From 4739a32ec87577968ed73d79d203d7c69a64bf55 Mon Sep 17 00:00:00 2001
From: Siddhartha Sahu <dev@sdht.in>
Date: Sat, 5 Apr 2025 13:05:57 -0400
Subject: [PATCH 0001/3724] checksec: 2.6.0 -> 3.0.2

---
 ...dprobe-config-before-checking-kernel.patch | 24 -----
 .../0002-don-t-sanatize-the-environment.patch | 25 ------
 pkgs/by-name/ch/checksec/package.nix          | 90 ++++---------------
 3 files changed, 15 insertions(+), 124 deletions(-)
 delete mode 100644 pkgs/by-name/ch/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
 delete mode 100644 pkgs/by-name/ch/checksec/0002-don-t-sanatize-the-environment.patch

diff --git a/pkgs/by-name/ch/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch b/pkgs/by-name/ch/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
deleted file mode 100644
index 2aabbc4d4c80..000000000000
--- a/pkgs/by-name/ch/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5cfb08effd21d9278e3eb8901c85112a331c3181 Mon Sep 17 00:00:00 2001
-From: Austin Seipp <aseipp@pobox.com>
-Date: Tue, 26 Oct 2021 09:23:07 +0000
-Subject: [PATCH] attempt to 'modprobe config' before checking kernel
-
----
- checksec | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/checksec b/checksec
-index 5536250..895073b 100755
---- a/checksec
-+++ b/checksec
-@@ -1059,6 +1059,7 @@ kernelcheck() {
-   echo_message "  options that harden the kernel itself against attack.\n\n" '' '' ''
-   echo_message "  Kernel config:\n" '' '' '{ "kernel": '
-
-+  modprobe configs 2> /dev/null
-   if [[ ! "${1}" == "" ]]; then
-     kconfig="cat ${1}"
-     echo_message "  Warning: The config ${1} on disk may not represent running kernel config!\n\n" "${1}" "<kernel config=\"${1}\"" "{ \"KernelConfig\":\"${1}\""
--- 
-2.33.0
-
diff --git a/pkgs/by-name/ch/checksec/0002-don-t-sanatize-the-environment.patch b/pkgs/by-name/ch/checksec/0002-don-t-sanatize-the-environment.patch
deleted file mode 100644
index bd639574f63f..000000000000
--- a/pkgs/by-name/ch/checksec/0002-don-t-sanatize-the-environment.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3b047ab4271919856ae0a3dee3a03a24045c0016 Mon Sep 17 00:00:00 2001
-From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
-Date: Mon, 13 Nov 2023 20:24:54 +0000
-Subject: [PATCH] don't sanatize the environment
-
----
- checksec | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/checksec b/checksec
-index 4fc3c31..135223a 100755
---- a/checksec
-+++ b/checksec
-@@ -2,9 +2,6 @@
- # Do not edit this file directly, this file is generated from the files
- # in the src directory. Any updates to this file will be overwritten when generated
-
--# sanitize the environment before run
--[[ "$(env | /bin/sed -r -e '/^(PWD|SHLVL|_)=/d')" ]] && exec -c "$0" "$@"
--
- # --- Modified Version ---
- # Name    : checksec.sh
- # Version : 1.7.0
---
-2.42.0
diff --git a/pkgs/by-name/ch/checksec/package.nix b/pkgs/by-name/ch/checksec/package.nix
index c479c7f14510..620b6beeaf81 100644
--- a/pkgs/by-name/ch/checksec/package.nix
+++ b/pkgs/by-name/ch/checksec/package.nix
@@ -1,110 +1,50 @@
 {
   lib,
-  stdenv,
-  fetchpatch,
   fetchFromGitHub,
-  makeWrapper,
-  testers,
-  runCommand,
 
-  # dependencies
-  binutils,
-  coreutils,
-  curl,
-  elfutils,
-  file,
-  findutils,
-  gawk,
-  glibc,
-  gnugrep,
-  gnused,
-  openssl,
-  procps,
-  sysctl,
-  wget,
-  which,
+  buildGoModule,
 
   # tests
+  testers,
   checksec,
 }:
 
-stdenv.mkDerivation rec {
+buildGoModule rec {
   pname = "checksec";
-  version = "2.6.0";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "slimm609";
-    repo = "checksec.sh";
-    rev = version;
-    hash = "sha256-BWtchWXukIDSLJkFX8M/NZBvfi7vUE2j4yFfS0KEZDo=";
+    repo = "checksec";
+    tag = version;
+    hash = "sha256-ZpDowTmnK23+ZocOY1pJMgMSn7FiQQGvMg/gSbiL1nw=";
   };
 
-  patches = [
-    ./0001-attempt-to-modprobe-config-before-checking-kernel.patch
-    # Tool would sanitize the environment, removing the PATH set by our wrapper.
-    ./0002-don-t-sanatize-the-environment.patch
-    # Fix the exit code of debug_report command. Check if PR 226 was merged when upgrading version.
-    (fetchpatch {
-      url = "https://github.com/slimm609/checksec.sh/commit/851ebff6972f122fde5507f1883e268bbff1f23d.patch";
-      hash = "sha256-DOcVF+oPGIR9VSbqE+EqWlcNANEvou1gV8qBvJLGLBE=";
-    })
-  ];
+  vendorHash = "sha256-7poHsEsRATljkqtfGxzqUbqhwSjVmiao2KoMVQ8LkD4=";
 
-  nativeBuildInputs = [
-    makeWrapper
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${version}"
   ];
 
-  installPhase =
-    let
-      path = lib.makeBinPath [
-        binutils
-        coreutils
-        curl
-        elfutils
-        file
-        findutils
-        gawk
-        gnugrep
-        gnused
-        openssl
-        procps
-        sysctl
-        wget
-        which
-      ];
-    in
-    ''
-      mkdir -p $out/bin
-      install checksec $out/bin
-      substituteInPlace $out/bin/checksec \
-        --replace "/bin/sed" "${gnused}/bin/sed" \
-        --replace "/usr/bin/id" "${coreutils}/bin/id" \
-        --replace "/lib/libc.so.6" "${glibc}/lib/libc.so.6"
-      wrapProgram $out/bin/checksec \
-        --prefix PATH : ${path}
-    '';
-
   passthru.tests = {
     version = testers.testVersion {
       package = checksec;
-      version = "v${version}";
+      inherit version;
     };
-    debug-report = runCommand "debug-report" { buildInputs = [ checksec ]; } ''
-      checksec --debug_report || exit 1
-      echo "OK"
-      touch $out
-    '';
   };
 
   meta = with lib; {
     description = "Tool for checking security bits on executables";
     mainProgram = "checksec";
-    homepage = "https://www.trapkit.de/tools/checksec/";
+    homepage = "https://slimm609.github.io/checksec/";
     license = licenses.bsd3;
     platforms = platforms.linux;
     maintainers = with maintainers; [
       thoughtpolice
       globin
+      sdht0
     ];
   };
 }

From 09d8b2e359201af8a91f3d10354c4d9de1fd6781 Mon Sep 17 00:00:00 2001
From: Petr Hodina <petr.hodina@luxonis.com>
Date: Sat, 26 Apr 2025 10:47:59 +0200
Subject: [PATCH 0002/3724] iotools: Fix werror and refactor definition

---
 .../io/iotools/001-fix-werror-in-sprintf.patch      | 13 +++++++++++++
 pkgs/by-name/io/iotools/package.nix                 | 12 +++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/io/iotools/001-fix-werror-in-sprintf.patch

diff --git a/pkgs/by-name/io/iotools/001-fix-werror-in-sprintf.patch b/pkgs/by-name/io/iotools/001-fix-werror-in-sprintf.patch
new file mode 100644
index 000000000000..58d6e01de398
--- /dev/null
+++ b/pkgs/by-name/io/iotools/001-fix-werror-in-sprintf.patch
@@ -0,0 +1,13 @@
+diff --git a/commands.c b/commands.c
+index a83f1d5..b3f217a 100644
+--- a/commands.c
++++ b/commands.c
+@@ -152,1 +152,7 @@ build_symlink_name(const char *path_to_bin, const struct cmd_info *cmd)
+-	snprintf(link_name, FILENAME_MAX, "%s/%s", path_to_bin, cmd->name);
++	int result = snprintf(link_name, FILENAME_MAX, "%s/%s", path_to_bin, cmd->name);
++
++	if (result >= FILENAME_MAX) {
++		link_name[FILENAME_MAX - 1] = '\0';
++	} else if (result < 0) {
++		link_name[0] = '\0';
++	}
diff --git a/pkgs/by-name/io/iotools/package.nix b/pkgs/by-name/io/iotools/package.nix
index 7e71c12153bd..1e3a33d548b0 100644
--- a/pkgs/by-name/io/iotools/package.nix
+++ b/pkgs/by-name/io/iotools/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "iotools";
   version = "unstable-2017-12-11";
 
@@ -15,6 +15,8 @@ stdenv.mkDerivation {
     hash = "sha256-tlGXJn3n27mQDupMIVYDd86YaWazVwel/qs0QqCy1W8=";
   };
 
+  patches = [ ./001-fix-werror-in-sprintf.patch ];
+
   makeFlags = [
     "DEBUG=0"
     "STATIC=0"
@@ -24,7 +26,7 @@ stdenv.mkDerivation {
     install -Dm755 iotools -t $out/bin
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Set of simple command line tools which allow access to
       hardware device registers";
     longDescription = ''
@@ -35,12 +37,12 @@ stdenv.mkDerivation {
       operations.
     '';
     homepage = "https://github.com/adurbin/iotools";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ felixsinger ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ felixsinger ];
     platforms = [
       "x86_64-linux"
       "i686-linux"
     ];
     mainProgram = "iotools";
   };
-}
+})

From 1aa767cd3571891bb951c5688a484b18d213b178 Mon Sep 17 00:00:00 2001
From: Petr Hodina <petr.hodina@luxonis.com>
Date: Sat, 26 Apr 2025 10:58:34 +0200
Subject: [PATCH 0003/3724] psb_status: init at 0-unstable-2024-10-10

---
 .../iotools/001-fix-werror-in-sprintf.patch   | 26 ++++++++---
 pkgs/by-name/ps/psb_status/package.nix        | 44 +++++++++++++++++++
 2 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/ps/psb_status/package.nix

diff --git a/pkgs/by-name/io/iotools/001-fix-werror-in-sprintf.patch b/pkgs/by-name/io/iotools/001-fix-werror-in-sprintf.patch
index 58d6e01de398..22a0b87b8f36 100644
--- a/pkgs/by-name/io/iotools/001-fix-werror-in-sprintf.patch
+++ b/pkgs/by-name/io/iotools/001-fix-werror-in-sprintf.patch
@@ -1,13 +1,27 @@
 diff --git a/commands.c b/commands.c
-index a83f1d5..b3f217a 100644
+index a28e6da..0f76ac7 100644
 --- a/commands.c
 +++ b/commands.c
-@@ -152,1 +152,7 @@ build_symlink_name(const char *path_to_bin, const struct cmd_info *cmd)
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <limits.h>
+ #include <errno.h>
+ #include "commands.h"
+ #include "platform.h"
+@@ -150,7 +151,13 @@ build_symlink_name(const char *path_to_bin, const struct cmd_info *cmd)
+ {
+ 	static char link_name[FILENAME_MAX];
+ 
 -	snprintf(link_name, FILENAME_MAX, "%s/%s", path_to_bin, cmd->name);
-+	int result = snprintf(link_name, FILENAME_MAX, "%s/%s", path_to_bin, cmd->name);
++	int result = snprintf(link_name, PATH_MAX, "%s/%s", path_to_bin, cmd->name);
 +
-+	if (result >= FILENAME_MAX) {
-+		link_name[FILENAME_MAX - 1] = '\0';
-+	} else if (result < 0) {
++	if (result >= PATH_MAX) {
++		link_name[PATH_MAX - 1] = '\0';
++		} else if (result < 0) {
 +		link_name[0] = '\0';
 +	}
+ 
+ 	return link_name;
+ }
diff --git a/pkgs/by-name/ps/psb_status/package.nix b/pkgs/by-name/ps/psb_status/package.nix
new file mode 100644
index 000000000000..86098227854e
--- /dev/null
+++ b/pkgs/by-name/ps/psb_status/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  bash,
+  iotools,
+  makeWrapper,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "psb_status";
+  version = "0-unstable-2024-10-10";
+
+  src = fetchFromGitHub {
+    owner = "mkopec";
+    repo = "psb_status";
+    rev = "be896832c53d6b0b70cf8a87f7ee46ad33deefc2";
+    hash = "sha256-4anPyjO8y3FgnYWa4bGFxI8Glk9srw/XF552tnixc8I=";
+  };
+
+  dontBuild = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    install -m755 psb_status.sh $out/bin/psb_status
+    wrapProgram $out/bin/psb_status \
+      --prefix PATH : ${lib.makeBinPath [ iotools ]}
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Script to check Platform Secure Boot enablement on Zen based AMD CPUs";
+    homepage = "https://github.com/mkopec/psb_status";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ phodina ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "psb_status";
+  };
+})

From 3153fa49db2ffdf78752359cc244d9c3b682c8b3 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 25 May 2025 19:17:42 +0200
Subject: [PATCH 0004/3724] python313Packages.bunch: drop

---
 .../python-modules/bunch/default.nix          | 39 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 pkgs/development/python-modules/bunch/default.nix

diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix
deleted file mode 100644
index 84fb157a8659..000000000000
--- a/pkgs/development/python-modules/bunch/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-}:
-
-buildPythonPackage {
-  pname = "bunch";
-  version = "unstable-2017-11-21";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
-
-  # Use a fork as upstream is dead
-  src = fetchFromGitHub {
-    owner = "olivecoder";
-    repo = "bunch";
-    rev = "71ac9d5c712becd4c502ab3099203731a0f1122e";
-    hash = "sha256-XOgzJkcIqkAJFsKAyt2jSEIxcc0h2gFC15xy5kAs+7s=";
-  };
-
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "rU" "r"
-  '';
-
-  # No real tests available
-  doCheck = false;
-
-  pythonImportsCheck = [ "bunch" ];
-
-  meta = with lib; {
-    description = "Python dictionary that provides attribute-style access";
-    homepage = "https://github.com/dsc/bunch";
-    license = licenses.mit;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 7cd7e7c6dd88..5622870cdbec 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -126,6 +126,7 @@ mapAliases ({
   buildbot-plugins = throw "use pkgs.buildbot-plugins instead"; # added 2022-04-07
   buildbot-worker = throw "use pkgs.buildbot-worker instead"; # added 2022-04-07
   buildbot-pkg = throw "buildbot-pkg has been removed, it's only internally used in buildbot"; # added 2022-04-07
+  bunch = throw "bunch has been removed as it is unmaintained since inception"; # added 2025-05-31
   btsmarthub_devicelist = btsmarthub-devicelist; # added 2024-01-03
   bt_proximity = bt-proximity; # added 2021-07-02
   BTrees = btrees; # added 2023-02-19
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c6ddce26ff2..ff2f0217f5eb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2137,8 +2137,6 @@ self: super: with self; {
 
   bumps = callPackage ../development/python-modules/bumps { };
 
-  bunch = callPackage ../development/python-modules/bunch { };
-
   bundlewrap = callPackage ../development/python-modules/bundlewrap { };
 
   bundlewrap-keepass = callPackage ../development/python-modules/bundlewrap-keepass { };

From 565ca5671681b57ecb7c4c4c81f0fb9994c10fc5 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Fri, 30 May 2025 21:53:55 -0700
Subject: [PATCH 0005/3724] xosd-xft: init at 1.1.0

---
 pkgs/by-name/xo/xosd-xft/package.nix | 47 ++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/xo/xosd-xft/package.nix

diff --git a/pkgs/by-name/xo/xosd-xft/package.nix b/pkgs/by-name/xo/xosd-xft/package.nix
new file mode 100644
index 000000000000..73a71fee2062
--- /dev/null
+++ b/pkgs/by-name/xo/xosd-xft/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+  pkg-config,
+  xorg,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xosd-xft";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "kdmurthy";
+    repo = "libxosd-xft";
+    tag = finalAttrs.version;
+    hash = "sha256-hsI7KMDmqGoGExSI3K7JiKNoiwZMNLubekuEEgkmQTg=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+  buildInputs = with xorg; [
+    libXft
+    libXrandr
+    libXinerama
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/osd-echo";
+  versionCheckProgramArg = "--help";
+
+  updateScript = nix-update-script { };
+
+  meta = {
+    description = "Show text content with Xft/TTF fonts on X11 display";
+    homepage = "https://github.com/kdmurthy/libxosd-xft";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+    platforms = lib.platforms.linux;
+  };
+})

From e54843b9a7bae09e40616cb4bf8910522b716cbb Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 1 Jun 2025 06:26:38 +0100
Subject: [PATCH 0006/3724] kbd: 2.7.1 -> 2.8.0

Changes: https://lore.kernel.org/kbd/aDmDTB_oRNU8UsWy@example.org/T/#u
---
 pkgs/by-name/kb/kbd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index c85e05fc552f..f14dbb6a9afe 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "kbd";
-  version = "2.7.1";
+  version = "2.8.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz";
-    sha256 = "sha256-8WfYmdkrVszxL29JNVFz+ThwqV8V2K7r9f3NKKYhrKg=";
+    hash = "sha256-AfWAbafR009ZS3sqauGrIyFTRM8QZOjtzTqQ/vl3ahE=";
   };
 
   # vlock is moved into its own output, since it depends on pam. This

From 2f6b53822a3b3c4008f4d7d552d2af134a810567 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 1 Jun 2025 06:29:11 +0100
Subject: [PATCH 0007/3724] kbd: enable parallel building

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

diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index f14dbb6a9afe..d6e0b28ba3c0 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -75,6 +75,8 @@ stdenv.mkDerivation rec {
       src/vlock/Makefile.am
   '';
 
+  enableParallelBuilding = true;
+
   postInstall = ''
     for i in $out/bin/unicode_{start,stop}; do
       substituteInPlace "$i" \

From edba77eb82d747a04385a165d44c11ca60401dcc Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Fri, 16 May 2025 18:09:56 +0100
Subject: [PATCH 0008/3724] haskellPackages.ghc: disable split sections on
 windows

---
 pkgs/development/compilers/ghc/common-hadrian.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index f94890b91358..63ef692cee6b 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -110,7 +110,7 @@
         # While split sections are now enabled by default in ghc 8.8 for windows,
         # they seem to lead to `too many sections` errors when building base for
         # profiling.
-        ++ lib.optionals (!stdenv.targetPlatform.isWindows) [ "split_sections" ];
+        ++ (if stdenv.targetPlatform.isWindows then [ "no_split_sections" ] else [ "split_sections" ]);
     in
     baseFlavour + lib.concatMapStrings (t: "+${t}") transformers,
 

From 7e90fcc68c538ded3409d93d21292ee6e4646d49 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Fri, 16 May 2025 18:10:47 +0100
Subject: [PATCH 0009/3724] haskellPackages.ghc: fix windres settings reference
 when cross-compiling for windows

Fixes error: `could not execute: /bin/false`
---
 pkgs/development/compilers/ghc/common-hadrian.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index 63ef692cee6b..20c5af9494aa 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -403,6 +403,8 @@ let
           ld = cc.bintools;
           "ld.gold" = cc.bintools;
 
+          windres = cc.bintools;
+
           otool = cc.bintools.bintools;
 
           # GHC needs install_name_tool on all darwin platforms. The same one can
@@ -821,6 +823,10 @@ stdenv.mkDerivation (
               "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang"
           }"
       ''
+      + lib.optionalString stdenv.targetPlatform.isWindows ''
+        ghc-settings-edit "$settingsFile" \
+        "windres command" "${toolPath "windres" installCC}"
+      ''
       + ''
 
         # Install the bash completion file.

From 13bffd835b74aa359e849c2f25702168710f9995 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Fri, 16 May 2025 18:11:58 +0100
Subject: [PATCH 0010/3724] haskellPackages: fix GHC build on linux->ucrt cross

---
 pkgs/development/compilers/ghc/common-hadrian.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index 20c5af9494aa..28dad6c6f7d5 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -248,6 +248,14 @@
             ./Cabal-3.12-paths-fix-cycle-aarch64-darwin.patch
         )
       ]
+      ++ lib.optionals stdenv.targetPlatform.isWindows [
+        # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13919
+        (fetchpatch {
+          name = "include-modern-utimbuf.patch";
+          url = "https://gitlab.haskell.org/ghc/ghc/-/commit/7e75928ed0f1c4654de6ddd13d0b00bf4b5c6411.patch";
+          hash = "sha256-sb+AHdkGkCu8MW0xoQIpD5kEc0zYX8udAMDoC+TWc0Q=";
+        })
+      ]
       # Prevents passing --hyperlinked-source to haddock. Note that this can
       # be configured via a user defined flavour now. Unfortunately, it is
       # impossible to import an existing flavour in UserSettings, so patching

From 2a7033b350732332642688d9483386dd328c354c Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Wed, 26 Feb 2025 19:51:55 +0000
Subject: [PATCH 0011/3724] haskellPackages: add ucrt64 to release-haskell
 jobset on ghc 9.12

---
 pkgs/top-level/release-haskell.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index ad737ea57108..bb547c2329e2 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -524,6 +524,14 @@ let
               };
             };
 
+        ucrt64.haskell.packages.ghc912 = {
+          inherit (packagePlatforms pkgs.pkgsCross.ucrt64.haskell.packages.ghc912)
+            ghc
+            # hello # executables don't build yet
+            microlens
+            ;
+        };
+
         riscv64 = {
           # Cross compilation of GHC
           haskell.compiler = {

From f7cb50a2fb56f6d328ecf3045e9c7fae3baaf696 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Sat, 7 Jun 2025 20:46:25 +0200
Subject: [PATCH 0012/3724] alsa-ucm-conf: 1.2.12 -> 1.2.14

---
 pkgs/by-name/al/alsa-ucm-conf/package.nix | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix
index ea27eed8fbc6..e250448adf76 100644
--- a/pkgs/by-name/al/alsa-ucm-conf/package.nix
+++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "alsa-ucm-conf";
-  version = "1.2.12";
+  version = "1.2.14";
 
   src = fetchurl {
     url = "mirror://alsa/lib/alsa-ucm-conf-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-Fo58BUm3v4mRCS+iv7kDYx33edxMQ+6PQnf8t3LYwDU=";
+    hash = "sha256-MumAn1ktkrl4qhAy41KTwzuNDx7Edfk3Aiw+6aMGnCE=";
   };
 
   dontBuild = true;
@@ -25,21 +25,10 @@ stdenv.mkDerivation (finalAttrs: {
       substituteInPlace ucm2/lib/card-init.conf \
         --replace-fail "/bin/rm" "${coreutils}/bin/rm" \
         --replace-fail "/bin/mkdir" "${coreutils}/bin/mkdir"
-
-      files=(
-          "ucm2/HDA/HDA.conf"
-          "ucm2/codecs/rt715/init.conf"
-          "ucm2/codecs/rt715-sdca/init.conf"
-          "ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf"
-          "ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf"
-      )
-
     ''
     + lib.optionalString stdenv.hostPlatform.isLinux ''
-      for file in "''${files[@]}"; do
-          substituteInPlace "$file" \
-              --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe'
-      done
+      substituteInPlace ucm2/common/ctl/led.conf \
+        --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe'
     ''
     + ''
 

From eb11defad7ffc4724a3ac4308cc2c970aaa9a397 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Sat, 7 Jun 2025 20:52:54 +0200
Subject: [PATCH 0013/3724] alsa-ucm-conf: Build using stdenvNoCC

---
 pkgs/by-name/al/alsa-ucm-conf/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix
index e250448adf76..32d683877c74 100644
--- a/pkgs/by-name/al/alsa-ucm-conf/package.nix
+++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix
@@ -2,12 +2,12 @@
   directoryListingUpdater,
   fetchurl,
   lib,
-  stdenv,
+  stdenvNoCC,
   coreutils,
   kmod,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "alsa-ucm-conf";
   version = "1.2.14";
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
         --replace-fail "/bin/rm" "${coreutils}/bin/rm" \
         --replace-fail "/bin/mkdir" "${coreutils}/bin/mkdir"
     ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
+    + lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
       substituteInPlace ucm2/common/ctl/led.conf \
         --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe'
     ''

From b5825dab3e5e33de4a8261e94bcffa7f552fe635 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 9 Jun 2025 06:37:43 +0100
Subject: [PATCH 0014/3724] libdrm: 2.4.124 -> 2.4.125

Changes: https://lists.x.org/archives/xorg-announce/2025-June/003606.html
---
 pkgs/by-name/li/libdrm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix
index 9ddf95cdbc1c..1019893a6dbd 100644
--- a/pkgs/by-name/li/libdrm/package.nix
+++ b/pkgs/by-name/li/libdrm/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdrm";
-  version = "2.4.124";
+  version = "2.4.125";
 
   src = fetchurl {
     url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-rDYpP2HKSq+vSxaip6//MSqk9cN8n715fenjwIY8o3k=";
+    hash = "sha256-1LrpJ5elD4GpNSR2LgQQpJzYTPoPmXeVvAFyrI+x2Wo=";
   };
 
   outputs = [

From b034b4da127c26114b76d64481fd4a8bc280cf7d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 11 Jun 2025 21:30:57 +0100
Subject: [PATCH 0015/3724] maturin: 1.8.6 -> 1.8.7

Changes: https://github.com/PyO3/maturin/releases/tag/v1.8.7
---
 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 140083a3e636..93e8826c9373 100644
--- a/pkgs/by-name/ma/maturin/package.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "maturin";
-  version = "1.8.6";
+  version = "1.8.7";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    hash = "sha256-Dfq8kBg6gk1j/Y1flOb2yw9hhY40n5gi4h08znI2Yw8=";
+    hash = "sha256-uPtaojmAmMQcmkw7N6oRmE7nIpgyBXm3fLiyP0Ur7Ds=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-LDVmNtpu+J8rnSlpTslwm6QcyN6E3ZlVdpmowKc/kZo=";
+  cargoHash = "sha256-3/CP7A/nlx1Qd7j4SQKcxafKAFxnIU90sqaOOw/APOs=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv

From a7beb46aa788193bc07f4de2b3a77de4ac8d30de Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Thu, 5 Jun 2025 15:10:11 +0100
Subject: [PATCH 0016/3724] haskellPackages: fix GHC 9.12 on android

---
 .../compilers/ghc/common-hadrian.nix          |  5 ++++
 ...c-define-undefined-elf-st-visibility.patch | 24 +++++++++++++++++++
 pkgs/top-level/release-haskell.nix            |  4 ++--
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/compilers/ghc/ghc-define-undefined-elf-st-visibility.patch

diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index f4f40bec3f22..b57beac509ad 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -291,6 +291,11 @@
           url = "https://gitlab.haskell.org/ghc/ghc/-/commit/39bb6e583d64738db51441a556d499aa93a4fc4a.patch";
           sha256 = "0w5fx413z924bi2irsy1l4xapxxhrq158b5gn6jzrbsmhvmpirs0";
         })
+      ]
+
+      # Missing ELF symbols
+      ++ lib.optionals stdenv.targetPlatform.isAndroid [
+        ./ghc-define-undefined-elf-st-visibility.patch
       ];
 
     stdenv = stdenvNoCC;
diff --git a/pkgs/development/compilers/ghc/ghc-define-undefined-elf-st-visibility.patch b/pkgs/development/compilers/ghc/ghc-define-undefined-elf-st-visibility.patch
new file mode 100644
index 000000000000..bd3b3ea60485
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-define-undefined-elf-st-visibility.patch
@@ -0,0 +1,24 @@
+diff --git a/rts/linker/ElfTypes.h b/rts/linker/ElfTypes.h
+index f5e2f819d9..7f75087738 100644
+--- a/rts/linker/ElfTypes.h
++++ b/rts/linker/ElfTypes.h
+@@ -33,6 +33,9 @@
+ #define Elf_Sym     Elf64_Sym
+ #define Elf_Rel     Elf64_Rel
+ #define Elf_Rela    Elf64_Rela
++#if !defined(ELF64_ST_VISIBILITY)
++#define ELF64_ST_VISIBILITY(o) ((o)&0x3)
++#endif
+ #if !defined(ELF_ST_VISIBILITY)
+ #define ELF_ST_VISIBILITY ELF64_ST_VISIBILITY
+ #endif
+@@ -60,6 +63,9 @@
+ #define Elf_Sym     Elf32_Sym
+ #define Elf_Rel     Elf32_Rel
+ #define Elf_Rela    Elf32_Rela
++#if !defined(ELF32_ST_VISIBILITY)
++#define ELF32_ST_VISIBILITY(o) ((o)&0x3)
++#endif
+ #if !defined(ELF_ST_VISIBILITY)
+ #define ELF_ST_VISIBILITY ELF32_ST_VISIBILITY
+ #endif /* ELF_ST_VISIBILITY */
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 315e94e73a79..b65b8095b288 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -515,8 +515,8 @@ let
                   ;
               };
 
-              haskell.packages.ghc910 = {
-                inherit (packagePlatforms pkgs.pkgsCross.aarch64-android-prebuilt.haskell.packages.ghc910)
+              haskell.packages.ghc912 = {
+                inherit (packagePlatforms pkgs.pkgsCross.aarch64-android-prebuilt.haskell.packages.ghc912)
                   ghc
                   hello
                   microlens

From 3799b9e0615077df213e2e5a6ddebd950fdcea81 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Thu, 5 Jun 2025 15:46:13 +0100
Subject: [PATCH 0017/3724] haskellPackages: fix aarch64-android-prebuilt
 release-haskell jobset

---
 pkgs/top-level/release-haskell.nix | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index b65b8095b288..6db198eca8e1 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -482,6 +482,26 @@ let
           };
 
       pkgsCross = {
+        aarch64-android-prebuilt.pkgsStatic =
+          removePlatforms
+            [
+              # Android NDK package doesn't support building on
+              "aarch64-darwin"
+              "aarch64-linux"
+
+              "x86_64-darwin"
+            ]
+            {
+              haskell.packages.ghc912 = {
+                inherit
+                  (packagePlatforms pkgs.pkgsCross.aarch64-android-prebuilt.pkgsStatic.haskell.packages.ghc912)
+                  ghc
+                  hello
+                  microlens
+                  ;
+              };
+            };
+
         ghcjs =
           removePlatforms
             [
@@ -515,14 +535,6 @@ let
                   ;
               };
 
-              haskell.packages.ghc912 = {
-                inherit (packagePlatforms pkgs.pkgsCross.aarch64-android-prebuilt.haskell.packages.ghc912)
-                  ghc
-                  hello
-                  microlens
-                  ;
-              };
-
               haskell.packages.ghcHEAD = {
                 inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghcHEAD)
                   ghc

From 4fe25a04939a00a83bb75bc3abc7063a5295edf9 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Wed, 11 Jun 2025 00:57:38 +0100
Subject: [PATCH 0018/3724] Add note about leaking into RPATH

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

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 4c7db9d149e9..fd96aa1a5c4e 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -85,7 +85,7 @@ in
   enableSharedLibraries ?
     !stdenv.hostPlatform.isStatic
     && (ghc.enableShared or false)
-    && !stdenv.hostPlatform.useAndroidPrebuilt,
+    && !stdenv.hostPlatform.useAndroidPrebuilt, # TODO: figure out why /build leaks into RPATH
   enableDeadCodeElimination ? (!stdenv.hostPlatform.isDarwin), # TODO: use -dead_strip for darwin
   # Disabling this for ghcjs prevents this crash: https://gitlab.haskell.org/ghc/ghc/-/issues/23235
   enableStaticLibraries ?

From e2eae470a8ee8fc6983f958dc337e686db75544c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 16 Jun 2025 22:45:31 +0100
Subject: [PATCH 0019/3724] rav1e: 0.8.0 -> 0.8.1

Changes: https://github.com/xiph/rav1e/releases/tag/v0.8.1
---
 pkgs/by-name/ra/rav1e/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix
index 3b0b7c9fc061..cc233cde58f3 100644
--- a/pkgs/by-name/ra/rav1e/package.nix
+++ b/pkgs/by-name/ra/rav1e/package.nix
@@ -13,15 +13,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rav1e";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-hVeBrfZxqkxzUeuut0XgU4qph1z4gPzV/9mS7X9byto=";
+    hash = "sha256-GCfh2v3w5C8h4GuPKkTMUAhPspT1W0drrRpELCJWeTI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-EDXzpHrdaHd3FQEuVnkQzqsYAjShsGc4XLhDAfmVXK8=";
+  cargoHash = "sha256-KQsAEs608OyzwZtJRXw7Zwh5X+4yFJpacOMoij58vh0=";
 
   nativeBuildInputs = [
     cargo-c

From c14eea4451fa6334c4171572c151b2cd4a8e97ab Mon Sep 17 00:00:00 2001
From: Simon Arlott <sa.me.uk>
Date: Wed, 18 Jun 2025 22:44:44 +0100
Subject: [PATCH 0020/3724] maintainer: add nomis

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2e29fd89dc3d..12750d889ee3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18086,6 +18086,12 @@
     githubId = 148037;
     name = "Joachim Breitner";
   };
+  nomis = {
+    email = "nixpkgs@octiron.net";
+    github = "nomis";
+    githubId = 70171;
+    name = "Simon Arlott";
+  };
   nomisiv = {
     email = "simon@nomisiv.com";
     github = "NomisIV";

From ca596975ab053d6865e328ef7cbd9ac9789963fe Mon Sep 17 00:00:00 2001
From: Simon Arlott <sa.me.uk>
Date: Wed, 18 Jun 2025 22:48:31 +0100
Subject: [PATCH 0021/3724] dtee: init at 1.1.3

---
 pkgs/by-name/dt/dtee/package.nix | 91 ++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 pkgs/by-name/dt/dtee/package.nix

diff --git a/pkgs/by-name/dt/dtee/package.nix b/pkgs/by-name/dt/dtee/package.nix
new file mode 100644
index 000000000000..b8b92a3b1ade
--- /dev/null
+++ b/pkgs/by-name/dt/dtee/package.nix
@@ -0,0 +1,91 @@
+{
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  pkgs,
+  stdenv,
+  # nativeBuildInputs
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
+  python3,
+  sphinx,
+  # buildInputs
+  boost,
+  # nativeCheckInputs
+  bash,
+  coreutils,
+  diffutils,
+  findutils,
+  glibcLocales,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "dtee";
+  version = "1.1.3";
+
+  src = fetchFromGitHub {
+    owner = "nomis";
+    repo = "dtee";
+    tag = finalAttrs.version;
+    hash = "sha256-trREhITO3cY4j75mpudWhOA3GXI0Q8GkUxNq2s6154w=";
+  };
+
+  passthru.updateScript = nix-update-script { };
+
+  # Make "#!/usr/bin/env bash" work in tests
+  postPatch = "patchShebangs tests";
+
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pkg-config
+    python3
+    sphinx # For the man page
+  ];
+
+  buildInputs = [ boost ];
+
+  nativeCheckInputs = [
+    bash
+    coreutils
+    diffutils
+    findutils
+    glibcLocales # For tests that check translations work
+  ];
+
+  # Use the correct copyright year on the man page (workaround for https://github.com/sphinx-doc/sphinx/issues/13231)
+  preBuild = ''
+    SOURCE_DATE_EPOCH=$(python3 $NIX_BUILD_TOP/$sourceRoot/release_date.py -e ${finalAttrs.version}) || exit 1
+    export SOURCE_DATE_EPOCH
+  '';
+
+  mesonFlags = [ "--unity on" ];
+  doCheck = true;
+
+  meta = {
+    description = "Run a program with standard output and standard error copied to files";
+    longDescription = ''
+      Run a program with standard output and standard error copied to files
+      while maintaining the original standard output and standard error in
+      the original order. When invoked as "cronty", allows programs to be run
+      from cron, suppressing all output unless the process outputs an error
+      message or has a non-zero exit status whereupon the original output
+      will be written as normal and the exit code will be appended to standard
+      error.
+    '';
+
+    homepage = "https://dtee.readthedocs.io/";
+    downloadPage = "https://github.com/nomis/dtee/releases/tag/${finalAttrs.version}";
+    changelog = "https://dtee.readthedocs.io/en/${finalAttrs.version}/changelog.html";
+
+    license = lib.licenses.gpl3Plus;
+    sourceProvenance = [ lib.sourceTypes.fromSource ];
+    maintainers = with lib.maintainers; [ nomis ];
+    mainProgram = "dtee";
+    # Only Linux has reliable local datagram sockets
+    platforms = lib.platforms.linux;
+  };
+})

From db98b9a00174c52eab658dcbc4e3455f184d40d6 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 23 Jun 2025 08:48:53 +0200
Subject: [PATCH 0022/3724] aab: init at 1.0.0-dev.5

Co-authored-by: June Stepp <git@junestepp.me>
---
 .../aab/allow-manually-setting-modtime.patch  | 124 ++++++++++++++++++
 pkgs/by-name/aa/aab/fix-flaky-tests.patch     |  75 +++++++++++
 .../aa/aab/only-call-git-when-necessary.patch |  14 ++
 pkgs/by-name/aa/aab/package.nix               |  48 +++++++
 4 files changed, 261 insertions(+)
 create mode 100644 pkgs/by-name/aa/aab/allow-manually-setting-modtime.patch
 create mode 100644 pkgs/by-name/aa/aab/fix-flaky-tests.patch
 create mode 100644 pkgs/by-name/aa/aab/only-call-git-when-necessary.patch
 create mode 100644 pkgs/by-name/aa/aab/package.nix

diff --git a/pkgs/by-name/aa/aab/allow-manually-setting-modtime.patch b/pkgs/by-name/aa/aab/allow-manually-setting-modtime.patch
new file mode 100644
index 000000000000..27e4e455c511
--- /dev/null
+++ b/pkgs/by-name/aa/aab/allow-manually-setting-modtime.patch
@@ -0,0 +1,124 @@
+diff --git a/aab/builder.py b/aab/builder.py
+index 5c3805c..7dfe595 100644
+--- a/aab/builder.py
++++ b/aab/builder.py
+@@ -77,7 +77,7 @@ class AddonBuilder:
+         self._config = Config()
+         self._path_dist_module = PATH_DIST / "src" / self._config["module_name"]
+
+-    def build(self, qt_versions: List[QtVersion], disttype="local", pyenv=None):
++    def build(self, qt_versions: List[QtVersion], disttype="local", pyenv=None, modtime=None):
+         logging.info(
+             "\n--- Building %s %s for %s ---\n",
+             self._config["display_name"],
+@@ -86,7 +86,7 @@ class AddonBuilder:
+         )
+
+         self.create_dist()
+-        self.build_dist(qt_versions=qt_versions, disttype=disttype, pyenv=pyenv)
++        self.build_dist(qt_versions=qt_versions, disttype=disttype, pyenv=pyenv, modtime=modtime)
+
+         return self.package_dist(qt_versions=qt_versions, disttype=disttype)
+
+@@ -102,7 +102,7 @@ class AddonBuilder:
+         PATH_DIST.mkdir(parents=True)
+         Git().archive(self._version, PATH_DIST)
+
+-    def build_dist(self, qt_versions: List[QtVersion], disttype="local", pyenv=None):
++    def build_dist(self, qt_versions: List[QtVersion], disttype="local", pyenv=None, modtime=None):
+         self._copy_licenses()
+         if self._path_changelog.exists():
+             self._copy_changelog()
+@@ -111,7 +111,7 @@ class AddonBuilder:
+         if self._callback_archive:
+             self._callback_archive()
+
+-        self._write_manifest(disttype)
++        self._write_manifest(disttype, modtime=modtime)
+
+         ui_builder = UIBuilder(dist=PATH_DIST, config=self._config)
+
+@@ -162,12 +162,13 @@ class AddonBuilder:
+
+         return out_path
+
+-    def _write_manifest(self, disttype):
++    def _write_manifest(self, disttype, modtime=None):
+         ManifestUtils.generate_and_write_manifest(
+             addon_properties=self._config,
+             version=self._version,
+             dist_type=disttype,
+             target_dir=self._path_dist_module,
++            modtime=modtime,
+         )
+
+     def _copy_licenses(self):
+diff --git a/aab/cli.py b/aab/cli.py
+index 2ce6425..0956e98 100644
+--- a/aab/cli.py
++++ b/aab/cli.py
+@@ -89,7 +89,7 @@ def build(args):
+     total = len(dists)
+     for dist in dists:
+         logging.info("\n=== Build task %s/%s ===", cnt, total)
+-        builder.build(qt_versions=qt_versions, disttype=dist)
++        builder.build(qt_versions=qt_versions, disttype=dist, modtime=args.modtime)
+         cnt += 1
+
+
+@@ -146,7 +146,7 @@ def build_dist(args):
+     total = len(dists)
+     for dist in dists:
+         logging.info("\n=== Build task %s/%s ===", cnt, total)
+-        builder.build_dist(qt_versions=qt_versions, disttype=dist)
++        builder.build_dist(qt_versions=qt_versions, disttype=dist, modtime=args.modtime)
+         cnt += 1
+
+
+@@ -204,6 +204,12 @@ def construct_parser():
+         default="local",
+         choices=["local", "ankiweb", "all"],
+     )
++    dist_parent.add_argument(
++        "--modtime",
++        help="Last modified timestamp",
++        type=int,
++        required=False,
++    )
+
+     build_parent = argparse.ArgumentParser(add_help=False)
+     build_parent.add_argument(
+diff --git a/aab/manifest.py b/aab/manifest.py
+index fc0038d..355e370 100644
+--- a/aab/manifest.py
++++ b/aab/manifest.py
+@@ -49,10 +49,11 @@ class ManifestUtils:
+         version: str,
+         dist_type: DistType,
+         target_dir: Path,
++        modtime=None,
+     ):
+         logging.info("Writing manifest...")
+         manifest = cls.generate_manifest_from_properties(
+-            addon_properties=addon_properties, version=version, dist_type=dist_type
++            addon_properties=addon_properties, version=version, dist_type=dist_type, modtime=modtime
+         )
+         cls.write_manifest(manifest=manifest, target_dir=target_dir)
+
+@@ -62,6 +63,7 @@ class ManifestUtils:
+         addon_properties: Config,
+         version: str,
+         dist_type: DistType,
++        modtime=None,
+     ) -> Dict[str, Any]:
+         manifest = {
+             "name": addon_properties["display_name"],
+@@ -71,7 +73,7 @@ class ManifestUtils:
+             "version": version,
+             "homepage": addon_properties.get("homepage", ""),
+             "conflicts": deepcopy(addon_properties["conflicts"]),
+-            "mod": Git().modtime(version),
++            "mod": modtime if modtime is not None else Git().modtime(version),
+         }
+
+         # Add version specifiers:
diff --git a/pkgs/by-name/aa/aab/fix-flaky-tests.patch b/pkgs/by-name/aa/aab/fix-flaky-tests.patch
new file mode 100644
index 000000000000..948280c20b7a
--- /dev/null
+++ b/pkgs/by-name/aa/aab/fix-flaky-tests.patch
@@ -0,0 +1,75 @@
+diff --git a/tests/test_legacy.py b/tests/test_legacy.py
+index 33790b9..0577262 100644
+--- a/tests/test_legacy.py
++++ b/tests/test_legacy.py
+@@ -101,8 +101,8 @@ gui/
+         sample-project/
+             icons/
+                 coffee.svg
+-                heart.svg
+                 email.svg
++                heart.svg
+                 help.svg\
+ """
+
+diff --git a/tests/test_ui.py b/tests/test_ui.py
+index 0774672..3764fda 100644
+--- a/tests/test_ui.py
++++ b/tests/test_ui.py
+@@ -60,22 +60,22 @@ def test_ui_builder(tmp_path: Path):
+
+     expected_file_structure = """\
+ gui/
++    forms/
++        __init__.py
++        qt5/
++            __init__.py
++            dialog.py
++        qt6/
++            __init__.py
++            dialog.py
+     resources/
+         __init__.py
+         sample-project/
+             icons/
+                 coffee.svg
+-                heart.svg
+                 email.svg
+-                help.svg
+-    forms/
+-        __init__.py
+-        qt6/
+-            __init__.py
+-            dialog.py
+-        qt5/
+-            __init__.py
+-            dialog.py\
++                heart.svg
++                help.svg\
+ """
+
+     config = Config(test_project_root / "addon.json")
+@@ -136,8 +136,8 @@ gui/
+         sample-project/
+             icons/
+                 coffee.svg
+-                heart.svg
+                 email.svg
++                heart.svg
+                 help.svg\
+ """
+
+diff --git a/tests/util.py b/tests/util.py
+index a682bcd..a4aa7de 100644
+--- a/tests/util.py
++++ b/tests/util.py
+@@ -40,6 +40,9 @@ def list_files(startpath: Path):
+     ret = []
+
+     for root, dirs, files in os.walk(path):
++        dirs.sort()
++        files.sort()
++
+         level = root.replace(path, "").count(os.sep)
+         indent = " " * 4 * (level)
+         ret.append("{}{}/".format(indent, os.path.basename(root)))
diff --git a/pkgs/by-name/aa/aab/only-call-git-when-necessary.patch b/pkgs/by-name/aa/aab/only-call-git-when-necessary.patch
new file mode 100644
index 000000000000..1bc0e327d95f
--- /dev/null
+++ b/pkgs/by-name/aa/aab/only-call-git-when-necessary.patch
@@ -0,0 +1,14 @@
+diff --git a/aab/builder.py b/aab/builder.py
+index 5c3805c..a181b27 100644
+--- a/aab/builder.py
++++ b/aab/builder.py
+@@ -67,8 +67,7 @@ class AddonBuilder:
+         self._version = Git().parse_version(version)
+         # git stash create comes up empty when no changes were made since the
+         # last commit. Don't use 'dev' as version in these cases.
+-        git_status = call_shell("git status --porcelain")
+-        if self._version == "dev" and git_status == "":
++        if self._version == "dev" and call_shell("git status --porcelain") == "":
+             self._version = Git().parse_version("current")
+         if not self._version:
+             logging.error("Error: Version could not be determined through Git")
diff --git a/pkgs/by-name/aa/aab/package.nix b/pkgs/by-name/aa/aab/package.nix
new file mode 100644
index 000000000000..146fb2c89af8
--- /dev/null
+++ b/pkgs/by-name/aa/aab/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "aab";
+  version = "1.0.0-dev.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "glutanimate";
+    repo = "anki-addon-builder";
+    tag = "v${version}";
+    hash = "sha256-92Xqxgb9MLhSIa5EN3Rdk4aJlRfzEWqKmXFe604Q354=";
+  };
+
+  patches = [
+    ./fix-flaky-tests.patch
+    ./only-call-git-when-necessary.patch
+    ./allow-manually-setting-modtime.patch
+  ];
+
+  build-system = [ python3.pkgs.poetry-core ];
+
+  dependencies = with python3.pkgs; [
+    jsonschema
+    whichcraft
+    pyqt5
+    pyqt6
+  ];
+
+  nativeCheckInputs = [
+    python3.pkgs.pytestCheckHook
+    python3.pkgs.pyqt5
+    python3.pkgs.pyqt6
+  ];
+
+  pythonImportsCheck = [ "aab" ];
+
+  meta = {
+    description = "Build tool for Anki add-ons";
+    homepage = "https://github.com/glutanimate/anki-addon-builder";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ eljamm ];
+  };
+}

From bd0b9dd21bde2b2c61650866df62322ee54c4c28 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 23 Jun 2025 08:49:29 +0200
Subject: [PATCH 0023/3724] ankiAddons.review-heatmap: init at 1.0.1

Co-authored-by: June Stepp <git@junestepp.me>
---
 pkgs/games/anki/addons/default.nix            |  2 +
 ...vite-style-to-anki-review-heatmap.js.patch | 26 ++++++++
 .../anki/addons/review-heatmap/default.nix    | 60 +++++++++++++++++++
 3 files changed, 88 insertions(+)
 create mode 100644 pkgs/games/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch
 create mode 100644 pkgs/games/anki/addons/review-heatmap/default.nix

diff --git a/pkgs/games/anki/addons/default.nix b/pkgs/games/anki/addons/default.nix
index d602b1ea877e..7ee40d038d4b 100644
--- a/pkgs/games/anki/addons/default.nix
+++ b/pkgs/games/anki/addons/default.nix
@@ -14,5 +14,7 @@
 
   reviewer-refocus-card = callPackage ./reviewer-refocus-card { };
 
+  review-heatmap = callPackage ./review-heatmap { };
+
   yomichan-forvo-server = callPackage ./yomichan-forvo-server { };
 }
diff --git a/pkgs/games/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch b/pkgs/games/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch
new file mode 100644
index 000000000000..9af61f3989d9
--- /dev/null
+++ b/pkgs/games/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch
@@ -0,0 +1,26 @@
+---
+ src/web/main.ts | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/web/main.ts b/src/web/main.ts
+index 389c7fc..0b7c702 100644
+--- a/src/web/main.ts
++++ b/src/web/main.ts
+@@ -29,8 +29,12 @@ listed here: <https://glutanimate.com/contact/>.
+ Any modifications to this file must keep this entire header intact.
+ */
+
+-import "./_vendor/cal-heatmap.css";
+-import "./css/review-heatmap.css";
++import calHeatmapCss from "./_vendor/cal-heatmap.css";
++import reviewHeatmapCss from "./css/review-heatmap.css";
++
++var __vite_style__ = document.createElement('style');
++__vite_style__.textContent = calHeatmapCss + "\n" + reviewHeatmapCss;
++document.head.appendChild(__vite_style__);
+
+ import { CalHeatMap } from "./_vendor/cal-heatmap.js";
+ import { ReviewHeatmapOptions, ReviewHeatmapData } from "./types";
+--
+2.49.0
+
diff --git a/pkgs/games/anki/addons/review-heatmap/default.nix b/pkgs/games/anki/addons/review-heatmap/default.nix
new file mode 100644
index 000000000000..933a1ee1c290
--- /dev/null
+++ b/pkgs/games/anki/addons/review-heatmap/default.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  anki-utils,
+  fetchFromGitHub,
+  esbuild,
+  aab,
+}:
+anki-utils.buildAnkiAddon (finalAttrs: {
+  pname = "review-heatmap";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "glutanimate";
+    repo = "review-heatmap";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CL98DYikumoPR/QTWcMMwpd/tEpKLIDVC1Rj5NEvWJ8=";
+    # Needed files are set to export-ignore in .gitattributes
+    forceFetchGit = true;
+  };
+
+  patches = [ ./0001-Apply-vite-style-to-anki-review-heatmap.js.patch ];
+
+  nativeBuildInputs = [
+    aab
+    esbuild
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    # Work around missing icons
+    mkdir resources/icons/optional
+    touch resources/icons/optional/{patreon.svg,thanks.svg,twitter.svg,youtube.svg}
+
+    mkdir -p build/dist
+    cp -r src resources designer --target-directory build/dist
+    aab build_dist ${finalAttrs.version} --modtime -1
+
+    # build anki-review-heatmap.js
+    esbuild \
+      src/web/main.ts \
+      --bundle \
+      --minify \
+      --target=es2015 \
+      --loader:.css=text \
+      --outfile=build/dist/src/review_heatmap/web/anki-review-heatmap.js
+
+    cd build/dist/src/review_heatmap
+
+    runHook postBuild
+  '';
+
+  meta = {
+    description = "Anki add-on to help you keep track of your review activity";
+    homepage = "https://github.com/glutanimate/review-heatmap";
+    changelog = "https://github.com/glutanimate/review-heatmap/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ eljamm ];
+  };
+})

From b5daea748fca99f357152b727cfe9d36ffa842bb Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 23 Jun 2025 18:02:48 +0000
Subject: [PATCH 0024/3724] opencv4: protobuf_21 -> protobuf

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/libraries/opencv/4.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index fc2432d6bc94..d79a343a2c04 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -13,7 +13,7 @@
   glib,
   glog,
   gflags,
-  protobuf_21,
+  protobuf,
   config,
   ocl-icd,
   qimgv,
@@ -335,7 +335,7 @@ effectiveStdenv.mkDerivation {
       glib
       glog
       pcre2
-      protobuf_21
+      protobuf
       zlib
     ]
     ++ optionals enablePython [

From 5a388a9a097dc339ff24ccbcbaf13e130b9e72c0 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 24 Jun 2025 22:18:50 +0200
Subject: [PATCH 0025/3724] freeorion: 0.5.0.1-unstable-2024-07-28 -> 0.5.1.1

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/fr/freeorion/package.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fr/freeorion/package.nix b/pkgs/by-name/fr/freeorion/package.nix
index dff37f9b7ea8..1b3b55582546 100644
--- a/pkgs/by-name/fr/freeorion/package.nix
+++ b/pkgs/by-name/fr/freeorion/package.nix
@@ -23,17 +23,15 @@
   libxslt,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "freeorion";
-  version = "0.5.0.1-unstable-2024-07-28";
+  version = "0.5.1.1";
 
   src = fetchFromGitHub {
     owner = "freeorion";
     repo = "freeorion";
-    # Current `release-0.5` commit to pick up Boost and GCC 14 fixes
-    # until another release is cut.
-    rev = "dc3d6a4f01aa78229c419fa17b4e383f73b024e2";
-    hash = "sha256-9yPk77YeYkGMJqrlDYRTUMDKMWpxUXhVCnHhomiUc/A=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-0z3EPiSlViWQzpUu6+4IZ3ih0pbwdkZWAiVPsVcJr8o=";
   };
 
   buildInputs = [
@@ -93,4 +91,4 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     maintainers = with maintainers; [ tex ];
   };
-}
+})

From b08aaad1c4b3326e071ab50fd0c48cb8a4b06e8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Jun 2025 00:33:16 +0000
Subject: [PATCH 0026/3724] shadow: 4.17.4 -> 4.18.0

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

diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix
index 58cc701e9efc..8b00499e2cbf 100644
--- a/pkgs/by-name/sh/shadow/package.nix
+++ b/pkgs/by-name/sh/shadow/package.nix
@@ -33,13 +33,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "shadow";
-  version = "4.17.4";
+  version = "4.18.0";
 
   src = fetchFromGitHub {
     owner = "shadow-maint";
     repo = "shadow";
     rev = version;
-    hash = "sha256-HlSO1VCrMJtYlSL9/GvVw4mp/pEtuDju6V+6etrAAEk=";
+    hash = "sha256-M7We3JboNpr9H0ELbKcFtMvfmmVYaX9dYcsQ3sVX0lM=";
   };
 
   outputs = [

From 6e78716a8c4885dbc73bdff7826d40f6f47142df Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.f.scherer@gmail.com>
Date: Mon, 24 Mar 2025 16:56:50 +0100
Subject: [PATCH 0027/3724] souffle: 2.4.1 -> 2.5

additionally anticipate patch to fix build on darwin
---
 pkgs/by-name/so/souffle/includes.patch |  6 +++---
 pkgs/by-name/so/souffle/package.nix    | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/so/souffle/includes.patch b/pkgs/by-name/so/souffle/includes.patch
index 3e37641a6cab..edc5f07432fe 100644
--- a/pkgs/by-name/so/souffle/includes.patch
+++ b/pkgs/by-name/so/souffle/includes.patch
@@ -1,13 +1,13 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 946a1f8..bc60339 100644
+index c2ce37bf2..ee15e47f7 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -428,7 +428,7 @@ set(SOUFFLE_COMPILED_RELEASE_CXX_FLAGS ${CMAKE_CXX_FLAGS_RELEASE})
+@@ -448,7 +448,7 @@ set(SOUFFLE_COMPILED_RELEASE_CXX_FLAGS ${CMAKE_CXX_FLAGS_RELEASE})
  set(SOUFFLE_COMPILED_DEBUG_CXX_FLAGS ${CMAKE_CXX_FLAGS_DEBUG})
  get_target_property(SOUFFLE_COMPILED_DEFS compiled COMPILE_DEFINITIONS)
  get_target_property(SOUFFLE_COMPILED_OPTS compiled COMPILE_OPTIONS)
 -get_target_property(SOUFFLE_COMPILED_INCS compiled INCLUDE_DIRECTORIES)
 +set(SOUFFLE_COMPILED_INCS PLACEHOLDER_FOR_INCLUDES_THAT_ARE_SET_BY_NIXPKGS)
+ get_property(SOUFFLE_COMPILED_LINK_OPTS TARGET compiled PROPERTY LINK_OPTIONS)
  
  set(SOUFFLE_COMPILED_LIBS "")
- set(SOUFFLE_COMPILED_RPATHS "")
diff --git a/pkgs/by-name/so/souffle/package.nix b/pkgs/by-name/so/souffle/package.nix
index 8f359360ebf4..7e15221d6856 100644
--- a/pkgs/by-name/so/souffle/package.nix
+++ b/pkgs/by-name/so/souffle/package.nix
@@ -17,6 +17,7 @@
   makeWrapper,
   python3,
   callPackage,
+  fetchpatch,
 }:
 
 let
@@ -27,18 +28,23 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "souffle";
-  version = "2.4.1";
+  version = "2.5";
 
   src = fetchFromGitHub {
     owner = "souffle-lang";
     repo = "souffle";
     rev = version;
-    sha256 = "sha256-U3/1iNOLFzuXiBsVDAc5AXnK4F982Uifp18jjFNUv2o=";
+    sha256 = "sha256-Umfeb1pGAeK5K3QDRD/labC6IJLsPPJ73ycsAV4yPNM=";
   };
 
   patches = [
     ./threads.patch
     ./includes.patch
+    (fetchpatch {
+      name = "replace-copy-assignment.patch";
+      url = "https://github.com/souffle-lang/souffle/commit/73ebe789ec21772a0c5558639606354bfc3bcbd1.patch";
+      hash = "sha256-L9SK3Dh2cRwxKfEckUSiGGTDsWIZ5B8hoYYcslJpZl4=";
+    })
   ];
 
   hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ];

From bfbd17b6e1b5f8ef007b8c44fa824f450a657650 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 18 Jun 2025 12:44:38 +0200
Subject: [PATCH 0028/3724] kbd: set strictDeps, and put bash explicitly in
 buildInputs for wrapping

---
 pkgs/by-name/kb/kbd/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index c85e05fc552f..734931a4b972 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -8,6 +8,7 @@
   flex,
   check,
   pam,
+  bash,
   coreutils,
   gzip,
   bzip2,
@@ -85,6 +86,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     check
     pam
+    bash
   ];
   NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isStatic "-laudit";
   nativeBuildInputs = [
@@ -92,6 +94,7 @@ stdenv.mkDerivation rec {
     pkg-config
     flex
   ];
+  strictDeps = true;
 
   passthru.tests = {
     inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch;

From 75c8f84d1f6aeddd25601e820cb8d6ce115d3409 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 20 Jun 2025 17:54:04 +0300
Subject: [PATCH 0029/3724] kbd: use --replace-fail in unicode_{start,stop}
 scripts

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

diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index 734931a4b972..194d713a0c1f 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     for i in $out/bin/unicode_{start,stop}; do
       substituteInPlace "$i" \
-        --replace /usr/bin/tty ${coreutils}/bin/tty
+        --replace-fail /usr/bin/tty ${coreutils}/bin/tty
     done
   '';
 

From 298d39ede3dd9abfbc3b58c6e39758ce0f83e57a Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 18 Jun 2025 12:37:17 +0200
Subject: [PATCH 0030/3724] kbd: split man & scripts outputs

---
 doc/release-notes/rl-2511.section.md | 4 +---
 pkgs/by-name/kb/kbd/package.nix      | 7 +++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index d635e04b5941..39175de9d652 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -19,11 +19,9 @@
 - `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
 - `space-orbit` package has been removed due to lack of upstream maintenance. Debian upstream stopped tracking it in 2011.
 - `command-not-found` package is now disabled by default; it works only for nix-channels based systems, and requires setup for it to work.
-
 - Derivations setting both `separateDebugInfo` and one of `allowedReferences`, `allowedRequistes`, `disallowedReferences` or `disallowedRequisites` must now set `__structuredAttrs` to `true`. The effect of reference whitelisting or blacklisting will be disabled on the `debug` output created by `separateDebugInfo`.
-
 - `victoriametrics` no longer contains VictoriaLogs components. These have been separated into the new package `victorialogs`.
-
+- `kbd` package's `outputs` now include a `man` and `scripts` outputs. The `unicode_start` and `unicode_stop` Bash scripts are now part of the `scripts` output, allowing most usages of the `kbd` package to not pull in `bash`.
 - `gnome-keyring` no longer ships with an SSH agent anymore because it has been deprecated upstream. You should use `gcr_4` instead, which provides the same features. More information on why this was done can be found on [the relevant GCR upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67).
 
 - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input.
diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index 194d713a0c1f..1d9c0cf235ee 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
     "out"
     "vlock"
     "dev"
+    "scripts"
+    "man"
   ];
 
   configureFlags =
@@ -77,9 +79,10 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    for i in $out/bin/unicode_{start,stop}; do
-      substituteInPlace "$i" \
+    for s in unicode_{start,stop}; do
+      substituteInPlace ''${!outputBin}/bin/$s \
         --replace-fail /usr/bin/tty ${coreutils}/bin/tty
+      moveToOutput "bin/$s" "$scripts"
     done
   '';
 

From 1ab9d08c34689fef8684acfa5d54f589f20942bd Mon Sep 17 00:00:00 2001
From: "nikhil.singh" <nik.singh710@gmail.com>
Date: Thu, 26 Jun 2025 17:06:15 +0530
Subject: [PATCH 0031/3724] maintainers: add niksingh710

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f30e927b0165..3885d92843c7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17952,6 +17952,12 @@
     githubId = 70602908;
     github = "nikolaizombie1";
   };
+  niksingh710 = {
+    email = "nik.singh710@gmail.com";
+    name = "Nikhil Singh";
+    github = "niksingh710";
+    githubId = 60490474;
+  };
   nikstur = {
     email = "nikstur@outlook.com";
     name = "nikstur";

From 535d6d8b69c411806d944d45d5c665f2376340c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Jun 2025 20:00:47 +0000
Subject: [PATCH 0032/3724] glslang: 15.3.0 -> 15.4.0

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

diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix
index 47fcfdf24115..a4e3e5a6987d 100644
--- a/pkgs/by-name/gl/glslang/package.nix
+++ b/pkgs/by-name/gl/glslang/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "glslang";
-  version = "15.3.0";
+  version = "15.4.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
     rev = version;
-    hash = "sha256-HwFP4KJuA+BMQVvBWV0BCRj9U5I3CLEU+5bBtde2f6w=";
+    hash = "sha256-sPc+G7/ua7LQ7scuSvqWs7Q7Q+gFvXQ5wGQsEXbWH6w=";
   };
 
   outputs = [

From 38f28e3d5033e1c1d2db7666752f38238959c4d9 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 27 Jun 2025 21:39:03 +0100
Subject: [PATCH 0033/3724] nettle: 3.10.1 -> 3.10.2

Changes: https://git.lysator.liu.se/nettle/nettle/-/blob/nettle_3.10.2_release_20250626/NEWS?ref_type=tags
---
 pkgs/development/libraries/nettle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix
index aeaa1919872f..cc8d42201d32 100644
--- a/pkgs/development/libraries/nettle/default.nix
+++ b/pkgs/development/libraries/nettle/default.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix rec {
-  version = "3.10.1";
+  version = "3.10.2";
 
   src = fetchurl {
     url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
-    hash = "sha256-sPzdf8DN6m6A3PHdhbp5SvDVtKV+Jjl+7jvBkyctkTI=";
+    hash = "sha256-/p/1HLHyq7XmWmuMEKktoKtaturybn/CtnXEXx+1GbU=";
   };
 }

From d1964e1780138fb4dc2032bf7010a271b7bb32a9 Mon Sep 17 00:00:00 2001
From: Olivier LDff <olivier.ldff@gmail.com>
Date: Fri, 27 Jun 2025 21:25:14 +0200
Subject: [PATCH 0034/3724] gstreamer: 1.26.0 -> 1.26.3

---
 .../development/libraries/gstreamer/bad/default.nix | 12 ++----------
 .../libraries/gstreamer/base/default.nix            |  4 ++--
 .../libraries/gstreamer/core/default.nix            |  4 ++--
 .../libraries/gstreamer/devtools/default.nix        | 13 +++----------
 .../development/libraries/gstreamer/ges/default.nix |  4 ++--
 .../libraries/gstreamer/good/default.nix            | 11 ++---------
 .../libraries/gstreamer/libav/default.nix           |  4 ++--
 .../libraries/gstreamer/rtsp-server/default.nix     |  4 ++--
 .../libraries/gstreamer/ugly/default.nix            |  4 ++--
 .../libraries/gstreamer/vaapi/default.nix           |  4 ++--
 10 files changed, 21 insertions(+), 43 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index efb261a613e6..8102e016a159 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -113,7 +113,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-bad";
-  version = "1.26.0";
+  version = "1.26.3";
 
   outputs = [
     "out"
@@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${finalAttrs.version}.tar.xz";
-    hash = "sha256-+Ch6hMX2Y2ilpQ2l+WmZSgLEfyAiD/4coxVBk+Za8hY=";
+    hash = "sha256-lcSNrK8UJ29OWV9MvKlLPP6/wiKF52XiqlbQpydddWE=";
   };
 
   patches = [
@@ -130,14 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
     (replaceVars ./fix-paths.patch {
       inherit (addDriverRunpath) driverLink;
     })
-
-    # Fix Requires in gstreamer-analytics-1.0.pc
-    # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8661
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/bc93bbf5c87ec994ea136bb40accc09dfa35ae98.patch";
-      stripLen = 2;
-      hash = "sha256-QQDpHe363iPxTuthITRbLUKaAXS2F9s5zfCn/ps14WE=";
-    })
   ];
 
   nativeBuildInputs =
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index e497f0c4ffc4..8fa76369f987 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -50,7 +50,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-base";
-  version = "1.26.0";
+  version = "1.26.3";
 
   outputs = [
     "out"
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${finalAttrs.version}.tar.xz";
-    hash = "sha256-4jGJ++0uxIZpA4LRBVwZ7q9arj6V4ldvxMiE2WqQ5p4=";
+    hash = "sha256-Tvn57wkCUwjOIg4t0iqJ5MmS2MpxuWjjxwrwY07CeTM=";
   };
 
   strictDeps = true;
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 8b8900058d28..3563dceaa4c8 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -40,7 +40,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gstreamer";
-  version = "1.26.0";
+  version = "1.26.3";
 
   outputs = [
     "bin"
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Gy7kAoAQwlt3bv+nw5bH4+GGG2C5QX5Bb0kUq83/J58=";
+    hash = "sha256-3GYWAyISk9zMdAhiQl61T7vtYPsp0IyAHUQKaj/4JoA=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix
index aaa3770b6257..27a46db683e2 100644
--- a/pkgs/development/libraries/gstreamer/devtools/default.nix
+++ b/pkgs/development/libraries/gstreamer/devtools/default.nix
@@ -28,7 +28,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-devtools";
-  version = "1.26.0";
+  version = "1.26.3";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${finalAttrs.version}.tar.xz";
-    hash = "sha256-7/M9fcKSuwdKJ4jqiHtigzmP/e+vpJ+30I7+ZlimVkg=";
+    hash = "sha256-T94Zw8FEg0+MsFwso/FLOlDTlbrSA9F/mKbnDBZy8ro=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
@@ -47,17 +47,10 @@ stdenv.mkDerivation (finalAttrs: {
       cargoRoot
       ;
     name = "gst-devtools-${finalAttrs.version}";
-    hash = "sha256-GLxevEwoTgS7kmDlul0AA2wIFRY7js8Ij4UIu1ZQf8I=";
+    hash = "sha256-AgxvFMq37a8NuOHY1QIUGOAo8aSBt4HVeSCHNUYa1tQ=";
   };
 
   patches = [
-    # Fix Requires in gstreamer-validate-1.0.pc
-    # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8661
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/13c0f44dd546cd058c39f32101a361b3a7746f73.patch";
-      stripLen = 2;
-      hash = "sha256-CpBFTmdn+VO6ZeNe6NZR6ELvakZqQdaF3o3G5TSDuUU=";
-    })
     # dots-viewer: sort static files
     # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9208
     (fetchpatch {
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 92baa4bd66f2..2c95568cdbf5 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-editing-services";
-  version = "1.26.0";
+  version = "1.26.3";
 
   outputs = [
     "out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-editing-services/gst-editing-services-${finalAttrs.version}.tar.xz";
-    hash = "sha256-r1sn9ck2MCc3IQDKwLrxkFUoBynfHMWN1ORU72mOsf8=";
+    hash = "sha256-3SCpPSw0aLahAk/wySeIayGTe9E7jLjxdfhjc2DRb9I=";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 7fa065408604..3a89a0910482 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -74,7 +74,7 @@ assert raspiCameraSupport -> hostSupportsRaspiCamera;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-good";
-  version = "1.26.0";
+  version = "1.26.3";
 
   outputs = [
     "out"
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${finalAttrs.version}.tar.xz";
-    hash = "sha256-nhjxOe9prQhnwt+7j+HRc2123xGqyD9g6NOtseLq8Ds=";
+    hash = "sha256-/k7JZw7f5rseXycWmuFFtawt0hismL2CUcj7pBrTPFM=";
   };
 
   patches = [
@@ -91,13 +91,6 @@ stdenv.mkDerivation (finalAttrs: {
     (replaceVars ./souploader.diff {
       nixLibSoup3Path = "${lib.getLib libsoup_3}/lib";
     })
-
-    (fetchpatch {
-      name = "musl.patch";
-      url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/dd1fc2b7931f5789815e17dda2ef7c31b9fba563.patch";
-      stripLen = 2;
-      hash = "sha256-m2h1F6M2hzw3HxizmCyEEqkUQe0ccLWFBvgT2f+GjNE=";
-    })
   ];
 
   strictDeps = true;
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 72dc282f70cc..53289e203709 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-libav";
-  version = "1.26.0";
+  version = "1.26.3";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${finalAttrs.version}.tar.xz";
-    hash = "sha256-cHqLaH/1/dzuWwJBXi7JtxtKxE0Leuw7R3Nkzuy/Hs8=";
+    hash = "sha256-Otp+UKO5uLo+QFsUxAIeJfuxA3n3fSzkkKoWUj7Sck0=";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index dade9cd11663..4bfbb8f791f8 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-rtsp-server";
-  version = "1.26.0";
+  version = "1.26.3";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-${finalAttrs.version}.tar.xz";
-    hash = "sha256-6YPAOUluP3XjlpZVTOdNtBIOJGXeF6ocw3FgVo6bQLw=";
+    hash = "sha256-QV6KU6mER4l3DdTxFqwuOkoz3kJnPFeswlxboPRAb8U=";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 0329460a6e8d..dc24d4f49c86 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -27,7 +27,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-ugly";
-  version = "1.26.0";
+  version = "1.26.3";
 
   outputs = [
     "out"
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${finalAttrs.version}.tar.xz";
-    hash = "sha256-qGtRyEVKgTEghIyANCHzJ9jAeqvK5GHgWXzEk5jA/N4=";
+    hash = "sha256-QX9e6JX3NKwDQbNxnBdf/xa0yOrogG4p4XCzvLPZ26U=";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index c717fa21e725..0a5269bcd43c 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -30,7 +30,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gstreamer-vaapi";
-  version = "1.26.0";
+  version = "1.26.3";
 
   outputs = [
     "out"
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Vzkx1FX1qW9j23yNNdUTIrjSh4FujGp32Ez7ufoTUfE=";
+    hash = "sha256-LWQ/vRQgKX2lpNaUXRHwpbT4L+6lTqauyTaNQpldiwM=";
   };
 
   nativeBuildInputs =

From 8ade39d224483dca15388378ea1d7c1f80f4d301 Mon Sep 17 00:00:00 2001
From: Daniel Cox <63171098+dan-kc@users.noreply.github.com>
Date: Sun, 29 Jun 2025 11:58:51 +0100
Subject: [PATCH 0035/3724] sunsama: init at 3.1.1

maintainers: add dan-kc

desc update
---
 maintainers/maintainer-list.nix     |  6 +++++
 pkgs/by-name/su/sunsama/package.nix | 34 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/su/sunsama/package.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 835ec2814e89..641dd64d5272 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5494,6 +5494,12 @@
     githubId = 217543;
     name = "Damien Cassou";
   };
+  dan-kc = {
+    email = "daniel@keone.dev";
+    github = "dan-kc";
+    githubId = 63171098;
+    name = "Daniel Cox";
+  };
   dan-theriault = {
     email = "nix@theriault.codes";
     github = "Dan-Theriault";
diff --git a/pkgs/by-name/su/sunsama/package.nix b/pkgs/by-name/su/sunsama/package.nix
new file mode 100644
index 000000000000..80d39304da36
--- /dev/null
+++ b/pkgs/by-name/su/sunsama/package.nix
@@ -0,0 +1,34 @@
+{
+  appimageTools,
+  lib,
+  fetchurl,
+}:
+
+let
+  version = "3.1.1";
+  pname = "sunsama";
+  src = fetchurl {
+    url = "https://download.todesktop.com/2003096gmmnl0g1/sunsama-${version}-build-250512vfxlcgvds-x86_64.AppImage";
+    sha512 = "VOzD/kWfsP2GR1uYkVUdjAuw9tlKjHRNxYuDSYYH7fn43Bk+wfgom/ofu3it/vQjjtuezkTN6gi96U87ypQrSA==";
+  };
+  appimageContents = appimageTools.extractType2 { inherit pname version src; };
+in
+
+appimageTools.wrapType2 {
+  inherit pname version src;
+  extraInstallCommands = ''
+    install -Dm444 ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
+    install -Dm444 ${appimageContents}/usr/share/icons/hicolor/512x512/apps/${pname}.png $out/share/pixmaps/${pname}.png
+    substituteInPlace $out/share/applications/${pname}.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=${pname}'
+  '';
+
+  meta = with lib; {
+    description = "The digital daily planner that helps you feel calm and stay focused.";
+    homepage = "https://sunsama.com";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ dan-kc ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "sunsama";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b20f87db9d05..7b6928681ce1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4474,6 +4474,8 @@ with pkgs;
 
   subzerod = with python3Packages; toPythonApplication subzerod;
 
+  sunsama = callPackage ../by-name/su/sunsama/package.nix { };
+
   system-config-printer = callPackage ../tools/misc/system-config-printer {
     autoreconfHook = buildPackages.autoreconfHook269;
     libxml2 = libxml2Python;

From e8b66b8e954fce2ba3b2040c51bae26fec696c0e Mon Sep 17 00:00:00 2001
From: Daniel Cox <63171098+dan-kc@users.noreply.github.com>
Date: Sun, 29 Jun 2025 19:50:06 +0100
Subject: [PATCH 0036/3724] remove unnecessary definition

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b6928681ce1..b20f87db9d05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4474,8 +4474,6 @@ with pkgs;
 
   subzerod = with python3Packages; toPythonApplication subzerod;
 
-  sunsama = callPackage ../by-name/su/sunsama/package.nix { };
-
   system-config-printer = callPackage ../tools/misc/system-config-printer {
     autoreconfHook = buildPackages.autoreconfHook269;
     libxml2 = libxml2Python;

From 4bca195d0d330c1f869459d42071d6ed68c33f17 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Mon, 30 Jun 2025 09:55:29 -0400
Subject: [PATCH 0037/3724] itk: 5.4.3 -> 5.4.4

---
 pkgs/development/libraries/itk/5.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/itk/5.x.nix b/pkgs/development/libraries/itk/5.x.nix
index c9a42bb9bf32..9c04fdf313d3 100644
--- a/pkgs/development/libraries/itk/5.x.nix
+++ b/pkgs/development/libraries/itk/5.x.nix
@@ -1,5 +1,5 @@
 import ./generic.nix rec {
-  version = "5.4.3";
+  version = "5.4.4";
   tag = "v${version}";
-  sourceSha256 = "sha256-Ve9AzgzePYb6mJ6OZ6C4YeiggCd4WBxB4Xu3ju5HhAg=";
+  sourceSha256 = "sha256-vHcMlWr/Dy5CnX165ihpCKNTVvw1eWncxzPho+73wB0=";
 }

From 4dd87a4c82517f9aab4304d5a8449a0523f4beac Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 30 Jun 2025 18:05:35 +0100
Subject: [PATCH 0038/3724] re2c: 4.2 -> 4.3

Changes: https://re2c.org/releases/release_notes.html#release-4-3
---
 pkgs/by-name/re/re2c/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/re2c/package.nix b/pkgs/by-name/re/re2c/package.nix
index 5442dd079c5a..e9d5c449ddd9 100644
--- a/pkgs/by-name/re/re2c/package.nix
+++ b/pkgs/by-name/re/re2c/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "re2c";
-  version = "4.2";
+  version = "4.3";
 
   src = fetchFromGitHub {
     owner = "skvadrik";
     repo = "re2c";
     rev = version;
-    hash = "sha256-7Niq+Xxq/r86qOeJl6/gNdH1XKm6m0fPhbPmgazZFkU=";
+    hash = "sha256-zPOENMfXXgTwds1t+Lrmz9+GTHJf2yRpQsGT7nLRvcg=";
   };
 
   nativeBuildInputs = [

From 5b19ed065f9c28ba530ae5a34479fae29292b86c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 1 Jul 2025 06:52:21 +0100
Subject: [PATCH 0039/3724] netpbm: 11.10.5 -> 11.11.0

---
 pkgs/by-name/ne/netpbm/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix
index 6be3ba013923..108859b01950 100644
--- a/pkgs/by-name/ne/netpbm/package.nix
+++ b/pkgs/by-name/ne/netpbm/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   # Determine version and revision from:
   # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
   pname = "netpbm";
-  version = "11.10.5";
+  version = "11.11.0";
 
   outputs = [
     "bin"
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
 
   src = fetchsvn {
     url = "https://svn.code.sf.net/p/netpbm/code/advanced";
-    rev = "5085";
-    sha256 = "sha256-04ObCW+xMvGOkhTwYAhVoBG1QIe0/DKfEYbSpDkEGCU=";
+    rev = "5101";
+    sha256 = "sha256-/oS+h4VujaNM7AnMq6e5/8A0cVZysJzFSGgJ4p01oJU=";
   };
 
   nativeBuildInputs = [

From 3eb8b879ace75d30c7bd5f4a73d98d2a004746c9 Mon Sep 17 00:00:00 2001
From: Melody Kelly <melody@melody.blue>
Date: Sun, 2 Mar 2025 19:46:53 +1000
Subject: [PATCH 0040/3724] opencv: use c++ 17 to fix protobuf support

fixes #386327

(cherry picked from commit fbced4e70d4663a5b5c7c317fe4dfe899c6b8d66)
---
 pkgs/development/libraries/opencv/4.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index d79a343a2c04..447bf2fd82ff 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -468,6 +468,7 @@ effectiveStdenv.mkDerivation {
       (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true)
       (cmakeBool "WITH_OPENMP" true)
       (cmakeBool "BUILD_PROTOBUF" false)
+      (cmakeFeature "CMAKE_CXX_STANDARD" "17") # required to enable protobuf
       (cmakeBool "WITH_PROTOBUF" true)
       (cmakeBool "PROTOBUF_UPDATE_FILES" true)
       (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree)

From a28e5146b95c06b7b21ddbc0444911912659c887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Thu, 12 Jun 2025 14:10:02 +0200
Subject: [PATCH 0041/3724] haskellPackages.yaml: build executables

This package doesn't build its executables (json2yaml, yaml2json) by default, see
https://github.com/snoyberg/yaml/issues/194.
---
 pkgs/development/haskell-modules/configuration-nix.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 795b769677a2..23de849cfeb3 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -842,6 +842,14 @@ builtins.intersectAttrs super {
     pkgs.z3
   ] super.crucible-llvm;
 
+  # yaml doesn't build its executables (json2yaml, yaml2json) by default:
+  # https://github.com/snoyberg/yaml/issues/194
+  yaml = lib.pipe super.yaml [
+    (disableCabalFlag "no-exe")
+    enableSeparateBinOutput
+    (addBuildDepend self.optparse-applicative)
+  ];
+
   # Compile manpages (which are in RST and are compiled with Sphinx).
   futhark =
     overrideCabal

From 2be51f4b68a601ae31ceb72a14540b40f07e0a53 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Thu, 3 Jul 2025 00:03:47 +0200
Subject: [PATCH 0042/3724] shaderc: 2025.2 -> 2025.3

Needed for fresh llama-cpp with Vulkan (including the version in Nixpkgs master)
---
 pkgs/development/compilers/shaderc/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix
index e7df901ed2dc..e651e50448eb 100644
--- a/pkgs/development/compilers/shaderc/default.nix
+++ b/pkgs/development/compilers/shaderc/default.nix
@@ -18,25 +18,27 @@ let
   glslang = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
-    rev = "15.3.0";
-    hash = "sha256-HwFP4KJuA+BMQVvBWV0BCRj9U5I3CLEU+5bBtde2f6w=";
+    # No corresponding tag for efd24d75bcbc55620e759f6bf42c45a32abac5f8 on 2025-06-23
+    rev = "efd24d75bcbc55620e759f6bf42c45a32abac5f8";
+    hash = "sha256-wMd1ylwDOM/uBbhpyMAduM9X7ao08TNq3HdoNGfSjcQ=";
   };
   spirv-tools = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Tools";
-    rev = "v2025.1";
-    hash = "sha256-2Wv0dxVQ8NvuDRTcsXkH1GKmuA6lsIuwTl0j6kbTefo=";
+    rev = "v2025.3.rc1";
+    hash = "sha256-yAdd/mXY8EJnE0vCu0n/aVxMH9059T/7cAdB9nP1vQQ=";
   };
   spirv-headers = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Headers";
-    rev = "vulkan-sdk-1.4.309.0";
-    hash = "sha256-Q1i6i5XimULuGufP6mimwDW674anAETUiIEvDQwvg5Y=";
+    # No corresponding tag for 2a611a970fdbc41ac2e3e328802aed9985352dca on 2025-06-19
+    rev = "2a611a970fdbc41ac2e3e328802aed9985352dca";
+    hash = "sha256-LRjMy9xtOErbJbMh+g2IKXfmo/hWpegZM72F8E122oY=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "shaderc";
-  version = "2025.2";
+  version = "2025.3";
 
   outputs = [
     "out"
@@ -50,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "google";
     repo = "shaderc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-u3gmH2lrkwBTZg9j4jInQceXK4MUWhKZPSPsN98mEkk=";
+    hash = "sha256-q5Z0wER8DbkmfT/MNrmnn9J9rzur2YjzAncaO1aRNXA=";
   };
 
   postPatch = ''

From dde790c12c7a590c4eb11f4f2d8f6b363d133f97 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 4 Jul 2025 06:37:18 +0100
Subject: [PATCH 0043/3724] mbedtls: 3.6.3 -> 3.6.4

Changes: https://github.com/Mbed-TLS/mbedtls/releases/tag/mbedtls-3.6.4
---
 pkgs/development/libraries/mbedtls/3.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix
index e8c3908174ac..1713280f2123 100644
--- a/pkgs/development/libraries/mbedtls/3.nix
+++ b/pkgs/development/libraries/mbedtls/3.nix
@@ -1,17 +1,6 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix {
-  version = "3.6.3";
-  hash = "sha256-FJuezgVTxzLRz0Jzk2XnSnpO5sTc8q6QgzkCwlqQ+EU=";
-  patches = [
-    # Fixes the build with GCC 14.
-    #
-    # See:
-    # * <https://github.com/openwrt/openwrt/pull/15479>
-    # * <https://github.com/Mbed-TLS/mbedtls/issues/9003>
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/openwrt/openwrt/52b6c9247997e51a97f13bb9e94749bc34e2d52e/package/libs/mbedtls/patches/100-fix-gcc14-build.patch";
-      hash = "sha256-20bxGoUHkrOEungN3SamYKNgj95pM8IjbisNRh68Wlw=";
-    })
-  ];
+  version = "3.6.4";
+  hash = "sha256-y5YqKtjW4IXyIZkoJvwCGC4scx0qdeV40rynHza4NUE=";
 }

From 27af57e54af18b21790b113e57462fdf405d0147 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 4 Jul 2025 09:49:05 +0300
Subject: [PATCH 0044/3724] python313Packages.scipy: use external system
 libraries as dependencies

Per https://github.com/scipy/scipy/pull/22893
---
 pkgs/development/python-modules/scipy/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index f08228330bc7..21e2cf810614 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -28,6 +28,8 @@
   pybind11,
   pooch,
   xsimd,
+  boost188,
+  qhull,
 
   # dependencies
   numpy,
@@ -131,6 +133,8 @@ buildPythonPackage {
     pybind11
     pooch
     xsimd
+    boost188
+    qhull
   ];
 
   dependencies = [ numpy ];
@@ -182,6 +186,7 @@ buildPythonPackage {
     # meson the proper cross compilation related arguments. See also:
     # https://docs.scipy.org/doc/scipy/building/cross_compilation.html
     "--cross-file=${crossFileScipy}"
+    "-Duse-system-libraries=all"
   ];
 
   # disable stackprotector on aarch64-darwin for now

From 5cfe11fa97c360f6bf4377c663dc6455845e73f6 Mon Sep 17 00:00:00 2001
From: Teo Camarasu <teofilcamarasu@gmail.com>
Date: Fri, 4 Jul 2025 19:11:19 +0100
Subject: [PATCH 0045/3724] haskell-modules/configuration-common: explicitly
 list amazonka packages

Rather than traversing the entire haskell package set, let's just explicitly list the amazonka packages. This should improve eval times somewhat, since the haskell package set is large, and hasPrefix is surprisingly expensive, as each call checks that the needle is not a path.
---
 .../haskell-modules/configuration-common.nix  | 349 +++++++++++++++++-
 1 file changed, 346 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 166490f2d4e4..b5ac661c8d9c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -3309,9 +3309,352 @@ with haskellLib;
         src = amazonkaSrc + "/${dir}";
       })
         drv;
-    isAmazonkaService =
-      name: lib.hasPrefix "amazonka-" name && name != "amazonka-test" && name != "amazonka-s3-streaming";
-    amazonkaServices = lib.filter isAmazonkaService (lib.attrNames super);
+    # To get the list of amazonka services run:
+    # > nix eval --impure --expr 'builtins.attrNames (import ./. {}).haskellPackages' --json | jq '.[]' | grep '^"amazonka'
+    # NB: we exclude amazonka-test and amazonka-s3-streaming
+    amazonkaServices = [
+      "amazonka"
+      "amazonka-accessanalyzer"
+      "amazonka-account"
+      "amazonka-alexa-business"
+      "amazonka-amp"
+      "amazonka-amplify"
+      "amazonka-amplifybackend"
+      "amazonka-amplifyuibuilder"
+      "amazonka-apigateway"
+      "amazonka-apigatewaymanagementapi"
+      "amazonka-apigatewayv2"
+      "amazonka-appconfig"
+      "amazonka-appconfigdata"
+      "amazonka-appflow"
+      "amazonka-appintegrations"
+      "amazonka-application-autoscaling"
+      "amazonka-application-insights"
+      "amazonka-applicationcostprofiler"
+      "amazonka-appmesh"
+      "amazonka-apprunner"
+      "amazonka-appstream"
+      "amazonka-appsync"
+      "amazonka-arc-zonal-shift"
+      "amazonka-athena"
+      "amazonka-auditmanager"
+      "amazonka-autoscaling"
+      "amazonka-autoscaling-plans"
+      "amazonka-backup"
+      "amazonka-backup-gateway"
+      "amazonka-backupstorage"
+      "amazonka-batch"
+      "amazonka-billingconductor"
+      "amazonka-braket"
+      "amazonka-budgets"
+      "amazonka-certificatemanager"
+      "amazonka-certificatemanager-pca"
+      "amazonka-chime"
+      "amazonka-chime-sdk-identity"
+      "amazonka-chime-sdk-media-pipelines"
+      "amazonka-chime-sdk-meetings"
+      "amazonka-chime-sdk-messaging"
+      "amazonka-chime-sdk-voice"
+      "amazonka-cloud9"
+      "amazonka-cloudcontrol"
+      "amazonka-clouddirectory"
+      "amazonka-cloudformation"
+      "amazonka-cloudfront"
+      "amazonka-cloudhsm"
+      "amazonka-cloudhsmv2"
+      "amazonka-cloudsearch"
+      "amazonka-cloudsearch-domains"
+      "amazonka-cloudtrail"
+      "amazonka-cloudwatch"
+      "amazonka-cloudwatch-events"
+      "amazonka-cloudwatch-logs"
+      "amazonka-codeartifact"
+      "amazonka-codebuild"
+      "amazonka-codecommit"
+      "amazonka-codedeploy"
+      "amazonka-codeguru-reviewer"
+      "amazonka-codeguruprofiler"
+      "amazonka-codepipeline"
+      "amazonka-codestar"
+      "amazonka-codestar-connections"
+      "amazonka-codestar-notifications"
+      "amazonka-cognito-identity"
+      "amazonka-cognito-idp"
+      "amazonka-cognito-sync"
+      "amazonka-comprehend"
+      "amazonka-comprehendmedical"
+      "amazonka-compute-optimizer"
+      "amazonka-config"
+      "amazonka-connect"
+      "amazonka-connect-contact-lens"
+      "amazonka-connectcampaigns"
+      "amazonka-connectcases"
+      "amazonka-connectparticipant"
+      "amazonka-contrib-rds-utils"
+      "amazonka-controltower"
+      "amazonka-core"
+      "amazonka-cost-explorer"
+      "amazonka-cur"
+      "amazonka-customer-profiles"
+      "amazonka-databrew"
+      "amazonka-dataexchange"
+      "amazonka-datapipeline"
+      "amazonka-datasync"
+      "amazonka-detective"
+      "amazonka-devicefarm"
+      "amazonka-devops-guru"
+      "amazonka-directconnect"
+      "amazonka-discovery"
+      "amazonka-dlm"
+      "amazonka-dms"
+      "amazonka-docdb"
+      "amazonka-docdb-elastic"
+      "amazonka-drs"
+      "amazonka-ds"
+      "amazonka-dynamodb"
+      "amazonka-dynamodb-dax"
+      "amazonka-dynamodb-streams"
+      "amazonka-ebs"
+      "amazonka-ec2"
+      "amazonka-ec2-instance-connect"
+      "amazonka-ecr"
+      "amazonka-ecr-public"
+      "amazonka-ecs"
+      "amazonka-efs"
+      "amazonka-eks"
+      "amazonka-elastic-inference"
+      "amazonka-elasticache"
+      "amazonka-elasticbeanstalk"
+      "amazonka-elasticsearch"
+      "amazonka-elastictranscoder"
+      "amazonka-elb"
+      "amazonka-elbv2"
+      "amazonka-emr"
+      "amazonka-emr-containers"
+      "amazonka-emr-serverless"
+      "amazonka-evidently"
+      "amazonka-finspace"
+      "amazonka-finspace-data"
+      "amazonka-fis"
+      "amazonka-fms"
+      "amazonka-forecast"
+      "amazonka-forecastquery"
+      "amazonka-frauddetector"
+      "amazonka-fsx"
+      "amazonka-gamelift"
+      "amazonka-gamesparks"
+      "amazonka-glacier"
+      "amazonka-globalaccelerator"
+      "amazonka-glue"
+      "amazonka-grafana"
+      "amazonka-greengrass"
+      "amazonka-greengrassv2"
+      "amazonka-groundstation"
+      "amazonka-guardduty"
+      "amazonka-health"
+      "amazonka-healthlake"
+      "amazonka-honeycode"
+      "amazonka-iam"
+      "amazonka-iam-policy"
+      "amazonka-identitystore"
+      "amazonka-imagebuilder"
+      "amazonka-importexport"
+      "amazonka-inspector"
+      "amazonka-inspector2"
+      "amazonka-iot"
+      "amazonka-iot-analytics"
+      "amazonka-iot-dataplane"
+      "amazonka-iot-jobs-dataplane"
+      "amazonka-iot-roborunner"
+      "amazonka-iot1click-devices"
+      "amazonka-iot1click-projects"
+      "amazonka-iotdeviceadvisor"
+      "amazonka-iotevents"
+      "amazonka-iotevents-data"
+      "amazonka-iotfleethub"
+      "amazonka-iotfleetwise"
+      "amazonka-iotsecuretunneling"
+      "amazonka-iotsitewise"
+      "amazonka-iotthingsgraph"
+      "amazonka-iottwinmaker"
+      "amazonka-iotwireless"
+      "amazonka-ivs"
+      "amazonka-ivschat"
+      "amazonka-kafka"
+      "amazonka-kafkaconnect"
+      "amazonka-kendra"
+      "amazonka-keyspaces"
+      "amazonka-kinesis"
+      "amazonka-kinesis-analytics"
+      "amazonka-kinesis-firehose"
+      "amazonka-kinesis-video"
+      "amazonka-kinesis-video-archived-media"
+      "amazonka-kinesis-video-media"
+      "amazonka-kinesis-video-signaling"
+      "amazonka-kinesis-video-webrtc-storage"
+      "amazonka-kinesisanalyticsv2"
+      "amazonka-kms"
+      "amazonka-lakeformation"
+      "amazonka-lambda"
+      "amazonka-lex-models"
+      "amazonka-lex-runtime"
+      "amazonka-lexv2-models"
+      "amazonka-license-manager"
+      "amazonka-license-manager-linux-subscriptions"
+      "amazonka-license-manager-user-subscriptions"
+      "amazonka-lightsail"
+      "amazonka-location"
+      "amazonka-lookoutequipment"
+      "amazonka-lookoutmetrics"
+      "amazonka-lookoutvision"
+      "amazonka-m2"
+      "amazonka-macie"
+      "amazonka-maciev2"
+      "amazonka-managedblockchain"
+      "amazonka-marketplace-analytics"
+      "amazonka-marketplace-catalog"
+      "amazonka-marketplace-entitlement"
+      "amazonka-marketplace-metering"
+      "amazonka-mechanicalturk"
+      "amazonka-mediaconnect"
+      "amazonka-mediaconvert"
+      "amazonka-medialive"
+      "amazonka-mediapackage"
+      "amazonka-mediapackage-vod"
+      "amazonka-mediastore"
+      "amazonka-mediastore-dataplane"
+      "amazonka-mediatailor"
+      "amazonka-memorydb"
+      "amazonka-mgn"
+      "amazonka-migration-hub-refactor-spaces"
+      "amazonka-migrationhub"
+      "amazonka-migrationhub-config"
+      "amazonka-migrationhuborchestrator"
+      "amazonka-migrationhubstrategy"
+      "amazonka-ml"
+      "amazonka-mobile"
+      "amazonka-mq"
+      "amazonka-mtl"
+      "amazonka-mwaa"
+      "amazonka-neptune"
+      "amazonka-network-firewall"
+      "amazonka-networkmanager"
+      "amazonka-nimble"
+      "amazonka-oam"
+      "amazonka-omics"
+      "amazonka-opensearch"
+      "amazonka-opensearchserverless"
+      "amazonka-opsworks"
+      "amazonka-opsworks-cm"
+      "amazonka-organizations"
+      "amazonka-outposts"
+      "amazonka-panorama"
+      "amazonka-personalize"
+      "amazonka-personalize-events"
+      "amazonka-personalize-runtime"
+      "amazonka-pi"
+      "amazonka-pinpoint"
+      "amazonka-pinpoint-email"
+      "amazonka-pinpoint-sms-voice"
+      "amazonka-pinpoint-sms-voice-v2"
+      "amazonka-pipes"
+      "amazonka-polly"
+      "amazonka-pricing"
+      "amazonka-privatenetworks"
+      "amazonka-proton"
+      "amazonka-qldb"
+      "amazonka-qldb-session"
+      "amazonka-quicksight"
+      "amazonka-ram"
+      "amazonka-rbin"
+      "amazonka-rds"
+      "amazonka-rds-data"
+      "amazonka-redshift"
+      "amazonka-redshift-data"
+      "amazonka-redshift-serverless"
+      "amazonka-rekognition"
+      "amazonka-resiliencehub"
+      "amazonka-resource-explorer-v2"
+      "amazonka-resourcegroups"
+      "amazonka-resourcegroupstagging"
+      "amazonka-robomaker"
+      "amazonka-rolesanywhere"
+      "amazonka-route53"
+      "amazonka-route53-autonaming"
+      "amazonka-route53-domains"
+      "amazonka-route53-recovery-cluster"
+      "amazonka-route53-recovery-control-config"
+      "amazonka-route53-recovery-readiness"
+      "amazonka-route53resolver"
+      "amazonka-rum"
+      "amazonka-s3"
+      "amazonka-s3-encryption"
+      #"amazonka-s3-streaming"
+      "amazonka-s3outposts"
+      "amazonka-sagemaker"
+      "amazonka-sagemaker-a2i-runtime"
+      "amazonka-sagemaker-edge"
+      "amazonka-sagemaker-featurestore-runtime"
+      "amazonka-sagemaker-geospatial"
+      "amazonka-sagemaker-metrics"
+      "amazonka-sagemaker-runtime"
+      "amazonka-savingsplans"
+      "amazonka-scheduler"
+      "amazonka-schemas"
+      "amazonka-sdb"
+      "amazonka-secretsmanager"
+      "amazonka-securityhub"
+      "amazonka-securitylake"
+      "amazonka-serverlessrepo"
+      "amazonka-service-quotas"
+      "amazonka-servicecatalog"
+      "amazonka-servicecatalog-appregistry"
+      "amazonka-ses"
+      "amazonka-sesv2"
+      "amazonka-shield"
+      "amazonka-signer"
+      "amazonka-simspaceweaver"
+      "amazonka-sms"
+      "amazonka-sms-voice"
+      "amazonka-snow-device-management"
+      "amazonka-snowball"
+      "amazonka-sns"
+      "amazonka-sqs"
+      "amazonka-ssm"
+      "amazonka-ssm-contacts"
+      "amazonka-ssm-incidents"
+      "amazonka-ssm-sap"
+      "amazonka-sso"
+      "amazonka-sso-admin"
+      "amazonka-sso-oidc"
+      "amazonka-stepfunctions"
+      "amazonka-storagegateway"
+      "amazonka-sts"
+      "amazonka-support"
+      "amazonka-support-app"
+      "amazonka-swf"
+      "amazonka-synthetics"
+      #"amazonka-test"
+      "amazonka-textract"
+      "amazonka-timestream-query"
+      "amazonka-timestream-write"
+      "amazonka-transcribe"
+      "amazonka-transfer"
+      "amazonka-translate"
+      "amazonka-voice-id"
+      "amazonka-waf"
+      "amazonka-waf-regional"
+      "amazonka-wafv2"
+      "amazonka-wellarchitected"
+      "amazonka-wisdom"
+      "amazonka-workdocs"
+      "amazonka-worklink"
+      "amazonka-workmail"
+      "amazonka-workmailmessageflow"
+      "amazonka-workspaces"
+      "amazonka-workspaces-web"
+      "amazonka-xray"
+    ];
     amazonkaServiceOverrides = (
       lib.genAttrs amazonkaServices (
         name:

From 49c98157764ad8543702e0ea80d39751a8db74f9 Mon Sep 17 00:00:00 2001
From: Daniel Cox <63171098+dan-kc@users.noreply.github.com>
Date: Sat, 5 Jul 2025 09:29:30 +0100
Subject: [PATCH 0046/3724] refactor

---
 pkgs/by-name/su/sunsama/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/su/sunsama/package.nix b/pkgs/by-name/su/sunsama/package.nix
index 80d39304da36..cb4696735d07 100644
--- a/pkgs/by-name/su/sunsama/package.nix
+++ b/pkgs/by-name/su/sunsama/package.nix
@@ -9,7 +9,7 @@ let
   pname = "sunsama";
   src = fetchurl {
     url = "https://download.todesktop.com/2003096gmmnl0g1/sunsama-${version}-build-250512vfxlcgvds-x86_64.AppImage";
-    sha512 = "VOzD/kWfsP2GR1uYkVUdjAuw9tlKjHRNxYuDSYYH7fn43Bk+wfgom/ofu3it/vQjjtuezkTN6gi96U87ypQrSA==";
+    hash = "sha512-VOzD/kWfsP2GR1uYkVUdjAuw9tlKjHRNxYuDSYYH7fn43Bk+wfgom/ofu3it/vQjjtuezkTN6gi96U87ypQrSA==";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in
@@ -17,17 +17,17 @@ in
 appimageTools.wrapType2 {
   inherit pname version src;
   extraInstallCommands = ''
-    install -Dm444 ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
-    install -Dm444 ${appimageContents}/usr/share/icons/hicolor/512x512/apps/${pname}.png $out/share/pixmaps/${pname}.png
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace-fail 'Exec=AppRun' 'Exec=${pname}'
+    install -Dm444 ${appimageContents}/sunsama.desktop $out/share/applications/sunsama.desktop
+    install -Dm444 ${appimageContents}/usr/share/icons/hicolor/512x512/apps/sunsama.png $out/share/pixmaps/sunsama.png
+    substituteInPlace $out/share/applications/sunsama.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=sunsama'
   '';
 
-  meta = with lib; {
-    description = "The digital daily planner that helps you feel calm and stay focused.";
+  meta = {
+    description = "Digital daily planner that helps you feel calm and stay focused";
     homepage = "https://sunsama.com";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ dan-kc ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ dan-kc ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "sunsama";
   };

From 2bf668936b19fdd1986d837c787b00eca790e210 Mon Sep 17 00:00:00 2001
From: Daniel Cox <63171098+dan-kc@users.noreply.github.com>
Date: Sat, 5 Jul 2025 10:55:34 +0100
Subject: [PATCH 0047/3724] align with freedesktop.org spec

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

diff --git a/pkgs/by-name/su/sunsama/package.nix b/pkgs/by-name/su/sunsama/package.nix
index cb4696735d07..07b202838360 100644
--- a/pkgs/by-name/su/sunsama/package.nix
+++ b/pkgs/by-name/su/sunsama/package.nix
@@ -18,7 +18,7 @@ appimageTools.wrapType2 {
   inherit pname version src;
   extraInstallCommands = ''
     install -Dm444 ${appimageContents}/sunsama.desktop $out/share/applications/sunsama.desktop
-    install -Dm444 ${appimageContents}/usr/share/icons/hicolor/512x512/apps/sunsama.png $out/share/pixmaps/sunsama.png
+    install -Dm444 {${appimageContents}/usr,$out}/share/icons/hicolor/512x512/apps/sunsama.png
     substituteInPlace $out/share/applications/sunsama.desktop \
       --replace-fail 'Exec=AppRun' 'Exec=sunsama'
   '';

From 802afd0c794d8a59eb2f5665f07f06aaf4cd04ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 22:29:03 +0000
Subject: [PATCH 0048/3724] gupnp_1_6: 1.6.8 -> 1.6.9

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

diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix
index 408305542cf5..0aeca4241ccc 100644
--- a/pkgs/development/libraries/gupnp/1.6.nix
+++ b/pkgs/development/libraries/gupnp/1.6.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gupnp";
-  version = "1.6.8";
+  version = "1.6.9";
 
   outputs = [
     "out"
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor finalAttrs.version}/gupnp-${finalAttrs.version}.tar.xz";
-    hash = "sha256-cKADzr1oV3KT+z5q9J/5AiA7+HaLL8XWUd3B8PoeEek=";
+    hash = "sha256-Lttu42E1WOYvU4c1NoruJxUbfgnU4uLFFgaDPagBhps=";
   };
 
   depsBuildBuild = [

From 44b4054d6f18a846f93719c10e60aea38070b700 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Jul 2025 11:08:51 +0000
Subject: [PATCH 0049/3724] re2: 2024-07-02 -> 2025-06-26b

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

diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix
index 8781413e48ba..dbc55c717d1b 100644
--- a/pkgs/by-name/re/re2/package.nix
+++ b/pkgs/by-name/re/re2/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "re2";
-  version = "2024-07-02";
+  version = "2025-06-26b";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "re2";
     rev = finalAttrs.version;
-    hash = "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=";
+    hash = "sha256-thON6Xdt2ihXqgj1qIyHYvoQWkBjvbswytCuSqH0LM0=";
   };
 
   outputs = [

From b57280ab08f2639b202315f89ce581052415fdbc Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <serenity@kaction.cc>
Date: Wed, 25 Jun 2025 20:00:00 -0400
Subject: [PATCH 0050/3724] pkg-config: Fix build with gcc-15

---
 .../pk/pkg-config-unwrapped/gcc-15.patch      | 35 +++++++++++++++++++
 .../pk/pkg-config-unwrapped/package.nix       |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/pk/pkg-config-unwrapped/gcc-15.patch

diff --git a/pkgs/by-name/pk/pkg-config-unwrapped/gcc-15.patch b/pkgs/by-name/pk/pkg-config-unwrapped/gcc-15.patch
new file mode 100644
index 000000000000..b210395ef113
--- /dev/null
+++ b/pkgs/by-name/pk/pkg-config-unwrapped/gcc-15.patch
@@ -0,0 +1,35 @@
+From 4444e3e5b7130c1664d7617e079e776ac0437661 Mon Sep 17 00:00:00 2001
+From: Dmitry Bogatov <serenity@kaction.cc>
+Date: Thu, 26 Jun 2025 00:26:31 +0000
+Subject: [PATCH] Avoid using "bool" as identifier (was made a keyword in
+ gcc-15)
+
+---
+ glib/glib/goption.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glib/glib/goption.c b/glib/glib/goption.c
+index 0a22f6f..bdd8837 100644
+--- a/glib/glib/goption.c
++++ b/glib/glib/goption.c
+@@ -166,7 +166,7 @@ typedef struct
+   gpointer arg_data;
+   union
+   {
+-    gboolean bool;
++    gboolean bool_value;
+     gint integer;
+     gchar *str;
+     gchar **array;
+@@ -1600,7 +1600,7 @@ free_changes_list (GOptionContext *context,
+           switch (change->arg_type)
+             {
+             case G_OPTION_ARG_NONE:
+-              *(gboolean *)change->arg_data = change->prev.bool;
++              *(gboolean *)change->arg_data = change->prev.bool_value;
+               break;
+             case G_OPTION_ARG_INT:
+               *(gint *)change->arg_data = change->prev.integer;
+-- 
+2.47.2
+
diff --git a/pkgs/by-name/pk/pkg-config-unwrapped/package.nix b/pkgs/by-name/pk/pkg-config-unwrapped/package.nix
index bcd386b134b4..c11b6cbbf0aa 100644
--- a/pkgs/by-name/pk/pkg-config-unwrapped/package.nix
+++ b/pkgs/by-name/pk/pkg-config-unwrapped/package.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
   # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to
   # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28
   patches =
-    lib.optional (!vanilla) ./requires-private.patch
+    [ ./gcc-15.patch ]
+    ++ lib.optional (!vanilla) ./requires-private.patch
     ++ lib.optional stdenv.hostPlatform.isCygwin ./2.36.3-not-win32.patch;
 
   # These three tests fail due to a (desired) behavior change from our ./requires-private.patch

From b3daf8c3a5d916b5ee2c94cfefe57ab7ddfe750b Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 7 Jul 2025 01:10:55 +0000
Subject: [PATCH 0051/3724] nodejs: split destCPU into stdenv.$platform.node

this architecture mapping is used broadly in the node ecosystem.
an assortment of tools and hooks, like buildNpmPackage or
pnpm.configHook, will benefit from reusing these values. placing them in
stdenv makes sense because (1) several of these tools don't currently
depend on nodejs, and may even be available where nodejs is not and (2)
`stdenv.{build,host,target}Platform` seems to be less error-prone than
`pkgs*.nodejs.{os,arch}` -- especially for setup hooks where the offsets
are shifted.
---
 lib/systems/default.nix                | 45 ++++++++++++++++++++++++++
 pkgs/development/web/nodejs/nodejs.nix | 26 +--------------
 2 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 6f5be39d29ac..2de5b6a858be 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -562,6 +562,51 @@ let
             # See https://go.dev/wiki/GoArm
             GOARM = toString (lib.intersectLists [ (final.parsed.cpu.version or "") ] [ "5" "6" "7" ]);
           };
+
+          node = {
+            # See these locations for a list of known architectures/platforms:
+            # - https://nodejs.org/api/os.html#osarch
+            # - https://nodejs.org/api/os.html#osplatform
+            arch =
+              if final.isAarch then
+                "arm" + lib.optionalString final.is64bit "64"
+              else if final.isMips32 then
+                "mips" + lib.optionalString final.isLittleEndian "el"
+              else if final.isMips64 && final.isLittleEndian then
+                "mips64el"
+              else if final.isPower then
+                "ppc" + lib.optionalString final.is64bit "64"
+              else if final.isx86_64 then
+                "x64"
+              else if final.isx86_32 then
+                "ia32"
+              else if final.isS390x then
+                "s390x"
+              else if final.isRiscV64 then
+                "riscv64"
+              else if final.isLoongArch64 then
+                "loong64"
+              else
+                null;
+
+            platform =
+              if final.isAndroid then
+                "android"
+              else if final.isDarwin then
+                "darwin"
+              else if final.isFreeBSD then
+                "freebsd"
+              else if final.isLinux then
+                "linux"
+              else if final.isOpenBSD then
+                "openbsd"
+              else if final.isSunOS then
+                "sunos"
+              else if final.isWindows then
+                "win32"
+              else
+                null;
+          };
         };
     in
     assert final.useAndroidPrebuilt -> final.isAndroid;
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 873a333e5f38..4c552a30fc31 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -70,30 +70,6 @@ let
       "freebsd"
     else
       throw "unsupported os ${platform.uname.system}";
-  destCPU =
-    let
-      platform = stdenv.hostPlatform;
-    in
-    if platform.isAarch then
-      "arm" + lib.optionalString platform.is64bit "64"
-    else if platform.isMips32 then
-      "mips" + lib.optionalString platform.isLittleEndian "le"
-    else if platform.isMips64 && platform.isLittleEndian then
-      "mips64el"
-    else if platform.isPower then
-      "ppc" + lib.optionalString platform.is64bit "64"
-    else if platform.isx86_64 then
-      "x64"
-    else if platform.isx86_32 then
-      "ia32"
-    else if platform.isS390x then
-      "s390x"
-    else if platform.isRiscV64 then
-      "riscv64"
-    else if platform.isLoongArch64 then
-      "loong64"
-    else
-      throw "unsupported cpu ${platform.uname.processor}";
   destARMFPU =
     let
       platform = stdenv.hostPlatform;
@@ -258,7 +234,7 @@ let
           # --cross-compiling flag enables use of CC_host et. al
           (if canExecute || canEmulate then "--no-cross-compiling" else "--cross-compiling")
           "--dest-os=${destOS}"
-          "--dest-cpu=${destCPU}"
+          "--dest-cpu=${stdenv.hostPlatform.node.arch}"
         ]
         ++ lib.optionals (destARMFPU != null) [ "--with-arm-fpu=${destARMFPU}" ]
         ++ lib.optionals (destARMFloatABI != null) [ "--with-arm-float-abi=${destARMFloatABI}" ]

From 8199f6b551b5a9dfda627ee15887c3a25bd40fed Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 7 Jul 2025 01:25:46 +0000
Subject: [PATCH 0052/3724] treewide: replace node platform mapping with
 stdenv.hostPlatform.node.{arch,platform}

---
 pkgs/build-support/node/build-npm-package/default.nix |  9 ++-------
 pkgs/by-name/af/affine-bin/package.nix                | 10 ++--------
 pkgs/by-name/af/affine/package.nix                    | 10 ++--------
 pkgs/by-name/el/element-desktop/keytar/default.nix    | 11 +----------
 4 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix
index 69181aee399c..fb57c0cfd0b9 100644
--- a/pkgs/build-support/node/build-npm-package/default.nix
+++ b/pkgs/build-support/node/build-npm-package/default.nix
@@ -104,13 +104,8 @@ lib.extendMkDerivation {
       dontStrip = args.dontStrip or true;
 
       env = {
-        npm_config_arch =
-          {
-            "x86_64" = "x64";
-            "aarch64" = "arm64";
-          }
-          .${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name;
-        npm_config_platform = stdenv.hostPlatform.parsed.kernel.name;
+        npm_config_arch = stdenv.hostPlatform.node.arch;
+        npm_config_platform = stdenv.hostPlatform.node.platform;
       } // (args.env or { });
 
       meta = (args.meta or { }) // {
diff --git a/pkgs/by-name/af/affine-bin/package.nix b/pkgs/by-name/af/affine-bin/package.nix
index b576208ee505..65e73398f3d9 100644
--- a/pkgs/by-name/af/affine-bin/package.nix
+++ b/pkgs/by-name/af/affine-bin/package.nix
@@ -13,14 +13,8 @@
 }:
 let
   hostPlatform = stdenvNoCC.hostPlatform;
-  nodePlatform = hostPlatform.parsed.kernel.name; # nodejs's `process.platform`
-  nodeArch = # nodejs's `process.arch`
-    {
-      "x86_64" = "x64";
-      "aarch64" = "arm64";
-    }
-    .${hostPlatform.parsed.cpu.name}
-      or (throw "affine-bin(${buildType}): unsupported CPU family ${hostPlatform.parsed.cpu.name}");
+  nodePlatform = hostPlatform.node.platform;
+  nodeArch = hostPlatform.node.arch;
 in
 stdenvNoCC.mkDerivation (
   finalAttrs:
diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix
index 51045670eb1f..13ddac4f899c 100644
--- a/pkgs/by-name/af/affine/package.nix
+++ b/pkgs/by-name/af/affine/package.nix
@@ -26,14 +26,8 @@
 }:
 let
   hostPlatform = stdenvNoCC.hostPlatform;
-  nodePlatform = hostPlatform.parsed.kernel.name; # nodejs's `process.platform`
-  nodeArch = # nodejs's `process.arch`
-    {
-      "x86_64" = "x64";
-      "aarch64" = "arm64";
-    }
-    .${hostPlatform.parsed.cpu.name}
-      or (throw "affine(${buildType}): unsupported CPU family ${hostPlatform.parsed.cpu.name}");
+  nodePlatform = hostPlatform.node.platform;
+  nodeArch = hostPlatform.node.arch;
   electron = electron_35;
   nodejs = nodejs_22;
   yarn-berry = yarn-berry_4.override { inherit nodejs; };
diff --git a/pkgs/by-name/el/element-desktop/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix
index 56a49eef1459..2c2fdf78aa1e 100644
--- a/pkgs/by-name/el/element-desktop/keytar/default.nix
+++ b/pkgs/by-name/el/element-desktop/keytar/default.nix
@@ -52,16 +52,7 @@ stdenv.mkDerivation rec {
     # Make sure the native modules are built against electron's ABI
     "--nodedir=${electron.headers}"
     # https://nodejs.org/api/os.html#osarch
-    "--arch=${
-      if stdenv.hostPlatform.parsed.cpu.name == "i686" then
-        "ia32"
-      else if stdenv.hostPlatform.parsed.cpu.name == "x86_64" then
-        "x64"
-      else if stdenv.hostPlatform.parsed.cpu.name == "aarch64" then
-        "arm64"
-      else
-        stdenv.hostPlatform.parsed.cpu.name
-    }"
+    "--arch=${stdenv.hostPlatform.node.arch}"
   ];
 
   installPhase = ''

From faeab3c841ec25e2453297038ffe137868f73c10 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 6 Jul 2025 08:40:29 +0000
Subject: [PATCH 0053/3724] buildNpmPackage: push npm_config_* options into
 npmHooks.npmConfigHook

these options affect npm generally, and aren't specific to our
`buildNpmPackage`. pushing these options into the `npmConfigHook` (which
is used by `buildNpmPackage`, among others) makes them available to more
packages, especially to enable cross compilation.
---
 pkgs/build-support/node/build-npm-package/default.nix        | 5 -----
 pkgs/build-support/node/build-npm-package/hooks/default.nix  | 3 +++
 .../node/build-npm-package/hooks/npm-config-hook.sh          | 2 ++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix
index fb57c0cfd0b9..747043e3d12a 100644
--- a/pkgs/build-support/node/build-npm-package/default.nix
+++ b/pkgs/build-support/node/build-npm-package/default.nix
@@ -103,11 +103,6 @@ lib.extendMkDerivation {
       # Stripping takes way too long with the amount of files required by a typical Node.js project.
       dontStrip = args.dontStrip or true;
 
-      env = {
-        npm_config_arch = stdenv.hostPlatform.node.arch;
-        npm_config_platform = stdenv.hostPlatform.node.platform;
-      } // (args.env or { });
-
       meta = (args.meta or { }) // {
         platforms = args.meta.platforms or nodejs.meta.platforms;
       };
diff --git a/pkgs/build-support/node/build-npm-package/hooks/default.nix b/pkgs/build-support/node/build-npm-package/hooks/default.nix
index 54c9fd2a561b..a28b0fbaa379 100644
--- a/pkgs/build-support/node/build-npm-package/hooks/default.nix
+++ b/pkgs/build-support/node/build-npm-package/hooks/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   srcOnly,
+  stdenv,
   makeSetupHook,
   makeWrapper,
   nodejs,
@@ -18,6 +19,8 @@
     substitutions = {
       nodeSrc = srcOnly nodejs;
       nodeGyp = "${nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js";
+      npmArch = stdenv.targetPlatform.node.arch;
+      npmPlatform = stdenv.targetPlatform.node.platform;
 
       # Specify `diff`, `jq`, and `prefetch-npm-deps` by abspath to ensure that the user's build
       # inputs do not cause us to find the wrong binaries.
diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh
index 6a301e715ef8..7fabd80eec1f 100644
--- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh
+++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh
@@ -16,6 +16,8 @@ npmConfigHook() {
     export HOME="$TMPDIR"
     export npm_config_nodedir="@nodeSrc@"
     export npm_config_node_gyp="@nodeGyp@"
+    export npm_config_arch="@npmArch@"
+    export npm_config_platform="@npmPlatform@"
 
     if [ -z "${npmDeps-}" ]; then
         echo

From bea64a7d3fbf566d5a41777ab6ec741539b3777a Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 6 Jul 2025 09:30:13 +0000
Subject: [PATCH 0054/3724] pnpm.configHook: set npm_config_{arch,platform}

pnpm uses the same `npm_config_*` naming as npm.

this fixes cross compilation for at least the following packages:

- jellyseerr
- karakeep
---
 pkgs/development/tools/pnpm/fetch-deps/default.nix         | 4 ++++
 pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix
index 8e26d173fd90..f006a079ac05 100644
--- a/pkgs/development/tools/pnpm/fetch-deps/default.nix
+++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix
@@ -130,5 +130,9 @@ in
   configHook = makeSetupHook {
     name = "pnpm-config-hook";
     propagatedBuildInputs = [ pnpm ];
+    substitutions = {
+      npmArch = stdenvNoCC.targetPlatform.node.arch;
+      npmPlatform = stdenvNoCC.targetPlatform.node.platform;
+    };
   } ./pnpm-config-hook.sh;
 }
diff --git a/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh b/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh
index f66f06c0a867..5e3c05b4c377 100644
--- a/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh
+++ b/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh
@@ -16,6 +16,8 @@ pnpmConfigHook() {
 
     export HOME=$(mktemp -d)
     export STORE_PATH=$(mktemp -d)
+    export npm_config_arch="@npmArch@"
+    export npm_config_platform="@npmPlatform@"
 
     cp -Tr "$pnpmDeps" "$STORE_PATH"
     chmod -R +w "$STORE_PATH"

From 378a7699696f2931f01ba88c41cb74e00cfe69df Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Wed, 2 Jul 2025 09:47:35 +0200
Subject: [PATCH 0055/3724] haskellPackages.cabal2nix-unstable: move overrides
 into config*-nix

---
 .../haskell-modules/configuration-common.nix  | 29 -------------------
 .../haskell-modules/configuration-nix.nix     | 27 +++++++++++++++++
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 166490f2d4e4..c8bb9c200ade 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2098,35 +2098,6 @@ with haskellLib;
   # https://github.com/obsidiansystems/database-id/issues/1
   database-id-class = doJailbreak super.database-id-class;
 
-  cabal2nix-unstable = overrideCabal {
-    passthru = {
-      updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh;
-
-      # This is used by regenerate-hackage-packages.nix to supply the configuration
-      # values we can easily generate automatically without checking them in.
-      compilerConfig =
-        pkgs.runCommand "hackage2nix-${self.ghc.haskellCompilerName}-config.yaml"
-          {
-            nativeBuildInputs = [
-              self.ghc
-            ];
-          }
-          ''
-            cat > "$out" << EOF
-            # generated by haskellPackages.cabal2nix-unstable.compilerConfig
-            compiler: ${self.ghc.haskellCompilerName}
-
-            core-packages:
-            EOF
-
-            ghc-pkg list \
-              | tail -n '+2' \
-              | sed -e 's/[()]//g' -e 's/\s\+/  - /' \
-              >> "$out"
-          '';
-    };
-  } super.cabal2nix-unstable;
-
   # Too strict version bounds on base
   # https://github.com/gibiansky/IHaskell/issues/1217
   ihaskell-display = doJailbreak super.ihaskell-display;
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 23de849cfeb3..7c4886c96ce4 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1261,6 +1261,33 @@ builtins.intersectAttrs super {
           ]
         }"
     '';
+
+    passthru = {
+      updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh;
+
+      # This is used by regenerate-hackage-packages.nix to supply the configuration
+      # values we can easily generate automatically without checking them in.
+      compilerConfig =
+        pkgs.runCommand "hackage2nix-${self.ghc.haskellCompilerName}-config.yaml"
+          {
+            nativeBuildInputs = [
+              self.ghc
+            ];
+          }
+          ''
+            cat > "$out" << EOF
+            # generated by haskellPackages.cabal2nix-unstable.compilerConfig
+            compiler: ${self.ghc.haskellCompilerName}
+
+            core-packages:
+            EOF
+
+            ghc-pkg list \
+              | tail -n '+2' \
+              | sed -e 's/[()]//g' -e 's/\s\+/  - /' \
+              >> "$out"
+          '';
+    };
   }) (justStaticExecutables super.cabal2nix-unstable);
 
   # test suite needs local redis daemon

From dca180b572642b650fb0fe9c84f7017d0f4f9235 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 3 Jul 2025 12:31:22 +0200
Subject: [PATCH 0056/3724] haskellPackages.hpack_0_38_1: disable tests
 accessing network

haskell.packages.ghc912.hpack: 0.38.0 -> 0.38.1
---
 .../haskell-modules/configuration-ghc-9.12.x.nix   |  2 +-
 .../haskell-modules/configuration-nix.nix          | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
index 705b4261058f..440fdacb8082 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
@@ -175,5 +175,5 @@ with haskellLib;
   };
 
   # Allow Cabal 3.14
-  hpack = doDistribute self.hpack_0_38_0;
+  hpack = doDistribute self.hpack_0_38_1;
 }
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 7c4886c96ce4..c92690a1504c 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1779,6 +1779,20 @@ builtins.intersectAttrs super {
 
   xmobar = enableSeparateBinOutput super.xmobar;
 
+  # These test cases access the network
+  hpack_0_38_1 = doDistribute (
+    overrideCabal (drv: {
+      testFlags = drv.testFlags or [ ] ++ [
+        "--skip"
+        "/Hpack.Defaults/ensureFile/with 404/does not create any files/"
+        "--skip"
+        "/Hpack.Defaults/ensureFile/downloads file if missing/"
+        "--skip"
+        "/EndToEnd/hpack/defaults/fails if defaults don't exist/"
+      ];
+    }) super.hpack_0_38_1
+  );
+
   # 2024-08-09: Disable some cabal-doctest tests pending further investigation.
   inherit
     (lib.mapAttrs (

From 1c393bb828b5616a0533423145174379106dee18 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 3 Jul 2025 12:33:48 +0200
Subject: [PATCH 0057/3724] haskellPackages.cabal2nix-unstable: build against
 Cabal 3.14

Some packages in Hackage apparently now declare cabal-version: 3.12, so
let's bump cabal2nix-unstable to the latest Cabal version we ship. We
should probably do this for pkgs.cabal2nix as well, but I'm not sure how
to it exactly.
---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c8bb9c200ade..51093e745d91 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -104,6 +104,9 @@ with haskellLib;
         cabalInstallOverlay = cself: csuper: {
           Cabal = cself.Cabal_3_14_2_0;
           Cabal-syntax = cself.Cabal-syntax_3_14_2_0;
+
+          # Only needed for cabal2nix, hpack < 0.37 forbids Cabal >= 3.14
+          hpack = cself.hpack_0_38_1;
         };
       in
       {
@@ -169,11 +172,14 @@ with haskellLib;
           # May as well…
           (self.generateOptparseApplicativeCompletions [ "guardian" ])
         ];
+
+        cabal2nix-unstable = super.cabal2nix-unstable.overrideScope cabalInstallOverlay;
       }
     )
     cabal-install
     cabal-install-solver
     guardian
+    cabal2nix-unstable
     ;
 
   # Expected test output for these accidentally checks the absolute location of the source directory

From 9acee8ea5cfa40516576b7f909787c4b0ccfb072 Mon Sep 17 00:00:00 2001
From: miampf <miampf@proton.me>
Date: Fri, 4 Jul 2025 12:33:08 +0200
Subject: [PATCH 0058/3724] kanri: init at 0.8.1

---
 pkgs/by-name/ka/kanri/package.nix | 72 +++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 pkgs/by-name/ka/kanri/package.nix

diff --git a/pkgs/by-name/ka/kanri/package.nix b/pkgs/by-name/ka/kanri/package.nix
new file mode 100644
index 000000000000..beaf4956cbe2
--- /dev/null
+++ b/pkgs/by-name/ka/kanri/package.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchYarnDeps,
+  fetchFromGitHub,
+  cargo-tauri,
+  glib-networking,
+  yarnConfigHook,
+  yarnBuildHook,
+  openssl,
+  pkg-config,
+  webkitgtk_4_1,
+  wrapGAppsHook4,
+  nix-update-script,
+  nodejs,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "kanri";
+  version = "0.8.1";
+  src = fetchFromGitHub {
+    owner = "kanriapp";
+    repo = "kanri";
+    tag = "app-v${finalAttrs.version}";
+    hash = "sha256-pP+q9AD2WATFYWHFitcrebN8y6iGCyXqmQYXCs9Ytf0=";
+  };
+
+  cargoHash = "sha256-JLv4YC40VcRMQVgJnunLkFIEfLKUTEDBgNMV6NmMAzA=";
+
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = finalAttrs.src + "/yarn.lock";
+    hash = "sha256-z0RLQ6n3hdsaBy3BiIOpuvpPBq3ST02r7lfsGfJypb8=";
+  };
+
+  nativeBuildInputs =
+    [
+      nodejs
+      cargo-tauri.hook
+
+      yarnConfigHook
+      yarnBuildHook
+
+      pkg-config
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      wrapGAppsHook4
+    ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    glib-networking
+    openssl
+    webkitgtk_4_1
+  ];
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = finalAttrs.cargoRoot;
+
+  passthru.updateScript = nix-update-script { };
+
+  preBuild = ''
+    yarn --offline generate
+  '';
+
+  meta = {
+    description = "Modern, minimalist Kanban board that works offline";
+    homepage = "https://www.kanriapp.com/";
+    license = lib.licenses.unfree;
+    mainProgram = "kanri";
+    maintainers = with lib.maintainers; [ miampf ];
+  };
+})

From f485a9f52baaa755a68da75d61d6c46011c313d3 Mon Sep 17 00:00:00 2001
From: TilCreator <tilcreator@tc-j.de>
Date: Mon, 7 Jul 2025 17:01:47 +0200
Subject: [PATCH 0059/3724] gatus: 5.17.0 -> 5.19.0

---
 pkgs/by-name/ga/gatus/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix
index 050d1db2b80c..e06c56be4ee9 100644
--- a/pkgs/by-name/ga/gatus/package.nix
+++ b/pkgs/by-name/ga/gatus/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gatus";
-  version = "5.17.0";
+  version = "5.19.0";
 
   src = fetchFromGitHub {
     owner = "TwiN";
     repo = "gatus";
     rev = "v${version}";
-    hash = "sha256-/YOC13ut1k48vx/LapcShNfi83LxbC62yxKuanlUI9k=";
+    hash = "sha256-Jw7OdFGSZgxy52fICURc313ONsmI9Qlsf75aS0LUB9s=";
   };
 
-  vendorHash = "sha256-gr/GmZaaNwp/jQwnDiU/kfDWaciQloxP9vNlVTwMQjE=";
+  vendorHash = "sha256-CofmAYsRp0bya+q/eFJkWV9tGfhg37UxDFR9vpCKYls=";
 
   subPackages = [ "." ];
 

From 4390d1af4b62b9995dde60b1064b31146fe43971 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 8 Jul 2025 15:00:44 +0200
Subject: [PATCH 0060/3724] libopenmpt: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/by-name/li/libopenmpt/package.nix b/pkgs/by-name/li/libopenmpt/package.nix
index 2098ceb2cfa8..34c48151f8bf 100644
--- a/pkgs/by-name/li/libopenmpt/package.nix
+++ b/pkgs/by-name/li/libopenmpt/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libopenmpt";
-  version = "0.8.0";
+  version = "0.8.1";
 
   outputs = [
     "out"
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
-    hash = "sha256-VT7pxjxLPLybZk1bwx2LxO6zRfrYgJ8Dy/kxR6EIqzI=";
+    hash = "sha256-XMwpHkRXkl88o+gUT1tkXEo9zCvAXcmjllETKzK4O84=";
   };
 
   enableParallelBuilding = true;

From b892dfe549e2494a1d177d48d33030f4b1b77041 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Fri, 27 Jun 2025 20:24:20 -0400
Subject: [PATCH 0061/3724] systemd: 257.6 -> 257.7

---
 ...on-t-try-to-unmount-nix-or-nix-store.patch |   4 +-
 .../systemd/0003-Fix-NixOS-containers.patch   |   2 +-
 ...f-a-useless-message-in-user-sessions.patch |   2 +-
 ...e-usr-share-zoneinfo-to-etc-zoneinfo.patch |   4 +-
 ...-environment-when-calling-generators.patch |   4 +-
 ...ontext_init-fix-driver-name-checking.patch |   2 +-
 ...uggest-systemdctl-edit-runtime-on-sy.patch |   2 +-
 ....build-do-not-create-systemdstatedir.patch |   4 +-
 ...pdate-list-remove-all-instances-of-s.patch | 125 ------------------
 ...ry-to-update-the-same-file-multiple-.patch |  89 +++++++++++++
 .../0019-meson-Don-t-link-ssh-dropins.patch   |   7 +-
 ...nit_file_exists_full-follow-symlinks.patch |   9 +-
 pkgs/os-specific/linux/systemd/default.nix    |  12 +-
 13 files changed, 115 insertions(+), 151 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/systemd/0018-Revert-bootctl-update-list-remove-all-instances-of-s.patch
 create mode 100644 pkgs/os-specific/linux/systemd/0018-bootctl-do-not-try-to-update-the-same-file-multiple-.patch

diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
index d6a64437c2ac..9e3496986859 100644
--- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
+++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
@@ -27,10 +27,10 @@ index d6a256c4a7..f74d5198f1 100644
                          "/etc"))
                  return true;
 diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
-index 4bc01c75e0..ede9ac7b87 100644
+index 84da5eed63..d6e2f36d52 100644
 --- a/src/shutdown/umount.c
 +++ b/src/shutdown/umount.c
-@@ -170,8 +170,10 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) {
+@@ -175,8 +175,10 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) {
  static bool nonunmountable_path(const char *path) {
          assert(path);
  
diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
index 23029da39f23..7cc2804a05bb 100644
--- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
+++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
@@ -10,7 +10,7 @@ container, so checking early whether it exists will fail.
  1 file changed, 2 insertions(+)
 
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 500725d35f..2b735e4df4 100644
+index 6f90f2f418..74b2a237d3 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
 @@ -6189,6 +6189,7 @@ static int run(int argc, char *argv[]) {
diff --git a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
index c23b7315cde9..6c4a41ab0609 100644
--- a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
+++ b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
@@ -13,7 +13,7 @@ in containers.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index f21a4f7ceb..4c24ce5c98 100644
+index 4ccaba9054..9577b89783 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
 @@ -1672,7 +1672,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
diff --git a/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
index 119dd75bc2c3..1f4184e92836 100644
--- a/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
+++ b/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
@@ -75,7 +75,7 @@ index 29afb08ebc..398ff340cd 100644
                  return -EINVAL;
          if (!timezone_is_valid(e, LOG_DEBUG))
 diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index 9be62b8df3..2044e9f8d0 100644
+index a389eeae10..c817e91991 100644
 --- a/src/firstboot/firstboot.c
 +++ b/src/firstboot/firstboot.c
 @@ -598,7 +598,7 @@ static int process_timezone(int rfd) {
@@ -88,7 +88,7 @@ index 9be62b8df3..2044e9f8d0 100644
          r = symlinkat_atomic_full(e, pfd, f, /* make_relative= */ false);
          if (r < 0)
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 2b735e4df4..7a21f34edd 100644
+index 74b2a237d3..cf9eabf0f2 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
 @@ -1851,8 +1851,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
diff --git a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
index 14ff6ca57d46..856fdee93475 100644
--- a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
+++ b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
@@ -16,10 +16,10 @@ executables that are being called from managers.
  1 file changed, 8 insertions(+)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index 4c24ce5c98..3c944559fc 100644
+index 9577b89783..9cfd2798b9 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
-@@ -4135,9 +4135,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
+@@ -4158,9 +4158,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
           * adjust generated units to that. Let's pass down some bits of information that are easy for us to
           * determine (but a bit harder for generator scripts to determine), as environment variables. */
  
diff --git a/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch b/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
index 41e836ca04eb..fe8ac0ddd913 100644
--- a/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
+++ b/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
@@ -27,7 +27,7 @@ filename_is_valid with path_is_valid.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
-index 36a0f906da..e0f42abca2 100644
+index 5b6b3ea93c..8ab04241b6 100644
 --- a/src/shared/tpm2-util.c
 +++ b/src/shared/tpm2-util.c
 @@ -721,7 +721,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
diff --git a/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch b/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
index 6c7a1aff4094..50dd842cc221 100644
--- a/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
+++ b/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
@@ -30,7 +30,7 @@ are written into `$XDG_CONFIG_HOME/systemd/user`.
  1 file changed, 3 insertions(+)
 
 diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c
-index c42a31153d..154dbf0402 100644
+index 7165fa1cf7..7498cf9f4c 100644
 --- a/src/systemctl/systemctl-edit.c
 +++ b/src/systemctl/systemctl-edit.c
 @@ -323,6 +323,9 @@ int verb_edit(int argc, char *argv[], void *userdata) {
diff --git a/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch b/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
index debcaab14e81..76b85b8db674 100644
--- a/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
+++ b/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] meson.build: do not create systemdstatedir
  1 file changed, 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index bffda86845..cb5dcec0f9 100644
+index 7ede6f7a96..90860be99a 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2781,7 +2781,6 @@ install_data('LICENSE.GPL2',
+@@ -2795,7 +2795,6 @@ install_data('LICENSE.GPL2',
  install_subdir('LICENSES',
                 install_dir : docdir)
  
diff --git a/pkgs/os-specific/linux/systemd/0018-Revert-bootctl-update-list-remove-all-instances-of-s.patch b/pkgs/os-specific/linux/systemd/0018-Revert-bootctl-update-list-remove-all-instances-of-s.patch
deleted file mode 100644
index b4b9d9ee3e3d..000000000000
--- a/pkgs/os-specific/linux/systemd/0018-Revert-bootctl-update-list-remove-all-instances-of-s.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jared Baur <jaredbaur@fastmail.com>
-Date: Sun, 17 Nov 2024 12:46:36 -0800
-Subject: [PATCH] Revert "bootctl: update/list/remove all instances of
- systemd-boot in /EFI/BOOT"
-
-This reverts commit 929f41c6528fb630753d4e2f588a8eb6c2f6a609.
----
- src/bootctl/bootctl-install.c | 52 ++++-------------------------------
- src/bootctl/bootctl-status.c  |  8 ++++--
- 2 files changed, 12 insertions(+), 48 deletions(-)
-
-diff --git a/src/bootctl/bootctl-install.c b/src/bootctl/bootctl-install.c
-index 7ad264d882..298e749ed6 100644
---- a/src/bootctl/bootctl-install.c
-+++ b/src/bootctl/bootctl-install.c
-@@ -323,46 +323,6 @@ static int create_subdirs(const char *root, const char * const *subdirs) {
-         return 0;
- }
- 
--static int update_efi_boot_binaries(const char *esp_path, const char *source_path) {
--        _cleanup_closedir_ DIR *d = NULL;
--        _cleanup_free_ char *p = NULL;
--        int r, ret = 0;
--
--        r = chase_and_opendir("/EFI/BOOT", esp_path, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, &p, &d);
--        if (r == -ENOENT)
--                return 0;
--        if (r < 0)
--                return log_error_errno(r, "Failed to open directory \"%s/EFI/BOOT\": %m", esp_path);
--
--        FOREACH_DIRENT(de, d, break) {
--                _cleanup_close_ int fd = -EBADF;
--                _cleanup_free_ char *v = NULL;
--
--                if (!endswith_no_case(de->d_name, ".efi"))
--                        continue;
--
--                fd = openat(dirfd(d), de->d_name, O_RDONLY|O_CLOEXEC);
--                if (fd < 0)
--                        return log_error_errno(errno, "Failed to open \"%s/%s\" for reading: %m", p, de->d_name);
--
--                r = get_file_version(fd, &v);
--                if (r == -ESRCH)
--                        continue;  /* No version information */
--                if (r < 0)
--                        return r;
--                if (startswith(v, "systemd-boot ")) {
--                        _cleanup_free_ char *dest_path = NULL;
--
--                        dest_path = path_join(p, de->d_name);
--                        if (!dest_path)
--                                return log_oom();
--
--                        RET_GATHER(ret, copy_file_with_version_check(source_path, dest_path, /* force = */ false));
--                }
--        }
--
--        return ret;
--}
- 
- static int copy_one_file(const char *esp_path, const char *name, bool force) {
-         char *root = IN_SET(arg_install_source, ARG_INSTALL_SOURCE_AUTO, ARG_INSTALL_SOURCE_IMAGE) ? arg_root : NULL;
-@@ -416,12 +376,9 @@ static int copy_one_file(const char *esp_path, const char *name, bool force) {
-                 if (r < 0)
-                         return log_error_errno(r, "Failed to resolve path %s under directory %s: %m", v, esp_path);
- 
--                RET_GATHER(ret, copy_file_with_version_check(source_path, default_dest_path, force));
--
--                /* If we were installed under any other name in /EFI/BOOT, make sure we update those binaries
--                 * as well. */
--                if (!force)
--                        RET_GATHER(ret, update_efi_boot_binaries(esp_path, source_path));
-+                r = copy_file_with_version_check(source_path, default_dest_path, force);
-+                if (r < 0 && ret == 0)
-+                        ret = r;
-         }
- 
-         return ret;
-@@ -1102,6 +1059,9 @@ static int remove_boot_efi(const char *esp_path) {
-                 if (!endswith_no_case(de->d_name, ".efi"))
-                         continue;
- 
-+                if (!startswith_no_case(de->d_name, "boot"))
-+                        continue;
-+
-                 fd = openat(dirfd(d), de->d_name, O_RDONLY|O_CLOEXEC);
-                 if (fd < 0)
-                         return log_error_errno(errno, "Failed to open \"%s/%s\" for reading: %m", p, de->d_name);
-diff --git a/src/bootctl/bootctl-status.c b/src/bootctl/bootctl-status.c
-index 6bcb348935..fe753510ce 100644
---- a/src/bootctl/bootctl-status.c
-+++ b/src/bootctl/bootctl-status.c
-@@ -187,6 +187,7 @@ static int status_variables(void) {
- static int enumerate_binaries(
-                 const char *esp_path,
-                 const char *path,
-+                const char *prefix,
-                 char **previous,
-                 bool *is_first) {
- 
-@@ -212,6 +213,9 @@ static int enumerate_binaries(
-                 if (!endswith_no_case(de->d_name, ".efi"))
-                         continue;
- 
-+                if (prefix && !startswith_no_case(de->d_name, prefix))
-+                        continue;
-+
-                 filename = path_join(p, de->d_name);
-                 if (!filename)
-                         return log_oom();
-@@ -268,11 +272,11 @@ static int status_binaries(const char *esp_path, sd_id128_t partition) {
-                 printf(" (/dev/disk/by-partuuid/" SD_ID128_UUID_FORMAT_STR ")", SD_ID128_FORMAT_VAL(partition));
-         printf("\n");
- 
--        r = enumerate_binaries(esp_path, "EFI/systemd", &last, &is_first);
-+        r = enumerate_binaries(esp_path, "EFI/systemd", NULL, &last, &is_first);
-         if (r < 0)
-                 goto fail;
- 
--        k = enumerate_binaries(esp_path, "EFI/BOOT", &last, &is_first);
-+        k = enumerate_binaries(esp_path, "EFI/BOOT", "boot", &last, &is_first);
-         if (k < 0) {
-                 r = k;
-                 goto fail;
diff --git a/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-try-to-update-the-same-file-multiple-.patch b/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-try-to-update-the-same-file-multiple-.patch
new file mode 100644
index 000000000000..8adac9fb9bde
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-try-to-update-the-same-file-multiple-.patch
@@ -0,0 +1,89 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Wed, 19 Jun 2024 15:55:59 +0900
+Subject: [PATCH] bootctl: do not try to update the same file multiple times
+
+Otherwise, copy_file_with_version_check() -> version_check() will fail
+and warn about that the same version is already installed.
+
+Fixes a regression caused by 929f41c6528fb630753d4e2f588a8eb6c2f6a609.
+Fixes #33392.
+
+bootctl: add missing error messages in version_check()
+
+bootctl: check file type before update
+
+This also adds missing assertions.
+
+Follow-up for 929f41c6528fb630753d4e2f588a8eb6c2f6a609.
+---
+ src/bootctl/bootctl-install.c | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/src/bootctl/bootctl-install.c b/src/bootctl/bootctl-install.c
+index e15c2c6bed..7828ce1f08 100644
+--- a/src/bootctl/bootctl-install.c
++++ b/src/bootctl/bootctl-install.c
+@@ -195,14 +195,14 @@ static int version_check(int fd_from, const char *from, int fd_to, const char *t
+         if (r == -ESRCH)
+                 return log_notice_errno(r, "Source file \"%s\" does not carry version information!", from);
+         if (r < 0)
+-                return r;
++                return log_error_errno(r, "Failed to get version information of source file \"%s\": %m", from);
+ 
+         r = get_file_version(fd_to, &b);
+         if (r == -ESRCH)
+                 return log_notice_errno(r, "Skipping \"%s\", it's owned by another boot loader (no version info found).",
+                                         to);
+         if (r < 0)
+-                return r;
++                return log_error_errno(r, "Failed to get version information of \"%s\": %m", to);
+         if (compare_product(a, b) != 0)
+                 return log_notice_errno(SYNTHETIC_ERRNO(ESRCH),
+                                         "Skipping \"%s\", it's owned by another boot loader.", to);
+@@ -324,11 +324,15 @@ static int create_subdirs(const char *root, const char * const *subdirs) {
+         return 0;
+ }
+ 
+-static int update_efi_boot_binaries(const char *esp_path, const char *source_path) {
++static int update_efi_boot_binaries(const char *esp_path, const char *source_path, const char *exclude_path) {
+         _cleanup_closedir_ DIR *d = NULL;
+         _cleanup_free_ char *p = NULL;
+         int r, ret = 0;
+ 
++        assert(esp_path);
++        assert(source_path);
++        assert(exclude_path);
++
+         r = chase_and_opendir("/EFI/BOOT", esp_path, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, &p, &d);
+         if (r == -ENOENT)
+                 return 0;
+@@ -339,9 +343,19 @@ static int update_efi_boot_binaries(const char *esp_path, const char *source_pat
+                 _cleanup_close_ int fd = -EBADF;
+                 _cleanup_free_ char *v = NULL;
+ 
++                if (!IN_SET(de->d_type, DT_REG, DT_UNKNOWN))
++                        continue;
++
+                 if (!endswith_no_case(de->d_name, ".efi"))
+                         continue;
+ 
++                /* Skip the file that is already updated. We cannot check if the paths are equal because the
++                 * file system is likely case insensitve. It's easiest to just check if the inodes are the
++                 * same.
++                 */
++                if (inode_same_at(dirfd(d), de->d_name, 0, exclude_path, 0))
++                        continue;
++
+                 fd = xopenat_full(dirfd(d), de->d_name, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY|O_NOFOLLOW, /* xopen_flags= */ 0, /* mode= */ 0);
+                 if (fd < 0)
+                         return log_error_errno(fd, "Failed to open \"%s/%s\" for reading: %m", p, de->d_name);
+@@ -429,7 +443,7 @@ static int copy_one_file(const char *esp_path, const char *name, bool force) {
+                 /* If we were installed under any other name in /EFI/BOOT, make sure we update those binaries
+                  * as well. */
+                 if (!force)
+-                        RET_GATHER(ret, update_efi_boot_binaries(esp_path, source_path));
++                        RET_GATHER(ret, update_efi_boot_binaries(esp_path, source_path, default_dest_path));
+         }
+ 
+         return ret;
diff --git a/pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch b/pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch
index a5b7c168ee94..55d8f989e842 100644
--- a/pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch
+++ b/pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] meson: Don't link ssh dropins
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index d392610625..c17d0a1feb 100644
+index 90860be99a..f021f76031 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -211,13 +211,13 @@ sshconfdir = get_option('sshconfdir')
+@@ -207,13 +207,13 @@ sshconfdir = get_option('sshconfdir')
  if sshconfdir == ''
          sshconfdir = sysconfdir / 'ssh/ssh_config.d'
  endif
@@ -27,6 +27,3 @@ index d392610625..c17d0a1feb 100644
  
  sshdprivsepdir = get_option('sshdprivsepdir')
  conf.set10('CREATE_SSHDPRIVSEPDIR', sshdprivsepdir != 'no' and not sshdprivsepdir.startswith('/usr/'))
--- 
-2.47.0
-
diff --git a/pkgs/os-specific/linux/systemd/0020-install-unit_file_exists_full-follow-symlinks.patch b/pkgs/os-specific/linux/systemd/0020-install-unit_file_exists_full-follow-symlinks.patch
index e138aca05ac2..4d7ceedcbab0 100644
--- a/pkgs/os-specific/linux/systemd/0020-install-unit_file_exists_full-follow-symlinks.patch
+++ b/pkgs/os-specific/linux/systemd/0020-install-unit_file_exists_full-follow-symlinks.patch
@@ -1,4 +1,4 @@
-From 7be486fb25dc4ea212cb17f6a3f4a434a557b0d9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Marie Ramlow <me@nycode.dev>
 Date: Fri, 10 Jan 2025 15:51:33 +0100
 Subject: [PATCH] install: unit_file_exists_full: follow symlinks
@@ -8,10 +8,10 @@ Subject: [PATCH] install: unit_file_exists_full: follow symlinks
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/shared/install.c b/src/shared/install.c
-index 53566b7eef..0975cd47c7 100644
+index 6d87858a3c..8da022eb64 100644
 --- a/src/shared/install.c
 +++ b/src/shared/install.c
-@@ -3217,7 +3217,7 @@ int unit_file_exists_full(RuntimeScope scope, const LookupPaths *lp, const char
+@@ -3226,7 +3226,7 @@ int unit_file_exists_full(RuntimeScope scope, const LookupPaths *lp, const char
                          &c,
                          lp,
                          name,
@@ -20,6 +20,3 @@ index 53566b7eef..0975cd47c7 100644
                          ret_path ? &info : NULL,
                          /* changes= */ NULL,
                          /* n_changes= */ NULL);
--- 
-2.47.0
-
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 5d89887378e7..7d45c2e96c6d 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -197,7 +197,7 @@ assert withBootloader -> withEfi;
 let
   wantCurl = withRemote || withImportd;
 
-  version = "257.6";
+  version = "257.7";
 
   # Use the command below to update `releaseTimestamp` on every (major) version
   # change. More details in the commentary at mesonFlags.
@@ -215,7 +215,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "systemd";
     repo = "systemd";
     rev = "v${version}";
-    hash = "sha256-Myb/ra7NQTDzN7B9jn8svbhTrLSfiqWaSxREe/nDyYo=";
+    hash = "sha256-9OnjeMrfV5DSAoX/aetI4r/QLPYITUd2aOY0DYfkTzQ=";
   };
 
   # On major changes, or when otherwise required, you *must* :
@@ -245,11 +245,17 @@ stdenv.mkDerivation (finalAttrs: {
       ./0015-tpm2_context_init-fix-driver-name-checking.patch
       ./0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
       ./0017-meson.build-do-not-create-systemdstatedir.patch
-      ./0018-Revert-bootctl-update-list-remove-all-instances-of-s.patch # https://github.com/systemd/systemd/issues/33392
+
+      # https://github.com/systemd/systemd/issues/33392
+      # This patch is a slightly modified version of this PR:
+      # https://github.com/systemd/systemd/pull/33400
+      ./0018-bootctl-do-not-try-to-update-the-same-file-multiple-.patch
+
       # systemd tries to link the systemd-ssh-proxy ssh config snippet with tmpfiles
       # if the install prefix is not /usr, but that does not work for us
       # because we include the config snippet manually
       ./0019-meson-Don-t-link-ssh-dropins.patch
+
       ./0020-install-unit_file_exists_full-follow-symlinks.patch
     ]
     ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [

From 2b113e525588837d46654480534636ecc29359c3 Mon Sep 17 00:00:00 2001
From: Nikhil Singh <nik.singh710@gmail.com>
Date: Wed, 9 Jul 2025 10:57:07 +0530
Subject: [PATCH 0062/3724] choose-gui: add maintainer niksingh710

---
 pkgs/by-name/ch/choose-gui/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ch/choose-gui/package.nix b/pkgs/by-name/ch/choose-gui/package.nix
index da7d1e6e7be9..810d7fefadef 100644
--- a/pkgs/by-name/ch/choose-gui/package.nix
+++ b/pkgs/by-name/ch/choose-gui/package.nix
@@ -42,7 +42,10 @@ stdenv.mkDerivation rec {
     license = lib.licenses.mit;
     platforms = lib.platforms.darwin;
     changelog = "https://github.com/chipsenkbeil/choose/blob/${version}/CHANGELOG.md";
-    maintainers = with lib.maintainers; [ heywoodlh ];
+    maintainers = with lib.maintainers; [
+      heywoodlh
+      niksingh710
+    ];
     mainProgram = "choose";
   };
 }

From 49efc394218f3ac456ae0275cefcfad088dbf613 Mon Sep 17 00:00:00 2001
From: Nikhil Singh <nik.singh710@gmail.com>
Date: Wed, 9 Jul 2025 10:58:03 +0530
Subject: [PATCH 0063/3724] choose-gui: 1.3.1 -> 1.5.0

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

diff --git a/pkgs/by-name/ch/choose-gui/package.nix b/pkgs/by-name/ch/choose-gui/package.nix
index 810d7fefadef..04a74c40d901 100644
--- a/pkgs/by-name/ch/choose-gui/package.nix
+++ b/pkgs/by-name/ch/choose-gui/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "choose-gui";
-  version = "1.3.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "chipsenkbeil";
     repo = "choose";
     rev = version;
-    hash = "sha256-oR0GgMinKcBHaZWdE7O+mdbiLKKjkweECKbi80bjW+c=";
+    hash = "sha256-ewXZpP3XmOuV/MA3fK4BwZnNb2jkE727Sse6oAd4HJk=";
   };
 
   nativeBuildInputs = [ xcbuild ];

From 1158f20f1563e8a8e5524d6f910d311956b006a3 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 3 Jul 2025 13:38:40 +0200
Subject: [PATCH 0064/3724] maintainers/haskell/update*: print version diff
 when not committing

This allows other scripts to detect whether anything changed without
resorting to git-diff(1): If nothing changed, stdout will be empty (i.e.
we now enforce that other messages go to stderr). To make sure that this
behavior is retained in the future, the scripts' behavior is briefly
documented in the files' header.
---
 maintainers/scripts/haskell/update-hackage.sh | 32 +++++++++++++++++--
 .../scripts/haskell/update-stackage.sh        | 32 +++++++++++++++++--
 2 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/maintainers/scripts/haskell/update-hackage.sh b/maintainers/scripts/haskell/update-hackage.sh
index 27a77d5db9df..eb4d341dc09b 100755
--- a/maintainers/scripts/haskell/update-hackage.sh
+++ b/maintainers/scripts/haskell/update-hackage.sh
@@ -1,7 +1,26 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i bash -p curl jq git gnused -I nixpkgs=.
-
-# See regenerate-hackage-packages.sh for details on the purpose of this script.
+#
+# SYNOPSIS
+#
+#   Update Hackage index and hashes data exposed via pkgs.all-cabal-hashes.
+#
+# DESCRIPTION
+#
+#   Find latest revision of the commercialhaskell/all-cabal-hashes repository's
+#   hackage branch and update pkgs/data/misc/hackage/pin.json accordingly.
+#
+#   This data is used by hackage2nix to generate hackage-packages.nix. Since
+#   hackage2nix uses the latest version of a package unless an explicit
+#   constraint is configured, running this script indirectly updates packages
+#   (when hackage2nix is executed afterwards).
+#
+#   Prints a version difference to stdout if the pin has been updated, nothing
+#   otherwise.
+#
+# EXIT STATUS
+#
+#   Always exit with zero (even if nothing changed) unless there was an error.
 
 set -euo pipefail
 
@@ -14,6 +33,7 @@ commit_msg="$(echo "$git_info" | jq -r .commit.commit.message)"
 new_date="$(echo "$commit_msg" | sed 's/Update from Hackage at //')"
 
 if [ "$current_commit" != "$head_commit" ]; then
+   echo "Updating all-cabal-hashes from $old_date to $new_date" >&2
    url="https://github.com/commercialhaskell/all-cabal-hashes/archive/$head_commit.tar.gz"
    hash="$(nix-prefetch-url "$url")"
    jq -n \
@@ -23,13 +43,19 @@ if [ "$current_commit" != "$head_commit" ]; then
      --arg commit_msg "$commit_msg" \
      '{commit: $commit, url: $url, sha256: $hash, msg: $commit_msg}' \
      > $pin_file
+else
+   echo "No new all-cabal-hashes version" >&2
 fi
 
+version_diff="$old_date -> $new_date"
+
 if [[ "${1:-}" == "--do-commit" ]]; then
 git add pkgs/data/misc/hackage/pin.json
 git commit -F - << EOF
-all-cabal-hashes: $old_date -> $new_date
+all-cabal-hashes: $version_diff
 
 This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
 EOF
+else
+echo "$version_diff"
 fi
diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index 8401ec1f2108..5bae409ec070 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -1,6 +1,28 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i bash -p curl jq git gnused gnugrep -I nixpkgs=.
 # shellcheck shell=bash
+#
+# SYNOPSIS
+#
+#   Update version constraints in hackage2nix config file from Stackage.
+#
+# DESCRIPTION
+#
+#   Fetches the latest snapshot of the configured Stackage solver which is
+#   configured via the SOLVER (either LTS or Nightly) and VERSION variables in
+#   the script.
+#
+#   VERSION is only applicable if SOLVER is LTS. SOLVER=LTS and VERSION=22
+#   will cause update-stackage.sh to fetch the latest LTS-22.XX version.
+#   If empty, the latest version of the solver is used.
+#
+#   If the configuration file has been updated, update-stackage.sh prints a
+#   version difference to stdout, e.g. 23.11 -> 23.13. Otherwise, stdout remains
+#   empty.
+#
+# EXIT STATUS
+#
+#   Always exit with zero (even if nothing changed) unless there was an error.
 
 set -eu -o pipefail
 
@@ -31,11 +53,11 @@ old_version=$(grep '^# Stackage' $stackage_config | sed -e 's/.\+ \([A-Za-z]\+ [
 version="$SOLVER $(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.$(toLower "$SOLVER")-//p" "$tmpfile")"
 
 if [[ "$old_version" == "$version" ]]; then
-   echo "No new stackage version"
+   echo "No new stackage version" >&2
    exit 0 # Nothing to do
 fi
 
-echo "Updating Stackage from $old_version to $version."
+echo "Updating Stackage from $old_version to $version." >&2
 
 # Create a simple yaml version of the file.
 sed -r \
@@ -78,11 +100,15 @@ sed -r \
 # ShellCheck: latest version of command-line dev tool.
 # Agda: The Agda community is fast-moving; we strive to always include the newest versions of Agda and the Agda packages in nixpkgs.
 
+version_diff="$old_version -> $version"
+
 if [[ "${1:-}" == "--do-commit" ]]; then
 git add $stackage_config
 git commit -F - << EOF
-haskellPackages: stackage $old_version -> $version
+haskellPackages: stackage $version_diff
 
 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
 EOF
+else
+echo "$version_diff"
 fi

From f834f1dacc34bf82f6aa9bfb67b5bfdce0ee534b Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Fri, 4 Jul 2025 01:35:47 +0200
Subject: [PATCH 0065/3724] maintainers/scripts/haskell: briefer commit message
 bodies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The “This commit was generated by …” message is very wordy and often
exceeds 72 characters which is a good (loose) target for wrapping lines
in commit messages.
---
 maintainers/scripts/haskell/regenerate-hackage-packages.sh | 2 +-
 maintainers/scripts/haskell/update-hackage.sh              | 2 +-
 maintainers/scripts/haskell/update-stackage.sh             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh
index 3b7c0a8297e1..f67d31a9c096 100755
--- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh
+++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh
@@ -110,7 +110,7 @@ git add pkgs/development/haskell-modules/hackage-packages.nix
 git commit -F - << EOF
 haskellPackages: regenerate package set based on current config
 
-This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
+(generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh)
 EOF
 fi
 
diff --git a/maintainers/scripts/haskell/update-hackage.sh b/maintainers/scripts/haskell/update-hackage.sh
index eb4d341dc09b..afc9eb25aae7 100755
--- a/maintainers/scripts/haskell/update-hackage.sh
+++ b/maintainers/scripts/haskell/update-hackage.sh
@@ -54,7 +54,7 @@ git add pkgs/data/misc/hackage/pin.json
 git commit -F - << EOF
 all-cabal-hashes: $version_diff
 
-This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
+(generated by maintainers/scripts/haskell/update-hackage.sh)
 EOF
 else
 echo "$version_diff"
diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index 5bae409ec070..81b11363da91 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -107,7 +107,7 @@ git add $stackage_config
 git commit -F - << EOF
 haskellPackages: stackage $version_diff
 
-This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
+(generated by maintainers/scripts/haskell/update-stackage.sh)
 EOF
 else
 echo "$version_diff"

From 5e758ae57347a54f9d0217589f0354d94f048978 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Fri, 4 Jul 2025 01:39:11 +0200
Subject: [PATCH 0066/3724] maintainers/haskell/regen-h-packages.sh: let user
 edit commit msg

Calling git commit with --edit here, allows the user to rephrase the
very nondescript default message, in doing so e.g. clarifying why the
regeneration was necessary etc. This should hopefully encourage better
commit mesages.
---
 maintainers/scripts/haskell/regenerate-hackage-packages.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh
index f67d31a9c096..d3e31140d8bb 100755
--- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh
+++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh
@@ -107,7 +107,7 @@ nixfmt pkgs/development/haskell-modules/hackage-packages.nix
 if [[ "$DO_COMMIT" -eq 1 ]]; then
 git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
 git add pkgs/development/haskell-modules/hackage-packages.nix
-git commit -F - << EOF
+git commit --edit -F - << EOF
 haskellPackages: regenerate package set based on current config
 
 (generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh)

From 34c51b70fbe2fa69e368268d04413feb6d9cc996 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 7 Jul 2025 16:03:17 +0200
Subject: [PATCH 0067/3724] maintainers/scripts/haskell: unify pkg set update
 into single commit

Currently, every package set consists of three commits, generated by
update-hackage.sh, update-stackage.sh and
regenerate-hackage-packages.sh, respectively. This is suboptimal, as it
necessarly causes intermediate states of Nixpkgs where the generated
hackage-packages.nix and all-cabal-hasehs and/or the hackage2nix
configuration files are out of sync. Ideally, running
regenerate-hackage-packages.sh is a no-op for every Nixpkgs revision.

This is achieved by adding a wrapper script, update-package-set.sh,
which runs the individual moving parts and commits the result.
---
 .../scripts/haskell/merge-and-open-pr.sh      |  8 +--
 .../scripts/haskell/update-package-set.sh     | 53 +++++++++++++++++++
 2 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100755 maintainers/scripts/haskell/update-package-set.sh

diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh
index ea985acfc9a0..e5f5aa5e2831 100755
--- a/maintainers/scripts/haskell/merge-and-open-pr.sh
+++ b/maintainers/scripts/haskell/merge-and-open-pr.sh
@@ -80,13 +80,7 @@ echo "Merging https://github.com/NixOS/nixpkgs/pull/${curr_haskell_updates_pr_nu
 gh pr merge --repo NixOS/nixpkgs --merge "$curr_haskell_updates_pr_num"
 
 # Update stackage, Hackage hashes, and regenerate Haskell package set
-echo "Updating Stackage..."
-./maintainers/scripts/haskell/update-stackage.sh --do-commit
-echo "Updating Hackage hashes..."
-./maintainers/scripts/haskell/update-hackage.sh --do-commit
-echo "Regenerating Hackage packages..."
-# Using fast here because after the hackage-update eval errors will likely break the transitive dependencies check.
-./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast --do-commit
+./maintainers/scripts/haskell/update-package-set.sh
 
 # Push these new commits to the haskell-updates branch
 echo "Pushing commits just created to the remote $push_remote/haskell-updates branch..."
diff --git a/maintainers/scripts/haskell/update-package-set.sh b/maintainers/scripts/haskell/update-package-set.sh
new file mode 100755
index 000000000000..94ccf2827555
--- /dev/null
+++ b/maintainers/scripts/haskell/update-package-set.sh
@@ -0,0 +1,53 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash
+#! nix-shell -p git -I nixpkgs=.
+set -euo pipefail
+
+filesToStage=(
+  'pkgs/data/misc/hackage/pin.json'
+  'pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml'
+  'pkgs/development/haskell-modules/hackage-packages.nix'
+)
+
+if ! git diff --quiet --cached; then
+  echo "Please commit staged changes before running $0" >&2
+  exit 100
+fi
+
+if ! git diff --quiet -- "${filesToStage[@]}"; then
+  echo -n "Please commit your changes to the following files before running $0: " >&2
+  echo    "${filesToStage[@]}" >&2
+  exit 100
+fi
+
+stackage_diff="$(./maintainers/scripts/haskell/update-stackage.sh)"
+hackage_diff="$(./maintainers/scripts/haskell/update-hackage.sh)"
+readonly stackage_diff hackage_diff
+
+# Prefer Stackage version diff in the commit header, fall back to Hackage
+if [[ -n "$stackage_diff" ]]; then
+  commit_message="haskellPackages: stackage $stackage_diff"
+  if [[ -n "$hackage_diff" ]]; then
+    commit_message="$commit_message
+
+all-cabal-hashes: $hackage_diff"
+  fi
+elif [[ -n "$hackage_diff" ]]; then
+  commit_message="haskellPackages: hackage $hackage_diff
+
+all-cabal-hashes: $hackage_diff"
+else
+  echo "Neither Hackage nor Stackage changed. Nothing to do." >&2
+  exit 0
+fi
+
+commit_message="$commit_message
+
+(generated by maintainers/scripts/haskell/update-package-set.sh)"
+
+# Using fast here because after the hackage-update eval errors will likely break the transitive dependencies check.
+./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast
+
+# A --do-commit flag probably doesn't make much sense
+git add -- "${filesToStage[@]}"
+git commit -m "$commit_message"

From 7479392276eede7c7cb89abf1693e8ef9ae5aebd Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 8 Jul 2025 00:12:22 +0200
Subject: [PATCH 0068/3724] haskellPackages: stackage LTS 23.24 -> LTS 23.27

all-cabal-hashes: 2025-06-01T18:10:16Z -> 2025-07-07T21:33:55Z

(generated by maintainers/scripts/haskell/update-package-set.sh)
---
 pkgs/data/misc/hackage/pin.json               |    8 +-
 .../configuration-hackage2nix/stackage.yaml   |  165 +-
 .../haskell-modules/hackage-packages.nix      | 6853 +++++++++++++----
 3 files changed, 5624 insertions(+), 1402 deletions(-)

diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index bd1c6b104bd2..07da1f56012e 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "0b40331fe9f6ba2ce9cf1b8afe0a04aa79d36878",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b40331fe9f6ba2ce9cf1b8afe0a04aa79d36878.tar.gz",
-  "sha256": "03mjsvybfh8bq5v475pqqs5bs9xdb0pm2qrw9w892q0q0ir5b6na",
-  "msg": "Update from Hackage at 2025-06-01T18:10:16Z"
+  "commit": "e184dedb360769d6e8e041e711559185f39ab55c",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e184dedb360769d6e8e041e711559185f39ab55c.tar.gz",
+  "sha256": "16qlwrw96lf52yvmmhfl948wpimbnqm9z87j27agcdmigf5icg1s",
+  "msg": "Update from Hackage at 2025-07-07T21:33:55Z"
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index 338c7fde2257..16b83fc122c7 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@@ -1,4 +1,4 @@
-# Stackage LTS 23.24
+# Stackage LTS 23.27
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -107,7 +107,7 @@ default-package-overrides:
   - attoparsec-binary ==0.2
   - attoparsec-data ==1.0.5.4
   - attoparsec-expr ==0.1.1.2
-  - attoparsec-framer ==0.1.0.9
+  - attoparsec-framer ==0.1.0.10
   - attoparsec-iso8601 ==1.1.1.0
   - attoparsec-path ==0.0.0.1
   - attoparsec-time ==1.0.3.1
@@ -133,7 +133,7 @@ default-package-overrides:
   - aws-xray-client ==0.1.0.2
   - aws-xray-client-persistent ==0.1.0.5
   - aws-xray-client-wai ==0.1.0.2
-  - backprop ==0.2.6.5
+  - backprop ==0.2.7.2
   - backtracking ==0.1.0
   - bank-holiday-germany ==1.3.1.0
   - bank-holidays-england ==0.2.0.11
@@ -161,12 +161,12 @@ default-package-overrides:
   - bcp47 ==0.2.0.6
   - bcp47-orphans ==0.1.0.6
   - bcrypt ==0.0.11
-  - beam-core ==0.10.3.1
+  - beam-core ==0.10.4.0
   - beam-migrate ==0.5.3.1
   - beam-postgres ==0.5.4.2
   - beam-sqlite ==0.5.4.0
-  - bech32 ==1.1.8
-  - bech32-th ==1.1.8
+  - bech32 ==1.1.9
+  - bech32-th ==1.1.9
   - bench-show ==0.3.2
   - benchpress ==0.2.2.25
   - bencode ==0.6.1.1
@@ -252,12 +252,12 @@ default-package-overrides:
   - bson-lens ==0.1.1
   - btrfs ==0.2.1.0
   - buffer-pipe ==0.0
-  - bugsnag ==1.1.0.1
+  - bugsnag ==1.1.0.2
   - bugsnag-hs ==0.2.0.12
-  - bugsnag-wai ==1.0.0.1
+  - bugsnag-wai ==1.0.1.1
   - bugsnag-yesod ==1.0.1.0
   - bugzilla-redhat ==1.0.1.1
-  - burrito ==2.0.1.13
+  - burrito ==2.0.1.14
   - bv ==0.5
   - bv-little ==1.3.2
   - bv-sized ==1.0.6
@@ -270,7 +270,7 @@ default-package-overrides:
   - byteorder ==1.0.4
   - bytes ==0.17.4
   - byteset ==0.1.1.2
-  - byteslice ==0.2.14.0
+  - byteslice ==0.2.15.0
   - bytesmith ==0.3.11.1
   - bytestring-builder ==0.10.8.2.0
   - bytestring-conversion ==0.3.2
@@ -292,14 +292,14 @@ default-package-overrides:
   - cabal-add ==0.1
   - cabal-appimage ==0.4.1.0
   - cabal-clean ==0.2.20230609
-  - cabal-debian ==5.2.5
+  - cabal-debian ==5.2.6
   - cabal-doctest ==1.0.11
   - cabal-file ==0.1.1
   - cabal-fix ==0.1.0.0
   - cabal-flatpak ==0.1.2
   - cabal-gild ==1.5.0.3
   - cabal-install-parsers ==0.6.1.1
-  - cabal-plan ==0.7.5.0
+  - cabal-plan ==0.7.6.0
   - cabal-rpm ==2.2.1
   - cabal-sort ==0.1.2.1
   - cabal2spec ==2.7.1
@@ -322,7 +322,7 @@ default-package-overrides:
   - cased ==0.1.0.0
   - cases ==0.1.4.4
   - casing ==0.1.4.1
-  - cassava ==0.5.3.2
+  - cassava ==0.5.4.0
   - cassava-conduit ==0.6.6
   - cassava-megaparsec ==2.1.1
   - cast ==0.1.0.2
@@ -347,7 +347,7 @@ default-package-overrides:
   - Chart-cairo ==1.9.4.1
   - Chart-diagrams ==1.9.5.1
   - chart-svg ==0.7.0.0
-  - ChasingBottoms ==1.3.1.15
+  - ChasingBottoms ==1.3.1.16
   - check-email ==1.0.2
   - checkers ==0.6.0
   - checksum ==0.0.0.1
@@ -413,7 +413,7 @@ default-package-overrides:
   - commutative-semigroups ==0.2.0.2
   - comonad ==5.0.9
   - compact ==0.2.0.0
-  - compactmap ==0.1.4.5
+  - compactmap ==0.1.4.6
   - companion ==0.1.0
   - compdata ==0.13.1
   - compensated ==0.8.3
@@ -437,7 +437,7 @@ default-package-overrides:
   - conduit-algorithms ==0.0.14.0
   - conduit-combinators ==1.3.0
   - conduit-concurrent-map ==0.1.4
-  - conduit-extra ==1.3.7
+  - conduit-extra ==1.3.8
   - conduit-parse ==0.2.1.1
   - conduit-zstd ==0.0.2.0
   - conferer ==1.1.0.0
@@ -671,7 +671,7 @@ default-package-overrides:
   - doctest ==0.22.6
   - doctest-discover ==0.2.0.0
   - doctest-driver-gen ==0.3.0.8
-  - doctest-exitcode-stdio ==0.0
+  - doctest-exitcode-stdio ==0.0.0.1
   - doctest-extract ==0.1.2
   - doctest-lib ==0.1.1.1
   - doctest-parallel ==0.3.1.1
@@ -717,10 +717,10 @@ default-package-overrides:
   - effectful-plugin ==1.1.0.4
   - effectful-th ==1.0.0.3
   - egison-pattern-src ==0.2.1.2
-  - either ==5.0.2
+  - either ==5.0.3
   - either-unwrap ==1.1
   - ekg ==0.4.1.2
-  - ekg-core ==0.1.1.8
+  - ekg-core ==0.1.2.0
   - ekg-json ==0.1.1.1
   - ekg-statsd ==0.2.6.2
   - elerea ==2.9.0
@@ -792,7 +792,7 @@ default-package-overrides:
   - explainable-predicates ==0.1.2.4
   - explicit-exception ==0.2
   - express ==1.0.18
-  - extended-reals ==0.2.6.0
+  - extended-reals ==0.2.7.0
   - extensible ==0.9.2
   - extensible-effects ==5.0.0.1
   - extensible-exceptions ==0.1.1.4
@@ -809,7 +809,7 @@ default-package-overrides:
   - falsify ==0.2.0
   - fast-builder ==0.1.5.0
   - fast-digits ==0.3.2.0
-  - fast-logger ==3.2.5
+  - fast-logger ==3.2.6
   - fast-math ==1.0.2
   - fast-myers-diff ==0.0.1
   - fcf-family ==0.2.0.2
@@ -817,7 +817,7 @@ default-package-overrides:
   - feature-flags ==0.1.0.1
   - fedora-krb ==0.1.0
   - fedora-releases ==0.2.1
-  - fedora-repoquery ==0.7.2
+  - fedora-repoquery ==0.7.3
   - feed ==1.3.2.1
   - FenwickTree ==0.1.2.1
   - fft ==0.1.8.7
@@ -867,7 +867,7 @@ default-package-overrides:
   - focus ==1.0.3.2
   - focuslist ==0.1.1.0
   - fold-debounce ==0.2.0.16
-  - foldable1-classes-compat ==0.1.1
+  - foldable1-classes-compat ==0.1.2
   - foldl ==1.4.18
   - folds ==0.7.8
   - FontyFruity ==0.5.3.5
@@ -879,7 +879,7 @@ default-package-overrides:
   - format-numbers ==0.1.0.1
   - formatn ==0.3.1.0
   - formatting ==7.2.0
-  - fortran-src ==0.16.5
+  - fortran-src ==0.16.7
   - foundation ==0.0.30
   - fourmolu ==0.15.0.0
   - Frames ==0.7.4.2
@@ -901,7 +901,7 @@ default-package-overrides:
   - funcmp ==1.9
   - function-builder ==0.3.0.1
   - functor-classes-compat ==2.0.0.2
-  - functor-combinators ==0.4.1.3
+  - functor-combinators ==0.4.1.4
   - functor-products ==0.1.2.2
   - fused-effects ==1.1.2.5
   - fusion-plugin ==0.2.7
@@ -1012,7 +1012,7 @@ default-package-overrides:
   - gi-gdkx11 ==3.0.17
   - gi-gdkx113 ==3.0.17
   - gi-gdkx114 ==4.0.9
-  - gi-gio ==2.0.37
+  - gi-gio ==2.0.38
   - gi-glib ==2.0.30
   - gi-gmodule ==2.0.6
   - gi-gobject ==2.0.31
@@ -1066,15 +1066,15 @@ default-package-overrides:
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graphite ==0.10.0.1
-  - graphql ==1.5.0.0
+  - graphql ==1.5.0.1
   - graphql-client ==1.2.4
   - graphql-spice ==1.0.6.0
   - graphs ==0.7.3
-  - graphula ==2.1.0.1
+  - graphula ==2.1.2.0
   - graphviz ==2999.20.2.1
   - gravatar ==0.8.1
   - greskell ==2.0.3.3
-  - greskell-core ==1.0.0.4
+  - greskell-core ==1.0.0.6
   - greskell-websocket ==1.0.0.4
   - gridtables ==0.1.0.0
   - grisette ==0.9.0.0
@@ -1087,15 +1087,15 @@ default-package-overrides:
   - gtk2hs-buildtools ==0.13.12.0
   - gtk3 ==0.15.10
   - guarded-allocation ==0.0.1
-  - hackage-cli ==0.1.0.2
-  - hackage-security ==0.6.3.0
+  - hackage-cli ==0.1.0.3
+  - hackage-security ==0.6.3.1
   - hackage-security-HTTP ==0.1.1.2
   - haddock-library ==1.11.0
   - haha ==0.3.1.1
   - hakyll ==4.16.6.0
   - hakyll-convert ==0.3.0.5
   - hal ==1.1
-  - half ==0.3.2
+  - half ==0.3.3
   - hall-symbols ==0.1.0.6
   - hamlet ==1.2.0
   - hamtsolo ==1.0.4
@@ -1115,8 +1115,8 @@ default-package-overrides:
   - hashids ==1.1.1.0
   - hashmap ==1.3.3
   - hashtables ==1.3.1
-  - haskell-gi ==0.26.15
-  - haskell-gi-base ==0.26.8
+  - haskell-gi ==0.26.16
+  - haskell-gi-base ==0.26.9
   - haskell-gi-overloading ==1.0
   - haskell-lexer ==1.1.2
   - haskell-src ==1.0.4.1
@@ -1211,6 +1211,7 @@ default-package-overrides:
   - HMock ==0.5.1.2
   - hmpfr ==0.4.5
   - hnix-store-core ==0.8.0.0
+  - hoare ==0.1.1.0
   - hoauth2 ==2.14.0
   - hoogle ==5.0.18.4
   - hopenssl ==2.2.5
@@ -1256,12 +1257,12 @@ default-package-overrides:
   - hslua-core ==2.3.2
   - hslua-list ==1.1.4
   - hslua-marshalling ==2.3.1
-  - hslua-module-doclayout ==1.2.0
+  - hslua-module-doclayout ==1.2.0.1
   - hslua-module-path ==1.1.1
   - hslua-module-system ==1.1.3
   - hslua-module-text ==1.1.1
   - hslua-module-version ==1.1.1
-  - hslua-module-zip ==1.1.3
+  - hslua-module-zip ==1.1.4
   - hslua-objectorientation ==2.3.1
   - hslua-packaging ==2.3.1
   - hslua-repl ==0.1.2
@@ -1330,7 +1331,7 @@ default-package-overrides:
   - http-semantics ==0.3.0
   - http-streams ==0.8.9.9
   - http-types ==0.12.4
-  - http2 ==5.3.9
+  - http2 ==5.3.10
   - httpd-shed ==0.4.1.2
   - human-readable-duration ==0.2.1.4
   - HUnit ==1.6.2.0
@@ -1433,7 +1434,7 @@ default-package-overrides:
   - io-streams ==1.5.2.2
   - io-streams-haproxy ==1.0.1.0
   - ip ==1.7.8
-  - ip6addr ==2.0.0
+  - ip6addr ==2.0.0.1
   - iproute ==1.7.15
   - IPv6Addr ==2.0.6.1
   - IPv6DB ==0.3.3.4
@@ -1479,7 +1480,7 @@ default-package-overrides:
   - JuicyPixels-scale-dct ==0.1.2
   - junit-xml ==0.1.0.4
   - justified-containers ==0.3.0.0
-  - kan-extensions ==5.2.6
+  - kan-extensions ==5.2.7
   - kansas-comet ==0.4.3
   - katip ==0.8.8.2
   - katip-logstash ==0.1.0.2
@@ -1543,13 +1544,13 @@ default-package-overrides:
   - leapseconds-announced ==2017.1.0.1
   - learn-physics ==0.6.7
   - leb128-cereal ==1.2
-  - lens ==5.3.4
+  - lens ==5.3.5
   - lens-action ==0.2.6
   - lens-aeson ==1.2.3
   - lens-csv ==0.1.1.0
   - lens-family ==2.1.3
   - lens-family-core ==2.1.3
-  - lens-family-th ==0.5.3.1
+  - lens-family-th ==0.5.3.2
   - lens-misc ==0.0.2.0
   - lens-properties ==4.11.1
   - lens-regex ==0.1.3
@@ -1568,7 +1569,7 @@ default-package-overrides:
   - lift-type ==0.1.2.0
   - lifted-async ==0.10.2.7
   - lifted-base ==0.2.3.12
-  - linear ==1.23.1
+  - linear ==1.23.2
   - linear-base ==0.4.0
   - linear-circuit ==0.1.0.4
   - linear-generics ==0.2.3
@@ -1593,7 +1594,7 @@ default-package-overrides:
   - locators ==0.3.0.5
   - loch-th ==0.2.2
   - lockfree-queue ==0.2.4
-  - log-base ==0.12.0.1
+  - log-base ==0.12.1.0
   - log-domain ==0.13.2
   - logfloat ==0.14.0
   - logger-thread ==0.1.0.2
@@ -1635,7 +1636,7 @@ default-package-overrides:
   - markov-chain ==0.0.3.4
   - markov-chain-usage-model ==0.0.0
   - markup-parse ==0.1.1.1
-  - massiv ==1.0.4.1
+  - massiv ==1.0.5.0
   - massiv-io ==1.0.0.1
   - massiv-serialise ==1.0.0.2
   - massiv-test ==1.1.0.1
@@ -1709,7 +1710,7 @@ default-package-overrides:
   - mmark ==0.0.8.0
   - mmark-cli ==0.0.5.2
   - mmark-ext ==0.2.1.5
-  - mmorph ==1.2.0
+  - mmorph ==1.2.1
   - mnist-idx ==0.1.3.2
   - mnist-idx-conduit ==0.4.0.0
   - mockcat ==0.5.2.0
@@ -1812,7 +1813,7 @@ default-package-overrides:
   - nanospec ==0.2.2
   - nanovg ==0.8.1.0
   - nats ==1.1.2
-  - natural-arithmetic ==0.2.2.0
+  - natural-arithmetic ==0.2.3.0
   - natural-induction ==0.2.0.0
   - natural-sort ==0.1.2
   - natural-transformation ==0.4.1
@@ -1948,7 +1949,7 @@ default-package-overrides:
   - pandoc ==3.6
   - pandoc-cli ==3.6
   - pandoc-lua-engine ==0.4.1.1
-  - pandoc-lua-marshal ==0.3.0
+  - pandoc-lua-marshal ==0.3.1
   - pandoc-plot ==1.9.1
   - pandoc-server ==0.1.0.11
   - pandoc-throw ==0.1.0.0
@@ -1987,7 +1988,7 @@ default-package-overrides:
   - pathtype ==0.8.1.3
   - pathwalk ==0.3.1.2
   - patience ==0.3
-  - patrol ==1.0.0.11
+  - patrol ==1.0.1.0
   - pava ==0.1.1.4
   - pcg-random ==0.1.4.0
   - pcre-heavy ==1.0.0.4
@@ -2008,7 +2009,7 @@ default-package-overrides:
   - persistable-types-HDBC-pg ==0.0.3.5
   - persistent ==2.14.6.3
   - persistent-discover ==0.1.0.7
-  - persistent-documentation ==0.1.0.5
+  - persistent-documentation ==0.1.0.6
   - persistent-lens ==1.0.0
   - persistent-mongoDB ==2.13.1.0
   - persistent-mtl ==0.5.1
@@ -2019,7 +2020,7 @@ default-package-overrides:
   - persistent-redis ==2.13.0.2
   - persistent-sqlite ==2.13.3.0
   - persistent-template ==2.12.0.0
-  - persistent-test ==2.13.1.4
+  - persistent-test ==2.13.1.3
   - persistent-typed-db ==0.1.0.7
   - pfile ==0.1.0.1
   - pg-harness-client ==0.6.0
@@ -2121,7 +2122,7 @@ default-package-overrides:
   - process-extras ==0.7.4
   - product-isomorphic ==0.0.3.4
   - product-profunctors ==0.11.1.1
-  - profunctors ==5.6.2
+  - profunctors ==5.6.3
   - project-template ==0.2.1.0
   - projectroot ==0.2.0.1
   - prometheus ==2.3.0
@@ -2166,12 +2167,12 @@ default-package-overrides:
   - quickcheck-assertions ==0.3.0
   - quickcheck-classes ==0.6.5.0
   - quickcheck-classes-base ==0.6.2.0
-  - quickcheck-groups ==0.0.1.4
+  - quickcheck-groups ==0.0.1.5
   - quickcheck-higherorder ==0.1.0.1
-  - quickcheck-instances ==0.3.32
+  - quickcheck-instances ==0.3.33
   - quickcheck-io ==0.2.0
-  - quickcheck-monoid-subclasses ==0.3.0.5
-  - quickcheck-quid ==0.0.1.7
+  - quickcheck-monoid-subclasses ==0.3.0.6
+  - quickcheck-quid ==0.0.1.8
   - quickcheck-simple ==0.1.1.1
   - quickcheck-state-machine ==0.10.1
   - quickcheck-text ==0.1.2.1
@@ -2291,12 +2292,12 @@ default-package-overrides:
   - rhine-gloss ==1.5
   - rhine-terminal ==1.5
   - riak-protobuf ==0.25.0.0
-  - richenv ==0.1.0.2
+  - richenv ==0.1.0.3
   - rio ==0.1.22.0
   - rio-orphans ==0.1.2.0
   - rio-prettyprint ==0.1.8.0
   - rng-utils ==0.3.1
-  - roc-id ==0.2.0.4
+  - roc-id ==0.2.0.5
   - rocksdb-haskell ==1.0.1
   - rocksdb-haskell-jprupp ==2.1.7
   - rocksdb-query ==0.4.3
@@ -2342,12 +2343,12 @@ default-package-overrides:
   - sampling ==0.3.5
   - samsort ==0.1.0.0
   - sandi ==0.5
-  - sandwich ==0.3.0.3
-  - sandwich-contexts ==0.3.0.2
+  - sandwich ==0.3.0.4
+  - sandwich-contexts ==0.3.0.3
   - sandwich-hedgehog ==0.1.3.1
   - sandwich-quickcheck ==0.1.0.7
   - sandwich-slack ==0.1.2.0
-  - sandwich-webdriver ==0.3.0.0
+  - sandwich-webdriver ==0.3.0.1
   - saturn ==1.0.0.8
   - say ==0.1.0.1
   - sayable ==1.2.5.0
@@ -2363,7 +2364,7 @@ default-package-overrides:
   - scientist ==0.0.0.0
   - scotty ==0.22
   - scrypt ==0.5.0
-  - search-algorithms ==0.3.3
+  - search-algorithms ==0.3.4
   - secp256k1-haskell ==1.4.6
   - securemem ==0.1.10
   - select-rpms ==0.2.0
@@ -2383,18 +2384,18 @@ default-package-overrides:
   - sequence-formats ==1.10.0.0
   - sequenceTools ==1.5.3.1
   - serialise ==0.2.6.1
-  - servant ==0.20.2
+  - servant ==0.20.3.0
   - servant-auth ==0.4.2.0
   - servant-auth-client ==0.4.2.0
   - servant-auth-docs ==0.2.11.0
-  - servant-auth-server ==0.4.9.0
+  - servant-auth-server ==0.4.9.1
   - servant-auth-swagger ==0.2.11.0
   - servant-blaze ==0.9.1
   - servant-checked-exceptions ==2.2.0.1
   - servant-checked-exceptions-core ==2.2.0.1
   - servant-cli ==0.1.1.0
-  - servant-client ==0.20.2
-  - servant-client-core ==0.20.2
+  - servant-client ==0.20.3.0
+  - servant-client-core ==0.20.3.0
   - servant-conduit ==0.16.1
   - servant-docs ==0.13.1
   - servant-elm ==0.7.3
@@ -2413,7 +2414,7 @@ default-package-overrides:
   - servant-quickcheck ==0.1.1.0
   - servant-rate-limit ==0.2.0.0
   - servant-rawm ==1.0.0.0
-  - servant-server ==0.20.2
+  - servant-server ==0.20.3.0
   - servant-static-th ==1.0.0.1
   - servant-swagger ==1.2.1
   - servant-swagger-ui ==0.3.5.5.0.1
@@ -2436,7 +2437,7 @@ default-package-overrides:
   - SHA ==1.6.4.4
   - shake ==0.19.8
   - shake-plus ==0.3.4.0
-  - shakespeare ==2.1.1
+  - shakespeare ==2.1.4
   - shakespeare-text ==1.1.0
   - shared-memory ==0.2.0.1
   - shell-conduit ==5.0.0
@@ -2512,14 +2513,14 @@ default-package-overrides:
   - soxlib ==0.0.3.2
   - special-values ==0.1.0.0
   - speculate ==0.4.20
-  - specup ==0.2.0.5
+  - specup ==0.2.0.6
   - speedy-slice ==0.3.2
   - sphinx ==0.6.1
   - Spintax ==0.3.7.0
   - splice ==0.6.1.1
   - split ==0.2.5
   - split-record ==0.1.1.4
-  - splitmix ==0.1.1
+  - splitmix ==0.1.3.1
   - splitmix-distributions ==1.0.0
   - Spock-api ==0.14.0.0
   - spoon ==0.3.1
@@ -2646,7 +2647,7 @@ default-package-overrides:
   - tagchup ==0.4.1.2
   - tagged ==0.8.8
   - tagged-binary ==0.2.0.1
-  - tagged-identity ==0.1.4
+  - tagged-identity ==0.1.5
   - tagged-transformer ==0.8.3
   - tagsoup ==0.14.8
   - tagstream-conduit ==0.5.6
@@ -2662,7 +2663,7 @@ default-package-overrides:
   - tasty-bench-fit ==0.1.1
   - tasty-checklist ==1.0.6.0
   - tasty-dejafu ==2.1.0.2
-  - tasty-discover ==5.0.1
+  - tasty-discover ==5.0.2
   - tasty-expected-failure ==0.12.3
   - tasty-fail-fast ==0.0.3
   - tasty-focus ==1.0.1
@@ -2675,7 +2676,7 @@ default-package-overrides:
   - tasty-inspection-testing ==0.2.1
   - tasty-kat ==0.0.3
   - tasty-leancheck ==0.0.2
-  - tasty-lua ==1.1.1
+  - tasty-lua ==1.1.1.1
   - tasty-papi ==0.1.2.0
   - tasty-program ==1.1.0
   - tasty-quickcheck ==0.11
@@ -2737,7 +2738,7 @@ default-package-overrides:
   - text-regex-replace ==0.1.1.5
   - text-rope ==0.2
   - text-short ==0.1.6
-  - text-show ==3.11.1
+  - text-show ==3.11.2
   - text-show-instances ==3.9.10
   - text-zipper ==0.13
   - textlocal ==0.1.0.5
@@ -2810,7 +2811,7 @@ default-package-overrides:
   - toml-reader ==0.2.2.0
   - toml-reader-parse ==0.1.1.1
   - tomland ==1.3.3.3
-  - tools-yj ==0.1.0.27
+  - tools-yj ==0.1.0.45
   - tophat ==1.0.8.0
   - topograph ==1.0.1
   - torrent ==10000.1.3
@@ -2913,7 +2914,7 @@ default-package-overrides:
   - universum ==1.8.2.2
   - unix-bytestring ==0.4.0.3
   - unix-compat ==0.7.4
-  - unix-time ==0.4.16
+  - unix-time ==0.4.17
   - unjson ==0.15.4
   - unlifted ==0.2.3.0
   - unliftio ==0.2.25.1
@@ -2969,13 +2970,13 @@ default-package-overrides:
   - vector-builder ==0.3.8.6
   - vector-bytes-instances ==0.1.1
   - vector-extras ==0.2.8.2
-  - vector-hashtables ==0.1.2.0
-  - vector-instances ==3.4.2
+  - vector-hashtables ==0.1.2.1
+  - vector-instances ==3.4.3
   - vector-mmap ==0.0.3
   - vector-rotcev ==0.1.0.2
   - vector-sized ==1.6.1
   - vector-space ==0.16
-  - vector-split ==1.0.0.3
+  - vector-split ==1.0.0.4
   - vector-stream ==0.1.0.1
   - vector-th-unbox ==0.2.2
   - verset ==0.0.1.11
@@ -2992,7 +2993,7 @@ default-package-overrides:
   - vty ==6.2
   - vty-crossplatform ==0.4.0.0
   - vty-unix ==0.2.0.0
-  - vty-windows ==0.2.0.3
+  - vty-windows ==0.2.0.4
   - wai ==3.2.4
   - wai-app-static ==3.1.9
   - wai-cli ==0.2.3
@@ -3023,7 +3024,7 @@ default-package-overrides:
   - wai-transformers ==0.1.0
   - wai-websockets ==3.0.1.2
   - wakame ==0.1.0.0
-  - warp ==3.4.7
+  - warp ==3.4.8
   - warp-tls ==3.4.9
   - wave ==0.2.1
   - wcwidth ==0.0.2
@@ -3049,8 +3050,8 @@ default-package-overrides:
   - welford-online-mean-variance ==0.2.0.0
   - what4 ==1.6.3
   - wherefrom-compat ==0.1.1.1
-  - wide-word ==0.1.7.0
-  - wild-bind ==0.1.2.11
+  - wide-word ==0.1.7.1
+  - wild-bind ==0.1.2.12
   - wild-bind-x11 ==0.2.0.17
   - Win32-notify ==0.3.0.3
   - windns ==0.1.0.1
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 61d87665d8ef..516491e31628 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1490,7 +1490,6 @@ self: {
       blaze-html,
       boxes,
       bytestring,
-      Cabal,
       case-insensitive,
       containers,
       data-hash,
@@ -1499,9 +1498,13 @@ self: {
       dlist,
       edit-distance,
       emacs,
+      enummapset,
       equivalence,
       exceptions,
+      filelock,
+      filemanip,
       filepath,
+      generic-data,
       ghc-compact,
       gitrev,
       happy,
@@ -1510,16 +1513,19 @@ self: {
       monad-control,
       mtl,
       murmur-hash,
+      nonempty-containers,
       parallel,
       peano,
       pqueue,
       pretty,
       process,
+      process-extras,
       regex-tdfa,
       split,
       stm,
       STMonadTrans,
       strict,
+      template-haskell,
       text,
       time,
       transformers,
@@ -1531,20 +1537,11 @@ self: {
     }:
     mkDerivation {
       pname = "Agda";
-      version = "2.7.0.1";
-      sha256 = "13pn0mbxyfy04fcdl68l2m36b40hwk8iwpkqdfad3xsf9l5ddxil";
-      revision = "3";
-      editedCabalFile = "0vmsy5hjivysiqkzk65ca1y8ivbzly5z55zi12bgsmj7jqrd8vrf";
+      version = "2.8.0";
+      sha256 = "184vjq260zf5w9c8nz11nbhpsvq3a1yxp7mhaz7synlaww3ik146";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
-      setupHaskellDepends = [
-        base
-        Cabal
-        directory
-        filepath
-        process
-      ];
       libraryHaskellDepends = [
         aeson
         ansi-terminal
@@ -1562,9 +1559,13 @@ self: {
         directory
         dlist
         edit-distance
+        enummapset
         equivalence
         exceptions
+        filelock
+        filemanip
         filepath
+        generic-data
         ghc-compact
         gitrev
         hashable
@@ -1572,16 +1573,19 @@ self: {
         monad-control
         mtl
         murmur-hash
+        nonempty-containers
         parallel
         peano
         pqueue
         pretty
         process
+        process-extras
         regex-tdfa
         split
         stm
         STMonadTrans
         strict
+        template-haskell
         text
         time
         transformers
@@ -1597,9 +1601,13 @@ self: {
       ];
       executableHaskellDepends = [
         base
+        bytestring
         directory
+        filelock
         filepath
+        gitrev
         process
+        template-haskell
       ];
       executableToolDepends = [ emacs ];
       description = "A dependently typed functional programming language and proof assistant";
@@ -7005,10 +7013,8 @@ self: {
     }:
     mkDerivation {
       pname = "ChasingBottoms";
-      version = "1.3.1.15";
-      sha256 = "0if8h6xq10y1xa90cwmx2jkxjn9628rzs8y6fsjmpjdcvcyr5wnj";
-      revision = "2";
-      editedCabalFile = "11h7gfnlxfrfpvax74lbdwaz8jazy833q6mzrgs9p8cyj6q69ibn";
+      version = "1.3.1.16";
+      sha256 = "08zg018arf4qvp970dcnf0nyaqp7wkp5ba2dhck3v4l49k5cax9m";
       libraryHaskellDepends = [
         base
         containers
@@ -8110,6 +8116,31 @@ self: {
     }
   ) { };
 
+  "ConsoleAsk" = callPackage (
+    {
+      mkDerivation,
+      base,
+      lens,
+      parsec,
+      regex-tdfa,
+      text,
+    }:
+    mkDerivation {
+      pname = "ConsoleAsk";
+      version = "0.1.0.1";
+      sha256 = "0mbrvaqdxfx7vfcqy6rbva0ml6a7a2yklgzh3vx008yaavzw4hy6";
+      libraryHaskellDepends = [
+        base
+        lens
+        parsec
+        regex-tdfa
+        text
+      ];
+      description = "Simple CLI user input library";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   "ConstraintKinds" = callPackage (
     {
       mkDerivation,
@@ -22336,10 +22367,8 @@ self: {
     }:
     mkDerivation {
       pname = "HaskellNet";
-      version = "0.6.1.2";
-      sha256 = "0yd0n6c9favb6kv37flz2cn9wz5kapx3iqljq2h7l6qvx6kd92v5";
-      revision = "1";
-      editedCabalFile = "1j5g09v40rvsk4crfjabs0mma5nlwsbzbny25803bc6805jh9058";
+      version = "0.6.2";
+      sha256 = "134gmv5b4f02f24m86ql256dssdvkgqjp2cw36p6958ydbdsx6s4";
       libraryHaskellDepends = [
         array
         base
@@ -23978,8 +24007,8 @@ self: {
     }:
     mkDerivation {
       pname = "HsSyck";
-      version = "0.53";
-      sha256 = "17r4jwnkjinmzpw9m2crjwccdyv9wmpljnv1ldgljkr9p9mb5ywf";
+      version = "0.55";
+      sha256 = "1ccm9r40898kfgkrnwz0ybcdps83li9wk565fm37gdpsvmi19faf";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         base
@@ -24096,6 +24125,8 @@ self: {
       pname = "HsYAML";
       version = "0.2.1.5";
       sha256 = "13av46629msknp1spmcczgd2hpsyj0ca590vpiy7df8l6cfwjyk5";
+      revision = "1";
+      editedCabalFile = "1l5ig8a1c13rwcx530li93p0kkxcsjpjyr303v19z6n8zmdvnz6a";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -24700,6 +24731,8 @@ self: {
       pname = "IPv6DB";
       version = "0.3.3.4";
       sha256 = "1mkf2fqlg2n9q3l3p8rxdcmb7k281lz37x6hiry1wvxbn92d4pja";
+      revision = "1";
+      editedCabalFile = "18wx26x4nyyywbl7inwna68kmxs8sbyckmrhdz4png9gn7ix4sr0";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -26815,6 +26848,8 @@ self: {
       pname = "LPFP";
       version = "1.1.5";
       sha256 = "11mlcd1pq2vb0kwjm2z6304qslvmdcfdbly37yr27zhn860zfzz2";
+      revision = "2";
+      editedCabalFile = "1530y0rmj3gwhk0ghpaf0977wz0n2pq86dfcb401y0ala7f4z167";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -29699,8 +29734,8 @@ self: {
     }:
     mkDerivation {
       pname = "MicroHs";
-      version = "0.12.6.1";
-      sha256 = "145fk10clh4mmfd58212kr1b56fr4j19vrlrq6d4jdv4zrvk5iwl";
+      version = "0.13.0.0";
+      sha256 = "02wl86ql8xcp9w7vlhvh0m95am6ssmw8fzkbs597qlhpwp91ax3w";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -31721,7 +31756,7 @@ self: {
     }
   ) { };
 
-  "NanoID_3_4_1" = callPackage (
+  "NanoID_3_4_1_1" = callPackage (
     {
       mkDerivation,
       aeson,
@@ -31736,8 +31771,8 @@ self: {
     }:
     mkDerivation {
       pname = "NanoID";
-      version = "3.4.1";
-      sha256 = "1rrz4wmhba372fg9w8rg6fgynwqmy5dhyz5i74xab5mbjgv169rs";
+      version = "3.4.1.1";
+      sha256 = "1dfl5vj6fwxwrhgx11vzxij2p19q3kqri130fxgw2l6ajlckyh8x";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -34971,8 +35006,8 @@ self: {
     }:
     mkDerivation {
       pname = "PenroseKiteDart";
-      version = "1.3";
-      sha256 = "0yjfc7zahrf4h02xhlbhzh0r8nzns5v1a2rp2sg3gi073v59gpps";
+      version = "1.4.3";
+      sha256 = "1nrp9cr7jxjvplkfgp4lxh3rvzf1pms8bm7kwhc4w4fzmpy3p3p1";
       libraryHaskellDepends = [
         base
         containers
@@ -36449,7 +36484,7 @@ self: {
     }
   ) { };
 
-  "QuickCheck_2_15_0_1" = callPackage (
+  "QuickCheck_2_16_0_0" = callPackage (
     {
       mkDerivation,
       base,
@@ -36463,10 +36498,8 @@ self: {
     }:
     mkDerivation {
       pname = "QuickCheck";
-      version = "2.15.0.1";
-      sha256 = "0zvfydg44ibs1br522rzvdlxj9mpz0h62js1hay1sj5gvdnj3cm3";
-      revision = "1";
-      editedCabalFile = "0cgfp4s51cjphsn9cls6rndisvqmi94vn95xan9g1yz6p5xk7z8c";
+      version = "2.16.0.0";
+      sha256 = "1h02m26hvhfcs82rrfmfznwh4vj799gn55kysmv3sr8ixak3ymhb";
       libraryHaskellDepends = [
         base
         containers
@@ -46709,8 +46742,8 @@ self: {
     { mkDerivation }:
     mkDerivation {
       pname = "Win32";
-      version = "2.14.2.0";
-      sha256 = "0qmm44py2r1z5mj12vr33s01kci5hmh479pr6v8ljqgm2imlfr4j";
+      version = "2.14.2.1";
+      sha256 = "0583vy22b89z4zdgg52ayga46mw8qmj0lw7qm99q6wggnjgmmlb9";
       description = "A binding to Windows Win32 API";
       license = lib.licenses.bsd3;
       platforms = lib.platforms.windows;
@@ -49363,8 +49396,8 @@ self: {
     }:
     mkDerivation {
       pname = "ac-library-hs";
-      version = "1.5.0.0";
-      sha256 = "15jvxwsx50qcv58wx4a2m4f1h5ic476cnb78n757shyfm0asn9ag";
+      version = "1.5.2.0";
+      sha256 = "028781j64wv42j9i2gmgccmlakyjchpxqk13rk5n59xavlyv7yw9";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -49373,6 +49406,7 @@ self: {
         bytestring
         primitive
         random
+        transformers
         vector
         vector-algorithms
         wide-word
@@ -49383,6 +49417,7 @@ self: {
         bytestring
         primitive
         random
+        transformers
         vector
         vector-algorithms
         wide-word
@@ -52295,8 +52330,8 @@ self: {
       pname = "active";
       version = "0.2.1";
       sha256 = "150kwir36aj9q219qi80mlqd0vxm4941dh6x4xp58rbd5a3mhmv1";
-      revision = "4";
-      editedCabalFile = "0s5aiyskly1j4wd4hs2c52bdawx9340pgdx0378xvivixd48cd8x";
+      revision = "5";
+      editedCabalFile = "0wxl3pfdz4krx7lg1rckvmjkm2hj5vlwx3kyzzfrpsfhc9zq7f1g";
       libraryHaskellDepends = [
         base
         lens
@@ -53707,8 +53742,8 @@ self: {
       pname = "aeson";
       version = "2.2.3.0";
       sha256 = "1akbrh8iz47f0ai30yabg1n4vcf1fx0a9gzj45fx0si553s5r8ns";
-      revision = "3";
-      editedCabalFile = "16sajjm1fqrjjgdy651ff7hyj89di7ys9wk4qnm9h6nnpbr5krb1";
+      revision = "4";
+      editedCabalFile = "0yw5kahz82kls4svn0qssckvx143k73h5nqg0z1d4s7ibqww4j3x";
       libraryHaskellDepends = [
         base
         bytestring
@@ -59447,8 +59482,8 @@ self: {
       pname = "align-audio";
       version = "0.0.0.1";
       sha256 = "1r1660igj6bmzhccw30vj0wsz7jjkd5k0vbr4nrcbpcwkxllshnb";
-      revision = "2";
-      editedCabalFile = "15hqn6q6991qp60pvykw3ryrcyqz94vhwcj1y28sxdpn5ga8mrl9";
+      revision = "3";
+      editedCabalFile = "1j50cp7i77dplkd3g7nnyn9xgcr8r8d4lh6nh9xcnjfkn8p6g539";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -69870,8 +69905,8 @@ self: {
     }:
     mkDerivation {
       pname = "amazonka-mtl";
-      version = "0.1.1.1";
-      sha256 = "19rcmfq5ly92jm96w5770286kihd5gsdc45rmpbkhm71xl2aa0pq";
+      version = "0.1.1.3";
+      sha256 = "06ng492c6r0zwyjyr0h6b665sp6v17i245svdsag3ha8ni303hka";
       libraryHaskellDepends = [
         amazonka
         amazonka-core
@@ -75708,8 +75743,8 @@ self: {
     }:
     mkDerivation {
       pname = "android-activity";
-      version = "0.2.0.1";
-      sha256 = "1pb250zsmh9z7h8wcqnqhbvhhdwwhmrwj8qr1w8053pxylsr5npn";
+      version = "0.2.0.2";
+      sha256 = "1l82k9if392682wr31b6g74wv25qwl5cgxwcmhnrp4lm8w0n428d";
       libraryHaskellDepends = [
         base
         data-default
@@ -76690,8 +76725,8 @@ self: {
       pname = "ansi-terminal-game";
       version = "1.9.3.0";
       sha256 = "1yy7hzdcawdmwl8wqzabbamzjdg260xbwryj0hdjn7b0n6qlqymk";
-      revision = "2";
-      editedCabalFile = "1gjaa3kj05v5zyjn27y17w05nx018bx28znj7r0al0c6267n0la8";
+      revision = "3";
+      editedCabalFile = "0m4df8a2p18j29zsgffnyf69hjkyam3rg3xc4zvmxafidj877ykk";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -78131,8 +78166,8 @@ self: {
     }:
     mkDerivation {
       pname = "aoc";
-      version = "0.1.0.2";
-      sha256 = "0x5lpirk74zf4283gpvmw71dv8mgil80l1awv42f8sfxg5nx805g";
+      version = "0.2.0.0";
+      sha256 = "0hamr2sqw00njwg4sdir81fmsgc29ic21m0rzqnrfmd5jgdmg27h";
       libraryHaskellDepends = [
         base
         containers
@@ -83460,8 +83495,8 @@ self: {
       pname = "arithmoi";
       version = "0.13.1.0";
       sha256 = "0ka0sqkrkqrln6ci8fxzls9r5bhwii48xc39bbapdqbn4sc2c5bf";
-      revision = "1";
-      editedCabalFile = "1q36pbxsz3vcig7gjr0m38bn5d34az2cjkhcag4n2ra86zdqrnvv";
+      revision = "2";
+      editedCabalFile = "1q81krc6qgg495qqlnh7kbzg2fk57amgiqa5xmxwhxrhlffjsk3d";
       configureFlags = [ "-f-llvm" ];
       libraryHaskellDepends = [
         array
@@ -85092,6 +85127,60 @@ self: {
     }
   ) { };
 
+  "ascii85x" = callPackage (
+    {
+      mkDerivation,
+      array,
+      attoparsec,
+      base,
+      bytestring,
+      hedgehog,
+      JuicyPixels,
+      optparse-applicative,
+      text,
+      vector,
+    }:
+    mkDerivation {
+      pname = "ascii85x";
+      version = "0.2.4.1";
+      sha256 = "1jr0qqcyx173gy5izz99z5s3v9a78ks48g7am4lfab7py3k0xri3";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        array
+        attoparsec
+        base
+        bytestring
+        JuicyPixels
+        text
+        vector
+      ];
+      executableHaskellDepends = [
+        array
+        attoparsec
+        base
+        bytestring
+        JuicyPixels
+        optparse-applicative
+        text
+        vector
+      ];
+      testHaskellDepends = [
+        array
+        attoparsec
+        base
+        bytestring
+        hedgehog
+        JuicyPixels
+        text
+        vector
+      ];
+      description = "Displays TI-85 variable files as text";
+      license = lib.licenses.bsd3;
+      mainProgram = "ascii85x";
+    }
+  ) { };
+
   "asciichart" = callPackage (
     {
       mkDerivation,
@@ -88874,8 +88963,8 @@ self: {
     }:
     mkDerivation {
       pname = "attoparsec-framer";
-      version = "0.1.0.9";
-      sha256 = "0kh54qdzjqa7lxd8s679b3my5nsy55rwqwd84nblmfczi73bjc0p";
+      version = "0.1.0.10";
+      sha256 = "1ziskifj6mly9ywsag8395ladwscrwzjpn628nbmn29x28zq0n61";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -88987,6 +89076,7 @@ self: {
       containers,
       deepseq,
       directory,
+      fail,
       filepath,
       ghc-prim,
       haddock-use-refs,
@@ -88995,6 +89085,7 @@ self: {
       QuickCheck,
       quickcheck-unicode,
       scientific,
+      semigroups,
       tagged,
       tasty,
       tasty-bench,
@@ -89007,17 +89098,19 @@ self: {
     }:
     mkDerivation {
       pname = "attoparsec-isotropic";
-      version = "0.14.4";
-      sha256 = "17rgqqkshn7pdyk54ac4vc3xs4p2kqh3mbd0ppsy7shyry7c1ahs";
+      version = "0.14.5";
+      sha256 = "1bvxy2gydz3kv0fbhp77bwk75l73kz7qc4aa7wlldga90f8y3vhj";
       libraryHaskellDepends = [
         array
         base
         bytestring
         containers
         deepseq
+        fail
         ghc-prim
         haddock-use-refs
         scientific
+        semigroups
         tagged
         text
         trace-embrace
@@ -89027,11 +89120,16 @@ self: {
         array
         base
         bytestring
+        containers
         deepseq
+        fail
+        haddock-use-refs
         http-types
         QuickCheck
         quickcheck-unicode
         scientific
+        semigroups
+        tagged
         tasty
         tasty-bench
         tasty-quickcheck
@@ -89048,13 +89146,18 @@ self: {
         containers
         deepseq
         directory
+        fail
         filepath
         ghc-prim
+        haddock-use-refs
         http-types
         parsec
         scientific
+        semigroups
+        tagged
         tasty-bench
         text
+        trace-embrace
         transformers
         unordered-containers
         vector
@@ -89452,6 +89555,8 @@ self: {
       pname = "audacity";
       version = "0.0.2.2";
       sha256 = "1glvk4mkq8j48s0xm86xb1l3xrb6m3cijcckdm48zq3pz7yg3hd8";
+      revision = "1";
+      editedCabalFile = "1zijgx43yd713czj9r5b2yv26dii4d4i6ar9n0l1c9zqaqv7vh6p";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -90223,6 +90328,94 @@ self: {
     }
   ) { };
 
+  "autodocodec_0_5_0_0" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      dlist,
+      doctest,
+      hashable,
+      mtl,
+      scientific,
+      text,
+      time,
+      unordered-containers,
+      validity,
+      validity-scientific,
+      vector,
+    }:
+    mkDerivation {
+      pname = "autodocodec";
+      version = "0.5.0.0";
+      sha256 = "172z14rfrl7jn0cwsbspyzb884szrmvq1rixd2b8ymc8d278l049";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        dlist
+        hashable
+        mtl
+        scientific
+        text
+        time
+        unordered-containers
+        validity
+        validity-scientific
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        doctest
+      ];
+      description = "Self-documenting encoder and decoder";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  "autodocodec-exact" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-pretty,
+      autodocodec,
+      base,
+      bytestring,
+      containers,
+      mtl,
+      pretty-show,
+      scientific,
+      text,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "autodocodec-exact";
+      version = "0.0.0.1";
+      sha256 = "07ljrfxhkrl7k33nhg51m30334yvjp7jrix6hlwzgfqgr4nsbdas";
+      libraryHaskellDepends = [
+        aeson
+        aeson-pretty
+        autodocodec
+        base
+        bytestring
+        containers
+        mtl
+        pretty-show
+        scientific
+        text
+        unordered-containers
+        vector
+      ];
+      description = "Exact decoder for autodocodec";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   "autodocodec-nix" = callPackage (
     {
       mkDerivation,
@@ -90393,6 +90586,40 @@ self: {
     }
   ) { };
 
+  "autodocodec-servant-multipart_0_0_0_2" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      autodocodec,
+      base,
+      bytestring,
+      servant-multipart,
+      servant-multipart-api,
+      text,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "autodocodec-servant-multipart";
+      version = "0.0.0.2";
+      sha256 = "0zdghkqmrr2d4lj71c3qh62bqvc5frhid8s8zkh3hwkkla7a1ld4";
+      libraryHaskellDepends = [
+        aeson
+        autodocodec
+        base
+        bytestring
+        servant-multipart
+        servant-multipart-api
+        text
+        unordered-containers
+        vector
+      ];
+      description = "Autodocodec interpreters for Servant Multipart";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "autodocodec-swagger2" = callPackage (
     {
       mkDerivation,
@@ -90463,6 +90690,46 @@ self: {
     }
   ) { };
 
+  "autodocodec-yaml_0_4_0_2" = callPackage (
+    {
+      mkDerivation,
+      autodocodec,
+      autodocodec-schema,
+      base,
+      bytestring,
+      containers,
+      path,
+      path-io,
+      safe-coloured-text,
+      scientific,
+      text,
+      vector,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "autodocodec-yaml";
+      version = "0.4.0.2";
+      sha256 = "17ll6bb0qs7nm9s2kf1b2zn67kjv5lwcrs2igllk5vlsajk4difl";
+      libraryHaskellDepends = [
+        autodocodec
+        autodocodec-schema
+        base
+        bytestring
+        containers
+        path
+        path-io
+        safe-coloured-text
+        scientific
+        text
+        vector
+        yaml
+      ];
+      description = "Autodocodec interpreters for yaml";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "autoexporter" = callPackage (
     {
       mkDerivation,
@@ -91933,6 +92200,42 @@ self: {
     }
   ) { };
 
+  "aws-academy-grade-exporter" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      cassava,
+      optparse-applicative,
+      postgresql-simple,
+      req,
+      text,
+      vector,
+    }:
+    mkDerivation {
+      pname = "aws-academy-grade-exporter";
+      version = "0.1.0.0";
+      sha256 = "1wh0sz2x4kfh97yi3811r3vg2qf6i6zp2hyifzz1jy1nra93b6av";
+      isLibrary = false;
+      isExecutable = true;
+      executableHaskellDepends = [
+        aeson
+        base
+        bytestring
+        cassava
+        optparse-applicative
+        postgresql-simple
+        req
+        text
+        vector
+      ];
+      description = "Export grades from AWS Academy to different formats";
+      license = lib.licenses.mit;
+      mainProgram = "aws-academy-grade-exporter";
+    }
+  ) { };
+
   "aws-arn" = callPackage (
     {
       mkDerivation,
@@ -93761,8 +94064,8 @@ self: {
     }:
     mkDerivation {
       pname = "aws-spend-summary";
-      version = "0.2.0.2";
-      sha256 = "0zp9bdrhxl4z8fyjqcilndpj6qw5scs1byh1fzj8v9r4zzg59zsg";
+      version = "0.3.0.0";
+      sha256 = "0lnwlvjqjs4hxqfblrhgqjq6309c466hlnamryprgd3l8nhnpak3";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -95450,7 +95753,6 @@ self: {
       microlens,
       microlens-th,
       mwc-random,
-      primitive,
       reflection,
       time,
       transformers,
@@ -95459,14 +95761,13 @@ self: {
     }:
     mkDerivation {
       pname = "backprop";
-      version = "0.2.6.5";
-      sha256 = "0rc6dsf0zasl9vah8kv61qk2z7s644lzsrmkd7fwxwj1480kb482";
+      version = "0.2.7.2";
+      sha256 = "1v7r2gr18kcrcf12dmjpg2cqg1lanpqfpjwbqqnm1sbibvf467w7";
       libraryHaskellDepends = [
         base
         containers
         deepseq
         microlens
-        primitive
         reflection
         transformers
         vector
@@ -96251,8 +96552,8 @@ self: {
       pname = "ban-instance";
       version = "0.1.0.1";
       sha256 = "0504qsjbqbrdf9avfrhs290baszc9dickx7wknbyxwrzpzzbpggk";
-      revision = "4";
-      editedCabalFile = "1ip2abbxnj2cwc3b0l88s0014zakx4g84ifnnaqq8rg6mcn5ppik";
+      revision = "5";
+      editedCabalFile = "1a0xh0kfdpqgppaisb0hlm4k40gssbxh5jjz2j2l8xn2bnmv95cb";
       libraryHaskellDepends = [
         base
         template-haskell
@@ -97684,6 +97985,8 @@ self: {
       pname = "base64-bytes";
       version = "0.1.1.1";
       sha256 = "0gvh2yg7mqwrswcq5p0h35bifsvm18cdvsjzazz37yrwan0i31vs";
+      revision = "1";
+      editedCabalFile = "17kl1813wdqbh6hjrm7npm2w65d0ir4bpbklggr4bxzxabwbsg2c";
       libraryHaskellDepends = [
         base
         byte-order
@@ -97784,8 +98087,8 @@ self: {
       pname = "base64-bytestring-type";
       version = "1.0.1";
       sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn";
-      revision = "21";
-      editedCabalFile = "1y3j1lkqlqw8l4p0g8s3iac0gd84nz3pqccrzfj7n23fp19zr1q3";
+      revision = "22";
+      editedCabalFile = "0a5640qjbd3f96v9sf6r1laqpqk83xh073qlq75174kcg5zi4rxa";
       libraryHaskellDepends = [
         aeson
         base
@@ -99872,8 +100175,8 @@ self: {
     }:
     mkDerivation {
       pname = "beam-automigrate";
-      version = "0.1.6.0";
-      sha256 = "09pq0i3zb68ad20qznvf4kqf3y3zz0pjfi84g87rxay6y4sj6vi1";
+      version = "0.1.7.0";
+      sha256 = "019b0kykdjqmf2xcj11pi2s67ssy2al882nsj5aq2h1mq6c7bx63";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -99973,8 +100276,8 @@ self: {
     }:
     mkDerivation {
       pname = "beam-core";
-      version = "0.10.3.1";
-      sha256 = "0n3fyjhcljd44ri7z3kb1sd3izv047v82m9n7597r7sbipv8cysc";
+      version = "0.10.4.0";
+      sha256 = "1zxqyxxyid186s86lfw0sq030jckh83j3rwj6ibx4wg3flslk515";
       libraryHaskellDepends = [
         aeson
         base
@@ -100488,6 +100791,72 @@ self: {
     }
   ) { };
 
+  "beam-sqlite_0_5_4_1" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      attoparsec,
+      base,
+      beam-core,
+      beam-migrate,
+      bytestring,
+      direct-sqlite,
+      dlist,
+      free,
+      hashable,
+      monad-control,
+      mtl,
+      network-uri,
+      scientific,
+      sqlite-simple,
+      tasty,
+      tasty-expected-failure,
+      tasty-hunit,
+      text,
+      time,
+      transformers-base,
+    }:
+    mkDerivation {
+      pname = "beam-sqlite";
+      version = "0.5.4.1";
+      sha256 = "1f5yjsx7zfbfbxs3xd64rwn2m3vjffrbdn5xadhm1axhghi6srki";
+      libraryHaskellDepends = [
+        aeson
+        attoparsec
+        base
+        beam-core
+        beam-migrate
+        bytestring
+        direct-sqlite
+        dlist
+        free
+        hashable
+        monad-control
+        mtl
+        network-uri
+        scientific
+        sqlite-simple
+        text
+        time
+        transformers-base
+      ];
+      testHaskellDepends = [
+        base
+        beam-core
+        beam-migrate
+        sqlite-simple
+        tasty
+        tasty-expected-failure
+        tasty-hunit
+        text
+        time
+      ];
+      description = "Beam driver for SQLite";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "beam-th" = callPackage (
     {
       mkDerivation,
@@ -100717,8 +101086,8 @@ self: {
     }:
     mkDerivation {
       pname = "bech32";
-      version = "1.1.8";
-      sha256 = "0y9k93c5rxh0wjdyz4f1qpp6kljdbsrmy5appp4aqvwq2nqz9aas";
+      version = "1.1.9";
+      sha256 = "0l3h4c1aqjqrlxdc4gq409dwly61i7k2d7g3gz0gya9nf39xc3f4";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -100775,8 +101144,8 @@ self: {
     }:
     mkDerivation {
       pname = "bech32-th";
-      version = "1.1.8";
-      sha256 = "0dg79llv3rrakhskzpbs1qdwjn8i1whn1fn3xqkd9scmwh26a2n2";
+      version = "1.1.9";
+      sha256 = "0bc3wx5np17lb1y4s843f8m65687ainiv8biqfhfg7i2gfsc60cs";
       libraryHaskellDepends = [
         base
         bech32
@@ -102148,8 +102517,8 @@ self: {
       pname = "bhoogle";
       version = "0.1.4.4";
       sha256 = "1z19h0jgnipj16rqbrflcjnqaslafq9bvwkyg8q0il76q7s4wyxa";
-      revision = "1";
-      editedCabalFile = "182j2bc4cqddzv5vd2fkkyx2qs9ya7vg9r234xr5gyp35waln1i9";
+      revision = "2";
+      editedCabalFile = "1kpzvlzydrfqjhmpjirb51xhnwircdcnmhbn82nvnvm5s4h0pajd";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -111006,8 +111375,8 @@ self: {
     }:
     mkDerivation {
       pname = "blockfrost-api";
-      version = "0.12.2.0";
-      sha256 = "04w745ws2nf90yix2idd6shahqfi7mwx83j4divjrkfb57pd8v6p";
+      version = "0.13.0.0";
+      sha256 = "0nghxnx9kjwk2frzsy0zrskvn3yffy7xp2fa70hl25bsc4sa2zar";
       libraryHaskellDepends = [
         aeson
         base
@@ -111069,8 +111438,8 @@ self: {
     }:
     mkDerivation {
       pname = "blockfrost-client";
-      version = "0.9.2.0";
-      sha256 = "04q48afris70y4j4ya52kvj9n1iy8jqn6ygydp11idr15fpjj4qh";
+      version = "0.10.0.0";
+      sha256 = "0jyg2mc8jmwpsix46nh8r6bc2p1j5rdrjsrcdyyvqz5a2ri6hac7";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -111241,6 +111610,59 @@ self: {
     }
   ) { };
 
+  "blockio-uring" = callPackage (
+    {
+      mkDerivation,
+      async,
+      base,
+      containers,
+      liburing,
+      primitive,
+      quickcheck-classes,
+      random,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      time,
+      unix,
+      vector,
+    }:
+    mkDerivation {
+      pname = "blockio-uring";
+      version = "0.1.0.0";
+      sha256 = "1g4sd7wqxf86i1c5iqiar6mpdszk99v7p71jcrx3dm8pap69r1x7";
+      libraryHaskellDepends = [
+        base
+        primitive
+        vector
+      ];
+      libraryPkgconfigDepends = [ liburing ];
+      testHaskellDepends = [
+        base
+        primitive
+        quickcheck-classes
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+        vector
+      ];
+      testPkgconfigDepends = [ liburing ];
+      benchmarkHaskellDepends = [
+        async
+        base
+        containers
+        primitive
+        random
+        time
+        unix
+        vector
+      ];
+      benchmarkPkgconfigDepends = [ liburing ];
+      description = "Perform batches of asynchronous disk IO operations";
+      license = lib.licenses.bsd3;
+    }
+  ) { inherit (pkgs) liburing; };
+
   "blogination" = callPackage (
     {
       mkDerivation,
@@ -113623,8 +114045,8 @@ self: {
       pname = "boomwhacker";
       version = "0.0.2";
       sha256 = "0q5cq5j7dy1qm5jqpcl1imwiqqm0h21yvqwnvabsjnfrvfvryqg2";
-      revision = "1";
-      editedCabalFile = "0hwqdahpbinw9m7h05q0fhakj4w8mlvqz0ah6609x6wgb0dggmyb";
+      revision = "2";
+      editedCabalFile = "0jqys322j818dc24fyb37a59qs66m3b46j05y4vswipakwm1kgmk";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -116864,6 +117286,8 @@ self: {
       pname = "brotli";
       version = "0.0.0.2";
       sha256 = "09y460adrq6cp9d8qlf8522yb0qc1vgjxv4d56kq2rdf9khqic6z";
+      revision = "1";
+      editedCabalFile = "1a0lbghilwpa6hb5msivb7hjqnnxi2bxlfgiawv0mjpc7gidhbz7";
       libraryHaskellDepends = [
         base
         bytestring
@@ -116946,8 +117370,8 @@ self: {
       pname = "brotli-streams";
       version = "0.0.0.0";
       sha256 = "14jc1nhm50razsl99d95amdf4njf75dnzx8vqkihgrgp7qisyz3z";
-      revision = "9";
-      editedCabalFile = "1rhy0d1jy3v9r1skg3bdlnjj5avxy968ih1cyg9x9yb7rbyf3za5";
+      revision = "10";
+      editedCabalFile = "0v0zg5q9ahf8kvfm9zwlj4ws1yd3bvdxyxkak3xk7nca49vb8mcm";
       libraryHaskellDepends = [
         base
         brotli
@@ -118141,8 +118565,8 @@ self: {
     }:
     mkDerivation {
       pname = "bugsnag";
-      version = "1.1.0.1";
-      sha256 = "1n2lq9iyz5m0s1mx22cwaci18f9i37g6xgdq3nbbyysmylrw09w2";
+      version = "1.1.0.2";
+      sha256 = "1f0jsad9z9zsj8sbirq6h1x0s7245rxv5gpciz4p8wv9ryi8d3m3";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -118174,6 +118598,63 @@ self: {
     }
   ) { };
 
+  "bugsnag_1_2_0_0" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      annotated-exception,
+      base,
+      bugsnag-hs,
+      bytestring,
+      containers,
+      Glob,
+      hspec,
+      http-client,
+      http-client-tls,
+      parsec,
+      template-haskell,
+      text,
+      th-lift-instances,
+      ua-parser,
+      unliftio,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "bugsnag";
+      version = "1.2.0.0";
+      sha256 = "0hhr4z1jdsbg8jx2416dgpad0lirzdjiv79s4ykhfimn2pqk9liq";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        annotated-exception
+        base
+        bugsnag-hs
+        bytestring
+        containers
+        Glob
+        http-client
+        http-client-tls
+        parsec
+        template-haskell
+        text
+        th-lift-instances
+        ua-parser
+        unliftio
+        unordered-containers
+      ];
+      testHaskellDepends = [
+        annotated-exception
+        base
+        hspec
+        unliftio
+      ];
+      description = "Bugsnag error reporter for Haskell";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "bugsnag-haskell" = callPackage (
     {
       mkDerivation,
@@ -118302,8 +118783,8 @@ self: {
     }:
     mkDerivation {
       pname = "bugsnag-wai";
-      version = "1.0.0.1";
-      sha256 = "0f3x4m9nl277rhg2pwrja9xh6fffrwl2dm1cf3jiyngkrbrfck0w";
+      version = "1.0.1.1";
+      sha256 = "0wi0ip7fjzk3hvw2i19wjj08pn0bvmnx9j68lh4hgc8a0bdr69bg";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -119196,8 +119677,8 @@ self: {
     }:
     mkDerivation {
       pname = "burrito";
-      version = "2.0.1.13";
-      sha256 = "1bg3nd994xrwpirqn2hsbk831fralal946sac3ljslxjlvxar8v6";
+      version = "2.0.1.14";
+      sha256 = "1mywmf72rsj5p6mrg3454wsihlh1b26x4acb2gp0awx4bg96j09i";
       libraryHaskellDepends = [
         base
         bytestring
@@ -120630,8 +121111,8 @@ self: {
     }:
     mkDerivation {
       pname = "byteslice";
-      version = "0.2.14.0";
-      sha256 = "0s9cnb7p1wr5vh3j95a952222xf2xzli451las5il3n04n4rxq1n";
+      version = "0.2.15.0";
+      sha256 = "10fcb7g9m4rkd6mza2km64agsgkwrbl7crv5hdcd5yljq6gyx2fm";
       libraryHaskellDepends = [
         base
         bytestring
@@ -122727,8 +123208,8 @@ self: {
       pname = "cabal-add";
       version = "0.1";
       sha256 = "1szbi0z8yf98641rwnj856gcfsvvflxwrfxraxy6rl60m7i0mab1";
-      revision = "2";
-      editedCabalFile = "1qb5xq7r68psc2dpp8wdfcfd1w4nls7xfla1fkc9vppd8zxmi87m";
+      revision = "3";
+      editedCabalFile = "0siv5ajqxcbs9c0ky94p5qk51w6cgf1zyc3rckxvlc25f4kygw4v";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -122764,6 +123245,67 @@ self: {
     }
   ) { };
 
+  "cabal-add_0_2" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      Cabal,
+      cabal-install-parsers,
+      Cabal-syntax,
+      containers,
+      Diff,
+      directory,
+      filepath,
+      mtl,
+      optparse-applicative,
+      process,
+      string-qq,
+      tasty,
+      temporary,
+    }:
+    mkDerivation {
+      pname = "cabal-add";
+      version = "0.2";
+      sha256 = "0fd098gkfmxrhq0k4j1ll5g4xwwzgmhdx0mj9hnp5xanj7z1laxg";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        bytestring
+        Cabal
+        Cabal-syntax
+        containers
+        mtl
+      ];
+      executableHaskellDepends = [
+        base
+        bytestring
+        cabal-install-parsers
+        Cabal-syntax
+        directory
+        filepath
+        optparse-applicative
+        process
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        Cabal
+        Diff
+        directory
+        process
+        string-qq
+        tasty
+        temporary
+      ];
+      description = "Extend Cabal build-depends from the command line";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "cabal-add";
+    }
+  ) { };
+
   "cabal-appimage" = callPackage (
     {
       mkDerivation,
@@ -123131,8 +123673,8 @@ self: {
     }:
     mkDerivation {
       pname = "cabal-cargs";
-      version = "1.6.0";
-      sha256 = "1kn21l5w838db558nijblar6i3z5jkh12d6l1yccxmd70lrb39vv";
+      version = "1.7.0";
+      sha256 = "17q51lg7vhdzvy9s8f3zplxa4mij2bjclzxry5f9d2pgiq4290p9";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -123313,8 +123855,8 @@ self: {
     }:
     mkDerivation {
       pname = "cabal-debian";
-      version = "5.2.5";
-      sha256 = "0nkrvs1a9kj2nqz9pklxzni5wbirwgqim9haqn8lglqliycrdzbx";
+      version = "5.2.6";
+      sha256 = "081h14nw6spfpr6l0cd9knc2jw8g3zhlwyhq7zrxvfrlqwwwm14w";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -123761,8 +124303,8 @@ self: {
       pname = "cabal-flatpak";
       version = "0.1.2";
       sha256 = "05ig175b2glxppn5wr05pnncqkp8yhhy1m7ymmc1jk5pmiy3zvzi";
-      revision = "1";
-      editedCabalFile = "0fhwfjrq20zqh64cb0iv2civljacllgy3zqsyjlydmphs95v5hhv";
+      revision = "2";
+      editedCabalFile = "01iqpfj5nvl19580ckl4b0aljl86svplxzpkavp5r0jbwaqi0ll3";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -124658,7 +125200,7 @@ self: {
     }
   ) { };
 
-  "cabal-install-parsers_0_6_2" = callPackage (
+  "cabal-install-parsers_0_6_3" = callPackage (
     {
       mkDerivation,
       aeson,
@@ -124690,8 +125232,8 @@ self: {
     }:
     mkDerivation {
       pname = "cabal-install-parsers";
-      version = "0.6.2";
-      sha256 = "1362p021irm0kaz7n8gdjy1ppjk914zza114cmpm87ris0i1a9jn";
+      version = "0.6.3";
+      sha256 = "1vcy6y1p750g4v9zqmsakrcvw78p43n2b745fl02xq7xyr5lpfij";
       libraryHaskellDepends = [
         aeson
         base
@@ -125062,8 +125604,8 @@ self: {
     }:
     mkDerivation {
       pname = "cabal-plan";
-      version = "0.7.5.0";
-      sha256 = "0svvsh3ir9z1pdjbbhi8fkcqv66812hixnv18vifhcw0v8w94ymi";
+      version = "0.7.6.0";
+      sha256 = "0n6q56gyyiflagka0bhmp077py71xdc9j921yyl7818q6b6ha3hs";
       configureFlags = [ "-fexe" ];
       isLibrary = true;
       isExecutable = true;
@@ -125552,6 +126094,8 @@ self: {
       pname = "cabal-sort";
       version = "0.1.2.2";
       sha256 = "1gyx5d485mzya147d7gwh0i9bkvdqxixrb80bfv5sn710p07bfdz";
+      revision = "1";
+      editedCabalFile = "0hlz8y734rgcqjlncv0bwi05m30iviz6bi9bsafvsv1w25lxlpc4";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -126869,8 +127413,8 @@ self: {
     }:
     mkDerivation {
       pname = "cachix";
-      version = "1.7.8";
-      sha256 = "18vp2r0q6ibk5snsys7qh65vmshp4344z29pqdp8qfwzk5yqc3hc";
+      version = "1.7.9";
+      sha256 = "02q0z2f668y826f9rspwwn1kw3ma1igwsh2fp291g4sz8x6z66fv";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -127030,8 +127574,8 @@ self: {
     }:
     mkDerivation {
       pname = "cachix-api";
-      version = "1.7.8";
-      sha256 = "0rvmfwmgyn6jpivq45f5v5sg0s007ansjmizflxgiqn4sfqbkndr";
+      version = "1.7.9";
+      sha256 = "1jp55yvih27xkpky4i6pl37ajwyql84cniz2nhgwdb67qac5nmgi";
       libraryHaskellDepends = [
         aeson
         async
@@ -131854,10 +132398,10 @@ self: {
     }:
     mkDerivation {
       pname = "cassava";
-      version = "0.5.3.2";
-      sha256 = "1jd9s10z2y3hizrpy3iaw2vvqmk342zxhwkky57ba39cbli5vlis";
+      version = "0.5.4.0";
+      sha256 = "0vdbmvb36sg08glig1dqc8kb1s07l5fcn2n0c58iglkv5djsbpnr";
       revision = "1";
-      editedCabalFile = "0xkqzvj5xd6d37gpf2rm9cp2p2lhkc3jgd0gvlmv99vcmy125rdj";
+      editedCabalFile = "1w7mih2wpbgv0bn2cg2ip0ffsn2y7aywqixi1lig30yarsyc873x";
       configureFlags = [ "-f-bytestring--lt-0_10_4" ];
       libraryHaskellDepends = [
         array
@@ -132181,14 +132725,21 @@ self: {
   ) { };
 
   "cassette" = callPackage (
-    { mkDerivation, base }:
+    {
+      mkDerivation,
+      base,
+      profunctors,
+    }:
     mkDerivation {
       pname = "cassette";
-      version = "0.1.0";
-      sha256 = "04qnk1s4bdj3wbbxdwzzvpnhkcgma8c4qfkg454ybg7f8kyv6h7x";
-      libraryHaskellDepends = [ base ];
-      description = "A combinator library for simultaneously defining parsers and pretty printers";
-      license = lib.licenses.bsd3;
+      version = "0.2.0.1";
+      sha256 = "1rl5bb7bhprvnqcr55psbgws96xvjfci5nimhly3avs7pvkwxbhj";
+      libraryHaskellDepends = [
+        base
+        profunctors
+      ];
+      description = "Combinators to simultaneously define parsers and pretty printers";
+      license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -132829,38 +133380,31 @@ self: {
   "cauldron" = callPackage (
     {
       mkDerivation,
-      algebraic-graphs,
       base,
-      bytestring,
       containers,
       tasty,
       tasty-hunit,
-      text,
       transformers,
     }:
     mkDerivation {
       pname = "cauldron";
-      version = "0.6.1.0";
-      sha256 = "04anjjpjvj51x27mq9n2sc88v6398bz5ljzq049d879avl0i08sj";
+      version = "0.8.0.0";
+      sha256 = "1vkvxkr3lr99xvd4vqga18idcpw3p1mv8hr94qagvfqdxrd68wcl";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
-        algebraic-graphs
         base
-        bytestring
         containers
-        text
       ];
       executableHaskellDepends = [ base ];
       testHaskellDepends = [
-        algebraic-graphs
         base
         containers
         tasty
         tasty-hunit
-        text
         transformers
       ];
+      doHaddock = false;
       description = "Dependency injection library";
       license = lib.licenses.bsd3;
       mainProgram = "cauldron-example-wiring";
@@ -133243,8 +133787,8 @@ self: {
       pname = "cborg";
       version = "0.2.10.0";
       sha256 = "15y7p5rsv76fpklh4rgrxlxxaivpbchxdfdw96mqqjgw7060gzhp";
-      revision = "2";
-      editedCabalFile = "0m1ndq1a4yya5p7093lw3ynpcw2q74s73im0bhm9jp6a19cj88m5";
+      revision = "3";
+      editedCabalFile = "1ahqlq51kjc8cf5sybbmrh4rf6vsbkcd67rhxhrr9rc5w6nl9h27";
       libraryHaskellDepends = [
         array
         base
@@ -133310,8 +133854,8 @@ self: {
       pname = "cborg-json";
       version = "0.2.6.0";
       sha256 = "1p6xdimwypmlsc0zdyw1vyyapnhwn2g8b9n0a83ca6h4r90722yv";
-      revision = "3";
-      editedCabalFile = "1dlmm5jyl8a8rxpkvr2dk5dlsvxrap3x4pbwnx4mg3q7sz25rs8r";
+      revision = "4";
+      editedCabalFile = "06pjqx8v7j8f6rvkf84vahva8y02lykaymnjdrjqrc5rgy01c6m0";
       libraryHaskellDepends = [
         aeson
         aeson-pretty
@@ -136239,7 +136783,7 @@ self: {
     }
   ) { };
 
-  "chart-svg_0_8_0_3" = callPackage (
+  "chart-svg_0_8_1_0" = callPackage (
     {
       mkDerivation,
       base,
@@ -136263,8 +136807,8 @@ self: {
     }:
     mkDerivation {
       pname = "chart-svg";
-      version = "0.8.0.3";
-      sha256 = "0qvnxm90vka02pplz9fxncsplnsbxkh9xcp81wik0g795g7xkpsp";
+      version = "0.8.1.0";
+      sha256 = "1rsix6qdxhsgjg4zp7rh5di6y5mjxjv0mzv9g82ryl3vlcryyaj4";
       libraryHaskellDepends = [
         base
         bytestring
@@ -147181,10 +147725,10 @@ self: {
     }:
     mkDerivation {
       pname = "co-log-concurrent";
-      version = "0.5.1.0";
-      sha256 = "07qmx9z03vmgq2cgz4352fsav7r1nx8n7svmrhg2lkdiyp0j7a59";
-      revision = "3";
-      editedCabalFile = "17pmkgly1882hbwa6b2qb0y1wh4x4nawhw1vl8fsy252caxkck0s";
+      version = "0.5.1.1";
+      sha256 = "1yw5ljanhc176k4xj1pfqkhq6c63hv5an7pm06vjiakmk6j4rqlg";
+      revision = "1";
+      editedCabalFile = "071xrzj7bjnb32f5dlsqa726cmw9s9q22bv7ch4gj2r83crng68g";
       libraryHaskellDepends = [
         base
         co-log-core
@@ -147284,8 +147828,8 @@ self: {
     }:
     mkDerivation {
       pname = "co-log-json";
-      version = "0.1.0.0";
-      sha256 = "0212dcaw4anjn569a8gpv30k09b9lk99r70bbsh7kb8hb268rk83";
+      version = "0.1.0.2";
+      sha256 = "0lr8599hqiyg70qw5pmdbrpm1lyps819h7anxxi4ip2r1im2p3xd";
       libraryHaskellDepends = [
         aeson
         base
@@ -152521,8 +153065,8 @@ self: {
     }:
     mkDerivation {
       pname = "compactmap";
-      version = "0.1.4.5";
-      sha256 = "1xa4wa4qjd7yjghkaakpgrz9kw4iyy0zlc9cpajyysaxdq4k7czf";
+      version = "0.1.4.6";
+      sha256 = "1lkvhmdz77m6jm43946q2g6ijl7w6kqs9n68g1gzfxw6akmpy39y";
       libraryHaskellDepends = [
         base
         vector
@@ -156491,8 +157035,10 @@ self: {
     }:
     mkDerivation {
       pname = "conduit-extra";
-      version = "1.3.7";
-      sha256 = "0mrbaf4lrnczgn1kxjwpmzxk226wprw10y9xg621g74h4s36zgdj";
+      version = "1.3.8";
+      sha256 = "08l2728vyr3dppnj4z3yagi2265ixp8g8ayhz07x3x88jj73w7s9";
+      revision = "1";
+      editedCabalFile = "1fq0cs2fcn2kd1mvp9ygsp7rm5qridwp1wwnr60jmpahvihb4cp9";
       libraryHaskellDepends = [
         async
         attoparsec
@@ -156552,8 +157098,6 @@ self: {
       conduit,
       conduit-combinators,
       conduit-extra,
-      directory,
-      doctest,
       either,
       exceptions,
       filepath,
@@ -156562,19 +157106,22 @@ self: {
       monad-control,
       mtl,
       regex-posix,
+      resourcet,
       semigroups,
       streaming-commons,
       text,
       time,
       transformers,
       transformers-base,
+      transformers-either,
       unix,
       unix-compat,
+      unliftio-core,
     }:
     mkDerivation {
       pname = "conduit-find";
-      version = "0.1.0.3";
-      sha256 = "13gbpvqxs3k2vlsbdn0vr90z4y8kaz7hlw9bywyqd8jna3ff13a9";
+      version = "0.1.0.4";
+      sha256 = "03mrfqmxryrv21adk6ijf3isfffjhf91qkjqqrlfkm3fxhz2xp4m";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -156590,13 +157137,16 @@ self: {
         monad-control
         mtl
         regex-posix
+        resourcet
         semigroups
         streaming-commons
         text
         time
         transformers
         transformers-base
+        transformers-either
         unix-compat
+        unliftio-core
       ];
       executableHaskellDepends = [
         attoparsec
@@ -156611,6 +157161,7 @@ self: {
         monad-control
         mtl
         regex-posix
+        resourcet
         semigroups
         streaming-commons
         text
@@ -156618,14 +157169,13 @@ self: {
         transformers
         transformers-base
         unix
+        unliftio-core
       ];
       testHaskellDepends = [
         attoparsec
         base
         conduit
         conduit-combinators
-        directory
-        doctest
         either
         exceptions
         filepath
@@ -156634,6 +157184,7 @@ self: {
         monad-control
         mtl
         regex-posix
+        resourcet
         semigroups
         streaming-commons
         text
@@ -156641,6 +157192,7 @@ self: {
         transformers
         transformers-base
         unix-compat
+        unliftio-core
       ];
       description = "A file-finding conduit that allows user control over traversals";
       license = lib.licenses.mit;
@@ -161101,8 +161653,8 @@ self: {
     }:
     mkDerivation {
       pname = "control-block";
-      version = "0.0.1";
-      sha256 = "06l9s8inrdqp9z4zsd178rk3211zmhx4acwxq1py801lpb7vgn8v";
+      version = "0.0.2";
+      sha256 = "0p79ic8yq9jw86jiyxs6k6z740w25ckkdn0lp3rj8rxya2h7viaw";
       libraryHaskellDepends = [
         base
         indexed-traversable
@@ -161905,6 +162457,68 @@ self: {
     }
   ) { };
 
+  "convex-schema-parser" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      containers,
+      deepseq,
+      directory,
+      filepath,
+      fsnotify,
+      HUnit,
+      mtl,
+      optparse-applicative,
+      parsec,
+      process,
+      split,
+      stm,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "convex-schema-parser";
+      version = "0.1.3.0";
+      sha256 = "01z32fdxzwqbn8i7izh4amqa3jv4zfkxjn2zcy3fmyc7js72az68";
+      isLibrary = false;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        containers
+        directory
+        filepath
+        mtl
+        parsec
+        process
+        split
+      ];
+      executableHaskellDepends = [
+        aeson
+        base
+        deepseq
+        directory
+        filepath
+        fsnotify
+        optparse-applicative
+        parsec
+        process
+        stm
+        yaml
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        HUnit
+        mtl
+        parsec
+      ];
+      doHaddock = false;
+      description = "A type-safe client generator for Convex for both Rust and Python";
+      license = lib.licenses.mit;
+      mainProgram = "convex-schema-parser";
+    }
+  ) { };
+
   "convexHullNd" = callPackage (
     {
       mkDerivation,
@@ -164459,6 +165073,8 @@ self: {
       pname = "countdown-numbers-game";
       version = "0.0.0.1";
       sha256 = "1warpkqimxjvqrm1jq4nbj3g3bz009alklqs46dh23p3lrgcif61";
+      revision = "1";
+      editedCabalFile = "05106icwf7kvnwj5109yim2xyx8q5lxvccbn2dqb0q571h5v1a5q";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -167179,6 +167795,8 @@ self: {
       pname = "criterion";
       version = "1.6.4.0";
       sha256 = "0l9gxar759nskhm7gskr3j08bw8515amw6rr4n3zx3978dxg8aq6";
+      revision = "1";
+      editedCabalFile = "0wwzijzvqrv7swpalr24i3j4pjcjm266ybhhah853d783zz37vzz";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -172222,6 +172840,102 @@ self: {
     }
   ) { inherit (pkgs) cudd; };
 
+  "cuddle" = callPackage (
+    {
+      mkDerivation,
+      base,
+      base16-bytestring,
+      boxes,
+      bytestring,
+      capability,
+      cborg,
+      containers,
+      data-default-class,
+      foldable1-classes-compat,
+      generic-optics,
+      hashable,
+      hspec,
+      hspec-megaparsec,
+      HUnit,
+      megaparsec,
+      mtl,
+      mutable-containers,
+      optics-core,
+      optparse-applicative,
+      ordered-containers,
+      parser-combinators,
+      prettyprinter,
+      QuickCheck,
+      random,
+      regex-tdfa,
+      scientific,
+      string-qq,
+      text,
+      tree-diff,
+    }:
+    mkDerivation {
+      pname = "cuddle";
+      version = "0.5.0.0";
+      sha256 = "1vjm6v5wf1hbj7ikwmfxf4ah62g4j33nhqqc1xjb9dll5jlvadyn";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        base16-bytestring
+        boxes
+        bytestring
+        capability
+        cborg
+        containers
+        data-default-class
+        foldable1-classes-compat
+        generic-optics
+        hashable
+        megaparsec
+        mtl
+        mutable-containers
+        optics-core
+        ordered-containers
+        parser-combinators
+        prettyprinter
+        random
+        regex-tdfa
+        scientific
+        text
+        tree-diff
+      ];
+      executableHaskellDepends = [
+        base
+        base16-bytestring
+        bytestring
+        cborg
+        megaparsec
+        mtl
+        optparse-applicative
+        prettyprinter
+        random
+        text
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        data-default-class
+        hspec
+        hspec-megaparsec
+        HUnit
+        megaparsec
+        prettyprinter
+        QuickCheck
+        string-qq
+        text
+        tree-diff
+      ];
+      description = "CDDL Generator and test utilities";
+      license = lib.licenses.asl20;
+      mainProgram = "cuddle";
+    }
+  ) { };
+
   "cue-sheet" = callPackage (
     {
       mkDerivation,
@@ -176661,6 +177375,36 @@ self: {
     }
   ) { };
 
+  "data-debruijn" = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      deepseq,
+      ghc-bignum,
+      ghc-prim,
+      QuickCheck,
+    }:
+    mkDerivation {
+      pname = "data-debruijn";
+      version = "0.1.0.0";
+      sha256 = "1zwi7wsznmhph5nljhxzk1rbz5a8qz79j8djdkqc169z5f7fkssv";
+      revision = "1";
+      editedCabalFile = "1njc7m4g0nwj9ww2gk2z83xbll8pcchmmix109fwgwgz9jv26ckr";
+      libraryHaskellDepends = [
+        base
+        containers
+        deepseq
+        ghc-bignum
+        ghc-prim
+        QuickCheck
+      ];
+      doHaddock = false;
+      description = "Fast and safe implementation of common compiler machinery";
+      license = lib.licenses.agpl3Only;
+    }
+  ) { };
+
   "data-default" = callPackage (
     {
       mkDerivation,
@@ -180567,8 +181311,8 @@ self: {
     }:
     mkDerivation {
       pname = "dataframe";
-      version = "0.1.0.3";
-      sha256 = "0p4syk43nz1b9x9fzm3hgrdgksjs3siqgczaf2bqmgrra61fw8nh";
+      version = "0.2.0.1";
+      sha256 = "1qgdlmyz4mlvqb1qicspv7yiddyla8kxczx7018myryws9861f52";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -181758,7 +182502,7 @@ self: {
     }
   ) { };
 
-  "dbus_1_4_0" = callPackage (
+  "dbus_1_4_1" = callPackage (
     {
       mkDerivation,
       base,
@@ -181794,8 +182538,8 @@ self: {
     }:
     mkDerivation {
       pname = "dbus";
-      version = "1.4.0";
-      sha256 = "1rb5q8g0n3fj9b57wlds7ldji029fqym4dvpvq10hmn7qw313dz6";
+      version = "1.4.1";
+      sha256 = "016xrx8gnvldpwgalpsxzvkwagavpzw9m7j65w5msskaxk474ln7";
       libraryHaskellDepends = [
         base
         bytestring
@@ -183531,17 +184275,19 @@ self: {
       containers,
       hspec,
       markdown-unlit,
+      scientific,
       text,
       vector,
     }:
     mkDerivation {
       pname = "debug-print";
-      version = "0.2.0.1";
-      sha256 = "1bcdmnkxcyicw4f57vlx64iyfj3lwz1157s89k4gdyk3ilc2x8g4";
+      version = "0.2.1.0";
+      sha256 = "1mgl8sc69fbpcx3hrb8b1dcsgs2zzflms5ryf3zbs8j91yvpx02s";
       libraryHaskellDepends = [
         aeson
         base
         containers
+        scientific
         text
         vector
       ];
@@ -183864,8 +184610,8 @@ self: {
       pname = "decimal-literals";
       version = "0.1.0.1";
       sha256 = "0lbpnc4c266fbqjzzrnig648zzsqfaphlxqwyly9xd15qggzasb0";
-      revision = "3";
-      editedCabalFile = "1650vnqwjsqg2mghsvghiyzg5qqbz36vibkq8614adhyjpcd3w07";
+      revision = "4";
+      editedCabalFile = "1jiayinmqx35lm7n5dwgfqfq8pafdz7q1ysv8lqqjaiylrlm092r";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [
         base
@@ -184303,7 +185049,7 @@ self: {
     }
   ) { };
 
-  "deepseq_1_5_1_0" = callPackage (
+  "deepseq_1_5_2_0" = callPackage (
     {
       mkDerivation,
       base,
@@ -184311,8 +185057,8 @@ self: {
     }:
     mkDerivation {
       pname = "deepseq";
-      version = "1.5.1.0";
-      sha256 = "0yz1b3c4fpa1pknwd64fba37wbr7mxzawd0han2ifq70mgiqfkiz";
+      version = "1.5.2.0";
+      sha256 = "1rgv1kn3igdip34bpn24syirmsjllipd98l301y5n225gw6q1mq9";
       libraryHaskellDepends = [
         base
         ghc-prim
@@ -185476,6 +186222,8 @@ self: {
       pname = "deltaq";
       version = "1.0.0.0";
       sha256 = "00zpvwxar13rq84li7j21ycapdnyx128cs2yqvn6hwnrr8w25w9d";
+      revision = "1";
+      editedCabalFile = "1i4lkq6w34ik7csx6wpwy4by2vbdijilpynwjf9kr7dfn5ac2gz1";
       libraryHaskellDepends = [
         base
         Chart
@@ -190551,8 +191299,8 @@ self: {
       pname = "diagrams-builder";
       version = "0.8.0.6";
       sha256 = "17yi5dmcxx4sgk3wha386zbv9h69pwq72j8i21vmfh35brxhs9f4";
-      revision = "2";
-      editedCabalFile = "1mkxn0r6wmxyvdhwly1a6j0z4j234mfv7aimirwl7jmcv55lwbs4";
+      revision = "3";
+      editedCabalFile = "0pi4509j5i8jgxn0a9z39ac1sr8n2n97v8pfyla9s30sc63ybjag";
       configureFlags = [
         "-fcairo"
         "-fps"
@@ -190657,7 +191405,7 @@ self: {
     }
   ) { };
 
-  "diagrams-cairo_1_4_3" = callPackage (
+  "diagrams-cairo_1_5" = callPackage (
     {
       mkDerivation,
       array,
@@ -190684,8 +191432,10 @@ self: {
     }:
     mkDerivation {
       pname = "diagrams-cairo";
-      version = "1.4.3";
-      sha256 = "0irj7jigi9dfprjilndyx0kwg7vjpbhrsxhlsqc8n1sy1b4s2aha";
+      version = "1.5";
+      sha256 = "1s0cq1sv158b7pszhipc4f5555zfqz1xxa7hdd13afx7jnh68z3i";
+      revision = "1";
+      editedCabalFile = "19daz3jx4kc4pqr0ffq4wrpfwk95xz3fnhlacba9q96aw3c1vcnd";
       libraryHaskellDepends = [
         array
         base
@@ -190779,8 +191529,8 @@ self: {
       pname = "diagrams-canvas";
       version = "1.4.2";
       sha256 = "0ns1xmgcjqig7qld7r77rbcrk779cmzj7xfqj6a7sbdci3in2dgm";
-      revision = "1";
-      editedCabalFile = "08pm7i10k7a046jjrdbzhmlrv05wp171mblgs8y18m6vc8hw87v6";
+      revision = "2";
+      editedCabalFile = "0if7b5dzgrdqz491ma31kizasiyaa3pc0m570r4ccr4m2gs7jz2m";
       libraryHaskellDepends = [
         base
         blank-canvas
@@ -190918,8 +191668,8 @@ self: {
       pname = "diagrams-contrib";
       version = "1.4.6";
       sha256 = "1x5z361xmqfa503brmf0zwyq3lldm9kgixx90v14s4dsz52my46k";
-      revision = "1";
-      editedCabalFile = "00zgzy7b3vkjd0f22hbp2lknwl1x5nd6d1ng30wq4qlncwdxqkpz";
+      revision = "3";
+      editedCabalFile = "07yslc0ds8sj412xgy13dxa7g2a8psgx06nds99yd55bfppias32";
       libraryHaskellDepends = [
         base
         circle-packing
@@ -191030,10 +191780,8 @@ self: {
     }:
     mkDerivation {
       pname = "diagrams-gi-cairo";
-      version = "1.4.2";
-      sha256 = "0k6fw1vvqa4pra4czd90n7i7h1vf6hn08a4jip1xbqkf57d89bn6";
-      revision = "1";
-      editedCabalFile = "1r1ph8nc7xgh3by63dsamkvhi6bvw1bgvhnc8f664iiziaj9p08a";
+      version = "1.5";
+      sha256 = "1wkr52maf7320k75si6lbwds39i0zw0mhd8b4y5h262ifqfkyi1s";
       libraryHaskellDepends = [
         array
         base
@@ -191105,8 +191853,8 @@ self: {
       pname = "diagrams-gtk";
       version = "1.4";
       sha256 = "1sga2wwkircjgryd4pn9i0wvvcnh3qnhpxas32crpdq939idwsxn";
-      revision = "6";
-      editedCabalFile = "0fiv5w3pk8rbj6d28qyay13h25px7fs1flzqdriz1n74f6prnj98";
+      revision = "7";
+      editedCabalFile = "065hmxb3hhaa7g1xbay0wa29zcyivxrp289l9wrak7pg610ri3j3";
       libraryHaskellDepends = [
         base
         cairo
@@ -191590,8 +192338,8 @@ self: {
       pname = "diagrams-lib";
       version = "1.5";
       sha256 = "0gp9k6cfc62j6rlfiziig6j5shf05d0vbcvss40rzjk8qi012i11";
-      revision = "1";
-      editedCabalFile = "092pidlcpqxrjqjmpwgiznqkjzz1qwbkxb8526k2gi7n1zy2bw3v";
+      revision = "2";
+      editedCabalFile = "0499yz41prmsixfq2h9virqr9fkn9akllxxf0yc2kqkv7ran2ij9";
       libraryHaskellDepends = [
         active
         adjunctions
@@ -191675,8 +192423,8 @@ self: {
     }:
     mkDerivation {
       pname = "diagrams-pandoc";
-      version = "0.4";
-      sha256 = "164f0k1jk8p604h31wypy2z2jy5x0gfbkbmmrd64c9jp7j71iyc4";
+      version = "0.4.1";
+      sha256 = "1gil467zp3n6wymiw4d492izf1hhac01j4nafmahjh4ybvi840xr";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -191797,6 +192545,8 @@ self: {
       pname = "diagrams-pgf";
       version = "1.5";
       sha256 = "13zm00ayyk6gvlh4l2wdmrdqic386v69i3krylgvrajhdsd050al";
+      revision = "1";
+      editedCabalFile = "0vzi1dim76arwjrh9yqb9l2004ffsir8rws4vx26is5wzxsqf8y1";
       libraryHaskellDepends = [
         base
         bytestring
@@ -191887,8 +192637,8 @@ self: {
       pname = "diagrams-postscript";
       version = "1.5.2";
       sha256 = "08kqhnd5r60kisjraypwjfcri1v4f32rf14js413871pgic4rhy5";
-      revision = "1";
-      editedCabalFile = "0ndvf9nhvgwvwnc0k9in3n83l3jif1nzsyyrmpk5plif590hj1zp";
+      revision = "2";
+      editedCabalFile = "060zkv836i1df97nqkna8fnqkyxv4wgmk7yn74whyf1fii4rf86g";
       libraryHaskellDepends = [
         base
         bytestring
@@ -192012,6 +192762,8 @@ self: {
       pname = "diagrams-rasterific";
       version = "1.5";
       sha256 = "02bq6819a8xxa20kggmg9j5wa72zh4gbcvbpv1b1pzbg57bp2s8k";
+      revision = "1";
+      editedCabalFile = "1f5l5w28kbnajc0kd304fs2h9svc2inb90qbjmqyii30bf0b2n15";
       libraryHaskellDepends = [
         base
         bytestring
@@ -192210,6 +192962,8 @@ self: {
       pname = "diagrams-svg";
       version = "1.5";
       sha256 = "1g11fvcgx99xg71c9sd6m7pfclnzcfx72alcx3avlb4qzz56wn52";
+      revision = "2";
+      editedCabalFile = "1d7n707vmcbk1l1fi956hagyyzzn3hd11wxyabm1mirv8qxrha0s";
       libraryHaskellDepends = [
         base
         base64-bytestring
@@ -195477,8 +196231,8 @@ self: {
     }:
     mkDerivation {
       pname = "discord-haskell";
-      version = "1.17.1";
-      sha256 = "1lw1n8m297ad0rcbn48ysg85l35sg5bh3gwbnm2698cd051b4yad";
+      version = "1.18.0";
+      sha256 = "0g3xlhjfqslv6565fgzq0m0qdsf50kv9m5shb71yr4hwvar4w7qc";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -200286,7 +201040,7 @@ self: {
     }
   ) { };
 
-  "doctest_0_24_0" = callPackage (
+  "doctest_0_24_2" = callPackage (
     {
       mkDerivation,
       base,
@@ -200313,8 +201067,8 @@ self: {
     }:
     mkDerivation {
       pname = "doctest";
-      version = "0.24.0";
-      sha256 = "1cylb84kmlw7a38xnfyx0sxcpgahmfm7bsbv0vf2x3slsgz597kx";
+      version = "0.24.2";
+      sha256 = "1dpffnr24zaricmkwc13npap569crwwfha1w9vz3fhywmh0dnfjk";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -200488,10 +201242,8 @@ self: {
     }:
     mkDerivation {
       pname = "doctest-exitcode-stdio";
-      version = "0.0";
-      sha256 = "1g3c7yrqq2mwqbmvs8vkx1a3cf0p0x74b7fnn344dsk7bsfpgv0x";
-      revision = "2";
-      editedCabalFile = "0gfnxkbm126m0d4pnqgl5ca6ab8x5p1vpbxjxgz1sxczablsmk5b";
+      version = "0.0.0.1";
+      sha256 = "0kg5xiw4giyvqpcj6cxqqnysvixhxlwm0pbg3qks8dzwb5w79dvk";
       libraryHaskellDepends = [
         base
         doctest-lib
@@ -200521,6 +201273,8 @@ self: {
       pname = "doctest-extract";
       version = "0.1.2";
       sha256 = "1dizs0r9pdankbv5ijfgqva5ha8p5xxl7x8y1sjql6h7ch8pz0p6";
+      revision = "1";
+      editedCabalFile = "1m71h2iwizh9rms2dq29wwzbsfz8qzqw7q8vldpmk7nm1572rhss";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -200638,6 +201392,92 @@ self: {
     }
   ) { };
 
+  "doctest-parallel_0_4" = callPackage (
+    {
+      mkDerivation,
+      base,
+      base-compat,
+      Cabal,
+      code-page,
+      containers,
+      deepseq,
+      directory,
+      exceptions,
+      filepath,
+      ghc,
+      ghc-exactprint,
+      ghc-paths,
+      Glob,
+      hspec,
+      hspec-core,
+      HUnit,
+      mockery,
+      process,
+      QuickCheck,
+      random,
+      setenv,
+      silently,
+      stringbuilder,
+      syb,
+      template-haskell,
+      transformers,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "doctest-parallel";
+      version = "0.4";
+      sha256 = "1y907fg2y7ayddwv38rjv6nyc18w682dxwkq3msqnlkddglqlxfx";
+      libraryHaskellDepends = [
+        base
+        base-compat
+        Cabal
+        code-page
+        containers
+        deepseq
+        directory
+        exceptions
+        filepath
+        ghc
+        ghc-exactprint
+        ghc-paths
+        Glob
+        process
+        random
+        syb
+        template-haskell
+        transformers
+        unordered-containers
+      ];
+      testHaskellDepends = [
+        base
+        base-compat
+        code-page
+        containers
+        deepseq
+        directory
+        exceptions
+        filepath
+        ghc
+        ghc-paths
+        hspec
+        hspec-core
+        HUnit
+        mockery
+        process
+        QuickCheck
+        setenv
+        silently
+        stringbuilder
+        syb
+        transformers
+      ];
+      doHaddock = false;
+      description = "Test interactive Haskell examples";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "doctest-prop" = callPackage (
     {
       mkDerivation,
@@ -201140,8 +201980,8 @@ self: {
     }:
     mkDerivation {
       pname = "dollaridoos";
-      version = "0.1.0.0";
-      sha256 = "1pipbyfpny8mq540rpfkgkwbc3mc13yf6xm1h9vxm0fnaa8kcbw9";
+      version = "0.2.0.0";
+      sha256 = "09hbm1dkgg8qb4y22hbqwmy858nbaxjn9vizv7z58gd2756gia7s";
       libraryHaskellDepends = [
         base
         profunctors
@@ -202390,8 +203230,8 @@ self: {
     }:
     mkDerivation {
       pname = "double-x-encoding";
-      version = "1.2.1";
-      sha256 = "0sg8sh9a1krzfhdwxcd3ja56kzr6hif11s4iqicrdqz3qgi905ia";
+      version = "1.2.2";
+      sha256 = "0wzawzwsw2dkmw5yvnva8la6v2iwr5ni353imi0qmsgssvg0va6s";
       libraryHaskellDepends = [
         base
         Cabal-syntax
@@ -204969,8 +205809,8 @@ self: {
       pname = "dumb-cas";
       version = "0.2.1.1";
       sha256 = "0rqh1sy500gbgqr69z220yb8g7gp117z0iw1kly9zxqhrzn3sv9f";
-      revision = "1";
-      editedCabalFile = "031hcc34r20gpvsicllwcvvzirx2bm5nsdabp75a0m05rj3wzmvv";
+      revision = "2";
+      editedCabalFile = "0gg7yxb8r8f53pw6j33ifm9l5a934q7x261kbydj1kf8zbq0pwfd";
       libraryHaskellDepends = [
         base
         containers
@@ -205705,8 +206545,8 @@ self: {
     }:
     mkDerivation {
       pname = "dwergaz";
-      version = "0.3.0.2";
-      sha256 = "0849adznjgfg4z1llq5kfwi3ypjj9bj1jw7anax6g86izzvs75jj";
+      version = "0.3.1.0";
+      sha256 = "1c40js81v95hl90zv7nbsmdn8z05s8f2arjhzvsbimckvjrg03x9";
       libraryHaskellDepends = [
         base
         pretty
@@ -209172,8 +210012,8 @@ self: {
     }:
     mkDerivation {
       pname = "effect-stack";
-      version = "0.3";
-      sha256 = "08zalj8svp78ykqbf5nhd6khgygz8dplcvjd19w3hvgm08y4kxqi";
+      version = "0.3.0.1";
+      sha256 = "04y5rqvjzz5fsvlkwqwjlwngz3j3p83anzh77d7fbmkii8fb9g87";
       libraryHaskellDepends = [
         base
         constraints
@@ -209253,6 +210093,73 @@ self: {
     }
   ) { };
 
+  "effectful_2_6_0_0" = callPackage (
+    {
+      mkDerivation,
+      async,
+      base,
+      bytestring,
+      containers,
+      directory,
+      effectful-core,
+      exceptions,
+      lifted-base,
+      primitive,
+      process,
+      safe-exceptions,
+      stm,
+      strict-mutable-base,
+      tasty,
+      tasty-bench,
+      tasty-hunit,
+      text,
+      time,
+      unix,
+      unliftio,
+    }:
+    mkDerivation {
+      pname = "effectful";
+      version = "2.6.0.0";
+      sha256 = "1k850pgslnfdhfwqcwr4hv2ymab4cszklrh4rxmwhwixrbb7m3l8";
+      libraryHaskellDepends = [
+        async
+        base
+        bytestring
+        directory
+        effectful-core
+        process
+        stm
+        strict-mutable-base
+        time
+        unliftio
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        effectful-core
+        exceptions
+        lifted-base
+        primitive
+        safe-exceptions
+        strict-mutable-base
+        tasty
+        tasty-hunit
+        unliftio
+      ];
+      benchmarkHaskellDepends = [
+        async
+        base
+        tasty-bench
+        text
+        unix
+        unliftio
+      ];
+      description = "An easy to use, performant extensible effects library";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "effectful-core" = callPackage (
     {
       mkDerivation,
@@ -209286,6 +210193,40 @@ self: {
     }
   ) { };
 
+  "effectful-core_2_6_0_0" = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      deepseq,
+      exceptions,
+      monad-control,
+      primitive,
+      strict-mutable-base,
+      transformers-base,
+      unliftio-core,
+    }:
+    mkDerivation {
+      pname = "effectful-core";
+      version = "2.6.0.0";
+      sha256 = "1zi1cgnyfzz5csml8saf9zxixrc7q074ywgh0cjd5k2v3zj79rw1";
+      libraryHaskellDepends = [
+        base
+        containers
+        deepseq
+        exceptions
+        monad-control
+        primitive
+        strict-mutable-base
+        transformers-base
+        unliftio-core
+      ];
+      description = "An easy to use, performant extensible effects library";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "effectful-plugin" = callPackage (
     {
       mkDerivation,
@@ -209315,6 +210256,34 @@ self: {
     }
   ) { };
 
+  "effectful-plugin_2_0_0_0" = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      effectful-core,
+      ghc,
+    }:
+    mkDerivation {
+      pname = "effectful-plugin";
+      version = "2.0.0.0";
+      sha256 = "11xy98k20r9bw2436digcn3mjdk5qlf12i0h7d0xizsqsdazyvy6";
+      libraryHaskellDepends = [
+        base
+        containers
+        effectful-core
+        ghc
+      ];
+      testHaskellDepends = [
+        base
+        effectful-core
+      ];
+      description = "A GHC plugin for improving disambiguation of effects";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "effectful-st" = callPackage (
     {
       mkDerivation,
@@ -210246,15 +211215,13 @@ self: {
       profunctors,
       QuickCheck,
       semigroupoids,
-      test-framework,
-      test-framework-quickcheck2,
+      tasty,
+      tasty-quickcheck,
     }:
     mkDerivation {
       pname = "either";
-      version = "5.0.2";
-      sha256 = "1gl748ia68bldbqb2fl7vjv44g0y8ivn659fjmy1qyypgyb5p95z";
-      revision = "2";
-      editedCabalFile = "1lx6ls938vssg75ib2fr1ww4nsig2rkhjc6x57yfinx1yb9r62vz";
+      version = "5.0.3";
+      sha256 = "00a8h2jgrpqdlsi8vjrm2qa6rmw33ksirxv9s6i90nlmhhg6jrkd";
       libraryHaskellDepends = [
         base
         bifunctors
@@ -210265,8 +211232,8 @@ self: {
       testHaskellDepends = [
         base
         QuickCheck
-        test-framework
-        test-framework-quickcheck2
+        tasty
+        tasty-quickcheck
       ];
       description = "Combinators for working with sums";
       license = lib.licenses.bsd3;
@@ -210611,18 +211578,18 @@ self: {
       mkDerivation,
       base,
       containers,
+      ghc-prim,
       text,
       unordered-containers,
     }:
     mkDerivation {
       pname = "ekg-core";
-      version = "0.1.1.8";
-      sha256 = "028c3g1fz0rfxpfn98wxxmklnxx3szwvjxl9n9ls2w011vqslvia";
-      revision = "1";
-      editedCabalFile = "1lwss6aha8bjmjb3xji58jznca7k7nss76qva5pihgb20j7xs7vi";
+      version = "0.1.2.0";
+      sha256 = "12d4xzkdczbrmhhpgymf9brjn0kpq5645dq57xw05sylalfyslzz";
       libraryHaskellDepends = [
         base
         containers
+        ghc-prim
         text
         unordered-containers
       ];
@@ -216853,8 +217820,8 @@ self: {
     }:
     mkDerivation {
       pname = "erebos-tester";
-      version = "0.3.2";
-      sha256 = "0m3fi03q0l55r6amxcq0l01sqcg8m6hqbx1zhdaq75s3yyx4wb71";
+      version = "0.3.3";
+      sha256 = "0xcwijr034dw5s4f6jyb727449wayyd31lv8afmfr49i0jmwhgay";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -217765,6 +218732,79 @@ self: {
     }
   ) { };
 
+  "ersatz_0_6" = callPackage (
+    {
+      mkDerivation,
+      array,
+      attoparsec,
+      base,
+      bytestring,
+      containers,
+      data-default,
+      fail,
+      lens,
+      mtl,
+      optparse-applicative,
+      parsec,
+      process,
+      semigroups,
+      streams,
+      tasty,
+      tasty-hunit,
+      temporary,
+      transformers,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "ersatz";
+      version = "0.6";
+      sha256 = "05wg6hvrxijdw6pnzpzdcf85ybjdhax731f70gxl1hvwfllrp43j";
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        array
+        attoparsec
+        base
+        bytestring
+        containers
+        data-default
+        lens
+        mtl
+        process
+        semigroups
+        streams
+        temporary
+        transformers
+        unordered-containers
+      ];
+      executableHaskellDepends = [
+        array
+        base
+        bytestring
+        containers
+        fail
+        lens
+        mtl
+        optparse-applicative
+        parsec
+        semigroups
+      ];
+      testHaskellDepends = [
+        array
+        base
+        containers
+        data-default
+        tasty
+        tasty-hunit
+      ];
+      description = "A monad for expressing SAT or QSAT problems using observable sharing";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   "ersatz-toysat" = callPackage (
     {
       mkDerivation,
@@ -220819,10 +221859,8 @@ self: {
     }:
     mkDerivation {
       pname = "eventlog2html";
-      version = "0.11.1";
-      sha256 = "1rfyw285g48c7dck8kjykx9n4brw7ngm275n64g1wwwkm4ybn43n";
-      revision = "1";
-      editedCabalFile = "0kxb0990f8x394j2l7y5y2xz43lqdlm4bc6gihfqnkc6w5qsqhji";
+      version = "0.12.0";
+      sha256 = "1jbp46hcx4kcnkln9vd8b36fjwhxlmlcv08narr6w5bfxz1dpzy6";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -222219,25 +223257,23 @@ self: {
     }
   ) { };
 
-  "exceptions_0_10_9" = callPackage (
+  "exceptions_0_10_10" = callPackage (
     {
       mkDerivation,
       base,
       mtl,
       QuickCheck,
       stm,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
       template-haskell,
-      test-framework,
-      test-framework-hunit,
-      test-framework-quickcheck2,
       transformers,
     }:
     mkDerivation {
       pname = "exceptions";
-      version = "0.10.9";
-      sha256 = "0h5y2rqg7kz4ic59n5i7619766mzfpqcdill3l712nihs3q2nk4v";
-      revision = "1";
-      editedCabalFile = "11p0d1gd3ybgbyplhr18wy2k7cy3hf6ab288ymy3ddayc4a927k6";
+      version = "0.10.10";
+      sha256 = "1cddmj2y5h2hqjgmk14c698g8hhq0x2rycdl5vgz8vvzzsg83zq8";
       libraryHaskellDepends = [
         base
         mtl
@@ -222250,10 +223286,10 @@ self: {
         mtl
         QuickCheck
         stm
+        tasty
+        tasty-hunit
+        tasty-quickcheck
         template-haskell
-        test-framework
-        test-framework-hunit
-        test-framework-quickcheck2
         transformers
       ];
       description = "Extensible optionally-pure exceptions";
@@ -223437,8 +224473,8 @@ self: {
     }:
     mkDerivation {
       pname = "exotic-list-monads";
-      version = "1.1.1";
-      sha256 = "063nmcqp9swzmhbdbdvl63kll1mqw3gywwrzx64s5hdk893rzkrf";
+      version = "1.2.0";
+      sha256 = "1wxdhh869v69schj88xz9anzmj4qly3wrh8jmkwga6h5krhvqkgh";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [
         base
@@ -224608,8 +225644,10 @@ self: {
     }:
     mkDerivation {
       pname = "extended-reals";
-      version = "0.2.6.0";
-      sha256 = "0cy5fb6b9kidxqadpymy0pqvswlsqxwxqqhfx9di1l66ynks2b6z";
+      version = "0.2.7.0";
+      sha256 = "0q9k3fl8n30mlsv1c459470bjd4bqyg0vqycjc76qkzxwljl6pwk";
+      revision = "1";
+      editedCabalFile = "1w69ym1cpsdxh7344j6j0kabrdazfx7n9yzqgxcjplsd92gwr97k";
       libraryHaskellDepends = [
         base
         deepseq
@@ -227091,8 +228129,8 @@ self: {
     }:
     mkDerivation {
       pname = "fast-logger";
-      version = "3.2.5";
-      sha256 = "0cddv18k0n1hdbjf0szqq7pl5r0h4srzxy8pmr66a4pc1w410lii";
+      version = "3.2.6";
+      sha256 = "1hy5cczg64q6cafahfcfjsij48w80zskgjnn3ks0w5w4vqiccrmx";
       libraryHaskellDepends = [
         array
         auto-update
@@ -228554,8 +229592,8 @@ self: {
     }:
     mkDerivation {
       pname = "fbrnch";
-      version = "1.6.2";
-      sha256 = "0yqpxma3qgdkacbabaffz0498phl79yvn2pbhn10gb6f18lzxcsf";
+      version = "1.7.1";
+      sha256 = "1xsq70xpd0qgz0krlmm31b821ir94sc8qa0qpshjlcfja882p11l";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -229608,6 +230646,34 @@ self: {
     }
   ) { };
 
+  "fedora-releases_0_3_0" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bodhi,
+      cached-json-file,
+      extra,
+      safe,
+    }:
+    mkDerivation {
+      pname = "fedora-releases";
+      version = "0.3.0";
+      sha256 = "1lipp022kxj72i9d25f8if4dppa706zvb1a62lx3gw1xw1p55j8b";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bodhi
+        cached-json-file
+        extra
+        safe
+      ];
+      description = "Library for Fedora release versions";
+      license = lib.licenses.gpl3Only;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "fedora-repoquery" = callPackage (
     {
       mkDerivation,
@@ -229629,8 +230695,8 @@ self: {
     }:
     mkDerivation {
       pname = "fedora-repoquery";
-      version = "0.7.2";
-      sha256 = "0glmc6fqcw7r400nczlnalbdp98ddvvywrxng9jz5y7bindy1vh7";
+      version = "0.7.3";
+      sha256 = "1sdyvbvrh1z32y8hsbfwzyrffl57niri0rgpp580syh11l621sj1";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -232469,6 +233535,8 @@ self: {
       pname = "filepath";
       version = "1.5.4.0";
       sha256 = "1bswvf1hrsslb8xlwvsccz12h5habrdpqq4zgcyjg4zm6b28dajl";
+      revision = "1";
+      editedCabalFile = "0b7hmqygr29ppazwbmrrl60bshpqg7zhvzq5g4wl3pgj19iw55ql";
       libraryHaskellDepends = [
         base
         bytestring
@@ -232731,8 +233799,8 @@ self: {
       pname = "filestore";
       version = "0.6.5";
       sha256 = "0z29273vdqjsrj4vby0gp7d12wg9nkzq9zgqg18db0p5948jw1dh";
-      revision = "2";
-      editedCabalFile = "1m6qi647v475gcim8nfb6cgahhc99rszc8k1z2mpzm797qxg9xbs";
+      revision = "3";
+      editedCabalFile = "003vfb6j47vihjba1py9ls9l269gkg89rf732gb5lwdximxg7wf0";
       libraryHaskellDepends = [
         base
         bytestring
@@ -233621,8 +234689,8 @@ self: {
     }:
     mkDerivation {
       pname = "finite";
-      version = "1.4.1.2";
-      sha256 = "10hnqz4klgrpfbvla07h8yghpv22bsyijf0cibfzwl9j779vb4nc";
+      version = "1.5.0.0";
+      sha256 = "02fw2m1qn4rpz25jnd9vb16417srpzwz0lhzin04dwc6gjq74i8g";
       libraryHaskellDepends = [
         array
         base
@@ -238634,17 +239702,15 @@ self: {
       QuickCheck,
       quickcheck-instances,
       tagged,
+      tasty,
       tasty-bench,
-      test-framework,
-      test-framework-quickcheck2,
+      tasty-quickcheck,
       transformers,
     }:
     mkDerivation {
       pname = "foldable1-classes-compat";
-      version = "0.1.1";
-      sha256 = "17xmc3525crnd86rrl2c50rfnhibwh5xbqrnmvzvyns4d3l4vvdg";
-      revision = "2";
-      editedCabalFile = "0m1cd2g2f2983nb9h4d3amq058k2yri6hbh5v026y5lxhg9fq0i8";
+      version = "0.1.2";
+      sha256 = "1n6a8ga07gdwnhy485qzy23algcmnzppfcxfy8c6qipamn4hw5p3";
       libraryHaskellDepends = [
         base
         ghc-prim
@@ -238655,8 +239721,8 @@ self: {
         containers
         QuickCheck
         quickcheck-instances
-        test-framework
-        test-framework-quickcheck2
+        tasty
+        tasty-quickcheck
         transformers
       ];
       benchmarkHaskellDepends = [
@@ -240592,8 +241658,8 @@ self: {
     }:
     mkDerivation {
       pname = "fortran-src";
-      version = "0.16.5";
-      sha256 = "1adqczpb1d2zclgvg03z3izcmmncgxj7bff9zz5p8zc77v8865m4";
+      version = "0.16.7";
+      sha256 = "12d46b232aks34nvb3jc66dhz0nxq3z8ngbs6rfn71paj2mfj5cv";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -242434,8 +243500,8 @@ self: {
     }:
     mkDerivation {
       pname = "freckle-app";
-      version = "1.23.1.0";
-      sha256 = "0ik1ay4vm0qw5jg1zvbdfl1p0gxawlrah9lphg9y2cqq48yj4zql";
+      version = "1.23.3.0";
+      sha256 = "0405dj2isvhgib85km2fppq32aan5sghsny2ilwv39pr2g6kkwkm";
       libraryHaskellDepends = [
         aeson
         annotated-exception
@@ -242676,8 +243742,8 @@ self: {
     }:
     mkDerivation {
       pname = "freckle-http";
-      version = "0.1.0.0";
-      sha256 = "1a8isx1z9injzmbcfj19i4m8cccbl754chx8ayxww76ahd1s6v81";
+      version = "0.2.0.0";
+      sha256 = "0an1bqpsslr8zlpmvvp5hjw5fwpwqjr6w0m4ib7sa1d0218xzdnz";
       libraryHaskellDepends = [
         aeson
         annotated-exception
@@ -243795,8 +244861,8 @@ self: {
       pname = "free-vector-spaces";
       version = "0.1.5.2";
       sha256 = "0p0flpai3n9ism9dd3kyf1fa8s8rpb4cc00m3bplb9s8zb6aghpb";
-      revision = "2";
-      editedCabalFile = "1jlaljmfhsb4yb8iqmw1zaa3kkiayg6li6bk04a3camh2jc8k22m";
+      revision = "3";
+      editedCabalFile = "1nhbj4ch0fayqbd90qzwhlda929rny81422grdqifghqrr1lq4lv";
       libraryHaskellDepends = [
         base
         lens
@@ -245402,10 +246468,8 @@ self: {
     }:
     mkDerivation {
       pname = "fs-api";
-      version = "0.3.0.1";
-      sha256 = "0yjfldwmxqg4fgcymyb9bb9axwsfsnldnxxfmk54spkmiab8kr49";
-      revision = "1";
-      editedCabalFile = "17z9clqfs0hm8jl2hdgk0jqvjdxm8i4lk0av489nhsj2qp6ikvmy";
+      version = "0.4.0.0";
+      sha256 = "1aw9x4cgflm2fy5ps3cgpwfzgfp7r7r9fps2vkzbqz03gjpql0dm";
       libraryHaskellDepends = [
         base
         bytestring
@@ -245460,6 +246524,7 @@ self: {
       bifunctors,
       bytestring,
       containers,
+      deepseq,
       fs-api,
       generics-sop,
       io-classes,
@@ -245478,10 +246543,8 @@ self: {
     }:
     mkDerivation {
       pname = "fs-sim";
-      version = "0.3.1.0";
-      sha256 = "0qq7fc9b37haz2dcywyxhkszy58i3fr7z8nyrrp16x46v5cs6jwq";
-      revision = "1";
-      editedCabalFile = "1pbpi5hngw723z2nr9zwp9rzfxh1p1q8jk8ln01brm7xf3kkq2pb";
+      version = "0.4.0.0";
+      sha256 = "0wirx3mk2dmjw13adbf4d9qpgx7b9kk0y5my7s3yx1lsm2z9m4pw";
       libraryHaskellDepends = [
         base
         base16-bytestring
@@ -245500,6 +246563,7 @@ self: {
         bifunctors
         bytestring
         containers
+        deepseq
         fs-api
         generics-sop
         io-classes
@@ -246984,8 +248048,8 @@ self: {
     }:
     mkDerivation {
       pname = "functor-combinators";
-      version = "0.4.1.3";
-      sha256 = "0123y4n01rga8kb86w74hzjwvz8jfr15c1abkrrngacp60bd25rl";
+      version = "0.4.1.4";
+      sha256 = "1yqfbnwv649viy1qpzvk8f9xip0id1k7q6m0j2ssiapfpig43xys";
       libraryHaskellDepends = [
         assoc
         base
@@ -249082,8 +250146,8 @@ self: {
     }:
     mkDerivation {
       pname = "fxpak";
-      version = "0.1.2";
-      sha256 = "1mrpbz32aczrh5aw550p1vzvj8zqhcnmj574sc012r3z1c0g1cin";
+      version = "0.1.3";
+      sha256 = "1fn88wzhazx9jwddjxq4l4q1xr9g9yl5dsbc9slizb8mnkrkacd9";
       libraryHaskellDepends = [
         base
         bytestring
@@ -252082,6 +253146,8 @@ self: {
       pname = "generic-aeson";
       version = "0.2.0.14";
       sha256 = "0ssras2db9fqgyfhhw2pk827xf4dd4g9s9vwj8g85vaqxyvzyd8x";
+      revision = "1";
+      editedCabalFile = "047mgqq08f1zmnw9400b246bjgpg1r5barz53kbqhfqiaq7ybz85";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -252485,8 +253551,8 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "generic-enumeration";
-      version = "0.1.0.3";
-      sha256 = "02ywn0byg4g42hl28mqc07jifj48jxzmnjm4plfdz4pnxs40kwzg";
+      version = "0.1.0.4";
+      sha256 = "0f83fnvmmi4yvdn9i2r1vkpk6cy4lqpxgjv26f380akyf30av90p";
       libraryHaskellDepends = [ base ];
       description = "Generically derived enumerations";
       license = lib.licenses.mit;
@@ -252655,6 +253721,8 @@ self: {
       pname = "generic-lens-lite";
       version = "0.1.1";
       sha256 = "1ldc13g7l5jjgca80c2hymkbgq9pf8b5j4x3dr83kz6wq2p76q12";
+      revision = "1";
+      editedCabalFile = "1wg3qxik9mgd49jkrgzargpncj6d1pg1zy13xg9yck5w4i10rixw";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Monomorphic field lens like with generic-lens";
@@ -252666,8 +253734,8 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "generic-lexicographic-order";
-      version = "0.1.0.0";
-      sha256 = "096c1fan7isxynyk968llm3p204kgcmh8xp4krnmspz0xvcn7sh0";
+      version = "0.1.0.1";
+      sha256 = "01vylkficx9ylri9200pvqgqc89lm9x4iy3s4bfal96pv8q59knx";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Derive Bounded and Enum for sum types and Enum for product types";
@@ -252844,6 +253912,8 @@ self: {
       pname = "generic-optics-lite";
       version = "0.1.1";
       sha256 = "1dd2dw72fyyimnyq8bw57k7lbh0lnjipvk08dyj87h357ykjv3ql";
+      revision = "1";
+      editedCabalFile = "1z3bf20fj03bfp4zigdxzw4v30hmxgwkdzdmgbn4hibpcz2j24p0";
       libraryHaskellDepends = [
         base
         generic-lens-lite
@@ -256506,7 +257576,7 @@ self: {
     }
   ) { };
 
-  "ghc_9_12_1" =
+  "ghc_9_12_2" =
     callPackage
       (
         {
@@ -256540,8 +257610,8 @@ self: {
         }:
         mkDerivation {
           pname = "ghc";
-          version = "9.12.1";
-          sha256 = "179gp0lqrxhvzc0pyxwmkvxpilm6c201s1pjws3dl8qqyddliiqs";
+          version = "9.12.2";
+          sha256 = "0l5rrnfv933m37dziqaf5iv4nqirig1mfaj037by94s486ggx5f7";
           setupHaskellDepends = [
             base
             Cabal
@@ -257216,8 +258286,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-debugger";
-      version = "0.2.0.0";
-      sha256 = "0k02y36kz9412i0fk9vvdidcyc5qh0cq47jbgk78i8c7276dm4j3";
+      version = "0.4.0.0";
+      sha256 = "0nzmlnhv5liwkibva0djvc06c0d2wwpqa9x4lvpb2snkid0yliyl";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -257227,10 +258297,12 @@ self: {
         binary
         bytestring
         containers
+        directory
         exceptions
         filepath
         ghc
         ghci
+        hie-bios
         mtl
         process
         unix
@@ -258122,6 +259194,63 @@ self: {
     }
   ) { };
 
+  "ghc-hie" = callPackage (
+    {
+      mkDerivation,
+      array,
+      base,
+      bytestring,
+      containers,
+      deepseq,
+      directory,
+      filepath,
+      ghc,
+      ghc-boot,
+      hspec,
+      hspec-discover,
+      process,
+      QuickCheck,
+      temporary,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "ghc-hie";
+      version = "0.0.2";
+      sha256 = "1z51fbm0n9knqrp01gqd7xx0pkfwyr9kgaginvqmdw45gi8rqhm7";
+      libraryHaskellDepends = [
+        array
+        base
+        bytestring
+        containers
+        deepseq
+        directory
+        filepath
+        ghc
+        ghc-boot
+        transformers
+      ];
+      testHaskellDepends = [
+        array
+        base
+        bytestring
+        containers
+        deepseq
+        directory
+        filepath
+        ghc
+        ghc-boot
+        hspec
+        process
+        QuickCheck
+        temporary
+        transformers
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "HIE-file parsing machinery that supports multiple versions of GHC";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   "ghc-hotswap" = callPackage (
     {
       mkDerivation,
@@ -259806,8 +260935,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-prof";
-      version = "1.4.1.13";
-      sha256 = "0g85216s10pm515wi0dl95znq3vdac3zvagizg8vy82zfmsgxwcp";
+      version = "1.4.1.14";
+      sha256 = "16zl8x8abkh2fbyzsd6k48vm2na0bbm0cv2b9sfi3jac7mi3v3kq";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -260653,16 +261782,18 @@ self: {
       base,
       containers,
       ghc,
+      template-haskell,
       transformers,
     }:
     mkDerivation {
       pname = "ghc-tcplugin-api";
-      version = "0.14.0.0";
-      sha256 = "089lw1gjxrk54s1agl5gxkwg49368z6i6m260snz05nfia4m7fak";
+      version = "0.15.0.0";
+      sha256 = "024gwhs575rirrizlriigxvz0b9az2c63vbbdfm3dd4qa5ln3jmq";
       libraryHaskellDepends = [
         base
         containers
         ghc
+        template-haskell
         transformers
       ];
       description = "An API for type-checker plugins";
@@ -261488,6 +262619,68 @@ self: {
     }
   ) { };
 
+  "ghci4luatex" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      cmdargs,
+      containers,
+      hspec,
+      network-simple,
+      process,
+      QuickCheck,
+      stm,
+      text,
+    }:
+    mkDerivation {
+      pname = "ghci4luatex";
+      version = "0.1";
+      sha256 = "1x3kdwxcallnyvssbxaj4scf6rc0f5yx3js1bzzwmi9p3imxj4x8";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        cmdargs
+        containers
+        network-simple
+        process
+        stm
+        text
+      ];
+      executableHaskellDepends = [
+        aeson
+        base
+        bytestring
+        cmdargs
+        containers
+        network-simple
+        process
+        stm
+        text
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        cmdargs
+        containers
+        hspec
+        network-simple
+        process
+        QuickCheck
+        stm
+        text
+      ];
+      description = "A GHCi session in LaTeX";
+      license = lib.licenses.bsd3;
+      mainProgram = "ghci4luatex";
+    }
+  ) { };
+
   "ghcid" = callPackage (
     {
       mkDerivation,
@@ -261895,8 +263088,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghcitui";
-      version = "0.4.1.0";
-      sha256 = "05c9s43qhzxc280xycicwrm95kl1jpz14pzlcnv0a29i8589gpdz";
+      version = "0.4.1.1";
+      sha256 = "1s7imyvv7pg3yyrajgl5fqv1q35188ianm8y689mzb5ikbwr5wq4";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -261968,8 +263161,8 @@ self: {
     { mkDerivation }:
     mkDerivation {
       pname = "ghcjs-base";
-      version = "0.8.0.3";
-      sha256 = "1cff0sgcwdas30dgxg9mdab5rk0s1v2qkkb9cr47dl3d5wmc4add";
+      version = "0.8.0.4";
+      sha256 = "081w3234jramsmafnl86v37lwbckr2vc93gr9pdwc31yzni9kbml";
       description = "base library for GHCJS";
       license = lib.licenses.mit;
       platforms = [ "javascript-ghcjs" ];
@@ -262754,6 +263947,8 @@ self: {
       pname = "ghostscript-parallel";
       version = "0.0.1";
       sha256 = "1sja6nhp8p9h2z0yr5qwxd8d59zzpb11ybmsbargza6ddaplpxny";
+      revision = "1";
+      editedCabalFile = "1sd1rh0fm29c3h4vm42fv6vbqplcm32ilqzimdp7vxfp3mhbblpr";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -263993,51 +265188,6 @@ self: {
   ) { inherit (pkgs) libgit2-glib; };
 
   "gi-gio" = callPackage (
-    {
-      mkDerivation,
-      base,
-      bytestring,
-      Cabal,
-      containers,
-      gi-glib,
-      gi-gobject,
-      glib,
-      haskell-gi,
-      haskell-gi-base,
-      haskell-gi-overloading,
-      text,
-      transformers,
-    }:
-    mkDerivation {
-      pname = "gi-gio";
-      version = "2.0.37";
-      sha256 = "0a3z1aj1fqnpwxcf27anjcp2wpg3mbn86xybk150260bb00jzxpb";
-      setupHaskellDepends = [
-        base
-        Cabal
-        gi-glib
-        gi-gobject
-        haskell-gi
-      ];
-      libraryHaskellDepends = [
-        base
-        bytestring
-        containers
-        gi-glib
-        gi-gobject
-        haskell-gi
-        haskell-gi-base
-        haskell-gi-overloading
-        text
-        transformers
-      ];
-      libraryPkgconfigDepends = [ glib ];
-      description = "Gio bindings";
-      license = lib.licenses.lgpl21Only;
-    }
-  ) { inherit (pkgs) glib; };
-
-  "gi-gio_2_0_38" = callPackage (
     {
       mkDerivation,
       base,
@@ -264079,7 +265229,6 @@ self: {
       libraryPkgconfigDepends = [ glib ];
       description = "Gio bindings";
       license = lib.licenses.lgpl21Only;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { inherit (pkgs) glib; };
 
@@ -265128,6 +266277,51 @@ self: {
     }
   ) { inherit (pkgs) gtk4; };
 
+  "gi-gtk4-layer-shell" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      Cabal,
+      containers,
+      gi-gdk4,
+      gi-gtk4,
+      gtk4-layer-shell,
+      haskell-gi,
+      haskell-gi-base,
+      haskell-gi-overloading,
+      text,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "gi-gtk4-layer-shell";
+      version = "0.1.0";
+      sha256 = "0x1bafara3nq2f76lmmzvkm51i16za0fymh0zpvqx4mvac8lhpzz";
+      setupHaskellDepends = [
+        base
+        Cabal
+        gi-gdk4
+        gi-gtk4
+        haskell-gi
+      ];
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        gi-gdk4
+        gi-gtk4
+        haskell-gi
+        haskell-gi-base
+        haskell-gi-overloading
+        text
+        transformers
+      ];
+      libraryPkgconfigDepends = [ gtk4-layer-shell ];
+      description = "gtk4-layer-shell bindings";
+      license = lib.licenses.lgpl21Only;
+    }
+  ) { inherit (pkgs) gtk4-layer-shell; };
+
   "gi-gtkosxapplication" = callPackage (
     {
       mkDerivation,
@@ -266538,8 +267732,8 @@ self: {
     }:
     mkDerivation {
       pname = "gi-webkit";
-      version = "6.0.4";
-      sha256 = "0cabpym4p654psrck548wpkdf43wbm8zn0r2lrqiijx72f6xwij5";
+      version = "6.0.5";
+      sha256 = "1a7nmzry1h24i35imhp2d9x32bn32fwswpvrp72lk8yyb12v7i5g";
       setupHaskellDepends = [
         base
         Cabal
@@ -267142,6 +268336,8 @@ self: {
       pname = "ginger";
       version = "0.10.6.0";
       sha256 = "0j5arz8x2ksbcwy5iq8p7pzy71rl0nhadlv2d6933ibdgvzbsb7j";
+      revision = "1";
+      editedCabalFile = "1226x5dlcpaczy3kx5h27fmq4g03h4aa1nc1aw9r7x18h8rjay04";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -267202,6 +268398,96 @@ self: {
     }
   ) { };
 
+  "ginger2" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      array,
+      base,
+      base64-bytestring,
+      bytestring,
+      cmark,
+      containers,
+      directory,
+      filepath,
+      megaparsec,
+      mtl,
+      optparse-applicative,
+      quickcheck-instances,
+      random,
+      regex-tdfa,
+      scientific,
+      SHA,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      template-haskell,
+      text,
+      time,
+      vector,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "ginger2";
+      version = "2.2.0.0";
+      sha256 = "0a8aa944v7b8qlwqykkrvm334ic8c8lfb8zwls7wx1cyh68kif66";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        array
+        base
+        base64-bytestring
+        bytestring
+        containers
+        filepath
+        megaparsec
+        mtl
+        random
+        regex-tdfa
+        scientific
+        SHA
+        tasty
+        tasty-quickcheck
+        template-haskell
+        text
+        time
+        vector
+      ];
+      executableHaskellDepends = [
+        aeson
+        base
+        cmark
+        containers
+        directory
+        filepath
+        optparse-applicative
+        random
+        text
+        vector
+        yaml
+      ];
+      testHaskellDepends = [
+        base
+        base64-bytestring
+        bytestring
+        containers
+        megaparsec
+        mtl
+        quickcheck-instances
+        random
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+        text
+        vector
+      ];
+      description = "Jinja templates for Haskell";
+      license = lib.licenses.mit;
+      mainProgram = "ginger2";
+    }
+  ) { };
+
   "gingersnap" = callPackage (
     {
       mkDerivation,
@@ -267726,8 +269012,8 @@ self: {
     }:
     mkDerivation {
       pname = "git-annex";
-      version = "10.20250520";
-      sha256 = "15qb4pm3chhb5x0halx5qd4s1rcbci1q22sskm0mw4xjn2yfhc99";
+      version = "10.20250630";
+      sha256 = "1varfir2vmnr29kfsjpqc5vd6msansch6xiag1d0s4bj5wpn1pq3";
       configureFlags = [
         "-fassistant"
         "-f-benchmark"
@@ -269182,6 +270468,70 @@ self: {
     }
   ) { };
 
+  "github-actions" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      filepath,
+      hedgehog,
+      hoist-error,
+      pretty-show,
+      string-interpolate,
+      tasty,
+      tasty-discover,
+      tasty-golden,
+      tasty-golden-extra,
+      tasty-hedgehog,
+      tasty-hunit,
+      text,
+      vector,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "github-actions";
+      version = "0.1.0.0";
+      sha256 = "0aa4j8cbij6ags49pmdlfjgwfhj4w1960cjijfhncjm1dr5gij1z";
+      revision = "1";
+      editedCabalFile = "13n5nxpqgak96fqyywp1kx0yvzp7m2r19fn84z0khb5bq5nglv01";
+      libraryHaskellDepends = [
+        aeson
+        base
+        containers
+        hedgehog
+        hoist-error
+        string-interpolate
+        text
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        filepath
+        hedgehog
+        hoist-error
+        pretty-show
+        string-interpolate
+        tasty
+        tasty-discover
+        tasty-golden
+        tasty-golden-extra
+        tasty-hedgehog
+        tasty-hunit
+        text
+        vector
+        yaml
+      ];
+      testToolDepends = [ tasty-discover ];
+      description = "Github Actions";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   "github-app-token" = callPackage (
     {
       mkDerivation,
@@ -278546,8 +279896,8 @@ self: {
     }:
     mkDerivation {
       pname = "gothic";
-      version = "0.1.8.2";
-      sha256 = "1mqkkla4ipibp7y7aiy466qrqcapra4n2xx8an07c1inwkpsxzw1";
+      version = "0.1.8.3";
+      sha256 = "0lf0yhq4q2vcw9b69l7ixdscmz5drxiag9l31iz1ypb8cyjspi1q";
       libraryHaskellDepends = [
         aeson
         base
@@ -279306,8 +280656,8 @@ self: {
     }:
     mkDerivation {
       pname = "gpu-vulkan-middle";
-      version = "0.1.0.75";
-      sha256 = "1m22f7p78pwpipkvlsg95izivhz4z2cxiww4l4qy329s1cyyy0w6";
+      version = "0.1.0.76";
+      sha256 = "188g8i3zszb3xm5cl57bvhmwwrg1adx679h4j52z1a1qzyiia02m";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         base
@@ -281253,8 +282603,8 @@ self: {
     }:
     mkDerivation {
       pname = "graphql";
-      version = "1.5.0.0";
-      sha256 = "1vgvrk225fgn94cmdk5yy6a6d8p10igwx1fbvll94x4izkq57h9y";
+      version = "1.5.0.1";
+      sha256 = "0kx0pnf16zwdjxc1ig46mbv7px7r7v6xn6kmlypl0d73ik8jfzrq";
       libraryHaskellDepends = [
         base
         conduit
@@ -281391,6 +282741,8 @@ self: {
       pname = "graphql-client";
       version = "1.2.4";
       sha256 = "0rm7x5hrjz7fqfixpaab2c8fmwpn6m3p14zr0wq2bll8qf0hj15c";
+      revision = "1";
+      editedCabalFile = "0fi7q2zxfm85pdpn9b4jzh49rnakm5dvcmjkr0g39738zprgwaph";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -281652,8 +283004,8 @@ self: {
     }:
     mkDerivation {
       pname = "graphula";
-      version = "2.1.0.1";
-      sha256 = "1bc8nr6m9lahbfg5h1i9y25kv5ikr7dcqs4ga4hzii07zvq6ks84";
+      version = "2.1.2.0";
+      sha256 = "11w4sp6jpygpqd0xjnhwdrj5gizz4nrn01md2hc98fxm19a0la03";
       libraryHaskellDepends = [
         base
         containers
@@ -282556,8 +283908,8 @@ self: {
     }:
     mkDerivation {
       pname = "greskell-core";
-      version = "1.0.0.4";
-      sha256 = "0cvqrbpfa0flsvjvmdg6pf1m0dd1gxgk22n8wqbnvwak8c528hff";
+      version = "1.0.0.6";
+      sha256 = "14xsjs4xf3db8ppz4xypshzvyvxsn7s7syr8vqkrbll8vz9laab8";
       libraryHaskellDepends = [
         aeson
         base
@@ -283126,7 +284478,7 @@ self: {
     }
   ) { };
 
-  "grisette_0_12_0_0" = callPackage (
+  "grisette_0_13_0_0" = callPackage (
     {
       mkDerivation,
       array,
@@ -283166,8 +284518,8 @@ self: {
     }:
     mkDerivation {
       pname = "grisette";
-      version = "0.12.0.0";
-      sha256 = "0dcwbc53321jg6jfmsr72kmsx8w7c6x9aq4yllwfvbzh092ljlib";
+      version = "0.13.0.0";
+      sha256 = "0115al5kw0vfsp11cndra6qrjiakm2w0gpi8ai4g47fysn8xbx6p";
       libraryHaskellDepends = [
         array
         async
@@ -289224,8 +290576,8 @@ self: {
     }:
     mkDerivation {
       pname = "hackage-cli";
-      version = "0.1.0.2";
-      sha256 = "1q7k8fy6mqb7h4q4bm8qp0ma2nhspszkwy8d606hb66sdiw7k73k";
+      version = "0.1.0.3";
+      sha256 = "19mnvvhhcagq1l3qc37qxxv7pwzfw6p15194f21z7harj5y1ly5c";
       isLibrary = false;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -289606,8 +290958,8 @@ self: {
       pname = "hackage-repo-tool";
       version = "0.1.1.4";
       sha256 = "1nqm6rri8rkhrqvppyzy04s3875c4wjcay8gny4ygbr65c6iw81v";
-      revision = "1";
-      editedCabalFile = "09fx1z32m36riv3hmjrv36knlmmrrjq2hbl30i2qfk7pfcbcjlgw";
+      revision = "2";
+      editedCabalFile = "0ghjpd02ccv6xdp0n6mxylq09ff5w7yzvpw3v3w4i62l43fi9j7q";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -289654,6 +291006,8 @@ self: {
       pname = "hackage-revdeps";
       version = "0.1.1";
       sha256 = "0ckkcp2ndzv219hpl42vfzw0hvb5vblsx2bvdsa98wikkxnmn47j";
+      revision = "1";
+      editedCabalFile = "078lhc7lzs24qqizplyf4ipggxkqqsfmgq6vnrgbyhxiia2smc4b";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -289721,8 +291075,10 @@ self: {
     }:
     mkDerivation {
       pname = "hackage-security";
-      version = "0.6.3.0";
-      sha256 = "0w0d94gbqpi8b3ddkb32px8xj0qxaaxwdbl8x45y55331b23a7a0";
+      version = "0.6.3.1";
+      sha256 = "05sckvvwj10krkhp1457mgp1hgq45p7r2sp850g3b5689i91mvqx";
+      revision = "1";
+      editedCabalFile = "1si6mkc8gimkpqkdl2wyzxp14v7yphp40hxvp77im7bhr8brsa77";
       libraryHaskellDepends = [
         base
         base16-bytestring
@@ -291360,6 +292716,7 @@ self: {
       aeson,
       attoparsec,
       base,
+      bytestring,
       data-default,
       doctest,
       filepath,
@@ -291378,8 +292735,8 @@ self: {
     }:
     mkDerivation {
       pname = "haiji";
-      version = "0.3.4.0";
-      sha256 = "1m97lnd993xpxcbm3n2qgqzqjb5j3jvkzkdcb1h9qjd3lr88j1cf";
+      version = "0.4.0.0";
+      sha256 = "1r6bzh95a4qg0waday49qqrm1kmss667hksp0wcl749w5g32jnaq";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -291397,6 +292754,7 @@ self: {
       testHaskellDepends = [
         aeson
         base
+        bytestring
         data-default
         doctest
         filepath
@@ -292094,8 +293452,8 @@ self: {
       pname = "hakyll";
       version = "4.16.6.0";
       sha256 = "1933k6aiawa0kdws7ajm9picjchnfrkkd0qd8xb9l2yv1fvcywg2";
-      revision = "1";
-      editedCabalFile = "0w6z4dq378aai39n9samlfahqr5s1p0fz1xl6kgfp9z8bvq9daa7";
+      revision = "3";
+      editedCabalFile = "0q2yl6vqf6qqc7azqwsls7b2pm3y42shhdcpyszrpi16zgx9y137";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -293290,14 +294648,14 @@ self: {
       bytestring,
       deepseq,
       QuickCheck,
+      tasty,
+      tasty-quickcheck,
       template-haskell,
-      test-framework,
-      test-framework-quickcheck2,
     }:
     mkDerivation {
       pname = "half";
-      version = "0.3.2";
-      sha256 = "0f7hgnfy8qpjsjv78gk01di3riwfbrb961msn19qmsplnsgjx68r";
+      version = "0.3.3";
+      sha256 = "00mb2xfz0q8sq8zxqpw3ycp1p8gjhlgc0wxh5xr7kzyn52b08xpl";
       libraryHaskellDepends = [
         base
         binary
@@ -293309,8 +294667,8 @@ self: {
         binary
         bytestring
         QuickCheck
-        test-framework
-        test-framework-quickcheck2
+        tasty
+        tasty-quickcheck
       ];
       description = "Half-precision floating-point";
       license = lib.licenses.bsd3;
@@ -297628,6 +298986,55 @@ self: {
     }
   ) { };
 
+  "harpie_0_1_3_0" = callPackage (
+    {
+      mkDerivation,
+      adjunctions,
+      base,
+      distributive,
+      doctest-parallel,
+      first-class-families,
+      prettyprinter,
+      QuickCheck,
+      quickcheck-instances,
+      random,
+      vector,
+      vector-algorithms,
+    }:
+    mkDerivation {
+      pname = "harpie";
+      version = "0.1.3.0";
+      sha256 = "1agkp62rcgk705hp8hlppfiidv5vsz0ps6pq3pvlnn1g73vv5ivr";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        adjunctions
+        base
+        distributive
+        first-class-families
+        prettyprinter
+        QuickCheck
+        quickcheck-instances
+        random
+        vector
+        vector-algorithms
+      ];
+      executableHaskellDepends = [
+        adjunctions
+        base
+        first-class-families
+      ];
+      testHaskellDepends = [
+        base
+        doctest-parallel
+      ];
+      description = "Haskell array programming";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "harpie-bug-issue1";
+    }
+  ) { };
+
   "harpie-numhask" = callPackage (
     {
       mkDerivation,
@@ -298631,8 +300038,8 @@ self: {
     }:
     mkDerivation {
       pname = "hash-string";
-      version = "0.1.0.1";
-      sha256 = "136a5pkygam99fx52r1dhrxydkzk1v83n0ip5iaczdx99cwki0gb";
+      version = "0.1.0.2";
+      sha256 = "0ri03id2jwpsn77mnnvvicx6niy5q5q7mr38r6y64am4j6yfh2q3";
       libraryHaskellDepends = [
         base
         bytestring
@@ -300561,6 +301968,293 @@ self: {
     }
   ) { };
 
+  "haskell-bee" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      safe-exceptions,
+      stm,
+      tasty,
+      tasty-quickcheck,
+      text,
+      unbounded-delays,
+    }:
+    mkDerivation {
+      pname = "haskell-bee";
+      version = "0.1.0.0";
+      sha256 = "1wsdwfqswvq9vbsk8vpdx58bqrznqix2p8d527fwvksvg9rpq5r0";
+      libraryHaskellDepends = [
+        aeson
+        base
+        safe-exceptions
+        stm
+        text
+        unbounded-delays
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        tasty
+        tasty-quickcheck
+      ];
+      description = "A lightweight library for asynchronous job workers with multiple broker backends";
+      license = lib.licenses.agpl3Plus;
+    }
+  ) { };
+
+  "haskell-bee-pgmq" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      deepseq,
+      haskell-bee,
+      haskell-bee-tests,
+      haskell-pgmq,
+      hspec,
+      mtl,
+      postgresql-libpq,
+      postgresql-simple,
+      random-strings,
+      safe,
+      safe-exceptions,
+      scientific,
+      tasty,
+      tasty-hspec,
+      text,
+      time,
+      units,
+      unix-time,
+    }:
+    mkDerivation {
+      pname = "haskell-bee-pgmq";
+      version = "0.1.0.0";
+      sha256 = "1cf8mc1ddl1vhh7nyjsla5ccymy3963sz2j9l337pvpm492lxf0a";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        deepseq
+        haskell-bee
+        haskell-pgmq
+        postgresql-libpq
+        postgresql-simple
+        safe
+        safe-exceptions
+        scientific
+        text
+        time
+        units
+        unix-time
+      ];
+      executableHaskellDepends = [
+        aeson
+        base
+        haskell-bee
+        haskell-pgmq
+        mtl
+        postgresql-simple
+        text
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        containers
+        haskell-bee
+        haskell-bee-tests
+        hspec
+        postgresql-simple
+        random-strings
+        tasty
+        tasty-hspec
+        text
+      ];
+      description = "PostgreSQL/PGMQ broker implementation for haskell-bee";
+      license = lib.licenses.agpl3Plus;
+      mainProgram = "simple-worker";
+    }
+  ) { };
+
+  "haskell-bee-redis" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      deepseq,
+      haskell-bee,
+      haskell-bee-tests,
+      hedis,
+      hspec,
+      random-strings,
+      safe,
+      safe-exceptions,
+      scientific,
+      stm,
+      tasty,
+      tasty-hspec,
+      tasty-hunit,
+      tasty-quickcheck,
+      text,
+      time,
+      units,
+      unix-time,
+    }:
+    mkDerivation {
+      pname = "haskell-bee-redis";
+      version = "0.1.0.0";
+      sha256 = "19qq0gkpqb0ywchsz0z2q5qpvj3f260k1175zkjc49mzwl6q26x4";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        deepseq
+        haskell-bee
+        hedis
+        safe
+        safe-exceptions
+        scientific
+        stm
+        text
+        time
+        units
+        unix-time
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        containers
+        haskell-bee
+        haskell-bee-tests
+        hedis
+        hspec
+        random-strings
+        stm
+        tasty
+        tasty-hspec
+        tasty-hunit
+        tasty-quickcheck
+        text
+        unix-time
+      ];
+      description = "Redis broker implementation for haskell-bee";
+      license = lib.licenses.agpl3Plus;
+    }
+  ) { };
+
+  "haskell-bee-stm" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      deepseq,
+      haskell-bee,
+      haskell-bee-tests,
+      hspec,
+      random-strings,
+      safe,
+      safe-exceptions,
+      scientific,
+      stm,
+      tasty,
+      tasty-hspec,
+      tasty-hunit,
+      tasty-quickcheck,
+      text,
+      time,
+      units,
+      unix-time,
+    }:
+    mkDerivation {
+      pname = "haskell-bee-stm";
+      version = "0.1.0.0";
+      sha256 = "1m34642h4nkl03yrvpgrhnprkj09xylg5rfg169gadwk8jm6w0bw";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        deepseq
+        haskell-bee
+        safe
+        safe-exceptions
+        scientific
+        stm
+        text
+        time
+        units
+        unix-time
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        containers
+        haskell-bee
+        haskell-bee-tests
+        hspec
+        random-strings
+        stm
+        tasty
+        tasty-hspec
+        tasty-hunit
+        tasty-quickcheck
+        text
+        unix-time
+      ];
+      description = "STM broker implementation for haskell-bee";
+      license = lib.licenses.agpl3Plus;
+    }
+  ) { };
+
+  "haskell-bee-tests" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      containers,
+      haskell-bee,
+      hedis,
+      hspec,
+      postgresql-simple,
+      random-strings,
+      stm,
+      tasty,
+      tasty-hspec,
+      text,
+    }:
+    mkDerivation {
+      pname = "haskell-bee-tests";
+      version = "0.1.0.0";
+      sha256 = "1bcg8c8fm9yaq4k3v8m79qq6miqjgbmc3xbdnr4mn5z8ayi1s2cr";
+      libraryHaskellDepends = [
+        aeson
+        base
+        containers
+        haskell-bee
+        hedis
+        hspec
+        postgresql-simple
+        random-strings
+        stm
+        tasty
+        tasty-hspec
+        text
+      ];
+      description = "Reusable test suite for any haskell-bee Broker implementation";
+      license = lib.licenses.agpl3Plus;
+    }
+  ) { };
+
   "haskell-bitmex-client" = callPackage (
     {
       mkDerivation,
@@ -301753,8 +303447,8 @@ self: {
         }:
         mkDerivation {
           pname = "haskell-gi";
-          version = "0.26.15";
-          sha256 = "07lpd31j582czgvrivyh0fp3bbjmhvqicgy47pv2j69x450q2wsa";
+          version = "0.26.16";
+          sha256 = "0v5pjysap2v5a9njc1z9c6by2sv18p9kkqcpzpxwqjs9hh4mxq5q";
           setupHaskellDepends = [
             base
             Cabal
@@ -301798,6 +303492,82 @@ self: {
         inherit (pkgs) gobject-introspection;
       };
 
+  "haskell-gi_0_26_17" =
+    callPackage
+      (
+        {
+          mkDerivation,
+          ansi-terminal,
+          attoparsec,
+          base,
+          bytestring,
+          Cabal,
+          cabal-doctest,
+          containers,
+          directory,
+          doctest,
+          filepath,
+          glib,
+          gobject-introspection,
+          haskell-gi-base,
+          mtl,
+          pretty-show,
+          process,
+          regex-tdfa,
+          safe,
+          text,
+          transformers,
+          xdg-basedir,
+          xml-conduit,
+        }:
+        mkDerivation {
+          pname = "haskell-gi";
+          version = "0.26.17";
+          sha256 = "0vg75z5qgf0km59gv6dvpzckyxdli3i5d8lk8xck55smaf9h6f6i";
+          setupHaskellDepends = [
+            base
+            Cabal
+            cabal-doctest
+          ];
+          libraryHaskellDepends = [
+            ansi-terminal
+            attoparsec
+            base
+            bytestring
+            Cabal
+            containers
+            directory
+            filepath
+            haskell-gi-base
+            mtl
+            pretty-show
+            process
+            regex-tdfa
+            safe
+            text
+            transformers
+            xdg-basedir
+            xml-conduit
+          ];
+          libraryPkgconfigDepends = [
+            glib
+            gobject-introspection
+          ];
+          testHaskellDepends = [
+            base
+            doctest
+            process
+          ];
+          description = "Generate Haskell bindings for GObject Introspection capable libraries";
+          license = lib.licenses.lgpl21Only;
+          hydraPlatforms = lib.platforms.none;
+        }
+      )
+      {
+        inherit (pkgs) glib;
+        inherit (pkgs) gobject-introspection;
+      };
+
   "haskell-gi-base" = callPackage (
     {
       mkDerivation,
@@ -301805,16 +303575,18 @@ self: {
       bytestring,
       containers,
       glib,
+      optics-core,
       text,
     }:
     mkDerivation {
       pname = "haskell-gi-base";
-      version = "0.26.8";
-      sha256 = "19sp8yi9inxq7vqw6zpf2rlk56algxajkf8gyl0iqbx95kb4x1bb";
+      version = "0.26.9";
+      sha256 = "1li1q8k5zn7yxqn3rdh5sjkq4lsr9gsbhkvxh6wzca39n37vnnf3";
       libraryHaskellDepends = [
         base
         bytestring
         containers
+        optics-core
         text
       ];
       libraryPkgconfigDepends = [ glib ];
@@ -301861,6 +303633,90 @@ self: {
     }
   ) { };
 
+  "haskell-google-genai-client" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      base64-bytestring,
+      bytestring,
+      case-insensitive,
+      containers,
+      deepseq,
+      exceptions,
+      hspec,
+      http-api-data,
+      http-client,
+      http-client-tls,
+      http-media,
+      http-types,
+      iso8601-time,
+      microlens,
+      monad-logger,
+      mtl,
+      network,
+      QuickCheck,
+      random,
+      safe-exceptions,
+      semigroups,
+      text,
+      time,
+      transformers,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "haskell-google-genai-client";
+      version = "0.1.0";
+      sha256 = "020qnab47jn1ixmwds8w4nbyzd2j1kpg7ykd71lfc71vnr4mh93h";
+      libraryHaskellDepends = [
+        aeson
+        base
+        base64-bytestring
+        bytestring
+        case-insensitive
+        containers
+        deepseq
+        exceptions
+        http-api-data
+        http-client
+        http-client-tls
+        http-media
+        http-types
+        iso8601-time
+        microlens
+        monad-logger
+        mtl
+        network
+        random
+        safe-exceptions
+        text
+        time
+        transformers
+        unordered-containers
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        hspec
+        iso8601-time
+        mtl
+        QuickCheck
+        semigroups
+        text
+        time
+        transformers
+        unordered-containers
+        vector
+      ];
+      description = "Auto-generated Gemini API Client for Haskell";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   "haskell-google-trends" = callPackage (
     {
       mkDerivation,
@@ -302307,6 +304163,8 @@ self: {
       pname = "haskell-language-server";
       version = "2.11.0.0";
       sha256 = "1acd42sqa76nkrwkb6jcrimbf8va6ikkynv9ssbbamyy4vmx1aa4";
+      revision = "1";
+      editedCabalFile = "06ah5cdcg52azd0jx7n4n7xwrhphjc2k4k8gqda44m1kiv5z2v18";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -303191,6 +305049,62 @@ self: {
     }
   ) { };
 
+  "haskell-pgmq" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      hspec,
+      postgresql-simple,
+      random-strings,
+      safe,
+      stm,
+      tasty,
+      tasty-hspec,
+      text,
+      time,
+      units,
+    }:
+    mkDerivation {
+      pname = "haskell-pgmq";
+      version = "0.1.0.0";
+      sha256 = "1kslpx1zah97k9z2k967rwkjm01p9c0vz0if4hhpa52rprcadm7k";
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        postgresql-simple
+        safe
+        text
+        time
+        units
+      ];
+      executableHaskellDepends = [
+        base
+        postgresql-simple
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        containers
+        hspec
+        postgresql-simple
+        random-strings
+        stm
+        tasty
+        tasty-hspec
+        text
+      ];
+      description = "Haskell interface for Tembo's PGMQ PostgreSQL extension";
+      license = lib.licenses.agpl3Plus;
+    }
+  ) { };
+
   "haskell-platform-test" = callPackage (
     {
       mkDerivation,
@@ -308645,8 +310559,8 @@ self: {
     }:
     mkDerivation {
       pname = "hasktorch";
-      version = "0.2.1.3";
-      sha256 = "18j3mvbag1anmkc5s8486i1a6am3iljm48aixxf5fi1bg2mkq46k";
+      version = "0.2.1.4";
+      sha256 = "0g5k796s66mz53cabfd0gl099rrjk1pfxc55qfg2j97mn69hgb1q";
       setupHaskellDepends = [
         base
         Cabal
@@ -311362,8 +313276,8 @@ self: {
     }:
     mkDerivation {
       pname = "hasql-resource-pool";
-      version = "1.9.1.2";
-      sha256 = "1cg1wgrb7xbnqqqzy31y5lskcb66vmsr6ifmv0xi1qy0kb0c2y7i";
+      version = "1.9.1.3";
+      sha256 = "10hgwdpnd82yhsjflbskngwkjmkpp49qrvxspgka24ngp8q08zyz";
       libraryHaskellDepends = [
         base-prelude
         clock
@@ -313252,6 +315166,8 @@ self: {
       pname = "haxr";
       version = "3000.11.5.1";
       sha256 = "1r5ipm1qzlkxk1xc9hv86kli5aa4nw7i9a6n42ixkcspwb8fjhzd";
+      revision = "1";
+      editedCabalFile = "0m9x1cs789qs7k3zc197zri1nbh6g1y05xraq5a1k10s0xs5sjdy";
       libraryHaskellDepends = [
         array
         base
@@ -313890,6 +315806,31 @@ self: {
     }
   ) { };
 
+  "hblosc" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      hspec,
+    }:
+    mkDerivation {
+      pname = "hblosc";
+      version = "0.1.0.2";
+      sha256 = "0xsp5cwj8mqss6rwbm5ndjkzl2yhw7x135s9gvhwm6xj36pz0gnb";
+      libraryHaskellDepends = [
+        base
+        bytestring
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        hspec
+      ];
+      description = "Blosc (numerical compression library) bindings for Haskell";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   "hbro" = callPackage (
     {
       mkDerivation,
@@ -317178,8 +319119,8 @@ self: {
       pname = "hedgehog-classes";
       version = "0.2.5.4";
       sha256 = "0z9ik5asddc2pnz430jsi1pyahkh6jy36ng0vwm7ywcq7cvhcvlz";
-      revision = "5";
-      editedCabalFile = "19jxkb9dszkvch4cd30n4nsp36p86xdbgqbliqv836m2qwayjmyp";
+      revision = "6";
+      editedCabalFile = "1gj6lrvy11bxnv26ayg1b98dv44ahwqngi8d5rxw1h1m13a7yzkk";
       libraryHaskellDepends = [
         aeson
         base
@@ -317229,22 +319170,25 @@ self: {
       async,
       base,
       bytestring,
+      containers,
       deepseq,
       Diff,
       directory,
       exceptions,
       filepath,
+      generic-lens,
       hedgehog,
       http-conduit,
+      hw-prelude,
       lifted-async,
       lifted-base,
+      microlens,
       mmorph,
       monad-control,
       mtl,
       network,
       process,
       resourcet,
-      retry,
       stm,
       tar,
       tasty,
@@ -317261,34 +319205,38 @@ self: {
     }:
     mkDerivation {
       pname = "hedgehog-extras";
-      version = "0.7.0.0";
-      sha256 = "0dhkhai2q831fb8z9cyv065gdf0468x0sbns1np74v8qnzwbhgav";
-      revision = "1";
-      editedCabalFile = "1f8xc2dr158c3nppj4rny611vfli74fpggnx1s75ln846xq2yzkj";
+      version = "0.9.0.0";
+      sha256 = "0l067gvm7vvhr5jrcys9676kfhdvaivbwiqh85n0zlcnkf3mjff0";
       libraryHaskellDepends = [
         aeson
         aeson-pretty
         async
         base
         bytestring
+        containers
         deepseq
         Diff
         directory
         exceptions
         filepath
+        generic-lens
         hedgehog
         http-conduit
+        hw-prelude
         lifted-async
         lifted-base
+        microlens
         mmorph
         monad-control
         mtl
         network
         process
         resourcet
-        retry
         stm
         tar
+        tasty
+        tasty-discover
+        tasty-hedgehog
         temporary
         text
         time
@@ -317301,10 +319249,12 @@ self: {
       testHaskellDepends = [
         base
         hedgehog
+        lifted-base
         network
         process
         resourcet
         tasty
+        tasty-discover
         tasty-hedgehog
         time
         transformers
@@ -317328,8 +319278,8 @@ self: {
       pname = "hedgehog-fakedata";
       version = "0.0.1.5";
       sha256 = "00k26d83v0646klrg0k3cf94r4fnnx3ykxv7i8shjjgbkbzlzz78";
-      revision = "2";
-      editedCabalFile = "1b8v4j8zkvdfx786nfxxdkxj57b2qh4p9h16wiy0kc3l1dsj6llm";
+      revision = "3";
+      editedCabalFile = "1gfknhs1lslw7s00ciqn14r9b1lpph0827hhbb6bg9r52lylv9g3";
       libraryHaskellDepends = [
         base
         fakedata
@@ -318590,8 +320540,8 @@ self: {
       pname = "heist";
       version = "1.1.1.2";
       sha256 = "1377740si611j0szp64axy0xj1fi2a6w8i9s3xij89h34m7rb3rz";
-      revision = "4";
-      editedCabalFile = "112bhvishyhknb7gzii56sqaz5gxzb1png2k73rsnfmranvzl3ka";
+      revision = "5";
+      editedCabalFile = "0rx4cx09zlg9kdl2sn5fn2ka7a7c26xrvbhkp60pzdnj1hdnsbqi";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -319889,6 +321839,63 @@ self: {
     }
   ) { };
 
+  "heph-sparse-set" = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      criterion,
+      deepseq,
+      hedgehog,
+      mtl,
+      nothunks,
+      primitive,
+      random,
+      tasty,
+      tasty-discover,
+      tasty-hedgehog,
+      tasty-hunit,
+      vector,
+    }:
+    mkDerivation {
+      pname = "heph-sparse-set";
+      version = "0.1.0.0";
+      sha256 = "0w1h6xa62xp1bwpz4czdr6vzml311zq76i1swq6iqpw2wch0dbvn";
+      libraryHaskellDepends = [
+        base
+        deepseq
+        primitive
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        deepseq
+        hedgehog
+        nothunks
+        primitive
+        tasty
+        tasty-discover
+        tasty-hedgehog
+        tasty-hunit
+        vector
+      ];
+      testToolDepends = [ tasty-discover ];
+      benchmarkHaskellDepends = [
+        base
+        containers
+        criterion
+        deepseq
+        mtl
+        primitive
+        random
+        vector
+      ];
+      description = "Really fast mutable sparse sets";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   "heptapod" = callPackage (
     {
       mkDerivation,
@@ -320997,6 +323004,36 @@ self: {
     }
   ) { };
 
+  "heredocs-r2" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      hspec,
+      parsec,
+      template-haskell,
+      text,
+    }:
+    mkDerivation {
+      pname = "heredocs-r2";
+      version = "0.1.0.2";
+      sha256 = "1dzsgblbn4hijd6hgrwc951h1v6fjbg7gjbl8l3ihy79jm75ifbx";
+      libraryHaskellDepends = [
+        base
+        parsec
+        template-haskell
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        hspec
+        text
+      ];
+      description = "Heredocument on Haskell";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   "herf-time" = callPackage (
     {
       mkDerivation,
@@ -325430,8 +327467,8 @@ self: {
     }:
     mkDerivation {
       pname = "hiedb";
-      version = "0.6.0.2";
-      sha256 = "0sfxykvg5n44lpjj069j25pnff30ckby8k3n7yhp8ixajfnfrb5i";
+      version = "0.7.0.0";
+      sha256 = "0mhajz4wlgdzg079r9dcrhkl6dx5fdwq2x1c892frq0gqd18k5ln";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -325458,6 +327495,7 @@ self: {
         ghc-paths
       ];
       testHaskellDepends = [
+        algebraic-graphs
         base
         directory
         filepath
@@ -329805,7 +331843,7 @@ self: {
     }
   ) { };
 
-  "hledger_1_42_2" = callPackage (
+  "hledger_1_43_2" = callPackage (
     {
       mkDerivation,
       aeson,
@@ -329824,6 +331862,8 @@ self: {
       hashable,
       haskeline,
       hledger-lib,
+      http-client,
+      http-types,
       lucid,
       math-functions,
       megaparsec,
@@ -329832,6 +331872,7 @@ self: {
       mtl,
       process,
       regex-tdfa,
+      req,
       safe,
       shakespeare,
       split,
@@ -329850,8 +331891,8 @@ self: {
     }:
     mkDerivation {
       pname = "hledger";
-      version = "1.42.2";
-      sha256 = "0c6g90xdwavp23azv4b1k9sn309j96150adc5ihm4lhijvldphcr";
+      version = "1.43.2";
+      sha256 = "043gw3amc29fbjxlzyc4m97bw5i5462352lmk61adlxcd12l47i1";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -329871,6 +331912,8 @@ self: {
         hashable
         haskeline
         hledger-lib
+        http-client
+        http-types
         lucid
         math-functions
         megaparsec
@@ -329879,6 +331922,7 @@ self: {
         mtl
         process
         regex-tdfa
+        req
         safe
         shakespeare
         split
@@ -329910,12 +331954,15 @@ self: {
         githash
         haskeline
         hledger-lib
+        http-client
+        http-types
         math-functions
         megaparsec
         microlens
         mtl
         process
         regex-tdfa
+        req
         safe
         shakespeare
         split
@@ -329947,12 +331994,15 @@ self: {
         githash
         haskeline
         hledger-lib
+        http-client
+        http-types
         math-functions
         megaparsec
         microlens
         mtl
         process
         regex-tdfa
+        req
         safe
         shakespeare
         split
@@ -329970,7 +332020,7 @@ self: {
         wizards
       ];
       description = "Command-line interface for the hledger accounting system";
-      license = lib.licenses.gpl3Only;
+      license = lib.licenses.gpl3Plus;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hledger";
       maintainers = [
@@ -330207,8 +332257,8 @@ self: {
       pname = "hledger-iadd";
       version = "1.3.21";
       sha256 = "00x0vbfp08kqs1nbknndk9h56hcidf6xnrk0ldz45dvjrmgcv3w2";
-      revision = "8";
-      editedCabalFile = "166vkhghms83x0c03m6kg6v5fx3x8wyr445zjy6vxfsbni6ks4h7";
+      revision = "9";
+      editedCabalFile = "0fhkk8gsqiv7mxjk8jlz43i2h0cqampr8w5f1lxcnfz9g4k0bv5l";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -330288,8 +332338,8 @@ self: {
       pname = "hledger-interest";
       version = "1.6.7";
       sha256 = "1jirygghw82zi8z160j45qzfcj1l89vckqr7hrv78h3f3pim6np4";
-      revision = "1";
-      editedCabalFile = "1hl3vgwhlk15xrhafmp5y017cm4y7zkn2n8l9frsc0xz67h9571z";
+      revision = "2";
+      editedCabalFile = "1inrlrz2rgk99sspm33r7rnfiycx8pllsh95ais9x05fp88cxhcf";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -330506,7 +332556,7 @@ self: {
     }
   ) { };
 
-  "hledger-lib_1_42_2" = callPackage (
+  "hledger-lib_1_43_2" = callPackage (
     {
       mkDerivation,
       aeson,
@@ -330514,7 +332564,6 @@ self: {
       ansi-terminal,
       array,
       base,
-      base-compat,
       blaze-html,
       blaze-markup,
       bytestring,
@@ -330561,15 +332610,14 @@ self: {
     }:
     mkDerivation {
       pname = "hledger-lib";
-      version = "1.42.2";
-      sha256 = "0m0z70m4bm7bhrhjczdhwgz8afvjc1lrxwdr8kzgg0yyq2xrmxxx";
+      version = "1.43.2";
+      sha256 = "18037qwz7d0h4i86ac0w3hkrvx22vdxf04fjbg0qjlizgb3dlazf";
       libraryHaskellDepends = [
         aeson
         aeson-pretty
         ansi-terminal
         array
         base
-        base-compat
         blaze-html
         blaze-markup
         bytestring
@@ -330619,7 +332667,6 @@ self: {
         ansi-terminal
         array
         base
-        base-compat
         blaze-html
         blaze-markup
         bytestring
@@ -330665,7 +332712,7 @@ self: {
         utf8-string
       ];
       description = "A library providing the core functionality of hledger";
-      license = lib.licenses.gpl3Only;
+      license = lib.licenses.gpl3Plus;
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -330874,7 +332921,7 @@ self: {
     }
   ) { };
 
-  "hledger-ui_1_42_2" = callPackage (
+  "hledger-ui_1_43_2" = callPackage (
     {
       mkDerivation,
       ansi-terminal,
@@ -330910,10 +332957,8 @@ self: {
     }:
     mkDerivation {
       pname = "hledger-ui";
-      version = "1.42.2";
-      sha256 = "17jmjphvrxcmg69b3p82sapf8x14w5xw10crbpcs6ws0wmlmmq71";
-      revision = "1";
-      editedCabalFile = "0lh28f9pxx6zxn91wna6ywj50igraqb6dyg797qqm2q3zz0kapif";
+      version = "1.43.2";
+      sha256 = "1xz5ndkg5mci689n82dnmwhhr8a08qw12czsf4b82ha7zlmbkmnv";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -330950,7 +332995,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Terminal interface for the hledger accounting system";
-      license = lib.licenses.gpl3Only;
+      license = lib.licenses.gpl3Plus;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hledger-ui";
       maintainers = [ lib.maintainers.maralorn ];
@@ -331112,12 +333157,11 @@ self: {
     }
   ) { };
 
-  "hledger-web_1_42_2" = callPackage (
+  "hledger-web_1_43_2" = callPackage (
     {
       mkDerivation,
       aeson,
       base,
-      base-compat,
       base64,
       blaze-html,
       blaze-markup,
@@ -331132,6 +333176,7 @@ self: {
       Decimal,
       directory,
       extra,
+      file-embed,
       filepath,
       githash,
       hjsmin,
@@ -331167,14 +333212,13 @@ self: {
     }:
     mkDerivation {
       pname = "hledger-web";
-      version = "1.42.2";
-      sha256 = "0ciz1y97aw7493avj8i9hnzjinc1fwj20wns036qa6yxglsj0qkm";
+      version = "1.43.2";
+      sha256 = "0d4sv9k3m7s0764lbq2l8w9p2p47cby177l0avl5w3fa9y8d0gyd";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         aeson
         base
-        base-compat
         base64
         blaze-html
         blaze-markup
@@ -331189,6 +333233,7 @@ self: {
         Decimal
         directory
         extra
+        file-embed
         filepath
         githash
         hjsmin
@@ -331222,16 +333267,10 @@ self: {
         yesod-static
         yesod-test
       ];
-      executableHaskellDepends = [
-        base
-        base-compat
-      ];
-      testHaskellDepends = [
-        base
-        base-compat
-      ];
+      executableHaskellDepends = [ base ];
+      testHaskellDepends = [ base ];
       description = "Web user interface for the hledger accounting system";
-      license = lib.licenses.gpl3Only;
+      license = lib.licenses.gpl3Plus;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hledger-web";
       maintainers = [ lib.maintainers.maralorn ];
@@ -337404,8 +339443,8 @@ self: {
     }:
     mkDerivation {
       pname = "hoist-error";
-      version = "0.3.0.0";
-      sha256 = "160967zsp8rzsvs12crsxh3854lnhxiidv8adixb4nf9hxvdnka6";
+      version = "0.3.1.0";
+      sha256 = "12hq6xz6jrsjd6nc03iv033abx73m1b2baszlk6b7k6r850fw4q5";
       libraryHaskellDepends = [
         base
         mtl
@@ -339984,8 +342023,8 @@ self: {
       pname = "horizontal-rule";
       version = "0.7.0.0";
       sha256 = "0s4hf7frj1gc41v83qk8fgdfn49msmvhcfw6vjklx6w7b6pkfx9x";
-      revision = "1";
-      editedCabalFile = "1jb71y6mxkrcnps1jdh6rkkrznhzcsyl8c7s565xjalabql56nkq";
+      revision = "2";
+      editedCabalFile = "02cql9yvsvbi6xf7kplidmxay7n70lxb1z2499vngn7197b6d5kh";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -342869,7 +344908,7 @@ self: {
     }
   ) { };
 
-  "hpqtypes-extras_1_17_0_1" = callPackage (
+  "hpqtypes-extras_1_18_0_0" = callPackage (
     {
       mkDerivation,
       base,
@@ -342893,8 +344932,8 @@ self: {
     }:
     mkDerivation {
       pname = "hpqtypes-extras";
-      version = "1.17.0.1";
-      sha256 = "1f2ipf4hwp3iqfb79bbx8h97l1cy8vyc1w5h0q1fvg2yvxl52szp";
+      version = "1.18.0.0";
+      sha256 = "1vqyb1izw6ascmkkqkm33iahydrabpb7rq2r3qkhxkjbhrgfk5j5";
       libraryHaskellDepends = [
         base
         base16-bytestring
@@ -343611,6 +345650,26 @@ self: {
     }
   ) { };
 
+  "hquantlib-time_0_1_2" = callPackage (
+    {
+      mkDerivation,
+      base,
+      time,
+    }:
+    mkDerivation {
+      pname = "hquantlib-time";
+      version = "0.1.2";
+      sha256 = "0i0klg4l4vipw8802ghb2ddd1fpn7wrg027pqfh1yf6x1m1r2k8z";
+      libraryHaskellDepends = [
+        base
+        time
+      ];
+      description = "HQuantLib Time is a business calendar functions extracted from HQuantLib";
+      license = lib.licenses.lgpl3Plus;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "hquery" = callPackage (
     {
       mkDerivation,
@@ -346711,14 +348770,15 @@ self: {
       base,
       extra,
       ghc-events,
+      machines,
       optparse-applicative,
       text,
       vector,
     }:
     mkDerivation {
       pname = "hs-speedscope";
-      version = "0.2.1";
-      sha256 = "1qzmcn718mbg5pckvbcw2n36srmbixkyp45hrkdcdnqcsvf5agln";
+      version = "0.3.0";
+      sha256 = "089mg3q9f6pkvkx4zxgnv69hyzs06cr4ljkaij5kzgq35i12l4x3";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -346726,6 +348786,7 @@ self: {
         base
         extra
         ghc-events
+        machines
         optparse-applicative
         text
         vector
@@ -350603,7 +352664,6 @@ self: {
       cmdargs,
       directory,
       filepath,
-      filepath-bytestring,
       libssh2,
       mtl,
       tasty,
@@ -350616,8 +352676,8 @@ self: {
     }:
     mkDerivation {
       pname = "hsftp";
-      version = "1.3.1";
-      sha256 = "0027bmn11fl3lbyd4aw77w5b4xdf53izpxnnpp1qnwpxd8j92w82";
+      version = "1.4.0";
+      sha256 = "01fzgrk9w6xy7wxkpg2znw5g2wkqrcz6vj1f0pdffvg0bslfn4g0";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -350627,7 +352687,6 @@ self: {
         cmdargs
         directory
         filepath
-        filepath-bytestring
         libssh2
         mtl
         time
@@ -350640,7 +352699,6 @@ self: {
         cmdargs
         directory
         filepath
-        filepath-bytestring
         libssh2
         mtl
         time
@@ -350653,7 +352711,6 @@ self: {
         cmdargs
         directory
         filepath
-        filepath-bytestring
         libssh2
         mtl
         tasty
@@ -351567,6 +353624,56 @@ self: {
     }
   ) { };
 
+  "hslua_2_4_0" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      exceptions,
+      hslua-aeson,
+      hslua-classes,
+      hslua-core,
+      hslua-marshalling,
+      hslua-objectorientation,
+      hslua-packaging,
+      hslua-typing,
+      tasty,
+      tasty-hslua,
+      tasty-hunit,
+      text,
+    }:
+    mkDerivation {
+      pname = "hslua";
+      version = "2.4.0";
+      sha256 = "093cjgrzxyvd7kg7ap5bszbfpgzcggwsnypm2q2ij6hyqz8x8gqk";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        hslua-aeson
+        hslua-classes
+        hslua-core
+        hslua-marshalling
+        hslua-objectorientation
+        hslua-packaging
+        hslua-typing
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        exceptions
+        hslua-core
+        tasty
+        tasty-hslua
+        tasty-hunit
+        text
+      ];
+      description = "Bindings to Lua, an embeddable scripting language";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "hslua-aeson" = callPackage (
     {
       mkDerivation,
@@ -351880,8 +353987,8 @@ self: {
     }:
     mkDerivation {
       pname = "hslua-module-doclayout";
-      version = "1.2.0";
-      sha256 = "1x3znkdz1l8p8gsvazz85936p107xscsaah1ac3padyiswhair1j";
+      version = "1.2.0.1";
+      sha256 = "139l4sh9pllm0zjgv3w7scbpd0cgn23r95fdlchavsdfwkpvcx17";
       libraryHaskellDepends = [
         base
         doclayout
@@ -351988,6 +354095,55 @@ self: {
     }
   ) { };
 
+  "hslua-module-system_1_2_0" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      directory,
+      exceptions,
+      hslua-core,
+      hslua-marshalling,
+      hslua-packaging,
+      process,
+      tasty,
+      tasty-hunit,
+      tasty-lua,
+      temporary,
+      text,
+      time,
+    }:
+    mkDerivation {
+      pname = "hslua-module-system";
+      version = "1.2.0";
+      sha256 = "0wbbz0h33wrhdpxz40gqgijkra19jg0zyy4snmj75qxcq2cc9dw2";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        directory
+        exceptions
+        hslua-core
+        hslua-marshalling
+        hslua-packaging
+        process
+        temporary
+        text
+        time
+      ];
+      testHaskellDepends = [
+        base
+        hslua-core
+        hslua-packaging
+        tasty
+        tasty-hunit
+        tasty-lua
+      ];
+      description = "Lua module wrapper around Haskell's System module";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "hslua-module-text" = callPackage (
     {
       mkDerivation,
@@ -352070,8 +354226,6 @@ self: {
     {
       mkDerivation,
       base,
-      bytestring,
-      filepath,
       hslua-core,
       hslua-list,
       hslua-marshalling,
@@ -352087,14 +354241,10 @@ self: {
     }:
     mkDerivation {
       pname = "hslua-module-zip";
-      version = "1.1.3";
-      sha256 = "1fws5jwf1zwqilgm05y28ywgxavygnjpdlj43nhfg8cmng1p0kyq";
-      revision = "1";
-      editedCabalFile = "1ml14hycwh4wg8351b8dq94qyppkzhw8jk0b0dgahqvy7p5w86y3";
+      version = "1.1.4";
+      sha256 = "1ij2rmy8m4pw7k7w5vvb3g934kms60vhzhhp8kryknbi6bsg8lsy";
       libraryHaskellDepends = [
         base
-        bytestring
-        filepath
         hslua-core
         hslua-list
         hslua-marshalling
@@ -352106,20 +354256,12 @@ self: {
       ];
       testHaskellDepends = [
         base
-        bytestring
-        filepath
         hslua-core
-        hslua-list
-        hslua-marshalling
         hslua-module-system
         hslua-packaging
-        hslua-typing
         tasty
         tasty-hunit
         tasty-lua
-        text
-        time
-        zip-archive
       ];
       description = "Lua module to work with file zips";
       license = lib.licenses.mit;
@@ -352184,6 +354326,46 @@ self: {
     }
   ) { };
 
+  "hslua-objectorientation_2_4_0" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      hslua-core,
+      hslua-marshalling,
+      hslua-typing,
+      tasty,
+      tasty-hslua,
+      text,
+    }:
+    mkDerivation {
+      pname = "hslua-objectorientation";
+      version = "2.4.0";
+      sha256 = "0gm7l5gqbxrvniivz82wl9rmwgmrg2swji3q0wk43s2xxhajbihs";
+      libraryHaskellDepends = [
+        base
+        containers
+        hslua-core
+        hslua-marshalling
+        hslua-typing
+        text
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        hslua-core
+        hslua-marshalling
+        hslua-typing
+        tasty
+        tasty-hslua
+      ];
+      description = "Object orientation tools for HsLua";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "hslua-packaging" = callPackage (
     {
       mkDerivation,
@@ -352232,6 +354414,50 @@ self: {
     }
   ) { };
 
+  "hslua-packaging_2_3_2" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      hslua-core,
+      hslua-marshalling,
+      hslua-objectorientation,
+      hslua-typing,
+      tasty,
+      tasty-hslua,
+      tasty-hunit,
+      text,
+    }:
+    mkDerivation {
+      pname = "hslua-packaging";
+      version = "2.3.2";
+      sha256 = "1w7929fr6pkwm9x25ags1nk5xrfq9kn3g113wi5c02a8m8zqwh8s";
+      libraryHaskellDepends = [
+        base
+        containers
+        hslua-core
+        hslua-marshalling
+        hslua-objectorientation
+        hslua-typing
+        text
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        hslua-core
+        hslua-marshalling
+        tasty
+        tasty-hslua
+        tasty-hunit
+        text
+      ];
+      description = "Utilities to build Lua modules";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "hslua-repl" = callPackage (
     {
       mkDerivation,
@@ -353132,6 +355358,33 @@ self: {
     }
   ) { };
 
+  "hspec-annotated-exception" = callPackage (
+    {
+      mkDerivation,
+      annotated-exception,
+      base,
+      hspec,
+      HUnit,
+      lens,
+      text,
+    }:
+    mkDerivation {
+      pname = "hspec-annotated-exception";
+      version = "0.0.0.0";
+      sha256 = "0cmhplcqqbn9ggv5fwdij3kmj52jvkm8j4z3gbrgyd66y1i9wmhb";
+      libraryHaskellDepends = [
+        annotated-exception
+        base
+        hspec
+        HUnit
+        lens
+        text
+      ];
+      description = "Hspec hook that unwraps test failures from AnnotatedException";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   "hspec-api" = callPackage (
     {
       mkDerivation,
@@ -353391,6 +355644,8 @@ self: {
       pname = "hspec-core";
       version = "2.11.12";
       sha256 = "030400w95775jrivbi7n1nnx6j5z717rqd3986ggklb8h9hjalfc";
+      revision = "1";
+      editedCabalFile = "0yq9nnawcgbgxiz4ymfa8k66jrvgrhmv8j7g880x8k6q8q4ncqlq";
       libraryHaskellDepends = [
         ansi-terminal
         array
@@ -354319,6 +356574,8 @@ self: {
       pname = "hspec-meta";
       version = "2.11.12";
       sha256 = "1612pg5gihqjxrzqqvbbgckaqiwq3rmz3rg07lrjhzklg975nj69";
+      revision = "2";
+      editedCabalFile = "1jrk14s51psb0zjici56220iyb98i3q06sd3rsyx594s3cddgn5d";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -355673,55 +357930,69 @@ self: {
     }
   ) { inherit (pkgs) sqlite; };
 
-  "hsqml" = callPackage (
-    {
-      mkDerivation,
-      base,
-      c2hs,
-      Cabal,
-      containers,
-      directory,
-      filepath,
-      qt5,
-      QuickCheck,
-      tagged,
-      template-haskell,
-      text,
-      transformers,
-    }:
-    mkDerivation {
-      pname = "hsqml";
-      version = "0.3.5.1";
-      sha256 = "046inz0pa5s052w653pk2km9finj44c6y2yx7iqihn4h4vnqbim0";
-      setupHaskellDepends = [
-        base
-        Cabal
-        filepath
-        template-haskell
-      ];
-      libraryHaskellDepends = [
-        base
-        containers
-        filepath
-        tagged
-        text
-        transformers
-      ];
-      libraryPkgconfigDepends = [ qt5 ];
-      libraryToolDepends = [ c2hs ];
-      testHaskellDepends = [
-        base
-        containers
-        directory
-        QuickCheck
-        tagged
-        text
-      ];
-      description = "Haskell binding for Qt Quick";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-    }
-  ) { qt5 = null; };
+  "hsqml" =
+    callPackage
+      (
+        {
+          mkDerivation,
+          base,
+          bytestring,
+          c2hs,
+          Cabal,
+          containers,
+          directory,
+          filepath,
+          qt5,
+          Qt5Network,
+          QuickCheck,
+          tagged,
+          template-haskell,
+          text,
+          transformers,
+        }:
+        mkDerivation {
+          pname = "hsqml";
+          version = "0.3.6.1";
+          sha256 = "0wvnxc3kad9ja4s16n9nj6nqknckal93ifbprq6nwd0x5i6zvknm";
+          setupHaskellDepends = [
+            base
+            Cabal
+            filepath
+            template-haskell
+          ];
+          libraryHaskellDepends = [
+            base
+            bytestring
+            containers
+            directory
+            filepath
+            QuickCheck
+            tagged
+            text
+            transformers
+          ];
+          libraryPkgconfigDepends = [
+            qt5
+            Qt5Network
+          ];
+          libraryToolDepends = [ c2hs ];
+          testHaskellDepends = [
+            base
+            containers
+            directory
+            QuickCheck
+            tagged
+            text
+          ];
+          description = "Haskell binding for Qt Quick";
+          license = lib.licenses.bsd3;
+          hydraPlatforms = lib.platforms.none;
+        }
+      )
+      {
+        Qt5Network = null;
+        qt5 = null;
+      };
 
   "hsqml-datamodel" = callPackage (
     {
@@ -355786,8 +358057,8 @@ self: {
     }:
     mkDerivation {
       pname = "hsqml-demo-manic";
-      version = "0.3.4.0";
-      sha256 = "09lnd6am51z98j4kwwidj4jw0bcrx8904r526w50y38afngysqx6";
+      version = "0.3.5.0";
+      sha256 = "1y5wfqdilmgkshvd5zz0ajpjx41rn68n6gp43nx1qamz036plklv";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -355818,8 +358089,8 @@ self: {
     }:
     mkDerivation {
       pname = "hsqml-demo-morris";
-      version = "0.3.1.1";
-      sha256 = "166r06yhnmg063d48dh7973wg85nfmvp1c5gmy79ilycc8xgvmhm";
+      version = "0.3.2.0";
+      sha256 = "0bc0ll794bmz0m12y2s6pcwxlm16ppcldhr0gbs4xfwcb2mylrd2";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -355851,8 +358122,8 @@ self: {
     }:
     mkDerivation {
       pname = "hsqml-demo-notes";
-      version = "0.3.3.0";
-      sha256 = "0gjlsqlspchav6lvc4ld15192x70j8cyzw903dgla7g9sj8fg813";
+      version = "0.3.4.0";
+      sha256 = "1k15v0wyv59dkd7wgzpkv8qy8g0i3sw5dpsjf003cy59rl8g8y3q";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -355881,8 +358152,8 @@ self: {
     }:
     mkDerivation {
       pname = "hsqml-demo-samples";
-      version = "0.3.4.0";
-      sha256 = "0y82caz4fb4cz4qfmdg7h5zr959yw2q162zz980jz179188a8pr2";
+      version = "0.3.5.0";
+      sha256 = "0xihibxfy86ml20hhzr66mzygk0lhwhwjpz09ig47fvdlhs0239d";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -361593,8 +363864,8 @@ self: {
     }:
     mkDerivation {
       pname = "http2";
-      version = "5.3.9";
-      sha256 = "0wcv9ziz0865j66avlax7f4i9l5k7ydcn96bacy78snmvcciblqf";
+      version = "5.3.10";
+      sha256 = "0rs21pgnmd0qcg1j360pm8r9c4hm18bcivhnq3krqjl32zb1frpl";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -361879,6 +364150,7 @@ self: {
       base,
       bytestring,
       crypton-x509-store,
+      crypton-x509-system,
       crypton-x509-validation,
       http2,
       network,
@@ -361891,14 +364163,15 @@ self: {
     }:
     mkDerivation {
       pname = "http2-tls";
-      version = "0.4.6";
-      sha256 = "1fi7mk5lkpgr194da9wcwwn7hwdj5cw9kzdiqr3w8dwixnddqrl9";
+      version = "0.4.8";
+      sha256 = "1sy2q6zyc68fjk03fc9pnd6sshjwr6djbyw45gningpfcrw41qv6";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
         bytestring
         crypton-x509-store
+        crypton-x509-system
         crypton-x509-validation
         http2
         network
@@ -361938,6 +364211,8 @@ self: {
       iproute,
       network,
       network-byte-order,
+      network-control,
+      psqueues,
       quic,
       QuickCheck,
       sockaddr,
@@ -361948,8 +364223,8 @@ self: {
     }:
     mkDerivation {
       pname = "http3";
-      version = "0.0.24";
-      sha256 = "1i7dzw9ib9h0i2zjnwsqxbs188p71ly1ad1vdnjnbhyr4gq6aw77";
+      version = "0.1.0";
+      sha256 = "1ygm1a6ph24a84vsdqb7l2bn1ylzd3dl0bc6blvpqq6yhhm34cpa";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -361965,6 +364240,8 @@ self: {
         iproute
         network
         network-byte-order
+        network-control
+        psqueues
         quic
         sockaddr
         stm
@@ -361977,8 +364254,10 @@ self: {
         base
         base16-bytestring
         bytestring
+        case-insensitive
         conduit
         conduit-extra
+        containers
         crypton
         hspec
         http-semantics
@@ -378490,7 +380769,7 @@ self: {
     }
   ) { };
 
-  "inspection-testing_0_6" = callPackage (
+  "inspection-testing_0_6_2" = callPackage (
     {
       mkDerivation,
       base,
@@ -378502,8 +380781,8 @@ self: {
     }:
     mkDerivation {
       pname = "inspection-testing";
-      version = "0.6";
-      sha256 = "13j6bqybkqd1nrhx648j0nmsjgyqnmbgssm5pxynmkqw62yylbry";
+      version = "0.6.2";
+      sha256 = "0zi1q86sd9jy5dpqfs2j71acdl7kvik0ps78xirpdhyldhwwyqws";
       libraryHaskellDepends = [
         base
         containers
@@ -379192,8 +381471,8 @@ self: {
       pname = "int-cast";
       version = "0.2.0.0";
       sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0";
-      revision = "7";
-      editedCabalFile = "0z1bffrx787f2697a6gfkmbxkj3ymgs88kid9ckcla08n11zw2ql";
+      revision = "8";
+      editedCabalFile = "10a33fvsy4qkckw6ciqiigy4r5f1pflw16l284scsdas56lk1pqq";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [
         base
@@ -379291,8 +381570,8 @@ self: {
     }:
     mkDerivation {
       pname = "int-like";
-      version = "0.3.0";
-      sha256 = "0nyxhq5715cb5dpvs6ap6zkm08xai1ivhpvj6jsj3kiy0fxyscmw";
+      version = "0.3.1";
+      sha256 = "093kq89lj49wmr878i3nx4yw7x0csh7wmnbil4w7whcy7zfmfabx";
       libraryHaskellDepends = [
         algebraic-graphs
         base
@@ -380824,6 +383103,7 @@ self: {
       hashable,
       heaps,
       hspec,
+      indexed-traversable,
       lattices,
       parsec,
       QuickCheck,
@@ -380834,8 +383114,8 @@ self: {
     }:
     mkDerivation {
       pname = "interval-patterns";
-      version = "0.8.0";
-      sha256 = "1paciwq4wzl0kqkl5zzj486dsq5pg6275nj15gicv1czj7m9ncg9";
+      version = "0.8.1";
+      sha256 = "1wq080qvc1xbw6kd86ffl7017prz27g5658yyyvmjrshv5krxrhx";
       libraryHaskellDepends = [
         base
         containers
@@ -380843,6 +383123,7 @@ self: {
         groups
         hashable
         heaps
+        indexed-traversable
         lattices
         semirings
         time
@@ -380856,6 +383137,7 @@ self: {
         hashable
         heaps
         hspec
+        indexed-traversable
         lattices
         parsec
         QuickCheck
@@ -381725,8 +384007,8 @@ self: {
     }:
     mkDerivation {
       pname = "io-classes";
-      version = "1.8.0.0";
-      sha256 = "154bpq8w65xyy4slbd12d0r02gv5bz0q09rlpxyjwx63kpzy5xw1";
+      version = "1.8.0.1";
+      sha256 = "0ivhs0wpl2i8fw5g2ch3ck5adzwsp1dlfl1j3vy872i3cfygcbdi";
       libraryHaskellDepends = [
         array
         async
@@ -381941,8 +384223,8 @@ self: {
     }:
     mkDerivation {
       pname = "io-sim";
-      version = "1.8.0.0";
-      sha256 = "00dmqfbq9j906f5ga1vqqmrvzdmwxwrw6gcigmdspwnpaq73yydr";
+      version = "1.8.0.1";
+      sha256 = "1xv0j1l46n0wv76sll796avrvl3aaxnf0dsqjkp66fw0yprdbh5n";
       libraryHaskellDepends = [
         base
         containers
@@ -382551,8 +384833,8 @@ self: {
     }:
     mkDerivation {
       pname = "ip6addr";
-      version = "2.0.0";
-      sha256 = "1drhjv6xmwfnx2yvxxs03ds415gxdgylzkmb5wy9g7b12q91kxf5";
+      version = "2.0.0.1";
+      sha256 = "18g1y923ll8sh1flg9ddf5nyi7ndngf99p3d39q6icimffnyqkfh";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -384378,14 +386660,15 @@ self: {
       bytestring-lexing,
       hspec,
       hspec-core,
+      hspec-discover,
       QuickCheck,
       quickcheck-instances,
       time,
     }:
     mkDerivation {
       pname = "iso8601-duration";
-      version = "0.1.2.0";
-      sha256 = "1hzzcgc1k3dn4l5yxzqq9d62n2hfkrcg0ag14dly7ak3gx9l8l3n";
+      version = "0.1.2.1";
+      sha256 = "0swdzv13y0ww4vlddcfwlwdcp0n5v824dcn5hfa5lxlp06xvy86h";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -384402,6 +386685,7 @@ self: {
         quickcheck-instances
         time
       ];
+      testToolDepends = [ hspec-discover ];
       description = "Types and parser for ISO8601 durations";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
@@ -390133,15 +392417,17 @@ self: {
       base,
       bytestring,
       jsaddle,
+      template-haskell,
     }:
     mkDerivation {
       pname = "jsaddle-wasm";
-      version = "0.1.1.0";
-      sha256 = "0srdxphbx4f70z97l1v64xdww2ggxap7wb1lyplacrml3pq7qr5d";
+      version = "0.1.2.0";
+      sha256 = "1anr6gg5900mcywwkx8s5j4wpq7hs0zgxc8b2mxf9nlagjjparfz";
       libraryHaskellDepends = [
         base
         bytestring
         jsaddle
+        template-haskell
       ];
       doHaddock = false;
       description = "Run JSaddle JSM with the GHC Wasm backend";
@@ -394031,8 +396317,8 @@ self: {
     }:
     mkDerivation {
       pname = "jukebox";
-      version = "0.5.5";
-      sha256 = "1rv21hdgjmmd6mynv8prfdcn48by3zch9qz6clmkjijvph0zg0nl";
+      version = "0.5.8";
+      sha256 = "1pb7z95cmqaxbmba2grrbf8dm56821y40v12l4402milnahzl3k9";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -395271,10 +397557,8 @@ self: {
     }:
     mkDerivation {
       pname = "kan-extensions";
-      version = "5.2.6";
-      sha256 = "1k7cxqj9hl1b4axlw5903hrxh4vg5rdrzjmpa44xrhws3hy2i0ps";
-      revision = "1";
-      editedCabalFile = "0cq87wbjx4zppyxamqqcy2hsahs3n3k23qnp6q7lrh5303wp5fg0";
+      version = "5.2.7";
+      sha256 = "0n716zyihbnq3s1zhqbh3fm0qzhgy2hk79ziy8b6bvydjpzsq8y3";
       libraryHaskellDepends = [
         adjunctions
         array
@@ -400830,6 +403114,65 @@ self: {
     }
   ) { };
 
+  "koji-tool_1_3" = callPackage (
+    {
+      mkDerivation,
+      base,
+      directory,
+      extra,
+      filepath,
+      formatting,
+      http-conduit,
+      http-directory,
+      koji,
+      pretty-simple,
+      rpm-nvr,
+      safe,
+      select-rpms,
+      simple-cmd,
+      simple-cmd-args,
+      text,
+      time,
+      utf8-string,
+      xdg-userdirs,
+    }:
+    mkDerivation {
+      pname = "koji-tool";
+      version = "1.3";
+      sha256 = "0ibbkl0lvgfwh16hihgqbc9gsgxdlz2w1ra7kfjs9cmx5l8w1gpg";
+      isLibrary = false;
+      isExecutable = true;
+      executableHaskellDepends = [
+        base
+        directory
+        extra
+        filepath
+        formatting
+        http-conduit
+        http-directory
+        koji
+        pretty-simple
+        rpm-nvr
+        safe
+        select-rpms
+        simple-cmd
+        simple-cmd-args
+        text
+        time
+        utf8-string
+        xdg-userdirs
+      ];
+      testHaskellDepends = [
+        base
+        simple-cmd
+      ];
+      description = "Koji CLI tool for querying tasks and installing builds";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "koji-tool";
+    }
+  ) { };
+
   "koneko" = callPackage (
     {
       mkDerivation,
@@ -401704,8 +404047,8 @@ self: {
     }:
     mkDerivation {
       pname = "kubernetes-api-client";
-      version = "0.6.0.1";
-      sha256 = "0j1jldj300n2fnr6q7ciiszcp2p3gs33cjxpjk481rrz84xlgaf5";
+      version = "0.6.1.1";
+      sha256 = "0f3sfs6z9xwf7811s7mbh03a4jsyfcvjx1lvycs7gv1ak1jhm27z";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -404950,6 +407293,8 @@ self: {
       pname = "langchain-hs";
       version = "0.0.2.0";
       sha256 = "0gh3gmmppfms1jg5zaxksalh90675r4pl6lmz63szkpwl9rmc9kz";
+      revision = "2";
+      editedCabalFile = "0qk56yswclxrf903c34ifadd8ja2l3zxfc0b2vzlgf1x7zf4cikl";
       libraryHaskellDepends = [
         aeson
         async
@@ -408491,8 +410836,8 @@ self: {
       pname = "lapack-ffi-tools";
       version = "0.1.3.2";
       sha256 = "0y30qwxzbggn3aqr437j3bi1yfa1fpdq96xq7vxbi1fnll8a9432";
-      revision = "1";
-      editedCabalFile = "0z8ahg1bxcphdyhjaxwmfhdhwwg1d2mhx3dvl6af3c9sql9r5xjw";
+      revision = "2";
+      editedCabalFile = "0k96wssmadcjrhdzcd6q3n7qx9kpb2wb3i9c61xygwx6x9q13wm3";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -409457,8 +411802,8 @@ self: {
       pname = "lattices";
       version = "2.2.1";
       sha256 = "0rknzbzwcbg87hjiz4jwqb81w14pywkipxjrrlrp0m5i8ciky1i7";
-      revision = "2";
-      editedCabalFile = "1y01fx2d3ad601zg13n52k8d4lcx1s3b6hhbwmyblhdj7x9xyl2i";
+      revision = "3";
+      editedCabalFile = "0ry6d23sy0pqgzn2cfbr0yrsxcf1mix2irhv1x9bzv99cz2az3qm";
       libraryHaskellDepends = [
         base
         containers
@@ -412374,7 +414719,6 @@ self: {
       generic-deriving,
       ghc-prim,
       hashable,
-      HUnit,
       indexed-traversable,
       indexed-traversable-instances,
       kan-extensions,
@@ -412387,10 +414731,10 @@ self: {
       simple-reflect,
       strict,
       tagged,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
       template-haskell,
-      test-framework,
-      test-framework-hunit,
-      test-framework-quickcheck2,
       text,
       th-abstraction,
       these,
@@ -412401,8 +414745,8 @@ self: {
     }:
     mkDerivation {
       pname = "lens";
-      version = "5.3.4";
-      sha256 = "12n8jdwlpa5lcp2yi26a4fwncn1v1lyznaa9fasszk6qp0afvdpi";
+      version = "5.3.5";
+      sha256 = "1s0ziznj60l9z3z5dacq58kaq8cdfxcz0r75f5hwj25ivzrsrszg";
       libraryHaskellDepends = [
         array
         assoc
@@ -412444,13 +414788,12 @@ self: {
         bytestring
         containers
         deepseq
-        HUnit
         mtl
         QuickCheck
         simple-reflect
-        test-framework
-        test-framework-hunit
-        test-framework-quickcheck2
+        tasty
+        tasty-hunit
+        tasty-quickcheck
         text
         transformers
       ];
@@ -412711,8 +415054,8 @@ self: {
     }:
     mkDerivation {
       pname = "lens-family-th";
-      version = "0.5.3.1";
-      sha256 = "0fhv44qb3gdwiay3imhwhqhdpiczncjz2w6jiiqk11qn4a63rv7l";
+      version = "0.5.3.2";
+      sha256 = "1lkzrnajlgnxd5wmxaa8z4j3kxry5iwarc15n9jkxygb0b20x3rh";
       libraryHaskellDepends = [
         base
         template-haskell
@@ -412948,8 +415291,8 @@ self: {
       pname = "lens-properties";
       version = "4.11.1";
       sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g";
-      revision = "7";
-      editedCabalFile = "14n9yzar4zfqigyayxhi11a0g954nb4jcz0fahgpxyl2vbg7h1ch";
+      revision = "8";
+      editedCabalFile = "0lp0nkbm38v2i361w79dmqq20v3gn95bh1xixbs20549k73cxxj3";
       libraryHaskellDepends = [
         base
         lens
@@ -413454,8 +415797,8 @@ self: {
       pname = "lentil";
       version = "1.5.8.0";
       sha256 = "08g15kzynync0kl9f247sifzqpkjyvigc5r31w2n3vivi3pdcafn";
-      revision = "1";
-      editedCabalFile = "0n991bjlcjchmjlgfxg709sp6vsi6c5igzs7904i6hfabq3z47q5";
+      revision = "2";
+      editedCabalFile = "0qcibmqkw96658fx3dcfy90k8w4a7xdvllb8h0hk14v0lwvi4cmm";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -416840,8 +419183,8 @@ self: {
         }:
         mkDerivation {
           pname = "libtorch-ffi";
-          version = "2.0.1.3";
-          sha256 = "0hamxxlf69r3m826a3x59k11cmlv4m2340mr3xmcbyqga2zs04a6";
+          version = "2.0.1.5";
+          sha256 = "0qk8wdfp2c3xwn8ydszxn5zpifcgbp5ns75rinyyqybz0rls1xk8";
           libraryHaskellDepends = [
             async
             base
@@ -418722,7 +421065,6 @@ self: {
       distributive,
       ghc-prim,
       hashable,
-      HUnit,
       indexed-traversable,
       lens,
       QuickCheck,
@@ -418731,10 +421073,10 @@ self: {
       semigroupoids,
       simple-reflect,
       tagged,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
       template-haskell,
-      test-framework,
-      test-framework-hunit,
-      test-framework-quickcheck2,
       transformers,
       transformers-compat,
       unordered-containers,
@@ -418743,8 +421085,8 @@ self: {
     }:
     mkDerivation {
       pname = "linear";
-      version = "1.23.1";
-      sha256 = "0ybch2f4yc7mhxryr5f29i7j8ryq1i1n69fgldskxjrj825qkb3x";
+      version = "1.23.2";
+      sha256 = "05v91is8rwm34a86gra2q03d5f1klj4nmlxx8r3cx0gbkdhrvmmv";
       libraryHaskellDepends = [
         adjunctions
         base
@@ -418775,13 +421117,12 @@ self: {
         binary
         bytestring
         deepseq
-        HUnit
         QuickCheck
         reflection
         simple-reflect
-        test-framework
-        test-framework-hunit
-        test-framework-quickcheck2
+        tasty
+        tasty-hunit
+        tasty-quickcheck
         vector
       ];
       description = "Linear Algebra";
@@ -422260,19 +424601,12 @@ self: {
   ) { };
 
   "list1" = callPackage (
-    {
-      mkDerivation,
-      base,
-      smash,
-    }:
+    { mkDerivation, base }:
     mkDerivation {
       pname = "list1";
-      version = "0.0.2";
-      sha256 = "0lxx1m2vrf14fb8r4qzfp6y8iqxai3cdpg2dzh9az383qxhy0zmh";
-      libraryHaskellDepends = [
-        base
-        smash
-      ];
+      version = "0.1.0";
+      sha256 = "1kyl7gg0prq7cyr0radwqcwdmqj3d0w2rjs1406nkryjfibsxgkh";
+      libraryHaskellDepends = [ base ];
       description = "Helpers for working with NonEmpty lists";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
@@ -422643,6 +424977,8 @@ self: {
       pname = "literatex";
       version = "0.4.0.0";
       sha256 = "06whn0rx1gy2pzl4678z087pfragy2sjaw34ljx6sfvxg0wn03bx";
+      revision = "1";
+      editedCabalFile = "1kqa99vrq35hk0n58cj5sgp6s87jgwhafz78jzrwi67v94w3hi01";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -423565,24 +425901,24 @@ self: {
       mkDerivation,
       base,
       enumset,
-      LLVM,
+      LLVM-21git,
     }:
     mkDerivation {
       pname = "llvm-ffi";
-      version = "16.0";
-      sha256 = "14cf6qhdq69ggx41259ih55g6z1vn0694wrh3s8m6f7adq990ra9";
+      version = "21.0";
+      sha256 = "1dfl6zxcghhyyp49lgkknlq8nkvii7aag7y8b38ny93cpcczgx0g";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
         enumset
       ];
-      librarySystemDepends = [ LLVM ];
+      librarySystemDepends = [ LLVM-21git ];
       description = "FFI bindings to the LLVM compiler toolkit";
       license = lib.licenses.bsd3;
       maintainers = [ lib.maintainers.thielema ];
     }
-  ) { LLVM = null; };
+  ) { LLVM-21git = null; };
 
   "llvm-ffi-tools" = callPackage (
     {
@@ -424248,8 +426584,8 @@ self: {
     }:
     mkDerivation {
       pname = "llvm-tf";
-      version = "16.0";
-      sha256 = "1nscccmk0nf52p9r0af354p4n4vr1fbaym4x164wwwid7xc1x65g";
+      version = "21.0";
+      sha256 = "108a6kw5xfbxq4y613702r79bix6djyn3szi188d38vmwzs4a8qx";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -425424,8 +427760,8 @@ self: {
     }:
     mkDerivation {
       pname = "log-base";
-      version = "0.12.0.1";
-      sha256 = "021chwkggy7q5c3hysfg3aj6pv60wla1cv8iyppibx70ilqpzqs4";
+      version = "0.12.1.0";
+      sha256 = "1c4dimdgzbia8h201prbl1w8g4qixn9fr100d7aawr256xhi7jci";
       libraryHaskellDepends = [
         aeson
         aeson-pretty
@@ -425602,7 +427938,7 @@ self: {
       bytestring,
       deepseq,
       http-client,
-      http-client-openssl,
+      http-client-tls,
       http-types,
       log-base,
       network-uri,
@@ -425617,8 +427953,8 @@ self: {
     }:
     mkDerivation {
       pname = "log-elasticsearch";
-      version = "0.13.0.1";
-      sha256 = "1l9p4zpf18rkwkv485swrlwyx2l3iqd332273mkz64ybjqllsdkx";
+      version = "0.13.0.2";
+      sha256 = "1hnd866bcp5fqnxlh3z39d2kn9mza9vp554sm34cmaclmkzfp0cw";
       libraryHaskellDepends = [
         aeson
         aeson-pretty
@@ -425627,7 +427963,7 @@ self: {
         bytestring
         deepseq
         http-client
-        http-client-openssl
+        http-client-tls
         http-types
         log-base
         network-uri
@@ -431261,8 +433597,8 @@ self: {
     }:
     mkDerivation {
       pname = "lz4-bytes";
-      version = "0.1.2.0";
-      sha256 = "1jgsz96n7n7g4403w0h3zjvlhdh11vy4s7wqka0ppsikjjl7f1ni";
+      version = "0.2.0.0";
+      sha256 = "10g253lwwmiz7ci70lyxfjln8mczj5r3m2nmcgidh4r9h31x30yv";
       libraryHaskellDepends = [
         base
         byte-order
@@ -436427,6 +438763,48 @@ self: {
     }
   ) { };
 
+  "markup-parse_0_2_0_0" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      deepseq,
+      Diff,
+      doctest-parallel,
+      flatparse,
+      string-interpolate,
+      tasty,
+      tasty-golden,
+      these,
+    }:
+    mkDerivation {
+      pname = "markup-parse";
+      version = "0.2.0.0";
+      sha256 = "1z08d3chvgl9zk9y2crfjih0crh5dv7pih6x0n7af38l6lhsgkhz";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        deepseq
+        flatparse
+        string-interpolate
+        these
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        Diff
+        doctest-parallel
+        tasty
+        tasty-golden
+      ];
+      description = "A markup parser";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "markup-preview" = callPackage (
     {
       mkDerivation,
@@ -436998,47 +439376,6 @@ self: {
   ) { };
 
   "massiv" = callPackage (
-    {
-      mkDerivation,
-      base,
-      bytestring,
-      deepseq,
-      doctest,
-      exceptions,
-      primitive,
-      random,
-      scheduler,
-      unliftio-core,
-      vector,
-      vector-stream,
-    }:
-    mkDerivation {
-      pname = "massiv";
-      version = "1.0.4.1";
-      sha256 = "11gvl0z49aariw3vy8g46di1x5xibf6l7zf6b3l701hvg0hffyn7";
-      libraryHaskellDepends = [
-        base
-        bytestring
-        deepseq
-        exceptions
-        primitive
-        random
-        scheduler
-        unliftio-core
-        vector
-        vector-stream
-      ];
-      testHaskellDepends = [
-        base
-        doctest
-      ];
-      description = "Massiv (Массив) is an Array Library";
-      license = lib.licenses.bsd3;
-      maintainers = [ lib.maintainers.sheepforce ];
-    }
-  ) { };
-
-  "massiv_1_0_5_0" = callPackage (
     {
       mkDerivation,
       base,
@@ -437075,7 +439412,6 @@ self: {
       ];
       description = "Massiv (Массив) is an Array Library";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.sheepforce ];
     }
   ) { };
@@ -438924,8 +441260,8 @@ self: {
     }:
     mkDerivation {
       pname = "mattermost-api";
-      version = "90000.0.0";
-      sha256 = "1ka3r4bnfwlbjnkws8vkg8i9gj8wzsyss137p7hxrx4sr75s6iyv";
+      version = "90000.1.0";
+      sha256 = "0mp2qch4amgiixmx7zv158fb3ld1dpfad17sb43gxwadrj9afxdh";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -438987,8 +441323,8 @@ self: {
     }:
     mkDerivation {
       pname = "mattermost-api-qc";
-      version = "90000.0.0";
-      sha256 = "0lrb8l8nbrdp4y2ala8hchr8ikv5hqw710ffiiw1sz6z2dqiqbxm";
+      version = "90000.1.0";
+      sha256 = "08ifm97c80a8vp9cqlwk7jb7105y2q6w77zvy2p42vk1l1p6yq4m";
       libraryHaskellDepends = [
         base
         containers
@@ -439854,6 +442190,145 @@ self: {
     }
   ) { };
 
+  "mcp" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      base64-bytestring,
+      bytestring,
+      containers,
+      cryptonite,
+      http-conduit,
+      http-types,
+      jose,
+      memory,
+      mtl,
+      optparse-applicative,
+      random,
+      scientific,
+      servant,
+      servant-auth,
+      servant-auth-server,
+      servant-server,
+      stm,
+      text,
+      time,
+      transformers,
+      unordered-containers,
+      uuid,
+      wai,
+      wai-extra,
+      warp,
+    }:
+    mkDerivation {
+      pname = "mcp";
+      version = "0.2.0.1";
+      sha256 = "0mmm890m86dv16hw7mjbznswhw1jrm7kbn45qqhfp661k3kwlw1j";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        async
+        base
+        base64-bytestring
+        bytestring
+        containers
+        cryptonite
+        http-conduit
+        http-types
+        jose
+        memory
+        mtl
+        random
+        servant
+        servant-auth
+        servant-auth-server
+        servant-server
+        stm
+        text
+        time
+        transformers
+        unordered-containers
+        uuid
+        wai
+        wai-extra
+        warp
+      ];
+      executableHaskellDepends = [
+        aeson
+        base
+        containers
+        optparse-applicative
+        scientific
+        text
+        time
+      ];
+      testHaskellDepends = [ base ];
+      description = "A Haskell implementation of the Model Context Protocol (MCP)";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
+  "mcp-server" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      hspec,
+      http-types,
+      network-uri,
+      QuickCheck,
+      template-haskell,
+      text,
+      vector,
+      wai,
+      warp,
+    }:
+    mkDerivation {
+      pname = "mcp-server";
+      version = "0.1.0.14";
+      sha256 = "0lyr19sg5cjsgiq16v0cfkf1rkwgvyacz4siflf4wapllrkr82fz";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        http-types
+        network-uri
+        template-haskell
+        text
+        vector
+        wai
+        warp
+      ];
+      executableHaskellDepends = [
+        base
+        containers
+        network-uri
+        text
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        hspec
+        network-uri
+        QuickCheck
+        template-haskell
+        text
+      ];
+      description = "Library for building Model Context Protocol (MCP) servers";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   "mcpi" = callPackage (
     {
       mkDerivation,
@@ -440275,8 +442750,8 @@ self: {
       pname = "med-module";
       version = "0.1.3";
       sha256 = "04p1aj85hsr3wpnnfg4nxbqsgq41ga63mrg2w39d8ls8ljvajvna";
-      revision = "1";
-      editedCabalFile = "0m69cvm2nzx2g0y8jfkymap529fm0k65wg82dycj0dc60p9fj66r";
+      revision = "2";
+      editedCabalFile = "0b557rrqki2rjb922s1yqkd7gbm9cjhzg52f0h5mp19v53nds3vz";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -441171,6 +443646,8 @@ self: {
       pname = "megaparsec-tests";
       version = "9.7.0";
       sha256 = "17jwz62f8lnrfmmfrsv1jcvn9wmpk4jlhmxjwk5qqx2iyijnrpb1";
+      revision = "1";
+      editedCabalFile = "108nv4c045xg3ks0v7c0figqrl7v90l87cahhmn5mc24vdpxhkrj";
       libraryHaskellDepends = [
         base
         bytestring
@@ -441717,7 +444194,7 @@ self: {
     }
   ) { };
 
-  "mem-info_0_4_1_0" = callPackage (
+  "mem-info_0_4_1_1" = callPackage (
     {
       mkDerivation,
       base,
@@ -441742,8 +444219,8 @@ self: {
     }:
     mkDerivation {
       pname = "mem-info";
-      version = "0.4.1.0";
-      sha256 = "0613k5qil4j1cfh335gyjf708md9cicbhm5xji7v8fzfmzsqxx1c";
+      version = "0.4.1.1";
+      sha256 = "10b3lmqh4nbyfpglgjb04xx0wd65vxfyc53m3l89linhvij61kmc";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -444459,8 +446936,8 @@ self: {
       pname = "microaeson";
       version = "0.1.0.2";
       sha256 = "025vnzs4j2nmkin5x8h5hbrj25spamqppg68wfqlnbrr1519lxfz";
-      revision = "1";
-      editedCabalFile = "1faq5mjz8jy739lbaizy1v5wrvkxsjzp6lhjmb06a3yv71h6m594";
+      revision = "2";
+      editedCabalFile = "04kq6sh1fl0xgkai0d055s7hkwf21vlksgqizh4xfvsb2xbakgiz";
       libraryHaskellDepends = [
         array
         base
@@ -445556,8 +448033,8 @@ self: {
       pname = "midi-music-box";
       version = "0.0.1.2";
       sha256 = "0rnjwis6y0lnyfjxnxqk3zsh78ylccq5v21avb97vybmj0pld1l9";
-      revision = "6";
-      editedCabalFile = "0b8039mw0wacjxxwx1ws2wczwdgxm4iiymdkykk7lp5ii75vvfww";
+      revision = "7";
+      editedCabalFile = "02xnldnw5ci6chpbj18mz82m8pp582zpy9z3bdy5yi7q7k415h0p";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -445704,6 +448181,8 @@ self: {
       pname = "midimory";
       version = "0.0.2.3";
       sha256 = "1k9pm0ai9i66c7l4px84cf5db3nsq5ab9ndplcyfh05snbdy70vz";
+      revision = "1";
+      editedCabalFile = "1sq7xipm92nfcbf6cad1yclzl36gghqlnnvs1r0579njjcchbgl5";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -446100,9 +448579,11 @@ self: {
       directory,
       filepath,
       hspec,
+      hspec-discover,
       http-client,
       http-date,
       http-types,
+      http2,
       network,
       old-locale,
       parsec,
@@ -446123,8 +448604,8 @@ self: {
     }:
     mkDerivation {
       pname = "mighttpd2";
-      version = "4.0.8";
-      sha256 = "0yqj3m7y493bzjmx1ycyid4s40h11l46w8lv1783drlw7wpakmya";
+      version = "4.0.9";
+      sha256 = "1qd43hlyvhnslxrvy4h0rj5qs6nbxnz8d23myqjspa9jl8rzb1bg";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -446142,6 +448623,7 @@ self: {
         filepath
         http-date
         http-types
+        http2
         network
         parsec
         resourcet
@@ -446181,6 +448663,7 @@ self: {
         hspec
         http-client
       ];
+      testToolDepends = [ hspec-discover ];
       description = "High performance web server on WAI/warp";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
@@ -447077,8 +449560,8 @@ self: {
     }:
     mkDerivation {
       pname = "minici";
-      version = "0.1.7";
-      sha256 = "0kwlgsjn7ikddk59bksb4abb0dc262a61mh4694p8s7x3psjris1";
+      version = "0.1.8";
+      sha256 = "0fady7w644gcrjd9yy7ngbi1dj2rp87lnzmxjr307w8kdb2aqdcj";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -449067,25 +451550,28 @@ self: {
       bytestring,
       concurrent-output,
       containers,
+      data-default,
       directory,
+      extra,
       filepath,
       filepattern,
-      ghc-prim,
       hspec,
       HsYAML,
+      MissingH,
       monad-parallel,
       process,
       SafeSemaphore,
       text,
+      text-builder-linear,
+      text-display,
       time,
       unix-compat,
-      unordered-containers,
       xdg-basedir,
     }:
     mkDerivation {
       pname = "miv";
-      version = "0.4.8";
-      sha256 = "1b3lplsnjf992rvidj48swccl8f8aqdik1sf481g7vwv2mz7d7m6";
+      version = "0.4.9";
+      sha256 = "1z3hwvg3jb82hf6hrlzl9vv1fqy1llgfj2rps27fbccz50i6v6ps";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -449094,33 +451580,26 @@ self: {
         bytestring
         concurrent-output
         containers
+        data-default
         directory
+        extra
         filepath
         filepattern
-        ghc-prim
         HsYAML
+        MissingH
         monad-parallel
         process
         SafeSemaphore
         text
+        text-builder-linear
+        text-display
         time
         unix-compat
-        unordered-containers
         xdg-basedir
       ];
       testHaskellDepends = [
         base
-        bytestring
-        containers
-        directory
-        ghc-prim
         hspec
-        HsYAML
-        monad-parallel
-        process
-        text
-        time
-        unordered-containers
       ];
       description = "Vim plugin manager written in Haskell";
       license = lib.licenses.mit;
@@ -449590,6 +452069,8 @@ self: {
       pname = "mmark-cli";
       version = "0.0.5.2";
       sha256 = "05i8wy3zls6fp1qmdz4ayydhgvq6jnhh2rj4r3frvp8nl70kkv26";
+      revision = "1";
+      editedCabalFile = "1p1ia1vxaa8qpbc4hclmavjnk8xj1b6qqzprq3gysy5l38s340aj";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -449670,10 +452151,8 @@ self: {
     }:
     mkDerivation {
       pname = "mmorph";
-      version = "1.2.0";
-      sha256 = "1022d8mm523dihkf85mqsqxpm9rnyicmv91c8rm4csv7xdc80cv1";
-      revision = "3";
-      editedCabalFile = "1582vcpjiyimb1vwnhgq8gp805iziwa8sivv2frir0cgq4z236yz";
+      version = "1.2.1";
+      sha256 = "1rjclyxyr5ajnpmkrlwap77h5fmdwys8bpwfj0n87v33hh1dcn8f";
       libraryHaskellDepends = [
         base
         mtl
@@ -456466,8 +458945,8 @@ self: {
     }:
     mkDerivation {
       pname = "monoidmap-aeson";
-      version = "0.0.0.5";
-      sha256 = "1m5pw94lrybjvf6hnfzl0v974fg2i53r5s8aw4qv9cbxizhh68ag";
+      version = "0.0.0.6";
+      sha256 = "0fd2cd4a8ncb3hibfknq0sf7j8nmmisr4bwc42yp6l0ddfsdbbd6";
       libraryHaskellDepends = [
         aeson
         base
@@ -456508,8 +458987,8 @@ self: {
     }:
     mkDerivation {
       pname = "monoidmap-examples";
-      version = "0.0.0.0";
-      sha256 = "1pqswi2r41r7hrrzwg4ygj67jsgmmsyyqyn7n47lnf4q331l1hv6";
+      version = "0.0.0.1";
+      sha256 = "1q7vssgknncjq1f187zvg6630r6kk12mdmq1985skm98ynl1n8wx";
       libraryHaskellDepends = [
         base
         containers
@@ -456552,8 +459031,8 @@ self: {
     }:
     mkDerivation {
       pname = "monoidmap-internal";
-      version = "0.0.0.0";
-      sha256 = "0di3b4x4f5mkmi71rpfa0zv5048z4hkzzdy1zw1qla46sn1646jg";
+      version = "0.0.0.1";
+      sha256 = "1khqa1pnxfngbay9gzjvls7hy7pddr8pd32c0z1na9mj8q8hz63c";
       libraryHaskellDepends = [
         base
         containers
@@ -456602,8 +459081,8 @@ self: {
     }:
     mkDerivation {
       pname = "monoidmap-quickcheck";
-      version = "0.0.0.2";
-      sha256 = "0sqgd61a6abwr7rdiqm25cs2kl496v8ji0rax9dw0sdc3zh6m4j2";
+      version = "0.0.0.3";
+      sha256 = "065b7rk64yg89ll546n338jny9d3y0pmp2alwf5z7z5n25nf40cq";
       libraryHaskellDepends = [
         base
         containers
@@ -460812,8 +463291,8 @@ self: {
       pname = "msgpack";
       version = "1.0.1.0";
       sha256 = "1ljb9rdhdbxqs32brrwd42c8v3z7yrl6pr4mzmid1rfqdipard77";
-      revision = "2";
-      editedCabalFile = "07m8xrwfxp0p6dgg7bz1vwsypcwi9ix84bxva462261ncyaayd9p";
+      revision = "3";
+      editedCabalFile = "10qhv3v617zq8r3b08mqb3h1h6vzmvyq2rps6kdvs8gvqb5mkiss";
       libraryHaskellDepends = [
         base
         binary
@@ -464342,8 +466821,8 @@ self: {
       pname = "multistate";
       version = "0.8.0.4";
       sha256 = "0y42c21ha0chqhrn40a4bikdbirsw7aqg4i866frpagz1ivr915q";
-      revision = "1";
-      editedCabalFile = "0m1wv2yv1isw1qkzfa2fgjx0md7irp9djcgy16739wvl8hnj1ciq";
+      revision = "2";
+      editedCabalFile = "1gdxarys4x4bws8d8smw219z7zrjbyl8k7d2fqv1ray1x52zxr3n";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -469643,8 +472122,8 @@ self: {
     }:
     mkDerivation {
       pname = "natural-arithmetic";
-      version = "0.2.2.0";
-      sha256 = "1ps6lcp0s3izphp3hx73p2v91cs1r2iz4rh1hwrmxd9pfar815ya";
+      version = "0.2.3.0";
+      sha256 = "1lf7v804lnvb63mw232qkyqrhdrbk37s6icx4wysiw8z90v6c10j";
       libraryHaskellDepends = [
         base
         unlifted
@@ -474020,8 +476499,8 @@ self: {
     }:
     mkDerivation {
       pname = "network-protocol-xmpp";
-      version = "0.5.1";
-      sha256 = "1fd8rq235lbpkdlashsqk01ymxbbh6q1hng706h5lw0v49wpvd7i";
+      version = "0.5.2";
+      sha256 = "0jm46pkhys8a2rvyss8dv1b61im56il0kkwswg521xv6mfqk1csm";
       libraryHaskellDepends = [
         base
         bytestring
@@ -480449,8 +482928,8 @@ self: {
         }:
         mkDerivation {
           pname = "notmuch";
-          version = "0.3.1.1";
-          sha256 = "18z8pbqagdyd5rqv42i6060vv40gv84dx3sf52vvrayga19k1ydw";
+          version = "0.3.2";
+          sha256 = "0yx7lkncs7xn3w3sdplwj7ghsblm9q4w97af9vw9rszhpd50b1cd";
           isLibrary = true;
           isExecutable = true;
           libraryHaskellDepends = [
@@ -480470,7 +482949,7 @@ self: {
           ];
           libraryToolDepends = [ c2hs ];
           description = "Haskell binding to Notmuch, the mail indexer";
-          license = lib.licenses.gpl3Only;
+          license = lib.licenses.gpl3Plus;
         }
       )
       {
@@ -482725,6 +485204,29 @@ self: {
     }
   ) { };
 
+  "numhask_0_13_0_0" = callPackage (
+    {
+      mkDerivation,
+      base,
+      doctest-parallel,
+      QuickCheck,
+    }:
+    mkDerivation {
+      pname = "numhask";
+      version = "0.13.0.0";
+      sha256 = "13174w30c9pmmfjc5gn9yfzvlyr6ljm0diyh0q0gysiq0wspx2ni";
+      libraryHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        doctest-parallel
+        QuickCheck
+      ];
+      description = "A numeric class hierarchy";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "numhask-array" = callPackage (
     {
       mkDerivation,
@@ -485404,6 +487906,8 @@ self: {
       pname = "ods2csv";
       version = "0.1.0.1";
       sha256 = "1a1qrknqh24hgv5v46vnxnaqcnx3n92rcwgh3b6h6k27kassx4xa";
+      revision = "1";
+      editedCabalFile = "0sb7k4sw64ld5jdsx1g522q911d4z9c92mh0vfjb0p7h4r1h71hm";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -486292,6 +488796,8 @@ self: {
       pname = "oidc-client";
       version = "0.8.0.0";
       sha256 = "0fmffnf6gg99d15nn84ih36lr7qasa1zfkb62sgb0icik8dwv83m";
+      revision = "1";
+      editedCabalFile = "1zaaldni8i7kdxpmbpd2nlva0ygycn9955yh9qvcm08cd2wvq15d";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -486540,6 +489046,75 @@ self: {
     }
   ) { };
 
+  "ollama-haskell_0_2_0_0" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      base64-bytestring,
+      bytestring,
+      containers,
+      directory,
+      filepath,
+      http-client,
+      http-client-tls,
+      http-types,
+      mtl,
+      scientific,
+      silently,
+      stm,
+      tasty,
+      tasty-hunit,
+      text,
+      time,
+    }:
+    mkDerivation {
+      pname = "ollama-haskell";
+      version = "0.2.0.0";
+      sha256 = "00vgffjzhyc060x59gxrqazzclkm3bspmvzva5kc2c2319l93wy8";
+      libraryHaskellDepends = [
+        aeson
+        base
+        base64-bytestring
+        bytestring
+        containers
+        directory
+        filepath
+        http-client
+        http-client-tls
+        http-types
+        mtl
+        stm
+        text
+        time
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        base64-bytestring
+        bytestring
+        containers
+        directory
+        filepath
+        http-client
+        http-client-tls
+        http-types
+        mtl
+        scientific
+        silently
+        stm
+        tasty
+        tasty-hunit
+        text
+        time
+      ];
+      description = "Haskell client for ollama";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   "ollama-holes-plugin" = callPackage (
     {
       mkDerivation,
@@ -489407,8 +491982,8 @@ self: {
     }:
     mkDerivation {
       pname = "opencascade-hs";
-      version = "0.5.0.1";
-      sha256 = "1a397mxry4k5hq6gwnjn1lc3q8fz5pg7ff6imr1fwyf9b6rhls9j";
+      version = "0.5.1.0";
+      sha256 = "12c77xnh0h0h2sw23q5v891iddnmsq5j1853b90wypm6p18kpnsw";
       libraryHaskellDepends = [
         base
         resourcet
@@ -489431,8 +492006,8 @@ self: {
     }:
     mkDerivation {
       pname = "opencc";
-      version = "0.1.1.0";
-      sha256 = "06jz04352bgqnfvzds75n65x352x07ffj8aan01q6m2mjs3xidfa";
+      version = "0.1.2.0";
+      sha256 = "0vl57aglagq0zpxld3hhp4sda783m5sncdxwyxyjypl433yjyzgq";
       libraryHaskellDepends = [
         base
         bytestring
@@ -490820,8 +493395,8 @@ self: {
     }:
     mkDerivation {
       pname = "opentelemetry-plugin";
-      version = "1.1.1";
-      sha256 = "1sp6bzy0is704x18522b2kmbbsw3nbfz9x69rvidmpz0x52cpwbg";
+      version = "1.1.2";
+      sha256 = "12lm7b4kjqlvc3j2i4q7xqavr0d98wazfaqyvph20afvfq90zwf8";
       libraryHaskellDepends = [
         base
         bytestring
@@ -492464,7 +495039,7 @@ self: {
     }
   ) { };
 
-  "optima_0_4_0_6" = callPackage (
+  "optima_0_4_0_7" = callPackage (
     {
       mkDerivation,
       attoparsec,
@@ -492477,8 +495052,8 @@ self: {
     }:
     mkDerivation {
       pname = "optima";
-      version = "0.4.0.6";
-      sha256 = "06wy9d3zidly70d3n9bbxfl9yx2hx03xw8k9p8vhjb0xj526vpgk";
+      version = "0.4.0.7";
+      sha256 = "0cqy4ifddmyjmp8hj5ksi7f1b2bvxlwljm6q2cjxfpp3ig6alzr6";
       libraryHaskellDepends = [
         attoparsec
         attoparsec-data
@@ -492842,6 +495417,39 @@ self: {
     }
   ) { };
 
+  "optparse-applicative_0_19_0_0" = callPackage (
+    {
+      mkDerivation,
+      base,
+      prettyprinter,
+      prettyprinter-ansi-terminal,
+      process,
+      QuickCheck,
+      text,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "optparse-applicative";
+      version = "0.19.0.0";
+      sha256 = "0waq6i6jk0zj9vb00m62khfcm9xdnz3afzs471vhqwr1v3psw5ng";
+      libraryHaskellDepends = [
+        base
+        prettyprinter
+        prettyprinter-ansi-terminal
+        process
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        base
+        QuickCheck
+      ];
+      description = "Utilities and combinators for parsing command line options";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "optparse-applicative-cmdline-util" = callPackage (
     {
       mkDerivation,
@@ -495187,6 +497795,8 @@ self: {
       pname = "os-string";
       version = "2.0.7";
       sha256 = "186b4swiga0nk05np512iw50pz9w88l3bqz47pr241997bykb71k";
+      revision = "1";
+      editedCabalFile = "0504jf7wa84z3a8gd60cx7df6232xq31wqc532jcxrxh3hl0hm6b";
       libraryHaskellDepends = [
         base
         bytestring
@@ -495745,8 +498355,8 @@ self: {
     }:
     mkDerivation {
       pname = "oughta";
-      version = "0.2.0.0";
-      sha256 = "1ls97l94jpv5mlmiqccm4z8p80vnk8z0mv2937zcl1c7bx67ra3j";
+      version = "0.3.0.0";
+      sha256 = "1153jnvscsc3i8zz0sih7vy42vlsgynw0hvjvh0zxxqcyx4cc27i";
       libraryHaskellDepends = [
         base
         bytestring
@@ -496133,6 +498743,62 @@ self: {
     }
   ) { };
 
+  "ox-arrays" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      deepseq,
+      ghc-typelits-knownnat,
+      ghc-typelits-natnormalise,
+      hedgehog,
+      hmatrix,
+      orthotope,
+      random,
+      tasty,
+      tasty-bench,
+      tasty-hedgehog,
+      template-haskell,
+      vector,
+    }:
+    mkDerivation {
+      pname = "ox-arrays";
+      version = "0.1.0.0";
+      sha256 = "0kix255p5n1dg9y3s00il3x4s1r4d3fn1v6ljm6zgy8j40lg1nzh";
+      libraryHaskellDepends = [
+        base
+        deepseq
+        ghc-typelits-knownnat
+        ghc-typelits-natnormalise
+        orthotope
+        template-haskell
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        ghc-typelits-knownnat
+        ghc-typelits-natnormalise
+        hedgehog
+        orthotope
+        random
+        tasty
+        tasty-hedgehog
+        vector
+      ];
+      benchmarkHaskellDepends = [
+        base
+        hmatrix
+        orthotope
+        tasty-bench
+        vector
+      ];
+      doHaddock = false;
+      description = "An efficient CPU-based multidimensional array (tensor) library";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   "pa-error-tree" = callPackage (
     {
       mkDerivation,
@@ -496660,6 +499326,7 @@ self: {
       extra,
       filepath,
       hspec,
+      linear-base,
       listsafe,
       mtl,
       optparse-applicative,
@@ -496671,16 +499338,16 @@ self: {
     }:
     mkDerivation {
       pname = "packed-data";
-      version = "0.1.0.3";
-      sha256 = "1h0aqcpfygj29mij5ln7zaypf4a6v37ycnlhh5shb7pvh0nfajn3";
+      version = "0.2.0.0";
+      sha256 = "07hkm3a98aadihm3zvvq299xmswf8xzdyzx06qcs7nbdqwkqx2zk";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
         bytestring
-        bytestring-strict-builder
         deepseq
         extra
+        linear-base
         mtl
         template-haskell
       ];
@@ -497745,22 +500412,47 @@ self: {
   "palindromes" = callPackage (
     {
       mkDerivation,
-      array,
       base,
-      bytestring,
-      containers,
+      conduit,
+      criterion,
+      deepseq,
+      directory,
+      filepath,
+      HUnit,
+      levenshtein,
+      QuickCheck,
+      strict,
+      vector,
     }:
     mkDerivation {
       pname = "palindromes";
-      version = "0.4";
-      sha256 = "1k0kvd8p1ivwmpmf8khwmb4vyk8z0di74xn5840zy9jhf1cwx4kn";
+      version = "1.1.0.0";
+      sha256 = "1dfq0b2f11xwbdn9hyrrr4ywzz415nb32n4yfjrqf35myaqdbfcz";
       isLibrary = true;
       isExecutable = true;
-      executableHaskellDepends = [
-        array
+      libraryHaskellDepends = [
         base
-        bytestring
-        containers
+        conduit
+        vector
+      ];
+      executableHaskellDepends = [
+        base
+        directory
+      ];
+      testHaskellDepends = [
+        base
+        HUnit
+        levenshtein
+        QuickCheck
+        vector
+      ];
+      benchmarkHaskellDepends = [
+        base
+        criterion
+        deepseq
+        directory
+        filepath
+        strict
       ];
       description = "Finding palindromes in strings";
       license = lib.licenses.bsd3;
@@ -499570,8 +502262,8 @@ self: {
     }:
     mkDerivation {
       pname = "pandoc-lua-marshal";
-      version = "0.3.0";
-      sha256 = "0d8vfbmgd107b9lq9dq0b39v3dhznqh11j0ci0i8hsb7g3dkks5g";
+      version = "0.3.1";
+      sha256 = "0869amr9w5s90dha694vy6rwfni7p1wp9dyjyyk2jvh8h22gcpr0";
       libraryHaskellDepends = [
         aeson
         base
@@ -499800,6 +502492,8 @@ self: {
       pname = "pandoc-plot";
       version = "1.9.1";
       sha256 = "0d6lknjnlzg4a7sx311kpdi94yq7fp19lhvwbsf7rvc3ykx0hjm3";
+      revision = "1";
+      editedCabalFile = "0ykgv0cxiwvcx0pkkmx841cdwv2sas033mq928mg6dlcbvw32nx1";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -500210,8 +502904,8 @@ self: {
       pname = "pandoc-types";
       version = "1.23.1";
       sha256 = "1hd18l1c5yh7x24gsligkbraadq12hn7mim16xyjnicdsa1s03xd";
-      revision = "2";
-      editedCabalFile = "1whymq4w5z08l5ng829kn8aslczda6svi6c6q72cnv200mlq7d1c";
+      revision = "3";
+      editedCabalFile = "0w2n4vzxs3jasrivaq49clxdlccnfv2gh4mkp8s7krxa1arambrz";
       libraryHaskellDepends = [
         aeson
         base
@@ -503611,8 +506305,8 @@ self: {
       pname = "parser-combinators-tests";
       version = "1.3.0";
       sha256 = "0sw6ws7za93y3lbmxp6jp1k17zi3wdg7698ab133kcw82f6mzba2";
-      revision = "1";
-      editedCabalFile = "0h6lwj0mdlirlwcadjvyblvgqg6yksw2bnp77qkjxm2kk3rw56hn";
+      revision = "2";
+      editedCabalFile = "1b038wk6b1kria8627qb0nfrz4v67j2yq5rx01m3vigfxf6h4422";
       isLibrary = false;
       isExecutable = false;
       testHaskellDepends = [
@@ -506146,6 +508840,7 @@ self: {
       exceptions,
       hspec,
       http-client,
+      http-client-tls,
       http-types,
       network-uri,
       text,
@@ -506154,8 +508849,8 @@ self: {
     }:
     mkDerivation {
       pname = "patrol";
-      version = "1.0.0.11";
-      sha256 = "0adci15r7mm0ddbg4zb10kngyl0c7ipaws7drd7idmzrb0gb82kd";
+      version = "1.0.1.0";
+      sha256 = "1yk90shi4idxdzf82mvxpsbgslx3psrwpxgwhnqpcl0kj4sdblf1";
       libraryHaskellDepends = [
         aeson
         base
@@ -506164,6 +508859,63 @@ self: {
         containers
         exceptions
         http-client
+        http-client-tls
+        http-types
+        network-uri
+        text
+        time
+        uuid
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        case-insensitive
+        containers
+        hspec
+        http-client
+        http-types
+        network-uri
+        text
+        time
+        uuid
+      ];
+      description = "Sentry SDK";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
+  "patrol_1_1_0_0" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      case-insensitive,
+      containers,
+      exceptions,
+      hspec,
+      http-client,
+      http-client-tls,
+      http-types,
+      network-uri,
+      text,
+      time,
+      uuid,
+    }:
+    mkDerivation {
+      pname = "patrol";
+      version = "1.1.0.0";
+      sha256 = "0ijfflc9gv3ks5y3irng0mpsbcfwx41v59xgm8840310sz6kj4p1";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        case-insensitive
+        containers
+        exceptions
+        http-client
+        http-client-tls
         http-types
         network-uri
         text
@@ -506187,6 +508939,7 @@ self: {
       ];
       description = "Sentry SDK";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -508032,6 +510785,28 @@ self: {
     }
   ) { };
 
+  "pear" = callPackage (
+    {
+      mkDerivation,
+      base,
+      doctest,
+      markdown-unlit,
+    }:
+    mkDerivation {
+      pname = "pear";
+      version = "1.0.0.1";
+      sha256 = "1svbmj1v7y3hq9f43x4szvs6h83zz085y1h5lncci4i4yx7qfrhj";
+      libraryHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        doctest
+      ];
+      testToolDepends = [ markdown-unlit ];
+      description = "Pear Trees: An indexed type using type-level binary numbers";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   "pec" = callPackage (
     {
       mkDerivation,
@@ -510544,46 +513319,6 @@ self: {
   ) { };
 
   "persistent-documentation" = callPackage (
-    {
-      mkDerivation,
-      base,
-      containers,
-      hspec,
-      hspec-discover,
-      mtl,
-      persistent,
-      persistent-template,
-      template-haskell,
-      text,
-    }:
-    mkDerivation {
-      pname = "persistent-documentation";
-      version = "0.1.0.5";
-      sha256 = "032mfnsz5kpy1022gc2w9y0g4fjhqwq07zb2r8arjdhzzhbirwk2";
-      libraryHaskellDepends = [
-        base
-        containers
-        mtl
-        persistent
-        template-haskell
-        text
-      ];
-      testHaskellDepends = [
-        base
-        containers
-        hspec
-        hspec-discover
-        persistent
-        persistent-template
-        text
-      ];
-      testToolDepends = [ hspec-discover ];
-      description = "Documentation DSL for persistent entities";
-      license = lib.licenses.asl20;
-    }
-  ) { };
-
-  "persistent-documentation_0_1_0_6" = callPackage (
     {
       mkDerivation,
       base,
@@ -510620,7 +513355,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Documentation DSL for persistent entities";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -511719,6 +514453,105 @@ self: {
     }
   ) { };
 
+  "persistent-postgresql_2_13_7_0" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      attoparsec,
+      base,
+      blaze-builder,
+      bytestring,
+      conduit,
+      containers,
+      fast-logger,
+      hspec,
+      hspec-expectations,
+      hspec-expectations-lifted,
+      http-api-data,
+      HUnit,
+      monad-logger,
+      mtl,
+      path-pieces,
+      persistent,
+      persistent-qq,
+      persistent-test,
+      postgresql-libpq,
+      postgresql-simple,
+      QuickCheck,
+      quickcheck-instances,
+      resource-pool,
+      resourcet,
+      string-conversions,
+      text,
+      time,
+      transformers,
+      unliftio,
+      unliftio-core,
+      unordered-containers,
+      vault,
+      vector,
+    }:
+    mkDerivation {
+      pname = "persistent-postgresql";
+      version = "2.13.7.0";
+      sha256 = "1774fh28jls2r692164ln66ipa6gl3sqj8pb04nf3sl1m498qjd7";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        attoparsec
+        base
+        blaze-builder
+        bytestring
+        conduit
+        containers
+        monad-logger
+        mtl
+        persistent
+        postgresql-libpq
+        postgresql-simple
+        resource-pool
+        resourcet
+        string-conversions
+        text
+        time
+        transformers
+        unliftio-core
+        vault
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        fast-logger
+        hspec
+        hspec-expectations
+        hspec-expectations-lifted
+        http-api-data
+        HUnit
+        monad-logger
+        path-pieces
+        persistent
+        persistent-qq
+        persistent-test
+        QuickCheck
+        quickcheck-instances
+        resourcet
+        text
+        time
+        transformers
+        unliftio
+        unliftio-core
+        unordered-containers
+        vector
+      ];
+      description = "Backend for the persistent library using postgresql";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "persistent-postgresql-streaming" = callPackage (
     {
       mkDerivation,
@@ -512365,7 +515198,7 @@ self: {
     }
   ) { };
 
-  "persistent-test_2_13_1_3" = callPackage (
+  "persistent-test" = callPackage (
     {
       mkDerivation,
       aeson,
@@ -512431,11 +515264,10 @@ self: {
       ];
       description = "Tests for Persistent";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
-  "persistent-test" = callPackage (
+  "persistent-test_2_13_1_4" = callPackage (
     {
       mkDerivation,
       aeson,
@@ -512470,6 +515302,8 @@ self: {
       pname = "persistent-test";
       version = "2.13.1.4";
       sha256 = "1k2wq6ag4jvqr1krdjfx84mmx0mg09hy38w569zxwdrd03ffcjpy";
+      revision = "1";
+      editedCabalFile = "1kzqhvs4h8xpx2x153gh64rc006mvjxv6fzsyxvnfknmqcx8xn19";
       libraryHaskellDepends = [
         aeson
         base
@@ -512501,6 +515335,7 @@ self: {
       ];
       description = "Tests for Persistent";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -512528,8 +515363,8 @@ self: {
       pname = "persistent-typed-db";
       version = "0.1.0.7";
       sha256 = "0fkshbf35mnlx4aqkij0lzzmpfxw34zkwgq8s2lm3rrrqw7gw59l";
-      revision = "1";
-      editedCabalFile = "19l1nfd82l8lsjsi00virsapwlnany5cdwgzw9hmm9bkwxfsk9v8";
+      revision = "2";
+      editedCabalFile = "0m5ajvfcj10k1mnlwdyd1n9s3py70g4sinzh0gkvch9q1bl6qiwz";
       libraryHaskellDepends = [
         aeson
         base
@@ -513988,6 +516823,7 @@ self: {
       bytestring,
       containers,
       directory,
+      file-embed,
       filepath,
       hspec,
       hspec-core,
@@ -513995,16 +516831,21 @@ self: {
       megaparsec,
       optparse-applicative,
       prettyprinter,
+      process,
+      random,
       scientific,
       silently,
       text,
+      time,
       utf8-string,
+      vector,
+      xml-conduit,
       yaml,
     }:
     mkDerivation {
       pname = "phino";
-      version = "0.0.0.1";
-      sha256 = "1sl4iqrcmmjn2gc294rz4yfj5k0hd7ngl9ax57k22h2qac90rrkc";
+      version = "0.0.0.14";
+      sha256 = "1nl2n0y636bdppxc29p4zyxlyra2zjiy3a1s6xw2yin64q3gqrim";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -514014,13 +516855,18 @@ self: {
         bytestring
         containers
         directory
+        file-embed
         filepath
         megaparsec
         optparse-applicative
         prettyprinter
+        random
         scientific
         text
+        time
         utf8-string
+        vector
+        xml-conduit
         yaml
       ];
       executableHaskellDepends = [ base ];
@@ -514035,8 +516881,10 @@ self: {
         megaparsec
         optparse-applicative
         prettyprinter
+        process
         silently
         text
+        xml-conduit
         yaml
       ];
       testToolDepends = [ hspec-discover ];
@@ -519443,8 +522291,8 @@ self: {
       pname = "pipes-safe";
       version = "2.3.5";
       sha256 = "13npagy597g6zfr2f3vj4a98h2ssg2ps7lmdzrgdsvm8m28x3cph";
-      revision = "3";
-      editedCabalFile = "1wic8km3c17g2xrmxd4qj5qmppb76k7srxrgj8jg1vs6g2l7v6cs";
+      revision = "4";
+      editedCabalFile = "1x0p9fiilz21ck5n52lg2p17qi7n0mkk566qzzwd4jnvhbcsb8jf";
       libraryHaskellDepends = [
         base
         containers
@@ -522414,6 +525262,723 @@ self: {
     }
   ) { };
 
+  "pms-application-service" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      async-pool,
+      base,
+      data-default,
+      fast-logger,
+      hspec,
+      hspec-discover,
+      lens,
+      monad-logger,
+      mtl,
+      pms-domain-model,
+      safe-exceptions,
+      stm,
+      text,
+      unix,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "pms-application-service";
+      version = "0.0.4.0";
+      sha256 = "0a91pa5rs2vplixky8bap4gl8i8mm3j7454w7s4pihyf4h7wfhpl";
+      libraryHaskellDepends = [
+        aeson
+        async
+        async-pool
+        base
+        data-default
+        fast-logger
+        lens
+        monad-logger
+        mtl
+        pms-domain-model
+        safe-exceptions
+        text
+        yaml
+      ];
+      testHaskellDepends = [
+        async
+        base
+        data-default
+        hspec
+        hspec-discover
+        lens
+        monad-logger
+        pms-domain-model
+        stm
+        unix
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "pms-application-service";
+      license = lib.licenses.asl20;
+    }
+  ) { };
+
+  "pms-domain-model" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      data-default,
+      fast-logger,
+      filepath,
+      hspec,
+      hspec-discover,
+      lens,
+      monad-logger,
+      mtl,
+      safe-exceptions,
+      stm,
+      strip-ansi-escape,
+      text,
+      transformers,
+      unix,
+    }:
+    mkDerivation {
+      pname = "pms-domain-model";
+      version = "0.0.5.0";
+      sha256 = "0z0a04j6x4jrq6xpfdd6jnbq7q7p71y51gar6i6g0apfliiydq9w";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        data-default
+        fast-logger
+        filepath
+        lens
+        monad-logger
+        mtl
+        safe-exceptions
+        stm
+        strip-ansi-escape
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        aeson
+        async
+        base
+        data-default
+        hspec
+        hspec-discover
+        lens
+        monad-logger
+        stm
+        unix
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "pms-domain-model";
+      license = lib.licenses.asl20;
+    }
+  ) { };
+
+  "pms-domain-service" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      conduit,
+      data-default,
+      directory,
+      fast-logger,
+      filepath,
+      hspec,
+      hspec-discover,
+      lens,
+      monad-logger,
+      mtl,
+      mustache,
+      network-uri,
+      pms-domain-model,
+      safe-exceptions,
+      stm,
+      template-haskell,
+      text,
+      transformers,
+      unix,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "pms-domain-service";
+      version = "0.0.4.0";
+      sha256 = "1akacdrh2ngyvik46sjhag8kp9hyyr7rv9grswx7i3ngy6pk64yn";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        conduit
+        data-default
+        directory
+        fast-logger
+        filepath
+        lens
+        monad-logger
+        mtl
+        mustache
+        network-uri
+        pms-domain-model
+        safe-exceptions
+        stm
+        template-haskell
+        text
+        transformers
+        unordered-containers
+      ];
+      testHaskellDepends = [
+        async
+        base
+        data-default
+        hspec
+        hspec-discover
+        lens
+        monad-logger
+        pms-domain-model
+        stm
+        unix
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "pms-domain-service";
+      license = lib.licenses.asl20;
+    }
+  ) { };
+
+  "pms-infra-cmdrun" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      conduit,
+      data-default,
+      directory,
+      fast-logger,
+      filepath,
+      hspec,
+      hspec-discover,
+      lens,
+      monad-logger,
+      mtl,
+      pms-domain-model,
+      process,
+      safe-exceptions,
+      stm,
+      text,
+      transformers,
+      unix,
+    }:
+    mkDerivation {
+      pname = "pms-infra-cmdrun";
+      version = "0.0.2.0";
+      sha256 = "0c4jhci5im04ks49if7ncbqipbln2ixw2f262qw64ir5a5hdygzy";
+      libraryHaskellDepends = [
+        aeson
+        async
+        base
+        bytestring
+        conduit
+        data-default
+        directory
+        fast-logger
+        filepath
+        lens
+        monad-logger
+        mtl
+        pms-domain-model
+        process
+        safe-exceptions
+        stm
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        async
+        base
+        data-default
+        hspec
+        hspec-discover
+        lens
+        monad-logger
+        pms-domain-model
+        stm
+        unix
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "pms-infra-cmdrun";
+      license = lib.licenses.asl20;
+    }
+  ) { };
+
+  "pms-infra-procspawn" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      conduit,
+      data-default,
+      directory,
+      fast-logger,
+      filepath,
+      hspec,
+      hspec-discover,
+      lens,
+      monad-logger,
+      mtl,
+      pms-domain-model,
+      process,
+      safe-exceptions,
+      stm,
+      text,
+      transformers,
+      unix,
+    }:
+    mkDerivation {
+      pname = "pms-infra-procspawn";
+      version = "0.0.1.0";
+      sha256 = "1wg0508h2svl0pk9yrwrnmssrqnm2vnlws9w9nm5ydqlqibdr282";
+      libraryHaskellDepends = [
+        aeson
+        async
+        base
+        bytestring
+        conduit
+        data-default
+        directory
+        fast-logger
+        filepath
+        lens
+        monad-logger
+        mtl
+        pms-domain-model
+        process
+        safe-exceptions
+        stm
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        async
+        base
+        data-default
+        hspec
+        hspec-discover
+        lens
+        monad-logger
+        pms-domain-model
+        stm
+        unix
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "pms-infra-procspawn";
+      license = lib.licenses.asl20;
+    }
+  ) { };
+
+  "pms-infra-socket" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      base16-bytestring,
+      bytestring,
+      conduit,
+      data-default,
+      directory,
+      fast-logger,
+      filepath,
+      hspec,
+      hspec-discover,
+      lens,
+      monad-logger,
+      mtl,
+      network,
+      pms-domain-model,
+      process,
+      safe-exceptions,
+      stm,
+      text,
+      transformers,
+      unix,
+    }:
+    mkDerivation {
+      pname = "pms-infra-socket";
+      version = "0.0.1.0";
+      sha256 = "01iz8ws1wc04k52djy37wrlyrr8g33n7zvd03md06wjycahhrri5";
+      libraryHaskellDepends = [
+        aeson
+        async
+        base
+        base16-bytestring
+        bytestring
+        conduit
+        data-default
+        directory
+        fast-logger
+        filepath
+        lens
+        monad-logger
+        mtl
+        network
+        pms-domain-model
+        process
+        safe-exceptions
+        stm
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        async
+        base
+        data-default
+        hspec
+        hspec-discover
+        lens
+        monad-logger
+        pms-domain-model
+        stm
+        unix
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "pms-infra-socket";
+      license = lib.licenses.asl20;
+    }
+  ) { };
+
+  "pms-infra-watch" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      conduit,
+      data-default,
+      directory,
+      fast-logger,
+      filepath,
+      fsnotify,
+      hspec,
+      hspec-discover,
+      lens,
+      monad-logger,
+      mtl,
+      pms-domain-model,
+      process,
+      safe-exceptions,
+      stm,
+      text,
+      transformers,
+      unix,
+    }:
+    mkDerivation {
+      pname = "pms-infra-watch";
+      version = "0.0.3.0";
+      sha256 = "0lwiydxf9p7pvri6s3p0wg0lya9imp6rpggb2mrpb49nqknnpxpx";
+      libraryHaskellDepends = [
+        aeson
+        async
+        base
+        bytestring
+        conduit
+        data-default
+        directory
+        fast-logger
+        filepath
+        fsnotify
+        lens
+        monad-logger
+        mtl
+        pms-domain-model
+        process
+        safe-exceptions
+        stm
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        async
+        base
+        data-default
+        hspec
+        hspec-discover
+        lens
+        monad-logger
+        pms-domain-model
+        stm
+        unix
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "pms-infra-watch";
+      license = lib.licenses.asl20;
+    }
+  ) { };
+
+  "pms-infrastructure" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      conduit,
+      data-default,
+      directory,
+      fast-logger,
+      filepath,
+      hie-bios,
+      hspec,
+      hspec-discover,
+      lens,
+      monad-logger,
+      mtl,
+      pms-domain-model,
+      posix-pty,
+      process,
+      safe-exceptions,
+      stm,
+      strip-ansi-escape,
+      text,
+      transformers,
+      unix,
+    }:
+    mkDerivation {
+      pname = "pms-infrastructure";
+      version = "0.0.4.0";
+      sha256 = "1vawlgs6i1rpw2266zbzxwykjsf5p61w88vi2lyj69dgl3dd0kiz";
+      libraryHaskellDepends = [
+        aeson
+        async
+        base
+        bytestring
+        conduit
+        data-default
+        directory
+        fast-logger
+        filepath
+        hie-bios
+        lens
+        monad-logger
+        mtl
+        pms-domain-model
+        posix-pty
+        process
+        safe-exceptions
+        stm
+        strip-ansi-escape
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        async
+        base
+        data-default
+        hspec
+        hspec-discover
+        lens
+        monad-logger
+        pms-domain-model
+        stm
+        unix
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "pms-infrastructure";
+      license = lib.licenses.asl20;
+    }
+  ) { };
+
+  "pms-ui-notification" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      conduit,
+      data-default,
+      fast-logger,
+      hspec,
+      hspec-discover,
+      lens,
+      monad-logger,
+      mtl,
+      pms-domain-model,
+      safe-exceptions,
+      stm,
+      text,
+      transformers,
+      unix,
+    }:
+    mkDerivation {
+      pname = "pms-ui-notification";
+      version = "0.0.3.0";
+      sha256 = "1fq1kasqmghbic59v815032spcl9wahm9wqjyjmg93di92xz8mm3";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        conduit
+        data-default
+        fast-logger
+        lens
+        monad-logger
+        mtl
+        pms-domain-model
+        safe-exceptions
+        stm
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        async
+        base
+        data-default
+        hspec
+        hspec-discover
+        lens
+        monad-logger
+        pms-domain-model
+        stm
+        unix
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "pms-ui-notification";
+      license = lib.licenses.asl20;
+    }
+  ) { };
+
+  "pms-ui-request" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      conduit,
+      data-default,
+      fast-logger,
+      hspec,
+      hspec-discover,
+      lens,
+      monad-logger,
+      mtl,
+      pms-domain-model,
+      safe-exceptions,
+      stm,
+      text,
+      transformers,
+      unix,
+    }:
+    mkDerivation {
+      pname = "pms-ui-request";
+      version = "0.0.4.0";
+      sha256 = "1yg42dy0jrv0xhz657kys41i0prr2xn417ji2p6wahgnlfkiy6am";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        conduit
+        data-default
+        fast-logger
+        lens
+        monad-logger
+        mtl
+        pms-domain-model
+        safe-exceptions
+        stm
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        async
+        base
+        data-default
+        hspec
+        hspec-discover
+        lens
+        monad-logger
+        pms-domain-model
+        stm
+        unix
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "pms-ui-request";
+      license = lib.licenses.asl20;
+    }
+  ) { };
+
+  "pms-ui-response" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      conduit,
+      data-default,
+      fast-logger,
+      hspec,
+      hspec-discover,
+      lens,
+      monad-logger,
+      mtl,
+      pms-domain-model,
+      safe-exceptions,
+      stm,
+      text,
+      transformers,
+      unix,
+    }:
+    mkDerivation {
+      pname = "pms-ui-response";
+      version = "0.0.4.0";
+      sha256 = "0045ddj3v34aycvnh72fvy9159iv4vad1jghd1ndslhphav1d91b";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        conduit
+        data-default
+        fast-logger
+        lens
+        monad-logger
+        mtl
+        pms-domain-model
+        safe-exceptions
+        stm
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        async
+        base
+        data-default
+        hspec
+        hspec-discover
+        lens
+        monad-logger
+        pms-domain-model
+        stm
+        unix
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "pms-ui-response";
+      license = lib.licenses.asl20;
+    }
+  ) { };
+
   "png-file" = callPackage (
     {
       mkDerivation,
@@ -526621,27 +530186,27 @@ self: {
   "poolboy" = callPackage (
     {
       mkDerivation,
-      async,
       base,
       hspec,
       hspec-core,
-      stm,
+      timeit,
       unliftio,
+      unordered-containers,
     }:
     mkDerivation {
       pname = "poolboy";
-      version = "0.2.2.0";
-      sha256 = "0d0lxqyf73w7nvgydbgv692zzc0zg2hk8sdd3lb6xyzdqkkd0vf3";
+      version = "0.4.0.1";
+      sha256 = "0ifdp2p2c257k52c9prm072c1gmfx55a40gaanba083viq6cxzal";
       libraryHaskellDepends = [
-        async
         base
-        stm
         unliftio
+        unordered-containers
       ];
       testHaskellDepends = [
         base
         hspec
         hspec-core
+        timeit
       ];
       description = "Simple work queue for bounded concurrency";
       license = lib.licenses.isc;
@@ -527993,10 +531558,8 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "positive-integer";
-      version = "0.1.0.0";
-      sha256 = "17vqxdmqbsp6366dipq5xdfb3aq5mrshlvkw8zv30byl7p6iaz51";
-      revision = "1";
-      editedCabalFile = "101bbp5zv7w5ldr7j2nxpmm21mpnpzz4knrcv5inqfs0k69w1z7c";
+      version = "0.1.2.0";
+      sha256 = "0m0l02v3ybsilkcvyc82ma57bbha4rhncsf5574b0m3zmxq17kaq";
       libraryHaskellDepends = [ base ];
       description = "Type of positive integers";
       license = lib.licenses.mit;
@@ -531718,6 +535281,7 @@ self: {
       base,
       bytestring,
       criterion,
+      deepseq,
       ppad-base16,
       ppad-chacha,
       ppad-poly1305,
@@ -531728,8 +535292,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-aead";
-      version = "0.1.0";
-      sha256 = "1vvz39m852yp3j0mdm1mx3i5rgl78z0limlgm70al34gv1gxv3mh";
+      version = "0.2.0";
+      sha256 = "1s14bplwjfavg50xfyy65r2f8lg4man31jc83m3l32k6h4jvg983";
       libraryHaskellDepends = [
         base
         bytestring
@@ -531750,6 +535314,7 @@ self: {
         base
         bytestring
         criterion
+        deepseq
         ppad-base16
       ];
       description = "A pure AEAD-ChaCha20-Poly1305 construction";
@@ -531817,8 +535382,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-base58";
-      version = "0.2.0";
-      sha256 = "1bn0fv1vmsc698lpl8x1brgi00bl9rcnh7r8v81rcxnjqf9xfdcb";
+      version = "0.2.1";
+      sha256 = "0s94985p1d1zh0ip404pgi12bj97naydr525i45aac64w8iis03y";
       libraryHaskellDepends = [
         base
         bytestring
@@ -531858,8 +535423,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-bech32";
-      version = "0.2.2";
-      sha256 = "1bp4p6adfi7awy3k2fbi3akjqr5gyiijilgxg5r0hzpnzmzpxvzr";
+      version = "0.2.3";
+      sha256 = "0g8fk0bwx88zr4k4mijd8zn5jhi6gcsn6hvdp8jxb3r4a97a4yyv";
       libraryHaskellDepends = [
         base
         bytestring
@@ -531902,8 +535467,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-bip32";
-      version = "0.1.1";
-      sha256 = "0q76ffxzrbr0fiv18ghgfjrv0y61nvsb6971pl49377c2835qa1l";
+      version = "0.2.0";
+      sha256 = "1h7i6km0ai3wvyrhfhl31gpaq21vcggrgk0gvr0cjhkmmscd3d5w";
       libraryHaskellDepends = [
         base
         bytestring
@@ -531959,8 +535524,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-bip39";
-      version = "0.2.1";
-      sha256 = "1aqcjq1xika89qhxf54z25shg4kz8pmr6k70k48w7lyk85h3l97b";
+      version = "0.3.0";
+      sha256 = "18bshwr4hpnxk2v73kqxcsjbjffpss41whmd3scm20wq3al2xvva";
       libraryHaskellDepends = [
         base
         bytestring
@@ -532003,6 +535568,7 @@ self: {
       base,
       bytestring,
       criterion,
+      deepseq,
       ppad-base16,
       primitive,
       tasty,
@@ -532010,8 +535576,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-chacha";
-      version = "0.1.0";
-      sha256 = "15idv1nrl2rl5rmx42dw1zwpdr7wvrr08j0k4vwy0s12cc40aka6";
+      version = "0.2.0";
+      sha256 = "1zqrg1af6rlflq74lamxd9f0p8sfhvmhjv3ii89mkckhizr8fqrc";
       libraryHaskellDepends = [
         base
         bytestring
@@ -532029,6 +535595,7 @@ self: {
         base
         bytestring
         criterion
+        deepseq
         ppad-base16
       ];
       description = "A pure ChaCha20 stream cipher";
@@ -532052,8 +535619,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-hkdf";
-      version = "0.2.1";
-      sha256 = "1y5rmkaq8wgibsx6bvppbaqp13fb9al5yn4ni9x2ll685545m398";
+      version = "0.3.0";
+      sha256 = "194nwcjpdals55wf5khvl393d0q4fzdmx9424s9j2n0z70ry29pw";
       libraryHaskellDepends = [
         base
         bytestring
@@ -532144,8 +535711,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-pbkdf";
-      version = "0.1.1";
-      sha256 = "05g3k4gyjkpn9k5fhz37lq10qgzlwayf4xiy5m4kjijv7l1wcxqp";
+      version = "0.2.0";
+      sha256 = "1zir2zm4bgimrgiv94dzqvn794dhwywl63b4im9sg9c61gh91r9m";
       libraryHaskellDepends = [
         base
         bytestring
@@ -532187,8 +535754,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-poly1305";
-      version = "0.2.0";
-      sha256 = "1vv3ln9lzszx3h0dji4fqznh86qh40sl34msljddgyj3h709lzk6";
+      version = "0.3.0";
+      sha256 = "06db9qvi688nyhw8fqk8vqxhl6sddfkrg5ap15xd2lf75rl1v7kw";
       libraryHaskellDepends = [
         base
         bytestring
@@ -532321,8 +535888,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-secp256k1";
-      version = "0.3.0";
-      sha256 = "1k2glxrrpgdngzy0j5mgbkh9a0a5b0cp5c1lmvaiwipik50n9rb3";
+      version = "0.4.0";
+      sha256 = "0wrmbz0s19g7b6qardn7isgmkrl5svw5nf360ksvhwagicv51g7l";
       libraryHaskellDepends = [
         base
         bytestring
@@ -537157,8 +540724,8 @@ self: {
       pname = "probability-polynomial";
       version = "1.0.0.1";
       sha256 = "1f06x4d2cbd9j7rxgwdpxn8ff8w32xag96qk86mwggnzlw091gib";
-      revision = "1";
-      editedCabalFile = "10avhbz8k3yg1hzjp5qbkhv3mmmhrvii5mpjcxqcw9pq635x0kc8";
+      revision = "2";
+      editedCabalFile = "039np4z6lzz81n90k1sqbr7n8bxfmh8v4xvbppzzpgk6kp5fxpfm";
       libraryHaskellDepends = [
         base
         containers
@@ -538566,10 +542133,8 @@ self: {
     }:
     mkDerivation {
       pname = "profunctors";
-      version = "5.6.2";
-      sha256 = "0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5";
-      revision = "3";
-      editedCabalFile = "0y2g5dhmvkbd8zsckpgxd1g4hr3g56g0iqi6crjjc8wqd12bly71";
+      version = "5.6.3";
+      sha256 = "1wqf3isrrgmqxz5h42phsa7lawl6442r1da89hg82bld6qkz9imr";
       libraryHaskellDepends = [
         base
         base-orphans
@@ -539848,6 +543413,36 @@ self: {
     }
   ) { };
 
+  "prometheus-wai" = callPackage (
+    {
+      mkDerivation,
+      autoexporter,
+      base,
+      bytestring,
+      containers,
+      http-types,
+      prometheus,
+      text,
+      wai,
+    }:
+    mkDerivation {
+      pname = "prometheus-wai";
+      version = "0.0.0.0";
+      sha256 = "027i17zyxk3wgzw7161h57rnmgb5iqqnlnlcg129q28dw005wg9h";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        http-types
+        prometheus
+        text
+        wai
+      ];
+      libraryToolDepends = [ autoexporter ];
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   "prometheus-wai-middleware" = callPackage (
     {
       mkDerivation,
@@ -543127,6 +546722,52 @@ self: {
     }
   ) { };
 
+  "pty-mcp-server" = callPackage (
+    {
+      mkDerivation,
+      base,
+      optparse-applicative,
+      pms-application-service,
+      pms-domain-model,
+      pms-domain-service,
+      pms-infra-cmdrun,
+      pms-infra-procspawn,
+      pms-infra-socket,
+      pms-infra-watch,
+      pms-infrastructure,
+      pms-ui-notification,
+      pms-ui-request,
+      pms-ui-response,
+      safe-exceptions,
+    }:
+    mkDerivation {
+      pname = "pty-mcp-server";
+      version = "0.0.5.0";
+      sha256 = "0vra3p8cfzijkz3m5aw3m97vf3awqfc5ga72ks7hmk4fbf7hiwkq";
+      isLibrary = false;
+      isExecutable = true;
+      executableHaskellDepends = [
+        base
+        optparse-applicative
+        pms-application-service
+        pms-domain-model
+        pms-domain-service
+        pms-infra-cmdrun
+        pms-infra-procspawn
+        pms-infra-socket
+        pms-infra-watch
+        pms-infrastructure
+        pms-ui-notification
+        pms-ui-request
+        pms-ui-response
+        safe-exceptions
+      ];
+      description = "pty-mcp-server";
+      license = lib.licenses.asl20;
+      mainProgram = "pty-mcp-server";
+    }
+  ) { };
+
   "pub" = callPackage (
     {
       mkDerivation,
@@ -545391,8 +549032,8 @@ self: {
     }:
     mkDerivation {
       pname = "push-notify-apn";
-      version = "0.4.0.3";
-      sha256 = "024xanv7wcpmbd2mv4v8gw281gsnx5z15a39zh0v07bgiq7q04wb";
+      version = "0.5.0.0";
+      sha256 = "128k7awxxs07lymqln224lnxvcqwcc263jzpsbsadzp6zpwpg641";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -546719,11 +550360,11 @@ self: {
       bytestring,
       containers,
       cryptonite,
+      extra,
       hspec,
       optparse-applicative,
       process,
       simple-sql-parser,
-      split,
       sqlite-simple,
       syb,
       text,
@@ -546731,38 +550372,32 @@ self: {
     }:
     mkDerivation {
       pname = "qhs";
-      version = "0.3.3";
-      sha256 = "1wm11y9gnfrjrq5i5nl74vkg242mr08223kw6cracnmr4n6xqm0q";
+      version = "0.4.0";
+      sha256 = "10b996ymvsmcmjyiaw567idr52mc017cgppma9va8yw94xqgdx7s";
       isLibrary = false;
       isExecutable = true;
-      executableHaskellDepends = [
+      libraryHaskellDepends = [
         base
         bytestring
         containers
         cryptonite
+        extra
         optparse-applicative
         simple-sql-parser
-        split
         sqlite-simple
         syb
         text
         zlib
       ];
+      executableHaskellDepends = [ base ];
       testHaskellDepends = [
         base
-        bytestring
         containers
-        cryptonite
+        extra
         hspec
-        optparse-applicative
         process
-        simple-sql-parser
-        split
-        sqlite-simple
-        syb
-        text
-        zlib
       ];
+      doHaddock = false;
       description = "Command line tool qhs, SQL queries on CSV and TSV files";
       license = lib.licenses.mit;
       hydraPlatforms = lib.platforms.none;
@@ -547857,6 +551492,8 @@ self: {
       pname = "quantification";
       version = "0.8";
       sha256 = "1dw47hy0pvar4mkdp6xjz8ywpic2zs3q0xah9zlbnfpibhjjc1a9";
+      revision = "1";
+      editedCabalFile = "1abpn4sz7g9ih4c3iclpqnwng15dwa7553pxyvwvgy19x6sfgck2";
       libraryHaskellDepends = [
         base
         binary
@@ -548700,6 +552337,7 @@ self: {
       crypton,
       crypton-x509,
       crypton-x509-system,
+      crypton-x509-validation,
       fast-logger,
       filepath,
       hspec,
@@ -548718,8 +552356,8 @@ self: {
     }:
     mkDerivation {
       pname = "quic";
-      version = "0.2.14";
-      sha256 = "1f486d4mqc18pfx5krwxv9mh1zkmyjbjddkx4yixjf2yfhq6a855";
+      version = "0.2.17";
+      sha256 = "15fk5786rkryjixqiqk9y7zh5wazwakp6gkk5jr4ryckjdgjyyjj";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -548733,6 +552371,7 @@ self: {
         crypton
         crypton-x509
         crypton-x509-system
+        crypton-x509-validation
         fast-logger
         filepath
         iproute
@@ -548789,8 +552428,10 @@ self: {
   "quick-process" = callPackage (
     {
       mkDerivation,
+      array,
       attoparsec,
       base,
+      base-orphans,
       bytestring,
       casing,
       conduit,
@@ -548802,16 +552443,20 @@ self: {
       either,
       exceptions,
       filepath,
+      generic-data,
+      generic-deriving,
       generic-lens,
       generic-random,
+      ghc-prim,
       hashable,
-      HList,
       lens,
       mmorph,
       monad-control,
+      monad-time,
       mtl,
-      pretty,
+      pretty-simple,
       process,
+      profunctors,
       QuickCheck,
       quickcheck-instances,
       regex-compat,
@@ -548823,6 +552468,7 @@ self: {
       sbv,
       semigroups,
       streaming-commons,
+      tagged,
       tasty,
       tasty-discover,
       tasty-hunit,
@@ -548842,14 +552488,17 @@ self: {
       unix-compat,
       unliftio,
       unliftio-core,
+      wl-pprint-text,
     }:
     mkDerivation {
       pname = "quick-process";
-      version = "0.0.1";
-      sha256 = "1dgv63w8qlb35xjsyn0716xsmb9jimdwly0c7704pmlfnw5sp38s";
+      version = "0.0.3";
+      sha256 = "180zxzsg2xh24nw7gdzmk134hx7vl61hfc3dsvrdr0rwkp1xmngi";
       libraryHaskellDepends = [
+        array
         attoparsec
         base
+        base-orphans
         bytestring
         casing
         conduit
@@ -548861,16 +552510,20 @@ self: {
         either
         exceptions
         filepath
+        generic-data
+        generic-deriving
         generic-lens
         generic-random
+        ghc-prim
         hashable
-        HList
         lens
         mmorph
         monad-control
+        monad-time
         mtl
-        pretty
+        pretty-simple
         process
+        profunctors
         QuickCheck
         regex-compat
         regex-posix
@@ -548881,6 +552534,7 @@ self: {
         sbv
         semigroups
         streaming-commons
+        tagged
         template-haskell
         temporary
         text
@@ -548894,13 +552548,13 @@ self: {
         unix
         unix-compat
         unliftio-core
+        wl-pprint-text
       ];
       testHaskellDepends = [
         base
         bytestring
         directory
         generic-lens
-        HList
         lens
         QuickCheck
         quickcheck-instances
@@ -549335,8 +552989,8 @@ self: {
     }:
     mkDerivation {
       pname = "quickcheck-groups";
-      version = "0.0.1.4";
-      sha256 = "1k1pbxcp8ppzyym2wavvpn6p5d74cddh1ldlg1kv55ypfszzzf21";
+      version = "0.0.1.5";
+      sha256 = "1ibchcgj1bqfsc6dx3n4bii6dhylxjn8zl9vhhvk48zsk99q4jaz";
       libraryHaskellDepends = [
         base
         groups
@@ -549419,10 +553073,10 @@ self: {
     }:
     mkDerivation {
       pname = "quickcheck-instances";
-      version = "0.3.32";
-      sha256 = "10zz62j1jplk392c90hkg9mfk8piyp5ify94jp3rld722phg5xa8";
+      version = "0.3.33";
+      sha256 = "0rl8y3rb4fm4nqz122bp5f2aya4f8bc9m9i9n2vwlyq2gdacs0v8";
       revision = "1";
-      editedCabalFile = "0d7vgsvvkipa1d1gh7z7ha12fv49frcv81dz09qy0m6kvn5lawl7";
+      editedCabalFile = "1xkc7rsfgya4rwiizh0yfincws3knpdnh08m280v1dgik4kv37vh";
       libraryHaskellDepends = [
         array
         base
@@ -549507,8 +553161,8 @@ self: {
     }:
     mkDerivation {
       pname = "quickcheck-lockstep";
-      version = "0.7.0";
-      sha256 = "0dcy47ab2813saml3jdiar9xlx8ml8c55awcg92i6amazhgwpyw2";
+      version = "0.8.0";
+      sha256 = "1y3icjvd9qbv38q1cxkn48d6fp4b7c0j0j0l3mwkfi8ph8qjg2y6";
       libraryHaskellDepends = [
         base
         constraints
@@ -549552,15 +553206,14 @@ self: {
       pretty-show,
       QuickCheck,
       quickcheck-classes,
-      quickcheck-instances,
       semigroupoids,
       text,
       vector,
     }:
     mkDerivation {
       pname = "quickcheck-monoid-subclasses";
-      version = "0.3.0.5";
-      sha256 = "0hnrm69vavc2b1h4cishdvn7j0x8l8mk8fggbai3kn77w6cnf3il";
+      version = "0.3.0.6";
+      sha256 = "03gngckzwhln7c86dixg8szrnqwgdl9svy6hfnzgyjpn4qfqwcmv";
       libraryHaskellDepends = [
         base
         containers
@@ -549568,7 +553221,6 @@ self: {
         pretty-show
         QuickCheck
         quickcheck-classes
-        quickcheck-instances
         semigroupoids
       ];
       testHaskellDepends = [
@@ -549580,7 +553232,6 @@ self: {
         monoid-subclasses
         QuickCheck
         quickcheck-classes
-        quickcheck-instances
         text
         vector
       ];
@@ -549700,8 +553351,8 @@ self: {
     }:
     mkDerivation {
       pname = "quickcheck-quid";
-      version = "0.0.1.7";
-      sha256 = "1r0ip3a281dgvy6bplhr76wg5n0l4qz0k6i6r3fzh4848r6z9say";
+      version = "0.0.1.8";
+      sha256 = "0qx08f6z1y21qn63z5hkhlvj1rgn921ads03lrppmggg9kvrk5x0";
       libraryHaskellDepends = [
         base
         containers
@@ -555889,8 +559540,8 @@ self: {
     }:
     mkDerivation {
       pname = "rdf4h";
-      version = "5.2.0";
-      sha256 = "03f1dcw4zii4yvq7azhcgpkf59wibjdlvkifb88jp8maiaadzr75";
+      version = "5.2.1";
+      sha256 = "1jah12gcmc85qpbhw6igi28rvmww38fqmj1waqw7c16y0lxnkvxb";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -556055,10 +559706,8 @@ self: {
     }:
     mkDerivation {
       pname = "rds-data";
-      version = "0.2.0.0";
-      sha256 = "08lk0m1vgvbsmbvf5gv9nlab161a05w6n964w90g7wf1rqmj54d7";
-      isLibrary = false;
-      isExecutable = false;
+      version = "0.2.0.1";
+      sha256 = "1kfi9qmq07v9bvs7a08221r4c7r4hl74f1iavnk6d5gaqms38sfz";
       libraryHaskellDepends = [
         aeson
         amazonka-core
@@ -556202,6 +559851,137 @@ self: {
     }
   ) { };
 
+  "rds-data-polysemy" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-pretty,
+      amazonka,
+      amazonka-core,
+      amazonka-rds,
+      amazonka-rds-data,
+      amazonka-secretsmanager,
+      base,
+      base64-bytestring,
+      bytestring,
+      contravariant,
+      generic-lens,
+      hedgehog,
+      hedgehog-extras,
+      http-client,
+      hw-polysemy,
+      hw-prelude,
+      microlens,
+      mtl,
+      optparse-applicative,
+      polysemy-log,
+      polysemy-plugin,
+      polysemy-time,
+      rds-data,
+      resourcet,
+      stm,
+      tasty,
+      tasty-discover,
+      tasty-hedgehog,
+      testcontainers,
+      text,
+      time,
+      transformers,
+      ulid,
+      uuid,
+    }:
+    mkDerivation {
+      pname = "rds-data-polysemy";
+      version = "0.1.0.0";
+      sha256 = "13anncaj8yw3y4csg7kbda6wrb9s8g5spd9k5h1ygrwy1az697sr";
+      isLibrary = false;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        amazonka
+        amazonka-core
+        amazonka-rds
+        amazonka-rds-data
+        amazonka-secretsmanager
+        base
+        base64-bytestring
+        bytestring
+        contravariant
+        generic-lens
+        hw-polysemy
+        hw-prelude
+        microlens
+        mtl
+        polysemy-log
+        polysemy-plugin
+        rds-data
+        text
+        time
+        transformers
+        ulid
+        uuid
+      ];
+      executableHaskellDepends = [
+        aeson
+        amazonka
+        amazonka-rds-data
+        base
+        bytestring
+        generic-lens
+        hedgehog
+        http-client
+        hw-polysemy
+        hw-prelude
+        microlens
+        optparse-applicative
+        polysemy-log
+        polysemy-plugin
+        polysemy-time
+        rds-data
+        resourcet
+        stm
+        testcontainers
+        text
+        time
+        ulid
+        uuid
+      ];
+      testHaskellDepends = [
+        aeson
+        aeson-pretty
+        amazonka
+        amazonka-core
+        amazonka-rds
+        amazonka-rds-data
+        amazonka-secretsmanager
+        base
+        base64-bytestring
+        bytestring
+        generic-lens
+        hedgehog
+        hedgehog-extras
+        hw-polysemy
+        microlens
+        polysemy-log
+        polysemy-plugin
+        rds-data
+        tasty
+        tasty-discover
+        tasty-hedgehog
+        testcontainers
+        text
+        time
+        ulid
+        uuid
+      ];
+      testToolDepends = [ tasty-discover ];
+      doHaddock = false;
+      description = "Codecs for use with AWS rds-data";
+      license = lib.licenses.bsd3;
+      mainProgram = "rds-data";
+    }
+  ) { };
+
   "rdtsc" = callPackage (
     { mkDerivation, base }:
     mkDerivation {
@@ -560677,8 +564457,8 @@ self: {
     }:
     mkDerivation {
       pname = "reflex";
-      version = "0.9.3.3";
-      sha256 = "0iklqcszxmj3dian0mjpz75483084ar8i328ydcx68xk9l9rlqbf";
+      version = "0.9.3.4";
+      sha256 = "1qh2xbg4q2gif25hinz72j8ka2w976lccklknwgijxaayh92if4a";
       libraryHaskellDepends = [
         base
         bifunctors
@@ -568954,6 +572734,34 @@ self: {
     }
   ) { };
 
+  "resource-pool_0_5_0_0" = callPackage (
+    {
+      mkDerivation,
+      base,
+      hashable,
+      primitive,
+      stm,
+      text,
+      time,
+    }:
+    mkDerivation {
+      pname = "resource-pool";
+      version = "0.5.0.0";
+      sha256 = "1l0l26fgwjilqh55z7vylw9i735hich8amwgl1a63dgcwyvhlxgs";
+      libraryHaskellDepends = [
+        base
+        hashable
+        primitive
+        stm
+        text
+        time
+      ];
+      description = "A high-performance striped resource pooling implementation";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "resource-pool-catchio" = callPackage (
     {
       mkDerivation,
@@ -572759,8 +576567,8 @@ self: {
     }:
     mkDerivation {
       pname = "richenv";
-      version = "0.1.0.2";
-      sha256 = "0yxl6cnhg7n29f93mj4a5wkp1v1i2y38824n2bg8b64ik1hlg876";
+      version = "0.1.0.3";
+      sha256 = "0v6ymwypp6023srv9axh0rc98bsvkhk29nwhap9rb33x8ibb8vr9";
       libraryHaskellDepends = [
         aeson
         base
@@ -574719,8 +578527,8 @@ self: {
     }:
     mkDerivation {
       pname = "roc-id";
-      version = "0.2.0.4";
-      sha256 = "126ijgk7wi06694xcqvjz9amg61pzi2hnx7gq631zwxa6d98czzk";
+      version = "0.2.0.5";
+      sha256 = "1a70y8l45lyglq6rrxrp20jfpwg87gkga4wdxdf15nzh0p1a417f";
       libraryHaskellDepends = [
         base
         MonadRandom
@@ -581798,7 +585606,6 @@ self: {
       exceptions,
       filepath,
       free,
-      haskell-src-exts,
       microlens,
       microlens-th,
       monad-control,
@@ -581825,8 +585632,8 @@ self: {
     }:
     mkDerivation {
       pname = "sandwich";
-      version = "0.3.0.3";
-      sha256 = "0j53b68vgidwahmbbhcrshh9043k1g230lypyfavcwbpcgrzxkpb";
+      version = "0.3.0.4";
+      sha256 = "1j6xlnhb58kg776jl1bp82lfi95a9xy27haqanbx67mw7n471gc6";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -581843,7 +585650,6 @@ self: {
         exceptions
         filepath
         free
-        haskell-src-exts
         microlens
         microlens-th
         monad-control
@@ -581882,7 +585688,6 @@ self: {
         exceptions
         filepath
         free
-        haskell-src-exts
         microlens
         microlens-th
         monad-control
@@ -581921,7 +585726,6 @@ self: {
         exceptions
         filepath
         free
-        haskell-src-exts
         microlens
         microlens-th
         monad-control
@@ -581981,7 +585785,6 @@ self: {
       string-interpolate,
       temporary,
       text,
-      time,
       transformers,
       unix-compat,
       unliftio,
@@ -581990,8 +585793,8 @@ self: {
     }:
     mkDerivation {
       pname = "sandwich-contexts";
-      version = "0.3.0.2";
-      sha256 = "01klfrf9n1z6h1iqgb3ccch1dxihp28lh60d44xj3xmfz2q4y5iq";
+      version = "0.3.0.3";
+      sha256 = "0bd0a3akg7rbpp94cwyrpjjw104468y7caxnvl6iwl3fnc6gvy7c";
       libraryHaskellDepends = [
         aeson
         base
@@ -582019,7 +585822,6 @@ self: {
         string-interpolate
         temporary
         text
-        time
         transformers
         unix-compat
         unliftio
@@ -582053,8 +585855,8 @@ self: {
       exceptions,
       filepath,
       http-client,
-      kubernetes-client,
-      kubernetes-client-core,
+      kubernetes-api,
+      kubernetes-api-client,
       lens,
       lens-aeson,
       minio-hs,
@@ -582080,8 +585882,8 @@ self: {
     }:
     mkDerivation {
       pname = "sandwich-contexts-kubernetes";
-      version = "0.1.0.0";
-      sha256 = "04p2g6jjra3bh4a4zb00lidckm91ba3cvwvrvjh28i3flh15b6wr";
+      version = "0.1.1.0";
+      sha256 = "00g2fq9xnk8icrvfjmqkhl3g7pz7159kqajx10vgy4xgdxp25zfz";
       libraryHaskellDepends = [
         aeson
         base
@@ -582090,8 +585892,8 @@ self: {
         exceptions
         filepath
         http-client
-        kubernetes-client
-        kubernetes-client-core
+        kubernetes-api
+        kubernetes-api-client
         lens
         lens-aeson
         minio-hs
@@ -582449,8 +586251,8 @@ self: {
     }:
     mkDerivation {
       pname = "sandwich-webdriver";
-      version = "0.3.0.0";
-      sha256 = "1s4j2i91csn1wplw1vnz7s8kin5v580a7m98yfas8p7nlm9bihp4";
+      version = "0.3.0.1";
+      sha256 = "18vb8vdcpdy6zkqynhqwzy2217lbz0jrdhd2c21wr6ly4rfmf0jr";
       libraryHaskellDepends = [
         aeson
         base
@@ -582514,6 +586316,7 @@ self: {
         sandwich
         sandwich-contexts
         string-interpolate
+        temporary
         text
         time
         transformers
@@ -583550,7 +587353,7 @@ self: {
     }
   ) { inherit (pkgs) z3; };
 
-  "sbv_11_7" = callPackage (
+  "sbv_12_0" = callPackage (
     {
       mkDerivation,
       array,
@@ -583563,6 +587366,8 @@ self: {
       deepseq,
       directory,
       filepath,
+      haskell-src-exts,
+      haskell-src-meta,
       libBF,
       mtl,
       pretty,
@@ -583585,8 +587390,8 @@ self: {
     }:
     mkDerivation {
       pname = "sbv";
-      version = "11.7";
-      sha256 = "1nq1yjc4wfjmqhp0y61aqmva99vxnpj2mpksyai63ijmx9zq8yzs";
+      version = "12.0";
+      sha256 = "14c9i9aa6rbm6kfxjcdbcy7vajh3v6bhsginhn1v6hg8430f93rp";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         array
@@ -583599,6 +587404,8 @@ self: {
         deepseq
         directory
         filepath
+        haskell-src-exts
+        haskell-src-meta
         libBF
         mtl
         pretty
@@ -588823,8 +592630,8 @@ self: {
     }:
     mkDerivation {
       pname = "search-algorithms";
-      version = "0.3.3";
-      sha256 = "00b1fxgjg57m6qm8017yvqbs6qvblw4iazir005flzjm6jls12kz";
+      version = "0.3.4";
+      sha256 = "1r6nnwb0ry95xqg8psdwgfx6h264kd437a3mr5z7gv7vdarb3r2h";
       libraryHaskellDepends = [
         base
         containers
@@ -589736,6 +593543,42 @@ self: {
     }
   ) { };
 
+  "select-rpms_0_3_0" = callPackage (
+    {
+      mkDerivation,
+      base,
+      directory,
+      extra,
+      filepath,
+      Glob,
+      rpm-nvr,
+      safe,
+      simple-cmd,
+      simple-cmd-args,
+      simple-prompt,
+    }:
+    mkDerivation {
+      pname = "select-rpms";
+      version = "0.3.0";
+      sha256 = "0xzhhic205nvh8n2mdb85675x8kdvlgjy0d4xxyw1nq8p078cn51";
+      libraryHaskellDepends = [
+        base
+        directory
+        extra
+        filepath
+        Glob
+        rpm-nvr
+        safe
+        simple-cmd
+        simple-cmd-args
+        simple-prompt
+      ];
+      description = "Select a subset of RPM packages";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "selections" = callPackage (
     { mkDerivation, base }:
     mkDerivation {
@@ -591821,7 +595664,7 @@ self: {
     }
   ) { };
 
-  "sequence-formats_1_11_0_1" = callPackage (
+  "sequence-formats_1_11_0_2" = callPackage (
     {
       mkDerivation,
       attoparsec,
@@ -591846,8 +595689,8 @@ self: {
     }:
     mkDerivation {
       pname = "sequence-formats";
-      version = "1.11.0.1";
-      sha256 = "1qzawb3qnn76j7dvb0q8jbblbayggr5hja0x723y09nv1y9lg6g5";
+      version = "1.11.0.2";
+      sha256 = "1y6sv7xlzbkvlrihmkclv1hp5g3nsrnz37xika3jzksqv4grv412";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -592396,8 +596239,8 @@ self: {
       pname = "serialise";
       version = "0.2.6.1";
       sha256 = "1x3p9vi6daf50xgv5xxjnclqcq9ynqg1qw7af3ppa1nizycrg533";
-      revision = "4";
-      editedCabalFile = "1ipcrg5g450a3aq15l5rhngpfck8krz7c7bvhhrd8fv3q645yjbh";
+      revision = "5";
+      editedCabalFile = "0kfai48gza3zzi3s3ll1gng2wbpdmr5z5isx8snlh49vafsqjzx6";
       libraryHaskellDepends = [
         array
         base
@@ -592793,6 +596636,7 @@ self: {
       constraints,
       containers,
       deepseq,
+      generics-sop,
       hspec,
       hspec-discover,
       http-api-data,
@@ -592811,10 +596655,8 @@ self: {
     }:
     mkDerivation {
       pname = "servant";
-      version = "0.20.2";
-      sha256 = "0rakyjrmn05sb2gxk4bkxlb23zfwm1pjkdg9mh7b4hjgsdwy4fba";
-      revision = "1";
-      editedCabalFile = "17n769vwyyc5hshm71r33ksvn26qcz19017wl9p8xj4igav790pa";
+      version = "0.20.3.0";
+      sha256 = "00k6pwqxpyjp5qm5pjl8qb75iqmpql5iv3ac43xdvikcixffcwzj";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -592825,6 +596667,7 @@ self: {
         constraints
         containers
         deepseq
+        generics-sop
         http-api-data
         http-media
         http-types
@@ -592845,6 +596688,7 @@ self: {
         hspec
         http-media
         mtl
+        network-uri
         QuickCheck
         quickcheck-instances
         text
@@ -592903,15 +596747,12 @@ self: {
       containers,
       servant,
       servant-server,
-      template-haskell,
       text,
     }:
     mkDerivation {
       pname = "servant-activeresource";
-      version = "0.1.0.0";
-      sha256 = "0dcip0vbry344pv8za5ldxr9g71vyb63ks3jdpjc7z4vixp5rbsp";
-      revision = "1";
-      editedCabalFile = "006mbw5mvj5kzz8bigws55xallwrsvdsi5b5y9wc4d7l8a63z0gd";
+      version = "0.2.0.0";
+      sha256 = "0gxw9yxsr4ri2lwr4y0qhf0cgqknrdjgpqn87wy1n4pas2k6sc15";
       libraryHaskellDepends = [
         aeson
         base
@@ -592919,7 +596760,6 @@ self: {
         containers
         servant
         servant-server
-        template-haskell
         text
       ];
       testHaskellDepends = [
@@ -592929,10 +596769,9 @@ self: {
         containers
         servant
         servant-server
-        template-haskell
         text
       ];
-      description = "Servant endpoints compatible with Rails's ActiveResources";
+      description = "Servant endpoints compatible with Rails's ActiveResource";
       license = lib.licenses.bsd3;
     }
   ) { };
@@ -593454,7 +597293,7 @@ self: {
       bytestring,
       case-insensitive,
       cookie,
-      data-default-class,
+      data-default,
       entropy,
       hspec,
       hspec-discover,
@@ -593482,10 +597321,8 @@ self: {
     }:
     mkDerivation {
       pname = "servant-auth-server";
-      version = "0.4.9.0";
-      sha256 = "0fhk2z9n9ax4g7iisdgcd87wgj9wvazhl86kjh364gsj1g8a5y99";
-      revision = "1";
-      editedCabalFile = "0skvvqkyqzgjdg5b2l9fd1ri144s649g5yddpclwciraimip7gw1";
+      version = "0.4.9.1";
+      sha256 = "04sy2g81pp0pr31xi6h1hqm199z6r4xv3fy2x307dlydxmdm8qb3";
       libraryHaskellDepends = [
         aeson
         base
@@ -593494,7 +597331,7 @@ self: {
         bytestring
         case-insensitive
         cookie
-        data-default-class
+        data-default
         entropy
         http-types
         jose
@@ -594296,6 +598133,7 @@ self: {
       deepseq,
       entropy,
       exceptions,
+      generics-sop,
       hspec,
       hspec-discover,
       http-api-data,
@@ -594324,10 +598162,10 @@ self: {
     }:
     mkDerivation {
       pname = "servant-client";
-      version = "0.20.2";
-      sha256 = "026bp0qk2bx672834yjxmqrfacyzzdssm89bd0niz1xzxzmw5r7g";
-      revision = "2";
-      editedCabalFile = "1sm0xspcsxn6n70nirpglcmx07sn6vmag8kvvw9i2dr2hcfkgk55";
+      version = "0.20.3.0";
+      sha256 = "0kxmixgv5nmir2bk3zfrhaal4969rf414wi2ccnngjm3395bqrwn";
+      revision = "1";
+      editedCabalFile = "0644af144zy4axv8hhqhv8mj7amnqd09fbz5rglr6l60d27hpqx1";
       libraryHaskellDepends = [
         base
         base-compat
@@ -594355,6 +598193,7 @@ self: {
         base-compat
         bytestring
         entropy
+        generics-sop
         hspec
         http-api-data
         http-client
@@ -594387,6 +598226,7 @@ self: {
     {
       mkDerivation,
       aeson,
+      attoparsec,
       base,
       base-compat,
       base64-bytestring,
@@ -594407,15 +598247,17 @@ self: {
       sop-core,
       template-haskell,
       text,
+      transformers,
     }:
     mkDerivation {
       pname = "servant-client-core";
-      version = "0.20.2";
-      sha256 = "10nv810ns8v1d9a2fkg9bgi7h9gm4yap1y6mg2r15d569i27rrvc";
+      version = "0.20.3.0";
+      sha256 = "1vv6xf340hyk60vv6jb1zxfpsb7x2ykacb84yrn3h1w4k075hlyn";
       revision = "1";
-      editedCabalFile = "13200adlbl8mydi35x1r8w4q9ra8y079figgjxl5jsrhvps54608";
+      editedCabalFile = "1g8arzgcqc9qp1fimrs8iwqvzgsp6br76kkh72hsz0nsg6gmlvc1";
       libraryHaskellDepends = [
         aeson
+        attoparsec
         base
         base-compat
         base64-bytestring
@@ -594437,9 +598279,12 @@ self: {
       testHaskellDepends = [
         base
         base-compat
+        bytestring
         deepseq
         hspec
         QuickCheck
+        servant
+        transformers
       ];
       testToolDepends = [ hspec-discover ];
       description = "Core functionality and class for client function generation for servant APIs";
@@ -598183,8 +602028,8 @@ self: {
     }:
     mkDerivation {
       pname = "servant-routes";
-      version = "0.1.0.0";
-      sha256 = "1m17cpbmyi8y2h27p9y28193b2d46qmr8bhswvjn89nd5z42d6x2";
+      version = "0.1.1.0";
+      sha256 = "0r9db46gbi9rcsrdvqndfa9433szbp5a0c1ad3z3qchpf3i2dxfm";
       libraryHaskellDepends = [
         aeson
         aeson-pretty
@@ -598215,6 +602060,52 @@ self: {
     }
   ) { };
 
+  "servant-routes-golden" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-pretty,
+      base,
+      hspec,
+      hspec-core,
+      hspec-discover,
+      hspec-golden,
+      QuickCheck,
+      servant,
+      servant-routes,
+      text,
+    }:
+    mkDerivation {
+      pname = "servant-routes-golden";
+      version = "0.1.0.0";
+      sha256 = "16kc5q0vc7hjy7dfd3smnlcs6308sligzgr3hcnx1mqxnfmv0svp";
+      libraryHaskellDepends = [
+        aeson
+        aeson-pretty
+        base
+        hspec-core
+        hspec-golden
+        servant-routes
+        text
+      ];
+      testHaskellDepends = [
+        aeson
+        aeson-pretty
+        base
+        hspec
+        hspec-core
+        hspec-golden
+        QuickCheck
+        servant
+        servant-routes
+        text
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Golden test your Servant APIs using `servant-routes`";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   "servant-ruby" = callPackage (
     {
       mkDerivation,
@@ -598491,10 +602382,10 @@ self: {
     }:
     mkDerivation {
       pname = "servant-server";
-      version = "0.20.2";
-      sha256 = "0fqgnzzgbj4w441h3v841lav7gxazakz04s354r24pq4rh6m1kqy";
+      version = "0.20.3.0";
+      sha256 = "05crwklbncd393zq00gi04zgnfyy2wk31s0xf5hy6yjrsbshlmih";
       revision = "1";
-      editedCabalFile = "0qjl1yrr0l7kynrndv8qmpzl0jz9nzb7c4v9r7kxq05nnb7xpqbz";
+      editedCabalFile = "1z2h1gmxphwd76chyah405ww4ciyxq7rvggghr6lh0z1m3p2k90h";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -599669,12 +603560,13 @@ self: {
       servant,
       servant-foreign,
       string-interpolate,
+      temporary,
       text,
     }:
     mkDerivation {
       pname = "servant-typescript";
-      version = "0.1.0.2";
-      sha256 = "03nf4gqiy7jpdaxmddv859im0czpjrdss72cgjhkd96vqf4g4kam";
+      version = "0.1.0.3";
+      sha256 = "0x10dsd16bjqkk7s8kb1yfhrvkzqw5v0smxm8vf3bm8q10anf2dp";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -599703,6 +603595,7 @@ self: {
         servant
         servant-foreign
         string-interpolate
+        temporary
         text
       ];
       testHaskellDepends = [
@@ -603825,84 +607718,6 @@ self: {
     }
   ) { };
 
-  "shakespeare_2_1_0_1" = callPackage (
-    {
-      mkDerivation,
-      aeson,
-      base,
-      blaze-html,
-      blaze-markup,
-      bytestring,
-      containers,
-      directory,
-      exceptions,
-      file-embed,
-      ghc-prim,
-      hspec,
-      HUnit,
-      parsec,
-      process,
-      scientific,
-      template-haskell,
-      text,
-      th-lift,
-      time,
-      transformers,
-      unordered-containers,
-      vector,
-    }:
-    mkDerivation {
-      pname = "shakespeare";
-      version = "2.1.0.1";
-      sha256 = "0byj0zhxi1pr8l5f18phzkwcf7z38lyk2zznz8hbkqadfgrmbdkc";
-      libraryHaskellDepends = [
-        aeson
-        base
-        blaze-html
-        blaze-markup
-        bytestring
-        containers
-        directory
-        exceptions
-        file-embed
-        ghc-prim
-        parsec
-        process
-        scientific
-        template-haskell
-        text
-        th-lift
-        time
-        transformers
-        unordered-containers
-        vector
-      ];
-      testHaskellDepends = [
-        aeson
-        base
-        blaze-html
-        blaze-markup
-        bytestring
-        containers
-        directory
-        exceptions
-        ghc-prim
-        hspec
-        HUnit
-        parsec
-        process
-        template-haskell
-        text
-        time
-        transformers
-      ];
-      description = "A toolkit for making compile-time interpolated templates";
-      license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      maintainers = [ lib.maintainers.psibi ];
-    }
-  ) { };
-
   "shakespeare" = callPackage (
     {
       mkDerivation,
@@ -603931,8 +607746,8 @@ self: {
     }:
     mkDerivation {
       pname = "shakespeare";
-      version = "2.1.1";
-      sha256 = "1j6jniy8d8dgc61h4n2kw668y8f30cqnsfwmgad1s4fqj1bplh0r";
+      version = "2.1.4";
+      sha256 = "1c9lvb0aw00r0wibm061c614phlwsrf888amjn9nc168ix0cxv6x";
       libraryHaskellDepends = [
         aeson
         base
@@ -604985,7 +608800,7 @@ self: {
     }
   ) { };
 
-  "shellify_0_14_0_0" = callPackage (
+  "shellify_0_14_0_1" = callPackage (
     {
       mkDerivation,
       base,
@@ -605007,8 +608822,8 @@ self: {
     }:
     mkDerivation {
       pname = "shellify";
-      version = "0.14.0.0";
-      sha256 = "09i55y57innmjbgb0x1bvrbpk0c5py0bb004wxnqpw4b8swxc60r";
+      version = "0.14.0.1";
+      sha256 = "1gnr4ii3wn7i0b8facg5a9d3b83lwm7nyk56576ll3nyywqh577i";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -616514,8 +620329,8 @@ self: {
       pname = "snap";
       version = "1.1.3.3";
       sha256 = "1mqckzm9gasa04ls691zgw4c6m53mgcj86yd2p5qvy07mpn9rdvx";
-      revision = "3";
-      editedCabalFile = "1nzkb0jq359lpwz4a1ldx1fh8xs735wfwf2z6qq0z7y0c4zxb9da";
+      revision = "4";
+      editedCabalFile = "1zqvs7kx3jy8vmgwqc344cyv6f3zpx0vg9w5nb9lf5h23bl85k0i";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -619438,8 +623253,8 @@ self: {
     }:
     mkDerivation {
       pname = "snappy";
-      version = "0.2.0.3";
-      sha256 = "0jy747dg58smzzr1mzrm751bkwvnaaghn65ppfkqbpqz6jw45qq2";
+      version = "0.2.0.4";
+      sha256 = "1marmb148hq6fnwmb5q1kqmzjsxpnqcgszmm4jdapiijlmms1b76";
       libraryHaskellDepends = [
         base
         bytestring
@@ -621041,6 +624856,65 @@ self: {
     }
   ) { };
 
+  "socks5" = callPackage (
+    {
+      mkDerivation,
+      async,
+      base,
+      binary,
+      bytestring,
+      data-default,
+      hspec,
+      iproute,
+      mtl,
+      network,
+      network-run,
+      optparse-applicative,
+      text,
+      tls,
+    }:
+    mkDerivation {
+      pname = "socks5";
+      version = "0.6.0.1";
+      sha256 = "1q4084wvfhyni3dw0xa5a08k3lkylr6g5bzv6d463iqwn5skjwsq";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        async
+        base
+        binary
+        bytestring
+        iproute
+        mtl
+        network
+        network-run
+        text
+        tls
+      ];
+      executableHaskellDepends = [
+        base
+        bytestring
+        data-default
+        network
+        optparse-applicative
+        text
+        tls
+      ];
+      testHaskellDepends = [
+        async
+        base
+        bytestring
+        data-default
+        hspec
+        network
+        network-run
+        tls
+      ];
+      description = "A SOCKS5 (RFC 1928) implementation";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   "sodium" = callPackage (
     {
       mkDerivation,
@@ -621539,6 +625413,34 @@ self: {
     }
   ) { };
 
+  "sop-satisfier" = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      tasty,
+      tasty-hunit,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "sop-satisfier";
+      version = "0.3.4.5";
+      sha256 = "1q0w5syb0x04k6iy4rhssw7wnj1vy562lhw9lmvygi37wir6vjj1";
+      libraryHaskellDepends = [
+        base
+        containers
+        transformers
+      ];
+      testHaskellDepends = [
+        base
+        tasty
+        tasty-hunit
+      ];
+      description = "Check satisfiability of expressions on natural numbers";
+      license = lib.licenses.bsd2;
+    }
+  ) { };
+
   "sophia" = callPackage (
     {
       mkDerivation,
@@ -624158,8 +628060,8 @@ self: {
     }:
     mkDerivation {
       pname = "specup";
-      version = "0.2.0.5";
-      sha256 = "1b84drxgqaij48rwwannnkms1mzd5mw4i4r442am6wz4y7v45309";
+      version = "0.2.0.6";
+      sha256 = "1b7bvrb2ad1p78g82q7a3pzi4pgq2qrsas8vl9nglljyn2l259va";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -625079,6 +628981,7 @@ self: {
       math-functions,
       process,
       random,
+      template-haskell,
       test-framework,
       test-framework-hunit,
       testu01,
@@ -625087,8 +628990,8 @@ self: {
     }:
     mkDerivation {
       pname = "splitmix";
-      version = "0.1.1";
-      sha256 = "1iqjxg3jdjmpj6rchnab1scr6b12p1mk7y75ywn06qisc0dc8y6n";
+      version = "0.1.3.1";
+      sha256 = "0w32z3rhsnijb9s5k6h60rhbzgzkw8xq1glfbjbl1znlkgbx1g5n";
       libraryHaskellDepends = [
         base
         deepseq
@@ -625104,6 +629007,7 @@ self: {
         math-functions
         process
         random
+        template-haskell
         test-framework
         test-framework-hunit
         tf-random
@@ -625535,8 +629439,8 @@ self: {
       pname = "spreadsheet";
       version = "0.1.3.10";
       sha256 = "022q6an3jl0s8bnwgma8v03b6m4zq3q0drl6nsrcs0nav8n1z5r0";
-      revision = "1";
-      editedCabalFile = "1dd37qgmy7nzxkbarflh5fm33gy7yqy91pa4pa3x4yggp9v52f61";
+      revision = "2";
+      editedCabalFile = "1zw9lf90r43vnmybbzmgahw4w423zfjhz4b0nmssnvdbk2lj5yps";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -626665,6 +630569,8 @@ self: {
       pname = "sqlite";
       version = "0.5.5";
       sha256 = "1i2bkfyswmannwb1fx6y8ma3pzgx28nl05a35gz1gar28rsx7gyk";
+      revision = "1";
+      editedCabalFile = "0pp4b2z41n9rpln4zrc6d9100v8g60m3ggjrjbq5fk0xjan4gp7k";
       libraryHaskellDepends = [
         base
         bytestring
@@ -627655,7 +631561,7 @@ self: {
     }
   ) { inherit (pkgs) nlopt; };
 
-  "srtree_2_0_1_4" = callPackage (
+  "srtree_2_0_1_5" = callPackage (
     {
       mkDerivation,
       ad,
@@ -627690,8 +631596,8 @@ self: {
     }:
     mkDerivation {
       pname = "srtree";
-      version = "2.0.1.4";
-      sha256 = "04r9lxf3nffpmmv978h8mfzr0shcbcrwarxs8s2mgpdvdx5qm1sa";
+      version = "2.0.1.5";
+      sha256 = "0h856i6gsh01rpp08lkvdrigylhbf1h016xwkccmmyd20iz3023l";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -628550,8 +632456,8 @@ self: {
       pname = "stache";
       version = "2.3.4";
       sha256 = "0kgiyxws2kir8q8zrqkzmk103y7hl6nksxl70f6fy8m9fqkjga51";
-      revision = "4";
-      editedCabalFile = "03bgp2b2kpijnvdsvcr4adas7iyz3v12cp6j044b248cw6hklayd";
+      revision = "5";
+      editedCabalFile = "1kvqv42w223r53mjkj2am6j65qly8bvahr5fxvlbnx88bairp0zm";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -628682,8 +632588,8 @@ self: {
     }:
     mkDerivation {
       pname = "stack";
-      version = "3.5.1";
-      sha256 = "12423vw5k576c1yy0mg40cjia8j6b9jsf8p2489ixlvm192fza7f";
+      version = "3.7.1";
+      sha256 = "03n8191slbq9zs9h437qda1w24nnf73p7x48x8lqp8sbcn6plaj1";
       configureFlags = [
         "-fdisable-git-info"
         "-fhide-dependency-versions"
@@ -630838,8 +634744,8 @@ self: {
     }:
     mkDerivation {
       pname = "stackctl";
-      version = "1.7.3.4";
-      sha256 = "0y0prp85gf5yns5lb9285g2xqfy8w5ck2ajkpiljnmff2zqnlyzb";
+      version = "1.7.3.5";
+      sha256 = "1naf2n41d0vhhnkkc4bnkapzqdmap6kp8xh27dqjcg7kmv3hllhi";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -631152,6 +635058,8 @@ self: {
       pname = "stan";
       version = "0.2.1.0";
       sha256 = "1mf01bpy291131jfl4fcslv0jfn8i8jqwr29v1v48j6c6q49rias";
+      revision = "1";
+      editedCabalFile = "0b7lf7g8kg7xxxl3zgfxk86bs0pl9i9xm1cvn1n2bpmfvymm19qa";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -632530,6 +636438,18 @@ self: {
     }
   ) { };
 
+  "stats-monad" = callPackage (
+    { mkDerivation, base }:
+    mkDerivation {
+      pname = "stats-monad";
+      version = "0.1.0.1";
+      sha256 = "1cg0db7malqm75rlxxcmp2w00pvlf1kki4fz5p7lc86qy7241vzb";
+      libraryHaskellDepends = [ base ];
+      description = "A discrete probability monad with statistics";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   "statsd" = callPackage (
     {
       mkDerivation,
@@ -633666,6 +637586,8 @@ self: {
       pname = "stm";
       version = "2.5.3.1";
       sha256 = "1rrh4s07vav9mlhpqsq9r6r0gh3f4k8g1gjlx63ngkpdj59ldc7b";
+      revision = "1";
+      editedCabalFile = "1pfrf0r1f3hl9x3nxv5nja6hrflm72z3cls4x5vljnzmrp4mf6s2";
       libraryHaskellDepends = [
         array
         base
@@ -638837,8 +642759,8 @@ self: {
       pname = "string-interpolate";
       version = "0.3.4.0";
       sha256 = "13hb3spabggr6gsn9xhwpwldjvpl2l7z4lgssis82c40n108b0w8";
-      revision = "2";
-      editedCabalFile = "0mw6ws7ixdcfhn7pkgci8v1pk26wnid123pi5f1y88hnmnrzs13k";
+      revision = "3";
+      editedCabalFile = "0grq9v023186gfq3a2as9974qlwcjx3dhxqczpq22bq2wfpw24x7";
       libraryHaskellDepends = [
         base
         bytestring
@@ -642839,6 +646761,8 @@ self: {
       pname = "sum-pyramid";
       version = "0.0.1";
       sha256 = "1zh7g16d345g8wffgj7wswfryrxxf7ik02fwrncqyc9yxmc7hm6y";
+      revision = "1";
+      editedCabalFile = "0pq6b89ygb0c2sd7b73zic7f8g589jz08ff0a1fpwr4xj5mawkmd";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -644344,8 +648268,8 @@ self: {
     }:
     mkDerivation {
       pname = "sv2v";
-      version = "0.0.13";
-      sha256 = "0gg8972im84gp60qavpmsdxcmjwzsbbg3va2f0fdxz5yqyc96cdn";
+      version = "0.0.13.1";
+      sha256 = "1idv0mm1n02k9qzqqshylp310bcjlg5m3dh7l6dvz575553r4d1l";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -645268,6 +649192,7 @@ self: {
       boolexpr,
       brick,
       brick-list-skip,
+      brick-tabular-list,
       bytestring,
       clock,
       colour,
@@ -645287,6 +649212,7 @@ self: {
       fused-effects,
       fused-effects-lens,
       fuzzy,
+      generic-data,
       githash,
       hashable,
       hsnoise,
@@ -645300,24 +649226,30 @@ self: {
       megaparsec,
       minimorph,
       MissingH,
+      monad-logger,
+      monoidmap,
+      monoidmap-aeson,
       mtl,
       murmur3,
       natural-sort,
       nonempty-containers,
       optparse-applicative,
+      ordered-containers,
       palette,
       pandoc,
       pandoc-types,
       parser-combinators,
       prettyprinter,
       QuickCheck,
+      quickcheck-instances,
       random,
       scientific,
+      servant,
       servant-docs,
+      servant-JuicyPixels,
       servant-multipart,
       servant-server,
       SHA,
-      simple-enumeration,
       split,
       sqlite-simple,
       syb,
@@ -645351,8 +649283,8 @@ self: {
     }:
     mkDerivation {
       pname = "swarm";
-      version = "0.6.0.0";
-      sha256 = "0y2ijxfn8yns6fk87mj7nzlnq5k62mhc5xp8nhzzs5yf2v4p72j6";
+      version = "0.7.0.0";
+      sha256 = "0i0n5vrsz7d8x45lbjzmk1jln368bcz6cy3hn3yaafvhyacqii82";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -645365,6 +649297,7 @@ self: {
         boolexpr
         brick
         brick-list-skip
+        brick-tabular-list
         bytestring
         clock
         colour
@@ -645384,6 +649317,7 @@ self: {
         fused-effects
         fused-effects-lens
         fuzzy
+        generic-data
         githash
         hashable
         hsnoise
@@ -645396,10 +649330,14 @@ self: {
         lsp
         megaparsec
         minimorph
+        monad-logger
+        monoidmap
+        monoidmap-aeson
         mtl
         murmur3
         natural-sort
         nonempty-containers
+        ordered-containers
         palette
         pandoc
         pandoc-types
@@ -645407,11 +649345,12 @@ self: {
         prettyprinter
         random
         scientific
+        servant
         servant-docs
+        servant-JuicyPixels
         servant-multipart
         servant-server
         SHA
-        simple-enumeration
         split
         sqlite-simple
         syb
@@ -645438,10 +649377,17 @@ self: {
         yaml
       ];
       executableHaskellDepends = [
+        aeson
         base
         brick
+        bytestring
+        containers
+        extra
         fused-effects
         githash
+        http-client
+        http-client-tls
+        http-types
         lens
         optparse-applicative
         sqlite-simple
@@ -645471,6 +649417,7 @@ self: {
         mtl
         nonempty-containers
         QuickCheck
+        quickcheck-instances
         SHA
         tasty
         tasty-expected-failure
@@ -645487,6 +649434,7 @@ self: {
         base
         containers
         extra
+        fused-effects
         lens
         mtl
         tasty-bench
@@ -646225,6 +650173,74 @@ self: {
     }
   ) { };
 
+  "sydtest_0_20_0_0" = callPackage (
+    {
+      mkDerivation,
+      async,
+      autodocodec,
+      base,
+      bytestring,
+      containers,
+      deepseq,
+      dlist,
+      fast-myers-diff,
+      filepath,
+      MonadRandom,
+      mtl,
+      opt-env-conf,
+      path,
+      path-io,
+      pretty-show,
+      QuickCheck,
+      quickcheck-io,
+      random,
+      random-shuffle,
+      safe,
+      safe-coloured-text,
+      safe-coloured-text-terminfo,
+      stm,
+      svg-builder,
+      text,
+      vector,
+    }:
+    mkDerivation {
+      pname = "sydtest";
+      version = "0.20.0.0";
+      sha256 = "0f1ipp6wqykkyiibn1prx61ysvydf4bybiqg5mlzgi5h1cnqh22i";
+      libraryHaskellDepends = [
+        async
+        autodocodec
+        base
+        bytestring
+        containers
+        deepseq
+        dlist
+        fast-myers-diff
+        filepath
+        MonadRandom
+        mtl
+        opt-env-conf
+        path
+        path-io
+        pretty-show
+        QuickCheck
+        quickcheck-io
+        random
+        random-shuffle
+        safe
+        safe-coloured-text
+        safe-coloured-text-terminfo
+        stm
+        svg-builder
+        text
+        vector
+      ];
+      description = "A modern testing framework for Haskell with good defaults and advanced testing features";
+      license = "unknown";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "sydtest-aeson" = callPackage (
     {
       mkDerivation,
@@ -649612,6 +653628,8 @@ self: {
       pname = "synthesizer-llvm";
       version = "1.1.0.1";
       sha256 = "166551a0g4m48f0mxccwcrgg488i4v8jpj6rjhd39mh6gxb874yr";
+      revision = "1";
+      editedCabalFile = "1kjiqwmfp2g7mqg6818qdhjjc5lw8hxf895763npjv5dx62b6dc3";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -650630,11 +654648,15 @@ self: {
       bytestring,
       extra,
       gi-ayatana-appindicator3,
-      gi-gdk,
+      gi-gdk3,
       gi-glib,
       gi-gobject,
-      gi-gtk,
+      gi-gtk3,
+      hspec-expectations,
       optparse-applicative,
+      tasty,
+      tasty-autocollect,
+      tasty-hunit-compat,
       text,
       typed-process,
       unliftio,
@@ -650642,26 +654664,42 @@ self: {
     }:
     mkDerivation {
       pname = "systranything";
-      version = "0.1.2.0";
-      sha256 = "1da3zqkknx9yg8spwjpaxx4sizwl598p2dwr2nnrl6dw033c6m1f";
-      isLibrary = false;
+      version = "0.1.3.0";
+      sha256 = "17y8zwbrxmbfr8g7gwbsvhxrwf330l6n2xqm6247ia8k5ap4drfy";
+      isLibrary = true;
       isExecutable = true;
-      executableHaskellDepends = [
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
         aeson
         base
         bytestring
         extra
         gi-ayatana-appindicator3
-        gi-gdk
+        gi-gdk3
         gi-glib
         gi-gobject
-        gi-gtk
-        optparse-applicative
+        gi-gtk3
         text
         typed-process
+      ];
+      executableHaskellDepends = [
+        base
+        gi-glib
+        gi-gtk3
+        optparse-applicative
         unliftio
         yaml
       ];
+      testHaskellDepends = [
+        base
+        hspec-expectations
+        tasty
+        tasty-autocollect
+        tasty-hunit-compat
+        text
+        yaml
+      ];
+      testToolDepends = [ tasty-autocollect ];
       description = "Let you put anything in the system tray";
       license = lib.licenses.mit;
       hydraPlatforms = lib.platforms.none;
@@ -651638,10 +655676,8 @@ self: {
     }:
     mkDerivation {
       pname = "tagged-identity";
-      version = "0.1.4";
-      sha256 = "0mq4q4i16lzm1d0ckarwjk2a47y28lfrv0hc31y0xblb9q50xxwl";
-      revision = "1";
-      editedCabalFile = "03r7ys57zbyadkka5rzb418y5ksb88nnmvxjs58j0pmp71h0zfa6";
+      version = "0.1.5";
+      sha256 = "1n8zfgb80856rhizkclq6bfdcixbi0ymvx0f508x70crrvk38xdv";
       libraryHaskellDepends = [
         base
         mtl
@@ -654888,8 +658924,8 @@ self: {
       pname = "tasty";
       version = "1.5.3";
       sha256 = "10076vlklbcyiz7plakrihava5sy3dvwhskjldqzhfl18jvcg82l";
-      revision = "1";
-      editedCabalFile = "1l7nwf37v29qb1m2q3264473dzhvr6r764skzi9whkr7pjfylmlx";
+      revision = "2";
+      editedCabalFile = "04llcf1i3gawdik0bjhxdgls2wkiqlx0gi76nfh784nv2qzxlpbb";
       libraryHaskellDepends = [
         ansi-terminal
         base
@@ -655292,63 +659328,6 @@ self: {
   ) { };
 
   "tasty-discover" = callPackage (
-    {
-      mkDerivation,
-      base,
-      bytestring,
-      containers,
-      filepath,
-      Glob,
-      hedgehog,
-      hspec,
-      hspec-core,
-      tasty,
-      tasty-golden,
-      tasty-hedgehog,
-      tasty-hspec,
-      tasty-hunit,
-      tasty-quickcheck,
-      tasty-smallcheck,
-    }:
-    mkDerivation {
-      pname = "tasty-discover";
-      version = "5.0.1";
-      sha256 = "143d0bcbvnvybbgrfdjr0wqmpdghjkn1297qmxk5ji33r8pqf4wc";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        base
-        containers
-        filepath
-        Glob
-        tasty
-      ];
-      executableHaskellDepends = [
-        base
-        filepath
-      ];
-      testHaskellDepends = [
-        base
-        bytestring
-        containers
-        hedgehog
-        hspec
-        hspec-core
-        tasty
-        tasty-golden
-        tasty-hedgehog
-        tasty-hspec
-        tasty-hunit
-        tasty-quickcheck
-        tasty-smallcheck
-      ];
-      description = "Test discovery for the tasty framework";
-      license = lib.licenses.mit;
-      mainProgram = "tasty-discover";
-    }
-  ) { };
-
-  "tasty-discover_5_0_2" = callPackage (
     {
       mkDerivation,
       base,
@@ -655401,7 +659380,6 @@ self: {
       ];
       description = "Test discovery for the tasty framework";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "tasty-discover";
     }
   ) { };
@@ -655614,8 +659592,8 @@ self: {
       pname = "tasty-golden-extra";
       version = "0.1.0.0";
       sha256 = "1bfd9ql3pws2vd37nbc5a8b49p7zbq3n48slxkrrwx1szaxkp8nj";
-      revision = "2";
-      editedCabalFile = "1vj6yr1ysnn5x76r3j824gdny121z69vr9367yi3mp4jxl1w44kw";
+      revision = "3";
+      editedCabalFile = "1hdkxsn075bc6f318vk81bddagxsyp390604v3azskfp52bwbl8r";
       libraryHaskellDepends = [
         aeson
         aeson-diff
@@ -655833,8 +659811,8 @@ self: {
       pname = "tasty-hspec";
       version = "1.2.0.4";
       sha256 = "1hk1nkjvhp89xxgzj6dhbgw0fknnghpng6afq4i39hjkwv5p78ni";
-      revision = "6";
-      editedCabalFile = "1i2zj9q7lxiaqs8mlwhw72ar7bnkr5k5y99pjalaisb6hp9380ds";
+      revision = "7";
+      editedCabalFile = "0s1y34i8g7fva0z10ws3ipcy2jmlvqk0v4hdbx8rqnby5n0l5kay";
       libraryHaskellDepends = [
         base
         hspec
@@ -656294,14 +660272,11 @@ self: {
       QuickCheck,
       tasty,
       tasty-hunit,
-      text,
     }:
     mkDerivation {
       pname = "tasty-lua";
-      version = "1.1.1";
-      sha256 = "186322a9gwndnpis4r7nzlca4iymrz712bbbxpm0pxsw63xary06";
-      revision = "1";
-      editedCabalFile = "180jy8dhr7mdfgj5xgnwddm5lh8ahbvs78y07g9zgpsxkdnm5ghn";
+      version = "1.1.1.1";
+      sha256 = "03b2n3gw2w70cnl57w3sh3cv5ka270sf07jlxpb4zs0z5gh83p1r";
       libraryHaskellDepends = [
         base
         bytestring
@@ -656311,11 +660286,9 @@ self: {
         lua-arbitrary
         QuickCheck
         tasty
-        text
       ];
       testHaskellDepends = [
         base
-        bytestring
         directory
         filepath
         hslua-core
@@ -656585,8 +660558,8 @@ self: {
       pname = "tasty-quickcheck";
       version = "0.11.1";
       sha256 = "0si4ccgqlv8h33d6310rrqba7f4pz3g8cinqfj42yd7damsdxm73";
-      revision = "1";
-      editedCabalFile = "0l4ck9xqbylrdhyi0gwvws7jakn3qcyd146g9wwcqmjryzkzpj68";
+      revision = "3";
+      editedCabalFile = "1wzvha4xam8npx5mk33c056grmrqnjd6m38nnm6d7y99w2mn1a7w";
       libraryHaskellDepends = [
         base
         optparse-applicative
@@ -656658,6 +660631,8 @@ self: {
       pname = "tasty-rerun";
       version = "1.1.20";
       sha256 = "0px58jm1yqbg32qf2s0yk09d2qdjxkkz9df89f31q3nzw85jv2ky";
+      revision = "1";
+      editedCabalFile = "13xmx91hp7i0qzrhada9ckliqkynwlwa8x6pjbvxjcy1y0qsd7hk";
       libraryHaskellDepends = [
         base
         containers
@@ -657074,8 +661049,8 @@ self: {
       pname = "tasty-wai";
       version = "0.1.2.0";
       sha256 = "18yw2qzzg969c99rpa8p154hxbm9i4iq64pma3jkr2gfdm6j4vvg";
-      revision = "2";
-      editedCabalFile = "140kajnwrk614hswxyjymgpzy61m6riv5s25p4zkgv8aa1yhbk06";
+      revision = "3";
+      editedCabalFile = "0jxvhn4yasi1cl9rxwfpsdjh0bz79i4javy9qf4hqi7vzzxll6i4";
       libraryHaskellDepends = [
         base
         bytestring
@@ -657145,20 +661120,18 @@ self: {
       base,
       dollaridoos,
       profunctors,
-      semigroups,
     }:
     mkDerivation {
       pname = "tax";
-      version = "0.2.0.0";
-      sha256 = "13911rksr268v2jbdm7kkwlglni7s8lb417lryr7m2x9vfg31jqb";
+      version = "0.2.1.0";
+      sha256 = "1cgfvfi89rv4c12754hsah13ggfhq1hk4axs3sz7dvdwlw25swxr";
       libraryHaskellDepends = [
         base
         dollaridoos
         profunctors
-        semigroups
       ];
       description = "Types and combinators for taxes";
-      license = lib.licenses.agpl3Only;
+      license = lib.licenses.agpl3Plus;
     }
   ) { };
 
@@ -657173,8 +661146,8 @@ self: {
     }:
     mkDerivation {
       pname = "tax-ato";
-      version = "2024.1.0.1";
-      sha256 = "1mggzkkd4sxf7bccqwpz49jgxh36mbixl95j2sbsnyac91kgkmxa";
+      version = "2025.1";
+      sha256 = "0xg8wl83cgla3v2bjx4sk4szlyxam1223xrsa6v6ggwiqm9la5sq";
       libraryHaskellDepends = [
         base
         lens
@@ -658837,8 +662810,8 @@ self: {
     }:
     mkDerivation {
       pname = "telescope";
-      version = "0.3.0";
-      sha256 = "06hfflc1ala8b8zm0838yrd51lwj5bqg1qdqwn9fs0hr1jp5nx1r";
+      version = "0.4.0";
+      sha256 = "13bls8czlwk6df5p5i37cs4sdf0wmz4w4bnjjhpf8kk7bnglpr97";
       libraryHaskellDepends = [
         base
         binary
@@ -661713,6 +665686,8 @@ self: {
       pname = "test-framework";
       version = "0.8.2.2";
       sha256 = "04ijf5x6xx8i5lqv9ir33zs1rfzc4qkwwz8c1fdycnzvydcv4dnp";
+      revision = "1";
+      editedCabalFile = "1yv1qsr6bxphxk9430id9bqhfmkffdqmfg0k017dp9pnn4pqj0zh";
       libraryHaskellDepends = [
         ansi-terminal
         ansi-wl-pprint
@@ -661922,6 +665897,8 @@ self: {
       pname = "test-framework-quickcheck2";
       version = "0.3.0.6";
       sha256 = "1d0w2q9sm8aayk0aj1zr2irpnqwpzixn6pdfq1i904vs1kkb2xin";
+      revision = "1";
+      editedCabalFile = "1af2gw9gvq143jdqmsnxj23cgss9ffdyr67951a5x151aps04y7z";
       libraryHaskellDepends = [
         base
         extensible-exceptions
@@ -664062,6 +668039,36 @@ self: {
     }
   ) { };
 
+  "text-convert" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      hspec,
+      QuickCheck,
+      text,
+    }:
+    mkDerivation {
+      pname = "text-convert";
+      version = "0.1.0.1";
+      sha256 = "1jwckq3y4c964kviqrbk1x1gvp6hl97mb4pgl140cgh5nvz58dvl";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        text
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        hspec
+        QuickCheck
+        text
+      ];
+      description = "Convert between various textual representations";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   "text-cp437" = callPackage (
     {
       mkDerivation,
@@ -664131,6 +668138,60 @@ self: {
     }
   ) { };
 
+  "text-encode" = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      casing,
+      cassava,
+      http-api-data,
+      http-types,
+      persistent,
+      postgresql-simple,
+      sqlite-simple,
+      text,
+      text-convert,
+    }:
+    mkDerivation {
+      pname = "text-encode";
+      version = "0.2.0.0";
+      sha256 = "0512n1l1xfnzknm4c917n7wylhh52jsk7szxy6fcb6dvl2cr9v41";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        casing
+        cassava
+        http-api-data
+        http-types
+        persistent
+        postgresql-simple
+        sqlite-simple
+        text
+        text-convert
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        casing
+        cassava
+        http-api-data
+        http-types
+        persistent
+        postgresql-simple
+        sqlite-simple
+        text
+        text-convert
+      ];
+      doHaddock = false;
+      description = "Classes and newtypes for deriving uniform textual encodings";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   "text-format" = callPackage (
     {
       mkDerivation,
@@ -665431,10 +669492,8 @@ self: {
     }:
     mkDerivation {
       pname = "text-show";
-      version = "3.11.1";
-      sha256 = "18n4smbwwh9as0kpm2c18153y6lj5pbk2hy6ra9im0fwqk7xan6x";
-      revision = "1";
-      editedCabalFile = "1g96fwpf0y8hqbjiqdxz4ayyh9qwhacfynkmij80dksk7qxzwxml";
+      version = "3.11.2";
+      sha256 = "10nm8kj524hkl65qvxkrjjyykzgj85n3p96gv7zc7j3x90v9g1z2";
       libraryHaskellDepends = [
         array
         base
@@ -665526,8 +669585,8 @@ self: {
       pname = "text-show-instances";
       version = "3.9.10";
       sha256 = "09cb391gi0hgkjk4ap4d83vg13lczrghmb9db96a4ckw1bp9pbc1";
-      revision = "3";
-      editedCabalFile = "1ghlw5jwcxpclsvffn51lhc4i7mljg0jczg78kjghwnv0prjm8r8";
+      revision = "4";
+      editedCabalFile = "1k5h1lqc8z593cwnmy2yngh3nlq2b4zfbjwkmyqddg192xia8bbh";
       libraryHaskellDepends = [
         aeson
         base
@@ -670247,6 +674306,77 @@ self: {
     }
   ) { };
 
+  "tidal_1_10_0" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      clock,
+      colour,
+      containers,
+      criterion,
+      deepseq,
+      exceptions,
+      hosc,
+      hspec,
+      mtl,
+      network,
+      parsec,
+      primitive,
+      random,
+      text,
+      tidal-core,
+      tidal-link,
+      transformers,
+      weigh,
+    }:
+    mkDerivation {
+      pname = "tidal";
+      version = "1.10.0";
+      sha256 = "07ky2bj0hfm734sf4c2pymxlxs0rmgdd13q7fmb390p5m5fbxy54";
+      revision = "2";
+      editedCabalFile = "0pka2nxlmf2sh3c4cmpjzb9zmcmhqhf5bz8qprcmxvmzkwm5a4yz";
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        base
+        bytestring
+        clock
+        colour
+        containers
+        deepseq
+        exceptions
+        hosc
+        mtl
+        network
+        parsec
+        primitive
+        random
+        text
+        tidal-core
+        tidal-link
+        transformers
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        deepseq
+        hosc
+        hspec
+        parsec
+        tidal-core
+      ];
+      benchmarkHaskellDepends = [
+        base
+        criterion
+        tidal-core
+        weigh
+      ];
+      description = "Pattern language for improvised music";
+      license = lib.licenses.gpl3Only;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   "tidal-core" = callPackage (
     {
       mkDerivation,
@@ -670254,14 +674384,14 @@ self: {
       colour,
       containers,
       deepseq,
-      microspec,
+      hspec,
       parsec,
       text,
     }:
     mkDerivation {
       pname = "tidal-core";
-      version = "1.9.6";
-      sha256 = "0lny9f5crvx61cwlwbfl7xj34i2gl4j9wlvba8ga82hhysyxzg3i";
+      version = "1.10.0";
+      sha256 = "1dg6z0z52zxrqai4jfgqrp4ghsdkcflixwspcbnyrxq1d4jw0zdf";
       libraryHaskellDepends = [
         base
         colour
@@ -670274,7 +674404,7 @@ self: {
         base
         containers
         deepseq
-        microspec
+        hspec
       ];
       description = "Core pattern library for TidalCycles, a pattern language for improvised music";
       license = lib.licenses.gpl3Only;
@@ -670304,7 +674434,7 @@ self: {
     }
   ) { };
 
-  "tidal-link_1_1_0" = callPackage (
+  "tidal-link_1_2_0" = callPackage (
     {
       mkDerivation,
       base,
@@ -670315,8 +674445,8 @@ self: {
     }:
     mkDerivation {
       pname = "tidal-link";
-      version = "1.1.0";
-      sha256 = "0qd157gxdb06dwpmsimp9w49lqbpp93ms4bmxn1xwz3p2dhcwbrj";
+      version = "1.2.0";
+      sha256 = "15sqmdafz8ha2rlk4k327pjfc2kpcvq211avchanmmlvn7dflvsv";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -670636,6 +674766,8 @@ self: {
       pname = "tiktoken";
       version = "1.0.3";
       sha256 = "0hy3y9rdgjirk8ji7458qnc7h9d2b6yipfri25qkay96kq91kmj6";
+      revision = "1";
+      editedCabalFile = "0pwxqznjqbdsy99g4l1cyx8anns7wr92kpnbh19y9y99f1913jbn";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         base
@@ -676915,6 +681047,7 @@ self: {
   "tools-yj" = callPackage (
     {
       mkDerivation,
+      array,
       base,
       bytestring,
       containers,
@@ -676925,9 +681058,10 @@ self: {
     }:
     mkDerivation {
       pname = "tools-yj";
-      version = "0.1.0.27";
-      sha256 = "1blcyq5ihqk2kidvywvv187jqgisnnak6rgp2jhw7zbpd4da7hs8";
+      version = "0.1.0.45";
+      sha256 = "04n78afz82kmpyffy8vilfdw584qhhb5bfm3p1rnv9bjnrqv7jxn";
       libraryHaskellDepends = [
+        array
         base
         bytestring
         containers
@@ -676937,6 +681071,7 @@ self: {
         text
       ];
       testHaskellDepends = [
+        array
         base
         bytestring
         containers
@@ -676950,45 +681085,6 @@ self: {
     }
   ) { };
 
-  "tools-yj_0_1_0_30" = callPackage (
-    {
-      mkDerivation,
-      base,
-      bytestring,
-      containers,
-      data-default,
-      mono-traversable,
-      stm,
-      text,
-    }:
-    mkDerivation {
-      pname = "tools-yj";
-      version = "0.1.0.30";
-      sha256 = "0dd7l31p74h0nqszv4095zdp5lmjg8s9sxsn59da808f8z1pzf41";
-      libraryHaskellDepends = [
-        base
-        bytestring
-        containers
-        data-default
-        mono-traversable
-        stm
-        text
-      ];
-      testHaskellDepends = [
-        base
-        bytestring
-        containers
-        data-default
-        mono-traversable
-        stm
-        text
-      ];
-      description = "Tribial tools";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-    }
-  ) { };
-
   "toolshed" = callPackage (
     {
       mkDerivation,
@@ -678255,8 +682351,8 @@ self: {
     }:
     mkDerivation {
       pname = "trace-embrace";
-      version = "1.0.11";
-      sha256 = "0cnbw0yxaq3lpq8z66fkjsr3d9dss66l837mnbicfksbsn27m22i";
+      version = "1.2.0";
+      sha256 = "05wgj9pf9vqafa1h7sbjxzy2lx213qwrpr4f2dq7s7i2l9hf2a3k";
       libraryHaskellDepends = [
         aeson
         base
@@ -678279,6 +682375,7 @@ self: {
         yaml
       ];
       testHaskellDepends = [
+        aeson
         base
         bytestring
         containers
@@ -681641,8 +685738,8 @@ self: {
       pname = "trial-optparse-applicative";
       version = "0.0.0.0";
       sha256 = "1h8pfznf1dp9z3r2kl2ljgmxxkfp3va9yqba00fyvw85lna2aggn";
-      revision = "4";
-      editedCabalFile = "05rzzcsqvhil7wbsz23syd35h9jqbmmabx89v3h86ng7my3w1nc1";
+      revision = "5";
+      editedCabalFile = "0jvl3q2lh134z1r9zq2acpsilbjzpjia3xdh51szp6r708jnlpg1";
       libraryHaskellDepends = [
         base
         optparse-applicative
@@ -688891,6 +692988,7 @@ self: {
       dlist,
       hspec,
       hspec-discover,
+      safe,
       template-haskell,
       text,
       th-data-compat,
@@ -688899,8 +692997,8 @@ self: {
     }:
     mkDerivation {
       pname = "typesafe-precure";
-      version = "0.11.1.1";
-      sha256 = "0zg4wwp5asnzz0n2yhrqb825dldr57m1j6w0l3sdxsi4jmibs4bj";
+      version = "0.12.0.1";
+      sha256 = "1cl6dq9mdm3caw3zzwpw7vcyv41apk0d0fxrxrm7d0vp4wvjckff";
       libraryHaskellDepends = [
         aeson
         aeson-pretty
@@ -688908,6 +693006,7 @@ self: {
         base
         bytestring
         dlist
+        safe
         template-haskell
         text
         th-data-compat
@@ -690799,6 +694898,39 @@ self: {
     }
   ) { };
 
+  "uku" = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      ilist,
+      protolude,
+      text,
+    }:
+    mkDerivation {
+      pname = "uku";
+      version = "0.0.2.0";
+      sha256 = "16hgrnhiy3xy3qizg9xpb6br7rqcwrxjxr750bcs9yds35lwqlpf";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        containers
+        ilist
+        protolude
+        text
+      ];
+      executableHaskellDepends = [
+        base
+        protolude
+        text
+      ];
+      description = "Display Ukulele fingering charts in the terminal";
+      license = lib.licenses.isc;
+      mainProgram = "uku";
+    }
+  ) { };
+
   "ulid" = callPackage (
     {
       mkDerivation,
@@ -694714,6 +698846,8 @@ self: {
       pname = "unix";
       version = "2.8.7.0";
       sha256 = "10zv2vcq82vv56hll5mpvfwfsx6ymp2f75fwxvp5a1xgbafqgpfb";
+      revision = "1";
+      editedCabalFile = "1mvyq9qajqhjrv8m3zch07v8h0b3i4fj40d8jfcpbmqsq6h8sa9d";
       libraryHaskellDepends = [
         base
         bytestring
@@ -695025,8 +699159,8 @@ self: {
     }:
     mkDerivation {
       pname = "unix-time";
-      version = "0.4.16";
-      sha256 = "1s9qws7z2z9d9ayljz98zdlsja3zvrbcb00n4arzwi3kdl9agqmc";
+      version = "0.4.17";
+      sha256 = "130z416958xqd6yvjidmm66674y9vkwgxj965kvwhnncbnz0afpn";
       libraryHaskellDepends = [
         base
         binary
@@ -696425,6 +700559,29 @@ self: {
     }
   ) { };
 
+  "unzip-traversable" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bifunctors,
+    }:
+    mkDerivation {
+      pname = "unzip-traversable";
+      version = "0.1.1";
+      sha256 = "0p5pf6rii89y9skms9a4qblj43b92bzym688q01w7zsa8y16dgv8";
+      libraryHaskellDepends = [
+        base
+        bifunctors
+      ];
+      testHaskellDepends = [
+        base
+        bifunctors
+      ];
+      description = "Unzip functions for general Traversable containers";
+      license = lib.licenses.bsd2;
+    }
+  ) { };
+
   "uom-plugin" = callPackage (
     {
       mkDerivation,
@@ -698883,8 +703040,8 @@ self: {
     }:
     mkDerivation {
       pname = "utxorpc";
-      version = "0.0.16.0";
-      sha256 = "0jhk3x5qbp2rvknbir8s6y4vq8sy5qcs0p9md1g8kbi872ipglng";
+      version = "0.0.17.0";
+      sha256 = "1jzb0v8gjy15b97a66gmjaxxf3mcxwigaavl5cnzga5z9kz8pyw1";
       libraryHaskellDepends = [
         base
         proto-lens
@@ -701486,6 +705643,36 @@ self: {
     }
   ) { };
 
+  "variety" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      exact-combinatorics,
+      HUnit,
+      QuickCheck,
+    }:
+    mkDerivation {
+      pname = "variety";
+      version = "0.1.0.2";
+      sha256 = "0bzavj283kraw1ffx1fi5ihxvk168mqs1s6j6vpl7qmxc0zmrn5a";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        exact-combinatorics
+      ];
+      testHaskellDepends = [
+        base
+        HUnit
+        QuickCheck
+      ];
+      description = "integer arithmetic codes";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   "vary" = callPackage (
     {
       mkDerivation,
@@ -701504,8 +705691,8 @@ self: {
     }:
     mkDerivation {
       pname = "vary";
-      version = "0.1.1.2";
-      sha256 = "1snil2rmlhbjrlazjycririwr9w4irznf5g4mgmjadb0xny9gwyx";
+      version = "0.1.1.3";
+      sha256 = "1rw05k5v0idr1ypcmfp7xxyqdaff12yc3x8csv2flspwmyvvlsn3";
       libraryHaskellDepends = [
         aeson
         base
@@ -701987,8 +706174,8 @@ self: {
     }:
     mkDerivation {
       pname = "vcr";
-      version = "0.0.0";
-      sha256 = "0h3rjrncjhh8b0lhpj3ilz8dqfrw3qj1qr7q9vpa098nkkvfyqxf";
+      version = "0.1.0";
+      sha256 = "1s6gp1m84izlsvw5z7ll39mw2r456xmbh7cx53f8gkwl2m2pyyrq";
       libraryHaskellDepends = [
         async
         base
@@ -703043,8 +707230,8 @@ self: {
     }:
     mkDerivation {
       pname = "vector-hashtables";
-      version = "0.1.2.0";
-      sha256 = "1s0c3d4f61rgvb0i8c2m3lazxbxg2cpv1pq4k4lnr7nga7sama9r";
+      version = "0.1.2.1";
+      sha256 = "1cdfvrpnia7bgqaw8yg0n23svbsdz72gss0hrkrvc5rwzxwhz49k";
       libraryHaskellDepends = [
         base
         hashable
@@ -703110,8 +707297,8 @@ self: {
     }:
     mkDerivation {
       pname = "vector-instances";
-      version = "3.4.2";
-      sha256 = "0rynfy4agx66mwslj50bfqdyrylr2zba3r6dg5yqykpnfxp2vn9l";
+      version = "3.4.3";
+      sha256 = "1ajc65vj5j02qzfx11zvgmfx4lh5r99h4hg8wacdkyk1vw1rh9b7";
       libraryHaskellDepends = [
         base
         comonad
@@ -703526,8 +707713,8 @@ self: {
     }:
     mkDerivation {
       pname = "vector-split";
-      version = "1.0.0.3";
-      sha256 = "1y2imndpyx15jmiajhabi34522jcayrz05zrxiv1srj4fssz56bd";
+      version = "1.0.0.4";
+      sha256 = "1m5b0v9izczkh3860a0l0lbwcygv9kf30552941gfmv8k931zq4d";
       libraryHaskellDepends = [
         base
         vector
@@ -704588,10 +708775,11 @@ self: {
     }:
     mkDerivation {
       pname = "vext";
-      version = "0.1.7.0";
-      sha256 = "0ynwgb2d3xs6qn99qhdz417p1pjc6y1mjllk6v17rvxiim88yd36";
+      version = "0.1.8.0";
+      sha256 = "05mw1mijpm1k7hjsr5xx6nwk2ipk2ghi8n1m60zarhlqwmbcvjms";
       libraryHaskellDepends = [
         base
+        byteslice
         natural-arithmetic
         primitive
         run-st
@@ -707323,58 +711511,6 @@ self: {
   ) { };
 
   "vty-windows" = callPackage (
-    {
-      mkDerivation,
-      base,
-      blaze-builder,
-      bytestring,
-      containers,
-      deepseq,
-      directory,
-      filepath,
-      microlens,
-      microlens-mtl,
-      microlens-th,
-      mtl,
-      parsec,
-      stm,
-      transformers,
-      utf8-string,
-      vector,
-      vty,
-      Win32,
-    }:
-    mkDerivation {
-      pname = "vty-windows";
-      version = "0.2.0.3";
-      sha256 = "12f91izwg4r18zvdbnkwd8jk7agdyy3w3bcljrm92hib43i210id";
-      libraryHaskellDepends = [
-        base
-        blaze-builder
-        bytestring
-        containers
-        deepseq
-        directory
-        filepath
-        microlens
-        microlens-mtl
-        microlens-th
-        mtl
-        parsec
-        stm
-        transformers
-        utf8-string
-        vector
-        vty
-        Win32
-      ];
-      description = "Windows backend for Vty";
-      license = lib.licenses.bsd3;
-      platforms = lib.platforms.windows;
-    }
-  ) { };
-
-  "vty-windows_0_2_0_4" = callPackage (
     {
       mkDerivation,
       base,
@@ -707423,7 +711559,6 @@ self: {
       description = "Windows backend for Vty";
       license = lib.licenses.bsd3;
       platforms = lib.platforms.windows;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -712989,8 +717124,8 @@ self: {
     }:
     mkDerivation {
       pname = "warp";
-      version = "3.4.7";
-      sha256 = "1s0kynqliqwn79gydrdxsgfdw6qffs5fmvhmxiydc379fxf07k7s";
+      version = "3.4.8";
+      sha256 = "0l67bz23l5sbhsmi9pz5vr0cf2mkkzpl0gjkf9309g0lxfq0mpyl";
       libraryHaskellDepends = [
         array
         async
@@ -713169,8 +717304,8 @@ self: {
     }:
     mkDerivation {
       pname = "warp-quic";
-      version = "0.0.2";
-      sha256 = "1hb9xv5v7l1iwhv7qgm9y3prrjkpvcd5snmw6xc9wsk3fr82xl1r";
+      version = "0.0.3";
+      sha256 = "0vbgbvkl5j8x0lrz568cd2viq0vl5dwzavfincz7a01v5w90qr9c";
       libraryHaskellDepends = [
         base
         bytestring
@@ -713244,8 +717379,8 @@ self: {
       pname = "warp-systemd";
       version = "0.3.0.0";
       sha256 = "1yvkg49wla7axk8vdh5c7d0pxlhyb66ka0xiqi6a3ra3zmw5xi3c";
-      revision = "2";
-      editedCabalFile = "09pkrig9xq95k3n1yrhfcfa8i3dkdim4nd03mgm22523jk9b3hbw";
+      revision = "3";
+      editedCabalFile = "1rb5qgfvyblpj15ikrlngyc87wdbp6xp90r7v7gyczshgdhnsg8d";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -713631,8 +717766,8 @@ self: {
     }:
     mkDerivation {
       pname = "waterfall-cad";
-      version = "0.5.0.1";
-      sha256 = "1869qwkbi3mlvciz916y6hv6l4h7z16fflf9xac4i0p9frly50jg";
+      version = "0.5.1.0";
+      sha256 = "173pv3a7n3jcf4j2jb7sirdib0x850qsifhlz858bkzamhqlxkr8";
       libraryHaskellDepends = [
         base
         filepath
@@ -713666,8 +717801,8 @@ self: {
     }:
     mkDerivation {
       pname = "waterfall-cad-examples";
-      version = "0.5.0.1";
-      sha256 = "1k9qs6jnh23d1r9xdpc07002a89rwn1zy5lgvbvlmmlsjny3v7fv";
+      version = "0.5.1.0";
+      sha256 = "0vrlhgvbkwgk2nvmw8h6sg3fygi3sxs7qllyvwkzzs91kavnkb4d";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -713720,8 +717855,8 @@ self: {
     }:
     mkDerivation {
       pname = "waterfall-cad-svg";
-      version = "0.5.0.1";
-      sha256 = "0vyq23iryzsqjjdyb9ws5jbjm3rkb00ssmabnzx6vlnvzf5cfb1s";
+      version = "0.5.1.0";
+      sha256 = "1gjm36f7w3xf7q8gfm6xk5ssj594z45vfkqkr3x9rgny8rn7w3p5";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -714192,6 +718327,7 @@ self: {
       attoparsec,
       base,
       bytestring,
+      directory,
       hspec,
       http-client,
       QuickCheck,
@@ -714200,12 +718336,13 @@ self: {
     }:
     mkDerivation {
       pname = "web-cookiejar";
-      version = "0.1.0.0";
-      sha256 = "0hc9cpqs2h7kcxlrvlsmqm7xxq1cdi7zax3c7md5ldbzgzwiwr28";
+      version = "0.1.3.0";
+      sha256 = "0n8r23nk89hlp5z5zirj2yng818fba39f5yz0l351z7rpx0pi8vy";
       libraryHaskellDepends = [
         attoparsec
         base
         bytestring
+        directory
         http-client
         time
       ];
@@ -715810,8 +719947,8 @@ self: {
     }:
     mkDerivation {
       pname = "webauthn";
-      version = "0.10.0.0";
-      sha256 = "0ndgwv8d7yndl9kb4fzvfp5wrz1pfshsp2xwhwnynd2a9mz3yqwp";
+      version = "0.11.0.0";
+      sha256 = "11fah0xsblggpnviggzpz18y8snhyn6wm7hng8665d7s4ylr9z4w";
       libraryHaskellDepends = [
         aeson
         asn1-encoding
@@ -716766,8 +720903,8 @@ self: {
     }:
     mkDerivation {
       pname = "webfinger-client";
-      version = "0.2.2.0";
-      sha256 = "0i8gixjsz6hw77gplrk26d15m6d3ddm1ac2hgcmv641msvbfr9p2";
+      version = "0.2.2.1";
+      sha256 = "0rwfzjgx8g2ic6763sbv9ybnkcg84kgmmvw476sswaw2338spwd0";
       libraryHaskellDepends = [
         aeson
         base
@@ -717771,8 +721908,8 @@ self: {
       pname = "websockets";
       version = "0.13.0.0";
       sha256 = "1da95b71akggyikbxdmja3gcaqrz8sp6ri5jrsyavc2ickvi9y4s";
-      revision = "4";
-      editedCabalFile = "1g6f94cn20a4073cbinv2sfwglbqlpjxgzgj7svi6ff4vkfn0ins";
+      revision = "5";
+      editedCabalFile = "0nm0lj8cv5z5y2d0bz0rfl3bz100swhind4wn95b7q2ma2x80dlv";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -719672,8 +723809,8 @@ self: {
     }:
     mkDerivation {
       pname = "wide-word";
-      version = "0.1.7.0";
-      sha256 = "01rx0bcc6kanyjp1vf9icymdgkmsx279m7rby2gpb1w0d6swnss8";
+      version = "0.1.7.1";
+      sha256 = "1h42k00inir628qb2r8966bhn354bnkgadpx5fgm6g1kh879y15a";
       libraryHaskellDepends = [
         base
         binary
@@ -720245,8 +724382,8 @@ self: {
     }:
     mkDerivation {
       pname = "wild-bind";
-      version = "0.1.2.11";
-      sha256 = "0mdwx0qwlmm22pajvg5s3rzm6xf83z14lfxwbwh8fiphxlgyhnin";
+      version = "0.1.2.12";
+      sha256 = "1bjm2vxa6xg7j6wl28rg8djxabpjss22z1w1ymlm2lw5fb148frn";
       libraryHaskellDepends = [
         base
         containers
@@ -722507,6 +726644,8 @@ self: {
       pname = "word8set";
       version = "0.1.2";
       sha256 = "0jbr571rxw0vxxc95568kdxrw9d0kk6np9wrwjd6rj6ybh532zr7";
+      revision = "1";
+      editedCabalFile = "1w3w1f8kig5mvrl06y5f48lrr44zxwa0w8lvwa6vks4fvv1ia0lj";
       libraryHaskellDepends = [
         base
         deepseq
@@ -724704,33 +728843,37 @@ self: {
       aeson,
       base,
       binary,
-      binary-parsers,
       bytestring,
       network,
+      postgresql-simple,
       text,
       time,
     }:
     mkDerivation {
       pname = "wsjtx-udp";
-      version = "0.1.3.5";
-      sha256 = "1x2975pj2i0c4w1s00s4qc24sa24y29magilfxbhy8v1w1hfqcv7";
+      version = "0.5.0.0";
+      sha256 = "0fz92fjynvaz73i8v229ibj9z7bjjc4v467hmakc1v7xcjdxajj7";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         aeson
         base
         binary
-        binary-parsers
         bytestring
         network
         text
         time
       ];
-      executableHaskellDepends = [ base ];
+      executableHaskellDepends = [
+        aeson
+        base
+        bytestring
+        network
+        postgresql-simple
+      ];
       description = "WSJT-X UDP protocol";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
-      mainProgram = "wsjtx-dump-udp";
       broken = true;
     }
   ) { };
@@ -726164,6 +730307,35 @@ self: {
     }
   ) { };
 
+  "xcframework" = callPackage (
+    {
+      mkDerivation,
+      base,
+      Cabal,
+      Cabal-hooks,
+      directory,
+      filepath,
+      process,
+      temporary,
+    }:
+    mkDerivation {
+      pname = "xcframework";
+      version = "0.1.0.0";
+      sha256 = "1pzgkijqmws848z5m6zizsywxydwxl3vzh47z4qjdy2b8z8m0qk0";
+      libraryHaskellDepends = [
+        base
+        Cabal
+        Cabal-hooks
+        directory
+        filepath
+        process
+        temporary
+      ];
+      description = "Cabal hooks for producing an XCFramework from a Haskell library";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   "xchat-plugin" = callPackage (
     {
       mkDerivation,
@@ -726548,6 +730720,47 @@ self: {
     }
   ) { };
 
+  "xenomorph" = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      hspec,
+      hspec-discover,
+      html-entities,
+      text,
+      unordered-containers,
+      vector,
+      xeno,
+    }:
+    mkDerivation {
+      pname = "xenomorph";
+      version = "0.0.1.0";
+      sha256 = "1c7pdqk7758jzgfcmv2q6gbp9gwh1ka6hkfggiw5xmc2nky084bv";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        html-entities
+        text
+        unordered-containers
+        vector
+        xeno
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        hspec
+        html-entities
+        text
+        unordered-containers
+        vector
+        xeno
+      ];
+      testToolDepends = [ hspec-discover ];
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   "xenstore" = callPackage (
     {
       mkDerivation,
@@ -728261,8 +732474,8 @@ self: {
       pname = "xml-lens";
       version = "0.3.1";
       sha256 = "0i6c4xqacinhxnyszzna7s9x79rrcs1c7jq6zimcwh4302l5d6cm";
-      revision = "3";
-      editedCabalFile = "1zwkii9klqaknnf06h56nvh9090xczqff1mq89mq7wk9y585qd3s";
+      revision = "4";
+      editedCabalFile = "1zicqdzvca53rg2ai14nkyq1f46w6kz6bd4mjmqzx778xn17d22f";
       libraryHaskellDepends = [
         base
         case-insensitive
@@ -729528,8 +733741,8 @@ self: {
         }:
         mkDerivation {
           pname = "xmobar";
-          version = "0.49";
-          sha256 = "0mw01jxkcvm186csg71y21zig9rkxkp304i3ym4pgr3rilhp3p5z";
+          version = "0.50";
+          sha256 = "026s0q718z89vzjgva19vg58dm1l016i67mzi0wbj7kgai89w909";
           configureFlags = [
             "-fwith_alsa"
             "-fwith_conduit"
@@ -730351,6 +734564,8 @@ self: {
       pname = "xor";
       version = "0.0.1.3";
       sha256 = "12hqm6imp3qvnnrkds77jsi0zx2dza1h9g88adnxiksv62fybymv";
+      revision = "1";
+      editedCabalFile = "0n0mdli5qypi9khk42lqqkn464w22vjwx0dg2dg6mvdq0r37qwab";
       libraryHaskellDepends = [
         base
         bytestring
@@ -739762,7 +743977,7 @@ self: {
     }
   ) { };
 
-  "yesod-test_1_6_19" = callPackage (
+  "yesod-test_1_6_23" = callPackage (
     {
       mkDerivation,
       aeson,
@@ -739776,6 +743991,7 @@ self: {
       conduit,
       containers,
       cookie,
+      directory,
       hspec,
       hspec-core,
       html-conduit,
@@ -739785,6 +744001,7 @@ self: {
       mtl,
       network,
       pretty-show,
+      process,
       text,
       time,
       transformers,
@@ -739799,8 +744016,8 @@ self: {
     }:
     mkDerivation {
       pname = "yesod-test";
-      version = "1.6.19";
-      sha256 = "0snq06yps28lkxfc1mhsvbv2kq0h0mi16zjdfrahm4zaz8axkqka";
+      version = "1.6.23";
+      sha256 = "1bisgnvfda16ryg9npdn4s041z7vvvgdmpkq9wqwccpw4vwylklv";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -739813,6 +744030,7 @@ self: {
         conduit
         containers
         cookie
+        directory
         hspec-core
         html-conduit
         http-types
@@ -739821,6 +744039,7 @@ self: {
         mtl
         network
         pretty-show
+        process
         text
         time
         transformers
@@ -744184,6 +748403,8 @@ self: {
       pname = "zinza";
       version = "0.2.1";
       sha256 = "1k4k2yvijg0vwp3ykp9l77n3qdpivikqxx78ilvk6nx6w9sj58c8";
+      revision = "1";
+      editedCabalFile = "1ikbfa3g3636v70v7xa0x89xn91g2w8nngrxnaxwjyhaldskxvzc";
       libraryHaskellDepends = [
         base
         containers
@@ -744327,7 +748548,7 @@ self: {
     }
   ) { };
 
-  "zip_2_2_0" = callPackage (
+  "zip_2_2_1" = callPackage (
     {
       mkDerivation,
       base,
@@ -744358,8 +748579,8 @@ self: {
     }:
     mkDerivation {
       pname = "zip";
-      version = "2.2.0";
-      sha256 = "0l83f3bkx9npmna637wy607vr20z3gx8isgmjh8yany6f3nb805d";
+      version = "2.2.1";
+      sha256 = "1wq0nl034b2nknd627adzffj6rymykvkdn5b0smydcv5wp7i6p6j";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [

From 4b59ccb4263a3d0be7312938b682f3239b339e9d Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 10 Jul 2025 18:16:19 +0200
Subject: [PATCH 0069/3724] haskellPackages.gpu-vulkan-middle: drop obsolete
 override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 51093e745d91..20d3d3cc0d40 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1377,21 +1377,6 @@ with haskellLib;
   VulkanMemoryAllocator = addExtraLibrary pkgs.vulkan-headers super.VulkanMemoryAllocator;
   vulkan-utils = addExtraLibrary pkgs.vulkan-headers super.vulkan-utils;
 
-  # Support for vulkan-headers 1.4.313.0
-  # https://github.com/YoshikuniJujo/gpu-vulkan-middle/issues/10
-  gpu-vulkan-middle = overrideCabal (drv: {
-    version =
-      let
-        fixed = "0.1.0.76";
-      in
-      lib.warnIf (lib.versionAtLeast drv.version fixed)
-        "haskellPackages.gpu-vulkan-middle: default version ${drv.version} >= ${fixed}, consider dropping override"
-        fixed;
-    sha256 = "sha256-VQAVo/84qPBFkQSmY3pT4WXOK9zrFMpK7WN9/UdED6E=";
-    revision = null;
-    editedCabalFile = null;
-  }) super.gpu-vulkan-middle;
-
   # Generate cli completions for dhall.
   dhall = self.generateOptparseApplicativeCompletions [ "dhall" ] super.dhall;
   # 2025-01-27: allow aeson >= 2.2, 9.8 versions of text and bytestring

From fb745cd5c470015d6646839d0660ef37b441db43 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 10 Jul 2025 18:19:57 +0200
Subject: [PATCH 0070/3724] haskellPackages.persistent-test: drop obsolete
 overrides

Upstream Hackage and Stackage LTS have corrected the faulty bounds.
---
 .../haskell-modules/configuration-common.nix           | 10 ----------
 .../configuration-hackage2nix/main.yaml                |  1 -
 2 files changed, 11 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 20d3d3cc0d40..68cdd5f12fc2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1660,16 +1660,6 @@ with haskellLib;
       # https://github.com/NixOS/nixpkgs/issues/198495
       (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.persistent-postgresql);
 
-  # Downgrade persistent-test to a version that's compatible with
-  # persistent < 2.16 (which Stackage prescribed).  Unfortunately, the
-  # bad version of persistent-test slipped into Stackage LTS because
-  # PVP allows it and LTS doesn't continuously run test suites (contrary
-  # to nightly).
-  # See also https://github.com/yesodweb/persistent/pull/1584#issuecomment-2939756529
-  #          https://github.com/commercialhaskell/stackage/issues/7768
-  persistent-test_2_13_1_4 = dontDistribute super.persistent-test;
-  persistent-test = doDistribute self.persistent-test_2_13_1_3;
-
   # Needs matching lsp-types
   # Allow lens >= 5.3
   lsp_2_4_0_0 = doDistribute (
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 11b6d196b68c..15bf59c518c3 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -109,7 +109,6 @@ extra-packages:
   - ormolu == 0.5.2.0                   # 2023-08-08: preserve for ghc 9.0
   - ormolu == 0.7.2.0                   # 2023-11-13: for ghc-lib-parser 9.6 compat
   - ormolu == 0.7.7.0                   # 2025-01-27: for ghc 9.10 compat
-  - persistent-test < 2.13.1.4          # 2025-06-04: incompatible with persistent < 2.16, see conf*-common.nix
   - postgresql-binary < 0.14            # 2025-01-19: Needed for building postgrest
   - primitive-unlifted == 0.1.3.1       # 2024-03-16: preserve for ghc 9.2
   - retrie < 1.2.0.0                    # 2022-12-30: preserve for ghc < 9.2

From bf811701c8763b650e6b46ee4df2f7638bab626d Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 10 Jul 2025 18:20:40 +0200
Subject: [PATCH 0071/3724] haskellPackages.shakespeare: use latest version
 from Stackage again

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 68cdd5f12fc2..584161bcee4a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -318,11 +318,6 @@ with haskellLib;
     sha256 = "10zkvclyir3zf21v41zdsvg68vrkq89n64kv9k54742am2i4aygf";
   }) super.weeder;
 
-  # Version 2.1.1 is deprecated, but part of Stackage LTS at the moment.
-  # https://github.com/commercialhaskell/stackage/issues/7500
-  # https://github.com/yesodweb/shakespeare/issues/280
-  shakespeare = doDistribute self.shakespeare_2_1_0_1;
-
   # Work around -Werror failures until a more permanent solution is released
   # https://github.com/haskell-cryptography/HsOpenSSL/issues/88
   # https://github.com/haskell-cryptography/HsOpenSSL/issues/93

From 543e922b41da1cdf471d74ebd3a703db2405fff4 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 10 Jul 2025 18:53:37 +0200
Subject: [PATCH 0072/3724] haskellPackages.shakespeare: disable broken test
 suite

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 584161bcee4a..e75bc394513f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -318,6 +318,10 @@ with haskellLib;
     sha256 = "10zkvclyir3zf21v41zdsvg68vrkq89n64kv9k54742am2i4aygf";
   }) super.weeder;
 
+  # Test suite doesn't find necessary test files when compiling
+  # https://github.com/yesodweb/shakespeare/issues/294
+  shakespeare = dontCheck super.shakespeare;
+
   # Work around -Werror failures until a more permanent solution is released
   # https://github.com/haskell-cryptography/HsOpenSSL/issues/88
   # https://github.com/haskell-cryptography/HsOpenSSL/issues/93

From 22e64afc04fb24324e0fcafddcea606b16963cab Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 10 Jul 2025 18:21:15 +0200
Subject: [PATCH 0073/3724] haskellPackages.llvm-ffi: don't unnecessarily pass
 null

cabal2nix currently generates a version specific input name that gets
set to null anyways.
---
 pkgs/development/haskell-modules/configuration-nix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index c92690a1504c..077739076cc3 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -509,7 +509,7 @@ builtins.intersectAttrs super {
   llvm-ffi = addBuildDepends [
     pkgs.llvmPackages_16.llvm.lib
     pkgs.llvmPackages_16.llvm.dev
-  ] (super.llvm-ffi.override { LLVM = null; });
+  ] super.llvm-ffi;
 
   # Needs help finding LLVM.
   spaceprobe = addBuildTool self.buildHaskellPackages.llvmPackages.llvm super.spaceprobe;

From 63c4be08eb289f0d1c901dc8abc22bf417176bdf Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 11 Jul 2025 06:37:56 +0100
Subject: [PATCH 0074/3724] djvulibre: 3.5.28 -> 3.5.29

Changes: https://sourceforge.net/p/djvu/djvulibre-git/ci/master/tree/NEWS
---
 ...-32491+CVE-2021-32492+CVE-2021-32493.patch | 105 ------------------
 .../dj/djvulibre/c++17-register-class.patch   |  21 ----
 pkgs/by-name/dj/djvulibre/package.nix         |  12 +-
 3 files changed, 2 insertions(+), 136 deletions(-)
 delete mode 100644 pkgs/by-name/dj/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch
 delete mode 100644 pkgs/by-name/dj/djvulibre/c++17-register-class.patch

diff --git a/pkgs/by-name/dj/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch b/pkgs/by-name/dj/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch
deleted file mode 100644
index e305c5618d19..000000000000
--- a/pkgs/by-name/dj/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From cd8b5c97b27a5c1dc83046498b6ca49ad20aa9b6 Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Tue, 11 May 2021 14:44:09 -0400
-Subject: [PATCH] Reviewed Fedora patches and adopted some of them (or variants
- thereof)
-
- - Patch0: djvulibre-3.5.22-cdefs.patch                  (forward ported)
-Does not make imuch sense. GSmartPointer.h already includes "stddef.h"
- - Patch6: djvulibre-3.5.27-export-file.patch              (forward ported)
-Incorrect: inkscape command is --export-png, not --export-filename.
- - Patch8: djvulibre-3.5.27-check-image-size.patch         (forward ported)
-Correct: adopted a variant of this
- - Patch9: djvulibre-3.5.27-integer-overflow.patch         (forward ported)
-Correct: adopted a variant of this
- - Patch10: djvulibre-3.5.27-check-input-pool.patch        (forward ported)
-Adopted: input validation never hurts
- - Patch11: djvulibre-3.5.27-djvuport-stack-overflow.patch (forward ported)
-Dubious: Instead I changed djvufile to prevent a file from including itself
-which is the only way I can imagine to create an file creation loop.
- - Patch12: djvulibre-3.5.27-unsigned-short-overflow.patch (forward ported)
-Adopted: but without including limits.h
----
- libdjvu/DataPool.cpp  | 3 ++-
- libdjvu/DjVuFile.cpp  | 2 ++
- libdjvu/GBitmap.cpp   | 2 ++
- libdjvu/IW44Image.cpp | 4 ++++
- tools/ddjvu.cpp       | 7 +++++--
- 5 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/libdjvu/DataPool.cpp b/libdjvu/DataPool.cpp
-index 5fcbedf..b58fc45 100644
---- a/libdjvu/DataPool.cpp
-+++ b/libdjvu/DataPool.cpp
-@@ -790,7 +790,8 @@ DataPool::create(const GP<DataPool> & pool, int start, int length)
- {
-   DEBUG_MSG("DataPool::DataPool: pool=" << (void *)((DataPool *)pool) << " start=" << start << " length= " << length << "\n");
-   DEBUG_MAKE_INDENT(3);
--
-+  if (!pool)
-+    G_THROW( ERR_MSG("DataPool.zero_DataPool") );
-   DataPool *xpool=new DataPool();
-   GP<DataPool> retval=xpool;
-   xpool->init();
-diff --git a/libdjvu/DjVuFile.cpp b/libdjvu/DjVuFile.cpp
-index 143346b..2587491 100644
---- a/libdjvu/DjVuFile.cpp
-+++ b/libdjvu/DjVuFile.cpp
-@@ -576,6 +576,8 @@ DjVuFile::process_incl_chunk(ByteStream & str, int file_num)
-     GURL incl_url=pcaster->id_to_url(this, incl_str);
-     if (incl_url.is_empty())	// Fallback. Should never be used.
-       incl_url=GURL::UTF8(incl_str,url.base());
-+    if (incl_url == url)        // Infinite loop avoidance
-+      G_THROW( ERR_MSG("DjVuFile.malformed") );
-     
-     // Now see if there is already a file with this *name* created
-     {
-diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp
-index c2fdbe4..8ad64b2 100644
---- a/libdjvu/GBitmap.cpp
-+++ b/libdjvu/GBitmap.cpp
-@@ -1284,6 +1284,8 @@ GBitmap::decode(unsigned char *runs)
-   // initialize pixel array
-   if (nrows==0 || ncolumns==0)
-     G_THROW( ERR_MSG("GBitmap.not_init") );
-+  if (ncolumns + border != (unsigned short)(ncolumns+border))
-+    G_THROW("GBitmap: image size exceeds maximum (corrupted file?)");
-   bytes_per_row = ncolumns + border;
-   if (runs==0)
-     G_THROW( ERR_MSG("GBitmap.null_arg") );
-diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp
-index e8d4b44..4a1797e 100644
---- a/libdjvu/IW44Image.cpp
-+++ b/libdjvu/IW44Image.cpp
-@@ -676,9 +676,13 @@ IW44Image::Map::image(signed char *img8, int rowsize, int pixsep, int fast)
-   // Allocate reconstruction buffer
-   short *data16;
-   size_t sz = bw * bh;
-+  if (sz == 0)
-+    G_THROW("IW44Image: image size is zero (corrupted file?)");
-   if (sz / (size_t)bw != (size_t)bh) // multiplication overflow
-     G_THROW("IW44Image: image size exceeds maximum (corrupted file?)");
-   GPBuffer<short> gdata16(data16,sz);
-+  if (data16 == 0)
-+    G_THROW("IW44Image: unable to allocate image buffer");
-   // Copy coefficients
-   int i;
-   short *p = data16;
-diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
-index 7109952..e7b489b 100644
---- a/tools/ddjvu.cpp
-+++ b/tools/ddjvu.cpp
-@@ -393,8 +393,11 @@ render(ddjvu_page_t *page, int pageno)
-   } else if (style == DDJVU_FORMAT_GREY8)
-     rowsize = rrect.w;
-   else
--    rowsize = rrect.w * 3; 
--  if (! (image = (char*)malloc(rowsize * rrect.h)))
-+    rowsize = rrect.w * 3;
-+  size_t bufsize = (size_t)rowsize * rrect.h;
-+  if (bufsize / rowsize != rrect.h)
-+    die(i18n("Integer overflow when allocating image buffer for page %d"), pageno);
-+  if (! (image = (char*)malloc(bufsize)))
-     die(i18n("Cannot allocate image buffer for page %d"), pageno);
- 
-   /* Render */
\ No newline at end of file
diff --git a/pkgs/by-name/dj/djvulibre/c++17-register-class.patch b/pkgs/by-name/dj/djvulibre/c++17-register-class.patch
deleted file mode 100644
index 88251b34f773..000000000000
--- a/pkgs/by-name/dj/djvulibre/c++17-register-class.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur a/libdjvu/GBitmap.h b/libdjvu/GBitmap.h
---- a/libdjvu/GBitmap.h	2020-11-20 09:57:32.000000000 -0700
-+++ b/libdjvu/GBitmap.h	2023-07-07 07:07:45.519912414 -0600
-@@ -620,7 +620,7 @@
- inline int
- GBitmap::read_run(unsigned char *&data)
- {
--  register int z=*data++;
-+  int z=*data++;
-   return (z>=RUNOVERFLOWVALUE)?
-     ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z;
- }
-@@ -628,7 +628,7 @@
- inline int
- GBitmap::read_run(const unsigned char *&data)
- {
--  register int z=*data++;
-+  int z=*data++;
-   return (z>=RUNOVERFLOWVALUE)?
-     ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z;
- }
diff --git a/pkgs/by-name/dj/djvulibre/package.nix b/pkgs/by-name/dj/djvulibre/package.nix
index ba1b0361f53f..ecf5185939dc 100644
--- a/pkgs/by-name/dj/djvulibre/package.nix
+++ b/pkgs/by-name/dj/djvulibre/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "djvulibre";
-  version = "3.5.28";
+  version = "3.5.29";
 
   src = fetchurl {
     url = "mirror://sourceforge/djvu/${pname}-${version}.tar.gz";
-    sha256 = "1p1fiygq9ny8aimwc4vxwjc6k9ykgdsq1sq06slfbzalfvm0kl7w";
+    hash = "sha256-07SwOuK9yoUWo2726ye3d/BSjJ7aJnRdmWKCSj/f7M8=";
   };
 
   outputs = [
@@ -40,14 +40,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  patches = [
-    # Remove uses of the `register` storage class specifier, which was removed in C++17.
-    # Fixes compilation with clang 16, which defaults to C++17.
-    ./c++17-register-class.patch
-
-    ./CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch
-  ];
-
   meta = with lib; {
     description = "Big set of CLI tools to make/modify/optimize/show/export DJVU files";
     homepage = "https://djvu.sourceforge.net";

From 24648489c3d9932d452a31c5f6ee6a23098c852f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 11 Jul 2025 10:18:59 +0200
Subject: [PATCH 0075/3724] haskell.packages.ghc912.doctest: 0.24.0 -> 0.24.2

Fixes eval after hackage update.
---
 pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
index 440fdacb8082..af951064bf1e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
@@ -78,7 +78,7 @@ with haskellLib;
   tagged = doDistribute self.tagged_0_8_9;
   time-compat = doDistribute self.time-compat_1_9_8;
   extensions = doDistribute self.extensions_0_1_0_3;
-  doctest = doDistribute self.doctest_0_24_0;
+  doctest = doDistribute self.doctest_0_24_2;
   ghc-syntax-highlighter = doDistribute self.ghc-syntax-highlighter_0_0_13_0;
   ghc-lib = doDistribute self.ghc-lib_9_12_2_20250421;
   ghc-exactprint = doDistribute self.ghc-exactprint_1_12_0_0;

From a39fb3bf7d6a73c6d3792facee3d11c0dbe877db Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Fri, 11 Jul 2025 00:36:45 +0200
Subject: [PATCH 0076/3724] haskellPackages.llvm-ffi: pin to 20.*

llvm-ffi == 21.* already supports LLVM >= 21 which hasn't been released
yet. Since llvmPackages_git isn't tested on Hydra, we can't really
verify whether the FFI bindings would work.

The best option seems to use the latest released version and add a small
warning reminding us to bump llvm-ffi when the next LLVM version gets
released.
---
 .../configuration-hackage2nix/main.yaml       |  2 ++
 .../haskell-modules/configuration-nix.nix     | 21 ++++++++++++----
 .../haskell-modules/hackage-packages.nix      | 25 +++++++++++++++++++
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 15bf59c518c3..732ff62231c3 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -37,6 +37,8 @@ default-package-overrides:
   - hsc3 < 0.21
   # 2024-12-31: last version that's compatible with GHC < 9.9
   - htree < 0.2.0.0
+  # 2025-07-10: use latest released version of LLVM
+  - llvm-ffi == 20.*
   # 2025-06-11: last version that supports pandoc == 3.6.* which is prescribed by LTS 23
   - pandoc-crossref < 0.3.20
 # keep-sorted end
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 077739076cc3..15a076fdca78 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -505,11 +505,22 @@ builtins.intersectAttrs super {
   # can't use pkg-config (LLVM has no official .pc files), we need to pass the
   # `dev` and `lib` output in, or Cabal will have trouble finding the library.
   # Since it looks a bit neater having it in a list, we circumvent the singular
-  # LLVM input here.
-  llvm-ffi = addBuildDepends [
-    pkgs.llvmPackages_16.llvm.lib
-    pkgs.llvmPackages_16.llvm.dev
-  ] super.llvm-ffi;
+  # LLVM input that llvm-ffi declares.
+  llvm-ffi =
+    let
+      matchingLlvmVersion = lib.strings.toInt (lib.versions.major super.llvm-ffi.version);
+      nextLlvmVersion = matchingLlvmVersion + 1;
+    in
+    lib.warnIf (pkgs ? "llvmPackages_${toString nextLlvmVersion}")
+      # This package can be updated by changing the version constraint in
+      # configuration-hackage2nix/main.yaml and regenerating the haskellPackages set.
+      "haskellPackages.llvm-ffi: LLVM ${toString nextLlvmVersion} is available in Nixpkgs, consider updating."
+      addBuildDepends
+      [
+        pkgs."llvmPackages_${toString matchingLlvmVersion}".llvm.lib
+        pkgs."llvmPackages_${toString matchingLlvmVersion}".llvm.dev
+      ]
+      super.llvm-ffi;
 
   # Needs help finding LLVM.
   spaceprobe = addBuildTool self.buildHaskellPackages.llvmPackages.llvm super.spaceprobe;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 516491e31628..9cf9cbfe6ba0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -425897,6 +425897,30 @@ self: {
   ) { };
 
   "llvm-ffi" = callPackage (
+    {
+      mkDerivation,
+      base,
+      enumset,
+      LLVM,
+    }:
+    mkDerivation {
+      pname = "llvm-ffi";
+      version = "20.0";
+      sha256 = "1vd9rzqq9fcml9zgrxrvplcgxd925xyy7ixprcxb8j4vc0a8hgzc";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        enumset
+      ];
+      librarySystemDepends = [ LLVM ];
+      description = "FFI bindings to the LLVM compiler toolkit";
+      license = lib.licenses.bsd3;
+      maintainers = [ lib.maintainers.thielema ];
+    }
+  ) { LLVM = null; };
+
+  "llvm-ffi_21_0" = callPackage (
     {
       mkDerivation,
       base,
@@ -425916,6 +425940,7 @@ self: {
       librarySystemDepends = [ LLVM-21git ];
       description = "FFI bindings to the LLVM compiler toolkit";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { LLVM-21git = null; };

From 4bdcc227b99f26d06a7392fb16bcd5bb2d3f1dc5 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Fri, 11 Jul 2025 16:32:53 +0200
Subject: [PATCH 0077/3724] python3Packages.astropy-helpers: modernize

---
 .../astropy-helpers/default.nix               | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/astropy-helpers/default.nix b/pkgs/development/python-modules/astropy-helpers/default.nix
index c803ac0449c3..d7e7cc42f1cd 100644
--- a/pkgs/development/python-modules/astropy-helpers/default.nix
+++ b/pkgs/development/python-modules/astropy-helpers/default.nix
@@ -1,30 +1,34 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   isPy3k,
   pythonAtLeast,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "astropy-helpers";
   version = "4.0.1";
-  format = "setuptools";
+  pyproject = true;
 
-  # ModuleNotFoundError: No module named 'imp'
   disabled = !isPy3k || pythonAtLeast "3.12";
 
-  doCheck = false; # tests requires sphinx-astropy
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f1096414d108778218d6bea06d4d9c7b2ff7c83856a451331ac194e74de9f413";
+  src = fetchFromGitHub {
+    owner = "astropy";
+    repo = "astropy-helpers";
+    tag = "v${version}";
+    hash = "sha256-MjL/I+ApyoyoD2NmKuKWpDbyuEgvBb2OBhxqj/w/3lk=";
   };
 
-  meta = with lib; {
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "astropy_helpers" ];
+
+  meta = {
     description = "Utilities for building and installing Astropy, Astropy affiliated packages, and their respective documentation";
     homepage = "https://github.com/astropy/astropy-helpers";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.smaret ];
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.smaret ];
   };
 }

From 927ca2bba0bb554429d0929dde56e00f0cc6befc Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Fri, 11 Jul 2025 16:34:21 +0200
Subject: [PATCH 0078/3724] python3Packages.astropy-helpers: fix build for
 py312+

---
 .../astropy-helpers/default.nix               |  9 +--
 .../astropy-helpers/python-imp.patch          | 63 +++++++++++++++++++
 2 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/python-modules/astropy-helpers/python-imp.patch

diff --git a/pkgs/development/python-modules/astropy-helpers/default.nix b/pkgs/development/python-modules/astropy-helpers/default.nix
index d7e7cc42f1cd..f0938e83a7ab 100644
--- a/pkgs/development/python-modules/astropy-helpers/default.nix
+++ b/pkgs/development/python-modules/astropy-helpers/default.nix
@@ -2,8 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  isPy3k,
-  pythonAtLeast,
   setuptools,
 }:
 
@@ -12,8 +10,6 @@ buildPythonPackage rec {
   version = "4.0.1";
   pyproject = true;
 
-  disabled = !isPy3k || pythonAtLeast "3.12";
-
   src = fetchFromGitHub {
     owner = "astropy";
     repo = "astropy-helpers";
@@ -21,6 +17,11 @@ buildPythonPackage rec {
     hash = "sha256-MjL/I+ApyoyoD2NmKuKWpDbyuEgvBb2OBhxqj/w/3lk=";
   };
 
+  patches = [
+    # Fixes build with Python 3.12+
+    ./python-imp.patch
+  ];
+
   build-system = [ setuptools ];
 
   pythonImportsCheck = [ "astropy_helpers" ];
diff --git a/pkgs/development/python-modules/astropy-helpers/python-imp.patch b/pkgs/development/python-modules/astropy-helpers/python-imp.patch
new file mode 100644
index 000000000000..d12c2fb0e951
--- /dev/null
+++ b/pkgs/development/python-modules/astropy-helpers/python-imp.patch
@@ -0,0 +1,63 @@
+diff --git a/astropy_helpers/tests/test_git_helpers.py b/astropy_helpers/tests/test_git_helpers.py
+index 6b826fc..3fb3a29 100644
+--- a/astropy_helpers/tests/test_git_helpers.py
++++ b/astropy_helpers/tests/test_git_helpers.py
+@@ -1,5 +1,5 @@
+ import glob
+-import imp
++import importlib as imp
+ import os
+ import pkgutil
+ import re
+diff --git a/astropy_helpers/utils.py b/astropy_helpers/utils.py
+index 115c915..0cfc9e3 100644
+--- a/astropy_helpers/utils.py
++++ b/astropy_helpers/utils.py
+@@ -1,12 +1,12 @@
+ # Licensed under a 3-clause BSD style license - see LICENSE.rst
+ 
+ import contextlib
+-import imp
+ import os
+ import sys
+ import glob
+ 
+ from importlib import machinery as import_machinery
++from importlib import util as importlib_util
+ 
+ 
+ # Note: The following Warning subclasses are simply copies of the Warnings in
+@@ -54,9 +54,9 @@ def get_numpy_include_path():
+     import builtins
+     if hasattr(builtins, '__NUMPY_SETUP__'):
+         del builtins.__NUMPY_SETUP__
+-    import imp
++    import importlib
+     import numpy
+-    imp.reload(numpy)
++    importlib.reload(numpy)
+ 
+     try:
+         numpy_include = numpy.get_include()
+@@ -208,8 +208,6 @@ def import_file(filename, name=None):
+     # generates an underscore-separated name which is more likely to
+     # be unique, and it doesn't really matter because the name isn't
+     # used directly here anyway.
+-    mode = 'r'
+-
+     if name is None:
+         basename = os.path.splitext(filename)[0]
+         name = '_'.join(os.path.relpath(basename).split(os.sep)[1:])
+@@ -221,8 +219,10 @@ def import_file(filename, name=None):
+         loader = import_machinery.SourceFileLoader(name, filename)
+         mod = loader.load_module()
+     else:
+-        with open(filename, mode) as fd:
+-            mod = imp.load_module(name, fd, filename, ('.py', mode, 1))
++        importlib_util
++        spec = importlib_util.spec_from_file_location(name, filename)
++        mod = importlib_util.module_from_spec(spec)
++        spec.loader.exec_module(mod)
+ 
+     return mod
+ 

From 9f91eeedcbd89f0d64fcf28717c5030e45796b85 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Fri, 11 Jul 2025 19:45:35 +0200
Subject: [PATCH 0079/3724] python3Packages.astroquery: modernize

---
 .../python-modules/astroquery/default.nix     | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix
index 94ee306cd74e..3da2ea9c8c22 100644
--- a/pkgs/development/python-modules/astroquery/default.nix
+++ b/pkgs/development/python-modules/astroquery/default.nix
@@ -1,7 +1,7 @@
 {
-  pkgs,
+  lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   astropy,
   requests,
   keyring,
@@ -17,22 +17,26 @@
   pyvo,
   astropy-helpers,
   setuptools,
-  isPy3k,
 }:
 
 buildPythonPackage rec {
   pname = "astroquery";
   version = "0.4.10";
-  format = "pyproject";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-6s2R6do3jmQXQPvDEjhQ2qg7oJJqb/9MQMy/XcbVpAY=";
+  src = fetchFromGitHub {
+    owner = "astropy";
+    repo = "astroquery";
+    tag = "v${version}";
+    hash = "sha256-5pNKV+XNfUQca7WoWboVphXffzyVIHCmfxwr4nBMaEk=";
   };
 
-  disabled = !isPy3k;
+  build-system = [
+    astropy-helpers
+    setuptools
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     astropy
     requests
     keyring
@@ -41,11 +45,6 @@ buildPythonPackage rec {
     pyvo
   ];
 
-  nativeBuildInputs = [
-    astropy-helpers
-    setuptools
-  ];
-
   # Disable automatic update of the astropy-helper module
   postPatch = ''
     substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False"
@@ -77,10 +76,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "astroquery" ];
 
-  meta = with pkgs.lib; {
+  meta = {
     description = "Functions and classes to access online data resources";
     homepage = "https://astroquery.readthedocs.io/";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.smaret ];
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.smaret ];
   };
 }

From 549e1bdb99d771bab7205a3783887938b8596bee Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Fri, 11 Jul 2025 19:50:36 +0200
Subject: [PATCH 0080/3724] python3Packages.astroquery: fix build

---
 .../python-modules/astroquery/default.nix            | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix
index 3da2ea9c8c22..196c96fa62f6 100644
--- a/pkgs/development/python-modules/astroquery/default.nix
+++ b/pkgs/development/python-modules/astroquery/default.nix
@@ -2,7 +2,9 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   astropy,
+  boto3,
   requests,
   keyring,
   beautifulsoup4,
@@ -31,6 +33,15 @@ buildPythonPackage rec {
     hash = "sha256-5pNKV+XNfUQca7WoWboVphXffzyVIHCmfxwr4nBMaEk=";
   };
 
+  patches = [
+    # https://github.com/astropy/astroquery/pull/3311
+    (fetchpatch2 {
+      name = "setuptools-package-index.patch";
+      url = "https://github.com/astropy/astroquery/commit/9d43beb4b7bea424d73fff0b602ca90026155519.patch";
+      hash = "sha256-3QdOwP1rlWeScGxHT9ZVPmffE7S1XE0cbtnQ8T4bIYw=";
+    })
+  ];
+
   build-system = [
     astropy-helpers
     setuptools
@@ -53,6 +64,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pytestCheckHook ];
 
   checkInputs = [
+    boto3
     matplotlib
     pillow
     pytest

From f7080c060690365e55364dc5320099bed67f69c8 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Thu, 10 Jul 2025 09:48:59 -0700
Subject: [PATCH 0081/3724] systemd: add sysupdated

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 80a9ae1bb550..f30db465560a 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -559,6 +559,7 @@ stdenv.mkDerivation (finalAttrs: {
       (lib.mesonEnable "libiptc" withIptables)
       (lib.mesonEnable "repart" withRepart)
       (lib.mesonEnable "sysupdate" withSysupdate)
+      (lib.mesonEnable "sysupdated" withSysupdate)
       (lib.mesonEnable "seccomp" withLibseccomp)
       (lib.mesonEnable "selinux" withSelinux)
       (lib.mesonEnable "tpm2" withTpm2Tss)

From cbb2734d993b3acc9f21792f06b4b8393e96ebbb Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Thu, 10 Jul 2025 21:55:14 -0700
Subject: [PATCH 0082/3724] systemd: add withSysupdate to passthru

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index f30db465560a..d6af487a9692 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -906,6 +906,7 @@ stdenv.mkDerivation (finalAttrs: {
       withMachined
       withNetworkd
       withPortabled
+      withSysupdate
       withTimedated
       withTpm2Tss
       withUtmp

From 45a71d67a70c448be7dc86c6a7d7dbacfeae8f56 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Thu, 10 Jul 2025 21:57:37 -0700
Subject: [PATCH 0083/3724] nixos/sysupdate: add assertion for systemd built
 with sysupdate support

---
 nixos/modules/system/boot/systemd/sysupdate.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/system/boot/systemd/sysupdate.nix b/nixos/modules/system/boot/systemd/sysupdate.nix
index 4c71b1714954..354cd0027c91 100644
--- a/nixos/modules/system/boot/systemd/sysupdate.nix
+++ b/nixos/modules/system/boot/systemd/sysupdate.nix
@@ -114,6 +114,12 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = config.systemd.package.withSysupdate;
+        message = "Cannot enable systemd-sysupdate with systemd package not built with sysupdate support";
+      }
+    ];
 
     systemd.additionalUpstreamSystemUnits = [
       "systemd-sysupdate.service"

From e84623d33450a46eebc2b0ccdafef9d1e7f443cf Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 12 Jul 2025 13:14:40 +0200
Subject: [PATCH 0084/3724] haskellPackages.servant-client: drop released patch

---
 .../haskell-modules/configuration-common.nix  | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e75bc394513f..bdda52f5af58 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1576,31 +1576,6 @@ with haskellLib;
     })
   ] super.servant-routes;
 
-  # Fix test suite with text >= 2.1.2
-  servant-client =
-    appendPatches
-      [
-        (pkgs.fetchpatch {
-          name = "servant-client-text-2.1.2.patch";
-          url = "https://github.com/haskell-servant/servant/commit/9cda0cfb356a01ad402ee949e0b0d5c0494eace2.patch";
-          sha256 = "19vpn7h108wra9b84r642zxg0mii66rq4vjbqhi7ackkdb0mx9yn";
-          relative = "servant-client";
-          # patch to servant-client.cabal doesn't apply on 0.20.2
-          includes = [ "README.md" ];
-        })
-      ]
-      (
-        overrideCabal (drv: {
-          postPatch =
-            super.postPatch or ""
-            + ''
-              # Restore the symlink (to the file we patch) which becomes a regular file
-              # in the hackage tarball
-              ln -sf README.md README.lhs
-            '';
-        }) super.servant-client
-      );
-
   # it wants to build a statically linked binary by default
   hledger-flow = overrideCabal (drv: {
     postPatch =

From 4e0dda4decefe4259cc2dbdc8fdc02acf4e1d62b Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 12 Jul 2025 22:42:34 +0200
Subject: [PATCH 0085/3724] haskellPackages.servant-routes: drop released patch

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index bdda52f5af58..c667ba118972 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1566,16 +1566,6 @@ with haskellLib;
   # https://github.com/haskell-servant/servant-ekg/issues/15
   servant-ekg = doJailbreak super.servant-ekg;
 
-  # Fixes bug in an Ord instance that was causing the test suite to fail
-  # https://github.com/fpringle/servant-routes/issues/33
-  servant-routes = appendPatches [
-    (pkgs.fetchpatch {
-      name = "servant-routes-fix-ord.patch";
-      url = "https://github.com/fpringle/servant-routes/commit/d1ef071f11c6a0810637beb8ea0b08f8e524b48a.patch";
-      sha256 = "1c2xpi7sz0621fj9r1010587d1l39j6mm8l4vqmz9pldccmcb0f2";
-    })
-  ] super.servant-routes;
-
   # it wants to build a statically linked binary by default
   hledger-flow = overrideCabal (drv: {
     postPatch =

From f256da2029d7bd20134573dc38013e735c616a09 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 12 Jul 2025 23:13:07 +0200
Subject: [PATCH 0086/3724] git-annex: update sha256 for 10.20250630

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c667ba118972..bc6d97b4e8cf 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -551,7 +551,7 @@ with haskellLib;
           name = "git-annex-${super.git-annex.version}-src";
           url = "git://git-annex.branchable.com/";
           rev = "refs/tags/" + super.git-annex.version;
-          sha256 = "0d968aciaxmblahk79x2m708rvbg19flj5naxzg0zdp9j2jwlcqf";
+          sha256 = "sha256-whpBFmOHBTm1clXoAwInsQw7mnxrQOyaUj7byogku5c=";
           # delete android and Android directories which cause issues on
           # darwin (case insensitive directory). Since we don't need them
           # during the build process, we can delete it to prevent a hash

From c9858489fca0f4c4c6b71f4a4853f53748f2c388 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 13 Jul 2025 06:53:47 +0100
Subject: [PATCH 0087/3724] gssdp_1_6: 1.6.3 -> 1.6.4

Changes: https://gitlab.gnome.org/GNOME/gssdp/-/tags/gssdp-1.6.4
---
 pkgs/development/libraries/gssdp/1.6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix
index 6d59e165a3e6..d52f441ed961 100644
--- a/pkgs/development/libraries/gssdp/1.6.nix
+++ b/pkgs/development/libraries/gssdp/1.6.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gssdp";
-  version = "1.6.3";
+  version = "1.6.4";
 
   outputs = [
     "out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor finalAttrs.version}/gssdp-${finalAttrs.version}.tar.xz";
-    sha256 = "L+21r9sizxTVSYo5p3PKiXiKJQ/PcBGHg9+CHh8/NEY=";
+    hash = "sha256-/5f9+39WHT5oE7T2ohRSWefC7/Q8wOY/P9Ax0LYmYDI=";
   };
 
   depsBuildBuild = [

From fa88eb41aa069e3553fcc4add99b37357fe3da16 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 19 Jun 2025 06:36:40 +0100
Subject: [PATCH 0088/3724] ninja: 1.12.1 -> 1.13.1

Changes:
- https://github.com/ninja-build/ninja/releases/tag/v1.13.0
- https://github.com/ninja-build/ninja/releases/tag/v1.13.1
---
 pkgs/by-name/ni/ninja/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/ninja/package.nix b/pkgs/by-name/ni/ninja/package.nix
index 25be8510ad35..1872124f25b3 100644
--- a/pkgs/by-name/ni/ninja/package.nix
+++ b/pkgs/by-name/ni/ninja/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   version =
     {
       "1.11" = "1.11.1";
-      latest = "1.12.1";
+      latest = "1.13.1";
     }
     .${ninjaRelease};
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
       {
         # TODO: Remove Ninja 1.11 as soon as possible.
         "1.11" = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI=";
-        latest = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA=";
+        latest = "sha256-GhAF5wUT19E02ZekW+ywsCMVGYrt56hES+MHCH4lNG4=";
       }
       .${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}");
   };

From 4ccdc6ca47c6564e3563ceeb9b1b9ae6243b77da Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 13 Jul 2025 15:39:29 +0200
Subject: [PATCH 0089/3724] iproute2: add python3 for routel script

Fixes #424803.
---
 pkgs/by-name/ip/iproute2/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix
index 0355f71c7c9a..e7659e248170 100644
--- a/pkgs/by-name/ip/iproute2/package.nix
+++ b/pkgs/by-name/ip/iproute2/package.nix
@@ -11,6 +11,7 @@
   elfutils,
   libmnl,
   libbpf,
+  python3,
   gitUpdater,
   pkgsStatic,
 }:
@@ -87,6 +88,7 @@ stdenv.mkDerivation rec {
       db
       iptables
       libmnl
+      python3
     ]
     # needed to uploaded bpf programs
     ++ lib.optionals (!stdenv.hostPlatform.isStatic) [

From 6b3a446632207cec5d0de799cdc605903b6c601d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= <kpg@posteo.net>
Date: Sun, 13 Jul 2025 20:50:32 +0200
Subject: [PATCH 0090/3724] lisp-modules: import quicklisp dist 2025-06-22

State after import: 646 out of 4717 packages fail to build.

Added release note.
---
 doc/release-notes/rl-2511.section.md       |    2 +
 pkgs/development/lisp-modules/imported.nix | 9474 ++++++++++----------
 2 files changed, 4955 insertions(+), 4521 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 1f28d5222632..15a43d2935b2 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -58,6 +58,8 @@
 
 - `meta.mainProgram`: Changing this `meta` entry can lead to a package rebuild due to being used to determine the `NIX_MAIN_PROGRAM` environment variable.
 
+- `lisp-modules` were brought in sync with the [June 2025 Quicklisp release](http://blog.quicklisp.org/2025/07/june-2025-quicklisp-dist-now-available.html).
+
 - `versionCheckHook`: Packages that previously relied solely on `pname` to locate the program used to version check, but have a differing `meta.mainProgram` entry, might now fail.
 
 
diff --git a/pkgs/development/lisp-modules/imported.nix b/pkgs/development/lisp-modules/imported.nix
index 00b6e35b5f2c..02194cbed797 100644
--- a/pkgs/development/lisp-modules/imported.nix
+++ b/pkgs/development/lisp-modules/imported.nix
@@ -6,7 +6,6 @@
   lib,
   fetchzip,
   build-asdf-system,
-  stdenv,
   ...
 }:
 
@@ -210,12 +209,12 @@ lib.makeScope pkgs.newScope (self: {
   _3bgl-shader = (
     build-asdf-system {
       pname = "3bgl-shader";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "3bgl-shader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bgl-shader/2024-10-12/3bgl-shader-20241012-git.tgz";
-          sha256 = "06v9a3m0cwhj2m5nz20shzgz3362sd7bv011rlknm4nz6i4q5bzz";
+          url = "http://beta.quicklisp.org/archive/3bgl-shader/2025-06-22/3bgl-shader-20250622-git.tgz";
+          sha256 = "0v29qppa0g7hnjj84jbxrvqyi8apvnzgbn0f6ng033qg3vics2gx";
           system = "3bgl-shader";
           asd = "3bgl-shader";
         }
@@ -234,12 +233,12 @@ lib.makeScope pkgs.newScope (self: {
   _3bgl-shader-example = (
     build-asdf-system {
       pname = "3bgl-shader-example";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "3bgl-shader-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bgl-shader/2024-10-12/3bgl-shader-20241012-git.tgz";
-          sha256 = "06v9a3m0cwhj2m5nz20shzgz3362sd7bv011rlknm4nz6i4q5bzz";
+          url = "http://beta.quicklisp.org/archive/3bgl-shader/2025-06-22/3bgl-shader-20250622-git.tgz";
+          sha256 = "0v29qppa0g7hnjj84jbxrvqyi8apvnzgbn0f6ng033qg3vics2gx";
           system = "3bgl-shader-example";
           asd = "3bgl-shader-example";
         }
@@ -259,12 +258,12 @@ lib.makeScope pkgs.newScope (self: {
   _3bmd = (
     build-asdf-system {
       pname = "3bmd";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "3bmd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz";
-          sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv";
+          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd";
           asd = "3bmd";
         }
@@ -283,12 +282,12 @@ lib.makeScope pkgs.newScope (self: {
   _3bmd-ext-code-blocks = (
     build-asdf-system {
       pname = "3bmd-ext-code-blocks";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "3bmd-ext-code-blocks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz";
-          sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv";
+          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-ext-code-blocks";
           asd = "3bmd-ext-code-blocks";
         }
@@ -308,12 +307,12 @@ lib.makeScope pkgs.newScope (self: {
   _3bmd-ext-definition-lists = (
     build-asdf-system {
       pname = "3bmd-ext-definition-lists";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "3bmd-ext-definition-lists" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz";
-          sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv";
+          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-ext-definition-lists";
           asd = "3bmd-ext-definition-lists";
         }
@@ -332,12 +331,12 @@ lib.makeScope pkgs.newScope (self: {
   _3bmd-ext-math = (
     build-asdf-system {
       pname = "3bmd-ext-math";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "3bmd-ext-math" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz";
-          sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv";
+          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-ext-math";
           asd = "3bmd-ext-math";
         }
@@ -355,12 +354,12 @@ lib.makeScope pkgs.newScope (self: {
   _3bmd-ext-tables = (
     build-asdf-system {
       pname = "3bmd-ext-tables";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "3bmd-ext-tables" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz";
-          sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv";
+          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-ext-tables";
           asd = "3bmd-ext-tables";
         }
@@ -375,12 +374,12 @@ lib.makeScope pkgs.newScope (self: {
   _3bmd-ext-wiki-links = (
     build-asdf-system {
       pname = "3bmd-ext-wiki-links";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "3bmd-ext-wiki-links" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz";
-          sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv";
+          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-ext-wiki-links";
           asd = "3bmd-ext-wiki-links";
         }
@@ -395,12 +394,12 @@ lib.makeScope pkgs.newScope (self: {
   _3bmd-tests = (
     build-asdf-system {
       pname = "3bmd-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "3bmd-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz";
-          sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv";
+          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-tests";
           asd = "3bmd-tests";
         }
@@ -419,12 +418,12 @@ lib.makeScope pkgs.newScope (self: {
   _3bmd-youtube = (
     build-asdf-system {
       pname = "3bmd-youtube";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "3bmd-youtube" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz";
-          sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv";
+          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-youtube";
           asd = "3bmd-youtube";
         }
@@ -442,12 +441,12 @@ lib.makeScope pkgs.newScope (self: {
   _3bmd-youtube-tests = (
     build-asdf-system {
       pname = "3bmd-youtube-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "3bmd-youtube-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz";
-          sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv";
+          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-youtube-tests";
           asd = "3bmd-youtube-tests";
         }
@@ -492,12 +491,12 @@ lib.makeScope pkgs.newScope (self: {
   _3d-math = (
     build-asdf-system {
       pname = "3d-math";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "3d-math" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-math/2024-10-12/3d-math-20241012-git.tgz";
-          sha256 = "01xnzizy76ypypzpqrg9fwnxfl5mlldc554b0791rsckkhh35xvd";
+          url = "http://beta.quicklisp.org/archive/3d-math/2025-06-22/3d-math-20250622-git.tgz";
+          sha256 = "14jmmv1vsri0qil6hksax7xcakfmxjndj90gkszin67c8sazqzzb";
           system = "3d-math";
           asd = "3d-math";
         }
@@ -515,12 +514,12 @@ lib.makeScope pkgs.newScope (self: {
   _3d-math-test = (
     build-asdf-system {
       pname = "3d-math-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "3d-math-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-math/2024-10-12/3d-math-20241012-git.tgz";
-          sha256 = "01xnzizy76ypypzpqrg9fwnxfl5mlldc554b0791rsckkhh35xvd";
+          url = "http://beta.quicklisp.org/archive/3d-math/2025-06-22/3d-math-20250622-git.tgz";
+          sha256 = "14jmmv1vsri0qil6hksax7xcakfmxjndj90gkszin67c8sazqzzb";
           system = "3d-math-test";
           asd = "3d-math-test";
         }
@@ -631,12 +630,12 @@ lib.makeScope pkgs.newScope (self: {
   _3d-spaces = (
     build-asdf-system {
       pname = "3d-spaces";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "3d-spaces" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-spaces/2024-10-12/3d-spaces-20241012-git.tgz";
-          sha256 = "170f2hyvrf3mvkfg9mj7rg2zafcnqbm9h9c29y716ppq1vk1pxhc";
+          url = "http://beta.quicklisp.org/archive/3d-spaces/2025-06-22/3d-spaces-20250622-git.tgz";
+          sha256 = "16m87s9mpynxgjxcp3yn70s6l7mh9sgx3yxwkzdp20y5x5nkknlb";
           system = "3d-spaces";
           asd = "3d-spaces";
         }
@@ -644,8 +643,11 @@ lib.makeScope pkgs.newScope (self: {
       systems = [ "3d-spaces" ];
       lispLibs = [
         (getAttr "_3d-math" self)
+        (getAttr "babel" self)
         (getAttr "documentation-utils" self)
         (getAttr "for" self)
+        (getAttr "nibbles" self)
+        (getAttr "text-draw" self)
         (getAttr "trivial-extensible-sequences" self)
       ];
       meta = {
@@ -653,29 +655,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  _3d-spaces-test = (
-    build-asdf-system {
-      pname = "3d-spaces-test";
-      version = "20241012-git";
-      asds = [ "3d-spaces-test" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-spaces/2024-10-12/3d-spaces-20241012-git.tgz";
-          sha256 = "170f2hyvrf3mvkfg9mj7rg2zafcnqbm9h9c29y716ppq1vk1pxhc";
-          system = "3d-spaces-test";
-          asd = "3d-spaces-test";
-        }
-      );
-      systems = [ "3d-spaces-test" ];
-      lispLibs = [
-        (getAttr "_3d-spaces" self)
-        (getAttr "parachute" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   _3d-transforms = (
     build-asdf-system {
       pname = "3d-transforms";
@@ -727,12 +706,12 @@ lib.makeScope pkgs.newScope (self: {
   _3d-vectors = (
     build-asdf-system {
       pname = "3d-vectors";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "3d-vectors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-vectors/2023-10-21/3d-vectors-20231021-git.tgz";
-          sha256 = "0y3iwb0bvxf8ixgsbg3idlx91k3lim9na53fasb4scnhlmpsbk28";
+          url = "http://beta.quicklisp.org/archive/3d-vectors/2025-06-22/3d-vectors-20250622-git.tgz";
+          sha256 = "1zmk47ggghajq5b493z2ikjm28ddmva244fsg4dlyp02shan221a";
           system = "3d-vectors";
           asd = "3d-vectors";
         }
@@ -747,12 +726,12 @@ lib.makeScope pkgs.newScope (self: {
   _3d-vectors-test = (
     build-asdf-system {
       pname = "3d-vectors-test";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "3d-vectors-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-vectors/2023-10-21/3d-vectors-20231021-git.tgz";
-          sha256 = "0y3iwb0bvxf8ixgsbg3idlx91k3lim9na53fasb4scnhlmpsbk28";
+          url = "http://beta.quicklisp.org/archive/3d-vectors/2025-06-22/3d-vectors-20250622-git.tgz";
+          sha256 = "1zmk47ggghajq5b493z2ikjm28ddmva244fsg4dlyp02shan221a";
           system = "3d-vectors-test";
           asd = "3d-vectors-test";
         }
@@ -770,12 +749,12 @@ lib.makeScope pkgs.newScope (self: {
   _40ants-asdf-system = (
     build-asdf-system {
       pname = "40ants-asdf-system";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "40ants-asdf-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2024-10-12/40ants-asdf-system-20241012-git.tgz";
-          sha256 = "0wi575m0s0a9fvp1wy5ga760f71la16z1633qk6s2f87rwcjs8kw";
+          url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz";
+          sha256 = "151zfyz7c4xrd4mnyzd5nsla1p70q4iixgm9mlnbm799mr1aprwp";
           system = "40ants-asdf-system";
           asd = "40ants-asdf-system";
         }
@@ -790,12 +769,12 @@ lib.makeScope pkgs.newScope (self: {
   _40ants-asdf-system-ci = (
     build-asdf-system {
       pname = "40ants-asdf-system-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "40ants-asdf-system-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2024-10-12/40ants-asdf-system-20241012-git.tgz";
-          sha256 = "0wi575m0s0a9fvp1wy5ga760f71la16z1633qk6s2f87rwcjs8kw";
+          url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz";
+          sha256 = "151zfyz7c4xrd4mnyzd5nsla1p70q4iixgm9mlnbm799mr1aprwp";
           system = "40ants-asdf-system-ci";
           asd = "40ants-asdf-system-ci";
         }
@@ -810,12 +789,12 @@ lib.makeScope pkgs.newScope (self: {
   _40ants-asdf-system-tests = (
     build-asdf-system {
       pname = "40ants-asdf-system-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "40ants-asdf-system-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2024-10-12/40ants-asdf-system-20241012-git.tgz";
-          sha256 = "0wi575m0s0a9fvp1wy5ga760f71la16z1633qk6s2f87rwcjs8kw";
+          url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz";
+          sha256 = "151zfyz7c4xrd4mnyzd5nsla1p70q4iixgm9mlnbm799mr1aprwp";
           system = "40ants-asdf-system-tests";
           asd = "40ants-asdf-system-tests";
         }
@@ -833,12 +812,12 @@ lib.makeScope pkgs.newScope (self: {
   _40ants-ci = (
     build-asdf-system {
       pname = "40ants-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "40ants-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ci/2024-10-12/ci-20241012-git.tgz";
-          sha256 = "0fmy1302c89qbhn4zc58cydcv8qc3qrl6cjbf2fy53sphnmj0wgm";
+          url = "http://beta.quicklisp.org/archive/ci/2025-06-22/ci-20250622-git.tgz";
+          sha256 = "17pmmvwl7a2ixck2jqa47sx6k4v976h0566niy56h1b0fiwzp73a";
           system = "40ants-ci";
           asd = "40ants-ci";
         }
@@ -859,12 +838,12 @@ lib.makeScope pkgs.newScope (self: {
   _40ants-ci-docs = (
     build-asdf-system {
       pname = "40ants-ci-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "40ants-ci-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ci/2024-10-12/ci-20241012-git.tgz";
-          sha256 = "0fmy1302c89qbhn4zc58cydcv8qc3qrl6cjbf2fy53sphnmj0wgm";
+          url = "http://beta.quicklisp.org/archive/ci/2025-06-22/ci-20250622-git.tgz";
+          sha256 = "17pmmvwl7a2ixck2jqa47sx6k4v976h0566niy56h1b0fiwzp73a";
           system = "40ants-ci-docs";
           asd = "40ants-ci-docs";
         }
@@ -873,7 +852,6 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "_40ants-ci" self)
         (getAttr "_40ants-doc" self)
-        (getAttr "_40ants-logging-docs" self)
         (getAttr "docs-config" self)
       ];
       meta = {
@@ -884,12 +862,12 @@ lib.makeScope pkgs.newScope (self: {
   _40ants-ci-tests = (
     build-asdf-system {
       pname = "40ants-ci-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "40ants-ci-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ci/2024-10-12/ci-20241012-git.tgz";
-          sha256 = "0fmy1302c89qbhn4zc58cydcv8qc3qrl6cjbf2fy53sphnmj0wgm";
+          url = "http://beta.quicklisp.org/archive/ci/2025-06-22/ci-20250622-git.tgz";
+          sha256 = "17pmmvwl7a2ixck2jqa47sx6k4v976h0566niy56h1b0fiwzp73a";
           system = "40ants-ci-tests";
           asd = "40ants-ci-tests";
         }
@@ -904,12 +882,12 @@ lib.makeScope pkgs.newScope (self: {
   _40ants-doc = (
     build-asdf-system {
       pname = "40ants-doc";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "40ants-doc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/doc/2024-10-12/doc-20241012-git.tgz";
-          sha256 = "1vkczfcdgg1dmzb5jzxvc50kywbz7il130qrj0smlg1grwgw10a2";
+          url = "http://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz";
+          sha256 = "0343172ci1hff6q83fbrpck5j02p0983qdrzsrvbq6kdyfm48l7q";
           system = "40ants-doc";
           asd = "40ants-doc";
         }
@@ -918,6 +896,7 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "named-readtables" self)
         (getAttr "pythonic-string-reader" self)
+        (getAttr "serapeum" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -927,12 +906,12 @@ lib.makeScope pkgs.newScope (self: {
   _40ants-doc-full = (
     build-asdf-system {
       pname = "40ants-doc-full";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "40ants-doc-full" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/doc/2024-10-12/doc-20241012-git.tgz";
-          sha256 = "1vkczfcdgg1dmzb5jzxvc50kywbz7il130qrj0smlg1grwgw10a2";
+          url = "http://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz";
+          sha256 = "0343172ci1hff6q83fbrpck5j02p0983qdrzsrvbq6kdyfm48l7q";
           system = "40ants-doc-full";
           asd = "40ants-doc-full";
         }
@@ -957,6 +936,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "log4cl" self)
         (getAttr "named-readtables" self)
         (getAttr "pythonic-string-reader" self)
+        (getAttr "serapeum" self)
         (getAttr "slynk" self)
         (getAttr "spinneret" self)
         (getAttr "stem" self)
@@ -971,15 +951,110 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  _40ants-doc-plantuml = (
+    build-asdf-system {
+      pname = "40ants-doc-plantuml";
+      version = "20250622-git";
+      asds = [ "40ants-doc-plantuml" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz";
+          sha256 = "04d4ff2rar3y5c6n20ccb7p295iakf93wmc0yrg9fvpjczbh18bk";
+          system = "40ants-doc-plantuml";
+          asd = "40ants-doc-plantuml";
+        }
+      );
+      systems = [ "40ants-doc-plantuml" ];
+      lispLibs = [
+        (getAttr "_40ants-asdf-system" self)
+        (getAttr "_40ants-doc" self)
+        (getAttr "_40ants-doc-full" self)
+        (getAttr "_40ants-plantuml" self)
+        (getAttr "common-doc" self)
+        (getAttr "serapeum" self)
+        (getAttr "str" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  _40ants-doc-plantuml-ci = (
+    build-asdf-system {
+      pname = "40ants-doc-plantuml-ci";
+      version = "20250622-git";
+      asds = [ "40ants-doc-plantuml-ci" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz";
+          sha256 = "04d4ff2rar3y5c6n20ccb7p295iakf93wmc0yrg9fvpjczbh18bk";
+          system = "40ants-doc-plantuml-ci";
+          asd = "40ants-doc-plantuml-ci";
+        }
+      );
+      systems = [ "40ants-doc-plantuml-ci" ];
+      lispLibs = [ (getAttr "_40ants-ci" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  _40ants-doc-plantuml-docs = (
+    build-asdf-system {
+      pname = "40ants-doc-plantuml-docs";
+      version = "20250622-git";
+      asds = [ "40ants-doc-plantuml-docs" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz";
+          sha256 = "04d4ff2rar3y5c6n20ccb7p295iakf93wmc0yrg9fvpjczbh18bk";
+          system = "40ants-doc-plantuml-docs";
+          asd = "40ants-doc-plantuml-docs";
+        }
+      );
+      systems = [ "40ants-doc-plantuml-docs" ];
+      lispLibs = [
+        (getAttr "_40ants-doc" self)
+        (getAttr "_40ants-doc-plantuml" self)
+        (getAttr "docs-config" self)
+        (getAttr "named-readtables" self)
+        (getAttr "pythonic-string-reader" self)
+        (getAttr "serapeum" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  _40ants-doc-plantuml-tests = (
+    build-asdf-system {
+      pname = "40ants-doc-plantuml-tests";
+      version = "20250622-git";
+      asds = [ "40ants-doc-plantuml-tests" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz";
+          sha256 = "04d4ff2rar3y5c6n20ccb7p295iakf93wmc0yrg9fvpjczbh18bk";
+          system = "40ants-doc-plantuml-tests";
+          asd = "40ants-doc-plantuml-tests";
+        }
+      );
+      systems = [ "40ants-doc-plantuml-tests" ];
+      lispLibs = [ (getAttr "rove" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   _40ants-doc-test = (
     build-asdf-system {
       pname = "40ants-doc-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "40ants-doc-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/doc/2024-10-12/doc-20241012-git.tgz";
-          sha256 = "1vkczfcdgg1dmzb5jzxvc50kywbz7il130qrj0smlg1grwgw10a2";
+          url = "http://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz";
+          sha256 = "0343172ci1hff6q83fbrpck5j02p0983qdrzsrvbq6kdyfm48l7q";
           system = "40ants-doc-test";
           asd = "40ants-doc-test";
         }
@@ -1001,12 +1076,12 @@ lib.makeScope pkgs.newScope (self: {
   _40ants-logging = (
     build-asdf-system {
       pname = "40ants-logging";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "40ants-logging" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz";
-          sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz";
+          url = "http://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
+          sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d";
           system = "40ants-logging";
           asd = "40ants-logging";
         }
@@ -1025,12 +1100,12 @@ lib.makeScope pkgs.newScope (self: {
   _40ants-logging-ci = (
     build-asdf-system {
       pname = "40ants-logging-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "40ants-logging-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz";
-          sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz";
+          url = "http://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
+          sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d";
           system = "40ants-logging-ci";
           asd = "40ants-logging-ci";
         }
@@ -1045,12 +1120,12 @@ lib.makeScope pkgs.newScope (self: {
   _40ants-logging-docs = (
     build-asdf-system {
       pname = "40ants-logging-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "40ants-logging-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz";
-          sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz";
+          url = "http://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
+          sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d";
           system = "40ants-logging-docs";
           asd = "40ants-logging-docs";
         }
@@ -1071,12 +1146,12 @@ lib.makeScope pkgs.newScope (self: {
   _40ants-logging-example = (
     build-asdf-system {
       pname = "40ants-logging-example";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "40ants-logging-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz";
-          sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz";
+          url = "http://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
+          sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d";
           system = "40ants-logging-example";
           asd = "40ants-logging-example";
         }
@@ -1097,12 +1172,12 @@ lib.makeScope pkgs.newScope (self: {
   _40ants-logging-tests = (
     build-asdf-system {
       pname = "40ants-logging-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "40ants-logging-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz";
-          sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz";
+          url = "http://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
+          sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d";
           system = "40ants-logging-tests";
           asd = "40ants-logging-tests";
         }
@@ -1114,6 +1189,194 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  _40ants-plantuml = (
+    build-asdf-system {
+      pname = "40ants-plantuml";
+      version = "20250622-git";
+      asds = [ "40ants-plantuml" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz";
+          sha256 = "0bi3i0cw16aa38xp04xwirdfvwjz862q5yzghpprddi1q5mvxpbf";
+          system = "40ants-plantuml";
+          asd = "40ants-plantuml";
+        }
+      );
+      systems = [ "40ants-plantuml" ];
+      lispLibs = [
+        (getAttr "_40ants-asdf-system" self)
+        (getAttr "alexandria" self)
+        (getAttr "serapeum" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  _40ants-plantuml-ci = (
+    build-asdf-system {
+      pname = "40ants-plantuml-ci";
+      version = "20250622-git";
+      asds = [ "40ants-plantuml-ci" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz";
+          sha256 = "0bi3i0cw16aa38xp04xwirdfvwjz862q5yzghpprddi1q5mvxpbf";
+          system = "40ants-plantuml-ci";
+          asd = "40ants-plantuml-ci";
+        }
+      );
+      systems = [ "40ants-plantuml-ci" ];
+      lispLibs = [ (getAttr "_40ants-ci" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  _40ants-plantuml-docs = (
+    build-asdf-system {
+      pname = "40ants-plantuml-docs";
+      version = "20250622-git";
+      asds = [ "40ants-plantuml-docs" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz";
+          sha256 = "0bi3i0cw16aa38xp04xwirdfvwjz862q5yzghpprddi1q5mvxpbf";
+          system = "40ants-plantuml-docs";
+          asd = "40ants-plantuml-docs";
+        }
+      );
+      systems = [ "40ants-plantuml-docs" ];
+      lispLibs = [
+        (getAttr "_40ants-doc" self)
+        (getAttr "_40ants-plantuml" self)
+        (getAttr "docs-config" self)
+        (getAttr "named-readtables" self)
+        (getAttr "pythonic-string-reader" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  _40ants-plantuml-tests = (
+    build-asdf-system {
+      pname = "40ants-plantuml-tests";
+      version = "20250622-git";
+      asds = [ "40ants-plantuml-tests" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz";
+          sha256 = "0bi3i0cw16aa38xp04xwirdfvwjz862q5yzghpprddi1q5mvxpbf";
+          system = "40ants-plantuml-tests";
+          asd = "40ants-plantuml-tests";
+        }
+      );
+      systems = [ "40ants-plantuml-tests" ];
+      lispLibs = [ (getAttr "rove" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  _40ants-routes = (
+    build-asdf-system {
+      pname = "40ants-routes";
+      version = "20250622-git";
+      asds = [ "40ants-routes" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz";
+          sha256 = "0dc613f8605a88s7ggvkg2vkj5zfhdk9ijcqnh3kvz6258qqhcgr";
+          system = "40ants-routes";
+          asd = "40ants-routes";
+        }
+      );
+      systems = [ "40ants-routes" ];
+      lispLibs = [
+        (getAttr "_40ants-asdf-system" self)
+        (getAttr "alexandria" self)
+        (getAttr "cl-ppcre" self)
+        (getAttr "serapeum" self)
+        (getAttr "split-sequence" self)
+        (getAttr "str" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  _40ants-routes-ci = (
+    build-asdf-system {
+      pname = "40ants-routes-ci";
+      version = "20250622-git";
+      asds = [ "40ants-routes-ci" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz";
+          sha256 = "0dc613f8605a88s7ggvkg2vkj5zfhdk9ijcqnh3kvz6258qqhcgr";
+          system = "40ants-routes-ci";
+          asd = "40ants-routes-ci";
+        }
+      );
+      systems = [ "40ants-routes-ci" ];
+      lispLibs = [ (getAttr "_40ants-ci" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  _40ants-routes-docs = (
+    build-asdf-system {
+      pname = "40ants-routes-docs";
+      version = "20250622-git";
+      asds = [ "40ants-routes-docs" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz";
+          sha256 = "0dc613f8605a88s7ggvkg2vkj5zfhdk9ijcqnh3kvz6258qqhcgr";
+          system = "40ants-routes-docs";
+          asd = "40ants-routes-docs";
+        }
+      );
+      systems = [ "40ants-routes-docs" ];
+      lispLibs = [
+        (getAttr "_40ants-doc" self)
+        (getAttr "_40ants-routes" self)
+        (getAttr "docs-config" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  _40ants-routes-tests = (
+    build-asdf-system {
+      pname = "40ants-routes-tests";
+      version = "20250622-git";
+      asds = [ "40ants-routes-tests" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz";
+          sha256 = "0dc613f8605a88s7ggvkg2vkj5zfhdk9ijcqnh3kvz6258qqhcgr";
+          system = "40ants-routes-tests";
+          asd = "40ants-routes-tests";
+        }
+      );
+      systems = [ "40ants-routes-tests" ];
+      lispLibs = [
+        (getAttr "_40ants-routes" self)
+        (getAttr "alexandria" self)
+        (getAttr "cl-ppcre" self)
+        (getAttr "rove" self)
+        (getAttr "serapeum" self)
+        (getAttr "split-sequence" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   _40ants-slynk = (
     build-asdf-system {
       pname = "40ants-slynk";
@@ -1375,6 +1638,31 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  abstract-arrays = (
+    build-asdf-system {
+      pname = "abstract-arrays";
+      version = "20250622-git";
+      asds = [ "abstract-arrays" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/abstract-arrays/2025-06-22/abstract-arrays-20250622-git.tgz";
+          sha256 = "0d26ig4czff69ws942rwg8126mxxzifb2490pscgk7056m71drkr";
+          system = "abstract-arrays";
+          asd = "abstract-arrays";
+        }
+      );
+      systems = [ "abstract-arrays" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "closer-mop" self)
+        (getAttr "peltadot" self)
+        (getAttr "peltadot-traits-library" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   abstract-classes = (
     build-asdf-system {
       pname = "abstract-classes";
@@ -1398,12 +1686,12 @@ lib.makeScope pkgs.newScope (self: {
   access = (
     build-asdf-system {
       pname = "access";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "access" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/access/2024-10-12/access-20241012-git.tgz";
-          sha256 = "0zdjqhb9rvnlq6nzmsp7372gi91k1rq9bz510m6hcki7g3r01iv5";
+          url = "http://beta.quicklisp.org/archive/access/2025-06-22/access-20250622-git.tgz";
+          sha256 = "1m9m97qnih57z7zn470myxs3vpraa0v40b84p2wd1i8qjp9ysbrx";
           system = "access";
           asd = "access";
         }
@@ -1530,12 +1818,12 @@ lib.makeScope pkgs.newScope (self: {
   action-list = (
     build-asdf-system {
       pname = "action-list";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "action-list" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/action-list/2024-10-12/action-list-20241012-git.tgz";
-          sha256 = "0ky38svlm0xhgsmh5maqj314q4wl3apg7532q8apy37axg1y3xvh";
+          url = "http://beta.quicklisp.org/archive/action-list/2025-06-22/action-list-20250622-git.tgz";
+          sha256 = "10x90idgrzhc7blg85mgbr6yrh23rhwavcm4p0kbjmgnnfvvibq9";
           system = "action-list";
           asd = "action-list";
         }
@@ -1553,12 +1841,12 @@ lib.makeScope pkgs.newScope (self: {
   add-two = (
     build-asdf-system {
       pname = "add-two";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "add-two" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/whereiseveryone.command-line-args/2024-10-12/whereiseveryone.command-line-args-20241012-git.tgz";
-          sha256 = "140xnz2v0v3hfg3dp2fhidw8ns6lxd3a5knm07wqdp48ksg119wy";
+          url = "http://beta.quicklisp.org/archive/command-line-args/2025-06-22/command-line-args-20250622-git.tgz";
+          sha256 = "14x68ww8323vkvql3ryn9wkxf4fbj1brdn4f6mynr7wqygink2bd";
           system = "add-two";
           asd = "add-two";
         }
@@ -1732,12 +2020,12 @@ lib.makeScope pkgs.newScope (self: {
   adp = (
     build-asdf-system {
       pname = "adp";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "adp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/adp/2024-10-12/adp-20241012-git.tgz";
-          sha256 = "04h91m2x1vcn8iidhx1y2cwb8j55siiifhx1ksy7hyn9hf39b2kv";
+          url = "http://beta.quicklisp.org/archive/adp/2025-06-22/adp-20250622-git.tgz";
+          sha256 = "0qa0l0k39xf36f09axwmzyv4fbjys87jaalr5szpdv7h64qp2x1j";
           system = "adp";
           asd = "adp";
         }
@@ -1756,12 +2044,12 @@ lib.makeScope pkgs.newScope (self: {
   adp-github = (
     build-asdf-system {
       pname = "adp-github";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "adp-github" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/adp-github/2024-10-12/adp-github-20241012-git.tgz";
-          sha256 = "1g33l2k6pc5m8d0d3dl4rf8p364563jpyk22rywrh5188m9nayjc";
+          url = "http://beta.quicklisp.org/archive/adp-github/2025-06-22/adp-github-20250622-git.tgz";
+          sha256 = "0qja8zh1sibnffnjhl914gzifmxhxfkqylh972mak0i62y6njjqa";
           system = "adp-github";
           asd = "adp-github";
         }
@@ -1770,7 +2058,9 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "adp" self)
         (getAttr "alexandria" self)
+        (getAttr "cl-ppcre" self)
         (getAttr "closer-mop" self)
+        (getAttr "hyperspec" self)
         (getAttr "trivial-arguments" self)
       ];
       meta = {
@@ -1778,26 +2068,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  adp-plain = (
-    build-asdf-system {
-      pname = "adp-plain";
-      version = "20241012-git";
-      asds = [ "adp-plain" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/adp-plain/2024-10-12/adp-plain-20241012-git.tgz";
-          sha256 = "0dnfx7hhdibkg0qphs3wsfll2kmpkfpg4hxfjv2paxnsmqdhspnz";
-          system = "adp-plain";
-          asd = "adp-plain";
-        }
-      );
-      systems = [ "adp-plain" ];
-      lispLibs = [ (getAttr "adp" self) ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   advanced-readtable = (
     build-asdf-system {
       pname = "advanced-readtable";
@@ -1821,12 +2091,12 @@ lib.makeScope pkgs.newScope (self: {
   aether = (
     build-asdf-system {
       pname = "aether";
-      version = "v1.1.0";
+      version = "v1.2.0";
       asds = [ "aether" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/aether/2021-12-09/aether-v1.1.0.tgz";
-          sha256 = "0q60gc4lsxpvv4g572mnhpzkziq1412k1q0xm4y2d1zigryg30bb";
+          url = "http://beta.quicklisp.org/archive/aether/2025-06-22/aether-v1.2.0.tgz";
+          sha256 = "0c5ab4lkjxr7yyqjzc6lmkmz6ynqzn0yf7bcjg2kg1qzarphjj3n";
           system = "aether";
           asd = "aether";
         }
@@ -1846,12 +2116,12 @@ lib.makeScope pkgs.newScope (self: {
   aether-tests = (
     build-asdf-system {
       pname = "aether-tests";
-      version = "v1.1.0";
+      version = "v1.2.0";
       asds = [ "aether-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/aether/2021-12-09/aether-v1.1.0.tgz";
-          sha256 = "0q60gc4lsxpvv4g572mnhpzkziq1412k1q0xm4y2d1zigryg30bb";
+          url = "http://beta.quicklisp.org/archive/aether/2025-06-22/aether-v1.2.0.tgz";
+          sha256 = "0c5ab4lkjxr7yyqjzc6lmkmz6ynqzn0yf7bcjg2kg1qzarphjj3n";
           system = "aether-tests";
           asd = "aether-tests";
         }
@@ -1866,6 +2136,33 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  affinity = (
+    build-asdf-system {
+      pname = "affinity";
+      version = "20250622-git";
+      asds = [ "affinity" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/more-cffi/2025-06-22/more-cffi-20250622-git.tgz";
+          sha256 = "0z9l5pk6ckbipxdsfwadjl6hp4134w3m3nk7klmzbvd0930cygw3";
+          system = "affinity";
+          asd = "affinity";
+        }
+      );
+      systems = [ "affinity" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "allioli" self)
+        (getAttr "cffi" self)
+        (getAttr "clith" self)
+        (getAttr "expanders" self)
+        (getAttr "named-readtables" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   agnostic-lizard = (
     build-asdf-system {
       pname = "agnostic-lizard";
@@ -1997,12 +2294,12 @@ lib.makeScope pkgs.newScope (self: {
   alexandria_plus = (
     build-asdf-system {
       pname = "alexandria+";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "alexandria+" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/alexandria-plus/2024-10-12/alexandria-plus-20241012-git.tgz";
-          sha256 = "05j88i289nx2dgc8r3n3h8x3ma31gk8xk2bpvxc5y9yzfl2mp0hk";
+          url = "http://beta.quicklisp.org/archive/alexandria-plus/2025-06-22/alexandria-plus-20250622-git.tgz";
+          sha256 = "09r51sck0andgq6nybsw35583zvyb6prp9jb2rk1ryi1w3grqh9i";
           system = "alexandria+";
           asd = "alexandria+";
         }
@@ -2060,12 +2357,12 @@ lib.makeScope pkgs.newScope (self: {
   also-alsa = (
     build-asdf-system {
       pname = "also-alsa";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "also-alsa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/also-alsa/2023-10-21/also-alsa-20231021-git.tgz";
-          sha256 = "17xvq04nnw2kmxvahj56ja5k21d3wg3fzclbfm36fn641lr6l7dx";
+          url = "http://beta.quicklisp.org/archive/also-alsa/2025-06-22/also-alsa-20250622-git.tgz";
+          sha256 = "1aqi9pf1pr68hbncxqwsymsvv21cmwgqyczp2rszy843r9ffrwrl";
           system = "also-alsa";
           asd = "also-alsa";
         }
@@ -2189,12 +2486,12 @@ lib.makeScope pkgs.newScope (self: {
   anatevka = (
     build-asdf-system {
       pname = "anatevka";
-      version = "v1.0.1";
+      version = "v1.1.0";
       asds = [ "anatevka" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/anatevka/2024-10-12/anatevka-v1.0.1.tgz";
-          sha256 = "1cxrbbb947pccy6532cxqrdlkfpm0m6z135mnyaiplfsd77jy772";
+          url = "http://beta.quicklisp.org/archive/anatevka/2025-06-22/anatevka-v1.1.0.tgz";
+          sha256 = "0cxx28fzs2bmq2mwvw86sh7rrqvnp5ifddsckg4fp8g6ajrb6zjr";
           system = "anatevka";
           asd = "anatevka";
         }
@@ -2209,31 +2506,53 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  anatevka-tests = (
+  anathema = (
     build-asdf-system {
-      pname = "anatevka-tests";
-      version = "v1.0.1";
-      asds = [ "anatevka-tests" ];
+      pname = "anathema";
+      version = "production-0ae10e2a-git";
+      asds = [ "anathema" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/anatevka/2024-10-12/anatevka-v1.0.1.tgz";
-          sha256 = "1cxrbbb947pccy6532cxqrdlkfpm0m6z135mnyaiplfsd77jy772";
-          system = "anatevka-tests";
-          asd = "anatevka-tests";
+          url = "http://beta.quicklisp.org/archive/anathema/2025-06-22/anathema-production-0ae10e2a-git.tgz";
+          sha256 = "0cqi5f4x5yqhn6rh8kmax2fqshqfcpf68glz8fvwyw7v35plsn5x";
+          system = "anathema";
+          asd = "anathema";
         }
       );
-      systems = [ "anatevka-tests" ];
+      systems = [ "anathema" ];
       lispLibs = [
-        (getAttr "anatevka" self)
+        (getAttr "alexandria" self)
+        (getAttr "cl-colors2" self)
+        (getAttr "clim" self)
         (getAttr "closer-mop" self)
-        (getAttr "fiasco" self)
-        (getAttr "trivial-garbage" self)
+        (getAttr "serapeum" self)
+        (getAttr "split-sequence" self)
       ];
       meta = {
         hydraPlatforms = [ ];
       };
     }
   );
+  anathema-doom = (
+    build-asdf-system {
+      pname = "anathema-doom";
+      version = "production-0ae10e2a-git";
+      asds = [ "anathema-doom" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/anathema/2025-06-22/anathema-production-0ae10e2a-git.tgz";
+          sha256 = "0cqi5f4x5yqhn6rh8kmax2fqshqfcpf68glz8fvwyw7v35plsn5x";
+          system = "anathema-doom";
+          asd = "anathema-doom";
+        }
+      );
+      systems = [ "anathema-doom" ];
+      lispLibs = [ (getAttr "anathema" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   ansi-escape = (
     build-asdf-system {
       pname = "ansi-escape";
@@ -2371,12 +2690,12 @@ lib.makeScope pkgs.newScope (self: {
   aplesque = (
     build-asdf-system {
       pname = "aplesque";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "aplesque" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "aplesque";
           asd = "aplesque";
         }
@@ -2426,12 +2745,12 @@ lib.makeScope pkgs.newScope (self: {
   apply-argv = (
     build-asdf-system {
       pname = "apply-argv";
-      version = "20150608-git";
+      version = "20250622-git";
       asds = [ "apply-argv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/apply-argv/2015-06-08/apply-argv-20150608-git.tgz";
-          sha256 = "19qj847vyawjgm5iwk96469c0plnxj37948ac1bcd86hgpbm75w0";
+          url = "http://beta.quicklisp.org/archive/apply-argv/2025-06-22/apply-argv-20250622-git.tgz";
+          sha256 = "1g15210azg5275zh9p3m9mbvwzlxasgkxl5c3m4bhq8v0pjws2m0";
           system = "apply-argv";
           asd = "apply-argv";
         }
@@ -2443,38 +2762,15 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  apply-argv-tests = (
-    build-asdf-system {
-      pname = "apply-argv-tests";
-      version = "20150608-git";
-      asds = [ "apply-argv-tests" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/apply-argv/2015-06-08/apply-argv-20150608-git.tgz";
-          sha256 = "19qj847vyawjgm5iwk96469c0plnxj37948ac1bcd86hgpbm75w0";
-          system = "apply-argv-tests";
-          asd = "apply-argv";
-        }
-      );
-      systems = [ "apply-argv-tests" ];
-      lispLibs = [
-        (getAttr "apply-argv" self)
-        (getAttr "fiveam" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   april = (
     build-asdf-system {
       pname = "april";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "april" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april";
           asd = "april";
         }
@@ -2504,12 +2800,12 @@ lib.makeScope pkgs.newScope (self: {
   april-demo_dot_cnn = (
     build-asdf-system {
       pname = "april-demo.cnn";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "april-demo.cnn" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-demo.cnn";
           asd = "april-demo.cnn";
         }
@@ -2527,12 +2823,12 @@ lib.makeScope pkgs.newScope (self: {
   april-demo_dot_fnn = (
     build-asdf-system {
       pname = "april-demo.fnn";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "april-demo.fnn" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-demo.fnn";
           asd = "april-demo.fnn";
         }
@@ -2548,15 +2844,39 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  april-demo_dot_ncurses = (
+    build-asdf-system {
+      pname = "april-demo.ncurses";
+      version = "20250622-git";
+      asds = [ "april-demo.ncurses" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
+          system = "april-demo.ncurses";
+          asd = "april-demo.ncurses";
+        }
+      );
+      systems = [ "april-demo.ncurses" ];
+      lispLibs = [
+        (getAttr "april" self)
+        (getAttr "croatoan" self)
+        (getAttr "lparallel" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   april-lib_dot_dfns_dot_array = (
     build-asdf-system {
       pname = "april-lib.dfns.array";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "april-lib.dfns.array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-lib.dfns.array";
           asd = "april-lib.dfns.array";
         }
@@ -2571,12 +2891,12 @@ lib.makeScope pkgs.newScope (self: {
   april-lib_dot_dfns_dot_graph = (
     build-asdf-system {
       pname = "april-lib.dfns.graph";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "april-lib.dfns.graph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-lib.dfns.graph";
           asd = "april-lib.dfns.graph";
         }
@@ -2594,12 +2914,12 @@ lib.makeScope pkgs.newScope (self: {
   april-lib_dot_dfns_dot_numeric = (
     build-asdf-system {
       pname = "april-lib.dfns.numeric";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "april-lib.dfns.numeric" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-lib.dfns.numeric";
           asd = "april-lib.dfns.numeric";
         }
@@ -2617,12 +2937,12 @@ lib.makeScope pkgs.newScope (self: {
   april-lib_dot_dfns_dot_power = (
     build-asdf-system {
       pname = "april-lib.dfns.power";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "april-lib.dfns.power" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-lib.dfns.power";
           asd = "april-lib.dfns.power";
         }
@@ -2640,12 +2960,12 @@ lib.makeScope pkgs.newScope (self: {
   april-lib_dot_dfns_dot_string = (
     build-asdf-system {
       pname = "april-lib.dfns.string";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "april-lib.dfns.string" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-lib.dfns.string";
           asd = "april-lib.dfns.string";
         }
@@ -2663,12 +2983,12 @@ lib.makeScope pkgs.newScope (self: {
   april-lib_dot_dfns_dot_tree = (
     build-asdf-system {
       pname = "april-lib.dfns.tree";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "april-lib.dfns.tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-lib.dfns.tree";
           asd = "april-lib.dfns.tree";
         }
@@ -2687,12 +3007,12 @@ lib.makeScope pkgs.newScope (self: {
   april-xt_dot_uzuki = (
     build-asdf-system {
       pname = "april-xt.uzuki";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "april-xt.uzuki" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-xt.uzuki";
           asd = "april-xt.uzuki";
         }
@@ -2988,12 +3308,12 @@ lib.makeScope pkgs.newScope (self: {
   arnesi = (
     build-asdf-system {
       pname = "arnesi";
-      version = "20170403-git";
+      version = "20250622-git";
       asds = [ "arnesi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz";
-          sha256 = "0jgj2xgd1gq6rf8ia43lkmbrbxnp8rgs053br9azfa25ygk3ikbh";
+          url = "http://beta.quicklisp.org/archive/arnesi/2025-06-22/arnesi-20250622-git.tgz";
+          sha256 = "1z99bmvlb2rhklad6dbvc4wnvp2b2ixdjvm9s1bsa9qryz360p99";
           system = "arnesi";
           asd = "arnesi";
         }
@@ -3655,12 +3975,12 @@ lib.makeScope pkgs.newScope (self: {
   async-process = (
     build-asdf-system {
       pname = "async-process";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "async-process" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/async-process/2024-10-12/async-process-20241012-git.tgz";
-          sha256 = "0691z0vs5c65m24p1yi12iy27j59layzvzyy1yl19704x05442qh";
+          url = "http://beta.quicklisp.org/archive/async-process/2025-06-22/async-process-20250622-git.tgz";
+          sha256 = "0ykbkmcf46rgiphsb8c03xf9l4l23xn1rppm51mviz7brs0zx7g4";
           system = "async-process";
           asd = "async-process";
         }
@@ -3702,12 +4022,12 @@ lib.makeScope pkgs.newScope (self: {
   atomics = (
     build-asdf-system {
       pname = "atomics";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "atomics" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/atomics/2024-10-12/atomics-20241012-git.tgz";
-          sha256 = "1ah6fgvfva0axnhj4sp1qy6gjyw41fkhpnv998di0wbp6hls8j39";
+          url = "http://beta.quicklisp.org/archive/atomics/2025-06-22/atomics-20250622-git.tgz";
+          sha256 = "14x6mahmwxjm91zvg59z189l081ww6wlia7gbamj8ydx214014cl";
           system = "atomics";
           asd = "atomics";
         }
@@ -3722,12 +4042,12 @@ lib.makeScope pkgs.newScope (self: {
   atomics-test = (
     build-asdf-system {
       pname = "atomics-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "atomics-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/atomics/2024-10-12/atomics-20241012-git.tgz";
-          sha256 = "1ah6fgvfva0axnhj4sp1qy6gjyw41fkhpnv998di0wbp6hls8j39";
+          url = "http://beta.quicklisp.org/archive/atomics/2025-06-22/atomics-20250622-git.tgz";
+          sha256 = "14x6mahmwxjm91zvg59z189l081ww6wlia7gbamj8ydx214014cl";
           system = "atomics-test";
           asd = "atomics-test";
         }
@@ -3811,12 +4131,12 @@ lib.makeScope pkgs.newScope (self: {
   auto-restart = (
     build-asdf-system {
       pname = "auto-restart";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "auto-restart" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/auto-restart/2024-10-12/auto-restart-20241012-git.tgz";
-          sha256 = "1kz50w4x7glin8fyrfysazz07r4rrk90daml35yrwnz08vi3dfw7";
+          url = "http://beta.quicklisp.org/archive/auto-restart/2025-06-22/auto-restart-20250622-git.tgz";
+          sha256 = "0dmdxq04m70b0cl2vag31f5c3gsyv46w335igzrvxy45irjb4h7v";
           system = "auto-restart";
           asd = "auto-restart";
         }
@@ -3851,15 +4171,35 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  autoload = (
+    build-asdf-system {
+      pname = "autoload";
+      version = "20250622-git";
+      asds = [ "autoload" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
+          system = "autoload";
+          asd = "autoload";
+        }
+      );
+      systems = [ "autoload" ];
+      lispLibs = [ (getAttr "mgl-pax_dot_asdf" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   automaton = (
     build-asdf-system {
       pname = "automaton";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "automaton" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "automaton";
           asd = "automaton";
         }
@@ -3968,12 +4308,12 @@ lib.makeScope pkgs.newScope (self: {
   aws-sdk = (
     build-asdf-system {
       pname = "aws-sdk";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "aws-sdk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/aws-sdk-lisp/2024-10-12/aws-sdk-lisp-20241012-git.tgz";
-          sha256 = "0iqm441fr1qx5py7cvrv4jl9zgfsm813igwvq3rj90606g6lyxjc";
+          url = "http://beta.quicklisp.org/archive/aws-sdk-lisp/2025-06-22/aws-sdk-lisp-20250622-git.tgz";
+          sha256 = "023isx4p9laia3yq39g3zdak1zl3mc7gnkjhsx386akwdjha5j95";
           system = "aws-sdk";
           asd = "aws-sdk";
         }
@@ -3986,6 +4326,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "babel" self)
         (getAttr "cl-base64" self)
         (getAttr "cl-ppcre" self)
+        (getAttr "closer-mop" self)
         (getAttr "dexador" self)
         (getAttr "ironclad" self)
         (getAttr "kebab" self)
@@ -4213,12 +4554,12 @@ lib.makeScope pkgs.newScope (self: {
   base = (
     build-asdf-system {
       pname = "base";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "base";
           asd = "base";
         }
@@ -4317,15 +4658,64 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  batis = (
+    build-asdf-system {
+      pname = "batis";
+      version = "20250622-git";
+      asds = [ "batis" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-batis/2025-06-22/cl-batis-20250622-git.tgz";
+          sha256 = "1hmgvp32ivs34xj6a5nnrmj16kphdckz1ygfkrb5f0iwr305qbjf";
+          system = "batis";
+          asd = "batis";
+        }
+      );
+      systems = [ "batis" ];
+      lispLibs = [
+        (getAttr "cl-dbi" self)
+        (getAttr "cl-dbi-connection-pool" self)
+        (getAttr "cl-ppcre" self)
+        (getAttr "cl-syntax" self)
+        (getAttr "cl-syntax-annot" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  batis-test = (
+    build-asdf-system {
+      pname = "batis-test";
+      version = "20250622-git";
+      asds = [ "batis-test" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-batis/2025-06-22/cl-batis-20250622-git.tgz";
+          sha256 = "1hmgvp32ivs34xj6a5nnrmj16kphdckz1ygfkrb5f0iwr305qbjf";
+          system = "batis-test";
+          asd = "batis-test";
+        }
+      );
+      systems = [ "batis-test" ];
+      lispLibs = [
+        (getAttr "batis" self)
+        (getAttr "rove" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   bdef = (
     build-asdf-system {
       pname = "bdef";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "bdef" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bdef/2024-10-12/bdef-20241012-git.tgz";
-          sha256 = "16jz9fxxjcpnmhx0yagv8xs7l0b7qh8yx7i7p8fnlxz3pn7726y6";
+          url = "http://beta.quicklisp.org/archive/bdef/2025-06-22/bdef-20250622-git.tgz";
+          sha256 = "0cq89xn527ryq140j2i08zpyz4lsyb90zz3hrh2qx841k73168i5";
           system = "bdef";
           asd = "bdef";
         }
@@ -4333,6 +4723,7 @@ lib.makeScope pkgs.newScope (self: {
       systems = [ "bdef" ];
       lispLibs = [
         (getAttr "alexandria" self)
+        (getAttr "closer-mop" self)
         (getAttr "eager-future2" self)
         (getAttr "jsown" self)
         (getAttr "mutility" self)
@@ -4516,15 +4907,48 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  bike = (
+    build-asdf-system {
+      pname = "bike";
+      version = "20250622-git";
+      asds = [ "bike" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/bike/2025-06-22/bike-20250622-git.tgz";
+          sha256 = "1d7jcmhqvyc7g4hw76sybc40xla32abpdxjlma677shvvfv9qv5c";
+          system = "bike";
+          asd = "bike";
+        }
+      );
+      systems = [ "bike" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "bike-internals" self)
+        (getAttr "bordeaux-threads" self)
+        (getAttr "cffi" self)
+        (getAttr "cl-ppcre" self)
+        (getAttr "closer-mop" self)
+        (getAttr "flexi-streams" self)
+        (getAttr "global-vars" self)
+        (getAttr "named-readtables" self)
+        (getAttr "split-sequence" self)
+        (getAttr "trivial-features" self)
+        (getAttr "trivial-garbage" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   bike-internals = (
     build-asdf-system {
       pname = "bike-internals";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "bike-internals" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bike/2024-10-12/bike-20241012-git.tgz";
-          sha256 = "0ssv4n39wl3i0r8gy2sg6rxfz571jcfsd6db9ndy13drqnhyda6s";
+          url = "http://beta.quicklisp.org/archive/bike/2025-06-22/bike-20250622-git.tgz";
+          sha256 = "1d7jcmhqvyc7g4hw76sybc40xla32abpdxjlma677shvvfv9qv5c";
           system = "bike-internals";
           asd = "bike-internals";
         }
@@ -4550,12 +4974,12 @@ lib.makeScope pkgs.newScope (self: {
   binary-io = (
     build-asdf-system {
       pname = "binary-io";
-      version = "20201016-git";
+      version = "20250622-git";
       asds = [ "binary-io" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/binary-io/2020-10-16/binary-io-20201016-git.tgz";
-          sha256 = "0gxnl12nydh8aslw78jc4cmq8licj342y2f04jalqb4d9m9jbri2";
+          url = "http://beta.quicklisp.org/archive/binary-io/2025-06-22/binary-io-20250622-git.tgz";
+          sha256 = "1pwvmbnzs15dfvb67b5wchch2b24h6lfs30676y4h4m84jqjr0vg";
           system = "binary-io";
           asd = "binary-io";
         }
@@ -4573,12 +4997,12 @@ lib.makeScope pkgs.newScope (self: {
   binary-lass = (
     build-asdf-system {
       pname = "binary-lass";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "binary-lass" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lass/2024-10-12/lass-20241012-git.tgz";
-          sha256 = "1b6a3v763i5fcdxczffd59kh4m73p4ilz6az85apd22apc8lr80z";
+          url = "http://beta.quicklisp.org/archive/lass/2025-06-22/lass-20250622-git.tgz";
+          sha256 = "0pj9p7asqaqjakjjn8i7k6lb9piakjxd8xa732c88q5qijbmvkb2";
           system = "binary-lass";
           asd = "binary-lass";
         }
@@ -4638,12 +5062,12 @@ lib.makeScope pkgs.newScope (self: {
   binary-structures = (
     build-asdf-system {
       pname = "binary-structures";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "binary-structures" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/binary-structures/2024-10-12/binary-structures-20241012-git.tgz";
-          sha256 = "1ygfa4xgd0wliggmmxlqqh9nd7hfsgjwl168l8s9r595vx6fnzmb";
+          url = "http://beta.quicklisp.org/archive/binary-structures/2025-06-22/binary-structures-20250622-git.tgz";
+          sha256 = "15i2s639pc1s6jw1zzlh114bgkzv61ykdi51g1dah206fwp4lbn7";
           system = "binary-structures";
           asd = "binary-structures";
         }
@@ -4745,12 +5169,12 @@ lib.makeScope pkgs.newScope (self: {
   binding-knx = (
     build-asdf-system {
       pname = "binding-knx";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "binding-knx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chipi/2024-10-12/chipi-20241012-git.tgz";
-          sha256 = "0xpfclvl5v031cjnjvr3bcfc87rayw624m9yrw35f5r31p8m283g";
+          url = "http://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz";
+          sha256 = "00wqwgdzfnwxkm1bd42axp69bpl0gs99i7a3mq2x6q1dvn1rczac";
           system = "binding-knx";
           asd = "binding-knx";
         }
@@ -5078,12 +5502,12 @@ lib.makeScope pkgs.newScope (self: {
   bknr_dot_data_dot_impex = (
     build-asdf-system {
       pname = "bknr.data.impex";
-      version = "20220220-git";
+      version = "20250622-git";
       asds = [ "bknr.data.impex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz";
-          sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm";
+          url = "http://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
+          sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj";
           system = "bknr.data.impex";
           asd = "bknr.data.impex";
         }
@@ -5105,12 +5529,12 @@ lib.makeScope pkgs.newScope (self: {
   bknr_dot_datastore = (
     build-asdf-system {
       pname = "bknr.datastore";
-      version = "20220220-git";
+      version = "20250622-git";
       asds = [ "bknr.datastore" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz";
-          sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm";
+          url = "http://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
+          sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj";
           system = "bknr.datastore";
           asd = "bknr.datastore";
         }
@@ -5134,12 +5558,12 @@ lib.makeScope pkgs.newScope (self: {
   bknr_dot_impex = (
     build-asdf-system {
       pname = "bknr.impex";
-      version = "20220220-git";
+      version = "20250622-git";
       asds = [ "bknr.impex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz";
-          sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm";
+          url = "http://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
+          sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj";
           system = "bknr.impex";
           asd = "bknr.impex";
         }
@@ -5161,12 +5585,12 @@ lib.makeScope pkgs.newScope (self: {
   bknr_dot_indices = (
     build-asdf-system {
       pname = "bknr.indices";
-      version = "20220220-git";
+      version = "20250622-git";
       asds = [ "bknr.indices" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz";
-          sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm";
+          url = "http://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
+          sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj";
           system = "bknr.indices";
           asd = "bknr.indices";
         }
@@ -5220,12 +5644,12 @@ lib.makeScope pkgs.newScope (self: {
   bknr_dot_skip-list = (
     build-asdf-system {
       pname = "bknr.skip-list";
-      version = "20220220-git";
+      version = "20250622-git";
       asds = [ "bknr.skip-list" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz";
-          sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm";
+          url = "http://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
+          sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj";
           system = "bknr.skip-list";
           asd = "bknr.skip-list";
         }
@@ -5237,38 +5661,15 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  bknr_dot_skip-list_dot_test = (
-    build-asdf-system {
-      pname = "bknr.skip-list.test";
-      version = "20220220-git";
-      asds = [ "bknr.skip-list.test" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz";
-          sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm";
-          system = "bknr.skip-list.test";
-          asd = "bknr.skip-list";
-        }
-      );
-      systems = [ "bknr.skip-list.test" ];
-      lispLibs = [
-        (getAttr "bknr_dot_skip-list" self)
-        (getAttr "unit-test" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   bknr_dot_utils = (
     build-asdf-system {
       pname = "bknr.utils";
-      version = "20220220-git";
+      version = "20250622-git";
       asds = [ "bknr.utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz";
-          sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm";
+          url = "http://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
+          sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj";
           system = "bknr.utils";
           asd = "bknr.utils";
         }
@@ -5329,12 +5730,12 @@ lib.makeScope pkgs.newScope (self: {
   bknr_dot_xml = (
     build-asdf-system {
       pname = "bknr.xml";
-      version = "20220220-git";
+      version = "20250622-git";
       asds = [ "bknr.xml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz";
-          sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm";
+          url = "http://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
+          sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj";
           system = "bknr.xml";
           asd = "bknr.xml";
         }
@@ -6141,12 +6542,12 @@ lib.makeScope pkgs.newScope (self: {
   bp = (
     build-asdf-system {
       pname = "bp";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "bp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bp/2023-10-21/bp-20231021-git.tgz";
-          sha256 = "1l58bf2fq0807id4cs39sajsfw0z7zz4gxb2vpcvfa9nxcbyziqx";
+          url = "http://beta.quicklisp.org/archive/bp/2025-06-22/bp-20250622-git.tgz";
+          sha256 = "06g7xrkll4qqkqhlwqsw695yann8fpvz5ln5lzigqljzyg09wxk8";
           system = "bp";
           asd = "bp";
         }
@@ -6591,12 +6992,12 @@ lib.makeScope pkgs.newScope (self: {
   bus = (
     build-asdf-system {
       pname = "bus";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "bus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "bus";
           asd = "bus";
         }
@@ -7124,49 +7525,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  cardioex = (
-    build-asdf-system {
-      pname = "cardioex";
-      version = "20211020-git";
-      asds = [ "cardioex" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/cardiogram/2021-10-20/cardiogram-20211020-git.tgz";
-          sha256 = "08kqcj3c4vkx5s6ba9m67xh7w7paaavp2ds072crp1x7pjkh4n5i";
-          system = "cardioex";
-          asd = "cardioex";
-        }
-      );
-      systems = [ "cardioex" ];
-      lispLibs = [ (getAttr "cardiogram" self) ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  cardiogram = (
-    build-asdf-system {
-      pname = "cardiogram";
-      version = "20211020-git";
-      asds = [ "cardiogram" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/cardiogram/2021-10-20/cardiogram-20211020-git.tgz";
-          sha256 = "08kqcj3c4vkx5s6ba9m67xh7w7paaavp2ds072crp1x7pjkh4n5i";
-          system = "cardiogram";
-          asd = "cardiogram";
-        }
-      );
-      systems = [ "cardiogram" ];
-      lispLibs = [
-        (getAttr "cl-annot" self)
-        (getAttr "closer-mop" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   cari3s = (
     build-asdf-system {
       pname = "cari3s";
@@ -7467,12 +7825,12 @@ lib.makeScope pkgs.newScope (self: {
   cbor = (
     build-asdf-system {
       pname = "cbor";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cbor" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cbor/2024-10-12/cbor-20241012-git.tgz";
-          sha256 = "0bkjfi449m651hbsm39dc9863mcry3ynz1j59wb2kl8zwxm1qg2r";
+          url = "http://beta.quicklisp.org/archive/cbor/2025-06-22/cbor-20250622-git.tgz";
+          sha256 = "1ln6n4faw3a89qksdla983ah3q8dd0hb0c0didx253vyncrgqxvg";
           system = "cbor";
           asd = "cbor";
         }
@@ -7489,6 +7847,33 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  cbor-tests = (
+    build-asdf-system {
+      pname = "cbor-tests";
+      version = "20250622-git";
+      asds = [ "cbor-tests" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cbor/2025-06-22/cbor-20250622-git.tgz";
+          sha256 = "1ln6n4faw3a89qksdla983ah3q8dd0hb0c0didx253vyncrgqxvg";
+          system = "cbor-tests";
+          asd = "cbor-tests";
+        }
+      );
+      systems = [ "cbor-tests" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "cbor" self)
+        (getAttr "equals" self)
+        (getAttr "local-time" self)
+        (getAttr "parachute" self)
+        (getAttr "yason" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   ccl-compat = (
     build-asdf-system {
       pname = "ccl-compat";
@@ -8014,12 +8399,12 @@ lib.makeScope pkgs.newScope (self: {
   cerberus = (
     build-asdf-system {
       pname = "cerberus";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cerberus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cerberus/2024-10-12/cerberus-20241012-git.tgz";
-          sha256 = "131x0raccj5majd72hmmlp67dsj2zdizm2xzdhw6s0jbxjbhdgfs";
+          url = "http://beta.quicklisp.org/archive/cerberus/2025-06-22/cerberus-20250622-git.tgz";
+          sha256 = "1pky9xdh1189ld5qjnm6mh6457vs0gx2q7jn1mxmn4fl4zkvk3q7";
           system = "cerberus";
           asd = "cerberus";
         }
@@ -8042,14 +8427,14 @@ lib.makeScope pkgs.newScope (self: {
   cerberus-kdc = (
     build-asdf-system {
       pname = "cerberus-kdc";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cerberus-kdc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cerberus/2024-10-12/cerberus-20241012-git.tgz";
-          sha256 = "131x0raccj5majd72hmmlp67dsj2zdizm2xzdhw6s0jbxjbhdgfs";
+          url = "http://beta.quicklisp.org/archive/cerberus/2025-06-22/cerberus-20250622-git.tgz";
+          sha256 = "1pky9xdh1189ld5qjnm6mh6457vs0gx2q7jn1mxmn4fl4zkvk3q7";
           system = "cerberus-kdc";
-          asd = "cerberus";
+          asd = "cerberus-kdc";
         }
       );
       systems = [ "cerberus-kdc" ];
@@ -8109,12 +8494,12 @@ lib.makeScope pkgs.newScope (self: {
   cf = (
     build-asdf-system {
       pname = "cf";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cf/2024-10-12/cl-cf-20241012-git.tgz";
-          sha256 = "1w4asb8v81q2rf8fhhq88c2ib4ax5fbm0655kvdpfvkz1457yi25";
+          url = "http://beta.quicklisp.org/archive/cl-cf/2025-06-22/cl-cf-20250622-git.tgz";
+          sha256 = "0bacgspfqvkdr430yax9dk61pavcajz9kv9lb12rg5qcrqd1vpmb";
           system = "cf";
           asd = "cf";
         }
@@ -8129,12 +8514,12 @@ lib.makeScope pkgs.newScope (self: {
   cf-tests = (
     build-asdf-system {
       pname = "cf-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cf-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cf/2024-10-12/cl-cf-20241012-git.tgz";
-          sha256 = "1w4asb8v81q2rf8fhhq88c2ib4ax5fbm0655kvdpfvkz1457yi25";
+          url = "http://beta.quicklisp.org/archive/cl-cf/2025-06-22/cl-cf-20250622-git.tgz";
+          sha256 = "0bacgspfqvkdr430yax9dk61pavcajz9kv9lb12rg5qcrqd1vpmb";
           system = "cf-tests";
           asd = "cf-tests";
         }
@@ -8152,12 +8537,12 @@ lib.makeScope pkgs.newScope (self: {
   cffi = (
     build-asdf-system {
       pname = "cffi";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz";
-          sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7";
+          url = "http://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
+          sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1";
           system = "cffi";
           asd = "cffi";
         }
@@ -8197,12 +8582,12 @@ lib.makeScope pkgs.newScope (self: {
   cffi-examples = (
     build-asdf-system {
       pname = "cffi-examples";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cffi-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz";
-          sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7";
+          url = "http://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
+          sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1";
           system = "cffi-examples";
           asd = "cffi-examples";
         }
@@ -8217,12 +8602,12 @@ lib.makeScope pkgs.newScope (self: {
   cffi-grovel = (
     build-asdf-system {
       pname = "cffi-grovel";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cffi-grovel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz";
-          sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7";
+          url = "http://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
+          sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1";
           system = "cffi-grovel";
           asd = "cffi-grovel";
         }
@@ -8239,12 +8624,12 @@ lib.makeScope pkgs.newScope (self: {
   cffi-libffi = (
     build-asdf-system {
       pname = "cffi-libffi";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cffi-libffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz";
-          sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7";
+          url = "http://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
+          sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1";
           system = "cffi-libffi";
           asd = "cffi-libffi";
         }
@@ -8263,12 +8648,12 @@ lib.makeScope pkgs.newScope (self: {
   cffi-object = (
     build-asdf-system {
       pname = "cffi-object";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cffi-object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi-object/2024-10-12/cffi-object-20241012-git.tgz";
-          sha256 = "0hdxy2lqf0q04j57y6plnlh2v6w7y7prsypxk9f4vdlnp2ah3lln";
+          url = "http://beta.quicklisp.org/archive/cffi-object/2025-06-22/cffi-object-20250622-git.tgz";
+          sha256 = "1v5yaf2y366mbpqbvqnqg1za5k3vsa6d4px56ldis996vb2kv84h";
           system = "cffi-object";
           asd = "cffi-object";
         }
@@ -8287,12 +8672,12 @@ lib.makeScope pkgs.newScope (self: {
   cffi-object_dot_ops = (
     build-asdf-system {
       pname = "cffi-object.ops";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cffi-object.ops" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi-object/2024-10-12/cffi-object-20241012-git.tgz";
-          sha256 = "0hdxy2lqf0q04j57y6plnlh2v6w7y7prsypxk9f4vdlnp2ah3lln";
+          url = "http://beta.quicklisp.org/archive/cffi-object/2025-06-22/cffi-object-20250622-git.tgz";
+          sha256 = "1v5yaf2y366mbpqbvqnqg1za5k3vsa6d4px56ldis996vb2kv84h";
           system = "cffi-object.ops";
           asd = "cffi-object.ops";
         }
@@ -8310,12 +8695,12 @@ lib.makeScope pkgs.newScope (self: {
   cffi-ops = (
     build-asdf-system {
       pname = "cffi-ops";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cffi-ops" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi-ops/2024-10-12/cffi-ops-20241012-git.tgz";
-          sha256 = "0hi3svwfb7m1wq892wlrsgj52jkh3x6msnimax28221baj6g64gg";
+          url = "http://beta.quicklisp.org/archive/cffi-ops/2025-06-22/cffi-ops-20250622-git.tgz";
+          sha256 = "1si71czfs923p2fjimj3jyjy5gliylxji3dgsfb6w4qaczsmyd33";
           system = "cffi-ops";
           asd = "cffi-ops";
         }
@@ -8335,12 +8720,12 @@ lib.makeScope pkgs.newScope (self: {
   cffi-tests = (
     build-asdf-system {
       pname = "cffi-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cffi-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz";
-          sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7";
+          url = "http://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
+          sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1";
           system = "cffi-tests";
           asd = "cffi-tests";
         }
@@ -8361,12 +8746,12 @@ lib.makeScope pkgs.newScope (self: {
   cffi-toolchain = (
     build-asdf-system {
       pname = "cffi-toolchain";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cffi-toolchain" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz";
-          sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7";
+          url = "http://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
+          sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1";
           system = "cffi-toolchain";
           asd = "cffi-toolchain";
         }
@@ -8379,12 +8764,12 @@ lib.makeScope pkgs.newScope (self: {
   cffi-uffi-compat = (
     build-asdf-system {
       pname = "cffi-uffi-compat";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cffi-uffi-compat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz";
-          sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7";
+          url = "http://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
+          sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1";
           system = "cffi-uffi-compat";
           asd = "cffi-uffi-compat";
         }
@@ -8397,18 +8782,21 @@ lib.makeScope pkgs.newScope (self: {
   chain = (
     build-asdf-system {
       pname = "chain";
-      version = "20211209-git";
+      version = "20250622-git";
       asds = [ "chain" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chain/2021-12-09/chain-20211209-git.tgz";
-          sha256 = "0x8b2cbp1xq61fpbk0mqwbksnfynlgai3782rafsywka8rgfhmjh";
+          url = "http://beta.quicklisp.org/archive/chain/2025-06-22/chain-20250622-git.tgz";
+          sha256 = "10kq8dlwbib6chc9m5wn7v7narjpdksf000vycaj1nqqqdy348mp";
           system = "chain";
           asd = "chain";
         }
       );
       systems = [ "chain" ];
-      lispLibs = [ (getAttr "metabang-bind" self) ];
+      lispLibs = [
+        (getAttr "metabang-bind" self)
+        (getAttr "mgl-pax" self)
+      ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -8520,12 +8908,12 @@ lib.makeScope pkgs.newScope (self: {
   chanl = (
     build-asdf-system {
       pname = "chanl";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "chanl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chanl/2024-10-12/chanl-20241012-git.tgz";
-          sha256 = "1gyvsajvqjzfmcbccnysw7qyvhyqdlfcwl57lhsfwz9gif50y1fw";
+          url = "http://beta.quicklisp.org/archive/chanl/2025-06-22/chanl-20250622-git.tgz";
+          sha256 = "1znps9654lap7yl6y370ji0sjwl9bg9g6bazsjy37yw8kwdjflzh";
           system = "chanl";
           asd = "chanl";
         }
@@ -8897,12 +9285,12 @@ lib.makeScope pkgs.newScope (self: {
   chipi = (
     build-asdf-system {
       pname = "chipi";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "chipi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chipi/2024-10-12/chipi-20241012-git.tgz";
-          sha256 = "0xpfclvl5v031cjnjvr3bcfc87rayw624m9yrw35f5r31p8m283g";
+          url = "http://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz";
+          sha256 = "00wqwgdzfnwxkm1bd42axp69bpl0gs99i7a3mq2x6q1dvn1rczac";
           system = "chipi";
           asd = "chipi";
         }
@@ -8912,12 +9300,12 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "alexandria" self)
         (getAttr "binding-arrows" self)
         (getAttr "cl-cron" self)
+        (getAttr "com_dot_inuoe_dot_jzon" self)
         (getAttr "drakma" self)
         (getAttr "local-time" self)
         (getAttr "parse-float" self)
         (getAttr "sento" self)
         (getAttr "timer-wheel" self)
-        (getAttr "yason" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -8927,12 +9315,12 @@ lib.makeScope pkgs.newScope (self: {
   chipi-web = (
     build-asdf-system {
       pname = "chipi-web";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "chipi-web" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chipi/2024-10-12/chipi-20241012-git.tgz";
-          sha256 = "0xpfclvl5v031cjnjvr3bcfc87rayw624m9yrw35f5r31p8m283g";
+          url = "http://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz";
+          sha256 = "00wqwgdzfnwxkm1bd42axp69bpl0gs99i7a3mq2x6q1dvn1rczac";
           system = "chipi-web";
           asd = "chipi-web";
         }
@@ -8942,7 +9330,6 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "chipi" self)
         (getAttr "cl-base64" self)
         (getAttr "cl-ppcre" self)
-        (getAttr "com_dot_inuoe_dot_jzon" self)
         (getAttr "drakma" self)
         (getAttr "hunchentoot" self)
         (getAttr "ironclad" self)
@@ -8998,12 +9385,12 @@ lib.makeScope pkgs.newScope (self: {
   chirp = (
     build-asdf-system {
       pname = "chirp";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "chirp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chirp/2023-10-21/chirp-20231021-git.tgz";
-          sha256 = "00vin2svx54wpk2yv9645y3gfy5pg78pfpr79srqk7jklr1wwa1m";
+          url = "http://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz";
+          sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q";
           system = "chirp";
           asd = "chirp";
         }
@@ -9018,12 +9405,12 @@ lib.makeScope pkgs.newScope (self: {
   chirp-core = (
     build-asdf-system {
       pname = "chirp-core";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "chirp-core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chirp/2023-10-21/chirp-20231021-git.tgz";
-          sha256 = "00vin2svx54wpk2yv9645y3gfy5pg78pfpr79srqk7jklr1wwa1m";
+          url = "http://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz";
+          sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q";
           system = "chirp-core";
           asd = "chirp-core";
         }
@@ -9049,12 +9436,12 @@ lib.makeScope pkgs.newScope (self: {
   chirp-dexador = (
     build-asdf-system {
       pname = "chirp-dexador";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "chirp-dexador" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chirp/2023-10-21/chirp-20231021-git.tgz";
-          sha256 = "00vin2svx54wpk2yv9645y3gfy5pg78pfpr79srqk7jklr1wwa1m";
+          url = "http://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz";
+          sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q";
           system = "chirp-dexador";
           asd = "chirp-dexador";
         }
@@ -9072,12 +9459,12 @@ lib.makeScope pkgs.newScope (self: {
   chirp-drakma = (
     build-asdf-system {
       pname = "chirp-drakma";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "chirp-drakma" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chirp/2023-10-21/chirp-20231021-git.tgz";
-          sha256 = "00vin2svx54wpk2yv9645y3gfy5pg78pfpr79srqk7jklr1wwa1m";
+          url = "http://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz";
+          sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q";
           system = "chirp-drakma";
           asd = "chirp-drakma";
         }
@@ -9426,12 +9813,12 @@ lib.makeScope pkgs.newScope (self: {
   cl_plus_ssl = (
     build-asdf-system {
       pname = "cl+ssl";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "cl+ssl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl+ssl/2023-10-21/cl+ssl-20231021-git.tgz";
-          sha256 = "0v0kx2m5355jkdshmj0z923c5rlvdl2n11rb3hjbv3kssdfsbs0s";
+          url = "http://beta.quicklisp.org/archive/cl+ssl/2025-06-22/cl+ssl-20250622-git.tgz";
+          sha256 = "0ns7if8f6i3ag0xrxkxy9k25ybypb2y3h4bq75cf7a0y82j3wlax";
           system = "cl+ssl";
           asd = "cl+ssl";
         }
@@ -9453,12 +9840,12 @@ lib.makeScope pkgs.newScope (self: {
   cl_plus_ssl_dot_test = (
     build-asdf-system {
       pname = "cl+ssl.test";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "cl+ssl.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl+ssl/2023-10-21/cl+ssl-20231021-git.tgz";
-          sha256 = "0v0kx2m5355jkdshmj0z923c5rlvdl2n11rb3hjbv3kssdfsbs0s";
+          url = "http://beta.quicklisp.org/archive/cl+ssl/2025-06-22/cl+ssl-20250622-git.tgz";
+          sha256 = "0ns7if8f6i3ag0xrxkxy9k25ybypb2y3h4bq75cf7a0y82j3wlax";
           system = "cl+ssl.test";
           asd = "cl+ssl.test";
         }
@@ -11368,12 +11755,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-ansi-term = (
     build-asdf-system {
       pname = "cl-ansi-term";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-ansi-term" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ansi-term/2024-10-12/cl-ansi-term-20241012-git.tgz";
-          sha256 = "01nrlyb8lqca9z16ndlyy22wqy83ixcr02yibfypj255x6xbql1x";
+          url = "http://beta.quicklisp.org/archive/cl-ansi-term/2025-06-22/cl-ansi-term-20250622-git.tgz";
+          sha256 = "0hrg17bijyhldmc5j8j50q9njqapm5yj7m3sb8azlffam9bpsbza";
           system = "cl-ansi-term";
           asd = "cl-ansi-term";
         }
@@ -11382,6 +11769,7 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "alexandria" self)
         (getAttr "anaphora" self)
+        (getAttr "serapeum" self)
         (getAttr "str" self)
       ];
       meta = {
@@ -11686,12 +12074,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-astar = (
     build-asdf-system {
       pname = "cl-astar";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-astar" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-astar/2024-10-12/cl-astar-20241012-git.tgz";
-          sha256 = "0fdwyg3xnj5sxn4cqycydg0cp1l3ii0brk7ad1sh28m703zmndxv";
+          url = "http://beta.quicklisp.org/archive/cl-astar/2025-06-22/cl-astar-20250622-git.tgz";
+          sha256 = "1hx68wk2r290v1l5g4gp02rj33kc1zf7xbn5c5kmys83f9dq8j9f";
           system = "cl-astar";
           asd = "cl-astar";
         }
@@ -11711,12 +12099,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-async = (
     build-asdf-system {
       pname = "cl-async";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-async" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz";
-          sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr";
+          url = "http://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
+          sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv";
           system = "cl-async";
           asd = "cl-async";
         }
@@ -11763,12 +12151,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-async-base = (
     build-asdf-system {
       pname = "cl-async-base";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-async-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz";
-          sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr";
+          url = "http://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
+          sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv";
           system = "cl-async-base";
           asd = "cl-async";
         }
@@ -11805,12 +12193,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-async-repl = (
     build-asdf-system {
       pname = "cl-async-repl";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-async-repl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz";
-          sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr";
+          url = "http://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
+          sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv";
           system = "cl-async-repl";
           asd = "cl-async-repl";
         }
@@ -11826,12 +12214,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-async-ssl = (
     build-asdf-system {
       pname = "cl-async-ssl";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-async-ssl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz";
-          sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr";
+          url = "http://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
+          sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv";
           system = "cl-async-ssl";
           asd = "cl-async-ssl";
         }
@@ -11848,12 +12236,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-async-test = (
     build-asdf-system {
       pname = "cl-async-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-async-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz";
-          sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr";
+          url = "http://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
+          sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv";
           system = "cl-async-test";
           asd = "cl-async-test";
         }
@@ -11877,12 +12265,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-async-util = (
     build-asdf-system {
       pname = "cl-async-util";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-async-util" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz";
-          sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr";
+          url = "http://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
+          sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv";
           system = "cl-async-util";
           asd = "cl-async";
         }
@@ -11902,11 +12290,11 @@ lib.makeScope pkgs.newScope (self: {
   cl-aubio = (
     build-asdf-system {
       pname = "cl-aubio";
-      version = "20200427-git";
+      version = "20250622-git";
       asds = [ "cl-aubio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-aubio/2020-04-27/cl-aubio-20200427-git.tgz";
+          url = "http://beta.quicklisp.org/archive/cl-aubio/2025-06-22/cl-aubio-20250622-git.tgz";
           sha256 = "1xyflxy46z4487dbnizhv058y2mdka9iyikl097m60w42blidpn3";
           system = "cl-aubio";
           asd = "cl-aubio";
@@ -11917,6 +12305,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "cffi" self)
         (getAttr "cffi-libffi" self)
         (getAttr "closer-mop" self)
+        (getAttr "trivial-features" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -12176,6 +12565,26 @@ lib.makeScope pkgs.newScope (self: {
       meta = { };
     }
   );
+  cl-batis = (
+    build-asdf-system {
+      pname = "cl-batis";
+      version = "20250622-git";
+      asds = [ "cl-batis" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-batis/2025-06-22/cl-batis-20250622-git.tgz";
+          sha256 = "1hmgvp32ivs34xj6a5nnrmj16kphdckz1ygfkrb5f0iwr305qbjf";
+          system = "cl-batis";
+          asd = "cl-batis";
+        }
+      );
+      systems = [ "cl-batis" ];
+      lispLibs = [ (getAttr "batis" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   cl-bayesnet = (
     build-asdf-system {
       pname = "cl-bayesnet";
@@ -12271,6 +12680,31 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  cl-binary-store = (
+    build-asdf-system {
+      pname = "cl-binary-store";
+      version = "stable-9d8b7e7f-git";
+      asds = [ "cl-binary-store" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-binary-store/2025-06-22/cl-binary-store-stable-9d8b7e7f-git.tgz";
+          sha256 = "1x8g65ij6bbfkd9hcy4wm3frjnb83ip05mvdbpm8hwzgkx1ydf94";
+          system = "cl-binary-store";
+          asd = "cl-binary-store";
+        }
+      );
+      systems = [ "cl-binary-store" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "babel" self)
+        (getAttr "flexi-streams" self)
+        (getAttr "static-vectors" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   cl-bip39 = (
     build-asdf-system {
       pname = "cl-bip39";
@@ -12373,12 +12807,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-bmp = (
     build-asdf-system {
       pname = "cl-bmp";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-bmp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bmp/2024-10-12/cl-bmp-20241012-git.tgz";
-          sha256 = "1mcayxjppka40q9xx1qwdvrjjblclnggnicg70i95xqnv5sdwdhz";
+          url = "http://beta.quicklisp.org/archive/cl-bmp/2025-06-22/cl-bmp-20250622-git.tgz";
+          sha256 = "0zv91gad3bvd3sd4ah91d3i1fp0sn23rz6vi3nj28mw9r90sf6z1";
           system = "cl-bmp";
           asd = "cl-bmp";
         }
@@ -13147,12 +13581,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-change-case = (
     build-asdf-system {
       pname = "cl-change-case";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "cl-change-case" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-change-case/2023-10-21/cl-change-case-20231021-git.tgz";
-          sha256 = "0g17n80jmaiyqsx8r35v6p0axb03s6j9wywlf8qkvw8rm848pp7s";
+          url = "http://beta.quicklisp.org/archive/cl-change-case/2025-06-22/cl-change-case-20250622-git.tgz";
+          sha256 = "0snwq2zmvkay173hhg43njy9iqapisazri1y6ws89m1c4dhs47x8";
           system = "cl-change-case";
           asd = "cl-change-case";
         }
@@ -13168,12 +13602,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-charms = (
     build-asdf-system {
       pname = "cl-charms";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "cl-charms" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-charms/2023-06-18/cl-charms-20230618-git.tgz";
-          sha256 = "0g6kw0b3b8wjb89rv6slyjl55pymadkcf35ig4d22z8igac7kj8b";
+          url = "http://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz";
+          sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9";
           system = "cl-charms";
           asd = "cl-charms";
         }
@@ -13192,12 +13626,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-charms-marquee = (
     build-asdf-system {
       pname = "cl-charms-marquee";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "cl-charms-marquee" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-charms/2023-06-18/cl-charms-20230618-git.tgz";
-          sha256 = "0g6kw0b3b8wjb89rv6slyjl55pymadkcf35ig4d22z8igac7kj8b";
+          url = "http://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz";
+          sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9";
           system = "cl-charms-marquee";
           asd = "cl-charms-marquee";
         }
@@ -13212,12 +13646,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-charms-paint = (
     build-asdf-system {
       pname = "cl-charms-paint";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "cl-charms-paint" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-charms/2023-06-18/cl-charms-20230618-git.tgz";
-          sha256 = "0g6kw0b3b8wjb89rv6slyjl55pymadkcf35ig4d22z8igac7kj8b";
+          url = "http://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz";
+          sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9";
           system = "cl-charms-paint";
           asd = "cl-charms-paint";
         }
@@ -13232,12 +13666,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-charms-timer = (
     build-asdf-system {
       pname = "cl-charms-timer";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "cl-charms-timer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-charms/2023-06-18/cl-charms-20230618-git.tgz";
-          sha256 = "0g6kw0b3b8wjb89rv6slyjl55pymadkcf35ig4d22z8igac7kj8b";
+          url = "http://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz";
+          sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9";
           system = "cl-charms-timer";
           asd = "cl-charms-timer";
         }
@@ -13392,12 +13826,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-collider = (
     build-asdf-system {
       pname = "cl-collider";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-collider" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-collider/2024-10-12/cl-collider-20241012-git.tgz";
-          sha256 = "0h0fyx7glxnzwyam2aflma6003h8fcvcf5nj5f7svarw9brcc2xa";
+          url = "http://beta.quicklisp.org/archive/cl-collider/2025-06-22/cl-collider-20250622-git.tgz";
+          sha256 = "01yiwwi9zhh1vksk26m170i6x9lsbygbznaxggf8h9psiyqg5991";
           system = "cl-collider";
           asd = "cl-collider";
         }
@@ -13412,8 +13846,6 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "named-readtables" self)
         (getAttr "pileup" self)
         (getAttr "sc-osc" self)
-        (getAttr "simple-inferiors" self)
-        (getAttr "split-sequence" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -13467,12 +13899,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-colors2 = (
     build-asdf-system {
       pname = "cl-colors2";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-colors2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-colors2/2024-10-12/cl-colors2-20241012-git.tgz";
-          sha256 = "053bidgbqziv5visdq09gy8zf30cvqh1w06l23yygn1yrg7m7302";
+          url = "http://beta.quicklisp.org/archive/cl-colors2/2025-06-22/cl-colors2-20250622-git.tgz";
+          sha256 = "0wisj59fq38cnk1m8lxxpjbwk0j8q3sp3n1jp99da7bi7vq04491";
           system = "cl-colors2";
           asd = "cl-colors2";
         }
@@ -13489,18 +13921,23 @@ lib.makeScope pkgs.newScope (self: {
   cl-concord = (
     build-asdf-system {
       pname = "cl-concord";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-concord" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-concord/2024-10-12/cl-concord-20241012-git.tgz";
-          sha256 = "01i13lp3z2v2w165h0xh72r1vyfbjr6k1gwk4hff1rf2yx2yg9k1";
+          url = "http://beta.quicklisp.org/archive/cl-concord/2025-06-22/cl-concord-20250622-git.tgz";
+          sha256 = "1kyz9wjcr5xq4fvzvs8cib4a52vwnv08cv5kzf3hyaipxd7fq37y";
           system = "cl-concord";
           asd = "cl-concord";
         }
       );
       systems = [ "cl-concord" ];
-      lispLibs = [ (getAttr "cl-redis" self) ];
+      lispLibs = [
+        (getAttr "cl-ipfs-api2" self)
+        (getAttr "cl-json" self)
+        (getAttr "cl-redis" self)
+        (getAttr "trivial-utf-8" self)
+      ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -13774,12 +14211,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-coveralls = (
     build-asdf-system {
       pname = "cl-coveralls";
-      version = "20210411-git";
+      version = "20250622-git";
       asds = [ "cl-coveralls" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-coveralls/2021-04-11/cl-coveralls-20210411-git.tgz";
-          sha256 = "1n4jks92827xbi2zzy6gsx3r2gl97difl04da9wz94n9rjj3bcz0";
+          url = "http://beta.quicklisp.org/archive/cl-coveralls/2025-06-22/cl-coveralls-20250622-git.tgz";
+          sha256 = "0wl7245v0wp7sbp64a4n7r490r21pnac1lfadl8vdp5ccrxh4nb5";
           system = "cl-coveralls";
           asd = "cl-coveralls";
         }
@@ -13787,11 +14224,11 @@ lib.makeScope pkgs.newScope (self: {
       systems = [ "cl-coveralls" ];
       lispLibs = [
         (getAttr "alexandria" self)
+        (getAttr "cl-json" self)
         (getAttr "cl-ppcre" self)
         (getAttr "dexador" self)
         (getAttr "flexi-streams" self)
         (getAttr "ironclad" self)
-        (getAttr "jonathan" self)
         (getAttr "lquery" self)
         (getAttr "split-sequence" self)
       ];
@@ -13803,12 +14240,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-coveralls-test = (
     build-asdf-system {
       pname = "cl-coveralls-test";
-      version = "20210411-git";
+      version = "20250622-git";
       asds = [ "cl-coveralls-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-coveralls/2021-04-11/cl-coveralls-20210411-git.tgz";
-          sha256 = "1n4jks92827xbi2zzy6gsx3r2gl97difl04da9wz94n9rjj3bcz0";
+          url = "http://beta.quicklisp.org/archive/cl-coveralls/2025-06-22/cl-coveralls-20250622-git.tgz";
+          sha256 = "0wl7245v0wp7sbp64a4n7r490r21pnac1lfadl8vdp5ccrxh4nb5";
           system = "cl-coveralls-test";
           asd = "cl-coveralls-test";
         }
@@ -13859,12 +14296,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-cpu-affinity = (
     build-asdf-system {
       pname = "cl-cpu-affinity";
-      version = "20210411-git";
+      version = "20250622-git";
       asds = [ "cl-cpu-affinity" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz";
-          sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa";
+          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "cl-cpu-affinity";
           asd = "cl-cpu-affinity";
         }
@@ -14226,12 +14663,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-data-structures = (
     build-asdf-system {
       pname = "cl-data-structures";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-data-structures" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-data-structures/2024-10-12/cl-data-structures-20241012-git.tgz";
-          sha256 = "0h49h1x9dgr53imj0r4lgx0zvdsv3mnh7lyayzy9hlysy2ixp425";
+          url = "http://beta.quicklisp.org/archive/cl-data-structures/2025-06-22/cl-data-structures-20250622-git.tgz";
+          sha256 = "1sxp8gh2737v5qm6hb9j4wqqcairmlr14xylhdizrmgkza9dqp0d";
           system = "cl-data-structures";
           asd = "cl-data-structures";
         }
@@ -14259,12 +14696,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-data-structures-tests = (
     build-asdf-system {
       pname = "cl-data-structures-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-data-structures-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-data-structures/2024-10-12/cl-data-structures-20241012-git.tgz";
-          sha256 = "0h49h1x9dgr53imj0r4lgx0zvdsv3mnh7lyayzy9hlysy2ixp425";
+          url = "http://beta.quicklisp.org/archive/cl-data-structures/2025-06-22/cl-data-structures-20250622-git.tgz";
+          sha256 = "1sxp8gh2737v5qm6hb9j4wqqcairmlr14xylhdizrmgkza9dqp0d";
           system = "cl-data-structures-tests";
           asd = "cl-data-structures-tests";
         }
@@ -14325,6 +14762,26 @@ lib.makeScope pkgs.newScope (self: {
       meta = { };
     }
   );
+  cl-dbi-connection-pool = (
+    build-asdf-system {
+      pname = "cl-dbi-connection-pool";
+      version = "20250622-git";
+      asds = [ "cl-dbi-connection-pool" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-dbi-connection-pool/2025-06-22/cl-dbi-connection-pool-20250622-git.tgz";
+          sha256 = "0q1kgcn822ifc8zcss4yihhwcl0asdxl8xxpbbnyjzxasqa47ifv";
+          system = "cl-dbi-connection-pool";
+          asd = "cl-dbi-connection-pool";
+        }
+      );
+      systems = [ "cl-dbi-connection-pool" ];
+      lispLibs = [ (getAttr "dbi-cp" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   cl-debug-print = (
     build-asdf-system {
       pname = "cl-debug-print";
@@ -15067,12 +15524,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-environments = (
     build-asdf-system {
       pname = "cl-environments";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-environments" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-environments/2024-10-12/cl-environments-20241012-git.tgz";
-          sha256 = "0pafk4c0qdzqp0l23fi1pgrqycbcrwm51wq0x0jvr7975yfx2lim";
+          url = "http://beta.quicklisp.org/archive/cl-environments/2025-06-22/cl-environments-20250622-git.tgz";
+          sha256 = "0aas5139qy4hfrkqgbx2iird7mma95pvk6xarlwzi28v9r8qpzy3";
           system = "cl-environments";
           asd = "cl-environments";
         }
@@ -15288,12 +15745,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-fast-ecs = (
     build-asdf-system {
       pname = "cl-fast-ecs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-fast-ecs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fast-ecs/2024-10-12/cl-fast-ecs-20241012-git.tgz";
-          sha256 = "0hwprzq6dnbfh4y08db615gzpdpr8vphy27whgsjhyg980503hxv";
+          url = "http://beta.quicklisp.org/archive/cl-fast-ecs/2025-06-22/cl-fast-ecs-20250622-git.tgz";
+          sha256 = "067nfx7cp0qbzva54ym01rvvdiq9f6gnl92w026132p7bzdls2i5";
           system = "cl-fast-ecs";
           asd = "cl-fast-ecs";
         }
@@ -15301,7 +15758,9 @@ lib.makeScope pkgs.newScope (self: {
       systems = [ "cl-fast-ecs" ];
       lispLibs = [
         (getAttr "alexandria" self)
-        (getAttr "trivial-garbage" self)
+        (getAttr "closer-mop" self)
+        (getAttr "global-vars" self)
+        (getAttr "trivial-adjust-simple-array" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -15515,12 +15974,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-flac = (
     build-asdf-system {
       pname = "cl-flac";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "cl-flac" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-flac/2023-10-21/cl-flac-20231021-git.tgz";
-          sha256 = "1p6hrg9j58yyml78l82zd6p33apbbnbw24slxw876n2j30qiyc84";
+          url = "http://beta.quicklisp.org/archive/cl-flac/2025-06-22/cl-flac-20250622-git.tgz";
+          sha256 = "018kllg8zjdwzm3l3fcxyy47sv1h67mlib7585hvg2hnvqljffh8";
           system = "cl-flac";
           asd = "cl-flac";
         }
@@ -15529,6 +15988,7 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "cffi" self)
         (getAttr "documentation-utils" self)
+        (getAttr "pathname-utils" self)
         (getAttr "trivial-features" self)
         (getAttr "trivial-garbage" self)
       ];
@@ -15583,12 +16043,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-fluent-logger = (
     build-asdf-system {
       pname = "cl-fluent-logger";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-fluent-logger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fluent-logger/2024-10-12/cl-fluent-logger-20241012-git.tgz";
-          sha256 = "0dqmx28d49fraqymrvaxq19d1x5nd6sb30bza7s9vgcyz404hzg4";
+          url = "http://beta.quicklisp.org/archive/cl-fluent-logger/2025-06-22/cl-fluent-logger-20250622-git.tgz";
+          sha256 = "1p9sjqlxr0mazzzq9lg7dapyyh854pz7z6cdy9y0hdijlm4h2m6r";
           system = "cl-fluent-logger";
           asd = "cl-fluent-logger";
         }
@@ -15598,8 +16058,8 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "alexandria" self)
         (getAttr "bordeaux-threads" self)
         (getAttr "chanl" self)
+        (getAttr "cl-json" self)
         (getAttr "cl-messagepack" self)
-        (getAttr "jonathan" self)
         (getAttr "local-time" self)
         (getAttr "pack" self)
         (getAttr "usocket" self)
@@ -15734,23 +16194,46 @@ lib.makeScope pkgs.newScope (self: {
   cl-forms = (
     build-asdf-system {
       pname = "cl-forms";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-forms" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz";
-          sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc";
+          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms";
           asd = "cl-forms";
         }
       );
       systems = [ "cl-forms" ];
+      lispLibs = [
+        (getAttr "cl-forms_dot_core" self)
+        (getAttr "hunchentoot" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  cl-forms_dot_core = (
+    build-asdf-system {
+      pname = "cl-forms.core";
+      version = "20250622-git";
+      asds = [ "cl-forms.core" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
+          system = "cl-forms.core";
+          asd = "cl-forms.core";
+        }
+      );
+      systems = [ "cl-forms.core" ];
       lispLibs = [
         (getAttr "alexandria" self)
+        (getAttr "cl-base64" self)
         (getAttr "cl-ppcre" self)
         (getAttr "clavier" self)
         (getAttr "fmt" self)
-        (getAttr "hunchentoot" self)
         (getAttr "ironclad" self)
         (getAttr "str" self)
         (getAttr "uuid" self)
@@ -15763,12 +16246,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-forms_dot_demo = (
     build-asdf-system {
       pname = "cl-forms.demo";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-forms.demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz";
-          sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc";
+          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms.demo";
           asd = "cl-forms.demo";
         }
@@ -15794,19 +16277,19 @@ lib.makeScope pkgs.newScope (self: {
   cl-forms_dot_djula = (
     build-asdf-system {
       pname = "cl-forms.djula";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-forms.djula" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz";
-          sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc";
+          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms.djula";
           asd = "cl-forms.djula";
         }
       );
       systems = [ "cl-forms.djula" ];
       lispLibs = [
-        (getAttr "cl-forms" self)
+        (getAttr "cl-forms_dot_core" self)
         (getAttr "cl-forms_dot_who" self)
         (getAttr "djula" self)
       ];
@@ -15815,22 +16298,46 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  cl-forms_dot_ningle = (
+    build-asdf-system {
+      pname = "cl-forms.ningle";
+      version = "20250622-git";
+      asds = [ "cl-forms.ningle" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
+          system = "cl-forms.ningle";
+          asd = "cl-forms.ningle";
+        }
+      );
+      systems = [ "cl-forms.ningle" ];
+      lispLibs = [
+        (getAttr "cl-forms_dot_core" self)
+        (getAttr "lack" self)
+        (getAttr "ningle" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   cl-forms_dot_peppol = (
     build-asdf-system {
       pname = "cl-forms.peppol";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-forms.peppol" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz";
-          sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc";
+          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms.peppol";
           asd = "cl-forms.peppol";
         }
       );
       systems = [ "cl-forms.peppol" ];
       lispLibs = [
-        (getAttr "cl-forms" self)
+        (getAttr "cl-forms_dot_core" self)
         (getAttr "peppol" self)
       ];
       meta = {
@@ -15841,12 +16348,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-forms_dot_test = (
     build-asdf-system {
       pname = "cl-forms.test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-forms.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz";
-          sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc";
+          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms.test";
           asd = "cl-forms.test";
         }
@@ -15864,19 +16371,19 @@ lib.makeScope pkgs.newScope (self: {
   cl-forms_dot_who = (
     build-asdf-system {
       pname = "cl-forms.who";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-forms.who" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz";
-          sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc";
+          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms.who";
           asd = "cl-forms.who";
         }
       );
       systems = [ "cl-forms.who" ];
       lispLibs = [
-        (getAttr "cl-forms" self)
+        (getAttr "cl-forms_dot_core" self)
         (getAttr "cl-who" self)
       ];
       meta = {
@@ -15887,12 +16394,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-forms_dot_who_dot_bootstrap = (
     build-asdf-system {
       pname = "cl-forms.who.bootstrap";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-forms.who.bootstrap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz";
-          sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc";
+          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms.who.bootstrap";
           asd = "cl-forms.who.bootstrap";
         }
@@ -15921,8 +16428,6 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [ (getAttr "cffi" self) ];
       meta = {
         hydraPlatforms = [ ];
-        # darwin cannot find libpango.dylib
-        broken = stdenv.hostPlatform.isDarwin;
       };
     }
   );
@@ -16112,12 +16617,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-gamepad = (
     build-asdf-system {
       pname = "cl-gamepad";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-gamepad" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gamepad/2024-10-12/cl-gamepad-20241012-git.tgz";
-          sha256 = "015qx89rnkkqaa6qsl78zvb3sb1m4xdgjpgzn5ip5i27gw94770g";
+          url = "http://beta.quicklisp.org/archive/cl-gamepad/2025-06-22/cl-gamepad-20250622-git.tgz";
+          sha256 = "1flnsqa33hm3ab4vbab0r62xbjjrwi5g6a9asjr77mp2vhdwycsr";
           system = "cl-gamepad";
           asd = "cl-gamepad";
         }
@@ -16125,6 +16630,7 @@ lib.makeScope pkgs.newScope (self: {
       systems = [ "cl-gamepad" ];
       lispLibs = [
         (getAttr "cffi" self)
+        (getAttr "deploy" self)
         (getAttr "documentation-utils" self)
         (getAttr "trivial-features" self)
       ];
@@ -23795,12 +24301,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-gltf = (
     build-asdf-system {
       pname = "cl-gltf";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-gltf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gltf/2024-10-12/cl-gltf-20241012-git.tgz";
-          sha256 = "0s7q6zsy85wryy3wb2hn3nprh1m4vmjzsai1mdcqlhzqyh5rm6jq";
+          url = "http://beta.quicklisp.org/archive/cl-gltf/2025-06-22/cl-gltf-20250622-git.tgz";
+          sha256 = "0ais6p3mw22zmhcfkab34sfb717si3a1wjx1xq8lig6fr75fw6k1";
           system = "cl-gltf";
           asd = "cl-gltf";
         }
@@ -23812,6 +24318,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "documentation-utils" self)
         (getAttr "mmap" self)
         (getAttr "nibbles" self)
+        (getAttr "pathname-utils" self)
         (getAttr "qbase64" self)
         (getAttr "static-vectors" self)
         (getAttr "trivial-extensible-sequences" self)
@@ -23824,12 +24331,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-glu = (
     build-asdf-system {
       pname = "cl-glu";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-glu" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opengl/2024-10-12/cl-opengl-20241012-git.tgz";
-          sha256 = "1xpa3x9fx7wxrs5xmkj13yzh2wjfnlb0ihirfr9clngpv1y4gcm6";
+          url = "http://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz";
+          sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm";
           system = "cl-glu";
           asd = "cl-glu";
         }
@@ -23847,12 +24354,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-glut = (
     build-asdf-system {
       pname = "cl-glut";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-glut" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opengl/2024-10-12/cl-opengl-20241012-git.tgz";
-          sha256 = "1xpa3x9fx7wxrs5xmkj13yzh2wjfnlb0ihirfr9clngpv1y4gcm6";
+          url = "http://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz";
+          sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm";
           system = "cl-glut";
           asd = "cl-glut";
         }
@@ -23871,12 +24378,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-glut-examples = (
     build-asdf-system {
       pname = "cl-glut-examples";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-glut-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opengl/2024-10-12/cl-opengl-20241012-git.tgz";
-          sha256 = "1xpa3x9fx7wxrs5xmkj13yzh2wjfnlb0ihirfr9clngpv1y4gcm6";
+          url = "http://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz";
+          sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm";
           system = "cl-glut-examples";
           asd = "cl-glut-examples";
         }
@@ -23987,12 +24494,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-gog-galaxy = (
     build-asdf-system {
       pname = "cl-gog-galaxy";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-gog-galaxy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gog-galaxy/2024-10-12/cl-gog-galaxy-20241012-git.tgz";
-          sha256 = "0pb8q4q1gj4n8ll5cglip4rl9gqy8y0g9kpqn2xkc3lssvxkkh63";
+          url = "http://beta.quicklisp.org/archive/cl-gog-galaxy/2025-06-22/cl-gog-galaxy-20250622-git.tgz";
+          sha256 = "0y8qp74njyidl93l3spbrizdfmmxdd0vs36hw4ihn5gr62y8yf18";
           system = "cl-gog-galaxy";
           asd = "cl-gog-galaxy";
         }
@@ -24001,6 +24508,7 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "cffi" self)
         (getAttr "documentation-utils" self)
+        (getAttr "pathname-utils" self)
         (getAttr "trivial-features" self)
         (getAttr "trivial-indent" self)
       ];
@@ -24038,12 +24546,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-gpio = (
     build-asdf-system {
       pname = "cl-gpio";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "cl-gpio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gpio/2023-10-21/cl-gpio-20231021-git.tgz";
-          sha256 = "0sh40fg9gcz72xsfi17zh1b1wckw4fsyx75kkm2w3757lx69wkmh";
+          url = "http://beta.quicklisp.org/archive/cl-gpio/2025-06-22/cl-gpio-20250622-git.tgz";
+          sha256 = "0z5w2p87plmgqnn8r6kc040303c7wynngr0fq3m25p29n776fibw";
           system = "cl-gpio";
           asd = "cl-gpio";
         }
@@ -24768,12 +25276,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-i18n = (
     build-asdf-system {
       pname = "cl-i18n";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-i18n" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-i18n/2024-10-12/cl-i18n-20241012-git.tgz";
-          sha256 = "1gp4ncf7ywyyh2f0zdkqibvn0wxm4hvsj672ni2vfqvhcivqfdza";
+          url = "http://beta.quicklisp.org/archive/cl-i18n/2025-06-22/cl-i18n-20250622-git.tgz";
+          sha256 = "1vz0ynfx557c9nydnq5c32ha7qv8viypvmqg36s1l6mbp16b76ws";
           system = "cl-i18n";
           asd = "cl-i18n";
         }
@@ -24883,12 +25391,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-indentify = (
     build-asdf-system {
       pname = "cl-indentify";
-      version = "20230214-git";
+      version = "20250622-git";
       asds = [ "cl-indentify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-indentify/2023-02-14/cl-indentify-20230214-git.tgz";
-          sha256 = "1np7b3mh3wd5dv7nvwmjl5rgy7m0qf0fx61s04yazlh46k3d0nxd";
+          url = "http://beta.quicklisp.org/archive/cl-indentify/2025-06-22/cl-indentify-20250622-git.tgz";
+          sha256 = "1fyrlrrncvpzgp209010kjs3rvx845n6vk160995w464gsrpf56m";
           system = "cl-indentify";
           asd = "cl-indentify";
         }
@@ -24979,40 +25487,83 @@ lib.makeScope pkgs.newScope (self: {
   cl-info = (
     build-asdf-system {
       pname = "cl-info";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-info" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-info/2024-10-12/cl-info-20241012-git.tgz";
-          sha256 = "0vrrlcwdqnw8v34zd7wkjxh02zysam5c5s5n4l5q6s2jy0gmai0y";
+          url = "http://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz";
+          sha256 = "0j3yd13g8pyx2fj1fxvbizhz7wc016cykx3csknnw72cms890vli";
           system = "cl-info";
           asd = "cl-info";
         }
       );
       systems = [ "cl-info" ];
+      lispLibs = [ (getAttr "_40ants-asdf-system" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  cl-info-ci = (
+    build-asdf-system {
+      pname = "cl-info-ci";
+      version = "20250622-git";
+      asds = [ "cl-info-ci" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz";
+          sha256 = "0j3yd13g8pyx2fj1fxvbizhz7wc016cykx3csknnw72cms890vli";
+          system = "cl-info-ci";
+          asd = "cl-info-ci";
+        }
+      );
+      systems = [ "cl-info-ci" ];
+      lispLibs = [ (getAttr "_40ants-ci" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  cl-info-docs = (
+    build-asdf-system {
+      pname = "cl-info-docs";
+      version = "20250622-git";
+      asds = [ "cl-info-docs" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz";
+          sha256 = "0j3yd13g8pyx2fj1fxvbizhz7wc016cykx3csknnw72cms890vli";
+          system = "cl-info-docs";
+          asd = "cl-info-docs";
+        }
+      );
+      systems = [ "cl-info-docs" ];
       lispLibs = [
         (getAttr "_40ants-doc" self)
+        (getAttr "cl-info" self)
         (getAttr "docs-config" self)
+        (getAttr "named-readtables" self)
+        (getAttr "pythonic-string-reader" self)
       ];
       meta = {
         hydraPlatforms = [ ];
       };
     }
   );
-  cl-info-test = (
+  cl-info-tests = (
     build-asdf-system {
-      pname = "cl-info-test";
-      version = "20241012-git";
-      asds = [ "cl-info-test" ];
+      pname = "cl-info-tests";
+      version = "20250622-git";
+      asds = [ "cl-info-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-info/2024-10-12/cl-info-20241012-git.tgz";
-          sha256 = "0vrrlcwdqnw8v34zd7wkjxh02zysam5c5s5n4l5q6s2jy0gmai0y";
-          system = "cl-info-test";
-          asd = "cl-info-test";
+          url = "http://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz";
+          sha256 = "0j3yd13g8pyx2fj1fxvbizhz7wc016cykx3csknnw72cms890vli";
+          system = "cl-info-tests";
+          asd = "cl-info-tests";
         }
       );
-      systems = [ "cl-info-test" ];
+      systems = [ "cl-info-tests" ];
       lispLibs = [
         (getAttr "cl-info" self)
         (getAttr "hamcrest" self)
@@ -25835,12 +26386,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-k8055 = (
     build-asdf-system {
       pname = "cl-k8055";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "cl-k8055" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-k8055/2023-10-21/cl-k8055-20231021-git.tgz";
-          sha256 = "1qap7pf90l89lqb8asnnnc0qfaabd6p179vmdq1z7n5wxdwsw2b3";
+          url = "http://beta.quicklisp.org/archive/cl-k8055/2025-06-22/cl-k8055-20250622-git.tgz";
+          sha256 = "0ml2i5zkidc01dmjqxrk2y4a24wnh6wz4amc979rilj6nwrxzj1f";
           system = "cl-k8055";
           asd = "cl-k8055";
         }
@@ -26138,12 +26689,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-las = (
     build-asdf-system {
       pname = "cl-las";
-      version = "20221106-git";
+      version = "20250622-git";
       asds = [ "cl-las" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-las/2022-11-06/cl-las-20221106-git.tgz";
-          sha256 = "119v5mrvxhz8b3alqj9gzfbzhigdm1n1hmwyylncn5w5dkq3jc9k";
+          url = "http://beta.quicklisp.org/archive/cl-las/2025-06-22/cl-las-20250622-git.tgz";
+          sha256 = "0gmygdn36lwfi2v9k6izk2l2gj7f02vcnlkrxlmgyqc0x6plf3n8";
           system = "cl-las";
           asd = "cl-las";
         }
@@ -26315,12 +26866,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-liballegro = (
     build-asdf-system {
       pname = "cl-liballegro";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-liballegro" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-liballegro/2024-10-12/cl-liballegro-20241012-git.tgz";
-          sha256 = "1q263wzm25rynyhcym216l3swhrz6fhiwhdbh4iz212hw9w0kn71";
+          url = "http://beta.quicklisp.org/archive/cl-liballegro/2025-06-22/cl-liballegro-20250622-git.tgz";
+          sha256 = "1kqywmc4zp45kh1b6hix1dsm1n01zpmz8qkwfbwjrpq4a07rx30l";
           system = "cl-liballegro";
           asd = "cl-liballegro";
         }
@@ -26342,12 +26893,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-liballegro-nuklear = (
     build-asdf-system {
       pname = "cl-liballegro-nuklear";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-liballegro-nuklear" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-liballegro-nuklear/2024-10-12/cl-liballegro-nuklear-20241012-git.tgz";
-          sha256 = "15wbs1jfl60dnyzgzdibw2hkl64cx3n3v90i5jp0vd123kix217j";
+          url = "http://beta.quicklisp.org/archive/cl-liballegro-nuklear/2025-06-22/cl-liballegro-nuklear-20250622-git.tgz";
+          sha256 = "1nfayk1as4ss9fmi04rz5gb5l9v7zs98zj1ddx15h4lml811n322";
           system = "cl-liballegro-nuklear";
           asd = "cl-liballegro-nuklear";
         }
@@ -26516,6 +27067,55 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  cl-libre-translate = (
+    build-asdf-system {
+      pname = "cl-libre-translate";
+      version = "20250622-git";
+      asds = [ "cl-libre-translate" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-libre-translate/2025-06-22/cl-libre-translate-20250622-git.tgz";
+          sha256 = "1wgspc50z6bnald5drbr2qr913s2r10qvm1281h44cyx294kl6gg";
+          system = "cl-libre-translate";
+          asd = "cl-libre-translate";
+        }
+      );
+      systems = [ "cl-libre-translate" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "dexador" self)
+        (getAttr "st-json" self)
+        (getAttr "trivial-clipboard" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  cl-libre-translate_dot_test = (
+    build-asdf-system {
+      pname = "cl-libre-translate.test";
+      version = "20250622-git";
+      asds = [ "cl-libre-translate.test" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-libre-translate/2025-06-22/cl-libre-translate-20250622-git.tgz";
+          sha256 = "1wgspc50z6bnald5drbr2qr913s2r10qvm1281h44cyx294kl6gg";
+          system = "cl-libre-translate.test";
+          asd = "cl-libre-translate.test";
+        }
+      );
+      systems = [ "cl-libre-translate.test" ];
+      lispLibs = [
+        (getAttr "cl-libre-translate" self)
+        (getAttr "fiveam" self)
+        (getAttr "st-json" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   cl-libsvm = (
     build-asdf-system {
       pname = "cl-libsvm";
@@ -26741,12 +27341,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-lite = (
     build-asdf-system {
       pname = "cl-lite";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "cl-lite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "cl-lite";
           asd = "cl-lite";
         }
@@ -27119,12 +27719,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-markless = (
     build-asdf-system {
       pname = "cl-markless";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-markless" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz";
-          sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g";
+          url = "http://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
+          sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy";
           system = "cl-markless";
           asd = "cl-markless";
         }
@@ -27142,12 +27742,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-markless-epub = (
     build-asdf-system {
       pname = "cl-markless-epub";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-markless-epub" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz";
-          sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g";
+          url = "http://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
+          sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy";
           system = "cl-markless-epub";
           asd = "cl-markless-epub";
         }
@@ -27169,12 +27769,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-markless-latex = (
     build-asdf-system {
       pname = "cl-markless-latex";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-markless-latex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz";
-          sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g";
+          url = "http://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
+          sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy";
           system = "cl-markless-latex";
           asd = "cl-markless-latex";
         }
@@ -27189,12 +27789,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-markless-markdown = (
     build-asdf-system {
       pname = "cl-markless-markdown";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-markless-markdown" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz";
-          sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g";
+          url = "http://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
+          sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy";
           system = "cl-markless-markdown";
           asd = "cl-markless-markdown";
         }
@@ -27213,12 +27813,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-markless-plump = (
     build-asdf-system {
       pname = "cl-markless-plump";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-markless-plump" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz";
-          sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g";
+          url = "http://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
+          sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy";
           system = "cl-markless-plump";
           asd = "cl-markless-plump";
         }
@@ -27236,12 +27836,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-markless-standalone = (
     build-asdf-system {
       pname = "cl-markless-standalone";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-markless-standalone" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz";
-          sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g";
+          url = "http://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
+          sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy";
           system = "cl-markless-standalone";
           asd = "cl-markless-standalone";
         }
@@ -27264,12 +27864,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-markless-test = (
     build-asdf-system {
       pname = "cl-markless-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-markless-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz";
-          sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g";
+          url = "http://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
+          sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy";
           system = "cl-markless-test";
           asd = "cl-markless-test";
         }
@@ -28193,12 +28793,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed = (
     build-asdf-system {
       pname = "cl-mixed";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed";
           asd = "cl-mixed";
         }
@@ -28219,12 +28819,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-aaudio = (
     build-asdf-system {
       pname = "cl-mixed-aaudio";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-aaudio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-aaudio";
           asd = "cl-mixed-aaudio";
         }
@@ -28242,12 +28842,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-alsa = (
     build-asdf-system {
       pname = "cl-mixed-alsa";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-alsa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-alsa";
           asd = "cl-mixed-alsa";
         }
@@ -28265,12 +28865,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-coreaudio = (
     build-asdf-system {
       pname = "cl-mixed-coreaudio";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-coreaudio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-coreaudio";
           asd = "cl-mixed-coreaudio";
         }
@@ -28290,12 +28890,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-examples = (
     build-asdf-system {
       pname = "cl-mixed-examples";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-examples";
           asd = "cl-mixed-examples";
         }
@@ -28316,12 +28916,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-flac = (
     build-asdf-system {
       pname = "cl-mixed-flac";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-flac" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-flac";
           asd = "cl-mixed-flac";
         }
@@ -28339,12 +28939,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-jack = (
     build-asdf-system {
       pname = "cl-mixed-jack";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-jack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-jack";
           asd = "cl-mixed-jack";
         }
@@ -28362,12 +28962,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-mpg123 = (
     build-asdf-system {
       pname = "cl-mixed-mpg123";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-mpg123" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-mpg123";
           asd = "cl-mixed-mpg123";
         }
@@ -28385,12 +28985,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-mpt = (
     build-asdf-system {
       pname = "cl-mixed-mpt";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-mpt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-mpt";
           asd = "cl-mixed-mpt";
         }
@@ -28408,12 +29008,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-nxau = (
     build-asdf-system {
       pname = "cl-mixed-nxau";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-nxau" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-nxau";
           asd = "cl-mixed-nxau";
         }
@@ -28431,12 +29031,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-opus = (
     build-asdf-system {
       pname = "cl-mixed-opus";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-opus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-opus";
           asd = "cl-mixed-opus";
         }
@@ -28454,12 +29054,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-oss = (
     build-asdf-system {
       pname = "cl-mixed-oss";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-oss" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-oss";
           asd = "cl-mixed-oss";
         }
@@ -28477,12 +29077,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-out123 = (
     build-asdf-system {
       pname = "cl-mixed-out123";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-out123" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-out123";
           asd = "cl-mixed-out123";
         }
@@ -28497,15 +29097,39 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  cl-mixed-pipewire = (
+    build-asdf-system {
+      pname = "cl-mixed-pipewire";
+      version = "20250622-git";
+      asds = [ "cl-mixed-pipewire" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
+          system = "cl-mixed-pipewire";
+          asd = "cl-mixed-pipewire";
+        }
+      );
+      systems = [ "cl-mixed-pipewire" ];
+      lispLibs = [
+        (getAttr "bordeaux-threads" self)
+        (getAttr "cffi" self)
+        (getAttr "cl-mixed" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   cl-mixed-pulse = (
     build-asdf-system {
       pname = "cl-mixed-pulse";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-pulse" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-pulse";
           asd = "cl-mixed-pulse";
         }
@@ -28523,12 +29147,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-qoa = (
     build-asdf-system {
       pname = "cl-mixed-qoa";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-qoa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-qoa";
           asd = "cl-mixed-qoa";
         }
@@ -28546,12 +29170,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-sdl2 = (
     build-asdf-system {
       pname = "cl-mixed-sdl2";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-sdl2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-sdl2";
           asd = "cl-mixed-sdl2";
         }
@@ -28566,15 +29190,35 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  cl-mixed-sf3 = (
+    build-asdf-system {
+      pname = "cl-mixed-sf3";
+      version = "20250622-git";
+      asds = [ "cl-mixed-sf3" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
+          system = "cl-mixed-sf3";
+          asd = "cl-mixed-sf3";
+        }
+      );
+      systems = [ "cl-mixed-sf3" ];
+      lispLibs = [ (getAttr "cl-mixed" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   cl-mixed-vorbis = (
     build-asdf-system {
       pname = "cl-mixed-vorbis";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-vorbis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-vorbis";
           asd = "cl-mixed-vorbis";
         }
@@ -28592,12 +29236,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-wasapi = (
     build-asdf-system {
       pname = "cl-mixed-wasapi";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-wasapi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-wasapi";
           asd = "cl-mixed-wasapi";
         }
@@ -28616,12 +29260,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-wav = (
     build-asdf-system {
       pname = "cl-mixed-wav";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-wav" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-wav";
           asd = "cl-mixed-wav";
         }
@@ -28636,12 +29280,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-winmm = (
     build-asdf-system {
       pname = "cl-mixed-winmm";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-winmm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-winmm";
           asd = "cl-mixed-winmm";
         }
@@ -28659,18 +29303,19 @@ lib.makeScope pkgs.newScope (self: {
   cl-mixed-xaudio2 = (
     build-asdf-system {
       pname = "cl-mixed-xaudio2";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mixed-xaudio2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz";
-          sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9";
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-xaudio2";
           asd = "cl-mixed-xaudio2";
         }
       );
       systems = [ "cl-mixed-xaudio2" ];
       lispLibs = [
+        (getAttr "bordeaux-threads" self)
         (getAttr "cffi" self)
         (getAttr "cl-mixed" self)
         (getAttr "com-on" self)
@@ -28680,6 +29325,29 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  cl-mixed-xmp = (
+    build-asdf-system {
+      pname = "cl-mixed-xmp";
+      version = "20250622-git";
+      asds = [ "cl-mixed-xmp" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
+          system = "cl-mixed-xmp";
+          asd = "cl-mixed-xmp";
+        }
+      );
+      systems = [ "cl-mixed-xmp" ];
+      lispLibs = [
+        (getAttr "cl-mixed" self)
+        (getAttr "pathname-utils" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   cl-mock = (
     build-asdf-system {
       pname = "cl-mock";
@@ -28776,12 +29444,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-modio = (
     build-asdf-system {
       pname = "cl-modio";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-modio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-modio/2024-10-12/cl-modio-20241012-git.tgz";
-          sha256 = "1f755xqpibdrxiqclnsiba36bl8xgw958h0lb0rw6hjsvrx9z8dg";
+          url = "http://beta.quicklisp.org/archive/cl-modio/2025-06-22/cl-modio-20250622-git.tgz";
+          sha256 = "1f591m3g9a6y434wypfzw1vqwslxm1llzarz99qgp0bf930cwfgb";
           system = "cl-modio";
           asd = "cl-modio";
         }
@@ -29033,12 +29701,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mpg123 = (
     build-asdf-system {
       pname = "cl-mpg123";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mpg123" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mpg123/2024-10-12/cl-mpg123-20241012-git.tgz";
-          sha256 = "03ysv3psfj4agf62gn1skc26qzd9g9zx6yjxxs9lrjz7g9kwf1xk";
+          url = "http://beta.quicklisp.org/archive/cl-mpg123/2025-06-22/cl-mpg123-20250622-git.tgz";
+          sha256 = "0hlzx72ga43vhh1wfi7g9imf5jmqyga2sn135yf99s38bpznh4p7";
           system = "cl-mpg123";
           asd = "cl-mpg123";
         }
@@ -29047,6 +29715,7 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "cffi" self)
         (getAttr "documentation-utils" self)
+        (getAttr "pathname-utils" self)
         (getAttr "trivial-features" self)
         (getAttr "trivial-garbage" self)
       ];
@@ -29058,12 +29727,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-mpg123-example = (
     build-asdf-system {
       pname = "cl-mpg123-example";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-mpg123-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mpg123/2024-10-12/cl-mpg123-20241012-git.tgz";
-          sha256 = "03ysv3psfj4agf62gn1skc26qzd9g9zx6yjxxs9lrjz7g9kwf1xk";
+          url = "http://beta.quicklisp.org/archive/cl-mpg123/2025-06-22/cl-mpg123-20250622-git.tgz";
+          sha256 = "0hlzx72ga43vhh1wfi7g9imf5jmqyga2sn135yf99s38bpznh4p7";
           system = "cl-mpg123-example";
           asd = "cl-mpg123-example";
         }
@@ -29596,49 +30265,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  cl-naive-ptrees = (
-    build-asdf-system {
-      pname = "cl-naive-ptrees";
-      version = "20241012-git";
-      asds = [ "cl-naive-ptrees" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-naive-ptrees/2024-10-12/cl-naive-ptrees-20241012-git.tgz";
-          sha256 = "10548wm3mpjxmjibidv1dd8wzcn3nn12pzwlpdd1li362v8l9n6y";
-          system = "cl-naive-ptrees";
-          asd = "cl-naive-ptrees";
-        }
-      );
-      systems = [ "cl-naive-ptrees" ];
-      lispLibs = [ ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  cl-naive-ptrees_dot_tests = (
-    build-asdf-system {
-      pname = "cl-naive-ptrees.tests";
-      version = "20241012-git";
-      asds = [ "cl-naive-ptrees.tests" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-naive-ptrees/2024-10-12/cl-naive-ptrees-20241012-git.tgz";
-          sha256 = "10548wm3mpjxmjibidv1dd8wzcn3nn12pzwlpdd1li362v8l9n6y";
-          system = "cl-naive-ptrees.tests";
-          asd = "cl-naive-ptrees.tests";
-        }
-      );
-      systems = [ "cl-naive-ptrees.tests" ];
-      lispLibs = [
-        (getAttr "cl-naive-ptrees" self)
-        (getAttr "cl-naive-tests" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   cl-naive-tests = (
     build-asdf-system {
       pname = "cl-naive-tests";
@@ -30091,12 +30717,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-oju = (
     build-asdf-system {
       pname = "cl-oju";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-oju" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-oju/2024-10-12/cl-oju-20241012-git.tgz";
-          sha256 = "0gwzxl4pj45jq7vx6vssgzsp4xxc99bzfi6fbklc5nnlfkqq0v62";
+          url = "http://beta.quicklisp.org/archive/cl-oju/2025-06-22/cl-oju-20250622-git.tgz";
+          sha256 = "1gsi43fk1brh0is5k9ahwp3vshb63i8mizf2zshk231zd9rvp1ai";
           system = "cl-oju";
           asd = "cl-oju";
         }
@@ -30336,12 +30962,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-opengl = (
     build-asdf-system {
       pname = "cl-opengl";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-opengl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opengl/2024-10-12/cl-opengl-20241012-git.tgz";
-          sha256 = "1xpa3x9fx7wxrs5xmkj13yzh2wjfnlb0ihirfr9clngpv1y4gcm6";
+          url = "http://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz";
+          sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm";
           system = "cl-opengl";
           asd = "cl-opengl";
         }
@@ -30504,12 +31130,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-out123 = (
     build-asdf-system {
       pname = "cl-out123";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "cl-out123" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-out123/2023-10-21/cl-out123-20231021-git.tgz";
-          sha256 = "1h48hfd956799wx9kmkmb9azg01jmjbnj16b6z9ciw9y9k5jlzsh";
+          url = "http://beta.quicklisp.org/archive/cl-out123/2025-06-22/cl-out123-20250622-git.tgz";
+          sha256 = "1qsdp2pk1b4b3vfy0n7k70q1xa5kjkddsvf4lqw0lawh1m88mb9i";
           system = "cl-out123";
           asd = "cl-out123";
         }
@@ -30761,12 +31387,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-patterns = (
     build-asdf-system {
       pname = "cl-patterns";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-patterns" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-patterns/2024-10-12/cl-patterns-20241012-git.tgz";
-          sha256 = "0g0q514fn1hxq518358yy2va4cb9xxqwds9cglw133qxy0wsjllh";
+          url = "http://beta.quicklisp.org/archive/cl-patterns/2025-06-22/cl-patterns-20250622-git.tgz";
+          sha256 = "0lp01gp0dnbryc35kkh33s6ifninw1w41n38mq9idgwk806ylr4j";
           system = "cl-patterns";
           asd = "cl-patterns";
         }
@@ -31192,12 +31818,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-plus-ssl-osx-fix = (
     build-asdf-system {
       pname = "cl-plus-ssl-osx-fix";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-plus-ssl-osx-fix" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2024-10-12/cl-plus-ssl-osx-fix-20241012-git.tgz";
-          sha256 = "0rkrazia05zzwzd9vx2kl1azwgjy0d4pvfmwp5mjmqsvpklgacwv";
+          url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz";
+          sha256 = "00ian3xkchag5c3acwjrn42g2vp19rwfvcfhslri4fdns769myp1";
           system = "cl-plus-ssl-osx-fix";
           asd = "cl-plus-ssl-osx-fix";
         }
@@ -31215,12 +31841,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-plus-ssl-osx-fix-ci = (
     build-asdf-system {
       pname = "cl-plus-ssl-osx-fix-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-plus-ssl-osx-fix-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2024-10-12/cl-plus-ssl-osx-fix-20241012-git.tgz";
-          sha256 = "0rkrazia05zzwzd9vx2kl1azwgjy0d4pvfmwp5mjmqsvpklgacwv";
+          url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz";
+          sha256 = "00ian3xkchag5c3acwjrn42g2vp19rwfvcfhslri4fdns769myp1";
           system = "cl-plus-ssl-osx-fix-ci";
           asd = "cl-plus-ssl-osx-fix-ci";
         }
@@ -31235,12 +31861,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-plus-ssl-osx-fix-docs = (
     build-asdf-system {
       pname = "cl-plus-ssl-osx-fix-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-plus-ssl-osx-fix-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2024-10-12/cl-plus-ssl-osx-fix-20241012-git.tgz";
-          sha256 = "0rkrazia05zzwzd9vx2kl1azwgjy0d4pvfmwp5mjmqsvpklgacwv";
+          url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz";
+          sha256 = "00ian3xkchag5c3acwjrn42g2vp19rwfvcfhslri4fdns769myp1";
           system = "cl-plus-ssl-osx-fix-docs";
           asd = "cl-plus-ssl-osx-fix-docs";
         }
@@ -31261,12 +31887,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-plus-ssl-osx-fix-tests = (
     build-asdf-system {
       pname = "cl-plus-ssl-osx-fix-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-plus-ssl-osx-fix-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2024-10-12/cl-plus-ssl-osx-fix-20241012-git.tgz";
-          sha256 = "0rkrazia05zzwzd9vx2kl1azwgjy0d4pvfmwp5mjmqsvpklgacwv";
+          url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz";
+          sha256 = "00ian3xkchag5c3acwjrn42g2vp19rwfvcfhslri4fdns769myp1";
           system = "cl-plus-ssl-osx-fix-tests";
           asd = "cl-plus-ssl-osx-fix-tests";
         }
@@ -31418,12 +32044,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-postgres_plus_local-time = (
     build-asdf-system {
       pname = "cl-postgres+local-time";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-postgres+local-time" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/local-time/2024-10-12/local-time-20241012-git.tgz";
-          sha256 = "0jb1mb5zs4ryiah8zjzhpln1z686mfmpmvg1phgpr2mh9vvlgjk2";
+          url = "http://beta.quicklisp.org/archive/local-time/2025-06-22/local-time-20250622-git.tgz";
+          sha256 = "1xdxm1js8n1b3k0g013s810hzf7jr6yhapyvj9agfyl7b6knj0kg";
           system = "cl-postgres+local-time";
           asd = "cl-postgres+local-time";
         }
@@ -31509,12 +32135,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-ppcre = (
     build-asdf-system {
       pname = "cl-ppcre";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-ppcre" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ppcre/2024-10-12/cl-ppcre-20241012-git.tgz";
-          sha256 = "0aw7lh79wgn18c75v29md2x8irl8v7f96lj1mfkp7x0mkqsb0cs8";
+          url = "http://beta.quicklisp.org/archive/cl-ppcre/2025-06-22/cl-ppcre-20250622-git.tgz";
+          sha256 = "0f7sh2pr81pkfx0d348shqjp21qj7px1k310dfmyjb4y40kq2kxn";
           system = "cl-ppcre";
           asd = "cl-ppcre";
         }
@@ -31527,12 +32153,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-ppcre-template = (
     build-asdf-system {
       pname = "cl-ppcre-template";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-ppcre-template" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-unification/2024-10-12/cl-unification-20241012-git.tgz";
-          sha256 = "1q7bjj9dzazhgj32291rqy4lld1ilrpck374c21864qn3pmz31ag";
+          url = "http://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz";
+          sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r";
           system = "cl-ppcre-template";
           asd = "cl-ppcre-template";
         }
@@ -31548,12 +32174,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-ppcre-unicode = (
     build-asdf-system {
       pname = "cl-ppcre-unicode";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-ppcre-unicode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ppcre/2024-10-12/cl-ppcre-20241012-git.tgz";
-          sha256 = "0aw7lh79wgn18c75v29md2x8irl8v7f96lj1mfkp7x0mkqsb0cs8";
+          url = "http://beta.quicklisp.org/archive/cl-ppcre/2025-06-22/cl-ppcre-20250622-git.tgz";
+          sha256 = "0f7sh2pr81pkfx0d348shqjp21qj7px1k310dfmyjb4y40kq2kxn";
           system = "cl-ppcre-unicode";
           asd = "cl-ppcre-unicode";
         }
@@ -31569,12 +32195,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-prevalence = (
     build-asdf-system {
       pname = "cl-prevalence";
-      version = "20230214-git";
+      version = "20250622-git";
       asds = [ "cl-prevalence" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prevalence/2023-02-14/cl-prevalence-20230214-git.tgz";
-          sha256 = "1lb957ivshgp56phqhvhsmnc4r55x5shvi3mpsan2xsm4hvqspp0";
+          url = "http://beta.quicklisp.org/archive/cl-prevalence/2025-06-22/cl-prevalence-20250622-git.tgz";
+          sha256 = "0j5rplbx1lcm52y3jl86ji4kpc4jz6zznk25dc2m30ac16cqiavs";
           system = "cl-prevalence";
           asd = "cl-prevalence";
         }
@@ -31588,15 +32214,35 @@ lib.makeScope pkgs.newScope (self: {
       meta = { };
     }
   );
+  cl-prevalence-ci = (
+    build-asdf-system {
+      pname = "cl-prevalence-ci";
+      version = "20250622-git";
+      asds = [ "cl-prevalence-ci" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-prevalence/2025-06-22/cl-prevalence-20250622-git.tgz";
+          sha256 = "0j5rplbx1lcm52y3jl86ji4kpc4jz6zznk25dc2m30ac16cqiavs";
+          system = "cl-prevalence-ci";
+          asd = "cl-prevalence-ci";
+        }
+      );
+      systems = [ "cl-prevalence-ci" ];
+      lispLibs = [ (getAttr "_40ants-ci" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   cl-prevalence-test = (
     build-asdf-system {
       pname = "cl-prevalence-test";
-      version = "20230214-git";
+      version = "20250622-git";
       asds = [ "cl-prevalence-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prevalence/2023-02-14/cl-prevalence-20230214-git.tgz";
-          sha256 = "1lb957ivshgp56phqhvhsmnc4r55x5shvi3mpsan2xsm4hvqspp0";
+          url = "http://beta.quicklisp.org/archive/cl-prevalence/2025-06-22/cl-prevalence-20250622-git.tgz";
+          sha256 = "0j5rplbx1lcm52y3jl86ji4kpc4jz6zznk25dc2m30ac16cqiavs";
           system = "cl-prevalence-test";
           asd = "cl-prevalence-test";
         }
@@ -32017,12 +32663,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-protobufs_dot_asdf = (
     build-asdf-system {
       pname = "cl-protobufs.asdf";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-protobufs.asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-protobufs/2024-10-12/cl-protobufs-20241012-git.tgz";
-          sha256 = "08digcsyxs46pl7r5d945db5r2hbrxydqqcmzbgziq61ca4p0ifn";
+          url = "http://beta.quicklisp.org/archive/cl-protobufs/2025-06-22/cl-protobufs-20250622-git.tgz";
+          sha256 = "0kxryqk283qm7shrx7swiqkmv7kj1lawjlrz9pdqbci2fcs763kj";
           system = "cl-protobufs.asdf";
           asd = "cl-protobufs.asdf";
         }
@@ -32377,12 +33023,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-rdkafka = (
     build-asdf-system {
       pname = "cl-rdkafka";
-      version = "20230214-git";
+      version = "20250622-git";
       asds = [ "cl-rdkafka" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rdkafka/2023-02-14/cl-rdkafka-20230214-git.tgz";
-          sha256 = "10y56avak66k2la9bmfzrni01wybi86avxjh64hz57b351bf2s55";
+          url = "http://beta.quicklisp.org/archive/cl-rdkafka/2025-06-22/cl-rdkafka-20250622-git.tgz";
+          sha256 = "1pjpbpl0biyiv63zxm4x3zb3wc7gzag4axnv5rwgg5pa8vqhkdhl";
           system = "cl-rdkafka";
           asd = "cl-rdkafka";
         }
@@ -32392,6 +33038,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "bordeaux-threads" self)
         (getAttr "cffi" self)
         (getAttr "cffi-grovel" self)
+        (getAttr "log4cl" self)
         (getAttr "lparallel" self)
         (getAttr "trivial-garbage" self)
       ];
@@ -32403,12 +33050,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-readline = (
     build-asdf-system {
       pname = "cl-readline";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-readline" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-readline/2024-10-12/cl-readline-20241012-git.tgz";
-          sha256 = "0law12vnj1d5174kk9l949mgkkxm1x6kpcw5wixxjavmxxwqwric";
+          url = "http://beta.quicklisp.org/archive/cl-readline/2025-06-22/cl-readline-20250622-git.tgz";
+          sha256 = "0kimc1blxlza438125qipqaa1ia0r7jwz5jsahmxqc17cmlkby4k";
           system = "cl-readline";
           asd = "cl-readline";
         }
@@ -32472,12 +33119,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-redis = (
     build-asdf-system {
       pname = "cl-redis";
-      version = "20200925-git";
+      version = "20250622-git";
       asds = [ "cl-redis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-redis/2020-09-25/cl-redis-20200925-git.tgz";
-          sha256 = "0x5ahxb5cx37biyn3cjycshhm1rr9p5cf1a9l5hd1n1xjxm2f8vi";
+          url = "http://beta.quicklisp.org/archive/cl-redis/2025-06-22/cl-redis-20250622-git.tgz";
+          sha256 = "1jb82zpiwx7ri86z0xqdynr3m40jnlzinyc0b47lvpbqs7cydrrg";
           system = "cl-redis";
           asd = "cl-redis";
         }
@@ -32485,9 +33132,11 @@ lib.makeScope pkgs.newScope (self: {
       systems = [ "cl-redis" ];
       lispLibs = [
         (getAttr "babel" self)
+        (getAttr "cl_plus_ssl" self)
         (getAttr "cl-ppcre" self)
         (getAttr "flexi-streams" self)
         (getAttr "rutils" self)
+        (getAttr "trivial-gray-streams" self)
         (getAttr "usocket" self)
       ];
       meta = {
@@ -32498,12 +33147,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-redis-test = (
     build-asdf-system {
       pname = "cl-redis-test";
-      version = "20200925-git";
+      version = "20250622-git";
       asds = [ "cl-redis-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-redis/2020-09-25/cl-redis-20200925-git.tgz";
-          sha256 = "0x5ahxb5cx37biyn3cjycshhm1rr9p5cf1a9l5hd1n1xjxm2f8vi";
+          url = "http://beta.quicklisp.org/archive/cl-redis/2025-06-22/cl-redis-20250622-git.tgz";
+          sha256 = "1jb82zpiwx7ri86z0xqdynr3m40jnlzinyc0b47lvpbqs7cydrrg";
           system = "cl-redis-test";
           asd = "cl-redis";
         }
@@ -32604,12 +33253,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-resvg = (
     build-asdf-system {
       pname = "cl-resvg";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-resvg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-resvg/2024-10-12/cl-resvg-20241012-git.tgz";
-          sha256 = "0263na51qs0wrc9r2dqigj4a1h70pjf0mqsgbnd6hfshvx0kq1cl";
+          url = "http://beta.quicklisp.org/archive/cl-resvg/2025-06-22/cl-resvg-20250622-git.tgz";
+          sha256 = "0i0ji3zylcpy25sa8an1s14rpqc7xl0058xm0gr9fmwgiglx3jvi";
           system = "cl-resvg";
           asd = "cl-resvg";
         }
@@ -32619,6 +33268,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "cffi" self)
         (getAttr "documentation-utils" self)
         (getAttr "float-features" self)
+        (getAttr "pathname-utils" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -33788,6 +34438,33 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  cl-sf3 = (
+    build-asdf-system {
+      pname = "cl-sf3";
+      version = "20250622-git";
+      asds = [ "cl-sf3" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-sf3/2025-06-22/cl-sf3-20250622-git.tgz";
+          sha256 = "0rp435whhcb8i46kp9g8fsnbr4w7jkimsngs7v6pga99j5rngfgn";
+          system = "cl-sf3";
+          asd = "cl-sf3";
+        }
+      );
+      systems = [ "cl-sf3" ];
+      lispLibs = [
+        (getAttr "binary-structures" self)
+        (getAttr "documentation-utils" self)
+        (getAttr "file-attributes" self)
+        (getAttr "filesystem-utils" self)
+        (getAttr "pathname-utils" self)
+        (getAttr "precise-time" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   cl-sha1 = (
     build-asdf-system {
       pname = "cl-sha1";
@@ -33961,12 +34638,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-skkserv = (
     build-asdf-system {
       pname = "cl-skkserv";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-skkserv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-skkserv/2024-10-12/cl-skkserv-20241012-git.tgz";
-          sha256 = "1fnar6iw6hr5w37sc96zk9kdcgam8bm71l26l7c6f5daxk57labi";
+          url = "http://beta.quicklisp.org/archive/cl-skkserv/2025-06-22/cl-skkserv-20250622-git.tgz";
+          sha256 = "1vxpmg9fc12w73ymh6xyin4mw2cyjkd115ssvlzm7g9zb1dzswf3";
           system = "cl-skkserv";
           asd = "cl-skkserv";
         }
@@ -34235,12 +34912,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-soloud = (
     build-asdf-system {
       pname = "cl-soloud";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "cl-soloud" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-soloud/2023-10-21/cl-soloud-20231021-git.tgz";
-          sha256 = "0r0z365gcgf93vy8g2nbjwgh5r04gv0l645l2knvip420jxqqp1c";
+          url = "http://beta.quicklisp.org/archive/cl-soloud/2025-06-22/cl-soloud-20250622-git.tgz";
+          sha256 = "0rkvy4pf2hn82bm0vmjp6b0is3zrjm2r2lrcgvxhh6dxcx71zs7i";
           system = "cl-soloud";
           asd = "cl-soloud";
         }
@@ -34421,12 +35098,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-spidev = (
     build-asdf-system {
       pname = "cl-spidev";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "cl-spidev" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-spidev/2023-10-21/cl-spidev-20231021-git.tgz";
-          sha256 = "1dhh6hb2myw8p04psdhdjmikl02r66szpg70yapgyqpycb9yg0l3";
+          url = "http://beta.quicklisp.org/archive/cl-spidev/2025-06-22/cl-spidev-20250622-git.tgz";
+          sha256 = "1wyg67mr3wawdrvv6flxkxbi3saaddxajr0lfzzyvswpy3s117bm";
           system = "cl-spidev";
           asd = "cl-spidev";
         }
@@ -34599,12 +35276,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-steamworks = (
     build-asdf-system {
       pname = "cl-steamworks";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-steamworks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-steamworks/2024-10-12/cl-steamworks-20241012-git.tgz";
-          sha256 = "0401gfmzcc29pm15yyl0p36id0yza2i02wixma2zl8ah3cxb39w5";
+          url = "http://beta.quicklisp.org/archive/cl-steamworks/2025-06-22/cl-steamworks-20250622-git.tgz";
+          sha256 = "0s10n0qnlbj1cwmkv1zhwwnhv79gp04070z0743qyjjvba24l650";
           system = "cl-steamworks";
           asd = "cl-steamworks";
         }
@@ -34616,6 +35293,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "cffi" self)
         (getAttr "documentation-utils" self)
         (getAttr "float-features" self)
+        (getAttr "pathname-utils" self)
         (getAttr "trivial-features" self)
         (getAttr "trivial-garbage" self)
         (getAttr "trivial-gray-streams" self)
@@ -34628,12 +35306,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-steamworks-generator = (
     build-asdf-system {
       pname = "cl-steamworks-generator";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-steamworks-generator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-steamworks/2024-10-12/cl-steamworks-20241012-git.tgz";
-          sha256 = "0401gfmzcc29pm15yyl0p36id0yza2i02wixma2zl8ah3cxb39w5";
+          url = "http://beta.quicklisp.org/archive/cl-steamworks/2025-06-22/cl-steamworks-20250622-git.tgz";
+          sha256 = "0s10n0qnlbj1cwmkv1zhwwnhv79gp04070z0743qyjjvba24l650";
           system = "cl-steamworks-generator";
           asd = "cl-steamworks-generator";
         }
@@ -35350,12 +36028,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-telegram-bot = (
     build-asdf-system {
       pname = "cl-telegram-bot";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-telegram-bot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2024-10-12/cl-telegram-bot-20241012-git.tgz";
-          sha256 = "1i1g9ax46b5jyx2nckp2q00asb46wwlin0hj5wlqlp7cb27r3dqj";
+          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
+          sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m";
           system = "cl-telegram-bot";
           asd = "cl-telegram-bot";
         }
@@ -35364,6 +36042,7 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "_40ants-asdf-system" self)
         (getAttr "alexandria" self)
+        (getAttr "anaphora" self)
         (getAttr "arrows" self)
         (getAttr "bordeaux-threads" self)
         (getAttr "cl-ppcre" self)
@@ -35376,6 +36055,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "serapeum" self)
         (getAttr "str" self)
         (getAttr "trivial-backtrace" self)
+        (getAttr "yason" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -35385,12 +36065,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-telegram-bot-ci = (
     build-asdf-system {
       pname = "cl-telegram-bot-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-telegram-bot-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2024-10-12/cl-telegram-bot-20241012-git.tgz";
-          sha256 = "1i1g9ax46b5jyx2nckp2q00asb46wwlin0hj5wlqlp7cb27r3dqj";
+          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
+          sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m";
           system = "cl-telegram-bot-ci";
           asd = "cl-telegram-bot-ci";
         }
@@ -35405,12 +36085,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-telegram-bot-docs = (
     build-asdf-system {
       pname = "cl-telegram-bot-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-telegram-bot-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2024-10-12/cl-telegram-bot-20241012-git.tgz";
-          sha256 = "1i1g9ax46b5jyx2nckp2q00asb46wwlin0hj5wlqlp7cb27r3dqj";
+          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
+          sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m";
           system = "cl-telegram-bot-docs";
           asd = "cl-telegram-bot-docs";
         }
@@ -35419,6 +36099,8 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "_40ants-doc" self)
         (getAttr "cl-telegram-bot" self)
+        (getAttr "cl-telegram-bot-media" self)
+        (getAttr "cl-telegram-bot2" self)
         (getAttr "docs-config" self)
         (getAttr "named-readtables" self)
         (getAttr "pythonic-string-reader" self)
@@ -35428,15 +36110,35 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  cl-telegram-bot-media = (
+    build-asdf-system {
+      pname = "cl-telegram-bot-media";
+      version = "20250622-git";
+      asds = [ "cl-telegram-bot-media" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-telegram-bot-media/2025-06-22/cl-telegram-bot-media-20250622-git.tgz";
+          sha256 = "0w8vj1szb2i00r5ll7wjjz45ny1w6ygplidpmd6xm6qf8izr69gy";
+          system = "cl-telegram-bot-media";
+          asd = "cl-telegram-bot-media";
+        }
+      );
+      systems = [ "cl-telegram-bot-media" ];
+      lispLibs = [ (getAttr "_40ants-asdf-system" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   cl-telegram-bot-tests = (
     build-asdf-system {
       pname = "cl-telegram-bot-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-telegram-bot-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2024-10-12/cl-telegram-bot-20241012-git.tgz";
-          sha256 = "1i1g9ax46b5jyx2nckp2q00asb46wwlin0hj5wlqlp7cb27r3dqj";
+          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
+          sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m";
           system = "cl-telegram-bot-tests";
           asd = "cl-telegram-bot-tests";
         }
@@ -35448,6 +36150,75 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  cl-telegram-bot2 = (
+    build-asdf-system {
+      pname = "cl-telegram-bot2";
+      version = "20250622-git";
+      asds = [ "cl-telegram-bot2" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
+          sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m";
+          system = "cl-telegram-bot2";
+          asd = "cl-telegram-bot2";
+        }
+      );
+      systems = [ "cl-telegram-bot2" ];
+      lispLibs = [
+        (getAttr "_40ants-asdf-system" self)
+        (getAttr "alexandria" self)
+        (getAttr "bordeaux-threads" self)
+        (getAttr "cl-json" self)
+        (getAttr "closer-mop" self)
+        (getAttr "dexador" self)
+        (getAttr "lambda-fiddle" self)
+        (getAttr "log4cl" self)
+        (getAttr "njson" self)
+        (getAttr "quri" self)
+        (getAttr "sento" self)
+        (getAttr "serapeum" self)
+        (getAttr "str" self)
+        (getAttr "trivial-arguments" self)
+        (getAttr "trivial-backtrace" self)
+        (getAttr "utilities_dot_print-items" self)
+        (getAttr "yason" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  cl-telegram-bot2-examples = (
+    build-asdf-system {
+      pname = "cl-telegram-bot2-examples";
+      version = "20250622-git";
+      asds = [ "cl-telegram-bot2-examples" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
+          sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m";
+          system = "cl-telegram-bot2-examples";
+          asd = "cl-telegram-bot2-examples";
+        }
+      );
+      systems = [ "cl-telegram-bot2-examples" ];
+      lispLibs = [
+        (getAttr "_40ants-asdf-system" self)
+        (getAttr "_40ants-logging" self)
+        (getAttr "alexandria" self)
+        (getAttr "clack" self)
+        (getAttr "clack-handler-hunchentoot" self)
+        (getAttr "ningle" self)
+        (getAttr "serapeum" self)
+        (getAttr "spinneret" self)
+        (getAttr "str" self)
+        (getAttr "yason" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   cl-template = (
     build-asdf-system {
       pname = "cl-template";
@@ -35514,12 +36285,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-tesseract = (
     build-asdf-system {
       pname = "cl-tesseract";
-      version = "20171130-git";
+      version = "20250622-git";
       asds = [ "cl-tesseract" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tesseract/2017-11-30/cl-tesseract-20171130-git.tgz";
-          sha256 = "086627k8whbj60bpw9r3jrdifr4bigqpnp9hxsi7r6702gixz50x";
+          url = "http://beta.quicklisp.org/archive/cl-tesseract/2025-06-22/cl-tesseract-20250622-git.tgz";
+          sha256 = "1v2f8hiwjj501bwq5nh3q09w994d54jf87kllz1xzqknfb835c48";
           system = "cl-tesseract";
           asd = "cl-tesseract";
         }
@@ -35687,12 +36458,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-tiled = (
     build-asdf-system {
       pname = "cl-tiled";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-tiled" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tiled/2024-10-12/cl-tiled-20241012-git.tgz";
-          sha256 = "0ni61iahr58i44psk4z3q1w9nsxbc49m5wbb8w0icm4f7x0ijn07";
+          url = "http://beta.quicklisp.org/archive/cl-tiled/2025-06-22/cl-tiled-20250622-git.tgz";
+          sha256 = "1wmh9df35sl4wd4n4nd050p9489zk4vwg32a5hsj2qqyrh2qvi8b";
           system = "cl-tiled";
           asd = "cl-tiled";
         }
@@ -35716,18 +36487,21 @@ lib.makeScope pkgs.newScope (self: {
   cl-tk = (
     build-asdf-system {
       pname = "cl-tk";
-      version = "20150608-git";
+      version = "20250622-git";
       asds = [ "cl-tk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tk/2015-06-08/cl-tk-20150608-git.tgz";
+          url = "http://beta.quicklisp.org/archive/cl-tk/2025-06-22/cl-tk-20250622-git.tgz";
           sha256 = "0fm4q4pkzbyxr6227vavvy4lm7rfw214lp2dylgzjzcp6f5r4n7w";
           system = "cl-tk";
           asd = "cl-tk";
         }
       );
       systems = [ "cl-tk" ];
-      lispLibs = [ (getAttr "cffi" self) ];
+      lispLibs = [
+        (getAttr "cffi" self)
+        (getAttr "trivial-features" self)
+      ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -35736,12 +36510,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-tld = (
     build-asdf-system {
       pname = "cl-tld";
-      version = "20220220-git";
+      version = "20250622-git";
       asds = [ "cl-tld" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tld/2022-02-20/cl-tld-20220220-git.tgz";
-          sha256 = "1xm471p92in5g4fcxgqshwgr2d7937jw7jv6j473slwkxjvx8dp6";
+          url = "http://beta.quicklisp.org/archive/cl-tld/2025-06-22/cl-tld-20250622-git.tgz";
+          sha256 = "1zxns30gj4hkbm8vm00yi4yvyyvchndq9vi84s5ssymja722j2dc";
           system = "cl-tld";
           asd = "cl-tld";
         }
@@ -36239,12 +37013,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-unification = (
     build-asdf-system {
       pname = "cl-unification";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-unification" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-unification/2024-10-12/cl-unification-20241012-git.tgz";
-          sha256 = "1q7bjj9dzazhgj32291rqy4lld1ilrpck374c21864qn3pmz31ag";
+          url = "http://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz";
+          sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r";
           system = "cl-unification";
           asd = "cl-unification";
         }
@@ -36257,12 +37031,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-unification-lib = (
     build-asdf-system {
       pname = "cl-unification-lib";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-unification-lib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-unification/2024-10-12/cl-unification-20241012-git.tgz";
-          sha256 = "1q7bjj9dzazhgj32291rqy4lld1ilrpck374c21864qn3pmz31ag";
+          url = "http://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz";
+          sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r";
           system = "cl-unification-lib";
           asd = "cl-unification-lib";
         }
@@ -36280,12 +37054,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-unification-test = (
     build-asdf-system {
       pname = "cl-unification-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-unification-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-unification/2024-10-12/cl-unification-20241012-git.tgz";
-          sha256 = "1q7bjj9dzazhgj32291rqy4lld1ilrpck374c21864qn3pmz31ag";
+          url = "http://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz";
+          sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r";
           system = "cl-unification-test";
           asd = "cl-unification-test";
         }
@@ -36581,12 +37355,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-vorbis = (
     build-asdf-system {
       pname = "cl-vorbis";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-vorbis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-vorbis/2024-10-12/cl-vorbis-20241012-git.tgz";
-          sha256 = "04p0ix2mxa8iv2dab19mlix6m3inwyb0rs5wsrf8r9l1n41dyp2p";
+          url = "http://beta.quicklisp.org/archive/cl-vorbis/2025-06-22/cl-vorbis-20250622-git.tgz";
+          sha256 = "0xigqkh4lqz734nniyifbymgxyxcr6if4358598md0y4mnv709sx";
           system = "cl-vorbis";
           asd = "cl-vorbis";
         }
@@ -36737,12 +37511,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-wavefront = (
     build-asdf-system {
       pname = "cl-wavefront";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-wavefront" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-wavefront/2024-10-12/cl-wavefront-20241012-git.tgz";
-          sha256 = "1il5i04x2ff3pnjm2pgvq0hryd9rnjdbczvinj3l3w30lj553g83";
+          url = "http://beta.quicklisp.org/archive/cl-wavefront/2025-06-22/cl-wavefront-20250622-git.tgz";
+          sha256 = "0yc6850v8hvfll34fz30yxbazzjs31ylf1rdwi62dzfmmqyxk2cs";
           system = "cl-wavefront";
           asd = "cl-wavefront";
         }
@@ -36954,12 +37728,12 @@ lib.makeScope pkgs.newScope (self: {
   cl-who = (
     build-asdf-system {
       pname = "cl-who";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cl-who" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-who/2024-10-12/cl-who-20241012-git.tgz";
-          sha256 = "1kfpy69dw0g7w7k0akimncpkxfqq85r08i2da8nw1dhk2hp6l8jc";
+          url = "http://beta.quicklisp.org/archive/cl-who/2025-06-22/cl-who-20250622-git.tgz";
+          sha256 = "1x65mwkj40ii1rpnm7qaf9hhj23l2hcadkfc6s22mpd422ljd3kd";
           system = "cl-who";
           asd = "cl-who";
         }
@@ -36969,29 +37743,6 @@ lib.makeScope pkgs.newScope (self: {
       meta = { };
     }
   );
-  cl-who-test = (
-    build-asdf-system {
-      pname = "cl-who-test";
-      version = "20241012-git";
-      asds = [ "cl-who-test" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-who/2024-10-12/cl-who-20241012-git.tgz";
-          sha256 = "1kfpy69dw0g7w7k0akimncpkxfqq85r08i2da8nw1dhk2hp6l8jc";
-          system = "cl-who-test";
-          asd = "cl-who";
-        }
-      );
-      systems = [ "cl-who-test" ];
-      lispLibs = [
-        (getAttr "cl-who" self)
-        (getAttr "flexi-streams" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   cl-why = (
     build-asdf-system {
       pname = "cl-why";
@@ -37669,12 +38420,12 @@ lib.makeScope pkgs.newScope (self: {
   clack = (
     build-asdf-system {
       pname = "clack";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz";
-          sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3";
+          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "clack";
           asd = "clack";
         }
@@ -37695,12 +38446,12 @@ lib.makeScope pkgs.newScope (self: {
   clack-cors = (
     build-asdf-system {
       pname = "clack-cors";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clack-cors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-cors/2024-10-12/clack-cors-20241012-git.tgz";
-          sha256 = "0bndzkrqmdq5cz7wfzr7kw2gy5vk8h1hmf3vplc6mqk7vr3zm6m2";
+          url = "http://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz";
+          sha256 = "1a2nfzbshc8y04my5fjlka666jd093nr0wz6mn8qfi70d688vkjh";
           system = "clack-cors";
           asd = "clack-cors";
         }
@@ -37720,12 +38471,12 @@ lib.makeScope pkgs.newScope (self: {
   clack-cors-ci = (
     build-asdf-system {
       pname = "clack-cors-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clack-cors-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-cors/2024-10-12/clack-cors-20241012-git.tgz";
-          sha256 = "0bndzkrqmdq5cz7wfzr7kw2gy5vk8h1hmf3vplc6mqk7vr3zm6m2";
+          url = "http://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz";
+          sha256 = "1a2nfzbshc8y04my5fjlka666jd093nr0wz6mn8qfi70d688vkjh";
           system = "clack-cors-ci";
           asd = "clack-cors-ci";
         }
@@ -37740,12 +38491,12 @@ lib.makeScope pkgs.newScope (self: {
   clack-cors-docs = (
     build-asdf-system {
       pname = "clack-cors-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clack-cors-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-cors/2024-10-12/clack-cors-20241012-git.tgz";
-          sha256 = "0bndzkrqmdq5cz7wfzr7kw2gy5vk8h1hmf3vplc6mqk7vr3zm6m2";
+          url = "http://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz";
+          sha256 = "1a2nfzbshc8y04my5fjlka666jd093nr0wz6mn8qfi70d688vkjh";
           system = "clack-cors-docs";
           asd = "clack-cors-docs";
         }
@@ -37766,12 +38517,12 @@ lib.makeScope pkgs.newScope (self: {
   clack-cors-tests = (
     build-asdf-system {
       pname = "clack-cors-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clack-cors-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-cors/2024-10-12/clack-cors-20241012-git.tgz";
-          sha256 = "0bndzkrqmdq5cz7wfzr7kw2gy5vk8h1hmf3vplc6mqk7vr3zm6m2";
+          url = "http://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz";
+          sha256 = "1a2nfzbshc8y04my5fjlka666jd093nr0wz6mn8qfi70d688vkjh";
           system = "clack-cors-tests";
           asd = "clack-cors-tests";
         }
@@ -37865,12 +38616,12 @@ lib.makeScope pkgs.newScope (self: {
   clack-handler-hunchentoot = (
     build-asdf-system {
       pname = "clack-handler-hunchentoot";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clack-handler-hunchentoot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz";
-          sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3";
+          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "clack-handler-hunchentoot";
           asd = "clack-handler-hunchentoot";
         }
@@ -37892,12 +38643,12 @@ lib.makeScope pkgs.newScope (self: {
   clack-handler-toot = (
     build-asdf-system {
       pname = "clack-handler-toot";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clack-handler-toot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz";
-          sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3";
+          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "clack-handler-toot";
           asd = "clack-handler-toot";
         }
@@ -37939,12 +38690,12 @@ lib.makeScope pkgs.newScope (self: {
   clack-handler-wookie = (
     build-asdf-system {
       pname = "clack-handler-wookie";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clack-handler-wookie" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz";
-          sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3";
+          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "clack-handler-wookie";
           asd = "clack-handler-wookie";
         }
@@ -37996,12 +38747,12 @@ lib.makeScope pkgs.newScope (self: {
   clack-prometheus = (
     build-asdf-system {
       pname = "clack-prometheus";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clack-prometheus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-prometheus/2024-10-12/clack-prometheus-20241012-git.tgz";
-          sha256 = "1zkflszvxyhxn7m9c2f1k2snqwdzasbvscw5vpsglb50pczs9g0d";
+          url = "http://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz";
+          sha256 = "00j4wzsjzlqq6fa6p5vv59z4v72qq8n78j3cz128icc73dgv3pzq";
           system = "clack-prometheus";
           asd = "clack-prometheus";
         }
@@ -38025,12 +38776,12 @@ lib.makeScope pkgs.newScope (self: {
   clack-prometheus-ci = (
     build-asdf-system {
       pname = "clack-prometheus-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clack-prometheus-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-prometheus/2024-10-12/clack-prometheus-20241012-git.tgz";
-          sha256 = "1zkflszvxyhxn7m9c2f1k2snqwdzasbvscw5vpsglb50pczs9g0d";
+          url = "http://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz";
+          sha256 = "00j4wzsjzlqq6fa6p5vv59z4v72qq8n78j3cz128icc73dgv3pzq";
           system = "clack-prometheus-ci";
           asd = "clack-prometheus-ci";
         }
@@ -38045,12 +38796,12 @@ lib.makeScope pkgs.newScope (self: {
   clack-prometheus-docs = (
     build-asdf-system {
       pname = "clack-prometheus-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clack-prometheus-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-prometheus/2024-10-12/clack-prometheus-20241012-git.tgz";
-          sha256 = "1zkflszvxyhxn7m9c2f1k2snqwdzasbvscw5vpsglb50pczs9g0d";
+          url = "http://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz";
+          sha256 = "00j4wzsjzlqq6fa6p5vv59z4v72qq8n78j3cz128icc73dgv3pzq";
           system = "clack-prometheus-docs";
           asd = "clack-prometheus-docs";
         }
@@ -38071,12 +38822,12 @@ lib.makeScope pkgs.newScope (self: {
   clack-prometheus-tests = (
     build-asdf-system {
       pname = "clack-prometheus-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clack-prometheus-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-prometheus/2024-10-12/clack-prometheus-20241012-git.tgz";
-          sha256 = "1zkflszvxyhxn7m9c2f1k2snqwdzasbvscw5vpsglb50pczs9g0d";
+          url = "http://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz";
+          sha256 = "00j4wzsjzlqq6fa6p5vv59z4v72qq8n78j3cz128icc73dgv3pzq";
           system = "clack-prometheus-tests";
           asd = "clack-prometheus-tests";
         }
@@ -38091,12 +38842,12 @@ lib.makeScope pkgs.newScope (self: {
   clack-socket = (
     build-asdf-system {
       pname = "clack-socket";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clack-socket" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz";
-          sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3";
+          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "clack-socket";
           asd = "clack-socket";
         }
@@ -38184,12 +38935,12 @@ lib.makeScope pkgs.newScope (self: {
   clack-test = (
     build-asdf-system {
       pname = "clack-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clack-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz";
-          sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3";
+          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "clack-test";
           asd = "clack-test";
         }
@@ -38214,12 +38965,12 @@ lib.makeScope pkgs.newScope (self: {
   clad = (
     build-asdf-system {
       pname = "clad";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clad" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clad/2024-10-12/clad-20241012-git.tgz";
-          sha256 = "1ah8d4wyd7yqchcnyjcnd27gx2m410cgybyp194ng1ipdpa4mm6n";
+          url = "http://beta.quicklisp.org/archive/clad/2025-06-22/clad-20250622-git.tgz";
+          sha256 = "0qr59j0d2df08vaijw3il5hh4j6vgrmwgm9nm1dc4nipqci1wadc";
           system = "clad";
           asd = "clad";
         }
@@ -38279,12 +39030,12 @@ lib.makeScope pkgs.newScope (self: {
   classimp = (
     build-asdf-system {
       pname = "classimp";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "classimp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/classimp/2024-10-12/classimp-20241012-git.tgz";
-          sha256 = "1sq34s5yrljh7fffllsscay7xi11lg03alrkyrh6xfwa2w7cnqmx";
+          url = "http://beta.quicklisp.org/archive/classimp/2025-06-22/classimp-20250622-git.tgz";
+          sha256 = "0grily13njibm60fw81vlycn3131qi2dgp9yys5xj65cacjfyky0";
           system = "classimp";
           asd = "classimp";
         }
@@ -38302,12 +39053,12 @@ lib.makeScope pkgs.newScope (self: {
   classimp-samples = (
     build-asdf-system {
       pname = "classimp-samples";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "classimp-samples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/classimp/2024-10-12/classimp-20241012-git.tgz";
-          sha256 = "1sq34s5yrljh7fffllsscay7xi11lg03alrkyrh6xfwa2w7cnqmx";
+          url = "http://beta.quicklisp.org/archive/classimp/2025-06-22/classimp-20250622-git.tgz";
+          sha256 = "0grily13njibm60fw81vlycn3131qi2dgp9yys5xj65cacjfyky0";
           system = "classimp-samples";
           asd = "classimp-samples";
         }
@@ -38369,12 +39120,12 @@ lib.makeScope pkgs.newScope (self: {
   clast = (
     build-asdf-system {
       pname = "clast";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clast" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clast/2024-10-12/clast-20241012-git.tgz";
-          sha256 = "0509hrpd049s62s03wwb2mp24dfw8f0l8cg0vgq3s8wrsch7af2m";
+          url = "http://beta.quicklisp.org/archive/clast/2025-06-22/clast-20250622-git.tgz";
+          sha256 = "0ipybqc928ncdpq3rkxgk9c4y9mis4k139w284nn4g4yzh28vq1i";
           system = "clast";
           asd = "clast";
         }
@@ -38389,12 +39140,12 @@ lib.makeScope pkgs.newScope (self: {
   clath = (
     build-asdf-system {
       pname = "clath";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clath" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clath/2024-10-12/clath-20241012-git.tgz";
-          sha256 = "0519jzm8r55am6f5w11pfbyq0bvn8jxkcz33kbrznwrf43xz5fcv";
+          url = "http://beta.quicklisp.org/archive/clath/2025-06-22/clath-20250622-git.tgz";
+          sha256 = "136zf18g734mhvh3ghk9ag4y2ginzvirn1v51kchn7nxzsm8ay97";
           system = "clath";
           asd = "clath";
         }
@@ -38447,12 +39198,12 @@ lib.makeScope pkgs.newScope (self: {
   clavier = (
     build-asdf-system {
       pname = "clavier";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clavier" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clavier/2024-10-12/clavier-20241012-git.tgz";
-          sha256 = "0v81ql9bbnsqaxcrv0ynm82xwifxvc6ysmfrn1lgphn4szx1p230";
+          url = "http://beta.quicklisp.org/archive/clavier/2025-06-22/clavier-20250622-git.tgz";
+          sha256 = "19hmrzp2sgycmm1qq24nv89ss24d8vs6izjzxn9zp24zcdr64crs";
           system = "clavier";
           asd = "clavier";
         }
@@ -38473,12 +39224,12 @@ lib.makeScope pkgs.newScope (self: {
   clavier_dot_test = (
     build-asdf-system {
       pname = "clavier.test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clavier.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clavier/2024-10-12/clavier-20241012-git.tgz";
-          sha256 = "0v81ql9bbnsqaxcrv0ynm82xwifxvc6ysmfrn1lgphn4szx1p230";
+          url = "http://beta.quicklisp.org/archive/clavier/2025-06-22/clavier-20250622-git.tgz";
+          sha256 = "19hmrzp2sgycmm1qq24nv89ss24d8vs6izjzxn9zp24zcdr64crs";
           system = "clavier.test";
           asd = "clavier.test";
         }
@@ -38654,12 +39405,12 @@ lib.makeScope pkgs.newScope (self: {
   clazy = (
     build-asdf-system {
       pname = "clazy";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clazy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clazy/2024-10-12/clazy-20241012-git.tgz";
-          sha256 = "0z9iy89p4grj2a803nlrnvj335c6knmnlbicpf0b4br41j6q74xj";
+          url = "http://beta.quicklisp.org/archive/clazy/2025-06-22/clazy-20250622-git.tgz";
+          sha256 = "023wx26gcswgkx0b7i2bjhpaqrphnniv5vrljhbhx1v1w9cf47yh";
           system = "clazy";
           asd = "clazy";
         }
@@ -39079,12 +39830,12 @@ lib.makeScope pkgs.newScope (self: {
   clim = (
     build-asdf-system {
       pname = "clim";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim";
           asd = "clim";
         }
@@ -39102,12 +39853,12 @@ lib.makeScope pkgs.newScope (self: {
   clim-core = (
     build-asdf-system {
       pname = "clim-core";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clim-core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-core";
           asd = "clim-core";
         }
@@ -39130,12 +39881,12 @@ lib.makeScope pkgs.newScope (self: {
   clim-debugger = (
     build-asdf-system {
       pname = "clim-debugger";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clim-debugger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-debugger";
           asd = "clim-debugger";
         }
@@ -39155,12 +39906,12 @@ lib.makeScope pkgs.newScope (self: {
   clim-examples = (
     build-asdf-system {
       pname = "clim-examples";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clim-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-examples";
           asd = "clim-examples";
         }
@@ -39183,12 +39934,12 @@ lib.makeScope pkgs.newScope (self: {
   clim-lisp = (
     build-asdf-system {
       pname = "clim-lisp";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clim-lisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-lisp";
           asd = "clim-lisp";
         }
@@ -39209,12 +39960,12 @@ lib.makeScope pkgs.newScope (self: {
   clim-listener = (
     build-asdf-system {
       pname = "clim-listener";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clim-listener" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-listener";
           asd = "clim-listener";
         }
@@ -39233,12 +39984,12 @@ lib.makeScope pkgs.newScope (self: {
   clim-pdf = (
     build-asdf-system {
       pname = "clim-pdf";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clim-pdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-pdf";
           asd = "clim-pdf";
         }
@@ -39260,12 +40011,12 @@ lib.makeScope pkgs.newScope (self: {
   clim-postscript = (
     build-asdf-system {
       pname = "clim-postscript";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clim-postscript" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-postscript";
           asd = "clim-postscript";
         }
@@ -39283,12 +40034,12 @@ lib.makeScope pkgs.newScope (self: {
   clim-postscript-font = (
     build-asdf-system {
       pname = "clim-postscript-font";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clim-postscript-font" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-postscript-font";
           asd = "clim-postscript-font";
         }
@@ -39540,8 +40291,6 @@ lib.makeScope pkgs.newScope (self: {
       ];
       meta = {
         hydraPlatforms = [ ];
-        # darwin cannot find libpango.dylib
-        broken = stdenv.hostPlatform.isDarwin;
       };
     }
   );
@@ -39688,12 +40437,12 @@ lib.makeScope pkgs.newScope (self: {
   clip = (
     build-asdf-system {
       pname = "clip";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clip" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clip/2024-10-12/clip-20241012-git.tgz";
-          sha256 = "1ikzfza4s5xl67bz4vi05hmqmkvs5qr2ycy1f6vi1ihsdvjfify0";
+          url = "http://beta.quicklisp.org/archive/clip/2025-06-22/clip-20250622-git.tgz";
+          sha256 = "1ikyf0340clllafjb7jg2bvwxfnb0vv8bjnd8ngn4qlpsx75m1nl";
           system = "clip";
           asd = "clip";
         }
@@ -39787,18 +40536,21 @@ lib.makeScope pkgs.newScope (self: {
   clith = (
     build-asdf-system {
       pname = "clith";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clith" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clith/2024-10-12/clith-20241012-git.tgz";
-          sha256 = "02qfyrnihx9x6nwxgzlh2x6ymz90i524jg8gc5zsy9rcfqj2sfa7";
+          url = "http://beta.quicklisp.org/archive/clith/2025-06-22/clith-20250622-git.tgz";
+          sha256 = "0n973pf696bi8mv6nazjwdwgp1i2p8jfp3ab068y0cvnrww693x6";
           system = "clith";
           asd = "clith";
         }
       );
       systems = [ "clith" ];
-      lispLibs = [ (getAttr "alexandria" self) ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "expanders" self)
+      ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -40842,12 +41594,12 @@ lib.makeScope pkgs.newScope (self: {
   clog = (
     build-asdf-system {
       pname = "clog";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clog/2024-10-12/clog-20241012-git.tgz";
-          sha256 = "0hqpj9ji7kfqgcxdfnc7x202qzmb7zdkmjwcyhdllqs6b0ssw5lx";
+          url = "http://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz";
+          sha256 = "1sf2xan0fh2qqr8xgmsbmq9qcj5nkzrp3nq7gd69ssbkz9ab6qpw";
           system = "clog";
           asd = "clog";
         }
@@ -41156,12 +41908,12 @@ lib.makeScope pkgs.newScope (self: {
   closer-mop = (
     build-asdf-system {
       pname = "closer-mop";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "closer-mop" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/closer-mop/2024-10-12/closer-mop-20241012-git.tgz";
-          sha256 = "1affaqh0sm1phs6qa12vbhf69abssjcpy55cwf4fi4nd6hgcrfqr";
+          url = "http://beta.quicklisp.org/archive/closer-mop/2025-06-22/closer-mop-20250622-git.tgz";
+          sha256 = "11mzk34j9mq1sq99im1n6y798kfrxgavskwx9mrywmvs316pssly";
           system = "closer-mop";
           asd = "closer-mop";
         }
@@ -41316,12 +42068,12 @@ lib.makeScope pkgs.newScope (self: {
   clouseau = (
     build-asdf-system {
       pname = "clouseau";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clouseau" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clouseau";
           asd = "clouseau";
         }
@@ -41799,12 +42551,12 @@ lib.makeScope pkgs.newScope (self: {
   clss = (
     build-asdf-system {
       pname = "clss";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clss" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clss/2024-10-12/clss-20241012-git.tgz";
-          sha256 = "1l2yq6wi8wmb7l8fy6w4xb3mb2yd9d14ijgqdsbnwb5k2hbmndbf";
+          url = "http://beta.quicklisp.org/archive/clss/2025-06-22/clss-20250622-git.tgz";
+          sha256 = "08ivm4x6j9lvvl55df71h2azwf4l47nyvi0yrb4rs5paqjd4afq3";
           system = "clss";
           asd = "clss";
         }
@@ -42082,12 +42834,12 @@ lib.makeScope pkgs.newScope (self: {
   clunit2 = (
     build-asdf-system {
       pname = "clunit2";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "clunit2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clunit2/2024-10-12/clunit2-20241012-git.tgz";
-          sha256 = "03k4wc2zz31wcqcxy8fhq095i8xzcaxrzgrlrn2va10lcjs4v51b";
+          url = "http://beta.quicklisp.org/archive/clunit2/2025-06-22/clunit2-20250622-git.tgz";
+          sha256 = "0xm9jsy2wsvbbf8cgln6601a1rbyiz8hk17vh0lm747sqhg2vxc5";
           system = "clunit2";
           asd = "clunit2";
         }
@@ -42332,12 +43084,12 @@ lib.makeScope pkgs.newScope (self: {
   cmd = (
     build-asdf-system {
       pname = "cmd";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cmd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cmd/2024-10-12/cmd-20241012-git.tgz";
-          sha256 = "0rs2priccm34yx8cj29214i4bwa908gqs1ss23gyjb7v5qcq1sj7";
+          url = "http://beta.quicklisp.org/archive/cmd/2025-06-22/cmd-20250622-git.tgz";
+          sha256 = "1wm06jvb24pcrfy5h8xm5l6jh13dsrir789bz1c50pjm17wlbk3k";
           system = "cmd";
           asd = "cmd";
         }
@@ -42401,12 +43153,12 @@ lib.makeScope pkgs.newScope (self: {
   coalton = (
     build-asdf-system {
       pname = "coalton";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "coalton" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz";
-          sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7";
+          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "coalton";
           asd = "coalton";
         }
@@ -42426,12 +43178,12 @@ lib.makeScope pkgs.newScope (self: {
   coalton-asdf = (
     build-asdf-system {
       pname = "coalton-asdf";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "coalton-asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz";
-          sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7";
+          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "coalton-asdf";
           asd = "coalton-asdf";
         }
@@ -42446,12 +43198,12 @@ lib.makeScope pkgs.newScope (self: {
   coalton-compiler = (
     build-asdf-system {
       pname = "coalton-compiler";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "coalton-compiler" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz";
-          sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7";
+          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "coalton-compiler";
           asd = "coalton-compiler";
         }
@@ -42476,12 +43228,12 @@ lib.makeScope pkgs.newScope (self: {
   coalton-testing-example-project = (
     build-asdf-system {
       pname = "coalton-testing-example-project";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "coalton-testing-example-project" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz";
-          sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7";
+          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "coalton-testing-example-project";
           asd = "coalton-testing-example-project";
         }
@@ -42496,38 +43248,15 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  cocoahelper = (
-    build-asdf-system {
-      pname = "cocoahelper";
-      version = "20210807-git";
-      asds = [ "cocoahelper" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
-          system = "cocoahelper";
-          asd = "cocoahelper";
-        }
-      );
-      systems = [ "cocoahelper" ];
-      lispLibs = [
-        (getAttr "cffi" self)
-        (getAttr "lispbuilder-sdl-binaries" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   cocoas = (
     build-asdf-system {
       pname = "cocoas";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "cocoas" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cocoas/2024-10-12/cocoas-20241012-git.tgz";
-          sha256 = "0a3jpni8hnzd6103qj3nywy61c3jq6j9yzmg35wy4b8j94pgyvj5";
+          url = "http://beta.quicklisp.org/archive/cocoas/2025-06-22/cocoas-20250622-git.tgz";
+          sha256 = "1mw20p5apf75vf26hqbvsbmr46kw6nab36mg11wff1p22l4xmlqx";
           system = "cocoas";
           asd = "cocoas";
         }
@@ -42546,12 +43275,12 @@ lib.makeScope pkgs.newScope (self: {
   codata-recommended-values = (
     build-asdf-system {
       pname = "codata-recommended-values";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "codata-recommended-values" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/codata-recommended-values/2024-10-12/codata-recommended-values-20241012-git.tgz";
-          sha256 = "0mks9hzw5wkdjkqkcfbafm9rvbfgkn2na4bajfrhs4mn7bg4bv74";
+          url = "http://beta.quicklisp.org/archive/codata-recommended-values/2025-06-22/codata-recommended-values-20250622-git.tgz";
+          sha256 = "0s3bc8znh3jrm5n4lw87qa6lm2w2bkv96bh8li7kskfdvd3fzgfi";
           system = "codata-recommended-values";
           asd = "codata-recommended-values";
         }
@@ -42620,12 +43349,12 @@ lib.makeScope pkgs.newScope (self: {
   coleslaw = (
     build-asdf-system {
       pname = "coleslaw";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "coleslaw" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coleslaw/2024-10-12/coleslaw-20241012-git.tgz";
-          sha256 = "1p9hg5qnymxzx2bzcvkzjarwxw383misq0cmqgggpzyhignx80av";
+          url = "http://beta.quicklisp.org/archive/coleslaw/2025-06-22/coleslaw-20250622-git.tgz";
+          sha256 = "126dl1m6zh7m6gmq2xnam0bfg6nv7gdkvcr4x1i3407s3wpmirw5";
           system = "coleslaw";
           asd = "coleslaw";
         }
@@ -42651,12 +43380,12 @@ lib.makeScope pkgs.newScope (self: {
   coleslaw-cli = (
     build-asdf-system {
       pname = "coleslaw-cli";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "coleslaw-cli" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coleslaw/2024-10-12/coleslaw-20241012-git.tgz";
-          sha256 = "1p9hg5qnymxzx2bzcvkzjarwxw383misq0cmqgggpzyhignx80av";
+          url = "http://beta.quicklisp.org/archive/coleslaw/2025-06-22/coleslaw-20250622-git.tgz";
+          sha256 = "126dl1m6zh7m6gmq2xnam0bfg6nv7gdkvcr4x1i3407s3wpmirw5";
           system = "coleslaw-cli";
           asd = "coleslaw-cli";
         }
@@ -42675,12 +43404,12 @@ lib.makeScope pkgs.newScope (self: {
   coleslaw-test = (
     build-asdf-system {
       pname = "coleslaw-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "coleslaw-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coleslaw/2024-10-12/coleslaw-20241012-git.tgz";
-          sha256 = "1p9hg5qnymxzx2bzcvkzjarwxw383misq0cmqgggpzyhignx80av";
+          url = "http://beta.quicklisp.org/archive/coleslaw/2025-06-22/coleslaw-20250622-git.tgz";
+          sha256 = "126dl1m6zh7m6gmq2xnam0bfg6nv7gdkvcr4x1i3407s3wpmirw5";
           system = "coleslaw-test";
           asd = "coleslaw-test";
         }
@@ -42814,12 +43543,12 @@ lib.makeScope pkgs.newScope (self: {
   colored = (
     build-asdf-system {
       pname = "colored";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "colored" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/colored/2024-10-12/colored-20241012-git.tgz";
-          sha256 = "0msw83gs5m887n1ha54jhflqjxb2mc7yv1hifspv9g16fn6h355c";
+          url = "http://beta.quicklisp.org/archive/colored/2025-06-22/colored-20250622-git.tgz";
+          sha256 = "1wsj4449165h8diclk74a80x847yzsqnx9s02l314nm1wa37y3c7";
           system = "colored";
           asd = "colored";
         }
@@ -42834,12 +43563,12 @@ lib.makeScope pkgs.newScope (self: {
   colored-test = (
     build-asdf-system {
       pname = "colored-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "colored-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/colored/2024-10-12/colored-20241012-git.tgz";
-          sha256 = "0msw83gs5m887n1ha54jhflqjxb2mc7yv1hifspv9g16fn6h355c";
+          url = "http://beta.quicklisp.org/archive/colored/2025-06-22/colored-20250622-git.tgz";
+          sha256 = "1wsj4449165h8diclk74a80x847yzsqnx9s02l314nm1wa37y3c7";
           system = "colored-test";
           asd = "colored-test";
         }
@@ -42857,12 +43586,12 @@ lib.makeScope pkgs.newScope (self: {
   colorize = (
     build-asdf-system {
       pname = "colorize";
-      version = "20230214-git";
+      version = "20250622-git";
       asds = [ "colorize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/colorize/2023-02-14/colorize-20230214-git.tgz";
-          sha256 = "1gbg11ghs4iak3n4c66qn6yvrcsg71xcbnjjf8qks0y4c8573fyf";
+          url = "http://beta.quicklisp.org/archive/colorize/2025-06-22/colorize-20250622-git.tgz";
+          sha256 = "0wgnmpfn9z6xcvf87inlgpr3xhc2xbly5k9aifgvjwpmw9994m65";
           system = "colorize";
           asd = "colorize";
         }
@@ -42879,12 +43608,12 @@ lib.makeScope pkgs.newScope (self: {
   com-on = (
     build-asdf-system {
       pname = "com-on";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "com-on" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/com-on/2024-10-12/com-on-20241012-git.tgz";
-          sha256 = "1a3by2kx3iq0zl4304zhs89dfkp8xdjmdlnfmgywdg3wjdkxakci";
+          url = "http://beta.quicklisp.org/archive/com-on/2025-06-22/com-on-20250622-git.tgz";
+          sha256 = "0ycg3iijaj5p2xmd0lzpgqpdkxi6q9kx9gijyv0ww18xzqd8s3z1";
           system = "com-on";
           asd = "com-on";
         }
@@ -42902,12 +43631,12 @@ lib.makeScope pkgs.newScope (self: {
   com-on-test = (
     build-asdf-system {
       pname = "com-on-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "com-on-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/com-on/2024-10-12/com-on-20241012-git.tgz";
-          sha256 = "1a3by2kx3iq0zl4304zhs89dfkp8xdjmdlnfmgywdg3wjdkxakci";
+          url = "http://beta.quicklisp.org/archive/com-on/2025-06-22/com-on-20250622-git.tgz";
+          sha256 = "0ycg3iijaj5p2xmd0lzpgqpdkxi6q9kx9gijyv0ww18xzqd8s3z1";
           system = "com-on-test";
           asd = "com-on-test";
         }
@@ -42960,7 +43689,9 @@ lib.makeScope pkgs.newScope (self: {
         }
       );
       systems = [ "com.clearly-useful.generic-collection-interface.test" ];
-      lispLibs = [ (getAttr "com_dot_clearly-useful_dot_generic-collection-interface" self) ];
+      lispLibs = [
+        (getAttr "com_dot_clearly-useful_dot_generic-collection-interface" self)
+      ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -43764,12 +44495,12 @@ lib.makeScope pkgs.newScope (self: {
   common-lisp-jupyter = (
     build-asdf-system {
       pname = "common-lisp-jupyter";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "common-lisp-jupyter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-lisp-jupyter/2024-10-12/common-lisp-jupyter-20241012-git.tgz";
-          sha256 = "1qbrzv0myxfxq7rzm2y9cm2xymkl982982h2kbsl7d1yd5hrjvl6";
+          url = "http://beta.quicklisp.org/archive/common-lisp-jupyter/2025-06-22/common-lisp-jupyter-20250622-git.tgz";
+          sha256 = "0xm3a68dn3mlq4gyiqfndf61agh1bj5fp1cqhsscz53zjcnrb2yb";
           system = "common-lisp-jupyter";
           asd = "common-lisp-jupyter";
         }
@@ -43791,10 +44522,8 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "puri" self)
         (getAttr "pzmq" self)
         (getAttr "shasht" self)
-        (getAttr "static-vectors" self)
         (getAttr "trivial-do" self)
         (getAttr "trivial-features" self)
-        (getAttr "trivial-garbage" self)
         (getAttr "trivial-mimes" self)
       ];
       meta = {
@@ -43805,12 +44534,12 @@ lib.makeScope pkgs.newScope (self: {
   commondoc-markdown = (
     build-asdf-system {
       pname = "commondoc-markdown";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "commondoc-markdown" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/commondoc-markdown/2024-10-12/commondoc-markdown-20241012-git.tgz";
-          sha256 = "12n8yx8jhz8713r63gmrymplm1mfczm7q7a343d13wl6gng1gjs1";
+          url = "http://beta.quicklisp.org/archive/commondoc-markdown/2025-06-22/commondoc-markdown-20250622-git.tgz";
+          sha256 = "0r9np8lv1p1fkfxapz12x5r5bak555kaf9dkwclv9xq8jbpvqyam";
           system = "commondoc-markdown";
           asd = "commondoc-markdown";
         }
@@ -43838,12 +44567,12 @@ lib.makeScope pkgs.newScope (self: {
   commondoc-markdown-docs = (
     build-asdf-system {
       pname = "commondoc-markdown-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "commondoc-markdown-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/commondoc-markdown/2024-10-12/commondoc-markdown-20241012-git.tgz";
-          sha256 = "12n8yx8jhz8713r63gmrymplm1mfczm7q7a343d13wl6gng1gjs1";
+          url = "http://beta.quicklisp.org/archive/commondoc-markdown/2025-06-22/commondoc-markdown-20250622-git.tgz";
+          sha256 = "0r9np8lv1p1fkfxapz12x5r5bak555kaf9dkwclv9xq8jbpvqyam";
           system = "commondoc-markdown-docs";
           asd = "commondoc-markdown-docs";
         }
@@ -43860,31 +44589,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  commondoc-markdown-test = (
-    build-asdf-system {
-      pname = "commondoc-markdown-test";
-      version = "20241012-git";
-      asds = [ "commondoc-markdown-test" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/commondoc-markdown/2024-10-12/commondoc-markdown-20241012-git.tgz";
-          sha256 = "12n8yx8jhz8713r63gmrymplm1mfczm7q7a343d13wl6gng1gjs1";
-          system = "commondoc-markdown-test";
-          asd = "commondoc-markdown-test";
-        }
-      );
-      systems = [ "commondoc-markdown-test" ];
-      lispLibs = [
-        (getAttr "common-doc" self)
-        (getAttr "commondoc-markdown" self)
-        (getAttr "hamcrest" self)
-        (getAttr "rove" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   commonqt = (
     build-asdf-system {
       pname = "commonqt";
@@ -44022,40 +44726,17 @@ lib.makeScope pkgs.newScope (self: {
   concrete-syntax-tree = (
     build-asdf-system {
       pname = "concrete-syntax-tree";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "concrete-syntax-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2023-06-18/concrete-syntax-tree-20230618-git.tgz";
-          sha256 = "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv";
+          url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz";
+          sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl";
           system = "concrete-syntax-tree";
           asd = "concrete-syntax-tree";
         }
       );
       systems = [ "concrete-syntax-tree" ];
-      lispLibs = [
-        (getAttr "concrete-syntax-tree-base" self)
-        (getAttr "concrete-syntax-tree-lambda-list" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  concrete-syntax-tree-base = (
-    build-asdf-system {
-      pname = "concrete-syntax-tree-base";
-      version = "20230618-git";
-      asds = [ "concrete-syntax-tree-base" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2023-06-18/concrete-syntax-tree-20230618-git.tgz";
-          sha256 = "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv";
-          system = "concrete-syntax-tree-base";
-          asd = "concrete-syntax-tree-base";
-        }
-      );
-      systems = [ "concrete-syntax-tree-base" ];
       lispLibs = [ (getAttr "acclimation" self) ];
       meta = {
         hydraPlatforms = [ ];
@@ -44065,12 +44746,12 @@ lib.makeScope pkgs.newScope (self: {
   concrete-syntax-tree-destructuring = (
     build-asdf-system {
       pname = "concrete-syntax-tree-destructuring";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "concrete-syntax-tree-destructuring" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2023-06-18/concrete-syntax-tree-20230618-git.tgz";
-          sha256 = "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv";
+          url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz";
+          sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl";
           system = "concrete-syntax-tree-destructuring";
           asd = "concrete-syntax-tree-destructuring";
         }
@@ -44085,38 +44766,18 @@ lib.makeScope pkgs.newScope (self: {
   concrete-syntax-tree-lambda-list = (
     build-asdf-system {
       pname = "concrete-syntax-tree-lambda-list";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "concrete-syntax-tree-lambda-list" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2023-06-18/concrete-syntax-tree-20230618-git.tgz";
-          sha256 = "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv";
+          url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz";
+          sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl";
           system = "concrete-syntax-tree-lambda-list";
           asd = "concrete-syntax-tree-lambda-list";
         }
       );
       systems = [ "concrete-syntax-tree-lambda-list" ];
-      lispLibs = [ (getAttr "concrete-syntax-tree-base" self) ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  concrete-syntax-tree-lambda-list-test = (
-    build-asdf-system {
-      pname = "concrete-syntax-tree-lambda-list-test";
-      version = "20230618-git";
-      asds = [ "concrete-syntax-tree-lambda-list-test" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2023-06-18/concrete-syntax-tree-20230618-git.tgz";
-          sha256 = "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv";
-          system = "concrete-syntax-tree-lambda-list-test";
-          asd = "concrete-syntax-tree-lambda-list-test";
-        }
-      );
-      systems = [ "concrete-syntax-tree-lambda-list-test" ];
-      lispLibs = [ (getAttr "concrete-syntax-tree-lambda-list" self) ];
+      lispLibs = [ (getAttr "concrete-syntax-tree" self) ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -44125,12 +44786,12 @@ lib.makeScope pkgs.newScope (self: {
   concrete-syntax-tree-source-info = (
     build-asdf-system {
       pname = "concrete-syntax-tree-source-info";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "concrete-syntax-tree-source-info" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2023-06-18/concrete-syntax-tree-20230618-git.tgz";
-          sha256 = "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv";
+          url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz";
+          sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl";
           system = "concrete-syntax-tree-source-info";
           asd = "concrete-syntax-tree-source-info";
         }
@@ -44145,12 +44806,12 @@ lib.makeScope pkgs.newScope (self: {
   conditional-commands = (
     build-asdf-system {
       pname = "conditional-commands";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "conditional-commands" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "conditional-commands";
           asd = "conditional-commands";
         }
@@ -44389,12 +45050,12 @@ lib.makeScope pkgs.newScope (self: {
   consfigurator = (
     build-asdf-system {
       pname = "consfigurator";
-      version = "v1.4.4";
+      version = "v1.5.2";
       asds = [ "consfigurator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/consfigurator/2024-10-12/consfigurator-v1.4.4.tgz";
-          sha256 = "1f4q5w58phj5a6i2fj712ggz2p8b5m4v77qzsvbb3xmy2vhppvv0";
+          url = "http://beta.quicklisp.org/archive/consfigurator/2025-06-22/consfigurator-v1.5.2.tgz";
+          sha256 = "18v87zky9rlrp0xhg1q3ydd5v18c4zx37kaxiw4swlxpf2br6gfa";
           system = "consfigurator";
           asd = "consfigurator";
         }
@@ -44566,12 +45227,12 @@ lib.makeScope pkgs.newScope (self: {
   copy-directory = (
     build-asdf-system {
       pname = "copy-directory";
-      version = "20160628-git";
+      version = "20250622-git";
       asds = [ "copy-directory" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/copy-directory/2016-06-28/copy-directory-20160628-git.tgz";
-          sha256 = "19wvzb046lcyifhx26ydzf7ngfa52n64nyx76k3lh02x7ahhpc93";
+          url = "http://beta.quicklisp.org/archive/copy-directory/2025-06-22/copy-directory-20250622-git.tgz";
+          sha256 = "0f4sidgj71ksibjzsrl33348dhgg4vnmm5pj6kr92acmvsdhhhap";
           system = "copy-directory";
           asd = "copy-directory";
         }
@@ -44589,12 +45250,12 @@ lib.makeScope pkgs.newScope (self: {
   copy-directory-test = (
     build-asdf-system {
       pname = "copy-directory-test";
-      version = "20160628-git";
+      version = "20250622-git";
       asds = [ "copy-directory-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/copy-directory/2016-06-28/copy-directory-20160628-git.tgz";
-          sha256 = "19wvzb046lcyifhx26ydzf7ngfa52n64nyx76k3lh02x7ahhpc93";
+          url = "http://beta.quicklisp.org/archive/copy-directory/2025-06-22/copy-directory-20250622-git.tgz";
+          sha256 = "0f4sidgj71ksibjzsrl33348dhgg4vnmm5pj6kr92acmvsdhhhap";
           system = "copy-directory-test";
           asd = "copy-directory-test";
         }
@@ -44652,6 +45313,30 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  cosmo-pagination = (
+    build-asdf-system {
+      pname = "cosmo-pagination";
+      version = "20250622-git";
+      asds = [ "cosmo-pagination" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cosmo-pagination/2025-06-22/cosmo-pagination-20250622-git.tgz";
+          sha256 = "13n9p62n26d637jz5cp4w0x9g3h1baar584f98sx22hw42n50x3d";
+          system = "cosmo-pagination";
+          asd = "cosmo-pagination";
+        }
+      );
+      systems = [ "cosmo-pagination" ];
+      lispLibs = [
+        (getAttr "log4cl" self)
+        (getAttr "serapeum" self)
+        (getAttr "str" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   cover = (
     build-asdf-system {
       pname = "cover";
@@ -44946,12 +45631,12 @@ lib.makeScope pkgs.newScope (self: {
   crypto-shortcuts = (
     build-asdf-system {
       pname = "crypto-shortcuts";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "crypto-shortcuts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/crypto-shortcuts/2023-10-21/crypto-shortcuts-20231021-git.tgz";
-          sha256 = "0ghih34xlf9vgbh8arsqjbgf8iymvs5s0ys0n2bm73b1z0632ygr";
+          url = "http://beta.quicklisp.org/archive/crypto-shortcuts/2025-06-22/crypto-shortcuts-20250622-git.tgz";
+          sha256 = "1ah1jw2vf3sz2ns835rbv8jm2sc821icmdj9qjw06h2x5lspw7xs";
           system = "crypto-shortcuts";
           asd = "crypto-shortcuts";
         }
@@ -45195,12 +45880,12 @@ lib.makeScope pkgs.newScope (self: {
   ctype = (
     build-asdf-system {
       pname = "ctype";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "ctype" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ctype/2024-10-12/ctype-20241012-git.tgz";
-          sha256 = "0qnssrjssb7258i3a1s1bv3z6plx4pzrkg65i8an25bvwrjwpvqv";
+          url = "http://beta.quicklisp.org/archive/ctype/2025-06-22/ctype-20250622-git.tgz";
+          sha256 = "1l1qz49584l8kss3l1lp5k2brw4xs4xqxhnjzq9fnnwbmy8253nq";
           system = "ctype";
           asd = "ctype";
         }
@@ -45327,12 +46012,12 @@ lib.makeScope pkgs.newScope (self: {
   cxml = (
     build-asdf-system {
       pname = "cxml";
-      version = "20200610-git";
+      version = "20250622-git";
       asds = [ "cxml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz";
-          sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51";
+          url = "http://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz";
+          sha256 = "1w1yhiabcycf614dhrgz3kz2zgawhc1p7m09gqppc1wsaznwc2bx";
           system = "cxml";
           asd = "cxml";
         }
@@ -45349,12 +46034,12 @@ lib.makeScope pkgs.newScope (self: {
   cxml-dom = (
     build-asdf-system {
       pname = "cxml-dom";
-      version = "20200610-git";
+      version = "20250622-git";
       asds = [ "cxml-dom" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz";
-          sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51";
+          url = "http://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz";
+          sha256 = "1w1yhiabcycf614dhrgz3kz2zgawhc1p7m09gqppc1wsaznwc2bx";
           system = "cxml-dom";
           asd = "cxml-dom";
         }
@@ -45373,12 +46058,12 @@ lib.makeScope pkgs.newScope (self: {
   cxml-klacks = (
     build-asdf-system {
       pname = "cxml-klacks";
-      version = "20200610-git";
+      version = "20250622-git";
       asds = [ "cxml-klacks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz";
-          sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51";
+          url = "http://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz";
+          sha256 = "1w1yhiabcycf614dhrgz3kz2zgawhc1p7m09gqppc1wsaznwc2bx";
           system = "cxml-klacks";
           asd = "cxml-klacks";
         }
@@ -45471,12 +46156,12 @@ lib.makeScope pkgs.newScope (self: {
   cxml-test = (
     build-asdf-system {
       pname = "cxml-test";
-      version = "20200610-git";
+      version = "20250622-git";
       asds = [ "cxml-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz";
-          sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51";
+          url = "http://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz";
+          sha256 = "1w1yhiabcycf614dhrgz3kz2zgawhc1p7m09gqppc1wsaznwc2bx";
           system = "cxml-test";
           asd = "cxml-test";
         }
@@ -45956,12 +46641,12 @@ lib.makeScope pkgs.newScope (self: {
   data-frame = (
     build-asdf-system {
       pname = "data-frame";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "data-frame" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/data-frame/2024-10-12/data-frame-20241012-git.tgz";
-          sha256 = "1sqyvb6hscz070d5ap5v5yvql4nx69c7jkp29za5dj84rsvbckcp";
+          url = "http://beta.quicklisp.org/archive/data-frame/2025-06-22/data-frame-20250622-git.tgz";
+          sha256 = "1xbh1bicwlqn5kfj6my869ngx1f5x4xrb91hc7rgbz3bmsg19qpr";
           system = "data-frame";
           asd = "data-frame";
         }
@@ -46457,6 +47142,54 @@ lib.makeScope pkgs.newScope (self: {
       meta = { };
     }
   );
+  dbi-cp = (
+    build-asdf-system {
+      pname = "dbi-cp";
+      version = "20250622-git";
+      asds = [ "dbi-cp" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-dbi-connection-pool/2025-06-22/cl-dbi-connection-pool-20250622-git.tgz";
+          sha256 = "0q1kgcn822ifc8zcss4yihhwcl0asdxl8xxpbbnyjzxasqa47ifv";
+          system = "dbi-cp";
+          asd = "dbi-cp";
+        }
+      );
+      systems = [ "dbi-cp" ];
+      lispLibs = [
+        (getAttr "bt-semaphore" self)
+        (getAttr "cl-dbi" self)
+        (getAttr "cl-syntax" self)
+        (getAttr "cl-syntax-annot" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  dbi-cp-test = (
+    build-asdf-system {
+      pname = "dbi-cp-test";
+      version = "20250622-git";
+      asds = [ "dbi-cp-test" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-dbi-connection-pool/2025-06-22/cl-dbi-connection-pool-20250622-git.tgz";
+          sha256 = "0q1kgcn822ifc8zcss4yihhwcl0asdxl8xxpbbnyjzxasqa47ifv";
+          system = "dbi-cp-test";
+          asd = "dbi-cp-test";
+        }
+      );
+      systems = [ "dbi-cp-test" ];
+      lispLibs = [
+        (getAttr "dbi-cp" self)
+        (getAttr "rove" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   dbi-test = (
     build-asdf-system {
       pname = "dbi-test";
@@ -46559,12 +47292,12 @@ lib.makeScope pkgs.newScope (self: {
   ddo = (
     build-asdf-system {
       pname = "ddo";
-      version = "20210411-git";
+      version = "20250622-git";
       asds = [ "ddo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz";
-          sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa";
+          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "ddo";
           asd = "ddo";
         }
@@ -46610,12 +47343,12 @@ lib.makeScope pkgs.newScope (self: {
   dealii-tutorial = (
     build-asdf-system {
       pname = "dealii-tutorial";
-      version = "20210411-git";
+      version = "20250622-git";
       asds = [ "dealii-tutorial" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz";
-          sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa";
+          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "dealii-tutorial";
           asd = "dealii-tutorial";
         }
@@ -46650,12 +47383,12 @@ lib.makeScope pkgs.newScope (self: {
   deeds = (
     build-asdf-system {
       pname = "deeds";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "deeds" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deeds/2023-10-21/deeds-20231021-git.tgz";
-          sha256 = "0pd178wydg2zld8pvfm7ss5qvbjh4g8klqbhx2k7h68hn2q1xnn8";
+          url = "http://beta.quicklisp.org/archive/deeds/2025-06-22/deeds-20250622-git.tgz";
+          sha256 = "0qhb95msyl0fv3swczdjfp413q8dckpf2kx7xrlryjdw3628wisq";
           system = "deeds";
           asd = "deeds";
         }
@@ -46767,12 +47500,12 @@ lib.makeScope pkgs.newScope (self: {
   defenum = (
     build-asdf-system {
       pname = "defenum";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "defenum" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defenum/2024-10-12/defenum-20241012-git.tgz";
-          sha256 = "1856w0vsjj9fcyqrry5k4b2iv87xms5wlw8xbqawjax6w5hdsrhk";
+          url = "http://beta.quicklisp.org/archive/defenum/2025-06-22/defenum-20250622-git.tgz";
+          sha256 = "1rrm5gvb9l1ynvq2mnpvmv1mdgmbm48169r05zmpmvbfyyd2ngs9";
           system = "defenum";
           asd = "defenum";
         }
@@ -46787,12 +47520,12 @@ lib.makeScope pkgs.newScope (self: {
   deferred = (
     build-asdf-system {
       pname = "deferred";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "deferred" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deferred/2023-10-21/deferred-20231021-git.tgz";
-          sha256 = "0npsxxapah8c3sxmfmi0djvw5kw5pj03dk5ia4yh3q2v7mwzpqy2";
+          url = "http://beta.quicklisp.org/archive/deferred/2025-06-22/deferred-20250622-git.tgz";
+          sha256 = "1f7rv7vz5jld1wd9b087af6a62wjd5a1hwwmk47wklwmhvk32pk9";
           system = "deferred";
           asd = "deferred";
         }
@@ -46827,12 +47560,12 @@ lib.makeScope pkgs.newScope (self: {
   definer = (
     build-asdf-system {
       pname = "definer";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "definer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/definer/2024-10-12/definer-20241012-git.tgz";
-          sha256 = "0vd7gcj55pdzgxq2309pxshplg3rjx95xikkc2ylqrcm9nf3d2zb";
+          url = "http://beta.quicklisp.org/archive/definer/2025-06-22/definer-20250622-git.tgz";
+          sha256 = "1dndgm78bylick7yh46rna40z0rq5l84lsyzlfpr6bfv51skpckc";
           system = "definer";
           asd = "definer";
         }
@@ -47361,12 +48094,12 @@ lib.makeScope pkgs.newScope (self: {
   deoxybyte-gzip = (
     build-asdf-system {
       pname = "deoxybyte-gzip";
-      version = "20140113-git";
+      version = "20250622-git";
       asds = [ "deoxybyte-gzip" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deoxybyte-gzip/2014-01-13/deoxybyte-gzip-20140113-git.tgz";
-          sha256 = "0ccci902nxqhdlskw3pghcjg0vgl10xlh16cb5b631j3n2ajfa16";
+          url = "http://beta.quicklisp.org/archive/deoxybyte-gzip/2025-06-22/deoxybyte-gzip-20250622-git.tgz";
+          sha256 = "0zy9536ggz2wpgzkgby4hgn38f3s2wq21f2j9gbb9xm431p4w3kx";
           system = "deoxybyte-gzip";
           asd = "deoxybyte-gzip";
         }
@@ -47385,12 +48118,12 @@ lib.makeScope pkgs.newScope (self: {
   deoxybyte-gzip-test = (
     build-asdf-system {
       pname = "deoxybyte-gzip-test";
-      version = "20140113-git";
+      version = "20250622-git";
       asds = [ "deoxybyte-gzip-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deoxybyte-gzip/2014-01-13/deoxybyte-gzip-20140113-git.tgz";
-          sha256 = "0ccci902nxqhdlskw3pghcjg0vgl10xlh16cb5b631j3n2ajfa16";
+          url = "http://beta.quicklisp.org/archive/deoxybyte-gzip/2025-06-22/deoxybyte-gzip-20250622-git.tgz";
+          sha256 = "0zy9536ggz2wpgzkgby4hgn38f3s2wq21f2j9gbb9xm431p4w3kx";
           system = "deoxybyte-gzip-test";
           asd = "deoxybyte-gzip-test";
         }
@@ -47566,12 +48299,12 @@ lib.makeScope pkgs.newScope (self: {
   deploy = (
     build-asdf-system {
       pname = "deploy";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "deploy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deploy/2024-10-12/deploy-20241012-git.tgz";
-          sha256 = "1ysi8fjgb7kq3cycb6ms44j0m70xbd140fh4qgcpj7fm26p2a59p";
+          url = "http://beta.quicklisp.org/archive/deploy/2025-06-22/deploy-20250622-git.tgz";
+          sha256 = "0lhc0ca4y29wpcv8j78613y5rmq0q8fmh7hq6kxi3b9ykfgr5n31";
           system = "deploy";
           asd = "deploy";
         }
@@ -47580,6 +48313,7 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "cffi" self)
         (getAttr "documentation-utils" self)
+        (getAttr "pathname-utils" self)
         (getAttr "sha3" self)
         (getAttr "trivial-features" self)
       ];
@@ -47591,12 +48325,12 @@ lib.makeScope pkgs.newScope (self: {
   deploy-test = (
     build-asdf-system {
       pname = "deploy-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "deploy-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deploy/2024-10-12/deploy-20241012-git.tgz";
-          sha256 = "1ysi8fjgb7kq3cycb6ms44j0m70xbd140fh4qgcpj7fm26p2a59p";
+          url = "http://beta.quicklisp.org/archive/deploy/2025-06-22/deploy-20250622-git.tgz";
+          sha256 = "0lhc0ca4y29wpcv8j78613y5rmq0q8fmh7hq6kxi3b9ykfgr5n31";
           system = "deploy-test";
           asd = "deploy-test";
         }
@@ -47615,12 +48349,12 @@ lib.makeScope pkgs.newScope (self: {
   depot = (
     build-asdf-system {
       pname = "depot";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "depot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz";
-          sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4";
+          url = "http://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
+          sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8";
           system = "depot";
           asd = "depot";
         }
@@ -47639,12 +48373,12 @@ lib.makeScope pkgs.newScope (self: {
   depot-in-memory = (
     build-asdf-system {
       pname = "depot-in-memory";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "depot-in-memory" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz";
-          sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4";
+          url = "http://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
+          sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8";
           system = "depot-in-memory";
           asd = "depot-in-memory";
         }
@@ -47662,12 +48396,12 @@ lib.makeScope pkgs.newScope (self: {
   depot-test = (
     build-asdf-system {
       pname = "depot-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "depot-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz";
-          sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4";
+          url = "http://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
+          sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8";
           system = "depot-test";
           asd = "depot-test";
         }
@@ -47687,12 +48421,12 @@ lib.makeScope pkgs.newScope (self: {
   depot-virtual = (
     build-asdf-system {
       pname = "depot-virtual";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "depot-virtual" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz";
-          sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4";
+          url = "http://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
+          sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8";
           system = "depot-virtual";
           asd = "depot-virtual";
         }
@@ -47707,12 +48441,12 @@ lib.makeScope pkgs.newScope (self: {
   depot-zip = (
     build-asdf-system {
       pname = "depot-zip";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "depot-zip" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz";
-          sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4";
+          url = "http://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
+          sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8";
           system = "depot-zip";
           asd = "depot-zip";
         }
@@ -48162,12 +48896,12 @@ lib.makeScope pkgs.newScope (self: {
   djula = (
     build-asdf-system {
       pname = "djula";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "djula" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz";
-          sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw";
+          url = "http://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
+          sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a";
           system = "djula";
           asd = "djula";
         }
@@ -48194,12 +48928,12 @@ lib.makeScope pkgs.newScope (self: {
   djula-demo = (
     build-asdf-system {
       pname = "djula-demo";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "djula-demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz";
-          sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw";
+          url = "http://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
+          sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a";
           system = "djula-demo";
           asd = "djula-demo";
         }
@@ -48218,12 +48952,12 @@ lib.makeScope pkgs.newScope (self: {
   djula-gettext = (
     build-asdf-system {
       pname = "djula-gettext";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "djula-gettext" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz";
-          sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw";
+          url = "http://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
+          sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a";
           system = "djula-gettext";
           asd = "djula-gettext";
         }
@@ -48241,12 +48975,12 @@ lib.makeScope pkgs.newScope (self: {
   djula-locale = (
     build-asdf-system {
       pname = "djula-locale";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "djula-locale" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz";
-          sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw";
+          url = "http://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
+          sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a";
           system = "djula-locale";
           asd = "djula-locale";
         }
@@ -48264,12 +48998,12 @@ lib.makeScope pkgs.newScope (self: {
   djula-test = (
     build-asdf-system {
       pname = "djula-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "djula-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz";
-          sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw";
+          url = "http://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
+          sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a";
           system = "djula-test";
           asd = "djula-test";
         }
@@ -48287,12 +49021,12 @@ lib.makeScope pkgs.newScope (self: {
   djula-translate = (
     build-asdf-system {
       pname = "djula-translate";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "djula-translate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz";
-          sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw";
+          url = "http://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
+          sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a";
           system = "djula-translate";
           asd = "djula-translate";
         }
@@ -48378,12 +49112,12 @@ lib.makeScope pkgs.newScope (self: {
   dns-client = (
     build-asdf-system {
       pname = "dns-client";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "dns-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dns-client/2024-10-12/dns-client-20241012-git.tgz";
-          sha256 = "1lbxryi0hx1i0ib3rz3ci89pfdyzikhv4dg0lk5piggrkdji2fx3";
+          url = "http://beta.quicklisp.org/archive/dns-client/2025-06-22/dns-client-20250622-git.tgz";
+          sha256 = "1ylnhnpcs25nzax2bxrnxl1kjghmnl5yy2vsi6ps3fafw6b2ras3";
           system = "dns-client";
           asd = "dns-client";
         }
@@ -48423,12 +49157,12 @@ lib.makeScope pkgs.newScope (self: {
   docbrowser = (
     build-asdf-system {
       pname = "docbrowser";
-      version = "20200610-git";
+      version = "20250622-git";
       asds = [ "docbrowser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/docbrowser/2020-06-10/docbrowser-20200610-git.tgz";
-          sha256 = "0k7gkyciqfbwdmvip2s8h4k21a63h45bj3qydq3jbvkhaq4gj9x1";
+          url = "http://beta.quicklisp.org/archive/docbrowser/2025-06-22/docbrowser-20250622-git.tgz";
+          sha256 = "1c48wh6mgw0n8g6cq758nzcsrbkgsq56183ydg76yqhj4ciri0jn";
           system = "docbrowser";
           asd = "docbrowser";
         }
@@ -48526,12 +49260,12 @@ lib.makeScope pkgs.newScope (self: {
   docs-builder = (
     build-asdf-system {
       pname = "docs-builder";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "docs-builder" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/docs-builder/2024-10-12/docs-builder-20241012-git.tgz";
-          sha256 = "09pg4frik728g7njrpkb8jmzw6q9f47ng4c123lmqlmjha9bs03c";
+          url = "http://beta.quicklisp.org/archive/docs-builder/2025-06-22/docs-builder-20250622-git.tgz";
+          sha256 = "1w1fx5b193s5zifnp22sha8s4vqa15p3kg8fwl60yv90gk4wvwwm";
           system = "docs-builder";
           asd = "docs-builder";
         }
@@ -48551,12 +49285,12 @@ lib.makeScope pkgs.newScope (self: {
   docs-config = (
     build-asdf-system {
       pname = "docs-config";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "docs-config" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/docs-builder/2024-10-12/docs-builder-20241012-git.tgz";
-          sha256 = "09pg4frik728g7njrpkb8jmzw6q9f47ng4c123lmqlmjha9bs03c";
+          url = "http://beta.quicklisp.org/archive/docs-builder/2025-06-22/docs-builder-20250622-git.tgz";
+          sha256 = "1w1fx5b193s5zifnp22sha8s4vqa15p3kg8fwl60yv90gk4wvwwm";
           system = "docs-config";
           asd = "docs-config";
         }
@@ -48591,12 +49325,12 @@ lib.makeScope pkgs.newScope (self: {
   documentation-utils = (
     build-asdf-system {
       pname = "documentation-utils";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "documentation-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/documentation-utils/2023-10-21/documentation-utils-20231021-git.tgz";
-          sha256 = "0nzkjzvcqi1l2ywiz17h1f54vgvbkywv95in4yww6lyzqjqsqqhy";
+          url = "http://beta.quicklisp.org/archive/documentation-utils/2025-06-22/documentation-utils-20250622-git.tgz";
+          sha256 = "1rmb9m3rilj5c4cr7bn5gnx1wrksi85zizp4hr7409qzg345mg7l";
           system = "documentation-utils";
           asd = "documentation-utils";
         }
@@ -48653,12 +49387,12 @@ lib.makeScope pkgs.newScope (self: {
   dom = (
     build-asdf-system {
       pname = "dom";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "dom" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "dom";
           asd = "dom";
         }
@@ -48909,18 +49643,19 @@ lib.makeScope pkgs.newScope (self: {
   dref = (
     build-asdf-system {
       pname = "dref";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "dref" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz";
-          sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0";
+          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
           system = "dref";
           asd = "dref";
         }
       );
       systems = [ "dref" ];
       lispLibs = [
+        (getAttr "autoload" self)
         (getAttr "mgl-pax-bootstrap" self)
         (getAttr "mgl-pax_dot_asdf" self)
         (getAttr "named-readtables" self)
@@ -48934,12 +49669,12 @@ lib.makeScope pkgs.newScope (self: {
   dref-test = (
     build-asdf-system {
       pname = "dref-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "dref-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz";
-          sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0";
+          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
           system = "dref-test";
           asd = "dref-test";
         }
@@ -48958,15 +49693,35 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  dref-test-package-inferred = (
+    build-asdf-system {
+      pname = "dref-test-package-inferred";
+      version = "20250622-git";
+      asds = [ "dref-test-package-inferred" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
+          system = "dref-test-package-inferred";
+          asd = "dref-test-package-inferred";
+        }
+      );
+      systems = [ "dref-test-package-inferred" ];
+      lispLibs = [ ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   drei-mcclim = (
     build-asdf-system {
       pname = "drei-mcclim";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "drei-mcclim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "drei-mcclim";
           asd = "drei-mcclim";
         }
@@ -49031,12 +49786,12 @@ lib.makeScope pkgs.newScope (self: {
   duckdb = (
     build-asdf-system {
       pname = "duckdb";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "duckdb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-duckdb/2024-10-12/cl-duckdb-20241012-git.tgz";
-          sha256 = "144c8c4m8vwmdg1ny5hjsvxmm8k6jijmrabyf2hmcnvk7hdy5sq0";
+          url = "http://beta.quicklisp.org/archive/cl-duckdb/2025-06-22/cl-duckdb-20250622-git.tgz";
+          sha256 = "13l74slzsd6vdn1ankphbrrqd4021g2d28am677xrmlm1p7nlw52";
           system = "duckdb";
           asd = "duckdb";
         }
@@ -49320,12 +50075,12 @@ lib.makeScope pkgs.newScope (self: {
   dynamic-mixins-swm = (
     build-asdf-system {
       pname = "dynamic-mixins-swm";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "dynamic-mixins-swm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stumpwm/2023-10-21/stumpwm-20231021-git.tgz";
-          sha256 = "114kicsziqvm15x15yhc39j8qzv6gxz4wxc40xp968pprzr4a4d1";
+          url = "http://beta.quicklisp.org/archive/stumpwm/2025-06-22/stumpwm-20250622-git.tgz";
+          sha256 = "1l4rxcva947ijxsfnzyy35ql7a8pjsxaag51pq2bib3qfy7wg5ld";
           system = "dynamic-mixins-swm";
           asd = "dynamic-mixins-swm";
         }
@@ -49510,12 +50265,12 @@ lib.makeScope pkgs.newScope (self: {
   easy-audio = (
     build-asdf-system {
       pname = "easy-audio";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "easy-audio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/easy-audio/2024-10-12/easy-audio-20241012-git.tgz";
-          sha256 = "1vlk2lzipz7sspizv4fiv6nmxhgq9piangc6gfxz6m5k3r74mwrg";
+          url = "http://beta.quicklisp.org/archive/easy-audio/2025-06-22/easy-audio-20250622-git.tgz";
+          sha256 = "1g8yrzrc6bv2487581hbfx1wjhf3gwvzznrfbmchqrfpx16vbmf1";
           system = "easy-audio";
           asd = "easy-audio";
         }
@@ -49526,6 +50281,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "flexi-streams" self)
         (getAttr "nibbles-streams" self)
         (getAttr "serapeum" self)
+        (getAttr "stateless-iterators" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -49575,12 +50331,12 @@ lib.makeScope pkgs.newScope (self: {
   easy-routes = (
     build-asdf-system {
       pname = "easy-routes";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "easy-routes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/easy-routes/2024-10-12/easy-routes-20241012-git.tgz";
-          sha256 = "0bz91g0vd1nn9b23npmrjw2ig6fahjs3b6iiw7ncajc2w5x9w1y4";
+          url = "http://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz";
+          sha256 = "0mw5w1gcss15b3wz1n9g7pd30a6d2w2xssfiznx3a61n7h7prb93";
           system = "easy-routes";
           asd = "easy-routes";
         }
@@ -49598,12 +50354,12 @@ lib.makeScope pkgs.newScope (self: {
   easy-routes_plus_djula = (
     build-asdf-system {
       pname = "easy-routes+djula";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "easy-routes+djula" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/easy-routes/2024-10-12/easy-routes-20241012-git.tgz";
-          sha256 = "0bz91g0vd1nn9b23npmrjw2ig6fahjs3b6iiw7ncajc2w5x9w1y4";
+          url = "http://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz";
+          sha256 = "0mw5w1gcss15b3wz1n9g7pd30a6d2w2xssfiznx3a61n7h7prb93";
           system = "easy-routes+djula";
           asd = "easy-routes+djula";
         }
@@ -49621,12 +50377,12 @@ lib.makeScope pkgs.newScope (self: {
   easy-routes_plus_errors = (
     build-asdf-system {
       pname = "easy-routes+errors";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "easy-routes+errors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/easy-routes/2024-10-12/easy-routes-20241012-git.tgz";
-          sha256 = "0bz91g0vd1nn9b23npmrjw2ig6fahjs3b6iiw7ncajc2w5x9w1y4";
+          url = "http://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz";
+          sha256 = "0mw5w1gcss15b3wz1n9g7pd30a6d2w2xssfiznx3a61n7h7prb93";
           system = "easy-routes+errors";
           asd = "easy-routes+errors";
         }
@@ -49902,12 +50658,12 @@ lib.makeScope pkgs.newScope (self: {
   ecclesia = (
     build-asdf-system {
       pname = "ecclesia";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "ecclesia" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ecclesia/2023-10-21/ecclesia-20231021-git.tgz";
-          sha256 = "0hamxgkqq833m02wjnghnjq9ny9k8xk3qx1wffm809qsm9ivwah8";
+          url = "http://beta.quicklisp.org/archive/ecclesia/2025-06-22/ecclesia-20250622-git.tgz";
+          sha256 = "1435124psvgbsvzbvx0bm14715hbx8id0c4ixsdgc74sb5034idy";
           system = "ecclesia";
           asd = "ecclesia";
         }
@@ -49982,12 +50738,12 @@ lib.makeScope pkgs.newScope (self: {
   eclector = (
     build-asdf-system {
       pname = "eclector";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "eclector" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eclector/2024-10-12/eclector-20241012-git.tgz";
-          sha256 = "06qhll5k0hq652gdzvvhcv4amqg9z7qillnn3z9cm8z9sv1n912v";
+          url = "http://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz";
+          sha256 = "16yhh2zb9616zk1dsw2qbngq8pz2hhgq82habz8x3rg0sxwwnw8v";
           system = "eclector";
           asd = "eclector";
         }
@@ -50006,12 +50762,12 @@ lib.makeScope pkgs.newScope (self: {
   eclector-concrete-syntax-tree = (
     build-asdf-system {
       pname = "eclector-concrete-syntax-tree";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "eclector-concrete-syntax-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eclector/2024-10-12/eclector-20241012-git.tgz";
-          sha256 = "06qhll5k0hq652gdzvvhcv4amqg9z7qillnn3z9cm8z9sv1n912v";
+          url = "http://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz";
+          sha256 = "16yhh2zb9616zk1dsw2qbngq8pz2hhgq82habz8x3rg0sxwwnw8v";
           system = "eclector-concrete-syntax-tree";
           asd = "eclector-concrete-syntax-tree";
         }
@@ -50030,12 +50786,12 @@ lib.makeScope pkgs.newScope (self: {
   eclector_dot_syntax-extensions = (
     build-asdf-system {
       pname = "eclector.syntax-extensions";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "eclector.syntax-extensions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eclector/2024-10-12/eclector-20241012-git.tgz";
-          sha256 = "06qhll5k0hq652gdzvvhcv4amqg9z7qillnn3z9cm8z9sv1n912v";
+          url = "http://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz";
+          sha256 = "16yhh2zb9616zk1dsw2qbngq8pz2hhgq82habz8x3rg0sxwwnw8v";
           system = "eclector.syntax-extensions";
           asd = "eclector.syntax-extensions";
         }
@@ -50602,12 +51358,12 @@ lib.makeScope pkgs.newScope (self: {
   enumerations = (
     build-asdf-system {
       pname = "enumerations";
-      version = "20230214-git";
+      version = "20250622-git";
       asds = [ "enumerations" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-enumeration/2023-02-14/cl-enumeration-20230214-git.tgz";
-          sha256 = "08jp5sf1230d4yyr7jyjqv235hdjjbmabh8r5lsqjh4kgqbwrvqr";
+          url = "http://beta.quicklisp.org/archive/cl-enumeration/2025-06-22/cl-enumeration-20250622-git.tgz";
+          sha256 = "1ldidii8a9qrl5l43cxx23x2nm9nqhrc259nq623qfxzakxdwlwz";
           system = "enumerations";
           asd = "enumerations";
         }
@@ -50992,12 +51748,12 @@ lib.makeScope pkgs.newScope (self: {
   esa-mcclim = (
     build-asdf-system {
       pname = "esa-mcclim";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "esa-mcclim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "esa-mcclim";
           asd = "esa-mcclim";
         }
@@ -51058,12 +51814,12 @@ lib.makeScope pkgs.newScope (self: {
   esrap = (
     build-asdf-system {
       pname = "esrap";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "esrap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/esrap/2024-10-12/esrap-20241012-git.tgz";
-          sha256 = "0pvid1hld03vz2zyszvsxckcpjb2lfl2vjfig6dlrmw3dx8grdj0";
+          url = "http://beta.quicklisp.org/archive/esrap/2025-06-22/esrap-20250622-git.tgz";
+          sha256 = "0c5w5sbd43apcxj57w88v7pmyf9cavynham4jz5asbx9g72clfv4";
           system = "esrap";
           asd = "esrap";
         }
@@ -51479,6 +52235,26 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  example-extension = (
+    build-asdf-system {
+      pname = "example-extension";
+      version = "stable-9d8b7e7f-git";
+      asds = [ "example-extension" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/cl-binary-store/2025-06-22/cl-binary-store-stable-9d8b7e7f-git.tgz";
+          sha256 = "1x8g65ij6bbfkd9hcy4wm3frjnb83ip05mvdbpm8hwzgkx1ydf94";
+          system = "example-extension";
+          asd = "example-extension";
+        }
+      );
+      systems = [ "example-extension" ];
+      lispLibs = [ (getAttr "cl-binary-store" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   exit-hooks = (
     build-asdf-system {
       pname = "exit-hooks";
@@ -51499,6 +52275,26 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  expanders = (
+    build-asdf-system {
+      pname = "expanders";
+      version = "20250622-git";
+      asds = [ "expanders" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/expanders/2025-06-22/expanders-20250622-git.tgz";
+          sha256 = "0lgx5r82l4mxw616xz3s02awq5miga9mb86s7yz8amfx20601qld";
+          system = "expanders";
+          asd = "expanders";
+        }
+      );
+      systems = [ "expanders" ];
+      lispLibs = [ (getAttr "alexandria" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   exponential-backoff = (
     build-asdf-system {
       pname = "exponential-backoff";
@@ -52061,6 +52857,30 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  fast-generic-functions = (
+    build-asdf-system {
+      pname = "fast-generic-functions";
+      version = "20250622-git";
+      asds = [ "fast-generic-functions" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/fast-generic-functions/2025-06-22/fast-generic-functions-20250622-git.tgz";
+          sha256 = "1v2pwmhnyfvhx8hrl1zk2lm4k1a3kqglf696hnfx7zrpz9kwk15m";
+          system = "fast-generic-functions";
+          asd = "fast-generic-functions";
+        }
+      );
+      systems = [ "fast-generic-functions" ];
+      lispLibs = [
+        (getAttr "closer-mop" self)
+        (getAttr "sealable-metaobjects" self)
+        (getAttr "trivial-macroexpand-all" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   fast-http = (
     build-asdf-system {
       pname = "fast-http";
@@ -52256,12 +53076,12 @@ lib.makeScope pkgs.newScope (self: {
   femlisp = (
     build-asdf-system {
       pname = "femlisp";
-      version = "20210411-git";
+      version = "20250622-git";
       asds = [ "femlisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz";
-          sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa";
+          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "femlisp";
           asd = "femlisp";
         }
@@ -52284,12 +53104,12 @@ lib.makeScope pkgs.newScope (self: {
   femlisp-basic = (
     build-asdf-system {
       pname = "femlisp-basic";
-      version = "20210411-git";
+      version = "20250622-git";
       asds = [ "femlisp-basic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz";
-          sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa";
+          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "femlisp-basic";
           asd = "femlisp-basic";
         }
@@ -52307,12 +53127,12 @@ lib.makeScope pkgs.newScope (self: {
   femlisp-dictionary = (
     build-asdf-system {
       pname = "femlisp-dictionary";
-      version = "20210411-git";
+      version = "20250622-git";
       asds = [ "femlisp-dictionary" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz";
-          sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa";
+          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "femlisp-dictionary";
           asd = "femlisp-dictionary";
         }
@@ -52331,12 +53151,12 @@ lib.makeScope pkgs.newScope (self: {
   femlisp-matlisp = (
     build-asdf-system {
       pname = "femlisp-matlisp";
-      version = "20210411-git";
+      version = "20250622-git";
       asds = [ "femlisp-matlisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz";
-          sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa";
+          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "femlisp-matlisp";
           asd = "femlisp-matlisp";
         }
@@ -52355,12 +53175,12 @@ lib.makeScope pkgs.newScope (self: {
   femlisp-parallel = (
     build-asdf-system {
       pname = "femlisp-parallel";
-      version = "20210411-git";
+      version = "20250622-git";
       asds = [ "femlisp-parallel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz";
-          sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa";
+          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "femlisp-parallel";
           asd = "femlisp-parallel";
         }
@@ -52381,12 +53201,12 @@ lib.makeScope pkgs.newScope (self: {
   femlisp-picture = (
     build-asdf-system {
       pname = "femlisp-picture";
-      version = "20210411-git";
+      version = "20250622-git";
       asds = [ "femlisp-picture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz";
-          sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa";
+          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "femlisp-picture";
           asd = "femlisp-picture";
         }
@@ -52552,12 +53372,12 @@ lib.makeScope pkgs.newScope (self: {
   file-finder = (
     build-asdf-system {
       pname = "file-finder";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "file-finder" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/file-finder/2024-10-12/file-finder-20241012-git.tgz";
-          sha256 = "11cjyyngvydcq2sbgsqkxd9060a0cb3ndqrqr318djndf30ckmqx";
+          url = "http://beta.quicklisp.org/archive/file-finder/2025-06-22/file-finder-20250622-git.tgz";
+          sha256 = "05mbr6a2wy67swkpsmmyxw9vzlmj5117zjmmhqxls42kx4bsyl88";
           system = "file-finder";
           asd = "file-finder";
         }
@@ -52650,12 +53470,12 @@ lib.makeScope pkgs.newScope (self: {
   file-notify = (
     build-asdf-system {
       pname = "file-notify";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "file-notify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/file-notify/2024-10-12/file-notify-20241012-git.tgz";
-          sha256 = "1zxn0smgahbxvy8v2bwmff3262msqhqqc5qpmh4ffinx6azln1hq";
+          url = "http://beta.quicklisp.org/archive/file-notify/2025-06-22/file-notify-20250622-git.tgz";
+          sha256 = "1crwybqih0x43z12irbaz338k2y709igq69vghqi1rqw953i1l44";
           system = "file-notify";
           asd = "file-notify";
         }
@@ -52674,12 +53494,12 @@ lib.makeScope pkgs.newScope (self: {
   file-select = (
     build-asdf-system {
       pname = "file-select";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "file-select" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/file-select/2024-10-12/file-select-20241012-git.tgz";
-          sha256 = "0vp7qfqymlw21yrlfack799xjwyh23dyxnbc5ix4fnylpi1lxjbn";
+          url = "http://beta.quicklisp.org/archive/file-select/2025-06-22/file-select-20250622-git.tgz";
+          sha256 = "17afb2p707l9nqmnl83zshayi4vvv9nvyfmxiippal3izz5k9mqq";
           system = "file-select";
           asd = "file-select";
         }
@@ -52689,6 +53509,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "cffi" self)
         (getAttr "documentation-utils" self)
         (getAttr "float-features" self)
+        (getAttr "pathname-utils" self)
         (getAttr "trivial-features" self)
       ];
       meta = {
@@ -52719,12 +53540,12 @@ lib.makeScope pkgs.newScope (self: {
   filesystem-utils = (
     build-asdf-system {
       pname = "filesystem-utils";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "filesystem-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/filesystem-utils/2024-10-12/filesystem-utils-20241012-git.tgz";
-          sha256 = "0h1xqpc11iachb9yg1d2xrzp1df1qadr1call904cjf45xadn62r";
+          url = "http://beta.quicklisp.org/archive/filesystem-utils/2025-06-22/filesystem-utils-20250622-git.tgz";
+          sha256 = "0ylf7csp7v2i1br654j945ns6capxb75p078vxiga5gkhhlxql5h";
           system = "filesystem-utils";
           asd = "filesystem-utils";
         }
@@ -52744,12 +53565,12 @@ lib.makeScope pkgs.newScope (self: {
   filesystem-utils-test = (
     build-asdf-system {
       pname = "filesystem-utils-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "filesystem-utils-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/filesystem-utils/2024-10-12/filesystem-utils-20241012-git.tgz";
-          sha256 = "0h1xqpc11iachb9yg1d2xrzp1df1qadr1call904cjf45xadn62r";
+          url = "http://beta.quicklisp.org/archive/filesystem-utils/2025-06-22/filesystem-utils-20250622-git.tgz";
+          sha256 = "0ylf7csp7v2i1br654j945ns6capxb75p078vxiga5gkhhlxql5h";
           system = "filesystem-utils-test";
           asd = "filesystem-utils-test";
         }
@@ -53023,12 +53844,12 @@ lib.makeScope pkgs.newScope (self: {
   fiveam-matchers = (
     build-asdf-system {
       pname = "fiveam-matchers";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "fiveam-matchers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fiveam-matchers/2024-10-12/fiveam-matchers-20241012-git.tgz";
-          sha256 = "1kwichcxjmqdi8whx4daggp4fdp53w17jj1rqlph9ixgr4s9kvqv";
+          url = "http://beta.quicklisp.org/archive/fiveam-matchers/2025-06-22/fiveam-matchers-20250622-git.tgz";
+          sha256 = "1ydxfbjc2aq4ffw9cxn6yx4m5rw08dagws9mjl7i71x5h3znb7mw";
           system = "fiveam-matchers";
           asd = "fiveam-matchers";
         }
@@ -53067,12 +53888,12 @@ lib.makeScope pkgs.newScope (self: {
   flac = (
     build-asdf-system {
       pname = "flac";
-      version = "20151218-git";
+      version = "20250622-git";
       asds = [ "flac" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz";
-          sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9";
+          url = "http://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
+          sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb";
           system = "flac";
           asd = "flac";
         }
@@ -53090,12 +53911,12 @@ lib.makeScope pkgs.newScope (self: {
   flare = (
     build-asdf-system {
       pname = "flare";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "flare" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/flare/2023-10-21/flare-20231021-git.tgz";
-          sha256 = "1ws357819rr9lzh5b2hmqid6vrq8zj46a5dzwqa0fdmxxbam75zm";
+          url = "http://beta.quicklisp.org/archive/flare/2025-06-22/flare-20250622-git.tgz";
+          sha256 = "11cdianshkq9mh0g83zb44b8iikp6qslgf8rqpny81m4x2x3mpjr";
           system = "flare";
           asd = "flare";
         }
@@ -53114,34 +53935,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  flare-viewer = (
-    build-asdf-system {
-      pname = "flare-viewer";
-      version = "20231021-git";
-      asds = [ "flare-viewer" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/flare/2023-10-21/flare-20231021-git.tgz";
-          sha256 = "1ws357819rr9lzh5b2hmqid6vrq8zj46a5dzwqa0fdmxxbam75zm";
-          system = "flare-viewer";
-          asd = "flare-viewer";
-        }
-      );
-      systems = [ "flare-viewer" ];
-      lispLibs = [
-        (getAttr "cl-opengl" self)
-        (getAttr "flare" self)
-        (getAttr "qtcore" self)
-        (getAttr "qtgui" self)
-        (getAttr "qtools" self)
-        (getAttr "qtopengl" self)
-        (getAttr "verbose" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   flat-tree = (
     build-asdf-system {
       pname = "flat-tree";
@@ -53243,12 +54036,12 @@ lib.makeScope pkgs.newScope (self: {
   float-features = (
     build-asdf-system {
       pname = "float-features";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "float-features" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/float-features/2024-10-12/float-features-20241012-git.tgz";
-          sha256 = "1vxnvaprki5rk3phj20m35pva9dpgsixm8d9rnsixq1qgrv3djjf";
+          url = "http://beta.quicklisp.org/archive/float-features/2025-06-22/float-features-20250622-git.tgz";
+          sha256 = "1i6apsg595hzyymvn0gz04xg58qxw8rx1fyc093arbakywjfcqas";
           system = "float-features";
           asd = "float-features";
         }
@@ -53264,12 +54057,12 @@ lib.makeScope pkgs.newScope (self: {
   float-features-tests = (
     build-asdf-system {
       pname = "float-features-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "float-features-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/float-features/2024-10-12/float-features-20241012-git.tgz";
-          sha256 = "1vxnvaprki5rk3phj20m35pva9dpgsixm8d9rnsixq1qgrv3djjf";
+          url = "http://beta.quicklisp.org/archive/float-features/2025-06-22/float-features-20250622-git.tgz";
+          sha256 = "1i6apsg595hzyymvn0gz04xg58qxw8rx1fyc093arbakywjfcqas";
           system = "float-features-tests";
           asd = "float-features-tests";
         }
@@ -53350,12 +54143,12 @@ lib.makeScope pkgs.newScope (self: {
   flow = (
     build-asdf-system {
       pname = "flow";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "flow" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/flow/2024-10-12/flow-20241012-git.tgz";
-          sha256 = "1623kkyygwkqpgrbvv1zqj13mjkycqyh88nwcjsxd0clrlhlyfz3";
+          url = "http://beta.quicklisp.org/archive/flow/2025-06-22/flow-20250622-git.tgz";
+          sha256 = "1x4mvqw8236pipdbbkbmj5szm725qwvbwlq8vzi8qmaks7l20q5i";
           system = "flow";
           asd = "flow";
         }
@@ -53364,35 +54157,11 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "closer-mop" self)
         (getAttr "documentation-utils" self)
+        (getAttr "text-draw" self)
       ];
       meta = { };
     }
   );
-  flow-visualizer = (
-    build-asdf-system {
-      pname = "flow-visualizer";
-      version = "20241012-git";
-      asds = [ "flow-visualizer" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/flow/2024-10-12/flow-20241012-git.tgz";
-          sha256 = "1623kkyygwkqpgrbvv1zqj13mjkycqyh88nwcjsxd0clrlhlyfz3";
-          system = "flow-visualizer";
-          asd = "flow-visualizer";
-        }
-      );
-      systems = [ "flow-visualizer" ];
-      lispLibs = [
-        (getAttr "flow" self)
-        (getAttr "qtcore" self)
-        (getAttr "qtgui" self)
-        (getAttr "qtools" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   flute = (
     build-asdf-system {
       pname = "flute";
@@ -53442,12 +54211,12 @@ lib.makeScope pkgs.newScope (self: {
   flx = (
     build-asdf-system {
       pname = "flx";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "flx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-flx/2024-10-12/cl-flx-20241012-git.tgz";
-          sha256 = "02p8qmc6wy3kf6w3rpgjvyg3jb699i5x9zk2f1p2y9h3m86d7hsw";
+          url = "http://beta.quicklisp.org/archive/cl-flx/2025-06-22/cl-flx-20250622-git.tgz";
+          sha256 = "0s7cmsjzsnvq1h4q4p7v8hkyavhrmv1mam2v9nrihzsgzx0yddb3";
           system = "flx";
           asd = "flx";
         }
@@ -54316,12 +55085,12 @@ lib.makeScope pkgs.newScope (self: {
   font-discovery = (
     build-asdf-system {
       pname = "font-discovery";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "font-discovery" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/font-discovery/2023-10-21/font-discovery-20231021-git.tgz";
-          sha256 = "1kx83564p1w2wka3l6g4rj7zvzi85prvs6yag2qv2a9xh80yv9rz";
+          url = "http://beta.quicklisp.org/archive/font-discovery/2025-06-22/font-discovery-20250622-git.tgz";
+          sha256 = "0bfhd417kz73y1q38xn3j1k9j49lzng0j11x03jwlmjm6k8331vj";
           system = "font-discovery";
           asd = "font-discovery";
         }
@@ -54330,8 +55099,10 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "cffi" self)
         (getAttr "documentation-utils" self)
+        (getAttr "pathname-utils" self)
         (getAttr "trivial-features" self)
         (getAttr "trivial-indent" self)
+        (getAttr "zpb-ttf" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -54361,12 +55132,12 @@ lib.makeScope pkgs.newScope (self: {
   for = (
     build-asdf-system {
       pname = "for";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "for" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/for/2023-10-21/for-20231021-git.tgz";
-          sha256 = "07jdwqkyb3qd65mng60cs723z7p0bv2769hhalz4c0mfzn8qrn99";
+          url = "http://beta.quicklisp.org/archive/for/2025-06-22/for-20250622-git.tgz";
+          sha256 = "01n60r7wsdkbdr2prrxacjyx4klijgj5363rsdh0lfq32j0r078z";
           system = "for";
           asd = "for";
         }
@@ -54433,12 +55204,12 @@ lib.makeScope pkgs.newScope (self: {
   form-fiddle = (
     build-asdf-system {
       pname = "form-fiddle";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "form-fiddle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/form-fiddle/2023-10-21/form-fiddle-20231021-git.tgz";
-          sha256 = "0vl28q8xa42i9gr1bch22jdha9jh8sr2hcv6d9kykj4jsqi9kwbg";
+          url = "http://beta.quicklisp.org/archive/form-fiddle/2025-06-22/form-fiddle-20250622-git.tgz";
+          sha256 = "0hg58xq2dbcdk31rfnwqc6h7krm6fmww103yzfbkg7cg7f3w7p51";
           system = "form-fiddle";
           asd = "form-fiddle";
         }
@@ -54448,6 +55219,29 @@ lib.makeScope pkgs.newScope (self: {
       meta = { };
     }
   );
+  format-seconds-tests = (
+    build-asdf-system {
+      pname = "format-seconds-tests";
+      version = "production-e6b26811-git";
+      asds = [ "format-seconds-tests" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/format-seconds/2025-06-22/format-seconds-production-e6b26811-git.tgz";
+          sha256 = "106ykx2n8vmw7k9rkr8iclh0pf6n4va7qfs7xvgqzcjsgpyi0ynz";
+          system = "format-seconds-tests";
+          asd = "format-seconds-tests";
+        }
+      );
+      systems = [ "format-seconds-tests" ];
+      lispLibs = [
+        (getAttr "fiveam" self)
+        (getAttr "literate-lisp" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   format-string-builder = (
     build-asdf-system {
       pname = "format-string-builder";
@@ -54786,12 +55580,12 @@ lib.makeScope pkgs.newScope (self: {
   frugal-uuid = (
     build-asdf-system {
       pname = "frugal-uuid";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "frugal-uuid" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-frugal-uuid/2024-10-12/cl-frugal-uuid-20241012-git.tgz";
-          sha256 = "01hli6gh0rr6mizqp1iqfch7rd0jw6ygrskjdr5hf3r8wwwvr9hh";
+          url = "http://beta.quicklisp.org/archive/cl-frugal-uuid/2025-06-22/cl-frugal-uuid-20250622-git.tgz";
+          sha256 = "1naviw6qksf2zh2wsr9lqpdjfy10nfrc1pc0liz1hrq14f15lsrm";
           system = "frugal-uuid";
           asd = "frugal-uuid";
         }
@@ -54829,12 +55623,12 @@ lib.makeScope pkgs.newScope (self: {
   fset = (
     build-asdf-system {
       pname = "fset";
-      version = "20241012-git";
+      version = "v1.4.6";
       asds = [ "fset" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fset/2024-10-12/fset-20241012-git.tgz";
-          sha256 = "0h9j5a7vlr8g0hq99y4wgw1l1wialzs6k16nrpmd4pwiyiypzkm6";
+          url = "http://beta.quicklisp.org/archive/fset/2025-06-22/fset-v1.4.6.tgz";
+          sha256 = "1hgxs534w7x46y6pm6mjljyy4gvawfkyk2dg0qbiisgv7zj271ka";
           system = "fset";
           asd = "fset";
         }
@@ -54842,8 +55636,8 @@ lib.makeScope pkgs.newScope (self: {
       systems = [ "fset" ];
       lispLibs = [
         (getAttr "misc-extensions" self)
+        (getAttr "mt19937" self)
         (getAttr "named-readtables" self)
-        (getAttr "random-state" self)
       ];
       meta = { };
     }
@@ -55004,12 +55798,12 @@ lib.makeScope pkgs.newScope (self: {
   functional-geometry = (
     build-asdf-system {
       pname = "functional-geometry";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "functional-geometry" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "functional-geometry";
           asd = "functional-geometry";
         }
@@ -55024,12 +55818,12 @@ lib.makeScope pkgs.newScope (self: {
   functional-trees = (
     build-asdf-system {
       pname = "functional-trees";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "functional-trees" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/functional-trees/2024-10-12/functional-trees-20241012-git.tgz";
-          sha256 = "02jhc2c6d7zd75cpjmwck62b3iyzsf5q2yqqpp5ymwjmnx4bnysd";
+          url = "http://beta.quicklisp.org/archive/functional-trees/2025-06-22/functional-trees-20250622-git.tgz";
+          sha256 = "1z0z0g49jv6nvvqd5g0nyfac4h3l53n2lrszzvs3favp98z37byx";
           system = "functional-trees";
           asd = "functional-trees";
         }
@@ -55094,12 +55888,12 @@ lib.makeScope pkgs.newScope (self: {
   fuzzy-dates = (
     build-asdf-system {
       pname = "fuzzy-dates";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "fuzzy-dates" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fuzzy-dates/2024-10-12/fuzzy-dates-20241012-git.tgz";
-          sha256 = "1nnwb7dl772zax0ysc9v4z29kq639f3za7k34hdk9fyyqbln9dgl";
+          url = "http://beta.quicklisp.org/archive/fuzzy-dates/2025-06-22/fuzzy-dates-20250622-git.tgz";
+          sha256 = "0qaig90b91nrwgxs55c8zaah5iq72rgxw1clmjqw0iilfg5wgllr";
           system = "fuzzy-dates";
           asd = "fuzzy-dates";
         }
@@ -55169,12 +55963,12 @@ lib.makeScope pkgs.newScope (self: {
   gadgets = (
     build-asdf-system {
       pname = "gadgets";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "gadgets" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gadgets/2024-10-12/gadgets-20241012-git.tgz";
-          sha256 = "1ba4gj8lh3ihbb66xiz7hc8cdg3gvi3q20w32nmsqdch956is34k";
+          url = "http://beta.quicklisp.org/archive/gadgets/2025-06-22/gadgets-20250622-git.tgz";
+          sha256 = "0dbia2679dj4kr2ndh15ib26l9kw6zxx0qjn4l0jkcdx7shrkll6";
           system = "gadgets";
           asd = "gadgets";
         }
@@ -55305,12 +56099,12 @@ lib.makeScope pkgs.newScope (self: {
   gendl = (
     build-asdf-system {
       pname = "gendl";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "gendl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "gendl";
           asd = "gendl";
         }
@@ -55331,12 +56125,12 @@ lib.makeScope pkgs.newScope (self: {
   gendl-asdf = (
     build-asdf-system {
       pname = "gendl-asdf";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "gendl-asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "gendl-asdf";
           asd = "gendl-asdf";
         }
@@ -55422,12 +56216,12 @@ lib.makeScope pkgs.newScope (self: {
   generic-cl = (
     build-asdf-system {
       pname = "generic-cl";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "generic-cl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz";
-          sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4";
+          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl";
           asd = "generic-cl";
         }
@@ -55453,12 +56247,12 @@ lib.makeScope pkgs.newScope (self: {
   generic-cl_dot_arithmetic = (
     build-asdf-system {
       pname = "generic-cl.arithmetic";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "generic-cl.arithmetic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz";
-          sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4";
+          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.arithmetic";
           asd = "generic-cl.arithmetic";
         }
@@ -55478,12 +56272,12 @@ lib.makeScope pkgs.newScope (self: {
   generic-cl_dot_collector = (
     build-asdf-system {
       pname = "generic-cl.collector";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "generic-cl.collector" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz";
-          sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4";
+          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.collector";
           asd = "generic-cl.collector";
         }
@@ -55505,12 +56299,12 @@ lib.makeScope pkgs.newScope (self: {
   generic-cl_dot_comparison = (
     build-asdf-system {
       pname = "generic-cl.comparison";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "generic-cl.comparison" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz";
-          sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4";
+          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.comparison";
           asd = "generic-cl.comparison";
         }
@@ -55529,12 +56323,12 @@ lib.makeScope pkgs.newScope (self: {
   generic-cl_dot_container = (
     build-asdf-system {
       pname = "generic-cl.container";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "generic-cl.container" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz";
-          sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4";
+          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.container";
           asd = "generic-cl.container";
         }
@@ -55552,12 +56346,12 @@ lib.makeScope pkgs.newScope (self: {
   generic-cl_dot_internal = (
     build-asdf-system {
       pname = "generic-cl.internal";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "generic-cl.internal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz";
-          sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4";
+          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.internal";
           asd = "generic-cl.internal";
         }
@@ -55577,12 +56371,12 @@ lib.makeScope pkgs.newScope (self: {
   generic-cl_dot_iterator = (
     build-asdf-system {
       pname = "generic-cl.iterator";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "generic-cl.iterator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz";
-          sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4";
+          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.iterator";
           asd = "generic-cl.iterator";
         }
@@ -55609,12 +56403,12 @@ lib.makeScope pkgs.newScope (self: {
   generic-cl_dot_lazy-seq = (
     build-asdf-system {
       pname = "generic-cl.lazy-seq";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "generic-cl.lazy-seq" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz";
-          sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4";
+          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.lazy-seq";
           asd = "generic-cl.lazy-seq";
         }
@@ -55642,12 +56436,12 @@ lib.makeScope pkgs.newScope (self: {
   generic-cl_dot_map = (
     build-asdf-system {
       pname = "generic-cl.map";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "generic-cl.map" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz";
-          sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4";
+          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.map";
           asd = "generic-cl.map";
         }
@@ -55676,12 +56470,12 @@ lib.makeScope pkgs.newScope (self: {
   generic-cl_dot_math = (
     build-asdf-system {
       pname = "generic-cl.math";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "generic-cl.math" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz";
-          sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4";
+          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.math";
           asd = "generic-cl.math";
         }
@@ -55704,12 +56498,12 @@ lib.makeScope pkgs.newScope (self: {
   generic-cl_dot_object = (
     build-asdf-system {
       pname = "generic-cl.object";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "generic-cl.object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz";
-          sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4";
+          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.object";
           asd = "generic-cl.object";
         }
@@ -55729,12 +56523,12 @@ lib.makeScope pkgs.newScope (self: {
   generic-cl_dot_sequence = (
     build-asdf-system {
       pname = "generic-cl.sequence";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "generic-cl.sequence" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz";
-          sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4";
+          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.sequence";
           asd = "generic-cl.sequence";
         }
@@ -55763,12 +56557,12 @@ lib.makeScope pkgs.newScope (self: {
   generic-cl_dot_set = (
     build-asdf-system {
       pname = "generic-cl.set";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "generic-cl.set" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz";
-          sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4";
+          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.set";
           asd = "generic-cl.set";
         }
@@ -55794,12 +56588,12 @@ lib.makeScope pkgs.newScope (self: {
   generic-cl_dot_util = (
     build-asdf-system {
       pname = "generic-cl.util";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "generic-cl.util" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz";
-          sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4";
+          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.util";
           asd = "generic-cl.util";
         }
@@ -56182,18 +56976,19 @@ lib.makeScope pkgs.newScope (self: {
   geom-base = (
     build-asdf-system {
       pname = "geom-base";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "geom-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "geom-base";
           asd = "geom-base";
         }
       );
       systems = [ "geom-base" ];
       lispLibs = [
+        (getAttr "alexandria" self)
         (getAttr "base" self)
         (getAttr "cl-pdf" self)
         (getAttr "cl-typesetting" self)
@@ -56207,12 +57002,12 @@ lib.makeScope pkgs.newScope (self: {
   geowkt = (
     build-asdf-system {
       pname = "geowkt";
-      version = "20200610-git";
+      version = "20250622-git";
       asds = [ "geowkt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/geowkt/2020-06-10/geowkt-20200610-git.tgz";
-          sha256 = "02l8cb2k10j7k6fvhk9dpqmkxs6vb5w5nh3159w7drprvjqhfrjw";
+          url = "http://beta.quicklisp.org/archive/geowkt/2025-06-22/geowkt-20250622-git.tgz";
+          sha256 = "1x71m22vgqycm46bqymy5pr4k0l2xn3myjbxaf9ps1s36nvd3d1g";
           system = "geowkt";
           asd = "geowkt";
         }
@@ -56227,18 +57022,19 @@ lib.makeScope pkgs.newScope (self: {
   geowkt-update = (
     build-asdf-system {
       pname = "geowkt-update";
-      version = "20200610-git";
+      version = "20250622-git";
       asds = [ "geowkt-update" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/geowkt/2020-06-10/geowkt-20200610-git.tgz";
-          sha256 = "02l8cb2k10j7k6fvhk9dpqmkxs6vb5w5nh3159w7drprvjqhfrjw";
+          url = "http://beta.quicklisp.org/archive/geowkt/2025-06-22/geowkt-20250622-git.tgz";
+          sha256 = "1x71m22vgqycm46bqymy5pr4k0l2xn3myjbxaf9ps1s36nvd3d1g";
           system = "geowkt-update";
           asd = "geowkt-update";
         }
       );
       systems = [ "geowkt-update" ];
       lispLibs = [
+        (getAttr "cl-json" self)
         (getAttr "cl-ppcre" self)
         (getAttr "drakma" self)
         (getAttr "parse-number" self)
@@ -56359,12 +57155,12 @@ lib.makeScope pkgs.newScope (self: {
   geysr = (
     build-asdf-system {
       pname = "geysr";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "geysr" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "geysr";
           asd = "geysr";
         }
@@ -56487,36 +57283,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  glacier = (
-    build-asdf-system {
-      pname = "glacier";
-      version = "20230214-git";
-      asds = [ "glacier" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/glacier/2023-02-14/glacier-20230214-git.tgz";
-          sha256 = "1h66cd3bn3n8yjd922xsvv0r668cm82106nm2k3fnll67apazlwi";
-          system = "glacier";
-          asd = "glacier";
-        }
-      );
-      systems = [ "glacier" ];
-      lispLibs = [
-        (getAttr "alexandria" self)
-        (getAttr "bordeaux-threads" self)
-        (getAttr "cl-json" self)
-        (getAttr "cl-ppcre" self)
-        (getAttr "dexador" self)
-        (getAttr "simple-config" self)
-        (getAttr "str" self)
-        (getAttr "tooter" self)
-        (getAttr "websocket-driver" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   glad-blob = (
     build-asdf-system {
       pname = "glad-blob";
@@ -56658,12 +57424,12 @@ lib.makeScope pkgs.newScope (self: {
   glfw = (
     build-asdf-system {
       pname = "glfw";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "glfw" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glfw/2024-10-12/glfw-20241012-git.tgz";
-          sha256 = "1n421gvrzs76v57icy0c4zhz84ymin91vbv5gkkj4i00cnggwdxv";
+          url = "http://beta.quicklisp.org/archive/glfw/2025-06-22/glfw-20250622-git.tgz";
+          sha256 = "0a9s6mz92h1lhayja683gfraacpq7w1fg3y7b9brkfzdkg1nk5ik";
           system = "glfw";
           asd = "glfw";
         }
@@ -56732,12 +57498,12 @@ lib.makeScope pkgs.newScope (self: {
   glisp = (
     build-asdf-system {
       pname = "glisp";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "glisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "glisp";
           asd = "glisp";
         }
@@ -57018,12 +57784,12 @@ lib.makeScope pkgs.newScope (self: {
   glsl-toolkit = (
     build-asdf-system {
       pname = "glsl-toolkit";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "glsl-toolkit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glsl-toolkit/2024-10-12/glsl-toolkit-20241012-git.tgz";
-          sha256 = "0yh6y2k2v5ivzwfnvnprlcih8jn7fv3pzz2wn85fpvbfw4mg120x";
+          url = "http://beta.quicklisp.org/archive/glsl-toolkit/2025-06-22/glsl-toolkit-20250622-git.tgz";
+          sha256 = "18vkhww1h6pdwarr3smzdzj96va6c6j7a33sf05rjkifa0bm8f4m";
           system = "glsl-toolkit";
           asd = "glsl-toolkit";
         }
@@ -57183,12 +57949,12 @@ lib.makeScope pkgs.newScope (self: {
   graphs = (
     build-asdf-system {
       pname = "graphs";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "graphs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "graphs";
           asd = "graphs";
         }
@@ -57435,6 +58201,26 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  grouping-stack = (
+    build-asdf-system {
+      pname = "grouping-stack";
+      version = "20250622-git";
+      asds = [ "grouping-stack" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/lisa/2025-06-22/lisa-20250622-git.tgz";
+          sha256 = "0m1ww61vbaxrj1jiln8f6x393i27sd604hv511bd67y6xj23qqai";
+          system = "grouping-stack";
+          asd = "grouping-stack";
+        }
+      );
+      systems = [ "grouping-stack" ];
+      lispLibs = [ ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   grovel-locally = (
     build-asdf-system {
       pname = "grovel-locally";
@@ -57735,12 +58521,12 @@ lib.makeScope pkgs.newScope (self: {
   gwl = (
     build-asdf-system {
       pname = "gwl";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "gwl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "gwl";
           asd = "gwl";
         }
@@ -57748,6 +58534,7 @@ lib.makeScope pkgs.newScope (self: {
       systems = [ "gwl" ];
       lispLibs = [
         (getAttr "cl-html-parse" self)
+        (getAttr "cl-json" self)
         (getAttr "cl-markdown" self)
         (getAttr "cl-who" self)
         (getAttr "glisp" self)
@@ -57762,12 +58549,12 @@ lib.makeScope pkgs.newScope (self: {
   gwl-graphics = (
     build-asdf-system {
       pname = "gwl-graphics";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "gwl-graphics" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "gwl-graphics";
           asd = "gwl-graphics";
         }
@@ -57809,12 +58596,12 @@ lib.makeScope pkgs.newScope (self: {
   hamcrest = (
     build-asdf-system {
       pname = "hamcrest";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "hamcrest" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-hamcrest/2024-10-12/cl-hamcrest-20241012-git.tgz";
-          sha256 = "05l5i5cmm1yqg8x9ayffaf3a9xf742k02wkxwpkc125ih5x0ggws";
+          url = "http://beta.quicklisp.org/archive/cl-hamcrest/2025-06-22/cl-hamcrest-20250622-git.tgz";
+          sha256 = "0d97v9rmf681vmxzdg8vrp4c9dphyrw89qwxpjwzncd34xrppjfn";
           system = "hamcrest";
           asd = "hamcrest";
         }
@@ -57835,12 +58622,12 @@ lib.makeScope pkgs.newScope (self: {
   hamcrest-ci = (
     build-asdf-system {
       pname = "hamcrest-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "hamcrest-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-hamcrest/2024-10-12/cl-hamcrest-20241012-git.tgz";
-          sha256 = "05l5i5cmm1yqg8x9ayffaf3a9xf742k02wkxwpkc125ih5x0ggws";
+          url = "http://beta.quicklisp.org/archive/cl-hamcrest/2025-06-22/cl-hamcrest-20250622-git.tgz";
+          sha256 = "0d97v9rmf681vmxzdg8vrp4c9dphyrw89qwxpjwzncd34xrppjfn";
           system = "hamcrest-ci";
           asd = "hamcrest-ci";
         }
@@ -57855,12 +58642,12 @@ lib.makeScope pkgs.newScope (self: {
   hamcrest-tests = (
     build-asdf-system {
       pname = "hamcrest-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "hamcrest-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-hamcrest/2024-10-12/cl-hamcrest-20241012-git.tgz";
-          sha256 = "05l5i5cmm1yqg8x9ayffaf3a9xf742k02wkxwpkc125ih5x0ggws";
+          url = "http://beta.quicklisp.org/archive/cl-hamcrest/2025-06-22/cl-hamcrest-20250622-git.tgz";
+          sha256 = "0d97v9rmf681vmxzdg8vrp4c9dphyrw89qwxpjwzncd34xrppjfn";
           system = "hamcrest-tests";
           asd = "hamcrest-tests";
         }
@@ -57880,12 +58667,12 @@ lib.makeScope pkgs.newScope (self: {
   harmony = (
     build-asdf-system {
       pname = "harmony";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "harmony" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/harmony/2024-10-12/harmony-20241012-git.tgz";
-          sha256 = "0bzqwcbnpb529bdp35c4s3p4p6rsrjnsvll2bkkrwpxlwzdd3fim";
+          url = "http://beta.quicklisp.org/archive/harmony/2025-06-22/harmony-20250622-git.tgz";
+          sha256 = "1dfwwp0850qh6a0pqnia99kapcpli38k5ywx9rq9c1jj5xb5byc1";
           system = "harmony";
           asd = "harmony";
         }
@@ -57896,8 +58683,10 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "bordeaux-threads" self)
         (getAttr "cl-mixed" self)
         (getAttr "cl-mixed-alsa" self)
+        (getAttr "cl-mixed-pipewire" self)
         (getAttr "cl-mixed-pulse" self)
         (getAttr "stealth-mixin" self)
+        (getAttr "text-draw" self)
         (getAttr "trivial-features" self)
       ];
       meta = {
@@ -57908,12 +58697,12 @@ lib.makeScope pkgs.newScope (self: {
   hash-set = (
     build-asdf-system {
       pname = "hash-set";
-      version = "20211230-git";
+      version = "20250622-git";
       asds = [ "hash-set" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hash-set/2021-12-30/hash-set-20211230-git.tgz";
-          sha256 = "0a966y9yfarhmki4wwzg371ziaygnp13yc6r13w9zz327fkhz8na";
+          url = "http://beta.quicklisp.org/archive/hash-set/2025-06-22/hash-set-20250622-git.tgz";
+          sha256 = "0q7bg8ww60smsw3jk6d6js4j09ggm7pd31xc0jpp0cjldylam2pz";
           system = "hash-set";
           asd = "hash-set";
         }
@@ -57928,12 +58717,12 @@ lib.makeScope pkgs.newScope (self: {
   hash-set-tests = (
     build-asdf-system {
       pname = "hash-set-tests";
-      version = "20211230-git";
+      version = "20250622-git";
       asds = [ "hash-set-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hash-set/2021-12-30/hash-set-20211230-git.tgz";
-          sha256 = "0a966y9yfarhmki4wwzg371ziaygnp13yc6r13w9zz327fkhz8na";
+          url = "http://beta.quicklisp.org/archive/hash-set/2025-06-22/hash-set-20250622-git.tgz";
+          sha256 = "0q7bg8ww60smsw3jk6d6js4j09ggm7pd31xc0jpp0cjldylam2pz";
           system = "hash-set-tests";
           asd = "hash-set-tests";
         }
@@ -57997,12 +58786,12 @@ lib.makeScope pkgs.newScope (self: {
   hashtrie = (
     build-asdf-system {
       pname = "hashtrie";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "hashtrie" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hashtrie/2024-10-12/hashtrie-20241012-git.tgz";
-          sha256 = "1qn7azbl2p3hjvrb87bb06d3njsi5ksmdcv4mk80iadq06w0rn0n";
+          url = "http://beta.quicklisp.org/archive/hashtrie/2025-06-22/hashtrie-20250622-git.tgz";
+          sha256 = "04k38sya7nypqmbwrzwv18wxsky8ycc1jlxv3vlhn52jngizxc1n";
           system = "hashtrie";
           asd = "hashtrie";
         }
@@ -58017,12 +58806,12 @@ lib.makeScope pkgs.newScope (self: {
   hashtrie-tests = (
     build-asdf-system {
       pname = "hashtrie-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "hashtrie-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hashtrie/2024-10-12/hashtrie-20241012-git.tgz";
-          sha256 = "1qn7azbl2p3hjvrb87bb06d3njsi5ksmdcv4mk80iadq06w0rn0n";
+          url = "http://beta.quicklisp.org/archive/hashtrie/2025-06-22/hashtrie-20250622-git.tgz";
+          sha256 = "04k38sya7nypqmbwrzwv18wxsky8ycc1jlxv3vlhn52jngizxc1n";
           system = "hashtrie-tests";
           asd = "hashtrie-tests";
         }
@@ -58127,12 +58916,12 @@ lib.makeScope pkgs.newScope (self: {
   helambdap = (
     build-asdf-system {
       pname = "helambdap";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "helambdap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/helambdap/2024-10-12/helambdap-20241012-git.tgz";
-          sha256 = "0z7hnphjxfr5z5h9gp5940pbbh163w3nnis2fan2wrrh0l88scn3";
+          url = "http://beta.quicklisp.org/archive/helambdap/2025-06-22/helambdap-20250622-git.tgz";
+          sha256 = "0kvrajgglwf3zsfw7kafdkjwqv9y9pblmygcv1a2zvrnrgxmak1g";
           system = "helambdap";
           asd = "helambdap";
         }
@@ -58152,12 +58941,12 @@ lib.makeScope pkgs.newScope (self: {
   hello-builder = (
     build-asdf-system {
       pname = "hello-builder";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "hello-builder" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clog/2024-10-12/clog-20241012-git.tgz";
-          sha256 = "0hqpj9ji7kfqgcxdfnc7x202qzmb7zdkmjwcyhdllqs6b0ssw5lx";
+          url = "http://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz";
+          sha256 = "1sf2xan0fh2qqr8xgmsbmq9qcj5nkzrp3nq7gd69ssbkz9ab6qpw";
           system = "hello-builder";
           asd = "hello-builder";
         }
@@ -58172,12 +58961,12 @@ lib.makeScope pkgs.newScope (self: {
   hello-clog = (
     build-asdf-system {
       pname = "hello-clog";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "hello-clog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clog/2024-10-12/clog-20241012-git.tgz";
-          sha256 = "0hqpj9ji7kfqgcxdfnc7x202qzmb7zdkmjwcyhdllqs6b0ssw5lx";
+          url = "http://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz";
+          sha256 = "1sf2xan0fh2qqr8xgmsbmq9qcj5nkzrp3nq7gd69ssbkz9ab6qpw";
           system = "hello-clog";
           asd = "hello-clog";
         }
@@ -58633,12 +59422,12 @@ lib.makeScope pkgs.newScope (self: {
   hsx = (
     build-asdf-system {
       pname = "hsx";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "hsx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hsx/2024-10-12/hsx-20241012-git.tgz";
-          sha256 = "0aldv9cjzl9n4p1arlmvbjdy3zwhxcmx1ajp5lwdz5vq4mivw3zy";
+          url = "http://beta.quicklisp.org/archive/hsx/2025-06-22/hsx-20250622-git.tgz";
+          sha256 = "16sb2vc0z51riaa4hm5537ns17jfbw45adj0ykifklkc36zahil2";
           system = "hsx";
           asd = "hsx";
         }
@@ -58656,12 +59445,12 @@ lib.makeScope pkgs.newScope (self: {
   hsx-test = (
     build-asdf-system {
       pname = "hsx-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "hsx-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hsx/2024-10-12/hsx-20241012-git.tgz";
-          sha256 = "0aldv9cjzl9n4p1arlmvbjdy3zwhxcmx1ajp5lwdz5vq4mivw3zy";
+          url = "http://beta.quicklisp.org/archive/hsx/2025-06-22/hsx-20250622-git.tgz";
+          sha256 = "16sb2vc0z51riaa4hm5537ns17jfbw45adj0ykifklkc36zahil2";
           system = "hsx-test";
           asd = "hsx-test";
         }
@@ -58847,12 +59636,12 @@ lib.makeScope pkgs.newScope (self: {
   http-body = (
     build-asdf-system {
       pname = "http-body";
-      version = "20190813-git";
+      version = "20250622-git";
       asds = [ "http-body" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz";
-          sha256 = "0kcg43l5674drzid9cj938q0ki5z25glx296rl239dm7yfmxlzz2";
+          url = "http://beta.quicklisp.org/archive/http-body/2025-06-22/http-body-20250622-git.tgz";
+          sha256 = "0p54ai77igyhppi4r74izdykbnip67570fbvxkg90nvxvas3ybz4";
           system = "http-body";
           asd = "http-body";
         }
@@ -58864,9 +59653,9 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "cl-utilities" self)
         (getAttr "fast-http" self)
         (getAttr "flexi-streams" self)
-        (getAttr "jonathan" self)
         (getAttr "quri" self)
         (getAttr "trivial-gray-streams" self)
+        (getAttr "yason" self)
       ];
       meta = { };
     }
@@ -58874,12 +59663,12 @@ lib.makeScope pkgs.newScope (self: {
   http-body-test = (
     build-asdf-system {
       pname = "http-body-test";
-      version = "20190813-git";
+      version = "20250622-git";
       asds = [ "http-body-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz";
-          sha256 = "0kcg43l5674drzid9cj938q0ki5z25glx296rl239dm7yfmxlzz2";
+          url = "http://beta.quicklisp.org/archive/http-body/2025-06-22/http-body-20250622-git.tgz";
+          sha256 = "0p54ai77igyhppi4r74izdykbnip67570fbvxkg90nvxvas3ybz4";
           system = "http-body-test";
           asd = "http-body-test";
         }
@@ -58969,12 +59758,12 @@ lib.makeScope pkgs.newScope (self: {
   http2 = (
     build-asdf-system {
       pname = "http2";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "http2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/http2/2024-10-12/http2-20241012-git.tgz";
-          sha256 = "1zb21np8rksz7b0vkfr3hg8y1a4m20vgkks3v39cc1yclnrfavii";
+          url = "http://beta.quicklisp.org/archive/http2/2025-06-22/http2-20250622-git.tgz";
+          sha256 = "0ypjgdic1a19gr0v77dh1gd8a51h2jf8gx8zm7f0rs42m09bbb7n";
           system = "http2";
           asd = "http2";
         }
@@ -58983,9 +59772,17 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "alexandria" self)
         (getAttr "anaphora" self)
+        (getAttr "bordeaux-threads" self)
+        (getAttr "cffi" self)
+        (getAttr "cffi-grovel" self)
+        (getAttr "chipz" self)
+        (getAttr "cl_plus_ssl" self)
         (getAttr "flexi-streams" self)
         (getAttr "gzip-stream" self)
+        (getAttr "mgl-pax" self)
+        (getAttr "puri" self)
         (getAttr "trivial-gray-streams" self)
+        (getAttr "trivial-utf-8" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -59040,7 +59837,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.bluez" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.bluez/2021-02-28/hu.dwim.bluez-stable-git.tgz";
+          url = "http://beta.quicklisp.org/archive/hu.dwim.bluez/2025-06-22/hu.dwim.bluez-stable-git.tgz";
           sha256 = "0gjh3bgmdz4aabdavbd5m27r273hna47vs388r4m7l2xnd3b3j55";
           system = "hu.dwim.bluez";
           asd = "hu.dwim.bluez";
@@ -59052,6 +59849,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "cffi" self)
         (getAttr "cffi-libffi" self)
         (getAttr "hu_dot_dwim_dot_asdf" self)
+        (getAttr "trivial-features" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -60795,8 +61593,8 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.reiterate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.reiterate/2021-12-30/hu.dwim.reiterate-stable-git.tgz";
-          sha256 = "0h6cgg385ivgc6942xal09c7n9vmy6gn4y3zz4zafc1qyl5jwyv9";
+          url = "http://beta.quicklisp.org/archive/hu.dwim.reiterate/2025-06-22/hu.dwim.reiterate-stable-git.tgz";
+          sha256 = "1qy83h4q10as7r8ynci0iqmdwazzs92wkl2jd92wh4ai3zaf72al";
           system = "hu.dwim.reiterate";
           asd = "hu.dwim.reiterate";
         }
@@ -60811,6 +61609,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "hu_dot_dwim_dot_defclass-star" self)
         (getAttr "hu_dot_dwim_dot_syntax-sugar" self)
         (getAttr "hu_dot_dwim_dot_util" self)
+        (getAttr "hu_dot_dwim_dot_walker" self)
         (getAttr "metabang-bind" self)
       ];
       meta = {
@@ -60825,8 +61624,8 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.reiterate+hu.dwim.logger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.reiterate/2021-12-30/hu.dwim.reiterate-stable-git.tgz";
-          sha256 = "0h6cgg385ivgc6942xal09c7n9vmy6gn4y3zz4zafc1qyl5jwyv9";
+          url = "http://beta.quicklisp.org/archive/hu.dwim.reiterate/2025-06-22/hu.dwim.reiterate-stable-git.tgz";
+          sha256 = "1qy83h4q10as7r8ynci0iqmdwazzs92wkl2jd92wh4ai3zaf72al";
           system = "hu.dwim.reiterate+hu.dwim.logger";
           asd = "hu.dwim.reiterate+hu.dwim.logger";
         }
@@ -60849,7 +61648,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.sdl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.sdl/2022-07-07/hu.dwim.sdl-stable-git.tgz";
+          url = "http://beta.quicklisp.org/archive/hu.dwim.sdl/2025-06-22/hu.dwim.sdl-stable-git.tgz";
           sha256 = "175kha5f7kvis2nlxbzrybswbr62lgmjh691ajwl5i9y7andqhq2";
           system = "hu.dwim.sdl";
           asd = "hu.dwim.sdl";
@@ -60861,6 +61660,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "cffi" self)
         (getAttr "cffi-libffi" self)
         (getAttr "hu_dot_dwim_dot_asdf" self)
+        (getAttr "trivial-features" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -61522,7 +62322,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.zlib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.zlib/2022-07-07/hu.dwim.zlib-stable-git.tgz";
+          url = "http://beta.quicklisp.org/archive/hu.dwim.zlib/2025-06-22/hu.dwim.zlib-stable-git.tgz";
           sha256 = "1yrsbl6rmsp6sdaj9yzwx1bpbs529akndxnpplafw31195khnxm1";
           system = "hu.dwim.zlib";
           asd = "hu.dwim.zlib";
@@ -61534,6 +62334,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "cffi" self)
         (getAttr "cffi-libffi" self)
         (getAttr "hu_dot_dwim_dot_asdf" self)
+        (getAttr "trivial-features" self)
       ];
       meta = {
         broken = true;
@@ -61564,12 +62365,12 @@ lib.makeScope pkgs.newScope (self: {
   humbler = (
     build-asdf-system {
       pname = "humbler";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "humbler" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/humbler/2023-10-21/humbler-20231021-git.tgz";
-          sha256 = "15fdvlrhdvr58i2rwa87i4is2rgh9xzjag0sqhga8ri7a8i63fgf";
+          url = "http://beta.quicklisp.org/archive/humbler/2025-06-22/humbler-20250622-git.tgz";
+          sha256 = "0vca31p9ngzxzpmy5rshyywc7zy12d413a8rw0y5xd6l1jv9qpjh";
           system = "humbler";
           asd = "humbler";
         }
@@ -61591,12 +62392,12 @@ lib.makeScope pkgs.newScope (self: {
   hunchensocket = (
     build-asdf-system {
       pname = "hunchensocket";
-      version = "20221106-git";
+      version = "20250622-git";
       asds = [ "hunchensocket" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hunchensocket/2022-11-06/hunchensocket-20221106-git.tgz";
-          sha256 = "1vhd009lwl62l1czmhsalblxmyz4x9v3nspjflpajwm1db5rnd7h";
+          url = "http://beta.quicklisp.org/archive/hunchensocket/2025-06-22/hunchensocket-20250622-git.tgz";
+          sha256 = "0f8g54gjcmnf6yjz9d0x619p99sf39wzxxb328hdbwfj21ww74nf";
           system = "hunchensocket";
           asd = "hunchensocket";
         }
@@ -61620,14 +62421,14 @@ lib.makeScope pkgs.newScope (self: {
   hunchensocket-tests = (
     build-asdf-system {
       pname = "hunchensocket-tests";
-      version = "20221106-git";
+      version = "20250622-git";
       asds = [ "hunchensocket-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hunchensocket/2022-11-06/hunchensocket-20221106-git.tgz";
-          sha256 = "1vhd009lwl62l1czmhsalblxmyz4x9v3nspjflpajwm1db5rnd7h";
+          url = "http://beta.quicklisp.org/archive/hunchensocket/2025-06-22/hunchensocket-20250622-git.tgz";
+          sha256 = "0f8g54gjcmnf6yjz9d0x619p99sf39wzxxb328hdbwfj21ww74nf";
           system = "hunchensocket-tests";
-          asd = "hunchensocket";
+          asd = "hunchensocket-tests";
         }
       );
       systems = [ "hunchensocket-tests" ];
@@ -62302,12 +63103,12 @@ lib.makeScope pkgs.newScope (self: {
   imago = (
     build-asdf-system {
       pname = "imago";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "imago" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/imago/2024-10-12/imago-20241012-git.tgz";
-          sha256 = "1jhhlqbzdd68n8scl98dxfr92s1rgd43isgd317l3ynfjwz63wq1";
+          url = "http://beta.quicklisp.org/archive/imago/2025-06-22/imago-20250622-git.tgz";
+          sha256 = "17bfxp9z9hyi6sh382371fb822lqkgw1lrc1vvspsayax126yhpl";
           system = "imago";
           asd = "imago";
         }
@@ -62528,12 +63329,12 @@ lib.makeScope pkgs.newScope (self: {
   infix = (
     build-asdf-system {
       pname = "infix";
-      version = "20210411-git";
+      version = "20250622-git";
       asds = [ "infix" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz";
-          sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa";
+          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "infix";
           asd = "infix";
         }
@@ -63276,6 +64077,30 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  interact = (
+    build-asdf-system {
+      pname = "interact";
+      version = "production-86dd9553-git";
+      asds = [ "interact" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/interact/2025-06-22/interact-production-86dd9553-git.tgz";
+          sha256 = "10076p3vlb3a7106gdl44sil8b63ama7svbf9smgbbs40c1657ba";
+          system = "interact";
+          asd = "interact";
+        }
+      );
+      systems = [ "interact" ];
+      lispLibs = [
+        (getAttr "clim" self)
+        (getAttr "fn" self)
+        (getAttr "serapeum" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   intercom = (
     build-asdf-system {
       pname = "intercom";
@@ -63415,12 +64240,12 @@ lib.makeScope pkgs.newScope (self: {
   invistra = (
     build-asdf-system {
       pname = "invistra";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "invistra" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/invistra/2024-10-12/invistra-20241012-git.tgz";
-          sha256 = "14ja35zqa85hjl9wxkwrff2wnlfflxi6lnkw0ic7jp7b59f80qas";
+          url = "http://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz";
+          sha256 = "1wkf5hi8939bxd39psbzc11w7xvqdfl1z6192spk7s73i3ql9s9x";
           system = "invistra";
           asd = "invistra";
         }
@@ -63440,12 +64265,12 @@ lib.makeScope pkgs.newScope (self: {
   invistra-extrinsic = (
     build-asdf-system {
       pname = "invistra-extrinsic";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "invistra-extrinsic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/invistra/2024-10-12/invistra-20241012-git.tgz";
-          sha256 = "14ja35zqa85hjl9wxkwrff2wnlfflxi6lnkw0ic7jp7b59f80qas";
+          url = "http://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz";
+          sha256 = "1wkf5hi8939bxd39psbzc11w7xvqdfl1z6192spk7s73i3ql9s9x";
           system = "invistra-extrinsic";
           asd = "invistra-extrinsic";
         }
@@ -63463,12 +64288,12 @@ lib.makeScope pkgs.newScope (self: {
   invistra-numeral = (
     build-asdf-system {
       pname = "invistra-numeral";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "invistra-numeral" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/invistra/2024-10-12/invistra-20241012-git.tgz";
-          sha256 = "14ja35zqa85hjl9wxkwrff2wnlfflxi6lnkw0ic7jp7b59f80qas";
+          url = "http://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz";
+          sha256 = "1wkf5hi8939bxd39psbzc11w7xvqdfl1z6192spk7s73i3ql9s9x";
           system = "invistra-numeral";
           asd = "invistra-numeral";
         }
@@ -63907,12 +64732,12 @@ lib.makeScope pkgs.newScope (self: {
   jingle = (
     build-asdf-system {
       pname = "jingle";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "jingle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jingle/2023-10-21/cl-jingle-20231021-git.tgz";
-          sha256 = "0g64y9nzkdrb2yjp0lvhfc0qm3595n6w76hk9hd1v0ril78vzybc";
+          url = "http://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz";
+          sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4";
           system = "jingle";
           asd = "jingle";
         }
@@ -63941,12 +64766,12 @@ lib.makeScope pkgs.newScope (self: {
   jingle_dot_demo = (
     build-asdf-system {
       pname = "jingle.demo";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "jingle.demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jingle/2023-10-21/cl-jingle-20231021-git.tgz";
-          sha256 = "0g64y9nzkdrb2yjp0lvhfc0qm3595n6w76hk9hd1v0ril78vzybc";
+          url = "http://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz";
+          sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4";
           system = "jingle.demo";
           asd = "jingle.demo";
         }
@@ -63972,12 +64797,12 @@ lib.makeScope pkgs.newScope (self: {
   jingle_dot_demo_dot_test = (
     build-asdf-system {
       pname = "jingle.demo.test";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "jingle.demo.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jingle/2023-10-21/cl-jingle-20231021-git.tgz";
-          sha256 = "0g64y9nzkdrb2yjp0lvhfc0qm3595n6w76hk9hd1v0ril78vzybc";
+          url = "http://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz";
+          sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4";
           system = "jingle.demo.test";
           asd = "jingle.demo.test";
         }
@@ -63995,12 +64820,12 @@ lib.makeScope pkgs.newScope (self: {
   jingle_dot_test = (
     build-asdf-system {
       pname = "jingle.test";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "jingle.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jingle/2023-10-21/cl-jingle-20231021-git.tgz";
-          sha256 = "0g64y9nzkdrb2yjp0lvhfc0qm3595n6w76hk9hd1v0ril78vzybc";
+          url = "http://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz";
+          sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4";
           system = "jingle.test";
           asd = "jingle.test";
         }
@@ -64446,12 +65271,12 @@ lib.makeScope pkgs.newScope (self: {
   jose = (
     build-asdf-system {
       pname = "jose";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "jose" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jose/2024-10-12/jose-20241012-git.tgz";
-          sha256 = "1z7xjy4ihxa8ay5vznhnxkjflfx6xmfpgwxdakk9wmkw30p2yn4h";
+          url = "http://beta.quicklisp.org/archive/jose/2025-06-22/jose-20250622-git.tgz";
+          sha256 = "18xy51sqkdcyxd7my1nd9jdhzxc9g77x8bh8ycr0y5fmkvpzmmkv";
           system = "jose";
           asd = "jose";
         }
@@ -64461,8 +65286,8 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "alexandria" self)
         (getAttr "assoc-utils" self)
         (getAttr "cl-base64" self)
+        (getAttr "cl-json" self)
         (getAttr "ironclad" self)
-        (getAttr "jonathan" self)
         (getAttr "split-sequence" self)
         (getAttr "trivial-utf-8" self)
       ];
@@ -64474,12 +65299,12 @@ lib.makeScope pkgs.newScope (self: {
   journal = (
     build-asdf-system {
       pname = "journal";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "journal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/journal/2023-10-21/journal-20231021-git.tgz";
-          sha256 = "0h55mi3n0cwsl3gb9v7xsl9jzq0x5fbv2s8a0haby7g9995jr98v";
+          url = "http://beta.quicklisp.org/archive/journal/2025-06-22/journal-20250622-git.tgz";
+          sha256 = "0flv7rikhgsm8074wmhi0wa16n9j5dcaif3xjm65ljmzj48m8qp1";
           system = "journal";
           asd = "journal";
         }
@@ -64866,12 +65691,12 @@ lib.makeScope pkgs.newScope (self: {
   jsonrpc = (
     build-asdf-system {
       pname = "jsonrpc";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "jsonrpc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jsonrpc/2024-10-12/jsonrpc-20241012-git.tgz";
-          sha256 = "1wsc6bv8xpzad0lgrlldzrpb9r4aksnw7ss2ifwa7ykbzfxcr8gi";
+          url = "http://beta.quicklisp.org/archive/jsonrpc/2025-06-22/jsonrpc-20250622-git.tgz";
+          sha256 = "0kd550fsklsc4h0fj8jl6g4z5ldb8ba9dn68s7ykv3myaiwgsy1p";
           system = "jsonrpc";
           asd = "jsonrpc";
         }
@@ -64959,12 +65784,12 @@ lib.makeScope pkgs.newScope (self: {
   jupyter-lab-extension = (
     build-asdf-system {
       pname = "jupyter-lab-extension";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "jupyter-lab-extension" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-lisp-jupyter/2024-10-12/common-lisp-jupyter-20241012-git.tgz";
-          sha256 = "1qbrzv0myxfxq7rzm2y9cm2xymkl982982h2kbsl7d1yd5hrjvl6";
+          url = "http://beta.quicklisp.org/archive/common-lisp-jupyter/2025-06-22/common-lisp-jupyter-20250622-git.tgz";
+          sha256 = "0xm3a68dn3mlq4gyiqfndf61agh1bj5fp1cqhsscz53zjcnrb2yb";
           system = "jupyter-lab-extension";
           asd = "jupyter-lab-extension";
         }
@@ -65214,12 +66039,12 @@ lib.makeScope pkgs.newScope (self: {
   kenzo = (
     build-asdf-system {
       pname = "kenzo";
-      version = "20200325-git";
+      version = "20250622-git";
       asds = [ "kenzo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/kenzo/2020-03-25/kenzo-20200325-git.tgz";
-          sha256 = "0dg70p5pxvx2ksr66z3p2nkxxwkjd852pkckr15j6cwfaji9fr8r";
+          url = "http://beta.quicklisp.org/archive/kenzo/2025-06-22/kenzo-20250622-git.tgz";
+          sha256 = "10wpjg76vb0rxkid6v5s6dnwamipd5lsjf3nxk40g1n6isf4jf0l";
           system = "kenzo";
           asd = "kenzo";
         }
@@ -65234,12 +66059,12 @@ lib.makeScope pkgs.newScope (self: {
   kenzo-test = (
     build-asdf-system {
       pname = "kenzo-test";
-      version = "20200325-git";
+      version = "20250622-git";
       asds = [ "kenzo-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/kenzo/2020-03-25/kenzo-20200325-git.tgz";
-          sha256 = "0dg70p5pxvx2ksr66z3p2nkxxwkjd852pkckr15j6cwfaji9fr8r";
+          url = "http://beta.quicklisp.org/archive/kenzo/2025-06-22/kenzo-20250622-git.tgz";
+          sha256 = "10wpjg76vb0rxkid6v5s6dnwamipd5lsjf3nxk40g1n6isf4jf0l";
           system = "kenzo-test";
           asd = "kenzo-test";
         }
@@ -65283,18 +66108,87 @@ lib.makeScope pkgs.newScope (self: {
   khazern = (
     build-asdf-system {
       pname = "khazern";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "khazern" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz";
-          sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h";
+          url = "http://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
+          sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d";
           system = "khazern";
           asd = "khazern";
         }
       );
       systems = [ "khazern" ];
-      lispLibs = [ (getAttr "acclimation" self) ];
+      lispLibs = [
+        (getAttr "acclimation" self)
+        (getAttr "trivial-with-current-source-form" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  khazern-extension = (
+    build-asdf-system {
+      pname = "khazern-extension";
+      version = "20250622-git";
+      asds = [ "khazern-extension" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
+          sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d";
+          system = "khazern-extension";
+          asd = "khazern-extension";
+        }
+      );
+      systems = [ "khazern-extension" ];
+      lispLibs = [ (getAttr "khazern" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  khazern-extension-extrinsic = (
+    build-asdf-system {
+      pname = "khazern-extension-extrinsic";
+      version = "20250622-git";
+      asds = [ "khazern-extension-extrinsic" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
+          sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d";
+          system = "khazern-extension-extrinsic";
+          asd = "khazern-extension-extrinsic";
+        }
+      );
+      systems = [ "khazern-extension-extrinsic" ];
+      lispLibs = [
+        (getAttr "khazern-extension" self)
+        (getAttr "khazern-extrinsic" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  khazern-extension-intrinsic = (
+    build-asdf-system {
+      pname = "khazern-extension-intrinsic";
+      version = "20250622-git";
+      asds = [ "khazern-extension-intrinsic" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
+          sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d";
+          system = "khazern-extension-intrinsic";
+          asd = "khazern-extension-intrinsic";
+        }
+      );
+      systems = [ "khazern-extension-intrinsic" ];
+      lispLibs = [
+        (getAttr "khazern-extension" self)
+        (getAttr "khazern-intrinsic" self)
+      ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -65303,12 +66197,12 @@ lib.makeScope pkgs.newScope (self: {
   khazern-extrinsic = (
     build-asdf-system {
       pname = "khazern-extrinsic";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "khazern-extrinsic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz";
-          sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h";
+          url = "http://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
+          sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d";
           system = "khazern-extrinsic";
           asd = "khazern-extrinsic";
         }
@@ -65323,12 +66217,12 @@ lib.makeScope pkgs.newScope (self: {
   khazern-intrinsic = (
     build-asdf-system {
       pname = "khazern-intrinsic";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "khazern-intrinsic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz";
-          sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h";
+          url = "http://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
+          sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d";
           system = "khazern-intrinsic";
           asd = "khazern-intrinsic";
         }
@@ -65343,75 +66237,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  khazern-sequence = (
-    build-asdf-system {
-      pname = "khazern-sequence";
-      version = "20241012-git";
-      asds = [ "khazern-sequence" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz";
-          sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h";
-          system = "khazern-sequence";
-          asd = "khazern-sequence";
-        }
-      );
-      systems = [ "khazern-sequence" ];
-      lispLibs = [
-        (getAttr "khazern" self)
-        (getAttr "trivial-extensible-sequences" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  khazern-sequence-extrinsic = (
-    build-asdf-system {
-      pname = "khazern-sequence-extrinsic";
-      version = "20241012-git";
-      asds = [ "khazern-sequence-extrinsic" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz";
-          sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h";
-          system = "khazern-sequence-extrinsic";
-          asd = "khazern-sequence-extrinsic";
-        }
-      );
-      systems = [ "khazern-sequence-extrinsic" ];
-      lispLibs = [
-        (getAttr "khazern-extrinsic" self)
-        (getAttr "khazern-sequence" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  khazern-sequence-intrinsic = (
-    build-asdf-system {
-      pname = "khazern-sequence-intrinsic";
-      version = "20241012-git";
-      asds = [ "khazern-sequence-intrinsic" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz";
-          sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h";
-          system = "khazern-sequence-intrinsic";
-          asd = "khazern-sequence-intrinsic";
-        }
-      );
-      systems = [ "khazern-sequence-intrinsic" ];
-      lispLibs = [
-        (getAttr "khazern-intrinsic" self)
-        (getAttr "khazern-sequence" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   kl-verify = (
     build-asdf-system {
       pname = "kl-verify";
@@ -65473,12 +66298,12 @@ lib.makeScope pkgs.newScope (self: {
   knx-conn = (
     build-asdf-system {
       pname = "knx-conn";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "knx-conn" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/knx-conn/2024-10-12/knx-conn-20241012-git.tgz";
-          sha256 = "1zq716fr1mq096hbpndfawyi1a7pr6gsyxnv2g1b00vpgyf37c4r";
+          url = "http://beta.quicklisp.org/archive/knx-conn/2025-06-22/knx-conn-20250622-git.tgz";
+          sha256 = "0vs31sipx6drd0hs0n9lggaz282br6d3yya5rnvssmv471wqrbsf";
           system = "knx-conn";
           asd = "knx-conn";
         }
@@ -65586,12 +66411,12 @@ lib.makeScope pkgs.newScope (self: {
   lack = (
     build-asdf-system {
       pname = "lack";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack";
           asd = "lack";
         }
@@ -65607,12 +66432,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-app-directory = (
     build-asdf-system {
       pname = "lack-app-directory";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-app-directory" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-app-directory";
           asd = "lack-app-directory";
         }
@@ -65633,12 +66458,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-app-file = (
     build-asdf-system {
       pname = "lack-app-file";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-app-file" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-app-file";
           asd = "lack-app-file";
         }
@@ -65658,12 +66483,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-component = (
     build-asdf-system {
       pname = "lack-component";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-component" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-component";
           asd = "lack-component";
         }
@@ -65676,12 +66501,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-middleware-accesslog = (
     build-asdf-system {
       pname = "lack-middleware-accesslog";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-middleware-accesslog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-accesslog";
           asd = "lack-middleware-accesslog";
         }
@@ -65719,12 +66544,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-middleware-auth-basic = (
     build-asdf-system {
       pname = "lack-middleware-auth-basic";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-middleware-auth-basic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-auth-basic";
           asd = "lack-middleware-auth-basic";
         }
@@ -65742,12 +66567,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-middleware-backtrace = (
     build-asdf-system {
       pname = "lack-middleware-backtrace";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-middleware-backtrace" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-backtrace";
           asd = "lack-middleware-backtrace";
         }
@@ -65780,12 +66605,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-middleware-csrf = (
     build-asdf-system {
       pname = "lack-middleware-csrf";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-middleware-csrf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-csrf";
           asd = "lack-middleware-csrf";
         }
@@ -65803,12 +66628,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-middleware-dbpool = (
     build-asdf-system {
       pname = "lack-middleware-dbpool";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-middleware-dbpool" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-dbpool";
           asd = "lack-middleware-dbpool";
         }
@@ -65826,12 +66651,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-middleware-mito = (
     build-asdf-system {
       pname = "lack-middleware-mito";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-middleware-mito" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz";
-          sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3";
+          url = "http://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
+          sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096";
           system = "lack-middleware-mito";
           asd = "lack-middleware-mito";
         }
@@ -65849,12 +66674,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-middleware-mount = (
     build-asdf-system {
       pname = "lack-middleware-mount";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-middleware-mount" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-mount";
           asd = "lack-middleware-mount";
         }
@@ -65869,12 +66694,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-middleware-session = (
     build-asdf-system {
       pname = "lack-middleware-session";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-middleware-session" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-session";
           asd = "lack-middleware-session";
         }
@@ -65895,12 +66720,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-middleware-static = (
     build-asdf-system {
       pname = "lack-middleware-static";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-middleware-static" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-static";
           asd = "lack-middleware-static";
         }
@@ -65919,12 +66744,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-request = (
     build-asdf-system {
       pname = "lack-request";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-request" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-request";
           asd = "lack-request";
         }
@@ -65944,12 +66769,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-response = (
     build-asdf-system {
       pname = "lack-response";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-response" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-response";
           asd = "lack-response";
         }
@@ -65967,12 +66792,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-session-store-dbi = (
     build-asdf-system {
       pname = "lack-session-store-dbi";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-session-store-dbi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-session-store-dbi";
           asd = "lack-session-store-dbi";
         }
@@ -65993,12 +66818,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-session-store-redis = (
     build-asdf-system {
       pname = "lack-session-store-redis";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-session-store-redis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-session-store-redis";
           asd = "lack-session-store-redis";
         }
@@ -66019,12 +66844,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-test = (
     build-asdf-system {
       pname = "lack-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-test";
           asd = "lack-test";
         }
@@ -66044,12 +66869,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-util = (
     build-asdf-system {
       pname = "lack-util";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-util" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-util";
           asd = "lack-util";
         }
@@ -66065,12 +66890,12 @@ lib.makeScope pkgs.newScope (self: {
   lack-util-writer-stream = (
     build-asdf-system {
       pname = "lack-util-writer-stream";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lack-util-writer-stream" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz";
-          sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys";
+          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-util-writer-stream";
           asd = "lack-util-writer-stream";
         }
@@ -66161,12 +66986,12 @@ lib.makeScope pkgs.newScope (self: {
   lambda-fiddle = (
     build-asdf-system {
       pname = "lambda-fiddle";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "lambda-fiddle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lambda-fiddle/2023-10-21/lambda-fiddle-20231021-git.tgz";
-          sha256 = "1hh0192qvymn3zwy9a0rsg98wgb8mnb9z2jzl2a2n1ssvpx61gpj";
+          url = "http://beta.quicklisp.org/archive/lambda-fiddle/2025-06-22/lambda-fiddle-20250622-git.tgz";
+          sha256 = "0ka9av9806qlj2blnf4k55fma3xvc8zksnqwc60g5hv20y858c1p";
           system = "lambda-fiddle";
           asd = "lambda-fiddle";
         }
@@ -66245,12 +67070,12 @@ lib.makeScope pkgs.newScope (self: {
   language-codes = (
     build-asdf-system {
       pname = "language-codes";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "language-codes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/language-codes/2023-10-21/language-codes-20231021-git.tgz";
-          sha256 = "0qbv0x0w415m48c6gjaw7ncnb1446q9sswr2p3svx7ijiwd19kja";
+          url = "http://beta.quicklisp.org/archive/language-codes/2025-06-22/language-codes-20250622-git.tgz";
+          sha256 = "00wlfnazvfl3kl7wls4vig1v6dg45z5k1ax0v512i3x63kvxr7bb";
           system = "language-codes";
           asd = "language-codes";
         }
@@ -66262,29 +67087,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  langutils = (
-    build-asdf-system {
-      pname = "langutils";
-      version = "20121125-git";
-      asds = [ "langutils" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-langutils/2012-11-25/cl-langutils-20121125-git.tgz";
-          sha256 = "15y9x5wkg3fqndc04w2sc650fnwimxp4gjgpv9xvvdm9x4v433x6";
-          system = "langutils";
-          asd = "langutils";
-        }
-      );
-      systems = [ "langutils" ];
-      lispLibs = [
-        (getAttr "s-xml-rpc" self)
-        (getAttr "stdutils" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   lapack = (
     build-asdf-system {
       pname = "lapack";
@@ -66313,12 +67115,12 @@ lib.makeScope pkgs.newScope (self: {
   lass = (
     build-asdf-system {
       pname = "lass";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lass" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lass/2024-10-12/lass-20241012-git.tgz";
-          sha256 = "1b6a3v763i5fcdxczffd59kh4m73p4ilz6az85apd22apc8lr80z";
+          url = "http://beta.quicklisp.org/archive/lass/2025-06-22/lass-20250622-git.tgz";
+          sha256 = "0pj9p7asqaqjakjjn8i7k6lb9piakjxd8xa732c88q5qijbmvkb2";
           system = "lass";
           asd = "lass";
         }
@@ -66507,12 +67309,12 @@ lib.makeScope pkgs.newScope (self: {
   ledger = (
     build-asdf-system {
       pname = "ledger";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "ledger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "ledger";
           asd = "ledger";
         }
@@ -66599,12 +67401,12 @@ lib.makeScope pkgs.newScope (self: {
   legit = (
     build-asdf-system {
       pname = "legit";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "legit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/legit/2023-10-21/legit-20231021-git.tgz";
-          sha256 = "0jy021ywrbnkgbgb63ip6j7kr40m4wz2pz1v5ybn6xkkn6dyprsz";
+          url = "http://beta.quicklisp.org/archive/legit/2025-06-22/legit-20250622-git.tgz";
+          sha256 = "0k9jjng50d22i37vv3ag7f1j71yspr74n4akd4sw8mpyk7r66kh3";
           system = "legit";
           asd = "legit";
         }
@@ -66652,18 +67454,19 @@ lib.makeScope pkgs.newScope (self: {
   lemmy-api = (
     build-asdf-system {
       pname = "lemmy-api";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lemmy-api" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lemmy-api/2024-10-12/lemmy-api-20241012-git.tgz";
-          sha256 = "0krlf3zw4snpkgqb564xk82b1d0q2scqs05s1kalr773a5d801s7";
+          url = "http://beta.quicklisp.org/archive/lemmy-api/2025-06-22/lemmy-api-20250622-git.tgz";
+          sha256 = "1mbry0jv7zizvc23rz3h7428z65miccl1sanqa23d1xnlgjqvpbh";
           system = "lemmy-api";
           asd = "lemmy-api";
         }
       );
       systems = [ "lemmy-api" ];
       lispLibs = [
+        (getAttr "alexandria" self)
         (getAttr "closer-mop" self)
         (getAttr "dexador" self)
       ];
@@ -66672,26 +67475,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  lemmy-api-bindings-generator = (
-    build-asdf-system {
-      pname = "lemmy-api-bindings-generator";
-      version = "20241012-git";
-      asds = [ "lemmy-api-bindings-generator" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/lemmy-api/2024-10-12/lemmy-api-20241012-git.tgz";
-          sha256 = "0krlf3zw4snpkgqb564xk82b1d0q2scqs05s1kalr773a5d801s7";
-          system = "lemmy-api-bindings-generator";
-          asd = "lemmy-api-bindings-generator";
-        }
-      );
-      systems = [ "lemmy-api-bindings-generator" ];
-      lispLibs = [ ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   lense = (
     build-asdf-system {
       pname = "lense";
@@ -66810,12 +67593,12 @@ lib.makeScope pkgs.newScope (self: {
   letv = (
     build-asdf-system {
       pname = "letv";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "letv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/letv/2024-10-12/letv-20241012-git.tgz";
-          sha256 = "000alkhqb2n47y6849pswp7dg9pd0wwgswfrcm0sm4bz3r7dyjx1";
+          url = "http://beta.quicklisp.org/archive/letv/2025-06-22/letv-20250622-git.tgz";
+          sha256 = "1hpqhrgrnf9rgy3dnvyl1q5wfa6xbb4x98qfymzgp8yfi1c9ic9w";
           system = "letv";
           asd = "letv";
         }
@@ -67097,6 +67880,32 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  lftp-wrapper = (
+    build-asdf-system {
+      pname = "lftp-wrapper";
+      version = "20250622-git";
+      asds = [ "lftp-wrapper" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/lftp-wrapper/2025-06-22/lftp-wrapper-20250622-git.tgz";
+          sha256 = "1k87nxiv74p7xnwgqzvqdz3va7rnvcbqccrs5sddzhyi9syhfwhv";
+          system = "lftp-wrapper";
+          asd = "lftp-wrapper";
+        }
+      );
+      systems = [ "lftp-wrapper" ];
+      lispLibs = [
+        (getAttr "log4cl" self)
+        (getAttr "secret-values" self)
+        (getAttr "str" self)
+        (getAttr "termp" self)
+        (getAttr "trivial-types" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   lhstats = (
     build-asdf-system {
       pname = "lhstats";
@@ -67330,12 +68139,12 @@ lib.makeScope pkgs.newScope (self: {
   lichat-serverlib = (
     build-asdf-system {
       pname = "lichat-serverlib";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "lichat-serverlib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lichat-serverlib/2023-10-21/lichat-serverlib-20231021-git.tgz";
-          sha256 = "04830z49lczgdf8gval4j3s0fp5p6pfgvy783mrkcdfal2dcwacq";
+          url = "http://beta.quicklisp.org/archive/lichat-serverlib/2025-06-22/lichat-serverlib-20250622-git.tgz";
+          sha256 = "1rai2r4ysrcj0wj3jwqc8yqn26nlm1vjm21imc1rvbqd5lprrc3b";
           system = "lichat-serverlib";
           asd = "lichat-serverlib";
         }
@@ -67355,12 +68164,12 @@ lib.makeScope pkgs.newScope (self: {
   lichat-tcp-client = (
     build-asdf-system {
       pname = "lichat-tcp-client";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lichat-tcp-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lichat-tcp-client/2024-10-12/lichat-tcp-client-20241012-git.tgz";
-          sha256 = "1wwh396z7185nylrsz47b6l45hyfq6mjrm620fk5bsxr3jrzxs25";
+          url = "http://beta.quicklisp.org/archive/lichat-tcp-client/2025-06-22/lichat-tcp-client-20250622-git.tgz";
+          sha256 = "1d9zpcny7lqsmz5z1ssk09r3ncrf82mqlmxxcds03ijaaga117qv";
           system = "lichat-tcp-client";
           asd = "lichat-tcp-client";
         }
@@ -67383,12 +68192,12 @@ lib.makeScope pkgs.newScope (self: {
   lichat-tcp-server = (
     build-asdf-system {
       pname = "lichat-tcp-server";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "lichat-tcp-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lichat-tcp-server/2023-10-21/lichat-tcp-server-20231021-git.tgz";
-          sha256 = "18dys957iw678y6bqfq9x85m2bnb0ck8gr6l4b61vv3g2yl2w53y";
+          url = "http://beta.quicklisp.org/archive/lichat-tcp-server/2025-06-22/lichat-tcp-server-20250622-git.tgz";
+          sha256 = "00cvikcv560cgm4rzr1k9gm3i752i991g0z5ppsvbm79ay976gsf";
           system = "lichat-tcp-server";
           asd = "lichat-tcp-server";
         }
@@ -67410,12 +68219,12 @@ lib.makeScope pkgs.newScope (self: {
   lichat-ws-server = (
     build-asdf-system {
       pname = "lichat-ws-server";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "lichat-ws-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lichat-ws-server/2023-10-21/lichat-ws-server-20231021-git.tgz";
-          sha256 = "05vmc9b8b5igifm6lb5p3fssmny6ils7aimsizql3gay4nycvxgp";
+          url = "http://beta.quicklisp.org/archive/lichat-ws-server/2025-06-22/lichat-ws-server-20250622-git.tgz";
+          sha256 = "0cilzklkr24704s8g7m1i5bm2qwqpi7g63cqfkx1swrilzx77hg0";
           system = "lichat-ws-server";
           asd = "lichat-ws-server";
         }
@@ -67612,12 +68421,12 @@ lib.makeScope pkgs.newScope (self: {
   linear-programming = (
     build-asdf-system {
       pname = "linear-programming";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "linear-programming" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/linear-programming/2024-10-12/linear-programming-20241012-git.tgz";
-          sha256 = "01dy54ycmalqlk4wrkw1y6vixr0mk0nxmfy3p1w5kpdwp3642h9g";
+          url = "http://beta.quicklisp.org/archive/linear-programming/2025-06-22/linear-programming-20250622-git.tgz";
+          sha256 = "1sk2a02qcadndmzmkpbzcvwqz1sgx9i9xsj5901z7lmwpz9wzx0j";
           system = "linear-programming";
           asd = "linear-programming";
         }
@@ -67658,12 +68467,12 @@ lib.makeScope pkgs.newScope (self: {
   linear-programming-test = (
     build-asdf-system {
       pname = "linear-programming-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "linear-programming-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/linear-programming/2024-10-12/linear-programming-20241012-git.tgz";
-          sha256 = "01dy54ycmalqlk4wrkw1y6vixr0mk0nxmfy3p1w5kpdwp3642h9g";
+          url = "http://beta.quicklisp.org/archive/linear-programming/2025-06-22/linear-programming-20250622-git.tgz";
+          sha256 = "1sk2a02qcadndmzmkpbzcvwqz1sgx9i9xsj5901z7lmwpz9wzx0j";
           system = "linear-programming-test";
           asd = "linear-programming-test";
         }
@@ -67801,18 +68610,18 @@ lib.makeScope pkgs.newScope (self: {
   lisa = (
     build-asdf-system {
       pname = "lisa";
-      version = "20120407-git";
+      version = "20250622-git";
       asds = [ "lisa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisa/2012-04-07/lisa-20120407-git.tgz";
-          sha256 = "12mpwxpczfq2hridjspbg51121hngbcnji37fhlr0vv4dqrg1z15";
+          url = "http://beta.quicklisp.org/archive/lisa/2025-06-22/lisa-20250622-git.tgz";
+          sha256 = "0m1ww61vbaxrj1jiln8f6x393i27sd604hv511bd67y6xj23qqai";
           system = "lisa";
           asd = "lisa";
         }
       );
       systems = [ "lisa" ];
-      lispLibs = [ ];
+      lispLibs = [ (getAttr "log4cl" self) ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -67821,12 +68630,12 @@ lib.makeScope pkgs.newScope (self: {
   lisp-binary = (
     build-asdf-system {
       pname = "lisp-binary";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lisp-binary" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-binary/2024-10-12/lisp-binary-20241012-git.tgz";
-          sha256 = "1zgk6pbhjj4agazffv6mc3hjzyg4xh256sla83iqy5mwm172d810";
+          url = "http://beta.quicklisp.org/archive/lisp-binary/2025-06-22/lisp-binary-20250622-git.tgz";
+          sha256 = "0m798xnk0q1hf1l16jqv60bwp49y0hhljn79qvjixrpwr2ridgag";
           system = "lisp-binary";
           asd = "lisp-binary";
         }
@@ -67846,12 +68655,12 @@ lib.makeScope pkgs.newScope (self: {
   lisp-binary-test = (
     build-asdf-system {
       pname = "lisp-binary-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lisp-binary-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-binary/2024-10-12/lisp-binary-20241012-git.tgz";
-          sha256 = "1zgk6pbhjj4agazffv6mc3hjzyg4xh256sla83iqy5mwm172d810";
+          url = "http://beta.quicklisp.org/archive/lisp-binary/2025-06-22/lisp-binary-20250622-git.tgz";
+          sha256 = "0m798xnk0q1hf1l16jqv60bwp49y0hhljn79qvjixrpwr2ridgag";
           system = "lisp-binary-test";
           asd = "lisp-binary-test";
         }
@@ -68138,12 +68947,12 @@ lib.makeScope pkgs.newScope (self: {
   lisp-stat = (
     build-asdf-system {
       pname = "lisp-stat";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lisp-stat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-stat/2024-10-12/lisp-stat-20241012-git.tgz";
-          sha256 = "0igrrwlfvdqxdqwqij819zlkma6b815d10v3kzh1r6hp9fhn0r3p";
+          url = "http://beta.quicklisp.org/archive/lisp-stat/2025-06-22/lisp-stat-20250622-git.tgz";
+          sha256 = "1n98bp3jdk724zr7h3z496z754j0fbj4ilgqxf1f3kzmw34sb14n";
           system = "lisp-stat";
           asd = "lisp-stat";
         }
@@ -68289,12 +69098,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-lexer = (
     build-asdf-system {
       pname = "lispbuilder-lexer";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-lexer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-lexer";
           asd = "lispbuilder-lexer";
         }
@@ -68309,12 +69118,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-net = (
     build-asdf-system {
       pname = "lispbuilder-net";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-net" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-net";
           asd = "lispbuilder-net";
         }
@@ -68332,12 +69141,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-net-cffi = (
     build-asdf-system {
       pname = "lispbuilder-net-cffi";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-net-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-net-cffi";
           asd = "lispbuilder-net-cffi";
         }
@@ -68352,12 +69161,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-opengl-1-1 = (
     build-asdf-system {
       pname = "lispbuilder-opengl-1-1";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-opengl-1-1" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-opengl-1-1";
           asd = "lispbuilder-opengl-1-1";
         }
@@ -68372,12 +69181,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-opengl-examples = (
     build-asdf-system {
       pname = "lispbuilder-opengl-examples";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-opengl-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-opengl-examples";
           asd = "lispbuilder-opengl-examples";
         }
@@ -68396,12 +69205,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-regex = (
     build-asdf-system {
       pname = "lispbuilder-regex";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-regex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-regex";
           asd = "lispbuilder-regex";
         }
@@ -68416,12 +69225,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl = (
     build-asdf-system {
       pname = "lispbuilder-sdl";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl";
           asd = "lispbuilder-sdl";
         }
@@ -68441,12 +69250,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-assets = (
     build-asdf-system {
       pname = "lispbuilder-sdl-assets";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-assets" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-assets";
           asd = "lispbuilder-sdl-assets";
         }
@@ -68461,12 +69270,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-base = (
     build-asdf-system {
       pname = "lispbuilder-sdl-base";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-base";
           asd = "lispbuilder-sdl-base";
         }
@@ -68484,12 +69293,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-binaries = (
     build-asdf-system {
       pname = "lispbuilder-sdl-binaries";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-binaries" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-binaries";
           asd = "lispbuilder-sdl-binaries";
         }
@@ -68504,12 +69313,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-cffi = (
     build-asdf-system {
       pname = "lispbuilder-sdl-cffi";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-cffi";
           asd = "lispbuilder-sdl-cffi";
         }
@@ -68527,12 +69336,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-cl-vectors = (
     build-asdf-system {
       pname = "lispbuilder-sdl-cl-vectors";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-cl-vectors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-cl-vectors";
           asd = "lispbuilder-sdl-cl-vectors";
         }
@@ -68553,12 +69362,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-cl-vectors-examples = (
     build-asdf-system {
       pname = "lispbuilder-sdl-cl-vectors-examples";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-cl-vectors-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-cl-vectors-examples";
           asd = "lispbuilder-sdl-cl-vectors-examples";
         }
@@ -68573,12 +69382,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-examples = (
     build-asdf-system {
       pname = "lispbuilder-sdl-examples";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-examples";
           asd = "lispbuilder-sdl-examples";
         }
@@ -68593,12 +69402,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-gfx = (
     build-asdf-system {
       pname = "lispbuilder-sdl-gfx";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-gfx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-gfx";
           asd = "lispbuilder-sdl-gfx";
         }
@@ -68617,12 +69426,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-gfx-binaries = (
     build-asdf-system {
       pname = "lispbuilder-sdl-gfx-binaries";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-gfx-binaries" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-gfx-binaries";
           asd = "lispbuilder-sdl-gfx-binaries";
         }
@@ -68637,12 +69446,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-gfx-cffi = (
     build-asdf-system {
       pname = "lispbuilder-sdl-gfx-cffi";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-gfx-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-gfx-cffi";
           asd = "lispbuilder-sdl-gfx-cffi";
         }
@@ -68660,12 +69469,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-gfx-examples = (
     build-asdf-system {
       pname = "lispbuilder-sdl-gfx-examples";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-gfx-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-gfx-examples";
           asd = "lispbuilder-sdl-gfx-examples";
         }
@@ -68680,12 +69489,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-image = (
     build-asdf-system {
       pname = "lispbuilder-sdl-image";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-image" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-image";
           asd = "lispbuilder-sdl-image";
         }
@@ -68704,12 +69513,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-image-binaries = (
     build-asdf-system {
       pname = "lispbuilder-sdl-image-binaries";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-image-binaries" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-image-binaries";
           asd = "lispbuilder-sdl-image-binaries";
         }
@@ -68724,12 +69533,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-image-cffi = (
     build-asdf-system {
       pname = "lispbuilder-sdl-image-cffi";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-image-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-image-cffi";
           asd = "lispbuilder-sdl-image-cffi";
         }
@@ -68748,12 +69557,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-image-examples = (
     build-asdf-system {
       pname = "lispbuilder-sdl-image-examples";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-image-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-image-examples";
           asd = "lispbuilder-sdl-image-examples";
         }
@@ -68772,12 +69581,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-mixer = (
     build-asdf-system {
       pname = "lispbuilder-sdl-mixer";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-mixer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-mixer";
           asd = "lispbuilder-sdl-mixer";
         }
@@ -68796,12 +69605,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-mixer-binaries = (
     build-asdf-system {
       pname = "lispbuilder-sdl-mixer-binaries";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-mixer-binaries" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-mixer-binaries";
           asd = "lispbuilder-sdl-mixer-binaries";
         }
@@ -68816,12 +69625,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-mixer-cffi = (
     build-asdf-system {
       pname = "lispbuilder-sdl-mixer-cffi";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-mixer-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-mixer-cffi";
           asd = "lispbuilder-sdl-mixer-cffi";
         }
@@ -68840,12 +69649,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-mixer-examples = (
     build-asdf-system {
       pname = "lispbuilder-sdl-mixer-examples";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-mixer-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-mixer-examples";
           asd = "lispbuilder-sdl-mixer-examples";
         }
@@ -68864,12 +69673,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-ttf = (
     build-asdf-system {
       pname = "lispbuilder-sdl-ttf";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-ttf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-ttf";
           asd = "lispbuilder-sdl-ttf";
         }
@@ -68888,12 +69697,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-ttf-binaries = (
     build-asdf-system {
       pname = "lispbuilder-sdl-ttf-binaries";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-ttf-binaries" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-ttf-binaries";
           asd = "lispbuilder-sdl-ttf-binaries";
         }
@@ -68908,12 +69717,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-ttf-cffi = (
     build-asdf-system {
       pname = "lispbuilder-sdl-ttf-cffi";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-ttf-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-ttf-cffi";
           asd = "lispbuilder-sdl-ttf-cffi";
         }
@@ -68932,12 +69741,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-ttf-examples = (
     build-asdf-system {
       pname = "lispbuilder-sdl-ttf-examples";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-ttf-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-ttf-examples";
           asd = "lispbuilder-sdl-ttf-examples";
         }
@@ -68956,12 +69765,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-vecto = (
     build-asdf-system {
       pname = "lispbuilder-sdl-vecto";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-vecto" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-vecto";
           asd = "lispbuilder-sdl-vecto";
         }
@@ -68980,12 +69789,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-sdl-vecto-examples = (
     build-asdf-system {
       pname = "lispbuilder-sdl-vecto-examples";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-sdl-vecto-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-vecto-examples";
           asd = "lispbuilder-sdl-vecto-examples";
         }
@@ -69000,12 +69809,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-windows = (
     build-asdf-system {
       pname = "lispbuilder-windows";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-windows" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-windows";
           asd = "lispbuilder-windows";
         }
@@ -69020,12 +69829,12 @@ lib.makeScope pkgs.newScope (self: {
   lispbuilder-yacc = (
     build-asdf-system {
       pname = "lispbuilder-yacc";
-      version = "20210807-git";
+      version = "20250622-git";
       asds = [ "lispbuilder-yacc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz";
-          sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq";
+          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-yacc";
           asd = "lispbuilder-yacc";
         }
@@ -69340,12 +70149,12 @@ lib.makeScope pkgs.newScope (self: {
   lmdb = (
     build-asdf-system {
       pname = "lmdb";
-      version = "20230214-git";
+      version = "20250622-git";
       asds = [ "lmdb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lmdb/2023-02-14/lmdb-20230214-git.tgz";
-          sha256 = "1mccswfdgg7pxvnq3rds2zh0257853zqf81q4igfpjh5lhg3czgh";
+          url = "http://beta.quicklisp.org/archive/lmdb/2025-06-22/lmdb-20250622-git.tgz";
+          sha256 = "1k2pr6jqa9rnqxm94wvsl6cx7fra0bw3dp75z6d6x1mcjjla43bj";
           system = "lmdb";
           asd = "lmdb";
         }
@@ -69475,12 +70284,12 @@ lib.makeScope pkgs.newScope (self: {
   local-time = (
     build-asdf-system {
       pname = "local-time";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "local-time" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/local-time/2024-10-12/local-time-20241012-git.tgz";
-          sha256 = "0jb1mb5zs4ryiah8zjzhpln1z686mfmpmvg1phgpr2mh9vvlgjk2";
+          url = "http://beta.quicklisp.org/archive/local-time/2025-06-22/local-time-20250622-git.tgz";
+          sha256 = "1xdxm1js8n1b3k0g013s810hzf7jr6yhapyvj9agfyl7b6knj0kg";
           system = "local-time";
           asd = "local-time";
         }
@@ -69955,12 +70764,12 @@ lib.makeScope pkgs.newScope (self: {
   lru-cache = (
     build-asdf-system {
       pname = "lru-cache";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lru-cache" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lru-cache/2024-10-12/lru-cache-20241012-git.tgz";
-          sha256 = "035pl11j1l129akgf33w5c0b8c6gxw1xpj54r0fzxz3dw7cs8pg1";
+          url = "http://beta.quicklisp.org/archive/lru-cache/2025-06-22/lru-cache-20250622-git.tgz";
+          sha256 = "0nscrgkhzj1br9xgcxzrsr5pg4xcsv2l3736gxbba3wxlj4v2v3d";
           system = "lru-cache";
           asd = "lru-cache";
         }
@@ -69975,12 +70784,12 @@ lib.makeScope pkgs.newScope (self: {
   lru-cache-test = (
     build-asdf-system {
       pname = "lru-cache-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "lru-cache-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lru-cache/2024-10-12/lru-cache-20241012-git.tgz";
-          sha256 = "035pl11j1l129akgf33w5c0b8c6gxw1xpj54r0fzxz3dw7cs8pg1";
+          url = "http://beta.quicklisp.org/archive/lru-cache/2025-06-22/lru-cache-20250622-git.tgz";
+          sha256 = "0nscrgkhzj1br9xgcxzrsr5pg4xcsv2l3736gxbba3wxlj4v2v3d";
           system = "lru-cache-test";
           asd = "lru-cache-test";
         }
@@ -70099,15 +70908,63 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  luckless = (
+    build-asdf-system {
+      pname = "luckless";
+      version = "20250622-git";
+      asds = [ "luckless" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/luckless/2025-06-22/luckless-20250622-git.tgz";
+          sha256 = "1ajd6kzvdknl1wl2019aqajzr5v26b45fdgldky74m93piibznbn";
+          system = "luckless";
+          asd = "luckless";
+        }
+      );
+      systems = [ "luckless" ];
+      lispLibs = [
+        (getAttr "atomics" self)
+        (getAttr "documentation-utils" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  luckless-test = (
+    build-asdf-system {
+      pname = "luckless-test";
+      version = "20250622-git";
+      asds = [ "luckless-test" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/luckless/2025-06-22/luckless-20250622-git.tgz";
+          sha256 = "1ajd6kzvdknl1wl2019aqajzr5v26b45fdgldky74m93piibznbn";
+          system = "luckless-test";
+          asd = "luckless-test";
+        }
+      );
+      systems = [ "luckless-test" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "bordeaux-threads" self)
+        (getAttr "luckless" self)
+        (getAttr "parachute" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   lunamech-matrix-api = (
     build-asdf-system {
       pname = "lunamech-matrix-api";
-      version = "20230214-git";
+      version = "20250622-git";
       asds = [ "lunamech-matrix-api" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lunamech-matrix-api/2023-02-14/lunamech-matrix-api-20230214-git.tgz";
-          sha256 = "0a664qq4m5gk4iv5ck63gmsl3218jhjsalawklj56wn2pw0cf8a0";
+          url = "http://beta.quicklisp.org/archive/lunamech-matrix-api/2025-06-22/lunamech-matrix-api-20250622-git.tgz";
+          sha256 = "1ygdnwk1irnlfr6c3d07sqxwj2q74vpkd4hjjfvghr8v7kq4arpv";
           system = "lunamech-matrix-api";
           asd = "lunamech-matrix-api";
         }
@@ -70131,6 +70988,29 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  lunar-phases = (
+    build-asdf-system {
+      pname = "lunar-phases";
+      version = "20250622-git";
+      asds = [ "lunar-phases" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/lunar-phases/2025-06-22/lunar-phases-20250622-git.tgz";
+          sha256 = "02apr8ddrg7lq2vps49pn3jdy6kqhncz0qgfk53bl7ffjfxc0aw8";
+          system = "lunar-phases";
+          asd = "lunar-phases";
+        }
+      );
+      systems = [ "lunar-phases" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "local-time" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   lw-compat = (
     build-asdf-system {
       pname = "lw-compat";
@@ -70229,15 +71109,39 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  machine-measurements = (
+    build-asdf-system {
+      pname = "machine-measurements";
+      version = "20250622-git";
+      asds = [ "machine-measurements" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/machine-measurements/2025-06-22/machine-measurements-20250622-git.tgz";
+          sha256 = "0d2lhippyhyyzgp67vp8g30xx3r30vrbs1jpcl8wrmxzszyp4qg2";
+          system = "machine-measurements";
+          asd = "machine-measurements";
+        }
+      );
+      systems = [ "machine-measurements" ];
+      lispLibs = [
+        (getAttr "documentation-utils" self)
+        (getAttr "machine-state" self)
+        (getAttr "precise-time" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   machine-state = (
     build-asdf-system {
       pname = "machine-state";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "machine-state" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/machine-state/2024-10-12/machine-state-20241012-git.tgz";
-          sha256 = "1zmag6j9zfpnv9xfdjzb6dfg3jzvhandm1plyv50i619p0w0nagk";
+          url = "http://beta.quicklisp.org/archive/machine-state/2025-06-22/machine-state-20250622-git.tgz";
+          sha256 = "01hdfzlw9zp0r3vrsdapg7djvld3g5sdh6r33kap7qa2zmicbivf";
           system = "machine-state";
           asd = "machine-state";
         }
@@ -70582,12 +71486,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden = (
     build-asdf-system {
       pname = "maiden";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden";
           asd = "maiden";
         }
@@ -70613,12 +71517,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-accounts = (
     build-asdf-system {
       pname = "maiden-accounts";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-accounts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-accounts";
           asd = "maiden-accounts";
         }
@@ -70637,12 +71541,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-activatable = (
     build-asdf-system {
       pname = "maiden-activatable";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-activatable" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-activatable";
           asd = "maiden-activatable";
         }
@@ -70661,12 +71565,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-api-access = (
     build-asdf-system {
       pname = "maiden-api-access";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-api-access" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-api-access";
           asd = "maiden-api-access";
         }
@@ -70686,12 +71590,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-blocker = (
     build-asdf-system {
       pname = "maiden-blocker";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-blocker" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-blocker";
           asd = "maiden-blocker";
         }
@@ -70711,12 +71615,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-channel-relay = (
     build-asdf-system {
       pname = "maiden-channel-relay";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-channel-relay" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-channel-relay";
           asd = "maiden-channel-relay";
         }
@@ -70735,12 +71639,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-chatlog = (
     build-asdf-system {
       pname = "maiden-chatlog";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-chatlog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-chatlog";
           asd = "maiden-chatlog";
         }
@@ -70762,12 +71666,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-client-entities = (
     build-asdf-system {
       pname = "maiden-client-entities";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-client-entities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-client-entities";
           asd = "maiden-client-entities";
         }
@@ -70785,12 +71689,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-commands = (
     build-asdf-system {
       pname = "maiden-commands";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-commands" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-commands";
           asd = "maiden-commands";
         }
@@ -70809,12 +71713,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-core-manager = (
     build-asdf-system {
       pname = "maiden-core-manager";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-core-manager" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-core-manager";
           asd = "maiden-core-manager";
         }
@@ -70833,12 +71737,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-counter = (
     build-asdf-system {
       pname = "maiden-counter";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-counter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-counter";
           asd = "maiden-counter";
         }
@@ -70859,12 +71763,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-crimes = (
     build-asdf-system {
       pname = "maiden-crimes";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-crimes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-crimes";
           asd = "maiden-crimes";
         }
@@ -70886,12 +71790,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-dictionary = (
     build-asdf-system {
       pname = "maiden-dictionary";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-dictionary" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-dictionary";
           asd = "maiden-dictionary";
         }
@@ -70911,12 +71815,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-emoticon = (
     build-asdf-system {
       pname = "maiden-emoticon";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-emoticon" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-emoticon";
           asd = "maiden-emoticon";
         }
@@ -70937,12 +71841,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-help = (
     build-asdf-system {
       pname = "maiden-help";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-help" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-help";
           asd = "maiden-help";
         }
@@ -70961,12 +71865,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-irc = (
     build-asdf-system {
       pname = "maiden-irc";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-irc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-irc";
           asd = "maiden-irc";
         }
@@ -70989,12 +71893,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-lastfm = (
     build-asdf-system {
       pname = "maiden-lastfm";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-lastfm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-lastfm";
           asd = "maiden-lastfm";
         }
@@ -71015,12 +71919,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-lichat = (
     build-asdf-system {
       pname = "maiden-lichat";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-lichat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-lichat";
           asd = "maiden-lichat";
         }
@@ -71039,12 +71943,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-location = (
     build-asdf-system {
       pname = "maiden-location";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-location" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-location";
           asd = "maiden-location";
         }
@@ -71064,12 +71968,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-lookup = (
     build-asdf-system {
       pname = "maiden-lookup";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-lookup" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-lookup";
           asd = "maiden-lookup";
         }
@@ -71091,12 +71995,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-markov = (
     build-asdf-system {
       pname = "maiden-markov";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-markov" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-markov";
           asd = "maiden-markov";
         }
@@ -71121,12 +72025,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-medals = (
     build-asdf-system {
       pname = "maiden-medals";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-medals" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-medals";
           asd = "maiden-medals";
         }
@@ -71147,12 +72051,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-networking = (
     build-asdf-system {
       pname = "maiden-networking";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-networking" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-networking";
           asd = "maiden-networking";
         }
@@ -71171,12 +72075,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-notify = (
     build-asdf-system {
       pname = "maiden-notify";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-notify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-notify";
           asd = "maiden-notify";
         }
@@ -71196,12 +72100,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-permissions = (
     build-asdf-system {
       pname = "maiden-permissions";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-permissions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-permissions";
           asd = "maiden-permissions";
         }
@@ -71222,12 +72126,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-relay = (
     build-asdf-system {
       pname = "maiden-relay";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-relay" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-relay";
           asd = "maiden-relay";
         }
@@ -71245,12 +72149,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-serialize = (
     build-asdf-system {
       pname = "maiden-serialize";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-serialize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-serialize";
           asd = "maiden-serialize";
         }
@@ -71269,12 +72173,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-silly = (
     build-asdf-system {
       pname = "maiden-silly";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-silly" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-silly";
           asd = "maiden-silly";
         }
@@ -71297,12 +72201,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-storage = (
     build-asdf-system {
       pname = "maiden-storage";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-storage" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-storage";
           asd = "maiden-storage";
         }
@@ -71321,12 +72225,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-talk = (
     build-asdf-system {
       pname = "maiden-talk";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-talk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-talk";
           asd = "maiden-talk";
         }
@@ -71348,12 +72252,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-throttle = (
     build-asdf-system {
       pname = "maiden-throttle";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-throttle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-throttle";
           asd = "maiden-throttle";
         }
@@ -71372,12 +72276,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-time = (
     build-asdf-system {
       pname = "maiden-time";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-time" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-time";
           asd = "maiden-time";
         }
@@ -71397,12 +72301,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-trivia = (
     build-asdf-system {
       pname = "maiden-trivia";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-trivia" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-trivia";
           asd = "maiden-trivia";
         }
@@ -71422,12 +72326,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-twitter = (
     build-asdf-system {
       pname = "maiden-twitter";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-twitter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-twitter";
           asd = "maiden-twitter";
         }
@@ -71445,12 +72349,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-urlinfo = (
     build-asdf-system {
       pname = "maiden-urlinfo";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-urlinfo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-urlinfo";
           asd = "maiden-urlinfo";
         }
@@ -71472,12 +72376,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-vote = (
     build-asdf-system {
       pname = "maiden-vote";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-vote" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-vote";
           asd = "maiden-vote";
         }
@@ -71496,12 +72400,12 @@ lib.makeScope pkgs.newScope (self: {
   maiden-weather = (
     build-asdf-system {
       pname = "maiden-weather";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maiden-weather" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz";
-          sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd";
+          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-weather";
           asd = "maiden-weather";
         }
@@ -71658,12 +72562,12 @@ lib.makeScope pkgs.newScope (self: {
   manifolds = (
     build-asdf-system {
       pname = "manifolds";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "manifolds" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/manifolds/2024-10-12/manifolds-20241012-git.tgz";
-          sha256 = "1q9hy2k1xabf8whnyxjiaqypbnbq84q94z1gmqgicxyzn7h3ybw4";
+          url = "http://beta.quicklisp.org/archive/manifolds/2025-06-22/manifolds-20250622-git.tgz";
+          sha256 = "0gygnblkd8x134lanj535mi14r5xgdp4kzv7g8a1l8p2drqqwrhw";
           system = "manifolds";
           asd = "manifolds";
         }
@@ -71679,30 +72583,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  manifolds-test = (
-    build-asdf-system {
-      pname = "manifolds-test";
-      version = "20241012-git";
-      asds = [ "manifolds-test" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/manifolds/2024-10-12/manifolds-20241012-git.tgz";
-          sha256 = "1q9hy2k1xabf8whnyxjiaqypbnbq84q94z1gmqgicxyzn7h3ybw4";
-          system = "manifolds-test";
-          asd = "manifolds-test";
-        }
-      );
-      systems = [ "manifolds-test" ];
-      lispLibs = [
-        (getAttr "cl-wavefront" self)
-        (getAttr "manifolds" self)
-        (getAttr "parachute" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   map-bind = (
     build-asdf-system {
       pname = "map-bind";
@@ -71857,12 +72737,12 @@ lib.makeScope pkgs.newScope (self: {
   markup = (
     build-asdf-system {
       pname = "markup";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "markup" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/markup/2023-06-18/markup-20230618-git.tgz";
-          sha256 = "1paj76r1bfq4pr6m6j1mgik8b97sl2zgzy7rvvwwfrs2j1mf8byd";
+          url = "http://beta.quicklisp.org/archive/markup/2025-06-22/markup-20250622-git.tgz";
+          sha256 = "0hdi195jxv103zq7iwmhwka3whv33slvkzzzh17csan6d071qlf9";
           system = "markup";
           asd = "markup";
         }
@@ -71879,29 +72759,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  markup_dot_test = (
-    build-asdf-system {
-      pname = "markup.test";
-      version = "20230618-git";
-      asds = [ "markup.test" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/markup/2023-06-18/markup-20230618-git.tgz";
-          sha256 = "1paj76r1bfq4pr6m6j1mgik8b97sl2zgzy7rvvwwfrs2j1mf8byd";
-          system = "markup.test";
-          asd = "markup.test";
-        }
-      );
-      systems = [ "markup.test" ];
-      lispLibs = [
-        (getAttr "fiveam" self)
-        (getAttr "markup" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   marshal = (
     build-asdf-system {
       pname = "marshal";
@@ -71946,12 +72803,12 @@ lib.makeScope pkgs.newScope (self: {
   math = (
     build-asdf-system {
       pname = "math";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "math" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/math/2024-10-12/math-20241012-git.tgz";
-          sha256 = "104rga7fqq3xvdxryhmgdq8zygd00zk5xb05glwqw01ygl3bc0r3";
+          url = "http://beta.quicklisp.org/archive/math/2025-06-22/math-20250622-git.tgz";
+          sha256 = "1rgx28m2cjp7bmrnmdhl4f74sdwvs6f4n15699hqhds3p11yk4r8";
           system = "math";
           asd = "math";
         }
@@ -72055,12 +72912,12 @@ lib.makeScope pkgs.newScope (self: {
   maxpc-apache = (
     build-asdf-system {
       pname = "maxpc-apache";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maxpc-apache" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "maxpc-apache";
           asd = "maxpc-apache";
         }
@@ -72075,12 +72932,12 @@ lib.makeScope pkgs.newScope (self: {
   maxpc-apache-test = (
     build-asdf-system {
       pname = "maxpc-apache-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "maxpc-apache-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "maxpc-apache-test";
           asd = "maxpc-apache-test";
         }
@@ -72181,12 +73038,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim = (
     build-asdf-system {
       pname = "mcclim";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim";
           asd = "mcclim";
         }
@@ -72212,12 +73069,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-bezier = (
     build-asdf-system {
       pname = "mcclim-bezier";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-bezier" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-bezier";
           asd = "mcclim-bezier";
         }
@@ -72240,12 +73097,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-bitmaps = (
     build-asdf-system {
       pname = "mcclim-bitmaps";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-bitmaps" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-bitmaps";
           asd = "mcclim-bitmaps";
         }
@@ -72263,12 +73120,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-clx = (
     build-asdf-system {
       pname = "mcclim-clx";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-clx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-clx";
           asd = "mcclim-clx";
         }
@@ -72296,12 +73153,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-clx-fb = (
     build-asdf-system {
       pname = "mcclim-clx-fb";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-clx-fb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-clx-fb";
           asd = "mcclim-clx-fb";
         }
@@ -72319,12 +73176,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-dot = (
     build-asdf-system {
       pname = "mcclim-dot";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-dot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-dot";
           asd = "mcclim-dot";
         }
@@ -72347,12 +73204,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-fontconfig = (
     build-asdf-system {
       pname = "mcclim-fontconfig";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-fontconfig" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-fontconfig";
           asd = "mcclim-fontconfig";
         }
@@ -72371,12 +73228,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-fonts = (
     build-asdf-system {
       pname = "mcclim-fonts";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-fonts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-fonts";
           asd = "mcclim-fonts";
         }
@@ -72391,12 +73248,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-franz = (
     build-asdf-system {
       pname = "mcclim-franz";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-franz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-franz";
           asd = "mcclim-franz";
         }
@@ -72411,12 +73268,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-harfbuzz = (
     build-asdf-system {
       pname = "mcclim-harfbuzz";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-harfbuzz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-harfbuzz";
           asd = "mcclim-harfbuzz";
         }
@@ -72436,12 +73293,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-layouts = (
     build-asdf-system {
       pname = "mcclim-layouts";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-layouts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-layouts";
           asd = "mcclim-layouts";
         }
@@ -72456,12 +73313,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-null = (
     build-asdf-system {
       pname = "mcclim-null";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-null" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-null";
           asd = "mcclim-null";
         }
@@ -72476,12 +73333,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-raster-image = (
     build-asdf-system {
       pname = "mcclim-raster-image";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-raster-image" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-raster-image";
           asd = "mcclim-raster-image";
         }
@@ -72499,12 +73356,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-render = (
     build-asdf-system {
       pname = "mcclim-render";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-render" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-render";
           asd = "mcclim-render";
         }
@@ -72528,12 +73385,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-svg = (
     build-asdf-system {
       pname = "mcclim-svg";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-svg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-svg";
           asd = "mcclim-svg";
         }
@@ -72561,12 +73418,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-tooltips = (
     build-asdf-system {
       pname = "mcclim-tooltips";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-tooltips" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-tooltips";
           asd = "mcclim-tooltips";
         }
@@ -72581,12 +73438,12 @@ lib.makeScope pkgs.newScope (self: {
   mcclim-tree-with-cross-edges = (
     build-asdf-system {
       pname = "mcclim-tree-with-cross-edges";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mcclim-tree-with-cross-edges" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-tree-with-cross-edges";
           asd = "mcclim-tree-with-cross-edges";
         }
@@ -72687,12 +73544,12 @@ lib.makeScope pkgs.newScope (self: {
   memory-regions = (
     build-asdf-system {
       pname = "memory-regions";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "memory-regions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/memory-regions/2024-10-12/memory-regions-20241012-git.tgz";
-          sha256 = "0j2qfbh2kwl8k6v0h0pbh5hml8aia888kaq4kgb12nfslim81iyd";
+          url = "http://beta.quicklisp.org/archive/memory-regions/2025-06-22/memory-regions-20250622-git.tgz";
+          sha256 = "1a4w7h4bciszdk9m3yc1n20kawnxbplrxh3qy2l53x8qp20ydsp5";
           system = "memory-regions";
           asd = "memory-regions";
         }
@@ -72735,12 +73592,12 @@ lib.makeScope pkgs.newScope (self: {
   messagebox = (
     build-asdf-system {
       pname = "messagebox";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "messagebox" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/messagebox/2024-10-12/messagebox-20241012-git.tgz";
-          sha256 = "0wf25rfx7vg0l1mnzjjzwjqcjaa96a95k9diijppn7y9v2knr1qq";
+          url = "http://beta.quicklisp.org/archive/messagebox/2025-06-22/messagebox-20250622-git.tgz";
+          sha256 = "197bfxh4w7m967chsbv76qf65r9z7m7fi16b76g8l5vdpf9v6aaw";
           system = "messagebox";
           asd = "messagebox";
         }
@@ -73234,12 +74091,12 @@ lib.makeScope pkgs.newScope (self: {
   mgl = (
     build-asdf-system {
       pname = "mgl";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "mgl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl/2023-06-18/mgl-20230618-git.tgz";
-          sha256 = "1jr2jill9b1rq0msy0bzzl0q2w0bm3gpd0dwrmkyazzjym2rdsjx";
+          url = "http://beta.quicklisp.org/archive/mgl/2025-06-22/mgl-20250622-git.tgz";
+          sha256 = "04c7cy77a7h6chj7f8y3bnk0hm832pfki9yf2rm4vni6jm7qmcrf";
           system = "mgl";
           asd = "mgl";
         }
@@ -73265,12 +74122,12 @@ lib.makeScope pkgs.newScope (self: {
   mgl-example = (
     build-asdf-system {
       pname = "mgl-example";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "mgl-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl/2023-06-18/mgl-20230618-git.tgz";
-          sha256 = "1jr2jill9b1rq0msy0bzzl0q2w0bm3gpd0dwrmkyazzjym2rdsjx";
+          url = "http://beta.quicklisp.org/archive/mgl/2025-06-22/mgl-20250622-git.tgz";
+          sha256 = "04c7cy77a7h6chj7f8y3bnk0hm832pfki9yf2rm4vni6jm7qmcrf";
           system = "mgl-example";
           asd = "mgl-example";
         }
@@ -73285,12 +74142,12 @@ lib.makeScope pkgs.newScope (self: {
   mgl-gnuplot = (
     build-asdf-system {
       pname = "mgl-gnuplot";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "mgl-gnuplot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl/2023-06-18/mgl-20230618-git.tgz";
-          sha256 = "1jr2jill9b1rq0msy0bzzl0q2w0bm3gpd0dwrmkyazzjym2rdsjx";
+          url = "http://beta.quicklisp.org/archive/mgl/2025-06-22/mgl-20250622-git.tgz";
+          sha256 = "04c7cy77a7h6chj7f8y3bnk0hm832pfki9yf2rm4vni6jm7qmcrf";
           system = "mgl-gnuplot";
           asd = "mgl-gnuplot";
         }
@@ -73305,15 +74162,38 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  mgl-gpr = (
+    build-asdf-system {
+      pname = "mgl-gpr";
+      version = "20250622-git";
+      asds = [ "mgl-gpr" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/mgl-gpr/2025-06-22/mgl-gpr-20250622-git.tgz";
+          sha256 = "1y505j39b1gp6zfsmhz56aqnrif16h42wwrwl8778ailamq15zsv";
+          system = "mgl-gpr";
+          asd = "mgl-gpr";
+        }
+      );
+      systems = [ "mgl-gpr" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "mgl-pax" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   mgl-mat = (
     build-asdf-system {
       pname = "mgl-mat";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "mgl-mat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-mat/2023-10-21/mgl-mat-20231021-git.tgz";
-          sha256 = "0pl9ksdjr57sg2w85ql6y9pgbzrxcsz6irb7i0s1q3d08f87il1i";
+          url = "http://beta.quicklisp.org/archive/mgl-mat/2025-06-22/mgl-mat-20250622-git.tgz";
+          sha256 = "0bd0dcapmg22w8l37gdc3l5pglbhka5qnla4yd91gc4k01jh6pkd";
           system = "mgl-mat";
           asd = "mgl-mat";
         }
@@ -73339,12 +74219,12 @@ lib.makeScope pkgs.newScope (self: {
   mgl-pax = (
     build-asdf-system {
       pname = "mgl-pax";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mgl-pax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz";
-          sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0";
+          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
           system = "mgl-pax";
           asd = "mgl-pax";
         }
@@ -73363,18 +74243,21 @@ lib.makeScope pkgs.newScope (self: {
   mgl-pax-bootstrap = (
     build-asdf-system {
       pname = "mgl-pax-bootstrap";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mgl-pax-bootstrap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz";
-          sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0";
+          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
           system = "mgl-pax-bootstrap";
           asd = "mgl-pax-bootstrap";
         }
       );
       systems = [ "mgl-pax-bootstrap" ];
-      lispLibs = [ (getAttr "mgl-pax_dot_asdf" self) ];
+      lispLibs = [
+        (getAttr "autoload" self)
+        (getAttr "mgl-pax_dot_asdf" self)
+      ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -73383,12 +74266,12 @@ lib.makeScope pkgs.newScope (self: {
   mgl-pax-test = (
     build-asdf-system {
       pname = "mgl-pax-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mgl-pax-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz";
-          sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0";
+          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
           system = "mgl-pax-test";
           asd = "mgl-pax-test";
         }
@@ -73397,10 +74280,12 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "_3bmd" self)
         (getAttr "_3bmd-ext-code-blocks" self)
+        (getAttr "_3bmd-ext-math" self)
         (getAttr "alexandria" self)
         (getAttr "colorize" self)
         (getAttr "dref" self)
         (getAttr "dref-test" self)
+        (getAttr "hunchentoot" self)
         (getAttr "md5" self)
         (getAttr "mgl-pax" self)
         (getAttr "mgl-pax_dot_asdf" self)
@@ -73416,12 +74301,12 @@ lib.makeScope pkgs.newScope (self: {
   mgl-pax_dot_asdf = (
     build-asdf-system {
       pname = "mgl-pax.asdf";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mgl-pax.asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz";
-          sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0";
+          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
           system = "mgl-pax.asdf";
           asd = "mgl-pax.asdf";
         }
@@ -73456,12 +74341,12 @@ lib.makeScope pkgs.newScope (self: {
   micmac = (
     build-asdf-system {
       pname = "micmac";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "micmac" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/micmac/2023-06-18/micmac-20230618-git.tgz";
-          sha256 = "10zjxqc7y5spr3y5yrnfqmv881ia168scbhiq8i98rvizabgxf6x";
+          url = "http://beta.quicklisp.org/archive/micmac/2025-06-22/micmac-20250622-git.tgz";
+          sha256 = "1xm0smgbsmlkyp3zc48s1zziv6irbf3ahvq3j1dchdrkfwrwbqhi";
           system = "micmac";
           asd = "micmac";
         }
@@ -73660,12 +74545,12 @@ lib.makeScope pkgs.newScope (self: {
   misc-extensions = (
     build-asdf-system {
       pname = "misc-extensions";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "misc-extensions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/misc-extensions/2024-10-12/misc-extensions-20241012-git.tgz";
-          sha256 = "0pvgg376vkydp2831bnnvwrv27m4ivc78c0nhvb4848c3ik1hn5j";
+          url = "http://beta.quicklisp.org/archive/misc-extensions/2025-06-22/misc-extensions-20250622-git.tgz";
+          sha256 = "168gi0d77rqh2nl1v8h3sj2ajjc9dk2imgbbir4y5v10915mzb6l";
           system = "misc-extensions";
           asd = "misc-extensions";
         }
@@ -73678,12 +74563,12 @@ lib.makeScope pkgs.newScope (self: {
   mito = (
     build-asdf-system {
       pname = "mito";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mito" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz";
-          sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3";
+          url = "http://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
+          sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096";
           system = "mito";
           asd = "mito";
         }
@@ -73732,12 +74617,12 @@ lib.makeScope pkgs.newScope (self: {
   mito-auth = (
     build-asdf-system {
       pname = "mito-auth";
-      version = "20171019-git";
+      version = "20250622-git";
       asds = [ "mito-auth" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mito-auth/2017-10-19/mito-auth-20171019-git.tgz";
-          sha256 = "1q1yxjpnshzmia34a68dlscjadzynzyzz14sr4mkkkjyg5dhkazi";
+          url = "http://beta.quicklisp.org/archive/mito-auth/2025-06-22/mito-auth-20250622-git.tgz";
+          sha256 = "1xffrhlihkn1mckyxrxz5kjy44y85vbyrhdzg7iaixy5qf742b45";
           system = "mito-auth";
           asd = "mito-auth";
         }
@@ -73756,12 +74641,12 @@ lib.makeScope pkgs.newScope (self: {
   mito-core = (
     build-asdf-system {
       pname = "mito-core";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mito-core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz";
-          sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3";
+          url = "http://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
+          sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096";
           system = "mito-core";
           asd = "mito-core";
         }
@@ -73786,12 +74671,12 @@ lib.makeScope pkgs.newScope (self: {
   mito-migration = (
     build-asdf-system {
       pname = "mito-migration";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mito-migration" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz";
-          sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3";
+          url = "http://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
+          sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096";
           system = "mito-migration";
           asd = "mito-migration";
         }
@@ -73814,12 +74699,12 @@ lib.makeScope pkgs.newScope (self: {
   mito-test = (
     build-asdf-system {
       pname = "mito-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mito-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz";
-          sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3";
+          url = "http://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
+          sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096";
           system = "mito-test";
           asd = "mito-test";
         }
@@ -73840,12 +74725,12 @@ lib.makeScope pkgs.newScope (self: {
   mixalot = (
     build-asdf-system {
       pname = "mixalot";
-      version = "20151218-git";
+      version = "20250622-git";
       asds = [ "mixalot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz";
-          sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9";
+          url = "http://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
+          sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb";
           system = "mixalot";
           asd = "mixalot";
         }
@@ -73864,12 +74749,12 @@ lib.makeScope pkgs.newScope (self: {
   mixalot-flac = (
     build-asdf-system {
       pname = "mixalot-flac";
-      version = "20151218-git";
+      version = "20250622-git";
       asds = [ "mixalot-flac" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz";
-          sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9";
+          url = "http://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
+          sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb";
           system = "mixalot-flac";
           asd = "mixalot-flac";
         }
@@ -73888,12 +74773,12 @@ lib.makeScope pkgs.newScope (self: {
   mixalot-mp3 = (
     build-asdf-system {
       pname = "mixalot-mp3";
-      version = "20151218-git";
+      version = "20250622-git";
       asds = [ "mixalot-mp3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz";
-          sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9";
+          url = "http://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
+          sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb";
           system = "mixalot-mp3";
           asd = "mixalot-mp3";
         }
@@ -73912,12 +74797,12 @@ lib.makeScope pkgs.newScope (self: {
   mixalot-vorbis = (
     build-asdf-system {
       pname = "mixalot-vorbis";
-      version = "20151218-git";
+      version = "20250622-git";
       asds = [ "mixalot-vorbis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz";
-          sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9";
+          url = "http://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
+          sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb";
           system = "mixalot-vorbis";
           asd = "mixalot-vorbis";
         }
@@ -73936,12 +74821,12 @@ lib.makeScope pkgs.newScope (self: {
   mk-defsystem = (
     build-asdf-system {
       pname = "mk-defsystem";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mk-defsystem" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mk-defsystem/2024-10-12/mk-defsystem-20241012-git.tgz";
-          sha256 = "0zrr11szr50bqaxybm66ggj5bmchwljjafhxcwsyzgpqbnf06740";
+          url = "http://beta.quicklisp.org/archive/mk-defsystem/2025-06-22/mk-defsystem-20250622-git.tgz";
+          sha256 = "08dkr53ganqikg33a3b30zn8267bphx8mzmdl4302ri29srr0a1r";
           system = "mk-defsystem";
           asd = "mk-defsystem";
         }
@@ -74108,12 +74993,12 @@ lib.makeScope pkgs.newScope (self: {
   mmap = (
     build-asdf-system {
       pname = "mmap";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mmap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mmap/2024-10-12/mmap-20241012-git.tgz";
-          sha256 = "1wlxymkkbjyyp6fikxi94q26pjfz656y4d8kgm22xxvw70hppgc3";
+          url = "http://beta.quicklisp.org/archive/mmap/2025-06-22/mmap-20250622-git.tgz";
+          sha256 = "1s233i80ja9xfk820x4yjccbbqh6llc90n4lmkjglrk4jjk28x1h";
           system = "mmap";
           asd = "mmap";
         }
@@ -74122,6 +75007,7 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "cffi" self)
         (getAttr "documentation-utils" self)
+        (getAttr "pathname-utils" self)
         (getAttr "trivial-features" self)
       ];
       meta = { };
@@ -74130,12 +75016,12 @@ lib.makeScope pkgs.newScope (self: {
   mmap-test = (
     build-asdf-system {
       pname = "mmap-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mmap-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mmap/2024-10-12/mmap-20241012-git.tgz";
-          sha256 = "1wlxymkkbjyyp6fikxi94q26pjfz656y4d8kgm22xxvw70hppgc3";
+          url = "http://beta.quicklisp.org/archive/mmap/2025-06-22/mmap-20250622-git.tgz";
+          sha256 = "1s233i80ja9xfk820x4yjccbbqh6llc90n4lmkjglrk4jjk28x1h";
           system = "mmap-test";
           asd = "mmap-test";
         }
@@ -74198,12 +75084,12 @@ lib.makeScope pkgs.newScope (self: {
   mnas-package = (
     build-asdf-system {
       pname = "mnas-package";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mnas-package" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mnas-package/2024-10-12/mnas-package-20241012-git.tgz";
-          sha256 = "05wkh2rzlp3csnk3p50rp3jv4jycdqa5hylqf93b2q8vjxvv67wm";
+          url = "http://beta.quicklisp.org/archive/mnas-package/2025-06-22/mnas-package-20250622-git.tgz";
+          sha256 = "0l3c7kabql49jnf213vgp9kh62k68ph62lm7l55a5s3w5xdlx0l9";
           system = "mnas-package";
           asd = "mnas-package";
         }
@@ -74225,12 +75111,12 @@ lib.makeScope pkgs.newScope (self: {
   mnas-path = (
     build-asdf-system {
       pname = "mnas-path";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "mnas-path" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mnas-path/2023-10-21/mnas-path-20231021-git.tgz";
-          sha256 = "10hijr71nlnl9wf15ahzjgynvq1n1y8446fxk7pkfwcw832x874z";
+          url = "http://beta.quicklisp.org/archive/mnas-path/2025-06-22/mnas-path-20250622-git.tgz";
+          sha256 = "0lkgxk7kacy6c7x6sy1ykfpjqr945721fvjgjvlxndf4xhja6vl8";
           system = "mnas-path";
           asd = "mnas-path";
         }
@@ -74248,12 +75134,12 @@ lib.makeScope pkgs.newScope (self: {
   mnas-string = (
     build-asdf-system {
       pname = "mnas-string";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mnas-string" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mnas-string/2024-10-12/mnas-string-20241012-git.tgz";
-          sha256 = "1pk0fyi3pjq7h9x40hixapsa06s0dah6xd4d63jpyhp7y6fa8w6f";
+          url = "http://beta.quicklisp.org/archive/mnas-string/2025-06-22/mnas-string-20250622-git.tgz";
+          sha256 = "02j1ix03bgijd0x9jiibkadx3dmb3sr76q2b00hl8ffl7gk2hk8n";
           system = "mnas-string";
           asd = "mnas-string";
         }
@@ -74503,12 +75389,12 @@ lib.makeScope pkgs.newScope (self: {
   modularize = (
     build-asdf-system {
       pname = "modularize";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "modularize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/modularize/2023-10-21/modularize-20231021-git.tgz";
-          sha256 = "1i660gpljl97j51sj4mx8pk91v96zddww24rbwz0p20cl9hfp0xj";
+          url = "http://beta.quicklisp.org/archive/modularize/2025-06-22/modularize-20250622-git.tgz";
+          sha256 = "01ybc1mizn9xaxb2dbvvw8qvwwcz47kx0hma2nlq3kw8v7par58y";
           system = "modularize";
           asd = "modularize";
         }
@@ -74526,12 +75412,12 @@ lib.makeScope pkgs.newScope (self: {
   modularize-hooks = (
     build-asdf-system {
       pname = "modularize-hooks";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "modularize-hooks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/modularize-hooks/2023-10-21/modularize-hooks-20231021-git.tgz";
-          sha256 = "0f60rk9753vil56wyi54db35ffanjw5fmkyn79jc5hnlab78ffhy";
+          url = "http://beta.quicklisp.org/archive/modularize-hooks/2025-06-22/modularize-hooks-20250622-git.tgz";
+          sha256 = "0gqb217j7hgdsqzq9dbqb9wf2wp3vf1iijivixdkmbvl27d5jxmp";
           system = "modularize-hooks";
           asd = "modularize-hooks";
         }
@@ -74576,12 +75462,12 @@ lib.makeScope pkgs.newScope (self: {
   modularize-test-module = (
     build-asdf-system {
       pname = "modularize-test-module";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "modularize-test-module" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/modularize/2023-10-21/modularize-20231021-git.tgz";
-          sha256 = "1i660gpljl97j51sj4mx8pk91v96zddww24rbwz0p20cl9hfp0xj";
+          url = "http://beta.quicklisp.org/archive/modularize/2025-06-22/modularize-20250622-git.tgz";
+          sha256 = "01ybc1mizn9xaxb2dbvvw8qvwwcz47kx0hma2nlq3kw8v7par58y";
           system = "modularize-test-module";
           asd = "modularize-test-module";
         }
@@ -74835,12 +75721,12 @@ lib.makeScope pkgs.newScope (self: {
   more-conditions = (
     build-asdf-system {
       pname = "more-conditions";
-      version = "20180831-git";
+      version = "20250622-git";
       asds = [ "more-conditions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz";
-          sha256 = "1n0xbz0yiqn9dxf0ycm57wqvsr4gh2q4hs5fskjbv87c47d7l7zr";
+          url = "http://beta.quicklisp.org/archive/more-conditions/2025-06-22/more-conditions-20250622-git.tgz";
+          sha256 = "12fahmb84g3dabjg0rqxxnv23f4kzfyink1mn9bdvr8m41mr04nm";
           system = "more-conditions";
           asd = "more-conditions";
         }
@@ -74920,12 +75806,12 @@ lib.makeScope pkgs.newScope (self: {
   mpg123-ffi = (
     build-asdf-system {
       pname = "mpg123-ffi";
-      version = "20151218-git";
+      version = "20250622-git";
       asds = [ "mpg123-ffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz";
-          sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9";
+          url = "http://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
+          sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb";
           system = "mpg123-ffi";
           asd = "mpg123-ffi";
         }
@@ -75063,12 +75949,12 @@ lib.makeScope pkgs.newScope (self: {
   multilang-documentation = (
     build-asdf-system {
       pname = "multilang-documentation";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "multilang-documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/multilang-documentation/2023-10-21/multilang-documentation-20231021-git.tgz";
-          sha256 = "1v9sv81lx0ms9djz0hqhwdswg0rmzqv47g57k5jmzkx6lbjsya7z";
+          url = "http://beta.quicklisp.org/archive/multilang-documentation/2025-06-22/multilang-documentation-20250622-git.tgz";
+          sha256 = "1bhb1vqgahj5nw5rb4y8c22ksh10h12zn5y8qkpz772j3dnnxhhn";
           system = "multilang-documentation";
           asd = "multilang-documentation";
         }
@@ -75087,12 +75973,12 @@ lib.makeScope pkgs.newScope (self: {
   multilang-documentation-utils = (
     build-asdf-system {
       pname = "multilang-documentation-utils";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "multilang-documentation-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/documentation-utils/2023-10-21/documentation-utils-20231021-git.tgz";
-          sha256 = "0nzkjzvcqi1l2ywiz17h1f54vgvbkywv95in4yww6lyzqjqsqqhy";
+          url = "http://beta.quicklisp.org/archive/documentation-utils/2025-06-22/documentation-utils-20250622-git.tgz";
+          sha256 = "1rmb9m3rilj5c4cr7bn5gnx1wrksi85zizp4hr7409qzg345mg7l";
           system = "multilang-documentation-utils";
           asd = "multilang-documentation-utils";
         }
@@ -75219,18 +76105,22 @@ lib.makeScope pkgs.newScope (self: {
   music-spelling = (
     build-asdf-system {
       pname = "music-spelling";
-      version = "20230214-git";
+      version = "20250622-git";
       asds = [ "music-spelling" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/music-spelling/2023-02-14/music-spelling-20230214-git.tgz";
-          sha256 = "0fgahb0jjr4sp2739d55gylmx8alsghnx3spyaqfqci4cxfrys52";
+          url = "http://beta.quicklisp.org/archive/music-spelling/2025-06-22/music-spelling-20250622-git.tgz";
+          sha256 = "0f2ygh46mq7wh1wvnyqfb7lc8i36rs1d63siajqv3mpfja6h7z7p";
           system = "music-spelling";
           asd = "music-spelling";
         }
       );
       systems = [ "music-spelling" ];
-      lispLibs = [ (getAttr "alexandria" self) ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "cl-ppcre" self)
+        (getAttr "parse-float" self)
+      ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -75239,12 +76129,12 @@ lib.makeScope pkgs.newScope (self: {
   mutility = (
     build-asdf-system {
       pname = "mutility";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mutility" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mutility/2024-10-12/mutility-20241012-git.tgz";
-          sha256 = "17ip4rkvval66k9r3a2hvpr4pqa087b3rqjdayl115fi6bfzncr4";
+          url = "http://beta.quicklisp.org/archive/mutility/2025-06-22/mutility-20250622-git.tgz";
+          sha256 = "1vzcns6wsddd3jmy7kxs6gv27nhqncmpxc68xpikdznsm20qn9kb";
           system = "mutility";
           asd = "mutility";
         }
@@ -75263,12 +76153,12 @@ lib.makeScope pkgs.newScope (self: {
   mutils = (
     build-asdf-system {
       pname = "mutils";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "mutils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mutils/2024-10-12/mutils-20241012-git.tgz";
-          sha256 = "1xmqms002bafrdrpzgqq5dr0qfiywg3p7mhvb6xny1jrk3qdqz75";
+          url = "http://beta.quicklisp.org/archive/mutils/2025-06-22/mutils-20250622-git.tgz";
+          sha256 = "03inzkq60rbn0bskviqkx7n6akg7fjyvv1cnxnd85wjan3qssw0b";
           system = "mutils";
           asd = "mutils";
         }
@@ -75635,12 +76525,12 @@ lib.makeScope pkgs.newScope (self: {
   named-closure = (
     build-asdf-system {
       pname = "named-closure";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "named-closure" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/named-closure/2024-10-12/named-closure-20241012-git.tgz";
-          sha256 = "1ja7lvid589n3r25vh7j21wji60dm2qika2jn51jvfbbii853x09";
+          url = "http://beta.quicklisp.org/archive/named-closure/2025-06-22/named-closure-20250622-git.tgz";
+          sha256 = "17lpslk7amh9pghjpjdnd1aj50r1kdc4iyai2h2xas7wampg5xf5";
           system = "named-closure";
           asd = "named-closure";
         }
@@ -75649,8 +76539,9 @@ lib.makeScope pkgs.newScope (self: {
       lispLibs = [
         (getAttr "alexandria" self)
         (getAttr "closer-mop" self)
-        (getAttr "hu_dot_dwim_dot_util" self)
-        (getAttr "hu_dot_dwim_dot_walker" self)
+        (getAttr "iterate" self)
+        (getAttr "serapeum" self)
+        (getAttr "trivial-cltl2" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -75703,12 +76594,12 @@ lib.makeScope pkgs.newScope (self: {
   named-readtables = (
     build-asdf-system {
       pname = "named-readtables";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "named-readtables" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/named-readtables/2023-10-21/named-readtables-20231021-git.tgz";
-          sha256 = "0cnxs13qf0y1r05mhhf54jihvv7pqk1a2p3x5jzs4y8ld1in6xzp";
+          url = "http://beta.quicklisp.org/archive/named-readtables/2025-06-22/named-readtables-20250622-git.tgz";
+          sha256 = "0wm7k1xq6c8rji121wfnv396l59bw87010c7mqhdj9vg7amyr9af";
           system = "named-readtables";
           asd = "named-readtables";
         }
@@ -75721,12 +76612,12 @@ lib.makeScope pkgs.newScope (self: {
   named-readtables-test = (
     build-asdf-system {
       pname = "named-readtables-test";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "named-readtables-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/named-readtables/2023-10-21/named-readtables-20231021-git.tgz";
-          sha256 = "0cnxs13qf0y1r05mhhf54jihvv7pqk1a2p3x5jzs4y8ld1in6xzp";
+          url = "http://beta.quicklisp.org/archive/named-readtables/2025-06-22/named-readtables-20250622-git.tgz";
+          sha256 = "0wm7k1xq6c8rji121wfnv396l59bw87010c7mqhdj9vg7amyr9af";
           system = "named-readtables-test";
           asd = "named-readtables-test";
         }
@@ -75876,6 +76767,26 @@ lib.makeScope pkgs.newScope (self: {
       meta = { };
     }
   );
+  nclasses = (
+    build-asdf-system {
+      pname = "nclasses";
+      version = "20250622-git";
+      asds = [ "nclasses" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/nclasses/2025-06-22/nclasses-20250622-git.tgz";
+          sha256 = "1yq0l7alqw5v3g46y3pvkx0qlprsvji6rlkb63vnqq5z82dqf7sn";
+          system = "nclasses";
+          asd = "nclasses";
+        }
+      );
+      systems = [ "nclasses" ];
+      lispLibs = [ (getAttr "moptilities" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   ncurses-clone-for-lem = (
     build-asdf-system {
       pname = "ncurses-clone-for-lem";
@@ -75907,12 +76818,12 @@ lib.makeScope pkgs.newScope (self: {
   ndebug = (
     build-asdf-system {
       pname = "ndebug";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "ndebug" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ndebug/2024-10-12/ndebug-20241012-git.tgz";
-          sha256 = "168khn4190p55fjhbpnbq130lbaafq7cw0131x7n650d9f4h2hyq";
+          url = "http://beta.quicklisp.org/archive/ndebug/2025-06-22/ndebug-20250622-git.tgz";
+          sha256 = "1z98kzgnvqrd0dbanyr91j9hv28qb32g51vvmbmagcwqprswdcqk";
           system = "ndebug";
           asd = "ndebug";
         }
@@ -76266,12 +77177,12 @@ lib.makeScope pkgs.newScope (self: {
   net_dot_didierverna_dot_tfm = (
     build-asdf-system {
       pname = "net.didierverna.tfm";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "net.didierverna.tfm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfm/2024-10-12/tfm-20241012-git.tgz";
-          sha256 = "15lnp9w9z5ar64bynb365n4wqh8wa7z4m4dzy320xrxnnc1w2sn2";
+          url = "http://beta.quicklisp.org/archive/tfm/2025-06-22/tfm-20250622-git.tgz";
+          sha256 = "0mbfclm680wnai9alys1acb78dp83nkpb22b0lx06059pv6ylz6r";
           system = "net.didierverna.tfm";
           asd = "net.didierverna.tfm";
         }
@@ -76286,12 +77197,12 @@ lib.makeScope pkgs.newScope (self: {
   net_dot_didierverna_dot_tfm_dot_core = (
     build-asdf-system {
       pname = "net.didierverna.tfm.core";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "net.didierverna.tfm.core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfm/2024-10-12/tfm-20241012-git.tgz";
-          sha256 = "15lnp9w9z5ar64bynb365n4wqh8wa7z4m4dzy320xrxnnc1w2sn2";
+          url = "http://beta.quicklisp.org/archive/tfm/2025-06-22/tfm-20250622-git.tgz";
+          sha256 = "0mbfclm680wnai9alys1acb78dp83nkpb22b0lx06059pv6ylz6r";
           system = "net.didierverna.tfm.core";
           asd = "net.didierverna.tfm.core";
         }
@@ -76306,12 +77217,12 @@ lib.makeScope pkgs.newScope (self: {
   net_dot_didierverna_dot_tfm_dot_setup = (
     build-asdf-system {
       pname = "net.didierverna.tfm.setup";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "net.didierverna.tfm.setup" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfm/2024-10-12/tfm-20241012-git.tgz";
-          sha256 = "15lnp9w9z5ar64bynb365n4wqh8wa7z4m4dzy320xrxnnc1w2sn2";
+          url = "http://beta.quicklisp.org/archive/tfm/2025-06-22/tfm-20250622-git.tgz";
+          sha256 = "0mbfclm680wnai9alys1acb78dp83nkpb22b0lx06059pv6ylz6r";
           system = "net.didierverna.tfm.setup";
           asd = "net.didierverna.tfm.setup";
         }
@@ -76326,12 +77237,12 @@ lib.makeScope pkgs.newScope (self: {
   net_dot_scipolis_dot_graphs = (
     build-asdf-system {
       pname = "net.scipolis.graphs";
-      version = "20210411-git";
+      version = "20250622-git";
       asds = [ "net.scipolis.graphs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz";
-          sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa";
+          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "net.scipolis.graphs";
           asd = "net.scipolis.graphs";
         }
@@ -76414,12 +77325,12 @@ lib.makeScope pkgs.newScope (self: {
   new-op = (
     build-asdf-system {
       pname = "new-op";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "new-op" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/new-op/2024-10-12/new-op-20241012-git.tgz";
-          sha256 = "1jrnn4xbx5gc1202hqpinh0q1gm2wcv28jr8fl6g7wm6170nscxh";
+          url = "http://beta.quicklisp.org/archive/new-op/2025-06-22/new-op-20250622-git.tgz";
+          sha256 = "1kw7rbrnjq9bk8i6gx17si8kdz58c5bxaf23zvxkprzzd4ydlrv0";
           system = "new-op";
           asd = "new-op";
         }
@@ -76431,15 +77342,67 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  nfiles = (
+    build-asdf-system {
+      pname = "nfiles";
+      version = "20250622-git";
+      asds = [ "nfiles" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/nfiles/2025-06-22/nfiles-20250622-git.tgz";
+          sha256 = "1lm6p9cncixqybhhy212pnlvx132fjv0xc14wkrvimd7i38dxcdl";
+          system = "nfiles";
+          asd = "nfiles";
+        }
+      );
+      systems = [ "nfiles" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "nclasses" self)
+        (getAttr "quri" self)
+        (getAttr "serapeum" self)
+        (getAttr "trivial-garbage" self)
+        (getAttr "trivial-package-local-nicknames" self)
+        (getAttr "trivial-types" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  nhooks = (
+    build-asdf-system {
+      pname = "nhooks";
+      version = "20250622-git";
+      asds = [ "nhooks" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/nhooks/2025-06-22/nhooks-20250622-git.tgz";
+          sha256 = "1k1lcpaj6zhgq8sxjl12xi1p5l8fhz54akw7kvqk5frpiigdpg47";
+          system = "nhooks";
+          asd = "nhooks";
+        }
+      );
+      systems = [ "nhooks" ];
+      lispLibs = [
+        (getAttr "bordeaux-threads" self)
+        (getAttr "closer-mop" self)
+        (getAttr "serapeum" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   nibbles = (
     build-asdf-system {
       pname = "nibbles";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "nibbles" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nibbles/2024-10-12/nibbles-20241012-git.tgz";
-          sha256 = "00j464l3l1rx2x9gzx45gz7wcpplk1wmfh5liigzlxqq0ybjc7lr";
+          url = "http://beta.quicklisp.org/archive/nibbles/2025-06-22/nibbles-20250622-git.tgz";
+          sha256 = "034jq9y0p6a7cckzgjqm1jlj4njm3mcd9vwp2jxmqcrgjlf4qavs";
           system = "nibbles";
           asd = "nibbles";
         }
@@ -76452,12 +77415,12 @@ lib.makeScope pkgs.newScope (self: {
   nibbles-streams = (
     build-asdf-system {
       pname = "nibbles-streams";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "nibbles-streams" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nibbles-streams/2024-10-12/nibbles-streams-20241012-git.tgz";
-          sha256 = "1m1i9nivpahk11rzdwy3xxdcdwmkx3xzb4kqcz3gh3prwhyg83a1";
+          url = "http://beta.quicklisp.org/archive/nibbles-streams/2025-06-22/nibbles-streams-20250622-git.tgz";
+          sha256 = "1q6x71gfrn15xdrb4jdydz838nyl0sqi8gz92rfkbrf7b2771gkz";
           system = "nibbles-streams";
           asd = "nibbles-streams";
         }
@@ -76555,6 +77518,51 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  njson = (
+    build-asdf-system {
+      pname = "njson";
+      version = "20250622-git";
+      asds = [ "njson" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/njson/2025-06-22/njson-20250622-git.tgz";
+          sha256 = "0bb1apfc2iidknkf8yxkscwvf4w110f2lxb2hw9rldf5gq4w5h03";
+          system = "njson";
+          asd = "njson";
+        }
+      );
+      systems = [ "njson" ];
+      lispLibs = [ ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  nkeymaps = (
+    build-asdf-system {
+      pname = "nkeymaps";
+      version = "20250622-git";
+      asds = [ "nkeymaps" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/nkeymaps/2025-06-22/nkeymaps-20250622-git.tgz";
+          sha256 = "1n8bw5nlagzaldc9fqxfd8sl2bnh04fq1zlz38vb305db0wkz39c";
+          system = "nkeymaps";
+          asd = "nkeymaps";
+        }
+      );
+      systems = [ "nkeymaps" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "fset" self)
+        (getAttr "str" self)
+        (getAttr "trivial-package-local-nicknames" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   nlopt = (
     build-asdf-system {
       pname = "nlopt";
@@ -76581,12 +77589,12 @@ lib.makeScope pkgs.newScope (self: {
   nodgui = (
     build-asdf-system {
       pname = "nodgui";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "nodgui" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nodgui/2024-10-12/nodgui-20241012-git.tgz";
-          sha256 = "088dkpqsxc4dmfsbz24wrgi192xrn8116p4zpklwfqa0fblmfzpb";
+          url = "http://beta.quicklisp.org/archive/nodgui/2025-06-22/nodgui-20250622-git.tgz";
+          sha256 = "01lkgb2xk2lgq32fflsbf1p0mxxpk3215awhb1f01hgdnr94r7fa";
           system = "nodgui";
           asd = "nodgui";
         }
@@ -76619,12 +77627,12 @@ lib.makeScope pkgs.newScope (self: {
   nodgui-lite = (
     build-asdf-system {
       pname = "nodgui-lite";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "nodgui-lite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nodgui/2024-10-12/nodgui-20241012-git.tgz";
-          sha256 = "088dkpqsxc4dmfsbz24wrgi192xrn8116p4zpklwfqa0fblmfzpb";
+          url = "http://beta.quicklisp.org/archive/nodgui/2025-06-22/nodgui-20250622-git.tgz";
+          sha256 = "01lkgb2xk2lgq32fflsbf1p0mxxpk3215awhb1f01hgdnr94r7fa";
           system = "nodgui-lite";
           asd = "nodgui-lite";
         }
@@ -76653,12 +77661,12 @@ lib.makeScope pkgs.newScope (self: {
   noisy = (
     build-asdf-system {
       pname = "noisy";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "noisy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/noisy/2024-10-12/noisy-20241012-git.tgz";
-          sha256 = "0qr29rxbrrlgd3k7hb6c62yzgflaygvxabq2sbhs90r0bi3cs0dj";
+          url = "http://beta.quicklisp.org/archive/noisy/2025-06-22/noisy-20250622-git.tgz";
+          sha256 = "0djv0gwaikvrl9xkwwfks8nw5iic0mjbbi78gnra0hsklikqfai3";
           system = "noisy";
           asd = "noisy";
         }
@@ -76673,12 +77681,12 @@ lib.makeScope pkgs.newScope (self: {
   nontrivial-gray-streams = (
     build-asdf-system {
       pname = "nontrivial-gray-streams";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "nontrivial-gray-streams" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nontrivial-gray-streams/2024-10-12/nontrivial-gray-streams-20241012-git.tgz";
-          sha256 = "0v49nqsc5jbrg499qhk550zg4v5arjh9nch33n5g4f5bfgw7lzh3";
+          url = "http://beta.quicklisp.org/archive/nontrivial-gray-streams/2025-06-22/nontrivial-gray-streams-20250622-git.tgz";
+          sha256 = "1x5b2fw3kr1227vr4hab08cls5f7rzz7kf31xinvafbl5hpd2ynf";
           system = "nontrivial-gray-streams";
           asd = "nontrivial-gray-streams";
         }
@@ -76693,12 +77701,12 @@ lib.makeScope pkgs.newScope (self: {
   north = (
     build-asdf-system {
       pname = "north";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "north" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz";
-          sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2";
+          url = "http://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
+          sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk";
           system = "north";
           asd = "north";
         }
@@ -76713,22 +77721,24 @@ lib.makeScope pkgs.newScope (self: {
   north-core = (
     build-asdf-system {
       pname = "north-core";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "north-core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz";
-          sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2";
+          url = "http://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
+          sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk";
           system = "north-core";
           asd = "north-core";
         }
       );
       systems = [ "north-core" ];
       lispLibs = [
+        (getAttr "babel" self)
+        (getAttr "cl-base64" self)
         (getAttr "cl-ppcre" self)
-        (getAttr "crypto-shortcuts" self)
         (getAttr "documentation-utils" self)
-        (getAttr "uuid" self)
+        (getAttr "frugal-uuid" self)
+        (getAttr "ironclad" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -76738,12 +77748,12 @@ lib.makeScope pkgs.newScope (self: {
   north-dexador = (
     build-asdf-system {
       pname = "north-dexador";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "north-dexador" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz";
-          sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2";
+          url = "http://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
+          sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk";
           system = "north-dexador";
           asd = "north-dexador";
         }
@@ -76761,12 +77771,12 @@ lib.makeScope pkgs.newScope (self: {
   north-drakma = (
     build-asdf-system {
       pname = "north-drakma";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "north-drakma" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz";
-          sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2";
+          url = "http://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
+          sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk";
           system = "north-drakma";
           asd = "north-drakma";
         }
@@ -76784,12 +77794,12 @@ lib.makeScope pkgs.newScope (self: {
   north-example = (
     build-asdf-system {
       pname = "north-example";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "north-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz";
-          sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2";
+          url = "http://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
+          sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk";
           system = "north-example";
           asd = "north-example";
         }
@@ -77240,6 +78250,61 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  numericals = (
+    build-asdf-system {
+      pname = "numericals";
+      version = "2024.12.0";
+      asds = [ "numericals" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/numericals/2025-06-22/numericals-2024.12.0.tgz";
+          sha256 = "1pwfgicyqs5gp37d5fxq7zljs3w7h09y0m9hc70lqc9qfr4c61jp";
+          system = "numericals";
+          asd = "numericals";
+        }
+      );
+      systems = [ "numericals" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "bmas" self)
+        (getAttr "ceigen-lite" self)
+        (getAttr "cffi" self)
+        (getAttr "iterate" self)
+        (getAttr "lparallel" self)
+        (getAttr "peltadot" self)
+        (getAttr "peltadot-traits-library" self)
+        (getAttr "policy-cond" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  numericals_dot_common = (
+    build-asdf-system {
+      pname = "numericals.common";
+      version = "2024.12.0";
+      asds = [ "numericals.common" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/numericals/2025-06-22/numericals-2024.12.0.tgz";
+          sha256 = "1pwfgicyqs5gp37d5fxq7zljs3w7h09y0m9hc70lqc9qfr4c61jp";
+          system = "numericals.common";
+          asd = "numericals.common";
+        }
+      );
+      systems = [ "numericals.common" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "cffi" self)
+        (getAttr "peltadot" self)
+        (getAttr "peltadot-traits-library" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   numpy-file-format = (
     build-asdf-system {
       pname = "numpy-file-format";
@@ -77313,12 +78378,12 @@ lib.makeScope pkgs.newScope (self: {
   nyaml = (
     build-asdf-system {
       pname = "nyaml";
-      version = "20211230-git";
+      version = "20250622-git";
       asds = [ "nyaml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nyaml/2021-12-30/nyaml-20211230-git.tgz";
-          sha256 = "1gdsxhgqx9ynzrxwjidgljlkmz35wx83r6gwslxgg4v0g4vix9da";
+          url = "http://beta.quicklisp.org/archive/nyaml/2025-06-22/nyaml-20250622-git.tgz";
+          sha256 = "0prd2q70rwm7d6g5xqh224rcrqpdyl3wzaxplj98wkhmjjsdzh2x";
           system = "nyaml";
           asd = "nyaml";
         }
@@ -77342,18 +78407,18 @@ lib.makeScope pkgs.newScope (self: {
   nytpu_dot_lisp-utils = (
     build-asdf-system {
       pname = "nytpu.lisp-utils";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "nytpu.lisp-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nytpu.lisp-utils/2024-10-12/nytpu.lisp-utils-20241012-git.tgz";
-          sha256 = "11mn2xf0nlaqmni0s22n4jbdy8rkqkin1sqni90drd8cs6mccmsd";
+          url = "http://beta.quicklisp.org/archive/nytpu.lisp-utils/2025-06-22/nytpu.lisp-utils-20250622-git.tgz";
+          sha256 = "1bkjhym38zj5jb97w9mapr6ingwzihfywgb6nlmw7anjb0silam6";
           system = "nytpu.lisp-utils";
           asd = "nytpu.lisp-utils";
         }
       );
       systems = [ "nytpu.lisp-utils" ];
-      lispLibs = [ ];
+      lispLibs = [ (getAttr "trivial-indent" self) ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -77623,12 +78688,12 @@ lib.makeScope pkgs.newScope (self: {
   omg = (
     build-asdf-system {
       pname = "omg";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "omg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/omglib/2024-10-12/omglib-20241012-git.tgz";
-          sha256 = "0jp68w3sw9z8gn3498lrmysf93f22a71hsr9c886wix5zpwgqpx7";
+          url = "http://beta.quicklisp.org/archive/omglib/2025-06-22/omglib-20250622-git.tgz";
+          sha256 = "0m3hzavsg8la8cjsdd153h1y8v2bjwmf31yl33nb7gnb2vb1nd5n";
           system = "omg";
           asd = "omg";
         }
@@ -77636,12 +78701,13 @@ lib.makeScope pkgs.newScope (self: {
       systems = [ "omg" ];
       lispLibs = [
         (getAttr "bordeaux-threads" self)
+        (getAttr "cl-base64" self)
         (getAttr "cl-jpeg" self)
-        (getAttr "cl-parallel" self)
         (getAttr "clack" self)
         (getAttr "hunchentoot" self)
         (getAttr "media-types" self)
         (getAttr "pngload" self)
+        (getAttr "quri" self)
         (getAttr "skippy" self)
         (getAttr "trivial-utf-8" self)
         (getAttr "websocket-driver-server" self)
@@ -77654,12 +78720,12 @@ lib.makeScope pkgs.newScope (self: {
   omgdaemon = (
     build-asdf-system {
       pname = "omgdaemon";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "omgdaemon" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/omglib/2024-10-12/omglib-20241012-git.tgz";
-          sha256 = "0jp68w3sw9z8gn3498lrmysf93f22a71hsr9c886wix5zpwgqpx7";
+          url = "http://beta.quicklisp.org/archive/omglib/2025-06-22/omglib-20250622-git.tgz";
+          sha256 = "0m3hzavsg8la8cjsdd153h1y8v2bjwmf31yl33nb7gnb2vb1nd5n";
           system = "omgdaemon";
           asd = "omgdaemon";
         }
@@ -77683,15 +78749,88 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  one-more-re-nightmare = (
+    build-asdf-system {
+      pname = "one-more-re-nightmare";
+      version = "20250622-git";
+      asds = [ "one-more-re-nightmare" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/one-more-re-nightmare/2025-06-22/one-more-re-nightmare-20250622-git.tgz";
+          sha256 = "0d4knmkbh81242l0j284y8h9sdgms22x8ngnpkqr47garrrfnp91";
+          system = "one-more-re-nightmare";
+          asd = "one-more-re-nightmare";
+        }
+      );
+      systems = [ "one-more-re-nightmare" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "babel" self)
+        (getAttr "bordeaux-threads" self)
+        (getAttr "dynamic-mixins" self)
+        (getAttr "esrap" self)
+        (getAttr "stealth-mixin" self)
+        (getAttr "trivia" self)
+        (getAttr "trivial-indent" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  one-more-re-nightmare-simd = (
+    build-asdf-system {
+      pname = "one-more-re-nightmare-simd";
+      version = "20250622-git";
+      asds = [ "one-more-re-nightmare-simd" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/one-more-re-nightmare/2025-06-22/one-more-re-nightmare-20250622-git.tgz";
+          sha256 = "0d4knmkbh81242l0j284y8h9sdgms22x8ngnpkqr47garrrfnp91";
+          system = "one-more-re-nightmare-simd";
+          asd = "one-more-re-nightmare-simd";
+        }
+      );
+      systems = [ "one-more-re-nightmare-simd" ];
+      lispLibs = [ (getAttr "one-more-re-nightmare" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  one-more-re-nightmare-tests = (
+    build-asdf-system {
+      pname = "one-more-re-nightmare-tests";
+      version = "20250622-git";
+      asds = [ "one-more-re-nightmare-tests" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/one-more-re-nightmare/2025-06-22/one-more-re-nightmare-20250622-git.tgz";
+          sha256 = "0d4knmkbh81242l0j284y8h9sdgms22x8ngnpkqr47garrrfnp91";
+          system = "one-more-re-nightmare-tests";
+          asd = "one-more-re-nightmare-tests";
+        }
+      );
+      systems = [ "one-more-re-nightmare-tests" ];
+      lispLibs = [
+        (getAttr "lparallel" self)
+        (getAttr "one-more-re-nightmare" self)
+        (getAttr "parachute" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   ook = (
     build-asdf-system {
       pname = "ook";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "ook" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ook/2024-10-12/ook-20241012-git.tgz";
-          sha256 = "0vh6g6a392z77yd4vgj3izajyai7pckr90ij1xns6cf9w505aq8w";
+          url = "http://beta.quicklisp.org/archive/ook/2025-06-22/ook-20250622-git.tgz";
+          sha256 = "0ibm7zii7nvjbz91ya5f98f1w3daxfpk1q6dcr59c9cimsnv2s3c";
           system = "ook";
           asd = "ook";
         }
@@ -77837,12 +78976,12 @@ lib.makeScope pkgs.newScope (self: {
   open-with = (
     build-asdf-system {
       pname = "open-with";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "open-with" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/open-with/2024-10-12/open-with-20241012-git.tgz";
-          sha256 = "0bc0p8nigmfq4axx6qmlxdkm4sb0d2mdi1h7bwmnh0irvmrgdy33";
+          url = "http://beta.quicklisp.org/archive/open-with/2025-06-22/open-with-20250622-git.tgz";
+          sha256 = "0j0qv1389wbr84y3mis4qd2zz9qybnq4frvc01pamidsbryxss0r";
           system = "open-with";
           asd = "open-with";
         }
@@ -77910,12 +79049,12 @@ lib.makeScope pkgs.newScope (self: {
   openapi-generator = (
     build-asdf-system {
       pname = "openapi-generator";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "openapi-generator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openapi-generator/2024-10-12/openapi-generator-20241012-git.tgz";
-          sha256 = "0zc0y8frcnsqj76sqmqsgfv0zhdz5kkpynwan3sigc78fl1nrs3q";
+          url = "http://beta.quicklisp.org/archive/openapi-generator/2025-06-22/openapi-generator-20250622-git.tgz";
+          sha256 = "0876fgy5k1i0sd53qyaic5idd9arf6q132yv2ilwskp78wp03x30";
           system = "openapi-generator";
           asd = "openapi-generator";
         }
@@ -78052,12 +79191,12 @@ lib.makeScope pkgs.newScope (self: {
   openrpc-ci = (
     build-asdf-system {
       pname = "openrpc-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "openrpc-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz";
-          sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s";
+          url = "http://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
+          sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0";
           system = "openrpc-ci";
           asd = "openrpc-ci";
         }
@@ -78072,12 +79211,12 @@ lib.makeScope pkgs.newScope (self: {
   openrpc-client = (
     build-asdf-system {
       pname = "openrpc-client";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "openrpc-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz";
-          sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s";
+          url = "http://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
+          sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0";
           system = "openrpc-client";
           asd = "openrpc-client";
         }
@@ -78104,12 +79243,12 @@ lib.makeScope pkgs.newScope (self: {
   openrpc-deps = (
     build-asdf-system {
       pname = "openrpc-deps";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "openrpc-deps" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz";
-          sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s";
+          url = "http://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
+          sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0";
           system = "openrpc-deps";
           asd = "openrpc-deps";
         }
@@ -78124,12 +79263,12 @@ lib.makeScope pkgs.newScope (self: {
   openrpc-docs = (
     build-asdf-system {
       pname = "openrpc-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "openrpc-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz";
-          sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s";
+          url = "http://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
+          sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0";
           system = "openrpc-docs";
           asd = "openrpc-docs";
         }
@@ -78148,12 +79287,12 @@ lib.makeScope pkgs.newScope (self: {
   openrpc-example = (
     build-asdf-system {
       pname = "openrpc-example";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "openrpc-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz";
-          sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s";
+          url = "http://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
+          sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0";
           system = "openrpc-example";
           asd = "openrpc-example";
         }
@@ -78177,12 +79316,12 @@ lib.makeScope pkgs.newScope (self: {
   openrpc-server = (
     build-asdf-system {
       pname = "openrpc-server";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "openrpc-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz";
-          sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s";
+          url = "http://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
+          sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0";
           system = "openrpc-server";
           asd = "openrpc-server";
         }
@@ -78210,6 +79349,37 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  openrpc-tests = (
+    build-asdf-system {
+      pname = "openrpc-tests";
+      version = "20250622-git";
+      asds = [ "openrpc-tests" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
+          sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0";
+          system = "openrpc-tests";
+          asd = "openrpc-tests";
+        }
+      );
+      systems = [ "openrpc-tests" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "clack-test" self)
+        (getAttr "diff" self)
+        (getAttr "hamcrest" self)
+        (getAttr "jsonrpc" self)
+        (getAttr "openrpc-client" self)
+        (getAttr "openrpc-example" self)
+        (getAttr "openrpc-server" self)
+        (getAttr "rove" self)
+        (getAttr "serapeum" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   ops-test = (
     build-asdf-system {
       pname = "ops-test";
@@ -78579,12 +79749,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_melusina_dot_atelier = (
     build-asdf-system {
       pname = "org.melusina.atelier";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.melusina.atelier" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-atelier/2024-10-12/cl-atelier-20241012-git.tgz";
-          sha256 = "0n8v4f7xq1szxhipmkvg4x5s41vqllcq6hxzcd7r0rbxi9i57pqz";
+          url = "http://beta.quicklisp.org/archive/cl-atelier/2025-06-22/cl-atelier-20250622-git.tgz";
+          sha256 = "1q95j1bsriil7b1d2i90h398iz84c743mai16ksl616mn0ydkhk8";
           system = "org.melusina.atelier";
           asd = "org.melusina.atelier";
         }
@@ -78649,12 +79819,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_melusina_dot_webmachine = (
     build-asdf-system {
       pname = "org.melusina.webmachine";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.melusina.webmachine" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-webmachine/2024-10-12/cl-webmachine-20241012-git.tgz";
-          sha256 = "0k31fbwsv0zdixzis625dsk9zlz04g4908wzwb8p593dksqa0sr8";
+          url = "http://beta.quicklisp.org/archive/cl-webmachine/2025-06-22/cl-webmachine-20250622-git.tgz";
+          sha256 = "09nrd8wqwfnqgag1w078pwk0qiy4d32ib8wjhkfqpky7pxccp73h";
           system = "org.melusina.webmachine";
           asd = "org.melusina.webmachine";
         }
@@ -78675,12 +79845,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_conduit-packages = (
     build-asdf-system {
       pname = "org.tfeb.conduit-packages";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.conduit-packages" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/conduit-packages/2024-10-12/conduit-packages-20241012-git.tgz";
-          sha256 = "1x89maglc4cw2c87y23zrsvh8mk22ik1anmps462w3a0j3c1ly12";
+          url = "http://beta.quicklisp.org/archive/conduit-packages/2025-06-22/conduit-packages-20250622-git.tgz";
+          sha256 = "1nb58r52ic3k7dyis1h3pb16hf6nr37hr03drf09xhxir4n6gj77";
           system = "org.tfeb.conduit-packages";
           asd = "org.tfeb.conduit-packages";
         }
@@ -78695,12 +79865,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_dsm = (
     build-asdf-system {
       pname = "org.tfeb.dsm";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.dsm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dsm/2024-10-12/dsm-20241012-git.tgz";
-          sha256 = "033swj37bgbzn35fjndxqsk89i17bhsim12j8mciiziykx62c4pw";
+          url = "http://beta.quicklisp.org/archive/dsm/2025-06-22/dsm-20250622-git.tgz";
+          sha256 = "1ahibwfrjdxvxw2rhfq4804lb9bidyzxcxwplc7sdfcsjzbvnzk7";
           system = "org.tfeb.dsm";
           asd = "org.tfeb.dsm";
         }
@@ -78721,12 +79891,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax = (
     build-asdf-system {
       pname = "org.tfeb.hax";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax";
           asd = "org.tfeb.hax";
         }
@@ -78741,12 +79911,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_abstract-classes = (
     build-asdf-system {
       pname = "org.tfeb.hax.abstract-classes";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.abstract-classes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.abstract-classes";
           asd = "org.tfeb.hax.abstract-classes";
         }
@@ -78761,12 +79931,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_binding = (
     build-asdf-system {
       pname = "org.tfeb.hax.binding";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.binding" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.binding";
           asd = "org.tfeb.hax.binding";
         }
@@ -78784,12 +79954,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_collecting = (
     build-asdf-system {
       pname = "org.tfeb.hax.collecting";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.collecting" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.collecting";
           asd = "org.tfeb.hax.collecting";
         }
@@ -78804,12 +79974,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_comment-form = (
     build-asdf-system {
       pname = "org.tfeb.hax.comment-form";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.comment-form" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.comment-form";
           asd = "org.tfeb.hax.comment-form";
         }
@@ -78824,12 +79994,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_cs-forms = (
     build-asdf-system {
       pname = "org.tfeb.hax.cs-forms";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.cs-forms" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.cs-forms";
           asd = "org.tfeb.hax.cs-forms";
         }
@@ -78844,12 +80014,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_define-functions = (
     build-asdf-system {
       pname = "org.tfeb.hax.define-functions";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.define-functions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.define-functions";
           asd = "org.tfeb.hax.define-functions";
         }
@@ -78864,12 +80034,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_dynamic-state = (
     build-asdf-system {
       pname = "org.tfeb.hax.dynamic-state";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.dynamic-state" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.dynamic-state";
           asd = "org.tfeb.hax.dynamic-state";
         }
@@ -78884,12 +80054,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_iterate = (
     build-asdf-system {
       pname = "org.tfeb.hax.iterate";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.iterate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.iterate";
           asd = "org.tfeb.hax.iterate";
         }
@@ -78901,15 +80071,41 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  org_dot_tfeb_dot_hax_dot_let-values = (
+    build-asdf-system {
+      pname = "org.tfeb.hax.let-values";
+      version = "20250622-git";
+      asds = [ "org.tfeb.hax.let-values" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
+          system = "org.tfeb.hax.let-values";
+          asd = "org.tfeb.hax.let-values";
+        }
+      );
+      systems = [ "org.tfeb.hax.let-values" ];
+      lispLibs = [
+        (getAttr "org_dot_tfeb_dot_hax_dot_collecting" self)
+        (getAttr "org_dot_tfeb_dot_hax_dot_iterate" self)
+        (getAttr "org_dot_tfeb_dot_hax_dot_process-declarations" self)
+        (getAttr "org_dot_tfeb_dot_hax_dot_spam" self)
+        (getAttr "org_dot_tfeb_dot_hax_dot_utilities" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   org_dot_tfeb_dot_hax_dot_memoize = (
     build-asdf-system {
       pname = "org.tfeb.hax.memoize";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.memoize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.memoize";
           asd = "org.tfeb.hax.memoize";
         }
@@ -78924,12 +80120,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_metatronic = (
     build-asdf-system {
       pname = "org.tfeb.hax.metatronic";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.metatronic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.metatronic";
           asd = "org.tfeb.hax.metatronic";
         }
@@ -78944,18 +80140,38 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_object-accessors = (
     build-asdf-system {
       pname = "org.tfeb.hax.object-accessors";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.object-accessors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.object-accessors";
           asd = "org.tfeb.hax.object-accessors";
         }
       );
       systems = [ "org.tfeb.hax.object-accessors" ];
-      lispLibs = [ ];
+      lispLibs = [ (getAttr "org_dot_tfeb_dot_hax_dot_utilities" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  org_dot_tfeb_dot_hax_dot_process-declarations = (
+    build-asdf-system {
+      pname = "org.tfeb.hax.process-declarations";
+      version = "20250622-git";
+      asds = [ "org.tfeb.hax.process-declarations" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
+          system = "org.tfeb.hax.process-declarations";
+          asd = "org.tfeb.hax.process-declarations";
+        }
+      );
+      systems = [ "org.tfeb.hax.process-declarations" ];
+      lispLibs = [ (getAttr "org_dot_tfeb_dot_hax_dot_utilities" self) ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -78964,12 +80180,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_read-package = (
     build-asdf-system {
       pname = "org.tfeb.hax.read-package";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.read-package" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.read-package";
           asd = "org.tfeb.hax.read-package";
         }
@@ -78984,12 +80200,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_simple-loops = (
     build-asdf-system {
       pname = "org.tfeb.hax.simple-loops";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.simple-loops" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.simple-loops";
           asd = "org.tfeb.hax.simple-loops";
         }
@@ -79008,12 +80224,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_singleton-classes = (
     build-asdf-system {
       pname = "org.tfeb.hax.singleton-classes";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.singleton-classes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.singleton-classes";
           asd = "org.tfeb.hax.singleton-classes";
         }
@@ -79028,12 +80244,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_slog = (
     build-asdf-system {
       pname = "org.tfeb.hax.slog";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.slog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.slog";
           asd = "org.tfeb.hax.slog";
         }
@@ -79053,12 +80269,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_spam = (
     build-asdf-system {
       pname = "org.tfeb.hax.spam";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.spam" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.spam";
           asd = "org.tfeb.hax.spam";
         }
@@ -79073,12 +80289,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_stringtable = (
     build-asdf-system {
       pname = "org.tfeb.hax.stringtable";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.stringtable" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.stringtable";
           asd = "org.tfeb.hax.stringtable";
         }
@@ -79096,12 +80312,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_trace-macroexpand = (
     build-asdf-system {
       pname = "org.tfeb.hax.trace-macroexpand";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.trace-macroexpand" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.trace-macroexpand";
           asd = "org.tfeb.hax.trace-macroexpand";
         }
@@ -79116,12 +80332,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_utilities = (
     build-asdf-system {
       pname = "org.tfeb.hax.utilities";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.utilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.utilities";
           asd = "org.tfeb.hax.utilities";
         }
@@ -79136,12 +80352,12 @@ lib.makeScope pkgs.newScope (self: {
   org_dot_tfeb_dot_hax_dot_wrapping-standard = (
     build-asdf-system {
       pname = "org.tfeb.hax.wrapping-standard";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "org.tfeb.hax.wrapping-standard" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz";
-          sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa";
+          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.wrapping-standard";
           asd = "org.tfeb.hax.wrapping-standard";
         }
@@ -79391,12 +80607,12 @@ lib.makeScope pkgs.newScope (self: {
   osicat = (
     build-asdf-system {
       pname = "osicat";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "osicat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/osicat/2023-10-21/osicat-20231021-git.tgz";
-          sha256 = "10q1dfkhrvp5ia860q10y4wdm11fmxf7xv8zl4viz2np9xzf5v22";
+          url = "http://beta.quicklisp.org/archive/osicat/2025-06-22/osicat-20250622-git.tgz";
+          sha256 = "1cwh4dim62ffm0hcrswk543zm3ynrqbkjxcrrc1ndfjl1b5kgars";
           system = "osicat";
           asd = "osicat";
         }
@@ -79443,12 +80659,12 @@ lib.makeScope pkgs.newScope (self: {
   overlord = (
     build-asdf-system {
       pname = "overlord";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "overlord" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/overlord/2024-10-12/overlord-20241012-git.tgz";
-          sha256 = "1afhqx6wdqdah1fpapvr6zxpzkkqmhbrxkqxam523fqjyg4a6941";
+          url = "http://beta.quicklisp.org/archive/overlord/2025-06-22/overlord-20250622-git.tgz";
+          sha256 = "1fr3nkycqhb2c5f94r9zv9b3viagik0qsx1bsrb4jcrr1r07vl4m";
           system = "overlord";
           asd = "overlord";
         }
@@ -79767,12 +80983,12 @@ lib.makeScope pkgs.newScope (self: {
   papyrus = (
     build-asdf-system {
       pname = "papyrus";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "papyrus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/papyrus/2024-10-12/papyrus-20241012-git.tgz";
-          sha256 = "0cnhdl2x5vs91srlfjnaznwj5vrg6qlyn2xjbyy40p8yvr5pny88";
+          url = "http://beta.quicklisp.org/archive/papyrus/2025-06-22/papyrus-20250622-git.tgz";
+          sha256 = "1x5wmqjpxx1m7rvbspbv78h3him37n6klblp192yl0faz5v5p8x5";
           system = "papyrus";
           asd = "papyrus";
         }
@@ -79787,12 +81003,12 @@ lib.makeScope pkgs.newScope (self: {
   parachute = (
     build-asdf-system {
       pname = "parachute";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "parachute" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parachute/2024-10-12/parachute-20241012-git.tgz";
-          sha256 = "1hghjrv5d5w9nz27lhwz8vvbdcjl2skm76r8adpzmi7s1f9ww121";
+          url = "http://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz";
+          sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr";
           system = "parachute";
           asd = "parachute";
         }
@@ -79809,12 +81025,12 @@ lib.makeScope pkgs.newScope (self: {
   parachute-fiveam = (
     build-asdf-system {
       pname = "parachute-fiveam";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "parachute-fiveam" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parachute/2024-10-12/parachute-20241012-git.tgz";
-          sha256 = "1hghjrv5d5w9nz27lhwz8vvbdcjl2skm76r8adpzmi7s1f9ww121";
+          url = "http://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz";
+          sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr";
           system = "parachute-fiveam";
           asd = "parachute-fiveam";
         }
@@ -79829,12 +81045,12 @@ lib.makeScope pkgs.newScope (self: {
   parachute-lisp-unit = (
     build-asdf-system {
       pname = "parachute-lisp-unit";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "parachute-lisp-unit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parachute/2024-10-12/parachute-20241012-git.tgz";
-          sha256 = "1hghjrv5d5w9nz27lhwz8vvbdcjl2skm76r8adpzmi7s1f9ww121";
+          url = "http://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz";
+          sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr";
           system = "parachute-lisp-unit";
           asd = "parachute-lisp-unit";
         }
@@ -79849,12 +81065,12 @@ lib.makeScope pkgs.newScope (self: {
   parachute-prove = (
     build-asdf-system {
       pname = "parachute-prove";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "parachute-prove" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parachute/2024-10-12/parachute-20241012-git.tgz";
-          sha256 = "1hghjrv5d5w9nz27lhwz8vvbdcjl2skm76r8adpzmi7s1f9ww121";
+          url = "http://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz";
+          sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr";
           system = "parachute-prove";
           asd = "parachute-prove";
         }
@@ -79959,12 +81175,12 @@ lib.makeScope pkgs.newScope (self: {
   paren6 = (
     build-asdf-system {
       pname = "paren6";
-      version = "20220331-git";
+      version = "20250622-git";
       asds = [ "paren6" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/paren6/2022-03-31/paren6-20220331-git.tgz";
-          sha256 = "0m7z7zkc1vrwmp68f3yx0mdsb0j45dmw3iddnbvf94dpv8aywwpx";
+          url = "http://beta.quicklisp.org/archive/paren6/2025-06-22/paren6-20250622-git.tgz";
+          sha256 = "1ib57mfq82c62nd0ikic6mjbivwv7x7g5fgjblq7jssms6s7h9wm";
           system = "paren6";
           asd = "paren6";
         }
@@ -80029,12 +81245,12 @@ lib.makeScope pkgs.newScope (self: {
   parenscript = (
     build-asdf-system {
       pname = "parenscript";
-      version = "Parenscript-2.7.1";
+      version = "20250622-git";
       asds = [ "parenscript" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz";
-          sha256 = "0vg9b9j5psil5iba1d9k6vfxl5rn133qvy750dny20qkp9mf3a13";
+          url = "http://beta.quicklisp.org/archive/parenscript/2025-06-22/parenscript-20250622-git.tgz";
+          sha256 = "1nmn4ww339mhha51d0akppnyc031lap2kzribzlpr9jr89g2j39y";
           system = "parenscript";
           asd = "parenscript";
         }
@@ -80071,12 +81287,12 @@ lib.makeScope pkgs.newScope (self: {
   parenscript_dot_tests = (
     build-asdf-system {
       pname = "parenscript.tests";
-      version = "Parenscript-2.7.1";
+      version = "20250622-git";
       asds = [ "parenscript.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz";
-          sha256 = "0vg9b9j5psil5iba1d9k6vfxl5rn133qvy750dny20qkp9mf3a13";
+          url = "http://beta.quicklisp.org/archive/parenscript/2025-06-22/parenscript-20250622-git.tgz";
+          sha256 = "1nmn4ww339mhha51d0akppnyc031lap2kzribzlpr9jr89g2j39y";
           system = "parenscript.tests";
           asd = "parenscript.tests";
         }
@@ -80301,12 +81517,12 @@ lib.makeScope pkgs.newScope (self: {
   parse-rgb = (
     build-asdf-system {
       pname = "parse-rgb";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "parse-rgb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tcod/2023-10-21/cl-tcod-20231021-git.tgz";
-          sha256 = "1r4ip16dlzr56p94b0grw6nmkykbmgb04jsqdvgl1ypcmbpfr3i1";
+          url = "http://beta.quicklisp.org/archive/cl-tcod/2025-06-22/cl-tcod-20250622-git.tgz";
+          sha256 = "1m3fgfc7nfk8yn4z1c09lixnk0sr3szxqihq3fx4j6is430ywxdd";
           system = "parse-rgb";
           asd = "parse-rgb";
         }
@@ -80667,12 +81883,12 @@ lib.makeScope pkgs.newScope (self: {
   pathname-utils = (
     build-asdf-system {
       pname = "pathname-utils";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "pathname-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pathname-utils/2024-10-12/pathname-utils-20241012-git.tgz";
-          sha256 = "1z1z3dar6g2ybxgk9zgcyb8bh5g6rh12bwl3ik6rdwy3rdd5b1q5";
+          url = "http://beta.quicklisp.org/archive/pathname-utils/2025-06-22/pathname-utils-20250622-git.tgz";
+          sha256 = "1b89i0n70hr4wbbd9lqp0zf4sz70yvj5dn7x9a7mp1510g2wrii1";
           system = "pathname-utils";
           asd = "pathname-utils";
         }
@@ -80687,12 +81903,12 @@ lib.makeScope pkgs.newScope (self: {
   pathname-utils-test = (
     build-asdf-system {
       pname = "pathname-utils-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "pathname-utils-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pathname-utils/2024-10-12/pathname-utils-20241012-git.tgz";
-          sha256 = "1z1z3dar6g2ybxgk9zgcyb8bh5g6rh12bwl3ik6rdwy3rdd5b1q5";
+          url = "http://beta.quicklisp.org/archive/pathname-utils/2025-06-22/pathname-utils-20250622-git.tgz";
+          sha256 = "1b89i0n70hr4wbbd9lqp0zf4sz70yvj5dn7x9a7mp1510g2wrii1";
           system = "pathname-utils-test";
           asd = "pathname-utils-test";
         }
@@ -81078,6 +82294,61 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  peltadot = (
+    build-asdf-system {
+      pname = "peltadot";
+      version = "20250622-git";
+      asds = [ "peltadot" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/peltadot/2025-06-22/peltadot-20250622-git.tgz";
+          sha256 = "1d1f7b864pd16aivf53y6sr5kczlibzlvcjlrllsfbrv4ygx759z";
+          system = "peltadot";
+          asd = "peltadot";
+        }
+      );
+      systems = [ "peltadot" ];
+      lispLibs = [
+        (getAttr "agutil" self)
+        (getAttr "alexandria" self)
+        (getAttr "alternate-asdf-system-connections" self)
+        (getAttr "arrows" self)
+        (getAttr "cl-environments" self)
+        (getAttr "compiler-macro-notes" self)
+        (getAttr "fiveam" self)
+        (getAttr "in-nomine" self)
+        (getAttr "introspect-environment" self)
+        (getAttr "let-plus" self)
+        (getAttr "split-sequence" self)
+        (getAttr "swank" self)
+        (getAttr "trivial-garbage" self)
+        (getAttr "trivial-types" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  peltadot-traits-library = (
+    build-asdf-system {
+      pname = "peltadot-traits-library";
+      version = "20250622-git";
+      asds = [ "peltadot-traits-library" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/peltadot/2025-06-22/peltadot-20250622-git.tgz";
+          sha256 = "1d1f7b864pd16aivf53y6sr5kczlibzlvcjlrllsfbrv4ygx759z";
+          system = "peltadot-traits-library";
+          asd = "peltadot-traits-library";
+        }
+      );
+      systems = [ "peltadot-traits-library" ];
+      lispLibs = [ (getAttr "peltadot" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   peppol = (
     build-asdf-system {
       pname = "peppol";
@@ -81288,12 +82559,12 @@ lib.makeScope pkgs.newScope (self: {
   persistent = (
     build-asdf-system {
       pname = "persistent";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "persistent" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "persistent";
           asd = "persistent";
         }
@@ -81371,12 +82642,12 @@ lib.makeScope pkgs.newScope (self: {
   petalisp = (
     build-asdf-system {
       pname = "petalisp";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "petalisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz";
-          sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9";
+          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp";
           asd = "petalisp";
         }
@@ -81394,12 +82665,12 @@ lib.makeScope pkgs.newScope (self: {
   petalisp_dot_api = (
     build-asdf-system {
       pname = "petalisp.api";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "petalisp.api" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz";
-          sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9";
+          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.api";
           asd = "petalisp.api";
         }
@@ -81409,6 +82680,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "alexandria" self)
         (getAttr "petalisp_dot_codegen" self)
         (getAttr "petalisp_dot_core" self)
+        (getAttr "petalisp_dot_graphviz" self)
         (getAttr "petalisp_dot_ir" self)
         (getAttr "petalisp_dot_native-backend" self)
         (getAttr "petalisp_dot_packages" self)
@@ -81422,15 +82694,39 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  petalisp_dot_benchmarks = (
+    build-asdf-system {
+      pname = "petalisp.benchmarks";
+      version = "20250622-git";
+      asds = [ "petalisp.benchmarks" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
+          system = "petalisp.benchmarks";
+          asd = "petalisp.benchmarks";
+        }
+      );
+      systems = [ "petalisp.benchmarks" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "closer-mop" self)
+        (getAttr "petalisp" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   petalisp_dot_codegen = (
     build-asdf-system {
       pname = "petalisp.codegen";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "petalisp.codegen" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz";
-          sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9";
+          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.codegen";
           asd = "petalisp.codegen";
         }
@@ -81454,12 +82750,12 @@ lib.makeScope pkgs.newScope (self: {
   petalisp_dot_core = (
     build-asdf-system {
       pname = "petalisp.core";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "petalisp.core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz";
-          sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9";
+          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.core";
           asd = "petalisp.core";
         }
@@ -81482,12 +82778,12 @@ lib.makeScope pkgs.newScope (self: {
   petalisp_dot_examples = (
     build-asdf-system {
       pname = "petalisp.examples";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "petalisp.examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz";
-          sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9";
+          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.examples";
           asd = "petalisp.examples";
         }
@@ -81502,15 +82798,45 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  petalisp_dot_graphviz = (
+    build-asdf-system {
+      pname = "petalisp.graphviz";
+      version = "20250622-git";
+      asds = [ "petalisp.graphviz" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
+          system = "petalisp.graphviz";
+          asd = "petalisp.graphviz";
+        }
+      );
+      systems = [ "petalisp.graphviz" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "cl-dot" self)
+        (getAttr "closer-mop" self)
+        (getAttr "petalisp_dot_core" self)
+        (getAttr "petalisp_dot_ir" self)
+        (getAttr "petalisp_dot_native-backend" self)
+        (getAttr "petalisp_dot_packages" self)
+        (getAttr "petalisp_dot_utilities" self)
+        (getAttr "trivial-features" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   petalisp_dot_ir = (
     build-asdf-system {
       pname = "petalisp.ir";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "petalisp.ir" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz";
-          sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9";
+          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.ir";
           asd = "petalisp.ir";
         }
@@ -81532,12 +82858,12 @@ lib.makeScope pkgs.newScope (self: {
   petalisp_dot_native-backend = (
     build-asdf-system {
       pname = "petalisp.native-backend";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "petalisp.native-backend" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz";
-          sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9";
+          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.native-backend";
           asd = "petalisp.native-backend";
         }
@@ -81565,12 +82891,12 @@ lib.makeScope pkgs.newScope (self: {
   petalisp_dot_packages = (
     build-asdf-system {
       pname = "petalisp.packages";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "petalisp.packages" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz";
-          sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9";
+          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.packages";
           asd = "petalisp.packages";
         }
@@ -81585,12 +82911,12 @@ lib.makeScope pkgs.newScope (self: {
   petalisp_dot_test-suite = (
     build-asdf-system {
       pname = "petalisp.test-suite";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "petalisp.test-suite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz";
-          sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9";
+          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.test-suite";
           asd = "petalisp.test-suite";
         }
@@ -81611,12 +82937,12 @@ lib.makeScope pkgs.newScope (self: {
   petalisp_dot_utilities = (
     build-asdf-system {
       pname = "petalisp.utilities";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "petalisp.utilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz";
-          sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9";
+          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.utilities";
           asd = "petalisp.utilities";
         }
@@ -82137,12 +83463,12 @@ lib.makeScope pkgs.newScope (self: {
   piping = (
     build-asdf-system {
       pname = "piping";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "piping" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/piping/2023-10-21/piping-20231021-git.tgz";
-          sha256 = "0g0k6w7xa0xyzlr3j5j85b91kazbba4rxwplmqcb5ns3shk8745g";
+          url = "http://beta.quicklisp.org/archive/piping/2025-06-22/piping-20250622-git.tgz";
+          sha256 = "0c5mbgl19krr62gddfhqm7nybqwcdnla4d6gsifqizhyfmqsyl7n";
           system = "piping";
           asd = "piping";
         }
@@ -82157,12 +83483,12 @@ lib.makeScope pkgs.newScope (self: {
   pithy-xml = (
     build-asdf-system {
       pname = "pithy-xml";
-      version = "20101006-git";
+      version = "20250622-git";
       asds = [ "pithy-xml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pithy-xml/2010-10-06/pithy-xml-20101006-git.tgz";
-          sha256 = "05zw5adiw7jgvi9w9c661s4r49fidpcxn6m7azmn0pzc936dg17h";
+          url = "http://beta.quicklisp.org/archive/pithy-xml/2025-06-22/pithy-xml-20250622-git.tgz";
+          sha256 = "03sjn0n2av6d4kd1xi156izlhiknwwqkkga375kv7mx8c7xvl6zj";
           system = "pithy-xml";
           asd = "pithy-xml";
         }
@@ -82316,33 +83642,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  planks = (
-    build-asdf-system {
-      pname = "planks";
-      version = "20110522-git";
-      asds = [ "planks" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/planks/2011-05-22/planks-20110522-git.tgz";
-          sha256 = "1y7cg9xb75j1yslbxsmw0fyg738f4d28lnlm7w7hzgc51fc7875k";
-          system = "planks";
-          asd = "planks";
-        }
-      );
-      systems = [ "planks" ];
-      lispLibs = [
-        (getAttr "babel" self)
-        (getAttr "bordeaux-threads" self)
-        (getAttr "closer-mop" self)
-        (getAttr "ironclad" self)
-        (getAttr "rucksack" self)
-        (getAttr "trivial-garbage" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   plokami = (
     build-asdf-system {
       pname = "plokami";
@@ -82434,12 +83733,12 @@ lib.makeScope pkgs.newScope (self: {
   plump = (
     build-asdf-system {
       pname = "plump";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "plump" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plump/2024-10-12/plump-20241012-git.tgz";
-          sha256 = "04wy2v69zal186gg0pvcj60184gi7cpkpx3h1w93c9nilmla0dv9";
+          url = "http://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz";
+          sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq";
           system = "plump";
           asd = "plump";
         }
@@ -82480,12 +83779,12 @@ lib.makeScope pkgs.newScope (self: {
   plump-dom = (
     build-asdf-system {
       pname = "plump-dom";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "plump-dom" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plump/2024-10-12/plump-20241012-git.tgz";
-          sha256 = "04wy2v69zal186gg0pvcj60184gi7cpkpx3h1w93c9nilmla0dv9";
+          url = "http://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz";
+          sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq";
           system = "plump-dom";
           asd = "plump-dom";
         }
@@ -82500,12 +83799,12 @@ lib.makeScope pkgs.newScope (self: {
   plump-lexer = (
     build-asdf-system {
       pname = "plump-lexer";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "plump-lexer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plump/2024-10-12/plump-20241012-git.tgz";
-          sha256 = "04wy2v69zal186gg0pvcj60184gi7cpkpx3h1w93c9nilmla0dv9";
+          url = "http://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz";
+          sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq";
           system = "plump-lexer";
           asd = "plump-lexer";
         }
@@ -82520,12 +83819,12 @@ lib.makeScope pkgs.newScope (self: {
   plump-parser = (
     build-asdf-system {
       pname = "plump-parser";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "plump-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plump/2024-10-12/plump-20241012-git.tgz";
-          sha256 = "04wy2v69zal186gg0pvcj60184gi7cpkpx3h1w93c9nilmla0dv9";
+          url = "http://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz";
+          sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq";
           system = "plump-parser";
           asd = "plump-parser";
         }
@@ -82540,12 +83839,12 @@ lib.makeScope pkgs.newScope (self: {
   plump-sexp = (
     build-asdf-system {
       pname = "plump-sexp";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "plump-sexp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plump-sexp/2024-10-12/plump-sexp-20241012-git.tgz";
-          sha256 = "19gihmsbwv42zwyc4rd1pcvj5yzf1vnhpci7r5kz1dnrmz9gzy3l";
+          url = "http://beta.quicklisp.org/archive/plump-sexp/2025-06-22/plump-sexp-20250622-git.tgz";
+          sha256 = "0rl7abbaiwggdblcirn3mdcnnghvq9x9sn4pqk9fmkmsn3ladm7a";
           system = "plump-sexp";
           asd = "plump-sexp";
         }
@@ -82835,12 +84134,12 @@ lib.makeScope pkgs.newScope (self: {
   polymorphic-functions-lite = (
     build-asdf-system {
       pname = "polymorphic-functions-lite";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "polymorphic-functions-lite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/polymorphic-functions/2024-10-12/polymorphic-functions-20241012-git.tgz";
-          sha256 = "1bawhbj5rh1q6qrcjnx48n78841mgri5n63pmicxxyhif2il0zq3";
+          url = "http://beta.quicklisp.org/archive/polymorphic-functions/2025-06-22/polymorphic-functions-20250622-git.tgz";
+          sha256 = "12rxvwfwpi899dx8nyighax2qd6jl0kch5f0ycg10am5kvprbkyy";
           system = "polymorphic-functions-lite";
           asd = "polymorphic-functions-lite";
         }
@@ -83346,12 +84645,12 @@ lib.makeScope pkgs.newScope (self: {
   precise-time = (
     build-asdf-system {
       pname = "precise-time";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "precise-time" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/precise-time/2024-10-12/precise-time-20241012-git.tgz";
-          sha256 = "114ix5nldfg301g0af8lsnc129i7hnhgdzmnznda2fv92zf3vn8g";
+          url = "http://beta.quicklisp.org/archive/precise-time/2025-06-22/precise-time-20250622-git.tgz";
+          sha256 = "1b7ky6m8ih8dz93psrznrxvvchrrhaby3q3fdlhr6nw8zpg63fsh";
           system = "precise-time";
           asd = "precise-time";
         }
@@ -83390,12 +84689,12 @@ lib.makeScope pkgs.newScope (self: {
   prepl = (
     build-asdf-system {
       pname = "prepl";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "prepl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prepl/2023-10-21/prepl-20231021-git.tgz";
-          sha256 = "0sbqlqbk9xrl30iklp3vs493zq4bc2nxv6q435cspicwz6igbjdw";
+          url = "http://beta.quicklisp.org/archive/prepl/2025-06-22/prepl-20250622-git.tgz";
+          sha256 = "0rwh46lbwr7gfcl0cb7k0snkg9z8hpv43ir575zw5kadiqxqwr3g";
           system = "prepl";
           asd = "prepl";
         }
@@ -83637,12 +84936,12 @@ lib.makeScope pkgs.newScope (self: {
   progressons = (
     build-asdf-system {
       pname = "progressons";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "progressons" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/progressons/2024-10-12/progressons-20241012-git.tgz";
-          sha256 = "1i93khd0l1aphzh6qb4yy9cpi2nmqac08b90yx95p4zymap03nly";
+          url = "http://beta.quicklisp.org/archive/progressons/2025-06-22/progressons-20250622-git.tgz";
+          sha256 = "136pnign0rl03c6pr3vbd4ia3yzl63svcv8dshxlmbpjwpma0nr3";
           system = "progressons";
           asd = "progressons";
         }
@@ -83892,12 +85191,12 @@ lib.makeScope pkgs.newScope (self: {
   prometheus-gc = (
     build-asdf-system {
       pname = "prometheus-gc";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "prometheus-gc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus-gc/2024-10-12/prometheus-gc-20241012-git.tgz";
-          sha256 = "0lfdh7j7jzklhr76fdw1z3a777h5sr5c9h1i6nv1knnm36l44zpj";
+          url = "http://beta.quicklisp.org/archive/prometheus-gc/2025-06-22/prometheus-gc-20250622-git.tgz";
+          sha256 = "0z9np2226649kllvkb7jyk7bc767z5i68861l1g96hyhbndf8aw6";
           system = "prometheus-gc";
           asd = "prometheus-gc";
         }
@@ -83915,12 +85214,12 @@ lib.makeScope pkgs.newScope (self: {
   prometheus-gc-ci = (
     build-asdf-system {
       pname = "prometheus-gc-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "prometheus-gc-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus-gc/2024-10-12/prometheus-gc-20241012-git.tgz";
-          sha256 = "0lfdh7j7jzklhr76fdw1z3a777h5sr5c9h1i6nv1knnm36l44zpj";
+          url = "http://beta.quicklisp.org/archive/prometheus-gc/2025-06-22/prometheus-gc-20250622-git.tgz";
+          sha256 = "0z9np2226649kllvkb7jyk7bc767z5i68861l1g96hyhbndf8aw6";
           system = "prometheus-gc-ci";
           asd = "prometheus-gc-ci";
         }
@@ -83935,12 +85234,12 @@ lib.makeScope pkgs.newScope (self: {
   prometheus-gc-tests = (
     build-asdf-system {
       pname = "prometheus-gc-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "prometheus-gc-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus-gc/2024-10-12/prometheus-gc-20241012-git.tgz";
-          sha256 = "0lfdh7j7jzklhr76fdw1z3a777h5sr5c9h1i6nv1knnm36l44zpj";
+          url = "http://beta.quicklisp.org/archive/prometheus-gc/2025-06-22/prometheus-gc-20250622-git.tgz";
+          sha256 = "0z9np2226649kllvkb7jyk7bc767z5i68861l1g96hyhbndf8aw6";
           system = "prometheus-gc-tests";
           asd = "prometheus-gc-tests";
         }
@@ -84957,12 +86256,12 @@ lib.makeScope pkgs.newScope (self: {
   py4cl2-cffi = (
     build-asdf-system {
       pname = "py4cl2-cffi";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "py4cl2-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/py4cl2-cffi/2024-10-12/py4cl2-cffi-20241012-git.tgz";
-          sha256 = "12ggqz8ibbzsmym51yfd19dlw751s7a1i6ra4z8m2ml3zw1k63zr";
+          url = "http://beta.quicklisp.org/archive/py4cl2-cffi/2025-06-22/py4cl2-cffi-20250622-git.tgz";
+          sha256 = "1niql10rjhm19qh3fsmp434h6j8x38dknwvwdc72r63gkn7lqiaa";
           system = "py4cl2-cffi";
           asd = "py4cl2-cffi";
         }
@@ -85090,26 +86389,6 @@ lib.makeScope pkgs.newScope (self: {
       meta = { };
     }
   );
-  q_plus = (
-    build-asdf-system {
-      pname = "q+";
-      version = "20230214-git";
-      asds = [ "q+" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz";
-          sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx";
-          system = "q+";
-          asd = "q+";
-        }
-      );
-      systems = [ "q+" ];
-      lispLibs = [ (getAttr "qtools" self) ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   qbase64 = (
     build-asdf-system {
       pname = "qbase64";
@@ -85206,12 +86485,12 @@ lib.makeScope pkgs.newScope (self: {
   qlot = (
     build-asdf-system {
       pname = "qlot";
-      version = "1.5.14";
+      version = "1.7.2";
       asds = [ "qlot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qlot/2024-10-12/qlot-1.5.14.tgz";
-          sha256 = "15rg8gjwisi2gp7a0pfgdvs9mjs1xxff0a58b14nm8sf11cdggkr";
+          url = "http://beta.quicklisp.org/archive/qlot/2025-06-22/qlot-1.7.2.tgz";
+          sha256 = "0mnpz4z589wfmc2pjwgjv86v09p0pqwdk10izv7xri9hab1823vq";
           system = "qlot";
           asd = "qlot";
         }
@@ -85221,10 +86500,12 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "archive" self)
         (getAttr "bordeaux-threads" self)
         (getAttr "cl_plus_ssl" self)
+        (getAttr "cl-ppcre" self)
         (getAttr "deflate" self)
         (getAttr "dexador" self)
         (getAttr "fuzzy-match" self)
         (getAttr "ironclad" self)
+        (getAttr "local-time" self)
         (getAttr "lparallel" self)
         (getAttr "quri" self)
         (getAttr "yason" self)
@@ -85237,25 +86518,28 @@ lib.makeScope pkgs.newScope (self: {
   qmynd = (
     build-asdf-system {
       pname = "qmynd";
-      version = "20190710-git";
+      version = "20250622-git";
       asds = [ "qmynd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qmynd/2019-07-10/qmynd-20190710-git.tgz";
-          sha256 = "06gw5wxcpdclb6a5i5k9lbmdlyqsp182czrm9bm1cpklzbj0ihrl";
+          url = "http://beta.quicklisp.org/archive/qmynd/2025-06-22/qmynd-20250622-git.tgz";
+          sha256 = "1j04if9zl6z80pj1301pd6dnp82id495wpgys53psgwn4y3z6y6w";
           system = "qmynd";
           asd = "qmynd";
         }
       );
       systems = [ "qmynd" ];
       lispLibs = [
+        (getAttr "asn1" self)
         (getAttr "babel" self)
         (getAttr "chipz" self)
         (getAttr "cl_plus_ssl" self)
+        (getAttr "cl-base64" self)
         (getAttr "flexi-streams" self)
         (getAttr "ironclad" self)
         (getAttr "list-of" self)
         (getAttr "salza2" self)
+        (getAttr "trivia" self)
         (getAttr "trivial-gray-streams" self)
         (getAttr "usocket" self)
       ];
@@ -85267,12 +86551,12 @@ lib.makeScope pkgs.newScope (self: {
   qmynd-test = (
     build-asdf-system {
       pname = "qmynd-test";
-      version = "20190710-git";
+      version = "20250622-git";
       asds = [ "qmynd-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qmynd/2019-07-10/qmynd-20190710-git.tgz";
-          sha256 = "06gw5wxcpdclb6a5i5k9lbmdlyqsp182czrm9bm1cpklzbj0ihrl";
+          url = "http://beta.quicklisp.org/archive/qmynd/2025-06-22/qmynd-20250622-git.tgz";
+          sha256 = "1j04if9zl6z80pj1301pd6dnp82id495wpgys53psgwn4y3z6y6w";
           system = "qmynd-test";
           asd = "qmynd-test";
         }
@@ -85590,1003 +86874,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  qtools = (
-    build-asdf-system {
-      pname = "qtools";
-      version = "20230214-git";
-      asds = [ "qtools" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz";
-          sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx";
-          system = "qtools";
-          asd = "qtools";
-        }
-      );
-      systems = [ "qtools" ];
-      lispLibs = [
-        (getAttr "cl-ppcre" self)
-        (getAttr "closer-mop" self)
-        (getAttr "deploy" self)
-        (getAttr "documentation-utils" self)
-        (getAttr "form-fiddle" self)
-        (getAttr "named-readtables" self)
-        (getAttr "qt_plus_libs" self)
-        (getAttr "trivial-garbage" self)
-        (getAttr "trivial-indent" self)
-        (getAttr "trivial-main-thread" self)
-      ];
-      meta = { };
-    }
-  );
-  qtools-evaluator = (
-    build-asdf-system {
-      pname = "qtools-evaluator";
-      version = "20230214-git";
-      asds = [ "qtools-evaluator" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz";
-          sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx";
-          system = "qtools-evaluator";
-          asd = "qtools-evaluator";
-        }
-      );
-      systems = [ "qtools-evaluator" ];
-      lispLibs = [
-        (getAttr "cl-ppcre" self)
-        (getAttr "qtcore" self)
-        (getAttr "qtgui" self)
-        (getAttr "qtools" self)
-        (getAttr "trivial-gray-streams" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-game = (
-    build-asdf-system {
-      pname = "qtools-game";
-      version = "20230214-git";
-      asds = [ "qtools-game" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz";
-          sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx";
-          system = "qtools-game";
-          asd = "qtools-game";
-        }
-      );
-      systems = [ "qtools-game" ];
-      lispLibs = [
-        (getAttr "closer-mop" self)
-        (getAttr "qtcore" self)
-        (getAttr "qtgui" self)
-        (getAttr "qtools" self)
-        (getAttr "qtopengl" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-helloworld = (
-    build-asdf-system {
-      pname = "qtools-helloworld";
-      version = "20230214-git";
-      asds = [ "qtools-helloworld" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz";
-          sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx";
-          system = "qtools-helloworld";
-          asd = "qtools-helloworld";
-        }
-      );
-      systems = [ "qtools-helloworld" ];
-      lispLibs = [
-        (getAttr "qtcore" self)
-        (getAttr "qtgui" self)
-        (getAttr "qtools" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-melody = (
-    build-asdf-system {
-      pname = "qtools-melody";
-      version = "20230214-git";
-      asds = [ "qtools-melody" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz";
-          sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx";
-          system = "qtools-melody";
-          asd = "qtools-melody";
-        }
-      );
-      systems = [ "qtools-melody" ];
-      lispLibs = [
-        (getAttr "phonon" self)
-        (getAttr "qtcore" self)
-        (getAttr "qtgui" self)
-        (getAttr "qtools" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-opengl = (
-    build-asdf-system {
-      pname = "qtools-opengl";
-      version = "20230214-git";
-      asds = [ "qtools-opengl" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz";
-          sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx";
-          system = "qtools-opengl";
-          asd = "qtools-opengl";
-        }
-      );
-      systems = [ "qtools-opengl" ];
-      lispLibs = [
-        (getAttr "cl-opengl" self)
-        (getAttr "qtcore" self)
-        (getAttr "qtgui" self)
-        (getAttr "qtools" self)
-        (getAttr "qtopengl" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-titter = (
-    build-asdf-system {
-      pname = "qtools-titter";
-      version = "20230214-git";
-      asds = [ "qtools-titter" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools/2023-02-14/qtools-20230214-git.tgz";
-          sha256 = "1w9v2swdqqalvlc36kbb1fbvqmwlndisp2dnqbkx8s8h67k1m4lx";
-          system = "qtools-titter";
-          asd = "qtools-titter";
-        }
-      );
-      systems = [ "qtools-titter" ];
-      lispLibs = [
-        (getAttr "chirp" self)
-        (getAttr "qtcore" self)
-        (getAttr "qtgui" self)
-        (getAttr "qtools" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui = (
-    build-asdf-system {
-      pname = "qtools-ui";
-      version = "20200218-git";
-      asds = [ "qtools-ui" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui";
-          asd = "qtools-ui";
-        }
-      );
-      systems = [ "qtools-ui" ];
-      lispLibs = [
-        (getAttr "qtools-ui-auto-resizing-textedit" self)
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-cell" self)
-        (getAttr "qtools-ui-color-history" self)
-        (getAttr "qtools-ui-color-picker" self)
-        (getAttr "qtools-ui-color-sliders" self)
-        (getAttr "qtools-ui-color-triangle" self)
-        (getAttr "qtools-ui-compass" self)
-        (getAttr "qtools-ui-container" self)
-        (getAttr "qtools-ui-debugger" self)
-        (getAttr "qtools-ui-dialog" self)
-        (getAttr "qtools-ui-dictionary" self)
-        (getAttr "qtools-ui-drag-and-drop" self)
-        (getAttr "qtools-ui-fixed-qtextedit" self)
-        (getAttr "qtools-ui-flow-layout" self)
-        (getAttr "qtools-ui-helpers" self)
-        (getAttr "qtools-ui-imagetools" self)
-        (getAttr "qtools-ui-keychord-editor" self)
-        (getAttr "qtools-ui-layout" self)
-        (getAttr "qtools-ui-listing" self)
-        (getAttr "qtools-ui-notification" self)
-        (getAttr "qtools-ui-options" self)
-        (getAttr "qtools-ui-panels" self)
-        (getAttr "qtools-ui-placeholder-text-edit" self)
-        (getAttr "qtools-ui-plot" self)
-        (getAttr "qtools-ui-repl" self)
-        (getAttr "qtools-ui-slider" self)
-        (getAttr "qtools-ui-spellchecked-text-edit" self)
-        (getAttr "qtools-ui-splitter" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-auto-resizing-textedit = (
-    build-asdf-system {
-      pname = "qtools-ui-auto-resizing-textedit";
-      version = "20200218-git";
-      asds = [ "qtools-ui-auto-resizing-textedit" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-auto-resizing-textedit";
-          asd = "qtools-ui-auto-resizing-textedit";
-        }
-      );
-      systems = [ "qtools-ui-auto-resizing-textedit" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-fixed-qtextedit" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-base = (
-    build-asdf-system {
-      pname = "qtools-ui-base";
-      version = "20200218-git";
-      asds = [ "qtools-ui-base" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-base";
-          asd = "qtools-ui-base";
-        }
-      );
-      systems = [ "qtools-ui-base" ];
-      lispLibs = [
-        (getAttr "array-utils" self)
-        (getAttr "documentation-utils" self)
-        (getAttr "qtcore" self)
-        (getAttr "qtgui" self)
-        (getAttr "qtools" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-bytearray = (
-    build-asdf-system {
-      pname = "qtools-ui-bytearray";
-      version = "20200218-git";
-      asds = [ "qtools-ui-bytearray" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-bytearray";
-          asd = "qtools-ui-bytearray";
-        }
-      );
-      systems = [ "qtools-ui-bytearray" ];
-      lispLibs = [ (getAttr "qtools-ui-base" self) ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-cell = (
-    build-asdf-system {
-      pname = "qtools-ui-cell";
-      version = "20200218-git";
-      asds = [ "qtools-ui-cell" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-cell";
-          asd = "qtools-ui-cell";
-        }
-      );
-      systems = [ "qtools-ui-cell" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-helpers" self)
-        (getAttr "qtools-ui-layout" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-color-history = (
-    build-asdf-system {
-      pname = "qtools-ui-color-history";
-      version = "20200218-git";
-      asds = [ "qtools-ui-color-history" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-color-history";
-          asd = "qtools-ui-color-history";
-        }
-      );
-      systems = [ "qtools-ui-color-history" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-flow-layout" self)
-        (getAttr "qtools-ui-helpers" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-color-picker = (
-    build-asdf-system {
-      pname = "qtools-ui-color-picker";
-      version = "20200218-git";
-      asds = [ "qtools-ui-color-picker" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-color-picker";
-          asd = "qtools-ui-color-picker";
-        }
-      );
-      systems = [ "qtools-ui-color-picker" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-color-history" self)
-        (getAttr "qtools-ui-color-sliders" self)
-        (getAttr "qtools-ui-color-triangle" self)
-        (getAttr "qtools-ui-dialog" self)
-        (getAttr "qtools-ui-helpers" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-color-sliders = (
-    build-asdf-system {
-      pname = "qtools-ui-color-sliders";
-      version = "20200218-git";
-      asds = [ "qtools-ui-color-sliders" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-color-sliders";
-          asd = "qtools-ui-color-sliders";
-        }
-      );
-      systems = [ "qtools-ui-color-sliders" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-helpers" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-color-triangle = (
-    build-asdf-system {
-      pname = "qtools-ui-color-triangle";
-      version = "20200218-git";
-      asds = [ "qtools-ui-color-triangle" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-color-triangle";
-          asd = "qtools-ui-color-triangle";
-        }
-      );
-      systems = [ "qtools-ui-color-triangle" ];
-      lispLibs = [
-        (getAttr "cl-opengl" self)
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-helpers" self)
-        (getAttr "qtopengl" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-compass = (
-    build-asdf-system {
-      pname = "qtools-ui-compass";
-      version = "20200218-git";
-      asds = [ "qtools-ui-compass" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-compass";
-          asd = "qtools-ui-compass";
-        }
-      );
-      systems = [ "qtools-ui-compass" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-layout" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-container = (
-    build-asdf-system {
-      pname = "qtools-ui-container";
-      version = "20200218-git";
-      asds = [ "qtools-ui-container" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-container";
-          asd = "qtools-ui-container";
-        }
-      );
-      systems = [ "qtools-ui-container" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-layout" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-debugger = (
-    build-asdf-system {
-      pname = "qtools-ui-debugger";
-      version = "20200218-git";
-      asds = [ "qtools-ui-debugger" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-debugger";
-          asd = "qtools-ui-debugger";
-        }
-      );
-      systems = [ "qtools-ui-debugger" ];
-      lispLibs = [
-        (getAttr "dissect" self)
-        (getAttr "qtools-ui-base" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-dialog = (
-    build-asdf-system {
-      pname = "qtools-ui-dialog";
-      version = "20200218-git";
-      asds = [ "qtools-ui-dialog" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-dialog";
-          asd = "qtools-ui-dialog";
-        }
-      );
-      systems = [ "qtools-ui-dialog" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-helpers" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-dictionary = (
-    build-asdf-system {
-      pname = "qtools-ui-dictionary";
-      version = "20200218-git";
-      asds = [ "qtools-ui-dictionary" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-dictionary";
-          asd = "qtools-ui-dictionary";
-        }
-      );
-      systems = [ "qtools-ui-dictionary" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-fixed-qtextedit" self)
-        (getAttr "qtools-ui-helpers" self)
-        (getAttr "wordnet" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-drag-and-drop = (
-    build-asdf-system {
-      pname = "qtools-ui-drag-and-drop";
-      version = "20200218-git";
-      asds = [ "qtools-ui-drag-and-drop" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-drag-and-drop";
-          asd = "qtools-ui-drag-and-drop";
-        }
-      );
-      systems = [ "qtools-ui-drag-and-drop" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-helpers" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-executable = (
-    build-asdf-system {
-      pname = "qtools-ui-executable";
-      version = "20200218-git";
-      asds = [ "qtools-ui-executable" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-executable";
-          asd = "qtools-ui-executable";
-        }
-      );
-      systems = [ "qtools-ui-executable" ];
-      lispLibs = [
-        (getAttr "bordeaux-threads" self)
-        (getAttr "qtools-ui-base" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-fixed-qtextedit = (
-    build-asdf-system {
-      pname = "qtools-ui-fixed-qtextedit";
-      version = "20200218-git";
-      asds = [ "qtools-ui-fixed-qtextedit" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-fixed-qtextedit";
-          asd = "qtools-ui-fixed-qtextedit";
-        }
-      );
-      systems = [ "qtools-ui-fixed-qtextedit" ];
-      lispLibs = [ (getAttr "qtools-ui-base" self) ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-flow-layout = (
-    build-asdf-system {
-      pname = "qtools-ui-flow-layout";
-      version = "20200218-git";
-      asds = [ "qtools-ui-flow-layout" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-flow-layout";
-          asd = "qtools-ui-flow-layout";
-        }
-      );
-      systems = [ "qtools-ui-flow-layout" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-container" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-helpers = (
-    build-asdf-system {
-      pname = "qtools-ui-helpers";
-      version = "20200218-git";
-      asds = [ "qtools-ui-helpers" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-helpers";
-          asd = "qtools-ui-helpers";
-        }
-      );
-      systems = [ "qtools-ui-helpers" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-layout" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-imagetools = (
-    build-asdf-system {
-      pname = "qtools-ui-imagetools";
-      version = "20200218-git";
-      asds = [ "qtools-ui-imagetools" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-imagetools";
-          asd = "qtools-ui-imagetools";
-        }
-      );
-      systems = [ "qtools-ui-imagetools" ];
-      lispLibs = [
-        (getAttr "qimageblitz" self)
-        (getAttr "qtools-ui-base" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-keychord-editor = (
-    build-asdf-system {
-      pname = "qtools-ui-keychord-editor";
-      version = "20200218-git";
-      asds = [ "qtools-ui-keychord-editor" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-keychord-editor";
-          asd = "qtools-ui-keychord-editor";
-        }
-      );
-      systems = [ "qtools-ui-keychord-editor" ];
-      lispLibs = [ (getAttr "qtools-ui-base" self) ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-layout = (
-    build-asdf-system {
-      pname = "qtools-ui-layout";
-      version = "20200218-git";
-      asds = [ "qtools-ui-layout" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-layout";
-          asd = "qtools-ui-layout";
-        }
-      );
-      systems = [ "qtools-ui-layout" ];
-      lispLibs = [ (getAttr "qtools-ui-base" self) ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-listing = (
-    build-asdf-system {
-      pname = "qtools-ui-listing";
-      version = "20200218-git";
-      asds = [ "qtools-ui-listing" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-listing";
-          asd = "qtools-ui-listing";
-        }
-      );
-      systems = [ "qtools-ui-listing" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-cell" self)
-        (getAttr "qtools-ui-container" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-notification = (
-    build-asdf-system {
-      pname = "qtools-ui-notification";
-      version = "20200218-git";
-      asds = [ "qtools-ui-notification" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-notification";
-          asd = "qtools-ui-notification";
-        }
-      );
-      systems = [ "qtools-ui-notification" ];
-      lispLibs = [ (getAttr "qtools-ui-base" self) ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-options = (
-    build-asdf-system {
-      pname = "qtools-ui-options";
-      version = "20200218-git";
-      asds = [ "qtools-ui-options" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-options";
-          asd = "qtools-ui-options";
-        }
-      );
-      systems = [ "qtools-ui-options" ];
-      lispLibs = [
-        (getAttr "closer-mop" self)
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-color-picker" self)
-        (getAttr "qtools-ui-color-triangle" self)
-        (getAttr "qtools-ui-helpers" self)
-        (getAttr "qtools-ui-listing" self)
-        (getAttr "qtools-ui-slider" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-panels = (
-    build-asdf-system {
-      pname = "qtools-ui-panels";
-      version = "20200218-git";
-      asds = [ "qtools-ui-panels" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-panels";
-          asd = "qtools-ui-panels";
-        }
-      );
-      systems = [ "qtools-ui-panels" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-compass" self)
-        (getAttr "qtools-ui-helpers" self)
-        (getAttr "qtools-ui-splitter" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-placeholder-text-edit = (
-    build-asdf-system {
-      pname = "qtools-ui-placeholder-text-edit";
-      version = "20200218-git";
-      asds = [ "qtools-ui-placeholder-text-edit" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-placeholder-text-edit";
-          asd = "qtools-ui-placeholder-text-edit";
-        }
-      );
-      systems = [ "qtools-ui-placeholder-text-edit" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-fixed-qtextedit" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-plot = (
-    build-asdf-system {
-      pname = "qtools-ui-plot";
-      version = "20200218-git";
-      asds = [ "qtools-ui-plot" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-plot";
-          asd = "qtools-ui-plot";
-        }
-      );
-      systems = [ "qtools-ui-plot" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-helpers" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-progress-bar = (
-    build-asdf-system {
-      pname = "qtools-ui-progress-bar";
-      version = "20200218-git";
-      asds = [ "qtools-ui-progress-bar" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-progress-bar";
-          asd = "qtools-ui-progress-bar";
-        }
-      );
-      systems = [ "qtools-ui-progress-bar" ];
-      lispLibs = [ (getAttr "qtools-ui-base" self) ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-repl = (
-    build-asdf-system {
-      pname = "qtools-ui-repl";
-      version = "20200218-git";
-      asds = [ "qtools-ui-repl" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-repl";
-          asd = "qtools-ui-repl";
-        }
-      );
-      systems = [ "qtools-ui-repl" ];
-      lispLibs = [
-        (getAttr "bordeaux-threads" self)
-        (getAttr "qtools-ui-base" self)
-        (getAttr "trivial-gray-streams" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-slider = (
-    build-asdf-system {
-      pname = "qtools-ui-slider";
-      version = "20200218-git";
-      asds = [ "qtools-ui-slider" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-slider";
-          asd = "qtools-ui-slider";
-        }
-      );
-      systems = [ "qtools-ui-slider" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-helpers" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-spellchecked-text-edit = (
-    build-asdf-system {
-      pname = "qtools-ui-spellchecked-text-edit";
-      version = "20200218-git";
-      asds = [ "qtools-ui-spellchecked-text-edit" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-spellchecked-text-edit";
-          asd = "qtools-ui-spellchecked-text-edit";
-        }
-      );
-      systems = [ "qtools-ui-spellchecked-text-edit" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-fixed-qtextedit" self)
-        (getAttr "qtools-ui-helpers" self)
-        (getAttr "spell" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-splitter = (
-    build-asdf-system {
-      pname = "qtools-ui-splitter";
-      version = "20200218-git";
-      asds = [ "qtools-ui-splitter" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-splitter";
-          asd = "qtools-ui-splitter";
-        }
-      );
-      systems = [ "qtools-ui-splitter" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtools-ui-container" self)
-        (getAttr "qtools-ui-helpers" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  qtools-ui-svgtools = (
-    build-asdf-system {
-      pname = "qtools-ui-svgtools";
-      version = "20200218-git";
-      asds = [ "qtools-ui-svgtools" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz";
-          sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z";
-          system = "qtools-ui-svgtools";
-          asd = "qtools-ui-svgtools";
-        }
-      );
-      systems = [ "qtools-ui-svgtools" ];
-      lispLibs = [
-        (getAttr "qtools-ui-base" self)
-        (getAttr "qtsvg" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   qtopengl = (
     build-asdf-system {
       pname = "qtopengl";
@@ -87008,12 +87295,12 @@ lib.makeScope pkgs.newScope (self: {
   quaviver = (
     build-asdf-system {
       pname = "quaviver";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "quaviver" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quaviver/2024-10-12/quaviver-20241012-git.tgz";
-          sha256 = "17kixyznxfwlxkfl2d2ngxas3vi7r21bgfy4g7xlngvakxw3zfzp";
+          url = "http://beta.quicklisp.org/archive/quaviver/2025-06-22/quaviver-20250622-git.tgz";
+          sha256 = "1cghypzlpiprcw2napzvb4wjdykciqi7v4s70kqf4mk0mkbxymb2";
           system = "quaviver";
           asd = "quaviver";
         }
@@ -87276,12 +87563,12 @@ lib.makeScope pkgs.newScope (self: {
   quickhull = (
     build-asdf-system {
       pname = "quickhull";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "quickhull" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quickhull/2024-10-12/quickhull-20241012-git.tgz";
-          sha256 = "1814qq23dg2shnfdkw9w9ap53qzg2igy119bwslvflmcb1jd7bpm";
+          url = "http://beta.quicklisp.org/archive/quickhull/2025-06-22/quickhull-20250622-git.tgz";
+          sha256 = "1krlyqqsb6jqlx7byby8v0nadkg4aylbiz8jj0w3z9z3nqwp415p";
           system = "quickhull";
           asd = "quickhull";
         }
@@ -87566,12 +87853,12 @@ lib.makeScope pkgs.newScope (self: {
   quil-coalton = (
     build-asdf-system {
       pname = "quil-coalton";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "quil-coalton" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz";
-          sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7";
+          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "quil-coalton";
           asd = "quil-coalton";
         }
@@ -87834,12 +88121,12 @@ lib.makeScope pkgs.newScope (self: {
   random-sampling = (
     build-asdf-system {
       pname = "random-sampling";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "random-sampling" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/random-sampling/2024-10-12/random-sampling-20241012-git.tgz";
-          sha256 = "0c5cf7k37fh8h9dhcj9bfk9zx245i806wh7qkvh1g659kvl2gamj";
+          url = "http://beta.quicklisp.org/archive/random-sampling/2025-06-22/random-sampling-20250622-git.tgz";
+          sha256 = "1kj7ak0fsmmvayp3yqfnr0j0z7pkyrlnbgabkkckw7gcr0z0kbay";
           system = "random-sampling";
           asd = "random-sampling";
         }
@@ -87858,12 +88145,12 @@ lib.makeScope pkgs.newScope (self: {
   random-state = (
     build-asdf-system {
       pname = "random-state";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "random-state" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/random-state/2024-10-12/random-state-20241012-git.tgz";
-          sha256 = "1iwcrn2fqvsw651wk60nm6x5hlmlvj04v8xxfxmzhqmx5f081f1g";
+          url = "http://beta.quicklisp.org/archive/random-state/2025-06-22/random-state-20250622-git.tgz";
+          sha256 = "0bvb8hldhydmgf0vvjz10vwq8srkm0piglshzm260crvdq1nx4c0";
           system = "random-state";
           asd = "random-state";
         }
@@ -87875,53 +88162,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  random-state-test = (
-    build-asdf-system {
-      pname = "random-state-test";
-      version = "20241012-git";
-      asds = [ "random-state-test" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/random-state/2024-10-12/random-state-20241012-git.tgz";
-          sha256 = "1iwcrn2fqvsw651wk60nm6x5hlmlvj04v8xxfxmzhqmx5f081f1g";
-          system = "random-state-test";
-          asd = "random-state-test";
-        }
-      );
-      systems = [ "random-state-test" ];
-      lispLibs = [
-        (getAttr "parachute" self)
-        (getAttr "random-state" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  random-state-viewer = (
-    build-asdf-system {
-      pname = "random-state-viewer";
-      version = "20241012-git";
-      asds = [ "random-state-viewer" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/random-state/2024-10-12/random-state-20241012-git.tgz";
-          sha256 = "1iwcrn2fqvsw651wk60nm6x5hlmlvj04v8xxfxmzhqmx5f081f1g";
-          system = "random-state-viewer";
-          asd = "random-state-viewer";
-        }
-      );
-      systems = [ "random-state-viewer" ];
-      lispLibs = [
-        (getAttr "random-state" self)
-        (getAttr "trivial-features" self)
-        (getAttr "zpng" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   random-test = (
     build-asdf-system {
       pname = "random-test";
@@ -88017,12 +88257,12 @@ lib.makeScope pkgs.newScope (self: {
   ratify = (
     build-asdf-system {
       pname = "ratify";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "ratify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ratify/2023-10-21/ratify-20231021-git.tgz";
-          sha256 = "11fsamjjbc77kjhbsh0w9wkwbdq51paa07sxjb2brvcm0ji4hynf";
+          url = "http://beta.quicklisp.org/archive/ratify/2025-06-22/ratify-20250622-git.tgz";
+          sha256 = "0ja9rgx1n3zyyps4gxi8ws4r9vbqj5qj9bnmzwykfmsgy9wzi5d0";
           system = "ratify";
           asd = "ratify";
         }
@@ -88154,12 +88394,12 @@ lib.makeScope pkgs.newScope (self: {
   read-csv = (
     build-asdf-system {
       pname = "read-csv";
-      version = "20181018-git";
+      version = "20250622-git";
       asds = [ "read-csv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/read-csv/2018-10-18/read-csv-20181018-git.tgz";
-          sha256 = "1wr6n8z7jm611xf2jwp3pw03qzq76440cmb75495l5p907lmrbcs";
+          url = "http://beta.quicklisp.org/archive/read-csv/2025-06-22/read-csv-20250622-git.tgz";
+          sha256 = "01hj7wiawb4lyka3a7zka79dj0r44dsc28cbfh863dsjgmn6pkk0";
           system = "read-csv";
           asd = "read-csv";
         }
@@ -88171,44 +88411,21 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  read-csv_dot_test = (
-    build-asdf-system {
-      pname = "read-csv.test";
-      version = "20181018-git";
-      asds = [ "read-csv.test" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/read-csv/2018-10-18/read-csv-20181018-git.tgz";
-          sha256 = "1wr6n8z7jm611xf2jwp3pw03qzq76440cmb75495l5p907lmrbcs";
-          system = "read-csv.test";
-          asd = "read-csv";
-        }
-      );
-      systems = [ "read-csv.test" ];
-      lispLibs = [ (getAttr "read-csv" self) ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   read-number = (
     build-asdf-system {
       pname = "read-number";
-      version = "20230214-git";
+      version = "20250622-git";
       asds = [ "read-number" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/read-number/2023-02-14/read-number-20230214-git.tgz";
-          sha256 = "1y2g2vbg9zccm9h8r7dabgb315z7jhr91d81wa2cccibpgccdyac";
+          url = "http://beta.quicklisp.org/archive/read-number/2025-06-22/read-number-20250622-git.tgz";
+          sha256 = "1k43sdcqzhlfcih7dm6ich0v3g33vrqg14ni2cgn73463m3r13bg";
           system = "read-number";
           asd = "read-number";
         }
       );
       systems = [ "read-number" ];
-      lispLibs = [
-        (getAttr "alexandria" self)
-        (getAttr "lisp-unit" self)
-      ];
+      lispLibs = [ (getAttr "alexandria" self) ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -88311,12 +88528,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks = (
     build-asdf-system {
       pname = "reblocks";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks/2024-10-12/reblocks-20241012-git.tgz";
-          sha256 = "0s8npy7bh013qhm6ngvi7ar117ja2m098nr4krnzlcg2ivxdff3i";
+          url = "http://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz";
+          sha256 = "1c5vr60010jshxf6kq1pvjqhlspky1djm39sz7sl9hyqh9jrvqdh";
           system = "reblocks";
           asd = "reblocks";
         }
@@ -88324,6 +88541,7 @@ lib.makeScope pkgs.newScope (self: {
       systems = [ "reblocks" ];
       lispLibs = [
         (getAttr "_40ants-doc" self)
+        (getAttr "_40ants-routes" self)
         (getAttr "alexandria" self)
         (getAttr "anaphora" self)
         (getAttr "babel" self)
@@ -88335,14 +88553,12 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "clack" self)
         (getAttr "closer-mop" self)
         (getAttr "dexador" self)
-        (getAttr "f-underscore" self)
         (getAttr "find-port" self)
         (getAttr "ironclad" self)
         (getAttr "jonathan" self)
         (getAttr "lack" self)
         (getAttr "lack-middleware-session" self)
         (getAttr "lack-request" self)
-        (getAttr "lack-response" self)
         (getAttr "lack-util" self)
         (getAttr "local-time" self)
         (getAttr "log4cl" self)
@@ -88361,7 +88577,6 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "str" self)
         (getAttr "trivial-garbage" self)
         (getAttr "trivial-open-browser" self)
-        (getAttr "trivial-timeout" self)
         (getAttr "uuid" self)
         (getAttr "yason" self)
       ];
@@ -88373,12 +88588,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-auth = (
     build-asdf-system {
       pname = "reblocks-auth";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-auth" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-auth/2024-10-12/reblocks-auth-20241012-git.tgz";
-          sha256 = "1qydbk61a5xb2a61gj8mal0bmanhzynky1rh6lzwa10r5ybls4dq";
+          url = "http://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz";
+          sha256 = "11yzl40a542hk5q35ign9f3agjx1g6z8a56s2sgqrymmavin2hvk";
           system = "reblocks-auth";
           asd = "reblocks-auth";
         }
@@ -88411,12 +88626,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-auth-ci = (
     build-asdf-system {
       pname = "reblocks-auth-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-auth-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-auth/2024-10-12/reblocks-auth-20241012-git.tgz";
-          sha256 = "1qydbk61a5xb2a61gj8mal0bmanhzynky1rh6lzwa10r5ybls4dq";
+          url = "http://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz";
+          sha256 = "11yzl40a542hk5q35ign9f3agjx1g6z8a56s2sgqrymmavin2hvk";
           system = "reblocks-auth-ci";
           asd = "reblocks-auth-ci";
         }
@@ -88431,12 +88646,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-auth-example = (
     build-asdf-system {
       pname = "reblocks-auth-example";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-auth-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-auth/2024-10-12/reblocks-auth-20241012-git.tgz";
-          sha256 = "1qydbk61a5xb2a61gj8mal0bmanhzynky1rh6lzwa10r5ybls4dq";
+          url = "http://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz";
+          sha256 = "11yzl40a542hk5q35ign9f3agjx1g6z8a56s2sgqrymmavin2hvk";
           system = "reblocks-auth-example";
           asd = "reblocks-auth-example";
         }
@@ -88467,12 +88682,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-auth-tests = (
     build-asdf-system {
       pname = "reblocks-auth-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-auth-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-auth/2024-10-12/reblocks-auth-20241012-git.tgz";
-          sha256 = "1qydbk61a5xb2a61gj8mal0bmanhzynky1rh6lzwa10r5ybls4dq";
+          url = "http://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz";
+          sha256 = "11yzl40a542hk5q35ign9f3agjx1g6z8a56s2sgqrymmavin2hvk";
           system = "reblocks-auth-tests";
           asd = "reblocks-auth-tests";
         }
@@ -88487,12 +88702,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-docs = (
     build-asdf-system {
       pname = "reblocks-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks/2024-10-12/reblocks-20241012-git.tgz";
-          sha256 = "0s8npy7bh013qhm6ngvi7ar117ja2m098nr4krnzlcg2ivxdff3i";
+          url = "http://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz";
+          sha256 = "1c5vr60010jshxf6kq1pvjqhlspky1djm39sz7sl9hyqh9jrvqdh";
           system = "reblocks-docs";
           asd = "reblocks-docs";
         }
@@ -88507,12 +88722,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-file-server = (
     build-asdf-system {
       pname = "reblocks-file-server";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-file-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-file-server/2024-10-12/reblocks-file-server-20241012-git.tgz";
-          sha256 = "1v17v0474k845l0s0bgly3zbgq2rjn5fyh8zmjnisszgkdd3bh13";
+          url = "http://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz";
+          sha256 = "0lxmqw6hrdx977jjp20yfcnwvlzv1y1lha0h20vd8af19a9gcj35";
           system = "reblocks-file-server";
           asd = "reblocks-file-server";
         }
@@ -88520,11 +88735,17 @@ lib.makeScope pkgs.newScope (self: {
       systems = [ "reblocks-file-server" ];
       lispLibs = [
         (getAttr "_40ants-asdf-system" self)
+        (getAttr "_40ants-routes" self)
+        (getAttr "alexandria" self)
         (getAttr "cl-fad" self)
         (getAttr "cl-ppcre" self)
+        (getAttr "local-time" self)
         (getAttr "log4cl" self)
         (getAttr "reblocks" self)
+        (getAttr "reblocks-ui2" self)
         (getAttr "routes" self)
+        (getAttr "serapeum" self)
+        (getAttr "str" self)
         (getAttr "trivial-mimes" self)
       ];
       meta = {
@@ -88535,12 +88756,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-file-server-ci = (
     build-asdf-system {
       pname = "reblocks-file-server-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-file-server-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-file-server/2024-10-12/reblocks-file-server-20241012-git.tgz";
-          sha256 = "1v17v0474k845l0s0bgly3zbgq2rjn5fyh8zmjnisszgkdd3bh13";
+          url = "http://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz";
+          sha256 = "0lxmqw6hrdx977jjp20yfcnwvlzv1y1lha0h20vd8af19a9gcj35";
           system = "reblocks-file-server-ci";
           asd = "reblocks-file-server-ci";
         }
@@ -88555,12 +88776,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-file-server-docs = (
     build-asdf-system {
       pname = "reblocks-file-server-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-file-server-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-file-server/2024-10-12/reblocks-file-server-20241012-git.tgz";
-          sha256 = "1v17v0474k845l0s0bgly3zbgq2rjn5fyh8zmjnisszgkdd3bh13";
+          url = "http://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz";
+          sha256 = "0lxmqw6hrdx977jjp20yfcnwvlzv1y1lha0h20vd8af19a9gcj35";
           system = "reblocks-file-server-docs";
           asd = "reblocks-file-server-docs";
         }
@@ -88581,12 +88802,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-file-server-tests = (
     build-asdf-system {
       pname = "reblocks-file-server-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-file-server-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-file-server/2024-10-12/reblocks-file-server-20241012-git.tgz";
-          sha256 = "1v17v0474k845l0s0bgly3zbgq2rjn5fyh8zmjnisszgkdd3bh13";
+          url = "http://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz";
+          sha256 = "0lxmqw6hrdx977jjp20yfcnwvlzv1y1lha0h20vd8af19a9gcj35";
           system = "reblocks-file-server-tests";
           asd = "reblocks-file-server-tests";
         }
@@ -88601,12 +88822,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-lass = (
     build-asdf-system {
       pname = "reblocks-lass";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-lass" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-lass/2024-10-12/reblocks-lass-20241012-git.tgz";
-          sha256 = "0aic2dnsp4hkc26fpnn0p493psz1fip9rfhbacfwaaqyxdgrh9cl";
+          url = "http://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz";
+          sha256 = "0hjqfqfwcgfk77xm3wdynxskd6zirhk6yccdk2ni2gm81yqwdnh1";
           system = "reblocks-lass";
           asd = "reblocks-lass";
         }
@@ -88625,12 +88846,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-lass-ci = (
     build-asdf-system {
       pname = "reblocks-lass-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-lass-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-lass/2024-10-12/reblocks-lass-20241012-git.tgz";
-          sha256 = "0aic2dnsp4hkc26fpnn0p493psz1fip9rfhbacfwaaqyxdgrh9cl";
+          url = "http://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz";
+          sha256 = "0hjqfqfwcgfk77xm3wdynxskd6zirhk6yccdk2ni2gm81yqwdnh1";
           system = "reblocks-lass-ci";
           asd = "reblocks-lass-ci";
         }
@@ -88645,12 +88866,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-lass-docs = (
     build-asdf-system {
       pname = "reblocks-lass-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-lass-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-lass/2024-10-12/reblocks-lass-20241012-git.tgz";
-          sha256 = "0aic2dnsp4hkc26fpnn0p493psz1fip9rfhbacfwaaqyxdgrh9cl";
+          url = "http://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz";
+          sha256 = "0hjqfqfwcgfk77xm3wdynxskd6zirhk6yccdk2ni2gm81yqwdnh1";
           system = "reblocks-lass-docs";
           asd = "reblocks-lass-docs";
         }
@@ -88671,12 +88892,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-lass-tests = (
     build-asdf-system {
       pname = "reblocks-lass-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-lass-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-lass/2024-10-12/reblocks-lass-20241012-git.tgz";
-          sha256 = "0aic2dnsp4hkc26fpnn0p493psz1fip9rfhbacfwaaqyxdgrh9cl";
+          url = "http://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz";
+          sha256 = "0hjqfqfwcgfk77xm3wdynxskd6zirhk6yccdk2ni2gm81yqwdnh1";
           system = "reblocks-lass-tests";
           asd = "reblocks-lass-tests";
         }
@@ -88691,12 +88912,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-navigation-widget = (
     build-asdf-system {
       pname = "reblocks-navigation-widget";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-navigation-widget" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2024-10-12/reblocks-navigation-widget-20241012-git.tgz";
-          sha256 = "0gwfzlf8054g3iizbkbbzkxfmr8xlcvgcqycx7crlgzc8qksrqhm";
+          url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2025-06-22/reblocks-navigation-widget-20250622-git.tgz";
+          sha256 = "0lbzm61cxc9j58alv01blqx1zaqzbmknjn6qf4l4ily52rk8aqmh";
           system = "reblocks-navigation-widget";
           asd = "reblocks-navigation-widget";
         }
@@ -88704,6 +88925,8 @@ lib.makeScope pkgs.newScope (self: {
       systems = [ "reblocks-navigation-widget" ];
       lispLibs = [
         (getAttr "_40ants-asdf-system" self)
+        (getAttr "alexandria" self)
+        (getAttr "cl-ppcre" self)
         (getAttr "log4cl" self)
         (getAttr "reblocks" self)
         (getAttr "str" self)
@@ -88716,12 +88939,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-navigation-widget-ci = (
     build-asdf-system {
       pname = "reblocks-navigation-widget-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-navigation-widget-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2024-10-12/reblocks-navigation-widget-20241012-git.tgz";
-          sha256 = "0gwfzlf8054g3iizbkbbzkxfmr8xlcvgcqycx7crlgzc8qksrqhm";
+          url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2025-06-22/reblocks-navigation-widget-20250622-git.tgz";
+          sha256 = "0lbzm61cxc9j58alv01blqx1zaqzbmknjn6qf4l4ily52rk8aqmh";
           system = "reblocks-navigation-widget-ci";
           asd = "reblocks-navigation-widget-ci";
         }
@@ -88733,41 +88956,15 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  reblocks-navigation-widget-docs = (
-    build-asdf-system {
-      pname = "reblocks-navigation-widget-docs";
-      version = "20241012-git";
-      asds = [ "reblocks-navigation-widget-docs" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2024-10-12/reblocks-navigation-widget-20241012-git.tgz";
-          sha256 = "0gwfzlf8054g3iizbkbbzkxfmr8xlcvgcqycx7crlgzc8qksrqhm";
-          system = "reblocks-navigation-widget-docs";
-          asd = "reblocks-navigation-widget-docs";
-        }
-      );
-      systems = [ "reblocks-navigation-widget-docs" ];
-      lispLibs = [
-        (getAttr "_40ants-doc" self)
-        (getAttr "docs-config" self)
-        (getAttr "named-readtables" self)
-        (getAttr "pythonic-string-reader" self)
-        (getAttr "reblocks-navigation-widget" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   reblocks-navigation-widget-tests = (
     build-asdf-system {
       pname = "reblocks-navigation-widget-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-navigation-widget-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2024-10-12/reblocks-navigation-widget-20241012-git.tgz";
-          sha256 = "0gwfzlf8054g3iizbkbbzkxfmr8xlcvgcqycx7crlgzc8qksrqhm";
+          url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2025-06-22/reblocks-navigation-widget-20250622-git.tgz";
+          sha256 = "0lbzm61cxc9j58alv01blqx1zaqzbmknjn6qf4l4ily52rk8aqmh";
           system = "reblocks-navigation-widget-tests";
           asd = "reblocks-navigation-widget-tests";
         }
@@ -88782,12 +88979,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-parenscript = (
     build-asdf-system {
       pname = "reblocks-parenscript";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-parenscript" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2024-10-12/reblocks-parenscript-20241012-git.tgz";
-          sha256 = "0c29y7k6kczzcz1fgsk0iyf93qsx4nmw3iir807zicya8dkvvpk6";
+          url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz";
+          sha256 = "10hxgz63dk02arkl9jvz2svk22iirvrw8v42yb5sf09871d7vph2";
           system = "reblocks-parenscript";
           asd = "reblocks-parenscript";
         }
@@ -88808,12 +89005,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-parenscript-ci = (
     build-asdf-system {
       pname = "reblocks-parenscript-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-parenscript-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2024-10-12/reblocks-parenscript-20241012-git.tgz";
-          sha256 = "0c29y7k6kczzcz1fgsk0iyf93qsx4nmw3iir807zicya8dkvvpk6";
+          url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz";
+          sha256 = "10hxgz63dk02arkl9jvz2svk22iirvrw8v42yb5sf09871d7vph2";
           system = "reblocks-parenscript-ci";
           asd = "reblocks-parenscript-ci";
         }
@@ -88828,12 +89025,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-parenscript-docs = (
     build-asdf-system {
       pname = "reblocks-parenscript-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-parenscript-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2024-10-12/reblocks-parenscript-20241012-git.tgz";
-          sha256 = "0c29y7k6kczzcz1fgsk0iyf93qsx4nmw3iir807zicya8dkvvpk6";
+          url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz";
+          sha256 = "10hxgz63dk02arkl9jvz2svk22iirvrw8v42yb5sf09871d7vph2";
           system = "reblocks-parenscript-docs";
           asd = "reblocks-parenscript-docs";
         }
@@ -88854,12 +89051,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-parenscript-tests = (
     build-asdf-system {
       pname = "reblocks-parenscript-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-parenscript-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2024-10-12/reblocks-parenscript-20241012-git.tgz";
-          sha256 = "0c29y7k6kczzcz1fgsk0iyf93qsx4nmw3iir807zicya8dkvvpk6";
+          url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz";
+          sha256 = "10hxgz63dk02arkl9jvz2svk22iirvrw8v42yb5sf09871d7vph2";
           system = "reblocks-parenscript-tests";
           asd = "reblocks-parenscript-tests";
         }
@@ -88874,12 +89071,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-prometheus = (
     build-asdf-system {
       pname = "reblocks-prometheus";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-prometheus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2024-10-12/reblocks-prometheus-20241012-git.tgz";
-          sha256 = "0bjzwk28csfdvnic2znil6cxk8fmh5p49n971q5pjs0dmwdzmwra";
+          url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz";
+          sha256 = "1jlncbw2krsdiwqmsj2l2cmnpq3qnj38717qnkw5mlwbiwcmjmy8";
           system = "reblocks-prometheus";
           asd = "reblocks-prometheus";
         }
@@ -88887,8 +89084,8 @@ lib.makeScope pkgs.newScope (self: {
       systems = [ "reblocks-prometheus" ];
       lispLibs = [
         (getAttr "_40ants-asdf-system" self)
+        (getAttr "_40ants-routes" self)
         (getAttr "cffi-grovel" self)
-        (getAttr "log4cl-extras" self)
         (getAttr "prometheus" self)
         (getAttr "prometheus-gc" self)
         (getAttr "prometheus_dot_collectors_dot_process" self)
@@ -88904,12 +89101,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-prometheus-ci = (
     build-asdf-system {
       pname = "reblocks-prometheus-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-prometheus-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2024-10-12/reblocks-prometheus-20241012-git.tgz";
-          sha256 = "0bjzwk28csfdvnic2znil6cxk8fmh5p49n971q5pjs0dmwdzmwra";
+          url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz";
+          sha256 = "1jlncbw2krsdiwqmsj2l2cmnpq3qnj38717qnkw5mlwbiwcmjmy8";
           system = "reblocks-prometheus-ci";
           asd = "reblocks-prometheus-ci";
         }
@@ -88924,12 +89121,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-prometheus-docs = (
     build-asdf-system {
       pname = "reblocks-prometheus-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-prometheus-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2024-10-12/reblocks-prometheus-20241012-git.tgz";
-          sha256 = "0bjzwk28csfdvnic2znil6cxk8fmh5p49n971q5pjs0dmwdzmwra";
+          url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz";
+          sha256 = "1jlncbw2krsdiwqmsj2l2cmnpq3qnj38717qnkw5mlwbiwcmjmy8";
           system = "reblocks-prometheus-docs";
           asd = "reblocks-prometheus-docs";
         }
@@ -88950,12 +89147,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-prometheus-tests = (
     build-asdf-system {
       pname = "reblocks-prometheus-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-prometheus-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2024-10-12/reblocks-prometheus-20241012-git.tgz";
-          sha256 = "0bjzwk28csfdvnic2znil6cxk8fmh5p49n971q5pjs0dmwdzmwra";
+          url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz";
+          sha256 = "1jlncbw2krsdiwqmsj2l2cmnpq3qnj38717qnkw5mlwbiwcmjmy8";
           system = "reblocks-prometheus-tests";
           asd = "reblocks-prometheus-tests";
         }
@@ -88970,18 +89167,19 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-tests = (
     build-asdf-system {
       pname = "reblocks-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks/2024-10-12/reblocks-20241012-git.tgz";
-          sha256 = "0s8npy7bh013qhm6ngvi7ar117ja2m098nr4krnzlcg2ivxdff3i";
+          url = "http://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz";
+          sha256 = "1c5vr60010jshxf6kq1pvjqhlspky1djm39sz7sl9hyqh9jrvqdh";
           system = "reblocks-tests";
           asd = "reblocks-tests";
         }
       );
       systems = [ "reblocks-tests" ];
       lispLibs = [
+        (getAttr "_40ants-routes" self)
         (getAttr "alexandria" self)
         (getAttr "cl-mock" self)
         (getAttr "cl-ppcre" self)
@@ -89002,12 +89200,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-typeahead = (
     build-asdf-system {
       pname = "reblocks-typeahead";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-typeahead" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz";
-          sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m";
+          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
+          sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3";
           system = "reblocks-typeahead";
           asd = "reblocks-typeahead";
         }
@@ -89029,12 +89227,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-typeahead-ci = (
     build-asdf-system {
       pname = "reblocks-typeahead-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-typeahead-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz";
-          sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m";
+          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
+          sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3";
           system = "reblocks-typeahead-ci";
           asd = "reblocks-typeahead-ci";
         }
@@ -89049,12 +89247,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-typeahead-docs = (
     build-asdf-system {
       pname = "reblocks-typeahead-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-typeahead-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz";
-          sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m";
+          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
+          sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3";
           system = "reblocks-typeahead-docs";
           asd = "reblocks-typeahead-docs";
         }
@@ -89075,12 +89273,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-typeahead-example = (
     build-asdf-system {
       pname = "reblocks-typeahead-example";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-typeahead-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz";
-          sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m";
+          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
+          sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3";
           system = "reblocks-typeahead-example";
           asd = "reblocks-typeahead-example";
         }
@@ -89112,12 +89310,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-typeahead-tests = (
     build-asdf-system {
       pname = "reblocks-typeahead-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-typeahead-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz";
-          sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m";
+          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
+          sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3";
           system = "reblocks-typeahead-tests";
           asd = "reblocks-typeahead-tests";
         }
@@ -89132,12 +89330,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-ui = (
     build-asdf-system {
       pname = "reblocks-ui";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-ui" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-ui/2024-10-12/reblocks-ui-20241012-git.tgz";
-          sha256 = "1iwq62ba0rsiqw34d681nzg88wzps1f3d1ahl99crrk9xpy1c3y5";
+          url = "http://beta.quicklisp.org/archive/reblocks-ui/2025-06-22/reblocks-ui-20250622-git.tgz";
+          sha256 = "1540m5w5f0giph9sc4yzv8x5206pp26lai1x3h5z7ai2dadx3zw2";
           system = "reblocks-ui";
           asd = "reblocks-ui";
         }
@@ -89162,12 +89360,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-ui-docs = (
     build-asdf-system {
       pname = "reblocks-ui-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-ui-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-ui/2024-10-12/reblocks-ui-20241012-git.tgz";
-          sha256 = "1iwq62ba0rsiqw34d681nzg88wzps1f3d1ahl99crrk9xpy1c3y5";
+          url = "http://beta.quicklisp.org/archive/reblocks-ui/2025-06-22/reblocks-ui-20250622-git.tgz";
+          sha256 = "1540m5w5f0giph9sc4yzv8x5206pp26lai1x3h5z7ai2dadx3zw2";
           system = "reblocks-ui-docs";
           asd = "reblocks-ui-docs";
         }
@@ -89186,12 +89384,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-ui-examples = (
     build-asdf-system {
       pname = "reblocks-ui-examples";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-ui-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-ui/2024-10-12/reblocks-ui-20241012-git.tgz";
-          sha256 = "1iwq62ba0rsiqw34d681nzg88wzps1f3d1ahl99crrk9xpy1c3y5";
+          url = "http://beta.quicklisp.org/archive/reblocks-ui/2025-06-22/reblocks-ui-20250622-git.tgz";
+          sha256 = "1540m5w5f0giph9sc4yzv8x5206pp26lai1x3h5z7ai2dadx3zw2";
           system = "reblocks-ui-examples";
           asd = "reblocks-ui-examples";
         }
@@ -89207,15 +89405,165 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  reblocks-ui2 = (
+    build-asdf-system {
+      pname = "reblocks-ui2";
+      version = "20250622-git";
+      asds = [ "reblocks-ui2" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
+          sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9";
+          system = "reblocks-ui2";
+          asd = "reblocks-ui2";
+        }
+      );
+      systems = [ "reblocks-ui2" ];
+      lispLibs = [
+        (getAttr "_40ants-asdf-system" self)
+        (getAttr "alexandria" self)
+        (getAttr "anaphora" self)
+        (getAttr "closer-mop" self)
+        (getAttr "moptilities" self)
+        (getAttr "named-readtables" self)
+        (getAttr "parenscript" self)
+        (getAttr "pythonic-string-reader" self)
+        (getAttr "reblocks" self)
+        (getAttr "reblocks-lass" self)
+        (getAttr "serapeum" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  reblocks-ui2-ci = (
+    build-asdf-system {
+      pname = "reblocks-ui2-ci";
+      version = "20250622-git";
+      asds = [ "reblocks-ui2-ci" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
+          sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9";
+          system = "reblocks-ui2-ci";
+          asd = "reblocks-ui2-ci";
+        }
+      );
+      systems = [ "reblocks-ui2-ci" ];
+      lispLibs = [ (getAttr "_40ants-ci" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  reblocks-ui2-demo = (
+    build-asdf-system {
+      pname = "reblocks-ui2-demo";
+      version = "20250622-git";
+      asds = [ "reblocks-ui2-demo" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
+          sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9";
+          system = "reblocks-ui2-demo";
+          asd = "reblocks-ui2-demo";
+        }
+      );
+      systems = [ "reblocks-ui2-demo" ];
+      lispLibs = [
+        (getAttr "_40ants-asdf-system" self)
+        (getAttr "_40ants-logging" self)
+        (getAttr "_40ants-routes" self)
+        (getAttr "_40ants-slynk" self)
+        (getAttr "alexandria" self)
+        (getAttr "reblocks" self)
+        (getAttr "reblocks-file-server" self)
+        (getAttr "reblocks-prometheus" self)
+        (getAttr "reblocks-ui2-tailwind" self)
+        (getAttr "serapeum" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  reblocks-ui2-docs = (
+    build-asdf-system {
+      pname = "reblocks-ui2-docs";
+      version = "20250622-git";
+      asds = [ "reblocks-ui2-docs" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
+          sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9";
+          system = "reblocks-ui2-docs";
+          asd = "reblocks-ui2-docs";
+        }
+      );
+      systems = [ "reblocks-ui2-docs" ];
+      lispLibs = [
+        (getAttr "_40ants-doc" self)
+        (getAttr "docs-config" self)
+        (getAttr "named-readtables" self)
+        (getAttr "pythonic-string-reader" self)
+        (getAttr "reblocks-ui2" self)
+        (getAttr "reblocks-ui2-tailwind" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  reblocks-ui2-tailwind = (
+    build-asdf-system {
+      pname = "reblocks-ui2-tailwind";
+      version = "20250622-git";
+      asds = [ "reblocks-ui2-tailwind" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
+          sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9";
+          system = "reblocks-ui2-tailwind";
+          asd = "reblocks-ui2-tailwind";
+        }
+      );
+      systems = [ "reblocks-ui2-tailwind" ];
+      lispLibs = [ (getAttr "_40ants-asdf-system" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  reblocks-ui2-tests = (
+    build-asdf-system {
+      pname = "reblocks-ui2-tests";
+      version = "20250622-git";
+      asds = [ "reblocks-ui2-tests" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
+          sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9";
+          system = "reblocks-ui2-tests";
+          asd = "reblocks-ui2-tests";
+        }
+      );
+      systems = [ "reblocks-ui2-tests" ];
+      lispLibs = [ (getAttr "rove" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   reblocks-websocket = (
     build-asdf-system {
       pname = "reblocks-websocket";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-websocket" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-websocket/2024-10-12/reblocks-websocket-20241012-git.tgz";
-          sha256 = "0zn14if637cfadz93cgyk79hqrjyzddwc483gl10386rj9nvcf6b";
+          url = "http://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz";
+          sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6";
           system = "reblocks-websocket";
           asd = "reblocks-websocket";
         }
@@ -89241,12 +89589,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-websocket-ci = (
     build-asdf-system {
       pname = "reblocks-websocket-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-websocket-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-websocket/2024-10-12/reblocks-websocket-20241012-git.tgz";
-          sha256 = "0zn14if637cfadz93cgyk79hqrjyzddwc483gl10386rj9nvcf6b";
+          url = "http://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz";
+          sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6";
           system = "reblocks-websocket-ci";
           asd = "reblocks-websocket-ci";
         }
@@ -89261,12 +89609,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-websocket-docs = (
     build-asdf-system {
       pname = "reblocks-websocket-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-websocket-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-websocket/2024-10-12/reblocks-websocket-20241012-git.tgz";
-          sha256 = "0zn14if637cfadz93cgyk79hqrjyzddwc483gl10386rj9nvcf6b";
+          url = "http://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz";
+          sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6";
           system = "reblocks-websocket-docs";
           asd = "reblocks-websocket-docs";
         }
@@ -89287,12 +89635,12 @@ lib.makeScope pkgs.newScope (self: {
   reblocks-websocket-tests = (
     build-asdf-system {
       pname = "reblocks-websocket-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "reblocks-websocket-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-websocket/2024-10-12/reblocks-websocket-20241012-git.tgz";
-          sha256 = "0zn14if637cfadz93cgyk79hqrjyzddwc483gl10386rj9nvcf6b";
+          url = "http://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz";
+          sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6";
           system = "reblocks-websocket-tests";
           asd = "reblocks-websocket-tests";
         }
@@ -89437,12 +89785,12 @@ lib.makeScope pkgs.newScope (self: {
   redirect-stream = (
     build-asdf-system {
       pname = "redirect-stream";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "redirect-stream" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/redirect-stream/2023-10-21/redirect-stream-20231021-git.tgz";
-          sha256 = "1x8m2jk02dmsc2y8kq5h1bkdl51qz3ldg58hdzj6dpyi6ciykj28";
+          url = "http://beta.quicklisp.org/archive/redirect-stream/2025-06-22/redirect-stream-20250622-git.tgz";
+          sha256 = "1pg84dvfd0vnrc12zj6r7vpdkbqznsddk2a7qfqcdm8mjb5xf0ak";
           system = "redirect-stream";
           asd = "redirect-stream";
         }
@@ -90008,12 +90356,12 @@ lib.makeScope pkgs.newScope (self: {
   robot = (
     build-asdf-system {
       pname = "robot";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "robot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "robot";
           asd = "robot";
         }
@@ -90170,12 +90518,12 @@ lib.makeScope pkgs.newScope (self: {
   rove = (
     build-asdf-system {
       pname = "rove";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "rove" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rove/2024-10-12/rove-20241012-git.tgz";
-          sha256 = "1cx55d8frlk8rzdwbf1698rsvy34gx0ws2ix257qsh7gxy2mld05";
+          url = "http://beta.quicklisp.org/archive/rove/2025-06-22/rove-20250622-git.tgz";
+          sha256 = "082fz6gbifx0m255blxqvfdd5i930618i5ix3g5ar250abfdqabn";
           system = "rove";
           asd = "rove";
         }
@@ -90193,12 +90541,12 @@ lib.makeScope pkgs.newScope (self: {
   rovers-problem-translator = (
     build-asdf-system {
       pname = "rovers-problem-translator";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "rovers-problem-translator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shop3/2024-10-12/shop3-20241012-git.tgz";
-          sha256 = "1sdyyyd82fqmm9lcqmg7k8yy3l3891m2gjwidibzvk95bp4xf9sd";
+          url = "http://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz";
+          sha256 = "0vznjrg51bh261bh39d2cj5jifl7mlryksdb7rrcymqq0k6zc0pn";
           system = "rovers-problem-translator";
           asd = "rovers-problem-translator";
         }
@@ -91357,12 +91705,12 @@ lib.makeScope pkgs.newScope (self: {
   sb-cga = (
     build-asdf-system {
       pname = "sb-cga";
-      version = "20210531-git";
+      version = "20250622-git";
       asds = [ "sb-cga" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sb-cga/2021-05-31/sb-cga-20210531-git.tgz";
-          sha256 = "1y54qlwfrhch9aghk7nsbdx7x2qsvgsws1g2k631l9dsgdakw4w8";
+          url = "http://beta.quicklisp.org/archive/sb-cga/2025-06-22/sb-cga-20250622-git.tgz";
+          sha256 = "0yzlaiqhac914q5pqvn9kkg1pkxxdq4w7ndpbs4d5as67wihhpdb";
           system = "sb-cga";
           asd = "sb-cga";
         }
@@ -91417,12 +91765,12 @@ lib.makeScope pkgs.newScope (self: {
   sc-extensions = (
     build-asdf-system {
       pname = "sc-extensions";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "sc-extensions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sc-extensions/2024-10-12/sc-extensions-20241012-git.tgz";
-          sha256 = "1va153gr7002j5hshalq13gk6jpij29h613nm47aimj01hjy9p0n";
+          url = "http://beta.quicklisp.org/archive/sc-extensions/2025-06-22/sc-extensions-20250622-git.tgz";
+          sha256 = "1hxjcax7f6kqcf0a5lbqp407g7r1psy6wc0hsfdn5afrscdw5ak1";
           system = "sc-extensions";
           asd = "sc-extensions";
         }
@@ -91441,12 +91789,12 @@ lib.makeScope pkgs.newScope (self: {
   sc-osc = (
     build-asdf-system {
       pname = "sc-osc";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "sc-osc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-collider/2024-10-12/cl-collider-20241012-git.tgz";
-          sha256 = "0h0fyx7glxnzwyam2aflma6003h8fcvcf5nj5f7svarw9brcc2xa";
+          url = "http://beta.quicklisp.org/archive/cl-collider/2025-06-22/cl-collider-20250622-git.tgz";
+          sha256 = "01yiwwi9zhh1vksk26m170i6x9lsbygbznaxggf8h9psiyqg5991";
           system = "sc-osc";
           asd = "sc-osc";
         }
@@ -91539,12 +91887,12 @@ lib.makeScope pkgs.newScope (self: {
   scigraph = (
     build-asdf-system {
       pname = "scigraph";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "scigraph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "scigraph";
           asd = "scigraph";
         }
@@ -91559,12 +91907,12 @@ lib.makeScope pkgs.newScope (self: {
   scrapycl = (
     build-asdf-system {
       pname = "scrapycl";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "scrapycl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scrapycl/2024-10-12/scrapycl-20241012-git.tgz";
-          sha256 = "0qlvsc5qr8vyyrsasp041ydlfx8vgsy191m0nhab487fzmrlbzwp";
+          url = "http://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz";
+          sha256 = "15pl1vd8gng1sg2pib63rj2cx60wn7an98gr13j8506ia99anm33";
           system = "scrapycl";
           asd = "scrapycl";
         }
@@ -91595,12 +91943,12 @@ lib.makeScope pkgs.newScope (self: {
   scrapycl-ci = (
     build-asdf-system {
       pname = "scrapycl-ci";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "scrapycl-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scrapycl/2024-10-12/scrapycl-20241012-git.tgz";
-          sha256 = "0qlvsc5qr8vyyrsasp041ydlfx8vgsy191m0nhab487fzmrlbzwp";
+          url = "http://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz";
+          sha256 = "15pl1vd8gng1sg2pib63rj2cx60wn7an98gr13j8506ia99anm33";
           system = "scrapycl-ci";
           asd = "scrapycl-ci";
         }
@@ -91615,12 +91963,12 @@ lib.makeScope pkgs.newScope (self: {
   scrapycl-docs = (
     build-asdf-system {
       pname = "scrapycl-docs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "scrapycl-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scrapycl/2024-10-12/scrapycl-20241012-git.tgz";
-          sha256 = "0qlvsc5qr8vyyrsasp041ydlfx8vgsy191m0nhab487fzmrlbzwp";
+          url = "http://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz";
+          sha256 = "15pl1vd8gng1sg2pib63rj2cx60wn7an98gr13j8506ia99anm33";
           system = "scrapycl-docs";
           asd = "scrapycl-docs";
         }
@@ -91641,12 +91989,12 @@ lib.makeScope pkgs.newScope (self: {
   scrapycl-tests = (
     build-asdf-system {
       pname = "scrapycl-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "scrapycl-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scrapycl/2024-10-12/scrapycl-20241012-git.tgz";
-          sha256 = "0qlvsc5qr8vyyrsasp041ydlfx8vgsy191m0nhab487fzmrlbzwp";
+          url = "http://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz";
+          sha256 = "15pl1vd8gng1sg2pib63rj2cx60wn7an98gr13j8506ia99anm33";
           system = "scrapycl-tests";
           asd = "scrapycl-tests";
         }
@@ -91681,50 +92029,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  screamer = (
-    build-asdf-system {
-      pname = "screamer";
-      version = "20210807-git";
-      asds = [ "screamer" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/screamer/2021-08-07/screamer-20210807-git.tgz";
-          sha256 = "0913wmy0fpf6shvbz40ay9gnjhgyjglf661d1p5ld2glkw1ky8hm";
-          system = "screamer";
-          asd = "screamer";
-        }
-      );
-      systems = [ "screamer" ];
-      lispLibs = [ ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  screamer-tests = (
-    build-asdf-system {
-      pname = "screamer-tests";
-      version = "20210807-git";
-      asds = [ "screamer-tests" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/screamer/2021-08-07/screamer-20210807-git.tgz";
-          sha256 = "0913wmy0fpf6shvbz40ay9gnjhgyjglf661d1p5ld2glkw1ky8hm";
-          system = "screamer-tests";
-          asd = "screamer-tests";
-        }
-      );
-      systems = [ "screamer-tests" ];
-      lispLibs = [
-        (getAttr "hu_dot_dwim_dot_stefil" self)
-        (getAttr "iterate" self)
-        (getAttr "screamer" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   scriba = (
     build-asdf-system {
       pname = "scriba";
@@ -92339,6 +92643,26 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  semz_dot_minisign-verify = (
+    build-asdf-system {
+      pname = "semz.minisign-verify";
+      version = "20250622-git";
+      asds = [ "semz.minisign-verify" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/minisign-verify/2025-06-22/minisign-verify-20250622-git.tgz";
+          sha256 = "10v87cm8yxnp7lgqbxcr6bn223391bk9sv9d9p0kff07d1a4dwrp";
+          system = "semz.minisign-verify";
+          asd = "semz.minisign-verify";
+        }
+      );
+      systems = [ "semz.minisign-verify" ];
+      lispLibs = [ ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   sendgrid = (
     build-asdf-system {
       pname = "sendgrid";
@@ -92367,12 +92691,12 @@ lib.makeScope pkgs.newScope (self: {
   sento = (
     build-asdf-system {
       pname = "sento";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "sento" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gserver/2024-10-12/cl-gserver-20241012-git.tgz";
-          sha256 = "1281iir75ccr5ilh2jv9xh1w446492gywvady48xggqyh6idaz9k";
+          url = "http://beta.quicklisp.org/archive/cl-gserver/2025-06-22/cl-gserver-20250622-git.tgz";
+          sha256 = "1lwa2habxdmjl2y9jl7ds2b1v1ijcdp7kk060b57g8hyx0saxj6x";
           system = "sento";
           asd = "sento";
         }
@@ -92515,12 +92839,12 @@ lib.makeScope pkgs.newScope (self: {
   serapeum = (
     build-asdf-system {
       pname = "serapeum";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "serapeum" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/serapeum/2024-10-12/serapeum-20241012-git.tgz";
-          sha256 = "12dc4p3i82p3jhxpp5wd6xiwy2fgdjybgfgj54nv8ya75rl9a64z";
+          url = "http://beta.quicklisp.org/archive/serapeum/2025-06-22/serapeum-20250622-git.tgz";
+          sha256 = "0vg7pzv9y2qx0zydnkx5klf0vb3ac5q8hy35z919b9037s7nrcl7";
           system = "serapeum";
           asd = "serapeum";
         }
@@ -92915,12 +93239,12 @@ lib.makeScope pkgs.newScope (self: {
   shellpool = (
     build-asdf-system {
       pname = "shellpool";
-      version = "20200925-git";
+      version = "20250622-git";
       asds = [ "shellpool" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shellpool/2020-09-25/shellpool-20200925-git.tgz";
-          sha256 = "1bpv58i2l2a3ayk3jvi2wwd90gjczp0qk24bj82775qp8miw9vz0";
+          url = "http://beta.quicklisp.org/archive/shellpool/2025-06-22/shellpool-20250622-git.tgz";
+          sha256 = "1ia1b7kcdrr9r1306my22c8sz4bjn7yki94j196dxrpbpb7s1jpb";
           system = "shellpool";
           asd = "shellpool";
         }
@@ -93015,12 +93339,12 @@ lib.makeScope pkgs.newScope (self: {
   shop3 = (
     build-asdf-system {
       pname = "shop3";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "shop3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shop3/2024-10-12/shop3-20241012-git.tgz";
-          sha256 = "1sdyyyd82fqmm9lcqmg7k8yy3l3891m2gjwidibzvk95bp4xf9sd";
+          url = "http://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz";
+          sha256 = "0vznjrg51bh261bh39d2cj5jifl7mlryksdb7rrcymqq0k6zc0pn";
           system = "shop3";
           asd = "shop3";
         }
@@ -93041,12 +93365,12 @@ lib.makeScope pkgs.newScope (self: {
   shop3-thmpr-api = (
     build-asdf-system {
       pname = "shop3-thmpr-api";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "shop3-thmpr-api" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shop3/2024-10-12/shop3-20241012-git.tgz";
-          sha256 = "1sdyyyd82fqmm9lcqmg7k8yy3l3891m2gjwidibzvk95bp4xf9sd";
+          url = "http://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz";
+          sha256 = "0vznjrg51bh261bh39d2cj5jifl7mlryksdb7rrcymqq0k6zc0pn";
           system = "shop3-thmpr-api";
           asd = "shop3-thmpr-api";
         }
@@ -93086,12 +93410,12 @@ lib.makeScope pkgs.newScope (self: {
   shuffletron = (
     build-asdf-system {
       pname = "shuffletron";
-      version = "20181018-git";
+      version = "20250622-git";
       asds = [ "shuffletron" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shuffletron/2018-10-18/shuffletron-20181018-git.tgz";
-          sha256 = "10626wp2xdk0wxj0kl49m9gyb2bp6f0vp67563mw6zrzfs7ynpkb";
+          url = "http://beta.quicklisp.org/archive/shuffletron/2025-06-22/shuffletron-20250622-git.tgz";
+          sha256 = "108xl69ndnb2wdy93sqgqacmbqhg8l82cn0rsqaqgfwapx6i5gaz";
           system = "shuffletron";
           asd = "shuffletron";
         }
@@ -93149,6 +93473,31 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  simpbin = (
+    build-asdf-system {
+      pname = "simpbin";
+      version = "20250622-git";
+      asds = [ "simpbin" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/simpbin/2025-06-22/simpbin-20250622-git.tgz";
+          sha256 = "0dymdi6crlq18x181gkip3vdyv2i3ryjip306vgw9ac2gg23rfdn";
+          system = "simpbin";
+          asd = "simpbin";
+        }
+      );
+      systems = [ "simpbin" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "fast-io" self)
+        (getAttr "flexi-streams" self)
+        (getAttr "nibbles" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   simple-actors = (
     build-asdf-system {
       pname = "simple-actors";
@@ -93368,12 +93717,12 @@ lib.makeScope pkgs.newScope (self: {
   simple-inferiors = (
     build-asdf-system {
       pname = "simple-inferiors";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "simple-inferiors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-inferiors/2023-10-21/simple-inferiors-20231021-git.tgz";
-          sha256 = "1b7y44r2ncpfc5766pw56k07036qjvwqdbycizldfk9rjam2afa6";
+          url = "http://beta.quicklisp.org/archive/simple-inferiors/2025-06-22/simple-inferiors-20250622-git.tgz";
+          sha256 = "050bwv7m6li41rq9cq2achy9j3zibnwyn2xigngg4knir0hi1f4s";
           system = "simple-inferiors";
           asd = "simple-inferiors";
         }
@@ -93389,12 +93738,12 @@ lib.makeScope pkgs.newScope (self: {
   simple-neural-network = (
     build-asdf-system {
       pname = "simple-neural-network";
-      version = "20230214-git";
+      version = "20250622-git";
       asds = [ "simple-neural-network" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-neural-network/2023-02-14/simple-neural-network-20230214-git.tgz";
-          sha256 = "14ix2f560bhvccfzi30ghmmg79785nmg8c3lpq5hg99djgigxyfw";
+          url = "http://beta.quicklisp.org/archive/simple-neural-network/2025-06-22/simple-neural-network-20250622-git.tgz";
+          sha256 = "15c4851qm1zv76hqa4081z0ni7dnf23130x1rxgsiysjpvz2slyf";
           system = "simple-neural-network";
           asd = "simple-neural-network";
         }
@@ -93455,12 +93804,12 @@ lib.makeScope pkgs.newScope (self: {
   simple-rgb = (
     build-asdf-system {
       pname = "simple-rgb";
-      version = "20190521-git";
+      version = "20250622-git";
       asds = [ "simple-rgb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-rgb/2019-05-21/simple-rgb-20190521-git.tgz";
-          sha256 = "0ggv0h2n4mvwnggjr1b40gw667gnyykzki2zadaczi38ydzyzlp1";
+          url = "http://beta.quicklisp.org/archive/simple-rgb/2025-06-22/simple-rgb-20250622-git.tgz";
+          sha256 = "1cmbq08kpha7k85mznqn3y6jn49ps8569737x3mr9kmks43raay9";
           system = "simple-rgb";
           asd = "simple-rgb";
         }
@@ -93523,12 +93872,12 @@ lib.makeScope pkgs.newScope (self: {
   simple-tasks = (
     build-asdf-system {
       pname = "simple-tasks";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "simple-tasks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-tasks/2023-10-21/simple-tasks-20231021-git.tgz";
-          sha256 = "14j0sbi9zv22rrcp3wvjzmrgk6f75zydhs50cbmspr2r0c9s5c6n";
+          url = "http://beta.quicklisp.org/archive/simple-tasks/2025-06-22/simple-tasks-20250622-git.tgz";
+          sha256 = "101fljqvac2msj5aaqbhk755c3ml3rnhz8675abixhfjzbhv1khi";
           system = "simple-tasks";
           asd = "simple-tasks";
         }
@@ -94008,12 +94357,12 @@ lib.makeScope pkgs.newScope (self: {
   slim = (
     build-asdf-system {
       pname = "slim";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "slim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz";
-          sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9";
+          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "slim";
           asd = "slim";
         }
@@ -94028,12 +94377,12 @@ lib.makeScope pkgs.newScope (self: {
   slite = (
     build-asdf-system {
       pname = "slite";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "slite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/slite/2024-10-12/slite-20241012-git.tgz";
-          sha256 = "1ij1qxp20p7zfxm453v42z27ff3z6lk7hly8knk5fj3awj9nvljd";
+          url = "http://beta.quicklisp.org/archive/slite/2025-06-22/slite-20250622-git.tgz";
+          sha256 = "10gfnppjja41w00cxnlf7qwcq92ssz5xn9gqsvdiwdsy12501qrz";
           system = "slite";
           asd = "slite";
         }
@@ -94126,12 +94475,12 @@ lib.makeScope pkgs.newScope (self: {
   slynk = (
     build-asdf-system {
       pname = "slynk";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "slynk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sly/2024-10-12/sly-20241012-git.tgz";
-          sha256 = "1mxkcgh7g76mqn148zm2mhsh09whwh89wldlyfhq0d9h96zch451";
+          url = "http://beta.quicklisp.org/archive/sly/2025-06-22/sly-20250622-git.tgz";
+          sha256 = "1744n32vc00n6fgc4sa8x6z7s1cym0nq6gqnqqyz56kcqc2h2qqb";
           system = "slynk";
           asd = "slynk";
         }
@@ -94235,12 +94584,12 @@ lib.makeScope pkgs.newScope (self: {
   small-coalton-programs = (
     build-asdf-system {
       pname = "small-coalton-programs";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "small-coalton-programs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz";
-          sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7";
+          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "small-coalton-programs";
           asd = "small-coalton-programs";
         }
@@ -94252,6 +94601,34 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  smallnet = (
+    build-asdf-system {
+      pname = "smallnet";
+      version = "20250622-git";
+      asds = [ "smallnet" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/smallnet/2025-06-22/smallnet-20250622-git.tgz";
+          sha256 = "0kmi2jrgi0m295r9kpw6ahxpbpjwpxnjxk3753yxaqwgh814al20";
+          system = "smallnet";
+          asd = "smallnet";
+        }
+      );
+      systems = [ "smallnet" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "babel" self)
+        (getAttr "cl_plus_ssl" self)
+        (getAttr "cl-mimeparse" self)
+        (getAttr "nytpu_dot_lisp-utils" self)
+        (getAttr "quri" self)
+        (getAttr "usocket" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   smart-buffer = (
     build-asdf-system {
       pname = "smart-buffer";
@@ -94419,12 +94796,12 @@ lib.makeScope pkgs.newScope (self: {
   snark = (
     build-asdf-system {
       pname = "snark";
-      version = "20160421-git";
+      version = "20250622-git";
       asds = [ "snark" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz";
-          sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5";
+          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark";
           asd = "snark";
         }
@@ -94439,12 +94816,12 @@ lib.makeScope pkgs.newScope (self: {
   snark-agenda = (
     build-asdf-system {
       pname = "snark-agenda";
-      version = "20160421-git";
+      version = "20250622-git";
       asds = [ "snark-agenda" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz";
-          sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5";
+          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-agenda";
           asd = "snark-agenda";
         }
@@ -94464,12 +94841,12 @@ lib.makeScope pkgs.newScope (self: {
   snark-auxiliary-packages = (
     build-asdf-system {
       pname = "snark-auxiliary-packages";
-      version = "20160421-git";
+      version = "20250622-git";
       asds = [ "snark-auxiliary-packages" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz";
-          sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5";
+          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-auxiliary-packages";
           asd = "snark-auxiliary-packages";
         }
@@ -94484,12 +94861,12 @@ lib.makeScope pkgs.newScope (self: {
   snark-deque = (
     build-asdf-system {
       pname = "snark-deque";
-      version = "20160421-git";
+      version = "20250622-git";
       asds = [ "snark-deque" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz";
-          sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5";
+          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-deque";
           asd = "snark-deque";
         }
@@ -94507,12 +94884,12 @@ lib.makeScope pkgs.newScope (self: {
   snark-dpll = (
     build-asdf-system {
       pname = "snark-dpll";
-      version = "20160421-git";
+      version = "20250622-git";
       asds = [ "snark-dpll" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz";
-          sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5";
+          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-dpll";
           asd = "snark-dpll";
         }
@@ -94530,12 +94907,12 @@ lib.makeScope pkgs.newScope (self: {
   snark-examples = (
     build-asdf-system {
       pname = "snark-examples";
-      version = "20160421-git";
+      version = "20250622-git";
       asds = [ "snark-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz";
-          sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5";
+          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-examples";
           asd = "snark-examples";
         }
@@ -94550,12 +94927,12 @@ lib.makeScope pkgs.newScope (self: {
   snark-feature = (
     build-asdf-system {
       pname = "snark-feature";
-      version = "20160421-git";
+      version = "20250622-git";
       asds = [ "snark-feature" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz";
-          sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5";
+          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-feature";
           asd = "snark-feature";
         }
@@ -94573,12 +94950,12 @@ lib.makeScope pkgs.newScope (self: {
   snark-implementation = (
     build-asdf-system {
       pname = "snark-implementation";
-      version = "20160421-git";
+      version = "20250622-git";
       asds = [ "snark-implementation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz";
-          sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5";
+          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-implementation";
           asd = "snark-implementation";
         }
@@ -94604,12 +94981,12 @@ lib.makeScope pkgs.newScope (self: {
   snark-infix-reader = (
     build-asdf-system {
       pname = "snark-infix-reader";
-      version = "20160421-git";
+      version = "20250622-git";
       asds = [ "snark-infix-reader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz";
-          sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5";
+          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-infix-reader";
           asd = "snark-infix-reader";
         }
@@ -94627,12 +95004,12 @@ lib.makeScope pkgs.newScope (self: {
   snark-lisp = (
     build-asdf-system {
       pname = "snark-lisp";
-      version = "20160421-git";
+      version = "20250622-git";
       asds = [ "snark-lisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz";
-          sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5";
+          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-lisp";
           asd = "snark-lisp";
         }
@@ -94647,12 +95024,12 @@ lib.makeScope pkgs.newScope (self: {
   snark-loads = (
     build-asdf-system {
       pname = "snark-loads";
-      version = "20160421-git";
+      version = "20250622-git";
       asds = [ "snark-loads" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz";
-          sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5";
+          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-loads";
           asd = "snark-loads";
         }
@@ -94667,12 +95044,12 @@ lib.makeScope pkgs.newScope (self: {
   snark-numbering = (
     build-asdf-system {
       pname = "snark-numbering";
-      version = "20160421-git";
+      version = "20250622-git";
       asds = [ "snark-numbering" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz";
-          sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5";
+          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-numbering";
           asd = "snark-numbering";
         }
@@ -94691,12 +95068,12 @@ lib.makeScope pkgs.newScope (self: {
   snark-pkg = (
     build-asdf-system {
       pname = "snark-pkg";
-      version = "20160421-git";
+      version = "20250622-git";
       asds = [ "snark-pkg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz";
-          sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5";
+          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-pkg";
           asd = "snark-pkg";
         }
@@ -94711,12 +95088,12 @@ lib.makeScope pkgs.newScope (self: {
   snark-sparse-array = (
     build-asdf-system {
       pname = "snark-sparse-array";
-      version = "20160421-git";
+      version = "20250622-git";
       asds = [ "snark-sparse-array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz";
-          sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5";
+          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-sparse-array";
           asd = "snark-sparse-array";
         }
@@ -94929,12 +95306,12 @@ lib.makeScope pkgs.newScope (self: {
   softdrink = (
     build-asdf-system {
       pname = "softdrink";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "softdrink" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/softdrink/2023-10-21/softdrink-20231021-git.tgz";
-          sha256 = "1454mqpwb2s7m1myhibj2mrlm64wng1jgbv94mhs6hpzj2r2mgdi";
+          url = "http://beta.quicklisp.org/archive/softdrink/2025-06-22/softdrink-20250622-git.tgz";
+          sha256 = "07d3nswpxzb3xskya4n7dmv9lgnag0jv88nab6c4ls7ik1v4b9id";
           system = "softdrink";
           asd = "softdrink";
         }
@@ -94952,12 +95329,12 @@ lib.makeScope pkgs.newScope (self: {
   software-evolution-library = (
     build-asdf-system {
       pname = "software-evolution-library";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "software-evolution-library" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sel/2024-10-12/sel-20241012-git.tgz";
-          sha256 = "1j1disr1wcql30hdj3f49ss41843wlmqx486nkna6qbnnsfay66w";
+          url = "http://beta.quicklisp.org/archive/sel/2025-06-22/sel-20250622-git.tgz";
+          sha256 = "0y8kysbk3r9r3lyfa1dj8yf6nxzbjj2wilf9yfcl8b66yf87a1qs";
           system = "software-evolution-library";
           asd = "software-evolution-library";
         }
@@ -95018,12 +95395,12 @@ lib.makeScope pkgs.newScope (self: {
   source-error = (
     build-asdf-system {
       pname = "source-error";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "source-error" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz";
-          sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7";
+          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "source-error";
           asd = "source-error";
         }
@@ -95323,12 +95700,12 @@ lib.makeScope pkgs.newScope (self: {
   speechless = (
     build-asdf-system {
       pname = "speechless";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "speechless" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/speechless/2023-10-21/speechless-20231021-git.tgz";
-          sha256 = "0x1v3gf0f0xpyxs8392r4xaqz214zmd1j89l61x9bg2h30k8ls37";
+          url = "http://beta.quicklisp.org/archive/speechless/2025-06-22/speechless-20250622-git.tgz";
+          sha256 = "1p9sgj0gaylzxv9vslvikzbj6vk2jm6rd6yklcslkfmyws6wyxhr";
           system = "speechless";
           asd = "speechless";
         }
@@ -95414,12 +95791,12 @@ lib.makeScope pkgs.newScope (self: {
   spinneret = (
     build-asdf-system {
       pname = "spinneret";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "spinneret" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/spinneret/2024-10-12/spinneret-20241012-git.tgz";
-          sha256 = "09ak35p487bwlwbv0vcdg9h869n8m7i3j1qj4f53lh1bm5s1zi5n";
+          url = "http://beta.quicklisp.org/archive/spinneret/2025-06-22/spinneret-20250622-git.tgz";
+          sha256 = "0bvs1055b91b0vdcagcbp3nqx064cjjf4vc8fdv4ym44yk1xzc79";
           system = "spinneret";
           asd = "spinneret";
         }
@@ -95762,12 +96139,12 @@ lib.makeScope pkgs.newScope (self: {
   staple = (
     build-asdf-system {
       pname = "staple";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "staple" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz";
-          sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi";
+          url = "http://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
+          sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik";
           system = "staple";
           asd = "staple";
         }
@@ -95792,12 +96169,12 @@ lib.makeScope pkgs.newScope (self: {
   staple-code-parser = (
     build-asdf-system {
       pname = "staple-code-parser";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "staple-code-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz";
-          sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi";
+          url = "http://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
+          sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik";
           system = "staple-code-parser";
           asd = "staple-code-parser";
         }
@@ -95821,12 +96198,12 @@ lib.makeScope pkgs.newScope (self: {
   staple-markdown = (
     build-asdf-system {
       pname = "staple-markdown";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "staple-markdown" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz";
-          sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi";
+          url = "http://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
+          sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik";
           system = "staple-markdown";
           asd = "staple-markdown";
         }
@@ -95845,12 +96222,12 @@ lib.makeScope pkgs.newScope (self: {
   staple-markless = (
     build-asdf-system {
       pname = "staple-markless";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "staple-markless" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz";
-          sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi";
+          url = "http://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
+          sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik";
           system = "staple-markless";
           asd = "staple-markless";
         }
@@ -95868,12 +96245,12 @@ lib.makeScope pkgs.newScope (self: {
   staple-package-recording = (
     build-asdf-system {
       pname = "staple-package-recording";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "staple-package-recording" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz";
-          sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi";
+          url = "http://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
+          sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik";
           system = "staple-package-recording";
           asd = "staple-package-recording";
         }
@@ -95888,12 +96265,12 @@ lib.makeScope pkgs.newScope (self: {
   staple-restructured-text = (
     build-asdf-system {
       pname = "staple-restructured-text";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "staple-restructured-text" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz";
-          sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi";
+          url = "http://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
+          sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik";
           system = "staple-restructured-text";
           asd = "staple-restructured-text";
         }
@@ -95911,12 +96288,12 @@ lib.makeScope pkgs.newScope (self: {
   staple-server = (
     build-asdf-system {
       pname = "staple-server";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "staple-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz";
-          sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi";
+          url = "http://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
+          sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik";
           system = "staple-server";
           asd = "staple-server";
         }
@@ -95958,6 +96335,29 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  stateless-iterators = (
+    build-asdf-system {
+      pname = "stateless-iterators";
+      version = "20250622-git";
+      asds = [ "stateless-iterators" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/stateless-iterators/2025-06-22/stateless-iterators-20250622-git.tgz";
+          sha256 = "1d2jpvns52jfmyizhdkf02ng0qhg5jl3ngnrj9vw3zlqlrd19440";
+          system = "stateless-iterators";
+          asd = "stateless-iterators";
+        }
+      );
+      systems = [ "stateless-iterators" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "serapeum" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   static-dispatch = (
     build-asdf-system {
       pname = "static-dispatch";
@@ -96188,12 +96588,12 @@ lib.makeScope pkgs.newScope (self: {
   stepster = (
     build-asdf-system {
       pname = "stepster";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "stepster" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stepster/2024-10-12/stepster-20241012-git.tgz";
-          sha256 = "027psal692mvpaj8bzp8fkkrsy5pgyrg8sr21xgc4m8ypp0shvw3";
+          url = "http://beta.quicklisp.org/archive/stepster/2025-06-22/stepster-20250622-git.tgz";
+          sha256 = "003knr53b298s9l5y73il579cnjf90c6zkdh15ddnj4cfq8bfckl";
           system = "stepster";
           asd = "stepster";
         }
@@ -96307,12 +96707,12 @@ lib.makeScope pkgs.newScope (self: {
   str = (
     build-asdf-system {
       pname = "str";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "str" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-str/2024-10-12/cl-str-20241012-git.tgz";
-          sha256 = "1c9vcrm4gy3ljwnzjimsxswszfs2im1a4iqalpn1mhv8ddwavb2j";
+          url = "http://beta.quicklisp.org/archive/cl-str/2025-06-22/cl-str-20250622-git.tgz";
+          sha256 = "04hjv5cbflpsbhiic5ygld3kvzh775vprmn9n0i6q3w4xi2x56g2";
           system = "str";
           asd = "str";
         }
@@ -96329,12 +96729,12 @@ lib.makeScope pkgs.newScope (self: {
   str_dot_test = (
     build-asdf-system {
       pname = "str.test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "str.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-str/2024-10-12/cl-str-20241012-git.tgz";
-          sha256 = "1c9vcrm4gy3ljwnzjimsxswszfs2im1a4iqalpn1mhv8ddwavb2j";
+          url = "http://beta.quicklisp.org/archive/cl-str/2025-06-22/cl-str-20250622-git.tgz";
+          sha256 = "04hjv5cbflpsbhiic5ygld3kvzh775vprmn9n0i6q3w4xi2x56g2";
           system = "str.test";
           asd = "str.test";
         }
@@ -96673,12 +97073,12 @@ lib.makeScope pkgs.newScope (self: {
   stumpwm = (
     build-asdf-system {
       pname = "stumpwm";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "stumpwm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stumpwm/2023-10-21/stumpwm-20231021-git.tgz";
-          sha256 = "114kicsziqvm15x15yhc39j8qzv6gxz4wxc40xp968pprzr4a4d1";
+          url = "http://beta.quicklisp.org/archive/stumpwm/2025-06-22/stumpwm-20250622-git.tgz";
+          sha256 = "1l4rxcva947ijxsfnzyy35ql7a8pjsxaag51pq2bib3qfy7wg5ld";
           system = "stumpwm";
           asd = "stumpwm";
         }
@@ -96693,24 +97093,41 @@ lib.makeScope pkgs.newScope (self: {
       meta = { };
     }
   );
-  stumpwm-tests = (
+  stumpwm-dynamic-float = (
     build-asdf-system {
-      pname = "stumpwm-tests";
-      version = "20231021-git";
-      asds = [ "stumpwm-tests" ];
+      pname = "stumpwm-dynamic-float";
+      version = "20250622-git";
+      asds = [ "stumpwm-dynamic-float" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stumpwm/2023-10-21/stumpwm-20231021-git.tgz";
-          sha256 = "114kicsziqvm15x15yhc39j8qzv6gxz4wxc40xp968pprzr4a4d1";
-          system = "stumpwm-tests";
-          asd = "stumpwm-tests";
+          url = "http://beta.quicklisp.org/archive/stumpwm-dynamic-float/2025-06-22/stumpwm-dynamic-float-20250622-git.tgz";
+          sha256 = "13m9864vfj4b5b0hlvp7jrb96368rxr5ydjsdqldky10yad7icxf";
+          system = "stumpwm-dynamic-float";
+          asd = "stumpwm-dynamic-float";
         }
       );
-      systems = [ "stumpwm-tests" ];
-      lispLibs = [
-        (getAttr "fiasco" self)
-        (getAttr "stumpwm" self)
-      ];
+      systems = [ "stumpwm-dynamic-float" ];
+      lispLibs = [ (getAttr "stumpwm" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  stumpwm-sndioctl = (
+    build-asdf-system {
+      pname = "stumpwm-sndioctl";
+      version = "20250622-git";
+      asds = [ "stumpwm-sndioctl" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/stumpwm-sndioctl/2025-06-22/stumpwm-sndioctl-20250622-git.tgz";
+          sha256 = "1q4w4grim7izvw01k95wh7bbaaq0hz2ljjhn47nyd7pzrk9dabpv";
+          system = "stumpwm-sndioctl";
+          asd = "stumpwm-sndioctl";
+        }
+      );
+      systems = [ "stumpwm-sndioctl" ];
+      lispLibs = [ (getAttr "stumpwm" self) ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -96872,12 +97289,12 @@ lib.makeScope pkgs.newScope (self: {
   surf = (
     build-asdf-system {
       pname = "surf";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "surf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "surf";
           asd = "surf";
         }
@@ -96892,12 +97309,12 @@ lib.makeScope pkgs.newScope (self: {
   swank = (
     build-asdf-system {
       pname = "swank";
-      version = "v2.30";
+      version = "v2.31";
       asds = [ "swank" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/slime/2024-10-12/slime-v2.30.tgz";
-          sha256 = "0qb7m65gq0mbxfrdppkh3k4jn13i14i07ziga4r8b3rmrxhrmlv0";
+          url = "http://beta.quicklisp.org/archive/slime/2025-06-22/slime-v2.31.tgz";
+          sha256 = "0rqjw2c5hzmrmvbf37l6fdx6pria6d360nvqka47qc74s4pw1hyi";
           system = "swank";
           asd = "swank";
         }
@@ -97020,12 +97437,12 @@ lib.makeScope pkgs.newScope (self: {
   sxql = (
     build-asdf-system {
       pname = "sxql";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "sxql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sxql/2024-10-12/sxql-20241012-git.tgz";
-          sha256 = "11x4qgdwbddbk0a8avrirp1ksmphfxlimirfwvmiwi0jc4zd5csa";
+          url = "http://beta.quicklisp.org/archive/sxql/2025-06-22/sxql-20250622-git.tgz";
+          sha256 = "0lm6f35h5cg0a1rrpfkfgifp1i2ws0vy3w98kngv886jj9r6jjdn";
           system = "sxql";
           asd = "sxql";
         }
@@ -97069,12 +97486,12 @@ lib.makeScope pkgs.newScope (self: {
   sxql-test = (
     build-asdf-system {
       pname = "sxql-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "sxql-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sxql/2024-10-12/sxql-20241012-git.tgz";
-          sha256 = "11x4qgdwbddbk0a8avrirp1ksmphfxlimirfwvmiwi0jc4zd5csa";
+          url = "http://beta.quicklisp.org/archive/sxql/2025-06-22/sxql-20250622-git.tgz";
+          sha256 = "0lm6f35h5cg0a1rrpfkfgifp1i2ws0vy3w98kngv886jj9r6jjdn";
           system = "sxql-test";
           asd = "sxql-test";
         }
@@ -97116,18 +97533,18 @@ lib.makeScope pkgs.newScope (self: {
   symath = (
     build-asdf-system {
       pname = "symath";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "symath" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/symath/2024-10-12/symath-20241012-git.tgz";
-          sha256 = "1bxggf9kn4bhx877hyj4kpr76p47d8cd35lgv224hri5211fqyaz";
+          url = "http://beta.quicklisp.org/archive/symath/2025-06-22/symath-20250622-git.tgz";
+          sha256 = "01603s8cbifwy7x6jqmxff232pyq99nzjlxn2sjbzx11hwf8092l";
           system = "symath";
           asd = "symath";
         }
       );
       systems = [ "symath" ];
-      lispLibs = [ ];
+      lispLibs = [ (getAttr "alexandria" self) ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -97217,12 +97634,12 @@ lib.makeScope pkgs.newScope (self: {
   system-locale = (
     build-asdf-system {
       pname = "system-locale";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "system-locale" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/system-locale/2024-10-12/system-locale-20241012-git.tgz";
-          sha256 = "1q91vyvsh787fz3j49lmyw2lx85288cmamb11h99wdmbmf61rdgr";
+          url = "http://beta.quicklisp.org/archive/system-locale/2025-06-22/system-locale-20250622-git.tgz";
+          sha256 = "1v794i2f652c1qplbb8igr4dl98xxz7ha9c5ckzql50ykdw871jy";
           system = "system-locale";
           asd = "system-locale";
         }
@@ -97237,12 +97654,12 @@ lib.makeScope pkgs.newScope (self: {
   t-clack-handler-hunchentoot = (
     build-asdf-system {
       pname = "t-clack-handler-hunchentoot";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "t-clack-handler-hunchentoot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz";
-          sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3";
+          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "t-clack-handler-hunchentoot";
           asd = "t-clack-handler-hunchentoot";
         }
@@ -97260,12 +97677,12 @@ lib.makeScope pkgs.newScope (self: {
   t-clack-handler-toot = (
     build-asdf-system {
       pname = "t-clack-handler-toot";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "t-clack-handler-toot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz";
-          sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3";
+          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "t-clack-handler-toot";
           asd = "t-clack-handler-toot";
         }
@@ -97283,12 +97700,12 @@ lib.makeScope pkgs.newScope (self: {
   t-clack-handler-wookie = (
     build-asdf-system {
       pname = "t-clack-handler-wookie";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "t-clack-handler-wookie" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz";
-          sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3";
+          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "t-clack-handler-wookie";
           asd = "t-clack-handler-wookie";
         }
@@ -97303,12 +97720,12 @@ lib.makeScope pkgs.newScope (self: {
   ta2 = (
     build-asdf-system {
       pname = "ta2";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "ta2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "ta2";
           asd = "ta2";
         }
@@ -97610,12 +98027,12 @@ lib.makeScope pkgs.newScope (self: {
   tasty = (
     build-asdf-system {
       pname = "tasty";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "tasty" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "tasty";
           asd = "tasty";
         }
@@ -97630,35 +98047,15 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  tclcs-code = (
-    build-asdf-system {
-      pname = "tclcs-code";
-      version = "20210124-git";
-      asds = [ "tclcs-code" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/tclcs-code/2021-01-24/tclcs-code-20210124-git.tgz";
-          sha256 = "0p0g8shy284sj9ncq27zn8yj7xsrdcg2aiy2q783l6sl2ip6nfxa";
-          system = "tclcs-code";
-          asd = "tclcs-code";
-        }
-      );
-      systems = [ "tclcs-code" ];
-      lispLibs = [ (getAttr "trivial-custom-debugger" self) ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   tcod = (
     build-asdf-system {
       pname = "tcod";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "tcod" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tcod/2023-10-21/cl-tcod-20231021-git.tgz";
-          sha256 = "1r4ip16dlzr56p94b0grw6nmkykbmgb04jsqdvgl1ypcmbpfr3i1";
+          url = "http://beta.quicklisp.org/archive/cl-tcod/2025-06-22/cl-tcod-20250622-git.tgz";
+          sha256 = "1m3fgfc7nfk8yn4z1c09lixnk0sr3szxqihq3fx4j6is430ywxdd";
           system = "tcod";
           asd = "tcod";
         }
@@ -98028,6 +98425,26 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  termp = (
+    build-asdf-system {
+      pname = "termp";
+      version = "20250622-git";
+      asds = [ "termp" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/termp/2025-06-22/termp-20250622-git.tgz";
+          sha256 = "03r5cv01q4yg0a2dv2ckn2xys53y9isrq3hkp0dqa96q8wrindlh";
+          system = "termp";
+          asd = "termp";
+        }
+      );
+      systems = [ "termp" ];
+      lispLibs = [ ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   terrable = (
     build-asdf-system {
       pname = "terrable";
@@ -98080,12 +98497,12 @@ lib.makeScope pkgs.newScope (self: {
   test-40ants-system = (
     build-asdf-system {
       pname = "test-40ants-system";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "test-40ants-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2024-10-12/40ants-asdf-system-20241012-git.tgz";
-          sha256 = "0wi575m0s0a9fvp1wy5ga760f71la16z1633qk6s2f87rwcjs8kw";
+          url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz";
+          sha256 = "151zfyz7c4xrd4mnyzd5nsla1p70q4iixgm9mlnbm799mr1aprwp";
           system = "test-40ants-system";
           asd = "test-40ants-system";
         }
@@ -98100,12 +98517,12 @@ lib.makeScope pkgs.newScope (self: {
   test-gadgets = (
     build-asdf-system {
       pname = "test-gadgets";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "test-gadgets" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gadgets/2024-10-12/gadgets-20241012-git.tgz";
-          sha256 = "1ba4gj8lh3ihbb66xiz7hc8cdg3gvi3q20w32nmsqdch956is34k";
+          url = "http://beta.quicklisp.org/archive/gadgets/2025-06-22/gadgets-20250622-git.tgz";
+          sha256 = "0dbia2679dj4kr2ndh15ib26l9kw6zxx0qjn4l0jkcdx7shrkll6";
           system = "test-gadgets";
           asd = "test-gadgets";
         }
@@ -98123,12 +98540,12 @@ lib.makeScope pkgs.newScope (self: {
   test-paren6 = (
     build-asdf-system {
       pname = "test-paren6";
-      version = "20220331-git";
+      version = "20250622-git";
       asds = [ "test-paren6" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/paren6/2022-03-31/paren6-20220331-git.tgz";
-          sha256 = "0m7z7zkc1vrwmp68f3yx0mdsb0j45dmw3iddnbvf94dpv8aywwpx";
+          url = "http://beta.quicklisp.org/archive/paren6/2025-06-22/paren6-20250622-git.tgz";
+          sha256 = "1ib57mfq82c62nd0ikic6mjbivwv7x7g5fgjblq7jssms6s7h9wm";
           system = "test-paren6";
           asd = "test-paren6";
         }
@@ -98283,18 +98700,38 @@ lib.makeScope pkgs.newScope (self: {
   testiere = (
     build-asdf-system {
       pname = "testiere";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "testiere" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/testiere/2024-10-12/testiere-20241012-git.tgz";
-          sha256 = "0sfsk7i5kxk8s1273i9vwz49hak0qdrr9asq70kdiwq0lfd56kgg";
+          url = "http://beta.quicklisp.org/archive/testiere/2025-06-22/testiere-20250622-git.tgz";
+          sha256 = "0jn07812abpmlb4rig2v4ckgv5afx7jl03fvi06jn2890i527058";
           system = "testiere";
           asd = "testiere";
         }
       );
       systems = [ "testiere" ];
-      lispLibs = [ (getAttr "trivia" self) ];
+      lispLibs = [ ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
+  testiere-examples = (
+    build-asdf-system {
+      pname = "testiere-examples";
+      version = "20250622-git";
+      asds = [ "testiere-examples" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/testiere/2025-06-22/testiere-20250622-git.tgz";
+          sha256 = "0jn07812abpmlb4rig2v4ckgv5afx7jl03fvi06jn2890i527058";
+          system = "testiere-examples";
+          asd = "testiere-examples";
+        }
+      );
+      systems = [ "testiere-examples" ];
+      lispLibs = [ (getAttr "testiere" self) ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -98320,6 +98757,26 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  text-draw = (
+    build-asdf-system {
+      pname = "text-draw";
+      version = "20250622-git";
+      asds = [ "text-draw" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/text-draw/2025-06-22/text-draw-20250622-git.tgz";
+          sha256 = "0iw4bx8ipa2y3in8j6d3gjzm26ppxgl93fmphn5574l0lfr0x5ng";
+          system = "text-draw";
+          asd = "text-draw";
+        }
+      );
+      systems = [ "text-draw" ];
+      lispLibs = [ (getAttr "documentation-utils" self) ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   text-query = (
     build-asdf-system {
       pname = "text-query";
@@ -98444,12 +98901,12 @@ lib.makeScope pkgs.newScope (self: {
   thih-coalton = (
     build-asdf-system {
       pname = "thih-coalton";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "thih-coalton" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz";
-          sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7";
+          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "thih-coalton";
           asd = "thih-coalton";
         }
@@ -98461,26 +98918,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  thnappy = (
-    build-asdf-system {
-      pname = "thnappy";
-      version = "20180831-git";
-      asds = [ "thnappy" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/thnappy/2018-08-31/thnappy-20180831-git.tgz";
-          sha256 = "0p03w2mcc655gm9x3rpgixhap9l56imjyblkwv05rk6mjx7wfnrp";
-          system = "thnappy";
-          asd = "thnappy";
-        }
-      );
-      systems = [ "thnappy" ];
-      lispLibs = [ (getAttr "cffi" self) ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   thorn = (
     build-asdf-system {
       pname = "thorn";
@@ -99003,12 +99440,12 @@ lib.makeScope pkgs.newScope (self: {
   tooter = (
     build-asdf-system {
       pname = "tooter";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "tooter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tooter/2024-10-12/tooter-20241012-git.tgz";
-          sha256 = "03ymavph34248lh18jycsky55dg83kjr6k5a9bib5wh2idswrfxp";
+          url = "http://beta.quicklisp.org/archive/tooter/2025-06-22/tooter-20250622-git.tgz";
+          sha256 = "1hyihg9mr9b69jbf6dr07g8w3k7ismw63a4zynmmzbba6lbbv3p0";
           system = "tooter";
           asd = "tooter";
         }
@@ -99029,12 +99466,12 @@ lib.makeScope pkgs.newScope (self: {
   torrents = (
     build-asdf-system {
       pname = "torrents";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "torrents" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-torrents/2024-10-12/cl-torrents-20241012-git.tgz";
-          sha256 = "1xigzskksgn8pg18v2dncfapdn94zv0djr4yi8nmkqbv8ljx93l4";
+          url = "http://beta.quicklisp.org/archive/cl-torrents/2025-06-22/cl-torrents-20250622-git.tgz";
+          sha256 = "1jfxgb5hr2cr9pp7pkcwkafvdrfpcvpgzvn4qi11q0bygng7qg38";
           system = "torrents";
           asd = "torrents";
         }
@@ -99051,7 +99488,6 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "log4cl" self)
         (getAttr "lparallel" self)
         (getAttr "lquery" self)
-        (getAttr "mockingbird" self)
         (getAttr "parse-float" self)
         (getAttr "plump" self)
         (getAttr "py-configparser" self)
@@ -99068,12 +99504,12 @@ lib.makeScope pkgs.newScope (self: {
   torrents-test = (
     build-asdf-system {
       pname = "torrents-test";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "torrents-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-torrents/2024-10-12/cl-torrents-20241012-git.tgz";
-          sha256 = "1xigzskksgn8pg18v2dncfapdn94zv0djr4yi8nmkqbv8ljx93l4";
+          url = "http://beta.quicklisp.org/archive/cl-torrents/2025-06-22/cl-torrents-20250622-git.tgz";
+          sha256 = "1jfxgb5hr2cr9pp7pkcwkafvdrfpcvpgzvn4qi11q0bygng7qg38";
           system = "torrents-test";
           asd = "torrents-test";
         }
@@ -99204,42 +99640,18 @@ lib.makeScope pkgs.newScope (self: {
   transducers = (
     build-asdf-system {
       pname = "transducers";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "transducers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-transducers/2024-10-12/cl-transducers-20241012-git.tgz";
-          sha256 = "1n7g2fr5bxyq1axp3a1pw01c5v167njhd7i0gbpq35s1fxvqw6ik";
+          url = "http://beta.quicklisp.org/archive/cl-transducers/2025-06-22/cl-transducers-20250622-git.tgz";
+          sha256 = "1ldcd4wkyc5ysw891hs4n3s71zfi0q1ji9pshmxvkq05p7gamqlp";
           system = "transducers";
           asd = "transducers";
         }
       );
       systems = [ "transducers" ];
-      lispLibs = [ (getAttr "sycamore" self) ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
-  transducers-jzon = (
-    build-asdf-system {
-      pname = "transducers-jzon";
-      version = "20241012-git";
-      asds = [ "transducers-jzon" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-transducers/2024-10-12/cl-transducers-20241012-git.tgz";
-          sha256 = "1n7g2fr5bxyq1axp3a1pw01c5v167njhd7i0gbpq35s1fxvqw6ik";
-          system = "transducers-jzon";
-          asd = "transducers";
-        }
-      );
-      systems = [ "transducers-jzon" ];
-      lispLibs = [
-        (getAttr "com_dot_inuoe_dot_jzon" self)
-        (getAttr "transducers" self)
-        (getAttr "trivia" self)
-      ];
+      lispLibs = [ ];
       meta = {
         hydraPlatforms = [ ];
       };
@@ -99351,12 +99763,12 @@ lib.makeScope pkgs.newScope (self: {
   translators = (
     build-asdf-system {
       pname = "translators";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "translators" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "translators";
           asd = "translators";
         }
@@ -99396,12 +99808,12 @@ lib.makeScope pkgs.newScope (self: {
   tree = (
     build-asdf-system {
       pname = "tree";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "tree";
           asd = "tree";
         }
@@ -99845,12 +100257,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-adjust-simple-array = (
     build-asdf-system {
       pname = "trivial-adjust-simple-array";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "trivial-adjust-simple-array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-adjust-simple-array/2024-10-12/trivial-adjust-simple-array-20241012-git.tgz";
-          sha256 = "05yifs4b44whqz4bgv4wys6kvza8y7z5w52kh55ch7krpv61ncy6";
+          url = "http://beta.quicklisp.org/archive/trivial-adjust-simple-array/2025-06-22/trivial-adjust-simple-array-20250622-git.tgz";
+          sha256 = "1mxsng80x3m4cf65vfd1q5fx9nlzqckfc7axwvf9fh156rdhhr3p";
           system = "trivial-adjust-simple-array";
           asd = "trivial-adjust-simple-array";
         }
@@ -99865,12 +100277,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-arguments = (
     build-asdf-system {
       pname = "trivial-arguments";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "trivial-arguments" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-arguments/2024-10-12/trivial-arguments-20241012-git.tgz";
-          sha256 = "1x1jifrw4ryyqgbln07znrc1drl4gxvzhbhv5gl1kgp2xm0rvr7j";
+          url = "http://beta.quicklisp.org/archive/trivial-arguments/2025-06-22/trivial-arguments-20250622-git.tgz";
+          sha256 = "1lgg057vp6iwf0k48dipgm5ffpqfakx0kgicf13xscfqzpv5pw6i";
           system = "trivial-arguments";
           asd = "trivial-arguments";
         }
@@ -100118,12 +100530,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-clock = (
     build-asdf-system {
       pname = "trivial-clock";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "trivial-clock" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-trivial-clock/2024-10-12/cl-trivial-clock-20241012-git.tgz";
-          sha256 = "1m1351j3xvrf6631gmf99xaxb3dhh4ak657p1hac3b9f9a5h85nd";
+          url = "http://beta.quicklisp.org/archive/cl-trivial-clock/2025-06-22/cl-trivial-clock-20250622-git.tgz";
+          sha256 = "13pfghnar0c55fzha8nfihyjayycz659wp08s5fcip1ksdgkiw05";
           system = "trivial-clock";
           asd = "trivial-clock";
         }
@@ -100493,12 +100905,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-extensible-sequences = (
     build-asdf-system {
       pname = "trivial-extensible-sequences";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "trivial-extensible-sequences" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-extensible-sequences/2023-10-21/trivial-extensible-sequences-20231021-git.tgz";
-          sha256 = "1mgfvyvy3dkn8wyjqc49czl990rbbfkz7sfrhz9641dilasmw9s6";
+          url = "http://beta.quicklisp.org/archive/trivial-extensible-sequences/2025-06-22/trivial-extensible-sequences-20250622-git.tgz";
+          sha256 = "1l3i99gcabh7b0cvkhqlhdfx5mk1n2smfvkxzgx8v55qa5gzsa8w";
           system = "trivial-extensible-sequences";
           asd = "trivial-extensible-sequences";
         }
@@ -100563,12 +100975,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-features = (
     build-asdf-system {
       pname = "trivial-features";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "trivial-features" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-features/2023-06-18/trivial-features-20230618-git.tgz";
-          sha256 = "0r33ycg1wsmglbsychglzkd6fachnnqfzd0w9mhpwi6cz94hx7c3";
+          url = "http://beta.quicklisp.org/archive/trivial-features/2025-06-22/trivial-features-20250622-git.tgz";
+          sha256 = "0r3lwy5ssrw6d3v1clyfqc59dxknsnr5zrb0h64zx5b7ddn6vb6q";
           system = "trivial-features";
           asd = "trivial-features";
         }
@@ -100581,12 +100993,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-features-tests = (
     build-asdf-system {
       pname = "trivial-features-tests";
-      version = "20230618-git";
+      version = "20250622-git";
       asds = [ "trivial-features-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-features/2023-06-18/trivial-features-20230618-git.tgz";
-          sha256 = "0r33ycg1wsmglbsychglzkd6fachnnqfzd0w9mhpwi6cz94hx7c3";
+          url = "http://beta.quicklisp.org/archive/trivial-features/2025-06-22/trivial-features-20250622-git.tgz";
+          sha256 = "0r3lwy5ssrw6d3v1clyfqc59dxknsnr5zrb0h64zx5b7ddn6vb6q";
           system = "trivial-features-tests";
           asd = "trivial-features-tests";
         }
@@ -100607,12 +101019,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-file-size = (
     build-asdf-system {
       pname = "trivial-file-size";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "trivial-file-size" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-file-size/2024-10-12/trivial-file-size-20241012-git.tgz";
-          sha256 = "08dbyrrgvvl459lk3pcq0j7qryb20hdh946y42h4jsp5crhbi71z";
+          url = "http://beta.quicklisp.org/archive/trivial-file-size/2025-06-22/trivial-file-size-20250622-git.tgz";
+          sha256 = "172xmsmcdq73gxyg77d05mxqcml2rjk2jwh91yl9aph68ls2d1pq";
           system = "trivial-file-size";
           asd = "trivial-file-size";
         }
@@ -100744,12 +101156,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-indent = (
     build-asdf-system {
       pname = "trivial-indent";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "trivial-indent" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-indent/2023-10-21/trivial-indent-20231021-git.tgz";
-          sha256 = "08qgx34zbpafzws96nq68bgpynddf22ibliqni2jnvhwv74lcpiw";
+          url = "http://beta.quicklisp.org/archive/trivial-indent/2025-06-22/trivial-indent-20250622-git.tgz";
+          sha256 = "17zfm62szbvyn8qq6k88yh04xwa6dnmbla4yqaqqpc971xs562cy";
           system = "trivial-indent";
           asd = "trivial-indent";
         }
@@ -101005,12 +101417,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-main-thread = (
     build-asdf-system {
       pname = "trivial-main-thread";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "trivial-main-thread" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-main-thread/2024-10-12/trivial-main-thread-20241012-git.tgz";
-          sha256 = "0vxr82ald41355hvlg0ngrpzkz9y3nyl24h58306kmg982xk4hnk";
+          url = "http://beta.quicklisp.org/archive/trivial-main-thread/2025-06-22/trivial-main-thread-20250622-git.tgz";
+          sha256 = "0p7p6bh3rghj3yj2d9ry2jfvpjkky2mwwbbh4w422v6yplv6iwhx";
           system = "trivial-main-thread";
           asd = "trivial-main-thread";
         }
@@ -101047,12 +101459,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-mimes = (
     build-asdf-system {
       pname = "trivial-mimes";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "trivial-mimes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-mimes/2023-10-21/trivial-mimes-20231021-git.tgz";
-          sha256 = "05cqbg9bh4r9av675vrzgw4p3s1dxb74r2ygvbfkych79kdik871";
+          url = "http://beta.quicklisp.org/archive/trivial-mimes/2025-06-22/trivial-mimes-20250622-git.tgz";
+          sha256 = "0ahf8i2ghsg1kqfiaarxhlcsd3icmb2glsbcv2rwzdc06w7x2lms";
           system = "trivial-mimes";
           asd = "trivial-mimes";
         }
@@ -101466,6 +101878,26 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  trivial-restarts = (
+    build-asdf-system {
+      pname = "trivial-restarts";
+      version = "20250622-git";
+      asds = [ "trivial-restarts" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/trivial-restart-accessors/2025-06-22/trivial-restart-accessors-20250622-git.tgz";
+          sha256 = "127fhlqds5qyabvl85k50n6wgxkcpcb3bbxazz5hnd0zj3r3901z";
+          system = "trivial-restarts";
+          asd = "trivial-restarts";
+        }
+      );
+      systems = [ "trivial-restarts" ];
+      lispLibs = [ ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   trivial-rfc-1123 = (
     build-asdf-system {
       pname = "trivial-rfc-1123";
@@ -101489,12 +101921,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-sanitize = (
     build-asdf-system {
       pname = "trivial-sanitize";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "trivial-sanitize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-sanitize/2024-10-12/trivial-sanitize-20241012-git.tgz";
-          sha256 = "18pc1diq0mfmr3ql79islv2mfm4y791vg9xwz3dwp8wa912dd93h";
+          url = "http://beta.quicklisp.org/archive/trivial-sanitize/2025-06-22/trivial-sanitize-20250622-git.tgz";
+          sha256 = "1rk34ss0zyap18yf3r0kjyr9pa6jlj3w9q00fb6hjynykp1lvmr2";
           system = "trivial-sanitize";
           asd = "trivial-sanitize";
         }
@@ -101513,12 +101945,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-sanitize-tests = (
     build-asdf-system {
       pname = "trivial-sanitize-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "trivial-sanitize-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-sanitize/2024-10-12/trivial-sanitize-20241012-git.tgz";
-          sha256 = "18pc1diq0mfmr3ql79islv2mfm4y791vg9xwz3dwp8wa912dd93h";
+          url = "http://beta.quicklisp.org/archive/trivial-sanitize/2025-06-22/trivial-sanitize-20250622-git.tgz";
+          sha256 = "1rk34ss0zyap18yf3r0kjyr9pa6jlj3w9q00fb6hjynykp1lvmr2";
           system = "trivial-sanitize-tests";
           asd = "trivial-sanitize-tests";
         }
@@ -101756,12 +102188,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-thumbnail = (
     build-asdf-system {
       pname = "trivial-thumbnail";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "trivial-thumbnail" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-thumbnail/2023-10-21/trivial-thumbnail-20231021-git.tgz";
-          sha256 = "1asa8vg8cyfr0kl86xrpywk0cpqym9lzhkhxb829lqr49vr8zfa7";
+          url = "http://beta.quicklisp.org/archive/trivial-thumbnail/2025-06-22/trivial-thumbnail-20250622-git.tgz";
+          sha256 = "1451yimch278s4qing3a71kpnhgk3dl4k096prvyiyqyz1qnq2ld";
           system = "trivial-thumbnail";
           asd = "trivial-thumbnail";
         }
@@ -101822,12 +102254,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-toplevel-commands = (
     build-asdf-system {
       pname = "trivial-toplevel-commands";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "trivial-toplevel-commands" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-toplevel-commands/2024-10-12/trivial-toplevel-commands-20241012-git.tgz";
-          sha256 = "03n0dpzgdgghc7cxj1s19w2wlx6r8f1s983f5a6cix5rigx9r834";
+          url = "http://beta.quicklisp.org/archive/trivial-toplevel-commands/2025-06-22/trivial-toplevel-commands-20250622-git.tgz";
+          sha256 = "1izzaihfq5fjwdfz0048lb4a0zr0pyydx9p6nrwr4i8702ighjnw";
           system = "trivial-toplevel-commands";
           asd = "trivial-toplevel-commands";
         }
@@ -101842,12 +102274,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-toplevel-prompt = (
     build-asdf-system {
       pname = "trivial-toplevel-prompt";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "trivial-toplevel-prompt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-toplevel-prompt/2024-10-12/trivial-toplevel-prompt-20241012-git.tgz";
-          sha256 = "07gvazwqiw37sic9zz8qnl3gz0b8n4qzrwbmg4wy3rlkps98i4s2";
+          url = "http://beta.quicklisp.org/archive/trivial-toplevel-prompt/2025-06-22/trivial-toplevel-prompt-20250622-git.tgz";
+          sha256 = "0n3apxjdxn8cnhl1w1ampzhc6j37ra4ygv44v6rz3sinw1pwcmf4";
           system = "trivial-toplevel-prompt";
           asd = "trivial-toplevel-prompt";
         }
@@ -101900,12 +102332,12 @@ lib.makeScope pkgs.newScope (self: {
   trivial-utf-8 = (
     build-asdf-system {
       pname = "trivial-utf-8";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "trivial-utf-8" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-utf-8/2023-10-21/trivial-utf-8-20231021-git.tgz";
-          sha256 = "0paf7ldw6ffl5xilyri3rfygz1v1npagf186i1z8hyxxjkri4q9s";
+          url = "http://beta.quicklisp.org/archive/trivial-utf-8/2025-06-22/trivial-utf-8-20250622-git.tgz";
+          sha256 = "1szf8xlsz1lhpwikz8lb9fxwkmi8x9ibss5512mw40h97r68rpw2";
           system = "trivial-utf-8";
           asd = "trivial-utf-8";
         }
@@ -102339,12 +102771,12 @@ lib.makeScope pkgs.newScope (self: {
   try = (
     build-asdf-system {
       pname = "try";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "try" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/try/2023-10-21/try-20231021-git.tgz";
-          sha256 = "166i3fqwxfv9skz6yf95c95nx0jjqy1ak1131bd0sqmd582gi9mg";
+          url = "http://beta.quicklisp.org/archive/try/2025-06-22/try-20250622-git.tgz";
+          sha256 = "0w3c7s6rma1whlgaxz5sxmr9vkp914yanyh1dy64j9kzxyw9h40h";
           system = "try";
           asd = "try";
         }
@@ -102367,12 +102799,12 @@ lib.makeScope pkgs.newScope (self: {
   try_dot_asdf = (
     build-asdf-system {
       pname = "try.asdf";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "try.asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/try/2023-10-21/try-20231021-git.tgz";
-          sha256 = "166i3fqwxfv9skz6yf95c95nx0jjqy1ak1131bd0sqmd582gi9mg";
+          url = "http://beta.quicklisp.org/archive/try/2025-06-22/try-20250622-git.tgz";
+          sha256 = "0w3c7s6rma1whlgaxz5sxmr9vkp914yanyh1dy64j9kzxyw9h40h";
           system = "try.asdf";
           asd = "try.asdf";
         }
@@ -102565,12 +102997,12 @@ lib.makeScope pkgs.newScope (self: {
   type-templates = (
     build-asdf-system {
       pname = "type-templates";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "type-templates" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/type-templates/2024-10-12/type-templates-20241012-git.tgz";
-          sha256 = "1zmz3bmwg8ncqbnjwimn8n7q9ik9arnhd5ijd22ap1nwhbnmk1rj";
+          url = "http://beta.quicklisp.org/archive/type-templates/2025-06-22/type-templates-20250622-git.tgz";
+          sha256 = "1kc88zhvh2xvx73sxqq58kip31xa9ial1y1vi8rrw8za3bf31nc3";
           system = "type-templates";
           asd = "type-templates";
         }
@@ -102589,12 +103021,12 @@ lib.makeScope pkgs.newScope (self: {
   typo = (
     build-asdf-system {
       pname = "typo";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "typo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/typo/2024-10-12/typo-20241012-git.tgz";
-          sha256 = "1xgrfj1yxay04zf1ppf56b4j5p1wn67zfhiwpfd30dvk53mcrlik";
+          url = "http://beta.quicklisp.org/archive/typo/2025-06-22/typo-20250622-git.tgz";
+          sha256 = "12r0jwhl41mfgb3wkikisvp5qf35nmajmvqv2gjjph7j2p5qh8h0";
           system = "typo";
           asd = "typo";
         }
@@ -102606,6 +103038,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "introspect-environment" self)
         (getAttr "trivia" self)
         (getAttr "trivial-arguments" self)
+        (getAttr "trivial-cltl2" self)
         (getAttr "trivial-garbage" self)
       ];
       meta = {
@@ -102616,12 +103049,12 @@ lib.makeScope pkgs.newScope (self: {
   typo_dot_test-suite = (
     build-asdf-system {
       pname = "typo.test-suite";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "typo.test-suite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/typo/2024-10-12/typo-20241012-git.tgz";
-          sha256 = "1xgrfj1yxay04zf1ppf56b4j5p1wn67zfhiwpfd30dvk53mcrlik";
+          url = "http://beta.quicklisp.org/archive/typo/2025-06-22/typo-20250622-git.tgz";
+          sha256 = "12r0jwhl41mfgb3wkikisvp5qf35nmajmvqv2gjjph7j2p5qh8h0";
           system = "typo.test-suite";
           asd = "typo.test-suite";
         }
@@ -102639,12 +103072,12 @@ lib.makeScope pkgs.newScope (self: {
   uax-14 = (
     build-asdf-system {
       pname = "uax-14";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "uax-14" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uax-14/2023-10-21/uax-14-20231021-git.tgz";
-          sha256 = "1k9cqs9lb5i2y9b3zgrr1kq2w8bcr3h362105ykz0if5yz8m59fq";
+          url = "http://beta.quicklisp.org/archive/uax-14/2025-06-22/uax-14-20250622-git.tgz";
+          sha256 = "1a1lzmmfqhxyg68fg0q0rpcpx57bv48svwgm5aq3ffi03j2wyy1l";
           system = "uax-14";
           asd = "uax-14";
         }
@@ -102659,12 +103092,12 @@ lib.makeScope pkgs.newScope (self: {
   uax-14-test = (
     build-asdf-system {
       pname = "uax-14-test";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "uax-14-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uax-14/2023-10-21/uax-14-20231021-git.tgz";
-          sha256 = "1k9cqs9lb5i2y9b3zgrr1kq2w8bcr3h362105ykz0if5yz8m59fq";
+          url = "http://beta.quicklisp.org/archive/uax-14/2025-06-22/uax-14-20250622-git.tgz";
+          sha256 = "1a1lzmmfqhxyg68fg0q0rpcpx57bv48svwgm5aq3ffi03j2wyy1l";
           system = "uax-14-test";
           asd = "uax-14-test";
         }
@@ -103609,12 +104042,12 @@ lib.makeScope pkgs.newScope (self: {
   utf8-input-stream = (
     build-asdf-system {
       pname = "utf8-input-stream";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "utf8-input-stream" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utf8-input-stream/2024-10-12/utf8-input-stream-20241012-git.tgz";
-          sha256 = "06fk8fsz9nngdfjymg93h1l5m4yhfg4w8as68zlaj698xf9ry3i5";
+          url = "http://beta.quicklisp.org/archive/utf8-input-stream/2025-06-22/utf8-input-stream-20250622-git.tgz";
+          sha256 = "0in5d1n8smqshkm640h85i5c3pwwyl4i9j5vh1jrpl8mnyblvqrw";
           system = "utf8-input-stream";
           asd = "utf8-input-stream";
         }
@@ -103632,12 +104065,12 @@ lib.makeScope pkgs.newScope (self: {
   utf8-input-stream_dot_tests = (
     build-asdf-system {
       pname = "utf8-input-stream.tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "utf8-input-stream.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utf8-input-stream/2024-10-12/utf8-input-stream-20241012-git.tgz";
-          sha256 = "06fk8fsz9nngdfjymg93h1l5m4yhfg4w8as68zlaj698xf9ry3i5";
+          url = "http://beta.quicklisp.org/archive/utf8-input-stream/2025-06-22/utf8-input-stream-20250622-git.tgz";
+          sha256 = "0in5d1n8smqshkm640h85i5c3pwwyl4i9j5vh1jrpl8mnyblvqrw";
           system = "utf8-input-stream.tests";
           asd = "utf8-input-stream.tests";
         }
@@ -103776,12 +104209,12 @@ lib.makeScope pkgs.newScope (self: {
   utm = (
     build-asdf-system {
       pname = "utm";
-      version = "20200218-git";
+      version = "20250622-git";
       asds = [ "utm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utm/2020-02-18/utm-20200218-git.tgz";
-          sha256 = "1a5dp5fls26ppc6fnvd941nfvk2qs72grl0a3pycq7vzw6580v01";
+          url = "http://beta.quicklisp.org/archive/utm/2025-06-22/utm-20250622-git.tgz";
+          sha256 = "1fvbbmc6z1py9zixx3h0mb2zrb6v92km8bf7k8vvk0lj2p0kjjmw";
           system = "utm";
           asd = "utm";
         }
@@ -103816,12 +104249,12 @@ lib.makeScope pkgs.newScope (self: {
   utm_dot_test = (
     build-asdf-system {
       pname = "utm.test";
-      version = "20200218-git";
+      version = "20250622-git";
       asds = [ "utm.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utm/2020-02-18/utm-20200218-git.tgz";
-          sha256 = "1a5dp5fls26ppc6fnvd941nfvk2qs72grl0a3pycq7vzw6580v01";
+          url = "http://beta.quicklisp.org/archive/utm/2025-06-22/utm-20250622-git.tgz";
+          sha256 = "1fvbbmc6z1py9zixx3h0mb2zrb6v92km8bf7k8vvk0lj2p0kjjmw";
           system = "utm.test";
           asd = "utm.test";
         }
@@ -104006,12 +104439,12 @@ lib.makeScope pkgs.newScope (self: {
   varray = (
     build-asdf-system {
       pname = "varray";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "varray" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "varray";
           asd = "varray";
         }
@@ -104111,12 +104544,12 @@ lib.makeScope pkgs.newScope (self: {
   vellum = (
     build-asdf-system {
       pname = "vellum";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "vellum" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vellum/2024-10-12/vellum-20241012-git.tgz";
-          sha256 = "0qy5hsyy3qf5245n5lfnhsfdjmsdjmwa2d3jp8gr6zg71npfx926";
+          url = "http://beta.quicklisp.org/archive/vellum/2025-06-22/vellum-20250622-git.tgz";
+          sha256 = "0bc8fdyzq01kfilz7zyibq8dghzp1gcvdn4681r5hzpsslprym44";
           system = "vellum";
           asd = "vellum";
         }
@@ -104193,12 +104626,12 @@ lib.makeScope pkgs.newScope (self: {
   vellum-csv = (
     build-asdf-system {
       pname = "vellum-csv";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "vellum-csv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vellum-csv/2024-10-12/vellum-csv-20241012-git.tgz";
-          sha256 = "0xk4n6w3hsnn8cl34x8vigzmqnkdn04j6831095yyqk7373hvfql";
+          url = "http://beta.quicklisp.org/archive/vellum-csv/2025-06-22/vellum-csv-20250622-git.tgz";
+          sha256 = "0kq5qw8dma90j75rmyid4gdz21asdp4x0s8dx3a3yk990xg9g6fc";
           system = "vellum-csv";
           asd = "vellum-csv";
         }
@@ -104220,12 +104653,12 @@ lib.makeScope pkgs.newScope (self: {
   vellum-csv-tests = (
     build-asdf-system {
       pname = "vellum-csv-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "vellum-csv-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vellum-csv/2024-10-12/vellum-csv-20241012-git.tgz";
-          sha256 = "0xk4n6w3hsnn8cl34x8vigzmqnkdn04j6831095yyqk7373hvfql";
+          url = "http://beta.quicklisp.org/archive/vellum-csv/2025-06-22/vellum-csv-20250622-git.tgz";
+          sha256 = "0kq5qw8dma90j75rmyid4gdz21asdp4x0s8dx3a3yk990xg9g6fc";
           system = "vellum-csv-tests";
           asd = "vellum-csv-tests";
         }
@@ -104273,12 +104706,12 @@ lib.makeScope pkgs.newScope (self: {
   vellum-tests = (
     build-asdf-system {
       pname = "vellum-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "vellum-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vellum/2024-10-12/vellum-20241012-git.tgz";
-          sha256 = "0qy5hsyy3qf5245n5lfnhsfdjmsdjmwa2d3jp8gr6zg71npfx926";
+          url = "http://beta.quicklisp.org/archive/vellum/2025-06-22/vellum-20250622-git.tgz";
+          sha256 = "0bc8fdyzq01kfilz7zyibq8dghzp1gcvdn4681r5hzpsslprym44";
           system = "vellum-tests";
           asd = "vellum-tests";
         }
@@ -104317,22 +104750,22 @@ lib.makeScope pkgs.newScope (self: {
   verbose = (
     build-asdf-system {
       pname = "verbose";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "verbose" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/verbose/2024-10-12/verbose-20241012-git.tgz";
-          sha256 = "1q0knjk1nlnvlg9kydyxzd4sd2v8vm9dx10zqz2bpihd5nyhz3nv";
+          url = "http://beta.quicklisp.org/archive/verbose/2025-06-22/verbose-20250622-git.tgz";
+          sha256 = "1zpfbnfa4ii093aij4bzay6nm9kgms2smksrdj1d9kkl5qbrviyz";
           system = "verbose";
           asd = "verbose";
         }
       );
       systems = [ "verbose" ];
       lispLibs = [
+        (getAttr "atomics" self)
         (getAttr "bordeaux-threads" self)
         (getAttr "dissect" self)
         (getAttr "documentation-utils" self)
-        (getAttr "local-time" self)
         (getAttr "piping" self)
       ];
       meta = {
@@ -104340,32 +104773,6 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
-  verlet = (
-    build-asdf-system {
-      pname = "verlet";
-      version = "20211209-git";
-      asds = [ "verlet" ];
-      src = (
-        createAsd {
-          url = "http://beta.quicklisp.org/archive/verlet/2021-12-09/verlet-20211209-git.tgz";
-          sha256 = "0n6wgjwwbrr13ldwa4y59n2ixn47rr0ad7n3jbb58635z6ahfvd4";
-          system = "verlet";
-          asd = "verlet";
-        }
-      );
-      systems = [ "verlet" ];
-      lispLibs = [
-        (getAttr "chain" self)
-        (getAttr "fset" self)
-        (getAttr "metabang-bind" self)
-        (getAttr "mgl-pax" self)
-        (getAttr "rtg-math" self)
-      ];
-      meta = {
-        hydraPlatforms = [ ];
-      };
-    }
-  );
   vernacular = (
     build-asdf-system {
       pname = "vernacular";
@@ -104495,12 +104902,12 @@ lib.makeScope pkgs.newScope (self: {
   vex = (
     build-asdf-system {
       pname = "vex";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "vex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz";
-          sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn";
+          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "vex";
           asd = "vex";
         }
@@ -104910,12 +105317,12 @@ lib.makeScope pkgs.newScope (self: {
   voipms = (
     build-asdf-system {
       pname = "voipms";
-      version = "20231021-git";
+      version = "20250622-git";
       asds = [ "voipms" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-voipms/2023-10-21/cl-voipms-20231021-git.tgz";
-          sha256 = "05jrpd9vc95hqxq3nbwv0qpsfj3winwx2n5a5933919gfanxrslk";
+          url = "http://beta.quicklisp.org/archive/cl-voipms/2025-06-22/cl-voipms-20250622-git.tgz";
+          sha256 = "0rwb9nww6n6xz219c44aaj321lqhm4bhq49cn6ijywqns51ymnj7";
           system = "voipms";
           asd = "voipms";
         }
@@ -104925,6 +105332,7 @@ lib.makeScope pkgs.newScope (self: {
         (getAttr "cl-date-time-parser" self)
         (getAttr "erjoalgo-webutil" self)
         (getAttr "local-time" self)
+        (getAttr "vom" self)
       ];
       meta = {
         hydraPlatforms = [ ];
@@ -104976,12 +105384,12 @@ lib.makeScope pkgs.newScope (self: {
   vorbisfile-ffi = (
     build-asdf-system {
       pname = "vorbisfile-ffi";
-      version = "20151218-git";
+      version = "20250622-git";
       asds = [ "vorbisfile-ffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz";
-          sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9";
+          url = "http://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
+          sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb";
           system = "vorbisfile-ffi";
           asd = "vorbisfile-ffi";
         }
@@ -105094,11 +105502,11 @@ lib.makeScope pkgs.newScope (self: {
   wayflan = (
     build-asdf-system {
       pname = "wayflan";
-      version = "20230214-git";
+      version = "20250622-git";
       asds = [ "wayflan" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wayflan/2023-02-14/wayflan-20230214-git.tgz";
+          url = "http://beta.quicklisp.org/archive/wayflan/2025-06-22/wayflan-20250622-git.tgz";
           sha256 = "0y6hzskp1vgaigzj5b3i695sc6dn5mk7nlxs21nh5ybzmf4chhyy";
           system = "wayflan";
           asd = "wayflan";
@@ -105117,11 +105525,11 @@ lib.makeScope pkgs.newScope (self: {
   wayflan-client = (
     build-asdf-system {
       pname = "wayflan-client";
-      version = "20230214-git";
+      version = "20250622-git";
       asds = [ "wayflan-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wayflan/2023-02-14/wayflan-20230214-git.tgz";
+          url = "http://beta.quicklisp.org/archive/wayflan/2025-06-22/wayflan-20250622-git.tgz";
           sha256 = "0y6hzskp1vgaigzj5b3i695sc6dn5mk7nlxs21nh5ybzmf4chhyy";
           system = "wayflan-client";
           asd = "wayflan-client";
@@ -105408,12 +105816,12 @@ lib.makeScope pkgs.newScope (self: {
   websocket-driver = (
     build-asdf-system {
       pname = "websocket-driver";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "websocket-driver" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/websocket-driver/2024-10-12/websocket-driver-20241012-git.tgz";
-          sha256 = "1lj6xarr62199ladkml7qpgi86w94j4djrp54v9ch0zakni3rhj2";
+          url = "http://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz";
+          sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry";
           system = "websocket-driver";
           asd = "websocket-driver";
         }
@@ -105431,12 +105839,12 @@ lib.makeScope pkgs.newScope (self: {
   websocket-driver-base = (
     build-asdf-system {
       pname = "websocket-driver-base";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "websocket-driver-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/websocket-driver/2024-10-12/websocket-driver-20241012-git.tgz";
-          sha256 = "1lj6xarr62199ladkml7qpgi86w94j4djrp54v9ch0zakni3rhj2";
+          url = "http://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz";
+          sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry";
           system = "websocket-driver-base";
           asd = "websocket-driver-base";
         }
@@ -105459,12 +105867,12 @@ lib.makeScope pkgs.newScope (self: {
   websocket-driver-client = (
     build-asdf-system {
       pname = "websocket-driver-client";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "websocket-driver-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/websocket-driver/2024-10-12/websocket-driver-20241012-git.tgz";
-          sha256 = "1lj6xarr62199ladkml7qpgi86w94j4djrp54v9ch0zakni3rhj2";
+          url = "http://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz";
+          sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry";
           system = "websocket-driver-client";
           asd = "websocket-driver-client";
         }
@@ -105489,12 +105897,12 @@ lib.makeScope pkgs.newScope (self: {
   websocket-driver-server = (
     build-asdf-system {
       pname = "websocket-driver-server";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "websocket-driver-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/websocket-driver/2024-10-12/websocket-driver-20241012-git.tgz";
-          sha256 = "1lj6xarr62199ladkml7qpgi86w94j4djrp54v9ch0zakni3rhj2";
+          url = "http://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz";
+          sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry";
           system = "websocket-driver-server";
           asd = "websocket-driver-server";
         }
@@ -105607,12 +106015,12 @@ lib.makeScope pkgs.newScope (self: {
   whereiseveryone_dot_command-line-args = (
     build-asdf-system {
       pname = "whereiseveryone.command-line-args";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "whereiseveryone.command-line-args" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/whereiseveryone.command-line-args/2024-10-12/whereiseveryone.command-line-args-20241012-git.tgz";
-          sha256 = "140xnz2v0v3hfg3dp2fhidw8ns6lxd3a5knm07wqdp48ksg119wy";
+          url = "http://beta.quicklisp.org/archive/command-line-args/2025-06-22/command-line-args-20250622-git.tgz";
+          sha256 = "14x68ww8323vkvql3ryn9wkxf4fbj1brdn4f6mynr7wqygink2bd";
           system = "whereiseveryone.command-line-args";
           asd = "whereiseveryone.command-line-args";
         }
@@ -105830,12 +106238,12 @@ lib.makeScope pkgs.newScope (self: {
   wire-world = (
     build-asdf-system {
       pname = "wire-world";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "wire-world" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "wire-world";
           asd = "wire-world";
         }
@@ -105947,12 +106355,12 @@ lib.makeScope pkgs.newScope (self: {
   with-contexts = (
     build-asdf-system {
       pname = "with-contexts";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "with-contexts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/with-contexts/2024-10-12/with-contexts-20241012-git.tgz";
-          sha256 = "1biz33wxg312zsmpyjqfcmq4vnixxz3g4hp9krc61977d5n4fxwj";
+          url = "http://beta.quicklisp.org/archive/with-contexts/2025-06-22/with-contexts-20250622-git.tgz";
+          sha256 = "16ak29iy4akxfz7la4mb3swfmyxqj0pf08j5wrpcp7djxb3y6wi9";
           system = "with-contexts";
           asd = "with-contexts";
         }
@@ -106184,12 +106592,12 @@ lib.makeScope pkgs.newScope (self: {
   wordnet = (
     build-asdf-system {
       pname = "wordnet";
-      version = "20220220-git";
+      version = "20250622-git";
       asds = [ "wordnet" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wordnet/2022-02-20/wordnet-20220220-git.tgz";
-          sha256 = "07p60k295fsfcp0gmkqhrxd68hb38aqva8f4k8xk8bqqxxf42vkq";
+          url = "http://beta.quicklisp.org/archive/wordnet/2025-06-22/wordnet-20250622-git.tgz";
+          sha256 = "1gdly27dv1x60p504r4xn1aqd8s544mvw55wfk4dz25m93hwv8pj";
           system = "wordnet";
           asd = "wordnet";
         }
@@ -106228,6 +106636,30 @@ lib.makeScope pkgs.newScope (self: {
       };
     }
   );
+  wouldwork = (
+    build-asdf-system {
+      pname = "wouldwork";
+      version = "20250622-git";
+      asds = [ "wouldwork" ];
+      src = (
+        createAsd {
+          url = "http://beta.quicklisp.org/archive/wouldwork/2025-06-22/wouldwork-20250622-git.tgz";
+          sha256 = "1g47djrdh2qipihvxph5df4z4l10ziwgd69bvjrb3a58r7nl4sj0";
+          system = "wouldwork";
+          asd = "wouldwork";
+        }
+      );
+      systems = [ "wouldwork" ];
+      lispLibs = [
+        (getAttr "alexandria" self)
+        (getAttr "iterate" self)
+        (getAttr "lparallel" self)
+      ];
+      meta = {
+        hydraPlatforms = [ ];
+      };
+    }
+  );
   wu-decimal = (
     build-asdf-system {
       pname = "wu-decimal";
@@ -106497,12 +106929,12 @@ lib.makeScope pkgs.newScope (self: {
   xhtmlambda = (
     build-asdf-system {
       pname = "xhtmlambda";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "xhtmlambda" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xhtmlambda/2024-10-12/xhtmlambda-20241012-git.tgz";
-          sha256 = "1xqwps5lr66lhqiczvccxrpy8kff15fx6qr9nh1i65wi4p68i1bb";
+          url = "http://beta.quicklisp.org/archive/xhtmlambda/2025-06-22/xhtmlambda-20250622-git.tgz";
+          sha256 = "1s30s7panpxi59n0rzqls6pq34gx362s2f4xawswc242c922h3pc";
           system = "xhtmlambda";
           asd = "xhtmlambda";
         }
@@ -106968,12 +107400,12 @@ lib.makeScope pkgs.newScope (self: {
   yadd = (
     build-asdf-system {
       pname = "yadd";
-      version = "master-fe503896-git";
+      version = "master-5a621564-git";
       asds = [ "yadd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2023-10-21/gendl-master-fe503896-git.tgz";
-          sha256 = "0raymbbp71zfyiq6z2qvdh2h8jab3ilc0slxi2m8i7cz0kj1zw10";
+          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "yadd";
           asd = "yadd";
         }
@@ -107011,12 +107443,12 @@ lib.makeScope pkgs.newScope (self: {
   yason = (
     build-asdf-system {
       pname = "yason";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "yason" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/yason/2024-10-12/yason-20241012-git.tgz";
-          sha256 = "00hqii9n6ay5cq1ahbqpnw3l3v0mmz5s1f9kn6l35g8zxj1nlpa7";
+          url = "http://beta.quicklisp.org/archive/yason/2025-06-22/yason-20250622-git.tgz";
+          sha256 = "1bbkqsd7qfih089zs1fpkq8lb4z6xgjj8qswhwd8kgb5wax78lbn";
           system = "yason";
           asd = "yason";
         }
@@ -107032,12 +107464,12 @@ lib.makeScope pkgs.newScope (self: {
   yason-tests = (
     build-asdf-system {
       pname = "yason-tests";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "yason-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/yason/2024-10-12/yason-20241012-git.tgz";
-          sha256 = "00hqii9n6ay5cq1ahbqpnw3l3v0mmz5s1f9kn6l35g8zxj1nlpa7";
+          url = "http://beta.quicklisp.org/archive/yason/2025-06-22/yason-20250622-git.tgz";
+          sha256 = "1bbkqsd7qfih089zs1fpkq8lb4z6xgjj8qswhwd8kgb5wax78lbn";
           system = "yason-tests";
           asd = "yason-tests";
         }
@@ -107399,12 +107831,12 @@ lib.makeScope pkgs.newScope (self: {
   zippy = (
     build-asdf-system {
       pname = "zippy";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "zippy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zippy/2024-10-12/zippy-20241012-git.tgz";
-          sha256 = "06znhzi4zjg2p2858cwnlslqvx28zlmqr9jqij0rkvnn7ysa7qcg";
+          url = "http://beta.quicklisp.org/archive/zippy/2025-06-22/zippy-20250622-git.tgz";
+          sha256 = "12bkds03cx7wj91qs9dhg80zchm8vli73rkgwj6dy0fjrwczdws8";
           system = "zippy";
           asd = "zippy";
         }
@@ -107429,12 +107861,12 @@ lib.makeScope pkgs.newScope (self: {
   zippy-dwim = (
     build-asdf-system {
       pname = "zippy-dwim";
-      version = "20241012-git";
+      version = "20250622-git";
       asds = [ "zippy-dwim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zippy/2024-10-12/zippy-20241012-git.tgz";
-          sha256 = "06znhzi4zjg2p2858cwnlslqvx28zlmqr9jqij0rkvnn7ysa7qcg";
+          url = "http://beta.quicklisp.org/archive/zippy/2025-06-22/zippy-20250622-git.tgz";
+          sha256 = "12bkds03cx7wj91qs9dhg80zchm8vli73rkgwj6dy0fjrwczdws8";
           system = "zippy-dwim";
           asd = "zippy-dwim";
         }
@@ -107589,12 +108021,12 @@ lib.makeScope pkgs.newScope (self: {
   zpb-ttf = (
     build-asdf-system {
       pname = "zpb-ttf";
-      version = "release-1.0.7";
+      version = "20250622-git";
       asds = [ "zpb-ttf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zpb-ttf/2024-10-12/zpb-ttf-release-1.0.7.tgz";
-          sha256 = "04lph7i153zlswvpgg76fxazyswj8j0idqm4ysn8qmflb7xcvd78";
+          url = "http://beta.quicklisp.org/archive/zpb-ttf/2025-06-22/zpb-ttf-20250622-git.tgz";
+          sha256 = "1mnn85109dl2nvk00jmw42vm55lf5md4p5aknc7pzfs8kmc45bp4";
           system = "zpb-ttf";
           asd = "zpb-ttf";
         }
@@ -107625,12 +108057,12 @@ lib.makeScope pkgs.newScope (self: {
   zs3 = (
     build-asdf-system {
       pname = "zs3";
-      version = "1.3.3";
+      version = "release-1.3.4";
       asds = [ "zs3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zs3/2019-10-07/zs3-1.3.3.tgz";
-          sha256 = "186v95wgsj2hkxdw2jl9x1w4fddjclp7arp0rrd9vf5ly8h8sbf3";
+          url = "http://beta.quicklisp.org/archive/zs3/2025-06-22/zs3-release-1.3.4.tgz";
+          sha256 = "1vr9l0hjjmcs24xfjz1s63jfj2261rlzhjvj5f4vblqi0yc96ir5";
           system = "zs3";
           asd = "zs3";
         }

From 7992efedf07bcb443c2bb885d992066475064772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= <kpg@posteo.net>
Date: Sun, 13 Jul 2025 21:27:07 +0200
Subject: [PATCH 0091/3724] lisp-modules: add nixfmt step

Recently the imported.nix file was re-formatted using nixfmt. Adding that step
to the QL import script, to keep up the spirit. Keeps diffs smaller.
---
 .../development/lisp-modules/import/main.lisp |  6 +++-
 pkgs/development/lisp-modules/shell.nix       | 29 +++++++++++--------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/lisp-modules/import/main.lisp b/pkgs/development/lisp-modules/import/main.lisp
index 2ab754d05a4c..6671b8f22b4f 100644
--- a/pkgs/development/lisp-modules/import/main.lisp
+++ b/pkgs/development/lisp-modules/import/main.lisp
@@ -48,8 +48,12 @@
   (format t "Dumped nix file to ~a~%"
           (truename "imported.nix")))
 
+(defun run-nix-formatter ()
+  (uiop:run-program '("nixfmt" "imported.nix")))
+
 (defun main ()
   (format t "~%")
   (init-quicklisp)
   (run-importers)
-  (gen-nix-file))
+  (gen-nix-file)
+  (run-nix-formatter))
diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix
index 85b79bcbff6f..811e8d3c1d28 100644
--- a/pkgs/development/lisp-modules/shell.nix
+++ b/pkgs/development/lisp-modules/shell.nix
@@ -1,18 +1,23 @@
 let
   pkgs = import ../../../. { };
+  inherit (pkgs) mkShellNoCC sbcl nixfmt-rfc-style;
 in
-pkgs.mkShell {
-  nativeBuildInputs = [
-    (pkgs.sbcl.withPackages (
-      ps: with ps; [
-        alexandria
-        str
-        dexador
-        cl-ppcre
-        sqlite
-        arrow-macros
-        jzon
-      ]
+mkShellNoCC {
+  packages = [
+    nixfmt-rfc-style
+    (sbcl.withPackages (
+      ps:
+      builtins.attrValues {
+        inherit (ps)
+          alexandria
+          str
+          dexador
+          cl-ppcre
+          sqlite
+          arrow-macros
+          jzon
+          ;
+      }
     ))
   ];
 }

From f1a96f44914f43f210759a5d18cb66d0d36f7f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Thu, 10 Jul 2025 18:39:18 +0200
Subject: [PATCH 0092/3724] haskellPackages.Agda: generate interface files for
 the primitive modules

---
 .../haskell-modules/configuration-nix.nix            | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 15a076fdca78..fb88a5999acb 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1410,6 +1410,18 @@ builtins.intersectAttrs super {
     (enableCabalFlag "debug")
     # Split outputs to reduce closure size
     enableSeparateBinOutput
+    # Build the primitive library to generate its interface files.
+    # These are needed in order to use Agda in Nix builds.
+    (overrideCabal (drv: {
+      postInstall =
+        drv.postInstall or ""
+        + ''
+          agdaExe=''${bin:-$out}/bin/agda
+
+          echo "Generating Agda core library interface files..."
+          (cd "$("$agdaExe" --print-agda-data-dir)/lib/prim" && "$agdaExe" --build-library)
+        '';
+    }))
   ];
 
   # ats-format uses cli-setup in Setup.hs which is quite happy to write

From 67a1389d948d6b853e6beeacf3cf7b0798803224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Thu, 10 Jul 2025 19:54:20 +0200
Subject: [PATCH 0093/3724] agdaPackages.standard-library: 2.2 ->
 2.2-unstable-2025-07-03

---
 .../development/libraries/agda/standard-library/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix
index f05158d56a1c..0d8221a3b65f 100644
--- a/pkgs/development/libraries/agda/standard-library/default.nix
+++ b/pkgs/development/libraries/agda/standard-library/default.nix
@@ -8,13 +8,13 @@
 
 mkDerivation rec {
   pname = "standard-library";
-  version = "2.2";
+  version = "2.2-unstable-2025-07-03";
 
   src = fetchFromGitHub {
     repo = "agda-stdlib";
     owner = "agda";
-    rev = "v${version}";
-    hash = "sha256-/Fy5EOSbVNXt6Jq0yKSnlNPW4SYfn+eCTAYFnMZrbR0=";
+    rev = "6f8af9452e7fac27bc3b3ad068793b538f07668e";
+    hash = "sha256-LD6KasmQ9ZHRNQJ0N4wjyc6JiSkZpmyqQq9B0Wta1n0=";
   };
 
   nativeBuildInputs = [ (ghcWithPackages (self: [ self.filemanip ])) ];

From 7bd1a191f0d0df7ac55bcbf87cae1cbfc9ec9762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Thu, 10 Jul 2025 20:07:40 +0200
Subject: [PATCH 0094/3724] agdaPackages._1lab: unstable-2024-08-05 ->
 unstable-2025-07-01

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

diff --git a/pkgs/development/libraries/agda/1lab/default.nix b/pkgs/development/libraries/agda/1lab/default.nix
index e21e9537f759..7cafc19dbb7a 100644
--- a/pkgs/development/libraries/agda/1lab/default.nix
+++ b/pkgs/development/libraries/agda/1lab/default.nix
@@ -6,13 +6,13 @@
 
 mkDerivation rec {
   pname = "1lab";
-  version = "unstable-2024-08-05";
+  version = "unstable-2025-07-01";
 
   src = fetchFromGitHub {
     owner = "the1lab";
     repo = pname;
-    rev = "7cc9bf7bbe90be5491e0d64da90a36afa29a540b";
-    hash = "sha256-hOyf6ZzejDAFDRj6liFZsBc9bKdxV5bzTPP4kGXIhW0=";
+    rev = "e9c2ad2b3ba9cefad36e72cb9d732117c68ac862";
+    hash = "sha256-wKh77+xCdfMtnq9jMlpdnEptGO+/WVNlQFa1TDbdUGs=";
   };
 
   postPatch = ''

From 5a6da0e102b135824904c7227902ccbab572e1a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Thu, 10 Jul 2025 21:02:24 +0200
Subject: [PATCH 0095/3724] agdaPackages.cubical-mini: nightly-20241214 ->
 0.5-unstable-2025-06-13

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

diff --git a/pkgs/development/libraries/agda/cubical-mini/default.nix b/pkgs/development/libraries/agda/cubical-mini/default.nix
index 385d99b96ada..1a9107f6b4e6 100644
--- a/pkgs/development/libraries/agda/cubical-mini/default.nix
+++ b/pkgs/development/libraries/agda/cubical-mini/default.nix
@@ -8,13 +8,13 @@
 
 mkDerivation rec {
   pname = "cubical-mini";
-  version = "nightly-20241214";
+  version = "0.5-unstable-2025-06-13";
 
   src = fetchFromGitHub {
     repo = pname;
     owner = "cmcmA20";
-    rev = "ab18320018ddc0055db60d4bb5560d31909c5b78";
-    hash = "sha256-32qXY9KbProdPwqHxSkwO74Oqx65rTzoXtH2SpRB3OM=";
+    rev = "1776874d13d0b811e6eeb70d0e5a52b4d2a978d2";
+    hash = "sha256-UxWOS+uzP9aAaMdSueA2CAuzWkImGAoKxroarcgpk+w=";
   };
 
   nativeBuildInputs = [

From 5be62c29be1d8b17629fafcdc5a87a0768e006b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Thu, 10 Jul 2025 21:04:04 +0200
Subject: [PATCH 0096/3724] agdaPackages.generics: fix build

---
 pkgs/development/libraries/agda/generics/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/agda/generics/default.nix b/pkgs/development/libraries/agda/generics/default.nix
index 71219e334612..18ba2c19b349 100644
--- a/pkgs/development/libraries/agda/generics/default.nix
+++ b/pkgs/development/libraries/agda/generics/default.nix
@@ -20,6 +20,11 @@ mkDerivation rec {
     standard-library
   ];
 
+  # Agda expects a single .agda-lib file.
+  preBuild = ''
+    rm tests.agda-lib
+  '';
+
   # everythingFile = "./README.agda";
 
   meta = with lib; {

From cc708024f66debc2d7562388173c8f4777bd2e44 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 14 Jul 2025 12:57:07 +0200
Subject: [PATCH 0097/3724] stack: use hpack == 0.38.1 to match upstream

See https://github.com/NixOS/nixpkgs/issues/223390 for background info.
---
 .../haskell-modules/configuration-common.nix  |   2 +-
 .../configuration-hackage2nix/main.yaml       |   1 -
 .../haskell-modules/hackage-packages.nix      | 133 ------------------
 3 files changed, 1 insertion(+), 135 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a77cffe2ad65..bd96845634c7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2124,7 +2124,7 @@ with haskellLib;
     self: super: {
       # stack needs to be built with the same hpack version that the upstream releases use.
       # https://github.com/NixOS/nixpkgs/issues/223390
-      hpack = self.hpack_0_38_0;
+      hpack = self.hpack_0_38_1;
     }
   );
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 732ff62231c3..657c958b1d72 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -96,7 +96,6 @@ extra-packages:
   - hlint == 3.4.1                      # 2022-09-21: preserve for ghc 8.10
   - hlint == 3.6.*                      # 2025-04-14: needed for hls with ghc-lib-parser 9.6
   - hnix-store-core < 0.7               # 2023-12-11: required by hnix-store-remote 0.6
-  - hpack == 0.38.0                     # 2025-04-23: preserve for stack == 3.5.1
   - hspec < 2.8                         # 2022-04-07: Needed for tasty-hspec 1.1.6
   - hspec-core < 2.8                    # 2022-04-07: Needed for tasty-hspec 1.1.6
   - hspec-discover < 2.8                # 2022-04-07: Needed for tasty-hspec 1.1.6
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 9cf9cbfe6ba0..4a66de49e257 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -343075,139 +343075,6 @@ self: {
     }
   ) { };
 
-  "hpack_0_38_0" = callPackage (
-    {
-      mkDerivation,
-      aeson,
-      base,
-      bifunctors,
-      bytestring,
-      Cabal,
-      containers,
-      crypton,
-      deepseq,
-      directory,
-      filepath,
-      Glob,
-      hspec,
-      hspec-discover,
-      http-client,
-      http-client-tls,
-      http-types,
-      HUnit,
-      infer-license,
-      interpolate,
-      mockery,
-      mtl,
-      pretty,
-      QuickCheck,
-      scientific,
-      template-haskell,
-      temporary,
-      text,
-      transformers,
-      unordered-containers,
-      vector,
-      yaml,
-    }:
-    mkDerivation {
-      pname = "hpack";
-      version = "0.38.0";
-      sha256 = "0iysz3xnxhjj49hjz9gv56awaldamrbidkiw0xd873g5yfyhyljp";
-      revision = "1";
-      editedCabalFile = "02pqfqqijvr2z3ki2rnb9nlavhzm59qbbvhq89bfdvhcicfgmmf4";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        aeson
-        base
-        bifunctors
-        bytestring
-        Cabal
-        containers
-        crypton
-        deepseq
-        directory
-        filepath
-        Glob
-        http-client
-        http-client-tls
-        http-types
-        infer-license
-        mtl
-        pretty
-        scientific
-        text
-        transformers
-        unordered-containers
-        vector
-        yaml
-      ];
-      executableHaskellDepends = [
-        aeson
-        base
-        bifunctors
-        bytestring
-        Cabal
-        containers
-        crypton
-        deepseq
-        directory
-        filepath
-        Glob
-        http-client
-        http-client-tls
-        http-types
-        infer-license
-        mtl
-        pretty
-        scientific
-        text
-        transformers
-        unordered-containers
-        vector
-        yaml
-      ];
-      testHaskellDepends = [
-        aeson
-        base
-        bifunctors
-        bytestring
-        Cabal
-        containers
-        crypton
-        deepseq
-        directory
-        filepath
-        Glob
-        hspec
-        http-client
-        http-client-tls
-        http-types
-        HUnit
-        infer-license
-        interpolate
-        mockery
-        mtl
-        pretty
-        QuickCheck
-        scientific
-        template-haskell
-        temporary
-        text
-        transformers
-        unordered-containers
-        vector
-        yaml
-      ];
-      testToolDepends = [ hspec-discover ];
-      description = "A modern format for Haskell packages";
-      license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      mainProgram = "hpack";
-    }
-  ) { };
-
   "hpack_0_38_1" = callPackage (
     {
       mkDerivation,

From 902e69b45877e1f92f6badb03195124948f67dc1 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Tue, 15 Jul 2025 02:45:30 +0900
Subject: [PATCH 0098/3724] python3Packages.certifi: 2025.06.15 -> 2025.07.14

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/development/python-modules/certifi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index 7d4704c7917a..30ffb8552e6c 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "certifi";
-  version = "2025.06.15";
+  version = "2025.07.14";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "certifi";
     repo = "python-certifi";
     rev = version;
-    hash = "sha256-ah2a+Qspll3jZ8M7CRL7zhTIt2kuRIiWeI6vTgwb3vs=";
+    hash = "sha256-TSqBca42i7i59ERTrnPN0fLdLWToYMCq5cfFFsgZm5U=";
   };
 
   patches = [

From 59ea7fd277bcceff7e8cb36fd8aa5dbfb3f47d64 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 14 Jul 2025 12:31:18 +0200
Subject: [PATCH 0099/3724] haskell.compiler.*: enable NUMA in rts if supported

Linking against libnuma gives users extra RTS options:
https://downloads.haskell.org/ghc/latest/docs/users_guide/runtime_control.html#rts-flag-numa

Funnily enough, we've already been supporting this for bindists because
it was enabled for some of them.

Resolves #414559.
---
 pkgs/development/compilers/ghc/8.10.7.nix     | 20 ++++++++++++++++---
 .../compilers/ghc/common-hadrian.nix          | 19 ++++++++++++++++--
 .../ghc/common-make-native-bignum.nix         | 19 ++++++++++++++++--
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix
index c972f29289d3..49f0c6b3ec3a 100644
--- a/pkgs/development/compilers/ghc/8.10.7.nix
+++ b/pkgs/development/compilers/ghc/8.10.7.nix
@@ -69,6 +69,10 @@ in
       || (stdenv.hostPlatform != stdenv.targetPlatform)
     ),
 
+  # Enable NUMA support in RTS
+  enableNuma ? lib.meta.availableOn stdenv.targetPlatform numactl,
+  numactl,
+
   # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
   ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (
@@ -265,7 +269,7 @@ let
       basePackageSet = if hostPlatform != targetPlatform then targetPackages else pkgsHostTarget;
     in
     {
-      inherit (basePackageSet) gmp ncurses;
+      inherit (basePackageSet) gmp ncurses numactl;
       # dynamic inherits are not possible in Nix
       libffi = basePackageSet.${libffi_name};
     };
@@ -513,6 +517,11 @@ stdenv.mkDerivation (
       ++ lib.optionals (disableLargeAddressSpace) [
         "--disable-large-address-space"
       ]
+      ++ lib.optionals enableNuma [
+        "--enable-numa"
+        "--with-libnuma-includes=${lib.getDev targetLibs.numactl}/include"
+        "--with-libnuma-libraries=${lib.getLib targetLibs.numactl}/lib"
+      ]
       ++ lib.optionals enableUnregisterised [
         "--enable-unregisterised"
       ];
@@ -565,8 +574,13 @@ stdenv.mkDerivation (
 
     buildInputs = [ bash ] ++ (libDeps hostPlatform);
 
-    depsTargetTarget = map lib.getDev (libDeps targetPlatform);
-    depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
+    # stage1 GHC doesn't need to link against libnuma, so it's target specific
+    depsTargetTarget = map lib.getDev (
+      libDeps targetPlatform ++ lib.optionals enableNuma [ targetLibs.numactl ]
+    );
+    depsTargetTargetPropagated = map (lib.getOutput "out") (
+      libDeps targetPlatform ++ lib.optionals enableNuma [ targetLibs.numactl ]
+    );
 
     # required, because otherwise all symbols from HSffi.o are stripped, and
     # that in turn causes GHCi to abort
diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index acdb2d5bd884..1240dc3e158a 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -91,6 +91,10 @@
     && !stdenv.hostPlatform.isStatic,
   elfutils,
 
+  # Enable NUMA support in RTS
+  enableNuma ? lib.meta.availableOn stdenv.targetPlatform numactl,
+  numactl,
+
   # What flavour to build. Flavour string may contain a flavour and flavour
   # transformers as accepted by hadrian.
   ghcFlavour ?
@@ -479,6 +483,7 @@ let
       gmp
       libffi
       ncurses
+      numactl
       ;
   };
 
@@ -664,6 +669,11 @@ stdenv.mkDerivation (
         "--with-libdw-includes=${lib.getDev targetLibs.elfutils}/include"
         "--with-libdw-libraries=${lib.getLib targetLibs.elfutils}/lib"
       ]
+      ++ lib.optionals enableNuma [
+        "--enable-numa"
+        "--with-libnuma-includes=${lib.getDev targetLibs.numactl}/include"
+        "--with-libnuma-libraries=${lib.getLib targetLibs.numactl}/lib"
+      ]
       ++ lib.optionals targetPlatform.isDarwin [
         # Darwin uses llvm-ar. GHC will try to use `-L` with `ar` when it is `llvm-ar`
         # but it doesn’t currently work because Cabal never uses `-L` on Darwin. See:
@@ -731,8 +741,13 @@ stdenv.mkDerivation (
 
     buildInputs = [ bash ] ++ (libDeps hostPlatform);
 
-    depsTargetTarget = map lib.getDev (libDeps targetPlatform);
-    depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
+    # stage0:ghc (i.e. stage1) doesn't need to link against libnuma, so it's target specific
+    depsTargetTarget = map lib.getDev (
+      libDeps targetPlatform ++ lib.optionals enableNuma [ targetLibs.numactl ]
+    );
+    depsTargetTargetPropagated = map (lib.getOutput "out") (
+      libDeps targetPlatform ++ lib.optionals enableNuma [ targetLibs.numactl ]
+    );
 
     hadrianFlags =
       [
diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
index 9c42c41cd1da..924934937e98 100644
--- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix
+++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@@ -68,6 +68,10 @@
       || (stdenv.hostPlatform != stdenv.targetPlatform)
     ),
 
+  # Enable NUMA support in RTS
+  enableNuma ? lib.meta.availableOn stdenv.targetPlatform numactl,
+  numactl,
+
   # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
   ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (
@@ -261,6 +265,7 @@ let
       gmp
       libffi
       ncurses
+      numactl
       ;
   };
 
@@ -565,6 +570,11 @@ stdenv.mkDerivation (
       ++ lib.optionals (disableLargeAddressSpace) [
         "--disable-large-address-space"
       ]
+      ++ lib.optionals enableNuma [
+        "--enable-numa"
+        "--with-libnuma-includes=${lib.getDev targetLibs.numactl}/include"
+        "--with-libnuma-libraries=${lib.getLib targetLibs.numactl}/lib"
+      ]
       ++ lib.optionals enableUnregisterised [
         "--enable-unregisterised"
       ];
@@ -621,8 +631,13 @@ stdenv.mkDerivation (
 
     buildInputs = [ bash ] ++ (libDeps hostPlatform);
 
-    depsTargetTarget = map lib.getDev (libDeps targetPlatform);
-    depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
+    # stage1 GHC doesn't need to link against libnuma, so it's target specific
+    depsTargetTarget = map lib.getDev (
+      libDeps targetPlatform ++ lib.optionals enableNuma [ targetLibs.numactl ]
+    );
+    depsTargetTargetPropagated = map (lib.getOutput "out") (
+      libDeps targetPlatform ++ lib.optionals enableNuma [ targetLibs.numactl ]
+    );
 
     # required, because otherwise all symbols from HSffi.o are stripped, and
     # that in turn causes GHCi to abort

From 7b981efa880d3e78beb56df4caaf2240ffee7461 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Fri, 11 Jul 2025 23:44:38 -0700
Subject: [PATCH 0100/3724] nixos/sysupdate: add support for
 sysupdated/updatectl

---
 nixos/modules/system/boot/systemd/sysupdate.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/systemd/sysupdate.nix b/nixos/modules/system/boot/systemd/sysupdate.nix
index 354cd0027c91..1aba22235c12 100644
--- a/nixos/modules/system/boot/systemd/sysupdate.nix
+++ b/nixos/modules/system/boot/systemd/sysupdate.nix
@@ -11,7 +11,14 @@ let
 
   format = pkgs.formats.ini { listToValue = toString; };
 
-  definitionsDirectory = utils.systemdUtils.lib.definitions "sysupdate.d" format cfg.transfers;
+  # TODO: Switch back to using utils.systemdUtils.lib.definitions once
+  # https://github.com/systemd/systemd/pull/38187 is resolved. Also ensure
+  # utils.systemdUtils.lib.definitions is capable of setting a custom file
+  # suffix.
+  sysupdateTransfers = lib.mapAttrs' (name: value: {
+    name = "sysupdate.d/${name}.transfer";
+    value.source = format.generate "${name}.transfer" value;
+  }) cfg.transfers;
 in
 {
   options.systemd.sysupdate = {
@@ -126,8 +133,11 @@ in
       "systemd-sysupdate.timer"
       "systemd-sysupdate-reboot.service"
       "systemd-sysupdate-reboot.timer"
+      "systemd-sysupdated.service"
     ];
 
+    systemd.services.systemd-sysupdated.aliases = [ "dbus-org.freedesktop.sysupdate1.service" ];
+
     systemd.timers = {
       "systemd-sysupdate" = {
         wantedBy = [ "timers.target" ];
@@ -139,7 +149,7 @@ in
       };
     };
 
-    environment.etc."sysupdate.d".source = definitionsDirectory;
+    environment.etc = sysupdateTransfers;
   };
 
   meta.maintainers = with lib.maintainers; [ nikstur ];

From 996cc69171d427cf02fe8768ca36454586fd29a8 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Fri, 11 Jul 2025 23:45:05 -0700
Subject: [PATCH 0101/3724] nixos/sysupdate: add jmbaur as maintainer

---
 nixos/modules/system/boot/systemd/sysupdate.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd/sysupdate.nix b/nixos/modules/system/boot/systemd/sysupdate.nix
index 1aba22235c12..0f8bc2dd966b 100644
--- a/nixos/modules/system/boot/systemd/sysupdate.nix
+++ b/nixos/modules/system/boot/systemd/sysupdate.nix
@@ -152,5 +152,8 @@ in
     environment.etc = sysupdateTransfers;
   };
 
-  meta.maintainers = with lib.maintainers; [ nikstur ];
+  meta.maintainers = with lib.maintainers; [
+    nikstur
+    jmbaur
+  ];
 }

From 61d37d773358ee34d5fffd99e38eb566981effbd Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Fri, 11 Jul 2025 23:45:16 -0700
Subject: [PATCH 0102/3724] nixosTests.systemd-sysupdate: use updatectl as
 frontend for updates

---
 nixos/tests/systemd-sysupdate.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/systemd-sysupdate.nix b/nixos/tests/systemd-sysupdate.nix
index 059f2db5df41..5ab5da738171 100644
--- a/nixos/tests/systemd-sysupdate.nix
+++ b/nixos/tests/systemd-sysupdate.nix
@@ -1,7 +1,7 @@
 # Tests downloading a signed update artifact from a server to a target machine.
 # This test does not rely on the `systemd.timer` units provided by the
-# `systemd-sysupdate` module but triggers the `systemd-sysupdate` service
-# manually to make the test more robust.
+# `systemd-sysupdate` module but triggers the `updatectl` tool directly to
+# demonstrate how to initiate updates manually.
 
 { lib, pkgs, ... }:
 
@@ -62,7 +62,8 @@ in
   testScript = ''
     server.wait_for_unit("nginx.service")
 
-    target.succeed("systemctl start systemd-sysupdate")
+    print(target.succeed("updatectl list"))
+    target.succeed("updatectl update")
     assert "nixos" in target.wait_until_succeeds("cat /nixos_1.txt", timeout=5)
   '';
 }

From 369d01f47aa6991ca8ee1da7f112b3ce43bfddaf Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 15 Jul 2025 18:43:00 +0200
Subject: [PATCH 0103/3724] libyuv: Apply patch to fix ARGBToRGB565DitherRow_C
 on big-endian

Makes LibYUVConvertTest.Test{,No}Dither pass.
---
 .../li/libyuv/dither-honour-byte-order.patch  | 32 +++++++++++++++++++
 pkgs/by-name/li/libyuv/package.nix            |  5 +++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/li/libyuv/dither-honour-byte-order.patch

diff --git a/pkgs/by-name/li/libyuv/dither-honour-byte-order.patch b/pkgs/by-name/li/libyuv/dither-honour-byte-order.patch
new file mode 100644
index 000000000000..4ea63a754ba1
--- /dev/null
+++ b/pkgs/by-name/li/libyuv/dither-honour-byte-order.patch
@@ -0,0 +1,32 @@
+diff '--color=auto' -ruN a/source/row_common.cc b/source/row_common.cc
+--- a/source/row_common.cc	2025-07-15 17:55:24.611751521 +0200
++++ b/source/row_common.cc	2025-07-15 18:01:57.808312551 +0200
+@@ -104,8 +104,13 @@
+ #if defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || \
+     defined(_M_IX86) || defined(__arm__) || defined(_M_ARM) ||     \
+     (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
++#define WRITE16(p, v) *(uint16_t*)(p) = v
+ #define WRITEWORD(p, v) *(uint32_t*)(p) = v
+ #else
++static inline void WRITE16(uint8_t* p, uint16_t v) {
++  p[0] = (uint8_t)(v & 255);
++  p[1] = (uint8_t)((v >> 8) & 255);
++}
+ static inline void WRITEWORD(uint8_t* p, uint32_t v) {
+   p[0] = (uint8_t)(v & 255);
+   p[1] = (uint8_t)((v >> 8) & 255);
+@@ -408,10 +413,10 @@
+     uint8_t b1 = STATIC_CAST(uint8_t, clamp255(src_argb[4] + dither1) >> 3);
+     uint8_t g1 = STATIC_CAST(uint8_t, clamp255(src_argb[5] + dither1) >> 2);
+     uint8_t r1 = STATIC_CAST(uint8_t, clamp255(src_argb[6] + dither1) >> 3);
+-    *(uint16_t*)(dst_rgb + 0) =
+-        STATIC_CAST(uint16_t, b0 | (g0 << 5) | (r0 << 11));
+-    *(uint16_t*)(dst_rgb + 2) =
+-        STATIC_CAST(uint16_t, b1 | (g1 << 5) | (r1 << 11));
++    WRITE16((dst_rgb + 0),
++        STATIC_CAST(uint16_t, b0 | (g0 << 5) | (r0 << 11)));
++    WRITE16((dst_rgb + 2),
++        STATIC_CAST(uint16_t, b1 | (g1 << 5) | (r1 << 11)));
+     dst_rgb += 4;
+     src_argb += 8;
+   }
diff --git a/pkgs/by-name/li/libyuv/package.nix b/pkgs/by-name/li/libyuv/package.nix
index 20587c52e87e..7c7bd13d7231 100644
--- a/pkgs/by-name/li/libyuv/package.nix
+++ b/pkgs/by-name/li/libyuv/package.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation {
     hash = "sha256-4Irs+hlAvr6v5UKXmKHhg4IK3cTWdsFWxt1QTS0rizU=";
   };
 
+  patches = [
+    # Fixes wrong byte order in ARGBToRGB565DitherRow_C on big-endian
+    ./dither-honour-byte-order.patch
+  ];
+
   nativeBuildInputs = [
     cmake
   ];

From 963502fbdefdfa5f289a780d4d7ff0df2a1cb5c4 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 16 Jul 2025 00:15:31 +0200
Subject: [PATCH 0104/3724] nodejs_22: 22.17.0 -> 22.17.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 6110bbed9e63..ff3655c4db56 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -21,8 +21,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "22.17.0";
-  sha256 = "7a3ef2aedb905ea7926e5209157266e2376a5db619d9ac0cba3c967f6f5db4f9";
+  version = "22.17.1";
+  sha256 = "327415fd76fcebb98133bf56e2d90e3ac048b038fac2676f03b6db91074575b9";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then

From 254068dc96ac20ad9f114e744516f164e73ff346 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 23:52:24 +0000
Subject: [PATCH 0105/3724] lilv: 0.24.24 -> 0.24.26

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

diff --git a/pkgs/by-name/li/lilv/package.nix b/pkgs/by-name/li/lilv/package.nix
index 32b0bb70bf36..2ae91a38494f 100644
--- a/pkgs/by-name/li/lilv/package.nix
+++ b/pkgs/by-name/li/lilv/package.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "lilv";
-  version = "0.24.24";
+  version = "0.24.26";
 
   outputs = [
     "out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.drobilla.net/${pname}-${version}.tar.xz";
-    hash = "sha256-a7a+n4hQQXbQZC8S3oCbK54txVYhporbjH7bma76u08=";
+    hash = "sha256-Iv7tMLwPlSOEolwvb0sE5tQ4NkCHmO1lqKk0wFXV2Kw=";
   };
 
   nativeBuildInputs = [

From 6c2ccf3f6e357b9dc643a9b13391adff62e31c92 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Wed, 16 Jul 2025 13:20:42 +1000
Subject: [PATCH 0106/3724] make-iso9660-image: drop references to build
 closure

---
 nixos/lib/make-iso9660-image.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix
index daf2d14a9ebf..0180805fe355 100644
--- a/nixos/lib/make-iso9660-image.nix
+++ b/nixos/lib/make-iso9660-image.nix
@@ -76,6 +76,10 @@ stdenv.mkDerivation {
   name = isoName;
   __structuredAttrs = true;
 
+  # the image will be self-contained so we can drop references
+  # to the closure that was used to build it
+  unsafeDiscardReferences.out = true;
+
   buildCommandPath = ./make-iso9660-image.sh;
   nativeBuildInputs = [
     xorriso

From f03674d8680c1eb69074d8601a477e7dd51e517f Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Wed, 16 Jul 2025 13:20:42 +1000
Subject: [PATCH 0107/3724] make-squashfs: drop references to build closure

---
 nixos/lib/make-squashfs.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix
index 49c926760106..4903659bbfd7 100644
--- a/nixos/lib/make-squashfs.nix
+++ b/nixos/lib/make-squashfs.nix
@@ -27,6 +27,10 @@ stdenv.mkDerivation {
   name = "${fileName}${lib.optionalString (!hydraBuildProduct) ".img"}";
   __structuredAttrs = true;
 
+  # the image will be self-contained so we can drop references
+  # to the closure that was used to build it
+  unsafeDiscardReferences.out = true;
+
   nativeBuildInputs = [ squashfsTools ];
 
   buildCommand =

From 3bc4d7773c37eb8c3cf29e6ec172b69f8d414d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 15 Jul 2025 22:03:50 -0700
Subject: [PATCH 0108/3724] libadwaita: 1.7.4 -> 1.7.5

Diff: https://gitlab.gnome.org/GNOME/libadwaita/-/compare/refs/tags/1.7.4...1.7.5

Changelog: https://gitlab.gnome.org/GNOME/libadwaita/-/blob/1.7.5/NEWS
---
 pkgs/by-name/li/libadwaita/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix
index 427eac7604c9..7b6f050b5964 100644
--- a/pkgs/by-name/li/libadwaita/package.nix
+++ b/pkgs/by-name/li/libadwaita/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libadwaita";
-  version = "1.7.4";
+  version = "1.7.5";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GNOME";
     repo = "libadwaita";
     tag = finalAttrs.version;
-    hash = "sha256-HHSKqYOtIfG6JR8zvXl06tq0iHVVNIpVJLDwyB+nI0I=";
+    hash = "sha256-KlaRwOWHvzm+VwMygiEh8wqJfEwwA+x7o9T72Qpqnmo=";
   };
 
   depsBuildBuild = [

From acfcf0f40b2f342b3dc28100194579bc05aeb44b Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Wed, 16 Jul 2025 15:28:36 +1000
Subject: [PATCH 0109/3724] make-system-tarball: use `__structuredAttrs`

Based on https://github.com/NixOS/nixpkgs/commit/ea81a2465eeef6d470786a4e8a8c5d8e9b5db9f3
---
 nixos/lib/make-system-tarball.nix |  6 +++---
 nixos/lib/make-system-tarball.sh  | 13 +++----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix
index 9fb77230cf63..f84fe8f5cbac 100644
--- a/nixos/lib/make-system-tarball.nix
+++ b/nixos/lib/make-system-tarball.nix
@@ -39,7 +39,9 @@ in
 
 stdenv.mkDerivation {
   name = "tarball";
-  builder = ./make-system-tarball.sh;
+  __structuredAttrs = true;
+
+  buildCommandPath = ./make-system-tarball.sh;
   nativeBuildInputs = extraInputs;
 
   inherit
@@ -49,11 +51,9 @@ stdenv.mkDerivation {
     compressCommand
     ;
 
-  # !!! should use XML.
   sources = map (x: x.source) contents;
   targets = map (x: x.target) contents;
 
-  # !!! should use XML.
   inherit symlinks objects;
 
   closureInfo = closureInfo {
diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh
index 8fadc79a13dc..ea24dcf9842d 100644
--- a/nixos/lib/make-system-tarball.sh
+++ b/nixos/lib/make-system-tarball.sh
@@ -1,10 +1,3 @@
-sources_=($sources)
-targets_=($targets)
-
-objects=($objects)
-symlinks=($symlinks)
-
-
 # Remove the initial slash from a path, since genisofs likes it that way.
 stripSlash() {
     res="$1"
@@ -12,10 +5,10 @@ stripSlash() {
 }
 
 # Add the individual files.
-for ((i = 0; i < ${#targets_[@]}; i++)); do
-    stripSlash "${targets_[$i]}"
+for ((i = 0; i < ${#targets[@]}; i++)); do
+    stripSlash "${targets[$i]}"
     mkdir -p "$(dirname "$res")"
-    cp -a "${sources_[$i]}" "$res"
+    cp -a "${sources[$i]}" "$res"
 done
 
 

From 575a9f0e0bcb38805683668d642a9d3b313be695 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Wed, 16 Jul 2025 15:31:26 +1000
Subject: [PATCH 0110/3724] make-system-tarball: drop references to build
 closure

---
 nixos/lib/make-system-tarball.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix
index f84fe8f5cbac..9f1e3bd1e874 100644
--- a/nixos/lib/make-system-tarball.nix
+++ b/nixos/lib/make-system-tarball.nix
@@ -41,6 +41,10 @@ stdenv.mkDerivation {
   name = "tarball";
   __structuredAttrs = true;
 
+  # the tarball will be self-contained so we can drop references
+  # to the closure that was used to build it
+  unsafeDiscardReferences.out = true;
+
   buildCommandPath = ./make-system-tarball.sh;
   nativeBuildInputs = extraInputs;
 

From 1288f57e557951419770b5691fc613f8e3266c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Fri, 11 Jul 2025 01:00:47 +0200
Subject: [PATCH 0111/3724] agdaPackages: switch to `--build-library`

Use the new `--build-library` mode introduced in Agda 2.8.0 to build
libraries instead of relying on ad-hoc `Everything` files. This
simplifies most derivations (except cubical-mini which imports generated
`Everything` files from various modules).
---
 doc/languages-frameworks/agda.section.md      | 47 ++++++-------------
 pkgs/build-support/agda/default.nix           | 12 ++---
 pkgs/build-support/agda/lib.nix               |  4 +-
 .../libraries/agda/1lab/default.nix           | 11 -----
 .../agda/agda-categories/default.nix          |  5 --
 .../libraries/agda/agda-prelude/default.nix   |  7 ---
 .../libraries/agda/agdarsec/default.nix       |  7 ---
 .../libraries/agda/cubical/default.nix        | 12 ++---
 .../functional-linear-algebra/default.nix     |  4 --
 .../libraries/agda/generics/default.nix       |  2 -
 .../agda/standard-library/default.nix         |  9 ----
 pkgs/top-level/agda-packages.nix              |  4 +-
 12 files changed, 25 insertions(+), 99 deletions(-)

diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md
index d5a1c6ef08a3..6d4d973ed612 100644
--- a/doc/languages-frameworks/agda.section.md
+++ b/doc/languages-frameworks/agda.section.md
@@ -125,11 +125,10 @@ To install Agda without GHC, use `ghc = null;`.
 
 ## Writing Agda packages {#writing-agda-packages}
 
-To write a nix derivation for an Agda library, first check that the library has a `*.agda-lib` file.
+To write a nix derivation for an Agda library, first check that the library has a (single) `*.agda-lib` file.
 
 A derivation can then be written using `agdaPackages.mkDerivation`. This has similar arguments to `stdenv.mkDerivation` with the following additions:
 
-* `everythingFile` can be used to specify the location of the `Everything.agda` file, defaulting to `./Everything.agda`. If this file does not exist then either it should be patched in or the `buildPhase` should be overridden (see below).
 * `libraryName` should be the name that appears in the `*.agda-lib` file, defaulting to `pname`.
 * `libraryFile` should be the file name of the `*.agda-lib` file, defaulting to `${libraryName}.agda-lib`.
 
@@ -152,9 +151,9 @@ agdaPackages.mkDerivation {
 
 ### Building Agda packages {#building-agda-packages}
 
-The default build phase for `agdaPackages.mkDerivation` runs `agda` on the `Everything.agda` file.
+The default build phase for `agdaPackages.mkDerivation` runs `agda --build-library`.
 If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden.
-Additionally, a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file.
+Additionally, a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the library.
 `agda` and the Agda libraries contained in `buildInputs` are made available during the build phase.
 
 ### Installing Agda packages {#installing-agda-packages}
@@ -182,7 +181,7 @@ the Agda package set is small and can (still) be maintained by hand.
 
 ### Adding Agda packages to Nixpkgs {#adding-agda-packages-to-nixpkgs}
 
-To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other Agda libraries, so the top line of the `default.nix` can look like:
+To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/default.nix` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other Agda libraries, so the derivation could look like:
 
 ```nix
 {
@@ -190,45 +189,29 @@ To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/d
   standard-library,
   fetchFromGitHub,
 }:
-{ }
+
+mkDerivation {
+  pname = "my-library";
+  version = "1.0";
+  src = <...>;
+  buildInputs = [ standard-library ];
+  meta = <...>;
+}
 ```
 
+You can look at other files under `pkgs/development/libraries/agda/` for more inspiration.
+
 Note that the derivation function is called with `mkDerivation` set to `agdaPackages.mkDerivation`, therefore you
 could use a similar set as in your `default.nix` from [Writing Agda Packages](#writing-agda-packages) with
 `agdaPackages.mkDerivation` replaced with `mkDerivation`.
 
-Here is an example skeleton derivation for iowa-stdlib:
-
-```nix
-mkDerivation {
-  version = "1.5.0";
-  pname = "iowa-stdlib";
-
-  src = <...>;
-
-  libraryFile = "";
-  libraryName = "IAL-1.3";
-
-  buildPhase = ''
-    runHook preBuild
-
-    patchShebangs find-deps.sh
-    make
-
-    runHook postBuild
-  '';
-}
-```
-
-This library has a file called `.agda-lib`, and so we give an empty string to `libraryFile` as nothing precedes `.agda-lib` in the filename. This file contains `name: IAL-1.3`, and so we let `libraryName =  "IAL-1.3"`. This library does not use an `Everything.agda` file and instead has a Makefile, so there is no need to set `everythingFile` and we set a custom `buildPhase`.
-
 When writing an Agda package it is essential to make sure that no `.agda-lib` file gets added to the store as a single file (for example by using `writeText`). This causes Agda to think that the nix store is a Agda library and it will attempt to write to it whenever it typechecks something. See [https://github.com/agda/agda/issues/4613](https://github.com/agda/agda/issues/4613).
 
 In the pull request adding this library,
 you can test whether it builds correctly by writing in a comment:
 
 ```
-@ofborg build agdaPackages.iowa-stdlib
+@ofborg build agdaPackages.my-library
 ```
 
 ### Maintaining Agda packages {#agda-maintaining-packages}
diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index 45fa66ad4587..bd95fef31808 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -90,8 +90,6 @@ let
       pname,
       meta,
       buildInputs ? [ ],
-      everythingFile ? "./Everything.agda",
-      includePaths ? [ ],
       libraryName ? pname,
       libraryFile ? "${libraryName}.agda-lib",
       buildPhase ? null,
@@ -100,17 +98,14 @@ let
       ...
     }:
     let
-      agdaWithArgs = withPackages (filter (p: p ? isAgdaDerivation) buildInputs);
-      includePathArgs = concatMapStrings (path: "-i" + path + " ") (
-        includePaths ++ [ (dirOf everythingFile) ]
-      );
+      agdaWithPkgs = withPackages (filter (p: p ? isAgdaDerivation) buildInputs);
     in
     {
       inherit libraryName libraryFile;
 
       isAgdaDerivation = true;
 
-      buildInputs = buildInputs ++ [ agdaWithArgs ];
+      buildInputs = buildInputs ++ [ agdaWithPkgs ];
 
       buildPhase =
         if buildPhase != null then
@@ -118,8 +113,7 @@ let
         else
           ''
             runHook preBuild
-            agda ${includePathArgs} ${everythingFile}
-            rm ${everythingFile} ${lib.interfaceFile Agda.version everythingFile}
+            agda --build-library
             runHook postBuild
           '';
 
diff --git a/pkgs/build-support/agda/lib.nix b/pkgs/build-support/agda/lib.nix
index 4bdb80a6ca00..c11c17e668a9 100644
--- a/pkgs/build-support/agda/lib.nix
+++ b/pkgs/build-support/agda/lib.nix
@@ -6,8 +6,8 @@
     * The resulting path may not be normalized.
     *
     * Examples:
-    * interfaceFile pkgs.agda.version "./Everything.agda" == "_build/2.6.4.3/agda/./Everything.agdai"
-    * interfaceFile pkgs.agda.version "src/Everything.lagda.tex" == "_build/2.6.4.3/agda/src/Everything.agdai"
+    * interfaceFile pkgs.agda.version "./Foo.agda" == "_build/AGDA_VERSION/agda/./Foo.agdai"
+    * interfaceFile pkgs.agda.version "src/Foo.lagda.tex" == "_build/AGDA_VERSION/agda/src/Foo.agdai"
   */
   interfaceFile =
     agdaVersion: agdaFile:
diff --git a/pkgs/development/libraries/agda/1lab/default.nix b/pkgs/development/libraries/agda/1lab/default.nix
index 7cafc19dbb7a..6dfcc4ac2a84 100644
--- a/pkgs/development/libraries/agda/1lab/default.nix
+++ b/pkgs/development/libraries/agda/1lab/default.nix
@@ -23,19 +23,8 @@ mkDerivation rec {
     shopt -s globstar extglob
     files=(src/**/*.@(agda|lagda.md))
     sed -Ei '/OPTIONS/s/ -v ?[^ #]+//g' "''${files[@]}"
-
-    # Generate all-pages manually instead of building the build script.
-    mkdir -p _build
-    for f in "''${files[@]}"; do
-      f=''${f#src/} f=''${f%%.*} f=''${f//\//.}
-      echo "open import $f"
-    done > _build/all-pages.agda
   '';
 
-  libraryName = "1lab";
-  libraryFile = "1lab.agda-lib";
-  everythingFile = "_build/all-pages.agda";
-
   meta = with lib; {
     description = "A formalised, cross-linked reference resource for mathematics done in Homotopy Type Theory ";
     homepage = src.meta.homepage;
diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix
index 60a74c353f3e..b59255e887f8 100644
--- a/pkgs/development/libraries/agda/agda-categories/default.nix
+++ b/pkgs/development/libraries/agda/agda-categories/default.nix
@@ -24,11 +24,6 @@ mkDerivation rec {
     # version update of the stdlib, so we get rid of the version constraint
     # altogether.
     sed -Ei 's/standard-library-[0-9.]+/standard-library/' agda-categories.agda-lib
-
-    # The Makefile of agda-categories uses git(1) instead of find(1) to
-    # determine the list of source files. We cannot use git, as $PWD will not
-    # be a valid Git working directory.
-    find src -name '*.agda' | sed -e 's|^src/[/]*|import |' -e 's|/|.|g' -e 's/.agda//' -e '/import Everything/d' | LC_COLLATE='C' sort > Everything.agda
   '';
 
   buildInputs = [ standard-library ];
diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix
index 15f27998bec2..8cc002793456 100644
--- a/pkgs/development/libraries/agda/agda-prelude/default.nix
+++ b/pkgs/development/libraries/agda/agda-prelude/default.nix
@@ -15,13 +15,6 @@ mkDerivation {
     hash = "sha256-ab+KojzRbkUTAFNH5OA78s0F5SUuXTbliai6badveg4=";
   };
 
-  preConfigure = ''
-    cd test
-    make everything
-    mv Everything.agda ..
-    cd ..
-  '';
-
   meta = with lib; {
     homepage = "https://github.com/UlfNorell/agda-prelude";
     description = "Programming library for Agda";
diff --git a/pkgs/development/libraries/agda/agdarsec/default.nix b/pkgs/development/libraries/agda/agdarsec/default.nix
index 257172ad3178..876b3b271695 100644
--- a/pkgs/development/libraries/agda/agdarsec/default.nix
+++ b/pkgs/development/libraries/agda/agdarsec/default.nix
@@ -16,13 +16,6 @@ mkDerivation rec {
     sha256 = "02fqkycvicw6m2xsz8p01aq8n3gj2d2gyx8sgj15l46f8434fy0x";
   };
 
-  everythingFile = "./index.agda";
-
-  includePaths = [
-    "src"
-    "examples"
-  ];
-
   buildInputs = [ standard-library ];
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix
index 32cf1063383b..72bb3c3a501d 100644
--- a/pkgs/development/libraries/agda/cubical/default.nix
+++ b/pkgs/development/libraries/agda/cubical/default.nix
@@ -2,7 +2,6 @@
   lib,
   mkDerivation,
   fetchFromGitHub,
-  ghc,
 }:
 
 mkDerivation rec {
@@ -16,13 +15,10 @@ mkDerivation rec {
     hash = "sha256-KwwN2g2naEo4/rKTz2L/0Guh5LxymEYP53XQzJ6eMjM=";
   };
 
-  # The cubical library has several `Everything.agda` files, which are
-  # compiled through the make file they provide.
-  nativeBuildInputs = [ ghc ];
-  buildPhase = ''
-    runHook preBuild
-    make
-    runHook postBuild
+  postPatch = ''
+    # This imports the Everything files, which we don't generate.
+    # TODO: remove for the next release
+    rm -rf Cubical/README.agda Cubical/Talks/EPA2020.agda
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
index 40ec014ca129..a2d5cae4f6f5 100644
--- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
+++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
@@ -18,10 +18,6 @@ mkDerivation rec {
     sha256 = "sha256-3nme/eH4pY6bD0DkhL4Dj/Vp/WnZqkQtZTNk+n1oAyY=";
   };
 
-  preConfigure = ''
-    sh generate-everything.sh
-  '';
-
   meta = with lib; {
     homepage = "https://github.com/ryanorendorff/functional-linear-algebra";
     description = ''
diff --git a/pkgs/development/libraries/agda/generics/default.nix b/pkgs/development/libraries/agda/generics/default.nix
index 18ba2c19b349..e2eefb445e9d 100644
--- a/pkgs/development/libraries/agda/generics/default.nix
+++ b/pkgs/development/libraries/agda/generics/default.nix
@@ -25,8 +25,6 @@ mkDerivation rec {
     rm tests.agda-lib
   '';
 
-  # everythingFile = "./README.agda";
-
   meta = with lib; {
     description = "Library for datatype-generic programming in Agda";
     homepage = src.meta.homepage;
diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix
index 0d8221a3b65f..976d84157836 100644
--- a/pkgs/development/libraries/agda/standard-library/default.nix
+++ b/pkgs/development/libraries/agda/standard-library/default.nix
@@ -2,7 +2,6 @@
   lib,
   mkDerivation,
   fetchFromGitHub,
-  ghcWithPackages,
   nixosTests,
 }:
 
@@ -17,14 +16,6 @@ mkDerivation rec {
     hash = "sha256-LD6KasmQ9ZHRNQJ0N4wjyc6JiSkZpmyqQq9B0Wta1n0=";
   };
 
-  nativeBuildInputs = [ (ghcWithPackages (self: [ self.filemanip ])) ];
-  preConfigure = ''
-    runhaskell GenerateEverything.hs --include-deprecated
-    # We will only build/consider Everything.agda, in particular we don't want Everything*.agda
-    # do be copied to the store.
-    rm EverythingSafe.agda
-  '';
-
   passthru.tests = { inherit (nixosTests) agda; };
   meta = with lib; {
     homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix
index a943c2c52cfd..1289445a5872 100644
--- a/pkgs/top-level/agda-packages.nix
+++ b/pkgs/top-level/agda-packages.nix
@@ -28,9 +28,7 @@ let
 
       agda = withPackages [ ];
 
-      standard-library = callPackage ../development/libraries/agda/standard-library {
-        inherit (pkgs.haskellPackages) ghcWithPackages;
-      };
+      standard-library = callPackage ../development/libraries/agda/standard-library { };
 
       iowa-stdlib = callPackage ../development/libraries/agda/iowa-stdlib { };
 

From 850180f1a01c5c15e590f12f9c6ca1d0cf4767f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Jul 2025 13:43:15 +0000
Subject: [PATCH 0112/3724] unbound-full: 1.23.0 -> 1.23.1

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

diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix
index 2a4fca39cae1..b4da71a189fe 100644
--- a/pkgs/by-name/un/unbound/package.nix
+++ b/pkgs/by-name/un/unbound/package.nix
@@ -56,13 +56,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unbound";
-  version = "1.23.0";
+  version = "1.23.1";
 
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = "unbound";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-a9WNUVDy7ORB40VFUhkUxEaBho+HVNJ105AqdGDr+tI=";
+    hash = "sha256-65bv/AYQ3Dxwuwv49dU2UuA2imZFbUWnQEJESJvqC6w=";
   };
 
   outputs = [

From 5bc07efc6329d06d397aeed713cf6763157dc2db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Jul 2025 13:49:18 +0000
Subject: [PATCH 0113/3724] icingaweb2: 2.12.4 -> 2.12.5

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

diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix
index ffa3325d52e2..a2d4f8b06e21 100644
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/pkgs/servers/icingaweb2/default.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "icingaweb2";
-  version = "2.12.4";
+  version = "2.12.5";
 
   src = fetchFromGitHub {
     owner = "Icinga";
     repo = "icingaweb2";
     rev = "v${version}";
-    hash = "sha256-Ds1SxNQ3WAhY79SWl1ZIQUl2Pb8bZlHISRaSEe+Phos=";
+    hash = "sha256-g55TR7rgWnxNa1OQXOaLAPg3ijtx1u3mqxAxcMLhcB4=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 2eae0245867039a6767a224381a8def593ac739e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 16 Jul 2025 10:00:00 -0500
Subject: [PATCH 0114/3724] game-music-emu: refactor meta section

---
 pkgs/by-name/ga/game-music-emu/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ga/game-music-emu/package.nix b/pkgs/by-name/ga/game-music-emu/package.nix
index ca782008a7b9..b7410ac39378 100644
--- a/pkgs/by-name/ga/game-music-emu/package.nix
+++ b/pkgs/by-name/ga/game-music-emu/package.nix
@@ -31,11 +31,11 @@ stdenv.mkDerivation rec {
     remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/libgme/game-music-emu/";
     description = "Collection of video game music file emulators";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ ];
   };
 }

From 21629b8005c45ce0dbf854f23967429b75bae1b4 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 16 Jul 2025 20:30:29 +0300
Subject: [PATCH 0115/3724] glslang: 15.3.0 -> 15.4.0

Diff: https://github.com/KhronosGroup/glslang/compare/15.3.0...15.4.0
---
 pkgs/by-name/gl/glslang/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix
index 47fcfdf24115..a4e3e5a6987d 100644
--- a/pkgs/by-name/gl/glslang/package.nix
+++ b/pkgs/by-name/gl/glslang/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "glslang";
-  version = "15.3.0";
+  version = "15.4.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
     rev = version;
-    hash = "sha256-HwFP4KJuA+BMQVvBWV0BCRj9U5I3CLEU+5bBtde2f6w=";
+    hash = "sha256-sPc+G7/ua7LQ7scuSvqWs7Q7Q+gFvXQ5wGQsEXbWH6w=";
   };
 
   outputs = [

From 39a7c8f2e1b6655e2772b14c3cdccbbd47055b6e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 16 Jul 2025 20:30:41 +0300
Subject: [PATCH 0116/3724] vulkan-headers: 1.4.313.0 -> 1.4.321.0

Diff: https://github.com/KhronosGroup/Vulkan-Headers/compare/vulkan-sdk-1.4.313.0...vulkan-sdk-1.4.321.0
---
 pkgs/by-name/vu/vulkan-headers/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-headers/package.nix b/pkgs/by-name/vu/vulkan-headers/package.nix
index 8510c2fb43af..c1b118fc6cef 100644
--- a/pkgs/by-name/vu/vulkan-headers/package.nix
+++ b/pkgs/by-name/vu/vulkan-headers/package.nix
@@ -7,7 +7,7 @@
 }:
 stdenv.mkDerivation rec {
   pname = "vulkan-headers";
-  version = "1.4.313.0";
+  version = "1.4.321.0";
 
   # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or
   # later the build fails as:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     owner = "KhronosGroup";
     repo = "Vulkan-Headers";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-cbt0QHifjRCak+3V9J5PjNXDIEBvnwVYFa7rcmNv1VU=";
+    hash = "sha256-Yznjiiu/EEW7B37hbO0aw8Lvc6aVxOy7J/zSwmGxVc0=";
   };
 
   passthru.updateScript = ./update.sh;

From f6ae946baecbd794a24fe0fc0ab7702bbdde7140 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 16 Jul 2025 20:30:49 +0300
Subject: [PATCH 0117/3724] vulkan-loader: 1.4.313.0 -> 1.4.321.0

Diff: https://github.com/KhronosGroup/Vulkan-Loader/compare/vulkan-sdk-1.4.313.0...vulkan-sdk-1.4.321.0
---
 pkgs/by-name/vu/vulkan-loader/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix
index 712d91733b52..6eb0eb813554 100644
--- a/pkgs/by-name/vu/vulkan-loader/package.nix
+++ b/pkgs/by-name/vu/vulkan-loader/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vulkan-loader";
-  version = "1.4.313.0";
+  version = "1.4.321.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Loader";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-CeIjyW90Ri0MvhyFfYgss5Rjh5fHKhQf7CgBEcB/nPk=";
+    hash = "sha256-i06il1GRkjSlhY36XpIUCcd1Wy+If+Eennzbb//1dzk=";
   };
 
   patches = [ ./fix-pkgconfig.patch ];

From 481a484ba80d2a711e96bca418eae10986430f5c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 16 Jul 2025 20:31:01 +0300
Subject: [PATCH 0118/3724] vulkan-validation-layers: 1.4.313.0 -> 1.4.321.0

Diff: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/vulkan-sdk-1.4.313.0...vulkan-sdk-1.4.321.0
---
 pkgs/by-name/vu/vulkan-validation-layers/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
index 422250e5e9ca..78fe2e5e9744 100644
--- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix
+++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
@@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "vulkan-validation-layers";
-  version = "1.4.313.0";
+  version = "1.4.321.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ValidationLayers";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-FavJ9QIv9J/QlY8bBSQ4C+8ZeNzge3Rov97GPOjltuA=";
+    hash = "sha256-aTO8AIwN6/oOcxu6AgYBoOQiUHQkT6MJGAYNgP5js9I=";
   };
 
   strictDeps = true;

From dc07ed2230b70ad24e3530d16c5482c33ffc5ce9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 16 Jul 2025 20:31:11 +0300
Subject: [PATCH 0119/3724] vulkan-tools: 1.4.313.0 -> 1.4.321.0

Diff: https://github.com/KhronosGroup/Vulkan-Tools/compare/vulkan-sdk-1.4.313.0...vulkan-sdk-1.4.321.0
---
 pkgs/by-name/vu/vulkan-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix
index afc501655a0c..db6437b98449 100644
--- a/pkgs/by-name/vu/vulkan-tools/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-tools";
-  version = "1.4.313.0";
+  version = "1.4.321.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Tools";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-47RVuhK9NDtOazG4awTjwbZSnG+thGw6GpyKmcCgWpQ=";
+    hash = "sha256-cd7aLDhXiZ4Wlnrx2dfCQG3j+9vosM3SeohhCNvVN48=";
   };
 
   patches = [ ./wayland-scanner.patch ];

From 079be4291b2bde77818235c90c07186659f1a608 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 16 Jul 2025 20:31:22 +0300
Subject: [PATCH 0120/3724] vulkan-tools-lunarg: 1.4.313.0 -> 1.4.321.0

Diff: https://github.com/LunarG/VulkanTools/compare/vulkan-sdk-1.4.313.0...vulkan-sdk-1.4.321.0
---
 pkgs/by-name/vu/vulkan-tools-lunarg/package.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
index 88791c0cd774..47bd85ab67b8 100644
--- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
@@ -22,18 +22,18 @@
   vulkan-loader,
   vulkan-utility-libraries,
   writeText,
-  libsForQt5,
+  qt6,
 }:
 
 stdenv.mkDerivation rec {
   pname = "vulkan-tools-lunarg";
-  version = "1.4.313.0";
+  version = "1.4.321.0";
 
   src = fetchFromGitHub {
     owner = "LunarG";
     repo = "VulkanTools";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-VJxomhzHEIbQ8CUzlUN2fvBF+M9854FlIR0fE2RgppM=";
+    hash = "sha256-Wd37AYfZ8Ia5kXS9Nvxyj7s+W2DPHUONtqD+tX45XGk=";
   };
 
   nativeBuildInputs = [
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     jq
     which
     pkg-config
-    libsForQt5.qt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -60,8 +60,8 @@ stdenv.mkDerivation rec {
     wayland
     xcbutilkeysyms
     xcbutilwm
-    libsForQt5.qt5.qtbase
-    libsForQt5.qt5.qtwayland
+    qt6.qtbase
+    qt6.qtwayland
   ];
 
   cmakeFlags = [
@@ -70,7 +70,6 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     patchShebangs scripts/*
-    substituteInPlace via/CMakeLists.txt --replace "jsoncpp_static" "jsoncpp"
   '';
 
   # Include absolute paths to layer libraries in their associated

From fd49cf8b75edba7d082493afd125632fd971ac05 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 16 Jul 2025 20:31:30 +0300
Subject: [PATCH 0121/3724] vulkan-extension-layer: 1.4.313.0 -> 1.4.321.0

Diff: https://github.com/KhronosGroup/Vulkan-ExtensionLayer/compare/vulkan-sdk-1.4.313.0...vulkan-sdk-1.4.321.0
---
 pkgs/by-name/vu/vulkan-extension-layer/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
index 8fecc2e233e4..b64bfb519150 100644
--- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix
+++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-extension-layer";
-  version = "1.4.313.0";
+  version = "1.4.321.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ExtensionLayer";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-WYlme5vEHpJHImfkGB+kmUY96fYia93WlfyutBfdxzk=";
+    hash = "sha256-tWUi+yCI7wNLVeGg/h5a+yvKWAu8KZqtgEujfCUtYQ4=";
   };
 
   nativeBuildInputs = [

From e5e3ecdd51bb843af63a18e4ed9b4e345e1a3f91 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 16 Jul 2025 20:31:37 +0300
Subject: [PATCH 0122/3724] vulkan-utility-libraries: 1.4.313.0 -> 1.4.321.0

Diff: https://github.com/KhronosGroup/Vulkan-Utility-Libraries/compare/vulkan-sdk-1.4.313.0...vulkan-sdk-1.4.321.0
---
 pkgs/by-name/vu/vulkan-utility-libraries/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
index 59ea1f8ca1fa..71601060ee97 100644
--- a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
+++ b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vulkan-utility-libraries";
-  version = "1.4.313.0";
+  version = "1.4.321.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Utility-Libraries";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-MmC4UVa9P/0h7r8IBp1LhP9EztwyZv/ASWKKj8Gk1T8=";
+    hash = "sha256-MaEn0qVTnhp5kKCbyMhFXysIcAnZF+ba4+KaVD4wSPY=";
   };
 
   nativeBuildInputs = [

From baf9d1ca3552de401b81d3ed7f73f7ac0146be97 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 16 Jul 2025 20:31:50 +0300
Subject: [PATCH 0123/3724] vulkan-volk: 1.4.313.0 -> 1.4.321.0

Diff: https://github.com/zeux/volk/compare/vulkan-sdk-1.4.313.0...vulkan-sdk-1.4.321.0
---
 pkgs/by-name/vu/vulkan-volk/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix
index cbbfde507c78..778312559317 100644
--- a/pkgs/by-name/vu/vulkan-volk/package.nix
+++ b/pkgs/by-name/vu/vulkan-volk/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "volk";
-  version = "1.4.313.0";
+  version = "1.4.321.0";
 
   src = fetchFromGitHub {
     owner = "zeux";
     repo = "volk";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-MXJjHfrSZiDHnCJMaKYgy2480DxNv86pbHx2ebWU2ug=";
+    hash = "sha256-Revi0OVvLI23yh1R6mNfcUCo1DXlACLjIw+k6EZQb/U=";
   };
 
   nativeBuildInputs = [ cmake ];

From 93a4ff754dc0e2bd21c9558564c60cf596337d5e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 16 Jul 2025 20:31:59 +0300
Subject: [PATCH 0124/3724] spirv-headers: 1.4.313.0 -> 1.4.321.0

Diff: https://github.com/KhronosGroup/SPIRV-Headers/compare/vulkan-sdk-1.4.313.0...vulkan-sdk-1.4.321.0
---
 pkgs/by-name/sp/spirv-headers/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix
index ba28dbbb1efd..6a4546588bf3 100644
--- a/pkgs/by-name/sp/spirv-headers/package.nix
+++ b/pkgs/by-name/sp/spirv-headers/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "spirv-headers";
-  version = "1.4.313.0";
+  version = "1.4.321.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Headers";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-bUgt7m3vJYoozxgrA5hVTRcbPg3OAzht0e+MgTH7q9k=";
+    hash = "sha256-LRjMy9xtOErbJbMh+g2IKXfmo/hWpegZM72F8E122oY=";
   };
 
   nativeBuildInputs = [ cmake ];

From 1837a31efcd331c1b79e20b1058426f8122fda56 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 16 Jul 2025 20:32:20 +0300
Subject: [PATCH 0125/3724] spirv-cross: 1.4.313.0 -> 1.4.321.0

Diff: https://github.com/KhronosGroup/SPIRV-Cross/compare/vulkan-sdk-1.4.313.0...vulkan-sdk-1.4.321.0

Changelog: https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/1.4.321.0
---
 pkgs/by-name/sp/spirv-cross/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix
index 3751d3186bea..20b464dd5ea0 100644
--- a/pkgs/by-name/sp/spirv-cross/package.nix
+++ b/pkgs/by-name/sp/spirv-cross/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spirv-cross";
-  version = "1.4.313.0";
+  version = "1.4.321.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Cross";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-Rvb3XlTGoQKABSK/jKnbOePS4BKLDAW4L+t2SLw2RMA=";
+    hash = "sha256-qmJK29PtjDE4+6uF8Mj6noAcRoeM3rHWRbUvcr6JzI0=";
   };
 
   nativeBuildInputs = [

From c52e38e629f8b718a964ef63ff1e8b0b552fae0a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 16 Jul 2025 20:32:31 +0300
Subject: [PATCH 0126/3724] spirv-tools: 1.4.313.0 -> 1.4.321.0

Diff: https://github.com/KhronosGroup/SPIRV-Tools/compare/vulkan-sdk-1.4.313.0...vulkan-sdk-1.4.321.0
---
 pkgs/by-name/sp/spirv-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix
index 3f0dabe9a26f..f158e801d2dd 100644
--- a/pkgs/by-name/sp/spirv-tools/package.nix
+++ b/pkgs/by-name/sp/spirv-tools/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "spirv-tools";
-  version = "1.4.313.0";
+  version = "1.4.321.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Tools";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-nGyEOREua/W2mdb8DhmqXW0gDThnXnIlhnURAUhCO2g=";
+    hash = "sha256-yAdd/mXY8EJnE0vCu0n/aVxMH9059T/7cAdB9nP1vQQ=";
   };
 
   # The cmake options are sufficient for turning on static building, but not

From ba80420bcc6731f3228e8d763c514a5f33644836 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 16 Jul 2025 20:06:37 +0200
Subject: [PATCH 0127/3724] libxml2: 2.14.4-unstable-2025-06-20 -> 2.14.5

Release notes: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.14.5

schematron: Fix memory safety issues in xmlSchematronReportOutput
Schematron: Fix null pointer dereference leading to DoS (Michael Mann)
Fix potential buffer overflows of interactive shell (Michael Mann)

Fixes CVE-2025-49794, CVE-2025-49796, CVE-2025-49795, CVE-2025-6170
---
 pkgs/development/libraries/libxml2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 35111e8c7516..1a411f3b2130 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -33,7 +33,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxml2";
-  version = "2.14.4-unstable-2025-06-20";
+  version = "2.14.5";
 
   outputs =
     [
@@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "libxml2";
-    rev = "356542324fa439de544b5e419b91ae68d42c306c"; # some bugfixes right behind 2.14.4
-    hash = "sha256-0jo08ECX+oP7Ekjgw3ZgOh+fSiNjlbjoZc4p3PqomJA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-vxKlw8Kz+fgUP6bhWG2+4346WJVzqG0QvPG/BT7RftQ=";
   };
 
   patches = [

From 51ec23af3a769a676dd36269f6e812875902d490 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 16 Jul 2025 11:35:36 -0700
Subject: [PATCH 0128/3724] Revert "re2: 2024-07-02 -> 2025-06-26b"

This reverts commit 44b4054d6f18a846f93719c10e60aea38070b700.

No such tag exists in the repository. Perhaps it once did.
---
 pkgs/by-name/re/re2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix
index dbc55c717d1b..8781413e48ba 100644
--- a/pkgs/by-name/re/re2/package.nix
+++ b/pkgs/by-name/re/re2/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "re2";
-  version = "2025-06-26b";
+  version = "2024-07-02";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "re2";
     rev = finalAttrs.version;
-    hash = "sha256-thON6Xdt2ihXqgj1qIyHYvoQWkBjvbswytCuSqH0LM0=";
+    hash = "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=";
   };
 
   outputs = [

From 0e19aa4ab51d576d0c91668d8e29b79ce8fe0f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= <kpg@posteo.net>
Date: Thu, 17 Jul 2025 00:19:36 +0200
Subject: [PATCH 0129/3724] sbcl.pkgs.reblocks: fix build after bump

added some extra systems which other packages were looking for
---
 pkgs/development/lisp-modules/packages.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index 9acb067effaf..ea47ea457262 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -86,6 +86,21 @@ let
 
       jzon = super.com_dot_inuoe_dot_jzon;
 
+      _40ants-routes = super._40ants-routes.overrideLispAttrs (o: {
+        systems = o.systems ++ [ "40ants-routes/handler" ];
+      });
+
+      reblocks-ui2 = super.reblocks-ui2.overrideLispAttrs (o: {
+        systems = o.systems ++ [
+          "reblocks-ui2/themes/color"
+          "reblocks-ui2/themes/tailwind"
+          "reblocks-ui2/utils/padding"
+          "reblocks-ui2/utils/align"
+          "reblocks-ui2/card"
+          "reblocks-ui2/card/view"
+        ];
+      });
+
       cl-notify = build-asdf-system {
         pname = "cl-notify";
         version = "20080904-138ca7038";

From e02269897a9b08b62765f91679104e6125fc101d Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 17 Jul 2025 18:36:42 +0200
Subject: [PATCH 0130/3724] haskell.compiler: (make-native-bignum) group
 unconditional patches

The patches for avoiding clang -S in C compilation are a bit of an edge
case: They shouldn't be conditional, but are currently.
---
 .../ghc/common-make-native-bignum.nix         | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
index 924934937e98..c47a710cc906 100644
--- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix
+++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@@ -302,9 +302,51 @@ stdenv.mkDerivation (
           stripLen = 1;
           extraPrefix = "libraries/unix/";
         })
+
+        # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
+        ./docs-sphinx-7.patch
       ]
+
+      # Before GHC 9.6, GHC, when used to compile C sources (i.e. to drive the CC), would first
+      # invoke the C compiler to generate assembly and later call the assembler on the result of
+      # that operation. Unfortunately, that is brittle in a lot of cases, e.g. when using mismatched
+      # CC / assembler (https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12005). This issue
+      # does not affect us. However, LLVM 18 introduced a check in clang that makes sure no
+      # non private labels occur between .cfi_startproc and .cfi_endproc which causes the
+      # assembly that the same version (!) of clang generates from rts/StgCRun.c to be rejected.
+      # This causes GHC to fail compilation on mach-o platforms ever since we upgraded to
+      # LLVM 19.
+      #
+      # clang compiles the same file without issues whithout the roundtrip via assembly. Thus,
+      # the solution is to backport those changes from GHC 9.6 that skip the intermediate
+      # assembly step.
+      #
+      # https://gitlab.haskell.org/ghc/ghc/-/issues/25608#note_622589
+      # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6877
+      ++ (
+        if lib.versionAtLeast version "9.4" then
+          [
+            # Need to use this patch so the next one applies, passes file location info to the cc phase
+            (fetchpatch {
+              name = "ghc-add-location-to-cc-phase.patch";
+              url = "https://gitlab.haskell.org/ghc/ghc/-/commit/4a7256a75af2fc0318bef771a06949ffb3939d5a.patch";
+              hash = "sha256-DnTI+i1zMebeWvw75D59vMaEEBb2Nr9HusxTyhmdy2M=";
+            })
+            # Makes Cc phase directly generate object files instead of assembly
+            (fetchpatch {
+              name = "ghc-cc-directly-emit-object.patch";
+              url = "https://gitlab.haskell.org/ghc/ghc/-/commit/96811ba491495b601ec7d6a32bef8563b0292109.patch";
+              hash = "sha256-G8u7/MK/tGOEN8Wxccxj/YIOP7mL2G9Co1WKdHXOo6I=";
+            })
+          ]
+        else
+          [
+            # TODO(@sternenseemann): backport changes to GHC < 9.4 if possible
+          ]
+      )
+
+      # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
       ++ lib.optionals (lib.versionOlder version "9.4") [
-        # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
         (fetchpatch {
           url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
           sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk=";
@@ -323,11 +365,6 @@ stdenv.mkDerivation (
         })
       ]
 
-      ++ [
-        # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
-        ./docs-sphinx-7.patch
-      ]
-
       ++ lib.optionals (lib.versionOlder version "9.2.2") [
         # Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2.
         # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423
@@ -382,45 +419,8 @@ stdenv.mkDerivation (
           url = "https://gitlab.haskell.org/ghc/ghc/-/commit/39bb6e583d64738db51441a556d499aa93a4fc4a.patch";
           sha256 = "0w5fx413z924bi2irsy1l4xapxxhrq158b5gn6jzrbsmhvmpirs0";
         })
-      ]
+      ];
 
-      # Before GHC 9.6, GHC, when used to compile C sources (i.e. to drive the CC), would first
-      # invoke the C compiler to generate assembly and later call the assembler on the result of
-      # that operation. Unfortunately, that is brittle in a lot of cases, e.g. when using mismatched
-      # CC / assembler (https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12005). This issue
-      # does not affect us. However, LLVM 18 introduced a check in clang that makes sure no
-      # non private labels occur between .cfi_startproc and .cfi_endproc which causes the
-      # assembly that the same version (!) of clang generates from rts/StgCRun.c to be rejected.
-      # This causes GHC to fail compilation on mach-o platforms ever since we upgraded to
-      # LLVM 19.
-      #
-      # clang compiles the same file without issues whithout the roundtrip via assembly. Thus,
-      # the solution is to backport those changes from GHC 9.6 that skip the intermediate
-      # assembly step.
-      #
-      # https://gitlab.haskell.org/ghc/ghc/-/issues/25608#note_622589
-      # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6877
-      ++ (
-        if lib.versionAtLeast version "9.4" then
-          [
-            # Need to use this patch so the next one applies, passes file location info to the cc phase
-            (fetchpatch {
-              name = "ghc-add-location-to-cc-phase.patch";
-              url = "https://gitlab.haskell.org/ghc/ghc/-/commit/4a7256a75af2fc0318bef771a06949ffb3939d5a.patch";
-              hash = "sha256-DnTI+i1zMebeWvw75D59vMaEEBb2Nr9HusxTyhmdy2M=";
-            })
-            # Makes Cc phase directly generate object files instead of assembly
-            (fetchpatch {
-              name = "ghc-cc-directly-emit-object.patch";
-              url = "https://gitlab.haskell.org/ghc/ghc/-/commit/96811ba491495b601ec7d6a32bef8563b0292109.patch";
-              hash = "sha256-G8u7/MK/tGOEN8Wxccxj/YIOP7mL2G9Co1WKdHXOo6I=";
-            })
-          ]
-        else
-          [
-            # TODO(@sternenseemann): backport changes to GHC < 9.4 if possible
-          ]
-      );
 
     postPatch = "patchShebangs .";
 

From a9be46bf73a9878b039254f5980bbe9265715e1a Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 17 Jul 2025 21:33:35 +0200
Subject: [PATCH 0131/3724] haskell.compiler: (make-native-bignum) sort cond
 patches by version

---
 .../ghc/common-make-native-bignum.nix         | 69 +++++++++----------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
index c47a710cc906..b4916ff57a7c 100644
--- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix
+++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@@ -345,23 +345,14 @@ stdenv.mkDerivation (
           ]
       )
 
-      # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
-      ++ lib.optionals (lib.versionOlder version "9.4") [
+      ++ lib.optionals (lib.versionAtLeast version "9.2") [
+        # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs
+        # Can be removed if the Cabal library included with ghc backports the linked fix
         (fetchpatch {
-          url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
-          sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk=";
-          extraPrefix = "utils/haddock/";
+          url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch";
           stripLen = 1;
-        })
-      ]
-
-      ++ lib.optionals (lib.versionOlder version "9.4.6") [
-        # Fix docs build with sphinx >= 6.0
-        # https://gitlab.haskell.org/ghc/ghc/-/issues/22766
-        (fetchpatch {
-          name = "ghc-docs-sphinx-6.0.patch";
-          url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch";
-          sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv";
+          extraPrefix = "libraries/Cabal/";
+          sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY=";
         })
       ]
 
@@ -376,14 +367,36 @@ stdenv.mkDerivation (
         })
       ]
 
-      ++ lib.optionals (lib.versionAtLeast version "9.2") [
-        # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs
-        # Can be removed if the Cabal library included with ghc backports the linked fix
+      # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
+      ++ lib.optionals (lib.versionOlder version "9.4") [
         (fetchpatch {
-          url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch";
+          url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
+          sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk=";
+          extraPrefix = "utils/haddock/";
           stripLen = 1;
-          extraPrefix = "libraries/Cabal/";
-          sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY=";
+        })
+      ]
+
+      # Fixes stack overrun in rts which crashes an process whenever
+      # freeHaskellFunPtr is called with nixpkgs' hardening flags.
+      # https://gitlab.haskell.org/ghc/ghc/-/issues/25485
+      # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13599
+      # TODO: patch doesn't apply for < 9.4, but may still be necessary?
+      ++ lib.optionals (lib.versionAtLeast version "9.4") [
+        (fetchpatch {
+          name = "ghc-rts-adjustor-fix-i386-stack-overrun.patch";
+          url = "https://gitlab.haskell.org/ghc/ghc/-/commit/39bb6e583d64738db51441a556d499aa93a4fc4a.patch";
+          sha256 = "0w5fx413z924bi2irsy1l4xapxxhrq158b5gn6jzrbsmhvmpirs0";
+        })
+      ]
+
+      ++ lib.optionals (lib.versionOlder version "9.4.6") [
+        # Fix docs build with sphinx >= 6.0
+        # https://gitlab.haskell.org/ghc/ghc/-/issues/22766
+        (fetchpatch {
+          name = "ghc-docs-sphinx-6.0.patch";
+          url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch";
+          sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv";
         })
       ]
 
@@ -406,22 +419,8 @@ stdenv.mkDerivation (
           else
             ./Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch
         )
-      ]
-
-      # Fixes stack overrun in rts which crashes an process whenever
-      # freeHaskellFunPtr is called with nixpkgs' hardening flags.
-      # https://gitlab.haskell.org/ghc/ghc/-/issues/25485
-      # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13599
-      # TODO: patch doesn't apply for < 9.4, but may still be necessary?
-      ++ lib.optionals (lib.versionAtLeast version "9.4") [
-        (fetchpatch {
-          name = "ghc-rts-adjustor-fix-i386-stack-overrun.patch";
-          url = "https://gitlab.haskell.org/ghc/ghc/-/commit/39bb6e583d64738db51441a556d499aa93a4fc4a.patch";
-          sha256 = "0w5fx413z924bi2irsy1l4xapxxhrq158b5gn6jzrbsmhvmpirs0";
-        })
       ];
 
-
     postPatch = "patchShebangs .";
 
     # GHC needs the locale configured during the Haddock phase.

From 98d795a2725894ea0fdaf799665c9dd3b2113d92 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 17 Jul 2025 21:34:00 +0200
Subject: [PATCH 0132/3724] haskell.compiler: (make built) add libnuma paths to
 pkg db

We support using GHC outside of stdenv and even inside stdenv the setup
hooks and propagation sometimes fail us. E.g. in pkgsStatic, the
build->build linker won't properly find the (dynamic) libnuma nativeGhc
needs, presumably because the stdenv shell code can't distinguish
between build and host by platform config strings in this case.

In both use cases we need to have GHC correctly set the -L flags which
can be achieved by setting include-dirs and library-dirs in the package
db entry for rts. Curiously, only hadrian does this, so we need to add
an appropriate patch for the make built GHCs.
---
 pkgs/development/compilers/ghc/8.10.7.nix     |  6 ++
 .../ghc/common-make-native-bignum.nix         | 11 +++
 ...8.10-9.2-rts-package-db-libnuma-dirs.patch | 85 +++++++++++++++++++
 .../ghc-9.4-rts-package-db-libnuma-dirs.patch | 85 +++++++++++++++++++
 4 files changed, 187 insertions(+)
 create mode 100644 pkgs/development/compilers/ghc/ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch
 create mode 100644 pkgs/development/compilers/ghc/ghc-9.4-rts-package-db-libnuma-dirs.patch

diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix
index 49f0c6b3ec3a..1023487d299a 100644
--- a/pkgs/development/compilers/ghc/8.10.7.nix
+++ b/pkgs/development/compilers/ghc/8.10.7.nix
@@ -368,6 +368,12 @@ stdenv.mkDerivation (
           sha256 = "1rmv3132xhxbka97v0rx7r6larx5f5nnvs4mgm9q3rmgpjyd1vf9";
           includes = [ "libraries/ghci/ghci.cabal.in" ];
         })
+
+        # Correctly record libnuma's library and include directories in the
+        # package db. This fixes linking whenever stdenv and propagation won't
+        # quite pass the correct -L flags to the linker, e.g. when using GHC
+        # outside of stdenv/nixpkgs or build->build compilation in pkgsStatic.
+        ./ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         # Make Block.h compile with c++ compilers. Remove with the next release
diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
index b4916ff57a7c..db2bca2eab70 100644
--- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix
+++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@@ -305,6 +305,17 @@ stdenv.mkDerivation (
 
         # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
         ./docs-sphinx-7.patch
+
+        # Correctly record libnuma's library and include directories in the
+        # package db. This fixes linking whenever stdenv and propagation won't
+        # quite pass the correct -L flags to the linker, e.g. when using GHC
+        # outside of stdenv/nixpkgs or build->build compilation in pkgsStatic.
+        (
+          if lib.versionAtLeast version "9.4" then
+            ./ghc-9.4-rts-package-db-libnuma-dirs.patch
+          else
+            ./ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch
+        )
       ]
 
       # Before GHC 9.6, GHC, when used to compile C sources (i.e. to drive the CC), would first
diff --git a/pkgs/development/compilers/ghc/ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch b/pkgs/development/compilers/ghc/ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch
new file mode 100644
index 000000000000..4a5de6403923
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch
@@ -0,0 +1,85 @@
+From adef13bb81cdb49a8da8a22db261e48d8c4bbb5d Mon Sep 17 00:00:00 2001
+From: sterni <sternenseemann@systemli.org>
+Date: Thu, 17 Jul 2025 21:21:29 +0200
+Subject: [PATCH] rts: record libnuma include and lib dirs in package conf
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The --with-libnuma-libraries and --with-libnuma-includes flags were
+originally introduced for hadrian in def486c90ef6f37d81d0d9c6df7544
+and curiously never supported by the make build system — even though
+the addition was made in the 9.0 series and even backported to the
+8.10 series.
+
+While the make build system knows when to link against libnuma, it won't
+enforce its specific directories by adding them to rts.conf in the
+package db. This commit implements this retroactively for the make build
+system, modeled after how make does the same sort of thing for Libdw.
+---
+ mk/config.mk.in     | 4 ++++
+ rts/ghc.mk          | 8 ++++++++
+ rts/package.conf.in | 5 +++--
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/mk/config.mk.in b/mk/config.mk.in
+index 35f6e2d087..d2b1329eb5 100644
+--- a/mk/config.mk.in
++++ b/mk/config.mk.in
+@@ -333,6 +333,10 @@ LibdwIncludeDir=@LibdwIncludeDir@
+ #     rts/Libdw.c:set_initial_registers()
+ GhcRtsWithLibdw=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 s390x),@UseLibdw@,NO))
+ 
++UseLibNuma=@UseLibNuma@
++LibNumaLibDir=@LibNumaLibDir@
++LibNumaIncludeDir=@LibNumaIncludeDir@
++
+ ################################################################################
+ #
+ #		Paths (see paths.mk)
+diff --git a/rts/ghc.mk b/rts/ghc.mk
+index 9c535def5a..7782c4b768 100644
+--- a/rts/ghc.mk
++++ b/rts/ghc.mk
+@@ -576,6 +576,14 @@ rts_PACKAGE_CPP_OPTS += -DLIBDW_INCLUDE_DIR=
+ rts_PACKAGE_CPP_OPTS += -DLIBDW_LIB_DIR=
+ endif
+ 
++ifeq "$(UseLibNuma)" "YES"
++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_INCLUDE_DIR=$(LibNumaIncludeDir)
++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_LIB_DIR=$(LibNumaLibDir)
++else
++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_INCLUDE_DIR=
++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_LIB_DIR=
++endif
++
+ # -----------------------------------------------------------------------------
+ # dependencies
+ 
+diff --git a/rts/package.conf.in b/rts/package.conf.in
+index 9bdbf3659a..46f728b09a 100644
+--- a/rts/package.conf.in
++++ b/rts/package.conf.in
+@@ -18,9 +18,9 @@ hidden-modules:
+ import-dirs:
+ 
+ #if defined(INSTALLING)
+-library-dirs:           LIB_DIR"/rts" FFI_LIB_DIR LIBDW_LIB_DIR
++library-dirs:           LIB_DIR"/rts" FFI_LIB_DIR LIBDW_LIB_DIR LIBNUMA_LIB_DIR
+ #else /* !INSTALLING */
+-library-dirs:           TOP"/rts/dist/build" FFI_LIB_DIR LIBDW_LIB_DIR
++library-dirs:           TOP"/rts/dist/build" FFI_LIB_DIR LIBDW_LIB_DIR LIBNUMA_LIB_DIR
+ #endif
+ 
+ hs-libraries:   "HSrts" FFI_LIB
+@@ -76,6 +76,7 @@ include-dirs:           TOP"/rts/dist/build"
+                         FFI_INCLUDE_DIR
+                         LIBDW_INCLUDE_DIR
+                         TOP"/includes/dist-install/build"
++                        LIBNUMA_INCLUDE_DIR
+ #endif
+ 
+ includes:               Stg.h
+-- 
+2.49.0
+
diff --git a/pkgs/development/compilers/ghc/ghc-9.4-rts-package-db-libnuma-dirs.patch b/pkgs/development/compilers/ghc/ghc-9.4-rts-package-db-libnuma-dirs.patch
new file mode 100644
index 000000000000..645153b9a2d7
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.4-rts-package-db-libnuma-dirs.patch
@@ -0,0 +1,85 @@
+From f9625ba94522bec93b4c5d46ee5fd97f537a7dfa Mon Sep 17 00:00:00 2001
+From: sterni <sternenseemann@systemli.org>
+Date: Thu, 17 Jul 2025 21:21:29 +0200
+Subject: [PATCH] rts: record libnuma include and lib dirs in package conf
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The --with-libnuma-libraries and --with-libnuma-includes flags were
+originally introduced for hadrian in def486c90ef6f37d81d0d9c6df7544
+and curiously never supported by the make build system — even though
+the addition was made in the 9.0 series and even backported to the
+8.10 series.
+
+While the make build system knows when to link against libnuma, it won't
+enforce its specific directories by adding them to rts.conf in the
+package db. This commit implements this retroactively for the make build
+system, modeled after how make does the same sort of thing for Libdw.
+---
+ mk/config.mk.in     | 4 ++++
+ rts/ghc.mk          | 8 ++++++++
+ rts/package.conf.in | 5 +++--
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/mk/config.mk.in b/mk/config.mk.in
+index 2ff2bea9b6..d95f927dbd 100644
+--- a/mk/config.mk.in
++++ b/mk/config.mk.in
+@@ -324,6 +324,10 @@ LibdwIncludeDir=@LibdwIncludeDir@
+ #     rts/Libdw.c:set_initial_registers()
+ GhcRtsWithLibdw=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 s390x),@UseLibdw@,NO))
+ 
++UseLibNuma=@UseLibNuma@
++LibNumaLibDir=@LibNumaLibDir@
++LibNumaIncludeDir=@LibNumaIncludeDir@
++
+ ################################################################################
+ #
+ #		Paths (see paths.mk)
+diff --git a/rts/ghc.mk b/rts/ghc.mk
+index 36a82f9f2c..854bb8e013 100644
+--- a/rts/ghc.mk
++++ b/rts/ghc.mk
+@@ -573,6 +573,14 @@ rts_PACKAGE_CPP_OPTS += -DLIBDW_INCLUDE_DIR=
+ rts_PACKAGE_CPP_OPTS += -DLIBDW_LIB_DIR=
+ endif
+ 
++ifeq "$(UseLibNuma)" "YES"
++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_INCLUDE_DIR=$(LibNumaIncludeDir)
++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_LIB_DIR=$(LibNumaLibDir)
++else
++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_INCLUDE_DIR=
++rts_PACKAGE_CPP_OPTS += -DLIBNUMA_LIB_DIR=
++endif
++
+ # -----------------------------------------------------------------------------
+ # dependencies
+ 
+diff --git a/rts/package.conf.in b/rts/package.conf.in
+index cb5a436f5c..9e5ae48adb 100644
+--- a/rts/package.conf.in
++++ b/rts/package.conf.in
+@@ -18,9 +18,9 @@ hidden-modules:
+ import-dirs:
+ 
+ #if defined(INSTALLING)
+-library-dirs:           LIB_DIR FFI_LIB_DIR LIBDW_LIB_DIR
++library-dirs:           LIB_DIR FFI_LIB_DIR LIBDW_LIB_DIR LIBNUMA_LIB_DIR
+ #else /* !INSTALLING */
+-library-dirs:           TOP"/rts/dist-install/build" FFI_LIB_DIR LIBDW_LIB_DIR
++library-dirs:           TOP"/rts/dist-install/build" FFI_LIB_DIR LIBDW_LIB_DIR LIBNUMA_LIB_DIR
+ #endif
+ 
+ hs-libraries:   "HSrts" FFI_LIB
+@@ -74,6 +74,7 @@ include-dirs:           TOP"/rts/include"
+                         TOP"/rts/dist-install/build/include"
+                         FFI_INCLUDE_DIR
+                         LIBDW_INCLUDE_DIR
++                        LIBNUMA_INCLUDE_DIR
+ #endif
+ 
+ includes:               Rts.h
+-- 
+2.49.0
+

From e94e63f060fe0790a465c9afb2ad3c57629bf626 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 17 Jul 2025 22:19:30 +0200
Subject: [PATCH 0133/3724] tests.srcOnly: use equivalent input attrs instead
 of drvAttrs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The ability to use srcOnly on derivations and as a builder can be
formulated like this: Given a derivation `drv` with the expression:

    stdenv.mkDerivation {
      name = "drv";
      …
    }

We can transform it to

    srcOnly {
      stdenv = stdenv;
      name = "drv";
      …
    }

and expect to get the same result as `srcOnly drv`.

This commit changes tests.srcOnly to test this assumption. The
arguments effectively passed to mkDerivation are computed using
getEquivAttrs which then also records the used stdenv for the benefit
of srcOnly.

This is better than using drvAttrs like before because there is actually
no guarantee that drvAttrs is the same as what was passed to
stdenv.mkDerivation. mkDerivation may transform arguments before passing
them on to builtins.derivation. For example, it performs extra
checks on `env` as well as consistency checks with the top level
argument. This can even lead to issues with srcOnly:
https://github.com/NixOS/nixpkgs/issues/269539

Furthermore, the drvAttrs check really only checks something that is
practically statically guaranteed by srcOnly internals before this
commit (assuming that drvAttrs doesn't contain an attribute also named
drvAttrs):

    args = attrs.drvAttrs or attrs;
---
 pkgs/build-support/src-only/tests.nix | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/src-only/tests.nix b/pkgs/build-support/src-only/tests.nix
index f739715e717d..b501bc5a37da 100644
--- a/pkgs/build-support/src-only/tests.nix
+++ b/pkgs/build-support/src-only/tests.nix
@@ -10,14 +10,31 @@
 }:
 
 let
+  # Extract (effective) arguments passed to stdenv.mkDerivation and compute the
+  # arguments we would need to pass to srcOnly manually in order to get the same
+  # as `srcOnly drv`, i.e. the arguments passed to stdenv.mkDerivation plus the
+  # used stdenv itself.
+  getEquivAttrs =
+    drv:
+    let
+      drv' = drv.overrideAttrs (
+        _finalAttrs: prevAttrs: {
+          passthru = prevAttrs.passthru // {
+            passedAttrs = prevAttrs;
+          };
+        }
+      );
+    in
+    drv'.passedAttrs // { inherit (drv') stdenv; };
+
   emptySrc = srcOnly emptyDirectory;
   zlibSrc = srcOnly zlib;
 
   # It can be invoked in a number of ways. Let's make sure they're equivalent.
-  zlibSrcDrvAttrs = srcOnly zlib.drvAttrs;
+  zlibSrcEquiv = srcOnly (getEquivAttrs zlib);
   # zlibSrcFreeform = # ???;
   helloSrc = srcOnly hello;
-  helloSrcDrvAttrs = srcOnly hello.drvAttrs;
+  helloSrcEquiv = srcOnly (getEquivAttrs hello);
 
   # The srcOnly <drv> invocation leaks a lot of attrs into the srcOnly derivation,
   # so for comparing with the freeform invocation, we need to make a selection.
@@ -59,12 +76,12 @@ in
 runCommand "srcOnly-tests"
   {
     moreTests = [
-      (testers.testEqualDerivation "zlibSrcDrvAttrs == zlibSrc" zlibSrcDrvAttrs zlibSrc)
+      (testers.testEqualDerivation "zlibSrcEquiv == zlibSrc" zlibSrcEquiv zlibSrc)
       # (testers.testEqualDerivation
       #   "zlibSrcFreeform == zlibSrc"
       #   zlibSrcFreeform
       #   zlibSrc)
-      (testers.testEqualDerivation "helloSrcDrvAttrs == helloSrc" helloSrcDrvAttrs helloSrc)
+      (testers.testEqualDerivation "helloSrcEquiv == helloSrc" helloSrcEquiv helloSrc)
       (testers.testEqualDerivation "helloDrvSimpleSrcFreeform == helloDrvSimpleSrc"
         helloDrvSimpleSrcFreeform
         helloDrvSimpleSrc

From 436339fa2e85e764f0b8ca9daf587f017f03e0a2 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Wed, 16 Jul 2025 23:40:11 +0200
Subject: [PATCH 0134/3724] srcOnly: float mkDerivation args that need to be
 overridden into let

This is a refactor (to benefit later changes) that shouldn't cause any
rebuilds under any circumstances.
---
 pkgs/build-support/src-only/default.nix | 40 ++++++++++++-------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix
index d43bada43794..b077d88b0328 100644
--- a/pkgs/build-support/src-only/default.nix
+++ b/pkgs/build-support/src-only/default.nix
@@ -38,27 +38,25 @@
 attrs:
 let
   args = attrs.drvAttrs or attrs;
-  name = args.name or "${args.pname}-${args.version}";
+  argsToOverride = {
+    name = "${args.name or "${args.pname}-${args.version}"}-source";
+
+    outputs = [ "out" ];
+
+    phases = [
+      "unpackPhase"
+      "patchPhase"
+      "installPhase"
+    ];
+    separateDebugInfo = false;
+
+    dontUnpack = false;
+
+    dontInstall = false;
+    installPhase = "cp -pr --reflink=auto -- . $out";
+  };
+
   stdenv = args.stdenv or (lib.warn "srcOnly: stdenv not provided, using stdenvNoCC" stdenvNoCC);
-  drv = stdenv.mkDerivation (
-    args
-    // {
-      name = "${name}-source";
-
-      outputs = [ "out" ];
-
-      phases = [
-        "unpackPhase"
-        "patchPhase"
-        "installPhase"
-      ];
-      separateDebugInfo = false;
-
-      dontUnpack = false;
-
-      dontInstall = false;
-      installPhase = "cp -pr --reflink=auto -- . $out";
-    }
-  );
+  drv = stdenv.mkDerivation (args // argsToOverride);
 in
 lib.warnIf (args.dontUnpack or false) "srcOnly: derivation has dontUnpack set, overriding" drv

From 8dfbfd4d8c9895c97e4c5af89d7478db4ee98d74 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Wed, 16 Jul 2025 23:42:29 +0200
Subject: [PATCH 0135/3724] srcOnly: move dontUnpack warning into dontUnpack
 binding

This is a refactor to benefit later changes that shouldn't cause any
rebuilds. Unfortunately, the new code doesn't look great with nixfmt.
---
 pkgs/build-support/src-only/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix
index b077d88b0328..c0058b2e9ea4 100644
--- a/pkgs/build-support/src-only/default.nix
+++ b/pkgs/build-support/src-only/default.nix
@@ -50,7 +50,8 @@ let
     ];
     separateDebugInfo = false;
 
-    dontUnpack = false;
+    dontUnpack = lib.warnIf (args.dontUnpack or false
+    ) "srcOnly: derivation has dontUnpack set, overriding" false;
 
     dontInstall = false;
     installPhase = "cp -pr --reflink=auto -- . $out";
@@ -59,4 +60,4 @@ let
   stdenv = args.stdenv or (lib.warn "srcOnly: stdenv not provided, using stdenvNoCC" stdenvNoCC);
   drv = stdenv.mkDerivation (args // argsToOverride);
 in
-lib.warnIf (args.dontUnpack or false) "srcOnly: derivation has dontUnpack set, overriding" drv
+drv

From f89a54c9ebc1ae8b9901080fd421b9e3ed050920 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Wed, 16 Jul 2025 23:45:13 +0200
Subject: [PATCH 0136/3724] srcOnly: differentiate between computed and user
 passed drvAttrs

Currently srcOnly assumes that it can pass drv.drvAttrs to
drv.stdenv.mkDerivation and obtain basically the same resulting
derivation, i.e. that drvAttrs and the arguments passed to
stdenv.mkDerivation are equivalent.

It is obvious, that stdenv.mkDerivation may at any point violate this
assumption. Currently, there are two (known) problems stemming from this
assumption affecting srcOnly:

- If __structuredAttrs = true, drvAttrs will contain the env attribute
  set as passed to stdenv.mkDerivation as well as its members at the
  top level like they need to be passed to builtins.derivation.

  If such an attribute set is passed to stdenv.mkDerivation again,
  it triggers its consistency check implemented in #332750.

  This affects e.g. pkgs.git since 318b8c61bdacb3e5c190c5ab3a7ac.

- The use of stdenv adapters that modify the env attribute set
  (like withCFlags) causes another issue. In such cases, the
  effect of the adapter, e.g. setting env.NIX_CFLAGS_COMPILE
  can be observed as drvAttrs.NIX_CFLAGS_COMPILE. Without
  __structuredAttrs, drvAttrs.env.NIX_CFLAGS_COMPILE would
  not be set.

  However, because srcOnly dutifully uses the same stdenv as the
  original derivation, the stdenv adapter will be applied to the
  derivation constructed by srcOnly as well. Because it can't tell that
  NIX_CFLAGS_COMPILE was set by the adapter, it'll pass it to
  stdenv.mkDerivation. Unaware of this, the stdenv adapter is applied
  again and sets env.NIX_CFLAGS_COMPILE, triggering the same consistency
  check as above.

tests.srcOnly now also checks that both these issues have been fixed in
srcOnly.

The solution to this is to change the derivation instead of
reconstructing it. Since srcOnly assumes that the input derivation is
based on stdenv.mkDerivation anyways, we are entitled to take advantage
of overrideAttrs. This enables us to see the (effective) arguments
passed to stdenv.mkDerivation via prevAttrs -- before any duplication
between env and the top level happens. We are also guaranteed that the
stdenv adapters are applied only once.

Resolves #269539.

Note that this commit passes the tests.srcOnly test suite both before
and after the change to getEquivAttrs, i.e. that test suite change may
be rebased out or applied after this commit.
---
 pkgs/build-support/src-only/default.nix | 30 ++++++++++---
 pkgs/build-support/src-only/tests.nix   | 58 ++++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix
index c0058b2e9ea4..f8c3068d6c73 100644
--- a/pkgs/build-support/src-only/default.nix
+++ b/pkgs/build-support/src-only/default.nix
@@ -37,8 +37,7 @@
 
 attrs:
 let
-  args = attrs.drvAttrs or attrs;
-  argsToOverride = {
+  argsToOverride = args: {
     name = "${args.name or "${args.pname}-${args.version}"}-source";
 
     outputs = [ "out" ];
@@ -56,8 +55,27 @@ let
     dontInstall = false;
     installPhase = "cp -pr --reflink=auto -- . $out";
   };
-
-  stdenv = args.stdenv or (lib.warn "srcOnly: stdenv not provided, using stdenvNoCC" stdenvNoCC);
-  drv = stdenv.mkDerivation (args // argsToOverride);
 in
-drv
+
+# If we are passed a derivation (based on stdenv*), we can use overrideAttrs to
+# update the arguments to mkDerivation. This gives us the proper awareness of
+# what arguments were effectively passed *to* mkDerivation as opposed to
+# builtins.derivation (by mkDerivation). For example, stdenv.mkDerivation
+# accepts an `env` attribute set which is postprocessed before being passed to
+# builtins.derivation. This can lead to evaluation failures, if we assume
+# that drvAttrs is equivalent to the arguments passed to mkDerivation.
+# See https://github.com/NixOS/nixpkgs/issues/269539.
+if lib.isDerivation attrs && attrs ? overrideAttrs then
+  attrs.overrideAttrs (_finalAttrs: prevAttrs: argsToOverride prevAttrs)
+else
+  let
+    # TODO(@sternenseemann): remove drvAttrs special casing
+    # If we don't have overrideAttrs, it is extremely unlikely that we are seeing
+    # a derivation constructed by stdenv.mkDerivation. Since srcOnly assumes
+    # that we are using stdenv's setup.sh, it therefore doesn't make sense to
+    # have derivation specific logic in this branch.
+    args = attrs.drvAttrs or attrs;
+    stdenv = args.stdenv or (lib.warn "srcOnly: stdenv not provided, using stdenvNoCC" stdenvNoCC);
+    drv = stdenv.mkDerivation (args // argsToOverride args);
+  in
+  drv
diff --git a/pkgs/build-support/src-only/tests.nix b/pkgs/build-support/src-only/tests.nix
index b501bc5a37da..ff76d420fb3d 100644
--- a/pkgs/build-support/src-only/tests.nix
+++ b/pkgs/build-support/src-only/tests.nix
@@ -5,6 +5,8 @@
   hello,
   emptyDirectory,
   zlib,
+  git,
+  withCFlags,
   stdenv,
   testers,
 }:
@@ -19,7 +21,7 @@ let
     let
       drv' = drv.overrideAttrs (
         _finalAttrs: prevAttrs: {
-          passthru = prevAttrs.passthru // {
+          passthru = prevAttrs.passthru or { } // {
             passedAttrs = prevAttrs;
           };
         }
@@ -27,6 +29,8 @@ let
     in
     drv'.passedAttrs // { inherit (drv') stdenv; };
 
+  canEvalDrv = drv: (builtins.tryEval drv.drvPath).success;
+
   emptySrc = srcOnly emptyDirectory;
   zlibSrc = srcOnly zlib;
 
@@ -36,6 +40,9 @@ let
   helloSrc = srcOnly hello;
   helloSrcEquiv = srcOnly (getEquivAttrs hello);
 
+  gitSrc = srcOnly git;
+  gitSrcEquiv = srcOnly (getEquivAttrs git);
+
   # The srcOnly <drv> invocation leaks a lot of attrs into the srcOnly derivation,
   # so for comparing with the freeform invocation, we need to make a selection.
   # Otherwise, we'll be comparing against whatever attribute the fancy hello drv
@@ -71,6 +78,45 @@ let
     }
   );
 
+  # Test the issue reported in https://github.com/NixOS/nixpkgs/issues/269539
+  stdenvAdapterDrv =
+    let
+      drv = (withCFlags [ "-Werror" "-Wall" ] stdenv).mkDerivation {
+        name = "drv-using-stdenv-adapter";
+      };
+    in
+    # Confirm the issue we are trying to avoid exists
+    assert !(canEvalDrv (srcOnly drv.drvAttrs));
+    drv;
+  stdenvAdapterDrvSrc = srcOnly stdenvAdapterDrv;
+  stdenvAdapterDrvSrcEquiv = srcOnly (
+    getEquivAttrs stdenvAdapterDrv
+    // {
+      # The upside of using overrideAttrs is that any stdenv adapter related
+      # modifications are only applied once. Using the adapter here again would
+      # mean applying it twice in total (since withCFlags functions more or less
+      # like an automatic overrideAttrs).
+      inherit stdenv;
+    }
+  );
+
+  # Issue similar to https://github.com/NixOS/nixpkgs/issues/269539
+  structuredAttrsDrv =
+    let
+      drv = stdenv.mkDerivation {
+        name = "drv-using-structured-attrs";
+        src = emptyDirectory;
+
+        env.NIX_DEBUG = true;
+        __structuredAttrs = true;
+      };
+    in
+    # Confirm the issue we are trying to avoid exists
+    assert !(canEvalDrv (srcOnly drv.drvAttrs));
+    drv;
+  structuredAttrsDrvSrc = srcOnly structuredAttrsDrv;
+  structuredAttrsDrvSrcEquiv = srcOnly (getEquivAttrs structuredAttrsDrv);
+
 in
 
 runCommand "srcOnly-tests"
@@ -82,10 +128,20 @@ runCommand "srcOnly-tests"
       #   zlibSrcFreeform
       #   zlibSrc)
       (testers.testEqualDerivation "helloSrcEquiv == helloSrc" helloSrcEquiv helloSrc)
+      (testers.testEqualDerivation "helloSrcEquiv == helloSrc" helloSrcEquiv helloSrc)
+      (testers.testEqualDerivation "gitSrcEquiv == gitSrc" gitSrcEquiv gitSrc)
       (testers.testEqualDerivation "helloDrvSimpleSrcFreeform == helloDrvSimpleSrc"
         helloDrvSimpleSrcFreeform
         helloDrvSimpleSrc
       )
+      (testers.testEqualDerivation "stdenvAdapterDrvSrcEquiv == stdenvAdapterDrvSrc"
+        stdenvAdapterDrvSrcEquiv
+        stdenvAdapterDrvSrc
+      )
+      (testers.testEqualDerivation "structuredAttrsDrvSrcEquiv == structuredAttrsDrvSrc"
+        structuredAttrsDrvSrcEquiv
+        structuredAttrsDrvSrc
+      )
     ];
   }
   ''

From fe592efe24e32cd5a8077e2cae810ba8b497b0c4 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 17 Jul 2025 23:04:51 +0200
Subject: [PATCH 0137/3724] tests.srcOnly: __impureHostDeps issue is fixed
 using .overrideAttrs

---
 pkgs/build-support/src-only/tests.nix | 30 +++++++++------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/pkgs/build-support/src-only/tests.nix b/pkgs/build-support/src-only/tests.nix
index ff76d420fb3d..bd6fa6f6ca5a 100644
--- a/pkgs/build-support/src-only/tests.nix
+++ b/pkgs/build-support/src-only/tests.nix
@@ -57,26 +57,16 @@ let
       ;
   };
   helloDrvSimpleSrc = srcOnly helloDrvSimple;
-  helloDrvSimpleSrcFreeform = srcOnly (
-    {
-      inherit (helloDrvSimple)
-        name
-        pname
-        version
-        src
-        patches
-        stdenv
-        ;
-    }
-    # __impureHostDeps get duplicated in helloDrvSimpleSrc (on darwin)
-    # This is harmless, but fails the test for what is arguably an
-    # unrelated non-problem, so we just work around it here.
-    # The inclusion of __impureHostDeps really shouldn't be required,
-    # and should be removed from this test.
-    // lib.optionalAttrs (helloDrvSimple ? __impureHostDeps) {
-      inherit (helloDrvSimple) __impureHostDeps;
-    }
-  );
+  helloDrvSimpleSrcFreeform = srcOnly ({
+    inherit (helloDrvSimple)
+      name
+      pname
+      version
+      src
+      patches
+      stdenv
+      ;
+  });
 
   # Test the issue reported in https://github.com/NixOS/nixpkgs/issues/269539
   stdenvAdapterDrv =

From 250924fd7dc84e9fd5d66675bcf1e1a1ca5abeb0 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 14 Jul 2025 22:55:56 +0200
Subject: [PATCH 0138/3724] maintainers/update-hackage.sh: don't print diff if
 no changes

Bug introduced in 1158f20f1563e8a8e5524d6f910d311956b006a3.
---
 maintainers/scripts/haskell/update-hackage.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/scripts/haskell/update-hackage.sh b/maintainers/scripts/haskell/update-hackage.sh
index afc9eb25aae7..5aad07c1b331 100755
--- a/maintainers/scripts/haskell/update-hackage.sh
+++ b/maintainers/scripts/haskell/update-hackage.sh
@@ -45,6 +45,7 @@ if [ "$current_commit" != "$head_commit" ]; then
      > $pin_file
 else
    echo "No new all-cabal-hashes version" >&2
+   exit 0
 fi
 
 version_diff="$old_date -> $new_date"

From 0545642ebb66294593da3048abe7f23a20129cff Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 14 Jul 2025 22:58:35 +0200
Subject: [PATCH 0139/3724] maintainers/update-{st,h}ackage.sh: drop support
 for --do-commit

---
 maintainers/scripts/haskell/update-hackage.sh  | 18 ++++++------------
 maintainers/scripts/haskell/update-stackage.sh | 18 ++++++------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/maintainers/scripts/haskell/update-hackage.sh b/maintainers/scripts/haskell/update-hackage.sh
index 5aad07c1b331..e6cf7fa2bea7 100755
--- a/maintainers/scripts/haskell/update-hackage.sh
+++ b/maintainers/scripts/haskell/update-hackage.sh
@@ -24,6 +24,11 @@
 
 set -euo pipefail
 
+if [[ "${1:-}" == "--do-commit" ]]; then
+  echo "$0: --do-commit is no longer supported. Use update-package-set.sh instead."
+  exit 100
+fi
+
 pin_file=pkgs/data/misc/hackage/pin.json
 current_commit="$(jq -r .commit $pin_file)"
 old_date="$(jq -r .msg $pin_file | sed 's/Update from Hackage at //')"
@@ -48,15 +53,4 @@ else
    exit 0
 fi
 
-version_diff="$old_date -> $new_date"
-
-if [[ "${1:-}" == "--do-commit" ]]; then
-git add pkgs/data/misc/hackage/pin.json
-git commit -F - << EOF
-all-cabal-hashes: $version_diff
-
-(generated by maintainers/scripts/haskell/update-hackage.sh)
-EOF
-else
-echo "$version_diff"
-fi
+echo "$old_date -> $new_date"
diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index 81b11363da91..5a91d3dc9cbc 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -26,6 +26,11 @@
 
 set -eu -o pipefail
 
+if [[ "${1:-}" == "--do-commit" ]]; then
+  echo "$0: --do-commit is no longer supported. Use update-package-set.sh instead."
+  exit 100
+fi
+
 # Stackage solver to use, LTS or Nightly
 # (should be capitalized like the display name)
 SOLVER=LTS
@@ -100,15 +105,4 @@ sed -r \
 # ShellCheck: latest version of command-line dev tool.
 # Agda: The Agda community is fast-moving; we strive to always include the newest versions of Agda and the Agda packages in nixpkgs.
 
-version_diff="$old_version -> $version"
-
-if [[ "${1:-}" == "--do-commit" ]]; then
-git add $stackage_config
-git commit -F - << EOF
-haskellPackages: stackage $version_diff
-
-(generated by maintainers/scripts/haskell/update-stackage.sh)
-EOF
-else
-echo "$version_diff"
-fi
+echo "$old_version -> $version"

From 32d8dd2326dd345178b537434ac55e7847047766 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Fri, 18 Jul 2025 01:46:56 +0200
Subject: [PATCH 0140/3724] Revert "git-annex: apply workaround for test
 failure with git 2.50"

This reverts commit 75542a9b8781b58538ec3755fdc3816c67c7a166.

Reason for revert: haskell-updates already contains the git-annex
release that contains this fix.
---
 .../haskell-modules/configuration-common.nix         | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9a6bddc1130d..605e705745d0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -566,18 +566,6 @@ with haskellLib;
           # TODO(@sternenseemann): submit upstreamable patch resolving this
           # (this should be possible by also taking PREFIX into account).
           ./patches/git-annex-no-usr-prefix.patch
-
-          # Pick fix for git 2.50 related test suite failures from 10.20250630
-          # https://git-annex.branchable.com/bugs/test_suite_fail_with_git_2.50/
-          (pkgs.fetchpatch {
-            name = "git-annex-workaround-for-git-2.50.patch";
-            url = "https://git.joeyh.name/index.cgi/git-annex.git/patch/?id=fb155b1e3e59cc1f9cf8a4fe7d47cba49d1c81af";
-            sha256 = "sha256-w6eXW0JqshXTd0/tNPZ0fOW2SVmA90G5eFhsd9y05BI=";
-            excludes = [
-              "doc/**"
-              "CHANGELOG"
-            ];
-          })
         ];
 
         postPatch = ''

From 411cdc160cc83839a69aaa387ea09a09fd5ffd2c Mon Sep 17 00:00:00 2001
From: Eric Ripa <eric@ripa.io>
Date: Thu, 17 Jul 2025 18:48:23 -0700
Subject: [PATCH 0141/3724] maintainers: add eripa

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 04a1e3c0b6d3..4f7b1393fb1f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7719,6 +7719,13 @@
     github = "ErinvanderVeen";
     githubId = 10973664;
   };
+  eripa = {
+    name = "Eric Ripa";
+    email = "eric@ripa.io";
+    keys = [ { fingerprint = "L2IODNAzlzi0tkpCy4LHixqMUhkEas9D3+mo4a+PQZg"; } ];
+    github = "eripa";
+    githubId = 1429673;
+  };
   ern775 = {
     email = "eren.demir2479090@gmail.com";
     github = "ern775";

From b6c607e4b143040a65c2ab9fa435149eb0e5d13b Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 18 Jul 2025 06:35:27 +0100
Subject: [PATCH 0142/3724] automake: 1.16 -> 1.18.1

---
 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 b8df040634ca..050863748e6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6859,7 +6859,7 @@ with pkgs;
   autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { };
   autoconf271 = callPackage ../development/tools/misc/autoconf/2.71.nix { };
 
-  automake = automake116x;
+  automake = automake118x;
 
   automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
 

From 23f824ccf6bfb7090f7bd8ead00d041612a709fa Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Fri, 18 Jul 2025 20:03:09 +0200
Subject: [PATCH 0143/3724] alsa-ucm-conf: add mvs as maintainer

---
 pkgs/by-name/al/alsa-ucm-conf/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix
index 32d683877c74..d11c9b878e7e 100644
--- a/pkgs/by-name/al/alsa-ucm-conf/package.nix
+++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix
@@ -52,7 +52,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     '';
 
     license = lib.licenses.bsd3;
-    maintainers = [ lib.maintainers.roastiek ];
+    maintainers = with lib.maintainers; [
+      roastiek
+      mvs
+    ];
+
     platforms = lib.platforms.linux ++ lib.platforms.freebsd;
   };
 })

From 9d00c816c092b3c32206d375c9ff5fbe7e7c3d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= <kpg@posteo.net>
Date: Fri, 18 Jul 2025 20:47:03 +0200
Subject: [PATCH 0144/3724] sbcl.pkgs.april: fix build after bump

Added the 'cape' system to the build, which is required by april, but was missing.
---
 pkgs/development/lisp-modules/packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index ea47ea457262..06730aed4604 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -101,6 +101,10 @@ let
         ];
       });
 
+      april = super.april.overrideLispAttrs (o: {
+        systems = o.systems ++ [ "cape" ];
+      });
+
       cl-notify = build-asdf-system {
         pname = "cl-notify";
         version = "20080904-138ca7038";

From 037387d4ba374f2c03cf26590ff143ba459e7cfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Wed, 2 Jul 2025 10:30:49 +0200
Subject: [PATCH 0145/3724] libxml2: get rid of generic arguments

---
 pkgs/development/libraries/libxml2/default.nix | 11 +++++++++--
 pkgs/top-level/all-packages.nix                |  8 +-------
 pkgs/top-level/python-packages.nix             |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 1a411f3b2130..6b366fbd4e11 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,11 +1,12 @@
 {
   stdenv,
+  darwin,
   lib,
   fetchFromGitLab,
   pkg-config,
   autoreconfHook,
   libintl,
-  python,
+  python3,
   gettext,
   ncurses,
   findXMLCatalogs,
@@ -31,7 +32,13 @@
   enableHttp ? false,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+let
+  python = python3;
+  # libxml2 is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv
+  # that does not propagate xcrun.
+  stdenv' = if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
+in
+stdenv'.mkDerivation (finalAttrs: {
   pname = "libxml2";
   version = "2.14.5";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b33f85874c21..d997a1b6824e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8835,13 +8835,7 @@ with pkgs;
   libxcrypt-legacy = libxcrypt.override { enableHashes = "all"; };
 
   libxkbcommon = libxkbcommon_8;
-  libxml2 = callPackage ../development/libraries/libxml2 {
-    python = python3;
-    stdenv =
-      # libxml2 is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv
-      # that does not propagate xcrun.
-      if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
-  };
+  libxml2 = callPackage ../development/libraries/libxml2 { };
 
   libxml2Python =
     let
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d231cd21957d..9a82087429b6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8234,7 +8234,7 @@ self: super: with self; {
     (toPythonModule (
       pkgs.libxml2.override {
         pythonSupport = true;
-        inherit python;
+        python3 = python;
       }
     )).py;
 

From 8dc10e9c4fa72e74b8c2d0af5aa8c54ccd921dec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 3 Jul 2025 00:59:00 +0200
Subject: [PATCH 0146/3724] libxml2: remove `with lib;`

---
 pkgs/development/libraries/libxml2/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 6b366fbd4e11..431e08fa101b 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -165,12 +165,14 @@ stdenv'.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/libxml2";
     description = "XML parsing library for C";
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ jtojnar ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
+      jtojnar
+    ];
     pkgConfigModules = [ "libxml-2.0" ];
   };
 })

From 2fc398994878e1de9e4fb02e0a19011503f3876d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 13 Jul 2025 21:14:10 +0200
Subject: [PATCH 0147/3724] libxml2: remove python2 support, don't check for
 python3

---
 .../development/libraries/libxml2/default.nix | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 431e08fa101b..f222324778c0 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -5,9 +5,7 @@
   fetchFromGitLab,
   pkg-config,
   autoreconfHook,
-  libintl,
   python3,
-  gettext,
   ncurses,
   findXMLCatalogs,
   libiconv,
@@ -33,7 +31,6 @@
 }:
 
 let
-  python = python3;
   # libxml2 is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv
   # that does not propagate xcrun.
   stdenv' = if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
@@ -79,16 +76,8 @@ stdenv'.mkDerivation (finalAttrs: {
 
   buildInputs =
     lib.optionals pythonSupport [
-      python
-    ]
-    ++ lib.optionals (pythonSupport && python ? isPy2 && python.isPy2) [
-      gettext
-    ]
-    ++ lib.optionals (pythonSupport && python ? isPy3 && python.isPy3) [
       ncurses
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport && python ? isPy2 && python.isPy2) [
-      libintl
+      python3
     ]
     ++ lib.optionals zlibSupport [
       zlib
@@ -112,15 +101,15 @@ stdenv'.mkDerivation (finalAttrs: {
       (lib.enableFeature enableShared "shared")
       (lib.withFeature icuSupport "icu")
       (lib.withFeature pythonSupport "python")
-      (lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}")
+      (lib.optionalString pythonSupport "PYTHON=${python3.pythonOnBuildForHost.interpreter}")
     ]
     # avoid rebuilds, can be merged into list in version bumps
     ++ lib.optional enableHttp "--with-http"
     ++ lib.optional zlibSupport "--with-zlib";
 
   installFlags = lib.optionals pythonSupport [
-    "pythondir=\"${placeholder "py"}/${python.sitePackages}\""
-    "pyexecdir=\"${placeholder "py"}/${python.sitePackages}\""
+    "pythondir=\"${placeholder "py"}/${python3.sitePackages}\""
+    "pyexecdir=\"${placeholder "py"}/${python3.sitePackages}\""
   ];
 
   enableParallelBuilding = true;
@@ -135,7 +124,7 @@ stdenv'.mkDerivation (finalAttrs: {
   '';
 
   preInstall = lib.optionalString pythonSupport ''
-    substituteInPlace python/libxml2mod.la --replace-fail "$dev/${python.sitePackages}" "$py/${python.sitePackages}"
+    substituteInPlace python/libxml2mod.la --replace-fail "$dev/${python3.sitePackages}" "$py/${python3.sitePackages}"
   '';
 
   postFixup =

From e67ade88a3b65e00b61e9cabd7f29cf69c1f8f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 3 Jul 2025 00:43:32 +0200
Subject: [PATCH 0148/3724] libxml2: rename default.nix to common.nix

---
 pkgs/development/libraries/libxml2/{default.nix => common.nix} | 0
 pkgs/top-level/all-packages.nix                                | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/libraries/libxml2/{default.nix => common.nix} (100%)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/common.nix
similarity index 100%
rename from pkgs/development/libraries/libxml2/default.nix
rename to pkgs/development/libraries/libxml2/common.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d997a1b6824e..ae6fa6207985 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8835,7 +8835,7 @@ with pkgs;
   libxcrypt-legacy = libxcrypt.override { enableHashes = "all"; };
 
   libxkbcommon = libxkbcommon_8;
-  libxml2 = callPackage ../development/libraries/libxml2 { };
+  libxml2 = callPackage ../development/libraries/libxml2/common.nix { };
 
   libxml2Python =
     let

From febeabf314cce1f99612825fe14858a4bc682cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 19 Jul 2025 00:30:51 +0200
Subject: [PATCH 0149/3724] libxml2: prepare for multiple versions

---
 pkgs/development/libraries/libxml2/common.nix | 24 +++++++----------
 .../development/libraries/libxml2/default.nix | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +++-
 3 files changed, 40 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/libraries/libxml2/default.nix

diff --git a/pkgs/development/libraries/libxml2/common.nix b/pkgs/development/libraries/libxml2/common.nix
index f222324778c0..bc10a31bcf6d 100644
--- a/pkgs/development/libraries/libxml2/common.nix
+++ b/pkgs/development/libraries/libxml2/common.nix
@@ -2,7 +2,6 @@
   stdenv,
   darwin,
   lib,
-  fetchFromGitLab,
   pkg-config,
   autoreconfHook,
   python3,
@@ -28,6 +27,10 @@
   gnome,
   testers,
   enableHttp ? false,
+
+  version,
+  src,
+  extraMeta ? { },
 }:
 
 let
@@ -36,8 +39,12 @@ let
   stdenv' = if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
 in
 stdenv'.mkDerivation (finalAttrs: {
+  inherit
+    version
+    src
+    ;
+
   pname = "libxml2";
-  version = "2.14.5";
 
   outputs =
     [
@@ -50,14 +57,6 @@ stdenv'.mkDerivation (finalAttrs: {
     ++ lib.optional (enableStatic && enableShared) "static";
   outputMan = "bin";
 
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = "libxml2";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-vxKlw8Kz+fgUP6bhWG2+4346WJVzqG0QvPG/BT7RftQ=";
-  };
-
   patches = [
     # Unmerged ABI-breaking patch required to fix the following security issues:
     # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/139
@@ -159,9 +158,6 @@ stdenv'.mkDerivation (finalAttrs: {
     description = "XML parsing library for C";
     license = lib.licenses.mit;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [
-      jtojnar
-    ];
     pkgConfigModules = [ "libxml-2.0" ];
-  };
+  } // extraMeta;
 })
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
new file mode 100644
index 000000000000..9678d1124b02
--- /dev/null
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -0,0 +1,26 @@
+{
+  lib,
+  callPackage,
+  fetchFromGitLab,
+}:
+
+let
+  packages = {
+    libxml2 = callPackage ./common.nix {
+      version = "2.14.5";
+      src = fetchFromGitLab {
+        domain = "gitlab.gnome.org";
+        owner = "GNOME";
+        repo = "libxml2";
+        tag = "v${packages.libxml2.version}";
+        hash = "sha256-vxKlw8Kz+fgUP6bhWG2+4346WJVzqG0QvPG/BT7RftQ=";
+      };
+      extraMeta = {
+        maintainers = with lib.maintainers; [
+          jtojnar
+        ];
+      };
+    };
+  };
+in
+packages
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae6fa6207985..d191c2df337f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8835,7 +8835,10 @@ with pkgs;
   libxcrypt-legacy = libxcrypt.override { enableHashes = "all"; };
 
   libxkbcommon = libxkbcommon_8;
-  libxml2 = callPackage ../development/libraries/libxml2/common.nix { };
+
+  inherit (callPackage ../development/libraries/libxml2 { })
+    libxml2
+    ;
 
   libxml2Python =
     let

From 4c5c6be10f4c5ecfb52e6b1d27b6c2f1f273f86f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 3 Jul 2025 01:28:36 +0200
Subject: [PATCH 0150/3724] libxml2_13: init

---
 pkgs/development/libraries/libxml2/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  1 +
 2 files changed, 19 insertions(+)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 9678d1124b02..71b433584a35 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -6,6 +6,24 @@
 
 let
   packages = {
+    libxml2_13 = callPackage ./common.nix {
+      version = "2.13.8";
+      src = fetchFromGitLab {
+        domain = "gitlab.gnome.org";
+        owner = "GNOME";
+        repo = "libxml2";
+        tag = "v${packages.libxml2_13.version}";
+        hash = "sha256-acemyYs1yRSTSLH7YCGxnQzrEDm8YPTK4HtisC36LsY=";
+      };
+      extraMeta = {
+        knownVulnerabilities = [
+          "CVE-2025-6021"
+        ];
+        maintainers = with lib.maintainers; [
+          gepbird
+        ];
+      };
+    };
     libxml2 = callPackage ./common.nix {
       version = "2.14.5";
       src = fetchFromGitLab {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d191c2df337f..422c103ad83f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8837,6 +8837,7 @@ with pkgs;
   libxkbcommon = libxkbcommon_8;
 
   inherit (callPackage ../development/libraries/libxml2 { })
+    libxml2_13
     libxml2
     ;
 

From dbdc8ca8f473fde09b3b908ce000a4b055aca228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 3 Jul 2025 01:32:30 +0200
Subject: [PATCH 0151/3724] libxml2_13: freeze update script

---
 pkgs/development/libraries/libxml2/common.nix  | 2 ++
 pkgs/development/libraries/libxml2/default.nix | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/libxml2/common.nix b/pkgs/development/libraries/libxml2/common.nix
index bc10a31bcf6d..3a2d6836fc11 100644
--- a/pkgs/development/libraries/libxml2/common.nix
+++ b/pkgs/development/libraries/libxml2/common.nix
@@ -31,6 +31,7 @@
   version,
   src,
   extraMeta ? { },
+  freezeUpdateScript ? false,
 }:
 
 let
@@ -141,6 +142,7 @@ stdenv'.mkDerivation (finalAttrs: {
     updateScript = gnome.updateScript {
       packageName = "libxml2";
       versionPolicy = "none";
+      freeze = freezeUpdateScript;
     };
     tests = {
       pkg-config = testers.hasPkgConfigModules {
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 71b433584a35..940f007b97da 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -15,6 +15,7 @@ let
         tag = "v${packages.libxml2_13.version}";
         hash = "sha256-acemyYs1yRSTSLH7YCGxnQzrEDm8YPTK4HtisC36LsY=";
       };
+      freezeUpdateScript = true;
       extraMeta = {
         knownVulnerabilities = [
           "CVE-2025-6021"

From 348be18ac4b40caa531048d977df7d54b4ea9d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Mon, 14 Jul 2025 10:31:12 +0200
Subject: [PATCH 0152/3724] libxml2_13: add patch for CVE-2025-6021

---
 .../libraries/libxml2/CVE-2025-6021.patch     | 40 +++++++++++++++++++
 pkgs/development/libraries/libxml2/common.nix |  3 +-
 .../development/libraries/libxml2/default.nix |  8 ++--
 3 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/libxml2/CVE-2025-6021.patch

diff --git a/pkgs/development/libraries/libxml2/CVE-2025-6021.patch b/pkgs/development/libraries/libxml2/CVE-2025-6021.patch
new file mode 100644
index 000000000000..7d20a17c7038
--- /dev/null
+++ b/pkgs/development/libraries/libxml2/CVE-2025-6021.patch
@@ -0,0 +1,40 @@
+diff --git a/tree.c b/tree.c
+index f097cf87..4d966ec9 100644
+--- a/tree.c
++++ b/tree.c
+@@ -47,6 +47,10 @@
+ #include "private/error.h"
+ #include "private/tree.h"
+ 
++#ifndef SIZE_MAX
++  #define SIZE_MAX ((size_t) -1)
++#endif
++
+ int __xmlRegisterCallbacks = 0;
+ 
+ /************************************************************************
+@@ -167,10 +168,10 @@ xmlGetParameterEntityFromDtd(const xmlDtd *dtd, const xmlChar *name) {
+ xmlChar *
+ xmlBuildQName(const xmlChar *ncname, const xmlChar *prefix,
+ 	      xmlChar *memory, int len) {
+-    int lenn, lenp;
++    size_t lenn, lenp;
+     xmlChar *ret;
+ 
+-    if (ncname == NULL) return(NULL);
++    if ((ncname == NULL) || (len < 0)) return(NULL);
+     if (prefix == NULL) return((xmlChar *) ncname);
+ 
+ #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+@@ -181,8 +182,10 @@ xmlBuildQName(const xmlChar *ncname, const xmlChar *prefix,
+ 
+     lenn = strlen((char *) ncname);
+     lenp = strlen((char *) prefix);
++    if (lenn >= SIZE_MAX - lenp - 1)
++        return(NULL);
+ 
+-    if ((memory == NULL) || (len < lenn + lenp + 2)) {
++    if ((memory == NULL) || ((size_t) len < lenn + lenp + 2)) {
+ 	ret = (xmlChar *) xmlMallocAtomic(lenn + lenp + 2);
+ 	if (ret == NULL)
+ 	    return(NULL);
diff --git a/pkgs/development/libraries/libxml2/common.nix b/pkgs/development/libraries/libxml2/common.nix
index 3a2d6836fc11..7ab55b3f10bb 100644
--- a/pkgs/development/libraries/libxml2/common.nix
+++ b/pkgs/development/libraries/libxml2/common.nix
@@ -29,6 +29,7 @@
   enableHttp ? false,
 
   version,
+  extraPatches ? [ ],
   src,
   extraMeta ? { },
   freezeUpdateScript ? false,
@@ -65,7 +66,7 @@ stdenv'.mkDerivation (finalAttrs: {
     # See also https://gitlab.gnome.org/GNOME/libxml2/-/issues/906
     # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxml/chromium/xml-attr-extra.patch
     ./xml-attr-extra.patch
-  ];
+  ] ++ extraPatches;
 
   strictDeps = true;
 
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 940f007b97da..8bc4ddcdd079 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -15,11 +15,13 @@ let
         tag = "v${packages.libxml2_13.version}";
         hash = "sha256-acemyYs1yRSTSLH7YCGxnQzrEDm8YPTK4HtisC36LsY=";
       };
+      extraPatches = [
+        # same as upstream patch but fixed conflict and added required import:
+        # https://gitlab.gnome.org/GNOME/libxml2/-/commit/acbbeef9f5dcdcc901c5f3fa14d583ef8cfd22f0.diff
+        ./CVE-2025-6021.patch
+      ];
       freezeUpdateScript = true;
       extraMeta = {
-        knownVulnerabilities = [
-          "CVE-2025-6021"
-        ];
         maintainers = with lib.maintainers; [
           gepbird
         ];

From 5b7873647225dbb427157933eb8e04485fb5144c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 17 Jul 2025 00:38:14 +0200
Subject: [PATCH 0153/3724] libxml2_13: add patch for CVE-2025-49794 and
 CVE-2025-49796

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

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 8bc4ddcdd079..762f3c554217 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -2,6 +2,7 @@
   lib,
   callPackage,
   fetchFromGitLab,
+  fetchpatch2,
 }:
 
 let
@@ -19,6 +20,11 @@ let
         # same as upstream patch but fixed conflict and added required import:
         # https://gitlab.gnome.org/GNOME/libxml2/-/commit/acbbeef9f5dcdcc901c5f3fa14d583ef8cfd22f0.diff
         ./CVE-2025-6021.patch
+        (fetchpatch2 {
+          name = "CVE-2025-49794-49796.patch";
+          url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/f7ebc65f05bffded58d1e1b2138eb124c2e44f21.patch";
+          hash = "sha256-k+IGq6pbv9EA7o+uDocEAUqIammEjLj27Z+2RF5EMrs=";
+        })
       ];
       freezeUpdateScript = true;
       extraMeta = {

From 5d3c18107abdac1354a12ec09a8e862c9c631553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 17 Jul 2025 00:40:46 +0200
Subject: [PATCH 0154/3724] libxml2_13: add patch for CVE-2025-49795

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

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 762f3c554217..17d4ea5e8222 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -25,6 +25,12 @@ let
           url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/f7ebc65f05bffded58d1e1b2138eb124c2e44f21.patch";
           hash = "sha256-k+IGq6pbv9EA7o+uDocEAUqIammEjLj27Z+2RF5EMrs=";
         })
+        (fetchpatch2 {
+          name = "CVE-2025-49795.patch";
+          url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/c24909ba2601848825b49a60f988222da3019667.patch";
+          hash = "sha256-r7PYKr5cDDNNMtM3ogNLsucPFTwP/uoC7McijyLl4kU=";
+          excludes = [ "runtest.c" ]; # tests were rewritten in C and are on schematron for 2.13.x, meaning this does not apply
+        })
       ];
       freezeUpdateScript = true;
       extraMeta = {

From 2da008e2ee4eda08380f6341db237ec6fef950ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 17 Jul 2025 09:47:20 +0200
Subject: [PATCH 0155/3724] libxml2_13: add patch for CVE-2025-6170

---
 .../libraries/libxml2/CVE-2025-6170.patch     | 112 ++++++++++++++++++
 .../development/libraries/libxml2/default.nix |   3 +
 2 files changed, 115 insertions(+)
 create mode 100644 pkgs/development/libraries/libxml2/CVE-2025-6170.patch

diff --git a/pkgs/development/libraries/libxml2/CVE-2025-6170.patch b/pkgs/development/libraries/libxml2/CVE-2025-6170.patch
new file mode 100644
index 000000000000..b66f24e305e0
--- /dev/null
+++ b/pkgs/development/libraries/libxml2/CVE-2025-6170.patch
@@ -0,0 +1,112 @@
+diff --git a/result/scripts/long_command b/result/scripts/long_command
+new file mode 100644
+index 000000000..e6f00708b
+--- /dev/null
++++ b/result/scripts/long_command
+@@ -0,0 +1,8 @@
++/ > b > b > Object is a Node Set :
++Set contains 1 nodes:
++1  ELEMENT a:c
++b > Unknown command This_is_a_really_long_command_string_designed_to_test_the_limits_of_the_memory_that_stores_the_comm
++b > b > Unknown command ess_currents_of_time_and_existence
++b > <?xml version="1.0"?>
++<a xmlns:a="bar"><b xmlns:a="foo">Navigating_the_labyrinthine_corridors_of_human_cognition_one_often_encounters_the_perplexing_paradox_that_the_more_we_delve_into_the_intricate_dance_of_neural_pathways_and_synaptic_firings_the_further_we_seem_to_stray_from_a_truly_holistic_understanding_of_consciousness_a_phenomenon_that_remains_as_elusive_as_a_moonbeam_caught_in_a_spiderweb_yet_undeniably_shapes_every_fleeting_thought_every_prof</b></a>
++b > 
+\ No newline at end of file
+diff --git a/debugXML.c b/debugXML.c
+index ed56b0f8..aeeea3c0 100644
+--- a/debugXML.c
++++ b/debugXML.c
+@@ -2780,6 +2780,10 @@ xmlShellPwd(xmlShellCtxtPtr ctxt ATTRIBUTE_UNUSED, char *buffer,
+     return (0);
+ }
+ 
++#define MAX_PROMPT_SIZE     500
++#define MAX_ARG_SIZE        400
++#define MAX_COMMAND_SIZE    100
++
+ /**
+  * xmlShell:
+  * @doc:  the initial document
+@@ -2795,10 +2795,10 @@ void
+ xmlShell(xmlDocPtr doc, const char *filename, xmlShellReadlineFunc input,
+          FILE * output)
+ {
+-    char prompt[500] = "/ > ";
++    char prompt[MAX_PROMPT_SIZE] = "/ > ";
+     char *cmdline = NULL, *cur;
+-    char command[100];
+-    char arg[400];
++    char command[MAX_COMMAND_SIZE];
++    char arg[MAX_ARG_SIZE];
+     int i;
+     xmlShellCtxtPtr ctxt;
+     xmlXPathObjectPtr list;
+@@ -2856,7 +2856,8 @@ xmlShell(xmlDocPtr doc, const char *filename, xmlShellReadlineFunc input,
+             cur++;
+         i = 0;
+         while ((*cur != ' ') && (*cur != '\t') &&
+-               (*cur != '\n') && (*cur != '\r')) {
++               (*cur != '\n') && (*cur != '\r') &&
++               (i < (MAX_COMMAND_SIZE - 1))) {
+             if (*cur == 0)
+                 break;
+             command[i++] = *cur++;
+@@ -2871,7 +2872,7 @@ xmlShell(xmlDocPtr doc, const char *filename, xmlShellReadlineFunc input,
+         while ((*cur == ' ') || (*cur == '\t'))
+             cur++;
+         i = 0;
+-        while ((*cur != '\n') && (*cur != '\r') && (*cur != 0)) {
++        while ((*cur != '\n') && (*cur != '\r') && (*cur != 0) && (i < (MAX_ARG_SIZE-1))) {
+             if (*cur == 0)
+                 break;
+             arg[i++] = *cur++;
+diff --git a/xmllint.c b/xmllint.c
+index c6273477..3d90272c 100644
+--- a/xmllint.c
++++ b/xmllint.c
+@@ -724,6 +724,9 @@ xmlHTMLValidityWarning(void *ctx, const char *msg, ...)
+  ************************************************************************/
+ #ifdef LIBXML_DEBUG_ENABLED
+ #ifdef LIBXML_XPATH_ENABLED
++
++#define MAX_PROMPT_SIZE     500
++
+ /**
+  * xmlShellReadline:
+  * @prompt:  the prompt value
+@@ -754,9 +754,9 @@ xmlShellReadline(char *prompt) {
+     if (prompt != NULL)
+ 	fprintf(stdout, "%s", prompt);
+     fflush(stdout);
+-    if (!fgets(line_read, 500, stdin))
++    if (!fgets(line_read, MAX_PROMPT_SIZE, stdin))
+         return(NULL);
+-    line_read[500] = 0;
++    line_read[MAX_PROMPT_SIZE] = 0;
+     len = strlen(line_read);
+     ret = (char *) malloc(len + 1);
+     if (ret != NULL) {
+-- 
+diff --git a/test/scripts/long_command.script b/test/scripts/long_command.script
+new file mode 100644
+index 000000000..00f6df09f
+--- /dev/null
++++ b/test/scripts/long_command.script
+@@ -0,0 +1,6 @@
++cd a/b
++set <a:c/>
++xpath //*[namespace-uri()="foo"]
++This_is_a_really_long_command_string_designed_to_test_the_limits_of_the_memory_that_stores_the_command_please_dont_crash foo
++set Navigating_the_labyrinthine_corridors_of_human_cognition_one_often_encounters_the_perplexing_paradox_that_the_more_we_delve_into_the_intricate_dance_of_neural_pathways_and_synaptic_firings_the_further_we_seem_to_stray_from_a_truly_holistic_understanding_of_consciousness_a_phenomenon_that_remains_as_elusive_as_a_moonbeam_caught_in_a_spiderweb_yet_undeniably_shapes_every_fleeting_thought_every_profound_emotion_and_every_grand_aspiration_that_propels_our_species_ever_onward_through_the_relentless_currents_of_time_and_existence
++save -
+diff --git a/test/scripts/long_command.xml b/test/scripts/long_command.xml
+new file mode 100644
+index 000000000..1ba44016e
+--- /dev/null
++++ b/test/scripts/long_command.xml
+@@ -0,0 +1 @@
++<a xmlns:a="bar"><b xmlns:a="foo"/></a>
+-- 
+GitLab
+
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 17d4ea5e8222..52889102febc 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -31,6 +31,9 @@ let
           hash = "sha256-r7PYKr5cDDNNMtM3ogNLsucPFTwP/uoC7McijyLl4kU=";
           excludes = [ "runtest.c" ]; # tests were rewritten in C and are on schematron for 2.13.x, meaning this does not apply
         })
+        # same as upstream, fixed conflicts
+        # https://gitlab.gnome.org/GNOME/libxml2/-/commit/c340e419505cf4bf1d9ed7019a87cc00ec200434
+        ./CVE-2025-6170.patch
       ];
       freezeUpdateScript = true;
       extraMeta = {

From 0d3a5cac50cb67e0e46c09f701453f503c59e372 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 18 Jul 2025 23:24:32 +0200
Subject: [PATCH 0156/3724] vim: 9.1.1475 -> 9.1.1566

Fixes CVE-2025-53905 and CVE-2025-53906.
https://github.com/vim/vim/security/advisories/GHSA-74v4-f3x9-ppvr
https://github.com/vim/vim/security/advisories/GHSA-r2fw-9cw4-mj86
---
 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 b2cfd2db9fd1..61ff8b7d877f 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.1475";
+  version = "9.1.1566";
 
   outputs = [
     "out"
@@ -11,7 +11,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-KKUzS0dS9K/jlfP+igyLX1Fwjb7Y5ZAzGLjqHvkA3bs=";
+    hash = "sha256-/hzyjFGjl8Wu9tHtFgnnHtGbcJ5AIjCMUNCScrdIgwU=";
   };
 
   enableParallelBuilding = true;

From ff1f353e6772a42e63ae4e8bd36a4a8c337a44c1 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 18 Jul 2025 23:42:53 +0200
Subject: [PATCH 0157/3724] perlPackages.AuthenSASL: apply patch for
 CVE-2025-40918

https://www.openwall.com/lists/oss-security/2025/07/16/5
---
 pkgs/top-level/perl-packages.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b12f50e790f2..3ad07232359b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2062,7 +2062,17 @@ with self;
       url = "mirror://cpan/authors/id/E/EH/EHUELS/Authen-SASL-2.1700.tar.gz";
       hash = "sha256-uG1aV2uNOHruJPOfR6VK/RS7ZrCQA9tQZQAfHeA6js4=";
     };
-    propagatedBuildInputs = [ DigestHMAC ];
+    patches = [
+      (fetchurl {
+        name = "CVE-2025-40918.patch";
+        url = "https://security.metacpan.org/patches/A/Authen-SASL/2.1800/CVE-2025-40918-r1.patch";
+        hash = "sha256-2Mk6RoD7tI8V6YFV8gs08LLs0QeMJqwGz/eZ6zXBBpw=";
+      })
+    ];
+    propagatedBuildInputs = [
+      DigestHMAC
+      CryptURandom
+    ];
     meta = {
       description = "SASL Authentication framework";
       license = with lib.licenses; [

From cc8a3137be01639bc80a59acf6410e97edc303a5 Mon Sep 17 00:00:00 2001
From: goatastronaut0212 <goatastronaut0212@outlook.com>
Date: Fri, 13 Jun 2025 08:33:15 +0700
Subject: [PATCH 0158/3724] unciv: 4.16.5 -> 4.17.6

---
 pkgs/by-name/un/unciv/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix
index 2ff29641356a..1fc8aeedb372 100644
--- a/pkgs/by-name/un/unciv/package.nix
+++ b/pkgs/by-name/un/unciv/package.nix
@@ -11,7 +11,7 @@
   libXxf86vm,
 }:
 let
-  version = "4.16.5";
+  version = "4.17.6";
 
   desktopItem = makeDesktopItem {
     name = "unciv";
@@ -34,7 +34,6 @@ let
       libXxf86vm
     ]
   );
-
 in
 stdenv.mkDerivation rec {
   pname = "unciv";
@@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-CMyZlQ5zXHxUExH7aMIJ4nreEPz8Y0eeJ5nnt267SqU=";
+    hash = "sha256-J3OewOILoZD18y5xSjbhhlBBJz6zX3h1gtH4KYO6+Rk=";
   };
 
   dontUnpack = true;

From b14809fc77a729652adf717cec5a3fc527378be3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Jul 2025 08:35:52 +0000
Subject: [PATCH 0159/3724] maturin: 1.8.6 -> 1.9.1

---
 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 93e8826c9373..15fd7b2888da 100644
--- a/pkgs/by-name/ma/maturin/package.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "maturin";
-  version = "1.8.7";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    hash = "sha256-uPtaojmAmMQcmkw7N6oRmE7nIpgyBXm3fLiyP0Ur7Ds=";
+    hash = "sha256-nqi3t1rK2ZTIwFra1avnnhJSMbRI64t5/wP3dCyCY3A=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-3/CP7A/nlx1Qd7j4SQKcxafKAFxnIU90sqaOOw/APOs=";
+  cargoHash = "sha256-ZszmCXvPRpt6+cTDU1GD3K81Qw4UVFMDKLOlb1R6KiE=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv

From 1010b2606b6bda1b4e987886c88e6e94759d983c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 12:32:29 +0000
Subject: [PATCH 0160/3724] e2fsprogs: 1.47.2 -> 1.47.3

---
 pkgs/by-name/e2/e2fsprogs/package.nix | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/e2/e2fsprogs/package.nix b/pkgs/by-name/e2/e2fsprogs/package.nix
index b50d99f801e3..a66afb4da59f 100644
--- a/pkgs/by-name/e2/e2fsprogs/package.nix
+++ b/pkgs/by-name/e2/e2fsprogs/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPackages,
   fetchurl,
-  fetchpatch,
   pkg-config,
   libuuid,
   gettext,
@@ -18,27 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "e2fsprogs";
-  version = "1.47.2";
+  version = "1.47.3";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz";
-    hash = "sha256-CCQuZMoOgZTZwcqtSXYrGSCaBjGBmbY850rk7y105jw=";
+    hash = "sha256-hX5u+AD+qiu0V4+8gQIUvl08iLBy6lPFOEczqWVzcyk=";
   };
 
-  # 2025-05-31: Fix libarchive, from https://github.com/tytso/e2fsprogs/pull/230
-  patches = [
-    (fetchpatch {
-      name = "0001-create_inode_libarchive.c-define-libarchive-dylib-for-darwin.patch";
-      url = "https://github.com/tytso/e2fsprogs/commit/e86c65bc7ee276cd9ca920d96e18ed0cddab3412.patch";
-      hash = "sha256-HFZAznaNl5rzgVEvYx1LDKh2jd/VEXD/o0wypIh4TR8=";
-    })
-    (fetchpatch {
-      name = "0002-mkgnutar.pl-avoid-uninitialized-username-variable.patch";
-      url = "https://github.com/tytso/e2fsprogs/commit/9217c359db1d1b6d031a0e2ca9a885634fed00da.patch";
-      hash = "sha256-iDXmLq77eJolH1mkXSbvZ9tRVtGQt2F45CdkVphUZSs=";
-    })
-  ];
-
   # fuse2fs adds 14mb of dependencies
   outputs = [
     "bin"

From 1a3c01ca6f16717892291d30d332f28b0245a236 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 19 Jul 2025 06:32:46 +0100
Subject: [PATCH 0161/3724] re2: 2024-07-02 -> 2025-07-17

Changes: https://github.com/google/re2/compare/2024-07-02...2025-07-17
---
 pkgs/by-name/re/re2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix
index 8781413e48ba..ff5ca8344d7c 100644
--- a/pkgs/by-name/re/re2/package.nix
+++ b/pkgs/by-name/re/re2/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "re2";
-  version = "2024-07-02";
+  version = "2025-07-17";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "re2";
     rev = finalAttrs.version;
-    hash = "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=";
+    hash = "sha256-8wxAFu013Nc67vikwXt5+A/5odEk62yHpRbeH6zHrlY=";
   };
 
   outputs = [

From d0190b008bff158eab9f2dc24622c376eb2ba9c5 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 19 Jul 2025 09:50:23 +0200
Subject: [PATCH 0162/3724] python3Packages.hatch-vcs: use gitMinimal

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

diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix
index 3592cbf86d80..1810472ea583 100644
--- a/pkgs/development/python-modules/hatch-vcs/default.nix
+++ b/pkgs/development/python-modules/hatch-vcs/default.nix
@@ -4,7 +4,7 @@
   fetchPypi,
   pytestCheckHook,
   pythonOlder,
-  git,
+  gitMinimal,
   hatchling,
   setuptools-scm,
 }:
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    git
+    gitMinimal
     pytestCheckHook
   ];
 

From bd9f431ce084e1eb616c02193a1e2754bfb94c58 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 19 Jul 2025 09:51:10 +0200
Subject: [PATCH 0163/3724] python3Packages.poetry-core: use gitMinimal

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

diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index e5a62637975a..0d9a5c4ecdee 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   pythonOlder,
   build,
-  git,
+  gitMinimal,
   pytest-cov-stub,
   pytest-mock,
   pytestCheckHook,
@@ -31,7 +31,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     build
-    git
+    gitMinimal
     pytest-mock
     pytest-cov-stub
     pytestCheckHook

From 9c926ae509ef073304ec4b5632a52a327d9c983f Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 19 Jul 2025 09:51:45 +0200
Subject: [PATCH 0164/3724] python3Packages.meson-python: use gitMinimal

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

diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix
index b4099605e0e0..205b99841974 100644
--- a/pkgs/development/python-modules/meson-python/default.nix
+++ b/pkgs/development/python-modules/meson-python/default.nix
@@ -14,7 +14,7 @@
 
   # tests
   cython,
-  git,
+  gitMinimal,
   pytestCheckHook,
   pytest-mock,
 }:
@@ -52,7 +52,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     cython
-    git
+    gitMinimal
     pytestCheckHook
     pytest-mock
   ];

From a4d61af95028f0d234d306b7672c0a703673bd40 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Fri, 18 Jul 2025 22:51:41 -0400
Subject: [PATCH 0165/3724] systemd: Use smaller bootctl patch.

The PR has been updated and simplified.
---
 ...ail-when-the-same-file-is-updated-mu.patch | 57 ++++++++++++
 ...ry-to-update-the-same-file-multiple-.patch | 89 -------------------
 pkgs/os-specific/linux/systemd/default.nix    |  3 +-
 3 files changed, 58 insertions(+), 91 deletions(-)
 create mode 100644 pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/0018-bootctl-do-not-try-to-update-the-same-file-multiple-.patch

diff --git a/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch b/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch
new file mode 100644
index 000000000000..70c3f0ef5f26
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Wed, 19 Jun 2024 16:11:23 +0900
+Subject: [PATCH] bootctl: do not fail when the same file is updated multiple
+ times
+
+In the second or later trial, copy_file_with_version_check() -> version_check()
+fails with -ESRCH. Let's ignore the failure.
+
+This also adds missing assertions in update_efi_boot_binaries(), and
+drop redundant version check in update_efi_boot_binaries(), as version
+will be anyway checked later.
+
+Fixes a regression caused by 929f41c6528fb630753d4e2f588a8eb6c2f6a609.
+Fixes #33392.
+---
+ src/bootctl/bootctl-install.c | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/src/bootctl/bootctl-install.c b/src/bootctl/bootctl-install.c
+index e15c2c6bed..5b4cff5d5e 100644
+--- a/src/bootctl/bootctl-install.c
++++ b/src/bootctl/bootctl-install.c
+@@ -329,6 +329,9 @@ static int update_efi_boot_binaries(const char *esp_path, const char *source_pat
+         _cleanup_free_ char *p = NULL;
+         int r, ret = 0;
+ 
++        assert(esp_path);
++        assert(source_path);
++
+         r = chase_and_opendir("/EFI/BOOT", esp_path, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, &p, &d);
+         if (r == -ENOENT)
+                 return 0;
+@@ -354,19 +357,14 @@ static int update_efi_boot_binaries(const char *esp_path, const char *source_pat
+                 if (r == 0)
+                         continue;
+ 
+-                r = get_file_version(fd, &v);
+-                if (r == -ESRCH)
+-                        continue;  /* No version information */
+-                if (r < 0)
+-                        return r;
+-                if (!startswith(v, "systemd-boot "))
+-                        continue;
+-
+                 _cleanup_free_ char *dest_path = path_join(p, de->d_name);
+                 if (!dest_path)
+                         return log_oom();
+ 
+-                RET_GATHER(ret, copy_file_with_version_check(source_path, dest_path, /* force = */ false));
++                r = copy_file_with_version_check(source_path, dest_path, /* force = */ false);
++                if (IN_SET(r, -ESTALE, -ESRCH))
++                        continue;
++                RET_GATHER(ret, r);
+         }
+ 
+         return ret;
diff --git a/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-try-to-update-the-same-file-multiple-.patch b/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-try-to-update-the-same-file-multiple-.patch
deleted file mode 100644
index 8adac9fb9bde..000000000000
--- a/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-try-to-update-the-same-file-multiple-.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Wed, 19 Jun 2024 15:55:59 +0900
-Subject: [PATCH] bootctl: do not try to update the same file multiple times
-
-Otherwise, copy_file_with_version_check() -> version_check() will fail
-and warn about that the same version is already installed.
-
-Fixes a regression caused by 929f41c6528fb630753d4e2f588a8eb6c2f6a609.
-Fixes #33392.
-
-bootctl: add missing error messages in version_check()
-
-bootctl: check file type before update
-
-This also adds missing assertions.
-
-Follow-up for 929f41c6528fb630753d4e2f588a8eb6c2f6a609.
----
- src/bootctl/bootctl-install.c | 22 ++++++++++++++++++----
- 1 file changed, 18 insertions(+), 4 deletions(-)
-
-diff --git a/src/bootctl/bootctl-install.c b/src/bootctl/bootctl-install.c
-index e15c2c6bed..7828ce1f08 100644
---- a/src/bootctl/bootctl-install.c
-+++ b/src/bootctl/bootctl-install.c
-@@ -195,14 +195,14 @@ static int version_check(int fd_from, const char *from, int fd_to, const char *t
-         if (r == -ESRCH)
-                 return log_notice_errno(r, "Source file \"%s\" does not carry version information!", from);
-         if (r < 0)
--                return r;
-+                return log_error_errno(r, "Failed to get version information of source file \"%s\": %m", from);
- 
-         r = get_file_version(fd_to, &b);
-         if (r == -ESRCH)
-                 return log_notice_errno(r, "Skipping \"%s\", it's owned by another boot loader (no version info found).",
-                                         to);
-         if (r < 0)
--                return r;
-+                return log_error_errno(r, "Failed to get version information of \"%s\": %m", to);
-         if (compare_product(a, b) != 0)
-                 return log_notice_errno(SYNTHETIC_ERRNO(ESRCH),
-                                         "Skipping \"%s\", it's owned by another boot loader.", to);
-@@ -324,11 +324,15 @@ static int create_subdirs(const char *root, const char * const *subdirs) {
-         return 0;
- }
- 
--static int update_efi_boot_binaries(const char *esp_path, const char *source_path) {
-+static int update_efi_boot_binaries(const char *esp_path, const char *source_path, const char *exclude_path) {
-         _cleanup_closedir_ DIR *d = NULL;
-         _cleanup_free_ char *p = NULL;
-         int r, ret = 0;
- 
-+        assert(esp_path);
-+        assert(source_path);
-+        assert(exclude_path);
-+
-         r = chase_and_opendir("/EFI/BOOT", esp_path, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, &p, &d);
-         if (r == -ENOENT)
-                 return 0;
-@@ -339,9 +343,19 @@ static int update_efi_boot_binaries(const char *esp_path, const char *source_pat
-                 _cleanup_close_ int fd = -EBADF;
-                 _cleanup_free_ char *v = NULL;
- 
-+                if (!IN_SET(de->d_type, DT_REG, DT_UNKNOWN))
-+                        continue;
-+
-                 if (!endswith_no_case(de->d_name, ".efi"))
-                         continue;
- 
-+                /* Skip the file that is already updated. We cannot check if the paths are equal because the
-+                 * file system is likely case insensitve. It's easiest to just check if the inodes are the
-+                 * same.
-+                 */
-+                if (inode_same_at(dirfd(d), de->d_name, 0, exclude_path, 0))
-+                        continue;
-+
-                 fd = xopenat_full(dirfd(d), de->d_name, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY|O_NOFOLLOW, /* xopen_flags= */ 0, /* mode= */ 0);
-                 if (fd < 0)
-                         return log_error_errno(fd, "Failed to open \"%s/%s\" for reading: %m", p, de->d_name);
-@@ -429,7 +443,7 @@ static int copy_one_file(const char *esp_path, const char *name, bool force) {
-                 /* If we were installed under any other name in /EFI/BOOT, make sure we update those binaries
-                  * as well. */
-                 if (!force)
--                        RET_GATHER(ret, update_efi_boot_binaries(esp_path, source_path));
-+                        RET_GATHER(ret, update_efi_boot_binaries(esp_path, source_path, default_dest_path));
-         }
- 
-         return ret;
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 7d45c2e96c6d..f8dafeb8e5ad 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -247,9 +247,8 @@ stdenv.mkDerivation (finalAttrs: {
       ./0017-meson.build-do-not-create-systemdstatedir.patch
 
       # https://github.com/systemd/systemd/issues/33392
-      # This patch is a slightly modified version of this PR:
       # https://github.com/systemd/systemd/pull/33400
-      ./0018-bootctl-do-not-try-to-update-the-same-file-multiple-.patch
+      ./0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch
 
       # systemd tries to link the systemd-ssh-proxy ssh config snippet with tmpfiles
       # if the install prefix is not /usr, but that does not work for us

From 362d606bc22be9c0f08c144e2b973ab44b432eeb Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 19 Jul 2025 10:44:45 +0200
Subject: [PATCH 0166/3724] python3Packages.pytest-benchmark: use gitMinimal

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

diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix
index fc4fbef0c72c..9142e7eabecc 100644
--- a/pkgs/development/python-modules/pytest-benchmark/default.nix
+++ b/pkgs/development/python-modules/pytest-benchmark/default.nix
@@ -5,7 +5,7 @@
   elasticsearch,
   fetchFromGitHub,
   freezegun,
-  git,
+  gitMinimal,
   mercurial,
   nbmake,
   py-cpuinfo,
@@ -52,7 +52,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     freezegun
-    git
+    gitMinimal
     mercurial
     nbmake
     pytestCheckHook

From 1adbdf6004ee13620d31f25b0d2f8a8483a6746a Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 19 Jul 2025 10:45:18 +0200
Subject: [PATCH 0167/3724] python3Packages.versioningit: use gitMinimal

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

diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix
index 05dc14a79557..8461b0b5e691 100644
--- a/pkgs/development/python-modules/versioningit/default.nix
+++ b/pkgs/development/python-modules/versioningit/default.nix
@@ -13,7 +13,7 @@
   pytest-cov-stub,
   pytest-mock,
   setuptools,
-  git,
+  gitMinimal,
   mercurial,
 }:
 
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytest-mock
     setuptools
-    git
+    gitMinimal
     mercurial
   ];
 

From 2d5de22889ce6ba1febcd1681251d04e0adaa983 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 3 Jun 2025 22:54:57 +0200
Subject: [PATCH 0168/3724] cargo-c: add update script

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/ca/cargo-c/package.nix | 14 ++++++++++----
 pkgs/by-name/ca/cargo-c/update.sh   | 14 ++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100755 pkgs/by-name/ca/cargo-c/update.sh

diff --git a/pkgs/by-name/ca/cargo-c/package.nix b/pkgs/by-name/ca/cargo-c/package.nix
index 3624b19e5388..153c578518b2 100644
--- a/pkgs/by-name/ca/cargo-c/package.nix
+++ b/pkgs/by-name/ca/cargo-c/package.nix
@@ -10,14 +10,17 @@
   rav1e,
 }:
 
+let
+  # this version may need to be updated along with package version
+  cargoVersion = "0.80.0";
+in
 rustPlatform.buildRustPackage rec {
   pname = "cargo-c";
   version = "0.10.2";
 
   src = fetchCrate {
     inherit pname;
-    # this version may need to be updated along with package version
-    version = "${version}+cargo-0.80.0";
+    version = "${version}+cargo-${cargoVersion}";
     hash = "sha256-ltxd4n3oo8ZF/G/zmR4FSVtNOkxwCjDv6PdxkmWxZ+8=";
   };
 
@@ -47,8 +50,11 @@ rustPlatform.buildRustPackage rec {
     runHook postInstallCheck
   '';
 
-  passthru.tests = {
-    inherit rav1e;
+  passthru = {
+    tests = {
+      inherit rav1e;
+    };
+    updateScript.command = [ ./update.sh ];
   };
 
   meta = {
diff --git a/pkgs/by-name/ca/cargo-c/update.sh b/pkgs/by-name/ca/cargo-c/update.sh
new file mode 100755
index 000000000000..fe1137043aea
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-c/update.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash curl coreutils nix-update jq
+
+set -ex
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+latestVersion=`curl https://crates.io/api/v1/crates/cargo-c/versions | jq '.versions[0].num | split("+cargo-")'`
+crateVersion=`jq -r '.[0]' <<< $latestVersion`
+cargoVersion=`jq -r '.[1]' <<< $latestVersion`
+
+sed -E -i "s/(cargoVersion = ).*;/\1\"$cargoVersion\";/" $SCRIPT_DIR/package.nix
+
+nix-update cargo-c --version="$crateVersion"

From 26e7dace03c30ef63ce8674c79aa34196abad758 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 3 Jun 2025 23:14:20 +0200
Subject: [PATCH 0169/3724] cargo-c: 0.10.2 -> 0.10.14

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/ca/cargo-c/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-c/package.nix b/pkgs/by-name/ca/cargo-c/package.nix
index 153c578518b2..eb13465eb783 100644
--- a/pkgs/by-name/ca/cargo-c/package.nix
+++ b/pkgs/by-name/ca/cargo-c/package.nix
@@ -12,20 +12,20 @@
 
 let
   # this version may need to be updated along with package version
-  cargoVersion = "0.80.0";
+  cargoVersion = "0.89.0";
 in
 rustPlatform.buildRustPackage rec {
   pname = "cargo-c";
-  version = "0.10.2";
+  version = "0.10.14";
 
   src = fetchCrate {
     inherit pname;
     version = "${version}+cargo-${cargoVersion}";
-    hash = "sha256-ltxd4n3oo8ZF/G/zmR4FSVtNOkxwCjDv6PdxkmWxZ+8=";
+    hash = "sha256-t6cbufPdpyaFzwEFWt19Nid2S5FXCJCS+SHJ0aJICX0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-tCJ7Giyj7Wqowhk0N7CkvAiWvF6DBNw7G7aAnn2+mp8=";
+  cargoHash = "sha256-nW+akmbpIGZnhJLBdwDAGI4m5eSwdT2Z/iY2RV4zMQY=";
 
   nativeBuildInputs = [
     pkg-config

From 3a355010e6f0b5874149306f48139fd11d4b0dd1 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 19 Jul 2025 11:49:30 +0200
Subject: [PATCH 0170/3724] python3Packages.twisted: use gitMinimal

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

diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index e6d853fe2314..4e870f48f6ff 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -33,7 +33,7 @@
 
   # tests
   cython-test-exception-raiser,
-  git,
+  gitMinimal,
   glibcLocales,
   pyhamcrest,
   hypothesis,
@@ -196,7 +196,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs =
     [
-      git
+      gitMinimal
       glibcLocales
     ]
     ++ optional-dependencies.test

From 203e523ab70844ea230fd7505511c7e5924c5a9b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 19 Jul 2025 12:34:39 +0300
Subject: [PATCH 0171/3724] python313Packages.dbus-deviation: remove unused
 setuptools_git dep, modernize

This (via hotdoc) drops git's reverse closure by another 3.7k builds per Linux.
---
 .../python-modules/dbus-deviation/default.nix       | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/dbus-deviation/default.nix b/pkgs/development/python-modules/dbus-deviation/default.nix
index 3f455b68a961..158bf7f5d11b 100644
--- a/pkgs/development/python-modules/dbus-deviation/default.nix
+++ b/pkgs/development/python-modules/dbus-deviation/default.nix
@@ -4,7 +4,6 @@
   fetchPypi,
   lxml,
   setuptools,
-  setuptools-git,
 }:
 
 buildPythonPackage rec {
@@ -18,15 +17,13 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
-    sed -i "/'sphinx',/d" setup.py
+    substituteInPlace setup.py \
+      --replace-fail "'setuptools_git >= 0.3'," "" \
+      --replace-fail "'sphinx'," ""
   '';
 
-  nativeBuildInputs = [
-    setuptools
-    setuptools-git
-  ];
-
-  propagatedBuildInputs = [ lxml ];
+  build-system = [ setuptools ];
+  dependencies = [ lxml ];
 
   pythonImportsCheck = [ "dbusdeviation" ];
 

From 351b2b10c2ead903c71837b48990cfe880da2232 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <kaction.cc@gmail.com>
Date: Fri, 27 Jun 2025 20:00:00 -0400
Subject: [PATCH 0172/3724] bash: Fix build with gcc-15

---
 pkgs/shells/bash/5.nix | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix
index 66172bddd125..d11f363592f2 100644
--- a/pkgs/shells/bash/5.nix
+++ b/pkgs/shells/bash/5.nix
@@ -133,10 +133,31 @@ lib.warnIf (withDocs != null)
 
     enableParallelBuilding = true;
 
-    makeFlags = lib.optionals stdenv.hostPlatform.isCygwin [
-      "LOCAL_LDFLAGS=-Wl,--export-all,--out-implib,libbash.dll.a"
-      "SHOBJ_LIBS=-lbash"
-    ];
+    makeFlags =
+      lib.optionals stdenv.hostPlatform.isCygwin [
+        "LOCAL_LDFLAGS=-Wl,--export-all,--out-implib,libbash.dll.a"
+        "SHOBJ_LIBS=-lbash"
+      ]
+      # GNU Bash extensively uses function prototypes with unspecified signature, like
+      #
+      #     extern void add_unwind_protect ()
+      #
+      # to implicitly cast all kinds of word-sized arguments. GCC-15 switched C standard
+      # from gnu17 to gnu23, which changed the meaning of the prototype above to
+      #
+      #     extern void add_unwind_protect (void)
+      #
+      # Note that Bash 5.3, quoting the release announcement:
+      #
+      # > The source code has been updated for C23 conformance. This means that bash
+      # > will no longer compile with K&R-style C compilers.
+      #
+      # So this workaround won't be necessary after upgrade to bash=5.3.
+      #
+      # => https://lists.gnu.org/archive/html/bug-bash/2025-07/msg00005.html
+      #
+      #      ~kaction 2025-07-19
+      ++ [ "LOCAL_CFLAGS=-std=c99" ];
 
     nativeCheckInputs = [ util-linux ];
     doCheck = false; # dependency cycle, needs to be interactive

From 2a9a83e489e867280f65ae00fc61dc14be1de883 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <kaction.cc@gmail.com>
Date: Fri, 27 Jun 2025 20:00:00 -0400
Subject: [PATCH 0173/3724] glibc: Fix build with gcc-15

---
 pkgs/development/libraries/glibc/common.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index e4b9d66f7dd0..f6c9aa6755c4 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -162,6 +162,15 @@ stdenv.mkDerivation (
         -#define LIBIDN2_SONAME "libidn2.so.0"
         +#define LIBIDN2_SONAME "${lib.getLib libidn2}/lib/libidn2.so.0"
         EOF
+      ''
+      # For some reason, with gcc-15 build fails with the following error:
+      #
+      #     zic.c:3767:1: note: did you mean to specify it after ')' following function parameters?
+      #     zic.c:3781:1: error: standard 'reproducible' attribute can only be applied to function declarators or type specifiers with function type []
+      + ''
+        for path in timezone/zic.c timezone/zdump.c ; do
+          substituteInPlace $path  --replace-fail "ATTRIBUTE_REPRODUCIBLE" ""
+        done
       '';
 
     configureFlags =

From 88686e2fe3a9657520a7bed0e0eb53e736345485 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <kaction.cc@gmail.com>
Date: Sun, 29 Jun 2025 01:06:06 +0000
Subject: [PATCH 0174/3724] gmp: Fix build with gcc-15

---
 pkgs/development/libraries/gmp/6.x.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 2e3fdc532059..25e0a324ec12 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -48,6 +48,12 @@ let
     configureFlags =
       [
         "--with-pic"
+        # gcc-15 have c23 standard by default, where "void foo()" now means "void foo(void)".
+        #
+        # The "configure" script relies on c17 and below semantics for "long long
+        # reliability test 1" (defined in aclocal.m4)
+        "CFLAGS=-std=c99"
+
         (lib.enableFeature cxx "cxx")
         # Build a "fat binary", with routines for several sub-architectures
         # (x86), except on Solaris where some tests crash with "Memory fault".

From 88b848ca71a8561be457b3e83ace14e2cc7a6501 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <kaction.cc@gmail.com>
Date: Sat, 28 Jun 2025 20:00:00 -0400
Subject: [PATCH 0175/3724] unzip: Fix build with gcc-15

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

diff --git a/pkgs/by-name/un/unzip/package.nix b/pkgs/by-name/un/unzip/package.nix
index 7a2f8fc8bd33..ebcc3d27c351 100644
--- a/pkgs/by-name/un/unzip/package.nix
+++ b/pkgs/by-name/un/unzip/package.nix
@@ -86,6 +86,11 @@ stdenv.mkDerivation rec {
       sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1";
     });
 
+  # gcc-15 uses c23 standard, which removed non-prototype function declarations.
+  postPatch = ''
+    sed -i '/localtime()/ d' unix/unxcfg.h
+  '';
+
   nativeBuildInputs = [ bzip2 ];
   buildInputs = [ bzip2 ] ++ lib.optional enableNLS libnatspec;
 

From 7b9606965db1764d6b473b64670535ccdbc75592 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <kaction.cc@gmail.com>
Date: Sun, 29 Jun 2025 20:54:27 +0000
Subject: [PATCH 0176/3724] ncurses: fix build with gcc-15

---
 .../development/libraries/ncurses/default.nix | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index df558034c7e0..6abb6e13acdb 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -33,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   setOutputFlags = false; # some aren't supported
 
+  postPatch = ''
+    sed -i '1i #include <stdbool.h>' include/curses.h.in
+  '';
+
   # see other isOpenBSD clause below
   configurePlatforms =
     if stdenv.hostPlatform.isOpenBSD then
@@ -95,6 +99,22 @@ stdenv.mkDerivation (finalAttrs: {
       # which assumes that your openbsd is from the 90s, leading to a truly awful compiler/linker configuration.
       # No, autoreconfHook doesn't work.
       "--host=${stdenv.hostPlatform.config}${stdenv.cc.libc.version}"
+    ]
+    # Without this override, the upstream configure system results in
+    #
+    #     typedef unsigned char NCURSES_BOOL;
+    #     #define bool NCURSES_BOOL;
+    #
+    # Which breaks C++ bindings:
+    #
+    #      > /nix/store/[...]-gcc-15.1.0/include/c++/15.1.0/cstddef:81:21: error: redefinition of 'struct std::__byte_operand<unsigned char>'
+    #      >    81 |   template<> struct __byte_operand<unsigned char> { using __type = byte; };
+    #      >       |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #      > /nix/store/[...]-gcc-15.1.0/include/c++/15.1.0/cstddef:78:21: note: previous definition of 'struct std::__byte_operand<unsigned char>'
+    #      >    78 |   template<> struct __byte_operand<bool> { using __type = byte; };
+    #
+    ++ [
+      "cf_cv_type_of_bool=bool"
     ];
 
   # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris:

From ce3414c7a60b474db0e6cb3eba8773e89337814e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 19 Jul 2025 16:32:23 +0300
Subject: [PATCH 0177/3724] qt6.qtwebengine: drop unused git dependency

More git reverse closure reduction.
---
 pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index 4d484a5e7692..5b4b4d8185ef 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -9,7 +9,6 @@
   coreutils,
   fetchpatch2,
   flex,
-  git,
   gperf,
   ninja,
   pkg-config,
@@ -75,7 +74,6 @@ qtModule {
       bison
       coreutils
       flex
-      git
       gperf
       ninja
       pkg-config

From b8ea17dbd3c12fbe1110f89a162e84796436ec0f Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 27 Jun 2025 21:08:14 +0200
Subject: [PATCH 0178/3724] tcl,tk: 8.6.15 -> 8.6.16

---
 pkgs/development/interpreters/tcl/8.6.nix | 4 ++--
 pkgs/development/libraries/tk/8.6.nix     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/tcl/8.6.nix b/pkgs/development/interpreters/tcl/8.6.nix
index 1c6217e79d52..2c3a57df6b81 100644
--- a/pkgs/development/interpreters/tcl/8.6.nix
+++ b/pkgs/development/interpreters/tcl/8.6.nix
@@ -4,13 +4,13 @@ callPackage ./generic.nix (
   args
   // rec {
     release = "8.6";
-    version = "${release}.15";
+    version = "${release}.16";
 
     # Note: when updating, the hash in pkgs/development/libraries/tk/8.6.nix must also be updated!
 
     src = fetchurl {
       url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
-      sha256 = "sha256-hh4Vl1Py4vvW7BSEEDcVsL5WvjNXUiuFjTy7X4k//vE=";
+      hash = "sha256-kcuPphdxxjwmLvtVMFm3x61nV6+lhXr2Jl5LC9wqFKU=";
     };
   }
 )
diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix
index bb5f3e97da64..ca655c01ae44 100644
--- a/pkgs/development/libraries/tk/8.6.nix
+++ b/pkgs/development/libraries/tk/8.6.nix
@@ -11,7 +11,7 @@ callPackage ./generic.nix (
 
     src = fetchurl {
       url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
-      sha256 = "sha256-VQlp81N5+VKzAg86t7ndW/0Rwe98m3xqdfXEmsp5P+w=";
+      hash = "sha256-vp+U01ddSzCZ2EvDwQ3omU3y16pAUggXPHCcxASn5f4=";
     };
 
     patches = [

From 8b47e3268a220bbc12583337d4de7f57fe5ae450 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 19 Jul 2025 17:11:46 +0300
Subject: [PATCH 0179/3724] qt5.qtwebengine: drop unused git dependency

---
 pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 6fb7d833470b..2f37cfd89e83 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -9,7 +9,6 @@
 
   bison,
   flex,
-  git,
   gperf,
   ninja,
   pkg-config,
@@ -96,7 +95,6 @@ qtModule (
       [
         bison
         flex
-        git
         gperf
         ninja
         pkg-config

From 8ae532aabfef284af0dbe56e37d795593357c34c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 19 Jul 2025 17:20:06 +0300
Subject: [PATCH 0180/3724] triton-llvm: remove unused git dependency

Only used to determine version, which doesn't work with
a tarball download anyway.
---
 pkgs/by-name/tr/triton-llvm/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix
index 6b2b99aa0264..dccab097dc16 100644
--- a/pkgs/by-name/tr/triton-llvm/package.nix
+++ b/pkgs/by-name/tr/triton-llvm/package.nix
@@ -6,7 +6,6 @@
   pkg-config,
   cmake,
   ninja,
-  git,
   libxml2,
   libxcrypt,
   libedit,
@@ -90,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
       pkg-config
       cmake
       ninja
-      git
       python
     ]
     ++ lib.optionals (buildDocs || buildMan) [

From 8acee0c6a9bb1f24a28123cc0543ccf06539c53b Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 19 Jul 2025 14:33:27 +0530
Subject: [PATCH 0181/3724] Revert "hdr10plus: decouple the src from
 hdr10plus_tool"

This reverts commit 7f75ff0da259ffaa91c2864bbcdbcdc08cef5663.\

This is no longer needed as staging has cargo-c 0.10.14.
The workaround was for https://github.com/NixOS/nixpkgs/pull/426181#issuecomment-3092161469
---
 pkgs/by-name/hd/hdr10plus/package.nix | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/hd/hdr10plus/package.nix b/pkgs/by-name/hd/hdr10plus/package.nix
index ee57905180f1..1c466b21851a 100644
--- a/pkgs/by-name/hd/hdr10plus/package.nix
+++ b/pkgs/by-name/hd/hdr10plus/package.nix
@@ -4,7 +4,6 @@
   rust,
   rustPlatform,
   hdr10plus_tool,
-  fetchFromGitHub,
   cargo-c,
   fontconfig,
 }:
@@ -17,26 +16,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "hdr10plus";
-  # Version of the library, not the tool
-  # See https://github.com/quietvoid/hdr10plus_tool/blob/main/hdr10plus/Cargo.toml
-  version = "2.1.3";
-
-  src = fetchFromGitHub {
-    owner = "quietvoid";
-    repo = "hdr10plus_tool";
-    # repo release snapshots are versioned per the tool
-    # https://github.com/quietvoid/hdr10plus_tool/releases/latest
-    tag = "1.7.0";
-    hash = "sha256-eueB+ZrOrnySEwUpCTvC4qARCsDcHJhm088XepLTlOE=";
-  };
-
-  cargoHash = "sha256-3D0HjDtKwYoi9bpQnosC/TPNBjfiWi5m1CH1eGQpGg0=";
+  version = "2.1.4";
 
   outputs = [
     "out"
     "dev"
   ];
 
+  inherit (hdr10plus_tool) src cargoDeps cargoHash;
+
   nativeBuildInputs = [ cargo-c ];
   buildInputs = [ fontconfig ];
 

From 2cdbaee7c110f1fe95dbcbbff098e872112f22ad Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 19 Jul 2025 14:45:19 +0530
Subject: [PATCH 0182/3724] hdr10plus: add comments back

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 pkgs/by-name/hd/hdr10plus/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/hd/hdr10plus/package.nix b/pkgs/by-name/hd/hdr10plus/package.nix
index 1c466b21851a..d0a7778a0449 100644
--- a/pkgs/by-name/hd/hdr10plus/package.nix
+++ b/pkgs/by-name/hd/hdr10plus/package.nix
@@ -16,6 +16,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "hdr10plus";
+  # Version of the library, not the tool
+  # See https://github.com/quietvoid/hdr10plus_tool/blob/main/hdr10plus/Cargo.toml
   version = "2.1.4";
 
   outputs = [

From b079060dd11e6481ed16e49142379fc7578a7022 Mon Sep 17 00:00:00 2001
From: M0ustach3 <37956764+M0ustach3@users.noreply.github.com>
Date: Sat, 19 Jul 2025 20:22:58 +0200
Subject: [PATCH 0183/3724] apache-answer: 1.4.1 -> 1.5.1

---
 pkgs/by-name/ap/apache-answer/package.nix | 36 ++++++++++++-----------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix
index a3d0fa6fc285..257f972e4f47 100644
--- a/pkgs/by-name/ap/apache-answer/package.nix
+++ b/pkgs/by-name/ap/apache-answer/package.nix
@@ -2,7 +2,7 @@
   buildGoModule,
   lib,
   fetchFromGitHub,
-  pnpm_9,
+  pnpm,
   nodejs,
   fetchpatch,
   stdenv,
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "apache-answer";
-  version = "1.4.1";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "apache";
-    repo = "incubator-answer";
+    repo = "answer";
     tag = "v${version}";
-    hash = "sha256-nS3ZDwY221axzo1HAz369f5jWZ/mpCn4r3OPPqjiohI=";
+    hash = "sha256-OocQsCqyVHjkpGSDS23RbOJ+b10Ax32G2hok5bgNDTI=";
   };
 
   webui = stdenv.mkDerivation {
@@ -25,15 +25,15 @@ buildGoModule rec {
 
     sourceRoot = "${src.name}/ui";
 
-    pnpmDeps = pnpm_9.fetchDeps {
+    pnpmDeps = pnpm.fetchDeps {
       inherit src version pname;
       sourceRoot = "${src.name}/ui";
       fetcherVersion = 1;
-      hash = "sha256-/se6IWeHdazqS7PzOpgtT4IxCJ1WptqBzZ/BdmGb4BA=";
+      hash = "sha256-6IeLOwsEqchCwe0GGj/4v9Q4/Hm16K+ve2X+8QHztQM=";
     };
 
     nativeBuildInputs = [
-      pnpm_9.configHook
+      pnpm.configHook
       nodejs
     ];
 
@@ -55,26 +55,28 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-nvXr1YAqVCyhCgPtABTOtzDH+FCQhN9kSEhxKw7ipsE=";
+  vendorHash = "sha256-jKpUJD8rq+ZvTgJVaI+AfrwMzrrai+cfd4hjoDLYnxc=";
+
+  doCheck = false; # TODO checks are currently broken upstream
+
+  ldflags = [
+    "-X main.Version=${version}"
+    "-X main.Commit=${version}"
+  ];
 
   preBuild = ''
     cp -r ${webui}/* ui/build/
   '';
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/apache/incubator-answer/commit/57b0d0e84dd0e0bf3c8a05a38a7f55eddc5f0dda.patch";
-      hash = "sha256-TfF+PtrcMYYgNjgU4lGpnshdII8xECTT2L7M26uebn0=";
-    })
-  ];
-
   meta = {
     homepage = "https://answer.apache.org/";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    maintainers = with lib.maintainers; [
+      bot-wxt1221
+    ];
     platforms = lib.platforms.unix;
     mainProgram = "answer";
-    changelog = "https://github.com/apache/incubator-answer/releases/tag/v${version}";
+    changelog = "https://github.com/apache/answer/releases/tag/v${version}";
     description = "Q&A platform software for teams at any scales";
   };
 }

From e6b8ad33ff67c8dfd87d64876babd0c6db2e05f4 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Thu, 3 Jul 2025 01:34:23 -0700
Subject: [PATCH 0184/3724] util-linux: 2.41 -> 2.41.1

Drop most of our patches, since they were fixed:

libmount:
    - (subdir) restrict for real mounts only (by Karel Zak)
    - (subdir) remove unused code (by Karel Zak)
    - fix --no-canonicalize regression (by Karel Zak)

libuuid:
    - fix uuid_time on macOS without attribute((alias)) (by Eugene Gershnik)

https://lore.kernel.org/util-linux/wnfaquaapqknjnu2bdvddkp2xbleowfcr2g3cqiewpl54oclmi@mrseflcu5nyk/T/#u
---
 .../ut/util-linux/fix-darwin-build.patch      | 35 --------
 .../ut/util-linux/fix-mount-regression.patch  | 39 ---------
 .../libmount-subdir-remove-unused-code.patch  | 31 -------
 ...subdir-restrict-for-real-mounts-only.patch | 80 -------------------
 pkgs/by-name/ut/util-linux/package.nix        | 11 +--
 5 files changed, 2 insertions(+), 194 deletions(-)
 delete mode 100644 pkgs/by-name/ut/util-linux/fix-darwin-build.patch
 delete mode 100644 pkgs/by-name/ut/util-linux/fix-mount-regression.patch
 delete mode 100644 pkgs/by-name/ut/util-linux/libmount-subdir-remove-unused-code.patch
 delete mode 100644 pkgs/by-name/ut/util-linux/libmount-subdir-restrict-for-real-mounts-only.patch

diff --git a/pkgs/by-name/ut/util-linux/fix-darwin-build.patch b/pkgs/by-name/ut/util-linux/fix-darwin-build.patch
deleted file mode 100644
index c65266e88690..000000000000
--- a/pkgs/by-name/ut/util-linux/fix-darwin-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e47c6f751a7ef87640c61316ada774e8e9cc6b07 Mon Sep 17 00:00:00 2001
-From: Eugene Gershnik <gershnik@users.noreply.github.com>
-Date: Mon, 6 May 2024 09:29:39 -0700
-Subject: [PATCH] libuuid: fix uuid_time on macOS without attribute((alias))
-
-Weak aliases are not supported by clang on Darwin.
-Instead this fix uses inline asm to make `_uuid_time` an alias to
-`___uuid_time`
-
-It appears that on macOS the time API is purely 32 or 64 bit depending
-on the build type. There is no ABI issue on that platform and `uuid_time`
-can be unconditionally aliased to `_uuid_time`. This is all conjectural,
-however, since I have no ability to make 32-bit builds for macOS - the
-Apple toolchain doesn't support this since 2019.
-
-Fixes util-linux/util-linux#2873
----
- libuuid/src/uuid_time.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libuuid/src/uuid_time.c b/libuuid/src/uuid_time.c
-index 9b415b3ee73..df0478e1909 100644
---- a/libuuid/src/uuid_time.c
-+++ b/libuuid/src/uuid_time.c
-@@ -85,6 +85,10 @@ time_t __uuid_time(const uuid_t uu, struct timeval *ret_tv)
- }
- #if defined(__USE_TIME_BITS64) && defined(__GLIBC__)
- extern time_t uuid_time64(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time")));
-+#elif defined(__clang__) && defined(__APPLE__)
-+__asm__(".globl _uuid_time");
-+__asm__(".set _uuid_time, ___uuid_time");
-+extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv);
- #else
- extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time")));
- #endif
diff --git a/pkgs/by-name/ut/util-linux/fix-mount-regression.patch b/pkgs/by-name/ut/util-linux/fix-mount-regression.patch
deleted file mode 100644
index 973ba7493e7d..000000000000
--- a/pkgs/by-name/ut/util-linux/fix-mount-regression.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7dbfe31a83f45d5aef2b508697e9511c569ffbc8 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Mon, 24 Mar 2025 14:31:05 +0100
-Subject: [PATCH] libmount: fix --no-canonicalize regression
-
-Fixes: https://github.com/util-linux/util-linux/issues/3474
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libmount/src/context.c | 3 ---
- sys-utils/mount.8.adoc | 2 +-
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/libmount/src/context.c b/libmount/src/context.c
-index 0323cb23d34..15a8ad3bbd0 100644
---- a/libmount/src/context.c
-+++ b/libmount/src/context.c
-@@ -530,9 +530,6 @@ int mnt_context_is_xnocanonicalize(
- 	assert(cxt);
- 	assert(type);
- 
--	if (mnt_context_is_nocanonicalize(cxt))
--		return 1;
--
- 	ol = mnt_context_get_optlist(cxt);
- 	if (!ol)
- 		return 0;
-diff --git a/sys-utils/mount.8.adoc b/sys-utils/mount.8.adoc
-index 4f23f8d1f0e..5103b91c578 100644
---- a/sys-utils/mount.8.adoc
-+++ b/sys-utils/mount.8.adoc
-@@ -756,7 +756,7 @@ Allow to make a target directory (mountpoint) if it does not exist yet. The opti
- *X-mount.nocanonicalize*[**=**_type_]::
- Allows disabling of canonicalization for mount source and target paths. By default, the `mount` command resolves all paths to their absolute paths without symlinks. However, this behavior may not be desired in certain situations, such as when binding a mount over a symlink, or a symlink over a directory or another symlink. The optional argument _type_ can be either "source" or "target" (mountpoint). If no _type_ is specified, then canonicalization is disabled for both types. This mount option does not affect the conversion of source tags (e.g. LABEL= or UUID=) and fstab processing.
- +
--The command line option *--no-canonicalize* overrides this mount option and affects all path and tag conversions in all situations, but it does not modify flags for open_tree syscalls.
-+The command-line option *--no-canonicalize* overrides this mount option and affects all path and tag conversions in all situations, but for backward compatibility, it does not modify open_tree syscall flags and does not allow the bind-mount over a symlink use case.
- +
- Note that *mount*(8) still sanitizes and canonicalizes the source and target paths specified on the command line by non-root users, regardless of the X-mount.nocanonicalize setting.
- 
diff --git a/pkgs/by-name/ut/util-linux/libmount-subdir-remove-unused-code.patch b/pkgs/by-name/ut/util-linux/libmount-subdir-remove-unused-code.patch
deleted file mode 100644
index 557924570c84..000000000000
--- a/pkgs/by-name/ut/util-linux/libmount-subdir-remove-unused-code.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cfb80587da7bf3d6a8eeb9b846702d6d731aa1c6 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Wed, 9 Apr 2025 11:32:08 +0200
-Subject: [PATCH] libmount: (subdir) remove unused code
-
-The optlist already handles quoted values, so there's no need to do it
-in the callers.
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
-(cherry picked from commit 5462fa3435544344727b8644205ae427dfd5fcba)
----
- libmount/src/hook_subdir.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/libmount/src/hook_subdir.c b/libmount/src/hook_subdir.c
-index 5949af7d8..1e5d79958 100644
---- a/libmount/src/hook_subdir.c
-+++ b/libmount/src/hook_subdir.c
-@@ -329,9 +329,6 @@ static int is_subdir_required(struct libmnt_context *cxt, int *rc, char **subdir
- 
- 	dir = mnt_opt_get_value(opt);
- 
--	if (dir && *dir == '"')
--		dir++;
--
- 	if (!dir || !*dir) {
- 		DBG(HOOK, ul_debug("failed to parse X-mount.subdir '%s'", dir));
- 		*rc = -MNT_ERR_MOUNTOPT;
--- 
-2.49.0
-
diff --git a/pkgs/by-name/ut/util-linux/libmount-subdir-restrict-for-real-mounts-only.patch b/pkgs/by-name/ut/util-linux/libmount-subdir-restrict-for-real-mounts-only.patch
deleted file mode 100644
index d96a303a9cc4..000000000000
--- a/pkgs/by-name/ut/util-linux/libmount-subdir-restrict-for-real-mounts-only.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 22b91501d30a65d25ecf48ce5169ec70848117b8 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Wed, 9 Apr 2025 12:15:57 +0200
-Subject: [PATCH] libmount: (subdir) restrict for real mounts only
-
-It's now possible to use, for example, for bind operations, but it
-does not make sense as you can specify the target with the
-subdirectory.
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
-(cherry picked from commit 437a271f7108f689d350f1b3d837490d3d283c3c)
----
- libmount/src/hook_subdir.c | 21 ++++++++++++++++-----
- sys-utils/mount.8.adoc     |  6 ++++--
- 2 files changed, 20 insertions(+), 7 deletions(-)
-
-diff --git a/libmount/src/hook_subdir.c b/libmount/src/hook_subdir.c
-index 1e5d79958..7cbb2c88d 100644
---- a/libmount/src/hook_subdir.c
-+++ b/libmount/src/hook_subdir.c
-@@ -313,6 +313,7 @@ static int is_subdir_required(struct libmnt_context *cxt, int *rc, char **subdir
- 	struct libmnt_optlist *ol;
- 	struct libmnt_opt *opt;
- 	const char *dir = NULL;
-+	unsigned long flags = 0;
- 
- 	assert(cxt);
- 	assert(rc);
-@@ -328,16 +329,26 @@ static int is_subdir_required(struct libmnt_context *cxt, int *rc, char **subdir
- 		return 0;
- 
- 	dir = mnt_opt_get_value(opt);
--
- 	if (!dir || !*dir) {
- 		DBG(HOOK, ul_debug("failed to parse X-mount.subdir '%s'", dir));
- 		*rc = -MNT_ERR_MOUNTOPT;
--	} else {
--		*subdir = strdup(dir);
--		if (!*subdir)
--			*rc = -ENOMEM;
-+		return 0;
-+	}
-+
-+	*rc = mnt_optlist_get_flags(ol, &flags, cxt->map_linux, 0);
-+	if (*rc)
-+		return 0;
-+
-+	if (flags & MS_REMOUNT || flags & MS_BIND || flags & MS_MOVE
-+	    || mnt_context_propagation_only(cxt)) {
-+		DBG(HOOK, ul_debug("ignore subdir= (bind/move/remount/..)"));
-+		return 0;
- 	}
- 
-+	*subdir = strdup(dir);
-+	if (!*subdir)
-+		*rc = -ENOMEM;
-+
- 	return *rc == 0;
- }
- 
-diff --git a/sys-utils/mount.8.adoc b/sys-utils/mount.8.adoc
-index 6a17cd5eb..d9ce31fd4 100644
---- a/sys-utils/mount.8.adoc
-+++ b/sys-utils/mount.8.adoc
-@@ -763,8 +763,10 @@ Note that *mount*(8) still sanitizes and canonicalizes the source and target pat
- *X-mount.noloop*::
- Do not create and mount a loop device, even if the source of the mount is a regular file.
- 
--*X-mount.subdir=*__directory__::
--Allow mounting sub-directory from a filesystem instead of the root directory. For now, this feature is implemented by temporary filesystem root directory mount in unshared namespace and then bind the sub-directory to the final mount point and umount the root of the filesystem. The sub-directory mount shows up atomically for the rest of the system although it is implemented by multiple *mount*(2) syscalls.
-+**X-mount.subdir=**_directory_::
-+Allow mounting a subdirectory of a filesystem instead of the root directory. This is effective only when a new instance of a filesystem is attached to the system. The option is silently ignored for operations like remount, bind mount, or move.
-++
-+For now, this feature is implemented by a temporary filesystem root-directory mount in an unshared namespace and then binding the sub-directory to the final mount point and unmounting the root of the filesystem. The sub-directory mount shows up atomically for the rest of the system although it is implemented by multiple *mount*(2) syscalls.
- +
- Note that this feature will not work in session with an unshared private mount namespace (after *unshare --mount*) on old kernels or with *mount*(8) without support for file-descriptors-based mount kernel API. In this case, you need *unshare --mount --propagation shared*.
- +
--- 
-2.49.0
-
diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index d93f0deb29a2..b11fcc6b81df 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -36,23 +36,16 @@ let
 in
 stdenv.mkDerivation (finalPackage: rec {
   pname = "util-linux" + lib.optionalString isMinimal "-minimal";
-  version = "2.41";
+  version = "2.41.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz";
-    hash = "sha256-ge6Ts8/f6318QJDO3rode7zpFB/QtQG2hrP+R13cpMY=";
+    hash = "sha256-vprZonb0MFq33S9SJci+H/VDUvVl/03t6WKMGqp97Fc=";
   };
 
   patches =
     [
       ./rtcwake-search-PATH-for-shutdown.patch
-      # https://github.com/util-linux/util-linux/pull/3013
-      ./fix-darwin-build.patch
-      # https://github.com/util-linux/util-linux/pull/3479 (fixes https://github.com/util-linux/util-linux/issues/3474)
-      ./fix-mount-regression.patch
-      # https://github.com/util-linux/util-linux/pull/3530
-      ./libmount-subdir-remove-unused-code.patch
-      ./libmount-subdir-restrict-for-real-mounts-only.patch
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
       (fetchurl {

From 5cc59d724d5c76cea8b8193d12e2d4d9eb79e414 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 20 Jul 2025 08:42:58 +0100
Subject: [PATCH 0185/3724] libopenmpt: 0.8.1 -> 0.8.2

Changes: https://lib.openmpt.org/libopenmpt/2025/07/19/security-updates-0.8.2-0.7.15-0.6.24-0.5.37-0.4.50/
---
 pkgs/by-name/li/libopenmpt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libopenmpt/package.nix b/pkgs/by-name/li/libopenmpt/package.nix
index 34c48151f8bf..b10cd2580da1 100644
--- a/pkgs/by-name/li/libopenmpt/package.nix
+++ b/pkgs/by-name/li/libopenmpt/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libopenmpt";
-  version = "0.8.1";
+  version = "0.8.2";
 
   outputs = [
     "out"
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
-    hash = "sha256-XMwpHkRXkl88o+gUT1tkXEo9zCvAXcmjllETKzK4O84=";
+    hash = "sha256-hE5P+Y29mUK75KEEgib5H4vFtGC3vsZInmfO2z4KrDc=";
   };
 
   enableParallelBuilding = true;

From 27a63981b7d545358c6a543f994e3163a49e2d3b Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <kaction.cc@gmail.com>
Date: Sun, 20 Jul 2025 17:46:30 +0000
Subject: [PATCH 0186/3724] bash: Drop gcc-15 compatibility workaround for
 bash-5.2

Bash=5.3 does not need it.
---
 pkgs/shells/bash/5.nix | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix
index 03761110b942..9a4e81572852 100644
--- a/pkgs/shells/bash/5.nix
+++ b/pkgs/shells/bash/5.nix
@@ -127,31 +127,10 @@ lib.warnIf (withDocs != null)
 
     enableParallelBuilding = true;
 
-    makeFlags =
-      lib.optionals stdenv.hostPlatform.isCygwin [
-        "LOCAL_LDFLAGS=-Wl,--export-all,--out-implib,libbash.dll.a"
-        "SHOBJ_LIBS=-lbash"
-      ]
-      # GNU Bash extensively uses function prototypes with unspecified signature, like
-      #
-      #     extern void add_unwind_protect ()
-      #
-      # to implicitly cast all kinds of word-sized arguments. GCC-15 switched C standard
-      # from gnu17 to gnu23, which changed the meaning of the prototype above to
-      #
-      #     extern void add_unwind_protect (void)
-      #
-      # Note that Bash 5.3, quoting the release announcement:
-      #
-      # > The source code has been updated for C23 conformance. This means that bash
-      # > will no longer compile with K&R-style C compilers.
-      #
-      # So this workaround won't be necessary after upgrade to bash=5.3.
-      #
-      # => https://lists.gnu.org/archive/html/bug-bash/2025-07/msg00005.html
-      #
-      #      ~kaction 2025-07-19
-      ++ [ "LOCAL_CFLAGS=-std=c99" ];
+    makeFlags = lib.optionals stdenv.hostPlatform.isCygwin [
+      "LOCAL_LDFLAGS=-Wl,--export-all,--out-implib,libbash.dll.a"
+      "SHOBJ_LIBS=-lbash"
+    ];
 
     nativeCheckInputs = [ util-linux ];
     doCheck = false; # dependency cycle, needs to be interactive

From 07bce58d9c4c7a3be573688ff62f750b24fceacd Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 21 Jul 2025 14:06:01 +0200
Subject: [PATCH 0187/3724] cc-wrapper: Workaround gnuabielfv{1,2} support
 deficiency on Clang

Clang cannot handle the gnuabielfv{1,2} ABI specification in the triplet properly. It used to parse it as just "gnu", disregarding the ABI version in it and defaulting to ELFv1. Now, it completely fails to parse such target triplet:

> clang: error: version 'abielfv1' in target triple 'powerpc64-unknown-linux-gnuabielfv1' is invalid

So when it comes time to passing the target triplet to Clang, handle this support deficiency:

1. If the triplet ends in gnuabielfv*, shorten it to just gnu. This makes it get parsed properly.
2. After the above, re-add the ABI via the separate -mabi option. This makes it use the correct ABI for the platform.
---
 .../cc-wrapper/add-clang-cc-cflags-before.sh  |  4 +++
 pkgs/build-support/cc-wrapper/default.nix     | 26 ++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
index b56bb39c97a9..2b7cd00783a5 100644
--- a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
+++ b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
@@ -30,4 +30,8 @@ if $targetPassed && [[ "$targetValue" != "@defaultTarget@" ]] && (( "${NIX_CC_WR
     echo "Warning: supplying the --target $targetValue != @defaultTarget@ argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2
 elif [[ $0 != *cpp ]]; then
     extraBefore+=(-target @defaultTarget@ @machineFlags@)
+
+    if [[ "@explicitAbiValue@" != "" ]]; then
+        extraBefore+=(-mabi=@explicitAbiValue@)
+    fi
 fi
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index eecaacbd6fea..5aa688ebd6ba 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -94,12 +94,14 @@ let
     getLib
     getName
     getVersion
+    hasPrefix
     mapAttrsToList
     optional
     optionalAttrs
     optionals
     optionalString
     removePrefix
+    removeSuffix
     replaceStrings
     toList
     versionAtLeast
@@ -900,12 +902,24 @@ stdenvNoCC.mkDerivation {
     ## General Clang support
     ## Needs to go after ^ because the for loop eats \n and makes this file an invalid script
     ##
-    + optionalString isClang ''
-      # Escape twice: once for this script, once for the one it gets substituted into.
-      export machineFlags=${escapeShellArg (escapeShellArgs machineFlags)}
-      export defaultTarget=${targetPlatform.config}
-      substituteAll ${./add-clang-cc-cflags-before.sh} $out/nix-support/add-local-cc-cflags-before.sh
-    ''
+    + optionalString isClang (
+      let
+        hasUnsupportedGnuSuffix = hasPrefix "gnuabielfv" targetPlatform.parsed.abi.name;
+        clangCompatibleConfig =
+          if hasUnsupportedGnuSuffix then
+            removeSuffix (removePrefix "gnu" targetPlatform.parsed.abi.name) targetPlatform.config
+          else
+            targetPlatform.config;
+        explicitAbiValue = if hasUnsupportedGnuSuffix then targetPlatform.parsed.abi.abi else "";
+      in
+      ''
+        # Escape twice: once for this script, once for the one it gets substituted into.
+        export machineFlags=${escapeShellArg (escapeShellArgs machineFlags)}
+        export defaultTarget=${clangCompatibleConfig}
+        export explicitAbiValue=${explicitAbiValue}
+        substituteAll ${./add-clang-cc-cflags-before.sh} $out/nix-support/add-local-cc-cflags-before.sh
+      ''
+    )
 
     ##
     ## Extra custom steps

From b3aa22052fdebcde862a38808411b27b04458c64 Mon Sep 17 00:00:00 2001
From: stupidcomputer <ryan@beepboop.systems>
Date: Mon, 21 Jul 2025 14:16:08 -0500
Subject: [PATCH 0188/3724] maintainers: add stupidcomputer

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f76d0a3dfb97..480d02be1d5f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24232,6 +24232,12 @@
     githubId = 1315818;
     name = "Felix Bühler";
   };
+  stupidcomputer = {
+    email = "ryan@beepboop.systems";
+    github = "stupidcomputer";
+    githubId = 108326967;
+    name = "Ryan Marina";
+  };
   stupremee = {
     email = "jutus.k@protonmail.com";
     github = "Stupremee";

From 8f1b5b616633147e527d150ec3db6efd95ee2e39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 16:21:39 +0000
Subject: [PATCH 0189/3724] lua51Packages.luarocks_bootstrap: 3.12.0 -> 3.12.2

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

diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index 9cb4a80efa66..6efe713d08ca 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luarocks_bootstrap";
-  version = "3.12.0";
+  version = "3.12.2";
 
   src = fetchFromGitHub {
     owner = "luarocks";
     repo = "luarocks";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PGK4gjEhCJt2+0viNU0/qJBBOxPIy2swXplQOolmP2E=";
+    hash = "sha256-hQysstYGUcZnnEXL+9ECS0sBViYggeDIMgo6LpUexBA=";
   };
 
   patches = [

From 45f72c00e2e921e37c24f7840bccee98dee68423 Mon Sep 17 00:00:00 2001
From: Eric Roberts <eric@ericroberts.dev>
Date: Sun, 20 Jul 2025 18:08:10 +0000
Subject: [PATCH 0190/3724] karakeep: 0.25.0 -> 0.26.0

---
 pkgs/by-name/ka/karakeep/package.nix             |  8 ++++----
 .../patches/dont-lock-pnpm-version.patch         | 16 ++++------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ka/karakeep/package.nix b/pkgs/by-name/ka/karakeep/package.nix
index d901f1ad09e2..f85048581e5c 100644
--- a/pkgs/by-name/ka/karakeep/package.nix
+++ b/pkgs/by-name/ka/karakeep/package.nix
@@ -17,13 +17,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "karakeep";
-  version = "0.25.0";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "karakeep-app";
     repo = "karakeep";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eAiRvesUZIwTaj7CSxtI4rkGlTkgVjbzzwjYaXlhSuo=";
+    hash = "sha256-t5mQmrBrXc1wl5PRCdEHZvIEMxeCokrd0x4YhZU+qE0=";
   };
 
   patches = [
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     };
 
     fetcherVersion = 1;
-    hash = "sha256-yf8A0oZ0Y4A5k7gfinIU02Lbqp/ygyvIBlldS0pv5+0=";
+    hash = "sha256-8NdYEcslo9dxSyJbNWzO81/MrDLO+QyrhQN1hwM0/j4=";
   };
   buildPhase = ''
     runHook preBuild
@@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
         package = finalAttrs.finalPackage;
         # remove hardcoded version if upstream syncs general version with cli
         # version
-        version = "0.23.0";
+        version = "0.25.0";
       };
     };
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch b/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch
index 52463f9b0ad2..43a546386af8 100644
--- a/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch
+++ b/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch
@@ -1,6 +1,6 @@
-The Hoarder project uses a very specific version of pnpm (9.0.0-alpha.8) and
-will fail to build with other pnpm versions. Instead of adding this pnpm
-version to nixpkgs, we override this requirement and use the latest v9 release.
+Karakeep uses a specific version of pnpm and will fail to build with other pnpm
+versions. Instead of adding this pnpm version to nixpkgs, we override this
+requirement.
 
 ---
 --- a/package.json
@@ -9,16 +9,8 @@ version to nixpkgs, we override this requirement and use the latest v9 release.
      "turbo": "^2.1.2"
    },
    "prettier": "@karakeep/prettier-config",
--  "packageManager": "pnpm@9.0.0-alpha.8+sha256.a433a59569b00389a951352956faf25d1fdf43b568213fbde591c36274d4bc30",
+-  "packageManager": "pnpm@9.15.9",
 +  "packageManager": "pnpm",
    "pnpm": {
      "patchedDependencies": {
        "xcode@3.0.1": "patches/xcode@3.0.1.patch"
---- a/pnpm-lock.yaml
-+++ b/pnpm-lock.yaml
-@@ -1,4 +1,4 @@
--lockfileVersion: '7.0'
-+lockfileVersion: '9.0'
- 
- settings:
-   autoInstallPeers: true

From bd554819709ea70f397965aec1696fb38e1c3e7b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 21 Jul 2025 16:48:03 +0200
Subject: [PATCH 0191/3724] cacert: 3.113.1 -> 3.114

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_114.rst
---
 pkgs/by-name/ca/cacert/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ca/cacert/package.nix b/pkgs/by-name/ca/cacert/package.nix
index 0ff9953cdc89..67f54f65cc11 100644
--- a/pkgs/by-name/ca/cacert/package.nix
+++ b/pkgs/by-name/ca/cacert/package.nix
@@ -23,7 +23,7 @@ let
     lib.concatStringsSep "\n\n" extraCertificateStrings
   );
 
-  srcVersion = "3.113.1";
+  srcVersion = "3.114";
   version = if nssOverride != null then nssOverride.version else srcVersion;
   meta = with lib; {
     homepage = "https://curl.haxx.se/docs/caextract.html";
@@ -47,7 +47,7 @@ let
           owner = "nss-dev";
           repo = "nss";
           rev = "NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM";
-          hash = "sha256-Yfs9Hh98ASJe1D4qyQEXaTC2xjeDI2Cdxp5Xgy0rYdQ=";
+          hash = "sha256-YVtXk1U9JtqfOH7+m/+bUI/yXJcydqjjGbCy/5xbMe8=";
         };
 
     dontBuild = true;

From 9895bd603dd6a3419a180b58e29b8d394cf1c138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Tue, 22 Jul 2025 10:56:32 +0200
Subject: [PATCH 0192/3724] haskellPackages.Agda: fix build on aarch64-darwin

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

diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index 56a86a5c74bf..bee95e9cb502 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -393,8 +393,12 @@ self: super:
       libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
     }) (disableCabalFlag "fixity-th" super.fourmolu);
 
-    # https://github.com/NixOS/nixpkgs/issues/149692
-    Agda = disableCabalFlag "optimise-heavily" super.Agda;
+    Agda = lib.pipe super.Agda [
+      # https://github.com/NixOS/nixpkgs/issues/149692
+      (disableCabalFlag "optimise-heavily")
+      # https://github.com/agda/agda/issues/8016
+      (appendConfigureFlag "--ghc-option=-Wwarn=deprecations")
+    ];
 
     # https://github.com/NixOS/nixpkgs/issues/198495
     eventsourcing-postgresql = dontCheck super.eventsourcing-postgresql;

From 3641b16de0c259a404a4d4297cf91038e7351bba Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 22 Jul 2025 09:28:21 +0200
Subject: [PATCH 0193/3724] haskellPackages: unbreak packages

Ran maintainers/scripts/haskell/unbreak.nu.

(generated by
maintainers/scripts/haskell/regenerate-hackage-packages.sh)
---
 .../configuration-hackage2nix/broken.yaml     | 33 --------
 .../transitive-broken.yaml                    | 19 +----
 .../haskell-modules/hackage-packages.nix      | 80 +------------------
 3 files changed, 5 insertions(+), 127 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index ff7ec02444af..373e989c9ff5 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -375,7 +375,6 @@ broken-packages:
   - base32-lens # failure in job https://hydra.nixos.org/build/233226670 at 2023-09-02
   - base58address # failure in job https://hydra.nixos.org/build/233221633 at 2023-09-02
   - base62 # failure in job https://hydra.nixos.org/build/233250040 at 2023-09-02
-  - base64-bytes # failure in job https://hydra.nixos.org/build/295091866 at 2025-04-22
   - base64-conduit # failure in job https://hydra.nixos.org/build/233197196 at 2023-09-02
   - base64-lens # failure in job https://hydra.nixos.org/build/233252600 at 2023-09-02
   - based # failure in job https://hydra.nixos.org/build/233211900 at 2023-09-02
@@ -718,7 +717,6 @@ broken-packages:
   - Cassava # failure in job https://hydra.nixos.org/build/233245677 at 2023-09-02
   - cassava-conduit # failure in job https://hydra.nixos.org/build/233220495 at 2023-09-02
   - cassava-records # failure in job https://hydra.nixos.org/build/233259049 at 2023-09-02
-  - cassette # failure in job https://hydra.nixos.org/build/233201251 at 2023-09-02
   - castle # failure in job https://hydra.nixos.org/build/233204027 at 2023-09-02
   - catamorphism # failure in job https://hydra.nixos.org/build/233208488 at 2023-09-02
   - Catana # failure in job https://hydra.nixos.org/build/233196550 at 2023-09-02
@@ -871,8 +869,6 @@ broken-packages:
   - cmph # failure in job https://hydra.nixos.org/build/233225766 at 2023-09-02
   - CMQ # failure in job https://hydra.nixos.org/build/233233168 at 2023-09-02
   - cmt # failure in job https://hydra.nixos.org/build/233233474 at 2023-09-02
-  - co-log-concurrent # failure in job https://hydra.nixos.org/build/295092333 at 2025-04-22
-  - co-log-json # failure in job https://hydra.nixos.org/build/295092337 at 2025-04-22
   - co-log-polysemy-formatting # failure building executable 'example' in job https://hydra.nixos.org/build/237249360 at 2023-10-21
   - co-log-sys # failure in job https://hydra.nixos.org/build/233206587 at 2023-09-02
   - cobot-tools # failure in job https://hydra.nixos.org/build/233259173 at 2023-09-02
@@ -1015,7 +1011,6 @@ broken-packages:
   - contra-tracers # failure in job https://hydra.nixos.org/build/233197959 at 2023-09-02
   - contracheck-applicative # failure in job https://hydra.nixos.org/build/233255104 at 2023-09-02
   - Contract # failure in job https://hydra.nixos.org/build/233242103 at 2023-09-02
-  - control-block # failure in job https://hydra.nixos.org/build/295092490 at 2025-04-22
   - control-dsl # failure in job https://hydra.nixos.org/build/233249037 at 2023-09-02
   - control-iso # failure in job https://hydra.nixos.org/build/233229763 at 2023-09-02
   - control-monad-failure # failure in job https://hydra.nixos.org/build/233240265 at 2023-09-02
@@ -1305,9 +1300,7 @@ broken-packages:
   - dia-base # failure in job https://hydra.nixos.org/build/233230896 at 2023-09-02
   - diagnose # failure in job https://hydra.nixos.org/build/233231767 at 2023-09-02
   - diagrams-boolean # failure in job https://hydra.nixos.org/build/233202036 at 2023-09-02
-  - diagrams-gtk # failure in job https://hydra.nixos.org/build/295092833 at 2025-04-22
   - diagrams-haddock # failure in job https://hydra.nixos.org/build/295092844 at 2025-04-22
-  - diagrams-pandoc # failure in job https://hydra.nixos.org/build/295092840 at 2025-04-22
   - diagrams-pdf # failure in job https://hydra.nixos.org/build/233197864 at 2023-09-02
   - diagrams-qrcode # failure in job https://hydra.nixos.org/build/233229542 at 2023-09-02
   - diagrams-rubiks-cube # failure in job https://hydra.nixos.org/build/233213426 at 2023-09-02
@@ -1349,7 +1342,6 @@ broken-packages:
   - direm # failure in job https://hydra.nixos.org/build/233211496 at 2023-09-02
   - dirstream # failure in job https://hydra.nixos.org/build/273442606 at 2024-10-01
   - disco # failure in job https://hydra.nixos.org/build/233212298 at 2023-09-02
-  - discord-haskell # failure in job https://hydra.nixos.org/build/295092870 at 2025-04-22
   - discord-register # failure in job https://hydra.nixos.org/build/295092898 at 2025-04-22
   - discord-types # failure in job https://hydra.nixos.org/build/233251778 at 2023-09-02
   - discordian-calendar # failure in job https://hydra.nixos.org/build/233218124 at 2023-09-02
@@ -1401,7 +1393,6 @@ broken-packages:
   - DOH # failure in job https://hydra.nixos.org/build/233231913 at 2023-09-02
   - doi # failure in job https://hydra.nixos.org/build/295092999 at 2025-04-22
   - dom-events # failure in job https://hydra.nixos.org/build/233231199 at 2023-09-02
-  - dom-parser # failure in job https://hydra.nixos.org/build/233235797 at 2023-09-02
   - dom-selector # failure in job https://hydra.nixos.org/build/233212663 at 2023-09-02
   - domaindriven-core # failure in job https://hydra.nixos.org/build/233234739 at 2023-09-02
   - dominion # failure in job https://hydra.nixos.org/build/252714022 at 2024-03-16
@@ -1409,7 +1400,6 @@ broken-packages:
   - dormouse-uri # failure in job https://hydra.nixos.org/build/233191706 at 2023-09-02
   - dot-linker # failure in job https://hydra.nixos.org/build/233237512 at 2023-09-02
   - dotfs # failure in job https://hydra.nixos.org/build/233200762 at 2023-09-02
-  - double-x-encoding # failure in job https://hydra.nixos.org/build/253694746 at 2024-03-31
   - doublezip # failure in job https://hydra.nixos.org/build/233219270 at 2023-09-02
   - doublify-toolkit # failure in job https://hydra.nixos.org/build/233223302 at 2023-09-02
   - dovin # failure in job https://hydra.nixos.org/build/252714139 at 2024-03-16
@@ -1446,7 +1436,6 @@ broken-packages:
   - dualizer # failure in job https://hydra.nixos.org/build/233237592 at 2023-09-02
   - duckling # failure in job https://hydra.nixos.org/build/233247880 at 2023-09-02
   - duet # failure in job https://hydra.nixos.org/build/233219004 at 2023-09-02
-  - dumb-cas # failure in job https://hydra.nixos.org/build/252730634 at 2024-03-16
   - dump-core # failure in job https://hydra.nixos.org/build/233244428 at 2023-09-02
   - dunai-core # failure in job https://hydra.nixos.org/build/233255804 at 2023-09-02
   - Dung # failure in job https://hydra.nixos.org/build/233206343 at 2023-09-02
@@ -1507,7 +1496,6 @@ broken-packages:
   - editline # failure in job https://hydra.nixos.org/build/233259515 at 2023-09-02
   - edits # failure in job https://hydra.nixos.org/build/295093075 at 2025-04-22
   - effect-handlers # failure in job https://hydra.nixos.org/build/233234988 at 2023-09-02
-  - effect-stack # failure in job https://hydra.nixos.org/build/233212358 at 2023-09-02
   - effectful-st # failure in job https://hydra.nixos.org/build/233248591 at 2023-09-02
   - effectful-zoo # failure in job https://hydra.nixos.org/build/283208805 at 2024-12-31
   - effective-aspects # failure in job https://hydra.nixos.org/build/233223120 at 2023-09-02
@@ -1905,7 +1893,6 @@ broken-packages:
   - frown # failure in job https://hydra.nixos.org/build/233208462 at 2023-09-02
   - frp-arduino # failure in job https://hydra.nixos.org/build/233192216 at 2023-09-02
   - frpnow # failure in job https://hydra.nixos.org/build/233236056 at 2023-09-02
-  - fs-api # failure in job https://hydra.nixos.org/build/299137683 at 2025-06-23
   - fs-events # failure in job https://hydra.nixos.org/build/233218231 at 2023-09-02
   - fsh-csv # failure in job https://hydra.nixos.org/build/233220196 at 2023-09-02
   - FSM # failure in job https://hydra.nixos.org/build/233247343 at 2023-09-02
@@ -1926,7 +1913,6 @@ broken-packages:
   - funcons-tools # failure in job https://hydra.nixos.org/build/295122838 at 2025-04-22
   - function-instances-algebra # failure in job https://hydra.nixos.org/build/233202209 at 2023-09-02
   - functional-arrow # failure in job https://hydra.nixos.org/build/295093396 at 2025-04-22
-  - functor-combinators # failure in job https://hydra.nixos.org/build/252714438 at 2024-03-16
   - functor-friends # failure in job https://hydra.nixos.org/build/233208108 at 2023-09-02
   - functor-infix # failure in job https://hydra.nixos.org/build/233228794 at 2023-09-02
   - functor-utils # failure in job https://hydra.nixos.org/build/233213259 at 2023-09-02
@@ -1952,7 +1938,6 @@ broken-packages:
   - fwgl # failure in job https://hydra.nixos.org/build/233246210 at 2023-09-02
   - fwgl-javascript # broken by fwgl, manually entered here, because it does not appear in transitive-broken.yaml at 2024-07-09
   - fx # failure in job https://hydra.nixos.org/build/295093438 at 2025-04-22
-  - fxpak # failure in job https://hydra.nixos.org/build/265955610 at 2024-07-14
   - g-npm # failure in job https://hydra.nixos.org/build/233215965 at 2023-09-02
   - g4ip # failure in job https://hydra.nixos.org/build/233248315 at 2023-09-02
   - gambler # failure in job https://hydra.nixos.org/build/252732701 at 2024-03-16
@@ -1980,7 +1965,6 @@ broken-packages:
   - GeneralTicTacToe # failure in job https://hydra.nixos.org/build/233207939 at 2023-09-02
   - generator # failure in job https://hydra.nixos.org/build/233213384 at 2023-09-02
   - generators # failure in job https://hydra.nixos.org/build/233246459 at 2023-09-02
-  - generic-aeson # failure in job https://hydra.nixos.org/build/233198064 at 2023-09-02
   - generic-binary # failure in job https://hydra.nixos.org/build/233214473 at 2023-09-02
   - generic-church # failure in job https://hydra.nixos.org/build/233213419 at 2023-09-02
   - generic-enum # failure in job https://hydra.nixos.org/build/233220316 at 2023-09-02
@@ -2010,7 +1994,6 @@ broken-packages:
   - gentlemark # failure in job https://hydra.nixos.org/build/233202158 at 2023-09-02
   - genvalidity-appendful # failure in job https://hydra.nixos.org/build/295093519 at 2025-04-22
   - genvalidity-mergeful # failure in job https://hydra.nixos.org/build/295093508 at 2025-04-22
-  - genvalidity-network-uri # failure in job https://hydra.nixos.org/build/299137822 at 2025-06-23
   - geo-resolver # failure in job https://hydra.nixos.org/build/233206563 at 2023-09-02
   - geo-uk # failure in job https://hydra.nixos.org/build/233221284 at 2023-09-02
   - geocode-google # failure in job https://hydra.nixos.org/build/233191594 at 2023-09-02
@@ -2455,7 +2438,6 @@ broken-packages:
   - haskelldb-wx # failure in job https://hydra.nixos.org/build/233197525 at 2023-09-02
   - HaskellForMaths # failure in job https://hydra.nixos.org/build/233237608 at 2023-09-02
   - HaskellLM # failure in job https://hydra.nixos.org/build/233237641 at 2023-09-02
-  - HaskellNet # failure in job https://hydra.nixos.org/build/295091001 at 2025-04-22
   - HaskellNN # failure in job https://hydra.nixos.org/build/233209323 at 2023-09-02
   - Haskelloids # failure in job https://hydra.nixos.org/build/233204861 at 2023-09-02
   - haskellscrabble # failure in job https://hydra.nixos.org/build/233251248 at 2023-09-02
@@ -2471,7 +2453,6 @@ broken-packages:
   - haskoin # failure in job https://hydra.nixos.org/build/233201668 at 2023-09-02
   - haskoin-store # failure in job https://hydra.nixos.org/build/299138382 at 2025-06-23
   - haskoin-util # failure in job https://hydra.nixos.org/build/233222171 at 2023-09-02
-  - haskoin-wallet # failure in job https://hydra.nixos.org/build/233206922 at 2023-09-02
   - haskore-realtime # failure in job https://hydra.nixos.org/build/301391170 at 2025-07-01
   - haskore-vintage # failure in job https://hydra.nixos.org/build/233230742 at 2023-09-02
   - HaskRel # failure in job https://hydra.nixos.org/build/295090970 at 2025-04-22
@@ -2880,7 +2861,6 @@ broken-packages:
   - hs-scrape # failure in job https://hydra.nixos.org/build/233244221 at 2023-09-02
   - hs-server-starter # failure in job https://hydra.nixos.org/build/295094379 at 2025-04-22
   - hs-snowtify # failure in job https://hydra.nixos.org/build/233200511 at 2023-09-02
-  - hs-speedscope # failure in job https://hydra.nixos.org/build/295094385 at 2025-04-22
   - hs-tags # failure in job https://hydra.nixos.org/build/233258358 at 2023-09-02
   - hs-tango # failure in job https://hydra.nixos.org/build/276377558 at 2024-11-06
   - hs-term-emulator # failure in job https://hydra.nixos.org/build/233252262 at 2023-09-02
@@ -3221,7 +3201,6 @@ broken-packages:
   - interspersed # failure in job https://hydra.nixos.org/build/252722645 at 2024-03-16
   - interval # failure in job https://hydra.nixos.org/build/233239434 at 2023-09-02
   - interval-algebra # failure in job https://hydra.nixos.org/build/233208487 at 2023-09-02
-  - interval-patterns # failure in job https://hydra.nixos.org/build/239259401 at 2023-11-10
   - interval-tree-clock # failure in job https://hydra.nixos.org/build/233234316 at 2023-09-02
   - IntFormats # failure in job https://hydra.nixos.org/build/233195190 at 2023-09-02
   - intricacy # failure in job https://hydra.nixos.org/build/252711846 at 2024-03-16
@@ -3259,7 +3238,6 @@ broken-packages:
   - isdicom # failure in job https://hydra.nixos.org/build/233214249 at 2023-09-02
   - IsNull # failure in job https://hydra.nixos.org/build/233233011 at 2023-09-02
   - iso-deriving # failure in job https://hydra.nixos.org/build/252738238 at 2024-03-16
-  - iso8601-duration # failure in job https://hydra.nixos.org/build/233190968 at 2023-09-02
   - isobmff # failure in job https://hydra.nixos.org/build/233237273 at 2023-09-02
   - isotope # failure in job https://hydra.nixos.org/build/233204650 at 2023-09-02
   - it-has # failure in job https://hydra.nixos.org/build/233212395 at 2023-09-02
@@ -3995,7 +3973,6 @@ broken-packages:
   - monoid-absorbing # failure in job https://hydra.nixos.org/build/233236465 at 2023-09-02
   - monoid-owns # failure in job https://hydra.nixos.org/build/233259043 at 2023-09-02
   - monoidmap # failure in job https://hydra.nixos.org/build/295095498 at 2025-04-22
-  - monoidmap-internal # failure in job https://hydra.nixos.org/build/295095513 at 2025-04-22
   - monoidplus # failure in job https://hydra.nixos.org/build/233226759 at 2023-09-02
   - monoids # failure in job https://hydra.nixos.org/build/233231684 at 2023-09-02
   - monopati # failure in job https://hydra.nixos.org/build/233234119 at 2023-09-02
@@ -4026,7 +4003,6 @@ broken-packages:
   - ms-auth # failure in job https://hydra.nixos.org/build/233193383 at 2023-09-02
   - ms-azure-api # failure in job https://hydra.nixos.org/build/233202229 at 2023-09-02
   - ms-graph-api # failure in job https://hydra.nixos.org/build/233219042 at 2023-09-02
-  - msgpack # failure in job https://hydra.nixos.org/build/233258131 at 2023-09-02
   - msgpack-types # failure in job https://hydra.nixos.org/build/233235351 at 2023-09-02
   - msh # failure in job https://hydra.nixos.org/build/233196466 at 2023-09-02
   - MTGBuilder # failure in job https://hydra.nixos.org/build/233227528 at 2023-09-02
@@ -4273,7 +4249,6 @@ broken-packages:
   - ohhecs # failure in job https://hydra.nixos.org/build/267987310 at 2024-07-31
   - ohloh-hs # failure in job https://hydra.nixos.org/build/233228177 at 2023-09-02
   - oi # failure in job https://hydra.nixos.org/build/233190838 at 2023-09-02
-  - oidc-client # failure in job https://hydra.nixos.org/build/295095776 at 2025-04-22
   - okapi # failure in job https://hydra.nixos.org/build/233193822 at 2023-09-02
   - old-version # failure in job https://hydra.nixos.org/build/233198538 at 2023-09-02
   - ollama-haskell # failure in job https://hydra.nixos.org/build/276371507 at 2024-11-06
@@ -4331,7 +4306,6 @@ broken-packages:
   - openssh-protocol # failure in job https://hydra.nixos.org/build/233196013 at 2023-09-02
   - opentelemetry-extra # failure in job https://hydra.nixos.org/build/233194254 at 2023-09-02
   - opentelemetry-http-client # failure in job https://hydra.nixos.org/build/233221983 at 2023-09-02
-  - opentelemetry-plugin # failure in job https://hydra.nixos.org/build/295095836 at 2025-04-22
   - opentheory-char # failure in job https://hydra.nixos.org/build/233222347 at 2023-09-02
   - opentype # failure in job https://hydra.nixos.org/build/233213443 at 2023-09-02
   - OpenVGRaw # failure in job https://hydra.nixos.org/build/233254457 at 2023-09-02
@@ -4738,7 +4712,6 @@ broken-packages:
   - pontarius-xpmn # failure in job https://hydra.nixos.org/build/233217546 at 2023-09-02
   - pool # failure in job https://hydra.nixos.org/build/233205364 at 2023-09-02
   - pool-conduit # failure in job https://hydra.nixos.org/build/233246643 at 2023-09-02
-  - poolboy # failure in job https://hydra.nixos.org/build/233195085 at 2023-09-02
   - pop3-client # failure in job https://hydra.nixos.org/build/233251475 at 2023-09-02
   - popkey # failure in job https://hydra.nixos.org/build/233203892 at 2023-09-02
   - poppler # failure in job https://hydra.nixos.org/build/233196044 at 2023-09-02
@@ -4978,7 +4951,6 @@ broken-packages:
   - quickbooks # failure in job https://hydra.nixos.org/build/233227666 at 2023-09-02
   - quickcheck-arbitrary-template # failure in job https://hydra.nixos.org/build/233223045 at 2023-09-02
   - quickcheck-combinators # failure in job https://hydra.nixos.org/build/233209131 at 2023-09-02
-  - quickcheck-lockstep # failure in job https://hydra.nixos.org/build/295096463 at 2025-04-22
   - quickcheck-property-comb # failure in job https://hydra.nixos.org/build/233204877 at 2023-09-02
   - quickcheck-property-monad # failure in job https://hydra.nixos.org/build/233228775 at 2023-09-02
   - quickcheck-rematch # failure in job https://hydra.nixos.org/build/233205449 at 2023-09-02
@@ -5400,7 +5372,6 @@ broken-packages:
   - servant-avro # failure in job https://hydra.nixos.org/build/233225632 at 2023-09-02
   - servant-benchmark # failure in job https://hydra.nixos.org/build/233203748 at 2023-09-02
   - servant-cassava # failure in job https://hydra.nixos.org/build/252730906 at 2024-03-16
-  - servant-cli # failure in job https://hydra.nixos.org/build/233259212 at 2023-09-02
   - servant-client-js # failure in job https://hydra.nixos.org/build/233194725 at 2023-09-02
   - servant-combinators # failure in job https://hydra.nixos.org/build/233249924 at 2023-09-02
   - servant-db # failure in job https://hydra.nixos.org/build/233234946 at 2023-09-02
@@ -5442,7 +5413,6 @@ broken-packages:
   - servant-to-elm # failure in job https://hydra.nixos.org/build/253681347 at 2024-03-31
   - servant-tracing # failure in job https://hydra.nixos.org/build/233229308 at 2023-09-02
   - servant-typed-error # failure in job https://hydra.nixos.org/build/252727241 at 2024-03-16
-  - servant-typescript # failure in job https://hydra.nixos.org/build/253932573 at 2024-03-31
   - servant-util # failure in job https://hydra.nixos.org/build/252729690 at 2024-03-16
   - servant-wasm # failure in job https://hydra.nixos.org/build/233191644 at 2023-09-02
   - servant-xml-conduit # failure in job https://hydra.nixos.org/build/243828707 at 2024-01-01
@@ -5978,7 +5948,6 @@ broken-packages:
   - system-test # failure in job https://hydra.nixos.org/build/233240318 at 2023-09-02
   - systemd-ntfy # failure in job https://hydra.nixos.org/build/236686880 at 2023-10-04
   - systemd-socket-activation # failure in job https://hydra.nixos.org/build/295097415 at 2025-04-22
-  - systranything # failure in job https://hydra.nixos.org/build/295097462 at 2025-04-22
   - t-regex # failure in job https://hydra.nixos.org/build/233254486 at 2023-09-02
   - t3-server # failure in job https://hydra.nixos.org/build/233220511 at 2023-09-02
   - table # failure in job https://hydra.nixos.org/build/233223186 at 2023-09-02
@@ -6184,7 +6153,6 @@ broken-packages:
   - tiger # failure in job https://hydra.nixos.org/build/233249333 at 2023-09-02
   - TigerHash # failure in job https://hydra.nixos.org/build/233208162 at 2023-09-02
   - tightrope # failure in job https://hydra.nixos.org/build/233215237 at 2023-09-02
-  - tiktoken # failure in job https://hydra.nixos.org/build/273448419 at 2024-10-01
   - tikzsd # failure in job https://hydra.nixos.org/build/233224431 at 2023-09-02
   - time-extras # failure in job https://hydra.nixos.org/build/233204030 at 2023-09-02
   - time-parsers # failure in job https://hydra.nixos.org/build/295097665 at 2025-04-22
@@ -6789,7 +6757,6 @@ broken-packages:
   - xml-extractors # failure in job https://hydra.nixos.org/build/252718569 at 2024-03-16
   - xml-html-conduit-lens # failure in job https://hydra.nixos.org/build/233238471 at 2023-09-02
   - xml-indexed-cursor # failure in job https://hydra.nixos.org/build/295098303 at 2025-04-22
-  - xml-lens # failure in job https://hydra.nixos.org/build/295098347 at 2025-04-22
   - xml-parsec # failure in job https://hydra.nixos.org/build/233208461 at 2023-09-02
   - xml-parser # failure in job https://hydra.nixos.org/build/252721082 at 2024-03-16
   - xml-prettify # failure in job https://hydra.nixos.org/build/233225974 at 2023-09-02
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index c53cd7260bd4..b722ae99b5af 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -1026,7 +1026,6 @@ dont-distribute-packages:
  - frpnow-gtk
  - frpnow-gtk3
  - frpnow-vty
- - fs-sim
  - ftdi
  - ftp-client-conduit
  - FTPLine
@@ -1196,7 +1195,7 @@ dont-distribute-packages:
  - gridland
  - grisette
  - grisette-monad-coroutine
- - grisette_0_12_0_0
+ - grisette_0_13_0_0
  - gross
  - groundhog-converters
  - groundhog-inspector
@@ -1363,7 +1362,6 @@ dont-distribute-packages:
  - haskelldb-hsql-postgresql
  - haskelldb-hsql-sqlite3
  - haskelldb-th
- - HaskellNet-SSL
  - haskelm
  - haskey
  - haskey-mtl
@@ -1584,7 +1582,7 @@ dont-distribute-packages:
  - HPong
  - hpqtypes-effectful
  - hpqtypes-extras
- - hpqtypes-extras_1_17_0_1
+ - hpqtypes-extras_1_18_0_0
  - hprotoc
  - hprotoc-fork
  - hps
@@ -1872,7 +1870,6 @@ dont-distribute-packages:
  - json-pointer-hasql
  - json-query
  - json-rpc-client
- - json-schema
  - json-state
  - json-togo
  - json2-hdbc
@@ -1938,9 +1935,9 @@ dont-distribute-packages:
  - knit-haskell
  - koji-install
  - koji-tool
+ - koji-tool_1_3
  - korfu
  - ks-test
- - kubernetes-api-client
  - kubernetes-client
  - kure-your-boilerplate
  - kurita
@@ -2062,7 +2059,6 @@ dont-distribute-packages:
  - liquidhaskell-cabal-demo
  - list-t-attoparsec
  - list-t-html-parser
- - list1
  - listenbrainz-client
  - ListT
  - liszt
@@ -2133,7 +2129,6 @@ dont-distribute-packages:
  - magic-wormhole
  - mahoro
  - maid
- - mail-pool
  - MailchimpSimple
  - mailgun
  - majordomo
@@ -2281,14 +2276,10 @@ dont-distribute-packages:
  - mpretty
  - mprover
  - mps
- - mptcp-pm
- - mptcpanalyzer
- - msgpack-aeson
  - msgpack-arbitrary
  - msgpack-binary
  - msgpack-idl
  - msgpack-persist
- - msgpack-rpc
  - msgpack-rpc-conduit
  - msgpack-testsuite
  - msi-kb-backlit
@@ -2632,7 +2623,6 @@ dont-distribute-packages:
  - polysemy-hasql
  - polysemy-hasql-test
  - polysemy-kvstore-jsonfile
- - polysemy-log-co
  - polysemy-methodology
  - polysemy-methodology-co-log
  - polysemy-methodology-composite
@@ -2815,6 +2805,7 @@ dont-distribute-packages:
  - rbr
  - rc
  - rdioh
+ - rds-data-polysemy
  - react-flux-servant
  - reactive
  - reactive-banana-sdl
@@ -2862,7 +2853,6 @@ dont-distribute-packages:
  - regions-monadsfd
  - regions-monadstf
  - regions-mtl
- - registry-messagepack
  - regular-extras
  - regular-web
  - regular-xmlpickler
@@ -3769,7 +3759,6 @@ dont-distribute-packages:
  - xml-catalog
  - xml-enumerator
  - xml-enumerator-combinators
- - xml-isogen
  - xml-monad
  - xml-pipe
  - xml-push
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 4a66de49e257..c45ec5bff676 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -22385,8 +22385,6 @@ self: {
       ];
       description = "Client support for POP3, SMTP, and IMAP";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -22423,7 +22421,6 @@ self: {
       ];
       description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "HaskellNet-SSL-example";
     }
   ) { };
@@ -98016,8 +98013,6 @@ self: {
       ];
       description = "Base64 encoding of byte sequences";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -132740,8 +132735,6 @@ self: {
       ];
       description = "Combinators to simultaneously define parsers and pretty printers";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -147736,8 +147729,6 @@ self: {
       ];
       description = "Asynchronous backend for co-log library";
       license = lib.licenses.mpl20;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -147841,8 +147832,6 @@ self: {
       ];
       description = "Structured messages support in co-log ecosystem";
       license = lib.licenses.mpl20;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -161662,8 +161651,6 @@ self: {
       ];
       description = "Higher-order functions with their function arguments at the end, for channeling the full power of BlockArguments and LambdaCase";
       license = lib.licenses.bsd2;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -191864,8 +191851,6 @@ self: {
       ];
       description = "Backend for rendering diagrams directly to GTK windows";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -192469,9 +192454,7 @@ self: {
       ];
       description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "diagrams-pandoc";
-      broken = true;
     }
   ) { };
 
@@ -196269,8 +196252,6 @@ self: {
       ];
       description = "Write bots for Discord in Haskell";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -202102,8 +202083,6 @@ self: {
       ];
       description = "Simple monadic DOM parser";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -203244,8 +203223,6 @@ self: {
       ];
       description = "Encoding scheme to encode any Unicode string with only [0-9a-zA-Z_]";
       license = lib.licenses.isc;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -205826,8 +205803,6 @@ self: {
       ];
       description = "A computer “algebra” system that knows nothing about algebra, at the core";
       license = lib.licenses.gpl3Only;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -210022,8 +209997,6 @@ self: {
       ];
       description = "Reducing the pain of transformer stacks with duplicated effects";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -246497,8 +246470,6 @@ self: {
       ];
       description = "Abstract interface for the file system";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -246580,7 +246551,6 @@ self: {
       ];
       description = "Simulated file systems";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -248094,8 +248064,6 @@ self: {
       ];
       description = "Tools for functor combinator-based program design";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -250155,8 +250123,6 @@ self: {
       ];
       description = "Interface to the FXPak/FXPak Pro USB interface";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -253161,8 +253127,6 @@ self: {
       ];
       description = "Derivation of Aeson instances using GHC generics";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -255918,8 +255882,6 @@ self: {
       ];
       description = "GenValidity support for URI";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -310033,9 +309995,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Lightweight CLI wallet for Bitcoin and Bitcoin Cash";
       license = lib.licenses.publicDomain;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "hw";
-      broken = true;
     }
   ) { };
 
@@ -348661,9 +348621,7 @@ self: {
       executableHaskellDepends = [ base ];
       description = "Convert an eventlog into the speedscope json format";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "hs-speedscope";
-      broken = true;
     }
   ) { };
 
@@ -383015,8 +382973,6 @@ self: {
       ];
       description = "Intervals, and monoids thereof";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -386555,8 +386511,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Types and parser for ISO8601 durations";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -393913,7 +393867,6 @@ self: {
       ];
       description = "Types and type classes for defining JSON schemas";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -403998,7 +403951,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Client library for Kubernetes";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -424476,7 +424428,6 @@ self: {
       libraryHaskellDepends = [ base ];
       description = "Helpers for working with NonEmpty lists";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -435493,7 +435444,6 @@ self: {
       ];
       description = "Preconfigured email connection pool on top of smtp";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "exe";
     }
   ) { };
@@ -458957,8 +458907,6 @@ self: {
       ];
       description = "Internal support for monoidmap";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -462496,7 +462444,6 @@ self: {
       description = "A Multipath TCP path manager";
       license = lib.licenses.gpl3Only;
       badPlatforms = lib.platforms.darwin;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "mptcp-pm";
     }
   ) { };
@@ -462674,7 +462621,6 @@ self: {
       ];
       description = "A Multipath TCP analyzer";
       license = lib.licenses.gpl3Only;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "mptcpanalyzer";
     }
   ) { };
@@ -463208,8 +463154,6 @@ self: {
       ];
       description = "A Haskell implementation of MessagePack";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -463252,7 +463196,6 @@ self: {
       ];
       description = "Aeson adapter for MessagePack";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -463528,7 +463471,6 @@ self: {
       ];
       description = "A MessagePack-RPC Implementation";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -488727,8 +488669,6 @@ self: {
       ];
       description = "OpenID Connect 1.0 library for RP";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -493306,8 +493246,6 @@ self: {
       ];
       description = "GHC plugin for open telemetry";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -528493,7 +528431,6 @@ self: {
       ];
       description = "Colog adapters for polysemy-log";
       license = "BSD-2-Clause-Patent";
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -530102,8 +530039,6 @@ self: {
       ];
       description = "Simple work queue for bounded concurrency";
       license = lib.licenses.isc;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -553080,8 +553015,6 @@ self: {
       ];
       description = "Library for lockstep-style testing with 'quickcheck-dynamic'";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -559870,6 +559803,7 @@ self: {
       doHaddock = false;
       description = "Codecs for use with AWS rds-data";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "rds-data";
     }
   ) { };
@@ -568421,7 +568355,6 @@ self: {
       ];
       description = "MessagePack encoders / decoders";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -598008,9 +597941,7 @@ self: {
       ];
       description = "Command line interface for Servant API clients";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "greet-cli";
-      broken = true;
     }
   ) { };
 
@@ -603506,9 +603437,7 @@ self: {
       ];
       description = "TypeScript client generation for Servant";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "servant-typescript-exe";
-      broken = true;
     }
   ) { };
 
@@ -654594,9 +654523,7 @@ self: {
       testToolDepends = [ tasty-autocollect ];
       description = "Let you put anything in the system tray";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "systranything";
-      broken = true;
     }
   ) { };
 
@@ -674692,8 +674619,6 @@ self: {
       ];
       description = "Haskell implementation of tiktoken";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -732348,7 +732273,6 @@ self: {
       ];
       description = "Generate XML-isomorphic types";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -732378,8 +732302,6 @@ self: {
       ];
       description = "Lenses, traversals, and prisms for xml-conduit";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 

From 8641d2da644851755fc5a9424f4599381796ff59 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 22 Jul 2025 12:10:33 +0200
Subject: [PATCH 0194/3724] sqlite: drop weird LFS64 hacks

This breaks my linux->freebsd cross build.  It's only relevant for
32-bit systems, and the right way to do this is to set
_FILE_OFFSET_BITS, not hacks like this.  Plus, whether we use 64-bit
file APIs on 32-bit platforms is really a decision we should be making
globally, not per package.
---
 pkgs/development/libraries/sqlite/default.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 4fae7f1b1a01..25e18481387f 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -109,19 +109,6 @@ stdenv.mkDerivation rec {
 
   # Test for features which may not be available at compile time
   preBuild = ''
-    # Use pread(), pread64(), pwrite(), pwrite64() functions for better performance if they are available.
-    if cc -Werror=implicit-function-declaration -x c - -o "$TMPDIR/pread_pwrite_test" <<< \
-      ''$'#include <unistd.h>\nint main()\n{\n  pread(0, NULL, 0, 0);\n  pwrite(0, NULL, 0, 0);\n  return 0;\n}'; then
-      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD"
-    fi
-    if cc -Werror=implicit-function-declaration -x c - -o "$TMPDIR/pread64_pwrite64_test" <<< \
-      ''$'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}'; then
-      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD64"
-    elif cc -D_LARGEFILE64_SOURCE -Werror=implicit-function-declaration -x c - -o "$TMPDIR/pread64_pwrite64_test" <<< \
-      ''$'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}'; then
-      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD64 -D_LARGEFILE64_SOURCE"
-    fi
-
     # Necessary for FTS5 on Linux
     export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lm"
 

From aa6c7781a9c6827e2008dc211eba7246806e8948 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 21 Jul 2025 14:32:59 +0200
Subject: [PATCH 0195/3724] haskell.compiler: elaborate error when cross
 compiling hadrian ghcs

People seem to frequently expect pkgsCross.*.haskell.compiler.* /
pkgsStatic.haskell.compiler.* to contain cross compilers and are greeted
with a failing assert instead. We can help them out a little bit, by
hinting the may have meant to use buildPackages.
---
 pkgs/development/compilers/ghc/common-hadrian.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index 1240dc3e158a..4e400da2ccc8 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -346,7 +346,8 @@ assert !enableNativeBignum -> gmp != null;
 assert stdenv.buildPlatform == stdenv.hostPlatform || stdenv.hostPlatform == stdenv.targetPlatform;
 
 # It is currently impossible to cross-compile GHC with Hadrian.
-assert stdenv.buildPlatform == stdenv.hostPlatform;
+assert lib.assertMsg (stdenv.buildPlatform == stdenv.hostPlatform)
+  "GHC >= 9.6 can't be cross-compiled. If you meant to build a GHC cross-compiler, use `buildPackages`.";
 
 let
   inherit (stdenv) buildPlatform hostPlatform targetPlatform;

From 85fe3f0fe1c5938a57a0c55117912171bf3a09b5 Mon Sep 17 00:00:00 2001
From: jakobkukla <jakob.kukla@gmail.com>
Date: Tue, 22 Jul 2025 17:52:35 +0200
Subject: [PATCH 0196/3724] fmt_11: 11.0.2 -> 11.2.0

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

diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index e4d6aaf99037..b789956dfe56 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -87,14 +87,7 @@ in
   };
 
   fmt_11 = generic {
-    version = "11.0.2";
-    hash = "sha256-IKNt4xUoVi750zBti5iJJcCk3zivTt7nU12RIf8pM+0=";
-    patches = [
-      (fetchpatch {
-        name = "get-rid-of-std-copy-fix-clang.patch";
-        url = "https://github.com/fmtlib/fmt/commit/6e462b89aa22fd5f737ed162d0150e145ccb1914.patch";
-        hash = "sha256-tRU1y1VCxtQ5J2yvFmwUx+YNcQs8izzLImD37KBiCFk=";
-      })
-    ];
+    version = "11.2.0";
+    hash = "sha256-sAlU5L/olxQUYcv8euVYWTTB8TrVeQgXLHtXy8IMEnU=";
   };
 }

From 0d1c07f6bf44882b860a415b09a8efa919e0a89d Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas.gerbet@enalean.com>
Date: Tue, 22 Jul 2025 08:02:10 +0200
Subject: [PATCH 0197/3724] vim-full: fix build when built with GUI support

wayland-scanner is now needed since https://github.com/vim/vim/commit/b90c2395b2c055aed38e0c5fd40c1841f43dab4b
---
 pkgs/applications/editors/vim/full.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix
index 9b20629618ae..06595ed3d217 100644
--- a/pkgs/applications/editors/vim/full.nix
+++ b/pkgs/applications/editors/vim/full.nix
@@ -26,6 +26,7 @@
   libXmu,
   libsodium,
   libICE,
+  wayland-scanner,
   vimPlugins,
   makeWrapper,
   wrapGAppsHook3,
@@ -33,6 +34,7 @@
   features ? "huge", # One of tiny, small, normal, big or huge
   wrapPythonDrv ? false,
   guiSupport ? config.vim.gui or (if stdenv.hostPlatform.isDarwin then "gtk2" else "gtk3"),
+  waylandSupport ? !stdenv.hostPlatform.isDarwin,
   luaSupport ? config.vim.lua or true,
   perlSupport ? config.vim.perl or false, # Perl interpreter
   pythonSupport ? config.vim.python or true, # Python interpreter
@@ -121,6 +123,7 @@ stdenv.mkDerivation {
       "--disable-nextaf_check"
       "--disable-carbon_check"
       "--disable-gtktest"
+      (lib.strings.enableFeature waylandSupport "wayland")
     ]
     ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
       "vim_cv_toupper_broken=no"
@@ -188,6 +191,7 @@ stdenv.mkDerivation {
     ]
     ++ lib.optional (guiSupport == "gtk2") gtk2-x11
     ++ lib.optional (guiSupport == "gtk3") gtk3-x11
+    ++ lib.optional waylandSupport wayland-scanner
     ++ lib.optional luaSupport lua
     ++ lib.optional pythonSupport python3
     ++ lib.optional tclSupport tcl

From abc50135a4ff1d4a48b42ab2054ee2131b90dc66 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 17 Jul 2025 14:19:04 +0200
Subject: [PATCH 0198/3724] rustc: unset PKG_CONFIG_*

This hasn't been required to cross compile rustc since
20e24e42d474 ("rustc: 1.67.1 -> 1.68.0").
---
 pkgs/development/compilers/rust/rustc.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 18a889fe9349..dd0fbc2708d6 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -82,13 +82,6 @@ stdenv.mkDerivation (finalAttrs: {
   # See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656
   stripDebugList = [ "bin" ];
 
-  # The Rust pkg-config crate does not support prefixed pkg-config executables[1],
-  # but it does support checking these idiosyncratic PKG_CONFIG_${TRIPLE}
-  # environment variables.
-  # [1]: https://github.com/rust-lang/pkg-config-rs/issues/53
-  "PKG_CONFIG_${builtins.replaceStrings [ "-" ] [ "_" ] stdenv.buildPlatform.rust.rustcTarget}" =
-    "${pkgsBuildHost.stdenv.cc.targetPrefix}pkg-config";
-
   NIX_LDFLAGS = toString (
     # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
     # This doesn't apply to cross-building for FreeBSD because the host

From 28e72a42c799e195d5fe17e6362abc37811facb8 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Tue, 22 Jul 2025 14:38:58 +0200
Subject: [PATCH 0199/3724] gnupg: Remove broken mirrors

None of these two mirrors have any of the sources these mirrors are used
for, checked with `nix-build <pkg>.src --check` while only those two are
not commented.
---
 pkgs/build-support/fetchurl/mirrors.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 7e51efed66ac..1a412617835f 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -93,9 +93,7 @@
   gnupg = [
     "https://gnupg.org/ftp/gcrypt/"
     "https://mirrors.dotsrc.org/gcrypt/"
-    "https://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/"
     "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/"
-    "http://www.ring.gr.jp/pub/net/"
   ];
 
   # IBiblio (former metalab/sunsite)

From 12003e5b3a7fe65a1e070a52fbd9515effefe174 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Tue, 22 Jul 2025 19:29:07 +0200
Subject: [PATCH 0200/3724] gnupg: Add patch comments

---
 pkgs/tools/security/gnupg/24.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix
index d2a9462b193a..4f0b8a178981 100644
--- a/pkgs/tools/security/gnupg/24.nix
+++ b/pkgs/tools/security/gnupg/24.nix
@@ -76,6 +76,7 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals withTpm2Tss [ tpm2-tss ];
 
+  # Maintained by Andrew Gallapher, who's involved with GPG in multiple ways: https://andrewg.com/
   freepgPatches = fetchFromGitLab {
     domain = "gitlab.com";
     owner = "freepg";
@@ -86,7 +87,16 @@ stdenv.mkDerivation rec {
 
   patches =
     [
+      # Without this, scdaemon isn't linked to libusb, causing smartcards to not work correctly
       ./fix-libusb-include-path.patch
+      # Use pkg-config to find tss2-esys to fix static building
+      # Submitted upstream: https://dev.gnupg.org/D606
+      # The diff is larger than upstream because configure.ac was modified,
+      # requiring configure to be regenerated. For reasons we don't totally
+      # understand, regenerating configure has all sorts of other undesirable
+      # side effects. So to unbreak things, instead of regenerating configure,
+      # we can include just the configure changes relevant to the static patch
+      # in the patch file.
       ./static.patch
     ]
     ++ lib.map (v: "${freepgPatches}/STABLE-BRANCH-2-4-freepg/" + v) [
@@ -116,6 +126,13 @@ stdenv.mkDerivation rec {
     ];
 
   postPatch =
+    # Switch the default key server to keys.openpgp.org
+    # The original motivation in 2019 was to switch away from the then-default SKS network: https://github.com/NixOS/nixpkgs/pull/63952
+    # In 2021 upstream also switched away, but to keyserver.ubuntu.com: https://dev.gnupg.org/rG47c4e3e00a7ef55f954c14b3c237496e54a853c1,
+    # while NixOS kept the keys.openpgp.org default: https://github.com/NixOS/nixpkgs/pull/159604
+    # TODO: Should this patch be removed so that the now-uncompromised default is used once again?
+    # A significant difference between the two seems to be that keys.openpgp.org is verifying keys, while keyserver.ubuntu.com isn't: https://unix.stackexchange.com/a/694528
+    # The keys.openpgp.org also has a great FAQ: https://keys.openpgp.org/about/faq
     ''
       sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1
     ''

From f0c791e5104197c03181d8328fe6b7c1e920037f Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Tue, 22 Jul 2025 19:29:31 +0200
Subject: [PATCH 0201/3724] gnupg: Enable test suite

---
 pkgs/tools/security/gnupg/24.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix
index 4f0b8a178981..680a9ff4b088 100644
--- a/pkgs/tools/security/gnupg/24.nix
+++ b/pkgs/tools/security/gnupg/24.nix
@@ -21,6 +21,7 @@
   readline,
   sqlite,
   zlib,
+  openssh,
   enableMinimal ? false,
   withPcsc ? !enableMinimal,
   pcsclite,
@@ -145,6 +146,8 @@ stdenv.mkDerivation rec {
   configureFlags =
     [
       "--sysconfdir=/etc"
+      # Needed for large RSA key support (patch 0033)
+      "--enable-large-secmem"
       "--with-libgpg-error-prefix=${libgpg-error.dev}"
       "--with-libgcrypt-prefix=${libgcrypt.dev}"
       "--with-libassuan-prefix=${libassuan.dev}"
@@ -180,6 +183,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  nativeCheckInputs = [
+    # A test would be skipped without SSH
+    openssh
+  ];
+  doCheck = !enableMinimal;
+
   passthru.tests = nixosTests.gnupg;
 
   meta = with lib; {

From 4657535e2ed314d82202b3a7def8b2d51af8e807 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 17 Jul 2025 21:34:00 +0200
Subject: [PATCH 0202/3724] haskell.compiler: (make built) also patch
 rts.cabal.in in numa patch

This is the part of the autoconf/make logic that may be relevant to us
which wasn't replicated from Libdw. For completeness' sake, do this
here. The extra logic in distrib/configure.ac.in is not relevant to us
since we don't build bindists for make built GHCs.
---
 ...8.10-9.2-rts-package-db-libnuma-dirs.patch | 21 ++++++++++++++++---
 .../ghc-9.4-rts-package-db-libnuma-dirs.patch | 21 ++++++++++++++++---
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghc/ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch b/pkgs/development/compilers/ghc/ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch
index 4a5de6403923..698c111e6721 100644
--- a/pkgs/development/compilers/ghc/ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch
+++ b/pkgs/development/compilers/ghc/ghc-8.10-9.2-rts-package-db-libnuma-dirs.patch
@@ -1,4 +1,4 @@
-From adef13bb81cdb49a8da8a22db261e48d8c4bbb5d Mon Sep 17 00:00:00 2001
+From 3d17e6fa39fb18d4300fbf2a0c4b9ddb4adf746b Mon Sep 17 00:00:00 2001
 From: sterni <sternenseemann@systemli.org>
 Date: Thu, 17 Jul 2025 21:21:29 +0200
 Subject: [PATCH] rts: record libnuma include and lib dirs in package conf
@@ -16,11 +16,14 @@ While the make build system knows when to link against libnuma, it won't
 enforce its specific directories by adding them to rts.conf in the
 package db. This commit implements this retroactively for the make build
 system, modeled after how make does the same sort of thing for Libdw.
+The Libdw logic also affects the bindist configure file in
+distrib/configure.ac which isn't replicate since we don't need it.
 ---
  mk/config.mk.in     | 4 ++++
  rts/ghc.mk          | 8 ++++++++
  rts/package.conf.in | 5 +++--
- 3 files changed, 15 insertions(+), 2 deletions(-)
+ rts/rts.cabal.in    | 1 +
+ 4 files changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/mk/config.mk.in b/mk/config.mk.in
 index 35f6e2d087..d2b1329eb5 100644
@@ -80,6 +83,18 @@ index 9bdbf3659a..46f728b09a 100644
  #endif
  
  includes:               Stg.h
+diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in
+index 0a06414d95..f71fb079ec 100644
+--- a/rts/rts.cabal.in
++++ b/rts/rts.cabal.in
+@@ -150,6 +150,7 @@ library
+     include-dirs: build ../includes includes
+                   includes/dist-derivedconstants/header @FFIIncludeDir@
+                   @LibdwIncludeDir@
++                  @LibNumaIncludeDir@
+     includes: Stg.h
+     install-includes: Cmm.h HsFFI.h MachDeps.h Rts.h RtsAPI.h Stg.h
+                       ghcautoconf.h ghcconfig.h ghcplatform.h ghcversion.h
 -- 
-2.49.0
+2.50.0
 
diff --git a/pkgs/development/compilers/ghc/ghc-9.4-rts-package-db-libnuma-dirs.patch b/pkgs/development/compilers/ghc/ghc-9.4-rts-package-db-libnuma-dirs.patch
index 645153b9a2d7..6607ec02f3f7 100644
--- a/pkgs/development/compilers/ghc/ghc-9.4-rts-package-db-libnuma-dirs.patch
+++ b/pkgs/development/compilers/ghc/ghc-9.4-rts-package-db-libnuma-dirs.patch
@@ -1,4 +1,4 @@
-From f9625ba94522bec93b4c5d46ee5fd97f537a7dfa Mon Sep 17 00:00:00 2001
+From a0b547f41939304adfc0c430314c342dd69306ae Mon Sep 17 00:00:00 2001
 From: sterni <sternenseemann@systemli.org>
 Date: Thu, 17 Jul 2025 21:21:29 +0200
 Subject: [PATCH] rts: record libnuma include and lib dirs in package conf
@@ -16,11 +16,14 @@ While the make build system knows when to link against libnuma, it won't
 enforce its specific directories by adding them to rts.conf in the
 package db. This commit implements this retroactively for the make build
 system, modeled after how make does the same sort of thing for Libdw.
+The Libdw logic also affects the bindist configure file in
+distrib/configure.ac which isn't replicate since we don't need it.
 ---
  mk/config.mk.in     | 4 ++++
  rts/ghc.mk          | 8 ++++++++
  rts/package.conf.in | 5 +++--
- 3 files changed, 15 insertions(+), 2 deletions(-)
+ rts/rts.cabal.in    | 1 +
+ 4 files changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/mk/config.mk.in b/mk/config.mk.in
 index 2ff2bea9b6..d95f927dbd 100644
@@ -80,6 +83,18 @@ index cb5a436f5c..9e5ae48adb 100644
  #endif
  
  includes:               Rts.h
+diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in
+index a8882268ac..debf2ba0a0 100644
+--- a/rts/rts.cabal.in
++++ b/rts/rts.cabal.in
+@@ -154,6 +154,7 @@ library
+     include-dirs: include
+                   @FFIIncludeDir@
+                   @LibdwIncludeDir@
++                  @LibNumaIncludeDir@
+     includes: Rts.h
+     install-includes: Cmm.h HsFFI.h MachDeps.h Rts.h RtsAPI.h Stg.h
+                       ghcautoconf.h ghcconfig.h ghcplatform.h ghcversion.h
 -- 
-2.49.0
+2.50.0
 

From 86e02ae0a9df9c89bf81bfddb0156fb55033e13b Mon Sep 17 00:00:00 2001
From: Lach <iam@lach.pw>
Date: Wed, 23 Jul 2025 02:17:51 +0200
Subject: [PATCH 0203/3724] libcamera: fix regression due to library paths
 change

Previously reported at https://github.com/NixOS/nixpkgs/issues/351842

It was regressed in libcamera 0.5.1 update, due to ipa modules being moved from /lib/libcamera/ipa_*.so to /lib/libcamera/ipa/ipa_*.so in upstream, here:
https://git.libcamera.org/libcamera/libcamera.git/commit/src/ipa/meson.build?id=37dccb4584346b53b0f39184bb3a71eed9ca8d6c
---
 pkgs/by-name/li/libcamera/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix
index dca021ffbe13..4f05ec01d69b 100644
--- a/pkgs/by-name/li/libcamera/package.nix
+++ b/pkgs/by-name/li/libcamera/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    ../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so
+    ../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa/ipa_*.so
   '';
 
   strictDeps = true;

From fc37a73baea14733e57ee61de3ed804b0e108c83 Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Wed, 23 Jul 2025 03:11:29 -0400
Subject: [PATCH 0204/3724] threema-desktop: 1.2.46 -> 1.2.48

---
 pkgs/by-name/th/threema-desktop/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/th/threema-desktop/package.nix b/pkgs/by-name/th/threema-desktop/package.nix
index 1ed7fe3c9350..622440923f15 100644
--- a/pkgs/by-name/th/threema-desktop/package.nix
+++ b/pkgs/by-name/th/threema-desktop/package.nix
@@ -10,26 +10,26 @@
 }:
 
 let
-  version = "1.2.46";
+  version = "1.2.48";
   electronSrc = fetchFromGitHub {
     owner = "threema-ch";
     repo = "threema-web-electron";
     rev = "refs/tags/${version}";
-    hash = "sha256-Qv40l6TyYZL9WcRQeIYUgMFsJrr0XYC2nmtYBgQKXvY=";
+    hash = "sha256-u1rzKFDrLxU/o7Oc2o/WBwbAncNWKJ9GAUBaNDPViZI=";
   };
 
   threema-web = buildNpmPackage rec {
     pname = "threema-web";
-    version = "2.5.7";
+    version = "2.6.2";
 
     src = fetchFromGitHub {
       owner = "threema-ch";
       repo = "threema-web";
       rev = "refs/tags/v${version}";
-      hash = "sha256-WuPOOchFZtnLVoB+i4LKFkeSujYXpQN8RLrt9xG9/W0=";
+      hash = "sha256-GmyWKJdDgiRS7XxNjCyvt92Bn48kpP3+ZsfRouyUCM0=";
     };
 
-    npmDepsHash = "sha256-eJIVX2W0Fgk/OmkaN2cR+qFoHTOmu4RmluR3BEuPOAU=";
+    npmDepsHash = "sha256-KDkJ2jdtHVK40b0ja/Nj6t5Bcl5frh7rzteWD74AKOM=";
     npmBuildScript = "dist";
 
     nativeBuildInputs = [
@@ -54,7 +54,7 @@ let
     inherit version;
     src = electronSrc;
     sourceRoot = "${src.name}/app";
-    npmDepsHash = "sha256-CRYcmly8S+waeCf2fRWM2o3IuBVdpk2gZ/djHhxLLTQ=";
+    npmDepsHash = "sha256-mafB7lC1YpIZ71R6IT3TnSzFDieK4AsAzIqpWcy9480=";
     env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     dontNpmBuild = true;
     prePatch = ''
@@ -73,7 +73,7 @@ buildNpmPackage rec {
   inherit version;
   src = electronSrc;
 
-  npmDepsHash = "sha256-OdxDAy9ybBUEFuQQtihEvUXCVtVtveksLlOBD8F1RP0=";
+  npmDepsHash = "sha256-A7XvzURCCM0+ISlSLpnreFIxKku4FnVdWLsF2WxQfBY=";
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
@@ -123,7 +123,7 @@ buildNpmPackage rec {
     homepage = "https://threema.ch";
     license = licenses.agpl3Only;
     mainProgram = "threema";
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.jonhermansen ];
     platforms = [ "x86_64-linux" ];
   };
 }

From 429b22f9428063d448fd09ee4bbd429ca96ed110 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jul 2025 14:29:38 +0000
Subject: [PATCH 0205/3724] libbpf: 1.5.1 -> 1.6.1

---
 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 21241a2952db..37b6bb5578fa 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libbpf";
-  version = "1.5.1";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "libbpf";
     repo = "libbpf";
     rev = "v${version}";
-    hash = "sha256-bTT7ehTHVaqkT27hJrH2YQBrVU6uo2gkgHE1AJtDKKY=";
+    hash = "sha256-2AtUwCN17bSM0mJrERTklVluUduMMAX25pOGEwNPjAU=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From b92da7d1cb35ab020db64eca19ea11a7a1b2ed4d Mon Sep 17 00:00:00 2001
From: Lucio Franco <luciofranco14@gmail.com>
Date: Sun, 18 May 2025 00:24:14 +0200
Subject: [PATCH 0206/3724] replace-workspace-values.py: Update cargo.toml on
 only lints replace

---
 .../rust/replace-workspace-values.py              |  1 +
 .../crate_lints.toml                              | 15 +++++++++++++++
 .../default.nix                                   |  4 ++++
 .../want_lints.toml                               | 15 +++++++++++++++
 .../workspace.toml                                |  3 +++
 5 files changed, 38 insertions(+)
 create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate_lints.toml
 create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want_lints.toml

diff --git a/pkgs/build-support/rust/replace-workspace-values.py b/pkgs/build-support/rust/replace-workspace-values.py
index 426d1b961296..708ce14a7e8f 100644
--- a/pkgs/build-support/rust/replace-workspace-values.py
+++ b/pkgs/build-support/rust/replace-workspace-values.py
@@ -123,6 +123,7 @@ def main() -> None:
         and crate_manifest["lints"]["workspace"] is True
     ):
         crate_manifest["lints"] = workspace_manifest["lints"]
+        changed = True
 
     if not changed:
         return
diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate_lints.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate_lints.toml
new file mode 100644
index 000000000000..f1df81cbf22f
--- /dev/null
+++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate_lints.toml
@@ -0,0 +1,15 @@
+[package]
+name = "im_using_workspaces"
+version = { workspace = true }
+publish = false
+keywords = [
+    "workspace",
+    "other_thing",
+    "third_thing",
+]
+
+[lints]
+workspace = true
+
+[dependencies]
+bar = "1.0.0"
diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix
index 138b7179b95f..b52026190e29 100644
--- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix
+++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix
@@ -4,4 +4,8 @@ runCommand "git-dependency-workspace-inheritance-test" { } ''
   cp --no-preserve=mode ${./crate.toml} "$out"
   ${replaceWorkspaceValues} "$out" ${./workspace.toml}
   diff -u "$out" ${./want.toml}
+
+  cp --no-preserve=mode ${./crate_lints.toml} "$out"
+  ${replaceWorkspaceValues} "$out" ${./workspace.toml}
+  diff -u "$out" ${./want_lints.toml}
 ''
diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want_lints.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want_lints.toml
new file mode 100644
index 000000000000..59655e6ade05
--- /dev/null
+++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want_lints.toml
@@ -0,0 +1,15 @@
+[package]
+name = "im_using_workspaces"
+version = "1.0.0"
+publish = false
+keywords = [
+    "workspace",
+    "other_thing",
+    "third_thing",
+]
+
+[lints]
+dbg_macro = "warn"
+
+[dependencies]
+bar = "1.0.0"
diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/workspace.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/workspace.toml
index c58112a782d0..ff67ed9b51b0 100644
--- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/workspace.toml
+++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/workspace.toml
@@ -3,3 +3,6 @@ version = "1.0.0"
 
 [workspace.dependencies]
 foo = { version = "1.0.0", features = ["meow"] }
+
+[workspace.lints]
+dbg_macro = "warn"

From 0d7fc558cc3ca7bc8397b22444038e211b5a6090 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Sat, 5 Jul 2025 17:13:42 +0900
Subject: [PATCH 0207/3724] libpng: 1.6.47 -> 1.6.49

https://github.com/pnggroup/libpng/blob/640204280f8109d7165f95d2b177f89baf20b253/CHANGES#L6254-L6268

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/development/libraries/libpng/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 3448fa03fa81..d6a03867000b 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -10,21 +10,21 @@
 assert zlib != null;
 
 let
-  patchVersion = "1.6.47";
+  patchVersion = "1.6.49";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
-    hash = "sha256-Wwhvr+fhJ4SyhpPhmlvPaGd6jFKUcRVxKlbD0SOUT28=";
+    hash = "sha256-Zmdtgn4y7hc0ezmjU+kbW4sFR7RArrE/AjzU+irXjTI=";
   };
   whenPatched = lib.optionalString apngSupport;
 
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libpng" + whenPatched "-apng";
-  version = "1.6.47";
+  version = "1.6.49";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz";
-    hash = "sha256-shPLOB+7EXUye9cIp3qrcIoFrd57RxvCZ70VrJmJNjE=";
+    hash = "sha256-QxgqpI451ksatOxrcas+kQtn7tOg//N3fPjPQNbvcCQ=";
   };
   postPatch =
     whenPatched "gunzip < ${patch_src} | patch -Np1"

From 2c79c5d882cb8a0e200eb8b9f0894d3e85e67c0f Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Sat, 19 Jul 2025 20:16:46 -0400
Subject: [PATCH 0208/3724] =?UTF-8?q?masterpdfeditor:=205.9.89=20=E2=86=92?=
 =?UTF-8?q?=205.9.90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wulpey <wulpine@proton.me>
---
 pkgs/by-name/ma/masterpdfeditor/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ma/masterpdfeditor/package.nix b/pkgs/by-name/ma/masterpdfeditor/package.nix
index d3c93e1f14f4..52787ba2736f 100644
--- a/pkgs/by-name/ma/masterpdfeditor/package.nix
+++ b/pkgs/by-name/ma/masterpdfeditor/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "masterpdfeditor";
-  version = "5.9.89";
+  version = "5.9.90";
 
   src =
     let
@@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
         aarch64-linux = "https://code-industry.net/public/master-pdf-editor-${finalAttrs.version}-qt5.arm64.tar.gz";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-HTYFo3tZD1JiYpsx/q9mr1Sp9JIWA6Kp0ThzmDcvxmo=";
-        aarch64-linux = "sha256-uxCp9iv4923Qbyd2IldHm1/a50GU6VISSG6jfVzQqq4=";
+        x86_64-linux = "sha256-E0bH6Tbq8poQn0kuWcbxup72l/ijBoD1BTUANuEAsM4=";
+        aarch64-linux = "sha256-nH16N9XjMtDpCy6XQLr76SFHnDLB3bsjHZHtHQj60Rw=";
       };
     };
 
@@ -76,8 +76,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = writeShellScript "update-masterpdfeditor" ''
     latestVersion=$(curl -s https://code-industry.net/downloads/ | grep -A1 "fa-linux" | grep -oP 'Version\s+\K[\d.]+' | head -n 1)
-    ${lib.getExe nix-update} masterpdfeditor --version $latestVersion --system x86_64-linux
-    ${lib.getExe' common-updater-scripts "update-source-version"} masterpdfeditor $latestVersion --system=aarch64-linux --ignore-same-version
+    ${lib.getExe nix-update} pkgsCross.gnu64.masterpdfeditor --version $latestVersion
+    ${lib.getExe' common-updater-scripts "update-source-version"} pkgsCross.aarch64-multiplatform.masterpdfeditor --ignore-same-version
   '';
 
   meta = {

From ca7d34e71b412fe2e753f449b7d08ee1c7d2f6a4 Mon Sep 17 00:00:00 2001
From: Alexander Ben Nasrallah <me@abn.sh>
Date: Tue, 22 Jul 2025 17:32:08 +0200
Subject: [PATCH 0209/3724] lisp-modules: Fetch systems over HTTPS

quicklisp does not support TLS (https://github.com/quicklisp/quicklisp-client/issues/167)
and therefore lists release with http in release.txt.

Since nixpkgs uses `fetchzip` we can change the source to be fetched
over HTTPS.
---
 .../import/repository/quicklisp.lisp          |   16 +-
 pkgs/development/lisp-modules/imported.nix    | 9408 ++++++++---------
 2 files changed, 4714 insertions(+), 4710 deletions(-)

diff --git a/pkgs/development/lisp-modules/import/repository/quicklisp.lisp b/pkgs/development/lisp-modules/import/repository/quicklisp.lisp
index 634795ab17a4..04f29b476ba0 100644
--- a/pkgs/development/lisp-modules/import/repository/quicklisp.lisp
+++ b/pkgs/development/lisp-modules/import/repository/quicklisp.lisp
@@ -112,13 +112,17 @@
 
       (sqlite:with-transaction db
         (dolist (line releases-lines)
-          (destructuring-bind (project url size md5 sha1 prefix &rest asds)
+          (destructuring-bind (project http-url size md5 sha1 prefix &rest asds)
               (str:words line)
-            (sql-query
-             "insert or ignore into quicklisp_release values(?,?,?,?,?,?,?)"
-             project url size md5 sha1 prefix (json:stringify (coerce
-                                                               asds
-                                                               'vector))))))
+            ;; quicklisp does not support TLS
+            ;; https://github.com/quicklisp/quicklisp-client/issues/167
+            ;; but since we fetch systems using nix we can adapt the url.
+            (let ((url (str:replace-first "http://" "https://" http-url)))
+              (sql-query
+               "insert or ignore into quicklisp_release values(?,?,?,?,?,?,?)"
+               project url size md5 sha1 prefix (json:stringify (coerce
+                                                                 asds
+                                                                 'vector)))))))
 
       ;; Weed out circular dependencies from the package graph.
       (sqlite:with-transaction db
diff --git a/pkgs/development/lisp-modules/imported.nix b/pkgs/development/lisp-modules/imported.nix
index 02194cbed797..0b87b344e36c 100644
--- a/pkgs/development/lisp-modules/imported.nix
+++ b/pkgs/development/lisp-modules/imported.nix
@@ -47,7 +47,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "1am" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/1am/2014-11-06/1am-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/1am/2014-11-06/1am-20141106-git.tgz";
           sha256 = "05ss4nz1jb9kb796295482b62w5cj29msfj8zis33sp2rw2vmv2g";
           system = "1am";
           asd = "1am";
@@ -67,7 +67,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "2d-array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "2d-array";
           asd = "2d-array";
@@ -87,7 +87,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "2d-array-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "2d-array-test";
           asd = "2d-array-test";
@@ -110,7 +110,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3b-bmfont" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3b-bmfont/2024-10-12/3b-bmfont-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3b-bmfont/2024-10-12/3b-bmfont-20241012-git.tgz";
           sha256 = "1zmkmhw8ma2j8p6crw0x6am6fx95rxkb1n3fqlgvs2rxdk273dan";
           system = "3b-bmfont";
           asd = "3b-bmfont";
@@ -134,7 +134,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3b-hdr" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3b-hdr/2020-09-25/3b-hdr-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3b-hdr/2020-09-25/3b-hdr-20200925-git.tgz";
           sha256 = "0bvpdzz88xjwvqapjnkdr44ds3gh5xl3r6r1c2y7x9d6lnvc38jq";
           system = "3b-hdr";
           asd = "3b-hdr";
@@ -159,7 +159,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3b-swf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3b-swf/2012-01-07/3b-swf-20120107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3b-swf/2012-01-07/3b-swf-20120107-git.tgz";
           sha256 = "1d74045b6zfxjf0as8n5ji14j5cxsdi3qkqkzcdy3i83whbxkcbm";
           system = "3b-swf";
           asd = "3b-swf";
@@ -189,7 +189,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3b-swf-swc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3b-swf/2012-01-07/3b-swf-20120107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3b-swf/2012-01-07/3b-swf-20120107-git.tgz";
           sha256 = "1d74045b6zfxjf0as8n5ji14j5cxsdi3qkqkzcdy3i83whbxkcbm";
           system = "3b-swf-swc";
           asd = "3b-swf-swc";
@@ -213,7 +213,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3bgl-shader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bgl-shader/2025-06-22/3bgl-shader-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3bgl-shader/2025-06-22/3bgl-shader-20250622-git.tgz";
           sha256 = "0v29qppa0g7hnjj84jbxrvqyi8apvnzgbn0f6ng033qg3vics2gx";
           system = "3bgl-shader";
           asd = "3bgl-shader";
@@ -237,7 +237,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3bgl-shader-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bgl-shader/2025-06-22/3bgl-shader-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3bgl-shader/2025-06-22/3bgl-shader-20250622-git.tgz";
           sha256 = "0v29qppa0g7hnjj84jbxrvqyi8apvnzgbn0f6ng033qg3vics2gx";
           system = "3bgl-shader-example";
           asd = "3bgl-shader-example";
@@ -262,7 +262,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3bmd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
           sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd";
           asd = "3bmd";
@@ -286,7 +286,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3bmd-ext-code-blocks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
           sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-ext-code-blocks";
           asd = "3bmd-ext-code-blocks";
@@ -311,7 +311,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3bmd-ext-definition-lists" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
           sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-ext-definition-lists";
           asd = "3bmd-ext-definition-lists";
@@ -335,7 +335,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3bmd-ext-math" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
           sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-ext-math";
           asd = "3bmd-ext-math";
@@ -358,7 +358,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3bmd-ext-tables" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
           sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-ext-tables";
           asd = "3bmd-ext-tables";
@@ -378,7 +378,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3bmd-ext-wiki-links" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
           sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-ext-wiki-links";
           asd = "3bmd-ext-wiki-links";
@@ -398,7 +398,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3bmd-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
           sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-tests";
           asd = "3bmd-tests";
@@ -422,7 +422,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3bmd-youtube" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
           sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-youtube";
           asd = "3bmd-youtube";
@@ -445,7 +445,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3bmd-youtube-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3bmd/2025-06-22/3bmd-20250622-git.tgz";
           sha256 = "148if19cjb08l6k347jzhwnymj5a8hmr4fm9r5hr17ddcbbq8sbv";
           system = "3bmd-youtube-tests";
           asd = "3bmd-youtube-tests";
@@ -468,7 +468,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3bz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3bz/2023-06-18/3bz-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3bz/2023-06-18/3bz-20230618-git.tgz";
           sha256 = "0qdnxj2sn185l0jnp4zjlh5la14pxkgp1hmcyw4d2zwx30sc37p7";
           system = "3bz";
           asd = "3bz";
@@ -495,7 +495,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3d-math" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-math/2025-06-22/3d-math-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3d-math/2025-06-22/3d-math-20250622-git.tgz";
           sha256 = "14jmmv1vsri0qil6hksax7xcakfmxjndj90gkszin67c8sazqzzb";
           system = "3d-math";
           asd = "3d-math";
@@ -518,7 +518,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3d-math-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-math/2025-06-22/3d-math-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3d-math/2025-06-22/3d-math-20250622-git.tgz";
           sha256 = "14jmmv1vsri0qil6hksax7xcakfmxjndj90gkszin67c8sazqzzb";
           system = "3d-math-test";
           asd = "3d-math-test";
@@ -541,7 +541,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3d-matrices" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-matrices/2023-10-21/3d-matrices-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3d-matrices/2023-10-21/3d-matrices-20231021-git.tgz";
           sha256 = "0kn68awww0h8gwiqih8a65d2p34q3qh4z5ji2g5ja99vgpr1498q";
           system = "3d-matrices";
           asd = "3d-matrices";
@@ -564,7 +564,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3d-matrices-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-matrices/2023-10-21/3d-matrices-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3d-matrices/2023-10-21/3d-matrices-20231021-git.tgz";
           sha256 = "0kn68awww0h8gwiqih8a65d2p34q3qh4z5ji2g5ja99vgpr1498q";
           system = "3d-matrices-test";
           asd = "3d-matrices-test";
@@ -587,7 +587,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3d-quaternions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-quaternions/2023-10-21/3d-quaternions-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3d-quaternions/2023-10-21/3d-quaternions-20231021-git.tgz";
           sha256 = "1m72g2rn1n5xsqaa50qbj6hcp8b4gk7xsld4qaly788bwscparl8";
           system = "3d-quaternions";
           asd = "3d-quaternions";
@@ -611,7 +611,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3d-quaternions-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-quaternions/2023-10-21/3d-quaternions-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3d-quaternions/2023-10-21/3d-quaternions-20231021-git.tgz";
           sha256 = "1m72g2rn1n5xsqaa50qbj6hcp8b4gk7xsld4qaly788bwscparl8";
           system = "3d-quaternions-test";
           asd = "3d-quaternions-test";
@@ -634,7 +634,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3d-spaces" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-spaces/2025-06-22/3d-spaces-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3d-spaces/2025-06-22/3d-spaces-20250622-git.tgz";
           sha256 = "16m87s9mpynxgjxcp3yn70s6l7mh9sgx3yxwkzdp20y5x5nkknlb";
           system = "3d-spaces";
           asd = "3d-spaces";
@@ -662,7 +662,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3d-transforms" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-transforms/2023-10-21/3d-transforms-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3d-transforms/2023-10-21/3d-transforms-20231021-git.tgz";
           sha256 = "0876pih289fgn8maclihiz9xl66zbi4nbznpdq2xpfbsr1k4sihy";
           system = "3d-transforms";
           asd = "3d-transforms";
@@ -687,7 +687,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3d-transforms-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-transforms/2023-10-21/3d-transforms-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3d-transforms/2023-10-21/3d-transforms-20231021-git.tgz";
           sha256 = "0876pih289fgn8maclihiz9xl66zbi4nbznpdq2xpfbsr1k4sihy";
           system = "3d-transforms-test";
           asd = "3d-transforms-test";
@@ -710,7 +710,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3d-vectors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-vectors/2025-06-22/3d-vectors-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3d-vectors/2025-06-22/3d-vectors-20250622-git.tgz";
           sha256 = "1zmk47ggghajq5b493z2ikjm28ddmva244fsg4dlyp02shan221a";
           system = "3d-vectors";
           asd = "3d-vectors";
@@ -730,7 +730,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "3d-vectors-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/3d-vectors/2025-06-22/3d-vectors-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/3d-vectors/2025-06-22/3d-vectors-20250622-git.tgz";
           sha256 = "1zmk47ggghajq5b493z2ikjm28ddmva244fsg4dlyp02shan221a";
           system = "3d-vectors-test";
           asd = "3d-vectors-test";
@@ -753,7 +753,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-asdf-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz";
           sha256 = "151zfyz7c4xrd4mnyzd5nsla1p70q4iixgm9mlnbm799mr1aprwp";
           system = "40ants-asdf-system";
           asd = "40ants-asdf-system";
@@ -773,7 +773,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-asdf-system-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz";
           sha256 = "151zfyz7c4xrd4mnyzd5nsla1p70q4iixgm9mlnbm799mr1aprwp";
           system = "40ants-asdf-system-ci";
           asd = "40ants-asdf-system-ci";
@@ -793,7 +793,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-asdf-system-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz";
           sha256 = "151zfyz7c4xrd4mnyzd5nsla1p70q4iixgm9mlnbm799mr1aprwp";
           system = "40ants-asdf-system-tests";
           asd = "40ants-asdf-system-tests";
@@ -816,7 +816,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ci/2025-06-22/ci-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ci/2025-06-22/ci-20250622-git.tgz";
           sha256 = "17pmmvwl7a2ixck2jqa47sx6k4v976h0566niy56h1b0fiwzp73a";
           system = "40ants-ci";
           asd = "40ants-ci";
@@ -842,7 +842,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-ci-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ci/2025-06-22/ci-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ci/2025-06-22/ci-20250622-git.tgz";
           sha256 = "17pmmvwl7a2ixck2jqa47sx6k4v976h0566niy56h1b0fiwzp73a";
           system = "40ants-ci-docs";
           asd = "40ants-ci-docs";
@@ -866,7 +866,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-ci-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ci/2025-06-22/ci-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ci/2025-06-22/ci-20250622-git.tgz";
           sha256 = "17pmmvwl7a2ixck2jqa47sx6k4v976h0566niy56h1b0fiwzp73a";
           system = "40ants-ci-tests";
           asd = "40ants-ci-tests";
@@ -886,7 +886,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-doc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz";
           sha256 = "0343172ci1hff6q83fbrpck5j02p0983qdrzsrvbq6kdyfm48l7q";
           system = "40ants-doc";
           asd = "40ants-doc";
@@ -910,7 +910,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-doc-full" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz";
           sha256 = "0343172ci1hff6q83fbrpck5j02p0983qdrzsrvbq6kdyfm48l7q";
           system = "40ants-doc-full";
           asd = "40ants-doc-full";
@@ -958,7 +958,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-doc-plantuml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz";
           sha256 = "04d4ff2rar3y5c6n20ccb7p295iakf93wmc0yrg9fvpjczbh18bk";
           system = "40ants-doc-plantuml";
           asd = "40ants-doc-plantuml";
@@ -986,7 +986,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-doc-plantuml-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz";
           sha256 = "04d4ff2rar3y5c6n20ccb7p295iakf93wmc0yrg9fvpjczbh18bk";
           system = "40ants-doc-plantuml-ci";
           asd = "40ants-doc-plantuml-ci";
@@ -1006,7 +1006,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-doc-plantuml-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz";
           sha256 = "04d4ff2rar3y5c6n20ccb7p295iakf93wmc0yrg9fvpjczbh18bk";
           system = "40ants-doc-plantuml-docs";
           asd = "40ants-doc-plantuml-docs";
@@ -1033,7 +1033,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-doc-plantuml-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/doc-plantuml/2025-06-22/doc-plantuml-20250622-git.tgz";
           sha256 = "04d4ff2rar3y5c6n20ccb7p295iakf93wmc0yrg9fvpjczbh18bk";
           system = "40ants-doc-plantuml-tests";
           asd = "40ants-doc-plantuml-tests";
@@ -1053,7 +1053,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-doc-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/doc/2025-06-22/doc-20250622-git.tgz";
           sha256 = "0343172ci1hff6q83fbrpck5j02p0983qdrzsrvbq6kdyfm48l7q";
           system = "40ants-doc-test";
           asd = "40ants-doc-test";
@@ -1080,7 +1080,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-logging" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
           sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d";
           system = "40ants-logging";
           asd = "40ants-logging";
@@ -1104,7 +1104,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-logging-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
           sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d";
           system = "40ants-logging-ci";
           asd = "40ants-logging-ci";
@@ -1124,7 +1124,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-logging-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
           sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d";
           system = "40ants-logging-docs";
           asd = "40ants-logging-docs";
@@ -1150,7 +1150,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-logging-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
           sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d";
           system = "40ants-logging-example";
           asd = "40ants-logging-example";
@@ -1176,7 +1176,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-logging-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/logging/2025-06-22/logging-20250622-git.tgz";
           sha256 = "1q9zfq50jprhiij87pvhw4wjzzf2yfaxaqbyjj4k5r5lihgk785d";
           system = "40ants-logging-tests";
           asd = "40ants-logging-tests";
@@ -1196,7 +1196,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-plantuml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz";
           sha256 = "0bi3i0cw16aa38xp04xwirdfvwjz862q5yzghpprddi1q5mvxpbf";
           system = "40ants-plantuml";
           asd = "40ants-plantuml";
@@ -1220,7 +1220,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-plantuml-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz";
           sha256 = "0bi3i0cw16aa38xp04xwirdfvwjz862q5yzghpprddi1q5mvxpbf";
           system = "40ants-plantuml-ci";
           asd = "40ants-plantuml-ci";
@@ -1240,7 +1240,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-plantuml-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz";
           sha256 = "0bi3i0cw16aa38xp04xwirdfvwjz862q5yzghpprddi1q5mvxpbf";
           system = "40ants-plantuml-docs";
           asd = "40ants-plantuml-docs";
@@ -1266,7 +1266,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-plantuml-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plantuml/2025-06-22/plantuml-20250622-git.tgz";
           sha256 = "0bi3i0cw16aa38xp04xwirdfvwjz862q5yzghpprddi1q5mvxpbf";
           system = "40ants-plantuml-tests";
           asd = "40ants-plantuml-tests";
@@ -1286,7 +1286,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-routes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz";
           sha256 = "0dc613f8605a88s7ggvkg2vkj5zfhdk9ijcqnh3kvz6258qqhcgr";
           system = "40ants-routes";
           asd = "40ants-routes";
@@ -1313,7 +1313,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-routes-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz";
           sha256 = "0dc613f8605a88s7ggvkg2vkj5zfhdk9ijcqnh3kvz6258qqhcgr";
           system = "40ants-routes-ci";
           asd = "40ants-routes-ci";
@@ -1333,7 +1333,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-routes-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz";
           sha256 = "0dc613f8605a88s7ggvkg2vkj5zfhdk9ijcqnh3kvz6258qqhcgr";
           system = "40ants-routes-docs";
           asd = "40ants-routes-docs";
@@ -1357,7 +1357,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-routes-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/routes/2025-06-22/routes-20250622-git.tgz";
           sha256 = "0dc613f8605a88s7ggvkg2vkj5zfhdk9ijcqnh3kvz6258qqhcgr";
           system = "40ants-routes-tests";
           asd = "40ants-routes-tests";
@@ -1384,7 +1384,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-slynk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz";
           sha256 = "0rz32aaya177s8c4lsasyfff91b2ancjlw8bi50xz150kwqqqmmx";
           system = "40ants-slynk";
           asd = "40ants-slynk";
@@ -1412,7 +1412,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-slynk-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz";
           sha256 = "0rz32aaya177s8c4lsasyfff91b2ancjlw8bi50xz150kwqqqmmx";
           system = "40ants-slynk-ci";
           asd = "40ants-slynk-ci";
@@ -1432,7 +1432,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-slynk-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz";
           sha256 = "0rz32aaya177s8c4lsasyfff91b2ancjlw8bi50xz150kwqqqmmx";
           system = "40ants-slynk-docs";
           asd = "40ants-slynk-docs";
@@ -1458,7 +1458,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "40ants-slynk-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz";
           sha256 = "0rz32aaya177s8c4lsasyfff91b2ancjlw8bi50xz150kwqqqmmx";
           system = "40ants-slynk-tests";
           asd = "40ants-slynk-tests";
@@ -1478,7 +1478,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "a-cl-cairo2-loader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz";
           sha256 = "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q";
           system = "a-cl-cairo2-loader";
           asd = "a-cl-cairo2-loader";
@@ -1498,7 +1498,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "a-cl-logger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz";
           sha256 = "0vhhbnh4akxh0ivqh8r0f2djv2nbf3l9hbbi0b5fdk9bdpziqkb4";
           system = "a-cl-logger";
           asd = "a-cl-logger";
@@ -1528,7 +1528,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "a-cl-logger-logstash" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz";
           sha256 = "0vhhbnh4akxh0ivqh8r0f2djv2nbf3l9hbbi0b5fdk9bdpziqkb4";
           system = "a-cl-logger-logstash";
           asd = "a-cl-logger-logstash";
@@ -1552,7 +1552,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "a-cl-logger-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz";
           sha256 = "0vhhbnh4akxh0ivqh8r0f2djv2nbf3l9hbbi0b5fdk9bdpziqkb4";
           system = "a-cl-logger-tests";
           asd = "a-cl-logger";
@@ -1575,7 +1575,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "aabbcc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "aabbcc";
           asd = "aabbcc";
@@ -1598,7 +1598,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "able" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/able/2017-12-27/able-20171227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/able/2017-12-27/able-20171227-git.tgz";
           sha256 = "1fbcmr6hy7bwlnsnrml3j4b2jkkj8ddxw27l8hr2z6l3fi3qw4hh";
           system = "able";
           asd = "able";
@@ -1622,7 +1622,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "abnf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-abnf/2020-03-25/cl-abnf-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-abnf/2020-03-25/cl-abnf-20200325-git.tgz";
           sha256 = "0f09nsndxa90acm71zd4qdnp40v705a4sqm04mnv9x76h6dlggmz";
           system = "abnf";
           asd = "abnf";
@@ -1645,7 +1645,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "abstract-arrays" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/abstract-arrays/2025-06-22/abstract-arrays-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/abstract-arrays/2025-06-22/abstract-arrays-20250622-git.tgz";
           sha256 = "0d26ig4czff69ws942rwg8126mxxzifb2490pscgk7056m71drkr";
           system = "abstract-arrays";
           asd = "abstract-arrays";
@@ -1670,7 +1670,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "abstract-classes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-abstract-classes/2019-03-07/cl-abstract-classes-20190307-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-abstract-classes/2019-03-07/cl-abstract-classes-20190307-hg.tgz";
           sha256 = "0q03j3ksgn56j9xvs3d3hhasplj3hvg488f4cx1z97nlyqxr5w1d";
           system = "abstract-classes";
           asd = "abstract-classes";
@@ -1690,7 +1690,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "access" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/access/2025-06-22/access-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/access/2025-06-22/access-20250622-git.tgz";
           sha256 = "1m9m97qnih57z7zn470myxs3vpraa0v40b84p2wd1i8qjp9ysbrx";
           system = "access";
           asd = "access";
@@ -1713,7 +1713,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "acclimation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/acclimation/2024-10-12/acclimation-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/acclimation/2024-10-12/acclimation-20241012-git.tgz";
           sha256 = "1rp4794czi01hlv67mgykxym1hqsyn04ldgwiqjwf4lj5d3p7aj4";
           system = "acclimation";
           asd = "acclimation";
@@ -1731,7 +1731,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "acclimation-temperature" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/acclimation/2024-10-12/acclimation-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/acclimation/2024-10-12/acclimation-20241012-git.tgz";
           sha256 = "1rp4794czi01hlv67mgykxym1hqsyn04ldgwiqjwf4lj5d3p7aj4";
           system = "acclimation-temperature";
           asd = "acclimation-temperature";
@@ -1751,7 +1751,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "acl-compat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz";
           sha256 = "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa";
           system = "acl-compat";
           asd = "acl-compat";
@@ -1776,7 +1776,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "acm-random" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz";
           sha256 = "1fb4mnp85jm9s667y4dgz07klhkr9pvi5xbxws28lbb8iip75y2p";
           system = "acm-random";
           asd = "acm-random";
@@ -1799,7 +1799,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "acm-random-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz";
           sha256 = "1fb4mnp85jm9s667y4dgz07klhkr9pvi5xbxws28lbb8iip75y2p";
           system = "acm-random-test";
           asd = "acm-random-test";
@@ -1822,7 +1822,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "action-list" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/action-list/2025-06-22/action-list-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/action-list/2025-06-22/action-list-20250622-git.tgz";
           sha256 = "10x90idgrzhc7blg85mgbr6yrh23rhwavcm4p0kbjmgnnfvvibq9";
           system = "action-list";
           asd = "action-list";
@@ -1845,7 +1845,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "add-two" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/command-line-args/2025-06-22/command-line-args-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/command-line-args/2025-06-22/command-line-args-20250622-git.tgz";
           sha256 = "14x68ww8323vkvql3ryn9wkxf4fbj1brdn4f6mynr7wqygink2bd";
           system = "add-two";
           asd = "add-two";
@@ -1868,7 +1868,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "adhoc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/adhoc/2024-10-12/adhoc-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/adhoc/2024-10-12/adhoc-20241012-git.tgz";
           sha256 = "1h7mnwybapxzpv0zlwr1mr91lsd7wiv722ifa21gczllvrg5qai6";
           system = "adhoc";
           asd = "adhoc";
@@ -1888,7 +1888,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "adhoc-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/adhoc/2024-10-12/adhoc-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/adhoc/2024-10-12/adhoc-20241012-git.tgz";
           sha256 = "1h7mnwybapxzpv0zlwr1mr91lsd7wiv722ifa21gczllvrg5qai6";
           system = "adhoc-tests";
           asd = "adhoc-tests";
@@ -1911,7 +1911,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "adjuvant" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "adjuvant";
           asd = "adjuvant";
@@ -1931,7 +1931,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "adjuvant-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "adjuvant-test";
           asd = "adjuvant-test";
@@ -1954,7 +1954,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "adopt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/adopt/2024-10-12/adopt-20241012-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/adopt/2024-10-12/adopt-20241012-hg.tgz";
           sha256 = "1q36b9bp76daprnhd97h00x56kccmii8pc9w2ra6yihkfbcas41q";
           system = "adopt";
           asd = "adopt";
@@ -1977,7 +1977,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "adopt-subcommands" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/adopt-subcommands/2021-05-31/adopt-subcommands-v0.2.2.tgz";
+          url = "https://beta.quicklisp.org/archive/adopt-subcommands/2021-05-31/adopt-subcommands-v0.2.2.tgz";
           sha256 = "0q35s3ihhlshakjalq5pgf14x502qnj8jimim8yf7bp1p9sn83h8";
           system = "adopt-subcommands";
           asd = "adopt-subcommands";
@@ -2001,7 +2001,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "adopt-subcommands-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/adopt-subcommands/2021-05-31/adopt-subcommands-v0.2.2.tgz";
+          url = "https://beta.quicklisp.org/archive/adopt-subcommands/2021-05-31/adopt-subcommands-v0.2.2.tgz";
           sha256 = "0q35s3ihhlshakjalq5pgf14x502qnj8jimim8yf7bp1p9sn83h8";
           system = "adopt-subcommands-test";
           asd = "adopt-subcommands-test";
@@ -2024,7 +2024,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "adp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/adp/2025-06-22/adp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/adp/2025-06-22/adp-20250622-git.tgz";
           sha256 = "0qa0l0k39xf36f09axwmzyv4fbjys87jaalr5szpdv7h64qp2x1j";
           system = "adp";
           asd = "adp";
@@ -2048,7 +2048,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "adp-github" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/adp-github/2025-06-22/adp-github-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/adp-github/2025-06-22/adp-github-20250622-git.tgz";
           sha256 = "0qja8zh1sibnffnjhl914gzifmxhxfkqylh972mak0i62y6njjqa";
           system = "adp-github";
           asd = "adp-github";
@@ -2075,7 +2075,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "advanced-readtable" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/advanced-readtable/2013-07-20/advanced-readtable-20130720-git.tgz";
+          url = "https://beta.quicklisp.org/archive/advanced-readtable/2013-07-20/advanced-readtable-20130720-git.tgz";
           sha256 = "0dgm3lp9s6792g22swcb085f67q68jsyqj71vicb1wdr9qslvgwm";
           system = "advanced-readtable";
           asd = "advanced-readtable";
@@ -2095,7 +2095,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "aether" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/aether/2025-06-22/aether-v1.2.0.tgz";
+          url = "https://beta.quicklisp.org/archive/aether/2025-06-22/aether-v1.2.0.tgz";
           sha256 = "0c5ab4lkjxr7yyqjzc6lmkmz6ynqzn0yf7bcjg2kg1qzarphjj3n";
           system = "aether";
           asd = "aether";
@@ -2120,7 +2120,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "aether-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/aether/2025-06-22/aether-v1.2.0.tgz";
+          url = "https://beta.quicklisp.org/archive/aether/2025-06-22/aether-v1.2.0.tgz";
           sha256 = "0c5ab4lkjxr7yyqjzc6lmkmz6ynqzn0yf7bcjg2kg1qzarphjj3n";
           system = "aether-tests";
           asd = "aether-tests";
@@ -2143,7 +2143,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "affinity" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/more-cffi/2025-06-22/more-cffi-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/more-cffi/2025-06-22/more-cffi-20250622-git.tgz";
           sha256 = "0z9l5pk6ckbipxdsfwadjl6hp4134w3m3nk7klmzbvd0930cygw3";
           system = "affinity";
           asd = "affinity";
@@ -2170,7 +2170,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "agnostic-lizard" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/agnostic-lizard/2024-10-12/agnostic-lizard-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/agnostic-lizard/2024-10-12/agnostic-lizard-20241012-git.tgz";
           sha256 = "0amzshh6v3mp24j0h2cinv4zvdlg4kih04md5biakwhnmcw4j4pr";
           system = "agnostic-lizard";
           asd = "agnostic-lizard";
@@ -2190,7 +2190,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "agnostic-lizard-debugger-prototype" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/agnostic-lizard/2024-10-12/agnostic-lizard-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/agnostic-lizard/2024-10-12/agnostic-lizard-20241012-git.tgz";
           sha256 = "0amzshh6v3mp24j0h2cinv4zvdlg4kih04md5biakwhnmcw4j4pr";
           system = "agnostic-lizard-debugger-prototype";
           asd = "agnostic-lizard-debugger-prototype";
@@ -2213,7 +2213,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "agutil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/agutil/2021-05-31/agutil-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/agutil/2021-05-31/agutil-20210531-git.tgz";
           sha256 = "10lccrqkaqq0h1p79gjqsqk1nqa6c25n0w7pj39y2gs14s5qr5q9";
           system = "agutil";
           asd = "agutil";
@@ -2234,7 +2234,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "alexa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/alexa/2018-08-31/alexa-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/alexa/2018-08-31/alexa-20180831-git.tgz";
           sha256 = "1y9jyz9gfmd02h492kf7v3mmpbhc0yfh4ka2rzd1vczq6fl8qgqv";
           system = "alexa";
           asd = "alexa";
@@ -2257,7 +2257,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "alexa-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/alexa/2018-08-31/alexa-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/alexa/2018-08-31/alexa-20180831-git.tgz";
           sha256 = "1y9jyz9gfmd02h492kf7v3mmpbhc0yfh4ka2rzd1vczq6fl8qgqv";
           system = "alexa-tests";
           asd = "alexa-tests";
@@ -2280,7 +2280,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "alexandria" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/alexandria/2024-10-12/alexandria-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/alexandria/2024-10-12/alexandria-20241012-git.tgz";
           sha256 = "0jq0n59s0r9yl374f0zpdnaflb5g853yqvax7ka8rnypspyykwdw";
           system = "alexandria";
           asd = "alexandria";
@@ -2298,7 +2298,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "alexandria+" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/alexandria-plus/2025-06-22/alexandria-plus-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/alexandria-plus/2025-06-22/alexandria-plus-20250622-git.tgz";
           sha256 = "09r51sck0andgq6nybsw35583zvyb6prp9jb2rk1ryi1w3grqh9i";
           system = "alexandria+";
           asd = "alexandria+";
@@ -2318,7 +2318,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "algebraic-data-library" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/algebraic-data-library/2018-08-31/algebraic-data-library-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/algebraic-data-library/2018-08-31/algebraic-data-library-20180831-git.tgz";
           sha256 = "0mmakfdwgfjl812ydzbbl81lkv41zfnqhw9ydjk1w63lq8c11cmn";
           system = "algebraic-data-library";
           asd = "algebraic-data-library";
@@ -2338,7 +2338,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "allioli" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/allioli/2024-10-12/allioli-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/allioli/2024-10-12/allioli-20241012-git.tgz";
           sha256 = "00504wf4rxrwpc171czlk56zzbf798c39jzhbipm7ba3iz28qkai";
           system = "allioli";
           asd = "allioli";
@@ -2361,7 +2361,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "also-alsa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/also-alsa/2025-06-22/also-alsa-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/also-alsa/2025-06-22/also-alsa-20250622-git.tgz";
           sha256 = "1aqi9pf1pr68hbncxqwsymsvv21cmwgqyczp2rszy843r9ffrwrl";
           system = "also-alsa";
           asd = "also-alsa";
@@ -2381,7 +2381,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "alternate-asdf-system-connections" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/alternate-asdf-system-connections/2024-10-12/alternate-asdf-system-connections-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/alternate-asdf-system-connections/2024-10-12/alternate-asdf-system-connections-20241012-git.tgz";
           sha256 = "0wlmr29a8azs5kjvwdaqmfn2iwqid0f659cmj34ywchgxahdr6p6";
           system = "alternate-asdf-system-connections";
           asd = "alternate-asdf-system-connections";
@@ -2401,7 +2401,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "amazon-ecs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/amazon-ecs/2011-04-18/amazon-ecs-20110418-git.tgz";
+          url = "https://beta.quicklisp.org/archive/amazon-ecs/2011-04-18/amazon-ecs-20110418-git.tgz";
           sha256 = "1gi3ybfkdfqvgmwgf0l77xpp5xgmkbycdpz6kn79vm0iga3kd2mz";
           system = "amazon-ecs";
           asd = "amazon-ecs";
@@ -2432,7 +2432,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "amb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/amb/2023-02-14/amb-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/amb/2023-02-14/amb-20230214-git.tgz";
           sha256 = "014vpsqxjnsr0x2zql6xpz0kh448p3lqw521amsf6700jqa2s1wp";
           system = "amb";
           asd = "amb";
@@ -2452,7 +2452,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "anaphora" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/anaphora/2022-02-20/anaphora-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/anaphora/2022-02-20/anaphora-20220220-git.tgz";
           sha256 = "1ds5ab0rzkrhfl29xpvmvyxmkdyj9mi19p330pz603lx95njjc0b";
           system = "anaphora";
           asd = "anaphora";
@@ -2470,7 +2470,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "anaphoric-variants" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/anaphoric-variants/2012-10-13/anaphoric-variants-1.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/anaphoric-variants/2012-10-13/anaphoric-variants-1.0.1.tgz";
           sha256 = "02ms01w09b9bzsdsr0icd3ggyl86kyxk164kf0759k2k9y6kjsp5";
           system = "anaphoric-variants";
           asd = "anaphoric-variants";
@@ -2490,7 +2490,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "anatevka" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/anatevka/2025-06-22/anatevka-v1.1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/anatevka/2025-06-22/anatevka-v1.1.0.tgz";
           sha256 = "0cxx28fzs2bmq2mwvw86sh7rrqvnp5ifddsckg4fp8g6ajrb6zjr";
           system = "anatevka";
           asd = "anatevka";
@@ -2513,7 +2513,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "anathema" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/anathema/2025-06-22/anathema-production-0ae10e2a-git.tgz";
+          url = "https://beta.quicklisp.org/archive/anathema/2025-06-22/anathema-production-0ae10e2a-git.tgz";
           sha256 = "0cqi5f4x5yqhn6rh8kmax2fqshqfcpf68glz8fvwyw7v35plsn5x";
           system = "anathema";
           asd = "anathema";
@@ -2540,7 +2540,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "anathema-doom" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/anathema/2025-06-22/anathema-production-0ae10e2a-git.tgz";
+          url = "https://beta.quicklisp.org/archive/anathema/2025-06-22/anathema-production-0ae10e2a-git.tgz";
           sha256 = "0cqi5f4x5yqhn6rh8kmax2fqshqfcpf68glz8fvwyw7v35plsn5x";
           system = "anathema-doom";
           asd = "anathema-doom";
@@ -2560,7 +2560,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ansi-escape" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz";
           sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c";
           system = "ansi-escape";
           asd = "ansi-escape";
@@ -2580,7 +2580,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ansi-escape-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz";
           sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c";
           system = "ansi-escape-test";
           asd = "ansi-escape-test";
@@ -2600,7 +2600,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ansi-test-harness" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ansi-test-harness/2023-10-21/ansi-test-harness-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ansi-test-harness/2023-10-21/ansi-test-harness-20231021-git.tgz";
           sha256 = "168q2358ag5lf7k8378462279q0izllbwqr1axljm0nsn6d4g0yl";
           system = "ansi-test-harness";
           asd = "ansi-test-harness";
@@ -2620,7 +2620,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "antik" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz";
+          url = "https://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz";
           sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0";
           system = "antik";
           asd = "antik";
@@ -2643,7 +2643,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "antik-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz";
+          url = "https://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz";
           sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0";
           system = "antik-base";
           asd = "antik-base";
@@ -2671,7 +2671,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "anypool" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/anypool/2024-10-12/anypool-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/anypool/2024-10-12/anypool-20241012-git.tgz";
           sha256 = "1ffssc5fzh7gj0z94xxfb3mk5cwja65lrhxyfgib15a6yxqf1kk1";
           system = "anypool";
           asd = "anypool";
@@ -2694,7 +2694,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "aplesque" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "aplesque";
           asd = "aplesque";
@@ -2721,7 +2721,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "application" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "application";
           asd = "application";
@@ -2749,7 +2749,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "apply-argv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/apply-argv/2025-06-22/apply-argv-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/apply-argv/2025-06-22/apply-argv-20250622-git.tgz";
           sha256 = "1g15210azg5275zh9p3m9mbvwzlxasgkxl5c3m4bhq8v0pjws2m0";
           system = "apply-argv";
           asd = "apply-argv";
@@ -2769,7 +2769,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "april" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april";
           asd = "april";
@@ -2804,7 +2804,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "april-demo.cnn" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-demo.cnn";
           asd = "april-demo.cnn";
@@ -2827,7 +2827,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "april-demo.fnn" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-demo.fnn";
           asd = "april-demo.fnn";
@@ -2851,7 +2851,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "april-demo.ncurses" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-demo.ncurses";
           asd = "april-demo.ncurses";
@@ -2875,7 +2875,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "april-lib.dfns.array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-lib.dfns.array";
           asd = "april-lib.dfns.array";
@@ -2895,7 +2895,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "april-lib.dfns.graph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-lib.dfns.graph";
           asd = "april-lib.dfns.graph";
@@ -2918,7 +2918,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "april-lib.dfns.numeric" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-lib.dfns.numeric";
           asd = "april-lib.dfns.numeric";
@@ -2941,7 +2941,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "april-lib.dfns.power" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-lib.dfns.power";
           asd = "april-lib.dfns.power";
@@ -2964,7 +2964,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "april-lib.dfns.string" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-lib.dfns.string";
           asd = "april-lib.dfns.string";
@@ -2987,7 +2987,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "april-lib.dfns.tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-lib.dfns.tree";
           asd = "april-lib.dfns.tree";
@@ -3011,7 +3011,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "april-xt.uzuki" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "april-xt.uzuki";
           asd = "april-xt.uzuki";
@@ -3031,7 +3031,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "arc-compat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/arc-compat/2024-10-12/arc-compat-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/arc-compat/2024-10-12/arc-compat-20241012-git.tgz";
           sha256 = "1wmq5mvlkvdbl4562p3n7x8bhv3swjj0yqbly07y8mv0snasns8d";
           system = "arc-compat";
           asd = "arc-compat";
@@ -3058,7 +3058,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "architecture.builder-protocol" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz";
           sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q";
           system = "architecture.builder-protocol";
           asd = "architecture.builder-protocol";
@@ -3078,7 +3078,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "architecture.builder-protocol.inspection" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz";
           sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q";
           system = "architecture.builder-protocol.inspection";
           asd = "architecture.builder-protocol.inspection";
@@ -3101,7 +3101,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "architecture.builder-protocol.json" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz";
           sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q";
           system = "architecture.builder-protocol.json";
           asd = "architecture.builder-protocol.json";
@@ -3125,7 +3125,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "architecture.builder-protocol.print-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz";
           sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q";
           system = "architecture.builder-protocol.print-tree";
           asd = "architecture.builder-protocol.print-tree";
@@ -3149,7 +3149,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "architecture.builder-protocol.universal-builder" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz";
           sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q";
           system = "architecture.builder-protocol.universal-builder";
           asd = "architecture.builder-protocol.universal-builder";
@@ -3173,7 +3173,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "architecture.builder-protocol.xpath" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz";
           sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q";
           system = "architecture.builder-protocol.xpath";
           asd = "architecture.builder-protocol.xpath";
@@ -3197,7 +3197,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "architecture.service-provider" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/architecture.service-provider/2019-10-07/architecture.service-provider-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/architecture.service-provider/2019-10-07/architecture.service-provider-20191007-git.tgz";
           sha256 = "0n4a299md5z0wvk6j3my4ii6cs198fqgizz1swic89p1qz5n2fjm";
           system = "architecture.service-provider";
           asd = "architecture.service-provider";
@@ -3222,7 +3222,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "architecture.service-provider-and-hooks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/architecture.service-provider/2019-10-07/architecture.service-provider-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/architecture.service-provider/2019-10-07/architecture.service-provider-20191007-git.tgz";
           sha256 = "0n4a299md5z0wvk6j3my4ii6cs198fqgizz1swic89p1qz5n2fjm";
           system = "architecture.service-provider-and-hooks";
           asd = "architecture.service-provider-and-hooks";
@@ -3245,7 +3245,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "archive" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/archive/2016-03-18/archive-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/archive/2016-03-18/archive-20160318-git.tgz";
           sha256 = "0pvsc9fmybx7rxd0kmzq4shi6hszdpwdc1sfy7jwyfxf8n3hnv4p";
           system = "archive";
           asd = "archive";
@@ -3268,7 +3268,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "arith" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/paren-test/2017-08-30/paren-test-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/paren-test/2017-08-30/paren-test-20170830-git.tgz";
           sha256 = "0b2d3kcv3n4b0dm67pzhxx8wxjsgnb32bw2dsprblc7149gaczdr";
           system = "arith";
           asd = "arith";
@@ -3292,7 +3292,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "arithmetic-operators-as-words" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/arithmetic-operators-as-words/2020-06-10/arithmetic-operators-as-words-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/arithmetic-operators-as-words/2020-06-10/arithmetic-operators-as-words-20200610-git.tgz";
           sha256 = "1bcfkbq3kqns2ng0cdmj81c72j63641pqlskg4xrzkgkh25bhkks";
           system = "arithmetic-operators-as-words";
           asd = "arithmetic-operators-as-words";
@@ -3312,7 +3312,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "arnesi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/arnesi/2025-06-22/arnesi-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/arnesi/2025-06-22/arnesi-20250622-git.tgz";
           sha256 = "1z99bmvlb2rhklad6dbvc4wnvp2b2ixdjvm9s1bsa9qryz360p99";
           system = "arnesi";
           asd = "arnesi";
@@ -3330,7 +3330,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "array-operations" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/array-operations/2023-10-21/array-operations-1.2.1.tgz";
+          url = "https://beta.quicklisp.org/archive/array-operations/2023-10-21/array-operations-1.2.1.tgz";
           sha256 = "06zg7ds7c1vi59zxzrd52a9zfpw8x0jsf1hqcdgaz8s3dcfma3mn";
           system = "array-operations";
           asd = "array-operations";
@@ -3351,7 +3351,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "array-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/array-utils/2024-10-12/array-utils-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/array-utils/2024-10-12/array-utils-20241012-git.tgz";
           sha256 = "0rya7k9sfpyrn5vrn12wywpgsr2f0pmcywv51ixzb0sv8ska0mhs";
           system = "array-utils";
           asd = "array-utils";
@@ -3369,7 +3369,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "array-utils-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/array-utils/2024-10-12/array-utils-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/array-utils/2024-10-12/array-utils-20241012-git.tgz";
           sha256 = "0rya7k9sfpyrn5vrn12wywpgsr2f0pmcywv51ixzb0sv8ska0mhs";
           system = "array-utils-test";
           asd = "array-utils-test";
@@ -3392,7 +3392,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "arrival" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/arrival/2021-12-09/arrival-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/arrival/2021-12-09/arrival-20211209-git.tgz";
           sha256 = "1iwdk5fdismw91ln5wdnn8c8xv06fbgiwbvdj2gy2hpp8f3qk00b";
           system = "arrival";
           asd = "arrival";
@@ -3418,7 +3418,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "arrow-macros" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/arrow-macros/2024-10-12/arrow-macros-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/arrow-macros/2024-10-12/arrow-macros-20241012-git.tgz";
           sha256 = "0q4vpysk4h9ghs5zmnzzilky9jyz7i8n0x0p98nq528crbrkh6c4";
           system = "arrow-macros";
           asd = "arrow-macros";
@@ -3438,7 +3438,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "arrow-macros-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/arrow-macros/2024-10-12/arrow-macros-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/arrow-macros/2024-10-12/arrow-macros-20241012-git.tgz";
           sha256 = "0q4vpysk4h9ghs5zmnzzilky9jyz7i8n0x0p98nq528crbrkh6c4";
           system = "arrow-macros-test";
           asd = "arrow-macros-test";
@@ -3461,7 +3461,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "arrows" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/arrows/2018-10-18/arrows-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/arrows/2018-10-18/arrows-20181018-git.tgz";
           sha256 = "042k9vkssrqx9nhp14wdzm942zgdxvp35mba0p2syz98i75im2yy";
           system = "arrows";
           asd = "arrows";
@@ -3479,7 +3479,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ascii-strings" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz";
           sha256 = "0zndlkw3qy3vw4px4qv884z6232w8zfaliyc88irjwizdv35wcq9";
           system = "ascii-strings";
           asd = "ascii-strings";
@@ -3502,7 +3502,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asd-generator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asd-generator/2019-01-07/asd-generator-20190107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asd-generator/2019-01-07/asd-generator-20190107-git.tgz";
           sha256 = "0yiybl7b9x1f85v0drj0yw9821y3yfhya4n6gycnv5vvx6jp9by4";
           system = "asd-generator";
           asd = "asd-generator";
@@ -3527,7 +3527,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asd-generator-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asd-generator/2019-01-07/asd-generator-20190107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asd-generator/2019-01-07/asd-generator-20190107-git.tgz";
           sha256 = "0yiybl7b9x1f85v0drj0yw9821y3yfhya4n6gycnv5vvx6jp9by4";
           system = "asd-generator-test";
           asd = "asd-generator-test";
@@ -3551,7 +3551,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asdf-dependency-graph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asdf-dependency-graph/2023-06-18/asdf-dependency-graph-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asdf-dependency-graph/2023-06-18/asdf-dependency-graph-20230618-git.tgz";
           sha256 = "1m3cgjmr5fzyas33gjnahcbjiiksr02h2lwdxxl35y2dbip8pygp";
           system = "asdf-dependency-graph";
           asd = "asdf-dependency-graph";
@@ -3571,7 +3571,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asdf-dependency-grovel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asdf-dependency-grovel/2017-04-03/asdf-dependency-grovel-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asdf-dependency-grovel/2017-04-03/asdf-dependency-grovel-20170403-git.tgz";
           sha256 = "1y4kdqsda4ira4r9dws6kxzzv6mg45q3lkmb2c9mg9q7ksc5glif";
           system = "asdf-dependency-grovel";
           asd = "asdf-dependency-grovel";
@@ -3591,7 +3591,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asdf-driver" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uiop/2024-10-12/uiop-3.3.7.tgz";
+          url = "https://beta.quicklisp.org/archive/uiop/2024-10-12/uiop-3.3.7.tgz";
           sha256 = "0xvzxglkf9hlly7if0l307k31kwglk2ay4k393545c1l5l1ac584";
           system = "asdf-driver";
           asd = "asdf-driver";
@@ -3611,7 +3611,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asdf-encodings" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asdf-encodings/2019-10-07/asdf-encodings-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asdf-encodings/2019-10-07/asdf-encodings-20191007-git.tgz";
           sha256 = "1yn77nhrz5w2s7nlafxjnk9j8fsrz7ivrm7nbj4r726bwc5knky6";
           system = "asdf-encodings";
           asd = "asdf-encodings";
@@ -3631,7 +3631,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asdf-finalizers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asdf-finalizers/2022-11-06/asdf-finalizers-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asdf-finalizers/2022-11-06/asdf-finalizers-20221106-git.tgz";
           sha256 = "1w56c9yjjydjshsgqxz57qlp2v3r4ilbisnsgiqphvxnhvd41y0v";
           system = "asdf-finalizers";
           asd = "asdf-finalizers";
@@ -3651,7 +3651,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asdf-linguist" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asdf-linguist/2015-09-23/asdf-linguist-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asdf-linguist/2015-09-23/asdf-linguist-20150923-git.tgz";
           sha256 = "14jaqmxxh70f1jf58mxb117951iql2sjxymmbjyqniqwazznbd9a";
           system = "asdf-linguist";
           asd = "asdf-linguist";
@@ -3674,7 +3674,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asdf-manager" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asdf-manager/2016-02-08/asdf-manager-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asdf-manager/2016-02-08/asdf-manager-20160208-git.tgz";
           sha256 = "0jw7d0vg13v1l1fwwhsw04n6w3c49vsbmq6vrlrkh95aayc5413w";
           system = "asdf-manager";
           asd = "asdf-manager";
@@ -3697,7 +3697,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asdf-manager-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asdf-manager/2016-02-08/asdf-manager-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asdf-manager/2016-02-08/asdf-manager-20160208-git.tgz";
           sha256 = "0jw7d0vg13v1l1fwwhsw04n6w3c49vsbmq6vrlrkh95aayc5413w";
           system = "asdf-manager-test";
           asd = "asdf-manager-test";
@@ -3720,7 +3720,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asdf-nst" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
           sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga";
           system = "asdf-nst";
           asd = "asdf-nst";
@@ -3740,7 +3740,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asdf-package-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz";
           sha256 = "1q4qgvbl64c4zdbq91by1la8licdgam7ybnhvg2bixdhq4v693sj";
           system = "asdf-package-system";
           asd = "asdf-package-system";
@@ -3758,7 +3758,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asdf-system-connections" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz";
           sha256 = "06kg0m8bv383qq3r34x0f8hz6p6zxcw02qn7kj960vcnrp5a5b3y";
           system = "asdf-system-connections";
           asd = "asdf-system-connections";
@@ -3776,7 +3776,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asdf-viz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asdf-viz/2020-06-10/asdf-viz-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asdf-viz/2020-06-10/asdf-viz-20200610-git.tgz";
           sha256 = "1hj9ac1m2kz8x65n62gd1s2k2x9pip9a85pnmib53qsks3a9sc4z";
           system = "asdf-viz";
           asd = "asdf-viz";
@@ -3802,7 +3802,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "aserve" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz";
           sha256 = "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa";
           system = "aserve";
           asd = "aserve";
@@ -3825,7 +3825,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asn1" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asn1/2022-03-31/asn1-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asn1/2022-03-31/asn1-20220331-git.tgz";
           sha256 = "16gs4xznmg19ii0cg7g2yxrk9ls5vah8ynjj80s99rv8wi3789z1";
           system = "asn1";
           asd = "asn1";
@@ -3849,7 +3849,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "assert-p" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/assert-p/2020-06-10/assert-p-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/assert-p/2020-06-10/assert-p-20200610-git.tgz";
           sha256 = "1x24rkqkqiw8zd26swi9rmhfplkmr5scz3bhjwccah9d2s36b1xs";
           system = "assert-p";
           asd = "assert-p";
@@ -3872,7 +3872,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "assertion-error" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/assertion-error/2019-12-27/assertion-error-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/assertion-error/2019-12-27/assertion-error-20191227-git.tgz";
           sha256 = "0ix23kkakmf4nwx852zsssb831jvajr3qyppqfyks7y1ls617svn";
           system = "assertion-error";
           asd = "assertion-error";
@@ -3892,7 +3892,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "assoc-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/assoc-utils/2024-10-12/assoc-utils-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/assoc-utils/2024-10-12/assoc-utils-20241012-git.tgz";
           sha256 = "0rgfv9qni9dnmm3qnaf1x67h0z38vw2zbmbsdk3a4x5s8ckxln6r";
           system = "assoc-utils";
           asd = "assoc-utils";
@@ -3912,7 +3912,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "assoc-utils-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/assoc-utils/2024-10-12/assoc-utils-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/assoc-utils/2024-10-12/assoc-utils-20241012-git.tgz";
           sha256 = "0rgfv9qni9dnmm3qnaf1x67h0z38vw2zbmbsdk3a4x5s8ckxln6r";
           system = "assoc-utils-test";
           asd = "assoc-utils-test";
@@ -3935,7 +3935,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "asteroids" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asteroids/2019-10-07/asteroids-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asteroids/2019-10-07/asteroids-20191007-git.tgz";
           sha256 = "1wdzwpizgy477ny6pxjshj3q25phdxsjfq8cvrbx0x7k5w8fkg50";
           system = "asteroids";
           asd = "asteroids";
@@ -3959,7 +3959,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "astonish" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/astonish/2021-01-24/astonish-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/astonish/2021-01-24/astonish-20210124-git.tgz";
           sha256 = "14qphx97q4gqcc71figc6r3cgy89rn9c43sh35fzxkln9ydk2pr6";
           system = "astonish";
           asd = "astonish";
@@ -3979,7 +3979,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "async-process" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/async-process/2025-06-22/async-process-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/async-process/2025-06-22/async-process-20250622-git.tgz";
           sha256 = "0ykbkmcf46rgiphsb8c03xf9l4l23xn1rppm51mviz7brs0zx7g4";
           system = "async-process";
           asd = "async-process";
@@ -3999,7 +3999,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "atdoc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/atdoc/2012-03-05/atdoc-20120305-git.tgz";
+          url = "https://beta.quicklisp.org/archive/atdoc/2012-03-05/atdoc-20120305-git.tgz";
           sha256 = "1w54phadjj00sy5qz5n0hmhzyjrx26h9hw06756zdpfbzk4f5il6";
           system = "atdoc";
           asd = "atdoc";
@@ -4026,7 +4026,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "atomics" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/atomics/2025-06-22/atomics-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/atomics/2025-06-22/atomics-20250622-git.tgz";
           sha256 = "14x6mahmwxjm91zvg59z189l081ww6wlia7gbamj8ydx214014cl";
           system = "atomics";
           asd = "atomics";
@@ -4046,7 +4046,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "atomics-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/atomics/2025-06-22/atomics-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/atomics/2025-06-22/atomics-20250622-git.tgz";
           sha256 = "14x6mahmwxjm91zvg59z189l081ww6wlia7gbamj8ydx214014cl";
           system = "atomics-test";
           asd = "atomics-test";
@@ -4069,7 +4069,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "audio-tag" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/audio-tag/2021-05-31/audio-tag-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/audio-tag/2021-05-31/audio-tag-20210531-git.tgz";
           sha256 = "1k9152wakazr34q4q5x8zzv3mjjkf0n9xdg7c2qqwigwws0ysgzh";
           system = "audio-tag";
           asd = "audio-tag";
@@ -4092,7 +4092,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "authenticated-encryption" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/authenticated-encryption/2018-10-18/authenticated-encryption-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/authenticated-encryption/2018-10-18/authenticated-encryption-20181018-git.tgz";
           sha256 = "0cvl4g0g59z5dicg7q3f9hhqshz2m0a6l2fzic75c3yv28q8m2vr";
           system = "authenticated-encryption";
           asd = "authenticated-encryption";
@@ -4112,7 +4112,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "authenticated-encryption-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/authenticated-encryption/2018-10-18/authenticated-encryption-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/authenticated-encryption/2018-10-18/authenticated-encryption-20181018-git.tgz";
           sha256 = "0cvl4g0g59z5dicg7q3f9hhqshz2m0a6l2fzic75c3yv28q8m2vr";
           system = "authenticated-encryption-test";
           asd = "authenticated-encryption-test";
@@ -4135,7 +4135,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "auto-restart" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/auto-restart/2025-06-22/auto-restart-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/auto-restart/2025-06-22/auto-restart-20250622-git.tgz";
           sha256 = "0dmdxq04m70b0cl2vag31f5c3gsyv46w335igzrvxy45irjb4h7v";
           system = "auto-restart";
           asd = "auto-restart";
@@ -4155,7 +4155,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "autoexport" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/autoexport/2021-10-20/autoexport-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/autoexport/2021-10-20/autoexport-20211020-git.tgz";
           sha256 = "15kzq4hfsracxapxik3i6sxqqnwl7cb9lisgk9krrsk13d97l844";
           system = "autoexport";
           asd = "autoexport";
@@ -4178,7 +4178,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "autoload" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
           sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
           system = "autoload";
           asd = "autoload";
@@ -4198,7 +4198,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "automaton" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "automaton";
           asd = "automaton";
@@ -4218,7 +4218,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "avatar-api" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/avatar-api/2015-06-08/avatar-api-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/avatar-api/2015-06-08/avatar-api-20150608-git.tgz";
           sha256 = "026s8m0bl13iqyakfxc6zwacvpj2bxxipms1kl3k9ql99yn8imvr";
           system = "avatar-api";
           asd = "avatar-api";
@@ -4242,7 +4242,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "avatar-api-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/avatar-api/2015-06-08/avatar-api-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/avatar-api/2015-06-08/avatar-api-20150608-git.tgz";
           sha256 = "026s8m0bl13iqyakfxc6zwacvpj2bxxipms1kl3k9ql99yn8imvr";
           system = "avatar-api-test";
           asd = "avatar-api-test";
@@ -4265,7 +4265,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "avl-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/avl-tree/2022-07-07/avl-tree-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/avl-tree/2022-07-07/avl-tree-20220707-git.tgz";
           sha256 = "1xvh5rpz0kwzx42jrnh3kgqa87z5kmgd7f3fkkydiqj04hknsj7k";
           system = "avl-tree";
           asd = "avl-tree";
@@ -4285,7 +4285,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "aws-foundation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/aws-foundation/2018-07-11/aws-foundation-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/aws-foundation/2018-07-11/aws-foundation-20180711-git.tgz";
           sha256 = "1f5af22qw583frqjhnkf9wcccdkkpjiv0bbnlqqk7fxzm9pqpvhb";
           system = "aws-foundation";
           asd = "aws-foundation";
@@ -4312,7 +4312,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "aws-sdk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/aws-sdk-lisp/2025-06-22/aws-sdk-lisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/aws-sdk-lisp/2025-06-22/aws-sdk-lisp-20250622-git.tgz";
           sha256 = "023isx4p9laia3yq39g3zdak1zl3mc7gnkjhsx386akwdjha5j95";
           system = "aws-sdk";
           asd = "aws-sdk";
@@ -4350,7 +4350,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "aws-sign4" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz";
           sha256 = "1bwqmy9vlq0ilwhp48y05cdfav9inwv4kai8mjj1a95776xjmjnk";
           system = "aws-sign4";
           asd = "aws-sign4";
@@ -4377,7 +4377,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "aws-sign4-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz";
           sha256 = "1bwqmy9vlq0ilwhp48y05cdfav9inwv4kai8mjj1a95776xjmjnk";
           system = "aws-sign4-example";
           asd = "aws-sign4";
@@ -4400,7 +4400,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "aws-sign4-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz";
           sha256 = "1bwqmy9vlq0ilwhp48y05cdfav9inwv4kai8mjj1a95776xjmjnk";
           system = "aws-sign4-tests";
           asd = "aws-sign4";
@@ -4420,7 +4420,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ayah-captcha" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ayah-captcha/2018-02-28/ayah-captcha-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ayah-captcha/2018-02-28/ayah-captcha-20180228-git.tgz";
           sha256 = "1l9zg0hj5cd1yda1nnab7byrgkakh5vn3qcd4lmfidbijk6kiamw";
           system = "ayah-captcha";
           asd = "ayah-captcha";
@@ -4443,7 +4443,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ayah-captcha-demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ayah-captcha/2018-02-28/ayah-captcha-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ayah-captcha/2018-02-28/ayah-captcha-20180228-git.tgz";
           sha256 = "1l9zg0hj5cd1yda1nnab7byrgkakh5vn3qcd4lmfidbijk6kiamw";
           system = "ayah-captcha-demo";
           asd = "ayah-captcha-demo";
@@ -4467,7 +4467,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "babel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz";
           sha256 = "0359bj3yr6frybcmg8qr5vi4q8hzbsb7hmvxdc0jgkfz3c33q667";
           system = "babel";
           asd = "babel";
@@ -4488,7 +4488,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "babel-streams" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz";
           sha256 = "0359bj3yr6frybcmg8qr5vi4q8hzbsb7hmvxdc0jgkfz3c33q667";
           system = "babel-streams";
           asd = "babel-streams";
@@ -4512,7 +4512,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "babel-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz";
           sha256 = "0359bj3yr6frybcmg8qr5vi4q8hzbsb7hmvxdc0jgkfz3c33q667";
           system = "babel-tests";
           asd = "babel-tests";
@@ -4535,7 +4535,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "babylon" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/babylon/2023-10-21/babylon-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/babylon/2023-10-21/babylon-20231021-git.tgz";
           sha256 = "14k9kvcfyfpn74l5ij5mdc7zlj9vnlnig8piqw0wm5gq9pxmhydg";
           system = "babylon";
           asd = "babylon";
@@ -4558,7 +4558,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "base";
           asd = "base";
@@ -4578,7 +4578,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "base-blobs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/base-blobs/2020-10-16/base-blobs-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/base-blobs/2020-10-16/base-blobs-stable-git.tgz";
           sha256 = "06m8rvczj309wq8by697gvrklhff5mnn5n5sky7i11bnszrxysys";
           system = "base-blobs";
           asd = "base-blobs";
@@ -4601,7 +4601,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "base64" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/base64/2018-10-18/base64-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/base64/2018-10-18/base64-20181018-git.tgz";
           sha256 = "0qkqcrgmcqshcsnzn4pcyk8d1j9c7pks2qf51p1hfybz5shxkqkh";
           system = "base64";
           asd = "base64";
@@ -4621,7 +4621,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "basic-binary-ipc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/basic-binary-ipc/2021-12-09/basic-binary-ipc-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/basic-binary-ipc/2021-12-09/basic-binary-ipc-20211209-git.tgz";
           sha256 = "0bsxy27mnmzr6vys96cs2is57zvk0n9hlif9llnp4q9m2wzycbwm";
           system = "basic-binary-ipc";
           asd = "basic-binary-ipc";
@@ -4641,7 +4641,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "basic-binary-ipc-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/basic-binary-ipc/2021-12-09/basic-binary-ipc-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/basic-binary-ipc/2021-12-09/basic-binary-ipc-20211209-git.tgz";
           sha256 = "0bsxy27mnmzr6vys96cs2is57zvk0n9hlif9llnp4q9m2wzycbwm";
           system = "basic-binary-ipc-tests";
           asd = "basic-binary-ipc-tests";
@@ -4665,7 +4665,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "batis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-batis/2025-06-22/cl-batis-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-batis/2025-06-22/cl-batis-20250622-git.tgz";
           sha256 = "1hmgvp32ivs34xj6a5nnrmj16kphdckz1ygfkrb5f0iwr305qbjf";
           system = "batis";
           asd = "batis";
@@ -4691,7 +4691,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "batis-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-batis/2025-06-22/cl-batis-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-batis/2025-06-22/cl-batis-20250622-git.tgz";
           sha256 = "1hmgvp32ivs34xj6a5nnrmj16kphdckz1ygfkrb5f0iwr305qbjf";
           system = "batis-test";
           asd = "batis-test";
@@ -4714,7 +4714,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bdef" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bdef/2025-06-22/bdef-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bdef/2025-06-22/bdef-20250622-git.tgz";
           sha256 = "0cq89xn527ryq140j2i08zpyz4lsyb90zz3hrh2qx841k73168i5";
           system = "bdef";
           asd = "bdef";
@@ -4741,7 +4741,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "beast" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/beast/2021-10-20/beast-20211020-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/beast/2021-10-20/beast-20211020-hg.tgz";
           sha256 = "0rb7yxr4clsdbgyjz9d8inxgj7zs0knrngl7gb6b8ky1vyrv12k4";
           system = "beast";
           asd = "beast";
@@ -4761,7 +4761,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "beirc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/beirc/2015-05-05/beirc-20150505-git.tgz";
+          url = "https://beta.quicklisp.org/archive/beirc/2015-05-05/beirc-20150505-git.tgz";
           sha256 = "1jmxihxln51vxy85r3zx0gfrzs9ng8nmj87j5ws1fg8bwv8b2zc4";
           system = "beirc";
           asd = "beirc";
@@ -4787,7 +4787,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bencode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bencode/2018-02-28/cl-bencode-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bencode/2018-02-28/cl-bencode-20180228-git.tgz";
           sha256 = "02n9cv5jbgzjwmw11c1a557r62m4i4gmmx38csscbq0cv6vzys1j";
           system = "bencode";
           asd = "bencode";
@@ -4807,7 +4807,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bencode-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bencode/2018-02-28/cl-bencode-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bencode/2018-02-28/cl-bencode-20180228-git.tgz";
           sha256 = "02n9cv5jbgzjwmw11c1a557r62m4i4gmmx38csscbq0cv6vzys1j";
           system = "bencode-test";
           asd = "bencode";
@@ -4831,7 +4831,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bermuda" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pal/2015-06-08/pal-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pal/2015-06-08/pal-20150608-git.tgz";
           sha256 = "0kn6jxirrn7wzqymzsi0kx2ivl0nrrcgbl4dm1714s48qw0jwhcw";
           system = "bermuda";
           asd = "bermuda";
@@ -4851,7 +4851,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bert" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bert/2014-11-06/cl-bert-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bert/2014-11-06/cl-bert-20141106-git.tgz";
           sha256 = "18cyk63dmcqqwsld4h65mzscgjsc085ws69z097naqm1r70kkygr";
           system = "bert";
           asd = "bert";
@@ -4874,7 +4874,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bibtex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bibtex/2018-12-10/cl-bibtex-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bibtex/2018-12-10/cl-bibtex-20181210-git.tgz";
           sha256 = "1rb4yf1z0vvl6z4kyj0s81kq1pvxwpvbgiaraqllgj1wpf51m78h";
           system = "bibtex";
           asd = "bibtex";
@@ -4894,7 +4894,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "big-string" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/big-string/2023-06-18/big-string-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/big-string/2023-06-18/big-string-20230618-git.tgz";
           sha256 = "03w0y3x9sm0fv0dclmrnh55i83nviz7pw7mdg6di05gw03bnslrc";
           system = "big-string";
           asd = "big-string";
@@ -4914,7 +4914,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bike" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bike/2025-06-22/bike-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bike/2025-06-22/bike-20250622-git.tgz";
           sha256 = "1d7jcmhqvyc7g4hw76sybc40xla32abpdxjlma677shvvfv9qv5c";
           system = "bike";
           asd = "bike";
@@ -4947,7 +4947,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bike-internals" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bike/2025-06-22/bike-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bike/2025-06-22/bike-20250622-git.tgz";
           sha256 = "1d7jcmhqvyc7g4hw76sybc40xla32abpdxjlma677shvvfv9qv5c";
           system = "bike-internals";
           asd = "bike-internals";
@@ -4978,7 +4978,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "binary-io" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/binary-io/2025-06-22/binary-io-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/binary-io/2025-06-22/binary-io-20250622-git.tgz";
           sha256 = "1pwvmbnzs15dfvb67b5wchch2b24h6lfs30676y4h4m84jqjr0vg";
           system = "binary-io";
           asd = "binary-io";
@@ -5001,7 +5001,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "binary-lass" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lass/2025-06-22/lass-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lass/2025-06-22/lass-20250622-git.tgz";
           sha256 = "0pj9p7asqaqjakjjn8i7k6lb9piakjxd8xa732c88q5qijbmvkb2";
           system = "binary-lass";
           asd = "binary-lass";
@@ -5021,7 +5021,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "binary-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/binary-parser/2023-02-14/binary-parser-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/binary-parser/2023-02-14/binary-parser-20230214-git.tgz";
           sha256 = "06lq5iv0ap6qnsrc73rmnr9qirllyz4yxsvimj6ny5wl2hn8i9jl";
           system = "binary-parser";
           asd = "binary-parser";
@@ -5046,7 +5046,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "binary-search-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/binary-search-tree/2022-07-07/binary-search-tree-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/binary-search-tree/2022-07-07/binary-search-tree-20220707-git.tgz";
           sha256 = "1k7p5dgziwni5yma7q3sbnr23kk2730vzb7ap6knnazpp0smgclf";
           system = "binary-search-tree";
           asd = "binary-search-tree";
@@ -5066,7 +5066,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "binary-structures" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/binary-structures/2025-06-22/binary-structures-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/binary-structures/2025-06-22/binary-structures-20250622-git.tgz";
           sha256 = "15i2s639pc1s6jw1zzlh114bgkzv61ykdi51g1dah206fwp4lbn7";
           system = "binary-structures";
           asd = "binary-structures";
@@ -5093,7 +5093,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "binary-types" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/binary-types/2013-06-15/binary-types-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/binary-types/2013-06-15/binary-types-20130615-git.tgz";
           sha256 = "1bh65p9vg2kgh4m8q1a4jiyncnp5prdzh0d0l4pzh3jvfhgbm0gh";
           system = "binary-types";
           asd = "binary-types";
@@ -5113,7 +5113,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "binascii" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/binascii/2015-07-09/binascii-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/binascii/2015-07-09/binascii-20150709-git.tgz";
           sha256 = "000rcdl8qshr7n48zq9bzrc4lkjx4ylb3r3w9x9syhiwfla9j4b7";
           system = "binascii";
           asd = "binascii";
@@ -5133,7 +5133,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "binascii-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/binascii/2015-07-09/binascii-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/binascii/2015-07-09/binascii-20150709-git.tgz";
           sha256 = "000rcdl8qshr7n48zq9bzrc4lkjx4ylb3r3w9x9syhiwfla9j4b7";
           system = "binascii-tests";
           asd = "binascii";
@@ -5153,7 +5153,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "binding-arrows" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/binding-arrows/2024-10-12/binding-arrows-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/binding-arrows/2024-10-12/binding-arrows-20241012-git.tgz";
           sha256 = "0kzybw5qlb49czh9v2lnxniz9jzqx306a6lnarfv59x48a7cch22";
           system = "binding-arrows";
           asd = "binding-arrows";
@@ -5173,7 +5173,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "binding-knx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz";
           sha256 = "00wqwgdzfnwxkm1bd42axp69bpl0gs99i7a3mq2x6q1dvn1rczac";
           system = "binding-knx";
           asd = "binding-knx";
@@ -5196,7 +5196,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "binfix" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/binfix/2019-08-13/binfix-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/binfix/2019-08-13/binfix-20190813-git.tgz";
           sha256 = "07925kj32y7ppwmz62c08gd0s6yp12s6nz1wh0pzh0ccq9nwgzhz";
           system = "binfix";
           asd = "binfix";
@@ -5216,7 +5216,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "binomial-heap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/binomial-heap/2013-04-20/binomial-heap-20130420-git.tgz";
+          url = "https://beta.quicklisp.org/archive/binomial-heap/2013-04-20/binomial-heap-20130420-git.tgz";
           sha256 = "1d4jrlkdjdppnvqpqkr7i7djpgmrvrbky4pc1pxvqci5jx7xlkk6";
           system = "binomial-heap";
           asd = "binomial-heap";
@@ -5234,7 +5234,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "binpack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/binpack/2023-02-14/binpack-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/binpack/2023-02-14/binpack-20230214-git.tgz";
           sha256 = "0cfflx7aqmkzsljjaw0dwk49ii0vxm7d07s4gyrszb7zbpmz0jri";
           system = "binpack";
           asd = "binpack";
@@ -5252,7 +5252,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "binpack-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/binpack/2023-02-14/binpack-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/binpack/2023-02-14/binpack-20230214-git.tgz";
           sha256 = "0cfflx7aqmkzsljjaw0dwk49ii0vxm7d07s4gyrszb7zbpmz0jri";
           system = "binpack-test";
           asd = "binpack-test";
@@ -5275,7 +5275,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "birch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/birch/2024-10-12/birch-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/birch/2024-10-12/birch-20241012-git.tgz";
           sha256 = "1b24xng92ra7420s3zy44pybk4h7xg4kjwdk35arl46badgi28r1";
           system = "birch";
           asd = "birch";
@@ -5301,7 +5301,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "birch.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/birch/2024-10-12/birch-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/birch/2024-10-12/birch-20241012-git.tgz";
           sha256 = "1b24xng92ra7420s3zy44pybk4h7xg4kjwdk35arl46badgi28r1";
           system = "birch.test";
           asd = "birch.test";
@@ -5325,7 +5325,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bit-ops" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bit-ops/2018-02-28/bit-ops-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bit-ops/2018-02-28/bit-ops-20180228-git.tgz";
           sha256 = "0rwmm438bgxfl5ab1vnrsxgimxnr3d5kjv9a0yzmlnbg9i2hyhz7";
           system = "bit-ops";
           asd = "bit-ops";
@@ -5351,7 +5351,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bit-ops.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bit-ops/2018-02-28/bit-ops-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bit-ops/2018-02-28/bit-ops-20180228-git.tgz";
           sha256 = "0rwmm438bgxfl5ab1vnrsxgimxnr3d5kjv9a0yzmlnbg9i2hyhz7";
           system = "bit-ops.test";
           asd = "bit-ops.test";
@@ -5374,7 +5374,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bit-smasher" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bit-smasher/2022-11-06/bit-smasher-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bit-smasher/2022-11-06/bit-smasher-20221106-git.tgz";
           sha256 = "1dad4x9sjq45zz8rys6rflsklmw77631r3k4g248ynmaqkdaqjyd";
           system = "bit-smasher";
           asd = "bit-smasher";
@@ -5397,7 +5397,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bit-smasher-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bit-smasher/2022-11-06/bit-smasher-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bit-smasher/2022-11-06/bit-smasher-20221106-git.tgz";
           sha256 = "1dad4x9sjq45zz8rys6rflsklmw77631r3k4g248ynmaqkdaqjyd";
           system = "bit-smasher-test";
           asd = "bit-smasher-test";
@@ -5421,7 +5421,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bitfield" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bitfield/2021-12-30/bitfield-20211230-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bitfield/2021-12-30/bitfield-20211230-git.tgz";
           sha256 = "1137kdj5imc5gj9g6hj4w6ksqnqppgm3knzv7j2f8r5qpfl8rfl2";
           system = "bitfield";
           asd = "bitfield";
@@ -5441,7 +5441,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bitfield-schema" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bitfield-schema/2012-01-07/bitfield-schema-20120107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bitfield-schema/2012-01-07/bitfield-schema-20120107-git.tgz";
           sha256 = "08xkl7rbfhrx8vj98zj1lmhv6pfg2f5gk14xj7qys7mkj2iv4li6";
           system = "bitfield-schema";
           asd = "bitfield-schema";
@@ -5461,7 +5461,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bitio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bitio/2022-02-20/bitio-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bitio/2022-02-20/bitio-20220220-git.tgz";
           sha256 = "0z2yn19nxg46j274nxzry255z86p0y3p68s1f2sg7rx9y2nx3rjg";
           system = "bitio";
           asd = "bitio";
@@ -5486,7 +5486,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bk-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bk-tree/2013-04-20/bk-tree-20130420-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bk-tree/2013-04-20/bk-tree-20130420-git.tgz";
           sha256 = "1nrz6fwzvkzvs6ipc5rgas77p5hv5bnaw2in5760v240gg7lxqzz";
           system = "bk-tree";
           asd = "bk-tree";
@@ -5506,7 +5506,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bknr.data.impex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
           sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj";
           system = "bknr.data.impex";
           asd = "bknr.data.impex";
@@ -5533,7 +5533,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bknr.datastore" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
           sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj";
           system = "bknr.datastore";
           asd = "bknr.datastore";
@@ -5562,7 +5562,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bknr.impex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
           sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj";
           system = "bknr.impex";
           asd = "bknr.impex";
@@ -5589,7 +5589,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bknr.indices" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
           sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj";
           system = "bknr.indices";
           asd = "bknr.indices";
@@ -5614,7 +5614,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bknr.modules" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz";
           sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2";
           system = "bknr.modules";
           asd = "bknr.modules";
@@ -5648,7 +5648,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bknr.skip-list" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
           sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj";
           system = "bknr.skip-list";
           asd = "bknr.skip-list";
@@ -5668,7 +5668,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bknr.utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
           sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj";
           system = "bknr.utils";
           asd = "bknr.utils";
@@ -5695,7 +5695,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bknr.web" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz";
           sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2";
           system = "bknr.web";
           asd = "bknr.web";
@@ -5734,7 +5734,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bknr.xml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bknr-datastore/2025-06-22/bknr-datastore-20250622-git.tgz";
           sha256 = "12pxq21g9fwcwqyx463gbdw6596gm4v31hqwxnkssf1rgzm55ngj";
           system = "bknr.xml";
           asd = "bknr.xml";
@@ -5757,7 +5757,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "black-tie" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/black-tie/2022-07-07/black-tie-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/black-tie/2022-07-07/black-tie-20220707-git.tgz";
           sha256 = "0a1zczxp4wkqs4cmwc4rnsgwwc2h4zqmg58cjykfzz4jh31fa43a";
           system = "black-tie";
           asd = "black-tie";
@@ -5777,7 +5777,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "blackbird" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/blackbird/2024-10-12/blackbird-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/blackbird/2024-10-12/blackbird-20241012-git.tgz";
           sha256 = "0bqg8sn816qfar410w2c2k07vqh9sig8zbkvlmwj1bk33snvmam8";
           system = "blackbird";
           asd = "blackbird";
@@ -5795,7 +5795,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "blackbird-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/blackbird/2024-10-12/blackbird-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/blackbird/2024-10-12/blackbird-20241012-git.tgz";
           sha256 = "0bqg8sn816qfar410w2c2k07vqh9sig8zbkvlmwj1bk33snvmam8";
           system = "blackbird-test";
           asd = "blackbird-test";
@@ -5819,7 +5819,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "blas" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "blas";
           asd = "blas";
@@ -5843,7 +5843,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "blas-complex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "blas-complex";
           asd = "blas-complex";
@@ -5866,7 +5866,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "blas-hompack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "blas-hompack";
           asd = "blas-hompack";
@@ -5889,7 +5889,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "blas-package" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "blas-package";
           asd = "blas-package";
@@ -5909,7 +5909,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "blas-real" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "blas-real";
           asd = "blas-real";
@@ -5932,7 +5932,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "blocks-world" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/atdoc/2012-03-05/atdoc-20120305-git.tgz";
+          url = "https://beta.quicklisp.org/archive/atdoc/2012-03-05/atdoc-20120305-git.tgz";
           sha256 = "1w54phadjj00sy5qz5n0hmhzyjrx26h9hw06756zdpfbzk4f5il6";
           system = "blocks-world";
           asd = "blocks-world";
@@ -5952,7 +5952,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bmas" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bmas/2024-10-12/cl-bmas-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bmas/2024-10-12/cl-bmas-20241012-git.tgz";
           sha256 = "1j4wniwcxz4kqzw7q3ac8rpz2xhd0qfdgl5dylswh02ifdgq9z4m";
           system = "bmas";
           asd = "bmas";
@@ -5975,7 +5975,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bmp-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz";
           sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4";
           system = "bmp-test";
           asd = "bmp-test";
@@ -5995,7 +5995,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bnf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bnf/2022-02-20/bnf-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bnf/2022-02-20/bnf-20220220-git.tgz";
           sha256 = "1kr6k9qs9bbza591hi1c2mlxqd5yz3nrvyd3cw7139iz1z2m7dbg";
           system = "bnf";
           asd = "bnf";
@@ -6015,7 +6015,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bnf.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bnf/2022-02-20/bnf-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bnf/2022-02-20/bnf-20220220-git.tgz";
           sha256 = "1kr6k9qs9bbza591hi1c2mlxqd5yz3nrvyd3cw7139iz1z2m7dbg";
           system = "bnf.test";
           asd = "bnf.test";
@@ -6038,7 +6038,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bobbin" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bobbin/2020-10-16/bobbin-20201016-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/bobbin/2020-10-16/bobbin-20201016-hg.tgz";
           sha256 = "1yvx7d0cx5b119r4aays2rck33088bp7spaydnvkc329hfq1ahc2";
           system = "bobbin";
           asd = "bobbin";
@@ -6058,7 +6058,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-blobs-support" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-blobs-support/2020-10-16/bodge-blobs-support-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-blobs-support/2020-10-16/bodge-blobs-support-stable-git.tgz";
           sha256 = "02nd1x6y1akp1ymv1y4z9ympwbnpd1drwi4f86xbjszxqff6jyj8";
           system = "bodge-blobs-support";
           asd = "bodge-blobs-support";
@@ -6082,7 +6082,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-chipmunk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-chipmunk/2020-10-16/bodge-chipmunk-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-chipmunk/2020-10-16/bodge-chipmunk-stable-git.tgz";
           sha256 = "06zkia7rrhn1961jmayyvdbbbnf2rnr84lbd1x6gq8psfb2rif2f";
           system = "bodge-chipmunk";
           asd = "bodge-chipmunk";
@@ -6108,7 +6108,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-concurrency" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-concurrency/2020-10-16/bodge-concurrency-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-concurrency/2020-10-16/bodge-concurrency-stable-git.tgz";
           sha256 = "06v2h7vassp5v50qsqxkmshcrlrzlhqaga4z7lnidfniw7f8d5vd";
           system = "bodge-concurrency";
           asd = "bodge-concurrency";
@@ -6137,7 +6137,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-glad" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-glad/2020-10-16/bodge-glad-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-glad/2020-10-16/bodge-glad-stable-git.tgz";
           sha256 = "0ghrg0z5pj36igp5wpvp1iwnvjbca3wfb60kvirhv3l9ww51jg9g";
           system = "bodge-glad";
           asd = "bodge-glad";
@@ -6160,7 +6160,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-glfw" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-glfw/2020-10-16/bodge-glfw-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-glfw/2020-10-16/bodge-glfw-stable-git.tgz";
           sha256 = "1xjg75grndl2mbfql1g2qgx810kg6wxrnhxb406m9lisd112i0m8";
           system = "bodge-glfw";
           asd = "bodge-glfw";
@@ -6186,7 +6186,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-heap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-heap/2020-10-16/bodge-heap-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-heap/2020-10-16/bodge-heap-stable-git.tgz";
           sha256 = "1ngi9ccr9iz93mm3b4hgh2fj39vqpjrpkcfza5vly16z3r7gxca4";
           system = "bodge-heap";
           asd = "bodge-heap";
@@ -6206,7 +6206,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-host" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-host/2021-12-09/bodge-host-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-host/2021-12-09/bodge-host-stable-git.tgz";
           sha256 = "0piayirpbh91klrk3pg0g1vxhlk8yxvbr2wv923awdalwy0fn73n";
           system = "bodge-host";
           asd = "bodge-host";
@@ -6235,7 +6235,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-libc-essentials" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-libc-essentials/2020-10-16/bodge-libc-essentials-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-libc-essentials/2020-10-16/bodge-libc-essentials-stable-git.tgz";
           sha256 = "1nkjhkaap78xk9rkvnnnkchphiz0qwrsfp4jsvcl6mvv3rb4gp2k";
           system = "bodge-libc-essentials";
           asd = "bodge-libc-essentials";
@@ -6255,7 +6255,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-math" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-math/2020-10-16/bodge-math-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-math/2020-10-16/bodge-math-stable-git.tgz";
           sha256 = "0r3vnl9lywn4ksy34apcv6j825qp7l1naddawr14v4lwacndb80v";
           system = "bodge-math";
           asd = "bodge-math";
@@ -6278,7 +6278,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-memory" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-memory/2020-10-16/bodge-memory-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-memory/2020-10-16/bodge-memory-stable-git.tgz";
           sha256 = "19fn3dw5z6f2kpar0jx7ysy5zvqjv7yv0ca7njgaam3p891yy2j9";
           system = "bodge-memory";
           asd = "bodge-memory";
@@ -6301,7 +6301,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-nanovg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-nanovg/2020-10-16/bodge-nanovg-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-nanovg/2020-10-16/bodge-nanovg-stable-git.tgz";
           sha256 = "0cg4rlsddjrn0ps891n29xnd14xiis20ka5gafbz9npbj6nrc4v1";
           system = "bodge-nanovg";
           asd = "bodge-nanovg";
@@ -6327,7 +6327,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-nuklear" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-nuklear/2020-10-16/bodge-nuklear-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-nuklear/2020-10-16/bodge-nuklear-stable-git.tgz";
           sha256 = "15q89dz2zi99yyxhb90wyydy24y2lj5xm2mzh1mrw4v8rz9aqhc2";
           system = "bodge-nuklear";
           asd = "bodge-nuklear";
@@ -6353,7 +6353,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-ode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-ode/2020-10-16/bodge-ode-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-ode/2020-10-16/bodge-ode-stable-git.tgz";
           sha256 = "1c051ljn5x7ssysia7lil0ykjdnbx8dfkr45ck77plv39acgicbs";
           system = "bodge-ode";
           asd = "bodge-ode";
@@ -6380,7 +6380,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-openal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-openal/2020-10-16/bodge-openal-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-openal/2020-10-16/bodge-openal-stable-git.tgz";
           sha256 = "0051pwifygj1ijv5b39ldmfrka2yrj8rpap04bw3w9cckbkp6bnw";
           system = "bodge-openal";
           asd = "bodge-openal";
@@ -6405,7 +6405,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-queue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-queue/2020-10-16/bodge-queue-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-queue/2020-10-16/bodge-queue-stable-git.tgz";
           sha256 = "0f4252i8pfy5s4v7w1bpjawysn4cw7di405mqsx2h7skv27hvpz6";
           system = "bodge-queue";
           asd = "bodge-queue";
@@ -6425,7 +6425,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-sndfile" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-sndfile/2020-10-16/bodge-sndfile-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-sndfile/2020-10-16/bodge-sndfile-stable-git.tgz";
           sha256 = "0chdasp4zvr5n34x037lhymh90wg5xwbpr5flwj8aw0cw2nlg485";
           system = "bodge-sndfile";
           asd = "bodge-sndfile";
@@ -6453,7 +6453,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bodge-utilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bodge-utilities/2022-07-07/bodge-utilities-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bodge-utilities/2022-07-07/bodge-utilities-stable-git.tgz";
           sha256 = "0jmz7zb5ahg2kfd5nrh9nb7dda5szamjv7iv9skgcvf7rwn8qf0g";
           system = "bodge-utilities";
           asd = "bodge-utilities";
@@ -6483,7 +6483,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bordeaux-fft" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bordeaux-fft/2015-06-08/bordeaux-fft-20150608-http.tgz";
+          url = "https://beta.quicklisp.org/archive/bordeaux-fft/2015-06-08/bordeaux-fft-20150608-http.tgz";
           sha256 = "0kmz0wv34p8wixph5i6vj6p60xa48fflh9aq6kismlb0q4a1amp3";
           system = "bordeaux-fft";
           asd = "bordeaux-fft";
@@ -6503,7 +6503,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bordeaux-threads" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bordeaux-threads/2024-10-12/bordeaux-threads-v0.9.4.tgz";
+          url = "https://beta.quicklisp.org/archive/bordeaux-threads/2024-10-12/bordeaux-threads-v0.9.4.tgz";
           sha256 = "1ds1aa3rd38hq5i1nwd9qi8icxmdag0shcwwsf7km91v9214385d";
           system = "bordeaux-threads";
           asd = "bordeaux-threads";
@@ -6526,7 +6526,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bourbaki" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bourbaki/2011-01-10/bourbaki-20110110-http.tgz";
+          url = "https://beta.quicklisp.org/archive/bourbaki/2011-01-10/bourbaki-20110110-http.tgz";
           sha256 = "0d222kjk1h60467bkjpxglds3gykily5pyrnb45yvx86shkiv4lp";
           system = "bourbaki";
           asd = "bourbaki";
@@ -6546,7 +6546,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bp/2025-06-22/bp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bp/2025-06-22/bp-20250622-git.tgz";
           sha256 = "06g7xrkll4qqkqhlwqsw695yann8fpvz5ln5lzigqljzyg09wxk8";
           system = "bp";
           asd = "bp";
@@ -6572,7 +6572,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bst" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bst/2022-11-06/bst-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bst/2022-11-06/bst-20221106-git.tgz";
           sha256 = "0y052jf3gkqhb7rfx72961kg42dnqhmizk7cxlv87d1jr2906d1d";
           system = "bst";
           asd = "bst";
@@ -6592,7 +6592,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bt-semaphore" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bt-semaphore/2018-07-11/bt-semaphore-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bt-semaphore/2018-07-11/bt-semaphore-20180711-git.tgz";
           sha256 = "0rl7yp36225z975hg069pywwlpchwn4086cgxwsi2db5mhghpr7l";
           system = "bt-semaphore";
           asd = "bt-semaphore";
@@ -6612,7 +6612,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bt-semaphore-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bt-semaphore/2018-07-11/bt-semaphore-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bt-semaphore/2018-07-11/bt-semaphore-20180711-git.tgz";
           sha256 = "0rl7yp36225z975hg069pywwlpchwn4086cgxwsi2db5mhghpr7l";
           system = "bt-semaphore-test";
           asd = "bt-semaphore-test";
@@ -6635,7 +6635,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "btrie" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/btrie/2014-07-13/btrie-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/btrie/2014-07-13/btrie-20140713-git.tgz";
           sha256 = "0f1rs2zlpi2bcyba951h3cnyz2mfsxr2i6icmqbam5acqjdrmp30";
           system = "btrie";
           asd = "btrie";
@@ -6659,7 +6659,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "btrie-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/btrie/2014-07-13/btrie-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/btrie/2014-07-13/btrie-20140713-git.tgz";
           sha256 = "0f1rs2zlpi2bcyba951h3cnyz2mfsxr2i6icmqbam5acqjdrmp30";
           system = "btrie-tests";
           asd = "btrie";
@@ -6683,7 +6683,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bubble-operator-upwards" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bubble-operator-upwards/2023-10-21/bubble-operator-upwards_1.1.tgz";
+          url = "https://beta.quicklisp.org/archive/bubble-operator-upwards/2023-10-21/bubble-operator-upwards_1.1.tgz";
           sha256 = "1k6rvhlx4z0xb460dyg6blvqkwxakvqxslky69ld8p2yni1qar5p";
           system = "bubble-operator-upwards";
           asd = "bubble-operator-upwards";
@@ -6703,7 +6703,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bubble-operator-upwards_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bubble-operator-upwards/2023-10-21/bubble-operator-upwards_1.1.tgz";
+          url = "https://beta.quicklisp.org/archive/bubble-operator-upwards/2023-10-21/bubble-operator-upwards_1.1.tgz";
           sha256 = "1k6rvhlx4z0xb460dyg6blvqkwxakvqxslky69ld8p2yni1qar5p";
           system = "bubble-operator-upwards_tests";
           asd = "bubble-operator-upwards_tests";
@@ -6726,7 +6726,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "buildapp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/buildapp/2015-12-18/buildapp-1.5.6.tgz";
+          url = "https://beta.quicklisp.org/archive/buildapp/2015-12-18/buildapp-1.5.6.tgz";
           sha256 = "020ipjfqa3l8skd97cj5kq837wgpj28ygfxnkv64cnjrlbnzh161";
           system = "buildapp";
           asd = "buildapp";
@@ -6746,7 +6746,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "buildnode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
           sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs";
           system = "buildnode";
           asd = "buildnode";
@@ -6776,7 +6776,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "buildnode-excel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
           sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs";
           system = "buildnode-excel";
           asd = "buildnode-excel";
@@ -6796,7 +6796,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "buildnode-html5" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
           sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs";
           system = "buildnode-html5";
           asd = "buildnode-html5";
@@ -6816,7 +6816,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "buildnode-kml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
           sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs";
           system = "buildnode-kml";
           asd = "buildnode-kml";
@@ -6836,7 +6836,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "buildnode-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
           sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs";
           system = "buildnode-test";
           asd = "buildnode";
@@ -6860,7 +6860,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "buildnode-xhtml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
           sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs";
           system = "buildnode-xhtml";
           asd = "buildnode-xhtml";
@@ -6878,7 +6878,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "buildnode-xul" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
           sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs";
           system = "buildnode-xul";
           asd = "buildnode-xul";
@@ -6898,7 +6898,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "burgled-batteries" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/burgled-batteries/2016-08-25/burgled-batteries-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/burgled-batteries/2016-08-25/burgled-batteries-20160825-git.tgz";
           sha256 = "080ff1yrmfb87pqq1jqr35djjkh3fh8i6cbhv3d1md5qy7hhgdaj";
           system = "burgled-batteries";
           asd = "burgled-batteries";
@@ -6925,7 +6925,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "burgled-batteries-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/burgled-batteries/2016-08-25/burgled-batteries-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/burgled-batteries/2016-08-25/burgled-batteries-20160825-git.tgz";
           sha256 = "080ff1yrmfb87pqq1jqr35djjkh3fh8i6cbhv3d1md5qy7hhgdaj";
           system = "burgled-batteries-tests";
           asd = "burgled-batteries-tests";
@@ -6949,7 +6949,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "burgled-batteries.syntax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/burgled-batteries.syntax/2021-05-31/burgled-batteries.syntax-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/burgled-batteries.syntax/2021-05-31/burgled-batteries.syntax-20210531-git.tgz";
           sha256 = "1hx8w74cgx1qbk6r2p7lzygjqxs5mzxh7w73zrmdibny64akir9a";
           system = "burgled-batteries.syntax";
           asd = "burgled-batteries.syntax";
@@ -6973,7 +6973,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "burgled-batteries.syntax-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/burgled-batteries.syntax/2021-05-31/burgled-batteries.syntax-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/burgled-batteries.syntax/2021-05-31/burgled-batteries.syntax-20210531-git.tgz";
           sha256 = "1hx8w74cgx1qbk6r2p7lzygjqxs5mzxh7w73zrmdibny64akir9a";
           system = "burgled-batteries.syntax-test";
           asd = "burgled-batteries.syntax-test";
@@ -6996,7 +6996,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "bus";
           asd = "bus";
@@ -7016,7 +7016,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bytecurry.asdf-ext" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bytecurry.asdf-ext/2015-05-05/bytecurry.asdf-ext-20150505-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bytecurry.asdf-ext/2015-05-05/bytecurry.asdf-ext-20150505-git.tgz";
           sha256 = "07w2lz9mq35sgzzvmz9084l1sia40zkhlvfblkpzxfwyzr6cxrxa";
           system = "bytecurry.asdf-ext";
           asd = "bytecurry.asdf-ext";
@@ -7036,7 +7036,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "bytecurry.mocks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bytecurry.mocks/2020-03-25/bytecurry.mocks-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bytecurry.mocks/2020-03-25/bytecurry.mocks-20200325-git.tgz";
           sha256 = "0md2j6iggmfm1v7nzcmz7f0xy2jxrsg77iszpisdzmwnijfy8ks0";
           system = "bytecurry.mocks";
           asd = "bytecurry.mocks";
@@ -7059,7 +7059,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "c2ffi-blob" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/c2ffi-blob/2020-10-16/c2ffi-blob-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/c2ffi-blob/2020-10-16/c2ffi-blob-stable-git.tgz";
           sha256 = "1rk89nycdvcb4a50zm3wdmrbz8w5xk4jgvjg2wib1dnslwnwdivc";
           system = "c2ffi-blob";
           asd = "c2ffi-blob";
@@ -7082,7 +7082,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cacau" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz";
           sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0";
           system = "cacau";
           asd = "cacau";
@@ -7105,7 +7105,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cacau-asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz";
           sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0";
           system = "cacau-asdf";
           asd = "cacau-asdf";
@@ -7125,7 +7125,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cacau-examples-asdf-integration" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz";
           sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0";
           system = "cacau-examples-asdf-integration";
           asd = "cacau-examples-asdf-integration";
@@ -7145,7 +7145,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cacau-examples-asdf-integration-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz";
           sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0";
           system = "cacau-examples-asdf-integration-test";
           asd = "cacau-examples-asdf-integration-test";
@@ -7170,7 +7170,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cacau-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz";
           sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0";
           system = "cacau-test";
           asd = "cacau-test";
@@ -7194,7 +7194,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cache-while" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cache-while/2021-08-07/cache-while-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cache-while/2021-08-07/cache-while-20210807-git.tgz";
           sha256 = "1qil68rfn5irmkb0jk1f6g1zy80wgc3skl8cr4rfgh7ywgm5izx3";
           system = "cache-while";
           asd = "cache-while";
@@ -7214,7 +7214,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cacle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cacle/2019-05-21/cacle-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cacle/2019-05-21/cacle-20190521-git.tgz";
           sha256 = "0h0dk0sfkfl8g0sbrs76ydb9l4znssqhx8nc5k1sg7zxpni5a4qy";
           system = "cacle";
           asd = "cacle";
@@ -7234,7 +7234,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "calispel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz";
           sha256 = "08bmf3pi7n5hadpmqqkg65cxcj6kbvm997wcs1f53ml1nb79d9z8";
           system = "calispel";
           asd = "calispel";
@@ -7256,7 +7256,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "calispel-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz";
           sha256 = "08bmf3pi7n5hadpmqqkg65cxcj6kbvm997wcs1f53ml1nb79d9z8";
           system = "calispel-test";
           asd = "calispel";
@@ -7279,7 +7279,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "calm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/calm/2024-10-12/calm-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/calm/2024-10-12/calm-20241012-git.tgz";
           sha256 = "0c8d7aagx02cqk42pyj62hpqz3yarncigsw0g2ccc64sk74v67js";
           system = "calm";
           asd = "calm";
@@ -7308,7 +7308,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cambl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz";
           sha256 = "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz";
           system = "cambl";
           asd = "cambl";
@@ -7334,7 +7334,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cambl-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz";
           sha256 = "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz";
           system = "cambl-test";
           asd = "cambl-test";
@@ -7357,7 +7357,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "camera-matrix" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "camera-matrix";
           asd = "camera-matrix";
@@ -7380,7 +7380,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "can" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/can/2018-03-28/can-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/can/2018-03-28/can-20180328-git.tgz";
           sha256 = "0m3lqc56aw46cj2z379a19fh7f1h0vaxn78xpvbxq3bwar46jzqh";
           system = "can";
           asd = "can";
@@ -7400,7 +7400,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "can-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/can/2018-03-28/can-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/can/2018-03-28/can-20180328-git.tgz";
           sha256 = "0m3lqc56aw46cj2z379a19fh7f1h0vaxn78xpvbxq3bwar46jzqh";
           system = "can-test";
           asd = "can-test";
@@ -7426,7 +7426,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "canonicalized-initargs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/canonicalized-initargs/2021-04-11/canonicalized-initargs_2.0.tgz";
+          url = "https://beta.quicklisp.org/archive/canonicalized-initargs/2021-04-11/canonicalized-initargs_2.0.tgz";
           sha256 = "0jmmjw86x9mmlfla4kdmdqf1fjrj0p2fmv1lc4k555mcf67mj2fq";
           system = "canonicalized-initargs";
           asd = "canonicalized-initargs";
@@ -7453,7 +7453,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "canonicalized-initargs_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/canonicalized-initargs/2021-04-11/canonicalized-initargs_2.0.tgz";
+          url = "https://beta.quicklisp.org/archive/canonicalized-initargs/2021-04-11/canonicalized-initargs_2.0.tgz";
           sha256 = "0jmmjw86x9mmlfla4kdmdqf1fjrj0p2fmv1lc4k555mcf67mj2fq";
           system = "canonicalized-initargs_tests";
           asd = "canonicalized-initargs_tests";
@@ -7478,7 +7478,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "capstone" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-capstone/2022-03-31/cl-capstone-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-capstone/2022-03-31/cl-capstone-20220331-git.tgz";
           sha256 = "1jbhp1sf7mr6yrqkdyjl93m1dl901ka6gkgdj20nv2bgp400ycmp";
           system = "capstone";
           asd = "capstone";
@@ -7504,7 +7504,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "caramel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/caramel/2013-04-20/caramel-20130420-git.tgz";
+          url = "https://beta.quicklisp.org/archive/caramel/2013-04-20/caramel-20130420-git.tgz";
           sha256 = "08kyjxd8hyk5xnnq0p0w4aqpvisv278h38pqjkz04a032dn5b87a";
           system = "caramel";
           asd = "caramel";
@@ -7532,7 +7532,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cari3s" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cari3s/2023-10-21/cari3s-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cari3s/2023-10-21/cari3s-20231021-git.tgz";
           sha256 = "1q977ykj4fb095ilr1x4g0nrhqmipcgmdxbxn4gmlksg457sb4lm";
           system = "cari3s";
           asd = "cari3s";
@@ -7560,7 +7560,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "carrier" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/carrier/2024-10-12/carrier-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/carrier/2024-10-12/carrier-20241012-git.tgz";
           sha256 = "04w6hzqqbcvi8niqj35xz098gjfg4pdv6fbihfbna3c5v7q59gr1";
           system = "carrier";
           asd = "carrier";
@@ -7590,7 +7590,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cartesian-product-switch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cartesian-product-switch/2012-09-09/cartesian-product-switch-2.0.tgz";
+          url = "https://beta.quicklisp.org/archive/cartesian-product-switch/2012-09-09/cartesian-product-switch-2.0.tgz";
           sha256 = "18cxslj2753k6h666j0mmzg0h0z9l6ddi24gqls6h5d5svd7l3xk";
           system = "cartesian-product-switch";
           asd = "cartesian-product-switch";
@@ -7610,7 +7610,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "caveman-middleware-dbimanager" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz";
           sha256 = "1q07mmm41zymh464j4mldf3lv1sb9amzdcwinkywqhwnjmnx6axi";
           system = "caveman-middleware-dbimanager";
           asd = "caveman-middleware-dbimanager";
@@ -7630,7 +7630,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "caveman2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz";
           sha256 = "1q07mmm41zymh464j4mldf3lv1sb9amzdcwinkywqhwnjmnx6axi";
           system = "caveman2";
           asd = "caveman2";
@@ -7659,7 +7659,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "caveman2-db" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz";
           sha256 = "1q07mmm41zymh464j4mldf3lv1sb9amzdcwinkywqhwnjmnx6axi";
           system = "caveman2-db";
           asd = "caveman2-db";
@@ -7683,7 +7683,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "caveman2-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz";
           sha256 = "1q07mmm41zymh464j4mldf3lv1sb9amzdcwinkywqhwnjmnx6axi";
           system = "caveman2-test";
           asd = "caveman2-test";
@@ -7711,7 +7711,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "caveman2-widgets" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/caveman2-widgets/2018-02-28/caveman2-widgets-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/caveman2-widgets/2018-02-28/caveman2-widgets-20180228-git.tgz";
           sha256 = "1rzb868m3f28z1hcr3nzlprgqqq1kwg3qyh24p36fv76b4g96wkq";
           system = "caveman2-widgets";
           asd = "caveman2-widgets";
@@ -7735,7 +7735,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "caveman2-widgets-bootstrap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/caveman2-widgets-bootstrap/2018-02-28/caveman2-widgets-bootstrap-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/caveman2-widgets-bootstrap/2018-02-28/caveman2-widgets-bootstrap-20180228-git.tgz";
           sha256 = "1xh3x7r7givxxyrkh4ngx098s35qz98gcz7yjyf4dp0psfkk65xj";
           system = "caveman2-widgets-bootstrap";
           asd = "caveman2-widgets-bootstrap";
@@ -7758,7 +7758,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "caveman2-widgets-bootstrap-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/caveman2-widgets-bootstrap/2018-02-28/caveman2-widgets-bootstrap-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/caveman2-widgets-bootstrap/2018-02-28/caveman2-widgets-bootstrap-20180228-git.tgz";
           sha256 = "1xh3x7r7givxxyrkh4ngx098s35qz98gcz7yjyf4dp0psfkk65xj";
           system = "caveman2-widgets-bootstrap-test";
           asd = "caveman2-widgets-bootstrap-test";
@@ -7782,7 +7782,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "caveman2-widgets-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/caveman2-widgets/2018-02-28/caveman2-widgets-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/caveman2-widgets/2018-02-28/caveman2-widgets-20180228-git.tgz";
           sha256 = "1rzb868m3f28z1hcr3nzlprgqqq1kwg3qyh24p36fv76b4g96wkq";
           system = "caveman2-widgets-test";
           asd = "caveman2-widgets-test";
@@ -7806,7 +7806,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cblas" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cblas/2022-11-06/cl-cblas-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cblas/2022-11-06/cl-cblas-20221106-git.tgz";
           sha256 = "1bd2w51r71pgm6sc6m2fms4j1bbnli023j4w3rbxw9cln0g7badp";
           system = "cblas";
           asd = "cblas";
@@ -7829,7 +7829,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cbor" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cbor/2025-06-22/cbor-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cbor/2025-06-22/cbor-20250622-git.tgz";
           sha256 = "1ln6n4faw3a89qksdla983ah3q8dd0hb0c0didx253vyncrgqxvg";
           system = "cbor";
           asd = "cbor";
@@ -7854,7 +7854,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cbor-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cbor/2025-06-22/cbor-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cbor/2025-06-22/cbor-20250622-git.tgz";
           sha256 = "1ln6n4faw3a89qksdla983ah3q8dd0hb0c0didx253vyncrgqxvg";
           system = "cbor-tests";
           asd = "cbor-tests";
@@ -7881,7 +7881,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ccl-compat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ccl-compat/2017-11-30/ccl-compat-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ccl-compat/2017-11-30/ccl-compat-20171130-git.tgz";
           sha256 = "15402373wprmyx4l7zgpv64vj3c11xvxnnpzqbmq4j6rljpb40da";
           system = "ccl-compat";
           asd = "ccl-compat";
@@ -7905,7 +7905,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ccldoc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz";
           sha256 = "15pc25pwnlg2lhzxniln53fr2i2cqa6fpr60nv4i1743x9ahp35l";
           system = "ccldoc";
           asd = "ccldoc";
@@ -7925,7 +7925,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ccldoc-docbook" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz";
           sha256 = "15pc25pwnlg2lhzxniln53fr2i2cqa6fpr60nv4i1743x9ahp35l";
           system = "ccldoc-docbook";
           asd = "ccldoc-docbook";
@@ -7948,7 +7948,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ccldoc-libraries" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz";
           sha256 = "15pc25pwnlg2lhzxniln53fr2i2cqa6fpr60nv4i1743x9ahp35l";
           system = "ccldoc-libraries";
           asd = "ccldoc-libraries";
@@ -7972,7 +7972,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ceigen-lite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ceigen-lite/2024-10-12/cl-ceigen-lite-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ceigen-lite/2024-10-12/cl-ceigen-lite-20241012-git.tgz";
           sha256 = "0k2b6x913mnv1f5712xvvv7d6j3lrja4isjg6cyad694py59d09q";
           system = "ceigen-lite";
           asd = "ceigen-lite";
@@ -7995,7 +7995,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cells" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cells/2023-06-18/cells-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cells/2023-06-18/cells-20230618-git.tgz";
           sha256 = "1mh14g8x2mpb8qdngqxgnkawqbv4xxxr3bgn01jm5d6c8jn6ph3f";
           system = "cells";
           asd = "cells";
@@ -8015,7 +8015,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cells-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cells/2023-06-18/cells-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cells/2023-06-18/cells-20230618-git.tgz";
           sha256 = "1mh14g8x2mpb8qdngqxgnkawqbv4xxxr3bgn01jm5d6c8jn6ph3f";
           system = "cells-test";
           asd = "cells-test";
@@ -8035,7 +8035,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cephes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cephes.cl/2024-10-12/cephes.cl-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cephes.cl/2024-10-12/cephes.cl-20241012-git.tgz";
           sha256 = "1p0npidiy9zjb90gyihdmx0nmm87a5akph1jhs6y7z50fx8470hb";
           system = "cephes";
           asd = "cephes";
@@ -8055,7 +8055,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cepl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cepl/2024-10-12/cepl-release-quicklisp-543c9fc1-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cepl/2024-10-12/cepl-release-quicklisp-543c9fc1-git.tgz";
           sha256 = "0g5frci6ljmy6pyyrjhh2kw894l3fl3wsz27k75xw49cd8xm24mh";
           system = "cepl";
           asd = "cepl";
@@ -8087,7 +8087,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cepl.build" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cepl/2024-10-12/cepl-release-quicklisp-543c9fc1-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cepl/2024-10-12/cepl-release-quicklisp-543c9fc1-git.tgz";
           sha256 = "0g5frci6ljmy6pyyrjhh2kw894l3fl3wsz27k75xw49cd8xm24mh";
           system = "cepl.build";
           asd = "cepl.build";
@@ -8107,7 +8107,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cepl.camera" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cepl.camera/2018-02-28/cepl.camera-release-quicklisp-1292212a-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cepl.camera/2018-02-28/cepl.camera-release-quicklisp-1292212a-git.tgz";
           sha256 = "0z73f95bxr2vn47g8qrvf9gzy1my25mkg7hl7kpib21yahfpzzvb";
           system = "cepl.camera";
           asd = "cepl.camera";
@@ -8131,7 +8131,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cepl.devil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cepl.devil/2018-02-28/cepl.devil-release-quicklisp-ea5f8514-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cepl.devil/2018-02-28/cepl.devil-release-quicklisp-ea5f8514-git.tgz";
           sha256 = "1b64vfjchkwppcp3j4krwx2x9nj29llisqy1yc9ncbnmi9xs38a0";
           system = "cepl.devil";
           asd = "cepl.devil";
@@ -8154,7 +8154,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cepl.drm-gbm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cepl.drm-gbm/2019-05-21/cepl.drm-gbm-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cepl.drm-gbm/2019-05-21/cepl.drm-gbm-20190521-git.tgz";
           sha256 = "00csd2f6z13rjqipaf02w87phn2xynmzf1jcrrshbibs204m4nmy";
           system = "cepl.drm-gbm";
           asd = "cepl.drm-gbm";
@@ -8180,7 +8180,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cepl.glop" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cepl.glop/2018-02-28/cepl.glop-release-quicklisp-8ec09801-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cepl.glop/2018-02-28/cepl.glop-release-quicklisp-8ec09801-git.tgz";
           sha256 = "1dq727v2s22yna6ycxxs79pg13b0cyh1lfrk6hsb6vizgiks20jw";
           system = "cepl.glop";
           asd = "cepl.glop";
@@ -8203,7 +8203,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cepl.sdl2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cepl.sdl2/2018-02-28/cepl.sdl2-release-quicklisp-6da5a030-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cepl.sdl2/2018-02-28/cepl.sdl2-release-quicklisp-6da5a030-git.tgz";
           sha256 = "0lz8yxm1g2ch0w779lhrs2xkfciy3iz6viz7cdgyd2824isvinjf";
           system = "cepl.sdl2";
           asd = "cepl.sdl2";
@@ -8226,7 +8226,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cepl.sdl2-image" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cepl.sdl2-image/2018-02-28/cepl.sdl2-image-release-quicklisp-94a77649-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cepl.sdl2-image/2018-02-28/cepl.sdl2-image-release-quicklisp-94a77649-git.tgz";
           sha256 = "16dzjk2q658xr1v9rk2iny70rjhxbgi4lcp59s5mkdfs2k3a2637";
           system = "cepl.sdl2-image";
           asd = "cepl.sdl2-image";
@@ -8250,7 +8250,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cepl.sdl2-ttf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cepl.sdl2-ttf/2018-01-31/cepl.sdl2-ttf-release-quicklisp-11b498a3-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cepl.sdl2-ttf/2018-01-31/cepl.sdl2-ttf-release-quicklisp-11b498a3-git.tgz";
           sha256 = "1fxj3rdv2rlyks00h18dpd42xywgnydgyvb1s4d67hjk7fl19a5p";
           system = "cepl.sdl2-ttf";
           asd = "cepl.sdl2-ttf";
@@ -8274,7 +8274,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cepl.skitter.glop" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cepl.skitter/2018-02-28/cepl.skitter-release-quicklisp-f52b9240-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cepl.skitter/2018-02-28/cepl.skitter-release-quicklisp-f52b9240-git.tgz";
           sha256 = "1xz53q8klzrd7cr586jd16pypxgpy68vlvfirqhlv6jc7k99sjvs";
           system = "cepl.skitter.glop";
           asd = "cepl.skitter.glop";
@@ -8297,7 +8297,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cepl.skitter.sdl2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cepl.skitter/2018-02-28/cepl.skitter-release-quicklisp-f52b9240-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cepl.skitter/2018-02-28/cepl.skitter-release-quicklisp-f52b9240-git.tgz";
           sha256 = "1xz53q8klzrd7cr586jd16pypxgpy68vlvfirqhlv6jc7k99sjvs";
           system = "cepl.skitter.sdl2";
           asd = "cepl.skitter.sdl2";
@@ -8320,7 +8320,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cepl.spaces" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cepl.spaces/2018-03-28/cepl.spaces-release-quicklisp-c7f83f26-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cepl.spaces/2018-03-28/cepl.spaces-release-quicklisp-c7f83f26-git.tgz";
           sha256 = "0z74ipd4j2spjwl6h625azdczpds3v44iin77q685ldx9rwx3k8y";
           system = "cepl.spaces";
           asd = "cepl.spaces";
@@ -8347,7 +8347,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ceramic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ceramic/2021-08-07/ceramic-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ceramic/2021-08-07/ceramic-20210807-git.tgz";
           sha256 = "0hd553gj4cwmli45pfwhqpz7sg6kzn31iv8akaxr5ba3hssa1aap";
           system = "ceramic";
           asd = "ceramic";
@@ -8380,7 +8380,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ceramic-test-app" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ceramic/2021-08-07/ceramic-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ceramic/2021-08-07/ceramic-20210807-git.tgz";
           sha256 = "0hd553gj4cwmli45pfwhqpz7sg6kzn31iv8akaxr5ba3hssa1aap";
           system = "ceramic-test-app";
           asd = "ceramic-test-app";
@@ -8403,7 +8403,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cerberus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cerberus/2025-06-22/cerberus-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cerberus/2025-06-22/cerberus-20250622-git.tgz";
           sha256 = "1pky9xdh1189ld5qjnm6mh6457vs0gx2q7jn1mxmn4fl4zkvk3q7";
           system = "cerberus";
           asd = "cerberus";
@@ -8431,7 +8431,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cerberus-kdc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cerberus/2025-06-22/cerberus-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cerberus/2025-06-22/cerberus-20250622-git.tgz";
           sha256 = "1pky9xdh1189ld5qjnm6mh6457vs0gx2q7jn1mxmn4fl4zkvk3q7";
           system = "cerberus-kdc";
           asd = "cerberus-kdc";
@@ -8455,7 +8455,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cesdi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cesdi/2020-07-15/cesdi_1.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/cesdi/2020-07-15/cesdi_1.0.1.tgz";
           sha256 = "02f2pz5rw79ljkkx1ywh8nkpjj4g3z3s1lyvzqb8krbnx11wl0q9";
           system = "cesdi";
           asd = "cesdi";
@@ -8475,7 +8475,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cesdi_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cesdi/2020-07-15/cesdi_1.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/cesdi/2020-07-15/cesdi_1.0.1.tgz";
           sha256 = "02f2pz5rw79ljkkx1ywh8nkpjj4g3z3s1lyvzqb8krbnx11wl0q9";
           system = "cesdi_tests";
           asd = "cesdi_tests";
@@ -8498,7 +8498,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cf/2025-06-22/cl-cf-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cf/2025-06-22/cl-cf-20250622-git.tgz";
           sha256 = "0bacgspfqvkdr430yax9dk61pavcajz9kv9lb12rg5qcrqd1vpmb";
           system = "cf";
           asd = "cf";
@@ -8518,7 +8518,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cf-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cf/2025-06-22/cl-cf-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cf/2025-06-22/cl-cf-20250622-git.tgz";
           sha256 = "0bacgspfqvkdr430yax9dk61pavcajz9kv9lb12rg5qcrqd1vpmb";
           system = "cf-tests";
           asd = "cf-tests";
@@ -8541,7 +8541,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
           sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1";
           system = "cffi";
           asd = "cffi";
@@ -8563,7 +8563,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cffi-c-ref" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi-c-ref/2020-10-16/cffi-c-ref-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cffi-c-ref/2020-10-16/cffi-c-ref-stable-git.tgz";
           sha256 = "1a3pp6xcisabqir3rp1gvvjfdxcvpm8yr35p38nri9azsinmmc7z";
           system = "cffi-c-ref";
           asd = "cffi-c-ref";
@@ -8586,7 +8586,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cffi-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
           sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1";
           system = "cffi-examples";
           asd = "cffi-examples";
@@ -8606,7 +8606,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cffi-grovel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
           sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1";
           system = "cffi-grovel";
           asd = "cffi-grovel";
@@ -8628,7 +8628,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cffi-libffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
           sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1";
           system = "cffi-libffi";
           asd = "cffi-libffi";
@@ -8652,7 +8652,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cffi-object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi-object/2025-06-22/cffi-object-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cffi-object/2025-06-22/cffi-object-20250622-git.tgz";
           sha256 = "1v5yaf2y366mbpqbvqnqg1za5k3vsa6d4px56ldis996vb2kv84h";
           system = "cffi-object";
           asd = "cffi-object";
@@ -8676,7 +8676,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cffi-object.ops" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi-object/2025-06-22/cffi-object-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cffi-object/2025-06-22/cffi-object-20250622-git.tgz";
           sha256 = "1v5yaf2y366mbpqbvqnqg1za5k3vsa6d4px56ldis996vb2kv84h";
           system = "cffi-object.ops";
           asd = "cffi-object.ops";
@@ -8699,7 +8699,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cffi-ops" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi-ops/2025-06-22/cffi-ops-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cffi-ops/2025-06-22/cffi-ops-20250622-git.tgz";
           sha256 = "1si71czfs923p2fjimj3jyjy5gliylxji3dgsfb6w4qaczsmyd33";
           system = "cffi-ops";
           asd = "cffi-ops";
@@ -8724,7 +8724,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cffi-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
           sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1";
           system = "cffi-tests";
           asd = "cffi-tests";
@@ -8750,7 +8750,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cffi-toolchain" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
           sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1";
           system = "cffi-toolchain";
           asd = "cffi-toolchain";
@@ -8768,7 +8768,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cffi-uffi-compat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cffi/2025-06-22/cffi-20250622-git.tgz";
           sha256 = "1s7b5zrgbf5pz52hcncvvmd22nppwpgvh7s0hg8lnk74k42vpms1";
           system = "cffi-uffi-compat";
           asd = "cffi-uffi-compat";
@@ -8786,7 +8786,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chain" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chain/2025-06-22/chain-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chain/2025-06-22/chain-20250622-git.tgz";
           sha256 = "10kq8dlwbib6chc9m5wn7v7narjpdksf000vycaj1nqqqdy348mp";
           system = "chain";
           asd = "chain";
@@ -8809,7 +8809,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chameleon" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chameleon/2022-02-20/chameleon-v2.1.1.tgz";
+          url = "https://beta.quicklisp.org/archive/chameleon/2022-02-20/chameleon-v2.1.1.tgz";
           sha256 = "1bqminvhx3hlqzxvy2a105gm9d2dxl5cy6ls5rm9wmkvw7gyza6c";
           system = "chameleon";
           asd = "chameleon";
@@ -8829,7 +8829,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chancery" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chancery/2020-10-16/chancery-20201016-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/chancery/2020-10-16/chancery-20201016-hg.tgz";
           sha256 = "1g0jgrih7q14gizy481j9z2s15pmv6iwymnpddbyqfja9miv61lw";
           system = "chancery";
           asd = "chancery";
@@ -8849,7 +8849,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chancery.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chancery/2020-10-16/chancery-20201016-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/chancery/2020-10-16/chancery-20201016-hg.tgz";
           sha256 = "1g0jgrih7q14gizy481j9z2s15pmv6iwymnpddbyqfja9miv61lw";
           system = "chancery.test";
           asd = "chancery.test";
@@ -8872,7 +8872,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "changed-stream" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/changed-stream/2013-01-28/changed-stream-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/changed-stream/2013-01-28/changed-stream-20130128-git.tgz";
           sha256 = "1cll7xclg9jr55swhi3g6z567bxvb9kmljh67091xazcfacz732i";
           system = "changed-stream";
           asd = "changed-stream";
@@ -8892,7 +8892,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "changed-stream.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/changed-stream/2013-01-28/changed-stream-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/changed-stream/2013-01-28/changed-stream-20130128-git.tgz";
           sha256 = "1cll7xclg9jr55swhi3g6z567bxvb9kmljh67091xazcfacz732i";
           system = "changed-stream.test";
           asd = "changed-stream.test";
@@ -8912,7 +8912,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chanl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chanl/2025-06-22/chanl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chanl/2025-06-22/chanl-20250622-git.tgz";
           sha256 = "1znps9654lap7yl6y370ji0sjwl9bg9g6bazsjy37yw8kwdjflzh";
           system = "chanl";
           asd = "chanl";
@@ -8930,7 +8930,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "character-modifier-bits" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "character-modifier-bits";
           asd = "character-modifier-bits";
@@ -8950,7 +8950,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "charje.documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/charje.documentation/2024-10-12/charje.documentation-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/charje.documentation/2024-10-12/charje.documentation-20241012-git.tgz";
           sha256 = "0rdfi4sj5ad6krwypmsr934ic6y5xlj6iixdwwxrxj9fihfq47zb";
           system = "charje.documentation";
           asd = "charje.documentation";
@@ -8970,7 +8970,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cheat-js" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cheat-js/2012-10-13/cheat-js-20121013-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cheat-js/2012-10-13/cheat-js-20121013-git.tgz";
           sha256 = "1h73kx0iii4y4gslz6f8kvf980bnypsras6xj38apm0fcwm93w03";
           system = "cheat-js";
           asd = "cheat-js";
@@ -8993,7 +8993,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "check-bnf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/check-bnf/2022-07-07/check-bnf-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/check-bnf/2022-07-07/check-bnf-20220707-git.tgz";
           sha256 = "1dpp0xzj51a7fg9yw0xsipnsa54xj1axvkk55n0yxq9yv9ih3rb0";
           system = "check-bnf";
           asd = "check-bnf";
@@ -9019,7 +9019,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "check-bnf.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/check-bnf/2022-07-07/check-bnf-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/check-bnf/2022-07-07/check-bnf-20220707-git.tgz";
           sha256 = "1dpp0xzj51a7fg9yw0xsipnsa54xj1axvkk55n0yxq9yv9ih3rb0";
           system = "check-bnf.test";
           asd = "check-bnf.test";
@@ -9042,7 +9042,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "check-it" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/check-it/2015-07-09/check-it-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/check-it/2015-07-09/check-it-20150709-git.tgz";
           sha256 = "1kbjwpniffdpv003igmlz5r0vy65m7wpfnhg54fhwirp1227hgg7";
           system = "check-it";
           asd = "check-it";
@@ -9064,7 +9064,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "check-it-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/check-it/2015-07-09/check-it-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/check-it/2015-07-09/check-it-20150709-git.tgz";
           sha256 = "1kbjwpniffdpv003igmlz5r0vy65m7wpfnhg54fhwirp1227hgg7";
           system = "check-it-test";
           asd = "check-it";
@@ -9087,7 +9087,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "checkl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz";
           sha256 = "0bpisihx1gay44xmyr1dmhlwh00j0zzi04rp9fy35i95l2r4xdlx";
           system = "checkl";
           asd = "checkl";
@@ -9107,7 +9107,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "checkl-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz";
           sha256 = "0bpisihx1gay44xmyr1dmhlwh00j0zzi04rp9fy35i95l2r4xdlx";
           system = "checkl-docs";
           asd = "checkl-docs";
@@ -9130,7 +9130,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "checkl-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz";
           sha256 = "0bpisihx1gay44xmyr1dmhlwh00j0zzi04rp9fy35i95l2r4xdlx";
           system = "checkl-test";
           asd = "checkl-test";
@@ -9153,7 +9153,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chemical-compounds" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chemical-compounds/2011-10-01/chemical-compounds-1.0.2.tgz";
+          url = "https://beta.quicklisp.org/archive/chemical-compounds/2011-10-01/chemical-compounds-1.0.2.tgz";
           sha256 = "047z1lab08y4nsb32rnzqfpb6akyhibzjgmmr1bnwrh9pmhv3s2k";
           system = "chemical-compounds";
           asd = "chemical-compounds";
@@ -9173,7 +9173,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chillax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz";
           sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1";
           system = "chillax";
           asd = "chillax";
@@ -9196,7 +9196,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chillax.core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz";
           sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1";
           system = "chillax.core";
           asd = "chillax.core";
@@ -9220,7 +9220,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chillax.jsown" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz";
           sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1";
           system = "chillax.jsown";
           asd = "chillax.jsown";
@@ -9243,7 +9243,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chillax.view-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz";
           sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1";
           system = "chillax.view-server";
           asd = "chillax.view-server";
@@ -9266,7 +9266,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chillax.yason" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz";
           sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1";
           system = "chillax.yason";
           asd = "chillax.yason";
@@ -9289,7 +9289,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chipi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz";
           sha256 = "00wqwgdzfnwxkm1bd42axp69bpl0gs99i7a3mq2x6q1dvn1rczac";
           system = "chipi";
           asd = "chipi";
@@ -9319,7 +9319,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chipi-web" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chipi/2025-06-22/chipi-20250622-git.tgz";
           sha256 = "00wqwgdzfnwxkm1bd42axp69bpl0gs99i7a3mq2x6q1dvn1rczac";
           system = "chipi-web";
           asd = "chipi-web";
@@ -9348,7 +9348,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chipmunk-blob" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chipmunk-blob/2020-10-16/chipmunk-blob-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chipmunk-blob/2020-10-16/chipmunk-blob-stable-git.tgz";
           sha256 = "0kdi1al1cn90hzjfnjhkxp3k5ibp6l73k3m04mkpzkzpjy7jc80d";
           system = "chipmunk-blob";
           asd = "chipmunk-blob";
@@ -9371,7 +9371,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chipz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chipz/2023-06-18/chipz-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chipz/2023-06-18/chipz-20230618-git.tgz";
           sha256 = "04ysl1lz47dd8p1cbm637kpyf84hl74xvcdpqhdyxwh4n97csm5h";
           system = "chipz";
           asd = "chipz";
@@ -9389,7 +9389,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chirp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz";
           sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q";
           system = "chirp";
           asd = "chirp";
@@ -9409,7 +9409,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chirp-core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz";
           sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q";
           system = "chirp-core";
           asd = "chirp-core";
@@ -9440,7 +9440,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chirp-dexador" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz";
           sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q";
           system = "chirp-dexador";
           asd = "chirp-dexador";
@@ -9463,7 +9463,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chirp-drakma" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chirp/2025-06-22/chirp-20250622-git.tgz";
           sha256 = "00q82i0jkz61a15q658w3l82c8blz7s8197zgh72zwypgis8aw0q";
           system = "chirp-drakma";
           asd = "chirp-drakma";
@@ -9486,7 +9486,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chlorophyll" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chlorophyll/2023-10-21/chlorophyll-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chlorophyll/2023-10-21/chlorophyll-20231021-git.tgz";
           sha256 = "0q681pbcx4vcshrlligd5h07kakbjprb0kpf48z4glswy59vg8mg";
           system = "chlorophyll";
           asd = "chlorophyll";
@@ -9506,7 +9506,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chlorophyll-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chlorophyll/2023-10-21/chlorophyll-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chlorophyll/2023-10-21/chlorophyll-20231021-git.tgz";
           sha256 = "0q681pbcx4vcshrlligd5h07kakbjprb0kpf48z4glswy59vg8mg";
           system = "chlorophyll-test";
           asd = "chlorophyll-test";
@@ -9530,7 +9530,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chrome-native-messaging" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chrome-native-messaging/2015-03-02/chrome-native-messaging-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chrome-native-messaging/2015-03-02/chrome-native-messaging-20150302-git.tgz";
           sha256 = "1fw02w5brpwa0kl7sx5b13fbcfv1ny8rwcj11ayj2q528i2xmpx5";
           system = "chrome-native-messaging";
           asd = "chrome-native-messaging";
@@ -9550,7 +9550,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chronicity" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chronicity/2019-02-02/chronicity-20190202-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chronicity/2019-02-02/chronicity-20190202-git.tgz";
           sha256 = "1h5dlgvccffd8sqszqwilscysklzfcp374zl48rq14ywgv3rnwhl";
           system = "chronicity";
           asd = "chronicity";
@@ -9574,7 +9574,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chronicity-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chronicity/2019-02-02/chronicity-20190202-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chronicity/2019-02-02/chronicity-20190202-git.tgz";
           sha256 = "1h5dlgvccffd8sqszqwilscysklzfcp374zl48rq14ywgv3rnwhl";
           system = "chronicity-test";
           asd = "chronicity-test";
@@ -9597,7 +9597,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chtml-matcher" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chtml-matcher/2011-10-01/chtml-matcher-20111001-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chtml-matcher/2011-10-01/chtml-matcher-20111001-git.tgz";
           sha256 = "1q1ksy2w0c4dcmq8543scl11x4crh1m5w29p1wjpqhxk826jx7fd";
           system = "chtml-matcher";
           asd = "chtml-matcher";
@@ -9622,7 +9622,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "chunga" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/chunga/2024-10-12/chunga-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/chunga/2024-10-12/chunga-20241012-git.tgz";
           sha256 = "17jswsp31dh1jpg2n60nn34wxf4z6vvxjq1avy50z9fnzywvikyi";
           system = "chunga";
           asd = "chunga";
@@ -9640,7 +9640,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ci-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ci-utils/2024-10-12/ci-utils-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ci-utils/2024-10-12/ci-utils-20241012-git.tgz";
           sha256 = "1wrr1v2r7kd668hyz54x28xh153l2qkl1gra3bk4wmqi3x7xyxdg";
           system = "ci-utils";
           asd = "ci-utils";
@@ -9660,7 +9660,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ci-utils-features" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ci-utils/2024-10-12/ci-utils-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ci-utils/2024-10-12/ci-utils-20241012-git.tgz";
           sha256 = "1wrr1v2r7kd668hyz54x28xh153l2qkl1gra3bk4wmqi3x7xyxdg";
           system = "ci-utils-features";
           asd = "ci-utils-features";
@@ -9680,7 +9680,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ciao" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ciao/2024-10-12/ciao-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ciao/2024-10-12/ciao-20241012-git.tgz";
           sha256 = "1x443k02kl5iyq6awv2vqm08d9x9f92hjivqv2c5xdamki7y513s";
           system = "ciao";
           asd = "ciao";
@@ -9705,7 +9705,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "circular-streams" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz";
           sha256 = "1wpw6d5cciyqcf92f7mvihak52pd5s47kk4qq6f0r2z2as68p5rs";
           system = "circular-streams";
           asd = "circular-streams";
@@ -9726,7 +9726,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "circular-streams-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz";
           sha256 = "1wpw6d5cciyqcf92f7mvihak52pd5s47kk4qq6f0r2z2as68p5rs";
           system = "circular-streams-test";
           asd = "circular-streams-test";
@@ -9750,7 +9750,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "city-hash" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/city-hash/2020-09-25/city-hash-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/city-hash/2020-09-25/city-hash-20200925-git.tgz";
           sha256 = "10ksl402aa37sn78hnvlvpqibr66qzpjvf2x4a789gnl411cf44a";
           system = "city-hash";
           asd = "city-hash";
@@ -9774,7 +9774,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "city-hash-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/city-hash/2020-09-25/city-hash-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/city-hash/2020-09-25/city-hash-20200925-git.tgz";
           sha256 = "10ksl402aa37sn78hnvlvpqibr66qzpjvf2x4a789gnl411cf44a";
           system = "city-hash-test";
           asd = "city-hash-test";
@@ -9797,7 +9797,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ckr-tables" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-critic/2024-10-12/lisp-critic-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-critic/2024-10-12/lisp-critic-20241012-git.tgz";
           sha256 = "19czs2m8h3kgwjd10pdk9r5kazbgly8g82a5q3bs7pqkja42i7x7";
           system = "ckr-tables";
           asd = "ckr-tables";
@@ -9817,7 +9817,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl+ssl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl+ssl/2025-06-22/cl+ssl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl+ssl/2025-06-22/cl+ssl-20250622-git.tgz";
           sha256 = "0ns7if8f6i3ag0xrxkxy9k25ybypb2y3h4bq75cf7a0y82j3wlax";
           system = "cl+ssl";
           asd = "cl+ssl";
@@ -9844,7 +9844,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl+ssl.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl+ssl/2025-06-22/cl+ssl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl+ssl/2025-06-22/cl+ssl-20250622-git.tgz";
           sha256 = "0ns7if8f6i3ag0xrxkxy9k25ybypb2y3h4bq75cf7a0y82j3wlax";
           system = "cl+ssl.test";
           asd = "cl+ssl.test";
@@ -9871,7 +9871,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-6502" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-6502/2024-10-12/cl-6502-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-6502/2024-10-12/cl-6502-20241012-git.tgz";
           sha256 = "1cj38bi12i7ji3m8dd8gxb17dlna2v8s3b3h6b0a9pvmv6wchpmz";
           system = "cl-6502";
           asd = "cl-6502";
@@ -9894,7 +9894,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-aa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz";
           sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5";
           system = "cl-aa";
           asd = "cl-aa";
@@ -9912,7 +9912,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-aa-misc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz";
           sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5";
           system = "cl-aa-misc";
           asd = "cl-aa-misc";
@@ -9932,7 +9932,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-acronyms" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-acronyms/2015-03-02/cl-acronyms-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-acronyms/2015-03-02/cl-acronyms-20150302-git.tgz";
           sha256 = "1b827g6n87i81wbqzvmlq0yn41kfa502v5ssbh2wh1b4xznhn8cc";
           system = "cl-acronyms";
           asd = "cl-acronyms";
@@ -9955,7 +9955,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-actors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-lisp-actors/2019-11-30/common-lisp-actors-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-lisp-actors/2019-11-30/common-lisp-actors-20191130-git.tgz";
           sha256 = "0snf91yivxq6jcbvm3l6b05lcka7jrzciqd4m841amghfw32clfn";
           system = "cl-actors";
           asd = "cl-actors";
@@ -9975,7 +9975,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-advice" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-advice/2023-02-14/cl-advice-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-advice/2023-02-14/cl-advice-20230214-git.tgz";
           sha256 = "038fhy7chgn9racrcikqncyiq5yqngs6d5ahxz7jkypixcdz48jx";
           system = "cl-advice";
           asd = "cl-advice";
@@ -9995,7 +9995,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-advice-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-advice/2023-02-14/cl-advice-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-advice/2023-02-14/cl-advice-20230214-git.tgz";
           sha256 = "038fhy7chgn9racrcikqncyiq5yqngs6d5ahxz7jkypixcdz48jx";
           system = "cl-advice-tests";
           asd = "cl-advice-tests";
@@ -10018,7 +10018,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-alc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz";
           sha256 = "0jmp81mf23ckcm4knnh0q7zpmyls5220imaqbmnl0xvvra10b1zy";
           system = "cl-alc";
           asd = "cl-alc";
@@ -10041,7 +10041,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-algebraic-data-type" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-algebraic-data-type/2024-10-12/cl-algebraic-data-type-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-algebraic-data-type/2024-10-12/cl-algebraic-data-type-20241012-git.tgz";
           sha256 = "02bfx9g4267f7f85banmfy15adyvlzaz3flia8zmhlzhpx7j4bj6";
           system = "cl-algebraic-data-type";
           asd = "cl-algebraic-data-type";
@@ -10064,7 +10064,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-all" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-all/2024-10-12/cl-all-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-all/2024-10-12/cl-all-20241012-git.tgz";
           sha256 = "02n30b3yp949fxwnb9wr3m9hd5h1kcmxcbjc8c5fj4ihphf8sd7d";
           system = "cl-all";
           asd = "cl-all";
@@ -10084,7 +10084,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-alut" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz";
           sha256 = "0jmp81mf23ckcm4knnh0q7zpmyls5220imaqbmnl0xvvra10b1zy";
           system = "cl-alut";
           asd = "cl-alut";
@@ -10107,7 +10107,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-amqp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-amqp/2019-10-08/cl-amqp-v0.4.1.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-amqp/2019-10-08/cl-amqp-v0.4.1.tgz";
           sha256 = "1ggd77ckfr54z7z5yi8d04k310x2dhf53qija8dzjhk1r9py20vz";
           system = "cl-amqp";
           asd = "cl-amqp";
@@ -10137,7 +10137,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-amqp.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-amqp/2019-10-08/cl-amqp-v0.4.1.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-amqp/2019-10-08/cl-amqp-v0.4.1.tgz";
           sha256 = "1ggd77ckfr54z7z5yi8d04k310x2dhf53qija8dzjhk1r9py20vz";
           system = "cl-amqp.test";
           asd = "cl-amqp.test";
@@ -10164,7 +10164,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana";
           asd = "cl-ana";
@@ -10224,7 +10224,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.array-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.array-utils";
           asd = "cl-ana.array-utils";
@@ -10244,7 +10244,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.binary-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.binary-tree";
           asd = "cl-ana.binary-tree";
@@ -10268,7 +10268,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.calculus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.calculus";
           asd = "cl-ana.calculus";
@@ -10291,7 +10291,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.clos-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.clos-utils";
           asd = "cl-ana.clos-utils";
@@ -10316,7 +10316,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.columnar-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.columnar-table";
           asd = "cl-ana.columnar-table";
@@ -10339,7 +10339,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.csv-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.csv-table";
           asd = "cl-ana.csv-table";
@@ -10366,7 +10366,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.error-propogation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.error-propogation";
           asd = "cl-ana.error-propogation";
@@ -10389,7 +10389,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.file-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.file-utils";
           asd = "cl-ana.file-utils";
@@ -10412,7 +10412,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.fitting" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.fitting";
           asd = "cl-ana.fitting";
@@ -10439,7 +10439,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.functional-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.functional-utils";
           asd = "cl-ana.functional-utils";
@@ -10459,7 +10459,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.generic-math" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.generic-math";
           asd = "cl-ana.generic-math";
@@ -10482,7 +10482,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.gnuplot-interface" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.gnuplot-interface";
           asd = "cl-ana.gnuplot-interface";
@@ -10502,7 +10502,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.gsl-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.gsl-cffi";
           asd = "cl-ana.gsl-cffi";
@@ -10522,7 +10522,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.hash-table-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.hash-table-utils";
           asd = "cl-ana.hash-table-utils";
@@ -10542,7 +10542,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.hdf-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.hdf-cffi";
           asd = "cl-ana.hdf-cffi";
@@ -10565,7 +10565,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.hdf-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.hdf-table";
           asd = "cl-ana.hdf-table";
@@ -10595,7 +10595,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.hdf-typespec" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.hdf-typespec";
           asd = "cl-ana.hdf-typespec";
@@ -10624,7 +10624,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.hdf-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.hdf-utils";
           asd = "cl-ana.hdf-utils";
@@ -10654,7 +10654,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.histogram" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.histogram";
           asd = "cl-ana.histogram";
@@ -10688,7 +10688,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.int-char" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.int-char";
           asd = "cl-ana.int-char";
@@ -10708,7 +10708,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.linear-algebra" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.linear-algebra";
           asd = "cl-ana.linear-algebra";
@@ -10734,7 +10734,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.list-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.list-utils";
           asd = "cl-ana.list-utils";
@@ -10758,7 +10758,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.lorentz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.lorentz";
           asd = "cl-ana.lorentz";
@@ -10783,7 +10783,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.macro-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.macro-utils";
           asd = "cl-ana.macro-utils";
@@ -10809,7 +10809,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.makeres" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.makeres";
           asd = "cl-ana.makeres";
@@ -10851,7 +10851,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.makeres-block" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.makeres-block";
           asd = "cl-ana.makeres-block";
@@ -10876,7 +10876,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.makeres-branch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.makeres-branch";
           asd = "cl-ana.makeres-branch";
@@ -10903,7 +10903,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.makeres-graphviz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.makeres-graphviz";
           asd = "cl-ana.makeres-graphviz";
@@ -10926,7 +10926,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.makeres-macro" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.makeres-macro";
           asd = "cl-ana.makeres-macro";
@@ -10949,7 +10949,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.makeres-progress" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.makeres-progress";
           asd = "cl-ana.makeres-progress";
@@ -10973,7 +10973,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.makeres-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.makeres-table";
           asd = "cl-ana.makeres-table";
@@ -11007,7 +11007,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.makeres-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.makeres-utils";
           asd = "cl-ana.makeres-utils";
@@ -11044,7 +11044,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.map" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.map";
           asd = "cl-ana.map";
@@ -11064,7 +11064,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.math-functions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.math-functions";
           asd = "cl-ana.math-functions";
@@ -11087,7 +11087,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.memoization" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.memoization";
           asd = "cl-ana.memoization";
@@ -11107,7 +11107,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.ntuple-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.ntuple-table";
           asd = "cl-ana.ntuple-table";
@@ -11136,7 +11136,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.package-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.package-utils";
           asd = "cl-ana.package-utils";
@@ -11156,7 +11156,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.pathname-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.pathname-utils";
           asd = "cl-ana.pathname-utils";
@@ -11176,7 +11176,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.plotting" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.plotting";
           asd = "cl-ana.plotting";
@@ -11212,7 +11212,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.quantity" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.quantity";
           asd = "cl-ana.quantity";
@@ -11240,7 +11240,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.reusable-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.reusable-table";
           asd = "cl-ana.reusable-table";
@@ -11263,7 +11263,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.serialization" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.serialization";
           asd = "cl-ana.serialization";
@@ -11291,7 +11291,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.spline" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.spline";
           asd = "cl-ana.spline";
@@ -11320,7 +11320,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.statistical-learning" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.statistical-learning";
           asd = "cl-ana.statistical-learning";
@@ -11350,7 +11350,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.statistics" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.statistics";
           asd = "cl-ana.statistics";
@@ -11377,7 +11377,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.string-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.string-utils";
           asd = "cl-ana.string-utils";
@@ -11397,7 +11397,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.symbol-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.symbol-utils";
           asd = "cl-ana.symbol-utils";
@@ -11417,7 +11417,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.table";
           asd = "cl-ana.table";
@@ -11444,7 +11444,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.table-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.table-utils";
           asd = "cl-ana.table-utils";
@@ -11471,7 +11471,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.table-viewing" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.table-viewing";
           asd = "cl-ana.table-viewing";
@@ -11499,7 +11499,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.tensor" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.tensor";
           asd = "cl-ana.tensor";
@@ -11525,7 +11525,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.typed-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.typed-table";
           asd = "cl-ana.typed-table";
@@ -11552,7 +11552,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ana.typespec" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz";
           sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9";
           system = "cl-ana.typespec";
           asd = "cl-ana.typespec";
@@ -11581,7 +11581,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-android" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sl4a/2015-08-04/cl-sl4a-20150804-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sl4a/2015-08-04/cl-sl4a-20150804-git.tgz";
           sha256 = "0lqla60apkc8xfiyi43w18dldf0m8z5q290wv3d89qf0n9gwk3cr";
           system = "cl-android";
           asd = "cl-android";
@@ -11604,7 +11604,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-annot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz";
           sha256 = "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n";
           system = "cl-annot";
           asd = "cl-annot";
@@ -11622,7 +11622,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-annot-prove" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-annot-prove/2015-09-23/cl-annot-prove-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-annot-prove/2015-09-23/cl-annot-prove-20150923-git.tgz";
           sha256 = "000nlxxs1id1pccp3y5s9xnm76fc5r87q0bxmjrpklxwwf5y8wwy";
           system = "cl-annot-prove";
           asd = "cl-annot-prove";
@@ -11649,7 +11649,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-annot-prove-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-annot-prove/2015-09-23/cl-annot-prove-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-annot-prove/2015-09-23/cl-annot-prove-20150923-git.tgz";
           sha256 = "000nlxxs1id1pccp3y5s9xnm76fc5r87q0bxmjrpklxwwf5y8wwy";
           system = "cl-annot-prove-test";
           asd = "cl-annot-prove-test";
@@ -11673,7 +11673,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-annot-revisit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz";
           sha256 = "0jlllgq14bi1rddzlmq9wfs4vb24apgqz17wfd79kjjcmnzzjp4m";
           system = "cl-annot-revisit";
           asd = "cl-annot-revisit";
@@ -11696,7 +11696,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-annot-revisit-compat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz";
           sha256 = "0jlllgq14bi1rddzlmq9wfs4vb24apgqz17wfd79kjjcmnzzjp4m";
           system = "cl-annot-revisit-compat";
           asd = "cl-annot-revisit-compat";
@@ -11716,7 +11716,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-annot-revisit-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz";
           sha256 = "0jlllgq14bi1rddzlmq9wfs4vb24apgqz17wfd79kjjcmnzzjp4m";
           system = "cl-annot-revisit-test";
           asd = "cl-annot-revisit-test";
@@ -11741,7 +11741,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-anonfun" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz";
           sha256 = "086x2vjvasdy9bhikvdzx34nrq008c0sfkq3ncv0i9mhfk5xwp2j";
           system = "cl-anonfun";
           asd = "cl-anonfun";
@@ -11759,7 +11759,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ansi-term" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ansi-term/2025-06-22/cl-ansi-term-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ansi-term/2025-06-22/cl-ansi-term-20250622-git.tgz";
           sha256 = "0hrg17bijyhldmc5j8j50q9njqapm5yj7m3sb8azlffam9bpsbza";
           system = "cl-ansi-term";
           asd = "cl-ansi-term";
@@ -11784,7 +11784,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ansi-text" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ansi-text/2021-10-20/cl-ansi-text-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ansi-text/2021-10-20/cl-ansi-text-20211020-git.tgz";
           sha256 = "0nk7ajqfa937w1iy3zy86jjbw8yffm05cqs4wxkgl97v6kmmya14";
           system = "cl-ansi-text";
           asd = "cl-ansi-text";
@@ -11805,7 +11805,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ansi-text.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ansi-text/2021-10-20/cl-ansi-text-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ansi-text/2021-10-20/cl-ansi-text-20211020-git.tgz";
           sha256 = "0nk7ajqfa937w1iy3zy86jjbw8yffm05cqs4wxkgl97v6kmmya14";
           system = "cl-ansi-text.test";
           asd = "cl-ansi-text.test";
@@ -11830,7 +11830,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-apertium-stream" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-apertium-stream-parser/2023-06-18/cl-apertium-stream-parser-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-apertium-stream-parser/2023-06-18/cl-apertium-stream-parser-20230618-git.tgz";
           sha256 = "1f3v5pgar83iw443haa4nlzy1qvr55xxqggq9klvsji1a3jdypqy";
           system = "cl-apertium-stream";
           asd = "cl-apertium-stream";
@@ -11853,7 +11853,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-apple-plist" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-apple-plist/2011-11-05/cl-apple-plist-20111105-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-apple-plist/2011-11-05/cl-apple-plist-20111105-git.tgz";
           sha256 = "104j5lvvp7apdx59kbwc6kpa8b82y20w03627ml91lpbqk9bq63f";
           system = "cl-apple-plist";
           asd = "cl-apple-plist";
@@ -11873,7 +11873,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-arff-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-arff-parser/2013-04-21/cl-arff-parser-20130421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-arff-parser/2013-04-21/cl-arff-parser-20130421-git.tgz";
           sha256 = "0rn76r48b2y2richfy3si4r8kbwkvm7q15g34sxi0fkfmx15z4jx";
           system = "cl-arff-parser";
           asd = "cl-arff-parser";
@@ -11893,7 +11893,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-argparse" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-argparse/2021-05-31/cl-argparse-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-argparse/2021-05-31/cl-argparse-20210531-git.tgz";
           sha256 = "05vy2iaqr7yiaw0ykzwm0ml0mil5qagy87b8hqx4vvb3lq1qpn14";
           system = "cl-argparse";
           asd = "cl-argparse";
@@ -11913,7 +11913,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-aristid" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-aristid/2020-09-25/cl-aristid-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-aristid/2020-09-25/cl-aristid-20200925-git.tgz";
           sha256 = "0k573k3wydy6dd5pmvqdxmlwk0n5kq2wsk86syddhqyjgx2jmw98";
           system = "cl-aristid";
           asd = "cl-aristid";
@@ -11936,7 +11936,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-arxiv-api" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-arxiv-api/2017-04-03/cl-arxiv-api-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-arxiv-api/2017-04-03/cl-arxiv-api-20170403-git.tgz";
           sha256 = "1id95gszqxmmjydv1vjv2vyxz0svqvnx74bmgy63xnajb4kfnpq3";
           system = "cl-arxiv-api";
           asd = "cl-arxiv-api";
@@ -11962,7 +11962,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ascii-art" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ascii-art/2017-10-19/cl-ascii-art-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ascii-art/2017-10-19/cl-ascii-art-20171019-git.tgz";
           sha256 = "03d3bd8m7dd2l4170vky8y8ini3giqhjpd06rlswz287mkvzq8aa";
           system = "cl-ascii-art";
           asd = "cl-ascii-art";
@@ -11989,7 +11989,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ascii-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ascii-table/2020-06-10/cl-ascii-table-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ascii-table/2020-06-10/cl-ascii-table-20200610-git.tgz";
           sha256 = "1nclyypd2p06hyfydcv16m9lbj1xmrpmf00wp8mfyhwimv021zlp";
           system = "cl-ascii-table";
           asd = "cl-ascii-table";
@@ -12009,7 +12009,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-aseprite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-aseprite/2024-10-12/cl-aseprite-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-aseprite/2024-10-12/cl-aseprite-20241012-git.tgz";
           sha256 = "0xjrfi232d0my4ncafp1l2yfas8nj0k8nsbppkq70anic5ihbhch";
           system = "cl-aseprite";
           asd = "cl-aseprite";
@@ -12035,7 +12035,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-association-rules" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-association-rules/2017-04-03/cl-association-rules-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-association-rules/2017-04-03/cl-association-rules-20170403-git.tgz";
           sha256 = "1d4sg9j30ydk1m17byacww8l2x9ggb82iay507g08ij0jxdky86z";
           system = "cl-association-rules";
           asd = "cl-association-rules";
@@ -12055,7 +12055,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-association-rules-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-association-rules/2017-04-03/cl-association-rules-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-association-rules/2017-04-03/cl-association-rules-20170403-git.tgz";
           sha256 = "1d4sg9j30ydk1m17byacww8l2x9ggb82iay507g08ij0jxdky86z";
           system = "cl-association-rules-tests";
           asd = "cl-association-rules";
@@ -12078,7 +12078,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-astar" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-astar/2025-06-22/cl-astar-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-astar/2025-06-22/cl-astar-20250622-git.tgz";
           sha256 = "1hx68wk2r290v1l5g4gp02rj33kc1zf7xbn5c5kmys83f9dq8j9f";
           system = "cl-astar";
           asd = "cl-astar";
@@ -12103,7 +12103,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-async" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
           sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv";
           system = "cl-async";
           asd = "cl-async";
@@ -12131,7 +12131,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-async-await" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-async-await/2020-10-16/cl-async-await-20201016-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-async-await/2020-10-16/cl-async-await-20201016-git.tgz";
           sha256 = "1slhn9z4hljvad3hd8jmvw4q4m6310s04yh3212wvbfar8q0yasj";
           system = "cl-async-await";
           asd = "cl-async-await";
@@ -12155,7 +12155,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-async-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
           sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv";
           system = "cl-async-base";
           asd = "cl-async";
@@ -12177,7 +12177,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-async-future" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-async-future/2015-01-13/cl-async-future-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-async-future/2015-01-13/cl-async-future-20150113-git.tgz";
           sha256 = "0z0sc7qlzzxk99f4l26zp6rai9kv0kj0f599sxai5s44p17zbbvh";
           system = "cl-async-future";
           asd = "cl-async-future";
@@ -12197,7 +12197,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-async-repl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
           sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv";
           system = "cl-async-repl";
           asd = "cl-async-repl";
@@ -12218,7 +12218,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-async-ssl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
           sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv";
           system = "cl-async-ssl";
           asd = "cl-async-ssl";
@@ -12240,7 +12240,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-async-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
           sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv";
           system = "cl-async-test";
           asd = "cl-async-test";
@@ -12269,7 +12269,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-async-util" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-async/2025-06-22/cl-async-20250622-git.tgz";
           sha256 = "0z1zb8dvi0p5kx2fv1wi092l50jb88xwsbxzmkmny9647jfcq9kv";
           system = "cl-async-util";
           asd = "cl-async";
@@ -12294,7 +12294,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-aubio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-aubio/2025-06-22/cl-aubio-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-aubio/2025-06-22/cl-aubio-20250622-git.tgz";
           sha256 = "1xyflxy46z4487dbnizhv058y2mdka9iyikl097m60w42blidpn3";
           system = "cl-aubio";
           asd = "cl-aubio";
@@ -12319,7 +12319,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-authorize-net" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz";
           sha256 = "1qq9r7q50k7jw6sv65aqi9xalaw8m6aqsbb0cgpjxv8wdhy934cr";
           system = "cl-authorize-net";
           asd = "cl-authorize-net";
@@ -12345,7 +12345,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-authorize-net-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz";
           sha256 = "1qq9r7q50k7jw6sv65aqi9xalaw8m6aqsbb0cgpjxv8wdhy934cr";
           system = "cl-authorize-net-tests";
           asd = "cl-authorize-net";
@@ -12369,7 +12369,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-autorepo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-autorepo/2018-07-11/cl-autorepo-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-autorepo/2018-07-11/cl-autorepo-20180711-git.tgz";
           sha256 = "01hpg3r3493mri44kxp8sjy8i5kfvjklmnksvm0727i6bhpf8cz9";
           system = "cl-autorepo";
           asd = "cl-autorepo";
@@ -12389,7 +12389,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-autowrap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz";
           sha256 = "1sfvhyrwm9dhxi0y42xp7mx8mvs6lmq3bzxdx34frxni5srcgly0";
           system = "cl-autowrap";
           asd = "cl-autowrap";
@@ -12416,7 +12416,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-autowrap-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz";
           sha256 = "1sfvhyrwm9dhxi0y42xp7mx8mvs6lmq3bzxdx34frxni5srcgly0";
           system = "cl-autowrap-test";
           asd = "cl-autowrap-test";
@@ -12436,7 +12436,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-azure" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-azure/2016-08-25/cl-azure-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-azure/2016-08-25/cl-azure-20160825-git.tgz";
           sha256 = "19sgzbvgs1f1h3qhx11xhpia2x3n8x729h9fsqkc7fap0ak1h31d";
           system = "cl-azure";
           asd = "cl-azure";
@@ -12466,7 +12466,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-base16" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-base16/2020-09-25/cl-base16-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-base16/2020-09-25/cl-base16-20200925-git.tgz";
           sha256 = "0m7ndmk4xhizn3q3ywjvw8sg4pfgp6lrd0wac5d1bf7wbw6afh5q";
           system = "cl-base16";
           asd = "cl-base16";
@@ -12491,7 +12491,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-base32" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-base32/2024-10-12/cl-base32-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-base32/2024-10-12/cl-base32-20241012-git.tgz";
           sha256 = "0kc0rxwx2ak5kvrzl8y8x3csm0d6appi5k0as2jgm3ig5vgcs5cn";
           system = "cl-base32";
           asd = "cl-base32";
@@ -12511,7 +12511,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-base58" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-base58/2015-01-13/cl-base58-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-base58/2015-01-13/cl-base58-20150113-git.tgz";
           sha256 = "01wiiyz1jzxx3zhxi2hpq5n8hv28g1mn0adk793vwjzh4v5bi5zz";
           system = "cl-base58";
           asd = "cl-base58";
@@ -12531,7 +12531,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-base58-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-base58/2015-01-13/cl-base58-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-base58/2015-01-13/cl-base58-20150113-git.tgz";
           sha256 = "01wiiyz1jzxx3zhxi2hpq5n8hv28g1mn0adk793vwjzh4v5bi5zz";
           system = "cl-base58-test";
           asd = "cl-base58-test";
@@ -12554,7 +12554,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-base64" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz";
           sha256 = "12jj54h0fs6n237cvnp8v6hn0imfksammq22ys6pi0gwz2w47rbj";
           system = "cl-base64";
           asd = "cl-base64";
@@ -12572,7 +12572,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-batis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-batis/2025-06-22/cl-batis-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-batis/2025-06-22/cl-batis-20250622-git.tgz";
           sha256 = "1hmgvp32ivs34xj6a5nnrmj16kphdckz1ygfkrb5f0iwr305qbjf";
           system = "cl-batis";
           asd = "cl-batis";
@@ -12592,7 +12592,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bayesnet" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bayesnet/2013-04-20/cl-bayesnet-20130420-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bayesnet/2013-04-20/cl-bayesnet-20130420-git.tgz";
           sha256 = "02as2isvgm89qpyj49ccs1cg4fl9iswxi26w4j0svsha0q1dh5m8";
           system = "cl-bayesnet";
           asd = "cl-bayesnet";
@@ -12616,7 +12616,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bcrypt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bcrypt/2023-10-21/cl-bcrypt-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bcrypt/2023-10-21/cl-bcrypt-20231021-git.tgz";
           sha256 = "0mfs1jwf1xi6za61hfc7dgf1g5lqqsqdclnnspncvdg6l137013n";
           system = "cl-bcrypt";
           asd = "cl-bcrypt";
@@ -12640,7 +12640,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bcrypt.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bcrypt/2023-10-21/cl-bcrypt-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bcrypt/2023-10-21/cl-bcrypt-20231021-git.tgz";
           sha256 = "0mfs1jwf1xi6za61hfc7dgf1g5lqqsqdclnnspncvdg6l137013n";
           system = "cl-bcrypt.test";
           asd = "cl-bcrypt.test";
@@ -12663,7 +12663,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-beanstalk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-beanstalk/2022-07-07/cl-beanstalk-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-beanstalk/2022-07-07/cl-beanstalk-20220707-git.tgz";
           sha256 = "0vca8dw2l765m7g7xcpzi80m8f3145hhshh8ym602336fhiz61q1";
           system = "cl-beanstalk";
           asd = "cl-beanstalk";
@@ -12687,7 +12687,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-binary-store" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-binary-store/2025-06-22/cl-binary-store-stable-9d8b7e7f-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-binary-store/2025-06-22/cl-binary-store-stable-9d8b7e7f-git.tgz";
           sha256 = "1x8g65ij6bbfkd9hcy4wm3frjnb83ip05mvdbpm8hwzgkx1ydf94";
           system = "cl-binary-store";
           asd = "cl-binary-store";
@@ -12712,7 +12712,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bip39" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bip39/2018-07-11/cl-bip39-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bip39/2018-07-11/cl-bip39-20180711-git.tgz";
           sha256 = "04h4lhppvavvqknp11gaj4ka2wpn9i883w1w27llblkg2vnn0816";
           system = "cl-bip39";
           asd = "cl-bip39";
@@ -12737,7 +12737,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bloggy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bloggy/2021-10-20/cl-bloggy-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bloggy/2021-10-20/cl-bloggy-20211020-git.tgz";
           sha256 = "1clz2a0s3g3jbsrpypb4byb432l0yb4658riqs6ckin57c4bzxc8";
           system = "cl-bloggy";
           asd = "cl-bloggy";
@@ -12768,7 +12768,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bloom" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bloom/2018-02-28/cl-bloom-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bloom/2018-02-28/cl-bloom-20180228-git.tgz";
           sha256 = "1ircc5sa0a2xlx0fca0is6inwrk311hbj8jx6r4sas5pfv78k4am";
           system = "cl-bloom";
           asd = "cl-bloom";
@@ -12791,7 +12791,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bloom-filter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bloom-filter/2022-11-06/cl-bloom-filter-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bloom-filter/2022-11-06/cl-bloom-filter-20221106-git.tgz";
           sha256 = "1s9m617fh3krh2klc2nx7jf89nk43cvvrnvqrhvw9jprw7gqanvq";
           system = "cl-bloom-filter";
           asd = "cl-bloom-filter";
@@ -12811,7 +12811,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bmp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bmp/2025-06-22/cl-bmp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bmp/2025-06-22/cl-bmp-20250622-git.tgz";
           sha256 = "0zv91gad3bvd3sd4ah91d3i1fp0sn23rz6vi3nj28mw9r90sf6z1";
           system = "cl-bmp";
           asd = "cl-bmp";
@@ -12834,7 +12834,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bnf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz";
           sha256 = "0aa7hnkj71f37lxzlhsppwcmk3yv42hclq08c4jrdnv8jmdb8r0l";
           system = "cl-bnf";
           asd = "cl-bnf";
@@ -12857,7 +12857,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bnf-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz";
           sha256 = "0aa7hnkj71f37lxzlhsppwcmk3yv42hclq08c4jrdnv8jmdb8r0l";
           system = "cl-bnf-examples";
           asd = "cl-bnf-examples";
@@ -12877,7 +12877,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bnf-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz";
           sha256 = "0aa7hnkj71f37lxzlhsppwcmk3yv42hclq08c4jrdnv8jmdb8r0l";
           system = "cl-bnf-tests";
           asd = "cl-bnf-tests";
@@ -12900,7 +12900,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bootstrap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz";
           sha256 = "0pk7wx4arsljxlnbx1hzcgxwsvhdp3gn22wv43xls2jv1rdi2xry";
           system = "cl-bootstrap";
           asd = "cl-bootstrap";
@@ -12923,7 +12923,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bootstrap-demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz";
           sha256 = "0pk7wx4arsljxlnbx1hzcgxwsvhdp3gn22wv43xls2jv1rdi2xry";
           system = "cl-bootstrap-demo";
           asd = "cl-bootstrap-demo";
@@ -12948,7 +12948,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bootstrap-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz";
           sha256 = "0pk7wx4arsljxlnbx1hzcgxwsvhdp3gn22wv43xls2jv1rdi2xry";
           system = "cl-bootstrap-test";
           asd = "cl-bootstrap-test";
@@ -12971,7 +12971,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bplustree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bplustree/2018-03-28/cl-bplustree-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bplustree/2018-03-28/cl-bplustree-20180328-git.tgz";
           sha256 = "1d9pm9fi9bhh73bhcgig0wq5i4fvc4551kxvny3di6x6yr7j2kbl";
           system = "cl-bplustree";
           asd = "cl-bplustree";
@@ -12991,7 +12991,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bplustree-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bplustree/2018-03-28/cl-bplustree-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bplustree/2018-03-28/cl-bplustree-20180328-git.tgz";
           sha256 = "1d9pm9fi9bhh73bhcgig0wq5i4fvc4551kxvny3di6x6yr7j2kbl";
           system = "cl-bplustree-test";
           asd = "cl-bplustree";
@@ -13011,7 +13011,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-brewer-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz";
           sha256 = "0izf6v4qx82jhk7ln28jhdmnr3lb0r5iqjj0by9igq5sk3y1my4x";
           system = "cl-brewer-ci";
           asd = "cl-brewer-ci";
@@ -13031,7 +13031,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-brewer-deploy-hooks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz";
           sha256 = "0izf6v4qx82jhk7ln28jhdmnr3lb0r5iqjj0by9igq5sk3y1my4x";
           system = "cl-brewer-deploy-hooks";
           asd = "cl-brewer-deploy-hooks";
@@ -13051,7 +13051,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-brewer-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz";
           sha256 = "0izf6v4qx82jhk7ln28jhdmnr3lb0r5iqjj0by9igq5sk3y1my4x";
           system = "cl-brewer-tests";
           asd = "cl-brewer-tests";
@@ -13071,7 +13071,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-buchberger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-buchberger/2024-10-12/cl-buchberger-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-buchberger/2024-10-12/cl-buchberger-20241012-git.tgz";
           sha256 = "0hn340y52xfgj788zh449jrh7blfv6yqfnkmqg2vghy92s8jcr1i";
           system = "cl-buchberger";
           asd = "cl-buchberger";
@@ -13091,7 +13091,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-bus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-bus/2021-12-09/cl-bus-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-bus/2021-12-09/cl-bus-20211209-git.tgz";
           sha256 = "1galzqm1qv2slibn3awfyxnmlslxmzw09a8fidmbdy1r0ppp5r7z";
           system = "cl-bus";
           asd = "cl-bus";
@@ -13111,7 +13111,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ca" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ca/2016-12-04/cl-ca-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ca/2016-12-04/cl-ca-20161204-git.tgz";
           sha256 = "0kpwpxw3c8q7b2ajyj9rzhs1r1h6kipdm9qjkgsn0sqrmx9acfnz";
           system = "cl-ca";
           asd = "cl-ca";
@@ -13131,7 +13131,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cache-tables" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cache-tables/2017-10-19/cl-cache-tables-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cache-tables/2017-10-19/cl-cache-tables-20171019-git.tgz";
           sha256 = "008m7v39mq2475y1f4if5iazb15rm02g22id4q4qgig1zx2vfpg1";
           system = "cl-cache-tables";
           asd = "cl-cache-tables";
@@ -13151,7 +13151,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cache-tables-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cache-tables/2017-10-19/cl-cache-tables-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cache-tables/2017-10-19/cl-cache-tables-20171019-git.tgz";
           sha256 = "008m7v39mq2475y1f4if5iazb15rm02g22id4q4qgig1zx2vfpg1";
           system = "cl-cache-tables-tests";
           asd = "cl-cache-tables";
@@ -13174,7 +13174,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cairo2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz";
           sha256 = "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q";
           system = "cl-cairo2";
           asd = "cl-cairo2";
@@ -13199,7 +13199,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cairo2-demos" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz";
           sha256 = "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q";
           system = "cl-cairo2-demos";
           asd = "cl-cairo2-demos";
@@ -13219,7 +13219,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cairo2-xlib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz";
           sha256 = "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q";
           system = "cl-cairo2-xlib";
           asd = "cl-cairo2-xlib";
@@ -13240,7 +13240,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-case-control" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-case-control/2014-11-06/cl-case-control-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-case-control/2014-11-06/cl-case-control-20141106-git.tgz";
           sha256 = "0510m1dfz4abw3s7w0axr1b1nsmi72avr850r0sn6p2pq091pc71";
           system = "cl-case-control";
           asd = "cl-case-control";
@@ -13260,7 +13260,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-catmull-rom-spline" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-catmull-rom-spline/2022-02-20/cl-catmull-rom-spline-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-catmull-rom-spline/2022-02-20/cl-catmull-rom-spline-20220220-git.tgz";
           sha256 = "0702swja11zpfdx04l0901ipvi0acg17mk9ryvhibnbzq70npyjs";
           system = "cl-catmull-rom-spline";
           asd = "cl-catmull-rom-spline";
@@ -13280,7 +13280,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cerf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cerf/2021-05-31/cl-cerf-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cerf/2021-05-31/cl-cerf-20210531-git.tgz";
           sha256 = "0n1b6ig1d0dqkjn06iqsk0m4y7j7msi2gcq7niivcwc4s0ry0ljn";
           system = "cl-cerf";
           asd = "cl-cerf";
@@ -13303,7 +13303,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cffi-gtk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
           sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3";
           system = "cl-cffi-gtk";
           asd = "cl-cffi-gtk";
@@ -13329,7 +13329,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cffi-gtk-cairo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
           sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3";
           system = "cl-cffi-gtk-cairo";
           asd = "cl-cffi-gtk-cairo";
@@ -13347,7 +13347,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cffi-gtk-demo-cairo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
           sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3";
           system = "cl-cffi-gtk-demo-cairo";
           asd = "cl-cffi-gtk-demo-cairo";
@@ -13367,7 +13367,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cffi-gtk-demo-glib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
           sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3";
           system = "cl-cffi-gtk-demo-glib";
           asd = "cl-cffi-gtk-demo-glib";
@@ -13387,7 +13387,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cffi-gtk-demo-gobject" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
           sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3";
           system = "cl-cffi-gtk-demo-gobject";
           asd = "cl-cffi-gtk-demo-gobject";
@@ -13407,7 +13407,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cffi-gtk-example-gtk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
           sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3";
           system = "cl-cffi-gtk-example-gtk";
           asd = "cl-cffi-gtk-example-gtk";
@@ -13427,7 +13427,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cffi-gtk-gdk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
           sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3";
           system = "cl-cffi-gtk-gdk";
           asd = "cl-cffi-gtk-gdk";
@@ -13452,7 +13452,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cffi-gtk-gdk-pixbuf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
           sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3";
           system = "cl-cffi-gtk-gdk-pixbuf";
           asd = "cl-cffi-gtk-gdk-pixbuf";
@@ -13473,7 +13473,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cffi-gtk-gio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
           sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3";
           system = "cl-cffi-gtk-gio";
           asd = "cl-cffi-gtk-gio";
@@ -13494,7 +13494,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cffi-gtk-glib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
           sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3";
           system = "cl-cffi-gtk-glib";
           asd = "cl-cffi-gtk-glib";
@@ -13518,7 +13518,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cffi-gtk-gobject" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
           sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3";
           system = "cl-cffi-gtk-gobject";
           asd = "cl-cffi-gtk-gobject";
@@ -13540,7 +13540,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cffi-gtk-opengl-demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
           sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3";
           system = "cl-cffi-gtk-opengl-demo";
           asd = "cl-cffi-gtk-opengl-demo";
@@ -13563,7 +13563,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cffi-gtk-pango" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cffi-gtk/2023-02-14/cl-cffi-gtk-20230214-git.tgz";
           sha256 = "1cn2f6b62axjzdzfv971218ably32dvqfdy499li25vjd8nb2qm3";
           system = "cl-cffi-gtk-pango";
           asd = "cl-cffi-gtk-pango";
@@ -13585,7 +13585,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-change-case" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-change-case/2025-06-22/cl-change-case-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-change-case/2025-06-22/cl-change-case-20250622-git.tgz";
           sha256 = "0snwq2zmvkay173hhg43njy9iqapisazri1y6ws89m1c4dhs47x8";
           system = "cl-change-case";
           asd = "cl-change-case";
@@ -13606,7 +13606,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-charms" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz";
           sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9";
           system = "cl-charms";
           asd = "cl-charms";
@@ -13630,7 +13630,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-charms-marquee" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz";
           sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9";
           system = "cl-charms-marquee";
           asd = "cl-charms-marquee";
@@ -13650,7 +13650,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-charms-paint" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz";
           sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9";
           system = "cl-charms-paint";
           asd = "cl-charms-paint";
@@ -13670,7 +13670,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-charms-timer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-charms/2025-06-22/cl-charms-20250622-git.tgz";
           sha256 = "102jiq0y8ckf14s1i8b42r44yjlb761q8jinqf2q4c2ki0vgflw9";
           system = "cl-charms-timer";
           asd = "cl-charms-timer";
@@ -13690,7 +13690,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-clblas" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-clblas/2018-10-18/cl-clblas-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-clblas/2018-10-18/cl-clblas-20181018-git.tgz";
           sha256 = "0cn4hvywaw97ccnj2wxjf20lh7h7n5fs6rq6kgjyfs9cxcixmvrj";
           system = "cl-clblas";
           asd = "cl-clblas";
@@ -13710,7 +13710,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-clblas-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-clblas/2018-10-18/cl-clblas-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-clblas/2018-10-18/cl-clblas-20181018-git.tgz";
           sha256 = "0cn4hvywaw97ccnj2wxjf20lh7h7n5fs6rq6kgjyfs9cxcixmvrj";
           system = "cl-clblas-test";
           asd = "cl-clblas-test";
@@ -13736,7 +13736,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cli" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz";
           sha256 = "0zlifq55r78vfdlqf8jy6rkny73438f1i9cp9a8vybmila5dij3q";
           system = "cl-cli";
           asd = "cl-cli";
@@ -13754,7 +13754,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-clsparse" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-clsparse/2019-08-13/cl-clsparse-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-clsparse/2019-08-13/cl-clsparse-20190813-git.tgz";
           sha256 = "0cmmwx2ka1jp5711x21knw3zi6kcpkpcs39dm62w82s97bv794gz";
           system = "cl-clsparse";
           asd = "cl-clsparse";
@@ -13777,7 +13777,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cognito" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cognito/2018-12-10/cl-cognito-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cognito/2018-12-10/cl-cognito-20181210-git.tgz";
           sha256 = "0zy4yg4zggvxwbvkjkd89d2ps236kz6pvz90zn6gzq812wnidsd3";
           system = "cl-cognito";
           asd = "cl-cognito";
@@ -13803,7 +13803,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-coinpayments" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-coinpayments/2021-08-07/cl-coinpayments-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-coinpayments/2021-08-07/cl-coinpayments-20210807-git.tgz";
           sha256 = "1vgsh95vjqqg0a6lqg1ivs36yjx6ck8cqhsmlr5l3ldfd8yr65q7";
           system = "cl-coinpayments";
           asd = "cl-coinpayments";
@@ -13830,7 +13830,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-collider" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-collider/2025-06-22/cl-collider-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-collider/2025-06-22/cl-collider-20250622-git.tgz";
           sha256 = "01yiwwi9zhh1vksk26m170i6x9lsbygbznaxggf8h9psiyqg5991";
           system = "cl-collider";
           asd = "cl-collider";
@@ -13859,7 +13859,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-colors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz";
           sha256 = "0l446lday4hybsm9bq3jli97fvv8jb1d33abg79vbylpwjmf3y9a";
           system = "cl-colors";
           asd = "cl-colors";
@@ -13880,7 +13880,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-colors-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz";
           sha256 = "0l446lday4hybsm9bq3jli97fvv8jb1d33abg79vbylpwjmf3y9a";
           system = "cl-colors-tests";
           asd = "cl-colors";
@@ -13903,7 +13903,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-colors2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-colors2/2025-06-22/cl-colors2-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-colors2/2025-06-22/cl-colors2-20250622-git.tgz";
           sha256 = "0wisj59fq38cnk1m8lxxpjbwk0j8q3sp3n1jp99da7bi7vq04491";
           system = "cl-colors2";
           asd = "cl-colors2";
@@ -13925,7 +13925,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-concord" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-concord/2025-06-22/cl-concord-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-concord/2025-06-22/cl-concord-20250622-git.tgz";
           sha256 = "1kyz9wjcr5xq4fvzvs8cib4a52vwnv08cv5kzf3hyaipxd7fq37y";
           system = "cl-concord";
           asd = "cl-concord";
@@ -13950,7 +13950,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-conllu" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-conllu/2021-12-09/cl-conllu-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-conllu/2021-12-09/cl-conllu-20211209-git.tgz";
           sha256 = "0n69k0apifnirs2g3rfdsxiwy6dimd9qqxaqywaingvbd7yn42jn";
           system = "cl-conllu";
           asd = "cl-conllu";
@@ -13982,7 +13982,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-conspack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-conspack/2023-02-14/cl-conspack-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-conspack/2023-02-14/cl-conspack-20230214-git.tgz";
           sha256 = "0y5wp5c89ph44k2xjppy1c1jf2ac3q9yrk22da2rkwnbxn0h1a8d";
           system = "cl-conspack";
           asd = "cl-conspack";
@@ -14009,7 +14009,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-conspack-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-conspack/2023-02-14/cl-conspack-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-conspack/2023-02-14/cl-conspack-20230214-git.tgz";
           sha256 = "0y5wp5c89ph44k2xjppy1c1jf2ac3q9yrk22da2rkwnbxn0h1a8d";
           system = "cl-conspack-test";
           asd = "cl-conspack-test";
@@ -14032,7 +14032,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cont" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cont/2011-02-19/cl-cont-20110219-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cont/2011-02-19/cl-cont-20110219-darcs.tgz";
           sha256 = "1zf8zvb0i6jm3hhfks4w74hibm6avgc6f9s1qwgjrn2bcik8lrvz";
           system = "cl-cont";
           asd = "cl-cont";
@@ -14055,7 +14055,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cont-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cont/2011-02-19/cl-cont-20110219-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cont/2011-02-19/cl-cont-20110219-darcs.tgz";
           sha256 = "1zf8zvb0i6jm3hhfks4w74hibm6avgc6f9s1qwgjrn2bcik8lrvz";
           system = "cl-cont-test";
           asd = "cl-cont-test";
@@ -14078,7 +14078,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-containers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-containers/2024-10-12/cl-containers-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-containers/2024-10-12/cl-containers-20241012-git.tgz";
           sha256 = "0xpa5yhsndh33cs4q6vgjc8jxwlmv8lxkg4bamfi0f3ad4smi7zl";
           system = "cl-containers";
           asd = "cl-containers";
@@ -14099,7 +14099,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-containers-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-containers/2024-10-12/cl-containers-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-containers/2024-10-12/cl-containers-20241012-git.tgz";
           sha256 = "0xpa5yhsndh33cs4q6vgjc8jxwlmv8lxkg4bamfi0f3ad4smi7zl";
           system = "cl-containers-test";
           asd = "cl-containers-test";
@@ -14122,7 +14122,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cookie" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cookie/2024-10-12/cl-cookie-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cookie/2024-10-12/cl-cookie-20241012-git.tgz";
           sha256 = "172lw0sm6i9nvlx0iv0851rsm5pc28xqqf6a75pwv1fvr6srq8qh";
           system = "cl-cookie";
           asd = "cl-cookie";
@@ -14146,7 +14146,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cookie-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cookie/2024-10-12/cl-cookie-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cookie/2024-10-12/cl-cookie-20241012-git.tgz";
           sha256 = "172lw0sm6i9nvlx0iv0851rsm5pc28xqqf6a75pwv1fvr6srq8qh";
           system = "cl-cookie-test";
           asd = "cl-cookie-test";
@@ -14169,7 +14169,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-coroutine" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-coroutine/2016-09-29/cl-coroutine-20160929-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-coroutine/2016-09-29/cl-coroutine-20160929-git.tgz";
           sha256 = "1cqdhdjxffgfs116l1swjlsmcbly0xgcgrckvaajd566idj9yj4l";
           system = "cl-coroutine";
           asd = "cl-coroutine";
@@ -14192,7 +14192,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-coroutine-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-coroutine/2016-09-29/cl-coroutine-20160929-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-coroutine/2016-09-29/cl-coroutine-20160929-git.tgz";
           sha256 = "1cqdhdjxffgfs116l1swjlsmcbly0xgcgrckvaajd566idj9yj4l";
           system = "cl-coroutine-test";
           asd = "cl-coroutine-test";
@@ -14215,7 +14215,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-coveralls" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-coveralls/2025-06-22/cl-coveralls-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-coveralls/2025-06-22/cl-coveralls-20250622-git.tgz";
           sha256 = "0wl7245v0wp7sbp64a4n7r490r21pnac1lfadl8vdp5ccrxh4nb5";
           system = "cl-coveralls";
           asd = "cl-coveralls";
@@ -14244,7 +14244,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-coveralls-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-coveralls/2025-06-22/cl-coveralls-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-coveralls/2025-06-22/cl-coveralls-20250622-git.tgz";
           sha256 = "0wl7245v0wp7sbp64a4n7r490r21pnac1lfadl8vdp5ccrxh4nb5";
           system = "cl-coveralls-test";
           asd = "cl-coveralls-test";
@@ -14268,7 +14268,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-covid19" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-covid19/2022-03-31/cl-covid19-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-covid19/2022-03-31/cl-covid19-20220331-git.tgz";
           sha256 = "0nxdharz29nrdylrwnhgdayfsfwm0vd5g487mi4i5lly8q0i9vl0";
           system = "cl-covid19";
           asd = "cl-covid19";
@@ -14300,7 +14300,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cpu-affinity" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
           sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "cl-cpu-affinity";
           asd = "cl-cpu-affinity";
@@ -14320,7 +14320,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cpus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cpus/2023-06-18/cl-cpus-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cpus/2023-06-18/cl-cpus-20230618-git.tgz";
           sha256 = "1gxyb85hpjmhz7vhny9cscrzldx06f7c5q93pl1qs0s3b7avh5vd";
           system = "cl-cpus";
           asd = "cl-cpus";
@@ -14340,7 +14340,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cram" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cram/2023-06-18/cl-cram-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cram/2023-06-18/cl-cram-20230618-git.tgz";
           sha256 = "139p4hbb6ac57ay5vgr969d3rki9ypk9ninaqm5vkax2hcx7mq3i";
           system = "cl-cram";
           asd = "cl-cram";
@@ -14360,7 +14360,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-crc64" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-crc64/2014-07-13/cl-crc64-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-crc64/2014-07-13/cl-crc64-20140713-git.tgz";
           sha256 = "1cqky5ps28r49z6ib4vjwfjpq3ml81p2ayf0nqppf2lc4vf3kb20";
           system = "cl-crc64";
           asd = "cl-crc64";
@@ -14380,7 +14380,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-creditcard" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz";
           sha256 = "1qq9r7q50k7jw6sv65aqi9xalaw8m6aqsbb0cgpjxv8wdhy934cr";
           system = "cl-creditcard";
           asd = "cl-creditcard";
@@ -14400,7 +14400,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cron" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cron/2023-10-21/cl-cron-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cron/2023-10-21/cl-cron-20231021-git.tgz";
           sha256 = "0l1jg2sqdqniaqsaywy0ar49m10gzls8i31gpxmd7c4yzazy4fib";
           system = "cl-cron";
           asd = "cl-cron";
@@ -14420,7 +14420,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-css" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz";
           sha256 = "1lc42zi2sw11fl2589sc19nr5sd2p0wy7wgvgwaggxa5f3ajhsmd";
           system = "cl-css";
           asd = "cl-css";
@@ -14438,7 +14438,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-csv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz";
           sha256 = "0pb89l3bi2cnk7sav2w0dmlvjxij1wpy3w6n9c4b6imjs0pznrxi";
           system = "cl-csv";
           asd = "cl-csv";
@@ -14460,7 +14460,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-csv-clsql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz";
           sha256 = "0pb89l3bi2cnk7sav2w0dmlvjxij1wpy3w6n9c4b6imjs0pznrxi";
           system = "cl-csv-clsql";
           asd = "cl-csv-clsql";
@@ -14484,7 +14484,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-csv-data-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz";
           sha256 = "0pb89l3bi2cnk7sav2w0dmlvjxij1wpy3w6n9c4b6imjs0pznrxi";
           system = "cl-csv-data-table";
           asd = "cl-csv-data-table";
@@ -14507,7 +14507,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cuda" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz";
           sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg";
           system = "cl-cuda";
           asd = "cl-cuda";
@@ -14535,7 +14535,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cuda-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz";
           sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg";
           system = "cl-cuda-examples";
           asd = "cl-cuda-examples";
@@ -14558,7 +14558,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cuda-interop" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz";
           sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg";
           system = "cl-cuda-interop";
           asd = "cl-cuda-interop";
@@ -14583,7 +14583,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cuda-interop-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz";
           sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg";
           system = "cl-cuda-interop-examples";
           asd = "cl-cuda-interop-examples";
@@ -14603,7 +14603,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-cuda-misc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz";
           sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg";
           system = "cl-cuda-misc";
           asd = "cl-cuda-misc";
@@ -14626,7 +14626,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-custom-hash-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-custom-hash-table/2024-10-12/cl-custom-hash-table-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-custom-hash-table/2024-10-12/cl-custom-hash-table-20241012-git.tgz";
           sha256 = "1sb5anv9kh7wv165nra95v0qkk1gvp3mn461zi7m0fla1290g598";
           system = "cl-custom-hash-table";
           asd = "cl-custom-hash-table";
@@ -14644,7 +14644,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-custom-hash-table-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-custom-hash-table/2024-10-12/cl-custom-hash-table-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-custom-hash-table/2024-10-12/cl-custom-hash-table-20241012-git.tgz";
           sha256 = "1sb5anv9kh7wv165nra95v0qkk1gvp3mn461zi7m0fla1290g598";
           system = "cl-custom-hash-table-test";
           asd = "cl-custom-hash-table-test";
@@ -14667,7 +14667,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-data-structures" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-data-structures/2025-06-22/cl-data-structures-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-data-structures/2025-06-22/cl-data-structures-20250622-git.tgz";
           sha256 = "1sxp8gh2737v5qm6hb9j4wqqcairmlr14xylhdizrmgkza9dqp0d";
           system = "cl-data-structures";
           asd = "cl-data-structures";
@@ -14700,7 +14700,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-data-structures-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-data-structures/2025-06-22/cl-data-structures-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-data-structures/2025-06-22/cl-data-structures-20250622-git.tgz";
           sha256 = "1sxp8gh2737v5qm6hb9j4wqqcairmlr14xylhdizrmgkza9dqp0d";
           system = "cl-data-structures-tests";
           asd = "cl-data-structures-tests";
@@ -14724,7 +14724,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-date-time-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-date-time-parser/2014-07-13/cl-date-time-parser-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-date-time-parser/2014-07-13/cl-date-time-parser-20140713-git.tgz";
           sha256 = "0dswpbbb57jm609xxfah25dxxhjzc7qh5lr1a1ffkpms84l0r7m5";
           system = "cl-date-time-parser";
           asd = "cl-date-time-parser";
@@ -14751,7 +14751,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-dbi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz";
           sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy";
           system = "cl-dbi";
           asd = "cl-dbi";
@@ -14769,7 +14769,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-dbi-connection-pool" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dbi-connection-pool/2025-06-22/cl-dbi-connection-pool-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dbi-connection-pool/2025-06-22/cl-dbi-connection-pool-20250622-git.tgz";
           sha256 = "0q1kgcn822ifc8zcss4yihhwcl0asdxl8xxpbbnyjzxasqa47ifv";
           system = "cl-dbi-connection-pool";
           asd = "cl-dbi-connection-pool";
@@ -14789,7 +14789,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-debug-print" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz";
           sha256 = "1cm5nybmv0pq9s4lrwhd01rjj1wlcj1sjcrcakabi7w7b5zw4cyh";
           system = "cl-debug-print";
           asd = "cl-debug-print";
@@ -14809,7 +14809,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-debug-print-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz";
           sha256 = "1cm5nybmv0pq9s4lrwhd01rjj1wlcj1sjcrcakabi7w7b5zw4cyh";
           system = "cl-debug-print-test";
           asd = "cl-debug-print-test";
@@ -14833,7 +14833,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-dejavu" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dejavu/2021-01-24/cl-dejavu-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dejavu/2021-01-24/cl-dejavu-20210124-git.tgz";
           sha256 = "1lbxiq21bxj8r11c58cqskgn8gnl2p8q1ydkhdsv7i7xnhv2y7r0";
           system = "cl-dejavu";
           asd = "cl-dejavu";
@@ -14853,7 +14853,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-devil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz";
           sha256 = "1qdjb7xwzjkv99s8q0834lfdq4ch5j2ymrmqsvwzhg47ys17pvvf";
           system = "cl-devil";
           asd = "cl-devil";
@@ -14876,7 +14876,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-diceware" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-diceware/2015-09-23/cl-diceware-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-diceware/2015-09-23/cl-diceware-20150923-git.tgz";
           sha256 = "0560ji51ksp8kngn2pyi41vw9zlnwiqj64ici43lzjx0qgv5v84l";
           system = "cl-diceware";
           asd = "cl-diceware";
@@ -14896,7 +14896,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-difflib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz";
           sha256 = "08if0abhqg191xcz9s7xv8faqq51nswzp8hw423fkqjzr24pmq48";
           system = "cl-difflib";
           asd = "cl-difflib";
@@ -14914,7 +14914,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-difflib-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz";
           sha256 = "08if0abhqg191xcz9s7xv8faqq51nswzp8hw423fkqjzr24pmq48";
           system = "cl-difflib-tests";
           asd = "cl-difflib-tests";
@@ -14934,7 +14934,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-digraph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz";
           sha256 = "18avbb608rv5radbczilfzb2857wz7pad49hwhr5za5qycjam8ss";
           system = "cl-digraph";
           asd = "cl-digraph";
@@ -14952,7 +14952,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-digraph.dot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz";
           sha256 = "18avbb608rv5radbczilfzb2857wz7pad49hwhr5za5qycjam8ss";
           system = "cl-digraph.dot";
           asd = "cl-digraph.dot";
@@ -14975,7 +14975,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-digraph.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz";
           sha256 = "18avbb608rv5radbczilfzb2857wz7pad49hwhr5za5qycjam8ss";
           system = "cl-digraph.test";
           asd = "cl-digraph.test";
@@ -14999,7 +14999,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-diskspace" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-diskspace/2022-03-31/cl-diskspace-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-diskspace/2022-03-31/cl-diskspace-20220331-git.tgz";
           sha256 = "0l19hxqw6b8i5i1jdbr45k1xib9axcwdagsp3y8wkb35g6wwc0s7";
           system = "cl-diskspace";
           asd = "cl-diskspace";
@@ -15023,7 +15023,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-disque" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-disque/2017-12-27/cl-disque-20171227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-disque/2017-12-27/cl-disque-20171227-git.tgz";
           sha256 = "0z26ls9vzlq43fwn307nb7xvqck5h3l9yygf93b0filki83krg3s";
           system = "cl-disque";
           asd = "cl-disque";
@@ -15049,7 +15049,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-disque-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-disque/2017-12-27/cl-disque-20171227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-disque/2017-12-27/cl-disque-20171227-git.tgz";
           sha256 = "0z26ls9vzlq43fwn307nb7xvqck5h3l9yygf93b0filki83krg3s";
           system = "cl-disque-test";
           asd = "cl-disque-test";
@@ -15073,7 +15073,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-djula-svg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-djula-svg/2022-11-06/cl-djula-svg-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-djula-svg/2022-11-06/cl-djula-svg-20221106-git.tgz";
           sha256 = "1jxgngr51ars234by4vnczfqmkwi2iy94sdxnj3pkjrdximy5any";
           system = "cl-djula-svg";
           asd = "cl-djula-svg";
@@ -15096,7 +15096,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-djula-tailwind" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-djula-tailwind/2022-11-06/cl-djula-tailwind-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-djula-tailwind/2022-11-06/cl-djula-tailwind-20221106-git.tgz";
           sha256 = "059mfgh53gpj74rgr7b61fnm24bwx8hdrw15mjk687y9sna3avda";
           system = "cl-djula-tailwind";
           asd = "cl-djula-tailwind";
@@ -15121,7 +15121,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-dot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dot/2024-10-12/cl-dot-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dot/2024-10-12/cl-dot-20241012-git.tgz";
           sha256 = "1874jsc51pkyh6rz27qdhhsdyzx1mr7zx7v65m849wp49qlxs1ya";
           system = "cl-dot";
           asd = "cl-dot";
@@ -15139,7 +15139,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-dotenv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dotenv/2018-10-18/cl-dotenv-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dotenv/2018-10-18/cl-dotenv-20181018-git.tgz";
           sha256 = "0cdbk886aizsnqqs3z4jfn8nyrnxj4yb3y00av49xc4h83h6xn53";
           system = "cl-dotenv";
           asd = "cl-dotenv";
@@ -15162,7 +15162,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-dotenv-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dotenv/2018-10-18/cl-dotenv-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dotenv/2018-10-18/cl-dotenv-20181018-git.tgz";
           sha256 = "0cdbk886aizsnqqs3z4jfn8nyrnxj4yb3y00av49xc4h83h6xn53";
           system = "cl-dotenv-test";
           asd = "cl-dotenv-test";
@@ -15186,7 +15186,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-drawille" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-drawille/2021-08-07/cl-drawille-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-drawille/2021-08-07/cl-drawille-20210807-git.tgz";
           sha256 = "0wmiz0c7h2zsfj7inzzn8jivnfsc94rq8pczfi44h36n2jg6hdys";
           system = "cl-drawille";
           asd = "cl-drawille";
@@ -15210,7 +15210,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-drm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-drm/2016-12-04/cl-drm-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-drm/2016-12-04/cl-drm-20161204-git.tgz";
           sha256 = "018jsdi9hs71x14mq18k08hwrgdvvbc2yqbqww6gara0bg9cl3l6";
           system = "cl-drm";
           asd = "cl-drm";
@@ -15230,7 +15230,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-dropbox" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dropbox/2015-06-08/cl-dropbox-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dropbox/2015-06-08/cl-dropbox-20150608-git.tgz";
           sha256 = "09giwr1wlz42flrpy71gv60p53nixjk9jaj4lirgf59dkh718f9x";
           system = "cl-dropbox";
           asd = "cl-dropbox";
@@ -15255,7 +15255,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-dsl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dsl/2013-07-20/cl-dsl-20130720-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dsl/2013-07-20/cl-dsl-20130720-git.tgz";
           sha256 = "1bj5yp20r8z6gi6rpf88kpy4i06c8i2d3cg5sjlq7d1ninkb4gg4";
           system = "cl-dsl";
           asd = "cl-dsl";
@@ -15275,7 +15275,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-dsl-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dsl/2013-07-20/cl-dsl-20130720-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dsl/2013-07-20/cl-dsl-20130720-git.tgz";
           sha256 = "1bj5yp20r8z6gi6rpf88kpy4i06c8i2d3cg5sjlq7d1ninkb4gg4";
           system = "cl-dsl-tests";
           asd = "cl-dsl";
@@ -15298,7 +15298,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-durian" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-durian/2015-06-08/cl-durian-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-durian/2015-06-08/cl-durian-20150608-git.tgz";
           sha256 = "0s89gr5gwwkyirrv7l5fzk9ws7fhy087c3myksblsh00z1xcrvng";
           system = "cl-durian";
           asd = "cl-durian";
@@ -15318,7 +15318,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-earley-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-earley-parser/2021-10-20/cl-earley-parser-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-earley-parser/2021-10-20/cl-earley-parser-20211020-git.tgz";
           sha256 = "1pkry3ynxn2y3nf13lc3zjqgf4hx43d9zb0w0m34s51xd4xp2h1x";
           system = "cl-earley-parser";
           asd = "cl-earley-parser";
@@ -15338,7 +15338,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ecma-48" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ecma-48/2020-02-18/cl-ecma-48-20200218-http.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ecma-48/2020-02-18/cl-ecma-48-20200218-http.tgz";
           sha256 = "1y3srzahci25qp959b87m82d1i1i8jmq039yp9nf0hifxyhw6dgy";
           system = "cl-ecma-48";
           asd = "cl-ecma-48";
@@ -15358,7 +15358,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-egl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-egl/2019-05-21/cl-egl-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-egl/2019-05-21/cl-egl-20190521-git.tgz";
           sha256 = "19shhzmdc9f1128slc9m4ns6zraka99awqgb4dkrwzgv7w3miqfl";
           system = "cl-egl";
           asd = "cl-egl";
@@ -15378,7 +15378,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-elastic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-elastic/2020-02-18/cl-elastic-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-elastic/2020-02-18/cl-elastic-20200218-git.tgz";
           sha256 = "107ha226n3mxzvm0cp8kvgybcv4rr0b4lwik4f4j7lrhz6xvnncq";
           system = "cl-elastic";
           asd = "cl-elastic";
@@ -15402,7 +15402,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-elastic-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-elastic/2020-02-18/cl-elastic-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-elastic/2020-02-18/cl-elastic-20200218-git.tgz";
           sha256 = "107ha226n3mxzvm0cp8kvgybcv4rr0b4lwik4f4j7lrhz6xvnncq";
           system = "cl-elastic-test";
           asd = "cl-elastic-test";
@@ -15426,7 +15426,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-emacs-if" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-emacs-if/2012-03-05/cl-emacs-if-20120305-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-emacs-if/2012-03-05/cl-emacs-if-20120305-git.tgz";
           sha256 = "0br3jvihq24ymqjn2r2qnl3l099r329bsqh18nmkk3yw3kclrcfv";
           system = "cl-emacs-if";
           asd = "cl-emacs-if";
@@ -15446,7 +15446,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-emb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz";
           sha256 = "1xcm31n7afh5316lwz8iqbjx7kn5lw0l11arg8mhdmkx42aj4gkk";
           system = "cl-emb";
           asd = "cl-emb";
@@ -15464,7 +15464,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-emoji" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-emoji/2020-02-18/cl-emoji-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-emoji/2020-02-18/cl-emoji-20200218-git.tgz";
           sha256 = "1v91kzx42qyjm936frvfsr0cgnj9g197x78xlda6x7x6xri2r9gm";
           system = "cl-emoji";
           asd = "cl-emoji";
@@ -15484,7 +15484,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-emoji-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-emoji/2020-02-18/cl-emoji-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-emoji/2020-02-18/cl-emoji-20200218-git.tgz";
           sha256 = "1v91kzx42qyjm936frvfsr0cgnj9g197x78xlda6x7x6xri2r9gm";
           system = "cl-emoji-test";
           asd = "cl-emoji-test";
@@ -15508,7 +15508,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-env" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-env/2018-04-30/cl-env-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-env/2018-04-30/cl-env-20180430-git.tgz";
           sha256 = "1r0d004gr1za9ib53jhxkx315wd4av0ar2063dcvs9g4nahk2d07";
           system = "cl-env";
           asd = "cl-env";
@@ -15528,7 +15528,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-environments" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-environments/2025-06-22/cl-environments-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-environments/2025-06-22/cl-environments-20250622-git.tgz";
           sha256 = "0aas5139qy4hfrkqgbx2iird7mma95pvk6xarlwzi28v9r8qpzy3";
           system = "cl-environments";
           asd = "cl-environments";
@@ -15552,7 +15552,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-etcd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-etcd/2023-02-14/cl-etcd-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-etcd/2023-02-14/cl-etcd-20230214-git.tgz";
           sha256 = "0bals10r07prxvjxd744vz02ri72isf168lkhrx9qkc96hd214ah";
           system = "cl-etcd";
           asd = "cl-etcd";
@@ -15583,7 +15583,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-events" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-events/2016-03-18/cl-events-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-events/2016-03-18/cl-events-20160318-git.tgz";
           sha256 = "1r847q1bwblnb2395dsydylr9nxgjx7gdwc9dx1051zhvi9in36g";
           system = "cl-events";
           asd = "cl-events";
@@ -15609,7 +15609,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-events.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-events/2016-03-18/cl-events-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-events/2016-03-18/cl-events-20160318-git.tgz";
           sha256 = "1r847q1bwblnb2395dsydylr9nxgjx7gdwc9dx1051zhvi9in36g";
           system = "cl-events.test";
           asd = "cl-events.test";
@@ -15635,7 +15635,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ewkb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ewkb/2011-06-19/cl-ewkb-20110619-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ewkb/2011-06-19/cl-ewkb-20110619-git.tgz";
           sha256 = "1mk5j34m9gkwl7c4d464l42gclxlrcpifp2nq41z3fsfl8badn6w";
           system = "cl-ewkb";
           asd = "cl-ewkb";
@@ -15658,7 +15658,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ewkb-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ewkb/2011-06-19/cl-ewkb-20110619-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ewkb/2011-06-19/cl-ewkb-20110619-git.tgz";
           sha256 = "1mk5j34m9gkwl7c4d464l42gclxlrcpifp2nq41z3fsfl8badn6w";
           system = "cl-ewkb-tests";
           asd = "cl-ewkb";
@@ -15681,7 +15681,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-factoring" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-factoring/2022-11-06/cl-factoring-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-factoring/2022-11-06/cl-factoring-20221106-git.tgz";
           sha256 = "0vn3kb8mmi93pr76lx1mbwp7qc2krzb0ayzcrffwq2aw2q201fhd";
           system = "cl-factoring";
           asd = "cl-factoring";
@@ -15704,7 +15704,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fad" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fad/2022-02-20/cl-fad-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fad/2022-02-20/cl-fad-20220220-git.tgz";
           sha256 = "0a1xqldrq170lflnns3xp6swpnvsvllf5vq0h7sz8jqh4riqlny6";
           system = "cl-fad";
           asd = "cl-fad";
@@ -15725,7 +15725,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fam" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fam/2012-11-25/cl-fam-20121125-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fam/2012-11-25/cl-fam-20121125-git.tgz";
           sha256 = "1imv87imhxvigghx3l28kbsldz6hpqd32280wjwffqwvadhx0gng";
           system = "cl-fam";
           asd = "cl-fam";
@@ -15749,7 +15749,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fast-ecs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fast-ecs/2025-06-22/cl-fast-ecs-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fast-ecs/2025-06-22/cl-fast-ecs-20250622-git.tgz";
           sha256 = "067nfx7cp0qbzva54ym01rvvdiq9f6gnl92w026132p7bzdls2i5";
           system = "cl-fast-ecs";
           asd = "cl-fast-ecs";
@@ -15774,7 +15774,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fastcgi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fastcgi/2024-10-12/cl-fastcgi-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fastcgi/2024-10-12/cl-fastcgi-20241012-git.tgz";
           sha256 = "0hf6a8jrz8dx91px8q4201k3y919ls7cgn4qjmkqxqhjk2gxy5k7";
           system = "cl-fastcgi";
           asd = "cl-fastcgi";
@@ -15797,7 +15797,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fbclient" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fbclient/2014-01-13/cl-fbclient-20140113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fbclient/2014-01-13/cl-fbclient-20140113-git.tgz";
           sha256 = "1q2dwizrjnal3fdcdgim4kdq0dma71p3s8w6i8bjkg4fs49k5p9j";
           system = "cl-fbclient";
           asd = "cl-fbclient";
@@ -15817,7 +15817,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fbx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fbx/2024-10-12/cl-fbx-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fbx/2024-10-12/cl-fbx-20241012-git.tgz";
           sha256 = "1g6s3ili3fcxy37g34ykmf2zc6nm70sh5q0diqbikikaly8kfi50";
           system = "cl-fbx";
           asd = "cl-fbx";
@@ -15845,7 +15845,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-feedparser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-feedparser/2023-06-18/cl-feedparser-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-feedparser/2023-06-18/cl-feedparser-20230618-git.tgz";
           sha256 = "18cl4318g8szhdsqvg68ajry91m1hn0znmsqd0r2ikq6l5wpixmb";
           system = "cl-feedparser";
           asd = "cl-feedparser";
@@ -15878,7 +15878,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-feedparser-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-feedparser/2023-06-18/cl-feedparser-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-feedparser/2023-06-18/cl-feedparser-20230618-git.tgz";
           sha256 = "18cl4318g8szhdsqvg68ajry91m1hn0znmsqd0r2ikq6l5wpixmb";
           system = "cl-feedparser-tests";
           asd = "cl-feedparser-tests";
@@ -15903,7 +15903,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fix" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fix/2023-02-14/cl-fix-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fix/2023-02-14/cl-fix-20230214-git.tgz";
           sha256 = "0hw9sms558vn964sw5bav74wmfahf066nqj1xyd6b3f1lz3jarbb";
           system = "cl-fix";
           asd = "cl-fix";
@@ -15932,7 +15932,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fixtures" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fixtures/2020-03-25/cl-fixtures-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fixtures/2020-03-25/cl-fixtures-20200325-git.tgz";
           sha256 = "01z8brw32lv8lqn6r9srwrna5gkd4cyncpbpg6pc0khgdxzpzaag";
           system = "cl-fixtures";
           asd = "cl-fixtures";
@@ -15952,7 +15952,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fixtures-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fixtures/2020-03-25/cl-fixtures-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fixtures/2020-03-25/cl-fixtures-20200325-git.tgz";
           sha256 = "01z8brw32lv8lqn6r9srwrna5gkd4cyncpbpg6pc0khgdxzpzaag";
           system = "cl-fixtures-test";
           asd = "cl-fixtures-test";
@@ -15978,7 +15978,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-flac" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-flac/2025-06-22/cl-flac-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-flac/2025-06-22/cl-flac-20250622-git.tgz";
           sha256 = "018kllg8zjdwzm3l3fcxyy47sv1h67mlib7585hvg2hnvqljffh8";
           system = "cl-flac";
           asd = "cl-flac";
@@ -16004,7 +16004,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-flow" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-flow/2022-07-07/cl-flow-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-flow/2022-07-07/cl-flow-stable-git.tgz";
           sha256 = "0mh9g0zj2kwnsq31zg4af5k9jvfbwp28zx02f0r1jlg2rha87vlg";
           system = "cl-flow";
           asd = "cl-flow";
@@ -16027,7 +16027,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-flowd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-flowd/2014-07-13/cl-flowd-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-flowd/2014-07-13/cl-flowd-20140713-git.tgz";
           sha256 = "0qppiqgy4fgvkm519bqjrw1mfp90q8fs1spvawf24d1nzslf51pj";
           system = "cl-flowd";
           asd = "cl-flowd";
@@ -16047,7 +16047,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fluent-logger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fluent-logger/2025-06-22/cl-fluent-logger-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fluent-logger/2025-06-22/cl-fluent-logger-20250622-git.tgz";
           sha256 = "1p9sjqlxr0mazzzq9lg7dapyyh854pz7z6cdy9y0hdijlm4h2m6r";
           system = "cl-fluent-logger";
           asd = "cl-fluent-logger";
@@ -16076,7 +16076,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fluiddb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz";
           sha256 = "0npkkp2w88f6vb9pckjp4q4d4idx9p2s4s4imljs2vfym2j3w0wb";
           system = "cl-fluiddb";
           asd = "cl-fluiddb";
@@ -16102,7 +16102,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fluiddb-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz";
           sha256 = "0npkkp2w88f6vb9pckjp4q4d4idx9p2s4s4imljs2vfym2j3w0wb";
           system = "cl-fluiddb-test";
           asd = "cl-fluiddb-test";
@@ -16125,7 +16125,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fluidinfo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz";
           sha256 = "0npkkp2w88f6vb9pckjp4q4d4idx9p2s4s4imljs2vfym2j3w0wb";
           system = "cl-fluidinfo";
           asd = "cl-fluidinfo";
@@ -16145,7 +16145,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fond" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fond/2019-11-30/cl-fond-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fond/2019-11-30/cl-fond-20191130-git.tgz";
           sha256 = "03ygcw1azb44bhdsqcq99xi4ci0by76ap5jf5l2d1vfxq04v8grq";
           system = "cl-fond";
           asd = "cl-fond";
@@ -16172,7 +16172,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-form-types" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-form-types/2024-10-12/cl-form-types-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-form-types/2024-10-12/cl-form-types-20241012-git.tgz";
           sha256 = "1qc9dy9ji14nz5k2i17idbfks3ddwrwy9bf60rq95pnngkzqs3d1";
           system = "cl-form-types";
           asd = "cl-form-types";
@@ -16198,7 +16198,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-forms" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
           sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms";
           asd = "cl-forms";
@@ -16221,7 +16221,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-forms.core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
           sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms.core";
           asd = "cl-forms.core";
@@ -16250,7 +16250,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-forms.demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
           sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms.demo";
           asd = "cl-forms.demo";
@@ -16281,7 +16281,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-forms.djula" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
           sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms.djula";
           asd = "cl-forms.djula";
@@ -16305,7 +16305,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-forms.ningle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
           sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms.ningle";
           asd = "cl-forms.ningle";
@@ -16329,7 +16329,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-forms.peppol" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
           sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms.peppol";
           asd = "cl-forms.peppol";
@@ -16352,7 +16352,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-forms.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
           sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms.test";
           asd = "cl-forms.test";
@@ -16375,7 +16375,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-forms.who" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
           sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms.who";
           asd = "cl-forms.who";
@@ -16398,7 +16398,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-forms.who.bootstrap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-forms/2025-06-22/cl-forms-20250622-git.tgz";
           sha256 = "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj";
           system = "cl-forms.who.bootstrap";
           asd = "cl-forms.who.bootstrap";
@@ -16418,7 +16418,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-freeimage" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-freeimage/2017-04-03/cl-freeimage-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-freeimage/2017-04-03/cl-freeimage-20170403-git.tgz";
           sha256 = "1333i8sh670nkb0c35xp511xjlafn5zh8a6gk3wnh19gffvj63hq";
           system = "cl-freeimage";
           asd = "cl-freeimage";
@@ -16438,7 +16438,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-freetype2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-freetype2/2024-10-12/cl-freetype2-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-freetype2/2024-10-12/cl-freetype2-20241012-git.tgz";
           sha256 = "00lkmawhjgqzfrsaaqmnffm7mmn3b31gzwz8g51kdjm9s16vwpjs";
           system = "cl-freetype2";
           asd = "cl-freetype2";
@@ -16461,7 +16461,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-freetype2-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-freetype2/2024-10-12/cl-freetype2-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-freetype2/2024-10-12/cl-freetype2-20241012-git.tgz";
           sha256 = "00lkmawhjgqzfrsaaqmnffm7mmn3b31gzwz8g51kdjm9s16vwpjs";
           system = "cl-freetype2-tests";
           asd = "cl-freetype2-tests";
@@ -16484,7 +16484,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fsnotify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fsnotify/2015-03-02/cl-fsnotify-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fsnotify/2015-03-02/cl-fsnotify-20150302-git.tgz";
           sha256 = "0693ga1xqcvi89j3aw0lmyi3a1yl3hrfwli2jiwxv0mgpcaxz0yr";
           system = "cl-fsnotify";
           asd = "cl-fsnotify";
@@ -16507,7 +16507,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ftp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ftp/2015-06-08/cl-ftp-20150608-http.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ftp/2015-06-08/cl-ftp-20150608-http.tgz";
           sha256 = "1m955rjpaynybzmb9q631mll764hm06lydvhra50mfjj75ynwsvw";
           system = "cl-ftp";
           asd = "cl-ftp";
@@ -16530,7 +16530,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fuse" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz";
           sha256 = "1qxvf8ybn0v1hiaz11k1h47y0dksj8ah9v8jdfrjp9ad1rrrnxqs";
           system = "cl-fuse";
           asd = "cl-fuse";
@@ -16556,7 +16556,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fuse-meta-fs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz";
           sha256 = "1wbi7lvczfn09qb72rg1bps9w51mz42dwa7lyjl2hp8lbwc2a5a9";
           system = "cl-fuse-meta-fs";
           asd = "cl-fuse-meta-fs";
@@ -16579,7 +16579,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fuzz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fuzz/2018-10-18/cl-fuzz-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fuzz/2018-10-18/cl-fuzz-20181018-git.tgz";
           sha256 = "1zvlh0nh4iip75p6dblx5kajqaa3hhv6mdjbx9cids8491r388rz";
           system = "cl-fuzz";
           asd = "cl-fuzz";
@@ -16597,7 +16597,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-fxml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-fxml/2022-03-31/cl-fxml-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-fxml/2022-03-31/cl-fxml-20220331-git.tgz";
           sha256 = "0i5w3z0rgyi42rlhvf92k95w6bajf3m1x9g4zprwf602kp7abr3c";
           system = "cl-fxml";
           asd = "cl-fxml";
@@ -16621,7 +16621,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gamepad" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gamepad/2025-06-22/cl-gamepad-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gamepad/2025-06-22/cl-gamepad-20250622-git.tgz";
           sha256 = "1flnsqa33hm3ab4vbab0r62xbjjrwi5g6a9asjr77mp2vhdwycsr";
           system = "cl-gamepad";
           asd = "cl-gamepad";
@@ -16646,7 +16646,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gap-buffer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gap-buffer/2023-06-18/cl-gap-buffer-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gap-buffer/2023-06-18/cl-gap-buffer-20230618-git.tgz";
           sha256 = "0dzwhzv139z9pspnh1krnldnk4nfrj8f5khh08085xkc5bgg1jfv";
           system = "cl-gap-buffer";
           asd = "cl-gap-buffer";
@@ -16666,7 +16666,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gbm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gbm/2018-04-30/cl-gbm-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gbm/2018-04-30/cl-gbm-20180430-git.tgz";
           sha256 = "14bshi7q1hhyag8va9javjjn5cnhmwyjlw8vvvb4fyzfspz3kpdx";
           system = "cl-gbm";
           asd = "cl-gbm";
@@ -16686,7 +16686,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gcrypt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gcrypt/2021-12-09/cl-gcrypt-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gcrypt/2021-12-09/cl-gcrypt-20211209-git.tgz";
           sha256 = "1f4gx5ssirr4f3n68i2da6ad7hbhgsk18zv0gfqy3q635zai0z3w";
           system = "cl-gcrypt";
           asd = "cl-gcrypt";
@@ -16706,7 +16706,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gcrypt-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gcrypt/2021-12-09/cl-gcrypt-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gcrypt/2021-12-09/cl-gcrypt-20211209-git.tgz";
           sha256 = "1f4gx5ssirr4f3n68i2da6ad7hbhgsk18zv0gfqy3q635zai0z3w";
           system = "cl-gcrypt-test";
           asd = "cl-gcrypt-test";
@@ -16732,7 +16732,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gd/2020-12-20/cl-gd-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gd/2020-12-20/cl-gd-20201220-git.tgz";
           sha256 = "1wa6nv5bdf0v38hzr6cfadkk6mhvvnj9lpl9igcxygdjbnn2a3y6";
           system = "cl-gd";
           asd = "cl-gd";
@@ -16752,7 +16752,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gd-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gd/2020-12-20/cl-gd-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gd/2020-12-20/cl-gd-20201220-git.tgz";
           sha256 = "1wa6nv5bdf0v38hzr6cfadkk6mhvvnj9lpl9igcxygdjbnn2a3y6";
           system = "cl-gd-test";
           asd = "cl-gd-test";
@@ -16772,7 +16772,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gdata" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gdata/2017-11-30/cl-gdata-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gdata/2017-11-30/cl-gdata-20171130-git.tgz";
           sha256 = "0x2sq03nacjbq7p9baxlhr7bb0xg7v1ljq7qj1b3xrd4rbcibxi9";
           system = "cl-gdata";
           asd = "cl-gdata";
@@ -16809,7 +16809,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gearman" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gearman/2021-10-20/cl-gearman-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gearman/2021-10-20/cl-gearman-20211020-git.tgz";
           sha256 = "0cnkpqn43p55xlhdi8bws2ssa1ahvzbgggh3pam0zbqma2m525j6";
           system = "cl-gearman";
           asd = "cl-gearman";
@@ -16834,7 +16834,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gearman-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gearman/2021-10-20/cl-gearman-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gearman/2021-10-20/cl-gearman-20211020-git.tgz";
           sha256 = "0cnkpqn43p55xlhdi8bws2ssa1ahvzbgggh3pam0zbqma2m525j6";
           system = "cl-gearman-test";
           asd = "cl-gearman-test";
@@ -16857,7 +16857,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gendoc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gendoc/2018-08-31/cl-gendoc-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gendoc/2018-08-31/cl-gendoc-20180831-git.tgz";
           sha256 = "19f8fmz2hj332kh3y3fbil2dchpckdsqci6ljhadymd8p2h6w4ws";
           system = "cl-gendoc";
           asd = "cl-gendoc";
@@ -16881,7 +16881,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gendoc-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gendoc/2018-08-31/cl-gendoc-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gendoc/2018-08-31/cl-gendoc-20180831-git.tgz";
           sha256 = "19f8fmz2hj332kh3y3fbil2dchpckdsqci6ljhadymd8p2h6w4ws";
           system = "cl-gendoc-docs";
           asd = "cl-gendoc";
@@ -16901,7 +16901,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gene-searcher" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gene-searcher/2011-10-01/cl-gene-searcher-20111001-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gene-searcher/2011-10-01/cl-gene-searcher-20111001-git.tgz";
           sha256 = "0n8p6yk600h7m050bjxazmcxdrcfrkcklrcj8ncflyshm72qv1yk";
           system = "cl-gene-searcher";
           asd = "cl-gene-searcher";
@@ -16921,7 +16921,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-generator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-generator/2022-11-06/cl-generator-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-generator/2022-11-06/cl-generator-20221106-git.tgz";
           sha256 = "0aa5prw6f4fqw9j8m6kvdb3h3lqyvi15dd1l6437p9408mmyxk30";
           system = "cl-generator";
           asd = "cl-generator";
@@ -16941,7 +16941,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-generator-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-generator/2022-11-06/cl-generator-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-generator/2022-11-06/cl-generator-20221106-git.tgz";
           sha256 = "0aa5prw6f4fqw9j8m6kvdb3h3lqyvi15dd1l6437p9408mmyxk30";
           system = "cl-generator-test";
           asd = "cl-generator-test";
@@ -16964,7 +16964,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-geocode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-geocode/2019-08-13/cl-geocode-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-geocode/2019-08-13/cl-geocode-20190813-git.tgz";
           sha256 = "17z0v29rrhsfjikg4sn9ynxckh5i3ahjn7c8qs381n1p9fbd668l";
           system = "cl-geocode";
           asd = "cl-geocode";
@@ -16988,7 +16988,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-geoip" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-geoip/2013-06-15/cl-geoip-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-geoip/2013-06-15/cl-geoip-20130615-git.tgz";
           sha256 = "0ys8wysppx06j3s0dc9lc9zjizr1fmj388fiigyn1wrdyyka41y2";
           system = "cl-geoip";
           asd = "cl-geoip";
@@ -17008,7 +17008,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-geometry" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-geometry/2016-05-31/cl-geometry-20160531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-geometry/2016-05-31/cl-geometry-20160531-git.tgz";
           sha256 = "188xrd8plvc34gz7q01zmkdrzxbpwzln103l5dl78pa4a6vzz34h";
           system = "cl-geometry";
           asd = "cl-geometry";
@@ -17029,7 +17029,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-geometry-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-geometry/2016-05-31/cl-geometry-20160531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-geometry/2016-05-31/cl-geometry-20160531-git.tgz";
           sha256 = "188xrd8plvc34gz7q01zmkdrzxbpwzln103l5dl78pa4a6vzz34h";
           system = "cl-geometry-tests";
           asd = "cl-geometry-tests";
@@ -17053,7 +17053,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-geos" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-geos/2018-07-11/cl-geos-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-geos/2018-07-11/cl-geos-20180711-git.tgz";
           sha256 = "0igq2c1p82pbkyc7zg90fm3lbsmhwnfmb3q8jc8baklb958555ck";
           system = "cl-geos";
           asd = "cl-geos";
@@ -17077,7 +17077,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-getopt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-getopt/2021-12-09/cl-getopt-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-getopt/2021-12-09/cl-getopt-20211209-git.tgz";
           sha256 = "16qkpg2qln7q9j5614py00zwsnmxcy3xcmhb4m8f0w0zbnpvkjxl";
           system = "cl-getopt";
           asd = "cl-getopt";
@@ -17100,7 +17100,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-getx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-getx/2020-09-25/cl-getx-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-getx/2020-09-25/cl-getx-20200925-git.tgz";
           sha256 = "07gi346vqrhnbkdk4l6g06z4shhnx7f4l44jgayzfdd0xkv02brv";
           system = "cl-getx";
           asd = "cl-getx";
@@ -17120,7 +17120,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gimei" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gimei/2021-10-20/cl-gimei-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gimei/2021-10-20/cl-gimei-20211020-git.tgz";
           sha256 = "1405qbqrrrmanmg2dl7yfdj8z4vcsj1silpsa7i1y00pd18xgk8q";
           system = "cl-gimei";
           asd = "cl-gimei";
@@ -17143,7 +17143,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glib/2023-10-21/cl-glib-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glib/2023-10-21/cl-glib-20231021-git.tgz";
           sha256 = "07y8hpvdl490p8j4k8y47raqqwnpym9scz7jlg2f1jx897dkssjb";
           system = "cl-gio";
           asd = "cl-gio";
@@ -17163,7 +17163,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gists" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gists/2023-10-21/cl-gists-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gists/2023-10-21/cl-gists-20231021-git.tgz";
           sha256 = "0kza5y6jckvydaw9bw8va5kli5d3ybyvil6w2bhf411crd2z15vc";
           system = "cl-gists";
           asd = "cl-gists";
@@ -17191,7 +17191,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-git" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-git/2023-06-18/cl-git-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-git/2023-06-18/cl-git-20230618-git.tgz";
           sha256 = "13h7n3nbpf2qq0vq0dz33r0468baskw83pjfxb3hik4rllrv04h6";
           system = "cl-git";
           asd = "cl-git";
@@ -17221,7 +17221,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-github-v3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-github-v3/2024-10-12/cl-github-v3-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-github-v3/2024-10-12/cl-github-v3-20241012-git.tgz";
           sha256 = "0ayhnildyjjmnyk0a1sx7qxg6vq9kcggaprqf37s5qi4kadvcsr2";
           system = "cl-github-v3";
           asd = "cl-github-v3";
@@ -17246,7 +17246,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw";
           asd = "cl-glfw";
@@ -17269,7 +17269,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-ftgl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-ftgl";
           asd = "cl-glfw-ftgl";
@@ -17289,7 +17289,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-glu" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-glu";
           asd = "cl-glfw-glu";
@@ -17312,7 +17312,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-3dfx_multisample" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-3dfx_multisample";
           asd = "cl-glfw-opengl-3dfx_multisample";
@@ -17332,7 +17332,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-3dfx_tbuffer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-3dfx_tbuffer";
           asd = "cl-glfw-opengl-3dfx_tbuffer";
@@ -17352,7 +17352,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-3dfx_texture_compression_fxt1" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-3dfx_texture_compression_fxt1";
           asd = "cl-glfw-opengl-3dfx_texture_compression_fxt1";
@@ -17372,7 +17372,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-amd_blend_minmax_factor" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-amd_blend_minmax_factor";
           asd = "cl-glfw-opengl-amd_blend_minmax_factor";
@@ -17392,7 +17392,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-amd_depth_clamp_separate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-amd_depth_clamp_separate";
           asd = "cl-glfw-opengl-amd_depth_clamp_separate";
@@ -17412,7 +17412,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-amd_draw_buffers_blend" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-amd_draw_buffers_blend";
           asd = "cl-glfw-opengl-amd_draw_buffers_blend";
@@ -17432,7 +17432,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-amd_multi_draw_indirect" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-amd_multi_draw_indirect";
           asd = "cl-glfw-opengl-amd_multi_draw_indirect";
@@ -17452,7 +17452,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-amd_name_gen_delete" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-amd_name_gen_delete";
           asd = "cl-glfw-opengl-amd_name_gen_delete";
@@ -17472,7 +17472,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-amd_performance_monitor" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-amd_performance_monitor";
           asd = "cl-glfw-opengl-amd_performance_monitor";
@@ -17492,7 +17492,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-amd_sample_positions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-amd_sample_positions";
           asd = "cl-glfw-opengl-amd_sample_positions";
@@ -17512,7 +17512,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-amd_seamless_cubemap_per_texture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-amd_seamless_cubemap_per_texture";
           asd = "cl-glfw-opengl-amd_seamless_cubemap_per_texture";
@@ -17532,7 +17532,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-amd_vertex_shader_tesselator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-amd_vertex_shader_tesselator";
           asd = "cl-glfw-opengl-amd_vertex_shader_tesselator";
@@ -17552,7 +17552,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_aux_depth_stencil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_aux_depth_stencil";
           asd = "cl-glfw-opengl-apple_aux_depth_stencil";
@@ -17572,7 +17572,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_client_storage" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_client_storage";
           asd = "cl-glfw-opengl-apple_client_storage";
@@ -17592,7 +17592,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_element_array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_element_array";
           asd = "cl-glfw-opengl-apple_element_array";
@@ -17612,7 +17612,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_fence" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_fence";
           asd = "cl-glfw-opengl-apple_fence";
@@ -17632,7 +17632,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_float_pixels" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_float_pixels";
           asd = "cl-glfw-opengl-apple_float_pixels";
@@ -17652,7 +17652,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_flush_buffer_range" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_flush_buffer_range";
           asd = "cl-glfw-opengl-apple_flush_buffer_range";
@@ -17672,7 +17672,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_object_purgeable" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_object_purgeable";
           asd = "cl-glfw-opengl-apple_object_purgeable";
@@ -17692,7 +17692,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_rgb_422" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_rgb_422";
           asd = "cl-glfw-opengl-apple_rgb_422";
@@ -17712,7 +17712,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_row_bytes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_row_bytes";
           asd = "cl-glfw-opengl-apple_row_bytes";
@@ -17732,7 +17732,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_specular_vector" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_specular_vector";
           asd = "cl-glfw-opengl-apple_specular_vector";
@@ -17752,7 +17752,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_texture_range" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_texture_range";
           asd = "cl-glfw-opengl-apple_texture_range";
@@ -17772,7 +17772,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_transform_hint" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_transform_hint";
           asd = "cl-glfw-opengl-apple_transform_hint";
@@ -17792,7 +17792,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_vertex_array_object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_vertex_array_object";
           asd = "cl-glfw-opengl-apple_vertex_array_object";
@@ -17812,7 +17812,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_vertex_array_range" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_vertex_array_range";
           asd = "cl-glfw-opengl-apple_vertex_array_range";
@@ -17832,7 +17832,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_vertex_program_evaluators" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_vertex_program_evaluators";
           asd = "cl-glfw-opengl-apple_vertex_program_evaluators";
@@ -17852,7 +17852,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-apple_ycbcr_422" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-apple_ycbcr_422";
           asd = "cl-glfw-opengl-apple_ycbcr_422";
@@ -17872,7 +17872,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_blend_func_extended" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_blend_func_extended";
           asd = "cl-glfw-opengl-arb_blend_func_extended";
@@ -17892,7 +17892,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_color_buffer_float" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_color_buffer_float";
           asd = "cl-glfw-opengl-arb_color_buffer_float";
@@ -17912,7 +17912,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_copy_buffer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_copy_buffer";
           asd = "cl-glfw-opengl-arb_copy_buffer";
@@ -17932,7 +17932,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_depth_buffer_float" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_depth_buffer_float";
           asd = "cl-glfw-opengl-arb_depth_buffer_float";
@@ -17952,7 +17952,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_depth_clamp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_depth_clamp";
           asd = "cl-glfw-opengl-arb_depth_clamp";
@@ -17972,7 +17972,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_depth_texture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_depth_texture";
           asd = "cl-glfw-opengl-arb_depth_texture";
@@ -17992,7 +17992,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_draw_buffers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_draw_buffers";
           asd = "cl-glfw-opengl-arb_draw_buffers";
@@ -18012,7 +18012,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_draw_buffers_blend" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_draw_buffers_blend";
           asd = "cl-glfw-opengl-arb_draw_buffers_blend";
@@ -18032,7 +18032,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_draw_elements_base_vertex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_draw_elements_base_vertex";
           asd = "cl-glfw-opengl-arb_draw_elements_base_vertex";
@@ -18052,7 +18052,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_draw_indirect" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_draw_indirect";
           asd = "cl-glfw-opengl-arb_draw_indirect";
@@ -18072,7 +18072,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_draw_instanced" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_draw_instanced";
           asd = "cl-glfw-opengl-arb_draw_instanced";
@@ -18092,7 +18092,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_es2_compatibility" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_es2_compatibility";
           asd = "cl-glfw-opengl-arb_es2_compatibility";
@@ -18112,7 +18112,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_fragment_program" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_fragment_program";
           asd = "cl-glfw-opengl-arb_fragment_program";
@@ -18132,7 +18132,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_fragment_shader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_fragment_shader";
           asd = "cl-glfw-opengl-arb_fragment_shader";
@@ -18152,7 +18152,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_framebuffer_object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_framebuffer_object";
           asd = "cl-glfw-opengl-arb_framebuffer_object";
@@ -18172,7 +18172,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_framebuffer_object_deprecated" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_framebuffer_object_deprecated";
           asd = "cl-glfw-opengl-arb_framebuffer_object_deprecated";
@@ -18192,7 +18192,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_framebuffer_srgb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_framebuffer_srgb";
           asd = "cl-glfw-opengl-arb_framebuffer_srgb";
@@ -18212,7 +18212,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_geometry_shader4" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_geometry_shader4";
           asd = "cl-glfw-opengl-arb_geometry_shader4";
@@ -18232,7 +18232,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_get_program_binary" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_get_program_binary";
           asd = "cl-glfw-opengl-arb_get_program_binary";
@@ -18252,7 +18252,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_gpu_shader5" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_gpu_shader5";
           asd = "cl-glfw-opengl-arb_gpu_shader5";
@@ -18272,7 +18272,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_gpu_shader_fp64" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_gpu_shader_fp64";
           asd = "cl-glfw-opengl-arb_gpu_shader_fp64";
@@ -18292,7 +18292,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_half_float_pixel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_half_float_pixel";
           asd = "cl-glfw-opengl-arb_half_float_pixel";
@@ -18312,7 +18312,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_half_float_vertex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_half_float_vertex";
           asd = "cl-glfw-opengl-arb_half_float_vertex";
@@ -18332,7 +18332,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_imaging" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_imaging";
           asd = "cl-glfw-opengl-arb_imaging";
@@ -18352,7 +18352,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_imaging_deprecated" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_imaging_deprecated";
           asd = "cl-glfw-opengl-arb_imaging_deprecated";
@@ -18372,7 +18372,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_instanced_arrays" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_instanced_arrays";
           asd = "cl-glfw-opengl-arb_instanced_arrays";
@@ -18392,7 +18392,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_map_buffer_range" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_map_buffer_range";
           asd = "cl-glfw-opengl-arb_map_buffer_range";
@@ -18412,7 +18412,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_matrix_palette" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_matrix_palette";
           asd = "cl-glfw-opengl-arb_matrix_palette";
@@ -18432,7 +18432,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_multisample" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_multisample";
           asd = "cl-glfw-opengl-arb_multisample";
@@ -18452,7 +18452,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_multitexture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_multitexture";
           asd = "cl-glfw-opengl-arb_multitexture";
@@ -18472,7 +18472,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_occlusion_query" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_occlusion_query";
           asd = "cl-glfw-opengl-arb_occlusion_query";
@@ -18492,7 +18492,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_occlusion_query2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_occlusion_query2";
           asd = "cl-glfw-opengl-arb_occlusion_query2";
@@ -18512,7 +18512,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_pixel_buffer_object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_pixel_buffer_object";
           asd = "cl-glfw-opengl-arb_pixel_buffer_object";
@@ -18532,7 +18532,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_point_parameters" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_point_parameters";
           asd = "cl-glfw-opengl-arb_point_parameters";
@@ -18552,7 +18552,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_point_sprite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_point_sprite";
           asd = "cl-glfw-opengl-arb_point_sprite";
@@ -18572,7 +18572,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_provoking_vertex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_provoking_vertex";
           asd = "cl-glfw-opengl-arb_provoking_vertex";
@@ -18592,7 +18592,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_robustness" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_robustness";
           asd = "cl-glfw-opengl-arb_robustness";
@@ -18612,7 +18612,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_sample_shading" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_sample_shading";
           asd = "cl-glfw-opengl-arb_sample_shading";
@@ -18632,7 +18632,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_sampler_objects" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_sampler_objects";
           asd = "cl-glfw-opengl-arb_sampler_objects";
@@ -18652,7 +18652,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_seamless_cube_map" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_seamless_cube_map";
           asd = "cl-glfw-opengl-arb_seamless_cube_map";
@@ -18672,7 +18672,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_separate_shader_objects" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_separate_shader_objects";
           asd = "cl-glfw-opengl-arb_separate_shader_objects";
@@ -18692,7 +18692,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_shader_objects" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_shader_objects";
           asd = "cl-glfw-opengl-arb_shader_objects";
@@ -18712,7 +18712,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_shader_subroutine" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_shader_subroutine";
           asd = "cl-glfw-opengl-arb_shader_subroutine";
@@ -18732,7 +18732,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_shading_language_100" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_shading_language_100";
           asd = "cl-glfw-opengl-arb_shading_language_100";
@@ -18752,7 +18752,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_shading_language_include" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_shading_language_include";
           asd = "cl-glfw-opengl-arb_shading_language_include";
@@ -18772,7 +18772,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_shadow" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_shadow";
           asd = "cl-glfw-opengl-arb_shadow";
@@ -18792,7 +18792,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_shadow_ambient" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_shadow_ambient";
           asd = "cl-glfw-opengl-arb_shadow_ambient";
@@ -18812,7 +18812,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_tessellation_shader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_tessellation_shader";
           asd = "cl-glfw-opengl-arb_tessellation_shader";
@@ -18832,7 +18832,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_border_clamp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_border_clamp";
           asd = "cl-glfw-opengl-arb_texture_border_clamp";
@@ -18852,7 +18852,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_buffer_object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_buffer_object";
           asd = "cl-glfw-opengl-arb_texture_buffer_object";
@@ -18872,7 +18872,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_buffer_object_rgb32" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_buffer_object_rgb32";
           asd = "cl-glfw-opengl-arb_texture_buffer_object_rgb32";
@@ -18892,7 +18892,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_compression" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_compression";
           asd = "cl-glfw-opengl-arb_texture_compression";
@@ -18912,7 +18912,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_compression_bptc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_compression_bptc";
           asd = "cl-glfw-opengl-arb_texture_compression_bptc";
@@ -18932,7 +18932,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_compression_rgtc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_compression_rgtc";
           asd = "cl-glfw-opengl-arb_texture_compression_rgtc";
@@ -18952,7 +18952,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_cube_map" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_cube_map";
           asd = "cl-glfw-opengl-arb_texture_cube_map";
@@ -18972,7 +18972,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_cube_map_array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_cube_map_array";
           asd = "cl-glfw-opengl-arb_texture_cube_map_array";
@@ -18992,7 +18992,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_env_combine" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_env_combine";
           asd = "cl-glfw-opengl-arb_texture_env_combine";
@@ -19012,7 +19012,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_env_dot3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_env_dot3";
           asd = "cl-glfw-opengl-arb_texture_env_dot3";
@@ -19032,7 +19032,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_float" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_float";
           asd = "cl-glfw-opengl-arb_texture_float";
@@ -19052,7 +19052,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_gather" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_gather";
           asd = "cl-glfw-opengl-arb_texture_gather";
@@ -19072,7 +19072,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_mirrored_repeat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_mirrored_repeat";
           asd = "cl-glfw-opengl-arb_texture_mirrored_repeat";
@@ -19092,7 +19092,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_multisample" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_multisample";
           asd = "cl-glfw-opengl-arb_texture_multisample";
@@ -19112,7 +19112,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_rectangle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_rectangle";
           asd = "cl-glfw-opengl-arb_texture_rectangle";
@@ -19132,7 +19132,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_rg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_rg";
           asd = "cl-glfw-opengl-arb_texture_rg";
@@ -19152,7 +19152,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_rgb10_a2ui" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_rgb10_a2ui";
           asd = "cl-glfw-opengl-arb_texture_rgb10_a2ui";
@@ -19172,7 +19172,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_texture_swizzle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_texture_swizzle";
           asd = "cl-glfw-opengl-arb_texture_swizzle";
@@ -19192,7 +19192,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_timer_query" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_timer_query";
           asd = "cl-glfw-opengl-arb_timer_query";
@@ -19212,7 +19212,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_transform_feedback2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_transform_feedback2";
           asd = "cl-glfw-opengl-arb_transform_feedback2";
@@ -19232,7 +19232,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_transpose_matrix" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_transpose_matrix";
           asd = "cl-glfw-opengl-arb_transpose_matrix";
@@ -19252,7 +19252,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_uniform_buffer_object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_uniform_buffer_object";
           asd = "cl-glfw-opengl-arb_uniform_buffer_object";
@@ -19272,7 +19272,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_vertex_array_bgra" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_vertex_array_bgra";
           asd = "cl-glfw-opengl-arb_vertex_array_bgra";
@@ -19292,7 +19292,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_vertex_array_object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_vertex_array_object";
           asd = "cl-glfw-opengl-arb_vertex_array_object";
@@ -19312,7 +19312,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_vertex_attrib_64bit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_vertex_attrib_64bit";
           asd = "cl-glfw-opengl-arb_vertex_attrib_64bit";
@@ -19332,7 +19332,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_vertex_blend" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_vertex_blend";
           asd = "cl-glfw-opengl-arb_vertex_blend";
@@ -19352,7 +19352,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_vertex_buffer_object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_vertex_buffer_object";
           asd = "cl-glfw-opengl-arb_vertex_buffer_object";
@@ -19372,7 +19372,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_vertex_program" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_vertex_program";
           asd = "cl-glfw-opengl-arb_vertex_program";
@@ -19392,7 +19392,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_vertex_shader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_vertex_shader";
           asd = "cl-glfw-opengl-arb_vertex_shader";
@@ -19412,7 +19412,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_vertex_type_2_10_10_10_rev" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_vertex_type_2_10_10_10_rev";
           asd = "cl-glfw-opengl-arb_vertex_type_2_10_10_10_rev";
@@ -19432,7 +19432,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_viewport_array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_viewport_array";
           asd = "cl-glfw-opengl-arb_viewport_array";
@@ -19452,7 +19452,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-arb_window_pos" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-arb_window_pos";
           asd = "cl-glfw-opengl-arb_window_pos";
@@ -19472,7 +19472,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_draw_buffers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_draw_buffers";
           asd = "cl-glfw-opengl-ati_draw_buffers";
@@ -19492,7 +19492,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_element_array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_element_array";
           asd = "cl-glfw-opengl-ati_element_array";
@@ -19512,7 +19512,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_envmap_bumpmap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_envmap_bumpmap";
           asd = "cl-glfw-opengl-ati_envmap_bumpmap";
@@ -19532,7 +19532,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_fragment_shader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_fragment_shader";
           asd = "cl-glfw-opengl-ati_fragment_shader";
@@ -19552,7 +19552,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_map_object_buffer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_map_object_buffer";
           asd = "cl-glfw-opengl-ati_map_object_buffer";
@@ -19572,7 +19572,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_meminfo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_meminfo";
           asd = "cl-glfw-opengl-ati_meminfo";
@@ -19592,7 +19592,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_pixel_format_float" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_pixel_format_float";
           asd = "cl-glfw-opengl-ati_pixel_format_float";
@@ -19612,7 +19612,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_pn_triangles" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_pn_triangles";
           asd = "cl-glfw-opengl-ati_pn_triangles";
@@ -19632,7 +19632,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_separate_stencil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_separate_stencil";
           asd = "cl-glfw-opengl-ati_separate_stencil";
@@ -19652,7 +19652,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_text_fragment_shader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_text_fragment_shader";
           asd = "cl-glfw-opengl-ati_text_fragment_shader";
@@ -19672,7 +19672,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_texture_env_combine3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_texture_env_combine3";
           asd = "cl-glfw-opengl-ati_texture_env_combine3";
@@ -19692,7 +19692,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_texture_float" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_texture_float";
           asd = "cl-glfw-opengl-ati_texture_float";
@@ -19712,7 +19712,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_texture_mirror_once" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_texture_mirror_once";
           asd = "cl-glfw-opengl-ati_texture_mirror_once";
@@ -19732,7 +19732,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_vertex_array_object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_vertex_array_object";
           asd = "cl-glfw-opengl-ati_vertex_array_object";
@@ -19752,7 +19752,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_vertex_attrib_array_object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_vertex_attrib_array_object";
           asd = "cl-glfw-opengl-ati_vertex_attrib_array_object";
@@ -19772,7 +19772,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ati_vertex_streams" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ati_vertex_streams";
           asd = "cl-glfw-opengl-ati_vertex_streams";
@@ -19792,7 +19792,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-core";
           asd = "cl-glfw-opengl-core";
@@ -19815,7 +19815,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_422_pixels" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_422_pixels";
           asd = "cl-glfw-opengl-ext_422_pixels";
@@ -19835,7 +19835,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_abgr" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_abgr";
           asd = "cl-glfw-opengl-ext_abgr";
@@ -19855,7 +19855,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_bgra" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_bgra";
           asd = "cl-glfw-opengl-ext_bgra";
@@ -19875,7 +19875,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_bindable_uniform" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_bindable_uniform";
           asd = "cl-glfw-opengl-ext_bindable_uniform";
@@ -19895,7 +19895,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_blend_color" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_blend_color";
           asd = "cl-glfw-opengl-ext_blend_color";
@@ -19915,7 +19915,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_blend_equation_separate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_blend_equation_separate";
           asd = "cl-glfw-opengl-ext_blend_equation_separate";
@@ -19935,7 +19935,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_blend_func_separate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_blend_func_separate";
           asd = "cl-glfw-opengl-ext_blend_func_separate";
@@ -19955,7 +19955,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_blend_minmax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_blend_minmax";
           asd = "cl-glfw-opengl-ext_blend_minmax";
@@ -19975,7 +19975,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_blend_subtract" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_blend_subtract";
           asd = "cl-glfw-opengl-ext_blend_subtract";
@@ -19995,7 +19995,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_clip_volume_hint" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_clip_volume_hint";
           asd = "cl-glfw-opengl-ext_clip_volume_hint";
@@ -20015,7 +20015,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_cmyka" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_cmyka";
           asd = "cl-glfw-opengl-ext_cmyka";
@@ -20035,7 +20035,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_color_subtable" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_color_subtable";
           asd = "cl-glfw-opengl-ext_color_subtable";
@@ -20055,7 +20055,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_compiled_vertex_array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_compiled_vertex_array";
           asd = "cl-glfw-opengl-ext_compiled_vertex_array";
@@ -20075,7 +20075,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_convolution" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_convolution";
           asd = "cl-glfw-opengl-ext_convolution";
@@ -20095,7 +20095,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_coordinate_frame" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_coordinate_frame";
           asd = "cl-glfw-opengl-ext_coordinate_frame";
@@ -20115,7 +20115,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_copy_texture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_copy_texture";
           asd = "cl-glfw-opengl-ext_copy_texture";
@@ -20135,7 +20135,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_cull_vertex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_cull_vertex";
           asd = "cl-glfw-opengl-ext_cull_vertex";
@@ -20155,7 +20155,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_depth_bounds_test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_depth_bounds_test";
           asd = "cl-glfw-opengl-ext_depth_bounds_test";
@@ -20175,7 +20175,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_direct_state_access" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_direct_state_access";
           asd = "cl-glfw-opengl-ext_direct_state_access";
@@ -20195,7 +20195,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_draw_buffers2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_draw_buffers2";
           asd = "cl-glfw-opengl-ext_draw_buffers2";
@@ -20215,7 +20215,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_draw_instanced" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_draw_instanced";
           asd = "cl-glfw-opengl-ext_draw_instanced";
@@ -20235,7 +20235,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_draw_range_elements" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_draw_range_elements";
           asd = "cl-glfw-opengl-ext_draw_range_elements";
@@ -20255,7 +20255,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_fog_coord" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_fog_coord";
           asd = "cl-glfw-opengl-ext_fog_coord";
@@ -20275,7 +20275,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_framebuffer_blit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_framebuffer_blit";
           asd = "cl-glfw-opengl-ext_framebuffer_blit";
@@ -20295,7 +20295,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_framebuffer_multisample" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_framebuffer_multisample";
           asd = "cl-glfw-opengl-ext_framebuffer_multisample";
@@ -20315,7 +20315,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_framebuffer_object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_framebuffer_object";
           asd = "cl-glfw-opengl-ext_framebuffer_object";
@@ -20335,7 +20335,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_framebuffer_srgb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_framebuffer_srgb";
           asd = "cl-glfw-opengl-ext_framebuffer_srgb";
@@ -20355,7 +20355,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_geometry_shader4" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_geometry_shader4";
           asd = "cl-glfw-opengl-ext_geometry_shader4";
@@ -20375,7 +20375,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_gpu_program_parameters" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_gpu_program_parameters";
           asd = "cl-glfw-opengl-ext_gpu_program_parameters";
@@ -20395,7 +20395,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_gpu_shader4" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_gpu_shader4";
           asd = "cl-glfw-opengl-ext_gpu_shader4";
@@ -20415,7 +20415,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_histogram" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_histogram";
           asd = "cl-glfw-opengl-ext_histogram";
@@ -20435,7 +20435,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_index_array_formats" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_index_array_formats";
           asd = "cl-glfw-opengl-ext_index_array_formats";
@@ -20455,7 +20455,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_index_func" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_index_func";
           asd = "cl-glfw-opengl-ext_index_func";
@@ -20475,7 +20475,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_index_material" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_index_material";
           asd = "cl-glfw-opengl-ext_index_material";
@@ -20495,7 +20495,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_light_texture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_light_texture";
           asd = "cl-glfw-opengl-ext_light_texture";
@@ -20515,7 +20515,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_multi_draw_arrays" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_multi_draw_arrays";
           asd = "cl-glfw-opengl-ext_multi_draw_arrays";
@@ -20535,7 +20535,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_multisample" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_multisample";
           asd = "cl-glfw-opengl-ext_multisample";
@@ -20555,7 +20555,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_packed_depth_stencil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_packed_depth_stencil";
           asd = "cl-glfw-opengl-ext_packed_depth_stencil";
@@ -20575,7 +20575,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_packed_float" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_packed_float";
           asd = "cl-glfw-opengl-ext_packed_float";
@@ -20595,7 +20595,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_packed_pixels" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_packed_pixels";
           asd = "cl-glfw-opengl-ext_packed_pixels";
@@ -20615,7 +20615,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_paletted_texture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_paletted_texture";
           asd = "cl-glfw-opengl-ext_paletted_texture";
@@ -20635,7 +20635,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_pixel_buffer_object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_pixel_buffer_object";
           asd = "cl-glfw-opengl-ext_pixel_buffer_object";
@@ -20655,7 +20655,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_pixel_transform" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_pixel_transform";
           asd = "cl-glfw-opengl-ext_pixel_transform";
@@ -20675,7 +20675,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_point_parameters" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_point_parameters";
           asd = "cl-glfw-opengl-ext_point_parameters";
@@ -20695,7 +20695,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_polygon_offset" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_polygon_offset";
           asd = "cl-glfw-opengl-ext_polygon_offset";
@@ -20715,7 +20715,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_provoking_vertex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_provoking_vertex";
           asd = "cl-glfw-opengl-ext_provoking_vertex";
@@ -20735,7 +20735,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_secondary_color" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_secondary_color";
           asd = "cl-glfw-opengl-ext_secondary_color";
@@ -20755,7 +20755,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_separate_shader_objects" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_separate_shader_objects";
           asd = "cl-glfw-opengl-ext_separate_shader_objects";
@@ -20775,7 +20775,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_separate_specular_color" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_separate_specular_color";
           asd = "cl-glfw-opengl-ext_separate_specular_color";
@@ -20795,7 +20795,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_shader_image_load_store" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_shader_image_load_store";
           asd = "cl-glfw-opengl-ext_shader_image_load_store";
@@ -20815,7 +20815,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_stencil_clear_tag" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_stencil_clear_tag";
           asd = "cl-glfw-opengl-ext_stencil_clear_tag";
@@ -20835,7 +20835,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_stencil_two_side" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_stencil_two_side";
           asd = "cl-glfw-opengl-ext_stencil_two_side";
@@ -20855,7 +20855,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_stencil_wrap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_stencil_wrap";
           asd = "cl-glfw-opengl-ext_stencil_wrap";
@@ -20875,7 +20875,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_subtexture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_subtexture";
           asd = "cl-glfw-opengl-ext_subtexture";
@@ -20895,7 +20895,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture";
           asd = "cl-glfw-opengl-ext_texture";
@@ -20915,7 +20915,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture3d" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture3d";
           asd = "cl-glfw-opengl-ext_texture3d";
@@ -20935,7 +20935,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_array";
           asd = "cl-glfw-opengl-ext_texture_array";
@@ -20955,7 +20955,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_buffer_object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_buffer_object";
           asd = "cl-glfw-opengl-ext_texture_buffer_object";
@@ -20975,7 +20975,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_compression_latc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_compression_latc";
           asd = "cl-glfw-opengl-ext_texture_compression_latc";
@@ -20995,7 +20995,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_compression_rgtc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_compression_rgtc";
           asd = "cl-glfw-opengl-ext_texture_compression_rgtc";
@@ -21015,7 +21015,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_compression_s3tc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_compression_s3tc";
           asd = "cl-glfw-opengl-ext_texture_compression_s3tc";
@@ -21035,7 +21035,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_cube_map" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_cube_map";
           asd = "cl-glfw-opengl-ext_texture_cube_map";
@@ -21055,7 +21055,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_env_combine" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_env_combine";
           asd = "cl-glfw-opengl-ext_texture_env_combine";
@@ -21075,7 +21075,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_env_dot3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_env_dot3";
           asd = "cl-glfw-opengl-ext_texture_env_dot3";
@@ -21095,7 +21095,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_filter_anisotropic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_filter_anisotropic";
           asd = "cl-glfw-opengl-ext_texture_filter_anisotropic";
@@ -21115,7 +21115,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_integer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_integer";
           asd = "cl-glfw-opengl-ext_texture_integer";
@@ -21135,7 +21135,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_lod_bias" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_lod_bias";
           asd = "cl-glfw-opengl-ext_texture_lod_bias";
@@ -21155,7 +21155,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_mirror_clamp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_mirror_clamp";
           asd = "cl-glfw-opengl-ext_texture_mirror_clamp";
@@ -21175,7 +21175,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_object";
           asd = "cl-glfw-opengl-ext_texture_object";
@@ -21195,7 +21195,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_perturb_normal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_perturb_normal";
           asd = "cl-glfw-opengl-ext_texture_perturb_normal";
@@ -21215,7 +21215,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_shared_exponent" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_shared_exponent";
           asd = "cl-glfw-opengl-ext_texture_shared_exponent";
@@ -21235,7 +21235,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_snorm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_snorm";
           asd = "cl-glfw-opengl-ext_texture_snorm";
@@ -21255,7 +21255,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_srgb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_srgb";
           asd = "cl-glfw-opengl-ext_texture_srgb";
@@ -21275,7 +21275,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_srgb_decode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_srgb_decode";
           asd = "cl-glfw-opengl-ext_texture_srgb_decode";
@@ -21295,7 +21295,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_texture_swizzle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_texture_swizzle";
           asd = "cl-glfw-opengl-ext_texture_swizzle";
@@ -21315,7 +21315,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_timer_query" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_timer_query";
           asd = "cl-glfw-opengl-ext_timer_query";
@@ -21335,7 +21335,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_transform_feedback" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_transform_feedback";
           asd = "cl-glfw-opengl-ext_transform_feedback";
@@ -21355,7 +21355,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_vertex_array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_vertex_array";
           asd = "cl-glfw-opengl-ext_vertex_array";
@@ -21375,7 +21375,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_vertex_array_bgra" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_vertex_array_bgra";
           asd = "cl-glfw-opengl-ext_vertex_array_bgra";
@@ -21395,7 +21395,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_vertex_attrib_64bit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_vertex_attrib_64bit";
           asd = "cl-glfw-opengl-ext_vertex_attrib_64bit";
@@ -21415,7 +21415,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_vertex_shader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_vertex_shader";
           asd = "cl-glfw-opengl-ext_vertex_shader";
@@ -21435,7 +21435,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ext_vertex_weighting" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ext_vertex_weighting";
           asd = "cl-glfw-opengl-ext_vertex_weighting";
@@ -21455,7 +21455,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-gremedy_frame_terminator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-gremedy_frame_terminator";
           asd = "cl-glfw-opengl-gremedy_frame_terminator";
@@ -21475,7 +21475,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-gremedy_string_marker" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-gremedy_string_marker";
           asd = "cl-glfw-opengl-gremedy_string_marker";
@@ -21495,7 +21495,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-hp_convolution_border_modes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-hp_convolution_border_modes";
           asd = "cl-glfw-opengl-hp_convolution_border_modes";
@@ -21515,7 +21515,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-hp_image_transform" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-hp_image_transform";
           asd = "cl-glfw-opengl-hp_image_transform";
@@ -21535,7 +21535,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-hp_occlusion_test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-hp_occlusion_test";
           asd = "cl-glfw-opengl-hp_occlusion_test";
@@ -21555,7 +21555,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-hp_texture_lighting" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-hp_texture_lighting";
           asd = "cl-glfw-opengl-hp_texture_lighting";
@@ -21575,7 +21575,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ibm_cull_vertex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ibm_cull_vertex";
           asd = "cl-glfw-opengl-ibm_cull_vertex";
@@ -21595,7 +21595,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ibm_multimode_draw_arrays" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ibm_multimode_draw_arrays";
           asd = "cl-glfw-opengl-ibm_multimode_draw_arrays";
@@ -21615,7 +21615,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ibm_rasterpos_clip" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ibm_rasterpos_clip";
           asd = "cl-glfw-opengl-ibm_rasterpos_clip";
@@ -21635,7 +21635,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ibm_texture_mirrored_repeat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ibm_texture_mirrored_repeat";
           asd = "cl-glfw-opengl-ibm_texture_mirrored_repeat";
@@ -21655,7 +21655,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ibm_vertex_array_lists" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ibm_vertex_array_lists";
           asd = "cl-glfw-opengl-ibm_vertex_array_lists";
@@ -21675,7 +21675,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ingr_blend_func_separate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ingr_blend_func_separate";
           asd = "cl-glfw-opengl-ingr_blend_func_separate";
@@ -21695,7 +21695,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ingr_color_clamp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ingr_color_clamp";
           asd = "cl-glfw-opengl-ingr_color_clamp";
@@ -21715,7 +21715,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-ingr_interlace_read" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-ingr_interlace_read";
           asd = "cl-glfw-opengl-ingr_interlace_read";
@@ -21735,7 +21735,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-intel_parallel_arrays" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-intel_parallel_arrays";
           asd = "cl-glfw-opengl-intel_parallel_arrays";
@@ -21755,7 +21755,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-mesa_pack_invert" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-mesa_pack_invert";
           asd = "cl-glfw-opengl-mesa_pack_invert";
@@ -21775,7 +21775,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-mesa_packed_depth_stencil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-mesa_packed_depth_stencil";
           asd = "cl-glfw-opengl-mesa_packed_depth_stencil";
@@ -21795,7 +21795,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-mesa_program_debug" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-mesa_program_debug";
           asd = "cl-glfw-opengl-mesa_program_debug";
@@ -21815,7 +21815,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-mesa_resize_buffers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-mesa_resize_buffers";
           asd = "cl-glfw-opengl-mesa_resize_buffers";
@@ -21835,7 +21835,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-mesa_shader_debug" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-mesa_shader_debug";
           asd = "cl-glfw-opengl-mesa_shader_debug";
@@ -21855,7 +21855,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-mesa_trace" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-mesa_trace";
           asd = "cl-glfw-opengl-mesa_trace";
@@ -21875,7 +21875,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-mesa_window_pos" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-mesa_window_pos";
           asd = "cl-glfw-opengl-mesa_window_pos";
@@ -21895,7 +21895,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-mesa_ycbcr_texture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-mesa_ycbcr_texture";
           asd = "cl-glfw-opengl-mesa_ycbcr_texture";
@@ -21915,7 +21915,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-mesax_texture_stack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-mesax_texture_stack";
           asd = "cl-glfw-opengl-mesax_texture_stack";
@@ -21935,7 +21935,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_conditional_render" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_conditional_render";
           asd = "cl-glfw-opengl-nv_conditional_render";
@@ -21955,7 +21955,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_copy_depth_to_color" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_copy_depth_to_color";
           asd = "cl-glfw-opengl-nv_copy_depth_to_color";
@@ -21975,7 +21975,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_copy_image" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_copy_image";
           asd = "cl-glfw-opengl-nv_copy_image";
@@ -21995,7 +21995,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_depth_buffer_float" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_depth_buffer_float";
           asd = "cl-glfw-opengl-nv_depth_buffer_float";
@@ -22015,7 +22015,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_depth_clamp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_depth_clamp";
           asd = "cl-glfw-opengl-nv_depth_clamp";
@@ -22035,7 +22035,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_evaluators" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_evaluators";
           asd = "cl-glfw-opengl-nv_evaluators";
@@ -22055,7 +22055,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_explicit_multisample" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_explicit_multisample";
           asd = "cl-glfw-opengl-nv_explicit_multisample";
@@ -22075,7 +22075,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_fence" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_fence";
           asd = "cl-glfw-opengl-nv_fence";
@@ -22095,7 +22095,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_float_buffer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_float_buffer";
           asd = "cl-glfw-opengl-nv_float_buffer";
@@ -22115,7 +22115,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_fog_distance" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_fog_distance";
           asd = "cl-glfw-opengl-nv_fog_distance";
@@ -22135,7 +22135,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_fragment_program" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_fragment_program";
           asd = "cl-glfw-opengl-nv_fragment_program";
@@ -22155,7 +22155,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_fragment_program2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_fragment_program2";
           asd = "cl-glfw-opengl-nv_fragment_program2";
@@ -22175,7 +22175,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_framebuffer_multisample_coverage" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_framebuffer_multisample_coverage";
           asd = "cl-glfw-opengl-nv_framebuffer_multisample_coverage";
@@ -22195,7 +22195,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_geometry_program4" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_geometry_program4";
           asd = "cl-glfw-opengl-nv_geometry_program4";
@@ -22215,7 +22215,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_gpu_program4" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_gpu_program4";
           asd = "cl-glfw-opengl-nv_gpu_program4";
@@ -22235,7 +22235,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_gpu_program5" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_gpu_program5";
           asd = "cl-glfw-opengl-nv_gpu_program5";
@@ -22255,7 +22255,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_gpu_shader5" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_gpu_shader5";
           asd = "cl-glfw-opengl-nv_gpu_shader5";
@@ -22275,7 +22275,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_half_float" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_half_float";
           asd = "cl-glfw-opengl-nv_half_float";
@@ -22295,7 +22295,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_light_max_exponent" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_light_max_exponent";
           asd = "cl-glfw-opengl-nv_light_max_exponent";
@@ -22315,7 +22315,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_multisample_coverage" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_multisample_coverage";
           asd = "cl-glfw-opengl-nv_multisample_coverage";
@@ -22335,7 +22335,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_multisample_filter_hint" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_multisample_filter_hint";
           asd = "cl-glfw-opengl-nv_multisample_filter_hint";
@@ -22355,7 +22355,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_occlusion_query" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_occlusion_query";
           asd = "cl-glfw-opengl-nv_occlusion_query";
@@ -22375,7 +22375,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_packed_depth_stencil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_packed_depth_stencil";
           asd = "cl-glfw-opengl-nv_packed_depth_stencil";
@@ -22395,7 +22395,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_parameter_buffer_object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_parameter_buffer_object";
           asd = "cl-glfw-opengl-nv_parameter_buffer_object";
@@ -22415,7 +22415,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_pixel_data_range" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_pixel_data_range";
           asd = "cl-glfw-opengl-nv_pixel_data_range";
@@ -22435,7 +22435,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_point_sprite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_point_sprite";
           asd = "cl-glfw-opengl-nv_point_sprite";
@@ -22455,7 +22455,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_present_video" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_present_video";
           asd = "cl-glfw-opengl-nv_present_video";
@@ -22475,7 +22475,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_primitive_restart" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_primitive_restart";
           asd = "cl-glfw-opengl-nv_primitive_restart";
@@ -22495,7 +22495,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_register_combiners" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_register_combiners";
           asd = "cl-glfw-opengl-nv_register_combiners";
@@ -22515,7 +22515,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_register_combiners2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_register_combiners2";
           asd = "cl-glfw-opengl-nv_register_combiners2";
@@ -22535,7 +22535,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_shader_buffer_load" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_shader_buffer_load";
           asd = "cl-glfw-opengl-nv_shader_buffer_load";
@@ -22555,7 +22555,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_shader_buffer_store" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_shader_buffer_store";
           asd = "cl-glfw-opengl-nv_shader_buffer_store";
@@ -22575,7 +22575,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_tessellation_program5" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_tessellation_program5";
           asd = "cl-glfw-opengl-nv_tessellation_program5";
@@ -22595,7 +22595,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_texgen_emboss" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_texgen_emboss";
           asd = "cl-glfw-opengl-nv_texgen_emboss";
@@ -22615,7 +22615,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_texgen_reflection" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_texgen_reflection";
           asd = "cl-glfw-opengl-nv_texgen_reflection";
@@ -22635,7 +22635,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_texture_barrier" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_texture_barrier";
           asd = "cl-glfw-opengl-nv_texture_barrier";
@@ -22655,7 +22655,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_texture_env_combine4" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_texture_env_combine4";
           asd = "cl-glfw-opengl-nv_texture_env_combine4";
@@ -22675,7 +22675,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_texture_expand_normal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_texture_expand_normal";
           asd = "cl-glfw-opengl-nv_texture_expand_normal";
@@ -22695,7 +22695,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_texture_multisample" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_texture_multisample";
           asd = "cl-glfw-opengl-nv_texture_multisample";
@@ -22715,7 +22715,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_texture_rectangle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_texture_rectangle";
           asd = "cl-glfw-opengl-nv_texture_rectangle";
@@ -22735,7 +22735,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_texture_shader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_texture_shader";
           asd = "cl-glfw-opengl-nv_texture_shader";
@@ -22755,7 +22755,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_texture_shader2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_texture_shader2";
           asd = "cl-glfw-opengl-nv_texture_shader2";
@@ -22775,7 +22775,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_texture_shader3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_texture_shader3";
           asd = "cl-glfw-opengl-nv_texture_shader3";
@@ -22795,7 +22795,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_transform_feedback" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_transform_feedback";
           asd = "cl-glfw-opengl-nv_transform_feedback";
@@ -22815,7 +22815,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_transform_feedback2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_transform_feedback2";
           asd = "cl-glfw-opengl-nv_transform_feedback2";
@@ -22835,7 +22835,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_vertex_array_range" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_vertex_array_range";
           asd = "cl-glfw-opengl-nv_vertex_array_range";
@@ -22855,7 +22855,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_vertex_array_range2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_vertex_array_range2";
           asd = "cl-glfw-opengl-nv_vertex_array_range2";
@@ -22875,7 +22875,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_vertex_attrib_integer_64bit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_vertex_attrib_integer_64bit";
           asd = "cl-glfw-opengl-nv_vertex_attrib_integer_64bit";
@@ -22895,7 +22895,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_vertex_buffer_unified_memory" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_vertex_buffer_unified_memory";
           asd = "cl-glfw-opengl-nv_vertex_buffer_unified_memory";
@@ -22915,7 +22915,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_vertex_program" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_vertex_program";
           asd = "cl-glfw-opengl-nv_vertex_program";
@@ -22935,7 +22935,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_vertex_program2_option" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_vertex_program2_option";
           asd = "cl-glfw-opengl-nv_vertex_program2_option";
@@ -22955,7 +22955,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_vertex_program3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_vertex_program3";
           asd = "cl-glfw-opengl-nv_vertex_program3";
@@ -22975,7 +22975,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-nv_vertex_program4" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-nv_vertex_program4";
           asd = "cl-glfw-opengl-nv_vertex_program4";
@@ -22995,7 +22995,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-oes_read_format" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-oes_read_format";
           asd = "cl-glfw-opengl-oes_read_format";
@@ -23015,7 +23015,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-oml_interlace" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-oml_interlace";
           asd = "cl-glfw-opengl-oml_interlace";
@@ -23035,7 +23035,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-oml_resample" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-oml_resample";
           asd = "cl-glfw-opengl-oml_resample";
@@ -23055,7 +23055,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-oml_subsample" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-oml_subsample";
           asd = "cl-glfw-opengl-oml_subsample";
@@ -23075,7 +23075,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-pgi_misc_hints" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-pgi_misc_hints";
           asd = "cl-glfw-opengl-pgi_misc_hints";
@@ -23095,7 +23095,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-pgi_vertex_hints" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-pgi_vertex_hints";
           asd = "cl-glfw-opengl-pgi_vertex_hints";
@@ -23115,7 +23115,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-rend_screen_coordinates" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-rend_screen_coordinates";
           asd = "cl-glfw-opengl-rend_screen_coordinates";
@@ -23135,7 +23135,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-s3_s3tc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-s3_s3tc";
           asd = "cl-glfw-opengl-s3_s3tc";
@@ -23155,7 +23155,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgi_color_table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgi_color_table";
           asd = "cl-glfw-opengl-sgi_color_table";
@@ -23175,7 +23175,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgi_depth_pass_instrument" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgi_depth_pass_instrument";
           asd = "cl-glfw-opengl-sgi_depth_pass_instrument";
@@ -23195,7 +23195,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgis_detail_texture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgis_detail_texture";
           asd = "cl-glfw-opengl-sgis_detail_texture";
@@ -23215,7 +23215,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgis_fog_function" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgis_fog_function";
           asd = "cl-glfw-opengl-sgis_fog_function";
@@ -23235,7 +23235,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgis_multisample" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgis_multisample";
           asd = "cl-glfw-opengl-sgis_multisample";
@@ -23255,7 +23255,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgis_pixel_texture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgis_pixel_texture";
           asd = "cl-glfw-opengl-sgis_pixel_texture";
@@ -23275,7 +23275,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgis_point_parameters" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgis_point_parameters";
           asd = "cl-glfw-opengl-sgis_point_parameters";
@@ -23295,7 +23295,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgis_sharpen_texture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgis_sharpen_texture";
           asd = "cl-glfw-opengl-sgis_sharpen_texture";
@@ -23315,7 +23315,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgis_texture4d" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgis_texture4d";
           asd = "cl-glfw-opengl-sgis_texture4d";
@@ -23335,7 +23335,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgis_texture_color_mask" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgis_texture_color_mask";
           asd = "cl-glfw-opengl-sgis_texture_color_mask";
@@ -23355,7 +23355,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgis_texture_filter4" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgis_texture_filter4";
           asd = "cl-glfw-opengl-sgis_texture_filter4";
@@ -23375,7 +23375,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgis_texture_select" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgis_texture_select";
           asd = "cl-glfw-opengl-sgis_texture_select";
@@ -23395,7 +23395,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_async" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_async";
           asd = "cl-glfw-opengl-sgix_async";
@@ -23415,7 +23415,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_depth_texture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_depth_texture";
           asd = "cl-glfw-opengl-sgix_depth_texture";
@@ -23435,7 +23435,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_flush_raster" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_flush_raster";
           asd = "cl-glfw-opengl-sgix_flush_raster";
@@ -23455,7 +23455,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_fog_scale" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_fog_scale";
           asd = "cl-glfw-opengl-sgix_fog_scale";
@@ -23475,7 +23475,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_fragment_lighting" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_fragment_lighting";
           asd = "cl-glfw-opengl-sgix_fragment_lighting";
@@ -23495,7 +23495,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_framezoom" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_framezoom";
           asd = "cl-glfw-opengl-sgix_framezoom";
@@ -23515,7 +23515,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_igloo_interface" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_igloo_interface";
           asd = "cl-glfw-opengl-sgix_igloo_interface";
@@ -23535,7 +23535,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_instruments" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_instruments";
           asd = "cl-glfw-opengl-sgix_instruments";
@@ -23555,7 +23555,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_line_quality_hint" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_line_quality_hint";
           asd = "cl-glfw-opengl-sgix_line_quality_hint";
@@ -23575,7 +23575,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_list_priority" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_list_priority";
           asd = "cl-glfw-opengl-sgix_list_priority";
@@ -23595,7 +23595,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_pixel_texture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_pixel_texture";
           asd = "cl-glfw-opengl-sgix_pixel_texture";
@@ -23615,7 +23615,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_polynomial_ffd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_polynomial_ffd";
           asd = "cl-glfw-opengl-sgix_polynomial_ffd";
@@ -23635,7 +23635,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_reference_plane" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_reference_plane";
           asd = "cl-glfw-opengl-sgix_reference_plane";
@@ -23655,7 +23655,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_resample" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_resample";
           asd = "cl-glfw-opengl-sgix_resample";
@@ -23675,7 +23675,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_scalebias_hint" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_scalebias_hint";
           asd = "cl-glfw-opengl-sgix_scalebias_hint";
@@ -23695,7 +23695,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_shadow" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_shadow";
           asd = "cl-glfw-opengl-sgix_shadow";
@@ -23715,7 +23715,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_shadow_ambient" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_shadow_ambient";
           asd = "cl-glfw-opengl-sgix_shadow_ambient";
@@ -23735,7 +23735,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_slim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_slim";
           asd = "cl-glfw-opengl-sgix_slim";
@@ -23755,7 +23755,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_sprite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_sprite";
           asd = "cl-glfw-opengl-sgix_sprite";
@@ -23775,7 +23775,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_tag_sample_buffer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_tag_sample_buffer";
           asd = "cl-glfw-opengl-sgix_tag_sample_buffer";
@@ -23795,7 +23795,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_texture_coordinate_clamp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_texture_coordinate_clamp";
           asd = "cl-glfw-opengl-sgix_texture_coordinate_clamp";
@@ -23815,7 +23815,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_texture_lod_bias" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_texture_lod_bias";
           asd = "cl-glfw-opengl-sgix_texture_lod_bias";
@@ -23835,7 +23835,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_texture_multi_buffer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_texture_multi_buffer";
           asd = "cl-glfw-opengl-sgix_texture_multi_buffer";
@@ -23855,7 +23855,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sgix_ycrcba" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sgix_ycrcba";
           asd = "cl-glfw-opengl-sgix_ycrcba";
@@ -23875,7 +23875,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sun_convolution_border_modes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sun_convolution_border_modes";
           asd = "cl-glfw-opengl-sun_convolution_border_modes";
@@ -23895,7 +23895,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sun_global_alpha" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sun_global_alpha";
           asd = "cl-glfw-opengl-sun_global_alpha";
@@ -23915,7 +23915,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sun_mesh_array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sun_mesh_array";
           asd = "cl-glfw-opengl-sun_mesh_array";
@@ -23935,7 +23935,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sun_slice_accum" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sun_slice_accum";
           asd = "cl-glfw-opengl-sun_slice_accum";
@@ -23955,7 +23955,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sun_triangle_list" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sun_triangle_list";
           asd = "cl-glfw-opengl-sun_triangle_list";
@@ -23975,7 +23975,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sun_vertex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sun_vertex";
           asd = "cl-glfw-opengl-sun_vertex";
@@ -23995,7 +23995,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-sunx_constant_data" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-sunx_constant_data";
           asd = "cl-glfw-opengl-sunx_constant_data";
@@ -24015,7 +24015,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-version_1_0" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-version_1_0";
           asd = "cl-glfw-opengl-version_1_0";
@@ -24035,7 +24035,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-version_1_1" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-version_1_1";
           asd = "cl-glfw-opengl-version_1_1";
@@ -24055,7 +24055,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-version_1_2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-version_1_2";
           asd = "cl-glfw-opengl-version_1_2";
@@ -24075,7 +24075,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-version_1_3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-version_1_3";
           asd = "cl-glfw-opengl-version_1_3";
@@ -24095,7 +24095,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-version_1_4" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-version_1_4";
           asd = "cl-glfw-opengl-version_1_4";
@@ -24115,7 +24115,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-version_1_5" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-version_1_5";
           asd = "cl-glfw-opengl-version_1_5";
@@ -24135,7 +24135,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-version_2_0" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-version_2_0";
           asd = "cl-glfw-opengl-version_2_0";
@@ -24155,7 +24155,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-version_2_1" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-version_2_1";
           asd = "cl-glfw-opengl-version_2_1";
@@ -24175,7 +24175,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-win_phong_shading" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-win_phong_shading";
           asd = "cl-glfw-opengl-win_phong_shading";
@@ -24195,7 +24195,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-opengl-win_specular_fog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-opengl-win_specular_fog";
           asd = "cl-glfw-opengl-win_specular_fog";
@@ -24215,7 +24215,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw-types" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz";
           sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6";
           system = "cl-glfw-types";
           asd = "cl-glfw-types";
@@ -24235,7 +24235,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw3/2021-05-31/cl-glfw3-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw3/2021-05-31/cl-glfw3-20210531-git.tgz";
           sha256 = "1wzr43nckdx4rlgxzhm1r4kfc264q969mc43y0js9ramh7l8gba5";
           system = "cl-glfw3";
           asd = "cl-glfw3";
@@ -24258,7 +24258,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glfw3-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glfw3/2021-05-31/cl-glfw3-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glfw3/2021-05-31/cl-glfw3-20210531-git.tgz";
           sha256 = "1wzr43nckdx4rlgxzhm1r4kfc264q969mc43y0js9ramh7l8gba5";
           system = "cl-glfw3-examples";
           asd = "cl-glfw3-examples";
@@ -24282,7 +24282,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glib/2023-10-21/cl-glib-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glib/2023-10-21/cl-glib-20231021-git.tgz";
           sha256 = "07y8hpvdl490p8j4k8y47raqqwnpym9scz7jlg2f1jx897dkssjb";
           system = "cl-glib";
           asd = "cl-glib";
@@ -24305,7 +24305,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gltf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gltf/2025-06-22/cl-gltf-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gltf/2025-06-22/cl-gltf-20250622-git.tgz";
           sha256 = "0ais6p3mw22zmhcfkab34sfb717si3a1wjx1xq8lig6fr75fw6k1";
           system = "cl-gltf";
           asd = "cl-gltf";
@@ -24335,7 +24335,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glu" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz";
           sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm";
           system = "cl-glu";
           asd = "cl-glu";
@@ -24358,7 +24358,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glut" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz";
           sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm";
           system = "cl-glut";
           asd = "cl-glut";
@@ -24382,7 +24382,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-glut-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz";
           sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm";
           system = "cl-glut-examples";
           asd = "cl-glut-examples";
@@ -24407,7 +24407,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gobject" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-glib/2023-10-21/cl-glib-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-glib/2023-10-21/cl-glib-20231021-git.tgz";
           sha256 = "07y8hpvdl490p8j4k8y47raqqwnpym9scz7jlg2f1jx897dkssjb";
           system = "cl-gobject";
           asd = "cl-gobject";
@@ -24427,7 +24427,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gobject-introspection" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gobject-introspection/2024-10-12/cl-gobject-introspection-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gobject-introspection/2024-10-12/cl-gobject-introspection-20241012-git.tgz";
           sha256 = "0iw8fciydh9bi2svq30hi029df16arpspk0mjzh0cm1c6kjm9dcj";
           system = "cl-gobject-introspection";
           asd = "cl-gobject-introspection";
@@ -24450,7 +24450,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gobject-introspection-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gobject-introspection/2024-10-12/cl-gobject-introspection-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gobject-introspection/2024-10-12/cl-gobject-introspection-20241012-git.tgz";
           sha256 = "0iw8fciydh9bi2svq30hi029df16arpspk0mjzh0cm1c6kjm9dcj";
           system = "cl-gobject-introspection-test";
           asd = "cl-gobject-introspection-test";
@@ -24474,7 +24474,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gobject-introspection-wrapper" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gobject-introspection-wrapper/2023-10-21/cl-gobject-introspection-wrapper-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gobject-introspection-wrapper/2023-10-21/cl-gobject-introspection-wrapper-20231021-git.tgz";
           sha256 = "0x1nryxkv6i0bzn2zmlsgbq0impni4drzawy3wc7zy5nr2qnd1x5";
           system = "cl-gobject-introspection-wrapper";
           asd = "cl-gobject-introspection-wrapper";
@@ -24498,7 +24498,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gog-galaxy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gog-galaxy/2025-06-22/cl-gog-galaxy-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gog-galaxy/2025-06-22/cl-gog-galaxy-20250622-git.tgz";
           sha256 = "0y8qp74njyidl93l3spbrizdfmmxdd0vs36hw4ihn5gr62y8yf18";
           system = "cl-gog-galaxy";
           asd = "cl-gog-galaxy";
@@ -24524,7 +24524,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gopher" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gopher/2023-10-21/cl-gopher-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gopher/2023-10-21/cl-gopher-20231021-git.tgz";
           sha256 = "0x8rj4icrx04rfh9qlh7hp2c0zyk4ii6s4wqwhqjxh5580mwblgb";
           system = "cl-gopher";
           asd = "cl-gopher";
@@ -24550,7 +24550,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gpio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gpio/2025-06-22/cl-gpio-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gpio/2025-06-22/cl-gpio-20250622-git.tgz";
           sha256 = "0z5w2p87plmgqnn8r6kc040303c7wynngr0fq3m25p29n776fibw";
           system = "cl-gpio";
           asd = "cl-gpio";
@@ -24573,7 +24573,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-graph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-graph/2024-10-12/cl-graph-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-graph/2024-10-12/cl-graph-20241012-git.tgz";
           sha256 = "1adwlkj2qp73irsswfi50ayjvz3di8fh1sqavsdl7l2d6k7yipdg";
           system = "cl-graph";
           asd = "cl-graph";
@@ -24598,7 +24598,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-graph+hu.dwim.graphviz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-graph/2024-10-12/cl-graph-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-graph/2024-10-12/cl-graph-20241012-git.tgz";
           sha256 = "1adwlkj2qp73irsswfi50ayjvz3di8fh1sqavsdl7l2d6k7yipdg";
           system = "cl-graph+hu.dwim.graphviz";
           asd = "cl-graph+hu.dwim.graphviz";
@@ -24621,7 +24621,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-grip" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-grip/2024-10-12/cl-grip-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-grip/2024-10-12/cl-grip-20241012-git.tgz";
           sha256 = "0k9qg6pdj4xs5rshf78jmiasyqj4sy5r5hhrccskfsajw6wfmbc9";
           system = "cl-grip";
           asd = "cl-grip";
@@ -24645,7 +24645,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-grnm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-grnm/2018-01-31/cl-grnm-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-grnm/2018-01-31/cl-grnm-20180131-git.tgz";
           sha256 = "1hb5n37n3x2ylrghcqsia2g9a6f5wg24l659jiz4ncpi5bsv4m3s";
           system = "cl-grnm";
           asd = "cl-grnm";
@@ -24665,7 +24665,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-growl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-growl/2016-12-08/cl-growl-20161208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-growl/2016-12-08/cl-growl-20161208-git.tgz";
           sha256 = "1qgj3sq22dznwxj1b3rw0099fsf6wgfbc63r376pab74kdnji3n6";
           system = "cl-growl";
           asd = "cl-growl";
@@ -24690,7 +24690,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gss" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gss/2018-02-28/cl-gss-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gss/2018-02-28/cl-gss-20180228-git.tgz";
           sha256 = "0zhxxn3zarird255s9i56bz0fm6dkv00mn8bbsjrhskg3wpcg4pb";
           system = "cl-gss";
           asd = "cl-gss";
@@ -24715,7 +24715,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gtk2-gdk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz";
           sha256 = "1lnrwd7s47cmksllim56mcg9l5m6jrwv6f0q1hq5lr8xpi5ix9vx";
           system = "cl-gtk2-gdk";
           asd = "cl-gtk2-gdk";
@@ -24737,7 +24737,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gtk2-glib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz";
           sha256 = "1lnrwd7s47cmksllim56mcg9l5m6jrwv6f0q1hq5lr8xpi5ix9vx";
           system = "cl-gtk2-glib";
           asd = "cl-gtk2-glib";
@@ -24761,7 +24761,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-gtk2-pango" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz";
           sha256 = "1lnrwd7s47cmksllim56mcg9l5m6jrwv6f0q1hq5lr8xpi5ix9vx";
           system = "cl-gtk2-pango";
           asd = "cl-gtk2-pango";
@@ -24782,7 +24782,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-haml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-haml/2018-02-28/cl-haml-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-haml/2018-02-28/cl-haml-20180228-git.tgz";
           sha256 = "017qr3509ha2680h3c8ip5rqyfaz7v9hfjmx0pg1wrjqw8vyjyb5";
           system = "cl-haml";
           asd = "cl-haml";
@@ -24802,7 +24802,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-haml-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-haml/2018-02-28/cl-haml-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-haml/2018-02-28/cl-haml-20180228-git.tgz";
           sha256 = "017qr3509ha2680h3c8ip5rqyfaz7v9hfjmx0pg1wrjqw8vyjyb5";
           system = "cl-haml-test";
           asd = "cl-haml";
@@ -24825,7 +24825,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-hamt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz";
           sha256 = "1ycbd73ykfj5j9sdhlzamyv18qbjj6xqf7fhm4fa0nsyr6sr3rf5";
           system = "cl-hamt";
           asd = "cl-hamt";
@@ -24845,7 +24845,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-hamt-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz";
           sha256 = "1ycbd73ykfj5j9sdhlzamyv18qbjj6xqf7fhm4fa0nsyr6sr3rf5";
           system = "cl-hamt-examples";
           asd = "cl-hamt-examples";
@@ -24869,7 +24869,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-hamt-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz";
           sha256 = "1ycbd73ykfj5j9sdhlzamyv18qbjj6xqf7fhm4fa0nsyr6sr3rf5";
           system = "cl-hamt-test";
           asd = "cl-hamt-test";
@@ -24892,7 +24892,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-hash-table-destructuring" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-hash-table-destructuring/2016-05-31/cl-hash-table-destructuring-20160531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-hash-table-destructuring/2016-05-31/cl-hash-table-destructuring-20160531-git.tgz";
           sha256 = "0za8jlqfvsilmnidk429509vbdd18w7ykcycni411pjpz0lxrh1v";
           system = "cl-hash-table-destructuring";
           asd = "cl-hash-table-destructuring";
@@ -24912,7 +24912,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-hash-table-destructuring-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-hash-table-destructuring/2016-05-31/cl-hash-table-destructuring-20160531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-hash-table-destructuring/2016-05-31/cl-hash-table-destructuring-20160531-git.tgz";
           sha256 = "0za8jlqfvsilmnidk429509vbdd18w7ykcycni411pjpz0lxrh1v";
           system = "cl-hash-table-destructuring-test";
           asd = "cl-hash-table-destructuring";
@@ -24936,7 +24936,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-hash-util" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-hash-util/2024-10-12/cl-hash-util-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-hash-util/2024-10-12/cl-hash-util-20241012-git.tgz";
           sha256 = "1xab7v2mav241rs8w68qmg485g4f75nrac3hjcnm0cb19ickbs1m";
           system = "cl-hash-util";
           asd = "cl-hash-util";
@@ -24956,7 +24956,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-hash-util-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-hash-util/2024-10-12/cl-hash-util-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-hash-util/2024-10-12/cl-hash-util-20241012-git.tgz";
           sha256 = "1xab7v2mav241rs8w68qmg485g4f75nrac3hjcnm0cb19ickbs1m";
           system = "cl-hash-util-test";
           asd = "cl-hash-util-test";
@@ -24979,7 +24979,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-heap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-heap/2013-03-12/cl-heap-0.1.6.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-heap/2013-03-12/cl-heap-0.1.6.tgz";
           sha256 = "01bss182x9i167lfv0lr8ylavk2m42s84vz6629kspgjhczm52w7";
           system = "cl-heap";
           asd = "cl-heap";
@@ -24997,7 +24997,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-heap-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-heap/2013-03-12/cl-heap-0.1.6.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-heap/2013-03-12/cl-heap-0.1.6.tgz";
           sha256 = "01bss182x9i167lfv0lr8ylavk2m42s84vz6629kspgjhczm52w7";
           system = "cl-heap-tests";
           asd = "cl-heap-tests";
@@ -25020,7 +25020,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-heredoc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-heredoc/2022-07-07/cl-heredoc-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-heredoc/2022-07-07/cl-heredoc-20220707-git.tgz";
           sha256 = "0hj9y6drd93nwcbmwwhnc30flm48ppw4rhfgfyqfc02fq2wnc83z";
           system = "cl-heredoc";
           asd = "cl-heredoc";
@@ -25040,7 +25040,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-heredoc-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-heredoc/2022-07-07/cl-heredoc-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-heredoc/2022-07-07/cl-heredoc-20220707-git.tgz";
           sha256 = "0hj9y6drd93nwcbmwwhnc30flm48ppw4rhfgfyqfc02fq2wnc83z";
           system = "cl-heredoc-test";
           asd = "cl-heredoc-test";
@@ -25063,7 +25063,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-hooks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz";
           sha256 = "0bg3l0a28lw5gqqjp6p6b5nhwqk46sgkb7184w5qbfngw1hk8x9y";
           system = "cl-hooks";
           asd = "cl-hooks";
@@ -25086,7 +25086,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-html-diff" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-html-diff/2013-01-28/cl-html-diff-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-html-diff/2013-01-28/cl-html-diff-20130128-git.tgz";
           sha256 = "1varnijivzd4jpimn1cz8p5ks713zzha5cgl4vmb0xr8ahravwzb";
           system = "cl-html-diff";
           asd = "cl-html-diff";
@@ -25104,7 +25104,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-html-parse" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-html-parse/2023-10-21/cl-html-parse-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-html-parse/2023-10-21/cl-html-parse-20231021-git.tgz";
           sha256 = "1qgjaq45lvqrsw4rrnyy4d5bwlmb7vd45ibdzgbxx5az02x3ahmy";
           system = "cl-html-parse";
           asd = "cl-html-parse";
@@ -25122,7 +25122,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-html-readme" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-html-readme/2024-10-12/cl-html-readme-quicklisp-current-release-f8aed591-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-html-readme/2024-10-12/cl-html-readme-quicklisp-current-release-f8aed591-git.tgz";
           sha256 = "1q23fdbhmra7hl12vd70m7q350wych6f739l8xmz6f84dwm9i8c7";
           system = "cl-html-readme";
           asd = "cl-html-readme";
@@ -25142,7 +25142,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-html5-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz";
           sha256 = "04if61wigylsmn996rbfl8ylsd0d9hzdmg7p2wiglncibjzcl5k9";
           system = "cl-html5-parser";
           asd = "cl-html5-parser";
@@ -25164,7 +25164,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-html5-parser-cxml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz";
           sha256 = "04if61wigylsmn996rbfl8ylsd0d9hzdmg7p2wiglncibjzcl5k9";
           system = "cl-html5-parser-cxml";
           asd = "cl-html5-parser-cxml";
@@ -25187,7 +25187,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-html5-parser-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz";
           sha256 = "04if61wigylsmn996rbfl8ylsd0d9hzdmg7p2wiglncibjzcl5k9";
           system = "cl-html5-parser-tests";
           asd = "cl-html5-parser-tests";
@@ -25212,7 +25212,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-htmlprag" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-htmlprag/2016-06-28/cl-htmlprag-20160628-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-htmlprag/2016-06-28/cl-htmlprag-20160628-git.tgz";
           sha256 = "1akfy9rldx5a2h34vf7y02pj2j7b5anbxja53m41ism4vklgqg1c";
           system = "cl-htmlprag";
           asd = "cl-htmlprag";
@@ -25236,7 +25236,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-httpsqs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-httpsqs/2018-02-28/cl-httpsqs-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-httpsqs/2018-02-28/cl-httpsqs-20180228-git.tgz";
           sha256 = "14nhr03lm8012crczjpgsmf0ydipqf3kggayshm7w72vkyf0haj7";
           system = "cl-httpsqs";
           asd = "cl-httpsqs";
@@ -25256,7 +25256,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-hue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-hue/2015-01-13/cl-hue-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-hue/2015-01-13/cl-hue-20150113-git.tgz";
           sha256 = "0d2qv60pih1xmk0zzbdwcsyk8k9abjzilcmhz3jdicinl8jinfr4";
           system = "cl-hue";
           asd = "cl-hue";
@@ -25280,7 +25280,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-i18n" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-i18n/2025-06-22/cl-i18n-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-i18n/2025-06-22/cl-i18n-20250622-git.tgz";
           sha256 = "1vz0ynfx557c9nydnq5c32ha7qv8viypvmqg36s1l6mbp16b76ws";
           system = "cl-i18n";
           asd = "cl-i18n";
@@ -25304,7 +25304,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-id3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-id3/2023-06-18/cl-id3-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-id3/2023-06-18/cl-id3-20230618-git.tgz";
           sha256 = "0p5rcxy6zy8jq673yphbq5dq0g28vx9g7kfklfhicg2blpzy2yf5";
           system = "cl-id3";
           asd = "cl-id3";
@@ -25324,7 +25324,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ilu" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz";
           sha256 = "1qdjb7xwzjkv99s8q0834lfdq4ch5j2ymrmqsvwzhg47ys17pvvf";
           system = "cl-ilu";
           asd = "cl-ilu";
@@ -25348,7 +25348,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ilut" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz";
           sha256 = "1qdjb7xwzjkv99s8q0834lfdq4ch5j2ymrmqsvwzhg47ys17pvvf";
           system = "cl-ilut";
           asd = "cl-ilut";
@@ -25372,7 +25372,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-incognia" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-incognia/2021-12-30/cl-incognia-20211230-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-incognia/2021-12-30/cl-incognia-20211230-git.tgz";
           sha256 = "0c5v7vqh26vg4mzzz7rkq3r29ygj2q4fw6v56pi79bbszyklfs21";
           system = "cl-incognia";
           asd = "cl-incognia";
@@ -25395,7 +25395,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-indentify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-indentify/2025-06-22/cl-indentify-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-indentify/2025-06-22/cl-indentify-20250622-git.tgz";
           sha256 = "1fyrlrrncvpzgp209010kjs3rvx845n6vk160995w464gsrpf56m";
           system = "cl-indentify";
           asd = "cl-indentify";
@@ -25418,7 +25418,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-inflector" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-inflector/2015-01-13/cl-inflector-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-inflector/2015-01-13/cl-inflector-20150113-git.tgz";
           sha256 = "1xwwlhik1la4fp984qnx2dqq24v012qv4x0y49sngfpwg7n0ya7y";
           system = "cl-inflector";
           asd = "cl-inflector";
@@ -25441,7 +25441,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-inflector-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-inflector/2015-01-13/cl-inflector-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-inflector/2015-01-13/cl-inflector-20150113-git.tgz";
           sha256 = "1xwwlhik1la4fp984qnx2dqq24v012qv4x0y49sngfpwg7n0ya7y";
           system = "cl-inflector-test";
           asd = "cl-inflector";
@@ -25464,7 +25464,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-influxdb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-influxdb/2018-01-31/cl-influxdb-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-influxdb/2018-01-31/cl-influxdb-20180131-git.tgz";
           sha256 = "0fqnsdw6x79qsvw7l6xp1gxgzcj6jwpa4mn0z2gbbipff4g7k527";
           system = "cl-influxdb";
           asd = "cl-influxdb";
@@ -25491,7 +25491,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-info" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz";
           sha256 = "0j3yd13g8pyx2fj1fxvbizhz7wc016cykx3csknnw72cms890vli";
           system = "cl-info";
           asd = "cl-info";
@@ -25511,7 +25511,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-info-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz";
           sha256 = "0j3yd13g8pyx2fj1fxvbizhz7wc016cykx3csknnw72cms890vli";
           system = "cl-info-ci";
           asd = "cl-info-ci";
@@ -25531,7 +25531,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-info-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz";
           sha256 = "0j3yd13g8pyx2fj1fxvbizhz7wc016cykx3csknnw72cms890vli";
           system = "cl-info-docs";
           asd = "cl-info-docs";
@@ -25557,7 +25557,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-info-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-info/2025-06-22/cl-info-20250622-git.tgz";
           sha256 = "0j3yd13g8pyx2fj1fxvbizhz7wc016cykx3csknnw72cms890vli";
           system = "cl-info-tests";
           asd = "cl-info-tests";
@@ -25581,7 +25581,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ini" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ini/2024-10-12/cl-ini-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ini/2024-10-12/cl-ini-20241012-git.tgz";
           sha256 = "1dj2w1fs1j52wxy91qy2jrn88aqggrvsg4fngl90ssvfh3awk4wm";
           system = "cl-ini";
           asd = "cl-ini";
@@ -25601,7 +25601,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ini-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ini/2024-10-12/cl-ini-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ini/2024-10-12/cl-ini-20241012-git.tgz";
           sha256 = "1dj2w1fs1j52wxy91qy2jrn88aqggrvsg4fngl90ssvfh3awk4wm";
           system = "cl-ini-test";
           asd = "cl-ini-test";
@@ -25624,7 +25624,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-inotify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-inotify/2022-07-07/cl-inotify-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-inotify/2022-07-07/cl-inotify-20220707-git.tgz";
           sha256 = "0d3bvp5lqnddzhk1w9yyli03njbkhc8d129a058g0j49kgd47c7v";
           system = "cl-inotify";
           asd = "cl-inotify";
@@ -25654,7 +25654,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-inotify-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-inotify/2022-07-07/cl-inotify-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-inotify/2022-07-07/cl-inotify-20220707-git.tgz";
           sha256 = "0d3bvp5lqnddzhk1w9yyli03njbkhc8d129a058g0j49kgd47c7v";
           system = "cl-inotify-tests";
           asd = "cl-inotify-tests";
@@ -25677,7 +25677,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-intbytes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-intbytes/2015-09-23/cl-intbytes-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-intbytes/2015-09-23/cl-intbytes-20150923-git.tgz";
           sha256 = "0chwfda7pi8mrgwj31li7f0x0hr5yrp4csiq8hwkgd4c1ag1z9fx";
           system = "cl-intbytes";
           asd = "cl-intbytes";
@@ -25697,7 +25697,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-intbytes-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-intbytes/2015-09-23/cl-intbytes-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-intbytes/2015-09-23/cl-intbytes-20150923-git.tgz";
           sha256 = "0chwfda7pi8mrgwj31li7f0x0hr5yrp4csiq8hwkgd4c1ag1z9fx";
           system = "cl-intbytes-test";
           asd = "cl-intbytes-test";
@@ -25721,7 +25721,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-interpol" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-interpol/2022-11-06/cl-interpol-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-interpol/2022-11-06/cl-interpol-20221106-git.tgz";
           sha256 = "1nkjn8byyfdxhi84rbpqs87bb5m478lvphfgxqqv0q37rn75c946";
           system = "cl-interpol";
           asd = "cl-interpol";
@@ -25742,7 +25742,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-interval" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-interval/2020-07-15/cl-interval-20200715-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-interval/2020-07-15/cl-interval-20200715-git.tgz";
           sha256 = "1425l6xmrqadjqgqb5qasisf14pbr6zpj30bpxfv8hhnxs5njq4p";
           system = "cl-interval";
           asd = "cl-interval";
@@ -25762,7 +25762,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-interval-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-interval/2020-07-15/cl-interval-20200715-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-interval/2020-07-15/cl-interval-20200715-git.tgz";
           sha256 = "1425l6xmrqadjqgqb5qasisf14pbr6zpj30bpxfv8hhnxs5njq4p";
           system = "cl-interval-docs";
           asd = "cl-interval-docs";
@@ -25785,7 +25785,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ipfs-api2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ipfs-api2/2024-10-12/cl-ipfs-api2-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ipfs-api2/2024-10-12/cl-ipfs-api2-20241012-git.tgz";
           sha256 = "0lz19ayvcdhakckxp6z6gzlglhvnaj0qqyx1jmp211fms7dzyl0x";
           system = "cl-ipfs-api2";
           asd = "cl-ipfs-api2";
@@ -25809,7 +25809,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-irc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-irc/2015-09-23/cl-irc-0.9.2.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-irc/2015-09-23/cl-irc-0.9.2.tgz";
           sha256 = "15h3ram8b6vyg4718ad2m92xgilda2x3zmkzbjnijk69kkqsq01r";
           system = "cl-irc";
           asd = "cl-irc";
@@ -25833,7 +25833,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-irc-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-irc/2015-09-23/cl-irc-0.9.2.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-irc/2015-09-23/cl-irc-0.9.2.tgz";
           sha256 = "15h3ram8b6vyg4718ad2m92xgilda2x3zmkzbjnijk69kkqsq01r";
           system = "cl-irc-test";
           asd = "cl-irc-test";
@@ -25857,7 +25857,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-irregsexp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-irregsexp/2016-08-25/cl-irregsexp-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-irregsexp/2016-08-25/cl-irregsexp-20160825-git.tgz";
           sha256 = "09pf3jlqskcs32shbj9q3m0zww5pxyrizbvk2nxiwwnbl1rdb406";
           system = "cl-irregsexp";
           asd = "cl-irregsexp";
@@ -25877,7 +25877,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-isaac" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-isaac/2023-10-21/cl-isaac-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-isaac/2023-10-21/cl-isaac-20231021-git.tgz";
           sha256 = "07gjfynhqwwsa839i24h08xd9w7kn5g02rm35x96hq1qrfv1v0fn";
           system = "cl-isaac";
           asd = "cl-isaac";
@@ -25897,7 +25897,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-iterative" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-iterative/2016-03-18/cl-iterative-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-iterative/2016-03-18/cl-iterative-20160318-git.tgz";
           sha256 = "01h2fs7nq2wivjwh9swsmfdvsdmd7j9dvzgrq0ijbq456zm8vilq";
           system = "cl-iterative";
           asd = "cl-iterative";
@@ -25920,7 +25920,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-iterative-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-iterative/2016-03-18/cl-iterative-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-iterative/2016-03-18/cl-iterative-20160318-git.tgz";
           sha256 = "01h2fs7nq2wivjwh9swsmfdvsdmd7j9dvzgrq0ijbq456zm8vilq";
           system = "cl-iterative-tests";
           asd = "cl-iterative-tests";
@@ -25943,7 +25943,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-itertools" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-itertools/2016-04-21/cl-itertools-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-itertools/2016-04-21/cl-itertools-20160421-git.tgz";
           sha256 = "0m1g7nxqnz03bcj46skcr2d50pi3lb4hwizna5d4mvl5hk4zwbxr";
           system = "cl-itertools";
           asd = "cl-itertools";
@@ -25967,7 +25967,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-itertools-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-itertools/2016-04-21/cl-itertools-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-itertools/2016-04-21/cl-itertools-20160421-git.tgz";
           sha256 = "0m1g7nxqnz03bcj46skcr2d50pi3lb4hwizna5d4mvl5hk4zwbxr";
           system = "cl-itertools-tests";
           asd = "cl-itertools";
@@ -25991,7 +25991,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-jpeg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jpeg/2023-02-14/cl-jpeg-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-jpeg/2023-02-14/cl-jpeg-20230214-git.tgz";
           sha256 = "1xl1id4k1bdw6hf24ndkzr6nxi30yw7xlr1fhfmxnwjqwy5hcq14";
           system = "cl-jpeg";
           asd = "cl-jpeg";
@@ -26009,7 +26009,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-js" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/js/2024-10-12/js-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/js/2024-10-12/js-20241012-git.tgz";
           sha256 = "084rfqxbhrwqb3xfcx3kzmnyzacr2wb8bkxzl0srdgn17pl7hkx3";
           system = "cl-js";
           asd = "cl-js";
@@ -26033,7 +26033,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-jschema" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jschema/2023-06-18/cl-jschema-v1.1.1.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-jschema/2023-06-18/cl-jschema-v1.1.1.tgz";
           sha256 = "0awc7hy07sg4h8k58xxxy578a5qklpkj3slslp7ghfzfdbi7nz11";
           system = "cl-jschema";
           asd = "cl-jschema";
@@ -26058,7 +26058,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-json" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-json/2022-07-07/cl-json-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-json/2022-07-07/cl-json-20220707-git.tgz";
           sha256 = "12vakz47d1i7pywgb9cm2364fzykidc9m7l7b6n9lx0gn2qx9ar5";
           system = "cl-json";
           asd = "cl-json";
@@ -26076,7 +26076,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-json-helper" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-json-helper/2018-12-10/cl-json-helper-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-json-helper/2018-12-10/cl-json-helper-20181210-git.tgz";
           sha256 = "1dhv5lh514m7bvl77xjhb4ky7nf4bskgpld7rqg3rq24k4y0c79a";
           system = "cl-json-helper";
           asd = "cl-json-helper";
@@ -26096,7 +26096,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-json-pointer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-json-pointer/2022-11-06/cl-json-pointer-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-json-pointer/2022-11-06/cl-json-pointer-20221106-git.tgz";
           sha256 = "0b7a755wc2ghsd1pv7d32877b21h4nssp41xs017anbmj55czb2h";
           system = "cl-json-pointer";
           asd = "cl-json-pointer";
@@ -26120,7 +26120,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-json-schema" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-json-schema/2021-02-28/cl-json-schema-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-json-schema/2021-02-28/cl-json-schema-20210228-git.tgz";
           sha256 = "1c90c9j6d2b02zyyqd07200waqa4saq0svps7vfy5a3lxp9vag9i";
           system = "cl-json-schema";
           asd = "cl-json-schema";
@@ -26145,7 +26145,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-json-schema-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-json-schema/2021-02-28/cl-json-schema-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-json-schema/2021-02-28/cl-json-schema-20210228-git.tgz";
           sha256 = "1c90c9j6d2b02zyyqd07200waqa4saq0svps7vfy5a3lxp9vag9i";
           system = "cl-json-schema-tests";
           asd = "cl-json-schema-tests";
@@ -26169,7 +26169,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-jsonl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jsonl/2023-10-21/cl-jsonl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-jsonl/2023-10-21/cl-jsonl-20231021-git.tgz";
           sha256 = "0mwszi9r88p21rl6x7gh0cjgmfmzvgs34257h88m6zr7q7h7djw4";
           system = "cl-jsonl";
           asd = "cl-jsonl";
@@ -26192,7 +26192,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-jsx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jsx/2016-02-08/cl-jsx-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-jsx/2016-02-08/cl-jsx-20160208-git.tgz";
           sha256 = "1vkqs65sqnfkfka2p93ibfrgg3wps3qhlcgcd8j40h0bv3phcjp7";
           system = "cl-jsx";
           asd = "cl-jsx";
@@ -26216,7 +26216,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-jsx-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jsx/2016-02-08/cl-jsx-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-jsx/2016-02-08/cl-jsx-20160208-git.tgz";
           sha256 = "1vkqs65sqnfkfka2p93ibfrgg3wps3qhlcgcd8j40h0bv3phcjp7";
           system = "cl-jsx-test";
           asd = "cl-jsx-test";
@@ -26240,7 +26240,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-junit-xml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz";
           sha256 = "1ssrcgw5bhfsb5lk7jb8jyz77mj6sg23wc3gmnw747iqvpikwakr";
           system = "cl-junit-xml";
           asd = "cl-junit-xml";
@@ -26264,7 +26264,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-junit-xml.lisp-unit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz";
           sha256 = "1ssrcgw5bhfsb5lk7jb8jyz77mj6sg23wc3gmnw747iqvpikwakr";
           system = "cl-junit-xml.lisp-unit";
           asd = "cl-junit-xml.lisp-unit";
@@ -26290,7 +26290,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-junit-xml.lisp-unit2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz";
           sha256 = "1ssrcgw5bhfsb5lk7jb8jyz77mj6sg23wc3gmnw747iqvpikwakr";
           system = "cl-junit-xml.lisp-unit2";
           asd = "cl-junit-xml.lisp-unit2";
@@ -26316,7 +26316,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-junit-xml.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz";
           sha256 = "1ssrcgw5bhfsb5lk7jb8jyz77mj6sg23wc3gmnw747iqvpikwakr";
           system = "cl-junit-xml.test";
           asd = "cl-junit-xml";
@@ -26339,7 +26339,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-jwk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jwk/2023-10-21/cl-jwk-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-jwk/2023-10-21/cl-jwk-20231021-git.tgz";
           sha256 = "07hphgx40583hpvzj2xnk73lypfp1iq40nfpv3gf3hba4x54c17a";
           system = "cl-jwk";
           asd = "cl-jwk";
@@ -26367,7 +26367,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-jwk.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jwk/2023-10-21/cl-jwk-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-jwk/2023-10-21/cl-jwk-20231021-git.tgz";
           sha256 = "07hphgx40583hpvzj2xnk73lypfp1iq40nfpv3gf3hba4x54c17a";
           system = "cl-jwk.test";
           asd = "cl-jwk.test";
@@ -26390,7 +26390,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-k8055" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-k8055/2025-06-22/cl-k8055-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-k8055/2025-06-22/cl-k8055-20250622-git.tgz";
           sha256 = "0ml2i5zkidc01dmjqxrk2y4a24wnh6wz4amc979rilj6nwrxzj1f";
           system = "cl-k8055";
           asd = "cl-k8055";
@@ -26415,7 +26415,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-kanren" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-kanren/2024-10-12/cl-kanren-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-kanren/2024-10-12/cl-kanren-20241012-git.tgz";
           sha256 = "136jdgh23vb7imihk9dqwpk8wzjmpvkqfhah3qrxpsw0xpir29sh";
           system = "cl-kanren";
           asd = "cl-kanren";
@@ -26435,7 +26435,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-kanren-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-kanren/2024-10-12/cl-kanren-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-kanren/2024-10-12/cl-kanren-20241012-git.tgz";
           sha256 = "136jdgh23vb7imihk9dqwpk8wzjmpvkqfhah3qrxpsw0xpir29sh";
           system = "cl-kanren-test";
           asd = "cl-kanren-test";
@@ -26459,7 +26459,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-keycloak" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-keycloak/2019-07-10/cl-keycloak-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-keycloak/2019-07-10/cl-keycloak-20190710-git.tgz";
           sha256 = "052x10xj951061xa80kp1ziwrr8hskjsr7q2ni1d1ab26rkmhb9q";
           system = "cl-keycloak";
           asd = "cl-keycloak";
@@ -26483,7 +26483,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-kraken" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-kraken/2022-03-31/cl-kraken-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-kraken/2022-03-31/cl-kraken-20220331-git.tgz";
           sha256 = "07a9a7yqii0gsiaf4r6jfz2nb2m8766rv4acqcdjm8zmsllwx7jz";
           system = "cl-kraken";
           asd = "cl-kraken";
@@ -26509,7 +26509,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ksuid" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ksuid/2017-08-30/cl-ksuid-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ksuid/2017-08-30/cl-ksuid-20170830-git.tgz";
           sha256 = "142fr8l6aa6wxnjxv04f61hy9504cx9x1r10byhmj475s5pfr6gl";
           system = "cl-ksuid";
           asd = "cl-ksuid";
@@ -26534,7 +26534,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ksuid-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ksuid/2017-08-30/cl-ksuid-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ksuid/2017-08-30/cl-ksuid-20170830-git.tgz";
           sha256 = "142fr8l6aa6wxnjxv04f61hy9504cx9x1r10byhmj475s5pfr6gl";
           system = "cl-ksuid-test";
           asd = "cl-ksuid";
@@ -26558,7 +26558,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ktx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ktx/2023-10-21/cl-ktx-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ktx/2023-10-21/cl-ktx-20231021-git.tgz";
           sha256 = "1nggg3qixnmv9gisj0aqd369z1rm2qqdf17xnsxcpzz1d9lvxqhq";
           system = "cl-ktx";
           asd = "cl-ktx";
@@ -26583,7 +26583,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-kyoto-cabinet" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-kyoto-cabinet/2019-11-30/cl-kyoto-cabinet-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-kyoto-cabinet/2019-11-30/cl-kyoto-cabinet-20191130-git.tgz";
           sha256 = "0ayp87ggayaf8d1dblpv90a87fmgh9vhhcah3ch6jvcw6zzb9lcr";
           system = "cl-kyoto-cabinet";
           asd = "cl-kyoto-cabinet";
@@ -26603,7 +26603,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-l10n" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-l10n/2021-12-09/cl-l10n-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-l10n/2021-12-09/cl-l10n-20211209-git.tgz";
           sha256 = "10yknvjcbgc82a6k6yzj2diki2z2s04q5kg642f2gfj2rl3bjyz7";
           system = "cl-l10n";
           asd = "cl-l10n";
@@ -26632,7 +26632,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-l10n-cldr" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz";
           sha256 = "1mwkjdc51158v9rpdpsc1qzqqs0x8hb9k1k7b0pm8q7dp9rrb53v";
           system = "cl-l10n-cldr";
           asd = "cl-l10n-cldr";
@@ -26650,7 +26650,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-lambdacalc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-lambdacalc/2023-02-14/cl-lambdacalc-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-lambdacalc/2023-02-14/cl-lambdacalc-20230214-git.tgz";
           sha256 = "0ja08d6p1dnbpf8yl8n59vis5lzr3x32in3iin72zmhj5n60axbd";
           system = "cl-lambdacalc";
           asd = "cl-lambdacalc";
@@ -26670,7 +26670,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-lambdacalc-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-lambdacalc/2023-02-14/cl-lambdacalc-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-lambdacalc/2023-02-14/cl-lambdacalc-20230214-git.tgz";
           sha256 = "0ja08d6p1dnbpf8yl8n59vis5lzr3x32in3iin72zmhj5n60axbd";
           system = "cl-lambdacalc-test";
           asd = "cl-lambdacalc-test";
@@ -26693,7 +26693,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-las" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-las/2025-06-22/cl-las-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-las/2025-06-22/cl-las-20250622-git.tgz";
           sha256 = "0gmygdn36lwfi2v9k6izk2l2gj7f02vcnlkrxlmgyqc0x6plf3n8";
           system = "cl-las";
           asd = "cl-las";
@@ -26713,7 +26713,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-lastfm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-lastfm/2014-07-13/cl-lastfm-0.2.1.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-lastfm/2014-07-13/cl-lastfm-0.2.1.tgz";
           sha256 = "0f37b8swgfz57bffcypjhcgzj5dhanssiraahkianj65a6zbindl";
           system = "cl-lastfm";
           asd = "cl-lastfm";
@@ -26738,7 +26738,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-lastfm-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-lastfm/2014-07-13/cl-lastfm-0.2.1.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-lastfm/2014-07-13/cl-lastfm-0.2.1.tgz";
           sha256 = "0f37b8swgfz57bffcypjhcgzj5dhanssiraahkianj65a6zbindl";
           system = "cl-lastfm-test";
           asd = "cl-lastfm-test";
@@ -26761,7 +26761,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-launch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-launch/2015-10-31/cl-launch-4.1.4.1.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-launch/2015-10-31/cl-launch-4.1.4.1.tgz";
           sha256 = "041nh1sh9rqdk9c1kr63n3g2pn11i68x9plzyfq36wmyhz2aypnr";
           system = "cl-launch";
           asd = "cl-launch";
@@ -26781,7 +26781,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-lc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-lc/2024-10-12/cl-lc-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-lc/2024-10-12/cl-lc-20241012-git.tgz";
           sha256 = "07wpbwgjybhp6vdr2rbd93jwakqixr9dyymp3yz1h684ln7wvfkb";
           system = "cl-lc";
           asd = "cl-lc";
@@ -26805,7 +26805,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ledger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ledger/2020-02-18/cl-ledger-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ledger/2020-02-18/cl-ledger-20200218-git.tgz";
           sha256 = "1dpxna9s0rgshqbc58h698ihwyk34a3napb8zrm8vbq8aigjrrzs";
           system = "cl-ledger";
           asd = "cl-ledger";
@@ -26830,7 +26830,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-lex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-lex/2016-09-29/cl-lex-20160929-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-lex/2016-09-29/cl-lex-20160929-git.tgz";
           sha256 = "1kg50f76bfpfxcv4dfivq1n9a0xlsra2ajb0vd68lxwgbidgyc2y";
           system = "cl-lex";
           asd = "cl-lex";
@@ -26850,7 +26850,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-lexer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-lexer/2019-10-07/cl-lexer-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-lexer/2019-10-07/cl-lexer-20191007-git.tgz";
           sha256 = "182fnmazfmc3zdp14lvpxlaxrwwsjp8mbjn8sdzywjxcnvlpkdmk";
           system = "cl-lexer";
           asd = "cl-lexer";
@@ -26870,7 +26870,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-liballegro" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-liballegro/2025-06-22/cl-liballegro-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-liballegro/2025-06-22/cl-liballegro-20250622-git.tgz";
           sha256 = "1kqywmc4zp45kh1b6hix1dsm1n01zpmz8qkwfbwjrpq4a07rx30l";
           system = "cl-liballegro";
           asd = "cl-liballegro";
@@ -26897,7 +26897,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-liballegro-nuklear" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-liballegro-nuklear/2025-06-22/cl-liballegro-nuklear-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-liballegro-nuklear/2025-06-22/cl-liballegro-nuklear-20250622-git.tgz";
           sha256 = "1nfayk1as4ss9fmi04rz5gb5l9v7zs98zj1ddx15h4lml811n322";
           system = "cl-liballegro-nuklear";
           asd = "cl-liballegro-nuklear";
@@ -26922,7 +26922,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libevent2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libevent2/2019-01-07/cl-libevent2-20190107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libevent2/2019-01-07/cl-libevent2-20190107-git.tgz";
           sha256 = "18c8cxlh0vmyca7ihj8dz3f1j31h7y0kcis6qr6mpkzyi0k2cf0g";
           system = "cl-libevent2";
           asd = "cl-libevent2";
@@ -26942,7 +26942,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libevent2-ssl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libevent2/2019-01-07/cl-libevent2-20190107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libevent2/2019-01-07/cl-libevent2-20190107-git.tgz";
           sha256 = "18c8cxlh0vmyca7ihj8dz3f1j31h7y0kcis6qr6mpkzyi0k2cf0g";
           system = "cl-libevent2-ssl";
           asd = "cl-libevent2-ssl";
@@ -26965,7 +26965,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libiio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libiio/2019-11-30/cl-libiio-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libiio/2019-11-30/cl-libiio-20191130-git.tgz";
           sha256 = "1z1jslm303c22imhshr92j1mq7g3j81xa5rk5psj3x00papncwmr";
           system = "cl-libiio";
           asd = "cl-libiio";
@@ -26985,7 +26985,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libinput" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libinput/2022-07-07/cl-libinput-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libinput/2022-07-07/cl-libinput-20220707-git.tgz";
           sha256 = "18c3rl3d2bizbp3607gnn9j50x84f2mkypj9rqbry56i5gcw8zkh";
           system = "cl-libinput";
           asd = "cl-libinput";
@@ -27008,7 +27008,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-liblinear" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libsvm/2021-10-20/cl-libsvm-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libsvm/2021-10-20/cl-libsvm-20211020-git.tgz";
           sha256 = "0fpcw82hz6bp2hicjhvhxwcj4azprcl911n8q941lk8xcld3pmi0";
           system = "cl-liblinear";
           asd = "cl-liblinear";
@@ -27031,7 +27031,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libpuzzle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libpuzzle/2015-06-08/cl-libpuzzle-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libpuzzle/2015-06-08/cl-libpuzzle-20150608-git.tgz";
           sha256 = "0qgpdg4lni4sq6jp23qcd1jldsnrsn4h5b14ddmc8mb7va4qshlp";
           system = "cl-libpuzzle";
           asd = "cl-libpuzzle";
@@ -27051,7 +27051,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libpuzzle-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libpuzzle/2015-06-08/cl-libpuzzle-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libpuzzle/2015-06-08/cl-libpuzzle-20150608-git.tgz";
           sha256 = "0qgpdg4lni4sq6jp23qcd1jldsnrsn4h5b14ddmc8mb7va4qshlp";
           system = "cl-libpuzzle-test";
           asd = "cl-libpuzzle-test";
@@ -27074,7 +27074,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libre-translate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libre-translate/2025-06-22/cl-libre-translate-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libre-translate/2025-06-22/cl-libre-translate-20250622-git.tgz";
           sha256 = "1wgspc50z6bnald5drbr2qr913s2r10qvm1281h44cyx294kl6gg";
           system = "cl-libre-translate";
           asd = "cl-libre-translate";
@@ -27099,7 +27099,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libre-translate.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libre-translate/2025-06-22/cl-libre-translate-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libre-translate/2025-06-22/cl-libre-translate-20250622-git.tgz";
           sha256 = "1wgspc50z6bnald5drbr2qr913s2r10qvm1281h44cyx294kl6gg";
           system = "cl-libre-translate.test";
           asd = "cl-libre-translate.test";
@@ -27123,7 +27123,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libsvm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libsvm/2021-10-20/cl-libsvm-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libsvm/2021-10-20/cl-libsvm-20211020-git.tgz";
           sha256 = "0fpcw82hz6bp2hicjhvhxwcj4azprcl911n8q941lk8xcld3pmi0";
           system = "cl-libsvm";
           asd = "cl-libsvm";
@@ -27146,7 +27146,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libsvm-format" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libsvm-format/2018-07-11/cl-libsvm-format-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libsvm-format/2018-07-11/cl-libsvm-format-20180711-git.tgz";
           sha256 = "0284aj84xszhkhlivaigf9qj855fxad3mzmv3zfr0qzb5k0nzwrg";
           system = "cl-libsvm-format";
           asd = "cl-libsvm-format";
@@ -27166,7 +27166,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libsvm-format-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libsvm-format/2018-07-11/cl-libsvm-format-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libsvm-format/2018-07-11/cl-libsvm-format-20180711-git.tgz";
           sha256 = "0284aj84xszhkhlivaigf9qj855fxad3mzmv3zfr0qzb5k0nzwrg";
           system = "cl-libsvm-format-test";
           asd = "cl-libsvm-format-test";
@@ -27190,7 +27190,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libusb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libusb/2021-02-28/cl-libusb-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libusb/2021-02-28/cl-libusb-20210228-git.tgz";
           sha256 = "0kyzgcflwb85q58fgn82sp0bipnq5bprg5i4h0h3jxafqqyagbnk";
           system = "cl-libusb";
           asd = "cl-libusb";
@@ -27213,7 +27213,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libuv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libuv/2023-06-18/cl-libuv-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libuv/2023-06-18/cl-libuv-20230618-git.tgz";
           sha256 = "13kymryibhlq7jc8q3yar0c676srx82axfmz0x2r5kq7k94cknl9";
           system = "cl-libuv";
           asd = "cl-libuv";
@@ -27235,7 +27235,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libuv-config" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libuv/2023-06-18/cl-libuv-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libuv/2023-06-18/cl-libuv-20230618-git.tgz";
           sha256 = "13kymryibhlq7jc8q3yar0c676srx82axfmz0x2r5kq7k94cknl9";
           system = "cl-libuv-config";
           asd = "cl-libuv-config";
@@ -27255,7 +27255,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libxml2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz";
           sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw";
           system = "cl-libxml2";
           asd = "cl-libxml2";
@@ -27281,7 +27281,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libxml2-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz";
           sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw";
           system = "cl-libxml2-test";
           asd = "cl-libxml2";
@@ -27304,7 +27304,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libyaml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libyaml/2020-12-20/cl-libyaml-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libyaml/2020-12-20/cl-libyaml-20201220-git.tgz";
           sha256 = "06pvmackyhq03rjmihpx6w63m6cy8wx78ll5xpwwvd85bgrqq817";
           system = "cl-libyaml";
           asd = "cl-libyaml";
@@ -27322,7 +27322,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-libyaml-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libyaml/2020-12-20/cl-libyaml-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libyaml/2020-12-20/cl-libyaml-20201220-git.tgz";
           sha256 = "06pvmackyhq03rjmihpx6w63m6cy8wx78ll5xpwwvd85bgrqq817";
           system = "cl-libyaml-test";
           asd = "cl-libyaml-test";
@@ -27345,7 +27345,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-lite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "cl-lite";
           asd = "cl-lite";
@@ -27365,7 +27365,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-locale" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz";
           sha256 = "1rhannhpsw1yg1fpflam483a3w9qb1izgyvmnmiddv3dn4qsmn9p";
           system = "cl-locale";
           asd = "cl-locale";
@@ -27389,7 +27389,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-locale-syntax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz";
           sha256 = "1rhannhpsw1yg1fpflam483a3w9qb1izgyvmnmiddv3dn4qsmn9p";
           system = "cl-locale-syntax";
           asd = "cl-locale-syntax";
@@ -27412,7 +27412,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-locale-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz";
           sha256 = "1rhannhpsw1yg1fpflam483a3w9qb1izgyvmnmiddv3dn4qsmn9p";
           system = "cl-locale-test";
           asd = "cl-locale-test";
@@ -27438,7 +27438,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-locatives" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-locatives/2023-06-18/cl-locatives-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-locatives/2023-06-18/cl-locatives-20230618-git.tgz";
           sha256 = "05avna8fj3bicdhbcvnjmv9dnqq10g26m9pwgmrh6a4hyxz9zdaq";
           system = "cl-locatives";
           asd = "cl-locatives";
@@ -27458,7 +27458,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-log" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-log/2024-10-12/cl-log-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-log/2024-10-12/cl-log-20241012-git.tgz";
           sha256 = "1r3z9swy1b59swvaa5b97is9ysrfmjvjjhhw56p7p5hqg93b92ak";
           system = "cl-log";
           asd = "cl-log";
@@ -27478,7 +27478,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-logic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-logic/2014-12-17/cl-logic-20141217-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-logic/2014-12-17/cl-logic-20141217-git.tgz";
           sha256 = "17n2wzqali3j6b7pqbydipwlxgwdrj4mdnsgwjdyz32n8jvfyjwh";
           system = "cl-logic";
           asd = "cl-logic";
@@ -27501,7 +27501,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ltsv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ltsv/2014-07-13/cl-ltsv-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ltsv/2014-07-13/cl-ltsv-20140713-git.tgz";
           sha256 = "1bjvnwxyaaw3yrq5hws2fr4qmk5938hdh2np2bqpm4m3b2c94n22";
           system = "cl-ltsv";
           asd = "cl-ltsv";
@@ -27521,7 +27521,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ltsv-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ltsv/2014-07-13/cl-ltsv-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ltsv/2014-07-13/cl-ltsv-20140713-git.tgz";
           sha256 = "1bjvnwxyaaw3yrq5hws2fr4qmk5938hdh2np2bqpm4m3b2c94n22";
           system = "cl-ltsv-test";
           asd = "cl-ltsv-test";
@@ -27544,7 +27544,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-lzma" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-lzma/2019-11-30/cl-lzma-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-lzma/2019-11-30/cl-lzma-20191130-git.tgz";
           sha256 = "17fdinmi2ffdga17slv86van0sp9gkvlmjprfdwak2jzziz6fxx6";
           system = "cl-lzma";
           asd = "cl-lzma";
@@ -27569,7 +27569,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-m4" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-m4/2013-03-12/cl-m4-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-m4/2013-03-12/cl-m4-20130312-git.tgz";
           sha256 = "1dqdhxb45j4vqmx38xkq32gsckldca8rxpf2idg4b61wd21c0ci6";
           system = "cl-m4";
           asd = "cl-m4";
@@ -27597,7 +27597,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-m4-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-m4/2013-03-12/cl-m4-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-m4/2013-03-12/cl-m4-20130312-git.tgz";
           sha256 = "1dqdhxb45j4vqmx38xkq32gsckldca8rxpf2idg4b61wd21c0ci6";
           system = "cl-m4-test";
           asd = "cl-m4-test";
@@ -27621,7 +27621,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mango" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mango/2020-09-25/cl-mango-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mango/2020-09-25/cl-mango-20200925-git.tgz";
           sha256 = "0ipa1azakzqigq103m1j2z597bp2i34kx4z1418kp2jn8zwbdz5s";
           system = "cl-mango";
           asd = "cl-mango";
@@ -27645,7 +27645,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-markdown" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz";
           sha256 = "1wksi765nk8kf5qm2chh7dcn6k562kvc108dzdb9y5iwp97lqqvg";
           system = "cl-markdown";
           asd = "cl-markdown";
@@ -27672,7 +27672,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-markdown-comparisons" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz";
           sha256 = "1wksi765nk8kf5qm2chh7dcn6k562kvc108dzdb9y5iwp97lqqvg";
           system = "cl-markdown-comparisons";
           asd = "cl-markdown-comparisons";
@@ -27699,7 +27699,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-markdown-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz";
           sha256 = "1wksi765nk8kf5qm2chh7dcn6k562kvc108dzdb9y5iwp97lqqvg";
           system = "cl-markdown-test";
           asd = "cl-markdown-test";
@@ -27723,7 +27723,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-markless" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
           sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy";
           system = "cl-markless";
           asd = "cl-markless";
@@ -27746,7 +27746,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-markless-epub" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
           sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy";
           system = "cl-markless-epub";
           asd = "cl-markless-epub";
@@ -27773,7 +27773,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-markless-latex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
           sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy";
           system = "cl-markless-latex";
           asd = "cl-markless-latex";
@@ -27793,7 +27793,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-markless-markdown" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
           sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy";
           system = "cl-markless-markdown";
           asd = "cl-markless-markdown";
@@ -27817,7 +27817,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-markless-plump" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
           sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy";
           system = "cl-markless-plump";
           asd = "cl-markless-plump";
@@ -27840,7 +27840,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-markless-standalone" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
           sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy";
           system = "cl-markless-standalone";
           asd = "cl-markless-standalone";
@@ -27868,7 +27868,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-markless-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-markless/2025-06-22/cl-markless-20250622-git.tgz";
           sha256 = "1vqjbhwqnx1i97r36sqr0alyqb39aszil6dswzdvx4s54h5dpphy";
           system = "cl-markless-test";
           asd = "cl-markless-test";
@@ -27891,7 +27891,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-marklogic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz";
           sha256 = "0baq2ccb88zyr2dqdvpm32lsin4zalv11w48x4xm80cr4kw45fk5";
           system = "cl-marklogic";
           asd = "cl-marklogic";
@@ -27916,7 +27916,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-markup" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz";
           sha256 = "10l6k45971dl13fkdmva7zc6i453lmq9j4xax2ci6pjzlc6xjhp7";
           system = "cl-markup";
           asd = "cl-markup";
@@ -27934,7 +27934,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-markup-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz";
           sha256 = "10l6k45971dl13fkdmva7zc6i453lmq9j4xax2ci6pjzlc6xjhp7";
           system = "cl-markup-test";
           asd = "cl-markup-test";
@@ -27957,7 +27957,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-match" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz";
           sha256 = "1qc8gzp7f4phgyi5whkxacrqzdqs0y1hvkf71m8n7l303jly9wjf";
           system = "cl-match";
           asd = "cl-match";
@@ -27977,7 +27977,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-match-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz";
           sha256 = "1qc8gzp7f4phgyi5whkxacrqzdqs0y1hvkf71m8n7l303jly9wjf";
           system = "cl-match-test";
           asd = "cl-match-test";
@@ -28000,7 +28000,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mathstats" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mathstats/2023-02-14/cl-mathstats-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mathstats/2023-02-14/cl-mathstats-20230214-git.tgz";
           sha256 = "17ic625bdsvgfjndl4zzxkjy7dcl54alg2pdr0jjn4cpysffga6z";
           system = "cl-mathstats";
           asd = "cl-mathstats";
@@ -28023,7 +28023,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mathstats-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mathstats/2023-02-14/cl-mathstats-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mathstats/2023-02-14/cl-mathstats-20230214-git.tgz";
           sha256 = "17ic625bdsvgfjndl4zzxkjy7dcl54alg2pdr0jjn4cpysffga6z";
           system = "cl-mathstats-test";
           asd = "cl-mathstats-test";
@@ -28046,7 +28046,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-maxminddb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-maxminddb/2021-06-30/cl-maxminddb-20210630-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-maxminddb/2021-06-30/cl-maxminddb-20210630-git.tgz";
           sha256 = "1mm7cpiygcka39pj4a0rvhayfl4wh0zfjkda60yshq24xmml84pw";
           system = "cl-maxminddb";
           asd = "cl-maxminddb";
@@ -28074,7 +28074,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-maxsat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-maxsat/2020-02-18/cl-maxsat-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-maxsat/2020-02-18/cl-maxsat-20200218-git.tgz";
           sha256 = "0qy4hhi8y3wv88x3s88g2hl2cz25cjp26xapd3z4h7lrx7cy786i";
           system = "cl-maxsat";
           asd = "cl-maxsat";
@@ -28099,7 +28099,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-maxsat.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-maxsat/2020-02-18/cl-maxsat-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-maxsat/2020-02-18/cl-maxsat-20200218-git.tgz";
           sha256 = "0qy4hhi8y3wv88x3s88g2hl2cz25cjp26xapd3z4h7lrx7cy786i";
           system = "cl-maxsat.test";
           asd = "cl-maxsat.test";
@@ -28122,7 +28122,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mdb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mdb/2022-07-07/cl-mdb-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mdb/2022-07-07/cl-mdb-20220707-git.tgz";
           sha256 = "1xkhk39485yv3j9bshnnv74c95asf9704g80wb8vwvwsvqi7ym2a";
           system = "cl-mdb";
           asd = "cl-mdb";
@@ -28142,7 +28142,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mecab" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mecab/2018-10-18/cl-mecab-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mecab/2018-10-18/cl-mecab-20181018-git.tgz";
           sha256 = "0lfan9p8dsniyp60g6n8awfjvv8lyickc40qdxiry6kmp65636ps";
           system = "cl-mecab";
           asd = "cl-mecab";
@@ -28165,7 +28165,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mecab-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mecab/2018-10-18/cl-mecab-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mecab/2018-10-18/cl-mecab-20181018-git.tgz";
           sha256 = "0lfan9p8dsniyp60g6n8awfjvv8lyickc40qdxiry6kmp65636ps";
           system = "cl-mecab-test";
           asd = "cl-mecab-test";
@@ -28189,7 +28189,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mechanize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mechanize/2018-07-11/cl-mechanize-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mechanize/2018-07-11/cl-mechanize-20180711-git.tgz";
           sha256 = "0y86sdi2nl3jv6n535cd62jax0mpc0cckrhffaqacbgbdjc875sn";
           system = "cl-mechanize";
           asd = "cl-mechanize";
@@ -28215,7 +28215,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mediawiki" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mediawiki/2016-12-04/cl-mediawiki-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mediawiki/2016-12-04/cl-mediawiki-20161204-git.tgz";
           sha256 = "1wrysj9l64k3xx152yw1arvn1glnx60j730qvj8prm65iid95xgm";
           system = "cl-mediawiki";
           asd = "cl-mediawiki";
@@ -28239,7 +28239,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mediawiki-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mediawiki/2016-12-04/cl-mediawiki-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mediawiki/2016-12-04/cl-mediawiki-20161204-git.tgz";
           sha256 = "1wrysj9l64k3xx152yw1arvn1glnx60j730qvj8prm65iid95xgm";
           system = "cl-mediawiki-test";
           asd = "cl-mediawiki-test";
@@ -28262,7 +28262,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-megolm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-megolm/2023-02-14/cl-megolm-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-megolm/2023-02-14/cl-megolm-20230214-git.tgz";
           sha256 = "1n80v63pw2ck419fglgdhhqnc06jmams6mnxb8sqdg966qxhql2k";
           system = "cl-megolm";
           asd = "cl-megolm";
@@ -28291,7 +28291,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-memcached" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-memcached/2015-06-08/cl-memcached-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-memcached/2015-06-08/cl-memcached-20150608-git.tgz";
           sha256 = "0g66m0yiazzh0447qbmgxjn4kxjcx9bk2l8cimyzmriz5d0j2q3i";
           system = "cl-memcached";
           asd = "cl-memcached";
@@ -28316,7 +28316,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-messagepack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-messagepack/2023-10-21/cl-messagepack-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-messagepack/2023-10-21/cl-messagepack-20231021-git.tgz";
           sha256 = "1hjd1q18lz46k46afz94ljflp76mfr30d6z4jrsgd26y2lc4gchc";
           system = "cl-messagepack";
           asd = "cl-messagepack";
@@ -28340,7 +28340,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-messagepack-rpc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-messagepack-rpc/2017-12-27/cl-messagepack-rpc-20171227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-messagepack-rpc/2017-12-27/cl-messagepack-rpc-20171227-git.tgz";
           sha256 = "02nrnhav28v5vwig9mmmmax59nl0sbjkmdzwakzpj6y1gafiqgy9";
           system = "cl-messagepack-rpc";
           asd = "cl-messagepack-rpc";
@@ -28368,7 +28368,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-messagepack-rpc-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-messagepack-rpc/2017-12-27/cl-messagepack-rpc-20171227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-messagepack-rpc/2017-12-27/cl-messagepack-rpc-20171227-git.tgz";
           sha256 = "02nrnhav28v5vwig9mmmmax59nl0sbjkmdzwakzpj6y1gafiqgy9";
           system = "cl-messagepack-rpc-tests";
           asd = "cl-messagepack-rpc-tests";
@@ -28391,7 +28391,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-messagepack-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-messagepack/2023-10-21/cl-messagepack-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-messagepack/2023-10-21/cl-messagepack-20231021-git.tgz";
           sha256 = "1hjd1q18lz46k46afz94ljflp76mfr30d6z4jrsgd26y2lc4gchc";
           system = "cl-messagepack-tests";
           asd = "cl-messagepack-tests";
@@ -28415,7 +28415,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-migrations" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-migrations/2011-01-10/cl-migrations-20110110-http.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-migrations/2011-01-10/cl-migrations-20110110-http.tgz";
           sha256 = "0mq3ir1kffw921q5a878964ghnrhcrh79p6yxsrb25bzkwpnfx02";
           system = "cl-migrations";
           asd = "cl-migrations";
@@ -28435,7 +28435,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-migratum" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
           sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw";
           system = "cl-migratum";
           asd = "cl-migratum";
@@ -28460,7 +28460,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-migratum.cli" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
           sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw";
           system = "cl-migratum.cli";
           asd = "cl-migratum.cli";
@@ -28486,7 +28486,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-migratum.driver.dbi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
           sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw";
           system = "cl-migratum.driver.dbi";
           asd = "cl-migratum.driver.dbi";
@@ -28512,7 +28512,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-migratum.driver.mixins" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
           sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw";
           system = "cl-migratum.driver.mixins";
           asd = "cl-migratum.driver.mixins";
@@ -28532,7 +28532,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-migratum.driver.postmodern-postgresql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
           sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw";
           system = "cl-migratum.driver.postmodern-postgresql";
           asd = "cl-migratum.driver.postmodern-postgresql";
@@ -28559,7 +28559,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-migratum.driver.rdbms-postgresql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
           sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw";
           system = "cl-migratum.driver.rdbms-postgresql";
           asd = "cl-migratum.driver.rdbms-postgresql";
@@ -28586,7 +28586,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-migratum.provider.local-path" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
           sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw";
           system = "cl-migratum.provider.local-path";
           asd = "cl-migratum.provider.local-path";
@@ -28610,7 +28610,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-migratum.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz";
           sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw";
           system = "cl-migratum.test";
           asd = "cl-migratum.test";
@@ -28639,7 +28639,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mime" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mime/2020-12-20/cl-mime-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mime/2020-12-20/cl-mime-20201220-git.tgz";
           sha256 = "0i2vyc1d4qp36f3c3qfpx9rkp3d2ka80r40wc9lsvhqn1hjxa2gv";
           system = "cl-mime";
           asd = "cl-mime";
@@ -28663,7 +28663,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mime-from-string" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mime-from-string/2020-04-27/cl-mime-from-string-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mime-from-string/2020-04-27/cl-mime-from-string-20200427-git.tgz";
           sha256 = "1pzhfbv6j3b0vvf4rxxd56v54lh6v7cs16nq2d64cawn6qzmk4bp";
           system = "cl-mime-from-string";
           asd = "cl-mime-from-string";
@@ -28683,7 +28683,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mime-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mime/2020-12-20/cl-mime-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mime/2020-12-20/cl-mime-20201220-git.tgz";
           sha256 = "0i2vyc1d4qp36f3c3qfpx9rkp3d2ka80r40wc9lsvhqn1hjxa2gv";
           system = "cl-mime-test";
           asd = "cl-mime-test";
@@ -28706,7 +28706,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mimeparse" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mimeparse/2021-05-31/cl-mimeparse-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mimeparse/2021-05-31/cl-mimeparse-20210531-git.tgz";
           sha256 = "0gdkpi3620va0a3q56svcn1q9f5w0pqfhx30lnldg8fjnrdfiwkk";
           system = "cl-mimeparse";
           asd = "cl-mimeparse";
@@ -28729,7 +28729,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mimeparse-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mimeparse/2021-05-31/cl-mimeparse-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mimeparse/2021-05-31/cl-mimeparse-20210531-git.tgz";
           sha256 = "0gdkpi3620va0a3q56svcn1q9f5w0pqfhx30lnldg8fjnrdfiwkk";
           system = "cl-mimeparse-tests";
           asd = "cl-mimeparse-tests";
@@ -28752,7 +28752,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-minify-css" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-minify-css/2020-09-25/cl-minify-css-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-minify-css/2020-09-25/cl-minify-css-20200925-git.tgz";
           sha256 = "1wj1mh7qzr8ybqyx7kxnpsmj3d9lylnzmq1qmycdyf2llqkcdxgd";
           system = "cl-minify-css";
           asd = "cl-minify-css";
@@ -28772,7 +28772,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-minify-css-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-minify-css/2020-09-25/cl-minify-css-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-minify-css/2020-09-25/cl-minify-css-20200925-git.tgz";
           sha256 = "1wj1mh7qzr8ybqyx7kxnpsmj3d9lylnzmq1qmycdyf2llqkcdxgd";
           system = "cl-minify-css-test";
           asd = "cl-minify-css-test";
@@ -28797,7 +28797,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed";
           asd = "cl-mixed";
@@ -28823,7 +28823,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-aaudio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-aaudio";
           asd = "cl-mixed-aaudio";
@@ -28846,7 +28846,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-alsa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-alsa";
           asd = "cl-mixed-alsa";
@@ -28869,7 +28869,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-coreaudio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-coreaudio";
           asd = "cl-mixed-coreaudio";
@@ -28894,7 +28894,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-examples";
           asd = "cl-mixed-examples";
@@ -28920,7 +28920,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-flac" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-flac";
           asd = "cl-mixed-flac";
@@ -28943,7 +28943,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-jack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-jack";
           asd = "cl-mixed-jack";
@@ -28966,7 +28966,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-mpg123" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-mpg123";
           asd = "cl-mixed-mpg123";
@@ -28989,7 +28989,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-mpt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-mpt";
           asd = "cl-mixed-mpt";
@@ -29012,7 +29012,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-nxau" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-nxau";
           asd = "cl-mixed-nxau";
@@ -29035,7 +29035,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-opus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-opus";
           asd = "cl-mixed-opus";
@@ -29058,7 +29058,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-oss" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-oss";
           asd = "cl-mixed-oss";
@@ -29081,7 +29081,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-out123" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-out123";
           asd = "cl-mixed-out123";
@@ -29104,7 +29104,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-pipewire" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-pipewire";
           asd = "cl-mixed-pipewire";
@@ -29128,7 +29128,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-pulse" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-pulse";
           asd = "cl-mixed-pulse";
@@ -29151,7 +29151,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-qoa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-qoa";
           asd = "cl-mixed-qoa";
@@ -29174,7 +29174,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-sdl2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-sdl2";
           asd = "cl-mixed-sdl2";
@@ -29197,7 +29197,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-sf3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-sf3";
           asd = "cl-mixed-sf3";
@@ -29217,7 +29217,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-vorbis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-vorbis";
           asd = "cl-mixed-vorbis";
@@ -29240,7 +29240,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-wasapi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-wasapi";
           asd = "cl-mixed-wasapi";
@@ -29264,7 +29264,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-wav" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-wav";
           asd = "cl-mixed-wav";
@@ -29284,7 +29284,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-winmm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-winmm";
           asd = "cl-mixed-winmm";
@@ -29307,7 +29307,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-xaudio2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-xaudio2";
           asd = "cl-mixed-xaudio2";
@@ -29332,7 +29332,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mixed-xmp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mixed/2025-06-22/cl-mixed-20250622-git.tgz";
           sha256 = "134rn9gmnhkwjbn9g2gi4wd2yv4725si18b25850wlhxbh4fpkf4";
           system = "cl-mixed-xmp";
           asd = "cl-mixed-xmp";
@@ -29355,7 +29355,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mock" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz";
           sha256 = "19641sm3klx9yfk8lr376rfkd26vy72yp1hkpkqcw3q3m1xrf9xp";
           system = "cl-mock";
           asd = "cl-mock";
@@ -29378,7 +29378,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mock-basic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz";
           sha256 = "19641sm3klx9yfk8lr376rfkd26vy72yp1hkpkqcw3q3m1xrf9xp";
           system = "cl-mock-basic";
           asd = "cl-mock-basic";
@@ -29402,7 +29402,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mock-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz";
           sha256 = "19641sm3klx9yfk8lr376rfkd26vy72yp1hkpkqcw3q3m1xrf9xp";
           system = "cl-mock-tests";
           asd = "cl-mock-tests";
@@ -29425,7 +29425,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mock-tests-basic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz";
           sha256 = "19641sm3klx9yfk8lr376rfkd26vy72yp1hkpkqcw3q3m1xrf9xp";
           system = "cl-mock-tests-basic";
           asd = "cl-mock-tests-basic";
@@ -29448,7 +29448,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-modio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-modio/2025-06-22/cl-modio-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-modio/2025-06-22/cl-modio-20250622-git.tgz";
           sha256 = "1f591m3g9a6y434wypfzw1vqwslxm1llzarz99qgp0bf930cwfgb";
           system = "cl-modio";
           asd = "cl-modio";
@@ -29476,7 +29476,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-monad-macros" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-monad-macros/2011-06-19/cl-monad-macros-20110619-svn.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-monad-macros/2011-06-19/cl-monad-macros-20110619-svn.tgz";
           sha256 = "184p018xb07yd04bpscrwrnwv1cdxh9hxggmrnj95lhlr6r97l1z";
           system = "cl-monad-macros";
           asd = "cl-monad-macros";
@@ -29496,7 +29496,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-moneris" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-moneris/2023-10-21/cl-moneris-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-moneris/2023-10-21/cl-moneris-20231021-git.tgz";
           sha256 = "1ajxqdgqy7cnkq6qz18xayw5z1idz3slzj7nc7pcv4ha7h3ak63k";
           system = "cl-moneris";
           asd = "cl-moneris";
@@ -29519,7 +29519,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-moneris-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-moneris/2023-10-21/cl-moneris-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-moneris/2023-10-21/cl-moneris-20231021-git.tgz";
           sha256 = "1ajxqdgqy7cnkq6qz18xayw5z1idz3slzj7nc7pcv4ha7h3ak63k";
           system = "cl-moneris-test";
           asd = "cl-moneris-test";
@@ -29542,7 +29542,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mongo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mongo/2016-05-31/cl-mongo-20160531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mongo/2016-05-31/cl-mongo-20160531-git.tgz";
           sha256 = "1l3kydbxbxhs1z76v6qpwjnabv8wf0mff1pfjkrpjfz6bia1svx6";
           system = "cl-mongo";
           asd = "cl-mongo";
@@ -29571,7 +29571,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mongo-id" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mongo-id/2020-12-20/cl-mongo-id-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mongo-id/2020-12-20/cl-mongo-id-20201220-git.tgz";
           sha256 = "1bpwmh5970rpr6ayygcgdg96hq2dlrksgpa1vdmy5l6vdbw9xrys";
           system = "cl-mongo-id";
           asd = "cl-mongo-id";
@@ -29596,7 +29596,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-monitors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-monitors/2023-10-21/cl-monitors-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-monitors/2023-10-21/cl-monitors-20231021-git.tgz";
           sha256 = "09ddgs7sbqjx91bajpk5qf6716vnx63mfg9yw0biw16mnfjhrg4i";
           system = "cl-monitors";
           asd = "cl-monitors";
@@ -29621,7 +29621,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mop" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mop/2015-01-13/cl-mop-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mop/2015-01-13/cl-mop-20150113-git.tgz";
           sha256 = "0wqjbp6jr868a89hklf1ppxkdfbznafrdpriakqiraicvr9kvksg";
           system = "cl-mop";
           asd = "cl-mop";
@@ -29641,7 +29641,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-morse" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-morse/2022-07-07/cl-morse-v1.0.0.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-morse/2022-07-07/cl-morse-v1.0.0.tgz";
           sha256 = "01sh34nhbsx2dsrb2r1vkd4j8lzm9gjd5jfi8a4cs4m3djjwhh5i";
           system = "cl-morse";
           asd = "cl-morse";
@@ -29661,7 +29661,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-moss" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-moss/2017-10-19/cl-moss-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-moss/2017-10-19/cl-moss-20171019-git.tgz";
           sha256 = "1qxzppnyxc8lkhfbbp5m3dbhp4rfkyc2lfrry2448i5w5icrigzd";
           system = "cl-moss";
           asd = "cl-moss";
@@ -29681,7 +29681,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mount-info" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mount-info/2024-10-12/cl-mount-info-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mount-info/2024-10-12/cl-mount-info-20241012-git.tgz";
           sha256 = "0i5vpr0s27gqrskl5qkbw23ba00abbmsskgvg2zhpdljg5qiwlcw";
           system = "cl-mount-info";
           asd = "cl-mount-info";
@@ -29705,7 +29705,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mpg123" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mpg123/2025-06-22/cl-mpg123-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mpg123/2025-06-22/cl-mpg123-20250622-git.tgz";
           sha256 = "0hlzx72ga43vhh1wfi7g9imf5jmqyga2sn135yf99s38bpznh4p7";
           system = "cl-mpg123";
           asd = "cl-mpg123";
@@ -29731,7 +29731,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mpg123-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mpg123/2025-06-22/cl-mpg123-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mpg123/2025-06-22/cl-mpg123-20250622-git.tgz";
           sha256 = "0hlzx72ga43vhh1wfi7g9imf5jmqyga2sn135yf99s38bpznh4p7";
           system = "cl-mpg123-example";
           asd = "cl-mpg123-example";
@@ -29755,7 +29755,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mpi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz";
           sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb";
           system = "cl-mpi";
           asd = "cl-mpi";
@@ -29780,7 +29780,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mpi-asdf-integration" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz";
           sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb";
           system = "cl-mpi-asdf-integration";
           asd = "cl-mpi-asdf-integration";
@@ -29803,7 +29803,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mpi-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz";
           sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb";
           system = "cl-mpi-examples";
           asd = "cl-mpi-examples";
@@ -29826,7 +29826,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mpi-extensions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz";
           sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb";
           system = "cl-mpi-extensions";
           asd = "cl-mpi-extensions";
@@ -29850,7 +29850,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mpi-test-suite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz";
           sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb";
           system = "cl-mpi-test-suite";
           asd = "cl-mpi-test-suite";
@@ -29874,7 +29874,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mtgnet" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz";
           sha256 = "08mwkfa9s51is6npn7al4rn5a65ip2bq0psb1pdvh111h5zqxdrb";
           system = "cl-mtgnet";
           asd = "cl-mtgnet";
@@ -29899,7 +29899,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mtgnet-async" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz";
           sha256 = "08mwkfa9s51is6npn7al4rn5a65ip2bq0psb1pdvh111h5zqxdrb";
           system = "cl-mtgnet-async";
           asd = "cl-mtgnet-async";
@@ -29922,7 +29922,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mtgnet-sync" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz";
           sha256 = "08mwkfa9s51is6npn7al4rn5a65ip2bq0psb1pdvh111h5zqxdrb";
           system = "cl-mtgnet-sync";
           asd = "cl-mtgnet-sync";
@@ -29945,7 +29945,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-murmurhash" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-murmurhash/2021-06-30/cl-murmurhash-20210630-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-murmurhash/2021-06-30/cl-murmurhash-20210630-git.tgz";
           sha256 = "0251r0mpjm0y3qsm4lm7ncvrkxvgwc53spdm1p2mpayhvkkqqsws";
           system = "cl-murmurhash";
           asd = "cl-murmurhash";
@@ -29965,7 +29965,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mustache" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mustache/2024-10-12/cl-mustache-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mustache/2024-10-12/cl-mustache-20241012-git.tgz";
           sha256 = "0isdrz1dgjvmfqvsgs2pmrran41w9n6f44r9fpdhdkjxa5zvy46b";
           system = "cl-mustache";
           asd = "cl-mustache";
@@ -29983,7 +29983,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mustache-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mustache/2024-10-12/cl-mustache-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mustache/2024-10-12/cl-mustache-20241012-git.tgz";
           sha256 = "0isdrz1dgjvmfqvsgs2pmrran41w9n6f44r9fpdhdkjxa5zvy46b";
           system = "cl-mustache-test";
           asd = "cl-mustache-test";
@@ -30007,7 +30007,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-muth" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-muth/2022-07-07/cl-muth-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-muth/2022-07-07/cl-muth-stable-git.tgz";
           sha256 = "0409arzy51chgi9anj9s2zn0qkx9wnphlbwcdvpamr4b51b60xjz";
           system = "cl-muth";
           asd = "cl-muth";
@@ -30033,7 +30033,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mw" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz";
           sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn";
           system = "cl-mw";
           asd = "cl-mw";
@@ -30059,7 +30059,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mw.examples.argument-processing" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz";
           sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn";
           system = "cl-mw.examples.argument-processing";
           asd = "cl-mw.examples.argument-processing";
@@ -30079,7 +30079,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mw.examples.hello-world" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz";
           sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn";
           system = "cl-mw.examples.hello-world";
           asd = "cl-mw.examples.hello-world";
@@ -30099,7 +30099,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mw.examples.higher-order" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz";
           sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn";
           system = "cl-mw.examples.higher-order";
           asd = "cl-mw.examples.higher-order";
@@ -30119,7 +30119,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mw.examples.monte-carlo-pi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz";
           sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn";
           system = "cl-mw.examples.monte-carlo-pi";
           asd = "cl-mw.examples.monte-carlo-pi";
@@ -30139,7 +30139,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mw.examples.ping" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz";
           sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn";
           system = "cl-mw.examples.ping";
           asd = "cl-mw.examples.ping";
@@ -30159,7 +30159,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mw.examples.with-task-policy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz";
           sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn";
           system = "cl-mw.examples.with-task-policy";
           asd = "cl-mw.examples.with-task-policy";
@@ -30179,7 +30179,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-myriam" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-myriam/2022-03-31/cl-myriam-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-myriam/2022-03-31/cl-myriam-20220331-git.tgz";
           sha256 = "0vyyyy6yj62id5m1a98rbq3pz7hm74znnawxh4apqhrff37xcs1l";
           system = "cl-myriam";
           asd = "cl-myriam";
@@ -30211,7 +30211,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mysql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mysql/2024-10-12/cl-mysql-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mysql/2024-10-12/cl-mysql-20241012-git.tgz";
           sha256 = "0ibxfjnvcgpibsfqjx2d3dcjcabiw6dj43vmr76b55fc4qlkjvz5";
           system = "cl-mysql";
           asd = "cl-mysql";
@@ -30229,7 +30229,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-mysql-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mysql/2024-10-12/cl-mysql-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mysql/2024-10-12/cl-mysql-20241012-git.tgz";
           sha256 = "0ibxfjnvcgpibsfqjx2d3dcjcabiw6dj43vmr76b55fc4qlkjvz5";
           system = "cl-mysql-test";
           asd = "cl-mysql-test";
@@ -30252,7 +30252,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-naive-deprecation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-naive-deprecation/2024-10-12/cl-naive-deprecation-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-naive-deprecation/2024-10-12/cl-naive-deprecation-20241012-git.tgz";
           sha256 = "17x6b5sr34qjfzbn2r6f5n4xa4p1qi438k792b48qiqnalkfp29m";
           system = "cl-naive-deprecation";
           asd = "cl-naive-deprecation";
@@ -30272,7 +30272,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-naive-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-naive-tests/2024-10-12/cl-naive-tests-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-naive-tests/2024-10-12/cl-naive-tests-20241012-git.tgz";
           sha256 = "1b7vvl5myybx92k778p3ca5367g4m6rh5k3rpr6qp9p4amd0yy2f";
           system = "cl-naive-tests";
           asd = "cl-naive-tests";
@@ -30292,7 +30292,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-naive-tests.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-naive-tests/2024-10-12/cl-naive-tests-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-naive-tests/2024-10-12/cl-naive-tests-20241012-git.tgz";
           sha256 = "1b7vvl5myybx92k778p3ca5367g4m6rh5k3rpr6qp9p4amd0yy2f";
           system = "cl-naive-tests.tests";
           asd = "cl-naive-tests.tests";
@@ -30312,7 +30312,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ncurses" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ncurses/2010-10-06/cl-ncurses_0.1.4.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ncurses/2010-10-06/cl-ncurses_0.1.4.tgz";
           sha256 = "1frcap93i4ni3d648rrbnjjpz7p4cxlv57mmzlpxpzchzbcga026";
           system = "cl-ncurses";
           asd = "cl-ncurses";
@@ -30332,7 +30332,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-neo4j" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-neo4j/2013-01-28/cl-neo4j-release-b8ad637a-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-neo4j/2013-01-28/cl-neo4j-release-b8ad637a-git.tgz";
           sha256 = "061xqjn08aqynfqygk48pwjp1d1mnhcb6fnl4lcfyw261dxsp871";
           system = "cl-neo4j";
           asd = "cl-neo4j";
@@ -30360,7 +30360,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-neo4j.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-neo4j/2013-01-28/cl-neo4j-release-b8ad637a-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-neo4j/2013-01-28/cl-neo4j-release-b8ad637a-git.tgz";
           sha256 = "061xqjn08aqynfqygk48pwjp1d1mnhcb6fnl4lcfyw261dxsp871";
           system = "cl-neo4j.tests";
           asd = "cl-neo4j";
@@ -30383,7 +30383,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-neovim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-neovim/2024-10-12/cl-neovim-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-neovim/2024-10-12/cl-neovim-20241012-git.tgz";
           sha256 = "1c72qy10kmccpfl90q4c0yinmy9z9mdqniqx24269h91xd3jyagc";
           system = "cl-neovim";
           asd = "cl-neovim";
@@ -30409,7 +30409,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-netpbm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-netpbm/2024-10-12/cl-netpbm-20241012-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-netpbm/2024-10-12/cl-netpbm-20241012-hg.tgz";
           sha256 = "16dv3d6x62vvc9wdvm2dc9mrm29ypzjzn2fvy46kl0h0wg7hjz92";
           system = "cl-netpbm";
           asd = "cl-netpbm";
@@ -30429,7 +30429,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-netstring+" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-netstring-plus/2015-07-09/cl-netstring-plus-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-netstring-plus/2015-07-09/cl-netstring-plus-20150709-git.tgz";
           sha256 = "03nxhgkab8lsx8mvavd4yny1894yxl5bllvqb12hyjdgg1v8whrr";
           system = "cl-netstring+";
           asd = "cl-netstring+";
@@ -30452,7 +30452,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-netstrings" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-netstrings/2012-10-13/cl-netstrings-20121013-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-netstrings/2012-10-13/cl-netstrings-20121013-git.tgz";
           sha256 = "1mprrb8i3fjpmw7w461ib8zrcjwx77sqwaxyqq7i8yqkbhk7p1ql";
           system = "cl-netstrings";
           asd = "cl-netstrings";
@@ -30475,7 +30475,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-notebook" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-notebook/2020-12-20/cl-notebook-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-notebook/2020-12-20/cl-notebook-20201220-git.tgz";
           sha256 = "0kg5wdclz9i64gcx27z5bs739hsvjrfl9kf1awi31x4142yxrva8";
           system = "cl-notebook";
           asd = "cl-notebook";
@@ -30508,7 +30508,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ntp-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ntp-client/2021-06-30/cl-ntp-client-20210630-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ntp-client/2021-06-30/cl-ntp-client-20210630-git.tgz";
           sha256 = "1mc16bvs0l8srnxjcjg4m192rw5waq291zks2jslxmxij0pa28cm";
           system = "cl-ntp-client";
           asd = "cl-ntp-client";
@@ -30531,7 +30531,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ntriples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ntriples/2019-03-07/cl-ntriples-20190307-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ntriples/2019-03-07/cl-ntriples-20190307-hg.tgz";
           sha256 = "0k8q2r2nxkgxp91398gb0iwfy9kd2mn519nxxa3zq831c433l2mq";
           system = "cl-ntriples";
           asd = "cl-ntriples";
@@ -30551,7 +30551,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-oauth" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-oauth/2015-08-04/cl-oauth-20150804-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-oauth/2015-08-04/cl-oauth-20150804-git.tgz";
           sha256 = "1q4r5i3099684q5x9wqddrm9g88qm16nnra9glvxngywfjc5zzkk";
           system = "cl-oauth";
           asd = "cl-oauth";
@@ -30584,7 +30584,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-oauth.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-oauth/2015-08-04/cl-oauth-20150804-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-oauth/2015-08-04/cl-oauth-20150804-git.tgz";
           sha256 = "1q4r5i3099684q5x9wqddrm9g88qm16nnra9glvxngywfjc5zzkk";
           system = "cl-oauth.tests";
           asd = "cl-oauth";
@@ -30607,7 +30607,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-oclapi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-oclapi/2018-08-31/cl-oclapi-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-oclapi/2018-08-31/cl-oclapi-20180831-git.tgz";
           sha256 = "0aix5ipw98fsnvg1w7qmrjbwgn70gn7vf5av21xsgblp2sd7w2aw";
           system = "cl-oclapi";
           asd = "cl-oclapi";
@@ -30632,7 +30632,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-oclapi-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-oclapi/2018-08-31/cl-oclapi-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-oclapi/2018-08-31/cl-oclapi-20180831-git.tgz";
           sha256 = "0aix5ipw98fsnvg1w7qmrjbwgn70gn7vf5av21xsgblp2sd7w2aw";
           system = "cl-oclapi-test";
           asd = "cl-oclapi-test";
@@ -30657,7 +30657,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-octet-streams" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-octet-streams/2020-12-20/cl-octet-streams-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-octet-streams/2020-12-20/cl-octet-streams-20201220-git.tgz";
           sha256 = "1hffh98bv4w5yrchagzwqrc43d2p473pvw7ka4kyyvhrr52dk2f8";
           system = "cl-octet-streams";
           asd = "cl-octet-streams";
@@ -30677,7 +30677,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ode/2016-06-28/cl-ode-20160628-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ode/2016-06-28/cl-ode-20160628-git.tgz";
           sha256 = "1pxm2pq0br0rhdfnvs5jqfkxfs8bc9wdqrzwyv83l8n7pax941b0";
           system = "cl-ode";
           asd = "cl-ode";
@@ -30697,7 +30697,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ohm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ohm/2018-02-28/cl-ohm-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ohm/2018-02-28/cl-ohm-20180228-git.tgz";
           sha256 = "00gdfsiba761gk7xw91wfnr9yv84maagf9idh55bk5bs4ws1ymyp";
           system = "cl-ohm";
           asd = "cl-ohm";
@@ -30721,7 +30721,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-oju" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-oju/2025-06-22/cl-oju-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-oju/2025-06-22/cl-oju-20250622-git.tgz";
           sha256 = "1gsi43fk1brh0is5k9ahwp3vshb63i8mizf2zshk231zd9rvp1ai";
           system = "cl-oju";
           asd = "cl-oju";
@@ -30741,7 +30741,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-olefs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-olefs/2015-07-09/cl-olefs-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-olefs/2015-07-09/cl-olefs-20150709-git.tgz";
           sha256 = "0cqna6zzfrjmsq17yc4wg204kr77riczqjpm1w5cj1mba43zcac7";
           system = "cl-olefs";
           asd = "cl-olefs";
@@ -30761,7 +30761,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-one-time-passwords" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-one-time-passwords/2017-10-19/cl-one-time-passwords-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-one-time-passwords/2017-10-19/cl-one-time-passwords-20171019-git.tgz";
           sha256 = "1nhq2jij257cfaadh9k421qaisicxpmx3wsc4kivf1psgbrc56lg";
           system = "cl-one-time-passwords";
           asd = "cl-one-time-passwords";
@@ -30781,7 +30781,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-one-time-passwords-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-one-time-passwords/2017-10-19/cl-one-time-passwords-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-one-time-passwords/2017-10-19/cl-one-time-passwords-20171019-git.tgz";
           sha256 = "1nhq2jij257cfaadh9k421qaisicxpmx3wsc4kivf1psgbrc56lg";
           system = "cl-one-time-passwords-test";
           asd = "cl-one-time-passwords-test";
@@ -30804,7 +30804,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-oneliner" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/oneliner/2013-10-03/oneliner-20131003-git.tgz";
+          url = "https://beta.quicklisp.org/archive/oneliner/2013-10-03/oneliner-20131003-git.tgz";
           sha256 = "0q9350s0r9yjmfc2360g35qi04b3867gd7hw5ada4176whinmjxb";
           system = "cl-oneliner";
           asd = "cl-oneliner";
@@ -30828,7 +30828,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-online-learning" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-online-learning/2022-03-31/cl-online-learning-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-online-learning/2022-03-31/cl-online-learning-20220331-git.tgz";
           sha256 = "136v9kxcy53qar2j4y38awnw2idnf0lwxqwx7wgak664w3hxs6k8";
           system = "cl-online-learning";
           asd = "cl-online-learning";
@@ -30851,7 +30851,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-online-learning-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-online-learning/2022-03-31/cl-online-learning-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-online-learning/2022-03-31/cl-online-learning-20220331-git.tgz";
           sha256 = "136v9kxcy53qar2j4y38awnw2idnf0lwxqwx7wgak664w3hxs6k8";
           system = "cl-online-learning-test";
           asd = "cl-online-learning-test";
@@ -30875,7 +30875,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-openal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz";
           sha256 = "0jmp81mf23ckcm4knnh0q7zpmyls5220imaqbmnl0xvvra10b1zy";
           system = "cl-openal";
           asd = "cl-openal";
@@ -30898,7 +30898,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-openal-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz";
           sha256 = "0jmp81mf23ckcm4knnh0q7zpmyls5220imaqbmnl0xvvra10b1zy";
           system = "cl-openal-examples";
           asd = "cl-openal-examples";
@@ -30923,7 +30923,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-opencl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opencl/2021-12-09/cl-opencl-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-opencl/2021-12-09/cl-opencl-20211209-git.tgz";
           sha256 = "1agg6rg7lsbq2jgarx25bwm1nw22jpl20bzhyn4ivygcgzp2mv29";
           system = "cl-opencl";
           asd = "cl-opencl";
@@ -30946,7 +30946,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-opencl-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opencl-utils/2023-02-14/cl-opencl-utils-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-opencl-utils/2023-02-14/cl-opencl-utils-20230214-git.tgz";
           sha256 = "17l4wsvhjj3zvhl5nsigh9fwnv7s7xiqfk2998gh86j32a02r95y";
           system = "cl-opencl-utils";
           asd = "cl-opencl-utils";
@@ -30966,7 +30966,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-opengl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-opengl/2025-06-22/cl-opengl-20250622-git.tgz";
           sha256 = "1ksm330gsw20ajcl1jri3s7ydmrkyqbmajmk4gp452nsgqm62axm";
           system = "cl-opengl";
           asd = "cl-opengl";
@@ -30990,7 +30990,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-opensearch-query-builder" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opensearch-query-builder/2024-10-12/cl-opensearch-query-builder-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-opensearch-query-builder/2024-10-12/cl-opensearch-query-builder-20241012-git.tgz";
           sha256 = "1pxlafahhgwyfhila0ikbpljcxgi59cqd2m6dvlib6ii90yq5dqx";
           system = "cl-opensearch-query-builder";
           asd = "cl-opensearch-query-builder";
@@ -31010,7 +31010,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-openstack-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-openstack-client/2019-10-07/cl-openstack-client-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-openstack-client/2019-10-07/cl-openstack-client-20191007-git.tgz";
           sha256 = "1sak75i82vn3acg7bxx8vjbw2y35wbq1vkh1yqhs68ksnph6d097";
           system = "cl-openstack-client";
           asd = "cl-openstack-client";
@@ -31036,7 +31036,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-openstack-client-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-openstack-client/2019-10-07/cl-openstack-client-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-openstack-client/2019-10-07/cl-openstack-client-20191007-git.tgz";
           sha256 = "1sak75i82vn3acg7bxx8vjbw2y35wbq1vkh1yqhs68ksnph6d097";
           system = "cl-openstack-client-test";
           asd = "cl-openstack-client-test";
@@ -31065,7 +31065,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-opsresearch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz";
           sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7";
           system = "cl-opsresearch";
           asd = "cl-opsresearch";
@@ -31085,7 +31085,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-opus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opus/2024-10-12/cl-opus-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-opus/2024-10-12/cl-opus-20241012-git.tgz";
           sha256 = "183xjlqjwildm1fb8piiic1f6l9fx4mxf9gcagpav8r60d1wmbpm";
           system = "cl-opus";
           asd = "cl-opus";
@@ -31111,7 +31111,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-org-mode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-org-mode/2010-12-07/cl-org-mode-20101207-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-org-mode/2010-12-07/cl-org-mode-20101207-git.tgz";
           sha256 = "1fvwl9jlbpd352b5zn2d45mabsim5xvzabwyz1h10hwv4gviymzf";
           system = "cl-org-mode";
           asd = "cl-org-mode";
@@ -31134,7 +31134,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-out123" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-out123/2025-06-22/cl-out123-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-out123/2025-06-22/cl-out123-20250622-git.tgz";
           sha256 = "1qsdp2pk1b4b3vfy0n7k70q1xa5kjkddsvf4lqw0lawh1m88mb9i";
           system = "cl-out123";
           asd = "cl-out123";
@@ -31160,7 +31160,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pack/2020-04-27/cl-pack-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pack/2020-04-27/cl-pack-20200427-git.tgz";
           sha256 = "0q7gawy0cwy49m1mxgj0jqnzzckk2ps74ncfaw1pqiqilfyx7np6";
           system = "cl-pack";
           asd = "cl-pack";
@@ -31180,7 +31180,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pack-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pack/2020-04-27/cl-pack-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pack/2020-04-27/cl-pack-20200427-git.tgz";
           sha256 = "0q7gawy0cwy49m1mxgj0jqnzzckk2ps74ncfaw1pqiqilfyx7np6";
           system = "cl-pack-test";
           asd = "cl-pack";
@@ -31200,7 +31200,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-package-locks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-package-locks/2011-12-03/cl-package-locks-20111203-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-package-locks/2011-12-03/cl-package-locks-20111203-git.tgz";
           sha256 = "0g3gfljnvpgd66ccd2sqawlkwqx4a0wsdrg5180va61w869cgxqq";
           system = "cl-package-locks";
           asd = "cl-package-locks";
@@ -31220,7 +31220,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pango" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pango/2017-04-03/cl-pango-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pango/2017-04-03/cl-pango-20170403-git.tgz";
           sha256 = "0zkn4yn8nkkjr0x1vcy856cvbmnyhdidqz0in8xvd2i93jvw5w0i";
           system = "cl-pango";
           asd = "cl-pango";
@@ -31242,7 +31242,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-parallel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-parallel/2013-03-12/cl-parallel-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-parallel/2013-03-12/cl-parallel-20130312-git.tgz";
           sha256 = "1hmkcbwkj7rx8zg5wf2w06nvbabldpr7hbbg1ycj0fss86s2cx2c";
           system = "cl-parallel";
           asd = "cl-parallel";
@@ -31262,7 +31262,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pass" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pass/2020-12-20/cl-pass-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pass/2020-12-20/cl-pass-20201220-git.tgz";
           sha256 = "05qx4jrkxqbqi72cxgswbpnifbdvp9mh7apc7566v522899bh0hb";
           system = "cl-pass";
           asd = "cl-pass";
@@ -31286,7 +31286,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pass-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pass/2020-12-20/cl-pass-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pass/2020-12-20/cl-pass-20201220-git.tgz";
           sha256 = "05qx4jrkxqbqi72cxgswbpnifbdvp9mh7apc7566v522899bh0hb";
           system = "cl-pass-test";
           asd = "cl-pass-test";
@@ -31309,7 +31309,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-paths" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz";
           sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5";
           system = "cl-paths";
           asd = "cl-paths";
@@ -31327,7 +31327,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-paths-ttf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz";
           sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5";
           system = "cl-paths-ttf";
           asd = "cl-paths-ttf";
@@ -31348,7 +31348,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pattern" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pattern/2014-07-13/cl-pattern-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pattern/2014-07-13/cl-pattern-20140713-git.tgz";
           sha256 = "0kc1yynn1ysa7bcaazhi1pq8l3hj3jq6p835kh5di7g1imrfkrny";
           system = "cl-pattern";
           asd = "cl-pattern";
@@ -31371,7 +31371,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pattern-benchmark" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pattern/2014-07-13/cl-pattern-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pattern/2014-07-13/cl-pattern-20140713-git.tgz";
           sha256 = "0kc1yynn1ysa7bcaazhi1pq8l3hj3jq6p835kh5di7g1imrfkrny";
           system = "cl-pattern-benchmark";
           asd = "cl-pattern-benchmark";
@@ -31391,7 +31391,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-patterns" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-patterns/2025-06-22/cl-patterns-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-patterns/2025-06-22/cl-patterns-20250622-git.tgz";
           sha256 = "0lp01gp0dnbryc35kkh33s6ifninw1w41n38mq9idgwk806ylr4j";
           system = "cl-patterns";
           asd = "cl-patterns";
@@ -31418,7 +31418,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-paymill" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-paymill/2013-11-11/cl-paymill-20131111-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-paymill/2013-11-11/cl-paymill-20131111-git.tgz";
           sha256 = "1dhddmw7gxfxbv1vfqi6nzyh8m5n3b160ch6ianf5sn6apmi92nw";
           system = "cl-paymill";
           asd = "cl-paymill";
@@ -31442,7 +31442,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-paypal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-paypal/2010-10-06/cl-paypal-20101006-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-paypal/2010-10-06/cl-paypal-20101006-git.tgz";
           sha256 = "0cc6zv17klgiyj1mbbrkbvajkr6dwsjv3iilh57vhdqd01lrhnb2";
           system = "cl-paypal";
           asd = "cl-paypal";
@@ -31466,7 +31466,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pcg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pcg/2020-10-16/cl-pcg-20201016-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pcg/2020-10-16/cl-pcg-20201016-hg.tgz";
           sha256 = "1w2b2y5fgjc6z8akvlmwasj90dnjv55nvb8pghq4xpv43hfy73mp";
           system = "cl-pcg";
           asd = "cl-pcg";
@@ -31486,7 +31486,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pcg.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pcg/2020-10-16/cl-pcg-20201016-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pcg/2020-10-16/cl-pcg-20201016-hg.tgz";
           sha256 = "1w2b2y5fgjc6z8akvlmwasj90dnjv55nvb8pghq4xpv43hfy73mp";
           system = "cl-pcg.test";
           asd = "cl-pcg.test";
@@ -31509,7 +31509,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pdf/2023-10-21/cl-pdf-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pdf/2023-10-21/cl-pdf-20231021-git.tgz";
           sha256 = "1x88fvk3kxi3k6a84iajb6myw67z8n3plfidq8d4c26ymiz0kvfm";
           system = "cl-pdf";
           asd = "cl-pdf";
@@ -31530,7 +31530,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pdf-doc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz";
           sha256 = "0fcs5mq0gxfczbrg7ay8r4bf5r4g6blvpdbjkhcl8dapcikyn35h";
           system = "cl-pdf-doc";
           asd = "cl-pdf-doc";
@@ -31553,7 +31553,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pdf-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pdf/2023-10-21/cl-pdf-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pdf/2023-10-21/cl-pdf-20231021-git.tgz";
           sha256 = "1x88fvk3kxi3k6a84iajb6myw67z8n3plfidq8d4c26ymiz0kvfm";
           system = "cl-pdf-parser";
           asd = "cl-pdf-parser";
@@ -31573,7 +31573,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-performance-tuning-helper" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-performance-tuning-helper/2013-06-15/cl-performance-tuning-helper-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-performance-tuning-helper/2013-06-15/cl-performance-tuning-helper-20130615-git.tgz";
           sha256 = "1j0k319il271grm6hjqq2bazp5l105lazayqsmpsy8lsy4lmy0c3";
           system = "cl-performance-tuning-helper";
           asd = "cl-performance-tuning-helper";
@@ -31593,7 +31593,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-performance-tuning-helper-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-performance-tuning-helper/2013-06-15/cl-performance-tuning-helper-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-performance-tuning-helper/2013-06-15/cl-performance-tuning-helper-20130615-git.tgz";
           sha256 = "1j0k319il271grm6hjqq2bazp5l105lazayqsmpsy8lsy4lmy0c3";
           system = "cl-performance-tuning-helper-test";
           asd = "cl-performance-tuning-helper-test";
@@ -31616,7 +31616,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-permutation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-permutation/2023-10-21/cl-permutation-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-permutation/2023-10-21/cl-permutation-20231021-git.tgz";
           sha256 = "1zq7hjfn854jr1sglagvdpn749ihxki0l1wcbg9nd2i7ds1g5h4y";
           system = "cl-permutation";
           asd = "cl-permutation";
@@ -31644,7 +31644,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-permutation-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-permutation/2023-10-21/cl-permutation-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-permutation/2023-10-21/cl-permutation-20231021-git.tgz";
           sha256 = "1zq7hjfn854jr1sglagvdpn749ihxki0l1wcbg9nd2i7ds1g5h4y";
           system = "cl-permutation-examples";
           asd = "cl-permutation-examples";
@@ -31667,7 +31667,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-permutation-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-permutation/2023-10-21/cl-permutation-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-permutation/2023-10-21/cl-permutation-20231021-git.tgz";
           sha256 = "1zq7hjfn854jr1sglagvdpn749ihxki0l1wcbg9nd2i7ds1g5h4y";
           system = "cl-permutation-tests";
           asd = "cl-permutation-tests";
@@ -31691,7 +31691,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-photo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-photo/2015-09-23/cl-photo-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-photo/2015-09-23/cl-photo-20150923-git.tgz";
           sha256 = "03rzsi1rqvlnw43z7kh5sy1h8gjxc5n0cfryfkkqnhym9q9186mj";
           system = "cl-photo";
           asd = "cl-photo";
@@ -31711,7 +31711,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-photo-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-photo/2015-09-23/cl-photo-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-photo/2015-09-23/cl-photo-20150923-git.tgz";
           sha256 = "03rzsi1rqvlnw43z7kh5sy1h8gjxc5n0cfryfkkqnhym9q9186mj";
           system = "cl-photo-tests";
           asd = "cl-photo-tests";
@@ -31734,7 +31734,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-plplot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-plplot/2018-02-28/cl-plplot-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-plplot/2018-02-28/cl-plplot-20180228-git.tgz";
           sha256 = "0hfgq47ga2r764jfc3ywaz5ynnvp701fjhbw0s4j1mrw4gaf6y6w";
           system = "cl-plplot";
           asd = "cl-plplot";
@@ -31754,7 +31754,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-plumbing" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-plumbing/2018-10-18/cl-plumbing-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-plumbing/2018-10-18/cl-plumbing-20181018-git.tgz";
           sha256 = "0bc4qqj0c4hghwx8jm3vg422c3i8livv3vvzfzi0gw79khaqdiyr";
           system = "cl-plumbing";
           asd = "cl-plumbing";
@@ -31778,7 +31778,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-plumbing-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-plumbing/2018-10-18/cl-plumbing-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-plumbing/2018-10-18/cl-plumbing-20181018-git.tgz";
           sha256 = "0bc4qqj0c4hghwx8jm3vg422c3i8livv3vvzfzi0gw79khaqdiyr";
           system = "cl-plumbing-test";
           asd = "cl-plumbing-test";
@@ -31802,7 +31802,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-plus-c" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz";
           sha256 = "1sfvhyrwm9dhxi0y42xp7mx8mvs6lmq3bzxdx34frxni5srcgly0";
           system = "cl-plus-c";
           asd = "cl-plus-c";
@@ -31822,7 +31822,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-plus-ssl-osx-fix" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz";
           sha256 = "00ian3xkchag5c3acwjrn42g2vp19rwfvcfhslri4fdns769myp1";
           system = "cl-plus-ssl-osx-fix";
           asd = "cl-plus-ssl-osx-fix";
@@ -31845,7 +31845,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-plus-ssl-osx-fix-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz";
           sha256 = "00ian3xkchag5c3acwjrn42g2vp19rwfvcfhslri4fdns769myp1";
           system = "cl-plus-ssl-osx-fix-ci";
           asd = "cl-plus-ssl-osx-fix-ci";
@@ -31865,7 +31865,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-plus-ssl-osx-fix-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz";
           sha256 = "00ian3xkchag5c3acwjrn42g2vp19rwfvcfhslri4fdns769myp1";
           system = "cl-plus-ssl-osx-fix-docs";
           asd = "cl-plus-ssl-osx-fix-docs";
@@ -31891,7 +31891,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-plus-ssl-osx-fix-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2025-06-22/cl-plus-ssl-osx-fix-20250622-git.tgz";
           sha256 = "00ian3xkchag5c3acwjrn42g2vp19rwfvcfhslri4fdns769myp1";
           system = "cl-plus-ssl-osx-fix-tests";
           asd = "cl-plus-ssl-osx-fix-tests";
@@ -31911,7 +31911,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ply" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ply/2015-05-05/cl-ply-20150505-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ply/2015-05-05/cl-ply-20150505-git.tgz";
           sha256 = "1va3il5ahvziwm6i3f2zy3vchv0qkh1l7jci7gnfam43gf88fl12";
           system = "cl-ply";
           asd = "cl-ply";
@@ -31934,7 +31934,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ply-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ply/2015-05-05/cl-ply-20150505-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ply/2015-05-05/cl-ply-20150505-git.tgz";
           sha256 = "1va3il5ahvziwm6i3f2zy3vchv0qkh1l7jci7gnfam43gf88fl12";
           system = "cl-ply-test";
           asd = "cl-ply-test";
@@ -31958,7 +31958,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-poker-eval" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-poker-eval/2015-08-04/cl-poker-eval-20150804-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-poker-eval/2015-08-04/cl-poker-eval-20150804-git.tgz";
           sha256 = "1w4dsr4j7r3n7p0jbp8ccwwk83wcjjiz1rhhfrqpsd9v263v7kw8";
           system = "cl-poker-eval";
           asd = "cl-poker-eval";
@@ -31978,7 +31978,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pop" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pop/2011-04-18/cl-pop-20110418-http.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pop/2011-04-18/cl-pop-20110418-http.tgz";
           sha256 = "1g47p9w2pzf7glx92cz859di9pz454xpaq97p76lcvyilxk6q819";
           system = "cl-pop";
           asd = "cl-pop";
@@ -32001,7 +32001,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-portaudio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-portaudio/2020-12-20/cl-portaudio-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-portaudio/2020-12-20/cl-portaudio-20201220-git.tgz";
           sha256 = "177c6bgf30caj5qpzfnzhbamax7c5zm2p4911mw7fay94vjs7zyb";
           system = "cl-portaudio";
           asd = "cl-portaudio";
@@ -32024,7 +32024,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-postgres" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz";
           sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb";
           system = "cl-postgres";
           asd = "cl-postgres";
@@ -32048,7 +32048,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-postgres+local-time" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/local-time/2025-06-22/local-time-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/local-time/2025-06-22/local-time-20250622-git.tgz";
           sha256 = "1xdxm1js8n1b3k0g013s810hzf7jr6yhapyvj9agfyl7b6knj0kg";
           system = "cl-postgres+local-time";
           asd = "cl-postgres+local-time";
@@ -32069,7 +32069,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-postgres+local-time-duration" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/local-time-duration/2018-04-30/local-time-duration-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/local-time-duration/2018-04-30/local-time-duration-20180430-git.tgz";
           sha256 = "0f13mg18lv31lclz9jvqyj8d85p1jj1366nlld8m3dxnnwsbbkd6";
           system = "cl-postgres+local-time-duration";
           asd = "cl-postgres+local-time-duration";
@@ -32092,7 +32092,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-postgres-datetime" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-postgres-datetime/2019-05-21/cl-postgres-datetime-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-postgres-datetime/2019-05-21/cl-postgres-datetime-20190521-git.tgz";
           sha256 = "1vwv5j1i968927j070bagqx9i114a8phmx7k9ankj9j5zg5dj0l3";
           system = "cl-postgres-datetime";
           asd = "cl-postgres-datetime";
@@ -32116,7 +32116,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-postgres-plus-uuid" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-postgres-plus-uuid/2018-10-18/cl-postgres-plus-uuid-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-postgres-plus-uuid/2018-10-18/cl-postgres-plus-uuid-20181018-git.tgz";
           sha256 = "1iw11v67gpwgpa5dw3d7chjmkc4d7sdwrqvnx0vg0m2qf4j7azmi";
           system = "cl-postgres-plus-uuid";
           asd = "cl-postgres-plus-uuid";
@@ -32139,7 +32139,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ppcre" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ppcre/2025-06-22/cl-ppcre-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ppcre/2025-06-22/cl-ppcre-20250622-git.tgz";
           sha256 = "0f7sh2pr81pkfx0d348shqjp21qj7px1k310dfmyjb4y40kq2kxn";
           system = "cl-ppcre";
           asd = "cl-ppcre";
@@ -32157,7 +32157,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ppcre-template" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz";
           sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r";
           system = "cl-ppcre-template";
           asd = "cl-ppcre-template";
@@ -32178,7 +32178,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ppcre-unicode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ppcre/2025-06-22/cl-ppcre-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ppcre/2025-06-22/cl-ppcre-20250622-git.tgz";
           sha256 = "0f7sh2pr81pkfx0d348shqjp21qj7px1k310dfmyjb4y40kq2kxn";
           system = "cl-ppcre-unicode";
           asd = "cl-ppcre-unicode";
@@ -32199,7 +32199,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prevalence" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prevalence/2025-06-22/cl-prevalence-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prevalence/2025-06-22/cl-prevalence-20250622-git.tgz";
           sha256 = "0j5rplbx1lcm52y3jl86ji4kpc4jz6zznk25dc2m30ac16cqiavs";
           system = "cl-prevalence";
           asd = "cl-prevalence";
@@ -32221,7 +32221,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prevalence-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prevalence/2025-06-22/cl-prevalence-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prevalence/2025-06-22/cl-prevalence-20250622-git.tgz";
           sha256 = "0j5rplbx1lcm52y3jl86ji4kpc4jz6zznk25dc2m30ac16cqiavs";
           system = "cl-prevalence-ci";
           asd = "cl-prevalence-ci";
@@ -32241,7 +32241,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prevalence-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prevalence/2025-06-22/cl-prevalence-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prevalence/2025-06-22/cl-prevalence-20250622-git.tgz";
           sha256 = "0j5rplbx1lcm52y3jl86ji4kpc4jz6zznk25dc2m30ac16cqiavs";
           system = "cl-prevalence-test";
           asd = "cl-prevalence-test";
@@ -32265,7 +32265,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-primality" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-primality/2015-06-08/cl-primality-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-primality/2015-06-08/cl-primality-20150608-git.tgz";
           sha256 = "1hvbsd5x7yrrrh7jjq0p8ign3ppzzpacmmz7nps60wgk38q1b618";
           system = "cl-primality";
           asd = "cl-primality";
@@ -32285,7 +32285,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-primality-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-primality/2015-06-08/cl-primality-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-primality/2015-06-08/cl-primality-20150608-git.tgz";
           sha256 = "1hvbsd5x7yrrrh7jjq0p8ign3ppzzpacmmz7nps60wgk38q1b618";
           system = "cl-primality-test";
           asd = "cl-primality-test";
@@ -32309,7 +32309,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prime-maker" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prime-maker/2015-03-02/cl-prime-maker-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prime-maker/2015-03-02/cl-prime-maker-20150302-git.tgz";
           sha256 = "0hs95zs990aiwspss2dzmjvl18ipvlkx3p9cgmcncqxhgkizds9s";
           system = "cl-prime-maker";
           asd = "cl-prime-maker";
@@ -32329,7 +32329,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-progress-bar" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-progress-bar/2021-12-09/cl-progress-bar-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-progress-bar/2021-12-09/cl-progress-bar-20211209-git.tgz";
           sha256 = "1y4kg4qb4bxkqnc84mczx5fhqlr6qbagxwsn93xrilv8lqg8ymiv";
           system = "cl-progress-bar";
           asd = "cl-progress-bar";
@@ -32352,7 +32352,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-project" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-project/2024-10-12/cl-project-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-project/2024-10-12/cl-project-20241012-git.tgz";
           sha256 = "12bvhs1ll6wxwgarvyxbrm978jxpvgj9vyqcbnwqmf5kqxjlrh0j";
           system = "cl-project";
           asd = "cl-project";
@@ -32377,7 +32377,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-project-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-project/2024-10-12/cl-project-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-project/2024-10-12/cl-project-20241012-git.tgz";
           sha256 = "12bvhs1ll6wxwgarvyxbrm978jxpvgj9vyqcbnwqmf5kqxjlrh0j";
           system = "cl-project-test";
           asd = "cl-project-test";
@@ -32402,7 +32402,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prolog2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
           sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg";
           system = "cl-prolog2";
           asd = "cl-prolog2";
@@ -32428,7 +32428,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prolog2.bprolog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
           sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg";
           system = "cl-prolog2.bprolog";
           asd = "cl-prolog2.bprolog";
@@ -32448,7 +32448,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prolog2.bprolog.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
           sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg";
           system = "cl-prolog2.bprolog.test";
           asd = "cl-prolog2.bprolog.test";
@@ -32471,7 +32471,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prolog2.gprolog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
           sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg";
           system = "cl-prolog2.gprolog";
           asd = "cl-prolog2.gprolog";
@@ -32491,7 +32491,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prolog2.gprolog.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
           sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg";
           system = "cl-prolog2.gprolog.test";
           asd = "cl-prolog2.gprolog.test";
@@ -32514,7 +32514,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prolog2.swi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
           sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg";
           system = "cl-prolog2.swi";
           asd = "cl-prolog2.swi";
@@ -32534,7 +32534,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prolog2.swi.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
           sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg";
           system = "cl-prolog2.swi.test";
           asd = "cl-prolog2.swi.test";
@@ -32557,7 +32557,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prolog2.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
           sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg";
           system = "cl-prolog2.test";
           asd = "cl-prolog2.test";
@@ -32581,7 +32581,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prolog2.xsb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
           sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg";
           system = "cl-prolog2.xsb";
           asd = "cl-prolog2.xsb";
@@ -32601,7 +32601,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prolog2.xsb.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
           sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg";
           system = "cl-prolog2.xsb.test";
           asd = "cl-prolog2.xsb.test";
@@ -32624,7 +32624,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prolog2.yap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
           sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg";
           system = "cl-prolog2.yap";
           asd = "cl-prolog2.yap";
@@ -32644,7 +32644,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-prolog2.yap.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz";
           sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg";
           system = "cl-prolog2.yap.test";
           asd = "cl-prolog2.yap.test";
@@ -32667,7 +32667,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-protobufs.asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-protobufs/2025-06-22/cl-protobufs-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-protobufs/2025-06-22/cl-protobufs-20250622-git.tgz";
           sha256 = "0kxryqk283qm7shrx7swiqkmv7kj1lawjlrz9pdqbci2fcs763kj";
           system = "cl-protobufs.asdf";
           asd = "cl-protobufs.asdf";
@@ -32687,7 +32687,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pslib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pslib/2024-10-12/cl-pslib-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pslib/2024-10-12/cl-pslib-20241012-git.tgz";
           sha256 = "12lg64nbjkxmaf212qr4i0msnsixc2cbqmxkdgqjii9rsyqdvrn6";
           system = "cl-pslib";
           asd = "cl-pslib";
@@ -32712,7 +32712,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-pslib-barcode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pslib-barcode/2024-10-12/cl-pslib-barcode-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pslib-barcode/2024-10-12/cl-pslib-barcode-20241012-git.tgz";
           sha256 = "1n17yv7qr6i6dhbjrcc1binlxxkc1p5blj9nwn6g26fyvakgwrsb";
           system = "cl-pslib-barcode";
           asd = "cl-pslib-barcode";
@@ -32738,7 +32738,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-punch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-punch/2019-01-07/cl-punch-20190107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-punch/2019-01-07/cl-punch-20190107-git.tgz";
           sha256 = "1sjgwn6c77n8pgs0rrw70xfl18rps6a0dlf2chfsbgk8shz6qyl2";
           system = "cl-punch";
           asd = "cl-punch";
@@ -32758,7 +32758,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-punch-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-punch/2019-01-07/cl-punch-20190107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-punch/2019-01-07/cl-punch-20190107-git.tgz";
           sha256 = "1sjgwn6c77n8pgs0rrw70xfl18rps6a0dlf2chfsbgk8shz6qyl2";
           system = "cl-punch-test";
           asd = "cl-punch-test";
@@ -32782,7 +32782,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-qoa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-qoa/2024-10-12/cl-qoa-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-qoa/2024-10-12/cl-qoa-20241012-git.tgz";
           sha256 = "0gxrra0mvvkyvhvg7cc4bvi3nwdsnx0dbjszp41ch6dsdhd3pcpy";
           system = "cl-qoa";
           asd = "cl-qoa";
@@ -32805,7 +32805,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-qprint" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz";
           sha256 = "099h0rrdzxnlmn8avi72mg2dl0kccp7w01b2p9nwyy4b8yr32cir";
           system = "cl-qprint";
           asd = "cl-qprint";
@@ -32823,7 +32823,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-qrencode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-qrencode/2019-10-07/cl-qrencode-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-qrencode/2019-10-07/cl-qrencode-20191007-git.tgz";
           sha256 = "1l5k131dchbf6cj8a8xqa731790p01p3qa1kdy2wa9dawy3ymkxr";
           system = "cl-qrencode";
           asd = "cl-qrencode";
@@ -32841,7 +32841,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-qrencode-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-qrencode/2019-10-07/cl-qrencode-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-qrencode/2019-10-07/cl-qrencode-20191007-git.tgz";
           sha256 = "1l5k131dchbf6cj8a8xqa731790p01p3qa1kdy2wa9dawy3ymkxr";
           system = "cl-qrencode-test";
           asd = "cl-qrencode-test";
@@ -32864,7 +32864,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-quickcheck" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-quickcheck/2020-06-10/cl-quickcheck-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-quickcheck/2020-06-10/cl-quickcheck-20200610-git.tgz";
           sha256 = "0cfyxbdhklvdk3qdzyxxaq9q6cxnsvqjfi86nay1vc7h6ziysb60";
           system = "cl-quickcheck";
           asd = "cl-quickcheck";
@@ -32884,7 +32884,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rabbit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rabbit/2021-04-11/cl-rabbit-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rabbit/2021-04-11/cl-rabbit-20210411-git.tgz";
           sha256 = "1q1mhqxqvxbr6ak7j0ym6mjhhq6r0pqk1l7az9hfajmqmw3xfija";
           system = "cl-rabbit";
           asd = "cl-rabbit";
@@ -32911,7 +32911,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rabbit-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rabbit/2021-04-11/cl-rabbit-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rabbit/2021-04-11/cl-rabbit-20210411-git.tgz";
           sha256 = "1q1mhqxqvxbr6ak7j0ym6mjhhq6r0pqk1l7az9hfajmqmw3xfija";
           system = "cl-rabbit-tests";
           asd = "cl-rabbit-tests";
@@ -32934,7 +32934,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-randist" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-randist/2022-11-06/cl-randist-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-randist/2022-11-06/cl-randist-20221106-git.tgz";
           sha256 = "1r0d76n5zjqg5fb2ypqx5i1wg4hsg5g0c126ylqb28wdaf2yjz5a";
           system = "cl-randist";
           asd = "cl-randist";
@@ -32954,7 +32954,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-random-forest" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-random-forest/2022-11-06/cl-random-forest-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-random-forest/2022-11-06/cl-random-forest-20221106-git.tgz";
           sha256 = "0jn5f3s1zvjql35c4m67lqc0vjr7sm7kzf8w4jfbfabcnxf3y6jx";
           system = "cl-random-forest";
           asd = "cl-random-forest";
@@ -32979,7 +32979,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-random-forest-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-random-forest/2022-11-06/cl-random-forest-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-random-forest/2022-11-06/cl-random-forest-20221106-git.tgz";
           sha256 = "0jn5f3s1zvjql35c4m67lqc0vjr7sm7kzf8w4jfbfabcnxf3y6jx";
           system = "cl-random-forest-test";
           asd = "cl-random-forest-test";
@@ -33004,7 +33004,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rdfxml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rdfxml/2014-07-13/cl-rdfxml-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rdfxml/2014-07-13/cl-rdfxml-20140713-git.tgz";
           sha256 = "09v76qg6l3y1llapnkfqrfgib67h7lpkzrdmfimwk49bi80iii8v";
           system = "cl-rdfxml";
           asd = "cl-rdfxml";
@@ -33027,7 +33027,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rdkafka" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rdkafka/2025-06-22/cl-rdkafka-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rdkafka/2025-06-22/cl-rdkafka-20250622-git.tgz";
           sha256 = "1pjpbpl0biyiv63zxm4x3zb3wc7gzag4axnv5rwgg5pa8vqhkdhl";
           system = "cl-rdkafka";
           asd = "cl-rdkafka";
@@ -33054,7 +33054,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-readline" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-readline/2025-06-22/cl-readline-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-readline/2025-06-22/cl-readline-20250622-git.tgz";
           sha256 = "0kimc1blxlza438125qipqaa1ia0r7jwz5jsahmxqc17cmlkby4k";
           system = "cl-readline";
           asd = "cl-readline";
@@ -33075,7 +33075,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-recaptcha" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-recaptcha/2015-06-08/cl-recaptcha-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-recaptcha/2015-06-08/cl-recaptcha-20150608-git.tgz";
           sha256 = "09qdmzbhc5hikay31mbsfd7dps72rm4gcdbbi0b6gkb6qbia6m71";
           system = "cl-recaptcha";
           asd = "cl-recaptcha";
@@ -33100,7 +33100,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-reddit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-reddit/2024-10-12/cl-reddit-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-reddit/2024-10-12/cl-reddit-20241012-git.tgz";
           sha256 = "0jnc88mdz7hsmsncqrqmc8m8f1yd3n9087750kqpnn1sp1cwskk1";
           system = "cl-reddit";
           asd = "cl-reddit";
@@ -33123,7 +33123,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-redis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-redis/2025-06-22/cl-redis-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-redis/2025-06-22/cl-redis-20250622-git.tgz";
           sha256 = "1jb82zpiwx7ri86z0xqdynr3m40jnlzinyc0b47lvpbqs7cydrrg";
           system = "cl-redis";
           asd = "cl-redis";
@@ -33151,7 +33151,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-redis-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-redis/2025-06-22/cl-redis-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-redis/2025-06-22/cl-redis-20250622-git.tgz";
           sha256 = "1jb82zpiwx7ri86z0xqdynr3m40jnlzinyc0b47lvpbqs7cydrrg";
           system = "cl-redis-test";
           asd = "cl-redis";
@@ -33176,7 +33176,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-reexport" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz";
           sha256 = "02la6z3ickhmh2m87ymm2ijh9nkn7l6slskj99l8a1rhps394qqc";
           system = "cl-reexport";
           asd = "cl-reexport";
@@ -33194,7 +33194,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-reexport-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz";
           sha256 = "02la6z3ickhmh2m87ymm2ijh9nkn7l6slskj99l8a1rhps394qqc";
           system = "cl-reexport-test";
           asd = "cl-reexport-test";
@@ -33217,7 +33217,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-renderdoc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-renderdoc/2020-09-25/cl-renderdoc-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-renderdoc/2020-09-25/cl-renderdoc-20200925-git.tgz";
           sha256 = "0rrcp4y1f07x8h0ikvf5ncc3pbqj6vaciblab9qghmgdglnn7akx";
           system = "cl-renderdoc";
           asd = "cl-renderdoc";
@@ -33237,7 +33237,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-replica" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-replica/2023-06-18/cl-replica-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-replica/2023-06-18/cl-replica-20230618-git.tgz";
           sha256 = "06nywqz7il4dk79s3ga8115s5cr9bpz1fh8b7jms5wxlc1h5p0mn";
           system = "cl-replica";
           asd = "cl-replica";
@@ -33257,7 +33257,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-resvg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-resvg/2025-06-22/cl-resvg-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-resvg/2025-06-22/cl-resvg-20250622-git.tgz";
           sha256 = "0i0ji3zylcpy25sa8an1s14rpqc7xl0058xm0gr9fmwgiglx3jvi";
           system = "cl-resvg";
           asd = "cl-resvg";
@@ -33282,7 +33282,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rethinkdb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rethinkdb/2016-08-25/cl-rethinkdb-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rethinkdb/2016-08-25/cl-rethinkdb-20160825-git.tgz";
           sha256 = "0sps1p203gn7i123w96pj5ggpncmkngkfdb6zfnm5yjq544sjjf7";
           system = "cl-rethinkdb";
           asd = "cl-rethinkdb";
@@ -33313,7 +33313,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rethinkdb-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rethinkdb/2016-08-25/cl-rethinkdb-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rethinkdb/2016-08-25/cl-rethinkdb-20160825-git.tgz";
           sha256 = "0sps1p203gn7i123w96pj5ggpncmkngkfdb6zfnm5yjq544sjjf7";
           system = "cl-rethinkdb-test";
           asd = "cl-rethinkdb-test";
@@ -33339,7 +33339,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rfc2047" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rfc2047/2015-08-04/cl-rfc2047-20150804-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rfc2047/2015-08-04/cl-rfc2047-20150804-git.tgz";
           sha256 = "1kh48p5i7lmv1hcdsddlcjavhai9gi54jndnbpm9r55a6ladi8gv";
           system = "cl-rfc2047";
           asd = "cl-rfc2047";
@@ -33362,7 +33362,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rfc2047-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rfc2047/2015-08-04/cl-rfc2047-20150804-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rfc2047/2015-08-04/cl-rfc2047-20150804-git.tgz";
           sha256 = "1kh48p5i7lmv1hcdsddlcjavhai9gi54jndnbpm9r55a6ladi8gv";
           system = "cl-rfc2047-test";
           asd = "cl-rfc2047-test";
@@ -33386,7 +33386,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rfc4251" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rfc4251/2023-10-21/cl-rfc4251-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rfc4251/2023-10-21/cl-rfc4251-20231021-git.tgz";
           sha256 = "11xz6w1gvyj5a01yjfy52byfrq6v8k1mzkp3wajhzhg60nkhn4jh";
           system = "cl-rfc4251";
           asd = "cl-rfc4251";
@@ -33406,7 +33406,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rfc4251.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rfc4251/2023-10-21/cl-rfc4251-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rfc4251/2023-10-21/cl-rfc4251-20231021-git.tgz";
           sha256 = "11xz6w1gvyj5a01yjfy52byfrq6v8k1mzkp3wajhzhg60nkhn4jh";
           system = "cl-rfc4251.test";
           asd = "cl-rfc4251.test";
@@ -33429,7 +33429,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-riff" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-riff/2022-07-07/cl-riff-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-riff/2022-07-07/cl-riff-20220707-git.tgz";
           sha256 = "0b2j6yw3xkv6611snn7cy56vmnjfgi58wyvfr9lx82xkakd9rw3z";
           system = "cl-riff";
           asd = "cl-riff";
@@ -33449,7 +33449,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rlimit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rlimit/2015-06-08/cl-rlimit-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rlimit/2015-06-08/cl-rlimit-20150608-git.tgz";
           sha256 = "19p02r380qhs76qlcb3jp4lm4nsnpy7zch01fdiwn7l7xgxkzxh0";
           system = "cl-rlimit";
           asd = "cl-rlimit";
@@ -33472,7 +33472,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rmath" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rmath/2018-03-28/cl-rmath-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rmath/2018-03-28/cl-rmath-20180328-git.tgz";
           sha256 = "1ld8vbpy10paymx2hn0mcgd21i7cjhdrayln1jx0kayqxm12mmk4";
           system = "cl-rmath";
           asd = "cl-rmath";
@@ -33492,7 +33492,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-robdd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "cl-robdd";
           asd = "cl-robdd";
@@ -33512,7 +33512,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-robdd-analysis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "cl-robdd-analysis";
           asd = "cl-robdd-analysis";
@@ -33536,7 +33536,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-robdd-analysis-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "cl-robdd-analysis-test";
           asd = "cl-robdd-analysis-test";
@@ -33560,7 +33560,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-robdd-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "cl-robdd-test";
           asd = "cl-robdd-test";
@@ -33585,7 +33585,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rrd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rrd/2013-01-28/cl-rrd-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rrd/2013-01-28/cl-rrd-20130128-git.tgz";
           sha256 = "0a7fs46q41qzi6k8q9lvxryn2m90vamcsw7vl9kcjivyckjqrsm2";
           system = "cl-rrd";
           asd = "cl-rrd";
@@ -33605,7 +33605,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rrt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz";
           sha256 = "0lf1dvw5j9awy7ic1i4j5wd7657a170ywxihinmsdn4bwd4fynv0";
           system = "cl-rrt";
           asd = "cl-rrt";
@@ -33630,7 +33630,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rrt.benchmark" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz";
           sha256 = "0lf1dvw5j9awy7ic1i4j5wd7657a170ywxihinmsdn4bwd4fynv0";
           system = "cl-rrt.benchmark";
           asd = "cl-rrt.benchmark";
@@ -33656,7 +33656,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rrt.rtree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz";
           sha256 = "0lf1dvw5j9awy7ic1i4j5wd7657a170ywxihinmsdn4bwd4fynv0";
           system = "cl-rrt.rtree";
           asd = "cl-rrt.rtree";
@@ -33685,7 +33685,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rrt.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz";
           sha256 = "0lf1dvw5j9awy7ic1i4j5wd7657a170ywxihinmsdn4bwd4fynv0";
           system = "cl-rrt.test";
           asd = "cl-rrt.test";
@@ -33710,7 +33710,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rsvg2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz";
           sha256 = "1amq4q27lj0nzffvwmqrkg8v9pdcf0281zzrvxl9w6vdm9qy1v3n";
           system = "cl-rsvg2";
           asd = "cl-rsvg2";
@@ -33733,7 +33733,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rsvg2-pixbuf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz";
           sha256 = "1amq4q27lj0nzffvwmqrkg8v9pdcf0281zzrvxl9w6vdm9qy1v3n";
           system = "cl-rsvg2-pixbuf";
           asd = "cl-rsvg2-pixbuf";
@@ -33756,7 +33756,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rsvg2-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz";
           sha256 = "1amq4q27lj0nzffvwmqrkg8v9pdcf0281zzrvxl9w6vdm9qy1v3n";
           system = "cl-rsvg2-test";
           asd = "cl-rsvg2-test";
@@ -33780,7 +33780,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rules" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rules/2019-07-10/cl-rules-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rules/2019-07-10/cl-rules-20190710-git.tgz";
           sha256 = "0jidck62n0jkfqwrpqjn43zmjb3jlfaxxhn2lsyfwy2740i8ppr1";
           system = "cl-rules";
           asd = "cl-rules";
@@ -33803,7 +33803,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-rules-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rules/2019-07-10/cl-rules-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rules/2019-07-10/cl-rules-20190710-git.tgz";
           sha256 = "0jidck62n0jkfqwrpqjn43zmjb3jlfaxxhn2lsyfwy2740i8ppr1";
           system = "cl-rules-test";
           asd = "cl-rules-test";
@@ -33827,7 +33827,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-s3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-s3/2013-01-28/cl-s3-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-s3/2013-01-28/cl-s3-20130128-git.tgz";
           sha256 = "1lbvf7phkm5vjk013p484rh4vh33i58jlqq3z4cv2yxqcw6r639d";
           system = "cl-s3";
           asd = "cl-s3";
@@ -33853,7 +33853,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sam" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sam/2015-06-08/cl-sam-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sam/2015-06-08/cl-sam-20150608-git.tgz";
           sha256 = "0frrxz70jin4sa5n087zm4ikckf1zdjqqpjq3llrv46753c62fc6";
           system = "cl-sam";
           asd = "cl-sam";
@@ -33877,7 +33877,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sam-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sam/2015-06-08/cl-sam-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sam/2015-06-08/cl-sam-20150608-git.tgz";
           sha256 = "0frrxz70jin4sa5n087zm4ikckf1zdjqqpjq3llrv46753c62fc6";
           system = "cl-sam-test";
           asd = "cl-sam-test";
@@ -33901,7 +33901,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sandbox" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sandbox/2018-01-31/cl-sandbox-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sandbox/2018-01-31/cl-sandbox-20180131-git.tgz";
           sha256 = "053zxy3zi5jvlbg8zxlf922sxb32mq34zvwfhgpj4rcmgvgmqnxv";
           system = "cl-sandbox";
           asd = "cl-sandbox";
@@ -33921,7 +33921,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sasl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sasl/2019-05-21/cl-sasl-v0.3.2.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sasl/2019-05-21/cl-sasl-v0.3.2.tgz";
           sha256 = "0a05q8rls2hn46rbbk6w5km9kqvhsj365zlw6hp32724xy2nd98w";
           system = "cl-sasl";
           asd = "cl-sasl";
@@ -33941,7 +33941,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sat/2022-07-07/cl-sat-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sat/2022-07-07/cl-sat-20220707-git.tgz";
           sha256 = "1fcvxpmja757vyyhcpb00g150dyx90jsg9z8s596vy1nb0z81f49";
           system = "cl-sat";
           asd = "cl-sat";
@@ -33964,7 +33964,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sat.glucose" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sat.glucose/2022-03-31/cl-sat.glucose-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sat.glucose/2022-03-31/cl-sat.glucose-20220331-git.tgz";
           sha256 = "11hbhsjzw3xzz6i6niisk5h271kg52y3y77sl6ljnszfgp9xjfxy";
           system = "cl-sat.glucose";
           asd = "cl-sat.glucose";
@@ -33988,7 +33988,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sat.glucose.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sat.glucose/2022-03-31/cl-sat.glucose-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sat.glucose/2022-03-31/cl-sat.glucose-20220331-git.tgz";
           sha256 = "11hbhsjzw3xzz6i6niisk5h271kg52y3y77sl6ljnszfgp9xjfxy";
           system = "cl-sat.glucose.test";
           asd = "cl-sat.glucose.test";
@@ -34011,7 +34011,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sat.minisat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sat.minisat/2024-10-12/cl-sat.minisat-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sat.minisat/2024-10-12/cl-sat.minisat-20241012-git.tgz";
           sha256 = "00h5smjs60r1abq27w2ayg55ypsw32769pkk72mrikyn29r6z9ni";
           system = "cl-sat.minisat";
           asd = "cl-sat.minisat";
@@ -34035,7 +34035,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sat.minisat.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sat.minisat/2024-10-12/cl-sat.minisat-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sat.minisat/2024-10-12/cl-sat.minisat-20241012-git.tgz";
           sha256 = "00h5smjs60r1abq27w2ayg55ypsw32769pkk72mrikyn29r6z9ni";
           system = "cl-sat.minisat.test";
           asd = "cl-sat.minisat.test";
@@ -34058,7 +34058,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sat.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sat/2022-07-07/cl-sat-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sat/2022-07-07/cl-sat-20220707-git.tgz";
           sha256 = "1fcvxpmja757vyyhcpb00g150dyx90jsg9z8s596vy1nb0z81f49";
           system = "cl-sat.test";
           asd = "cl-sat.test";
@@ -34081,7 +34081,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-scram" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-scram/2015-09-23/cl-scram-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-scram/2015-09-23/cl-scram-20150923-git.tgz";
           sha256 = "1absr9h9z79f1fbs4g33y2rc9jsqjs7vd2l5sl8dvqq4fyx8v6g0";
           system = "cl-scram";
           asd = "cl-scram";
@@ -34107,7 +34107,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-scribd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-scribd/2013-03-12/cl-scribd-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-scribd/2013-03-12/cl-scribd-20130312-git.tgz";
           sha256 = "0r4ah3f1ndi66bm1mir3ldl31sfbmav0kdfpb16f1n9931452mry";
           system = "cl-scribd";
           asd = "cl-scribd";
@@ -34131,7 +34131,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-scripting" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-scripting/2021-10-20/cl-scripting-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-scripting/2021-10-20/cl-scripting-20211020-git.tgz";
           sha256 = "1xi8klkn4fhmcrnhxzxvl0rj68dc7az6l2hc10560g9jvblcmmpp";
           system = "cl-scripting";
           asd = "cl-scripting";
@@ -34154,7 +34154,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-scrobbler" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-scrobbler/2011-11-05/cl-scrobbler-20111105-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-scrobbler/2011-11-05/cl-scrobbler-20111105-git.tgz";
           sha256 = "0cd0zfmhxf5chcg7hncavfjr8m06cjbiyqylk76z8mprdsv1n062";
           system = "cl-scrobbler";
           asd = "cl-scrobbler";
@@ -34181,7 +34181,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-scrobbler-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-scrobbler/2011-11-05/cl-scrobbler-20111105-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-scrobbler/2011-11-05/cl-scrobbler-20111105-git.tgz";
           sha256 = "0cd0zfmhxf5chcg7hncavfjr8m06cjbiyqylk76z8mprdsv1n062";
           system = "cl-scrobbler-tests";
           asd = "cl-scrobbler";
@@ -34204,7 +34204,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-scsu" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-scsu/2022-11-06/cl-scsu-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-scsu/2022-11-06/cl-scsu-20221106-git.tgz";
           sha256 = "0jiqyayflyyrdks4yl894vzw2bkxkd87w4sy4n6ikjz450xk3yxf";
           system = "cl-scsu";
           asd = "cl-scsu";
@@ -34224,7 +34224,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-scsu-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-scsu/2022-11-06/cl-scsu-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-scsu/2022-11-06/cl-scsu-20221106-git.tgz";
           sha256 = "0jiqyayflyyrdks4yl894vzw2bkxkd87w4sy4n6ikjz450xk3yxf";
           system = "cl-scsu-test";
           asd = "cl-scsu-test";
@@ -34248,7 +34248,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-selenium" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-selenium-webdriver/2018-03-28/cl-selenium-webdriver-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-selenium-webdriver/2018-03-28/cl-selenium-webdriver-20180328-git.tgz";
           sha256 = "0216vqg1ax5gcqahclii7ifqpc92rbi86rfcf1qn8bdahmfjccbb";
           system = "cl-selenium";
           asd = "cl-selenium";
@@ -34274,7 +34274,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-selenium-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-selenium-webdriver/2018-03-28/cl-selenium-webdriver-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-selenium-webdriver/2018-03-28/cl-selenium-webdriver-20180328-git.tgz";
           sha256 = "0216vqg1ax5gcqahclii7ifqpc92rbi86rfcf1qn8bdahmfjccbb";
           system = "cl-selenium-test";
           asd = "cl-selenium-test";
@@ -34298,7 +34298,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-semver" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-semver/2023-06-18/cl-semver-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-semver/2023-06-18/cl-semver-20230618-git.tgz";
           sha256 = "1zlcn7lrpvjiixgqm4yxnqqwak1hxfmxmchkpvrly41yhl586ril";
           system = "cl-semver";
           asd = "cl-semver";
@@ -34322,7 +34322,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-semver-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-semver/2023-06-18/cl-semver-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-semver/2023-06-18/cl-semver-20230618-git.tgz";
           sha256 = "1zlcn7lrpvjiixgqm4yxnqqwak1hxfmxmchkpvrly41yhl586ril";
           system = "cl-semver-test";
           asd = "cl-semver-test";
@@ -34345,7 +34345,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sentiment" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sentiment/2013-01-28/cl-sentiment-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sentiment/2013-01-28/cl-sentiment-20130128-git.tgz";
           sha256 = "18jx6ivbzcg9bsmp1pmlqvzr4kfxzll75b4viz1hrkq78nsnpp5v";
           system = "cl-sentiment";
           asd = "cl-sentiment";
@@ -34368,7 +34368,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-server-manager" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-server-manager/2023-10-21/cl-server-manager-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-server-manager/2023-10-21/cl-server-manager-20231021-git.tgz";
           sha256 = "0vrdn9iiwmx2zg7lrw56dqjaxbb9fvn4107qxgp3n3z8zxhiw03s";
           system = "cl-server-manager";
           asd = "cl-server-manager";
@@ -34393,7 +34393,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ses4" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ses4/2022-11-06/cl-ses4-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ses4/2022-11-06/cl-ses4-20221106-git.tgz";
           sha256 = "1n31k81i19hx26h9wcz39fsciq92hbblnbd15krblx9g877a1598";
           system = "cl-ses4";
           asd = "cl-ses4";
@@ -34422,7 +34422,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-setlocale" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-setlocale/2020-12-20/cl-setlocale-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-setlocale/2020-12-20/cl-setlocale-20201220-git.tgz";
           sha256 = "0g1b89yj6n42ayf2074krk3h9yvglqxn54a6i3sxgpsqww2ll2a1";
           system = "cl-setlocale";
           asd = "cl-setlocale";
@@ -34445,7 +34445,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sf3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sf3/2025-06-22/cl-sf3-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sf3/2025-06-22/cl-sf3-20250622-git.tgz";
           sha256 = "0rp435whhcb8i46kp9g8fsnbr4w7jkimsngs7v6pga99j5rngfgn";
           system = "cl-sf3";
           asd = "cl-sf3";
@@ -34472,7 +34472,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sha1" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sha1/2021-08-07/cl-sha1-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sha1/2021-08-07/cl-sha1-20210807-git.tgz";
           sha256 = "16hczcr7ghah0p9fi29ddrw5c4zbb2d4765iigfx7yrgk5z5jb8p";
           system = "cl-sha1";
           asd = "cl-sha1";
@@ -34492,7 +34492,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-shellwords" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-shellwords/2015-09-23/cl-shellwords-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-shellwords/2015-09-23/cl-shellwords-20150923-git.tgz";
           sha256 = "0im8cni1ig5zaha9gbmma7zk1xxa4xajvzfgalvl2f0fhvksl4pn";
           system = "cl-shellwords";
           asd = "cl-shellwords";
@@ -34510,7 +34510,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-shellwords-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-shellwords/2015-09-23/cl-shellwords-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-shellwords/2015-09-23/cl-shellwords-20150923-git.tgz";
           sha256 = "0im8cni1ig5zaha9gbmma7zk1xxa4xajvzfgalvl2f0fhvksl4pn";
           system = "cl-shellwords-test";
           asd = "cl-shellwords-test";
@@ -34533,7 +34533,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-simple-concurrent-jobs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-simple-concurrent-jobs/2015-05-05/cl-simple-concurrent-jobs-20150505-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-simple-concurrent-jobs/2015-05-05/cl-simple-concurrent-jobs-20150505-git.tgz";
           sha256 = "0mv7svsil58h8v8kq9965bpbradmhfpyrmi61dbzp5mbw8c5mrwj";
           system = "cl-simple-concurrent-jobs";
           asd = "cl-simple-concurrent-jobs";
@@ -34556,7 +34556,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-simple-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-simple-table/2013-03-12/cl-simple-table-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-simple-table/2013-03-12/cl-simple-table-20130312-git.tgz";
           sha256 = "1pnczi5hbqlyxxvzlpy6vc58qc9hh9mdm5rgq304bp3v2qajh0b7";
           system = "cl-simple-table";
           asd = "cl-simple-table";
@@ -34576,7 +34576,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-singleton-mixin" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-singleton-mixin/2015-05-05/cl-singleton-mixin-20150505-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-singleton-mixin/2015-05-05/cl-singleton-mixin-20150505-git.tgz";
           sha256 = "10dvwzx1kw9ac163i6sc8yfg3hpkn0dlq4hf6qipb46b4mcib01s";
           system = "cl-singleton-mixin";
           asd = "cl-singleton-mixin";
@@ -34599,7 +34599,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-singleton-mixin-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-singleton-mixin/2015-05-05/cl-singleton-mixin-20150505-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-singleton-mixin/2015-05-05/cl-singleton-mixin-20150505-git.tgz";
           sha256 = "10dvwzx1kw9ac163i6sc8yfg3hpkn0dlq4hf6qipb46b4mcib01s";
           system = "cl-singleton-mixin-test";
           asd = "cl-singleton-mixin-test";
@@ -34622,7 +34622,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-skip-list" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-skip-list/2022-07-07/cl-skip-list-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-skip-list/2022-07-07/cl-skip-list-20220707-git.tgz";
           sha256 = "1k3hbi9n1yzky3hjcg48jkkkp2jx5vm7bsywhnyyb1z6hz5phakd";
           system = "cl-skip-list";
           asd = "cl-skip-list";
@@ -34642,7 +34642,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-skkserv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-skkserv/2025-06-22/cl-skkserv-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-skkserv/2025-06-22/cl-skkserv-20250622-git.tgz";
           sha256 = "1vxpmg9fc12w73ymh6xyin4mw2cyjkd115ssvlzm7g9zb1dzswf3";
           system = "cl-skkserv";
           asd = "cl-skkserv";
@@ -34673,7 +34673,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-slice" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-slice/2021-05-31/cl-slice-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-slice/2021-05-31/cl-slice-20210531-git.tgz";
           sha256 = "1ybznf4y5lda6bn163jcvj281qzhm24dfcwhbgxmm5n6f27gdccl";
           system = "cl-slice";
           asd = "cl-slice";
@@ -34695,7 +34695,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-slice-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-slice/2021-05-31/cl-slice-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-slice/2021-05-31/cl-slice-20210531-git.tgz";
           sha256 = "1ybznf4y5lda6bn163jcvj281qzhm24dfcwhbgxmm5n6f27gdccl";
           system = "cl-slice-tests";
           asd = "cl-slice";
@@ -34718,7 +34718,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-slp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-slp/2014-08-26/cl-slp-20140826-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-slp/2014-08-26/cl-slp-20140826-git.tgz";
           sha256 = "10wfrw6r6w646lzx0nasnfvjpy63icxl8qm4888dpcjc57y1cd1w";
           system = "cl-slp";
           asd = "cl-slp";
@@ -34738,7 +34738,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-slug" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-slug/2018-02-28/cl-slug-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-slug/2018-02-28/cl-slug-20180228-git.tgz";
           sha256 = "1asdq6xllmsvfw5fky9wblqcx9isac9jrrlkfl7vyxcq1wxrnflx";
           system = "cl-slug";
           asd = "cl-slug";
@@ -34758,7 +34758,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-slug-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-slug/2018-02-28/cl-slug-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-slug/2018-02-28/cl-slug-20180228-git.tgz";
           sha256 = "1asdq6xllmsvfw5fky9wblqcx9isac9jrrlkfl7vyxcq1wxrnflx";
           system = "cl-slug-test";
           asd = "cl-slug-test";
@@ -34782,7 +34782,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-slugify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-slugify/2023-06-18/cl-slugify-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-slugify/2023-06-18/cl-slugify-20230618-git.tgz";
           sha256 = "18vjz9xb8q73j2bd609if2r6svljsnivl3sniz2p7j7w0qppps72";
           system = "cl-slugify";
           asd = "cl-slugify";
@@ -34802,7 +34802,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-slugify.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-slugify/2023-06-18/cl-slugify-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-slugify/2023-06-18/cl-slugify-20230618-git.tgz";
           sha256 = "18vjz9xb8q73j2bd609if2r6svljsnivl3sniz2p7j7w0qppps72";
           system = "cl-slugify.tests";
           asd = "cl-slugify.tests";
@@ -34825,7 +34825,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-smt-lib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-smt-lib/2022-03-31/cl-smt-lib-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-smt-lib/2022-03-31/cl-smt-lib-20220331-git.tgz";
           sha256 = "09xqpmzd8rmp4dkj6mzwlwnhqk266abqvskz9dm6mr3cnf2r774z";
           system = "cl-smt-lib";
           asd = "cl-smt-lib";
@@ -34847,7 +34847,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-smtp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-smtp/2024-10-12/cl-smtp-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-smtp/2024-10-12/cl-smtp-20241012-git.tgz";
           sha256 = "1r4gsklf4p163hn4ylabx7lp5zkz27v6gq3rkyrvwb7qz6sv8ws4";
           system = "cl-smtp";
           asd = "cl-smtp";
@@ -34872,7 +34872,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-smtp-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-smtp/2024-10-12/cl-smtp-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-smtp/2024-10-12/cl-smtp-20241012-git.tgz";
           sha256 = "1r4gsklf4p163hn4ylabx7lp5zkz27v6gq3rkyrvwb7qz6sv8ws4";
           system = "cl-smtp-tests";
           asd = "cl-smtp-tests";
@@ -34892,7 +34892,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-soil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-soil/2018-08-31/cl-soil-release-quicklisp-f27087ce-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-soil/2018-08-31/cl-soil-release-quicklisp-f27087ce-git.tgz";
           sha256 = "0mnz5yaw3kc14ja9g4j7dxh96kd82ifj25gy0dil7kqjd08lwcq9";
           system = "cl-soil";
           asd = "cl-soil";
@@ -34916,7 +34916,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-soloud" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-soloud/2025-06-22/cl-soloud-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-soloud/2025-06-22/cl-soloud-20250622-git.tgz";
           sha256 = "0rkvy4pf2hn82bm0vmjp6b0is3zrjm2r2lrcgvxhh6dxcx71zs7i";
           system = "cl-soloud";
           asd = "cl-soloud";
@@ -34944,7 +34944,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sophia" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sophia/2015-06-08/cl-sophia-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sophia/2015-06-08/cl-sophia-20150608-git.tgz";
           sha256 = "1x027mr7lg5fs0d82n5mshnd19kan76y3zb9yxbcnq222l4j8j00";
           system = "cl-sophia";
           asd = "cl-sophia";
@@ -34968,7 +34968,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sophia-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sophia/2015-06-08/cl-sophia-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sophia/2015-06-08/cl-sophia-20150608-git.tgz";
           sha256 = "1x027mr7lg5fs0d82n5mshnd19kan76y3zb9yxbcnq222l4j8j00";
           system = "cl-sophia-test";
           asd = "cl-sophia";
@@ -34993,7 +34993,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-spark" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-spark/2015-07-09/cl-spark-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-spark/2015-07-09/cl-spark-20150709-git.tgz";
           sha256 = "0my1fsgi2rjaqkpk934f2bjy63pmnj7faza3fzvnk6k3l66y19nk";
           system = "cl-spark";
           asd = "cl-spark";
@@ -35013,7 +35013,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-spark-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-spark/2015-07-09/cl-spark-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-spark/2015-07-09/cl-spark-20150709-git.tgz";
           sha256 = "0my1fsgi2rjaqkpk934f2bjy63pmnj7faza3fzvnk6k3l66y19nk";
           system = "cl-spark-test";
           asd = "cl-spark-test";
@@ -35036,7 +35036,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sparql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sparql/2022-03-31/cl-sparql-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sparql/2022-03-31/cl-sparql-20220331-git.tgz";
           sha256 = "1fjp5a25yly3l3pg07gzhz8q830fcaz0dwspigw8v90sx4insz0p";
           system = "cl-sparql";
           asd = "cl-sparql";
@@ -35061,7 +35061,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sparql-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sparql/2022-03-31/cl-sparql-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sparql/2022-03-31/cl-sparql-20220331-git.tgz";
           sha256 = "1fjp5a25yly3l3pg07gzhz8q830fcaz0dwspigw8v90sx4insz0p";
           system = "cl-sparql-tests";
           asd = "cl-sparql-tests";
@@ -35084,7 +35084,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-speedy-queue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-speedy-queue/2015-03-02/cl-speedy-queue-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-speedy-queue/2015-03-02/cl-speedy-queue-20150302-git.tgz";
           sha256 = "0czhnvxn9lvbjz9h1lb7y18nqrsq3drq5icd3lqdaa07362alriq";
           system = "cl-speedy-queue";
           asd = "cl-speedy-queue";
@@ -35102,7 +35102,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-spidev" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-spidev/2025-06-22/cl-spidev-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-spidev/2025-06-22/cl-spidev-20250622-git.tgz";
           sha256 = "1wyg67mr3wawdrvv6flxkxbi3saaddxajr0lfzzyvswpy3s117bm";
           system = "cl-spidev";
           asd = "cl-spidev";
@@ -35126,7 +35126,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ssdb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ssdb/2021-01-24/cl-ssdb-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ssdb/2021-01-24/cl-ssdb-20210124-git.tgz";
           sha256 = "05l0wg4a1kxgggmg1nalq811by76lja0gpa2c4i999h74bf4n3dc";
           system = "cl-ssdb";
           asd = "cl-ssdb";
@@ -35153,7 +35153,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ssdb-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ssdb/2021-01-24/cl-ssdb-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ssdb/2021-01-24/cl-ssdb-20210124-git.tgz";
           sha256 = "05l0wg4a1kxgggmg1nalq811by76lja0gpa2c4i999h74bf4n3dc";
           system = "cl-ssdb-test";
           asd = "cl-ssdb-test";
@@ -35177,7 +35177,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ssh-keys" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ssh-keys/2024-10-12/cl-ssh-keys-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ssh-keys/2024-10-12/cl-ssh-keys-20241012-git.tgz";
           sha256 = "037j89fjjrld46m9j71x6zfixdm7irwd58c08j0gq6w09qjlk5l2";
           system = "cl-ssh-keys";
           asd = "cl-ssh-keys";
@@ -35202,7 +35202,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-ssh-keys.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ssh-keys/2024-10-12/cl-ssh-keys-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ssh-keys/2024-10-12/cl-ssh-keys-20241012-git.tgz";
           sha256 = "037j89fjjrld46m9j71x6zfixdm7irwd58c08j0gq6w09qjlk5l2";
           system = "cl-ssh-keys.test";
           asd = "cl-ssh-keys.test";
@@ -35226,7 +35226,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-statsd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-statsd/2017-01-24/cl-statsd-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-statsd/2017-01-24/cl-statsd-20170124-git.tgz";
           sha256 = "1l2sxbzhp7wwalxn8k0k1gis9c9w462fygfw4ps0s1bnhgbvr6qb";
           system = "cl-statsd";
           asd = "cl-statsd";
@@ -35255,7 +35255,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-statsd.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-statsd/2017-01-24/cl-statsd-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-statsd/2017-01-24/cl-statsd-20170124-git.tgz";
           sha256 = "1l2sxbzhp7wwalxn8k0k1gis9c9w462fygfw4ps0s1bnhgbvr6qb";
           system = "cl-statsd.test";
           asd = "cl-statsd.test";
@@ -35280,7 +35280,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-steamworks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-steamworks/2025-06-22/cl-steamworks-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-steamworks/2025-06-22/cl-steamworks-20250622-git.tgz";
           sha256 = "0s10n0qnlbj1cwmkv1zhwwnhv79gp04070z0743qyjjvba24l650";
           system = "cl-steamworks";
           asd = "cl-steamworks";
@@ -35310,7 +35310,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-steamworks-generator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-steamworks/2025-06-22/cl-steamworks-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-steamworks/2025-06-22/cl-steamworks-20250622-git.tgz";
           sha256 = "0s10n0qnlbj1cwmkv1zhwwnhv79gp04070z0743qyjjvba24l650";
           system = "cl-steamworks-generator";
           asd = "cl-steamworks-generator";
@@ -35337,7 +35337,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-stomp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-stomp/2020-09-25/cl-stomp-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-stomp/2020-09-25/cl-stomp-20200925-git.tgz";
           sha256 = "180y0x53ghsvz6n0bz67aw69p962bsslarikk89rf41kcv998xvw";
           system = "cl-stomp";
           asd = "cl-stomp";
@@ -35361,7 +35361,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-stopwatch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-stopwatch/2023-06-18/cl-stopwatch-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-stopwatch/2023-06-18/cl-stopwatch-20230618-git.tgz";
           sha256 = "14jmylqk1kijbhhn897r76ii4xg32k22p4v7h29jbcs9y2mn2day";
           system = "cl-stopwatch";
           asd = "cl-stopwatch";
@@ -35381,7 +35381,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-store" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-store/2023-02-14/cl-store-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-store/2023-02-14/cl-store-20230214-git.tgz";
           sha256 = "1kw39lmbiaksrxsq8pf5np8vjarymcvlc451z83275194av3imix";
           system = "cl-store";
           asd = "cl-store";
@@ -35399,7 +35399,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-store-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-store/2023-02-14/cl-store-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-store/2023-02-14/cl-store-20230214-git.tgz";
           sha256 = "1kw39lmbiaksrxsq8pf5np8vjarymcvlc451z83275194av3imix";
           system = "cl-store-tests";
           asd = "cl-store";
@@ -35422,7 +35422,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-stream" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-stream/2019-05-21/cl-stream-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-stream/2019-05-21/cl-stream-20190521-git.tgz";
           sha256 = "1r2spbcx3ifz51yq2pxkdb1n2k5fvyg3pz3w42mnw99pq78cbasv";
           system = "cl-stream";
           asd = "cl-stream";
@@ -35442,7 +35442,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-strftime" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-strftime/2016-03-18/cl-strftime-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-strftime/2016-03-18/cl-strftime-20160318-git.tgz";
           sha256 = "00c8hq7vzgb89ab3q7mrp60x743kiqmsk1g51ynhxlqhph2bnslf";
           system = "cl-strftime";
           asd = "cl-strftime";
@@ -35467,7 +35467,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-string-complete" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-string-complete/2023-06-18/cl-string-complete-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-string-complete/2023-06-18/cl-string-complete-20230618-git.tgz";
           sha256 = "14l1yyz5fakz5xn31yjfn4mz7j9rcbijw1sp4mdfizfvjbbwcixl";
           system = "cl-string-complete";
           asd = "cl-string-complete";
@@ -35487,7 +35487,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-string-generator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-string-generator/2021-06-30/cl-string-generator-20210630-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-string-generator/2021-06-30/cl-string-generator-20210630-git.tgz";
           sha256 = "0zm6lyzd205lw30fdvnhrrlv9fylpfqksqxl32zvj9vzcn8qc1vi";
           system = "cl-string-generator";
           asd = "cl-string-generator";
@@ -35510,7 +35510,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-string-match" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz";
           sha256 = "0zndlkw3qy3vw4px4qv884z6232w8zfaliyc88irjwizdv35wcq9";
           system = "cl-string-match";
           asd = "cl-string-match";
@@ -35537,7 +35537,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-string-match-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz";
           sha256 = "0zndlkw3qy3vw4px4qv884z6232w8zfaliyc88irjwizdv35wcq9";
           system = "cl-string-match-test";
           asd = "cl-string-match-test";
@@ -35562,7 +35562,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-strings" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-strings/2021-04-11/cl-strings-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-strings/2021-04-11/cl-strings-20210411-git.tgz";
           sha256 = "1j8hs54fn0wsf5zfzhhgiva47n9hsmfa74iinahz6nmcs8iy75aj";
           system = "cl-strings";
           asd = "cl-strings";
@@ -35582,7 +35582,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-strings-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-strings/2021-04-11/cl-strings-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-strings/2021-04-11/cl-strings-20210411-git.tgz";
           sha256 = "1j8hs54fn0wsf5zfzhhgiva47n9hsmfa74iinahz6nmcs8iy75aj";
           system = "cl-strings-tests";
           asd = "cl-strings";
@@ -35605,7 +35605,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-svg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-svg/2024-10-12/cl-svg-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-svg/2024-10-12/cl-svg-20241012-git.tgz";
           sha256 = "05zrg6sxi01xn940c7lygfgxwjkq0zmlkihbhm7lhfaszg2xj8bh";
           system = "cl-svg";
           asd = "cl-svg";
@@ -35623,7 +35623,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-svm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-svm/2011-04-18/cl-svm-20110418-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-svm/2011-04-18/cl-svm-20110418-git.tgz";
           sha256 = "03d070k3bl5c0b2f6bzig5gkhlj074v74f7kg8hh3znrbmwji2wv";
           system = "cl-svm";
           asd = "cl-svm";
@@ -35643,7 +35643,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-swagger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-swagger-codegen/2018-08-31/cl-swagger-codegen-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-swagger-codegen/2018-08-31/cl-swagger-codegen-20180831-git.tgz";
           sha256 = "1lkp69n7wscyf2az3h2bmxmvzzppdfxcq5s0m607b1f7nfmxzjsq";
           system = "cl-swagger";
           asd = "cl-swagger";
@@ -35668,7 +35668,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sxml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sxml/2020-03-25/cl-sxml-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sxml/2020-03-25/cl-sxml-20200325-git.tgz";
           sha256 = "1105s9whidq1lf0lli2wdhcfcs5gwzxa0h1x3izx4mp2p7psvciz";
           system = "cl-sxml";
           asd = "cl-sxml";
@@ -35688,7 +35688,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-sxml-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sxml/2020-03-25/cl-sxml-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sxml/2020-03-25/cl-sxml-20200325-git.tgz";
           sha256 = "1105s9whidq1lf0lli2wdhcfcs5gwzxa0h1x3izx4mp2p7psvciz";
           system = "cl-sxml-test";
           asd = "cl-sxml";
@@ -35712,7 +35712,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-syntax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
           sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y";
           system = "cl-syntax";
           asd = "cl-syntax";
@@ -35733,7 +35733,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-syntax-annot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
           sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y";
           system = "cl-syntax-annot";
           asd = "cl-syntax-annot";
@@ -35754,7 +35754,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-syntax-anonfun" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
           sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y";
           system = "cl-syntax-anonfun";
           asd = "cl-syntax-anonfun";
@@ -35775,7 +35775,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-syntax-clsql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
           sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y";
           system = "cl-syntax-clsql";
           asd = "cl-syntax-clsql";
@@ -35798,7 +35798,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-syntax-debug-print" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz";
           sha256 = "1cm5nybmv0pq9s4lrwhd01rjj1wlcj1sjcrcakabi7w7b5zw4cyh";
           system = "cl-syntax-debug-print";
           asd = "cl-syntax-debug-print";
@@ -35821,7 +35821,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-syntax-fare-quasiquote" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
           sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y";
           system = "cl-syntax-fare-quasiquote";
           asd = "cl-syntax-fare-quasiquote";
@@ -35844,7 +35844,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-syntax-interpol" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
           sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y";
           system = "cl-syntax-interpol";
           asd = "cl-syntax-interpol";
@@ -35867,7 +35867,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-syntax-lsx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lsx/2022-02-20/lsx-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lsx/2022-02-20/lsx-20220220-git.tgz";
           sha256 = "1pdq6csr8pkzcq2zkhhm6wkp9zxx2aypjd16rcw4q43mff09y041";
           system = "cl-syntax-lsx";
           asd = "cl-syntax-lsx";
@@ -35890,7 +35890,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-syntax-markup" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
           sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y";
           system = "cl-syntax-markup";
           asd = "cl-syntax-markup";
@@ -35911,7 +35911,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-syslog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-syslog/2019-02-02/cl-syslog-20190202-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-syslog/2019-02-02/cl-syslog-20190202-git.tgz";
           sha256 = "1qcz55jiqwk91b01hsahxnha884f6zf2883j2m51sqph0mvj69mh";
           system = "cl-syslog";
           asd = "cl-syslog";
@@ -35937,7 +35937,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-table/2013-01-28/cl-table-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-table/2013-01-28/cl-table-20130128-git.tgz";
           sha256 = "0c7bdnpi473grayycdcdh4q8fi137i3c80k05k87pvjdrl1qnkpn";
           system = "cl-table";
           asd = "cl-table";
@@ -35957,7 +35957,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tasukete" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tasukete/2018-02-28/cl-tasukete-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tasukete/2018-02-28/cl-tasukete-20180228-git.tgz";
           sha256 = "0i8ibg2a33mb32vr2b70psb5dvh47r52lfhkh84rxzmcsk6ww230";
           system = "cl-tasukete";
           asd = "cl-tasukete";
@@ -35983,7 +35983,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tasukete-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tasukete/2018-02-28/cl-tasukete-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tasukete/2018-02-28/cl-tasukete-20180228-git.tgz";
           sha256 = "0i8ibg2a33mb32vr2b70psb5dvh47r52lfhkh84rxzmcsk6ww230";
           system = "cl-tasukete-test";
           asd = "cl-tasukete-test";
@@ -36008,7 +36008,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-telebot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-telebot/2021-10-20/cl-telebot-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-telebot/2021-10-20/cl-telebot-20211020-git.tgz";
           sha256 = "0nl002l4f3x6843s6h5w2iz2hganxb369k8c2hbbgqq7plb4mdf1";
           system = "cl-telebot";
           asd = "cl-telebot";
@@ -36032,7 +36032,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-telegram-bot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
           sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m";
           system = "cl-telegram-bot";
           asd = "cl-telegram-bot";
@@ -36069,7 +36069,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-telegram-bot-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
           sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m";
           system = "cl-telegram-bot-ci";
           asd = "cl-telegram-bot-ci";
@@ -36089,7 +36089,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-telegram-bot-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
           sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m";
           system = "cl-telegram-bot-docs";
           asd = "cl-telegram-bot-docs";
@@ -36117,7 +36117,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-telegram-bot-media" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-telegram-bot-media/2025-06-22/cl-telegram-bot-media-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-telegram-bot-media/2025-06-22/cl-telegram-bot-media-20250622-git.tgz";
           sha256 = "0w8vj1szb2i00r5ll7wjjz45ny1w6ygplidpmd6xm6qf8izr69gy";
           system = "cl-telegram-bot-media";
           asd = "cl-telegram-bot-media";
@@ -36137,7 +36137,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-telegram-bot-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
           sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m";
           system = "cl-telegram-bot-tests";
           asd = "cl-telegram-bot-tests";
@@ -36157,7 +36157,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-telegram-bot2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
           sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m";
           system = "cl-telegram-bot2";
           asd = "cl-telegram-bot2";
@@ -36195,7 +36195,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-telegram-bot2-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-telegram-bot/2025-06-22/cl-telegram-bot-20250622-git.tgz";
           sha256 = "14y99vc0k9xv81xcfk7aaia3npwg1b0lmsx3fn03vgl3ws37fz9m";
           system = "cl-telegram-bot2-examples";
           asd = "cl-telegram-bot2-examples";
@@ -36226,7 +36226,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-template" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-template/2013-06-15/cl-template-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-template/2013-06-15/cl-template-20130615-git.tgz";
           sha256 = "1rhg023a2nxsk5x6abd6i0a8sh36aj0bgsh80w60m3b7xlsva2x2";
           system = "cl-template";
           asd = "cl-template";
@@ -36246,7 +36246,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-template-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-template/2013-06-15/cl-template-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-template/2013-06-15/cl-template-20130615-git.tgz";
           sha256 = "1rhg023a2nxsk5x6abd6i0a8sh36aj0bgsh80w60m3b7xlsva2x2";
           system = "cl-template-tests";
           asd = "cl-template";
@@ -36269,7 +36269,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-termbox" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-termbox/2021-10-20/cl-termbox-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-termbox/2021-10-20/cl-termbox-20211020-git.tgz";
           sha256 = "1igmq64zndkgchmzggp34jrmxa81dqlhz2il8qizrpfw5a39cpld";
           system = "cl-termbox";
           asd = "cl-termbox";
@@ -36289,7 +36289,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tesseract" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tesseract/2025-06-22/cl-tesseract-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tesseract/2025-06-22/cl-tesseract-20250622-git.tgz";
           sha256 = "1v2f8hiwjj501bwq5nh3q09w994d54jf87kllz1xzqknfb835c48";
           system = "cl-tesseract";
           asd = "cl-tesseract";
@@ -36309,7 +36309,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-test-more" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
           sha256 = "0ca6ha3zhmckq3ad9lxm6sbg4i0hg3m81xhan4dkxd3x9898jzpc";
           system = "cl-test-more";
           asd = "cl-test-more";
@@ -36327,7 +36327,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tetris3d" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tetris3d/2018-12-10/cl-tetris3d-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tetris3d/2018-12-10/cl-tetris3d-20181210-git.tgz";
           sha256 = "09n7344is2vfbp32cd22ynk14h4vqs4xw3plbhga8q25ghhx5y9p";
           system = "cl-tetris3d";
           asd = "cl-tetris3d";
@@ -36352,7 +36352,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-textmagic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-textmagic/2015-12-18/cl-textmagic-20151218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-textmagic/2015-12-18/cl-textmagic-20151218-git.tgz";
           sha256 = "0xw6g1r5vxmnbz3kxf2q6s9dr9l2aacyri1wchzw4jx5wlcnkshw";
           system = "cl-textmagic";
           asd = "cl-textmagic";
@@ -36375,7 +36375,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-textmagic-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-textmagic/2015-12-18/cl-textmagic-20151218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-textmagic/2015-12-18/cl-textmagic-20151218-git.tgz";
           sha256 = "0xw6g1r5vxmnbz3kxf2q6s9dr9l2aacyri1wchzw4jx5wlcnkshw";
           system = "cl-textmagic-test";
           asd = "cl-textmagic-test";
@@ -36399,7 +36399,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tga" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tga/2016-03-18/cl-tga-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tga/2016-03-18/cl-tga-20160318-git.tgz";
           sha256 = "03k3npmn0xd3fd2m7vwxph82av2xrfb150imqrinlzqmzvz1v1br";
           system = "cl-tga";
           asd = "cl-tga";
@@ -36419,7 +36419,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-threadpool" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-threadpool/2024-10-12/cl-threadpool-quickload-current-release-feda6ff9-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-threadpool/2024-10-12/cl-threadpool-quickload-current-release-feda6ff9-git.tgz";
           sha256 = "0y2kai8ijz0y6j54svvdrl2f2v96pz0pl652x86lz7pl4yyg99vr";
           system = "cl-threadpool";
           asd = "cl-threadpool";
@@ -36442,7 +36442,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tidy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tidy/2017-08-30/cl-tidy-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tidy/2017-08-30/cl-tidy-20170830-git.tgz";
           sha256 = "13j0jgf6czb24148w2wxfwlji6vnc49qvyr5wzq5ps55b27ddlz6";
           system = "cl-tidy";
           asd = "cl-tidy";
@@ -36462,7 +36462,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tiled" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tiled/2025-06-22/cl-tiled-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tiled/2025-06-22/cl-tiled-20250622-git.tgz";
           sha256 = "1wmh9df35sl4wd4n4nd050p9489zk4vwg32a5hsj2qqyrh2qvi8b";
           system = "cl-tiled";
           asd = "cl-tiled";
@@ -36491,7 +36491,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tk/2025-06-22/cl-tk-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tk/2025-06-22/cl-tk-20250622-git.tgz";
           sha256 = "0fm4q4pkzbyxr6227vavvy4lm7rfw214lp2dylgzjzcp6f5r4n7w";
           system = "cl-tk";
           asd = "cl-tk";
@@ -36514,7 +36514,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tld" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tld/2025-06-22/cl-tld-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tld/2025-06-22/cl-tld-20250622-git.tgz";
           sha256 = "1zxns30gj4hkbm8vm00yi4yvyyvchndq9vi84s5ssymja722j2dc";
           system = "cl-tld";
           asd = "cl-tld";
@@ -36534,7 +36534,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tls" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tls/2023-10-21/cl-tls-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tls/2023-10-21/cl-tls-20231021-git.tgz";
           sha256 = "1gq7m5wmsrjmyhrk9xljxz9ickahwzl1anz2fcns5q2nj0j6d9bx";
           system = "cl-tls";
           asd = "cl-tls";
@@ -36560,7 +36560,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tokyo-cabinet" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tokyo-cabinet/2016-08-25/cl-tokyo-cabinet-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tokyo-cabinet/2016-08-25/cl-tokyo-cabinet-20160825-git.tgz";
           sha256 = "07961in8fa09bjnpwkdn0w6dj37nppzmgg50kf8khspnjh1sjsr2";
           system = "cl-tokyo-cabinet";
           asd = "cl-tokyo-cabinet";
@@ -36583,7 +36583,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tokyo-cabinet-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tokyo-cabinet/2016-08-25/cl-tokyo-cabinet-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tokyo-cabinet/2016-08-25/cl-tokyo-cabinet-20160825-git.tgz";
           sha256 = "07961in8fa09bjnpwkdn0w6dj37nppzmgg50kf8khspnjh1sjsr2";
           system = "cl-tokyo-cabinet-test";
           asd = "cl-tokyo-cabinet-test";
@@ -36608,7 +36608,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-toml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-toml/2019-11-30/cl-toml-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-toml/2019-11-30/cl-toml-20191130-git.tgz";
           sha256 = "1g5i60i78s0ms608fyc6sgaaqr6jdsln75n26lmfbcaqw2g1q9dk";
           system = "cl-toml";
           asd = "cl-toml";
@@ -36633,7 +36633,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-toml-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-toml/2019-11-30/cl-toml-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-toml/2019-11-30/cl-toml-20191130-git.tgz";
           sha256 = "1g5i60i78s0ms608fyc6sgaaqr6jdsln75n26lmfbcaqw2g1q9dk";
           system = "cl-toml-test";
           asd = "cl-toml-test";
@@ -36656,7 +36656,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tqdm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tqdm/2024-10-12/cl-tqdm-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tqdm/2024-10-12/cl-tqdm-20241012-git.tgz";
           sha256 = "0wlbgs7wfiy149d7zq5bpkm8g3785b1crcf2m802f9qhin2r0nzg";
           system = "cl-tqdm";
           asd = "cl-tqdm";
@@ -36676,7 +36676,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-transmission" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-transmission/2020-03-25/cl-transmission-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-transmission/2020-03-25/cl-transmission-20200325-git.tgz";
           sha256 = "0sg3f2jqs2z3mvscjhc43hkd34vlcc4c8hq8rhh5w1gjg19z57hb";
           system = "cl-transmission";
           asd = "cl-transmission";
@@ -36702,7 +36702,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-transmission-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-transmission/2020-03-25/cl-transmission-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-transmission/2020-03-25/cl-transmission-20200325-git.tgz";
           sha256 = "0sg3f2jqs2z3mvscjhc43hkd34vlcc4c8hq8rhh5w1gjg19z57hb";
           system = "cl-transmission-test";
           asd = "cl-transmission-test";
@@ -36726,7 +36726,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-trie" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-trie/2023-02-14/cl-trie-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-trie/2023-02-14/cl-trie-20230214-git.tgz";
           sha256 = "0d0mnac9rbqvwr45650yimfw4fyldbgasj139g7y1wzrranrcldf";
           system = "cl-trie";
           asd = "cl-trie";
@@ -36746,7 +36746,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-trie-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-trie/2023-02-14/cl-trie-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-trie/2023-02-14/cl-trie-20230214-git.tgz";
           sha256 = "0d0mnac9rbqvwr45650yimfw4fyldbgasj139g7y1wzrranrcldf";
           system = "cl-trie-examples";
           asd = "cl-trie-examples";
@@ -36769,7 +36769,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tui" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tui/2020-04-27/cl-tui-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tui/2020-04-27/cl-tui-20200427-git.tgz";
           sha256 = "1s0z7sjb3p1fxypc2x9fl0y094qa1a2iqjbn5him4hs8z7xm5kz8";
           system = "cl-tui";
           asd = "cl-tui";
@@ -36797,7 +36797,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tulip-graph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tulip-graph/2013-06-15/cl-tulip-graph-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tulip-graph/2013-06-15/cl-tulip-graph-20130615-git.tgz";
           sha256 = "0zmmwqabbyzdikn8x0xqrj192wr5w87l828nwandqg59af2isxav";
           system = "cl-tulip-graph";
           asd = "cl-tulip-graph";
@@ -36817,7 +36817,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-tuples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tuples/2014-07-13/cl-tuples-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tuples/2014-07-13/cl-tuples-20140713-git.tgz";
           sha256 = "060xmr03y8n0mnf4x4fnrirljcjk1jcir7jsjq4w9d5vzq3aqm9m";
           system = "cl-tuples";
           asd = "cl-tuples";
@@ -36840,7 +36840,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-twit-repl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz";
           sha256 = "07l86c63ssahpz3s9f7d99mbzmh60askkpdrhjrdbzd1vxlwkhcr";
           system = "cl-twit-repl";
           asd = "cl-twit-repl";
@@ -36860,7 +36860,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-twitter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz";
           sha256 = "07l86c63ssahpz3s9f7d99mbzmh60askkpdrhjrdbzd1vxlwkhcr";
           system = "cl-twitter";
           asd = "cl-twitter";
@@ -36889,7 +36889,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-typesetting" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz";
           sha256 = "0fcs5mq0gxfczbrg7ay8r4bf5r4g6blvpdbjkhcl8dapcikyn35h";
           system = "cl-typesetting";
           asd = "cl-typesetting";
@@ -36907,7 +36907,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-uglify-js" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-uglify-js/2015-07-09/cl-uglify-js-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-uglify-js/2015-07-09/cl-uglify-js-20150709-git.tgz";
           sha256 = "0k39y3c93jgxpr7gwz7w0d8yknn1fdnxrjhd03057lvk5w8js27a";
           system = "cl-uglify-js";
           asd = "cl-uglify-js";
@@ -36933,7 +36933,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-unac" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-unac/2023-06-18/cl-unac-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-unac/2023-06-18/cl-unac-20230618-git.tgz";
           sha256 = "16i4lwg70k05dw3vynyyz09ldgr4zzd1ar68g4jcxk7q4ijfdw9m";
           system = "cl-unac";
           asd = "cl-unac";
@@ -36956,7 +36956,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-unac.config" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-unac/2023-06-18/cl-unac-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-unac/2023-06-18/cl-unac-20230618-git.tgz";
           sha256 = "16i4lwg70k05dw3vynyyz09ldgr4zzd1ar68g4jcxk7q4ijfdw9m";
           system = "cl-unac.config";
           asd = "cl-unac.config";
@@ -36976,7 +36976,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-unac.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-unac/2023-06-18/cl-unac-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-unac/2023-06-18/cl-unac-20230618-git.tgz";
           sha256 = "16i4lwg70k05dw3vynyyz09ldgr4zzd1ar68g4jcxk7q4ijfdw9m";
           system = "cl-unac.tests";
           asd = "cl-unac.tests";
@@ -36999,7 +36999,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-unicode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-unicode/2024-10-12/cl-unicode-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-unicode/2024-10-12/cl-unicode-20241012-git.tgz";
           sha256 = "14ydcjkj94mmx40vs27w8137lgmw16jjhpr5m46mm6gqv46yvr6l";
           system = "cl-unicode";
           asd = "cl-unicode";
@@ -37017,7 +37017,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-unification" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz";
           sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r";
           system = "cl-unification";
           asd = "cl-unification";
@@ -37035,7 +37035,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-unification-lib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz";
           sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r";
           system = "cl-unification-lib";
           asd = "cl-unification-lib";
@@ -37058,7 +37058,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-unification-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-unification/2025-06-22/cl-unification-20250622-git.tgz";
           sha256 = "0s9lhh6nzbbsds967aixadwzfqbdiy5f19xp2a5181gd970w187r";
           system = "cl-unification-test";
           asd = "cl-unification-test";
@@ -37081,7 +37081,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-union-find" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-union-find/2022-11-06/cl-union-find-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-union-find/2022-11-06/cl-union-find-20221106-git.tgz";
           sha256 = "14xciva5v3c4zi4vzp1vfhs82a2654yhkfyllr3b0cr7x36jdm7y";
           system = "cl-union-find";
           asd = "cl-union-find";
@@ -37101,7 +37101,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-utilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz";
           sha256 = "1dmbkdr8xm2jw5yx1makqbf1ypqbm0hpkd7zyknxv3cblvz0a87w";
           system = "cl-utilities";
           asd = "cl-utilities";
@@ -37119,7 +37119,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-variates" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-variates/2018-01-31/cl-variates-20180131-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-variates/2018-01-31/cl-variates-20180131-darcs.tgz";
           sha256 = "02pd02isfxrn3h8h5kh369rwy17hfjkmd7j24pcihfskamgcqgfx";
           system = "cl-variates";
           asd = "cl-variates";
@@ -37139,7 +37139,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-vectors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz";
           sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5";
           system = "cl-vectors";
           asd = "cl-vectors";
@@ -37160,7 +37160,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-vhdl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-vhdl/2016-04-21/cl-vhdl-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-vhdl/2016-04-21/cl-vhdl-20160421-git.tgz";
           sha256 = "0i2780ljak8kcqa2zm24dk2fk771m2mvmnbq4xd4vvx9z87lbnvi";
           system = "cl-vhdl";
           asd = "cl-vhdl";
@@ -37187,7 +37187,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-vhdl-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-vhdl/2016-04-21/cl-vhdl-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-vhdl/2016-04-21/cl-vhdl-20160421-git.tgz";
           sha256 = "0i2780ljak8kcqa2zm24dk2fk771m2mvmnbq4xd4vvx9z87lbnvi";
           system = "cl-vhdl-tests";
           asd = "cl-vhdl";
@@ -37213,7 +37213,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-video" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz";
           sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr";
           system = "cl-video";
           asd = "cl-video";
@@ -37233,7 +37233,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-video-avi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz";
           sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr";
           system = "cl-video-avi";
           asd = "cl-video-avi";
@@ -37259,7 +37259,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-video-gif" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz";
           sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr";
           system = "cl-video-gif";
           asd = "cl-video-gif";
@@ -37283,7 +37283,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-video-player" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz";
           sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr";
           system = "cl-video-player";
           asd = "cl-video-player";
@@ -37310,7 +37310,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-video-wav" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz";
           sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr";
           system = "cl-video-wav";
           asd = "cl-video-wav";
@@ -37335,7 +37335,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-virtualbox" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-virtualbox/2018-08-31/cl-virtualbox-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-virtualbox/2018-08-31/cl-virtualbox-20180831-git.tgz";
           sha256 = "1jzn8jjn9yn9vgnn1r6h0iyxb6j17wm8lmf9j5hk4yqwdzb2nidv";
           system = "cl-virtualbox";
           asd = "cl-virtualbox";
@@ -37359,7 +37359,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-vorbis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-vorbis/2025-06-22/cl-vorbis-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-vorbis/2025-06-22/cl-vorbis-20250622-git.tgz";
           sha256 = "0xigqkh4lqz734nniyifbymgxyxcr6if4358598md0y4mnv709sx";
           system = "cl-vorbis";
           asd = "cl-vorbis";
@@ -37385,7 +37385,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-voxelize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz";
           sha256 = "1sim8n175dgy0i0dxi1vsqzgjx07lgsnrgn3bizzka58ni5y8xdm";
           system = "cl-voxelize";
           asd = "cl-voxelize";
@@ -37405,7 +37405,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-voxelize-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz";
           sha256 = "1sim8n175dgy0i0dxi1vsqzgjx07lgsnrgn3bizzka58ni5y8xdm";
           system = "cl-voxelize-examples";
           asd = "cl-voxelize-examples";
@@ -37428,7 +37428,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-voxelize-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz";
           sha256 = "1sim8n175dgy0i0dxi1vsqzgjx07lgsnrgn3bizzka58ni5y8xdm";
           system = "cl-voxelize-test";
           asd = "cl-voxelize-test";
@@ -37452,7 +37452,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-wadler-pprint" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-wadler-pprint/2019-10-07/cl-wadler-pprint-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-wadler-pprint/2019-10-07/cl-wadler-pprint-20191007-git.tgz";
           sha256 = "0y5jxk7yiw8wng7hg91cwibh6d2hf1sv2mzqhkds6l4myhzxb4jr";
           system = "cl-wadler-pprint";
           asd = "cl-wadler-pprint";
@@ -37472,7 +37472,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-wav" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-wav/2022-11-06/cl-wav-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-wav/2022-11-06/cl-wav-20221106-git.tgz";
           sha256 = "1nf4zw72v0c9fl8mr4si5cr2xz753ydzv19mfzy5dqqx0k1g7wyl";
           system = "cl-wav";
           asd = "cl-wav";
@@ -37495,7 +37495,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-wave-file-writer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-wave-file-writer/2021-10-20/cl-wave-file-writer-quickload-current-release-42cde6cf-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-wave-file-writer/2021-10-20/cl-wave-file-writer-quickload-current-release-42cde6cf-git.tgz";
           sha256 = "0mxzp6rm7ah86vp1xj67q43al71k62x407m5vmbldvyb6pmx37fp";
           system = "cl-wave-file-writer";
           asd = "cl-wave-file-writer";
@@ -37515,7 +37515,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-wavefront" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-wavefront/2025-06-22/cl-wavefront-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-wavefront/2025-06-22/cl-wavefront-20250622-git.tgz";
           sha256 = "0yc6850v8hvfll34fz30yxbazzjs31ylf1rdwi62dzfmmqyxk2cs";
           system = "cl-wavefront";
           asd = "cl-wavefront";
@@ -37539,7 +37539,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-wavelets" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-wavelets/2022-07-07/cl-wavelets-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-wavelets/2022-07-07/cl-wavelets-20220707-git.tgz";
           sha256 = "0z4r01d5mv4rachz5rr5zvnv94q7ka17138vcpsb05sz00vv03ba";
           system = "cl-wavelets";
           asd = "cl-wavelets";
@@ -37562,7 +37562,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-wayland" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-wayland/2019-03-07/cl-wayland-20190307-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-wayland/2019-03-07/cl-wayland-20190307-git.tgz";
           sha256 = "1axdkdm5d2bvj674jq6ylwhfwbzzs7yjj6f04c519qbdq9sknbcn";
           system = "cl-wayland";
           asd = "cl-wayland";
@@ -37585,7 +37585,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-weather-jp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-weather-jp/2016-02-08/cl-weather-jp-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-weather-jp/2016-02-08/cl-weather-jp-20160208-git.tgz";
           sha256 = "15bp7gdk7ck9xs9lx2rrzqw6awlk6nz03cqy14wv2lvy3j84dc01";
           system = "cl-weather-jp";
           asd = "cl-weather-jp";
@@ -37611,7 +37611,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-weather-jp-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-weather-jp/2016-02-08/cl-weather-jp-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-weather-jp/2016-02-08/cl-weather-jp-20160208-git.tgz";
           sha256 = "15bp7gdk7ck9xs9lx2rrzqw6awlk6nz03cqy14wv2lvy3j84dc01";
           system = "cl-weather-jp-test";
           asd = "cl-weather-jp-test";
@@ -37635,7 +37635,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-webdav" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-webdav/2017-08-30/cl-webdav-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-webdav/2017-08-30/cl-webdav-20170830-git.tgz";
           sha256 = "1cmzv763k4s5blfhx2p8s7q9gk20p8mj9p34dngydc14d2acrxmg";
           system = "cl-webdav";
           asd = "cl-webdav";
@@ -37659,7 +37659,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-webdriver-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-webdriver-client/2024-10-12/cl-webdriver-client-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-webdriver-client/2024-10-12/cl-webdriver-client-20241012-git.tgz";
           sha256 = "1975yyvvdxg11vgpyx93nkqr5x6i1xy47230vc40yd0c9bn6lpbr";
           system = "cl-webdriver-client";
           asd = "cl-webdriver-client";
@@ -37686,7 +37686,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-webdriver-client-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-webdriver-client/2024-10-12/cl-webdriver-client-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-webdriver-client/2024-10-12/cl-webdriver-client-20241012-git.tgz";
           sha256 = "1975yyvvdxg11vgpyx93nkqr5x6i1xy47230vc40yd0c9bn6lpbr";
           system = "cl-webdriver-client-test";
           asd = "cl-webdriver-client-test";
@@ -37710,7 +37710,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-webkit2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-webkit/2024-10-12/cl-webkit-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-webkit/2024-10-12/cl-webkit-20241012-git.tgz";
           sha256 = "1ppx4pdnx3c41hp1j8msvpyw22ck2lll2f4ap5hyfvhadp07g3m5";
           system = "cl-webkit2";
           asd = "cl-webkit2";
@@ -37732,7 +37732,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-who" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-who/2025-06-22/cl-who-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-who/2025-06-22/cl-who-20250622-git.tgz";
           sha256 = "1x65mwkj40ii1rpnm7qaf9hhj23l2hcadkfc6s22mpd422ljd3kd";
           system = "cl-who";
           asd = "cl-who";
@@ -37750,7 +37750,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-why" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-why/2018-02-28/cl-why-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-why/2018-02-28/cl-why-20180228-git.tgz";
           sha256 = "01xm7gj1wwd7i3r49jfdm96gwl7nvrn0h6q22kpzrb8zs48wj947";
           system = "cl-why";
           asd = "cl-why";
@@ -37770,7 +37770,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-why-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-why/2018-02-28/cl-why-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-why/2018-02-28/cl-why-20180228-git.tgz";
           sha256 = "01xm7gj1wwd7i3r49jfdm96gwl7nvrn0h6q22kpzrb8zs48wj947";
           system = "cl-why-test";
           asd = "cl-why";
@@ -37793,7 +37793,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-with" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-with/2021-10-20/cl-with-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-with/2021-10-20/cl-with-20211020-git.tgz";
           sha256 = "1x4laq7zi12xb28rfrh8hcy92pkfvjxsp2nn6jkmrhfynky5180w";
           system = "cl-with";
           asd = "cl-with";
@@ -37816,7 +37816,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-wol.cli" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-wol/2023-10-21/cl-wol-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-wol/2023-10-21/cl-wol-20231021-git.tgz";
           sha256 = "1gfrih0899i7280169cjp6bg3zmrx6znrr3i9qjgda0jk4dn5rp4";
           system = "cl-wol.cli";
           asd = "cl-wol.cli";
@@ -37843,7 +37843,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-wol.core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-wol/2023-10-21/cl-wol-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-wol/2023-10-21/cl-wol-20231021-git.tgz";
           sha256 = "1gfrih0899i7280169cjp6bg3zmrx6znrr3i9qjgda0jk4dn5rp4";
           system = "cl-wol.core";
           asd = "cl-wol.core";
@@ -37866,7 +37866,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-wol.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-wol/2023-10-21/cl-wol-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-wol/2023-10-21/cl-wol-20231021-git.tgz";
           sha256 = "1gfrih0899i7280169cjp6bg3zmrx6znrr3i9qjgda0jk4dn5rp4";
           system = "cl-wol.test";
           asd = "cl-wol.test";
@@ -37889,7 +37889,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-wordcut" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-wordcut/2016-04-21/cl-wordcut-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-wordcut/2016-04-21/cl-wordcut-20160421-git.tgz";
           sha256 = "1b8b3b1rgk0y87l54325ilcly8rq9qxalcsmw6rk8q6dq13lgv78";
           system = "cl-wordcut";
           asd = "cl-wordcut";
@@ -37909,7 +37909,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-xdg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-xdg/2017-01-24/cl-xdg-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-xdg/2017-01-24/cl-xdg-20170124-git.tgz";
           sha256 = "078hgsab0gl6s96wq09ibq5alzyyqh6wwc3yjs44fv18561p5jgc";
           system = "cl-xdg";
           asd = "cl-xdg";
@@ -37935,7 +37935,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-xdg-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-xdg/2017-01-24/cl-xdg-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-xdg/2017-01-24/cl-xdg-20170124-git.tgz";
           sha256 = "078hgsab0gl6s96wq09ibq5alzyyqh6wwc3yjs44fv18561p5jgc";
           system = "cl-xdg-test";
           asd = "cl-xdg";
@@ -37958,7 +37958,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-xkb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-xkb/2023-02-14/cl-xkb-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-xkb/2023-02-14/cl-xkb-20230214-git.tgz";
           sha256 = "002bskv0dvq2hahz7dah2zwwkp2zrkf98w7lm96jmqfn8vyp4k75";
           system = "cl-xkb";
           asd = "cl-xkb";
@@ -37978,7 +37978,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-xkeysym" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-xkeysym/2014-09-14/cl-xkeysym-20140914-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-xkeysym/2014-09-14/cl-xkeysym-20140914-git.tgz";
           sha256 = "0yxijl6xb5apb6v6qm8g3kfdr90slgg6vsnx4d1ps9z4zhrjlc6c";
           system = "cl-xkeysym";
           asd = "cl-xkeysym";
@@ -37998,7 +37998,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-xmlspam" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz";
           sha256 = "03jw57889b60nsqgb13vrf5q1g2fasah7qv7knjlx2w4mc1ci7ks";
           system = "cl-xmlspam";
           asd = "cl-xmlspam";
@@ -38019,7 +38019,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-xmpp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz";
           sha256 = "1kzzq1y0625zlg83ppcpb0aqzvqbga9x3gm826grmy4rf5jrhz5f";
           system = "cl-xmpp";
           asd = "cl-xmpp";
@@ -38043,7 +38043,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-xmpp-sasl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz";
           sha256 = "1kzzq1y0625zlg83ppcpb0aqzvqbga9x3gm826grmy4rf5jrhz5f";
           system = "cl-xmpp-sasl";
           asd = "cl-xmpp-sasl";
@@ -38067,7 +38067,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-xmpp-tls" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz";
           sha256 = "1kzzq1y0625zlg83ppcpb0aqzvqbga9x3gm826grmy4rf5jrhz5f";
           system = "cl-xmpp-tls";
           asd = "cl-xmpp-tls";
@@ -38090,7 +38090,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-xul" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-xul/2016-03-18/cl-xul-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-xul/2016-03-18/cl-xul-20160318-git.tgz";
           sha256 = "0ldny4bjfndrkyqcq6klqxvqkpb0lhcqlj52y89ybl9w7dkl2d9p";
           system = "cl-xul";
           asd = "cl-xul";
@@ -38120,7 +38120,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-xul-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-xul/2016-03-18/cl-xul-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-xul/2016-03-18/cl-xul-20160318-git.tgz";
           sha256 = "0ldny4bjfndrkyqcq6klqxvqkpb0lhcqlj52y89ybl9w7dkl2d9p";
           system = "cl-xul-test";
           asd = "cl-xul-test";
@@ -38143,7 +38143,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-yaclyaml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-yaclyaml/2016-08-25/cl-yaclyaml-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-yaclyaml/2016-08-25/cl-yaclyaml-20160825-git.tgz";
           sha256 = "1clfhz4ii2p11yc3bm23ib4rx0rfxsh18ddc2br82i7mbwks3pll";
           system = "cl-yaclyaml";
           asd = "cl-yaclyaml";
@@ -38172,7 +38172,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-yaclyaml-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-yaclyaml/2016-08-25/cl-yaclyaml-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-yaclyaml/2016-08-25/cl-yaclyaml-20160825-git.tgz";
           sha256 = "1clfhz4ii2p11yc3bm23ib4rx0rfxsh18ddc2br82i7mbwks3pll";
           system = "cl-yaclyaml-tests";
           asd = "cl-yaclyaml";
@@ -38196,7 +38196,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-yahoo-finance" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-yahoo-finance/2013-03-12/cl-yahoo-finance-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-yahoo-finance/2013-03-12/cl-yahoo-finance-20130312-git.tgz";
           sha256 = "1qhs4j00iw1w81lx0vmyiayzqyvixaxc5j2rc89qlr1gx12mqadl";
           system = "cl-yahoo-finance";
           asd = "cl-yahoo-finance";
@@ -38222,7 +38222,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-yaml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-yaml/2022-11-06/cl-yaml-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-yaml/2022-11-06/cl-yaml-20221106-git.tgz";
           sha256 = "053fvrrd0p2xx4zxbz4kg9469895ypwsbjfd3nwpi7lwcll2bir5";
           system = "cl-yaml";
           asd = "cl-yaml";
@@ -38247,7 +38247,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-yaml-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-yaml/2022-11-06/cl-yaml-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-yaml/2022-11-06/cl-yaml-20221106-git.tgz";
           sha256 = "053fvrrd0p2xx4zxbz4kg9469895ypwsbjfd3nwpi7lwcll2bir5";
           system = "cl-yaml-test";
           asd = "cl-yaml-test";
@@ -38275,7 +38275,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-yesql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-yesql/2021-10-20/cl-yesql-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-yesql/2021-10-20/cl-yesql-20211020-git.tgz";
           sha256 = "0bg133kprbssv0z4ir2hkhf72fbmnz9v9861ncs1isqaby2d4xlj";
           system = "cl-yesql";
           asd = "cl-yesql";
@@ -38302,7 +38302,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-zipper" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-zipper/2020-06-10/cl-zipper-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-zipper/2020-06-10/cl-zipper-20200610-git.tgz";
           sha256 = "1zcfy97l40ynbldxpx8nad81jlrfp0k2vic10wbkrqdfkr696xkg";
           system = "cl-zipper";
           asd = "cl-zipper";
@@ -38322,7 +38322,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl-zipper-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-zipper/2020-06-10/cl-zipper-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-zipper/2020-06-10/cl-zipper-20200610-git.tgz";
           sha256 = "1zcfy97l40ynbldxpx8nad81jlrfp0k2vic10wbkrqdfkr696xkg";
           system = "cl-zipper-test";
           asd = "cl-zipper";
@@ -38346,7 +38346,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cl4store" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl4store/2020-03-25/cl4store-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl4store/2020-03-25/cl4store-20200325-git.tgz";
           sha256 = "0qajxwlvmb5vd9qynnl0n62bcl1xhin49xk0p44v6pig8q2jzc26";
           system = "cl4store";
           asd = "cl4store";
@@ -38371,7 +38371,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clache" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clache/2017-11-30/clache-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clache/2017-11-30/clache-20171130-git.tgz";
           sha256 = "0wxg004bsay58vr6xr6mlk7wj415qmvisqxvpnjsg6glfwca86ys";
           system = "clache";
           asd = "clache";
@@ -38401,7 +38401,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clache-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clache/2017-11-30/clache-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clache/2017-11-30/clache-20171130-git.tgz";
           sha256 = "0wxg004bsay58vr6xr6mlk7wj415qmvisqxvpnjsg6glfwca86ys";
           system = "clache-test";
           asd = "clache-test";
@@ -38424,7 +38424,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
           sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "clack";
           asd = "clack";
@@ -38450,7 +38450,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-cors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz";
           sha256 = "1a2nfzbshc8y04my5fjlka666jd093nr0wz6mn8qfi70d688vkjh";
           system = "clack-cors";
           asd = "clack-cors";
@@ -38475,7 +38475,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-cors-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz";
           sha256 = "1a2nfzbshc8y04my5fjlka666jd093nr0wz6mn8qfi70d688vkjh";
           system = "clack-cors-ci";
           asd = "clack-cors-ci";
@@ -38495,7 +38495,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-cors-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz";
           sha256 = "1a2nfzbshc8y04my5fjlka666jd093nr0wz6mn8qfi70d688vkjh";
           system = "clack-cors-docs";
           asd = "clack-cors-docs";
@@ -38521,7 +38521,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-cors-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-cors/2025-06-22/clack-cors-20250622-git.tgz";
           sha256 = "1a2nfzbshc8y04my5fjlka666jd093nr0wz6mn8qfi70d688vkjh";
           system = "clack-cors-tests";
           asd = "clack-cors-tests";
@@ -38544,7 +38544,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-errors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz";
           sha256 = "0z6jyn37phnpq02l5wml8z0593g8ps95c0c2lzkhi3is2wcj9cpf";
           system = "clack-errors";
           asd = "clack-errors";
@@ -38571,7 +38571,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-errors-demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz";
           sha256 = "0z6jyn37phnpq02l5wml8z0593g8ps95c0c2lzkhi3is2wcj9cpf";
           system = "clack-errors-demo";
           asd = "clack-errors-demo";
@@ -38594,7 +38594,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-errors-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz";
           sha256 = "0z6jyn37phnpq02l5wml8z0593g8ps95c0c2lzkhi3is2wcj9cpf";
           system = "clack-errors-test";
           asd = "clack-errors-test";
@@ -38620,7 +38620,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-handler-hunchentoot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
           sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "clack-handler-hunchentoot";
           asd = "clack-handler-hunchentoot";
@@ -38647,7 +38647,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-handler-toot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
           sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "clack-handler-toot";
           asd = "clack-handler-toot";
@@ -38674,7 +38674,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-handler-woo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz";
           sha256 = "0nhxlb1qhkl20vknm44gx0cq5cks33rcljczfhgbnmpkzrdpdrrl";
           system = "clack-handler-woo";
           asd = "clack-handler-woo";
@@ -38694,7 +38694,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-handler-wookie" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
           sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "clack-handler-wookie";
           asd = "clack-handler-wookie";
@@ -38725,7 +38725,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-pretend" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-pretend/2024-10-12/clack-pretend-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-pretend/2024-10-12/clack-pretend-20241012-git.tgz";
           sha256 = "0f9y264bdxspd3sfzf9hq7v0myvq5va0drw8kji1b4gyprmg995k";
           system = "clack-pretend";
           asd = "clack-pretend";
@@ -38751,7 +38751,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-prometheus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz";
           sha256 = "00j4wzsjzlqq6fa6p5vv59z4v72qq8n78j3cz128icc73dgv3pzq";
           system = "clack-prometheus";
           asd = "clack-prometheus";
@@ -38780,7 +38780,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-prometheus-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz";
           sha256 = "00j4wzsjzlqq6fa6p5vv59z4v72qq8n78j3cz128icc73dgv3pzq";
           system = "clack-prometheus-ci";
           asd = "clack-prometheus-ci";
@@ -38800,7 +38800,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-prometheus-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz";
           sha256 = "00j4wzsjzlqq6fa6p5vv59z4v72qq8n78j3cz128icc73dgv3pzq";
           system = "clack-prometheus-docs";
           asd = "clack-prometheus-docs";
@@ -38826,7 +38826,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-prometheus-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-prometheus/2025-06-22/clack-prometheus-20250622-git.tgz";
           sha256 = "00j4wzsjzlqq6fa6p5vv59z4v72qq8n78j3cz128icc73dgv3pzq";
           system = "clack-prometheus-tests";
           asd = "clack-prometheus-tests";
@@ -38846,7 +38846,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-socket" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
           sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "clack-socket";
           asd = "clack-socket";
@@ -38864,7 +38864,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-static-asset-djula-helpers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz";
           sha256 = "0fk288812sdm012knqx4qqdhggdqbfgd0zfb6mc06xig20wj02hc";
           system = "clack-static-asset-djula-helpers";
           asd = "clack-static-asset-djula-helpers";
@@ -38887,7 +38887,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-static-asset-middleware" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz";
           sha256 = "0fk288812sdm012knqx4qqdhggdqbfgd0zfb6mc06xig20wj02hc";
           system = "clack-static-asset-middleware";
           asd = "clack-static-asset-middleware";
@@ -38913,7 +38913,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-static-asset-middleware-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz";
           sha256 = "0fk288812sdm012knqx4qqdhggdqbfgd0zfb6mc06xig20wj02hc";
           system = "clack-static-asset-middleware-test";
           asd = "clack-static-asset-middleware-test";
@@ -38939,7 +38939,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clack-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
           sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "clack-test";
           asd = "clack-test";
@@ -38969,7 +38969,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clad" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clad/2025-06-22/clad-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clad/2025-06-22/clad-20250622-git.tgz";
           sha256 = "0qr59j0d2df08vaijw3il5hh4j6vgrmwgm9nm1dc4nipqci1wadc";
           system = "clad";
           asd = "clad";
@@ -38989,7 +38989,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "class-options" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/class-options/2020-10-16/class-options_1.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/class-options/2020-10-16/class-options_1.0.1.tgz";
           sha256 = "1dkgr1vbrsra44jznzz2bvdf8nlpdrrkjcqrfs8aa7axksda3bqk";
           system = "class-options";
           asd = "class-options";
@@ -39009,7 +39009,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "class-options_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/class-options/2020-10-16/class-options_1.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/class-options/2020-10-16/class-options_1.0.1.tgz";
           sha256 = "1dkgr1vbrsra44jznzz2bvdf8nlpdrrkjcqrfs8aa7axksda3bqk";
           system = "class-options_tests";
           asd = "class-options_tests";
@@ -39034,7 +39034,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "classimp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/classimp/2025-06-22/classimp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/classimp/2025-06-22/classimp-20250622-git.tgz";
           sha256 = "0grily13njibm60fw81vlycn3131qi2dgp9yys5xj65cacjfyky0";
           system = "classimp";
           asd = "classimp";
@@ -39057,7 +39057,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "classimp-samples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/classimp/2025-06-22/classimp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/classimp/2025-06-22/classimp-20250622-git.tgz";
           sha256 = "0grily13njibm60fw81vlycn3131qi2dgp9yys5xj65cacjfyky0";
           system = "classimp-samples";
           asd = "classimp-samples";
@@ -39083,7 +39083,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "classowary" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/classowary/2023-10-21/classowary-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/classowary/2023-10-21/classowary-20231021-git.tgz";
           sha256 = "099zhf41d4frlrm99ldzypqjh03ijrvfn29f2pb0j6664h65bcsm";
           system = "classowary";
           asd = "classowary";
@@ -39101,7 +39101,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "classowary-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/classowary/2023-10-21/classowary-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/classowary/2023-10-21/classowary-20231021-git.tgz";
           sha256 = "099zhf41d4frlrm99ldzypqjh03ijrvfn29f2pb0j6664h65bcsm";
           system = "classowary-test";
           asd = "classowary-test";
@@ -39124,7 +39124,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clast" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clast/2025-06-22/clast-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clast/2025-06-22/clast-20250622-git.tgz";
           sha256 = "0ipybqc928ncdpq3rkxgk9c4y9mis4k139w284nn4g4yzh28vq1i";
           system = "clast";
           asd = "clast";
@@ -39144,7 +39144,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clath" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clath/2025-06-22/clath-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clath/2025-06-22/clath-20250622-git.tgz";
           sha256 = "136zf18g734mhvh3ghk9ag4y2ginzvirn1v51kchn7nxzsm8ay97";
           system = "clath";
           asd = "clath";
@@ -39177,7 +39177,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clavatar" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clavatar/2012-10-13/clavatar-20121013-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clavatar/2012-10-13/clavatar-20121013-git.tgz";
           sha256 = "07r58d4dk5nr3aimrryzbf3jw6580b5gkkbpw74ax4nmm8hz6v5y";
           system = "clavatar";
           asd = "clavatar";
@@ -39202,7 +39202,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clavier" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clavier/2025-06-22/clavier-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clavier/2025-06-22/clavier-20250622-git.tgz";
           sha256 = "19hmrzp2sgycmm1qq24nv89ss24d8vs6izjzxn9zp24zcdr64crs";
           system = "clavier";
           asd = "clavier";
@@ -39228,7 +39228,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clavier.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clavier/2025-06-22/clavier-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clavier/2025-06-22/clavier-20250622-git.tgz";
           sha256 = "19hmrzp2sgycmm1qq24nv89ss24d8vs6izjzxn9zp24zcdr64crs";
           system = "clavier.test";
           asd = "clavier.test";
@@ -39251,7 +39251,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "claw" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/claw/2020-10-16/claw-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/claw/2020-10-16/claw-stable-git.tgz";
           sha256 = "146yv0hc4hmk72562ssj2d41143pp84dcbd1h7f4nx1c7hf2bb0d";
           system = "claw";
           asd = "claw";
@@ -39279,7 +39279,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "claw-olm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/claw-olm/2021-05-31/claw-olm-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/claw-olm/2021-05-31/claw-olm-20210531-git.tgz";
           sha256 = "04r6d8infhcc7vz95asrvlpc0wzkzq1blaza74nd62alakr6mmrr";
           system = "claw-olm";
           asd = "claw-olm";
@@ -39299,7 +39299,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "claw-olm-bindings" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/claw-olm/2021-05-31/claw-olm-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/claw-olm/2021-05-31/claw-olm-20210531-git.tgz";
           sha256 = "04r6d8infhcc7vz95asrvlpc0wzkzq1blaza74nd62alakr6mmrr";
           system = "claw-olm-bindings";
           asd = "claw-olm-bindings";
@@ -39322,7 +39322,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "claw-support" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/claw-support/2020-10-16/claw-support-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/claw-support/2020-10-16/claw-support-stable-git.tgz";
           sha256 = "1my2ka7h72ipx5n3b465g6kjkasrhsvhqlijwcg6dhlzs5yygl23";
           system = "claw-support";
           asd = "claw-support";
@@ -39342,7 +39342,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "claw-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/claw-utils/2020-10-16/claw-utils-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/claw-utils/2020-10-16/claw-utils-stable-git.tgz";
           sha256 = "01df3kyf2qs3czi332dnz2s35x2j0fq46vgmsw7wjrrvnqc22mk5";
           system = "claw-utils";
           asd = "claw-utils";
@@ -39366,7 +39366,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clawk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clawk/2020-09-25/clawk-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clawk/2020-09-25/clawk-20200925-git.tgz";
           sha256 = "1ph3xjqilvinvgr9q3w47zxqyz1sqnq030nlx7kgkkv8j3bnqk7a";
           system = "clawk";
           asd = "clawk";
@@ -39386,7 +39386,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "claxy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/claxy/2022-02-20/claxy-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/claxy/2022-02-20/claxy-20220220-git.tgz";
           sha256 = "1n6zbsfp0zkndw7r3nar8srjj1wmfgngia3p7z756mmsvp1l68va";
           system = "claxy";
           asd = "claxy";
@@ -39409,7 +39409,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clazy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clazy/2025-06-22/clazy-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clazy/2025-06-22/clazy-20250622-git.tgz";
           sha256 = "023wx26gcswgkx0b7i2bjhpaqrphnniv5vrljhbhx1v1w9cf47yh";
           system = "clazy";
           asd = "clazy";
@@ -39429,7 +39429,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clem" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz";
           sha256 = "0vmsgxdpxrqkx3xp9n8b0fwkzk1r2dwcwjlc8yy5w2m2sighh2rk";
           system = "clem";
           asd = "clem";
@@ -39449,7 +39449,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clem-benchmark" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz";
           sha256 = "0vmsgxdpxrqkx3xp9n8b0fwkzk1r2dwcwjlc8yy5w2m2sighh2rk";
           system = "clem-benchmark";
           asd = "clem-benchmark";
@@ -39469,7 +39469,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clem-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz";
           sha256 = "0vmsgxdpxrqkx3xp9n8b0fwkzk1r2dwcwjlc8yy5w2m2sighh2rk";
           system = "clem-test";
           asd = "clem-test";
@@ -39489,7 +39489,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cleric" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cleric/2022-02-20/cleric-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cleric/2022-02-20/cleric-20220220-git.tgz";
           sha256 = "0a0xqr0bpp0v62f8d13yflz3vz6j4fa9icgc134ajaqxcfa7k0vp";
           system = "cleric";
           asd = "cleric";
@@ -39516,7 +39516,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cleric-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cleric/2022-02-20/cleric-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cleric/2022-02-20/cleric-20220220-git.tgz";
           sha256 = "0a0xqr0bpp0v62f8d13yflz3vz6j4fa9icgc134ajaqxcfa7k0vp";
           system = "cleric-test";
           asd = "cleric-test";
@@ -39541,7 +39541,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clerk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clerk/2024-10-12/clerk-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clerk/2024-10-12/clerk-20241012-git.tgz";
           sha256 = "0p81ha537bfs8421y74vrvhi1h61f38djr3iwgab30f6sdfj4k8j";
           system = "clerk";
           asd = "clerk";
@@ -39565,7 +39565,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clerk-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clerk/2024-10-12/clerk-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clerk/2024-10-12/clerk-20241012-git.tgz";
           sha256 = "0p81ha537bfs8421y74vrvhi1h61f38djr3iwgab30f6sdfj4k8j";
           system = "clerk-test";
           asd = "clerk";
@@ -39588,7 +39588,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clesh" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clesh/2020-12-20/clesh-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clesh/2020-12-20/clesh-20201220-git.tgz";
           sha256 = "012ry02djnqyvvs61wbbqj3saz621w2l9gczrywdxhi5p4ycx318";
           system = "clesh";
           asd = "clesh";
@@ -39611,7 +39611,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clesh-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clesh/2020-12-20/clesh-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clesh/2020-12-20/clesh-20201220-git.tgz";
           sha256 = "012ry02djnqyvvs61wbbqj3saz621w2l9gczrywdxhi5p4ycx318";
           system = "clesh-tests";
           asd = "clesh-tests";
@@ -39634,7 +39634,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cletris" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz";
           sha256 = "0k7j0jg4dc6q7p7h3vin3hs0f7q8d7yarg2mw0c3hng19r4q9p8v";
           system = "cletris";
           asd = "cletris";
@@ -39657,7 +39657,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cletris-network" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz";
           sha256 = "0k7j0jg4dc6q7p7h3vin3hs0f7q8d7yarg2mw0c3hng19r4q9p8v";
           system = "cletris-network";
           asd = "cletris-network";
@@ -39682,7 +39682,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cletris-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz";
           sha256 = "0k7j0jg4dc6q7p7h3vin3hs0f7q8d7yarg2mw0c3hng19r4q9p8v";
           system = "cletris-test";
           asd = "cletris-test";
@@ -39706,7 +39706,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clfswm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz";
           sha256 = "1r84cpcs74avkjw18ckz3r3836xhky2fcf5ypbfmajpjzxwn5dzc";
           system = "clfswm";
           asd = "clfswm";
@@ -39724,7 +39724,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clgplot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clgplot/2024-10-12/clgplot-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clgplot/2024-10-12/clgplot-20241012-git.tgz";
           sha256 = "0sl5g33v1lpkjimmcs22f32hgnlfhz0ydd5rgy0ykwb7jf7x3pv7";
           system = "clgplot";
           asd = "clgplot";
@@ -39744,7 +39744,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clgplot-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clgplot/2024-10-12/clgplot-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clgplot/2024-10-12/clgplot-20241012-git.tgz";
           sha256 = "0sl5g33v1lpkjimmcs22f32hgnlfhz0ydd5rgy0ykwb7jf7x3pv7";
           system = "clgplot-test";
           asd = "clgplot-test";
@@ -39768,7 +39768,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clhs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clhs/2015-04-07/clhs-0.6.3.tgz";
+          url = "https://beta.quicklisp.org/archive/clhs/2015-04-07/clhs-0.6.3.tgz";
           sha256 = "1jffq2w9yql4cvxy2g5c2v402014306qklp4xhddjjlfvs30sfjd";
           system = "clhs";
           asd = "clhs";
@@ -39788,7 +39788,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cli-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cli-parser/2015-06-08/cl-cli-parser-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cli-parser/2015-06-08/cl-cli-parser-20150608-git.tgz";
           sha256 = "0gnpakzakkb2j67v2wh4q87k6mmrv0c0fg56m4vx88kgpxp7f90f";
           system = "cli-parser";
           asd = "cli-parser";
@@ -39808,7 +39808,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clickr" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clickr/2014-07-13/clickr-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clickr/2014-07-13/clickr-20140713-git.tgz";
           sha256 = "0sykp4aaxjf8xcyiqyqs6967f0fna8ahjqi7ij5z79fd530sxz2s";
           system = "clickr";
           asd = "clickr";
@@ -39834,7 +39834,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim";
           asd = "clim";
@@ -39857,7 +39857,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clim-core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-core";
           asd = "clim-core";
@@ -39885,7 +39885,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clim-debugger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-debugger";
           asd = "clim-debugger";
@@ -39910,7 +39910,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clim-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-examples";
           asd = "clim-examples";
@@ -39938,7 +39938,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clim-lisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-lisp";
           asd = "clim-lisp";
@@ -39964,7 +39964,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clim-listener" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-listener";
           asd = "clim-listener";
@@ -39988,7 +39988,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clim-pdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-pdf";
           asd = "clim-pdf";
@@ -40015,7 +40015,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clim-postscript" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-postscript";
           asd = "clim-postscript";
@@ -40038,7 +40038,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clim-postscript-font" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clim-postscript-font";
           asd = "clim-postscript-font";
@@ -40058,7 +40058,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clim-widgets" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clim-widgets/2020-07-15/clim-widgets-20200715-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clim-widgets/2020-07-15/clim-widgets-20200715-git.tgz";
           sha256 = "0cpr8xn5a33sy75d06b95cfd3b1h9m5iixgg5h4isavpx3aglmy2";
           system = "clim-widgets";
           asd = "clim-widgets";
@@ -40087,7 +40087,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "climacs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/climacs/2024-10-12/climacs-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/climacs/2024-10-12/climacs-20241012-git.tgz";
           sha256 = "0swbnsnavwaxpdcdsdag6iadc6v436pawbrzz6p8lkkbmbmc7yf8";
           system = "climacs";
           asd = "climacs";
@@ -40110,7 +40110,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "climc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/climc/2023-02-14/climc-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/climc/2023-02-14/climc-20230214-git.tgz";
           sha256 = "0wnsyxkff5i4n36rwb5z54j4gi0j9n8459wcm6cj3lg77njmpasb";
           system = "climc";
           asd = "climc";
@@ -40134,7 +40134,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "climc-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/climc/2023-02-14/climc-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/climc/2023-02-14/climc-20230214-git.tgz";
           sha256 = "0wnsyxkff5i4n36rwb5z54j4gi0j9n8459wcm6cj3lg77njmpasb";
           system = "climc-test";
           asd = "climc-test";
@@ -40157,7 +40157,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "climon" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/climon/2022-02-20/climon-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/climon/2022-02-20/climon-20220220-git.tgz";
           sha256 = "00bdxpzgvmf5yg785xc9454nv7x5n314kywjd0f12mbvrgklb818";
           system = "climon";
           asd = "climon";
@@ -40177,7 +40177,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "climon-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/climon/2022-02-20/climon-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/climon/2022-02-20/climon-20220220-git.tgz";
           sha256 = "00bdxpzgvmf5yg785xc9454nv7x5n314kywjd0f12mbvrgklb818";
           system = "climon-test";
           asd = "climon-test";
@@ -40201,7 +40201,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clinch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz";
           sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik";
           system = "clinch";
           asd = "clinch";
@@ -40229,7 +40229,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clinch-cairo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz";
           sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik";
           system = "clinch-cairo";
           asd = "clinch-cairo";
@@ -40253,7 +40253,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clinch-classimp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz";
           sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik";
           system = "clinch-classimp";
           asd = "clinch-classimp";
@@ -40277,7 +40277,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clinch-freeimage" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz";
           sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik";
           system = "clinch-freeimage";
           asd = "clinch-freeimage";
@@ -40301,7 +40301,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clinch-pango" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz";
           sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik";
           system = "clinch-pango";
           asd = "clinch-pango";
@@ -40328,7 +40328,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clinenoise" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clinenoise/2020-04-27/clinenoise-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clinenoise/2020-04-27/clinenoise-20200427-git.tgz";
           sha256 = "0ydlirfk4dbpqqjwwph99v5swcrhd8v9g8q24fvs35wn2vm08lh1";
           system = "clinenoise";
           asd = "clinenoise";
@@ -40353,7 +40353,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clingon" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz";
           sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc";
           system = "clingon";
           asd = "clingon";
@@ -40378,7 +40378,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clingon.demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz";
           sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc";
           system = "clingon.demo";
           asd = "clingon.demo";
@@ -40398,7 +40398,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clingon.intro" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz";
           sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc";
           system = "clingon.intro";
           asd = "clingon.intro";
@@ -40418,7 +40418,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clingon.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz";
           sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc";
           system = "clingon.test";
           asd = "clingon.test";
@@ -40441,7 +40441,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clip" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clip/2025-06-22/clip-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clip/2025-06-22/clip-20250622-git.tgz";
           sha256 = "1ikyf0340clllafjb7jg2bvwxfnb0vv8bjnd8ngn4qlpsx75m1nl";
           system = "clip";
           asd = "clip";
@@ -40464,7 +40464,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clipper" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clipper/2015-09-23/clipper-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clipper/2015-09-23/clipper-20150923-git.tgz";
           sha256 = "0xx1z7xjy2qkb6hx4bjjxcpv180lynpxrmx0741zk0qcxf32y56n";
           system = "clipper";
           asd = "clipper";
@@ -40495,7 +40495,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clipper-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clipper/2015-09-23/clipper-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clipper/2015-09-23/clipper-20150923-git.tgz";
           sha256 = "0xx1z7xjy2qkb6hx4bjjxcpv180lynpxrmx0741zk0qcxf32y56n";
           system = "clipper-test";
           asd = "clipper-test";
@@ -40520,7 +40520,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clite/2013-06-15/clite-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clite/2013-06-15/clite-20130615-git.tgz";
           sha256 = "0q73vzm55i7m6in9i3fwwaqxvwm3pr7mm7gh7qsvfya61248ynrz";
           system = "clite";
           asd = "clite";
@@ -40540,7 +40540,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clith" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clith/2025-06-22/clith-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clith/2025-06-22/clith-20250622-git.tgz";
           sha256 = "0n973pf696bi8mv6nazjwdwgp1i2p8jfp3ab068y0cvnrww693x6";
           system = "clith";
           asd = "clith";
@@ -40563,7 +40563,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clj" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clj/2020-12-20/clj-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clj/2020-12-20/clj-20201220-git.tgz";
           sha256 = "0yic6w2n09w3v2r1dlg9a7z59j9rapj4hpz8whcxlw6zs4wrwib2";
           system = "clj";
           asd = "clj";
@@ -40592,7 +40592,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clj-arrows" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clj-arrows/2024-10-12/clj-arrows-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clj-arrows/2024-10-12/clj-arrows-20241012-git.tgz";
           sha256 = "0b0dpjbyk41h32laqa4hwlgximafkjgrgdahabyc3blkg5v7lill";
           system = "clj-arrows";
           asd = "clj-arrows";
@@ -40612,7 +40612,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clj-arrows-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clj-arrows/2024-10-12/clj-arrows-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clj-arrows/2024-10-12/clj-arrows-20241012-git.tgz";
           sha256 = "0b0dpjbyk41h32laqa4hwlgximafkjgrgdahabyc3blkg5v7lill";
           system = "clj-arrows-test";
           asd = "clj-arrows-test";
@@ -40635,7 +40635,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clj-con" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clj-con/2024-10-12/clj-con-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clj-con/2024-10-12/clj-con-20241012-git.tgz";
           sha256 = "05zjw4ncwwpmckxqv61zhv1lcyfm7w4ic59ypcw5bypxwgkapa7c";
           system = "clj-con";
           asd = "clj-con";
@@ -40658,7 +40658,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clj-con-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clj-con/2024-10-12/clj-con-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clj-con/2024-10-12/clj-con-20241012-git.tgz";
           sha256 = "05zjw4ncwwpmckxqv61zhv1lcyfm7w4ic59ypcw5bypxwgkapa7c";
           system = "clj-con-test";
           asd = "clj-con-test";
@@ -40681,7 +40681,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clj-re" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clj-re/2024-10-12/clj-re-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clj-re/2024-10-12/clj-re-20241012-git.tgz";
           sha256 = "05d0xqnhd50hmvicaq3a08m52c12j7cmxz99mpmk10mp0cv572bl";
           system = "clj-re";
           asd = "clj-re";
@@ -40704,7 +40704,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clj-re-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clj-re/2024-10-12/clj-re-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clj-re/2024-10-12/clj-re-20241012-git.tgz";
           sha256 = "05d0xqnhd50hmvicaq3a08m52c12j7cmxz99mpmk10mp0cv572bl";
           system = "clj-re-test";
           asd = "clj-re-test";
@@ -40727,7 +40727,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml";
           asd = "clml";
@@ -40767,7 +40767,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.association-rule" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.association-rule";
           asd = "clml.association-rule";
@@ -40787,7 +40787,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.blas" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.blas";
           asd = "clml.blas";
@@ -40811,7 +40811,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.blas.complex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.blas.complex";
           asd = "clml.blas";
@@ -40831,7 +40831,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.blas.hompack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.blas.hompack";
           asd = "clml.blas";
@@ -40852,7 +40852,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.blas.real" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.blas.real";
           asd = "clml.blas";
@@ -40872,7 +40872,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.classifiers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.classifiers";
           asd = "clml.classifiers";
@@ -40896,7 +40896,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.clustering" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.clustering";
           asd = "clml.clustering";
@@ -40921,7 +40921,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.data" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.data";
           asd = "clml.data";
@@ -40941,7 +40941,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.data.r-datasets" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.data.r-datasets";
           asd = "clml.data.r-datasets";
@@ -40966,7 +40966,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.decision-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.decision-tree";
           asd = "clml.decision-tree";
@@ -40989,7 +40989,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.docs";
           asd = "clml.docs";
@@ -41014,7 +41014,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.graph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.graph";
           asd = "clml.graph";
@@ -41040,7 +41040,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.hjs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.hjs";
           asd = "clml.hjs";
@@ -41069,7 +41069,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.lapack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.lapack";
           asd = "clml.lapack";
@@ -41093,7 +41093,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.lapack-real" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.lapack-real";
           asd = "clml.lapack";
@@ -41116,7 +41116,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.nearest-search" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.nearest-search";
           asd = "clml.nearest-search";
@@ -41140,7 +41140,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.nonparametric" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.nonparametric";
           asd = "clml.nonparametric";
@@ -41160,7 +41160,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.numeric" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.numeric";
           asd = "clml.numeric";
@@ -41180,7 +41180,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.pca" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.pca";
           asd = "clml.pca";
@@ -41203,7 +41203,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.pca.examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.pca.examples";
           asd = "clml.pca";
@@ -41226,7 +41226,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.som" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.som";
           asd = "clml.som";
@@ -41250,7 +41250,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.som.example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.som.example";
           asd = "clml.som";
@@ -41274,7 +41274,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.statistics" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.statistics";
           asd = "clml.statistics";
@@ -41294,7 +41294,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.statistics.rand" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.statistics.rand";
           asd = "clml.statistics.rand";
@@ -41314,7 +41314,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.svm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.svm";
           asd = "clml.svm";
@@ -41339,7 +41339,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.svm.examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.svm.examples";
           asd = "clml.svm";
@@ -41362,7 +41362,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.test";
           asd = "clml.test";
@@ -41385,7 +41385,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.text" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.text";
           asd = "clml.text";
@@ -41409,7 +41409,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.time-series" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.time-series";
           asd = "clml.time-series";
@@ -41434,7 +41434,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clml.utility" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "clml.utility";
           asd = "clml.utility";
@@ -41462,7 +41462,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clnuplot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clnuplot/2013-01-28/clnuplot-20130128-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/clnuplot/2013-01-28/clnuplot-20130128-darcs.tgz";
           sha256 = "0yfaay5idv9lq4ilafj305sg349c960n3q400kdayr0gda6pqlqr";
           system = "clnuplot";
           asd = "clnuplot";
@@ -41487,7 +41487,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clobber" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz";
           sha256 = "1n6j9q0czrzigw7vfahlylm1g8hmk7b1wm84jm94cgl8r5r3s8ra";
           system = "clobber";
           asd = "clobber";
@@ -41507,7 +41507,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clobber-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz";
           sha256 = "1n6j9q0czrzigw7vfahlylm1g8hmk7b1wm84jm94cgl8r5r3s8ra";
           system = "clobber-base";
           asd = "clobber-base";
@@ -41527,7 +41527,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clobber-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz";
           sha256 = "1n6j9q0czrzigw7vfahlylm1g8hmk7b1wm84jm94cgl8r5r3s8ra";
           system = "clobber-test";
           asd = "clobber-test";
@@ -41547,7 +41547,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clod" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clod/2019-03-07/clod-20190307-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/clod/2019-03-07/clod-20190307-hg.tgz";
           sha256 = "0sdlr6jlqnbiyf06648zhq8dpni3zy0n5rwjcrvm4hw7vcy8vhy1";
           system = "clod";
           asd = "clod";
@@ -41571,7 +41571,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clods-export" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clods-export/2021-04-11/clods-export-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clods-export/2021-04-11/clods-export-20210411-git.tgz";
           sha256 = "1bbzrl855qjs88ni548filghb2y8fvklkik22amwzi6dbzvq48qx";
           system = "clods-export";
           asd = "clods-export";
@@ -41598,7 +41598,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz";
           sha256 = "1sf2xan0fh2qqr8xgmsbmq9qcj5nkzrp3nq7gd69ssbkz9ab6qpw";
           system = "clog";
           asd = "clog";
@@ -41639,7 +41639,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clog-ace" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clog-ace/2024-10-12/clog-ace-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clog-ace/2024-10-12/clog-ace-20241012-git.tgz";
           sha256 = "01hwaiccy5i81w22kya00jscgpjw6iib2hnklqwky88i35kbb4sj";
           system = "clog-ace";
           asd = "clog-ace";
@@ -41659,7 +41659,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clog-collection" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clog-collection/2024-10-12/clog-collection-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clog-collection/2024-10-12/clog-collection-20241012-git.tgz";
           sha256 = "0f6rw9sla5f7jglbisving0c97vz3a5bbn59li0jzngqp8rqwsqx";
           system = "clog-collection";
           asd = "clog-collection";
@@ -41686,7 +41686,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clog-plotly" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clog-plotly/2024-10-12/clog-plotly-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clog-plotly/2024-10-12/clog-plotly-20241012-git.tgz";
           sha256 = "064fhfhh5nr1g9f4pn9x2ydmxdnxmvyxhwgbl3dgqm416scjzzs1";
           system = "clog-plotly";
           asd = "clog-plotly";
@@ -41706,7 +41706,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clog-terminal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clog-terminal/2024-10-12/clog-terminal-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clog-terminal/2024-10-12/clog-terminal-20241012-git.tgz";
           sha256 = "1pvrja8fvdzqmiqzl23lb7665vcpx9lhwxahns81wlykkyx7cjd5";
           system = "clog-terminal";
           asd = "clog-terminal";
@@ -41726,7 +41726,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clohost" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clohost/2024-10-12/clohost-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clohost/2024-10-12/clohost-20241012-git.tgz";
           sha256 = "1qph7nrjb62qxwkv5wbzqkycdavsjvi39b97qvs5g8jsrvbl50lh";
           system = "clohost";
           asd = "clohost";
@@ -41752,7 +41752,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clonsigna" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clonsigna/2012-09-09/clonsigna-20120909-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clonsigna/2012-09-09/clonsigna-20120909-git.tgz";
           sha256 = "052vdch0q07sx3j615qgw8z536fmqz8fm3qv7f298ql3wcskrj7j";
           system = "clonsigna";
           asd = "clonsigna";
@@ -41780,7 +41780,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clop" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clop/2022-02-20/clop-v1.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/clop/2022-02-20/clop-v1.0.1.tgz";
           sha256 = "1q7rlizr8gcbfz4a9660gdbw7d2zbld18akjpibg54j7jh5kb8gc";
           system = "clop";
           asd = "clop";
@@ -41806,7 +41806,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clop-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clop/2022-02-20/clop-v1.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/clop/2022-02-20/clop-v1.0.1.tgz";
           sha256 = "1q7rlizr8gcbfz4a9660gdbw7d2zbld18akjpibg54j7jh5kb8gc";
           system = "clop-tests";
           asd = "clop";
@@ -41829,7 +41829,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clos-diff" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clos-diff/2015-06-08/clos-diff-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clos-diff/2015-06-08/clos-diff-20150608-git.tgz";
           sha256 = "0y6chxzqwwwkrrmxxb74wwci6i4ck6i3fq36w9gl03qbrksfyjkz";
           system = "clos-diff";
           asd = "clos-diff";
@@ -41849,7 +41849,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clos-encounters" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clos-encounters/2024-10-12/clos-encounters-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clos-encounters/2024-10-12/clos-encounters-20241012-git.tgz";
           sha256 = "021ygh6s5qb7l155bcp9qv1w2dhq9csscasp77vjlms1ahpq9ixf";
           system = "clos-encounters";
           asd = "clos-encounters";
@@ -41869,7 +41869,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clos-fixtures" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clos-fixtures/2016-08-25/clos-fixtures-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clos-fixtures/2016-08-25/clos-fixtures-20160825-git.tgz";
           sha256 = "1a3yvqszdwnsnk5hr4zrdpaqxb8vlxpl2nhxjl0j97fnmfaiqjhk";
           system = "clos-fixtures";
           asd = "clos-fixtures";
@@ -41889,7 +41889,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clos-fixtures-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clos-fixtures/2016-08-25/clos-fixtures-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clos-fixtures/2016-08-25/clos-fixtures-20160825-git.tgz";
           sha256 = "1a3yvqszdwnsnk5hr4zrdpaqxb8vlxpl2nhxjl0j97fnmfaiqjhk";
           system = "clos-fixtures-test";
           asd = "clos-fixtures-test";
@@ -41912,7 +41912,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "closer-mop" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/closer-mop/2025-06-22/closer-mop-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/closer-mop/2025-06-22/closer-mop-20250622-git.tgz";
           sha256 = "11mzk34j9mq1sq99im1n6y798kfrxgavskwx9mrywmvs316pssly";
           system = "closer-mop";
           asd = "closer-mop";
@@ -41930,7 +41930,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "closure-common" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz";
           sha256 = "0k5r2qxn122pxi301ijir3nayi9sg4d7yiy276l36qmzwhp4mg5n";
           system = "closure-common";
           asd = "closure-common";
@@ -41951,7 +41951,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "closure-html" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz";
           sha256 = "105vm29qnxh6zj3rh4jwpm8dyp3b9bsva64c8a78cr270p28d032";
           system = "closure-html";
           asd = "closure-html";
@@ -41972,7 +41972,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "closure-template" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-closure-template/2015-08-04/cl-closure-template-20150804-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-closure-template/2015-08-04/cl-closure-template-20150804-git.tgz";
           sha256 = "16h0fs6bjjd4n9pbkwcprpgyj26vsw2akk3q08m7xmsmqi05dppv";
           system = "closure-template";
           asd = "closure-template";
@@ -42000,7 +42000,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "closure-template-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-closure-template/2015-08-04/cl-closure-template-20150804-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-closure-template/2015-08-04/cl-closure-template-20150804-git.tgz";
           sha256 = "16h0fs6bjjd4n9pbkwcprpgyj26vsw2akk3q08m7xmsmqi05dppv";
           system = "closure-template-test";
           asd = "closure-template";
@@ -42023,7 +42023,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clouchdb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clouchdb/2012-04-07/clouchdb_0.0.16.tgz";
+          url = "https://beta.quicklisp.org/archive/clouchdb/2012-04-07/clouchdb_0.0.16.tgz";
           sha256 = "1zfk4wkz0k5gbfznnbds0gcpc2y08p47rq7mhchf27v6rqg4kd7d";
           system = "clouchdb";
           asd = "clouchdb";
@@ -42049,7 +42049,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clouchdb-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clouchdb/2012-04-07/clouchdb_0.0.16.tgz";
+          url = "https://beta.quicklisp.org/archive/clouchdb/2012-04-07/clouchdb_0.0.16.tgz";
           sha256 = "1zfk4wkz0k5gbfznnbds0gcpc2y08p47rq7mhchf27v6rqg4kd7d";
           system = "clouchdb-examples";
           asd = "clouchdb-examples";
@@ -42072,7 +42072,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clouseau" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "clouseau";
           asd = "clouseau";
@@ -42095,7 +42095,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clpython" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-python/2022-03-31/cl-python-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-python/2022-03-31/cl-python-20220331-git.tgz";
           sha256 = "1liskpyfd8rbqn45xbymwvh4vic05pyvvf3hnq2ybyixwnkan9i9";
           system = "clpython";
           asd = "clpython";
@@ -42119,7 +42119,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
           sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0";
           system = "clsql";
           asd = "clsql";
@@ -42137,7 +42137,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-aodbc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
           sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0";
           system = "clsql-aodbc";
           asd = "clsql-aodbc";
@@ -42157,7 +42157,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
           sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0";
           system = "clsql-cffi";
           asd = "clsql-cffi";
@@ -42177,7 +42177,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-fluid" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql-fluid/2017-08-30/clsql-fluid-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql-fluid/2017-08-30/clsql-fluid-20170830-git.tgz";
           sha256 = "0i7x1xbh83wfr3k4ddsdy57yf0nqfhdxcbwv1na1ina6m5javg11";
           system = "clsql-fluid";
           asd = "clsql-fluid";
@@ -42201,7 +42201,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-helper" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz";
           sha256 = "0yc6m8yh0gcark98wvjjwdq3xxy308x15pb7fzha6svxa06hf27g";
           system = "clsql-helper";
           asd = "clsql-helper";
@@ -42232,7 +42232,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-helper-slot-coercer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz";
           sha256 = "0yc6m8yh0gcark98wvjjwdq3xxy308x15pb7fzha6svxa06hf27g";
           system = "clsql-helper-slot-coercer";
           asd = "clsql-helper-slot-coercer";
@@ -42255,7 +42255,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-helper-slot-coercer-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz";
           sha256 = "0yc6m8yh0gcark98wvjjwdq3xxy308x15pb7fzha6svxa06hf27g";
           system = "clsql-helper-slot-coercer-test";
           asd = "clsql-helper-slot-coercer";
@@ -42278,7 +42278,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-helper-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz";
           sha256 = "0yc6m8yh0gcark98wvjjwdq3xxy308x15pb7fzha6svxa06hf27g";
           system = "clsql-helper-test";
           asd = "clsql-helper";
@@ -42302,7 +42302,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-local-time" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql-local-time/2020-10-16/clsql-local-time-20201016-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql-local-time/2020-10-16/clsql-local-time-20201016-git.tgz";
           sha256 = "1ipv6ij1md5mw44cbif31hiccrric3302rhssj8f7kg3s8n6mphv";
           system = "clsql-local-time";
           asd = "clsql-local-time";
@@ -42325,7 +42325,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-mysql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
           sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0";
           system = "clsql-mysql";
           asd = "clsql-mysql";
@@ -42349,7 +42349,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-odbc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
           sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0";
           system = "clsql-odbc";
           asd = "clsql-odbc";
@@ -42372,7 +42372,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-orm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql-orm/2016-02-08/clsql-orm-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql-orm/2016-02-08/clsql-orm-20160208-git.tgz";
           sha256 = "1y9604k0mj8h03p85l5nrjkihr3yfj5fp910db9f4ksd1ln2qkka";
           system = "clsql-orm";
           asd = "clsql-orm";
@@ -42399,7 +42399,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-postgresql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
           sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0";
           system = "clsql-postgresql";
           asd = "clsql-postgresql";
@@ -42420,7 +42420,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-postgresql-socket" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
           sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0";
           system = "clsql-postgresql-socket";
           asd = "clsql-postgresql-socket";
@@ -42442,7 +42442,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-postgresql-socket3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
           sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0";
           system = "clsql-postgresql-socket3";
           asd = "clsql-postgresql-socket3";
@@ -42466,7 +42466,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-sqlite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
           sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0";
           system = "clsql-sqlite";
           asd = "clsql-sqlite";
@@ -42489,7 +42489,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-sqlite3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
           sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0";
           system = "clsql-sqlite3";
           asd = "clsql-sqlite3";
@@ -42510,7 +42510,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
           sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0";
           system = "clsql-tests";
           asd = "clsql-tests";
@@ -42534,7 +42534,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clsql-uffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz";
           sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0";
           system = "clsql-uffi";
           asd = "clsql-uffi";
@@ -42555,7 +42555,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clss" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clss/2025-06-22/clss-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clss/2025-06-22/clss-20250622-git.tgz";
           sha256 = "08ivm4x6j9lvvl55df71h2azwf4l47nyvi0yrb4rs5paqjd4afq3";
           system = "clss";
           asd = "clss";
@@ -42576,7 +42576,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cltcl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cltcl/2016-12-04/cltcl-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cltcl/2016-12-04/cltcl-20161204-git.tgz";
           sha256 = "18b7fa7m9h9xfhnkxa6r3xzj86p1fvq0mh5q8vdrdv3vxfyc2l68";
           system = "cltcl";
           asd = "cltcl";
@@ -42596,7 +42596,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cluffer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz";
           sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg";
           system = "cluffer";
           asd = "cluffer";
@@ -42620,7 +42620,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cluffer-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz";
           sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg";
           system = "cluffer-base";
           asd = "cluffer-base";
@@ -42640,7 +42640,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cluffer-simple-buffer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz";
           sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg";
           system = "cluffer-simple-buffer";
           asd = "cluffer-simple-buffer";
@@ -42660,7 +42660,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cluffer-simple-line" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz";
           sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg";
           system = "cluffer-simple-line";
           asd = "cluffer-simple-line";
@@ -42680,7 +42680,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cluffer-standard-buffer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz";
           sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg";
           system = "cluffer-standard-buffer";
           asd = "cluffer-standard-buffer";
@@ -42703,7 +42703,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cluffer-standard-line" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz";
           sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg";
           system = "cluffer-standard-line";
           asd = "cluffer-standard-line";
@@ -42723,7 +42723,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cluffer-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz";
           sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg";
           system = "cluffer-test";
           asd = "cluffer-test";
@@ -42743,7 +42743,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clump" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz";
           sha256 = "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh";
           system = "clump";
           asd = "clump";
@@ -42764,7 +42764,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clump-2-3-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz";
           sha256 = "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh";
           system = "clump-2-3-tree";
           asd = "clump-2-3-tree";
@@ -42782,7 +42782,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clump-binary-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz";
           sha256 = "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh";
           system = "clump-binary-tree";
           asd = "clump-binary-tree";
@@ -42800,7 +42800,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clump-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz";
           sha256 = "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh";
           system = "clump-test";
           asd = "clump-test";
@@ -42820,7 +42820,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clunit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz";
           sha256 = "1idf2xnqzlhi8rbrqmzpmb3i1l6pbdzhhajkmhwbp6qjkmxa4h85";
           system = "clunit";
           asd = "clunit";
@@ -42838,7 +42838,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clunit2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clunit2/2025-06-22/clunit2-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clunit2/2025-06-22/clunit2-20250622-git.tgz";
           sha256 = "0xm9jsy2wsvbbf8cgln6601a1rbyiz8hk17vh0lm747sqhg2vxc5";
           system = "clunit2";
           asd = "clunit2";
@@ -42856,7 +42856,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clustered-intset" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clustered-intset/2022-07-07/clustered-intset-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clustered-intset/2022-07-07/clustered-intset-20220707-git.tgz";
           sha256 = "035s2gn59l8389b0ypnb4qna7zplz9rxk05aw88qf8g4b7wyba1h";
           system = "clustered-intset";
           asd = "clustered-intset";
@@ -42876,7 +42876,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clustered-intset-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clustered-intset/2022-07-07/clustered-intset-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clustered-intset/2022-07-07/clustered-intset-20220707-git.tgz";
           sha256 = "035s2gn59l8389b0ypnb4qna7zplz9rxk05aw88qf8g4b7wyba1h";
           system = "clustered-intset-test";
           asd = "clustered-intset-test";
@@ -42900,7 +42900,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clusters" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clusters/2022-03-31/clusters-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clusters/2022-03-31/clusters-20220331-git.tgz";
           sha256 = "1x78ihrrah0rrb2ddxmxqcqpkswdvb3f0via56bkf1f3f5kqmsb8";
           system = "clusters";
           asd = "clusters";
@@ -42929,7 +42929,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clusters-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clusters/2022-03-31/clusters-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clusters/2022-03-31/clusters-20220331-git.tgz";
           sha256 = "1x78ihrrah0rrb2ddxmxqcqpkswdvb3f0via56bkf1f3f5kqmsb8";
           system = "clusters-tests";
           asd = "clusters-tests";
@@ -42953,7 +42953,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clutter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clutter/2021-10-20/clutter-v1.0.0.tgz";
+          url = "https://beta.quicklisp.org/archive/clutter/2021-10-20/clutter-v1.0.0.tgz";
           sha256 = "1q9mg4d0nja9ypm13i24wymhjwziw6n7r7p1dzw6xc5zhavqsni7";
           system = "clutter";
           asd = "clutter";
@@ -42976,7 +42976,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clweb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clweb/2020-12-20/clweb-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clweb/2020-12-20/clweb-20201220-git.tgz";
           sha256 = "0hqyrglgsgal5s8f0n247hg0hqlw6l6w1r5i8lzf0a0xvcz49f48";
           system = "clweb";
           asd = "clweb";
@@ -42996,7 +42996,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clws" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clws/2013-08-13/clws-20130813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clws/2013-08-13/clws-20130813-git.tgz";
           sha256 = "1svj025zwsbkb0hrbz1nj0x306hkhy9xinq0x1qdflc9vg169dh6";
           system = "clws";
           asd = "clws";
@@ -43023,7 +43023,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "clx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clx/2024-10-12/clx-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clx/2024-10-12/clx-20241012-git.tgz";
           sha256 = "16l0badm7dxwi7x5ynk1scrbrilnxi1nzz79h1v15xi6b41pf65w";
           system = "clx";
           asd = "clx";
@@ -43041,7 +43041,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cmake-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cmake-parser/2018-08-31/cmake-parser-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cmake-parser/2018-08-31/cmake-parser-20180831-git.tgz";
           sha256 = "1sb5pwxhg7k41202kvxj1b60c5pxnl0mfbqdz53xayddngn2brgl";
           system = "cmake-parser";
           asd = "cmake-parser";
@@ -43064,7 +43064,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cmark" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cmark/2024-10-12/cl-cmark-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cmark/2024-10-12/cl-cmark-20241012-git.tgz";
           sha256 = "1l4i530161ppfz0wn1da7g7dwf644ppp1afrq2p7qfkajm7dcfg5";
           system = "cmark";
           asd = "cmark";
@@ -43088,7 +43088,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cmd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cmd/2025-06-22/cmd-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cmd/2025-06-22/cmd-20250622-git.tgz";
           sha256 = "1wm06jvb24pcrfy5h8xm5l6jh13dsrir789bz1c50pjm17wlbk3k";
           system = "cmd";
           asd = "cmd";
@@ -43114,7 +43114,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cmu-infix" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cmu-infix/2018-02-28/cmu-infix-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cmu-infix/2018-02-28/cmu-infix-20180228-git.tgz";
           sha256 = "0macs398088cfif1dkjrpmidk515sjl7ld96f9ys5cpzx8sc5gib";
           system = "cmu-infix";
           asd = "cmu-infix";
@@ -43134,7 +43134,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cmu-infix-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cmu-infix/2018-02-28/cmu-infix-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cmu-infix/2018-02-28/cmu-infix-20180228-git.tgz";
           sha256 = "0macs398088cfif1dkjrpmidk515sjl7ld96f9ys5cpzx8sc5gib";
           system = "cmu-infix-tests";
           asd = "cmu-infix-tests";
@@ -43157,7 +43157,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "coalton" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
           sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "coalton";
           asd = "coalton";
@@ -43182,7 +43182,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "coalton-asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
           sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "coalton-asdf";
           asd = "coalton-asdf";
@@ -43202,7 +43202,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "coalton-compiler" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
           sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "coalton-compiler";
           asd = "coalton-compiler";
@@ -43232,7 +43232,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "coalton-testing-example-project" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
           sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "coalton-testing-example-project";
           asd = "coalton-testing-example-project";
@@ -43255,7 +43255,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cocoas" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cocoas/2025-06-22/cocoas-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cocoas/2025-06-22/cocoas-20250622-git.tgz";
           sha256 = "1mw20p5apf75vf26hqbvsbmr46kw6nab36mg11wff1p22l4xmlqx";
           system = "cocoas";
           asd = "cocoas";
@@ -43279,7 +43279,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "codata-recommended-values" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/codata-recommended-values/2025-06-22/codata-recommended-values-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/codata-recommended-values/2025-06-22/codata-recommended-values-20250622-git.tgz";
           sha256 = "0s3bc8znh3jrm5n4lw87qa6lm2w2bkv96bh8li7kskfdvd3fzgfi";
           system = "codata-recommended-values";
           asd = "codata-recommended-values";
@@ -43299,7 +43299,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "codex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/codex/2024-10-12/codex-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/codex/2024-10-12/codex-20241012-git.tgz";
           sha256 = "06d1qscqnkd24fhpvsm0206a4cj3wsxma7amazhvzqy1y4girgc3";
           system = "codex";
           asd = "codex";
@@ -43328,7 +43328,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "codex-templates" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/codex/2024-10-12/codex-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/codex/2024-10-12/codex-20241012-git.tgz";
           sha256 = "06d1qscqnkd24fhpvsm0206a4cj3wsxma7amazhvzqy1y4girgc3";
           system = "codex-templates";
           asd = "codex-templates";
@@ -43353,7 +43353,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "coleslaw" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coleslaw/2025-06-22/coleslaw-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/coleslaw/2025-06-22/coleslaw-20250622-git.tgz";
           sha256 = "126dl1m6zh7m6gmq2xnam0bfg6nv7gdkvcr4x1i3407s3wpmirw5";
           system = "coleslaw";
           asd = "coleslaw";
@@ -43384,7 +43384,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "coleslaw-cli" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coleslaw/2025-06-22/coleslaw-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/coleslaw/2025-06-22/coleslaw-20250622-git.tgz";
           sha256 = "126dl1m6zh7m6gmq2xnam0bfg6nv7gdkvcr4x1i3407s3wpmirw5";
           system = "coleslaw-cli";
           asd = "coleslaw-cli";
@@ -43408,7 +43408,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "coleslaw-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coleslaw/2025-06-22/coleslaw-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/coleslaw/2025-06-22/coleslaw-20250622-git.tgz";
           sha256 = "126dl1m6zh7m6gmq2xnam0bfg6nv7gdkvcr4x1i3407s3wpmirw5";
           system = "coleslaw-test";
           asd = "coleslaw-test";
@@ -43433,7 +43433,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "collectors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/collectors/2024-10-12/collectors-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/collectors/2024-10-12/collectors-20241012-git.tgz";
           sha256 = "1kc9q05wyp8yjz5wqc73nar7l49vcnfhj4924li81v76hlb03665";
           system = "collectors";
           asd = "collectors";
@@ -43455,7 +43455,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "colliflower" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz";
           sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r";
           system = "colliflower";
           asd = "colliflower";
@@ -43480,7 +43480,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "colliflower-fset" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz";
           sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r";
           system = "colliflower-fset";
           asd = "colliflower-fset";
@@ -43503,7 +43503,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "colliflower-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz";
           sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r";
           system = "colliflower-test";
           asd = "colliflower-test";
@@ -43527,7 +43527,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "colnew" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "colnew";
           asd = "colnew";
@@ -43547,7 +43547,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "colored" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/colored/2025-06-22/colored-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/colored/2025-06-22/colored-20250622-git.tgz";
           sha256 = "1wsj4449165h8diclk74a80x847yzsqnx9s02l314nm1wa37y3c7";
           system = "colored";
           asd = "colored";
@@ -43567,7 +43567,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "colored-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/colored/2025-06-22/colored-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/colored/2025-06-22/colored-20250622-git.tgz";
           sha256 = "1wsj4449165h8diclk74a80x847yzsqnx9s02l314nm1wa37y3c7";
           system = "colored-test";
           asd = "colored-test";
@@ -43590,7 +43590,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "colorize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/colorize/2025-06-22/colorize-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/colorize/2025-06-22/colorize-20250622-git.tgz";
           sha256 = "0wgnmpfn9z6xcvf87inlgpr3xhc2xbly5k9aifgvjwpmw9994m65";
           system = "colorize";
           asd = "colorize";
@@ -43612,7 +43612,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com-on" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/com-on/2025-06-22/com-on-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/com-on/2025-06-22/com-on-20250622-git.tgz";
           sha256 = "0ycg3iijaj5p2xmd0lzpgqpdkxi6q9kx9gijyv0ww18xzqd8s3z1";
           system = "com-on";
           asd = "com-on";
@@ -43635,7 +43635,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com-on-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/com-on/2025-06-22/com-on-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/com-on/2025-06-22/com-on-20250622-git.tgz";
           sha256 = "0ycg3iijaj5p2xmd0lzpgqpdkxi6q9kx9gijyv0ww18xzqd8s3z1";
           system = "com-on-test";
           asd = "com-on-test";
@@ -43658,7 +43658,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.clearly-useful.generic-collection-interface" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/com.clearly-useful.generic-collection-interface/2019-07-10/com.clearly-useful.generic-collection-interface-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/com.clearly-useful.generic-collection-interface/2019-07-10/com.clearly-useful.generic-collection-interface-20190710-git.tgz";
           sha256 = "1yfxwqgvrb1nwryymsl4s3h1lr8yskb9c76lxqy3mw5l0vwvl5zl";
           system = "com.clearly-useful.generic-collection-interface";
           asd = "com.clearly-useful.generic-collection-interface";
@@ -43682,7 +43682,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.clearly-useful.generic-collection-interface.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/com.clearly-useful.generic-collection-interface/2019-07-10/com.clearly-useful.generic-collection-interface-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/com.clearly-useful.generic-collection-interface/2019-07-10/com.clearly-useful.generic-collection-interface-20190710-git.tgz";
           sha256 = "1yfxwqgvrb1nwryymsl4s3h1lr8yskb9c76lxqy3mw5l0vwvl5zl";
           system = "com.clearly-useful.generic-collection-interface.test";
           asd = "com.clearly-useful.generic-collection-interface.test";
@@ -43704,7 +43704,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.clearly-useful.iterate+" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/com.clearly-useful.iterate-plus/2012-10-13/com.clearly-useful.iterate-plus-20121013-git.tgz";
+          url = "https://beta.quicklisp.org/archive/com.clearly-useful.iterate-plus/2012-10-13/com.clearly-useful.iterate-plus-20121013-git.tgz";
           sha256 = "0fpymg6p9zglkclfn035agcs5k83fakad7dj2612v5p1snzzcika";
           system = "com.clearly-useful.iterate+";
           asd = "com.clearly-useful.iterate+";
@@ -43729,7 +43729,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.clearly-useful.iterator-protocol" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/com.clearly-useful.iterator-protocol/2013-03-12/com.clearly-useful.iterator-protocol-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/com.clearly-useful.iterator-protocol/2013-03-12/com.clearly-useful.iterator-protocol-20130312-git.tgz";
           sha256 = "1wgksgpck6na1ygdnln5n1y8rj2kylg3lpbkyrhdka2cgsqiqs4a";
           system = "com.clearly-useful.iterator-protocol";
           asd = "com.clearly-useful.iterator-protocol";
@@ -43752,7 +43752,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.clearly-useful.protocols" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/com.clearly-useful.protocols/2013-03-12/com.clearly-useful.protocols-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/com.clearly-useful.protocols/2013-03-12/com.clearly-useful.protocols-20130312-git.tgz";
           sha256 = "0az9rs98chjj2fdmpapqkv4sgfs84n9s7vvngcl05hcbsldm0xvn";
           system = "com.clearly-useful.protocols";
           asd = "com.clearly-useful.protocols";
@@ -43772,7 +43772,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.danielkeogh.graph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/com.danielkeogh.graph/2024-10-12/com.danielkeogh.graph-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/com.danielkeogh.graph/2024-10-12/com.danielkeogh.graph-20241012-git.tgz";
           sha256 = "1hy9g49aqi1li0cdxzjmzgiskh00vlxbp1kjwiyk8a8kqzg69hj2";
           system = "com.danielkeogh.graph";
           asd = "com.danielkeogh.graph";
@@ -43796,7 +43796,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.danielkeogh.graph-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/com.danielkeogh.graph/2024-10-12/com.danielkeogh.graph-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/com.danielkeogh.graph/2024-10-12/com.danielkeogh.graph-20241012-git.tgz";
           sha256 = "1hy9g49aqi1li0cdxzjmzgiskh00vlxbp1kjwiyk8a8kqzg69hj2";
           system = "com.danielkeogh.graph-tests";
           asd = "com.danielkeogh.graph-tests";
@@ -43819,7 +43819,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.dvlsoft.rcfiles" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rcfiles/2011-12-03/cl-rcfiles-20111203-http.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rcfiles/2011-12-03/cl-rcfiles-20111203-http.tgz";
           sha256 = "06ahp9jaim216k7vbya1kp8iy5yb1i7axwrsjx7gwhl2b2q63r0a";
           system = "com.dvlsoft.rcfiles";
           asd = "com.dvlsoft.rcfiles";
@@ -43839,7 +43839,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.elbeno.curve" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/curve/2013-01-28/curve-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/curve/2013-01-28/curve-20130128-git.tgz";
           sha256 = "0223sxrdixjg0bmy76a9kiv7g4zjkqxs92x6kys5dnaywx7mjb6j";
           system = "com.elbeno.curve";
           asd = "com.elbeno.curve";
@@ -43862,7 +43862,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.elbeno.vector" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vector/2013-01-28/vector-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vector/2013-01-28/vector-20130128-git.tgz";
           sha256 = "04czvqycn9j2hzbjmrp9fgqlgns5l7vbb73dgv3zqmiwzdb66qr5";
           system = "com.elbeno.vector";
           asd = "com.elbeno.vector";
@@ -43882,7 +43882,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.gigamonkeys.binary-data" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/monkeylib-binary-data/2011-12-03/monkeylib-binary-data-20111203-git.tgz";
+          url = "https://beta.quicklisp.org/archive/monkeylib-binary-data/2011-12-03/monkeylib-binary-data-20111203-git.tgz";
           sha256 = "072v417vmcnvmyh8ddq9vmwwrizm7zwz9dpzi14qy9nsw8q649zw";
           system = "com.gigamonkeys.binary-data";
           asd = "com.gigamonkeys.binary-data";
@@ -43902,7 +43902,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.gigamonkeys.json" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/monkeylib-json/2018-02-28/monkeylib-json-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/monkeylib-json/2018-02-28/monkeylib-json-20180228-git.tgz";
           sha256 = "188717pmyhpgwg9ncc1fbqvbvw5fikbfhvchsy9gg4haxhdgpzsn";
           system = "com.gigamonkeys.json";
           asd = "com.gigamonkeys.json";
@@ -43925,7 +43925,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.gigamonkeys.macro-utilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/monkeylib-macro-utilities/2011-12-03/monkeylib-macro-utilities-20111203-git.tgz";
+          url = "https://beta.quicklisp.org/archive/monkeylib-macro-utilities/2011-12-03/monkeylib-macro-utilities-20111203-git.tgz";
           sha256 = "0l3m44zlzrvyn6fyvxslga8cppp4mh8dkgqzy297nnm0vnij5r8w";
           system = "com.gigamonkeys.macro-utilities";
           asd = "com.gigamonkeys.macro-utilities";
@@ -43945,7 +43945,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.gigamonkeys.markup" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/monkeylib-markup/2012-09-09/monkeylib-markup-20120909-git.tgz";
+          url = "https://beta.quicklisp.org/archive/monkeylib-markup/2012-09-09/monkeylib-markup-20120909-git.tgz";
           sha256 = "049zqgnprvddn2zp1a8g862m3ikll3a3lpi1k2vimjmx1bkc0vs0";
           system = "com.gigamonkeys.markup";
           asd = "com.gigamonkeys.markup";
@@ -43969,7 +43969,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.gigamonkeys.parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/monkeylib-parser/2012-02-08/monkeylib-parser-20120208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/monkeylib-parser/2012-02-08/monkeylib-parser-20120208-git.tgz";
           sha256 = "1xvzrih813311p48bzlm0z0592lx6iss3m36vz55qsw4sr397ncd";
           system = "com.gigamonkeys.parser";
           asd = "com.gigamonkeys.parser";
@@ -43992,7 +43992,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.gigamonkeys.pathnames" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/monkeylib-pathnames/2012-02-08/monkeylib-pathnames-20120208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/monkeylib-pathnames/2012-02-08/monkeylib-pathnames-20120208-git.tgz";
           sha256 = "108cc39g7razng316df4d47zzpj2zr576wzwwrpggdkm4q599gvk";
           system = "com.gigamonkeys.pathnames";
           asd = "com.gigamonkeys.pathnames";
@@ -44012,7 +44012,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.gigamonkeys.prose-diff" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/monkeylib-prose-diff/2014-07-13/monkeylib-prose-diff-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/monkeylib-prose-diff/2014-07-13/monkeylib-prose-diff-20140713-git.tgz";
           sha256 = "1zwaa8qmpbdpdg8zzk3as73i55c54k9m694gx4bla1xxli5f8ijc";
           system = "com.gigamonkeys.prose-diff";
           asd = "com.gigamonkeys.prose-diff";
@@ -44039,7 +44039,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.gigamonkeys.test-framework" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/monkeylib-test-framework/2010-12-07/monkeylib-test-framework-20101207-git.tgz";
+          url = "https://beta.quicklisp.org/archive/monkeylib-test-framework/2010-12-07/monkeylib-test-framework-20101207-git.tgz";
           sha256 = "1d6b8zg0vnbqxxsbbjr3b4r46d8whj84h9yqnqw3ii0bwr8hn82v";
           system = "com.gigamonkeys.test-framework";
           asd = "com.gigamonkeys.test-framework";
@@ -44059,7 +44059,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.gigamonkeys.utilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/monkeylib-utilities/2017-04-03/monkeylib-utilities-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/monkeylib-utilities/2017-04-03/monkeylib-utilities-20170403-git.tgz";
           sha256 = "0d0h1y43mn6r8s4g9gbr02d09565p0gig21jfnk7zf1dl6rnvkvm";
           system = "com.gigamonkeys.utilities";
           asd = "com.gigamonkeys.utilities";
@@ -44082,7 +44082,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.google.base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/com.google.base/2020-09-25/com.google.base-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/com.google.base/2020-09-25/com.google.base-20200925-git.tgz";
           sha256 = "1drc341sqmrmyvdgqpdy066f0z0ia0kl3ppq0rlxznlxhn17x3xj";
           system = "com.google.base";
           asd = "com.google.base";
@@ -44102,7 +44102,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.google.flag" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-gflags/2020-12-20/lisp-gflags-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-gflags/2020-12-20/lisp-gflags-20201220-git.tgz";
           sha256 = "06p70v1wv0ynr6ng6vr6krc5773xphvkv2nfxvnschc1bzqhds5k";
           system = "com.google.flag";
           asd = "com.google.flag";
@@ -44122,7 +44122,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.inuoe.jzon" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jzon/2024-10-12/jzon-v1.1.4.tgz";
+          url = "https://beta.quicklisp.org/archive/jzon/2024-10-12/jzon-v1.1.4.tgz";
           sha256 = "0z7xpylyk8rakz449rxqpz4hazn91ap2dnf0689iigdvvl3yqz3g";
           system = "com.inuoe.jzon";
           asd = "com.inuoe.jzon";
@@ -44145,7 +44145,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "com.inuoe.jzon-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jzon/2024-10-12/jzon-v1.1.4.tgz";
+          url = "https://beta.quicklisp.org/archive/jzon/2024-10-12/jzon-v1.1.4.tgz";
           sha256 = "0z7xpylyk8rakz449rxqpz4hazn91ap2dnf0689iigdvvl3yqz3g";
           system = "com.inuoe.jzon-tests";
           asd = "com.inuoe.jzon-tests";
@@ -44171,7 +44171,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "command-line-arguments" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/command-line-arguments/2021-08-07/command-line-arguments-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/command-line-arguments/2021-08-07/command-line-arguments-20210807-git.tgz";
           sha256 = "1wbb83b559nfv65rsxz3jrixic9gndk2whj40hhwb0s13rf5a62y";
           system = "command-line-arguments";
           asd = "command-line-arguments";
@@ -44189,7 +44189,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "common-doc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
           sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa";
           system = "common-doc";
           asd = "common-doc";
@@ -44216,7 +44216,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "common-doc-contrib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
           sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa";
           system = "common-doc-contrib";
           asd = "common-doc-contrib";
@@ -44243,7 +44243,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "common-doc-gnuplot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
           sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa";
           system = "common-doc-gnuplot";
           asd = "common-doc-gnuplot";
@@ -44266,7 +44266,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "common-doc-graphviz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
           sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa";
           system = "common-doc-graphviz";
           asd = "common-doc-graphviz";
@@ -44289,7 +44289,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "common-doc-include" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
           sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa";
           system = "common-doc-include";
           asd = "common-doc-include";
@@ -44312,7 +44312,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "common-doc-plantuml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
           sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa";
           system = "common-doc-plantuml";
           asd = "common-doc-plantuml";
@@ -44335,7 +44335,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "common-doc-plump" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-doc-plump/2016-04-21/common-doc-plump-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-doc-plump/2016-04-21/common-doc-plump-20160421-git.tgz";
           sha256 = "08h7m4c599rf2kz4wkpbj05441ax0vb3bd88a7dw5x57djf765r6";
           system = "common-doc-plump";
           asd = "common-doc-plump";
@@ -44361,7 +44361,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "common-doc-plump-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-doc-plump/2016-04-21/common-doc-plump-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-doc-plump/2016-04-21/common-doc-plump-20160421-git.tgz";
           sha256 = "08h7m4c599rf2kz4wkpbj05441ax0vb3bd88a7dw5x57djf765r6";
           system = "common-doc-plump-test";
           asd = "common-doc-plump-test";
@@ -44384,7 +44384,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "common-doc-split-paragraphs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
           sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa";
           system = "common-doc-split-paragraphs";
           asd = "common-doc-split-paragraphs";
@@ -44407,7 +44407,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "common-doc-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
           sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa";
           system = "common-doc-test";
           asd = "common-doc-test";
@@ -44431,7 +44431,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "common-doc-tex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-doc/2023-02-14/common-doc-20230214-git.tgz";
           sha256 = "0bzc4w37cq5mbkd15vxziks6nq58yad04mki4nwy5w6pza7z0faa";
           system = "common-doc-tex";
           asd = "common-doc-tex";
@@ -44451,7 +44451,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "common-html" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-html/2021-08-07/common-html-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-html/2021-08-07/common-html-20210807-git.tgz";
           sha256 = "1i11w4l95nybz5ibnaxrnrkfhch2s9wynqrg6kx6sl6y47khq1xz";
           system = "common-html";
           asd = "common-html";
@@ -44476,7 +44476,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "common-html-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-html/2021-08-07/common-html-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-html/2021-08-07/common-html-20210807-git.tgz";
           sha256 = "1i11w4l95nybz5ibnaxrnrkfhch2s9wynqrg6kx6sl6y47khq1xz";
           system = "common-html-test";
           asd = "common-html-test";
@@ -44499,7 +44499,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "common-lisp-jupyter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-lisp-jupyter/2025-06-22/common-lisp-jupyter-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-lisp-jupyter/2025-06-22/common-lisp-jupyter-20250622-git.tgz";
           sha256 = "0xm3a68dn3mlq4gyiqfndf61agh1bj5fp1cqhsscz53zjcnrb2yb";
           system = "common-lisp-jupyter";
           asd = "common-lisp-jupyter";
@@ -44538,7 +44538,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "commondoc-markdown" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/commondoc-markdown/2025-06-22/commondoc-markdown-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/commondoc-markdown/2025-06-22/commondoc-markdown-20250622-git.tgz";
           sha256 = "0r9np8lv1p1fkfxapz12x5r5bak555kaf9dkwclv9xq8jbpvqyam";
           system = "commondoc-markdown";
           asd = "commondoc-markdown";
@@ -44571,7 +44571,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "commondoc-markdown-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/commondoc-markdown/2025-06-22/commondoc-markdown-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/commondoc-markdown/2025-06-22/commondoc-markdown-20250622-git.tgz";
           sha256 = "0r9np8lv1p1fkfxapz12x5r5bak555kaf9dkwclv9xq8jbpvqyam";
           system = "commondoc-markdown-docs";
           asd = "commondoc-markdown-docs";
@@ -44596,7 +44596,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "commonqt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "commonqt";
           asd = "commonqt";
@@ -44620,7 +44620,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "comp-set" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
           sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga";
           system = "comp-set";
           asd = "comp-set";
@@ -44640,7 +44640,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "compatible-metaclasses" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/compatible-metaclasses/2020-09-25/compatible-metaclasses_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/compatible-metaclasses/2020-09-25/compatible-metaclasses_1.0.tgz";
           sha256 = "17cf74j400cl6sjslfhkv13lir85k705v63mx3dd4y6dl5hvsdh6";
           system = "compatible-metaclasses";
           asd = "compatible-metaclasses";
@@ -44664,7 +44664,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "compatible-metaclasses_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/compatible-metaclasses/2020-09-25/compatible-metaclasses_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/compatible-metaclasses/2020-09-25/compatible-metaclasses_1.0.tgz";
           sha256 = "17cf74j400cl6sjslfhkv13lir85k705v63mx3dd4y6dl5hvsdh6";
           system = "compatible-metaclasses_tests";
           asd = "compatible-metaclasses_tests";
@@ -44687,7 +44687,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "compiler-macro-notes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/compiler-macro-notes/2024-10-12/compiler-macro-notes-v0.3.1.tgz";
+          url = "https://beta.quicklisp.org/archive/compiler-macro-notes/2024-10-12/compiler-macro-notes-v0.3.1.tgz";
           sha256 = "0pchhvk14fx54p7qq92dnf0g4jnapqr6p2a4za6bhzd8im1d9gad";
           system = "compiler-macro-notes";
           asd = "compiler-macro-notes";
@@ -44710,7 +44710,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "computable-reals" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/computable-reals/2023-10-21/computable-reals-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/computable-reals/2023-10-21/computable-reals-20231021-git.tgz";
           sha256 = "1x8kkdyjil0zzg8fq9b76z12kmfrqwhsxnr6qqnlrg0c8c5bzz9c";
           system = "computable-reals";
           asd = "computable-reals";
@@ -44730,7 +44730,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "concrete-syntax-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz";
           sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl";
           system = "concrete-syntax-tree";
           asd = "concrete-syntax-tree";
@@ -44750,7 +44750,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "concrete-syntax-tree-destructuring" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz";
           sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl";
           system = "concrete-syntax-tree-destructuring";
           asd = "concrete-syntax-tree-destructuring";
@@ -44770,7 +44770,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "concrete-syntax-tree-lambda-list" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz";
           sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl";
           system = "concrete-syntax-tree-lambda-list";
           asd = "concrete-syntax-tree-lambda-list";
@@ -44790,7 +44790,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "concrete-syntax-tree-source-info" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/concrete-syntax-tree/2025-06-22/concrete-syntax-tree-20250622-git.tgz";
           sha256 = "1g5iyfn6hly08rngza4bc21yamv9vq699c2zb5ndqahns1r7q5fl";
           system = "concrete-syntax-tree-source-info";
           asd = "concrete-syntax-tree-source-info";
@@ -44810,7 +44810,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "conditional-commands" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "conditional-commands";
           asd = "conditional-commands";
@@ -44830,7 +44830,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "conf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/conf/2019-12-27/conf-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/conf/2019-12-27/conf-20191227-git.tgz";
           sha256 = "0mif91gb6yqg2qrzd2p6n83w9injikm5gggzv2mgxkiyzmr5gnay";
           system = "conf";
           asd = "conf";
@@ -44850,7 +44850,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "configuration.options" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz";
           sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g";
           system = "configuration.options";
           asd = "configuration.options";
@@ -44881,7 +44881,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "configuration.options-and-mop" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz";
           sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g";
           system = "configuration.options-and-mop";
           asd = "configuration.options-and-mop";
@@ -44906,7 +44906,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "configuration.options-and-puri" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz";
           sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g";
           system = "configuration.options-and-puri";
           asd = "configuration.options-and-puri";
@@ -44931,7 +44931,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "configuration.options-and-quri" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz";
           sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g";
           system = "configuration.options-and-quri";
           asd = "configuration.options-and-quri";
@@ -44956,7 +44956,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "configuration.options-and-service-provider" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz";
           sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g";
           system = "configuration.options-and-service-provider";
           asd = "configuration.options-and-service-provider";
@@ -44984,7 +44984,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "configuration.options-syntax-ini" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz";
           sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g";
           system = "configuration.options-syntax-ini";
           asd = "configuration.options-syntax-ini";
@@ -45009,7 +45009,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "configuration.options-syntax-xml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz";
           sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g";
           system = "configuration.options-syntax-xml";
           asd = "configuration.options-syntax-xml";
@@ -45034,7 +45034,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "conium" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/conium/2021-06-30/conium-20210630-git.tgz";
+          url = "https://beta.quicklisp.org/archive/conium/2021-06-30/conium-20210630-git.tgz";
           sha256 = "0y31za8xr8734p2pf8mrw1jd1fksh2d4y1p12wwjyn8hxxsvsx1w";
           system = "conium";
           asd = "conium";
@@ -45054,7 +45054,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "consfigurator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/consfigurator/2025-06-22/consfigurator-v1.5.2.tgz";
+          url = "https://beta.quicklisp.org/archive/consfigurator/2025-06-22/consfigurator-v1.5.2.tgz";
           sha256 = "18v87zky9rlrp0xhg1q3ydd5v18c4zx37kaxiw4swlxpf2br6gfa";
           system = "consfigurator";
           asd = "consfigurator";
@@ -45091,7 +45091,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "consix" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/consix/2020-12-20/consix-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/consix/2020-12-20/consix-20201220-git.tgz";
           sha256 = "0zpcaxgq9jx0baj5sid8rnzq8ygsmd8yzb0x37nkaiwa67x5jjck";
           system = "consix";
           asd = "consix";
@@ -45116,7 +45116,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "constantfold" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/constantfold/2019-12-27/constantfold-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/constantfold/2019-12-27/constantfold-20191227-git.tgz";
           sha256 = "153h0569z6bff1qbad0bdssplwwny75l7ilqwcfqfdvzsxf9jh06";
           system = "constantfold";
           asd = "constantfold";
@@ -45141,7 +45141,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "constantfold.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/constantfold/2019-12-27/constantfold-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/constantfold/2019-12-27/constantfold-20191227-git.tgz";
           sha256 = "153h0569z6bff1qbad0bdssplwwny75l7ilqwcfqfdvzsxf9jh06";
           system = "constantfold.test";
           asd = "constantfold.test";
@@ -45164,7 +45164,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "context-lite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/context-lite/2022-03-31/context-lite-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/context-lite/2022-03-31/context-lite-20220331-git.tgz";
           sha256 = "16hmid3adimn10c0y4p6hg7n42al2qgsy7wxlpargk0xbn4h3km4";
           system = "context-lite";
           asd = "context-lite";
@@ -45184,7 +45184,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "contextl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/contextl/2024-10-12/contextl-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/contextl/2024-10-12/contextl-20241012-git.tgz";
           sha256 = "1jsa5wyjzzfw9pii3d6x20mh8ijnpb291g3i0y2ccj0x8z3xfyyk";
           system = "contextl";
           asd = "contextl";
@@ -45207,7 +45207,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "control" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "control";
           asd = "control";
@@ -45231,7 +45231,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "copy-directory" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/copy-directory/2025-06-22/copy-directory-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/copy-directory/2025-06-22/copy-directory-20250622-git.tgz";
           sha256 = "0f4sidgj71ksibjzsrl33348dhgg4vnmm5pj6kr92acmvsdhhhap";
           system = "copy-directory";
           asd = "copy-directory";
@@ -45254,7 +45254,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "copy-directory-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/copy-directory/2025-06-22/copy-directory-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/copy-directory/2025-06-22/copy-directory-20250622-git.tgz";
           sha256 = "0f4sidgj71ksibjzsrl33348dhgg4vnmm5pj6kr92acmvsdhhhap";
           system = "copy-directory-test";
           asd = "copy-directory-test";
@@ -45277,7 +45277,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "core-reader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/core-reader/2022-07-07/core-reader-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/core-reader/2022-07-07/core-reader-20220707-git.tgz";
           sha256 = "1f2cm44r3pnahgx1b3c3psf6myaliwsrvfcgz8c9ydqi5qlx49gb";
           system = "core-reader";
           asd = "core-reader";
@@ -45297,7 +45297,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "core-reader.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/core-reader/2022-07-07/core-reader-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/core-reader/2022-07-07/core-reader-20220707-git.tgz";
           sha256 = "1f2cm44r3pnahgx1b3c3psf6myaliwsrvfcgz8c9ydqi5qlx49gb";
           system = "core-reader.test";
           asd = "core-reader.test";
@@ -45320,7 +45320,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cosmo-pagination" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cosmo-pagination/2025-06-22/cosmo-pagination-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cosmo-pagination/2025-06-22/cosmo-pagination-20250622-git.tgz";
           sha256 = "13n9p62n26d637jz5cp4w0x9g3h1baar584f98sx22hw42n50x3d";
           system = "cosmo-pagination";
           asd = "cosmo-pagination";
@@ -45344,7 +45344,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cover" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cover/2023-06-18/cover-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cover/2023-06-18/cover-20230618-git.tgz";
           sha256 = "0152zzdszhiblzm3a80x8bnalip7gnzyvvwnlswsnnlb509nby89";
           system = "cover";
           asd = "cover";
@@ -45364,7 +45364,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cqlcl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cqlcl/2014-11-06/cqlcl-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cqlcl/2014-11-06/cqlcl-20141106-git.tgz";
           sha256 = "0ppdsrrf2hz0s4y02a2p5mgms92znrj7hz7x9j6azppfkal25zid";
           system = "cqlcl";
           asd = "cqlcl";
@@ -45394,7 +45394,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cqlcl-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cqlcl/2014-11-06/cqlcl-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cqlcl/2014-11-06/cqlcl-20141106-git.tgz";
           sha256 = "0ppdsrrf2hz0s4y02a2p5mgms92znrj7hz7x9j6azppfkal25zid";
           system = "cqlcl-test";
           asd = "cqlcl";
@@ -45420,7 +45420,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "crane" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/crane/2016-02-08/crane-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/crane/2016-02-08/crane-20160208-git.tgz";
           sha256 = "1wai4h7vz5i0ld1fnnbcmpz5d67dmykyxx0ay0fkclkwvpj7gh5n";
           system = "crane";
           asd = "crane";
@@ -45449,7 +45449,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "crane-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/crane/2016-02-08/crane-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/crane/2016-02-08/crane-20160208-git.tgz";
           sha256 = "1wai4h7vz5i0ld1fnnbcmpz5d67dmykyxx0ay0fkclkwvpj7gh5n";
           system = "crane-test";
           asd = "crane-test";
@@ -45472,7 +45472,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cricket" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cricket/2022-07-07/cricket-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cricket/2022-07-07/cricket-20220707-git.tgz";
           sha256 = "0wdpzdmalbnfjmd9s7yalris4i1vvc2klnhfl8g0h2ahq0mqv9p9";
           system = "cricket";
           asd = "cricket";
@@ -45499,7 +45499,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cricket.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cricket/2022-07-07/cricket-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cricket/2022-07-07/cricket-20220707-git.tgz";
           sha256 = "0wdpzdmalbnfjmd9s7yalris4i1vvc2klnhfl8g0h2ahq0mqv9p9";
           system = "cricket.test";
           asd = "cricket.test";
@@ -45525,7 +45525,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "croatoan" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz";
           sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c";
           system = "croatoan";
           asd = "croatoan";
@@ -45549,7 +45549,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "croatoan-ncurses" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz";
           sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c";
           system = "croatoan-ncurses";
           asd = "croatoan-ncurses";
@@ -45569,7 +45569,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "croatoan-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz";
           sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c";
           system = "croatoan-test";
           asd = "croatoan-test";
@@ -45589,7 +45589,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "crud" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "crud";
           asd = "crud";
@@ -45615,7 +45615,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "crypt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-crypt/2012-05-20/cl-crypt-20120520-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-crypt/2012-05-20/cl-crypt-20120520-git.tgz";
           sha256 = "02fc3aqfbbwjpz79a4mwffv33pnmmknpkmd1r8v9mkn9a6c1ssmh";
           system = "crypt";
           asd = "crypt";
@@ -45635,7 +45635,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "crypto-shortcuts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/crypto-shortcuts/2025-06-22/crypto-shortcuts-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/crypto-shortcuts/2025-06-22/crypto-shortcuts-20250622-git.tgz";
           sha256 = "1ah1jw2vf3sz2ns835rbv8jm2sc821icmdj9qjw06h2x5lspw7xs";
           system = "crypto-shortcuts";
           asd = "crypto-shortcuts";
@@ -45660,7 +45660,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cserial-port" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cserial-port/2023-02-14/cserial-port-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cserial-port/2023-02-14/cserial-port-20230214-git.tgz";
           sha256 = "0l38qh66g2iba7kjw6fml3q55ax6vkk0khbwrsvkglwhpan79fsm";
           system = "cserial-port";
           asd = "cserial-port";
@@ -45686,7 +45686,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "css-lite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/css-lite/2023-06-18/css-lite-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/css-lite/2023-06-18/css-lite-20230618-git.tgz";
           sha256 = "1pvvwd6ysdc7m5945vkwdbq4jjmcszmkxp9jhgi0lba23si07dp5";
           system = "css-lite";
           asd = "css-lite";
@@ -45704,7 +45704,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "css-selectors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
+          url = "https://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
           sha256 = "0x0a5jq4kdw8zrkljmhijcbvjj09iyrwwgryc6kvzl5g7wzg2xr6";
           system = "css-selectors";
           asd = "css-selectors";
@@ -45731,7 +45731,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "css-selectors-simple-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
+          url = "https://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
           sha256 = "0x0a5jq4kdw8zrkljmhijcbvjj09iyrwwgryc6kvzl5g7wzg2xr6";
           system = "css-selectors-simple-tree";
           asd = "css-selectors-simple-tree";
@@ -45752,7 +45752,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "css-selectors-stp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
+          url = "https://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
           sha256 = "0x0a5jq4kdw8zrkljmhijcbvjj09iyrwwgryc6kvzl5g7wzg2xr6";
           system = "css-selectors-stp";
           asd = "css-selectors-stp";
@@ -45773,7 +45773,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "css-selectors-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
+          url = "https://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
           sha256 = "0x0a5jq4kdw8zrkljmhijcbvjj09iyrwwgryc6kvzl5g7wzg2xr6";
           system = "css-selectors-test";
           asd = "css-selectors";
@@ -45797,7 +45797,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "csv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/csv/2019-07-10/csv-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/csv/2019-07-10/csv-20190710-git.tgz";
           sha256 = "0jykv91w7anisac2aip38vnj7ywi567rcp4n8nv3lz5qb7g1dpy4";
           system = "csv";
           asd = "csv";
@@ -45817,7 +45817,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "csv-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/csv-parser/2014-07-13/csv-parser-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/csv-parser/2014-07-13/csv-parser-20140713-git.tgz";
           sha256 = "0pcp709dwxi3p2vrmx5qiy571pybfs1hpv9z8g4i1ig2l4mc3djh";
           system = "csv-parser";
           asd = "csv-parser";
@@ -45837,7 +45837,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "csv-validator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/csv-validator/2023-06-18/csv-validator-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/csv-validator/2023-06-18/csv-validator-20230618-git.tgz";
           sha256 = "14cwjc43q05a1gdl0m79sps59605dfrhd4mjhcxh7gxyj8x7x1k2";
           system = "csv-validator";
           asd = "csv-validator";
@@ -45861,7 +45861,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "csv-validator-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/csv-validator/2023-06-18/csv-validator-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/csv-validator/2023-06-18/csv-validator-20230618-git.tgz";
           sha256 = "14cwjc43q05a1gdl0m79sps59605dfrhd4mjhcxh7gxyj8x7x1k2";
           system = "csv-validator-tests";
           asd = "csv-validator-tests";
@@ -45884,7 +45884,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ctype" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ctype/2025-06-22/ctype-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ctype/2025-06-22/ctype-20250622-git.tgz";
           sha256 = "1l1qz49584l8kss3l1lp5k2brw4xs4xqxhnjzq9fnnwbmy8253nq";
           system = "ctype";
           asd = "ctype";
@@ -45904,7 +45904,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cubic-bezier" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cubic-bezier/2022-07-07/cubic-bezier-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cubic-bezier/2022-07-07/cubic-bezier-20220707-git.tgz";
           sha256 = "08byf1pw2s5sz97bk0sp2a6gdx5dkankbbg14azafd1k0vfh7vcr";
           system = "cubic-bezier";
           asd = "cubic-bezier";
@@ -45927,7 +45927,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cue-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cue-parser/2018-02-28/cue-parser-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cue-parser/2018-02-28/cue-parser-20180228-git.tgz";
           sha256 = "1zl3a02b68yywchd1aldls07b4qgrf08xpb4xiaaw8njk2qa0lz1";
           system = "cue-parser";
           asd = "cue-parser";
@@ -45950,7 +45950,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "curly" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/curly/2012-04-07/curly-20120407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/curly/2012-04-07/curly-20120407-git.tgz";
           sha256 = "04gpkq6hd7wvvny0p3lgn87bfalswqc67sbg4p35j52w51mqd8vf";
           system = "curly";
           asd = "curly";
@@ -45970,7 +45970,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "curly.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/curly/2012-04-07/curly-20120407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/curly/2012-04-07/curly-20120407-git.tgz";
           sha256 = "04gpkq6hd7wvvny0p3lgn87bfalswqc67sbg4p35j52w51mqd8vf";
           system = "curly.test";
           asd = "curly";
@@ -45993,7 +45993,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "curry-compose-reader-macros" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/curry-compose-reader-macros/2020-12-20/curry-compose-reader-macros-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/curry-compose-reader-macros/2020-12-20/curry-compose-reader-macros-20201220-git.tgz";
           sha256 = "0j4qfwpw4ykf5npiln54w7jcnj46p7xf9d4p3jpx4a67fdkrlxd1";
           system = "curry-compose-reader-macros";
           asd = "curry-compose-reader-macros";
@@ -46016,7 +46016,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cxml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz";
           sha256 = "1w1yhiabcycf614dhrgz3kz2zgawhc1p7m09gqppc1wsaznwc2bx";
           system = "cxml";
           asd = "cxml";
@@ -46038,7 +46038,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cxml-dom" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz";
           sha256 = "1w1yhiabcycf614dhrgz3kz2zgawhc1p7m09gqppc1wsaznwc2bx";
           system = "cxml-dom";
           asd = "cxml-dom";
@@ -46062,7 +46062,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cxml-klacks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz";
           sha256 = "1w1yhiabcycf614dhrgz3kz2zgawhc1p7m09gqppc1wsaznwc2bx";
           system = "cxml-klacks";
           asd = "cxml-klacks";
@@ -46086,7 +46086,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cxml-rng" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cxml-rng/2019-07-10/cxml-rng-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cxml-rng/2019-07-10/cxml-rng-20190710-git.tgz";
           sha256 = "0pjb5268spiwq6b0cly8nfajr6rsh2wf6si646bzzjrxbgs51sxa";
           system = "cxml-rng";
           asd = "cxml-rng";
@@ -46112,7 +46112,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cxml-rpc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cxml-rpc/2012-10-13/cxml-rpc-20121013-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cxml-rpc/2012-10-13/cxml-rpc-20121013-git.tgz";
           sha256 = "1ihd8rg0shy7nykqcbvvx5px7sw8wr1nwz70jdrh6ibq74yr8flh";
           system = "cxml-rpc";
           asd = "cxml-rpc";
@@ -46138,7 +46138,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cxml-stp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz";
           sha256 = "01yfxxvb144i2mlp06fxx410mf3phxz5qaqvk90pp4dzdl883knv";
           system = "cxml-stp";
           asd = "cxml-stp";
@@ -46160,7 +46160,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cxml-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cxml/2025-06-22/cxml-20250622-git.tgz";
           sha256 = "1w1yhiabcycf614dhrgz3kz2zgawhc1p7m09gqppc1wsaznwc2bx";
           system = "cxml-test";
           asd = "cxml-test";
@@ -46184,7 +46184,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cxx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cxx/2023-02-14/cl-cxx-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cxx/2023-02-14/cl-cxx-20230214-git.tgz";
           sha256 = "08jh7ajgfdr3cqla02c4d2y06y0imkky5d4mwnlph01nczzf85cy";
           system = "cxx";
           asd = "cxx";
@@ -46207,7 +46207,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cxx-jit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cxx-jit/2024-10-12/cl-cxx-jit-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cxx-jit/2024-10-12/cl-cxx-jit-20241012-git.tgz";
           sha256 = "1xnhkhynikqs61s488jjzklbvwb46yxqx3zi98ifszj4r8ndi3ym";
           system = "cxx-jit";
           asd = "cxx-jit";
@@ -46230,7 +46230,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cxx-jit-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cxx-jit/2024-10-12/cl-cxx-jit-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cxx-jit/2024-10-12/cl-cxx-jit-20241012-git.tgz";
           sha256 = "1xnhkhynikqs61s488jjzklbvwb46yxqx3zi98ifszj4r8ndi3ym";
           system = "cxx-jit-test";
           asd = "cxx-jit-test";
@@ -46253,7 +46253,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cxx-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cxx/2023-02-14/cl-cxx-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cxx/2023-02-14/cl-cxx-20230214-git.tgz";
           sha256 = "08jh7ajgfdr3cqla02c4d2y06y0imkky5d4mwnlph01nczzf85cy";
           system = "cxx-test";
           asd = "cxx-test";
@@ -46277,7 +46277,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "cytoscape-clj" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cytoscape-clj/2024-10-12/cytoscape-clj-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cytoscape-clj/2024-10-12/cytoscape-clj-20241012-git.tgz";
           sha256 = "0kyjgffm8nlvz75dbyz4fp1v8sr7j2bd7axxyn226s30gwzhihck";
           system = "cytoscape-clj";
           asd = "cytoscape-clj";
@@ -46300,7 +46300,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "daemon" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/daemon/2017-04-03/daemon-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/daemon/2017-04-03/daemon-20170403-git.tgz";
           sha256 = "1kdxfnhh9fz34j8qs7pn7mwjz3v33q4v9nh0hqkyzraq5xs2j3f4";
           system = "daemon";
           asd = "daemon";
@@ -46320,7 +46320,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "damn-fast-priority-queue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz";
           sha256 = "1mbigpgi7qbqvpj59l1f7p2qcg00ybvqzdca1j1b9hx62h224ndw";
           system = "damn-fast-priority-queue";
           asd = "damn-fast-priority-queue";
@@ -46340,7 +46340,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "damn-fast-stable-priority-queue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz";
           sha256 = "1mbigpgi7qbqvpj59l1f7p2qcg00ybvqzdca1j1b9hx62h224ndw";
           system = "damn-fast-stable-priority-queue";
           asd = "damn-fast-stable-priority-queue";
@@ -46360,7 +46360,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "darts.lib.email-address" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dartsclemailaddress/2016-04-21/dartsclemailaddress-quicklisp-release-48464635-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dartsclemailaddress/2016-04-21/dartsclemailaddress-quicklisp-release-48464635-git.tgz";
           sha256 = "15155nqi9q7ilaf14p4yi4iga8203rl7fn9v2iaxcfm18gsvqcjd";
           system = "darts.lib.email-address";
           asd = "darts.lib.email-address";
@@ -46380,7 +46380,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "darts.lib.email-address-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dartsclemailaddress/2016-04-21/dartsclemailaddress-quicklisp-release-48464635-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dartsclemailaddress/2016-04-21/dartsclemailaddress-quicklisp-release-48464635-git.tgz";
           sha256 = "15155nqi9q7ilaf14p4yi4iga8203rl7fn9v2iaxcfm18gsvqcjd";
           system = "darts.lib.email-address-test";
           asd = "darts.lib.email-address-test";
@@ -46403,7 +46403,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "darts.lib.hashtree-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dartsclhashtree/2023-10-21/dartsclhashtree-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dartsclhashtree/2023-10-21/dartsclhashtree-20231021-git.tgz";
           sha256 = "1kbxk7vnpv9zy6pm004cyyp9mbb4n845pfdv4wxngaj96ndi5v6j";
           system = "darts.lib.hashtree-test";
           asd = "darts.lib.hashtree-test";
@@ -46427,7 +46427,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "darts.lib.hashtrie" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dartsclhashtree/2023-10-21/dartsclhashtree-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dartsclhashtree/2023-10-21/dartsclhashtree-20231021-git.tgz";
           sha256 = "1kbxk7vnpv9zy6pm004cyyp9mbb4n845pfdv4wxngaj96ndi5v6j";
           system = "darts.lib.hashtrie";
           asd = "darts.lib.hashtrie";
@@ -46447,7 +46447,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "darts.lib.message-pack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dartsclmessagepack/2020-03-25/dartsclmessagepack-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dartsclmessagepack/2020-03-25/dartsclmessagepack-20200325-git.tgz";
           sha256 = "0i9jnvq6dp5zya1ijj3z7s10803jk8rb4nrjrzcgcfhkczd5si6y";
           system = "darts.lib.message-pack";
           asd = "darts.lib.message-pack";
@@ -46470,7 +46470,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "darts.lib.message-pack-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dartsclmessagepack/2020-03-25/dartsclmessagepack-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dartsclmessagepack/2020-03-25/dartsclmessagepack-20200325-git.tgz";
           sha256 = "0i9jnvq6dp5zya1ijj3z7s10803jk8rb4nrjrzcgcfhkczd5si6y";
           system = "darts.lib.message-pack-test";
           asd = "darts.lib.message-pack-test";
@@ -46494,7 +46494,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "darts.lib.sequence-metrics" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dartsclsequencemetrics/2013-03-12/dartsclsequencemetrics-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dartsclsequencemetrics/2013-03-12/dartsclsequencemetrics-20130312-git.tgz";
           sha256 = "1x99gj5dfgiaraawx1nd157g5ajygfxz47cz8jgi1fh52fp1p969";
           system = "darts.lib.sequence-metrics";
           asd = "darts.lib.sequence-metrics";
@@ -46514,7 +46514,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "darts.lib.tools" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dartscltools/2020-12-20/dartscltools-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dartscltools/2020-12-20/dartscltools-20201220-git.tgz";
           sha256 = "0mbz7ak03qsw41fgybdw4mbibr656y9xl9bfgr2rmkdkgxbicys9";
           system = "darts.lib.tools";
           asd = "darts.lib.tools";
@@ -46534,7 +46534,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "darts.lib.tools.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dartscltools/2020-12-20/dartscltools-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dartscltools/2020-12-20/dartscltools-20201220-git.tgz";
           sha256 = "0mbz7ak03qsw41fgybdw4mbibr656y9xl9bfgr2rmkdkgxbicys9";
           system = "darts.lib.tools.test";
           asd = "darts.lib.tools.test";
@@ -46558,7 +46558,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "darts.lib.uuid" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dartscluuid/2024-10-12/dartscluuid-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dartscluuid/2024-10-12/dartscluuid-20241012-git.tgz";
           sha256 = "17i2icz6k6vb5mp95rsjr8ldzhjjlcn7dyylvxjrccbxbrblnnsl";
           system = "darts.lib.uuid";
           asd = "darts.lib.uuid";
@@ -46582,7 +46582,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "darts.lib.uuid-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dartscluuid/2024-10-12/dartscluuid-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dartscluuid/2024-10-12/dartscluuid-20241012-git.tgz";
           sha256 = "17i2icz6k6vb5mp95rsjr8ldzhjjlcn7dyylvxjrccbxbrblnnsl";
           system = "darts.lib.uuid-test";
           asd = "darts.lib.uuid-test";
@@ -46605,7 +46605,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "darts.lib.wbtree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dartsclhashtree/2023-10-21/dartsclhashtree-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dartsclhashtree/2023-10-21/dartsclhashtree-20231021-git.tgz";
           sha256 = "1kbxk7vnpv9zy6pm004cyyp9mbb4n845pfdv4wxngaj96ndi5v6j";
           system = "darts.lib.wbtree";
           asd = "darts.lib.wbtree";
@@ -46625,7 +46625,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "data-format-validation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-data-format-validation/2014-07-13/cl-data-format-validation-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-data-format-validation/2014-07-13/cl-data-format-validation-20140713-git.tgz";
           sha256 = "0zmk47xmicyqvp1impn8kgh5373ysmx3gfpqcvbi9r31qsir2nqa";
           system = "data-format-validation";
           asd = "data-format-validation";
@@ -46645,7 +46645,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "data-frame" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/data-frame/2025-06-22/data-frame-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/data-frame/2025-06-22/data-frame-20250622-git.tgz";
           sha256 = "1xbh1bicwlqn5kfj6my869ngx1f5x4xrb91hc7rgbz3bmsg19qpr";
           system = "data-frame";
           asd = "data-frame";
@@ -46675,7 +46675,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "data-lens" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/data-lens/2024-10-12/data-lens-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/data-lens/2024-10-12/data-lens-20241012-git.tgz";
           sha256 = "1bark9r3br5ndcbkiagq891gn82xdiy8hrgzp72656yyadsrid5i";
           system = "data-lens";
           asd = "data-lens";
@@ -46698,7 +46698,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "data-lens+fset" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/data-lens/2024-10-12/data-lens-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/data-lens/2024-10-12/data-lens-20241012-git.tgz";
           sha256 = "1bark9r3br5ndcbkiagq891gn82xdiy8hrgzp72656yyadsrid5i";
           system = "data-lens+fset";
           asd = "data-lens+fset";
@@ -46722,7 +46722,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "data-sift" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/data-sift/2013-01-28/data-sift-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/data-sift/2013-01-28/data-sift-20130128-git.tgz";
           sha256 = "1v7gf0x4ibjzp0c56n9m77hxdgwcm9356zlk5n4l3fx4i0hj6146";
           system = "data-sift";
           asd = "data-sift";
@@ -46747,7 +46747,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "data-sift-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/data-sift/2013-01-28/data-sift-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/data-sift/2013-01-28/data-sift-20130128-git.tgz";
           sha256 = "1v7gf0x4ibjzp0c56n9m77hxdgwcm9356zlk5n4l3fx4i0hj6146";
           system = "data-sift-test";
           asd = "data-sift";
@@ -46770,7 +46770,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "data-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/data-table/2023-10-21/data-table-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/data-table/2023-10-21/data-table-20231021-git.tgz";
           sha256 = "1x64s3r2p28wgx7ffm205i90am2azfqkl6zlkrnjhppp82xan8yd";
           system = "data-table";
           asd = "data-table";
@@ -46793,7 +46793,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "data-table-clsql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/data-table/2023-10-21/data-table-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/data-table/2023-10-21/data-table-20231021-git.tgz";
           sha256 = "1x64s3r2p28wgx7ffm205i90am2azfqkl6zlkrnjhppp82xan8yd";
           system = "data-table-clsql";
           asd = "data-table-clsql";
@@ -46819,7 +46819,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "data-table-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/data-table/2023-10-21/data-table-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/data-table/2023-10-21/data-table-20231021-git.tgz";
           sha256 = "1x64s3r2p28wgx7ffm205i90am2azfqkl6zlkrnjhppp82xan8yd";
           system = "data-table-test";
           asd = "data-table";
@@ -46842,7 +46842,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "database-migrations" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/database-migrations/2023-02-14/database-migrations-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/database-migrations/2023-02-14/database-migrations-20230214-git.tgz";
           sha256 = "1mm5adjhqy0djr8fxpdsamc2ry2x5krc9w0s5nnfvyc4yqs0bwaa";
           system = "database-migrations";
           asd = "database-migrations";
@@ -46862,7 +46862,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "datafly" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/datafly/2024-10-12/datafly-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/datafly/2024-10-12/datafly-20241012-git.tgz";
           sha256 = "103zp5s778lys4lsn7hvyis65757338n0l9gzl595qfim4apx8g0";
           system = "datafly";
           asd = "datafly";
@@ -46897,7 +46897,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "datafly-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/datafly/2024-10-12/datafly-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/datafly/2024-10-12/datafly-20241012-git.tgz";
           sha256 = "103zp5s778lys4lsn7hvyis65757338n0l9gzl595qfim4apx8g0";
           system = "datafly-test";
           asd = "datafly-test";
@@ -46922,7 +46922,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dataloader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dataloader/2021-05-31/dataloader-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dataloader/2021-05-31/dataloader-20210531-git.tgz";
           sha256 = "1a7nap2yp0jjd9r3xpkj0a6z0m3gshz73abm8kfza4kf31ipzyik";
           system = "dataloader";
           asd = "dataloader";
@@ -46954,7 +46954,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dataloader.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dataloader/2021-05-31/dataloader-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dataloader/2021-05-31/dataloader-20210531-git.tgz";
           sha256 = "1a7nap2yp0jjd9r3xpkj0a6z0m3gshz73abm8kfza4kf31ipzyik";
           system = "dataloader.test";
           asd = "dataloader.test";
@@ -46977,7 +46977,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "datamuse" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/datamuse/2023-10-21/datamuse-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/datamuse/2023-10-21/datamuse-20231021-git.tgz";
           sha256 = "18mminvwv6wql6qh9kxxkhjfbxfz37gr125wy9h6za83vn1rkpwc";
           system = "datamuse";
           asd = "datamuse";
@@ -47001,7 +47001,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "date-calc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/date-calc/2019-12-27/date-calc-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/date-calc/2019-12-27/date-calc-20191227-git.tgz";
           sha256 = "09wmjp3ypxigcmx4mvc0yjnj56wkjjchhssdmklbaswy5mi7xc9s";
           system = "date-calc";
           asd = "date-calc";
@@ -47021,7 +47021,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "datum-comments" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/datum-comments/2021-02-28/datum-comments-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/datum-comments/2021-02-28/datum-comments-20210228-git.tgz";
           sha256 = "07zzlhphcmwimp4pjckhnbjbn127lcpafi7j0l74137dz9pimjik";
           system = "datum-comments";
           asd = "datum-comments";
@@ -47041,7 +47041,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "db3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-db3/2020-02-18/cl-db3-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-db3/2020-02-18/cl-db3-20200218-git.tgz";
           sha256 = "1i7j0mlri6kbklcx1lsm464s8kmyhhij5c4xh4aybrw8m4ixn1s5";
           system = "db3";
           asd = "db3";
@@ -47061,7 +47061,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dbd-mysql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz";
           sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy";
           system = "dbd-mysql";
           asd = "dbd-mysql";
@@ -47082,7 +47082,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dbd-postgres" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz";
           sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy";
           system = "dbd-postgres";
           asd = "dbd-postgres";
@@ -47104,7 +47104,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dbd-sqlite3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz";
           sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy";
           system = "dbd-sqlite3";
           asd = "dbd-sqlite3";
@@ -47126,7 +47126,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dbi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz";
           sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy";
           system = "dbi";
           asd = "dbi";
@@ -47149,7 +47149,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dbi-cp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dbi-connection-pool/2025-06-22/cl-dbi-connection-pool-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dbi-connection-pool/2025-06-22/cl-dbi-connection-pool-20250622-git.tgz";
           sha256 = "0q1kgcn822ifc8zcss4yihhwcl0asdxl8xxpbbnyjzxasqa47ifv";
           system = "dbi-cp";
           asd = "dbi-cp";
@@ -47174,7 +47174,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dbi-cp-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dbi-connection-pool/2025-06-22/cl-dbi-connection-pool-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dbi-connection-pool/2025-06-22/cl-dbi-connection-pool-20250622-git.tgz";
           sha256 = "0q1kgcn822ifc8zcss4yihhwcl0asdxl8xxpbbnyjzxasqa47ifv";
           system = "dbi-cp-test";
           asd = "dbi-cp-test";
@@ -47197,7 +47197,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dbi-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz";
           sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy";
           system = "dbi-test";
           asd = "dbi-test";
@@ -47220,7 +47220,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dbus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dbus/2024-10-12/dbus-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dbus/2024-10-12/dbus-20241012-git.tgz";
           sha256 = "1y880074m9g0swxrzpbplmkdxc6r62gzyigglf4x2i0zyss3gf65";
           system = "dbus";
           asd = "dbus";
@@ -47250,7 +47250,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dct" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dct/2022-03-31/cl-dct-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dct/2022-03-31/cl-dct-20220331-git.tgz";
           sha256 = "1rzq4vdhvr454668a3xf56mha061d27ymsgawmxikgk86wi8biin";
           system = "dct";
           asd = "dct";
@@ -47270,7 +47270,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dct-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-dct/2022-03-31/cl-dct-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-dct/2022-03-31/cl-dct-20220331-git.tgz";
           sha256 = "1rzq4vdhvr454668a3xf56mha061d27ymsgawmxikgk86wi8biin";
           system = "dct-test";
           asd = "dct-test";
@@ -47296,7 +47296,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ddo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
           sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "ddo";
           asd = "ddo";
@@ -47327,7 +47327,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "de-mock-racy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/de-mock-racy/2022-11-06/de-mock-racy-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/de-mock-racy/2022-11-06/de-mock-racy-20221106-git.tgz";
           sha256 = "02rkg1i5r8fgyhaipb0mkz543c8r81kqmwmmvywnnw8hpyvav2xb";
           system = "de-mock-racy";
           asd = "de-mock-racy";
@@ -47347,7 +47347,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dealii-tutorial" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
           sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "dealii-tutorial";
           asd = "dealii-tutorial";
@@ -47367,7 +47367,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "decimals" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-decimals/2021-12-09/cl-decimals-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-decimals/2021-12-09/cl-decimals-20211209-git.tgz";
           sha256 = "0wn5hq1pwd3wpjqqhpjzarcdk1q6416g8y447iaf55j5nbhlmbn6";
           system = "decimals";
           asd = "decimals";
@@ -47387,7 +47387,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deeds" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deeds/2025-06-22/deeds-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deeds/2025-06-22/deeds-20250622-git.tgz";
           sha256 = "0qhb95msyl0fv3swczdjfp413q8dckpf2kx7xrlryjdw3628wisq";
           system = "deeds";
           asd = "deeds";
@@ -47412,7 +47412,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "def-properties" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-def-properties/2023-06-18/cl-def-properties-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-def-properties/2023-06-18/cl-def-properties-20230618-git.tgz";
           sha256 = "0yvii6llhmjv1k7hli6waj1bprj8fqhncgnk8mdlg08wwa27a2j8";
           system = "def-properties";
           asd = "def-properties";
@@ -47436,7 +47436,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defclass-std" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defclass-std/2020-12-20/defclass-std-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/defclass-std/2020-12-20/defclass-std-20201220-git.tgz";
           sha256 = "1c0ymb49wd205lzxmnmsrpqyv0pn61snn2xvsbk5iis135r4fr18";
           system = "defclass-std";
           asd = "defclass-std";
@@ -47457,7 +47457,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defclass-std-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defclass-std/2020-12-20/defclass-std-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/defclass-std/2020-12-20/defclass-std-20201220-git.tgz";
           sha256 = "1c0ymb49wd205lzxmnmsrpqyv0pn61snn2xvsbk5iis135r4fr18";
           system = "defclass-std-test";
           asd = "defclass-std-test";
@@ -47481,7 +47481,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defconfig" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defconfig/2021-12-09/defconfig-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/defconfig/2021-12-09/defconfig-20211209-git.tgz";
           sha256 = "1gvgni43fxknj800k2k7jhgayzqqqp3s321sw4qmsjxpv479hcqy";
           system = "defconfig";
           asd = "defconfig";
@@ -47504,7 +47504,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defenum" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defenum/2025-06-22/defenum-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/defenum/2025-06-22/defenum-20250622-git.tgz";
           sha256 = "1rrm5gvb9l1ynvq2mnpvmv1mdgmbm48169r05zmpmvbfyyd2ngs9";
           system = "defenum";
           asd = "defenum";
@@ -47524,7 +47524,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deferred" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deferred/2025-06-22/deferred-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deferred/2025-06-22/deferred-20250622-git.tgz";
           sha256 = "1f7rv7vz5jld1wd9b087af6a62wjd5a1hwwmk47wklwmhvk32pk9";
           system = "deferred";
           asd = "deferred";
@@ -47544,7 +47544,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "define-json-expander" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/define-json-expander/2014-07-13/define-json-expander-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/define-json-expander/2014-07-13/define-json-expander-20140713-git.tgz";
           sha256 = "193mhjcy1qnfd7r7zia3qs8p7gllvq6s0b2wcqmkh0y17aw8brkh";
           system = "define-json-expander";
           asd = "define-json-expander";
@@ -47564,7 +47564,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "definer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/definer/2025-06-22/definer-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/definer/2025-06-22/definer-20250622-git.tgz";
           sha256 = "1dndgm78bylick7yh46rna40z0rq5l84lsyzlfpr6bfv51skpckc";
           system = "definer";
           asd = "definer";
@@ -47584,7 +47584,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "definitions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/definitions/2024-10-12/definitions-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/definitions/2024-10-12/definitions-20241012-git.tgz";
           sha256 = "16wg9rzxc193qvhzay69czr19wzy16b53vm1gy6p25gqvz90zryd";
           system = "definitions";
           asd = "definitions";
@@ -47604,7 +47604,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "definitions-systems" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/definitions-systems/2023-06-18/definitions-systems_3.0.tgz";
+          url = "https://beta.quicklisp.org/archive/definitions-systems/2023-06-18/definitions-systems_3.0.tgz";
           sha256 = "0wly8hr9gfxhdz4l46xsh4vj99q9aq7p3cfsglbgv19kdsvv217r";
           system = "definitions-systems";
           asd = "definitions-systems";
@@ -47630,7 +47630,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "definitions-systems_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/definitions-systems/2023-06-18/definitions-systems_3.0.tgz";
+          url = "https://beta.quicklisp.org/archive/definitions-systems/2023-06-18/definitions-systems_3.0.tgz";
           sha256 = "0wly8hr9gfxhdz4l46xsh4vj99q9aq7p3cfsglbgv19kdsvv217r";
           system = "definitions-systems_tests";
           asd = "definitions-systems_tests";
@@ -47653,7 +47653,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deflate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deflate/2024-10-12/deflate-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deflate/2024-10-12/deflate-20241012-git.tgz";
           sha256 = "1b225rgc3b2b2k941aj8mz4fkyysi0my368r042wzykq28lwwwij";
           system = "deflate";
           asd = "deflate";
@@ -47673,7 +47673,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deflazy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "deflazy";
           asd = "deflazy";
@@ -47697,7 +47697,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defmain" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defmain/2024-10-12/defmain-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/defmain/2024-10-12/defmain-20241012-git.tgz";
           sha256 = "0lb45xmpan188vcysc7d579gg1mc7qi3xyyqc6mqr49571zshzb1";
           system = "defmain";
           asd = "defmain";
@@ -47726,7 +47726,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defmain-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defmain/2024-10-12/defmain-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/defmain/2024-10-12/defmain-20241012-git.tgz";
           sha256 = "0lb45xmpan188vcysc7d579gg1mc7qi3xyyqc6mqr49571zshzb1";
           system = "defmain-test";
           asd = "defmain-test";
@@ -47750,7 +47750,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defmemo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defmemo/2012-04-07/defmemo-20120407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/defmemo/2012-04-07/defmemo-20120407-git.tgz";
           sha256 = "0rkvnjfb6fajzfzislz6z372bqpkj6wfbf0sxmzhhigni4wnil27";
           system = "defmemo";
           asd = "defmemo";
@@ -47773,7 +47773,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defmemo-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defmemo/2012-04-07/defmemo-20120407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/defmemo/2012-04-07/defmemo-20120407-git.tgz";
           sha256 = "0rkvnjfb6fajzfzislz6z372bqpkj6wfbf0sxmzhhigni4wnil27";
           system = "defmemo-test";
           asd = "defmemo";
@@ -47793,7 +47793,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defpackage-plus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defpackage-plus/2018-01-31/defpackage-plus-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/defpackage-plus/2018-01-31/defpackage-plus-20180131-git.tgz";
           sha256 = "0lzljvf343xb6mlh6lni2i27hpm5qd376522mk6hr2pa20vd6rdq";
           system = "defpackage-plus";
           asd = "defpackage-plus";
@@ -47813,7 +47813,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defrec" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defrec/2023-06-18/defrec-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/defrec/2023-06-18/defrec-20230618-git.tgz";
           sha256 = "04wd43z2k5cv4a55x532y3aqc7gf1ksndvndvy0y6bslxqqgv63m";
           system = "defrec";
           asd = "defrec";
@@ -47833,7 +47833,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defrest" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defrest/2021-05-31/defrest-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/defrest/2021-05-31/defrest-20210531-git.tgz";
           sha256 = "14pap344a0549mb7p79jf87ibfxmymk0hf9i7galcfi4s8nqq45g";
           system = "defrest";
           asd = "defrest";
@@ -47858,7 +47858,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defrest.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defrest/2021-05-31/defrest-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/defrest/2021-05-31/defrest-20210531-git.tgz";
           sha256 = "14pap344a0549mb7p79jf87ibfxmymk0hf9i7galcfi4s8nqq45g";
           system = "defrest.test";
           asd = "defrest";
@@ -47882,7 +47882,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defstar" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defstar/2014-07-13/defstar-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/defstar/2014-07-13/defstar-20140713-git.tgz";
           sha256 = "0n6m3aqvdfnsrhlhqjcy72d1i55lbkjg13ij5c7vw003p1n78wxi";
           system = "defstar";
           asd = "defstar";
@@ -47902,7 +47902,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defsystem-compatibility" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defsystem-compatibility/2010-10-06/defsystem-compatibility-20101006-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/defsystem-compatibility/2010-10-06/defsystem-compatibility-20101006-darcs.tgz";
           sha256 = "0bw0c69zyika19rvzl8xplwrqsgznhnlbj40fcszfw0vxh2czj0f";
           system = "defsystem-compatibility";
           asd = "defsystem-compatibility";
@@ -47922,7 +47922,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defsystem-compatibility-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defsystem-compatibility/2010-10-06/defsystem-compatibility-20101006-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/defsystem-compatibility/2010-10-06/defsystem-compatibility-20101006-darcs.tgz";
           sha256 = "0bw0c69zyika19rvzl8xplwrqsgznhnlbj40fcszfw0vxh2czj0f";
           system = "defsystem-compatibility-test";
           asd = "defsystem-compatibility-test";
@@ -47945,7 +47945,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "defvariant" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/defvariant/2014-07-13/defvariant-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/defvariant/2014-07-13/defvariant-20140713-git.tgz";
           sha256 = "0rma557l2irjyzrswcd7329iic2pjxw0jgk3m2inag39l6wyqsr1";
           system = "defvariant";
           asd = "defvariant";
@@ -47965,7 +47965,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "delorean" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/delorean/2013-06-15/delorean-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/delorean/2013-06-15/delorean-20130615-git.tgz";
           sha256 = "0q11wqdlvis91i996mar72icw07yf7mwmsnlmsbsya9kaqj7n3cd";
           system = "delorean";
           asd = "delorean";
@@ -47985,7 +47985,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "delorean-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/delorean/2013-06-15/delorean-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/delorean/2013-06-15/delorean-20130615-git.tgz";
           sha256 = "0q11wqdlvis91i996mar72icw07yf7mwmsnlmsbsya9kaqj7n3cd";
           system = "delorean-test";
           asd = "delorean";
@@ -48008,7 +48008,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "delta-debug" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/delta-debug/2018-08-31/delta-debug-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/delta-debug/2018-08-31/delta-debug-20180831-git.tgz";
           sha256 = "0dm33v8ipkpr23mjb9s6z2c7gmxwjbd5khc7c1vangba18nzm7ir";
           system = "delta-debug";
           asd = "delta-debug";
@@ -48032,7 +48032,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dendrite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz";
           sha256 = "1fsi77w2yamis2707f1hx09pmyjaxqpzl8s0h182vpz159lkxdy5";
           system = "dendrite";
           asd = "dendrite";
@@ -48055,7 +48055,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dendrite.micro-l-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz";
           sha256 = "1fsi77w2yamis2707f1hx09pmyjaxqpzl8s0h182vpz159lkxdy5";
           system = "dendrite.micro-l-system";
           asd = "dendrite.micro-l-system";
@@ -48075,7 +48075,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dendrite.primitives" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz";
           sha256 = "1fsi77w2yamis2707f1hx09pmyjaxqpzl8s0h182vpz159lkxdy5";
           system = "dendrite.primitives";
           asd = "dendrite.primitives";
@@ -48098,7 +48098,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deoxybyte-gzip" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deoxybyte-gzip/2025-06-22/deoxybyte-gzip-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deoxybyte-gzip/2025-06-22/deoxybyte-gzip-20250622-git.tgz";
           sha256 = "0zy9536ggz2wpgzkgby4hgn38f3s2wq21f2j9gbb9xm431p4w3kx";
           system = "deoxybyte-gzip";
           asd = "deoxybyte-gzip";
@@ -48122,7 +48122,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deoxybyte-gzip-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deoxybyte-gzip/2025-06-22/deoxybyte-gzip-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deoxybyte-gzip/2025-06-22/deoxybyte-gzip-20250622-git.tgz";
           sha256 = "0zy9536ggz2wpgzkgby4hgn38f3s2wq21f2j9gbb9xm431p4w3kx";
           system = "deoxybyte-gzip-test";
           asd = "deoxybyte-gzip-test";
@@ -48145,7 +48145,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deoxybyte-io" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deoxybyte-io/2014-01-13/deoxybyte-io-20140113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deoxybyte-io/2014-01-13/deoxybyte-io-20140113-git.tgz";
           sha256 = "0pjx96g50yqhdk0l1y970hc22fc1bl8ppyklhp62l41b4fb7hbbv";
           system = "deoxybyte-io";
           asd = "deoxybyte-io";
@@ -48170,7 +48170,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deoxybyte-io-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deoxybyte-io/2014-01-13/deoxybyte-io-20140113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deoxybyte-io/2014-01-13/deoxybyte-io-20140113-git.tgz";
           sha256 = "0pjx96g50yqhdk0l1y970hc22fc1bl8ppyklhp62l41b4fb7hbbv";
           system = "deoxybyte-io-test";
           asd = "deoxybyte-io-test";
@@ -48193,7 +48193,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deoxybyte-systems" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deoxybyte-systems/2014-01-13/deoxybyte-systems-20140113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deoxybyte-systems/2014-01-13/deoxybyte-systems-20140113-git.tgz";
           sha256 = "0sbzl0ngz85mvkghcy8y94hk34v5hvi41b111mb76f2jvdq9jjr8";
           system = "deoxybyte-systems";
           asd = "deoxybyte-systems";
@@ -48213,7 +48213,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deoxybyte-unix" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deoxybyte-unix/2014-01-13/deoxybyte-unix-20140113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deoxybyte-unix/2014-01-13/deoxybyte-unix-20140113-git.tgz";
           sha256 = "016lgb8vcnn7qwhndan1d61wbb10xmsczqp7h2kkfnhlvkr484qf";
           system = "deoxybyte-unix";
           asd = "deoxybyte-unix";
@@ -48237,7 +48237,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deoxybyte-unix-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deoxybyte-unix/2014-01-13/deoxybyte-unix-20140113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deoxybyte-unix/2014-01-13/deoxybyte-unix-20140113-git.tgz";
           sha256 = "016lgb8vcnn7qwhndan1d61wbb10xmsczqp7h2kkfnhlvkr484qf";
           system = "deoxybyte-unix-test";
           asd = "deoxybyte-unix-test";
@@ -48260,7 +48260,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deoxybyte-utilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deoxybyte-utilities/2014-01-13/deoxybyte-utilities-20140113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deoxybyte-utilities/2014-01-13/deoxybyte-utilities-20140113-git.tgz";
           sha256 = "054mvn27d9xdsal87avyxzphgv6pk96a0c1icpkldqczlmzl9j0g";
           system = "deoxybyte-utilities";
           asd = "deoxybyte-utilities";
@@ -48280,7 +48280,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deoxybyte-utilities-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deoxybyte-utilities/2014-01-13/deoxybyte-utilities-20140113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deoxybyte-utilities/2014-01-13/deoxybyte-utilities-20140113-git.tgz";
           sha256 = "054mvn27d9xdsal87avyxzphgv6pk96a0c1icpkldqczlmzl9j0g";
           system = "deoxybyte-utilities-test";
           asd = "deoxybyte-utilities-test";
@@ -48303,7 +48303,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deploy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deploy/2025-06-22/deploy-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deploy/2025-06-22/deploy-20250622-git.tgz";
           sha256 = "0lhc0ca4y29wpcv8j78613y5rmq0q8fmh7hq6kxi3b9ykfgr5n31";
           system = "deploy";
           asd = "deploy";
@@ -48329,7 +48329,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deploy-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deploy/2025-06-22/deploy-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deploy/2025-06-22/deploy-20250622-git.tgz";
           sha256 = "0lhc0ca4y29wpcv8j78613y5rmq0q8fmh7hq6kxi3b9ykfgr5n31";
           system = "deploy-test";
           asd = "deploy-test";
@@ -48353,7 +48353,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "depot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
           sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8";
           system = "depot";
           asd = "depot";
@@ -48377,7 +48377,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "depot-in-memory" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
           sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8";
           system = "depot-in-memory";
           asd = "depot-in-memory";
@@ -48400,7 +48400,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "depot-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
           sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8";
           system = "depot-test";
           asd = "depot-test";
@@ -48425,7 +48425,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "depot-virtual" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
           sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8";
           system = "depot-virtual";
           asd = "depot-virtual";
@@ -48445,7 +48445,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "depot-zip" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/depot/2025-06-22/depot-20250622-git.tgz";
           sha256 = "1hmd7pi3zharalqv2zl6aicw4ir3gd0gnawd6w55qvia8c5y9bm8";
           system = "depot-zip";
           asd = "depot-zip";
@@ -48469,7 +48469,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "deptree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/deptree/2024-10-12/deptree-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/deptree/2024-10-12/deptree-20241012-git.tgz";
           sha256 = "10ybmw28c52ahbm7xjn795367lssp6088v6705fmqbl0fgjpvxnw";
           system = "deptree";
           asd = "deptree";
@@ -48489,7 +48489,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "descriptions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz";
           sha256 = "0h44gxilwmzk8cbxb81047cjndksvf8vw2s3pcy2diw9aqiacg7f";
           system = "descriptions";
           asd = "descriptions";
@@ -48514,7 +48514,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "descriptions-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz";
           sha256 = "0h44gxilwmzk8cbxb81047cjndksvf8vw2s3pcy2diw9aqiacg7f";
           system = "descriptions-test";
           asd = "descriptions-test";
@@ -48539,7 +48539,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "descriptions.serialization" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz";
           sha256 = "0h44gxilwmzk8cbxb81047cjndksvf8vw2s3pcy2diw9aqiacg7f";
           system = "descriptions.serialization";
           asd = "descriptions.serialization";
@@ -48562,7 +48562,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "descriptions.validation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz";
           sha256 = "0h44gxilwmzk8cbxb81047cjndksvf8vw2s3pcy2diw9aqiacg7f";
           system = "descriptions.validation";
           asd = "descriptions.validation";
@@ -48585,7 +48585,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "destructuring-bind-star" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/destructuring-bind-star/2020-06-10/destructuring-bind-star-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/destructuring-bind-star/2020-06-10/destructuring-bind-star-20200610-git.tgz";
           sha256 = "1j1xnhvb6pm9q291aawbrcwp8bgbmiij9a53gifxhr4kp934ciz2";
           system = "destructuring-bind-star";
           asd = "destructuring-bind-star";
@@ -48605,7 +48605,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dexador" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz";
           sha256 = "19y95k821665vcy7gbxhh4rqwk7fh4brv1sgkaykncpw2l2lll5r";
           system = "dexador";
           asd = "dexador";
@@ -48641,7 +48641,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dexador-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz";
           sha256 = "19y95k821665vcy7gbxhh4rqwk7fh4brv1sgkaykncpw2l2lll5r";
           system = "dexador-test";
           asd = "dexador-test";
@@ -48668,7 +48668,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dexador-usocket" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz";
           sha256 = "19y95k821665vcy7gbxhh4rqwk7fh4brv1sgkaykncpw2l2lll5r";
           system = "dexador-usocket";
           asd = "dexador-usocket";
@@ -48691,7 +48691,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dfio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dfio/2022-11-06/dfio-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dfio/2022-11-06/dfio-20221106-git.tgz";
           sha256 = "1p53r7773939jnap518xp4b4wfvc1kbrz9jp6yd40xq0jpf9pbqg";
           system = "dfio";
           asd = "dfio";
@@ -48718,7 +48718,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "diff" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/diff/2013-08-13/diff-20130813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/diff/2013-08-13/diff-20130813-git.tgz";
           sha256 = "1giafck8qfvb688kx5bn9g32rfc12jjywg8vdav36aqbd6lxf5z5";
           system = "diff";
           asd = "diff";
@@ -48741,7 +48741,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "diff-match-patch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/diff-match-patch/2021-05-31/diff-match-patch-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/diff-match-patch/2021-05-31/diff-match-patch-20210531-git.tgz";
           sha256 = "0wxz2q9sd2v8fg521f7bzv6wi3za7saz2j2snsnw2p1kcsj6zqa4";
           system = "diff-match-patch";
           asd = "diff-match-patch";
@@ -48764,7 +48764,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dirt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dirt/2017-10-19/dirt-release-quicklisp-0d13ebc2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dirt/2017-10-19/dirt-release-quicklisp-0d13ebc2-git.tgz";
           sha256 = "1lqxfdzn9rh7rzsq97d4hp6fl4g9fs6s0n2pvf460d6ri6p40xna";
           system = "dirt";
           asd = "dirt";
@@ -48787,7 +48787,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dispatch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "dispatch";
           asd = "dispatch";
@@ -48810,7 +48810,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dispatch-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "dispatch-test";
           asd = "dispatch-test";
@@ -48833,7 +48833,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "disposable" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/disposable/2016-02-08/disposable-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/disposable/2016-02-08/disposable-20160208-git.tgz";
           sha256 = "18synnlg4b8203rgww644dj7ghb4m1j33lb4zm64850vqy5b3pz7";
           system = "disposable";
           asd = "disposable";
@@ -48853,7 +48853,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dissect" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dissect/2024-10-12/dissect-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dissect/2024-10-12/dissect-20241012-git.tgz";
           sha256 = "1ym1zggwrj15l7y2mcz5l2gfk68prqxhdswffd9s5014pa6zyysr";
           system = "dissect";
           asd = "dissect";
@@ -48871,7 +48871,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "distributions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/distributions/2022-11-06/distributions-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/distributions/2022-11-06/distributions-20221106-git.tgz";
           sha256 = "1fkzigd0s0s0mvszgmv04yc8jp9gm4812445hfh6kpz6cjy5zpsk";
           system = "distributions";
           asd = "distributions";
@@ -48900,7 +48900,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "djula" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
           sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a";
           system = "djula";
           asd = "djula";
@@ -48932,7 +48932,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "djula-demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
           sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a";
           system = "djula-demo";
           asd = "djula-demo";
@@ -48956,7 +48956,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "djula-gettext" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
           sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a";
           system = "djula-gettext";
           asd = "djula-gettext";
@@ -48979,7 +48979,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "djula-locale" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
           sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a";
           system = "djula-locale";
           asd = "djula-locale";
@@ -49002,7 +49002,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "djula-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
           sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a";
           system = "djula-test";
           asd = "djula-test";
@@ -49025,7 +49025,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "djula-translate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/djula/2025-06-22/djula-20250622-git.tgz";
           sha256 = "07pwb5cg3a978xzsvsqrsd9r1w0spfx3379wim4bn7fb1d417s9a";
           system = "djula-translate";
           asd = "djula-translate";
@@ -49048,7 +49048,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dlist" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dlist/2012-11-25/dlist-20121125-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dlist/2012-11-25/dlist-20121125-git.tgz";
           sha256 = "1ycgjmbxpj0bj95xg0x7m30yz8y73s7mnqs0dzam00rkf8g00h89";
           system = "dlist";
           asd = "dlist";
@@ -49068,7 +49068,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dlist-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dlist/2012-11-25/dlist-20121125-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dlist/2012-11-25/dlist-20121125-git.tgz";
           sha256 = "1ycgjmbxpj0bj95xg0x7m30yz8y73s7mnqs0dzam00rkf8g00h89";
           system = "dlist-test";
           asd = "dlist";
@@ -49091,7 +49091,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dml/2023-10-21/dml-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dml/2023-10-21/dml-20231021-git.tgz";
           sha256 = "15yxfgmzxpn3hr3kfmw7iid652v1v1v0fw7ngvs1ig6693kci72h";
           system = "dml";
           asd = "dml";
@@ -49116,7 +49116,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dns-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dns-client/2025-06-22/dns-client-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dns-client/2025-06-22/dns-client-20250622-git.tgz";
           sha256 = "1ylnhnpcs25nzax2bxrnxl1kjghmnl5yy2vsi6ps3fafw6b2ras3";
           system = "dns-client";
           asd = "dns-client";
@@ -49140,7 +49140,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "do-urlencode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz";
           sha256 = "0k2i3d4k9cpci235mwfm0c5a4yqfkijr716bjv7cdlpzx88lazm9";
           system = "do-urlencode";
           asd = "do-urlencode";
@@ -49161,7 +49161,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "docbrowser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/docbrowser/2025-06-22/docbrowser-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/docbrowser/2025-06-22/docbrowser-20250622-git.tgz";
           sha256 = "1c48wh6mgw0n8g6cq758nzcsrbkgsq56183ydg76yqhj4ciri0jn";
           system = "docbrowser";
           asd = "docbrowser";
@@ -49195,7 +49195,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "docparser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/docparser/2023-02-14/docparser-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/docparser/2023-02-14/docparser-20230214-git.tgz";
           sha256 = "1ix8n6albgl34kwvk2f3vfz9afi6y4m9dd6k3axlm9g16zhmhma1";
           system = "docparser";
           asd = "docparser";
@@ -49220,7 +49220,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "docparser-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/docparser/2023-02-14/docparser-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/docparser/2023-02-14/docparser-20230214-git.tgz";
           sha256 = "1ix8n6albgl34kwvk2f3vfz9afi6y4m9dd6k3axlm9g16zhmhma1";
           system = "docparser-test";
           asd = "docparser-test";
@@ -49244,7 +49244,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "docparser-test-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/docparser/2023-02-14/docparser-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/docparser/2023-02-14/docparser-20230214-git.tgz";
           sha256 = "1ix8n6albgl34kwvk2f3vfz9afi6y4m9dd6k3axlm9g16zhmhma1";
           system = "docparser-test-system";
           asd = "docparser-test-system";
@@ -49264,7 +49264,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "docs-builder" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/docs-builder/2025-06-22/docs-builder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/docs-builder/2025-06-22/docs-builder-20250622-git.tgz";
           sha256 = "1w1fx5b193s5zifnp22sha8s4vqa15p3kg8fwl60yv90gk4wvwwm";
           system = "docs-builder";
           asd = "docs-builder";
@@ -49289,7 +49289,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "docs-config" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/docs-builder/2025-06-22/docs-builder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/docs-builder/2025-06-22/docs-builder-20250622-git.tgz";
           sha256 = "1w1fx5b193s5zifnp22sha8s4vqa15p3kg8fwl60yv90gk4wvwwm";
           system = "docs-config";
           asd = "docs-config";
@@ -49309,7 +49309,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "documentation-template" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/documentation-template/2014-12-17/documentation-template-0.4.4.tgz";
+          url = "https://beta.quicklisp.org/archive/documentation-template/2014-12-17/documentation-template-0.4.4.tgz";
           sha256 = "0pfcg38ws0syhg2l15nwslfyj175dq1dvjip64nx02knw26zj56y";
           system = "documentation-template";
           asd = "documentation-template";
@@ -49329,7 +49329,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "documentation-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/documentation-utils/2025-06-22/documentation-utils-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/documentation-utils/2025-06-22/documentation-utils-20250622-git.tgz";
           sha256 = "1rmb9m3rilj5c4cr7bn5gnx1wrksi85zizp4hr7409qzg345mg7l";
           system = "documentation-utils";
           asd = "documentation-utils";
@@ -49347,7 +49347,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "documentation-utils-extensions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/documentation-utils-extensions/2022-07-07/documentation-utils-extensions-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/documentation-utils-extensions/2022-07-07/documentation-utils-extensions-20220707-git.tgz";
           sha256 = "1bv8y1hbn6fivvsanaci19k47vfdchj3argz92az3izmar9ybp4f";
           system = "documentation-utils-extensions";
           asd = "documentation-utils-extensions";
@@ -49367,7 +49367,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "docutils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-docutils/2013-01-28/cl-docutils-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-docutils/2013-01-28/cl-docutils-20130128-git.tgz";
           sha256 = "132bxlj0jlhiabi29mygmkcbbgyb5s1yz1xdfhm3pgrf9f8605gg";
           system = "docutils";
           asd = "docutils";
@@ -49391,7 +49391,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dom" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "dom";
           asd = "dom";
@@ -49414,7 +49414,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "donuts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/donuts/2012-07-03/donuts-20120703-git.tgz";
+          url = "https://beta.quicklisp.org/archive/donuts/2012-07-03/donuts-20120703-git.tgz";
           sha256 = "1arjlwic0gk28ja1ql5k1r3v0pqzg42ds8vzq9266hq5lp06q3ii";
           system = "donuts";
           asd = "donuts";
@@ -49437,7 +49437,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "doplus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/doplus/2021-10-20/doplus-v1.1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/doplus/2021-10-20/doplus-v1.1.0.tgz";
           sha256 = "1yvda9psw9m08d3bzdb8a2drvhrnr07a0rhza5ibk30v1dkwfw7c";
           system = "doplus";
           asd = "doplus";
@@ -49457,7 +49457,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "doplus-fset" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/doplus/2021-10-20/doplus-v1.1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/doplus/2021-10-20/doplus-v1.1.0.tgz";
           sha256 = "1yvda9psw9m08d3bzdb8a2drvhrnr07a0rhza5ibk30v1dkwfw7c";
           system = "doplus-fset";
           asd = "doplus-fset";
@@ -49480,7 +49480,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dotenv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dotenv/2021-12-09/dotenv-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dotenv/2021-12-09/dotenv-20211209-git.tgz";
           sha256 = "0g19svpxy2169rym532gjwsg1zybinpc99mjsy6im4n6zdd57hzh";
           system = "dotenv";
           asd = "dotenv";
@@ -49503,7 +49503,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dotenv-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dotenv/2021-12-09/dotenv-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dotenv/2021-12-09/dotenv-20211209-git.tgz";
           sha256 = "0g19svpxy2169rym532gjwsg1zybinpc99mjsy6im4n6zdd57hzh";
           system = "dotenv-test";
           asd = "dotenv";
@@ -49527,7 +49527,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "doubly-linked-list" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/doubly-linked-list/2022-07-07/doubly-linked-list-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/doubly-linked-list/2022-07-07/doubly-linked-list-20220707-git.tgz";
           sha256 = "073r1zyp0slzzvcyj7ibjs85bss1iqh42zn5dvkjd6ls78v2bn9f";
           system = "doubly-linked-list";
           asd = "doubly-linked-list";
@@ -49547,7 +49547,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "drakma" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/drakma/2023-10-21/drakma-v2.0.10.tgz";
+          url = "https://beta.quicklisp.org/archive/drakma/2023-10-21/drakma-v2.0.10.tgz";
           sha256 = "0clj7c1hysisdvkidvx7m0702alsksna6iiqlk499hn3hjpafmln";
           system = "drakma";
           asd = "drakma";
@@ -49574,7 +49574,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "drakma-async" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/drakma-async/2021-08-07/drakma-async-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/drakma-async/2021-08-07/drakma-async-20210807-git.tgz";
           sha256 = "19cd4xrcx3mz86sl0326x5lcrh9jizrwzi6p7pd856nrmx7ynf4w";
           system = "drakma-async";
           asd = "drakma-async";
@@ -49602,7 +49602,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "drakma-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/drakma/2023-10-21/drakma-v2.0.10.tgz";
+          url = "https://beta.quicklisp.org/archive/drakma/2023-10-21/drakma-v2.0.10.tgz";
           sha256 = "0clj7c1hysisdvkidvx7m0702alsksna6iiqlk499hn3hjpafmln";
           system = "drakma-test";
           asd = "drakma-test";
@@ -49627,7 +49627,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "draw-cons-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/draw-cons-tree/2023-06-18/draw-cons-tree-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/draw-cons-tree/2023-06-18/draw-cons-tree-20230618-git.tgz";
           sha256 = "1523bdkq8a5qn0qp9q7r16w47y6jb0hkfj7hbjfj6mg3xv001s3x";
           system = "draw-cons-tree";
           asd = "draw-cons-tree";
@@ -49647,7 +49647,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dref" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
           sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
           system = "dref";
           asd = "dref";
@@ -49673,7 +49673,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dref-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
           sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
           system = "dref-test";
           asd = "dref-test";
@@ -49700,7 +49700,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dref-test-package-inferred" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
           sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
           system = "dref-test-package-inferred";
           asd = "dref-test-package-inferred";
@@ -49720,7 +49720,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "drei-mcclim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "drei-mcclim";
           asd = "drei-mcclim";
@@ -49747,7 +49747,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dso-lex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dso-lex/2011-01-10/dso-lex-0.3.2.tgz";
+          url = "https://beta.quicklisp.org/archive/dso-lex/2011-01-10/dso-lex-0.3.2.tgz";
           sha256 = "09vx0dsfaj1c5ivfkx9zl9s2yxmqpdc2v41fhpq75anq9ffr6qyr";
           system = "dso-lex";
           asd = "dso-lex";
@@ -49770,7 +49770,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dso-util" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dso-util/2011-01-10/dso-util-0.1.2.tgz";
+          url = "https://beta.quicklisp.org/archive/dso-util/2011-01-10/dso-util-0.1.2.tgz";
           sha256 = "12w1rxxk2hi6k7ng9kqf2yb1kff78bshdfl7bwv6fz8im8vq13b3";
           system = "dso-util";
           asd = "dso-util";
@@ -49790,7 +49790,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "duckdb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-duckdb/2025-06-22/cl-duckdb-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-duckdb/2025-06-22/cl-duckdb-20250622-git.tgz";
           sha256 = "13l74slzsd6vdn1ankphbrrqd4021g2d28am677xrmlm1p7nlw52";
           system = "duckdb";
           asd = "duckdb";
@@ -49823,7 +49823,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dufy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dufy/2024-10-12/dufy-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dufy/2024-10-12/dufy-20241012-git.tgz";
           sha256 = "1fj1ad7jh8i72jvdc5ypdk1j1mlkr7dc9xs4khii9adj3jl1nb0v";
           system = "dufy";
           asd = "dufy";
@@ -49846,7 +49846,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dungen" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dungen/2022-07-07/dungen-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dungen/2022-07-07/dungen-20220707-git.tgz";
           sha256 = "1yvkch227g0yawv2682ysdv9q2g5yyyxjvfpx3hijl0mm0awgxv5";
           system = "dungen";
           asd = "dungen";
@@ -49870,7 +49870,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "duologue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/duologue/2023-02-14/duologue-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/duologue/2023-02-14/duologue-20230214-git.tgz";
           sha256 = "1yg7f27im9h0m6jihcay1p7alfhzm9hafwm5dw5hsyacy8f2cwk2";
           system = "duologue";
           asd = "duologue";
@@ -49897,7 +49897,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "duologue-readline" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/duologue/2023-02-14/duologue-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/duologue/2023-02-14/duologue-20230214-git.tgz";
           sha256 = "1yg7f27im9h0m6jihcay1p7alfhzm9hafwm5dw5hsyacy8f2cwk2";
           system = "duologue-readline";
           asd = "duologue-readline";
@@ -49926,7 +49926,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "duologue-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/duologue/2023-02-14/duologue-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/duologue/2023-02-14/duologue-20230214-git.tgz";
           sha256 = "1yg7f27im9h0m6jihcay1p7alfhzm9hafwm5dw5hsyacy8f2cwk2";
           system = "duologue-test";
           asd = "duologue-test";
@@ -49949,7 +49949,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dweet" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dweet/2014-12-17/dweet-20141217-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dweet/2014-12-17/dweet-20141217-git.tgz";
           sha256 = "1i3ab3igvdy6fhq3zlx1vaswhvm9dlp6fagzxbrqhqj6jsbhiwv7";
           system = "dweet";
           asd = "dweet";
@@ -49973,7 +49973,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dynamic-array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dynamic-array/2022-07-07/dynamic-array-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dynamic-array/2022-07-07/dynamic-array-20220707-git.tgz";
           sha256 = "02kg1m5xscg521074nasx3f04784jbm0x61a7skixbdprpg6hhnh";
           system = "dynamic-array";
           asd = "dynamic-array";
@@ -49993,7 +49993,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dynamic-classes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dynamic-classes/2023-10-21/dynamic-classes-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dynamic-classes/2023-10-21/dynamic-classes-20231021-git.tgz";
           sha256 = "1k9lkchwyi2xhygp2v8ifq3kg1l3wcnihhzgr06jrivjxgdqpc1a";
           system = "dynamic-classes";
           asd = "dynamic-classes";
@@ -50013,7 +50013,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dynamic-classes-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dynamic-classes/2023-10-21/dynamic-classes-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dynamic-classes/2023-10-21/dynamic-classes-20231021-git.tgz";
           sha256 = "1k9lkchwyi2xhygp2v8ifq3kg1l3wcnihhzgr06jrivjxgdqpc1a";
           system = "dynamic-classes-test";
           asd = "dynamic-classes-test";
@@ -50036,7 +50036,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dynamic-collect" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dynamic-collect/2023-06-18/dynamic-collect-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dynamic-collect/2023-06-18/dynamic-collect-20230618-git.tgz";
           sha256 = "0p1ylba1myby21jg8x9lgwxfv958za32qsz426yd2vc485j887iw";
           system = "dynamic-collect";
           asd = "dynamic-collect";
@@ -50056,7 +50056,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dynamic-mixins" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dynamic-mixins/2018-10-18/dynamic-mixins-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dynamic-mixins/2018-10-18/dynamic-mixins-20181018-git.tgz";
           sha256 = "00g3s509ysh2jp1qwsgb5bwl6qvhzcljwjz3z4mspbcak51484zj";
           system = "dynamic-mixins";
           asd = "dynamic-mixins";
@@ -50079,7 +50079,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dynamic-mixins-swm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stumpwm/2025-06-22/stumpwm-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stumpwm/2025-06-22/stumpwm-20250622-git.tgz";
           sha256 = "1l4rxcva947ijxsfnzyy35ql7a8pjsxaag51pq2bib3qfy7wg5ld";
           system = "dynamic-mixins-swm";
           asd = "dynamic-mixins-swm";
@@ -50099,7 +50099,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "dynamic-wind" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/contextl/2024-10-12/contextl-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/contextl/2024-10-12/contextl-20241012-git.tgz";
           sha256 = "1jsa5wyjzzfw9pii3d6x20mh8ijnpb291g3i0y2ccj0x8z3xfyyk";
           system = "dynamic-wind";
           asd = "dynamic-wind";
@@ -50119,7 +50119,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eager-future" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eager-future/2010-10-06/eager-future-20101006-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/eager-future/2010-10-06/eager-future-20101006-darcs.tgz";
           sha256 = "0l7khqfqfchk7j24fk7rwagwanjargxsrzr6g1h4ainqjajd91jl";
           system = "eager-future";
           asd = "eager-future";
@@ -50139,7 +50139,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eager-future.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eager-future/2010-10-06/eager-future-20101006-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/eager-future/2010-10-06/eager-future-20101006-darcs.tgz";
           sha256 = "0l7khqfqfchk7j24fk7rwagwanjargxsrzr6g1h4ainqjajd91jl";
           system = "eager-future.test";
           asd = "eager-future";
@@ -50162,7 +50162,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eager-future2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz";
           sha256 = "1qs1bv3m0ki8l5czhsflxcryh22r9d9g9a3a3b0cr0pl954q5rld";
           system = "eager-future2";
           asd = "eager-future2";
@@ -50183,7 +50183,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "easing" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz";
           sha256 = "0750cs5kij8hi53960lzih57xrf92fj23i3hxzhqzcyla4wi4jv5";
           system = "easing";
           asd = "easing";
@@ -50203,7 +50203,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "easing-demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz";
           sha256 = "0750cs5kij8hi53960lzih57xrf92fj23i3hxzhqzcyla4wi4jv5";
           system = "easing-demo";
           asd = "easing-demo";
@@ -50226,7 +50226,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "easing-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz";
           sha256 = "0750cs5kij8hi53960lzih57xrf92fj23i3hxzhqzcyla4wi4jv5";
           system = "easing-test";
           asd = "easing-test";
@@ -50249,7 +50249,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "easter-gauss" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/easter-gauss/2024-10-12/easter-gauss-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/easter-gauss/2024-10-12/easter-gauss-20241012-git.tgz";
           sha256 = "1wgr7j8b32yq0ajy4a3g08yr7z4p987gfjsrd6gai5i9zqxkbyih";
           system = "easter-gauss";
           asd = "easter-gauss";
@@ -50269,7 +50269,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "easy-audio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/easy-audio/2025-06-22/easy-audio-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/easy-audio/2025-06-22/easy-audio-20250622-git.tgz";
           sha256 = "1g8yrzrc6bv2487581hbfx1wjhf3gwvzznrfbmchqrfpx16vbmf1";
           system = "easy-audio";
           asd = "easy-audio";
@@ -50295,7 +50295,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "easy-bind" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/easy-bind/2019-02-02/easy-bind-20190202-git.tgz";
+          url = "https://beta.quicklisp.org/archive/easy-bind/2019-02-02/easy-bind-20190202-git.tgz";
           sha256 = "0z7mqm7vnk8jcsmawlyhzg81v2bmgdbxmx3jkf2m74170q78jhkl";
           system = "easy-bind";
           asd = "easy-bind";
@@ -50315,7 +50315,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "easy-macros" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/easy-macros/2024-10-12/easy-macros-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/easy-macros/2024-10-12/easy-macros-20241012-git.tgz";
           sha256 = "12ixfmxbxszhdcv2fnd9q8m573bn6q2nvn656bpwnzvka9si6vrq";
           system = "easy-macros";
           asd = "easy-macros";
@@ -50335,7 +50335,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "easy-routes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz";
           sha256 = "0mw5w1gcss15b3wz1n9g7pd30a6d2w2xssfiznx3a61n7h7prb93";
           system = "easy-routes";
           asd = "easy-routes";
@@ -50358,7 +50358,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "easy-routes+djula" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz";
           sha256 = "0mw5w1gcss15b3wz1n9g7pd30a6d2w2xssfiznx3a61n7h7prb93";
           system = "easy-routes+djula";
           asd = "easy-routes+djula";
@@ -50381,7 +50381,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "easy-routes+errors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/easy-routes/2025-06-22/easy-routes-20250622-git.tgz";
           sha256 = "0mw5w1gcss15b3wz1n9g7pd30a6d2w2xssfiznx3a61n7h7prb93";
           system = "easy-routes+errors";
           asd = "easy-routes+errors";
@@ -50404,7 +50404,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eazy-documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eazy-documentation/2021-04-11/eazy-documentation-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eazy-documentation/2021-04-11/eazy-documentation-20210411-git.tgz";
           sha256 = "0wqd6jih98ab8qpajmcmbj0cwa3g6jjbr7v0wp5gqn1wllwn70ix";
           system = "eazy-documentation";
           asd = "eazy-documentation";
@@ -50434,7 +50434,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eazy-gnuplot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eazy-gnuplot/2022-03-31/eazy-gnuplot-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eazy-gnuplot/2022-03-31/eazy-gnuplot-20220331-git.tgz";
           sha256 = "0mpkx1z52riahydzvqv7kk15p0pv2k7k5a7j65fg571kcxmssx8s";
           system = "eazy-gnuplot";
           asd = "eazy-gnuplot";
@@ -50458,7 +50458,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eazy-gnuplot.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eazy-gnuplot/2022-03-31/eazy-gnuplot-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eazy-gnuplot/2022-03-31/eazy-gnuplot-20220331-git.tgz";
           sha256 = "0mpkx1z52riahydzvqv7kk15p0pv2k7k5a7j65fg571kcxmssx8s";
           system = "eazy-gnuplot.test";
           asd = "eazy-gnuplot.test";
@@ -50481,7 +50481,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eazy-process" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eazy-process/2020-09-25/eazy-process-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eazy-process/2020-09-25/eazy-process-20200925-git.tgz";
           sha256 = "1fvc613jg3b0kra664lbyyzvig7sm1xzaawack28c5m61yiwakiw";
           system = "eazy-process";
           asd = "eazy-process";
@@ -50511,7 +50511,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eazy-process.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eazy-process/2020-09-25/eazy-process-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eazy-process/2020-09-25/eazy-process-20200925-git.tgz";
           sha256 = "1fvc613jg3b0kra664lbyyzvig7sm1xzaawack28c5m61yiwakiw";
           system = "eazy-process.test";
           asd = "eazy-process.test";
@@ -50534,7 +50534,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eazy-project" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz";
           sha256 = "1dfzvsvzdwcfvynvik9kwhgil9m08jx8r0vwqj7l1m2d9zm4db3b";
           system = "eazy-project";
           asd = "eazy-project";
@@ -50565,7 +50565,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eazy-project.autoload" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz";
           sha256 = "1dfzvsvzdwcfvynvik9kwhgil9m08jx8r0vwqj7l1m2d9zm4db3b";
           system = "eazy-project.autoload";
           asd = "eazy-project.autoload";
@@ -50585,7 +50585,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eazy-project.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz";
           sha256 = "1dfzvsvzdwcfvynvik9kwhgil9m08jx8r0vwqj7l1m2d9zm4db3b";
           system = "eazy-project.test";
           asd = "eazy-project.test";
@@ -50608,7 +50608,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ec2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ec2/2012-09-09/ec2-20120909-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ec2/2012-09-09/ec2-20120909-git.tgz";
           sha256 = "1z9yv1b8ckyvla80rha7amfhhy57kylkscf504rpfx8994fnfbsy";
           system = "ec2";
           asd = "ec2";
@@ -50633,7 +50633,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ec2-price-finder" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ec2-price-finder/2021-05-31/ec2-price-finder-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ec2-price-finder/2021-05-31/ec2-price-finder-20210531-git.tgz";
           sha256 = "1511py79fj0xpzzjlfk6fchp6lmikvhy42s3p6s85fbq4dyj4mpj";
           system = "ec2-price-finder";
           asd = "ec2-price-finder";
@@ -50662,7 +50662,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ecclesia" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ecclesia/2025-06-22/ecclesia-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ecclesia/2025-06-22/ecclesia-20250622-git.tgz";
           sha256 = "1435124psvgbsvzbvx0bm14715hbx8id0c4ixsdgc74sb5034idy";
           system = "ecclesia";
           asd = "ecclesia";
@@ -50682,7 +50682,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eclecticse.iso-8601-date" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/iso-8601-date/2019-01-07/iso-8601-date-20190107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/iso-8601-date/2019-01-07/iso-8601-date-20190107-git.tgz";
           sha256 = "12d6jyznglm13sb04xh5l0d0bwi4y449wdyifvfy7r03qy8wypdx";
           system = "eclecticse.iso-8601-date";
           asd = "eclecticse.iso-8601-date";
@@ -50702,7 +50702,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eclecticse.omer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/omer-count/2021-04-11/omer-count-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/omer-count/2021-04-11/omer-count-20210411-git.tgz";
           sha256 = "1rvg7rfalvi28x3jkknfdyf4y7zjrqdx073iqi2gin4amin6n7jv";
           system = "eclecticse.omer";
           asd = "eclecticse.omer";
@@ -50722,7 +50722,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eclecticse.slk-581" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/slk-581/2019-01-07/slk-581-20190107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/slk-581/2019-01-07/slk-581-20190107-git.tgz";
           sha256 = "1pxyr1gi4ppnfld399wiypqqkgm3bqd9kpizpwgll2fd10yh2qmf";
           system = "eclecticse.slk-581";
           asd = "eclecticse.slk-581";
@@ -50742,7 +50742,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eclector" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz";
           sha256 = "16yhh2zb9616zk1dsw2qbngq8pz2hhgq82habz8x3rg0sxwwnw8v";
           system = "eclector";
           asd = "eclector";
@@ -50766,7 +50766,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eclector-concrete-syntax-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz";
           sha256 = "16yhh2zb9616zk1dsw2qbngq8pz2hhgq82habz8x3rg0sxwwnw8v";
           system = "eclector-concrete-syntax-tree";
           asd = "eclector-concrete-syntax-tree";
@@ -50790,7 +50790,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eclector.syntax-extensions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eclector/2025-06-22/eclector-20250622-git.tgz";
           sha256 = "16yhh2zb9616zk1dsw2qbngq8pz2hhgq82habz8x3rg0sxwwnw8v";
           system = "eclector.syntax-extensions";
           asd = "eclector.syntax-extensions";
@@ -50810,7 +50810,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eco" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eco/2019-08-13/eco-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eco/2019-08-13/eco-20190813-git.tgz";
           sha256 = "13fsv9v7fhf05p7j1hrfy2sg813wmgsp9aw4ng4cpzdss24zvf7q";
           system = "eco";
           asd = "eco";
@@ -50835,7 +50835,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eco-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eco/2019-08-13/eco-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eco/2019-08-13/eco-20190813-git.tgz";
           sha256 = "13fsv9v7fhf05p7j1hrfy2sg813wmgsp9aw4ng4cpzdss24zvf7q";
           system = "eco-test";
           asd = "eco-test";
@@ -50858,7 +50858,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "edit-distance" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-editdistance/2022-03-31/cl-editdistance-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-editdistance/2022-03-31/cl-editdistance-20220331-git.tgz";
           sha256 = "0nzbgq69wak18vwpk0fp68x8shdxq5vy70213dc2r0hwfzzc10v9";
           system = "edit-distance";
           asd = "edit-distance";
@@ -50878,7 +50878,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "edit-distance-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-editdistance/2022-03-31/cl-editdistance-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-editdistance/2022-03-31/cl-editdistance-20220331-git.tgz";
           sha256 = "0nzbgq69wak18vwpk0fp68x8shdxq5vy70213dc2r0hwfzzc10v9";
           system = "edit-distance-test";
           asd = "edit-distance-test";
@@ -50904,7 +50904,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "elb-log" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/elb-log/2015-09-23/elb-log-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/elb-log/2015-09-23/elb-log-20150923-git.tgz";
           sha256 = "1d0vkmkjr6d96j7cggw5frj50jf14brbm63is41zwfkfl9r4i6bp";
           system = "elb-log";
           asd = "elb-log";
@@ -50932,7 +50932,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "elb-log-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/elb-log/2015-09-23/elb-log-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/elb-log/2015-09-23/elb-log-20150923-git.tgz";
           sha256 = "1d0vkmkjr6d96j7cggw5frj50jf14brbm63is41zwfkfl9r4i6bp";
           system = "elb-log-test";
           asd = "elb-log-test";
@@ -50956,7 +50956,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "electron-tools" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/electron-tools/2016-04-21/electron-tools-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/electron-tools/2016-04-21/electron-tools-20160421-git.tgz";
           sha256 = "0fr16gsbn87vyyjpn2gndhpjg7yzsn4j7skyn0py252cvdk5ygf7";
           system = "electron-tools";
           asd = "electron-tools";
@@ -50981,7 +50981,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "electron-tools-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/electron-tools/2016-04-21/electron-tools-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/electron-tools/2016-04-21/electron-tools-20160421-git.tgz";
           sha256 = "0fr16gsbn87vyyjpn2gndhpjg7yzsn4j7skyn0py252cvdk5ygf7";
           system = "electron-tools-test";
           asd = "electron-tools-test";
@@ -51005,7 +51005,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "elf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/elf/2019-07-10/elf-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/elf/2019-07-10/elf-20190710-git.tgz";
           sha256 = "0rd1qcczr2gx76fmxia0kix0p5b49myc9fndibkvwc94cxg085gk";
           system = "elf";
           asd = "elf";
@@ -51033,7 +51033,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enchant" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-enchant/2024-10-12/cl-enchant-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-enchant/2024-10-12/cl-enchant-20241012-git.tgz";
           sha256 = "1fcxyb9b8g0v2il2q4xj7z19y1qfxvgd34zax8sdjvl4rp66b08v";
           system = "enchant";
           asd = "enchant";
@@ -51051,7 +51051,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enhanced-boolean" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/enhanced-boolean/2020-03-25/enhanced-boolean_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/enhanced-boolean/2020-03-25/enhanced-boolean_1.0.tgz";
           sha256 = "17l18lz07fk2kg835vs6c3189d230n1rm9vghk3ls4i356gbq0gy";
           system = "enhanced-boolean";
           asd = "enhanced-boolean";
@@ -51071,7 +51071,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enhanced-boolean_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/enhanced-boolean/2020-03-25/enhanced-boolean_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/enhanced-boolean/2020-03-25/enhanced-boolean_1.0.tgz";
           sha256 = "17l18lz07fk2kg835vs6c3189d230n1rm9vghk3ls4i356gbq0gy";
           system = "enhanced-boolean_tests";
           asd = "enhanced-boolean_tests";
@@ -51094,7 +51094,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enhanced-defclass" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/enhanced-defclass/2021-04-11/enhanced-defclass_2.1.tgz";
+          url = "https://beta.quicklisp.org/archive/enhanced-defclass/2021-04-11/enhanced-defclass_2.1.tgz";
           sha256 = "142s5c3pl3x7xdawzsj8pdxiqp4wh6fcajf4la5msvnxgf66d8wg";
           system = "enhanced-defclass";
           asd = "enhanced-defclass";
@@ -51122,7 +51122,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enhanced-defclass_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/enhanced-defclass/2021-04-11/enhanced-defclass_2.1.tgz";
+          url = "https://beta.quicklisp.org/archive/enhanced-defclass/2021-04-11/enhanced-defclass_2.1.tgz";
           sha256 = "142s5c3pl3x7xdawzsj8pdxiqp4wh6fcajf4la5msvnxgf66d8wg";
           system = "enhanced-defclass_tests";
           asd = "enhanced-defclass_tests";
@@ -51145,7 +51145,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enhanced-eval-when" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/enhanced-eval-when/2023-10-21/enhanced-eval-when_2.0.tgz";
+          url = "https://beta.quicklisp.org/archive/enhanced-eval-when/2023-10-21/enhanced-eval-when_2.0.tgz";
           sha256 = "1l7n04pzcwsxvw6m4pcksmlx525ijbgh5n28h56clpvpwlwnzjs3";
           system = "enhanced-eval-when";
           asd = "enhanced-eval-when";
@@ -51165,7 +51165,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enhanced-eval-when_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/enhanced-eval-when/2023-10-21/enhanced-eval-when_2.0.tgz";
+          url = "https://beta.quicklisp.org/archive/enhanced-eval-when/2023-10-21/enhanced-eval-when_2.0.tgz";
           sha256 = "1l7n04pzcwsxvw6m4pcksmlx525ijbgh5n28h56clpvpwlwnzjs3";
           system = "enhanced-eval-when_tests";
           asd = "enhanced-eval-when_tests";
@@ -51188,7 +51188,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enhanced-find-class" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/enhanced-find-class/2020-09-25/enhanced-find-class_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/enhanced-find-class/2020-09-25/enhanced-find-class_1.0.tgz";
           sha256 = "1pf1mxb238zrmvgm9s0456s1x0m317ls23ls1d987riw69y3w9vx";
           system = "enhanced-find-class";
           asd = "enhanced-find-class";
@@ -51208,7 +51208,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enhanced-find-class_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/enhanced-find-class/2020-09-25/enhanced-find-class_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/enhanced-find-class/2020-09-25/enhanced-find-class_1.0.tgz";
           sha256 = "1pf1mxb238zrmvgm9s0456s1x0m317ls23ls1d987riw69y3w9vx";
           system = "enhanced-find-class_tests";
           asd = "enhanced-find-class_tests";
@@ -51231,7 +51231,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enhanced-multiple-value-bind" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/enhanced-multiple-value-bind/2023-10-21/enhanced-multiple-value-bind_2.0.tgz";
+          url = "https://beta.quicklisp.org/archive/enhanced-multiple-value-bind/2023-10-21/enhanced-multiple-value-bind_2.0.tgz";
           sha256 = "191h0rd3fs5vqc15kvblvvwmvcqddmvj3s8x6xfp78gm69wk9bdq";
           system = "enhanced-multiple-value-bind";
           asd = "enhanced-multiple-value-bind";
@@ -51251,7 +51251,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enhanced-multiple-value-bind_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/enhanced-multiple-value-bind/2023-10-21/enhanced-multiple-value-bind_2.0.tgz";
+          url = "https://beta.quicklisp.org/archive/enhanced-multiple-value-bind/2023-10-21/enhanced-multiple-value-bind_2.0.tgz";
           sha256 = "191h0rd3fs5vqc15kvblvvwmvcqddmvj3s8x6xfp78gm69wk9bdq";
           system = "enhanced-multiple-value-bind_tests";
           asd = "enhanced-multiple-value-bind_tests";
@@ -51275,7 +51275,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enhanced-typep" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/enhanced-typep/2020-10-16/enhanced-typep_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/enhanced-typep/2020-10-16/enhanced-typep_1.0.tgz";
           sha256 = "0b22gddkbxnhmi71wa2h51495737lrvsqxnri7g1qdsl1hraml21";
           system = "enhanced-typep";
           asd = "enhanced-typep";
@@ -51295,7 +51295,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enhanced-typep_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/enhanced-typep/2020-10-16/enhanced-typep_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/enhanced-typep/2020-10-16/enhanced-typep_1.0.tgz";
           sha256 = "0b22gddkbxnhmi71wa2h51495737lrvsqxnri7g1qdsl1hraml21";
           system = "enhanced-typep_tests";
           asd = "enhanced-typep_tests";
@@ -51319,7 +51319,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enhanced-unwind-protect" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/enhanced-unwind-protect/2023-10-21/enhanced-unwind-protect_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/enhanced-unwind-protect/2023-10-21/enhanced-unwind-protect_1.0.tgz";
           sha256 = "00yak6ga0rsz58r96clmzvqbcmnfxcdxvn3h3ysirrsfr8rayy5m";
           system = "enhanced-unwind-protect";
           asd = "enhanced-unwind-protect";
@@ -51339,7 +51339,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enhanced-unwind-protect_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/enhanced-unwind-protect/2023-10-21/enhanced-unwind-protect_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/enhanced-unwind-protect/2023-10-21/enhanced-unwind-protect_1.0.tgz";
           sha256 = "00yak6ga0rsz58r96clmzvqbcmnfxcdxvn3h3ysirrsfr8rayy5m";
           system = "enhanced-unwind-protect_tests";
           asd = "enhanced-unwind-protect_tests";
@@ -51362,7 +51362,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "enumerations" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-enumeration/2025-06-22/cl-enumeration-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-enumeration/2025-06-22/cl-enumeration-20250622-git.tgz";
           sha256 = "1ldidii8a9qrl5l43cxx23x2nm9nqhrc259nq623qfxzakxdwlwz";
           system = "enumerations";
           asd = "enumerations";
@@ -51382,7 +51382,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "envy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/envy/2022-03-31/envy-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/envy/2022-03-31/envy-20220331-git.tgz";
           sha256 = "1r0wgimd7z57x8cv69sw76w3y5l70hq50882a9nq5l4v64lg55fq";
           system = "envy";
           asd = "envy";
@@ -51402,7 +51402,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "envy-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/envy/2022-03-31/envy-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/envy/2022-03-31/envy-20220331-git.tgz";
           sha256 = "1r0wgimd7z57x8cv69sw76w3y5l70hq50882a9nq5l4v64lg55fq";
           system = "envy-test";
           asd = "envy-test";
@@ -51426,7 +51426,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eos" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eos/2020-09-25/eos-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eos/2020-09-25/eos-20200925-git.tgz";
           sha256 = "1afllvmlnx97yzz404gycl3pa3kwx427k3hrbf37rpmjlv47knhk";
           system = "eos";
           asd = "eos";
@@ -51446,7 +51446,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eos-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eos/2020-09-25/eos-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eos/2020-09-25/eos-20200925-git.tgz";
           sha256 = "1afllvmlnx97yzz404gycl3pa3kwx427k3hrbf37rpmjlv47knhk";
           system = "eos-tests";
           asd = "eos";
@@ -51466,7 +51466,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "epigraph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/epigraph/2020-03-25/epigraph-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/epigraph/2020-03-25/epigraph-20200325-git.tgz";
           sha256 = "0gqiv23grdiz6pfly7mqyfmq4c6nwcamlvgsnixn8qi9md7b9d64";
           system = "epigraph";
           asd = "epigraph";
@@ -51486,7 +51486,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "epigraph-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/epigraph/2020-03-25/epigraph-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/epigraph/2020-03-25/epigraph-20200325-git.tgz";
           sha256 = "0gqiv23grdiz6pfly7mqyfmq4c6nwcamlvgsnixn8qi9md7b9d64";
           system = "epigraph-test";
           asd = "epigraph";
@@ -51509,7 +51509,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "epmd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-epmd/2014-02-11/cl-epmd-20140211-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-epmd/2014-02-11/cl-epmd-20140211-git.tgz";
           sha256 = "1334856x7jqhv52wlab6wxmfqslj21pmryx3lwmlsn7c3ypwz4rw";
           system = "epmd";
           asd = "epmd";
@@ -51532,7 +51532,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "epmd-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-epmd/2014-02-11/cl-epmd-20140211-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-epmd/2014-02-11/cl-epmd-20140211-git.tgz";
           sha256 = "1334856x7jqhv52wlab6wxmfqslj21pmryx3lwmlsn7c3ypwz4rw";
           system = "epmd-test";
           asd = "epmd-test";
@@ -51556,7 +51556,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "equals" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/equals/2024-10-12/equals-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/equals/2024-10-12/equals-20241012-git.tgz";
           sha256 = "1pzhj748dgjcw6qffkykxx156y78wy3bsbqmq5ijkybfjpnfsg27";
           system = "equals";
           asd = "equals";
@@ -51576,7 +51576,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "erjoalgo-webutil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/erjoalgo-webutil/2024-10-12/erjoalgo-webutil-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/erjoalgo-webutil/2024-10-12/erjoalgo-webutil-20241012-git.tgz";
           sha256 = "1mf9f23p6pagdi97k306a6122a5djx06nfwsxnx61gbyir2cpl2c";
           system = "erjoalgo-webutil";
           asd = "erjoalgo-webutil";
@@ -51604,7 +51604,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "erlang-term" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-erlang-term/2022-02-20/cl-erlang-term-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-erlang-term/2022-02-20/cl-erlang-term-20220220-git.tgz";
           sha256 = "1rmnbirbvwmik3j0xkkn90kzx90klrwx7hmscl0ywcbaprm71wkv";
           system = "erlang-term";
           asd = "erlang-term";
@@ -51629,7 +51629,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "erlang-term-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-erlang-term/2022-02-20/cl-erlang-term-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-erlang-term/2022-02-20/cl-erlang-term-20220220-git.tgz";
           sha256 = "1rmnbirbvwmik3j0xkkn90kzx90klrwx7hmscl0ywcbaprm71wkv";
           system = "erlang-term-test";
           asd = "erlang-term-test";
@@ -51653,7 +51653,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ernestine" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ernestine/2022-02-20/ernestine-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ernestine/2022-02-20/ernestine-20220220-git.tgz";
           sha256 = "1gl8pjp44j01nfw9dzk1qdl6njnqcaccp5czcr5rq47l1aicrymn";
           system = "ernestine";
           asd = "ernestine";
@@ -51678,7 +51678,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ernestine-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ernestine/2022-02-20/ernestine-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ernestine/2022-02-20/ernestine-20220220-git.tgz";
           sha256 = "1gl8pjp44j01nfw9dzk1qdl6njnqcaccp5czcr5rq47l1aicrymn";
           system = "ernestine-tests";
           asd = "ernestine-tests";
@@ -51701,7 +51701,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "erudite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/erudite/2024-10-12/erudite-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/erudite/2024-10-12/erudite-20241012-git.tgz";
           sha256 = "159fmpm770rnixdpzpmzvqzd2kpns5mglpdxykvv2lqlnac24jn5";
           system = "erudite";
           asd = "erudite";
@@ -51729,7 +51729,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "erudite-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/erudite/2024-10-12/erudite-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/erudite/2024-10-12/erudite-20241012-git.tgz";
           sha256 = "159fmpm770rnixdpzpmzvqzd2kpns5mglpdxykvv2lqlnac24jn5";
           system = "erudite-test";
           asd = "erudite-test";
@@ -51752,7 +51752,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "esa-mcclim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "esa-mcclim";
           asd = "esa-mcclim";
@@ -51775,7 +51775,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "escalator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/escalator/2020-04-27/escalator-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/escalator/2020-04-27/escalator-20200427-git.tgz";
           sha256 = "136n4k983f90cqj6na17ff2fvk9rv4ma8l5y66q7lkbb69idipla";
           system = "escalator";
           asd = "escalator";
@@ -51795,7 +51795,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "escalator-bench" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/escalator/2020-04-27/escalator-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/escalator/2020-04-27/escalator-20200427-git.tgz";
           sha256 = "136n4k983f90cqj6na17ff2fvk9rv4ma8l5y66q7lkbb69idipla";
           system = "escalator-bench";
           asd = "escalator-bench";
@@ -51818,7 +51818,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "esrap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/esrap/2025-06-22/esrap-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/esrap/2025-06-22/esrap-20250622-git.tgz";
           sha256 = "0c5w5sbd43apcxj57w88v7pmyf9cavynham4jz5asbx9g72clfv4";
           system = "esrap";
           asd = "esrap";
@@ -51839,7 +51839,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "esrap-liquid" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/esrap-liquid/2016-10-31/esrap-liquid-20161031-git.tgz";
+          url = "https://beta.quicklisp.org/archive/esrap-liquid/2016-10-31/esrap-liquid-20161031-git.tgz";
           sha256 = "0agsi8qx6v3c7r6ri5rp78vdb570pdgkvw80va3045crl61mkjzs";
           system = "esrap-liquid";
           asd = "esrap-liquid";
@@ -51864,7 +51864,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "esrap-liquid-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/esrap-liquid/2016-10-31/esrap-liquid-20161031-git.tgz";
+          url = "https://beta.quicklisp.org/archive/esrap-liquid/2016-10-31/esrap-liquid-20161031-git.tgz";
           sha256 = "0agsi8qx6v3c7r6ri5rp78vdb570pdgkvw80va3045crl61mkjzs";
           system = "esrap-liquid-tests";
           asd = "esrap-liquid";
@@ -51888,7 +51888,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "esrap-peg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz";
           sha256 = "0540i7whx1w0n9fdakwk8rnn511xga9xfvczq9y1jcgz1hh42w53";
           system = "esrap-peg";
           asd = "esrap-peg";
@@ -51911,7 +51911,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "etcd-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-etcd/2023-02-14/cl-etcd-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-etcd/2023-02-14/cl-etcd-20230214-git.tgz";
           sha256 = "0bals10r07prxvjxd744vz02ri72isf168lkhrx9qkc96hd214ah";
           system = "etcd-test";
           asd = "etcd-test";
@@ -51934,7 +51934,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ev" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ev/2015-09-23/cl-ev-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ev/2015-09-23/cl-ev-20150923-git.tgz";
           sha256 = "0qnkzkw9mn4w6b0q9y207z8ddnd5a2gn42q55yycp2qrvvv47lhp";
           system = "ev";
           asd = "ev";
@@ -51957,7 +51957,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "evaled-when" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/evaled-when/2020-09-25/evaled-when_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/evaled-when/2020-09-25/evaled-when_1.0.tgz";
           sha256 = "0482s89nb5jyyg5wmb010p914pgq6ls8z5s12hdw7wrpy675kdkh";
           system = "evaled-when";
           asd = "evaled-when";
@@ -51977,7 +51977,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "evaled-when_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/evaled-when/2020-09-25/evaled-when_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/evaled-when/2020-09-25/evaled-when_1.0.tgz";
           sha256 = "0482s89nb5jyyg5wmb010p914pgq6ls8z5s12hdw7wrpy675kdkh";
           system = "evaled-when_tests";
           asd = "evaled-when_tests";
@@ -52001,7 +52001,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "event-emitter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz";
           sha256 = "0kj77r09wbsiq6n62vvgk9fh37p3n3ycmhln1mhswz24rhirnpyn";
           system = "event-emitter";
           asd = "event-emitter";
@@ -52021,7 +52021,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "event-emitter-benchmark" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz";
           sha256 = "0kj77r09wbsiq6n62vvgk9fh37p3n3ycmhln1mhswz24rhirnpyn";
           system = "event-emitter-benchmark";
           asd = "event-emitter-benchmark";
@@ -52041,7 +52041,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "event-emitter-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz";
           sha256 = "0kj77r09wbsiq6n62vvgk9fh37p3n3ycmhln1mhswz24rhirnpyn";
           system = "event-emitter-test";
           asd = "event-emitter-test";
@@ -52064,7 +52064,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "event-glue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/event-glue/2015-06-08/event-glue-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/event-glue/2015-06-08/event-glue-20150608-git.tgz";
           sha256 = "1cmxdx5nawzqafz9b6nswp20d3zlaks44ln4n6bf5jxji9n3vany";
           system = "event-glue";
           asd = "event-glue";
@@ -52084,7 +52084,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "event-glue-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/event-glue/2015-06-08/event-glue-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/event-glue/2015-06-08/event-glue-20150608-git.tgz";
           sha256 = "1cmxdx5nawzqafz9b6nswp20d3zlaks44ln4n6bf5jxji9n3vany";
           system = "event-glue-test";
           asd = "event-glue-test";
@@ -52107,7 +52107,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eventbus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eventbus/2019-12-27/eventbus-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eventbus/2019-12-27/eventbus-20191227-git.tgz";
           sha256 = "0slqx3zq6sbz3rg4g79j8y25sx4405y6ff3x6l5v8v4v42m1s0p2";
           system = "eventbus";
           asd = "eventbus";
@@ -52127,7 +52127,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "eventfd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eventfd/2017-11-30/eventfd-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eventfd/2017-11-30/eventfd-20171130-git.tgz";
           sha256 = "1zwg043vqzk665k9dxgxhik20wgkl204anjna94zg6037m33vdiw";
           system = "eventfd";
           asd = "eventfd";
@@ -52151,7 +52151,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "everblocking-stream" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/everblocking-stream/2018-10-18/everblocking-stream-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/everblocking-stream/2018-10-18/everblocking-stream-20181018-git.tgz";
           sha256 = "1xvfsx2ldwcprlynikn1rikxh3lfdyzl2p72glzvgh20sm93p1rz";
           system = "everblocking-stream";
           asd = "everblocking-stream";
@@ -52171,7 +52171,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "evol" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/evol/2010-10-06/evol-20101006-git.tgz";
+          url = "https://beta.quicklisp.org/archive/evol/2010-10-06/evol-20101006-git.tgz";
           sha256 = "1hp6wygj44llkscqq721xg4a7j5faqjcfc646lvkia5xg81zbf65";
           system = "evol";
           asd = "evol";
@@ -52199,7 +52199,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "evol-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/evol/2010-10-06/evol-20101006-git.tgz";
+          url = "https://beta.quicklisp.org/archive/evol/2010-10-06/evol-20101006-git.tgz";
           sha256 = "1hp6wygj44llkscqq721xg4a7j5faqjcfc646lvkia5xg81zbf65";
           system = "evol-test";
           asd = "evol-test";
@@ -52222,7 +52222,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "example-bot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispcord/2024-10-12/lispcord-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispcord/2024-10-12/lispcord-20241012-git.tgz";
           sha256 = "11xwrrvvqdm1wdnxrxqgizgw25plsn28n2k0lm5kakax9n221brn";
           system = "example-bot";
           asd = "example-bot";
@@ -52242,7 +52242,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "example-extension" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-binary-store/2025-06-22/cl-binary-store-stable-9d8b7e7f-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-binary-store/2025-06-22/cl-binary-store-stable-9d8b7e7f-git.tgz";
           sha256 = "1x8g65ij6bbfkd9hcy4wm3frjnb83ip05mvdbpm8hwzgkx1ydf94";
           system = "example-extension";
           asd = "example-extension";
@@ -52262,7 +52262,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "exit-hooks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/exit-hooks/2017-04-03/exit-hooks-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/exit-hooks/2017-04-03/exit-hooks-20170403-git.tgz";
           sha256 = "00rk0pr2cy3hy6giblh166b7yrg06d5lanipjcqv508gkfb0vi47";
           system = "exit-hooks";
           asd = "exit-hooks";
@@ -52282,7 +52282,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "expanders" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/expanders/2025-06-22/expanders-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/expanders/2025-06-22/expanders-20250622-git.tgz";
           sha256 = "0lgx5r82l4mxw616xz3s02awq5miga9mb86s7yz8amfx20601qld";
           system = "expanders";
           asd = "expanders";
@@ -52302,7 +52302,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "exponential-backoff" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/exponential-backoff/2015-01-13/exponential-backoff-20150113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/exponential-backoff/2015-01-13/exponential-backoff-20150113-git.tgz";
           sha256 = "1389hm9hxv85s0125ja4js1bvh8ay4dsy9q1gaynjv27ynik6gmv";
           system = "exponential-backoff";
           asd = "exponential-backoff";
@@ -52322,7 +52322,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "exscribe" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/exscribe/2020-09-25/exscribe-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/exscribe/2020-09-25/exscribe-20200925-git.tgz";
           sha256 = "02vsavasr5nbhrk86b7d8xpr6sm8cyrg3vs2pbpkls2iypffyd2h";
           system = "exscribe";
           asd = "exscribe";
@@ -52350,7 +52350,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ext-blog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ext-blog/2016-08-25/ext-blog-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ext-blog/2016-08-25/ext-blog-20160825-git.tgz";
           sha256 = "10qnl3p994wg12c0cn6xgkgmwfip0fk0sjyqyy0j5bdrp32gr5wg";
           system = "ext-blog";
           asd = "ext-blog";
@@ -52380,7 +52380,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "extended-reals" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/extended-reals/2018-03-28/extended-reals-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/extended-reals/2018-03-28/extended-reals-20180328-git.tgz";
           sha256 = "0vq191win5sq37mrwjhvi463jqh1mkwbsa0hja69syq789pgaxmb";
           system = "extended-reals";
           asd = "extended-reals";
@@ -52400,7 +52400,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "extensible-sequences" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz";
           sha256 = "12flvy6hysqw0fa2jfkxrgphlk6b25hg2w2dxm1ylax0gw9fh1l5";
           system = "extensible-sequences";
           asd = "extensible-sequences";
@@ -52420,7 +52420,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "external-program" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/external-program/2024-10-12/external-program-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/external-program/2024-10-12/external-program-20241012-git.tgz";
           sha256 = "1g7hawsbbfspzljj2spxxv26a5079xsa0kd7dqdclm5n71fypwx6";
           system = "external-program";
           asd = "external-program";
@@ -52438,7 +52438,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "external-program-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/external-program/2024-10-12/external-program-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/external-program/2024-10-12/external-program-20241012-git.tgz";
           sha256 = "1g7hawsbbfspzljj2spxxv26a5079xsa0kd7dqdclm5n71fypwx6";
           system = "external-program-test";
           asd = "external-program";
@@ -52461,7 +52461,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "external-symbol-not-found" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/external-symbol-not-found/2024-10-12/external-symbol-not-found-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/external-symbol-not-found/2024-10-12/external-symbol-not-found-20241012-git.tgz";
           sha256 = "1ic982jbcy71wlni60wnb8hqg3cqw488h4jj5pd2sqmjwv1960v7";
           system = "external-symbol-not-found";
           asd = "external-symbol-not-found";
@@ -52481,7 +52481,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "f-underscore" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f-underscore/2010-10-06/f-underscore-20101006-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/f-underscore/2010-10-06/f-underscore-20101006-darcs.tgz";
           sha256 = "0mqvb2rxa08y07lj6smp8gf1ig32802fxq7mw5a283f2nkrinnb5";
           system = "f-underscore";
           asd = "f-underscore";
@@ -52501,7 +52501,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "f2cl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "f2cl";
           asd = "f2cl";
@@ -52521,7 +52521,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "f2cl-asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "f2cl-asdf";
           asd = "f2cl-asdf";
@@ -52541,7 +52541,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "f2cl-lib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "f2cl-lib";
           asd = "f2cl-lib";
@@ -52561,7 +52561,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fact-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fact-base/2018-03-28/fact-base-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fact-base/2018-03-28/fact-base-20180328-git.tgz";
           sha256 = "14i0vqqxszabhas0z9dfxhvnbsxl4iic77m4i76w7iznmrcma2ar";
           system = "fact-base";
           asd = "fact-base";
@@ -52586,7 +52586,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "factory-alien" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/factory-alien/2023-06-18/factory-alien-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/factory-alien/2023-06-18/factory-alien-20230618-git.tgz";
           sha256 = "0n1fwxapl9vr0cm66gkhihws6zhvg2f4acx017lavn0g42b5fc4a";
           system = "factory-alien";
           asd = "factory-alien";
@@ -52609,7 +52609,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fakenil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fakenil/2020-03-25/fakenil_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/fakenil/2020-03-25/fakenil_1.0.tgz";
           sha256 = "0ipqax3sgcs1dsgxz8d2pmfg324k6l35pn0nz89w5jl02fia61l3";
           system = "fakenil";
           asd = "fakenil";
@@ -52629,7 +52629,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fakenil_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fakenil/2020-03-25/fakenil_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/fakenil/2020-03-25/fakenil_1.0.tgz";
           sha256 = "0ipqax3sgcs1dsgxz8d2pmfg324k6l35pn0nz89w5jl02fia61l3";
           system = "fakenil_tests";
           asd = "fakenil_tests";
@@ -52652,7 +52652,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fare-csv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fare-csv/2024-10-12/fare-csv-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fare-csv/2024-10-12/fare-csv-20241012-git.tgz";
           sha256 = "153sxb0vyd1cnhfw15j3183kqhcnma0ygaf5svzibknclm16n767";
           system = "fare-csv";
           asd = "fare-csv";
@@ -52670,7 +52670,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fare-memoization" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fare-memoization/2018-04-30/fare-memoization-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fare-memoization/2018-04-30/fare-memoization-20180430-git.tgz";
           sha256 = "1blmrb4c9gsxj87scz74z1s8w9d1w2r48fyxj0y1sw3vr6bsbb8f";
           system = "fare-memoization";
           asd = "fare-memoization";
@@ -52690,7 +52690,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fare-mop" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz";
           sha256 = "0maxs8392953fhnaa6zwnm2mdbhxjxipp4g4rvypm06ixr6pyv1c";
           system = "fare-mop";
           asd = "fare-mop";
@@ -52711,7 +52711,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fare-quasiquote" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
           sha256 = "034mw3x0jv6q5nxqq8sz77c44dc115x6y52bnzk31qclib88zl7n";
           system = "fare-quasiquote";
           asd = "fare-quasiquote";
@@ -52729,7 +52729,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fare-quasiquote-extras" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
           sha256 = "034mw3x0jv6q5nxqq8sz77c44dc115x6y52bnzk31qclib88zl7n";
           system = "fare-quasiquote-extras";
           asd = "fare-quasiquote-extras";
@@ -52750,7 +52750,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fare-quasiquote-optima" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
           sha256 = "034mw3x0jv6q5nxqq8sz77c44dc115x6y52bnzk31qclib88zl7n";
           system = "fare-quasiquote-optima";
           asd = "fare-quasiquote-optima";
@@ -52768,7 +52768,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fare-quasiquote-readtable" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
           sha256 = "034mw3x0jv6q5nxqq8sz77c44dc115x6y52bnzk31qclib88zl7n";
           system = "fare-quasiquote-readtable";
           asd = "fare-quasiquote-readtable";
@@ -52789,7 +52789,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fare-scripts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fare-scripts/2024-10-12/fare-scripts-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fare-scripts/2024-10-12/fare-scripts-20241012-git.tgz";
           sha256 = "08fq1ry4prlww4gr7zris7vywqs3vm1253mqfgx8vg0awrccmf98";
           system = "fare-scripts";
           asd = "fare-scripts";
@@ -52823,7 +52823,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fare-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fare-utils/2023-02-14/fare-utils-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fare-utils/2023-02-14/fare-utils-20230214-git.tgz";
           sha256 = "0kw6xzavzvpzac3xa6x4681q6w6v6bjk1g71flr2x9xixxg61sak";
           system = "fare-utils";
           asd = "fare-utils";
@@ -52841,7 +52841,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fare-utils-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fare-utils/2023-02-14/fare-utils-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fare-utils/2023-02-14/fare-utils-20230214-git.tgz";
           sha256 = "0kw6xzavzvpzac3xa6x4681q6w6v6bjk1g71flr2x9xixxg61sak";
           system = "fare-utils-test";
           asd = "fare-utils-test";
@@ -52864,7 +52864,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fast-generic-functions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fast-generic-functions/2025-06-22/fast-generic-functions-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fast-generic-functions/2025-06-22/fast-generic-functions-20250622-git.tgz";
           sha256 = "1v2pwmhnyfvhx8hrl1zk2lm4k1a3kqglf696hnfx7zrpz9kwk15m";
           system = "fast-generic-functions";
           asd = "fast-generic-functions";
@@ -52888,7 +52888,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fast-http" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fast-http/2024-10-12/fast-http-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fast-http/2024-10-12/fast-http-20241012-git.tgz";
           sha256 = "04cxh2241l9hyzarrxs528v2jjdfm5g3prc2374m4xkrb0wiygh0";
           system = "fast-http";
           asd = "fast-http";
@@ -52913,7 +52913,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fast-http-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fast-http/2024-10-12/fast-http-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fast-http/2024-10-12/fast-http-20241012-git.tgz";
           sha256 = "04cxh2241l9hyzarrxs528v2jjdfm5g3prc2374m4xkrb0wiygh0";
           system = "fast-http-test";
           asd = "fast-http-test";
@@ -52940,7 +52940,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fast-io" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fast-io/2022-11-06/fast-io-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fast-io/2022-11-06/fast-io-20221106-git.tgz";
           sha256 = "0wh02yagbqahy9z6787jz5ggpagvr18qd0z13wvwq1vjf8xd2530";
           system = "fast-io";
           asd = "fast-io";
@@ -52962,7 +52962,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fast-io-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fast-io/2022-11-06/fast-io-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fast-io/2022-11-06/fast-io-20221106-git.tgz";
           sha256 = "0wh02yagbqahy9z6787jz5ggpagvr18qd0z13wvwq1vjf8xd2530";
           system = "fast-io-test";
           asd = "fast-io-test";
@@ -52986,7 +52986,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fast-mpsc-queue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fast-mpsc-queue/2024-10-12/fast-mpsc-queue-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fast-mpsc-queue/2024-10-12/fast-mpsc-queue-20241012-git.tgz";
           sha256 = "1ggiaryjv3lmzrk6m22y7vvbqn3z0n7ahmkyfjq6iyrd64d77ck7";
           system = "fast-mpsc-queue";
           asd = "fast-mpsc-queue";
@@ -53006,7 +53006,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fast-websocket" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fast-websocket/2024-10-12/fast-websocket-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fast-websocket/2024-10-12/fast-websocket-20241012-git.tgz";
           sha256 = "102z58d27966lpx08kc6apgaainbsdfhygb67ibyw6lxnaasy3jz";
           system = "fast-websocket";
           asd = "fast-websocket";
@@ -53030,7 +53030,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fast-websocket-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fast-websocket/2024-10-12/fast-websocket-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fast-websocket/2024-10-12/fast-websocket-20241012-git.tgz";
           sha256 = "102z58d27966lpx08kc6apgaainbsdfhygb67ibyw6lxnaasy3jz";
           system = "fast-websocket-test";
           asd = "fast-websocket-test";
@@ -53056,7 +53056,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "feeder" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/feeder/2023-10-21/feeder-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/feeder/2023-10-21/feeder-20231021-git.tgz";
           sha256 = "00j3s98lbh6h2p007s7x48rw0ckd3c1apfwb28y89jxnwqk7sng7";
           system = "feeder";
           asd = "feeder";
@@ -53080,7 +53080,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "femlisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
           sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "femlisp";
           asd = "femlisp";
@@ -53108,7 +53108,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "femlisp-basic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
           sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "femlisp-basic";
           asd = "femlisp-basic";
@@ -53131,7 +53131,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "femlisp-dictionary" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
           sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "femlisp-dictionary";
           asd = "femlisp-dictionary";
@@ -53155,7 +53155,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "femlisp-matlisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
           sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "femlisp-matlisp";
           asd = "femlisp-matlisp";
@@ -53179,7 +53179,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "femlisp-parallel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
           sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "femlisp-parallel";
           asd = "femlisp-parallel";
@@ -53205,7 +53205,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "femlisp-picture" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
           sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "femlisp-picture";
           asd = "femlisp-picture";
@@ -53228,7 +53228,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ffa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ffa/2010-10-06/ffa-20101006-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ffa/2010-10-06/ffa-20101006-git.tgz";
           sha256 = "0l7kqcjp3sn1129hpwq6zhjqc0ydx9gc53z7k13i38x3z1asap7a";
           system = "ffa";
           asd = "ffa";
@@ -53253,7 +53253,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fft" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fft/2018-07-11/fft-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fft/2018-07-11/fft-20180711-git.tgz";
           sha256 = "0ymnfplap2cncw49mhq7crapgxphfwsvqdgrcckpgsvw6qsymasd";
           system = "fft";
           asd = "fft";
@@ -53273,7 +53273,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fftpack5" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "fftpack5";
           asd = "fftpack5";
@@ -53293,7 +53293,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fftpack5-double" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "fftpack5-double";
           asd = "fftpack5-double";
@@ -53313,7 +53313,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fiasco" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz";
           sha256 = "1k8i2kq57201bvy3zfpsxld530hd104dgbglxigqb6i408c1a7aw";
           system = "fiasco";
           asd = "fiasco";
@@ -53334,7 +53334,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fiasco-self-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz";
           sha256 = "1k8i2kq57201bvy3zfpsxld530hd104dgbglxigqb6i408c1a7aw";
           system = "fiasco-self-tests";
           asd = "fiasco";
@@ -53354,7 +53354,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "file-attributes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/file-attributes/2024-10-12/file-attributes-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/file-attributes/2024-10-12/file-attributes-20241012-git.tgz";
           sha256 = "14jimsmwcp8bygm2f0fjmjv0ncc5yxl7pvh04x0kw6gs1mc7rc9x";
           system = "file-attributes";
           asd = "file-attributes";
@@ -53376,7 +53376,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "file-finder" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/file-finder/2025-06-22/file-finder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/file-finder/2025-06-22/file-finder-20250622-git.tgz";
           sha256 = "05mbr6a2wy67swkpsmmyxw9vzlmj5117zjmmhqxls42kx4bsyl88";
           system = "file-finder";
           asd = "file-finder";
@@ -53403,7 +53403,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "file-local-variable" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/file-local-variable/2016-03-18/file-local-variable-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/file-local-variable/2016-03-18/file-local-variable-20160318-git.tgz";
           sha256 = "1jsjd0g41mg76wlqjxliyrfz8fk7ihi06nq2zizmk9np0pmwsxl9";
           system = "file-local-variable";
           asd = "file-local-variable";
@@ -53427,7 +53427,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "file-local-variable.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/file-local-variable/2016-03-18/file-local-variable-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/file-local-variable/2016-03-18/file-local-variable-20160318-git.tgz";
           sha256 = "1jsjd0g41mg76wlqjxliyrfz8fk7ihi06nq2zizmk9np0pmwsxl9";
           system = "file-local-variable.test";
           asd = "file-local-variable.test";
@@ -53450,7 +53450,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "file-lock" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/file-lock/2023-10-21/file-lock-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/file-lock/2023-10-21/file-lock-20231021-git.tgz";
           sha256 = "0n2mn931h83dh2diifsghc78agsz4savlfv5dr9pfmpk16vkwi5b";
           system = "file-lock";
           asd = "file-lock";
@@ -53474,7 +53474,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "file-notify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/file-notify/2025-06-22/file-notify-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/file-notify/2025-06-22/file-notify-20250622-git.tgz";
           sha256 = "1crwybqih0x43z12irbaz338k2y709igq69vghqi1rqw953i1l44";
           system = "file-notify";
           asd = "file-notify";
@@ -53498,7 +53498,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "file-select" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/file-select/2025-06-22/file-select-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/file-select/2025-06-22/file-select-20250622-git.tgz";
           sha256 = "17afb2p707l9nqmnl83zshayi4vvv9nvyfmxiippal3izz5k9mqq";
           system = "file-select";
           asd = "file-select";
@@ -53524,7 +53524,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "file-types" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/file-types/2016-09-29/file-types-20160929-git.tgz";
+          url = "https://beta.quicklisp.org/archive/file-types/2016-09-29/file-types-20160929-git.tgz";
           sha256 = "09l67gzjwx7kx237grm709dsj9rkmmm8s3ya6irmcw8nh587inbs";
           system = "file-types";
           asd = "file-types";
@@ -53544,7 +53544,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "filesystem-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/filesystem-utils/2025-06-22/filesystem-utils-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/filesystem-utils/2025-06-22/filesystem-utils-20250622-git.tgz";
           sha256 = "0ylf7csp7v2i1br654j945ns6capxb75p078vxiga5gkhhlxql5h";
           system = "filesystem-utils";
           asd = "filesystem-utils";
@@ -53569,7 +53569,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "filesystem-utils-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/filesystem-utils/2025-06-22/filesystem-utils-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/filesystem-utils/2025-06-22/filesystem-utils-20250622-git.tgz";
           sha256 = "0ylf7csp7v2i1br654j945ns6capxb75p078vxiga5gkhhlxql5h";
           system = "filesystem-utils-test";
           asd = "filesystem-utils-test";
@@ -53592,7 +53592,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "filter-maker" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/filter-maker/2022-11-06/filter-maker-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/filter-maker/2022-11-06/filter-maker-20221106-git.tgz";
           sha256 = "00algyghniqsvjy5vwx39fd98nd7x4w944ahy981jlh33lzc2qmn";
           system = "filter-maker";
           asd = "filter-maker";
@@ -53612,7 +53612,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "filtered-functions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/filtered-functions/2016-03-18/filtered-functions-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/filtered-functions/2016-03-18/filtered-functions-20160318-git.tgz";
           sha256 = "0m13k8pl0gfll8ss83c0z3gax7zrrw2i4s26451jfbka1xr4fgy9";
           system = "filtered-functions";
           asd = "filtered-functions";
@@ -53632,7 +53632,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "find-port" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/find-port/2023-02-14/find-port-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/find-port/2023-02-14/find-port-20230214-git.tgz";
           sha256 = "1hmbkqazk6m7075gmbrwzxkysp9779xm9qxrzj7p85bwlbk5m5i7";
           system = "find-port";
           asd = "find-port";
@@ -53652,7 +53652,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "find-port-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/find-port/2023-02-14/find-port-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/find-port/2023-02-14/find-port-20230214-git.tgz";
           sha256 = "1hmbkqazk6m7075gmbrwzxkysp9779xm9qxrzj7p85bwlbk5m5i7";
           system = "find-port-test";
           asd = "find-port-test";
@@ -53675,7 +53675,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "finite-state-machine" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-simple-fsm/2020-02-18/cl-simple-fsm-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-simple-fsm/2020-02-18/cl-simple-fsm-20200218-git.tgz";
           sha256 = "1w07df7kakjq3r1v5c4gnavp08ngpn2ni85cggnnsqzc27hly07b";
           system = "finite-state-machine";
           asd = "finite-state-machine";
@@ -53695,7 +53695,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "firephp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/firephp/2016-05-31/firephp-20160531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/firephp/2016-05-31/firephp-20160531-git.tgz";
           sha256 = "1j98z73c21xcjp4f8qvmv37y9zlsnwxx88nnxc3r1ngvxv23dlgh";
           system = "firephp";
           asd = "firephp";
@@ -53718,7 +53718,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "firephp-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/firephp/2016-05-31/firephp-20160531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/firephp/2016-05-31/firephp-20160531-git.tgz";
           sha256 = "1j98z73c21xcjp4f8qvmv37y9zlsnwxx88nnxc3r1ngvxv23dlgh";
           system = "firephp-tests";
           asd = "firephp-tests";
@@ -53743,7 +53743,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "first-time-value" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/first-time-value/2018-12-10/first-time-value-1.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/first-time-value/2018-12-10/first-time-value-1.0.1.tgz";
           sha256 = "155mqhnw1307b18a8bv8jhqp20qv83b409mlr61m45nq3sivxxp2";
           system = "first-time-value";
           asd = "first-time-value";
@@ -53763,7 +53763,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "first-time-value_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/first-time-value/2018-12-10/first-time-value-1.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/first-time-value/2018-12-10/first-time-value-1.0.1.tgz";
           sha256 = "155mqhnw1307b18a8bv8jhqp20qv83b409mlr61m45nq3sivxxp2";
           system = "first-time-value_tests";
           asd = "first-time-value_tests";
@@ -53786,7 +53786,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fishpack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "fishpack";
           asd = "fishpack";
@@ -53806,7 +53806,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fiveam" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fiveam/2024-10-12/fiveam-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fiveam/2024-10-12/fiveam-20241012-git.tgz";
           sha256 = "066amfjqhagzhb602y911wbw7jh9cv1fb7bfn2ppjzm5kf7hqbnh";
           system = "fiveam";
           asd = "fiveam";
@@ -53828,7 +53828,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fiveam-asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fiveam-asdf/2022-11-06/fiveam-asdf-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fiveam-asdf/2022-11-06/fiveam-asdf-20221106-git.tgz";
           sha256 = "18dhyznwl56lpp289dwg9xm9qwwv5062yawfaj6h1b2jwybqfrq7";
           system = "fiveam-asdf";
           asd = "fiveam-asdf";
@@ -53848,7 +53848,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fiveam-matchers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fiveam-matchers/2025-06-22/fiveam-matchers-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fiveam-matchers/2025-06-22/fiveam-matchers-20250622-git.tgz";
           sha256 = "1ydxfbjc2aq4ffw9cxn6yx4m5rw08dagws9mjl7i71x5h3znb7mw";
           system = "fiveam-matchers";
           asd = "fiveam-matchers";
@@ -53872,7 +53872,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fixed" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fixed/2017-01-24/fixed-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fixed/2017-01-24/fixed-20170124-git.tgz";
           sha256 = "0bx8802fmlml5k5xhcm4g5r6c7ambij4gb0b37xljjn3wxgs83dc";
           system = "fixed";
           asd = "fixed";
@@ -53892,7 +53892,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "flac" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
           sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb";
           system = "flac";
           asd = "flac";
@@ -53915,7 +53915,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "flare" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/flare/2025-06-22/flare-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/flare/2025-06-22/flare-20250622-git.tgz";
           sha256 = "11cdianshkq9mh0g83zb44b8iikp6qslgf8rqpny81m4x2x3mpjr";
           system = "flare";
           asd = "flare";
@@ -53942,7 +53942,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "flat-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-flat-tree/2019-08-13/cl-flat-tree-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-flat-tree/2019-08-13/cl-flat-tree-20190813-git.tgz";
           sha256 = "05nw1j0rr0vgz6shkjv87yn2mp0b4s7v5gxxcqcn1qi7fgbn55z7";
           system = "flat-tree";
           asd = "flat-tree";
@@ -53962,7 +53962,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "flexi-streams" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/flexi-streams/2024-10-12/flexi-streams-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/flexi-streams/2024-10-12/flexi-streams-20241012-git.tgz";
           sha256 = "1bk224ryfiwsmnmq2gdfv9gld85z2rvnlx7fxcl2k122vc344akh";
           system = "flexi-streams";
           asd = "flexi-streams";
@@ -53980,7 +53980,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "flexi-streams-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/flexi-streams/2024-10-12/flexi-streams-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/flexi-streams/2024-10-12/flexi-streams-20241012-git.tgz";
           sha256 = "1bk224ryfiwsmnmq2gdfv9gld85z2rvnlx7fxcl2k122vc344akh";
           system = "flexi-streams-test";
           asd = "flexi-streams-test";
@@ -54000,7 +54000,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "flexichain" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/flexichain/2020-12-20/flexichain-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/flexichain/2020-12-20/flexichain-20201220-git.tgz";
           sha256 = "1ivkffnkc1iqmpl1p1rgyfbbgjmjcid4iszvdql1jjz324lq94g6";
           system = "flexichain";
           asd = "flexichain";
@@ -54020,7 +54020,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "flexichain-doc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/flexichain/2020-12-20/flexichain-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/flexichain/2020-12-20/flexichain-20201220-git.tgz";
           sha256 = "1ivkffnkc1iqmpl1p1rgyfbbgjmjcid4iszvdql1jjz324lq94g6";
           system = "flexichain-doc";
           asd = "flexichain-doc";
@@ -54040,7 +54040,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "float-features" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/float-features/2025-06-22/float-features-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/float-features/2025-06-22/float-features-20250622-git.tgz";
           sha256 = "1i6apsg595hzyymvn0gz04xg58qxw8rx1fyc093arbakywjfcqas";
           system = "float-features";
           asd = "float-features";
@@ -54061,7 +54061,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "float-features-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/float-features/2025-06-22/float-features-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/float-features/2025-06-22/float-features-20250622-git.tgz";
           sha256 = "1i6apsg595hzyymvn0gz04xg58qxw8rx1fyc093arbakywjfcqas";
           system = "float-features-tests";
           asd = "float-features-tests";
@@ -54084,7 +54084,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "floating-point" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/floating-point/2014-11-06/floating-point-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/floating-point/2014-11-06/floating-point-20141106-git.tgz";
           sha256 = "1bqslmykg04innaqlp369pyjh61isj8xgv2h6pm95gsrxnf6wf7s";
           system = "floating-point";
           asd = "floating-point";
@@ -54104,7 +54104,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "floating-point-contractions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/floating-point-contractions/2020-12-20/floating-point-contractions-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/floating-point-contractions/2020-12-20/floating-point-contractions-20201220-git.tgz";
           sha256 = "0mr8bnc7hn0ii0cmlfnlwc14zkgbgdf099x5crrf9cp9wda4p082";
           system = "floating-point-contractions";
           asd = "floating-point-contractions";
@@ -54124,7 +54124,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "floating-point-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/floating-point/2014-11-06/floating-point-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/floating-point/2014-11-06/floating-point-20141106-git.tgz";
           sha256 = "1bqslmykg04innaqlp369pyjh61isj8xgv2h6pm95gsrxnf6wf7s";
           system = "floating-point-test";
           asd = "floating-point-test";
@@ -54147,7 +54147,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "flow" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/flow/2025-06-22/flow-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/flow/2025-06-22/flow-20250622-git.tgz";
           sha256 = "1x4mvqw8236pipdbbkbmj5szm725qwvbwlq8vzi8qmaks7l20q5i";
           system = "flow";
           asd = "flow";
@@ -54169,7 +54169,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "flute" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/flute/2018-08-31/flute-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/flute/2018-08-31/flute-20180831-git.tgz";
           sha256 = "0q8jhp040cvpppyn820mm6a550yfxyr1lar298x13c42mm807f4f";
           system = "flute";
           asd = "flute";
@@ -54192,7 +54192,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "flute-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/flute/2018-08-31/flute-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/flute/2018-08-31/flute-20180831-git.tgz";
           sha256 = "0q8jhp040cvpppyn820mm6a550yfxyr1lar298x13c42mm807f4f";
           system = "flute-test";
           asd = "flute-test";
@@ -54215,7 +54215,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "flx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-flx/2025-06-22/cl-flx-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-flx/2025-06-22/cl-flx-20250622-git.tgz";
           sha256 = "0s7cmsjzsnvq1h4q4p7v8hkyavhrmv1mam2v9nrihzsgzx0yddb3";
           system = "flx";
           asd = "flx";
@@ -54235,7 +54235,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fmarshal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/marshal/2013-07-20/marshal-20130720-git.tgz";
+          url = "https://beta.quicklisp.org/archive/marshal/2013-07-20/marshal-20130720-git.tgz";
           sha256 = "1c0hcf7i9kzgbmayhmcjg0kv5966yqlimvj67gl4mzvwhbdkc2nf";
           system = "fmarshal";
           asd = "fmarshal";
@@ -54255,7 +54255,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fmarshal-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/marshal/2013-07-20/marshal-20130720-git.tgz";
+          url = "https://beta.quicklisp.org/archive/marshal/2013-07-20/marshal-20130720-git.tgz";
           sha256 = "1c0hcf7i9kzgbmayhmcjg0kv5966yqlimvj67gl4mzvwhbdkc2nf";
           system = "fmarshal-test";
           asd = "fmarshal-test";
@@ -54278,7 +54278,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fmcs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fmcs/2023-10-21/fmcs-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fmcs/2023-10-21/fmcs-20231021-git.tgz";
           sha256 = "1zp73i68f5sl93z10l2f94nylbkaj601ani6yg3bg7iqhs543651";
           system = "fmcs";
           asd = "fmcs";
@@ -54298,7 +54298,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fmt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz";
           sha256 = "078y5yig5fw0jcsjjabaq7dlyxsd10w5k80ywx6gbm0j88al3fzp";
           system = "fmt";
           asd = "fmt";
@@ -54318,7 +54318,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fmt-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz";
           sha256 = "078y5yig5fw0jcsjjabaq7dlyxsd10w5k80ywx6gbm0j88al3fzp";
           system = "fmt-test";
           asd = "fmt-test";
@@ -54341,7 +54341,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fmt-time" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz";
           sha256 = "078y5yig5fw0jcsjjabaq7dlyxsd10w5k80ywx6gbm0j88al3fzp";
           system = "fmt-time";
           asd = "fmt-time";
@@ -54364,7 +54364,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fn" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fn/2024-10-12/fn-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fn/2024-10-12/fn-20241012-git.tgz";
           sha256 = "08ydmfly5jaisfj8pkksq6npz992zlz4ni1yqlrq5yigwx41xaz0";
           system = "fn";
           asd = "fn";
@@ -54382,7 +54382,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fof" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fof/2021-12-30/fof-20211230-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fof/2021-12-30/fof-20211230-git.tgz";
           sha256 = "0ipy51q2fw03xk9rqcyzbq2b9c32npc1gl3c53rdjywpak7zwwg6";
           system = "fof";
           asd = "fof";
@@ -54413,7 +54413,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz";
           sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64";
           system = "folio";
           asd = "folio";
@@ -54438,7 +54438,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio.as" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz";
           sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64";
           system = "folio.as";
           asd = "folio.as";
@@ -54458,7 +54458,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio.boxes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz";
           sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64";
           system = "folio.boxes";
           asd = "folio.boxes";
@@ -54478,7 +54478,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio.collections" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz";
           sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64";
           system = "folio.collections";
           asd = "folio.collections";
@@ -54502,7 +54502,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio.functions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz";
           sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64";
           system = "folio.functions";
           asd = "folio.functions";
@@ -54522,7 +54522,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2";
           asd = "folio2";
@@ -54559,7 +54559,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-as" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-as";
           asd = "folio2-as";
@@ -54579,7 +54579,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-as-syntax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-as-syntax";
           asd = "folio2-as-syntax";
@@ -54599,7 +54599,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-as-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-as-tests";
           asd = "folio2-as-tests";
@@ -54623,7 +54623,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-boxes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-boxes";
           asd = "folio2-boxes";
@@ -54646,7 +54646,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-boxes-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-boxes-tests";
           asd = "folio2-boxes-tests";
@@ -54669,7 +54669,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-functions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-functions";
           asd = "folio2-functions";
@@ -54693,7 +54693,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-functions-syntax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-functions-syntax";
           asd = "folio2-functions-syntax";
@@ -54716,7 +54716,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-functions-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-functions-tests";
           asd = "folio2-functions-tests";
@@ -54740,7 +54740,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-make" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-make";
           asd = "folio2-make";
@@ -54760,7 +54760,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-make-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-make-tests";
           asd = "folio2-make-tests";
@@ -54783,7 +54783,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-maps" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-maps";
           asd = "folio2-maps";
@@ -54807,7 +54807,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-maps-syntax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-maps-syntax";
           asd = "folio2-maps-syntax";
@@ -54827,7 +54827,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-maps-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-maps-tests";
           asd = "folio2-maps-tests";
@@ -54851,7 +54851,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-pairs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-pairs";
           asd = "folio2-pairs";
@@ -54874,7 +54874,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-pairs-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-pairs-tests";
           asd = "folio2-pairs-tests";
@@ -54897,7 +54897,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-sequences" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-sequences";
           asd = "folio2-sequences";
@@ -54923,7 +54923,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-sequences-syntax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-sequences-syntax";
           asd = "folio2-sequences-syntax";
@@ -54943,7 +54943,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-sequences-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-sequences-tests";
           asd = "folio2-sequences-tests";
@@ -54967,7 +54967,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-series" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-series";
           asd = "folio2-series";
@@ -54994,7 +54994,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-series-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-series-tests";
           asd = "folio2-series-tests";
@@ -55017,7 +55017,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-taps" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-taps";
           asd = "folio2-taps";
@@ -55046,7 +55046,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-taps-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-taps-tests";
           asd = "folio2-taps-tests";
@@ -55069,7 +55069,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "folio2-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz";
           sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd";
           system = "folio2-tests";
           asd = "folio2-tests";
@@ -55089,7 +55089,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "font-discovery" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/font-discovery/2025-06-22/font-discovery-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/font-discovery/2025-06-22/font-discovery-20250622-git.tgz";
           sha256 = "0bfhd417kz73y1q38xn3j1k9j49lzng0j11x03jwlmjm6k8331vj";
           system = "font-discovery";
           asd = "font-discovery";
@@ -55116,7 +55116,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "foo-wild" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wild-package-inferred-system/2021-05-31/wild-package-inferred-system-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/wild-package-inferred-system/2021-05-31/wild-package-inferred-system-20210531-git.tgz";
           sha256 = "0sp3j3i83aqyq9bl3djs490nilryi9sh1wjbcqd9z94d9wfbfz80";
           system = "foo-wild";
           asd = "foo-wild";
@@ -55136,7 +55136,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "for" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/for/2025-06-22/for-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/for/2025-06-22/for-20250622-git.tgz";
           sha256 = "01n60r7wsdkbdr2prrxacjyx4klijgj5363rsdh0lfq32j0r078z";
           system = "for";
           asd = "for";
@@ -55160,7 +55160,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "foreign-array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz";
+          url = "https://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz";
           sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0";
           system = "foreign-array";
           asd = "foreign-array";
@@ -55185,7 +55185,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fork-future" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "fork-future";
           asd = "fork-future";
@@ -55208,7 +55208,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "form-fiddle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/form-fiddle/2025-06-22/form-fiddle-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/form-fiddle/2025-06-22/form-fiddle-20250622-git.tgz";
           sha256 = "0hg58xq2dbcdk31rfnwqc6h7krm6fmww103yzfbkg7cg7f3w7p51";
           system = "form-fiddle";
           asd = "form-fiddle";
@@ -55226,7 +55226,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "format-seconds-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/format-seconds/2025-06-22/format-seconds-production-e6b26811-git.tgz";
+          url = "https://beta.quicklisp.org/archive/format-seconds/2025-06-22/format-seconds-production-e6b26811-git.tgz";
           sha256 = "106ykx2n8vmw7k9rkr8iclh0pf6n4va7qfs7xvgqzcjsgpyi0ynz";
           system = "format-seconds-tests";
           asd = "format-seconds-tests";
@@ -55249,7 +55249,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "format-string-builder" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/format-string-builder/2017-01-24/format-string-builder-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/format-string-builder/2017-01-24/format-string-builder-20170124-git.tgz";
           sha256 = "1266w5wynfhamxdf8ms2236m202f6982fd9ph8fs98nqccq2pcac";
           system = "format-string-builder";
           asd = "format-string-builder";
@@ -55272,7 +55272,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "formlets" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/formlets/2016-12-04/formlets-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/formlets/2016-12-04/formlets-20161204-git.tgz";
           sha256 = "0r2afi5lwzxfb8xylx9cs44wqhla4b50k21nzg2dxn7z8m6yspfn";
           system = "formlets";
           asd = "formlets";
@@ -55297,7 +55297,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "formlets-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/formlets/2016-12-04/formlets-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/formlets/2016-12-04/formlets-20161204-git.tgz";
           sha256 = "0r2afi5lwzxfb8xylx9cs44wqhla4b50k21nzg2dxn7z8m6yspfn";
           system = "formlets-test";
           asd = "formlets-test";
@@ -55323,7 +55323,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fprog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz";
           sha256 = "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz";
           system = "fprog";
           asd = "fprog";
@@ -55343,7 +55343,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fps-independent-timestep" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "fps-independent-timestep";
           asd = "fps-independent-timestep";
@@ -55366,7 +55366,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fred" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fred/2015-09-23/fred-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fred/2015-09-23/fred-20150923-git.tgz";
           sha256 = "0qn2rd67haz4pvvv4yp2yvbvjhficv8xjm7ijg0r34gxllm6i373";
           system = "fred";
           asd = "fred";
@@ -55389,7 +55389,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "freebsd-sysctl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/freebsd-sysctl/2021-02-28/freebsd-sysctl-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/freebsd-sysctl/2021-02-28/freebsd-sysctl-20210228-git.tgz";
           sha256 = "1gzqiqz0pi273ia2q61bhr908ymbl8cll5v2h8lkicr9pff37g91";
           system = "freebsd-sysctl";
           asd = "freebsd-sysctl";
@@ -55412,7 +55412,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "freesound" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/freesound/2021-04-11/freesound-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/freesound/2021-04-11/freesound-20210411-git.tgz";
           sha256 = "1nsmbz7qx9wn86860zlnw75sdgpr8qfzgqfbwxggc3zr7p83kric";
           system = "freesound";
           asd = "freesound";
@@ -55438,7 +55438,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fresnel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fresnel/2023-06-18/fresnel-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fresnel/2023-06-18/fresnel-20230618-git.tgz";
           sha256 = "0rzi3pz1cjf8m0fmj7dg7wxbbcmxnbx75hfp9hbmrm9yqsjc4khv";
           system = "fresnel";
           asd = "fresnel";
@@ -55462,7 +55462,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "froute" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/froute/2018-07-11/froute-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/froute/2018-07-11/froute-20180711-git.tgz";
           sha256 = "1q7xzgn7g5ky1d8m121r8hskcg4gqpripr791k03y7dz5vkfj14x";
           system = "froute";
           asd = "froute";
@@ -55485,7 +55485,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "frpc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz";
+          url = "https://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz";
           sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r";
           system = "frpc";
           asd = "frpc";
@@ -55514,7 +55514,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "frpc-des" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz";
+          url = "https://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz";
           sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r";
           system = "frpc-des";
           asd = "frpc";
@@ -55537,7 +55537,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "frpc-gss" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz";
+          url = "https://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz";
           sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r";
           system = "frpc-gss";
           asd = "frpc";
@@ -55560,7 +55560,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "frpcgen" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz";
+          url = "https://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz";
           sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r";
           system = "frpcgen";
           asd = "frpcgen";
@@ -55584,7 +55584,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "frugal-uuid" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-frugal-uuid/2025-06-22/cl-frugal-uuid-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-frugal-uuid/2025-06-22/cl-frugal-uuid-20250622-git.tgz";
           sha256 = "1naviw6qksf2zh2wsr9lqpdjfy10nfrc1pc0liz1hrq14f15lsrm";
           system = "frugal-uuid";
           asd = "frugal-uuid";
@@ -55604,7 +55604,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fs-watcher" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fs-watcher/2017-11-30/fs-watcher-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fs-watcher/2017-11-30/fs-watcher-20171130-git.tgz";
           sha256 = "0fr2wb39609z4afk4w21vwnwi4g050x4gag2ykdx6hn9m65cp9db";
           system = "fs-watcher";
           asd = "fs-watcher";
@@ -55627,7 +55627,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fset" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fset/2025-06-22/fset-v1.4.6.tgz";
+          url = "https://beta.quicklisp.org/archive/fset/2025-06-22/fset-v1.4.6.tgz";
           sha256 = "1hgxs534w7x46y6pm6mjljyy4gvawfkyk2dg0qbiisgv7zj271ka";
           system = "fset";
           asd = "fset";
@@ -55649,7 +55649,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fsocket" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fsocket/2021-12-30/fsocket-20211230-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fsocket/2021-12-30/fsocket-20211230-git.tgz";
           sha256 = "18h3s4bv3243xbp0qdywn9kmqvx8zh9cscc9f6sfyxrz6xhymw6p";
           system = "fsocket";
           asd = "fsocket";
@@ -55672,7 +55672,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fsvd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fsvd/2013-12-11/fsvd-20131211-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fsvd/2013-12-11/fsvd-20131211-git.tgz";
           sha256 = "1m22g9x18ixjh5nylm56l5p67ryx9dbd3g6lyzvwk9nayjmqn7x5";
           system = "fsvd";
           asd = "fsvd";
@@ -55692,7 +55692,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ftp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ftp/2015-06-08/cl-ftp-20150608-http.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ftp/2015-06-08/cl-ftp-20150608-http.tgz";
           sha256 = "1m955rjpaynybzmb9q631mll764hm06lydvhra50mfjj75ynwsvw";
           system = "ftp";
           asd = "ftp";
@@ -55712,7 +55712,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fucc-generator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fucc/2020-04-27/fucc-v0.2.2.tgz";
+          url = "https://beta.quicklisp.org/archive/fucc/2020-04-27/fucc-v0.2.2.tgz";
           sha256 = "10wznxw6yhkyh943xnm694innj13xdlmkx13pr8xwc6zdbdyb32k";
           system = "fucc-generator";
           asd = "fucc-generator";
@@ -55732,7 +55732,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fucc-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fucc/2020-04-27/fucc-v0.2.2.tgz";
+          url = "https://beta.quicklisp.org/archive/fucc/2020-04-27/fucc-v0.2.2.tgz";
           sha256 = "10wznxw6yhkyh943xnm694innj13xdlmkx13pr8xwc6zdbdyb32k";
           system = "fucc-parser";
           asd = "fucc-parser";
@@ -55752,7 +55752,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "function-cache" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/function-cache/2023-10-21/function-cache-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/function-cache/2023-10-21/function-cache-20231021-git.tgz";
           sha256 = "1sk35fd7zw6kx9zpv18wmzmkksbn0ac4ycjzi6hqdgkbyn3l136w";
           system = "function-cache";
           asd = "function-cache";
@@ -55778,7 +55778,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "function-cache-clsql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/function-cache/2023-10-21/function-cache-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/function-cache/2023-10-21/function-cache-20231021-git.tgz";
           sha256 = "1sk35fd7zw6kx9zpv18wmzmkksbn0ac4ycjzi6hqdgkbyn3l136w";
           system = "function-cache-clsql";
           asd = "function-cache-clsql";
@@ -55802,7 +55802,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "functional-geometry" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "functional-geometry";
           asd = "functional-geometry";
@@ -55822,7 +55822,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "functional-trees" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/functional-trees/2025-06-22/functional-trees-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/functional-trees/2025-06-22/functional-trees-20250622-git.tgz";
           sha256 = "1z0z0g49jv6nvvqd5g0nyfac4h3l53n2lrszzvs3favp98z37byx";
           system = "functional-trees";
           asd = "functional-trees";
@@ -55852,7 +55852,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "funds" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/funds/2021-10-20/funds-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/funds/2021-10-20/funds-20211020-git.tgz";
           sha256 = "13y1jhvnpzrs9daz6f3z67w6h2y21ggb10j3j4vnc5p3m8i7ps4p";
           system = "funds";
           asd = "funds";
@@ -55872,7 +55872,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "future" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz";
           sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1";
           system = "future";
           asd = "future";
@@ -55892,7 +55892,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fuzzy-dates" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fuzzy-dates/2025-06-22/fuzzy-dates-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fuzzy-dates/2025-06-22/fuzzy-dates-20250622-git.tgz";
           sha256 = "0qaig90b91nrwgxs55c8zaah5iq72rgxw1clmjqw0iilfg5wgllr";
           system = "fuzzy-dates";
           asd = "fuzzy-dates";
@@ -55915,7 +55915,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fuzzy-match" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fuzzy-match/2021-01-24/fuzzy-match-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fuzzy-match/2021-01-24/fuzzy-match-20210124-git.tgz";
           sha256 = "1lawndmzkl6f9sviy7ngn2s3xkc4akp8l505kvpslaz6qq0ayyqv";
           system = "fuzzy-match";
           asd = "fuzzy-match";
@@ -55938,7 +55938,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "fxml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz";
           sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm";
           system = "fxml";
           asd = "fxml";
@@ -55967,7 +55967,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gadgets" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gadgets/2025-06-22/gadgets-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gadgets/2025-06-22/gadgets-20250622-git.tgz";
           sha256 = "0dbia2679dj4kr2ndh15ib26l9kw6zxx0qjn4l0jkcdx7shrkll6";
           system = "gadgets";
           asd = "gadgets";
@@ -55992,7 +55992,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "garbage-pools" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/garbage-pools/2021-01-24/garbage-pools-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/garbage-pools/2021-01-24/garbage-pools-20210124-git.tgz";
           sha256 = "04jqwr6j138him6wc4nrwjzm4lvyj5j31xqab02nkf8h9hmsf5v1";
           system = "garbage-pools";
           asd = "garbage-pools";
@@ -56012,7 +56012,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "garbage-pools-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/garbage-pools/2021-01-24/garbage-pools-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/garbage-pools/2021-01-24/garbage-pools-20210124-git.tgz";
           sha256 = "04jqwr6j138him6wc4nrwjzm4lvyj5j31xqab02nkf8h9hmsf5v1";
           system = "garbage-pools-test";
           asd = "garbage-pools-test";
@@ -56035,7 +56035,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "garten" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz";
           sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r";
           system = "garten";
           asd = "garten";
@@ -56059,7 +56059,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gcm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gcm/2014-12-17/gcm-20141217-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gcm/2014-12-17/gcm-20141217-git.tgz";
           sha256 = "1xnm1cj417d9syb634zi9w90c2191gxjrixa724s4h3hvj70y0ff";
           system = "gcm";
           asd = "gcm";
@@ -56083,7 +56083,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "geco" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/geco/2021-02-28/geco-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/geco/2021-02-28/geco-20210228-git.tgz";
           sha256 = "1ncaf9ab7jz59zmga0p97blsjjb1m6db0qih57wipfhqdb5ylz17";
           system = "geco";
           asd = "geco";
@@ -56103,7 +56103,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gendl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "gendl";
           asd = "gendl";
@@ -56129,7 +56129,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gendl-asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "gendl-asdf";
           asd = "gendl-asdf";
@@ -56149,7 +56149,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "general-accumulator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-general-accumulator/2021-12-09/cl-general-accumulator-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-general-accumulator/2021-12-09/cl-general-accumulator-20211209-git.tgz";
           sha256 = "14ybsk1ahgya67clspacqij1lvs5bzv07rdq60nhgqsbc6s56j9g";
           system = "general-accumulator";
           asd = "general-accumulator";
@@ -56169,7 +56169,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generalized-reference" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generalized-reference/2022-07-07/generalized-reference-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generalized-reference/2022-07-07/generalized-reference-20220707-git.tgz";
           sha256 = "0q1cm52lijn4p6bjzx2yr2kwy729lcj3f6lsanbnbjw56xgp4cpb";
           system = "generalized-reference";
           asd = "generalized-reference";
@@ -56196,7 +56196,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generators" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generators/2013-06-15/generators-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generators/2013-06-15/generators-20130615-git.tgz";
           sha256 = "1y8jlvv5c3av2ww33rwm2kh9sxmhfykhz235b33fbjpdxpx1r9bs";
           system = "generators";
           asd = "generators";
@@ -56220,7 +56220,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-cl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
           sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl";
           asd = "generic-cl";
@@ -56251,7 +56251,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-cl.arithmetic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
           sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.arithmetic";
           asd = "generic-cl.arithmetic";
@@ -56276,7 +56276,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-cl.collector" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
           sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.collector";
           asd = "generic-cl.collector";
@@ -56303,7 +56303,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-cl.comparison" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
           sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.comparison";
           asd = "generic-cl.comparison";
@@ -56327,7 +56327,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-cl.container" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
           sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.container";
           asd = "generic-cl.container";
@@ -56350,7 +56350,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-cl.internal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
           sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.internal";
           asd = "generic-cl.internal";
@@ -56375,7 +56375,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-cl.iterator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
           sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.iterator";
           asd = "generic-cl.iterator";
@@ -56407,7 +56407,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-cl.lazy-seq" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
           sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.lazy-seq";
           asd = "generic-cl.lazy-seq";
@@ -56440,7 +56440,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-cl.map" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
           sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.map";
           asd = "generic-cl.map";
@@ -56474,7 +56474,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-cl.math" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
           sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.math";
           asd = "generic-cl.math";
@@ -56502,7 +56502,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-cl.object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
           sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.object";
           asd = "generic-cl.object";
@@ -56527,7 +56527,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-cl.sequence" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
           sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.sequence";
           asd = "generic-cl.sequence";
@@ -56561,7 +56561,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-cl.set" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
           sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.set";
           asd = "generic-cl.set";
@@ -56592,7 +56592,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-cl.util" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-cl/2025-06-22/generic-cl-20250622-git.tgz";
           sha256 = "1w1zx79605cz10j02vcycy0f8fr3bsdn4jsi0jgsx2151xdqws2s";
           system = "generic-cl.util";
           asd = "generic-cl.util";
@@ -56612,7 +56612,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-comparability" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-comparability/2018-01-31/generic-comparability-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-comparability/2018-01-31/generic-comparability-20180131-git.tgz";
           sha256 = "01ma0cwirxarwwmdwflnh8kmysmr2smh5kyvzhb2074ljxg8yq2p";
           system = "generic-comparability";
           asd = "generic-comparability";
@@ -56632,7 +56632,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-comparability-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-comparability/2018-01-31/generic-comparability-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-comparability/2018-01-31/generic-comparability-20180131-git.tgz";
           sha256 = "01ma0cwirxarwwmdwflnh8kmysmr2smh5kyvzhb2074ljxg8yq2p";
           system = "generic-comparability-test";
           asd = "generic-comparability";
@@ -56656,7 +56656,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-sequences" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz";
           sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3";
           system = "generic-sequences";
           asd = "generic-sequences";
@@ -56676,7 +56676,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-sequences-cont" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz";
           sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3";
           system = "generic-sequences-cont";
           asd = "generic-sequences-cont";
@@ -56699,7 +56699,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-sequences-iterate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz";
           sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3";
           system = "generic-sequences-iterate";
           asd = "generic-sequences-iterate";
@@ -56722,7 +56722,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-sequences-stream" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz";
           sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3";
           system = "generic-sequences-stream";
           asd = "generic-sequences-stream";
@@ -56745,7 +56745,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "generic-sequences-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz";
           sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3";
           system = "generic-sequences-test";
           asd = "generic-sequences-test";
@@ -56770,7 +56770,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "geneva" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
           sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3";
           system = "geneva";
           asd = "geneva";
@@ -56793,7 +56793,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "geneva-cl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
           sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3";
           system = "geneva-cl";
           asd = "geneva-cl";
@@ -56819,7 +56819,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "geneva-html" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
           sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3";
           system = "geneva-html";
           asd = "geneva-html";
@@ -56843,7 +56843,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "geneva-latex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
           sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3";
           system = "geneva-latex";
           asd = "geneva-latex";
@@ -56868,7 +56868,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "geneva-mk2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
           sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3";
           system = "geneva-mk2";
           asd = "geneva-mk2";
@@ -56892,7 +56892,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "geneva-plain-text" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
           sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3";
           system = "geneva-plain-text";
           asd = "geneva-plain-text";
@@ -56915,7 +56915,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "geneva-tex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
           sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3";
           system = "geneva-tex";
           asd = "geneva-tex";
@@ -56940,7 +56940,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "genhash" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/genhash/2018-12-10/genhash-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/genhash/2018-12-10/genhash-20181210-git.tgz";
           sha256 = "1jnk1fix1zydhy0kn3cvlp6dy0241x7v8ahq001nlr6v152z1cwk";
           system = "genhash";
           asd = "genhash";
@@ -56960,7 +56960,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "geodesic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/geodesic/2023-06-18/geodesic-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/geodesic/2023-06-18/geodesic-20230618-git.tgz";
           sha256 = "13hvkf6r1y1yx0zqgkl8yg1fskfp7vpa9p34ar00s4ly432vbpxq";
           system = "geodesic";
           asd = "geodesic";
@@ -56980,7 +56980,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "geom-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "geom-base";
           asd = "geom-base";
@@ -57006,7 +57006,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "geowkt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/geowkt/2025-06-22/geowkt-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/geowkt/2025-06-22/geowkt-20250622-git.tgz";
           sha256 = "1x71m22vgqycm46bqymy5pr4k0l2xn3myjbxaf9ps1s36nvd3d1g";
           system = "geowkt";
           asd = "geowkt";
@@ -57026,7 +57026,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "geowkt-update" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/geowkt/2025-06-22/geowkt-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/geowkt/2025-06-22/geowkt-20250622-git.tgz";
           sha256 = "1x71m22vgqycm46bqymy5pr4k0l2xn3myjbxaf9ps1s36nvd3d1g";
           system = "geowkt-update";
           asd = "geowkt-update";
@@ -57051,7 +57051,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "getopt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/getopt/2015-09-23/getopt-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/getopt/2015-09-23/getopt-20150923-git.tgz";
           sha256 = "1liwzghx2swws84xlxnq756gbass0s916a9sq5mjfnlg3scbwcs3";
           system = "getopt";
           asd = "getopt";
@@ -57071,7 +57071,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "getopt-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/getopt/2015-09-23/getopt-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/getopt/2015-09-23/getopt-20150923-git.tgz";
           sha256 = "1liwzghx2swws84xlxnq756gbass0s916a9sq5mjfnlg3scbwcs3";
           system = "getopt-tests";
           asd = "getopt";
@@ -57094,7 +57094,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gettext" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz";
           sha256 = "1pzhamgni6k5hi6bbvlb3dm659pcllrrr3vhhn3rpjn238zxg5ar";
           system = "gettext";
           asd = "gettext";
@@ -57116,7 +57116,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gettext-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz";
           sha256 = "1pzhamgni6k5hi6bbvlb3dm659pcllrrr3vhhn3rpjn238zxg5ar";
           system = "gettext-example";
           asd = "gettext-example";
@@ -57136,7 +57136,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gettext-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz";
           sha256 = "1pzhamgni6k5hi6bbvlb3dm659pcllrrr3vhhn3rpjn238zxg5ar";
           system = "gettext-tests";
           asd = "gettext-tests";
@@ -57159,7 +57159,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "geysr" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "geysr";
           asd = "geysr";
@@ -57182,7 +57182,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "git-file-history" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/git-file-history/2016-08-25/git-file-history-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/git-file-history/2016-08-25/git-file-history-20160825-git.tgz";
           sha256 = "00kdawcy3mhljv04xpx5n7l2s21qdpbm8i9avjdqbxvfc5j05bq8";
           system = "git-file-history";
           asd = "git-file-history";
@@ -57206,7 +57206,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "git-file-history-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/git-file-history/2016-08-25/git-file-history-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/git-file-history/2016-08-25/git-file-history-20160825-git.tgz";
           sha256 = "00kdawcy3mhljv04xpx5n7l2s21qdpbm8i9avjdqbxvfc5j05bq8";
           system = "git-file-history-test";
           asd = "git-file-history-test";
@@ -57229,7 +57229,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "github-api-cl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/github-api-cl/2024-10-12/github-api-cl-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/github-api-cl/2024-10-12/github-api-cl-20241012-git.tgz";
           sha256 = "04kvhap041v26axg4pzzymnibzh430yvja8c6dhic27g2639kswh";
           system = "github-api-cl";
           asd = "github-api-cl";
@@ -57259,7 +57259,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "github-gist-api-cl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/github-api-cl/2024-10-12/github-api-cl-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/github-api-cl/2024-10-12/github-api-cl-20241012-git.tgz";
           sha256 = "04kvhap041v26axg4pzzymnibzh430yvja8c6dhic27g2639kswh";
           system = "github-gist-api-cl";
           asd = "github-gist-api-cl";
@@ -57290,7 +57290,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glad-blob" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glad-blob/2020-10-16/glad-blob-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glad-blob/2020-10-16/glad-blob-stable-git.tgz";
           sha256 = "19vp7nyf4kxhczi8i2w47lvipk1i4psrxlpk4nvbdh97vc12k5a7";
           system = "glad-blob";
           asd = "glad-blob";
@@ -57313,7 +57313,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glass" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glass/2015-07-09/glass-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glass/2015-07-09/glass-20150709-git.tgz";
           sha256 = "1xwr6mj25m0z1qhp30hafbbhrfj34dfidy320x5m3lij13vbyb1p";
           system = "glass";
           asd = "glass";
@@ -57333,7 +57333,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glaw" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz";
           sha256 = "06i9g80hkqgwk5h306wkdpcpv7n229n1ig1hy6697l35v8c4mzmp";
           system = "glaw";
           asd = "glaw";
@@ -57357,7 +57357,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glaw-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz";
           sha256 = "06i9g80hkqgwk5h306wkdpcpv7n229n1ig1hy6697l35v8c4mzmp";
           system = "glaw-examples";
           asd = "glaw-examples";
@@ -57381,7 +57381,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glaw-imago" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz";
           sha256 = "06i9g80hkqgwk5h306wkdpcpv7n229n1ig1hy6697l35v8c4mzmp";
           system = "glaw-imago";
           asd = "glaw-imago";
@@ -57404,7 +57404,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glaw-sdl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz";
           sha256 = "06i9g80hkqgwk5h306wkdpcpv7n229n1ig1hy6697l35v8c4mzmp";
           system = "glaw-sdl";
           asd = "glaw-sdl";
@@ -57428,7 +57428,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glfw" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glfw/2025-06-22/glfw-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glfw/2025-06-22/glfw-20250622-git.tgz";
           sha256 = "0a9s6mz92h1lhayja683gfraacpq7w1fg3y7b9brkfzdkg1nk5ik";
           system = "glfw";
           asd = "glfw";
@@ -57453,7 +57453,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glfw-blob" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glfw-blob/2020-10-16/glfw-blob-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glfw-blob/2020-10-16/glfw-blob-stable-git.tgz";
           sha256 = "0j953vqsyswipgyhc39swsgwgaqb53wvs80izraknlsp379hzabs";
           system = "glfw-blob";
           asd = "glfw-blob";
@@ -57476,7 +57476,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glhelp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "glhelp";
           asd = "glhelp";
@@ -57502,7 +57502,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "glisp";
           asd = "glisp";
@@ -57528,7 +57528,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glisph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glisph/2017-04-03/glisph-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glisph/2017-04-03/glisph-20170403-git.tgz";
           sha256 = "097d6kjk4rndpqn181k9nyr2bps4gf3shq5x2fy1swvks3pvys91";
           system = "glisph";
           asd = "glisph";
@@ -57554,7 +57554,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glisph-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glisph/2017-04-03/glisph-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glisph/2017-04-03/glisph-20170403-git.tgz";
           sha256 = "097d6kjk4rndpqn181k9nyr2bps4gf3shq5x2fy1swvks3pvys91";
           system = "glisph-test";
           asd = "glisph-test";
@@ -57579,7 +57579,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glkit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glkit/2020-10-16/glkit-20201016-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glkit/2020-10-16/glkit-20201016-git.tgz";
           sha256 = "1x3y5jcr1f0v9sgn3y5b7b8fhgd6vv37nz73016gdwh511idi8jn";
           system = "glkit";
           asd = "glkit";
@@ -57605,7 +57605,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glkit-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glkit/2020-10-16/glkit-20201016-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glkit/2020-10-16/glkit-20201016-git.tgz";
           sha256 = "1x3y5jcr1f0v9sgn3y5b7b8fhgd6vv37nz73016gdwh511idi8jn";
           system = "glkit-examples";
           asd = "glkit-examples";
@@ -57628,7 +57628,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "global-vars" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz";
           sha256 = "06m3xc8l3pgsapl8fvsi9wf6y46zs75cp9zn7zh6dc65v4s5wz3d";
           system = "global-vars";
           asd = "global-vars";
@@ -57646,7 +57646,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "global-vars-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz";
           sha256 = "06m3xc8l3pgsapl8fvsi9wf6y46zs75cp9zn7zh6dc65v4s5wz3d";
           system = "global-vars-test";
           asd = "global-vars-test";
@@ -57666,7 +57666,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glop" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glop/2017-10-19/glop-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glop/2017-10-19/glop-20171019-git.tgz";
           sha256 = "1nm35kvigflfjlmsa8zwdajc61f02fh4sq08jv0wnqylhx8yg2bv";
           system = "glop";
           asd = "glop";
@@ -57690,7 +57690,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glop-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glop/2017-10-19/glop-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glop/2017-10-19/glop-20171019-git.tgz";
           sha256 = "1nm35kvigflfjlmsa8zwdajc61f02fh4sq08jv0wnqylhx8yg2bv";
           system = "glop-test";
           asd = "glop-test";
@@ -57714,7 +57714,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glsl-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz";
           sha256 = "01ipspr22fgfj3w8wq2y81lzrjc4vpfiwnr3dqhjlpzzra46am8c";
           system = "glsl-docs";
           asd = "glsl-docs";
@@ -57732,7 +57732,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glsl-packing" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glsl-packing/2018-01-31/glsl-packing-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glsl-packing/2018-01-31/glsl-packing-20180131-git.tgz";
           sha256 = "0k2f1771wd9kdrcasldy1r00k5bdgi9fd07in52zmjggc0i7dd80";
           system = "glsl-packing";
           asd = "glsl-packing";
@@ -57752,7 +57752,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glsl-spec" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz";
           sha256 = "01ipspr22fgfj3w8wq2y81lzrjc4vpfiwnr3dqhjlpzzra46am8c";
           system = "glsl-spec";
           asd = "glsl-spec";
@@ -57770,7 +57770,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glsl-symbols" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz";
           sha256 = "01ipspr22fgfj3w8wq2y81lzrjc4vpfiwnr3dqhjlpzzra46am8c";
           system = "glsl-symbols";
           asd = "glsl-symbols";
@@ -57788,7 +57788,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glsl-toolkit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glsl-toolkit/2025-06-22/glsl-toolkit-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glsl-toolkit/2025-06-22/glsl-toolkit-20250622-git.tgz";
           sha256 = "18vkhww1h6pdwarr3smzdzj96va6c6j7a33sf05rjkifa0bm8f4m";
           system = "glsl-toolkit";
           asd = "glsl-toolkit";
@@ -57813,7 +57813,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glu-tessellate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glu-tessellate/2015-06-08/glu-tessellate-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glu-tessellate/2015-06-08/glu-tessellate-20150608-git.tgz";
           sha256 = "1iwnvk341pidxdsjb2c730k6a7nr1knd5ir0v83y6jhsf78r9krh";
           system = "glu-tessellate";
           asd = "glu-tessellate";
@@ -57833,7 +57833,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glyphs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glyphs/2018-07-11/glyphs-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glyphs/2018-07-11/glyphs-20180711-git.tgz";
           sha256 = "17kai1anbkk5dj5sbrsin2fc019cmcbglb900db60v38myj0y0wf";
           system = "glyphs";
           asd = "glyphs";
@@ -57857,7 +57857,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "glyphs-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/glyphs/2018-07-11/glyphs-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/glyphs/2018-07-11/glyphs-20180711-git.tgz";
           sha256 = "17kai1anbkk5dj5sbrsin2fc019cmcbglb900db60v38myj0y0wf";
           system = "glyphs-test";
           asd = "glyphs-test";
@@ -57880,7 +57880,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "golden-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/golden-utils/2024-10-12/golden-utils-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/golden-utils/2024-10-12/golden-utils-20241012-git.tgz";
           sha256 = "09vq29wjr3x7h3fshwxg8h1psy4p73yl61cjljarpqjhsgz7lmbp";
           system = "golden-utils";
           asd = "golden-utils";
@@ -57900,7 +57900,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gooptest" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gooptest/2020-09-25/gooptest-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gooptest/2020-09-25/gooptest-20200925-git.tgz";
           sha256 = "1g9q4frlc79xkmz74ybs954rc5kmfwjsn4xi64aig1fh5wjni5xs";
           system = "gooptest";
           asd = "gooptest";
@@ -57926,7 +57926,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "graph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/graph/2022-03-31/graph-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/graph/2022-03-31/graph-20220331-git.tgz";
           sha256 = "0m76vb0mk7rlbv9xhnix001gxik9f7vy9lspradcvzbk1rfxyyf7";
           system = "graph";
           asd = "graph";
@@ -57953,7 +57953,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "graphs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "graphs";
           asd = "graphs";
@@ -57973,7 +57973,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gravatar" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gravatar/2011-03-20/cl-gravatar-20110320-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gravatar/2011-03-20/cl-gravatar-20110320-git.tgz";
           sha256 = "1r9fq1zaywlhpxr3s3wgajhxf1kgwsgsql0a7ccfgsbwkgy2qzfs";
           system = "gravatar";
           asd = "gravatar";
@@ -57999,7 +57999,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "graylex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/graylex/2011-05-22/graylex-20110522-git.tgz";
+          url = "https://beta.quicklisp.org/archive/graylex/2011-05-22/graylex-20110522-git.tgz";
           sha256 = "0s1mpz6cpx3fywznxc8kzkhbb4fpmzyjpfgc85lnxqmri8wy6xqy";
           system = "graylex";
           asd = "graylex";
@@ -58023,7 +58023,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "graylex-m4-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/graylex/2011-05-22/graylex-20110522-git.tgz";
+          url = "https://beta.quicklisp.org/archive/graylex/2011-05-22/graylex-20110522-git.tgz";
           sha256 = "0s1mpz6cpx3fywznxc8kzkhbb4fpmzyjpfgc85lnxqmri8wy6xqy";
           system = "graylex-m4-example";
           asd = "graylex-m4-example";
@@ -58046,7 +58046,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "graylog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-graylog/2018-04-30/cl-graylog-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-graylog/2018-04-30/cl-graylog-20180430-git.tgz";
           sha256 = "1bj1v6vwz8w78h0bkjv5614gq50jdpjix88rbn3nvh81cfjvsqdg";
           system = "graylog";
           asd = "graylog";
@@ -58073,7 +58073,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "graylog-log5" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-graylog/2018-04-30/cl-graylog-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-graylog/2018-04-30/cl-graylog-20180430-git.tgz";
           sha256 = "1bj1v6vwz8w78h0bkjv5614gq50jdpjix88rbn3nvh81cfjvsqdg";
           system = "graylog-log5";
           asd = "graylog-log5";
@@ -58096,7 +58096,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "green-threads" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/green-threads/2014-12-17/green-threads-20141217-git.tgz";
+          url = "https://beta.quicklisp.org/archive/green-threads/2014-12-17/green-threads-20141217-git.tgz";
           sha256 = "1czw7nr0dwfps76h8hjvglk1wdh53yqbfbvv30whwbgqx33iippz";
           system = "green-threads";
           asd = "green-threads";
@@ -58119,7 +58119,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "grid-formation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/grid-formation/2022-07-07/grid-formation-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/grid-formation/2022-07-07/grid-formation-20220707-git.tgz";
           sha256 = "0s5picmkn7gn98k23axadbc0mlzlrbadi1ln85gpqp17k3cmd54m";
           system = "grid-formation";
           asd = "grid-formation";
@@ -58142,7 +58142,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "group-by" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/group-by/2014-02-11/group-by-20140211-git.tgz";
+          url = "https://beta.quicklisp.org/archive/group-by/2014-02-11/group-by-20140211-git.tgz";
           sha256 = "1p1qprb57fjd6sj8ws6c7y40ab38mym65wni8xivdy89i3d63dz4";
           system = "group-by";
           asd = "group-by";
@@ -58165,7 +58165,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "group-by-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/group-by/2014-02-11/group-by-20140211-git.tgz";
+          url = "https://beta.quicklisp.org/archive/group-by/2014-02-11/group-by-20140211-git.tgz";
           sha256 = "1p1qprb57fjd6sj8ws6c7y40ab38mym65wni8xivdy89i3d63dz4";
           system = "group-by-test";
           asd = "group-by";
@@ -58188,7 +58188,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "groupby" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-groupby/2017-08-30/cl-groupby-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-groupby/2017-08-30/cl-groupby-20170830-git.tgz";
           sha256 = "1ra4zi9ifrhxxsj4svg1iqqzzsv9aqqa76pswygp7g084x6kn5km";
           system = "groupby";
           asd = "groupby";
@@ -58208,7 +58208,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "grouping-stack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisa/2025-06-22/lisa-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisa/2025-06-22/lisa-20250622-git.tgz";
           sha256 = "0m1ww61vbaxrj1jiln8f6x393i27sd604hv511bd67y6xj23qqai";
           system = "grouping-stack";
           asd = "grouping-stack";
@@ -58228,7 +58228,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "grovel-locally" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/grovel-locally/2018-02-28/grovel-locally-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/grovel-locally/2018-02-28/grovel-locally-20180228-git.tgz";
           sha256 = "07q7zjgv3d1f35zwxpzcz020z0gcqi6m2l2szw99bsqk5hn93szl";
           system = "grovel-locally";
           asd = "grovel-locally";
@@ -58254,7 +58254,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gsll" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gsll/2018-08-31/gsll-quicklisp-eeeda841-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gsll/2018-08-31/gsll-quicklisp-eeeda841-git.tgz";
           sha256 = "0zsjvi1f62hjgfjk4wqg13d4r53bli9nglkwnd31qrygn8pmzlhi";
           system = "gsll";
           asd = "gsll";
@@ -58281,7 +58281,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-utils/2024-10-12/cl-utils-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-utils/2024-10-12/cl-utils-20241012-git.tgz";
           sha256 = "133alv8368k9pjkvh3vsfsk50whw7si4i2i7b8z256knpb2d35gh";
           system = "gt";
           asd = "gt";
@@ -58317,7 +58317,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gtirb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz";
           sha256 = "0dpchsshnlh3jb9rg1zdf63mr5l33vhjdxgxx2vqg0nh1sh41zn1";
           system = "gtirb";
           asd = "gtirb";
@@ -58350,7 +58350,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gtirb-capstone" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gtirb-capstone/2023-10-21/gtirb-capstone-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gtirb-capstone/2023-10-21/gtirb-capstone-20231021-git.tgz";
           sha256 = "1i65iay3pkc0q00inqyykjpv38jj0abz7j7dbsm6bamjvrh8n1v8";
           system = "gtirb-capstone";
           asd = "gtirb-capstone";
@@ -58378,7 +58378,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gtirb-functions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gtirb-functions/2023-06-18/gtirb-functions-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gtirb-functions/2023-06-18/gtirb-functions-20230618-git.tgz";
           sha256 = "19w18vfqrkjrsn4i4i3ppw5q80557pj0844r4zr3pbr0l8ypjcnp";
           system = "gtirb-functions";
           asd = "gtirb-functions";
@@ -58404,7 +58404,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gtk-tagged-streams" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gtk-tagged-streams/2018-02-28/gtk-tagged-streams-quicklisp-d1c2b827-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gtk-tagged-streams/2018-02-28/gtk-tagged-streams-quicklisp-d1c2b827-git.tgz";
           sha256 = "0ciw4ydcb8clsqb338hxpzncj2m59i6scnqlgbwkznm5i9dxvkyd";
           system = "gtk-tagged-streams";
           asd = "gtk-tagged-streams";
@@ -58428,7 +58428,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gtwiwtg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gtwiwtg/2023-10-21/gtwiwtg-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gtwiwtg/2023-10-21/gtwiwtg-20231021-git.tgz";
           sha256 = "0pp28s2bydqcd850kyk4jjvjky692lqgld9lc9v64lb96ibxzplk";
           system = "gtwiwtg";
           asd = "gtwiwtg";
@@ -58448,7 +58448,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gtype" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gtype/2020-06-10/gtype-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gtype/2020-06-10/gtype-20200610-git.tgz";
           sha256 = "0hbkfdw00v7bsa6zbric34p5w6hfwxycccg8wc2faq0cxhsvpv9h";
           system = "gtype";
           asd = "gtype";
@@ -58475,7 +58475,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gtype.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gtype/2020-06-10/gtype-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gtype/2020-06-10/gtype-20200610-git.tgz";
           sha256 = "0hbkfdw00v7bsa6zbric34p5w6hfwxycccg8wc2faq0cxhsvpv9h";
           system = "gtype.test";
           asd = "gtype.test";
@@ -58498,7 +58498,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gute" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gute/2022-11-06/gute-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gute/2022-11-06/gute-20221106-git.tgz";
           sha256 = "1d1m4qaygvmkglwdqlnhkvwq0wrig13h97w8ansfkyig359vpzy0";
           system = "gute";
           asd = "gute";
@@ -58525,7 +58525,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gwl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "gwl";
           asd = "gwl";
@@ -58553,7 +58553,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gwl-graphics" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "gwl-graphics";
           asd = "gwl-graphics";
@@ -58576,7 +58576,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "gzip-stream" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gzip-stream/2010-10-06/gzip-stream_0.2.8.tgz";
+          url = "https://beta.quicklisp.org/archive/gzip-stream/2010-10-06/gzip-stream_0.2.8.tgz";
           sha256 = "1m2x685mk9zp8vq45r4gf6mlbzmzr79mvdxibw1fqzv7r1bqrwrs";
           system = "gzip-stream";
           asd = "gzip-stream";
@@ -58600,7 +58600,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hamcrest" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-hamcrest/2025-06-22/cl-hamcrest-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-hamcrest/2025-06-22/cl-hamcrest-20250622-git.tgz";
           sha256 = "0d97v9rmf681vmxzdg8vrp4c9dphyrw89qwxpjwzncd34xrppjfn";
           system = "hamcrest";
           asd = "hamcrest";
@@ -58626,7 +58626,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hamcrest-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-hamcrest/2025-06-22/cl-hamcrest-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-hamcrest/2025-06-22/cl-hamcrest-20250622-git.tgz";
           sha256 = "0d97v9rmf681vmxzdg8vrp4c9dphyrw89qwxpjwzncd34xrppjfn";
           system = "hamcrest-ci";
           asd = "hamcrest-ci";
@@ -58646,7 +58646,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hamcrest-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-hamcrest/2025-06-22/cl-hamcrest-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-hamcrest/2025-06-22/cl-hamcrest-20250622-git.tgz";
           sha256 = "0d97v9rmf681vmxzdg8vrp4c9dphyrw89qwxpjwzncd34xrppjfn";
           system = "hamcrest-tests";
           asd = "hamcrest-tests";
@@ -58671,7 +58671,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "harmony" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/harmony/2025-06-22/harmony-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/harmony/2025-06-22/harmony-20250622-git.tgz";
           sha256 = "1dfwwp0850qh6a0pqnia99kapcpli38k5ywx9rq9c1jj5xb5byc1";
           system = "harmony";
           asd = "harmony";
@@ -58701,7 +58701,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hash-set" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hash-set/2025-06-22/hash-set-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hash-set/2025-06-22/hash-set-20250622-git.tgz";
           sha256 = "0q7bg8ww60smsw3jk6d6js4j09ggm7pd31xc0jpp0cjldylam2pz";
           system = "hash-set";
           asd = "hash-set";
@@ -58721,7 +58721,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hash-set-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hash-set/2025-06-22/hash-set-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hash-set/2025-06-22/hash-set-20250622-git.tgz";
           sha256 = "0q7bg8ww60smsw3jk6d6js4j09ggm7pd31xc0jpp0cjldylam2pz";
           system = "hash-set-tests";
           asd = "hash-set-tests";
@@ -58744,7 +58744,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hash-table-ext" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hash-table-ext/2021-10-20/hash-table-ext-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hash-table-ext/2021-10-20/hash-table-ext-20211020-git.tgz";
           sha256 = "00pafnjy5w9yhbzzdvgg4wwb8yicjjshgzxnn0by3d9qknxc7539";
           system = "hash-table-ext";
           asd = "hash-table-ext";
@@ -58767,7 +58767,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hash-table-ext.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hash-table-ext/2021-10-20/hash-table-ext-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hash-table-ext/2021-10-20/hash-table-ext-20211020-git.tgz";
           sha256 = "00pafnjy5w9yhbzzdvgg4wwb8yicjjshgzxnn0by3d9qknxc7539";
           system = "hash-table-ext.test";
           asd = "hash-table-ext.test";
@@ -58790,7 +58790,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hashtrie" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hashtrie/2025-06-22/hashtrie-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hashtrie/2025-06-22/hashtrie-20250622-git.tgz";
           sha256 = "04k38sya7nypqmbwrzwv18wxsky8ycc1jlxv3vlhn52jngizxc1n";
           system = "hashtrie";
           asd = "hashtrie";
@@ -58810,7 +58810,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hashtrie-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hashtrie/2025-06-22/hashtrie-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hashtrie/2025-06-22/hashtrie-20250622-git.tgz";
           sha256 = "04k38sya7nypqmbwrzwv18wxsky8ycc1jlxv3vlhn52jngizxc1n";
           system = "hashtrie-tests";
           asd = "hashtrie-tests";
@@ -58833,7 +58833,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hdf5-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz";
           sha256 = "0vda3075423xz83qky998lpac5b04dwfv7bwgh9jq8cs5v0zrxjf";
           system = "hdf5-cffi";
           asd = "hdf5-cffi";
@@ -58856,7 +58856,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hdf5-cffi.examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz";
           sha256 = "0vda3075423xz83qky998lpac5b04dwfv7bwgh9jq8cs5v0zrxjf";
           system = "hdf5-cffi.examples";
           asd = "hdf5-cffi.examples";
@@ -58876,7 +58876,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hdf5-cffi.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz";
           sha256 = "0vda3075423xz83qky998lpac5b04dwfv7bwgh9jq8cs5v0zrxjf";
           system = "hdf5-cffi.test";
           asd = "hdf5-cffi.test";
@@ -58902,7 +58902,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "heap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/heap/2018-10-18/heap-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/heap/2018-10-18/heap-20181018-git.tgz";
           sha256 = "0jkgazjnjip7y41zd8rpy89ymh75yimk1q24qbddcisq5rzdl52k";
           system = "heap";
           asd = "heap";
@@ -58920,7 +58920,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "helambdap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/helambdap/2025-06-22/helambdap-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/helambdap/2025-06-22/helambdap-20250622-git.tgz";
           sha256 = "0kvrajgglwf3zsfw7kafdkjwqv9y9pblmygcv1a2zvrnrgxmak1g";
           system = "helambdap";
           asd = "helambdap";
@@ -58945,7 +58945,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hello-builder" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz";
           sha256 = "1sf2xan0fh2qqr8xgmsbmq9qcj5nkzrp3nq7gd69ssbkz9ab6qpw";
           system = "hello-builder";
           asd = "hello-builder";
@@ -58965,7 +58965,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hello-clog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clog/2025-06-22/clog-20250622-git.tgz";
           sha256 = "1sf2xan0fh2qqr8xgmsbmq9qcj5nkzrp3nq7gd69ssbkz9ab6qpw";
           system = "hello-clog";
           asd = "hello-clog";
@@ -58985,7 +58985,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hemlock.base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hemlock/2023-10-21/hemlock-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hemlock/2023-10-21/hemlock-20231021-git.tgz";
           sha256 = "0c1lmznz1md7r9jbyg2n22h1svw8pvqjxyp7mvxgvqp34mmbf5ad";
           system = "hemlock.base";
           asd = "hemlock.base";
@@ -59016,7 +59016,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hemlock.clx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hemlock/2023-10-21/hemlock-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hemlock/2023-10-21/hemlock-20231021-git.tgz";
           sha256 = "0c1lmznz1md7r9jbyg2n22h1svw8pvqjxyp7mvxgvqp34mmbf5ad";
           system = "hemlock.clx";
           asd = "hemlock.clx";
@@ -59039,7 +59039,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hemlock.tty" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hemlock/2023-10-21/hemlock-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hemlock/2023-10-21/hemlock-20231021-git.tgz";
           sha256 = "0c1lmznz1md7r9jbyg2n22h1svw8pvqjxyp7mvxgvqp34mmbf5ad";
           system = "hemlock.tty";
           asd = "hemlock.tty";
@@ -59059,7 +59059,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hermetic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hermetic/2019-10-07/hermetic-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hermetic/2019-10-07/hermetic-20191007-git.tgz";
           sha256 = "1sndxkkj45sqr13xw9kvnhj25an96q4la70ni3w468yrcbf782pi";
           system = "hermetic";
           asd = "hermetic";
@@ -59082,7 +59082,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "herodotus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/herodotus/2022-03-31/herodotus-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/herodotus/2022-03-31/herodotus-20220331-git.tgz";
           sha256 = "085r6b8fydac2a939r80vlavs1ij5ij5li5xnl5q8qvn9dl4rr5k";
           system = "herodotus";
           asd = "herodotus";
@@ -59106,7 +59106,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hh-aws" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hh-aws/2015-08-04/hh-aws-20150804-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hh-aws/2015-08-04/hh-aws-20150804-git.tgz";
           sha256 = "02kfq7krn8788iphzcxnf0da88sy30gxpj1acgy9fl2n8qc03qdp";
           system = "hh-aws";
           asd = "hh-aws";
@@ -59132,7 +59132,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hh-aws-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hh-aws/2015-08-04/hh-aws-20150804-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hh-aws/2015-08-04/hh-aws-20150804-git.tgz";
           sha256 = "02kfq7krn8788iphzcxnf0da88sy30gxpj1acgy9fl2n8qc03qdp";
           system = "hh-aws-tests";
           asd = "hh-aws";
@@ -59156,7 +59156,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hh-redblack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hh-redblack/2015-10-31/hh-redblack-20151031-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hh-redblack/2015-10-31/hh-redblack-20151031-git.tgz";
           sha256 = "1klr78m4g60c82dnxksb7710jjj35rnfl4gl3dx3nrx0nb04bam6";
           system = "hh-redblack";
           asd = "hh-redblack";
@@ -59176,7 +59176,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hh-redblack-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hh-redblack/2015-10-31/hh-redblack-20151031-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hh-redblack/2015-10-31/hh-redblack-20151031-git.tgz";
           sha256 = "1klr78m4g60c82dnxksb7710jjj35rnfl4gl3dx3nrx0nb04bam6";
           system = "hh-redblack-tests";
           asd = "hh-redblack";
@@ -59199,7 +59199,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hh-web" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hh-web/2014-11-06/hh-web-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hh-web/2014-11-06/hh-web-20141106-git.tgz";
           sha256 = "1i3jyifayczm9b7rvw3fafiisxvjq87xd9z0hdf957qc2albsq87";
           system = "hh-web";
           asd = "hh-web";
@@ -59233,7 +59233,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hiccl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hiccl/2024-10-12/hiccl-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hiccl/2024-10-12/hiccl-20241012-git.tgz";
           sha256 = "0d92q8kb8xn6c9gsm822339f9qmpf9lpzy6s6abvxbhhyfk136yp";
           system = "hiccl";
           asd = "hiccl";
@@ -59257,7 +59257,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hiccl-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hiccl/2024-10-12/hiccl-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hiccl/2024-10-12/hiccl-20241012-git.tgz";
           sha256 = "0d92q8kb8xn6c9gsm822339f9qmpf9lpzy6s6abvxbhhyfk136yp";
           system = "hiccl-test";
           asd = "hiccl-test";
@@ -59283,7 +59283,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hl7-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hl7-client/2015-04-07/hl7-client-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hl7-client/2015-04-07/hl7-client-20150407-git.tgz";
           sha256 = "0hq5ip6f1hbdiydml5f1z7qsjaq1v3a3g4y5a87jaif027pwhd89";
           system = "hl7-client";
           asd = "hl7-client";
@@ -59303,7 +59303,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hl7-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hl7-parser/2016-05-31/hl7-parser-20160531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hl7-parser/2016-05-31/hl7-parser-20160531-git.tgz";
           sha256 = "1lcyvk3vap73d23s6pk8p1ficqhl2gs84nan6d0yy0hx8c4gip0x";
           system = "hl7-parser";
           asd = "hl7-parser";
@@ -59323,7 +59323,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hompack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "hompack";
           asd = "hompack";
@@ -59346,7 +59346,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "horner" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/horner/2019-11-30/horner-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/horner/2019-11-30/horner-20191130-git.tgz";
           sha256 = "05afvf7sxn1db7xxw7qmys1dwbgsx53iw4w556r277da6bpyacr9";
           system = "horner";
           asd = "horner";
@@ -59370,7 +59370,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "horse-html" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/horse-html/2019-10-07/horse-html-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/horse-html/2019-10-07/horse-html-20191007-git.tgz";
           sha256 = "0g6cs38123ajf1hvv056df9d8gy5ajarg0f5gywzhmmf0rhr9br5";
           system = "horse-html";
           asd = "horse-html";
@@ -59390,7 +59390,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "house" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/house/2021-01-24/house-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/house/2021-01-24/house-20210124-git.tgz";
           sha256 = "1x3dprg5j5rhbf8r1nr6py6g8wgfb9zysbqbjdcyh91szg7w80mb";
           system = "house";
           asd = "house";
@@ -59426,7 +59426,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hsx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hsx/2025-06-22/hsx-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hsx/2025-06-22/hsx-20250622-git.tgz";
           sha256 = "16sb2vc0z51riaa4hm5537ns17jfbw45adj0ykifklkc36zahil2";
           system = "hsx";
           asd = "hsx";
@@ -59449,7 +59449,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hsx-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hsx/2025-06-22/hsx-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hsx/2025-06-22/hsx-20250622-git.tgz";
           sha256 = "16sb2vc0z51riaa4hm5537ns17jfbw45adj0ykifklkc36zahil2";
           system = "hsx-test";
           asd = "hsx-test";
@@ -59473,7 +59473,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ht-simple-ajax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ht-simple-ajax/2013-04-21/ht-simple-ajax-20130421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ht-simple-ajax/2013-04-21/ht-simple-ajax-20130421-git.tgz";
           sha256 = "1l87c0arjzyrp3g6ay189fjkqmy81b7i35rfrcs9b269n7d4iis4";
           system = "ht-simple-ajax";
           asd = "ht-simple-ajax";
@@ -59493,7 +59493,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "html-encode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz";
+          url = "https://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz";
           sha256 = "1ydgb5xnbj1qbvzn7x32dm38gpqg5h0pjxc31f8df3j8sar843db";
           system = "html-encode";
           asd = "html-encode";
@@ -59511,7 +59511,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "html-entities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/html-entities/2017-10-19/html-entities-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/html-entities/2017-10-19/html-entities-20171019-git.tgz";
           sha256 = "1b2yl6lf6vis17y4n5s505p7ica96bdafcl6vydy1hg50fy33nfr";
           system = "html-entities";
           asd = "html-entities";
@@ -59531,7 +59531,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "html-entities-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/html-entities/2017-10-19/html-entities-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/html-entities/2017-10-19/html-entities-20171019-git.tgz";
           sha256 = "1b2yl6lf6vis17y4n5s505p7ica96bdafcl6vydy1hg50fy33nfr";
           system = "html-entities-tests";
           asd = "html-entities";
@@ -59554,7 +59554,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "html-match" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz";
           sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2";
           system = "html-match";
           asd = "html-match";
@@ -59577,7 +59577,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "html-match.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz";
           sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2";
           system = "html-match.test";
           asd = "html-match";
@@ -59600,7 +59600,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "html-template" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/html-template/2017-12-27/html-template-20171227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/html-template/2017-12-27/html-template-20171227-git.tgz";
           sha256 = "0g700zlyjjba17nbmw1adspw7r9s0321xhayfiqh0drg20zixaf7";
           system = "html-template";
           asd = "html-template";
@@ -59620,7 +59620,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "htmlgen" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz";
           sha256 = "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa";
           system = "htmlgen";
           asd = "htmlgen";
@@ -59640,7 +59640,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "http-body" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/http-body/2025-06-22/http-body-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/http-body/2025-06-22/http-body-20250622-git.tgz";
           sha256 = "0p54ai77igyhppi4r74izdykbnip67570fbvxkg90nvxvas3ybz4";
           system = "http-body";
           asd = "http-body";
@@ -59667,7 +59667,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "http-body-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/http-body/2025-06-22/http-body-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/http-body/2025-06-22/http-body-20250622-git.tgz";
           sha256 = "0p54ai77igyhppi4r74izdykbnip67570fbvxkg90nvxvas3ybz4";
           system = "http-body-test";
           asd = "http-body-test";
@@ -59695,7 +59695,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "http-get-cache" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/http-get-cache/2018-02-28/http-get-cache-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/http-get-cache/2018-02-28/http-get-cache-20180228-git.tgz";
           sha256 = "03bw4zf4hlxyrqm5mq53z0qksb9jbrcc5nv90y7qry83kxic2cgv";
           system = "http-get-cache";
           asd = "http-get-cache";
@@ -59715,7 +59715,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "http-parse" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/http-parse/2015-06-08/http-parse-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/http-parse/2015-06-08/http-parse-20150608-git.tgz";
           sha256 = "1plycsx2kch2l143s56hvi5dqx51n5bvp7vazmphqj5skmnw4576";
           system = "http-parse";
           asd = "http-parse";
@@ -59738,7 +59738,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "http-parse-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/http-parse/2015-06-08/http-parse-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/http-parse/2015-06-08/http-parse-20150608-git.tgz";
           sha256 = "1plycsx2kch2l143s56hvi5dqx51n5bvp7vazmphqj5skmnw4576";
           system = "http-parse-test";
           asd = "http-parse-test";
@@ -59762,7 +59762,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "http2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/http2/2025-06-22/http2-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/http2/2025-06-22/http2-20250622-git.tgz";
           sha256 = "0ypjgdic1a19gr0v77dh1gd8a51h2jf8gx8zm7f0rs42m09bbb7n";
           system = "http2";
           asd = "http2";
@@ -59796,7 +59796,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.asdf/2021-12-30/hu.dwim.asdf-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.asdf/2021-12-30/hu.dwim.asdf-stable-git.tgz";
           sha256 = "0zfwdsvcywvwzkn0a80ghi5kn1hs4iwinvi17ld58gyskf15frx9";
           system = "hu.dwim.asdf";
           asd = "hu.dwim.asdf";
@@ -59814,7 +59814,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.asdf.documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.asdf/2021-12-30/hu.dwim.asdf-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.asdf/2021-12-30/hu.dwim.asdf-stable-git.tgz";
           sha256 = "0zfwdsvcywvwzkn0a80ghi5kn1hs4iwinvi17ld58gyskf15frx9";
           system = "hu.dwim.asdf.documentation";
           asd = "hu.dwim.asdf.documentation";
@@ -59837,7 +59837,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.bluez" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.bluez/2025-06-22/hu.dwim.bluez-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.bluez/2025-06-22/hu.dwim.bluez-stable-git.tgz";
           sha256 = "0gjh3bgmdz4aabdavbd5m27r273hna47vs388r4m7l2xnd3b3j55";
           system = "hu.dwim.bluez";
           asd = "hu.dwim.bluez";
@@ -59863,7 +59863,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.common" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.common/2015-07-09/hu.dwim.common-20150709-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.common/2015-07-09/hu.dwim.common-20150709-darcs.tgz";
           sha256 = "0mkhq6bqysdy09gswgxm1s50xrq7gimdyqiq84xk8vpyp2hv6hqq";
           system = "hu.dwim.common";
           asd = "hu.dwim.common";
@@ -59889,7 +59889,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.common-lisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.common-lisp/2021-02-28/hu.dwim.common-lisp-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.common-lisp/2021-02-28/hu.dwim.common-lisp-stable-git.tgz";
           sha256 = "06zkdw3scnaw0d4nmsgkv7pi7sw00dikdgfgsqmbqfbz2yrsdabk";
           system = "hu.dwim.common-lisp";
           asd = "hu.dwim.common-lisp";
@@ -59907,7 +59907,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.common-lisp.documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.common-lisp/2021-02-28/hu.dwim.common-lisp-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.common-lisp/2021-02-28/hu.dwim.common-lisp-stable-git.tgz";
           sha256 = "06zkdw3scnaw0d4nmsgkv7pi7sw00dikdgfgsqmbqfbz2yrsdabk";
           system = "hu.dwim.common-lisp.documentation";
           asd = "hu.dwim.common-lisp.documentation";
@@ -59931,7 +59931,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.common.documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.common/2015-07-09/hu.dwim.common-20150709-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.common/2015-07-09/hu.dwim.common-20150709-darcs.tgz";
           sha256 = "0mkhq6bqysdy09gswgxm1s50xrq7gimdyqiq84xk8vpyp2hv6hqq";
           system = "hu.dwim.common.documentation";
           asd = "hu.dwim.common.documentation";
@@ -59955,7 +59955,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.computed-class" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz";
           sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1";
           system = "hu.dwim.computed-class";
           asd = "hu.dwim.computed-class";
@@ -59981,7 +59981,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.computed-class+hu.dwim.logger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz";
           sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1";
           system = "hu.dwim.computed-class+hu.dwim.logger";
           asd = "hu.dwim.computed-class+hu.dwim.logger";
@@ -60005,7 +60005,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.computed-class+swank" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz";
           sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1";
           system = "hu.dwim.computed-class+swank";
           asd = "hu.dwim.computed-class+swank";
@@ -60029,7 +60029,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.computed-class.documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz";
           sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1";
           system = "hu.dwim.computed-class.documentation";
           asd = "hu.dwim.computed-class.documentation";
@@ -60053,7 +60053,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.computed-class.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz";
           sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1";
           system = "hu.dwim.computed-class.test";
           asd = "hu.dwim.computed-class.test";
@@ -60077,7 +60077,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.debug" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz";
           sha256 = "0ad606bmrif82fyikb2hgwzh3y6nlrlsprb5yi86qwa2a2fvak4b";
           system = "hu.dwim.debug";
           asd = "hu.dwim.debug";
@@ -60105,7 +60105,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.debug.documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz";
           sha256 = "0ad606bmrif82fyikb2hgwzh3y6nlrlsprb5yi86qwa2a2fvak4b";
           system = "hu.dwim.debug.documentation";
           asd = "hu.dwim.debug.documentation";
@@ -60129,7 +60129,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.debug.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz";
           sha256 = "0ad606bmrif82fyikb2hgwzh3y6nlrlsprb5yi86qwa2a2fvak4b";
           system = "hu.dwim.debug.test";
           asd = "hu.dwim.debug.test";
@@ -60153,7 +60153,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.def" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz";
           sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab";
           system = "hu.dwim.def";
           asd = "hu.dwim.def";
@@ -60177,7 +60177,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.def+cl-l10n" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz";
           sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab";
           system = "hu.dwim.def+cl-l10n";
           asd = "hu.dwim.def+cl-l10n";
@@ -60201,7 +60201,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.def+contextl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz";
           sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab";
           system = "hu.dwim.def+contextl";
           asd = "hu.dwim.def+contextl";
@@ -60225,7 +60225,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.def+hu.dwim.common" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz";
           sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab";
           system = "hu.dwim.def+hu.dwim.common";
           asd = "hu.dwim.def+hu.dwim.common";
@@ -60249,7 +60249,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.def+hu.dwim.delico" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz";
           sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab";
           system = "hu.dwim.def+hu.dwim.delico";
           asd = "hu.dwim.def+hu.dwim.delico";
@@ -60273,7 +60273,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.def+swank" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz";
           sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab";
           system = "hu.dwim.def+swank";
           asd = "hu.dwim.def+swank";
@@ -60295,7 +60295,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.defclass-star" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz";
           sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2";
           system = "hu.dwim.defclass-star";
           asd = "hu.dwim.defclass-star";
@@ -60313,7 +60313,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.defclass-star+contextl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz";
           sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2";
           system = "hu.dwim.defclass-star+contextl";
           asd = "hu.dwim.defclass-star+contextl";
@@ -60337,7 +60337,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.defclass-star+hu.dwim.def" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz";
           sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2";
           system = "hu.dwim.defclass-star+hu.dwim.def";
           asd = "hu.dwim.defclass-star+hu.dwim.def";
@@ -60361,7 +60361,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.defclass-star+hu.dwim.def+contextl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz";
           sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2";
           system = "hu.dwim.defclass-star+hu.dwim.def+contextl";
           asd = "hu.dwim.defclass-star+hu.dwim.def+contextl";
@@ -60385,7 +60385,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.defclass-star+swank" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz";
           sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2";
           system = "hu.dwim.defclass-star+swank";
           asd = "hu.dwim.defclass-star+swank";
@@ -60409,7 +60409,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.delico" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.delico/2020-09-25/hu.dwim.delico-20200925-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.delico/2020-09-25/hu.dwim.delico-20200925-darcs.tgz";
           sha256 = "12n5cddg7vd3y4dqjcf4wayxwj905ja8jh90ixvrhgnvs559lbnl";
           system = "hu.dwim.delico";
           asd = "hu.dwim.delico";
@@ -60434,7 +60434,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.graphviz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz";
           sha256 = "0cz5g7d6817ajypp876k9m65sxxlf42x4bg04ya73aqci5s1vjwy";
           system = "hu.dwim.graphviz";
           asd = "hu.dwim.graphviz";
@@ -60458,7 +60458,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.graphviz.documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz";
           sha256 = "0cz5g7d6817ajypp876k9m65sxxlf42x4bg04ya73aqci5s1vjwy";
           system = "hu.dwim.graphviz.documentation";
           asd = "hu.dwim.graphviz.documentation";
@@ -60482,7 +60482,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.graphviz.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz";
           sha256 = "0cz5g7d6817ajypp876k9m65sxxlf42x4bg04ya73aqci5s1vjwy";
           system = "hu.dwim.graphviz.test";
           asd = "hu.dwim.graphviz.test";
@@ -60507,7 +60507,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.logger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz";
           sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74";
           system = "hu.dwim.logger";
           asd = "hu.dwim.logger";
@@ -60536,7 +60536,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.logger+iolib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz";
           sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74";
           system = "hu.dwim.logger+iolib";
           asd = "hu.dwim.logger+iolib";
@@ -60560,7 +60560,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.logger+swank" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz";
           sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74";
           system = "hu.dwim.logger+swank";
           asd = "hu.dwim.logger+swank";
@@ -60584,7 +60584,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.logger.documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz";
           sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74";
           system = "hu.dwim.logger.documentation";
           asd = "hu.dwim.logger.documentation";
@@ -60608,7 +60608,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.logger.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz";
           sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74";
           system = "hu.dwim.logger.test";
           asd = "hu.dwim.logger.test";
@@ -60632,7 +60632,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.partial-eval" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.partial-eval/2024-10-12/hu.dwim.partial-eval-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.partial-eval/2024-10-12/hu.dwim.partial-eval-stable-git.tgz";
           sha256 = "1zsh1rk9rcxkrqavhx2slpczii23y51fn66n68vsw5d97g9k6gzz";
           system = "hu.dwim.partial-eval";
           asd = "hu.dwim.partial-eval";
@@ -60662,7 +60662,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.perec" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
           sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz";
           system = "hu.dwim.perec";
           asd = "hu.dwim.perec";
@@ -60704,7 +60704,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.perec+hu.dwim.quasi-quote.xml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
           sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz";
           system = "hu.dwim.perec+hu.dwim.quasi-quote.xml";
           asd = "hu.dwim.perec+hu.dwim.quasi-quote.xml";
@@ -60728,7 +60728,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.perec+iolib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
           sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz";
           system = "hu.dwim.perec+iolib";
           asd = "hu.dwim.perec+iolib";
@@ -60752,7 +60752,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.perec+swank" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
           sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz";
           system = "hu.dwim.perec+swank";
           asd = "hu.dwim.perec+swank";
@@ -60776,7 +60776,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.perec.all" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
           sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz";
           system = "hu.dwim.perec.all";
           asd = "hu.dwim.perec.all";
@@ -60801,7 +60801,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.perec.all.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
           sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz";
           system = "hu.dwim.perec.all.test";
           asd = "hu.dwim.perec.all.test";
@@ -60826,7 +60826,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.perec.documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
           sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz";
           system = "hu.dwim.perec.documentation";
           asd = "hu.dwim.perec.documentation";
@@ -60850,7 +60850,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.perec.oracle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
           sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz";
           system = "hu.dwim.perec.oracle";
           asd = "hu.dwim.perec.oracle";
@@ -60874,7 +60874,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.perec.oracle.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
           sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz";
           system = "hu.dwim.perec.oracle.test";
           asd = "hu.dwim.perec.oracle.test";
@@ -60898,7 +60898,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.perec.postgresql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
           sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz";
           system = "hu.dwim.perec.postgresql";
           asd = "hu.dwim.perec.postgresql";
@@ -60922,7 +60922,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.perec.postgresql.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
           sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz";
           system = "hu.dwim.perec.postgresql.test";
           asd = "hu.dwim.perec.postgresql.test";
@@ -60946,7 +60946,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.perec.sqlite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
           sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz";
           system = "hu.dwim.perec.sqlite";
           asd = "hu.dwim.perec.sqlite";
@@ -60970,7 +60970,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.perec.sqlite.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
           sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz";
           system = "hu.dwim.perec.sqlite.test";
           asd = "hu.dwim.perec.sqlite.test";
@@ -60994,7 +60994,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.perec.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz";
           sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz";
           system = "hu.dwim.perec.test";
           asd = "hu.dwim.perec.test";
@@ -61020,7 +61020,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.presentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz";
           sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp";
           system = "hu.dwim.presentation";
           asd = "hu.dwim.presentation";
@@ -61051,7 +61051,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.presentation+cl-graph+cl-typesetting" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz";
           sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp";
           system = "hu.dwim.presentation+cl-graph+cl-typesetting";
           asd = "hu.dwim.presentation+cl-graph+cl-typesetting";
@@ -61075,7 +61075,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.presentation+cl-typesetting" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz";
           sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp";
           system = "hu.dwim.presentation+cl-typesetting";
           asd = "hu.dwim.presentation+cl-typesetting";
@@ -61099,7 +61099,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.presentation+hu.dwim.stefil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz";
           sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp";
           system = "hu.dwim.presentation+hu.dwim.stefil";
           asd = "hu.dwim.presentation+hu.dwim.stefil";
@@ -61123,7 +61123,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.presentation+hu.dwim.web-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz";
           sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp";
           system = "hu.dwim.presentation+hu.dwim.web-server";
           asd = "hu.dwim.presentation+hu.dwim.web-server";
@@ -61147,7 +61147,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.quasi-quote" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz";
           sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm";
           system = "hu.dwim.quasi-quote";
           asd = "hu.dwim.quasi-quote";
@@ -61177,7 +61177,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.quasi-quote.css" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz";
           sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm";
           system = "hu.dwim.quasi-quote.css";
           asd = "hu.dwim.quasi-quote.css";
@@ -61200,7 +61200,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.quasi-quote.js" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz";
           sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm";
           system = "hu.dwim.quasi-quote.js";
           asd = "hu.dwim.quasi-quote.js";
@@ -61226,7 +61226,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.quasi-quote.pdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz";
           sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm";
           system = "hu.dwim.quasi-quote.pdf";
           asd = "hu.dwim.quasi-quote.pdf";
@@ -61250,7 +61250,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.quasi-quote.xml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz";
           sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm";
           system = "hu.dwim.quasi-quote.xml";
           asd = "hu.dwim.quasi-quote.xml";
@@ -61273,7 +61273,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.quasi-quote.xml+cxml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz";
           sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm";
           system = "hu.dwim.quasi-quote.xml+cxml";
           asd = "hu.dwim.quasi-quote.xml+cxml";
@@ -61297,7 +61297,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.quasi-quote.xml+hu.dwim.quasi-quote.js" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz";
           sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm";
           system = "hu.dwim.quasi-quote.xml+hu.dwim.quasi-quote.js";
           asd = "hu.dwim.quasi-quote.xml+hu.dwim.quasi-quote.js";
@@ -61321,7 +61321,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.rdbms" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
           sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av";
           system = "hu.dwim.rdbms";
           asd = "hu.dwim.rdbms";
@@ -61351,7 +61351,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.rdbms.all" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
           sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av";
           system = "hu.dwim.rdbms.all";
           asd = "hu.dwim.rdbms.all";
@@ -61376,7 +61376,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.rdbms.all.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
           sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av";
           system = "hu.dwim.rdbms.all.test";
           asd = "hu.dwim.rdbms.all.test";
@@ -61401,7 +61401,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.rdbms.documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
           sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av";
           system = "hu.dwim.rdbms.documentation";
           asd = "hu.dwim.rdbms.documentation";
@@ -61425,7 +61425,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.rdbms.oracle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
           sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av";
           system = "hu.dwim.rdbms.oracle";
           asd = "hu.dwim.rdbms.oracle";
@@ -61449,7 +61449,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.rdbms.oracle.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
           sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av";
           system = "hu.dwim.rdbms.oracle.test";
           asd = "hu.dwim.rdbms.oracle.test";
@@ -61473,7 +61473,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.rdbms.postgresql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
           sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av";
           system = "hu.dwim.rdbms.postgresql";
           asd = "hu.dwim.rdbms.postgresql";
@@ -61497,7 +61497,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.rdbms.postgresql.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
           sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av";
           system = "hu.dwim.rdbms.postgresql.test";
           asd = "hu.dwim.rdbms.postgresql.test";
@@ -61521,7 +61521,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.rdbms.sqlite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
           sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av";
           system = "hu.dwim.rdbms.sqlite";
           asd = "hu.dwim.rdbms.sqlite";
@@ -61545,7 +61545,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.rdbms.sqlite.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
           sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av";
           system = "hu.dwim.rdbms.sqlite.test";
           asd = "hu.dwim.rdbms.sqlite.test";
@@ -61569,7 +61569,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.rdbms.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz";
           sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av";
           system = "hu.dwim.rdbms.test";
           asd = "hu.dwim.rdbms.test";
@@ -61593,7 +61593,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.reiterate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.reiterate/2025-06-22/hu.dwim.reiterate-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.reiterate/2025-06-22/hu.dwim.reiterate-stable-git.tgz";
           sha256 = "1qy83h4q10as7r8ynci0iqmdwazzs92wkl2jd92wh4ai3zaf72al";
           system = "hu.dwim.reiterate";
           asd = "hu.dwim.reiterate";
@@ -61624,7 +61624,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.reiterate+hu.dwim.logger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.reiterate/2025-06-22/hu.dwim.reiterate-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.reiterate/2025-06-22/hu.dwim.reiterate-stable-git.tgz";
           sha256 = "1qy83h4q10as7r8ynci0iqmdwazzs92wkl2jd92wh4ai3zaf72al";
           system = "hu.dwim.reiterate+hu.dwim.logger";
           asd = "hu.dwim.reiterate+hu.dwim.logger";
@@ -61648,7 +61648,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.sdl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.sdl/2025-06-22/hu.dwim.sdl-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.sdl/2025-06-22/hu.dwim.sdl-stable-git.tgz";
           sha256 = "175kha5f7kvis2nlxbzrybswbr62lgmjh691ajwl5i9y7andqhq2";
           system = "hu.dwim.sdl";
           asd = "hu.dwim.sdl";
@@ -61674,7 +61674,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.serializer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz";
           sha256 = "1c4zl2ql4w7nw8vrcrhhq45c5yhbcp4z5qpp1yxjpd3002q2lbh2";
           system = "hu.dwim.serializer";
           asd = "hu.dwim.serializer";
@@ -61702,7 +61702,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.serializer.documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz";
           sha256 = "1c4zl2ql4w7nw8vrcrhhq45c5yhbcp4z5qpp1yxjpd3002q2lbh2";
           system = "hu.dwim.serializer.documentation";
           asd = "hu.dwim.serializer.documentation";
@@ -61726,7 +61726,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.serializer.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz";
           sha256 = "1c4zl2ql4w7nw8vrcrhhq45c5yhbcp4z5qpp1yxjpd3002q2lbh2";
           system = "hu.dwim.serializer.test";
           asd = "hu.dwim.serializer.test";
@@ -61750,7 +61750,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.stefil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz";
           sha256 = "0sra6psvrlpx9w7xjikm6ph2qlmgi9lr1kagpsiafxq4dnqlxjsx";
           system = "hu.dwim.stefil";
           asd = "hu.dwim.stefil";
@@ -61768,7 +61768,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.stefil+hu.dwim.def" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz";
           sha256 = "0sra6psvrlpx9w7xjikm6ph2qlmgi9lr1kagpsiafxq4dnqlxjsx";
           system = "hu.dwim.stefil+hu.dwim.def";
           asd = "hu.dwim.stefil+hu.dwim.def";
@@ -61790,7 +61790,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.stefil+hu.dwim.def+swank" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz";
           sha256 = "0sra6psvrlpx9w7xjikm6ph2qlmgi9lr1kagpsiafxq4dnqlxjsx";
           system = "hu.dwim.stefil+hu.dwim.def+swank";
           asd = "hu.dwim.stefil+hu.dwim.def+swank";
@@ -61813,7 +61813,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.stefil+swank" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz";
           sha256 = "0sra6psvrlpx9w7xjikm6ph2qlmgi9lr1kagpsiafxq4dnqlxjsx";
           system = "hu.dwim.stefil+swank";
           asd = "hu.dwim.stefil+swank";
@@ -61835,7 +61835,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.syntax-sugar" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2023-02-14/hu.dwim.syntax-sugar-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2023-02-14/hu.dwim.syntax-sugar-stable-git.tgz";
           sha256 = "1cy474di8njy4s39n7kn2w9jw39n4rssrk0fghrj0gabfxiz4wv9";
           system = "hu.dwim.syntax-sugar";
           asd = "hu.dwim.syntax-sugar";
@@ -61858,7 +61858,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.syntax-sugar.documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2023-02-14/hu.dwim.syntax-sugar-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2023-02-14/hu.dwim.syntax-sugar-stable-git.tgz";
           sha256 = "1cy474di8njy4s39n7kn2w9jw39n4rssrk0fghrj0gabfxiz4wv9";
           system = "hu.dwim.syntax-sugar.documentation";
           asd = "hu.dwim.syntax-sugar.documentation";
@@ -61882,7 +61882,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.syntax-sugar.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2023-02-14/hu.dwim.syntax-sugar-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2023-02-14/hu.dwim.syntax-sugar-stable-git.tgz";
           sha256 = "1cy474di8njy4s39n7kn2w9jw39n4rssrk0fghrj0gabfxiz4wv9";
           system = "hu.dwim.syntax-sugar.test";
           asd = "hu.dwim.syntax-sugar.test";
@@ -61907,7 +61907,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.uri" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.uri/2018-02-28/hu.dwim.uri-20180228-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.uri/2018-02-28/hu.dwim.uri-20180228-darcs.tgz";
           sha256 = "0wvai7djmbry0b0j8vhzw3s8m30ghs2sml29gw6snh1pynh3c2ir";
           system = "hu.dwim.uri";
           asd = "hu.dwim.uri";
@@ -61933,7 +61933,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.uri.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.uri/2018-02-28/hu.dwim.uri-20180228-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.uri/2018-02-28/hu.dwim.uri-20180228-darcs.tgz";
           sha256 = "0wvai7djmbry0b0j8vhzw3s8m30ghs2sml29gw6snh1pynh3c2ir";
           system = "hu.dwim.uri.test";
           asd = "hu.dwim.uri.test";
@@ -61958,7 +61958,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.util" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz";
           sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi";
           system = "hu.dwim.util";
           asd = "hu.dwim.util";
@@ -61983,7 +61983,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.util+iolib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz";
           sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi";
           system = "hu.dwim.util+iolib";
           asd = "hu.dwim.util+iolib";
@@ -62007,7 +62007,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.util.documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz";
           sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi";
           system = "hu.dwim.util.documentation";
           asd = "hu.dwim.util.documentation";
@@ -62031,7 +62031,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.util.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz";
           sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi";
           system = "hu.dwim.util.test";
           asd = "hu.dwim.util.test";
@@ -62076,7 +62076,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.walker" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.walker/2022-07-07/hu.dwim.walker-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.walker/2022-07-07/hu.dwim.walker-stable-git.tgz";
           sha256 = "0sw7z5iml82sklxjy1wr42mbp2qqml49ci36d6xsckar0sqsc8vr";
           system = "hu.dwim.walker";
           asd = "hu.dwim.walker";
@@ -62106,7 +62106,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.web-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
           sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf";
           system = "hu.dwim.web-server";
           asd = "hu.dwim.web-server";
@@ -62151,7 +62151,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.web-server+swank" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
           sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf";
           system = "hu.dwim.web-server+swank";
           asd = "hu.dwim.web-server+swank";
@@ -62175,7 +62175,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.web-server.application" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
           sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf";
           system = "hu.dwim.web-server.application";
           asd = "hu.dwim.web-server.application";
@@ -62198,7 +62198,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.web-server.application+hu.dwim.perec" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
           sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf";
           system = "hu.dwim.web-server.application+hu.dwim.perec";
           asd = "hu.dwim.web-server.application+hu.dwim.perec";
@@ -62222,7 +62222,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.web-server.application.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
           sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf";
           system = "hu.dwim.web-server.application.test";
           asd = "hu.dwim.web-server.application.test";
@@ -62246,7 +62246,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.web-server.documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
           sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf";
           system = "hu.dwim.web-server.documentation";
           asd = "hu.dwim.web-server.documentation";
@@ -62270,7 +62270,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.web-server.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
           sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf";
           system = "hu.dwim.web-server.test";
           asd = "hu.dwim.web-server.test";
@@ -62297,7 +62297,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.web-server.websocket" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz";
           sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf";
           system = "hu.dwim.web-server.websocket";
           asd = "hu.dwim.web-server.websocket";
@@ -62322,7 +62322,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hu.dwim.zlib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hu.dwim.zlib/2025-06-22/hu.dwim.zlib-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hu.dwim.zlib/2025-06-22/hu.dwim.zlib-stable-git.tgz";
           sha256 = "1yrsbl6rmsp6sdaj9yzwx1bpbs529akndxnpplafw31195khnxm1";
           system = "hu.dwim.zlib";
           asd = "hu.dwim.zlib";
@@ -62349,7 +62349,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "huffman" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/huffman/2018-10-18/huffman-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/huffman/2018-10-18/huffman-20181018-git.tgz";
           sha256 = "05b3ql5szzi4vsry76i76483mxf9m5i9620hdshykh5rbfiarvcx";
           system = "huffman";
           asd = "huffman";
@@ -62369,7 +62369,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "humbler" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/humbler/2025-06-22/humbler-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/humbler/2025-06-22/humbler-20250622-git.tgz";
           sha256 = "0vca31p9ngzxzpmy5rshyywc7zy12d413a8rw0y5xd6l1jv9qpjh";
           system = "humbler";
           asd = "humbler";
@@ -62396,7 +62396,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hunchensocket" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hunchensocket/2025-06-22/hunchensocket-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hunchensocket/2025-06-22/hunchensocket-20250622-git.tgz";
           sha256 = "0f8g54gjcmnf6yjz9d0x619p99sf39wzxxb328hdbwfj21ww74nf";
           system = "hunchensocket";
           asd = "hunchensocket";
@@ -62425,7 +62425,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hunchensocket-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hunchensocket/2025-06-22/hunchensocket-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hunchensocket/2025-06-22/hunchensocket-20250622-git.tgz";
           sha256 = "0f8g54gjcmnf6yjz9d0x619p99sf39wzxxb328hdbwfj21ww74nf";
           system = "hunchensocket-tests";
           asd = "hunchensocket-tests";
@@ -62448,7 +62448,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hunchentools" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hunchentools/2016-12-04/hunchentools-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hunchentools/2016-12-04/hunchentools-20161204-git.tgz";
           sha256 = "12r1ml1xxhyz646nnxqzixfisljjaracwp9jhwl3wb285qbmai4b";
           system = "hunchentools";
           asd = "hunchentools";
@@ -62473,7 +62473,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hunchentoot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hunchentoot/2024-10-12/hunchentoot-v1.3.1.tgz";
+          url = "https://beta.quicklisp.org/archive/hunchentoot/2024-10-12/hunchentoot-v1.3.1.tgz";
           sha256 = "0g4lh26l2vd10ilk1hrfmpj6hpjb986jp191ha2j6p2q1pil3kgc";
           system = "hunchentoot";
           asd = "hunchentoot";
@@ -62504,7 +62504,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hunchentoot-auth" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hunchentoot-auth/2014-01-13/hunchentoot-auth-20140113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hunchentoot-auth/2014-01-13/hunchentoot-auth-20140113-git.tgz";
           sha256 = "1bc70lh2jvk6gqmhczgv0indxk6j5whxbh7gylrlbv16041sdkbj";
           system = "hunchentoot-auth";
           asd = "hunchentoot-auth";
@@ -62529,7 +62529,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hunchentoot-cgi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hunchentoot-cgi/2014-02-11/hunchentoot-cgi-20140211-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hunchentoot-cgi/2014-02-11/hunchentoot-cgi-20140211-git.tgz";
           sha256 = "0al6qfs6661avhywsqxh3nwyhl1d1gip3yx57b8siczjarpgpawc";
           system = "hunchentoot-cgi";
           asd = "hunchentoot-cgi";
@@ -62552,7 +62552,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hunchentoot-errors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hunchentoot-errors/2023-10-21/hunchentoot-errors-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hunchentoot-errors/2023-10-21/hunchentoot-errors-20231021-git.tgz";
           sha256 = "0fab7s8qhhs713cw014qqvzm5z61wmxm2fcbkarhg41cz3li9k1j";
           system = "hunchentoot-errors";
           asd = "hunchentoot-errors";
@@ -62577,7 +62577,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hunchentoot-multi-acceptor" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hunchentoot-multi-acceptor/2022-03-31/hunchentoot-multi-acceptor-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hunchentoot-multi-acceptor/2022-03-31/hunchentoot-multi-acceptor-20220331-git.tgz";
           sha256 = "0m42dw8x0bp03n4hx4ppf45gjg14igf69z4rn7dslch6km58mrha";
           system = "hunchentoot-multi-acceptor";
           asd = "hunchentoot-multi-acceptor";
@@ -62602,7 +62602,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hunchentoot-single-signon" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hunchentoot-single-signon/2013-11-11/hunchentoot-single-signon-20131111-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hunchentoot-single-signon/2013-11-11/hunchentoot-single-signon-20131111-git.tgz";
           sha256 = "0dh16k4105isqwnkl52m55m6cbl7g8wmcrym8175r2zr6qcbghq8";
           system = "hunchentoot-single-signon";
           asd = "hunchentoot-single-signon";
@@ -62627,7 +62627,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hunchentoot-stuck-connection-monitor" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hunchentoot-stuck-connection-monitor/2024-10-12/hunchentoot-stuck-connection-monitor-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hunchentoot-stuck-connection-monitor/2024-10-12/hunchentoot-stuck-connection-monitor-20241012-git.tgz";
           sha256 = "1zbpxcym8pi9bf3m7f8f5aa2xhq048kx54sj1ka1vnz7rgccghc6";
           system = "hunchentoot-stuck-connection-monitor";
           asd = "hunchentoot-stuck-connection-monitor";
@@ -62651,7 +62651,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hyperlattices" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hyperlattices/2023-10-21/hyperlattices-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hyperlattices/2023-10-21/hyperlattices-20231021-git.tgz";
           sha256 = "1d0jhy7yv5917bgx1b8r8ch5b94zbg933kx8ak2sbpgsf16pqf2h";
           system = "hyperlattices";
           asd = "hyperlattices";
@@ -62676,7 +62676,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hyperluminal-mem" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hyperluminal-mem/2021-06-30/hyperluminal-mem-20210630-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hyperluminal-mem/2021-06-30/hyperluminal-mem-20210630-git.tgz";
           sha256 = "0qp00g43v518j0wccqnpglkrpikagnn9naphb29wbil6k7y9y7r9";
           system = "hyperluminal-mem";
           asd = "hyperluminal-mem";
@@ -62702,7 +62702,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hyperluminal-mem-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hyperluminal-mem/2021-06-30/hyperluminal-mem-20210630-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hyperluminal-mem/2021-06-30/hyperluminal-mem-20210630-git.tgz";
           sha256 = "0qp00g43v518j0wccqnpglkrpikagnn9naphb29wbil6k7y9y7r9";
           system = "hyperluminal-mem-test";
           asd = "hyperluminal-mem-test";
@@ -62726,7 +62726,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hyperobject" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hyperobject/2020-10-16/hyperobject-20201016-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hyperobject/2020-10-16/hyperobject-20201016-git.tgz";
           sha256 = "1ggqlvwcd52c2d4k8csy7qciaq7lyldi0rpk3b9x4rw4gllcch8n";
           system = "hyperobject";
           asd = "hyperobject";
@@ -62749,7 +62749,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "hyperspec" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hyperspec/2018-12-10/hyperspec-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hyperspec/2018-12-10/hyperspec-20181210-git.tgz";
           sha256 = "0zh1dq2451xw7yiycdr2mrcjx6rgnqnm8c8l9zhhn7hnf51b4x5l";
           system = "hyperspec";
           asd = "hyperspec";
@@ -62769,7 +62769,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ia-hash-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ia-hash-table/2016-03-18/ia-hash-table-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ia-hash-table/2016-03-18/ia-hash-table-20160318-git.tgz";
           sha256 = "11wnwjxa528yyjnfsvw315hyvq3lc996dwx83isdg4hlirj3amy4";
           system = "ia-hash-table";
           asd = "ia-hash-table";
@@ -62792,7 +62792,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ia-hash-table.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ia-hash-table/2016-03-18/ia-hash-table-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ia-hash-table/2016-03-18/ia-hash-table-20160318-git.tgz";
           sha256 = "11wnwjxa528yyjnfsvw315hyvq3lc996dwx83isdg4hlirj3amy4";
           system = "ia-hash-table.test";
           asd = "ia-hash-table.test";
@@ -62819,7 +62819,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "iclendar" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/iclendar/2023-10-21/iclendar-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/iclendar/2023-10-21/iclendar-20231021-git.tgz";
           sha256 = "13ic0zlwrlf6k08x7c8v96kjpbh1dmap15q4cv4in7rkx6rn2rsa";
           system = "iclendar";
           asd = "iclendar";
@@ -62844,7 +62844,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "iconv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-iconv/2017-12-27/cl-iconv-20171227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-iconv/2017-12-27/cl-iconv-20171227-git.tgz";
           sha256 = "1lpw95c02inifhdh9kkab9q92i5w9zd788dww1wly2p0a6kyx9wg";
           system = "iconv";
           asd = "iconv";
@@ -62867,7 +62867,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "id3v2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/id3v2/2016-02-08/id3v2-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/id3v2/2016-02-08/id3v2-20160208-git.tgz";
           sha256 = "0x017dfh9m80b8ml2vsgdcfs4kv7p06yzmwdilf1k8nfsilwpfra";
           system = "id3v2";
           asd = "id3v2";
@@ -62890,7 +62890,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "id3v2-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/id3v2/2016-02-08/id3v2-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/id3v2/2016-02-08/id3v2-20160208-git.tgz";
           sha256 = "0x017dfh9m80b8ml2vsgdcfs4kv7p06yzmwdilf1k8nfsilwpfra";
           system = "id3v2-test";
           asd = "id3v2-test";
@@ -62915,7 +62915,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "identifier-pool" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/identifier-pool/2022-07-07/identifier-pool-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/identifier-pool/2022-07-07/identifier-pool-20220707-git.tgz";
           sha256 = "01fs960s02nf8m3a5v95r12magq9rvgcc3awcppqa7c8yg7qdc55";
           system = "identifier-pool";
           asd = "identifier-pool";
@@ -62938,7 +62938,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "idna" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz";
           sha256 = "00nbr3mffxhlq14gg9d16pa6691s4qh35inyw76v906s77khm5a2";
           system = "idna";
           asd = "idna";
@@ -62956,7 +62956,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ieee-floats" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ieee-floats/2022-02-20/ieee-floats-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ieee-floats/2022-02-20/ieee-floats-20220220-git.tgz";
           sha256 = "0qp2dxq9jzndjfmc8nh0fvcwrrxjm7f012biczipifjckp9gxw7d";
           system = "ieee-floats";
           asd = "ieee-floats";
@@ -62974,7 +62974,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "illogical-pathnames" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/illogical-pathnames/2016-08-25/illogical-pathnames-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/illogical-pathnames/2016-08-25/illogical-pathnames-20160825-git.tgz";
           sha256 = "1yjs1lzgak1d3hz2q6sbac98vqgdxp0dz72fskpz73vrbp6h6da5";
           system = "illogical-pathnames";
           asd = "illogical-pathnames";
@@ -62994,7 +62994,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "illusion" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/illusion/2018-08-31/illusion-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/illusion/2018-08-31/illusion-20180831-git.tgz";
           sha256 = "05wik6q8hlhm7szzymkljfigcp7z35j6rz2ihsmng1y6zq9crk7z";
           system = "illusion";
           asd = "illusion";
@@ -63018,7 +63018,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "illusion-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/illusion/2018-08-31/illusion-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/illusion/2018-08-31/illusion-20180831-git.tgz";
           sha256 = "05wik6q8hlhm7szzymkljfigcp7z35j6rz2ihsmng1y6zq9crk7z";
           system = "illusion-test";
           asd = "illusion-test";
@@ -63042,7 +63042,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "image" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/image/2012-01-07/image-20120107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/image/2012-01-07/image-20120107-git.tgz";
           sha256 = "04by1snzw2kpw208fdi2azxbq5y2q2r6x8zkdh7jk43amkr18f5k";
           system = "image";
           asd = "image";
@@ -63067,7 +63067,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "image-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz";
           sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4";
           system = "image-test";
           asd = "image-test";
@@ -63087,7 +63087,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "image-utility" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "image-utility";
           asd = "image-utility";
@@ -63107,7 +63107,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "imago" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/imago/2025-06-22/imago-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/imago/2025-06-22/imago-20250622-git.tgz";
           sha256 = "17bfxp9z9hyi6sh382371fb822lqkgw1lrc1vvspsayax126yhpl";
           system = "imago";
           asd = "imago";
@@ -63135,7 +63135,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "immutable-struct" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/immutable-struct/2015-07-09/immutable-struct-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/immutable-struct/2015-07-09/immutable-struct-20150709-git.tgz";
           sha256 = "02868d21hcc0kc3jw8afx23kj6iy1vyf2pddn8yqfrkpldhd0rv9";
           system = "immutable-struct";
           asd = "immutable-struct";
@@ -63159,7 +63159,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "in-nomine" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/in-nomine/2024-10-12/in-nomine-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/in-nomine/2024-10-12/in-nomine-20241012-git.tgz";
           sha256 = "1wcfxqj5dfmkg94rnz2nsmyw8iwicncxmklnirlngqqvlcrd0rv4";
           system = "in-nomine";
           asd = "in-nomine";
@@ -63182,7 +63182,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "incf-cl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/incf-cl/2019-07-10/incf-cl-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/incf-cl/2019-07-10/incf-cl-20190710-git.tgz";
           sha256 = "1yvwb57dzccvd2lw2h3mwxgbi8ml3cgkyy8kl8hwhd4s8c016ibb";
           system = "incf-cl";
           asd = "incf-cl";
@@ -63202,7 +63202,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "incless" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz";
           sha256 = "1ypxhsx3fqwfng3b425bsgxbra7asny9261amdbfd6p59r51cyiy";
           system = "incless";
           asd = "incless";
@@ -63222,7 +63222,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "incless-extrinsic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz";
           sha256 = "1ypxhsx3fqwfng3b425bsgxbra7asny9261amdbfd6p59r51cyiy";
           system = "incless-extrinsic";
           asd = "incless-extrinsic";
@@ -63245,7 +63245,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "incless-native" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz";
           sha256 = "1ypxhsx3fqwfng3b425bsgxbra7asny9261amdbfd6p59r51cyiy";
           system = "incless-native";
           asd = "incless-native";
@@ -63265,7 +63265,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "incognito-keywords" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/incognito-keywords/2013-01-28/incognito-keywords-1.1.tgz";
+          url = "https://beta.quicklisp.org/archive/incognito-keywords/2013-01-28/incognito-keywords-1.1.tgz";
           sha256 = "1ignvz8v7bq8z9x22skzp1xsna2bxqcw22zh5sp9v2ndbjhqri5c";
           system = "incognito-keywords";
           asd = "incognito-keywords";
@@ -63288,7 +63288,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "incongruent-methods" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/incongruent-methods/2013-03-12/incongruent-methods-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/incongruent-methods/2013-03-12/incongruent-methods-20130312-git.tgz";
           sha256 = "15xfbpnqymbkk92vbirvccxcphyvjmxcw02yv1zs6c78aaf4ms9z";
           system = "incongruent-methods";
           asd = "incongruent-methods";
@@ -63308,7 +63308,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inferior-shell" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inferior-shell/2024-10-12/inferior-shell-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inferior-shell/2024-10-12/inferior-shell-20241012-git.tgz";
           sha256 = "1bmw0jjcpssahymqidz159pqbz5ficz56w7b97hfy1xnwkd2fwg5";
           system = "inferior-shell";
           asd = "inferior-shell";
@@ -63333,7 +63333,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "infix" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
           sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "infix";
           asd = "infix";
@@ -63353,7 +63353,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "infix-dollar-reader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/infix-dollar-reader/2012-10-13/infix-dollar-reader-20121013-git.tgz";
+          url = "https://beta.quicklisp.org/archive/infix-dollar-reader/2012-10-13/infix-dollar-reader-20121013-git.tgz";
           sha256 = "11sf4kqcw8s0zcjz1qpbhkn33rizvq5ijl6xp59q9wadvkd0wx0w";
           system = "infix-dollar-reader";
           asd = "infix-dollar-reader";
@@ -63373,7 +63373,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "infix-dollar-reader-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/infix-dollar-reader/2012-10-13/infix-dollar-reader-20121013-git.tgz";
+          url = "https://beta.quicklisp.org/archive/infix-dollar-reader/2012-10-13/infix-dollar-reader-20121013-git.tgz";
           sha256 = "11sf4kqcw8s0zcjz1qpbhkn33rizvq5ijl6xp59q9wadvkd0wx0w";
           system = "infix-dollar-reader-test";
           asd = "infix-dollar-reader-test";
@@ -63396,7 +63396,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "infix-math" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/infix-math/2021-10-20/infix-math-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/infix-math/2021-10-20/infix-math-20211020-git.tgz";
           sha256 = "1h6p254xl793wfq3qla5y95k6zimy477f8brblx6ran3rg3bydbg";
           system = "infix-math";
           asd = "infix-math";
@@ -63422,7 +63422,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "infix-reader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/infix-reader/2022-11-06/infix-reader-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/infix-reader/2022-11-06/infix-reader-20221106-git.tgz";
           sha256 = "16b6cw4w80p3yxsv0pqaiq0ay1v3jswlav2mlfsmhawpvhxsmb7z";
           system = "infix-reader";
           asd = "infix-reader";
@@ -63442,7 +63442,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inheriting-readers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inheriting-readers/2021-01-24/inheriting-readers_1.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/inheriting-readers/2021-01-24/inheriting-readers_1.0.1.tgz";
           sha256 = "0km3mq6vx1q9qv6j3r4sqqcsdbnb5jar66bl0mzzpaacfvzbx68p";
           system = "inheriting-readers";
           asd = "inheriting-readers";
@@ -63466,7 +63466,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inheriting-readers_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inheriting-readers/2021-01-24/inheriting-readers_1.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/inheriting-readers/2021-01-24/inheriting-readers_1.0.1.tgz";
           sha256 = "0km3mq6vx1q9qv6j3r4sqqcsdbnb5jar66bl0mzzpaacfvzbx68p";
           system = "inheriting-readers_tests";
           asd = "inheriting-readers_tests";
@@ -63490,7 +63490,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "injection" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/injection/2016-05-31/injection-20160531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/injection/2016-05-31/injection-20160531-git.tgz";
           sha256 = "12f838ikgyl7gzh2dnqh54hfa8rncbkk266bsibmbbqxz0cn2da7";
           system = "injection";
           asd = "injection";
@@ -63510,7 +63510,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "injection-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/injection/2016-05-31/injection-20160531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/injection/2016-05-31/injection-20160531-git.tgz";
           sha256 = "12f838ikgyl7gzh2dnqh54hfa8rncbkk266bsibmbbqxz0cn2da7";
           system = "injection-test";
           asd = "injection-test";
@@ -63533,7 +63533,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inkwell" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inkwell/2023-10-21/inkwell-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inkwell/2023-10-21/inkwell-20231021-git.tgz";
           sha256 = "07yxgs2zfnyr158v8q2s4npvzjzmpifx61hg7fc17dsmqgw296yc";
           system = "inkwell";
           asd = "inkwell";
@@ -63559,7 +63559,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inlined-generic-function" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inlined-generic-function/2019-05-21/inlined-generic-function-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inlined-generic-function/2019-05-21/inlined-generic-function-20190521-git.tgz";
           sha256 = "0kj9p99m9hwx4lx95npfln5dc5ip884f8agjc6h4y0rhnpj7r8gk";
           system = "inlined-generic-function";
           asd = "inlined-generic-function";
@@ -63585,7 +63585,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inlined-generic-function.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inlined-generic-function/2019-05-21/inlined-generic-function-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inlined-generic-function/2019-05-21/inlined-generic-function-20190521-git.tgz";
           sha256 = "0kj9p99m9hwx4lx95npfln5dc5ip884f8agjc6h4y0rhnpj7r8gk";
           system = "inlined-generic-function.test";
           asd = "inlined-generic-function.test";
@@ -63608,7 +63608,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inner-conditional" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inner-conditional/2020-09-25/inner-conditional-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inner-conditional/2020-09-25/inner-conditional-20200925-git.tgz";
           sha256 = "08vaq29l2bhv4n1c6zb3syddwpad66rghfy71fqidjvbag0ji71k";
           system = "inner-conditional";
           asd = "inner-conditional";
@@ -63633,7 +63633,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inner-conditional-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inner-conditional/2020-09-25/inner-conditional-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inner-conditional/2020-09-25/inner-conditional-20200925-git.tgz";
           sha256 = "08vaq29l2bhv4n1c6zb3syddwpad66rghfy71fqidjvbag0ji71k";
           system = "inner-conditional-test";
           asd = "inner-conditional-test";
@@ -63656,7 +63656,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inotify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inotify/2015-06-08/inotify-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inotify/2015-06-08/inotify-20150608-git.tgz";
           sha256 = "0jill05wsa7xbnkycc1ik1a05slv2h34fpyap2rxbnxvfjvyzw98";
           system = "inotify";
           asd = "inotify";
@@ -63680,7 +63680,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "input-event-codes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/input-event-codes/2022-11-06/input-event-codes-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/input-event-codes/2022-11-06/input-event-codes-20221106-git.tgz";
           sha256 = "1m96m9ia4frcn2xqaw4mfspjjzwl8gyj4k4rv0lq28va4s6mkgii";
           system = "input-event-codes";
           asd = "input-event-codes";
@@ -63700,7 +63700,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inquisitor" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz";
           sha256 = "08rkmqnwlq6v84wcz9yp31j5lxrsy33kv3dh7n3ccsg4kc54slzw";
           system = "inquisitor";
           asd = "inquisitor";
@@ -63723,7 +63723,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inquisitor-flexi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz";
           sha256 = "08rkmqnwlq6v84wcz9yp31j5lxrsy33kv3dh7n3ccsg4kc54slzw";
           system = "inquisitor-flexi";
           asd = "inquisitor-flexi";
@@ -63746,7 +63746,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inquisitor-flexi-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz";
           sha256 = "08rkmqnwlq6v84wcz9yp31j5lxrsy33kv3dh7n3ccsg4kc54slzw";
           system = "inquisitor-flexi-test";
           asd = "inquisitor-flexi-test";
@@ -63770,7 +63770,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inquisitor-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz";
           sha256 = "08rkmqnwlq6v84wcz9yp31j5lxrsy33kv3dh7n3ccsg4kc54slzw";
           system = "inquisitor-test";
           asd = "inquisitor-test";
@@ -63796,7 +63796,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inravina" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz";
           sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3";
           system = "inravina";
           asd = "inravina";
@@ -63819,7 +63819,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inravina-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz";
           sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3";
           system = "inravina-examples";
           asd = "inravina-examples";
@@ -63842,7 +63842,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inravina-extrinsic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz";
           sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3";
           system = "inravina-extrinsic";
           asd = "inravina-extrinsic";
@@ -63865,7 +63865,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inravina-native" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz";
           sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3";
           system = "inravina-native";
           asd = "inravina-native";
@@ -63885,7 +63885,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "inravina-shim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz";
           sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3";
           system = "inravina-shim";
           asd = "inravina-shim";
@@ -63909,7 +63909,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "instance-tracking" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/instance-tracking/2022-11-06/instance-tracking-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/instance-tracking/2022-11-06/instance-tracking-20221106-git.tgz";
           sha256 = "0bbxvl14ahws30x5dgjhilhybjgn1jfcbxwr8ji1ls31zf88fphr";
           system = "instance-tracking";
           asd = "instance-tracking";
@@ -63929,7 +63929,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "integral" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/integral/2020-03-25/integral-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/integral/2020-03-25/integral-20200325-git.tgz";
           sha256 = "17a9wg7n3f81fsi5mlsdxain1fw7ggfniipfrb9sr1ajff6lx9gs";
           system = "integral";
           asd = "integral";
@@ -63961,7 +63961,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "integral-rest" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/integral-rest/2015-09-23/integral-rest-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/integral-rest/2015-09-23/integral-rest-20150923-git.tgz";
           sha256 = "0187d9i7acw2v1hhy7wcz0vk90ji7cdgpaikb7admvzq0nnbzrmm";
           system = "integral-rest";
           asd = "integral-rest";
@@ -63989,7 +63989,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "integral-rest-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/integral-rest/2015-09-23/integral-rest-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/integral-rest/2015-09-23/integral-rest-20150923-git.tgz";
           sha256 = "0187d9i7acw2v1hhy7wcz0vk90ji7cdgpaikb7admvzq0nnbzrmm";
           system = "integral-rest-test";
           asd = "integral-rest-test";
@@ -64014,7 +64014,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "integral-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/integral/2020-03-25/integral-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/integral/2020-03-25/integral-20200325-git.tgz";
           sha256 = "17a9wg7n3f81fsi5mlsdxain1fw7ggfniipfrb9sr1ajff6lx9gs";
           system = "integral-test";
           asd = "integral-test";
@@ -64040,7 +64040,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "intel-hex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/intel-hex/2016-03-18/intel-hex-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/intel-hex/2016-03-18/intel-hex-20160318-git.tgz";
           sha256 = "0sz51qw262nh6ziwpy1kgv257nj56rp42s0g6g2rx3xv1ijdy395";
           system = "intel-hex";
           asd = "intel-hex";
@@ -64060,7 +64060,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "intel-hex-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/intel-hex/2016-03-18/intel-hex-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/intel-hex/2016-03-18/intel-hex-20160318-git.tgz";
           sha256 = "0sz51qw262nh6ziwpy1kgv257nj56rp42s0g6g2rx3xv1ijdy395";
           system = "intel-hex-test";
           asd = "intel-hex-test";
@@ -64084,7 +64084,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "interact" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/interact/2025-06-22/interact-production-86dd9553-git.tgz";
+          url = "https://beta.quicklisp.org/archive/interact/2025-06-22/interact-production-86dd9553-git.tgz";
           sha256 = "10076p3vlb3a7106gdl44sil8b63ama7svbf9smgbbs40c1657ba";
           system = "interact";
           asd = "interact";
@@ -64108,7 +64108,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "intercom" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/intercom/2013-06-15/intercom-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/intercom/2013-06-15/intercom-20130615-git.tgz";
           sha256 = "017klgjsza4cxdxms4hxgrfrwjshkcr2yyxnhg14zs9w0vjwkikl";
           system = "intercom";
           asd = "intercom";
@@ -64134,7 +64134,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "intercom-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/intercom/2013-06-15/intercom-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/intercom/2013-06-15/intercom-20130615-git.tgz";
           sha256 = "017klgjsza4cxdxms4hxgrfrwjshkcr2yyxnhg14zs9w0vjwkikl";
           system = "intercom-examples";
           asd = "intercom-examples";
@@ -64157,7 +64157,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "interface" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/interface/2023-06-18/interface-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/interface/2023-06-18/interface-20230618-git.tgz";
           sha256 = "0h1bckhyig2znl6nrd3agjzz7knrm2kyh2vfyk7j60kzki9rpzxy";
           system = "interface";
           asd = "interface";
@@ -64180,7 +64180,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "interfaces-test-implementation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/modularize-interfaces/2023-10-21/modularize-interfaces-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/modularize-interfaces/2023-10-21/modularize-interfaces-20231021-git.tgz";
           sha256 = "0lmq2jbkbr5wrrjl2qb1x64fcvl0lmii0h9301b9bq4d47s4w8sh";
           system = "interfaces-test-implementation";
           asd = "interfaces-test-implementation";
@@ -64203,7 +64203,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "introspect-environment" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/introspect-environment/2024-10-12/introspect-environment-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/introspect-environment/2024-10-12/introspect-environment-20241012-git.tgz";
           sha256 = "1jll8h1fmf9i8nk3j3hrh62s858fzmly22zb690a2hnb685w3zlf";
           system = "introspect-environment";
           asd = "introspect-environment";
@@ -64221,7 +64221,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "introspect-environment-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/introspect-environment/2024-10-12/introspect-environment-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/introspect-environment/2024-10-12/introspect-environment-20241012-git.tgz";
           sha256 = "1jll8h1fmf9i8nk3j3hrh62s858fzmly22zb690a2hnb685w3zlf";
           system = "introspect-environment-test";
           asd = "introspect-environment-test";
@@ -64244,7 +64244,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "invistra" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz";
           sha256 = "1wkf5hi8939bxd39psbzc11w7xvqdfl1z6192spk7s73i3ql9s9x";
           system = "invistra";
           asd = "invistra";
@@ -64269,7 +64269,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "invistra-extrinsic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz";
           sha256 = "1wkf5hi8939bxd39psbzc11w7xvqdfl1z6192spk7s73i3ql9s9x";
           system = "invistra-extrinsic";
           asd = "invistra-extrinsic";
@@ -64292,7 +64292,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "invistra-numeral" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/invistra/2025-06-22/invistra-20250622-git.tgz";
           sha256 = "1wkf5hi8939bxd39psbzc11w7xvqdfl1z6192spk7s73i3ql9s9x";
           system = "invistra-numeral";
           asd = "invistra-numeral";
@@ -64312,7 +64312,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "iolib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz";
+          url = "https://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz";
           sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq";
           system = "iolib";
           asd = "iolib";
@@ -64341,7 +64341,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "iolib.asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz";
+          url = "https://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz";
           sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq";
           system = "iolib.asdf";
           asd = "iolib.asdf";
@@ -64359,7 +64359,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "iolib.base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz";
+          url = "https://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz";
           sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq";
           system = "iolib.base";
           asd = "iolib.base";
@@ -64383,7 +64383,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "iolib.common-lisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz";
+          url = "https://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz";
           sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq";
           system = "iolib.common-lisp";
           asd = "iolib.common-lisp";
@@ -64405,7 +64405,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "iolib.conf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz";
+          url = "https://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz";
           sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq";
           system = "iolib.conf";
           asd = "iolib.conf";
@@ -64423,7 +64423,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "iolib.examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz";
+          url = "https://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz";
           sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq";
           system = "iolib.examples";
           asd = "iolib.examples";
@@ -64449,7 +64449,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ip-interfaces" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ip-interfaces/2018-12-10/ip-interfaces-0.2.1.tgz";
+          url = "https://beta.quicklisp.org/archive/ip-interfaces/2018-12-10/ip-interfaces-0.2.1.tgz";
           sha256 = "035sc4li0qz4lzjn555h8r2qkhc8a65zglk30f1b3pi9p44g91mw";
           system = "ip-interfaces";
           asd = "ip-interfaces";
@@ -64469,7 +64469,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ip-interfaces-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ip-interfaces/2018-12-10/ip-interfaces-0.2.1.tgz";
+          url = "https://beta.quicklisp.org/archive/ip-interfaces/2018-12-10/ip-interfaces-0.2.1.tgz";
           sha256 = "035sc4li0qz4lzjn555h8r2qkhc8a65zglk30f1b3pi9p44g91mw";
           system = "ip-interfaces-test";
           asd = "ip-interfaces-test";
@@ -64493,7 +64493,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "irc-logger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/irc-logger/2015-09-23/irc-logger-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/irc-logger/2015-09-23/irc-logger-20150923-git.tgz";
           sha256 = "1ylq8qnf29dij7133p19cmmmw3i7w6azncsdvpd4j0k1fqp14bq7";
           system = "irc-logger";
           asd = "irc-logger";
@@ -64516,7 +64516,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ironclad" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ironclad/2024-10-12/ironclad-v0.61.tgz";
+          url = "https://beta.quicklisp.org/archive/ironclad/2024-10-12/ironclad-v0.61.tgz";
           sha256 = "1yszjy6a0q1jvdgd7fpmnvi9851s8ivp4plscw27lbnl7jlj1pmk";
           system = "ironclad";
           asd = "ironclad";
@@ -64534,7 +64534,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ironclad-text" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ironclad/2024-10-12/ironclad-v0.61.tgz";
+          url = "https://beta.quicklisp.org/archive/ironclad/2024-10-12/ironclad-v0.61.tgz";
           sha256 = "1yszjy6a0q1jvdgd7fpmnvi9851s8ivp4plscw27lbnl7jlj1pmk";
           system = "ironclad-text";
           asd = "ironclad-text";
@@ -64557,7 +64557,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "isolated" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-isolated/2020-02-18/cl-isolated-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-isolated/2020-02-18/cl-isolated-20200218-git.tgz";
           sha256 = "01wbis4dw2cy7d2yh30rwvmlx3dr5s9dx8hs19xhjpznjbqfyksi";
           system = "isolated";
           asd = "isolated";
@@ -64577,7 +64577,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "issr" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/hunchenissr/2021-10-20/hunchenissr-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/hunchenissr/2021-10-20/hunchenissr-20211020-git.tgz";
           sha256 = "1dfm7zdvyj14my8giznq1vsy20nj7my71y7a657slhf6v2cap5vs";
           system = "issr";
           asd = "issr";
@@ -64610,7 +64610,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "issr-core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/core/2021-02-28/core-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/core/2021-02-28/core-20210228-git.tgz";
           sha256 = "1bajb09crzadkirdpd6jrpcc55irjd4sxzavygr25l85pafyhniw";
           system = "issr-core";
           asd = "issr-core";
@@ -64635,7 +64635,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "iterate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/iterate/2021-05-31/iterate-release-b0f9a9c6-git.tgz";
+          url = "https://beta.quicklisp.org/archive/iterate/2021-05-31/iterate-release-b0f9a9c6-git.tgz";
           sha256 = "09xq2mdr97hagjrjpc47mp8l9wfp697aa9qaqmsy0yskayzg6xsc";
           system = "iterate";
           asd = "iterate";
@@ -64653,7 +64653,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "iterate-clsql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/iterate-clsql/2013-03-12/iterate-clsql-20130312-http.tgz";
+          url = "https://beta.quicklisp.org/archive/iterate-clsql/2013-03-12/iterate-clsql-20130312-http.tgz";
           sha256 = "0adfs31zin5kkg9z5kyzykf8gmcgr600vvi4mjx7nixybh326h3h";
           system = "iterate-clsql";
           asd = "iterate-clsql";
@@ -64676,7 +64676,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ixf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-ixf/2018-02-28/cl-ixf-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-ixf/2018-02-28/cl-ixf-20180228-git.tgz";
           sha256 = "1wjdnf4vr9z7lcfc49kl43g6l2i23q9n81siy494k17d766cdvqa";
           system = "ixf";
           asd = "ixf";
@@ -64704,7 +64704,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jenkins.api" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jenkins/2013-03-12/jenkins-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jenkins/2013-03-12/jenkins-20130312-git.tgz";
           sha256 = "1kis95k3fwlaq2jbpia0wps4gq461w6p57dxlbvb0c6a5dgh4dwf";
           system = "jenkins.api";
           asd = "jenkins.api";
@@ -64736,7 +64736,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz";
           sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4";
           system = "jingle";
           asd = "jingle";
@@ -64770,7 +64770,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingle.demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz";
           sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4";
           system = "jingle.demo";
           asd = "jingle.demo";
@@ -64801,7 +64801,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingle.demo.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz";
           sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4";
           system = "jingle.demo.test";
           asd = "jingle.demo.test";
@@ -64824,7 +64824,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingle.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-jingle/2025-06-22/cl-jingle-20250622-git.tgz";
           sha256 = "1rvv7a3qwm0wliszinkv7acscyqf099h6xl81c40is67zw42azd4";
           system = "jingle.test";
           asd = "jingle.test";
@@ -64847,7 +64847,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh";
           asd = "jingoh";
@@ -64873,7 +64873,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh.documentizer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh.documentizer";
           asd = "jingoh.documentizer";
@@ -64899,7 +64899,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh.documentizer.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh.documentizer.test";
           asd = "jingoh.documentizer.test";
@@ -64922,7 +64922,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh.examiner" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh.examiner";
           asd = "jingoh.examiner";
@@ -64947,7 +64947,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh.examiner.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh.examiner.test";
           asd = "jingoh.examiner.test";
@@ -64971,7 +64971,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh.generator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh.generator";
           asd = "jingoh.generator";
@@ -65001,7 +65001,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh.generator.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh.generator.test";
           asd = "jingoh.generator.test";
@@ -65024,7 +65024,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh.org" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh.org";
           asd = "jingoh.org";
@@ -65048,7 +65048,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh.org.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh.org.test";
           asd = "jingoh.org.test";
@@ -65071,7 +65071,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh.parallel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh.parallel";
           asd = "jingoh.parallel";
@@ -65096,7 +65096,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh.parallel.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh.parallel.test";
           asd = "jingoh.parallel.test";
@@ -65119,7 +65119,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh.reader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh.reader";
           asd = "jingoh.reader";
@@ -65144,7 +65144,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh.reader.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh.reader.test";
           asd = "jingoh.reader.test";
@@ -65167,7 +65167,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh.tester" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh.tester";
           asd = "jingoh.tester";
@@ -65200,7 +65200,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jingoh.tester.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz";
           sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r";
           system = "jingoh.tester.test";
           asd = "jingoh.tester.test";
@@ -65223,7 +65223,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jonathan" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz";
           sha256 = "1l4sfxfmijibsvkbszikzslw1yy8z52ml9may1w2s0ay7lg7rsng";
           system = "jonathan";
           asd = "jonathan";
@@ -65250,7 +65250,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jonathan-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz";
           sha256 = "1l4sfxfmijibsvkbszikzslw1yy8z52ml9may1w2s0ay7lg7rsng";
           system = "jonathan-test";
           asd = "jonathan-test";
@@ -65275,7 +65275,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jose" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jose/2025-06-22/jose-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jose/2025-06-22/jose-20250622-git.tgz";
           sha256 = "18xy51sqkdcyxd7my1nd9jdhzxc9g77x8bh8ycr0y5fmkvpzmmkv";
           system = "jose";
           asd = "jose";
@@ -65303,7 +65303,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "journal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/journal/2025-06-22/journal-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/journal/2025-06-22/journal-20250622-git.tgz";
           sha256 = "0flv7rikhgsm8074wmhi0wa16n9j5dcaif3xjm65ljmzj48m8qp1";
           system = "journal";
           asd = "journal";
@@ -65330,7 +65330,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jp-numeral" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jp-numeral/2022-11-06/jp-numeral-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jp-numeral/2022-11-06/jp-numeral-20221106-git.tgz";
           sha256 = "1xqvah6mjd8lb2n19wzsn29q6az9kx1c48js3yj0ij73kjncby30";
           system = "jp-numeral";
           asd = "jp-numeral";
@@ -65353,7 +65353,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jp-numeral-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jp-numeral/2022-11-06/jp-numeral-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jp-numeral/2022-11-06/jp-numeral-20221106-git.tgz";
           sha256 = "1xqvah6mjd8lb2n19wzsn29q6az9kx1c48js3yj0ij73kjncby30";
           system = "jp-numeral-test";
           asd = "jp-numeral-test";
@@ -65377,7 +65377,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jpeg-turbo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jpeg-turbo/2020-12-20/jpeg-turbo-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jpeg-turbo/2020-12-20/jpeg-turbo-20201220-git.tgz";
           sha256 = "1andd1ibbk3224idnpsnrn96flr5d1wm9ja3di57fs04wn577sag";
           system = "jpeg-turbo";
           asd = "jpeg-turbo";
@@ -65400,7 +65400,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jpl-queues" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jpl-queues/2010-10-06/jpl-queues-0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/jpl-queues/2010-10-06/jpl-queues-0.1.tgz";
           sha256 = "1xgddsfa1gr0cjmdlc304j3msxi8w2fyk9i497x56kmkif7pkj88";
           system = "jpl-queues";
           asd = "jpl-queues";
@@ -65421,7 +65421,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jpl-util" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-jpl-util/2015-10-31/cl-jpl-util-20151031-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-jpl-util/2015-10-31/cl-jpl-util-20151031-git.tgz";
           sha256 = "0nc0rk9n8grkg3045xsw34whmcmddn2sfrxki4268g7kpgz0d2yz";
           system = "jpl-util";
           asd = "jpl-util";
@@ -65439,7 +65439,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "js-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/js-parser/2015-04-07/js-parser-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/js-parser/2015-04-07/js-parser-20150407-git.tgz";
           sha256 = "0hqw515vyhrv1as5sfn3l792ddjps85zbzpblr2cjyq9dmdrg89a";
           system = "js-parser";
           asd = "js-parser";
@@ -65459,7 +65459,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "js-parser-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/js-parser/2015-04-07/js-parser-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/js-parser/2015-04-07/js-parser-20150407-git.tgz";
           sha256 = "0hqw515vyhrv1as5sfn3l792ddjps85zbzpblr2cjyq9dmdrg89a";
           system = "js-parser-tests";
           asd = "js-parser-tests";
@@ -65479,7 +65479,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "json-lib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/json-lib/2023-06-18/json-lib-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/json-lib/2023-06-18/json-lib-20230618-git.tgz";
           sha256 = "08cbnj6h53ifwm6kk5pvpxmy2a11kiph9zjccd2ml3fj6257krpv";
           system = "json-lib";
           asd = "json-lib";
@@ -65505,7 +65505,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "json-mop" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/json-mop/2024-10-12/json-mop-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/json-mop/2024-10-12/json-mop-20241012-git.tgz";
           sha256 = "1q6mmq64hf4v448bnzfh8nxsxg5h18a9snh785r1fnvv1aij3fi1";
           system = "json-mop";
           asd = "json-mop";
@@ -65529,7 +65529,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "json-mop-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/json-mop/2024-10-12/json-mop-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/json-mop/2024-10-12/json-mop-20241012-git.tgz";
           sha256 = "1q6mmq64hf4v448bnzfh8nxsxg5h18a9snh785r1fnvv1aij3fi1";
           system = "json-mop-tests";
           asd = "json-mop-tests";
@@ -65552,7 +65552,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "json-responses" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/json-responses/2019-03-07/json-responses-20190307-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/json-responses/2019-03-07/json-responses-20190307-hg.tgz";
           sha256 = "0f1hrs3rhi6qn0r8qd3fbsknn417b8v8b4s4989yfwfvnf922g05";
           system = "json-responses";
           asd = "json-responses";
@@ -65575,7 +65575,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "json-responses-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/json-responses/2019-03-07/json-responses-20190307-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/json-responses/2019-03-07/json-responses-20190307-hg.tgz";
           sha256 = "0f1hrs3rhi6qn0r8qd3fbsknn417b8v8b4s4989yfwfvnf922g05";
           system = "json-responses-test";
           asd = "json-responses";
@@ -65598,7 +65598,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "json-schema" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/json-schema/2022-11-06/json-schema-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/json-schema/2022-11-06/json-schema-20221106-git.tgz";
           sha256 = "11rgnj14p8x059zx8hs02jji1p69v8kix783vf557zpcbydrw2mn";
           system = "json-schema";
           asd = "json-schema";
@@ -65631,7 +65631,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "json-streams" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/json-streams/2017-10-19/json-streams-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/json-streams/2017-10-19/json-streams-20171019-git.tgz";
           sha256 = "0cia3721im04q73dfkd688d8splgpz03qa4h8s3r39kar4w3xll2";
           system = "json-streams";
           asd = "json-streams";
@@ -65651,7 +65651,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "json-streams-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/json-streams/2017-10-19/json-streams-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/json-streams/2017-10-19/json-streams-20171019-git.tgz";
           sha256 = "0cia3721im04q73dfkd688d8splgpz03qa4h8s3r39kar4w3xll2";
           system = "json-streams-tests";
           asd = "json-streams-tests";
@@ -65675,7 +65675,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "json-test-suite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rs-json/2023-06-18/rs-json-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rs-json/2023-06-18/rs-json-20230618-git.tgz";
           sha256 = "0y71as0sg5vfijpzdhv6pj6yv064ldn2shx0y4da8kvaqv949dnq";
           system = "json-test-suite";
           asd = "json-test-suite";
@@ -65695,7 +65695,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jsonrpc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jsonrpc/2025-06-22/jsonrpc-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jsonrpc/2025-06-22/jsonrpc-20250622-git.tgz";
           sha256 = "0kd550fsklsc4h0fj8jl6g4z5ldb8ba9dn68s7ykv3myaiwgsy1p";
           system = "jsonrpc";
           asd = "jsonrpc";
@@ -65724,7 +65724,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jsown" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jsown/2020-02-18/jsown-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jsown/2020-02-18/jsown-20200218-git.tgz";
           sha256 = "0gadvmf1d9bq35s61z76psrsnzwwk12svi66jigf491hv48wigw7";
           system = "jsown";
           asd = "jsown";
@@ -65742,7 +65742,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jsown-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jsown/2020-02-18/jsown-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jsown/2020-02-18/jsown-20200218-git.tgz";
           sha256 = "0gadvmf1d9bq35s61z76psrsnzwwk12svi66jigf491hv48wigw7";
           system = "jsown-tests";
           asd = "jsown-tests";
@@ -65765,7 +65765,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jsown-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jsown-utils/2022-07-07/jsown-utils-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jsown-utils/2022-07-07/jsown-utils-20220707-git.tgz";
           sha256 = "046a18fywkim0jbnpls5zqdv65j1kwl268p4dbdd2dxgx050fwak";
           system = "jsown-utils";
           asd = "jsown-utils";
@@ -65788,7 +65788,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jupyter-lab-extension" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/common-lisp-jupyter/2025-06-22/common-lisp-jupyter-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/common-lisp-jupyter/2025-06-22/common-lisp-jupyter-20250622-git.tgz";
           sha256 = "0xm3a68dn3mlq4gyiqfndf61agh1bj5fp1cqhsscz53zjcnrb2yb";
           system = "jupyter-lab-extension";
           asd = "jupyter-lab-extension";
@@ -65808,7 +65808,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "just-getopt-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-just-getopt-parser/2021-12-09/cl-just-getopt-parser-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-just-getopt-parser/2021-12-09/cl-just-getopt-parser-20211209-git.tgz";
           sha256 = "0ngh8b51ngh3bqacl40j6wwiinhwxswsy02d9k7qlzv9sbjxay4s";
           system = "just-getopt-parser";
           asd = "just-getopt-parser";
@@ -65828,7 +65828,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jwacs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jwacs/2018-02-28/jwacs-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jwacs/2018-02-28/jwacs-20180228-git.tgz";
           sha256 = "1wzln3bjjmdv040i339dsm48a1sc2cnwhh4z066x2wkl5ka7j5b2";
           system = "jwacs";
           asd = "jwacs";
@@ -65848,7 +65848,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "jwacs-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/jwacs/2018-02-28/jwacs-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/jwacs/2018-02-28/jwacs-20180228-git.tgz";
           sha256 = "1wzln3bjjmdv040i339dsm48a1sc2cnwhh4z066x2wkl5ka7j5b2";
           system = "jwacs-tests";
           asd = "jwacs-tests";
@@ -65868,7 +65868,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "kanren-trs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-kanren-trs/2012-03-05/cl-kanren-trs-20120305-svn.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-kanren-trs/2012-03-05/cl-kanren-trs-20120305-svn.tgz";
           sha256 = "1r9xyickdkkqcaa7abvks4hqwjb7s95lcrym026c1w6ciibiypr7";
           system = "kanren-trs";
           asd = "kanren-trs";
@@ -65888,7 +65888,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "kanren-trs-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-kanren-trs/2012-03-05/cl-kanren-trs-20120305-svn.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-kanren-trs/2012-03-05/cl-kanren-trs-20120305-svn.tgz";
           sha256 = "1r9xyickdkkqcaa7abvks4hqwjb7s95lcrym026c1w6ciibiypr7";
           system = "kanren-trs-test";
           asd = "kanren-trs-test";
@@ -65908,7 +65908,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "kaputt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-kaputt/2022-11-06/cl-kaputt-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-kaputt/2022-11-06/cl-kaputt-20221106-git.tgz";
           sha256 = "1jd9lmdzkjm6mawsxczg6czyv7zbmaplq0ikmda0ysh4aq3apnnj";
           system = "kaputt";
           asd = "kaputt";
@@ -65928,7 +65928,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "kdl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/kdlcl/2023-06-18/kdlcl-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/kdlcl/2023-06-18/kdlcl-20230618-git.tgz";
           sha256 = "0bqqxkd6s420ld2hmhvbbvpzss0m2kimmxaqhz7j1ksmq86bvvmj";
           system = "kdl";
           asd = "kdl";
@@ -65951,7 +65951,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "kdtree-jk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/kdtree-jk/2023-06-18/kdtree-jk-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/kdtree-jk/2023-06-18/kdtree-jk-20230618-git.tgz";
           sha256 = "0l311lmwp4sminl0k534s1kvfwmlk56bfnj7367zd7jl0hvs06ck";
           system = "kdtree-jk";
           asd = "kdtree-jk";
@@ -65971,7 +65971,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "kebab" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/kebab/2015-06-08/kebab-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/kebab/2015-06-08/kebab-20150608-git.tgz";
           sha256 = "0j5haabnvj0vz0rx9mwyfsb3qzpga9nickbjw8xs6vypkdzlqv1b";
           system = "kebab";
           asd = "kebab";
@@ -65996,7 +65996,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "kebab-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/kebab/2015-06-08/kebab-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/kebab/2015-06-08/kebab-20150608-git.tgz";
           sha256 = "0j5haabnvj0vz0rx9mwyfsb3qzpga9nickbjw8xs6vypkdzlqv1b";
           system = "kebab-test";
           asd = "kebab-test";
@@ -66020,7 +66020,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "kekule-clj" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/kekule-clj/2023-10-21/kekule-clj-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/kekule-clj/2023-10-21/kekule-clj-20231021-git.tgz";
           sha256 = "1901b11ilknd4gy7r5b00yq6syb6qsh0xalkdw4g0dqzvqqxnfj5";
           system = "kekule-clj";
           asd = "kekule-clj";
@@ -66043,7 +66043,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "kenzo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/kenzo/2025-06-22/kenzo-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/kenzo/2025-06-22/kenzo-20250622-git.tgz";
           sha256 = "10wpjg76vb0rxkid6v5s6dnwamipd5lsjf3nxk40g1n6isf4jf0l";
           system = "kenzo";
           asd = "kenzo";
@@ -66063,7 +66063,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "kenzo-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/kenzo/2025-06-22/kenzo-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/kenzo/2025-06-22/kenzo-20250622-git.tgz";
           sha256 = "10wpjg76vb0rxkid6v5s6dnwamipd5lsjf3nxk40g1n6isf4jf0l";
           system = "kenzo-test";
           asd = "kenzo-test";
@@ -66086,7 +66086,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "keystone" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/keystone/2020-04-27/keystone-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/keystone/2020-04-27/keystone-20200427-git.tgz";
           sha256 = "04fczbkihf87qyp9f1sv45h69xrvdmcmxkv4m868q8zqw6z48hlj";
           system = "keystone";
           asd = "keystone";
@@ -66112,7 +66112,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "khazern" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
           sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d";
           system = "khazern";
           asd = "khazern";
@@ -66135,7 +66135,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "khazern-extension" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
           sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d";
           system = "khazern-extension";
           asd = "khazern-extension";
@@ -66155,7 +66155,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "khazern-extension-extrinsic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
           sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d";
           system = "khazern-extension-extrinsic";
           asd = "khazern-extension-extrinsic";
@@ -66178,7 +66178,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "khazern-extension-intrinsic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
           sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d";
           system = "khazern-extension-intrinsic";
           asd = "khazern-extension-intrinsic";
@@ -66201,7 +66201,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "khazern-extrinsic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
           sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d";
           system = "khazern-extrinsic";
           asd = "khazern-extrinsic";
@@ -66221,7 +66221,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "khazern-intrinsic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/khazern/2025-06-22/khazern-20250622-git.tgz";
           sha256 = "1z13bds8hdgwncmhl1pbsp341wch6yks8mfgmy3nw9agwfnkpa0d";
           system = "khazern-intrinsic";
           asd = "khazern-intrinsic";
@@ -66244,7 +66244,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "kl-verify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/kl-verify/2012-09-09/kl-verify-20120909-git.tgz";
+          url = "https://beta.quicklisp.org/archive/kl-verify/2012-09-09/kl-verify-20120909-git.tgz";
           sha256 = "1m5jyvvfb24idw0xzi92diyrygmq638dwxg0sl247yyvmwsqb8yj";
           system = "kl-verify";
           asd = "kl-verify";
@@ -66264,7 +66264,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "km" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/km/2011-05-22/km-2-5-33.tgz";
+          url = "https://beta.quicklisp.org/archive/km/2011-05-22/km-2-5-33.tgz";
           sha256 = "0vl4g7vg20l14xc1b5g1d0scak6ck5028q5s5c75pr8fp15m7wyb";
           system = "km";
           asd = "km";
@@ -66284,7 +66284,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "kmrcl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz";
+          url = "https://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz";
           sha256 = "06gx04mah5nc8w78s0j8628divbf1s5w7af8w7pvzb2d5mgvrbd2";
           system = "kmrcl";
           asd = "kmrcl";
@@ -66302,7 +66302,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "knx-conn" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/knx-conn/2025-06-22/knx-conn-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/knx-conn/2025-06-22/knx-conn-20250622-git.tgz";
           sha256 = "0vs31sipx6drd0hs0n9lggaz282br6d3yya5rnvssmv471wqrbsf";
           system = "knx-conn";
           asd = "knx-conn";
@@ -66330,7 +66330,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "l-math" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/l-math/2019-03-07/l-math-20190307-git.tgz";
+          url = "https://beta.quicklisp.org/archive/l-math/2019-03-07/l-math-20190307-git.tgz";
           sha256 = "12nhj1hrvgvmichrjf46fi0f1lzrjajw7k9i1f6qycnnqw45qan1";
           system = "l-math";
           asd = "l-math";
@@ -66350,7 +66350,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "l-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/l-system/2018-02-28/l-system-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/l-system/2018-02-28/l-system-20180228-git.tgz";
           sha256 = "1zvd90s7y936bx7sirc38vs8r2rs62064ndj06ahrc38vagv4qwd";
           system = "l-system";
           asd = "l-system";
@@ -66370,7 +66370,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "l-system-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/l-system/2018-02-28/l-system-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/l-system/2018-02-28/l-system-20180228-git.tgz";
           sha256 = "1zvd90s7y936bx7sirc38vs8r2rs62064ndj06ahrc38vagv4qwd";
           system = "l-system-examples";
           asd = "l-system-examples";
@@ -66390,7 +66390,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "laap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/laap/2017-08-30/laap-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/laap/2017-08-30/laap-20170830-git.tgz";
           sha256 = "0rzjdi4qcv2l99mk4bk94xlpfx1mav0kvd7crpax7dx4dfwkq8k5";
           system = "laap";
           asd = "laap";
@@ -66415,7 +66415,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack";
           asd = "lack";
@@ -66436,7 +66436,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-app-directory" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-app-directory";
           asd = "lack-app-directory";
@@ -66462,7 +66462,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-app-file" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-app-file";
           asd = "lack-app-file";
@@ -66487,7 +66487,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-component" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-component";
           asd = "lack-component";
@@ -66505,7 +66505,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-middleware-accesslog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-accesslog";
           asd = "lack-middleware-accesslog";
@@ -66528,7 +66528,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-middleware-anypool" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/anypool/2024-10-12/anypool-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/anypool/2024-10-12/anypool-20241012-git.tgz";
           sha256 = "1ffssc5fzh7gj0z94xxfb3mk5cwja65lrhxyfgib15a6yxqf1kk1";
           system = "lack-middleware-anypool";
           asd = "lack-middleware-anypool";
@@ -66548,7 +66548,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-middleware-auth-basic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-auth-basic";
           asd = "lack-middleware-auth-basic";
@@ -66571,7 +66571,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-middleware-backtrace" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-backtrace";
           asd = "lack-middleware-backtrace";
@@ -66589,7 +66589,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-middleware-clack-errors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz";
           sha256 = "0z6jyn37phnpq02l5wml8z0593g8ps95c0c2lzkhi3is2wcj9cpf";
           system = "lack-middleware-clack-errors";
           asd = "lack-middleware-clack-errors";
@@ -66609,7 +66609,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-middleware-csrf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-csrf";
           asd = "lack-middleware-csrf";
@@ -66632,7 +66632,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-middleware-dbpool" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-dbpool";
           asd = "lack-middleware-dbpool";
@@ -66655,7 +66655,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-middleware-mito" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
           sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096";
           system = "lack-middleware-mito";
           asd = "lack-middleware-mito";
@@ -66678,7 +66678,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-middleware-mount" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-mount";
           asd = "lack-middleware-mount";
@@ -66698,7 +66698,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-middleware-session" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-session";
           asd = "lack-middleware-session";
@@ -66724,7 +66724,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-middleware-static" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-middleware-static";
           asd = "lack-middleware-static";
@@ -66748,7 +66748,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-request" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-request";
           asd = "lack-request";
@@ -66773,7 +66773,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-response" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-response";
           asd = "lack-response";
@@ -66796,7 +66796,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-session-store-dbi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-session-store-dbi";
           asd = "lack-session-store-dbi";
@@ -66822,7 +66822,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-session-store-redis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-session-store-redis";
           asd = "lack-session-store-redis";
@@ -66848,7 +66848,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-test";
           asd = "lack-test";
@@ -66873,7 +66873,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-util" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-util";
           asd = "lack-util";
@@ -66894,7 +66894,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lack-util-writer-stream" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lack/2025-06-22/lack-20250622-git.tgz";
           sha256 = "1lpalsswwyiklmy8krf48x1gmmkd78v2ipmid0629fbkxlgwz048";
           system = "lack-util-writer-stream";
           asd = "lack-util-writer-stream";
@@ -66917,7 +66917,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lake" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz";
           sha256 = "1g6rr4d5vjx487ym5qjlnw5sd6rwx6l4zx1l9mj0j30lpm1k4il0";
           system = "lake";
           asd = "lake";
@@ -66943,7 +66943,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lake-cli" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz";
           sha256 = "1g6rr4d5vjx487ym5qjlnw5sd6rwx6l4zx1l9mj0j30lpm1k4il0";
           system = "lake-cli";
           asd = "lake-cli";
@@ -66966,7 +66966,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lake-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz";
           sha256 = "1g6rr4d5vjx487ym5qjlnw5sd6rwx6l4zx1l9mj0j30lpm1k4il0";
           system = "lake-test";
           asd = "lake-test";
@@ -66990,7 +66990,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lambda-fiddle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lambda-fiddle/2025-06-22/lambda-fiddle-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lambda-fiddle/2025-06-22/lambda-fiddle-20250622-git.tgz";
           sha256 = "0ka9av9806qlj2blnf4k55fma3xvc8zksnqwc60g5hv20y858c1p";
           system = "lambda-fiddle";
           asd = "lambda-fiddle";
@@ -67008,7 +67008,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lambda-reader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lambda-reader/2017-01-24/lambda-reader-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lambda-reader/2017-01-24/lambda-reader-20170124-git.tgz";
           sha256 = "0s73nrnvr0d2ql1gabcasmfnckzq0f2qs9317hv2mrrh0q1giq1w";
           system = "lambda-reader";
           asd = "lambda-reader";
@@ -67028,7 +67028,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lambda-reader-8bit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lambda-reader/2017-01-24/lambda-reader-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lambda-reader/2017-01-24/lambda-reader-20170124-git.tgz";
           sha256 = "0s73nrnvr0d2ql1gabcasmfnckzq0f2qs9317hv2mrrh0q1giq1w";
           system = "lambda-reader-8bit";
           asd = "lambda-reader-8bit";
@@ -67051,7 +67051,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lambdalite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lambdalite/2014-12-17/lambdalite-20141217-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lambdalite/2014-12-17/lambdalite-20141217-git.tgz";
           sha256 = "0bvhix74afak5bpaa4x3p1b7gskpvzvw78aqkml9d40gpd1ky8lh";
           system = "lambdalite";
           asd = "lambdalite";
@@ -67074,7 +67074,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "language-codes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/language-codes/2025-06-22/language-codes-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/language-codes/2025-06-22/language-codes-20250622-git.tgz";
           sha256 = "00wlfnazvfl3kl7wls4vig1v6dg45z5k1ax0v512i3x63kvxr7bb";
           system = "language-codes";
           asd = "language-codes";
@@ -67094,7 +67094,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lapack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "lapack";
           asd = "lapack";
@@ -67119,7 +67119,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lass" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lass/2025-06-22/lass-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lass/2025-06-22/lass-20250622-git.tgz";
           sha256 = "0pj9p7asqaqjakjjn8i7k6lb9piakjxd8xa732c88q5qijbmvkb2";
           system = "lass";
           asd = "lass";
@@ -67143,7 +67143,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lass-flexbox" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lass-flexbox/2016-02-08/lass-flexbox-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lass-flexbox/2016-02-08/lass-flexbox-20160208-git.tgz";
           sha256 = "143rkff1ybi3b07qyzndxxndp7j4nw1biyp51rkl0yvsk85kj1jp";
           system = "lass-flexbox";
           asd = "lass-flexbox";
@@ -67163,7 +67163,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lass-flexbox-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lass-flexbox/2016-02-08/lass-flexbox-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lass-flexbox/2016-02-08/lass-flexbox-20160208-git.tgz";
           sha256 = "143rkff1ybi3b07qyzndxxndp7j4nw1biyp51rkl0yvsk85kj1jp";
           system = "lass-flexbox-test";
           asd = "lass-flexbox-test";
@@ -67186,7 +67186,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lassie" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lassie/2014-07-13/lassie-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lassie/2014-07-13/lassie-20140713-git.tgz";
           sha256 = "06ps25422ymp9n35745xhg3qsclfli52b7mxhw58wwz9q1v1n0rn";
           system = "lassie";
           asd = "lassie";
@@ -67206,7 +67206,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lastfm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lastfm/2019-10-07/lastfm-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lastfm/2019-10-07/lastfm-20191007-git.tgz";
           sha256 = "1crg82fyzkm9a0czsf5vq6nwndg6gy7zqb2glbp3yaw6p2hrwkp4";
           system = "lastfm";
           asd = "lastfm";
@@ -67235,7 +67235,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "latex-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/latex-table/2018-03-28/latex-table-20180328-git.tgz";
+          url = "https://beta.quicklisp.org/archive/latex-table/2018-03-28/latex-table-20180328-git.tgz";
           sha256 = "04qqr62pdi7qs9p74a4a014l6sl6bk6hrlb7b7pknxx5c15xvcgv";
           system = "latex-table";
           asd = "latex-table";
@@ -67260,7 +67260,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "latter-day-paypal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/latter-day-paypal/2022-11-06/latter-day-paypal-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/latter-day-paypal/2022-11-06/latter-day-paypal-20221106-git.tgz";
           sha256 = "0a4xji2ymmr7s4gq0gc3bhbf62gwfs93ymmpvgsmb0afcsi5099q";
           system = "latter-day-paypal";
           asd = "latter-day-paypal";
@@ -67293,7 +67293,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lazy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lazy/2020-09-25/lazy-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lazy/2020-09-25/lazy-20200925-git.tgz";
           sha256 = "0m099rwr7k17v984n4jnq4hadf19vza5qilxdyrr43scxbbrmw1n";
           system = "lazy";
           asd = "lazy";
@@ -67313,7 +67313,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ledger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "ledger";
           asd = "ledger";
@@ -67333,7 +67333,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "leech" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz";
           sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2";
           system = "leech";
           asd = "leech";
@@ -67356,7 +67356,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "legion" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/legion/2023-10-21/legion-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/legion/2023-10-21/legion-20231021-git.tgz";
           sha256 = "0mf29w6s45dwkjvvirqk7b87swb5wvaffgb836s6sx74wwdgyyk8";
           system = "legion";
           asd = "legion";
@@ -67380,7 +67380,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "legion-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/legion/2023-10-21/legion-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/legion/2023-10-21/legion-20231021-git.tgz";
           sha256 = "0mf29w6s45dwkjvvirqk7b87swb5wvaffgb836s6sx74wwdgyyk8";
           system = "legion-test";
           asd = "legion-test";
@@ -67405,7 +67405,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "legit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/legit/2025-06-22/legit-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/legit/2025-06-22/legit-20250622-git.tgz";
           sha256 = "0k9jjng50d22i37vv3ag7f1j71yspr74n4akd4sw8mpyk7r66kh3";
           system = "legit";
           asd = "legit";
@@ -67428,7 +67428,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lem-opengl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "lem-opengl";
           asd = "lem-opengl";
@@ -67458,7 +67458,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lemmy-api" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lemmy-api/2025-06-22/lemmy-api-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lemmy-api/2025-06-22/lemmy-api-20250622-git.tgz";
           sha256 = "1mbry0jv7zizvc23rz3h7428z65miccl1sanqa23d1xnlgjqvpbh";
           system = "lemmy-api";
           asd = "lemmy-api";
@@ -67482,7 +67482,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lense" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lense/2020-12-20/lense-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lense/2020-12-20/lense-20201220-git.tgz";
           sha256 = "0j11m93an38d1cl6b1kaaj5azhkn64wpiiprlj2c4cjfzrc32ffv";
           system = "lense";
           asd = "lense";
@@ -67506,7 +67506,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "let-over-lambda" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/let-over-lambda/2023-10-21/let-over-lambda-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/let-over-lambda/2023-10-21/let-over-lambda-20231021-git.tgz";
           sha256 = "0inzbmxlx5cvvx1isv827c2zr4qixcb47n6l6qjvc11gnwihdfjf";
           system = "let-over-lambda";
           asd = "let-over-lambda";
@@ -67531,7 +67531,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "let-over-lambda-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/let-over-lambda/2023-10-21/let-over-lambda-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/let-over-lambda/2023-10-21/let-over-lambda-20231021-git.tgz";
           sha256 = "0inzbmxlx5cvvx1isv827c2zr4qixcb47n6l6qjvc11gnwihdfjf";
           system = "let-over-lambda-test";
           asd = "let-over-lambda-test";
@@ -67556,7 +67556,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "let-plus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz";
           sha256 = "00c0nq6l4zb692rzsc9aliqzj3avrssfyz4bhxzl7f1jsz3m29jb";
           system = "let-plus";
           asd = "let-plus";
@@ -67577,7 +67577,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "letrec" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/letrec/2023-06-18/letrec-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/letrec/2023-06-18/letrec-20230618-git.tgz";
           sha256 = "1iwpqrpjbapdxq37g2w65r966f5nhj5466wwvd7lb1jgb03kaghn";
           system = "letrec";
           asd = "letrec";
@@ -67597,7 +67597,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "letv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/letv/2025-06-22/letv-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/letv/2025-06-22/letv-20250622-git.tgz";
           sha256 = "1hpqhrgrnf9rgy3dnvyl1q5wfa6xbb4x98qfymzgp8yfi1c9ic9w";
           system = "letv";
           asd = "letv";
@@ -67617,7 +67617,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lev" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lev/2023-10-21/lev-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lev/2023-10-21/lev-20231021-git.tgz";
           sha256 = "1lr3lzghvl5mbg9cp66carmawbzg64yd8vyivf1df10vllc7ngd6";
           system = "lev";
           asd = "lev";
@@ -67638,7 +67638,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lev-config" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lev/2023-10-21/lev-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lev/2023-10-21/lev-20231021-git.tgz";
           sha256 = "1lr3lzghvl5mbg9cp66carmawbzg64yd8vyivf1df10vllc7ngd6";
           system = "lev-config";
           asd = "lev-config";
@@ -67658,7 +67658,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "leveldb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/leveldb/2016-05-31/leveldb-20160531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/leveldb/2016-05-31/leveldb-20160531-git.tgz";
           sha256 = "03i4qr3g8ga2vpc8qbnipan3i7y4809i036wppkkixcsbckslckv";
           system = "leveldb";
           asd = "leveldb";
@@ -67683,7 +67683,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "levenshtein" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/levenshtein/2010-10-06/levenshtein-1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/levenshtein/2010-10-06/levenshtein-1.0.tgz";
           sha256 = "0b4hdv55qcjlh3ixy3fglvb90ggmm79nl02nxkly2ls6cd7rbf5i";
           system = "levenshtein";
           asd = "levenshtein";
@@ -67703,7 +67703,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lfarm-admin" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
           sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv";
           system = "lfarm-admin";
           asd = "lfarm-admin";
@@ -67726,7 +67726,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lfarm-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
           sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv";
           system = "lfarm-client";
           asd = "lfarm-client";
@@ -67748,7 +67748,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lfarm-common" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
           sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv";
           system = "lfarm-common";
           asd = "lfarm-common";
@@ -67772,7 +67772,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lfarm-gss" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
           sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv";
           system = "lfarm-gss";
           asd = "lfarm-gss";
@@ -67796,7 +67796,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lfarm-launcher" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
           sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv";
           system = "lfarm-launcher";
           asd = "lfarm-launcher";
@@ -67820,7 +67820,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lfarm-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
           sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv";
           system = "lfarm-server";
           asd = "lfarm-server";
@@ -67841,7 +67841,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lfarm-ssl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
           sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv";
           system = "lfarm-ssl";
           asd = "lfarm-ssl";
@@ -67862,7 +67862,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lfarm-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
           sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv";
           system = "lfarm-test";
           asd = "lfarm-test";
@@ -67887,7 +67887,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lftp-wrapper" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lftp-wrapper/2025-06-22/lftp-wrapper-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lftp-wrapper/2025-06-22/lftp-wrapper-20250622-git.tgz";
           sha256 = "1k87nxiv74p7xnwgqzvqdz3va7rnvcbqccrs5sddzhyi9syhfwhv";
           system = "lftp-wrapper";
           asd = "lftp-wrapper";
@@ -67913,7 +67913,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lhstats" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lhstats/2012-01-07/lhstats-20120107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lhstats/2012-01-07/lhstats-20120107-git.tgz";
           sha256 = "1x8h37vm9yd0a2g7qzili673n1c3a9rzawq27rxyzjrggv9wdnlz";
           system = "lhstats";
           asd = "lhstats";
@@ -67933,7 +67933,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lib-helper" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-lib-helper/2024-10-12/cl-lib-helper-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-lib-helper/2024-10-12/cl-lib-helper-20241012-git.tgz";
           sha256 = "11aq60cs510kx9gj709q3kkgddk8aqb32pdzyikr9jylig050wyk";
           system = "lib-helper";
           asd = "lib-helper";
@@ -67959,7 +67959,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lib-helper-test-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-lib-helper/2024-10-12/cl-lib-helper-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-lib-helper/2024-10-12/cl-lib-helper-20241012-git.tgz";
           sha256 = "11aq60cs510kx9gj709q3kkgddk8aqb32pdzyikr9jylig050wyk";
           system = "lib-helper-test-system";
           asd = "lib-helper-test-system";
@@ -67979,7 +67979,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "libcmark" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-cmark/2024-10-12/cl-cmark-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-cmark/2024-10-12/cl-cmark-20241012-git.tgz";
           sha256 = "1l4i530161ppfz0wn1da7g7dwf644ppp1afrq2p7qfkajm7dcfg5";
           system = "libcmark";
           asd = "libcmark";
@@ -67999,7 +67999,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "liblmdb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/liblmdb/2017-08-30/liblmdb-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/liblmdb/2017-08-30/liblmdb-20170830-git.tgz";
           sha256 = "0484245fcbqza40n377qhsr2v838cih6pziav5vlnml1y0cgv62b";
           system = "liblmdb";
           asd = "liblmdb";
@@ -68019,7 +68019,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "libssh2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libssh2/2016-05-31/cl-libssh2-20160531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libssh2/2016-05-31/cl-libssh2-20160531-git.tgz";
           sha256 = "1f2zq30zli0gnawclpasxsajpn20cpyy9d3q9zpqyw1sfrsn0hmk";
           system = "libssh2";
           asd = "libssh2";
@@ -68048,7 +68048,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "libssh2.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libssh2/2016-05-31/cl-libssh2-20160531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libssh2/2016-05-31/cl-libssh2-20160531-git.tgz";
           sha256 = "1f2zq30zli0gnawclpasxsajpn20cpyy9d3q9zpqyw1sfrsn0hmk";
           system = "libssh2.test";
           asd = "libssh2.test";
@@ -68071,7 +68071,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "libusb-ffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libusb/2021-02-28/cl-libusb-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libusb/2021-02-28/cl-libusb-20210228-git.tgz";
           sha256 = "0kyzgcflwb85q58fgn82sp0bipnq5bprg5i4h0h3jxafqqyagbnk";
           system = "libusb-ffi";
           asd = "libusb-ffi";
@@ -68095,7 +68095,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lichat-ldap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lichat-ldap/2023-10-21/lichat-ldap-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lichat-ldap/2023-10-21/lichat-ldap-20231021-git.tgz";
           sha256 = "1jgj5c0sgr4rw9vsjhz71k3ld7hp8fbbmzrn3g11fq8jl4c4iai1";
           system = "lichat-ldap";
           asd = "lichat-ldap";
@@ -68119,7 +68119,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lichat-protocol" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lichat-protocol/2024-10-12/lichat-protocol-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lichat-protocol/2024-10-12/lichat-protocol-20241012-git.tgz";
           sha256 = "0y8546aaf539jnl29r4a8sa975jak1ld4d62w2n1kp8s9nb80z11";
           system = "lichat-protocol";
           asd = "lichat-protocol";
@@ -68143,7 +68143,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lichat-serverlib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lichat-serverlib/2025-06-22/lichat-serverlib-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lichat-serverlib/2025-06-22/lichat-serverlib-20250622-git.tgz";
           sha256 = "1rai2r4ysrcj0wj3jwqc8yqn26nlm1vjm21imc1rvbqd5lprrc3b";
           system = "lichat-serverlib";
           asd = "lichat-serverlib";
@@ -68168,7 +68168,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lichat-tcp-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lichat-tcp-client/2025-06-22/lichat-tcp-client-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lichat-tcp-client/2025-06-22/lichat-tcp-client-20250622-git.tgz";
           sha256 = "1d9zpcny7lqsmz5z1ssk09r3ncrf82mqlmxxcds03ijaaga117qv";
           system = "lichat-tcp-client";
           asd = "lichat-tcp-client";
@@ -68196,7 +68196,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lichat-tcp-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lichat-tcp-server/2025-06-22/lichat-tcp-server-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lichat-tcp-server/2025-06-22/lichat-tcp-server-20250622-git.tgz";
           sha256 = "00cvikcv560cgm4rzr1k9gm3i752i991g0z5ppsvbm79ay976gsf";
           system = "lichat-tcp-server";
           asd = "lichat-tcp-server";
@@ -68223,7 +68223,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lichat-ws-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lichat-ws-server/2025-06-22/lichat-ws-server-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lichat-ws-server/2025-06-22/lichat-ws-server-20250622-git.tgz";
           sha256 = "0cilzklkr24704s8g7m1i5bm2qwqpi7g63cqfkx1swrilzx77hg0";
           system = "lichat-ws-server";
           asd = "lichat-ws-server";
@@ -68250,7 +68250,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lift" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lift/2023-10-21/lift-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lift/2023-10-21/lift-20231021-git.tgz";
           sha256 = "1513n46fkqw8rnvz69s7xnwj476qm8ibdlwsr63qj9yh0mib0q6x";
           system = "lift";
           asd = "lift";
@@ -68268,7 +68268,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lift-documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lift/2023-10-21/lift-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lift/2023-10-21/lift-20231021-git.tgz";
           sha256 = "1513n46fkqw8rnvz69s7xnwj476qm8ibdlwsr63qj9yh0mib0q6x";
           system = "lift-documentation";
           asd = "lift-documentation";
@@ -68288,7 +68288,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lift-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lift/2023-10-21/lift-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lift/2023-10-21/lift-20231021-git.tgz";
           sha256 = "1513n46fkqw8rnvz69s7xnwj476qm8ibdlwsr63qj9yh0mib0q6x";
           system = "lift-test";
           asd = "lift-test";
@@ -68308,7 +68308,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-interface-library/2023-10-21/lisp-interface-library-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-interface-library/2023-10-21/lisp-interface-library-20231021-git.tgz";
           sha256 = "0krh8z696a0p894vmqdw9clzhpqfqff4c4rd7s8d8hd5jwjm40aq";
           system = "lil";
           asd = "lil";
@@ -68333,7 +68333,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lila" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lila/2019-10-07/lila-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lila/2019-10-07/lila-20191007-git.tgz";
           sha256 = "0n29ipbcxh4fm8f1vpaywv02iaayqqk61zsfk051ksjfl5kyqypq";
           system = "lila";
           asd = "lila";
@@ -68353,7 +68353,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lime" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lime/2023-06-18/lime-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lime/2023-06-18/lime-20230618-git.tgz";
           sha256 = "1af1m3nxxqpaw85s1cc4qf0fkv3z061xk5k17ygfmchmv8sj1agp";
           system = "lime";
           asd = "lime";
@@ -68377,7 +68377,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lime-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lime/2023-06-18/lime-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lime/2023-06-18/lime-20230618-git.tgz";
           sha256 = "1af1m3nxxqpaw85s1cc4qf0fkv3z061xk5k17ygfmchmv8sj1agp";
           system = "lime-example";
           asd = "lime-example";
@@ -68400,7 +68400,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lime-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lime/2023-06-18/lime-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lime/2023-06-18/lime-20230618-git.tgz";
           sha256 = "1af1m3nxxqpaw85s1cc4qf0fkv3z061xk5k17ygfmchmv8sj1agp";
           system = "lime-test";
           asd = "lime-test";
@@ -68425,7 +68425,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "linear-programming" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/linear-programming/2025-06-22/linear-programming-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/linear-programming/2025-06-22/linear-programming-20250622-git.tgz";
           sha256 = "1sk2a02qcadndmzmkpbzcvwqz1sgx9i9xsj5901z7lmwpz9wzx0j";
           system = "linear-programming";
           asd = "linear-programming";
@@ -68448,7 +68448,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "linear-programming-glpk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/linear-programming-glpk/2022-11-06/linear-programming-glpk-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/linear-programming-glpk/2022-11-06/linear-programming-glpk-20221106-git.tgz";
           sha256 = "0vm4qgjvw5k3v62h78j6802dm075aif06hbjw600m3hybn84rs3l";
           system = "linear-programming-glpk";
           asd = "linear-programming-glpk";
@@ -68471,7 +68471,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "linear-programming-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/linear-programming/2025-06-22/linear-programming-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/linear-programming/2025-06-22/linear-programming-20250622-git.tgz";
           sha256 = "1sk2a02qcadndmzmkpbzcvwqz1sgx9i9xsj5901z7lmwpz9wzx0j";
           system = "linear-programming-test";
           asd = "linear-programming-test";
@@ -68495,7 +68495,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "linedit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/linedit/2018-04-30/linedit-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/linedit/2018-04-30/linedit-20180430-git.tgz";
           sha256 = "0hhh7xn6q12rviayfihg1ym6x6csa0pdjgb88ykqbrz2rs3pgpz5";
           system = "linedit";
           asd = "linedit";
@@ -68520,7 +68520,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lineva" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lineva/2022-11-06/lineva-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lineva/2022-11-06/lineva-20221106-git.tgz";
           sha256 = "193v40llsi51b4zk93fyrg5ll2309waw7ibl4z75bbw73kc4f2wx";
           system = "lineva";
           asd = "lineva";
@@ -68540,7 +68540,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "linewise-template" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/linewise-template/2023-06-18/linewise-template-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/linewise-template/2023-06-18/linewise-template-20230618-git.tgz";
           sha256 = "08i2426lkcfcydmm9ca71whvyairrd0lklr6w7w17zbg0bsxsaaa";
           system = "linewise-template";
           asd = "linewise-template";
@@ -68563,7 +68563,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "linux-packaging" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/linux-packaging/2021-10-20/linux-packaging-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/linux-packaging/2021-10-20/linux-packaging-20211020-git.tgz";
           sha256 = "0hmahs2slfs1bznn6zdljc5yjlg16ml795rcxnmafq7941lgqjs5";
           system = "linux-packaging";
           asd = "linux-packaging";
@@ -68589,7 +68589,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "linux-packaging-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/linux-packaging/2021-10-20/linux-packaging-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/linux-packaging/2021-10-20/linux-packaging-20211020-git.tgz";
           sha256 = "0hmahs2slfs1bznn6zdljc5yjlg16ml795rcxnmafq7941lgqjs5";
           system = "linux-packaging-tests";
           asd = "linux-packaging-tests";
@@ -68614,7 +68614,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisa/2025-06-22/lisa-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisa/2025-06-22/lisa-20250622-git.tgz";
           sha256 = "0m1ww61vbaxrj1jiln8f6x393i27sd604hv511bd67y6xj23qqai";
           system = "lisa";
           asd = "lisa";
@@ -68634,7 +68634,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-binary" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-binary/2025-06-22/lisp-binary-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-binary/2025-06-22/lisp-binary-20250622-git.tgz";
           sha256 = "0m798xnk0q1hf1l16jqv60bwp49y0hhljn79qvjixrpwr2ridgag";
           system = "lisp-binary";
           asd = "lisp-binary";
@@ -68659,7 +68659,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-binary-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-binary/2025-06-22/lisp-binary-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-binary/2025-06-22/lisp-binary-20250622-git.tgz";
           sha256 = "0m798xnk0q1hf1l16jqv60bwp49y0hhljn79qvjixrpwr2ridgag";
           system = "lisp-binary-test";
           asd = "lisp-binary-test";
@@ -68679,7 +68679,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-chat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-chat/2024-10-12/lisp-chat-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-chat/2024-10-12/lisp-chat-20241012-git.tgz";
           sha256 = "16ckgxg0c3rx6qvwj5cn6rmfgxbj7587r9g342bw3nfxab0sqlzd";
           system = "lisp-chat";
           asd = "lisp-chat";
@@ -68703,7 +68703,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-critic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-critic/2024-10-12/lisp-critic-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-critic/2024-10-12/lisp-critic-20241012-git.tgz";
           sha256 = "19czs2m8h3kgwjd10pdk9r5kazbgly8g82a5q3bs7pqkja42i7x7";
           system = "lisp-critic";
           asd = "lisp-critic";
@@ -68723,7 +68723,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-executable" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz";
           sha256 = "1309f7w0hks3agkhcn8nwm83yssdfrr9b5bjqkjg3rrhxs86c0z7";
           system = "lisp-executable";
           asd = "lisp-executable";
@@ -68743,7 +68743,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-executable-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz";
           sha256 = "1309f7w0hks3agkhcn8nwm83yssdfrr9b5bjqkjg3rrhxs86c0z7";
           system = "lisp-executable-example";
           asd = "lisp-executable-example";
@@ -68763,7 +68763,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-executable-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz";
           sha256 = "1309f7w0hks3agkhcn8nwm83yssdfrr9b5bjqkjg3rrhxs86c0z7";
           system = "lisp-executable-tests";
           asd = "lisp-executable-tests";
@@ -68786,7 +68786,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-interface-library" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-interface-library/2023-10-21/lisp-interface-library-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-interface-library/2023-10-21/lisp-interface-library-20231021-git.tgz";
           sha256 = "0krh8z696a0p894vmqdw9clzhpqfqff4c4rd7s8d8hd5jwjm40aq";
           system = "lisp-interface-library";
           asd = "lisp-interface-library";
@@ -68806,7 +68806,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-invocation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-invocation/2018-02-28/lisp-invocation-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-invocation/2018-02-28/lisp-invocation-20180228-git.tgz";
           sha256 = "1qwvczjd5w6mrkz7ip3gl46f72dnxgngdc5bla35l2g7br96kzsl";
           system = "lisp-invocation";
           asd = "lisp-invocation";
@@ -68826,7 +68826,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-namespace" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-namespace/2022-11-06/lisp-namespace-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-namespace/2022-11-06/lisp-namespace-20221106-git.tgz";
           sha256 = "1p5db9mab4whapy1pl38ajw5fkrrdw266n05mnhf4xx2fb9sbx6p";
           system = "lisp-namespace";
           asd = "lisp-namespace";
@@ -68844,7 +68844,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-namespace.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-namespace/2022-11-06/lisp-namespace-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-namespace/2022-11-06/lisp-namespace-20221106-git.tgz";
           sha256 = "1p5db9mab4whapy1pl38ajw5fkrrdw266n05mnhf4xx2fb9sbx6p";
           system = "lisp-namespace.test";
           asd = "lisp-namespace.test";
@@ -68867,7 +68867,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-pay" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-pay/2024-10-12/lisp-pay-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-pay/2024-10-12/lisp-pay-20241012-git.tgz";
           sha256 = "1rbkzngas67ras5cf90y3dk99md05jmnjgsh45khj4b6kzw5a4v5";
           system = "lisp-pay";
           asd = "lisp-pay";
@@ -68902,7 +68902,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-preprocessor" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-preprocessor/2020-07-15/lisp-preprocessor-20200715-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-preprocessor/2020-07-15/lisp-preprocessor-20200715-git.tgz";
           sha256 = "0v0qhawcvgbxk06nfwyvcqwmqvzn2svq80l2rb12myr0znschhpi";
           system = "lisp-preprocessor";
           asd = "lisp-preprocessor";
@@ -68928,7 +68928,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-preprocessor-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-preprocessor/2020-07-15/lisp-preprocessor-20200715-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-preprocessor/2020-07-15/lisp-preprocessor-20200715-git.tgz";
           sha256 = "0v0qhawcvgbxk06nfwyvcqwmqvzn2svq80l2rb12myr0znschhpi";
           system = "lisp-preprocessor-tests";
           asd = "lisp-preprocessor";
@@ -68951,7 +68951,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-stat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-stat/2025-06-22/lisp-stat-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-stat/2025-06-22/lisp-stat-20250622-git.tgz";
           sha256 = "1n98bp3jdk724zr7h3z496z754j0fbj4ilgqxf1f3kzmw34sb14n";
           system = "lisp-stat";
           asd = "lisp-stat";
@@ -68983,7 +68983,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-types" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "lisp-types";
           asd = "lisp-types";
@@ -69007,7 +69007,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-types-analysis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "lisp-types-analysis";
           asd = "lisp-types-analysis";
@@ -69034,7 +69034,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-types-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "lisp-types-test";
           asd = "lisp-types-test";
@@ -69061,7 +69061,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-unit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-unit/2017-01-24/lisp-unit-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-unit/2017-01-24/lisp-unit-20170124-git.tgz";
           sha256 = "0p6gdmgr7p383nvd66c9y9fp2bjk4jx1lpa5p09g43hr9y9pp9ry";
           system = "lisp-unit";
           asd = "lisp-unit";
@@ -69079,7 +69079,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lisp-unit2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-unit2/2023-02-14/lisp-unit2-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-unit2/2023-02-14/lisp-unit2-20230214-git.tgz";
           sha256 = "140nn22n1xv3qaash3x6h2h7xmys44s3f42b7bakfhpc4qlx0b69";
           system = "lisp-unit2";
           asd = "lisp-unit2";
@@ -69102,7 +69102,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-lexer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-lexer";
           asd = "lispbuilder-lexer";
@@ -69122,7 +69122,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-net" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-net";
           asd = "lispbuilder-net";
@@ -69145,7 +69145,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-net-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-net-cffi";
           asd = "lispbuilder-net-cffi";
@@ -69165,7 +69165,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-opengl-1-1" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-opengl-1-1";
           asd = "lispbuilder-opengl-1-1";
@@ -69185,7 +69185,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-opengl-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-opengl-examples";
           asd = "lispbuilder-opengl-examples";
@@ -69209,7 +69209,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-regex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-regex";
           asd = "lispbuilder-regex";
@@ -69229,7 +69229,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl";
           asd = "lispbuilder-sdl";
@@ -69254,7 +69254,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-assets" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-assets";
           asd = "lispbuilder-sdl-assets";
@@ -69274,7 +69274,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-base";
           asd = "lispbuilder-sdl-base";
@@ -69297,7 +69297,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-binaries" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-binaries";
           asd = "lispbuilder-sdl-binaries";
@@ -69317,7 +69317,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-cffi";
           asd = "lispbuilder-sdl-cffi";
@@ -69340,7 +69340,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-cl-vectors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-cl-vectors";
           asd = "lispbuilder-sdl-cl-vectors";
@@ -69366,7 +69366,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-cl-vectors-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-cl-vectors-examples";
           asd = "lispbuilder-sdl-cl-vectors-examples";
@@ -69386,7 +69386,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-examples";
           asd = "lispbuilder-sdl-examples";
@@ -69406,7 +69406,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-gfx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-gfx";
           asd = "lispbuilder-sdl-gfx";
@@ -69430,7 +69430,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-gfx-binaries" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-gfx-binaries";
           asd = "lispbuilder-sdl-gfx-binaries";
@@ -69450,7 +69450,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-gfx-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-gfx-cffi";
           asd = "lispbuilder-sdl-gfx-cffi";
@@ -69473,7 +69473,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-gfx-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-gfx-examples";
           asd = "lispbuilder-sdl-gfx-examples";
@@ -69493,7 +69493,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-image" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-image";
           asd = "lispbuilder-sdl-image";
@@ -69517,7 +69517,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-image-binaries" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-image-binaries";
           asd = "lispbuilder-sdl-image-binaries";
@@ -69537,7 +69537,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-image-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-image-cffi";
           asd = "lispbuilder-sdl-image-cffi";
@@ -69561,7 +69561,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-image-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-image-examples";
           asd = "lispbuilder-sdl-image-examples";
@@ -69585,7 +69585,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-mixer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-mixer";
           asd = "lispbuilder-sdl-mixer";
@@ -69609,7 +69609,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-mixer-binaries" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-mixer-binaries";
           asd = "lispbuilder-sdl-mixer-binaries";
@@ -69629,7 +69629,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-mixer-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-mixer-cffi";
           asd = "lispbuilder-sdl-mixer-cffi";
@@ -69653,7 +69653,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-mixer-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-mixer-examples";
           asd = "lispbuilder-sdl-mixer-examples";
@@ -69677,7 +69677,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-ttf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-ttf";
           asd = "lispbuilder-sdl-ttf";
@@ -69701,7 +69701,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-ttf-binaries" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-ttf-binaries";
           asd = "lispbuilder-sdl-ttf-binaries";
@@ -69721,7 +69721,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-ttf-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-ttf-cffi";
           asd = "lispbuilder-sdl-ttf-cffi";
@@ -69745,7 +69745,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-ttf-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-ttf-examples";
           asd = "lispbuilder-sdl-ttf-examples";
@@ -69769,7 +69769,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-vecto" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-vecto";
           asd = "lispbuilder-sdl-vecto";
@@ -69793,7 +69793,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-sdl-vecto-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-sdl-vecto-examples";
           asd = "lispbuilder-sdl-vecto-examples";
@@ -69813,7 +69813,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-windows" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-windows";
           asd = "lispbuilder-windows";
@@ -69833,7 +69833,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispbuilder-yacc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispbuilder/2025-06-22/lispbuilder-20250622-git.tgz";
           sha256 = "0907dzalgnp7z7zhqvyz09hnjligr076naxaxy5s9s7fr2vvg62n";
           system = "lispbuilder-yacc";
           asd = "lispbuilder-yacc";
@@ -69853,7 +69853,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispcord" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispcord/2024-10-12/lispcord-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispcord/2024-10-12/lispcord-20241012-git.tgz";
           sha256 = "11xwrrvvqdm1wdnxrxqgizgw25plsn28n2k0lm5kakax9n221brn";
           system = "lispcord";
           asd = "lispcord";
@@ -69882,7 +69882,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lispqr" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lispqr/2021-06-30/lispqr-20210630-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lispqr/2021-06-30/lispqr-20210630-git.tgz";
           sha256 = "06v1xpw5r4nxll286frhkc3ysvr50m904d33marnjmiax41y8qkc";
           system = "lispqr";
           asd = "lispqr";
@@ -69902,7 +69902,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "list-named-class" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/list-named-class/2020-03-25/list-named-class-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/list-named-class/2020-03-25/list-named-class-20200325-git.tgz";
           sha256 = "1bdi9q9wvfj66jji3n9hpjrj9271ial2awsb0xw80bmy6wqbg8kq";
           system = "list-named-class";
           asd = "list-named-class";
@@ -69925,7 +69925,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "list-of" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asdf-finalizers/2022-11-06/asdf-finalizers-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asdf-finalizers/2022-11-06/asdf-finalizers-20221106-git.tgz";
           sha256 = "1w56c9yjjydjshsgqxz57qlp2v3r4ilbisnsgiqphvxnhvd41y0v";
           system = "list-of";
           asd = "list-of";
@@ -69945,7 +69945,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "listopia" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/listopia/2021-04-11/listopia-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/listopia/2021-04-11/listopia-20210411-git.tgz";
           sha256 = "0jd3mdv0ia8mfgdbpndzm3rdgc6nn9d9xpjzqjx582qhbnc0yji0";
           system = "listopia";
           asd = "listopia";
@@ -69965,7 +69965,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "listopia-bench" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/listopia/2021-04-11/listopia-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/listopia/2021-04-11/listopia-20210411-git.tgz";
           sha256 = "0jd3mdv0ia8mfgdbpndzm3rdgc6nn9d9xpjzqjx582qhbnc0yji0";
           system = "listopia-bench";
           asd = "listopia-bench";
@@ -69990,7 +69990,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "liter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz";
           sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r";
           system = "liter";
           asd = "liter";
@@ -70014,7 +70014,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "literate-demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/literate-lisp/2023-06-18/literate-lisp-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/literate-lisp/2023-06-18/literate-lisp-20230618-git.tgz";
           sha256 = "0smxf0a62dnwcfxsbsdkx4n5nqx9dlxdz6c2vfivxpqld6d6ap02";
           system = "literate-demo";
           asd = "literate-demo";
@@ -70037,7 +70037,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "literate-lisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/literate-lisp/2023-06-18/literate-lisp-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/literate-lisp/2023-06-18/literate-lisp-20230618-git.tgz";
           sha256 = "0smxf0a62dnwcfxsbsdkx4n5nqx9dlxdz6c2vfivxpqld6d6ap02";
           system = "literate-lisp";
           asd = "literate-lisp";
@@ -70061,7 +70061,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "litterae" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/litterae/2020-07-15/litterae-20200715-git.tgz";
+          url = "https://beta.quicklisp.org/archive/litterae/2020-07-15/litterae-20200715-git.tgz";
           sha256 = "05q6apkcxacis4llq8xjp468yg5v6za0ispcy5wqsb44ic0vhmsl";
           system = "litterae";
           asd = "litterae";
@@ -70088,7 +70088,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "litterae-test-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/litterae/2020-07-15/litterae-20200715-git.tgz";
+          url = "https://beta.quicklisp.org/archive/litterae/2020-07-15/litterae-20200715-git.tgz";
           sha256 = "05q6apkcxacis4llq8xjp468yg5v6za0ispcy5wqsb44ic0vhmsl";
           system = "litterae-test-system";
           asd = "litterae-test-system";
@@ -70108,7 +70108,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "livesupport" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/livesupport/2019-05-21/livesupport-release-quicklisp-71e6e412-git.tgz";
+          url = "https://beta.quicklisp.org/archive/livesupport/2019-05-21/livesupport-release-quicklisp-71e6e412-git.tgz";
           sha256 = "1rvnl0mncylbx63608pz5llss7y92j7z3ydambk9mcnjg2mjaapg";
           system = "livesupport";
           asd = "livesupport";
@@ -70128,7 +70128,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lla" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lla/2024-10-12/lla-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lla/2024-10-12/lla-20241012-git.tgz";
           sha256 = "19j11z8m00ry2bfn3ahai155b6qz995qqg7ipzvjdr05sj4gfb58";
           system = "lla";
           asd = "lla";
@@ -70153,7 +70153,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lmdb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lmdb/2025-06-22/lmdb-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lmdb/2025-06-22/lmdb-20250622-git.tgz";
           sha256 = "1k2pr6jqa9rnqxm94wvsl6cx7fra0bw3dp75z6d6x1mcjjla43bj";
           system = "lmdb";
           asd = "lmdb";
@@ -70182,7 +70182,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lml/2015-09-23/lml-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lml/2015-09-23/lml-20150923-git.tgz";
           sha256 = "1s8v9p08vwl08y6ssxn4l088zz57d6fr13lzdz93i9jb8w8884wk";
           system = "lml";
           asd = "lml";
@@ -70202,7 +70202,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lml-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lml/2015-09-23/lml-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lml/2015-09-23/lml-20150923-git.tgz";
           sha256 = "1s8v9p08vwl08y6ssxn4l088zz57d6fr13lzdz93i9jb8w8884wk";
           system = "lml-tests";
           asd = "lml-tests";
@@ -70225,7 +70225,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lml2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lml2/2015-09-23/lml2-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lml2/2015-09-23/lml2-20150923-git.tgz";
           sha256 = "0v4d30x5zq1asp4r91nrzljpk2pm1plr0jns7a5wrf1n9fay57a6";
           system = "lml2";
           asd = "lml2";
@@ -70245,7 +70245,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lml2-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lml2/2015-09-23/lml2-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lml2/2015-09-23/lml2-20150923-git.tgz";
           sha256 = "0v4d30x5zq1asp4r91nrzljpk2pm1plr0jns7a5wrf1n9fay57a6";
           system = "lml2-tests";
           asd = "lml2-tests";
@@ -70268,7 +70268,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "local-package-aliases" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/local-package-aliases/2020-12-20/local-package-aliases-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/local-package-aliases/2020-12-20/local-package-aliases-20201220-git.tgz";
           sha256 = "01knnxnximj2qyg8lhv0ijw69hfwqbfbmgvfjwnm7jbdgcp9wxnr";
           system = "local-package-aliases";
           asd = "local-package-aliases";
@@ -70288,7 +70288,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "local-time" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/local-time/2025-06-22/local-time-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/local-time/2025-06-22/local-time-20250622-git.tgz";
           sha256 = "1xdxm1js8n1b3k0g013s810hzf7jr6yhapyvj9agfyl7b6knj0kg";
           system = "local-time";
           asd = "local-time";
@@ -70306,7 +70306,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "local-time-duration" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/local-time-duration/2018-04-30/local-time-duration-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/local-time-duration/2018-04-30/local-time-duration-20180430-git.tgz";
           sha256 = "0f13mg18lv31lclz9jvqyj8d85p1jj1366nlld8m3dxnnwsbbkd6";
           system = "local-time-duration";
           asd = "local-time-duration";
@@ -70330,7 +70330,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "log4cl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz";
           sha256 = "0n119sy35k9yl4n18az1sw9a7saa5jh3v44863b305by1p5xdy7k";
           system = "log4cl";
           asd = "log4cl";
@@ -70348,7 +70348,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "log4cl-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz";
           sha256 = "0n119sy35k9yl4n18az1sw9a7saa5jh3v44863b305by1p5xdy7k";
           system = "log4cl-examples";
           asd = "log4cl-examples";
@@ -70371,7 +70371,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "log4cl-extras" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/log4cl-extras/2024-10-12/log4cl-extras-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/log4cl-extras/2024-10-12/log4cl-extras-20241012-git.tgz";
           sha256 = "17p8y884163j0gab0idra297kivzdgagl2im0gkmdhgrh0dw3b53";
           system = "log4cl-extras";
           asd = "log4cl-extras";
@@ -70404,7 +70404,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "log4cl-extras-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/log4cl-extras/2024-10-12/log4cl-extras-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/log4cl-extras/2024-10-12/log4cl-extras-20241012-git.tgz";
           sha256 = "17p8y884163j0gab0idra297kivzdgagl2im0gkmdhgrh0dw3b53";
           system = "log4cl-extras-test";
           asd = "log4cl-extras-test";
@@ -70429,7 +70429,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "log4cl.log4slime" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz";
           sha256 = "0n119sy35k9yl4n18az1sw9a7saa5jh3v44863b305by1p5xdy7k";
           system = "log4cl.log4slime";
           asd = "log4cl.log4slime";
@@ -70452,7 +70452,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "log4cl.log4sly" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/log4cl/2023-06-18/log4cl-20230618-git.tgz";
           sha256 = "0n119sy35k9yl4n18az1sw9a7saa5jh3v44863b305by1p5xdy7k";
           system = "log4cl.log4sly";
           asd = "log4cl.log4sly";
@@ -70475,7 +70475,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "log5" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/log5/2011-06-19/log5-20110619-git.tgz";
+          url = "https://beta.quicklisp.org/archive/log5/2011-06-19/log5-20110619-git.tgz";
           sha256 = "0f7qhhphijwk6a4hq18gpgifld7hwwpma6md845hgjmpvyqvrw2g";
           system = "log5";
           asd = "log5";
@@ -70495,7 +70495,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lorem-ipsum" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lorem-ipsum/2018-10-18/lorem-ipsum-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lorem-ipsum/2018-10-18/lorem-ipsum-20181018-git.tgz";
           sha256 = "1530qq0bk3xr25m77q96pbi1idnxdkax8cwmvq4ch03rfjy34j7n";
           system = "lorem-ipsum";
           asd = "lorem-ipsum";
@@ -70515,7 +70515,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lowlight" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz";
           sha256 = "1i27hdac7aqb27rn5cslpf5lwvkrfz52b6rf7zqq0fi42zmvgb4p";
           system = "lowlight";
           asd = "lowlight";
@@ -70542,7 +70542,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lowlight.doc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz";
           sha256 = "1i27hdac7aqb27rn5cslpf5lwvkrfz52b6rf7zqq0fi42zmvgb4p";
           system = "lowlight.doc";
           asd = "lowlight.doc";
@@ -70566,7 +70566,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lowlight.old" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz";
           sha256 = "1i27hdac7aqb27rn5cslpf5lwvkrfz52b6rf7zqq0fi42zmvgb4p";
           system = "lowlight.old";
           asd = "lowlight.old";
@@ -70591,7 +70591,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lowlight.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz";
           sha256 = "1i27hdac7aqb27rn5cslpf5lwvkrfz52b6rf7zqq0fi42zmvgb4p";
           system = "lowlight.tests";
           asd = "lowlight.tests";
@@ -70614,7 +70614,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lparallel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz";
           sha256 = "0g0aylrbbrqsz0ahmwhvnk4cmc2931fllbpcfgzsprwnqqd7vwq9";
           system = "lparallel";
           asd = "lparallel";
@@ -70635,7 +70635,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lparallel-bench" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz";
           sha256 = "0g0aylrbbrqsz0ahmwhvnk4cmc2931fllbpcfgzsprwnqqd7vwq9";
           system = "lparallel-bench";
           asd = "lparallel-bench";
@@ -70658,7 +70658,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lparallel-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz";
           sha256 = "0g0aylrbbrqsz0ahmwhvnk4cmc2931fllbpcfgzsprwnqqd7vwq9";
           system = "lparallel-test";
           asd = "lparallel-test";
@@ -70678,7 +70678,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lquery" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lquery/2023-10-21/lquery-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lquery/2023-10-21/lquery-20231021-git.tgz";
           sha256 = "124cjp4a99cicdk18rwz2slcyzvm982saddrvqcr97fi4i2nhnsg";
           system = "lquery";
           asd = "lquery";
@@ -70701,7 +70701,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lquery-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lquery/2023-10-21/lquery-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lquery/2023-10-21/lquery-20231021-git.tgz";
           sha256 = "124cjp4a99cicdk18rwz2slcyzvm982saddrvqcr97fi4i2nhnsg";
           system = "lquery-test";
           asd = "lquery-test";
@@ -70724,7 +70724,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lracer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/racer/2024-10-12/racer-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/racer/2024-10-12/racer-20241012-git.tgz";
           sha256 = "120x046c6vcrj70vb6ryf04mwbr8c6a15llb68x7h1siij8vwgvk";
           system = "lracer";
           asd = "lracer";
@@ -70744,7 +70744,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lredis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lredis/2014-11-06/lredis-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lredis/2014-11-06/lredis-20141106-git.tgz";
           sha256 = "08srvlys0fyslfpmhc740cana7fkxm2kc7mxds4083wgxw3prhf2";
           system = "lredis";
           asd = "lredis";
@@ -70768,7 +70768,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lru-cache" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lru-cache/2025-06-22/lru-cache-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lru-cache/2025-06-22/lru-cache-20250622-git.tgz";
           sha256 = "0nscrgkhzj1br9xgcxzrsr5pg4xcsv2l3736gxbba3wxlj4v2v3d";
           system = "lru-cache";
           asd = "lru-cache";
@@ -70788,7 +70788,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lru-cache-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lru-cache/2025-06-22/lru-cache-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lru-cache/2025-06-22/lru-cache-20250622-git.tgz";
           sha256 = "0nscrgkhzj1br9xgcxzrsr5pg4xcsv2l3736gxbba3wxlj4v2v3d";
           system = "lru-cache-test";
           asd = "lru-cache-test";
@@ -70811,7 +70811,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lsx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lsx/2022-02-20/lsx-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lsx/2022-02-20/lsx-20220220-git.tgz";
           sha256 = "1pdq6csr8pkzcq2zkhhm6wkp9zxx2aypjd16rcw4q43mff09y041";
           system = "lsx";
           asd = "lsx";
@@ -70834,7 +70834,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ltk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz";
           sha256 = "0vqmdq3k235hd8d9cg0ipv0kw28aiydvr9j1igfnrs1ns9sm79va";
           system = "ltk";
           asd = "ltk";
@@ -70852,7 +70852,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ltk-mw" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz";
           sha256 = "0vqmdq3k235hd8d9cg0ipv0kw28aiydvr9j1igfnrs1ns9sm79va";
           system = "ltk-mw";
           asd = "ltk-mw";
@@ -70872,7 +70872,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ltk-remote" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz";
           sha256 = "0vqmdq3k235hd8d9cg0ipv0kw28aiydvr9j1igfnrs1ns9sm79va";
           system = "ltk-remote";
           asd = "ltk-remote";
@@ -70892,7 +70892,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lucene-in-action-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz";
           sha256 = "0svmvsbsirydk3c1spzfvj8qmkzcs9i69anpfvk1843i62wb7x2c";
           system = "lucene-in-action-tests";
           asd = "lucene-in-action-tests";
@@ -70915,7 +70915,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "luckless" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/luckless/2025-06-22/luckless-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/luckless/2025-06-22/luckless-20250622-git.tgz";
           sha256 = "1ajd6kzvdknl1wl2019aqajzr5v26b45fdgldky74m93piibznbn";
           system = "luckless";
           asd = "luckless";
@@ -70938,7 +70938,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "luckless-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/luckless/2025-06-22/luckless-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/luckless/2025-06-22/luckless-20250622-git.tgz";
           sha256 = "1ajd6kzvdknl1wl2019aqajzr5v26b45fdgldky74m93piibznbn";
           system = "luckless-test";
           asd = "luckless-test";
@@ -70963,7 +70963,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lunamech-matrix-api" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lunamech-matrix-api/2025-06-22/lunamech-matrix-api-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lunamech-matrix-api/2025-06-22/lunamech-matrix-api-20250622-git.tgz";
           sha256 = "1ygdnwk1irnlfr6c3d07sqxwj2q74vpkd4hjjfvghr8v7kq4arpv";
           system = "lunamech-matrix-api";
           asd = "lunamech-matrix-api";
@@ -70995,7 +70995,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lunar-phases" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lunar-phases/2025-06-22/lunar-phases-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lunar-phases/2025-06-22/lunar-phases-20250622-git.tgz";
           sha256 = "02apr8ddrg7lq2vps49pn3jdy6kqhncz0qgfk53bl7ffjfxc0aw8";
           system = "lunar-phases";
           asd = "lunar-phases";
@@ -71018,7 +71018,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lw-compat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lw-compat/2016-03-18/lw-compat-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lw-compat/2016-03-18/lw-compat-20160318-git.tgz";
           sha256 = "131rq5k2mlv9bfhmafiv6nfsivl4cxx13d9wr06v5jrqnckh4aav";
           system = "lw-compat";
           asd = "lw-compat";
@@ -71038,7 +71038,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lyrics" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lyrics/2021-08-07/lyrics-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lyrics/2021-08-07/lyrics-20210807-git.tgz";
           sha256 = "1xdhl53i9pim2mbviwqahlkgfsja7ihyvvrwz8q22ljv6bnb6011";
           system = "lyrics";
           asd = "lyrics";
@@ -71067,7 +71067,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lzlib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-lzlib/2023-06-18/cl-lzlib-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-lzlib/2023-06-18/cl-lzlib-20230618-git.tgz";
           sha256 = "1nb2g6a7l1qzm1bwv8b15nflgv8rv478x0n7viv6rlwzgqs5q3b8";
           system = "lzlib";
           asd = "lzlib";
@@ -71092,7 +71092,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "lzlib-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-lzlib/2023-06-18/cl-lzlib-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-lzlib/2023-06-18/cl-lzlib-20230618-git.tgz";
           sha256 = "1nb2g6a7l1qzm1bwv8b15nflgv8rv478x0n7viv6rlwzgqs5q3b8";
           system = "lzlib-tests";
           asd = "lzlib-tests";
@@ -71116,7 +71116,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "machine-measurements" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/machine-measurements/2025-06-22/machine-measurements-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/machine-measurements/2025-06-22/machine-measurements-20250622-git.tgz";
           sha256 = "0d2lhippyhyyzgp67vp8g30xx3r30vrbs1jpcl8wrmxzszyp4qg2";
           system = "machine-measurements";
           asd = "machine-measurements";
@@ -71140,7 +71140,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "machine-state" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/machine-state/2025-06-22/machine-state-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/machine-state/2025-06-22/machine-state-20250622-git.tgz";
           sha256 = "01hdfzlw9zp0r3vrsdapg7djvld3g5sdh6r33kap7qa2zmicbivf";
           system = "machine-state";
           asd = "machine-state";
@@ -71166,7 +71166,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "macro-html" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/macro-html/2015-12-18/macro-html-20151218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/macro-html/2015-12-18/macro-html-20151218-git.tgz";
           sha256 = "05gzgijz8r3dw3ilz7d5i0g0mbcyv9k8w2dgvw7n478njp1gfj4b";
           system = "macro-html";
           asd = "macro-html";
@@ -71186,7 +71186,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "macro-level" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/macro-level/2023-10-21/macro-level_1.1.tgz";
+          url = "https://beta.quicklisp.org/archive/macro-level/2023-10-21/macro-level_1.1.tgz";
           sha256 = "1jcidyf4kfzzj5vj4i3l1vw0sbj9njaminb6j1bcq70y9w15qm68";
           system = "macro-level";
           asd = "macro-level";
@@ -71206,7 +71206,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "macro-level_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/macro-level/2023-10-21/macro-level_1.1.tgz";
+          url = "https://beta.quicklisp.org/archive/macro-level/2023-10-21/macro-level_1.1.tgz";
           sha256 = "1jcidyf4kfzzj5vj4i3l1vw0sbj9njaminb6j1bcq70y9w15qm68";
           system = "macro-level_tests";
           asd = "macro-level_tests";
@@ -71229,7 +71229,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "macrodynamics" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/macrodynamics/2018-02-28/macrodynamics-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/macrodynamics/2018-02-28/macrodynamics-20180228-git.tgz";
           sha256 = "1ysgin8lzd4fdl5c63v3ga9v6lzk3gyl1h8jhl0ar6wyhd3023l4";
           system = "macrodynamics";
           asd = "macrodynamics";
@@ -71249,7 +71249,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "macroexpand-dammit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/macroexpand-dammit/2013-11-11/macroexpand-dammit-20131111-http.tgz";
+          url = "https://beta.quicklisp.org/archive/macroexpand-dammit/2013-11-11/macroexpand-dammit-20131111-http.tgz";
           sha256 = "10avpq3qffrc51hrfjwp3vi5vv9b1aip1dnwncnlc3yd498b3pfl";
           system = "macroexpand-dammit";
           asd = "macroexpand-dammit";
@@ -71269,7 +71269,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "madeira-port" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/madeira-port/2015-07-09/madeira-port-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/madeira-port/2015-07-09/madeira-port-20150709-git.tgz";
           sha256 = "0zl6i11vm1akr0382zh582v3vkxjwmabsnfjcfgrp2wbkq4mvdgq";
           system = "madeira-port";
           asd = "madeira-port";
@@ -71289,7 +71289,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "madeira-port-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/madeira-port/2015-07-09/madeira-port-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/madeira-port/2015-07-09/madeira-port-20150709-git.tgz";
           sha256 = "0zl6i11vm1akr0382zh582v3vkxjwmabsnfjcfgrp2wbkq4mvdgq";
           system = "madeira-port-tests";
           asd = "madeira-port";
@@ -71312,7 +71312,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "magic-ed" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/magic-ed/2020-03-25/magic-ed-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/magic-ed/2020-03-25/magic-ed-20200325-git.tgz";
           sha256 = "1j6il4lif0dy6hqiz6n91yl8dvii9pk1i9vz0faq5mnr42mr7i5f";
           system = "magic-ed";
           asd = "magic-ed";
@@ -71332,7 +71332,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "magicffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/magicffi/2021-05-31/magicffi-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/magicffi/2021-05-31/magicffi-20210531-git.tgz";
           sha256 = "0l2b2irpb19b9pyxbmkxi4i5y6crx8nk7qrbihsdqahlkrwsk1il";
           system = "magicffi";
           asd = "magicffi";
@@ -71356,7 +71356,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "magicl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz";
+          url = "https://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz";
           sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw";
           system = "magicl";
           asd = "magicl";
@@ -71386,7 +71386,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "magicl-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz";
+          url = "https://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz";
           sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw";
           system = "magicl-examples";
           asd = "magicl-examples";
@@ -71406,7 +71406,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "magicl-gen" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz";
+          url = "https://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz";
           sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw";
           system = "magicl-gen";
           asd = "magicl-gen";
@@ -71435,7 +71435,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "magicl-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz";
+          url = "https://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz";
           sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw";
           system = "magicl-tests";
           asd = "magicl-tests";
@@ -71461,7 +71461,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "magicl-transcendental" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz";
+          url = "https://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz";
           sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw";
           system = "magicl-transcendental";
           asd = "magicl-transcendental";
@@ -71490,7 +71490,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden";
           asd = "maiden";
@@ -71521,7 +71521,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-accounts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-accounts";
           asd = "maiden-accounts";
@@ -71545,7 +71545,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-activatable" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-activatable";
           asd = "maiden-activatable";
@@ -71569,7 +71569,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-api-access" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-api-access";
           asd = "maiden-api-access";
@@ -71594,7 +71594,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-blocker" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-blocker";
           asd = "maiden-blocker";
@@ -71619,7 +71619,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-channel-relay" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-channel-relay";
           asd = "maiden-channel-relay";
@@ -71643,7 +71643,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-chatlog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-chatlog";
           asd = "maiden-chatlog";
@@ -71670,7 +71670,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-client-entities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-client-entities";
           asd = "maiden-client-entities";
@@ -71693,7 +71693,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-commands" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-commands";
           asd = "maiden-commands";
@@ -71717,7 +71717,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-core-manager" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-core-manager";
           asd = "maiden-core-manager";
@@ -71741,7 +71741,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-counter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-counter";
           asd = "maiden-counter";
@@ -71767,7 +71767,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-crimes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-crimes";
           asd = "maiden-crimes";
@@ -71794,7 +71794,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-dictionary" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-dictionary";
           asd = "maiden-dictionary";
@@ -71819,7 +71819,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-emoticon" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-emoticon";
           asd = "maiden-emoticon";
@@ -71845,7 +71845,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-help" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-help";
           asd = "maiden-help";
@@ -71869,7 +71869,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-irc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-irc";
           asd = "maiden-irc";
@@ -71897,7 +71897,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-lastfm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-lastfm";
           asd = "maiden-lastfm";
@@ -71923,7 +71923,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-lichat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-lichat";
           asd = "maiden-lichat";
@@ -71947,7 +71947,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-location" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-location";
           asd = "maiden-location";
@@ -71972,7 +71972,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-lookup" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-lookup";
           asd = "maiden-lookup";
@@ -71999,7 +71999,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-markov" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-markov";
           asd = "maiden-markov";
@@ -72029,7 +72029,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-medals" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-medals";
           asd = "maiden-medals";
@@ -72055,7 +72055,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-networking" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-networking";
           asd = "maiden-networking";
@@ -72079,7 +72079,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-notify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-notify";
           asd = "maiden-notify";
@@ -72104,7 +72104,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-permissions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-permissions";
           asd = "maiden-permissions";
@@ -72130,7 +72130,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-relay" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-relay";
           asd = "maiden-relay";
@@ -72153,7 +72153,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-serialize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-serialize";
           asd = "maiden-serialize";
@@ -72177,7 +72177,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-silly" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-silly";
           asd = "maiden-silly";
@@ -72205,7 +72205,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-storage" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-storage";
           asd = "maiden-storage";
@@ -72229,7 +72229,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-talk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-talk";
           asd = "maiden-talk";
@@ -72256,7 +72256,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-throttle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-throttle";
           asd = "maiden-throttle";
@@ -72280,7 +72280,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-time" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-time";
           asd = "maiden-time";
@@ -72305,7 +72305,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-trivia" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-trivia";
           asd = "maiden-trivia";
@@ -72330,7 +72330,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-twitter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-twitter";
           asd = "maiden-twitter";
@@ -72353,7 +72353,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-urlinfo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-urlinfo";
           asd = "maiden-urlinfo";
@@ -72380,7 +72380,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-vote" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-vote";
           asd = "maiden-vote";
@@ -72404,7 +72404,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maiden-weather" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maiden/2025-06-22/maiden-20250622-git.tgz";
           sha256 = "0gxzlhzqycswd8lz3rr6jraqcm5ds2qhypsvqn8si9x29s2m5hlm";
           system = "maiden-weather";
           asd = "maiden-weather";
@@ -72431,7 +72431,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maidenhead" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maidenhead/2024-10-12/maidenhead-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maidenhead/2024-10-12/maidenhead-20241012-git.tgz";
           sha256 = "10pcx2ngyj6lkfbg1b58lzcm02xl1a3smnad5lvvw30pbalwcq46";
           system = "maidenhead";
           asd = "maidenhead";
@@ -72451,7 +72451,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mailbox" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mailbox/2013-10-03/mailbox-20131003-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mailbox/2013-10-03/mailbox-20131003-git.tgz";
           sha256 = "1qgkcss8m2q29kr9d040dnjmzl17vb7zzvlz5ry3z3zgbdwgj1sy";
           system = "mailbox";
           asd = "mailbox";
@@ -72471,7 +72471,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mailgun" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mailgun/2022-07-07/mailgun-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mailgun/2022-07-07/mailgun-20220707-git.tgz";
           sha256 = "1wadkm5r2hmyz40m4kwg5rv4g4dwn3h2d8l2mn9dncg5qy37x2vl";
           system = "mailgun";
           asd = "mailgun";
@@ -72496,7 +72496,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "make-hash" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/make-hash/2013-06-15/make-hash-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/make-hash/2013-06-15/make-hash-20130615-git.tgz";
           sha256 = "1qa4mcmb3pv44py0j129dd8hjx09c2akpnds53b69151mgwv5qz8";
           system = "make-hash";
           asd = "make-hash";
@@ -72516,7 +72516,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "make-hash-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/make-hash/2013-06-15/make-hash-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/make-hash/2013-06-15/make-hash-20130615-git.tgz";
           sha256 = "1qa4mcmb3pv44py0j129dd8hjx09c2akpnds53b69151mgwv5qz8";
           system = "make-hash-tests";
           asd = "make-hash-tests";
@@ -72539,7 +72539,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "manifest" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/manifest/2012-02-08/manifest-20120208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/manifest/2012-02-08/manifest-20120208-git.tgz";
           sha256 = "0dswslnskskdbsln6vi7w8cbypw001d81xaxkfn4g7m15m9pzkgf";
           system = "manifest";
           asd = "manifest";
@@ -72566,7 +72566,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "manifolds" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/manifolds/2025-06-22/manifolds-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/manifolds/2025-06-22/manifolds-20250622-git.tgz";
           sha256 = "0gygnblkd8x134lanj535mi14r5xgdp4kzv7g8a1l8p2drqqwrhw";
           system = "manifolds";
           asd = "manifolds";
@@ -72590,7 +72590,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "map-bind" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/map-bind/2012-08-11/map-bind-20120811-git.tgz";
+          url = "https://beta.quicklisp.org/archive/map-bind/2012-08-11/map-bind-20120811-git.tgz";
           sha256 = "06z02c0ypfrd789glbidnhf95839hardd7nr3i95l1adm8pas30f";
           system = "map-bind";
           asd = "map-bind";
@@ -72610,7 +72610,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "map-set" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/map-set/2023-06-18/map-set-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/map-set/2023-06-18/map-set-20230618-git.tgz";
           sha256 = "1jlvgyvw9v49x65xvcc6vyy5nfgih43yysqj5v2555rm75p5ipgg";
           system = "map-set";
           asd = "map-set";
@@ -72630,7 +72630,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "marching-cubes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz";
           sha256 = "013wyr4g82b2gk0j5jbkkshg9lal2m34px37blyclf6kr5sk6azh";
           system = "marching-cubes";
           asd = "marching-cubes";
@@ -72650,7 +72650,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "marching-cubes-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz";
           sha256 = "013wyr4g82b2gk0j5jbkkshg9lal2m34px37blyclf6kr5sk6azh";
           system = "marching-cubes-example";
           asd = "marching-cubes-example";
@@ -72670,7 +72670,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "marching-cubes-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz";
           sha256 = "013wyr4g82b2gk0j5jbkkshg9lal2m34px37blyclf6kr5sk6azh";
           system = "marching-cubes-test";
           asd = "marching-cubes-test";
@@ -72693,7 +72693,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "markdown.cl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/markdown.cl/2021-02-28/markdown.cl-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/markdown.cl/2021-02-28/markdown.cl-20210228-git.tgz";
           sha256 = "00yxg67skx3navq7fdsjy0wds16n9n12bhdzv08f43bgbwali7v8";
           system = "markdown.cl";
           asd = "markdown.cl";
@@ -72717,7 +72717,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "markdown.cl-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/markdown.cl/2021-02-28/markdown.cl-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/markdown.cl/2021-02-28/markdown.cl-20210228-git.tgz";
           sha256 = "00yxg67skx3navq7fdsjy0wds16n9n12bhdzv08f43bgbwali7v8";
           system = "markdown.cl-test";
           asd = "markdown.cl-test";
@@ -72741,7 +72741,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "markup" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/markup/2025-06-22/markup-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/markup/2025-06-22/markup-20250622-git.tgz";
           sha256 = "0hdi195jxv103zq7iwmhwka3whv33slvkzzzh17csan6d071qlf9";
           system = "markup";
           asd = "markup";
@@ -72766,7 +72766,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "marshal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-marshal/2024-10-12/cl-marshal-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-marshal/2024-10-12/cl-marshal-20241012-git.tgz";
           sha256 = "081j2gfjdg05xzcq0jzqxjb874wkjdbxk9vah7hmlw9d767mzs5b";
           system = "marshal";
           asd = "marshal";
@@ -72784,7 +72784,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "marshal-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-marshal/2024-10-12/cl-marshal-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-marshal/2024-10-12/cl-marshal-20241012-git.tgz";
           sha256 = "081j2gfjdg05xzcq0jzqxjb874wkjdbxk9vah7hmlw9d767mzs5b";
           system = "marshal-tests";
           asd = "marshal-tests";
@@ -72807,7 +72807,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "math" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/math/2025-06-22/math-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/math/2025-06-22/math-20250622-git.tgz";
           sha256 = "1rgx28m2cjp7bmrnmdhl4f74sdwvs6f4n15699hqhds3p11yk4r8";
           system = "math";
           asd = "math";
@@ -72833,7 +72833,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mathkit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mathkit/2016-02-08/mathkit-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mathkit/2016-02-08/mathkit-20160208-git.tgz";
           sha256 = "174y6ndmf52h8sml87qjfl48llmynvdizzk2h0mr85zbaysx73i3";
           system = "mathkit";
           asd = "mathkit";
@@ -72853,7 +72853,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "matrix-case" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/matrix-case/2021-10-20/matrix-case-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/matrix-case/2021-10-20/matrix-case-20211020-git.tgz";
           sha256 = "17k7x7wcl78xw4ajd38gva2dw7snsm9jppbnnl4by2s0grsqg50a";
           system = "matrix-case";
           asd = "matrix-case";
@@ -72873,7 +72873,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "matrix-case.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/matrix-case/2021-10-20/matrix-case-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/matrix-case/2021-10-20/matrix-case-20211020-git.tgz";
           sha256 = "17k7x7wcl78xw4ajd38gva2dw7snsm9jppbnnl4by2s0grsqg50a";
           system = "matrix-case.test";
           asd = "matrix-case.test";
@@ -72896,7 +72896,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maxpc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maxpc/2020-04-27/maxpc-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maxpc/2020-04-27/maxpc-20200427-git.tgz";
           sha256 = "15wrjbr2js6j67c1dd4p2qxj49q9iqv1lhb7cwdcwpn79crr39gf";
           system = "maxpc";
           asd = "maxpc";
@@ -72916,7 +72916,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maxpc-apache" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "maxpc-apache";
           asd = "maxpc-apache";
@@ -72936,7 +72936,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maxpc-apache-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "maxpc-apache-test";
           asd = "maxpc-apache-test";
@@ -72956,7 +72956,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "maxpc-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/maxpc/2020-04-27/maxpc-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/maxpc/2020-04-27/maxpc-20200427-git.tgz";
           sha256 = "15wrjbr2js6j67c1dd4p2qxj49q9iqv1lhb7cwdcwpn79crr39gf";
           system = "maxpc-test";
           asd = "maxpc-test";
@@ -72976,7 +72976,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mbe" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mbe/2020-02-18/mbe-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mbe/2020-02-18/mbe-20200218-git.tgz";
           sha256 = "1wlhlddfv0jbqliqlvhxkmmj9pfym0f9qlvjjmlrkvx6fxpv0450";
           system = "mbe";
           asd = "mbe";
@@ -72996,7 +72996,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcase" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcase/2021-10-20/mcase-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcase/2021-10-20/mcase-20211020-git.tgz";
           sha256 = "1k0agm57xbzlskdi8cgsg2z9lsamm4jl6fw7687z3bw1s2dbsm59";
           system = "mcase";
           asd = "mcase";
@@ -73019,7 +73019,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcase.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcase/2021-10-20/mcase-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcase/2021-10-20/mcase-20211020-git.tgz";
           sha256 = "1k0agm57xbzlskdi8cgsg2z9lsamm4jl6fw7687z3bw1s2dbsm59";
           system = "mcase.test";
           asd = "mcase.test";
@@ -73042,7 +73042,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim";
           asd = "mcclim";
@@ -73073,7 +73073,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-bezier" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-bezier";
           asd = "mcclim-bezier";
@@ -73101,7 +73101,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-bitmaps" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-bitmaps";
           asd = "mcclim-bitmaps";
@@ -73124,7 +73124,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-clx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-clx";
           asd = "mcclim-clx";
@@ -73157,7 +73157,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-clx-fb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-clx-fb";
           asd = "mcclim-clx-fb";
@@ -73180,7 +73180,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-dot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-dot";
           asd = "mcclim-dot";
@@ -73208,7 +73208,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-fontconfig" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-fontconfig";
           asd = "mcclim-fontconfig";
@@ -73232,7 +73232,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-fonts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-fonts";
           asd = "mcclim-fonts";
@@ -73252,7 +73252,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-franz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-franz";
           asd = "mcclim-franz";
@@ -73272,7 +73272,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-harfbuzz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-harfbuzz";
           asd = "mcclim-harfbuzz";
@@ -73297,7 +73297,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-layouts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-layouts";
           asd = "mcclim-layouts";
@@ -73317,7 +73317,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-null" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-null";
           asd = "mcclim-null";
@@ -73337,7 +73337,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-raster-image" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-raster-image";
           asd = "mcclim-raster-image";
@@ -73360,7 +73360,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-render" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-render";
           asd = "mcclim-render";
@@ -73389,7 +73389,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-svg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-svg";
           asd = "mcclim-svg";
@@ -73422,7 +73422,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-tooltips" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-tooltips";
           asd = "mcclim-tooltips";
@@ -73442,7 +73442,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mcclim-tree-with-cross-edges" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "mcclim-tree-with-cross-edges";
           asd = "mcclim-tree-with-cross-edges";
@@ -73462,7 +73462,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "md5" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/md5/2021-06-30/md5-20210630-git.tgz";
+          url = "https://beta.quicklisp.org/archive/md5/2021-06-30/md5-20210630-git.tgz";
           sha256 = "1g20np6rhn3y08z8mlmlk721mw2207s52v2pwp4smm3lz25sx3q5";
           system = "md5";
           asd = "md5";
@@ -73480,7 +73480,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "media-types" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/media-types/2022-03-31/media-types-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/media-types/2022-03-31/media-types-20220331-git.tgz";
           sha256 = "07ly7jr0ff2ks4gyjpq2jyj9gm47frllal5is3iqhc4xrmpyzrqc";
           system = "media-types";
           asd = "media-types";
@@ -73504,7 +73504,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mel-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mel-base/2018-02-28/mel-base-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mel-base/2018-02-28/mel-base-20180228-git.tgz";
           sha256 = "1dvhmlkxasww3kb7xnwqlmdvi31w2awjrbkgk5d0hsfzqmyhhjh0";
           system = "mel-base";
           asd = "mel-base";
@@ -73528,7 +73528,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "memoize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/memoize/2014-08-26/memoize-20140826-http.tgz";
+          url = "https://beta.quicklisp.org/archive/memoize/2014-08-26/memoize-20140826-http.tgz";
           sha256 = "1f1plqy9xdv40235b7kkm63gsgssk8l81azhfniy8j9yww39gihf";
           system = "memoize";
           asd = "memoize";
@@ -73548,7 +73548,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "memory-regions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/memory-regions/2025-06-22/memory-regions-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/memory-regions/2025-06-22/memory-regions-20250622-git.tgz";
           sha256 = "1a4w7h4bciszdk9m3yc1n20kawnxbplrxh3qy2l53x8qp20ydsp5";
           system = "memory-regions";
           asd = "memory-regions";
@@ -73576,7 +73576,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "message-oo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/message-oo/2013-06-15/message-oo-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/message-oo/2013-06-15/message-oo-20130615-git.tgz";
           sha256 = "164yypzhr6pxb84x47s9vjl97imbq5r8sxan22101q0y1jn3dznp";
           system = "message-oo";
           asd = "message-oo";
@@ -73596,7 +73596,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "messagebox" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/messagebox/2025-06-22/messagebox-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/messagebox/2025-06-22/messagebox-20250622-git.tgz";
           sha256 = "197bfxh4w7m967chsbv76qf65r9z7m7fi16b76g8l5vdpf9v6aaw";
           system = "messagebox";
           asd = "messagebox";
@@ -73619,7 +73619,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "meta" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/meta/2015-06-08/meta-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/meta/2015-06-08/meta-20150608-git.tgz";
           sha256 = "08s53zj3mcx82kszp1bg2vsb4kydvkc70kj4hpq9h1l5a1wh44cy";
           system = "meta";
           asd = "meta";
@@ -73639,7 +73639,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "meta-sexp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/meta-sexp/2020-10-16/meta-sexp-20201016-git.tgz";
+          url = "https://beta.quicklisp.org/archive/meta-sexp/2020-10-16/meta-sexp-20201016-git.tgz";
           sha256 = "14z4xglybsj4pdaifhjvnki0vm0wg985x00n94djc0fdcclczv1c";
           system = "meta-sexp";
           asd = "meta-sexp";
@@ -73659,7 +73659,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "metabang-bind" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/metabang-bind/2023-06-18/metabang-bind-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/metabang-bind/2023-06-18/metabang-bind-20230618-git.tgz";
           sha256 = "14g7k3zhm8cd6bssc5mm5h6iq1dv5lfhiq33aimcmj5a6vbiq47d";
           system = "metabang-bind";
           asd = "metabang-bind";
@@ -73677,7 +73677,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "metabang-bind-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/metabang-bind/2023-06-18/metabang-bind-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/metabang-bind/2023-06-18/metabang-bind-20230618-git.tgz";
           sha256 = "14g7k3zhm8cd6bssc5mm5h6iq1dv5lfhiq33aimcmj5a6vbiq47d";
           system = "metabang-bind-test";
           asd = "metabang-bind-test";
@@ -73700,7 +73700,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "metacopy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/metacopy/2017-04-03/metacopy-20170403-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/metacopy/2017-04-03/metacopy-20170403-darcs.tgz";
           sha256 = "1xwvc18l5fc33ffqa6jz5g0qz6mpabia81bcmqf3sz24apkpr49x";
           system = "metacopy";
           asd = "metacopy";
@@ -73720,7 +73720,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "metacopy-with-contextl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/metacopy/2017-04-03/metacopy-20170403-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/metacopy/2017-04-03/metacopy-20170403-darcs.tgz";
           sha256 = "1xwvc18l5fc33ffqa6jz5g0qz6mpabia81bcmqf3sz24apkpr49x";
           system = "metacopy-with-contextl";
           asd = "metacopy-with-contextl";
@@ -73743,7 +73743,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "metalock" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/metalock/2020-09-25/metalock-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/metalock/2020-09-25/metalock-20200925-git.tgz";
           sha256 = "0z2vk0s694zhnkai593q42vln5a6ykm8pilyikc4qp9aw9r43lc5";
           system = "metalock";
           asd = "metalock";
@@ -73766,7 +73766,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "metap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/metap/2015-05-05/metap-20150505-git.tgz";
+          url = "https://beta.quicklisp.org/archive/metap/2015-05-05/metap-20150505-git.tgz";
           sha256 = "0drqyjscl0lmhgplld6annmlqma83q76xkxnahcq4ksnhpbsz9wx";
           system = "metap";
           asd = "metap";
@@ -73786,7 +73786,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "metap-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/metap/2015-05-05/metap-20150505-git.tgz";
+          url = "https://beta.quicklisp.org/archive/metap/2015-05-05/metap-20150505-git.tgz";
           sha256 = "0drqyjscl0lmhgplld6annmlqma83q76xkxnahcq4ksnhpbsz9wx";
           system = "metap-test";
           asd = "metap-test";
@@ -73809,7 +73809,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "metatilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/metatilities/2018-02-28/metatilities-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/metatilities/2018-02-28/metatilities-20180228-git.tgz";
           sha256 = "0vqhndnhrv40ixkj5lslr0h2fy79609gi0wgbqzcz82vkyx9d6vd";
           system = "metatilities";
           asd = "metatilities";
@@ -73835,7 +73835,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "metatilities-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz";
           sha256 = "069rk5ncwvjnnzvvky6xiriynl72yzvjpnzl6jw9jf3b8na14zrk";
           system = "metatilities-base";
           asd = "metatilities-base";
@@ -73853,7 +73853,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "metatilities-base-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz";
           sha256 = "069rk5ncwvjnnzvvky6xiriynl72yzvjpnzl6jw9jf3b8na14zrk";
           system = "metatilities-base-test";
           asd = "metatilities-base-test";
@@ -73876,7 +73876,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "metatilities-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/metatilities/2018-02-28/metatilities-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/metatilities/2018-02-28/metatilities-20180228-git.tgz";
           sha256 = "0vqhndnhrv40ixkj5lslr0h2fy79609gi0wgbqzcz82vkyx9d6vd";
           system = "metatilities-test";
           asd = "metatilities-test";
@@ -73899,7 +73899,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "metering" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/metering/2020-02-18/metering-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/metering/2020-02-18/metering-20200218-git.tgz";
           sha256 = "0jx3ypk8m815yp7208xkcxkvila847mvna25a2p22ihnj0ms9rn1";
           system = "metering";
           asd = "metering";
@@ -73919,7 +73919,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "method-combination-utilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/method-combination-utilities/2024-10-12/method-combination-utilities-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/method-combination-utilities/2024-10-12/method-combination-utilities-20241012-git.tgz";
           sha256 = "15wjzf6r9kkfw89rgzhrr60p5b4i15b90nr3wz6idkv3n4j7fsjl";
           system = "method-combination-utilities";
           asd = "method-combination-utilities";
@@ -73939,7 +73939,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "method-combination-utilities.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/method-combination-utilities/2024-10-12/method-combination-utilities-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/method-combination-utilities/2024-10-12/method-combination-utilities-20241012-git.tgz";
           sha256 = "15wjzf6r9kkfw89rgzhrr60p5b4i15b90nr3wz6idkv3n4j7fsjl";
           system = "method-combination-utilities.tests";
           asd = "method-combination-utilities";
@@ -73962,7 +73962,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "method-hooks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/method-hooks/2020-09-25/method-hooks-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/method-hooks/2020-09-25/method-hooks-20200925-git.tgz";
           sha256 = "0kzijk02wjzms3hihmn6n6p9r6awkrsqlkghf6ixzf6400fiy212";
           system = "method-hooks";
           asd = "method-hooks";
@@ -73982,7 +73982,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "method-hooks-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/method-hooks/2020-09-25/method-hooks-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/method-hooks/2020-09-25/method-hooks-20200925-git.tgz";
           sha256 = "0kzijk02wjzms3hihmn6n6p9r6awkrsqlkghf6ixzf6400fiy212";
           system = "method-hooks-test";
           asd = "method-hooks-test";
@@ -74005,7 +74005,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "method-versions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/method-versions/2011-05-22/method-versions_0.1.2011.05.18.tgz";
+          url = "https://beta.quicklisp.org/archive/method-versions/2011-05-22/method-versions_0.1.2011.05.18.tgz";
           sha256 = "119x3dbjry25issq2m8xcacknd1y9mcnla5rhqzcsrj58zsmwmwf";
           system = "method-versions";
           asd = "method-versions";
@@ -74025,7 +74025,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mexpr" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mexpr/2015-07-09/mexpr-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mexpr/2015-07-09/mexpr-20150709-git.tgz";
           sha256 = "0ri9cp7vhnn9sah1lhvxn523c342n0q4v0xzi6fzlfvpj84jfzqk";
           system = "mexpr";
           asd = "mexpr";
@@ -74048,7 +74048,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mexpr-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mexpr/2015-07-09/mexpr-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mexpr/2015-07-09/mexpr-20150709-git.tgz";
           sha256 = "0ri9cp7vhnn9sah1lhvxn523c342n0q4v0xzi6fzlfvpj84jfzqk";
           system = "mexpr-tests";
           asd = "mexpr-tests";
@@ -74072,7 +74072,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mfiano-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mfiano-utils/2023-02-14/mfiano-utils-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mfiano-utils/2023-02-14/mfiano-utils-20230214-git.tgz";
           sha256 = "06nrrwwlrwi4w87y6888759b5vpa5264lli5m4crl9r9lr9bnay9";
           system = "mfiano-utils";
           asd = "mfiano-utils";
@@ -74095,7 +74095,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mgl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl/2025-06-22/mgl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mgl/2025-06-22/mgl-20250622-git.tgz";
           sha256 = "04c7cy77a7h6chj7f8y3bnk0hm832pfki9yf2rm4vni6jm7qmcrf";
           system = "mgl";
           asd = "mgl";
@@ -74126,7 +74126,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mgl-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl/2025-06-22/mgl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mgl/2025-06-22/mgl-20250622-git.tgz";
           sha256 = "04c7cy77a7h6chj7f8y3bnk0hm832pfki9yf2rm4vni6jm7qmcrf";
           system = "mgl-example";
           asd = "mgl-example";
@@ -74146,7 +74146,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mgl-gnuplot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl/2025-06-22/mgl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mgl/2025-06-22/mgl-20250622-git.tgz";
           sha256 = "04c7cy77a7h6chj7f8y3bnk0hm832pfki9yf2rm4vni6jm7qmcrf";
           system = "mgl-gnuplot";
           asd = "mgl-gnuplot";
@@ -74169,7 +74169,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mgl-gpr" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-gpr/2025-06-22/mgl-gpr-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mgl-gpr/2025-06-22/mgl-gpr-20250622-git.tgz";
           sha256 = "1y505j39b1gp6zfsmhz56aqnrif16h42wwrwl8778ailamq15zsv";
           system = "mgl-gpr";
           asd = "mgl-gpr";
@@ -74192,7 +74192,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mgl-mat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-mat/2025-06-22/mgl-mat-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mgl-mat/2025-06-22/mgl-mat-20250622-git.tgz";
           sha256 = "0bd0dcapmg22w8l37gdc3l5pglbhka5qnla4yd91gc4k01jh6pkd";
           system = "mgl-mat";
           asd = "mgl-mat";
@@ -74223,7 +74223,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mgl-pax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
           sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
           system = "mgl-pax";
           asd = "mgl-pax";
@@ -74247,7 +74247,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mgl-pax-bootstrap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
           sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
           system = "mgl-pax-bootstrap";
           asd = "mgl-pax-bootstrap";
@@ -74270,7 +74270,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mgl-pax-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
           sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
           system = "mgl-pax-test";
           asd = "mgl-pax-test";
@@ -74305,7 +74305,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mgl-pax.asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mgl-pax/2025-06-22/mgl-pax-20250622-git.tgz";
           sha256 = "09wcwil8jyxm34cs7x1i3vclj84n6gxzxp21k0d23129c9adhi66";
           system = "mgl-pax.asdf";
           asd = "mgl-pax.asdf";
@@ -74325,7 +74325,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mgrs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mgrs/2022-03-31/mgrs-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mgrs/2022-03-31/mgrs-20220331-git.tgz";
           sha256 = "1n4kd734qjj7mrcg0q28hml3npam1rm067iwljwc87zshnxh5gmn";
           system = "mgrs";
           asd = "mgrs";
@@ -74345,7 +74345,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "micmac" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/micmac/2025-06-22/micmac-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/micmac/2025-06-22/micmac-20250622-git.tgz";
           sha256 = "1xm0smgbsmlkyp3zc48s1zziv6irbf3ahvq3j1dchdrkfwrwbqhi";
           system = "micmac";
           asd = "micmac";
@@ -74368,7 +74368,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "midi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/midi/2010-10-06/midi-20070618.tgz";
+          url = "https://beta.quicklisp.org/archive/midi/2010-10-06/midi-20070618.tgz";
           sha256 = "06hb6vm4dckhr1ln5jn3b31x1yampkl5fl0lfbg9zyazli7fgl87";
           system = "midi";
           asd = "midi";
@@ -74388,7 +74388,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "millet" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/millet/2021-12-09/millet-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/millet/2021-12-09/millet-20211209-git.tgz";
           sha256 = "1jdqyr1f9a6083k7n88rwc6mjmgccj6za50ybl1dlnxqvqj2pw80";
           system = "millet";
           asd = "millet";
@@ -74408,7 +74408,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "millet.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/millet/2021-12-09/millet-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/millet/2021-12-09/millet-20211209-git.tgz";
           sha256 = "1jdqyr1f9a6083k7n88rwc6mjmgccj6za50ybl1dlnxqvqj2pw80";
           system = "millet.test";
           asd = "millet.test";
@@ -74432,7 +74432,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "minheap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/minheap/2016-06-28/minheap-20160628-git.tgz";
+          url = "https://beta.quicklisp.org/archive/minheap/2016-06-28/minheap-20160628-git.tgz";
           sha256 = "03v0dqxg4kmwvfrlrkq8bmfcv70k9n9f48p9p3z8kmfbc4p3f1vd";
           system = "minheap";
           asd = "minheap";
@@ -74450,7 +74450,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "minheap-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/minheap/2016-06-28/minheap-20160628-git.tgz";
+          url = "https://beta.quicklisp.org/archive/minheap/2016-06-28/minheap-20160628-git.tgz";
           sha256 = "03v0dqxg4kmwvfrlrkq8bmfcv70k9n9f48p9p3z8kmfbc4p3f1vd";
           system = "minheap-tests";
           asd = "minheap-tests";
@@ -74473,7 +74473,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mini-cas" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mini-cas/2015-09-23/mini-cas-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mini-cas/2015-09-23/mini-cas-20150923-git.tgz";
           sha256 = "1y9a111877lkpssi651q684mj052vp6qr9pz5gl47s6swiqvqp24";
           system = "mini-cas";
           asd = "mini-cas";
@@ -74493,7 +74493,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "minilem" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/minilem/2020-02-18/minilem-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/minilem/2020-02-18/minilem-20200218-git.tgz";
           sha256 = "1hpcgj8k5m11nk1pfd479hrbh15dcas7z1s8w877rqmlf69ga4cp";
           system = "minilem";
           asd = "minilem";
@@ -74529,7 +74529,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "minpack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "minpack";
           asd = "minpack";
@@ -74549,7 +74549,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "misc-extensions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/misc-extensions/2025-06-22/misc-extensions-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/misc-extensions/2025-06-22/misc-extensions-20250622-git.tgz";
           sha256 = "168gi0d77rqh2nl1v8h3sj2ajjc9dk2imgbbir4y5v10915mzb6l";
           system = "misc-extensions";
           asd = "misc-extensions";
@@ -74567,7 +74567,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mito" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
           sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096";
           system = "mito";
           asd = "mito";
@@ -74592,7 +74592,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mito-attachment" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mito-attachment/2023-02-14/mito-attachment-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mito-attachment/2023-02-14/mito-attachment-20230214-git.tgz";
           sha256 = "0an744m6wmnbb5zrxqxcf719r7im1n7p63z632p3m5sqv8d86fm1";
           system = "mito-attachment";
           asd = "mito-attachment";
@@ -74621,7 +74621,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mito-auth" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mito-auth/2025-06-22/mito-auth-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mito-auth/2025-06-22/mito-auth-20250622-git.tgz";
           sha256 = "1xffrhlihkn1mckyxrxz5kjy44y85vbyrhdzg7iaixy5qf742b45";
           system = "mito-auth";
           asd = "mito-auth";
@@ -74645,7 +74645,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mito-core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
           sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096";
           system = "mito-core";
           asd = "mito-core";
@@ -74675,7 +74675,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mito-migration" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
           sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096";
           system = "mito-migration";
           asd = "mito-migration";
@@ -74703,7 +74703,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mito-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mito/2025-06-22/mito-20250622-git.tgz";
           sha256 = "17s00avmyy3ghzxb43hvjx2250w5b24vbcg2daf811qirl05s096";
           system = "mito-test";
           asd = "mito-test";
@@ -74729,7 +74729,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mixalot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
           sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb";
           system = "mixalot";
           asd = "mixalot";
@@ -74753,7 +74753,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mixalot-flac" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
           sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb";
           system = "mixalot-flac";
           asd = "mixalot-flac";
@@ -74777,7 +74777,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mixalot-mp3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
           sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb";
           system = "mixalot-mp3";
           asd = "mixalot-mp3";
@@ -74801,7 +74801,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mixalot-vorbis" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
           sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb";
           system = "mixalot-vorbis";
           asd = "mixalot-vorbis";
@@ -74825,7 +74825,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mk-defsystem" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mk-defsystem/2025-06-22/mk-defsystem-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mk-defsystem/2025-06-22/mk-defsystem-20250622-git.tgz";
           sha256 = "08dkr53ganqikg33a3b30zn8267bphx8mzmdl4302ri29srr0a1r";
           system = "mk-defsystem";
           asd = "mk-defsystem";
@@ -74845,7 +74845,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mk-string-metrics" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz";
           sha256 = "0c50hjpylhkh5phcxxcwqdzpa94vk5pq1j7c6x0d3wfpb2yx0wkd";
           system = "mk-string-metrics";
           asd = "mk-string-metrics";
@@ -74863,7 +74863,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mk-string-metrics-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz";
           sha256 = "0c50hjpylhkh5phcxxcwqdzpa94vk5pq1j7c6x0d3wfpb2yx0wkd";
           system = "mk-string-metrics-tests";
           asd = "mk-string-metrics-tests";
@@ -74883,7 +74883,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ml-dsl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz";
           sha256 = "0baq2ccb88zyr2dqdvpm32lsin4zalv11w48x4xm80cr4kw45fk5";
           system = "ml-dsl";
           asd = "ml-dsl";
@@ -74903,7 +74903,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ml-optimizer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz";
           sha256 = "0baq2ccb88zyr2dqdvpm32lsin4zalv11w48x4xm80cr4kw45fk5";
           system = "ml-optimizer";
           asd = "ml-optimizer";
@@ -74928,7 +74928,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ml-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz";
           sha256 = "0baq2ccb88zyr2dqdvpm32lsin4zalv11w48x4xm80cr4kw45fk5";
           system = "ml-test";
           asd = "ml-test";
@@ -74952,7 +74952,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mlep" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mlep/2023-10-21/cl-mlep-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mlep/2023-10-21/cl-mlep-20231021-git.tgz";
           sha256 = "0na6hjjp1a3bril14v878h9198zrbymnfw7nybgcll0kwv90815g";
           system = "mlep";
           asd = "mlep";
@@ -74972,7 +74972,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mlep-add" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mlep/2023-10-21/cl-mlep-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mlep/2023-10-21/cl-mlep-20231021-git.tgz";
           sha256 = "0na6hjjp1a3bril14v878h9198zrbymnfw7nybgcll0kwv90815g";
           system = "mlep-add";
           asd = "mlep-add";
@@ -74997,7 +74997,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mmap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mmap/2025-06-22/mmap-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mmap/2025-06-22/mmap-20250622-git.tgz";
           sha256 = "1s233i80ja9xfk820x4yjccbbqh6llc90n4lmkjglrk4jjk28x1h";
           system = "mmap";
           asd = "mmap";
@@ -75020,7 +75020,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mmap-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mmap/2025-06-22/mmap-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mmap/2025-06-22/mmap-20250622-git.tgz";
           sha256 = "1s233i80ja9xfk820x4yjccbbqh6llc90n4lmkjglrk4jjk28x1h";
           system = "mmap-test";
           asd = "mmap-test";
@@ -75045,7 +75045,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mnas-graph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mnas-graph/2023-06-18/mnas-graph-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mnas-graph/2023-06-18/mnas-graph-20230618-git.tgz";
           sha256 = "1psz8vh8s8zv9hh5pr0753r0baavfb1v6v9nc9kw50hkjvkchc1q";
           system = "mnas-graph";
           asd = "mnas-graph";
@@ -75068,7 +75068,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mnas-hash-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mnas-hash-table/2023-06-18/mnas-hash-table-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mnas-hash-table/2023-06-18/mnas-hash-table-20230618-git.tgz";
           sha256 = "107fqc2wipvs2ifj12sqizv3gc7j3yqww529vkp92xhkmrnkp833";
           system = "mnas-hash-table";
           asd = "mnas-hash-table";
@@ -75088,7 +75088,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mnas-package" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mnas-package/2025-06-22/mnas-package-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mnas-package/2025-06-22/mnas-package-20250622-git.tgz";
           sha256 = "0l3c7kabql49jnf213vgp9kh62k68ph62lm7l55a5s3w5xdlx0l9";
           system = "mnas-package";
           asd = "mnas-package";
@@ -75115,7 +75115,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mnas-path" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mnas-path/2025-06-22/mnas-path-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mnas-path/2025-06-22/mnas-path-20250622-git.tgz";
           sha256 = "0lkgxk7kacy6c7x6sy1ykfpjqr945721fvjgjvlxndf4xhja6vl8";
           system = "mnas-path";
           asd = "mnas-path";
@@ -75138,7 +75138,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mnas-string" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mnas-string/2025-06-22/mnas-string-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mnas-string/2025-06-22/mnas-string-20250622-git.tgz";
           sha256 = "02j1ix03bgijd0x9jiibkadx3dmb3sr76q2b00hl8ffl7gk2hk8n";
           system = "mnas-string";
           asd = "mnas-string";
@@ -75161,7 +75161,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mnst-relay" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
           sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga";
           system = "mnst-relay";
           asd = "mnst-relay";
@@ -75185,7 +75185,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mockingbird" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mockingbird/2021-10-20/mockingbird-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mockingbird/2021-10-20/mockingbird-20211020-git.tgz";
           sha256 = "1n1mxl2qk7g63z92d943ysn12axw0bx5dvw0cmm3cs1hjpx5rdly";
           system = "mockingbird";
           asd = "mockingbird";
@@ -75210,7 +75210,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mockingbird-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mockingbird/2021-10-20/mockingbird-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mockingbird/2021-10-20/mockingbird-20211020-git.tgz";
           sha256 = "1n1mxl2qk7g63z92d943ysn12axw0bx5dvw0cmm3cs1hjpx5rdly";
           system = "mockingbird-test";
           asd = "mockingbird-test";
@@ -75234,7 +75234,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "modest-config" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/modest-config/2018-02-28/modest-config-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/modest-config/2018-02-28/modest-config-20180228-git.tgz";
           sha256 = "0ali9lvg7ngzmpgaxmbc4adp4djznavbywiig8x94c2xwicvjh83";
           system = "modest-config";
           asd = "modest-config";
@@ -75254,7 +75254,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "modest-config-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/modest-config/2018-02-28/modest-config-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/modest-config/2018-02-28/modest-config-20180228-git.tgz";
           sha256 = "0ali9lvg7ngzmpgaxmbc4adp4djznavbywiig8x94c2xwicvjh83";
           system = "modest-config-test";
           asd = "modest-config-test";
@@ -75278,7 +75278,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "modf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/modf/2020-09-25/modf-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/modf/2020-09-25/modf-20200925-git.tgz";
           sha256 = "1aap7ldy7lv942khp026pgndgdzfkkqa9xcq1ykinrmflrgdazay";
           system = "modf";
           asd = "modf";
@@ -75302,7 +75302,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "modf-fset" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/modf-fset/2015-06-08/modf-fset-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/modf-fset/2015-06-08/modf-fset-20150608-git.tgz";
           sha256 = "0xdlwsw3b31l9c6db7rgvikn42ncqk98s45zcq116f51ph3dr95y";
           system = "modf-fset";
           asd = "modf-fset";
@@ -75325,7 +75325,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "modf-fset-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/modf-fset/2015-06-08/modf-fset-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/modf-fset/2015-06-08/modf-fset-20150608-git.tgz";
           sha256 = "0xdlwsw3b31l9c6db7rgvikn42ncqk98s45zcq116f51ph3dr95y";
           system = "modf-fset-test";
           asd = "modf-fset-test";
@@ -75349,7 +75349,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "modf-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/modf/2020-09-25/modf-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/modf/2020-09-25/modf-20200925-git.tgz";
           sha256 = "1aap7ldy7lv942khp026pgndgdzfkkqa9xcq1ykinrmflrgdazay";
           system = "modf-test";
           asd = "modf-test";
@@ -75373,7 +75373,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "modlisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-modlisp/2015-09-23/cl-modlisp-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-modlisp/2015-09-23/cl-modlisp-20150923-git.tgz";
           sha256 = "14gfhhy8blyrhpb1jk17bq4vazgwmzgcx3misw48ja77x17bl1zf";
           system = "modlisp";
           asd = "modlisp";
@@ -75393,7 +75393,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "modularize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/modularize/2025-06-22/modularize-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/modularize/2025-06-22/modularize-20250622-git.tgz";
           sha256 = "01ybc1mizn9xaxb2dbvvw8qvwwcz47kx0hma2nlq3kw8v7par58y";
           system = "modularize";
           asd = "modularize";
@@ -75416,7 +75416,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "modularize-hooks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/modularize-hooks/2025-06-22/modularize-hooks-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/modularize-hooks/2025-06-22/modularize-hooks-20250622-git.tgz";
           sha256 = "0gqb217j7hgdsqzq9dbqb9wf2wp3vf1iijivixdkmbvl27d5jxmp";
           system = "modularize-hooks";
           asd = "modularize-hooks";
@@ -75441,7 +75441,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "modularize-interfaces" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/modularize-interfaces/2023-10-21/modularize-interfaces-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/modularize-interfaces/2023-10-21/modularize-interfaces-20231021-git.tgz";
           sha256 = "0lmq2jbkbr5wrrjl2qb1x64fcvl0lmii0h9301b9bq4d47s4w8sh";
           system = "modularize-interfaces";
           asd = "modularize-interfaces";
@@ -75466,7 +75466,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "modularize-test-module" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/modularize/2025-06-22/modularize-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/modularize/2025-06-22/modularize-20250622-git.tgz";
           sha256 = "01ybc1mizn9xaxb2dbvvw8qvwwcz47kx0hma2nlq3kw8v7par58y";
           system = "modularize-test-module";
           asd = "modularize-test-module";
@@ -75486,7 +75486,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "moira" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/moira/2024-10-12/moira-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/moira/2024-10-12/moira-20241012-git.tgz";
           sha256 = "01wxjg122flla4pgys57hya3fwrkyjkpp26j5ypl5885zz1ip5b7";
           system = "moira";
           asd = "moira";
@@ -75513,7 +75513,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "monkeylib-html" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/monkeylib-html/2018-02-28/monkeylib-html-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/monkeylib-html/2018-02-28/monkeylib-html-20180228-git.tgz";
           sha256 = "11a778ynyb8mhiy9fkpyg2x1p53hi1i9mry9gfin2r28mjgwj096";
           system = "monkeylib-html";
           asd = "monkeylib-html";
@@ -75540,7 +75540,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "monkeylib-markup-html" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/monkeylib-markup-html/2012-02-08/monkeylib-markup-html-20120208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/monkeylib-markup-html/2012-02-08/monkeylib-markup-html-20120208-git.tgz";
           sha256 = "1kwnlb7dka9bqyc8a06lbsap8j83kdayk4m9a1m3mazjgaxlpv2a";
           system = "monkeylib-markup-html";
           asd = "monkeylib-markup-html";
@@ -75566,7 +75566,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "monkeylib-text-languages" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/monkeylib-text-languages/2011-12-03/monkeylib-text-languages-20111203-git.tgz";
+          url = "https://beta.quicklisp.org/archive/monkeylib-text-languages/2011-12-03/monkeylib-text-languages-20111203-git.tgz";
           sha256 = "1f6hb3r2s5phz5z4rv3llyfi30vbxlq9qpipsq9vppmw51fvdsdk";
           system = "monkeylib-text-languages";
           asd = "monkeylib-text-languages";
@@ -75589,7 +75589,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "monkeylib-text-output" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/monkeylib-text-output/2011-12-03/monkeylib-text-output-20111203-git.tgz";
+          url = "https://beta.quicklisp.org/archive/monkeylib-text-output/2011-12-03/monkeylib-text-output-20111203-git.tgz";
           sha256 = "0lygfxap2ppxxi0sbz8lig1h878ad84jwbp3c895r7h9svjh1ffm";
           system = "monkeylib-text-output";
           asd = "monkeylib-text-output";
@@ -75614,7 +75614,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "montezuma" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz";
           sha256 = "0svmvsbsirydk3c1spzfvj8qmkzcs9i69anpfvk1843i62wb7x2c";
           system = "montezuma";
           asd = "montezuma";
@@ -75638,7 +75638,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "montezuma-indexfiles" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz";
           sha256 = "0svmvsbsirydk3c1spzfvj8qmkzcs9i69anpfvk1843i62wb7x2c";
           system = "montezuma-indexfiles";
           asd = "montezuma-indexfiles";
@@ -75661,7 +75661,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "montezuma-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz";
           sha256 = "0svmvsbsirydk3c1spzfvj8qmkzcs9i69anpfvk1843i62wb7x2c";
           system = "montezuma-tests";
           asd = "montezuma";
@@ -75684,7 +75684,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "moptilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz";
           sha256 = "1q12bqjbj47lx98yim1kfnnhgfhkl80102fkgp9pdqxg0fp6g5fc";
           system = "moptilities";
           asd = "moptilities";
@@ -75702,7 +75702,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "moptilities-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz";
           sha256 = "1q12bqjbj47lx98yim1kfnnhgfhkl80102fkgp9pdqxg0fp6g5fc";
           system = "moptilities-test";
           asd = "moptilities-test";
@@ -75725,7 +75725,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "more-conditions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/more-conditions/2025-06-22/more-conditions-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/more-conditions/2025-06-22/more-conditions-20250622-git.tgz";
           sha256 = "12fahmb84g3dabjg0rqxxnv23f4kzfyink1mn9bdvr8m41mr04nm";
           system = "more-conditions";
           asd = "more-conditions";
@@ -75746,7 +75746,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mp3-duration" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mp3-duration/2016-02-08/mp3-duration-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mp3-duration/2016-02-08/mp3-duration-20160208-git.tgz";
           sha256 = "1mhn9g1kz2yan178m2adg0pz3dx2nmg7hq4gfmfz7lrlsxm08bs7";
           system = "mp3-duration";
           asd = "mp3-duration";
@@ -75766,7 +75766,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mp3-duration-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mp3-duration/2016-02-08/mp3-duration-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mp3-duration/2016-02-08/mp3-duration-20160208-git.tgz";
           sha256 = "1mhn9g1kz2yan178m2adg0pz3dx2nmg7hq4gfmfz7lrlsxm08bs7";
           system = "mp3-duration-test";
           asd = "mp3-duration-test";
@@ -75790,7 +75790,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mpc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mpc/2016-09-29/mpc-20160929-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mpc/2016-09-29/mpc-20160929-git.tgz";
           sha256 = "1nig0v91m4ybcr19s50xijwv488qlma0b36zy6cric2y8wgclmsx";
           system = "mpc";
           asd = "mpc";
@@ -75810,7 +75810,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mpg123-ffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
           sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb";
           system = "mpg123-ffi";
           asd = "mpg123-ffi";
@@ -75830,7 +75830,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mra-wavelet-plot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mra-wavelet-plot/2018-12-10/mra-wavelet-plot-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mra-wavelet-plot/2018-12-10/mra-wavelet-plot-20181210-git.tgz";
           sha256 = "0d6sdgj1zvkliga9drsqnj4l748vbcwwz744ayq5nnvp5fvhnc29";
           system = "mra-wavelet-plot";
           asd = "mra-wavelet-plot";
@@ -75850,7 +75850,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mssql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-mssql/2024-10-12/cl-mssql-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-mssql/2024-10-12/cl-mssql-20241012-git.tgz";
           sha256 = "15hnlkx6d2vw46v7h01wljzag33j5is679amv74kzk4qq91wfkx2";
           system = "mssql";
           asd = "mssql";
@@ -75875,7 +75875,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mstrings" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mstrings/2022-07-07/mstrings-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mstrings/2022-07-07/mstrings-20220707-git.tgz";
           sha256 = "0s1zqwnv9agvlp79gh7y06rmly56v8nm1l594rry9gzwvvx1jj1k";
           system = "mstrings";
           asd = "mstrings";
@@ -75895,7 +75895,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mt19937" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz";
+          url = "https://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz";
           sha256 = "0h02ssnncc760b68ipm0sbrzrbnllp6fqabvw98w43af08s36xlg";
           system = "mt19937";
           asd = "mt19937";
@@ -75913,7 +75913,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mtif" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mtif/2017-11-30/mtif-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mtif/2017-11-30/mtif-20171130-git.tgz";
           sha256 = "0fzlf0xawv579i4jp5l994d7m220py5j169klaj0l43frgxb4n7y";
           system = "mtif";
           asd = "mtif";
@@ -75933,7 +75933,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mtlisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mtlisp/2013-06-15/mtlisp-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mtlisp/2013-06-15/mtlisp-20130615-git.tgz";
           sha256 = "0qpbhiy2z2q7mf4lf2lpj66a13xj7bj0c584d1i7zi156s2hcnvs";
           system = "mtlisp";
           asd = "mtlisp";
@@ -75953,7 +75953,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "multilang-documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/multilang-documentation/2025-06-22/multilang-documentation-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/multilang-documentation/2025-06-22/multilang-documentation-20250622-git.tgz";
           sha256 = "1bhb1vqgahj5nw5rb4y8c22ksh10h12zn5y8qkpz772j3dnnxhhn";
           system = "multilang-documentation";
           asd = "multilang-documentation";
@@ -75977,7 +75977,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "multilang-documentation-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/documentation-utils/2025-06-22/documentation-utils-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/documentation-utils/2025-06-22/documentation-utils-20250622-git.tgz";
           sha256 = "1rmb9m3rilj5c4cr7bn5gnx1wrksi85zizp4hr7409qzg345mg7l";
           system = "multilang-documentation-utils";
           asd = "multilang-documentation-utils";
@@ -76000,7 +76000,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "multiple-value-variants" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/multiple-value-variants/2014-08-26/multiple-value-variants-1.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/multiple-value-variants/2014-08-26/multiple-value-variants-1.0.1.tgz";
           sha256 = "0kb7bkgg2iri89ph2lcgfk57pf8h4r6471sn2jcyp5sz13g4f6yw";
           system = "multiple-value-variants";
           asd = "multiple-value-variants";
@@ -76024,7 +76024,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "multiposter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/multiposter/2024-10-12/multiposter-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/multiposter/2024-10-12/multiposter-20241012-git.tgz";
           sha256 = "1q1zinv4csnb0yjlndym5dlf7apax3f5qdiids3dlai09jb4hbjg";
           system = "multiposter";
           asd = "multiposter";
@@ -76061,7 +76061,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "multival-plist" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/multival-plist/2012-03-05/multival-plist-20120305-git.tgz";
+          url = "https://beta.quicklisp.org/archive/multival-plist/2012-03-05/multival-plist-20120305-git.tgz";
           sha256 = "0cfca0qvngbvs9v4z8qpzr6wsjvf01jzaszagmasa4zkvmjycx1b";
           system = "multival-plist";
           asd = "multival-plist";
@@ -76086,7 +76086,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "multival-plist-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/multival-plist/2012-03-05/multival-plist-20120305-git.tgz";
+          url = "https://beta.quicklisp.org/archive/multival-plist/2012-03-05/multival-plist-20120305-git.tgz";
           sha256 = "0cfca0qvngbvs9v4z8qpzr6wsjvf01jzaszagmasa4zkvmjycx1b";
           system = "multival-plist-test";
           asd = "multival-plist-test";
@@ -76109,7 +76109,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "music-spelling" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/music-spelling/2025-06-22/music-spelling-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/music-spelling/2025-06-22/music-spelling-20250622-git.tgz";
           sha256 = "0f2ygh46mq7wh1wvnyqfb7lc8i36rs1d63siajqv3mpfja6h7z7p";
           system = "music-spelling";
           asd = "music-spelling";
@@ -76133,7 +76133,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mutility" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mutility/2025-06-22/mutility-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mutility/2025-06-22/mutility-20250622-git.tgz";
           sha256 = "1vzcns6wsddd3jmy7kxs6gv27nhqncmpxc68xpikdznsm20qn9kb";
           system = "mutility";
           asd = "mutility";
@@ -76157,7 +76157,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mutils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mutils/2025-06-22/mutils-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mutils/2025-06-22/mutils-20250622-git.tgz";
           sha256 = "03inzkq60rbn0bskviqkx7n6akg7fjyvv1cnxnd85wjan3qssw0b";
           system = "mutils";
           asd = "mutils";
@@ -76180,7 +76180,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mw-equiv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mw-equiv/2010-10-06/mw-equiv-0.1.3.tgz";
+          url = "https://beta.quicklisp.org/archive/mw-equiv/2010-10-06/mw-equiv-0.1.3.tgz";
           sha256 = "1fl90wp0jp7l90mps53fq0kzb28f10qfr739527h03xwqccyylad";
           system = "mw-equiv";
           asd = "mw-equiv";
@@ -76200,7 +76200,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "my-cool-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/super-loader/2023-10-21/super-loader-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/super-loader/2023-10-21/super-loader-20231021-git.tgz";
           sha256 = "0jicqg3w1yhwkmjfag0lvlhw83w2hpanwav1gzyf4s58sng6cxf4";
           system = "my-cool-system";
           asd = "my-cool-system";
@@ -76220,7 +76220,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "my-secret-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/super-loader/2023-10-21/super-loader-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/super-loader/2023-10-21/super-loader-20231021-git.tgz";
           sha256 = "0jicqg3w1yhwkmjfag0lvlhw83w2hpanwav1gzyf4s58sng6cxf4";
           system = "my-secret-system";
           asd = "my-secret-system";
@@ -76240,7 +76240,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mystic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
           sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5";
           system = "mystic";
           asd = "mystic";
@@ -76267,7 +76267,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mystic-file-mixin" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
           sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5";
           system = "mystic-file-mixin";
           asd = "mystic-file-mixin";
@@ -76287,7 +76287,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mystic-fiveam-mixin" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
           sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5";
           system = "mystic-fiveam-mixin";
           asd = "mystic-fiveam-mixin";
@@ -76310,7 +76310,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mystic-gitignore-mixin" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
           sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5";
           system = "mystic-gitignore-mixin";
           asd = "mystic-gitignore-mixin";
@@ -76333,7 +76333,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mystic-library-template" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
           sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5";
           system = "mystic-library-template";
           asd = "mystic-library-template";
@@ -76359,7 +76359,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mystic-readme-mixin" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
           sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5";
           system = "mystic-readme-mixin";
           asd = "mystic-readme-mixin";
@@ -76382,7 +76382,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mystic-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
           sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5";
           system = "mystic-test";
           asd = "mystic-test";
@@ -76406,7 +76406,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "mystic-travis-mixin" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mystic/2023-06-18/mystic-20230618-git.tgz";
           sha256 = "0fa7mb326vz7ygiwzk0x2y8gna0xnq19cics5vxc6smw6a8mhxi5";
           system = "mystic-travis-mixin";
           asd = "mystic-travis-mixin";
@@ -76429,7 +76429,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "myway" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/myway/2022-11-06/myway-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/myway/2022-11-06/myway-20221106-git.tgz";
           sha256 = "0xac8xpbcvq457f2jzzkf46mh5ganf1k2ix8sg61hqqmld5z4dag";
           system = "myway";
           asd = "myway";
@@ -76455,7 +76455,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "myway-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/myway/2022-11-06/myway-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/myway/2022-11-06/myway-20221106-git.tgz";
           sha256 = "0xac8xpbcvq457f2jzzkf46mh5ganf1k2ix8sg61hqqmld5z4dag";
           system = "myway-test";
           asd = "myway-test";
@@ -76479,7 +76479,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "myweb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/myweb/2024-10-12/myweb-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/myweb/2024-10-12/myweb-20241012-git.tgz";
           sha256 = "10r67w3cgrq0r7qmqdnv4c3pjz7kkhz9q3jj0amlknr0nsr4y2zp";
           system = "myweb";
           asd = "myweb";
@@ -76505,7 +76505,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nail" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nail/2023-02-14/nail-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nail/2023-02-14/nail-20230214-git.tgz";
           sha256 = "0m5a1zx9s033mz3ypx27c26z5bvc8mcpnpzslypzdp6xah1nv0g3";
           system = "nail";
           asd = "nail";
@@ -76529,7 +76529,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "named-closure" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/named-closure/2025-06-22/named-closure-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/named-closure/2025-06-22/named-closure-20250622-git.tgz";
           sha256 = "17lpslk7amh9pghjpjdnd1aj50r1kdc4iyai2h2xas7wampg5xf5";
           system = "named-closure";
           asd = "named-closure";
@@ -76555,7 +76555,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "named-read-macros" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/named-read-macros/2021-02-28/named-read-macros-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/named-read-macros/2021-02-28/named-read-macros-20210228-git.tgz";
           sha256 = "0bgqy43h06nq2p9avqix2k15ab306sghrz2pkr17pli87q0qkxhi";
           system = "named-read-macros";
           asd = "named-read-macros";
@@ -76575,7 +76575,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "named-read-macros-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/named-read-macros/2021-02-28/named-read-macros-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/named-read-macros/2021-02-28/named-read-macros-20210228-git.tgz";
           sha256 = "0bgqy43h06nq2p9avqix2k15ab306sghrz2pkr17pli87q0qkxhi";
           system = "named-read-macros-test";
           asd = "named-read-macros-test";
@@ -76598,7 +76598,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "named-readtables" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/named-readtables/2025-06-22/named-readtables-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/named-readtables/2025-06-22/named-readtables-20250622-git.tgz";
           sha256 = "0wm7k1xq6c8rji121wfnv396l59bw87010c7mqhdj9vg7amyr9af";
           system = "named-readtables";
           asd = "named-readtables";
@@ -76616,7 +76616,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "named-readtables-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/named-readtables/2025-06-22/named-readtables-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/named-readtables/2025-06-22/named-readtables-20250622-git.tgz";
           sha256 = "0wm7k1xq6c8rji121wfnv396l59bw87010c7mqhdj9vg7amyr9af";
           system = "named-readtables-test";
           asd = "named-readtables-test";
@@ -76639,7 +76639,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nanovg-blob" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nanovg-blob/2020-10-16/nanovg-blob-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nanovg-blob/2020-10-16/nanovg-blob-stable-git.tgz";
           sha256 = "1q80inrlfcqqqc912jcskfn667jgq6lcw0jvhk270x5qpj8z2pfj";
           system = "nanovg-blob";
           asd = "nanovg-blob";
@@ -76663,7 +76663,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "napa-fft3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/napa-fft3/2015-12-18/napa-fft3-20151218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/napa-fft3/2015-12-18/napa-fft3-20151218-git.tgz";
           sha256 = "1hxjf599xgwm28gbryy7q96j9ys6hfszmv0qxpr5698hxnhknscp";
           system = "napa-fft3";
           asd = "napa-fft3";
@@ -76683,7 +76683,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "narrowed-types" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/narrowed-types/2018-02-28/narrowed-types-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/narrowed-types/2018-02-28/narrowed-types-20180228-git.tgz";
           sha256 = "03v4jgdysapj3ndg2qij7liqc6n9zb07r5j4k1jhmhpml86jxg4g";
           system = "narrowed-types";
           asd = "narrowed-types";
@@ -76703,7 +76703,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "narrowed-types-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/narrowed-types/2018-02-28/narrowed-types-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/narrowed-types/2018-02-28/narrowed-types-20180228-git.tgz";
           sha256 = "03v4jgdysapj3ndg2qij7liqc6n9zb07r5j4k1jhmhpml86jxg4g";
           system = "narrowed-types-test";
           asd = "narrowed-types-test";
@@ -76726,7 +76726,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "native-lazy-seq" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/native-lazy-seq/2023-06-18/native-lazy-seq-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/native-lazy-seq/2023-06-18/native-lazy-seq-20230618-git.tgz";
           sha256 = "1p5zja0qg61girf67ic8j6wv9s1faxki0mazxmydbm92ckrns2rp";
           system = "native-lazy-seq";
           asd = "native-lazy-seq";
@@ -76751,7 +76751,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nbd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nbd/2021-10-20/nbd-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nbd/2021-10-20/nbd-20211020-git.tgz";
           sha256 = "1p9dpyvlpjm32a2ymhps782dp5pjya5bnky6sb20gf4zyw6r826n";
           system = "nbd";
           asd = "nbd";
@@ -76774,7 +76774,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nclasses" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nclasses/2025-06-22/nclasses-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nclasses/2025-06-22/nclasses-20250622-git.tgz";
           sha256 = "1yq0l7alqw5v3g46y3pvkx0qlprsvji6rlkb63vnqq5z82dqf7sn";
           system = "nclasses";
           asd = "nclasses";
@@ -76794,7 +76794,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ncurses-clone-for-lem" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "ncurses-clone-for-lem";
           asd = "ncurses-clone-for-lem";
@@ -76822,7 +76822,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ndebug" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ndebug/2025-06-22/ndebug-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ndebug/2025-06-22/ndebug-20250622-git.tgz";
           sha256 = "1z98kzgnvqrd0dbanyr91j9hv28qb32g51vvmbmagcwqprswdcqk";
           system = "ndebug";
           asd = "ndebug";
@@ -76847,7 +76847,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ndfa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "ndfa";
           asd = "ndfa";
@@ -76867,7 +76867,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ndfa-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "ndfa-test";
           asd = "ndfa-test";
@@ -76891,7 +76891,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net-telent-date" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz";
+          url = "https://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz";
           sha256 = "0vgibf76hy3zy39pix367xnvpwxiqsxvv6w0gqdxprd5ljpb7g2j";
           system = "net-telent-date";
           asd = "net-telent-date";
@@ -76909,7 +76909,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.asdf-flv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asdf-flv/2023-10-21/asdf-flv-version-2.2.tgz";
+          url = "https://beta.quicklisp.org/archive/asdf-flv/2023-10-21/asdf-flv-version-2.2.tgz";
           sha256 = "1svcjhdlsdayr07qa38kj8n5m40qplklspmlrkmvc5wdhk9jz8sw";
           system = "net.didierverna.asdf-flv";
           asd = "net.didierverna.asdf-flv";
@@ -76927,7 +76927,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.clon" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz";
           sha256 = "0cyh5z78r7qhv2rzghkhksgg848d6iy1xv7y87p3aivd23c916b1";
           system = "net.didierverna.clon";
           asd = "net.didierverna.clon";
@@ -76950,7 +76950,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.clon.core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz";
           sha256 = "0cyh5z78r7qhv2rzghkhksgg848d6iy1xv7y87p3aivd23c916b1";
           system = "net.didierverna.clon.core";
           asd = "net.didierverna.clon.core";
@@ -76970,7 +76970,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.clon.demo.advanced" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz";
           sha256 = "0cyh5z78r7qhv2rzghkhksgg848d6iy1xv7y87p3aivd23c916b1";
           system = "net.didierverna.clon.demo.advanced";
           asd = "net.didierverna.clon.demo.advanced";
@@ -76990,7 +76990,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.clon.demo.simple" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz";
           sha256 = "0cyh5z78r7qhv2rzghkhksgg848d6iy1xv7y87p3aivd23c916b1";
           system = "net.didierverna.clon.demo.simple";
           asd = "net.didierverna.clon.demo.simple";
@@ -77010,7 +77010,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.clon.setup" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz";
           sha256 = "0cyh5z78r7qhv2rzghkhksgg848d6iy1xv7y87p3aivd23c916b1";
           system = "net.didierverna.clon.setup";
           asd = "net.didierverna.clon.setup";
@@ -77030,7 +77030,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.clon.termio" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-clon/2023-10-21/cl-clon-version-1.0b27.tgz";
           sha256 = "0cyh5z78r7qhv2rzghkhksgg848d6iy1xv7y87p3aivd23c916b1";
           system = "net.didierverna.clon.termio";
           asd = "net.didierverna.clon.termio";
@@ -77053,7 +77053,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.declt.setup" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/declt/2024-10-12/declt-4.0b2.tgz";
+          url = "https://beta.quicklisp.org/archive/declt/2024-10-12/declt-4.0b2.tgz";
           sha256 = "1xkbf1xqrkmr8na09b0spmrznsx2ml10i9q026zv9mpbsc7gh0i6";
           system = "net.didierverna.declt.setup";
           asd = "net.didierverna.declt.setup";
@@ -77073,7 +77073,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.focus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz";
           sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc";
           system = "net.didierverna.focus";
           asd = "net.didierverna.focus";
@@ -77097,7 +77097,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.focus.core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz";
           sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc";
           system = "net.didierverna.focus.core";
           asd = "net.didierverna.focus.core";
@@ -77117,7 +77117,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.focus.demos.quotation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz";
           sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc";
           system = "net.didierverna.focus.demos.quotation";
           asd = "net.didierverna.focus.demos.quotation";
@@ -77137,7 +77137,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.focus.flv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz";
           sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc";
           system = "net.didierverna.focus.flv";
           asd = "net.didierverna.focus.flv";
@@ -77161,7 +77161,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.focus.setup" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz";
           sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc";
           system = "net.didierverna.focus.setup";
           asd = "net.didierverna.focus.setup";
@@ -77181,7 +77181,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.tfm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfm/2025-06-22/tfm-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfm/2025-06-22/tfm-20250622-git.tgz";
           sha256 = "0mbfclm680wnai9alys1acb78dp83nkpb22b0lx06059pv6ylz6r";
           system = "net.didierverna.tfm";
           asd = "net.didierverna.tfm";
@@ -77201,7 +77201,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.tfm.core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfm/2025-06-22/tfm-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfm/2025-06-22/tfm-20250622-git.tgz";
           sha256 = "0mbfclm680wnai9alys1acb78dp83nkpb22b0lx06059pv6ylz6r";
           system = "net.didierverna.tfm.core";
           asd = "net.didierverna.tfm.core";
@@ -77221,7 +77221,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.didierverna.tfm.setup" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfm/2025-06-22/tfm-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfm/2025-06-22/tfm-20250622-git.tgz";
           sha256 = "0mbfclm680wnai9alys1acb78dp83nkpb22b0lx06059pv6ylz6r";
           system = "net.didierverna.tfm.setup";
           asd = "net.didierverna.tfm.setup";
@@ -77241,7 +77241,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "net.scipolis.graphs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/femlisp/2025-06-22/femlisp-20250622-git.tgz";
           sha256 = "1rg1hhy3nlb85229ninnsdr8dhjjs0wgqv612g8i59v82n07yip8";
           system = "net.scipolis.graphs";
           asd = "net.scipolis.graphs";
@@ -77261,7 +77261,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "network-addresses" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/network-addresses/2016-06-28/network-addresses-20160628-git.tgz";
+          url = "https://beta.quicklisp.org/archive/network-addresses/2016-06-28/network-addresses-20160628-git.tgz";
           sha256 = "0zkyfdvfy9pz08vrgz40qpnqx0y7vf92aarp9dq2wipimnwy8df2";
           system = "network-addresses";
           asd = "network-addresses";
@@ -77281,7 +77281,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "network-addresses-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/network-addresses/2016-06-28/network-addresses-20160628-git.tgz";
+          url = "https://beta.quicklisp.org/archive/network-addresses/2016-06-28/network-addresses-20160628-git.tgz";
           sha256 = "0zkyfdvfy9pz08vrgz40qpnqx0y7vf92aarp9dq2wipimnwy8df2";
           system = "network-addresses-test";
           asd = "network-addresses-test";
@@ -77304,7 +77304,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "neural-classifier" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/neural-classifier/2024-10-12/neural-classifier-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/neural-classifier/2024-10-12/neural-classifier-20241012-git.tgz";
           sha256 = "0aq7m781c27di7lfs1a7di55f31i7x490yfd2033738biqn0x019";
           system = "neural-classifier";
           asd = "neural-classifier";
@@ -77329,7 +77329,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "new-op" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/new-op/2025-06-22/new-op-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/new-op/2025-06-22/new-op-20250622-git.tgz";
           sha256 = "1kw7rbrnjq9bk8i6gx17si8kdz58c5bxaf23zvxkprzzd4ydlrv0";
           system = "new-op";
           asd = "new-op";
@@ -77349,7 +77349,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nfiles" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nfiles/2025-06-22/nfiles-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nfiles/2025-06-22/nfiles-20250622-git.tgz";
           sha256 = "1lm6p9cncixqybhhy212pnlvx132fjv0xc14wkrvimd7i38dxcdl";
           system = "nfiles";
           asd = "nfiles";
@@ -77377,7 +77377,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nhooks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nhooks/2025-06-22/nhooks-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nhooks/2025-06-22/nhooks-20250622-git.tgz";
           sha256 = "1k1lcpaj6zhgq8sxjl12xi1p5l8fhz54akw7kvqk5frpiigdpg47";
           system = "nhooks";
           asd = "nhooks";
@@ -77401,7 +77401,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nibbles" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nibbles/2025-06-22/nibbles-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nibbles/2025-06-22/nibbles-20250622-git.tgz";
           sha256 = "034jq9y0p6a7cckzgjqm1jlj4njm3mcd9vwp2jxmqcrgjlf4qavs";
           system = "nibbles";
           asd = "nibbles";
@@ -77419,7 +77419,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nibbles-streams" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nibbles-streams/2025-06-22/nibbles-streams-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nibbles-streams/2025-06-22/nibbles-streams-20250622-git.tgz";
           sha256 = "1q6x71gfrn15xdrb4jdydz838nyl0sqi8gz92rfkbrf7b2771gkz";
           system = "nibbles-streams";
           asd = "nibbles-streams";
@@ -77443,7 +77443,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nineveh" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nineveh/2019-10-07/nineveh-release-quicklisp-0a10a846-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nineveh/2019-10-07/nineveh-release-quicklisp-0a10a846-git.tgz";
           sha256 = "0bpdgqc9iz37240ypirpi489pnqpb92i94snyhjbh87i50y4br2l";
           system = "nineveh";
           asd = "nineveh";
@@ -77472,7 +77472,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ningle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ningle/2024-10-12/ningle-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ningle/2024-10-12/ningle-20241012-git.tgz";
           sha256 = "1ym6phipbg94q7344ng9yf02ykh0x5ldx8nfrbsh8p15qajsw7hc";
           system = "ningle";
           asd = "ningle";
@@ -77498,7 +77498,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ningle-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ningle/2024-10-12/ningle-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ningle/2024-10-12/ningle-20241012-git.tgz";
           sha256 = "1ym6phipbg94q7344ng9yf02ykh0x5ldx8nfrbsh8p15qajsw7hc";
           system = "ningle-test";
           asd = "ningle-test";
@@ -77525,7 +77525,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "njson" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/njson/2025-06-22/njson-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/njson/2025-06-22/njson-20250622-git.tgz";
           sha256 = "0bb1apfc2iidknkf8yxkscwvf4w110f2lxb2hw9rldf5gq4w5h03";
           system = "njson";
           asd = "njson";
@@ -77545,7 +77545,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nkeymaps" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nkeymaps/2025-06-22/nkeymaps-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nkeymaps/2025-06-22/nkeymaps-20250622-git.tgz";
           sha256 = "1n8bw5nlagzaldc9fqxfd8sl2bnh04fq1zlz38vb305db0wkz39c";
           system = "nkeymaps";
           asd = "nkeymaps";
@@ -77570,7 +77570,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nlopt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nlopt/2022-07-07/nlopt-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nlopt/2022-07-07/nlopt-20220707-git.tgz";
           sha256 = "01zw4yx38kc8x3by0m3dw5j87hwb180ggp4njfnzi1qjq1fdczp5";
           system = "nlopt";
           asd = "nlopt";
@@ -77593,7 +77593,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nodgui" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nodgui/2025-06-22/nodgui-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nodgui/2025-06-22/nodgui-20250622-git.tgz";
           sha256 = "01lkgb2xk2lgq32fflsbf1p0mxxpk3215awhb1f01hgdnr94r7fa";
           system = "nodgui";
           asd = "nodgui";
@@ -77631,7 +77631,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nodgui-lite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nodgui/2025-06-22/nodgui-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nodgui/2025-06-22/nodgui-20250622-git.tgz";
           sha256 = "01lkgb2xk2lgq32fflsbf1p0mxxpk3215awhb1f01hgdnr94r7fa";
           system = "nodgui-lite";
           asd = "nodgui-lite";
@@ -77665,7 +77665,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "noisy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/noisy/2025-06-22/noisy-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/noisy/2025-06-22/noisy-20250622-git.tgz";
           sha256 = "0djv0gwaikvrl9xkwwfks8nw5iic0mjbbi78gnra0hsklikqfai3";
           system = "noisy";
           asd = "noisy";
@@ -77685,7 +77685,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nontrivial-gray-streams" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nontrivial-gray-streams/2025-06-22/nontrivial-gray-streams-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nontrivial-gray-streams/2025-06-22/nontrivial-gray-streams-20250622-git.tgz";
           sha256 = "1x5b2fw3kr1227vr4hab08cls5f7rzz7kf31xinvafbl5hpd2ynf";
           system = "nontrivial-gray-streams";
           asd = "nontrivial-gray-streams";
@@ -77705,7 +77705,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "north" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
           sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk";
           system = "north";
           asd = "north";
@@ -77725,7 +77725,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "north-core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
           sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk";
           system = "north-core";
           asd = "north-core";
@@ -77752,7 +77752,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "north-dexador" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
           sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk";
           system = "north-dexador";
           asd = "north-dexador";
@@ -77775,7 +77775,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "north-drakma" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
           sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk";
           system = "north-drakma";
           asd = "north-drakma";
@@ -77798,7 +77798,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "north-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/north/2025-06-22/north-20250622-git.tgz";
           sha256 = "1vvcg5xd44siap7cfi4lzjdl7djq2vmyhpcdjd7fq86n30xqhnbk";
           system = "north-example";
           asd = "north-example";
@@ -77823,7 +77823,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nsb-cga" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "nsb-cga";
           asd = "nsb-cga";
@@ -77843,7 +77843,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nsort" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nsort/2015-05-05/nsort-20150505-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nsort/2015-05-05/nsort-20150505-git.tgz";
           sha256 = "1q58slg8pl390av8pv16xb8g9qibgy3pm6vyl1fw75mx37yqkyd3";
           system = "nsort";
           asd = "nsort";
@@ -77863,7 +77863,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nst" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
           sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga";
           system = "nst";
           asd = "nst";
@@ -77886,7 +77886,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nst-manual-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
           sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga";
           system = "nst-manual-tests";
           asd = "nst-manual-tests";
@@ -77910,7 +77910,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nst-meta-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
           sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga";
           system = "nst-meta-tests";
           asd = "nst-meta-tests";
@@ -77934,7 +77934,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nst-mop-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
           sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga";
           system = "nst-mop-utils";
           asd = "nst-mop-utils";
@@ -77957,7 +77957,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nst-selftest-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
           sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga";
           system = "nst-selftest-utils";
           asd = "nst-selftest-utils";
@@ -77977,7 +77977,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nst-simple-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
           sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga";
           system = "nst-simple-tests";
           asd = "nst-simple-tests";
@@ -78001,7 +78001,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nst-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
           sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga";
           system = "nst-test";
           asd = "nst-test";
@@ -78026,7 +78026,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nst-test-jenkins" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz";
           sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga";
           system = "nst-test-jenkins";
           asd = "nst-test-jenkins";
@@ -78050,7 +78050,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nuclblog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nuclblog/2014-08-26/nuclblog-20140826-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nuclblog/2014-08-26/nuclblog-20140826-git.tgz";
           sha256 = "03ngrxas65l7h9ykyy100arm0imvnrxxyyf809l8iqqv87b3k1hz";
           system = "nuclblog";
           asd = "nuclblog";
@@ -78078,7 +78078,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nuklear-blob" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nuklear-blob/2020-10-16/nuklear-blob-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nuklear-blob/2020-10-16/nuklear-blob-stable-git.tgz";
           sha256 = "1qqx08sd74ix027p6w35yr0ycp72swy1zzps015hwkiwxsawkncm";
           system = "nuklear-blob";
           asd = "nuklear-blob";
@@ -78102,7 +78102,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nuklear-renderer-blob" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nuklear-renderer-blob/2020-10-16/nuklear-renderer-blob-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nuklear-renderer-blob/2020-10-16/nuklear-renderer-blob-stable-git.tgz";
           sha256 = "0f73ns9dq02v7ixpbnvrfgp52cjdvmbbbhhfwjyv0ywxx30mrdq4";
           system = "nuklear-renderer-blob";
           asd = "nuklear-renderer-blob";
@@ -78126,7 +78126,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "null-package" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/null-package/2022-07-07/null-package-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/null-package/2022-07-07/null-package-20220707-git.tgz";
           sha256 = "1ildain46gw0nfnxdwfvasr5vg1fs93afni3k65sl5imc82g910f";
           system = "null-package";
           asd = "null-package";
@@ -78151,7 +78151,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "null-package.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/null-package/2022-07-07/null-package-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/null-package/2022-07-07/null-package-20220707-git.tgz";
           sha256 = "1ildain46gw0nfnxdwfvasr5vg1fs93afni3k65sl5imc82g910f";
           system = "null-package.test";
           asd = "null-package.test";
@@ -78175,7 +78175,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "num-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/numerical-utilities/2024-10-12/numerical-utilities-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/numerical-utilities/2024-10-12/numerical-utilities-20241012-git.tgz";
           sha256 = "00ck2bj4pqir2aan26xhirk41wzrfaziqmnngabhmwi0hz81bjs6";
           system = "num-utils";
           asd = "num-utils";
@@ -78202,7 +78202,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "numcl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/numcl/2022-11-06/numcl-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/numcl/2022-11-06/numcl-20221106-git.tgz";
           sha256 = "1x0j4vx5w3rn18pssfwys3ghfxr2lkkrv37y47144kr890jrcad9";
           system = "numcl";
           asd = "numcl";
@@ -78234,7 +78234,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "numcl.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/numcl/2022-11-06/numcl-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/numcl/2022-11-06/numcl-20221106-git.tgz";
           sha256 = "1x0j4vx5w3rn18pssfwys3ghfxr2lkkrv37y47144kr890jrcad9";
           system = "numcl.test";
           asd = "numcl.test";
@@ -78257,7 +78257,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "numericals" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/numericals/2025-06-22/numericals-2024.12.0.tgz";
+          url = "https://beta.quicklisp.org/archive/numericals/2025-06-22/numericals-2024.12.0.tgz";
           sha256 = "1pwfgicyqs5gp37d5fxq7zljs3w7h09y0m9hc70lqc9qfr4c61jp";
           system = "numericals";
           asd = "numericals";
@@ -78287,7 +78287,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "numericals.common" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/numericals/2025-06-22/numericals-2024.12.0.tgz";
+          url = "https://beta.quicklisp.org/archive/numericals/2025-06-22/numericals-2024.12.0.tgz";
           sha256 = "1pwfgicyqs5gp37d5fxq7zljs3w7h09y0m9hc70lqc9qfr4c61jp";
           system = "numericals.common";
           asd = "numericals.common";
@@ -78312,7 +78312,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "numpy-file-format" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/numpy-file-format/2023-10-21/numpy-file-format-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/numpy-file-format/2023-10-21/numpy-file-format-20231021-git.tgz";
           sha256 = "1n0nixc44z1cymm20wif0l2100ydv0h69l6i6xz5bmwcb2zc4gqr";
           system = "numpy-file-format";
           asd = "numpy-file-format";
@@ -78335,7 +78335,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nxt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-nxt/2015-06-08/cl-nxt-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-nxt/2015-06-08/cl-nxt-20150608-git.tgz";
           sha256 = "1r9004ra140i9v2pmxnjv86dix4040jr0rgww2zwk370zxys7h2g";
           system = "nxt";
           asd = "nxt";
@@ -78359,7 +78359,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nxt-proxy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-nxt/2015-06-08/cl-nxt-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-nxt/2015-06-08/cl-nxt-20150608-git.tgz";
           sha256 = "1r9004ra140i9v2pmxnjv86dix4040jr0rgww2zwk370zxys7h2g";
           system = "nxt-proxy";
           asd = "nxt-proxy";
@@ -78382,7 +78382,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nyaml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nyaml/2025-06-22/nyaml-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nyaml/2025-06-22/nyaml-20250622-git.tgz";
           sha256 = "0prd2q70rwm7d6g5xqh224rcrqpdyl3wzaxplj98wkhmjjsdzh2x";
           system = "nyaml";
           asd = "nyaml";
@@ -78411,7 +78411,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "nytpu.lisp-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/nytpu.lisp-utils/2025-06-22/nytpu.lisp-utils-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/nytpu.lisp-utils/2025-06-22/nytpu.lisp-utils-20250622-git.tgz";
           sha256 = "1bkjhym38zj5jb97w9mapr6ingwzihfywgb6nlmw7anjb0silam6";
           system = "nytpu.lisp-utils";
           asd = "nytpu.lisp-utils";
@@ -78431,7 +78431,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "object-class" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/object-class/2020-09-25/object-class_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/object-class/2020-09-25/object-class_1.0.tgz";
           sha256 = "0qagmd2mxbr8b60l0y3jccj0maxjchds96p935pd3q805ry50683";
           system = "object-class";
           asd = "object-class";
@@ -78455,7 +78455,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "object-class_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/object-class/2020-09-25/object-class_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/object-class/2020-09-25/object-class_1.0.tgz";
           sha256 = "0qagmd2mxbr8b60l0y3jccj0maxjchds96p935pd3q805ry50683";
           system = "object-class_tests";
           asd = "object-class_tests";
@@ -78479,7 +78479,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "oclcl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz";
           sha256 = "1ccyrv4fknpln5askl8cpnwbp28sikrs6i3dwzm86jwhv272zc8q";
           system = "oclcl";
           asd = "oclcl";
@@ -78509,7 +78509,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "oclcl-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz";
           sha256 = "1ccyrv4fknpln5askl8cpnwbp28sikrs6i3dwzm86jwhv272zc8q";
           system = "oclcl-examples";
           asd = "oclcl-examples";
@@ -78533,7 +78533,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "oclcl-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz";
           sha256 = "1ccyrv4fknpln5askl8cpnwbp28sikrs6i3dwzm86jwhv272zc8q";
           system = "oclcl-test";
           asd = "oclcl-test";
@@ -78558,7 +78558,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ode-blob" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ode-blob/2020-10-16/ode-blob-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ode-blob/2020-10-16/ode-blob-stable-git.tgz";
           sha256 = "1l2zq27zmivmr6h66kadbh3isnbdmkxvc7wq16wwmsvq23bhpss6";
           system = "ode-blob";
           asd = "ode-blob";
@@ -78582,7 +78582,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "odepack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "odepack";
           asd = "odepack";
@@ -78602,7 +78602,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "odesk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-odesk/2015-06-08/cl-odesk-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-odesk/2015-06-08/cl-odesk-20150608-git.tgz";
           sha256 = "1j5pjq4aw83m1in0l7ljn7jq4ixckg91p4h0lwf420xks3lhi4ka";
           system = "odesk";
           asd = "odesk";
@@ -78629,7 +78629,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "oe-encode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/oe-encode/2015-08-04/oe-encode-20150804-git.tgz";
+          url = "https://beta.quicklisp.org/archive/oe-encode/2015-08-04/oe-encode-20150804-git.tgz";
           sha256 = "18hd97509vpg04gaf8lzjr2jfyj3w4ql1ydb5202p2r9k4qpvnj9";
           system = "oe-encode";
           asd = "oe-encode";
@@ -78649,7 +78649,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "oe-encode-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/oe-encode/2015-08-04/oe-encode-20150804-git.tgz";
+          url = "https://beta.quicklisp.org/archive/oe-encode/2015-08-04/oe-encode-20150804-git.tgz";
           sha256 = "18hd97509vpg04gaf8lzjr2jfyj3w4ql1ydb5202p2r9k4qpvnj9";
           system = "oe-encode-test";
           asd = "oe-encode";
@@ -78672,7 +78672,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "olc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/olc/2022-03-31/olc-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/olc/2022-03-31/olc-20220331-git.tgz";
           sha256 = "02r6w9kfa6v4a12y2azmyjkxbn54r1y18c6a024vq4y6zp20fqnz";
           system = "olc";
           asd = "olc";
@@ -78692,7 +78692,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "omg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/omglib/2025-06-22/omglib-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/omglib/2025-06-22/omglib-20250622-git.tgz";
           sha256 = "0m3hzavsg8la8cjsdd153h1y8v2bjwmf31yl33nb7gnb2vb1nd5n";
           system = "omg";
           asd = "omg";
@@ -78724,7 +78724,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "omgdaemon" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/omglib/2025-06-22/omglib-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/omglib/2025-06-22/omglib-20250622-git.tgz";
           sha256 = "0m3hzavsg8la8cjsdd153h1y8v2bjwmf31yl33nb7gnb2vb1nd5n";
           system = "omgdaemon";
           asd = "omgdaemon";
@@ -78756,7 +78756,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "one-more-re-nightmare" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/one-more-re-nightmare/2025-06-22/one-more-re-nightmare-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/one-more-re-nightmare/2025-06-22/one-more-re-nightmare-20250622-git.tgz";
           sha256 = "0d4knmkbh81242l0j284y8h9sdgms22x8ngnpkqr47garrrfnp91";
           system = "one-more-re-nightmare";
           asd = "one-more-re-nightmare";
@@ -78785,7 +78785,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "one-more-re-nightmare-simd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/one-more-re-nightmare/2025-06-22/one-more-re-nightmare-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/one-more-re-nightmare/2025-06-22/one-more-re-nightmare-20250622-git.tgz";
           sha256 = "0d4knmkbh81242l0j284y8h9sdgms22x8ngnpkqr47garrrfnp91";
           system = "one-more-re-nightmare-simd";
           asd = "one-more-re-nightmare-simd";
@@ -78805,7 +78805,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "one-more-re-nightmare-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/one-more-re-nightmare/2025-06-22/one-more-re-nightmare-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/one-more-re-nightmare/2025-06-22/one-more-re-nightmare-20250622-git.tgz";
           sha256 = "0d4knmkbh81242l0j284y8h9sdgms22x8ngnpkqr47garrrfnp91";
           system = "one-more-re-nightmare-tests";
           asd = "one-more-re-nightmare-tests";
@@ -78829,7 +78829,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ook" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ook/2025-06-22/ook-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ook/2025-06-22/ook-20250622-git.tgz";
           sha256 = "0ibm7zii7nvjbz91ya5f98f1w3daxfpk1q6dcr59c9cimsnv2s3c";
           system = "ook";
           asd = "ook";
@@ -78849,7 +78849,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "oook" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/oook/2017-11-30/oook-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/oook/2017-11-30/oook-20171130-git.tgz";
           sha256 = "0vxw160kbb2b624lc2aqvrx91xnmfhwz8nrzjvmbk5m55q1s4hxr";
           system = "oook";
           asd = "oook";
@@ -78879,7 +78879,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "open-geneva" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz";
           sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3";
           system = "open-geneva";
           asd = "open-geneva";
@@ -78907,7 +78907,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "open-location-code" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/open-location-code/2024-10-12/open-location-code-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/open-location-code/2024-10-12/open-location-code-20241012-git.tgz";
           sha256 = "17ip3xzqr2jk9br39d58grrjbk6gsh2mq1a9irjg9a5fig0jlyb2";
           system = "open-location-code";
           asd = "open-location-code";
@@ -78930,7 +78930,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "open-vrp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/open-vrp/2014-09-14/open-vrp-20140914-git.tgz";
+          url = "https://beta.quicklisp.org/archive/open-vrp/2014-09-14/open-vrp-20140914-git.tgz";
           sha256 = "04k0kp18gpr4cfpsck7pjizawwswh372df4pvm5v87brm6xdw1fr";
           system = "open-vrp";
           asd = "open-vrp";
@@ -78955,7 +78955,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "open-vrp-lib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/open-vrp/2014-09-14/open-vrp-20140914-git.tgz";
+          url = "https://beta.quicklisp.org/archive/open-vrp/2014-09-14/open-vrp-20140914-git.tgz";
           sha256 = "04k0kp18gpr4cfpsck7pjizawwswh372df4pvm5v87brm6xdw1fr";
           system = "open-vrp-lib";
           asd = "open-vrp-lib";
@@ -78980,7 +78980,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "open-with" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/open-with/2025-06-22/open-with-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/open-with/2025-06-22/open-with-20250622-git.tgz";
           sha256 = "0j0qv1389wbr84y3mis4qd2zz9qybnq4frvc01pamidsbryxss0r";
           system = "open-with";
           asd = "open-with";
@@ -79003,7 +79003,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "openai-openapi-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openai-openapi-client/2024-10-12/openai-openapi-client-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/openai-openapi-client/2024-10-12/openai-openapi-client-20241012-git.tgz";
           sha256 = "0qyd9i0y75gf92kf8v22n6wmh63791115r7gmg9ca9pl0dgbpmg9";
           system = "openai-openapi-client";
           asd = "openai-openapi-client";
@@ -79029,7 +79029,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "openal-blob" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openal-blob/2020-10-16/openal-blob-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/openal-blob/2020-10-16/openal-blob-stable-git.tgz";
           sha256 = "0bspdqb0xbvwvi6xkn88n4jswpds8fzbgj44ygm7mi6lpwp7lmv2";
           system = "openal-blob";
           asd = "openal-blob";
@@ -79053,7 +79053,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "openapi-generator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openapi-generator/2025-06-22/openapi-generator-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/openapi-generator/2025-06-22/openapi-generator-20250622-git.tgz";
           sha256 = "0876fgy5k1i0sd53qyaic5idd9arf6q132yv2ilwskp78wp03x30";
           system = "openapi-generator";
           asd = "openapi-generator";
@@ -79091,7 +79091,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "openapi-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-openapi-parser/2023-06-18/cl-openapi-parser-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-openapi-parser/2023-06-18/cl-openapi-parser-20230618-git.tgz";
           sha256 = "1vjqmxgkd8zvsfa1m6jzp6adwv1hz79z1x662v0f567iar01rzyz";
           system = "openapi-parser";
           asd = "openapi-parser";
@@ -79121,7 +79121,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "openapi-parser-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-openapi-parser/2023-06-18/cl-openapi-parser-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-openapi-parser/2023-06-18/cl-openapi-parser-20230618-git.tgz";
           sha256 = "1vjqmxgkd8zvsfa1m6jzp6adwv1hz79z1x662v0f567iar01rzyz";
           system = "openapi-parser-tests";
           asd = "openapi-parser";
@@ -79144,7 +79144,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "openid-key" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openid-key/2018-12-10/openid-key-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/openid-key/2018-12-10/openid-key-20181210-git.tgz";
           sha256 = "0ja1g4f8nrcn965376j7lnhha9krx4wjqxrg6vc57k7rmkhkzm1z";
           system = "openid-key";
           asd = "openid-key";
@@ -79172,7 +79172,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "openid-key-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openid-key/2018-12-10/openid-key-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/openid-key/2018-12-10/openid-key-20181210-git.tgz";
           sha256 = "0ja1g4f8nrcn965376j7lnhha9krx4wjqxrg6vc57k7rmkhkzm1z";
           system = "openid-key-test";
           asd = "openid-key-test";
@@ -79195,7 +79195,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "openrpc-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
           sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0";
           system = "openrpc-ci";
           asd = "openrpc-ci";
@@ -79215,7 +79215,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "openrpc-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
           sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0";
           system = "openrpc-client";
           asd = "openrpc-client";
@@ -79247,7 +79247,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "openrpc-deps" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
           sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0";
           system = "openrpc-deps";
           asd = "openrpc-deps";
@@ -79267,7 +79267,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "openrpc-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
           sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0";
           system = "openrpc-docs";
           asd = "openrpc-docs";
@@ -79291,7 +79291,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "openrpc-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
           sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0";
           system = "openrpc-example";
           asd = "openrpc-example";
@@ -79320,7 +79320,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "openrpc-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
           sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0";
           system = "openrpc-server";
           asd = "openrpc-server";
@@ -79356,7 +79356,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "openrpc-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/openrpc/2025-06-22/openrpc-20250622-git.tgz";
           sha256 = "0nr9wr69v74861da7ibwjdzi338k39f7cz1acbw53j9d6wv49wb0";
           system = "openrpc-tests";
           asd = "openrpc-tests";
@@ -79387,7 +79387,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ops-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz";
           sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4";
           system = "ops-test";
           asd = "ops-test";
@@ -79407,7 +79407,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ops5" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ops5/2020-02-18/ops5-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ops5/2020-02-18/ops5-20200218-git.tgz";
           sha256 = "1q2mrza40qvhny06f4ks2dghyk8a7pjjsi3vj83b9if7fmyj152a";
           system = "ops5";
           asd = "ops5";
@@ -79427,7 +79427,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "opticl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/opticl/2022-02-20/opticl-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/opticl/2022-02-20/opticl-20220220-git.tgz";
           sha256 = "1jx9n78d4lf53iz24yid34l92zrpqxfihv6049ixcy0xigf7j4ac";
           system = "opticl";
           asd = "opticl";
@@ -79456,7 +79456,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "opticl-core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/opticl-core/2017-10-19/opticl-core-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/opticl-core/2017-10-19/opticl-core-20171019-git.tgz";
           sha256 = "0458bllabcdjghfrqx6aki49c9qmvfmkk8jl75cfpi7q0i12kh95";
           system = "opticl-core";
           asd = "opticl-core";
@@ -79476,7 +79476,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "opticl-doc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/opticl/2022-02-20/opticl-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/opticl/2022-02-20/opticl-20220220-git.tgz";
           sha256 = "1jx9n78d4lf53iz24yid34l92zrpqxfihv6049ixcy0xigf7j4ac";
           system = "opticl-doc";
           asd = "opticl-doc";
@@ -79501,7 +79501,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "optima" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz";
           sha256 = "1yw4ymq7ms89342kkvb3aqxgv0w38m9kd8ikdqxxzyybnkjhndal";
           system = "optima";
           asd = "optima";
@@ -79522,7 +79522,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "optima.ppcre" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz";
           sha256 = "1yw4ymq7ms89342kkvb3aqxgv0w38m9kd8ikdqxxzyybnkjhndal";
           system = "optima.ppcre";
           asd = "optima.ppcre";
@@ -79546,7 +79546,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "optima.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz";
           sha256 = "1yw4ymq7ms89342kkvb3aqxgv0w38m9kd8ikdqxxzyybnkjhndal";
           system = "optima.test";
           asd = "optima.test";
@@ -79570,7 +79570,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "or-cluster" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz";
           sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7";
           system = "or-cluster";
           asd = "or-cluster";
@@ -79594,7 +79594,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "or-fann" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz";
           sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7";
           system = "or-fann";
           asd = "or-fann";
@@ -79617,7 +79617,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "or-glpk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz";
           sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7";
           system = "or-glpk";
           asd = "or-glpk";
@@ -79640,7 +79640,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "or-gsl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz";
           sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7";
           system = "or-gsl";
           asd = "or-gsl";
@@ -79663,7 +79663,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "or-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz";
           sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7";
           system = "or-test";
           asd = "or-test";
@@ -79689,7 +79689,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org-davep-dict" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/org-davep-dict/2019-05-21/org-davep-dict-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/org-davep-dict/2019-05-21/org-davep-dict-20190521-git.tgz";
           sha256 = "09dryqlprssrw0jpcg2313cc1hmlsasxvp1rs5z7axhasc16kl31";
           system = "org-davep-dict";
           asd = "org-davep-dict";
@@ -79713,7 +79713,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org-davep-dictrepl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/org-davep-dictrepl/2019-05-21/org-davep-dictrepl-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/org-davep-dictrepl/2019-05-21/org-davep-dictrepl-20190521-git.tgz";
           sha256 = "1s461asil8cxsbcpyxsw3g7phdn5c3mwv6wswp86hsxiga5hi327";
           system = "org-davep-dictrepl";
           asd = "org-davep-dictrepl";
@@ -79733,7 +79733,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org-sampler" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/org-sampler/2016-03-18/org-sampler-0.2.0.tgz";
+          url = "https://beta.quicklisp.org/archive/org-sampler/2016-03-18/org-sampler-0.2.0.tgz";
           sha256 = "1j2i24x9afxp6s5gyqlvy11c0lq9rzhmdj1bf0qpxcaa4znj48c3";
           system = "org-sampler";
           asd = "org-sampler";
@@ -79753,7 +79753,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.melusina.atelier" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-atelier/2025-06-22/cl-atelier-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-atelier/2025-06-22/cl-atelier-20250622-git.tgz";
           sha256 = "1q95j1bsriil7b1d2i90h398iz84c743mai16ksl616mn0ydkhk8";
           system = "org.melusina.atelier";
           asd = "org.melusina.atelier";
@@ -79779,7 +79779,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.melusina.confidence" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-confidence/2024-10-12/cl-confidence-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-confidence/2024-10-12/cl-confidence-20241012-git.tgz";
           sha256 = "1azvv54zchw88gpzh4dkflz6y0pvf7wq433yc7m90fs3c70wmsjl";
           system = "org.melusina.confidence";
           asd = "org.melusina.confidence";
@@ -79799,7 +79799,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.melusina.rashell" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rashell/2024-10-12/cl-rashell-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rashell/2024-10-12/cl-rashell-20241012-git.tgz";
           sha256 = "0fpdyhfc68xy6m0ixfvcnczlmlwasby24k47nc25x73swshlxqwq";
           system = "org.melusina.rashell";
           asd = "org.melusina.rashell";
@@ -79823,7 +79823,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.melusina.webmachine" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-webmachine/2025-06-22/cl-webmachine-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-webmachine/2025-06-22/cl-webmachine-20250622-git.tgz";
           sha256 = "09nrd8wqwfnqgag1w078pwk0qiy4d32ib8wjhkfqpky7pxccp73h";
           system = "org.melusina.webmachine";
           asd = "org.melusina.webmachine";
@@ -79849,7 +79849,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.conduit-packages" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/conduit-packages/2025-06-22/conduit-packages-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/conduit-packages/2025-06-22/conduit-packages-20250622-git.tgz";
           sha256 = "1nb58r52ic3k7dyis1h3pb16hf6nr37hr03drf09xhxir4n6gj77";
           system = "org.tfeb.conduit-packages";
           asd = "org.tfeb.conduit-packages";
@@ -79869,7 +79869,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.dsm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/dsm/2025-06-22/dsm-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/dsm/2025-06-22/dsm-20250622-git.tgz";
           sha256 = "1ahibwfrjdxvxw2rhfq4804lb9bidyzxcxwplc7sdfcsjzbvnzk7";
           system = "org.tfeb.dsm";
           asd = "org.tfeb.dsm";
@@ -79895,7 +79895,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax";
           asd = "org.tfeb.hax";
@@ -79915,7 +79915,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.abstract-classes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.abstract-classes";
           asd = "org.tfeb.hax.abstract-classes";
@@ -79935,7 +79935,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.binding" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.binding";
           asd = "org.tfeb.hax.binding";
@@ -79958,7 +79958,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.collecting" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.collecting";
           asd = "org.tfeb.hax.collecting";
@@ -79978,7 +79978,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.comment-form" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.comment-form";
           asd = "org.tfeb.hax.comment-form";
@@ -79998,7 +79998,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.cs-forms" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.cs-forms";
           asd = "org.tfeb.hax.cs-forms";
@@ -80018,7 +80018,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.define-functions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.define-functions";
           asd = "org.tfeb.hax.define-functions";
@@ -80038,7 +80038,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.dynamic-state" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.dynamic-state";
           asd = "org.tfeb.hax.dynamic-state";
@@ -80058,7 +80058,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.iterate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.iterate";
           asd = "org.tfeb.hax.iterate";
@@ -80078,7 +80078,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.let-values" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.let-values";
           asd = "org.tfeb.hax.let-values";
@@ -80104,7 +80104,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.memoize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.memoize";
           asd = "org.tfeb.hax.memoize";
@@ -80124,7 +80124,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.metatronic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.metatronic";
           asd = "org.tfeb.hax.metatronic";
@@ -80144,7 +80144,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.object-accessors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.object-accessors";
           asd = "org.tfeb.hax.object-accessors";
@@ -80164,7 +80164,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.process-declarations" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.process-declarations";
           asd = "org.tfeb.hax.process-declarations";
@@ -80184,7 +80184,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.read-package" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.read-package";
           asd = "org.tfeb.hax.read-package";
@@ -80204,7 +80204,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.simple-loops" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.simple-loops";
           asd = "org.tfeb.hax.simple-loops";
@@ -80228,7 +80228,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.singleton-classes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.singleton-classes";
           asd = "org.tfeb.hax.singleton-classes";
@@ -80248,7 +80248,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.slog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.slog";
           asd = "org.tfeb.hax.slog";
@@ -80273,7 +80273,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.spam" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.spam";
           asd = "org.tfeb.hax.spam";
@@ -80293,7 +80293,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.stringtable" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.stringtable";
           asd = "org.tfeb.hax.stringtable";
@@ -80316,7 +80316,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.trace-macroexpand" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.trace-macroexpand";
           asd = "org.tfeb.hax.trace-macroexpand";
@@ -80336,7 +80336,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.utilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.utilities";
           asd = "org.tfeb.hax.utilities";
@@ -80356,7 +80356,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.hax.wrapping-standard" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-hax/2025-06-22/tfeb-lisp-hax-20250622-git.tgz";
           sha256 = "0b8nj2z3f1zfpcznhyxp56z2322rg23gjbw9qk2v2q6kpxc5g1fd";
           system = "org.tfeb.hax.wrapping-standard";
           asd = "org.tfeb.hax.wrapping-standard";
@@ -80376,7 +80376,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.tools" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz";
           sha256 = "180zg96ln2fp7fzdmf5yiz0dxy36r2ddq0nxl0dkmhbrn03bd4iq";
           system = "org.tfeb.tools";
           asd = "org.tfeb.tools";
@@ -80396,7 +80396,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.tools.asdf-module-sysdcls" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz";
           sha256 = "180zg96ln2fp7fzdmf5yiz0dxy36r2ddq0nxl0dkmhbrn03bd4iq";
           system = "org.tfeb.tools.asdf-module-sysdcls";
           asd = "org.tfeb.tools.asdf-module-sysdcls";
@@ -80416,7 +80416,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.tools.build-modules" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz";
           sha256 = "180zg96ln2fp7fzdmf5yiz0dxy36r2ddq0nxl0dkmhbrn03bd4iq";
           system = "org.tfeb.tools.build-modules";
           asd = "org.tfeb.tools.build-modules";
@@ -80436,7 +80436,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.tools.deprecations" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz";
           sha256 = "180zg96ln2fp7fzdmf5yiz0dxy36r2ddq0nxl0dkmhbrn03bd4iq";
           system = "org.tfeb.tools.deprecations";
           asd = "org.tfeb.tools.deprecations";
@@ -80456,7 +80456,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.tools.feature-expressions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz";
           sha256 = "180zg96ln2fp7fzdmf5yiz0dxy36r2ddq0nxl0dkmhbrn03bd4iq";
           system = "org.tfeb.tools.feature-expressions";
           asd = "org.tfeb.tools.feature-expressions";
@@ -80476,7 +80476,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.tools.install-providers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz";
           sha256 = "180zg96ln2fp7fzdmf5yiz0dxy36r2ddq0nxl0dkmhbrn03bd4iq";
           system = "org.tfeb.tools.install-providers";
           asd = "org.tfeb.tools.install-providers";
@@ -80496,7 +80496,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "org.tfeb.tools.require-module" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tfeb-lisp-tools/2023-10-21/tfeb-lisp-tools-20231021-git.tgz";
           sha256 = "180zg96ln2fp7fzdmf5yiz0dxy36r2ddq0nxl0dkmhbrn03bd4iq";
           system = "org.tfeb.tools.require-module";
           asd = "org.tfeb.tools.require-module";
@@ -80516,7 +80516,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "origin" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/origin/2022-07-07/origin-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/origin/2022-07-07/origin-20220707-git.tgz";
           sha256 = "01b5rn83w85fnd92x5jgan2a092y7ir420r55p2b0a98xpvb4a71";
           system = "origin";
           asd = "origin";
@@ -80536,7 +80536,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "origin.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/origin/2022-07-07/origin-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/origin/2022-07-07/origin-20220707-git.tgz";
           sha256 = "01b5rn83w85fnd92x5jgan2a092y7ir420r55p2b0a98xpvb4a71";
           system = "origin.test";
           asd = "origin.test";
@@ -80559,7 +80559,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "orizuru-orm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/orizuru-orm/2024-10-12/orizuru-orm-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/orizuru-orm/2024-10-12/orizuru-orm-20241012-git.tgz";
           sha256 = "064sr0nxz884vrh550d8v3v9pqgs65d97lrr3828qn6bgaxwm1va";
           system = "orizuru-orm";
           asd = "orizuru-orm";
@@ -80591,7 +80591,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "osc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/osc/2023-06-18/osc-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/osc/2023-06-18/osc-20230618-git.tgz";
           sha256 = "0gh29zcl9pmy3xlmwzpf9www2z06ah6b4jk06sj2cvxbc15nblqa";
           system = "osc";
           asd = "osc";
@@ -80611,7 +80611,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "osicat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/osicat/2025-06-22/osicat-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/osicat/2025-06-22/osicat-20250622-git.tgz";
           sha256 = "1cwh4dim62ffm0hcrswk543zm3ynrqbkjxcrrc1ndfjl1b5kgars";
           system = "osicat";
           asd = "osicat";
@@ -80634,7 +80634,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ospm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ospm/2023-10-21/ospm-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ospm/2023-10-21/ospm-20231021-git.tgz";
           sha256 = "1z2wz2xg7rn7p1lladdhj789iz2f3wfjgpi2hjr08vkf1pkp15xf";
           system = "ospm";
           asd = "ospm";
@@ -80663,7 +80663,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "overlord" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/overlord/2025-06-22/overlord-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/overlord/2025-06-22/overlord-20250622-git.tgz";
           sha256 = "1fr3nkycqhb2c5f94r9zv9b3viagik0qsx1bsrb4jcrr1r07vl4m";
           system = "overlord";
           asd = "overlord";
@@ -80702,7 +80702,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "oxenfurt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz";
           sha256 = "1yqw21l19091aghvnfpdp62zs8scspaas4syn2yajm1b55jzxvya";
           system = "oxenfurt";
           asd = "oxenfurt";
@@ -80722,7 +80722,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "oxenfurt-core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz";
           sha256 = "1yqw21l19091aghvnfpdp62zs8scspaas4syn2yajm1b55jzxvya";
           system = "oxenfurt-core";
           asd = "oxenfurt-core";
@@ -80747,7 +80747,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "oxenfurt-dexador" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz";
           sha256 = "1yqw21l19091aghvnfpdp62zs8scspaas4syn2yajm1b55jzxvya";
           system = "oxenfurt-dexador";
           asd = "oxenfurt-dexador";
@@ -80770,7 +80770,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "oxenfurt-drakma" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/oxenfurt/2023-10-21/oxenfurt-20231021-git.tgz";
           sha256 = "1yqw21l19091aghvnfpdp62zs8scspaas4syn2yajm1b55jzxvya";
           system = "oxenfurt-drakma";
           asd = "oxenfurt-drakma";
@@ -80793,7 +80793,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pack/2011-06-19/pack-20110619-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pack/2011-06-19/pack-20110619-git.tgz";
           sha256 = "1b3qi04v1wj9nig0mx591sl4phqcalwdl0vsnf4kqp4d2qx2czi1";
           system = "pack";
           asd = "pack";
@@ -80816,7 +80816,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "package-renaming" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/package-renaming/2012-04-07/package-renaming-20120407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/package-renaming/2012-04-07/package-renaming-20120407-git.tgz";
           sha256 = "15kgd15r9bib8wfnn3hmv42rlifr4ph3rv2mji5i9d5ixhyqqwgq";
           system = "package-renaming";
           asd = "package-renaming";
@@ -80836,7 +80836,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "package-renaming-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/package-renaming/2012-04-07/package-renaming-20120407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/package-renaming/2012-04-07/package-renaming-20120407-git.tgz";
           sha256 = "15kgd15r9bib8wfnn3hmv42rlifr4ph3rv2mji5i9d5ixhyqqwgq";
           system = "package-renaming-test";
           asd = "package-renaming-test";
@@ -80859,7 +80859,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "packet" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/packet/2015-03-02/packet-20150302-git.tgz";
+          url = "https://beta.quicklisp.org/archive/packet/2015-03-02/packet-20150302-git.tgz";
           sha256 = "1vcmxwrliwczz161nz3ysx9cbfia4cmlqgnjgrx5016lp394pnx1";
           system = "packet";
           asd = "packet";
@@ -80879,7 +80879,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "packet-crafting" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/packet-crafting/2020-06-10/packet-crafting-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/packet-crafting/2020-06-10/packet-crafting-20200610-git.tgz";
           sha256 = "1ivnvkbqckqf5hm6khffc2wkbjl64fn03w9i0kypkb0mrazxdpdq";
           system = "packet-crafting";
           asd = "packet-crafting";
@@ -80899,7 +80899,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "paiprolog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/paiprolog/2018-02-28/paiprolog-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/paiprolog/2018-02-28/paiprolog-20180228-git.tgz";
           sha256 = "1nxz01i6f8s920gm69r2kwjdpq9pli8b2ayqwijhzgjwi0r4jj9r";
           system = "paiprolog";
           asd = "paiprolog";
@@ -80919,7 +80919,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pal/2015-06-08/pal-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pal/2015-06-08/pal-20150608-git.tgz";
           sha256 = "0kn6jxirrn7wzqymzsi0kx2ivl0nrrcgbl4dm1714s48qw0jwhcw";
           system = "pal";
           asd = "pal";
@@ -80939,7 +80939,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pandocl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pandocl/2015-09-23/pandocl-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pandocl/2015-09-23/pandocl-20150923-git.tgz";
           sha256 = "1fmlpx5m7ivdkqss1fa3xqbpcwzqrpyyx2nny12aqxn8f13vpvmg";
           system = "pandocl";
           asd = "pandocl";
@@ -80967,7 +80967,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pango-markup" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pango-markup/2023-10-21/pango-markup-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pango-markup/2023-10-21/pango-markup-20231021-git.tgz";
           sha256 = "1165z3ycbkgr9g3ni1z59r258c1jd2viyf3mj8a5p72kx6dqb8gf";
           system = "pango-markup";
           asd = "pango-markup";
@@ -80987,7 +80987,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "papyrus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/papyrus/2025-06-22/papyrus-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/papyrus/2025-06-22/papyrus-20250622-git.tgz";
           sha256 = "1x5wmqjpxx1m7rvbspbv78h3him37n6klblp192yl0faz5v5p8x5";
           system = "papyrus";
           asd = "papyrus";
@@ -81007,7 +81007,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parachute" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz";
           sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr";
           system = "parachute";
           asd = "parachute";
@@ -81029,7 +81029,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parachute-fiveam" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz";
           sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr";
           system = "parachute-fiveam";
           asd = "parachute-fiveam";
@@ -81049,7 +81049,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parachute-lisp-unit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz";
           sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr";
           system = "parachute-lisp-unit";
           asd = "parachute-lisp-unit";
@@ -81069,7 +81069,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parachute-prove" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parachute/2025-06-22/parachute-20250622-git.tgz";
           sha256 = "0zsqva66pd0vmxz9wbwccnjmkw8b9gyzkx36w2mdpfxspab3r4vr";
           system = "parachute-prove";
           asd = "parachute-prove";
@@ -81092,7 +81092,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parameterized-function" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parameterized-function/2023-06-18/parameterized-function-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parameterized-function/2023-06-18/parameterized-function-20230618-git.tgz";
           sha256 = "0pjdk4il83izd4iiavg6z7ighmjfmg39j8gp82qq2kikzlmklxxf";
           system = "parameterized-function";
           asd = "parameterized-function";
@@ -81112,7 +81112,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "paren-files" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/paren-files/2011-04-18/paren-files-20110418-git.tgz";
+          url = "https://beta.quicklisp.org/archive/paren-files/2011-04-18/paren-files-20110418-git.tgz";
           sha256 = "19lwzvdn9gpn28x6ismkwzs49vr4cbc6drsivkmll3dxb950wgw9";
           system = "paren-files";
           asd = "paren-files";
@@ -81132,7 +81132,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "paren-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/paren-test/2017-08-30/paren-test-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/paren-test/2017-08-30/paren-test-20170830-git.tgz";
           sha256 = "0b2d3kcv3n4b0dm67pzhxx8wxjsgnb32bw2dsprblc7149gaczdr";
           system = "paren-test";
           asd = "paren-test";
@@ -81156,7 +81156,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "paren-util" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/paren-util/2011-04-18/paren-util-20110418-git.tgz";
+          url = "https://beta.quicklisp.org/archive/paren-util/2011-04-18/paren-util-20110418-git.tgz";
           sha256 = "0jn7sgndhpn9ndn3xfmsp03alj2qksqz6p1c5h6x8hvi46caqvpy";
           system = "paren-util";
           asd = "paren-util";
@@ -81179,7 +81179,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "paren6" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/paren6/2025-06-22/paren6-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/paren6/2025-06-22/paren6-20250622-git.tgz";
           sha256 = "1ib57mfq82c62nd0ikic6mjbivwv7x7g5fgjblq7jssms6s7h9wm";
           system = "paren6";
           asd = "paren6";
@@ -81202,7 +81202,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parenml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parenml/2015-09-23/parenml-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parenml/2015-09-23/parenml-20150923-git.tgz";
           sha256 = "0g6s5phinpcfhixgsfqniwxd3kd4bwh78s90ixs2fwk3qjhh9zsb";
           system = "parenml";
           asd = "parenml";
@@ -81226,7 +81226,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parenml-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parenml/2015-09-23/parenml-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parenml/2015-09-23/parenml-20150923-git.tgz";
           sha256 = "0g6s5phinpcfhixgsfqniwxd3kd4bwh78s90ixs2fwk3qjhh9zsb";
           system = "parenml-test";
           asd = "parenml-test";
@@ -81249,7 +81249,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parenscript" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parenscript/2025-06-22/parenscript-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parenscript/2025-06-22/parenscript-20250622-git.tgz";
           sha256 = "1nmn4ww339mhha51d0akppnyc031lap2kzribzlpr9jr89g2j39y";
           system = "parenscript";
           asd = "parenscript";
@@ -81271,7 +81271,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parenscript-classic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parenscript-classic/2011-12-03/parenscript-classic-20111203-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/parenscript-classic/2011-12-03/parenscript-classic-20111203-darcs.tgz";
           sha256 = "19zsiyjlz938la2dd39cy6lwh95m10j4nx8837xm6qk8rz5f8dgy";
           system = "parenscript-classic";
           asd = "parenscript-classic";
@@ -81291,7 +81291,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parenscript.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parenscript/2025-06-22/parenscript-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parenscript/2025-06-22/parenscript-20250622-git.tgz";
           sha256 = "1nmn4ww339mhha51d0akppnyc031lap2kzribzlpr9jr89g2j39y";
           system = "parenscript.tests";
           asd = "parenscript.tests";
@@ -81315,7 +81315,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parse" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parse/2020-09-25/parse-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parse/2020-09-25/parse-20200925-git.tgz";
           sha256 = "0l18yabyh7jizm5lgvra0jxi8s1cfwghidi6ix1pyixjkdbjlmvy";
           system = "parse";
           asd = "parse";
@@ -81335,7 +81335,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parse-declarations-1.0" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz";
           sha256 = "04l3s180wxq6xyhgd77mbd03a1w1m0j9snag961g2f9dd77w6q1r";
           system = "parse-declarations-1.0";
           asd = "parse-declarations-1.0";
@@ -81353,7 +81353,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parse-float" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz";
           sha256 = "0jd2spawc3v8vzqf8ky4cngl45jm65fhkrdf20mf6dcbn3mzpkmr";
           system = "parse-float";
           asd = "parse-float";
@@ -81371,7 +81371,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parse-float-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz";
           sha256 = "0jd2spawc3v8vzqf8ky4cngl45jm65fhkrdf20mf6dcbn3mzpkmr";
           system = "parse-float-tests";
           asd = "parse-float";
@@ -81394,7 +81394,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parse-front-matter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parse-front-matter/2016-08-25/parse-front-matter-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parse-front-matter/2016-08-25/parse-front-matter-20160825-git.tgz";
           sha256 = "1yzadrjwycvyzlzb0mixxmwi5bjzkjwylnv3aslnr1j14q44vq58";
           system = "parse-front-matter";
           asd = "parse-front-matter";
@@ -81414,7 +81414,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parse-front-matter-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parse-front-matter/2016-08-25/parse-front-matter-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parse-front-matter/2016-08-25/parse-front-matter-20160825-git.tgz";
           sha256 = "1yzadrjwycvyzlzb0mixxmwi5bjzkjwylnv3aslnr1j14q44vq58";
           system = "parse-front-matter-test";
           asd = "parse-front-matter-test";
@@ -81437,7 +81437,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parse-js" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parse-js/2016-04-21/parse-js-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parse-js/2016-04-21/parse-js-20160421-git.tgz";
           sha256 = "1wddrnr5kiya5s3gp4cdq6crbfy9fqcz7fr44p81502sj3bvdv39";
           system = "parse-js";
           asd = "parse-js";
@@ -81457,7 +81457,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parse-number" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parse-number/2024-10-12/parse-number-v1.8.tgz";
+          url = "https://beta.quicklisp.org/archive/parse-number/2024-10-12/parse-number-v1.8.tgz";
           sha256 = "1yh54v02i9b55bmkfkz59qd14irw8llasp48drbilkbz1az1qg2p";
           system = "parse-number";
           asd = "parse-number";
@@ -81475,7 +81475,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parse-number-range" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parse-number-range/2024-10-12/parse-number-range_1.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/parse-number-range/2024-10-12/parse-number-range_1.0.1.tgz";
           sha256 = "1kd0l3bcywhwmnjil0zzvq4cjlhpj2g1wiy7h7860nflzfz7qvds";
           system = "parse-number-range";
           asd = "parse-number-range";
@@ -81498,7 +81498,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parse-number-range_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parse-number-range/2024-10-12/parse-number-range_1.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/parse-number-range/2024-10-12/parse-number-range_1.0.1.tgz";
           sha256 = "1kd0l3bcywhwmnjil0zzvq4cjlhpj2g1wiy7h7860nflzfz7qvds";
           system = "parse-number-range_tests";
           asd = "parse-number-range_tests";
@@ -81521,7 +81521,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parse-rgb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tcod/2025-06-22/cl-tcod-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tcod/2025-06-22/cl-tcod-20250622-git.tgz";
           sha256 = "1m3fgfc7nfk8yn4z1c09lixnk0sr3szxqihq3fx4j6is430ywxdd";
           system = "parse-rgb";
           asd = "parse-rgb";
@@ -81544,7 +81544,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parseltongue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parseltongue/2013-03-12/parseltongue-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parseltongue/2013-03-12/parseltongue-20130312-git.tgz";
           sha256 = "1cjy7p0snms604zp6x0jlm4v9divqc5r38ns737hffj9q6pi1nlx";
           system = "parseltongue";
           asd = "parseltongue";
@@ -81564,7 +81564,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parseq" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parseq/2023-10-21/parseq-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parseq/2023-10-21/parseq-20231021-git.tgz";
           sha256 = "13bdv9slnkf4b3py5dfvdnxvyb7zxwf2apcbr2p3s7ij26qslbbw";
           system = "parseq";
           asd = "parseq";
@@ -81582,7 +81582,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parser-combinators" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz";
           sha256 = "1k49vha5xm2cklayzpqwg73n4v93xwsbs5in6342pkkiimnidhs8";
           system = "parser-combinators";
           asd = "parser-combinators";
@@ -81603,7 +81603,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parser-combinators-cl-ppcre" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz";
           sha256 = "1k49vha5xm2cklayzpqwg73n4v93xwsbs5in6342pkkiimnidhs8";
           system = "parser-combinators-cl-ppcre";
           asd = "parser-combinators-cl-ppcre";
@@ -81628,7 +81628,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parser-combinators-debug" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz";
           sha256 = "1k49vha5xm2cklayzpqwg73n4v93xwsbs5in6342pkkiimnidhs8";
           system = "parser-combinators-debug";
           asd = "parser-combinators-debug";
@@ -81651,7 +81651,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parser-combinators-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz";
           sha256 = "1k49vha5xm2cklayzpqwg73n4v93xwsbs5in6342pkkiimnidhs8";
           system = "parser-combinators-tests";
           asd = "parser-combinators-tests";
@@ -81677,7 +81677,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parser.common-rules" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz";
           sha256 = "138ygj0qp58jl4h79szg3i2gnwzywwc48qn1gj6dw113wasrnkwa";
           system = "parser.common-rules";
           asd = "parser.common-rules";
@@ -81700,7 +81700,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parser.common-rules.operators" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz";
           sha256 = "138ygj0qp58jl4h79szg3i2gnwzywwc48qn1gj6dw113wasrnkwa";
           system = "parser.common-rules.operators";
           asd = "parser.common-rules.operators";
@@ -81726,7 +81726,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parser.ini" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parser.ini/2018-10-18/parser.ini-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parser.ini/2018-10-18/parser.ini-20181018-git.tgz";
           sha256 = "0ri4c7877i9val67z5sm8nfhz04p9l6brajx2fkavs8556l1wm1d";
           system = "parser.ini";
           asd = "parser.ini";
@@ -81753,7 +81753,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "parsnip" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/parsnip/2022-03-31/parsnip-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/parsnip/2022-03-31/parsnip-20220331-git.tgz";
           sha256 = "0gl7z8kn37qiz0vab89wawn78iczii7iqw43jy2ls7nw0l5jv13w";
           system = "parsnip";
           asd = "parsnip";
@@ -81773,7 +81773,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "patchwork" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/patchwork/2022-07-07/patchwork-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/patchwork/2022-07-07/patchwork-20220707-git.tgz";
           sha256 = "08d08hslcs69509wj56mlklv1cz5lq2rz0sl870zcxyn4j1nnf3f";
           system = "patchwork";
           asd = "patchwork";
@@ -81797,7 +81797,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "path-parse" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/path-parse/2016-04-21/path-parse-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/path-parse/2016-04-21/path-parse-20160421-git.tgz";
           sha256 = "10mxm6q62cfpv3hw2w8k968ba8a1xglqdkwlkqs4l4nby3b11aaq";
           system = "path-parse";
           asd = "path-parse";
@@ -81817,7 +81817,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "path-parse-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/path-parse/2016-04-21/path-parse-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/path-parse/2016-04-21/path-parse-20160421-git.tgz";
           sha256 = "10mxm6q62cfpv3hw2w8k968ba8a1xglqdkwlkqs4l4nby3b11aaq";
           system = "path-parse-test";
           asd = "path-parse-test";
@@ -81840,7 +81840,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "path-string" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/path-string/2016-08-25/path-string-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/path-string/2016-08-25/path-string-20160825-git.tgz";
           sha256 = "0hs36kf4njxafxrngs1m1sh9c7b9wv7sa8n316dq4icx3kf3v6yp";
           system = "path-string";
           asd = "path-string";
@@ -81863,7 +81863,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "path-string-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/path-string/2016-08-25/path-string-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/path-string/2016-08-25/path-string-20160825-git.tgz";
           sha256 = "0hs36kf4njxafxrngs1m1sh9c7b9wv7sa8n316dq4icx3kf3v6yp";
           system = "path-string-test";
           asd = "path-string-test";
@@ -81887,7 +81887,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pathname-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pathname-utils/2025-06-22/pathname-utils-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pathname-utils/2025-06-22/pathname-utils-20250622-git.tgz";
           sha256 = "1b89i0n70hr4wbbd9lqp0zf4sz70yvj5dn7x9a7mp1510g2wrii1";
           system = "pathname-utils";
           asd = "pathname-utils";
@@ -81907,7 +81907,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pathname-utils-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pathname-utils/2025-06-22/pathname-utils-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pathname-utils/2025-06-22/pathname-utils-20250622-git.tgz";
           sha256 = "1b89i0n70hr4wbbd9lqp0zf4sz70yvj5dn7x9a7mp1510g2wrii1";
           system = "pathname-utils-test";
           asd = "pathname-utils-test";
@@ -81930,7 +81930,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "patron" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/patron/2013-04-20/patron-20130420-git.tgz";
+          url = "https://beta.quicklisp.org/archive/patron/2013-04-20/patron-20130420-git.tgz";
           sha256 = "0i2vlwspnssjxdnq7dsrb98q3y8c8drd0a11nxn9808q76sqzsqc";
           system = "patron";
           asd = "patron";
@@ -81950,7 +81950,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcall" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz";
+          url = "https://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz";
           sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps";
           system = "pcall";
           asd = "pcall";
@@ -81971,7 +81971,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcall-queue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz";
+          url = "https://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz";
           sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps";
           system = "pcall-queue";
           asd = "pcall-queue";
@@ -81989,7 +81989,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcall-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz";
+          url = "https://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz";
           sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps";
           system = "pcall-tests";
           asd = "pcall";
@@ -82012,7 +82012,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcl-binary-data" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
           sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9";
           system = "pcl-binary-data";
           asd = "pcl-binary-data";
@@ -82032,7 +82032,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcl-html" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
           sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9";
           system = "pcl-html";
           asd = "pcl-html";
@@ -82052,7 +82052,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcl-id3v2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
           sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9";
           system = "pcl-id3v2";
           asd = "pcl-id3v2";
@@ -82075,7 +82075,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcl-macro-utilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
           sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9";
           system = "pcl-macro-utilities";
           asd = "pcl-macro-utilities";
@@ -82095,7 +82095,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcl-mp3-browser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
           sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9";
           system = "pcl-mp3-browser";
           asd = "pcl-mp3-browser";
@@ -82122,7 +82122,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcl-mp3-database" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
           sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9";
           system = "pcl-mp3-database";
           asd = "pcl-mp3-database";
@@ -82146,7 +82146,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcl-pathnames" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
           sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9";
           system = "pcl-pathnames";
           asd = "pcl-pathnames";
@@ -82166,7 +82166,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcl-shoutcast" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
           sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9";
           system = "pcl-shoutcast";
           asd = "pcl-shoutcast";
@@ -82193,7 +82193,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcl-simple-database" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
           sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9";
           system = "pcl-simple-database";
           asd = "pcl-simple-database";
@@ -82213,7 +82213,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcl-spam" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
           sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9";
           system = "pcl-spam";
           asd = "pcl-spam";
@@ -82237,7 +82237,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcl-test-framework" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
           sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9";
           system = "pcl-test-framework";
           asd = "pcl-test-framework";
@@ -82257,7 +82257,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcl-unit-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz";
           sha256 = "1qc8gzp7f4phgyi5whkxacrqzdqs0y1hvkf71m8n7l303jly9wjf";
           system = "pcl-unit-test";
           asd = "pcl-unit-test";
@@ -82277,7 +82277,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pcl-url-function" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
           sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9";
           system = "pcl-url-function";
           asd = "pcl-url-function";
@@ -82301,7 +82301,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "peltadot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/peltadot/2025-06-22/peltadot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/peltadot/2025-06-22/peltadot-20250622-git.tgz";
           sha256 = "1d1f7b864pd16aivf53y6sr5kczlibzlvcjlrllsfbrv4ygx759z";
           system = "peltadot";
           asd = "peltadot";
@@ -82336,7 +82336,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "peltadot-traits-library" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/peltadot/2025-06-22/peltadot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/peltadot/2025-06-22/peltadot-20250622-git.tgz";
           sha256 = "1d1f7b864pd16aivf53y6sr5kczlibzlvcjlrllsfbrv4ygx759z";
           system = "peltadot-traits-library";
           asd = "peltadot-traits-library";
@@ -82356,7 +82356,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "peppol" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-peppol/2020-10-16/cl-peppol-20201016-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-peppol/2020-10-16/cl-peppol-20201016-git.tgz";
           sha256 = "02wc6h1fiaqzf14py2kwsvx0dmb22wdkd54pl0ixnmivj436ln99";
           system = "peppol";
           asd = "peppol";
@@ -82379,7 +82379,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "percent-encoding" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/percent-encoding/2012-10-13/percent-encoding-20121013-git.tgz";
+          url = "https://beta.quicklisp.org/archive/percent-encoding/2012-10-13/percent-encoding-20121013-git.tgz";
           sha256 = "0q1lh3sa6mkjr5gcdkgimkpc29rgf9cjhv90f61h8ridj28grq0h";
           system = "percent-encoding";
           asd = "percent-encoding";
@@ -82402,7 +82402,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "percent-encoding-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/percent-encoding/2012-10-13/percent-encoding-20121013-git.tgz";
+          url = "https://beta.quicklisp.org/archive/percent-encoding/2012-10-13/percent-encoding-20121013-git.tgz";
           sha256 = "0q1lh3sa6mkjr5gcdkgimkpc29rgf9cjhv90f61h8ridj28grq0h";
           system = "percent-encoding-test";
           asd = "percent-encoding";
@@ -82425,7 +82425,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "perceptual-hashes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/perceptual-hashes/2022-07-07/perceptual-hashes-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/perceptual-hashes/2022-07-07/perceptual-hashes-20220707-git.tgz";
           sha256 = "1hg2vxi4avmjwscgab7wqf3c4d60x933lac4d86fmfk0wgl5nzzd";
           system = "perceptual-hashes";
           asd = "perceptual-hashes";
@@ -82450,7 +82450,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "periodic-table" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/periodic-table/2011-10-01/periodic-table-1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/periodic-table/2011-10-01/periodic-table-1.0.tgz";
           sha256 = "147j9kn0afsvlz09vdjmvw5si08ix3dyypg21vrc5xvn9nsalrxx";
           system = "periodic-table";
           asd = "periodic-table";
@@ -82470,7 +82470,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "periods" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/periods/2022-11-06/periods-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/periods/2022-11-06/periods-20221106-git.tgz";
           sha256 = "0ynhdmlzb499mlm7c7zy6vgw8vglkkf14zr0v40jcl1sgq3236ry";
           system = "periods";
           asd = "periods";
@@ -82490,7 +82490,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "periods-series" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/periods/2022-11-06/periods-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/periods/2022-11-06/periods-20221106-git.tgz";
           sha256 = "0ynhdmlzb499mlm7c7zy6vgw8vglkkf14zr0v40jcl1sgq3236ry";
           system = "periods-series";
           asd = "periods-series";
@@ -82513,7 +82513,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "perlre" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/perlre/2020-07-15/perlre-20200715-git.tgz";
+          url = "https://beta.quicklisp.org/archive/perlre/2020-07-15/perlre-20200715-git.tgz";
           sha256 = "1izhrn1xd0mi2nl0p6930ln3nb4wp3y5ngg81wy5g5s4vqy2h54a";
           system = "perlre";
           asd = "perlre";
@@ -82540,7 +82540,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pero" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pero/2023-02-14/pero-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pero/2023-02-14/pero-20230214-git.tgz";
           sha256 = "1q513lvnq4m8l332glriid0vxcdcnakcdag3lck1wmrfaxhdpnmc";
           system = "pero";
           asd = "pero";
@@ -82563,7 +82563,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "persistent" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "persistent";
           asd = "persistent";
@@ -82583,7 +82583,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "persistent-tables" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/persistent-tables/2012-02-08/persistent-tables-20120208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/persistent-tables/2012-02-08/persistent-tables-20120208-git.tgz";
           sha256 = "0klfjza85mgj2z42x2lhcqy9q66avac7zw0cpbmwwng3m7679hpa";
           system = "persistent-tables";
           asd = "persistent-tables";
@@ -82606,7 +82606,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "persistent-variables" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/persistent-variables/2013-03-12/persistent-variables-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/persistent-variables/2013-03-12/persistent-variables-20130312-git.tgz";
           sha256 = "0r72cbjkb5q4sn109svlcsvrwgvwdsn5c63rv5cpaf3jrfv1z8xn";
           system = "persistent-variables";
           asd = "persistent-variables";
@@ -82626,7 +82626,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "persistent-variables.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/persistent-variables/2013-03-12/persistent-variables-20130312-git.tgz";
+          url = "https://beta.quicklisp.org/archive/persistent-variables/2013-03-12/persistent-variables-20130312-git.tgz";
           sha256 = "0r72cbjkb5q4sn109svlcsvrwgvwdsn5c63rv5cpaf3jrfv1z8xn";
           system = "persistent-variables.test";
           asd = "persistent-variables";
@@ -82646,7 +82646,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petalisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
           sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp";
           asd = "petalisp";
@@ -82669,7 +82669,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petalisp.api" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
           sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.api";
           asd = "petalisp.api";
@@ -82701,7 +82701,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petalisp.benchmarks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
           sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.benchmarks";
           asd = "petalisp.benchmarks";
@@ -82725,7 +82725,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petalisp.codegen" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
           sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.codegen";
           asd = "petalisp.codegen";
@@ -82754,7 +82754,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petalisp.core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
           sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.core";
           asd = "petalisp.core";
@@ -82782,7 +82782,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petalisp.examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
           sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.examples";
           asd = "petalisp.examples";
@@ -82805,7 +82805,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petalisp.graphviz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
           sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.graphviz";
           asd = "petalisp.graphviz";
@@ -82835,7 +82835,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petalisp.ir" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
           sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.ir";
           asd = "petalisp.ir";
@@ -82862,7 +82862,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petalisp.native-backend" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
           sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.native-backend";
           asd = "petalisp.native-backend";
@@ -82895,7 +82895,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petalisp.packages" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
           sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.packages";
           asd = "petalisp.packages";
@@ -82915,7 +82915,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petalisp.test-suite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
           sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.test-suite";
           asd = "petalisp.test-suite";
@@ -82941,7 +82941,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petalisp.utilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petalisp/2025-06-22/petalisp-20250622-git.tgz";
           sha256 = "07va649d3j2dn0zv3vc3yvkavylv9fdfiz000mgiyid42ysakr11";
           system = "petalisp.utilities";
           asd = "petalisp.utilities";
@@ -82967,7 +82967,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petit.package-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petit.package-utils/2014-08-26/petit.package-utils-20140826-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petit.package-utils/2014-08-26/petit.package-utils-20140826-git.tgz";
           sha256 = "0jj4c1jpcqfy9mrlxhjmq4ypwlzk84h09i8nr34wjwh6z7idhpyv";
           system = "petit.package-utils";
           asd = "petit.package-utils";
@@ -82987,7 +82987,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petit.string-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petit.string-utils/2014-11-06/petit.string-utils-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petit.string-utils/2014-11-06/petit.string-utils-20141106-git.tgz";
           sha256 = "04kqdj69x53wzvpp54zp6767186in24p8yrr82wdg2bwzw4qh4yl";
           system = "petit.string-utils";
           asd = "petit.string-utils";
@@ -83007,7 +83007,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petit.string-utils-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petit.string-utils/2014-11-06/petit.string-utils-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petit.string-utils/2014-11-06/petit.string-utils-20141106-git.tgz";
           sha256 = "04kqdj69x53wzvpp54zp6767186in24p8yrr82wdg2bwzw4qh4yl";
           system = "petit.string-utils-test";
           asd = "petit.string-utils-test";
@@ -83030,7 +83030,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "petri" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/petri/2020-04-27/petri-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/petri/2020-04-27/petri-20200427-git.tgz";
           sha256 = "1y78s3jndyxll46zq7s5is9pwv8f6jr2npjkcpd48ik7xkj2269b";
           system = "petri";
           asd = "petri";
@@ -83056,7 +83056,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pettomato-deque" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pettomato-deque/2012-01-07/pettomato-deque-20120107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pettomato-deque/2012-01-07/pettomato-deque-20120107-git.tgz";
           sha256 = "07ai4fa64cg6shfvnx9xk7pscbsz64ys80482zz2fb9q0rba80b7";
           system = "pettomato-deque";
           asd = "pettomato-deque";
@@ -83076,7 +83076,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pettomato-deque-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pettomato-deque/2012-01-07/pettomato-deque-20120107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pettomato-deque/2012-01-07/pettomato-deque-20120107-git.tgz";
           sha256 = "07ai4fa64cg6shfvnx9xk7pscbsz64ys80482zz2fb9q0rba80b7";
           system = "pettomato-deque-tests";
           asd = "pettomato-deque-tests";
@@ -83099,7 +83099,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pettomato-indexed-priority-queue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pettomato-indexed-priority-queue/2012-09-09/pettomato-indexed-priority-queue-20120909-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pettomato-indexed-priority-queue/2012-09-09/pettomato-indexed-priority-queue-20120909-git.tgz";
           sha256 = "14i36qbdnif28xcbxdbr5abzmzxr7vzv64n1aix0f6khxg99pylz";
           system = "pettomato-indexed-priority-queue";
           asd = "pettomato-indexed-priority-queue";
@@ -83119,7 +83119,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pettomato-indexed-priority-queue-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pettomato-indexed-priority-queue/2012-09-09/pettomato-indexed-priority-queue-20120909-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pettomato-indexed-priority-queue/2012-09-09/pettomato-indexed-priority-queue-20120909-git.tgz";
           sha256 = "14i36qbdnif28xcbxdbr5abzmzxr7vzv64n1aix0f6khxg99pylz";
           system = "pettomato-indexed-priority-queue-tests";
           asd = "pettomato-indexed-priority-queue-tests";
@@ -83142,7 +83142,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pfft" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/fft/2018-07-11/fft-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/fft/2018-07-11/fft-20180711-git.tgz";
           sha256 = "0ymnfplap2cncw49mhq7crapgxphfwsvqdgrcckpgsvw6qsymasd";
           system = "pfft";
           asd = "pfft";
@@ -83165,7 +83165,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pg/2015-06-08/pg-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pg/2015-06-08/pg-20150608-git.tgz";
           sha256 = "1c7axd2yxw9lxf7l5djrnfkp197mmr88qpigy2cjgim8vxab4n2l";
           system = "pg";
           asd = "pg";
@@ -83185,7 +83185,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pgloader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pgloader/2022-11-06/pgloader-v3.6.9.tgz";
+          url = "https://beta.quicklisp.org/archive/pgloader/2022-11-06/pgloader-v3.6.9.tgz";
           sha256 = "03kp3ms2sjz4gwb94xs404mi63fnv1bq00hyqxyvc9csmicxzawn";
           system = "pgloader";
           asd = "pgloader";
@@ -83238,7 +83238,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "phoe-toolbox" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/phoe-toolbox/2021-01-24/phoe-toolbox-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/phoe-toolbox/2021-01-24/phoe-toolbox-20210124-git.tgz";
           sha256 = "0bzbgs4lkhw93y1cwrs9kp5yiyz8sg4885cnvi83dzzbla9b74kv";
           system = "phoe-toolbox";
           asd = "phoe-toolbox";
@@ -83262,7 +83262,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "phonon" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "phonon";
           asd = "phonon";
@@ -83289,7 +83289,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "phos" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/phos/2024-10-12/phos-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/phos/2024-10-12/phos-20241012-git.tgz";
           sha256 = "0lnv54iczidjpskciw7y2faazgxjwpncggdh5kggpjziq03pr7lv";
           system = "phos";
           asd = "phos";
@@ -83315,7 +83315,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "physical-dimension" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz";
+          url = "https://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz";
           sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0";
           system = "physical-dimension";
           asd = "physical-dimension";
@@ -83339,7 +83339,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "physical-quantities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/physical-quantities/2021-10-20/physical-quantities-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/physical-quantities/2021-10-20/physical-quantities-20211020-git.tgz";
           sha256 = "0mb2s94s6fhw5vfa89naalw7ld11sdsszlqpz0c65dvpfyfmmdmh";
           system = "physical-quantities";
           asd = "physical-quantities";
@@ -83357,7 +83357,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "picl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/picl/2024-10-12/picl-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/picl/2024-10-12/picl-20241012-git.tgz";
           sha256 = "0pdzlmphf1bqk5xdvwf1m1l3s5whwm4ysnpl5kpwq70adx38rysk";
           system = "picl";
           asd = "picl";
@@ -83380,7 +83380,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "piggyback-parameters" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/piggyback-parameters/2020-06-10/piggyback-parameters-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/piggyback-parameters/2020-06-10/piggyback-parameters-20200610-git.tgz";
           sha256 = "1187bgnz9pvs8xdxapqhrm4yqzwlp368ijmc5szm8r8q3zrb219n";
           system = "piggyback-parameters";
           asd = "piggyback-parameters";
@@ -83404,7 +83404,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pileup" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pileup/2015-07-09/pileup-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pileup/2015-07-09/pileup-20150709-git.tgz";
           sha256 = "01gvshpxil0ggjgfmgcymbgmpsfaxy6aggm0bywkn40rck3038vb";
           system = "pileup";
           asd = "pileup";
@@ -83424,7 +83424,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pileup-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pileup/2015-07-09/pileup-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pileup/2015-07-09/pileup-20150709-git.tgz";
           sha256 = "01gvshpxil0ggjgfmgcymbgmpsfaxy6aggm0bywkn40rck3038vb";
           system = "pileup-tests";
           asd = "pileup";
@@ -83447,7 +83447,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pipes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pipes/2015-09-23/pipes-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pipes/2015-09-23/pipes-20150923-git.tgz";
           sha256 = "17qcxalbdip20nkbwiv3kpdjjsy0g1y9s4a0zv38ch47bdl9yxpc";
           system = "pipes";
           asd = "pipes";
@@ -83467,7 +83467,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "piping" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/piping/2025-06-22/piping-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/piping/2025-06-22/piping-20250622-git.tgz";
           sha256 = "0c5mbgl19krr62gddfhqm7nybqwcdnla4d6gsifqizhyfmqsyl7n";
           system = "piping";
           asd = "piping";
@@ -83487,7 +83487,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pithy-xml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pithy-xml/2025-06-22/pithy-xml-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pithy-xml/2025-06-22/pithy-xml-20250622-git.tgz";
           sha256 = "03sjn0n2av6d4kd1xi156izlhiknwwqkkga375kv7mx8c7xvl6zj";
           system = "pithy-xml";
           asd = "pithy-xml";
@@ -83507,7 +83507,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pixman" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-pixman/2017-08-30/cl-pixman-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-pixman/2017-08-30/cl-pixman-20170830-git.tgz";
           sha256 = "068hh7cv6f2wqwd8092wqh3rgdix6sa319qpm648mss8jfnjjbgj";
           system = "pixman";
           asd = "pixman";
@@ -83531,7 +83531,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pjlink" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pjlink/2022-03-31/pjlink-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pjlink/2022-03-31/pjlink-20220331-git.tgz";
           sha256 = "1rsmg0x7fd32na36x9ahj6vji3xs6ckg5pyng8nf33fmdj8dscbc";
           system = "pjlink";
           asd = "pjlink";
@@ -83559,7 +83559,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pk-serialize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pk-serialize/2022-11-06/pk-serialize-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pk-serialize/2022-11-06/pk-serialize-20221106-git.tgz";
           sha256 = "1fi9xxdlg2z9dnqb2sc7wg37aqzqjz43h2l1wxa5zvk73qqzapyn";
           system = "pk-serialize";
           asd = "pk-serialize";
@@ -83579,7 +83579,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pkg-doc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pkg-doc/2020-09-25/pkg-doc-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pkg-doc/2020-09-25/pkg-doc-20200925-git.tgz";
           sha256 = "1y4dcc0q3iizgvavnkl8q4bjxq0dngvqw5dhrf9bxf4d3q3vrbd4";
           system = "pkg-doc";
           asd = "pkg-doc";
@@ -83606,7 +83606,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "place-modifiers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/place-modifiers/2012-11-25/place-modifiers-2.1.tgz";
+          url = "https://beta.quicklisp.org/archive/place-modifiers/2012-11-25/place-modifiers-2.1.tgz";
           sha256 = "13nd911h6i7gks78l30bzdqzygcqh47946jwaf50ak2iraagknvf";
           system = "place-modifiers";
           asd = "place-modifiers";
@@ -83629,7 +83629,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "place-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/place-utils/2018-10-18/place-utils-0.2.tgz";
+          url = "https://beta.quicklisp.org/archive/place-utils/2018-10-18/place-utils-0.2.tgz";
           sha256 = "1riaxxafn2xbyy6776yqns1bhz5jnzzpd177wb5xzvwlxiix6yf9";
           system = "place-utils";
           asd = "place-utils";
@@ -83649,7 +83649,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "plokami" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plokami/2020-02-18/plokami-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plokami/2020-02-18/plokami-20200218-git.tgz";
           sha256 = "1k78lpbaqqa2gnwi9k0y646md4s9xnijm774knl11p05r83w5ycb";
           system = "plokami";
           asd = "plokami";
@@ -83669,7 +83669,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "plot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plot/2024-10-12/plot-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plot/2024-10-12/plot-20241012-git.tgz";
           sha256 = "1x5kc5y0s082y24qgq138331qmfs0xxxj43ss3aw0kgx7wfpxlms";
           system = "plot";
           asd = "plot";
@@ -83694,7 +83694,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "plplot-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-plplot/2018-02-28/cl-plplot-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-plplot/2018-02-28/cl-plplot-20180228-git.tgz";
           sha256 = "0hfgq47ga2r764jfc3ywaz5ynnvp701fjhbw0s4j1mrw4gaf6y6w";
           system = "plplot-examples";
           asd = "cl-plplot";
@@ -83717,7 +83717,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pludeck" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pludeck/2018-08-31/pludeck-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pludeck/2018-08-31/pludeck-20180831-git.tgz";
           sha256 = "0p6v7fxs48fxr76kvkh6z2mjjyz3vf2rp698jq1fl6p3hihbgl0m";
           system = "pludeck";
           asd = "pludeck";
@@ -83737,7 +83737,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "plump" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz";
           sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq";
           system = "plump";
           asd = "plump";
@@ -83758,7 +83758,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "plump-bundle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plump-bundle/2023-10-21/plump-bundle-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plump-bundle/2023-10-21/plump-bundle-20231021-git.tgz";
           sha256 = "0qknmdryyynjk5g0zda2788p4j0s6w4fj27kdca22z0n8r8yfhhk";
           system = "plump-bundle";
           asd = "plump-bundle";
@@ -83783,7 +83783,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "plump-dom" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz";
           sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq";
           system = "plump-dom";
           asd = "plump-dom";
@@ -83803,7 +83803,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "plump-lexer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz";
           sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq";
           system = "plump-lexer";
           asd = "plump-lexer";
@@ -83823,7 +83823,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "plump-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plump/2025-06-22/plump-20250622-git.tgz";
           sha256 = "181skw88n8z9997fcwbkjm5p42rnf1q8sv4m443qjc0a4y8b3pgq";
           system = "plump-parser";
           asd = "plump-parser";
@@ -83843,7 +83843,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "plump-sexp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plump-sexp/2025-06-22/plump-sexp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plump-sexp/2025-06-22/plump-sexp-20250622-git.tgz";
           sha256 = "0rl7abbaiwggdblcirn3mdcnnghvq9x9sn4pqk9fmkmsn3ladm7a";
           system = "plump-sexp";
           asd = "plump-sexp";
@@ -83863,7 +83863,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "plump-tex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plump-tex/2023-10-21/plump-tex-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plump-tex/2023-10-21/plump-tex-20231021-git.tgz";
           sha256 = "1k0cmk5sbn042bx7nxiw0rvsjmgmj221zim1hg23r0485jbx0r3h";
           system = "plump-tex";
           asd = "plump-tex";
@@ -83886,7 +83886,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "plump-tex-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plump-tex/2023-10-21/plump-tex-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plump-tex/2023-10-21/plump-tex-20231021-git.tgz";
           sha256 = "1k0cmk5sbn042bx7nxiw0rvsjmgmj221zim1hg23r0485jbx0r3h";
           system = "plump-tex-test";
           asd = "plump-tex-test";
@@ -83909,7 +83909,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "png" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz";
           sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4";
           system = "png";
           asd = "png";
@@ -83932,7 +83932,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "png-read" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/png-read/2017-08-30/png-read-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/png-read/2017-08-30/png-read-20170830-git.tgz";
           sha256 = "0vyczbcwskrygrf1hgrsnk0jil8skmvf1kiaalw5jps4fjrfdkw0";
           system = "png-read";
           asd = "png-read";
@@ -83956,7 +83956,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "png-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz";
           sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4";
           system = "png-test";
           asd = "png-test";
@@ -83976,7 +83976,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pngload" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pngload/2024-10-12/pngload-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pngload/2024-10-12/pngload-20241012-git.tgz";
           sha256 = "1j5j8n8xa8hgc413lfxij3wmkwyal13p0a5q6n74zzr61f1kn6vc";
           system = "pngload";
           asd = "pngload";
@@ -84005,7 +84005,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pngload.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pngload/2024-10-12/pngload-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pngload/2024-10-12/pngload-20241012-git.tgz";
           sha256 = "1j5j8n8xa8hgc413lfxij3wmkwyal13p0a5q6n74zzr61f1kn6vc";
           system = "pngload.test";
           asd = "pngload.test";
@@ -84031,7 +84031,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "poler" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/poler/2018-12-10/poler-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/poler/2018-12-10/poler-20181210-git.tgz";
           sha256 = "1lcyjxmz5vm5is1kgxqjvpkllywvbsj6wqx5v2ac0py5vqws1l8z";
           system = "poler";
           asd = "poler";
@@ -84051,7 +84051,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "poler-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/poler/2018-12-10/poler-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/poler/2018-12-10/poler-20181210-git.tgz";
           sha256 = "1lcyjxmz5vm5is1kgxqjvpkllywvbsj6wqx5v2ac0py5vqws1l8z";
           system = "poler-test";
           asd = "poler-test";
@@ -84075,7 +84075,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "policy-cond" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/policy-cond/2024-10-12/policy-cond-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/policy-cond/2024-10-12/policy-cond-20241012-git.tgz";
           sha256 = "17gm4alfb8nf85963ckahipx61xfffj0ra2cnn6yra32krzj7gnk";
           system = "policy-cond";
           asd = "policy-cond";
@@ -84095,7 +84095,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "polisher" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/polisher/2021-12-30/polisher-20211230-git.tgz";
+          url = "https://beta.quicklisp.org/archive/polisher/2021-12-30/polisher-20211230-git.tgz";
           sha256 = "1i63kgk4vfisiyrfqdz0wc8ldvfh9jpkivsasgdhc97cad095ln0";
           system = "polisher";
           asd = "polisher";
@@ -84115,7 +84115,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "polisher.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/polisher/2021-12-30/polisher-20211230-git.tgz";
+          url = "https://beta.quicklisp.org/archive/polisher/2021-12-30/polisher-20211230-git.tgz";
           sha256 = "1i63kgk4vfisiyrfqdz0wc8ldvfh9jpkivsasgdhc97cad095ln0";
           system = "polisher.test";
           asd = "polisher.test";
@@ -84138,7 +84138,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "polymorphic-functions-lite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/polymorphic-functions/2025-06-22/polymorphic-functions-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/polymorphic-functions/2025-06-22/polymorphic-functions-20250622-git.tgz";
           sha256 = "12rxvwfwpi899dx8nyighax2qd6jl0kch5f0ycg10am5kvprbkyy";
           system = "polymorphic-functions-lite";
           asd = "polymorphic-functions-lite";
@@ -84163,7 +84163,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pooler" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pooler/2015-06-08/pooler-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pooler/2015-06-08/pooler-20150608-git.tgz";
           sha256 = "18vdl06cckk07m7r477qzcz24j3sid1agfa69fp91jna5aqi46kb";
           system = "pooler";
           asd = "pooler";
@@ -84183,7 +84183,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "portable-condition-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/portable-condition-system/2021-08-07/portable-condition-system-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/portable-condition-system/2021-08-07/portable-condition-system-20210807-git.tgz";
           sha256 = "099lb9f4bavj95wik99wla5rf6fk1gdw9pvn0cqlaf0wf20csd3h";
           system = "portable-condition-system";
           asd = "portable-condition-system";
@@ -84206,7 +84206,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "portable-condition-system.integration" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/portable-condition-system/2021-08-07/portable-condition-system-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/portable-condition-system/2021-08-07/portable-condition-system-20210807-git.tgz";
           sha256 = "099lb9f4bavj95wik99wla5rf6fk1gdw9pvn0cqlaf0wf20csd3h";
           system = "portable-condition-system.integration";
           asd = "portable-condition-system.integration";
@@ -84229,7 +84229,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "portable-threads" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/portable-threads/2021-05-31/portable-threads-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/portable-threads/2021-05-31/portable-threads-20210531-git.tgz";
           sha256 = "05y00mlvwlfas4jj50qas2v2rxa0hyc9834lpnbh61a3g8sz0d1f";
           system = "portable-threads";
           asd = "portable-threads";
@@ -84249,7 +84249,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "portal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/portal/2021-12-09/portal-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/portal/2021-12-09/portal-20211209-git.tgz";
           sha256 = "1012jc068qdd8df6mmbn8vmmqlniqm5j2jbyrraw3yz8c13c8280";
           system = "portal";
           asd = "portal";
@@ -84279,7 +84279,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "portmanteau" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-portmanteau/2018-10-18/cl-portmanteau-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-portmanteau/2018-10-18/cl-portmanteau-20181018-git.tgz";
           sha256 = "0430yixy722zkiljc6kh68hx2pyf2pbylgyp7n4qnnky86c0z0ip";
           system = "portmanteau";
           asd = "portmanteau";
@@ -84299,7 +84299,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "portmanteau-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-portmanteau/2018-10-18/cl-portmanteau-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-portmanteau/2018-10-18/cl-portmanteau-20181018-git.tgz";
           sha256 = "0430yixy722zkiljc6kh68hx2pyf2pbylgyp7n4qnnky86c0z0ip";
           system = "portmanteau-tests";
           asd = "portmanteau-tests";
@@ -84322,7 +84322,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "positional-lambda" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/positional-lambda/2012-10-13/positional-lambda-2.0.tgz";
+          url = "https://beta.quicklisp.org/archive/positional-lambda/2012-10-13/positional-lambda-2.0.tgz";
           sha256 = "00jbr42czv7piza5sm5hmmls7xnhq1pnzl09j6c28xrknr61cj8r";
           system = "positional-lambda";
           asd = "positional-lambda";
@@ -84342,7 +84342,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "posix-shm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/posix-shm/2023-10-21/posix-shm-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/posix-shm/2023-10-21/posix-shm-20231021-git.tgz";
           sha256 = "0ah7xh7dxvdk58slic60gx7k56idjw5x30q5ifg90hxfhd32qz6l";
           system = "posix-shm";
           asd = "posix-shm";
@@ -84367,7 +84367,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "postmodern" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz";
           sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb";
           system = "postmodern";
           asd = "postmodern";
@@ -84393,7 +84393,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "postmodernity" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/postmodernity/2017-01-24/postmodernity-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/postmodernity/2017-01-24/postmodernity-20170124-git.tgz";
           sha256 = "06mwlp79dgzsgfhgbhvqk4691nm52v3lqm99y72dm7pm4gmc2m9m";
           system = "postmodernity";
           asd = "postmodernity";
@@ -84416,7 +84416,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "postoffice" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/postoffice/2012-09-09/postoffice-20120909-git.tgz";
+          url = "https://beta.quicklisp.org/archive/postoffice/2012-09-09/postoffice-20120909-git.tgz";
           sha256 = "041k8nc969xyjdmbn6348pra3v5jb1sw4mrnxmamv0flngyv12fg";
           system = "postoffice";
           asd = "postoffice";
@@ -84436,7 +84436,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pounds" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pounds/2016-02-08/pounds-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pounds/2016-02-08/pounds-20160208-git.tgz";
           sha256 = "17hz0ywzfirmlwkrd9zrbl07ihhm03zhzqrz3rkmh1j9v95sy2kl";
           system = "pounds";
           asd = "pounds";
@@ -84462,7 +84462,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pp-toml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pp-toml/2022-11-06/pp-toml-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pp-toml/2022-11-06/pp-toml-20221106-git.tgz";
           sha256 = "136d7jzz7l2ck9wwld0ac46jmpm94lvja6m50sy73s232slka2hg";
           system = "pp-toml";
           asd = "pp-toml";
@@ -84490,7 +84490,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pp-toml-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pp-toml/2022-11-06/pp-toml-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pp-toml/2022-11-06/pp-toml-20221106-git.tgz";
           sha256 = "136d7jzz7l2ck9wwld0ac46jmpm94lvja6m50sy73s232slka2hg";
           system = "pp-toml-tests";
           asd = "pp-toml-tests";
@@ -84520,7 +84520,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ppath" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ppath/2024-10-12/ppath-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ppath/2024-10-12/ppath-20241012-git.tgz";
           sha256 = "122h2xlr9435gjim567cyry13ylbsixziy5bi1n4lzpfjnkq68qg";
           system = "ppath";
           asd = "ppath";
@@ -84547,7 +84547,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ppath-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ppath/2024-10-12/ppath-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ppath/2024-10-12/ppath-20241012-git.tgz";
           sha256 = "122h2xlr9435gjim567cyry13ylbsixziy5bi1n4lzpfjnkq68qg";
           system = "ppath-test";
           asd = "ppath-test";
@@ -84573,7 +84573,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "practical-cl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz";
           sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9";
           system = "practical-cl";
           asd = "practical-cl";
@@ -84606,7 +84606,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prbs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prbs/2018-02-28/prbs-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prbs/2018-02-28/prbs-20180228-git.tgz";
           sha256 = "0qbvbmxa66b367z9px4nyxqb21b9w2hr82rw7hfq5aynmwfk3fzi";
           system = "prbs";
           asd = "prbs";
@@ -84626,7 +84626,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prbs-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prbs/2018-02-28/prbs-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prbs/2018-02-28/prbs-20180228-git.tgz";
           sha256 = "0qbvbmxa66b367z9px4nyxqb21b9w2hr82rw7hfq5aynmwfk3fzi";
           system = "prbs-docs";
           asd = "prbs-docs";
@@ -84649,7 +84649,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "precise-time" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/precise-time/2025-06-22/precise-time-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/precise-time/2025-06-22/precise-time-20250622-git.tgz";
           sha256 = "1b7ky6m8ih8dz93psrznrxvvchrrhaby3q3fdlhr6nw8zpg63fsh";
           system = "precise-time";
           asd = "precise-time";
@@ -84673,7 +84673,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pregexp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pregexp/2024-10-12/pregexp-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pregexp/2024-10-12/pregexp-20241012-git.tgz";
           sha256 = "10l9hj7a812km1hygg6iwwl1bf8jgsfyfr1ixj7bif8k8502h4nz";
           system = "pregexp";
           asd = "pregexp";
@@ -84693,7 +84693,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prepl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prepl/2025-06-22/prepl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prepl/2025-06-22/prepl-20250622-git.tgz";
           sha256 = "0rwh46lbwr7gfcl0cb7k0snkg9z8hpv43ir575zw5kadiqxqwr3g";
           system = "prepl";
           asd = "prepl";
@@ -84719,7 +84719,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prettier-builtins" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prettier-builtins/2023-10-21/prettier-builtins-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prettier-builtins/2023-10-21/prettier-builtins-20231021-git.tgz";
           sha256 = "15lbf0zi1vxqpxwsfgkq7dlg5c9m1b2a4hvcfm3qlh9ir7ahggck";
           system = "prettier-builtins";
           asd = "prettier-builtins";
@@ -84739,7 +84739,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pretty-function" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pretty-function/2013-06-15/pretty-function-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pretty-function/2013-06-15/pretty-function-20130615-git.tgz";
           sha256 = "1hzfjwsp6r5nki6h8kry8k2bgj19mrp0jbq7jhsz3kz6y4ll0hb5";
           system = "pretty-function";
           asd = "pretty-function";
@@ -84759,7 +84759,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "primecount" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/primecount/2020-03-25/primecount-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/primecount/2020-03-25/primecount-20200325-git.tgz";
           sha256 = "1fw855qp82b887azww7z3yhd2zafaxjnzyff1ldf2wa6mb4f0dj8";
           system = "primecount";
           asd = "primecount";
@@ -84779,7 +84779,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "print-html" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/print-html/2018-10-18/print-html-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/print-html/2018-10-18/print-html-20181018-git.tgz";
           sha256 = "1ihr2yy6fvli3awrkfn4v8pm41wab5wsj30v84rr75v4p5irqmz8";
           system = "print-html";
           asd = "print-html";
@@ -84799,7 +84799,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "print-licenses" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/print-licenses/2023-06-18/print-licenses-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/print-licenses/2023-06-18/print-licenses-20230618-git.tgz";
           sha256 = "14i6r6mf16dlj1g4xk0alg2912y3wy0qbfpyvvgsgxkkar63cmi5";
           system = "print-licenses";
           asd = "print-licenses";
@@ -84822,7 +84822,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "printv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/printv/2021-12-30/printv-20211230-git.tgz";
+          url = "https://beta.quicklisp.org/archive/printv/2021-12-30/printv-20211230-git.tgz";
           sha256 = "07agyzkwp3w2r4d2anrmr8h00yngpr5dq9mjd3m4kzhn1jcmilfb";
           system = "printv";
           asd = "printv";
@@ -84842,7 +84842,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "priority-queue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/priority-queue/2015-07-09/priority-queue-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/priority-queue/2015-07-09/priority-queue-20150709-git.tgz";
           sha256 = "0y5a1fid8xzzl58hfdj64n8mrzq0kr06a0lnmdjpgi0czc3x0jcy";
           system = "priority-queue";
           asd = "priority-queue";
@@ -84862,7 +84862,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "priority-queue-benchmark" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz";
           sha256 = "1mbigpgi7qbqvpj59l1f7p2qcg00ybvqzdca1j1b9hx62h224ndw";
           system = "priority-queue-benchmark";
           asd = "priority-queue-benchmark";
@@ -84895,7 +84895,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "proc-parse" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz";
           sha256 = "07vbj26bfq4ywlcmamsqyac29rsdsa8lamjqx1ycla1bcvgmi4w2";
           system = "proc-parse";
           asd = "proc-parse";
@@ -84916,7 +84916,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "proc-parse-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz";
           sha256 = "07vbj26bfq4ywlcmamsqyac29rsdsa8lamjqx1ycla1bcvgmi4w2";
           system = "proc-parse-test";
           asd = "proc-parse-test";
@@ -84940,7 +84940,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "progressons" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/progressons/2025-06-22/progressons-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/progressons/2025-06-22/progressons-20250622-git.tgz";
           sha256 = "136pnign0rl03c6pr3vbd4ia3yzl63svcv8dshxlmbpjwpma0nr3";
           system = "progressons";
           asd = "progressons";
@@ -84963,7 +84963,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "projectured.document" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
+          url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
           sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn";
           system = "projectured.document";
           asd = "projectured.document";
@@ -84989,7 +84989,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "projectured.editor" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
+          url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
           sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn";
           system = "projectured.editor";
           asd = "projectured.editor";
@@ -85019,7 +85019,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "projectured.executable" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
+          url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
           sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn";
           system = "projectured.executable";
           asd = "projectured.executable";
@@ -85043,7 +85043,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "projectured.projection" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
+          url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
           sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn";
           system = "projectured.projection";
           asd = "projectured.projection";
@@ -85067,7 +85067,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "projectured.sdl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
+          url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
           sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn";
           system = "projectured.sdl";
           asd = "projectured.sdl";
@@ -85093,7 +85093,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "projectured.sdl.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
+          url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
           sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn";
           system = "projectured.sdl.test";
           asd = "projectured.sdl.test";
@@ -85117,7 +85117,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "projectured.swank" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
+          url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
           sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn";
           system = "projectured.swank";
           asd = "projectured.swank";
@@ -85141,7 +85141,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "projectured.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
+          url = "https://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz";
           sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn";
           system = "projectured.test";
           asd = "projectured.test";
@@ -85169,7 +85169,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus";
           asd = "prometheus";
@@ -85195,7 +85195,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus-gc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus-gc/2025-06-22/prometheus-gc-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus-gc/2025-06-22/prometheus-gc-20250622-git.tgz";
           sha256 = "0z9np2226649kllvkb7jyk7bc767z5i68861l1g96hyhbndf8aw6";
           system = "prometheus-gc";
           asd = "prometheus-gc";
@@ -85218,7 +85218,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus-gc-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus-gc/2025-06-22/prometheus-gc-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus-gc/2025-06-22/prometheus-gc-20250622-git.tgz";
           sha256 = "0z9np2226649kllvkb7jyk7bc767z5i68861l1g96hyhbndf8aw6";
           system = "prometheus-gc-ci";
           asd = "prometheus-gc-ci";
@@ -85238,7 +85238,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus-gc-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus-gc/2025-06-22/prometheus-gc-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus-gc/2025-06-22/prometheus-gc-20250622-git.tgz";
           sha256 = "0z9np2226649kllvkb7jyk7bc767z5i68861l1g96hyhbndf8aw6";
           system = "prometheus-gc-tests";
           asd = "prometheus-gc-tests";
@@ -85258,7 +85258,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus.collectors.process" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus.collectors.process";
           asd = "prometheus.collectors.process";
@@ -85284,7 +85284,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus.collectors.process.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus.collectors.process.test";
           asd = "prometheus.collectors.process.test";
@@ -85312,7 +85312,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus.collectors.sbcl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus.collectors.sbcl";
           asd = "prometheus.collectors.sbcl";
@@ -85332,7 +85332,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus.collectors.sbcl.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus.collectors.sbcl.test";
           asd = "prometheus.collectors.sbcl.test";
@@ -85360,7 +85360,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus.examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus.examples";
           asd = "prometheus.examples";
@@ -85386,7 +85386,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus.exposers.hunchentoot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus.exposers.hunchentoot";
           asd = "prometheus.exposers.hunchentoot";
@@ -85412,7 +85412,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus.exposers.hunchentoot.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus.exposers.hunchentoot.test";
           asd = "prometheus.exposers.hunchentoot.test";
@@ -85443,7 +85443,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus.formats.text" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus.formats.text";
           asd = "prometheus.formats.text";
@@ -85466,7 +85466,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus.formats.text.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus.formats.text.test";
           asd = "prometheus.formats.text.test";
@@ -85494,7 +85494,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus.pushgateway" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus.pushgateway";
           asd = "prometheus.pushgateway";
@@ -85518,7 +85518,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus.pushgateway.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus.pushgateway.test";
           asd = "prometheus.pushgateway.test";
@@ -85547,7 +85547,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus.test";
           asd = "prometheus.test";
@@ -85575,7 +85575,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus.test.all" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus.test.all";
           asd = "prometheus.test.all";
@@ -85604,7 +85604,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prometheus.test.support" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz";
           sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp";
           system = "prometheus.test.support";
           asd = "prometheus.test.support";
@@ -85629,7 +85629,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "promise" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/promise/2023-10-21/promise-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/promise/2023-10-21/promise-20231021-git.tgz";
           sha256 = "1xm10s89a2f7ydzayjgg94y9plrz1jnyvi6yzhk5v3vrbnmpggh1";
           system = "promise";
           asd = "promise";
@@ -85649,7 +85649,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "promise-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/promise/2023-10-21/promise-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/promise/2023-10-21/promise-20231021-git.tgz";
           sha256 = "1xm10s89a2f7ydzayjgg94y9plrz1jnyvi6yzhk5v3vrbnmpggh1";
           system = "promise-test";
           asd = "promise-test";
@@ -85672,7 +85672,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prompt-for" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prompt-for/2022-07-07/prompt-for-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prompt-for/2022-07-07/prompt-for-20220707-git.tgz";
           sha256 = "1zjc96ryyzsr5519s7yji40askqyymjrbdwx3r2r7bv146siqs5m";
           system = "prompt-for";
           asd = "prompt-for";
@@ -85692,7 +85692,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prompt-for.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prompt-for/2022-07-07/prompt-for-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prompt-for/2022-07-07/prompt-for-20220707-git.tgz";
           sha256 = "1zjc96ryyzsr5519s7yji40askqyymjrbdwx3r2r7bv146siqs5m";
           system = "prompt-for.test";
           asd = "prompt-for.test";
@@ -85715,7 +85715,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "protest" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz";
           sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h";
           system = "protest";
           asd = "protest";
@@ -85740,7 +85740,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "proto" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz";
           sha256 = "0dpchsshnlh3jb9rg1zdf63mr5l33vhjdxgxx2vqg0nh1sh41zn1";
           system = "proto";
           asd = "gtirb";
@@ -85760,7 +85760,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "proto-v0" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz";
           sha256 = "0dpchsshnlh3jb9rg1zdf63mr5l33vhjdxgxx2vqg0nh1sh41zn1";
           system = "proto-v0";
           asd = "gtirb";
@@ -85780,7 +85780,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "protobuf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/protobuf/2023-06-18/protobuf-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/protobuf/2023-06-18/protobuf-20230618-git.tgz";
           sha256 = "0pp8i2i72p6cng11sxj83klw45jqv05l5024h7c2rl0pvsg8f6bc";
           system = "protobuf";
           asd = "protobuf";
@@ -85803,7 +85803,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "protobuf-conformance" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/protobuf/2023-06-18/protobuf-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/protobuf/2023-06-18/protobuf-20230618-git.tgz";
           sha256 = "0pp8i2i72p6cng11sxj83klw45jqv05l5024h7c2rl0pvsg8f6bc";
           system = "protobuf-conformance";
           asd = "protobuf-conformance";
@@ -85827,7 +85827,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prove" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
           sha256 = "0ca6ha3zhmckq3ad9lxm6sbg4i0hg3m81xhan4dkxd3x9898jzpc";
           system = "prove";
           asd = "prove";
@@ -85850,7 +85850,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prove-asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
           sha256 = "0ca6ha3zhmckq3ad9lxm6sbg4i0hg3m81xhan4dkxd3x9898jzpc";
           system = "prove-asdf";
           asd = "prove-asdf";
@@ -85868,7 +85868,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "prove-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
           sha256 = "0ca6ha3zhmckq3ad9lxm6sbg4i0hg3m81xhan4dkxd3x9898jzpc";
           system = "prove-test";
           asd = "prove-test";
@@ -85893,7 +85893,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pseudonyms" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pseudonyms/2020-03-25/pseudonyms-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pseudonyms/2020-03-25/pseudonyms-20200325-git.tgz";
           sha256 = "0ph7l130hr8gz88gw8i15zbsbq96519srfhzgm6zzkw85vab1ysn";
           system = "pseudonyms";
           asd = "pseudonyms";
@@ -85916,7 +85916,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "psgraph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/psgraph/2010-10-06/psgraph-1.2.tgz";
+          url = "https://beta.quicklisp.org/archive/psgraph/2010-10-06/psgraph-1.2.tgz";
           sha256 = "19x1lvzfj2c2h83y5bng6jsp2300qfvd25mmf157qiss15al22vs";
           system = "psgraph";
           asd = "psgraph";
@@ -85936,7 +85936,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "psychiq" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/psychiq/2024-10-12/psychiq-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/psychiq/2024-10-12/psychiq-20241012-git.tgz";
           sha256 = "1036yyrzvyqszn037y4189h12221mkxdyp0nlyj26qjyil3qizbl";
           system = "psychiq";
           asd = "psychiq";
@@ -85965,7 +85965,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "psychiq-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/psychiq/2024-10-12/psychiq-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/psychiq/2024-10-12/psychiq-20241012-git.tgz";
           sha256 = "1036yyrzvyqszn037y4189h12221mkxdyp0nlyj26qjyil3qizbl";
           system = "psychiq-test";
           asd = "psychiq-test";
@@ -85989,7 +85989,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ptc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ptc/2023-10-21/ptc-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ptc/2023-10-21/ptc-20231021-git.tgz";
           sha256 = "1r4izrc6dhz3pqpcqn3y0sga4f77s2vzd1xpl8fsr41rfpyiff3x";
           system = "ptc";
           asd = "ptc";
@@ -86009,7 +86009,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ptester" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz";
           sha256 = "1l0lfl7cdnr2qf4zh38hi4llxg22c49zkm639bdkmvlkzwj3ndwf";
           system = "ptester";
           asd = "ptester";
@@ -86027,7 +86027,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "punycode" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/punycode/2023-10-21/punycode-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/punycode/2023-10-21/punycode-20231021-git.tgz";
           sha256 = "0779aj2bqsz7qb475x5sacr5q254wjar74sab04zfhrlpkgij9xh";
           system = "punycode";
           asd = "punycode";
@@ -86047,7 +86047,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "punycode-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/punycode/2023-10-21/punycode-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/punycode/2023-10-21/punycode-20231021-git.tgz";
           sha256 = "0779aj2bqsz7qb475x5sacr5q254wjar74sab04zfhrlpkgij9xh";
           system = "punycode-test";
           asd = "punycode-test";
@@ -86070,7 +86070,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "purgatory" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/purgatory/2024-10-12/purgatory-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/purgatory/2024-10-12/purgatory-20241012-git.tgz";
           sha256 = "1srafcpl01a1dv84z3sqc1wl23r8hz1nm3rrmmqiilfh2r4jfw6f";
           system = "purgatory";
           asd = "purgatory";
@@ -86095,7 +86095,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "purgatory-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/purgatory/2024-10-12/purgatory-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/purgatory/2024-10-12/purgatory-20241012-git.tgz";
           sha256 = "1srafcpl01a1dv84z3sqc1wl23r8hz1nm3rrmmqiilfh2r4jfw6f";
           system = "purgatory-tests";
           asd = "purgatory-tests";
@@ -86123,7 +86123,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "puri" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz";
+          url = "https://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz";
           sha256 = "0gq2rsr0aihs0z20v4zqvmdl4szq53b52rh97pvnmwrlbn4mapmd";
           system = "puri";
           asd = "puri";
@@ -86141,7 +86141,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "purl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/purl/2016-09-29/purl-20160929-git.tgz";
+          url = "https://beta.quicklisp.org/archive/purl/2016-09-29/purl-20160929-git.tgz";
           sha256 = "1fw3ip4b7n3q6kimh683apg381p7y4w6s4mb8mmv9n3dw0p0sdww";
           system = "purl";
           asd = "purl";
@@ -86164,7 +86164,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pvars" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pvars/2021-02-28/pvars-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pvars/2021-02-28/pvars-20210228-git.tgz";
           sha256 = "1x9mmz53sj0mgd288pa65x963mrd27sw47a8vbggsc4ykwacqf1d";
           system = "pvars";
           asd = "pvars";
@@ -86187,7 +86187,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "py-configparser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/py-configparser/2017-08-30/py-configparser-20170830-svn.tgz";
+          url = "https://beta.quicklisp.org/archive/py-configparser/2017-08-30/py-configparser-20170830-svn.tgz";
           sha256 = "1mpzhrys1b1mp1kp2xvryl6v01gfqfccb1zdiib49nf4bms4irvw";
           system = "py-configparser";
           asd = "py-configparser";
@@ -86207,7 +86207,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "py4cl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/py4cl/2024-10-12/py4cl-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/py4cl/2024-10-12/py4cl-20241012-git.tgz";
           sha256 = "0i2zg58zgcyw68m846sqwjb77mvps766xlp30i65h18plc8yqmpg";
           system = "py4cl";
           asd = "py4cl";
@@ -86231,7 +86231,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "py4cl2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/py4cl2/2024-10-12/py4cl2-v2.9.3.tgz";
+          url = "https://beta.quicklisp.org/archive/py4cl2/2024-10-12/py4cl2-v2.9.3.tgz";
           sha256 = "0g7qhwnyi1la22k90z8993q8knr117f40jk73wjsvixicqc4awqq";
           system = "py4cl2";
           asd = "py4cl2";
@@ -86260,7 +86260,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "py4cl2-cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/py4cl2-cffi/2025-06-22/py4cl2-cffi-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/py4cl2-cffi/2025-06-22/py4cl2-cffi-20250622-git.tgz";
           sha256 = "1niql10rjhm19qh3fsmp434h6j8x38dknwvwdc72r63gkn7lqiaa";
           system = "py4cl2-cffi";
           asd = "py4cl2-cffi";
@@ -86291,7 +86291,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pythonic-string-reader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz";
           sha256 = "1b5iryqw8xsh36swckmz8rrngmc39k92si33fgy5pml3n9l5rq3j";
           system = "pythonic-string-reader";
           asd = "pythonic-string-reader";
@@ -86309,7 +86309,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pzmq" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz";
           sha256 = "19mdhxhzzghlmff1fic4chg5iz0psglkim09z6dgpijm26biny05";
           system = "pzmq";
           asd = "pzmq";
@@ -86330,7 +86330,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pzmq-compat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz";
           sha256 = "19mdhxhzzghlmff1fic4chg5iz0psglkim09z6dgpijm26biny05";
           system = "pzmq-compat";
           asd = "pzmq";
@@ -86348,7 +86348,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pzmq-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz";
           sha256 = "19mdhxhzzghlmff1fic4chg5iz0psglkim09z6dgpijm26biny05";
           system = "pzmq-examples";
           asd = "pzmq";
@@ -86372,7 +86372,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "pzmq-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz";
           sha256 = "19mdhxhzzghlmff1fic4chg5iz0psglkim09z6dgpijm26biny05";
           system = "pzmq-test";
           asd = "pzmq";
@@ -86396,7 +86396,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qbase64" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qbase64/2022-02-20/qbase64-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qbase64/2022-02-20/qbase64-20220220-git.tgz";
           sha256 = "06daqqfdd51wkx0pyxgz7zq4ibzsqsgn3qs04jabx67gyybgnmjm";
           system = "qbase64";
           asd = "qbase64";
@@ -86419,7 +86419,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qbook" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qbook/2013-03-12/qbook-20130312-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/qbook/2013-03-12/qbook-20130312-darcs.tgz";
           sha256 = "0l5hc2v73416jpwc2nsnj03z85fisirgm4av2anvlpv5m1291p6g";
           system = "qbook";
           asd = "qbook";
@@ -86444,7 +86444,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qimageblitz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qimageblitz";
           asd = "qimageblitz";
@@ -86469,7 +86469,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ql-checkout" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ql-checkout/2019-05-21/ql-checkout-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ql-checkout/2019-05-21/ql-checkout-20190521-git.tgz";
           sha256 = "1zp3wa7g1wn7sypfsla7510ywvldqavlmv90pncanwpwn79klyhw";
           system = "ql-checkout";
           asd = "ql-checkout";
@@ -86489,7 +86489,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qlot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qlot/2025-06-22/qlot-1.7.2.tgz";
+          url = "https://beta.quicklisp.org/archive/qlot/2025-06-22/qlot-1.7.2.tgz";
           sha256 = "0mnpz4z589wfmc2pjwgjv86v09p0pqwdk10izv7xri9hab1823vq";
           system = "qlot";
           asd = "qlot";
@@ -86522,7 +86522,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qmynd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qmynd/2025-06-22/qmynd-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qmynd/2025-06-22/qmynd-20250622-git.tgz";
           sha256 = "1j04if9zl6z80pj1301pd6dnp82id495wpgys53psgwn4y3z6y6w";
           system = "qmynd";
           asd = "qmynd";
@@ -86555,7 +86555,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qmynd-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qmynd/2025-06-22/qmynd-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qmynd/2025-06-22/qmynd-20250622-git.tgz";
           sha256 = "1j04if9zl6z80pj1301pd6dnp82id495wpgys53psgwn4y3z6y6w";
           system = "qmynd-test";
           asd = "qmynd-test";
@@ -86579,7 +86579,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qoi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qoi/2024-10-12/qoi-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qoi/2024-10-12/qoi-20241012-git.tgz";
           sha256 = "06akq38q7m648c3kpx1pzw21fwqry7fkg6sfgbap0b7bifzg1dsn";
           system = "qoi";
           asd = "qoi";
@@ -86599,7 +86599,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qsci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qsci";
           asd = "qsci";
@@ -86624,7 +86624,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qt+libs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/commonqt/2023-02-14/commonqt-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/commonqt/2023-02-14/commonqt-20230214-git.tgz";
           sha256 = "1s66z48plfwiq4qhf6whpvnjy4n7r9zhipri7lc8k67x817k020q";
           system = "qt+libs";
           asd = "qt+libs";
@@ -86654,7 +86654,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qt-lib-generator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qt-lib-generator";
           asd = "qt-lib-generator";
@@ -86678,7 +86678,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qt-libs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qt-libs";
           asd = "qt-libs";
@@ -86700,7 +86700,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qt3support" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qt3support";
           asd = "qt3support";
@@ -86728,7 +86728,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qtcore" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qtcore";
           asd = "qtcore";
@@ -86752,7 +86752,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qtdbus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qtdbus";
           asd = "qtdbus";
@@ -86777,7 +86777,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qtdeclarative" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qtdeclarative";
           asd = "qtdeclarative";
@@ -86806,7 +86806,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qtgui" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qtgui";
           asd = "qtgui";
@@ -86830,7 +86830,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qthelp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qthelp";
           asd = "qthelp";
@@ -86857,7 +86857,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qtnetwork" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qtnetwork";
           asd = "qtnetwork";
@@ -86881,7 +86881,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qtopengl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qtopengl";
           asd = "qtopengl";
@@ -86906,7 +86906,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qtscript" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qtscript";
           asd = "qtscript";
@@ -86930,7 +86930,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qtsql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qtsql";
           asd = "qtsql";
@@ -86955,7 +86955,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qtsvg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qtsvg";
           asd = "qtsvg";
@@ -86980,7 +86980,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qttest" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qttest";
           asd = "qttest";
@@ -87005,7 +87005,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qtuitools" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qtuitools";
           asd = "qtuitools";
@@ -87030,7 +87030,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qtwebkit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qtwebkit";
           asd = "qtwebkit";
@@ -87056,7 +87056,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qtxml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qtxml";
           asd = "qtxml";
@@ -87080,7 +87080,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qtxmlpatterns" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qtxmlpatterns";
           asd = "qtxmlpatterns";
@@ -87105,7 +87105,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quad-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quad-tree/2022-07-07/quad-tree-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quad-tree/2022-07-07/quad-tree-20220707-git.tgz";
           sha256 = "1pg43zw75dbqxs8vca3fynqfvza59v1fmwh9m4x0jrnw7ysgkl6j";
           system = "quad-tree";
           asd = "quad-tree";
@@ -87128,7 +87128,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quadpack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "quadpack";
           asd = "quadpack";
@@ -87148,7 +87148,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quads" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "quads";
           asd = "quads";
@@ -87168,7 +87168,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quadtree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quadtree/2015-07-09/quadtree-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quadtree/2015-07-09/quadtree-20150709-git.tgz";
           sha256 = "0590f0sbv4qg590d2bb7ypncg3wn5xjapi24w78mnzr9bdnhh4vx";
           system = "quadtree";
           asd = "quadtree";
@@ -87188,7 +87188,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quadtree-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quadtree/2015-07-09/quadtree-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quadtree/2015-07-09/quadtree-20150709-git.tgz";
           sha256 = "0590f0sbv4qg590d2bb7ypncg3wn5xjapi24w78mnzr9bdnhh4vx";
           system = "quadtree-test";
           asd = "quadtree-test";
@@ -87212,7 +87212,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quantile-estimator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quantile-estimator.cl/2016-08-25/quantile-estimator.cl-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quantile-estimator.cl/2016-08-25/quantile-estimator.cl-20160825-git.tgz";
           sha256 = "1rrazbl0gbsymynlxp7ild6wvwp6csmdig4hwrp3wjvqhdl8j3mj";
           system = "quantile-estimator";
           asd = "quantile-estimator";
@@ -87232,7 +87232,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quantile-estimator.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quantile-estimator.cl/2016-08-25/quantile-estimator.cl-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quantile-estimator.cl/2016-08-25/quantile-estimator.cl-20160825-git.tgz";
           sha256 = "1rrazbl0gbsymynlxp7ild6wvwp6csmdig4hwrp3wjvqhdl8j3mj";
           system = "quantile-estimator.test";
           asd = "quantile-estimator.test";
@@ -87258,7 +87258,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quasiquote-2.0" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz";
           sha256 = "1g0s3aplrgmdjj8k1wrx3dkqdsl4lka2nmgdng0rcd93xp11q6hn";
           system = "quasiquote-2.0";
           asd = "quasiquote-2.0";
@@ -87276,7 +87276,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quasiquote-2.0-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz";
           sha256 = "1g0s3aplrgmdjj8k1wrx3dkqdsl4lka2nmgdng0rcd93xp11q6hn";
           system = "quasiquote-2.0-tests";
           asd = "quasiquote-2.0";
@@ -87299,7 +87299,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quaviver" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quaviver/2025-06-22/quaviver-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quaviver/2025-06-22/quaviver-20250622-git.tgz";
           sha256 = "1cghypzlpiprcw2napzvb4wjdykciqi7v4s70kqf4mk0mkbxymb2";
           system = "quaviver";
           asd = "quaviver";
@@ -87322,7 +87322,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "queen" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/queen.lisp/2023-06-18/queen.lisp-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/queen.lisp/2023-06-18/queen.lisp-20230618-git.tgz";
           sha256 = "14y4688f9gazdxh03k2jnxnla2bygcsz6wk55yc0id1achak95fa";
           system = "queen";
           asd = "queen";
@@ -87347,7 +87347,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "query-fs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/query-fs/2024-10-12/query-fs-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/query-fs/2024-10-12/query-fs-20241012-git.tgz";
           sha256 = "09gz8xrjg9r5bclphgwjdnif8qx4qnx518jragq3znwvlzfb34fw";
           system = "query-fs";
           asd = "query-fs";
@@ -87373,7 +87373,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "query-repl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/query-repl/2022-03-31/query-repl-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/query-repl/2022-03-31/query-repl-20220331-git.tgz";
           sha256 = "0gzrr1k7071hdmd64i5lqmg62i3yqim7nmcc9r94sry47bkp16v2";
           system = "query-repl";
           asd = "query-repl";
@@ -87396,7 +87396,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "query-repl.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/query-repl/2022-03-31/query-repl-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/query-repl/2022-03-31/query-repl-20220331-git.tgz";
           sha256 = "0gzrr1k7071hdmd64i5lqmg62i3yqim7nmcc9r94sry47bkp16v2";
           system = "query-repl.test";
           asd = "query-repl.test";
@@ -87419,7 +87419,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "queues" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz";
           sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv";
           system = "queues";
           asd = "queues";
@@ -87439,7 +87439,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "queues.priority-cqueue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz";
           sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv";
           system = "queues.priority-cqueue";
           asd = "queues.priority-cqueue";
@@ -87463,7 +87463,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "queues.priority-queue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz";
           sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv";
           system = "queues.priority-queue";
           asd = "queues.priority-queue";
@@ -87483,7 +87483,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "queues.simple-cqueue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz";
           sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv";
           system = "queues.simple-cqueue";
           asd = "queues.simple-cqueue";
@@ -87507,7 +87507,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "queues.simple-queue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz";
           sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv";
           system = "queues.simple-queue";
           asd = "queues.simple-queue";
@@ -87527,7 +87527,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quick-patch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quick-patch/2024-10-12/quick-patch-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quick-patch/2024-10-12/quick-patch-20241012-git.tgz";
           sha256 = "0a2wkqn65kl88yz7a8728x9gjy4w37hjavfqx4hyijhs1ph38wdi";
           system = "quick-patch";
           asd = "quick-patch";
@@ -87547,7 +87547,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quickapp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quickapp/2016-08-25/quickapp-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quickapp/2016-08-25/quickapp-20160825-git.tgz";
           sha256 = "0rhhxwggbh9sf3c4c9fv39c5imy48416mwf0dkhqpnm8x55xbw22";
           system = "quickapp";
           asd = "quickapp";
@@ -87567,7 +87567,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quickhull" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quickhull/2025-06-22/quickhull-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quickhull/2025-06-22/quickhull-20250622-git.tgz";
           sha256 = "1krlyqqsb6jqlx7byby8v0nadkg4aylbiz8jj0w3z9z3nqwp415p";
           system = "quickhull";
           asd = "quickhull";
@@ -87590,7 +87590,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quicklisp-slime-helper" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quicklisp-slime-helper/2015-07-09/quicklisp-slime-helper-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quicklisp-slime-helper/2015-07-09/quicklisp-slime-helper-20150709-git.tgz";
           sha256 = "14b1zg26h75pnhj3ic0h9i5jbmwf8wjp91scbcg1ra9fyhh73pa6";
           system = "quicklisp-slime-helper";
           asd = "quicklisp-slime-helper";
@@ -87613,7 +87613,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quicklisp-starter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz";
           sha256 = "0izf6v4qx82jhk7ln28jhdmnr3lb0r5iqjj0by9igq5sk3y1my4x";
           system = "quicklisp-starter";
           asd = "quicklisp-starter";
@@ -87633,7 +87633,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quicklisp-stats" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quicklisp-stats/2021-04-11/quicklisp-stats-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quicklisp-stats/2021-04-11/quicklisp-stats-20210411-git.tgz";
           sha256 = "0v8dgmlgd283n1g486q4sj2mghgdvgywg2nqp43nnrfc04mkvgc0";
           system = "quicklisp-stats";
           asd = "quicklisp-stats";
@@ -87657,7 +87657,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quickproject" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quickproject/2019-12-27/quickproject-1.4.1.tgz";
+          url = "https://beta.quicklisp.org/archive/quickproject/2019-12-27/quickproject-1.4.1.tgz";
           sha256 = "1szs8p2wr1yr9mjmj3h3557l6wxzzga0iszimb68z0hb1jj3lva6";
           system = "quickproject";
           asd = "quickproject";
@@ -87680,7 +87680,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quicksearch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quicksearch/2017-10-19/quicksearch-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quicksearch/2017-10-19/quicksearch-20171019-git.tgz";
           sha256 = "16k19zjkhh7r64vjq371k5jwjs7cdfjz83flh561n4h4v1z89fps";
           system = "quicksearch";
           asd = "quicksearch";
@@ -87711,7 +87711,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quickutil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz";
           sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz";
           system = "quickutil";
           asd = "quickutil";
@@ -87731,7 +87731,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quickutil-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz";
           sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz";
           system = "quickutil-client";
           asd = "quickutil-client";
@@ -87755,7 +87755,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quickutil-client-management" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz";
           sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz";
           system = "quickutil-client-management";
           asd = "quickutil-client-management";
@@ -87775,7 +87775,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quickutil-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz";
           sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz";
           system = "quickutil-server";
           asd = "quickutil-server";
@@ -87814,7 +87814,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quickutil-utilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz";
           sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz";
           system = "quickutil-utilities";
           asd = "quickutil-utilities";
@@ -87834,7 +87834,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quickutil-utilities-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz";
           sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz";
           system = "quickutil-utilities-test";
           asd = "quickutil-utilities-test";
@@ -87857,7 +87857,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quil-coalton" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
           sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "quil-coalton";
           asd = "quil-coalton";
@@ -87877,7 +87877,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quine-mccluskey" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-logic/2014-12-17/cl-logic-20141217-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-logic/2014-12-17/cl-logic-20141217-git.tgz";
           sha256 = "17n2wzqali3j6b7pqbydipwlxgwdrj4mdnsgwjdyz32n8jvfyjwh";
           system = "quine-mccluskey";
           asd = "cl-logic";
@@ -87897,7 +87897,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quri" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quri/2024-10-12/quri-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quri/2024-10-12/quri-20241012-git.tgz";
           sha256 = "0vismgg72xrflzdsrv8ybq3cxf717k5296g9b731974vwlf7ibh0";
           system = "quri";
           asd = "quri";
@@ -87921,7 +87921,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quri-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quri/2024-10-12/quri-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quri/2024-10-12/quri-20241012-git.tgz";
           sha256 = "0vismgg72xrflzdsrv8ybq3cxf717k5296g9b731974vwlf7ibh0";
           system = "quri-test";
           asd = "quri-test";
@@ -87945,7 +87945,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quux-hunchentoot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quux-hunchentoot/2021-12-30/quux-hunchentoot-20211230-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quux-hunchentoot/2021-12-30/quux-hunchentoot-20211230-git.tgz";
           sha256 = "0v0x4hzzfm835blqbp00vmj74gaq8wyldrnfj0x5s6zfl64w135y";
           system = "quux-hunchentoot";
           asd = "quux-hunchentoot";
@@ -87972,7 +87972,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "quux-time" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/quux-time/2015-04-07/quux-time-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/quux-time/2015-04-07/quux-time-20150407-git.tgz";
           sha256 = "0hsa2n1j0abhw8na9fql47rq1rxpf2vkwg2mbb1c3ax56r8dsh0v";
           system = "quux-time";
           asd = "quux-time";
@@ -87992,7 +87992,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "qwt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "qwt";
           asd = "qwt";
@@ -88017,7 +88017,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rail" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rail/2017-12-27/cl-rail-20171227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rail/2017-12-27/cl-rail-20171227-git.tgz";
           sha256 = "0vxbxyfl5lw7na8iki1cjp0cd31z2bnxcpdv0x25hq0vch1cb5rj";
           system = "rail";
           asd = "rail";
@@ -88037,7 +88037,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rail-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rail/2017-12-27/cl-rail-20171227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rail/2017-12-27/cl-rail-20171227-git.tgz";
           sha256 = "0vxbxyfl5lw7na8iki1cjp0cd31z2bnxcpdv0x25hq0vch1cb5rj";
           system = "rail-test";
           asd = "rail";
@@ -88060,7 +88060,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "random" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz";
           sha256 = "1fb4mnp85jm9s667y4dgz07klhkr9pvi5xbxws28lbb8iip75y2p";
           system = "random";
           asd = "random";
@@ -88080,7 +88080,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "random-access-lists" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/random-access-lists/2012-02-08/random-access-lists-20120208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/random-access-lists/2012-02-08/random-access-lists-20120208-git.tgz";
           sha256 = "0wslxxdmmr25hvmcyscph1bjlknm3nzh5g79cif22was1z411m5c";
           system = "random-access-lists";
           asd = "random-access-lists";
@@ -88100,7 +88100,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "random-sample" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/random-sample/2023-06-18/random-sample-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/random-sample/2023-06-18/random-sample-20230618-git.tgz";
           sha256 = "13g5wgq6z3gx07qr3q17mgwfn2rsck5p1b9cfswajagl0m8z3f51";
           system = "random-sample";
           asd = "random-sample";
@@ -88125,7 +88125,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "random-sampling" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/random-sampling/2025-06-22/random-sampling-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/random-sampling/2025-06-22/random-sampling-20250622-git.tgz";
           sha256 = "1kj7ak0fsmmvayp3yqfnr0j0z7pkyrlnbgabkkckw7gcr0z0kbay";
           system = "random-sampling";
           asd = "random-sampling";
@@ -88149,7 +88149,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "random-state" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/random-state/2025-06-22/random-state-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/random-state/2025-06-22/random-state-20250622-git.tgz";
           sha256 = "0bvb8hldhydmgf0vvjz10vwq8srkm0piglshzm260crvdq1nx4c0";
           system = "random-state";
           asd = "random-state";
@@ -88169,7 +88169,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "random-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz";
           sha256 = "1fb4mnp85jm9s667y4dgz07klhkr9pvi5xbxws28lbb8iip75y2p";
           system = "random-test";
           asd = "random-test";
@@ -88192,7 +88192,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "random-uuid" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/random-uuid/2022-07-07/random-uuid-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/random-uuid/2022-07-07/random-uuid-20220707-git.tgz";
           sha256 = "09yfi16gh12qg4pi13gbr5n881q5zvw7acq27a6sbqbkny35a6wj";
           system = "random-uuid";
           asd = "random-uuid";
@@ -88215,7 +88215,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rate-monotonic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rate-monotonic/2020-03-25/rate-monotonic-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rate-monotonic/2020-03-25/rate-monotonic-20200325-git.tgz";
           sha256 = "0v9m704zy3834whldx2fbs8x92hp7hlrzdlcxm1rd17wqpv7pvrv";
           system = "rate-monotonic";
           asd = "rate-monotonic";
@@ -88238,7 +88238,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rate-monotonic.examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rate-monotonic/2020-03-25/rate-monotonic-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rate-monotonic/2020-03-25/rate-monotonic-20200325-git.tgz";
           sha256 = "0v9m704zy3834whldx2fbs8x92hp7hlrzdlcxm1rd17wqpv7pvrv";
           system = "rate-monotonic.examples";
           asd = "rate-monotonic.examples";
@@ -88261,7 +88261,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ratify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ratify/2025-06-22/ratify-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ratify/2025-06-22/ratify-20250622-git.tgz";
           sha256 = "0ja9rgx1n3zyyps4gxi8ws4r9vbqj5qj9bnmzwykfmsgy9wzi5d0";
           system = "ratify";
           asd = "ratify";
@@ -88285,7 +88285,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ratmath" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ratmath/2020-02-18/ratmath-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ratmath/2020-02-18/ratmath-20200218-git.tgz";
           sha256 = "1p5rl1bam8qjsgscn7gwk2w55hdjawfgjikka59lwb6ia13v4rj9";
           system = "ratmath";
           asd = "ratmath";
@@ -88305,7 +88305,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rcl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rcl/2020-12-20/rcl-20201220-http.tgz";
+          url = "https://beta.quicklisp.org/archive/rcl/2020-12-20/rcl-20201220-http.tgz";
           sha256 = "1s6cvqs0s7fxh63zwc5zj7ryrffmv780rscm7aq3alzb9njwmg14";
           system = "rcl";
           asd = "rcl";
@@ -88332,7 +88332,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "re" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/re/2021-06-30/re-20210630-git.tgz";
+          url = "https://beta.quicklisp.org/archive/re/2021-06-30/re-20210630-git.tgz";
           sha256 = "15q4zvvzkxf1j0wxw0b1kz4d03js9cbgv82ndl8z6riz40kbffdp";
           system = "re";
           asd = "re";
@@ -88352,7 +88352,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "read-as-string" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/read-as-string/2022-07-07/read-as-string-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/read-as-string/2022-07-07/read-as-string-20220707-git.tgz";
           sha256 = "08dnnqmbadsrbsqr4n1x7rf0p46j9al0hw6la0z3jclp604dd0k3";
           system = "read-as-string";
           asd = "read-as-string";
@@ -88375,7 +88375,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "read-as-string.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/read-as-string/2022-07-07/read-as-string-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/read-as-string/2022-07-07/read-as-string-20220707-git.tgz";
           sha256 = "08dnnqmbadsrbsqr4n1x7rf0p46j9al0hw6la0z3jclp604dd0k3";
           system = "read-as-string.test";
           asd = "read-as-string.test";
@@ -88398,7 +88398,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "read-csv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/read-csv/2025-06-22/read-csv-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/read-csv/2025-06-22/read-csv-20250622-git.tgz";
           sha256 = "01hj7wiawb4lyka3a7zka79dj0r44dsc28cbfh863dsjgmn6pkk0";
           system = "read-csv";
           asd = "read-csv";
@@ -88418,7 +88418,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "read-number" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/read-number/2025-06-22/read-number-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/read-number/2025-06-22/read-number-20250622-git.tgz";
           sha256 = "1k43sdcqzhlfcih7dm6ich0v3g33vrqg14ni2cgn73463m3r13bg";
           system = "read-number";
           asd = "read-number";
@@ -88438,7 +88438,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reader/2020-12-20/reader-v0.10.0.tgz";
+          url = "https://beta.quicklisp.org/archive/reader/2020-12-20/reader-v0.10.0.tgz";
           sha256 = "0pbv6w0d8d4qmfkdsz2rk21bp1las9r7pyvpmd95qjz7kpxrirl7";
           system = "reader";
           asd = "reader";
@@ -88465,7 +88465,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reader+swank" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reader/2020-12-20/reader-v0.10.0.tgz";
+          url = "https://beta.quicklisp.org/archive/reader/2020-12-20/reader-v0.10.0.tgz";
           sha256 = "0pbv6w0d8d4qmfkdsz2rk21bp1las9r7pyvpmd95qjz7kpxrirl7";
           system = "reader+swank";
           asd = "reader+swank";
@@ -88488,7 +88488,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reader-interception" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reader-interception/2015-06-08/reader-interception-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reader-interception/2015-06-08/reader-interception-20150608-git.tgz";
           sha256 = "1f6xblayqb9q01qclvqx2gllqxm0qk8rmlp38rz433vgjxbq79y0";
           system = "reader-interception";
           asd = "reader-interception";
@@ -88508,7 +88508,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reader-interception-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reader-interception/2015-06-08/reader-interception-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reader-interception/2015-06-08/reader-interception-20150608-git.tgz";
           sha256 = "1f6xblayqb9q01qclvqx2gllqxm0qk8rmlp38rz433vgjxbq79y0";
           system = "reader-interception-test";
           asd = "reader-interception-test";
@@ -88532,7 +88532,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz";
           sha256 = "1c5vr60010jshxf6kq1pvjqhlspky1djm39sz7sl9hyqh9jrvqdh";
           system = "reblocks";
           asd = "reblocks";
@@ -88592,7 +88592,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-auth" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz";
           sha256 = "11yzl40a542hk5q35ign9f3agjx1g6z8a56s2sgqrymmavin2hvk";
           system = "reblocks-auth";
           asd = "reblocks-auth";
@@ -88630,7 +88630,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-auth-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz";
           sha256 = "11yzl40a542hk5q35ign9f3agjx1g6z8a56s2sgqrymmavin2hvk";
           system = "reblocks-auth-ci";
           asd = "reblocks-auth-ci";
@@ -88650,7 +88650,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-auth-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz";
           sha256 = "11yzl40a542hk5q35ign9f3agjx1g6z8a56s2sgqrymmavin2hvk";
           system = "reblocks-auth-example";
           asd = "reblocks-auth-example";
@@ -88686,7 +88686,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-auth-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-auth/2025-06-22/reblocks-auth-20250622-git.tgz";
           sha256 = "11yzl40a542hk5q35ign9f3agjx1g6z8a56s2sgqrymmavin2hvk";
           system = "reblocks-auth-tests";
           asd = "reblocks-auth-tests";
@@ -88706,7 +88706,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz";
           sha256 = "1c5vr60010jshxf6kq1pvjqhlspky1djm39sz7sl9hyqh9jrvqdh";
           system = "reblocks-docs";
           asd = "reblocks-docs";
@@ -88726,7 +88726,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-file-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz";
           sha256 = "0lxmqw6hrdx977jjp20yfcnwvlzv1y1lha0h20vd8af19a9gcj35";
           system = "reblocks-file-server";
           asd = "reblocks-file-server";
@@ -88760,7 +88760,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-file-server-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz";
           sha256 = "0lxmqw6hrdx977jjp20yfcnwvlzv1y1lha0h20vd8af19a9gcj35";
           system = "reblocks-file-server-ci";
           asd = "reblocks-file-server-ci";
@@ -88780,7 +88780,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-file-server-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz";
           sha256 = "0lxmqw6hrdx977jjp20yfcnwvlzv1y1lha0h20vd8af19a9gcj35";
           system = "reblocks-file-server-docs";
           asd = "reblocks-file-server-docs";
@@ -88806,7 +88806,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-file-server-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-file-server/2025-06-22/reblocks-file-server-20250622-git.tgz";
           sha256 = "0lxmqw6hrdx977jjp20yfcnwvlzv1y1lha0h20vd8af19a9gcj35";
           system = "reblocks-file-server-tests";
           asd = "reblocks-file-server-tests";
@@ -88826,7 +88826,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-lass" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz";
           sha256 = "0hjqfqfwcgfk77xm3wdynxskd6zirhk6yccdk2ni2gm81yqwdnh1";
           system = "reblocks-lass";
           asd = "reblocks-lass";
@@ -88850,7 +88850,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-lass-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz";
           sha256 = "0hjqfqfwcgfk77xm3wdynxskd6zirhk6yccdk2ni2gm81yqwdnh1";
           system = "reblocks-lass-ci";
           asd = "reblocks-lass-ci";
@@ -88870,7 +88870,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-lass-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz";
           sha256 = "0hjqfqfwcgfk77xm3wdynxskd6zirhk6yccdk2ni2gm81yqwdnh1";
           system = "reblocks-lass-docs";
           asd = "reblocks-lass-docs";
@@ -88896,7 +88896,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-lass-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-lass/2025-06-22/reblocks-lass-20250622-git.tgz";
           sha256 = "0hjqfqfwcgfk77xm3wdynxskd6zirhk6yccdk2ni2gm81yqwdnh1";
           system = "reblocks-lass-tests";
           asd = "reblocks-lass-tests";
@@ -88916,7 +88916,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-navigation-widget" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2025-06-22/reblocks-navigation-widget-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-navigation-widget/2025-06-22/reblocks-navigation-widget-20250622-git.tgz";
           sha256 = "0lbzm61cxc9j58alv01blqx1zaqzbmknjn6qf4l4ily52rk8aqmh";
           system = "reblocks-navigation-widget";
           asd = "reblocks-navigation-widget";
@@ -88943,7 +88943,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-navigation-widget-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2025-06-22/reblocks-navigation-widget-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-navigation-widget/2025-06-22/reblocks-navigation-widget-20250622-git.tgz";
           sha256 = "0lbzm61cxc9j58alv01blqx1zaqzbmknjn6qf4l4ily52rk8aqmh";
           system = "reblocks-navigation-widget-ci";
           asd = "reblocks-navigation-widget-ci";
@@ -88963,7 +88963,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-navigation-widget-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2025-06-22/reblocks-navigation-widget-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-navigation-widget/2025-06-22/reblocks-navigation-widget-20250622-git.tgz";
           sha256 = "0lbzm61cxc9j58alv01blqx1zaqzbmknjn6qf4l4ily52rk8aqmh";
           system = "reblocks-navigation-widget-tests";
           asd = "reblocks-navigation-widget-tests";
@@ -88983,7 +88983,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-parenscript" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz";
           sha256 = "10hxgz63dk02arkl9jvz2svk22iirvrw8v42yb5sf09871d7vph2";
           system = "reblocks-parenscript";
           asd = "reblocks-parenscript";
@@ -89009,7 +89009,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-parenscript-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz";
           sha256 = "10hxgz63dk02arkl9jvz2svk22iirvrw8v42yb5sf09871d7vph2";
           system = "reblocks-parenscript-ci";
           asd = "reblocks-parenscript-ci";
@@ -89029,7 +89029,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-parenscript-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz";
           sha256 = "10hxgz63dk02arkl9jvz2svk22iirvrw8v42yb5sf09871d7vph2";
           system = "reblocks-parenscript-docs";
           asd = "reblocks-parenscript-docs";
@@ -89055,7 +89055,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-parenscript-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-parenscript/2025-06-22/reblocks-parenscript-20250622-git.tgz";
           sha256 = "10hxgz63dk02arkl9jvz2svk22iirvrw8v42yb5sf09871d7vph2";
           system = "reblocks-parenscript-tests";
           asd = "reblocks-parenscript-tests";
@@ -89075,7 +89075,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-prometheus" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz";
           sha256 = "1jlncbw2krsdiwqmsj2l2cmnpq3qnj38717qnkw5mlwbiwcmjmy8";
           system = "reblocks-prometheus";
           asd = "reblocks-prometheus";
@@ -89105,7 +89105,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-prometheus-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz";
           sha256 = "1jlncbw2krsdiwqmsj2l2cmnpq3qnj38717qnkw5mlwbiwcmjmy8";
           system = "reblocks-prometheus-ci";
           asd = "reblocks-prometheus-ci";
@@ -89125,7 +89125,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-prometheus-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz";
           sha256 = "1jlncbw2krsdiwqmsj2l2cmnpq3qnj38717qnkw5mlwbiwcmjmy8";
           system = "reblocks-prometheus-docs";
           asd = "reblocks-prometheus-docs";
@@ -89151,7 +89151,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-prometheus-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-prometheus/2025-06-22/reblocks-prometheus-20250622-git.tgz";
           sha256 = "1jlncbw2krsdiwqmsj2l2cmnpq3qnj38717qnkw5mlwbiwcmjmy8";
           system = "reblocks-prometheus-tests";
           asd = "reblocks-prometheus-tests";
@@ -89171,7 +89171,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks/2025-06-22/reblocks-20250622-git.tgz";
           sha256 = "1c5vr60010jshxf6kq1pvjqhlspky1djm39sz7sl9hyqh9jrvqdh";
           system = "reblocks-tests";
           asd = "reblocks-tests";
@@ -89204,7 +89204,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-typeahead" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
           sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3";
           system = "reblocks-typeahead";
           asd = "reblocks-typeahead";
@@ -89231,7 +89231,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-typeahead-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
           sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3";
           system = "reblocks-typeahead-ci";
           asd = "reblocks-typeahead-ci";
@@ -89251,7 +89251,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-typeahead-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
           sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3";
           system = "reblocks-typeahead-docs";
           asd = "reblocks-typeahead-docs";
@@ -89277,7 +89277,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-typeahead-example" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
           sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3";
           system = "reblocks-typeahead-example";
           asd = "reblocks-typeahead-example";
@@ -89314,7 +89314,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-typeahead-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-typeahead/2025-06-22/reblocks-typeahead-20250622-git.tgz";
           sha256 = "177na6pmq25ksc4ir7mq42k56zphdf52n8ahy4s4cqvnvb34kir3";
           system = "reblocks-typeahead-tests";
           asd = "reblocks-typeahead-tests";
@@ -89334,7 +89334,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-ui" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-ui/2025-06-22/reblocks-ui-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-ui/2025-06-22/reblocks-ui-20250622-git.tgz";
           sha256 = "1540m5w5f0giph9sc4yzv8x5206pp26lai1x3h5z7ai2dadx3zw2";
           system = "reblocks-ui";
           asd = "reblocks-ui";
@@ -89364,7 +89364,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-ui-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-ui/2025-06-22/reblocks-ui-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-ui/2025-06-22/reblocks-ui-20250622-git.tgz";
           sha256 = "1540m5w5f0giph9sc4yzv8x5206pp26lai1x3h5z7ai2dadx3zw2";
           system = "reblocks-ui-docs";
           asd = "reblocks-ui-docs";
@@ -89388,7 +89388,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-ui-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-ui/2025-06-22/reblocks-ui-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-ui/2025-06-22/reblocks-ui-20250622-git.tgz";
           sha256 = "1540m5w5f0giph9sc4yzv8x5206pp26lai1x3h5z7ai2dadx3zw2";
           system = "reblocks-ui-examples";
           asd = "reblocks-ui-examples";
@@ -89412,7 +89412,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-ui2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
           sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9";
           system = "reblocks-ui2";
           asd = "reblocks-ui2";
@@ -89444,7 +89444,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-ui2-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
           sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9";
           system = "reblocks-ui2-ci";
           asd = "reblocks-ui2-ci";
@@ -89464,7 +89464,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-ui2-demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
           sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9";
           system = "reblocks-ui2-demo";
           asd = "reblocks-ui2-demo";
@@ -89495,7 +89495,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-ui2-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
           sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9";
           system = "reblocks-ui2-docs";
           asd = "reblocks-ui2-docs";
@@ -89522,7 +89522,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-ui2-tailwind" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
           sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9";
           system = "reblocks-ui2-tailwind";
           asd = "reblocks-ui2-tailwind";
@@ -89542,7 +89542,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-ui2-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-ui2/2025-06-22/reblocks-ui2-20250622-git.tgz";
           sha256 = "1kf0kravh79b5jibz9q1843cbzwlqh2mdlw9kbcnwxnw5r3dcmh9";
           system = "reblocks-ui2-tests";
           asd = "reblocks-ui2-tests";
@@ -89562,7 +89562,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-websocket" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz";
           sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6";
           system = "reblocks-websocket";
           asd = "reblocks-websocket";
@@ -89593,7 +89593,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-websocket-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz";
           sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6";
           system = "reblocks-websocket-ci";
           asd = "reblocks-websocket-ci";
@@ -89613,7 +89613,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-websocket-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz";
           sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6";
           system = "reblocks-websocket-docs";
           asd = "reblocks-websocket-docs";
@@ -89639,7 +89639,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reblocks-websocket-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reblocks-websocket/2025-06-22/reblocks-websocket-20250622-git.tgz";
           sha256 = "129mvzm1z6d5ffn21cqrm82yx2i6n5dc2n5sm5a51rf7f24lgcv6";
           system = "reblocks-websocket-tests";
           asd = "reblocks-websocket-tests";
@@ -89659,7 +89659,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rectangle-packing" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rectangle-packing/2013-06-15/rectangle-packing-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rectangle-packing/2013-06-15/rectangle-packing-20130615-git.tgz";
           sha256 = "1m31qbgkrgbp753mr012hpzjfddwmfzvazaadp3s6wd34vmbbv01";
           system = "rectangle-packing";
           asd = "rectangle-packing";
@@ -89679,7 +89679,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "recur" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/recur/2023-06-18/recur-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/recur/2023-06-18/recur-20230618-git.tgz";
           sha256 = "1wlw378h3k4ganw49kk5zrhx3w692yfdb4zaiciwqzviwz52c7gc";
           system = "recur";
           asd = "recur";
@@ -89699,7 +89699,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "recursive-regex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/recursive-regex/2012-04-07/recursive-regex-20120407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/recursive-regex/2012-04-07/recursive-regex-20120407-git.tgz";
           sha256 = "1alsfqfa85dwms7i3xrbp6ahlqk9a3sl8d4llxy1ydb0rlb09l4r";
           system = "recursive-regex";
           asd = "recursive-regex";
@@ -89726,7 +89726,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "recursive-regex-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/recursive-regex/2012-04-07/recursive-regex-20120407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/recursive-regex/2012-04-07/recursive-regex-20120407-git.tgz";
           sha256 = "1alsfqfa85dwms7i3xrbp6ahlqk9a3sl8d4llxy1ydb0rlb09l4r";
           system = "recursive-regex-test";
           asd = "recursive-regex";
@@ -89749,7 +89749,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "recursive-restart" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/recursive-restart/2016-10-31/recursive-restart-20161031-git.tgz";
+          url = "https://beta.quicklisp.org/archive/recursive-restart/2016-10-31/recursive-restart-20161031-git.tgz";
           sha256 = "0lgw95bnzw99avrb7vcg02fbw3y5mazfgnkim8gsazfjliaj21m7";
           system = "recursive-restart";
           asd = "recursive-restart";
@@ -89769,7 +89769,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "red-black-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/red-black-tree/2022-07-07/red-black-tree-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/red-black-tree/2022-07-07/red-black-tree-20220707-git.tgz";
           sha256 = "0dbl6y4l7k30a13d6rfdfby6p27li5b17nvz7xgyajxl9q5zz5kk";
           system = "red-black-tree";
           asd = "red-black-tree";
@@ -89789,7 +89789,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "redirect-stream" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/redirect-stream/2025-06-22/redirect-stream-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/redirect-stream/2025-06-22/redirect-stream-20250622-git.tgz";
           sha256 = "1pg84dvfd0vnrc12zj6r7vpdkbqznsddk2a7qfqcdm8mjb5xf0ak";
           system = "redirect-stream";
           asd = "redirect-stream";
@@ -89809,7 +89809,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "regex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regex/2012-09-09/regex-20120909-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regex/2012-09-09/regex-20120909-git.tgz";
           sha256 = "0wq5wlafrxv13wg28hg5b10sc48b88swsvznpy2zg7x37m4nmm6a";
           system = "regex";
           asd = "regex";
@@ -89829,7 +89829,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "remote-js" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/remote-js/2019-07-10/remote-js-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/remote-js/2019-07-10/remote-js-20190710-git.tgz";
           sha256 = "1z8apvfng8i7x4dsnz9da4y2l9mr7jykm19lmq3070qra7r3lby6";
           system = "remote-js";
           asd = "remote-js";
@@ -89853,7 +89853,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "remote-js-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/remote-js/2019-07-10/remote-js-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/remote-js/2019-07-10/remote-js-20190710-git.tgz";
           sha256 = "1z8apvfng8i7x4dsnz9da4y2l9mr7jykm19lmq3070qra7r3lby6";
           system = "remote-js-test";
           asd = "remote-js-test";
@@ -89878,7 +89878,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "repl-utilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/repl-utilities/2021-02-28/repl-utilities-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/repl-utilities/2021-02-28/repl-utilities-20210228-git.tgz";
           sha256 = "1hh56pq5nw3l4b83dzlyss69f06r038byj2cnjwvci4hfjhdfcc3";
           system = "repl-utilities";
           asd = "repl-utilities";
@@ -89898,7 +89898,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "replic" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/replic/2023-02-14/replic-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/replic/2023-02-14/replic-20230214-git.tgz";
           sha256 = "1jq0ysgpkcsw2fbxjy0v9kqvfnrdwzvrzc1a7fykihds548z3slf";
           system = "replic";
           asd = "replic";
@@ -89925,7 +89925,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "replic-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/replic/2023-02-14/replic-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/replic/2023-02-14/replic-20230214-git.tgz";
           sha256 = "1jq0ysgpkcsw2fbxjy0v9kqvfnrdwzvrzc1a7fykihds548z3slf";
           system = "replic-test";
           asd = "replic-test";
@@ -89949,7 +89949,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "research" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "research";
           asd = "research";
@@ -89979,7 +89979,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "resignal-bind" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/resignal-bind/2021-10-20/resignal-bind-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/resignal-bind/2021-10-20/resignal-bind-20211020-git.tgz";
           sha256 = "109b5bf2h3yqax87r16dsbnb0xdd9kqi0zdisy0wja1h622yrxhc";
           system = "resignal-bind";
           asd = "resignal-bind";
@@ -90002,7 +90002,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "resignal-bind.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/resignal-bind/2021-10-20/resignal-bind-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/resignal-bind/2021-10-20/resignal-bind-20211020-git.tgz";
           sha256 = "109b5bf2h3yqax87r16dsbnb0xdd9kqi0zdisy0wja1h622yrxhc";
           system = "resignal-bind.test";
           asd = "resignal-bind.test";
@@ -90025,7 +90025,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "restas" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/restas/2019-10-08/restas-20191008-git.tgz";
+          url = "https://beta.quicklisp.org/archive/restas/2019-10-08/restas-20191008-git.tgz";
           sha256 = "00ng6jik1lwjw3bbxhijy8s0ml24lgm73liwrr01gcsb0r6wrjjn";
           system = "restas";
           asd = "restas";
@@ -90052,7 +90052,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "restas-directory-publisher" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/restas-directory-publisher/2013-01-28/restas-directory-publisher-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/restas-directory-publisher/2013-01-28/restas-directory-publisher-20130128-git.tgz";
           sha256 = "1ra4bxsg9v507zrqjx78ak3797clagl6n62d3bx0aghrnkal1gmp";
           system = "restas-directory-publisher";
           asd = "restas-directory-publisher";
@@ -90076,7 +90076,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "restas-doc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/restas/2019-10-08/restas-20191008-git.tgz";
+          url = "https://beta.quicklisp.org/archive/restas/2019-10-08/restas-20191008-git.tgz";
           sha256 = "00ng6jik1lwjw3bbxhijy8s0ml24lgm73liwrr01gcsb0r6wrjjn";
           system = "restas-doc";
           asd = "restas-doc";
@@ -90100,7 +90100,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "restas.file-publisher" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/restas.file-publisher/2012-01-07/restas.file-publisher-20120107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/restas.file-publisher/2012-01-07/restas.file-publisher-20120107-git.tgz";
           sha256 = "12h291as21ziqb1l6p2p4hy429z6zznacp1gn0m2vah7f811q75l";
           system = "restas.file-publisher";
           asd = "restas.file-publisher";
@@ -90123,7 +90123,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "restful" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/restful/2015-06-08/restful-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/restful/2015-06-08/restful-20150608-git.tgz";
           sha256 = "1imcpd9zm1dbb1675pf3g3d6w9vyxk07g7r33174qdw470j8ml5n";
           system = "restful";
           asd = "restful";
@@ -90149,7 +90149,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "restful-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/restful/2015-06-08/restful-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/restful/2015-06-08/restful-20150608-git.tgz";
           sha256 = "1imcpd9zm1dbb1675pf3g3d6w9vyxk07g7r33174qdw470j8ml5n";
           system = "restful-test";
           asd = "restful-test";
@@ -90174,7 +90174,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "restricted-functions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/restricted-functions/2019-05-21/restricted-functions-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/restricted-functions/2019-05-21/restricted-functions-20190521-git.tgz";
           sha256 = "092k7bp6n8kppf2wdqf1kf1h8lrww6k1dcxp05dby779b8c6kfz4";
           system = "restricted-functions";
           asd = "restricted-functions";
@@ -90201,7 +90201,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "retrospectiff" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/retrospectiff/2021-12-09/retrospectiff-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/retrospectiff/2021-12-09/retrospectiff-20211209-git.tgz";
           sha256 = "1vfcbfzhkm2wkxnjg7y6gg93wlib9cqpbdbhyqcm5kc7170ci3vz";
           system = "retrospectiff";
           asd = "retrospectiff";
@@ -90228,7 +90228,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "reversi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/reversi/2020-10-16/reversi-20201016-git.tgz";
+          url = "https://beta.quicklisp.org/archive/reversi/2020-10-16/reversi-20201016-git.tgz";
           sha256 = "1vwjk207hvn5skazmkrcifkv4ia9nm5312rj0fr3w5423dr56swx";
           system = "reversi";
           asd = "reversi";
@@ -90248,7 +90248,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rfc2109" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rfc2109/2015-12-18/rfc2109-20151218-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/rfc2109/2015-12-18/rfc2109-20151218-darcs.tgz";
           sha256 = "1y767qjv5jxyfqzp0zpw96yz95mb8hhpjj9dn2i6b92r0z2vr42d";
           system = "rfc2109";
           asd = "rfc2109";
@@ -90268,7 +90268,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rfc2388" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz";
           sha256 = "0phh5n3clhl9ji8jaxrajidn22d3f0aq87mlbfkkxlnx2pnw694k";
           system = "rfc2388";
           asd = "rfc2388";
@@ -90286,7 +90286,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rfc2388-binary" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rfc2388-binary/2017-01-24/rfc2388-binary-20170124-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/rfc2388-binary/2017-01-24/rfc2388-binary-20170124-darcs.tgz";
           sha256 = "1ddjhd9vqramg93963d4py9a2hqpy1fr1ly517r3bpjx7a5mffwk";
           system = "rfc2388-binary";
           asd = "rfc2388-binary";
@@ -90306,7 +90306,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rlc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rlc/2015-09-23/rlc-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rlc/2015-09-23/rlc-20150923-git.tgz";
           sha256 = "1c37as5x45yizs76s7115a0w3fgas80bjb8xzq7yylpmxq44s2rk";
           system = "rlc";
           asd = "rlc";
@@ -90326,7 +90326,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "roan" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/roan/2020-12-20/roan-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/roan/2020-12-20/roan-20201220-git.tgz";
           sha256 = "032znprz03x4apzssb5vzs55cfdfyvca56bcrwxwm9dgkh3cnh7z";
           system = "roan";
           asd = "roan";
@@ -90360,7 +90360,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "robot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "robot";
           asd = "robot";
@@ -90380,7 +90380,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rock" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz";
           sha256 = "1ckvxswinv25vzwmyrr6k7m9cx99kl04b4543mlxad9688np91y8";
           system = "rock";
           asd = "rock";
@@ -90405,7 +90405,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rock-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz";
           sha256 = "1ckvxswinv25vzwmyrr6k7m9cx99kl04b4543mlxad9688np91y8";
           system = "rock-test";
           asd = "rock-test";
@@ -90428,7 +90428,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rock-web" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz";
           sha256 = "1ckvxswinv25vzwmyrr6k7m9cx99kl04b4543mlxad9688np91y8";
           system = "rock-web";
           asd = "rock-web";
@@ -90455,7 +90455,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "romreader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/romreader/2014-07-13/romreader-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/romreader/2014-07-13/romreader-20140713-git.tgz";
           sha256 = "1k3fnh48vy5wdbqif4hmflmxc3xnihyi1222cldcjvxl294yk6xx";
           system = "romreader";
           asd = "romreader";
@@ -90475,7 +90475,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "routes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-routes/2017-01-24/cl-routes-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-routes/2017-01-24/cl-routes-20170124-git.tgz";
           sha256 = "1zpk3cp2v8hm50ppjl10yxr437vv4552r8hylvizglzrq2ibsbr1";
           system = "routes";
           asd = "routes";
@@ -90499,7 +90499,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "routes-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-routes/2017-01-24/cl-routes-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-routes/2017-01-24/cl-routes-20170124-git.tgz";
           sha256 = "1zpk3cp2v8hm50ppjl10yxr437vv4552r8hylvizglzrq2ibsbr1";
           system = "routes-test";
           asd = "routes";
@@ -90522,7 +90522,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rove" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rove/2025-06-22/rove-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rove/2025-06-22/rove-20250622-git.tgz";
           sha256 = "082fz6gbifx0m255blxqvfdd5i930618i5ix3g5ar250abfdqabn";
           system = "rove";
           asd = "rove";
@@ -90545,7 +90545,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rovers-problem-translator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz";
           sha256 = "0vznjrg51bh261bh39d2cj5jifl7mlryksdb7rrcymqq0k6zc0pn";
           system = "rovers-problem-translator";
           asd = "rovers-problem-translator";
@@ -90569,7 +90569,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rpcq" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rpcq/2022-07-07/rpcq-v3.10.0.tgz";
+          url = "https://beta.quicklisp.org/archive/rpcq/2022-07-07/rpcq-v3.10.0.tgz";
           sha256 = "1bvppxlacvp0pfdbpn7ls1zxd127jacl225ds7lph5s8f8cyvf17";
           system = "rpcq";
           asd = "rpcq";
@@ -90602,7 +90602,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rpcq-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rpcq/2022-07-07/rpcq-v3.10.0.tgz";
+          url = "https://beta.quicklisp.org/archive/rpcq/2022-07-07/rpcq-v3.10.0.tgz";
           sha256 = "1bvppxlacvp0pfdbpn7ls1zxd127jacl225ds7lph5s8f8cyvf17";
           system = "rpcq-tests";
           asd = "rpcq-tests";
@@ -90627,7 +90627,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rpm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rpm/2016-04-21/rpm-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rpm/2016-04-21/rpm-20160421-git.tgz";
           sha256 = "0qn4vw3pvjm0maksl57mwikcmv7calzlblp5s01ixrn3nrgxmd9k";
           system = "rpm";
           asd = "rpm";
@@ -90652,7 +90652,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rs-colors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
           sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5";
           system = "rs-colors";
           asd = "rs-colors";
@@ -90678,7 +90678,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rs-colors-html" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
           sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5";
           system = "rs-colors-html";
           asd = "rs-colors-html";
@@ -90698,7 +90698,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rs-colors-internal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
           sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5";
           system = "rs-colors-internal";
           asd = "rs-colors-internal";
@@ -90718,7 +90718,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rs-colors-material-io" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
           sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5";
           system = "rs-colors-material-io";
           asd = "rs-colors-material-io";
@@ -90738,7 +90738,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rs-colors-ral" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
           sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5";
           system = "rs-colors-ral";
           asd = "rs-colors-ral";
@@ -90758,7 +90758,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rs-colors-ral-design" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
           sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5";
           system = "rs-colors-ral-design";
           asd = "rs-colors-ral-design";
@@ -90778,7 +90778,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rs-colors-svg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
           sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5";
           system = "rs-colors-svg";
           asd = "rs-colors-svg";
@@ -90798,7 +90798,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rs-colors-tango" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
           sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5";
           system = "rs-colors-tango";
           asd = "rs-colors-tango";
@@ -90818,7 +90818,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rs-colors-x11" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz";
           sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5";
           system = "rs-colors-x11";
           asd = "rs-colors-x11";
@@ -90838,7 +90838,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rs-dlx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rs-dlx/2024-10-12/rs-dlx-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rs-dlx/2024-10-12/rs-dlx-20241012-git.tgz";
           sha256 = "003ykkh61hg5q9lxjckqp8njhpgg21j9008gcsw60hnxdipmanaf";
           system = "rs-dlx";
           asd = "rs-dlx";
@@ -90861,7 +90861,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rs-json" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rs-json/2023-06-18/rs-json-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rs-json/2023-06-18/rs-json-20230618-git.tgz";
           sha256 = "0y71as0sg5vfijpzdhv6pj6yv064ldn2shx0y4da8kvaqv949dnq";
           system = "rs-json";
           asd = "rs-json";
@@ -90885,7 +90885,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rss" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-rss/2020-10-16/cl-rss-20201016-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-rss/2020-10-16/cl-rss-20201016-git.tgz";
           sha256 = "0wv3j13fj73gigriw5r9vi920hz05ld7zllsvbxdxvmyfy9k1kly";
           system = "rss";
           asd = "rss";
@@ -90909,7 +90909,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz";
           sha256 = "13si2rrxaagbr0bkvg6sqicxxpyshabx6ad6byc9n2ik5ysna69b";
           system = "rt";
           asd = "rt";
@@ -90927,7 +90927,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rt-events" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rt-events/2016-03-18/rt-events-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rt-events/2016-03-18/rt-events-20160318-git.tgz";
           sha256 = "17wqhczsi4mq00fp5hfc38b9ijdiaqjh7cvxhy714qqz3f5mxzdw";
           system = "rt-events";
           asd = "rt-events";
@@ -90947,7 +90947,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rt-events.examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rt-events/2016-03-18/rt-events-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rt-events/2016-03-18/rt-events-20160318-git.tgz";
           sha256 = "17wqhczsi4mq00fp5hfc38b9ijdiaqjh7cvxhy714qqz3f5mxzdw";
           system = "rt-events.examples";
           asd = "rt-events.examples";
@@ -90970,7 +90970,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rte" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "rte";
           asd = "rte";
@@ -90994,7 +90994,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rte-regexp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "rte-regexp";
           asd = "rte-regexp";
@@ -91018,7 +91018,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rte-regexp-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "rte-regexp-test";
           asd = "rte-regexp-test";
@@ -91043,7 +91043,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rte-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "rte-test";
           asd = "rte-test";
@@ -91072,7 +91072,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rtg-math" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rtg-math/2019-10-07/rtg-math-release-quicklisp-29fc5b3d-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rtg-math/2019-10-07/rtg-math-release-quicklisp-29fc5b3d-git.tgz";
           sha256 = "0bhxxnv7ldkkb18zdxyz2rj2a3iawzq2kcp7cn5i91iby7n0082x";
           system = "rtg-math";
           asd = "rtg-math";
@@ -91096,7 +91096,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rtg-math.vari" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rtg-math/2019-10-07/rtg-math-release-quicklisp-29fc5b3d-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rtg-math/2019-10-07/rtg-math-release-quicklisp-29fc5b3d-git.tgz";
           sha256 = "0bhxxnv7ldkkb18zdxyz2rj2a3iawzq2kcp7cn5i91iby7n0082x";
           system = "rtg-math.vari";
           asd = "rtg-math.vari";
@@ -91120,7 +91120,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rucksack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rucksack/2015-06-08/rucksack-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rucksack/2015-06-08/rucksack-20150608-git.tgz";
           sha256 = "0d6lvhc18i0brh75vp3n974ssx52b42rvwd24llhnphlnhryxh86";
           system = "rucksack";
           asd = "rucksack";
@@ -91140,7 +91140,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rucksack-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rucksack/2015-06-08/rucksack-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rucksack/2015-06-08/rucksack-20150608-git.tgz";
           sha256 = "0d6lvhc18i0brh75vp3n974ssx52b42rvwd24llhnphlnhryxh86";
           system = "rucksack-test";
           asd = "rucksack-test";
@@ -91160,7 +91160,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rutils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz";
           sha256 = "108l64k7qhbhmgp0wa4krm23wakyfc41wzyl2fgc9k59gf47axhq";
           system = "rutils";
           asd = "rutils";
@@ -91183,7 +91183,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rutils-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz";
           sha256 = "108l64k7qhbhmgp0wa4krm23wakyfc41wzyl2fgc9k59gf47axhq";
           system = "rutils-test";
           asd = "rutils-test";
@@ -91206,7 +91206,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "rutilsx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz";
           sha256 = "108l64k7qhbhmgp0wa4krm23wakyfc41wzyl2fgc9k59gf47axhq";
           system = "rutilsx";
           asd = "rutilsx";
@@ -91230,7 +91230,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ryeboy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ryeboy/2020-10-16/ryeboy-20201016-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ryeboy/2020-10-16/ryeboy-20201016-git.tgz";
           sha256 = "0div6m6861damksxdxcycpdyyjn50bjsxfdkksm34w6162zdjcla";
           system = "ryeboy";
           asd = "ryeboy";
@@ -91256,7 +91256,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "s-base64" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/s-base64/2013-01-28/s-base64-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/s-base64/2013-01-28/s-base64-20130128-git.tgz";
           sha256 = "0zrr8zhnkdy97c5g54605nhjlf7fly79ylr1yf6wwyssia04cagg";
           system = "s-base64";
           asd = "s-base64";
@@ -91276,7 +91276,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "s-dot2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/s-dot2/2024-10-12/s-dot2-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/s-dot2/2024-10-12/s-dot2-20241012-git.tgz";
           sha256 = "0zc833sc7szwyrrcinl84q3b0y9akh7hd5lhq3vxclk4zgb9n4nf";
           system = "s-dot2";
           asd = "s-dot2";
@@ -91296,7 +91296,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "s-graphviz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/s-graphviz/2020-12-20/s-graphviz-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/s-graphviz/2020-12-20/s-graphviz-20201220-git.tgz";
           sha256 = "1841xwci6y1gfhg15464wrlnw8xgsh1mwbg4yy2y7di02q4fbma2";
           system = "s-graphviz";
           asd = "s-graphviz";
@@ -91319,7 +91319,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "s-http-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/s-http-client/2020-04-27/s-http-client-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/s-http-client/2020-04-27/s-http-client-20200427-git.tgz";
           sha256 = "1fb2901h91rgfxz3cm1lb2dnd84m1fr745nd2kswd1mj2xz94zn8";
           system = "s-http-client";
           asd = "s-http-client";
@@ -91345,7 +91345,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "s-http-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/s-http-server/2020-04-27/s-http-server-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/s-http-server/2020-04-27/s-http-server-20200427-git.tgz";
           sha256 = "025mvnqhxx2c092aam3s4fk9v0p65hzdw39y4lamm0bdralda4bk";
           system = "s-http-server";
           asd = "s-http-server";
@@ -91371,7 +91371,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "s-sql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz";
           sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb";
           system = "s-sql";
           asd = "s-sql";
@@ -91392,7 +91392,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "s-sysdeps" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/s-sysdeps/2021-02-28/s-sysdeps-20210228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/s-sysdeps/2021-02-28/s-sysdeps-20210228-git.tgz";
           sha256 = "0rp81iq0rgl48qdwbmfy89glga81hmry2lp8adjbr5h5ybr92b4n";
           system = "s-sysdeps";
           asd = "s-sysdeps";
@@ -91414,7 +91414,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "s-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/s-utils/2020-04-27/s-utils-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/s-utils/2020-04-27/s-utils-20200427-git.tgz";
           sha256 = "0xggbcvjmj4sdqcs6vaccryqp2piaqxkc0ygkczrd5m14bwrmlp6";
           system = "s-utils";
           asd = "s-utils";
@@ -91434,7 +91434,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "s-xml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz";
           sha256 = "1zsf5zrlf47g5cp70kb9b8d4v88315g633q5jcdx22csw7sd7if1";
           system = "s-xml";
           asd = "s-xml";
@@ -91452,7 +91452,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "s-xml-rpc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/s-xml-rpc/2019-05-21/s-xml-rpc-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/s-xml-rpc/2019-05-21/s-xml-rpc-20190521-git.tgz";
           sha256 = "0z42awkz124xphkahw0mhg1pk029l2799rhyy51387ndd6gbqscx";
           system = "s-xml-rpc";
           asd = "s-xml-rpc";
@@ -91472,7 +91472,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "s-xml.examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz";
           sha256 = "1zsf5zrlf47g5cp70kb9b8d4v88315g633q5jcdx22csw7sd7if1";
           system = "s-xml.examples";
           asd = "s-xml";
@@ -91492,7 +91492,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "s-xml.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz";
           sha256 = "1zsf5zrlf47g5cp70kb9b8d4v88315g633q5jcdx22csw7sd7if1";
           system = "s-xml.test";
           asd = "s-xml";
@@ -91512,7 +91512,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "safe-queue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/safe-queue/2020-03-25/safe-queue-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/safe-queue/2020-03-25/safe-queue-20200325-git.tgz";
           sha256 = "1agvp8y2k5c6w35kly6d9a7hi1y6csn4k0hqqdv7i87lgjdi7vrq";
           system = "safe-queue";
           asd = "safe-queue";
@@ -91532,7 +91532,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "safe-read" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/safe-read/2022-02-20/safe-read-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/safe-read/2022-02-20/safe-read-20220220-git.tgz";
           sha256 = "1r9k8danfnqgpbn2vb90n6wdc6jd92h1ig565yplrbh6232lhi26";
           system = "safe-read";
           asd = "safe-read";
@@ -91555,7 +91555,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "safety-params" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/safety-params/2019-02-02/safety-params-20190202-git.tgz";
+          url = "https://beta.quicklisp.org/archive/safety-params/2019-02-02/safety-params-20190202-git.tgz";
           sha256 = "1y69b9aw3vsnsk0vdjyxw011j0lgc5gdwv6ay6vzfipa9gzi92ki";
           system = "safety-params";
           asd = "safety-params";
@@ -91578,7 +91578,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "salza2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/salza2/2021-10-20/salza2-2.1.tgz";
+          url = "https://beta.quicklisp.org/archive/salza2/2021-10-20/salza2-2.1.tgz";
           sha256 = "1p48lxdibnps5rpyh5cmnk0vc77bmmxb32qdzfz93zadr8wwas10";
           system = "salza2";
           asd = "salza2";
@@ -91596,7 +91596,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sandalphon.lambda-list" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sandalphon.lambda-list/2024-10-12/sandalphon.lambda-list-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sandalphon.lambda-list/2024-10-12/sandalphon.lambda-list-20241012-git.tgz";
           sha256 = "1j4xfcb1n71kh95v0y495snkna5avdp0inbiaia7r5fsxlcf4s45";
           system = "sandalphon.lambda-list";
           asd = "sandalphon.lambda-list";
@@ -91616,7 +91616,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sanitize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sanitize/2013-07-20/cl-sanitize-20130720-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sanitize/2013-07-20/cl-sanitize-20130720-git.tgz";
           sha256 = "101qqgi53scz3aaca57yg5wk9ana2axpwssmgrcb5c2ip5a2lwi3";
           system = "sanitize";
           asd = "sanitize";
@@ -91636,7 +91636,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sanitize-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sanitize/2013-07-20/cl-sanitize-20130720-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sanitize/2013-07-20/cl-sanitize-20130720-git.tgz";
           sha256 = "101qqgi53scz3aaca57yg5wk9ana2axpwssmgrcb5c2ip5a2lwi3";
           system = "sanitize-test";
           asd = "sanitize";
@@ -91659,7 +91659,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sanity-clause" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sanity-clause/2021-08-07/sanity-clause-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sanity-clause/2021-08-07/sanity-clause-20210807-git.tgz";
           sha256 = "0dzh00zpaqv48pn0xhbibiy33j8fwd2scsy5i466c9x9mcbhjz4f";
           system = "sanity-clause";
           asd = "sanity-clause";
@@ -91689,7 +91689,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sapaclisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sapaclisp/2012-05-20/sapaclisp-1.0a.tgz";
+          url = "https://beta.quicklisp.org/archive/sapaclisp/2012-05-20/sapaclisp-1.0a.tgz";
           sha256 = "1bgqvwvjq8g5wrmp5r1dn1v99hgin9gihwkihz455n9dn90l3pyq";
           system = "sapaclisp";
           asd = "sapaclisp";
@@ -91709,7 +91709,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sb-cga" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sb-cga/2025-06-22/sb-cga-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sb-cga/2025-06-22/sb-cga-20250622-git.tgz";
           sha256 = "0yzlaiqhac914q5pqvn9kkg1pkxxdq4w7ndpbs4d5as67wihhpdb";
           system = "sb-cga";
           asd = "sb-cga";
@@ -91729,7 +91729,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sb-fastcgi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sb-fastcgi/2024-10-12/sb-fastcgi-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sb-fastcgi/2024-10-12/sb-fastcgi-20241012-git.tgz";
           sha256 = "1jw5bmim4ll3a1bqlw02ksgw58cv1qr5li0gbczj7g9fjfk3r64z";
           system = "sb-fastcgi";
           asd = "sb-fastcgi";
@@ -91749,7 +91749,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sb-vector-io" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sb-vector-io/2011-08-29/sb-vector-io-20110829-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sb-vector-io/2011-08-29/sb-vector-io-20110829-git.tgz";
           sha256 = "0pwc0nxhv8ba33i8z2f1y7r7ldik4a4xrqrb69dvvasz838k6r22";
           system = "sb-vector-io";
           asd = "sb-vector-io";
@@ -91769,7 +91769,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sc-extensions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sc-extensions/2025-06-22/sc-extensions-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sc-extensions/2025-06-22/sc-extensions-20250622-git.tgz";
           sha256 = "1hxjcax7f6kqcf0a5lbqp407g7r1psy6wc0hsfdn5afrscdw5ak1";
           system = "sc-extensions";
           asd = "sc-extensions";
@@ -91793,7 +91793,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sc-osc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-collider/2025-06-22/cl-collider-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-collider/2025-06-22/cl-collider-20250622-git.tgz";
           sha256 = "01yiwwi9zhh1vksk26m170i6x9lsbygbznaxggf8h9psiyqg5991";
           system = "sc-osc";
           asd = "sc-osc";
@@ -91819,7 +91819,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "schannel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/schannel/2021-12-30/schannel-20211230-git.tgz";
+          url = "https://beta.quicklisp.org/archive/schannel/2021-12-30/schannel-20211230-git.tgz";
           sha256 = "1f7dncrjsswrr8wrm7qzxdvrmzg3n2ap607ad74mnfd806rwldnw";
           system = "schannel";
           asd = "schannel";
@@ -91842,7 +91842,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scheduler" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scheduler/2023-06-18/scheduler-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/scheduler/2023-06-18/scheduler-20230618-git.tgz";
           sha256 = "0559hxypgyg9863mb51wil777prspfsjbslj6psm3wndvl6xiprg";
           system = "scheduler";
           asd = "scheduler";
@@ -91868,7 +91868,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "science-data" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz";
+          url = "https://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz";
           sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0";
           system = "science-data";
           asd = "science-data";
@@ -91891,7 +91891,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scigraph" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "scigraph";
           asd = "scigraph";
@@ -91911,7 +91911,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scrapycl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz";
           sha256 = "15pl1vd8gng1sg2pib63rj2cx60wn7an98gr13j8506ia99anm33";
           system = "scrapycl";
           asd = "scrapycl";
@@ -91947,7 +91947,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scrapycl-ci" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz";
           sha256 = "15pl1vd8gng1sg2pib63rj2cx60wn7an98gr13j8506ia99anm33";
           system = "scrapycl-ci";
           asd = "scrapycl-ci";
@@ -91967,7 +91967,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scrapycl-docs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz";
           sha256 = "15pl1vd8gng1sg2pib63rj2cx60wn7an98gr13j8506ia99anm33";
           system = "scrapycl-docs";
           asd = "scrapycl-docs";
@@ -91993,7 +91993,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scrapycl-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/scrapycl/2025-06-22/scrapycl-20250622-git.tgz";
           sha256 = "15pl1vd8gng1sg2pib63rj2cx60wn7an98gr13j8506ia99anm33";
           system = "scrapycl-tests";
           asd = "scrapycl-tests";
@@ -92013,7 +92013,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scratch-buffer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "scratch-buffer";
           asd = "scratch-buffer";
@@ -92036,7 +92036,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scriba" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scriba/2022-07-07/scriba-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/scriba/2022-07-07/scriba-20220707-git.tgz";
           sha256 = "1n32bxf3b1cgb7y4015y3vahjgnbw59pi6d08by78pnpa2nx43sa";
           system = "scriba";
           asd = "scriba";
@@ -92060,7 +92060,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scriba-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scriba/2022-07-07/scriba-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/scriba/2022-07-07/scriba-20220707-git.tgz";
           sha256 = "1n32bxf3b1cgb7y4015y3vahjgnbw59pi6d08by78pnpa2nx43sa";
           system = "scriba-test";
           asd = "scriba-test";
@@ -92083,7 +92083,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scribble" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scribble/2023-10-21/scribble-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/scribble/2023-10-21/scribble-20231021-git.tgz";
           sha256 = "1ng56lzfva5231lkjls18mw7gcfc3vzksyh6habk0x5dff92cwvw";
           system = "scribble";
           asd = "scribble";
@@ -92109,7 +92109,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scriptl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz";
           sha256 = "1q0d64syglfdjrzx2x7hlvznljpfwr9scn7rliigbm5z326lygg4";
           system = "scriptl";
           asd = "scriptl";
@@ -92139,7 +92139,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scriptl-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz";
           sha256 = "1q0d64syglfdjrzx2x7hlvznljpfwr9scn7rliigbm5z326lygg4";
           system = "scriptl-examples";
           asd = "scriptl-examples";
@@ -92162,7 +92162,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scriptl-util" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz";
           sha256 = "1q0d64syglfdjrzx2x7hlvznljpfwr9scn7rliigbm5z326lygg4";
           system = "scriptl-util";
           asd = "scriptl-util";
@@ -92185,7 +92185,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scrutiny" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "scrutiny";
           asd = "scrutiny";
@@ -92205,7 +92205,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "scrutiny-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
+          url = "https://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz";
           sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi";
           system = "scrutiny-test";
           asd = "scrutiny-test";
@@ -92225,7 +92225,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sdl2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sdl2/2023-10-21/cl-sdl2-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sdl2/2023-10-21/cl-sdl2-20231021-git.tgz";
           sha256 = "189awhgxnqdyvypmw9k39542whb1jcpxx4psy6196qdbrgab8lc7";
           system = "sdl2";
           asd = "sdl2";
@@ -92252,7 +92252,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sdl2-game-controller-db" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sdl2-game-controller-db/2018-02-28/sdl2-game-controller-db-release-quicklisp-335d2b68-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sdl2-game-controller-db/2018-02-28/sdl2-game-controller-db-release-quicklisp-335d2b68-git.tgz";
           sha256 = "0yf4ygndmacs0pf3ws5197k51c4fdximvxcmvn56bqmsvil56kcd";
           system = "sdl2-game-controller-db";
           asd = "sdl2-game-controller-db";
@@ -92272,7 +92272,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sdl2-image" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sdl2-image/2024-10-12/cl-sdl2-image-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sdl2-image/2024-10-12/cl-sdl2-image-20241012-git.tgz";
           sha256 = "1jzrz3ppr5nbh0w6cvbbpv5x6gdq71a6v2qanvnjvcjs0zwf97iq";
           system = "sdl2-image";
           asd = "sdl2-image";
@@ -92297,7 +92297,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sdl2-mixer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sdl2-mixer/2024-10-12/cl-sdl2-mixer-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sdl2-mixer/2024-10-12/cl-sdl2-mixer-20241012-git.tgz";
           sha256 = "0d33pmyrcni90qfj0d4hxf97may1bv7i9z4a6rj02dw254n9r9lh";
           system = "sdl2-mixer";
           asd = "sdl2-mixer";
@@ -92322,7 +92322,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sdl2-ttf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sdl2-ttf/2024-10-12/cl-sdl2-ttf-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sdl2-ttf/2024-10-12/cl-sdl2-ttf-20241012-git.tgz";
           sha256 = "1asdymsn65a06qr1c8fknakdvpjwxsvl69py6fsz21nirxyha5nc";
           system = "sdl2-ttf";
           asd = "sdl2-ttf";
@@ -92349,7 +92349,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sdl2-ttf-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sdl2-ttf/2024-10-12/cl-sdl2-ttf-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sdl2-ttf/2024-10-12/cl-sdl2-ttf-20241012-git.tgz";
           sha256 = "1asdymsn65a06qr1c8fknakdvpjwxsvl69py6fsz21nirxyha5nc";
           system = "sdl2-ttf-examples";
           asd = "sdl2-ttf-examples";
@@ -92375,7 +92375,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sdl2kit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sdl2kit/2017-11-30/sdl2kit-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sdl2kit/2017-11-30/sdl2kit-20171130-git.tgz";
           sha256 = "10ymmxqsvdn7ndda9k2qcixj75l7namgqdxc5y2w3v5r1313fy2d";
           system = "sdl2kit";
           asd = "sdl2kit";
@@ -92400,7 +92400,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sdl2kit-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sdl2kit/2017-11-30/sdl2kit-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sdl2kit/2017-11-30/sdl2kit-20171130-git.tgz";
           sha256 = "10ymmxqsvdn7ndda9k2qcixj75l7namgqdxc5y2w3v5r1313fy2d";
           system = "sdl2kit-examples";
           asd = "sdl2kit-examples";
@@ -92426,7 +92426,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sealable-metaobjects" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sealable-metaobjects/2020-06-10/sealable-metaobjects-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sealable-metaobjects/2020-06-10/sealable-metaobjects-20200610-git.tgz";
           sha256 = "0hz1ivlpfhnk1w2cw4q2i000j2dc7maay06ndzziyywg7li6zf2p";
           system = "sealable-metaobjects";
           asd = "sealable-metaobjects";
@@ -92446,7 +92446,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "secp256k1" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-secp256k1/2022-07-07/cl-secp256k1-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-secp256k1/2022-07-07/cl-secp256k1-20220707-git.tgz";
           sha256 = "0lg84jkwwp95nnk865yfhg16z0d04wk3dzf5yilkfm2yxnmjnv85";
           system = "secp256k1";
           asd = "secp256k1";
@@ -92466,7 +92466,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "secret-values" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/secret-values/2020-12-20/secret-values-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/secret-values/2020-12-20/secret-values-20201220-git.tgz";
           sha256 = "07ph49s27gvjzx60yy094bb9ddwiys34r8cx5l837i34nm2fn3nh";
           system = "secret-values";
           asd = "secret-values";
@@ -92486,7 +92486,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "secure-random" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/secure-random/2016-02-08/secure-random-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/secure-random/2016-02-08/secure-random-20160208-git.tgz";
           sha256 = "09cnclnivkc87ja3z12ihcm02vkwp0cflcfa6hpjlbd5m75hvgsd";
           system = "secure-random";
           asd = "secure-random";
@@ -92506,7 +92506,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "seedable-rng" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/seedable-rng/2022-07-07/seedable-rng-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/seedable-rng/2022-07-07/seedable-rng-20220707-git.tgz";
           sha256 = "1pr2flvrj32m055apwn5f2cddki2ws5xldmj2v367iyry3lz2vm1";
           system = "seedable-rng";
           asd = "seedable-rng";
@@ -92530,7 +92530,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "select" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/select/2024-10-12/select-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/select/2024-10-12/select-20241012-git.tgz";
           sha256 = "1js02xgfd488lhv90rgxw0cvfbsarlpakydwrg1jr2hh5bhqyifh";
           system = "select";
           asd = "select";
@@ -92555,7 +92555,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "select-file" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/select-file/2020-04-27/select-file-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/select-file/2020-04-27/select-file-20200427-git.tgz";
           sha256 = "1v89k5vvn1a3gdhlwbb4wxggzzr1ic7iqzvrrxgsh90fr129rmzq";
           system = "select-file";
           asd = "select-file";
@@ -92578,7 +92578,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "selenium" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-selenium/2016-05-31/cl-selenium-20160531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-selenium/2016-05-31/cl-selenium-20160531-git.tgz";
           sha256 = "1wx3343gkmyb25vbbpv6g5d1m2c5qxrkq7hsz1v2fcchgdgvwgxl";
           system = "selenium";
           asd = "selenium";
@@ -92604,7 +92604,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "semantic-spinneret" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/semantic-spinneret/2017-08-30/semantic-spinneret-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/semantic-spinneret/2017-08-30/semantic-spinneret-20170830-git.tgz";
           sha256 = "0ghd4lwwcbcidj70j26hj9vic1nqrj78ksrqlxj29q61bnji05ix";
           system = "semantic-spinneret";
           asd = "semantic-spinneret";
@@ -92627,7 +92627,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "semz.decompress" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/decompress/2024-10-12/decompress-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/decompress/2024-10-12/decompress-20241012-git.tgz";
           sha256 = "0nzz6r57v94kyl5r77yawalnjszw93qjiqqargl3vjrmiga37gjp";
           system = "semz.decompress";
           asd = "semz.decompress";
@@ -92650,7 +92650,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "semz.minisign-verify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/minisign-verify/2025-06-22/minisign-verify-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/minisign-verify/2025-06-22/minisign-verify-20250622-git.tgz";
           sha256 = "10v87cm8yxnp7lgqbxcr6bn223391bk9sv9d9p0kff07d1a4dwrp";
           system = "semz.minisign-verify";
           asd = "semz.minisign-verify";
@@ -92670,7 +92670,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sendgrid" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sendgrid/2024-10-12/cl-sendgrid-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sendgrid/2024-10-12/cl-sendgrid-20241012-git.tgz";
           sha256 = "02wwi2fwfd21aisf1y6ngypg7dmfvlf3bgxhqhrp1vpw8b34ha4w";
           system = "sendgrid";
           asd = "sendgrid";
@@ -92695,7 +92695,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sento" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-gserver/2025-06-22/cl-gserver-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-gserver/2025-06-22/cl-gserver-20250622-git.tgz";
           sha256 = "1lwa2habxdmjl2y9jl7ds2b1v1ijcdp7kk060b57g8hyx0saxj6x";
           system = "sento";
           asd = "sento";
@@ -92726,7 +92726,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sentry-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz";
           sha256 = "0i83kgrjznffj6z5ryxnxlk995937askhilsbfa2nixakwal2c5h";
           system = "sentry-client";
           asd = "sentry-client";
@@ -92757,7 +92757,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sentry-client.async" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz";
           sha256 = "0i83kgrjznffj6z5ryxnxlk995937askhilsbfa2nixakwal2c5h";
           system = "sentry-client.async";
           asd = "sentry-client.async";
@@ -92780,7 +92780,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sentry-client.hunchentoot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz";
           sha256 = "0i83kgrjznffj6z5ryxnxlk995937askhilsbfa2nixakwal2c5h";
           system = "sentry-client.hunchentoot";
           asd = "sentry-client.hunchentoot";
@@ -92803,7 +92803,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sequence-iterators" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz";
           sha256 = "12flvy6hysqw0fa2jfkxrgphlk6b25hg2w2dxm1ylax0gw9fh1l5";
           system = "sequence-iterators";
           asd = "sequence-iterators";
@@ -92823,7 +92823,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sequence-iterators-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz";
           sha256 = "12flvy6hysqw0fa2jfkxrgphlk6b25hg2w2dxm1ylax0gw9fh1l5";
           system = "sequence-iterators-test";
           asd = "sequence-iterators";
@@ -92843,7 +92843,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "serapeum" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/serapeum/2025-06-22/serapeum-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/serapeum/2025-06-22/serapeum-20250622-git.tgz";
           sha256 = "0vg7pzv9y2qx0zydnkx5klf0vb3ac5q8hy35z919b9037s7nrcl7";
           system = "serapeum";
           asd = "serapeum";
@@ -92875,7 +92875,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "serializable-object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/serializable-object/2019-12-27/serializable-object-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/serializable-object/2019-12-27/serializable-object-20191227-git.tgz";
           sha256 = "0978ljw998ypryiiqmb1s11ymwg4h5qz9bv7ig1i29wf5s14s2i0";
           system = "serializable-object";
           asd = "serializable-object";
@@ -92895,7 +92895,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "serializable-object.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/serializable-object/2019-12-27/serializable-object-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/serializable-object/2019-12-27/serializable-object-20191227-git.tgz";
           sha256 = "0978ljw998ypryiiqmb1s11ymwg4h5qz9bv7ig1i29wf5s14s2i0";
           system = "serializable-object.test";
           asd = "serializable-object.test";
@@ -92918,7 +92918,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "series" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/series/2013-11-11/series-20131111-git.tgz";
+          url = "https://beta.quicklisp.org/archive/series/2013-11-11/series-20131111-git.tgz";
           sha256 = "07hk2lhfx42zk018pxqvn4gs77vd4n4g8m4xxbqaxgca76mifwfw";
           system = "series";
           asd = "series";
@@ -92938,7 +92938,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "series-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/series/2013-11-11/series-20131111-git.tgz";
+          url = "https://beta.quicklisp.org/archive/series/2013-11-11/series-20131111-git.tgz";
           sha256 = "07hk2lhfx42zk018pxqvn4gs77vd4n4g8m4xxbqaxgca76mifwfw";
           system = "series-tests";
           asd = "series";
@@ -92958,7 +92958,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "session-token" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/session-token/2014-11-06/session-token-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/session-token/2014-11-06/session-token-20141106-git.tgz";
           sha256 = "1yb6m8nbh4gaskplrd2bwsnpkq6dl9dkvbjmvhzls6vh4lp6cc2z";
           system = "session-token";
           asd = "session-token";
@@ -92978,7 +92978,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "setup-cl+ssl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zacl/2023-06-18/zacl-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/zacl/2023-06-18/zacl-20230618-git.tgz";
           sha256 = "1s31d47zx8hczim78zrqzg4bvj4bshj31gmrff065q6racx3q1dk";
           system = "setup-cl+ssl";
           asd = "setup-cl+ssl";
@@ -92998,7 +92998,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sexml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sexml/2014-07-13/sexml-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sexml/2014-07-13/sexml-20140713-git.tgz";
           sha256 = "1s7isk9v7qh03sf60zw32kaa1rgvdh24bsc37q173r282m8plbk3";
           system = "sexml";
           asd = "sexml";
@@ -93024,7 +93024,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sexml-objects" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sexml/2014-07-13/sexml-20140713-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sexml/2014-07-13/sexml-20140713-git.tgz";
           sha256 = "1s7isk9v7qh03sf60zw32kaa1rgvdh24bsc37q173r282m8plbk3";
           system = "sexml-objects";
           asd = "sexml-objects";
@@ -93044,7 +93044,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sha1" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sha1/2021-10-20/sha1-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sha1/2021-10-20/sha1-20211020-git.tgz";
           sha256 = "1cfn0j5yfwqkwr2dm73wr9hz8dmws3ngxlbk9886ahxkg544qx4z";
           system = "sha1";
           asd = "sha1";
@@ -93064,7 +93064,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sha3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sha3/2023-10-21/sha3-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sha3/2023-10-21/sha3-20231021-git.tgz";
           sha256 = "0jl59js4n1gc08j2bcwf0d1gy82lf7g53b639dwh6b0milbqh7gz";
           system = "sha3";
           asd = "sha3";
@@ -93084,7 +93084,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "shadchen" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shadchen/2013-10-03/shadchen-20131003-git.tgz";
+          url = "https://beta.quicklisp.org/archive/shadchen/2013-10-03/shadchen-20131003-git.tgz";
           sha256 = "0731hrpzf9pn1hyvs9wl0w3mnv13mr9ky3jx3dc4baj4nmjyb1k6";
           system = "shadchen";
           asd = "shadchen";
@@ -93104,7 +93104,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "shadow" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shadow/2022-07-07/shadow-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/shadow/2022-07-07/shadow-20220707-git.tgz";
           sha256 = "1lw98ir9381kmmranaa111f8jh47adsx0v4hzlw3qkf2xjcfah3l";
           system = "shadow";
           asd = "shadow";
@@ -93131,7 +93131,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "shared-preferences" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shared-preferences/2021-02-28/shared-preferences_1.1.1.tgz";
+          url = "https://beta.quicklisp.org/archive/shared-preferences/2021-02-28/shared-preferences_1.1.1.tgz";
           sha256 = "12m4kaba2lxndkjw30a6y2rq16fflh5016lp74l7pf3v0y3j1ydf";
           system = "shared-preferences";
           asd = "shared-preferences";
@@ -93154,7 +93154,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "shared-preferences_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shared-preferences/2021-02-28/shared-preferences_1.1.1.tgz";
+          url = "https://beta.quicklisp.org/archive/shared-preferences/2021-02-28/shared-preferences_1.1.1.tgz";
           sha256 = "12m4kaba2lxndkjw30a6y2rq16fflh5016lp74l7pf3v0y3j1ydf";
           system = "shared-preferences_tests";
           asd = "shared-preferences_tests";
@@ -93177,7 +93177,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "shasht" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shasht/2024-10-12/shasht-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/shasht/2024-10-12/shasht-20241012-git.tgz";
           sha256 = "0i4k6w5r74f2a0i3ffian715v057w63psywk89ih0hl9xxpc4pga";
           system = "shasht";
           asd = "shasht";
@@ -93200,7 +93200,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sheeple" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sheeple/2021-01-24/sheeple-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sheeple/2021-01-24/sheeple-20210124-git.tgz";
           sha256 = "13k6xm8a29xxkrwgc5j3bk2wr9skg4bzdnc4krrzgcdmx4gbcca3";
           system = "sheeple";
           asd = "sheeple";
@@ -93220,7 +93220,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sheeple-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sheeple/2021-01-24/sheeple-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sheeple/2021-01-24/sheeple-20210124-git.tgz";
           sha256 = "13k6xm8a29xxkrwgc5j3bk2wr9skg4bzdnc4krrzgcdmx4gbcca3";
           system = "sheeple-tests";
           asd = "sheeple";
@@ -93243,7 +93243,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "shellpool" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shellpool/2025-06-22/shellpool-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/shellpool/2025-06-22/shellpool-20250622-git.tgz";
           sha256 = "1ia1b7kcdrr9r1306my22c8sz4bjn7yki94j196dxrpbpb7s1jpb";
           system = "shellpool";
           asd = "shellpool";
@@ -93268,7 +93268,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "shelly" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shelly/2014-11-06/shelly-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/shelly/2014-11-06/shelly-20141106-git.tgz";
           sha256 = "07whfcd2ygq07lw73bqby74cqbp2bx0rnyx7c0v7s16y9xfqxw7b";
           system = "shelly";
           asd = "shelly";
@@ -93295,7 +93295,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "shelly-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shelly/2014-11-06/shelly-20141106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/shelly/2014-11-06/shelly-20141106-git.tgz";
           sha256 = "07whfcd2ygq07lw73bqby74cqbp2bx0rnyx7c0v7s16y9xfqxw7b";
           system = "shelly-test";
           asd = "shelly-test";
@@ -93318,7 +93318,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "shlex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-shlex/2021-04-11/cl-shlex-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-shlex/2021-04-11/cl-shlex-20210411-git.tgz";
           sha256 = "16ag48sswgimr1fzr582vhym4s03idpd4lkydw5s58lv80ibpim8";
           system = "shlex";
           asd = "shlex";
@@ -93343,7 +93343,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "shop3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz";
           sha256 = "0vznjrg51bh261bh39d2cj5jifl7mlryksdb7rrcymqq0k6zc0pn";
           system = "shop3";
           asd = "shop3";
@@ -93369,7 +93369,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "shop3-thmpr-api" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/shop3/2025-06-22/shop3-20250622-git.tgz";
           sha256 = "0vznjrg51bh261bh39d2cj5jifl7mlryksdb7rrcymqq0k6zc0pn";
           system = "shop3-thmpr-api";
           asd = "shop3-thmpr-api";
@@ -93389,7 +93389,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "should-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/should-test/2019-10-07/should-test-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/should-test/2019-10-07/should-test-20191007-git.tgz";
           sha256 = "1fqqa7lhf28qg60ji9libkylkcy747x576qpjn1y7c945j2fxmnm";
           system = "should-test";
           asd = "should-test";
@@ -93414,7 +93414,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "shuffletron" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/shuffletron/2025-06-22/shuffletron-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/shuffletron/2025-06-22/shuffletron-20250622-git.tgz";
           sha256 = "108xl69ndnb2wdy93sqgqacmbqhg8l82cn0rsqaqgfwapx6i5gaz";
           system = "shuffletron";
           asd = "shuffletron";
@@ -93440,7 +93440,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "si-kanren" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/si-kanren/2024-10-12/si-kanren-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/si-kanren/2024-10-12/si-kanren-20241012-git.tgz";
           sha256 = "1m99ryyfjxbjbmswprz8gr9hl3srwz74fwjna35wf8d41ns5ajlj";
           system = "si-kanren";
           asd = "si-kanren";
@@ -93460,7 +93460,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "silo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz";
           sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r";
           system = "silo";
           asd = "silo";
@@ -93480,7 +93480,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simpbin" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simpbin/2025-06-22/simpbin-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simpbin/2025-06-22/simpbin-20250622-git.tgz";
           sha256 = "0dymdi6crlq18x181gkip3vdyv2i3ryjip306vgw9ac2gg23rfdn";
           system = "simpbin";
           asd = "simpbin";
@@ -93505,7 +93505,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-actors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-actors/2020-09-25/simple-actors-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-actors/2020-09-25/simple-actors-20200925-git.tgz";
           sha256 = "1q843l1bh0xipp535gwm7713gpp04cycvq0i8yz54b6ym3dzkql4";
           system = "simple-actors";
           asd = "simple-actors";
@@ -93525,7 +93525,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-config" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-config/2023-06-18/simple-config-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-config/2023-06-18/simple-config-20230618-git.tgz";
           sha256 = "1ihw5yr5jwlpixaa011611q6i4j406rvc42bkm0da1arzd76pfhn";
           system = "simple-config";
           asd = "simple-config";
@@ -93545,7 +93545,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-config-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-config/2023-06-18/simple-config-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-config/2023-06-18/simple-config-20230618-git.tgz";
           sha256 = "1ihw5yr5jwlpixaa011611q6i4j406rvc42bkm0da1arzd76pfhn";
           system = "simple-config-test";
           asd = "simple-config-test";
@@ -93568,7 +93568,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-currency" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-currency/2017-11-30/simple-currency-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-currency/2017-11-30/simple-currency-20171130-git.tgz";
           sha256 = "1qrxaj5v25165vyjp2fmasasjri2cn53y6ckv3rlv04skifvnq2s";
           system = "simple-currency";
           asd = "simple-currency";
@@ -93594,7 +93594,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-date" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz";
           sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb";
           system = "simple-date";
           asd = "simple-date";
@@ -93612,7 +93612,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-date-time" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz";
           sha256 = "06iwf13gcdyqhkzfkcsfdl8iqbdl44cx01c3fjsmhl0v1pp8h2m4";
           system = "simple-date-time";
           asd = "simple-date-time";
@@ -93630,7 +93630,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-finalizer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-finalizer/2010-10-06/simple-finalizer-20101006-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-finalizer/2010-10-06/simple-finalizer-20101006-git.tgz";
           sha256 = "1qdm48zjlkbygz9ip006xwpas59fhijrswv1k7pzvhdwl04vkq65";
           system = "simple-finalizer";
           asd = "simple-finalizer";
@@ -93653,7 +93653,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-flow-dispatcher" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-flow-dispatcher/2020-10-16/simple-flow-dispatcher-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-flow-dispatcher/2020-10-16/simple-flow-dispatcher-stable-git.tgz";
           sha256 = "11k16svq4mgf0pagrs4drvf57hawffghv9g96b1n071nqyk2ald2";
           system = "simple-flow-dispatcher";
           asd = "simple-flow-dispatcher";
@@ -93677,7 +93677,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-guess" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-guess/2020-09-25/simple-guess_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-guess/2020-09-25/simple-guess_1.0.tgz";
           sha256 = "11v3wxj3k036r0kazn69vi580qm593ir1yf7j5d737j4rb382682";
           system = "simple-guess";
           asd = "simple-guess";
@@ -93697,7 +93697,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-guess_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-guess/2020-09-25/simple-guess_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-guess/2020-09-25/simple-guess_1.0.tgz";
           sha256 = "11v3wxj3k036r0kazn69vi580qm593ir1yf7j5d737j4rb382682";
           system = "simple-guess_tests";
           asd = "simple-guess_tests";
@@ -93721,7 +93721,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-inferiors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-inferiors/2025-06-22/simple-inferiors-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-inferiors/2025-06-22/simple-inferiors-20250622-git.tgz";
           sha256 = "050bwv7m6li41rq9cq2achy9j3zibnwyn2xigngg4knir0hi1f4s";
           system = "simple-inferiors";
           asd = "simple-inferiors";
@@ -93742,7 +93742,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-neural-network" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-neural-network/2025-06-22/simple-neural-network-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-neural-network/2025-06-22/simple-neural-network-20250622-git.tgz";
           sha256 = "15c4851qm1zv76hqa4081z0ni7dnf23130x1rxgsiysjpvz2slyf";
           system = "simple-neural-network";
           asd = "simple-neural-network";
@@ -93765,7 +93765,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-parallel-tasks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-parallel-tasks/2020-12-20/simple-parallel-tasks-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-parallel-tasks/2020-12-20/simple-parallel-tasks-20201220-git.tgz";
           sha256 = "0gvbpyff4siifp3cp86cpr9ksmakn66fx21f3h0hpn647zl07nj7";
           system = "simple-parallel-tasks";
           asd = "simple-parallel-tasks";
@@ -93785,7 +93785,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-parallel-tasks-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-parallel-tasks/2020-12-20/simple-parallel-tasks-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-parallel-tasks/2020-12-20/simple-parallel-tasks-20201220-git.tgz";
           sha256 = "0gvbpyff4siifp3cp86cpr9ksmakn66fx21f3h0hpn647zl07nj7";
           system = "simple-parallel-tasks-tests";
           asd = "simple-parallel-tasks-tests";
@@ -93808,7 +93808,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-rgb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-rgb/2025-06-22/simple-rgb-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-rgb/2025-06-22/simple-rgb-20250622-git.tgz";
           sha256 = "1cmbq08kpha7k85mznqn3y6jn49ps8569737x3mr9kmks43raay9";
           system = "simple-rgb";
           asd = "simple-rgb";
@@ -93828,7 +93828,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-routes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz";
           sha256 = "0zkjl69zf1ynmqmvwccdbip3wxfyi7xplivv70qwxzd27mc0kh3k";
           system = "simple-routes";
           asd = "simple-routes";
@@ -93851,7 +93851,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-scanf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz";
           sha256 = "0zndlkw3qy3vw4px4qv884z6232w8zfaliyc88irjwizdv35wcq9";
           system = "simple-scanf";
           asd = "simple-scanf";
@@ -93876,7 +93876,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simple-tasks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-tasks/2025-06-22/simple-tasks-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-tasks/2025-06-22/simple-tasks-20250622-git.tgz";
           sha256 = "101fljqvac2msj5aaqbhk755c3ml3rnhz8675abixhfjzbhv1khi";
           system = "simple-tasks";
           asd = "simple-tasks";
@@ -93898,7 +93898,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simpleroutes-demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz";
           sha256 = "0zkjl69zf1ynmqmvwccdbip3wxfyi7xplivv70qwxzd27mc0kh3k";
           system = "simpleroutes-demo";
           asd = "simple-routes";
@@ -93924,7 +93924,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simpleroutes-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz";
           sha256 = "0zkjl69zf1ynmqmvwccdbip3wxfyi7xplivv70qwxzd27mc0kh3k";
           system = "simpleroutes-test";
           asd = "simple-routes";
@@ -93944,7 +93944,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simplet" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simplet/2019-12-27/simplet-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simplet/2019-12-27/simplet-20191227-git.tgz";
           sha256 = "1scsalzbwxk6z48b61zq532c02l36yr3vl2jdy0xjm2diycq6jgs";
           system = "simplet";
           asd = "simplet";
@@ -93964,7 +93964,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simplet-asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simplet/2019-12-27/simplet-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simplet/2019-12-27/simplet-20191227-git.tgz";
           sha256 = "1scsalzbwxk6z48b61zq532c02l36yr3vl2jdy0xjm2diycq6jgs";
           system = "simplet-asdf";
           asd = "simplet-asdf";
@@ -93984,7 +93984,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simplified-types" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simplified-types/2019-08-13/simplified-types-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simplified-types/2019-08-13/simplified-types-20190813-git.tgz";
           sha256 = "1hdwmn5lz717aj6qdqmfmr3cbjl8l3giwn0fb5ca9pj83cx7fg8y";
           system = "simplified-types";
           asd = "simplified-types";
@@ -94008,7 +94008,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simplified-types-test-suite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simplified-types/2019-08-13/simplified-types-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/simplified-types/2019-08-13/simplified-types-20190813-git.tgz";
           sha256 = "1hdwmn5lz717aj6qdqmfmr3cbjl8l3giwn0fb5ca9pj83cx7fg8y";
           system = "simplified-types-test-suite";
           asd = "simplified-types-test-suite";
@@ -94031,7 +94031,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "simpsamp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/simpsamp/2010-10-06/simpsamp-0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/simpsamp/2010-10-06/simpsamp-0.1.tgz";
           sha256 = "0i85andjaz16lh4wwpdvd5kgg7lsfp206g7kniy16gs78xjy5jlc";
           system = "simpsamp";
           asd = "simpsamp";
@@ -94051,7 +94051,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "single-threaded-ccl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/single-threaded-ccl/2015-06-08/single-threaded-ccl-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/single-threaded-ccl/2015-06-08/single-threaded-ccl-20150608-git.tgz";
           sha256 = "0d8cf8x77b3f7qh2cr3fnkc6i7dm7pwlnldmv9k4q033rmmhnfxb";
           system = "single-threaded-ccl";
           asd = "single-threaded-ccl";
@@ -94071,7 +94071,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "singleton-classes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-abstract-classes/2019-03-07/cl-abstract-classes-20190307-hg.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-abstract-classes/2019-03-07/cl-abstract-classes-20190307-hg.tgz";
           sha256 = "0q03j3ksgn56j9xvs3d3hhasplj3hvg488f4cx1z97nlyqxr5w1d";
           system = "singleton-classes";
           asd = "singleton-classes";
@@ -94091,7 +94091,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sip-hash" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sip-hash/2020-06-10/sip-hash-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sip-hash/2020-06-10/sip-hash-20200610-git.tgz";
           sha256 = "0cd6g37lxd5i5fyg9my4jja27ki5agbpr9d635rcwpf32yhc4sh9";
           system = "sip-hash";
           asd = "sip-hash";
@@ -94114,7 +94114,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "skeleton-creator" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/skeleton-creator/2019-12-27/skeleton-creator-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/skeleton-creator/2019-12-27/skeleton-creator-20191227-git.tgz";
           sha256 = "1yj8w9lpb2jzyf02zg65ngmjfsakzc7k1kcw90w52gk14hv1lk6s";
           system = "skeleton-creator";
           asd = "skeleton-creator";
@@ -94139,7 +94139,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sketch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sketch/2024-10-12/sketch-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sketch/2024-10-12/sketch-20241012-git.tgz";
           sha256 = "1bq0ljb2awzkk4shsd0w4v2hc2abmkwfv7nz8d88hglrvar8qbnl";
           system = "sketch";
           asd = "sketch";
@@ -94175,7 +94175,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sketch-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sketch/2024-10-12/sketch-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sketch/2024-10-12/sketch-20241012-git.tgz";
           sha256 = "1bq0ljb2awzkk4shsd0w4v2hc2abmkwfv7nz8d88hglrvar8qbnl";
           system = "sketch-examples";
           asd = "sketch-examples";
@@ -94198,7 +94198,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "skippy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/skippy/2015-04-07/skippy-1.3.12.tgz";
+          url = "https://beta.quicklisp.org/archive/skippy/2015-04-07/skippy-1.3.12.tgz";
           sha256 = "1n8925qz19w00qc67z3hc97fpmfhi0r54dd50fzqm24vhyb7qwc2";
           system = "skippy";
           asd = "skippy";
@@ -94218,7 +94218,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "skippy-renderer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/skippy-renderer/2022-11-06/skippy-renderer-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/skippy-renderer/2022-11-06/skippy-renderer-20221106-git.tgz";
           sha256 = "0x9zv8zchxn48axl5rwfnywg9kb9m0pz3gwjk7gpg9m574jw8x0c";
           system = "skippy-renderer";
           asd = "skippy-renderer";
@@ -94238,7 +94238,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "skitter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz";
+          url = "https://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz";
           sha256 = "1rixcav388fnal9v139kvagjfc60sbwd8ikbmd48lppq2nq5anwl";
           system = "skitter";
           asd = "skitter";
@@ -94262,7 +94262,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "skitter.glop" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz";
+          url = "https://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz";
           sha256 = "1rixcav388fnal9v139kvagjfc60sbwd8ikbmd48lppq2nq5anwl";
           system = "skitter.glop";
           asd = "skitter.glop";
@@ -94285,7 +94285,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "skitter.sdl2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz";
+          url = "https://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz";
           sha256 = "1rixcav388fnal9v139kvagjfc60sbwd8ikbmd48lppq2nq5anwl";
           system = "skitter.sdl2";
           asd = "skitter.sdl2";
@@ -94308,7 +94308,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "slack-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/slack-client/2016-08-25/slack-client-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/slack-client/2016-08-25/slack-client-20160825-git.tgz";
           sha256 = "1yl2wqhx1h2kw3s5dkkq5c4hk1r7679yzq41j2j2bscbl3xk3jp9";
           system = "slack-client";
           asd = "slack-client";
@@ -94337,7 +94337,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "slack-client-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/slack-client/2016-08-25/slack-client-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/slack-client/2016-08-25/slack-client-20160825-git.tgz";
           sha256 = "1yl2wqhx1h2kw3s5dkkq5c4hk1r7679yzq41j2j2bscbl3xk3jp9";
           system = "slack-client-test";
           asd = "slack-client-test";
@@ -94361,7 +94361,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "slim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mcclim/2025-06-22/mcclim-20250622-git.tgz";
           sha256 = "0cwpmvmqlm1gnpbf4p7pqzkgywkavqg82zc40109a8k3wd31sj9s";
           system = "slim";
           asd = "slim";
@@ -94381,7 +94381,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "slite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/slite/2025-06-22/slite-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/slite/2025-06-22/slite-20250622-git.tgz";
           sha256 = "10gfnppjja41w00cxnlf7qwcq92ssz5xn9gqsvdiwdsy12501qrz";
           system = "slite";
           asd = "slite";
@@ -94404,7 +94404,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "slot-extra-options" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/slot-extra-options/2021-04-11/slot-extra-options-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/slot-extra-options/2021-04-11/slot-extra-options-20210411-git.tgz";
           sha256 = "1b2swhjjs0w1034cy045q8l3ndmci7rjawka39q23vncy6d90497";
           system = "slot-extra-options";
           asd = "slot-extra-options";
@@ -94429,7 +94429,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "slot-extra-options-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/slot-extra-options/2021-04-11/slot-extra-options-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/slot-extra-options/2021-04-11/slot-extra-options-20210411-git.tgz";
           sha256 = "1b2swhjjs0w1034cy045q8l3ndmci7rjawka39q23vncy6d90497";
           system = "slot-extra-options-tests";
           asd = "slot-extra-options-tests";
@@ -94456,7 +94456,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "slot-map" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/slot-map/2022-07-07/slot-map-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/slot-map/2022-07-07/slot-map-20220707-git.tgz";
           sha256 = "1z9qprjqj3pwqf469bxj0fvvjni1ncap6g7w5q9gmv5hnf2a4yjb";
           system = "slot-map";
           asd = "slot-map";
@@ -94479,7 +94479,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "slynk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sly/2025-06-22/sly-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sly/2025-06-22/sly-20250622-git.tgz";
           sha256 = "1744n32vc00n6fgc4sa8x6z7s1cym0nq6gqnqqyz56kcqc2h2qqb";
           system = "slynk";
           asd = "slynk";
@@ -94497,7 +94497,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "slynk-macrostep" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sly-macrostep/2023-06-18/sly-macrostep-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sly-macrostep/2023-06-18/sly-macrostep-20230618-git.tgz";
           sha256 = "1nxf28gn4f3n0wnv7nb5sgl36fz175y470zs9hig4kq8cp0yal0r";
           system = "slynk-macrostep";
           asd = "slynk-macrostep";
@@ -94517,7 +94517,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "slynk-named-readtables" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sly-named-readtables/2023-06-18/sly-named-readtables-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sly-named-readtables/2023-06-18/sly-named-readtables-20230618-git.tgz";
           sha256 = "16asd119rzqrlclps2q6yrkis8jy5an5xgzzqvb7jdyq39zxg54q";
           system = "slynk-named-readtables";
           asd = "slynk-named-readtables";
@@ -94537,7 +94537,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "smackjack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/smackjack/2018-02-28/smackjack-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/smackjack/2018-02-28/smackjack-20180228-git.tgz";
           sha256 = "1n2x7qij2ci70axd2xn295qqgqrvbfbpvv2438lhwd8qa92dhk8b";
           system = "smackjack";
           asd = "smackjack";
@@ -94563,7 +94563,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "smackjack-demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/smackjack/2018-02-28/smackjack-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/smackjack/2018-02-28/smackjack-20180228-git.tgz";
           sha256 = "1n2x7qij2ci70axd2xn295qqgqrvbfbpvv2438lhwd8qa92dhk8b";
           system = "smackjack-demo";
           asd = "smackjack-demo";
@@ -94588,7 +94588,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "small-coalton-programs" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
           sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "small-coalton-programs";
           asd = "small-coalton-programs";
@@ -94608,7 +94608,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "smallnet" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/smallnet/2025-06-22/smallnet-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/smallnet/2025-06-22/smallnet-20250622-git.tgz";
           sha256 = "0kmi2jrgi0m295r9kpw6ahxpbpjwpxnjxk3753yxaqwgh814al20";
           system = "smallnet";
           asd = "smallnet";
@@ -94636,7 +94636,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "smart-buffer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/smart-buffer/2021-10-20/smart-buffer-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/smart-buffer/2021-10-20/smart-buffer-20211020-git.tgz";
           sha256 = "1r9y61a791m7aqgg2ixs86lc63y78w7n6dwipakcpjzscqmprppr";
           system = "smart-buffer";
           asd = "smart-buffer";
@@ -94657,7 +94657,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "smart-buffer-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/smart-buffer/2021-10-20/smart-buffer-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/smart-buffer/2021-10-20/smart-buffer-20211020-git.tgz";
           sha256 = "1r9y61a791m7aqgg2ixs86lc63y78w7n6dwipakcpjzscqmprppr";
           system = "smart-buffer-test";
           asd = "smart-buffer-test";
@@ -94682,7 +94682,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "smokebase" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz";
           sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w";
           system = "smokebase";
           asd = "smokebase";
@@ -94705,7 +94705,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "smoothers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/smoothers/2024-10-12/smoothers-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/smoothers/2024-10-12/smoothers-20241012-git.tgz";
           sha256 = "0byqn3xni83jkbzc0jllpyfsgjaiifsjr55aaf90pbi71as39xfd";
           system = "smoothers";
           asd = "smoothers";
@@ -94731,7 +94731,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "smug" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/smug/2021-12-30/smug-20211230-git.tgz";
+          url = "https://beta.quicklisp.org/archive/smug/2021-12-30/smug-20211230-git.tgz";
           sha256 = "13gzkj9skya2ziwclk041v7sif392ydbvhvikhg2raa3qjcxb3rq";
           system = "smug";
           asd = "smug";
@@ -94749,7 +94749,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snakes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snakes/2022-11-06/snakes-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snakes/2022-11-06/snakes-20221106-git.tgz";
           sha256 = "17fqkw256c2iacy5g37sv9h0mbrmb3fg2s9sd83gj9clrg5r4wkl";
           system = "snakes";
           asd = "snakes";
@@ -94776,7 +94776,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snappy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snappy/2021-12-09/snappy-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snappy/2021-12-09/snappy-20211209-git.tgz";
           sha256 = "1g0d8icbqmahywqczb8pimr63970dil6mnlxkv3y9ng31dg0npy6";
           system = "snappy";
           asd = "snappy";
@@ -94800,7 +94800,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snark" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
           sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark";
           asd = "snark";
@@ -94820,7 +94820,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snark-agenda" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
           sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-agenda";
           asd = "snark-agenda";
@@ -94845,7 +94845,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snark-auxiliary-packages" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
           sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-auxiliary-packages";
           asd = "snark-auxiliary-packages";
@@ -94865,7 +94865,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snark-deque" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
           sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-deque";
           asd = "snark-deque";
@@ -94888,7 +94888,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snark-dpll" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
           sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-dpll";
           asd = "snark-dpll";
@@ -94911,7 +94911,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snark-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
           sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-examples";
           asd = "snark-examples";
@@ -94931,7 +94931,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snark-feature" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
           sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-feature";
           asd = "snark-feature";
@@ -94954,7 +94954,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snark-implementation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
           sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-implementation";
           asd = "snark-implementation";
@@ -94985,7 +94985,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snark-infix-reader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
           sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-infix-reader";
           asd = "snark-infix-reader";
@@ -95008,7 +95008,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snark-lisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
           sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-lisp";
           asd = "snark-lisp";
@@ -95028,7 +95028,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snark-loads" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
           sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-loads";
           asd = "snark-loads";
@@ -95048,7 +95048,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snark-numbering" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
           sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-numbering";
           asd = "snark-numbering";
@@ -95072,7 +95072,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snark-pkg" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
           sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-pkg";
           asd = "snark-pkg";
@@ -95092,7 +95092,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snark-sparse-array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snark/2025-06-22/snark-20250622-git.tgz";
           sha256 = "03vdkm3kdkm3d9cmrpr8qr4y0sdindwh8xncq341w2pil7zaila0";
           system = "snark-sparse-array";
           asd = "snark-sparse-array";
@@ -95115,7 +95115,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sndfile-blob" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sndfile-blob/2020-10-16/sndfile-blob-stable-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sndfile-blob/2020-10-16/sndfile-blob-stable-git.tgz";
           sha256 = "1csbm2cgj76smia59044vx8698w9dy223cmwv8l4i8kb95m1i3l0";
           system = "sndfile-blob";
           asd = "sndfile-blob";
@@ -95138,7 +95138,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snmp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz";
+          url = "https://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz";
           sha256 = "0qpy6jfp0v9i80gli1gf98sj0h67x9g5a8bqxrsxnqyi3h59di5s";
           system = "snmp";
           asd = "snmp";
@@ -95164,7 +95164,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snmp-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz";
+          url = "https://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz";
           sha256 = "0qpy6jfp0v9i80gli1gf98sj0h67x9g5a8bqxrsxnqyi3h59di5s";
           system = "snmp-server";
           asd = "snmp-server";
@@ -95187,7 +95187,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snmp-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz";
+          url = "https://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz";
           sha256 = "0qpy6jfp0v9i80gli1gf98sj0h67x9g5a8bqxrsxnqyi3h59di5s";
           system = "snmp-test";
           asd = "snmp-test";
@@ -95210,7 +95210,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snmp-ui" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz";
+          url = "https://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz";
           sha256 = "0qpy6jfp0v9i80gli1gf98sj0h67x9g5a8bqxrsxnqyi3h59di5s";
           system = "snmp-ui";
           asd = "snmp-ui";
@@ -95230,7 +95230,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snooze" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz";
           sha256 = "0gm9vxi7lcir80snka3qkl6sw8z90jaqf31c72bgyk9j8qkf7xvc";
           system = "snooze";
           asd = "snooze";
@@ -95257,7 +95257,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snooze-demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz";
           sha256 = "0gm9vxi7lcir80snka3qkl6sw8z90jaqf31c72bgyk9j8qkf7xvc";
           system = "snooze-demo";
           asd = "snooze";
@@ -95287,7 +95287,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "snooze-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz";
           sha256 = "0gm9vxi7lcir80snka3qkl6sw8z90jaqf31c72bgyk9j8qkf7xvc";
           system = "snooze-tests";
           asd = "snooze";
@@ -95310,7 +95310,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "softdrink" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/softdrink/2025-06-22/softdrink-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/softdrink/2025-06-22/softdrink-20250622-git.tgz";
           sha256 = "07d3nswpxzb3xskya4n7dmv9lgnag0jv88nab6c4ls7ik1v4b9id";
           system = "softdrink";
           asd = "softdrink";
@@ -95333,7 +95333,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "software-evolution-library" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sel/2025-06-22/sel-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sel/2025-06-22/sel-20250622-git.tgz";
           sha256 = "0y8kysbk3r9r3lyfa1dj8yf6nxzbjj2wilf9yfcl8b66yf87a1qs";
           system = "software-evolution-library";
           asd = "software-evolution-library";
@@ -95359,7 +95359,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "solid-engine" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/solid-engine/2019-05-21/solid-engine-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/solid-engine/2019-05-21/solid-engine-20190521-git.tgz";
           sha256 = "1pxrgxfqz8br258jy35qyimsrz544fg9k7lw2jshkj4jr2pswsv0";
           system = "solid-engine";
           asd = "solid-engine";
@@ -95379,7 +95379,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "soundex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/soundex/2010-10-06/soundex-1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/soundex/2010-10-06/soundex-1.0.tgz";
           sha256 = "00ar2x7ja35337v6gwa4h2b8w7gf7dwx5mdfz91dqay43kx1pjsi";
           system = "soundex";
           asd = "soundex";
@@ -95399,7 +95399,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "source-error" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
           sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "source-error";
           asd = "source-error";
@@ -95419,7 +95419,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "south" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/south/2023-10-21/south-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/south/2023-10-21/south-20231021-git.tgz";
           sha256 = "0acvi3nwddwphxm92i8bbv1nbb9zzx7gbcza5cr68rs8wydsr8h3";
           system = "south";
           asd = "south";
@@ -95444,7 +95444,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sparse-set" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sparse-set/2022-07-07/sparse-set-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sparse-set/2022-07-07/sparse-set-20220707-git.tgz";
           sha256 = "0czms03lrvg20hw3sz7wzzkl1z0vm0ndb3dmbvwsjd7m89fag793";
           system = "sparse-set";
           asd = "sparse-set";
@@ -95464,7 +95464,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "spatial-trees" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz";
+          url = "https://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz";
           sha256 = "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa";
           system = "spatial-trees";
           asd = "spatial-trees";
@@ -95484,7 +95484,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "spatial-trees.nns" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz";
+          url = "https://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz";
           sha256 = "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa";
           system = "spatial-trees.nns";
           asd = "spatial-trees.nns";
@@ -95509,7 +95509,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "spatial-trees.nns.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz";
+          url = "https://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz";
           sha256 = "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa";
           system = "spatial-trees.nns.test";
           asd = "spatial-trees.nns.test";
@@ -95536,7 +95536,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "spatial-trees.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz";
+          url = "https://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz";
           sha256 = "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa";
           system = "spatial-trees.test";
           asd = "spatial-trees.test";
@@ -95559,7 +95559,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "special-functions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/special-functions/2022-11-06/special-functions-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/special-functions/2022-11-06/special-functions-20221106-git.tgz";
           sha256 = "092szffy7zfxgrvfck11wnj8l0mgcym13yiafj01ad02lbj1fnnv";
           system = "special-functions";
           asd = "special-functions";
@@ -95584,7 +95584,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "specialization-store" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz";
+          url = "https://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz";
           sha256 = "03q0szyz8ygqmg10q4j97dy7gfr9icxay9s8bgs883yncbk42y6c";
           system = "specialization-store";
           asd = "specialization-store";
@@ -95608,7 +95608,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "specialization-store-features" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz";
+          url = "https://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz";
           sha256 = "03q0szyz8ygqmg10q4j97dy7gfr9icxay9s8bgs883yncbk42y6c";
           system = "specialization-store-features";
           asd = "specialization-store-features";
@@ -95631,7 +95631,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "specialization-store-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz";
+          url = "https://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz";
           sha256 = "03q0szyz8ygqmg10q4j97dy7gfr9icxay9s8bgs883yncbk42y6c";
           system = "specialization-store-tests";
           asd = "specialization-store-tests";
@@ -95654,7 +95654,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "specialized-function" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/specialized-function/2021-05-31/specialized-function-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/specialized-function/2021-05-31/specialized-function-20210531-git.tgz";
           sha256 = "19hfgc83b7as630r1w9r8yl0v6xq3dn01vcrl0bd4pza5hgjn4la";
           system = "specialized-function";
           asd = "specialized-function";
@@ -95681,7 +95681,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "specialized-function.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/specialized-function/2021-05-31/specialized-function-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/specialized-function/2021-05-31/specialized-function-20210531-git.tgz";
           sha256 = "19hfgc83b7as630r1w9r8yl0v6xq3dn01vcrl0bd4pza5hgjn4la";
           system = "specialized-function.test";
           asd = "specialized-function.test";
@@ -95704,7 +95704,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "speechless" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/speechless/2025-06-22/speechless-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/speechless/2025-06-22/speechless-20250622-git.tgz";
           sha256 = "1p9sgj0gaylzxv9vslvikzbj6vk2jm6rd6yklcslkfmyws6wyxhr";
           system = "speechless";
           asd = "speechless";
@@ -95727,7 +95727,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "spell" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/spell/2019-03-07/spell-20190307-git.tgz";
+          url = "https://beta.quicklisp.org/archive/spell/2019-03-07/spell-20190307-git.tgz";
           sha256 = "1ifhx5q0iz80i9zwgcpv3w7xpp92ar9grz25008wnqzaayhfl020";
           system = "spell";
           asd = "spell";
@@ -95747,7 +95747,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "spellcheck" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/spellcheck/2013-10-03/spellcheck-20131003-git.tgz";
+          url = "https://beta.quicklisp.org/archive/spellcheck/2013-10-03/spellcheck-20131003-git.tgz";
           sha256 = "0a0r1dgh7y06s7j9mzxrryri8fhajzjsrrsh3i6vv65vq5zzxlka";
           system = "spellcheck";
           asd = "spellcheck";
@@ -95770,7 +95770,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sphinx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sphinx/2011-06-19/cl-sphinx-20110619-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sphinx/2011-06-19/cl-sphinx-20110619-git.tgz";
           sha256 = "0z1ksxz1gh12ly6lbc77l0d5f380s81vx44qakm2dl1398lgb7x1";
           system = "sphinx";
           asd = "sphinx";
@@ -95795,7 +95795,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "spinneret" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/spinneret/2025-06-22/spinneret-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/spinneret/2025-06-22/spinneret-20250622-git.tgz";
           sha256 = "0bvs1055b91b0vdcagcbp3nqx064cjjf4vc8fdv4ym44yk1xzc79";
           system = "spinneret";
           asd = "spinneret";
@@ -95822,7 +95822,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "split-sequence" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/split-sequence/2021-05-31/split-sequence-v2.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/split-sequence/2021-05-31/split-sequence-v2.0.1.tgz";
           sha256 = "172k7iv775kwism6304p6z7mqpjvipl57nq1bgvmbk445943fmhq";
           system = "split-sequence";
           asd = "split-sequence";
@@ -95840,7 +95840,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sqlite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz";
           sha256 = "08iv7b4m0hh7qx2cvq4f510nrgdld0vicnvmqsh9w0fgrcgmyg4k";
           system = "sqlite";
           asd = "sqlite";
@@ -95861,7 +95861,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "srfi-1" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/srfi-1/2020-02-18/srfi-1-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/srfi-1/2020-02-18/srfi-1-20200218-git.tgz";
           sha256 = "00r2ikf1ck1zz3mx3jgk3plf3ibfhhrr8sc8hzr6ix34sbfvdadg";
           system = "srfi-1";
           asd = "srfi-1";
@@ -95881,7 +95881,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "srfi-1.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/srfi-1/2020-02-18/srfi-1-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/srfi-1/2020-02-18/srfi-1-20200218-git.tgz";
           sha256 = "00r2ikf1ck1zz3mx3jgk3plf3ibfhhrr8sc8hzr6ix34sbfvdadg";
           system = "srfi-1.test";
           asd = "srfi-1";
@@ -95904,7 +95904,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "srfi-23" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/srfi-23/2020-02-18/srfi-23-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/srfi-23/2020-02-18/srfi-23-20200218-git.tgz";
           sha256 = "0hgq2bdpdjp550kk9xlrxh82n45ldb42j2zzhkndmffh4rp9hd13";
           system = "srfi-23";
           asd = "srfi-23";
@@ -95924,7 +95924,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "srfi-6" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/srfi-6/2020-02-18/srfi-6-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/srfi-6/2020-02-18/srfi-6-20200218-git.tgz";
           sha256 = "1m9316r75haig84fhcrfm69gq0zfh5xqwqw8wsccc6z6vpz7pfwm";
           system = "srfi-6";
           asd = "srfi-6";
@@ -95944,7 +95944,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "srfi-98" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/srfi-98/2020-02-18/srfi-98-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/srfi-98/2020-02-18/srfi-98-20200218-git.tgz";
           sha256 = "0qqa7c6nas85n8mdpmk996jh12xm0nf63nhj1chi9qkwgm924fj3";
           system = "srfi-98";
           asd = "srfi-98";
@@ -95964,7 +95964,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "srfi-98.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/srfi-98/2020-02-18/srfi-98-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/srfi-98/2020-02-18/srfi-98-20200218-git.tgz";
           sha256 = "0qqa7c6nas85n8mdpmk996jh12xm0nf63nhj1chi9qkwgm924fj3";
           system = "srfi-98.test";
           asd = "srfi-98";
@@ -95987,7 +95987,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sse-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz";
           sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl";
           system = "sse-client";
           asd = "sse-client";
@@ -96007,7 +96007,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sse-client-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz";
           sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl";
           system = "sse-client-test";
           asd = "sse-client-test";
@@ -96031,7 +96031,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sse-demo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz";
           sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl";
           system = "sse-demo";
           asd = "sse-demo";
@@ -96056,7 +96056,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sse-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz";
           sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl";
           system = "sse-server";
           asd = "sse-server";
@@ -96079,7 +96079,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sse-server-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz";
           sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl";
           system = "sse-server-test";
           asd = "sse-server-test";
@@ -96103,7 +96103,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "st-json" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/st-json/2021-06-30/st-json-20210630-git.tgz";
+          url = "https://beta.quicklisp.org/archive/st-json/2021-06-30/st-json-20210630-git.tgz";
           sha256 = "06qrhr5iw73k96lai2x9w52l6gnmlxy7fsr0r35gz6nz1f71x7gx";
           system = "st-json";
           asd = "st-json";
@@ -96123,7 +96123,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "standard-cl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz";
           sha256 = "1qc8gzp7f4phgyi5whkxacrqzdqs0y1hvkf71m8n7l303jly9wjf";
           system = "standard-cl";
           asd = "standard-cl";
@@ -96143,7 +96143,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "staple" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
           sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik";
           system = "staple";
           asd = "staple";
@@ -96173,7 +96173,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "staple-code-parser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
           sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik";
           system = "staple-code-parser";
           asd = "staple-code-parser";
@@ -96202,7 +96202,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "staple-markdown" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
           sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik";
           system = "staple-markdown";
           asd = "staple-markdown";
@@ -96226,7 +96226,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "staple-markless" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
           sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik";
           system = "staple-markless";
           asd = "staple-markless";
@@ -96249,7 +96249,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "staple-package-recording" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
           sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik";
           system = "staple-package-recording";
           asd = "staple-package-recording";
@@ -96269,7 +96269,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "staple-restructured-text" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
           sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik";
           system = "staple-restructured-text";
           asd = "staple-restructured-text";
@@ -96292,7 +96292,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "staple-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/staple/2025-06-22/staple-20250622-git.tgz";
           sha256 = "0pjrjvkn54wrncf44fnang6mkfll6bdgfs0iiawi7xq5rb2ln7ik";
           system = "staple-server";
           asd = "staple-server";
@@ -96318,7 +96318,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stars" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sprint-stars/2018-08-31/sprint-stars-20180831-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sprint-stars/2018-08-31/sprint-stars-20180831-git.tgz";
           sha256 = "1pm6wvywfgy0vlb0b2lbybpvhw9xzyn1nlpy0wpcglxxig6mnrgi";
           system = "stars";
           asd = "stars";
@@ -96342,7 +96342,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stateless-iterators" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stateless-iterators/2025-06-22/stateless-iterators-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stateless-iterators/2025-06-22/stateless-iterators-20250622-git.tgz";
           sha256 = "1d2jpvns52jfmyizhdkf02ng0qhg5jl3ngnrj9vw3zlqlrd19440";
           system = "stateless-iterators";
           asd = "stateless-iterators";
@@ -96365,7 +96365,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "static-dispatch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/static-dispatch/2021-12-09/static-dispatch-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/static-dispatch/2021-12-09/static-dispatch-20211209-git.tgz";
           sha256 = "1cishp7nckda5hav6c907axdfn1zpmzxpsy6hk7kkb69qn81yn2i";
           system = "static-dispatch";
           asd = "static-dispatch";
@@ -96393,7 +96393,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "static-vectors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/static-vectors/2024-10-12/static-vectors-v1.9.3.tgz";
+          url = "https://beta.quicklisp.org/archive/static-vectors/2024-10-12/static-vectors-v1.9.3.tgz";
           sha256 = "1sn37hyf6x56irn2qqc51ncqswa3n94j6cxwcj2ixgxmszcyzx5h";
           system = "static-vectors";
           asd = "static-vectors";
@@ -96414,7 +96414,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "statistics" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/statistics/2024-10-12/statistics-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/statistics/2024-10-12/statistics-20241012-git.tgz";
           sha256 = "00dir3sif9jqc0b48vsk8r41h4zmf95jj4nqrc45mbnr80pmdrsl";
           system = "statistics";
           asd = "statistics";
@@ -96441,7 +96441,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "statusor" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/statusor/2023-06-18/statusor-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/statusor/2023-06-18/statusor-20230618-git.tgz";
           sha256 = "1mxj4q7grvma6q05vj6sw4h4f2s121mnd77271lwnp74kjwh17cq";
           system = "statusor";
           asd = "statusor";
@@ -96461,7 +96461,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stdutils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-stdutils/2011-10-01/cl-stdutils-20111001-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-stdutils/2011-10-01/cl-stdutils-20111001-git.tgz";
           sha256 = "16vxxphqdq8264x0aanm36x9r6d3ci1gjf4vf46mwl59gcff4wcj";
           system = "stdutils";
           asd = "stdutils";
@@ -96484,7 +96484,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stealth-mixin" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stealth-mixin/2021-10-20/stealth-mixin-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stealth-mixin/2021-10-20/stealth-mixin-20211020-git.tgz";
           sha256 = "0ar9cdmbmdnqz1ywpw34n47hlh0vqmb6pl76f5vbfgip3c81xwyi";
           system = "stealth-mixin";
           asd = "stealth-mixin";
@@ -96504,7 +96504,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stefil" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz";
           sha256 = "0bqz64q2szzhf91zyqyssmvrz7da6442rs01808pf3wrdq28bclh";
           system = "stefil";
           asd = "stefil";
@@ -96527,7 +96527,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stefil+" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stefil-/2021-12-09/stefil--20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stefil-/2021-12-09/stefil--20211209-git.tgz";
           sha256 = "039jjhcb3ka6vag39hz5v1bi81x444rqj6rb3np5qbm07dh1aij0";
           system = "stefil+";
           asd = "stefil+";
@@ -96552,7 +96552,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stefil-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz";
           sha256 = "0bqz64q2szzhf91zyqyssmvrz7da6442rs01808pf3wrdq28bclh";
           system = "stefil-test";
           asd = "stefil";
@@ -96572,7 +96572,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stem" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stem/2015-06-08/stem-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stem/2015-06-08/stem-20150608-git.tgz";
           sha256 = "0a2kr09c3qcwg16n8rm15qgy5p9l6z4m72jray0846hqbnji77mp";
           system = "stem";
           asd = "stem";
@@ -96592,7 +96592,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stepster" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stepster/2025-06-22/stepster-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stepster/2025-06-22/stepster-20250622-git.tgz";
           sha256 = "003knr53b298s9l5y73il579cnjf90c6zkdh15ddnj4cfq8bfckl";
           system = "stepster";
           asd = "stepster";
@@ -96620,7 +96620,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stl/2017-10-19/stl-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stl/2017-10-19/stl-20171019-git.tgz";
           sha256 = "12v11bsarlnx5k930gx116wbgv41kwm45ysdikq3am4x3lqsjz2n";
           system = "stl";
           asd = "stl";
@@ -96640,7 +96640,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stmx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stmx/2024-10-12/stmx-stable-95f7dea8-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stmx/2024-10-12/stmx-stable-95f7dea8-git.tgz";
           sha256 = "1qq25y79casaa56a76gj9hk2f3hjcc5z3f4na4vy3sw99km54hn9";
           system = "stmx";
           asd = "stmx";
@@ -96666,7 +96666,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stmx.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stmx/2024-10-12/stmx-stable-95f7dea8-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stmx/2024-10-12/stmx-stable-95f7dea8-git.tgz";
           sha256 = "1qq25y79casaa56a76gj9hk2f3hjcc5z3f4na4vy3sw99km54hn9";
           system = "stmx.test";
           asd = "stmx.test";
@@ -96691,7 +96691,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stopclock" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stopclock/2023-10-21/stopclock-v1.0.2.tgz";
+          url = "https://beta.quicklisp.org/archive/stopclock/2023-10-21/stopclock-v1.0.2.tgz";
           sha256 = "1p5lygznfasad1sw8whd2bg9bwi3z7nbncr3samd55nsi5yr3hfd";
           system = "stopclock";
           asd = "stopclock";
@@ -96711,7 +96711,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "str" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-str/2025-06-22/cl-str-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-str/2025-06-22/cl-str-20250622-git.tgz";
           sha256 = "04hjv5cbflpsbhiic5ygld3kvzh775vprmn9n0i6q3w4xi2x56g2";
           system = "str";
           asd = "str";
@@ -96733,7 +96733,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "str.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-str/2025-06-22/cl-str-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-str/2025-06-22/cl-str-20250622-git.tgz";
           sha256 = "04hjv5cbflpsbhiic5ygld3kvzh775vprmn9n0i6q3w4xi2x56g2";
           system = "str.test";
           asd = "str.test";
@@ -96756,7 +96756,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "strict-function" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/strict-function/2021-10-20/strict-function-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/strict-function/2021-10-20/strict-function-20211020-git.tgz";
           sha256 = "176l5024qa72my7wiag0w6mmwys1q4yk6b4n944378qbqr2zpq2a";
           system = "strict-function";
           asd = "strict-function";
@@ -96779,7 +96779,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "string-case" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz";
           sha256 = "1n5i3yh0h5s636rcnwn7jwqy3rjflikra04lymimhpcshhjsk0md";
           system = "string-case";
           asd = "string-case";
@@ -96797,7 +96797,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "string-escape" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/string-escape/2015-04-07/string-escape-20150407-http.tgz";
+          url = "https://beta.quicklisp.org/archive/string-escape/2015-04-07/string-escape-20150407-http.tgz";
           sha256 = "0r7b699332hy3qj17jax9jdhq4jx6rbw5xf0j43bwg79wddk0rq3";
           system = "string-escape";
           asd = "string-escape";
@@ -96817,7 +96817,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stripe" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stripe/2024-10-12/stripe-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stripe/2024-10-12/stripe-20241012-git.tgz";
           sha256 = "1ng1381pg0mj1ba0ndxvhaqmm0w64v0gq0qsxbfm9kr6hq46gsf9";
           system = "stripe";
           asd = "stripe";
@@ -96842,7 +96842,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stripe-against-the-modern-world" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stripe-against-the-modern-world/2022-11-06/stripe-against-the-modern-world-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stripe-against-the-modern-world/2022-11-06/stripe-against-the-modern-world-20221106-git.tgz";
           sha256 = "1qp714y7b7vfdafirlphk02gixa4jffs0xgcy96fncxs6r2zq3q9";
           system = "stripe-against-the-modern-world";
           asd = "stripe-against-the-modern-world";
@@ -96872,7 +96872,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "structure-ext" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz";
           sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq";
           system = "structure-ext";
           asd = "structure-ext";
@@ -96896,7 +96896,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "structure-ext.as-class" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz";
           sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq";
           system = "structure-ext.as-class";
           asd = "structure-ext.as-class";
@@ -96920,7 +96920,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "structure-ext.as-class.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz";
           sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq";
           system = "structure-ext.as-class.test";
           asd = "structure-ext.as-class.test";
@@ -96943,7 +96943,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "structure-ext.left-arrow-accessors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz";
           sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq";
           system = "structure-ext.left-arrow-accessors";
           asd = "structure-ext.left-arrow-accessors";
@@ -96963,7 +96963,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "structure-ext.left-arrow-accessors.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz";
           sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq";
           system = "structure-ext.left-arrow-accessors.test";
           asd = "structure-ext.left-arrow-accessors.test";
@@ -96986,7 +96986,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "structure-ext.make-instance" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz";
           sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq";
           system = "structure-ext.make-instance";
           asd = "structure-ext.make-instance";
@@ -97009,7 +97009,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "structure-ext.make-instance.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz";
           sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq";
           system = "structure-ext.make-instance.test";
           asd = "structure-ext.make-instance.test";
@@ -97032,7 +97032,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "structy-defclass" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/structy-defclass/2017-06-30/structy-defclass-20170630-git.tgz";
+          url = "https://beta.quicklisp.org/archive/structy-defclass/2017-06-30/structy-defclass-20170630-git.tgz";
           sha256 = "0fdlj45xzyghmg65dvs7ww7dxji84iid2y6rh9j77aip7v0l5q63";
           system = "structy-defclass";
           asd = "structy-defclass";
@@ -97052,7 +97052,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "studio-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/studio-client/2023-10-21/studio-client-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/studio-client/2023-10-21/studio-client-20231021-git.tgz";
           sha256 = "0wxakd5jd0y6h2ii4690qav7zna6iyamdyksw5zjyz4xmsg4by2l";
           system = "studio-client";
           asd = "studio-client";
@@ -97077,7 +97077,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stumpwm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stumpwm/2025-06-22/stumpwm-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stumpwm/2025-06-22/stumpwm-20250622-git.tgz";
           sha256 = "1l4rxcva947ijxsfnzyy35ql7a8pjsxaag51pq2bib3qfy7wg5ld";
           system = "stumpwm";
           asd = "stumpwm";
@@ -97100,7 +97100,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stumpwm-dynamic-float" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stumpwm-dynamic-float/2025-06-22/stumpwm-dynamic-float-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stumpwm-dynamic-float/2025-06-22/stumpwm-dynamic-float-20250622-git.tgz";
           sha256 = "13m9864vfj4b5b0hlvp7jrb96368rxr5ydjsdqldky10yad7icxf";
           system = "stumpwm-dynamic-float";
           asd = "stumpwm-dynamic-float";
@@ -97120,7 +97120,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "stumpwm-sndioctl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/stumpwm-sndioctl/2025-06-22/stumpwm-sndioctl-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/stumpwm-sndioctl/2025-06-22/stumpwm-sndioctl-20250622-git.tgz";
           sha256 = "1q4w4grim7izvw01k95wh7bbaaq0hz2ljjhn47nyd7pzrk9dabpv";
           system = "stumpwm-sndioctl";
           asd = "stumpwm-sndioctl";
@@ -97140,7 +97140,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sucle" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "sucle";
           asd = "sucle";
@@ -97182,7 +97182,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sucle-multiprocessing" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "sucle-multiprocessing";
           asd = "sucle-multiprocessing";
@@ -97208,7 +97208,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sucle-serialize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "sucle-serialize";
           asd = "sucle-serialize";
@@ -97232,7 +97232,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sucle-temp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "sucle-temp";
           asd = "sucle-temp";
@@ -97252,7 +97252,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sucle-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "sucle-test";
           asd = "sucle-test";
@@ -97293,7 +97293,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "surf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "surf";
           asd = "surf";
@@ -97313,7 +97313,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "swank" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/slime/2025-06-22/slime-v2.31.tgz";
+          url = "https://beta.quicklisp.org/archive/slime/2025-06-22/slime-v2.31.tgz";
           sha256 = "0rqjw2c5hzmrmvbf37l6fdx6pria6d360nvqka47qc74s4pw1hyi";
           system = "swank";
           asd = "swank";
@@ -97331,7 +97331,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "swank-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/swank-client/2023-06-18/swank-client-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/swank-client/2023-06-18/swank-client-20230618-git.tgz";
           sha256 = "0sd0xblaxj8zi03acmfq4pwv84jcl04fvyp1jqlb7d6iq0mbxvan";
           system = "swank-client";
           asd = "swank-client";
@@ -97356,7 +97356,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "swank-crew" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/swank-crew/2024-10-12/swank-crew-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/swank-crew/2024-10-12/swank-crew-20241012-git.tgz";
           sha256 = "0v0gg9d74x28xw3n12nrvkdnnvz0m972l4rymfansfaawiqm7ssz";
           system = "swank-crew";
           asd = "swank-crew";
@@ -97380,7 +97380,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "swank-protocol" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/swank-protocol/2024-10-12/swank-protocol-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/swank-protocol/2024-10-12/swank-protocol-20241012-git.tgz";
           sha256 = "0vqcdxp228fk3snay90ml33r1y03l5k05snq633f95his8ffxknl";
           system = "swank-protocol";
           asd = "swank-protocol";
@@ -97403,7 +97403,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "swank.live" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/swank.live/2016-02-08/swank.live-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/swank.live/2016-02-08/swank.live-20160208-git.tgz";
           sha256 = "0p7jyf07symfan6lmbhd3r42kf5vrsbmmh9li0n1kky8rd6fhgls";
           system = "swank.live";
           asd = "swank.live";
@@ -97423,7 +97423,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "swap-bytes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz";
+          url = "https://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz";
           sha256 = "1hw1v1lw26rifyznpnj1csphha9jgzwpiic16ni3pvs6hcsni9rz";
           system = "swap-bytes";
           asd = "swap-bytes";
@@ -97441,7 +97441,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sxql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sxql/2025-06-22/sxql-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sxql/2025-06-22/sxql-20250622-git.tgz";
           sha256 = "0lm6f35h5cg0a1rrpfkfgifp1i2ws0vy3w98kngv886jj9r6jjdn";
           system = "sxql";
           asd = "sxql";
@@ -97470,7 +97470,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sxql-composer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sxql-composer/2020-03-25/sxql-composer-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sxql-composer/2020-03-25/sxql-composer-20200325-git.tgz";
           sha256 = "1agkrj3ymskzc3c7pxbrj123d1kygjqcls145m0ap3i07q96hh1r";
           system = "sxql-composer";
           asd = "sxql-composer";
@@ -97490,7 +97490,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sxql-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sxql/2025-06-22/sxql-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sxql/2025-06-22/sxql-20250622-git.tgz";
           sha256 = "0lm6f35h5cg0a1rrpfkfgifp1i2ws0vy3w98kngv886jj9r6jjdn";
           system = "sxql-test";
           asd = "sxql-test";
@@ -97514,7 +97514,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sycamore" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sycamore/2021-10-20/sycamore-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sycamore/2021-10-20/sycamore-20211020-git.tgz";
           sha256 = "0icw7fba1ch51w24f4sinvy4xg3zc7zif0aqcjfrzxj14x108hai";
           system = "sycamore";
           asd = "sycamore";
@@ -97537,7 +97537,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "symath" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/symath/2025-06-22/symath-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/symath/2025-06-22/symath-20250622-git.tgz";
           sha256 = "01603s8cbifwy7x6jqmxff232pyq99nzjlxn2sjbzx11hwf8092l";
           system = "symath";
           asd = "symath";
@@ -97557,7 +97557,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "symbol-munger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/symbol-munger/2022-02-20/symbol-munger-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/symbol-munger/2022-02-20/symbol-munger-20220220-git.tgz";
           sha256 = "16fshnxp9212503z1vjlmx5pafv14bzpihn486x1ljakqjigfnfz";
           system = "symbol-munger";
           asd = "symbol-munger";
@@ -97578,7 +97578,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "symbol-namespaces" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/symbol-namespaces/2013-01-28/symbol-namespaces-1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/symbol-namespaces/2013-01-28/symbol-namespaces-1.0.tgz";
           sha256 = "0rw4ndhg669rkpjmv5n0zh69bzar60zn3bb4vs5ijgvxyl5f7xp1";
           system = "symbol-namespaces";
           asd = "symbol-namespaces";
@@ -97598,7 +97598,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "synonyms" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/synonyms/2023-06-18/synonyms-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/synonyms/2023-06-18/synonyms-20230618-git.tgz";
           sha256 = "1373m0h765r60lif0jz3frqbq7phrm2jhc30b5dh51spd7732v3x";
           system = "synonyms";
           asd = "synonyms";
@@ -97618,7 +97618,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "sysexits" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-sysexits/2022-07-07/cl-sysexits-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-sysexits/2022-07-07/cl-sysexits-20220707-git.tgz";
           sha256 = "1khkj0qqvmgylnvl32sks8v3iabasbcr9sj9zl89xh3rajc67z73";
           system = "sysexits";
           asd = "sysexits";
@@ -97638,7 +97638,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "system-locale" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/system-locale/2025-06-22/system-locale-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/system-locale/2025-06-22/system-locale-20250622-git.tgz";
           sha256 = "1v794i2f652c1qplbb8igr4dl98xxz7ha9c5ckzql50ykdw871jy";
           system = "system-locale";
           asd = "system-locale";
@@ -97658,7 +97658,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "t-clack-handler-hunchentoot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
           sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "t-clack-handler-hunchentoot";
           asd = "t-clack-handler-hunchentoot";
@@ -97681,7 +97681,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "t-clack-handler-toot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
           sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "t-clack-handler-toot";
           asd = "t-clack-handler-toot";
@@ -97704,7 +97704,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "t-clack-handler-wookie" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clack/2025-06-22/clack-20250622-git.tgz";
           sha256 = "1b6b1cna3r0gi6lq3jphy08012p700ngwas5rqkhlk61791yd944";
           system = "t-clack-handler-wookie";
           asd = "t-clack-handler-wookie";
@@ -97724,7 +97724,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ta2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "ta2";
           asd = "ta2";
@@ -97744,7 +97744,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tagger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tagger/2020-07-15/tagger-20200715-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tagger/2020-07-15/tagger-20200715-git.tgz";
           sha256 = "1mxkr5hx8p4rxc7vajgrpl49zh018wyspvww5fg50164if0n7j2q";
           system = "tagger";
           asd = "tagger";
@@ -97764,7 +97764,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "taglib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/taglib/2024-10-12/taglib-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/taglib/2024-10-12/taglib-20241012-git.tgz";
           sha256 = "1jhi38g2ngmbsv71chxyavgf4fzb64nr7z648ia01qxii0435csb";
           system = "taglib";
           asd = "taglib";
@@ -97789,7 +97789,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "taglib-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/taglib/2024-10-12/taglib-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/taglib/2024-10-12/taglib-20241012-git.tgz";
           sha256 = "1jhi38g2ngmbsv71chxyavgf4fzb64nr7z648ia01qxii0435csb";
           system = "taglib-tests";
           asd = "taglib-tests";
@@ -97813,7 +97813,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tailrec" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tailrec/2021-08-07/tailrec-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tailrec/2021-08-07/tailrec-20210807-git.tgz";
           sha256 = "1h8m2npdzd2cpnl75pvv4yvvfwxa7kl6qvalc9s0y4yws0kaih3i";
           system = "tailrec";
           asd = "tailrec";
@@ -97837,7 +97837,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "talcl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz";
           sha256 = "18pm3vz82dwcckhp4lkwjv8431hkdj3ghxb4v5qdjsyw2jm56v1p";
           system = "talcl";
           asd = "talcl";
@@ -97864,7 +97864,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "talcl-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz";
           sha256 = "18pm3vz82dwcckhp4lkwjv8431hkdj3ghxb4v5qdjsyw2jm56v1p";
           system = "talcl-examples";
           asd = "talcl";
@@ -97887,7 +97887,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "talcl-speed-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz";
           sha256 = "18pm3vz82dwcckhp4lkwjv8431hkdj3ghxb4v5qdjsyw2jm56v1p";
           system = "talcl-speed-tests";
           asd = "talcl";
@@ -97912,7 +97912,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "talcl-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz";
           sha256 = "18pm3vz82dwcckhp4lkwjv8431hkdj3ghxb4v5qdjsyw2jm56v1p";
           system = "talcl-test";
           asd = "talcl";
@@ -97936,7 +97936,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tap-unit-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tap-unit-test/2017-12-27/tap-unit-test-20171227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tap-unit-test/2017-12-27/tap-unit-test-20171227-git.tgz";
           sha256 = "1fzsnpng7y4sghasl29sjicbs4v6m5mgfj8wf2izhhcn1hbhr694";
           system = "tap-unit-test";
           asd = "tap-unit-test";
@@ -97956,7 +97956,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tar" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tar/2023-06-18/cl-tar-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tar/2023-06-18/cl-tar-20230618-git.tgz";
           sha256 = "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf";
           system = "tar";
           asd = "tar";
@@ -97983,7 +97983,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tar-file" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tar-file/2022-02-20/cl-tar-file-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tar-file/2022-02-20/cl-tar-file-20220220-git.tgz";
           sha256 = "0i8j05fkgdqy4c4pqj0c68sh4s3klpx9kc5wp73qwzrl3xqd2svy";
           system = "tar-file";
           asd = "tar-file";
@@ -98011,7 +98011,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "targa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/targa/2018-10-18/targa-20181018-git.tgz";
+          url = "https://beta.quicklisp.org/archive/targa/2018-10-18/targa-20181018-git.tgz";
           sha256 = "0fslb2alp4pfmp8md2q89xh8n43r8awwf343wfvkywwqdnls2zws";
           system = "targa";
           asd = "targa";
@@ -98031,7 +98031,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tasty" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "tasty";
           asd = "tasty";
@@ -98054,7 +98054,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tcod" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-tcod/2025-06-22/cl-tcod-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-tcod/2025-06-22/cl-tcod-20250622-git.tgz";
           sha256 = "1m3fgfc7nfk8yn4z1c09lixnk0sr3szxqihq3fx4j6is430ywxdd";
           system = "tcod";
           asd = "tcod";
@@ -98078,7 +98078,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "teddy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/teddy/2024-10-12/teddy-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/teddy/2024-10-12/teddy-20241012-git.tgz";
           sha256 = "0qg83khyny5pw9lk3ysid32wl1wds43ja35qx72mxpli3nhj7nhq";
           system = "teddy";
           asd = "teddy";
@@ -98108,7 +98108,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "teepeedee2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/teepeedee2/2023-02-14/teepeedee2-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/teepeedee2/2023-02-14/teepeedee2-20230214-git.tgz";
           sha256 = "16mfc1hcjdjcj1iiihdn9a725xry8hpvxijf5ic6yi4ydcv84pni";
           system = "teepeedee2";
           asd = "teepeedee2";
@@ -98138,7 +98138,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "teepeedee2-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/teepeedee2/2023-02-14/teepeedee2-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/teepeedee2/2023-02-14/teepeedee2-20230214-git.tgz";
           sha256 = "16mfc1hcjdjcj1iiihdn9a725xry8hpvxijf5ic6yi4ydcv84pni";
           system = "teepeedee2-test";
           asd = "teepeedee2-test";
@@ -98161,7 +98161,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "telnetlib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/telnetlib/2014-12-17/telnetlib-20141217-git.tgz";
+          url = "https://beta.quicklisp.org/archive/telnetlib/2014-12-17/telnetlib-20141217-git.tgz";
           sha256 = "1gdf6i352qkmp27nqbv6qfi7sqn5wjzdaffh6ls1y5jznqh3nb0h";
           system = "telnetlib";
           asd = "telnetlib";
@@ -98181,7 +98181,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "template" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/template/2023-06-18/template-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/template/2023-06-18/template-20230618-git.tgz";
           sha256 = "1ccnjawxwjqk8gavqga7waqrxv0pmncbycyfwylyly7a1c7zjadr";
           system = "template";
           asd = "template";
@@ -98204,7 +98204,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "template-function" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/template-function/2017-11-30/template-function-v0.0.1-git.tgz";
+          url = "https://beta.quicklisp.org/archive/template-function/2017-11-30/template-function-v0.0.1-git.tgz";
           sha256 = "1nq782cdi9vr3hgqqyzvvng2sbyc09biggwq4zp7k1vmqnm6qdaf";
           system = "template-function";
           asd = "template-function";
@@ -98228,7 +98228,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "template-function-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/template-function/2017-11-30/template-function-v0.0.1-git.tgz";
+          url = "https://beta.quicklisp.org/archive/template-function/2017-11-30/template-function-v0.0.1-git.tgz";
           sha256 = "1nq782cdi9vr3hgqqyzvvng2sbyc09biggwq4zp7k1vmqnm6qdaf";
           system = "template-function-tests";
           asd = "template-function-tests";
@@ -98251,7 +98251,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "temporal-functions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/temporal-functions/2017-10-19/temporal-functions-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/temporal-functions/2017-10-19/temporal-functions-20171019-git.tgz";
           sha256 = "03cbgw949g68n72nqp0nmjq9nx0kfz5zs6kpk0pwchy3i8bwf22j";
           system = "temporal-functions";
           asd = "temporal-functions";
@@ -98271,7 +98271,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "temporary-file" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/temporary-file/2015-06-08/temporary-file-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/temporary-file/2015-06-08/temporary-file-20150608-git.tgz";
           sha256 = "0m38lncj6bmj7gwq8vp7l0gwzmk7pfasl4samzgl2fah8hzb064a";
           system = "temporary-file";
           asd = "temporary-file";
@@ -98297,7 +98297,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ten" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz";
           sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk";
           system = "ten";
           asd = "ten";
@@ -98322,7 +98322,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ten.examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz";
           sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk";
           system = "ten.examples";
           asd = "ten.examples";
@@ -98342,7 +98342,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ten.i18n.cl-locale" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz";
           sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk";
           system = "ten.i18n.cl-locale";
           asd = "ten.i18n.cl-locale";
@@ -98365,7 +98365,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ten.i18n.gettext" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz";
           sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk";
           system = "ten.i18n.gettext";
           asd = "ten.i18n.gettext";
@@ -98388,7 +98388,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ten.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz";
           sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk";
           system = "ten.tests";
           asd = "ten.tests";
@@ -98412,7 +98412,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "terminfo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/terminfo/2021-01-24/terminfo-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/terminfo/2021-01-24/terminfo-20210124-git.tgz";
           sha256 = "1nmin9rr6f75xdhxysba66xa1dh62fh27w9ad1cvmj0062armf6b";
           system = "terminfo";
           asd = "terminfo";
@@ -98432,7 +98432,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "termp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/termp/2025-06-22/termp-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/termp/2025-06-22/termp-20250622-git.tgz";
           sha256 = "03r5cv01q4yg0a2dv2ckn2xys53y9isrq3hkp0dqa96q8wrindlh";
           system = "termp";
           asd = "termp";
@@ -98452,7 +98452,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "terrable" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/terrable/2023-10-21/terrable-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/terrable/2023-10-21/terrable-20231021-git.tgz";
           sha256 = "03fjfdffr5lf12llqbf3d07dd87ykfyw525dxnwm6gpyvg49wlgl";
           system = "terrable";
           asd = "terrable";
@@ -98478,7 +98478,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tesseract-capi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tesseract-capi/2020-12-20/tesseract-capi-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tesseract-capi/2020-12-20/tesseract-capi-20201220-git.tgz";
           sha256 = "1g8afgzbvfk80gi05nbwp9cmmrsqm5knhqi04v1cx556vrbp6ks1";
           system = "tesseract-capi";
           asd = "tesseract-capi";
@@ -98501,7 +98501,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "test-40ants-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/40ants-asdf-system/2025-06-22/40ants-asdf-system-20250622-git.tgz";
           sha256 = "151zfyz7c4xrd4mnyzd5nsla1p70q4iixgm9mlnbm799mr1aprwp";
           system = "test-40ants-system";
           asd = "test-40ants-system";
@@ -98521,7 +98521,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "test-gadgets" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gadgets/2025-06-22/gadgets-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gadgets/2025-06-22/gadgets-20250622-git.tgz";
           sha256 = "0dbia2679dj4kr2ndh15ib26l9kw6zxx0qjn4l0jkcdx7shrkll6";
           system = "test-gadgets";
           asd = "test-gadgets";
@@ -98544,7 +98544,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "test-paren6" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/paren6/2025-06-22/paren6-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/paren6/2025-06-22/paren6-20250622-git.tgz";
           sha256 = "1ib57mfq82c62nd0ikic6mjbivwv7x7g5fgjblq7jssms6s7h9wm";
           system = "test-paren6";
           asd = "test-paren6";
@@ -98568,7 +98568,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "test-serial-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/asdf-dependency-grovel/2017-04-03/asdf-dependency-grovel-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/asdf-dependency-grovel/2017-04-03/asdf-dependency-grovel-20170403-git.tgz";
           sha256 = "1y4kdqsda4ira4r9dws6kxzzv6mg45q3lkmb2c9mg9q7ksc5glif";
           system = "test-serial-system";
           asd = "test-serial-system";
@@ -98588,7 +98588,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "test-utils" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/test-utils/2020-06-10/test-utils-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/test-utils/2020-06-10/test-utils-20200610-git.tgz";
           sha256 = "036a8wvs37lnsf9dy3c810qk54963v7hnxx0zas25b50ikcmiqm5";
           system = "test-utils";
           asd = "test-utils";
@@ -98613,7 +98613,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "test.eager-future2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz";
           sha256 = "1qs1bv3m0ki8l5czhsflxcryh22r9d9g9a3a3b0cr0pl954q5rld";
           system = "test.eager-future2";
           asd = "test.eager-future2";
@@ -98636,7 +98636,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "test.vas-string-metrics" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vas-string-metrics/2021-12-09/vas-string-metrics-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vas-string-metrics/2021-12-09/vas-string-metrics-20211209-git.tgz";
           sha256 = "1yvkwc939dckv070nlgqfj5ys9ii2rm32m5wfx7qxdjrb4n19sx9";
           system = "test.vas-string-metrics";
           asd = "test.vas-string-metrics";
@@ -98656,7 +98656,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "testbild" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/testbild/2010-12-07/testbild-20101207-git.tgz";
+          url = "https://beta.quicklisp.org/archive/testbild/2010-12-07/testbild-20101207-git.tgz";
           sha256 = "024b6rlgljcjazwg302zkdmkpxs2hirjg7g39ypppz81ns2v65sw";
           system = "testbild";
           asd = "testbild";
@@ -98679,7 +98679,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "testbild-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/testbild/2010-12-07/testbild-20101207-git.tgz";
+          url = "https://beta.quicklisp.org/archive/testbild/2010-12-07/testbild-20101207-git.tgz";
           sha256 = "024b6rlgljcjazwg302zkdmkpxs2hirjg7g39ypppz81ns2v65sw";
           system = "testbild-test";
           asd = "testbild-test";
@@ -98704,7 +98704,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "testiere" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/testiere/2025-06-22/testiere-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/testiere/2025-06-22/testiere-20250622-git.tgz";
           sha256 = "0jn07812abpmlb4rig2v4ckgv5afx7jl03fvi06jn2890i527058";
           system = "testiere";
           asd = "testiere";
@@ -98724,7 +98724,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "testiere-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/testiere/2025-06-22/testiere-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/testiere/2025-06-22/testiere-20250622-git.tgz";
           sha256 = "0jn07812abpmlb4rig2v4ckgv5afx7jl03fvi06jn2890i527058";
           system = "testiere-examples";
           asd = "testiere-examples";
@@ -98744,7 +98744,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "texp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/texp/2015-12-18/texp-20151218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/texp/2015-12-18/texp-20151218-git.tgz";
           sha256 = "1sbll7jwmzd86hg0zva8r7db2565nnliasv2x6rkrm9xl97q0kg5";
           system = "texp";
           asd = "texp";
@@ -98764,7 +98764,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "text-draw" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/text-draw/2025-06-22/text-draw-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/text-draw/2025-06-22/text-draw-20250622-git.tgz";
           sha256 = "0iw4bx8ipa2y3in8j6d3gjzm26ppxgl93fmphn5574l0lfr0x5ng";
           system = "text-draw";
           asd = "text-draw";
@@ -98784,7 +98784,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "text-query" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/text-query/2011-11-05/text-query-1.1.tgz";
+          url = "https://beta.quicklisp.org/archive/text-query/2011-11-05/text-query-1.1.tgz";
           sha256 = "082xqpfchmg2752m1lw78q6c0z3walzsmqk8gl6qnj6bdwbhf4dm";
           system = "text-query";
           asd = "text-query";
@@ -98804,7 +98804,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "text-subsystem" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "text-subsystem";
           asd = "text-subsystem";
@@ -98832,7 +98832,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "text-subsystem-generate-font" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "text-subsystem-generate-font";
           asd = "text-subsystem-generate-font";
@@ -98856,7 +98856,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "textery" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/textery/2020-12-20/textery-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/textery/2020-12-20/textery-20201220-git.tgz";
           sha256 = "0v8zk1s18fi462qwvjbci8nikgs5wqjpl97ckfk0spvhybrdgwcc";
           system = "textery";
           asd = "textery";
@@ -98880,7 +98880,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "the-cost-of-nothing" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/the-cost-of-nothing/2019-11-30/the-cost-of-nothing-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/the-cost-of-nothing/2019-11-30/the-cost-of-nothing-20191130-git.tgz";
           sha256 = "1ccrglyr1wnnfp218w1qj7yfl4yzlxkki3hqaifi5axgbi5dmmh8";
           system = "the-cost-of-nothing";
           asd = "the-cost-of-nothing";
@@ -98905,7 +98905,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "thih-coalton" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/coalton/2025-06-22/coalton-20250622-git.tgz";
           sha256 = "0g6gfp3y9smzssi3dbddwxvx7g4hq6wz98h253gs4i15pd2pf3qp";
           system = "thih-coalton";
           asd = "thih-coalton";
@@ -98925,7 +98925,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "thorn" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz";
           sha256 = "1d4w5358yxgccna91pxz9526w932j5ig17gp19zysjxvca57hqy7";
           system = "thorn";
           asd = "thorn";
@@ -98945,7 +98945,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "thorn-doc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz";
           sha256 = "1d4w5358yxgccna91pxz9526w932j5ig17gp19zysjxvca57hqy7";
           system = "thorn-doc";
           asd = "thorn-doc";
@@ -98965,7 +98965,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "thorn-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz";
           sha256 = "1d4w5358yxgccna91pxz9526w932j5ig17gp19zysjxvca57hqy7";
           system = "thorn-test";
           asd = "thorn-test";
@@ -98989,7 +98989,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "thread-pool" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/thread-pool/2012-01-07/thread-pool-20120107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/thread-pool/2012-01-07/thread-pool-20120107-git.tgz";
           sha256 = "0wi9l0m660332w9pnc3w08m5hlsry9s0cgc3rznb5kyap68iv847";
           system = "thread-pool";
           asd = "thread-pool";
@@ -99012,7 +99012,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "thread.comm.rendezvous" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/thread.comm.rendezvous/2012-10-13/thread.comm.rendezvous-20121013-git.tgz";
+          url = "https://beta.quicklisp.org/archive/thread.comm.rendezvous/2012-10-13/thread.comm.rendezvous-20121013-git.tgz";
           sha256 = "16crdy09zm20iclgln1vj0psd8ifz4rqb6g9255p0d2rkjk2rgfx";
           system = "thread.comm.rendezvous";
           asd = "thread.comm.rendezvous";
@@ -99035,7 +99035,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "thread.comm.rendezvous.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/thread.comm.rendezvous/2012-10-13/thread.comm.rendezvous-20121013-git.tgz";
+          url = "https://beta.quicklisp.org/archive/thread.comm.rendezvous/2012-10-13/thread.comm.rendezvous-20121013-git.tgz";
           sha256 = "16crdy09zm20iclgln1vj0psd8ifz4rqb6g9255p0d2rkjk2rgfx";
           system = "thread.comm.rendezvous.test";
           asd = "thread.comm.rendezvous.test";
@@ -99058,7 +99058,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tile-grid" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tile-grid/2022-07-07/tile-grid-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tile-grid/2022-07-07/tile-grid-20220707-git.tgz";
           sha256 = "10sqiqspiljnk4i1v4w0dkr640cgf9nvkgmkaww3smmhyjsd9270";
           system = "tile-grid";
           asd = "tile-grid";
@@ -99078,7 +99078,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "time-interval" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/time-interval/2019-02-02/time-interval-20190202-git.tgz";
+          url = "https://beta.quicklisp.org/archive/time-interval/2019-02-02/time-interval-20190202-git.tgz";
           sha256 = "0dydlg42bwcd7sr57v8hhrd86n80d5cb5r6r2id0zyqbrijabdw5";
           system = "time-interval";
           asd = "time-interval";
@@ -99101,7 +99101,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "timer-wheel" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/timer-wheel/2018-02-28/timer-wheel-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/timer-wheel/2018-02-28/timer-wheel-20180228-git.tgz";
           sha256 = "12pc1dpnkwj43n1sdqhg8n8h0mb16zcx4wxly85b7bqf00s962bc";
           system = "timer-wheel";
           asd = "timer-wheel";
@@ -99121,7 +99121,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "timer-wheel.examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/timer-wheel/2018-02-28/timer-wheel-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/timer-wheel/2018-02-28/timer-wheel-20180228-git.tgz";
           sha256 = "12pc1dpnkwj43n1sdqhg8n8h0mb16zcx4wxly85b7bqf00s962bc";
           system = "timer-wheel.examples";
           asd = "timer-wheel.examples";
@@ -99144,7 +99144,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tinaa" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tinaa/2017-12-27/tinaa-20171227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tinaa/2017-12-27/tinaa-20171227-git.tgz";
           sha256 = "10r1ypxphs5h7xxkl7v7r9pi2wdz1ik948mp63006hn44j7s1sa1";
           system = "tinaa";
           asd = "tinaa";
@@ -99174,7 +99174,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tinaa-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tinaa/2017-12-27/tinaa-20171227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tinaa/2017-12-27/tinaa-20171227-git.tgz";
           sha256 = "10r1ypxphs5h7xxkl7v7r9pi2wdz1ik948mp63006hn44j7s1sa1";
           system = "tinaa-test";
           asd = "tinaa-test";
@@ -99197,7 +99197,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tiny-routes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tiny-routes/2024-10-12/tiny-routes-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tiny-routes/2024-10-12/tiny-routes-20241012-git.tgz";
           sha256 = "1wswzz7d26ic9izls7pnkybm8ryf5j0ksv55gr6k5nji9x8r5jqx";
           system = "tiny-routes";
           asd = "tiny-routes";
@@ -99217,7 +99217,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tiny-routes-middleware-cookie" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tiny-routes/2024-10-12/tiny-routes-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tiny-routes/2024-10-12/tiny-routes-20241012-git.tgz";
           sha256 = "1wswzz7d26ic9izls7pnkybm8ryf5j0ksv55gr6k5nji9x8r5jqx";
           system = "tiny-routes-middleware-cookie";
           asd = "tiny-routes-middleware-cookie";
@@ -99240,7 +99240,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tm/2018-02-28/tm-v0.8.tgz";
+          url = "https://beta.quicklisp.org/archive/tm/2018-02-28/tm-v0.8.tgz";
           sha256 = "0lhqg5jpkzni1vzni0nnw7jb8ick1pbp04gfij2iczbi82qsw8x1";
           system = "tm";
           asd = "tm";
@@ -99263,7 +99263,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tmpdir" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tmpdir/2020-02-18/tmpdir-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tmpdir/2020-02-18/tmpdir-20200218-git.tgz";
           sha256 = "11yshmg2wyd75ywwfybklm131d5rdw246pg35a6ksndiq3w5n4k8";
           system = "tmpdir";
           asd = "tmpdir";
@@ -99283,7 +99283,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tmpdir.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tmpdir/2020-02-18/tmpdir-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tmpdir/2020-02-18/tmpdir-20200218-git.tgz";
           sha256 = "11yshmg2wyd75ywwfybklm131d5rdw246pg35a6ksndiq3w5n4k8";
           system = "tmpdir.tests";
           asd = "tmpdir.tests";
@@ -99308,7 +99308,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "toadstool" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/toadstool/2013-06-15/toadstool-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/toadstool/2013-06-15/toadstool-20130615-git.tgz";
           sha256 = "0njb1mdzk0247h87db90zv7bk40mw54pq8sj35l1dwa30d5yhi6r";
           system = "toadstool";
           asd = "toadstool";
@@ -99328,7 +99328,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "toadstool-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/toadstool/2013-06-15/toadstool-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/toadstool/2013-06-15/toadstool-20130615-git.tgz";
           sha256 = "0njb1mdzk0247h87db90zv7bk40mw54pq8sj35l1dwa30d5yhi6r";
           system = "toadstool-tests";
           asd = "toadstool-tests";
@@ -99351,7 +99351,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "toms419" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "toms419";
           asd = "toms419";
@@ -99371,7 +99371,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "toms715" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "toms715";
           asd = "toms715";
@@ -99391,7 +99391,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "toms717" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/f2cl/2023-10-21/f2cl-20231021-git.tgz";
           sha256 = "0ifwsal8kxsbi4xrn90z2smvbz393babl3j25n33fadjpfan2f1z";
           system = "toms717";
           asd = "toms717";
@@ -99411,7 +99411,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "toot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/toot/2012-11-25/toot-20121125-git.tgz";
+          url = "https://beta.quicklisp.org/archive/toot/2012-11-25/toot-20121125-git.tgz";
           sha256 = "1235qhkjrg1mmy6kx1vhsqvgjjgc7hk2sjssapv7xr43m71n6ivx";
           system = "toot";
           asd = "toot";
@@ -99444,7 +99444,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tooter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tooter/2025-06-22/tooter-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tooter/2025-06-22/tooter-20250622-git.tgz";
           sha256 = "1hyihg9mr9b69jbf6dr07g8w3k7ismw63a4zynmmzbba6lbbv3p0";
           system = "tooter";
           asd = "tooter";
@@ -99470,7 +99470,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "torrents" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-torrents/2025-06-22/cl-torrents-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-torrents/2025-06-22/cl-torrents-20250622-git.tgz";
           sha256 = "1jfxgb5hr2cr9pp7pkcwkafvdrfpcvpgzvn4qi11q0bygng7qg38";
           system = "torrents";
           asd = "torrents";
@@ -99508,7 +99508,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "torrents-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-torrents/2025-06-22/cl-torrents-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-torrents/2025-06-22/cl-torrents-20250622-git.tgz";
           sha256 = "1jfxgb5hr2cr9pp7pkcwkafvdrfpcvpgzvn4qi11q0bygng7qg38";
           system = "torrents-test";
           asd = "torrents-test";
@@ -99533,7 +99533,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "towers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/towers/2014-12-17/towers-20141217-git.tgz";
+          url = "https://beta.quicklisp.org/archive/towers/2014-12-17/towers-20141217-git.tgz";
           sha256 = "0r89z1hfb7kmj0a4qm7ih599hlin8rhxk6pb7nnvsdjgn436dkga";
           system = "towers";
           asd = "towers";
@@ -99558,7 +99558,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trace-db" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trace-db/2023-06-18/trace-db-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trace-db/2023-06-18/trace-db-20230618-git.tgz";
           sha256 = "1n2mj8nzd0c3clz5xjllajfad50i6yhir27i9q41r4sc5z1k0x63";
           system = "trace-db";
           asd = "trace-db";
@@ -99578,7 +99578,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "track-best" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/track-best/2022-02-20/track-best-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/track-best/2022-02-20/track-best-20220220-git.tgz";
           sha256 = "1f59bn57y1mdq18l1ji5q8yazv73g85y1mns2xzwbmx8sgxsa6pq";
           system = "track-best";
           asd = "track-best";
@@ -99598,7 +99598,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trainable-object" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trainable-object/2019-12-27/trainable-object-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trainable-object/2019-12-27/trainable-object-20191227-git.tgz";
           sha256 = "06hfv039xx5vwm3qpm4kwlzlxc4zxlfcpxnbbq8x12a32ngqykwm";
           system = "trainable-object";
           asd = "trainable-object";
@@ -99621,7 +99621,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trainable-object.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trainable-object/2019-12-27/trainable-object-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trainable-object/2019-12-27/trainable-object-20191227-git.tgz";
           sha256 = "06hfv039xx5vwm3qpm4kwlzlxc4zxlfcpxnbbq8x12a32ngqykwm";
           system = "trainable-object.test";
           asd = "trainable-object.test";
@@ -99644,7 +99644,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "transducers" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-transducers/2025-06-22/cl-transducers-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-transducers/2025-06-22/cl-transducers-20250622-git.tgz";
           sha256 = "1ldcd4wkyc5ysw891hs4n3s71zfi0q1ji9pshmxvkq05p7gamqlp";
           system = "transducers";
           asd = "transducers";
@@ -99664,7 +99664,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "transit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-transit/2024-10-12/cl-transit-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-transit/2024-10-12/cl-transit-20241012-git.tgz";
           sha256 = "09rlajmcljl43n5866ackbdjkdz19sd12wzdzxnk2l7bjx3khqm4";
           system = "transit";
           asd = "transit";
@@ -99696,7 +99696,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "transit-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-transit/2024-10-12/cl-transit-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-transit/2024-10-12/cl-transit-20241012-git.tgz";
           sha256 = "09rlajmcljl43n5866ackbdjkdz19sd12wzdzxnk2l7bjx3khqm4";
           system = "transit-tests";
           asd = "transit-tests";
@@ -99721,7 +99721,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "translate" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/translate/2018-02-28/translate-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/translate/2018-02-28/translate-20180228-git.tgz";
           sha256 = "07bvdmj8x77k8pw24yhfp1xv9h40n5w717vgj3wmq703159kyjia";
           system = "translate";
           asd = "translate";
@@ -99741,7 +99741,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "translate-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/translate-client/2018-02-28/translate-client-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/translate-client/2018-02-28/translate-client-20180228-git.tgz";
           sha256 = "0mjzzahy5wrycik37dirwnvcd5bj5xm20cnw6cmzh0ncvb442mdx";
           system = "translate-client";
           asd = "translate-client";
@@ -99767,7 +99767,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "translators" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "translators";
           asd = "translators";
@@ -99787,7 +99787,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "transparent-wrap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/transparent-wrap/2020-09-25/transparent-wrap-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/transparent-wrap/2020-09-25/transparent-wrap-20200925-git.tgz";
           sha256 = "0ghva34ksdvczfwpjdaf97bkjxrp35fjqkxamyqf7fbadh4wmfqj";
           system = "transparent-wrap";
           asd = "transparent-wrap";
@@ -99812,7 +99812,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "tree";
           asd = "tree";
@@ -99832,7 +99832,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tree-search" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tree-search/2020-12-20/tree-search-0.0.1.tgz";
+          url = "https://beta.quicklisp.org/archive/tree-search/2020-12-20/tree-search-0.0.1.tgz";
           sha256 = "10qgd5yj3n2w4j6wsq1xly0hnpdi1bhhzpia4s1gpkywhglw84zq";
           system = "tree-search";
           asd = "tree-search";
@@ -99852,7 +99852,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "treedb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz";
           sha256 = "02xsm4han0m0vj1j2ly2a6ncjcv7z8p3lcpkyj27xygag2vlchbq";
           system = "treedb";
           asd = "treedb";
@@ -99872,7 +99872,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "treedb.doc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz";
           sha256 = "02xsm4han0m0vj1j2ly2a6ncjcv7z8p3lcpkyj27xygag2vlchbq";
           system = "treedb.doc";
           asd = "treedb.doc";
@@ -99896,7 +99896,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "treedb.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz";
           sha256 = "02xsm4han0m0vj1j2ly2a6ncjcv7z8p3lcpkyj27xygag2vlchbq";
           system = "treedb.tests";
           asd = "treedb.tests";
@@ -99919,7 +99919,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trees" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trees/2018-01-31/trees-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trees/2018-01-31/trees-20180131-git.tgz";
           sha256 = "1xvydf3qc17rd7ia8sffxcpclgm3l0iyhx8k72ddk59v3pg5is4k";
           system = "trees";
           asd = "trees";
@@ -99937,7 +99937,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trees-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trees/2018-01-31/trees-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trees/2018-01-31/trees-20180131-git.tgz";
           sha256 = "1xvydf3qc17rd7ia8sffxcpclgm3l0iyhx8k72ddk59v3pg5is4k";
           system = "trees-tests";
           asd = "trees";
@@ -99957,7 +99957,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trestrul" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trestrul/2021-10-20/trestrul-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trestrul/2021-10-20/trestrul-20211020-git.tgz";
           sha256 = "12bghcfnfxq8l4a1jzh6vx4yna9da1xvp0b7kfdcfylnyga9ivy6";
           system = "trestrul";
           asd = "trestrul";
@@ -99977,7 +99977,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trestrul.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trestrul/2021-10-20/trestrul-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trestrul/2021-10-20/trestrul-20211020-git.tgz";
           sha256 = "12bghcfnfxq8l4a1jzh6vx4yna9da1xvp0b7kfdcfylnyga9ivy6";
           system = "trestrul.test";
           asd = "trestrul.test";
@@ -100000,7 +100000,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivia" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
           sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b";
           system = "trivia";
           asd = "trivia";
@@ -100018,7 +100018,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivia.balland2006" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
           sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b";
           system = "trivia.balland2006";
           asd = "trivia.balland2006";
@@ -100041,7 +100041,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivia.benchmark" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
           sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b";
           system = "trivia.benchmark";
           asd = "trivia.benchmark";
@@ -100066,7 +100066,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivia.cffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
           sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b";
           system = "trivia.cffi";
           asd = "trivia.cffi";
@@ -100089,7 +100089,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivia.fset" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
           sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b";
           system = "trivia.fset";
           asd = "trivia.fset";
@@ -100112,7 +100112,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivia.level0" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
           sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b";
           system = "trivia.level0";
           asd = "trivia.level0";
@@ -100130,7 +100130,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivia.level1" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
           sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b";
           system = "trivia.level1";
           asd = "trivia.level1";
@@ -100148,7 +100148,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivia.level2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
           sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b";
           system = "trivia.level2";
           asd = "trivia.level2";
@@ -100171,7 +100171,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivia.ppcre" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
           sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b";
           system = "trivia.ppcre";
           asd = "trivia.ppcre";
@@ -100194,7 +100194,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivia.quasiquote" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
           sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b";
           system = "trivia.quasiquote";
           asd = "trivia.quasiquote";
@@ -100215,7 +100215,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivia.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
           sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b";
           system = "trivia.test";
           asd = "trivia.test";
@@ -100243,7 +100243,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivia.trivial" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz";
           sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b";
           system = "trivia.trivial";
           asd = "trivia.trivial";
@@ -100261,7 +100261,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-adjust-simple-array" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-adjust-simple-array/2025-06-22/trivial-adjust-simple-array-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-adjust-simple-array/2025-06-22/trivial-adjust-simple-array-20250622-git.tgz";
           sha256 = "1mxsng80x3m4cf65vfd1q5fx9nlzqckfc7axwvf9fh156rdhhr3p";
           system = "trivial-adjust-simple-array";
           asd = "trivial-adjust-simple-array";
@@ -100281,7 +100281,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-arguments" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-arguments/2025-06-22/trivial-arguments-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-arguments/2025-06-22/trivial-arguments-20250622-git.tgz";
           sha256 = "1lgg057vp6iwf0k48dipgm5ffpqfakx0kgicf13xscfqzpv5pw6i";
           system = "trivial-arguments";
           asd = "trivial-arguments";
@@ -100299,7 +100299,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-backtrace" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-backtrace/2023-02-14/trivial-backtrace-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-backtrace/2023-02-14/trivial-backtrace-20230214-git.tgz";
           sha256 = "11j0p3vgmnn5q84xw7sacr5p3cvff2hfhsh2is8xpm2iwxc723kn";
           system = "trivial-backtrace";
           asd = "trivial-backtrace";
@@ -100317,7 +100317,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-backtrace-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-backtrace/2023-02-14/trivial-backtrace-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-backtrace/2023-02-14/trivial-backtrace-20230214-git.tgz";
           sha256 = "11j0p3vgmnn5q84xw7sacr5p3cvff2hfhsh2is8xpm2iwxc723kn";
           system = "trivial-backtrace-test";
           asd = "trivial-backtrace-test";
@@ -100340,7 +100340,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-battery" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-battery/2021-10-20/trivial-battery-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-battery/2021-10-20/trivial-battery-20211020-git.tgz";
           sha256 = "12ni2502v9gjszhjsh0aai08cm64gl8g815xghdjhcf7y34ffl2b";
           system = "trivial-battery";
           asd = "trivial-battery";
@@ -100360,7 +100360,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-benchmark" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-benchmark/2023-10-21/trivial-benchmark-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-benchmark/2023-10-21/trivial-benchmark-20231021-git.tgz";
           sha256 = "1p48wgpady0n8frdcgp7sbg93b0fbvpx1qk5valmanhwr9j3xh88";
           system = "trivial-benchmark";
           asd = "trivial-benchmark";
@@ -100380,7 +100380,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-bit-streams" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-bit-streams/2019-07-10/trivial-bit-streams-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-bit-streams/2019-07-10/trivial-bit-streams-20190710-git.tgz";
           sha256 = "01xcs069934pzm8gi1xkwgd4lw37ams30i6rcgrlw8gnx4zc4zc9";
           system = "trivial-bit-streams";
           asd = "trivial-bit-streams";
@@ -100400,7 +100400,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-bit-streams-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-bit-streams/2019-07-10/trivial-bit-streams-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-bit-streams/2019-07-10/trivial-bit-streams-20190710-git.tgz";
           sha256 = "01xcs069934pzm8gi1xkwgd4lw37ams30i6rcgrlw8gnx4zc4zc9";
           system = "trivial-bit-streams-tests";
           asd = "trivial-bit-streams-tests";
@@ -100424,7 +100424,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-build" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-build/2015-12-18/trivial-build-20151218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-build/2015-12-18/trivial-build-20151218-git.tgz";
           sha256 = "10h1igvryaqz6f72i57ppifysnw8swnss9395sijnk595icja7q0";
           system = "trivial-build";
           asd = "trivial-build";
@@ -100447,7 +100447,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-build-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-build/2015-12-18/trivial-build-20151218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-build/2015-12-18/trivial-build-20151218-git.tgz";
           sha256 = "10h1igvryaqz6f72i57ppifysnw8swnss9395sijnk595icja7q0";
           system = "trivial-build-test";
           asd = "trivial-build-test";
@@ -100470,7 +100470,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-channels" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-channels/2016-04-21/trivial-channels-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-channels/2016-04-21/trivial-channels-20160421-git.tgz";
           sha256 = "04wnxcgk40x8p0gxnz9arv1a5wasdqrdxa8c4p5v7r2mycfps6jj";
           system = "trivial-channels";
           asd = "trivial-channels";
@@ -100493,7 +100493,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-clipboard" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-clipboard/2024-10-12/trivial-clipboard-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-clipboard/2024-10-12/trivial-clipboard-20241012-git.tgz";
           sha256 = "1agj4nvw4qq7k4vp64y15gq5h5g22zasys48c2bvzqjr0n9d4lj1";
           system = "trivial-clipboard";
           asd = "trivial-clipboard";
@@ -100511,7 +100511,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-clipboard-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-clipboard/2024-10-12/trivial-clipboard-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-clipboard/2024-10-12/trivial-clipboard-20241012-git.tgz";
           sha256 = "1agj4nvw4qq7k4vp64y15gq5h5g22zasys48c2bvzqjr0n9d4lj1";
           system = "trivial-clipboard-test";
           asd = "trivial-clipboard-test";
@@ -100534,7 +100534,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-clock" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-trivial-clock/2025-06-22/cl-trivial-clock-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-trivial-clock/2025-06-22/cl-trivial-clock-20250622-git.tgz";
           sha256 = "13pfghnar0c55fzha8nfihyjayycz659wp08s5fcip1ksdgkiw05";
           system = "trivial-clock";
           asd = "trivial-clock";
@@ -100554,7 +100554,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-cltl2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-cltl2/2021-12-30/trivial-cltl2-20211230-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-cltl2/2021-12-30/trivial-cltl2-20211230-git.tgz";
           sha256 = "0xx5vr0dp623m111zbfdk6x7l4jgd4wwyp6iarbj6ijq514wi3a3";
           system = "trivial-cltl2";
           asd = "trivial-cltl2";
@@ -100572,7 +100572,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-compress" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-compress/2020-12-20/trivial-compress-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-compress/2020-12-20/trivial-compress-20201220-git.tgz";
           sha256 = "1pbaz0phvzi27dgnfknscak1h27bsi16gys23kchg8y8zbm0z0g7";
           system = "trivial-compress";
           asd = "trivial-compress";
@@ -100597,7 +100597,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-compress-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-compress/2020-12-20/trivial-compress-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-compress/2020-12-20/trivial-compress-20201220-git.tgz";
           sha256 = "1pbaz0phvzi27dgnfknscak1h27bsi16gys23kchg8y8zbm0z0g7";
           system = "trivial-compress-test";
           asd = "trivial-compress-test";
@@ -100620,7 +100620,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-continuation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-continuation/2019-10-07/trivial-continuation-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-continuation/2019-10-07/trivial-continuation-20191007-git.tgz";
           sha256 = "1j8d8q86r60qr9pi5p3q7rqn16xpzbzygs0i9b8sn3qyxnnz5037";
           system = "trivial-continuation";
           asd = "trivial-continuation";
@@ -100643,7 +100643,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-coverage" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-coverage/2020-02-18/trivial-coverage-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-coverage/2020-02-18/trivial-coverage-20200218-git.tgz";
           sha256 = "1ak4mjcvzdjsjjh7j89zlnwgaamfrspxmjh2i9kg67kqn36prbsp";
           system = "trivial-coverage";
           asd = "trivial-coverage";
@@ -100663,7 +100663,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-custom-debugger" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-custom-debugger/2023-10-21/trivial-custom-debugger-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-custom-debugger/2023-10-21/trivial-custom-debugger-20231021-git.tgz";
           sha256 = "11x0wpnfllazaqlrgv9xx1mb5q62dx6ny08hpwgkq3jpvqbhxs3b";
           system = "trivial-custom-debugger";
           asd = "trivial-custom-debugger";
@@ -100683,7 +100683,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-debug-console" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-debug-console/2015-04-07/trivial-debug-console-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-debug-console/2015-04-07/trivial-debug-console-20150407-git.tgz";
           sha256 = "07r42k57vldg01hfwjhkic2hsy84c2s5zj7pl60xjl960i0lqnam";
           system = "trivial-debug-console";
           asd = "trivial-debug-console";
@@ -100703,7 +100703,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-do" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-do/2022-03-31/trivial-do-20220331-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-do/2022-03-31/trivial-do-20220331-git.tgz";
           sha256 = "0vql7am4zyg6zav3l6n6q3qgdxlnchdxpgdxp8lr9sm7jra7sdsf";
           system = "trivial-do";
           asd = "trivial-do";
@@ -100723,7 +100723,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-documentation" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-documentation/2016-12-04/trivial-documentation-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-documentation/2016-12-04/trivial-documentation-20161204-git.tgz";
           sha256 = "0y90zi6kaw7226xc089dl47677fz594a5ck1ld8yggk9ww7cdaav";
           system = "trivial-documentation";
           asd = "trivial-documentation";
@@ -100743,7 +100743,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-documentation-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-documentation/2016-12-04/trivial-documentation-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-documentation/2016-12-04/trivial-documentation-20161204-git.tgz";
           sha256 = "0y90zi6kaw7226xc089dl47677fz594a5ck1ld8yggk9ww7cdaav";
           system = "trivial-documentation-test";
           asd = "trivial-documentation-test";
@@ -100763,7 +100763,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-download" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-download/2023-02-14/trivial-download-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-download/2023-02-14/trivial-download-20230214-git.tgz";
           sha256 = "17kag2zi1r766n2mg4knz4ix268bll2acl0150cksibfa4dbq1k7";
           system = "trivial-download";
           asd = "trivial-download";
@@ -100783,7 +100783,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-dump-core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-dump-core/2017-02-27/trivial-dump-core-20170227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-dump-core/2017-02-27/trivial-dump-core-20170227-git.tgz";
           sha256 = "08lnp84gbf3yd3gpnbjbl8jm9p42j3m4hf2f355l7lylb8kabxn8";
           system = "trivial-dump-core";
           asd = "trivial-dump-core";
@@ -100803,7 +100803,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-ed-functions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-ed-functions/2021-08-07/trivial-ed-functions-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-ed-functions/2021-08-07/trivial-ed-functions-20210807-git.tgz";
           sha256 = "05r8n4jjcg2lci5qrjwqz913wivckgk01ivjg1barpnm0nr29qn1";
           system = "trivial-ed-functions";
           asd = "trivial-ed-functions";
@@ -100823,7 +100823,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-escapes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-escapes/2018-02-28/trivial-escapes-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-escapes/2018-02-28/trivial-escapes-20180228-git.tgz";
           sha256 = "0v6h8lk17iqv1qkxgqjyzn8gi6v0hvq2vmfbb01md3zjvjqxn6lr";
           system = "trivial-escapes";
           asd = "trivial-escapes";
@@ -100843,7 +100843,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-escapes-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-escapes/2018-02-28/trivial-escapes-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-escapes/2018-02-28/trivial-escapes-20180228-git.tgz";
           sha256 = "0v6h8lk17iqv1qkxgqjyzn8gi6v0hvq2vmfbb01md3zjvjqxn6lr";
           system = "trivial-escapes-test";
           asd = "trivial-escapes-test";
@@ -100866,7 +100866,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-exe" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-exe/2015-12-18/trivial-exe-20151218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-exe/2015-12-18/trivial-exe-20151218-git.tgz";
           sha256 = "1ryn7gh3n057czj3hwq6lx7h25ipfjxsvddywpm2ngfdwywaqzvc";
           system = "trivial-exe";
           asd = "trivial-exe";
@@ -100886,7 +100886,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-exe-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-exe/2015-12-18/trivial-exe-20151218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-exe/2015-12-18/trivial-exe-20151218-git.tgz";
           sha256 = "1ryn7gh3n057czj3hwq6lx7h25ipfjxsvddywpm2ngfdwywaqzvc";
           system = "trivial-exe-test";
           asd = "trivial-exe-test";
@@ -100909,7 +100909,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-extensible-sequences" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-extensible-sequences/2025-06-22/trivial-extensible-sequences-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-extensible-sequences/2025-06-22/trivial-extensible-sequences-20250622-git.tgz";
           sha256 = "1l3i99gcabh7b0cvkhqlhdfx5mk1n2smfvkxzgx8v55qa5gzsa8w";
           system = "trivial-extensible-sequences";
           asd = "trivial-extensible-sequences";
@@ -100929,7 +100929,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-extract" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-extract/2016-04-21/trivial-extract-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-extract/2016-04-21/trivial-extract-20160421-git.tgz";
           sha256 = "0083x71f4x6b64wd8ywgaiqi0ygmdhl5rv101jcv44l3l61839sx";
           system = "trivial-extract";
           asd = "trivial-extract";
@@ -100956,7 +100956,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-extract-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-extract/2016-04-21/trivial-extract-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-extract/2016-04-21/trivial-extract-20160421-git.tgz";
           sha256 = "0083x71f4x6b64wd8ywgaiqi0ygmdhl5rv101jcv44l3l61839sx";
           system = "trivial-extract-test";
           asd = "trivial-extract-test";
@@ -100979,7 +100979,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-features" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-features/2025-06-22/trivial-features-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-features/2025-06-22/trivial-features-20250622-git.tgz";
           sha256 = "0r3lwy5ssrw6d3v1clyfqc59dxknsnr5zrb0h64zx5b7ddn6vb6q";
           system = "trivial-features";
           asd = "trivial-features";
@@ -100997,7 +100997,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-features-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-features/2025-06-22/trivial-features-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-features/2025-06-22/trivial-features-20250622-git.tgz";
           sha256 = "0r3lwy5ssrw6d3v1clyfqc59dxknsnr5zrb0h64zx5b7ddn6vb6q";
           system = "trivial-features-tests";
           asd = "trivial-features-tests";
@@ -101023,7 +101023,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-file-size" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-file-size/2025-06-22/trivial-file-size-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-file-size/2025-06-22/trivial-file-size-20250622-git.tgz";
           sha256 = "172xmsmcdq73gxyg77d05mxqcml2rjk2jwh91yl9aph68ls2d1pq";
           system = "trivial-file-size";
           asd = "trivial-file-size";
@@ -101041,7 +101041,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-garbage" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-garbage/2023-10-21/trivial-garbage-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-garbage/2023-10-21/trivial-garbage-20231021-git.tgz";
           sha256 = "0rfwxvwg0kpcaa0hsi035yrkfdfks4bq8d9azmrww2f0rmv9g6sd";
           system = "trivial-garbage";
           asd = "trivial-garbage";
@@ -101059,7 +101059,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-gray-streams" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2024-10-12/trivial-gray-streams-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-gray-streams/2024-10-12/trivial-gray-streams-20241012-git.tgz";
           sha256 = "0iw6q5hx7x8sc5s7ikvsjccsksbm0rd13d54mkrg62sc56hjywrm";
           system = "trivial-gray-streams";
           asd = "trivial-gray-streams";
@@ -101077,7 +101077,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-gray-streams-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2024-10-12/trivial-gray-streams-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-gray-streams/2024-10-12/trivial-gray-streams-20241012-git.tgz";
           sha256 = "0iw6q5hx7x8sc5s7ikvsjccsksbm0rd13d54mkrg62sc56hjywrm";
           system = "trivial-gray-streams-test";
           asd = "trivial-gray-streams-test";
@@ -101097,7 +101097,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-hashtable-serialize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-hashtable-serialize/2019-10-07/trivial-hashtable-serialize-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-hashtable-serialize/2019-10-07/trivial-hashtable-serialize-20191007-git.tgz";
           sha256 = "06xdci47h6rpfkmrf7p9kd217jbkmkmf90ygqcmkkgf3sv5623bh";
           system = "trivial-hashtable-serialize";
           asd = "trivial-hashtable-serialize";
@@ -101117,7 +101117,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-http" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-http/2011-02-19/trivial-http-20110219-http.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-http/2011-02-19/trivial-http-20110219-http.tgz";
           sha256 = "06mrh2bjzhfdzi48dnq0bhl2cac4v41aqck53rfm4rnsygcjsn78";
           system = "trivial-http";
           asd = "trivial-http";
@@ -101137,7 +101137,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-http-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-http/2011-02-19/trivial-http-20110219-http.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-http/2011-02-19/trivial-http-20110219-http.tgz";
           sha256 = "06mrh2bjzhfdzi48dnq0bhl2cac4v41aqck53rfm4rnsygcjsn78";
           system = "trivial-http-test";
           asd = "trivial-http-test";
@@ -101160,7 +101160,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-indent" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-indent/2025-06-22/trivial-indent-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-indent/2025-06-22/trivial-indent-20250622-git.tgz";
           sha256 = "17zfm62szbvyn8qq6k88yh04xwa6dnmbla4yqaqqpc971xs562cy";
           system = "trivial-indent";
           asd = "trivial-indent";
@@ -101178,7 +101178,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-inspector-hook" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-inspector-hook/2021-08-07/trivial-inspector-hook-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-inspector-hook/2021-08-07/trivial-inspector-hook-20210807-git.tgz";
           sha256 = "0h9m1ps5sqgrr171czj6rq84wpy2xvggfzspvy667xsldv4xi0c2";
           system = "trivial-inspector-hook";
           asd = "trivial-inspector-hook";
@@ -101198,7 +101198,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-irc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-irc/2017-10-19/trivial-irc-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-irc/2017-10-19/trivial-irc-20171019-git.tgz";
           sha256 = "0jjgx6ld2gcr0w0g5k62dr0rl6202ydih6ylmypv6m5jmrarcbza";
           system = "trivial-irc";
           asd = "trivial-irc";
@@ -101222,7 +101222,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-irc-echobot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-irc/2017-10-19/trivial-irc-20171019-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-irc/2017-10-19/trivial-irc-20171019-git.tgz";
           sha256 = "0jjgx6ld2gcr0w0g5k62dr0rl6202ydih6ylmypv6m5jmrarcbza";
           system = "trivial-irc-echobot";
           asd = "trivial-irc-echobot";
@@ -101242,7 +101242,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-json-codec" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-json-codec/2022-07-07/trivial-json-codec-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-json-codec/2022-07-07/trivial-json-codec-20220707-git.tgz";
           sha256 = "1k0nnsn3nsb83gzmkrf81zqz6ydn21gzfq96r2d5690v5zkrg1kg";
           system = "trivial-json-codec";
           asd = "trivial-json-codec";
@@ -101268,7 +101268,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-jumptables" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-jumptables/2019-11-30/trivial-jumptables_1.1.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-jumptables/2019-11-30/trivial-jumptables_1.1.tgz";
           sha256 = "10ih84hkscj0l4ki3s196d9b85iil8f56ps5r8ng222i0lln1ni9";
           system = "trivial-jumptables";
           asd = "trivial-jumptables";
@@ -101288,7 +101288,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-jumptables_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-jumptables/2019-11-30/trivial-jumptables_1.1.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-jumptables/2019-11-30/trivial-jumptables_1.1.tgz";
           sha256 = "10ih84hkscj0l4ki3s196d9b85iil8f56ps5r8ng222i0lln1ni9";
           system = "trivial-jumptables_tests";
           asd = "trivial-jumptables_tests";
@@ -101312,7 +101312,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-lazy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-lazy/2015-07-09/trivial-lazy-20150709-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-lazy/2015-07-09/trivial-lazy-20150709-git.tgz";
           sha256 = "0fnsz2kdb0v5cz4xl5a2c1szcif7jmnkxhbzvk6lrhzjccgyhjc7";
           system = "trivial-lazy";
           asd = "trivial-lazy";
@@ -101332,7 +101332,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-ldap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-ldap/2018-07-11/trivial-ldap-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-ldap/2018-07-11/trivial-ldap-20180711-git.tgz";
           sha256 = "1zaa4wnk5y5ff211pkg6dl27j4pjwh56hq0246slxsdxv6kvp1z9";
           system = "trivial-ldap";
           asd = "trivial-ldap";
@@ -101356,7 +101356,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-left-pad" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-left-pad/2019-08-13/trivial-left-pad-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-left-pad/2019-08-13/trivial-left-pad-20190813-git.tgz";
           sha256 = "0q68j0x0x3z8rl577jsl3y0s3x5xiqv54sla6kds43q7821qfnwk";
           system = "trivial-left-pad";
           asd = "trivial-left-pad";
@@ -101379,7 +101379,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-left-pad-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-left-pad/2019-08-13/trivial-left-pad-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-left-pad/2019-08-13/trivial-left-pad-20190813-git.tgz";
           sha256 = "0q68j0x0x3z8rl577jsl3y0s3x5xiqv54sla6kds43q7821qfnwk";
           system = "trivial-left-pad-test";
           asd = "trivial-left-pad";
@@ -101403,7 +101403,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-macroexpand-all" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz";
           sha256 = "191hnn4b5j4i3crydmlzbm231kj0h7l8zj6mzj69r1npbzkas4bd";
           system = "trivial-macroexpand-all";
           asd = "trivial-macroexpand-all";
@@ -101421,7 +101421,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-main-thread" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-main-thread/2025-06-22/trivial-main-thread-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-main-thread/2025-06-22/trivial-main-thread-20250622-git.tgz";
           sha256 = "0p7p6bh3rghj3yj2d9ry2jfvpjkky2mwwbbh4w422v6yplv6iwhx";
           system = "trivial-main-thread";
           asd = "trivial-main-thread";
@@ -101443,7 +101443,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-method-combinations" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-method-combinations/2019-11-30/trivial-method-combinations-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-method-combinations/2019-11-30/trivial-method-combinations-20191130-git.tgz";
           sha256 = "0w9w8bj835sfp797rdm7b5crpnz0xrz2q5vgbzm2p9n9jskxnxnv";
           system = "trivial-method-combinations";
           asd = "trivial-method-combinations";
@@ -101463,7 +101463,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-mimes" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-mimes/2025-06-22/trivial-mimes-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-mimes/2025-06-22/trivial-mimes-20250622-git.tgz";
           sha256 = "0ahf8i2ghsg1kqfiaarxhlcsd3icmb2glsbcv2rwzdc06w7x2lms";
           system = "trivial-mimes";
           asd = "trivial-mimes";
@@ -101481,7 +101481,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-mmap" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-mmap/2021-01-24/trivial-mmap-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-mmap/2021-01-24/trivial-mmap-20210124-git.tgz";
           sha256 = "1ckhd7b0ll9xcmwdh42g0v38grk2acs3kv66k1gwh539f99kzcps";
           system = "trivial-mmap";
           asd = "trivial-mmap";
@@ -101504,7 +101504,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-monitored-thread" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-monitored-thread/2022-07-07/trivial-monitored-thread-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-monitored-thread/2022-07-07/trivial-monitored-thread-20220707-git.tgz";
           sha256 = "1vmhc5id0qk5yh8az4j1znqc73r18pygmrnfxmwwndh1a9yf98z4";
           system = "trivial-monitored-thread";
           asd = "trivial-monitored-thread";
@@ -101528,7 +101528,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-msi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-msi/2016-02-08/trivial-msi-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-msi/2016-02-08/trivial-msi-20160208-git.tgz";
           sha256 = "1mbpwnsvv30gf7z8m96kv8933s6csg4q0frx03vazp4ckplwff8w";
           system = "trivial-msi";
           asd = "trivial-msi";
@@ -101548,7 +101548,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-msi-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-msi/2016-02-08/trivial-msi-20160208-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-msi/2016-02-08/trivial-msi-20160208-git.tgz";
           sha256 = "1mbpwnsvv30gf7z8m96kv8933s6csg4q0frx03vazp4ckplwff8w";
           system = "trivial-msi-test";
           asd = "trivial-msi-test";
@@ -101571,7 +101571,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-nntp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-nntp/2016-12-04/trivial-nntp-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-nntp/2016-12-04/trivial-nntp-20161204-git.tgz";
           sha256 = "0ywwrjx4vaz117zaxqhk2b4xrb75cw1ac5xir9zhvgzkyl6wf867";
           system = "trivial-nntp";
           asd = "trivial-nntp";
@@ -101594,7 +101594,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-object-lock" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-object-lock/2022-07-07/trivial-object-lock-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-object-lock/2022-07-07/trivial-object-lock-20220707-git.tgz";
           sha256 = "18xwwgvshib4l2bs6m16mk0kzdp40482yf7v72nzk13v0bgnw91s";
           system = "trivial-object-lock";
           asd = "trivial-object-lock";
@@ -101619,7 +101619,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-octet-streams" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-octet-streams/2024-10-12/trivial-octet-streams-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-octet-streams/2024-10-12/trivial-octet-streams-20241012-git.tgz";
           sha256 = "0zj7aijn10hflr87774hwi5k1jzq6j5bgh2hm70ixxhcmaq7lqk5";
           system = "trivial-octet-streams";
           asd = "trivial-octet-streams";
@@ -101639,7 +101639,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-open-browser" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-open-browser/2016-08-25/trivial-open-browser-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-open-browser/2016-08-25/trivial-open-browser-20160825-git.tgz";
           sha256 = "0ixay1piq420i6adx642qhw45l6ik7rvgk52lyz27dvx5f8yqsdb";
           system = "trivial-open-browser";
           asd = "trivial-open-browser";
@@ -101659,7 +101659,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-openstack" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-openstack/2016-06-28/trivial-openstack-20160628-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-openstack/2016-06-28/trivial-openstack-20160628-git.tgz";
           sha256 = "0sdc6rhjqv1i7wknn44jg5xxnz70087bhfslh0izggny9d9s015i";
           system = "trivial-openstack";
           asd = "trivial-openstack";
@@ -101684,7 +101684,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-openstack-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-openstack/2016-06-28/trivial-openstack-20160628-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-openstack/2016-06-28/trivial-openstack-20160628-git.tgz";
           sha256 = "0sdc6rhjqv1i7wknn44jg5xxnz70087bhfslh0izggny9d9s015i";
           system = "trivial-openstack-test";
           asd = "trivial-openstack-test";
@@ -101711,7 +101711,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-package-local-nicknames" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2022-02-20/trivial-package-local-nicknames-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-package-local-nicknames/2022-02-20/trivial-package-local-nicknames-20220220-git.tgz";
           sha256 = "0p80s474czfqh7phd4qq5yjcy8q2160vxmn8pi6qlkqgdd7ix37r";
           system = "trivial-package-local-nicknames";
           asd = "trivial-package-local-nicknames";
@@ -101729,7 +101729,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-package-locks" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-package-locks/2024-10-12/trivial-package-locks-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-package-locks/2024-10-12/trivial-package-locks-20241012-git.tgz";
           sha256 = "09zhirygjmwr4xvwp1zx9b17mkxml7f7rni1xiwxg5vfgn0y1bi3";
           system = "trivial-package-locks";
           asd = "trivial-package-locks";
@@ -101749,7 +101749,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-package-manager" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-package-manager/2024-10-12/trivial-package-manager-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-package-manager/2024-10-12/trivial-package-manager-20241012-git.tgz";
           sha256 = "1q71r9h5xra0bg5c5v2gzjjswfv626gfg9sxn59w645g30xn1sph";
           system = "trivial-package-manager";
           asd = "trivial-package-manager";
@@ -101771,7 +101771,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-package-manager.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-package-manager/2024-10-12/trivial-package-manager-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-package-manager/2024-10-12/trivial-package-manager-20241012-git.tgz";
           sha256 = "1q71r9h5xra0bg5c5v2gzjjswfv626gfg9sxn59w645g30xn1sph";
           system = "trivial-package-manager.test";
           asd = "trivial-package-manager.test";
@@ -101794,7 +101794,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-pooled-database" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-pooled-database/2020-12-20/trivial-pooled-database-20201220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-pooled-database/2020-12-20/trivial-pooled-database-20201220-git.tgz";
           sha256 = "0a7c8bjl13k37b83lksklcw9sch570wgqv58cgs0dw9jcmsihqmx";
           system = "trivial-pooled-database";
           asd = "trivial-pooled-database";
@@ -101822,7 +101822,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-project" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-project/2017-08-30/trivial-project-quicklisp-9e3fe231-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-project/2017-08-30/trivial-project-quicklisp-9e3fe231-git.tgz";
           sha256 = "1s5h0fgs0rq00j492xln716w9i52v90rnfcr0idjzyimicx7hk22";
           system = "trivial-project";
           asd = "trivial-project";
@@ -101845,7 +101845,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-raw-io" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-raw-io/2014-12-17/trivial-raw-io-20141217-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-raw-io/2014-12-17/trivial-raw-io-20141217-git.tgz";
           sha256 = "19290zw2b64k78wr62gv30pp7cmqg07q85vfwjknaffjdd73xwi1";
           system = "trivial-raw-io";
           asd = "trivial-raw-io";
@@ -101865,7 +101865,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-renamer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-renamer/2017-08-30/trivial-renamer-quicklisp-1282597d-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-renamer/2017-08-30/trivial-renamer-quicklisp-1282597d-git.tgz";
           sha256 = "1nlgsayx4iw6gskg0d5vc823p0lmh414k9jiccvcsk1r17684mp8";
           system = "trivial-renamer";
           asd = "trivial-renamer";
@@ -101885,7 +101885,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-restarts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-restart-accessors/2025-06-22/trivial-restart-accessors-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-restart-accessors/2025-06-22/trivial-restart-accessors-20250622-git.tgz";
           sha256 = "127fhlqds5qyabvl85k50n6wgxkcpcb3bbxazz5hnd0zj3r3901z";
           system = "trivial-restarts";
           asd = "trivial-restarts";
@@ -101905,7 +101905,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-rfc-1123" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-rfc-1123/2022-07-07/trivial-rfc-1123-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-rfc-1123/2022-07-07/trivial-rfc-1123-20220707-git.tgz";
           sha256 = "1w4ywpj10fnp7cya62dzlxlg8nyk4lppn2pnmfixsndwr4ib1h6x";
           system = "trivial-rfc-1123";
           asd = "trivial-rfc-1123";
@@ -101925,7 +101925,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-sanitize" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-sanitize/2025-06-22/trivial-sanitize-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-sanitize/2025-06-22/trivial-sanitize-20250622-git.tgz";
           sha256 = "1rk34ss0zyap18yf3r0kjyr9pa6jlj3w9q00fb6hjynykp1lvmr2";
           system = "trivial-sanitize";
           asd = "trivial-sanitize";
@@ -101949,7 +101949,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-sanitize-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-sanitize/2025-06-22/trivial-sanitize-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-sanitize/2025-06-22/trivial-sanitize-20250622-git.tgz";
           sha256 = "1rk34ss0zyap18yf3r0kjyr9pa6jlj3w9q00fb6hjynykp1lvmr2";
           system = "trivial-sanitize-tests";
           asd = "trivial-sanitize-tests";
@@ -101973,7 +101973,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-shell" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-shell/2024-10-12/trivial-shell-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-shell/2024-10-12/trivial-shell-20241012-git.tgz";
           sha256 = "0cqfipcywi1ndl43walw7d54rd7layjq3wv2wpz5rlprv7dhpb2p";
           system = "trivial-shell";
           asd = "trivial-shell";
@@ -101991,7 +101991,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-shell-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-shell/2024-10-12/trivial-shell-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-shell/2024-10-12/trivial-shell-20241012-git.tgz";
           sha256 = "0cqfipcywi1ndl43walw7d54rd7layjq3wv2wpz5rlprv7dhpb2p";
           system = "trivial-shell-test";
           asd = "trivial-shell-test";
@@ -102014,7 +102014,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-signal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-signal/2019-07-10/trivial-signal-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-signal/2019-07-10/trivial-signal-20190710-git.tgz";
           sha256 = "13rh1jwh786xg235rkgqbdqga4b9jwn99zlxm0wr73rs2a5ga8ad";
           system = "trivial-signal";
           asd = "trivial-signal";
@@ -102038,7 +102038,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-sockets" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-sockets/2019-01-07/trivial-sockets-20190107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-sockets/2019-01-07/trivial-sockets-20190107-git.tgz";
           sha256 = "0xj9x5z3psxqap9c29qz1xswx5fiqxyzd35kmbw2g6z08cgb7nd0";
           system = "trivial-sockets";
           asd = "trivial-sockets";
@@ -102058,7 +102058,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-ssh" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz";
           sha256 = "1hjd8bhbymq4s2jglid5i9m2b19cnf6c793gvkh6mawcjd37vjmb";
           system = "trivial-ssh";
           asd = "trivial-ssh";
@@ -102078,7 +102078,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-ssh-libssh2" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz";
           sha256 = "1hjd8bhbymq4s2jglid5i9m2b19cnf6c793gvkh6mawcjd37vjmb";
           system = "trivial-ssh-libssh2";
           asd = "trivial-ssh-libssh2";
@@ -102106,7 +102106,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-ssh-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz";
           sha256 = "1hjd8bhbymq4s2jglid5i9m2b19cnf6c793gvkh6mawcjd37vjmb";
           system = "trivial-ssh-test";
           asd = "trivial-ssh-test";
@@ -102129,7 +102129,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-system-loader" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-system-loader/2024-10-12/trivial-system-loader-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-system-loader/2024-10-12/trivial-system-loader-20241012-git.tgz";
           sha256 = "094j50asfgyhqcm86p47azviivap0hni2gjp3khdxcn4f9i9d2b0";
           system = "trivial-system-loader";
           asd = "trivial-system-loader";
@@ -102149,7 +102149,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-tco" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-tco/2013-10-03/trivial-tco-20131003-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-tco/2013-10-03/trivial-tco-20131003-git.tgz";
           sha256 = "0j6mkchrk6bzkpdkrahagip9lxxr8rx3qj4547wg8bdqr7mm2nmi";
           system = "trivial-tco";
           asd = "trivial-tco";
@@ -102169,7 +102169,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-tco-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-tco/2013-10-03/trivial-tco-20131003-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-tco/2013-10-03/trivial-tco-20131003-git.tgz";
           sha256 = "0j6mkchrk6bzkpdkrahagip9lxxr8rx3qj4547wg8bdqr7mm2nmi";
           system = "trivial-tco-test";
           asd = "trivial-tco-test";
@@ -102192,7 +102192,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-thumbnail" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-thumbnail/2025-06-22/trivial-thumbnail-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-thumbnail/2025-06-22/trivial-thumbnail-20250622-git.tgz";
           sha256 = "1451yimch278s4qing3a71kpnhgk3dl4k096prvyiyqyz1qnq2ld";
           system = "trivial-thumbnail";
           asd = "trivial-thumbnail";
@@ -102212,7 +102212,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-timeout" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-timeout/2023-10-21/trivial-timeout-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-timeout/2023-10-21/trivial-timeout-20231021-git.tgz";
           sha256 = "0s8z9aj6b3kv21yiyk13cjylzf5zlnw9v86vcff477m1gk9yddjs";
           system = "trivial-timeout";
           asd = "trivial-timeout";
@@ -102232,7 +102232,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-timer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-timer/2021-05-31/trivial-timer-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-timer/2021-05-31/trivial-timer-20210531-git.tgz";
           sha256 = "1b8pnw613h1dngzmv3qglmfrl1jdjbxrsbqnh7rfdj0lnv43h1il";
           system = "trivial-timer";
           asd = "trivial-timer";
@@ -102258,7 +102258,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-toplevel-commands" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-toplevel-commands/2025-06-22/trivial-toplevel-commands-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-toplevel-commands/2025-06-22/trivial-toplevel-commands-20250622-git.tgz";
           sha256 = "1izzaihfq5fjwdfz0048lb4a0zr0pyydx9p6nrwr4i8702ighjnw";
           system = "trivial-toplevel-commands";
           asd = "trivial-toplevel-commands";
@@ -102278,7 +102278,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-toplevel-prompt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-toplevel-prompt/2025-06-22/trivial-toplevel-prompt-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-toplevel-prompt/2025-06-22/trivial-toplevel-prompt-20250622-git.tgz";
           sha256 = "0n3apxjdxn8cnhl1w1ampzhc6j37ra4ygv44v6rz3sinw1pwcmf4";
           system = "trivial-toplevel-prompt";
           asd = "trivial-toplevel-prompt";
@@ -102298,7 +102298,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-types" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz";
           sha256 = "1s4cp9bdlbn8447q7w7f1wkgwrbvfzp20mgs307l5pxvdslin341";
           system = "trivial-types";
           asd = "trivial-types";
@@ -102316,7 +102316,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-update" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-update/2018-01-31/trivial-update-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-update/2018-01-31/trivial-update-20180131-git.tgz";
           sha256 = "0dpijh9alljk0jmnkp37hfliylscs7xwvlmjkfshizmyh0qjjxir";
           system = "trivial-update";
           asd = "trivial-update";
@@ -102336,7 +102336,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-utf-8" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-utf-8/2025-06-22/trivial-utf-8-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-utf-8/2025-06-22/trivial-utf-8-20250622-git.tgz";
           sha256 = "1szf8xlsz1lhpwikz8lb9fxwkmi8x9ibss5512mw40h97r68rpw2";
           system = "trivial-utf-8";
           asd = "trivial-utf-8";
@@ -102354,7 +102354,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-utilities" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-utilities/2022-07-07/trivial-utilities-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-utilities/2022-07-07/trivial-utilities-20220707-git.tgz";
           sha256 = "0k1xmn5f5dik7scadw0vyy67mik4ypnfqbhlv2vsg9afxzbpx2dz";
           system = "trivial-utilities";
           asd = "trivial-utilities";
@@ -102378,7 +102378,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-variable-bindings" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-variable-bindings/2019-10-07/trivial-variable-bindings-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-variable-bindings/2019-10-07/trivial-variable-bindings-20191007-git.tgz";
           sha256 = "08lx5m1bspxsnv572zma1hxk3yfyk9fkmi5cvcr5riannyimdqgy";
           system = "trivial-variable-bindings";
           asd = "trivial-variable-bindings";
@@ -102401,7 +102401,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-wish" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-wish/2017-06-30/trivial-wish-quicklisp-910afeea-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-wish/2017-06-30/trivial-wish-quicklisp-910afeea-git.tgz";
           sha256 = "1ydb9vsanrv6slbddhxc38pq5s88k0rzgqnwabw5cgc8cp5gqvyp";
           system = "trivial-wish";
           asd = "trivial-wish";
@@ -102421,7 +102421,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-with" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-with/2017-08-30/trivial-with-quicklisp-2fd8ca54-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-with/2017-08-30/trivial-with-quicklisp-2fd8ca54-git.tgz";
           sha256 = "1h880j9k7piq6y5a6sywn1r43h439dd6vfymqvhgnbx458wy69sq";
           system = "trivial-with";
           asd = "trivial-with";
@@ -102441,7 +102441,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-with-current-source-form" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-with-current-source-form/2023-06-18/trivial-with-current-source-form-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-with-current-source-form/2023-06-18/trivial-with-current-source-form-20230618-git.tgz";
           sha256 = "1856m234mcg8l0p63h0j76isx8n2iji569b4r4zf7qs135xbw930";
           system = "trivial-with-current-source-form";
           asd = "trivial-with-current-source-form";
@@ -102459,7 +102459,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-ws" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz";
           sha256 = "0qmsf0dhmyhjgqjzdgj2yb1nkrijwp4p1j411613i45xjc2zd6m7";
           system = "trivial-ws";
           asd = "trivial-ws";
@@ -102479,7 +102479,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-ws-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz";
           sha256 = "0qmsf0dhmyhjgqjzdgj2yb1nkrijwp4p1j411613i45xjc2zd6m7";
           system = "trivial-ws-client";
           asd = "trivial-ws-client";
@@ -102502,7 +102502,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-ws-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz";
           sha256 = "0qmsf0dhmyhjgqjzdgj2yb1nkrijwp4p1j411613i45xjc2zd6m7";
           system = "trivial-ws-test";
           asd = "trivial-ws-test";
@@ -102528,7 +102528,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivial-yenc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivial-yenc/2016-12-04/trivial-yenc-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivial-yenc/2016-12-04/trivial-yenc-20161204-git.tgz";
           sha256 = "0jsqwixgikdinc1rq22c4dh9kgg6z0kvw9rh9sbssbmxv99sb5bf";
           system = "trivial-yenc";
           asd = "trivial-yenc";
@@ -102548,7 +102548,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivialib.bdd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivialib.bdd/2021-12-09/trivialib.bdd-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivialib.bdd/2021-12-09/trivialib.bdd-20211209-git.tgz";
           sha256 = "1iqpcihpm6glr0afi35z6qifj0ppl7s4h1k94fn6lqpv2js6lzbr";
           system = "trivialib.bdd";
           asd = "trivialib.bdd";
@@ -102573,7 +102573,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivialib.bdd.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivialib.bdd/2021-12-09/trivialib.bdd-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivialib.bdd/2021-12-09/trivialib.bdd-20211209-git.tgz";
           sha256 = "1iqpcihpm6glr0afi35z6qifj0ppl7s4h1k94fn6lqpv2js6lzbr";
           system = "trivialib.bdd.test";
           asd = "trivialib.bdd.test";
@@ -102596,7 +102596,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivialib.type-unify" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivialib.type-unify/2020-03-25/trivialib.type-unify-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivialib.type-unify/2020-03-25/trivialib.type-unify-20200325-git.tgz";
           sha256 = "0b5ck9ldn1w3imgpxyh164bypy28kvjzkwlcyyfsc0h1njnm5jmy";
           system = "trivialib.type-unify";
           asd = "trivialib.type-unify";
@@ -102621,7 +102621,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trivialib.type-unify.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trivialib.type-unify/2020-03-25/trivialib.type-unify-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trivialib.type-unify/2020-03-25/trivialib.type-unify-20200325-git.tgz";
           sha256 = "0b5ck9ldn1w3imgpxyh164bypy28kvjzkwlcyyfsc0h1njnm5jmy";
           system = "trivialib.type-unify.test";
           asd = "trivialib.type-unify.test";
@@ -102644,7 +102644,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trucler" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz";
           sha256 = "16cxx9pgpn3bkrmazc4lqhmaf20c0rhp1vaj78ms8ldwfqqrgznr";
           system = "trucler";
           asd = "trucler";
@@ -102667,7 +102667,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trucler-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz";
           sha256 = "16cxx9pgpn3bkrmazc4lqhmaf20c0rhp1vaj78ms8ldwfqqrgznr";
           system = "trucler-base";
           asd = "trucler-base";
@@ -102687,7 +102687,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trucler-native" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz";
           sha256 = "16cxx9pgpn3bkrmazc4lqhmaf20c0rhp1vaj78ms8ldwfqqrgznr";
           system = "trucler-native";
           asd = "trucler-native";
@@ -102707,7 +102707,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trucler-native-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz";
           sha256 = "16cxx9pgpn3bkrmazc4lqhmaf20c0rhp1vaj78ms8ldwfqqrgznr";
           system = "trucler-native-test";
           asd = "trucler-native-test";
@@ -102730,7 +102730,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "trucler-reference" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/trucler/2023-10-21/trucler-20231021-git.tgz";
           sha256 = "16cxx9pgpn3bkrmazc4lqhmaf20c0rhp1vaj78ms8ldwfqqrgznr";
           system = "trucler-reference";
           asd = "trucler-reference";
@@ -102750,7 +102750,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "truetype-clx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/truetype-clx/2020-02-18/truetype-clx-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/truetype-clx/2020-02-18/truetype-clx-20200218-git.tgz";
           sha256 = "1k46xa0nclj0mpd7khnlpam6q5hgnp23jixryhvv96gx47swhddr";
           system = "truetype-clx";
           asd = "truetype-clx";
@@ -102775,7 +102775,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "try" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/try/2025-06-22/try-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/try/2025-06-22/try-20250622-git.tgz";
           sha256 = "0w3c7s6rma1whlgaxz5sxmr9vkp914yanyh1dy64j9kzxyw9h40h";
           system = "try";
           asd = "try";
@@ -102803,7 +102803,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "try.asdf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/try/2025-06-22/try-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/try/2025-06-22/try-20250622-git.tgz";
           sha256 = "0w3c7s6rma1whlgaxz5sxmr9vkp914yanyh1dy64j9kzxyw9h40h";
           system = "try.asdf";
           asd = "try.asdf";
@@ -102823,7 +102823,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "tsqueue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/tsqueue/2022-11-06/tsqueue-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/tsqueue/2022-11-06/tsqueue-20221106-git.tgz";
           sha256 = "1ifq53b95a1sdpgx1hlz31pjbh0z6izh3wrgsiqvzgkbiyxq513q";
           system = "tsqueue";
           asd = "tsqueue";
@@ -102843,7 +102843,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ttt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ttt/2022-07-07/ttt-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ttt/2022-07-07/ttt-20220707-git.tgz";
           sha256 = "0g6p8gpl8hl427mfrrf8824zq6wmkj11v1xq7pyv7v0b5cwp5ccv";
           system = "ttt";
           asd = "ttt";
@@ -102863,7 +102863,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "twfy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/twfy/2013-04-20/twfy-20130420-git.tgz";
+          url = "https://beta.quicklisp.org/archive/twfy/2013-04-20/twfy-20130420-git.tgz";
           sha256 = "1srns5ayg7q8dzviizgm7j767dxbbyzh2ca8a5wdz3bc0qmwrsbs";
           system = "twfy";
           asd = "twfy";
@@ -102886,7 +102886,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "twitter-mongodb-driver" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz";
           sha256 = "07l86c63ssahpz3s9f7d99mbzmh60askkpdrhjrdbzd1vxlwkhcr";
           system = "twitter-mongodb-driver";
           asd = "twitter-mongodb-driver";
@@ -102909,7 +102909,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "type-i" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/type-i/2023-02-14/type-i-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/type-i/2023-02-14/type-i-20230214-git.tgz";
           sha256 = "1y9dh1iziv3gwpf5yls0amwjhdqjidfibcla04mz6dqdv3zrg3hs";
           system = "type-i";
           asd = "type-i";
@@ -102932,7 +102932,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "type-i.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/type-i/2023-02-14/type-i-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/type-i/2023-02-14/type-i-20230214-git.tgz";
           sha256 = "1y9dh1iziv3gwpf5yls0amwjhdqjidfibcla04mz6dqdv3zrg3hs";
           system = "type-i.test";
           asd = "type-i.test";
@@ -102955,7 +102955,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "type-r" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/type-r/2019-12-27/type-r-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/type-r/2019-12-27/type-r-20191227-git.tgz";
           sha256 = "1arsxc2539rg8vbrdirz4xxj1b06mc6g6rqndz7a02g127qvk2sm";
           system = "type-r";
           asd = "type-r";
@@ -102978,7 +102978,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "type-r.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/type-r/2019-12-27/type-r-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/type-r/2019-12-27/type-r-20191227-git.tgz";
           sha256 = "1arsxc2539rg8vbrdirz4xxj1b06mc6g6rqndz7a02g127qvk2sm";
           system = "type-r.test";
           asd = "type-r.test";
@@ -103001,7 +103001,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "type-templates" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/type-templates/2025-06-22/type-templates-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/type-templates/2025-06-22/type-templates-20250622-git.tgz";
           sha256 = "1kc88zhvh2xvx73sxqq58kip31xa9ial1y1vi8rrw8za3bf31nc3";
           system = "type-templates";
           asd = "type-templates";
@@ -103025,7 +103025,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "typo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/typo/2025-06-22/typo-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/typo/2025-06-22/typo-20250622-git.tgz";
           sha256 = "12r0jwhl41mfgb3wkikisvp5qf35nmajmvqv2gjjph7j2p5qh8h0";
           system = "typo";
           asd = "typo";
@@ -103053,7 +103053,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "typo.test-suite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/typo/2025-06-22/typo-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/typo/2025-06-22/typo-20250622-git.tgz";
           sha256 = "12r0jwhl41mfgb3wkikisvp5qf35nmajmvqv2gjjph7j2p5qh8h0";
           system = "typo.test-suite";
           asd = "typo.test-suite";
@@ -103076,7 +103076,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "uax-14" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uax-14/2025-06-22/uax-14-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/uax-14/2025-06-22/uax-14-20250622-git.tgz";
           sha256 = "1a1lzmmfqhxyg68fg0q0rpcpx57bv48svwgm5aq3ffi03j2wyy1l";
           system = "uax-14";
           asd = "uax-14";
@@ -103096,7 +103096,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "uax-14-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uax-14/2025-06-22/uax-14-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/uax-14/2025-06-22/uax-14-20250622-git.tgz";
           sha256 = "1a1lzmmfqhxyg68fg0q0rpcpx57bv48svwgm5aq3ffi03j2wyy1l";
           system = "uax-14-test";
           asd = "uax-14-test";
@@ -103120,7 +103120,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "uax-15" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uax-15/2024-10-12/uax-15-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/uax-15/2024-10-12/uax-15-20241012-git.tgz";
           sha256 = "12qkq4r6qv5cn535bwpkq7zfahajlrv8v7661x4wzf4pp0avx7n6";
           system = "uax-15";
           asd = "uax-15";
@@ -103141,7 +103141,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "uax-9" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uax-9/2023-10-21/uax-9-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/uax-9/2023-10-21/uax-9-20231021-git.tgz";
           sha256 = "1kbq8v45pxhmwqn6is5lfsp51h80kns4s1cqbh9z0xdmxzw63ip1";
           system = "uax-9";
           asd = "uax-9";
@@ -103161,7 +103161,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "uax-9-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uax-9/2023-10-21/uax-9-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/uax-9/2023-10-21/uax-9-20231021-git.tgz";
           sha256 = "1kbq8v45pxhmwqn6is5lfsp51h80kns4s1cqbh9z0xdmxzw63ip1";
           system = "uax-9-test";
           asd = "uax-9-test";
@@ -103185,7 +103185,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ubiquitous" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ubiquitous/2023-10-21/ubiquitous-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ubiquitous/2023-10-21/ubiquitous-20231021-git.tgz";
           sha256 = "02q6yz9j374q23avi06lddy6gkzza0xn3855n7dqgy34fv1shw1i";
           system = "ubiquitous";
           asd = "ubiquitous";
@@ -103206,7 +103206,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ubiquitous-concurrent" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ubiquitous/2023-10-21/ubiquitous-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ubiquitous/2023-10-21/ubiquitous-20231021-git.tgz";
           sha256 = "02q6yz9j374q23avi06lddy6gkzza0xn3855n7dqgy34fv1shw1i";
           system = "ubiquitous-concurrent";
           asd = "ubiquitous-concurrent";
@@ -103229,7 +103229,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ucons" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ucons/2023-06-18/ucons-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ucons/2023-06-18/ucons-20230618-git.tgz";
           sha256 = "0pisf8sswh1wainabpnczla8c98kr0lv0qvh0zapwkf1lq1drzp1";
           system = "ucons";
           asd = "ucons";
@@ -103255,7 +103255,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ucw" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz";
           sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z";
           system = "ucw";
           asd = "ucw";
@@ -103279,7 +103279,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ucw-core" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz";
           sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z";
           system = "ucw-core";
           asd = "ucw-core";
@@ -103312,7 +103312,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ucw-core.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz";
           sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z";
           system = "ucw-core.test";
           asd = "ucw-core";
@@ -103339,7 +103339,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ucw.examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz";
           sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z";
           system = "ucw.examples";
           asd = "ucw";
@@ -103359,7 +103359,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ucw.httpd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz";
           sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z";
           system = "ucw.httpd";
           asd = "ucw-core";
@@ -103384,7 +103384,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ucw.manual-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz";
           sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z";
           system = "ucw.manual-examples";
           asd = "ucw";
@@ -103404,7 +103404,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "uffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz";
           sha256 = "0ywly04k8vir39ld7ids80yjn34y3y3mlpky1pr1fh9p8q412a85";
           system = "uffi";
           asd = "uffi";
@@ -103422,7 +103422,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "uffi-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz";
           sha256 = "0ywly04k8vir39ld7ids80yjn34y3y3mlpky1pr1fh9p8q412a85";
           system = "uffi-tests";
           asd = "uffi-tests";
@@ -103442,7 +103442,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ufo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ufo/2021-08-07/ufo-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ufo/2021-08-07/ufo-20210807-git.tgz";
           sha256 = "0bbq4pjnbmf1zpmh11jlriv0qnvrhw1xxnjj2y35gk75rr8rvizy";
           system = "ufo";
           asd = "ufo";
@@ -103462,7 +103462,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ufo-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ufo/2021-08-07/ufo-20210807-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ufo/2021-08-07/ufo-20210807-git.tgz";
           sha256 = "0bbq4pjnbmf1zpmh11jlriv0qnvrhw1xxnjj2y35gk75rr8rvizy";
           system = "ufo-test";
           asd = "ufo-test";
@@ -103487,7 +103487,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ugly-tiny-infix-macro" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ugly-tiny-infix-macro/2016-08-25/ugly-tiny-infix-macro-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ugly-tiny-infix-macro/2016-08-25/ugly-tiny-infix-macro-20160825-git.tgz";
           sha256 = "15bbnr3kzy3p35skm6bkyyl5ck4d264am0zyjsix5k58d9fli3ii";
           system = "ugly-tiny-infix-macro";
           asd = "ugly-tiny-infix-macro";
@@ -103507,7 +103507,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "umbra" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/umbra/2022-07-07/umbra-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/umbra/2022-07-07/umbra-20220707-git.tgz";
           sha256 = "125bsf69gzdy0r6jh6fz8000rqww1rji354x0yrgmkz9x3mvz4k4";
           system = "umbra";
           asd = "umbra";
@@ -103531,7 +103531,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "umlisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/umlisp/2021-04-11/umlisp-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/umlisp/2021-04-11/umlisp-20210411-git.tgz";
           sha256 = "1yyyn1qka4iw3hwii7i8k939dbwvhn543m8qclk2ajggkdky4mqb";
           system = "umlisp";
           asd = "umlisp";
@@ -103556,7 +103556,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "umlisp-orf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/umlisp-orf/2015-09-23/umlisp-orf-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/umlisp-orf/2015-09-23/umlisp-orf-20150923-git.tgz";
           sha256 = "187i9rcj3rymi8hmlvglvig7yqandzzx57x0rzr4yfv8sgnb82qx";
           system = "umlisp-orf";
           asd = "umlisp-orf";
@@ -103581,7 +103581,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "umlisp-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/umlisp/2021-04-11/umlisp-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/umlisp/2021-04-11/umlisp-20210411-git.tgz";
           sha256 = "1yyyn1qka4iw3hwii7i8k939dbwvhn543m8qclk2ajggkdky4mqb";
           system = "umlisp-tests";
           asd = "umlisp-tests";
@@ -103604,7 +103604,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "unboxables" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/unboxables/2023-10-21/unboxables-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/unboxables/2023-10-21/unboxables-20231021-git.tgz";
           sha256 = "099qcsc9q9q5cz2qlvkylc2g8g80fqzrxyq4lc072bmw96wy27fs";
           system = "unboxables";
           asd = "unboxables";
@@ -103628,7 +103628,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "uncommon-lisp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "uncommon-lisp";
           asd = "uncommon-lisp";
@@ -103648,7 +103648,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "uncursed" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uncursed/2022-02-20/uncursed-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/uncursed/2022-02-20/uncursed-20220220-git.tgz";
           sha256 = "1hydiwh12851rrm12y0a6pb2jml2cjdk8wxvz4c00d2xwraqc6mr";
           system = "uncursed";
           asd = "uncursed";
@@ -103674,7 +103674,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "uncursed-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uncursed/2022-02-20/uncursed-20220220-git.tgz";
+          url = "https://beta.quicklisp.org/archive/uncursed/2022-02-20/uncursed-20220220-git.tgz";
           sha256 = "1hydiwh12851rrm12y0a6pb2jml2cjdk8wxvz4c00d2xwraqc6mr";
           system = "uncursed-examples";
           asd = "uncursed-examples";
@@ -103697,7 +103697,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "unifgram" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/paiprolog/2018-02-28/paiprolog-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/paiprolog/2018-02-28/paiprolog-20180228-git.tgz";
           sha256 = "1nxz01i6f8s920gm69r2kwjdpq9pli8b2ayqwijhzgjwi0r4jj9r";
           system = "unifgram";
           asd = "unifgram";
@@ -103717,7 +103717,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "unit-formulas" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/unit-formula/2018-07-11/unit-formula-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/unit-formula/2018-07-11/unit-formula-20180711-git.tgz";
           sha256 = "1j9zcnyj2ik7f2130pkfwr2bhh5ldlgc83n1024w0dy95ksl1f20";
           system = "unit-formulas";
           asd = "unit-formulas";
@@ -103740,7 +103740,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "unit-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz";
+          url = "https://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz";
           sha256 = "11hpksz56iqkv7jw25p2a8r3n9dj922fyarn16d98589g6hdskj9";
           system = "unit-test";
           asd = "unit-test";
@@ -103758,7 +103758,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "universal-config" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/universal-config/2018-04-30/universal-config-20180430-git.tgz";
+          url = "https://beta.quicklisp.org/archive/universal-config/2018-04-30/universal-config-20180430-git.tgz";
           sha256 = "17sjd37jwsi47yhsj9qsnfyhyrlhlxdrxa4szklwjh489hf01hd0";
           system = "universal-config";
           asd = "universal-config";
@@ -103781,7 +103781,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "unix-options" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz";
+          url = "https://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz";
           sha256 = "17q7irrbmaja7gj86h01ali9n9p782jxisgkb1r2q5ajf4lr1rsv";
           system = "unix-options";
           asd = "unix-options";
@@ -103799,7 +103799,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "unix-opts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/unix-opts/2021-01-24/unix-opts-20210124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/unix-opts/2021-01-24/unix-opts-20210124-git.tgz";
           sha256 = "16mcqpzwrz808p9n3wwl99ckg3hg7yihw08y1i4l7c92aldbkasq";
           system = "unix-opts";
           asd = "unix-opts";
@@ -103817,7 +103817,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "unix-sockets" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-unix-sockets/2024-10-12/cl-unix-sockets-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-unix-sockets/2024-10-12/cl-unix-sockets-20241012-git.tgz";
           sha256 = "09l3032p3gavyin1hn45yqv6b3vrg74vzcz85ppqg4nzpmp44845";
           system = "unix-sockets";
           asd = "unix-sockets";
@@ -103844,7 +103844,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "unix-sockets.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-unix-sockets/2024-10-12/cl-unix-sockets-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-unix-sockets/2024-10-12/cl-unix-sockets-20241012-git.tgz";
           sha256 = "09l3032p3gavyin1hn45yqv6b3vrg74vzcz85ppqg4nzpmp44845";
           system = "unix-sockets.tests";
           asd = "unix-sockets.tests";
@@ -103870,7 +103870,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "uri-template" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uri-template/2019-08-13/uri-template-1.3.1.tgz";
+          url = "https://beta.quicklisp.org/archive/uri-template/2019-08-13/uri-template-1.3.1.tgz";
           sha256 = "06n5kmjax64kv57ng5g2030a67z131i4wm53npg9zq2xlj9sprd8";
           system = "uri-template";
           asd = "uri-template";
@@ -103894,7 +103894,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "uri-template.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uri-template/2019-08-13/uri-template-1.3.1.tgz";
+          url = "https://beta.quicklisp.org/archive/uri-template/2019-08-13/uri-template-1.3.1.tgz";
           sha256 = "06n5kmjax64kv57ng5g2030a67z131i4wm53npg9zq2xlj9sprd8";
           system = "uri-template.test";
           asd = "uri-template.test";
@@ -103917,7 +103917,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "url-rewrite" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/url-rewrite/2017-12-27/url-rewrite-20171227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/url-rewrite/2017-12-27/url-rewrite-20171227-git.tgz";
           sha256 = "0d3awcb938ajiylyfnbqsc7nndy6csx0qz1bcyr4f0p862w3xbqf";
           system = "url-rewrite";
           asd = "url-rewrite";
@@ -103937,7 +103937,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "userial" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/userial/2011-06-19/userial_0.8.2011.06.02.tgz";
+          url = "https://beta.quicklisp.org/archive/userial/2011-06-19/userial_0.8.2011.06.02.tgz";
           sha256 = "08f8hc1f81gyn4br9p732p8r2gl6cvccd4yzc9ydz4i0ijclpp2m";
           system = "userial";
           asd = "userial";
@@ -103961,7 +103961,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "userial-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/userial/2011-06-19/userial_0.8.2011.06.02.tgz";
+          url = "https://beta.quicklisp.org/archive/userial/2011-06-19/userial_0.8.2011.06.02.tgz";
           sha256 = "08f8hc1f81gyn4br9p732p8r2gl6cvccd4yzc9ydz4i0ijclpp2m";
           system = "userial-tests";
           asd = "userial-tests";
@@ -103984,7 +103984,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "usocket" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz";
+          url = "https://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz";
           sha256 = "13j2hyl7j06vl8hh3930wd3bi2p0pcg4dcd243al31fgw4m0bvag";
           system = "usocket";
           asd = "usocket";
@@ -104002,7 +104002,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "usocket-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz";
+          url = "https://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz";
           sha256 = "13j2hyl7j06vl8hh3930wd3bi2p0pcg4dcd243al31fgw4m0bvag";
           system = "usocket-server";
           asd = "usocket-server";
@@ -104023,7 +104023,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "usocket-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz";
+          url = "https://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz";
           sha256 = "13j2hyl7j06vl8hh3930wd3bi2p0pcg4dcd243al31fgw4m0bvag";
           system = "usocket-test";
           asd = "usocket-test";
@@ -104046,7 +104046,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "utf8-input-stream" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utf8-input-stream/2025-06-22/utf8-input-stream-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/utf8-input-stream/2025-06-22/utf8-input-stream-20250622-git.tgz";
           sha256 = "0in5d1n8smqshkm640h85i5c3pwwyl4i9j5vh1jrpl8mnyblvqrw";
           system = "utf8-input-stream";
           asd = "utf8-input-stream";
@@ -104069,7 +104069,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "utf8-input-stream.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utf8-input-stream/2025-06-22/utf8-input-stream-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/utf8-input-stream/2025-06-22/utf8-input-stream-20250622-git.tgz";
           sha256 = "0in5d1n8smqshkm640h85i5c3pwwyl4i9j5vh1jrpl8mnyblvqrw";
           system = "utf8-input-stream.tests";
           asd = "utf8-input-stream.tests";
@@ -104093,7 +104093,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "utilities.binary-dump" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utilities.binary-dump/2018-12-10/utilities.binary-dump-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/utilities.binary-dump/2018-12-10/utilities.binary-dump-20181210-git.tgz";
           sha256 = "1l20r1782bskyy50ca6vsyxrvbxlgfq4nm33wl8as761dcjpj4d4";
           system = "utilities.binary-dump";
           asd = "utilities.binary-dump";
@@ -104117,7 +104117,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "utilities.print-items" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utilities.print-items/2022-11-06/utilities.print-items-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/utilities.print-items/2022-11-06/utilities.print-items-20221106-git.tgz";
           sha256 = "0qn0w7cyl76c3ssipqsx4ngb1641ajfkaihnb31w374zrzbns8wi";
           system = "utilities.print-items";
           asd = "utilities.print-items";
@@ -104135,7 +104135,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "utilities.print-tree" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utilities.print-tree/2022-11-06/utilities.print-tree-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/utilities.print-tree/2022-11-06/utilities.print-tree-20221106-git.tgz";
           sha256 = "0i7371qvlnwjcybh3c2ac88xz39vjdynhgxwz4acjbcnsw0jqsls";
           system = "utilities.print-tree";
           asd = "utilities.print-tree";
@@ -104153,7 +104153,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "utility" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utility/2019-02-02/utility-20190202-git.tgz";
+          url = "https://beta.quicklisp.org/archive/utility/2019-02-02/utility-20190202-git.tgz";
           sha256 = "0nc83kxp2c0wy5ai7dm6w4anx5266j99pxzr0c7fxgllc7d0g1qd";
           system = "utility";
           asd = "utility";
@@ -104173,7 +104173,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "utility-arguments" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utility-arguments/2016-12-04/utility-arguments-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/utility-arguments/2016-12-04/utility-arguments-20161204-git.tgz";
           sha256 = "0dzbzzrla9709zl5dqdfw02mxa3rvcpca466qrcprgs3hnxdvgwb";
           system = "utility-arguments";
           asd = "utility-arguments";
@@ -104193,7 +104193,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "utils-kt" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utils-kt/2020-02-18/utils-kt-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/utils-kt/2020-02-18/utils-kt-20200218-git.tgz";
           sha256 = "016x3w034brz02z9mrsrkhk2djizg3yqsvhl9k62xqcnpy3b87dn";
           system = "utils-kt";
           asd = "utils-kt";
@@ -104213,7 +104213,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "utm" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utm/2025-06-22/utm-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/utm/2025-06-22/utm-20250622-git.tgz";
           sha256 = "1fvbbmc6z1py9zixx3h0mb2zrb6v92km8bf7k8vvk0lj2p0kjjmw";
           system = "utm";
           asd = "utm";
@@ -104233,7 +104233,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "utm-ups" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utm-ups/2023-06-18/utm-ups-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/utm-ups/2023-06-18/utm-ups-20230618-git.tgz";
           sha256 = "19nnnqagfg1c1vzwlqpp8mq2d0hrk8r6r07a46nvdyzmwbnmbwyr";
           system = "utm-ups";
           asd = "utm-ups";
@@ -104253,7 +104253,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "utm.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/utm/2025-06-22/utm-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/utm/2025-06-22/utm-20250622-git.tgz";
           sha256 = "1fvbbmc6z1py9zixx3h0mb2zrb6v92km8bf7k8vvk0lj2p0kjjmw";
           system = "utm.test";
           asd = "utm.test";
@@ -104276,7 +104276,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "uuid" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz";
+          url = "https://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz";
           sha256 = "1ncwhyw0zggwpkzjsw7d4pkrlldi34xvb69c0bzxmyz2krg8rpx0";
           system = "uuid";
           asd = "uuid";
@@ -104297,7 +104297,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "uuidv7" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/uuidv7.lisp/2024-10-12/uuidv7.lisp-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/uuidv7.lisp/2024-10-12/uuidv7.lisp-20241012-git.tgz";
           sha256 = "1lirb92a1b3hpf66gndas4yix0smfckg9arzk69lpcvxsidzc66l";
           system = "uuidv7";
           asd = "uuidv7";
@@ -104317,7 +104317,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "validate-list" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/validate-list/2021-04-11/validate-list-20210411-git.tgz";
+          url = "https://beta.quicklisp.org/archive/validate-list/2021-04-11/validate-list-20210411-git.tgz";
           sha256 = "1rb7glqvlaz84cfd2wjk49si9jh4ffysmva5007gjhqfhr9z23lj";
           system = "validate-list";
           asd = "validate-list";
@@ -104341,7 +104341,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "varint" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/protobuf/2023-06-18/protobuf-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/protobuf/2023-06-18/protobuf-20230618-git.tgz";
           sha256 = "0pp8i2i72p6cng11sxj83klw45jqv05l5024h7c2rl0pvsg8f6bc";
           system = "varint";
           asd = "varint";
@@ -104364,7 +104364,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "varjo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz";
+          url = "https://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz";
           sha256 = "0gga4wq74qxql4zxh8zq1ab2xnsz8ygdaf8wxy7w15vv4czgamr9";
           system = "varjo";
           asd = "varjo";
@@ -104393,7 +104393,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "varjo.import" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz";
+          url = "https://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz";
           sha256 = "0gga4wq74qxql4zxh8zq1ab2xnsz8ygdaf8wxy7w15vv4czgamr9";
           system = "varjo.import";
           asd = "varjo.import";
@@ -104419,7 +104419,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "varjo.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz";
+          url = "https://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz";
           sha256 = "0gga4wq74qxql4zxh8zq1ab2xnsz8ygdaf8wxy7w15vv4czgamr9";
           system = "varjo.tests";
           asd = "varjo.tests";
@@ -104443,7 +104443,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "varray" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "varray";
           asd = "varray";
@@ -104468,7 +104468,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vas-string-metrics" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vas-string-metrics/2021-12-09/vas-string-metrics-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vas-string-metrics/2021-12-09/vas-string-metrics-20211209-git.tgz";
           sha256 = "1yvkwc939dckv070nlgqfj5ys9ii2rm32m5wfx7qxdjrb4n19sx9";
           system = "vas-string-metrics";
           asd = "vas-string-metrics";
@@ -104486,7 +104486,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vecto" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vecto/2021-12-30/vecto-1.6.tgz";
+          url = "https://beta.quicklisp.org/archive/vecto/2021-12-30/vecto-1.6.tgz";
           sha256 = "1s3ii9absili7yiv89byjikxcxlbagsvcxdwkxgsm1rahgggyk5x";
           system = "vecto";
           asd = "vecto";
@@ -104508,7 +104508,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vectometry" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vecto/2021-12-30/vecto-1.6.tgz";
+          url = "https://beta.quicklisp.org/archive/vecto/2021-12-30/vecto-1.6.tgz";
           sha256 = "1s3ii9absili7yiv89byjikxcxlbagsvcxdwkxgsm1rahgggyk5x";
           system = "vectometry";
           asd = "vectometry";
@@ -104528,7 +104528,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vectors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vectors/2017-12-27/vectors-20171227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vectors/2017-12-27/vectors-20171227-git.tgz";
           sha256 = "1sflb1wz6fcszdbqrcfh52bp5ch6wbizzp7jx97ni8lrqq2r6cqy";
           system = "vectors";
           asd = "vectors";
@@ -104548,7 +104548,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vellum" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vellum/2025-06-22/vellum-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vellum/2025-06-22/vellum-20250622-git.tgz";
           sha256 = "0bc8fdyzq01kfilz7zyibq8dghzp1gcvdn4681r5hzpsslprym44";
           system = "vellum";
           asd = "vellum";
@@ -104578,7 +104578,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vellum-binary" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vellum-binary/2024-10-12/vellum-binary-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vellum-binary/2024-10-12/vellum-binary-20241012-git.tgz";
           sha256 = "15kv5vzzrf6c3nvibz3p3d9arxmvwska37p5s13g9d2z1k3wyag1";
           system = "vellum-binary";
           asd = "vellum-binary";
@@ -104606,7 +104606,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vellum-clim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vellum-clim/2021-05-31/vellum-clim-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vellum-clim/2021-05-31/vellum-clim-20210531-git.tgz";
           sha256 = "06g1pw0r60yd13hzbjrbpa1p0pnlwkqfn06ipk1gs0kc76gf2im5";
           system = "vellum-clim";
           asd = "vellum-clim";
@@ -104630,7 +104630,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vellum-csv" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vellum-csv/2025-06-22/vellum-csv-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vellum-csv/2025-06-22/vellum-csv-20250622-git.tgz";
           sha256 = "0kq5qw8dma90j75rmyid4gdz21asdp4x0s8dx3a3yk990xg9g6fc";
           system = "vellum-csv";
           asd = "vellum-csv";
@@ -104657,7 +104657,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vellum-csv-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vellum-csv/2025-06-22/vellum-csv-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vellum-csv/2025-06-22/vellum-csv-20250622-git.tgz";
           sha256 = "0kq5qw8dma90j75rmyid4gdz21asdp4x0s8dx3a3yk990xg9g6fc";
           system = "vellum-csv-tests";
           asd = "vellum-csv-tests";
@@ -104681,7 +104681,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vellum-postmodern" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vellum-postmodern/2024-10-12/vellum-postmodern-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vellum-postmodern/2024-10-12/vellum-postmodern-20241012-git.tgz";
           sha256 = "1q7s57vfcs01nl03kjkyjk9ya68cnl9p6mf1z864imfd04ssy9gr";
           system = "vellum-postmodern";
           asd = "vellum-postmodern";
@@ -104710,7 +104710,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vellum-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vellum/2025-06-22/vellum-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vellum/2025-06-22/vellum-20250622-git.tgz";
           sha256 = "0bc8fdyzq01kfilz7zyibq8dghzp1gcvdn4681r5hzpsslprym44";
           system = "vellum-tests";
           asd = "vellum-tests";
@@ -104734,7 +104734,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "veq" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-veq/2023-10-21/cl-veq-v4.5.5.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-veq/2023-10-21/cl-veq-v4.5.5.tgz";
           sha256 = "0sk6rvqck47ym7ryy0smya1vwgpksxzal1xcwmwl106nxi9l7m34";
           system = "veq";
           asd = "veq";
@@ -104754,7 +104754,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "verbose" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/verbose/2025-06-22/verbose-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/verbose/2025-06-22/verbose-20250622-git.tgz";
           sha256 = "1zpfbnfa4ii093aij4bzay6nm9kgms2smksrdj1d9kkl5qbrviyz";
           system = "verbose";
           asd = "verbose";
@@ -104780,7 +104780,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vernacular" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vernacular/2024-10-12/vernacular-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vernacular/2024-10-12/vernacular-20241012-git.tgz";
           sha256 = "09jz68lms82vxq672pars6hqapvdl4z8z2v1s9kmzvgxm2khw8pw";
           system = "vernacular";
           asd = "vernacular";
@@ -104809,7 +104809,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "verrazano" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/verrazano/2012-09-09/verrazano-20120909-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/verrazano/2012-09-09/verrazano-20120909-darcs.tgz";
           sha256 = "0d7qv5jwv5p1r64g4rfqb844b5fh71p82b5983gjz0a5p391p270";
           system = "verrazano";
           asd = "verrazano";
@@ -104839,7 +104839,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "verrazano-runtime" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/verrazano/2012-09-09/verrazano-20120909-darcs.tgz";
+          url = "https://beta.quicklisp.org/archive/verrazano/2012-09-09/verrazano-20120909-darcs.tgz";
           sha256 = "0d7qv5jwv5p1r64g4rfqb844b5fh71p82b5983gjz0a5p391p270";
           system = "verrazano-runtime";
           asd = "verrazano-runtime";
@@ -104859,7 +104859,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vertex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vertex/2015-06-08/vertex-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vertex/2015-06-08/vertex-20150608-git.tgz";
           sha256 = "0g3ck1kvp6x9874ffizjz3fsd35a3m4hcr2x5gq9fdql680ic4k2";
           system = "vertex";
           asd = "vertex";
@@ -104883,7 +104883,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vertex-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vertex/2015-06-08/vertex-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vertex/2015-06-08/vertex-20150608-git.tgz";
           sha256 = "0g3ck1kvp6x9874ffizjz3fsd35a3m4hcr2x5gq9fdql680ic4k2";
           system = "vertex-test";
           asd = "vertex-test";
@@ -104906,7 +104906,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vex" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/april/2025-06-22/april-20250622-git.tgz";
           sha256 = "0rj75wfmwld2r1w4lafr9fcw6awy9nmh8k1dn2z8gdc778ydr3jf";
           system = "vex";
           asd = "vex";
@@ -104933,7 +104933,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vgplot" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vgplot/2022-07-07/vgplot-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vgplot/2022-07-07/vgplot-20220707-git.tgz";
           sha256 = "1vc5fd787xa8831wjbmwrpg17f9isi5k8dmb85fsysz47plbvi1y";
           system = "vgplot";
           asd = "vgplot";
@@ -104957,7 +104957,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vivid-colors" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
           sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww";
           system = "vivid-colors";
           asd = "vivid-colors";
@@ -104986,7 +104986,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vivid-colors.content" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
           sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww";
           system = "vivid-colors.content";
           asd = "vivid-colors.content";
@@ -105013,7 +105013,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vivid-colors.content.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
           sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww";
           system = "vivid-colors.content.test";
           asd = "vivid-colors.content.test";
@@ -105036,7 +105036,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vivid-colors.dispatch" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
           sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww";
           system = "vivid-colors.dispatch";
           asd = "vivid-colors.dispatch";
@@ -105060,7 +105060,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vivid-colors.dispatch.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
           sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww";
           system = "vivid-colors.dispatch.test";
           asd = "vivid-colors.dispatch.test";
@@ -105083,7 +105083,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vivid-colors.queue" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
           sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww";
           system = "vivid-colors.queue";
           asd = "vivid-colors.queue";
@@ -105107,7 +105107,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vivid-colors.queue.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
           sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww";
           system = "vivid-colors.queue.test";
           asd = "vivid-colors.queue.test";
@@ -105130,7 +105130,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vivid-colors.shared" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
           sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww";
           system = "vivid-colors.shared";
           asd = "vivid-colors.shared";
@@ -105150,7 +105150,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vivid-colors.shared.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
           sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww";
           system = "vivid-colors.shared.test";
           asd = "vivid-colors.shared.test";
@@ -105173,7 +105173,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vivid-colors.stream" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
           sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww";
           system = "vivid-colors.stream";
           asd = "vivid-colors.stream";
@@ -105201,7 +105201,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vivid-colors.stream.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
           sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww";
           system = "vivid-colors.stream.test";
           asd = "vivid-colors.stream.test";
@@ -105224,7 +105224,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vivid-colors.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz";
           sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww";
           system = "vivid-colors.test";
           asd = "vivid-colors.test";
@@ -105247,7 +105247,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vivid-diff" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vivid-diff/2022-07-07/vivid-diff-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vivid-diff/2022-07-07/vivid-diff-20220707-git.tgz";
           sha256 = "195hqx304x4na56qpiblz30ahp1qj55kan50mkr0xyjhcx75nsdk";
           system = "vivid-diff";
           asd = "vivid-diff";
@@ -105273,7 +105273,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vivid-diff.test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vivid-diff/2022-07-07/vivid-diff-20220707-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vivid-diff/2022-07-07/vivid-diff-20220707-git.tgz";
           sha256 = "195hqx304x4na56qpiblz30ahp1qj55kan50mkr0xyjhcx75nsdk";
           system = "vivid-diff.test";
           asd = "vivid-diff.test";
@@ -105297,7 +105297,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vk" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vk/2023-02-14/vk-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vk/2023-02-14/vk-20230214-git.tgz";
           sha256 = "14986kss2rggdjiql3rr34qnfjwb8w73j0ggn6c3w4y9dny3l31j";
           system = "vk";
           asd = "vk";
@@ -105321,7 +105321,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "voipms" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-voipms/2025-06-22/cl-voipms-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-voipms/2025-06-22/cl-voipms-20250622-git.tgz";
           sha256 = "0rwb9nww6n6xz219c44aaj321lqhm4bhq49cn6ijywqns51ymnj7";
           system = "voipms";
           asd = "voipms";
@@ -105346,7 +105346,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vom" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vom/2024-10-12/vom-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vom/2024-10-12/vom-20241012-git.tgz";
           sha256 = "1rnrr69h3j8phm6z3cfagv2bjh71wbzx9acnas9fn33j3q94gr95";
           system = "vom";
           asd = "vom";
@@ -105364,7 +105364,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vom-json" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vom-json/2020-06-10/vom-json-20200610-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vom-json/2020-06-10/vom-json-20200610-git.tgz";
           sha256 = "14b39kqbjpibh545gh9mb6w5g0kz7fhd5zxfmlf9a0fpdbwhw41c";
           system = "vom-json";
           asd = "vom-json";
@@ -105388,7 +105388,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vorbisfile-ffi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/mixalot/2025-06-22/mixalot-20250622-git.tgz";
           sha256 = "0w17m06rf8masgslnzva6c9dnbim8g99w2c4m93dhfc0bm2m98wb";
           system = "vorbisfile-ffi";
           asd = "vorbisfile-ffi";
@@ -105411,7 +105411,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "vp-trees" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/vp-trees/2023-02-14/vp-trees-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/vp-trees/2023-02-14/vp-trees-20230214-git.tgz";
           sha256 = "0fk41c97p5ck5g9nsvq6h9hzxz7yssyqz3v4f4qiavdnw6a9va1m";
           system = "vp-trees";
           asd = "vp-trees";
@@ -105434,7 +105434,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "wallstreetflets" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wallstreetflets/2021-12-09/wallstreetflets-20211209-git.tgz";
+          url = "https://beta.quicklisp.org/archive/wallstreetflets/2021-12-09/wallstreetflets-20211209-git.tgz";
           sha256 = "0d9anws4gk16an1kl4kads6lhm8a4mpiwxg74i3235d5874gbdj5";
           system = "wallstreetflets";
           asd = "wallstreetflets";
@@ -105458,7 +105458,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "wasm-encoder" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wasm-encoder/2021-06-30/wasm-encoder-20210630-git.tgz";
+          url = "https://beta.quicklisp.org/archive/wasm-encoder/2021-06-30/wasm-encoder-20210630-git.tgz";
           sha256 = "1h094d8www9ydg96fjj17pi0lb63ikgyp5237cl6n3rmg4jpy9w6";
           system = "wasm-encoder";
           asd = "wasm-encoder";
@@ -105486,7 +105486,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "water" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/water/2019-01-07/water-20190107-git.tgz";
+          url = "https://beta.quicklisp.org/archive/water/2019-01-07/water-20190107-git.tgz";
           sha256 = "0w9b6mh10rfv7rg1zq28pivad6435i9h839km6nlbhq9xmx0g27s";
           system = "water";
           asd = "water";
@@ -105506,7 +105506,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "wayflan" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wayflan/2025-06-22/wayflan-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/wayflan/2025-06-22/wayflan-20250622-git.tgz";
           sha256 = "0y6hzskp1vgaigzj5b3i695sc6dn5mk7nlxs21nh5ybzmf4chhyy";
           system = "wayflan";
           asd = "wayflan";
@@ -105529,7 +105529,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "wayflan-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wayflan/2025-06-22/wayflan-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/wayflan/2025-06-22/wayflan-20250622-git.tgz";
           sha256 = "0y6hzskp1vgaigzj5b3i695sc6dn5mk7nlxs21nh5ybzmf4chhyy";
           system = "wayflan-client";
           asd = "wayflan-client";
@@ -105556,7 +105556,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "webactions" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz";
+          url = "https://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz";
           sha256 = "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa";
           system = "webactions";
           asd = "webactions";
@@ -105580,7 +105580,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "webapi" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/webapi/2023-06-18/webapi-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/webapi/2023-06-18/webapi-20230618-git.tgz";
           sha256 = "1irp18a0rq61xfr3944ahy2spj0095l15xf7j0245jd0qw7gmg03";
           system = "webapi";
           asd = "webapi";
@@ -105607,7 +105607,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "weblocks-clsql" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz";
           sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya";
           system = "weblocks-clsql";
           asd = "weblocks-clsql";
@@ -105634,7 +105634,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "weblocks-memory" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz";
           sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya";
           system = "weblocks-memory";
           asd = "weblocks-memory";
@@ -105658,7 +105658,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "weblocks-montezuma" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz";
           sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya";
           system = "weblocks-montezuma";
           asd = "weblocks-montezuma";
@@ -105681,7 +105681,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "weblocks-perec" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz";
           sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya";
           system = "weblocks-perec";
           asd = "weblocks-perec";
@@ -105704,7 +105704,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "weblocks-prevalence" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz";
           sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya";
           system = "weblocks-prevalence";
           asd = "weblocks-prevalence";
@@ -105731,7 +105731,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "weblocks-scripts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/weblocks/2021-10-20/weblocks-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/weblocks/2021-10-20/weblocks-20211020-git.tgz";
           sha256 = "1hilpzm1p3hrp2hxghjr9y8sy5a9bgk96n8kc8bphvn7dvlbm78j";
           system = "weblocks-scripts";
           asd = "weblocks-scripts";
@@ -105754,7 +105754,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "weblocks-stores" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz";
           sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya";
           system = "weblocks-stores";
           asd = "weblocks-stores";
@@ -105778,7 +105778,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "weblocks-util" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/weblocks/2021-10-20/weblocks-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/weblocks/2021-10-20/weblocks-20211020-git.tgz";
           sha256 = "1hilpzm1p3hrp2hxghjr9y8sy5a9bgk96n8kc8bphvn7dvlbm78j";
           system = "weblocks-util";
           asd = "weblocks-util";
@@ -105820,7 +105820,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "websocket-driver" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz";
           sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry";
           system = "websocket-driver";
           asd = "websocket-driver";
@@ -105843,7 +105843,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "websocket-driver-base" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz";
           sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry";
           system = "websocket-driver-base";
           asd = "websocket-driver-base";
@@ -105871,7 +105871,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "websocket-driver-client" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz";
           sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry";
           system = "websocket-driver-client";
           asd = "websocket-driver-client";
@@ -105901,7 +105901,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "websocket-driver-server" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/websocket-driver/2025-06-22/websocket-driver-20250622-git.tgz";
           sha256 = "16dgs47215xb2i2mw3w3wn3spsf1hac1dyla9lq87k155vy7zlry";
           system = "websocket-driver-server";
           asd = "websocket-driver-server";
@@ -105927,7 +105927,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "weft" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/weft/2018-02-28/weft-20180228-git.tgz";
+          url = "https://beta.quicklisp.org/archive/weft/2018-02-28/weft-20180228-git.tgz";
           sha256 = "1ia38xcpp9g4v6sij99lyl9b8p59ysg2cj9k92nb683f8pzv9pl3";
           system = "weft";
           asd = "weft";
@@ -105952,7 +105952,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "westbrook" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/westbrook/2018-01-31/westbrook-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/westbrook/2018-01-31/westbrook-20180131-git.tgz";
           sha256 = "08qs5lpg34d1mn6warrrq1wimyqqrjb8jih62g1pbysgni4ihm2v";
           system = "westbrook";
           asd = "westbrook";
@@ -105972,7 +105972,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "westbrook-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/westbrook/2018-01-31/westbrook-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/westbrook/2018-01-31/westbrook-20180131-git.tgz";
           sha256 = "08qs5lpg34d1mn6warrrq1wimyqqrjb8jih62g1pbysgni4ihm2v";
           system = "westbrook-tests";
           asd = "westbrook-tests";
@@ -105995,7 +105995,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "what3words" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/what3words/2016-12-04/what3words-20161204-git.tgz";
+          url = "https://beta.quicklisp.org/archive/what3words/2016-12-04/what3words-20161204-git.tgz";
           sha256 = "0nlrpi8phrf2mpgbw9bj9w4vksqb0baj542bhnq39sjalc8bj73r";
           system = "what3words";
           asd = "what3words";
@@ -106019,7 +106019,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "whereiseveryone.command-line-args" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/command-line-args/2025-06-22/command-line-args-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/command-line-args/2025-06-22/command-line-args-20250622-git.tgz";
           sha256 = "14x68ww8323vkvql3ryn9wkxf4fbj1brdn4f6mynr7wqygink2bd";
           system = "whereiseveryone.command-line-args";
           asd = "whereiseveryone.command-line-args";
@@ -106045,7 +106045,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "which" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/which/2016-04-21/which-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/which/2016-04-21/which-20160421-git.tgz";
           sha256 = "127pm9h4rm4w9aadw5yvamnfzhk2rr69kchx10rf9k7sk7izqqfk";
           system = "which";
           asd = "which";
@@ -106068,7 +106068,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "which-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/which/2016-04-21/which-20160421-git.tgz";
+          url = "https://beta.quicklisp.org/archive/which/2016-04-21/which-20160421-git.tgz";
           sha256 = "127pm9h4rm4w9aadw5yvamnfzhk2rr69kchx10rf9k7sk7izqqfk";
           system = "which-test";
           asd = "which-test";
@@ -106091,7 +106091,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "whirlog" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/whirlog/2021-10-20/whirlog-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/whirlog/2021-10-20/whirlog-20211020-git.tgz";
           sha256 = "0sf1kc8ln1gszzrz3qh3bx11k42lpccrv6kp2ihlrg3d6lsa6i26";
           system = "whirlog";
           asd = "whirlog";
@@ -106111,7 +106111,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "whofields" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/whofields/2021-10-20/whofields-20211020-git.tgz";
+          url = "https://beta.quicklisp.org/archive/whofields/2021-10-20/whofields-20211020-git.tgz";
           sha256 = "1scpzzfdw5g7qsayhznjyzns8lxx4fvv2jxd0vr9vnxad3vm977x";
           system = "whofields";
           asd = "whofields";
@@ -106134,7 +106134,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "wilbur" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/de.setf.wilbur/2018-12-10/de.setf.wilbur-20181210-git.tgz";
+          url = "https://beta.quicklisp.org/archive/de.setf.wilbur/2018-12-10/de.setf.wilbur-20181210-git.tgz";
           sha256 = "0w4qssyarim4v64vv7jmspmyba7xghx9bkalyyhvccf6zrf7b2v7";
           system = "wilbur";
           asd = "wilbur";
@@ -106154,7 +106154,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "wild-package-inferred-system" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wild-package-inferred-system/2021-05-31/wild-package-inferred-system-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/wild-package-inferred-system/2021-05-31/wild-package-inferred-system-20210531-git.tgz";
           sha256 = "0sp3j3i83aqyq9bl3djs490nilryi9sh1wjbcqd9z94d9wfbfz80";
           system = "wild-package-inferred-system";
           asd = "wild-package-inferred-system";
@@ -106172,7 +106172,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "window" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
+          url = "https://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz";
           sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34";
           system = "window";
           asd = "window";
@@ -106198,7 +106198,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "winhttp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/winhttp/2024-10-12/winhttp-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/winhttp/2024-10-12/winhttp-20241012-git.tgz";
           sha256 = "1g4prr0x2cyc58wcpa3kfiwcs9f536bzfmsnlwnh3yn9aqndg67c";
           system = "winhttp";
           asd = "winhttp";
@@ -106218,7 +106218,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "winlock" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/winlock/2019-11-30/winlock-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/winlock/2019-11-30/winlock-20191130-git.tgz";
           sha256 = "0sgjq1cjbmshnh2zwyqws7rkr93zkjl0rrzyf04542gb1grj0vd8";
           system = "winlock";
           asd = "winlock";
@@ -106242,7 +106242,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "wire-world" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "wire-world";
           asd = "wire-world";
@@ -106262,7 +106262,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "with-branching" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/with-branching/2024-10-12/with-branching-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/with-branching/2024-10-12/with-branching-20241012-git.tgz";
           sha256 = "0rhmlg1nbbhaa5jflhnydsqs7aqwg8d7ijxxcqa8lkcq49wvm647";
           system = "with-branching";
           asd = "with-branching";
@@ -106285,7 +106285,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "with-c-syntax" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/with-c-syntax/2022-11-06/with-c-syntax-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/with-c-syntax/2022-11-06/with-c-syntax-20221106-git.tgz";
           sha256 = "12gdwdyxyl9xm8n04qvmvyc1s06dkckb87i6hdysal5lsf1gwc41";
           system = "with-c-syntax";
           asd = "with-c-syntax";
@@ -106314,7 +106314,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "with-c-syntax-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/with-c-syntax/2022-11-06/with-c-syntax-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/with-c-syntax/2022-11-06/with-c-syntax-20221106-git.tgz";
           sha256 = "12gdwdyxyl9xm8n04qvmvyc1s06dkckb87i6hdysal5lsf1gwc41";
           system = "with-c-syntax-test";
           asd = "with-c-syntax-test";
@@ -106339,7 +106339,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "with-cached-reader-conditionals" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/with-cached-reader-conditionals/2017-06-30/with-cached-reader-conditionals-20170630-git.tgz";
+          url = "https://beta.quicklisp.org/archive/with-cached-reader-conditionals/2017-06-30/with-cached-reader-conditionals-20170630-git.tgz";
           sha256 = "0n7a089d0wb13l1nsdh3xlgwxwlqynkbjl8fg2x56h52a5i9gkv4";
           system = "with-cached-reader-conditionals";
           asd = "with-cached-reader-conditionals";
@@ -106359,7 +106359,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "with-contexts" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/with-contexts/2025-06-22/with-contexts-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/with-contexts/2025-06-22/with-contexts-20250622-git.tgz";
           sha256 = "16ak29iy4akxfz7la4mb3swfmyxqj0pf08j5wrpcp7djxb3y6wi9";
           system = "with-contexts";
           asd = "with-contexts";
@@ -106379,7 +106379,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "with-output-to-stream" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/with-output-to-stream/2019-10-07/with-output-to-stream_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/with-output-to-stream/2019-10-07/with-output-to-stream_1.0.tgz";
           sha256 = "0pv9kccjbxkgcv7wbcfpnzas9pq0n2rs2aq9kdnqkx55k12366sm";
           system = "with-output-to-stream";
           asd = "with-output-to-stream";
@@ -106399,7 +106399,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "with-output-to-stream_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/with-output-to-stream/2019-10-07/with-output-to-stream_1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/with-output-to-stream/2019-10-07/with-output-to-stream_1.0.tgz";
           sha256 = "0pv9kccjbxkgcv7wbcfpnzas9pq0n2rs2aq9kdnqkx55k12366sm";
           system = "with-output-to-stream_tests";
           asd = "with-output-to-stream_tests";
@@ -106422,7 +106422,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "with-setf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/with-setf/2018-02-28/with-setf-release-quicklisp-df3eed9d-git.tgz";
+          url = "https://beta.quicklisp.org/archive/with-setf/2018-02-28/with-setf-release-quicklisp-df3eed9d-git.tgz";
           sha256 = "090v39kdxk4py3axjrjjac2pn1p0109q14hvl818pik479xr4inz";
           system = "with-setf";
           asd = "with-setf";
@@ -106442,7 +106442,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "with-shadowed-bindings" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/with-shadowed-bindings/2019-01-07/with-shadowed-bindings-1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/with-shadowed-bindings/2019-01-07/with-shadowed-bindings-1.0.tgz";
           sha256 = "0kxy86a21v4fm4xwd44c6kpdadgkcj8iv6a68xavhirhjhngcwy5";
           system = "with-shadowed-bindings";
           asd = "with-shadowed-bindings";
@@ -106462,7 +106462,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "with-shadowed-bindings_tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/with-shadowed-bindings/2019-01-07/with-shadowed-bindings-1.0.tgz";
+          url = "https://beta.quicklisp.org/archive/with-shadowed-bindings/2019-01-07/with-shadowed-bindings-1.0.tgz";
           sha256 = "0kxy86a21v4fm4xwd44c6kpdadgkcj8iv6a68xavhirhjhngcwy5";
           system = "with-shadowed-bindings_tests";
           asd = "with-shadowed-bindings_tests";
@@ -106485,7 +106485,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "with-user-abort" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/with-user-abort/2023-02-14/with-user-abort-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/with-user-abort/2023-02-14/with-user-abort-20230214-git.tgz";
           sha256 = "0yidlm92dk8kvz137zlm2f0d198kmgqpdswkinr2x4snbgkhd98j";
           system = "with-user-abort";
           asd = "with-user-abort";
@@ -106505,7 +106505,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "woo" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz";
           sha256 = "0nhxlb1qhkl20vknm44gx0cq5cks33rcljczfhgbnmpkzrdpdrrl";
           system = "woo";
           asd = "woo";
@@ -106540,7 +106540,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "woo-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz";
           sha256 = "0nhxlb1qhkl20vknm44gx0cq5cks33rcljczfhgbnmpkzrdpdrrl";
           system = "woo-test";
           asd = "woo-test";
@@ -106564,7 +106564,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "wookie" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wookie/2023-02-14/wookie-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/wookie/2023-02-14/wookie-20230214-git.tgz";
           sha256 = "1i5l9isahww9zwizj6dmdcplck8wr8gxm31i43i8hf3rfxmvfjwn";
           system = "wookie";
           asd = "wookie";
@@ -106596,7 +106596,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "wordnet" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wordnet/2025-06-22/wordnet-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/wordnet/2025-06-22/wordnet-20250622-git.tgz";
           sha256 = "1gdly27dv1x60p504r4xn1aqd8s544mvw55wfk4dz25m93hwv8pj";
           system = "wordnet";
           asd = "wordnet";
@@ -106616,7 +106616,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "workout-timer" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/workout-timer/2023-02-14/workout-timer-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/workout-timer/2023-02-14/workout-timer-20230214-git.tgz";
           sha256 = "1f8qj6la93k95xqkliv59r6dkyhyhzqp2zgk0s893a3mrar0gfrx";
           system = "workout-timer";
           asd = "workout-timer";
@@ -106643,7 +106643,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "wouldwork" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wouldwork/2025-06-22/wouldwork-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/wouldwork/2025-06-22/wouldwork-20250622-git.tgz";
           sha256 = "1g47djrdh2qipihvxph5df4z4l10ziwgd69bvjrb3a58r7nl4sj0";
           system = "wouldwork";
           asd = "wouldwork";
@@ -106667,7 +106667,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "wu-decimal" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wu-decimal/2013-01-28/wu-decimal-20130128-git.tgz";
+          url = "https://beta.quicklisp.org/archive/wu-decimal/2013-01-28/wu-decimal-20130128-git.tgz";
           sha256 = "1p7na4hic7297amwm4idfwkyx664ny8cdssncyra37pmv4wzp8dm";
           system = "wu-decimal";
           asd = "wu-decimal";
@@ -106687,7 +106687,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "wu-sugar" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wu-sugar/2016-08-25/wu-sugar-20160825-git.tgz";
+          url = "https://beta.quicklisp.org/archive/wu-sugar/2016-08-25/wu-sugar-20160825-git.tgz";
           sha256 = "0ypn5195krfd1rva5myla8j7n2ilfs5gxh81flx7v0mr4r70fayl";
           system = "wu-sugar";
           asd = "wu-sugar";
@@ -106707,7 +106707,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "wuwei" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wuwei/2022-11-06/wuwei-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/wuwei/2022-11-06/wuwei-20221106-git.tgz";
           sha256 = "1k5yhxdqcx250kd56qgbch5z0hvjpjwch38c3949nf790pmrhl8f";
           system = "wuwei";
           asd = "wuwei";
@@ -106733,7 +106733,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "wuwei-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/wuwei/2022-11-06/wuwei-20221106-git.tgz";
+          url = "https://beta.quicklisp.org/archive/wuwei/2022-11-06/wuwei-20221106-git.tgz";
           sha256 = "1k5yhxdqcx250kd56qgbch5z0hvjpjwch38c3949nf790pmrhl8f";
           system = "wuwei-examples";
           asd = "wuwei";
@@ -106756,7 +106756,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "x.let-star" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/x.let-star/2020-03-25/x.let-star-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/x.let-star/2020-03-25/x.let-star-20200325-git.tgz";
           sha256 = "0qk0rpqzb7vaivggsqch06nmdjzp6b31a88w40y3864clajpcrnr";
           system = "x.let-star";
           asd = "x.let-star";
@@ -106776,7 +106776,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xarray" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xarray/2014-01-13/xarray-20140113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xarray/2014-01-13/xarray-20140113-git.tgz";
           sha256 = "031h1bvy9s6qas2160dgf7gc0y6inrhpzp8j3wrb6fjxkb0524yl";
           system = "xarray";
           asd = "xarray";
@@ -106801,7 +106801,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xarray-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xarray/2014-01-13/xarray-20140113-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xarray/2014-01-13/xarray-20140113-git.tgz";
           sha256 = "031h1bvy9s6qas2160dgf7gc0y6inrhpzp8j3wrb6fjxkb0524yl";
           system = "xarray-test";
           asd = "xarray-test";
@@ -106824,7 +106824,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xcat" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xcat/2020-09-25/xcat-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xcat/2020-09-25/xcat-20200925-git.tgz";
           sha256 = "1v8mcz8bidcbfl587b5lm07l91xan6z1y3zikjkyzagiigd4byvi";
           system = "xcat";
           asd = "xcat";
@@ -106852,7 +106852,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xecto" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xecto/2015-12-18/xecto-20151218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xecto/2015-12-18/xecto-20151218-git.tgz";
           sha256 = "1m81cl02k28v9sgscl8qhig735x5qybhw69szs6bkkqml7hbl12q";
           system = "xecto";
           asd = "xecto";
@@ -106872,7 +106872,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xembed" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz";
           sha256 = "1abx4v36ycmfjdwpjk4hh8058ya8whwia7ds9vd96q2qsrs57f12";
           system = "xembed";
           asd = "xembed";
@@ -106890,7 +106890,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xfactory" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz";
           sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw";
           system = "xfactory";
           asd = "xfactory";
@@ -106910,7 +106910,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xfactory-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz";
           sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw";
           system = "xfactory-test";
           asd = "xfactory";
@@ -106933,7 +106933,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xhtmlambda" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xhtmlambda/2025-06-22/xhtmlambda-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xhtmlambda/2025-06-22/xhtmlambda-20250622-git.tgz";
           sha256 = "1s30s7panpxi59n0rzqls6pq34gx362s2f4xawswc242c922h3pc";
           system = "xhtmlambda";
           asd = "xhtmlambda";
@@ -106953,7 +106953,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xhtmlgen" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xhtmlgen/2017-01-24/xhtmlgen-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xhtmlgen/2017-01-24/xhtmlgen-20170124-git.tgz";
           sha256 = "0br4pqhl7y7rd95l9xx2p96gds3dh4pgk9v038wbshl2dnhjv82k";
           system = "xhtmlgen";
           asd = "xhtmlgen";
@@ -106973,7 +106973,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xhtmlgen-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xhtmlgen/2017-01-24/xhtmlgen-20170124-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xhtmlgen/2017-01-24/xhtmlgen-20170124-git.tgz";
           sha256 = "0br4pqhl7y7rd95l9xx2p96gds3dh4pgk9v038wbshl2dnhjv82k";
           system = "xhtmlgen-test";
           asd = "xhtmlgen";
@@ -106996,7 +106996,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xkeyboard" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz";
           sha256 = "1nxky9wsmm7nmwz372jgb4iy0ywlm22jw0vl8yi0k9slsfklvcqi";
           system = "xkeyboard";
           asd = "xkeyboard";
@@ -107014,7 +107014,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xkeyboard-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz";
+          url = "https://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz";
           sha256 = "1nxky9wsmm7nmwz372jgb4iy0ywlm22jw0vl8yi0k9slsfklvcqi";
           system = "xkeyboard-test";
           asd = "xkeyboard";
@@ -107034,7 +107034,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xlsx" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xlsx/2018-07-11/xlsx-20180711-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xlsx/2018-07-11/xlsx-20180711-git.tgz";
           sha256 = "15vw5zl13jg9b1rla7w2wv6ss93mijrnn9fzsh0fakgvfikqq1n6";
           system = "xlsx";
           asd = "xlsx";
@@ -107058,7 +107058,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xlunit" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xlunit/2015-09-23/xlunit-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xlunit/2015-09-23/xlunit-20150923-git.tgz";
           sha256 = "0argfmp9nghs4sihyj3f8ch9qfib2b7ll07v5m9ziajgzsfl5xw3";
           system = "xlunit";
           asd = "xlunit";
@@ -107078,7 +107078,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xlunit-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xlunit/2015-09-23/xlunit-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xlunit/2015-09-23/xlunit-20150923-git.tgz";
           sha256 = "0argfmp9nghs4sihyj3f8ch9qfib2b7ll07v5m9ziajgzsfl5xw3";
           system = "xlunit-tests";
           asd = "xlunit";
@@ -107098,7 +107098,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xml-emitter" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xml-emitter/2024-10-12/xml-emitter-20241012-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xml-emitter/2024-10-12/xml-emitter-20241012-git.tgz";
           sha256 = "1q7iygd1v857a3c72kv4zxm9nhx94kkam4p8z5v10q2r2cwfps1w";
           system = "xml-emitter";
           asd = "xml-emitter";
@@ -107118,7 +107118,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xml-mop" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xml-mop/2011-04-18/xml-mop-20110418-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xml-mop/2011-04-18/xml-mop-20110418-git.tgz";
           sha256 = "1vfa3h5dghnpc7qbqqm80mm1ri6x7x5r528kvkwzngghrbxyhgjr";
           system = "xml-mop";
           asd = "xml-mop";
@@ -107141,7 +107141,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xml-render" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz";
           sha256 = "0fcs5mq0gxfczbrg7ay8r4bf5r4g6blvpdbjkhcl8dapcikyn35h";
           system = "xml-render";
           asd = "xml-render";
@@ -107164,7 +107164,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xml.location" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz";
           sha256 = "0ajl03k7krns6b0z3ykmngq3i77yd2j85z3h76drlc9whxvm2kii";
           system = "xml.location";
           asd = "xml.location";
@@ -107191,7 +107191,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xml.location-and-local-time" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz";
           sha256 = "0ajl03k7krns6b0z3ykmngq3i77yd2j85z3h76drlc9whxvm2kii";
           system = "xml.location-and-local-time";
           asd = "xml.location-and-local-time";
@@ -107214,7 +107214,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xmls" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xmls/2023-10-21/xmls-release-310ba849-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xmls/2023-10-21/xmls-release-310ba849-git.tgz";
           sha256 = "0s1acd2r77v6x9f2kmd15njkmvvx3ivivlk509ndgmdhnn2jd776";
           system = "xmls";
           asd = "xmls";
@@ -107232,7 +107232,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xoverlay" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz";
           sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw";
           system = "xoverlay";
           asd = "xoverlay";
@@ -107252,7 +107252,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xpath" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz";
+          url = "https://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz";
           sha256 = "1fb03fgnzrvh22lw1jdg04pmyja5fib5n42rzwp5mhr829yvxkvp";
           system = "xpath";
           asd = "xpath";
@@ -107275,7 +107275,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xptest" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xptest/2015-09-23/xptest-20150923-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xptest/2015-09-23/xptest-20150923-git.tgz";
           sha256 = "02jwncq5d60l77gf87ahabzg6k6c878gfc4x1mf6ld97rj5lzp3b";
           system = "xptest";
           asd = "xptest";
@@ -107295,7 +107295,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xsubseq" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz";
           sha256 = "1xz79q0p2mclf3sqjiwf6izdpb6xrsr350bv4mlmdlm6rg5r99px";
           system = "xsubseq";
           asd = "xsubseq";
@@ -107313,7 +107313,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xsubseq-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz";
           sha256 = "1xz79q0p2mclf3sqjiwf6izdpb6xrsr350bv4mlmdlm6rg5r99px";
           system = "xsubseq-test";
           asd = "xsubseq-test";
@@ -107337,7 +107337,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "xuriella" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/xuriella/2012-03-05/xuriella-20120305-git.tgz";
+          url = "https://beta.quicklisp.org/archive/xuriella/2012-03-05/xuriella-20120305-git.tgz";
           sha256 = "0wz98bfvr7h7g0r7dy815brq5sz3x40281hp0qk801q17aa4qhqh";
           system = "xuriella";
           asd = "xuriella";
@@ -107363,7 +107363,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "yacc" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-yacc/2023-02-14/cl-yacc-20230214-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-yacc/2023-02-14/cl-yacc-20230214-git.tgz";
           sha256 = "1f974ysi7mlrksnqg63iwwxgbypkng4n240q29imkrz6m5pwdig7";
           system = "yacc";
           asd = "yacc";
@@ -107381,7 +107381,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "yaclml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/yaclml/2018-01-31/yaclml-20180131-git.tgz";
+          url = "https://beta.quicklisp.org/archive/yaclml/2018-01-31/yaclml-20180131-git.tgz";
           sha256 = "0wq6clk4qwbdaf0hcfjz4vg27nyf6ng0rrip1ay4rlkb03hdnssq";
           system = "yaclml";
           asd = "yaclml";
@@ -107404,7 +107404,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "yadd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
+          url = "https://beta.quicklisp.org/archive/gendl/2025-06-22/gendl-master-5a621564-git.tgz";
           sha256 = "1z7k4ibnhz71vawsz582zhk7zzcnc4mzsipgq4qmkg2lwn9ixnv8";
           system = "yadd";
           asd = "yadd";
@@ -107427,7 +107427,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "yah" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/yah/2023-10-21/yah-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/yah/2023-10-21/yah-20231021-git.tgz";
           sha256 = "1sklx9ak2rh9h19805i9wbym889pwd1qh3d4c4fsk9cbj2i9yxx5";
           system = "yah";
           asd = "yah";
@@ -107447,7 +107447,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "yason" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/yason/2025-06-22/yason-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/yason/2025-06-22/yason-20250622-git.tgz";
           sha256 = "1bbkqsd7qfih089zs1fpkq8lb4z6xgjj8qswhwd8kgb5wax78lbn";
           system = "yason";
           asd = "yason";
@@ -107468,7 +107468,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "yason-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/yason/2025-06-22/yason-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/yason/2025-06-22/yason-20250622-git.tgz";
           sha256 = "1bbkqsd7qfih089zs1fpkq8lb4z6xgjj8qswhwd8kgb5wax78lbn";
           system = "yason-tests";
           asd = "yason-tests";
@@ -107491,7 +107491,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "youtube" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/youtube/2019-12-27/youtube-20191227-git.tgz";
+          url = "https://beta.quicklisp.org/archive/youtube/2019-12-27/youtube-20191227-git.tgz";
           sha256 = "0rqbyxgb9v3m8rwx2agaz7cq83w9k8gy5wl5wbw0rfg7r88ah5z0";
           system = "youtube";
           asd = "youtube";
@@ -107516,7 +107516,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "yxorp" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-yxorp/2023-10-21/cl-yxorp-20231021-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-yxorp/2023-10-21/cl-yxorp-20231021-git.tgz";
           sha256 = "0l84icr1d3z2k6rs92lgkghwqm6w3i87d1sz4c8mpfcyfb5shgzn";
           system = "yxorp";
           asd = "yxorp";
@@ -107549,7 +107549,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zacl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zacl/2023-06-18/zacl-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/zacl/2023-06-18/zacl-20230618-git.tgz";
           sha256 = "1s31d47zx8hczim78zrqzg4bvj4bshj31gmrff065q6racx3q1dk";
           system = "zacl";
           asd = "zacl";
@@ -107587,7 +107587,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zaserve" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/aserve/2023-06-18/aserve-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/aserve/2023-06-18/aserve-20230618-git.tgz";
           sha256 = "1i88264yghlb4brdh58hn9cps695gh63b6w6i8dmsd9rqwhlsibi";
           system = "zaserve";
           asd = "zaserve";
@@ -107610,7 +107610,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zaws" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zaws/2015-04-07/zaws-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/zaws/2015-04-07/zaws-20150407-git.tgz";
           sha256 = "1iwjyqzm4b44in7i53z5lp8n4gzsi27ch02ql6y2vxbmq3sqffaw";
           system = "zaws";
           asd = "zaws";
@@ -107635,7 +107635,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zaws-xml" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zaws/2015-04-07/zaws-20150407-git.tgz";
+          url = "https://beta.quicklisp.org/archive/zaws/2015-04-07/zaws-20150407-git.tgz";
           sha256 = "1iwjyqzm4b44in7i53z5lp8n4gzsi27ch02ql6y2vxbmq3sqffaw";
           system = "zaws-xml";
           asd = "zaws-xml";
@@ -107655,7 +107655,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zbucium" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zbucium/2019-07-10/zbucium-20190710-git.tgz";
+          url = "https://beta.quicklisp.org/archive/zbucium/2019-07-10/zbucium-20190710-git.tgz";
           sha256 = "112qx8lwcsaipnnypv2jr57lwhlgzb5n53wgck3r66b8vjjb91gy";
           system = "zbucium";
           asd = "zbucium";
@@ -107688,7 +107688,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zcdb" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zcdb/2015-04-07/zcdb-1.0.4.tgz";
+          url = "https://beta.quicklisp.org/archive/zcdb/2015-04-07/zcdb-1.0.4.tgz";
           sha256 = "1g83hqivh40xrpifm9v1vx92h13g5kzn12fjrlk57fyl1qwjqdi7";
           system = "zcdb";
           asd = "zcdb";
@@ -107708,7 +107708,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zenekindarl" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zenekindarl/2017-11-30/zenekindarl-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/zenekindarl/2017-11-30/zenekindarl-20171130-git.tgz";
           sha256 = "104y98j8fjj4wry55mhgv3g6358h5n1qcbhpn19b27b8cs8gqwib";
           system = "zenekindarl";
           asd = "zenekindarl";
@@ -107738,7 +107738,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zenekindarl-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zenekindarl/2017-11-30/zenekindarl-20171130-git.tgz";
+          url = "https://beta.quicklisp.org/archive/zenekindarl/2017-11-30/zenekindarl-20171130-git.tgz";
           sha256 = "104y98j8fjj4wry55mhgv3g6358h5n1qcbhpn19b27b8cs8gqwib";
           system = "zenekindarl-test";
           asd = "zenekindarl-test";
@@ -107762,7 +107762,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zeromq" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-zmq/2016-03-18/cl-zmq-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-zmq/2016-03-18/cl-zmq-20160318-git.tgz";
           sha256 = "0g19ych3n57qdd42m0bcdcrq8c1p0fqzz07xrxl0s0g8bms3a3ga";
           system = "zeromq";
           asd = "zeromq";
@@ -107786,7 +107786,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zeromq.tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-zmq/2016-03-18/cl-zmq-20160318-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-zmq/2016-03-18/cl-zmq-20160318-git.tgz";
           sha256 = "0g19ych3n57qdd42m0bcdcrq8c1p0fqzz07xrxl0s0g8bms3a3ga";
           system = "zeromq.tests";
           asd = "zeromq";
@@ -107810,7 +107810,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zip" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zip/2015-06-08/zip-20150608-git.tgz";
+          url = "https://beta.quicklisp.org/archive/zip/2015-06-08/zip-20150608-git.tgz";
           sha256 = "0s08a6fq182fzsbfyvihqbdllq6gxcwkvphxnrd9wwz65dhg5y66";
           system = "zip";
           asd = "zip";
@@ -107835,7 +107835,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zippy" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zippy/2025-06-22/zippy-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/zippy/2025-06-22/zippy-20250622-git.tgz";
           sha256 = "12bkds03cx7wj91qs9dhg80zchm8vli73rkgwj6dy0fjrwczdws8";
           system = "zippy";
           asd = "zippy";
@@ -107865,7 +107865,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zippy-dwim" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zippy/2025-06-22/zippy-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/zippy/2025-06-22/zippy-20250622-git.tgz";
           sha256 = "12bkds03cx7wj91qs9dhg80zchm8vli73rkgwj6dy0fjrwczdws8";
           system = "zippy-dwim";
           asd = "zippy-dwim";
@@ -107888,7 +107888,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "ziz" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/ziz/2019-10-07/ziz-20191007-git.tgz";
+          url = "https://beta.quicklisp.org/archive/ziz/2019-10-07/ziz-20191007-git.tgz";
           sha256 = "1rh6ixkyyj7y9jkw046m4ilmr8a12ylzm0a7sm8mjybdpkh6bk30";
           system = "ziz";
           asd = "ziz";
@@ -107913,7 +107913,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zlib" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zlib/2017-04-03/zlib-20170403-git.tgz";
+          url = "https://beta.quicklisp.org/archive/zlib/2017-04-03/zlib-20170403-git.tgz";
           sha256 = "1gz771h2q3xhw1yxpwki5zr9mqysa818vn21501w6fsi8wlmlffa";
           system = "zlib";
           asd = "zlib";
@@ -107933,7 +107933,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zmq" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz";
           sha256 = "01aavmnn2lbsaq957p1qll21hmhvhkrqhq3kazmz88sc40x1n0ld";
           system = "zmq";
           asd = "zmq";
@@ -107958,7 +107958,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zmq-examples" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz";
           sha256 = "01aavmnn2lbsaq957p1qll21hmhvhkrqhq3kazmz88sc40x1n0ld";
           system = "zmq-examples";
           asd = "zmq-examples";
@@ -107981,7 +107981,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zmq-test" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz";
+          url = "https://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz";
           sha256 = "01aavmnn2lbsaq957p1qll21hmhvhkrqhq3kazmz88sc40x1n0ld";
           system = "zmq-test";
           asd = "zmq-test";
@@ -108005,7 +108005,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zpb-exif" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zpb-exif/2021-01-24/zpb-exif-release-1.2.5.tgz";
+          url = "https://beta.quicklisp.org/archive/zpb-exif/2021-01-24/zpb-exif-release-1.2.5.tgz";
           sha256 = "0h1n36lfl8xn8rfyl5jxz9m8zlg0if2avmryas79f684yczrvdnd";
           system = "zpb-exif";
           asd = "zpb-exif";
@@ -108025,7 +108025,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zpb-ttf" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zpb-ttf/2025-06-22/zpb-ttf-20250622-git.tgz";
+          url = "https://beta.quicklisp.org/archive/zpb-ttf/2025-06-22/zpb-ttf-20250622-git.tgz";
           sha256 = "1mnn85109dl2nvk00jmw42vm55lf5md4p5aknc7pzfs8kmc45bp4";
           system = "zpb-ttf";
           asd = "zpb-ttf";
@@ -108043,7 +108043,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zpng" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zpng/2015-04-07/zpng-1.2.2.tgz";
+          url = "https://beta.quicklisp.org/archive/zpng/2015-04-07/zpng-1.2.2.tgz";
           sha256 = "0b3ag3jhl3z7kdls3ahdsdxsfhhw5qrizk769984f4wkxhb69rcm";
           system = "zpng";
           asd = "zpng";
@@ -108061,7 +108061,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zs3" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zs3/2025-06-22/zs3-release-1.3.4.tgz";
+          url = "https://beta.quicklisp.org/archive/zs3/2025-06-22/zs3-release-1.3.4.tgz";
           sha256 = "1vr9l0hjjmcs24xfjz1s63jfj2261rlzhjvj5f4vblqi0yc96ir5";
           system = "zs3";
           asd = "zs3";
@@ -108088,7 +108088,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zsort" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/zsort/2012-05-20/zsort-20120520-git.tgz";
+          url = "https://beta.quicklisp.org/archive/zsort/2012-05-20/zsort-20120520-git.tgz";
           sha256 = "1vyklyh99712zsll4qi0m4mm8yb1nz04403vl8i57bjv5p5max49";
           system = "zsort";
           asd = "zsort";
@@ -108108,7 +108108,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zstd" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-zstd/2023-06-18/cl-zstd-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-zstd/2023-06-18/cl-zstd-20230618-git.tgz";
           sha256 = "037igr1v849smcs6svjb5s850k5s5yfg74d4gb3ir4b4v9g4k97i";
           system = "zstd";
           asd = "zstd";
@@ -108132,7 +108132,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zstd-tests" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-zstd/2023-06-18/cl-zstd-20230618-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-zstd/2023-06-18/cl-zstd-20230618-git.tgz";
           sha256 = "037igr1v849smcs6svjb5s850k5s5yfg74d4gb3ir4b4v9g4k97i";
           system = "zstd-tests";
           asd = "zstd-tests";
@@ -108156,7 +108156,7 @@ lib.makeScope pkgs.newScope (self: {
       asds = [ "zyre" ];
       src = (
         createAsd {
-          url = "http://beta.quicklisp.org/archive/cl-zyre/2020-09-25/cl-zyre-20200925-git.tgz";
+          url = "https://beta.quicklisp.org/archive/cl-zyre/2020-09-25/cl-zyre-20200925-git.tgz";
           sha256 = "1pfb176k655hxksyrans5j43ridvpkl8q8h6d37zgi2z4iiz15wv";
           system = "zyre";
           asd = "zyre";

From 68369330d58965e5220e49a6852abfe673cf278a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 23 Jul 2025 21:28:45 +0100
Subject: [PATCH 0210/3724] libmicrohttpd: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/development/libraries/libmicrohttpd/1.0.nix b/pkgs/development/libraries/libmicrohttpd/1.0.nix
index 16a4f2ed884e..944749f281c0 100644
--- a/pkgs/development/libraries/libmicrohttpd/1.0.nix
+++ b/pkgs/development/libraries/libmicrohttpd/1.0.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
-    hash = "sha256-qJ4J/JtN403eGfT8tPqqHOECmbmQjbETK7+h3keIK5Q=";
+    hash = "sha256-3zJPzQg0F12rB0gxM5Atl3SmBb+imAJfaYgyiP0gqMc=";
   };
 })

From eb79e38026540fe9a86ca7dd002018eb14185449 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 23 Jul 2025 21:30:10 +0100
Subject: [PATCH 0211/3724] libmicrohttpd: enable parallel building

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

diff --git a/pkgs/development/libraries/libmicrohttpd/generic.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix
index 4ceb9afe9265..ea56e38c4fbf 100644
--- a/pkgs/development/libraries/libmicrohttpd/generic.nix
+++ b/pkgs/development/libraries/libmicrohttpd/generic.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
     libintl
   ];
 
+  enableParallelBuilding = true;
+
   preCheck = ''
     # Since `localhost' can't be resolved in a chroot, work around it.
     sed -i -e 's/localhost/127.0.0.1/g' src/test*/*.[ch]

From d2ee711249fe9745fe8c7a47528b69e269d744e9 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 23 Jul 2025 21:52:14 +0100
Subject: [PATCH 0212/3724] bash: 5.3p0 -> 5.3p3

---
 pkgs/shells/bash/bash-5.3-patches.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/shells/bash/bash-5.3-patches.nix b/pkgs/shells/bash/bash-5.3-patches.nix
index b8019fb33502..b285f9918ca6 100644
--- a/pkgs/shells/bash/bash-5.3-patches.nix
+++ b/pkgs/shells/bash/bash-5.3-patches.nix
@@ -1,4 +1,7 @@
 # Automatically generated by `update-patch-set.sh'; do not edit.
 
 patch: [
+  (patch "001" "0zr8wgg1gb67vxn7ws971n1znrdinczymc688ndnpy2a6qs88q0z")
+  (patch "002" "009051z55plsy4jmmjdb3ys7li2jraynz99qg7n6a1qk025591g3")
+  (patch "003" "1vb0gnrkmz49rcfpxjcxy0v0k5278wrlkljk9gc20nizvk3xjigj")
 ]

From 09be7dca3a0d827c8021854853d11a1db727e75f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 01:34:28 +0000
Subject: [PATCH 0213/3724] minio: 2025-06-13T11-33-47Z -> 2025-07-18T21-56-31Z

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

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 5bed1a79d65a..0296130ba6a3 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -30,16 +30,16 @@ let
 in
 buildGoModule rec {
   pname = "minio";
-  version = "2025-06-13T11-33-47Z";
+  version = "2025-07-18T21-56-31Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    hash = "sha256-pck/K/BJZC0OdjgeCr+3ErkOyqmVTCdZv61jG24tp2E=";
+    hash = "sha256-kQxCrL1hzyEttpqCtJiK6so8L1bKvKaVU5wGWfb24fM=";
   };
 
-  vendorHash = "sha256-0UoEIlxbAveYlCbGZ2z1q+RAksJrVjdE+ymc6ozDGcE=";
+  vendorHash = "sha256-XxvSTdHC8l3EwRP8odtcyGv9dlCTCl9dho8BOg6J8zY=";
 
   doCheck = false;
 

From b0a86ce5d511dc54707527e24db51742cfe97ddc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Jul 2025 01:13:50 +0000
Subject: [PATCH 0214/3724] pipewire: 1.4.6 -> 1.4.7

---
 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 04f7ea09e50d..3043b64cf4f5 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -77,7 +77,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pipewire";
-  version = "1.4.6";
+  version = "1.4.7";
 
   outputs = [
     "out"
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "pipewire";
     repo = "pipewire";
     rev = finalAttrs.version;
-    sha256 = "sha256-Hk43rKrKCJA6njQ9ap/Pje9AQKygrDc+GTlimaMh/pg=";
+    sha256 = "sha256-U9J7f6nDO4tp6OCBtBcZ9HP9KDKLfuuRWDEbgLL9Avs=";
   };
 
   patches = [

From 3ea4c39d98659a789660b5a2b9ef43c7e5e3a2e4 Mon Sep 17 00:00:00 2001
From: stupidcomputer <ryan@beepboop.systems>
Date: Mon, 21 Jul 2025 14:16:35 -0500
Subject: [PATCH 0215/3724] pyairtable: init at 3.1.1

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

diff --git a/pkgs/development/python-modules/pyairtable/default.nix b/pkgs/development/python-modules/pyairtable/default.nix
new file mode 100644
index 000000000000..2e9d1eeec604
--- /dev/null
+++ b/pkgs/development/python-modules/pyairtable/default.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+
+  inflection,
+  pydantic,
+  requests,
+  urllib3,
+  click,
+
+  pytest,
+  pytest-cov,
+  mock,
+  requests-mock,
+  tox,
+}:
+
+buildPythonPackage rec {
+  pname = "pyairtable";
+  version = "3.1.1";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-sYX+8SEZ8kng5wSrTksVopCA/Ikq1NVRoQU6G7YJ7y4=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    setuptools
+    inflection
+    pydantic
+    requests
+    urllib3
+    click
+  ];
+
+  nativeCheckInputs = [
+    pytest
+    pytest-cov
+    mock
+    requests-mock
+    tox
+  ];
+
+  pythonImportsCheck = [ "pyairtable" ];
+
+  meta = {
+    description = "Python API Client for Airtable";
+    homepage = "https://pyairtable.readthedocs.io/";
+    changelog = "https://pyairtable.readthedocs.io/en/${version}/changelog.html";
+    license = lib.licenses.mit;
+    mainProgram = "pyairtable";
+    maintainers = with lib.maintainers; [ stupidcomputer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ad4c7649a292..af93785418b6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12261,6 +12261,8 @@ self: super: with self; {
 
   pyairports = callPackage ../development/python-modules/pyairports { };
 
+  pyairtable = callPackage ../development/python-modules/pyairtable { };
+
   pyairvisual = callPackage ../development/python-modules/pyairvisual { };
 
   pyais = callPackage ../development/python-modules/pyais { };

From 8fb133a87f81c2fb0520aa78c9e84827b48a321a Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Thu, 24 Jul 2025 17:30:44 +0800
Subject: [PATCH 0216/3724] mysql-shell: 8.4.5 -> 8.4.6

---
 pkgs/development/tools/mysql-shell/8.nix | 8 ++++----
 pkgs/top-level/all-packages.nix          | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix
index 5f2ac287b656..9295d8263df3 100644
--- a/pkgs/development/tools/mysql-shell/8.nix
+++ b/pkgs/development/tools/mysql-shell/8.nix
@@ -38,8 +38,8 @@ let
     pyyaml
   ];
 
-  mysqlShellVersion = "8.4.5";
-  mysqlServerVersion = "8.4.5";
+  mysqlShellVersion = "8.4.6";
+  mysqlServerVersion = "8.4.6";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql-shell";
@@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
   srcs = [
     (fetchurl {
       url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
-      hash = "sha256-U2OVkqcgpxn9+t8skhuUfqyGwG4zMgLkdmeFKleBvRo=";
+      hash = "sha256-oeUj3IvpbRilreEGmYZhKFygG29bRsCLJlQRDkDfL7c=";
     })
     (fetchurl {
       url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
-      hash = "sha256-OLU27mLd46pC6mfvBTRmC0mJ8nlwQuHPNWPkTQw3t8w=";
+      hash = "sha256-IUmWUW5rZcRvmolE+LjMaGPFa5abv1osIhTzm9BKt/w=";
     })
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5929c845e691..4368027deead 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -542,9 +542,10 @@ with pkgs;
     ({
       mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix {
         antlr = antlr4_10;
-        icu = icu73;
-        protobuf = protobuf_25;
-        stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
+        icu = icu77;
+        protobuf = protobuf_25.override {
+          abseil-cpp = abseil-cpp_202407;
+        };
       };
     })
     mysql-shell_8

From 9ed1c81a3c03ba5230adbf3d962ae0585339eba0 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Thu, 24 Jul 2025 17:50:21 +0800
Subject: [PATCH 0217/3724] mysql-shell-innovation: 9.3.0 -> 9.4.0

---
 pkgs/development/tools/mysql-shell/innovation.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                   | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix
index 177992ca170b..c0f3a870ae50 100644
--- a/pkgs/development/tools/mysql-shell/innovation.nix
+++ b/pkgs/development/tools/mysql-shell/innovation.nix
@@ -38,8 +38,8 @@ let
     pyyaml
   ];
 
-  mysqlShellVersion = "9.3.0";
-  mysqlServerVersion = "9.3.0";
+  mysqlShellVersion = "9.4.0";
+  mysqlServerVersion = "9.4.0";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql-shell-innovation";
@@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
   srcs = [
     (fetchurl {
       url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
-      hash = "sha256-Gj7iNvHarF74l8YyXJsOCq5IY4m+G4AB3rP/d85oLWA=";
+      hash = "sha256-a7UJxU5YtUq776SeKW5yIPXnz+RGkUujYV9ZSWfPqSE=";
     })
     (fetchurl {
       url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
-      hash = "sha256-26bhtMNuaEnsW/TygbyhejlHbtSnh+EwrEdHaDqyv5s=";
+      hash = "sha256-BpiDGA3Lxf/MrKqtPSA+apFNZx9N805PYYVa+2vQxPE=";
     })
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4368027deead..6a68a9f9bee7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -553,9 +553,10 @@ with pkgs;
 
   mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix {
     antlr = antlr4_10;
-    icu = icu73;
-    protobuf = protobuf_25;
-    stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
+    icu = icu77;
+    protobuf = protobuf_25.override {
+      abseil-cpp = abseil-cpp_202407;
+    };
   };
 
   # this is used by most `fetch*` functions

From 6b2e5b947405fce1033199dfe3b4e754b14e4c35 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Mon, 26 Feb 2024 21:24:53 +0100
Subject: [PATCH 0218/3724] libtiff: don't propagate unnecessary build inputs

---
 pkgs/by-name/li/libtiff/package.nix | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix
index c73dfa2d0c94..33bfd037d577 100644
--- a/pkgs/by-name/li/libtiff/package.nix
+++ b/pkgs/by-name/li/libtiff/package.nix
@@ -16,12 +16,10 @@
   zlib,
   zstd,
 
-  # Because lerc is C++ and static libraries don't track dependencies,
-  # that every downstream dependent of libtiff has to link with a C++
-  # compiler, or the C++ standard library won't be linked, resulting
-  # in undefined symbol errors.  Without systematic support for this
-  # in build systems, fixing this would require modifying the build
-  # system of every libtiff user.  Hopefully at some point build
+  # Because lerc is C++ and static libraries don't track dependencies, every downstream dependent of
+  # libtiff has to link with a C++ compiler, or the C++ standard library won't be linked, resulting
+  # in undefined symbol errors. Without systematic support for this in build systems, fixing this
+  # would require modifying the build system of every libtiff user. Hopefully at some point build
   # systems will figure this out, and then we can enable this.
   #
   # See https://github.com/mesonbuild/meson/issues/14234
@@ -84,22 +82,16 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    zstd
-  ]
-  ++ lib.optionals withLerc [
-    lerc
-  ];
-
-  # TODO: opengl support (bogus configure detection)
-  propagatedBuildInputs = [
     libdeflate
     libjpeg
-    # libwebp depends on us; this will cause infinite
-    # recursion otherwise
+    # libwebp depends on us; this will cause infinite recursion otherwise
     (libwebp.override { tiffSupport = false; })
     xz
     zlib
     zstd
+  ]
+  ++ lib.optionals withLerc [
+    lerc
   ];
 
   cmakeFlags = [
@@ -109,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelBuilding = true;
 
   doCheck = true;
+
   # Avoid flakiness like https://gitlab.com/libtiff/libtiff/-/commit/94f6f7315b1
   enableParallelChecking = false;
 
@@ -122,7 +115,9 @@ stdenv.mkDerivation (finalAttrs: {
         openimageio
         freeimage
         ;
+
       inherit (python3Packages) pillow imread;
+
       pkg-config = testers.hasPkgConfigModules {
         package = finalAttrs.finalPackage;
       };

From a32e5f932c1866456ee2dad1ecabd4480e5de006 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Mon, 26 Feb 2024 21:32:57 +0100
Subject: [PATCH 0219/3724] libgeotiff: add missing build dependency

---
 pkgs/by-name/li/libgeotiff/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/li/libgeotiff/package.nix b/pkgs/by-name/li/libgeotiff/package.nix
index a8adeb40a962..30d1a94372a1 100644
--- a/pkgs/by-name/li/libgeotiff/package.nix
+++ b/pkgs/by-name/li/libgeotiff/package.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libtiff
     proj
+    zlib
   ];
 
   #hardeningDisable = [ "format" ];

From f0343f0b1506cd2bb60df9cf789aaf77bbc47ca1 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 23 Jul 2025 06:14:08 -0700
Subject: [PATCH 0220/3724] libappimage: add missing xz dependency

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

diff --git a/pkgs/by-name/li/libappimage/package.nix b/pkgs/by-name/li/libappimage/package.nix
index 8d2a1013aff8..9e63c725c93b 100644
--- a/pkgs/by-name/li/libappimage/package.nix
+++ b/pkgs/by-name/li/libappimage/package.nix
@@ -16,6 +16,7 @@
   librsvg,
   squashfuse,
   xdg-utils-cxx,
+  xz, # for liblzma
   zlib,
 }:
 stdenv.mkDerivation rec {
@@ -66,6 +67,7 @@ stdenv.mkDerivation rec {
     libarchive
     squashfuse
     xdg-utils-cxx
+    xz
   ];
 
   propagatedBuildInputs = [

From 7c104c9ba338167903547cff25e5eb5d2d0fcd04 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 24 Jul 2025 16:17:55 +0200
Subject: [PATCH 0221/3724] glibc: 2.40-66 -> 2.40-142, fix CVE-2025-8058

See https://nvd.nist.gov/vuln/detail/CVE-2025-8058

Updating to the latest patch-level of the 2.40 branch to address this.
---
 .../libraries/glibc/2.40-master.patch         | 17092 ++++++++++++++++
 pkgs/development/libraries/glibc/common.nix   |     2 +-
 2 files changed, 17093 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibc/2.40-master.patch b/pkgs/development/libraries/glibc/2.40-master.patch
index c7885ead7b7f..3384de16dc3b 100644
--- a/pkgs/development/libraries/glibc/2.40-master.patch
+++ b/pkgs/development/libraries/glibc/2.40-master.patch
@@ -26216,3 +26216,17095 @@ index f9e3425e04..089c47b04b 100644
        struct abort_msg_s *buf = __mmap (NULL, total,
  					PROT_READ | PROT_WRITE,
  					MAP_ANON | MAP_PRIVATE, -1, 0);
+
+commit aef8f8d6a947b290162393e1d717c7aee96fef8e
+Author: H.J. Lu <hjl.tools@gmail.com>
+Date:   Tue Dec 17 18:41:45 2024 +0800
+
+    Hide all malloc functions from compiler [BZ #32366]
+    
+    Since -1 isn't a power of two, compiler may reject it, hide memalign from
+    Clang 19 which issues an error:
+    
+    tst-memalign.c:86:31: error: requested alignment is not a power of 2 [-Werror,-Wnon-power-of-two-alignment]
+       86 |   p = memalign (-1, pagesize);
+          |                 ^~
+    tst-memalign.c:86:31: error: requested alignment must be 4294967296 bytes or smaller; maximum alignment assumed [-Werror,-Wbuiltin-assume-aligned-alignment]
+       86 |   p = memalign (-1, pagesize);
+          |                 ^~
+    
+    Update tst-malloc-aux.h to hide all malloc functions and include it in
+    all malloc tests to prevent compiler from optimizing out any malloc
+    functions.
+    
+    Tested with Clang 19.1.5 and GCC 15 20241206 for BZ #32366.
+    
+    Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
+    Reviewed-by: Sam James <sam@gentoo.org>
+    (cherry picked from commit f9493a15ea9cfb63a815c00c23142369ec09d8ce)
+
+diff --git a/malloc/tst-mallinfo2.c b/malloc/tst-mallinfo2.c
+index 2c02f5f700..f072b9f24b 100644
+--- a/malloc/tst-mallinfo2.c
++++ b/malloc/tst-mallinfo2.c
+@@ -23,6 +23,8 @@
+ #include <stdlib.h>
+ #include <support/check.h>
+ 
++#include "tst-malloc-aux.h"
++
+ /* This is not specifically needed for the test, but (1) does
+    something to the data so gcc doesn't optimize it away, and (2) may
+    help when developing future tests.  */
+diff --git a/malloc/tst-malloc-aux.h b/malloc/tst-malloc-aux.h
+index 54908b4a24..3e1b61ce34 100644
+--- a/malloc/tst-malloc-aux.h
++++ b/malloc/tst-malloc-aux.h
+@@ -22,20 +22,35 @@
+ 
+ #include <stddef.h>
+ #include <stdlib.h>
+-
+-static void *(*volatile aligned_alloc_indirect)(size_t, size_t) = aligned_alloc;
+-static void *(*volatile calloc_indirect)(size_t, size_t) = calloc;
+-static void *(*volatile malloc_indirect)(size_t) = malloc;
+-static void *(*volatile realloc_indirect)(void*, size_t) = realloc;
++#include <malloc.h>
++
++static __typeof (aligned_alloc) * volatile aligned_alloc_indirect
++  = aligned_alloc;
++static __typeof (calloc) * volatile calloc_indirect = calloc;
++static __typeof (malloc) * volatile malloc_indirect = malloc;
++static __typeof (memalign) * volatile memalign_indirect = memalign;
++static __typeof (posix_memalign) * volatile posix_memalign_indirect
++  = posix_memalign;
++static __typeof (pvalloc) * volatile pvalloc_indirect = pvalloc;
++static __typeof (realloc) * volatile realloc_indirect = realloc;
++static __typeof (valloc) * volatile valloc_indirect = valloc;
+ 
+ #undef aligned_alloc
+ #undef calloc
+ #undef malloc
++#undef memalign
++#undef posix_memalign
++#undef pvalloc
+ #undef realloc
++#undef valloc
+ 
+ #define aligned_alloc aligned_alloc_indirect
+ #define calloc calloc_indirect
+ #define malloc malloc_indirect
++#define memalign memalign_indirect
++#define posix_memalign posix_memalign_indirect
++#define pvalloc pvalloc_indirect
+ #define realloc realloc_indirect
++#define valloc valloc_indirect
+ 
+ #endif /* TST_MALLOC_AUX_H */
+diff --git a/malloc/tst-malloc-backtrace.c b/malloc/tst-malloc-backtrace.c
+index c7b1d65e5c..65fa91f6fd 100644
+--- a/malloc/tst-malloc-backtrace.c
++++ b/malloc/tst-malloc-backtrace.c
+@@ -22,6 +22,8 @@
+ #include <support/support.h>
+ #include <libc-diag.h>
+ 
++#include "tst-malloc-aux.h"
++
+ #define SIZE 4096
+ 
+ /* Wrap free with a function to prevent gcc from optimizing it out.  */
+diff --git a/malloc/tst-memalign.c b/malloc/tst-memalign.c
+index 563f6413d2..ac9770d3f9 100644
+--- a/malloc/tst-memalign.c
++++ b/malloc/tst-memalign.c
+@@ -23,6 +23,8 @@
+ #include <unistd.h>
+ #include <libc-diag.h>
+ 
++#include "tst-malloc-aux.h"
++
+ static int errors = 0;
+ 
+ static void
+diff --git a/malloc/tst-safe-linking.c b/malloc/tst-safe-linking.c
+index 01dd07004d..63a7e2bc8e 100644
+--- a/malloc/tst-safe-linking.c
++++ b/malloc/tst-safe-linking.c
+@@ -26,6 +26,8 @@
+ #include <support/capture_subprocess.h>
+ #include <support/check.h>
+ 
++#include "tst-malloc-aux.h"
++
+ /* Run CALLBACK and check that the data on standard error equals
+    EXPECTED.  */
+ static void
+diff --git a/malloc/tst-valloc.c b/malloc/tst-valloc.c
+index 9bab8c6470..0243d3dfd4 100644
+--- a/malloc/tst-valloc.c
++++ b/malloc/tst-valloc.c
+@@ -23,6 +23,8 @@
+ #include <unistd.h>
+ #include <libc-diag.h>
+ 
++#include "tst-malloc-aux.h"
++
+ static int errors = 0;
+ 
+ static void
+
+commit be48b8f6ad0ec6d0d6b1d2f45eb59bf8e8c67dd7
+Author: Sam James <sam@gentoo.org>
+Date:   Fri Jan 10 03:03:47 2025 +0000
+
+    malloc: obscure calloc use in tst-calloc
+    
+    Similar to a9944a52c967ce76a5894c30d0274b824df43c7a and
+    f9493a15ea9cfb63a815c00c23142369ec09d8ce, we need to hide calloc use from
+    the compiler to accommodate GCC's r15-6566-g804e9d55d9e54c change.
+    
+    First, include tst-malloc-aux.h, but then use `volatile` variables
+    for size.
+    
+    The test passes without the tst-malloc-aux.h change but IMO we want
+    it there for consistency and to avoid future problems (possibly silent).
+    
+    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
+    (cherry picked from commit c3d1dac96bdd10250aa37bb367d5ef8334a093a1)
+
+diff --git a/malloc/tst-calloc.c b/malloc/tst-calloc.c
+index 01f17f9e65..5a8c7ab121 100644
+--- a/malloc/tst-calloc.c
++++ b/malloc/tst-calloc.c
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <libc-diag.h>
+ 
++#include "tst-malloc-aux.h"
+ 
+ /* Number of samples per size.  */
+ #define N 50000
+@@ -94,16 +95,19 @@ random_test (void)
+ static void
+ null_test (void)
+ {
++  /* Obscure allocation size from the compiler.  */
++  volatile size_t max_size = UINT_MAX;
++  volatile size_t zero_size = 0;
+   /* If the size is 0 the result is implementation defined.  Just make
+      sure the program doesn't crash.  The result of calloc is
+      deliberately ignored, so do not warn about that.  */
+   DIAG_PUSH_NEEDS_COMMENT;
+   DIAG_IGNORE_NEEDS_COMMENT (10, "-Wunused-result");
+   calloc (0, 0);
+-  calloc (0, UINT_MAX);
+-  calloc (UINT_MAX, 0);
+-  calloc (0, ~((size_t) 0));
+-  calloc (~((size_t) 0), 0);
++  calloc (0, max_size);
++  calloc (max_size, 0);
++  calloc (0, ~((size_t) zero_size));
++  calloc (~((size_t) zero_size), 0);
+   DIAG_POP_NEEDS_COMMENT;
+ }
+ 
+
+commit 85668221974db44459527e04d04f77ca8f8e3115
+Author: H.J. Lu <hjl.tools@gmail.com>
+Date:   Fri Jan 24 18:53:13 2025 +0800
+
+    stdlib: Test using setenv with updated environ [BZ #32588]
+    
+    Add a test for setenv with updated environ.  Verify that BZ #32588 is
+    fixed.
+    
+    Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
+    Reviewed-by: Florian Weimer <fweimer@redhat.com>
+    (cherry picked from commit 8ab34497de14e35aff09b607222fe1309ef156da)
+
+diff --git a/stdlib/Makefile b/stdlib/Makefile
+index 8213fa83ef..d3a84fa641 100644
+--- a/stdlib/Makefile
++++ b/stdlib/Makefile
+@@ -307,6 +307,7 @@ tests := \
+   tst-setcontext9 \
+   tst-setcontext10 \
+   tst-setcontext11 \
++  tst-setenv-environ \
+   tst-stdbit-Wconversion \
+   tst-stdbit-builtins \
+   tst-stdc_bit_ceil \
+diff --git a/stdlib/tst-setenv-environ.c b/stdlib/tst-setenv-environ.c
+new file mode 100644
+index 0000000000..02fcef96d0
+--- /dev/null
++++ b/stdlib/tst-setenv-environ.c
+@@ -0,0 +1,36 @@
++/* Test using setenv with updated environ.
++   Copyright (C) 2025 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <stdlib.h>
++#include <support/check.h>
++
++extern char **environ;
++
++int
++do_test (void)
++{
++  char *valp;
++  static char *dummy_environ[] = { NULL };
++  environ = dummy_environ;
++  setenv ("A", "1", 0);
++  valp = getenv ("A");
++  TEST_VERIFY_EXIT (valp[0] == '1' && valp[1] == '\0');
++  return 0;
++}
++
++#include <support/test-driver.c>
+
+commit e899ca3651f8c5e01bf3420cfb34aad97d093f74
+Author: John David Anglin <danglin@gcc.gnu.org>
+Date:   Wed Jan 29 16:51:16 2025 -0500
+
+    nptl: Correct stack size attribute when stack grows up [BZ #32574]
+    
+    Set stack size attribute to the size of the mmap'd region only
+    when the size of the remaining stack space is less than the size
+    of the mmap'd region.
+    
+    This was reversed.  As a result, the initial stack size was only
+    135168 bytes.  On architectures where the stack grows down, the
+    initial stack size is approximately 8384512 bytes with the default
+    rlimit settings.  The small main stack size on hppa broke
+    applications like ruby that check for stack overflows.
+    
+    Signed-off-by: John David Anglin <dave.anglin@bell.net>
+
+diff --git a/nptl/pthread_getattr_np.c b/nptl/pthread_getattr_np.c
+index 1e91874767..3ce34437bc 100644
+--- a/nptl/pthread_getattr_np.c
++++ b/nptl/pthread_getattr_np.c
+@@ -145,9 +145,9 @@ __pthread_getattr_np (pthread_t thread_id, pthread_attr_t *attr)
+ 			  > (size_t) iattr->stackaddr - last_to)
+ 			iattr->stacksize = (size_t) iattr->stackaddr - last_to;
+ #else
+-		      /* The limit might be too high.  */
++		      /* The limit might be too low.  */
+ 		      if ((size_t) iattr->stacksize
+-			  > to - (size_t) iattr->stackaddr)
++			  < to - (size_t) iattr->stackaddr)
+ 			iattr->stacksize = to - (size_t) iattr->stackaddr;
+ #endif
+ 		      /* We succeed and no need to look further.  */
+
+commit d6c156c326999f144cb5b73d29982108d549ad8a
+Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date:   Fri Jan 31 12:16:30 2025 -0500
+
+    assert: Add test for CVE-2025-0395
+    
+    Use the __progname symbol to override the program name to induce the
+    failure that CVE-2025-0395 describes.
+    
+    This is related to BZ #32582
+    
+    Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
+    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+    (cherry picked from commit cdb9ba84191ce72e86346fb8b1d906e7cd930ea2)
+
+diff --git a/assert/Makefile b/assert/Makefile
+index 35dc908ddb..c0fe660bd6 100644
+--- a/assert/Makefile
++++ b/assert/Makefile
+@@ -38,6 +38,7 @@ tests := \
+   test-assert-perr \
+   tst-assert-c++ \
+   tst-assert-g++ \
++  tst-assert-sa-2025-0001 \
+   # tests
+ 
+ ifeq ($(have-cxx-thread_local),yes)
+diff --git a/assert/tst-assert-sa-2025-0001.c b/assert/tst-assert-sa-2025-0001.c
+new file mode 100644
+index 0000000000..102cb0078d
+--- /dev/null
++++ b/assert/tst-assert-sa-2025-0001.c
+@@ -0,0 +1,92 @@
++/* Test for CVE-2025-0395.
++   Copyright The GNU Toolchain Authors.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++/* Test that a large enough __progname does not result in a buffer overflow
++   when printing an assertion failure.  This was CVE-2025-0395.  */
++#include <assert.h>
++#include <inttypes.h>
++#include <signal.h>
++#include <stdbool.h>
++#include <string.h>
++#include <sys/mman.h>
++#include <support/check.h>
++#include <support/support.h>
++#include <support/xstdio.h>
++#include <support/xunistd.h>
++
++extern const char *__progname;
++
++int
++do_test (int argc, char **argv)
++{
++
++  support_need_proc ("Reads /proc/self/maps to add guards to writable maps.");
++  ignore_stderr ();
++
++  /* XXX assumes that the assert is on a 2 digit line number.  */
++  const char *prompt = ": %s:99: do_test: Assertion `argc < 1' failed.\n";
++
++  int ret = fprintf (stderr, prompt, __FILE__);
++  if (ret < 0)
++    FAIL_EXIT1 ("fprintf failed: %m\n");
++
++  size_t pagesize = getpagesize ();
++  size_t namesize = pagesize - 1 - ret;
++
++  /* Alter the progname so that the assert message fills the entire page.  */
++  char progname[namesize];
++  memset (progname, 'A', namesize - 1);
++  progname[namesize - 1] = '\0';
++  __progname = progname;
++
++  FILE *f = xfopen ("/proc/self/maps", "r");
++  char *line = NULL;
++  size_t len = 0;
++  uintptr_t prev_to = 0;
++
++  /* Pad the beginning of every writable mapping with a PROT_NONE map.  This
++     ensures that the mmap in the assert_fail path never ends up below a
++     writable map and will terminate immediately in case of a buffer
++     overflow.  */
++  while (xgetline (&line, &len, f))
++    {
++      uintptr_t from, to;
++      char perm[4];
++
++      sscanf (line, "%" SCNxPTR "-%" SCNxPTR " %c%c%c%c ",
++	      &from, &to,
++	      &perm[0], &perm[1], &perm[2], &perm[3]);
++
++      bool writable = (memchr (perm, 'w', 4) != NULL);
++
++      if (prev_to != 0 && from - prev_to > pagesize && writable)
++	xmmap ((void *) from - pagesize, pagesize, PROT_NONE,
++	       MAP_ANONYMOUS | MAP_PRIVATE, 0);
++
++      prev_to = to;
++    }
++
++  xfclose (f);
++
++  assert (argc < 1);
++  return 0;
++}
++
++#define EXPECTED_SIGNAL SIGABRT
++#define TEST_FUNCTION_ARGV do_test
++#include <support/test-driver.c>
+
+commit 523f85558152a1b9cced6d669f758c27677775ba
+Author: John David Anglin <danglin@gcc.gnu.org>
+Date:   Tue Feb 25 15:57:53 2025 -0500
+
+    math: Add optimization barrier to ensure a1 + u.d is not reused [BZ #30664]
+    
+    A number of fma tests started to fail on hppa when gcc was changed to
+    use Ranger rather than EVRP.  Eventually I found that the value of
+    a1 + u.d in this is block of code was being computed in FE_TOWARDZERO
+    mode and not the original rounding mode:
+    
+        if (TININESS_AFTER_ROUNDING)
+          {
+            w.d = a1 + u.d;
+            if (w.ieee.exponent == 109)
+              return w.d * 0x1p-108;
+          }
+    
+    This caused the exponent value to be wrong and the wrong return path
+    to be used.
+    
+    Here we add an optimization barrier after the rounding mode is reset
+    to ensure that the previous value of a1 + u.d is not reused.
+    
+    Signed-off-by: John David Anglin <dave.anglin@bell.net>
+
+diff --git a/sysdeps/ieee754/dbl-64/s_fma.c b/sysdeps/ieee754/dbl-64/s_fma.c
+index c5f5abdc68..79a3cd721d 100644
+--- a/sysdeps/ieee754/dbl-64/s_fma.c
++++ b/sysdeps/ieee754/dbl-64/s_fma.c
+@@ -244,6 +244,9 @@ __fma (double x, double y, double z)
+   /* Reset rounding mode and test for inexact simultaneously.  */
+   int j = libc_feupdateenv_test (&env, FE_INEXACT) != 0;
+ 
++  /* Ensure value of a1 + u.d is not reused.  */
++  a1 = math_opt_barrier (a1);
++
+   if (__glibc_likely (adjust == 0))
+     {
+       if ((u.ieee.mantissa1 & 1) == 0 && u.ieee.exponent != 0x7ff)
+
+commit ff10623706ea0096f3af7b38a3330ffb7fb15ae7
+Author: Joe Ramsay <Joe.Ramsay@arm.com>
+Date:   Mon Sep 9 13:00:01 2024 +0100
+
+    aarch64: Avoid redundant MOVs in AdvSIMD F32 logs
+    
+    Since the last operation is destructive, the first argument to the FMA
+    also has to be the first argument to the special-case in order to
+    avoid unnecessary MOVs. Reorder arguments and adjust special-case
+    bounds to facilitate this.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit 8b09af572b208bfde4d31c6abbae047dcc217675)
+
+diff --git a/sysdeps/aarch64/fpu/log10f_advsimd.c b/sysdeps/aarch64/fpu/log10f_advsimd.c
+index 9347422a77..82228b599a 100644
+--- a/sysdeps/aarch64/fpu/log10f_advsimd.c
++++ b/sysdeps/aarch64/fpu/log10f_advsimd.c
+@@ -22,11 +22,11 @@
+ 
+ static const struct data
+ {
+-  uint32x4_t min_norm;
++  uint32x4_t off, offset_lower_bound;
+   uint16x8_t special_bound;
++  uint32x4_t mantissa_mask;
+   float32x4_t poly[8];
+   float32x4_t inv_ln10, ln2;
+-  uint32x4_t off, mantissa_mask;
+ } data = {
+   /* Use order 9 for log10(1+x), i.e. order 8 for log10(1+x)/x, with x in
+       [-1/3, 1/3] (offset=2/3). Max. relative error: 0x1.068ee468p-25.  */
+@@ -35,18 +35,22 @@ static const struct data
+ 	    V4 (-0x1.0fc92cp-4f), V4 (0x1.f5f76ap-5f) },
+   .ln2 = V4 (0x1.62e43p-1f),
+   .inv_ln10 = V4 (0x1.bcb7b2p-2f),
+-  .min_norm = V4 (0x00800000),
+-  .special_bound = V8 (0x7f00), /* asuint32(inf) - min_norm.  */
++  /* Lower bound is the smallest positive normal float 0x00800000. For
++     optimised register use subnormals are detected after offset has been
++     subtracted, so lower bound is 0x0080000 - offset (which wraps around).  */
++  .offset_lower_bound = V4 (0x00800000 - 0x3f2aaaab),
++  .special_bound = V8 (0x7f00), /* top16(asuint32(inf) - 0x00800000).  */
+   .off = V4 (0x3f2aaaab),	/* 0.666667.  */
+   .mantissa_mask = V4 (0x007fffff),
+ };
+ 
+ static float32x4_t VPCS_ATTR NOINLINE
+-special_case (float32x4_t x, float32x4_t y, float32x4_t p, float32x4_t r2,
+-	      uint16x4_t cmp)
++special_case (float32x4_t y, uint32x4_t u_off, float32x4_t p, float32x4_t r2,
++	      uint16x4_t cmp, const struct data *d)
+ {
+   /* Fall back to scalar code.  */
+-  return v_call_f32 (log10f, x, vfmaq_f32 (y, p, r2), vmovl_u16 (cmp));
++  return v_call_f32 (log10f, vreinterpretq_f32_u32 (vaddq_u32 (u_off, d->off)),
++		     vfmaq_f32 (y, p, r2), vmovl_u16 (cmp));
+ }
+ 
+ /* Fast implementation of AdvSIMD log10f,
+@@ -58,15 +62,21 @@ special_case (float32x4_t x, float32x4_t y, float32x4_t p, float32x4_t r2,
+ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log10) (float32x4_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+-  uint32x4_t u = vreinterpretq_u32_f32 (x);
+-  uint16x4_t special = vcge_u16 (vsubhn_u32 (u, d->min_norm),
+-				 vget_low_u16 (d->special_bound));
++
++  /* To avoid having to mov x out of the way, keep u after offset has been
++     applied, and recover x by adding the offset back in the special-case
++     handler.  */
++  uint32x4_t u_off = vreinterpretq_u32_f32 (x);
+ 
+   /* x = 2^n * (1+r), where 2/3 < 1+r < 4/3.  */
+-  u = vsubq_u32 (u, d->off);
++  u_off = vsubq_u32 (u_off, d->off);
+   float32x4_t n = vcvtq_f32_s32 (
+-      vshrq_n_s32 (vreinterpretq_s32_u32 (u), 23)); /* signextend.  */
+-  u = vaddq_u32 (vandq_u32 (u, d->mantissa_mask), d->off);
++      vshrq_n_s32 (vreinterpretq_s32_u32 (u_off), 23)); /* signextend.  */
++
++  uint16x4_t special = vcge_u16 (vsubhn_u32 (u_off, d->offset_lower_bound),
++				 vget_low_u16 (d->special_bound));
++
++  uint32x4_t u = vaddq_u32 (vandq_u32 (u_off, d->mantissa_mask), d->off);
+   float32x4_t r = vsubq_f32 (vreinterpretq_f32_u32 (u), v_f32 (1.0f));
+ 
+   /* y = log10(1+r) + n * log10(2).  */
+@@ -77,7 +87,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log10) (float32x4_t x)
+   y = vmulq_f32 (y, d->inv_ln10);
+ 
+   if (__glibc_unlikely (v_any_u16h (special)))
+-    return special_case (x, y, poly, r2, special);
++    return special_case (y, u_off, poly, r2, special, d);
+   return vfmaq_f32 (y, poly, r2);
+ }
+ libmvec_hidden_def (V_NAME_F1 (log10))
+diff --git a/sysdeps/aarch64/fpu/log2f_advsimd.c b/sysdeps/aarch64/fpu/log2f_advsimd.c
+index db21836749..84effe4fe9 100644
+--- a/sysdeps/aarch64/fpu/log2f_advsimd.c
++++ b/sysdeps/aarch64/fpu/log2f_advsimd.c
+@@ -22,9 +22,9 @@
+ 
+ static const struct data
+ {
+-  uint32x4_t min_norm;
++  uint32x4_t off, offset_lower_bound;
+   uint16x8_t special_bound;
+-  uint32x4_t off, mantissa_mask;
++  uint32x4_t mantissa_mask;
+   float32x4_t poly[9];
+ } data = {
+   /* Coefficients generated using Remez algorithm approximate
+@@ -34,18 +34,22 @@ static const struct data
+ 	    V4 (-0x1.715458p-1f), V4 (0x1.ec701cp-2f), V4 (-0x1.7171a4p-2f),
+ 	    V4 (0x1.27a0b8p-2f), V4 (-0x1.e5143ep-3f), V4 (0x1.9d8ecap-3f),
+ 	    V4 (-0x1.c675bp-3f), V4 (0x1.9e495p-3f) },
+-  .min_norm = V4 (0x00800000),
+-  .special_bound = V8 (0x7f00), /* asuint32(inf) - min_norm.  */
++  /* Lower bound is the smallest positive normal float 0x00800000. For
++     optimised register use subnormals are detected after offset has been
++     subtracted, so lower bound is 0x0080000 - offset (which wraps around).  */
++  .offset_lower_bound = V4 (0x00800000 - 0x3f2aaaab),
++  .special_bound = V8 (0x7f00), /* top16(asuint32(inf) - 0x00800000).  */
+   .off = V4 (0x3f2aaaab),	/* 0.666667.  */
+   .mantissa_mask = V4 (0x007fffff),
+ };
+ 
+ static float32x4_t VPCS_ATTR NOINLINE
+-special_case (float32x4_t x, float32x4_t n, float32x4_t p, float32x4_t r,
+-	      uint16x4_t cmp)
++special_case (float32x4_t n, uint32x4_t u_off, float32x4_t p, float32x4_t r,
++	      uint16x4_t cmp, const struct data *d)
+ {
+   /* Fall back to scalar code.  */
+-  return v_call_f32 (log2f, x, vfmaq_f32 (n, p, r), vmovl_u16 (cmp));
++  return v_call_f32 (log2f, vreinterpretq_f32_u32 (vaddq_u32 (u_off, d->off)),
++		     vfmaq_f32 (n, p, r), vmovl_u16 (cmp));
+ }
+ 
+ /* Fast implementation for single precision AdvSIMD log2,
+@@ -56,15 +60,21 @@ special_case (float32x4_t x, float32x4_t n, float32x4_t p, float32x4_t r,
+ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log2) (float32x4_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+-  uint32x4_t u = vreinterpretq_u32_f32 (x);
+-  uint16x4_t special = vcge_u16 (vsubhn_u32 (u, d->min_norm),
+-				 vget_low_u16 (d->special_bound));
++
++  /* To avoid having to mov x out of the way, keep u after offset has been
++     applied, and recover x by adding the offset back in the special-case
++     handler.  */
++  uint32x4_t u_off = vreinterpretq_u32_f32 (x);
+ 
+   /* x = 2^n * (1+r), where 2/3 < 1+r < 4/3.  */
+-  u = vsubq_u32 (u, d->off);
++  u_off = vsubq_u32 (u_off, d->off);
+   float32x4_t n = vcvtq_f32_s32 (
+-      vshrq_n_s32 (vreinterpretq_s32_u32 (u), 23)); /* signextend.  */
+-  u = vaddq_u32 (vandq_u32 (u, d->mantissa_mask), d->off);
++      vshrq_n_s32 (vreinterpretq_s32_u32 (u_off), 23)); /* signextend.  */
++
++  uint16x4_t special = vcge_u16 (vsubhn_u32 (u_off, d->offset_lower_bound),
++				 vget_low_u16 (d->special_bound));
++
++  uint32x4_t u = vaddq_u32 (vandq_u32 (u_off, d->mantissa_mask), d->off);
+   float32x4_t r = vsubq_f32 (vreinterpretq_f32_u32 (u), v_f32 (1.0f));
+ 
+   /* y = log2(1+r) + n.  */
+@@ -72,7 +82,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log2) (float32x4_t x)
+   float32x4_t p = v_pw_horner_8_f32 (r, r2, d->poly);
+ 
+   if (__glibc_unlikely (v_any_u16h (special)))
+-    return special_case (x, n, p, r, special);
++    return special_case (n, u_off, p, r, special, d);
+   return vfmaq_f32 (n, p, r);
+ }
+ libmvec_hidden_def (V_NAME_F1 (log2))
+diff --git a/sysdeps/aarch64/fpu/logf_advsimd.c b/sysdeps/aarch64/fpu/logf_advsimd.c
+index 3c0d0fcdc7..c20dbfd6c0 100644
+--- a/sysdeps/aarch64/fpu/logf_advsimd.c
++++ b/sysdeps/aarch64/fpu/logf_advsimd.c
+@@ -21,20 +21,22 @@
+ 
+ static const struct data
+ {
+-  uint32x4_t min_norm;
++  uint32x4_t off, offset_lower_bound;
+   uint16x8_t special_bound;
++  uint32x4_t mantissa_mask;
+   float32x4_t poly[7];
+-  float32x4_t ln2, tiny_bound;
+-  uint32x4_t off, mantissa_mask;
++  float32x4_t ln2;
+ } data = {
+   /* 3.34 ulp error.  */
+   .poly = { V4 (-0x1.3e737cp-3f), V4 (0x1.5a9aa2p-3f), V4 (-0x1.4f9934p-3f),
+ 	    V4 (0x1.961348p-3f), V4 (-0x1.00187cp-2f), V4 (0x1.555d7cp-2f),
+ 	    V4 (-0x1.ffffc8p-2f) },
+   .ln2 = V4 (0x1.62e43p-1f),
+-  .tiny_bound = V4 (0x1p-126),
+-  .min_norm = V4 (0x00800000),
+-  .special_bound = V8 (0x7f00), /* asuint32(inf) - min_norm.  */
++  /* Lower bound is the smallest positive normal float 0x00800000. For
++     optimised register use subnormals are detected after offset has been
++     subtracted, so lower bound is 0x0080000 - offset (which wraps around).  */
++  .offset_lower_bound = V4 (0x00800000 - 0x3f2aaaab),
++  .special_bound = V8 (0x7f00), /* top16(asuint32(inf) - 0x00800000).  */
+   .off = V4 (0x3f2aaaab),	/* 0.666667.  */
+   .mantissa_mask = V4 (0x007fffff)
+ };
+@@ -42,32 +44,37 @@ static const struct data
+ #define P(i) d->poly[7 - i]
+ 
+ static float32x4_t VPCS_ATTR NOINLINE
+-special_case (float32x4_t x, float32x4_t y, float32x4_t r2, float32x4_t p,
+-	      uint16x4_t cmp)
++special_case (float32x4_t p, uint32x4_t u_off, float32x4_t y, float32x4_t r2,
++	      uint16x4_t cmp, const struct data *d)
+ {
+   /* Fall back to scalar code.  */
+-  return v_call_f32 (logf, x, vfmaq_f32 (p, y, r2), vmovl_u16 (cmp));
++  return v_call_f32 (logf, vreinterpretq_f32_u32 (vaddq_u32 (u_off, d->off)),
++		     vfmaq_f32 (p, y, r2), vmovl_u16 (cmp));
+ }
+ 
+ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log) (float32x4_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+   float32x4_t n, p, q, r, r2, y;
+-  uint32x4_t u;
++  uint32x4_t u, u_off;
+   uint16x4_t cmp;
+ 
+-  u = vreinterpretq_u32_f32 (x);
+-  cmp = vcge_u16 (vsubhn_u32 (u, d->min_norm),
+-		  vget_low_u16 (d->special_bound));
++  /* To avoid having to mov x out of the way, keep u after offset has been
++     applied, and recover x by adding the offset back in the special-case
++     handler.  */
++  u_off = vreinterpretq_u32_f32 (x);
+ 
+   /* x = 2^n * (1+r), where 2/3 < 1+r < 4/3.  */
+-  u = vsubq_u32 (u, d->off);
++  u_off = vsubq_u32 (u_off, d->off);
+   n = vcvtq_f32_s32 (
+-      vshrq_n_s32 (vreinterpretq_s32_u32 (u), 23)); /* signextend.  */
+-  u = vandq_u32 (u, d->mantissa_mask);
++      vshrq_n_s32 (vreinterpretq_s32_u32 (u_off), 23)); /* signextend.  */
++  u = vandq_u32 (u_off, d->mantissa_mask);
+   u = vaddq_u32 (u, d->off);
+   r = vsubq_f32 (vreinterpretq_f32_u32 (u), v_f32 (1.0f));
+ 
++  cmp = vcge_u16 (vsubhn_u32 (u_off, d->offset_lower_bound),
++		  vget_low_u16 (d->special_bound));
++
+   /* y = log(1+r) + n*ln2.  */
+   r2 = vmulq_f32 (r, r);
+   /* n*ln2 + r + r2*(P1 + r*P2 + r2*(P3 + r*P4 + r2*(P5 + r*P6 + r2*P7))).  */
+@@ -80,7 +87,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log) (float32x4_t x)
+   p = vfmaq_f32 (r, d->ln2, n);
+ 
+   if (__glibc_unlikely (v_any_u16h (cmp)))
+-    return special_case (x, y, r2, p, cmp);
++    return special_case (p, u_off, y, r2, cmp, d);
+   return vfmaq_f32 (p, y, r2);
+ }
+ libmvec_hidden_def (V_NAME_F1 (log))
+
+commit a991a0fc7c051d7ef2ea7778e0a699f22d4e53d7
+Author: Joe Ramsay <Joe.Ramsay@arm.com>
+Date:   Thu Sep 19 17:34:02 2024 +0100
+
+    AArch64: Add vector logp1 alias for log1p
+    
+    This enables vectorisation of C23 logp1, which is an alias for log1p.
+    There are no new tests or ulp entries because the new symbols are simply
+    aliases.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit 751a5502bea1d13551c62c47bb9bd25bff870cda)
+
+diff --git a/bits/libm-simd-decl-stubs.h b/bits/libm-simd-decl-stubs.h
+index 08a41c46ad..5019e8e25c 100644
+--- a/bits/libm-simd-decl-stubs.h
++++ b/bits/libm-simd-decl-stubs.h
+@@ -253,6 +253,17 @@
+ #define __DECL_SIMD_log1pf64x
+ #define __DECL_SIMD_log1pf128x
+ 
++#define __DECL_SIMD_logp1
++#define __DECL_SIMD_logp1f
++#define __DECL_SIMD_logp1l
++#define __DECL_SIMD_logp1f16
++#define __DECL_SIMD_logp1f32
++#define __DECL_SIMD_logp1f64
++#define __DECL_SIMD_logp1f128
++#define __DECL_SIMD_logp1f32x
++#define __DECL_SIMD_logp1f64x
++#define __DECL_SIMD_logp1f128x
++
+ #define __DECL_SIMD_atanh
+ #define __DECL_SIMD_atanhf
+ #define __DECL_SIMD_atanhl
+diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h
+index 6cb594b6ff..92856becc4 100644
+--- a/math/bits/mathcalls.h
++++ b/math/bits/mathcalls.h
+@@ -126,7 +126,7 @@ __MATHCALL (log2p1,, (_Mdouble_ __x));
+ __MATHCALL (log10p1,, (_Mdouble_ __x));
+ 
+ /* Return log(1 + X).  */
+-__MATHCALL (logp1,, (_Mdouble_ __x));
++__MATHCALL_VEC (logp1,, (_Mdouble_ __x));
+ #endif
+ 
+ #if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
+diff --git a/sysdeps/aarch64/fpu/Versions b/sysdeps/aarch64/fpu/Versions
+index cc15ce2d1e..015211f5f4 100644
+--- a/sysdeps/aarch64/fpu/Versions
++++ b/sysdeps/aarch64/fpu/Versions
+@@ -135,4 +135,11 @@ libmvec {
+     _ZGVsMxv_tanh;
+     _ZGVsMxv_tanhf;
+   }
++  GLIBC_2.41 {
++    _ZGVnN2v_logp1;
++    _ZGVnN2v_logp1f;
++    _ZGVnN4v_logp1f;
++    _ZGVsMxv_logp1;
++    _ZGVsMxv_logp1f;
++  }
+ }
+diff --git a/sysdeps/aarch64/fpu/advsimd_f32_protos.h b/sysdeps/aarch64/fpu/advsimd_f32_protos.h
+index 097d403ffe..5909bb4ce9 100644
+--- a/sysdeps/aarch64/fpu/advsimd_f32_protos.h
++++ b/sysdeps/aarch64/fpu/advsimd_f32_protos.h
+@@ -36,6 +36,7 @@ libmvec_hidden_proto (V_NAME_F2(hypot));
+ libmvec_hidden_proto (V_NAME_F1(log10));
+ libmvec_hidden_proto (V_NAME_F1(log1p));
+ libmvec_hidden_proto (V_NAME_F1(log2));
++libmvec_hidden_proto (V_NAME_F1(logp1));
+ libmvec_hidden_proto (V_NAME_F1(log));
+ libmvec_hidden_proto (V_NAME_F2(pow));
+ libmvec_hidden_proto (V_NAME_F1(sin));
+diff --git a/sysdeps/aarch64/fpu/bits/math-vector.h b/sysdeps/aarch64/fpu/bits/math-vector.h
+index 7484150131..f295fe185d 100644
+--- a/sysdeps/aarch64/fpu/bits/math-vector.h
++++ b/sysdeps/aarch64/fpu/bits/math-vector.h
+@@ -113,6 +113,10 @@
+ # define __DECL_SIMD_log2 __DECL_SIMD_aarch64
+ # undef __DECL_SIMD_log2f
+ # define __DECL_SIMD_log2f __DECL_SIMD_aarch64
++# undef __DECL_SIMD_logp1
++# define __DECL_SIMD_logp1 __DECL_SIMD_aarch64
++# undef __DECL_SIMD_logp1f
++# define __DECL_SIMD_logp1f __DECL_SIMD_aarch64
+ # undef __DECL_SIMD_pow
+ # define __DECL_SIMD_pow __DECL_SIMD_aarch64
+ # undef __DECL_SIMD_powf
+@@ -180,6 +184,7 @@ __vpcs __f32x4_t _ZGVnN4v_logf (__f32x4_t);
+ __vpcs __f32x4_t _ZGVnN4v_log10f (__f32x4_t);
+ __vpcs __f32x4_t _ZGVnN4v_log1pf (__f32x4_t);
+ __vpcs __f32x4_t _ZGVnN4v_log2f (__f32x4_t);
++__vpcs __f32x4_t _ZGVnN4v_logp1f (__f32x4_t);
+ __vpcs __f32x4_t _ZGVnN4vv_powf (__f32x4_t, __f32x4_t);
+ __vpcs __f32x4_t _ZGVnN4v_sinf (__f32x4_t);
+ __vpcs __f32x4_t _ZGVnN4v_sinhf (__f32x4_t);
+@@ -207,6 +212,7 @@ __vpcs __f64x2_t _ZGVnN2v_log (__f64x2_t);
+ __vpcs __f64x2_t _ZGVnN2v_log10 (__f64x2_t);
+ __vpcs __f64x2_t _ZGVnN2v_log1p (__f64x2_t);
+ __vpcs __f64x2_t _ZGVnN2v_log2 (__f64x2_t);
++__vpcs __f64x2_t _ZGVnN2v_logp1 (__f64x2_t);
+ __vpcs __f64x2_t _ZGVnN2vv_pow (__f64x2_t, __f64x2_t);
+ __vpcs __f64x2_t _ZGVnN2v_sin (__f64x2_t);
+ __vpcs __f64x2_t _ZGVnN2v_sinh (__f64x2_t);
+@@ -239,6 +245,7 @@ __sv_f32_t _ZGVsMxv_logf (__sv_f32_t, __sv_bool_t);
+ __sv_f32_t _ZGVsMxv_log10f (__sv_f32_t, __sv_bool_t);
+ __sv_f32_t _ZGVsMxv_log1pf (__sv_f32_t, __sv_bool_t);
+ __sv_f32_t _ZGVsMxv_log2f (__sv_f32_t, __sv_bool_t);
++__sv_f32_t _ZGVsMxv_logp1f (__sv_f32_t, __sv_bool_t);
+ __sv_f32_t _ZGVsMxvv_powf (__sv_f32_t, __sv_f32_t, __sv_bool_t);
+ __sv_f32_t _ZGVsMxv_sinf (__sv_f32_t, __sv_bool_t);
+ __sv_f32_t _ZGVsMxv_sinhf (__sv_f32_t, __sv_bool_t);
+@@ -266,6 +273,7 @@ __sv_f64_t _ZGVsMxv_log (__sv_f64_t, __sv_bool_t);
+ __sv_f64_t _ZGVsMxv_log10 (__sv_f64_t, __sv_bool_t);
+ __sv_f64_t _ZGVsMxv_log1p (__sv_f64_t, __sv_bool_t);
+ __sv_f64_t _ZGVsMxv_log2 (__sv_f64_t, __sv_bool_t);
++__sv_f64_t _ZGVsMxv_logp1 (__sv_f64_t, __sv_bool_t);
+ __sv_f64_t _ZGVsMxvv_pow (__sv_f64_t, __sv_f64_t, __sv_bool_t);
+ __sv_f64_t _ZGVsMxv_sin (__sv_f64_t, __sv_bool_t);
+ __sv_f64_t _ZGVsMxv_sinh (__sv_f64_t, __sv_bool_t);
+diff --git a/sysdeps/aarch64/fpu/log1p_advsimd.c b/sysdeps/aarch64/fpu/log1p_advsimd.c
+index ffc418fc9c..114064c696 100644
+--- a/sysdeps/aarch64/fpu/log1p_advsimd.c
++++ b/sysdeps/aarch64/fpu/log1p_advsimd.c
+@@ -127,3 +127,5 @@ VPCS_ATTR float64x2_t V_NAME_D1 (log1p) (float64x2_t x)
+ 
+   return vfmaq_f64 (y, f2, p);
+ }
++
++strong_alias (V_NAME_D1 (log1p), V_NAME_D1 (logp1))
+diff --git a/sysdeps/aarch64/fpu/log1p_sve.c b/sysdeps/aarch64/fpu/log1p_sve.c
+index 04f7e5720e..b21cfb2c90 100644
+--- a/sysdeps/aarch64/fpu/log1p_sve.c
++++ b/sysdeps/aarch64/fpu/log1p_sve.c
+@@ -116,3 +116,5 @@ svfloat64_t SV_NAME_D1 (log1p) (svfloat64_t x, svbool_t pg)
+ 
+   return y;
+ }
++
++strong_alias (SV_NAME_D1 (log1p), SV_NAME_D1 (logp1))
+diff --git a/sysdeps/aarch64/fpu/log1pf_advsimd.c b/sysdeps/aarch64/fpu/log1pf_advsimd.c
+index dc15334a85..8cfa28fb8a 100644
+--- a/sysdeps/aarch64/fpu/log1pf_advsimd.c
++++ b/sysdeps/aarch64/fpu/log1pf_advsimd.c
+@@ -128,3 +128,6 @@ VPCS_ATTR float32x4_t V_NAME_F1 (log1p) (float32x4_t x)
+ }
+ libmvec_hidden_def (V_NAME_F1 (log1p))
+ HALF_WIDTH_ALIAS_F1 (log1p)
++strong_alias (V_NAME_F1 (log1p), V_NAME_F1 (logp1))
++libmvec_hidden_def (V_NAME_F1 (logp1))
++HALF_WIDTH_ALIAS_F1 (logp1)
+diff --git a/sysdeps/aarch64/fpu/log1pf_sve.c b/sysdeps/aarch64/fpu/log1pf_sve.c
+index f645cc997e..5256d5e94c 100644
+--- a/sysdeps/aarch64/fpu/log1pf_sve.c
++++ b/sysdeps/aarch64/fpu/log1pf_sve.c
+@@ -98,3 +98,5 @@ svfloat32_t SV_NAME_F1 (log1p) (svfloat32_t x, svbool_t pg)
+ 
+   return y;
+ }
++
++strong_alias (SV_NAME_F1 (log1p), SV_NAME_F1 (logp1))
+diff --git a/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist b/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist
+index b685106954..98687cae0d 100644
+--- a/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist
++++ b/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist
+@@ -128,3 +128,8 @@ GLIBC_2.40 _ZGVsMxvv_hypot F
+ GLIBC_2.40 _ZGVsMxvv_hypotf F
+ GLIBC_2.40 _ZGVsMxvv_pow F
+ GLIBC_2.40 _ZGVsMxvv_powf F
++GLIBC_2.41 _ZGVnN2v_logp1 F
++GLIBC_2.41 _ZGVnN2v_logp1f F
++GLIBC_2.41 _ZGVnN4v_logp1f F
++GLIBC_2.41 _ZGVsMxv_logp1 F
++GLIBC_2.41 _ZGVsMxv_logp1f F
+
+commit 354aeaf2130c1484007025563fe87c997f07324a
+Author: Joe Ramsay <Joe.Ramsay@arm.com>
+Date:   Mon Sep 23 15:26:12 2024 +0100
+
+    AArch64: Improve codegen in SVE expf & related routines
+    
+    Reduce MOV and MOVPRFX by improving special-case handling.  Use inline
+    helper to duplicate the entire computation between the special- and
+    non-special case branches, removing the contention for z0 between x
+    and the return value.
+    
+    Also rearrange some MLAs and MLSs - by making the multiplicand the
+    destination we can avoid a MOVPRFX in several cases.  Also change which
+    constants go in the vector used for lanewise ops - the last lane is no
+    longer wasted.
+    
+    Spotted that shift was incorrect in exp2f and exp10f, w.r.t. to the
+    comment that explains it.  Fixed - worst-case ULP for exp2f moves
+    around but it doesn't change significantly for either routine.
+    
+    Worst-case error for coshf increases due to passing x to exp rather
+    than abs(x) - updated the comment, but does not require regen-ulps.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit 7b8c134b5460ed933d610fa92ed1227372b68fdc)
+
+diff --git a/sysdeps/aarch64/fpu/coshf_sve.c b/sysdeps/aarch64/fpu/coshf_sve.c
+index e5d8a299c6..7ad6efa0fc 100644
+--- a/sysdeps/aarch64/fpu/coshf_sve.c
++++ b/sysdeps/aarch64/fpu/coshf_sve.c
+@@ -23,37 +23,42 @@
+ static const struct data
+ {
+   struct sv_expf_data expf_consts;
+-  uint32_t special_bound;
++  float special_bound;
+ } data = {
+   .expf_consts = SV_EXPF_DATA,
+   /* 0x1.5a92d8p+6: expf overflows above this, so have to use special case.  */
+-  .special_bound = 0x42ad496c,
++  .special_bound = 0x1.5a92d8p+6,
+ };
+ 
+ static svfloat32_t NOINLINE
+-special_case (svfloat32_t x, svfloat32_t y, svbool_t pg)
++special_case (svfloat32_t x, svfloat32_t half_e, svfloat32_t half_over_e,
++	      svbool_t pg)
+ {
+-  return sv_call_f32 (coshf, x, y, pg);
++  return sv_call_f32 (coshf, x, svadd_x (svptrue_b32 (), half_e, half_over_e),
++		      pg);
+ }
+ 
+ /* Single-precision vector cosh, using vector expf.
+-   Maximum error is 1.89 ULP:
+-   _ZGVsMxv_coshf (-0x1.65898cp+6) got 0x1.f00aep+127
+-				  want 0x1.f00adcp+127.  */
++   Maximum error is 2.77 ULP:
++   _ZGVsMxv_coshf(-0x1.5b38f4p+1) got 0x1.e45946p+2
++				 want 0x1.e4594cp+2.  */
+ svfloat32_t SV_NAME_F1 (cosh) (svfloat32_t x, svbool_t pg)
+ {
+   const struct data *d = ptr_barrier (&data);
+ 
+-  svfloat32_t ax = svabs_x (pg, x);
+-  svbool_t special = svcmpge (pg, svreinterpret_u32 (ax), d->special_bound);
++  svbool_t special = svacge (pg, x, d->special_bound);
+ 
+-  /* Calculate cosh by exp(x) / 2 + exp(-x) / 2.  */
+-  svfloat32_t t = expf_inline (ax, pg, &d->expf_consts);
+-  svfloat32_t half_t = svmul_x (pg, t, 0.5);
+-  svfloat32_t half_over_t = svdivr_x (pg, t, 0.5);
++  /* Calculate cosh by exp(x) / 2 + exp(-x) / 2.
++     Note that x is passed to exp here, rather than |x|. This is to avoid using
++     destructive unary ABS for better register usage. However it means the
++     routine is not exactly symmetrical, as the exp helper is slightly less
++     accurate in the negative range.  */
++  svfloat32_t e = expf_inline (x, pg, &d->expf_consts);
++  svfloat32_t half_e = svmul_x (svptrue_b32 (), e, 0.5);
++  svfloat32_t half_over_e = svdivr_x (pg, e, 0.5);
+ 
+   if (__glibc_unlikely (svptest_any (pg, special)))
+-    return special_case (x, svadd_x (pg, half_t, half_over_t), special);
++    return special_case (x, half_e, half_over_e, special);
+ 
+-  return svadd_x (pg, half_t, half_over_t);
++  return svadd_x (svptrue_b32 (), half_e, half_over_e);
+ }
+diff --git a/sysdeps/aarch64/fpu/exp10f_sve.c b/sysdeps/aarch64/fpu/exp10f_sve.c
+index e09b2f3b27..8aa3fa9c43 100644
+--- a/sysdeps/aarch64/fpu/exp10f_sve.c
++++ b/sysdeps/aarch64/fpu/exp10f_sve.c
+@@ -18,74 +18,83 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include "sv_math.h"
+-#include "poly_sve_f32.h"
+ 
+-/* For x < -SpecialBound, the result is subnormal and not handled correctly by
++/* For x < -Thres, the result is subnormal and not handled correctly by
+    FEXPA.  */
+-#define SpecialBound 37.9
++#define Thres 37.9
+ 
+ static const struct data
+ {
+-  float poly[5];
+-  float shift, log10_2, log2_10_hi, log2_10_lo, special_bound;
++  float log2_10_lo, c0, c2, c4;
++  float c1, c3, log10_2;
++  float shift, log2_10_hi, thres;
+ } data = {
+   /* Coefficients generated using Remez algorithm with minimisation of relative
+      error.
+      rel error: 0x1.89dafa3p-24
+      abs error: 0x1.167d55p-23 in [-log10(2)/2, log10(2)/2]
+      maxerr: 0.52 +0.5 ulp.  */
+-  .poly = { 0x1.26bb16p+1f, 0x1.5350d2p+1f, 0x1.04744ap+1f, 0x1.2d8176p+0f,
+-	    0x1.12b41ap-1f },
++  .c0 = 0x1.26bb16p+1f,
++  .c1 = 0x1.5350d2p+1f,
++  .c2 = 0x1.04744ap+1f,
++  .c3 = 0x1.2d8176p+0f,
++  .c4 = 0x1.12b41ap-1f,
+   /* 1.5*2^17 + 127, a shift value suitable for FEXPA.  */
+-  .shift = 0x1.903f8p17f,
++  .shift = 0x1.803f8p17f,
+   .log10_2 = 0x1.a934fp+1,
+   .log2_10_hi = 0x1.344136p-2,
+   .log2_10_lo = -0x1.ec10cp-27,
+-  .special_bound = SpecialBound,
++  .thres = Thres,
+ };
+ 
+-static svfloat32_t NOINLINE
+-special_case (svfloat32_t x, svfloat32_t y, svbool_t special)
++static inline svfloat32_t
++sv_exp10f_inline (svfloat32_t x, const svbool_t pg, const struct data *d)
+ {
+-  return sv_call_f32 (exp10f, x, y, special);
+-}
+-
+-/* Single-precision SVE exp10f routine. Implements the same algorithm
+-   as AdvSIMD exp10f.
+-   Worst case error is 1.02 ULPs.
+-   _ZGVsMxv_exp10f(-0x1.040488p-4) got 0x1.ba5f9ep-1
+-				  want 0x1.ba5f9cp-1.  */
+-svfloat32_t SV_NAME_F1 (exp10) (svfloat32_t x, const svbool_t pg)
+-{
+-  const struct data *d = ptr_barrier (&data);
+   /* exp10(x) = 2^(n/N) * 10^r = 2^n * (1 + poly (r)),
+      with poly(r) in [1/sqrt(2), sqrt(2)] and
+      x = r + n * log10(2) / N, with r in [-log10(2)/2N, log10(2)/2N].  */
+ 
+-  /* Load some constants in quad-word chunks to minimise memory access (last
+-     lane is wasted).  */
+-  svfloat32_t log10_2_and_inv = svld1rq (svptrue_b32 (), &d->log10_2);
++  svfloat32_t lane_consts = svld1rq (svptrue_b32 (), &d->log2_10_lo);
+ 
+   /* n = round(x/(log10(2)/N)).  */
+   svfloat32_t shift = sv_f32 (d->shift);
+-  svfloat32_t z = svmla_lane (shift, x, log10_2_and_inv, 0);
+-  svfloat32_t n = svsub_x (pg, z, shift);
++  svfloat32_t z = svmad_x (pg, sv_f32 (d->log10_2), x, shift);
++  svfloat32_t n = svsub_x (svptrue_b32 (), z, shift);
+ 
+   /* r = x - n*log10(2)/N.  */
+-  svfloat32_t r = svmls_lane (x, n, log10_2_and_inv, 1);
+-  r = svmls_lane (r, n, log10_2_and_inv, 2);
++  svfloat32_t r = svmsb_x (pg, sv_f32 (d->log2_10_hi), n, x);
++  r = svmls_lane (r, n, lane_consts, 0);
+ 
+-  svbool_t special = svacgt (pg, x, d->special_bound);
+   svfloat32_t scale = svexpa (svreinterpret_u32 (z));
+ 
+   /* Polynomial evaluation: poly(r) ~ exp10(r)-1.  */
+-  svfloat32_t r2 = svmul_x (pg, r, r);
+-  svfloat32_t poly
+-      = svmla_x (pg, svmul_x (pg, r, d->poly[0]),
+-		 sv_pairwise_poly_3_f32_x (pg, r, r2, d->poly + 1), r2);
+-
+-  if (__glibc_unlikely (svptest_any (pg, special)))
+-    return special_case (x, svmla_x (pg, scale, scale, poly), special);
++  svfloat32_t p12 = svmla_lane (sv_f32 (d->c1), r, lane_consts, 2);
++  svfloat32_t p34 = svmla_lane (sv_f32 (d->c3), r, lane_consts, 3);
++  svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r);
++  svfloat32_t p14 = svmla_x (pg, p12, p34, r2);
++  svfloat32_t p0 = svmul_lane (r, lane_consts, 1);
++  svfloat32_t poly = svmla_x (pg, p0, r2, p14);
+ 
+   return svmla_x (pg, scale, scale, poly);
+ }
++
++static svfloat32_t NOINLINE
++special_case (svfloat32_t x, svbool_t special, const struct data *d)
++{
++  return sv_call_f32 (exp10f, x, sv_exp10f_inline (x, svptrue_b32 (), d),
++		      special);
++}
++
++/* Single-precision SVE exp10f routine. Implements the same algorithm
++   as AdvSIMD exp10f.
++   Worst case error is 1.02 ULPs.
++   _ZGVsMxv_exp10f(-0x1.040488p-4) got 0x1.ba5f9ep-1
++				  want 0x1.ba5f9cp-1.  */
++svfloat32_t SV_NAME_F1 (exp10) (svfloat32_t x, const svbool_t pg)
++{
++  const struct data *d = ptr_barrier (&data);
++  svbool_t special = svacgt (pg, x, d->thres);
++  if (__glibc_unlikely (svptest_any (special, special)))
++    return special_case (x, special, d);
++  return sv_exp10f_inline (x, pg, d);
++}
+diff --git a/sysdeps/aarch64/fpu/exp2f_sve.c b/sysdeps/aarch64/fpu/exp2f_sve.c
+index 8a686e3e05..c6216bed9e 100644
+--- a/sysdeps/aarch64/fpu/exp2f_sve.c
++++ b/sysdeps/aarch64/fpu/exp2f_sve.c
+@@ -24,54 +24,64 @@
+ 
+ static const struct data
+ {
+-  float poly[5];
++  float c0, c2, c4, c1, c3;
+   float shift, thres;
+ } data = {
+-  /* Coefficients copied from the polynomial in AdvSIMD variant, reversed for
+-     compatibility with polynomial helpers.  */
+-  .poly = { 0x1.62e422p-1f, 0x1.ebf9bcp-3f, 0x1.c6bd32p-5f, 0x1.3ce9e4p-7f,
+-	    0x1.59977ap-10f },
++  /* Coefficients copied from the polynomial in AdvSIMD variant.  */
++  .c0 = 0x1.62e422p-1f,
++  .c1 = 0x1.ebf9bcp-3f,
++  .c2 = 0x1.c6bd32p-5f,
++  .c3 = 0x1.3ce9e4p-7f,
++  .c4 = 0x1.59977ap-10f,
+   /* 1.5*2^17 + 127.  */
+-  .shift = 0x1.903f8p17f,
++  .shift = 0x1.803f8p17f,
+   /* Roughly 87.3. For x < -Thres, the result is subnormal and not handled
+      correctly by FEXPA.  */
+   .thres = Thres,
+ };
+ 
+-static svfloat32_t NOINLINE
+-special_case (svfloat32_t x, svfloat32_t y, svbool_t special)
+-{
+-  return sv_call_f32 (exp2f, x, y, special);
+-}
+-
+-/* Single-precision SVE exp2f routine. Implements the same algorithm
+-   as AdvSIMD exp2f.
+-   Worst case error is 1.04 ULPs.
+-   SV_NAME_F1 (exp2)(0x1.943b9p-1) got 0x1.ba7eb2p+0
+-				  want 0x1.ba7ebp+0.  */
+-svfloat32_t SV_NAME_F1 (exp2) (svfloat32_t x, const svbool_t pg)
++static inline svfloat32_t
++sv_exp2f_inline (svfloat32_t x, const svbool_t pg, const struct data *d)
+ {
+-  const struct data *d = ptr_barrier (&data);
+   /* exp2(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)]
+     x = n + r, with r in [-1/2, 1/2].  */
+-  svfloat32_t shift = sv_f32 (d->shift);
+-  svfloat32_t z = svadd_x (pg, x, shift);
+-  svfloat32_t n = svsub_x (pg, z, shift);
+-  svfloat32_t r = svsub_x (pg, x, n);
++  svfloat32_t z = svadd_x (svptrue_b32 (), x, d->shift);
++  svfloat32_t n = svsub_x (svptrue_b32 (), z, d->shift);
++  svfloat32_t r = svsub_x (svptrue_b32 (), x, n);
+ 
+-  svbool_t special = svacgt (pg, x, d->thres);
+   svfloat32_t scale = svexpa (svreinterpret_u32 (z));
+ 
+   /* Polynomial evaluation: poly(r) ~ exp2(r)-1.
+      Evaluate polynomial use hybrid scheme - offset ESTRIN by 1 for
+      coefficients 1 to 4, and apply most significant coefficient directly.  */
+-  svfloat32_t r2 = svmul_x (pg, r, r);
+-  svfloat32_t p14 = sv_pairwise_poly_3_f32_x (pg, r, r2, d->poly + 1);
+-  svfloat32_t p0 = svmul_x (pg, r, d->poly[0]);
++  svfloat32_t even_coeffs = svld1rq (svptrue_b32 (), &d->c0);
++  svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r);
++  svfloat32_t p12 = svmla_lane (sv_f32 (d->c1), r, even_coeffs, 1);
++  svfloat32_t p34 = svmla_lane (sv_f32 (d->c3), r, even_coeffs, 2);
++  svfloat32_t p14 = svmla_x (pg, p12, r2, p34);
++  svfloat32_t p0 = svmul_lane (r, even_coeffs, 0);
+   svfloat32_t poly = svmla_x (pg, p0, r2, p14);
+ 
+-  if (__glibc_unlikely (svptest_any (pg, special)))
+-    return special_case (x, svmla_x (pg, scale, scale, poly), special);
+-
+   return svmla_x (pg, scale, scale, poly);
+ }
++
++static svfloat32_t NOINLINE
++special_case (svfloat32_t x, svbool_t special, const struct data *d)
++{
++  return sv_call_f32 (exp2f, x, sv_exp2f_inline (x, svptrue_b32 (), d),
++		      special);
++}
++
++/* Single-precision SVE exp2f routine. Implements the same algorithm
++   as AdvSIMD exp2f.
++   Worst case error is 1.04 ULPs.
++   _ZGVsMxv_exp2f(-0x1.af994ap-3) got 0x1.ba6a66p-1
++				 want 0x1.ba6a64p-1.  */
++svfloat32_t SV_NAME_F1 (exp2) (svfloat32_t x, const svbool_t pg)
++{
++  const struct data *d = ptr_barrier (&data);
++  svbool_t special = svacgt (pg, x, d->thres);
++  if (__glibc_unlikely (svptest_any (special, special)))
++    return special_case (x, special, d);
++  return sv_exp2f_inline (x, pg, d);
++}
+diff --git a/sysdeps/aarch64/fpu/expf_sve.c b/sysdeps/aarch64/fpu/expf_sve.c
+index 3ba79bc4f1..da93e01b87 100644
+--- a/sysdeps/aarch64/fpu/expf_sve.c
++++ b/sysdeps/aarch64/fpu/expf_sve.c
+@@ -18,33 +18,25 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include "sv_math.h"
++#include "sv_expf_inline.h"
++
++/* Roughly 87.3. For x < -Thres, the result is subnormal and not handled
++   correctly by FEXPA.  */
++#define Thres 0x1.5d5e2ap+6f
+ 
+ static const struct data
+ {
+-  float poly[5];
+-  float inv_ln2, ln2_hi, ln2_lo, shift, thres;
++  struct sv_expf_data d;
++  float thres;
+ } data = {
+-  /* Coefficients copied from the polynomial in AdvSIMD variant, reversed for
+-     compatibility with polynomial helpers.  */
+-  .poly = { 0x1.ffffecp-1f, 0x1.fffdb6p-2f, 0x1.555e66p-3f, 0x1.573e2ep-5f,
+-	    0x1.0e4020p-7f },
+-  .inv_ln2 = 0x1.715476p+0f,
+-  .ln2_hi = 0x1.62e4p-1f,
+-  .ln2_lo = 0x1.7f7d1cp-20f,
+-  /* 1.5*2^17 + 127.  */
+-  .shift = 0x1.903f8p17f,
+-  /* Roughly 87.3. For x < -Thres, the result is subnormal and not handled
+-     correctly by FEXPA.  */
+-  .thres = 0x1.5d5e2ap+6f,
++  .d = SV_EXPF_DATA,
++  .thres = Thres,
+ };
+ 
+-#define C(i) sv_f32 (d->poly[i])
+-#define ExponentBias 0x3f800000
+-
+ static svfloat32_t NOINLINE
+-special_case (svfloat32_t x, svfloat32_t y, svbool_t special)
++special_case (svfloat32_t x, svbool_t special, const struct sv_expf_data *d)
+ {
+-  return sv_call_f32 (expf, x, y, special);
++  return sv_call_f32 (expf, x, expf_inline (x, svptrue_b32 (), d), special);
+ }
+ 
+ /* Optimised single-precision SVE exp function.
+@@ -54,36 +46,8 @@ special_case (svfloat32_t x, svfloat32_t y, svbool_t special)
+ svfloat32_t SV_NAME_F1 (exp) (svfloat32_t x, const svbool_t pg)
+ {
+   const struct data *d = ptr_barrier (&data);
+-
+-  /* exp(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)]
+-     x = ln2*n + r, with r in [-ln2/2, ln2/2].  */
+-
+-  /* Load some constants in quad-word chunks to minimise memory access (last
+-     lane is wasted).  */
+-  svfloat32_t invln2_and_ln2 = svld1rq (svptrue_b32 (), &d->inv_ln2);
+-
+-  /* n = round(x/(ln2/N)).  */
+-  svfloat32_t z = svmla_lane (sv_f32 (d->shift), x, invln2_and_ln2, 0);
+-  svfloat32_t n = svsub_x (pg, z, d->shift);
+-
+-  /* r = x - n*ln2/N.  */
+-  svfloat32_t r = svmls_lane (x, n, invln2_and_ln2, 1);
+-  r = svmls_lane (r, n, invln2_and_ln2, 2);
+-
+-  /* scale = 2^(n/N).  */
+   svbool_t is_special_case = svacgt (pg, x, d->thres);
+-  svfloat32_t scale = svexpa (svreinterpret_u32 (z));
+-
+-  /* y = exp(r) - 1 ~= r + C0 r^2 + C1 r^3 + C2 r^4 + C3 r^5 + C4 r^6.  */
+-  svfloat32_t p12 = svmla_x (pg, C (1), C (2), r);
+-  svfloat32_t p34 = svmla_x (pg, C (3), C (4), r);
+-  svfloat32_t r2 = svmul_x (pg, r, r);
+-  svfloat32_t p14 = svmla_x (pg, p12, p34, r2);
+-  svfloat32_t p0 = svmul_x (pg, r, C (0));
+-  svfloat32_t poly = svmla_x (pg, p0, r2, p14);
+-
+   if (__glibc_unlikely (svptest_any (pg, is_special_case)))
+-    return special_case (x, svmla_x (pg, scale, scale, poly), is_special_case);
+-
+-  return svmla_x (pg, scale, scale, poly);
++    return special_case (x, is_special_case, &d->d);
++  return expf_inline (x, pg, &d->d);
+ }
+diff --git a/sysdeps/aarch64/fpu/sv_expf_inline.h b/sysdeps/aarch64/fpu/sv_expf_inline.h
+index 23963b5f8e..6166df6553 100644
+--- a/sysdeps/aarch64/fpu/sv_expf_inline.h
++++ b/sysdeps/aarch64/fpu/sv_expf_inline.h
+@@ -24,19 +24,20 @@
+ 
+ struct sv_expf_data
+ {
+-  float poly[5];
+-  float inv_ln2, ln2_hi, ln2_lo, shift;
++  float c1, c3, inv_ln2;
++  float ln2_lo, c0, c2, c4;
++  float ln2_hi, shift;
+ };
+ 
+ /* Coefficients copied from the polynomial in AdvSIMD variant, reversed for
+    compatibility with polynomial helpers. Shift is 1.5*2^17 + 127.  */
+ #define SV_EXPF_DATA                                                          \
+   {                                                                           \
+-    .poly = { 0x1.ffffecp-1f, 0x1.fffdb6p-2f, 0x1.555e66p-3f, 0x1.573e2ep-5f, \
+-	      0x1.0e4020p-7f },                                               \
+-                                                                              \
+-    .inv_ln2 = 0x1.715476p+0f, .ln2_hi = 0x1.62e4p-1f,                        \
+-    .ln2_lo = 0x1.7f7d1cp-20f, .shift = 0x1.803f8p17f,                        \
++    /* Coefficients copied from the polynomial in AdvSIMD variant.  */        \
++    .c0 = 0x1.ffffecp-1f, .c1 = 0x1.fffdb6p-2f, .c2 = 0x1.555e66p-3f,         \
++    .c3 = 0x1.573e2ep-5f, .c4 = 0x1.0e4020p-7f, .inv_ln2 = 0x1.715476p+0f,    \
++    .ln2_hi = 0x1.62e4p-1f, .ln2_lo = 0x1.7f7d1cp-20f,                        \
++    .shift = 0x1.803f8p17f,                                                   \
+   }
+ 
+ #define C(i) sv_f32 (d->poly[i])
+@@ -47,26 +48,25 @@ expf_inline (svfloat32_t x, const svbool_t pg, const struct sv_expf_data *d)
+   /* exp(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)]
+      x = ln2*n + r, with r in [-ln2/2, ln2/2].  */
+ 
+-  /* Load some constants in quad-word chunks to minimise memory access.  */
+-  svfloat32_t c4_invln2_and_ln2 = svld1rq (svptrue_b32 (), &d->poly[4]);
++  svfloat32_t lane_consts = svld1rq (svptrue_b32 (), &d->ln2_lo);
+ 
+   /* n = round(x/(ln2/N)).  */
+-  svfloat32_t z = svmla_lane (sv_f32 (d->shift), x, c4_invln2_and_ln2, 1);
++  svfloat32_t z = svmad_x (pg, sv_f32 (d->inv_ln2), x, d->shift);
+   svfloat32_t n = svsub_x (pg, z, d->shift);
+ 
+   /* r = x - n*ln2/N.  */
+-  svfloat32_t r = svmls_lane (x, n, c4_invln2_and_ln2, 2);
+-  r = svmls_lane (r, n, c4_invln2_and_ln2, 3);
++  svfloat32_t r = svmsb_x (pg, sv_f32 (d->ln2_hi), n, x);
++  r = svmls_lane (r, n, lane_consts, 0);
+ 
+   /* scale = 2^(n/N).  */
+-  svfloat32_t scale = svexpa (svreinterpret_u32_f32 (z));
++  svfloat32_t scale = svexpa (svreinterpret_u32 (z));
+ 
+   /* y = exp(r) - 1 ~= r + C0 r^2 + C1 r^3 + C2 r^4 + C3 r^5 + C4 r^6.  */
+-  svfloat32_t p12 = svmla_x (pg, C (1), C (2), r);
+-  svfloat32_t p34 = svmla_lane (C (3), r, c4_invln2_and_ln2, 0);
+-  svfloat32_t r2 = svmul_f32_x (pg, r, r);
++  svfloat32_t p12 = svmla_lane (sv_f32 (d->c1), r, lane_consts, 2);
++  svfloat32_t p34 = svmla_lane (sv_f32 (d->c3), r, lane_consts, 3);
++  svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r);
+   svfloat32_t p14 = svmla_x (pg, p12, p34, r2);
+-  svfloat32_t p0 = svmul_f32_x (pg, r, C (0));
++  svfloat32_t p0 = svmul_lane (r, lane_consts, 1);
+   svfloat32_t poly = svmla_x (pg, p0, r2, p14);
+ 
+   return svmla_x (pg, scale, scale, poly);
+
+commit c4373426e3a85ec483a0f412c2a7c6cdfa32ccdb
+Author: Joe Ramsay <Joe.Ramsay@arm.com>
+Date:   Mon Sep 23 15:30:20 2024 +0100
+
+    AArch64: Improve codegen in SVE F32 logs
+    
+    Reduce MOVPRFXs by using unpredicated (non-destructive) instructions
+    where possible.  Similar to the recent change to AdvSIMD F32 logs,
+    adjust special-case arguments and bounds to allow for more optimal
+    register usage.  For all 3 routines one MOVPRFX remains in the
+    reduction, which cannot be avoided as immediate AND and ASR are both
+    destructive.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit a15b1394b5eba98ffe28a02a392b587e4fe13c0d)
+
+diff --git a/sysdeps/aarch64/fpu/log10f_sve.c b/sysdeps/aarch64/fpu/log10f_sve.c
+index bdbb49cd32..7913679f67 100644
+--- a/sysdeps/aarch64/fpu/log10f_sve.c
++++ b/sysdeps/aarch64/fpu/log10f_sve.c
+@@ -24,6 +24,7 @@ static const struct data
+   float poly_0246[4];
+   float poly_1357[4];
+   float ln2, inv_ln10;
++  uint32_t off, lower;
+ } data = {
+   .poly_1357 = {
+     /* Coefficients copied from the AdvSIMD routine, then rearranged so that coeffs
+@@ -35,18 +36,23 @@ static const struct data
+ 		 -0x1.0fc92cp-4f },
+   .ln2 = 0x1.62e43p-1f,
+   .inv_ln10 = 0x1.bcb7b2p-2f,
++  .off = 0x3f2aaaab,
++  /* Lower bound is the smallest positive normal float 0x00800000. For
++     optimised register use subnormals are detected after offset has been
++     subtracted, so lower bound is 0x0080000 - offset (which wraps around).  */
++  .lower = 0x00800000 - 0x3f2aaaab
+ };
+ 
+-#define Min 0x00800000
+-#define Max 0x7f800000
+-#define Thres 0x7f000000  /* Max - Min.  */
+-#define Offset 0x3f2aaaab /* 0.666667.  */
++#define Thres 0x7f000000 /* asuint32(inf) - 0x00800000.  */
+ #define MantissaMask 0x007fffff
+ 
+ static svfloat32_t NOINLINE
+-special_case (svfloat32_t x, svfloat32_t y, svbool_t special)
++special_case (svuint32_t u_off, svfloat32_t p, svfloat32_t r2, svfloat32_t y,
++	      svbool_t cmp)
+ {
+-  return sv_call_f32 (log10f, x, y, special);
++  return sv_call_f32 (
++      log10f, svreinterpret_f32 (svadd_x (svptrue_b32 (), u_off, data.off)),
++      svmla_x (svptrue_b32 (), p, r2, y), cmp);
+ }
+ 
+ /* Optimised implementation of SVE log10f using the same algorithm and
+@@ -57,23 +63,25 @@ special_case (svfloat32_t x, svfloat32_t y, svbool_t special)
+ svfloat32_t SV_NAME_F1 (log10) (svfloat32_t x, const svbool_t pg)
+ {
+   const struct data *d = ptr_barrier (&data);
+-  svuint32_t ix = svreinterpret_u32 (x);
+-  svbool_t special = svcmpge (pg, svsub_x (pg, ix, Min), Thres);
++
++  svuint32_t u_off = svreinterpret_u32 (x);
++
++  u_off = svsub_x (pg, u_off, d->off);
++  svbool_t special = svcmpge (pg, svsub_x (pg, u_off, d->lower), Thres);
+ 
+   /* x = 2^n * (1+r), where 2/3 < 1+r < 4/3.  */
+-  ix = svsub_x (pg, ix, Offset);
+   svfloat32_t n = svcvt_f32_x (
+-      pg, svasr_x (pg, svreinterpret_s32 (ix), 23)); /* signextend.  */
+-  ix = svand_x (pg, ix, MantissaMask);
+-  ix = svadd_x (pg, ix, Offset);
++      pg, svasr_x (pg, svreinterpret_s32 (u_off), 23)); /* signextend.  */
++  svuint32_t ix = svand_x (pg, u_off, MantissaMask);
++  ix = svadd_x (pg, ix, d->off);
+   svfloat32_t r = svsub_x (pg, svreinterpret_f32 (ix), 1.0f);
+ 
+   /* y = log10(1+r) + n*log10(2)
+      log10(1+r) ~ r * InvLn(10) + P(r)
+      where P(r) is a polynomial. Use order 9 for log10(1+x), i.e. order 8 for
+      log10(1+x)/x, with x in [-1/3, 1/3] (offset=2/3).  */
+-  svfloat32_t r2 = svmul_x (pg, r, r);
+-  svfloat32_t r4 = svmul_x (pg, r2, r2);
++  svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r);
++  svfloat32_t r4 = svmul_x (svptrue_b32 (), r2, r2);
+   svfloat32_t p_1357 = svld1rq (svptrue_b32 (), &d->poly_1357[0]);
+   svfloat32_t q_01 = svmla_lane (sv_f32 (d->poly_0246[0]), r, p_1357, 0);
+   svfloat32_t q_23 = svmla_lane (sv_f32 (d->poly_0246[1]), r, p_1357, 1);
+@@ -88,7 +96,6 @@ svfloat32_t SV_NAME_F1 (log10) (svfloat32_t x, const svbool_t pg)
+   hi = svmul_x (pg, hi, d->inv_ln10);
+ 
+   if (__glibc_unlikely (svptest_any (pg, special)))
+-    return special_case (x, svmla_x (svnot_z (pg, special), hi, r2, y),
+-			 special);
+-  return svmla_x (pg, hi, r2, y);
++    return special_case (u_off, hi, r2, y, special);
++  return svmla_x (svptrue_b32 (), hi, r2, y);
+ }
+diff --git a/sysdeps/aarch64/fpu/log2f_sve.c b/sysdeps/aarch64/fpu/log2f_sve.c
+index 5031c42483..939d89bfb9 100644
+--- a/sysdeps/aarch64/fpu/log2f_sve.c
++++ b/sysdeps/aarch64/fpu/log2f_sve.c
+@@ -23,6 +23,7 @@ static const struct data
+ {
+   float poly_02468[5];
+   float poly_1357[4];
++  uint32_t off, lower;
+ } data = {
+   .poly_1357 = {
+     /* Coefficients copied from the AdvSIMD routine, then rearranged so that coeffs
+@@ -32,18 +33,23 @@ static const struct data
+   },
+   .poly_02468 = { 0x1.715476p0f, 0x1.ec701cp-2f, 0x1.27a0b8p-2f,
+ 		  0x1.9d8ecap-3f, 0x1.9e495p-3f },
++  .off = 0x3f2aaaab,
++  /* Lower bound is the smallest positive normal float 0x00800000. For
++     optimised register use subnormals are detected after offset has been
++     subtracted, so lower bound is 0x0080000 - offset (which wraps around).  */
++  .lower = 0x00800000 - 0x3f2aaaab
+ };
+ 
+-#define Min (0x00800000)
+-#define Max (0x7f800000)
+-#define Thres (0x7f000000) /* Max - Min.  */
++#define Thresh (0x7f000000) /* asuint32(inf) - 0x00800000.  */
+ #define MantissaMask (0x007fffff)
+-#define Off (0x3f2aaaab) /* 0.666667.  */
+ 
+ static svfloat32_t NOINLINE
+-special_case (svfloat32_t x, svfloat32_t y, svbool_t cmp)
++special_case (svuint32_t u_off, svfloat32_t p, svfloat32_t r2, svfloat32_t y,
++	      svbool_t cmp)
+ {
+-  return sv_call_f32 (log2f, x, y, cmp);
++  return sv_call_f32 (
++      log2f, svreinterpret_f32 (svadd_x (svptrue_b32 (), u_off, data.off)),
++      svmla_x (svptrue_b32 (), p, r2, y), cmp);
+ }
+ 
+ /* Optimised implementation of SVE log2f, using the same algorithm
+@@ -55,19 +61,20 @@ svfloat32_t SV_NAME_F1 (log2) (svfloat32_t x, const svbool_t pg)
+ {
+   const struct data *d = ptr_barrier (&data);
+ 
+-  svuint32_t u = svreinterpret_u32 (x);
+-  svbool_t special = svcmpge (pg, svsub_x (pg, u, Min), Thres);
++  svuint32_t u_off = svreinterpret_u32 (x);
++
++  u_off = svsub_x (pg, u_off, d->off);
++  svbool_t special = svcmpge (pg, svsub_x (pg, u_off, d->lower), Thresh);
+ 
+   /* x = 2^n * (1+r), where 2/3 < 1+r < 4/3.  */
+-  u = svsub_x (pg, u, Off);
+   svfloat32_t n = svcvt_f32_x (
+-      pg, svasr_x (pg, svreinterpret_s32 (u), 23)); /* Sign-extend.  */
+-  u = svand_x (pg, u, MantissaMask);
+-  u = svadd_x (pg, u, Off);
++      pg, svasr_x (pg, svreinterpret_s32 (u_off), 23)); /* Sign-extend.  */
++  svuint32_t u = svand_x (pg, u_off, MantissaMask);
++  u = svadd_x (pg, u, d->off);
+   svfloat32_t r = svsub_x (pg, svreinterpret_f32 (u), 1.0f);
+ 
+   /* y = log2(1+r) + n.  */
+-  svfloat32_t r2 = svmul_x (pg, r, r);
++  svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r);
+ 
+   /* Evaluate polynomial using pairwise Horner scheme.  */
+   svfloat32_t p_1357 = svld1rq (svptrue_b32 (), &d->poly_1357[0]);
+@@ -81,6 +88,6 @@ svfloat32_t SV_NAME_F1 (log2) (svfloat32_t x, const svbool_t pg)
+   y = svmla_x (pg, q_01, r2, y);
+ 
+   if (__glibc_unlikely (svptest_any (pg, special)))
+-    return special_case (x, svmla_x (svnot_z (pg, special), n, r, y), special);
+-  return svmla_x (pg, n, r, y);
++    return special_case (u_off, n, r, y, special);
++  return svmla_x (svptrue_b32 (), n, r, y);
+ }
+diff --git a/sysdeps/aarch64/fpu/logf_sve.c b/sysdeps/aarch64/fpu/logf_sve.c
+index d64e810cfe..5b9324678d 100644
+--- a/sysdeps/aarch64/fpu/logf_sve.c
++++ b/sysdeps/aarch64/fpu/logf_sve.c
+@@ -24,6 +24,7 @@ static const struct data
+   float poly_0135[4];
+   float poly_246[3];
+   float ln2;
++  uint32_t off, lower;
+ } data = {
+   .poly_0135 = {
+     /* Coefficients copied from the AdvSIMD routine in math/, then rearranged so
+@@ -32,19 +33,24 @@ static const struct data
+     -0x1.3e737cp-3f, 0x1.5a9aa2p-3f, 0x1.961348p-3f, 0x1.555d7cp-2f
+   },
+   .poly_246 = { -0x1.4f9934p-3f, -0x1.00187cp-2f, -0x1.ffffc8p-2f },
+-  .ln2 = 0x1.62e43p-1f
++  .ln2 = 0x1.62e43p-1f,
++  .off = 0x3f2aaaab,
++  /* Lower bound is the smallest positive normal float 0x00800000. For
++     optimised register use subnormals are detected after offset has been
++     subtracted, so lower bound is 0x0080000 - offset (which wraps around).  */
++  .lower = 0x00800000 - 0x3f2aaaab
+ };
+ 
+-#define Min (0x00800000)
+-#define Max (0x7f800000)
+-#define Thresh (0x7f000000) /* Max - Min.  */
++#define Thresh (0x7f000000) /* asuint32(inf) - 0x00800000.  */
+ #define Mask (0x007fffff)
+-#define Off (0x3f2aaaab) /* 0.666667.  */
+ 
+ static svfloat32_t NOINLINE
+-special_case (svfloat32_t x, svfloat32_t y, svbool_t cmp)
++special_case (svuint32_t u_off, svfloat32_t p, svfloat32_t r2, svfloat32_t y,
++	      svbool_t cmp)
+ {
+-  return sv_call_f32 (logf, x, y, cmp);
++  return sv_call_f32 (
++      logf, svreinterpret_f32 (svadd_x (svptrue_b32 (), u_off, data.off)),
++      svmla_x (svptrue_b32 (), p, r2, y), cmp);
+ }
+ 
+ /* Optimised implementation of SVE logf, using the same algorithm and
+@@ -55,19 +61,21 @@ svfloat32_t SV_NAME_F1 (log) (svfloat32_t x, const svbool_t pg)
+ {
+   const struct data *d = ptr_barrier (&data);
+ 
+-  svuint32_t u = svreinterpret_u32 (x);
+-  svbool_t cmp = svcmpge (pg, svsub_x (pg, u, Min), Thresh);
++  svuint32_t u_off = svreinterpret_u32 (x);
++
++  u_off = svsub_x (pg, u_off, d->off);
++  svbool_t cmp = svcmpge (pg, svsub_x (pg, u_off, d->lower), Thresh);
+ 
+   /* x = 2^n * (1+r), where 2/3 < 1+r < 4/3.  */
+-  u = svsub_x (pg, u, Off);
+   svfloat32_t n = svcvt_f32_x (
+-      pg, svasr_x (pg, svreinterpret_s32 (u), 23)); /* Sign-extend.  */
+-  u = svand_x (pg, u, Mask);
+-  u = svadd_x (pg, u, Off);
++      pg, svasr_x (pg, svreinterpret_s32 (u_off), 23)); /* Sign-extend.  */
++
++  svuint32_t u = svand_x (pg, u_off, Mask);
++  u = svadd_x (pg, u, d->off);
+   svfloat32_t r = svsub_x (pg, svreinterpret_f32 (u), 1.0f);
+ 
+   /* y = log(1+r) + n*ln2.  */
+-  svfloat32_t r2 = svmul_x (pg, r, r);
++  svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r);
+   /* n*ln2 + r + r2*(P6 + r*P5 + r2*(P4 + r*P3 + r2*(P2 + r*P1 + r2*P0))).  */
+   svfloat32_t p_0135 = svld1rq (svptrue_b32 (), &d->poly_0135[0]);
+   svfloat32_t p = svmla_lane (sv_f32 (d->poly_246[0]), r, p_0135, 1);
+@@ -80,6 +88,6 @@ svfloat32_t SV_NAME_F1 (log) (svfloat32_t x, const svbool_t pg)
+   p = svmla_x (pg, r, n, d->ln2);
+ 
+   if (__glibc_unlikely (svptest_any (pg, cmp)))
+-    return special_case (x, svmla_x (svnot_z (pg, cmp), p, r2, y), cmp);
++    return special_case (u_off, p, r2, y, cmp);
+   return svmla_x (pg, p, r2, y);
+ }
+
+commit 520240173029fd03388ec01db9a5359291cbbd27
+Author: Joe Ramsay <Joe.Ramsay@arm.com>
+Date:   Mon Sep 23 15:32:14 2024 +0100
+
+    AArch64: Improve codegen in users of AdvSIMD log1pf helper
+    
+    log1pf is quite register-intensive - use fewer registers for the
+    polynomial, and make various changes to shorten dependency chains in
+    parent routines.  There is now no spilling with GCC 14.  Accuracy moves
+    around a little - comments adjusted accordingly but does not require
+    regen-ulps.
+    
+    Use the helper in log1pf as well, instead of having separate
+    implementations.  The more accurate polynomial means special-casing can
+    be simplified, and the shorter dependency chain avoids the usual dance
+    around v0, which is otherwise difficult.
+    
+    There is a small duplication of vectors containing 1.0f (or 0x3f800000) -
+    GCC is not currently able to efficiently handle values which fit in FMOV
+    but not MOVI, and are reinterpreted to integer.  There may be potential
+    for more optimisation if this is fixed.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit 5bc100bd4b7e00db3009ae93d25d303341545d23)
+
+diff --git a/sysdeps/aarch64/fpu/acoshf_advsimd.c b/sysdeps/aarch64/fpu/acoshf_advsimd.c
+index 8916dcbf40..004474acf9 100644
+--- a/sysdeps/aarch64/fpu/acoshf_advsimd.c
++++ b/sysdeps/aarch64/fpu/acoshf_advsimd.c
+@@ -25,35 +25,32 @@ const static struct data
+ {
+   struct v_log1pf_data log1pf_consts;
+   uint32x4_t one;
+-  uint16x4_t thresh;
+-} data = {
+-  .log1pf_consts = V_LOG1PF_CONSTANTS_TABLE,
+-  .one = V4 (0x3f800000),
+-  .thresh = V4 (0x2000) /* top(asuint(SquareLim) - asuint(1)).  */
+-};
++} data = { .log1pf_consts = V_LOG1PF_CONSTANTS_TABLE, .one = V4 (0x3f800000) };
++
++#define Thresh vdup_n_u16 (0x2000) /* top(asuint(SquareLim) - asuint(1)).  */
+ 
+ static float32x4_t NOINLINE VPCS_ATTR
+ special_case (float32x4_t x, float32x4_t y, uint16x4_t special,
+-	      const struct v_log1pf_data d)
++	      const struct v_log1pf_data *d)
+ {
+   return v_call_f32 (acoshf, x, log1pf_inline (y, d), vmovl_u16 (special));
+ }
+ 
+ /* Vector approximation for single-precision acosh, based on log1p. Maximum
+    error depends on WANT_SIMD_EXCEPT. With SIMD fp exceptions enabled, it
+-   is 2.78 ULP:
+-   __v_acoshf(0x1.07887p+0) got 0x1.ef9e9cp-3
+-			   want 0x1.ef9ea2p-3.
++   is 3.00 ULP:
++   _ZGVnN4v_acoshf(0x1.01df3ap+0) got 0x1.ef0a82p-4
++				 want 0x1.ef0a7cp-4.
+    With exceptions disabled, we can compute u with a shorter dependency chain,
+-   which gives maximum error of 3.07 ULP:
+-  __v_acoshf(0x1.01f83ep+0) got 0x1.fbc7fap-4
+-			   want 0x1.fbc7f4p-4.  */
++   which gives maximum error of 3.22 ULP:
++   _ZGVnN4v_acoshf(0x1.007ef2p+0) got 0x1.fdcdccp-5
++				 want 0x1.fdcdd2p-5.  */
+ 
+ VPCS_ATTR float32x4_t NOINLINE V_NAME_F1 (acosh) (float32x4_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+   uint32x4_t ix = vreinterpretq_u32_f32 (x);
+-  uint16x4_t special = vcge_u16 (vsubhn_u32 (ix, d->one), d->thresh);
++  uint16x4_t special = vcge_u16 (vsubhn_u32 (ix, d->one), Thresh);
+ 
+ #if WANT_SIMD_EXCEPT
+   /* Mask special lanes with 1 to side-step spurious invalid or overflow. Use
+@@ -64,15 +61,16 @@ VPCS_ATTR float32x4_t NOINLINE V_NAME_F1 (acosh) (float32x4_t x)
+   float32x4_t xm1 = v_zerofy_f32 (vsubq_f32 (x, v_f32 (1)), p);
+   float32x4_t u = vfmaq_f32 (vaddq_f32 (xm1, xm1), xm1, xm1);
+ #else
+-  float32x4_t xm1 = vsubq_f32 (x, v_f32 (1));
+-  float32x4_t u = vmulq_f32 (xm1, vaddq_f32 (x, v_f32 (1.0f)));
++  float32x4_t xm1 = vsubq_f32 (x, vreinterpretq_f32_u32 (d->one));
++  float32x4_t u
++      = vmulq_f32 (xm1, vaddq_f32 (x, vreinterpretq_f32_u32 (d->one)));
+ #endif
+ 
+   float32x4_t y = vaddq_f32 (xm1, vsqrtq_f32 (u));
+ 
+   if (__glibc_unlikely (v_any_u16h (special)))
+-    return special_case (x, y, special, d->log1pf_consts);
+-  return log1pf_inline (y, d->log1pf_consts);
++    return special_case (x, y, special, &d->log1pf_consts);
++  return log1pf_inline (y, &d->log1pf_consts);
+ }
+ libmvec_hidden_def (V_NAME_F1 (acosh))
+ HALF_WIDTH_ALIAS_F1 (acosh)
+diff --git a/sysdeps/aarch64/fpu/asinhf_advsimd.c b/sysdeps/aarch64/fpu/asinhf_advsimd.c
+index 09fd8a6143..eb789b91b6 100644
+--- a/sysdeps/aarch64/fpu/asinhf_advsimd.c
++++ b/sysdeps/aarch64/fpu/asinhf_advsimd.c
+@@ -20,16 +20,16 @@
+ #include "v_math.h"
+ #include "v_log1pf_inline.h"
+ 
+-#define SignMask v_u32 (0x80000000)
+-
+ const static struct data
+ {
+   struct v_log1pf_data log1pf_consts;
++  float32x4_t one;
+   uint32x4_t big_bound;
+ #if WANT_SIMD_EXCEPT
+   uint32x4_t tiny_bound;
+ #endif
+ } data = {
++  .one = V4 (1),
+   .log1pf_consts = V_LOG1PF_CONSTANTS_TABLE,
+   .big_bound = V4 (0x5f800000), /* asuint(0x1p64).  */
+ #if WANT_SIMD_EXCEPT
+@@ -38,20 +38,27 @@ const static struct data
+ };
+ 
+ static float32x4_t NOINLINE VPCS_ATTR
+-special_case (float32x4_t x, float32x4_t y, uint32x4_t special)
++special_case (float32x4_t x, uint32x4_t sign, float32x4_t y,
++	      uint32x4_t special, const struct data *d)
+ {
+-  return v_call_f32 (asinhf, x, y, special);
++  return v_call_f32 (
++      asinhf, x,
++      vreinterpretq_f32_u32 (veorq_u32 (
++	  sign, vreinterpretq_u32_f32 (log1pf_inline (y, &d->log1pf_consts)))),
++      special);
+ }
+ 
+ /* Single-precision implementation of vector asinh(x), using vector log1p.
+-   Worst-case error is 2.66 ULP, at roughly +/-0.25:
+-   __v_asinhf(0x1.01b04p-2) got 0x1.fe163ep-3 want 0x1.fe1638p-3.  */
++   Worst-case error is 2.59 ULP:
++   _ZGVnN4v_asinhf(0x1.d86124p-3) got 0x1.d449bep-3
++				 want 0x1.d449c4p-3.  */
+ VPCS_ATTR float32x4_t NOINLINE V_NAME_F1 (asinh) (float32x4_t x)
+ {
+   const struct data *dat = ptr_barrier (&data);
+-  uint32x4_t iax = vbicq_u32 (vreinterpretq_u32_f32 (x), SignMask);
+-  float32x4_t ax = vreinterpretq_f32_u32 (iax);
++  float32x4_t ax = vabsq_f32 (x);
++  uint32x4_t iax = vreinterpretq_u32_f32 (ax);
+   uint32x4_t special = vcgeq_u32 (iax, dat->big_bound);
++  uint32x4_t sign = veorq_u32 (vreinterpretq_u32_f32 (x), iax);
+   float32x4_t special_arg = x;
+ 
+ #if WANT_SIMD_EXCEPT
+@@ -68,13 +75,13 @@ VPCS_ATTR float32x4_t NOINLINE V_NAME_F1 (asinh) (float32x4_t x)
+   /* asinh(x) = log(x + sqrt(x * x + 1)).
+      For positive x, asinh(x) = log1p(x + x * x / (1 + sqrt(x * x + 1))).  */
+   float32x4_t d
+-      = vaddq_f32 (v_f32 (1), vsqrtq_f32 (vfmaq_f32 (v_f32 (1), x, x)));
+-  float32x4_t y = log1pf_inline (
+-      vaddq_f32 (ax, vdivq_f32 (vmulq_f32 (ax, ax), d)), dat->log1pf_consts);
++      = vaddq_f32 (v_f32 (1), vsqrtq_f32 (vfmaq_f32 (dat->one, ax, ax)));
++  float32x4_t y = vaddq_f32 (ax, vdivq_f32 (vmulq_f32 (ax, ax), d));
+ 
+   if (__glibc_unlikely (v_any_u32 (special)))
+-    return special_case (special_arg, vbslq_f32 (SignMask, x, y), special);
+-  return vbslq_f32 (SignMask, x, y);
++    return special_case (special_arg, sign, y, special, dat);
++  return vreinterpretq_f32_u32 (veorq_u32 (
++      sign, vreinterpretq_u32_f32 (log1pf_inline (y, &dat->log1pf_consts))));
+ }
+ libmvec_hidden_def (V_NAME_F1 (asinh))
+ HALF_WIDTH_ALIAS_F1 (asinh)
+diff --git a/sysdeps/aarch64/fpu/atanhf_advsimd.c b/sysdeps/aarch64/fpu/atanhf_advsimd.c
+index ae488f7b54..818b6c92ad 100644
+--- a/sysdeps/aarch64/fpu/atanhf_advsimd.c
++++ b/sysdeps/aarch64/fpu/atanhf_advsimd.c
+@@ -40,15 +40,17 @@ const static struct data
+ #define Half v_u32 (0x3f000000)
+ 
+ static float32x4_t NOINLINE VPCS_ATTR
+-special_case (float32x4_t x, float32x4_t y, uint32x4_t special)
++special_case (float32x4_t x, float32x4_t halfsign, float32x4_t y,
++	      uint32x4_t special)
+ {
+-  return v_call_f32 (atanhf, x, y, special);
++  return v_call_f32 (atanhf, vbslq_f32 (AbsMask, x, halfsign),
++		     vmulq_f32 (halfsign, y), special);
+ }
+ 
+ /* Approximation for vector single-precision atanh(x) using modified log1p.
+-   The maximum error is 3.08 ULP:
+-   __v_atanhf(0x1.ff215p-5) got 0x1.ffcb7cp-5
+-			   want 0x1.ffcb82p-5.  */
++   The maximum error is 2.93 ULP:
++   _ZGVnN4v_atanhf(0x1.f43d7p-5) got 0x1.f4dcfep-5
++				want 0x1.f4dcf8p-5.  */
+ VPCS_ATTR float32x4_t NOINLINE V_NAME_F1 (atanh) (float32x4_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+@@ -68,11 +70,19 @@ VPCS_ATTR float32x4_t NOINLINE V_NAME_F1 (atanh) (float32x4_t x)
+   uint32x4_t special = vcgeq_u32 (iax, d->one);
+ #endif
+ 
+-  float32x4_t y = vdivq_f32 (vaddq_f32 (ax, ax), vsubq_f32 (v_f32 (1), ax));
+-  y = log1pf_inline (y, d->log1pf_consts);
++  float32x4_t y = vdivq_f32 (vaddq_f32 (ax, ax),
++			     vsubq_f32 (vreinterpretq_f32_u32 (d->one), ax));
++  y = log1pf_inline (y, &d->log1pf_consts);
+ 
++  /* If exceptions not required, pass ax to special-case for shorter dependency
++     chain. If exceptions are required ax will have been zerofied, so have to
++     pass x.  */
+   if (__glibc_unlikely (v_any_u32 (special)))
+-    return special_case (x, vmulq_f32 (halfsign, y), special);
++#if WANT_SIMD_EXCEPT
++    return special_case (x, halfsign, y, special);
++#else
++    return special_case (ax, halfsign, y, special);
++#endif
+   return vmulq_f32 (halfsign, y);
+ }
+ libmvec_hidden_def (V_NAME_F1 (atanh))
+diff --git a/sysdeps/aarch64/fpu/log1pf_advsimd.c b/sysdeps/aarch64/fpu/log1pf_advsimd.c
+index 8cfa28fb8a..00006fc703 100644
+--- a/sysdeps/aarch64/fpu/log1pf_advsimd.c
++++ b/sysdeps/aarch64/fpu/log1pf_advsimd.c
+@@ -18,114 +18,79 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include "v_math.h"
+-#include "poly_advsimd_f32.h"
++#include "v_log1pf_inline.h"
++
++#if WANT_SIMD_EXCEPT
+ 
+ const static struct data
+ {
+-  float32x4_t poly[8], ln2;
+-  uint32x4_t tiny_bound, minus_one, four, thresh;
+-  int32x4_t three_quarters;
++  uint32x4_t minus_one, thresh;
++  struct v_log1pf_data d;
+ } data = {
+-  .poly = { /* Generated using FPMinimax in [-0.25, 0.5]. First two coefficients
+-	       (1, -0.5) are not stored as they can be generated more
+-	       efficiently.  */
+-	    V4 (0x1.5555aap-2f), V4 (-0x1.000038p-2f), V4 (0x1.99675cp-3f),
+-	    V4 (-0x1.54ef78p-3f), V4 (0x1.28a1f4p-3f), V4 (-0x1.0da91p-3f),
+-	    V4 (0x1.abcb6p-4f), V4 (-0x1.6f0d5ep-5f) },
+-  .ln2 = V4 (0x1.62e43p-1f),
+-  .tiny_bound = V4 (0x34000000), /* asuint32(0x1p-23). ulp=0.5 at 0x1p-23.  */
+-  .thresh = V4 (0x4b800000), /* asuint32(INFINITY) - tiny_bound.  */
++  .d = V_LOG1PF_CONSTANTS_TABLE,
++  .thresh = V4 (0x4b800000), /* asuint32(INFINITY) - TinyBound.  */
+   .minus_one = V4 (0xbf800000),
+-  .four = V4 (0x40800000),
+-  .three_quarters = V4 (0x3f400000)
+ };
+ 
+-static inline float32x4_t
+-eval_poly (float32x4_t m, const float32x4_t *p)
+-{
+-  /* Approximate log(1+m) on [-0.25, 0.5] using split Estrin scheme.  */
+-  float32x4_t p_12 = vfmaq_f32 (v_f32 (-0.5), m, p[0]);
+-  float32x4_t p_34 = vfmaq_f32 (p[1], m, p[2]);
+-  float32x4_t p_56 = vfmaq_f32 (p[3], m, p[4]);
+-  float32x4_t p_78 = vfmaq_f32 (p[5], m, p[6]);
+-
+-  float32x4_t m2 = vmulq_f32 (m, m);
+-  float32x4_t p_02 = vfmaq_f32 (m, m2, p_12);
+-  float32x4_t p_36 = vfmaq_f32 (p_34, m2, p_56);
+-  float32x4_t p_79 = vfmaq_f32 (p_78, m2, p[7]);
+-
+-  float32x4_t m4 = vmulq_f32 (m2, m2);
+-  float32x4_t p_06 = vfmaq_f32 (p_02, m4, p_36);
+-  return vfmaq_f32 (p_06, m4, vmulq_f32 (m4, p_79));
+-}
++/* asuint32(0x1p-23). ulp=0.5 at 0x1p-23.  */
++#  define TinyBound v_u32 (0x34000000)
+ 
+ static float32x4_t NOINLINE VPCS_ATTR
+-special_case (float32x4_t x, float32x4_t y, uint32x4_t special)
++special_case (float32x4_t x, uint32x4_t cmp, const struct data *d)
+ {
+-  return v_call_f32 (log1pf, x, y, special);
++  /* Side-step special lanes so fenv exceptions are not triggered
++     inadvertently.  */
++  float32x4_t x_nospecial = v_zerofy_f32 (x, cmp);
++  return v_call_f32 (log1pf, x, log1pf_inline (x_nospecial, &d->d), cmp);
+ }
+ 
+-/* Vector log1pf approximation using polynomial on reduced interval. Accuracy
+-   is roughly 2.02 ULP:
+-   log1pf(0x1.21e13ap-2) got 0x1.fe8028p-3 want 0x1.fe802cp-3.  */
++/* Vector log1pf approximation using polynomial on reduced interval. Worst-case
++   error is 1.69 ULP:
++   _ZGVnN4v_log1pf(0x1.04418ap-2) got 0x1.cfcbd8p-3
++				 want 0x1.cfcbdcp-3.  */
+ VPCS_ATTR float32x4_t V_NAME_F1 (log1p) (float32x4_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+-
+   uint32x4_t ix = vreinterpretq_u32_f32 (x);
+   uint32x4_t ia = vreinterpretq_u32_f32 (vabsq_f32 (x));
++
+   uint32x4_t special_cases
+-      = vorrq_u32 (vcgeq_u32 (vsubq_u32 (ia, d->tiny_bound), d->thresh),
++      = vorrq_u32 (vcgeq_u32 (vsubq_u32 (ia, TinyBound), d->thresh),
+ 		   vcgeq_u32 (ix, d->minus_one));
+-  float32x4_t special_arg = x;
+ 
+-#if WANT_SIMD_EXCEPT
+   if (__glibc_unlikely (v_any_u32 (special_cases)))
+-    /* Side-step special lanes so fenv exceptions are not triggered
+-       inadvertently.  */
+-    x = v_zerofy_f32 (x, special_cases);
+-#endif
++    return special_case (x, special_cases, d);
+ 
+-  /* With x + 1 = t * 2^k (where t = m + 1 and k is chosen such that m
+-			   is in [-0.25, 0.5]):
+-     log1p(x) = log(t) + log(2^k) = log1p(m) + k*log(2).
+-
+-     We approximate log1p(m) with a polynomial, then scale by
+-     k*log(2). Instead of doing this directly, we use an intermediate
+-     scale factor s = 4*k*log(2) to ensure the scale is representable
+-     as a normalised fp32 number.  */
++  return log1pf_inline (x, &d->d);
++}
+ 
+-  float32x4_t m = vaddq_f32 (x, v_f32 (1.0f));
++#else
+ 
+-  /* Choose k to scale x to the range [-1/4, 1/2].  */
+-  int32x4_t k
+-      = vandq_s32 (vsubq_s32 (vreinterpretq_s32_f32 (m), d->three_quarters),
+-		   v_s32 (0xff800000));
+-  uint32x4_t ku = vreinterpretq_u32_s32 (k);
++const static struct v_log1pf_data data = V_LOG1PF_CONSTANTS_TABLE;
+ 
+-  /* Scale x by exponent manipulation.  */
+-  float32x4_t m_scale
+-      = vreinterpretq_f32_u32 (vsubq_u32 (vreinterpretq_u32_f32 (x), ku));
++static float32x4_t NOINLINE VPCS_ATTR
++special_case (float32x4_t x, uint32x4_t cmp)
++{
++  return v_call_f32 (log1pf, x, log1pf_inline (x, ptr_barrier (&data)), cmp);
++}
+ 
+-  /* Scale up to ensure that the scale factor is representable as normalised
+-     fp32 number, and scale m down accordingly.  */
+-  float32x4_t s = vreinterpretq_f32_u32 (vsubq_u32 (d->four, ku));
+-  m_scale = vaddq_f32 (m_scale, vfmaq_f32 (v_f32 (-1.0f), v_f32 (0.25f), s));
++/* Vector log1pf approximation using polynomial on reduced interval. Worst-case
++   error is 1.63 ULP:
++   _ZGVnN4v_log1pf(0x1.216d12p-2) got 0x1.fdcb12p-3
++				 want 0x1.fdcb16p-3.  */
++VPCS_ATTR float32x4_t V_NAME_F1 (log1p) (float32x4_t x)
++{
++  uint32x4_t special_cases = vornq_u32 (vcleq_f32 (x, v_f32 (-1)),
++					vcaleq_f32 (x, v_f32 (0x1p127f)));
+ 
+-  /* Evaluate polynomial on the reduced interval.  */
+-  float32x4_t p = eval_poly (m_scale, d->poly);
++  if (__glibc_unlikely (v_any_u32 (special_cases)))
++    return special_case (x, special_cases);
+ 
+-  /* The scale factor to be applied back at the end - by multiplying float(k)
+-     by 2^-23 we get the unbiased exponent of k.  */
+-  float32x4_t scale_back = vcvtq_f32_s32 (vshrq_n_s32 (k, 23));
++  return log1pf_inline (x, ptr_barrier (&data));
++}
+ 
+-  /* Apply the scaling back.  */
+-  float32x4_t y = vfmaq_f32 (p, scale_back, d->ln2);
++#endif
+ 
+-  if (__glibc_unlikely (v_any_u32 (special_cases)))
+-    return special_case (special_arg, y, special_cases);
+-  return y;
+-}
+ libmvec_hidden_def (V_NAME_F1 (log1p))
+ HALF_WIDTH_ALIAS_F1 (log1p)
+ strong_alias (V_NAME_F1 (log1p), V_NAME_F1 (logp1))
+diff --git a/sysdeps/aarch64/fpu/v_log1pf_inline.h b/sysdeps/aarch64/fpu/v_log1pf_inline.h
+index 643a6cdcfc..73e45a942e 100644
+--- a/sysdeps/aarch64/fpu/v_log1pf_inline.h
++++ b/sysdeps/aarch64/fpu/v_log1pf_inline.h
+@@ -25,54 +25,81 @@
+ 
+ struct v_log1pf_data
+ {
+-  float32x4_t poly[8], ln2;
+   uint32x4_t four;
+   int32x4_t three_quarters;
++  float c0, c3, c5, c7;
++  float32x4_t c4, c6, c1, c2, ln2;
+ };
+ 
+ /* Polynomial generated using FPMinimax in [-0.25, 0.5]. First two coefficients
+    (1, -0.5) are not stored as they can be generated more efficiently.  */
+ #define V_LOG1PF_CONSTANTS_TABLE                                              \
+   {                                                                           \
+-    .poly                                                                     \
+-	= { V4 (0x1.5555aap-2f),  V4 (-0x1.000038p-2f), V4 (0x1.99675cp-3f),  \
+-	    V4 (-0x1.54ef78p-3f), V4 (0x1.28a1f4p-3f),	V4 (-0x1.0da91p-3f),  \
+-	    V4 (0x1.abcb6p-4f),	  V4 (-0x1.6f0d5ep-5f) },                     \
+-	.ln2 = V4 (0x1.62e43p-1f), .four = V4 (0x40800000),                   \
+-	.three_quarters = V4 (0x3f400000)                                     \
++    .c0 = 0x1.5555aap-2f, .c1 = V4 (-0x1.000038p-2f),                         \
++    .c2 = V4 (0x1.99675cp-3f), .c3 = -0x1.54ef78p-3f,                         \
++    .c4 = V4 (0x1.28a1f4p-3f), .c5 = -0x1.0da91p-3f,                          \
++    .c6 = V4 (0x1.abcb6p-4f), .c7 = -0x1.6f0d5ep-5f,                          \
++    .ln2 = V4 (0x1.62e43p-1f), .four = V4 (0x40800000),                       \
++    .three_quarters = V4 (0x3f400000)                                         \
+   }
+ 
+ static inline float32x4_t
+-eval_poly (float32x4_t m, const float32x4_t *c)
++eval_poly (float32x4_t m, const struct v_log1pf_data *d)
+ {
+-  /* Approximate log(1+m) on [-0.25, 0.5] using pairwise Horner (main routine
+-     uses split Estrin, but this way reduces register pressure in the calling
+-     routine).  */
+-  float32x4_t q = vfmaq_f32 (v_f32 (-0.5), m, c[0]);
++  /* Approximate log(1+m) on [-0.25, 0.5] using pairwise Horner.  */
++  float32x4_t c0357 = vld1q_f32 (&d->c0);
++  float32x4_t q = vfmaq_laneq_f32 (v_f32 (-0.5), m, c0357, 0);
+   float32x4_t m2 = vmulq_f32 (m, m);
+-  q = vfmaq_f32 (m, m2, q);
+-  float32x4_t p = v_pw_horner_6_f32 (m, m2, c + 1);
++  float32x4_t p67 = vfmaq_laneq_f32 (d->c6, m, c0357, 3);
++  float32x4_t p45 = vfmaq_laneq_f32 (d->c4, m, c0357, 2);
++  float32x4_t p23 = vfmaq_laneq_f32 (d->c2, m, c0357, 1);
++  float32x4_t p = vfmaq_f32 (p45, m2, p67);
++  p = vfmaq_f32 (p23, m2, p);
++  p = vfmaq_f32 (d->c1, m, p);
+   p = vmulq_f32 (m2, p);
+-  return vfmaq_f32 (q, m2, p);
++  p = vfmaq_f32 (m, m2, p);
++  return vfmaq_f32 (p, m2, q);
+ }
+ 
+ static inline float32x4_t
+-log1pf_inline (float32x4_t x, const struct v_log1pf_data d)
++log1pf_inline (float32x4_t x, const struct v_log1pf_data *d)
+ {
+-  /* Helper for calculating log(x + 1). Copied from log1pf_2u1.c, with no
+-     special-case handling. See that file for details of the algorithm.  */
++  /* Helper for calculating log(x + 1).  */
++
++  /* With x + 1 = t * 2^k (where t = m + 1 and k is chosen such that m
++			   is in [-0.25, 0.5]):
++     log1p(x) = log(t) + log(2^k) = log1p(m) + k*log(2).
++
++     We approximate log1p(m) with a polynomial, then scale by
++     k*log(2). Instead of doing this directly, we use an intermediate
++     scale factor s = 4*k*log(2) to ensure the scale is representable
++     as a normalised fp32 number.  */
+   float32x4_t m = vaddq_f32 (x, v_f32 (1.0f));
++
++  /* Choose k to scale x to the range [-1/4, 1/2].  */
+   int32x4_t k
+-      = vandq_s32 (vsubq_s32 (vreinterpretq_s32_f32 (m), d.three_quarters),
++      = vandq_s32 (vsubq_s32 (vreinterpretq_s32_f32 (m), d->three_quarters),
+ 		   v_s32 (0xff800000));
+   uint32x4_t ku = vreinterpretq_u32_s32 (k);
+-  float32x4_t s = vreinterpretq_f32_u32 (vsubq_u32 (d.four, ku));
++
++  /* Scale up to ensure that the scale factor is representable as normalised
++     fp32 number, and scale m down accordingly.  */
++  float32x4_t s = vreinterpretq_f32_u32 (vsubq_u32 (d->four, ku));
++
++  /* Scale x by exponent manipulation.  */
+   float32x4_t m_scale
+       = vreinterpretq_f32_u32 (vsubq_u32 (vreinterpretq_u32_f32 (x), ku));
+   m_scale = vaddq_f32 (m_scale, vfmaq_f32 (v_f32 (-1.0f), v_f32 (0.25f), s));
+-  float32x4_t p = eval_poly (m_scale, d.poly);
++
++  /* Evaluate polynomial on the reduced interval.  */
++  float32x4_t p = eval_poly (m_scale, d);
++
++  /* The scale factor to be applied back at the end - by multiplying float(k)
++     by 2^-23 we get the unbiased exponent of k.  */
+   float32x4_t scale_back = vmulq_f32 (vcvtq_f32_s32 (k), v_f32 (0x1.0p-23f));
+-  return vfmaq_f32 (p, scale_back, d.ln2);
++
++  /* Apply the scaling back.  */
++  return vfmaq_f32 (p, scale_back, d->ln2);
+ }
+ 
+ #endif
+
+commit a947a43b95bbea53ec50df058b42392fd5ea52b6
+Author: Joe Ramsay <Joe.Ramsay@arm.com>
+Date:   Mon Sep 23 15:32:53 2024 +0100
+
+    AArch64: Improve codegen in users of ADVSIMD expm1f helper
+    
+    Rearrange operations so MOV is not necessary in reduction or around
+    the special-case handler.  Reduce memory access by using more indexed
+    MLAs in polynomial.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit 7900ac490db32f6bccff812733f00280dde34e27)
+
+diff --git a/sysdeps/aarch64/fpu/expm1f_advsimd.c b/sysdeps/aarch64/fpu/expm1f_advsimd.c
+index a0616ec754..8303ca296e 100644
+--- a/sysdeps/aarch64/fpu/expm1f_advsimd.c
++++ b/sysdeps/aarch64/fpu/expm1f_advsimd.c
+@@ -18,27 +18,18 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include "v_math.h"
+-#include "poly_advsimd_f32.h"
++#include "v_expm1f_inline.h"
+ 
+ static const struct data
+ {
+-  float32x4_t poly[5];
+-  float invln2_and_ln2[4];
+-  float32x4_t shift;
+-  int32x4_t exponent_bias;
++  struct v_expm1f_data d;
+ #if WANT_SIMD_EXCEPT
+   uint32x4_t thresh;
+ #else
+   float32x4_t oflow_bound;
+ #endif
+ } data = {
+-  /* Generated using fpminimax with degree=5 in [-log(2)/2, log(2)/2].  */
+-  .poly = { V4 (0x1.fffffep-2), V4 (0x1.5554aep-3), V4 (0x1.555736p-5),
+-	    V4 (0x1.12287cp-7), V4 (0x1.6b55a2p-10) },
+-  /* Stores constants: invln2, ln2_hi, ln2_lo, 0.  */
+-  .invln2_and_ln2 = { 0x1.715476p+0f, 0x1.62e4p-1f, 0x1.7f7d1cp-20f, 0 },
+-  .shift = V4 (0x1.8p23f),
+-  .exponent_bias = V4 (0x3f800000),
++  .d = V_EXPM1F_DATA,
+ #if !WANT_SIMD_EXCEPT
+   /* Value above which expm1f(x) should overflow. Absolute value of the
+      underflow bound is greater than this, so it catches both cases - there is
+@@ -55,67 +46,38 @@ static const struct data
+ #define TinyBound v_u32 (0x34000000 << 1)
+ 
+ static float32x4_t VPCS_ATTR NOINLINE
+-special_case (float32x4_t x, float32x4_t y, uint32x4_t special)
++special_case (float32x4_t x, uint32x4_t special, const struct data *d)
+ {
+-  return v_call_f32 (expm1f, x, y, special);
++  return v_call_f32 (
++      expm1f, x, expm1f_inline (v_zerofy_f32 (x, special), &d->d), special);
+ }
+ 
+ /* Single-precision vector exp(x) - 1 function.
+-   The maximum error is 1.51 ULP:
+-   _ZGVnN4v_expm1f (0x1.8baa96p-2) got 0x1.e2fb9p-2
+-				  want 0x1.e2fb94p-2.  */
++   The maximum error is 1.62 ULP:
++   _ZGVnN4v_expm1f(0x1.85f83p-2) got 0x1.da9f4p-2
++				want 0x1.da9f44p-2.  */
+ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (expm1) (float32x4_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+-  uint32x4_t ix = vreinterpretq_u32_f32 (x);
+ 
+ #if WANT_SIMD_EXCEPT
++  uint32x4_t ix = vreinterpretq_u32_f32 (x);
+   /* If fp exceptions are to be triggered correctly, fall back to scalar for
+      |x| < 2^-23, |x| > oflow_bound, Inf & NaN. Add ix to itself for
+      shift-left by 1, and compare with thresh which was left-shifted offline -
+      this is effectively an absolute compare.  */
+   uint32x4_t special
+       = vcgeq_u32 (vsubq_u32 (vaddq_u32 (ix, ix), TinyBound), d->thresh);
+-  if (__glibc_unlikely (v_any_u32 (special)))
+-    x = v_zerofy_f32 (x, special);
+ #else
+   /* Handles very large values (+ve and -ve), +/-NaN, +/-Inf.  */
+   uint32x4_t special = vcagtq_f32 (x, d->oflow_bound);
+ #endif
+ 
+-  /* Reduce argument to smaller range:
+-     Let i = round(x / ln2)
+-     and f = x - i * ln2, then f is in [-ln2/2, ln2/2].
+-     exp(x) - 1 = 2^i * (expm1(f) + 1) - 1
+-     where 2^i is exact because i is an integer.  */
+-  float32x4_t invln2_and_ln2 = vld1q_f32 (d->invln2_and_ln2);
+-  float32x4_t j
+-      = vsubq_f32 (vfmaq_laneq_f32 (d->shift, x, invln2_and_ln2, 0), d->shift);
+-  int32x4_t i = vcvtq_s32_f32 (j);
+-  float32x4_t f = vfmsq_laneq_f32 (x, j, invln2_and_ln2, 1);
+-  f = vfmsq_laneq_f32 (f, j, invln2_and_ln2, 2);
+-
+-  /* Approximate expm1(f) using polynomial.
+-     Taylor expansion for expm1(x) has the form:
+-	 x + ax^2 + bx^3 + cx^4 ....
+-     So we calculate the polynomial P(f) = a + bf + cf^2 + ...
+-     and assemble the approximation expm1(f) ~= f + f^2 * P(f).  */
+-  float32x4_t p = v_horner_4_f32 (f, d->poly);
+-  p = vfmaq_f32 (f, vmulq_f32 (f, f), p);
+-
+-  /* Assemble the result.
+-     expm1(x) ~= 2^i * (p + 1) - 1
+-     Let t = 2^i.  */
+-  int32x4_t u = vaddq_s32 (vshlq_n_s32 (i, 23), d->exponent_bias);
+-  float32x4_t t = vreinterpretq_f32_s32 (u);
+-
+   if (__glibc_unlikely (v_any_u32 (special)))
+-    return special_case (vreinterpretq_f32_u32 (ix),
+-			 vfmaq_f32 (vsubq_f32 (t, v_f32 (1.0f)), p, t),
+-			 special);
++    return special_case (x, special, d);
+ 
+   /* expm1(x) ~= p * t + (t - 1).  */
+-  return vfmaq_f32 (vsubq_f32 (t, v_f32 (1.0f)), p, t);
++  return expm1f_inline (x, &d->d);
+ }
+ libmvec_hidden_def (V_NAME_F1 (expm1))
+ HALF_WIDTH_ALIAS_F1 (expm1)
+diff --git a/sysdeps/aarch64/fpu/sinhf_advsimd.c b/sysdeps/aarch64/fpu/sinhf_advsimd.c
+index 6bb7482dc2..c6ed7598e7 100644
+--- a/sysdeps/aarch64/fpu/sinhf_advsimd.c
++++ b/sysdeps/aarch64/fpu/sinhf_advsimd.c
+@@ -23,15 +23,13 @@
+ static const struct data
+ {
+   struct v_expm1f_data expm1f_consts;
+-  uint32x4_t halff;
+ #if WANT_SIMD_EXCEPT
+   uint32x4_t tiny_bound, thresh;
+ #else
+-  uint32x4_t oflow_bound;
++  float32x4_t oflow_bound;
+ #endif
+ } data = {
+   .expm1f_consts = V_EXPM1F_DATA,
+-  .halff = V4 (0x3f000000),
+ #if WANT_SIMD_EXCEPT
+   /* 0x1.6a09e8p-32, below which expm1f underflows.  */
+   .tiny_bound = V4 (0x2fb504f4),
+@@ -39,14 +37,15 @@ static const struct data
+   .thresh = V4 (0x12fbbbb3),
+ #else
+   /* 0x1.61814ep+6, above which expm1f helper overflows.  */
+-  .oflow_bound = V4 (0x42b0c0a7),
++  .oflow_bound = V4 (0x1.61814ep+6),
+ #endif
+ };
+ 
+ static float32x4_t NOINLINE VPCS_ATTR
+-special_case (float32x4_t x, float32x4_t y, uint32x4_t special)
++special_case (float32x4_t x, float32x4_t t, float32x4_t halfsign,
++	      uint32x4_t special)
+ {
+-  return v_call_f32 (sinhf, x, y, special);
++  return v_call_f32 (sinhf, x, vmulq_f32 (t, halfsign), special);
+ }
+ 
+ /* Approximation for vector single-precision sinh(x) using expm1.
+@@ -60,15 +59,15 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (sinh) (float32x4_t x)
+ 
+   uint32x4_t ix = vreinterpretq_u32_f32 (x);
+   float32x4_t ax = vabsq_f32 (x);
+-  uint32x4_t iax = vreinterpretq_u32_f32 (ax);
+-  uint32x4_t sign = veorq_u32 (ix, iax);
+-  float32x4_t halfsign = vreinterpretq_f32_u32 (vorrq_u32 (sign, d->halff));
++  float32x4_t halfsign = vreinterpretq_f32_u32 (
++      vbslq_u32 (v_u32 (0x80000000), ix, vreinterpretq_u32_f32 (v_f32 (0.5))));
+ 
+ #if WANT_SIMD_EXCEPT
+-  uint32x4_t special = vcgeq_u32 (vsubq_u32 (iax, d->tiny_bound), d->thresh);
++  uint32x4_t special = vcgeq_u32 (
++      vsubq_u32 (vreinterpretq_u32_f32 (ax), d->tiny_bound), d->thresh);
+   ax = v_zerofy_f32 (ax, special);
+ #else
+-  uint32x4_t special = vcgeq_u32 (iax, d->oflow_bound);
++  uint32x4_t special = vcageq_f32 (x, d->oflow_bound);
+ #endif
+ 
+   /* Up to the point that expm1f overflows, we can use it to calculate sinhf
+@@ -80,7 +79,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (sinh) (float32x4_t x)
+   /* Fall back to the scalar variant for any lanes that should trigger an
+      exception.  */
+   if (__glibc_unlikely (v_any_u32 (special)))
+-    return special_case (x, vmulq_f32 (t, halfsign), special);
++    return special_case (x, t, halfsign, special);
+ 
+   return vmulq_f32 (t, halfsign);
+ }
+diff --git a/sysdeps/aarch64/fpu/tanhf_advsimd.c b/sysdeps/aarch64/fpu/tanhf_advsimd.c
+index 50defd6ef0..3ced9b7a41 100644
+--- a/sysdeps/aarch64/fpu/tanhf_advsimd.c
++++ b/sysdeps/aarch64/fpu/tanhf_advsimd.c
+@@ -28,13 +28,16 @@ static const struct data
+   /* 0x1.205966p+3, above which tanhf rounds to 1 (or -1 for  negative).  */
+   .boring_bound = V4 (0x41102cb3),
+   .large_bound = V4 (0x7f800000),
+-  .onef = V4 (0x3f800000),
+ };
+ 
+ static float32x4_t NOINLINE VPCS_ATTR
+-special_case (float32x4_t x, float32x4_t y, uint32x4_t special)
++special_case (float32x4_t x, uint32x4_t is_boring, float32x4_t boring,
++	      float32x4_t q, uint32x4_t special)
+ {
+-  return v_call_f32 (tanhf, x, y, special);
++  return v_call_f32 (
++      tanhf, x,
++      vbslq_f32 (is_boring, boring, vdivq_f32 (q, vaddq_f32 (q, v_f32 (2.0)))),
++      special);
+ }
+ 
+ /* Approximation for single-precision vector tanh(x), using a simplified
+@@ -50,7 +53,9 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (tanh) (float32x4_t x)
+   uint32x4_t iax = vreinterpretq_u32_f32 (ax);
+   uint32x4_t sign = veorq_u32 (ix, iax);
+   uint32x4_t is_boring = vcgtq_u32 (iax, d->boring_bound);
+-  float32x4_t boring = vreinterpretq_f32_u32 (vorrq_u32 (sign, d->onef));
++  /* expm1 exponent bias is 1.0f reinterpreted to int.  */
++  float32x4_t boring = vreinterpretq_f32_u32 (vorrq_u32 (
++      sign, vreinterpretq_u32_s32 (d->expm1f_consts.exponent_bias)));
+ 
+ #if WANT_SIMD_EXCEPT
+   /* If fp exceptions are to be triggered properly, set all special and boring
+@@ -66,10 +71,12 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (tanh) (float32x4_t x)
+ 
+   /* tanh(x) = (e^2x - 1) / (e^2x + 1).  */
+   float32x4_t q = expm1f_inline (vmulq_n_f32 (x, 2), &d->expm1f_consts);
+-  float32x4_t y = vdivq_f32 (q, vaddq_f32 (q, v_f32 (2.0)));
++
+   if (__glibc_unlikely (v_any_u32 (special)))
+-    return special_case (vreinterpretq_f32_u32 (ix),
+-			 vbslq_f32 (is_boring, boring, y), special);
++    return special_case (vreinterpretq_f32_u32 (ix), is_boring, boring, q,
++			 special);
++
++  float32x4_t y = vdivq_f32 (q, vaddq_f32 (q, v_f32 (2.0)));
+   return vbslq_f32 (is_boring, boring, y);
+ }
+ libmvec_hidden_def (V_NAME_F1 (tanh))
+diff --git a/sysdeps/aarch64/fpu/v_expm1f_inline.h b/sysdeps/aarch64/fpu/v_expm1f_inline.h
+index 59b552da6b..1daedfdd51 100644
+--- a/sysdeps/aarch64/fpu/v_expm1f_inline.h
++++ b/sysdeps/aarch64/fpu/v_expm1f_inline.h
+@@ -21,48 +21,47 @@
+ #define AARCH64_FPU_V_EXPM1F_INLINE_H
+ 
+ #include "v_math.h"
+-#include "poly_advsimd_f32.h"
++#include "math_config.h"
+ 
+ struct v_expm1f_data
+ {
+-  float32x4_t poly[5];
+-  float invln2_and_ln2[4];
+-  float32x4_t shift;
++  float32x4_t c0, c2;
+   int32x4_t exponent_bias;
++  float c1, c3, inv_ln2, c4;
++  float ln2_hi, ln2_lo;
+ };
+ 
+ /* Coefficients generated using fpminimax with degree=5 in [-log(2)/2,
+-   log(2)/2]. Exponent bias is asuint(1.0f).
+-   invln2_and_ln2 Stores constants: invln2, ln2_lo, ln2_hi, 0.  */
++   log(2)/2]. Exponent bias is asuint(1.0f).  */
+ #define V_EXPM1F_DATA                                                         \
+   {                                                                           \
+-    .poly = { V4 (0x1.fffffep-2), V4 (0x1.5554aep-3), V4 (0x1.555736p-5),     \
+-	      V4 (0x1.12287cp-7), V4 (0x1.6b55a2p-10) },                      \
+-    .shift = V4 (0x1.8p23f), .exponent_bias = V4 (0x3f800000),                \
+-    .invln2_and_ln2 = { 0x1.715476p+0f, 0x1.62e4p-1f, 0x1.7f7d1cp-20f, 0 },   \
++    .c0 = V4 (0x1.fffffep-2), .c1 = 0x1.5554aep-3, .c2 = V4 (0x1.555736p-5),  \
++    .c3 = 0x1.12287cp-7, .c4 = 0x1.6b55a2p-10,                                \
++    .exponent_bias = V4 (0x3f800000), .inv_ln2 = 0x1.715476p+0f,              \
++    .ln2_hi = 0x1.62e4p-1f, .ln2_lo = 0x1.7f7d1cp-20f,                        \
+   }
+ 
+ static inline float32x4_t
+ expm1f_inline (float32x4_t x, const struct v_expm1f_data *d)
+ {
+-  /* Helper routine for calculating exp(x) - 1.
+-     Copied from v_expm1f_1u6.c, with all special-case handling removed - the
+-     calling routine should handle special values if required.  */
++  /* Helper routine for calculating exp(x) - 1.  */
++
++  float32x2_t ln2 = vld1_f32 (&d->ln2_hi);
++  float32x4_t lane_consts = vld1q_f32 (&d->c1);
+ 
+   /* Reduce argument: f in [-ln2/2, ln2/2], i is exact.  */
+-  float32x4_t invln2_and_ln2 = vld1q_f32 (d->invln2_and_ln2);
+-  float32x4_t j
+-      = vsubq_f32 (vfmaq_laneq_f32 (d->shift, x, invln2_and_ln2, 0), d->shift);
++  float32x4_t j = vrndaq_f32 (vmulq_laneq_f32 (x, lane_consts, 2));
+   int32x4_t i = vcvtq_s32_f32 (j);
+-  float32x4_t f = vfmsq_laneq_f32 (x, j, invln2_and_ln2, 1);
+-  f = vfmsq_laneq_f32 (f, j, invln2_and_ln2, 2);
++  float32x4_t f = vfmsq_lane_f32 (x, j, ln2, 0);
++  f = vfmsq_lane_f32 (f, j, ln2, 1);
+ 
+-  /* Approximate expm1(f) with polynomial P, expm1(f) ~= f + f^2 * P(f).
+-     Uses Estrin scheme, where the main _ZGVnN4v_expm1f routine uses
+-     Horner.  */
++  /* Approximate expm1(f) with polynomial P, expm1(f) ~= f + f^2 * P(f).  */
+   float32x4_t f2 = vmulq_f32 (f, f);
+   float32x4_t f4 = vmulq_f32 (f2, f2);
+-  float32x4_t p = v_estrin_4_f32 (f, f2, f4, d->poly);
++  float32x4_t p01 = vfmaq_laneq_f32 (d->c0, f, lane_consts, 0);
++  float32x4_t p23 = vfmaq_laneq_f32 (d->c2, f, lane_consts, 1);
++  float32x4_t p = vfmaq_f32 (p01, f2, p23);
++  p = vfmaq_laneq_f32 (p, f4, lane_consts, 3);
+   p = vfmaq_f32 (f, f2, p);
+ 
+   /* t = 2^i.  */
+
+commit 68f2eb20de698675ddc74068c2cd03fee29207df
+Author: Joe Ramsay <Joe.Ramsay@arm.com>
+Date:   Mon Sep 23 15:33:31 2024 +0100
+
+    AArch64: Simplify rounding-multiply pattern in several AdvSIMD routines
+    
+    This operation can be simplified to use simpler multiply-round-convert
+    sequence, which uses fewer instructions and constants.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit 16a59571e4e9fd019d3fc23a2e7d73c1df8bb5cb)
+
+diff --git a/sysdeps/aarch64/fpu/cos_advsimd.c b/sysdeps/aarch64/fpu/cos_advsimd.c
+index 3924c9ce44..11a89b1530 100644
+--- a/sysdeps/aarch64/fpu/cos_advsimd.c
++++ b/sysdeps/aarch64/fpu/cos_advsimd.c
+@@ -22,7 +22,7 @@
+ static const struct data
+ {
+   float64x2_t poly[7];
+-  float64x2_t range_val, shift, inv_pi, half_pi, pi_1, pi_2, pi_3;
++  float64x2_t range_val, inv_pi, pi_1, pi_2, pi_3;
+ } data = {
+   /* Worst-case error is 3.3 ulp in [-pi/2, pi/2].  */
+   .poly = { V2 (-0x1.555555555547bp-3), V2 (0x1.1111111108a4dp-7),
+@@ -30,11 +30,9 @@ static const struct data
+ 	    V2 (-0x1.ae633919987c6p-26), V2 (0x1.60e277ae07cecp-33),
+ 	    V2 (-0x1.9e9540300a1p-41) },
+   .inv_pi = V2 (0x1.45f306dc9c883p-2),
+-  .half_pi = V2 (0x1.921fb54442d18p+0),
+   .pi_1 = V2 (0x1.921fb54442d18p+1),
+   .pi_2 = V2 (0x1.1a62633145c06p-53),
+   .pi_3 = V2 (0x1.c1cd129024e09p-106),
+-  .shift = V2 (0x1.8p52),
+   .range_val = V2 (0x1p23)
+ };
+ 
+@@ -68,10 +66,9 @@ float64x2_t VPCS_ATTR V_NAME_D1 (cos) (float64x2_t x)
+ #endif
+ 
+   /* n = rint((|x|+pi/2)/pi) - 0.5.  */
+-  n = vfmaq_f64 (d->shift, d->inv_pi, vaddq_f64 (r, d->half_pi));
+-  odd = vshlq_n_u64 (vreinterpretq_u64_f64 (n), 63);
+-  n = vsubq_f64 (n, d->shift);
+-  n = vsubq_f64 (n, v_f64 (0.5));
++  n = vrndaq_f64 (vfmaq_f64 (v_f64 (0.5), r, d->inv_pi));
++  odd = vshlq_n_u64 (vreinterpretq_u64_s64 (vcvtq_s64_f64 (n)), 63);
++  n = vsubq_f64 (n, v_f64 (0.5f));
+ 
+   /* r = |x| - n*pi  (range reduction into -pi/2 .. pi/2).  */
+   r = vfmsq_f64 (r, d->pi_1, n);
+diff --git a/sysdeps/aarch64/fpu/cosf_advsimd.c b/sysdeps/aarch64/fpu/cosf_advsimd.c
+index d0c285b03a..85a1b37373 100644
+--- a/sysdeps/aarch64/fpu/cosf_advsimd.c
++++ b/sysdeps/aarch64/fpu/cosf_advsimd.c
+@@ -22,7 +22,7 @@
+ static const struct data
+ {
+   float32x4_t poly[4];
+-  float32x4_t range_val, inv_pi, half_pi, shift, pi_1, pi_2, pi_3;
++  float32x4_t range_val, inv_pi, pi_1, pi_2, pi_3;
+ } data = {
+   /* 1.886 ulp error.  */
+   .poly = { V4 (-0x1.555548p-3f), V4 (0x1.110df4p-7f), V4 (-0x1.9f42eap-13f),
+@@ -33,8 +33,6 @@ static const struct data
+   .pi_3 = V4 (-0x1.ee59dap-49f),
+ 
+   .inv_pi = V4 (0x1.45f306p-2f),
+-  .shift = V4 (0x1.8p+23f),
+-  .half_pi = V4 (0x1.921fb6p0f),
+   .range_val = V4 (0x1p20f)
+ };
+ 
+@@ -69,9 +67,8 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (cos) (float32x4_t x)
+ #endif
+ 
+   /* n = rint((|x|+pi/2)/pi) - 0.5.  */
+-  n = vfmaq_f32 (d->shift, d->inv_pi, vaddq_f32 (r, d->half_pi));
+-  odd = vshlq_n_u32 (vreinterpretq_u32_f32 (n), 31);
+-  n = vsubq_f32 (n, d->shift);
++  n = vrndaq_f32 (vfmaq_f32 (v_f32 (0.5), r, d->inv_pi));
++  odd = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtq_s32_f32 (n)), 31);
+   n = vsubq_f32 (n, v_f32 (0.5f));
+ 
+   /* r = |x| - n*pi  (range reduction into -pi/2 .. pi/2).  */
+diff --git a/sysdeps/aarch64/fpu/expf_advsimd.c b/sysdeps/aarch64/fpu/expf_advsimd.c
+index 99d2e647aa..5c9cb72620 100644
+--- a/sysdeps/aarch64/fpu/expf_advsimd.c
++++ b/sysdeps/aarch64/fpu/expf_advsimd.c
+@@ -22,7 +22,7 @@
+ static const struct data
+ {
+   float32x4_t poly[5];
+-  float32x4_t shift, inv_ln2, ln2_hi, ln2_lo;
++  float32x4_t inv_ln2, ln2_hi, ln2_lo;
+   uint32x4_t exponent_bias;
+ #if !WANT_SIMD_EXCEPT
+   float32x4_t special_bound, scale_thresh;
+@@ -31,7 +31,6 @@ static const struct data
+   /* maxerr: 1.45358 +0.5 ulp.  */
+   .poly = { V4 (0x1.0e4020p-7f), V4 (0x1.573e2ep-5f), V4 (0x1.555e66p-3f),
+ 	    V4 (0x1.fffdb6p-2f), V4 (0x1.ffffecp-1f) },
+-  .shift = V4 (0x1.8p23f),
+   .inv_ln2 = V4 (0x1.715476p+0f),
+   .ln2_hi = V4 (0x1.62e4p-1f),
+   .ln2_lo = V4 (0x1.7f7d1cp-20f),
+@@ -85,7 +84,7 @@ special_case (float32x4_t poly, float32x4_t n, uint32x4_t e, uint32x4_t cmp1,
+ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp) (float32x4_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+-  float32x4_t n, r, r2, scale, p, q, poly, z;
++  float32x4_t n, r, r2, scale, p, q, poly;
+   uint32x4_t cmp, e;
+ 
+ #if WANT_SIMD_EXCEPT
+@@ -104,11 +103,10 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp) (float32x4_t x)
+ 
+   /* exp(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)]
+      x = ln2*n + r, with r in [-ln2/2, ln2/2].  */
+-  z = vfmaq_f32 (d->shift, x, d->inv_ln2);
+-  n = vsubq_f32 (z, d->shift);
++  n = vrndaq_f32 (vmulq_f32 (x, d->inv_ln2));
+   r = vfmsq_f32 (x, n, d->ln2_hi);
+   r = vfmsq_f32 (r, n, d->ln2_lo);
+-  e = vshlq_n_u32 (vreinterpretq_u32_f32 (z), 23);
++  e = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtq_s32_f32 (n)), 23);
+   scale = vreinterpretq_f32_u32 (vaddq_u32 (e, d->exponent_bias));
+ 
+ #if !WANT_SIMD_EXCEPT
+diff --git a/sysdeps/aarch64/fpu/sin_advsimd.c b/sysdeps/aarch64/fpu/sin_advsimd.c
+index a0d9d3b819..718125cbad 100644
+--- a/sysdeps/aarch64/fpu/sin_advsimd.c
++++ b/sysdeps/aarch64/fpu/sin_advsimd.c
+@@ -22,7 +22,7 @@
+ static const struct data
+ {
+   float64x2_t poly[7];
+-  float64x2_t range_val, inv_pi, shift, pi_1, pi_2, pi_3;
++  float64x2_t range_val, inv_pi, pi_1, pi_2, pi_3;
+ } data = {
+   .poly = { V2 (-0x1.555555555547bp-3), V2 (0x1.1111111108a4dp-7),
+ 	    V2 (-0x1.a01a019936f27p-13), V2 (0x1.71de37a97d93ep-19),
+@@ -34,12 +34,13 @@ static const struct data
+   .pi_1 = V2 (0x1.921fb54442d18p+1),
+   .pi_2 = V2 (0x1.1a62633145c06p-53),
+   .pi_3 = V2 (0x1.c1cd129024e09p-106),
+-  .shift = V2 (0x1.8p52),
+ };
+ 
+ #if WANT_SIMD_EXCEPT
+-# define TinyBound v_u64 (0x3000000000000000) /* asuint64 (0x1p-255).  */
+-# define Thresh v_u64 (0x1160000000000000)    /* RangeVal - TinyBound.  */
++/* asuint64(0x1p-253)), below which multiply by inv_pi underflows.  */
++# define TinyBound v_u64 (0x3020000000000000)
++/* RangeVal - TinyBound.  */
++# define Thresh v_u64 (0x1160000000000000)
+ #endif
+ 
+ #define C(i) d->poly[i]
+@@ -72,16 +73,15 @@ float64x2_t VPCS_ATTR V_NAME_D1 (sin) (float64x2_t x)
+      fenv). These lanes will be fixed by special-case handler later.  */
+   uint64x2_t ir = vreinterpretq_u64_f64 (vabsq_f64 (x));
+   cmp = vcgeq_u64 (vsubq_u64 (ir, TinyBound), Thresh);
+-  r = vbslq_f64 (cmp, vreinterpretq_f64_u64 (cmp), x);
++  r = vreinterpretq_f64_u64 (vbicq_u64 (vreinterpretq_u64_f64 (x), cmp));
+ #else
+   r = x;
+   cmp = vcageq_f64 (x, d->range_val);
+ #endif
+ 
+   /* n = rint(|x|/pi).  */
+-  n = vfmaq_f64 (d->shift, d->inv_pi, r);
+-  odd = vshlq_n_u64 (vreinterpretq_u64_f64 (n), 63);
+-  n = vsubq_f64 (n, d->shift);
++  n = vrndaq_f64 (vmulq_f64 (r, d->inv_pi));
++  odd = vshlq_n_u64 (vreinterpretq_u64_s64 (vcvtq_s64_f64 (n)), 63);
+ 
+   /* r = |x| - n*pi  (range reduction into -pi/2 .. pi/2).  */
+   r = vfmsq_f64 (r, d->pi_1, n);
+diff --git a/sysdeps/aarch64/fpu/sinf_advsimd.c b/sysdeps/aarch64/fpu/sinf_advsimd.c
+index 375dfc3331..6ee9a23d5b 100644
+--- a/sysdeps/aarch64/fpu/sinf_advsimd.c
++++ b/sysdeps/aarch64/fpu/sinf_advsimd.c
+@@ -22,7 +22,7 @@
+ static const struct data
+ {
+   float32x4_t poly[4];
+-  float32x4_t range_val, inv_pi, shift, pi_1, pi_2, pi_3;
++  float32x4_t range_val, inv_pi, pi_1, pi_2, pi_3;
+ } data = {
+   /* 1.886 ulp error.  */
+   .poly = { V4 (-0x1.555548p-3f), V4 (0x1.110df4p-7f), V4 (-0x1.9f42eap-13f),
+@@ -33,13 +33,14 @@ static const struct data
+   .pi_3 = V4 (-0x1.ee59dap-49f),
+ 
+   .inv_pi = V4 (0x1.45f306p-2f),
+-  .shift = V4 (0x1.8p+23f),
+   .range_val = V4 (0x1p20f)
+ };
+ 
+ #if WANT_SIMD_EXCEPT
+-# define TinyBound v_u32 (0x21000000) /* asuint32(0x1p-61f).  */
+-# define Thresh v_u32 (0x28800000)    /* RangeVal - TinyBound.  */
++/* asuint32(0x1p-59f), below which multiply by inv_pi underflows.  */
++# define TinyBound v_u32 (0x22000000)
++/* RangeVal - TinyBound.  */
++# define Thresh v_u32 (0x27800000)
+ #endif
+ 
+ #define C(i) d->poly[i]
+@@ -64,23 +65,22 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (sin) (float32x4_t x)
+   /* If fenv exceptions are to be triggered correctly, set any special lanes
+      to 1 (which is neutral w.r.t. fenv). These lanes will be fixed by
+      special-case handler later.  */
+-  r = vbslq_f32 (cmp, vreinterpretq_f32_u32 (cmp), x);
++  r = vreinterpretq_f32_u32 (vbicq_u32 (vreinterpretq_u32_f32 (x), cmp));
+ #else
+   r = x;
+   cmp = vcageq_f32 (x, d->range_val);
+ #endif
+ 
+-  /* n = rint(|x|/pi) */
+-  n = vfmaq_f32 (d->shift, d->inv_pi, r);
+-  odd = vshlq_n_u32 (vreinterpretq_u32_f32 (n), 31);
+-  n = vsubq_f32 (n, d->shift);
++  /* n = rint(|x|/pi).  */
++  n = vrndaq_f32 (vmulq_f32 (r, d->inv_pi));
++  odd = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtq_s32_f32 (n)), 31);
+ 
+-  /* r = |x| - n*pi  (range reduction into -pi/2 .. pi/2) */
++  /* r = |x| - n*pi  (range reduction into -pi/2 .. pi/2).  */
+   r = vfmsq_f32 (r, d->pi_1, n);
+   r = vfmsq_f32 (r, d->pi_2, n);
+   r = vfmsq_f32 (r, d->pi_3, n);
+ 
+-  /* y = sin(r) */
++  /* y = sin(r).  */
+   r2 = vmulq_f32 (r, r);
+   y = vfmaq_f32 (C (2), C (3), r2);
+   y = vfmaq_f32 (C (1), y, r2);
+
+commit 9ff7559b274eb0dbce2cbcf87284c1d30d47a2d6
+Author: Joe Ramsay <Joe.Ramsay@arm.com>
+Date:   Mon Oct 28 14:58:35 2024 +0000
+
+    AArch64: Small optimisation in AdvSIMD erf and erfc
+    
+    In both routines, reduce register pressure such that GCC 14 emits no
+    spills for erf and fewer spills for erfc.  Also use more efficient
+    comparison for the special-case in erf.
+    
+    Benchtests show erf improves by 6.4%, erfc by 1.0%.
+    
+    (cherry picked from commit 1cf29fbc5be23db775d1dfa6b332ded6e6554252)
+
+diff --git a/sysdeps/aarch64/fpu/erf_advsimd.c b/sysdeps/aarch64/fpu/erf_advsimd.c
+index 19cbb7d0f4..c0116735e4 100644
+--- a/sysdeps/aarch64/fpu/erf_advsimd.c
++++ b/sysdeps/aarch64/fpu/erf_advsimd.c
+@@ -22,19 +22,21 @@
+ static const struct data
+ {
+   float64x2_t third;
+-  float64x2_t tenth, two_over_five, two_over_fifteen;
+-  float64x2_t two_over_nine, two_over_fortyfive;
++  float64x2_t tenth, two_over_five, two_over_nine;
++  double two_over_fifteen, two_over_fortyfive;
+   float64x2_t max, shift;
++  uint64x2_t max_idx;
+ #if WANT_SIMD_EXCEPT
+   float64x2_t tiny_bound, huge_bound, scale_minus_one;
+ #endif
+ } data = {
++  .max_idx = V2 (768),
+   .third = V2 (0x1.5555555555556p-2), /* used to compute 2/3 and 1/6 too.  */
+-  .two_over_fifteen = V2 (0x1.1111111111111p-3),
++  .two_over_fifteen = 0x1.1111111111111p-3,
+   .tenth = V2 (-0x1.999999999999ap-4),
+   .two_over_five = V2 (-0x1.999999999999ap-2),
+   .two_over_nine = V2 (-0x1.c71c71c71c71cp-3),
+-  .two_over_fortyfive = V2 (0x1.6c16c16c16c17p-5),
++  .two_over_fortyfive = 0x1.6c16c16c16c17p-5,
+   .max = V2 (5.9921875), /* 6 - 1/128.  */
+   .shift = V2 (0x1p45),
+ #if WANT_SIMD_EXCEPT
+@@ -87,8 +89,8 @@ float64x2_t VPCS_ATTR V_NAME_D1 (erf) (float64x2_t x)
+   float64x2_t a = vabsq_f64 (x);
+   /* Reciprocal conditions that do not catch NaNs so they can be used in BSLs
+      to return expected results.  */
+-  uint64x2_t a_le_max = vcleq_f64 (a, dat->max);
+-  uint64x2_t a_gt_max = vcgtq_f64 (a, dat->max);
++  uint64x2_t a_le_max = vcaleq_f64 (x, dat->max);
++  uint64x2_t a_gt_max = vcagtq_f64 (x, dat->max);
+ 
+ #if WANT_SIMD_EXCEPT
+   /* |x| huge or tiny.  */
+@@ -115,7 +117,7 @@ float64x2_t VPCS_ATTR V_NAME_D1 (erf) (float64x2_t x)
+      segfault.  */
+   uint64x2_t i
+       = vsubq_u64 (vreinterpretq_u64_f64 (z), vreinterpretq_u64_f64 (shift));
+-  i = vbslq_u64 (a_le_max, i, v_u64 (768));
++  i = vbslq_u64 (a_le_max, i, dat->max_idx);
+   struct entry e = lookup (i);
+ 
+   float64x2_t r = vsubq_f64 (z, shift);
+@@ -125,14 +127,19 @@ float64x2_t VPCS_ATTR V_NAME_D1 (erf) (float64x2_t x)
+   float64x2_t d2 = vmulq_f64 (d, d);
+   float64x2_t r2 = vmulq_f64 (r, r);
+ 
++  float64x2_t two_over_fifteen_and_fortyfive
++      = vld1q_f64 (&dat->two_over_fifteen);
++
+   /* poly (d, r) = 1 + p1(r) * d + p2(r) * d^2 + ... + p5(r) * d^5.  */
+   float64x2_t p1 = r;
+   float64x2_t p2
+       = vfmsq_f64 (dat->third, r2, vaddq_f64 (dat->third, dat->third));
+   float64x2_t p3 = vmulq_f64 (r, vfmaq_f64 (v_f64 (-0.5), r2, dat->third));
+-  float64x2_t p4 = vfmaq_f64 (dat->two_over_five, r2, dat->two_over_fifteen);
++  float64x2_t p4 = vfmaq_laneq_f64 (dat->two_over_five, r2,
++				    two_over_fifteen_and_fortyfive, 0);
+   p4 = vfmsq_f64 (dat->tenth, r2, p4);
+-  float64x2_t p5 = vfmaq_f64 (dat->two_over_nine, r2, dat->two_over_fortyfive);
++  float64x2_t p5 = vfmaq_laneq_f64 (dat->two_over_nine, r2,
++				    two_over_fifteen_and_fortyfive, 1);
+   p5 = vmulq_f64 (r, vfmaq_f64 (vmulq_f64 (v_f64 (0.5), dat->third), r2, p5));
+ 
+   float64x2_t p34 = vfmaq_f64 (p3, d, p4);
+diff --git a/sysdeps/aarch64/fpu/erfc_advsimd.c b/sysdeps/aarch64/fpu/erfc_advsimd.c
+index f1b3bfe830..2f2f755c46 100644
+--- a/sysdeps/aarch64/fpu/erfc_advsimd.c
++++ b/sysdeps/aarch64/fpu/erfc_advsimd.c
+@@ -24,8 +24,8 @@ static const struct data
+ {
+   uint64x2_t offset, table_scale;
+   float64x2_t max, shift;
+-  float64x2_t p20, p40, p41, p42;
+-  float64x2_t p51, p52;
++  float64x2_t p20, p40, p41, p51;
++  double p42, p52;
+   double qr5[2], qr6[2], qr7[2], qr8[2], qr9[2];
+ #if WANT_SIMD_EXCEPT
+   float64x2_t uflow_bound;
+@@ -41,9 +41,9 @@ static const struct data
+   .p20 = V2 (0x1.5555555555555p-2),  /* 1/3, used to compute 2/3 and 1/6.  */
+   .p40 = V2 (-0x1.999999999999ap-4), /* 1/10.  */
+   .p41 = V2 (-0x1.999999999999ap-2), /* 2/5.  */
+-  .p42 = V2 (0x1.1111111111111p-3),  /* 2/15.  */
++  .p42 = 0x1.1111111111111p-3,	     /* 2/15.  */
+   .p51 = V2 (-0x1.c71c71c71c71cp-3), /* 2/9.  */
+-  .p52 = V2 (0x1.6c16c16c16c17p-5),  /* 2/45.  */
++  .p52 = 0x1.6c16c16c16c17p-5,	     /* 2/45.  */
+   /* Qi = (i+1) / i, Ri = -2 * i / ((i+1)*(i+2)), for i = 5, ..., 9.  */
+   .qr5 = { 0x1.3333333333333p0, -0x1.e79e79e79e79ep-3 },
+   .qr6 = { 0x1.2aaaaaaaaaaabp0, -0x1.b6db6db6db6dbp-3 },
+@@ -157,9 +157,10 @@ float64x2_t V_NAME_D1 (erfc) (float64x2_t x)
+   float64x2_t p1 = r;
+   float64x2_t p2 = vfmsq_f64 (dat->p20, r2, vaddq_f64 (dat->p20, dat->p20));
+   float64x2_t p3 = vmulq_f64 (r, vfmaq_f64 (v_f64 (-0.5), r2, dat->p20));
+-  float64x2_t p4 = vfmaq_f64 (dat->p41, r2, dat->p42);
++  float64x2_t p42_p52 = vld1q_f64 (&dat->p42);
++  float64x2_t p4 = vfmaq_laneq_f64 (dat->p41, r2, p42_p52, 0);
+   p4 = vfmsq_f64 (dat->p40, r2, p4);
+-  float64x2_t p5 = vfmaq_f64 (dat->p51, r2, dat->p52);
++  float64x2_t p5 = vfmaq_laneq_f64 (dat->p51, r2, p42_p52, 1);
+   p5 = vmulq_f64 (r, vfmaq_f64 (vmulq_f64 (v_f64 (0.5), dat->p20), r2, p5));
+   /* Compute p_i using recurrence relation:
+      p_{i+2} = (p_i + r * Q_{i+1} * p_{i+1}) * R_{i+1}.  */
+
+commit 76c923fe9d09befc8131205659d99cb9ac97460a
+Author: Joe Ramsay <Joe.Ramsay@arm.com>
+Date:   Fri Nov 1 15:48:54 2024 +0000
+
+    AArch64: Remove SVE erf and erfc tables
+    
+    By using a combination of mask-and-add instead of the shift-based
+    index calculation the routines can share the same table as other
+    variants with no performance degradation.
+    
+    The tables change name because of other changes in downstream AOR.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit 2d82d781a539ce8e82178fc1fa2c99ae1884e7fe)
+
+diff --git a/sysdeps/aarch64/fpu/Makefile b/sysdeps/aarch64/fpu/Makefile
+index 234a6c457c..be8541f649 100644
+--- a/sysdeps/aarch64/fpu/Makefile
++++ b/sysdeps/aarch64/fpu/Makefile
+@@ -41,8 +41,6 @@ libmvec-support = $(addsuffix f_advsimd,$(float-advsimd-funcs)) \
+                   v_log10_data \
+                   erf_data \
+                   erff_data \
+-                  sv_erf_data \
+-                  sv_erff_data \
+                   v_exp_tail_data \
+                   erfc_data \
+                   erfcf_data \
+diff --git a/sysdeps/aarch64/fpu/erf_advsimd.c b/sysdeps/aarch64/fpu/erf_advsimd.c
+index c0116735e4..a48092e838 100644
+--- a/sysdeps/aarch64/fpu/erf_advsimd.c
++++ b/sysdeps/aarch64/fpu/erf_advsimd.c
+@@ -58,8 +58,8 @@ static inline struct entry
+ lookup (uint64x2_t i)
+ {
+   struct entry e;
+-  float64x2_t e1 = vld1q_f64 (&__erf_data.tab[vgetq_lane_u64 (i, 0)].erf),
+-	      e2 = vld1q_f64 (&__erf_data.tab[vgetq_lane_u64 (i, 1)].erf);
++  float64x2_t e1 = vld1q_f64 (&__v_erf_data.tab[vgetq_lane_u64 (i, 0)].erf),
++	      e2 = vld1q_f64 (&__v_erf_data.tab[vgetq_lane_u64 (i, 1)].erf);
+   e.erf = vuzp1q_f64 (e1, e2);
+   e.scale = vuzp2q_f64 (e1, e2);
+   return e;
+diff --git a/sysdeps/aarch64/fpu/erf_data.c b/sysdeps/aarch64/fpu/erf_data.c
+index 6d2dcd235c..ea01fad7ca 100644
+--- a/sysdeps/aarch64/fpu/erf_data.c
++++ b/sysdeps/aarch64/fpu/erf_data.c
+@@ -19,14 +19,14 @@
+ 
+ #include "vecmath_config.h"
+ 
+-/* Lookup table used in erf.
++/* Lookup table used in vector erf.
+    For each possible rounded input r (multiples of 1/128), between
+    r = 0.0 and r = 6.0 (769 values):
+-   - the first entry __erff_data.tab.erf contains the values of erf(r),
+-   - the second entry __erff_data.tab.scale contains the values of
++   - the first entry __v_erff_data.tab.erf contains the values of erf(r),
++   - the second entry __v_erff_data.tab.scale contains the values of
+    2/sqrt(pi)*exp(-r^2). Note that indices 0 and 1 are never hit by the
+    algorithm, since lookup is performed only for x >= 1/64-1/512.  */
+-const struct erf_data __erf_data = {
++const struct v_erf_data __v_erf_data = {
+   .tab = { { 0x0.0000000000000p+0, 0x1.20dd750429b6dp+0 },
+ 	   { 0x1.20dbf3deb1340p-7, 0x1.20d8f1975c85dp+0 },
+ 	   { 0x1.20d77083f17a0p-6, 0x1.20cb67bd452c7p+0 },
+diff --git a/sysdeps/aarch64/fpu/erf_sve.c b/sysdeps/aarch64/fpu/erf_sve.c
+index 7d51417406..671d55a02b 100644
+--- a/sysdeps/aarch64/fpu/erf_sve.c
++++ b/sysdeps/aarch64/fpu/erf_sve.c
+@@ -67,14 +67,16 @@ svfloat64_t SV_NAME_D1 (erf) (svfloat64_t x, const svbool_t pg)
+   svfloat64_t a = svabs_x (pg, x);
+   svfloat64_t shift = sv_f64 (dat->shift);
+   svfloat64_t z = svadd_x (pg, a, shift);
+-  svuint64_t i
+-      = svsub_x (pg, svreinterpret_u64 (z), svreinterpret_u64 (shift));
++  svuint64_t i = svand_x (pg, svreinterpret_u64 (z), 0xfff);
++  i = svadd_x (pg, i, i);
+ 
+   /* Lookup without shortcut for small values but with predicate to avoid
+      segfault for large values and NaNs.  */
+   svfloat64_t r = svsub_x (pg, z, shift);
+-  svfloat64_t erfr = svld1_gather_index (a_lt_max, __sv_erf_data.erf, i);
+-  svfloat64_t scale = svld1_gather_index (a_lt_max, __sv_erf_data.scale, i);
++  svfloat64_t erfr
++      = svld1_gather_index (a_lt_max, &__v_erf_data.tab[0].erf, i);
++  svfloat64_t scale
++      = svld1_gather_index (a_lt_max, &__v_erf_data.tab[0].scale, i);
+ 
+   /* erf(x) ~ erf(r) + scale * d * poly (r, d).  */
+   svfloat64_t d = svsub_x (pg, a, r);
+diff --git a/sysdeps/aarch64/fpu/erfc_advsimd.c b/sysdeps/aarch64/fpu/erfc_advsimd.c
+index 2f2f755c46..d05eac61a2 100644
+--- a/sysdeps/aarch64/fpu/erfc_advsimd.c
++++ b/sysdeps/aarch64/fpu/erfc_advsimd.c
+@@ -69,9 +69,9 @@ lookup (uint64x2_t i)
+ {
+   struct entry e;
+   float64x2_t e1
+-      = vld1q_f64 (&__erfc_data.tab[vgetq_lane_u64 (i, 0) - Off].erfc);
++      = vld1q_f64 (&__v_erfc_data.tab[vgetq_lane_u64 (i, 0) - Off].erfc);
+   float64x2_t e2
+-      = vld1q_f64 (&__erfc_data.tab[vgetq_lane_u64 (i, 1) - Off].erfc);
++      = vld1q_f64 (&__v_erfc_data.tab[vgetq_lane_u64 (i, 1) - Off].erfc);
+   e.erfc = vuzp1q_f64 (e1, e2);
+   e.scale = vuzp2q_f64 (e1, e2);
+   return e;
+diff --git a/sysdeps/aarch64/fpu/erfc_data.c b/sysdeps/aarch64/fpu/erfc_data.c
+index 76a94e4681..8dc6a8c42c 100644
+--- a/sysdeps/aarch64/fpu/erfc_data.c
++++ b/sysdeps/aarch64/fpu/erfc_data.c
+@@ -19,14 +19,14 @@
+ 
+ #include "vecmath_config.h"
+ 
+-/* Lookup table used in erfc.
++/* Lookup table used in vector erfc.
+    For each possible rounded input r (multiples of 1/128), between
+    r = 0.0 and r = ~27.0 (3488 values):
+-   - the first entry __erfc_data.tab.erfc contains the values of erfc(r),
+-   - the second entry __erfc_data.tab.scale contains the values of
++   - the first entry __v_erfc_data.tab.erfc contains the values of erfc(r),
++   - the second entry __v_erfc_data.tab.scale contains the values of
+    2/sqrt(pi)*exp(-r^2). Both values may go into subnormal range, therefore
+    they are scaled by a large enough value 2^128 (fits in 8bit).  */
+-const struct erfc_data __erfc_data = {
++const struct v_erfc_data __v_erfc_data = {
+   .tab = { { 0x1p128, 0x1.20dd750429b6dp128 },
+ 	   { 0x1.fb7c9030853b3p127, 0x1.20d8f1975c85dp128 },
+ 	   { 0x1.f6f9447be0743p127, 0x1.20cb67bd452c7p128 },
+diff --git a/sysdeps/aarch64/fpu/erfc_sve.c b/sysdeps/aarch64/fpu/erfc_sve.c
+index c17d3e4484..703926ee41 100644
+--- a/sysdeps/aarch64/fpu/erfc_sve.c
++++ b/sysdeps/aarch64/fpu/erfc_sve.c
+@@ -104,7 +104,7 @@ svfloat64_t SV_NAME_D1 (erfc) (svfloat64_t x, const svbool_t pg)
+ 
+   /* Lookup erfc(r) and 2/sqrt(pi)*exp(-r^2) in tables.  */
+   i = svadd_x (pg, i, i);
+-  const float64_t *p = &__erfc_data.tab[0].erfc - 2 * dat->off_arr;
++  const float64_t *p = &__v_erfc_data.tab[0].erfc - 2 * dat->off_arr;
+   svfloat64_t erfcr = svld1_gather_index (pg, p, i);
+   svfloat64_t scale = svld1_gather_index (pg, p + 1, i);
+ 
+diff --git a/sysdeps/aarch64/fpu/erfcf_advsimd.c b/sysdeps/aarch64/fpu/erfcf_advsimd.c
+index ca5bc3ab33..59b0b0d64b 100644
+--- a/sysdeps/aarch64/fpu/erfcf_advsimd.c
++++ b/sysdeps/aarch64/fpu/erfcf_advsimd.c
+@@ -62,13 +62,13 @@ lookup (uint32x4_t i)
+ {
+   struct entry e;
+   float32x2_t t0
+-      = vld1_f32 (&__erfcf_data.tab[vgetq_lane_u32 (i, 0) - Off].erfc);
++      = vld1_f32 (&__v_erfcf_data.tab[vgetq_lane_u32 (i, 0) - Off].erfc);
+   float32x2_t t1
+-      = vld1_f32 (&__erfcf_data.tab[vgetq_lane_u32 (i, 1) - Off].erfc);
++      = vld1_f32 (&__v_erfcf_data.tab[vgetq_lane_u32 (i, 1) - Off].erfc);
+   float32x2_t t2
+-      = vld1_f32 (&__erfcf_data.tab[vgetq_lane_u32 (i, 2) - Off].erfc);
++      = vld1_f32 (&__v_erfcf_data.tab[vgetq_lane_u32 (i, 2) - Off].erfc);
+   float32x2_t t3
+-      = vld1_f32 (&__erfcf_data.tab[vgetq_lane_u32 (i, 3) - Off].erfc);
++      = vld1_f32 (&__v_erfcf_data.tab[vgetq_lane_u32 (i, 3) - Off].erfc);
+   float32x4_t e1 = vcombine_f32 (t0, t1);
+   float32x4_t e2 = vcombine_f32 (t2, t3);
+   e.erfc = vuzp1q_f32 (e1, e2);
+diff --git a/sysdeps/aarch64/fpu/erfcf_data.c b/sysdeps/aarch64/fpu/erfcf_data.c
+index 77fb889a78..d45087bbb9 100644
+--- a/sysdeps/aarch64/fpu/erfcf_data.c
++++ b/sysdeps/aarch64/fpu/erfcf_data.c
+@@ -19,14 +19,14 @@
+ 
+ #include "vecmath_config.h"
+ 
+-/* Lookup table used in erfcf.
++/* Lookup table used in vector erfcf.
+    For each possible rounded input r (multiples of 1/64), between
+    r = 0.0 and r = 10.0625 (645 values):
+-   - the first entry __erfcf_data.tab.erfc contains the values of erfc(r),
+-   - the second entry __erfcf_data.tab.scale contains the values of
++   - the first entry __v_erfcf_data.tab.erfc contains the values of erfc(r),
++   - the second entry __v_erfcf_data.tab.scale contains the values of
+    2/sqrt(pi)*exp(-r^2). Both values may go into subnormal range, therefore
+    they are scaled by a large enough value 2^47 (fits in 8 bits).  */
+-const struct erfcf_data __erfcf_data = {
++const struct v_erfcf_data __v_erfcf_data = {
+   .tab = { { 0x1p47, 0x1.20dd76p47 },
+ 	   { 0x1.f6f944p46, 0x1.20cb68p47 },
+ 	   { 0x1.edf3aap46, 0x1.209546p47 },
+diff --git a/sysdeps/aarch64/fpu/erfcf_sve.c b/sysdeps/aarch64/fpu/erfcf_sve.c
+index 48d1677eb4..ecacb933ac 100644
+--- a/sysdeps/aarch64/fpu/erfcf_sve.c
++++ b/sysdeps/aarch64/fpu/erfcf_sve.c
+@@ -77,7 +77,7 @@ svfloat32_t SV_NAME_F1 (erfc) (svfloat32_t x, const svbool_t pg)
+ 
+   /* Lookup erfc(r) and 2/sqrt(pi)*exp(-r^2) in tables.  */
+   i = svmul_x (pg, i, 2);
+-  const float32_t *p = &__erfcf_data.tab[0].erfc - 2 * dat->off_arr;
++  const float32_t *p = &__v_erfcf_data.tab[0].erfc - 2 * dat->off_arr;
+   svfloat32_t erfcr = svld1_gather_index (pg, p, i);
+   svfloat32_t scale = svld1_gather_index (pg, p + 1, i);
+ 
+diff --git a/sysdeps/aarch64/fpu/erff_advsimd.c b/sysdeps/aarch64/fpu/erff_advsimd.c
+index f2fe6ff236..db39e789b6 100644
+--- a/sysdeps/aarch64/fpu/erff_advsimd.c
++++ b/sysdeps/aarch64/fpu/erff_advsimd.c
+@@ -47,10 +47,10 @@ static inline struct entry
+ lookup (uint32x4_t i)
+ {
+   struct entry e;
+-  float32x2_t t0 = vld1_f32 (&__erff_data.tab[vgetq_lane_u32 (i, 0)].erf);
+-  float32x2_t t1 = vld1_f32 (&__erff_data.tab[vgetq_lane_u32 (i, 1)].erf);
+-  float32x2_t t2 = vld1_f32 (&__erff_data.tab[vgetq_lane_u32 (i, 2)].erf);
+-  float32x2_t t3 = vld1_f32 (&__erff_data.tab[vgetq_lane_u32 (i, 3)].erf);
++  float32x2_t t0 = vld1_f32 (&__v_erff_data.tab[vgetq_lane_u32 (i, 0)].erf);
++  float32x2_t t1 = vld1_f32 (&__v_erff_data.tab[vgetq_lane_u32 (i, 1)].erf);
++  float32x2_t t2 = vld1_f32 (&__v_erff_data.tab[vgetq_lane_u32 (i, 2)].erf);
++  float32x2_t t3 = vld1_f32 (&__v_erff_data.tab[vgetq_lane_u32 (i, 3)].erf);
+   float32x4_t e1 = vcombine_f32 (t0, t1);
+   float32x4_t e2 = vcombine_f32 (t2, t3);
+   e.erf = vuzp1q_f32 (e1, e2);
+diff --git a/sysdeps/aarch64/fpu/erff_data.c b/sysdeps/aarch64/fpu/erff_data.c
+index 9a32940915..da38aed205 100644
+--- a/sysdeps/aarch64/fpu/erff_data.c
++++ b/sysdeps/aarch64/fpu/erff_data.c
+@@ -19,14 +19,14 @@
+ 
+ #include "vecmath_config.h"
+ 
+-/* Lookup table used in erff.
++/* Lookup table used in vector erff.
+    For each possible rounded input r (multiples of 1/128), between
+    r = 0.0 and r = 4.0 (513 values):
+-   - the first entry __erff_data.tab.erf contains the values of erf(r),
+-   - the second entry __erff_data.tab.scale contains the values of
++   - the first entry __v_erff_data.tab.erf contains the values of erf(r),
++   - the second entry __v_erff_data.tab.scale contains the values of
+    2/sqrt(pi)*exp(-r^2). Note that indices 0 and 1 are never hit by the
+    algorithm, since lookup is performed only for x >= 1/64-1/512.  */
+-const struct erff_data __erff_data = {
++const struct v_erff_data __v_erff_data = {
+   .tab = { { 0x0.000000p+0, 0x1.20dd76p+0 },
+ 	   { 0x1.20dbf4p-7, 0x1.20d8f2p+0 },
+ 	   { 0x1.20d770p-6, 0x1.20cb68p+0 },
+diff --git a/sysdeps/aarch64/fpu/erff_sve.c b/sysdeps/aarch64/fpu/erff_sve.c
+index 38f00db9be..0e382eb09a 100644
+--- a/sysdeps/aarch64/fpu/erff_sve.c
++++ b/sysdeps/aarch64/fpu/erff_sve.c
+@@ -62,18 +62,17 @@ svfloat32_t SV_NAME_F1 (erf) (svfloat32_t x, const svbool_t pg)
+ 
+   svfloat32_t shift = sv_f32 (dat->shift);
+   svfloat32_t z = svadd_x (pg, a, shift);
+-  svuint32_t i
+-      = svsub_x (pg, svreinterpret_u32 (z), svreinterpret_u32 (shift));
+-
+-  /* Saturate lookup index.  */
+-  i = svsel (a_ge_max, sv_u32 (512), i);
++  svuint32_t i = svand_x (pg, svreinterpret_u32 (z), 0xfff);
++  i = svadd_x (pg, i, i);
+ 
+   /* r and erf(r) set to 0 for |x| below min.  */
+   svfloat32_t r = svsub_z (a_gt_min, z, shift);
+-  svfloat32_t erfr = svld1_gather_index (a_gt_min, __sv_erff_data.erf, i);
++  svfloat32_t erfr
++      = svld1_gather_index (a_gt_min, &__v_erff_data.tab[0].erf, i);
+ 
+   /* scale set to 2/sqrt(pi) for |x| below min.  */
+-  svfloat32_t scale = svld1_gather_index (a_gt_min, __sv_erff_data.scale, i);
++  svfloat32_t scale
++      = svld1_gather_index (a_gt_min, &__v_erff_data.tab[0].scale, i);
+   scale = svsel (a_gt_min, scale, sv_f32 (dat->scale));
+ 
+   /* erf(x) ~ erf(r) + scale * d * (1 - r * d + 1/3 * d^2).  */
+diff --git a/sysdeps/aarch64/fpu/sv_erf_data.c b/sysdeps/aarch64/fpu/sv_erf_data.c
+deleted file mode 100644
+index a53878f893..0000000000
+--- a/sysdeps/aarch64/fpu/sv_erf_data.c
++++ /dev/null
+@@ -1,1570 +0,0 @@
+-/* Table for SVE erf approximation
+-
+-   Copyright (C) 2024 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, see
+-   <https://www.gnu.org/licenses/>.  */
+-
+-#include "vecmath_config.h"
+-
+-/* Lookup table used in vector erf.
+-   For each possible rounded input r (multiples of 1/128), between
+-   r = 0.0 and r = 6.0 (769 values):
+-   - the first entry __erf_data.tab.erf contains the values of erf(r),
+-   - the second entry __erf_data.tab.scale contains the values of
+-   2/sqrt(pi)*exp(-r^2). Note that indices 0 and 1 are never hit by the
+-   algorithm, since lookup is performed only for x >= 1/64-1/512.  */
+-const struct sv_erf_data __sv_erf_data = {
+-  .erf = { 0x0.0000000000000p+0,
+-	   0x1.20dbf3deb1340p-7,
+-	   0x1.20d77083f17a0p-6,
+-	   0x1.b137e0cf584dcp-6,
+-	   0x1.20c5645dd2538p-5,
+-	   0x1.68e5d3bbc9526p-5,
+-	   0x1.b0fafef135745p-5,
+-	   0x1.f902a77bd3821p-5,
+-	   0x1.207d480e90658p-4,
+-	   0x1.44703e87e8593p-4,
+-	   0x1.68591a1e83b5dp-4,
+-	   0x1.8c36beb8a8d23p-4,
+-	   0x1.b0081148a873ap-4,
+-	   0x1.d3cbf7e70a4b3p-4,
+-	   0x1.f78159ec8bb50p-4,
+-	   0x1.0d939005f65e5p-3,
+-	   0x1.1f5e1a35c3b89p-3,
+-	   0x1.311fc15f56d14p-3,
+-	   0x1.42d7fc2f64959p-3,
+-	   0x1.548642321d7c6p-3,
+-	   0x1.662a0bdf7a89fp-3,
+-	   0x1.77c2d2a765f9ep-3,
+-	   0x1.895010fdbdbfdp-3,
+-	   0x1.9ad142662e14dp-3,
+-	   0x1.ac45e37fe2526p-3,
+-	   0x1.bdad72110a648p-3,
+-	   0x1.cf076d1233237p-3,
+-	   0x1.e05354b96ff36p-3,
+-	   0x1.f190aa85540e2p-3,
+-	   0x1.015f78a3dcf3dp-2,
+-	   0x1.09eed6982b948p-2,
+-	   0x1.127631eb8de32p-2,
+-	   0x1.1af54e232d609p-2,
+-	   0x1.236bef825d9a2p-2,
+-	   0x1.2bd9db0f7827fp-2,
+-	   0x1.343ed6989b7d9p-2,
+-	   0x1.3c9aa8b84bedap-2,
+-	   0x1.44ed18d9f6462p-2,
+-	   0x1.4d35ef3e5372ep-2,
+-	   0x1.5574f4ffac98ep-2,
+-	   0x1.5da9f415ff23fp-2,
+-	   0x1.65d4b75b00471p-2,
+-	   0x1.6df50a8dff772p-2,
+-	   0x1.760aba57a76bfp-2,
+-	   0x1.7e15944d9d3e4p-2,
+-	   0x1.861566f5fd3c0p-2,
+-	   0x1.8e0a01cab516bp-2,
+-	   0x1.95f3353cbb146p-2,
+-	   0x1.9dd0d2b721f39p-2,
+-	   0x1.a5a2aca209394p-2,
+-	   0x1.ad68966569a87p-2,
+-	   0x1.b522646bbda68p-2,
+-	   0x1.bccfec24855b8p-2,
+-	   0x1.c4710406a65fcp-2,
+-	   0x1.cc058392a6d2dp-2,
+-	   0x1.d38d4354c3bd0p-2,
+-	   0x1.db081ce6e2a48p-2,
+-	   0x1.e275eaf25e458p-2,
+-	   0x1.e9d68931ae650p-2,
+-	   0x1.f129d471eabb1p-2,
+-	   0x1.f86faa9428f9dp-2,
+-	   0x1.ffa7ea8eb5fd0p-2,
+-	   0x1.03693a371519cp-1,
+-	   0x1.06f794ab2cae7p-1,
+-	   0x1.0a7ef5c18edd2p-1,
+-	   0x1.0dff4f247f6c6p-1,
+-	   0x1.1178930ada115p-1,
+-	   0x1.14eab43841b55p-1,
+-	   0x1.1855a5fd3dd50p-1,
+-	   0x1.1bb95c3746199p-1,
+-	   0x1.1f15cb50bc4dep-1,
+-	   0x1.226ae840d4d70p-1,
+-	   0x1.25b8a88b6dd7fp-1,
+-	   0x1.28ff0240d52cdp-1,
+-	   0x1.2c3debfd7d6c1p-1,
+-	   0x1.2f755ce9a21f4p-1,
+-	   0x1.32a54cb8db67bp-1,
+-	   0x1.35cdb3a9a144dp-1,
+-	   0x1.38ee8a84beb71p-1,
+-	   0x1.3c07ca9cb4f9ep-1,
+-	   0x1.3f196dcd0f135p-1,
+-	   0x1.42236e79a5fa6p-1,
+-	   0x1.4525c78dd5966p-1,
+-	   0x1.4820747ba2dc2p-1,
+-	   0x1.4b13713ad3513p-1,
+-	   0x1.4dfeba47f63ccp-1,
+-	   0x1.50e24ca35fd2cp-1,
+-	   0x1.53be25d016a4fp-1,
+-	   0x1.569243d2b3a9bp-1,
+-	   0x1.595ea53035283p-1,
+-	   0x1.5c2348ecc4dc3p-1,
+-	   0x1.5ee02e8a71a53p-1,
+-	   0x1.61955607dd15dp-1,
+-	   0x1.6442bfdedd397p-1,
+-	   0x1.66e86d0312e82p-1,
+-	   0x1.69865ee075011p-1,
+-	   0x1.6c1c9759d0e5fp-1,
+-	   0x1.6eab18c74091bp-1,
+-	   0x1.7131e5f496a5ap-1,
+-	   0x1.73b1021fc0cb8p-1,
+-	   0x1.762870f720c6fp-1,
+-	   0x1.78983697dc96fp-1,
+-	   0x1.7b00578c26037p-1,
+-	   0x1.7d60d8c979f7bp-1,
+-	   0x1.7fb9bfaed8078p-1,
+-	   0x1.820b1202f27fbp-1,
+-	   0x1.8454d5f25760dp-1,
+-	   0x1.8697120d92a4ap-1,
+-	   0x1.88d1cd474a2e0p-1,
+-	   0x1.8b050ef253c37p-1,
+-	   0x1.8d30debfc572ep-1,
+-	   0x1.8f5544bd00c04p-1,
+-	   0x1.91724951b8fc6p-1,
+-	   0x1.9387f53df5238p-1,
+-	   0x1.959651980da31p-1,
+-	   0x1.979d67caa6631p-1,
+-	   0x1.999d4192a5715p-1,
+-	   0x1.9b95e8fd26abap-1,
+-	   0x1.9d8768656cc42p-1,
+-	   0x1.9f71ca72cffb6p-1,
+-	   0x1.a1551a16aaeafp-1,
+-	   0x1.a331628a45b92p-1,
+-	   0x1.a506af4cc00f4p-1,
+-	   0x1.a6d50c20fa293p-1,
+-	   0x1.a89c850b7d54dp-1,
+-	   0x1.aa5d265064366p-1,
+-	   0x1.ac16fc7143263p-1,
+-	   0x1.adca142b10f98p-1,
+-	   0x1.af767a741088bp-1,
+-	   0x1.b11c3c79bb424p-1,
+-	   0x1.b2bb679ead19cp-1,
+-	   0x1.b4540978921eep-1,
+-	   0x1.b5e62fce16095p-1,
+-	   0x1.b771e894d602ep-1,
+-	   0x1.b8f741ef54f83p-1,
+-	   0x1.ba764a2af2b78p-1,
+-	   0x1.bbef0fbde6221p-1,
+-	   0x1.bd61a1453ab44p-1,
+-	   0x1.bece0d82d1a5cp-1,
+-	   0x1.c034635b66e23p-1,
+-	   0x1.c194b1d49a184p-1,
+-	   0x1.c2ef0812fc1bdp-1,
+-	   0x1.c443755820d64p-1,
+-	   0x1.c5920900b5fd1p-1,
+-	   0x1.c6dad2829ec62p-1,
+-	   0x1.c81de16b14cefp-1,
+-	   0x1.c95b455cce69dp-1,
+-	   0x1.ca930e0e2a825p-1,
+-	   0x1.cbc54b476248dp-1,
+-	   0x1.ccf20ce0c0d27p-1,
+-	   0x1.ce1962c0e0d8bp-1,
+-	   0x1.cf3b5cdaf0c39p-1,
+-	   0x1.d0580b2cfd249p-1,
+-	   0x1.d16f7dbe41ca0p-1,
+-	   0x1.d281c49d818d0p-1,
+-	   0x1.d38eefdf64fddp-1,
+-	   0x1.d4970f9ce00d9p-1,
+-	   0x1.d59a33f19ed42p-1,
+-	   0x1.d6986cfa798e7p-1,
+-	   0x1.d791cad3eff01p-1,
+-	   0x1.d8865d98abe01p-1,
+-	   0x1.d97635600bb89p-1,
+-	   0x1.da61623cb41e0p-1,
+-	   0x1.db47f43b2980dp-1,
+-	   0x1.dc29fb60715afp-1,
+-	   0x1.dd0787a8bb39dp-1,
+-	   0x1.dde0a90611a0dp-1,
+-	   0x1.deb56f5f12d28p-1,
+-	   0x1.df85ea8db188ep-1,
+-	   0x1.e0522a5dfda73p-1,
+-	   0x1.e11a3e8cf4eb8p-1,
+-	   0x1.e1de36c75ba58p-1,
+-	   0x1.e29e22a89d766p-1,
+-	   0x1.e35a11b9b61cep-1,
+-	   0x1.e4121370224ccp-1,
+-	   0x1.e4c6372cd8927p-1,
+-	   0x1.e5768c3b4a3fcp-1,
+-	   0x1.e62321d06c5e0p-1,
+-	   0x1.e6cc0709c8a0dp-1,
+-	   0x1.e7714aec96534p-1,
+-	   0x1.e812fc64db369p-1,
+-	   0x1.e8b12a44944a8p-1,
+-	   0x1.e94be342e6743p-1,
+-	   0x1.e9e335fb56f87p-1,
+-	   0x1.ea7730ed0bbb9p-1,
+-	   0x1.eb07e27a133aap-1,
+-	   0x1.eb9558e6b42cep-1,
+-	   0x1.ec1fa258c4beap-1,
+-	   0x1.eca6ccd709544p-1,
+-	   0x1.ed2ae6489ac1ep-1,
+-	   0x1.edabfc7453e63p-1,
+-	   0x1.ee2a1d004692cp-1,
+-	   0x1.eea5557137ae0p-1,
+-	   0x1.ef1db32a2277cp-1,
+-	   0x1.ef93436bc2daap-1,
+-	   0x1.f006135426b26p-1,
+-	   0x1.f0762fde45ee6p-1,
+-	   0x1.f0e3a5e1a1788p-1,
+-	   0x1.f14e8211e8c55p-1,
+-	   0x1.f1b6d0fea5f4dp-1,
+-	   0x1.f21c9f12f0677p-1,
+-	   0x1.f27ff89525acfp-1,
+-	   0x1.f2e0e9a6a8b09p-1,
+-	   0x1.f33f7e43a706bp-1,
+-	   0x1.f39bc242e43e6p-1,
+-	   0x1.f3f5c1558b19ep-1,
+-	   0x1.f44d870704911p-1,
+-	   0x1.f4a31ebcd47dfp-1,
+-	   0x1.f4f693b67bd77p-1,
+-	   0x1.f547f10d60597p-1,
+-	   0x1.f59741b4b97cfp-1,
+-	   0x1.f5e4907982a07p-1,
+-	   0x1.f62fe80272419p-1,
+-	   0x1.f67952cff6282p-1,
+-	   0x1.f6c0db3c34641p-1,
+-	   0x1.f7068b7b10fd9p-1,
+-	   0x1.f74a6d9a38383p-1,
+-	   0x1.f78c8b812d498p-1,
+-	   0x1.f7cceef15d631p-1,
+-	   0x1.f80ba18636f07p-1,
+-	   0x1.f848acb544e95p-1,
+-	   0x1.f88419ce4e184p-1,
+-	   0x1.f8bdf1fb78370p-1,
+-	   0x1.f8f63e416ebffp-1,
+-	   0x1.f92d077f8d56dp-1,
+-	   0x1.f96256700da8ep-1,
+-	   0x1.f99633a838a57p-1,
+-	   0x1.f9c8a7989af0dp-1,
+-	   0x1.f9f9ba8d3c733p-1,
+-	   0x1.fa2974addae45p-1,
+-	   0x1.fa57ddfe27376p-1,
+-	   0x1.fa84fe5e05c8dp-1,
+-	   0x1.fab0dd89d1309p-1,
+-	   0x1.fadb831a9f9c3p-1,
+-	   0x1.fb04f6868a944p-1,
+-	   0x1.fb2d3f20f9101p-1,
+-	   0x1.fb54641aebbc9p-1,
+-	   0x1.fb7a6c834b5a2p-1,
+-	   0x1.fb9f5f4739170p-1,
+-	   0x1.fbc3433260ca5p-1,
+-	   0x1.fbe61eef4cf6ap-1,
+-	   0x1.fc07f907bc794p-1,
+-	   0x1.fc28d7e4f9cd0p-1,
+-	   0x1.fc48c1d033c7ap-1,
+-	   0x1.fc67bcf2d7b8fp-1,
+-	   0x1.fc85cf56ecd38p-1,
+-	   0x1.fca2fee770c79p-1,
+-	   0x1.fcbf5170b578bp-1,
+-	   0x1.fcdacca0bfb73p-1,
+-	   0x1.fcf57607a6e7cp-1,
+-	   0x1.fd0f5317f582fp-1,
+-	   0x1.fd2869270a56fp-1,
+-	   0x1.fd40bd6d7a785p-1,
+-	   0x1.fd58550773cb5p-1,
+-	   0x1.fd6f34f52013ap-1,
+-	   0x1.fd85621b0876dp-1,
+-	   0x1.fd9ae142795e3p-1,
+-	   0x1.fdafb719e6a69p-1,
+-	   0x1.fdc3e835500b3p-1,
+-	   0x1.fdd7790ea5bc0p-1,
+-	   0x1.fdea6e062d0c9p-1,
+-	   0x1.fdfccb62e52d3p-1,
+-	   0x1.fe0e9552ebdd6p-1,
+-	   0x1.fe1fcfebe2083p-1,
+-	   0x1.fe307f2b503d0p-1,
+-	   0x1.fe40a6f70af4bp-1,
+-	   0x1.fe504b1d9696cp-1,
+-	   0x1.fe5f6f568b301p-1,
+-	   0x1.fe6e1742f7cf6p-1,
+-	   0x1.fe7c466dc57a1p-1,
+-	   0x1.fe8a004c19ae6p-1,
+-	   0x1.fe97483db8670p-1,
+-	   0x1.fea4218d6594ap-1,
+-	   0x1.feb08f7146046p-1,
+-	   0x1.febc950b3fa75p-1,
+-	   0x1.fec835695932ep-1,
+-	   0x1.fed37386190fbp-1,
+-	   0x1.fede5248e38f4p-1,
+-	   0x1.fee8d486585eep-1,
+-	   0x1.fef2fd00af31ap-1,
+-	   0x1.fefcce6813974p-1,
+-	   0x1.ff064b5afffbep-1,
+-	   0x1.ff0f766697c76p-1,
+-	   0x1.ff18520700971p-1,
+-	   0x1.ff20e0a7ba8c2p-1,
+-	   0x1.ff2924a3f7a83p-1,
+-	   0x1.ff312046f2339p-1,
+-	   0x1.ff38d5cc4227fp-1,
+-	   0x1.ff404760319b4p-1,
+-	   0x1.ff47772010262p-1,
+-	   0x1.ff4e671a85425p-1,
+-	   0x1.ff55194fe19dfp-1,
+-	   0x1.ff5b8fb26f5f6p-1,
+-	   0x1.ff61cc26c1578p-1,
+-	   0x1.ff67d08401202p-1,
+-	   0x1.ff6d9e943c231p-1,
+-	   0x1.ff733814af88cp-1,
+-	   0x1.ff789eb6130c9p-1,
+-	   0x1.ff7dd41ce2b4dp-1,
+-	   0x1.ff82d9e1a76d8p-1,
+-	   0x1.ff87b1913e853p-1,
+-	   0x1.ff8c5cad200a5p-1,
+-	   0x1.ff90dcaba4096p-1,
+-	   0x1.ff9532f846ab0p-1,
+-	   0x1.ff9960f3eb327p-1,
+-	   0x1.ff9d67f51ddbap-1,
+-	   0x1.ffa14948549a7p-1,
+-	   0x1.ffa506302ebaep-1,
+-	   0x1.ffa89fe5b3625p-1,
+-	   0x1.ffac17988ef4bp-1,
+-	   0x1.ffaf6e6f4f5c0p-1,
+-	   0x1.ffb2a5879f35ep-1,
+-	   0x1.ffb5bdf67fe6fp-1,
+-	   0x1.ffb8b8c88295fp-1,
+-	   0x1.ffbb970200110p-1,
+-	   0x1.ffbe599f4f9d9p-1,
+-	   0x1.ffc10194fcb64p-1,
+-	   0x1.ffc38fcffbb7cp-1,
+-	   0x1.ffc60535dd7f5p-1,
+-	   0x1.ffc862a501fd7p-1,
+-	   0x1.ffcaa8f4c9beap-1,
+-	   0x1.ffccd8f5c66d1p-1,
+-	   0x1.ffcef371ea4d7p-1,
+-	   0x1.ffd0f92cb6ba7p-1,
+-	   0x1.ffd2eae369a07p-1,
+-	   0x1.ffd4c94d29fdbp-1,
+-	   0x1.ffd6951b33686p-1,
+-	   0x1.ffd84ef9009eep-1,
+-	   0x1.ffd9f78c7524ap-1,
+-	   0x1.ffdb8f7605ee7p-1,
+-	   0x1.ffdd1750e1220p-1,
+-	   0x1.ffde8fb314ebfp-1,
+-	   0x1.ffdff92db56e5p-1,
+-	   0x1.ffe1544d01ccbp-1,
+-	   0x1.ffe2a1988857cp-1,
+-	   0x1.ffe3e19349dc7p-1,
+-	   0x1.ffe514bbdc197p-1,
+-	   0x1.ffe63b8c8b5f7p-1,
+-	   0x1.ffe7567b7b5e1p-1,
+-	   0x1.ffe865fac722bp-1,
+-	   0x1.ffe96a78a04a9p-1,
+-	   0x1.ffea645f6d6dap-1,
+-	   0x1.ffeb5415e7c44p-1,
+-	   0x1.ffec39ff380b9p-1,
+-	   0x1.ffed167b12ac2p-1,
+-	   0x1.ffede9e5d3262p-1,
+-	   0x1.ffeeb49896c6dp-1,
+-	   0x1.ffef76e956a9fp-1,
+-	   0x1.fff0312b010b5p-1,
+-	   0x1.fff0e3ad91ec2p-1,
+-	   0x1.fff18ebe2b0e1p-1,
+-	   0x1.fff232a72b48ep-1,
+-	   0x1.fff2cfb0453d9p-1,
+-	   0x1.fff3661e9569dp-1,
+-	   0x1.fff3f634b79f9p-1,
+-	   0x1.fff48032dbe40p-1,
+-	   0x1.fff50456dab8cp-1,
+-	   0x1.fff582dc48d30p-1,
+-	   0x1.fff5fbfc8a439p-1,
+-	   0x1.fff66feee5129p-1,
+-	   0x1.fff6dee89352ep-1,
+-	   0x1.fff7491cd4af6p-1,
+-	   0x1.fff7aebcff755p-1,
+-	   0x1.fff80ff8911fdp-1,
+-	   0x1.fff86cfd3e657p-1,
+-	   0x1.fff8c5f702ccfp-1,
+-	   0x1.fff91b102fca8p-1,
+-	   0x1.fff96c717b695p-1,
+-	   0x1.fff9ba420e834p-1,
+-	   0x1.fffa04a7928b1p-1,
+-	   0x1.fffa4bc63ee9ap-1,
+-	   0x1.fffa8fc0e5f33p-1,
+-	   0x1.fffad0b901755p-1,
+-	   0x1.fffb0ecebee1bp-1,
+-	   0x1.fffb4a210b172p-1,
+-	   0x1.fffb82cd9dcbfp-1,
+-	   0x1.fffbb8f1049c6p-1,
+-	   0x1.fffbeca6adbe9p-1,
+-	   0x1.fffc1e08f25f5p-1,
+-	   0x1.fffc4d3120aa1p-1,
+-	   0x1.fffc7a37857d2p-1,
+-	   0x1.fffca53375ce3p-1,
+-	   0x1.fffcce3b57bffp-1,
+-	   0x1.fffcf564ab6b7p-1,
+-	   0x1.fffd1ac4135f9p-1,
+-	   0x1.fffd3e6d5cd87p-1,
+-	   0x1.fffd607387b07p-1,
+-	   0x1.fffd80e8ce0dap-1,
+-	   0x1.fffd9fdeabccep-1,
+-	   0x1.fffdbd65e5ad0p-1,
+-	   0x1.fffdd98e903b2p-1,
+-	   0x1.fffdf46816833p-1,
+-	   0x1.fffe0e0140857p-1,
+-	   0x1.fffe26683972ap-1,
+-	   0x1.fffe3daa95b18p-1,
+-	   0x1.fffe53d558ae9p-1,
+-	   0x1.fffe68f4fa777p-1,
+-	   0x1.fffe7d156d244p-1,
+-	   0x1.fffe904222101p-1,
+-	   0x1.fffea2860ee1ep-1,
+-	   0x1.fffeb3ebb267bp-1,
+-	   0x1.fffec47d19457p-1,
+-	   0x1.fffed443e2787p-1,
+-	   0x1.fffee34943b15p-1,
+-	   0x1.fffef1960d85dp-1,
+-	   0x1.fffeff32af7afp-1,
+-	   0x1.ffff0c273bea2p-1,
+-	   0x1.ffff187b6bc0ep-1,
+-	   0x1.ffff2436a21dcp-1,
+-	   0x1.ffff2f5fefcaap-1,
+-	   0x1.ffff39fe16963p-1,
+-	   0x1.ffff44178c8d2p-1,
+-	   0x1.ffff4db27f146p-1,
+-	   0x1.ffff56d4d5e5ep-1,
+-	   0x1.ffff5f8435efcp-1,
+-	   0x1.ffff67c604180p-1,
+-	   0x1.ffff6f9f67e55p-1,
+-	   0x1.ffff77154e0d6p-1,
+-	   0x1.ffff7e2c6aea2p-1,
+-	   0x1.ffff84e93cd75p-1,
+-	   0x1.ffff8b500e77cp-1,
+-	   0x1.ffff9164f8e46p-1,
+-	   0x1.ffff972be5c59p-1,
+-	   0x1.ffff9ca891572p-1,
+-	   0x1.ffffa1de8c582p-1,
+-	   0x1.ffffa6d13de73p-1,
+-	   0x1.ffffab83e54b8p-1,
+-	   0x1.ffffaff99bac4p-1,
+-	   0x1.ffffb43555b5fp-1,
+-	   0x1.ffffb839e52f3p-1,
+-	   0x1.ffffbc09fa7cdp-1,
+-	   0x1.ffffbfa82616bp-1,
+-	   0x1.ffffc316d9ed0p-1,
+-	   0x1.ffffc6586abf6p-1,
+-	   0x1.ffffc96f1165ep-1,
+-	   0x1.ffffcc5cec0c1p-1,
+-	   0x1.ffffcf23ff5fcp-1,
+-	   0x1.ffffd1c637b2bp-1,
+-	   0x1.ffffd4456a10dp-1,
+-	   0x1.ffffd6a3554a1p-1,
+-	   0x1.ffffd8e1a2f22p-1,
+-	   0x1.ffffdb01e8546p-1,
+-	   0x1.ffffdd05a75eap-1,
+-	   0x1.ffffdeee4f810p-1,
+-	   0x1.ffffe0bd3e852p-1,
+-	   0x1.ffffe273c15b7p-1,
+-	   0x1.ffffe41314e06p-1,
+-	   0x1.ffffe59c6698bp-1,
+-	   0x1.ffffe710d565ep-1,
+-	   0x1.ffffe8717232dp-1,
+-	   0x1.ffffe9bf4098cp-1,
+-	   0x1.ffffeafb377d5p-1,
+-	   0x1.ffffec2641a9ep-1,
+-	   0x1.ffffed413e5b7p-1,
+-	   0x1.ffffee4d01cd6p-1,
+-	   0x1.ffffef4a55bd4p-1,
+-	   0x1.fffff039f9e8fp-1,
+-	   0x1.fffff11ca4876p-1,
+-	   0x1.fffff1f302bc1p-1,
+-	   0x1.fffff2bdb904dp-1,
+-	   0x1.fffff37d63a36p-1,
+-	   0x1.fffff43297019p-1,
+-	   0x1.fffff4dde0118p-1,
+-	   0x1.fffff57fc4a95p-1,
+-	   0x1.fffff618c3da6p-1,
+-	   0x1.fffff6a956450p-1,
+-	   0x1.fffff731ee681p-1,
+-	   0x1.fffff7b2f8ed6p-1,
+-	   0x1.fffff82cdcf1bp-1,
+-	   0x1.fffff89ffc4aap-1,
+-	   0x1.fffff90cb3c81p-1,
+-	   0x1.fffff9735b73bp-1,
+-	   0x1.fffff9d446cccp-1,
+-	   0x1.fffffa2fc5015p-1,
+-	   0x1.fffffa8621251p-1,
+-	   0x1.fffffad7a2652p-1,
+-	   0x1.fffffb248c39dp-1,
+-	   0x1.fffffb6d1e95dp-1,
+-	   0x1.fffffbb196132p-1,
+-	   0x1.fffffbf22c1e2p-1,
+-	   0x1.fffffc2f171e3p-1,
+-	   0x1.fffffc688a9cfp-1,
+-	   0x1.fffffc9eb76acp-1,
+-	   0x1.fffffcd1cbc28p-1,
+-	   0x1.fffffd01f36afp-1,
+-	   0x1.fffffd2f57d68p-1,
+-	   0x1.fffffd5a2041fp-1,
+-	   0x1.fffffd8271d12p-1,
+-	   0x1.fffffda86faa9p-1,
+-	   0x1.fffffdcc3b117p-1,
+-	   0x1.fffffdedf37edp-1,
+-	   0x1.fffffe0db6b91p-1,
+-	   0x1.fffffe2ba0ea5p-1,
+-	   0x1.fffffe47ccb60p-1,
+-	   0x1.fffffe62534d4p-1,
+-	   0x1.fffffe7b4c81ep-1,
+-	   0x1.fffffe92ced93p-1,
+-	   0x1.fffffea8ef9cfp-1,
+-	   0x1.fffffebdc2ec6p-1,
+-	   0x1.fffffed15bcbap-1,
+-	   0x1.fffffee3cc32cp-1,
+-	   0x1.fffffef5251c2p-1,
+-	   0x1.ffffff0576917p-1,
+-	   0x1.ffffff14cfb92p-1,
+-	   0x1.ffffff233ee1dp-1,
+-	   0x1.ffffff30d18e8p-1,
+-	   0x1.ffffff3d9480fp-1,
+-	   0x1.ffffff4993c46p-1,
+-	   0x1.ffffff54dab72p-1,
+-	   0x1.ffffff5f74141p-1,
+-	   0x1.ffffff6969fb8p-1,
+-	   0x1.ffffff72c5fb6p-1,
+-	   0x1.ffffff7b91176p-1,
+-	   0x1.ffffff83d3d07p-1,
+-	   0x1.ffffff8b962bep-1,
+-	   0x1.ffffff92dfba2p-1,
+-	   0x1.ffffff99b79d2p-1,
+-	   0x1.ffffffa0248e8p-1,
+-	   0x1.ffffffa62ce54p-1,
+-	   0x1.ffffffabd69b4p-1,
+-	   0x1.ffffffb127525p-1,
+-	   0x1.ffffffb624592p-1,
+-	   0x1.ffffffbad2affp-1,
+-	   0x1.ffffffbf370cdp-1,
+-	   0x1.ffffffc355dfdp-1,
+-	   0x1.ffffffc733572p-1,
+-	   0x1.ffffffcad3626p-1,
+-	   0x1.ffffffce39b67p-1,
+-	   0x1.ffffffd169d0cp-1,
+-	   0x1.ffffffd466fa5p-1,
+-	   0x1.ffffffd7344aap-1,
+-	   0x1.ffffffd9d4aabp-1,
+-	   0x1.ffffffdc4ad7ap-1,
+-	   0x1.ffffffde9964ep-1,
+-	   0x1.ffffffe0c2bf0p-1,
+-	   0x1.ffffffe2c92dbp-1,
+-	   0x1.ffffffe4aed5ep-1,
+-	   0x1.ffffffe675bbdp-1,
+-	   0x1.ffffffe81fc4ep-1,
+-	   0x1.ffffffe9aeb97p-1,
+-	   0x1.ffffffeb24467p-1,
+-	   0x1.ffffffec81ff2p-1,
+-	   0x1.ffffffedc95e7p-1,
+-	   0x1.ffffffeefbc85p-1,
+-	   0x1.fffffff01a8b6p-1,
+-	   0x1.fffffff126e1ep-1,
+-	   0x1.fffffff221f30p-1,
+-	   0x1.fffffff30cd3fp-1,
+-	   0x1.fffffff3e8892p-1,
+-	   0x1.fffffff4b606fp-1,
+-	   0x1.fffffff57632dp-1,
+-	   0x1.fffffff629e44p-1,
+-	   0x1.fffffff6d1e56p-1,
+-	   0x1.fffffff76ef3fp-1,
+-	   0x1.fffffff801c1fp-1,
+-	   0x1.fffffff88af67p-1,
+-	   0x1.fffffff90b2e3p-1,
+-	   0x1.fffffff982fc1p-1,
+-	   0x1.fffffff9f2e9fp-1,
+-	   0x1.fffffffa5b790p-1,
+-	   0x1.fffffffabd229p-1,
+-	   0x1.fffffffb18582p-1,
+-	   0x1.fffffffb6d844p-1,
+-	   0x1.fffffffbbd0aap-1,
+-	   0x1.fffffffc0748fp-1,
+-	   0x1.fffffffc4c96cp-1,
+-	   0x1.fffffffc8d462p-1,
+-	   0x1.fffffffcc9a41p-1,
+-	   0x1.fffffffd01f89p-1,
+-	   0x1.fffffffd36871p-1,
+-	   0x1.fffffffd678edp-1,
+-	   0x1.fffffffd954aep-1,
+-	   0x1.fffffffdbff2ap-1,
+-	   0x1.fffffffde7ba0p-1,
+-	   0x1.fffffffe0cd16p-1,
+-	   0x1.fffffffe2f664p-1,
+-	   0x1.fffffffe4fa30p-1,
+-	   0x1.fffffffe6daf7p-1,
+-	   0x1.fffffffe89b0cp-1,
+-	   0x1.fffffffea3c9ap-1,
+-	   0x1.fffffffebc1a9p-1,
+-	   0x1.fffffffed2c21p-1,
+-	   0x1.fffffffee7dc8p-1,
+-	   0x1.fffffffefb847p-1,
+-	   0x1.ffffffff0dd2bp-1,
+-	   0x1.ffffffff1ede9p-1,
+-	   0x1.ffffffff2ebdap-1,
+-	   0x1.ffffffff3d843p-1,
+-	   0x1.ffffffff4b453p-1,
+-	   0x1.ffffffff58126p-1,
+-	   0x1.ffffffff63fc3p-1,
+-	   0x1.ffffffff6f121p-1,
+-	   0x1.ffffffff79626p-1,
+-	   0x1.ffffffff82fabp-1,
+-	   0x1.ffffffff8be77p-1,
+-	   0x1.ffffffff94346p-1,
+-	   0x1.ffffffff9bec8p-1,
+-	   0x1.ffffffffa319fp-1,
+-	   0x1.ffffffffa9c63p-1,
+-	   0x1.ffffffffaffa4p-1,
+-	   0x1.ffffffffb5be5p-1,
+-	   0x1.ffffffffbb1a2p-1,
+-	   0x1.ffffffffc014ep-1,
+-	   0x1.ffffffffc4b56p-1,
+-	   0x1.ffffffffc901cp-1,
+-	   0x1.ffffffffccfffp-1,
+-	   0x1.ffffffffd0b56p-1,
+-	   0x1.ffffffffd4271p-1,
+-	   0x1.ffffffffd759dp-1,
+-	   0x1.ffffffffda520p-1,
+-	   0x1.ffffffffdd13cp-1,
+-	   0x1.ffffffffdfa2dp-1,
+-	   0x1.ffffffffe202dp-1,
+-	   0x1.ffffffffe4371p-1,
+-	   0x1.ffffffffe642ap-1,
+-	   0x1.ffffffffe8286p-1,
+-	   0x1.ffffffffe9eb0p-1,
+-	   0x1.ffffffffeb8d0p-1,
+-	   0x1.ffffffffed10ap-1,
+-	   0x1.ffffffffee782p-1,
+-	   0x1.ffffffffefc57p-1,
+-	   0x1.fffffffff0fa7p-1,
+-	   0x1.fffffffff218fp-1,
+-	   0x1.fffffffff3227p-1,
+-	   0x1.fffffffff4188p-1,
+-	   0x1.fffffffff4fc9p-1,
+-	   0x1.fffffffff5cfdp-1,
+-	   0x1.fffffffff6939p-1,
+-	   0x1.fffffffff748ep-1,
+-	   0x1.fffffffff7f0dp-1,
+-	   0x1.fffffffff88c5p-1,
+-	   0x1.fffffffff91c6p-1,
+-	   0x1.fffffffff9a1bp-1,
+-	   0x1.fffffffffa1d2p-1,
+-	   0x1.fffffffffa8f6p-1,
+-	   0x1.fffffffffaf92p-1,
+-	   0x1.fffffffffb5b0p-1,
+-	   0x1.fffffffffbb58p-1,
+-	   0x1.fffffffffc095p-1,
+-	   0x1.fffffffffc56dp-1,
+-	   0x1.fffffffffc9e8p-1,
+-	   0x1.fffffffffce0dp-1,
+-	   0x1.fffffffffd1e1p-1,
+-	   0x1.fffffffffd56cp-1,
+-	   0x1.fffffffffd8b3p-1,
+-	   0x1.fffffffffdbbap-1,
+-	   0x1.fffffffffde86p-1,
+-	   0x1.fffffffffe11dp-1,
+-	   0x1.fffffffffe380p-1,
+-	   0x1.fffffffffe5b6p-1,
+-	   0x1.fffffffffe7c0p-1,
+-	   0x1.fffffffffe9a2p-1,
+-	   0x1.fffffffffeb60p-1,
+-	   0x1.fffffffffecfbp-1,
+-	   0x1.fffffffffee77p-1,
+-	   0x1.fffffffffefd6p-1,
+-	   0x1.ffffffffff11ap-1,
+-	   0x1.ffffffffff245p-1,
+-	   0x1.ffffffffff359p-1,
+-	   0x1.ffffffffff457p-1,
+-	   0x1.ffffffffff542p-1,
+-	   0x1.ffffffffff61bp-1,
+-	   0x1.ffffffffff6e3p-1,
+-	   0x1.ffffffffff79bp-1,
+-	   0x1.ffffffffff845p-1,
+-	   0x1.ffffffffff8e2p-1,
+-	   0x1.ffffffffff973p-1,
+-	   0x1.ffffffffff9f8p-1,
+-	   0x1.ffffffffffa73p-1,
+-	   0x1.ffffffffffae4p-1,
+-	   0x1.ffffffffffb4cp-1,
+-	   0x1.ffffffffffbadp-1,
+-	   0x1.ffffffffffc05p-1,
+-	   0x1.ffffffffffc57p-1,
+-	   0x1.ffffffffffca2p-1,
+-	   0x1.ffffffffffce7p-1,
+-	   0x1.ffffffffffd27p-1,
+-	   0x1.ffffffffffd62p-1,
+-	   0x1.ffffffffffd98p-1,
+-	   0x1.ffffffffffdcap-1,
+-	   0x1.ffffffffffdf8p-1,
+-	   0x1.ffffffffffe22p-1,
+-	   0x1.ffffffffffe49p-1,
+-	   0x1.ffffffffffe6cp-1,
+-	   0x1.ffffffffffe8dp-1,
+-	   0x1.ffffffffffeabp-1,
+-	   0x1.ffffffffffec7p-1,
+-	   0x1.ffffffffffee1p-1,
+-	   0x1.ffffffffffef8p-1,
+-	   0x1.fffffffffff0ep-1,
+-	   0x1.fffffffffff22p-1,
+-	   0x1.fffffffffff34p-1,
+-	   0x1.fffffffffff45p-1,
+-	   0x1.fffffffffff54p-1,
+-	   0x1.fffffffffff62p-1,
+-	   0x1.fffffffffff6fp-1,
+-	   0x1.fffffffffff7bp-1,
+-	   0x1.fffffffffff86p-1,
+-	   0x1.fffffffffff90p-1,
+-	   0x1.fffffffffff9ap-1,
+-	   0x1.fffffffffffa2p-1,
+-	   0x1.fffffffffffaap-1,
+-	   0x1.fffffffffffb1p-1,
+-	   0x1.fffffffffffb8p-1,
+-	   0x1.fffffffffffbep-1,
+-	   0x1.fffffffffffc3p-1,
+-	   0x1.fffffffffffc8p-1,
+-	   0x1.fffffffffffcdp-1,
+-	   0x1.fffffffffffd1p-1,
+-	   0x1.fffffffffffd5p-1,
+-	   0x1.fffffffffffd9p-1,
+-	   0x1.fffffffffffdcp-1,
+-	   0x1.fffffffffffdfp-1,
+-	   0x1.fffffffffffe2p-1,
+-	   0x1.fffffffffffe4p-1,
+-	   0x1.fffffffffffe7p-1,
+-	   0x1.fffffffffffe9p-1,
+-	   0x1.fffffffffffebp-1,
+-	   0x1.fffffffffffedp-1,
+-	   0x1.fffffffffffeep-1,
+-	   0x1.ffffffffffff0p-1,
+-	   0x1.ffffffffffff1p-1,
+-	   0x1.ffffffffffff3p-1,
+-	   0x1.ffffffffffff4p-1,
+-	   0x1.ffffffffffff5p-1,
+-	   0x1.ffffffffffff6p-1,
+-	   0x1.ffffffffffff7p-1,
+-	   0x1.ffffffffffff7p-1,
+-	   0x1.ffffffffffff8p-1,
+-	   0x1.ffffffffffff9p-1,
+-	   0x1.ffffffffffff9p-1,
+-	   0x1.ffffffffffffap-1,
+-	   0x1.ffffffffffffbp-1,
+-	   0x1.ffffffffffffbp-1,
+-	   0x1.ffffffffffffbp-1,
+-	   0x1.ffffffffffffcp-1,
+-	   0x1.ffffffffffffcp-1,
+-	   0x1.ffffffffffffdp-1,
+-	   0x1.ffffffffffffdp-1,
+-	   0x1.ffffffffffffdp-1,
+-	   0x1.ffffffffffffdp-1,
+-	   0x1.ffffffffffffep-1,
+-	   0x1.ffffffffffffep-1,
+-	   0x1.ffffffffffffep-1,
+-	   0x1.ffffffffffffep-1,
+-	   0x1.ffffffffffffep-1,
+-	   0x1.ffffffffffffep-1,
+-	   0x1.fffffffffffffp-1,
+-	   0x1.fffffffffffffp-1,
+-	   0x1.fffffffffffffp-1,
+-	   0x1.fffffffffffffp-1,
+-	   0x1.fffffffffffffp-1,
+-	   0x1.fffffffffffffp-1,
+-	   0x1.fffffffffffffp-1,
+-	   0x1.fffffffffffffp-1,
+-	   0x1.fffffffffffffp-1,
+-	   0x1.fffffffffffffp-1,
+-	   0x1.fffffffffffffp-1,
+-	   0x1.0000000000000p+0,
+-	   0x1.0000000000000p+0,
+-	   0x1.0000000000000p+0,
+-	   0x1.0000000000000p+0,
+-	   0x1.0000000000000p+0,
+-	   0x1.0000000000000p+0,
+-	   0x1.0000000000000p+0,
+-	   0x1.0000000000000p+0,
+-	   0x1.0000000000000p+0,
+-	   0x1.0000000000000p+0,
+-	   0x1.0000000000000p+0,
+-  },
+-  .scale = { 0x1.20dd750429b6dp+0,
+-	     0x1.20d8f1975c85dp+0,
+-	     0x1.20cb67bd452c7p+0,
+-	     0x1.20b4d8bac36c1p+0,
+-	     0x1.209546ad13ccfp+0,
+-	     0x1.206cb4897b148p+0,
+-	     0x1.203b261cd0052p+0,
+-	     0x1.2000a00ae3804p+0,
+-	     0x1.1fbd27cdc72d3p+0,
+-	     0x1.1f70c3b4f2cc7p+0,
+-	     0x1.1f1b7ae44867fp+0,
+-	     0x1.1ebd5552f795bp+0,
+-	     0x1.1e565bca400d4p+0,
+-	     0x1.1de697e413d28p+0,
+-	     0x1.1d6e14099944ap+0,
+-	     0x1.1cecdb718d61cp+0,
+-	     0x1.1c62fa1e869b6p+0,
+-	     0x1.1bd07cdd189acp+0,
+-	     0x1.1b357141d95d5p+0,
+-	     0x1.1a91e5a748165p+0,
+-	     0x1.19e5e92b964abp+0,
+-	     0x1.19318bae53a04p+0,
+-	     0x1.1874ddcdfce24p+0,
+-	     0x1.17aff0e56ec10p+0,
+-	     0x1.16e2d7093cd8cp+0,
+-	     0x1.160da304ed92fp+0,
+-	     0x1.153068581b781p+0,
+-	     0x1.144b3b337c90cp+0,
+-	     0x1.135e3075d076bp+0,
+-	     0x1.12695da8b5bdep+0,
+-	     0x1.116cd8fd67618p+0,
+-	     0x1.1068b94962e5ep+0,
+-	     0x1.0f5d1602f7e41p+0,
+-	     0x1.0e4a073dc1b91p+0,
+-	     0x1.0d2fa5a70c168p+0,
+-	     0x1.0c0e0a8223359p+0,
+-	     0x1.0ae54fa490722p+0,
+-	     0x1.09b58f724416bp+0,
+-	     0x1.087ee4d9ad247p+0,
+-	     0x1.07416b4fbfe7cp+0,
+-	     0x1.05fd3ecbec297p+0,
+-	     0x1.04b27bc403d30p+0,
+-	     0x1.03613f2812dafp+0,
+-	     0x1.0209a65e29545p+0,
+-	     0x1.00abcf3e187a9p+0,
+-	     0x1.fe8fb01a47307p-1,
+-	     0x1.fbbbbef34b4b2p-1,
+-	     0x1.f8dc092d58ff8p-1,
+-	     0x1.f5f0cdaf15313p-1,
+-	     0x1.f2fa4c16c0019p-1,
+-	     0x1.eff8c4b1375dbp-1,
+-	     0x1.ecec7870ebca7p-1,
+-	     0x1.e9d5a8e4c934ep-1,
+-	     0x1.e6b4982f158b9p-1,
+-	     0x1.e38988fc46e72p-1,
+-	     0x1.e054be79d3042p-1,
+-	     0x1.dd167c4cf9d2ap-1,
+-	     0x1.d9cf06898cdafp-1,
+-	     0x1.d67ea1a8b5368p-1,
+-	     0x1.d325927fb9d89p-1,
+-	     0x1.cfc41e36c7df9p-1,
+-	     0x1.cc5a8a3fbea40p-1,
+-	     0x1.c8e91c4d01368p-1,
+-	     0x1.c5701a484ef9dp-1,
+-	     0x1.c1efca49a5011p-1,
+-	     0x1.be68728e29d5dp-1,
+-	     0x1.bada596f25436p-1,
+-	     0x1.b745c55905bf8p-1,
+-	     0x1.b3aafcc27502ep-1,
+-	     0x1.b00a46237d5bep-1,
+-	     0x1.ac63e7ecc1411p-1,
+-	     0x1.a8b8287ec6a09p-1,
+-	     0x1.a5074e2157620p-1,
+-	     0x1.a1519efaf889ep-1,
+-	     0x1.9d97610879642p-1,
+-	     0x1.99d8da149c13fp-1,
+-	     0x1.96164fafd8de3p-1,
+-	     0x1.925007283d7aap-1,
+-	     0x1.8e86458169af8p-1,
+-	     0x1.8ab94f6caa71dp-1,
+-	     0x1.86e9694134b9ep-1,
+-	     0x1.8316d6f48133dp-1,
+-	     0x1.7f41dc12c9e89p-1,
+-	     0x1.7b6abbb7aaf19p-1,
+-	     0x1.7791b886e7403p-1,
+-	     0x1.73b714a552763p-1,
+-	     0x1.6fdb11b1e0c34p-1,
+-	     0x1.6bfdf0beddaf5p-1,
+-	     0x1.681ff24b4ab04p-1,
+-	     0x1.6441563c665d4p-1,
+-	     0x1.60625bd75d07bp-1,
+-	     0x1.5c8341bb23767p-1,
+-	     0x1.58a445da7c74cp-1,
+-	     0x1.54c5a57629db0p-1,
+-	     0x1.50e79d1749ac9p-1,
+-	     0x1.4d0a6889dfd9fp-1,
+-	     0x1.492e42d78d2c5p-1,
+-	     0x1.4553664273d24p-1,
+-	     0x1.417a0c4049fd0p-1,
+-	     0x1.3da26d759aef5p-1,
+-	     0x1.39ccc1b136d5ap-1,
+-	     0x1.35f93fe7d1b3dp-1,
+-	     0x1.32281e2fd1a92p-1,
+-	     0x1.2e5991bd4cbfcp-1,
+-	     0x1.2a8dcede3673bp-1,
+-	     0x1.26c508f6bd0ffp-1,
+-	     0x1.22ff727dd6f7bp-1,
+-	     0x1.1f3d3cf9ffe5ap-1,
+-	     0x1.1b7e98fe26217p-1,
+-	     0x1.17c3b626c7a11p-1,
+-	     0x1.140cc3173f007p-1,
+-	     0x1.1059ed7740313p-1,
+-	     0x1.0cab61f084b93p-1,
+-	     0x1.09014c2ca74dap-1,
+-	     0x1.055bd6d32e8d7p-1,
+-	     0x1.01bb2b87c6968p-1,
+-	     0x1.fc3ee5d1524b0p-2,
+-	     0x1.f511a91a67d2ap-2,
+-	     0x1.edeeee0959518p-2,
+-	     0x1.e6d6ffaa65a25p-2,
+-	     0x1.dfca26f5bbf88p-2,
+-	     0x1.d8c8aace11e63p-2,
+-	     0x1.d1d2cfff91594p-2,
+-	     0x1.cae8d93f1d7b6p-2,
+-	     0x1.c40b0729ed547p-2,
+-	     0x1.bd3998457afdap-2,
+-	     0x1.b674c8ffc6283p-2,
+-	     0x1.afbcd3afe8ab6p-2,
+-	     0x1.a911f096fbc26p-2,
+-	     0x1.a27455e14c93cp-2,
+-	     0x1.9be437a7de946p-2,
+-	     0x1.9561c7f23a47bp-2,
+-	     0x1.8eed36b886d93p-2,
+-	     0x1.8886b1e5ecfd1p-2,
+-	     0x1.822e655b417e6p-2,
+-	     0x1.7be47af1f5d89p-2,
+-	     0x1.75a91a7f4d2edp-2,
+-	     0x1.6f7c69d7d3ef8p-2,
+-	     0x1.695e8cd31867ep-2,
+-	     0x1.634fa54fa285fp-2,
+-	     0x1.5d4fd33729015p-2,
+-	     0x1.575f3483021c3p-2,
+-	     0x1.517de540ce2a3p-2,
+-	     0x1.4babff975a04cp-2,
+-	     0x1.45e99bcbb7915p-2,
+-	     0x1.4036d0468a7a2p-2,
+-	     0x1.3a93b1998736cp-2,
+-	     0x1.35005285227f1p-2,
+-	     0x1.2f7cc3fe6f423p-2,
+-	     0x1.2a09153529381p-2,
+-	     0x1.24a55399ea239p-2,
+-	     0x1.1f518ae487dc8p-2,
+-	     0x1.1a0dc51a9934dp-2,
+-	     0x1.14da0a961fd14p-2,
+-	     0x1.0fb6620c550afp-2,
+-	     0x1.0aa2d09497f2bp-2,
+-	     0x1.059f59af7a906p-2,
+-	     0x1.00abff4dec7a3p-2,
+-	     0x1.f79183b101c5bp-3,
+-	     0x1.edeb406d9c824p-3,
+-	     0x1.e4652fadcb6b2p-3,
+-	     0x1.daff4969c0b04p-3,
+-	     0x1.d1b982c501370p-3,
+-	     0x1.c893ce1dcbef7p-3,
+-	     0x1.bf8e1b1ca2279p-3,
+-	     0x1.b6a856c3ed54fp-3,
+-	     0x1.ade26b7fbed95p-3,
+-	     0x1.a53c4135a6526p-3,
+-	     0x1.9cb5bd549b111p-3,
+-	     0x1.944ec2e4f5630p-3,
+-	     0x1.8c07329874652p-3,
+-	     0x1.83deeada4d25ap-3,
+-	     0x1.7bd5c7df3fe9cp-3,
+-	     0x1.73eba3b5b07b7p-3,
+-	     0x1.6c205655be71fp-3,
+-	     0x1.6473b5b15a7a1p-3,
+-	     0x1.5ce595c455b0ap-3,
+-	     0x1.5575c8a468361p-3,
+-	     0x1.4e241e912c305p-3,
+-	     0x1.46f066040a832p-3,
+-	     0x1.3fda6bc016994p-3,
+-	     0x1.38e1fae1d6a9dp-3,
+-	     0x1.3206dceef5f87p-3,
+-	     0x1.2b48d9e5dea1cp-3,
+-	     0x1.24a7b84d38971p-3,
+-	     0x1.1e233d434b813p-3,
+-	     0x1.17bb2c8d41535p-3,
+-	     0x1.116f48a6476ccp-3,
+-	     0x1.0b3f52ce8c383p-3,
+-	     0x1.052b0b1a174eap-3,
+-	     0x1.fe6460fef4680p-4,
+-	     0x1.f2a901ccafb37p-4,
+-	     0x1.e723726b824a9p-4,
+-	     0x1.dbd32ac4c99b0p-4,
+-	     0x1.d0b7a0f921e7cp-4,
+-	     0x1.c5d0497c09e74p-4,
+-	     0x1.bb1c972f23e50p-4,
+-	     0x1.b09bfb7d11a83p-4,
+-	     0x1.a64de673e8837p-4,
+-	     0x1.9c31c6df3b1b8p-4,
+-	     0x1.92470a61b6965p-4,
+-	     0x1.888d1d8e510a3p-4,
+-	     0x1.7f036c0107294p-4,
+-	     0x1.75a96077274bap-4,
+-	     0x1.6c7e64e7281cbp-4,
+-	     0x1.6381e2980956bp-4,
+-	     0x1.5ab342383d177p-4,
+-	     0x1.5211ebf41880bp-4,
+-	     0x1.499d478bca735p-4,
+-	     0x1.4154bc68d75c3p-4,
+-	     0x1.3937b1b319259p-4,
+-	     0x1.31458e6542847p-4,
+-	     0x1.297db960e4f63p-4,
+-	     0x1.21df9981f8e53p-4,
+-	     0x1.1a6a95b1e786fp-4,
+-	     0x1.131e14fa1625dp-4,
+-	     0x1.0bf97e95f2a64p-4,
+-	     0x1.04fc3a0481321p-4,
+-	     0x1.fc4b5e32d6259p-5,
+-	     0x1.eeea8c1b1db93p-5,
+-	     0x1.e1d4cf1e2450ap-5,
+-	     0x1.d508f9a1ea64ep-5,
+-	     0x1.c885df3451a07p-5,
+-	     0x1.bc4a54a84e834p-5,
+-	     0x1.b055303221015p-5,
+-	     0x1.a4a549829587ep-5,
+-	     0x1.993979e14fffdp-5,
+-	     0x1.8e109c4622913p-5,
+-	     0x1.83298d717210ep-5,
+-	     0x1.78832c03aa2b1p-5,
+-	     0x1.6e1c5893c380bp-5,
+-	     0x1.63f3f5c4de13bp-5,
+-	     0x1.5a08e85af27e0p-5,
+-	     0x1.505a174e9c929p-5,
+-	     0x1.46e66be002240p-5,
+-	     0x1.3dacd1a8d8ccdp-5,
+-	     0x1.34ac36ad8dafep-5,
+-	     0x1.2be38b6d92415p-5,
+-	     0x1.2351c2f2d1449p-5,
+-	     0x1.1af5d2e04f3f6p-5,
+-	     0x1.12ceb37ff9bc3p-5,
+-	     0x1.0adb5fcfa8c75p-5,
+-	     0x1.031ad58d56279p-5,
+-	     0x1.f7182a851bca2p-6,
+-	     0x1.e85c449e377f2p-6,
+-	     0x1.da0005e5f28dfp-6,
+-	     0x1.cc0180af00a8bp-6,
+-	     0x1.be5ecd2fcb5f9p-6,
+-	     0x1.b1160991ff737p-6,
+-	     0x1.a4255a00b9f03p-6,
+-	     0x1.978ae8b55ce1bp-6,
+-	     0x1.8b44e6031383ep-6,
+-	     0x1.7f5188610ddc8p-6,
+-	     0x1.73af0c737bb45p-6,
+-	     0x1.685bb5134ef13p-6,
+-	     0x1.5d55cb54cd53ap-6,
+-	     0x1.529b9e8cf9a1ep-6,
+-	     0x1.482b8455dc491p-6,
+-	     0x1.3e03d891b37dep-6,
+-	     0x1.3422fd6d12e2bp-6,
+-	     0x1.2a875b5ffab56p-6,
+-	     0x1.212f612dee7fbp-6,
+-	     0x1.181983e5133ddp-6,
+-	     0x1.0f443edc5ce49p-6,
+-	     0x1.06ae13b0d3255p-6,
+-	     0x1.fcab1483ea7fcp-7,
+-	     0x1.ec72615a894c4p-7,
+-	     0x1.dcaf3691fc448p-7,
+-	     0x1.cd5ec93c12431p-7,
+-	     0x1.be7e5ac24963bp-7,
+-	     0x1.b00b38d6b3575p-7,
+-	     0x1.a202bd6372dcep-7,
+-	     0x1.94624e78e0fafp-7,
+-	     0x1.87275e3a6869dp-7,
+-	     0x1.7a4f6aca256cbp-7,
+-	     0x1.6dd7fe3358230p-7,
+-	     0x1.61beae53b72b7p-7,
+-	     0x1.56011cc3b036dp-7,
+-	     0x1.4a9cf6bda3f4cp-7,
+-	     0x1.3f8ff5042a88ep-7,
+-	     0x1.34d7dbc76d7e5p-7,
+-	     0x1.2a727a89a3f14p-7,
+-	     0x1.205dac02bd6b9p-7,
+-	     0x1.1697560347b25p-7,
+-	     0x1.0d1d69569b82dp-7,
+-	     0x1.03ede1a45bfeep-7,
+-	     0x1.f60d8aa2a88f2p-8,
+-	     0x1.e4cc4abf7d065p-8,
+-	     0x1.d4143a9dfe965p-8,
+-	     0x1.c3e1a5f5c077cp-8,
+-	     0x1.b430ecf4a83a8p-8,
+-	     0x1.a4fe83fb9db25p-8,
+-	     0x1.9646f35a76623p-8,
+-	     0x1.8806d70b2fc36p-8,
+-	     0x1.7a3ade6c8b3e4p-8,
+-	     0x1.6cdfcbfc1e263p-8,
+-	     0x1.5ff2750fe7820p-8,
+-	     0x1.536fc18f7ce5cp-8,
+-	     0x1.4754abacdf1dcp-8,
+-	     0x1.3b9e3f9d06e3fp-8,
+-	     0x1.30499b503957fp-8,
+-	     0x1.2553ee2a336bfp-8,
+-	     0x1.1aba78ba3af89p-8,
+-	     0x1.107a8c7323a6ep-8,
+-	     0x1.06918b6355624p-8,
+-	     0x1.f9f9cfd9c3035p-9,
+-	     0x1.e77448fb66bb9p-9,
+-	     0x1.d58da68fd1170p-9,
+-	     0x1.c4412bf4b8f0bp-9,
+-	     0x1.b38a3af2e55b4p-9,
+-	     0x1.a3645330550ffp-9,
+-	     0x1.93cb11a30d765p-9,
+-	     0x1.84ba3004a50d0p-9,
+-	     0x1.762d84469c18fp-9,
+-	     0x1.6821000795a03p-9,
+-	     0x1.5a90b00981d93p-9,
+-	     0x1.4d78bba8ca5fdp-9,
+-	     0x1.40d564548fad7p-9,
+-	     0x1.34a305080681fp-9,
+-	     0x1.28de11c5031ebp-9,
+-	     0x1.1d83170fbf6fbp-9,
+-	     0x1.128eb96be8798p-9,
+-	     0x1.07fdb4dafea5fp-9,
+-	     0x1.fb99b8b8279e1p-10,
+-	     0x1.e7f232d9e2630p-10,
+-	     0x1.d4fed7195d7e8p-10,
+-	     0x1.c2b9cf7f893bfp-10,
+-	     0x1.b11d702b3deb1p-10,
+-	     0x1.a024365f771bdp-10,
+-	     0x1.8fc8c794b03b5p-10,
+-	     0x1.8005f08d6f1efp-10,
+-	     0x1.70d6a46e07ddap-10,
+-	     0x1.6235fbd7a4345p-10,
+-	     0x1.541f340697987p-10,
+-	     0x1.468dadf4080abp-10,
+-	     0x1.397ced7af2b15p-10,
+-	     0x1.2ce898809244ep-10,
+-	     0x1.20cc76202c5fap-10,
+-	     0x1.15246dda49d47p-10,
+-	     0x1.09ec86c75d497p-10,
+-	     0x1.fe41cd9bb4eeep-11,
+-	     0x1.e97ba3b77f306p-11,
+-	     0x1.d57f524723822p-11,
+-	     0x1.c245d4b998479p-11,
+-	     0x1.afc85e0f82e12p-11,
+-	     0x1.9e005769dbc1dp-11,
+-	     0x1.8ce75e9f6f8a0p-11,
+-	     0x1.7c7744d9378f7p-11,
+-	     0x1.6caa0d3582fe9p-11,
+-	     0x1.5d79eb71e893bp-11,
+-	     0x1.4ee1429bf7cc0p-11,
+-	     0x1.40daa3c89f5b6p-11,
+-	     0x1.3360ccd23db3ap-11,
+-	     0x1.266ea71d4f71ap-11,
+-	     0x1.19ff4663ae9dfp-11,
+-	     0x1.0e0de78654d1ep-11,
+-	     0x1.0295ef6591848p-11,
+-	     0x1.ef25d37f49fe1p-12,
+-	     0x1.da01102b5f851p-12,
+-	     0x1.c5b5412dcafadp-12,
+-	     0x1.b23a5a23e4210p-12,
+-	     0x1.9f8893d8fd1c1p-12,
+-	     0x1.8d986a4187285p-12,
+-	     0x1.7c629a822bc9ep-12,
+-	     0x1.6be02102b3520p-12,
+-	     0x1.5c0a378c90bcap-12,
+-	     0x1.4cda5374ea275p-12,
+-	     0x1.3e4a23d1f4702p-12,
+-	     0x1.30538fbb77ecdp-12,
+-	     0x1.22f0b496539bdp-12,
+-	     0x1.161be46ad3b50p-12,
+-	     0x1.09cfa445b00ffp-12,
+-	     0x1.fc0d55470cf51p-13,
+-	     0x1.e577bbcd49935p-13,
+-	     0x1.cfd4a5adec5bfp-13,
+-	     0x1.bb1a9657ce465p-13,
+-	     0x1.a740684026555p-13,
+-	     0x1.943d4a1d1ed39p-13,
+-	     0x1.8208bc334a6a5p-13,
+-	     0x1.709a8db59f25cp-13,
+-	     0x1.5feada379d8b7p-13,
+-	     0x1.4ff207314a102p-13,
+-	     0x1.40a8c1949f75ep-13,
+-	     0x1.3207fb7420eb9p-13,
+-	     0x1.2408e9ba3327fp-13,
+-	     0x1.16a501f0e42cap-13,
+-	     0x1.09d5f819c9e29p-13,
+-	     0x1.fb2b792b40a22p-14,
+-	     0x1.e3bcf436a1a95p-14,
+-	     0x1.cd55277c18d05p-14,
+-	     0x1.b7e94604479dcp-14,
+-	     0x1.a36eec00926ddp-14,
+-	     0x1.8fdc1b2dcf7b9p-14,
+-	     0x1.7d2737527c3f9p-14,
+-	     0x1.6b4702d7d5849p-14,
+-	     0x1.5a329b7d30748p-14,
+-	     0x1.49e17724f4d41p-14,
+-	     0x1.3a4b60ba9aa4dp-14,
+-	     0x1.2b6875310f785p-14,
+-	     0x1.1d312098e9dbap-14,
+-	     0x1.0f9e1b4dd36dfp-14,
+-	     0x1.02a8673a94691p-14,
+-	     0x1.ec929a665b449p-15,
+-	     0x1.d4f4b4c8e09edp-15,
+-	     0x1.be6abbb10a5aap-15,
+-	     0x1.a8e8cc1fadef6p-15,
+-	     0x1.94637d5bacfdbp-15,
+-	     0x1.80cfdc72220cfp-15,
+-	     0x1.6e2367dc27f95p-15,
+-	     0x1.5c540b4936fd2p-15,
+-	     0x1.4b581b8d170fcp-15,
+-	     0x1.3b2652b06c2b2p-15,
+-	     0x1.2bb5cc22e5db6p-15,
+-	     0x1.1cfe010e2052dp-15,
+-	     0x1.0ef6c4c84a0fep-15,
+-	     0x1.01984165a5f36p-15,
+-	     0x1.e9b5e8d00ce76p-16,
+-	     0x1.d16f5716c6c1ap-16,
+-	     0x1.ba4f035d60e02p-16,
+-	     0x1.a447b7b03f045p-16,
+-	     0x1.8f4ccca7fc90dp-16,
+-	     0x1.7b5223dac7336p-16,
+-	     0x1.684c227fcacefp-16,
+-	     0x1.562fac4329b48p-16,
+-	     0x1.44f21e49054f2p-16,
+-	     0x1.34894a5e24657p-16,
+-	     0x1.24eb7254ccf83p-16,
+-	     0x1.160f438c70913p-16,
+-	     0x1.07ebd2a2d2844p-16,
+-	     0x1.f4f12e9ab070ap-17,
+-	     0x1.db5ad0b27805cp-17,
+-	     0x1.c304efa2c6f4ep-17,
+-	     0x1.abe09e9144b5ep-17,
+-	     0x1.95df988e76644p-17,
+-	     0x1.80f439b4ee04bp-17,
+-	     0x1.6d11788a69c64p-17,
+-	     0x1.5a2adfa0b4bc4p-17,
+-	     0x1.4834877429b8fp-17,
+-	     0x1.37231085c7d9ap-17,
+-	     0x1.26eb9daed6f7ep-17,
+-	     0x1.1783ceac28910p-17,
+-	     0x1.08e1badf0fcedp-17,
+-	     0x1.f5f7d88472604p-18,
+-	     0x1.db92b5212fb8dp-18,
+-	     0x1.c282cd3957edap-18,
+-	     0x1.aab7abace48dcp-18,
+-	     0x1.94219bfcb4928p-18,
+-	     0x1.7eb1a2075864dp-18,
+-	     0x1.6a597219a93d9p-18,
+-	     0x1.570b69502f313p-18,
+-	     0x1.44ba864670882p-18,
+-	     0x1.335a62115bce2p-18,
+-	     0x1.22df298214423p-18,
+-	     0x1.133d96ae7e0ddp-18,
+-	     0x1.046aeabcfcdecp-18,
+-	     0x1.ecb9cfe1d8642p-19,
+-	     0x1.d21397ead99cbp-19,
+-	     0x1.b8d094c86d374p-19,
+-	     0x1.a0df0f0c626dcp-19,
+-	     0x1.8a2e269750a39p-19,
+-	     0x1.74adc8f4064d3p-19,
+-	     0x1.604ea819f007cp-19,
+-	     0x1.4d0231928c6f9p-19,
+-	     0x1.3aba85fe22e1fp-19,
+-	     0x1.296a70f414053p-19,
+-	     0x1.1905613b3abf2p-19,
+-	     0x1.097f6156f32c5p-19,
+-	     0x1.f59a20caf6695p-20,
+-	     0x1.d9c73698fb1dcp-20,
+-	     0x1.bf716c6168baep-20,
+-	     0x1.a6852c6b58392p-20,
+-	     0x1.8eefd70594a88p-20,
+-	     0x1.789fb715aae95p-20,
+-	     0x1.6383f726a8e04p-20,
+-	     0x1.4f8c96f26a26ap-20,
+-	     0x1.3caa61607f920p-20,
+-	     0x1.2acee2f5ecdb8p-20,
+-	     0x1.19ec60b1242edp-20,
+-	     0x1.09f5cf4dd2877p-20,
+-	     0x1.f5bd95d8730d8p-21,
+-	     0x1.d9371e2ff7c35p-21,
+-	     0x1.be41de54d155ap-21,
+-	     0x1.a4c89e08ef4f3p-21,
+-	     0x1.8cb738399b12cp-21,
+-	     0x1.75fa8dbc84becp-21,
+-	     0x1.608078a70dcbcp-21,
+-	     0x1.4c37c0394d094p-21,
+-	     0x1.39100d5687bfep-21,
+-	     0x1.26f9df8519bd6p-21,
+-	     0x1.15e6827001f18p-21,
+-	     0x1.05c803e4831c1p-21,
+-	     0x1.ed22548cffd35p-22,
+-	     0x1.d06ad6ecdf971p-22,
+-	     0x1.b551c847fbc96p-22,
+-	     0x1.9bc09f112b494p-22,
+-	     0x1.83a1ff0aa239dp-22,
+-	     0x1.6ce1aa3fd7bddp-22,
+-	     0x1.576c72b514859p-22,
+-	     0x1.43302cc4a0da8p-22,
+-	     0x1.301ba221dc9bbp-22,
+-	     0x1.1e1e857adc568p-22,
+-	     0x1.0d2966b1746f7p-22,
+-	     0x1.fa5b4f49cc6b2p-23,
+-	     0x1.dc3ae30b55c16p-23,
+-	     0x1.bfd7555a3bd68p-23,
+-	     0x1.a517d9e61628ap-23,
+-	     0x1.8be4f8f6c951fp-23,
+-	     0x1.74287ded49339p-23,
+-	     0x1.5dcd669f2cd34p-23,
+-	     0x1.48bfd38302870p-23,
+-	     0x1.34ecf8a3c124ap-23,
+-	     0x1.22430f521cbcfp-23,
+-	     0x1.10b1488aeb235p-23,
+-	     0x1.0027c00a263a6p-23,
+-	     0x1.e12ee004efc37p-24,
+-	     0x1.c3e44ae32b16bp-24,
+-	     0x1.a854ea14102a8p-24,
+-	     0x1.8e6761569f45dp-24,
+-	     0x1.7603bac345f65p-24,
+-	     0x1.5f1353cdad001p-24,
+-	     0x1.4980cb3c80949p-24,
+-	     0x1.3537f00b6ad4dp-24,
+-	     0x1.2225b12bffc68p-24,
+-	     0x1.10380e1adb7e9p-24,
+-	     0x1.febc107d5efaap-25,
+-	     0x1.df0f2a0ee6946p-25,
+-	     0x1.c14b2188bcee4p-25,
+-	     0x1.a553644f7f07dp-25,
+-	     0x1.8b0cfce0579dfp-25,
+-	     0x1.725e7c5dd20f7p-25,
+-	     0x1.5b2fe547a1340p-25,
+-	     0x1.456a974e92e93p-25,
+-	     0x1.30f93c3699078p-25,
+-	     0x1.1dc7b5b978cf8p-25,
+-	     0x1.0bc30c5d52f15p-25,
+-	     0x1.f5b2be65a0c7fp-26,
+-	     0x1.d5f3a8dea7357p-26,
+-	     0x1.b82915b03515bp-26,
+-	     0x1.9c3517e789488p-26,
+-	     0x1.81fb7df06136ep-26,
+-	     0x1.6961b8d641d06p-26,
+-	     0x1.524ec4d916caep-26,
+-	     0x1.3cab1343d18d1p-26,
+-	     0x1.2860757487a01p-26,
+-	     0x1.155a09065d4f7p-26,
+-	     0x1.0384250e4c9fcp-26,
+-	     0x1.e59890b926c78p-27,
+-	     0x1.c642116a8a9e3p-27,
+-	     0x1.a8e405e651ab6p-27,
+-	     0x1.8d5f98114f872p-27,
+-	     0x1.7397c5a66e307p-27,
+-	     0x1.5b71456c5a4c4p-27,
+-	     0x1.44d26de513197p-27,
+-	     0x1.2fa31d6371537p-27,
+-	     0x1.1bcca373b7b43p-27,
+-	     0x1.0939ab853339fp-27,
+-	     0x1.efac5187b2863p-28,
+-	     0x1.cf1e86235d0e6p-28,
+-	     0x1.b0a68a2128babp-28,
+-	     0x1.9423165bc4444p-28,
+-	     0x1.7974e743dea3cp-28,
+-	     0x1.607e9eacd1050p-28,
+-	     0x1.4924a74dec728p-28,
+-	     0x1.334d19e0c2160p-28,
+-	     0x1.1edfa3c5f5ccap-28,
+-	     0x1.0bc56f1b54701p-28,
+-	     0x1.f3d2185e047d9p-29,
+-	     0x1.d26cb87945e87p-29,
+-	     0x1.b334fac4b9f99p-29,
+-	     0x1.96076f7918d1cp-29,
+-	     0x1.7ac2d72fc2c63p-29,
+-	     0x1.614801550319ep-29,
+-	     0x1.4979ac8b28926p-29,
+-	     0x1.333c68e2d0548p-29,
+-	     0x1.1e767bce37dd7p-29,
+-	     0x1.0b0fc5b6d05a0p-29,
+-	     0x1.f1e3523b41d7dp-30,
+-	     0x1.d00de6608effep-30,
+-	     0x1.b0778b7b3301ap-30,
+-	     0x1.92fb04ec0f6cfp-30,
+-	     0x1.77756ec9f78fap-30,
+-	     0x1.5dc61922d5a06p-30,
+-	     0x1.45ce65699ff6dp-30,
+-	     0x1.2f71a5f159970p-30,
+-	     0x1.1a94ff571654fp-30,
+-	     0x1.071f4bbea09ecp-30,
+-	     0x1.e9f1ff8ddd774p-31,
+-	     0x1.c818223a202c7p-31,
+-	     0x1.a887bd2b4404dp-31,
+-	     0x1.8b1a336c5eb6bp-31,
+-	     0x1.6fab63324088ap-31,
+-	     0x1.56197e30205bap-31,
+-	     0x1.3e44e45301b92p-31,
+-	     0x1.281000bfe4c3fp-31,
+-	     0x1.135f28f2d50b4p-31,
+-	     0x1.00187dded5975p-31,
+-	     0x1.dc479de0ef001p-32,
+-	     0x1.bad4fdad3caa1p-32,
+-	     0x1.9baed3ed27ab8p-32,
+-	     0x1.7ead9ce4285bbp-32,
+-	     0x1.63ac6b4edc88ep-32,
+-	     0x1.4a88be2a6390cp-32,
+-	     0x1.332259185f1a0p-32,
+-	     0x1.1d5b1f3793044p-32,
+-	     0x1.0916f04b6e18bp-32,
+-	     0x1.ec77101de6926p-33,
+-	     0x1.c960bf23153e0p-33,
+-	     0x1.a8bd20fc65ef7p-33,
+-	     0x1.8a61745ec7d1dp-33,
+-	     0x1.6e25d0e756261p-33,
+-	     0x1.53e4f7d1666cbp-33,
+-	     0x1.3b7c27a7ddb0ep-33,
+-	     0x1.24caf2c32af14p-33,
+-	     0x1.0fb3186804d0fp-33,
+-	     0x1.f830c0bb41fd7p-34,
+-	     0x1.d3c0f1a91c846p-34,
+-	     0x1.b1e5acf351d87p-34,
+-	     0x1.92712d259ce66p-34,
+-	     0x1.7538c60a04476p-34,
+-	     0x1.5a14b04b47879p-34,
+-	     0x1.40dfd87456f4cp-34,
+-	     0x1.2977b1172b9d5p-34,
+-	     0x1.13bc07e891491p-34,
+-	     0x1.ff1dbb4300811p-35,
+-	     0x1.d9a880f306bd8p-35,
+-	     0x1.b6e45220b55e0p-35,
+-	     0x1.96a0b33f2c4dap-35,
+-	     0x1.78b07e9e924acp-35,
+-	     0x1.5ce9ab1670dd2p-35,
+-	     0x1.4325167006bb0p-35,
+-	     0x1.2b3e53538ff3fp-35,
+-	     0x1.15137a7f44864p-35,
+-	     0x1.0084ff125639dp-35,
+-	     0x1.daeb0b7311ec7p-36,
+-	     0x1.b7937d1c40c52p-36,
+-	     0x1.96d082f59ab06p-36,
+-	     0x1.7872d9fa10aadp-36,
+-	     0x1.5c4e8e37bc7d0p-36,
+-	     0x1.423ac0df49a40p-36,
+-	     0x1.2a117230ad284p-36,
+-	     0x1.13af4f04f9998p-36,
+-	     0x1.fde703724e560p-37,
+-	     0x1.d77f0c82e7641p-37,
+-	     0x1.b3ee02611d7ddp-37,
+-	     0x1.92ff33023d5bdp-37,
+-	     0x1.7481a9e69f53fp-37,
+-	     0x1.5847eda620959p-37,
+-	     0x1.3e27c1fcc74bdp-37,
+-	     0x1.25f9ee0b923dcp-37,
+-	     0x1.0f9a0686531ffp-37,
+-	     0x1.f5cc7718082afp-38,
+-	     0x1.cf7e53d6a2ca5p-38,
+-	     0x1.ac0f5f3229372p-38,
+-	     0x1.8b498644847eap-38,
+-	     0x1.6cfa9bcca59dcp-38,
+-	     0x1.50f411d4fd2cdp-38,
+-	     0x1.370ab8327af5ep-38,
+-	     0x1.1f167f88c6b6ep-38,
+-	     0x1.08f24085d4597p-38,
+-	     0x1.e8f70e181d619p-39,
+-	     0x1.c324c20e337dcp-39,
+-	     0x1.a03261574b54ep-39,
+-	     0x1.7fe903cdf5855p-39,
+-	     0x1.6215c58da3450p-39,
+-	     0x1.46897d4b69fc6p-39,
+-	     0x1.2d1877d731b7bp-39,
+-	     0x1.159a386b11517p-39,
+-	     0x1.ffd27ae9393cep-40,
+-	     0x1.d7c593130dd0bp-40,
+-	     0x1.b2cd607c79bcfp-40,
+-	     0x1.90ae4d3405651p-40,
+-	     0x1.71312dd1759e2p-40,
+-	     0x1.5422ef5d8949dp-40,
+-	     0x1.39544b0ecc957p-40,
+-	     0x1.20997f73e73ddp-40,
+-	     0x1.09ca0eaacd277p-40,
+-	     0x1.e9810295890ecp-41,
+-	     0x1.c2b45b5aa4a1dp-41,
+-	     0x1.9eee068fa7596p-41,
+-	     0x1.7df2b399c10a8p-41,
+-	     0x1.5f8b87a31bd85p-41,
+-	     0x1.4385c96e9a2d9p-41,
+-	     0x1.29b2933ef4cbcp-41,
+-	     0x1.11e68a6378f8ap-41,
+-	     0x1.f7f338086a86bp-42,
+-	     0x1.cf8d7d9ce040ap-42,
+-	     0x1.aa577251ae484p-42,
+-	     0x1.8811d739efb5ep-42,
+-	     0x1.68823e52970bep-42,
+-	     0x1.4b72ae68e8b4cp-42,
+-	     0x1.30b14dbe876bcp-42,
+-	     0x1.181012ef86610p-42,
+-	     0x1.01647ba798744p-42,
+-	     0x1.d90e917701675p-43,
+-	     0x1.b2a87e86d0c8ap-43,
+-	     0x1.8f53dcb377293p-43,
+-	     0x1.6ed2f2515e933p-43,
+-	     0x1.50ecc9ed47f19p-43,
+-	     0x1.356cd5ce7799ep-43,
+-	     0x1.1c229a587ab78p-43,
+-	     0x1.04e15ecc7f3f6p-43,
+-	     0x1.deffc7e6a6017p-44,
+-	     0x1.b7b040832f310p-44,
+-	     0x1.938e021f36d76p-44,
+-	     0x1.7258610b3b233p-44,
+-	     0x1.53d3bfc82a909p-44,
+-	     0x1.37c92babdc2fdp-44,
+-	     0x1.1e06010120f6ap-44,
+-	     0x1.065b9616170d4p-44,
+-	     0x1.e13dd96b3753ap-45,
+-	     0x1.b950d32467392p-45,
+-	     0x1.94a72263259a5p-45,
+-	     0x1.72fd93e036cdcp-45,
+-	     0x1.54164576929abp-45,
+-	     0x1.37b83c521fe96p-45,
+-	     0x1.1daf033182e96p-45,
+-	     0x1.05ca50205d26ap-45,
+-	     0x1.dfbb6235639fap-46,
+-	     0x1.b7807e294781fp-46,
+-	     0x1.9298add70a734p-46,
+-	     0x1.70beaf9c7ffb6p-46,
+-	     0x1.51b2cd6709222p-46,
+-	     0x1.353a6cf7f7fffp-46,
+-	     0x1.1b1fa8cbe84a7p-46,
+-	     0x1.0330f0fd69921p-46,
+-	     0x1.da81670f96f9bp-47,
+-	     0x1.b24a16b4d09aap-47,
+-	     0x1.8d6eeb6efdbd6p-47,
+-	     0x1.6ba91ac734785p-47,
+-	     0x1.4cb7966770ab5p-47,
+-	     0x1.305e9721d0981p-47,
+-	     0x1.1667311fff70ap-47,
+-	     0x1.fd3de10d62855p-48,
+-	     0x1.d1aefbcd48d0cp-48,
+-	     0x1.a9cc93c25aca9p-48,
+-	     0x1.85487ee3ea735p-48,
+-	     0x1.63daf8b4b1e0cp-48,
+-	     0x1.45421e69a6ca1p-48,
+-	     0x1.294175802d99ap-48,
+-	     0x1.0fa17bf41068fp-48,
+-	     0x1.f05e82aae2bb9p-49,
+-	     0x1.c578101b29058p-49,
+-	     0x1.9e39dc5dd2f7cp-49,
+-	     0x1.7a553a728bbf2p-49,
+-	     0x1.5982008db1304p-49,
+-	     0x1.3b7e00422e51bp-49,
+-	     0x1.200c898d9ee3ep-49,
+-	     0x1.06f5f7eb65a56p-49,
+-	     0x1.e00e9148a1d25p-50,
+-	     0x1.b623734024e92p-50,
+-	     0x1.8fd4e01891bf8p-50,
+-	     0x1.6cd44c7470d89p-50,
+-	     0x1.4cd9c04158cd7p-50,
+-	     0x1.2fa34bf5c8344p-50,
+-	     0x1.14f4890ff2461p-50,
+-	     0x1.f92c49dfa4df5p-51,
+-	     0x1.ccaaea71ab0dfp-51,
+-	     0x1.a40829f001197p-51,
+-	     0x1.7eef13b59e96cp-51,
+-	     0x1.5d11e1a252bf5p-51,
+-	     0x1.3e296303b2297p-51,
+-	     0x1.21f47009f43cep-51,
+-	     0x1.083768c5e4541p-51,
+-	     0x1.e1777d831265ep-52,
+-	     0x1.b69f10b0191b5p-52,
+-	     0x1.8f8a3a05b5b52p-52,
+-	     0x1.6be573c40c8e7p-52,
+-	     0x1.4b645ba991fdbp-52,
+-	     0x1.2dc119095729fp-52,
+-  },
+-};
+diff --git a/sysdeps/aarch64/fpu/sv_erff_data.c b/sysdeps/aarch64/fpu/sv_erff_data.c
+deleted file mode 100644
+index 6dcd72af69..0000000000
+--- a/sysdeps/aarch64/fpu/sv_erff_data.c
++++ /dev/null
+@@ -1,1058 +0,0 @@
+-/* Table for SVE erff approximation
+-
+-   Copyright (C) 2024 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, see
+-   <https://www.gnu.org/licenses/>.  */
+-
+-#include "vecmath_config.h"
+-
+-/* Lookup table used in SVE erff.
+-   For each possible rounded input r (multiples of 1/128), between
+-   r = 0.0 and r = 4.0 (513 values):
+-   - __erff_data.erf contains the values of erf(r),
+-   - __erff_data.scale contains the values of 2/sqrt(pi)*exp(-r^2).
+-   Note that indices 0 and 1 are never hit by the algorithm, since lookup is
+-   performed only for x >= 1/64-1/512.  */
+-const struct sv_erff_data __sv_erff_data = {
+-  .erf = { 0x0.000000p+0,
+-	   0x1.20dbf4p-7,
+-	   0x1.20d770p-6,
+-	   0x1.b137e0p-6,
+-	   0x1.20c564p-5,
+-	   0x1.68e5d4p-5,
+-	   0x1.b0fafep-5,
+-	   0x1.f902a8p-5,
+-	   0x1.207d48p-4,
+-	   0x1.44703ep-4,
+-	   0x1.68591ap-4,
+-	   0x1.8c36bep-4,
+-	   0x1.b00812p-4,
+-	   0x1.d3cbf8p-4,
+-	   0x1.f7815ap-4,
+-	   0x1.0d9390p-3,
+-	   0x1.1f5e1ap-3,
+-	   0x1.311fc2p-3,
+-	   0x1.42d7fcp-3,
+-	   0x1.548642p-3,
+-	   0x1.662a0cp-3,
+-	   0x1.77c2d2p-3,
+-	   0x1.895010p-3,
+-	   0x1.9ad142p-3,
+-	   0x1.ac45e4p-3,
+-	   0x1.bdad72p-3,
+-	   0x1.cf076ep-3,
+-	   0x1.e05354p-3,
+-	   0x1.f190aap-3,
+-	   0x1.015f78p-2,
+-	   0x1.09eed6p-2,
+-	   0x1.127632p-2,
+-	   0x1.1af54ep-2,
+-	   0x1.236bf0p-2,
+-	   0x1.2bd9dcp-2,
+-	   0x1.343ed6p-2,
+-	   0x1.3c9aa8p-2,
+-	   0x1.44ed18p-2,
+-	   0x1.4d35f0p-2,
+-	   0x1.5574f4p-2,
+-	   0x1.5da9f4p-2,
+-	   0x1.65d4b8p-2,
+-	   0x1.6df50ap-2,
+-	   0x1.760abap-2,
+-	   0x1.7e1594p-2,
+-	   0x1.861566p-2,
+-	   0x1.8e0a02p-2,
+-	   0x1.95f336p-2,
+-	   0x1.9dd0d2p-2,
+-	   0x1.a5a2acp-2,
+-	   0x1.ad6896p-2,
+-	   0x1.b52264p-2,
+-	   0x1.bccfecp-2,
+-	   0x1.c47104p-2,
+-	   0x1.cc0584p-2,
+-	   0x1.d38d44p-2,
+-	   0x1.db081cp-2,
+-	   0x1.e275eap-2,
+-	   0x1.e9d68ap-2,
+-	   0x1.f129d4p-2,
+-	   0x1.f86faap-2,
+-	   0x1.ffa7eap-2,
+-	   0x1.03693ap-1,
+-	   0x1.06f794p-1,
+-	   0x1.0a7ef6p-1,
+-	   0x1.0dff50p-1,
+-	   0x1.117894p-1,
+-	   0x1.14eab4p-1,
+-	   0x1.1855a6p-1,
+-	   0x1.1bb95cp-1,
+-	   0x1.1f15ccp-1,
+-	   0x1.226ae8p-1,
+-	   0x1.25b8a8p-1,
+-	   0x1.28ff02p-1,
+-	   0x1.2c3decp-1,
+-	   0x1.2f755cp-1,
+-	   0x1.32a54cp-1,
+-	   0x1.35cdb4p-1,
+-	   0x1.38ee8ap-1,
+-	   0x1.3c07cap-1,
+-	   0x1.3f196ep-1,
+-	   0x1.42236ep-1,
+-	   0x1.4525c8p-1,
+-	   0x1.482074p-1,
+-	   0x1.4b1372p-1,
+-	   0x1.4dfebap-1,
+-	   0x1.50e24cp-1,
+-	   0x1.53be26p-1,
+-	   0x1.569244p-1,
+-	   0x1.595ea6p-1,
+-	   0x1.5c2348p-1,
+-	   0x1.5ee02ep-1,
+-	   0x1.619556p-1,
+-	   0x1.6442c0p-1,
+-	   0x1.66e86ep-1,
+-	   0x1.69865ep-1,
+-	   0x1.6c1c98p-1,
+-	   0x1.6eab18p-1,
+-	   0x1.7131e6p-1,
+-	   0x1.73b102p-1,
+-	   0x1.762870p-1,
+-	   0x1.789836p-1,
+-	   0x1.7b0058p-1,
+-	   0x1.7d60d8p-1,
+-	   0x1.7fb9c0p-1,
+-	   0x1.820b12p-1,
+-	   0x1.8454d6p-1,
+-	   0x1.869712p-1,
+-	   0x1.88d1cep-1,
+-	   0x1.8b050ep-1,
+-	   0x1.8d30dep-1,
+-	   0x1.8f5544p-1,
+-	   0x1.91724ap-1,
+-	   0x1.9387f6p-1,
+-	   0x1.959652p-1,
+-	   0x1.979d68p-1,
+-	   0x1.999d42p-1,
+-	   0x1.9b95e8p-1,
+-	   0x1.9d8768p-1,
+-	   0x1.9f71cap-1,
+-	   0x1.a1551ap-1,
+-	   0x1.a33162p-1,
+-	   0x1.a506b0p-1,
+-	   0x1.a6d50cp-1,
+-	   0x1.a89c86p-1,
+-	   0x1.aa5d26p-1,
+-	   0x1.ac16fcp-1,
+-	   0x1.adca14p-1,
+-	   0x1.af767ap-1,
+-	   0x1.b11c3cp-1,
+-	   0x1.b2bb68p-1,
+-	   0x1.b4540ap-1,
+-	   0x1.b5e630p-1,
+-	   0x1.b771e8p-1,
+-	   0x1.b8f742p-1,
+-	   0x1.ba764ap-1,
+-	   0x1.bbef10p-1,
+-	   0x1.bd61a2p-1,
+-	   0x1.bece0ep-1,
+-	   0x1.c03464p-1,
+-	   0x1.c194b2p-1,
+-	   0x1.c2ef08p-1,
+-	   0x1.c44376p-1,
+-	   0x1.c5920ap-1,
+-	   0x1.c6dad2p-1,
+-	   0x1.c81de2p-1,
+-	   0x1.c95b46p-1,
+-	   0x1.ca930ep-1,
+-	   0x1.cbc54cp-1,
+-	   0x1.ccf20cp-1,
+-	   0x1.ce1962p-1,
+-	   0x1.cf3b5cp-1,
+-	   0x1.d0580cp-1,
+-	   0x1.d16f7ep-1,
+-	   0x1.d281c4p-1,
+-	   0x1.d38ef0p-1,
+-	   0x1.d49710p-1,
+-	   0x1.d59a34p-1,
+-	   0x1.d6986cp-1,
+-	   0x1.d791cap-1,
+-	   0x1.d8865ep-1,
+-	   0x1.d97636p-1,
+-	   0x1.da6162p-1,
+-	   0x1.db47f4p-1,
+-	   0x1.dc29fcp-1,
+-	   0x1.dd0788p-1,
+-	   0x1.dde0aap-1,
+-	   0x1.deb570p-1,
+-	   0x1.df85eap-1,
+-	   0x1.e0522ap-1,
+-	   0x1.e11a3ep-1,
+-	   0x1.e1de36p-1,
+-	   0x1.e29e22p-1,
+-	   0x1.e35a12p-1,
+-	   0x1.e41214p-1,
+-	   0x1.e4c638p-1,
+-	   0x1.e5768cp-1,
+-	   0x1.e62322p-1,
+-	   0x1.e6cc08p-1,
+-	   0x1.e7714ap-1,
+-	   0x1.e812fcp-1,
+-	   0x1.e8b12ap-1,
+-	   0x1.e94be4p-1,
+-	   0x1.e9e336p-1,
+-	   0x1.ea7730p-1,
+-	   0x1.eb07e2p-1,
+-	   0x1.eb9558p-1,
+-	   0x1.ec1fa2p-1,
+-	   0x1.eca6ccp-1,
+-	   0x1.ed2ae6p-1,
+-	   0x1.edabfcp-1,
+-	   0x1.ee2a1ep-1,
+-	   0x1.eea556p-1,
+-	   0x1.ef1db4p-1,
+-	   0x1.ef9344p-1,
+-	   0x1.f00614p-1,
+-	   0x1.f07630p-1,
+-	   0x1.f0e3a6p-1,
+-	   0x1.f14e82p-1,
+-	   0x1.f1b6d0p-1,
+-	   0x1.f21ca0p-1,
+-	   0x1.f27ff8p-1,
+-	   0x1.f2e0eap-1,
+-	   0x1.f33f7ep-1,
+-	   0x1.f39bc2p-1,
+-	   0x1.f3f5c2p-1,
+-	   0x1.f44d88p-1,
+-	   0x1.f4a31ep-1,
+-	   0x1.f4f694p-1,
+-	   0x1.f547f2p-1,
+-	   0x1.f59742p-1,
+-	   0x1.f5e490p-1,
+-	   0x1.f62fe8p-1,
+-	   0x1.f67952p-1,
+-	   0x1.f6c0dcp-1,
+-	   0x1.f7068cp-1,
+-	   0x1.f74a6ep-1,
+-	   0x1.f78c8cp-1,
+-	   0x1.f7cceep-1,
+-	   0x1.f80ba2p-1,
+-	   0x1.f848acp-1,
+-	   0x1.f8841ap-1,
+-	   0x1.f8bdf2p-1,
+-	   0x1.f8f63ep-1,
+-	   0x1.f92d08p-1,
+-	   0x1.f96256p-1,
+-	   0x1.f99634p-1,
+-	   0x1.f9c8a8p-1,
+-	   0x1.f9f9bap-1,
+-	   0x1.fa2974p-1,
+-	   0x1.fa57dep-1,
+-	   0x1.fa84fep-1,
+-	   0x1.fab0dep-1,
+-	   0x1.fadb84p-1,
+-	   0x1.fb04f6p-1,
+-	   0x1.fb2d40p-1,
+-	   0x1.fb5464p-1,
+-	   0x1.fb7a6cp-1,
+-	   0x1.fb9f60p-1,
+-	   0x1.fbc344p-1,
+-	   0x1.fbe61ep-1,
+-	   0x1.fc07fap-1,
+-	   0x1.fc28d8p-1,
+-	   0x1.fc48c2p-1,
+-	   0x1.fc67bcp-1,
+-	   0x1.fc85d0p-1,
+-	   0x1.fca2fep-1,
+-	   0x1.fcbf52p-1,
+-	   0x1.fcdaccp-1,
+-	   0x1.fcf576p-1,
+-	   0x1.fd0f54p-1,
+-	   0x1.fd286ap-1,
+-	   0x1.fd40bep-1,
+-	   0x1.fd5856p-1,
+-	   0x1.fd6f34p-1,
+-	   0x1.fd8562p-1,
+-	   0x1.fd9ae2p-1,
+-	   0x1.fdafb8p-1,
+-	   0x1.fdc3e8p-1,
+-	   0x1.fdd77ap-1,
+-	   0x1.fdea6ep-1,
+-	   0x1.fdfcccp-1,
+-	   0x1.fe0e96p-1,
+-	   0x1.fe1fd0p-1,
+-	   0x1.fe3080p-1,
+-	   0x1.fe40a6p-1,
+-	   0x1.fe504cp-1,
+-	   0x1.fe5f70p-1,
+-	   0x1.fe6e18p-1,
+-	   0x1.fe7c46p-1,
+-	   0x1.fe8a00p-1,
+-	   0x1.fe9748p-1,
+-	   0x1.fea422p-1,
+-	   0x1.feb090p-1,
+-	   0x1.febc96p-1,
+-	   0x1.fec836p-1,
+-	   0x1.fed374p-1,
+-	   0x1.fede52p-1,
+-	   0x1.fee8d4p-1,
+-	   0x1.fef2fep-1,
+-	   0x1.fefccep-1,
+-	   0x1.ff064cp-1,
+-	   0x1.ff0f76p-1,
+-	   0x1.ff1852p-1,
+-	   0x1.ff20e0p-1,
+-	   0x1.ff2924p-1,
+-	   0x1.ff3120p-1,
+-	   0x1.ff38d6p-1,
+-	   0x1.ff4048p-1,
+-	   0x1.ff4778p-1,
+-	   0x1.ff4e68p-1,
+-	   0x1.ff551ap-1,
+-	   0x1.ff5b90p-1,
+-	   0x1.ff61ccp-1,
+-	   0x1.ff67d0p-1,
+-	   0x1.ff6d9ep-1,
+-	   0x1.ff7338p-1,
+-	   0x1.ff789ep-1,
+-	   0x1.ff7dd4p-1,
+-	   0x1.ff82dap-1,
+-	   0x1.ff87b2p-1,
+-	   0x1.ff8c5cp-1,
+-	   0x1.ff90dcp-1,
+-	   0x1.ff9532p-1,
+-	   0x1.ff9960p-1,
+-	   0x1.ff9d68p-1,
+-	   0x1.ffa14ap-1,
+-	   0x1.ffa506p-1,
+-	   0x1.ffa8a0p-1,
+-	   0x1.ffac18p-1,
+-	   0x1.ffaf6ep-1,
+-	   0x1.ffb2a6p-1,
+-	   0x1.ffb5bep-1,
+-	   0x1.ffb8b8p-1,
+-	   0x1.ffbb98p-1,
+-	   0x1.ffbe5ap-1,
+-	   0x1.ffc102p-1,
+-	   0x1.ffc390p-1,
+-	   0x1.ffc606p-1,
+-	   0x1.ffc862p-1,
+-	   0x1.ffcaa8p-1,
+-	   0x1.ffccd8p-1,
+-	   0x1.ffcef4p-1,
+-	   0x1.ffd0fap-1,
+-	   0x1.ffd2eap-1,
+-	   0x1.ffd4cap-1,
+-	   0x1.ffd696p-1,
+-	   0x1.ffd84ep-1,
+-	   0x1.ffd9f8p-1,
+-	   0x1.ffdb90p-1,
+-	   0x1.ffdd18p-1,
+-	   0x1.ffde90p-1,
+-	   0x1.ffdffap-1,
+-	   0x1.ffe154p-1,
+-	   0x1.ffe2a2p-1,
+-	   0x1.ffe3e2p-1,
+-	   0x1.ffe514p-1,
+-	   0x1.ffe63cp-1,
+-	   0x1.ffe756p-1,
+-	   0x1.ffe866p-1,
+-	   0x1.ffe96ap-1,
+-	   0x1.ffea64p-1,
+-	   0x1.ffeb54p-1,
+-	   0x1.ffec3ap-1,
+-	   0x1.ffed16p-1,
+-	   0x1.ffedeap-1,
+-	   0x1.ffeeb4p-1,
+-	   0x1.ffef76p-1,
+-	   0x1.fff032p-1,
+-	   0x1.fff0e4p-1,
+-	   0x1.fff18ep-1,
+-	   0x1.fff232p-1,
+-	   0x1.fff2d0p-1,
+-	   0x1.fff366p-1,
+-	   0x1.fff3f6p-1,
+-	   0x1.fff480p-1,
+-	   0x1.fff504p-1,
+-	   0x1.fff582p-1,
+-	   0x1.fff5fcp-1,
+-	   0x1.fff670p-1,
+-	   0x1.fff6dep-1,
+-	   0x1.fff74ap-1,
+-	   0x1.fff7aep-1,
+-	   0x1.fff810p-1,
+-	   0x1.fff86cp-1,
+-	   0x1.fff8c6p-1,
+-	   0x1.fff91cp-1,
+-	   0x1.fff96cp-1,
+-	   0x1.fff9bap-1,
+-	   0x1.fffa04p-1,
+-	   0x1.fffa4cp-1,
+-	   0x1.fffa90p-1,
+-	   0x1.fffad0p-1,
+-	   0x1.fffb0ep-1,
+-	   0x1.fffb4ap-1,
+-	   0x1.fffb82p-1,
+-	   0x1.fffbb8p-1,
+-	   0x1.fffbecp-1,
+-	   0x1.fffc1ep-1,
+-	   0x1.fffc4ep-1,
+-	   0x1.fffc7ap-1,
+-	   0x1.fffca6p-1,
+-	   0x1.fffccep-1,
+-	   0x1.fffcf6p-1,
+-	   0x1.fffd1ap-1,
+-	   0x1.fffd3ep-1,
+-	   0x1.fffd60p-1,
+-	   0x1.fffd80p-1,
+-	   0x1.fffda0p-1,
+-	   0x1.fffdbep-1,
+-	   0x1.fffddap-1,
+-	   0x1.fffdf4p-1,
+-	   0x1.fffe0ep-1,
+-	   0x1.fffe26p-1,
+-	   0x1.fffe3ep-1,
+-	   0x1.fffe54p-1,
+-	   0x1.fffe68p-1,
+-	   0x1.fffe7ep-1,
+-	   0x1.fffe90p-1,
+-	   0x1.fffea2p-1,
+-	   0x1.fffeb4p-1,
+-	   0x1.fffec4p-1,
+-	   0x1.fffed4p-1,
+-	   0x1.fffee4p-1,
+-	   0x1.fffef2p-1,
+-	   0x1.ffff00p-1,
+-	   0x1.ffff0cp-1,
+-	   0x1.ffff18p-1,
+-	   0x1.ffff24p-1,
+-	   0x1.ffff30p-1,
+-	   0x1.ffff3ap-1,
+-	   0x1.ffff44p-1,
+-	   0x1.ffff4ep-1,
+-	   0x1.ffff56p-1,
+-	   0x1.ffff60p-1,
+-	   0x1.ffff68p-1,
+-	   0x1.ffff70p-1,
+-	   0x1.ffff78p-1,
+-	   0x1.ffff7ep-1,
+-	   0x1.ffff84p-1,
+-	   0x1.ffff8cp-1,
+-	   0x1.ffff92p-1,
+-	   0x1.ffff98p-1,
+-	   0x1.ffff9cp-1,
+-	   0x1.ffffa2p-1,
+-	   0x1.ffffa6p-1,
+-	   0x1.ffffacp-1,
+-	   0x1.ffffb0p-1,
+-	   0x1.ffffb4p-1,
+-	   0x1.ffffb8p-1,
+-	   0x1.ffffbcp-1,
+-	   0x1.ffffc0p-1,
+-	   0x1.ffffc4p-1,
+-	   0x1.ffffc6p-1,
+-	   0x1.ffffcap-1,
+-	   0x1.ffffccp-1,
+-	   0x1.ffffd0p-1,
+-	   0x1.ffffd2p-1,
+-	   0x1.ffffd4p-1,
+-	   0x1.ffffd6p-1,
+-	   0x1.ffffd8p-1,
+-	   0x1.ffffdcp-1,
+-	   0x1.ffffdep-1,
+-	   0x1.ffffdep-1,
+-	   0x1.ffffe0p-1,
+-	   0x1.ffffe2p-1,
+-	   0x1.ffffe4p-1,
+-	   0x1.ffffe6p-1,
+-	   0x1.ffffe8p-1,
+-	   0x1.ffffe8p-1,
+-	   0x1.ffffeap-1,
+-	   0x1.ffffeap-1,
+-	   0x1.ffffecp-1,
+-	   0x1.ffffeep-1,
+-	   0x1.ffffeep-1,
+-	   0x1.fffff0p-1,
+-	   0x1.fffff0p-1,
+-	   0x1.fffff2p-1,
+-	   0x1.fffff2p-1,
+-	   0x1.fffff2p-1,
+-	   0x1.fffff4p-1,
+-	   0x1.fffff4p-1,
+-	   0x1.fffff4p-1,
+-	   0x1.fffff6p-1,
+-	   0x1.fffff6p-1,
+-	   0x1.fffff6p-1,
+-	   0x1.fffff8p-1,
+-	   0x1.fffff8p-1,
+-	   0x1.fffff8p-1,
+-	   0x1.fffff8p-1,
+-	   0x1.fffffap-1,
+-	   0x1.fffffap-1,
+-	   0x1.fffffap-1,
+-	   0x1.fffffap-1,
+-	   0x1.fffffap-1,
+-	   0x1.fffffap-1,
+-	   0x1.fffffcp-1,
+-	   0x1.fffffcp-1,
+-	   0x1.fffffcp-1,
+-	   0x1.fffffcp-1,
+-	   0x1.fffffcp-1,
+-	   0x1.fffffcp-1,
+-	   0x1.fffffcp-1,
+-	   0x1.fffffcp-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.fffffep-1,
+-	   0x1.000000p+0,
+-	   0x1.000000p+0,
+-	   0x1.000000p+0,
+-	   0x1.000000p+0,
+-	   0x1.000000p+0,
+-	   0x1.000000p+0,
+-	   0x1.000000p+0,
+-	   0x1.000000p+0,
+-	   0x1.000000p+0,
+-	   0x1.000000p+0,
+-	   0x1.000000p+0,
+-  },
+-  .scale = { 0x1.20dd76p+0,
+-	     0x1.20d8f2p+0,
+-	     0x1.20cb68p+0,
+-	     0x1.20b4d8p+0,
+-	     0x1.209546p+0,
+-	     0x1.206cb4p+0,
+-	     0x1.203b26p+0,
+-	     0x1.2000a0p+0,
+-	     0x1.1fbd28p+0,
+-	     0x1.1f70c4p+0,
+-	     0x1.1f1b7ap+0,
+-	     0x1.1ebd56p+0,
+-	     0x1.1e565cp+0,
+-	     0x1.1de698p+0,
+-	     0x1.1d6e14p+0,
+-	     0x1.1cecdcp+0,
+-	     0x1.1c62fap+0,
+-	     0x1.1bd07cp+0,
+-	     0x1.1b3572p+0,
+-	     0x1.1a91e6p+0,
+-	     0x1.19e5eap+0,
+-	     0x1.19318cp+0,
+-	     0x1.1874dep+0,
+-	     0x1.17aff0p+0,
+-	     0x1.16e2d8p+0,
+-	     0x1.160da4p+0,
+-	     0x1.153068p+0,
+-	     0x1.144b3cp+0,
+-	     0x1.135e30p+0,
+-	     0x1.12695ep+0,
+-	     0x1.116cd8p+0,
+-	     0x1.1068bap+0,
+-	     0x1.0f5d16p+0,
+-	     0x1.0e4a08p+0,
+-	     0x1.0d2fa6p+0,
+-	     0x1.0c0e0ap+0,
+-	     0x1.0ae550p+0,
+-	     0x1.09b590p+0,
+-	     0x1.087ee4p+0,
+-	     0x1.07416cp+0,
+-	     0x1.05fd3ep+0,
+-	     0x1.04b27cp+0,
+-	     0x1.036140p+0,
+-	     0x1.0209a6p+0,
+-	     0x1.00abd0p+0,
+-	     0x1.fe8fb0p-1,
+-	     0x1.fbbbbep-1,
+-	     0x1.f8dc0ap-1,
+-	     0x1.f5f0cep-1,
+-	     0x1.f2fa4cp-1,
+-	     0x1.eff8c4p-1,
+-	     0x1.ecec78p-1,
+-	     0x1.e9d5a8p-1,
+-	     0x1.e6b498p-1,
+-	     0x1.e38988p-1,
+-	     0x1.e054bep-1,
+-	     0x1.dd167cp-1,
+-	     0x1.d9cf06p-1,
+-	     0x1.d67ea2p-1,
+-	     0x1.d32592p-1,
+-	     0x1.cfc41ep-1,
+-	     0x1.cc5a8ap-1,
+-	     0x1.c8e91cp-1,
+-	     0x1.c5701ap-1,
+-	     0x1.c1efcap-1,
+-	     0x1.be6872p-1,
+-	     0x1.bada5ap-1,
+-	     0x1.b745c6p-1,
+-	     0x1.b3aafcp-1,
+-	     0x1.b00a46p-1,
+-	     0x1.ac63e8p-1,
+-	     0x1.a8b828p-1,
+-	     0x1.a5074ep-1,
+-	     0x1.a1519ep-1,
+-	     0x1.9d9762p-1,
+-	     0x1.99d8dap-1,
+-	     0x1.961650p-1,
+-	     0x1.925008p-1,
+-	     0x1.8e8646p-1,
+-	     0x1.8ab950p-1,
+-	     0x1.86e96ap-1,
+-	     0x1.8316d6p-1,
+-	     0x1.7f41dcp-1,
+-	     0x1.7b6abcp-1,
+-	     0x1.7791b8p-1,
+-	     0x1.73b714p-1,
+-	     0x1.6fdb12p-1,
+-	     0x1.6bfdf0p-1,
+-	     0x1.681ff2p-1,
+-	     0x1.644156p-1,
+-	     0x1.60625cp-1,
+-	     0x1.5c8342p-1,
+-	     0x1.58a446p-1,
+-	     0x1.54c5a6p-1,
+-	     0x1.50e79ep-1,
+-	     0x1.4d0a68p-1,
+-	     0x1.492e42p-1,
+-	     0x1.455366p-1,
+-	     0x1.417a0cp-1,
+-	     0x1.3da26ep-1,
+-	     0x1.39ccc2p-1,
+-	     0x1.35f940p-1,
+-	     0x1.32281ep-1,
+-	     0x1.2e5992p-1,
+-	     0x1.2a8dcep-1,
+-	     0x1.26c508p-1,
+-	     0x1.22ff72p-1,
+-	     0x1.1f3d3cp-1,
+-	     0x1.1b7e98p-1,
+-	     0x1.17c3b6p-1,
+-	     0x1.140cc4p-1,
+-	     0x1.1059eep-1,
+-	     0x1.0cab62p-1,
+-	     0x1.09014cp-1,
+-	     0x1.055bd6p-1,
+-	     0x1.01bb2cp-1,
+-	     0x1.fc3ee6p-2,
+-	     0x1.f511aap-2,
+-	     0x1.edeeeep-2,
+-	     0x1.e6d700p-2,
+-	     0x1.dfca26p-2,
+-	     0x1.d8c8aap-2,
+-	     0x1.d1d2d0p-2,
+-	     0x1.cae8dap-2,
+-	     0x1.c40b08p-2,
+-	     0x1.bd3998p-2,
+-	     0x1.b674c8p-2,
+-	     0x1.afbcd4p-2,
+-	     0x1.a911f0p-2,
+-	     0x1.a27456p-2,
+-	     0x1.9be438p-2,
+-	     0x1.9561c8p-2,
+-	     0x1.8eed36p-2,
+-	     0x1.8886b2p-2,
+-	     0x1.822e66p-2,
+-	     0x1.7be47ap-2,
+-	     0x1.75a91ap-2,
+-	     0x1.6f7c6ap-2,
+-	     0x1.695e8cp-2,
+-	     0x1.634fa6p-2,
+-	     0x1.5d4fd4p-2,
+-	     0x1.575f34p-2,
+-	     0x1.517de6p-2,
+-	     0x1.4bac00p-2,
+-	     0x1.45e99cp-2,
+-	     0x1.4036d0p-2,
+-	     0x1.3a93b2p-2,
+-	     0x1.350052p-2,
+-	     0x1.2f7cc4p-2,
+-	     0x1.2a0916p-2,
+-	     0x1.24a554p-2,
+-	     0x1.1f518ap-2,
+-	     0x1.1a0dc6p-2,
+-	     0x1.14da0ap-2,
+-	     0x1.0fb662p-2,
+-	     0x1.0aa2d0p-2,
+-	     0x1.059f5ap-2,
+-	     0x1.00ac00p-2,
+-	     0x1.f79184p-3,
+-	     0x1.edeb40p-3,
+-	     0x1.e46530p-3,
+-	     0x1.daff4ap-3,
+-	     0x1.d1b982p-3,
+-	     0x1.c893cep-3,
+-	     0x1.bf8e1cp-3,
+-	     0x1.b6a856p-3,
+-	     0x1.ade26cp-3,
+-	     0x1.a53c42p-3,
+-	     0x1.9cb5bep-3,
+-	     0x1.944ec2p-3,
+-	     0x1.8c0732p-3,
+-	     0x1.83deeap-3,
+-	     0x1.7bd5c8p-3,
+-	     0x1.73eba4p-3,
+-	     0x1.6c2056p-3,
+-	     0x1.6473b6p-3,
+-	     0x1.5ce596p-3,
+-	     0x1.5575c8p-3,
+-	     0x1.4e241ep-3,
+-	     0x1.46f066p-3,
+-	     0x1.3fda6cp-3,
+-	     0x1.38e1fap-3,
+-	     0x1.3206dcp-3,
+-	     0x1.2b48dap-3,
+-	     0x1.24a7b8p-3,
+-	     0x1.1e233ep-3,
+-	     0x1.17bb2cp-3,
+-	     0x1.116f48p-3,
+-	     0x1.0b3f52p-3,
+-	     0x1.052b0cp-3,
+-	     0x1.fe6460p-4,
+-	     0x1.f2a902p-4,
+-	     0x1.e72372p-4,
+-	     0x1.dbd32ap-4,
+-	     0x1.d0b7a0p-4,
+-	     0x1.c5d04ap-4,
+-	     0x1.bb1c98p-4,
+-	     0x1.b09bfcp-4,
+-	     0x1.a64de6p-4,
+-	     0x1.9c31c6p-4,
+-	     0x1.92470ap-4,
+-	     0x1.888d1ep-4,
+-	     0x1.7f036cp-4,
+-	     0x1.75a960p-4,
+-	     0x1.6c7e64p-4,
+-	     0x1.6381e2p-4,
+-	     0x1.5ab342p-4,
+-	     0x1.5211ecp-4,
+-	     0x1.499d48p-4,
+-	     0x1.4154bcp-4,
+-	     0x1.3937b2p-4,
+-	     0x1.31458ep-4,
+-	     0x1.297dbap-4,
+-	     0x1.21df9ap-4,
+-	     0x1.1a6a96p-4,
+-	     0x1.131e14p-4,
+-	     0x1.0bf97ep-4,
+-	     0x1.04fc3ap-4,
+-	     0x1.fc4b5ep-5,
+-	     0x1.eeea8cp-5,
+-	     0x1.e1d4d0p-5,
+-	     0x1.d508fap-5,
+-	     0x1.c885e0p-5,
+-	     0x1.bc4a54p-5,
+-	     0x1.b05530p-5,
+-	     0x1.a4a54ap-5,
+-	     0x1.99397ap-5,
+-	     0x1.8e109cp-5,
+-	     0x1.83298ep-5,
+-	     0x1.78832cp-5,
+-	     0x1.6e1c58p-5,
+-	     0x1.63f3f6p-5,
+-	     0x1.5a08e8p-5,
+-	     0x1.505a18p-5,
+-	     0x1.46e66cp-5,
+-	     0x1.3dacd2p-5,
+-	     0x1.34ac36p-5,
+-	     0x1.2be38cp-5,
+-	     0x1.2351c2p-5,
+-	     0x1.1af5d2p-5,
+-	     0x1.12ceb4p-5,
+-	     0x1.0adb60p-5,
+-	     0x1.031ad6p-5,
+-	     0x1.f7182ap-6,
+-	     0x1.e85c44p-6,
+-	     0x1.da0006p-6,
+-	     0x1.cc0180p-6,
+-	     0x1.be5ecep-6,
+-	     0x1.b1160ap-6,
+-	     0x1.a4255ap-6,
+-	     0x1.978ae8p-6,
+-	     0x1.8b44e6p-6,
+-	     0x1.7f5188p-6,
+-	     0x1.73af0cp-6,
+-	     0x1.685bb6p-6,
+-	     0x1.5d55ccp-6,
+-	     0x1.529b9ep-6,
+-	     0x1.482b84p-6,
+-	     0x1.3e03d8p-6,
+-	     0x1.3422fep-6,
+-	     0x1.2a875cp-6,
+-	     0x1.212f62p-6,
+-	     0x1.181984p-6,
+-	     0x1.0f443ep-6,
+-	     0x1.06ae14p-6,
+-	     0x1.fcab14p-7,
+-	     0x1.ec7262p-7,
+-	     0x1.dcaf36p-7,
+-	     0x1.cd5ecap-7,
+-	     0x1.be7e5ap-7,
+-	     0x1.b00b38p-7,
+-	     0x1.a202bep-7,
+-	     0x1.94624ep-7,
+-	     0x1.87275ep-7,
+-	     0x1.7a4f6ap-7,
+-	     0x1.6dd7fep-7,
+-	     0x1.61beaep-7,
+-	     0x1.56011cp-7,
+-	     0x1.4a9cf6p-7,
+-	     0x1.3f8ff6p-7,
+-	     0x1.34d7dcp-7,
+-	     0x1.2a727ap-7,
+-	     0x1.205dacp-7,
+-	     0x1.169756p-7,
+-	     0x1.0d1d6ap-7,
+-	     0x1.03ede2p-7,
+-	     0x1.f60d8ap-8,
+-	     0x1.e4cc4ap-8,
+-	     0x1.d4143ap-8,
+-	     0x1.c3e1a6p-8,
+-	     0x1.b430ecp-8,
+-	     0x1.a4fe84p-8,
+-	     0x1.9646f4p-8,
+-	     0x1.8806d8p-8,
+-	     0x1.7a3adep-8,
+-	     0x1.6cdfccp-8,
+-	     0x1.5ff276p-8,
+-	     0x1.536fc2p-8,
+-	     0x1.4754acp-8,
+-	     0x1.3b9e40p-8,
+-	     0x1.30499cp-8,
+-	     0x1.2553eep-8,
+-	     0x1.1aba78p-8,
+-	     0x1.107a8cp-8,
+-	     0x1.06918cp-8,
+-	     0x1.f9f9d0p-9,
+-	     0x1.e77448p-9,
+-	     0x1.d58da6p-9,
+-	     0x1.c4412cp-9,
+-	     0x1.b38a3ap-9,
+-	     0x1.a36454p-9,
+-	     0x1.93cb12p-9,
+-	     0x1.84ba30p-9,
+-	     0x1.762d84p-9,
+-	     0x1.682100p-9,
+-	     0x1.5a90b0p-9,
+-	     0x1.4d78bcp-9,
+-	     0x1.40d564p-9,
+-	     0x1.34a306p-9,
+-	     0x1.28de12p-9,
+-	     0x1.1d8318p-9,
+-	     0x1.128ebap-9,
+-	     0x1.07fdb4p-9,
+-	     0x1.fb99b8p-10,
+-	     0x1.e7f232p-10,
+-	     0x1.d4fed8p-10,
+-	     0x1.c2b9d0p-10,
+-	     0x1.b11d70p-10,
+-	     0x1.a02436p-10,
+-	     0x1.8fc8c8p-10,
+-	     0x1.8005f0p-10,
+-	     0x1.70d6a4p-10,
+-	     0x1.6235fcp-10,
+-	     0x1.541f34p-10,
+-	     0x1.468daep-10,
+-	     0x1.397ceep-10,
+-	     0x1.2ce898p-10,
+-	     0x1.20cc76p-10,
+-	     0x1.15246ep-10,
+-	     0x1.09ec86p-10,
+-	     0x1.fe41cep-11,
+-	     0x1.e97ba4p-11,
+-	     0x1.d57f52p-11,
+-	     0x1.c245d4p-11,
+-	     0x1.afc85ep-11,
+-	     0x1.9e0058p-11,
+-	     0x1.8ce75ep-11,
+-	     0x1.7c7744p-11,
+-	     0x1.6caa0ep-11,
+-	     0x1.5d79ecp-11,
+-	     0x1.4ee142p-11,
+-	     0x1.40daa4p-11,
+-	     0x1.3360ccp-11,
+-	     0x1.266ea8p-11,
+-	     0x1.19ff46p-11,
+-	     0x1.0e0de8p-11,
+-	     0x1.0295f0p-11,
+-	     0x1.ef25d4p-12,
+-	     0x1.da0110p-12,
+-	     0x1.c5b542p-12,
+-	     0x1.b23a5ap-12,
+-	     0x1.9f8894p-12,
+-	     0x1.8d986ap-12,
+-	     0x1.7c629ap-12,
+-	     0x1.6be022p-12,
+-	     0x1.5c0a38p-12,
+-	     0x1.4cda54p-12,
+-	     0x1.3e4a24p-12,
+-	     0x1.305390p-12,
+-	     0x1.22f0b4p-12,
+-	     0x1.161be4p-12,
+-	     0x1.09cfa4p-12,
+-	     0x1.fc0d56p-13,
+-	     0x1.e577bcp-13,
+-	     0x1.cfd4a6p-13,
+-	     0x1.bb1a96p-13,
+-	     0x1.a74068p-13,
+-	     0x1.943d4ap-13,
+-	     0x1.8208bcp-13,
+-	     0x1.709a8ep-13,
+-	     0x1.5feadap-13,
+-	     0x1.4ff208p-13,
+-	     0x1.40a8c2p-13,
+-	     0x1.3207fcp-13,
+-	     0x1.2408eap-13,
+-	     0x1.16a502p-13,
+-	     0x1.09d5f8p-13,
+-	     0x1.fb2b7ap-14,
+-	     0x1.e3bcf4p-14,
+-	     0x1.cd5528p-14,
+-	     0x1.b7e946p-14,
+-	     0x1.a36eecp-14,
+-	     0x1.8fdc1cp-14,
+-	     0x1.7d2738p-14,
+-	     0x1.6b4702p-14,
+-	     0x1.5a329cp-14,
+-	     0x1.49e178p-14,
+-	     0x1.3a4b60p-14,
+-	     0x1.2b6876p-14,
+-	     0x1.1d3120p-14,
+-	     0x1.0f9e1cp-14,
+-	     0x1.02a868p-14,
+-	     0x1.ec929ap-15,
+-	     0x1.d4f4b4p-15,
+-	     0x1.be6abcp-15,
+-	     0x1.a8e8ccp-15,
+-	     0x1.94637ep-15,
+-	     0x1.80cfdcp-15,
+-	     0x1.6e2368p-15,
+-	     0x1.5c540cp-15,
+-	     0x1.4b581cp-15,
+-	     0x1.3b2652p-15,
+-	     0x1.2bb5ccp-15,
+-	     0x1.1cfe02p-15,
+-	     0x1.0ef6c4p-15,
+-	     0x1.019842p-15,
+-	     0x1.e9b5e8p-16,
+-	     0x1.d16f58p-16,
+-	     0x1.ba4f04p-16,
+-	     0x1.a447b8p-16,
+-	     0x1.8f4cccp-16,
+-	     0x1.7b5224p-16,
+-	     0x1.684c22p-16,
+-	     0x1.562facp-16,
+-	     0x1.44f21ep-16,
+-	     0x1.34894ap-16,
+-	     0x1.24eb72p-16,
+-	     0x1.160f44p-16,
+-	     0x1.07ebd2p-16,
+-	     0x1.f4f12ep-17,
+-	     0x1.db5ad0p-17,
+-	     0x1.c304f0p-17,
+-	     0x1.abe09ep-17,
+-	     0x1.95df98p-17,
+-	     0x1.80f43ap-17,
+-	     0x1.6d1178p-17,
+-	     0x1.5a2ae0p-17,
+-	     0x1.483488p-17,
+-	     0x1.372310p-17,
+-	     0x1.26eb9ep-17,
+-	     0x1.1783cep-17,
+-	     0x1.08e1bap-17,
+-	     0x1.f5f7d8p-18,
+-	     0x1.db92b6p-18,
+-	     0x1.c282cep-18,
+-	     0x1.aab7acp-18,
+-	     0x1.94219cp-18,
+-	     0x1.7eb1a2p-18,
+-	     0x1.6a5972p-18,
+-	     0x1.570b6ap-18,
+-	     0x1.44ba86p-18,
+-	     0x1.335a62p-18,
+-	     0x1.22df2ap-18,
+-	     0x1.133d96p-18,
+-	     0x1.046aeap-18,
+-	     0x1.ecb9d0p-19,
+-	     0x1.d21398p-19,
+-	     0x1.b8d094p-19,
+-	     0x1.a0df10p-19,
+-	     0x1.8a2e26p-19,
+-	     0x1.74adc8p-19,
+-	     0x1.604ea8p-19,
+-	     0x1.4d0232p-19,
+-	     0x1.3aba86p-19,
+-	     0x1.296a70p-19,
+-	     0x1.190562p-19,
+-	     0x1.097f62p-19,
+-	     0x1.f59a20p-20,
+-	     0x1.d9c736p-20,
+-	     0x1.bf716cp-20,
+-	     0x1.a6852cp-20,
+-	     0x1.8eefd8p-20,
+-	     0x1.789fb8p-20,
+-	     0x1.6383f8p-20,
+-	     0x1.4f8c96p-20,
+-	     0x1.3caa62p-20,
+-	     0x1.2acee2p-20,
+-	     0x1.19ec60p-20,
+-	     0x1.09f5d0p-20,
+-	     0x1.f5bd96p-21,
+-	     0x1.d9371ep-21,
+-	     0x1.be41dep-21,
+-	     0x1.a4c89ep-21,
+-	     0x1.8cb738p-21,
+-	     0x1.75fa8ep-21,
+-	     0x1.608078p-21,
+-	     0x1.4c37c0p-21,
+-	     0x1.39100ep-21,
+-	     0x1.26f9e0p-21,
+-	     0x1.15e682p-21,
+-	     0x1.05c804p-21,
+-	     0x1.ed2254p-22,
+-	     0x1.d06ad6p-22,
+-	     0x1.b551c8p-22,
+-	     0x1.9bc0a0p-22,
+-	     0x1.83a200p-22,
+-	     0x1.6ce1aap-22,
+-	     0x1.576c72p-22,
+-	     0x1.43302cp-22,
+-	     0x1.301ba2p-22,
+-	     0x1.1e1e86p-22,
+-	     0x1.0d2966p-22,
+-	     0x1.fa5b50p-23,
+-	     0x1.dc3ae4p-23,
+-	     0x1.bfd756p-23,
+-	     0x1.a517dap-23,
+-	     0x1.8be4f8p-23,
+-	     0x1.74287ep-23,
+-	     0x1.5dcd66p-23,
+-	     0x1.48bfd4p-23,
+-	     0x1.34ecf8p-23,
+-	     0x1.224310p-23,
+-	     0x1.10b148p-23,
+-  },
+-};
+diff --git a/sysdeps/aarch64/fpu/vecmath_config.h b/sysdeps/aarch64/fpu/vecmath_config.h
+index 7f0a8aa5f2..862eefaf8f 100644
+--- a/sysdeps/aarch64/fpu/vecmath_config.h
++++ b/sysdeps/aarch64/fpu/vecmath_config.h
+@@ -75,49 +75,37 @@ extern const struct v_log10_data
+   } table[1 << V_LOG10_TABLE_BITS];
+ } __v_log10_data attribute_hidden;
+ 
+-extern const struct erff_data
++extern const struct v_erff_data
+ {
+   struct
+   {
+     float erf, scale;
+   } tab[513];
+-} __erff_data attribute_hidden;
++} __v_erff_data attribute_hidden;
+ 
+-extern const struct sv_erff_data
+-{
+-  float erf[513];
+-  float scale[513];
+-} __sv_erff_data attribute_hidden;
+-
+-extern const struct erf_data
++extern const struct v_erf_data
+ {
+   struct
+   {
+     double erf, scale;
+   } tab[769];
+-} __erf_data attribute_hidden;
+-
+-extern const struct sv_erf_data
+-{
+-  double erf[769];
+-  double scale[769];
+-} __sv_erf_data attribute_hidden;
++} __v_erf_data attribute_hidden;
+ 
+-extern const struct erfc_data
++extern const struct v_erfc_data
+ {
+   struct
+   {
+     double erfc, scale;
+   } tab[3488];
+-} __erfc_data attribute_hidden;
++} __v_erfc_data attribute_hidden;
+ 
+-extern const struct erfcf_data
++extern const struct v_erfcf_data
+ {
+   struct
+   {
+     float erfc, scale;
+   } tab[645];
+-} __erfcf_data attribute_hidden;
++} __v_erfcf_data attribute_hidden;
+ 
+ /* Some data for AdvSIMD and SVE pow's internal exp and log.  */
+ #define V_POW_EXP_TABLE_BITS 8
+
+commit 4148940836eee07d1138da6f1805280eeb8217e3
+Author: Pierre Blanchard <pierre.blanchard@arm.com>
+Date:   Mon Dec 9 15:53:04 2024 +0000
+
+    AArch64: Improve codegen in AdvSIMD pow
+    
+    Remove spurious ADRP. Improve memory access by shuffling constants and
+    using more indexed MLAs.
+    
+    A few more optimisation with no impact on accuracy
+    - force fmas contraction
+    - switch from shift-aided rint to rint instruction
+    
+    Between 1 and 5% throughput improvement on Neoverse
+    V1 depending on benchmark.
+    
+    (cherry picked from commit 569cfaaf4984ae70b23c61ee28a609b5aef93fea)
+
+diff --git a/sysdeps/aarch64/fpu/pow_advsimd.c b/sysdeps/aarch64/fpu/pow_advsimd.c
+index 3c91e3e183..81e134ac2f 100644
+--- a/sysdeps/aarch64/fpu/pow_advsimd.c
++++ b/sysdeps/aarch64/fpu/pow_advsimd.c
+@@ -22,9 +22,6 @@
+ /* Defines parameters of the approximation and scalar fallback.  */
+ #include "finite_pow.h"
+ 
+-#define VecSmallExp v_u64 (SmallExp)
+-#define VecThresExp v_u64 (ThresExp)
+-
+ #define VecSmallPowX v_u64 (SmallPowX)
+ #define VecThresPowX v_u64 (ThresPowX)
+ #define VecSmallPowY v_u64 (SmallPowY)
+@@ -32,36 +29,48 @@
+ 
+ static const struct data
+ {
+-  float64x2_t log_poly[6];
+-  float64x2_t exp_poly[3];
+-  float64x2_t ln2_hi, ln2_lo;
+-  float64x2_t shift, inv_ln2_n, ln2_hi_n, ln2_lo_n, small_powx;
+   uint64x2_t inf;
++  float64x2_t small_powx;
++  uint64x2_t offset, mask;
++  uint64x2_t mask_sub_0, mask_sub_1;
++  float64x2_t log_c0, log_c2, log_c4, log_c5;
++  double log_c1, log_c3;
++  double ln2_lo, ln2_hi;
++  uint64x2_t small_exp, thres_exp;
++  double ln2_lo_n, ln2_hi_n;
++  double inv_ln2_n, exp_c2;
++  float64x2_t exp_c0, exp_c1;
+ } data = {
++  /* Power threshold.  */
++  .inf = V2 (0x7ff0000000000000),
++  .small_powx = V2 (0x1p-126),
++  .offset = V2 (Off),
++  .mask = V2 (0xfffULL << 52),
++  .mask_sub_0 = V2 (1ULL << 52),
++  .mask_sub_1 = V2 (52ULL << 52),
+   /* Coefficients copied from v_pow_log_data.c
+      relative error: 0x1.11922ap-70 in [-0x1.6bp-8, 0x1.6bp-8]
+      Coefficients are scaled to match the scaling during evaluation.  */
+-  .log_poly
+-  = { V2 (0x1.555555555556p-2 * -2), V2 (-0x1.0000000000006p-2 * -2),
+-      V2 (0x1.999999959554ep-3 * 4), V2 (-0x1.555555529a47ap-3 * 4),
+-      V2 (0x1.2495b9b4845e9p-3 * -8), V2 (-0x1.0002b8b263fc3p-3 * -8) },
+-  .ln2_hi = V2 (0x1.62e42fefa3800p-1),
+-  .ln2_lo = V2 (0x1.ef35793c76730p-45),
++  .log_c0 = V2 (0x1.555555555556p-2 * -2),
++  .log_c1 = -0x1.0000000000006p-2 * -2,
++  .log_c2 = V2 (0x1.999999959554ep-3 * 4),
++  .log_c3 = -0x1.555555529a47ap-3 * 4,
++  .log_c4 = V2 (0x1.2495b9b4845e9p-3 * -8),
++  .log_c5 = V2 (-0x1.0002b8b263fc3p-3 * -8),
++  .ln2_hi = 0x1.62e42fefa3800p-1,
++  .ln2_lo = 0x1.ef35793c76730p-45,
+   /* Polynomial coefficients: abs error: 1.43*2^-58, ulp error: 0.549
+      (0.550 without fma) if |x| < ln2/512.  */
+-  .exp_poly = { V2 (0x1.fffffffffffd4p-2), V2 (0x1.5555571d6ef9p-3),
+-		V2 (0x1.5555576a5adcep-5) },
+-  .shift = V2 (0x1.8p52), /* round to nearest int. without intrinsics.  */
+-  .inv_ln2_n = V2 (0x1.71547652b82fep8), /* N/ln2.  */
+-  .ln2_hi_n = V2 (0x1.62e42fefc0000p-9), /* ln2/N.  */
+-  .ln2_lo_n = V2 (-0x1.c610ca86c3899p-45),
+-  .small_powx = V2 (0x1p-126),
+-  .inf = V2 (0x7ff0000000000000)
++  .exp_c0 = V2 (0x1.fffffffffffd4p-2),
++  .exp_c1 = V2 (0x1.5555571d6ef9p-3),
++  .exp_c2 = 0x1.5555576a5adcep-5,
++  .small_exp = V2 (0x3c90000000000000),
++  .thres_exp = V2 (0x03f0000000000000),
++  .inv_ln2_n = 0x1.71547652b82fep8, /* N/ln2.  */
++  .ln2_hi_n = 0x1.62e42fefc0000p-9, /* ln2/N.  */
++  .ln2_lo_n = -0x1.c610ca86c3899p-45,
+ };
+ 
+-#define A(i) data.log_poly[i]
+-#define C(i) data.exp_poly[i]
+-
+ /* This version implements an algorithm close to scalar pow but
+    - does not implement the trick in the exp's specialcase subroutine to avoid
+      double-rounding,
+@@ -91,10 +100,9 @@ v_log_inline (uint64x2_t ix, float64x2_t *tail, const struct data *d)
+   /* x = 2^k z; where z is in range [OFF,2*OFF) and exact.
+      The range is split into N subintervals.
+      The ith subinterval contains z and c is near its center.  */
+-  uint64x2_t tmp = vsubq_u64 (ix, v_u64 (Off));
+-  int64x2_t k
+-      = vshrq_n_s64 (vreinterpretq_s64_u64 (tmp), 52); /* arithmetic shift.  */
+-  uint64x2_t iz = vsubq_u64 (ix, vandq_u64 (tmp, v_u64 (0xfffULL << 52)));
++  uint64x2_t tmp = vsubq_u64 (ix, d->offset);
++  int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (tmp), 52);
++  uint64x2_t iz = vsubq_u64 (ix, vandq_u64 (tmp, d->mask));
+   float64x2_t z = vreinterpretq_f64_u64 (iz);
+   float64x2_t kd = vcvtq_f64_s64 (k);
+   /* log(x) = k*Ln2 + log(c) + log1p(z/c-1).  */
+@@ -105,9 +113,10 @@ v_log_inline (uint64x2_t ix, float64x2_t *tail, const struct data *d)
+      |z/c - 1| < 1/N, so r = z/c - 1 is exactly representible.  */
+   float64x2_t r = vfmaq_f64 (v_f64 (-1.0), z, invc);
+   /* k*Ln2 + log(c) + r.  */
+-  float64x2_t t1 = vfmaq_f64 (logc, kd, d->ln2_hi);
++  float64x2_t ln2 = vld1q_f64 (&d->ln2_lo);
++  float64x2_t t1 = vfmaq_laneq_f64 (logc, kd, ln2, 1);
+   float64x2_t t2 = vaddq_f64 (t1, r);
+-  float64x2_t lo1 = vfmaq_f64 (logctail, kd, d->ln2_lo);
++  float64x2_t lo1 = vfmaq_laneq_f64 (logctail, kd, ln2, 0);
+   float64x2_t lo2 = vaddq_f64 (vsubq_f64 (t1, t2), r);
+   /* Evaluation is optimized assuming superscalar pipelined execution.  */
+   float64x2_t ar = vmulq_f64 (v_f64 (-0.5), r);
+@@ -118,9 +127,10 @@ v_log_inline (uint64x2_t ix, float64x2_t *tail, const struct data *d)
+   float64x2_t lo3 = vfmaq_f64 (vnegq_f64 (ar2), ar, r);
+   float64x2_t lo4 = vaddq_f64 (vsubq_f64 (t2, hi), ar2);
+   /* p = log1p(r) - r - A[0]*r*r.  */
+-  float64x2_t a56 = vfmaq_f64 (A (4), r, A (5));
+-  float64x2_t a34 = vfmaq_f64 (A (2), r, A (3));
+-  float64x2_t a12 = vfmaq_f64 (A (0), r, A (1));
++  float64x2_t odd_coeffs = vld1q_f64 (&d->log_c1);
++  float64x2_t a56 = vfmaq_f64 (d->log_c4, r, d->log_c5);
++  float64x2_t a34 = vfmaq_laneq_f64 (d->log_c2, r, odd_coeffs, 1);
++  float64x2_t a12 = vfmaq_laneq_f64 (d->log_c0, r, odd_coeffs, 0);
+   float64x2_t p = vfmaq_f64 (a34, ar2, a56);
+   p = vfmaq_f64 (a12, ar2, p);
+   p = vmulq_f64 (ar3, p);
+@@ -140,28 +150,28 @@ exp_special_case (float64x2_t x, float64x2_t xtail)
+ 
+ /* Computes sign*exp(x+xtail) where |xtail| < 2^-8/N and |xtail| <= |x|.  */
+ static inline float64x2_t
+-v_exp_inline (float64x2_t x, float64x2_t xtail, const struct data *d)
++v_exp_inline (float64x2_t x, float64x2_t neg_xtail, const struct data *d)
+ {
+   /* Fallback to scalar exp_inline for all lanes if any lane
+      contains value of x s.t. |x| <= 2^-54 or >= 512.  */
+-  uint64x2_t abstop
+-      = vshrq_n_u64 (vandq_u64 (vreinterpretq_u64_f64 (x), d->inf), 52);
+-  uint64x2_t uoflowx
+-      = vcgeq_u64 (vsubq_u64 (abstop, VecSmallExp), VecThresExp);
++  uint64x2_t uoflowx = vcgeq_u64 (
++      vsubq_u64 (vreinterpretq_u64_f64 (vabsq_f64 (x)), d->small_exp),
++      d->thres_exp);
+   if (__glibc_unlikely (v_any_u64 (uoflowx)))
+-    return exp_special_case (x, xtail);
++    return exp_special_case (x, vnegq_f64 (neg_xtail));
+ 
+   /* exp(x) = 2^(k/N) * exp(r), with exp(r) in [2^(-1/2N),2^(1/2N)].  */
+   /* x = ln2/N*k + r, with k integer and r in [-ln2/2N, ln2/2N].  */
+-  float64x2_t z = vmulq_f64 (d->inv_ln2_n, x);
+   /* z - kd is in [-1, 1] in non-nearest rounding modes.  */
+-  float64x2_t kd = vaddq_f64 (z, d->shift);
+-  uint64x2_t ki = vreinterpretq_u64_f64 (kd);
+-  kd = vsubq_f64 (kd, d->shift);
+-  float64x2_t r = vfmsq_f64 (x, kd, d->ln2_hi_n);
+-  r = vfmsq_f64 (r, kd, d->ln2_lo_n);
++  float64x2_t exp_consts = vld1q_f64 (&d->inv_ln2_n);
++  float64x2_t z = vmulq_laneq_f64 (x, exp_consts, 0);
++  float64x2_t kd = vrndnq_f64 (z);
++  uint64x2_t ki = vreinterpretq_u64_s64 (vcvtaq_s64_f64 (z));
++  float64x2_t ln2_n = vld1q_f64 (&d->ln2_lo_n);
++  float64x2_t r = vfmsq_laneq_f64 (x, kd, ln2_n, 1);
++  r = vfmsq_laneq_f64 (r, kd, ln2_n, 0);
+   /* The code assumes 2^-200 < |xtail| < 2^-8/N.  */
+-  r = vaddq_f64 (r, xtail);
++  r = vsubq_f64 (r, neg_xtail);
+   /* 2^(k/N) ~= scale.  */
+   uint64x2_t idx = vandq_u64 (ki, v_u64 (N_EXP - 1));
+   uint64x2_t top = vshlq_n_u64 (ki, 52 - V_POW_EXP_TABLE_BITS);
+@@ -170,8 +180,8 @@ v_exp_inline (float64x2_t x, float64x2_t xtail, const struct data *d)
+   sbits = vaddq_u64 (sbits, top);
+   /* exp(x) = 2^(k/N) * exp(r) ~= scale + scale * (exp(r) - 1).  */
+   float64x2_t r2 = vmulq_f64 (r, r);
+-  float64x2_t tmp = vfmaq_f64 (C (1), r, C (2));
+-  tmp = vfmaq_f64 (C (0), r, tmp);
++  float64x2_t tmp = vfmaq_laneq_f64 (d->exp_c1, r, exp_consts, 1);
++  tmp = vfmaq_f64 (d->exp_c0, r, tmp);
+   tmp = vfmaq_f64 (r, r2, tmp);
+   float64x2_t scale = vreinterpretq_f64_u64 (sbits);
+   /* Note: tmp == 0 or |tmp| > 2^-200 and scale > 2^-739, so there
+@@ -230,8 +240,8 @@ float64x2_t VPCS_ATTR V_NAME_D2 (pow) (float64x2_t x, float64x2_t y)
+ 	{
+ 	  /* Normalize subnormal x so exponent becomes negative.  */
+ 	  uint64x2_t vix_norm = vreinterpretq_u64_f64 (
+-	      vabsq_f64 (vmulq_f64 (x, vcvtq_f64_u64 (v_u64 (1ULL << 52)))));
+-	  vix_norm = vsubq_u64 (vix_norm, v_u64 (52ULL << 52));
++	      vabsq_f64 (vmulq_f64 (x, vcvtq_f64_u64 (d->mask_sub_0))));
++	  vix_norm = vsubq_u64 (vix_norm, d->mask_sub_1);
+ 	  vix = vbslq_u64 (sub_x, vix_norm, vix);
+ 	}
+     }
+@@ -242,8 +252,7 @@ float64x2_t VPCS_ATTR V_NAME_D2 (pow) (float64x2_t x, float64x2_t y)
+ 
+   /* Vector Exp(y_loghi, y_loglo).  */
+   float64x2_t vehi = vmulq_f64 (y, vhi);
+-  float64x2_t velo = vmulq_f64 (y, vlo);
+   float64x2_t vemi = vfmsq_f64 (vehi, y, vhi);
+-  velo = vsubq_f64 (velo, vemi);
+-  return v_exp_inline (vehi, velo, d);
++  float64x2_t neg_velo = vfmsq_f64 (vemi, y, vlo);
++  return v_exp_inline (vehi, neg_velo, d);
+ }
+
+commit ae04f63087415eba9060143608b03db693854bb7
+Author: Pierre Blanchard <pierre.blanchard@arm.com>
+Date:   Mon Dec 9 15:54:34 2024 +0000
+
+    AArch64: Improve codegen in AdvSIMD logs
+    
+    Remove spurious ADRP and a few MOVs.
+    Reduce memory access by using more indexed MLAs in polynomial.
+    Align notation so that algorithms are easier to compare.
+    Speedup on Neoverse V1 for log10 (8%), log (8.5%), and log2 (10%).
+    Update error threshold in AdvSIMD log (now matches SVE log).
+    
+    (cherry picked from commit 8eb5ad2ebc94cc5bedbac57c226c02ec254479c7)
+
+diff --git a/sysdeps/aarch64/fpu/log10_advsimd.c b/sysdeps/aarch64/fpu/log10_advsimd.c
+index c065aaebae..f69ed21c39 100644
+--- a/sysdeps/aarch64/fpu/log10_advsimd.c
++++ b/sysdeps/aarch64/fpu/log10_advsimd.c
+@@ -18,36 +18,36 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include "v_math.h"
+-#include "poly_advsimd_f64.h"
+-
+-#define N (1 << V_LOG10_TABLE_BITS)
+ 
+ static const struct data
+ {
+-  uint64x2_t min_norm;
++  uint64x2_t off, sign_exp_mask, offset_lower_bound;
+   uint32x4_t special_bound;
+-  float64x2_t poly[5];
+-  float64x2_t invln10, log10_2, ln2;
+-  uint64x2_t sign_exp_mask;
++  double invln10, log10_2;
++  double c1, c3;
++  float64x2_t c0, c2, c4;
+ } data = {
+   /* Computed from log coefficients divided by log(10) then rounded to double
+      precision.  */
+-  .poly = { V2 (-0x1.bcb7b1526e506p-3), V2 (0x1.287a7636be1d1p-3),
+-	    V2 (-0x1.bcb7b158af938p-4), V2 (0x1.63c78734e6d07p-4),
+-	    V2 (-0x1.287461742fee4p-4) },
+-  .ln2 = V2 (0x1.62e42fefa39efp-1),
+-  .invln10 = V2 (0x1.bcb7b1526e50ep-2),
+-  .log10_2 = V2 (0x1.34413509f79ffp-2),
+-  .min_norm = V2 (0x0010000000000000), /* asuint64(0x1p-1022).  */
+-  .special_bound = V4 (0x7fe00000),    /* asuint64(inf) - min_norm.  */
++  .c0 = V2 (-0x1.bcb7b1526e506p-3),
++  .c1 = 0x1.287a7636be1d1p-3,
++  .c2 = V2 (-0x1.bcb7b158af938p-4),
++  .c3 = 0x1.63c78734e6d07p-4,
++  .c4 = V2 (-0x1.287461742fee4p-4),
++  .invln10 = 0x1.bcb7b1526e50ep-2,
++  .log10_2 = 0x1.34413509f79ffp-2,
++  .off = V2 (0x3fe6900900000000),
+   .sign_exp_mask = V2 (0xfff0000000000000),
++  /* Lower bound is 0x0010000000000000. For
++     optimised register use subnormals are detected after offset has been
++     subtracted, so lower bound - offset (which wraps around).  */
++  .offset_lower_bound = V2 (0x0010000000000000 - 0x3fe6900900000000),
++  .special_bound = V4 (0x7fe00000), /* asuint64(inf) - 0x0010000000000000.  */
+ };
+ 
+-#define Off v_u64 (0x3fe6900900000000)
++#define N (1 << V_LOG10_TABLE_BITS)
+ #define IndexMask (N - 1)
+ 
+-#define T(s, i) __v_log10_data.s[i]
+-
+ struct entry
+ {
+   float64x2_t invc;
+@@ -70,10 +70,11 @@ lookup (uint64x2_t i)
+ }
+ 
+ static float64x2_t VPCS_ATTR NOINLINE
+-special_case (float64x2_t x, float64x2_t y, float64x2_t hi, float64x2_t r2,
+-	      uint32x2_t special)
++special_case (float64x2_t hi, uint64x2_t u_off, float64x2_t y, float64x2_t r2,
++	      uint32x2_t special, const struct data *d)
+ {
+-  return v_call_f64 (log10, x, vfmaq_f64 (hi, r2, y), vmovl_u32 (special));
++  float64x2_t x = vreinterpretq_f64_u64 (vaddq_u64 (u_off, d->off));
++  return v_call_f64 (log10, x, vfmaq_f64 (hi, y, r2), vmovl_u32 (special));
+ }
+ 
+ /* Fast implementation of double-precision vector log10
+@@ -85,19 +86,24 @@ special_case (float64x2_t x, float64x2_t y, float64x2_t hi, float64x2_t r2,
+ float64x2_t VPCS_ATTR V_NAME_D1 (log10) (float64x2_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+-  uint64x2_t ix = vreinterpretq_u64_f64 (x);
+-  uint32x2_t special = vcge_u32 (vsubhn_u64 (ix, d->min_norm),
+-				 vget_low_u32 (d->special_bound));
++
++  /* To avoid having to mov x out of the way, keep u after offset has been
++     applied, and recover x by adding the offset back in the special-case
++     handler.  */
++  uint64x2_t u = vreinterpretq_u64_f64 (x);
++  uint64x2_t u_off = vsubq_u64 (u, d->off);
+ 
+   /* x = 2^k z; where z is in range [OFF,2*OFF) and exact.
+      The range is split into N subintervals.
+      The ith subinterval contains z and c is near its center.  */
+-  uint64x2_t tmp = vsubq_u64 (ix, Off);
+-  int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (tmp), 52);
+-  uint64x2_t iz = vsubq_u64 (ix, vandq_u64 (tmp, d->sign_exp_mask));
++  int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (u_off), 52);
++  uint64x2_t iz = vsubq_u64 (u, vandq_u64 (u_off, d->sign_exp_mask));
+   float64x2_t z = vreinterpretq_f64_u64 (iz);
+ 
+-  struct entry e = lookup (tmp);
++  struct entry e = lookup (u_off);
++
++  uint32x2_t special = vcge_u32 (vsubhn_u64 (u_off, d->offset_lower_bound),
++				 vget_low_u32 (d->special_bound));
+ 
+   /* log10(x) = log1p(z/c-1)/log(10) + log10(c) + k*log10(2).  */
+   float64x2_t r = vfmaq_f64 (v_f64 (-1.0), z, e.invc);
+@@ -105,17 +111,22 @@ float64x2_t VPCS_ATTR V_NAME_D1 (log10) (float64x2_t x)
+ 
+   /* hi = r / log(10) + log10(c) + k*log10(2).
+      Constants in v_log10_data.c are computed (in extended precision) as
+-     e.log10c := e.logc * ivln10.  */
+-  float64x2_t w = vfmaq_f64 (e.log10c, r, d->invln10);
++     e.log10c := e.logc * invln10.  */
++  float64x2_t cte = vld1q_f64 (&d->invln10);
++  float64x2_t hi = vfmaq_laneq_f64 (e.log10c, r, cte, 0);
+ 
+   /* y = log10(1+r) + n * log10(2).  */
+-  float64x2_t hi = vfmaq_f64 (w, kd, d->log10_2);
++  hi = vfmaq_laneq_f64 (hi, kd, cte, 1);
+ 
+   /* y = r2*(A0 + r*A1 + r2*(A2 + r*A3 + r2*A4)) + hi.  */
+   float64x2_t r2 = vmulq_f64 (r, r);
+-  float64x2_t y = v_pw_horner_4_f64 (r, r2, d->poly);
++  float64x2_t odd_coeffs = vld1q_f64 (&d->c1);
++  float64x2_t y = vfmaq_laneq_f64 (d->c2, r, odd_coeffs, 1);
++  float64x2_t p = vfmaq_laneq_f64 (d->c0, r, odd_coeffs, 0);
++  y = vfmaq_f64 (y, d->c4, r2);
++  y = vfmaq_f64 (p, y, r2);
+ 
+   if (__glibc_unlikely (v_any_u32h (special)))
+-    return special_case (x, y, hi, r2, special);
+-  return vfmaq_f64 (hi, r2, y);
++    return special_case (hi, u_off, y, r2, special, d);
++  return vfmaq_f64 (hi, y, r2);
+ }
+diff --git a/sysdeps/aarch64/fpu/log2_advsimd.c b/sysdeps/aarch64/fpu/log2_advsimd.c
+index 4057c552d8..1eea1f86eb 100644
+--- a/sysdeps/aarch64/fpu/log2_advsimd.c
++++ b/sysdeps/aarch64/fpu/log2_advsimd.c
+@@ -18,31 +18,33 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include "v_math.h"
+-#include "poly_advsimd_f64.h"
+-
+-#define N (1 << V_LOG2_TABLE_BITS)
+ 
+ static const struct data
+ {
+-  uint64x2_t min_norm;
++  uint64x2_t off, sign_exp_mask, offset_lower_bound;
+   uint32x4_t special_bound;
+-  float64x2_t poly[5];
+-  float64x2_t invln2;
+-  uint64x2_t sign_exp_mask;
++  float64x2_t c0, c2;
++  double c1, c3, invln2, c4;
+ } data = {
+   /* Each coefficient was generated to approximate log(r) for |r| < 0x1.fp-9
+      and N = 128, then scaled by log2(e) in extended precision and rounded back
+      to double precision.  */
+-  .poly = { V2 (-0x1.71547652b83p-1), V2 (0x1.ec709dc340953p-2),
+-	    V2 (-0x1.71547651c8f35p-2), V2 (0x1.2777ebe12dda5p-2),
+-	    V2 (-0x1.ec738d616fe26p-3) },
+-  .invln2 = V2 (0x1.71547652b82fep0),
+-  .min_norm = V2 (0x0010000000000000), /* asuint64(0x1p-1022).  */
+-  .special_bound = V4 (0x7fe00000),    /* asuint64(inf) - min_norm.  */
++  .c0 = V2 (-0x1.71547652b8300p-1),
++  .c1 = 0x1.ec709dc340953p-2,
++  .c2 = V2 (-0x1.71547651c8f35p-2),
++  .c3 = 0x1.2777ebe12dda5p-2,
++  .c4 = -0x1.ec738d616fe26p-3,
++  .invln2 = 0x1.71547652b82fep0,
++  .off = V2 (0x3fe6900900000000),
+   .sign_exp_mask = V2 (0xfff0000000000000),
++  /* Lower bound is 0x0010000000000000. For
++     optimised register use subnormals are detected after offset has been
++     subtracted, so lower bound - offset (which wraps around).  */
++  .offset_lower_bound = V2 (0x0010000000000000 - 0x3fe6900900000000),
++  .special_bound = V4 (0x7fe00000), /* asuint64(inf) - asuint64(0x1p-1022).  */
+ };
+ 
+-#define Off v_u64 (0x3fe6900900000000)
++#define N (1 << V_LOG2_TABLE_BITS)
+ #define IndexMask (N - 1)
+ 
+ struct entry
+@@ -67,10 +69,11 @@ lookup (uint64x2_t i)
+ }
+ 
+ static float64x2_t VPCS_ATTR NOINLINE
+-special_case (float64x2_t x, float64x2_t y, float64x2_t w, float64x2_t r2,
+-	      uint32x2_t special)
++special_case (float64x2_t hi, uint64x2_t u_off, float64x2_t y, float64x2_t r2,
++	      uint32x2_t special, const struct data *d)
+ {
+-  return v_call_f64 (log2, x, vfmaq_f64 (w, r2, y), vmovl_u32 (special));
++  float64x2_t x = vreinterpretq_f64_u64 (vaddq_u64 (u_off, d->off));
++  return v_call_f64 (log2, x, vfmaq_f64 (hi, y, r2), vmovl_u32 (special));
+ }
+ 
+ /* Double-precision vector log2 routine. Implements the same algorithm as
+@@ -81,31 +84,41 @@ special_case (float64x2_t x, float64x2_t y, float64x2_t w, float64x2_t r2,
+ float64x2_t VPCS_ATTR V_NAME_D1 (log2) (float64x2_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+-  uint64x2_t ix = vreinterpretq_u64_f64 (x);
+-  uint32x2_t special = vcge_u32 (vsubhn_u64 (ix, d->min_norm),
+-				 vget_low_u32 (d->special_bound));
++
++  /* To avoid having to mov x out of the way, keep u after offset has been
++     applied, and recover x by adding the offset back in the special-case
++     handler.  */
++  uint64x2_t u = vreinterpretq_u64_f64 (x);
++  uint64x2_t u_off = vsubq_u64 (u, d->off);
+ 
+   /* x = 2^k z; where z is in range [Off,2*Off) and exact.
+      The range is split into N subintervals.
+      The ith subinterval contains z and c is near its center.  */
+-  uint64x2_t tmp = vsubq_u64 (ix, Off);
+-  int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (tmp), 52);
+-  uint64x2_t iz = vsubq_u64 (ix, vandq_u64 (tmp, d->sign_exp_mask));
++  int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (u_off), 52);
++  uint64x2_t iz = vsubq_u64 (u, vandq_u64 (u_off, d->sign_exp_mask));
+   float64x2_t z = vreinterpretq_f64_u64 (iz);
+ 
+-  struct entry e = lookup (tmp);
++  struct entry e = lookup (u_off);
+ 
+-  /* log2(x) = log1p(z/c-1)/log(2) + log2(c) + k.  */
++  uint32x2_t special = vcge_u32 (vsubhn_u64 (u_off, d->offset_lower_bound),
++				 vget_low_u32 (d->special_bound));
+ 
++  /* log2(x) = log1p(z/c-1)/log(2) + log2(c) + k.  */
+   float64x2_t r = vfmaq_f64 (v_f64 (-1.0), z, e.invc);
+   float64x2_t kd = vcvtq_f64_s64 (k);
+-  float64x2_t w = vfmaq_f64 (e.log2c, r, d->invln2);
++
++  float64x2_t invln2_and_c4 = vld1q_f64 (&d->invln2);
++  float64x2_t hi
++      = vfmaq_laneq_f64 (vaddq_f64 (e.log2c, kd), r, invln2_and_c4, 0);
+ 
+   float64x2_t r2 = vmulq_f64 (r, r);
+-  float64x2_t y = v_pw_horner_4_f64 (r, r2, d->poly);
+-  w = vaddq_f64 (kd, w);
++  float64x2_t odd_coeffs = vld1q_f64 (&d->c1);
++  float64x2_t y = vfmaq_laneq_f64 (d->c2, r, odd_coeffs, 1);
++  float64x2_t p = vfmaq_laneq_f64 (d->c0, r, odd_coeffs, 0);
++  y = vfmaq_laneq_f64 (y, r2, invln2_and_c4, 1);
++  y = vfmaq_f64 (p, r2, y);
+ 
+   if (__glibc_unlikely (v_any_u32h (special)))
+-    return special_case (x, y, w, r2, special);
+-  return vfmaq_f64 (w, r2, y);
++    return special_case (hi, u_off, y, r2, special, d);
++  return vfmaq_f64 (hi, y, r2);
+ }
+diff --git a/sysdeps/aarch64/fpu/log_advsimd.c b/sysdeps/aarch64/fpu/log_advsimd.c
+index 015a6da7d7..b1a27fbc29 100644
+--- a/sysdeps/aarch64/fpu/log_advsimd.c
++++ b/sysdeps/aarch64/fpu/log_advsimd.c
+@@ -21,27 +21,29 @@
+ 
+ static const struct data
+ {
+-  uint64x2_t min_norm;
++  uint64x2_t off, sign_exp_mask, offset_lower_bound;
+   uint32x4_t special_bound;
+-  float64x2_t poly[5];
+-  float64x2_t ln2;
+-  uint64x2_t sign_exp_mask;
++  float64x2_t c0, c2;
++  double c1, c3, ln2, c4;
+ } data = {
+-  /* Worst-case error: 1.17 + 0.5 ulp.
+-     Rel error: 0x1.6272e588p-56 in [ -0x1.fc1p-9 0x1.009p-8 ].  */
+-  .poly = { V2 (-0x1.ffffffffffff7p-2), V2 (0x1.55555555170d4p-2),
+-	    V2 (-0x1.0000000399c27p-2), V2 (0x1.999b2e90e94cap-3),
+-	    V2 (-0x1.554e550bd501ep-3) },
+-  .ln2 = V2 (0x1.62e42fefa39efp-1),
+-  .min_norm = V2 (0x0010000000000000),
+-  .special_bound = V4 (0x7fe00000), /* asuint64(inf) - min_norm.  */
+-  .sign_exp_mask = V2 (0xfff0000000000000)
++  /* Rel error: 0x1.6272e588p-56 in [ -0x1.fc1p-9 0x1.009p-8 ].  */
++  .c0 = V2 (-0x1.ffffffffffff7p-2),
++  .c1 = 0x1.55555555170d4p-2,
++  .c2 = V2 (-0x1.0000000399c27p-2),
++  .c3 = 0x1.999b2e90e94cap-3,
++  .c4 = -0x1.554e550bd501ep-3,
++  .ln2 = 0x1.62e42fefa39efp-1,
++  .sign_exp_mask = V2 (0xfff0000000000000),
++  .off = V2 (0x3fe6900900000000),
++  /* Lower bound is 0x0010000000000000. For
++     optimised register use subnormals are detected after offset has been
++     subtracted, so lower bound - offset (which wraps around).  */
++  .offset_lower_bound = V2 (0x0010000000000000 - 0x3fe6900900000000),
++  .special_bound = V4 (0x7fe00000), /* asuint64(inf) -  asuint64(0x1p-126).  */
+ };
+ 
+-#define A(i) d->poly[i]
+ #define N (1 << V_LOG_TABLE_BITS)
+ #define IndexMask (N - 1)
+-#define Off v_u64 (0x3fe6900900000000)
+ 
+ struct entry
+ {
+@@ -64,48 +66,56 @@ lookup (uint64x2_t i)
+ }
+ 
+ static float64x2_t VPCS_ATTR NOINLINE
+-special_case (float64x2_t x, float64x2_t y, float64x2_t hi, float64x2_t r2,
+-	      uint32x2_t cmp)
++special_case (float64x2_t hi, uint64x2_t u_off, float64x2_t y, float64x2_t r2,
++	      uint32x2_t special, const struct data *d)
+ {
+-  return v_call_f64 (log, x, vfmaq_f64 (hi, y, r2), vmovl_u32 (cmp));
++  float64x2_t x = vreinterpretq_f64_u64 (vaddq_u64 (u_off, d->off));
++  return v_call_f64 (log, x, vfmaq_f64 (hi, y, r2), vmovl_u32 (special));
+ }
+ 
++/* Double-precision vector log routine.
++   The maximum observed error is 2.17 ULP:
++   _ZGVnN2v_log(0x1.a6129884398a3p+0) got 0x1.ffffff1cca043p-2
++				     want 0x1.ffffff1cca045p-2.  */
+ float64x2_t VPCS_ATTR V_NAME_D1 (log) (float64x2_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+-  float64x2_t z, r, r2, p, y, kd, hi;
+-  uint64x2_t ix, iz, tmp;
+-  uint32x2_t cmp;
+-  int64x2_t k;
+-  struct entry e;
+ 
+-  ix = vreinterpretq_u64_f64 (x);
+-  cmp = vcge_u32 (vsubhn_u64 (ix, d->min_norm),
+-		  vget_low_u32 (d->special_bound));
++  /* To avoid having to mov x out of the way, keep u after offset has been
++     applied, and recover x by adding the offset back in the special-case
++     handler.  */
++  uint64x2_t u = vreinterpretq_u64_f64 (x);
++  uint64x2_t u_off = vsubq_u64 (u, d->off);
+ 
+   /* x = 2^k z; where z is in range [Off,2*Off) and exact.
+      The range is split into N subintervals.
+      The ith subinterval contains z and c is near its center.  */
+-  tmp = vsubq_u64 (ix, Off);
+-  k = vshrq_n_s64 (vreinterpretq_s64_u64 (tmp), 52); /* arithmetic shift.  */
+-  iz = vsubq_u64 (ix, vandq_u64 (tmp, d->sign_exp_mask));
+-  z = vreinterpretq_f64_u64 (iz);
+-  e = lookup (tmp);
++  int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (u_off), 52);
++  uint64x2_t iz = vsubq_u64 (u, vandq_u64 (u_off, d->sign_exp_mask));
++  float64x2_t z = vreinterpretq_f64_u64 (iz);
++
++  struct entry e = lookup (u_off);
++
++  uint32x2_t special = vcge_u32 (vsubhn_u64 (u_off, d->offset_lower_bound),
++				 vget_low_u32 (d->special_bound));
+ 
+   /* log(x) = log1p(z/c-1) + log(c) + k*Ln2.  */
+-  r = vfmaq_f64 (v_f64 (-1.0), z, e.invc);
+-  kd = vcvtq_f64_s64 (k);
++  float64x2_t r = vfmaq_f64 (v_f64 (-1.0), z, e.invc);
++  float64x2_t kd = vcvtq_f64_s64 (k);
+ 
+   /* hi = r + log(c) + k*Ln2.  */
+-  hi = vfmaq_f64 (vaddq_f64 (e.logc, r), kd, d->ln2);
++  float64x2_t ln2_and_c4 = vld1q_f64 (&d->ln2);
++  float64x2_t hi = vfmaq_laneq_f64 (vaddq_f64 (e.logc, r), kd, ln2_and_c4, 0);
++
+   /* y = r2*(A0 + r*A1 + r2*(A2 + r*A3 + r2*A4)) + hi.  */
+-  r2 = vmulq_f64 (r, r);
+-  y = vfmaq_f64 (A (2), A (3), r);
+-  p = vfmaq_f64 (A (0), A (1), r);
+-  y = vfmaq_f64 (y, A (4), r2);
+-  y = vfmaq_f64 (p, y, r2);
+-
+-  if (__glibc_unlikely (v_any_u32h (cmp)))
+-    return special_case (x, y, hi, r2, cmp);
++  float64x2_t odd_coeffs = vld1q_f64 (&d->c1);
++  float64x2_t r2 = vmulq_f64 (r, r);
++  float64x2_t y = vfmaq_laneq_f64 (d->c2, r, odd_coeffs, 1);
++  float64x2_t p = vfmaq_laneq_f64 (d->c0, r, odd_coeffs, 0);
++  y = vfmaq_laneq_f64 (y, r2, ln2_and_c4, 1);
++  y = vfmaq_f64 (p, r2, y);
++
++  if (__glibc_unlikely (v_any_u32h (special)))
++    return special_case (hi, u_off, y, r2, special, d);
+   return vfmaq_f64 (hi, y, r2);
+ }
+
+commit 2aed9796bfb17b257e63b12cefdb7ff60be09626
+Author: Pierre Blanchard <pierre.blanchard@arm.com>
+Date:   Mon Dec 9 15:55:39 2024 +0000
+
+    AArch64: Improve codegen in users of ADVSIMD log1p helper
+    
+    Add inline helper for log1p and rearrange operations so MOV
+    is not necessary in reduction or around the special-case handler.
+    Reduce memory access by using more indexed MLAs in polynomial.
+    Speedup on Neoverse V1 for log1p (3.5%), acosh (7.5%) and atanh (10%).
+    
+    (cherry picked from commit ca0c0d0f26fbf75b9cacc65122b457e8fdec40b8)
+
+diff --git a/sysdeps/aarch64/fpu/acosh_advsimd.c b/sysdeps/aarch64/fpu/acosh_advsimd.c
+index c88283cf11..a98f4a2e4d 100644
+--- a/sysdeps/aarch64/fpu/acosh_advsimd.c
++++ b/sysdeps/aarch64/fpu/acosh_advsimd.c
+@@ -54,9 +54,8 @@ VPCS_ATTR float64x2_t V_NAME_D1 (acosh) (float64x2_t x)
+     x = vbslq_f64 (special, vreinterpretq_f64_u64 (d->one), x);
+ #endif
+ 
+-  float64x2_t xm1 = vsubq_f64 (x, v_f64 (1));
+-  float64x2_t y;
+-  y = vaddq_f64 (x, v_f64 (1));
++  float64x2_t xm1 = vsubq_f64 (x, v_f64 (1.0));
++  float64x2_t y = vaddq_f64 (x, v_f64 (1.0));
+   y = vmulq_f64 (y, xm1);
+   y = vsqrtq_f64 (y);
+   y = vaddq_f64 (xm1, y);
+diff --git a/sysdeps/aarch64/fpu/atanh_advsimd.c b/sysdeps/aarch64/fpu/atanh_advsimd.c
+index 3c3d0bd6ad..eb9769aeac 100644
+--- a/sysdeps/aarch64/fpu/atanh_advsimd.c
++++ b/sysdeps/aarch64/fpu/atanh_advsimd.c
+@@ -23,15 +23,19 @@
+ const static struct data
+ {
+   struct v_log1p_data log1p_consts;
+-  uint64x2_t one, half;
++  uint64x2_t one;
++  uint64x2_t sign_mask;
+ } data = { .log1p_consts = V_LOG1P_CONSTANTS_TABLE,
+ 	   .one = V2 (0x3ff0000000000000),
+-	   .half = V2 (0x3fe0000000000000) };
++	   .sign_mask = V2 (0x8000000000000000) };
+ 
+ static float64x2_t VPCS_ATTR NOINLINE
+-special_case (float64x2_t x, float64x2_t y, uint64x2_t special)
++special_case (float64x2_t x, float64x2_t halfsign, float64x2_t y,
++	      uint64x2_t special, const struct data *d)
+ {
+-  return v_call_f64 (atanh, x, y, special);
++  y = log1p_inline (y, &d->log1p_consts);
++  return v_call_f64 (atanh, vbslq_f64 (d->sign_mask, halfsign, x),
++		     vmulq_f64 (halfsign, y), special);
+ }
+ 
+ /* Approximation for vector double-precision atanh(x) using modified log1p.
+@@ -43,11 +47,10 @@ float64x2_t V_NAME_D1 (atanh) (float64x2_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+ 
++  float64x2_t halfsign = vbslq_f64 (d->sign_mask, x, v_f64 (0.5));
+   float64x2_t ax = vabsq_f64 (x);
+   uint64x2_t ia = vreinterpretq_u64_f64 (ax);
+-  uint64x2_t sign = veorq_u64 (vreinterpretq_u64_f64 (x), ia);
+   uint64x2_t special = vcgeq_u64 (ia, d->one);
+-  float64x2_t halfsign = vreinterpretq_f64_u64 (vorrq_u64 (sign, d->half));
+ 
+ #if WANT_SIMD_EXCEPT
+   ax = v_zerofy_f64 (ax, special);
+@@ -55,10 +58,15 @@ float64x2_t V_NAME_D1 (atanh) (float64x2_t x)
+ 
+   float64x2_t y;
+   y = vaddq_f64 (ax, ax);
+-  y = vdivq_f64 (y, vsubq_f64 (v_f64 (1), ax));
+-  y = log1p_inline (y, &d->log1p_consts);
++  y = vdivq_f64 (y, vsubq_f64 (vreinterpretq_f64_u64 (d->one), ax));
+ 
+   if (__glibc_unlikely (v_any_u64 (special)))
+-    return special_case (x, vmulq_f64 (y, halfsign), special);
++#if WANT_SIMD_EXCEPT
++    return special_case (x, halfsign, y, special, d);
++#else
++    return special_case (ax, halfsign, y, special, d);
++#endif
++
++  y = log1p_inline (y, &d->log1p_consts);
+   return vmulq_f64 (y, halfsign);
+ }
+diff --git a/sysdeps/aarch64/fpu/log1p_advsimd.c b/sysdeps/aarch64/fpu/log1p_advsimd.c
+index 114064c696..1263587201 100644
+--- a/sysdeps/aarch64/fpu/log1p_advsimd.c
++++ b/sysdeps/aarch64/fpu/log1p_advsimd.c
+@@ -17,43 +17,26 @@
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+ 
+-#include "v_math.h"
+-#include "poly_advsimd_f64.h"
++#define WANT_V_LOG1P_K0_SHORTCUT 0
++#include "v_log1p_inline.h"
+ 
+ const static struct data
+ {
+-  float64x2_t poly[19], ln2[2];
+-  uint64x2_t hf_rt2_top, one_m_hf_rt2_top, umask, inf, minus_one;
+-  int64x2_t one_top;
+-} data = {
+-  /* Generated using Remez, deg=20, in [sqrt(2)/2-1, sqrt(2)-1].  */
+-  .poly = { V2 (-0x1.ffffffffffffbp-2), V2 (0x1.55555555551a9p-2),
+-	    V2 (-0x1.00000000008e3p-2), V2 (0x1.9999999a32797p-3),
+-	    V2 (-0x1.555555552fecfp-3), V2 (0x1.249248e071e5ap-3),
+-	    V2 (-0x1.ffffff8bf8482p-4), V2 (0x1.c71c8f07da57ap-4),
+-	    V2 (-0x1.9999ca4ccb617p-4), V2 (0x1.7459ad2e1dfa3p-4),
+-	    V2 (-0x1.554d2680a3ff2p-4), V2 (0x1.3b4c54d487455p-4),
+-	    V2 (-0x1.2548a9ffe80e6p-4), V2 (0x1.0f389a24b2e07p-4),
+-	    V2 (-0x1.eee4db15db335p-5), V2 (0x1.e95b494d4a5ddp-5),
+-	    V2 (-0x1.15fdf07cb7c73p-4), V2 (0x1.0310b70800fcfp-4),
+-	    V2 (-0x1.cfa7385bdb37ep-6) },
+-  .ln2 = { V2 (0x1.62e42fefa3800p-1), V2 (0x1.ef35793c76730p-45) },
+-  /* top32(asuint64(sqrt(2)/2)) << 32.  */
+-  .hf_rt2_top = V2 (0x3fe6a09e00000000),
+-  /* (top32(asuint64(1)) - top32(asuint64(sqrt(2)/2))) << 32.  */
+-  .one_m_hf_rt2_top = V2 (0x00095f6200000000),
+-  .umask = V2 (0x000fffff00000000),
+-  .one_top = V2 (0x3ff),
+-  .inf = V2 (0x7ff0000000000000),
+-  .minus_one = V2 (0xbff0000000000000)
+-};
++  struct v_log1p_data d;
++  uint64x2_t inf, minus_one;
++} data = { .d = V_LOG1P_CONSTANTS_TABLE,
++	   .inf = V2 (0x7ff0000000000000),
++	   .minus_one = V2 (0xbff0000000000000) };
+ 
+ #define BottomMask v_u64 (0xffffffff)
+ 
+-static float64x2_t VPCS_ATTR NOINLINE
+-special_case (float64x2_t x, float64x2_t y, uint64x2_t special)
++static float64x2_t NOINLINE VPCS_ATTR
++special_case (float64x2_t x, uint64x2_t cmp, const struct data *d)
+ {
+-  return v_call_f64 (log1p, x, y, special);
++  /* Side-step special lanes so fenv exceptions are not triggered
++     inadvertently.  */
++  float64x2_t x_nospecial = v_zerofy_f64 (x, cmp);
++  return v_call_f64 (log1p, x, log1p_inline (x_nospecial, &d->d), cmp);
+ }
+ 
+ /* Vector log1p approximation using polynomial on reduced interval. Routine is
+@@ -66,66 +49,14 @@ VPCS_ATTR float64x2_t V_NAME_D1 (log1p) (float64x2_t x)
+   const struct data *d = ptr_barrier (&data);
+   uint64x2_t ix = vreinterpretq_u64_f64 (x);
+   uint64x2_t ia = vreinterpretq_u64_f64 (vabsq_f64 (x));
+-  uint64x2_t special = vcgeq_u64 (ia, d->inf);
+ 
+-#if WANT_SIMD_EXCEPT
+-  special = vorrq_u64 (special,
+-		       vcgeq_u64 (ix, vreinterpretq_u64_f64 (v_f64 (-1))));
+-  if (__glibc_unlikely (v_any_u64 (special)))
+-    x = v_zerofy_f64 (x, special);
+-#else
+-  special = vorrq_u64 (special, vcleq_f64 (x, v_f64 (-1)));
+-#endif
++  uint64x2_t special_cases
++      = vorrq_u64 (vcgeq_u64 (ia, d->inf), vcgeq_u64 (ix, d->minus_one));
+ 
+-  /* With x + 1 = t * 2^k (where t = f + 1 and k is chosen such that f
+-			   is in [sqrt(2)/2, sqrt(2)]):
+-     log1p(x) = k*log(2) + log1p(f).
++  if (__glibc_unlikely (v_any_u64 (special_cases)))
++    return special_case (x, special_cases, d);
+ 
+-     f may not be representable exactly, so we need a correction term:
+-     let m = round(1 + x), c = (1 + x) - m.
+-     c << m: at very small x, log1p(x) ~ x, hence:
+-     log(1+x) - log(m) ~ c/m.
+-
+-     We therefore calculate log1p(x) by k*log2 + log1p(f) + c/m.  */
+-
+-  /* Obtain correctly scaled k by manipulation in the exponent.
+-     The scalar algorithm casts down to 32-bit at this point to calculate k and
+-     u_red. We stay in double-width to obtain f and k, using the same constants
+-     as the scalar algorithm but shifted left by 32.  */
+-  float64x2_t m = vaddq_f64 (x, v_f64 (1));
+-  uint64x2_t mi = vreinterpretq_u64_f64 (m);
+-  uint64x2_t u = vaddq_u64 (mi, d->one_m_hf_rt2_top);
+-
+-  int64x2_t ki
+-      = vsubq_s64 (vreinterpretq_s64_u64 (vshrq_n_u64 (u, 52)), d->one_top);
+-  float64x2_t k = vcvtq_f64_s64 (ki);
+-
+-  /* Reduce x to f in [sqrt(2)/2, sqrt(2)].  */
+-  uint64x2_t utop = vaddq_u64 (vandq_u64 (u, d->umask), d->hf_rt2_top);
+-  uint64x2_t u_red = vorrq_u64 (utop, vandq_u64 (mi, BottomMask));
+-  float64x2_t f = vsubq_f64 (vreinterpretq_f64_u64 (u_red), v_f64 (1));
+-
+-  /* Correction term c/m.  */
+-  float64x2_t cm = vdivq_f64 (vsubq_f64 (x, vsubq_f64 (m, v_f64 (1))), m);
+-
+-  /* Approximate log1p(x) on the reduced input using a polynomial. Because
+-     log1p(0)=0 we choose an approximation of the form:
+-       x + C0*x^2 + C1*x^3 + C2x^4 + ...
+-     Hence approximation has the form f + f^2 * P(f)
+-      where P(x) = C0 + C1*x + C2x^2 + ...
+-     Assembling this all correctly is dealt with at the final step.  */
+-  float64x2_t f2 = vmulq_f64 (f, f);
+-  float64x2_t p = v_pw_horner_18_f64 (f, f2, d->poly);
+-
+-  float64x2_t ylo = vfmaq_f64 (cm, k, d->ln2[1]);
+-  float64x2_t yhi = vfmaq_f64 (f, k, d->ln2[0]);
+-  float64x2_t y = vaddq_f64 (ylo, yhi);
+-
+-  if (__glibc_unlikely (v_any_u64 (special)))
+-    return special_case (vreinterpretq_f64_u64 (ix), vfmaq_f64 (y, f2, p),
+-			 special);
+-
+-  return vfmaq_f64 (y, f2, p);
++  return log1p_inline (x, &d->d);
+ }
+ 
+ strong_alias (V_NAME_D1 (log1p), V_NAME_D1 (logp1))
+diff --git a/sysdeps/aarch64/fpu/v_log1p_inline.h b/sysdeps/aarch64/fpu/v_log1p_inline.h
+index 242e43b6ee..834ff65adf 100644
+--- a/sysdeps/aarch64/fpu/v_log1p_inline.h
++++ b/sysdeps/aarch64/fpu/v_log1p_inline.h
+@@ -21,29 +21,30 @@
+ #define AARCH64_FPU_V_LOG1P_INLINE_H
+ 
+ #include "v_math.h"
+-#include "poly_advsimd_f64.h"
+ 
+ struct v_log1p_data
+ {
+-  float64x2_t poly[19], ln2[2];
++  float64x2_t c0, c2, c4, c6, c8, c10, c12, c14, c16;
+   uint64x2_t hf_rt2_top, one_m_hf_rt2_top, umask;
+   int64x2_t one_top;
++  double c1, c3, c5, c7, c9, c11, c13, c15, c17, c18;
++  double ln2[2];
+ };
+ 
+ /* Coefficients generated using Remez, deg=20, in [sqrt(2)/2-1, sqrt(2)-1].  */
+ #define V_LOG1P_CONSTANTS_TABLE                                               \
+   {                                                                           \
+-    .poly = { V2 (-0x1.ffffffffffffbp-2), V2 (0x1.55555555551a9p-2),          \
+-	      V2 (-0x1.00000000008e3p-2), V2 (0x1.9999999a32797p-3),          \
+-	      V2 (-0x1.555555552fecfp-3), V2 (0x1.249248e071e5ap-3),          \
+-	      V2 (-0x1.ffffff8bf8482p-4), V2 (0x1.c71c8f07da57ap-4),          \
+-	      V2 (-0x1.9999ca4ccb617p-4), V2 (0x1.7459ad2e1dfa3p-4),          \
+-	      V2 (-0x1.554d2680a3ff2p-4), V2 (0x1.3b4c54d487455p-4),          \
+-	      V2 (-0x1.2548a9ffe80e6p-4), V2 (0x1.0f389a24b2e07p-4),          \
+-	      V2 (-0x1.eee4db15db335p-5), V2 (0x1.e95b494d4a5ddp-5),          \
+-	      V2 (-0x1.15fdf07cb7c73p-4), V2 (0x1.0310b70800fcfp-4),          \
+-	      V2 (-0x1.cfa7385bdb37ep-6) },                                   \
+-    .ln2 = { V2 (0x1.62e42fefa3800p-1), V2 (0x1.ef35793c76730p-45) },         \
++    .c0 = V2 (-0x1.ffffffffffffbp-2), .c1 = 0x1.55555555551a9p-2,             \
++    .c2 = V2 (-0x1.00000000008e3p-2), .c3 = 0x1.9999999a32797p-3,             \
++    .c4 = V2 (-0x1.555555552fecfp-3), .c5 = 0x1.249248e071e5ap-3,             \
++    .c6 = V2 (-0x1.ffffff8bf8482p-4), .c7 = 0x1.c71c8f07da57ap-4,             \
++    .c8 = V2 (-0x1.9999ca4ccb617p-4), .c9 = 0x1.7459ad2e1dfa3p-4,             \
++    .c10 = V2 (-0x1.554d2680a3ff2p-4), .c11 = 0x1.3b4c54d487455p-4,           \
++    .c12 = V2 (-0x1.2548a9ffe80e6p-4), .c13 = 0x1.0f389a24b2e07p-4,           \
++    .c14 = V2 (-0x1.eee4db15db335p-5), .c15 = 0x1.e95b494d4a5ddp-5,           \
++    .c16 = V2 (-0x1.15fdf07cb7c73p-4), .c17 = 0x1.0310b70800fcfp-4,           \
++    .c18 = -0x1.cfa7385bdb37ep-6,                                             \
++    .ln2 = { 0x1.62e42fefa3800p-1, 0x1.ef35793c76730p-45 },                   \
+     .hf_rt2_top = V2 (0x3fe6a09e00000000),                                    \
+     .one_m_hf_rt2_top = V2 (0x00095f6200000000),                              \
+     .umask = V2 (0x000fffff00000000), .one_top = V2 (0x3ff)                   \
+@@ -51,19 +52,45 @@ struct v_log1p_data
+ 
+ #define BottomMask v_u64 (0xffffffff)
+ 
++static inline float64x2_t
++eval_poly (float64x2_t m, float64x2_t m2, const struct v_log1p_data *d)
++{
++  /* Approximate log(1+m) on [-0.25, 0.5] using pairwise Horner.  */
++  float64x2_t c13 = vld1q_f64 (&d->c1);
++  float64x2_t c57 = vld1q_f64 (&d->c5);
++  float64x2_t c911 = vld1q_f64 (&d->c9);
++  float64x2_t c1315 = vld1q_f64 (&d->c13);
++  float64x2_t c1718 = vld1q_f64 (&d->c17);
++  float64x2_t p1617 = vfmaq_laneq_f64 (d->c16, m, c1718, 0);
++  float64x2_t p1415 = vfmaq_laneq_f64 (d->c14, m, c1315, 1);
++  float64x2_t p1213 = vfmaq_laneq_f64 (d->c12, m, c1315, 0);
++  float64x2_t p1011 = vfmaq_laneq_f64 (d->c10, m, c911, 1);
++  float64x2_t p89 = vfmaq_laneq_f64 (d->c8, m, c911, 0);
++  float64x2_t p67 = vfmaq_laneq_f64 (d->c6, m, c57, 1);
++  float64x2_t p45 = vfmaq_laneq_f64 (d->c4, m, c57, 0);
++  float64x2_t p23 = vfmaq_laneq_f64 (d->c2, m, c13, 1);
++  float64x2_t p01 = vfmaq_laneq_f64 (d->c0, m, c13, 0);
++  float64x2_t p = vfmaq_laneq_f64 (p1617, m2, c1718, 1);
++  p = vfmaq_f64 (p1415, m2, p);
++  p = vfmaq_f64 (p1213, m2, p);
++  p = vfmaq_f64 (p1011, m2, p);
++  p = vfmaq_f64 (p89, m2, p);
++  p = vfmaq_f64 (p67, m2, p);
++  p = vfmaq_f64 (p45, m2, p);
++  p = vfmaq_f64 (p23, m2, p);
++  return vfmaq_f64 (p01, m2, p);
++}
++
+ static inline float64x2_t
+ log1p_inline (float64x2_t x, const struct v_log1p_data *d)
+ {
+-  /* Helper for calculating log(x + 1). Copied from v_log1p_2u5.c, with several
+-     modifications:
++  /* Helper for calculating log(x + 1):
+      - No special-case handling - this should be dealt with by the caller.
+-     - Pairwise Horner polynomial evaluation for improved accuracy.
+      - Optionally simulate the shortcut for k=0, used in the scalar routine,
+-       using v_sel, for improved accuracy when the argument to log1p is close to
+-       0. This feature is enabled by defining WANT_V_LOG1P_K0_SHORTCUT as 1 in
+-       the source of the caller before including this file.
+-     See v_log1pf_2u1.c for details of the algorithm.  */
+-  float64x2_t m = vaddq_f64 (x, v_f64 (1));
++       using v_sel, for improved accuracy when the argument to log1p is close
++       to 0. This feature is enabled by defining WANT_V_LOG1P_K0_SHORTCUT as 1
++       in the source of the caller before including this file.  */
++  float64x2_t m = vaddq_f64 (x, v_f64 (1.0));
+   uint64x2_t mi = vreinterpretq_u64_f64 (m);
+   uint64x2_t u = vaddq_u64 (mi, d->one_m_hf_rt2_top);
+ 
+@@ -74,14 +101,14 @@ log1p_inline (float64x2_t x, const struct v_log1p_data *d)
+   /* Reduce x to f in [sqrt(2)/2, sqrt(2)].  */
+   uint64x2_t utop = vaddq_u64 (vandq_u64 (u, d->umask), d->hf_rt2_top);
+   uint64x2_t u_red = vorrq_u64 (utop, vandq_u64 (mi, BottomMask));
+-  float64x2_t f = vsubq_f64 (vreinterpretq_f64_u64 (u_red), v_f64 (1));
++  float64x2_t f = vsubq_f64 (vreinterpretq_f64_u64 (u_red), v_f64 (1.0));
+ 
+   /* Correction term c/m.  */
+-  float64x2_t cm = vdivq_f64 (vsubq_f64 (x, vsubq_f64 (m, v_f64 (1))), m);
++  float64x2_t cm = vdivq_f64 (vsubq_f64 (x, vsubq_f64 (m, v_f64 (1.0))), m);
+ 
+ #ifndef WANT_V_LOG1P_K0_SHORTCUT
+-#error                                                                         \
+-  "Cannot use v_log1p_inline.h without specifying whether you need the k0 shortcut for greater accuracy close to 0"
++# error                                                                       \
++      "Cannot use v_log1p_inline.h without specifying whether you need the k0 shortcut for greater accuracy close to 0"
+ #elif WANT_V_LOG1P_K0_SHORTCUT
+   /* Shortcut if k is 0 - set correction term to 0 and f to x. The result is
+      that the approximation is solely the polynomial.  */
+@@ -92,11 +119,12 @@ log1p_inline (float64x2_t x, const struct v_log1p_data *d)
+ 
+   /* Approximate log1p(f) on the reduced input using a polynomial.  */
+   float64x2_t f2 = vmulq_f64 (f, f);
+-  float64x2_t p = v_pw_horner_18_f64 (f, f2, d->poly);
++  float64x2_t p = eval_poly (f, f2, d);
+ 
+   /* Assemble log1p(x) = k * log2 + log1p(f) + c/m.  */
+-  float64x2_t ylo = vfmaq_f64 (cm, k, d->ln2[1]);
+-  float64x2_t yhi = vfmaq_f64 (f, k, d->ln2[0]);
++  float64x2_t ln2 = vld1q_f64 (&d->ln2[0]);
++  float64x2_t ylo = vfmaq_laneq_f64 (cm, k, ln2, 1);
++  float64x2_t yhi = vfmaq_laneq_f64 (f, k, ln2, 0);
+   return vfmaq_f64 (vaddq_f64 (ylo, yhi), f2, p);
+ }
+ 
+
+commit 9170b921fa49d2ef37141506837baaae92c7d3f8
+Author: Joana Cruz <Joana.Cruz@arm.com>
+Date:   Tue Dec 17 14:47:31 2024 +0000
+
+    AArch64: Improve codegen of AdvSIMD logf function family
+    
+    Load the polynomial evaluation coefficients into 2 vectors and use lanewise MLAs.
+    8% improvement in throughput microbenchmark on Neoverse V1 for log2 and log,
+    and 2% for log10.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit d6e034f5b222a9ed1aeb5de0c0c7d0dda8b63da3)
+
+diff --git a/sysdeps/aarch64/fpu/log10f_advsimd.c b/sysdeps/aarch64/fpu/log10f_advsimd.c
+index 82228b599a..0d792c3df9 100644
+--- a/sysdeps/aarch64/fpu/log10f_advsimd.c
++++ b/sysdeps/aarch64/fpu/log10f_advsimd.c
+@@ -18,21 +18,25 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include "v_math.h"
+-#include "poly_advsimd_f32.h"
+ 
+ static const struct data
+ {
++  float32x4_t c0, c2, c4, c6, inv_ln10, ln2;
+   uint32x4_t off, offset_lower_bound;
+   uint16x8_t special_bound;
+   uint32x4_t mantissa_mask;
+-  float32x4_t poly[8];
+-  float32x4_t inv_ln10, ln2;
++  float c1, c3, c5, c7;
+ } data = {
+   /* Use order 9 for log10(1+x), i.e. order 8 for log10(1+x)/x, with x in
+       [-1/3, 1/3] (offset=2/3). Max. relative error: 0x1.068ee468p-25.  */
+-  .poly = { V4 (-0x1.bcb79cp-3f), V4 (0x1.2879c8p-3f), V4 (-0x1.bcd472p-4f),
+-	    V4 (0x1.6408f8p-4f), V4 (-0x1.246f8p-4f), V4 (0x1.f0e514p-5f),
+-	    V4 (-0x1.0fc92cp-4f), V4 (0x1.f5f76ap-5f) },
++  .c0 = V4 (-0x1.bcb79cp-3f),
++  .c1 = 0x1.2879c8p-3f,
++  .c2 = V4 (-0x1.bcd472p-4f),
++  .c3 = 0x1.6408f8p-4f,
++  .c4 = V4 (-0x1.246f8p-4f),
++  .c5 = 0x1.f0e514p-5f,
++  .c6 = V4 (-0x1.0fc92cp-4f),
++  .c7 = 0x1.f5f76ap-5f,
+   .ln2 = V4 (0x1.62e43p-1f),
+   .inv_ln10 = V4 (0x1.bcb7b2p-2f),
+   /* Lower bound is the smallest positive normal float 0x00800000. For
+@@ -62,7 +66,7 @@ special_case (float32x4_t y, uint32x4_t u_off, float32x4_t p, float32x4_t r2,
+ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log10) (float32x4_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+-
++  float32x4_t c1357 = vld1q_f32 (&d->c1);
+   /* To avoid having to mov x out of the way, keep u after offset has been
+      applied, and recover x by adding the offset back in the special-case
+      handler.  */
+@@ -81,7 +85,16 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log10) (float32x4_t x)
+ 
+   /* y = log10(1+r) + n * log10(2).  */
+   float32x4_t r2 = vmulq_f32 (r, r);
+-  float32x4_t poly = v_pw_horner_7_f32 (r, r2, d->poly);
++
++  float32x4_t c01 = vfmaq_laneq_f32 (d->c0, r, c1357, 0);
++  float32x4_t c23 = vfmaq_laneq_f32 (d->c2, r, c1357, 1);
++  float32x4_t c45 = vfmaq_laneq_f32 (d->c4, r, c1357, 2);
++  float32x4_t c67 = vfmaq_laneq_f32 (d->c6, r, c1357, 3);
++
++  float32x4_t p47 = vfmaq_f32 (c45, r2, c67);
++  float32x4_t p27 = vfmaq_f32 (c23, r2, p47);
++  float32x4_t poly = vfmaq_f32 (c01, r2, p27);
++
+   /* y = Log10(2) * n + poly * InvLn(10).  */
+   float32x4_t y = vfmaq_f32 (r, d->ln2, n);
+   y = vmulq_f32 (y, d->inv_ln10);
+diff --git a/sysdeps/aarch64/fpu/log2f_advsimd.c b/sysdeps/aarch64/fpu/log2f_advsimd.c
+index 84effe4fe9..116c36c8e2 100644
+--- a/sysdeps/aarch64/fpu/log2f_advsimd.c
++++ b/sysdeps/aarch64/fpu/log2f_advsimd.c
+@@ -18,22 +18,27 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include "v_math.h"
+-#include "poly_advsimd_f32.h"
+ 
+ static const struct data
+ {
++  float32x4_t c0, c2, c4, c6, c8;
+   uint32x4_t off, offset_lower_bound;
+   uint16x8_t special_bound;
+   uint32x4_t mantissa_mask;
+-  float32x4_t poly[9];
++  float c1, c3, c5, c7;
+ } data = {
+   /* Coefficients generated using Remez algorithm approximate
+      log2(1+r)/r for r in [ -1/3, 1/3 ].
+      rel error: 0x1.c4c4b0cp-26.  */
+-  .poly = { V4 (0x1.715476p0f), /* (float)(1 / ln(2)).  */
+-	    V4 (-0x1.715458p-1f), V4 (0x1.ec701cp-2f), V4 (-0x1.7171a4p-2f),
+-	    V4 (0x1.27a0b8p-2f), V4 (-0x1.e5143ep-3f), V4 (0x1.9d8ecap-3f),
+-	    V4 (-0x1.c675bp-3f), V4 (0x1.9e495p-3f) },
++  .c0 = V4 (0x1.715476p0f), /* (float)(1 / ln(2)).  */
++  .c1 = -0x1.715458p-1f,
++  .c2 = V4 (0x1.ec701cp-2f),
++  .c3 = -0x1.7171a4p-2f,
++  .c4 = V4 (0x1.27a0b8p-2f),
++  .c5 = -0x1.e5143ep-3f,
++  .c6 = V4 (0x1.9d8ecap-3f),
++  .c7 = -0x1.c675bp-3f,
++  .c8 = V4 (0x1.9e495p-3f),
+   /* Lower bound is the smallest positive normal float 0x00800000. For
+      optimised register use subnormals are detected after offset has been
+      subtracted, so lower bound is 0x0080000 - offset (which wraps around).  */
+@@ -79,11 +84,21 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log2) (float32x4_t x)
+ 
+   /* y = log2(1+r) + n.  */
+   float32x4_t r2 = vmulq_f32 (r, r);
+-  float32x4_t p = v_pw_horner_8_f32 (r, r2, d->poly);
++
++  float32x4_t c1357 = vld1q_f32 (&d->c1);
++  float32x4_t c01 = vfmaq_laneq_f32 (d->c0, r, c1357, 0);
++  float32x4_t c23 = vfmaq_laneq_f32 (d->c2, r, c1357, 1);
++  float32x4_t c45 = vfmaq_laneq_f32 (d->c4, r, c1357, 2);
++  float32x4_t c67 = vfmaq_laneq_f32 (d->c6, r, c1357, 3);
++  float32x4_t p68 = vfmaq_f32 (c67, r2, d->c8);
++  float32x4_t p48 = vfmaq_f32 (c45, r2, p68);
++  float32x4_t p28 = vfmaq_f32 (c23, r2, p48);
++  float32x4_t p = vfmaq_f32 (c01, r2, p28);
+ 
+   if (__glibc_unlikely (v_any_u16h (special)))
+     return special_case (n, u_off, p, r, special, d);
+   return vfmaq_f32 (n, p, r);
+ }
++
+ libmvec_hidden_def (V_NAME_F1 (log2))
+ HALF_WIDTH_ALIAS_F1 (log2)
+diff --git a/sysdeps/aarch64/fpu/logf_advsimd.c b/sysdeps/aarch64/fpu/logf_advsimd.c
+index c20dbfd6c0..d9e64c732d 100644
+--- a/sysdeps/aarch64/fpu/logf_advsimd.c
++++ b/sysdeps/aarch64/fpu/logf_advsimd.c
+@@ -21,16 +21,19 @@
+ 
+ static const struct data
+ {
+-  uint32x4_t off, offset_lower_bound;
++  float32x4_t c2, c4, c6, ln2;
++  uint32x4_t off, offset_lower_bound, mantissa_mask;
+   uint16x8_t special_bound;
+-  uint32x4_t mantissa_mask;
+-  float32x4_t poly[7];
+-  float32x4_t ln2;
++  float c1, c3, c5, c0;
+ } data = {
+   /* 3.34 ulp error.  */
+-  .poly = { V4 (-0x1.3e737cp-3f), V4 (0x1.5a9aa2p-3f), V4 (-0x1.4f9934p-3f),
+-	    V4 (0x1.961348p-3f), V4 (-0x1.00187cp-2f), V4 (0x1.555d7cp-2f),
+-	    V4 (-0x1.ffffc8p-2f) },
++  .c0 = -0x1.3e737cp-3f,
++  .c1 = 0x1.5a9aa2p-3f,
++  .c2 = V4 (-0x1.4f9934p-3f),
++  .c3 = 0x1.961348p-3f,
++  .c4 = V4 (-0x1.00187cp-2f),
++  .c5 = 0x1.555d7cp-2f,
++  .c6 = V4 (-0x1.ffffc8p-2f),
+   .ln2 = V4 (0x1.62e43p-1f),
+   /* Lower bound is the smallest positive normal float 0x00800000. For
+      optimised register use subnormals are detected after offset has been
+@@ -41,8 +44,6 @@ static const struct data
+   .mantissa_mask = V4 (0x007fffff)
+ };
+ 
+-#define P(i) d->poly[7 - i]
+-
+ static float32x4_t VPCS_ATTR NOINLINE
+ special_case (float32x4_t p, uint32x4_t u_off, float32x4_t y, float32x4_t r2,
+ 	      uint16x4_t cmp, const struct data *d)
+@@ -55,33 +56,30 @@ special_case (float32x4_t p, uint32x4_t u_off, float32x4_t y, float32x4_t r2,
+ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (log) (float32x4_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+-  float32x4_t n, p, q, r, r2, y;
+-  uint32x4_t u, u_off;
+-  uint16x4_t cmp;
++  float32x4_t c1350 = vld1q_f32 (&d->c1);
+ 
+   /* To avoid having to mov x out of the way, keep u after offset has been
+      applied, and recover x by adding the offset back in the special-case
+      handler.  */
+-  u_off = vreinterpretq_u32_f32 (x);
++  uint32x4_t u_off = vsubq_u32 (vreinterpretq_u32_f32 (x), d->off);
+ 
+   /* x = 2^n * (1+r), where 2/3 < 1+r < 4/3.  */
+-  u_off = vsubq_u32 (u_off, d->off);
+-  n = vcvtq_f32_s32 (
++  float32x4_t n = vcvtq_f32_s32 (
+       vshrq_n_s32 (vreinterpretq_s32_u32 (u_off), 23)); /* signextend.  */
+-  u = vandq_u32 (u_off, d->mantissa_mask);
+-  u = vaddq_u32 (u, d->off);
+-  r = vsubq_f32 (vreinterpretq_f32_u32 (u), v_f32 (1.0f));
++  uint16x4_t cmp = vcge_u16 (vsubhn_u32 (u_off, d->offset_lower_bound),
++			     vget_low_u16 (d->special_bound));
+ 
+-  cmp = vcge_u16 (vsubhn_u32 (u_off, d->offset_lower_bound),
+-		  vget_low_u16 (d->special_bound));
++  uint32x4_t u = vaddq_u32 (vandq_u32 (u_off, d->mantissa_mask), d->off);
++  float32x4_t r = vsubq_f32 (vreinterpretq_f32_u32 (u), v_f32 (1.0f));
+ 
+   /* y = log(1+r) + n*ln2.  */
+-  r2 = vmulq_f32 (r, r);
++  float32x4_t r2 = vmulq_f32 (r, r);
+   /* n*ln2 + r + r2*(P1 + r*P2 + r2*(P3 + r*P4 + r2*(P5 + r*P6 + r2*P7))).  */
+-  p = vfmaq_f32 (P (5), P (6), r);
+-  q = vfmaq_f32 (P (3), P (4), r);
+-  y = vfmaq_f32 (P (1), P (2), r);
+-  p = vfmaq_f32 (p, P (7), r2);
++  float32x4_t p = vfmaq_laneq_f32 (d->c2, r, c1350, 0);
++  float32x4_t q = vfmaq_laneq_f32 (d->c4, r, c1350, 1);
++  float32x4_t y = vfmaq_laneq_f32 (d->c6, r, c1350, 2);
++  p = vfmaq_laneq_f32 (p, r2, c1350, 3);
++
+   q = vfmaq_f32 (q, p, r2);
+   y = vfmaq_f32 (y, q, r2);
+   p = vfmaq_f32 (r, d->ln2, n);
+
+commit 41dc9e7c2d80bc5e886950b8a7bd21f77c9793b3
+Author: Joana Cruz <Joana.Cruz@arm.com>
+Date:   Tue Dec 17 14:49:30 2024 +0000
+
+    AArch64: Improve codegen of AdvSIMD atan(2)(f)
+    
+    Load the polynomial evaluation coefficients into 2 vectors and use lanewise MLAs.
+    8% improvement in throughput microbenchmark on Neoverse V1.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit 6914774b9d3460876d9ad4482782213ec01a752e)
+
+diff --git a/sysdeps/aarch64/fpu/atan2_advsimd.c b/sysdeps/aarch64/fpu/atan2_advsimd.c
+index b1e7a9b8fc..1a8f02109f 100644
+--- a/sysdeps/aarch64/fpu/atan2_advsimd.c
++++ b/sysdeps/aarch64/fpu/atan2_advsimd.c
+@@ -23,40 +23,57 @@
+ 
+ static const struct data
+ {
++  float64x2_t c0, c2, c4, c6, c8, c10, c12, c14, c16, c18;
+   float64x2_t pi_over_2;
+-  float64x2_t poly[20];
++  double c1, c3, c5, c7, c9, c11, c13, c15, c17, c19;
++  uint64x2_t zeroinfnan, minustwo;
+ } data = {
+   /* Coefficients of polynomial P such that atan(x)~x+x*P(x^2) on
+-     the interval [2**-1022, 1.0].  */
+-  .poly = { V2 (-0x1.5555555555555p-2),	 V2 (0x1.99999999996c1p-3),
+-	    V2 (-0x1.2492492478f88p-3),	 V2 (0x1.c71c71bc3951cp-4),
+-	    V2 (-0x1.745d160a7e368p-4),	 V2 (0x1.3b139b6a88ba1p-4),
+-	    V2 (-0x1.11100ee084227p-4),	 V2 (0x1.e1d0f9696f63bp-5),
+-	    V2 (-0x1.aebfe7b418581p-5),	 V2 (0x1.842dbe9b0d916p-5),
+-	    V2 (-0x1.5d30140ae5e99p-5),	 V2 (0x1.338e31eb2fbbcp-5),
+-	    V2 (-0x1.00e6eece7de8p-5),	 V2 (0x1.860897b29e5efp-6),
+-	    V2 (-0x1.0051381722a59p-6),	 V2 (0x1.14e9dc19a4a4ep-7),
+-	    V2 (-0x1.d0062b42fe3bfp-9),	 V2 (0x1.17739e210171ap-10),
+-	    V2 (-0x1.ab24da7be7402p-13), V2 (0x1.358851160a528p-16), },
++	      [2**-1022, 1.0].  */
++  .c0 = V2 (-0x1.5555555555555p-2),
++  .c1 = 0x1.99999999996c1p-3,
++  .c2 = V2 (-0x1.2492492478f88p-3),
++  .c3 = 0x1.c71c71bc3951cp-4,
++  .c4 = V2 (-0x1.745d160a7e368p-4),
++  .c5 = 0x1.3b139b6a88ba1p-4,
++  .c6 = V2 (-0x1.11100ee084227p-4),
++  .c7 = 0x1.e1d0f9696f63bp-5,
++  .c8 = V2 (-0x1.aebfe7b418581p-5),
++  .c9 = 0x1.842dbe9b0d916p-5,
++  .c10 = V2 (-0x1.5d30140ae5e99p-5),
++  .c11 = 0x1.338e31eb2fbbcp-5,
++  .c12 = V2 (-0x1.00e6eece7de8p-5),
++  .c13 = 0x1.860897b29e5efp-6,
++  .c14 = V2 (-0x1.0051381722a59p-6),
++  .c15 = 0x1.14e9dc19a4a4ep-7,
++  .c16 = V2 (-0x1.d0062b42fe3bfp-9),
++  .c17 = 0x1.17739e210171ap-10,
++  .c18 = V2 (-0x1.ab24da7be7402p-13),
++  .c19 = 0x1.358851160a528p-16,
+   .pi_over_2 = V2 (0x1.921fb54442d18p+0),
++  .zeroinfnan = V2 (2 * 0x7ff0000000000000ul - 1),
++  .minustwo = V2 (0xc000000000000000),
+ };
+ 
+ #define SignMask v_u64 (0x8000000000000000)
+ 
+ /* Special cases i.e. 0, infinity, NaN (fall back to scalar calls).  */
+ static float64x2_t VPCS_ATTR NOINLINE
+-special_case (float64x2_t y, float64x2_t x, float64x2_t ret, uint64x2_t cmp)
++special_case (float64x2_t y, float64x2_t x, float64x2_t ret,
++	      uint64x2_t sign_xy, uint64x2_t cmp)
+ {
++  /* Account for the sign of x and y.  */
++  ret = vreinterpretq_f64_u64 (
++      veorq_u64 (vreinterpretq_u64_f64 (ret), sign_xy));
+   return v_call2_f64 (atan2, y, x, ret, cmp);
+ }
+ 
+ /* Returns 1 if input is the bit representation of 0, infinity or nan.  */
+ static inline uint64x2_t
+-zeroinfnan (uint64x2_t i)
++zeroinfnan (uint64x2_t i, const struct data *d)
+ {
+   /* (2 * i - 1) >= (2 * asuint64 (INFINITY) - 1).  */
+-  return vcgeq_u64 (vsubq_u64 (vaddq_u64 (i, i), v_u64 (1)),
+-		    v_u64 (2 * asuint64 (INFINITY) - 1));
++  return vcgeq_u64 (vsubq_u64 (vaddq_u64 (i, i), v_u64 (1)), d->zeroinfnan);
+ }
+ 
+ /* Fast implementation of vector atan2.
+@@ -66,12 +83,13 @@ zeroinfnan (uint64x2_t i)
+        want 0x1.92d628ab678cfp-1.  */
+ float64x2_t VPCS_ATTR V_NAME_D2 (atan2) (float64x2_t y, float64x2_t x)
+ {
+-  const struct data *data_ptr = ptr_barrier (&data);
++  const struct data *d = ptr_barrier (&data);
+ 
+   uint64x2_t ix = vreinterpretq_u64_f64 (x);
+   uint64x2_t iy = vreinterpretq_u64_f64 (y);
+ 
+-  uint64x2_t special_cases = vorrq_u64 (zeroinfnan (ix), zeroinfnan (iy));
++  uint64x2_t special_cases
++      = vorrq_u64 (zeroinfnan (ix, d), zeroinfnan (iy, d));
+ 
+   uint64x2_t sign_x = vandq_u64 (ix, SignMask);
+   uint64x2_t sign_y = vandq_u64 (iy, SignMask);
+@@ -81,18 +99,18 @@ float64x2_t VPCS_ATTR V_NAME_D2 (atan2) (float64x2_t y, float64x2_t x)
+   float64x2_t ay = vabsq_f64 (y);
+ 
+   uint64x2_t pred_xlt0 = vcltzq_f64 (x);
+-  uint64x2_t pred_aygtax = vcgtq_f64 (ay, ax);
++  uint64x2_t pred_aygtax = vcagtq_f64 (y, x);
+ 
+   /* Set up z for call to atan.  */
+   float64x2_t n = vbslq_f64 (pred_aygtax, vnegq_f64 (ax), ay);
+-  float64x2_t d = vbslq_f64 (pred_aygtax, ay, ax);
+-  float64x2_t z = vdivq_f64 (n, d);
++  float64x2_t q = vbslq_f64 (pred_aygtax, ay, ax);
++  float64x2_t z = vdivq_f64 (n, q);
+ 
+   /* Work out the correct shift.  */
+-  float64x2_t shift = vreinterpretq_f64_u64 (
+-      vandq_u64 (pred_xlt0, vreinterpretq_u64_f64 (v_f64 (-2.0))));
++  float64x2_t shift
++      = vreinterpretq_f64_u64 (vandq_u64 (pred_xlt0, d->minustwo));
+   shift = vbslq_f64 (pred_aygtax, vaddq_f64 (shift, v_f64 (1.0)), shift);
+-  shift = vmulq_f64 (shift, data_ptr->pi_over_2);
++  shift = vmulq_f64 (shift, d->pi_over_2);
+ 
+   /* Calculate the polynomial approximation.
+      Use split Estrin scheme for P(z^2) with deg(P)=19. Use split instead of
+@@ -103,20 +121,52 @@ float64x2_t VPCS_ATTR V_NAME_D2 (atan2) (float64x2_t y, float64x2_t x)
+   float64x2_t x2 = vmulq_f64 (z2, z2);
+   float64x2_t x4 = vmulq_f64 (x2, x2);
+   float64x2_t x8 = vmulq_f64 (x4, x4);
+-  float64x2_t ret
+-      = vfmaq_f64 (v_estrin_7_f64 (z2, x2, x4, data_ptr->poly),
+-		   v_estrin_11_f64 (z2, x2, x4, x8, data_ptr->poly + 8), x8);
++
++  float64x2_t c13 = vld1q_f64 (&d->c1);
++  float64x2_t c57 = vld1q_f64 (&d->c5);
++  float64x2_t c911 = vld1q_f64 (&d->c9);
++  float64x2_t c1315 = vld1q_f64 (&d->c13);
++  float64x2_t c1719 = vld1q_f64 (&d->c17);
++
++  /* estrin_7.  */
++  float64x2_t p01 = vfmaq_laneq_f64 (d->c0, z2, c13, 0);
++  float64x2_t p23 = vfmaq_laneq_f64 (d->c2, z2, c13, 1);
++  float64x2_t p03 = vfmaq_f64 (p01, x2, p23);
++
++  float64x2_t p45 = vfmaq_laneq_f64 (d->c4, z2, c57, 0);
++  float64x2_t p67 = vfmaq_laneq_f64 (d->c6, z2, c57, 1);
++  float64x2_t p47 = vfmaq_f64 (p45, x2, p67);
++
++  float64x2_t p07 = vfmaq_f64 (p03, x4, p47);
++
++  /* estrin_11.  */
++  float64x2_t p89 = vfmaq_laneq_f64 (d->c8, z2, c911, 0);
++  float64x2_t p1011 = vfmaq_laneq_f64 (d->c10, z2, c911, 1);
++  float64x2_t p811 = vfmaq_f64 (p89, x2, p1011);
++
++  float64x2_t p1213 = vfmaq_laneq_f64 (d->c12, z2, c1315, 0);
++  float64x2_t p1415 = vfmaq_laneq_f64 (d->c14, z2, c1315, 1);
++  float64x2_t p1215 = vfmaq_f64 (p1213, x2, p1415);
++
++  float64x2_t p1617 = vfmaq_laneq_f64 (d->c16, z2, c1719, 0);
++  float64x2_t p1819 = vfmaq_laneq_f64 (d->c18, z2, c1719, 1);
++  float64x2_t p1619 = vfmaq_f64 (p1617, x2, p1819);
++
++  float64x2_t p815 = vfmaq_f64 (p811, x4, p1215);
++  float64x2_t p819 = vfmaq_f64 (p815, x8, p1619);
++
++  float64x2_t ret = vfmaq_f64 (p07, p819, x8);
+ 
+   /* Finalize. y = shift + z + z^3 * P(z^2).  */
+   ret = vfmaq_f64 (z, ret, vmulq_f64 (z2, z));
+   ret = vaddq_f64 (ret, shift);
+ 
++  if (__glibc_unlikely (v_any_u64 (special_cases)))
++    return special_case (y, x, ret, sign_xy, special_cases);
++
+   /* Account for the sign of x and y.  */
+   ret = vreinterpretq_f64_u64 (
+       veorq_u64 (vreinterpretq_u64_f64 (ret), sign_xy));
+ 
+-  if (__glibc_unlikely (v_any_u64 (special_cases)))
+-    return special_case (y, x, ret, special_cases);
+-
+   return ret;
+ }
+diff --git a/sysdeps/aarch64/fpu/atan2f_advsimd.c b/sysdeps/aarch64/fpu/atan2f_advsimd.c
+index 56e610caf1..88daacd76c 100644
+--- a/sysdeps/aarch64/fpu/atan2f_advsimd.c
++++ b/sysdeps/aarch64/fpu/atan2f_advsimd.c
+@@ -22,34 +22,39 @@
+ 
+ static const struct data
+ {
+-  float32x4_t poly[8];
+-  float32x4_t pi_over_2;
++  float32x4_t c0, pi_over_2, c4, c6, c2;
++  float c1, c3, c5, c7;
++  uint32x4_t comp_const;
+ } data = {
+   /* Coefficients of polynomial P such that atan(x)~x+x*P(x^2) on
+      [2**-128, 1.0].
+      Generated using fpminimax between FLT_MIN and 1.  */
+-  .poly = { V4 (-0x1.55555p-2f), V4 (0x1.99935ep-3f), V4 (-0x1.24051ep-3f),
+-	    V4 (0x1.bd7368p-4f), V4 (-0x1.491f0ep-4f), V4 (0x1.93a2c0p-5f),
+-	    V4 (-0x1.4c3c60p-6f), V4 (0x1.01fd88p-8f) },
+-  .pi_over_2 = V4 (0x1.921fb6p+0f),
++  .c0 = V4 (-0x1.55555p-2f),	    .c1 = 0x1.99935ep-3f,
++  .c2 = V4 (-0x1.24051ep-3f),	    .c3 = 0x1.bd7368p-4f,
++  .c4 = V4 (-0x1.491f0ep-4f),	    .c5 = 0x1.93a2c0p-5f,
++  .c6 = V4 (-0x1.4c3c60p-6f),	    .c7 = 0x1.01fd88p-8f,
++  .pi_over_2 = V4 (0x1.921fb6p+0f), .comp_const = V4 (2 * 0x7f800000lu - 1),
+ };
+ 
+ #define SignMask v_u32 (0x80000000)
+ 
+ /* Special cases i.e. 0, infinity and nan (fall back to scalar calls).  */
+ static float32x4_t VPCS_ATTR NOINLINE
+-special_case (float32x4_t y, float32x4_t x, float32x4_t ret, uint32x4_t cmp)
++special_case (float32x4_t y, float32x4_t x, float32x4_t ret,
++	      uint32x4_t sign_xy, uint32x4_t cmp)
+ {
++  /* Account for the sign of y.  */
++  ret = vreinterpretq_f32_u32 (
++      veorq_u32 (vreinterpretq_u32_f32 (ret), sign_xy));
+   return v_call2_f32 (atan2f, y, x, ret, cmp);
+ }
+ 
+ /* Returns 1 if input is the bit representation of 0, infinity or nan.  */
+ static inline uint32x4_t
+-zeroinfnan (uint32x4_t i)
++zeroinfnan (uint32x4_t i, const struct data *d)
+ {
+   /* 2 * i - 1 >= 2 * 0x7f800000lu - 1.  */
+-  return vcgeq_u32 (vsubq_u32 (vmulq_n_u32 (i, 2), v_u32 (1)),
+-		    v_u32 (2 * 0x7f800000lu - 1));
++  return vcgeq_u32 (vsubq_u32 (vmulq_n_u32 (i, 2), v_u32 (1)), d->comp_const);
+ }
+ 
+ /* Fast implementation of vector atan2f. Maximum observed error is
+@@ -58,12 +63,13 @@ zeroinfnan (uint32x4_t i)
+ 						 want 0x1.967f00p-1.  */
+ float32x4_t VPCS_ATTR NOINLINE V_NAME_F2 (atan2) (float32x4_t y, float32x4_t x)
+ {
+-  const struct data *data_ptr = ptr_barrier (&data);
++  const struct data *d = ptr_barrier (&data);
+ 
+   uint32x4_t ix = vreinterpretq_u32_f32 (x);
+   uint32x4_t iy = vreinterpretq_u32_f32 (y);
+ 
+-  uint32x4_t special_cases = vorrq_u32 (zeroinfnan (ix), zeroinfnan (iy));
++  uint32x4_t special_cases
++      = vorrq_u32 (zeroinfnan (ix, d), zeroinfnan (iy, d));
+ 
+   uint32x4_t sign_x = vandq_u32 (ix, SignMask);
+   uint32x4_t sign_y = vandq_u32 (iy, SignMask);
+@@ -77,14 +83,14 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F2 (atan2) (float32x4_t y, float32x4_t x)
+ 
+   /* Set up z for call to atanf.  */
+   float32x4_t n = vbslq_f32 (pred_aygtax, vnegq_f32 (ax), ay);
+-  float32x4_t d = vbslq_f32 (pred_aygtax, ay, ax);
+-  float32x4_t z = vdivq_f32 (n, d);
++  float32x4_t q = vbslq_f32 (pred_aygtax, ay, ax);
++  float32x4_t z = vdivq_f32 (n, q);
+ 
+   /* Work out the correct shift.  */
+   float32x4_t shift = vreinterpretq_f32_u32 (
+       vandq_u32 (pred_xlt0, vreinterpretq_u32_f32 (v_f32 (-2.0f))));
+   shift = vbslq_f32 (pred_aygtax, vaddq_f32 (shift, v_f32 (1.0f)), shift);
+-  shift = vmulq_f32 (shift, data_ptr->pi_over_2);
++  shift = vmulq_f32 (shift, d->pi_over_2);
+ 
+   /* Calculate the polynomial approximation.
+      Use 2-level Estrin scheme for P(z^2) with deg(P)=7. However,
+@@ -96,23 +102,27 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F2 (atan2) (float32x4_t y, float32x4_t x)
+   float32x4_t z2 = vmulq_f32 (z, z);
+   float32x4_t z4 = vmulq_f32 (z2, z2);
+ 
+-  float32x4_t ret = vfmaq_f32 (
+-      v_pairwise_poly_3_f32 (z2, z4, data_ptr->poly), z4,
+-      vmulq_f32 (z4, v_pairwise_poly_3_f32 (z2, z4, data_ptr->poly + 4)));
++  float32x4_t c1357 = vld1q_f32 (&d->c1);
++  float32x4_t p01 = vfmaq_laneq_f32 (d->c0, z2, c1357, 0);
++  float32x4_t p23 = vfmaq_laneq_f32 (d->c2, z2, c1357, 1);
++  float32x4_t p45 = vfmaq_laneq_f32 (d->c4, z2, c1357, 2);
++  float32x4_t p67 = vfmaq_laneq_f32 (d->c6, z2, c1357, 3);
++  float32x4_t p03 = vfmaq_f32 (p01, z4, p23);
++  float32x4_t p47 = vfmaq_f32 (p45, z4, p67);
++
++  float32x4_t ret = vfmaq_f32 (p03, z4, vmulq_f32 (z4, p47));
+ 
+   /* y = shift + z * P(z^2).  */
+   ret = vaddq_f32 (vfmaq_f32 (z, ret, vmulq_f32 (z2, z)), shift);
+ 
+-  /* Account for the sign of y.  */
+-  ret = vreinterpretq_f32_u32 (
+-      veorq_u32 (vreinterpretq_u32_f32 (ret), sign_xy));
+-
+   if (__glibc_unlikely (v_any_u32 (special_cases)))
+     {
+-      return special_case (y, x, ret, special_cases);
++      return special_case (y, x, ret, sign_xy, special_cases);
+     }
+ 
+-  return ret;
++  /* Account for the sign of y.  */
++  return vreinterpretq_f32_u32 (
++      veorq_u32 (vreinterpretq_u32_f32 (ret), sign_xy));
+ }
+ libmvec_hidden_def (V_NAME_F2 (atan2))
+ HALF_WIDTH_ALIAS_F2(atan2)
+diff --git a/sysdeps/aarch64/fpu/atan_advsimd.c b/sysdeps/aarch64/fpu/atan_advsimd.c
+index a962be0f78..14f1809796 100644
+--- a/sysdeps/aarch64/fpu/atan_advsimd.c
++++ b/sysdeps/aarch64/fpu/atan_advsimd.c
+@@ -22,21 +22,22 @@
+ 
+ static const struct data
+ {
++  float64x2_t c0, c2, c4, c6, c8, c10, c12, c14, c16, c18;
+   float64x2_t pi_over_2;
+-  float64x2_t poly[20];
++  double c1, c3, c5, c7, c9, c11, c13, c15, c17, c19;
+ } data = {
+   /* Coefficients of polynomial P such that atan(x)~x+x*P(x^2) on
+ 	      [2**-1022, 1.0].  */
+-  .poly = { V2 (-0x1.5555555555555p-2),	 V2 (0x1.99999999996c1p-3),
+-	    V2 (-0x1.2492492478f88p-3),	 V2 (0x1.c71c71bc3951cp-4),
+-	    V2 (-0x1.745d160a7e368p-4),	 V2 (0x1.3b139b6a88ba1p-4),
+-	    V2 (-0x1.11100ee084227p-4),	 V2 (0x1.e1d0f9696f63bp-5),
+-	    V2 (-0x1.aebfe7b418581p-5),	 V2 (0x1.842dbe9b0d916p-5),
+-	    V2 (-0x1.5d30140ae5e99p-5),	 V2 (0x1.338e31eb2fbbcp-5),
+-	    V2 (-0x1.00e6eece7de8p-5),	 V2 (0x1.860897b29e5efp-6),
+-	    V2 (-0x1.0051381722a59p-6),	 V2 (0x1.14e9dc19a4a4ep-7),
+-	    V2 (-0x1.d0062b42fe3bfp-9),	 V2 (0x1.17739e210171ap-10),
+-	    V2 (-0x1.ab24da7be7402p-13), V2 (0x1.358851160a528p-16), },
++  .c0 = V2 (-0x1.5555555555555p-2),	  .c1 = 0x1.99999999996c1p-3,
++  .c2 = V2 (-0x1.2492492478f88p-3),	  .c3 = 0x1.c71c71bc3951cp-4,
++  .c4 = V2 (-0x1.745d160a7e368p-4),	  .c5 = 0x1.3b139b6a88ba1p-4,
++  .c6 = V2 (-0x1.11100ee084227p-4),	  .c7 = 0x1.e1d0f9696f63bp-5,
++  .c8 = V2 (-0x1.aebfe7b418581p-5),	  .c9 = 0x1.842dbe9b0d916p-5,
++  .c10 = V2 (-0x1.5d30140ae5e99p-5),	  .c11 = 0x1.338e31eb2fbbcp-5,
++  .c12 = V2 (-0x1.00e6eece7de8p-5),	  .c13 = 0x1.860897b29e5efp-6,
++  .c14 = V2 (-0x1.0051381722a59p-6),	  .c15 = 0x1.14e9dc19a4a4ep-7,
++  .c16 = V2 (-0x1.d0062b42fe3bfp-9),	  .c17 = 0x1.17739e210171ap-10,
++  .c18 = V2 (-0x1.ab24da7be7402p-13),	  .c19 = 0x1.358851160a528p-16,
+   .pi_over_2 = V2 (0x1.921fb54442d18p+0),
+ };
+ 
+@@ -52,6 +53,11 @@ static const struct data
+ float64x2_t VPCS_ATTR V_NAME_D1 (atan) (float64x2_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
++  float64x2_t c13 = vld1q_f64 (&d->c1);
++  float64x2_t c57 = vld1q_f64 (&d->c5);
++  float64x2_t c911 = vld1q_f64 (&d->c9);
++  float64x2_t c1315 = vld1q_f64 (&d->c13);
++  float64x2_t c1719 = vld1q_f64 (&d->c17);
+ 
+   /* Small cases, infs and nans are supported by our approximation technique,
+      but do not set fenv flags correctly. Only trigger special case if we need
+@@ -90,9 +96,35 @@ float64x2_t VPCS_ATTR V_NAME_D1 (atan) (float64x2_t x)
+   float64x2_t x2 = vmulq_f64 (z2, z2);
+   float64x2_t x4 = vmulq_f64 (x2, x2);
+   float64x2_t x8 = vmulq_f64 (x4, x4);
+-  float64x2_t y
+-      = vfmaq_f64 (v_estrin_7_f64 (z2, x2, x4, d->poly),
+-		   v_estrin_11_f64 (z2, x2, x4, x8, d->poly + 8), x8);
++
++  /* estrin_7.  */
++  float64x2_t p01 = vfmaq_laneq_f64 (d->c0, z2, c13, 0);
++  float64x2_t p23 = vfmaq_laneq_f64 (d->c2, z2, c13, 1);
++  float64x2_t p03 = vfmaq_f64 (p01, x2, p23);
++
++  float64x2_t p45 = vfmaq_laneq_f64 (d->c4, z2, c57, 0);
++  float64x2_t p67 = vfmaq_laneq_f64 (d->c6, z2, c57, 1);
++  float64x2_t p47 = vfmaq_f64 (p45, x2, p67);
++
++  float64x2_t p07 = vfmaq_f64 (p03, x4, p47);
++
++  /* estrin_11.  */
++  float64x2_t p89 = vfmaq_laneq_f64 (d->c8, z2, c911, 0);
++  float64x2_t p1011 = vfmaq_laneq_f64 (d->c10, z2, c911, 1);
++  float64x2_t p811 = vfmaq_f64 (p89, x2, p1011);
++
++  float64x2_t p1213 = vfmaq_laneq_f64 (d->c12, z2, c1315, 0);
++  float64x2_t p1415 = vfmaq_laneq_f64 (d->c14, z2, c1315, 1);
++  float64x2_t p1215 = vfmaq_f64 (p1213, x2, p1415);
++
++  float64x2_t p1617 = vfmaq_laneq_f64 (d->c16, z2, c1719, 0);
++  float64x2_t p1819 = vfmaq_laneq_f64 (d->c18, z2, c1719, 1);
++  float64x2_t p1619 = vfmaq_f64 (p1617, x2, p1819);
++
++  float64x2_t p815 = vfmaq_f64 (p811, x4, p1215);
++  float64x2_t p819 = vfmaq_f64 (p815, x8, p1619);
++
++  float64x2_t y = vfmaq_f64 (p07, p819, x8);
+ 
+   /* Finalize. y = shift + z + z^3 * P(z^2).  */
+   y = vfmaq_f64 (az, y, vmulq_f64 (z2, az));
+
+commit bf2b60a56036c951a798845223a2e04cc48507e4
+Author: Joana Cruz <Joana.Cruz@arm.com>
+Date:   Tue Dec 17 14:50:33 2024 +0000
+
+    AArch64: Improve codegen of AdvSIMD expf family
+    
+    Load the polynomial evaluation coefficients into 2 vectors and use lanewise MLAs.
+    Also use intrinsics instead of native operations.
+    expf: 3% improvement in throughput microbenchmark on Neoverse V1, exp2f: 5%,
+    exp10f: 13%, coshf: 14%.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit cff9648d0b50d19cdaf685f6767add040d4e1a8e)
+
+diff --git a/sysdeps/aarch64/fpu/coshf_advsimd.c b/sysdeps/aarch64/fpu/coshf_advsimd.c
+index c1ab4923b8..cd5c866521 100644
+--- a/sysdeps/aarch64/fpu/coshf_advsimd.c
++++ b/sysdeps/aarch64/fpu/coshf_advsimd.c
+@@ -23,19 +23,27 @@
+ static const struct data
+ {
+   struct v_expf_data expf_consts;
+-  uint32x4_t tiny_bound, special_bound;
++  uint32x4_t tiny_bound;
++  float32x4_t bound;
++#if WANT_SIMD_EXCEPT
++  uint32x4_t special_bound;
++#endif
+ } data = {
+   .expf_consts = V_EXPF_DATA,
+   .tiny_bound = V4 (0x20000000), /* 0x1p-63: Round to 1 below this.  */
+   /* 0x1.5a92d8p+6: expf overflows above this, so have to use special case.  */
++  .bound = V4 (0x1.5a92d8p+6),
++#if WANT_SIMD_EXCEPT
+   .special_bound = V4 (0x42ad496c),
++#endif
+ };
+ 
+ #if !WANT_SIMD_EXCEPT
+ static float32x4_t NOINLINE VPCS_ATTR
+-special_case (float32x4_t x, float32x4_t y, uint32x4_t special)
++special_case (float32x4_t x, float32x4_t half_t, float32x4_t half_over_t,
++	      uint32x4_t special)
+ {
+-  return v_call_f32 (coshf, x, y, special);
++  return v_call_f32 (coshf, x, vaddq_f32 (half_t, half_over_t), special);
+ }
+ #endif
+ 
+@@ -47,14 +55,13 @@ float32x4_t VPCS_ATTR V_NAME_F1 (cosh) (float32x4_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+ 
+-  float32x4_t ax = vabsq_f32 (x);
+-  uint32x4_t iax = vreinterpretq_u32_f32 (ax);
+-  uint32x4_t special = vcgeq_u32 (iax, d->special_bound);
+-
+ #if WANT_SIMD_EXCEPT
+   /* If fp exceptions are to be triggered correctly, fall back to the scalar
+      variant for all inputs if any input is a special value or above the bound
+      at which expf overflows.  */
++  float32x4_t ax = vabsq_f32 (x);
++  uint32x4_t iax = vreinterpretq_u32_f32 (ax);
++  uint32x4_t special = vcgeq_u32 (iax, d->special_bound);
+   if (__glibc_unlikely (v_any_u32 (special)))
+     return v_call_f32 (coshf, x, x, v_u32 (-1));
+ 
+@@ -63,10 +70,13 @@ float32x4_t VPCS_ATTR V_NAME_F1 (cosh) (float32x4_t x)
+      input to 0, which will generate no exceptions.  */
+   if (__glibc_unlikely (v_any_u32 (tiny)))
+     ax = v_zerofy_f32 (ax, tiny);
++  float32x4_t t = v_expf_inline (ax, &d->expf_consts);
++#else
++  uint32x4_t special = vcageq_f32 (x, d->bound);
++  float32x4_t t = v_expf_inline (x, &d->expf_consts);
+ #endif
+ 
+   /* Calculate cosh by exp(x) / 2 + exp(-x) / 2.  */
+-  float32x4_t t = v_expf_inline (ax, &d->expf_consts);
+   float32x4_t half_t = vmulq_n_f32 (t, 0.5);
+   float32x4_t half_over_t = vdivq_f32 (v_f32 (0.5), t);
+ 
+@@ -75,7 +85,7 @@ float32x4_t VPCS_ATTR V_NAME_F1 (cosh) (float32x4_t x)
+     return vbslq_f32 (tiny, v_f32 (1), vaddq_f32 (half_t, half_over_t));
+ #else
+   if (__glibc_unlikely (v_any_u32 (special)))
+-    return special_case (x, vaddq_f32 (half_t, half_over_t), special);
++    return special_case (x, half_t, half_over_t, special);
+ #endif
+ 
+   return vaddq_f32 (half_t, half_over_t);
+diff --git a/sysdeps/aarch64/fpu/exp10f_advsimd.c b/sysdeps/aarch64/fpu/exp10f_advsimd.c
+index cf53e73290..55d9cd83f2 100644
+--- a/sysdeps/aarch64/fpu/exp10f_advsimd.c
++++ b/sysdeps/aarch64/fpu/exp10f_advsimd.c
+@@ -18,16 +18,15 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include "v_math.h"
+-#include "poly_advsimd_f32.h"
+ 
+ #define ScaleBound 192.0f
+ 
+ static const struct data
+ {
+-  float32x4_t poly[5];
+-  float log10_2_and_inv[4];
+-  float32x4_t shift;
+-
++  float32x4_t c0, c1, c3;
++  float log10_2_high, log10_2_low, c2, c4;
++  float32x4_t inv_log10_2, special_bound;
++  uint32x4_t exponent_bias, special_offset, special_bias;
+ #if !WANT_SIMD_EXCEPT
+   float32x4_t scale_thresh;
+ #endif
+@@ -37,19 +36,24 @@ static const struct data
+      rel error: 0x1.89dafa3p-24
+      abs error: 0x1.167d55p-23 in [-log10(2)/2, log10(2)/2]
+      maxerr: 1.85943 +0.5 ulp.  */
+-  .poly = { V4 (0x1.26bb16p+1f), V4 (0x1.5350d2p+1f), V4 (0x1.04744ap+1f),
+-	    V4 (0x1.2d8176p+0f), V4 (0x1.12b41ap-1f) },
+-  .shift = V4 (0x1.8p23f),
+-
+-  /* Stores constants 1/log10(2), log10(2)_high, log10(2)_low, 0.  */
+-  .log10_2_and_inv = { 0x1.a934fp+1, 0x1.344136p-2, -0x1.ec10cp-27, 0 },
++  .c0 = V4 (0x1.26bb16p+1f),
++  .c1 = V4 (0x1.5350d2p+1f),
++  .c2 = 0x1.04744ap+1f,
++  .c3 = V4 (0x1.2d8176p+0f),
++  .c4 = 0x1.12b41ap-1f,
++  .inv_log10_2 = V4 (0x1.a934fp+1),
++  .log10_2_high = 0x1.344136p-2,
++  .log10_2_low = 0x1.ec10cp-27,
++  /* rint (log2 (2^127 / (1 + sqrt (2)))).  */
++  .special_bound = V4 (126.0f),
++  .exponent_bias = V4 (0x3f800000),
++  .special_offset = V4 (0x82000000),
++  .special_bias = V4 (0x7f000000),
+ #if !WANT_SIMD_EXCEPT
+   .scale_thresh = V4 (ScaleBound)
+ #endif
+ };
+ 
+-#define ExponentBias v_u32 (0x3f800000)
+-
+ #if WANT_SIMD_EXCEPT
+ 
+ # define SpecialBound 38.0f	       /* rint(log10(2^127)).  */
+@@ -67,17 +71,15 @@ special_case (float32x4_t x, float32x4_t y, uint32x4_t cmp)
+ 
+ #else
+ 
+-# define SpecialBound 126.0f /* rint (log2 (2^127 / (1 + sqrt (2)))).  */
+-# define SpecialOffset v_u32 (0x82000000)
+-# define SpecialBias v_u32 (0x7f000000)
++# define SpecialBound 126.0f
+ 
+ static float32x4_t VPCS_ATTR NOINLINE
+ special_case (float32x4_t poly, float32x4_t n, uint32x4_t e, uint32x4_t cmp1,
+ 	      float32x4_t scale, const struct data *d)
+ {
+   /* 2^n may overflow, break it up into s1*s2.  */
+-  uint32x4_t b = vandq_u32 (vclezq_f32 (n), SpecialOffset);
+-  float32x4_t s1 = vreinterpretq_f32_u32 (vaddq_u32 (b, SpecialBias));
++  uint32x4_t b = vandq_u32 (vclezq_f32 (n), d->special_offset);
++  float32x4_t s1 = vreinterpretq_f32_u32 (vaddq_u32 (b, d->special_bias));
+   float32x4_t s2 = vreinterpretq_f32_u32 (vsubq_u32 (e, b));
+   uint32x4_t cmp2 = vcagtq_f32 (n, d->scale_thresh);
+   float32x4_t r2 = vmulq_f32 (s1, s1);
+@@ -112,23 +114,23 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp10) (float32x4_t x)
+   /* exp10(x) = 2^n * 10^r = 2^n * (1 + poly (r)),
+      with poly(r) in [1/sqrt(2), sqrt(2)] and
+      x = r + n * log10 (2), with r in [-log10(2)/2, log10(2)/2].  */
+-  float32x4_t log10_2_and_inv = vld1q_f32 (d->log10_2_and_inv);
+-  float32x4_t z = vfmaq_laneq_f32 (d->shift, x, log10_2_and_inv, 0);
+-  float32x4_t n = vsubq_f32 (z, d->shift);
+-  float32x4_t r = vfmsq_laneq_f32 (x, n, log10_2_and_inv, 1);
+-  r = vfmsq_laneq_f32 (r, n, log10_2_and_inv, 2);
+-  uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_f32 (z), 23);
++  float32x4_t log10_2_c24 = vld1q_f32 (&d->log10_2_high);
++  float32x4_t n = vrndaq_f32 (vmulq_f32 (x, d->inv_log10_2));
++  float32x4_t r = vfmsq_laneq_f32 (x, n, log10_2_c24, 0);
++  r = vfmaq_laneq_f32 (r, n, log10_2_c24, 1);
++  uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtaq_s32_f32 (n)), 23);
+ 
+-  float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, ExponentBias));
++  float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, d->exponent_bias));
+ 
+ #if !WANT_SIMD_EXCEPT
+-  uint32x4_t cmp = vcagtq_f32 (n, v_f32 (SpecialBound));
++  uint32x4_t cmp = vcagtq_f32 (n, d->special_bound);
+ #endif
+ 
+   float32x4_t r2 = vmulq_f32 (r, r);
+-  float32x4_t poly
+-      = vfmaq_f32 (vmulq_f32 (r, d->poly[0]),
+-		   v_pairwise_poly_3_f32 (r, r2, d->poly + 1), r2);
++  float32x4_t p12 = vfmaq_laneq_f32 (d->c1, r, log10_2_c24, 2);
++  float32x4_t p34 = vfmaq_laneq_f32 (d->c3, r, log10_2_c24, 3);
++  float32x4_t p14 = vfmaq_f32 (p12, r2, p34);
++  float32x4_t poly = vfmaq_f32 (vmulq_f32 (r, d->c0), p14, r2);
+ 
+   if (__glibc_unlikely (v_any_u32 (cmp)))
+ #if WANT_SIMD_EXCEPT
+diff --git a/sysdeps/aarch64/fpu/exp2f_advsimd.c b/sysdeps/aarch64/fpu/exp2f_advsimd.c
+index 69e0b193a1..a4220da63c 100644
+--- a/sysdeps/aarch64/fpu/exp2f_advsimd.c
++++ b/sysdeps/aarch64/fpu/exp2f_advsimd.c
+@@ -21,24 +21,28 @@
+ 
+ static const struct data
+ {
+-  float32x4_t poly[5];
+-  uint32x4_t exponent_bias;
++  float32x4_t c1, c3;
++  uint32x4_t exponent_bias, special_offset, special_bias;
+ #if !WANT_SIMD_EXCEPT
+-  float32x4_t special_bound, scale_thresh;
++  float32x4_t scale_thresh, special_bound;
+ #endif
++  float c0, c2, c4, zero;
+ } data = {
+   /* maxerr: 1.962 ulp.  */
+-  .poly = { V4 (0x1.59977ap-10f), V4 (0x1.3ce9e4p-7f), V4 (0x1.c6bd32p-5f),
+-	    V4 (0x1.ebf9bcp-3f), V4 (0x1.62e422p-1f) },
++  .c0 = 0x1.59977ap-10f,
++  .c1 = V4 (0x1.3ce9e4p-7f),
++  .c2 = 0x1.c6bd32p-5f,
++  .c3 = V4 (0x1.ebf9bcp-3f),
++  .c4 = 0x1.62e422p-1f,
+   .exponent_bias = V4 (0x3f800000),
++  .special_offset = V4 (0x82000000),
++  .special_bias = V4 (0x7f000000),
+ #if !WANT_SIMD_EXCEPT
+   .special_bound = V4 (126.0f),
+   .scale_thresh = V4 (192.0f),
+ #endif
+ };
+ 
+-#define C(i) d->poly[i]
+-
+ #if WANT_SIMD_EXCEPT
+ 
+ # define TinyBound v_u32 (0x20000000)	  /* asuint (0x1p-63).  */
+@@ -55,16 +59,13 @@ special_case (float32x4_t x, float32x4_t y, uint32x4_t cmp)
+ 
+ #else
+ 
+-# define SpecialOffset v_u32 (0x82000000)
+-# define SpecialBias v_u32 (0x7f000000)
+-
+ static float32x4_t VPCS_ATTR NOINLINE
+ special_case (float32x4_t poly, float32x4_t n, uint32x4_t e, uint32x4_t cmp1,
+ 	      float32x4_t scale, const struct data *d)
+ {
+   /* 2^n may overflow, break it up into s1*s2.  */
+-  uint32x4_t b = vandq_u32 (vclezq_f32 (n), SpecialOffset);
+-  float32x4_t s1 = vreinterpretq_f32_u32 (vaddq_u32 (b, SpecialBias));
++  uint32x4_t b = vandq_u32 (vclezq_f32 (n), d->special_offset);
++  float32x4_t s1 = vreinterpretq_f32_u32 (vaddq_u32 (b, d->special_bias));
+   float32x4_t s2 = vreinterpretq_f32_u32 (vsubq_u32 (e, b));
+   uint32x4_t cmp2 = vcagtq_f32 (n, d->scale_thresh);
+   float32x4_t r2 = vmulq_f32 (s1, s1);
+@@ -80,13 +81,11 @@ special_case (float32x4_t poly, float32x4_t n, uint32x4_t e, uint32x4_t cmp1,
+ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp2) (float32x4_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+-  float32x4_t n, r, r2, scale, p, q, poly;
+-  uint32x4_t cmp, e;
+ 
+ #if WANT_SIMD_EXCEPT
+   /* asuint(|x|) - TinyBound >= BigBound - TinyBound.  */
+   uint32x4_t ia = vreinterpretq_u32_f32 (vabsq_f32 (x));
+-  cmp = vcgeq_u32 (vsubq_u32 (ia, TinyBound), SpecialBound);
++  uint32x4_t cmp = vcgeq_u32 (vsubq_u32 (ia, TinyBound), SpecialBound);
+   float32x4_t xm = x;
+   /* If any lanes are special, mask them with 1 and retain a copy of x to allow
+      special_case to fix special lanes later. This is only necessary if fenv
+@@ -95,23 +94,24 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp2) (float32x4_t x)
+     x = vbslq_f32 (cmp, v_f32 (1), x);
+ #endif
+ 
+-    /* exp2(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)]
+-       x = n + r, with r in [-1/2, 1/2].  */
+-  n = vrndaq_f32 (x);
+-  r = vsubq_f32 (x, n);
+-  e = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtaq_s32_f32 (x)), 23);
+-  scale = vreinterpretq_f32_u32 (vaddq_u32 (e, d->exponent_bias));
++  /* exp2(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)]
++     x = n + r, with r in [-1/2, 1/2].  */
++  float32x4_t n = vrndaq_f32 (x);
++  float32x4_t r = vsubq_f32 (x, n);
++  uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtaq_s32_f32 (x)), 23);
++  float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, d->exponent_bias));
+ 
+ #if !WANT_SIMD_EXCEPT
+-  cmp = vcagtq_f32 (n, d->special_bound);
++  uint32x4_t cmp = vcagtq_f32 (n, d->special_bound);
+ #endif
+ 
+-  r2 = vmulq_f32 (r, r);
+-  p = vfmaq_f32 (C (1), C (0), r);
+-  q = vfmaq_f32 (C (3), C (2), r);
++  float32x4_t c024 = vld1q_f32 (&d->c0);
++  float32x4_t r2 = vmulq_f32 (r, r);
++  float32x4_t p = vfmaq_laneq_f32 (d->c1, r, c024, 0);
++  float32x4_t q = vfmaq_laneq_f32 (d->c3, r, c024, 1);
+   q = vfmaq_f32 (q, p, r2);
+-  p = vmulq_f32 (C (4), r);
+-  poly = vfmaq_f32 (p, q, r2);
++  p = vmulq_laneq_f32 (r, c024, 2);
++  float32x4_t poly = vfmaq_f32 (p, q, r2);
+ 
+   if (__glibc_unlikely (v_any_u32 (cmp)))
+ #if WANT_SIMD_EXCEPT
+diff --git a/sysdeps/aarch64/fpu/expf_advsimd.c b/sysdeps/aarch64/fpu/expf_advsimd.c
+index 5c9cb72620..70f137e2e5 100644
+--- a/sysdeps/aarch64/fpu/expf_advsimd.c
++++ b/sysdeps/aarch64/fpu/expf_advsimd.c
+@@ -21,20 +21,25 @@
+ 
+ static const struct data
+ {
+-  float32x4_t poly[5];
+-  float32x4_t inv_ln2, ln2_hi, ln2_lo;
+-  uint32x4_t exponent_bias;
++  float32x4_t c1, c3, c4, inv_ln2;
++  float ln2_hi, ln2_lo, c0, c2;
++  uint32x4_t exponent_bias, special_offset, special_bias;
+ #if !WANT_SIMD_EXCEPT
+   float32x4_t special_bound, scale_thresh;
+ #endif
+ } data = {
+   /* maxerr: 1.45358 +0.5 ulp.  */
+-  .poly = { V4 (0x1.0e4020p-7f), V4 (0x1.573e2ep-5f), V4 (0x1.555e66p-3f),
+-	    V4 (0x1.fffdb6p-2f), V4 (0x1.ffffecp-1f) },
++  .c0 = 0x1.0e4020p-7f,
++  .c1 = V4 (0x1.573e2ep-5f),
++  .c2 = 0x1.555e66p-3f,
++  .c3 = V4 (0x1.fffdb6p-2f),
++  .c4 = V4 (0x1.ffffecp-1f),
+   .inv_ln2 = V4 (0x1.715476p+0f),
+-  .ln2_hi = V4 (0x1.62e4p-1f),
+-  .ln2_lo = V4 (0x1.7f7d1cp-20f),
++  .ln2_hi = 0x1.62e4p-1f,
++  .ln2_lo = 0x1.7f7d1cp-20f,
+   .exponent_bias = V4 (0x3f800000),
++  .special_offset = V4 (0x82000000),
++  .special_bias = V4 (0x7f000000),
+ #if !WANT_SIMD_EXCEPT
+   .special_bound = V4 (126.0f),
+   .scale_thresh = V4 (192.0f),
+@@ -59,19 +64,17 @@ special_case (float32x4_t x, float32x4_t y, uint32x4_t cmp)
+ 
+ #else
+ 
+-# define SpecialOffset v_u32 (0x82000000)
+-# define SpecialBias v_u32 (0x7f000000)
+-
+ static float32x4_t VPCS_ATTR NOINLINE
+ special_case (float32x4_t poly, float32x4_t n, uint32x4_t e, uint32x4_t cmp1,
+ 	      float32x4_t scale, const struct data *d)
+ {
+   /* 2^n may overflow, break it up into s1*s2.  */
+-  uint32x4_t b = vandq_u32 (vclezq_f32 (n), SpecialOffset);
+-  float32x4_t s1 = vreinterpretq_f32_u32 (vaddq_u32 (b, SpecialBias));
++  uint32x4_t b = vandq_u32 (vclezq_f32 (n), d->special_offset);
++  float32x4_t s1 = vreinterpretq_f32_u32 (vaddq_u32 (b, d->special_bias));
+   float32x4_t s2 = vreinterpretq_f32_u32 (vsubq_u32 (e, b));
+   uint32x4_t cmp2 = vcagtq_f32 (n, d->scale_thresh);
+   float32x4_t r2 = vmulq_f32 (s1, s1);
++  // (s2 + p*s2)*s1 = s2(p+1)s1
+   float32x4_t r1 = vmulq_f32 (vfmaq_f32 (s2, poly, s2), s1);
+   /* Similar to r1 but avoids double rounding in the subnormal range.  */
+   float32x4_t r0 = vfmaq_f32 (scale, poly, scale);
+@@ -84,12 +87,11 @@ special_case (float32x4_t poly, float32x4_t n, uint32x4_t e, uint32x4_t cmp1,
+ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp) (float32x4_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+-  float32x4_t n, r, r2, scale, p, q, poly;
+-  uint32x4_t cmp, e;
++  float32x4_t ln2_c02 = vld1q_f32 (&d->ln2_hi);
+ 
+ #if WANT_SIMD_EXCEPT
+   /* asuint(x) - TinyBound >= BigBound - TinyBound.  */
+-  cmp = vcgeq_u32 (
++  uint32x4_t cmp = vcgeq_u32 (
+       vsubq_u32 (vandq_u32 (vreinterpretq_u32_f32 (x), v_u32 (0x7fffffff)),
+ 		 TinyBound),
+       SpecialBound);
+@@ -103,22 +105,22 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp) (float32x4_t x)
+ 
+   /* exp(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)]
+      x = ln2*n + r, with r in [-ln2/2, ln2/2].  */
+-  n = vrndaq_f32 (vmulq_f32 (x, d->inv_ln2));
+-  r = vfmsq_f32 (x, n, d->ln2_hi);
+-  r = vfmsq_f32 (r, n, d->ln2_lo);
+-  e = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtq_s32_f32 (n)), 23);
+-  scale = vreinterpretq_f32_u32 (vaddq_u32 (e, d->exponent_bias));
++  float32x4_t n = vrndaq_f32 (vmulq_f32 (x, d->inv_ln2));
++  float32x4_t r = vfmsq_laneq_f32 (x, n, ln2_c02, 0);
++  r = vfmsq_laneq_f32 (r, n, ln2_c02, 1);
++  uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtq_s32_f32 (n)), 23);
++  float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, d->exponent_bias));
+ 
+ #if !WANT_SIMD_EXCEPT
+-  cmp = vcagtq_f32 (n, d->special_bound);
++  uint32x4_t cmp = vcagtq_f32 (n, d->special_bound);
+ #endif
+ 
+-  r2 = vmulq_f32 (r, r);
+-  p = vfmaq_f32 (C (1), C (0), r);
+-  q = vfmaq_f32 (C (3), C (2), r);
++  float32x4_t r2 = vmulq_f32 (r, r);
++  float32x4_t p = vfmaq_laneq_f32 (d->c1, r, ln2_c02, 2);
++  float32x4_t q = vfmaq_laneq_f32 (d->c3, r, ln2_c02, 3);
+   q = vfmaq_f32 (q, p, r2);
+-  p = vmulq_f32 (C (4), r);
+-  poly = vfmaq_f32 (p, q, r2);
++  p = vmulq_f32 (d->c4, r);
++  float32x4_t poly = vfmaq_f32 (p, q, r2);
+ 
+   if (__glibc_unlikely (v_any_u32 (cmp)))
+ #if WANT_SIMD_EXCEPT
+diff --git a/sysdeps/aarch64/fpu/v_expf_inline.h b/sysdeps/aarch64/fpu/v_expf_inline.h
+index 08b06e0a6b..eacd2af241 100644
+--- a/sysdeps/aarch64/fpu/v_expf_inline.h
++++ b/sysdeps/aarch64/fpu/v_expf_inline.h
+@@ -24,50 +24,45 @@
+ 
+ struct v_expf_data
+ {
+-  float32x4_t poly[5];
+-  float32x4_t shift;
+-  float invln2_and_ln2[4];
++  float ln2_hi, ln2_lo, c0, c2;
++  float32x4_t inv_ln2, c1, c3, c4;
++  /* asuint(1.0f).  */
++  uint32x4_t exponent_bias;
+ };
+ 
+ /* maxerr: 1.45358 +0.5 ulp.  */
+ #define V_EXPF_DATA                                                           \
+   {                                                                           \
+-    .poly = { V4 (0x1.0e4020p-7f), V4 (0x1.573e2ep-5f), V4 (0x1.555e66p-3f),  \
+-	      V4 (0x1.fffdb6p-2f), V4 (0x1.ffffecp-1f) },                     \
+-    .shift = V4 (0x1.8p23f),                                                  \
+-    .invln2_and_ln2 = { 0x1.715476p+0f, 0x1.62e4p-1f, 0x1.7f7d1cp-20f, 0 },   \
++    .c0 = 0x1.0e4020p-7f, .c1 = V4 (0x1.573e2ep-5f), .c2 = 0x1.555e66p-3f,    \
++    .c3 = V4 (0x1.fffdb6p-2f), .c4 = V4 (0x1.ffffecp-1f),                     \
++    .ln2_hi = 0x1.62e4p-1f, .ln2_lo = 0x1.7f7d1cp-20f,                        \
++    .inv_ln2 = V4 (0x1.715476p+0f), .exponent_bias = V4 (0x3f800000),         \
+   }
+ 
+-#define ExponentBias v_u32 (0x3f800000) /* asuint(1.0f).  */
+-#define C(i) d->poly[i]
+-
+ static inline float32x4_t
+ v_expf_inline (float32x4_t x, const struct v_expf_data *d)
+ {
+-  /* Helper routine for calculating exp(x).
++  /* Helper routine for calculating exp(ax).
+      Copied from v_expf.c, with all special-case handling removed - the
+      calling routine should handle special values if required.  */
+ 
+-  /* exp(x) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)]
+-     x = ln2*n + r, with r in [-ln2/2, ln2/2].  */
+-  float32x4_t n, r, z;
+-  float32x4_t invln2_and_ln2 = vld1q_f32 (d->invln2_and_ln2);
+-  z = vfmaq_laneq_f32 (d->shift, x, invln2_and_ln2, 0);
+-  n = vsubq_f32 (z, d->shift);
+-  r = vfmsq_laneq_f32 (x, n, invln2_and_ln2, 1);
+-  r = vfmsq_laneq_f32 (r, n, invln2_and_ln2, 2);
+-  uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_f32 (z), 23);
+-  float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, ExponentBias));
++  /* exp(ax) = 2^n (1 + poly(r)), with 1 + poly(r) in [1/sqrt(2),sqrt(2)]
++     ax = ln2*n + r, with r in [-ln2/2, ln2/2].  */
++  float32x4_t ax = vabsq_f32 (x);
++  float32x4_t ln2_c02 = vld1q_f32 (&d->ln2_hi);
++  float32x4_t n = vrndaq_f32 (vmulq_f32 (ax, d->inv_ln2));
++  float32x4_t r = vfmsq_laneq_f32 (ax, n, ln2_c02, 0);
++  r = vfmsq_laneq_f32 (r, n, ln2_c02, 1);
++  uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_s32 (vcvtq_s32_f32 (n)), 23);
++  float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, d->exponent_bias));
+ 
+   /* Custom order-4 Estrin avoids building high order monomial.  */
+   float32x4_t r2 = vmulq_f32 (r, r);
+-  float32x4_t p, q, poly;
+-  p = vfmaq_f32 (C (1), C (0), r);
+-  q = vfmaq_f32 (C (3), C (2), r);
++  float32x4_t p = vfmaq_laneq_f32 (d->c1, r, ln2_c02, 2);
++  float32x4_t q = vfmaq_laneq_f32 (d->c3, r, ln2_c02, 3);
+   q = vfmaq_f32 (q, p, r2);
+-  p = vmulq_f32 (C (4), r);
+-  poly = vfmaq_f32 (p, q, r2);
++  p = vmulq_f32 (d->c4, r);
++  float32x4_t poly = vfmaq_f32 (p, q, r2);
+   return vfmaq_f32 (scale, poly, scale);
+ }
+-
+ #endif
+
+commit abfd20ebbd2883f2c6e5f16709f7b9781c3c8068
+Author: Luna Lamb <luna.lamb@arm.com>
+Date:   Fri Jan 3 19:00:12 2025 +0000
+
+    AArch64: Improve codegen in AdvSIMD asinh
+    
+    Improves memory access and removes spills.
+    Load the polynomial evaluation coefficients into 2 vectors and use lanewise
+    MLAs.  Reduces MOVs 6->3 , LDR 11->5, STR/STP 2->0, ADRP 3->2.
+    
+    (cherry picked from commit 140b985e5a2071000122b3cb63ebfe88cf21dd29)
+
+diff --git a/sysdeps/aarch64/fpu/asinh_advsimd.c b/sysdeps/aarch64/fpu/asinh_advsimd.c
+index 6207e7da95..2739f98b39 100644
+--- a/sysdeps/aarch64/fpu/asinh_advsimd.c
++++ b/sysdeps/aarch64/fpu/asinh_advsimd.c
+@@ -20,41 +20,71 @@
+ #include "v_math.h"
+ #include "poly_advsimd_f64.h"
+ 
+-#define A(i) v_f64 (__v_log_data.poly[i])
+-#define N (1 << V_LOG_TABLE_BITS)
+-#define IndexMask (N - 1)
+-
+ const static struct data
+ {
+-  float64x2_t poly[18];
+-  uint64x2_t off, huge_bound, abs_mask;
+-  float64x2_t ln2, tiny_bound;
++  uint64x2_t huge_bound, abs_mask, off, mask;
++#if WANT_SIMD_EXCEPT
++  float64x2_t tiny_bound;
++#endif
++  float64x2_t lc0, lc2;
++  double lc1, lc3, ln2, lc4;
++
++  float64x2_t c0, c2, c4, c6, c8, c10, c12, c14, c16, c17;
++  double c1, c3, c5, c7, c9, c11, c13, c15;
++
+ } data = {
+-  .off = V2 (0x3fe6900900000000),
+-  .ln2 = V2 (0x1.62e42fefa39efp-1),
+-  .huge_bound = V2 (0x5fe0000000000000),
++
++#if WANT_SIMD_EXCEPT
+   .tiny_bound = V2 (0x1p-26),
+-  .abs_mask = V2 (0x7fffffffffffffff),
++#endif
+   /* Even terms of polynomial s.t. asinh(x) is approximated by
+      asinh(x) ~= x + x^3 * (C0 + C1 * x + C2 * x^2 + C3 * x^3 + ...).
+      Generated using Remez, f = (asinh(sqrt(x)) - sqrt(x))/x^(3/2).  */
+-  .poly = { V2 (-0x1.55555555554a7p-3), V2 (0x1.3333333326c7p-4),
+-	    V2 (-0x1.6db6db68332e6p-5), V2 (0x1.f1c71b26fb40dp-6),
+-	    V2 (-0x1.6e8b8b654a621p-6), V2 (0x1.1c4daa9e67871p-6),
+-	    V2 (-0x1.c9871d10885afp-7), V2 (0x1.7a16e8d9d2ecfp-7),
+-	    V2 (-0x1.3ddca533e9f54p-7), V2 (0x1.0becef748dafcp-7),
+-	    V2 (-0x1.b90c7099dd397p-8), V2 (0x1.541f2bb1ffe51p-8),
+-	    V2 (-0x1.d217026a669ecp-9), V2 (0x1.0b5c7977aaf7p-9),
+-	    V2 (-0x1.e0f37daef9127p-11), V2 (0x1.388b5fe542a6p-12),
+-	    V2 (-0x1.021a48685e287p-14), V2 (0x1.93d4ba83d34dap-18) },
++
++  .c0 = V2 (-0x1.55555555554a7p-3),
++  .c1 = 0x1.3333333326c7p-4,
++  .c2 = V2 (-0x1.6db6db68332e6p-5),
++  .c3 = 0x1.f1c71b26fb40dp-6,
++  .c4 = V2 (-0x1.6e8b8b654a621p-6),
++  .c5 = 0x1.1c4daa9e67871p-6,
++  .c6 = V2 (-0x1.c9871d10885afp-7),
++  .c7 = 0x1.7a16e8d9d2ecfp-7,
++  .c8 = V2 (-0x1.3ddca533e9f54p-7),
++  .c9 = 0x1.0becef748dafcp-7,
++  .c10 = V2 (-0x1.b90c7099dd397p-8),
++  .c11 = 0x1.541f2bb1ffe51p-8,
++  .c12 = V2 (-0x1.d217026a669ecp-9),
++  .c13 = 0x1.0b5c7977aaf7p-9,
++  .c14 = V2 (-0x1.e0f37daef9127p-11),
++  .c15 = 0x1.388b5fe542a6p-12,
++  .c16 = V2 (-0x1.021a48685e287p-14),
++  .c17 = V2 (0x1.93d4ba83d34dap-18),
++
++  .lc0 = V2 (-0x1.ffffffffffff7p-2),
++  .lc1 = 0x1.55555555170d4p-2,
++  .lc2 = V2 (-0x1.0000000399c27p-2),
++  .lc3 = 0x1.999b2e90e94cap-3,
++  .lc4 = -0x1.554e550bd501ep-3,
++  .ln2 = 0x1.62e42fefa39efp-1,
++
++  .off = V2 (0x3fe6900900000000),
++  .huge_bound = V2 (0x5fe0000000000000),
++  .abs_mask = V2 (0x7fffffffffffffff),
++  .mask = V2 (0xfffULL << 52),
+ };
+ 
+ static float64x2_t NOINLINE VPCS_ATTR
+-special_case (float64x2_t x, float64x2_t y, uint64x2_t special)
++special_case (float64x2_t x, float64x2_t y, uint64x2_t abs_mask,
++	      uint64x2_t special)
+ {
++  /* Copy sign.  */
++  y = vbslq_f64 (abs_mask, y, x);
+   return v_call_f64 (asinh, x, y, special);
+ }
+ 
++#define N (1 << V_LOG_TABLE_BITS)
++#define IndexMask (N - 1)
++
+ struct entry
+ {
+   float64x2_t invc;
+@@ -76,27 +106,34 @@ lookup (uint64x2_t i)
+ }
+ 
+ static inline float64x2_t
+-log_inline (float64x2_t x, const struct data *d)
++log_inline (float64x2_t xm, const struct data *d)
+ {
+-  /* Double-precision vector log, copied from ordinary vector log with some
+-     cosmetic modification and special-cases removed.  */
+-  uint64x2_t ix = vreinterpretq_u64_f64 (x);
+-  uint64x2_t tmp = vsubq_u64 (ix, d->off);
+-  int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (tmp), 52);
+-  uint64x2_t iz
+-      = vsubq_u64 (ix, vandq_u64 (tmp, vdupq_n_u64 (0xfffULL << 52)));
++
++  uint64x2_t u = vreinterpretq_u64_f64 (xm);
++  uint64x2_t u_off = vsubq_u64 (u, d->off);
++
++  int64x2_t k = vshrq_n_s64 (vreinterpretq_s64_u64 (u_off), 52);
++  uint64x2_t iz = vsubq_u64 (u, vandq_u64 (u_off, d->mask));
+   float64x2_t z = vreinterpretq_f64_u64 (iz);
+-  struct entry e = lookup (tmp);
++
++  struct entry e = lookup (u_off);
++
++  /* log(x) = log1p(z/c-1) + log(c) + k*Ln2.  */
+   float64x2_t r = vfmaq_f64 (v_f64 (-1.0), z, e.invc);
+   float64x2_t kd = vcvtq_f64_s64 (k);
+-  float64x2_t hi = vfmaq_f64 (vaddq_f64 (e.logc, r), kd, d->ln2);
++
++  /* hi = r + log(c) + k*Ln2.  */
++  float64x2_t ln2_and_lc4 = vld1q_f64 (&d->ln2);
++  float64x2_t hi = vfmaq_laneq_f64 (vaddq_f64 (e.logc, r), kd, ln2_and_lc4, 0);
++
++  /* y = r2*(A0 + r*A1 + r2*(A2 + r*A3 + r2*A4)) + hi.  */
++  float64x2_t odd_coeffs = vld1q_f64 (&d->lc1);
+   float64x2_t r2 = vmulq_f64 (r, r);
+-  float64x2_t y = vfmaq_f64 (A (2), A (3), r);
+-  float64x2_t p = vfmaq_f64 (A (0), A (1), r);
+-  y = vfmaq_f64 (y, A (4), r2);
+-  y = vfmaq_f64 (p, y, r2);
+-  y = vfmaq_f64 (hi, y, r2);
+-  return y;
++  float64x2_t y = vfmaq_laneq_f64 (d->lc2, r, odd_coeffs, 1);
++  float64x2_t p = vfmaq_laneq_f64 (d->lc0, r, odd_coeffs, 0);
++  y = vfmaq_laneq_f64 (y, r2, ln2_and_lc4, 1);
++  y = vfmaq_f64 (p, r2, y);
++  return vfmaq_f64 (hi, y, r2);
+ }
+ 
+ /* Double-precision implementation of vector asinh(x).
+@@ -106,23 +143,24 @@ log_inline (float64x2_t x, const struct data *d)
+    asinh(x) = sign(x) * log(|x| + sqrt(x^2 + 1)      if |x| >= 1
+ 	    = sign(x) * (|x| + |x|^3 * P(x^2))       otherwise
+    where log(x) is an optimized log approximation, and P(x) is a polynomial
+-   shared with the scalar routine. The greatest observed error 3.29 ULP, in
++   shared with the scalar routine. The greatest observed error 2.79 ULP, in
+    |x| >= 1:
+-   __v_asinh(0x1.2cd9d717e2c9bp+0) got 0x1.ffffcfd0e234fp-1
+-				  want 0x1.ffffcfd0e2352p-1.  */
++   _ZGVnN2v_asinh(0x1.2cd9d73ea76a6p+0) got 0x1.ffffd003219dap-1
++				       want  0x1.ffffd003219ddp-1.  */
+ VPCS_ATTR float64x2_t V_NAME_D1 (asinh) (float64x2_t x)
+ {
+   const struct data *d = ptr_barrier (&data);
+-
+   float64x2_t ax = vabsq_f64 (x);
+-  uint64x2_t iax = vreinterpretq_u64_f64 (ax);
+ 
+   uint64x2_t gt1 = vcgeq_f64 (ax, v_f64 (1));
+-  uint64x2_t special = vcgeq_u64 (iax, d->huge_bound);
+ 
+ #if WANT_SIMD_EXCEPT
++  uint64x2_t iax = vreinterpretq_u64_f64 (ax);
++  uint64x2_t special = vcgeq_u64 (iax, (d->huge_bound));
+   uint64x2_t tiny = vcltq_f64 (ax, d->tiny_bound);
+   special = vorrq_u64 (special, tiny);
++#else
++  uint64x2_t special = vcgeq_f64 (ax, vreinterpretq_f64_u64 (d->huge_bound));
+ #endif
+ 
+   /* Option 1: |x| >= 1.
+@@ -147,19 +185,45 @@ VPCS_ATTR float64x2_t V_NAME_D1 (asinh) (float64x2_t x)
+      overflow, and tiny lanes, which will underflow, by setting them to 0. They
+      will be fixed later, either by selecting x or falling back to the scalar
+      special-case. The largest observed error in this region is 1.47 ULPs:
+-     __v_asinh(0x1.fdfcd00cc1e6ap-1) got 0x1.c1d6bf874019bp-1
+-				    want 0x1.c1d6bf874019cp-1.  */
++     _ZGVnN2v_asinh(0x1.fdfcd00cc1e6ap-1) got 0x1.c1d6bf874019bp-1
++					 want 0x1.c1d6bf874019cp-1.  */
+   float64x2_t option_2 = v_f64 (0);
++
+   if (__glibc_likely (v_any_u64 (vceqzq_u64 (gt1))))
+     {
++
+ #if WANT_SIMD_EXCEPT
+       ax = v_zerofy_f64 (ax, vorrq_u64 (tiny, gt1));
+ #endif
+-      float64x2_t x2 = vmulq_f64 (ax, ax), x3 = vmulq_f64 (ax, x2),
+-		  z2 = vmulq_f64 (x2, x2), z4 = vmulq_f64 (z2, z2),
+-		  z8 = vmulq_f64 (z4, z4), z16 = vmulq_f64 (z8, z8);
+-      float64x2_t p = v_estrin_17_f64 (x2, z2, z4, z8, z16, d->poly);
+-      option_2 = vfmaq_f64 (ax, p, x3);
++      float64x2_t x2 = vmulq_f64 (ax, ax), z2 = vmulq_f64 (x2, x2);
++      /* Order-17 Pairwise Horner scheme.  */
++      float64x2_t c13 = vld1q_f64 (&d->c1);
++      float64x2_t c57 = vld1q_f64 (&d->c5);
++      float64x2_t c911 = vld1q_f64 (&d->c9);
++      float64x2_t c1315 = vld1q_f64 (&d->c13);
++
++      float64x2_t p01 = vfmaq_laneq_f64 (d->c0, x2, c13, 0);
++      float64x2_t p23 = vfmaq_laneq_f64 (d->c2, x2, c13, 1);
++      float64x2_t p45 = vfmaq_laneq_f64 (d->c4, x2, c57, 0);
++      float64x2_t p67 = vfmaq_laneq_f64 (d->c6, x2, c57, 1);
++      float64x2_t p89 = vfmaq_laneq_f64 (d->c8, x2, c911, 0);
++      float64x2_t p1011 = vfmaq_laneq_f64 (d->c10, x2, c911, 1);
++      float64x2_t p1213 = vfmaq_laneq_f64 (d->c12, x2, c1315, 0);
++      float64x2_t p1415 = vfmaq_laneq_f64 (d->c14, x2, c1315, 1);
++      float64x2_t p1617 = vfmaq_f64 (d->c16, x2, d->c17);
++
++      float64x2_t p = vfmaq_f64 (p1415, z2, p1617);
++      p = vfmaq_f64 (p1213, z2, p);
++      p = vfmaq_f64 (p1011, z2, p);
++      p = vfmaq_f64 (p89, z2, p);
++
++      p = vfmaq_f64 (p67, z2, p);
++      p = vfmaq_f64 (p45, z2, p);
++
++      p = vfmaq_f64 (p23, z2, p);
++
++      p = vfmaq_f64 (p01, z2, p);
++      option_2 = vfmaq_f64 (ax, p, vmulq_f64 (ax, x2));
+ #if WANT_SIMD_EXCEPT
+       option_2 = vbslq_f64 (tiny, x, option_2);
+ #endif
+@@ -167,10 +231,10 @@ VPCS_ATTR float64x2_t V_NAME_D1 (asinh) (float64x2_t x)
+ 
+   /* Choose the right option for each lane.  */
+   float64x2_t y = vbslq_f64 (gt1, option_1, option_2);
+-  /* Copy sign.  */
+-  y = vbslq_f64 (d->abs_mask, y, x);
+-
+   if (__glibc_unlikely (v_any_u64 (special)))
+-    return special_case (x, y, special);
+-  return y;
++    {
++      return special_case (x, y, d->abs_mask, special);
++    }
++  /* Copy sign.  */
++  return vbslq_f64 (d->abs_mask, y, x);
+ }
+
+commit 5f45c0f91eae99b7d49f5c63b900441eb3491213
+Author: Luna Lamb <luna.lamb@arm.com>
+Date:   Fri Jan 3 19:02:52 2025 +0000
+
+    AArch64: Improve codegen in SVE tans
+    
+    Improves memory access.
+    Tan: MOVPRFX 7 -> 2, LD1RD 12 -> 5, move MOV away from return.
+    Tanf: MOV 2 -> 1, MOVPRFX 6 -> 3, LD1RW 5 -> 4, move mov away from return.
+    
+    (cherry picked from commit aa6609feb20ebf8653db639dabe2a6afc77b02cc)
+
+diff --git a/sysdeps/aarch64/fpu/tan_sve.c b/sysdeps/aarch64/fpu/tan_sve.c
+index b2e4447316..a7318fd417 100644
+--- a/sysdeps/aarch64/fpu/tan_sve.c
++++ b/sysdeps/aarch64/fpu/tan_sve.c
+@@ -22,24 +22,38 @@
+ 
+ static const struct data
+ {
+-  double poly[9];
+-  double half_pi_hi, half_pi_lo, inv_half_pi, range_val, shift;
++  double c2, c4, c6, c8;
++  double poly_1357[4];
++  double c0, inv_half_pi;
++  double half_pi_hi, half_pi_lo, range_val;
+ } data = {
+   /* Polynomial generated with FPMinimax.  */
+-  .poly = { 0x1.5555555555556p-2, 0x1.1111111110a63p-3, 0x1.ba1ba1bb46414p-5,
+-	    0x1.664f47e5b5445p-6, 0x1.226e5e5ecdfa3p-7, 0x1.d6c7ddbf87047p-9,
+-	    0x1.7ea75d05b583ep-10, 0x1.289f22964a03cp-11,
+-	    0x1.4e4fd14147622p-12, },
++  .c2 = 0x1.ba1ba1bb46414p-5,
++  .c4 = 0x1.226e5e5ecdfa3p-7,
++  .c6 = 0x1.7ea75d05b583ep-10,
++  .c8 = 0x1.4e4fd14147622p-12,
++  .poly_1357 = { 0x1.1111111110a63p-3, 0x1.664f47e5b5445p-6,
++		 0x1.d6c7ddbf87047p-9, 0x1.289f22964a03cp-11 },
++  .c0 = 0x1.5555555555556p-2,
++  .inv_half_pi = 0x1.45f306dc9c883p-1,
+   .half_pi_hi = 0x1.921fb54442d18p0,
+   .half_pi_lo = 0x1.1a62633145c07p-54,
+-  .inv_half_pi = 0x1.45f306dc9c883p-1,
+   .range_val = 0x1p23,
+-  .shift = 0x1.8p52,
+ };
+ 
+ static svfloat64_t NOINLINE
+-special_case (svfloat64_t x, svfloat64_t y, svbool_t special)
++special_case (svfloat64_t x, svfloat64_t p, svfloat64_t q, svbool_t pg,
++	      svbool_t special)
+ {
++  svbool_t use_recip = svcmpeq (
++      pg, svand_x (pg, svreinterpret_u64 (svcvt_s64_x (pg, q)), 1), 0);
++
++  svfloat64_t n = svmad_x (pg, p, p, -1);
++  svfloat64_t d = svmul_x (svptrue_b64 (), p, 2);
++  svfloat64_t swap = n;
++  n = svneg_m (n, use_recip, d);
++  d = svsel (use_recip, swap, d);
++  svfloat64_t y = svdiv_x (svnot_z (pg, special), n, d);
+   return sv_call_f64 (tan, x, y, special);
+ }
+ 
+@@ -50,15 +64,10 @@ special_case (svfloat64_t x, svfloat64_t y, svbool_t special)
+ svfloat64_t SV_NAME_D1 (tan) (svfloat64_t x, svbool_t pg)
+ {
+   const struct data *dat = ptr_barrier (&data);
+-
+-  /* Invert condition to catch NaNs and Infs as well as large values.  */
+-  svbool_t special = svnot_z (pg, svaclt (pg, x, dat->range_val));
+-
++  svfloat64_t half_pi_c0 = svld1rq (svptrue_b64 (), &dat->c0);
+   /* q = nearest integer to 2 * x / pi.  */
+-  svfloat64_t shift = sv_f64 (dat->shift);
+-  svfloat64_t q = svmla_x (pg, shift, x, dat->inv_half_pi);
+-  q = svsub_x (pg, q, shift);
+-  svint64_t qi = svcvt_s64_x (pg, q);
++  svfloat64_t q = svmul_lane (x, half_pi_c0, 1);
++  q = svrinta_x (pg, q);
+ 
+   /* Use q to reduce x to r in [-pi/4, pi/4], by:
+      r = x - q * pi/2, in extended precision.  */
+@@ -68,7 +77,7 @@ svfloat64_t SV_NAME_D1 (tan) (svfloat64_t x, svbool_t pg)
+   r = svmls_lane (r, q, half_pi, 1);
+   /* Further reduce r to [-pi/8, pi/8], to be reconstructed using double angle
+      formula.  */
+-  r = svmul_x (pg, r, 0.5);
++  r = svmul_x (svptrue_b64 (), r, 0.5);
+ 
+   /* Approximate tan(r) using order 8 polynomial.
+      tan(x) is odd, so polynomial has the form:
+@@ -76,29 +85,51 @@ svfloat64_t SV_NAME_D1 (tan) (svfloat64_t x, svbool_t pg)
+      Hence we first approximate P(r) = C1 + C2 * r^2 + C3 * r^4 + ...
+      Then compute the approximation by:
+      tan(r) ~= r + r^3 * (C0 + r^2 * P(r)).  */
+-  svfloat64_t r2 = svmul_x (pg, r, r);
+-  svfloat64_t r4 = svmul_x (pg, r2, r2);
+-  svfloat64_t r8 = svmul_x (pg, r4, r4);
++
++  svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r);
++  svfloat64_t r4 = svmul_x (svptrue_b64 (), r2, r2);
++  svfloat64_t r8 = svmul_x (svptrue_b64 (), r4, r4);
+   /* Use offset version coeff array by 1 to evaluate from C1 onwards.  */
+-  svfloat64_t p = sv_estrin_7_f64_x (pg, r2, r4, r8, dat->poly + 1);
+-  p = svmad_x (pg, p, r2, dat->poly[0]);
+-  p = svmla_x (pg, r, r2, svmul_x (pg, p, r));
++  svfloat64_t C_24 = svld1rq (svptrue_b64 (), &dat->c2);
++  svfloat64_t C_68 = svld1rq (svptrue_b64 (), &dat->c6);
++
++  /* Use offset version coeff array by 1 to evaluate from C1 onwards.  */
++  svfloat64_t p01 = svmla_lane (sv_f64 (dat->poly_1357[0]), r2, C_24, 0);
++  svfloat64_t p23 = svmla_lane_f64 (sv_f64 (dat->poly_1357[1]), r2, C_24, 1);
++  svfloat64_t p03 = svmla_x (pg, p01, p23, r4);
++
++  svfloat64_t p45 = svmla_lane (sv_f64 (dat->poly_1357[2]), r2, C_68, 0);
++  svfloat64_t p67 = svmla_lane (sv_f64 (dat->poly_1357[3]), r2, C_68, 1);
++  svfloat64_t p47 = svmla_x (pg, p45, p67, r4);
++
++  svfloat64_t p = svmla_x (pg, p03, p47, r8);
++
++  svfloat64_t z = svmul_x (svptrue_b64 (), p, r);
++  z = svmul_x (svptrue_b64 (), r2, z);
++  z = svmla_lane (z, r, half_pi_c0, 0);
++  p = svmla_x (pg, r, r2, z);
+ 
+   /* Recombination uses double-angle formula:
+      tan(2x) = 2 * tan(x) / (1 - (tan(x))^2)
+      and reciprocity around pi/2:
+      tan(x) = 1 / (tan(pi/2 - x))
+      to assemble result using change-of-sign and conditional selection of
+-     numerator/denominator dependent on odd/even-ness of q (hence quadrant).  */
+-  svbool_t use_recip
+-      = svcmpeq (pg, svand_x (pg, svreinterpret_u64 (qi), 1), 0);
++     numerator/denominator dependent on odd/even-ness of q (quadrant).  */
++
++  /* Invert condition to catch NaNs and Infs as well as large values.  */
++  svbool_t special = svnot_z (pg, svaclt (pg, x, dat->range_val));
++
++  if (__glibc_unlikely (svptest_any (pg, special)))
++    {
++      return special_case (x, p, q, pg, special);
++    }
++  svbool_t use_recip = svcmpeq (
++      pg, svand_x (pg, svreinterpret_u64 (svcvt_s64_x (pg, q)), 1), 0);
+ 
+   svfloat64_t n = svmad_x (pg, p, p, -1);
+-  svfloat64_t d = svmul_x (pg, p, 2);
++  svfloat64_t d = svmul_x (svptrue_b64 (), p, 2);
+   svfloat64_t swap = n;
+   n = svneg_m (n, use_recip, d);
+   d = svsel (use_recip, swap, d);
+-  if (__glibc_unlikely (svptest_any (pg, special)))
+-    return special_case (x, svdiv_x (svnot_z (pg, special), n, d), special);
+   return svdiv_x (pg, n, d);
+ }
+diff --git a/sysdeps/aarch64/fpu/tanf_sve.c b/sysdeps/aarch64/fpu/tanf_sve.c
+index f342583241..e850fb4882 100644
+--- a/sysdeps/aarch64/fpu/tanf_sve.c
++++ b/sysdeps/aarch64/fpu/tanf_sve.c
+@@ -60,21 +60,16 @@ svfloat32_t SV_NAME_F1 (tan) (svfloat32_t x, const svbool_t pg)
+ {
+   const struct data *d = ptr_barrier (&data);
+ 
+-  /* Determine whether input is too large to perform fast regression.  */
+-  svbool_t cmp = svacge (pg, x, d->range_val);
+-
+   svfloat32_t odd_coeffs = svld1rq (svptrue_b32 (), &d->c1);
+   svfloat32_t pi_vals = svld1rq (svptrue_b32 (), &d->pio2_1);
+ 
+   /* n = rint(x/(pi/2)).  */
+-  svfloat32_t q = svmla_lane (sv_f32 (d->shift), x, pi_vals, 3);
+-  svfloat32_t n = svsub_x (pg, q, d->shift);
++  svfloat32_t n = svrintn_x (pg, svmul_lane (x, pi_vals, 3));
+   /* n is already a signed integer, simply convert it.  */
+   svint32_t in = svcvt_s32_x (pg, n);
+   /* Determine if x lives in an interval, where |tan(x)| grows to infinity.  */
+   svint32_t alt = svand_x (pg, in, 1);
+   svbool_t pred_alt = svcmpne (pg, alt, 0);
+-
+   /* r = x - n * (pi/2)  (range reduction into 0 .. pi/4).  */
+   svfloat32_t r;
+   r = svmls_lane (x, n, pi_vals, 0);
+@@ -93,7 +88,7 @@ svfloat32_t SV_NAME_F1 (tan) (svfloat32_t x, const svbool_t pg)
+ 
+   /* Evaluate polynomial approximation of tangent on [-pi/4, pi/4],
+      using Estrin on z^2.  */
+-  svfloat32_t z2 = svmul_x (pg, z, z);
++  svfloat32_t z2 = svmul_x (svptrue_b32 (), r, r);
+   svfloat32_t p01 = svmla_lane (sv_f32 (d->c0), z2, odd_coeffs, 0);
+   svfloat32_t p23 = svmla_lane (sv_f32 (d->c2), z2, odd_coeffs, 1);
+   svfloat32_t p45 = svmla_lane (sv_f32 (d->c4), z2, odd_coeffs, 2);
+@@ -106,13 +101,14 @@ svfloat32_t SV_NAME_F1 (tan) (svfloat32_t x, const svbool_t pg)
+ 
+   svfloat32_t y = svmla_x (pg, z, p, svmul_x (pg, z, z2));
+ 
+-  /* Transform result back, if necessary.  */
+-  svfloat32_t inv_y = svdivr_x (pg, y, 1.0f);
+-
+   /* No need to pass pg to specialcase here since cmp is a strict subset,
+      guaranteed by the cmpge above.  */
++
++  /* Determine whether input is too large to perform fast regression.  */
++  svbool_t cmp = svacge (pg, x, d->range_val);
+   if (__glibc_unlikely (svptest_any (pg, cmp)))
+-    return special_case (x, svsel (pred_alt, inv_y, y), cmp);
++    return special_case (x, svdivr_x (pg, y, 1.0f), cmp);
+ 
++  svfloat32_t inv_y = svdivr_x (pg, y, 1.0f);
+   return svsel (pred_alt, inv_y, y);
+ }
+
+commit ab5ba6c188159bb5e12be95cd90458924c2fe592
+Author: Yat Long Poon <yatlong.poon@arm.com>
+Date:   Fri Jan 3 19:07:30 2025 +0000
+
+    AArch64: Improve codegen for SVE logs
+    
+    Reduce memory access by using lanewise MLA and moving constants to struct
+    and reduce number of MOVPRFXs.
+    Update maximum ULP error for double log_sve from 1 to 2.
+    Speedup on Neoverse V1 for log (3%), log2 (5%), and log10 (4%).
+    
+    (cherry picked from commit 32d193a372feb28f9da247bb7283d404b84429c6)
+
+diff --git a/sysdeps/aarch64/fpu/log10_sve.c b/sysdeps/aarch64/fpu/log10_sve.c
+index ab7362128d..f1cad2759a 100644
+--- a/sysdeps/aarch64/fpu/log10_sve.c
++++ b/sysdeps/aarch64/fpu/log10_sve.c
+@@ -23,28 +23,49 @@
+ #define Min 0x0010000000000000
+ #define Max 0x7ff0000000000000
+ #define Thres 0x7fe0000000000000 /* Max - Min.  */
+-#define Off 0x3fe6900900000000
+ #define N (1 << V_LOG10_TABLE_BITS)
+ 
++static const struct data
++{
++  double c0, c2;
++  double c1, c3;
++  double invln10, log10_2;
++  double c4;
++  uint64_t off;
++} data = {
++  .c0 = -0x1.bcb7b1526e506p-3,
++  .c1 = 0x1.287a7636be1d1p-3,
++  .c2 = -0x1.bcb7b158af938p-4,
++  .c3 = 0x1.63c78734e6d07p-4,
++  .c4 = -0x1.287461742fee4p-4,
++  .invln10 = 0x1.bcb7b1526e50ep-2,
++  .log10_2 = 0x1.34413509f79ffp-2,
++  .off = 0x3fe6900900000000,
++};
++
+ static svfloat64_t NOINLINE
+-special_case (svfloat64_t x, svfloat64_t y, svbool_t special)
++special_case (svfloat64_t hi, svuint64_t tmp, svfloat64_t y, svfloat64_t r2,
++	      svbool_t special, const struct data *d)
+ {
+-  return sv_call_f64 (log10, x, y, special);
++  svfloat64_t x = svreinterpret_f64 (svadd_x (svptrue_b64 (), tmp, d->off));
++  return sv_call_f64 (log10, x, svmla_x (svptrue_b64 (), hi, r2, y), special);
+ }
+ 
+-/* SVE log10 algorithm.
++/* Double-precision SVE log10 routine.
+    Maximum measured error is 2.46 ulps.
+    SV_NAME_D1 (log10)(0x1.131956cd4b627p+0) got 0x1.fffbdf6eaa669p-6
+ 					   want 0x1.fffbdf6eaa667p-6.  */
+ svfloat64_t SV_NAME_D1 (log10) (svfloat64_t x, const svbool_t pg)
+ {
++  const struct data *d = ptr_barrier (&data);
++
+   svuint64_t ix = svreinterpret_u64 (x);
+   svbool_t special = svcmpge (pg, svsub_x (pg, ix, Min), Thres);
+ 
+   /* x = 2^k z; where z is in range [Off,2*Off) and exact.
+      The range is split into N subintervals.
+      The ith subinterval contains z and c is near its center.  */
+-  svuint64_t tmp = svsub_x (pg, ix, Off);
++  svuint64_t tmp = svsub_x (pg, ix, d->off);
+   svuint64_t i = svlsr_x (pg, tmp, 51 - V_LOG10_TABLE_BITS);
+   i = svand_x (pg, i, (N - 1) << 1);
+   svfloat64_t k = svcvt_f64_x (pg, svasr_x (pg, svreinterpret_s64 (tmp), 52));
+@@ -62,15 +83,19 @@ svfloat64_t SV_NAME_D1 (log10) (svfloat64_t x, const svbool_t pg)
+   svfloat64_t r = svmad_x (pg, invc, z, -1.0);
+ 
+   /* hi = log(c) + k*log(2).  */
+-  svfloat64_t w = svmla_x (pg, logc, r, __v_log10_data.invln10);
+-  svfloat64_t hi = svmla_x (pg, w, k, __v_log10_data.log10_2);
++  svfloat64_t invln10_log10_2 = svld1rq_f64 (svptrue_b64 (), &d->invln10);
++  svfloat64_t w = svmla_lane_f64 (logc, r, invln10_log10_2, 0);
++  svfloat64_t hi = svmla_lane_f64 (w, k, invln10_log10_2, 1);
+ 
+   /* y = r2*(A0 + r*A1 + r2*(A2 + r*A3 + r2*A4)) + hi.  */
+-  svfloat64_t r2 = svmul_x (pg, r, r);
+-  svfloat64_t y = sv_pw_horner_4_f64_x (pg, r, r2, __v_log10_data.poly);
++  svfloat64_t odd_coeffs = svld1rq_f64 (svptrue_b64 (), &d->c1);
++  svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r);
++  svfloat64_t y = svmla_lane_f64 (sv_f64 (d->c2), r, odd_coeffs, 1);
++  svfloat64_t p = svmla_lane_f64 (sv_f64 (d->c0), r, odd_coeffs, 0);
++  y = svmla_x (pg, y, r2, d->c4);
++  y = svmla_x (pg, p, r2, y);
+ 
+   if (__glibc_unlikely (svptest_any (pg, special)))
+-    return special_case (x, svmla_x (svnot_z (pg, special), hi, r2, y),
+-			 special);
++    return special_case (hi, tmp, y, r2, special, d);
+   return svmla_x (pg, hi, r2, y);
+ }
+diff --git a/sysdeps/aarch64/fpu/log2_sve.c b/sysdeps/aarch64/fpu/log2_sve.c
+index 743fa2a913..908e638246 100644
+--- a/sysdeps/aarch64/fpu/log2_sve.c
++++ b/sysdeps/aarch64/fpu/log2_sve.c
+@@ -21,15 +21,32 @@
+ #include "poly_sve_f64.h"
+ 
+ #define N (1 << V_LOG2_TABLE_BITS)
+-#define Off 0x3fe6900900000000
+ #define Max (0x7ff0000000000000)
+ #define Min (0x0010000000000000)
+ #define Thresh (0x7fe0000000000000) /* Max - Min.  */
+ 
++static const struct data
++{
++  double c0, c2;
++  double c1, c3;
++  double invln2, c4;
++  uint64_t off;
++} data = {
++  .c0 = -0x1.71547652b83p-1,
++  .c1 = 0x1.ec709dc340953p-2,
++  .c2 = -0x1.71547651c8f35p-2,
++  .c3 = 0x1.2777ebe12dda5p-2,
++  .c4 = -0x1.ec738d616fe26p-3,
++  .invln2 = 0x1.71547652b82fep0,
++  .off = 0x3fe6900900000000,
++};
++
+ static svfloat64_t NOINLINE
+-special_case (svfloat64_t x, svfloat64_t y, svbool_t cmp)
++special_case (svfloat64_t w, svuint64_t tmp, svfloat64_t y, svfloat64_t r2,
++	      svbool_t special, const struct data *d)
+ {
+-  return sv_call_f64 (log2, x, y, cmp);
++  svfloat64_t x = svreinterpret_f64 (svadd_x (svptrue_b64 (), tmp, d->off));
++  return sv_call_f64 (log2, x, svmla_x (svptrue_b64 (), w, r2, y), special);
+ }
+ 
+ /* Double-precision SVE log2 routine.
+@@ -40,13 +57,15 @@ special_case (svfloat64_t x, svfloat64_t y, svbool_t cmp)
+ 					  want 0x1.fffb34198d9ddp-5.  */
+ svfloat64_t SV_NAME_D1 (log2) (svfloat64_t x, const svbool_t pg)
+ {
++  const struct data *d = ptr_barrier (&data);
++
+   svuint64_t ix = svreinterpret_u64 (x);
+   svbool_t special = svcmpge (pg, svsub_x (pg, ix, Min), Thresh);
+ 
+   /* x = 2^k z; where z is in range [Off,2*Off) and exact.
+      The range is split into N subintervals.
+      The ith subinterval contains z and c is near its center.  */
+-  svuint64_t tmp = svsub_x (pg, ix, Off);
++  svuint64_t tmp = svsub_x (pg, ix, d->off);
+   svuint64_t i = svlsr_x (pg, tmp, 51 - V_LOG2_TABLE_BITS);
+   i = svand_x (pg, i, (N - 1) << 1);
+   svfloat64_t k = svcvt_f64_x (pg, svasr_x (pg, svreinterpret_s64 (tmp), 52));
+@@ -59,15 +78,19 @@ svfloat64_t SV_NAME_D1 (log2) (svfloat64_t x, const svbool_t pg)
+ 
+   /* log2(x) = log1p(z/c-1)/log(2) + log2(c) + k.  */
+ 
++  svfloat64_t invln2_and_c4 = svld1rq_f64 (svptrue_b64 (), &d->invln2);
+   svfloat64_t r = svmad_x (pg, invc, z, -1.0);
+-  svfloat64_t w = svmla_x (pg, log2c, r, __v_log2_data.invln2);
+-
+-  svfloat64_t r2 = svmul_x (pg, r, r);
+-  svfloat64_t y = sv_pw_horner_4_f64_x (pg, r, r2, __v_log2_data.poly);
++  svfloat64_t w = svmla_lane_f64 (log2c, r, invln2_and_c4, 0);
+   w = svadd_x (pg, k, w);
+ 
++  svfloat64_t odd_coeffs = svld1rq_f64 (svptrue_b64 (), &d->c1);
++  svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r);
++  svfloat64_t y = svmla_lane_f64 (sv_f64 (d->c2), r, odd_coeffs, 1);
++  svfloat64_t p = svmla_lane_f64 (sv_f64 (d->c0), r, odd_coeffs, 0);
++  y = svmla_lane_f64 (y, r2, invln2_and_c4, 1);
++  y = svmla_x (pg, p, r2, y);
++
+   if (__glibc_unlikely (svptest_any (pg, special)))
+-    return special_case (x, svmla_x (svnot_z (pg, special), w, r2, y),
+-			 special);
++    return special_case (w, tmp, y, r2, special, d);
+   return svmla_x (pg, w, r2, y);
+ }
+diff --git a/sysdeps/aarch64/fpu/log_sve.c b/sysdeps/aarch64/fpu/log_sve.c
+index 9b689f2ec7..044223400b 100644
+--- a/sysdeps/aarch64/fpu/log_sve.c
++++ b/sysdeps/aarch64/fpu/log_sve.c
+@@ -19,39 +19,54 @@
+ 
+ #include "sv_math.h"
+ 
+-#define P(i) sv_f64 (__v_log_data.poly[i])
+ #define N (1 << V_LOG_TABLE_BITS)
+-#define Off (0x3fe6900900000000)
+-#define MaxTop (0x7ff)
+-#define MinTop (0x001)
+-#define ThreshTop (0x7fe) /* MaxTop - MinTop.  */
++#define Max (0x7ff0000000000000)
++#define Min (0x0010000000000000)
++#define Thresh (0x7fe0000000000000) /* Max - Min.  */
++
++static const struct data
++{
++  double c0, c2;
++  double c1, c3;
++  double ln2, c4;
++  uint64_t off;
++} data = {
++  .c0 = -0x1.ffffffffffff7p-2,
++  .c1 = 0x1.55555555170d4p-2,
++  .c2 = -0x1.0000000399c27p-2,
++  .c3 = 0x1.999b2e90e94cap-3,
++  .c4 = -0x1.554e550bd501ep-3,
++  .ln2 = 0x1.62e42fefa39efp-1,
++  .off = 0x3fe6900900000000,
++};
+ 
+ static svfloat64_t NOINLINE
+-special_case (svfloat64_t x, svfloat64_t y, svbool_t cmp)
++special_case (svfloat64_t hi, svuint64_t tmp, svfloat64_t y, svfloat64_t r2,
++	      svbool_t special, const struct data *d)
+ {
+-  return sv_call_f64 (log, x, y, cmp);
++  svfloat64_t x = svreinterpret_f64 (svadd_x (svptrue_b64 (), tmp, d->off));
++  return sv_call_f64 (log, x, svmla_x (svptrue_b64 (), hi, r2, y), special);
+ }
+ 
+-/* SVE port of AdvSIMD log algorithm.
+-   Maximum measured error is 2.17 ulp:
+-   SV_NAME_D1 (log)(0x1.a6129884398a3p+0) got 0x1.ffffff1cca043p-2
+-					 want 0x1.ffffff1cca045p-2.  */
++/* Double-precision SVE log routine.
++   Maximum measured error is 2.64 ulp:
++   SV_NAME_D1 (log)(0x1.95e54bc91a5e2p+184) got 0x1.fffffffe88cacp+6
++					   want 0x1.fffffffe88cafp+6.  */
+ svfloat64_t SV_NAME_D1 (log) (svfloat64_t x, const svbool_t pg)
+ {
++  const struct data *d = ptr_barrier (&data);
++
+   svuint64_t ix = svreinterpret_u64 (x);
+-  svuint64_t top = svlsr_x (pg, ix, 52);
+-  svbool_t cmp = svcmpge (pg, svsub_x (pg, top, MinTop), sv_u64 (ThreshTop));
++  svbool_t special = svcmpge (pg, svsub_x (pg, ix, Min), Thresh);
+ 
+   /* x = 2^k z; where z is in range [Off,2*Off) and exact.
+      The range is split into N subintervals.
+      The ith subinterval contains z and c is near its center.  */
+-  svuint64_t tmp = svsub_x (pg, ix, Off);
++  svuint64_t tmp = svsub_x (pg, ix, d->off);
+   /* Calculate table index = (tmp >> (52 - V_LOG_TABLE_BITS)) % N.
+      The actual value of i is double this due to table layout.  */
+   svuint64_t i
+       = svand_x (pg, svlsr_x (pg, tmp, (51 - V_LOG_TABLE_BITS)), (N - 1) << 1);
+-  svint64_t k
+-      = svasr_x (pg, svreinterpret_s64 (tmp), 52); /* Arithmetic shift.  */
+   svuint64_t iz = svsub_x (pg, ix, svand_x (pg, tmp, 0xfffULL << 52));
+   svfloat64_t z = svreinterpret_f64 (iz);
+   /* Lookup in 2 global lists (length N).  */
+@@ -59,18 +74,22 @@ svfloat64_t SV_NAME_D1 (log) (svfloat64_t x, const svbool_t pg)
+   svfloat64_t logc = svld1_gather_index (pg, &__v_log_data.table[0].logc, i);
+ 
+   /* log(x) = log1p(z/c-1) + log(c) + k*Ln2.  */
+-  svfloat64_t r = svmad_x (pg, invc, z, -1);
+-  svfloat64_t kd = svcvt_f64_x (pg, k);
++  svfloat64_t kd = svcvt_f64_x (pg, svasr_x (pg, svreinterpret_s64 (tmp), 52));
+   /* hi = r + log(c) + k*Ln2.  */
+-  svfloat64_t hi = svmla_x (pg, svadd_x (pg, logc, r), kd, __v_log_data.ln2);
++  svfloat64_t ln2_and_c4 = svld1rq_f64 (svptrue_b64 (), &d->ln2);
++  svfloat64_t r = svmad_x (pg, invc, z, -1);
++  svfloat64_t hi = svmla_lane_f64 (logc, kd, ln2_and_c4, 0);
++  hi = svadd_x (pg, r, hi);
++
+   /* y = r2*(A0 + r*A1 + r2*(A2 + r*A3 + r2*A4)) + hi.  */
+-  svfloat64_t r2 = svmul_x (pg, r, r);
+-  svfloat64_t y = svmla_x (pg, P (2), r, P (3));
+-  svfloat64_t p = svmla_x (pg, P (0), r, P (1));
+-  y = svmla_x (pg, y, r2, P (4));
++  svfloat64_t odd_coeffs = svld1rq_f64 (svptrue_b64 (), &d->c1);
++  svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r);
++  svfloat64_t y = svmla_lane_f64 (sv_f64 (d->c2), r, odd_coeffs, 1);
++  svfloat64_t p = svmla_lane_f64 (sv_f64 (d->c0), r, odd_coeffs, 0);
++  y = svmla_lane_f64 (y, r2, ln2_and_c4, 1);
+   y = svmla_x (pg, p, r2, y);
+ 
+-  if (__glibc_unlikely (svptest_any (pg, cmp)))
+-    return special_case (x, svmla_x (svnot_z (pg, cmp), hi, r2, y), cmp);
++  if (__glibc_unlikely (svptest_any (pg, special)))
++    return special_case (hi, tmp, y, r2, special, d);
+   return svmla_x (pg, hi, r2, y);
+ }
+diff --git a/sysdeps/aarch64/libm-test-ulps b/sysdeps/aarch64/libm-test-ulps
+index 6c96304611..b76c38dac2 100644
+--- a/sysdeps/aarch64/libm-test-ulps
++++ b/sysdeps/aarch64/libm-test-ulps
+@@ -1460,7 +1460,7 @@ float: 2
+ ldouble: 1
+ 
+ Function: "log_sve":
+-double: 1
++double: 2
+ float: 3
+ 
+ Function: "log_towardzero":
+
+commit aa7c61ea15e27ae14717e065a5d4c50baa472851
+Author: Yat Long Poon <yatlong.poon@arm.com>
+Date:   Fri Jan 3 19:09:05 2025 +0000
+
+    AArch64: Improve codegen for SVE log1pf users
+    
+    Reduce memory access by using lanewise MLA and reduce number of MOVPRFXs.
+    Move log1pf implementation to inline helper function.
+    Speedup on Neoverse V1 for log1pf (10%), acoshf (-1%), atanhf (2%), asinhf (2%).
+    
+    (cherry picked from commit 91c1fadba338752bf514cd4cca057b27b1b10eed)
+
+diff --git a/sysdeps/aarch64/fpu/acoshf_sve.c b/sysdeps/aarch64/fpu/acoshf_sve.c
+index 2110894e62..491365e24d 100644
+--- a/sysdeps/aarch64/fpu/acoshf_sve.c
++++ b/sysdeps/aarch64/fpu/acoshf_sve.c
+@@ -17,23 +17,26 @@
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+ 
++#include "sv_math.h"
++#include "sv_log1pf_inline.h"
++
+ #define One 0x3f800000
+ #define Thres 0x20000000 /* asuint(0x1p64) - One.  */
+ 
+-#include "sv_log1pf_inline.h"
+-
+ static svfloat32_t NOINLINE
+-special_case (svfloat32_t x, svfloat32_t y, svbool_t special)
++special_case (svfloat32_t xm1, svfloat32_t tmp, svbool_t special)
+ {
++  svfloat32_t x = svadd_x (svptrue_b32 (), xm1, 1.0f);
++  svfloat32_t y = sv_log1pf_inline (tmp, svptrue_b32 ());
+   return sv_call_f32 (acoshf, x, y, special);
+ }
+ 
+ /* Single-precision SVE acosh(x) routine. Implements the same algorithm as
+    vector acoshf and log1p.
+ 
+-   Maximum error is 2.78 ULPs:
+-   SV_NAME_F1 (acosh) (0x1.01e996p+0) got 0x1.f45b42p-4
+-				     want 0x1.f45b3cp-4.  */
++   Maximum error is 2.47 ULPs:
++   SV_NAME_F1 (acosh) (0x1.01ca76p+0) got 0x1.e435a6p-4
++				     want 0x1.e435a2p-4.  */
+ svfloat32_t SV_NAME_F1 (acosh) (svfloat32_t x, const svbool_t pg)
+ {
+   svuint32_t ix = svreinterpret_u32 (x);
+@@ -41,9 +44,9 @@ svfloat32_t SV_NAME_F1 (acosh) (svfloat32_t x, const svbool_t pg)
+ 
+   svfloat32_t xm1 = svsub_x (pg, x, 1.0f);
+   svfloat32_t u = svmul_x (pg, xm1, svadd_x (pg, x, 1.0f));
+-  svfloat32_t y = sv_log1pf_inline (svadd_x (pg, xm1, svsqrt_x (pg, u)), pg);
++  svfloat32_t tmp = svadd_x (pg, xm1, svsqrt_x (pg, u));
+ 
+   if (__glibc_unlikely (svptest_any (pg, special)))
+-    return special_case (x, y, special);
+-  return y;
++    return special_case (xm1, tmp, special);
++  return sv_log1pf_inline (tmp, pg);
+ }
+diff --git a/sysdeps/aarch64/fpu/asinhf_sve.c b/sysdeps/aarch64/fpu/asinhf_sve.c
+index d85c3a685c..b7f253bf32 100644
+--- a/sysdeps/aarch64/fpu/asinhf_sve.c
++++ b/sysdeps/aarch64/fpu/asinhf_sve.c
+@@ -20,20 +20,23 @@
+ #include "sv_math.h"
+ #include "sv_log1pf_inline.h"
+ 
+-#define BigBound (0x5f800000)  /* asuint(0x1p64).  */
++#define BigBound 0x5f800000 /* asuint(0x1p64).  */
+ 
+ static svfloat32_t NOINLINE
+-special_case (svfloat32_t x, svfloat32_t y, svbool_t special)
++special_case (svuint32_t iax, svuint32_t sign, svfloat32_t y, svbool_t special)
+ {
++  svfloat32_t x = svreinterpret_f32 (sveor_x (svptrue_b32 (), iax, sign));
++  y = svreinterpret_f32 (
++      svorr_x (svptrue_b32 (), sign, svreinterpret_u32 (y)));
+   return sv_call_f32 (asinhf, x, y, special);
+ }
+ 
+ /* Single-precision SVE asinh(x) routine. Implements the same algorithm as
+    vector asinhf and log1p.
+ 
+-   Maximum error is 2.48 ULPs:
+-   SV_NAME_F1 (asinh) (0x1.008864p-3) got 0x1.ffbbbcp-4
+-				     want 0x1.ffbbb8p-4.  */
++   Maximum error is 1.92 ULPs:
++   SV_NAME_F1 (asinh) (-0x1.0922ecp-1) got -0x1.fd0bccp-2
++				      want -0x1.fd0bc8p-2.  */
+ svfloat32_t SV_NAME_F1 (asinh) (svfloat32_t x, const svbool_t pg)
+ {
+   svfloat32_t ax = svabs_x (pg, x);
+@@ -49,8 +52,6 @@ svfloat32_t SV_NAME_F1 (asinh) (svfloat32_t x, const svbool_t pg)
+       = sv_log1pf_inline (svadd_x (pg, ax, svdiv_x (pg, ax2, d)), pg);
+ 
+   if (__glibc_unlikely (svptest_any (pg, special)))
+-    return special_case (
+-	x, svreinterpret_f32 (svorr_x (pg, sign, svreinterpret_u32 (y))),
+-	special);
++    return special_case (iax, sign, y, special);
+   return svreinterpret_f32 (svorr_x (pg, sign, svreinterpret_u32 (y)));
+ }
+diff --git a/sysdeps/aarch64/fpu/atanhf_sve.c b/sysdeps/aarch64/fpu/atanhf_sve.c
+index dae83041ef..2d3005bbc8 100644
+--- a/sysdeps/aarch64/fpu/atanhf_sve.c
++++ b/sysdeps/aarch64/fpu/atanhf_sve.c
+@@ -17,21 +17,25 @@
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+ 
++#include "sv_math.h"
+ #include "sv_log1pf_inline.h"
+ 
+ #define One (0x3f800000)
+ #define Half (0x3f000000)
+ 
+ static svfloat32_t NOINLINE
+-special_case (svfloat32_t x, svfloat32_t y, svbool_t special)
++special_case (svuint32_t iax, svuint32_t sign, svfloat32_t halfsign,
++	      svfloat32_t y, svbool_t special)
+ {
++  svfloat32_t x = svreinterpret_f32 (sveor_x (svptrue_b32 (), iax, sign));
++  y = svmul_x (svptrue_b32 (), halfsign, y);
+   return sv_call_f32 (atanhf, x, y, special);
+ }
+ 
+ /* Approximation for vector single-precision atanh(x) using modified log1p.
+-   The maximum error is 2.28 ULP:
+-   _ZGVsMxv_atanhf(0x1.ff1194p-5) got 0x1.ffbbbcp-5
+-				 want 0x1.ffbbb6p-5.  */
++   The maximum error is 1.99 ULP:
++   _ZGVsMxv_atanhf(0x1.f1583p-5) got 0x1.f1f4fap-5
++				want 0x1.f1f4f6p-5.  */
+ svfloat32_t SV_NAME_F1 (atanh) (svfloat32_t x, const svbool_t pg)
+ {
+   svfloat32_t ax = svabs_x (pg, x);
+@@ -48,7 +52,7 @@ svfloat32_t SV_NAME_F1 (atanh) (svfloat32_t x, const svbool_t pg)
+   y = sv_log1pf_inline (y, pg);
+ 
+   if (__glibc_unlikely (svptest_any (pg, special)))
+-    return special_case (x, svmul_x (pg, halfsign, y), special);
++    return special_case (iax, sign, halfsign, y, special);
+ 
+   return svmul_x (pg, halfsign, y);
+ }
+diff --git a/sysdeps/aarch64/fpu/log1pf_sve.c b/sysdeps/aarch64/fpu/log1pf_sve.c
+index 5256d5e94c..18a185c838 100644
+--- a/sysdeps/aarch64/fpu/log1pf_sve.c
++++ b/sysdeps/aarch64/fpu/log1pf_sve.c
+@@ -18,30 +18,13 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include "sv_math.h"
+-#include "poly_sve_f32.h"
+-
+-static const struct data
+-{
+-  float poly[8];
+-  float ln2, exp_bias;
+-  uint32_t four, three_quarters;
+-} data = {.poly = {/* Do not store first term of polynomial, which is -0.5, as
+-                      this can be fmov-ed directly instead of including it in
+-                      the main load-and-mla polynomial schedule.  */
+-		   0x1.5555aap-2f, -0x1.000038p-2f, 0x1.99675cp-3f,
+-		   -0x1.54ef78p-3f, 0x1.28a1f4p-3f, -0x1.0da91p-3f,
+-		   0x1.abcb6p-4f, -0x1.6f0d5ep-5f},
+-	  .ln2 = 0x1.62e43p-1f,
+-	  .exp_bias = 0x1p-23f,
+-	  .four = 0x40800000,
+-	  .three_quarters = 0x3f400000};
+-
+-#define SignExponentMask 0xff800000
++#include "sv_log1pf_inline.h"
+ 
+ static svfloat32_t NOINLINE
+-special_case (svfloat32_t x, svfloat32_t y, svbool_t special)
++special_case (svfloat32_t x, svbool_t special)
+ {
+-  return sv_call_f32 (log1pf, x, y, special);
++  return sv_call_f32 (log1pf, x, sv_log1pf_inline (x, svptrue_b32 ()),
++		      special);
+ }
+ 
+ /* Vector log1pf approximation using polynomial on reduced interval. Worst-case
+@@ -50,53 +33,14 @@ special_case (svfloat32_t x, svfloat32_t y, svbool_t special)
+ 				 want 0x1.9f323ep-2.  */
+ svfloat32_t SV_NAME_F1 (log1p) (svfloat32_t x, svbool_t pg)
+ {
+-  const struct data *d = ptr_barrier (&data);
+   /* x < -1, Inf/Nan.  */
+   svbool_t special = svcmpeq (pg, svreinterpret_u32 (x), 0x7f800000);
+   special = svorn_z (pg, special, svcmpge (pg, x, -1));
+ 
+-  /* With x + 1 = t * 2^k (where t = m + 1 and k is chosen such that m
+-			   is in [-0.25, 0.5]):
+-     log1p(x) = log(t) + log(2^k) = log1p(m) + k*log(2).
+-
+-     We approximate log1p(m) with a polynomial, then scale by
+-     k*log(2). Instead of doing this directly, we use an intermediate
+-     scale factor s = 4*k*log(2) to ensure the scale is representable
+-     as a normalised fp32 number.  */
+-  svfloat32_t m = svadd_x (pg, x, 1);
+-
+-  /* Choose k to scale x to the range [-1/4, 1/2].  */
+-  svint32_t k
+-      = svand_x (pg, svsub_x (pg, svreinterpret_s32 (m), d->three_quarters),
+-		 sv_s32 (SignExponentMask));
+-
+-  /* Scale x by exponent manipulation.  */
+-  svfloat32_t m_scale = svreinterpret_f32 (
+-      svsub_x (pg, svreinterpret_u32 (x), svreinterpret_u32 (k)));
+-
+-  /* Scale up to ensure that the scale factor is representable as normalised
+-     fp32 number, and scale m down accordingly.  */
+-  svfloat32_t s = svreinterpret_f32 (svsubr_x (pg, k, d->four));
+-  m_scale = svadd_x (pg, m_scale, svmla_x (pg, sv_f32 (-1), s, 0.25));
+-
+-  /* Evaluate polynomial on reduced interval.  */
+-  svfloat32_t ms2 = svmul_x (pg, m_scale, m_scale),
+-	      ms4 = svmul_x (pg, ms2, ms2);
+-  svfloat32_t p = sv_estrin_7_f32_x (pg, m_scale, ms2, ms4, d->poly);
+-  p = svmad_x (pg, m_scale, p, -0.5);
+-  p = svmla_x (pg, m_scale, m_scale, svmul_x (pg, m_scale, p));
+-
+-  /* The scale factor to be applied back at the end - by multiplying float(k)
+-     by 2^-23 we get the unbiased exponent of k.  */
+-  svfloat32_t scale_back = svmul_x (pg, svcvt_f32_x (pg, k), d->exp_bias);
+-
+-  /* Apply the scaling back.  */
+-  svfloat32_t y = svmla_x (pg, p, scale_back, d->ln2);
+-
+   if (__glibc_unlikely (svptest_any (pg, special)))
+-    return special_case (x, y, special);
++    return special_case (x, special);
+ 
+-  return y;
++  return sv_log1pf_inline (x, pg);
+ }
+ 
+ strong_alias (SV_NAME_F1 (log1p), SV_NAME_F1 (logp1))
+diff --git a/sysdeps/aarch64/fpu/sv_log1pf_inline.h b/sysdeps/aarch64/fpu/sv_log1pf_inline.h
+index b94b2da055..850297d615 100644
+--- a/sysdeps/aarch64/fpu/sv_log1pf_inline.h
++++ b/sysdeps/aarch64/fpu/sv_log1pf_inline.h
+@@ -22,55 +22,76 @@
+ 
+ #include "sv_math.h"
+ #include "vecmath_config.h"
+-#include "poly_sve_f32.h"
++
++#define SignExponentMask 0xff800000
+ 
+ static const struct sv_log1pf_data
+ {
+-  float32_t poly[9];
+-  float32_t ln2;
+-  float32_t scale_back;
++  float c0, c2, c4, c6;
++  float c1, c3, c5, c7;
++  float ln2, exp_bias, quarter;
++  uint32_t four, three_quarters;
+ } sv_log1pf_data = {
+-  /* Polynomial generated using FPMinimax in [-0.25, 0.5].  */
+-  .poly = { -0x1p-1f, 0x1.5555aap-2f, -0x1.000038p-2f, 0x1.99675cp-3f,
+-	    -0x1.54ef78p-3f, 0x1.28a1f4p-3f, -0x1.0da91p-3f, 0x1.abcb6p-4f,
+-	    -0x1.6f0d5ep-5f },
+-  .scale_back = 0x1.0p-23f,
+-  .ln2 = 0x1.62e43p-1f,
++  /* Do not store first term of polynomial, which is -0.5, as
++     this can be fmov-ed directly instead of including it in
++     the main load-and-mla polynomial schedule.  */
++  .c0 = 0x1.5555aap-2f,		.c1 = -0x1.000038p-2f, .c2 = 0x1.99675cp-3f,
++  .c3 = -0x1.54ef78p-3f,	.c4 = 0x1.28a1f4p-3f,  .c5 = -0x1.0da91p-3f,
++  .c6 = 0x1.abcb6p-4f,		.c7 = -0x1.6f0d5ep-5f, .ln2 = 0x1.62e43p-1f,
++  .exp_bias = 0x1p-23f,		.quarter = 0x1p-2f,    .four = 0x40800000,
++  .three_quarters = 0x3f400000,
+ };
+ 
+-static inline svfloat32_t
+-eval_poly (svfloat32_t m, const float32_t *c, svbool_t pg)
+-{
+-  svfloat32_t p_12 = svmla_x (pg, sv_f32 (c[0]), m, sv_f32 (c[1]));
+-  svfloat32_t m2 = svmul_x (pg, m, m);
+-  svfloat32_t q = svmla_x (pg, m, m2, p_12);
+-  svfloat32_t p = sv_pw_horner_6_f32_x (pg, m, m2, c + 2);
+-  p = svmul_x (pg, m2, p);
+-
+-  return svmla_x (pg, q, m2, p);
+-}
+-
+ static inline svfloat32_t
+ sv_log1pf_inline (svfloat32_t x, svbool_t pg)
+ {
+   const struct sv_log1pf_data *d = ptr_barrier (&sv_log1pf_data);
+ 
+-  svfloat32_t m = svadd_x (pg, x, 1.0f);
+-
+-  svint32_t ks = svsub_x (pg, svreinterpret_s32 (m),
+-			  svreinterpret_s32 (svdup_f32 (0.75f)));
+-  ks = svand_x (pg, ks, 0xff800000);
+-  svuint32_t k = svreinterpret_u32 (ks);
+-  svfloat32_t s = svreinterpret_f32 (
+-      svsub_x (pg, svreinterpret_u32 (svdup_f32 (4.0f)), k));
+-
+-  svfloat32_t m_scale
+-      = svreinterpret_f32 (svsub_x (pg, svreinterpret_u32 (x), k));
+-  m_scale
+-      = svadd_x (pg, m_scale, svmla_x (pg, sv_f32 (-1.0f), sv_f32 (0.25f), s));
+-  svfloat32_t p = eval_poly (m_scale, d->poly, pg);
+-  svfloat32_t scale_back = svmul_x (pg, svcvt_f32_x (pg, k), d->scale_back);
+-  return svmla_x (pg, p, scale_back, d->ln2);
++  /* With x + 1 = t * 2^k (where t = m + 1 and k is chosen such that m
++			 is in [-0.25, 0.5]):
++   log1p(x) = log(t) + log(2^k) = log1p(m) + k*log(2).
++
++   We approximate log1p(m) with a polynomial, then scale by
++   k*log(2). Instead of doing this directly, we use an intermediate
++   scale factor s = 4*k*log(2) to ensure the scale is representable
++   as a normalised fp32 number.  */
++  svfloat32_t m = svadd_x (pg, x, 1);
++
++  /* Choose k to scale x to the range [-1/4, 1/2].  */
++  svint32_t k
++      = svand_x (pg, svsub_x (pg, svreinterpret_s32 (m), d->three_quarters),
++		 sv_s32 (SignExponentMask));
++
++  /* Scale x by exponent manipulation.  */
++  svfloat32_t m_scale = svreinterpret_f32 (
++      svsub_x (pg, svreinterpret_u32 (x), svreinterpret_u32 (k)));
++
++  /* Scale up to ensure that the scale factor is representable as normalised
++     fp32 number, and scale m down accordingly.  */
++  svfloat32_t s = svreinterpret_f32 (svsubr_x (pg, k, d->four));
++  svfloat32_t fconst = svld1rq_f32 (svptrue_b32 (), &d->ln2);
++  m_scale = svadd_x (pg, m_scale, svmla_lane_f32 (sv_f32 (-1), s, fconst, 2));
++
++  /* Evaluate polynomial on reduced interval.  */
++  svfloat32_t ms2 = svmul_x (svptrue_b32 (), m_scale, m_scale);
++
++  svfloat32_t c1357 = svld1rq_f32 (svptrue_b32 (), &d->c1);
++  svfloat32_t p01 = svmla_lane_f32 (sv_f32 (d->c0), m_scale, c1357, 0);
++  svfloat32_t p23 = svmla_lane_f32 (sv_f32 (d->c2), m_scale, c1357, 1);
++  svfloat32_t p45 = svmla_lane_f32 (sv_f32 (d->c4), m_scale, c1357, 2);
++  svfloat32_t p67 = svmla_lane_f32 (sv_f32 (d->c6), m_scale, c1357, 3);
++
++  svfloat32_t p = svmla_x (pg, p45, p67, ms2);
++  p = svmla_x (pg, p23, p, ms2);
++  p = svmla_x (pg, p01, p, ms2);
++
++  p = svmad_x (pg, m_scale, p, -0.5);
++  p = svmla_x (pg, m_scale, m_scale, svmul_x (pg, m_scale, p));
++
++  /* The scale factor to be applied back at the end - by multiplying float(k)
++   by 2^-23 we get the unbiased exponent of k.  */
++  svfloat32_t scale_back = svmul_lane_f32 (svcvt_f32_x (pg, k), fconst, 1);
++  return svmla_lane_f32 (p, scale_back, fconst, 0);
+ }
+ 
+ #endif
+
+commit d983f14c304df2d880c7b01e904e4a889064b9b3
+Author: Luna Lamb <luna.lamb@arm.com>
+Date:   Fri Jan 3 20:15:17 2025 +0000
+
+    AArch64: Improve codegen in SVE expm1f and users
+    
+    Use unpredicated muls, use absolute compare and improve memory access.
+    Expm1f, sinhf and tanhf show 7%, 5% and 1% improvement in throughput
+    microbenchmark on Neoverse V1.
+    
+    (cherry picked from commit f86b4cf87581cf1e45702b07880679ffa0b1f47a)
+
+diff --git a/sysdeps/aarch64/fpu/expm1f_sve.c b/sysdeps/aarch64/fpu/expm1f_sve.c
+index 7c852125cd..05a66400d4 100644
+--- a/sysdeps/aarch64/fpu/expm1f_sve.c
++++ b/sysdeps/aarch64/fpu/expm1f_sve.c
+@@ -18,7 +18,6 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include "sv_math.h"
+-#include "poly_sve_f32.h"
+ 
+ /* Largest value of x for which expm1(x) should round to -1.  */
+ #define SpecialBound 0x1.5ebc4p+6f
+@@ -28,20 +27,17 @@ static const struct data
+   /* These 4 are grouped together so they can be loaded as one quadword, then
+      used with _lane forms of svmla/svmls.  */
+   float c2, c4, ln2_hi, ln2_lo;
+-  float c0, c1, c3, inv_ln2, special_bound, shift;
++  float c0, inv_ln2, c1, c3, special_bound;
+ } data = {
+   /* Generated using fpminimax.  */
+   .c0 = 0x1.fffffep-2,		 .c1 = 0x1.5554aep-3,
+   .c2 = 0x1.555736p-5,		 .c3 = 0x1.12287cp-7,
+-  .c4 = 0x1.6b55a2p-10,
++  .c4 = 0x1.6b55a2p-10,		 .inv_ln2 = 0x1.715476p+0f,
++  .special_bound = SpecialBound, .ln2_lo = 0x1.7f7d1cp-20f,
++  .ln2_hi = 0x1.62e4p-1f,
+ 
+-  .special_bound = SpecialBound, .shift = 0x1.8p23f,
+-  .inv_ln2 = 0x1.715476p+0f,	 .ln2_hi = 0x1.62e4p-1f,
+-  .ln2_lo = 0x1.7f7d1cp-20f,
+ };
+ 
+-#define C(i) sv_f32 (d->c##i)
+-
+ static svfloat32_t NOINLINE
+ special_case (svfloat32_t x, svbool_t pg)
+ {
+@@ -71,9 +67,8 @@ svfloat32_t SV_NAME_F1 (expm1) (svfloat32_t x, svbool_t pg)
+      and f = x - i * ln2, then f is in [-ln2/2, ln2/2].
+      exp(x) - 1 = 2^i * (expm1(f) + 1) - 1
+      where 2^i is exact because i is an integer.  */
+-  svfloat32_t j = svmla_x (pg, sv_f32 (d->shift), x, d->inv_ln2);
+-  j = svsub_x (pg, j, d->shift);
+-  svint32_t i = svcvt_s32_x (pg, j);
++  svfloat32_t j = svmul_x (svptrue_b32 (), x, d->inv_ln2);
++  j = svrinta_x (pg, j);
+ 
+   svfloat32_t f = svmls_lane (x, j, lane_constants, 2);
+   f = svmls_lane (f, j, lane_constants, 3);
+@@ -83,17 +78,17 @@ svfloat32_t SV_NAME_F1 (expm1) (svfloat32_t x, svbool_t pg)
+ 	 x + ax^2 + bx^3 + cx^4 ....
+      So we calculate the polynomial P(f) = a + bf + cf^2 + ...
+      and assemble the approximation expm1(f) ~= f + f^2 * P(f).  */
+-  svfloat32_t p12 = svmla_lane (C (1), f, lane_constants, 0);
+-  svfloat32_t p34 = svmla_lane (C (3), f, lane_constants, 1);
+-  svfloat32_t f2 = svmul_x (pg, f, f);
++  svfloat32_t p12 = svmla_lane (sv_f32 (d->c1), f, lane_constants, 0);
++  svfloat32_t p34 = svmla_lane (sv_f32 (d->c3), f, lane_constants, 1);
++  svfloat32_t f2 = svmul_x (svptrue_b32 (), f, f);
+   svfloat32_t p = svmla_x (pg, p12, f2, p34);
+-  p = svmla_x (pg, C (0), f, p);
++
++  p = svmla_x (pg, sv_f32 (d->c0), f, p);
+   p = svmla_x (pg, f, f2, p);
+ 
+   /* Assemble the result.
+      expm1(x) ~= 2^i * (p + 1) - 1
+      Let t = 2^i.  */
+-  svfloat32_t t = svreinterpret_f32 (
+-      svadd_x (pg, svreinterpret_u32 (svlsl_x (pg, i, 23)), 0x3f800000));
+-  return svmla_x (pg, svsub_x (pg, t, 1), p, t);
++  svfloat32_t t = svscale_x (pg, sv_f32 (1.0f), svcvt_s32_x (pg, j));
++  return svmla_x (pg, svsub_x (pg, t, 1.0f), p, t);
+ }
+diff --git a/sysdeps/aarch64/fpu/sinhf_sve.c b/sysdeps/aarch64/fpu/sinhf_sve.c
+index 6c204b57a2..50dd386774 100644
+--- a/sysdeps/aarch64/fpu/sinhf_sve.c
++++ b/sysdeps/aarch64/fpu/sinhf_sve.c
+@@ -63,5 +63,5 @@ svfloat32_t SV_NAME_F1 (sinh) (svfloat32_t x, const svbool_t pg)
+   if (__glibc_unlikely (svptest_any (pg, special)))
+     return special_case (x, svmul_x (pg, t, halfsign), special);
+ 
+-  return svmul_x (pg, t, halfsign);
++  return svmul_x (svptrue_b32 (), t, halfsign);
+ }
+diff --git a/sysdeps/aarch64/fpu/sv_expm1f_inline.h b/sysdeps/aarch64/fpu/sv_expm1f_inline.h
+index 5b72451222..e46ddda543 100644
+--- a/sysdeps/aarch64/fpu/sv_expm1f_inline.h
++++ b/sysdeps/aarch64/fpu/sv_expm1f_inline.h
+@@ -27,21 +27,18 @@ struct sv_expm1f_data
+   /* These 4 are grouped together so they can be loaded as one quadword, then
+    used with _lane forms of svmla/svmls.  */
+   float32_t c2, c4, ln2_hi, ln2_lo;
+-  float32_t c0, c1, c3, inv_ln2, shift;
++  float c0, inv_ln2, c1, c3, special_bound;
+ };
+ 
+ /* Coefficients generated using fpminimax.  */
+ #define SV_EXPM1F_DATA                                                        \
+   {                                                                           \
+-    .c0 = 0x1.fffffep-2, .c1 = 0x1.5554aep-3, .c2 = 0x1.555736p-5,            \
+-    .c3 = 0x1.12287cp-7, .c4 = 0x1.6b55a2p-10,                                \
++    .c0 = 0x1.fffffep-2, .c1 = 0x1.5554aep-3, .inv_ln2 = 0x1.715476p+0f,      \
++    .c2 = 0x1.555736p-5, .c3 = 0x1.12287cp-7,                                 \
+                                                                               \
+-    .shift = 0x1.8p23f, .inv_ln2 = 0x1.715476p+0f, .ln2_hi = 0x1.62e4p-1f,    \
+-    .ln2_lo = 0x1.7f7d1cp-20f,                                                \
++    .c4 = 0x1.6b55a2p-10, .ln2_lo = 0x1.7f7d1cp-20f, .ln2_hi = 0x1.62e4p-1f,  \
+   }
+ 
+-#define C(i) sv_f32 (d->c##i)
+-
+ static inline svfloat32_t
+ expm1f_inline (svfloat32_t x, svbool_t pg, const struct sv_expm1f_data *d)
+ {
+@@ -55,9 +52,8 @@ expm1f_inline (svfloat32_t x, svbool_t pg, const struct sv_expm1f_data *d)
+      and f = x - i * ln2, then f is in [-ln2/2, ln2/2].
+      exp(x) - 1 = 2^i * (expm1(f) + 1) - 1
+      where 2^i is exact because i is an integer.  */
+-  svfloat32_t j = svmla_x (pg, sv_f32 (d->shift), x, d->inv_ln2);
+-  j = svsub_x (pg, j, d->shift);
+-  svint32_t i = svcvt_s32_x (pg, j);
++  svfloat32_t j = svmul_x (svptrue_b32 (), x, d->inv_ln2);
++  j = svrinta_x (pg, j);
+ 
+   svfloat32_t f = svmls_lane (x, j, lane_constants, 2);
+   f = svmls_lane (f, j, lane_constants, 3);
+@@ -67,18 +63,18 @@ expm1f_inline (svfloat32_t x, svbool_t pg, const struct sv_expm1f_data *d)
+ 	 x + ax^2 + bx^3 + cx^4 ....
+      So we calculate the polynomial P(f) = a + bf + cf^2 + ...
+      and assemble the approximation expm1(f) ~= f + f^2 * P(f).  */
+-  svfloat32_t p12 = svmla_lane (C (1), f, lane_constants, 0);
+-  svfloat32_t p34 = svmla_lane (C (3), f, lane_constants, 1);
+-  svfloat32_t f2 = svmul_x (pg, f, f);
++  svfloat32_t p12 = svmla_lane (sv_f32 (d->c1), f, lane_constants, 0);
++  svfloat32_t p34 = svmla_lane (sv_f32 (d->c3), f, lane_constants, 1);
++  svfloat32_t f2 = svmul_x (svptrue_b32 (), f, f);
+   svfloat32_t p = svmla_x (pg, p12, f2, p34);
+-  p = svmla_x (pg, C (0), f, p);
++  p = svmla_x (pg, sv_f32 (d->c0), f, p);
+   p = svmla_x (pg, f, f2, p);
+ 
+   /* Assemble the result.
+      expm1(x) ~= 2^i * (p + 1) - 1
+      Let t = 2^i.  */
+-  svfloat32_t t = svscale_x (pg, sv_f32 (1), i);
+-  return svmla_x (pg, svsub_x (pg, t, 1), p, t);
++  svfloat32_t t = svscale_x (pg, sv_f32 (1.0f), svcvt_s32_x (pg, j));
++  return svmla_x (pg, svsub_x (pg, t, 1.0f), p, t);
+ }
+ 
+ #endif
+diff --git a/sysdeps/aarch64/fpu/tanhf_sve.c b/sysdeps/aarch64/fpu/tanhf_sve.c
+index 0b94523cf5..80dd679346 100644
+--- a/sysdeps/aarch64/fpu/tanhf_sve.c
++++ b/sysdeps/aarch64/fpu/tanhf_sve.c
+@@ -19,20 +19,27 @@
+ 
+ #include "sv_expm1f_inline.h"
+ 
++/* Largest value of x for which tanhf(x) rounds to 1 (or -1 for negative).  */
++#define BoringBound 0x1.205966p+3f
++
+ static const struct data
+ {
+   struct sv_expm1f_data expm1f_consts;
+-  uint32_t boring_bound, onef;
++  uint32_t onef, special_bound;
++  float boring_bound;
+ } data = {
+   .expm1f_consts = SV_EXPM1F_DATA,
+-  /* 0x1.205966p+3, above which tanhf rounds to 1 (or -1 for negative).  */
+-  .boring_bound = 0x41102cb3,
+   .onef = 0x3f800000,
++  .special_bound = 0x7f800000,
++  .boring_bound = BoringBound,
+ };
+ 
+ static svfloat32_t NOINLINE
+-special_case (svfloat32_t x, svfloat32_t y, svbool_t special)
++special_case (svfloat32_t x, svbool_t pg, svbool_t is_boring,
++	      svfloat32_t boring, svfloat32_t q, svbool_t special)
+ {
++  svfloat32_t y
++      = svsel_f32 (is_boring, boring, svdiv_x (pg, q, svadd_x (pg, q, 2.0)));
+   return sv_call_f32 (tanhf, x, y, special);
+ }
+ 
+@@ -47,15 +54,16 @@ svfloat32_t SV_NAME_F1 (tanh) (svfloat32_t x, const svbool_t pg)
+   svfloat32_t ax = svabs_x (pg, x);
+   svuint32_t iax = svreinterpret_u32 (ax);
+   svuint32_t sign = sveor_x (pg, svreinterpret_u32 (x), iax);
+-  svbool_t is_boring = svcmpgt (pg, iax, d->boring_bound);
+   svfloat32_t boring = svreinterpret_f32 (svorr_x (pg, sign, d->onef));
+-
+-  svbool_t special = svcmpgt (pg, iax, 0x7f800000);
++  svbool_t special = svcmpgt (pg, iax, d->special_bound);
++  svbool_t is_boring = svacgt (pg, x, d->boring_bound);
+ 
+   /* tanh(x) = (e^2x - 1) / (e^2x + 1).  */
+-  svfloat32_t q = expm1f_inline (svmul_x (pg, x, 2.0), pg, &d->expm1f_consts);
+-  svfloat32_t y = svdiv_x (pg, q, svadd_x (pg, q, 2.0));
++  svfloat32_t q = expm1f_inline (svmul_x (svptrue_b32 (), x, 2.0), pg,
++				 &d->expm1f_consts);
++
+   if (__glibc_unlikely (svptest_any (pg, special)))
+-    return special_case (x, svsel_f32 (is_boring, boring, y), special);
++    return special_case (x, pg, is_boring, boring, q, special);
++  svfloat32_t y = svdiv_x (pg, q, svadd_x (pg, q, 2.0));
+   return svsel_f32 (is_boring, boring, y);
+ }
+
+commit 0ff6a9ff79bca9384ce4ba20e8942d39cc377a14
+Author: Luna Lamb <luna.lamb@arm.com>
+Date:   Thu Feb 13 17:52:09 2025 +0000
+
+    Aarch64: Improve codegen in SVE asinh
+    
+    Use unpredicated muls, use lanewise mla's and improve memory access.
+    1% regression in throughput microbenchmark on Neoverse V1.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit 8f0e7fe61e0a2ad5ed777933703ce09053810ec4)
+
+diff --git a/sysdeps/aarch64/fpu/asinh_sve.c b/sysdeps/aarch64/fpu/asinh_sve.c
+index 28dc5c4587..fe8715e06c 100644
+--- a/sysdeps/aarch64/fpu/asinh_sve.c
++++ b/sysdeps/aarch64/fpu/asinh_sve.c
+@@ -18,36 +18,49 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include "sv_math.h"
+-#include "poly_sve_f64.h"
+ 
+ #define SignMask (0x8000000000000000)
+ #define One (0x3ff0000000000000)
+ #define Thres (0x5fe0000000000000) /* asuint64 (0x1p511).  */
++#define IndexMask (((1 << V_LOG_TABLE_BITS) - 1) << 1)
+ 
+ static const struct data
+ {
+-  double poly[18];
+-  double ln2, p3, p1, p4, p0, p2;
+-  uint64_t n;
+-  uint64_t off;
++  double even_coeffs[9];
++  double ln2, p3, p1, p4, p0, p2, c1, c3, c5, c7, c9, c11, c13, c15, c17;
++  uint64_t off, mask;
+ 
+ } data = {
+-  /* Polynomial generated using Remez on [2^-26, 1].  */
+-  .poly
+-  = { -0x1.55555555554a7p-3, 0x1.3333333326c7p-4, -0x1.6db6db68332e6p-5,
+-      0x1.f1c71b26fb40dp-6, -0x1.6e8b8b654a621p-6, 0x1.1c4daa9e67871p-6,
+-      -0x1.c9871d10885afp-7, 0x1.7a16e8d9d2ecfp-7, -0x1.3ddca533e9f54p-7,
+-      0x1.0becef748dafcp-7, -0x1.b90c7099dd397p-8, 0x1.541f2bb1ffe51p-8,
+-      -0x1.d217026a669ecp-9, 0x1.0b5c7977aaf7p-9, -0x1.e0f37daef9127p-11,
+-      0x1.388b5fe542a6p-12, -0x1.021a48685e287p-14, 0x1.93d4ba83d34dap-18 },
++   /* Polynomial generated using Remez on [2^-26, 1].  */
++  .even_coeffs ={
++    -0x1.55555555554a7p-3,
++    -0x1.6db6db68332e6p-5,
++    -0x1.6e8b8b654a621p-6,
++    -0x1.c9871d10885afp-7,
++    -0x1.3ddca533e9f54p-7,
++    -0x1.b90c7099dd397p-8,
++    -0x1.d217026a669ecp-9,
++    -0x1.e0f37daef9127p-11,
++    -0x1.021a48685e287p-14, },
++
++  .c1 = 0x1.3333333326c7p-4,
++  .c3 = 0x1.f1c71b26fb40dp-6,
++  .c5 = 0x1.1c4daa9e67871p-6,
++  .c7 = 0x1.7a16e8d9d2ecfp-7,
++  .c9 = 0x1.0becef748dafcp-7,
++  .c11 = 0x1.541f2bb1ffe51p-8,
++  .c13 = 0x1.0b5c7977aaf7p-9,
++  .c15 = 0x1.388b5fe542a6p-12,
++  .c17 = 0x1.93d4ba83d34dap-18,
++
+   .ln2 = 0x1.62e42fefa39efp-1,
+   .p0 = -0x1.ffffffffffff7p-2,
+   .p1 = 0x1.55555555170d4p-2,
+   .p2 = -0x1.0000000399c27p-2,
+   .p3 = 0x1.999b2e90e94cap-3,
+   .p4 = -0x1.554e550bd501ep-3,
+-  .n = 1 << V_LOG_TABLE_BITS,
+-  .off = 0x3fe6900900000000
++  .off = 0x3fe6900900000000,
++  .mask = 0xfffULL << 52,
+ };
+ 
+ static svfloat64_t NOINLINE
+@@ -64,11 +77,10 @@ __sv_log_inline (svfloat64_t x, const struct data *d, const svbool_t pg)
+      of the algorithm used.  */
+ 
+   svuint64_t ix = svreinterpret_u64 (x);
+-  svuint64_t tmp = svsub_x (pg, ix, d->off);
+-  svuint64_t i = svand_x (pg, svlsr_x (pg, tmp, (51 - V_LOG_TABLE_BITS)),
+-			  (d->n - 1) << 1);
+-  svint64_t k = svasr_x (pg, svreinterpret_s64 (tmp), 52);
+-  svuint64_t iz = svsub_x (pg, ix, svand_x (pg, tmp, 0xfffULL << 52));
++  svuint64_t i_off = svsub_x (pg, ix, d->off);
++  svuint64_t i
++      = svand_x (pg, svlsr_x (pg, i_off, (51 - V_LOG_TABLE_BITS)), IndexMask);
++  svuint64_t iz = svsub_x (pg, ix, svand_x (pg, i_off, d->mask));
+   svfloat64_t z = svreinterpret_f64 (iz);
+ 
+   svfloat64_t invc = svld1_gather_index (pg, &__v_log_data.table[0].invc, i);
+@@ -78,14 +90,14 @@ __sv_log_inline (svfloat64_t x, const struct data *d, const svbool_t pg)
+   svfloat64_t p1_p4 = svld1rq (svptrue_b64 (), &d->p1);
+ 
+   svfloat64_t r = svmla_x (pg, sv_f64 (-1.0), invc, z);
+-  svfloat64_t kd = svcvt_f64_x (pg, k);
++  svfloat64_t kd
++      = svcvt_f64_x (pg, svasr_x (pg, svreinterpret_s64 (i_off), 52));
+ 
+   svfloat64_t hi = svmla_lane (svadd_x (pg, logc, r), kd, ln2_p3, 0);
+-  svfloat64_t r2 = svmul_x (pg, r, r);
+-
++  svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r);
+   svfloat64_t y = svmla_lane (sv_f64 (d->p2), r, ln2_p3, 1);
+-
+   svfloat64_t p = svmla_lane (sv_f64 (d->p0), r, p1_p4, 0);
++
+   y = svmla_lane (y, r2, p1_p4, 1);
+   y = svmla_x (pg, p, r2, y);
+   y = svmla_x (pg, hi, r2, y);
+@@ -111,7 +123,6 @@ svfloat64_t SV_NAME_D1 (asinh) (svfloat64_t x, const svbool_t pg)
+   svuint64_t iax = svbic_x (pg, ix, SignMask);
+   svuint64_t sign = svand_x (pg, ix, SignMask);
+   svfloat64_t ax = svreinterpret_f64 (iax);
+-
+   svbool_t ge1 = svcmpge (pg, iax, One);
+   svbool_t special = svcmpge (pg, iax, Thres);
+ 
+@@ -120,7 +131,7 @@ svfloat64_t SV_NAME_D1 (asinh) (svfloat64_t x, const svbool_t pg)
+   svfloat64_t option_1 = sv_f64 (0);
+   if (__glibc_likely (svptest_any (pg, ge1)))
+     {
+-      svfloat64_t x2 = svmul_x (pg, ax, ax);
++      svfloat64_t x2 = svmul_x (svptrue_b64 (), ax, ax);
+       option_1 = __sv_log_inline (
+ 	  svadd_x (pg, ax, svsqrt_x (pg, svadd_x (pg, x2, 1))), d, pg);
+     }
+@@ -130,21 +141,53 @@ svfloat64_t SV_NAME_D1 (asinh) (svfloat64_t x, const svbool_t pg)
+      The largest observed error in this region is 1.51 ULPs:
+      _ZGVsMxv_asinh(0x1.fe12bf8c616a2p-1) got 0x1.c1e649ee2681bp-1
+ 					 want 0x1.c1e649ee2681dp-1.  */
++
+   svfloat64_t option_2 = sv_f64 (0);
+   if (__glibc_likely (svptest_any (pg, svnot_z (pg, ge1))))
+     {
+-      svfloat64_t x2 = svmul_x (pg, ax, ax);
+-      svfloat64_t x4 = svmul_x (pg, x2, x2);
+-      svfloat64_t p = sv_pw_horner_17_f64_x (pg, x2, x4, d->poly);
+-      option_2 = svmla_x (pg, ax, p, svmul_x (pg, x2, ax));
++      svfloat64_t x2 = svmul_x (svptrue_b64 (), ax, ax);
++      svfloat64_t x4 = svmul_x (svptrue_b64 (), x2, x2);
++      /* Order-17 Pairwise Horner scheme.  */
++      svfloat64_t c13 = svld1rq (svptrue_b64 (), &d->c1);
++      svfloat64_t c57 = svld1rq (svptrue_b64 (), &d->c5);
++      svfloat64_t c911 = svld1rq (svptrue_b64 (), &d->c9);
++      svfloat64_t c1315 = svld1rq (svptrue_b64 (), &d->c13);
++
++      svfloat64_t p01 = svmla_lane (sv_f64 (d->even_coeffs[0]), x2, c13, 0);
++      svfloat64_t p23 = svmla_lane (sv_f64 (d->even_coeffs[1]), x2, c13, 1);
++      svfloat64_t p45 = svmla_lane (sv_f64 (d->even_coeffs[2]), x2, c57, 0);
++      svfloat64_t p67 = svmla_lane (sv_f64 (d->even_coeffs[3]), x2, c57, 1);
++      svfloat64_t p89 = svmla_lane (sv_f64 (d->even_coeffs[4]), x2, c911, 0);
++      svfloat64_t p1011 = svmla_lane (sv_f64 (d->even_coeffs[5]), x2, c911, 1);
++      svfloat64_t p1213
++	  = svmla_lane (sv_f64 (d->even_coeffs[6]), x2, c1315, 0);
++      svfloat64_t p1415
++	  = svmla_lane (sv_f64 (d->even_coeffs[7]), x2, c1315, 1);
++      svfloat64_t p1617 = svmla_x (pg, sv_f64 (d->even_coeffs[8]), x2, d->c17);
++
++      svfloat64_t p = svmla_x (pg, p1415, x4, p1617);
++      p = svmla_x (pg, p1213, x4, p);
++      p = svmla_x (pg, p1011, x4, p);
++      p = svmla_x (pg, p89, x4, p);
++
++      p = svmla_x (pg, p67, x4, p);
++      p = svmla_x (pg, p45, x4, p);
++
++      p = svmla_x (pg, p23, x4, p);
++
++      p = svmla_x (pg, p01, x4, p);
++
++      option_2 = svmla_x (pg, ax, p, svmul_x (svptrue_b64 (), x2, ax));
+     }
+ 
+-  /* Choose the right option for each lane.  */
+-  svfloat64_t y = svsel (ge1, option_1, option_2);
+-
+   if (__glibc_unlikely (svptest_any (pg, special)))
+     return special_case (
+-	x, svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (y), sign)),
++	x,
++	svreinterpret_f64 (sveor_x (
++	    pg, svreinterpret_u64 (svsel (ge1, option_1, option_2)), sign)),
+ 	special);
++
++  /* Choose the right option for each lane.  */
++  svfloat64_t y = svsel (ge1, option_1, option_2);
+   return svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (y), sign));
+ }
+
+commit 4b0bb84eb7e52a135c873fd9d0fc6c30599aedf4
+Author: Luna Lamb <luna.lamb@arm.com>
+Date:   Thu Feb 13 17:54:46 2025 +0000
+
+    Aarch64: Improve codegen in SVE exp and users, and update expf_inline
+    
+    Use unpredicted muls, and improve memory access.
+    7%, 3% and 1% improvement in throughput microbenchmark on Neoverse V1,
+    for exp, exp2 and cosh respectively.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit c0ff447edf19bd4630fe79adf5e8b896405b059f)
+
+diff --git a/sysdeps/aarch64/fpu/cosh_sve.c b/sysdeps/aarch64/fpu/cosh_sve.c
+index 919f34604a..e375dd8a34 100644
+--- a/sysdeps/aarch64/fpu/cosh_sve.c
++++ b/sysdeps/aarch64/fpu/cosh_sve.c
+@@ -23,7 +23,7 @@ static const struct data
+ {
+   float64_t poly[3];
+   float64_t inv_ln2, ln2_hi, ln2_lo, shift, thres;
+-  uint64_t index_mask, special_bound;
++  uint64_t special_bound;
+ } data = {
+   .poly = { 0x1.fffffffffffd4p-2, 0x1.5555571d6b68cp-3,
+ 	    0x1.5555576a59599p-5, },
+@@ -35,14 +35,16 @@ static const struct data
+   .shift = 0x1.8p+52,
+   .thres = 704.0,
+ 
+-  .index_mask = 0xff,
+   /* 0x1.6p9, above which exp overflows.  */
+   .special_bound = 0x4086000000000000,
+ };
+ 
+ static svfloat64_t NOINLINE
+-special_case (svfloat64_t x, svfloat64_t y, svbool_t special)
++special_case (svfloat64_t x, svbool_t pg, svfloat64_t t, svbool_t special)
+ {
++  svfloat64_t half_t = svmul_x (svptrue_b64 (), t, 0.5);
++  svfloat64_t half_over_t = svdivr_x (pg, t, 0.5);
++  svfloat64_t y = svadd_x (pg, half_t, half_over_t);
+   return sv_call_f64 (cosh, x, y, special);
+ }
+ 
+@@ -60,12 +62,12 @@ exp_inline (svfloat64_t x, const svbool_t pg, const struct data *d)
+ 
+   svuint64_t u = svreinterpret_u64 (z);
+   svuint64_t e = svlsl_x (pg, u, 52 - V_EXP_TAIL_TABLE_BITS);
+-  svuint64_t i = svand_x (pg, u, d->index_mask);
++  svuint64_t i = svand_x (svptrue_b64 (), u, 0xff);
+ 
+   svfloat64_t y = svmla_x (pg, sv_f64 (d->poly[1]), r, d->poly[2]);
+   y = svmla_x (pg, sv_f64 (d->poly[0]), r, y);
+   y = svmla_x (pg, sv_f64 (1.0), r, y);
+-  y = svmul_x (pg, r, y);
++  y = svmul_x (svptrue_b64 (), r, y);
+ 
+   /* s = 2^(n/N).  */
+   u = svld1_gather_index (pg, __v_exp_tail_data, i);
+@@ -94,12 +96,12 @@ svfloat64_t SV_NAME_D1 (cosh) (svfloat64_t x, const svbool_t pg)
+   /* Up to the point that exp overflows, we can use it to calculate cosh by
+      exp(|x|) / 2 + 1 / (2 * exp(|x|)).  */
+   svfloat64_t t = exp_inline (ax, pg, d);
+-  svfloat64_t half_t = svmul_x (pg, t, 0.5);
+-  svfloat64_t half_over_t = svdivr_x (pg, t, 0.5);
+ 
+   /* Fall back to scalar for any special cases.  */
+   if (__glibc_unlikely (svptest_any (pg, special)))
+-    return special_case (x, svadd_x (pg, half_t, half_over_t), special);
++    return special_case (x, pg, t, special);
+ 
++  svfloat64_t half_t = svmul_x (svptrue_b64 (), t, 0.5);
++  svfloat64_t half_over_t = svdivr_x (pg, t, 0.5);
+   return svadd_x (pg, half_t, half_over_t);
+ }
+diff --git a/sysdeps/aarch64/fpu/exp10_sve.c b/sysdeps/aarch64/fpu/exp10_sve.c
+index ddf64708cb..bfd3fb9e19 100644
+--- a/sysdeps/aarch64/fpu/exp10_sve.c
++++ b/sysdeps/aarch64/fpu/exp10_sve.c
+@@ -18,21 +18,23 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include "sv_math.h"
+-#include "poly_sve_f64.h"
+ 
+ #define SpecialBound 307.0 /* floor (log10 (2^1023)).  */
+ 
+ static const struct data
+ {
+-  double poly[5];
++  double c1, c3, c2, c4, c0;
+   double shift, log10_2, log2_10_hi, log2_10_lo, scale_thres, special_bound;
+ } data = {
+   /* Coefficients generated using Remez algorithm.
+      rel error: 0x1.9fcb9b3p-60
+      abs error: 0x1.a20d9598p-60 in [ -log10(2)/128, log10(2)/128 ]
+      max ulp err 0.52 +0.5.  */
+-  .poly = { 0x1.26bb1bbb55516p1, 0x1.53524c73cd32ap1, 0x1.0470591daeafbp1,
+-	    0x1.2bd77b1361ef6p0, 0x1.142b5d54e9621p-1 },
++  .c0 = 0x1.26bb1bbb55516p1,
++  .c1 = 0x1.53524c73cd32ap1,
++  .c2 = 0x1.0470591daeafbp1,
++  .c3 = 0x1.2bd77b1361ef6p0,
++  .c4 = 0x1.142b5d54e9621p-1,
+   /* 1.5*2^46+1023. This value is further explained below.  */
+   .shift = 0x1.800000000ffc0p+46,
+   .log10_2 = 0x1.a934f0979a371p1,     /* 1/log2(10).  */
+@@ -70,9 +72,9 @@ special_case (svbool_t pg, svfloat64_t s, svfloat64_t y, svfloat64_t n,
+   /* |n| > 1280 => 2^(n) overflows.  */
+   svbool_t p_cmp = svacgt (pg, n, d->scale_thres);
+ 
+-  svfloat64_t r1 = svmul_x (pg, s1, s1);
++  svfloat64_t r1 = svmul_x (svptrue_b64 (), s1, s1);
+   svfloat64_t r2 = svmla_x (pg, s2, s2, y);
+-  svfloat64_t r0 = svmul_x (pg, r2, s1);
++  svfloat64_t r0 = svmul_x (svptrue_b64 (), r2, s1);
+ 
+   return svsel (p_cmp, r1, r0);
+ }
+@@ -103,11 +105,14 @@ svfloat64_t SV_NAME_D1 (exp10) (svfloat64_t x, svbool_t pg)
+      comes at significant performance cost.  */
+   svuint64_t u = svreinterpret_u64 (z);
+   svfloat64_t scale = svexpa (u);
+-
++  svfloat64_t c24 = svld1rq (svptrue_b64 (), &d->c2);
+   /* Approximate exp10(r) using polynomial.  */
+-  svfloat64_t r2 = svmul_x (pg, r, r);
+-  svfloat64_t y = svmla_x (pg, svmul_x (pg, r, d->poly[0]), r2,
+-			   sv_pairwise_poly_3_f64_x (pg, r, r2, d->poly + 1));
++  svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r);
++  svfloat64_t p12 = svmla_lane (sv_f64 (d->c1), r, c24, 0);
++  svfloat64_t p34 = svmla_lane (sv_f64 (d->c3), r, c24, 1);
++  svfloat64_t p14 = svmla_x (pg, p12, p34, r2);
++
++  svfloat64_t y = svmla_x (pg, svmul_x (svptrue_b64 (), r, d->c0), r2, p14);
+ 
+   /* Assemble result as exp10(x) = 2^n * exp10(r).  If |x| > SpecialBound
+      multiplication may overflow, so use special case routine.  */
+diff --git a/sysdeps/aarch64/fpu/exp2_sve.c b/sysdeps/aarch64/fpu/exp2_sve.c
+index 22848ebfa5..5dfb77cdbc 100644
+--- a/sysdeps/aarch64/fpu/exp2_sve.c
++++ b/sysdeps/aarch64/fpu/exp2_sve.c
+@@ -18,7 +18,6 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include "sv_math.h"
+-#include "poly_sve_f64.h"
+ 
+ #define N (1 << V_EXP_TABLE_BITS)
+ 
+@@ -27,15 +26,15 @@
+ 
+ static const struct data
+ {
+-  double poly[4];
++  double c0, c2;
++  double c1, c3;
+   double shift, big_bound, uoflow_bound;
+ } data = {
+   /* Coefficients are computed using Remez algorithm with
+      minimisation of the absolute error.  */
+-  .poly = { 0x1.62e42fefa3686p-1, 0x1.ebfbdff82c241p-3, 0x1.c6b09b16de99ap-5,
+-	    0x1.3b2abf5571ad8p-7 },
+-  .shift = 0x1.8p52 / N,
+-  .uoflow_bound = UOFlowBound,
++  .c0 = 0x1.62e42fefa3686p-1, .c1 = 0x1.ebfbdff82c241p-3,
++  .c2 = 0x1.c6b09b16de99ap-5, .c3 = 0x1.3b2abf5571ad8p-7,
++  .shift = 0x1.8p52 / N,      .uoflow_bound = UOFlowBound,
+   .big_bound = BigBound,
+ };
+ 
+@@ -67,9 +66,9 @@ special_case (svbool_t pg, svfloat64_t s, svfloat64_t y, svfloat64_t n,
+   /* |n| > 1280 => 2^(n) overflows.  */
+   svbool_t p_cmp = svacgt (pg, n, d->uoflow_bound);
+ 
+-  svfloat64_t r1 = svmul_x (pg, s1, s1);
++  svfloat64_t r1 = svmul_x (svptrue_b64 (), s1, s1);
+   svfloat64_t r2 = svmla_x (pg, s2, s2, y);
+-  svfloat64_t r0 = svmul_x (pg, r2, s1);
++  svfloat64_t r0 = svmul_x (svptrue_b64 (), r2, s1);
+ 
+   return svsel (p_cmp, r1, r0);
+ }
+@@ -99,11 +98,14 @@ svfloat64_t SV_NAME_D1 (exp2) (svfloat64_t x, svbool_t pg)
+   svuint64_t top = svlsl_x (pg, ki, 52 - V_EXP_TABLE_BITS);
+   svfloat64_t scale = svreinterpret_f64 (svadd_x (pg, sbits, top));
+ 
++  svfloat64_t c13 = svld1rq (svptrue_b64 (), &d->c1);
+   /* Approximate exp2(r) using polynomial.  */
+-  svfloat64_t r2 = svmul_x (pg, r, r);
+-  svfloat64_t p = sv_pairwise_poly_3_f64_x (pg, r, r2, d->poly);
+-  svfloat64_t y = svmul_x (pg, r, p);
+-
++  /* y = exp2(r) - 1 ~= C0 r + C1 r^2 + C2 r^3 + C3 r^4.  */
++  svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r);
++  svfloat64_t p01 = svmla_lane (sv_f64 (d->c0), r, c13, 0);
++  svfloat64_t p23 = svmla_lane (sv_f64 (d->c2), r, c13, 1);
++  svfloat64_t p = svmla_x (pg, p01, p23, r2);
++  svfloat64_t y = svmul_x (svptrue_b64 (), r, p);
+   /* Assemble exp2(x) = exp2(r) * scale.  */
+   if (__glibc_unlikely (svptest_any (pg, special)))
+     return special_case (pg, scale, y, kd, d);
+diff --git a/sysdeps/aarch64/fpu/exp_sve.c b/sysdeps/aarch64/fpu/exp_sve.c
+index aabaaa1d61..b2421d493f 100644
+--- a/sysdeps/aarch64/fpu/exp_sve.c
++++ b/sysdeps/aarch64/fpu/exp_sve.c
+@@ -21,12 +21,15 @@
+ 
+ static const struct data
+ {
+-  double poly[4];
++  double c0, c2;
++  double c1, c3;
+   double ln2_hi, ln2_lo, inv_ln2, shift, thres;
++
+ } data = {
+-  .poly = { /* ulp error: 0.53.  */
+-	    0x1.fffffffffdbcdp-2, 0x1.555555555444cp-3, 0x1.555573c6a9f7dp-5,
+-	    0x1.1111266d28935p-7 },
++  .c0 = 0x1.fffffffffdbcdp-2,
++  .c1 = 0x1.555555555444cp-3,
++  .c2 = 0x1.555573c6a9f7dp-5,
++  .c3 = 0x1.1111266d28935p-7,
+   .ln2_hi = 0x1.62e42fefa3800p-1,
+   .ln2_lo = 0x1.ef35793c76730p-45,
+   /* 1/ln2.  */
+@@ -36,7 +39,6 @@ static const struct data
+   .thres = 704.0,
+ };
+ 
+-#define C(i) sv_f64 (d->poly[i])
+ #define SpecialOffset 0x6000000000000000 /* 0x1p513.  */
+ /* SpecialBias1 + SpecialBias1 = asuint(1.0).  */
+ #define SpecialBias1 0x7000000000000000 /* 0x1p769.  */
+@@ -56,20 +58,20 @@ special_case (svbool_t pg, svfloat64_t s, svfloat64_t y, svfloat64_t n)
+   svuint64_t b
+       = svdup_u64_z (p_sign, SpecialOffset); /* Inactive lanes set to 0.  */
+ 
+-  /* Set s1 to generate overflow depending on sign of exponent n.  */
+-  svfloat64_t s1 = svreinterpret_f64 (
+-      svsubr_x (pg, b, SpecialBias1)); /* 0x70...0 - b.  */
+-  /* Offset s to avoid overflow in final result if n is below threshold.  */
++  /* Set s1 to generate overflow depending on sign of exponent n,
++     ie. s1 = 0x70...0 - b.  */
++  svfloat64_t s1 = svreinterpret_f64 (svsubr_x (pg, b, SpecialBias1));
++  /* Offset s to avoid overflow in final result if n is below threshold.
++     ie. s2 = as_u64 (s) - 0x3010...0 + b.  */
+   svfloat64_t s2 = svreinterpret_f64 (
+-      svadd_x (pg, svsub_x (pg, svreinterpret_u64 (s), SpecialBias2),
+-	       b)); /* as_u64 (s) - 0x3010...0 + b.  */
++      svadd_x (pg, svsub_x (pg, svreinterpret_u64 (s), SpecialBias2), b));
+ 
+   /* |n| > 1280 => 2^(n) overflows.  */
+   svbool_t p_cmp = svacgt (pg, n, 1280.0);
+ 
+-  svfloat64_t r1 = svmul_x (pg, s1, s1);
++  svfloat64_t r1 = svmul_x (svptrue_b64 (), s1, s1);
+   svfloat64_t r2 = svmla_x (pg, s2, s2, y);
+-  svfloat64_t r0 = svmul_x (pg, r2, s1);
++  svfloat64_t r0 = svmul_x (svptrue_b64 (), r2, s1);
+ 
+   return svsel (p_cmp, r1, r0);
+ }
+@@ -103,16 +105,16 @@ svfloat64_t SV_NAME_D1 (exp) (svfloat64_t x, const svbool_t pg)
+   svfloat64_t z = svmla_x (pg, sv_f64 (d->shift), x, d->inv_ln2);
+   svuint64_t u = svreinterpret_u64 (z);
+   svfloat64_t n = svsub_x (pg, z, d->shift);
+-
++  svfloat64_t c13 = svld1rq (svptrue_b64 (), &d->c1);
+   /* r = x - n * ln2, r is in [-ln2/(2N), ln2/(2N)].  */
+   svfloat64_t ln2 = svld1rq (svptrue_b64 (), &d->ln2_hi);
+   svfloat64_t r = svmls_lane (x, n, ln2, 0);
+   r = svmls_lane (r, n, ln2, 1);
+ 
+   /* y = exp(r) - 1 ~= r + C0 r^2 + C1 r^3 + C2 r^4 + C3 r^5.  */
+-  svfloat64_t r2 = svmul_x (pg, r, r);
+-  svfloat64_t p01 = svmla_x (pg, C (0), C (1), r);
+-  svfloat64_t p23 = svmla_x (pg, C (2), C (3), r);
++  svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r);
++  svfloat64_t p01 = svmla_lane (sv_f64 (d->c0), r, c13, 0);
++  svfloat64_t p23 = svmla_lane (sv_f64 (d->c2), r, c13, 1);
+   svfloat64_t p04 = svmla_x (pg, p01, p23, r2);
+   svfloat64_t y = svmla_x (pg, r, p04, r2);
+ 
+diff --git a/sysdeps/aarch64/fpu/sv_expf_inline.h b/sysdeps/aarch64/fpu/sv_expf_inline.h
+index 6166df6553..75781fb4dd 100644
+--- a/sysdeps/aarch64/fpu/sv_expf_inline.h
++++ b/sysdeps/aarch64/fpu/sv_expf_inline.h
+@@ -61,7 +61,7 @@ expf_inline (svfloat32_t x, const svbool_t pg, const struct sv_expf_data *d)
+   /* scale = 2^(n/N).  */
+   svfloat32_t scale = svexpa (svreinterpret_u32 (z));
+ 
+-  /* y = exp(r) - 1 ~= r + C0 r^2 + C1 r^3 + C2 r^4 + C3 r^5 + C4 r^6.  */
++  /* poly(r) = exp(r) - 1 ~= C0 r + C1 r^2 + C2 r^3 + C3 r^4 + C4 r^5.  */
+   svfloat32_t p12 = svmla_lane (sv_f32 (d->c1), r, lane_consts, 2);
+   svfloat32_t p34 = svmla_lane (sv_f32 (d->c3), r, lane_consts, 3);
+   svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r);
+@@ -71,5 +71,4 @@ expf_inline (svfloat32_t x, const svbool_t pg, const struct sv_expf_data *d)
+ 
+   return svmla_x (pg, scale, scale, poly);
+ }
+-
+ #endif
+
+commit 194185c28954dfa11a6ded8b32f34fee680d3218
+Author: Yat Long Poon <yatlong.poon@arm.com>
+Date:   Thu Feb 13 18:00:50 2025 +0000
+
+    AArch64: Improve codegen for SVE erfcf
+    
+    Reduce number of MOV/MOVPRFXs and use unpredicated FMUL.
+    Replace MUL with LSL.  Speedup on Neoverse V1: 6%.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit f5ff34cb3c75ec1061c75bb9188b3c1176426947)
+
+diff --git a/sysdeps/aarch64/fpu/erfcf_sve.c b/sysdeps/aarch64/fpu/erfcf_sve.c
+index ecacb933ac..e4869263e3 100644
+--- a/sysdeps/aarch64/fpu/erfcf_sve.c
++++ b/sysdeps/aarch64/fpu/erfcf_sve.c
+@@ -76,7 +76,7 @@ svfloat32_t SV_NAME_F1 (erfc) (svfloat32_t x, const svbool_t pg)
+   svuint32_t i = svqadd (svreinterpret_u32 (z), dat->off_idx);
+ 
+   /* Lookup erfc(r) and 2/sqrt(pi)*exp(-r^2) in tables.  */
+-  i = svmul_x (pg, i, 2);
++  i = svlsl_x (svptrue_b32 (), i, 1);
+   const float32_t *p = &__v_erfcf_data.tab[0].erfc - 2 * dat->off_arr;
+   svfloat32_t erfcr = svld1_gather_index (pg, p, i);
+   svfloat32_t scale = svld1_gather_index (pg, p + 1, i);
+@@ -84,15 +84,15 @@ svfloat32_t SV_NAME_F1 (erfc) (svfloat32_t x, const svbool_t pg)
+   /* erfc(x) ~ erfc(r) - scale * d * poly(r, d).  */
+   svfloat32_t r = svsub_x (pg, z, shift);
+   svfloat32_t d = svsub_x (pg, a, r);
+-  svfloat32_t d2 = svmul_x (pg, d, d);
+-  svfloat32_t r2 = svmul_x (pg, r, r);
++  svfloat32_t d2 = svmul_x (svptrue_b32 (), d, d);
++  svfloat32_t r2 = svmul_x (svptrue_b32 (), r, r);
+ 
+   svfloat32_t coeffs = svld1rq (svptrue_b32 (), &dat->third);
+-  svfloat32_t third = svdup_lane (coeffs, 0);
+ 
+   svfloat32_t p1 = r;
+-  svfloat32_t p2 = svmls_lane (third, r2, coeffs, 1);
+-  svfloat32_t p3 = svmul_x (pg, r, svmla_lane (sv_f32 (-0.5), r2, coeffs, 0));
++  svfloat32_t p2 = svmls_lane (sv_f32 (dat->third), r2, coeffs, 1);
++  svfloat32_t p3
++      = svmul_x (svptrue_b32 (), r, svmla_lane (sv_f32 (-0.5), r2, coeffs, 0));
+   svfloat32_t p4 = svmla_lane (sv_f32 (dat->two_over_five), r2, coeffs, 2);
+   p4 = svmls_x (pg, sv_f32 (dat->tenth), r2, p4);
+ 
+
+commit 7dc549c5a4af3c32689147550144397116404d22
+Author: Yat Long Poon <yatlong.poon@arm.com>
+Date:   Thu Feb 13 18:02:01 2025 +0000
+
+    AArch64: Improve codegen for SVE pow
+    
+    Move constants to struct.  Improve memory access with indexed/unpredicated
+    instructions.  Eliminate register spills.  Speedup on Neoverse V1: 24%.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit 0b195651db3ae793187c7dd6d78b5a7a8da9d5e6)
+
+diff --git a/sysdeps/aarch64/fpu/pow_sve.c b/sysdeps/aarch64/fpu/pow_sve.c
+index 4c0bf8956c..4242d22a49 100644
+--- a/sysdeps/aarch64/fpu/pow_sve.c
++++ b/sysdeps/aarch64/fpu/pow_sve.c
+@@ -44,19 +44,18 @@
+ 
+ /* Data is defined in v_pow_log_data.c.  */
+ #define N_LOG (1 << V_POW_LOG_TABLE_BITS)
+-#define A __v_pow_log_data.poly
+ #define Off 0x3fe6955500000000
+ 
+ /* Data is defined in v_pow_exp_data.c.  */
+ #define N_EXP (1 << V_POW_EXP_TABLE_BITS)
+ #define SignBias (0x800 << V_POW_EXP_TABLE_BITS)
+-#define C __v_pow_exp_data.poly
+ #define SmallExp 0x3c9 /* top12(0x1p-54).  */
+ #define BigExp 0x408   /* top12(512.).  */
+ #define ThresExp 0x03f /* BigExp - SmallExp.  */
+ #define HugeExp 0x409  /* top12(1024.).  */
+ 
+ /* Constants associated with pow.  */
++#define SmallBoundX 0x1p-126
+ #define SmallPowX 0x001 /* top12(0x1p-126).  */
+ #define BigPowX 0x7ff	/* top12(INFINITY).  */
+ #define ThresPowX 0x7fe /* BigPowX - SmallPowX.  */
+@@ -64,6 +63,31 @@
+ #define BigPowY 0x43e	/* top12(0x1.749p62).  */
+ #define ThresPowY 0x080 /* BigPowY - SmallPowY.  */
+ 
++static const struct data
++{
++  double log_c0, log_c2, log_c4, log_c6, ln2_hi, ln2_lo;
++  double log_c1, log_c3, log_c5, off;
++  double n_over_ln2, exp_c2, ln2_over_n_hi, ln2_over_n_lo;
++  double exp_c0, exp_c1;
++} data = {
++  .log_c0 = -0x1p-1,
++  .log_c1 = -0x1.555555555556p-1,
++  .log_c2 = 0x1.0000000000006p-1,
++  .log_c3 = 0x1.999999959554ep-1,
++  .log_c4 = -0x1.555555529a47ap-1,
++  .log_c5 = -0x1.2495b9b4845e9p0,
++  .log_c6 = 0x1.0002b8b263fc3p0,
++  .off = Off,
++  .exp_c0 = 0x1.fffffffffffd4p-2,
++  .exp_c1 = 0x1.5555571d6ef9p-3,
++  .exp_c2 = 0x1.5555576a5adcep-5,
++  .ln2_hi = 0x1.62e42fefa3800p-1,
++  .ln2_lo = 0x1.ef35793c76730p-45,
++  .n_over_ln2 = 0x1.71547652b82fep0 * N_EXP,
++  .ln2_over_n_hi = 0x1.62e42fefc0000p-9,
++  .ln2_over_n_lo = -0x1.c610ca86c3899p-45,
++};
++
+ /* Check if x is an integer.  */
+ static inline svbool_t
+ sv_isint (svbool_t pg, svfloat64_t x)
+@@ -82,7 +106,7 @@ sv_isnotint (svbool_t pg, svfloat64_t x)
+ static inline svbool_t
+ sv_isodd (svbool_t pg, svfloat64_t x)
+ {
+-  svfloat64_t y = svmul_x (pg, x, 0.5);
++  svfloat64_t y = svmul_x (svptrue_b64 (), x, 0.5);
+   return sv_isnotint (pg, y);
+ }
+ 
+@@ -121,7 +145,7 @@ zeroinfnan (uint64_t i)
+ static inline svbool_t
+ sv_zeroinfnan (svbool_t pg, svuint64_t i)
+ {
+-  return svcmpge (pg, svsub_x (pg, svmul_x (pg, i, 2), 1),
++  return svcmpge (pg, svsub_x (pg, svadd_x (pg, i, i), 1),
+ 		  2 * asuint64 (INFINITY) - 1);
+ }
+ 
+@@ -174,16 +198,17 @@ sv_call_specialcase (svfloat64_t x1, svuint64_t u1, svuint64_t u2,
+    additional 15 bits precision.  IX is the bit representation of x, but
+    normalized in the subnormal range using the sign bit for the exponent.  */
+ static inline svfloat64_t
+-sv_log_inline (svbool_t pg, svuint64_t ix, svfloat64_t *tail)
++sv_log_inline (svbool_t pg, svuint64_t ix, svfloat64_t *tail,
++	       const struct data *d)
+ {
+   /* x = 2^k z; where z is in range [Off,2*Off) and exact.
+      The range is split into N subintervals.
+      The ith subinterval contains z and c is near its center.  */
+-  svuint64_t tmp = svsub_x (pg, ix, Off);
++  svuint64_t tmp = svsub_x (pg, ix, d->off);
+   svuint64_t i = svand_x (pg, svlsr_x (pg, tmp, 52 - V_POW_LOG_TABLE_BITS),
+ 			  sv_u64 (N_LOG - 1));
+   svint64_t k = svasr_x (pg, svreinterpret_s64 (tmp), 52);
+-  svuint64_t iz = svsub_x (pg, ix, svand_x (pg, tmp, sv_u64 (0xfffULL << 52)));
++  svuint64_t iz = svsub_x (pg, ix, svlsl_x (pg, svreinterpret_u64 (k), 52));
+   svfloat64_t z = svreinterpret_f64 (iz);
+   svfloat64_t kd = svcvt_f64_x (pg, k);
+ 
+@@ -199,40 +224,85 @@ sv_log_inline (svbool_t pg, svuint64_t ix, svfloat64_t *tail)
+      |z/c - 1| < 1/N, so r = z/c - 1 is exactly representible.  */
+   svfloat64_t r = svmad_x (pg, z, invc, -1.0);
+   /* k*Ln2 + log(c) + r.  */
+-  svfloat64_t t1 = svmla_x (pg, logc, kd, __v_pow_log_data.ln2_hi);
++
++  svfloat64_t ln2_hilo = svld1rq_f64 (svptrue_b64 (), &d->ln2_hi);
++  svfloat64_t t1 = svmla_lane_f64 (logc, kd, ln2_hilo, 0);
+   svfloat64_t t2 = svadd_x (pg, t1, r);
+-  svfloat64_t lo1 = svmla_x (pg, logctail, kd, __v_pow_log_data.ln2_lo);
++  svfloat64_t lo1 = svmla_lane_f64 (logctail, kd, ln2_hilo, 1);
+   svfloat64_t lo2 = svadd_x (pg, svsub_x (pg, t1, t2), r);
+ 
+   /* Evaluation is optimized assuming superscalar pipelined execution.  */
+-  svfloat64_t ar = svmul_x (pg, r, -0.5); /* A[0] = -0.5.  */
+-  svfloat64_t ar2 = svmul_x (pg, r, ar);
+-  svfloat64_t ar3 = svmul_x (pg, r, ar2);
++
++  svfloat64_t log_c02 = svld1rq_f64 (svptrue_b64 (), &d->log_c0);
++  svfloat64_t ar = svmul_lane_f64 (r, log_c02, 0);
++  svfloat64_t ar2 = svmul_x (svptrue_b64 (), r, ar);
++  svfloat64_t ar3 = svmul_x (svptrue_b64 (), r, ar2);
+   /* k*Ln2 + log(c) + r + A[0]*r*r.  */
+   svfloat64_t hi = svadd_x (pg, t2, ar2);
+-  svfloat64_t lo3 = svmla_x (pg, svneg_x (pg, ar2), ar, r);
++  svfloat64_t lo3 = svmls_x (pg, ar2, ar, r);
+   svfloat64_t lo4 = svadd_x (pg, svsub_x (pg, t2, hi), ar2);
+   /* p = log1p(r) - r - A[0]*r*r.  */
+   /* p = (ar3 * (A[1] + r * A[2] + ar2 * (A[3] + r * A[4] + ar2 * (A[5] + r *
+      A[6])))).  */
+-  svfloat64_t a56 = svmla_x (pg, sv_f64 (A[5]), r, A[6]);
+-  svfloat64_t a34 = svmla_x (pg, sv_f64 (A[3]), r, A[4]);
+-  svfloat64_t a12 = svmla_x (pg, sv_f64 (A[1]), r, A[2]);
++
++  svfloat64_t log_c46 = svld1rq_f64 (svptrue_b64 (), &d->log_c4);
++  svfloat64_t a56 = svmla_lane_f64 (sv_f64 (d->log_c5), r, log_c46, 1);
++  svfloat64_t a34 = svmla_lane_f64 (sv_f64 (d->log_c3), r, log_c46, 0);
++  svfloat64_t a12 = svmla_lane_f64 (sv_f64 (d->log_c1), r, log_c02, 1);
+   svfloat64_t p = svmla_x (pg, a34, ar2, a56);
+   p = svmla_x (pg, a12, ar2, p);
+-  p = svmul_x (pg, ar3, p);
++  p = svmul_x (svptrue_b64 (), ar3, p);
+   svfloat64_t lo = svadd_x (
+-      pg, svadd_x (pg, svadd_x (pg, svadd_x (pg, lo1, lo2), lo3), lo4), p);
++      pg, svadd_x (pg, svsub_x (pg, svadd_x (pg, lo1, lo2), lo3), lo4), p);
+   svfloat64_t y = svadd_x (pg, hi, lo);
+   *tail = svadd_x (pg, svsub_x (pg, hi, y), lo);
+   return y;
+ }
+ 
++static inline svfloat64_t
++sv_exp_core (svbool_t pg, svfloat64_t x, svfloat64_t xtail,
++	     svuint64_t sign_bias, svfloat64_t *tmp, svuint64_t *sbits,
++	     svuint64_t *ki, const struct data *d)
++{
++  /* exp(x) = 2^(k/N) * exp(r), with exp(r) in [2^(-1/2N),2^(1/2N)].  */
++  /* x = ln2/N*k + r, with int k and r in [-ln2/2N, ln2/2N].  */
++  svfloat64_t n_over_ln2_and_c2 = svld1rq_f64 (svptrue_b64 (), &d->n_over_ln2);
++  svfloat64_t z = svmul_lane_f64 (x, n_over_ln2_and_c2, 0);
++  /* z - kd is in [-1, 1] in non-nearest rounding modes.  */
++  svfloat64_t kd = svrinta_x (pg, z);
++  *ki = svreinterpret_u64 (svcvt_s64_x (pg, kd));
++
++  svfloat64_t ln2_over_n_hilo
++      = svld1rq_f64 (svptrue_b64 (), &d->ln2_over_n_hi);
++  svfloat64_t r = x;
++  r = svmls_lane_f64 (r, kd, ln2_over_n_hilo, 0);
++  r = svmls_lane_f64 (r, kd, ln2_over_n_hilo, 1);
++  /* The code assumes 2^-200 < |xtail| < 2^-8/N.  */
++  r = svadd_x (pg, r, xtail);
++  /* 2^(k/N) ~= scale.  */
++  svuint64_t idx = svand_x (pg, *ki, N_EXP - 1);
++  svuint64_t top
++      = svlsl_x (pg, svadd_x (pg, *ki, sign_bias), 52 - V_POW_EXP_TABLE_BITS);
++  /* This is only a valid scale when -1023*N < k < 1024*N.  */
++  *sbits = svld1_gather_index (pg, __v_pow_exp_data.sbits, idx);
++  *sbits = svadd_x (pg, *sbits, top);
++  /* exp(x) = 2^(k/N) * exp(r) ~= scale + scale * (exp(r) - 1).  */
++  svfloat64_t r2 = svmul_x (svptrue_b64 (), r, r);
++  *tmp = svmla_lane_f64 (sv_f64 (d->exp_c1), r, n_over_ln2_and_c2, 1);
++  *tmp = svmla_x (pg, sv_f64 (d->exp_c0), r, *tmp);
++  *tmp = svmla_x (pg, r, r2, *tmp);
++  svfloat64_t scale = svreinterpret_f64 (*sbits);
++  /* Note: tmp == 0 or |tmp| > 2^-200 and scale > 2^-739, so there
++     is no spurious underflow here even without fma.  */
++  z = svmla_x (pg, scale, scale, *tmp);
++  return z;
++}
++
+ /* Computes sign*exp(x+xtail) where |xtail| < 2^-8/N and |xtail| <= |x|.
+    The sign_bias argument is SignBias or 0 and sets the sign to -1 or 1.  */
+ static inline svfloat64_t
+ sv_exp_inline (svbool_t pg, svfloat64_t x, svfloat64_t xtail,
+-	       svuint64_t sign_bias)
++	       svuint64_t sign_bias, const struct data *d)
+ {
+   /* 3 types of special cases: tiny (uflow and spurious uflow), huge (oflow)
+      and other cases of large values of x (scale * (1 + TMP) oflow).  */
+@@ -240,73 +310,46 @@ sv_exp_inline (svbool_t pg, svfloat64_t x, svfloat64_t xtail,
+   /* |x| is large (|x| >= 512) or tiny (|x| <= 0x1p-54).  */
+   svbool_t uoflow = svcmpge (pg, svsub_x (pg, abstop, SmallExp), ThresExp);
+ 
+-  /* Conditions special, uflow and oflow are all expressed as uoflow &&
+-     something, hence do not bother computing anything if no lane in uoflow is
+-     true.  */
+-  svbool_t special = svpfalse_b ();
+-  svbool_t uflow = svpfalse_b ();
+-  svbool_t oflow = svpfalse_b ();
++  svfloat64_t tmp;
++  svuint64_t sbits, ki;
+   if (__glibc_unlikely (svptest_any (pg, uoflow)))
+     {
++      svfloat64_t z
++	  = sv_exp_core (pg, x, xtail, sign_bias, &tmp, &sbits, &ki, d);
++
+       /* |x| is tiny (|x| <= 0x1p-54).  */
+-      uflow = svcmpge (pg, svsub_x (pg, abstop, SmallExp), 0x80000000);
++      svbool_t uflow
++	  = svcmpge (pg, svsub_x (pg, abstop, SmallExp), 0x80000000);
+       uflow = svand_z (pg, uoflow, uflow);
+       /* |x| is huge (|x| >= 1024).  */
+-      oflow = svcmpge (pg, abstop, HugeExp);
++      svbool_t oflow = svcmpge (pg, abstop, HugeExp);
+       oflow = svand_z (pg, uoflow, svbic_z (pg, oflow, uflow));
++
+       /* For large |x| values (512 < |x| < 1024) scale * (1 + TMP) can overflow
+-	 or underflow.  */
+-      special = svbic_z (pg, uoflow, svorr_z (pg, uflow, oflow));
++    or underflow.  */
++      svbool_t special = svbic_z (pg, uoflow, svorr_z (pg, uflow, oflow));
++
++      /* Update result with special and large cases.  */
++      z = sv_call_specialcase (tmp, sbits, ki, z, special);
++
++      /* Handle underflow and overflow.  */
++      svbool_t x_is_neg = svcmplt (pg, x, 0);
++      svuint64_t sign_mask
++	  = svlsl_x (pg, sign_bias, 52 - V_POW_EXP_TABLE_BITS);
++      svfloat64_t res_uoflow
++	  = svsel (x_is_neg, sv_f64 (0.0), sv_f64 (INFINITY));
++      res_uoflow = svreinterpret_f64 (
++	  svorr_x (pg, svreinterpret_u64 (res_uoflow), sign_mask));
++      /* Avoid spurious underflow for tiny x.  */
++      svfloat64_t res_spurious_uflow
++	  = svreinterpret_f64 (svorr_x (pg, sign_mask, 0x3ff0000000000000));
++
++      z = svsel (oflow, res_uoflow, z);
++      z = svsel (uflow, res_spurious_uflow, z);
++      return z;
+     }
+ 
+-  /* exp(x) = 2^(k/N) * exp(r), with exp(r) in [2^(-1/2N),2^(1/2N)].  */
+-  /* x = ln2/N*k + r, with int k and r in [-ln2/2N, ln2/2N].  */
+-  svfloat64_t z = svmul_x (pg, x, __v_pow_exp_data.n_over_ln2);
+-  /* z - kd is in [-1, 1] in non-nearest rounding modes.  */
+-  svfloat64_t shift = sv_f64 (__v_pow_exp_data.shift);
+-  svfloat64_t kd = svadd_x (pg, z, shift);
+-  svuint64_t ki = svreinterpret_u64 (kd);
+-  kd = svsub_x (pg, kd, shift);
+-  svfloat64_t r = x;
+-  r = svmls_x (pg, r, kd, __v_pow_exp_data.ln2_over_n_hi);
+-  r = svmls_x (pg, r, kd, __v_pow_exp_data.ln2_over_n_lo);
+-  /* The code assumes 2^-200 < |xtail| < 2^-8/N.  */
+-  r = svadd_x (pg, r, xtail);
+-  /* 2^(k/N) ~= scale.  */
+-  svuint64_t idx = svand_x (pg, ki, N_EXP - 1);
+-  svuint64_t top
+-      = svlsl_x (pg, svadd_x (pg, ki, sign_bias), 52 - V_POW_EXP_TABLE_BITS);
+-  /* This is only a valid scale when -1023*N < k < 1024*N.  */
+-  svuint64_t sbits = svld1_gather_index (pg, __v_pow_exp_data.sbits, idx);
+-  sbits = svadd_x (pg, sbits, top);
+-  /* exp(x) = 2^(k/N) * exp(r) ~= scale + scale * (exp(r) - 1).  */
+-  svfloat64_t r2 = svmul_x (pg, r, r);
+-  svfloat64_t tmp = svmla_x (pg, sv_f64 (C[1]), r, C[2]);
+-  tmp = svmla_x (pg, sv_f64 (C[0]), r, tmp);
+-  tmp = svmla_x (pg, r, r2, tmp);
+-  svfloat64_t scale = svreinterpret_f64 (sbits);
+-  /* Note: tmp == 0 or |tmp| > 2^-200 and scale > 2^-739, so there
+-     is no spurious underflow here even without fma.  */
+-  z = svmla_x (pg, scale, scale, tmp);
+-
+-  /* Update result with special and large cases.  */
+-  if (__glibc_unlikely (svptest_any (pg, special)))
+-    z = sv_call_specialcase (tmp, sbits, ki, z, special);
+-
+-  /* Handle underflow and overflow.  */
+-  svuint64_t sign_bit = svlsr_x (pg, svreinterpret_u64 (x), 63);
+-  svbool_t x_is_neg = svcmpne (pg, sign_bit, 0);
+-  svuint64_t sign_mask = svlsl_x (pg, sign_bias, 52 - V_POW_EXP_TABLE_BITS);
+-  svfloat64_t res_uoflow = svsel (x_is_neg, sv_f64 (0.0), sv_f64 (INFINITY));
+-  res_uoflow = svreinterpret_f64 (
+-      svorr_x (pg, svreinterpret_u64 (res_uoflow), sign_mask));
+-  z = svsel (oflow, res_uoflow, z);
+-  /* Avoid spurious underflow for tiny x.  */
+-  svfloat64_t res_spurious_uflow
+-      = svreinterpret_f64 (svorr_x (pg, sign_mask, 0x3ff0000000000000));
+-  z = svsel (uflow, res_spurious_uflow, z);
+-
+-  return z;
++  return sv_exp_core (pg, x, xtail, sign_bias, &tmp, &sbits, &ki, d);
+ }
+ 
+ static inline double
+@@ -341,47 +384,39 @@ pow_sc (double x, double y)
+ 
+ svfloat64_t SV_NAME_D2 (pow) (svfloat64_t x, svfloat64_t y, const svbool_t pg)
+ {
++  const struct data *d = ptr_barrier (&data);
++
+   /* This preamble handles special case conditions used in the final scalar
+      fallbacks. It also updates ix and sign_bias, that are used in the core
+      computation too, i.e., exp( y * log (x) ).  */
+   svuint64_t vix0 = svreinterpret_u64 (x);
+   svuint64_t viy0 = svreinterpret_u64 (y);
+-  svuint64_t vtopx0 = svlsr_x (svptrue_b64 (), vix0, 52);
+ 
+   /* Negative x cases.  */
+-  svuint64_t sign_bit = svlsr_m (pg, vix0, 63);
+-  svbool_t xisneg = svcmpeq (pg, sign_bit, 1);
++  svbool_t xisneg = svcmplt (pg, x, 0);
+ 
+   /* Set sign_bias and ix depending on sign of x and nature of y.  */
+-  svbool_t yisnotint_xisneg = svpfalse_b ();
++  svbool_t yint_or_xpos = pg;
+   svuint64_t sign_bias = sv_u64 (0);
+   svuint64_t vix = vix0;
+-  svuint64_t vtopx1 = vtopx0;
+   if (__glibc_unlikely (svptest_any (pg, xisneg)))
+     {
+       /* Determine nature of y.  */
+-      yisnotint_xisneg = sv_isnotint (xisneg, y);
+-      svbool_t yisint_xisneg = sv_isint (xisneg, y);
++      yint_or_xpos = sv_isint (xisneg, y);
+       svbool_t yisodd_xisneg = sv_isodd (xisneg, y);
+       /* ix set to abs(ix) if y is integer.  */
+-      vix = svand_m (yisint_xisneg, vix0, 0x7fffffffffffffff);
+-      vtopx1 = svand_m (yisint_xisneg, vtopx0, 0x7ff);
++      vix = svand_m (yint_or_xpos, vix0, 0x7fffffffffffffff);
+       /* Set to SignBias if x is negative and y is odd.  */
+       sign_bias = svsel (yisodd_xisneg, sv_u64 (SignBias), sv_u64 (0));
+     }
+ 
+-  /* Special cases of x or y: zero, inf and nan.  */
+-  svbool_t xspecial = sv_zeroinfnan (pg, vix0);
+-  svbool_t yspecial = sv_zeroinfnan (pg, viy0);
+-  svbool_t special = svorr_z (pg, xspecial, yspecial);
+-
+   /* Small cases of x: |x| < 0x1p-126.  */
+-  svuint64_t vabstopx0 = svand_x (pg, vtopx0, 0x7ff);
+-  svbool_t xsmall = svcmplt (pg, vabstopx0, SmallPowX);
+-  if (__glibc_unlikely (svptest_any (pg, xsmall)))
++  svbool_t xsmall = svaclt (yint_or_xpos, x, SmallBoundX);
++  if (__glibc_unlikely (svptest_any (yint_or_xpos, xsmall)))
+     {
+       /* Normalize subnormal x so exponent becomes negative.  */
+-      svbool_t topx_is_null = svcmpeq (xsmall, vtopx1, 0);
++      svuint64_t vtopx = svlsr_x (svptrue_b64 (), vix, 52);
++      svbool_t topx_is_null = svcmpeq (xsmall, vtopx, 0);
+ 
+       svuint64_t vix_norm = svreinterpret_u64 (svmul_m (xsmall, x, 0x1p52));
+       vix_norm = svand_m (xsmall, vix_norm, 0x7fffffffffffffff);
+@@ -391,20 +426,24 @@ svfloat64_t SV_NAME_D2 (pow) (svfloat64_t x, svfloat64_t y, const svbool_t pg)
+ 
+   /* y_hi = log(ix, &y_lo).  */
+   svfloat64_t vlo;
+-  svfloat64_t vhi = sv_log_inline (pg, vix, &vlo);
++  svfloat64_t vhi = sv_log_inline (yint_or_xpos, vix, &vlo, d);
+ 
+   /* z = exp(y_hi, y_lo, sign_bias).  */
+-  svfloat64_t vehi = svmul_x (pg, y, vhi);
+-  svfloat64_t velo = svmul_x (pg, y, vlo);
+-  svfloat64_t vemi = svmls_x (pg, vehi, y, vhi);
+-  velo = svsub_x (pg, velo, vemi);
+-  svfloat64_t vz = sv_exp_inline (pg, vehi, velo, sign_bias);
++  svfloat64_t vehi = svmul_x (svptrue_b64 (), y, vhi);
++  svfloat64_t vemi = svmls_x (yint_or_xpos, vehi, y, vhi);
++  svfloat64_t velo = svnmls_x (yint_or_xpos, vemi, y, vlo);
++  svfloat64_t vz = sv_exp_inline (yint_or_xpos, vehi, velo, sign_bias, d);
+ 
+   /* Cases of finite y and finite negative x.  */
+-  vz = svsel (yisnotint_xisneg, sv_f64 (__builtin_nan ("")), vz);
++  vz = svsel (yint_or_xpos, vz, sv_f64 (__builtin_nan ("")));
++
++  /* Special cases of x or y: zero, inf and nan.  */
++  svbool_t xspecial = sv_zeroinfnan (svptrue_b64 (), vix0);
++  svbool_t yspecial = sv_zeroinfnan (svptrue_b64 (), viy0);
++  svbool_t special = svorr_z (svptrue_b64 (), xspecial, yspecial);
+ 
+   /* Cases of zero/inf/nan x or y.  */
+-  if (__glibc_unlikely (svptest_any (pg, special)))
++  if (__glibc_unlikely (svptest_any (svptrue_b64 (), special)))
+     vz = sv_call2_f64 (pow_sc, x, y, vz, special);
+ 
+   return vz;
+
+commit 06fd8ad78f35a6cc65dc7c6c08ce55faf6ad079d
+Author: Yat Long Poon <yatlong.poon@arm.com>
+Date:   Thu Feb 13 18:03:04 2025 +0000
+
+    AArch64: Improve codegen for SVE powf
+    
+    Improve memory access with indexed/unpredicated instructions.
+    Eliminate register spills.  Speedup on Neoverse V1: 3%.
+    
+    Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+    (cherry picked from commit 95e807209b680257a9afe81a507754f1565dbb4d)
+
+diff --git a/sysdeps/aarch64/fpu/powf_sve.c b/sysdeps/aarch64/fpu/powf_sve.c
+index 4f6a142325..08d7019a18 100644
+--- a/sysdeps/aarch64/fpu/powf_sve.c
++++ b/sysdeps/aarch64/fpu/powf_sve.c
+@@ -26,7 +26,6 @@
+ #define Tlogc __v_powf_data.logc
+ #define Texp __v_powf_data.scale
+ #define SignBias (1 << (V_POWF_EXP2_TABLE_BITS + 11))
+-#define Shift 0x1.8p52
+ #define Norm 0x1p23f /* 0x4b000000.  */
+ 
+ /* Overall ULP error bound for pow is 2.6 ulp
+@@ -36,7 +35,7 @@ static const struct data
+   double log_poly[4];
+   double exp_poly[3];
+   float uflow_bound, oflow_bound, small_bound;
+-  uint32_t sign_bias, sign_mask, subnormal_bias, off;
++  uint32_t sign_bias, subnormal_bias, off;
+ } data = {
+   /* rel err: 1.5 * 2^-30. Each coefficients is multiplied the value of
+      V_POWF_EXP2_N.  */
+@@ -53,7 +52,6 @@ static const struct data
+   .small_bound = 0x1p-126f,
+   .off = 0x3f35d000,
+   .sign_bias = SignBias,
+-  .sign_mask = 0x80000000,
+   .subnormal_bias = 0x0b800000, /* 23 << 23.  */
+ };
+ 
+@@ -86,7 +84,7 @@ svisodd (svbool_t pg, svfloat32_t x)
+ static inline svbool_t
+ sv_zeroinfnan (svbool_t pg, svuint32_t i)
+ {
+-  return svcmpge (pg, svsub_x (pg, svmul_x (pg, i, 2u), 1),
++  return svcmpge (pg, svsub_x (pg, svadd_x (pg, i, i), 1),
+ 		  2u * 0x7f800000 - 1);
+ }
+ 
+@@ -150,9 +148,14 @@ powf_specialcase (float x, float y, float z)
+ }
+ 
+ /* Scalar fallback for special case routines with custom signature.  */
+-static inline svfloat32_t
+-sv_call_powf_sc (svfloat32_t x1, svfloat32_t x2, svfloat32_t y, svbool_t cmp)
++static svfloat32_t NOINLINE
++sv_call_powf_sc (svfloat32_t x1, svfloat32_t x2, svfloat32_t y)
+ {
++  /* Special cases of x or y: zero, inf and nan.  */
++  svbool_t xspecial = sv_zeroinfnan (svptrue_b32 (), svreinterpret_u32 (x1));
++  svbool_t yspecial = sv_zeroinfnan (svptrue_b32 (), svreinterpret_u32 (x2));
++  svbool_t cmp = svorr_z (svptrue_b32 (), xspecial, yspecial);
++
+   svbool_t p = svpfirst (cmp, svpfalse ());
+   while (svptest_any (cmp, p))
+     {
+@@ -182,30 +185,30 @@ sv_powf_core_ext (const svbool_t pg, svuint64_t i, svfloat64_t z, svint64_t k,
+ 
+   /* Polynomial to approximate log1p(r)/ln2.  */
+   svfloat64_t logx = A (0);
+-  logx = svmla_x (pg, A (1), r, logx);
+-  logx = svmla_x (pg, A (2), r, logx);
+-  logx = svmla_x (pg, A (3), r, logx);
+-  logx = svmla_x (pg, y0, r, logx);
++  logx = svmad_x (pg, r, logx, A (1));
++  logx = svmad_x (pg, r, logx, A (2));
++  logx = svmad_x (pg, r, logx, A (3));
++  logx = svmad_x (pg, r, logx, y0);
+   *pylogx = svmul_x (pg, y, logx);
+ 
+   /* z - kd is in [-1, 1] in non-nearest rounding modes.  */
+-  svfloat64_t kd = svadd_x (pg, *pylogx, Shift);
+-  svuint64_t ki = svreinterpret_u64 (kd);
+-  kd = svsub_x (pg, kd, Shift);
++  svfloat64_t kd = svrinta_x (svptrue_b64 (), *pylogx);
++  svuint64_t ki = svreinterpret_u64 (svcvt_s64_x (svptrue_b64 (), kd));
+ 
+   r = svsub_x (pg, *pylogx, kd);
+ 
+   /* exp2(x) = 2^(k/N) * 2^r ~= s * (C0*r^3 + C1*r^2 + C2*r + 1).  */
+-  svuint64_t t
+-      = svld1_gather_index (pg, Texp, svand_x (pg, ki, V_POWF_EXP2_N - 1));
+-  svuint64_t ski = svadd_x (pg, ki, sign_bias);
+-  t = svadd_x (pg, t, svlsl_x (pg, ski, 52 - V_POWF_EXP2_TABLE_BITS));
++  svuint64_t t = svld1_gather_index (
++      svptrue_b64 (), Texp, svand_x (svptrue_b64 (), ki, V_POWF_EXP2_N - 1));
++  svuint64_t ski = svadd_x (svptrue_b64 (), ki, sign_bias);
++  t = svadd_x (svptrue_b64 (), t,
++	       svlsl_x (svptrue_b64 (), ski, 52 - V_POWF_EXP2_TABLE_BITS));
+   svfloat64_t s = svreinterpret_f64 (t);
+ 
+   svfloat64_t p = C (0);
+   p = svmla_x (pg, C (1), p, r);
+   p = svmla_x (pg, C (2), p, r);
+-  p = svmla_x (pg, s, p, svmul_x (pg, s, r));
++  p = svmla_x (pg, s, p, svmul_x (svptrue_b64 (), s, r));
+ 
+   return p;
+ }
+@@ -219,19 +222,16 @@ sv_powf_core (const svbool_t pg, svuint32_t i, svuint32_t iz, svint32_t k,
+ {
+   const svbool_t ptrue = svptrue_b64 ();
+ 
+-  /* Unpack and promote input vectors (pg, y, z, i, k and sign_bias) into two in
+-     order to perform core computation in double precision.  */
++  /* Unpack and promote input vectors (pg, y, z, i, k and sign_bias) into two
++   * in order to perform core computation in double precision.  */
+   const svbool_t pg_lo = svunpklo (pg);
+   const svbool_t pg_hi = svunpkhi (pg);
+-  svfloat64_t y_lo = svcvt_f64_x (
+-      ptrue, svreinterpret_f32 (svunpklo (svreinterpret_u32 (y))));
+-  svfloat64_t y_hi = svcvt_f64_x (
+-      ptrue, svreinterpret_f32 (svunpkhi (svreinterpret_u32 (y))));
+-  svfloat32_t z = svreinterpret_f32 (iz);
+-  svfloat64_t z_lo = svcvt_f64_x (
+-      ptrue, svreinterpret_f32 (svunpklo (svreinterpret_u32 (z))));
+-  svfloat64_t z_hi = svcvt_f64_x (
+-      ptrue, svreinterpret_f32 (svunpkhi (svreinterpret_u32 (z))));
++  svfloat64_t y_lo
++      = svcvt_f64_x (pg, svreinterpret_f32 (svunpklo (svreinterpret_u32 (y))));
++  svfloat64_t y_hi
++      = svcvt_f64_x (pg, svreinterpret_f32 (svunpkhi (svreinterpret_u32 (y))));
++  svfloat64_t z_lo = svcvt_f64_x (pg, svreinterpret_f32 (svunpklo (iz)));
++  svfloat64_t z_hi = svcvt_f64_x (pg, svreinterpret_f32 (svunpkhi (iz)));
+   svuint64_t i_lo = svunpklo (i);
+   svuint64_t i_hi = svunpkhi (i);
+   svint64_t k_lo = svunpklo (k);
+@@ -258,9 +258,9 @@ sv_powf_core (const svbool_t pg, svuint32_t i, svuint32_t iz, svint32_t k,
+ /* Implementation of SVE powf.
+    Provides the same accuracy as AdvSIMD powf, since it relies on the same
+    algorithm. The theoretical maximum error is under 2.60 ULPs.
+-   Maximum measured error is 2.56 ULPs:
+-   SV_NAME_F2 (pow) (0x1.004118p+0, 0x1.5d14a4p+16) got 0x1.fd4bp+127
+-						   want 0x1.fd4b06p+127.  */
++   Maximum measured error is 2.57 ULPs:
++   SV_NAME_F2 (pow) (0x1.031706p+0, 0x1.ce2ec2p+12) got 0x1.fff868p+127
++						   want 0x1.fff862p+127.  */
+ svfloat32_t SV_NAME_F2 (pow) (svfloat32_t x, svfloat32_t y, const svbool_t pg)
+ {
+   const struct data *d = ptr_barrier (&data);
+@@ -269,21 +269,19 @@ svfloat32_t SV_NAME_F2 (pow) (svfloat32_t x, svfloat32_t y, const svbool_t pg)
+   svuint32_t viy0 = svreinterpret_u32 (y);
+ 
+   /* Negative x cases.  */
+-  svuint32_t sign_bit = svand_m (pg, vix0, d->sign_mask);
+-  svbool_t xisneg = svcmpeq (pg, sign_bit, d->sign_mask);
++  svbool_t xisneg = svcmplt (pg, x, sv_f32 (0));
+ 
+   /* Set sign_bias and ix depending on sign of x and nature of y.  */
+-  svbool_t yisnotint_xisneg = svpfalse_b ();
++  svbool_t yint_or_xpos = pg;
+   svuint32_t sign_bias = sv_u32 (0);
+   svuint32_t vix = vix0;
+   if (__glibc_unlikely (svptest_any (pg, xisneg)))
+     {
+       /* Determine nature of y.  */
+-      yisnotint_xisneg = svisnotint (xisneg, y);
+-      svbool_t yisint_xisneg = svisint (xisneg, y);
++      yint_or_xpos = svisint (xisneg, y);
+       svbool_t yisodd_xisneg = svisodd (xisneg, y);
+       /* ix set to abs(ix) if y is integer.  */
+-      vix = svand_m (yisint_xisneg, vix0, 0x7fffffff);
++      vix = svand_m (yint_or_xpos, vix0, 0x7fffffff);
+       /* Set to SignBias if x is negative and y is odd.  */
+       sign_bias = svsel (yisodd_xisneg, sv_u32 (d->sign_bias), sv_u32 (0));
+     }
+@@ -294,8 +292,8 @@ svfloat32_t SV_NAME_F2 (pow) (svfloat32_t x, svfloat32_t y, const svbool_t pg)
+   svbool_t cmp = svorr_z (pg, xspecial, yspecial);
+ 
+   /* Small cases of x: |x| < 0x1p-126.  */
+-  svbool_t xsmall = svaclt (pg, x, d->small_bound);
+-  if (__glibc_unlikely (svptest_any (pg, xsmall)))
++  svbool_t xsmall = svaclt (yint_or_xpos, x, d->small_bound);
++  if (__glibc_unlikely (svptest_any (yint_or_xpos, xsmall)))
+     {
+       /* Normalize subnormal x so exponent becomes negative.  */
+       svuint32_t vix_norm = svreinterpret_u32 (svmul_x (xsmall, x, Norm));
+@@ -304,32 +302,35 @@ svfloat32_t SV_NAME_F2 (pow) (svfloat32_t x, svfloat32_t y, const svbool_t pg)
+       vix = svsel (xsmall, vix_norm, vix);
+     }
+   /* Part of core computation carried in working precision.  */
+-  svuint32_t tmp = svsub_x (pg, vix, d->off);
+-  svuint32_t i = svand_x (pg, svlsr_x (pg, tmp, (23 - V_POWF_LOG2_TABLE_BITS)),
+-			  V_POWF_LOG2_N - 1);
+-  svuint32_t top = svand_x (pg, tmp, 0xff800000);
+-  svuint32_t iz = svsub_x (pg, vix, top);
+-  svint32_t k
+-      = svasr_x (pg, svreinterpret_s32 (top), (23 - V_POWF_EXP2_TABLE_BITS));
+-
+-  /* Compute core in extended precision and return intermediate ylogx results to
+-      handle cases of underflow and underflow in exp.  */
++  svuint32_t tmp = svsub_x (yint_or_xpos, vix, d->off);
++  svuint32_t i = svand_x (
++      yint_or_xpos, svlsr_x (yint_or_xpos, tmp, (23 - V_POWF_LOG2_TABLE_BITS)),
++      V_POWF_LOG2_N - 1);
++  svuint32_t top = svand_x (yint_or_xpos, tmp, 0xff800000);
++  svuint32_t iz = svsub_x (yint_or_xpos, vix, top);
++  svint32_t k = svasr_x (yint_or_xpos, svreinterpret_s32 (top),
++			 (23 - V_POWF_EXP2_TABLE_BITS));
++
++  /* Compute core in extended precision and return intermediate ylogx results
++   * to handle cases of underflow and underflow in exp.  */
+   svfloat32_t ylogx;
+-  svfloat32_t ret = sv_powf_core (pg, i, iz, k, y, sign_bias, &ylogx, d);
++  svfloat32_t ret
++      = sv_powf_core (yint_or_xpos, i, iz, k, y, sign_bias, &ylogx, d);
+ 
+   /* Handle exp special cases of underflow and overflow.  */
+-  svuint32_t sign = svlsl_x (pg, sign_bias, 20 - V_POWF_EXP2_TABLE_BITS);
++  svuint32_t sign
++      = svlsl_x (yint_or_xpos, sign_bias, 20 - V_POWF_EXP2_TABLE_BITS);
+   svfloat32_t ret_oflow
+-      = svreinterpret_f32 (svorr_x (pg, sign, asuint (INFINITY)));
++      = svreinterpret_f32 (svorr_x (yint_or_xpos, sign, asuint (INFINITY)));
+   svfloat32_t ret_uflow = svreinterpret_f32 (sign);
+-  ret = svsel (svcmple (pg, ylogx, d->uflow_bound), ret_uflow, ret);
+-  ret = svsel (svcmpgt (pg, ylogx, d->oflow_bound), ret_oflow, ret);
++  ret = svsel (svcmple (yint_or_xpos, ylogx, d->uflow_bound), ret_uflow, ret);
++  ret = svsel (svcmpgt (yint_or_xpos, ylogx, d->oflow_bound), ret_oflow, ret);
+ 
+   /* Cases of finite y and finite negative x.  */
+-  ret = svsel (yisnotint_xisneg, sv_f32 (__builtin_nanf ("")), ret);
++  ret = svsel (yint_or_xpos, ret, sv_f32 (__builtin_nanf ("")));
+ 
+-  if (__glibc_unlikely (svptest_any (pg, cmp)))
+-    return sv_call_powf_sc (x, y, ret, cmp);
++  if (__glibc_unlikely (svptest_any (cmp, cmp)))
++    return sv_call_powf_sc (x, y, ret);
+ 
+   return ret;
+ }
+
+commit fd9a3a36fdcf14d1678c469e8b9033a46aa6c6fb
+Author: Wilco Dijkstra <wilco.dijkstra@arm.com>
+Date:   Thu Feb 27 20:34:34 2025 +0000
+
+    Revert "AArch64: Add vector logp1 alias for log1p"
+    
+    This reverts commit a991a0fc7c051d7ef2ea7778e0a699f22d4e53d7.
+
+diff --git a/bits/libm-simd-decl-stubs.h b/bits/libm-simd-decl-stubs.h
+index 5019e8e25c..08a41c46ad 100644
+--- a/bits/libm-simd-decl-stubs.h
++++ b/bits/libm-simd-decl-stubs.h
+@@ -253,17 +253,6 @@
+ #define __DECL_SIMD_log1pf64x
+ #define __DECL_SIMD_log1pf128x
+ 
+-#define __DECL_SIMD_logp1
+-#define __DECL_SIMD_logp1f
+-#define __DECL_SIMD_logp1l
+-#define __DECL_SIMD_logp1f16
+-#define __DECL_SIMD_logp1f32
+-#define __DECL_SIMD_logp1f64
+-#define __DECL_SIMD_logp1f128
+-#define __DECL_SIMD_logp1f32x
+-#define __DECL_SIMD_logp1f64x
+-#define __DECL_SIMD_logp1f128x
+-
+ #define __DECL_SIMD_atanh
+ #define __DECL_SIMD_atanhf
+ #define __DECL_SIMD_atanhl
+diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h
+index 92856becc4..6cb594b6ff 100644
+--- a/math/bits/mathcalls.h
++++ b/math/bits/mathcalls.h
+@@ -126,7 +126,7 @@ __MATHCALL (log2p1,, (_Mdouble_ __x));
+ __MATHCALL (log10p1,, (_Mdouble_ __x));
+ 
+ /* Return log(1 + X).  */
+-__MATHCALL_VEC (logp1,, (_Mdouble_ __x));
++__MATHCALL (logp1,, (_Mdouble_ __x));
+ #endif
+ 
+ #if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
+diff --git a/sysdeps/aarch64/fpu/Versions b/sysdeps/aarch64/fpu/Versions
+index 015211f5f4..cc15ce2d1e 100644
+--- a/sysdeps/aarch64/fpu/Versions
++++ b/sysdeps/aarch64/fpu/Versions
+@@ -135,11 +135,4 @@ libmvec {
+     _ZGVsMxv_tanh;
+     _ZGVsMxv_tanhf;
+   }
+-  GLIBC_2.41 {
+-    _ZGVnN2v_logp1;
+-    _ZGVnN2v_logp1f;
+-    _ZGVnN4v_logp1f;
+-    _ZGVsMxv_logp1;
+-    _ZGVsMxv_logp1f;
+-  }
+ }
+diff --git a/sysdeps/aarch64/fpu/advsimd_f32_protos.h b/sysdeps/aarch64/fpu/advsimd_f32_protos.h
+index 5909bb4ce9..097d403ffe 100644
+--- a/sysdeps/aarch64/fpu/advsimd_f32_protos.h
++++ b/sysdeps/aarch64/fpu/advsimd_f32_protos.h
+@@ -36,7 +36,6 @@ libmvec_hidden_proto (V_NAME_F2(hypot));
+ libmvec_hidden_proto (V_NAME_F1(log10));
+ libmvec_hidden_proto (V_NAME_F1(log1p));
+ libmvec_hidden_proto (V_NAME_F1(log2));
+-libmvec_hidden_proto (V_NAME_F1(logp1));
+ libmvec_hidden_proto (V_NAME_F1(log));
+ libmvec_hidden_proto (V_NAME_F2(pow));
+ libmvec_hidden_proto (V_NAME_F1(sin));
+diff --git a/sysdeps/aarch64/fpu/bits/math-vector.h b/sysdeps/aarch64/fpu/bits/math-vector.h
+index f295fe185d..7484150131 100644
+--- a/sysdeps/aarch64/fpu/bits/math-vector.h
++++ b/sysdeps/aarch64/fpu/bits/math-vector.h
+@@ -113,10 +113,6 @@
+ # define __DECL_SIMD_log2 __DECL_SIMD_aarch64
+ # undef __DECL_SIMD_log2f
+ # define __DECL_SIMD_log2f __DECL_SIMD_aarch64
+-# undef __DECL_SIMD_logp1
+-# define __DECL_SIMD_logp1 __DECL_SIMD_aarch64
+-# undef __DECL_SIMD_logp1f
+-# define __DECL_SIMD_logp1f __DECL_SIMD_aarch64
+ # undef __DECL_SIMD_pow
+ # define __DECL_SIMD_pow __DECL_SIMD_aarch64
+ # undef __DECL_SIMD_powf
+@@ -184,7 +180,6 @@ __vpcs __f32x4_t _ZGVnN4v_logf (__f32x4_t);
+ __vpcs __f32x4_t _ZGVnN4v_log10f (__f32x4_t);
+ __vpcs __f32x4_t _ZGVnN4v_log1pf (__f32x4_t);
+ __vpcs __f32x4_t _ZGVnN4v_log2f (__f32x4_t);
+-__vpcs __f32x4_t _ZGVnN4v_logp1f (__f32x4_t);
+ __vpcs __f32x4_t _ZGVnN4vv_powf (__f32x4_t, __f32x4_t);
+ __vpcs __f32x4_t _ZGVnN4v_sinf (__f32x4_t);
+ __vpcs __f32x4_t _ZGVnN4v_sinhf (__f32x4_t);
+@@ -212,7 +207,6 @@ __vpcs __f64x2_t _ZGVnN2v_log (__f64x2_t);
+ __vpcs __f64x2_t _ZGVnN2v_log10 (__f64x2_t);
+ __vpcs __f64x2_t _ZGVnN2v_log1p (__f64x2_t);
+ __vpcs __f64x2_t _ZGVnN2v_log2 (__f64x2_t);
+-__vpcs __f64x2_t _ZGVnN2v_logp1 (__f64x2_t);
+ __vpcs __f64x2_t _ZGVnN2vv_pow (__f64x2_t, __f64x2_t);
+ __vpcs __f64x2_t _ZGVnN2v_sin (__f64x2_t);
+ __vpcs __f64x2_t _ZGVnN2v_sinh (__f64x2_t);
+@@ -245,7 +239,6 @@ __sv_f32_t _ZGVsMxv_logf (__sv_f32_t, __sv_bool_t);
+ __sv_f32_t _ZGVsMxv_log10f (__sv_f32_t, __sv_bool_t);
+ __sv_f32_t _ZGVsMxv_log1pf (__sv_f32_t, __sv_bool_t);
+ __sv_f32_t _ZGVsMxv_log2f (__sv_f32_t, __sv_bool_t);
+-__sv_f32_t _ZGVsMxv_logp1f (__sv_f32_t, __sv_bool_t);
+ __sv_f32_t _ZGVsMxvv_powf (__sv_f32_t, __sv_f32_t, __sv_bool_t);
+ __sv_f32_t _ZGVsMxv_sinf (__sv_f32_t, __sv_bool_t);
+ __sv_f32_t _ZGVsMxv_sinhf (__sv_f32_t, __sv_bool_t);
+@@ -273,7 +266,6 @@ __sv_f64_t _ZGVsMxv_log (__sv_f64_t, __sv_bool_t);
+ __sv_f64_t _ZGVsMxv_log10 (__sv_f64_t, __sv_bool_t);
+ __sv_f64_t _ZGVsMxv_log1p (__sv_f64_t, __sv_bool_t);
+ __sv_f64_t _ZGVsMxv_log2 (__sv_f64_t, __sv_bool_t);
+-__sv_f64_t _ZGVsMxv_logp1 (__sv_f64_t, __sv_bool_t);
+ __sv_f64_t _ZGVsMxvv_pow (__sv_f64_t, __sv_f64_t, __sv_bool_t);
+ __sv_f64_t _ZGVsMxv_sin (__sv_f64_t, __sv_bool_t);
+ __sv_f64_t _ZGVsMxv_sinh (__sv_f64_t, __sv_bool_t);
+diff --git a/sysdeps/aarch64/fpu/log1p_advsimd.c b/sysdeps/aarch64/fpu/log1p_advsimd.c
+index 1263587201..9d18578ce6 100644
+--- a/sysdeps/aarch64/fpu/log1p_advsimd.c
++++ b/sysdeps/aarch64/fpu/log1p_advsimd.c
+@@ -58,5 +58,3 @@ VPCS_ATTR float64x2_t V_NAME_D1 (log1p) (float64x2_t x)
+ 
+   return log1p_inline (x, &d->d);
+ }
+-
+-strong_alias (V_NAME_D1 (log1p), V_NAME_D1 (logp1))
+diff --git a/sysdeps/aarch64/fpu/log1p_sve.c b/sysdeps/aarch64/fpu/log1p_sve.c
+index b21cfb2c90..04f7e5720e 100644
+--- a/sysdeps/aarch64/fpu/log1p_sve.c
++++ b/sysdeps/aarch64/fpu/log1p_sve.c
+@@ -116,5 +116,3 @@ svfloat64_t SV_NAME_D1 (log1p) (svfloat64_t x, svbool_t pg)
+ 
+   return y;
+ }
+-
+-strong_alias (SV_NAME_D1 (log1p), SV_NAME_D1 (logp1))
+diff --git a/sysdeps/aarch64/fpu/log1pf_advsimd.c b/sysdeps/aarch64/fpu/log1pf_advsimd.c
+index 00006fc703..f2d47962fe 100644
+--- a/sysdeps/aarch64/fpu/log1pf_advsimd.c
++++ b/sysdeps/aarch64/fpu/log1pf_advsimd.c
+@@ -93,6 +93,3 @@ VPCS_ATTR float32x4_t V_NAME_F1 (log1p) (float32x4_t x)
+ 
+ libmvec_hidden_def (V_NAME_F1 (log1p))
+ HALF_WIDTH_ALIAS_F1 (log1p)
+-strong_alias (V_NAME_F1 (log1p), V_NAME_F1 (logp1))
+-libmvec_hidden_def (V_NAME_F1 (logp1))
+-HALF_WIDTH_ALIAS_F1 (logp1)
+diff --git a/sysdeps/aarch64/fpu/log1pf_sve.c b/sysdeps/aarch64/fpu/log1pf_sve.c
+index 18a185c838..4f17c44e2d 100644
+--- a/sysdeps/aarch64/fpu/log1pf_sve.c
++++ b/sysdeps/aarch64/fpu/log1pf_sve.c
+@@ -42,5 +42,3 @@ svfloat32_t SV_NAME_F1 (log1p) (svfloat32_t x, svbool_t pg)
+ 
+   return sv_log1pf_inline (x, pg);
+ }
+-
+-strong_alias (SV_NAME_F1 (log1p), SV_NAME_F1 (logp1))
+diff --git a/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist b/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist
+index 98687cae0d..b685106954 100644
+--- a/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist
++++ b/sysdeps/unix/sysv/linux/aarch64/libmvec.abilist
+@@ -128,8 +128,3 @@ GLIBC_2.40 _ZGVsMxvv_hypot F
+ GLIBC_2.40 _ZGVsMxvv_hypotf F
+ GLIBC_2.40 _ZGVsMxvv_pow F
+ GLIBC_2.40 _ZGVsMxvv_powf F
+-GLIBC_2.41 _ZGVnN2v_logp1 F
+-GLIBC_2.41 _ZGVnN2v_logp1f F
+-GLIBC_2.41 _ZGVnN4v_logp1f F
+-GLIBC_2.41 _ZGVsMxv_logp1 F
+-GLIBC_2.41 _ZGVsMxv_logp1f F
+
+commit 64896b7d329809127035fde42768a6f7eeffed75
+Author: Wilco Dijkstra <wilco.dijkstra@arm.com>
+Date:   Wed Aug 7 14:43:47 2024 +0100
+
+    AArch64: Improve generic strlen
+    
+    Improve performance by handling another 16 bytes before entering the loop.
+    Use ADDHN in the loop to avoid SHRN+FMOV when it terminates.  Change final
+    size computation to avoid increasing latency.  On Neoverse V1 performance
+    of the random strlen benchmark improves by 4.6%.
+    
+    Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+    (cherry picked from commit 3dc426b642dcafdbc11a99f2767e081d086f5fc7)
+
+diff --git a/sysdeps/aarch64/strlen.S b/sysdeps/aarch64/strlen.S
+index ab2a576cdb..352fb40d3a 100644
+--- a/sysdeps/aarch64/strlen.S
++++ b/sysdeps/aarch64/strlen.S
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 2012-2024 Free Software Foundation, Inc.
++/* Generic optimized strlen using SIMD.
++   Copyright (C) 2012-2024 Free Software Foundation, Inc.
+ 
+    This file is part of the GNU C Library.
+ 
+@@ -56,36 +57,50 @@ ENTRY (STRLEN)
+ 	shrn	vend.8b, vhas_nul.8h, 4		/* 128->64 */
+ 	fmov	synd, dend
+ 	lsr	synd, synd, shift
+-	cbz	synd, L(loop)
++	cbz	synd, L(next16)
+ 
+ 	rbit	synd, synd
+ 	clz	result, synd
+ 	lsr	result, result, 2
+ 	ret
+ 
++L(next16):
++	ldr	data, [src, 16]
++	cmeq	vhas_nul.16b, vdata.16b, 0
++	shrn	vend.8b, vhas_nul.8h, 4		/* 128->64 */
++	fmov	synd, dend
++	cbz	synd, L(loop)
++	add	src, src, 16
++#ifndef __AARCH64EB__
++	rbit	synd, synd
++#endif
++	sub	result, src, srcin
++	clz	tmp, synd
++	add	result, result, tmp, lsr 2
++	ret
++
+ 	.p2align 5
+ L(loop):
+-	ldr	data, [src, 16]
++	ldr	data, [src, 32]!
+ 	cmeq	vhas_nul.16b, vdata.16b, 0
+-	umaxp	vend.16b, vhas_nul.16b, vhas_nul.16b
++	addhn	vend.8b, vhas_nul.8h, vhas_nul.8h
+ 	fmov	synd, dend
+ 	cbnz	synd, L(loop_end)
+-	ldr	data, [src, 32]!
++	ldr	data, [src, 16]
+ 	cmeq	vhas_nul.16b, vdata.16b, 0
+-	umaxp	vend.16b, vhas_nul.16b, vhas_nul.16b
++	addhn	vend.8b, vhas_nul.8h, vhas_nul.8h
+ 	fmov	synd, dend
+ 	cbz	synd, L(loop)
+-	sub	src, src, 16
++	add	src, src, 16
+ L(loop_end):
+-	shrn	vend.8b, vhas_nul.8h, 4		/* 128->64 */
+-	sub	result, src, srcin
+-	fmov	synd, dend
++	sub	result, shift, src, lsl 2	/* (srcin - src) << 2.  */
+ #ifndef __AARCH64EB__
+ 	rbit	synd, synd
++	sub	result, result, 3
+ #endif
+-	add	result, result, 16
+ 	clz	tmp, synd
+-	add	result, result, tmp, lsr 2
++	sub	result, tmp, result
++	lsr	result, result, 2
+ 	ret
+ 
+ END (STRLEN)
+
+commit 544fb349d35efd5f86ed7e482759ff21496a32fd
+Author: Wilco Dijkstra <wilco.dijkstra@arm.com>
+Date:   Mon Sep 9 15:26:47 2024 +0100
+
+    AArch64: Optimize memset
+    
+    Improve small memsets by avoiding branches and use overlapping stores.
+    Use DC ZVA for copies over 128 bytes.  Remove unnecessary code for ZVA sizes
+    other than 64 and 128.  Performance of random memset benchmark improves by 24%
+    on Neoverse N1.
+    
+    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+    (cherry picked from commit cec3aef32412779e207f825db0d057ebb4628ae8)
+
+diff --git a/sysdeps/aarch64/memset.S b/sysdeps/aarch64/memset.S
+index 7ef77ee8c9..caafb019e2 100644
+--- a/sysdeps/aarch64/memset.S
++++ b/sysdeps/aarch64/memset.S
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 2012-2024 Free Software Foundation, Inc.
++/* Generic optimized memset using SIMD.
++   Copyright (C) 2012-2024 Free Software Foundation, Inc.
+ 
+    This file is part of the GNU C Library.
+ 
+@@ -17,7 +18,6 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include <sysdep.h>
+-#include "memset-reg.h"
+ 
+ #ifndef MEMSET
+ # define MEMSET memset
+@@ -25,130 +25,132 @@
+ 
+ /* Assumptions:
+  *
+- * ARMv8-a, AArch64, unaligned accesses
++ * ARMv8-a, AArch64, Advanced SIMD, unaligned accesses.
+  *
+  */
+ 
+-ENTRY (MEMSET)
++#define dstin	x0
++#define val	x1
++#define valw	w1
++#define count	x2
++#define dst	x3
++#define dstend	x4
++#define zva_val	x5
++#define off	x3
++#define dstend2	x5
+ 
++ENTRY (MEMSET)
+ 	PTR_ARG (0)
+ 	SIZE_ARG (2)
+ 
+ 	dup	v0.16B, valw
++	cmp	count, 16
++	b.lo	L(set_small)
++
+ 	add	dstend, dstin, count
++	cmp	count, 64
++	b.hs	L(set_128)
+ 
+-	cmp	count, 96
+-	b.hi	L(set_long)
+-	cmp	count, 16
+-	b.hs	L(set_medium)
+-	mov	val, v0.D[0]
++	/* Set 16..63 bytes.  */
++	mov	off, 16
++	and	off, off, count, lsr 1
++	sub	dstend2, dstend, off
++	str	q0, [dstin]
++	str	q0, [dstin, off]
++	str	q0, [dstend2, -16]
++	str	q0, [dstend, -16]
++	ret
+ 
++	.p2align 4
+ 	/* Set 0..15 bytes.  */
+-	tbz	count, 3, 1f
+-	str	val, [dstin]
+-	str	val, [dstend, -8]
+-	ret
+-	nop
+-1:	tbz	count, 2, 2f
+-	str	valw, [dstin]
+-	str	valw, [dstend, -4]
++L(set_small):
++	add	dstend, dstin, count
++	cmp	count, 4
++	b.lo	2f
++	lsr	off, count, 3
++	sub	dstend2, dstend, off, lsl 2
++	str	s0, [dstin]
++	str	s0, [dstin, off, lsl 2]
++	str	s0, [dstend2, -4]
++	str	s0, [dstend, -4]
+ 	ret
++
++	/* Set 0..3 bytes.  */
+ 2:	cbz	count, 3f
++	lsr	off, count, 1
+ 	strb	valw, [dstin]
+-	tbz	count, 1, 3f
+-	strh	valw, [dstend, -2]
++	strb	valw, [dstin, off]
++	strb	valw, [dstend, -1]
+ 3:	ret
+ 
+-	/* Set 17..96 bytes.  */
+-L(set_medium):
+-	str	q0, [dstin]
+-	tbnz	count, 6, L(set96)
+-	str	q0, [dstend, -16]
+-	tbz	count, 5, 1f
+-	str	q0, [dstin, 16]
+-	str	q0, [dstend, -32]
+-1:	ret
+-
+ 	.p2align 4
+-	/* Set 64..96 bytes.  Write 64 bytes from the start and
+-	   32 bytes from the end.  */
+-L(set96):
+-	str	q0, [dstin, 16]
++L(set_128):
++	bic	dst, dstin, 15
++	cmp	count, 128
++	b.hi	L(set_long)
++	stp	q0, q0, [dstin]
+ 	stp	q0, q0, [dstin, 32]
++	stp	q0, q0, [dstend, -64]
+ 	stp	q0, q0, [dstend, -32]
+ 	ret
+ 
+-	.p2align 3
+-	nop
++	.p2align 4
+ L(set_long):
+-	and	valw, valw, 255
+-	bic	dst, dstin, 15
+ 	str	q0, [dstin]
+-	cmp	count, 256
+-	ccmp	valw, 0, 0, cs
+-	b.eq	L(try_zva)
+-L(no_zva):
+-	sub	count, dstend, dst	/* Count is 16 too large.  */
+-	sub	dst, dst, 16		/* Dst is biased by -32.  */
+-	sub	count, count, 64 + 16	/* Adjust count and bias for loop.  */
+-1:	stp	q0, q0, [dst, 32]
+-	stp	q0, q0, [dst, 64]!
+-L(tail64):
+-	subs	count, count, 64
+-	b.hi	1b
+-2:	stp	q0, q0, [dstend, -64]
++	str	q0, [dst, 16]
++	tst	valw, 255
++	b.ne	L(no_zva)
++#ifndef ZVA64_ONLY
++	mrs	zva_val, dczid_el0
++	and	zva_val, zva_val, 31
++	cmp	zva_val, 4		/* ZVA size is 64 bytes.  */
++	b.ne	L(zva_128)
++#endif
++	stp	q0, q0, [dst, 32]
++	bic	dst, dstin, 63
++	sub	count, dstend, dst	/* Count is now 64 too large.  */
++	sub	count, count, 64 + 64	/* Adjust count and bias for loop.  */
++
++	/* Write last bytes before ZVA loop.  */
++	stp	q0, q0, [dstend, -64]
+ 	stp	q0, q0, [dstend, -32]
++
++	.p2align 4
++L(zva64_loop):
++	add	dst, dst, 64
++	dc	zva, dst
++	subs	count, count, 64
++	b.hi	L(zva64_loop)
+ 	ret
+ 
+-L(try_zva):
+-#ifndef ZVA64_ONLY
+ 	.p2align 3
+-	mrs	tmp1, dczid_el0
+-	tbnz	tmp1w, 4, L(no_zva)
+-	and	tmp1w, tmp1w, 15
+-	cmp	tmp1w, 4	/* ZVA size is 64 bytes.  */
+-	b.ne	 L(zva_128)
+-	nop
+-#endif
+-	/* Write the first and last 64 byte aligned block using stp rather
+-	   than using DC ZVA.  This is faster on some cores.
+-	 */
+-	.p2align 4
+-L(zva_64):
+-	str	q0, [dst, 16]
++L(no_zva):
++	sub	count, dstend, dst	/* Count is 32 too large.  */
++	sub	count, count, 64 + 32	/* Adjust count and bias for loop.  */
++L(no_zva_loop):
+ 	stp	q0, q0, [dst, 32]
+-	bic	dst, dst, 63
+ 	stp	q0, q0, [dst, 64]
+-	stp	q0, q0, [dst, 96]
+-	sub	count, dstend, dst	/* Count is now 128 too large.	*/
+-	sub	count, count, 128+64+64	/* Adjust count and bias for loop.  */
+-	add	dst, dst, 128
+-1:	dc	zva, dst
+ 	add	dst, dst, 64
+ 	subs	count, count, 64
+-	b.hi	1b
+-	stp	q0, q0, [dst, 0]
+-	stp	q0, q0, [dst, 32]
++	b.hi	L(no_zva_loop)
+ 	stp	q0, q0, [dstend, -64]
+ 	stp	q0, q0, [dstend, -32]
+ 	ret
+ 
+ #ifndef ZVA64_ONLY
+-	.p2align 3
++	.p2align 4
+ L(zva_128):
+-	cmp	tmp1w, 5	/* ZVA size is 128 bytes.  */
+-	b.ne	L(zva_other)
++	cmp	zva_val, 5		/* ZVA size is 128 bytes.  */
++	b.ne	L(no_zva)
+ 
+-	str	q0, [dst, 16]
+ 	stp	q0, q0, [dst, 32]
+ 	stp	q0, q0, [dst, 64]
+ 	stp	q0, q0, [dst, 96]
+ 	bic	dst, dst, 127
+ 	sub	count, dstend, dst	/* Count is now 128 too large.	*/
+-	sub	count, count, 128+128	/* Adjust count and bias for loop.  */
+-	add	dst, dst, 128
+-1:	dc	zva, dst
+-	add	dst, dst, 128
++	sub	count, count, 128 + 128	/* Adjust count and bias for loop.  */
++1:	add	dst, dst, 128
++	dc	zva, dst
+ 	subs	count, count, 128
+ 	b.hi	1b
+ 	stp	q0, q0, [dstend, -128]
+@@ -156,35 +158,6 @@ L(zva_128):
+ 	stp	q0, q0, [dstend, -64]
+ 	stp	q0, q0, [dstend, -32]
+ 	ret
+-
+-L(zva_other):
+-	mov	tmp2w, 4
+-	lsl	zva_lenw, tmp2w, tmp1w
+-	add	tmp1, zva_len, 64	/* Max alignment bytes written.	 */
+-	cmp	count, tmp1
+-	blo	L(no_zva)
+-
+-	sub	tmp2, zva_len, 1
+-	add	tmp1, dst, zva_len
+-	add	dst, dst, 16
+-	subs	count, tmp1, dst	/* Actual alignment bytes to write.  */
+-	bic	tmp1, tmp1, tmp2	/* Aligned dc zva start address.  */
+-	beq	2f
+-1:	stp	q0, q0, [dst], 64
+-	stp	q0, q0, [dst, -32]
+-	subs	count, count, 64
+-	b.hi	1b
+-2:	mov	dst, tmp1
+-	sub	count, dstend, tmp1	/* Remaining bytes to write.  */
+-	subs	count, count, zva_len
+-	b.lo	4f
+-3:	dc	zva, dst
+-	add	dst, dst, zva_len
+-	subs	count, count, zva_len
+-	b.hs	3b
+-4:	add	count, count, zva_len
+-	sub	dst, dst, 32		/* Bias dst for tail loop.  */
+-	b	L(tail64)
+ #endif
+ 
+ END (MEMSET)
+
+commit 41eb2f8b5847079caca90a74659456adbb80ec29
+Author: Wilco Dijkstra <wilco.dijkstra@arm.com>
+Date:   Mon Nov 25 18:43:08 2024 +0000
+
+    AArch64: Remove zva_128 from memset
+    
+    Remove ZVA 128 support from memset - the new memset no longer
+    guarantees count >= 256, which can result in underflow and a
+    crash if ZVA size is 128 ([1]).  Since only one CPU uses a ZVA
+    size of 128 and its memcpy implementation was removed in commit
+    e162ab2bf1b82c40f29e1925986582fa07568ce8, remove this special
+    case too.
+    
+    [1] https://sourceware.org/pipermail/libc-alpha/2024-November/161626.html
+    
+    Reviewed-by: Andrew Pinski <quic_apinski@quicinc.com>
+    (cherry picked from commit a08d9a52f967531a77e1824c23b5368c6434a72d)
+
+diff --git a/sysdeps/aarch64/memset.S b/sysdeps/aarch64/memset.S
+index caafb019e2..71814d0b2f 100644
+--- a/sysdeps/aarch64/memset.S
++++ b/sysdeps/aarch64/memset.S
+@@ -104,7 +104,7 @@ L(set_long):
+ 	mrs	zva_val, dczid_el0
+ 	and	zva_val, zva_val, 31
+ 	cmp	zva_val, 4		/* ZVA size is 64 bytes.  */
+-	b.ne	L(zva_128)
++	b.ne	L(no_zva)
+ #endif
+ 	stp	q0, q0, [dst, 32]
+ 	bic	dst, dstin, 63
+@@ -137,28 +137,5 @@ L(no_zva_loop):
+ 	stp	q0, q0, [dstend, -32]
+ 	ret
+ 
+-#ifndef ZVA64_ONLY
+-	.p2align 4
+-L(zva_128):
+-	cmp	zva_val, 5		/* ZVA size is 128 bytes.  */
+-	b.ne	L(no_zva)
+-
+-	stp	q0, q0, [dst, 32]
+-	stp	q0, q0, [dst, 64]
+-	stp	q0, q0, [dst, 96]
+-	bic	dst, dst, 127
+-	sub	count, dstend, dst	/* Count is now 128 too large.	*/
+-	sub	count, count, 128 + 128	/* Adjust count and bias for loop.  */
+-1:	add	dst, dst, 128
+-	dc	zva, dst
+-	subs	count, count, 128
+-	b.hi	1b
+-	stp	q0, q0, [dstend, -128]
+-	stp	q0, q0, [dstend, -96]
+-	stp	q0, q0, [dstend, -64]
+-	stp	q0, q0, [dstend, -32]
+-	ret
+-#endif
+-
+ END (MEMSET)
+ libc_hidden_builtin_def (MEMSET)
+
+commit 27fa0268ead054810a5e2669d0b5bb88ceb05b05
+Author: Wilco Dijkstra <wilco.dijkstra@arm.com>
+Date:   Wed Jul 24 15:17:47 2024 +0100
+
+    math: Improve layout of expf data
+    
+    GCC aligns global data to 16 bytes if their size is >= 16 bytes.  This patch
+    changes the exp2f_data struct slightly so that the fields are better aligned.
+    As a result on targets that support them, load-pair instructions accessing
+    poly_scaled and invln2_scaled are now 16-byte aligned.
+    
+    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+    (cherry picked from commit 44fa9c1080fe6a9539f0d2345b9d2ae37b8ee57a)
+
+diff --git a/sysdeps/ieee754/flt-32/math_config.h b/sysdeps/ieee754/flt-32/math_config.h
+index 729f22cd4f..dc07ebd459 100644
+--- a/sysdeps/ieee754/flt-32/math_config.h
++++ b/sysdeps/ieee754/flt-32/math_config.h
+@@ -166,9 +166,9 @@ extern const struct exp2f_data
+   uint64_t tab[1 << EXP2F_TABLE_BITS];
+   double shift_scaled;
+   double poly[EXP2F_POLY_ORDER];
+-  double shift;
+   double invln2_scaled;
+   double poly_scaled[EXP2F_POLY_ORDER];
++  double shift;
+ } __exp2f_data attribute_hidden;
+ 
+ #define LOGF_TABLE_BITS 4
+
+commit 7038970f1f485fb660606f0c596f432fdef250f6
+Author: Wilco Dijkstra <wilco.dijkstra@arm.com>
+Date:   Tue Dec 24 18:01:59 2024 +0000
+
+    AArch64: Add SVE memset
+    
+    Add SVE memset based on the generic memset with predicated load for sizes < 16.
+    Unaligned memsets of 128-1024 are improved by ~20% on average by using aligned
+    stores for the last 64 bytes.  Performance of random memset benchmark improves
+    by ~2% on Neoverse V1.
+    
+    Reviewed-by: Yury Khrustalev <yury.khrustalev@arm.com>
+    (cherry picked from commit 163b1bbb76caba4d9673c07940c5930a1afa7548)
+
+diff --git a/sysdeps/aarch64/multiarch/Makefile b/sysdeps/aarch64/multiarch/Makefile
+index 3e251cc234..6880ebc035 100644
+--- a/sysdeps/aarch64/multiarch/Makefile
++++ b/sysdeps/aarch64/multiarch/Makefile
+@@ -16,6 +16,7 @@ sysdep_routines += \
+   memset_kunpeng \
+   memset_mops \
+   memset_oryon1 \
++  memset_sve_zva64 \
+   memset_zva64 \
+   strlen_asimd \
+   strlen_generic \
+diff --git a/sysdeps/aarch64/multiarch/ifunc-impl-list.c b/sysdeps/aarch64/multiarch/ifunc-impl-list.c
+index b2fda541f9..1f101a719b 100644
+--- a/sysdeps/aarch64/multiarch/ifunc-impl-list.c
++++ b/sysdeps/aarch64/multiarch/ifunc-impl-list.c
+@@ -61,6 +61,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
+ 	      IFUNC_IMPL_ADD (array, i, memset, 1, __memset_kunpeng)
+ #if HAVE_AARCH64_SVE_ASM
+ 	      IFUNC_IMPL_ADD (array, i, memset, sve && !bti && zva_size == 256, __memset_a64fx)
++	      IFUNC_IMPL_ADD (array, i, memset, sve && zva_size == 64, __memset_sve_zva64)
+ #endif
+ 	      IFUNC_IMPL_ADD (array, i, memset, mops, __memset_mops)
+ 	      IFUNC_IMPL_ADD (array, i, memset, 1, __memset_generic))
+diff --git a/sysdeps/aarch64/multiarch/memset.c b/sysdeps/aarch64/multiarch/memset.c
+index bd063c16c9..4f65295e77 100644
+--- a/sysdeps/aarch64/multiarch/memset.c
++++ b/sysdeps/aarch64/multiarch/memset.c
+@@ -36,6 +36,7 @@ extern __typeof (__redirect_memset) __memset_a64fx attribute_hidden;
+ extern __typeof (__redirect_memset) __memset_generic attribute_hidden;
+ extern __typeof (__redirect_memset) __memset_mops attribute_hidden;
+ extern __typeof (__redirect_memset) __memset_oryon1 attribute_hidden;
++extern __typeof (__redirect_memset) __memset_sve_zva64 attribute_hidden;
+ 
+ static inline __typeof (__redirect_memset) *
+ select_memset_ifunc (void)
+@@ -49,6 +50,9 @@ select_memset_ifunc (void)
+     {
+       if (IS_A64FX (midr) && zva_size == 256)
+ 	return __memset_a64fx;
++
++      if (zva_size == 64)
++	return __memset_sve_zva64;
+     }
+ 
+   if (IS_ORYON1 (midr) && zva_size == 64)
+diff --git a/sysdeps/aarch64/multiarch/memset_sve_zva64.S b/sysdeps/aarch64/multiarch/memset_sve_zva64.S
+new file mode 100644
+index 0000000000..7fb40fdd9e
+--- /dev/null
++++ b/sysdeps/aarch64/multiarch/memset_sve_zva64.S
+@@ -0,0 +1,123 @@
++/* Optimized memset for SVE.
++   Copyright (C) 2025 Free Software Foundation, Inc.
++
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library.  If not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <sysdep.h>
++
++/* Assumptions:
++ *
++ * ARMv8-a, AArch64, Advanced SIMD, SVE, unaligned accesses.
++ * ZVA size is 64.
++ */
++
++#if HAVE_AARCH64_SVE_ASM
++
++.arch armv8.2-a+sve
++
++#define dstin	x0
++#define val	x1
++#define valw	w1
++#define count	x2
++#define dst	x3
++#define dstend	x4
++#define zva_val	x5
++#define vlen	x5
++#define off	x3
++#define dstend2 x5
++
++ENTRY (__memset_sve_zva64)
++	dup	v0.16B, valw
++	cmp	count, 16
++	b.lo	L(set_16)
++
++	add	dstend, dstin, count
++	cmp	count, 64
++	b.hs	L(set_128)
++
++	/* Set 16..63 bytes.  */
++	mov	off, 16
++	and	off, off, count, lsr 1
++	sub	dstend2, dstend, off
++	str	q0, [dstin]
++	str	q0, [dstin, off]
++	str	q0, [dstend2, -16]
++	str	q0, [dstend, -16]
++	ret
++
++	.p2align 4
++L(set_16):
++	whilelo p0.b, xzr, count
++	st1b	z0.b, p0, [dstin]
++	ret
++
++	.p2align 4
++L(set_128):
++	bic	dst, dstin, 15
++	cmp	count, 128
++	b.hi	L(set_long)
++	stp	q0, q0, [dstin]
++	stp	q0, q0, [dstin, 32]
++	stp	q0, q0, [dstend, -64]
++	stp	q0, q0, [dstend, -32]
++	ret
++
++	.p2align 4
++L(set_long):
++	cmp	count, 256
++	b.lo	L(no_zva)
++	tst	valw, 255
++	b.ne	L(no_zva)
++
++	str	q0, [dstin]
++	str	q0, [dst, 16]
++	bic	dst, dstin, 31
++	stp	q0, q0, [dst, 32]
++	bic	dst, dstin, 63
++	sub	count, dstend, dst	/* Count is now 64 too large.  */
++	sub	count, count, 128	/* Adjust count and bias for loop.  */
++
++	sub	x8, dstend, 1		/* Write last bytes before ZVA loop.  */
++	bic	x8, x8, 15
++	stp	q0, q0, [x8, -48]
++	str	q0, [x8, -16]
++	str	q0, [dstend, -16]
++
++	.p2align 4
++L(zva64_loop):
++	add	dst, dst, 64
++	dc	zva, dst
++	subs	count, count, 64
++	b.hi	L(zva64_loop)
++	ret
++
++L(no_zva):
++	str	q0, [dstin]
++	sub	count, dstend, dst	/* Count is 16 too large.  */
++	sub	count, count, 64 + 16	/* Adjust count and bias for loop.  */
++L(no_zva_loop):
++	stp	q0, q0, [dst, 16]
++	stp	q0, q0, [dst, 48]
++	add	dst, dst, 64
++	subs	count, count, 64
++	b.hi	L(no_zva_loop)
++	stp	q0, q0, [dstend, -64]
++	stp	q0, q0, [dstend, -32]
++	ret
++
++END (__memset_sve_zva64)
++#endif
+
+commit d6175a44e95fe443d0fbfed37a9ff7424f1e2661
+Author: Wilco Dijkstra <wilco.dijkstra@arm.com>
+Date:   Thu Feb 27 16:28:52 2025 +0000
+
+    AArch64: Use prefer_sve_ifuncs for SVE memset
+    
+    Use prefer_sve_ifuncs for SVE memset just like memcpy.
+    
+    Reviewed-by: Yury Khrustalev <yury.khrustalev@arm.com>
+    (cherry picked from commit 0f044be1dae5169d0e57f8d487b427863aeadab4)
+
+diff --git a/sysdeps/aarch64/multiarch/memset.c b/sysdeps/aarch64/multiarch/memset.c
+index 4f65295e77..bb1e865c97 100644
+--- a/sysdeps/aarch64/multiarch/memset.c
++++ b/sysdeps/aarch64/multiarch/memset.c
+@@ -51,7 +51,7 @@ select_memset_ifunc (void)
+       if (IS_A64FX (midr) && zva_size == 256)
+ 	return __memset_a64fx;
+ 
+-      if (zva_size == 64)
++      if (prefer_sve_ifuncs && zva_size == 64)
+ 	return __memset_sve_zva64;
+     }
+ 
+
+commit d8e8342369831808b00324790c8809ba33408ee7
+Author: Wilco Dijkstra <wilco.dijkstra@arm.com>
+Date:   Fri Dec 13 15:43:07 2024 +0000
+
+    math: Improve layout of exp/exp10 data
+    
+    GCC aligns global data to 16 bytes if their size is >= 16 bytes.  This patch
+    changes the exp_data struct slightly so that the fields are better aligned
+    and without gaps.  As a result on targets that support them, more load-pair
+    instructions are used in exp.  Exp10 is improved by moving invlog10_2N later
+    so that neglog10_2hiN and neglog10_2loN can be loaded using load-pair.
+    
+    The exp benchmark improves 2.5%, "144bits" by 7.2%, "768bits" by 12.7% on
+    Neoverse V2.  Exp10 improves by 1.5%.
+    
+    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+    (cherry picked from commit 5afaf99edb326fd9f36eb306a828d129a3a1d7f7)
+
+diff --git a/sysdeps/ieee754/dbl-64/math_config.h b/sysdeps/ieee754/dbl-64/math_config.h
+index ef87cfa6be..05515fd95a 100644
+--- a/sysdeps/ieee754/dbl-64/math_config.h
++++ b/sysdeps/ieee754/dbl-64/math_config.h
+@@ -195,16 +195,18 @@ check_uflow (double x)
+ extern const struct exp_data
+ {
+   double invln2N;
+-  double shift;
+   double negln2hiN;
+   double negln2loN;
+   double poly[4]; /* Last four coefficients.  */
++  double shift;
++
+   double exp2_shift;
+   double exp2_poly[EXP2_POLY_ORDER];
+-  double invlog10_2N;
++
+   double neglog10_2hiN;
+   double neglog10_2loN;
+   double exp10_poly[5];
++  double invlog10_2N;
+   uint64_t tab[2*(1 << EXP_TABLE_BITS)];
+ } __exp_data attribute_hidden;
+ 
+
+commit 3e820e17a8cef84645d83b67abcbc3f88c7fd268
+Author: Michael Jeanson <mjeanson@efficios.com>
+Date:   Fri Feb 14 13:54:22 2025 -0500
+
+    nptl: clear the whole rseq area before registration
+    
+    Due to the extensible nature of the rseq area we can't explictly
+    initialize fields that are not part of the ABI yet. It was agreed with
+    upstream that all new fields will be documented as zero initialized by
+    userspace. Future kernels configured with CONFIG_DEBUG_RSEQ will
+    validate the content of all fields during registration.
+    
+    Replace the explicit field initialization with a memset of the whole
+    rseq area which will cover fields as they are added to future kernels.
+    
+    Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
+    Reviewed-by: Florian Weimer <fweimer@redhat.com>
+    (cherry picked from commit 689a62a4217fae78b9ce0db781dc2a421f2b1ab4)
+
+diff --git a/sysdeps/nptl/dl-tls_init_tp.c b/sysdeps/nptl/dl-tls_init_tp.c
+index 7803e19fd1..ed10185e37 100644
+--- a/sysdeps/nptl/dl-tls_init_tp.c
++++ b/sysdeps/nptl/dl-tls_init_tp.c
+@@ -23,6 +23,7 @@
+ #include <tls.h>
+ #include <rseq-internal.h>
+ #include <thread_pointer.h>
++#include <dl-symbol-redir-ifunc.h>
+ 
+ #define TUNABLE_NAMESPACE pthread
+ #include <dl-tunables.h>
+diff --git a/sysdeps/unix/sysv/linux/rseq-internal.h b/sysdeps/unix/sysv/linux/rseq-internal.h
+index ef3eab1fef..76de2b7ff0 100644
+--- a/sysdeps/unix/sysv/linux/rseq-internal.h
++++ b/sysdeps/unix/sysv/linux/rseq-internal.h
+@@ -52,13 +52,12 @@ rseq_register_current_thread (struct pthread *self, bool do_rseq)
+            but still expected size 32.  */
+         size = RSEQ_AREA_SIZE_INITIAL;
+ 
+-      /* Initialize the rseq fields that are read by the kernel on
+-         registration, there is no guarantee that struct pthread is
+-         cleared on all architectures.  */
++      /* Initialize the whole rseq area to zero prior to registration.  */
++      memset (&self->rseq_area, 0, size);
++
++      /* Set the cpu_id field to RSEQ_CPU_ID_UNINITIALIZED, this is checked by
++         the kernel at registration when CONFIG_DEBUG_RSEQ is enabled.  */
+       THREAD_SETMEM (self, rseq_area.cpu_id, RSEQ_CPU_ID_UNINITIALIZED);
+-      THREAD_SETMEM (self, rseq_area.cpu_id_start, 0);
+-      THREAD_SETMEM (self, rseq_area.rseq_cs, 0);
+-      THREAD_SETMEM (self, rseq_area.flags, 0);
+ 
+       int ret = INTERNAL_SYSCALL_CALL (rseq, &self->rseq_area,
+                                        size, 0, RSEQ_SIG);
+
+commit ee1ab9302363066b49cf8862b96664ed35eda81c
+Author: Sunil K Pandey <skpgkp2@gmail.com>
+Date:   Mon Mar 10 10:24:07 2025 -0700
+
+    x86_64: Add tanh with FMA
+    
+    On Skylake, it improves tanh bench performance by:
+    
+            Before          After           Improvement
+    max     110.89          95.826          14%
+    min     20.966          20.157          4%
+    mean    30.9601         29.8431         4%
+    
+    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
+    (cherry picked from commit c6352111c72a20b3588ae304dd99b63e25dd6d85)
+
+diff --git a/sysdeps/ieee754/dbl-64/s_tanh.c b/sysdeps/ieee754/dbl-64/s_tanh.c
+index 673a97102d..13063db04e 100644
+--- a/sysdeps/ieee754/dbl-64/s_tanh.c
++++ b/sysdeps/ieee754/dbl-64/s_tanh.c
+@@ -46,6 +46,11 @@ static char rcsid[] = "$NetBSD: s_tanh.c,v 1.7 1995/05/10 20:48:22 jtc Exp $";
+ 
+ static const double one = 1.0, two = 2.0, tiny = 1.0e-300;
+ 
++#ifndef SECTION
++# define SECTION
++#endif
++
++SECTION
+ double
+ __tanh (double x)
+ {
+diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
+index cbe09d49f4..0f69f7089c 100644
+--- a/sysdeps/x86_64/fpu/multiarch/Makefile
++++ b/sysdeps/x86_64/fpu/multiarch/Makefile
+@@ -10,6 +10,7 @@ CFLAGS-s_expm1-fma.c = -mfma -mavx2
+ CFLAGS-s_log1p-fma.c = -mfma -mavx2
+ CFLAGS-s_sin-fma.c = -mfma -mavx2
+ CFLAGS-s_tan-fma.c = -mfma -mavx2
++CFLAGS-s_tanh-fma.c = -mfma -mavx2
+ CFLAGS-s_sincos-fma.c = -mfma -mavx2
+ 
+ CFLAGS-e_exp2f-fma.c = -mfma -mavx2
+@@ -92,6 +93,7 @@ libm-sysdep_routines += \
+   s_sinf-sse2 \
+   s_tan-avx \
+   s_tan-fma \
++  s_tanh-fma \
+   s_trunc-sse4_1 \
+   s_truncf-sse4_1 \
+ # libm-sysdep_routines
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_tanh-fma.c b/sysdeps/x86_64/fpu/multiarch/s_tanh-fma.c
+new file mode 100644
+index 0000000000..1b808b1227
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/s_tanh-fma.c
+@@ -0,0 +1,11 @@
++#define __tanh __tanh_fma
++#define __expm1 __expm1_fma
++
++/* NB: __expm1 may be expanded to __expm1_fma in the following
++   prototypes.  */
++extern long double __expm1l (long double);
++extern long double __expm1f128 (long double);
++
++#define SECTION __attribute__ ((section (".text.fma")))
++
++#include <sysdeps/ieee754/dbl-64/s_tanh.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_tanh.c b/sysdeps/x86_64/fpu/multiarch/s_tanh.c
+new file mode 100644
+index 0000000000..5539b6c61c
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/s_tanh.c
+@@ -0,0 +1,31 @@
++/* Multiple versions of tanh.
++   Copyright (C) 2025 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++
++extern double __redirect_tanh (double);
++
++# define SYMBOL_NAME tanh
++# include "ifunc-fma.h"
++
++libc_ifunc_redirected (__redirect_tanh, __tanh, IFUNC_SELECTOR ());
++
++# define __tanh __tanh_sse2
++#endif
++#include <sysdeps/ieee754/dbl-64/s_tanh.c>
+
+commit e854f6d37cbeabb9130fed74b587befad8b4ba08
+Author: Sunil K Pandey <skpgkp2@gmail.com>
+Date:   Sat Mar 8 08:51:10 2025 -0800
+
+    x86_64: Add sinh with FMA
+    
+    On SPR, it improves sinh bench performance by:
+    
+                            Before          After           Improvement
+    reciprocal-throughput   14.2017         11.815          17%
+    latency                 36.4917         35.2114         4%
+    
+    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
+    (cherry picked from commit dded0d20f67ba1925ccbcb9cf28f0c75febe0dbe)
+
+diff --git a/benchtests/sinh-inputs b/benchtests/sinh-inputs
+index 7b1ac46a39..2fcb2fabf8 100644
+--- a/benchtests/sinh-inputs
++++ b/benchtests/sinh-inputs
+@@ -1,6 +1,7 @@
+ ## args: double
+ ## ret: double
+ ## includes: math.h
++## name: workload-random
+ 0x1.bcb6129b5ff2bp8
+ -0x1.63057386325ebp9
+ 0x1.62f1d7dc4e8bfp9
+diff --git a/sysdeps/ieee754/dbl-64/e_sinh.c b/sysdeps/ieee754/dbl-64/e_sinh.c
+index b4b5857ddd..3f787967f9 100644
+--- a/sysdeps/ieee754/dbl-64/e_sinh.c
++++ b/sysdeps/ieee754/dbl-64/e_sinh.c
+@@ -41,6 +41,11 @@ static char rcsid[] = "$NetBSD: e_sinh.c,v 1.7 1995/05/10 20:46:13 jtc Exp $";
+ 
+ static const double one = 1.0, shuge = 1.0e307;
+ 
++#ifndef SECTION
++# define SECTION
++#endif
++
++SECTION
+ double
+ __ieee754_sinh (double x)
+ {
+@@ -90,4 +95,7 @@ __ieee754_sinh (double x)
+   /* |x| > overflowthresold, sinh(x) overflow */
+   return math_narrow_eval (x * shuge);
+ }
++
++#ifndef __ieee754_sinh
+ libm_alias_finite (__ieee754_sinh, __sinh)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
+index 0f69f7089c..b527cab8d1 100644
+--- a/sysdeps/x86_64/fpu/multiarch/Makefile
++++ b/sysdeps/x86_64/fpu/multiarch/Makefile
+@@ -5,6 +5,7 @@ CFLAGS-e_exp-fma.c = -mfma -mavx2
+ CFLAGS-e_log-fma.c = -mfma -mavx2
+ CFLAGS-e_log2-fma.c = -mfma -mavx2
+ CFLAGS-e_pow-fma.c = -mfma -mavx2
++CFLAGS-e_sinh-fma.c = -mfma -mavx2
+ CFLAGS-s_atan-fma.c = -mfma -mavx2
+ CFLAGS-s_expm1-fma.c = -mfma -mavx2
+ CFLAGS-s_log1p-fma.c = -mfma -mavx2
+@@ -67,6 +68,7 @@ libm-sysdep_routines += \
+   e_logf-fma \
+   e_pow-fma \
+   e_powf-fma \
++  e_sinh-fma \
+   s_atan-avx \
+   s_atan-fma \
+   s_ceil-sse4_1 \
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_sinh-fma.c b/sysdeps/x86_64/fpu/multiarch/e_sinh-fma.c
+new file mode 100644
+index 0000000000..e0e1e39a7a
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/e_sinh-fma.c
+@@ -0,0 +1,12 @@
++#define __ieee754_sinh __ieee754_sinh_fma
++#define __ieee754_exp __ieee754_exp_fma
++#define __expm1 __expm1_fma
++
++/* NB: __expm1 may be expanded to __expm1_fma in the following
++   prototypes.  */
++extern long double __expm1l (long double);
++extern long double __expm1f128 (long double);
++
++#define SECTION __attribute__ ((section (".text.fma")))
++
++#include <sysdeps/ieee754/dbl-64/e_sinh.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_sinh.c b/sysdeps/x86_64/fpu/multiarch/e_sinh.c
+new file mode 100644
+index 0000000000..3d3c18ccdf
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/e_sinh.c
+@@ -0,0 +1,35 @@
++/* Multiple versions of sinh.
++   Copyright (C) 2025 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-finite.h>
++
++extern double __redirect_ieee754_sinh (double);
++
++# define SYMBOL_NAME ieee754_sinh
++# include "ifunc-fma.h"
++
++libc_ifunc_redirected (__redirect_ieee754_sinh, __ieee754_sinh,
++		       IFUNC_SELECTOR ());
++
++libm_alias_finite (__ieee754_sinh, __sinh)
++
++# define __ieee754_sinh __ieee754_sinh_sse2
++#endif
++#include <sysdeps/ieee754/dbl-64/e_sinh.c>
+
+commit e5f5dfdda28def8362896bdb1748bb27dfc8be73
+Author: Sunil K Pandey <skpgkp2@gmail.com>
+Date:   Wed Mar 5 16:13:38 2025 -0800
+
+    x86_64: Add atanh with FMA
+    
+    On SPR, it improves atanh bench performance by:
+    
+                            Before          After           Improvement
+    reciprocal-throughput   15.1715         14.8628         2%
+    latency                 57.1941         56.1883         2%
+    
+    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
+    (cherry picked from commit c7c4a5906f326f1290b1c2413a83c530564ec4b8)
+
+diff --git a/benchtests/atanh-inputs b/benchtests/atanh-inputs
+index 455aa65b65..4985293254 100644
+--- a/benchtests/atanh-inputs
++++ b/benchtests/atanh-inputs
+@@ -1,6 +1,7 @@
+ ## args: double
+ ## ret: double
+ ## includes: math.h
++## name: workload-random
+ 0x1.5a2730bacd94ap-1
+ -0x1.b57eb40fc048ep-21
+ -0x1.c0b185fb450e2p-17
+diff --git a/sysdeps/ieee754/dbl-64/e_atanh.c b/sysdeps/ieee754/dbl-64/e_atanh.c
+index 11a2a45799..05ac0a1b30 100644
+--- a/sysdeps/ieee754/dbl-64/e_atanh.c
++++ b/sysdeps/ieee754/dbl-64/e_atanh.c
+@@ -44,6 +44,11 @@
+ 
+ static const double huge = 1e300;
+ 
++#ifndef SECTION
++# define SECTION
++#endif
++
++SECTION
+ double
+ __ieee754_atanh (double x)
+ {
+@@ -73,4 +78,7 @@ __ieee754_atanh (double x)
+ 
+   return copysign (t, x);
+ }
++
++#ifndef __ieee754_atanh
+ libm_alias_finite (__ieee754_atanh, __atanh)
++#endif
+diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
+index b527cab8d1..bc479b42d2 100644
+--- a/sysdeps/x86_64/fpu/multiarch/Makefile
++++ b/sysdeps/x86_64/fpu/multiarch/Makefile
+@@ -1,6 +1,7 @@
+ ifeq ($(subdir),math)
+ CFLAGS-e_asin-fma.c = -mfma -mavx2
+ CFLAGS-e_atan2-fma.c = -mfma -mavx2
++CFLAGS-e_atanh-fma.c = -mfma -mavx2
+ CFLAGS-e_exp-fma.c = -mfma -mavx2
+ CFLAGS-e_log-fma.c = -mfma -mavx2
+ CFLAGS-e_log2-fma.c = -mfma -mavx2
+@@ -57,6 +58,7 @@ libm-sysdep_routines += \
+   e_asin-fma \
+   e_atan2-avx \
+   e_atan2-fma \
++  e_atanh-fma \
+   e_exp-avx \
+   e_exp-fma \
+   e_exp2f-fma \
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_atanh-fma.c b/sysdeps/x86_64/fpu/multiarch/e_atanh-fma.c
+new file mode 100644
+index 0000000000..c3f2f9e550
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/e_atanh-fma.c
+@@ -0,0 +1,6 @@
++#define __ieee754_atanh __ieee754_atanh_fma
++#define __log1p __log1p_fma
++
++#define SECTION __attribute__ ((section (".text.fma")))
++
++#include <sysdeps/ieee754/dbl-64/e_atanh.c>
+diff --git a/sysdeps/x86_64/fpu/multiarch/e_atanh.c b/sysdeps/x86_64/fpu/multiarch/e_atanh.c
+new file mode 100644
+index 0000000000..d2b785dfc0
+--- /dev/null
++++ b/sysdeps/x86_64/fpu/multiarch/e_atanh.c
+@@ -0,0 +1,34 @@
++/* Multiple versions of atanh.
++   Copyright (C) 2025 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <sysdeps/x86/isa-level.h>
++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL
++# include <libm-alias-finite.h>
++
++extern double __redirect_ieee754_atanh (double);
++
++# define SYMBOL_NAME ieee754_atanh
++# include "ifunc-fma.h"
++
++libc_ifunc_redirected (__redirect_ieee754_atanh, __ieee754_atanh, IFUNC_SELECTOR ());
++
++libm_alias_finite (__ieee754_atanh, __atanh)
++
++# define __ieee754_atanh __ieee754_atanh_sse2
++#endif
++#include <sysdeps/ieee754/dbl-64/e_atanh.c>
+
+commit 8fc492bb4234edc1a5e8c3b7f76ba345ea7109ec
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Fri Mar 28 09:26:06 2025 +0100
+
+    x86: Skip XSAVE state size reset if ISA level requires XSAVE
+    
+    If we have to use XSAVE or XSAVEC trampolines, do not adjust the size
+    information they need.  Technically, it is an operator error to try to
+    run with -XSAVE,-XSAVEC on such builds, but this change here disables
+    some unnecessary code with higher ISA levels and simplifies testing.
+    
+    Related to commit befe2d3c4dec8be2cdd01a47132e47bdb7020922
+    ("x86-64: Don't use SSE resolvers for ISA level 3 or above").
+    
+    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
+    (cherry picked from commit 59585ddaa2d44f22af04bb4b8bd4ad1e302c4c02)
+
+diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
+index c096dd390a..b5b264db7f 100644
+--- a/sysdeps/x86/cpu-features.c
++++ b/sysdeps/x86/cpu-features.c
+@@ -24,6 +24,7 @@
+ #include <dl-cacheinfo.h>
+ #include <dl-minsigstacksize.h>
+ #include <dl-hwcap2.h>
++#include <gcc-macros.h>
+ 
+ extern void TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *)
+   attribute_hidden;
+@@ -1119,6 +1120,9 @@ no_cpuid:
+ 	       TUNABLE_CALLBACK (set_prefer_map_32bit_exec));
+ #endif
+ 
++  /* Do not add the logic to disable XSAVE/XSAVEC if this glibc build
++     requires AVX and therefore XSAVE or XSAVEC support.  */
++#ifndef GCCMACRO__AVX__
+   bool disable_xsave_features = false;
+ 
+   if (!CPU_FEATURE_USABLE_P (cpu_features, OSXSAVE))
+@@ -1172,6 +1176,7 @@ no_cpuid:
+ 
+       CPU_FEATURE_UNSET (cpu_features, FMA4);
+     }
++#endif
+ 
+ #ifdef __x86_64__
+   GLRO(dl_hwcap) = HWCAP_X86_64;
+
+commit df22af58f66e6815c054b1c56249356c2994935a
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Fri Mar 28 09:26:59 2025 +0100
+
+    x86: Use separate variable for TLSDESC XSAVE/XSAVEC state size (bug 32810)
+    
+    Previously, the initialization code reused the xsave_state_full_size
+    member of struct cpu_features for the TLSDESC state size.  However,
+    the tunable processing code assumes that this member has the
+    original XSAVE (non-compact) state size, so that it can use its
+    value if XSAVEC is disabled via tunable.
+    
+    This change uses a separate variable and not a struct member because
+    the value is only needed in ld.so and the static libc, but not in
+    libc.so.  As a result, struct cpu_features layout does not change,
+    helping a future backport of this change.
+    
+    Fixes commit 9b7091415af47082664717210ac49d51551456ab ("x86-64:
+    Update _dl_tlsdesc_dynamic to preserve AMX registers").
+    
+    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
+    (cherry picked from commit 145097dff170507fe73190e8e41194f5b5f7e6bf)
+
+diff --git a/NEWS b/NEWS
+index 57feba81cd..7a6985f5dd 100644
+--- a/NEWS
++++ b/NEWS
+@@ -22,6 +22,7 @@ The following bugs are resolved with this release:
+   [32231] elf: Change ldconfig auxcache magic number
+   [32245] glibc -Wstringop-overflow= build failure on hppa
+   [32470] x86: Avoid integer truncation with large cache sizes
++  [32810] Crash on x86-64 if XSAVEC disable via tunable
+ 
+ Version 2.40
+ 
+diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
+index 5311b594af..8819fba1b7 100644
+--- a/sysdeps/x86/Makefile
++++ b/sysdeps/x86/Makefile
+@@ -21,6 +21,9 @@ tests += \
+   tst-cpu-features-supports-static \
+   tst-get-cpu-features \
+   tst-get-cpu-features-static \
++  tst-gnu2-tls2-x86-noxsave \
++  tst-gnu2-tls2-x86-noxsavec \
++  tst-gnu2-tls2-x86-noxsavexsavec \
+   tst-hwcap-tunables \
+ # tests
+ tests-static += \
+@@ -91,6 +94,22 @@ CFLAGS-tst-gnu2-tls2.c += -msse
+ CFLAGS-tst-gnu2-tls2mod0.c += -msse2 -mtune=haswell
+ CFLAGS-tst-gnu2-tls2mod1.c += -msse2 -mtune=haswell
+ CFLAGS-tst-gnu2-tls2mod2.c += -msse2 -mtune=haswell
++
++LDFLAGS-tst-gnu2-tls2-x86-noxsave += -Wl,-z,lazy
++LDFLAGS-tst-gnu2-tls2-x86-noxsavec += -Wl,-z,lazy
++LDFLAGS-tst-gnu2-tls2-x86-noxsavexsavec += -Wl,-z,lazy
++
++# Test for bug 32810: incorrect XSAVE state size if XSAVEC is disabled
++# via tunable.
++tst-gnu2-tls2-x86-noxsave-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVE
++tst-gnu2-tls2-x86-noxsavec-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC
++tst-gnu2-tls2-x86-noxsavexsavec-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVE,-XSAVEC
++$(objpfx)tst-gnu2-tls2-x86-noxsave.out \
++$(objpfx)tst-gnu2-tls2-x86-noxsavec.out \
++$(objpfx)tst-gnu2-tls2-x86-noxsavexsavec.out: \
++  $(objpfx)tst-gnu2-tls2mod0.so \
++  $(objpfx)tst-gnu2-tls2mod1.so \
++  $(objpfx)tst-gnu2-tls2mod2.so
+ endif
+ 
+ ifeq ($(subdir),math)
+diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
+index b5b264db7f..ec27337337 100644
+--- a/sysdeps/x86/cpu-features.c
++++ b/sysdeps/x86/cpu-features.c
+@@ -84,6 +84,8 @@ extern void TUNABLE_CALLBACK (set_x86_shstk) (tunable_val_t *)
+ # include <dl-cet.h>
+ #endif
+ 
++unsigned long int _dl_x86_features_tlsdesc_state_size;
++
+ static void
+ update_active (struct cpu_features *cpu_features)
+ {
+@@ -318,6 +320,7 @@ update_active (struct cpu_features *cpu_features)
+ 		= xsave_state_full_size;
+ 	      cpu_features->xsave_state_full_size
+ 		= xsave_state_full_size;
++	      _dl_x86_features_tlsdesc_state_size = xsave_state_full_size;
+ 
+ 	      /* Check if XSAVEC is available.  */
+ 	      if (CPU_FEATURES_CPU_P (cpu_features, XSAVEC))
+@@ -406,11 +409,9 @@ update_active (struct cpu_features *cpu_features)
+ 			= ALIGN_UP ((amx_size
+ 				     + TLSDESC_CALL_REGISTER_SAVE_AREA),
+ 				    64);
+-		      /* Set xsave_state_full_size to the compact AMX
+-			 state size for XSAVEC.  NB: xsave_state_full_size
+-			 is only used in _dl_tlsdesc_dynamic_xsave and
+-			 _dl_tlsdesc_dynamic_xsavec.  */
+-		      cpu_features->xsave_state_full_size = amx_size;
++		      /* Set TLSDESC state size to the compact AMX
++			 state size for XSAVEC.  */
++		      _dl_x86_features_tlsdesc_state_size = amx_size;
+ #endif
+ 		      cpu_features->xsave_state_size
+ 			= ALIGN_UP (size + TLSDESC_CALL_REGISTER_SAVE_AREA,
+diff --git a/sysdeps/x86/cpu-tunables.c b/sysdeps/x86/cpu-tunables.c
+index ccc6b64dc2..a0b31d80f6 100644
+--- a/sysdeps/x86/cpu-tunables.c
++++ b/sysdeps/x86/cpu-tunables.c
+@@ -164,6 +164,8 @@ TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *valp)
+ 		  /* Update xsave_state_size to XSAVE state size.  */
+ 		  cpu_features->xsave_state_size
+ 		    = cpu_features->xsave_state_full_size;
++		  _dl_x86_features_tlsdesc_state_size
++		    = cpu_features->xsave_state_full_size;
+ 		  CPU_FEATURE_UNSET (cpu_features, XSAVEC);
+ 		}
+ 	    }
+diff --git a/sysdeps/x86/dl-diagnostics-cpu.c b/sysdeps/x86/dl-diagnostics-cpu.c
+index 49eeb5f70a..41100a908a 100644
+--- a/sysdeps/x86/dl-diagnostics-cpu.c
++++ b/sysdeps/x86/dl-diagnostics-cpu.c
+@@ -89,6 +89,8 @@ _dl_diagnostics_cpu (void)
+                             cpu_features->xsave_state_size);
+   print_cpu_features_value ("xsave_state_full_size",
+                             cpu_features->xsave_state_full_size);
++  print_cpu_features_value ("tlsdesc_state_full_size",
++                            _dl_x86_features_tlsdesc_state_size);
+   print_cpu_features_value ("data_cache_size", cpu_features->data_cache_size);
+   print_cpu_features_value ("shared_cache_size",
+                             cpu_features->shared_cache_size);
+diff --git a/sysdeps/x86/include/cpu-features.h b/sysdeps/x86/include/cpu-features.h
+index aaae44f0e1..03c71387dd 100644
+--- a/sysdeps/x86/include/cpu-features.h
++++ b/sysdeps/x86/include/cpu-features.h
+@@ -934,8 +934,6 @@ struct cpu_features
+   /* The full state size for XSAVE when XSAVEC is disabled by
+ 
+      GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC
+-
+-     and the AMX state size when XSAVEC is available.
+    */
+   unsigned int xsave_state_full_size;
+   /* Data cache size for use in memory and string routines, typically
+@@ -989,6 +987,13 @@ extern const struct cpu_features *_dl_x86_get_cpu_features (void)
+ 
+ #define __get_cpu_features() _dl_x86_get_cpu_features()
+ 
++#if IS_IN (rtld) || IS_IN (libc)
++/* XSAVE/XSAVEC state size used by TLS descriptors.  Compared to
++   xsave_state_size from struct cpu_features, this includes additional
++   registers.  */
++extern unsigned long int _dl_x86_features_tlsdesc_state_size attribute_hidden;
++#endif
++
+ #if defined (_LIBC) && !IS_IN (nonlib)
+ /* Unused for x86.  */
+ # define INIT_ARCH()
+diff --git a/sysdeps/x86/tst-gnu2-tls2-x86-noxsave.c b/sysdeps/x86/tst-gnu2-tls2-x86-noxsave.c
+new file mode 100644
+index 0000000000..f0024c143d
+--- /dev/null
++++ b/sysdeps/x86/tst-gnu2-tls2-x86-noxsave.c
+@@ -0,0 +1 @@
++#include <elf/tst-gnu2-tls2.c>
+diff --git a/sysdeps/x86/tst-gnu2-tls2-x86-noxsavec.c b/sysdeps/x86/tst-gnu2-tls2-x86-noxsavec.c
+new file mode 100644
+index 0000000000..f0024c143d
+--- /dev/null
++++ b/sysdeps/x86/tst-gnu2-tls2-x86-noxsavec.c
+@@ -0,0 +1 @@
++#include <elf/tst-gnu2-tls2.c>
+diff --git a/sysdeps/x86/tst-gnu2-tls2-x86-noxsavexsavec.c b/sysdeps/x86/tst-gnu2-tls2-x86-noxsavexsavec.c
+new file mode 100644
+index 0000000000..f0024c143d
+--- /dev/null
++++ b/sysdeps/x86/tst-gnu2-tls2-x86-noxsavexsavec.c
+@@ -0,0 +1 @@
++#include <elf/tst-gnu2-tls2.c>
+diff --git a/sysdeps/x86_64/dl-tlsdesc-dynamic.h b/sysdeps/x86_64/dl-tlsdesc-dynamic.h
+index 9f02cfc3eb..44d948696f 100644
+--- a/sysdeps/x86_64/dl-tlsdesc-dynamic.h
++++ b/sysdeps/x86_64/dl-tlsdesc-dynamic.h
+@@ -99,7 +99,7 @@ _dl_tlsdesc_dynamic:
+ # endif
+ #else
+ 	/* Allocate stack space of the required size to save the state.  */
+-	sub	_rtld_local_ro+RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_FULL_SIZE_OFFSET(%rip), %RSP_LP
++	sub	_dl_x86_features_tlsdesc_state_size(%rip), %RSP_LP
+ #endif
+ 	/* Besides rdi and rsi, saved above, save rcx, rdx, r8, r9,
+ 	   r10 and r11.  */
+
+commit a87d9a2c2cc17a3b22fd3be8d106336f4dcf2042
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Mon Mar 31 21:33:18 2025 +0200
+
+    x86: Link tst-gnu2-tls2-x86-noxsave{,c,xsavec} with libpthread
+    
+    This fixes a test build failure on Hurd.
+    
+    Fixes commit 145097dff170507fe73190e8e41194f5b5f7e6bf ("x86: Use separate
+    variable for TLSDESC XSAVE/XSAVEC state size (bug 32810)").
+    
+    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+    (cherry picked from commit c6e2895695118ab59c7b17feb0fcb75a53e3478c)
+
+diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
+index 8819fba1b7..01b0192ddf 100644
+--- a/sysdeps/x86/Makefile
++++ b/sysdeps/x86/Makefile
+@@ -104,6 +104,9 @@ LDFLAGS-tst-gnu2-tls2-x86-noxsavexsavec += -Wl,-z,lazy
+ tst-gnu2-tls2-x86-noxsave-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVE
+ tst-gnu2-tls2-x86-noxsavec-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC
+ tst-gnu2-tls2-x86-noxsavexsavec-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVE,-XSAVEC
++$(objpfx)tst-gnu2-tls2-x86-noxsave: $(shared-thread-library)
++$(objpfx)tst-gnu2-tls2-x86-noxsavec: $(shared-thread-library)
++$(objpfx)tst-gnu2-tls2-x86-noxsavexsavec: $(shared-thread-library)
+ $(objpfx)tst-gnu2-tls2-x86-noxsave.out \
+ $(objpfx)tst-gnu2-tls2-x86-noxsavec.out \
+ $(objpfx)tst-gnu2-tls2-x86-noxsavexsavec.out: \
+
+commit 8fe27af20c8b25b84e12bcd52353862a95044aa2
+Author: Noah Goldstein <goldstein.w.n@gmail.com>
+Date:   Wed Aug 14 14:37:30 2024 +0800
+
+    x86: Use `Avoid_Non_Temporal_Memset` to control non-temporal path
+    
+    This is just a refactor and there should be no behavioral change from
+    this commit.
+    
+    The goal is to make `Avoid_Non_Temporal_Memset` a more universal knob
+    for controlling whether we use non-temporal memset rather than having
+    extra logic based on vendor.
+    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
+    
+    (cherry picked from commit b93dddfaf440aa12f45d7c356f6ffe9f27d35577)
+
+diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
+index ec27337337..8841020b36 100644
+--- a/sysdeps/x86/cpu-features.c
++++ b/sysdeps/x86/cpu-features.c
+@@ -758,6 +758,12 @@ init_cpu_features (struct cpu_features *cpu_features)
+   unsigned int stepping = 0;
+   enum cpu_features_kind kind;
+ 
++  /* Default is avoid non-temporal memset for non Intel/AMD hardware. This is,
++     as of writing this, we only have benchmarks indicatings it profitability
++     on Intel/AMD.  */
++  cpu_features->preferred[index_arch_Avoid_Non_Temporal_Memset]
++      |= bit_arch_Avoid_Non_Temporal_Memset;
++
+   cpu_features->cachesize_non_temporal_divisor = 4;
+ #if !HAS_CPUID
+   if (__get_cpuid_max (0, 0) == 0)
+@@ -783,6 +789,11 @@ init_cpu_features (struct cpu_features *cpu_features)
+ 
+       update_active (cpu_features);
+ 
++      /* Benchmarks indicate non-temporal memset can be profitable on Intel
++	hardware.  */
++      cpu_features->preferred[index_arch_Avoid_Non_Temporal_Memset]
++	  &= ~bit_arch_Avoid_Non_Temporal_Memset;
++
+       if (family == 0x06)
+ 	{
+ 	  model += extended_model;
+@@ -993,6 +1004,11 @@ https://www.intel.com/content/www/us/en/support/articles/000059422/processors.ht
+ 
+       ecx = cpu_features->features[CPUID_INDEX_1].cpuid.ecx;
+ 
++      /* Benchmarks indicate non-temporal memset can be profitable on AMD
++	hardware.  */
++      cpu_features->preferred[index_arch_Avoid_Non_Temporal_Memset]
++	  &= ~bit_arch_Avoid_Non_Temporal_Memset;
++
+       if (CPU_FEATURE_USABLE_P (cpu_features, AVX))
+ 	{
+ 	  /* Since the FMA4 bit is in CPUID_INDEX_80000001 and
+diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h
+index ac97414b5b..7b1b61c096 100644
+--- a/sysdeps/x86/dl-cacheinfo.h
++++ b/sysdeps/x86/dl-cacheinfo.h
+@@ -988,14 +988,6 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
+   if (CPU_FEATURE_USABLE_P (cpu_features, FSRM))
+     rep_movsb_threshold = 2112;
+ 
+-  /* Non-temporal stores are more performant on Intel and AMD hardware above
+-     non_temporal_threshold. Enable this for both Intel and AMD hardware. */
+-  unsigned long int memset_non_temporal_threshold = SIZE_MAX;
+-  if (!CPU_FEATURES_ARCH_P (cpu_features, Avoid_Non_Temporal_Memset)
+-      && (cpu_features->basic.kind == arch_kind_intel
+-	  || cpu_features->basic.kind == arch_kind_amd))
+-    memset_non_temporal_threshold = non_temporal_threshold;
+-
+   /* For AMD CPUs that support ERMS (Zen3+), REP MOVSB is in a lot of
+      cases slower than the vectorized path (and for some alignments,
+      it is really slow, check BZ #30994).  */
+@@ -1017,6 +1009,13 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
+   if (tunable_size != 0)
+     shared = tunable_size;
+ 
++  /* Non-temporal stores are more performant on some hardware above
++     non_temporal_threshold. Currently Prefer_Non_Temporal is set for for both
++     Intel and AMD hardware. */
++  unsigned long int memset_non_temporal_threshold = SIZE_MAX;
++  if (!CPU_FEATURES_ARCH_P (cpu_features, Avoid_Non_Temporal_Memset))
++    memset_non_temporal_threshold = non_temporal_threshold;
++
+   tunable_size = TUNABLE_GET (x86_non_temporal_threshold, long int, NULL);
+   if (tunable_size > minimum_non_temporal_threshold
+       && tunable_size <= maximum_non_temporal_threshold)
+
+commit 7c6bd71b4dbdadab34e4fd21ec09b86b32daf443
+Author: Sunil K Pandey <skpgkp2@gmail.com>
+Date:   Thu Apr 3 13:00:45 2025 -0700
+
+    x86: Optimize xstate size calculation
+    
+    Scan xstate IDs up to the maximum supported xstate ID.  Remove the
+    separate AMX xstate calculation.  Instead, exclude the AMX space from
+    the start of TILECFG to the end of TILEDATA in xsave_state_size.
+    
+    Completed validation on SKL/SKX/SPR/SDE and compared xsave state size
+    with "ld.so --list-diagnostics" option, no regression.
+    
+    Co-Authored-By: H.J. Lu <hjl.tools@gmail.com>
+    Reviewed-by: Sunil K Pandey <skpgkp2@gmail.com>
+    (cherry picked from commit 70b648855185e967e54668b101d24704c3fb869d)
+
+diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
+index 8841020b36..1d5e2a0072 100644
+--- a/sysdeps/x86/cpu-features.c
++++ b/sysdeps/x86/cpu-features.c
+@@ -325,13 +325,8 @@ update_active (struct cpu_features *cpu_features)
+ 	      /* Check if XSAVEC is available.  */
+ 	      if (CPU_FEATURES_CPU_P (cpu_features, XSAVEC))
+ 		{
+-		  unsigned int xstate_comp_offsets[32];
+-		  unsigned int xstate_comp_sizes[32];
+-#ifdef __x86_64__
+-		  unsigned int xstate_amx_comp_offsets[32];
+-		  unsigned int xstate_amx_comp_sizes[32];
+-		  unsigned int amx_ecx;
+-#endif
++		  unsigned int xstate_comp_offsets[X86_XSTATE_MAX_ID + 1];
++		  unsigned int xstate_comp_sizes[X86_XSTATE_MAX_ID + 1];
+ 		  unsigned int i;
+ 
+ 		  xstate_comp_offsets[0] = 0;
+@@ -339,39 +334,16 @@ update_active (struct cpu_features *cpu_features)
+ 		  xstate_comp_offsets[2] = 576;
+ 		  xstate_comp_sizes[0] = 160;
+ 		  xstate_comp_sizes[1] = 256;
+-#ifdef __x86_64__
+-		  xstate_amx_comp_offsets[0] = 0;
+-		  xstate_amx_comp_offsets[1] = 160;
+-		  xstate_amx_comp_offsets[2] = 576;
+-		  xstate_amx_comp_sizes[0] = 160;
+-		  xstate_amx_comp_sizes[1] = 256;
+-#endif
+ 
+-		  for (i = 2; i < 32; i++)
++		  for (i = 2; i <= X86_XSTATE_MAX_ID; i++)
+ 		    {
+ 		      if ((FULL_STATE_SAVE_MASK & (1 << i)) != 0)
+ 			{
+ 			  __cpuid_count (0xd, i, eax, ebx, ecx, edx);
+-#ifdef __x86_64__
+-			  /* Include this in xsave_state_full_size.  */
+-			  amx_ecx = ecx;
+-			  xstate_amx_comp_sizes[i] = eax;
+-			  if ((AMX_STATE_SAVE_MASK & (1 << i)) != 0)
+-			    {
+-			      /* Exclude this from xsave_state_size.  */
+-			      ecx = 0;
+-			      xstate_comp_sizes[i] = 0;
+-			    }
+-			  else
+-#endif
+-			    xstate_comp_sizes[i] = eax;
++			  xstate_comp_sizes[i] = eax;
+ 			}
+ 		      else
+ 			{
+-#ifdef __x86_64__
+-			  amx_ecx = 0;
+-			  xstate_amx_comp_sizes[i] = 0;
+-#endif
+ 			  ecx = 0;
+ 			  xstate_comp_sizes[i] = 0;
+ 			}
+@@ -380,42 +352,32 @@ update_active (struct cpu_features *cpu_features)
+ 			{
+ 			  xstate_comp_offsets[i]
+ 			    = (xstate_comp_offsets[i - 1]
+-			       + xstate_comp_sizes[i -1]);
++			       + xstate_comp_sizes[i - 1]);
+ 			  if ((ecx & (1 << 1)) != 0)
+ 			    xstate_comp_offsets[i]
+ 			      = ALIGN_UP (xstate_comp_offsets[i], 64);
+-#ifdef __x86_64__
+-			  xstate_amx_comp_offsets[i]
+-			    = (xstate_amx_comp_offsets[i - 1]
+-			       + xstate_amx_comp_sizes[i - 1]);
+-			  if ((amx_ecx & (1 << 1)) != 0)
+-			    xstate_amx_comp_offsets[i]
+-			      = ALIGN_UP (xstate_amx_comp_offsets[i],
+-					  64);
+-#endif
+ 			}
+ 		    }
+ 
+ 		  /* Use XSAVEC.  */
+ 		  unsigned int size
+-		    = xstate_comp_offsets[31] + xstate_comp_sizes[31];
++		    = (xstate_comp_offsets[X86_XSTATE_MAX_ID]
++		       + xstate_comp_sizes[X86_XSTATE_MAX_ID]);
+ 		  if (size)
+ 		    {
++		      size = ALIGN_UP (size + TLSDESC_CALL_REGISTER_SAVE_AREA,
++				       64);
+ #ifdef __x86_64__
+-		      unsigned int amx_size
+-			= (xstate_amx_comp_offsets[31]
+-			   + xstate_amx_comp_sizes[31]);
+-		      amx_size
+-			= ALIGN_UP ((amx_size
+-				     + TLSDESC_CALL_REGISTER_SAVE_AREA),
+-				    64);
+-		      /* Set TLSDESC state size to the compact AMX
+-			 state size for XSAVEC.  */
+-		      _dl_x86_features_tlsdesc_state_size = amx_size;
++		      _dl_x86_features_tlsdesc_state_size = size;
++		      /* Exclude the AMX space from the start of TILECFG
++			 space to the end of TILEDATA space.  If CPU
++			 doesn't support AMX, TILECFG offset is the same
++			 as TILEDATA + 1 offset.  Otherwise, they are
++			 multiples of 64.  */
++		      size -= (xstate_comp_offsets[X86_XSTATE_TILEDATA_ID + 1]
++			       - xstate_comp_offsets[X86_XSTATE_TILECFG_ID]);
+ #endif
+-		      cpu_features->xsave_state_size
+-			= ALIGN_UP (size + TLSDESC_CALL_REGISTER_SAVE_AREA,
+-				    64);
++		      cpu_features->xsave_state_size = size;
+ 		      CPU_FEATURE_SET (cpu_features, XSAVEC);
+ 		    }
+ 		}
+diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h
+index 7359149e17..1d6cabd816 100644
+--- a/sysdeps/x86/sysdep.h
++++ b/sysdeps/x86/sysdep.h
+@@ -102,6 +102,9 @@
+    | (1 << X86_XSTATE_ZMM_ID)		\
+    | (1 << X86_XSTATE_APX_F_ID))
+ 
++/* The maximum supported xstate ID.  */
++# define X86_XSTATE_MAX_ID	X86_XSTATE_APX_F_ID
++
+ /* AMX state mask.  */
+ # define AMX_STATE_SAVE_MASK		\
+   ((1 << X86_XSTATE_TILECFG_ID) | (1 << X86_XSTATE_TILEDATA_ID))
+@@ -123,6 +126,9 @@
+    | (1 << X86_XSTATE_K_ID)		\
+    | (1 << X86_XSTATE_ZMM_H_ID))
+ 
++/* The maximum supported xstate ID.  */
++# define X86_XSTATE_MAX_ID	X86_XSTATE_ZMM_H_ID
++
+ /* States to be included in xsave_state_size.  */
+ # define FULL_STATE_SAVE_MASK		STATE_SAVE_MASK
+ #endif
+
+commit 44f92df8007d57f82b1518e219a0dbb60389ef2c
+Author: Sunil K Pandey <skpgkp2@gmail.com>
+Date:   Thu Apr 3 18:14:20 2025 -0700
+
+    x86: Add ARL/PTL/CWF model detection support
+    
+    - Add ARROWLAKE model detection.
+    - Add PANTHERLAKE model detection.
+    - Add CLEARWATERFOREST model detection.
+    
+    Intel® Architecture Instruction Set Extensions Programming Reference
+    https://cdrdv2.intel.com/v1/dl/getContent/671368 Section 1.2.
+    
+    No regression, validated model detection on SDE.
+    
+    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
+    (cherry picked from commit e53eb952b970ac94c97d74fb447418fb327ca096)
+
+diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
+index 1d5e2a0072..7f21a8227e 100644
+--- a/sysdeps/x86/cpu-features.c
++++ b/sysdeps/x86/cpu-features.c
+@@ -512,6 +512,7 @@ enum
+   INTEL_ATOM_GOLDMONT,
+   INTEL_ATOM_GOLDMONT_PLUS,
+   INTEL_ATOM_SIERRAFOREST,
++  INTEL_ATOM_CLEARWATERFOREST,
+   INTEL_ATOM_GRANDRIDGE,
+   INTEL_ATOM_TREMONT,
+ 
+@@ -539,6 +540,7 @@ enum
+   INTEL_BIGCORE_METEORLAKE,
+   INTEL_BIGCORE_LUNARLAKE,
+   INTEL_BIGCORE_ARROWLAKE,
++  INTEL_BIGCORE_PANTHERLAKE,
+   INTEL_BIGCORE_GRANITERAPIDS,
+ 
+   /* Mixed (bigcore + atom SOC).  */
+@@ -584,6 +586,8 @@ intel_get_fam6_microarch (unsigned int model,
+       return INTEL_ATOM_GOLDMONT_PLUS;
+     case 0xAF:
+       return INTEL_ATOM_SIERRAFOREST;
++    case 0xDD:
++      return INTEL_ATOM_CLEARWATERFOREST;
+     case 0xB6:
+       return INTEL_ATOM_GRANDRIDGE;
+     case 0x86:
+@@ -691,8 +695,12 @@ intel_get_fam6_microarch (unsigned int model,
+       return INTEL_BIGCORE_METEORLAKE;
+     case 0xbd:
+       return INTEL_BIGCORE_LUNARLAKE;
++    case 0xb5:
++    case 0xc5:
+     case 0xc6:
+       return INTEL_BIGCORE_ARROWLAKE;
++    case 0xCC:
++      return INTEL_BIGCORE_PANTHERLAKE;
+     case 0xAD:
+     case 0xAE:
+       return INTEL_BIGCORE_GRANITERAPIDS;
+@@ -808,6 +816,7 @@ init_cpu_features (struct cpu_features *cpu_features)
+ 	    Default tuned atom microarch.
+ 	    case INTEL_ATOM_SIERRAFOREST:
+ 	    case INTEL_ATOM_GRANDRIDGE:
++	    case INTEL_ATOM_CLEARWATERFOREST:
+ 	   */
+ 
+ 	      /* Bigcore/Default Tuning.  */
+@@ -864,6 +873,7 @@ init_cpu_features (struct cpu_features *cpu_features)
+ 	    case INTEL_BIGCORE_METEORLAKE:
+ 	    case INTEL_BIGCORE_LUNARLAKE:
+ 	    case INTEL_BIGCORE_ARROWLAKE:
++	    case INTEL_BIGCORE_PANTHERLAKE:
+ 	    case INTEL_BIGCORE_SAPPHIRERAPIDS:
+ 	    case INTEL_BIGCORE_EMERALDRAPIDS:
+ 	    case INTEL_BIGCORE_GRANITERAPIDS:
+
+commit 9ee8083c4edbe5e92af7aabb23261309f03ef05c
+Author: Sunil K Pandey <sunil.k.pandey@intel.com>
+Date:   Fri Apr 11 08:52:52 2025 -0700
+
+    x86: Handle unknown Intel processor with default tuning
+    
+    Enable default tuning for unknown Intel processor.
+    
+    Tested on x86, no regression.
+    
+    Co-Authored-By: H.J. Lu <hjl.tools@gmail.com>
+    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
+    (cherry picked from commit 9f0deff558d1d6b08c425c157f50de85013ada9c)
+
+diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
+index 7f21a8227e..1a6e694abf 100644
+--- a/sysdeps/x86/cpu-features.c
++++ b/sysdeps/x86/cpu-features.c
+@@ -502,8 +502,8 @@ _Static_assert (((index_arch_Fast_Unaligned_Load
+ 		"Incorrect index_arch_Fast_Unaligned_Load");
+ 
+ 
+-/* Intel Family-6 microarch list.  */
+-enum
++/* Intel microarch list.  */
++enum intel_microarch
+ {
+   /* Atom processors.  */
+   INTEL_ATOM_BONNELL,
+@@ -555,7 +555,7 @@ enum
+   INTEL_UNKNOWN,
+ };
+ 
+-static unsigned int
++static enum intel_microarch
+ intel_get_fam6_microarch (unsigned int model,
+ 			  __attribute__ ((unused)) unsigned int stepping)
+ {
+@@ -764,134 +764,20 @@ init_cpu_features (struct cpu_features *cpu_features)
+       cpu_features->preferred[index_arch_Avoid_Non_Temporal_Memset]
+ 	  &= ~bit_arch_Avoid_Non_Temporal_Memset;
+ 
++      enum intel_microarch microarch = INTEL_UNKNOWN;
+       if (family == 0x06)
+ 	{
+ 	  model += extended_model;
+-	  unsigned int microarch
+-	      = intel_get_fam6_microarch (model, stepping);
++	  microarch = intel_get_fam6_microarch (model, stepping);
+ 
++	  /* Disable TSX on some processors to avoid TSX on kernels that
++	     weren't updated with the latest microcode package (which
++	     disables broken feature by default).  */
+ 	  switch (microarch)
+ 	    {
+-	      /* Atom / KNL tuning.  */
+-	    case INTEL_ATOM_BONNELL:
+-	      /* BSF is slow on Bonnell.  */
+-	      cpu_features->preferred[index_arch_Slow_BSF]
+-		  |= bit_arch_Slow_BSF;
+-	      break;
+-
+-	      /* Unaligned load versions are faster than SSSE3
+-		     on Airmont, Silvermont, Goldmont, and Goldmont Plus.  */
+-	    case INTEL_ATOM_AIRMONT:
+-	    case INTEL_ATOM_SILVERMONT:
+-	    case INTEL_ATOM_GOLDMONT:
+-	    case INTEL_ATOM_GOLDMONT_PLUS:
+-
+-          /* Knights Landing.  Enable Silvermont optimizations.  */
+-	    case INTEL_KNIGHTS_LANDING:
+-
+-	      cpu_features->preferred[index_arch_Fast_Unaligned_Load]
+-		  |= (bit_arch_Fast_Unaligned_Load
+-		      | bit_arch_Fast_Unaligned_Copy
+-		      | bit_arch_Prefer_PMINUB_for_stringop
+-		      | bit_arch_Slow_SSE4_2);
+-	      break;
+-
+-	    case INTEL_ATOM_TREMONT:
+-	      /* Enable rep string instructions, unaligned load, unaligned
+-		 copy, pminub and avoid SSE 4.2 on Tremont.  */
+-	      cpu_features->preferred[index_arch_Fast_Rep_String]
+-		  |= (bit_arch_Fast_Rep_String
+-		      | bit_arch_Fast_Unaligned_Load
+-		      | bit_arch_Fast_Unaligned_Copy
+-		      | bit_arch_Prefer_PMINUB_for_stringop
+-		      | bit_arch_Slow_SSE4_2);
+-	      break;
+-
+-	   /*
+-	    Default tuned Knights microarch.
+-	    case INTEL_KNIGHTS_MILL:
+-        */
+-
+-	   /*
+-	    Default tuned atom microarch.
+-	    case INTEL_ATOM_SIERRAFOREST:
+-	    case INTEL_ATOM_GRANDRIDGE:
+-	    case INTEL_ATOM_CLEARWATERFOREST:
+-	   */
+-
+-	      /* Bigcore/Default Tuning.  */
+ 	    default:
+-	    default_tuning:
+-	      /* Unknown family 0x06 processors.  Assuming this is one
+-		 of Core i3/i5/i7 processors if AVX is available.  */
+-	      if (!CPU_FEATURES_CPU_P (cpu_features, AVX))
+-		break;
+-
+-	    enable_modern_features:
+-	      /* Rep string instructions, unaligned load, unaligned copy,
+-		 and pminub are fast on Intel Core i3, i5 and i7.  */
+-	      cpu_features->preferred[index_arch_Fast_Rep_String]
+-		  |= (bit_arch_Fast_Rep_String
+-		      | bit_arch_Fast_Unaligned_Load
+-		      | bit_arch_Fast_Unaligned_Copy
+-		      | bit_arch_Prefer_PMINUB_for_stringop);
+ 	      break;
+ 
+-	    case INTEL_BIGCORE_NEHALEM:
+-	    case INTEL_BIGCORE_WESTMERE:
+-	      /* Older CPUs prefer non-temporal stores at lower threshold.  */
+-	      cpu_features->cachesize_non_temporal_divisor = 8;
+-	      goto enable_modern_features;
+-
+-	      /* Older Bigcore microarch (smaller non-temporal store
+-		 threshold).  */
+-	    case INTEL_BIGCORE_SANDYBRIDGE:
+-	    case INTEL_BIGCORE_IVYBRIDGE:
+-	    case INTEL_BIGCORE_HASWELL:
+-	    case INTEL_BIGCORE_BROADWELL:
+-	      cpu_features->cachesize_non_temporal_divisor = 8;
+-	      goto default_tuning;
+-
+-	      /* Newer Bigcore microarch (larger non-temporal store
+-		 threshold).  */
+-	    case INTEL_BIGCORE_SKYLAKE_AVX512:
+-	    case INTEL_BIGCORE_CANNONLAKE:
+-	      /* Benchmarks indicate non-temporal memset is not
+-		     necessarily profitable on SKX (and in some cases much
+-		     worse). This is likely unique to SKX due its it unique
+-		     mesh interconnect (not present on ICX or BWD). Disable
+-		     non-temporal on all Skylake servers. */
+-	      cpu_features->preferred[index_arch_Avoid_Non_Temporal_Memset]
+-		  |= bit_arch_Avoid_Non_Temporal_Memset;
+-	    case INTEL_BIGCORE_COMETLAKE:
+-	    case INTEL_BIGCORE_SKYLAKE:
+-	    case INTEL_BIGCORE_KABYLAKE:
+-	    case INTEL_BIGCORE_ICELAKE:
+-	    case INTEL_BIGCORE_TIGERLAKE:
+-	    case INTEL_BIGCORE_ROCKETLAKE:
+-	    case INTEL_BIGCORE_RAPTORLAKE:
+-	    case INTEL_BIGCORE_METEORLAKE:
+-	    case INTEL_BIGCORE_LUNARLAKE:
+-	    case INTEL_BIGCORE_ARROWLAKE:
+-	    case INTEL_BIGCORE_PANTHERLAKE:
+-	    case INTEL_BIGCORE_SAPPHIRERAPIDS:
+-	    case INTEL_BIGCORE_EMERALDRAPIDS:
+-	    case INTEL_BIGCORE_GRANITERAPIDS:
+-	      cpu_features->cachesize_non_temporal_divisor = 2;
+-	      goto default_tuning;
+-
+-	      /* Default tuned Mixed (bigcore + atom SOC). */
+-	    case INTEL_MIXED_LAKEFIELD:
+-	    case INTEL_MIXED_ALDERLAKE:
+-	      cpu_features->cachesize_non_temporal_divisor = 2;
+-	      goto default_tuning;
+-	    }
+-
+-	      /* Disable TSX on some processors to avoid TSX on kernels that
+-		 weren't updated with the latest microcode package (which
+-		 disables broken feature by default).  */
+-	  switch (microarch)
+-	    {
+ 	    case INTEL_BIGCORE_SKYLAKE_AVX512:
+ 	      /* 0x55 (Skylake-avx512) && stepping <= 5 disable TSX. */
+ 	      if (stepping <= 5)
+@@ -900,38 +786,152 @@ init_cpu_features (struct cpu_features *cpu_features)
+ 
+ 	    case INTEL_BIGCORE_KABYLAKE:
+ 	      /* NB: Although the errata documents that for model == 0x8e
+-		     (kabylake skylake client), only 0xb stepping or lower are
+-		     impacted, the intention of the errata was to disable TSX on
+-		     all client processors on all steppings.  Include 0xc
+-		     stepping which is an Intel Core i7-8665U, a client mobile
+-		     processor.  */
++		 (kabylake skylake client), only 0xb stepping or lower are
++		 impacted, the intention of the errata was to disable TSX on
++		 all client processors on all steppings.  Include 0xc
++		 stepping which is an Intel Core i7-8665U, a client mobile
++		 processor.  */
+ 	      if (stepping > 0xc)
+ 		break;
+ 	      /* Fall through.  */
+ 	    case INTEL_BIGCORE_SKYLAKE:
+-		/* Disable Intel TSX and enable RTM_ALWAYS_ABORT for
+-		   processors listed in:
+-
+-https://www.intel.com/content/www/us/en/support/articles/000059422/processors.html
+-		 */
+-	    disable_tsx:
+-		CPU_FEATURE_UNSET (cpu_features, HLE);
+-		CPU_FEATURE_UNSET (cpu_features, RTM);
+-		CPU_FEATURE_SET (cpu_features, RTM_ALWAYS_ABORT);
+-		break;
++	      /* Disable Intel TSX and enable RTM_ALWAYS_ABORT for
++		 processors listed in:
++
++		 https://www.intel.com/content/www/us/en/support/articles/000059422/processors.html
++	       */
++disable_tsx:
++	      CPU_FEATURE_UNSET (cpu_features, HLE);
++	      CPU_FEATURE_UNSET (cpu_features, RTM);
++	      CPU_FEATURE_SET (cpu_features, RTM_ALWAYS_ABORT);
++	      break;
+ 
+ 	    case INTEL_BIGCORE_HASWELL:
+-		/* Xeon E7 v3 (model == 0x3f) with stepping >= 4 has working
+-		   TSX.  Haswell also include other model numbers that have
+-		   working TSX.  */
+-		if (model == 0x3f && stepping >= 4)
++	      /* Xeon E7 v3 (model == 0x3f) with stepping >= 4 has working
++		 TSX.  Haswell also includes other model numbers that have
++		 working TSX.  */
++	      if (model == 0x3f && stepping >= 4)
+ 		break;
+ 
+-		CPU_FEATURE_UNSET (cpu_features, RTM);
+-		break;
++	      CPU_FEATURE_UNSET (cpu_features, RTM);
++	      break;
+ 	    }
+ 	}
+ 
++      switch (microarch)
++	{
++	  /* Atom / KNL tuning.  */
++	case INTEL_ATOM_BONNELL:
++	  /* BSF is slow on Bonnell.  */
++	  cpu_features->preferred[index_arch_Slow_BSF]
++	    |= bit_arch_Slow_BSF;
++	  break;
++
++	  /* Unaligned load versions are faster than SSSE3
++	     on Airmont, Silvermont, Goldmont, and Goldmont Plus.  */
++	case INTEL_ATOM_AIRMONT:
++	case INTEL_ATOM_SILVERMONT:
++	case INTEL_ATOM_GOLDMONT:
++	case INTEL_ATOM_GOLDMONT_PLUS:
++
++	  /* Knights Landing.  Enable Silvermont optimizations.  */
++	case INTEL_KNIGHTS_LANDING:
++
++	  cpu_features->preferred[index_arch_Fast_Unaligned_Load]
++	    |= (bit_arch_Fast_Unaligned_Load
++		| bit_arch_Fast_Unaligned_Copy
++		| bit_arch_Prefer_PMINUB_for_stringop
++		| bit_arch_Slow_SSE4_2);
++	  break;
++
++	case INTEL_ATOM_TREMONT:
++	  /* Enable rep string instructions, unaligned load, unaligned
++	     copy, pminub and avoid SSE 4.2 on Tremont.  */
++	  cpu_features->preferred[index_arch_Fast_Rep_String]
++	    |= (bit_arch_Fast_Rep_String
++		| bit_arch_Fast_Unaligned_Load
++		| bit_arch_Fast_Unaligned_Copy
++		| bit_arch_Prefer_PMINUB_for_stringop
++		| bit_arch_Slow_SSE4_2);
++	  break;
++
++	  /*
++	     Default tuned Knights microarch.
++	     case INTEL_KNIGHTS_MILL:
++	     */
++
++	  /*
++	     Default tuned atom microarch.
++	     case INTEL_ATOM_SIERRAFOREST:
++	     case INTEL_ATOM_GRANDRIDGE:
++	     case INTEL_ATOM_CLEARWATERFOREST:
++	     */
++
++	  /* Bigcore/Default Tuning.  */
++	default:
++	default_tuning:
++	  /* Unknown Intel processors.  Assuming this is one of Core
++	     i3/i5/i7 processors if AVX is available.  */
++	  if (!CPU_FEATURES_CPU_P (cpu_features, AVX))
++	    break;
++
++	enable_modern_features:
++	  /* Rep string instructions, unaligned load, unaligned copy,
++	     and pminub are fast on Intel Core i3, i5 and i7.  */
++	  cpu_features->preferred[index_arch_Fast_Rep_String]
++	    |= (bit_arch_Fast_Rep_String
++		| bit_arch_Fast_Unaligned_Load
++		| bit_arch_Fast_Unaligned_Copy
++		| bit_arch_Prefer_PMINUB_for_stringop);
++	  break;
++
++	case INTEL_BIGCORE_NEHALEM:
++	case INTEL_BIGCORE_WESTMERE:
++	  /* Older CPUs prefer non-temporal stores at lower threshold.  */
++	  cpu_features->cachesize_non_temporal_divisor = 8;
++	  goto enable_modern_features;
++
++	  /* Older Bigcore microarch (smaller non-temporal store
++	     threshold).  */
++	case INTEL_BIGCORE_SANDYBRIDGE:
++	case INTEL_BIGCORE_IVYBRIDGE:
++	case INTEL_BIGCORE_HASWELL:
++	case INTEL_BIGCORE_BROADWELL:
++	  cpu_features->cachesize_non_temporal_divisor = 8;
++	  goto default_tuning;
++
++	  /* Newer Bigcore microarch (larger non-temporal store
++	     threshold).  */
++	case INTEL_BIGCORE_SKYLAKE_AVX512:
++	case INTEL_BIGCORE_CANNONLAKE:
++	  /* Benchmarks indicate non-temporal memset is not
++	     necessarily profitable on SKX (and in some cases much
++	     worse). This is likely unique to SKX due to its unique
++	     mesh interconnect (not present on ICX or BWD). Disable
++	     non-temporal on all Skylake servers. */
++	  cpu_features->preferred[index_arch_Avoid_Non_Temporal_Memset]
++	    |= bit_arch_Avoid_Non_Temporal_Memset;
++	  /* fallthrough */
++	case INTEL_BIGCORE_COMETLAKE:
++	case INTEL_BIGCORE_SKYLAKE:
++	case INTEL_BIGCORE_KABYLAKE:
++	case INTEL_BIGCORE_ICELAKE:
++	case INTEL_BIGCORE_TIGERLAKE:
++	case INTEL_BIGCORE_ROCKETLAKE:
++	case INTEL_BIGCORE_RAPTORLAKE:
++	case INTEL_BIGCORE_METEORLAKE:
++	case INTEL_BIGCORE_LUNARLAKE:
++	case INTEL_BIGCORE_ARROWLAKE:
++	case INTEL_BIGCORE_PANTHERLAKE:
++	case INTEL_BIGCORE_SAPPHIRERAPIDS:
++	case INTEL_BIGCORE_EMERALDRAPIDS:
++	case INTEL_BIGCORE_GRANITERAPIDS:
++	  /* Default tuned Mixed (bigcore + atom SOC). */
++	case INTEL_MIXED_LAKEFIELD:
++	case INTEL_MIXED_ALDERLAKE:
++	  cpu_features->cachesize_non_temporal_divisor = 2;
++	  goto default_tuning;
++	}
+ 
+       /* Since AVX512ER is unique to Xeon Phi, set Prefer_No_VZEROUPPER
+          if AVX512ER is available.  Don't use AVX512 to avoid lower CPU
+
+commit d8a1a1aef7a58b991505b9a1349a40736dec3abf
+Author: H.J. Lu <hjl.tools@gmail.com>
+Date:   Sat Apr 12 08:37:29 2025 -0700
+
+    x86: Detect Intel Diamond Rapids
+    
+    Detect Intel Diamond Rapids and tune it similar to Intel Granite Rapids.
+    
+    Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
+    Reviewed-by: Sunil K Pandey <skpgkp2@gmail.com>
+    (cherry picked from commit de14f1959ee5f9b845a7cae43bee03068b8136f0)
+
+diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
+index 1a6e694abf..52a2f03bdd 100644
+--- a/sysdeps/x86/cpu-features.c
++++ b/sysdeps/x86/cpu-features.c
+@@ -542,6 +542,7 @@ enum intel_microarch
+   INTEL_BIGCORE_ARROWLAKE,
+   INTEL_BIGCORE_PANTHERLAKE,
+   INTEL_BIGCORE_GRANITERAPIDS,
++  INTEL_BIGCORE_DIAMONDRAPIDS,
+ 
+   /* Mixed (bigcore + atom SOC).  */
+   INTEL_MIXED_LAKEFIELD,
+@@ -817,6 +818,16 @@ disable_tsx:
+ 	      break;
+ 	    }
+ 	}
++      else if (family == 19)
++	switch (model)
++	  {
++	  case 0x01:
++	    microarch = INTEL_BIGCORE_DIAMONDRAPIDS;
++	    break;
++
++	  default:
++	    break;
++	  }
+ 
+       switch (microarch)
+ 	{
+@@ -926,6 +937,7 @@ disable_tsx:
+ 	case INTEL_BIGCORE_SAPPHIRERAPIDS:
+ 	case INTEL_BIGCORE_EMERALDRAPIDS:
+ 	case INTEL_BIGCORE_GRANITERAPIDS:
++	case INTEL_BIGCORE_DIAMONDRAPIDS:
+ 	  /* Default tuned Mixed (bigcore + atom SOC). */
+ 	case INTEL_MIXED_LAKEFIELD:
+ 	case INTEL_MIXED_ALDERLAKE:
+
+commit 736e6735053f12181d3d287898dd5fdb9e8baf59
+Author: Frank Barrus <frankbarrus_sw@shaggy.cc>
+Date:   Wed Dec 4 07:55:02 2024 -0500
+
+    pthreads NPTL: lost wakeup fix 2
+    
+    This fixes the lost wakeup (from a bug in signal stealing) with a change
+    in the usage of g_signals[] in the condition variable internal state.
+    It also completely eliminates the concept and handling of signal stealing,
+    as well as the need for signalers to block to wait for waiters to wake
+    up every time there is a G1/G2 switch.  This greatly reduces the average
+    and maximum latency for pthread_cond_signal.
+    
+    The g_signals[] field now contains a signal count that is relative to
+    the current g1_start value.  Since it is a 32-bit field, and the LSB is
+    still reserved (though not currently used anymore), it has a 31-bit value
+    that corresponds to the low 31 bits of the sequence number in g1_start.
+    (since g1_start also has an LSB flag, this means bits 31:1 in g_signals
+    correspond to bits 31:1 in g1_start, plus the current signal count)
+    
+    By making the signal count relative to g1_start, there is no longer
+    any ambiguity or A/B/A issue, and thus any checks before blocking,
+    including the futex call itself, are guaranteed not to block if the G1/G2
+    switch occurs, even if the signal count remains the same.  This allows
+    initially safely blocking in G2 until the switch to G1 occurs, and
+    then transitioning from G1 to a new G1 or G2, and always being able to
+    distinguish the state change.  This removes the race condition and A/B/A
+    problems that otherwise ocurred if a late (pre-empted) waiter were to
+    resume just as the futex call attempted to block on g_signal since
+    otherwise there was no last opportunity to re-check things like whether
+    the current G1 group was already closed.
+    
+    By fixing these issues, the signal stealing code can be eliminated,
+    since there is no concept of signal stealing anymore.  The code to block
+    for all waiters to exit g_refs can also be removed, since any waiters
+    that are still in the g_refs region can be guaranteed to safely wake
+    up and exit.  If there are still any left at this time, they are all
+    sent one final futex wakeup to ensure that they are not blocked any
+    longer, but there is no need for the signaller to block and wait for
+    them to wake up and exit the g_refs region.
+    
+    The signal count is then effectively "zeroed" but since it is now
+    relative to g1_start, this is done by advancing it to a new value that
+    can be observed by any pending blocking waiters.  Any late waiters can
+    always tell the difference, and can thus just cleanly exit if they are
+    in a stale G1 or G2.  They can never steal a signal from the current
+    G1 if they are not in the current G1, since the signal value that has
+    to match in the cmpxchg has the low 31 bits of the g1_start value
+    contained in it, and that's first checked, and then it won't match if
+    there's a G1/G2 change.
+    
+    Note: the 31-bit sequence number used in g_signals is designed to
+    handle wrap-around when checking the signal count, but if the entire
+    31-bit wraparound (2 billion signals) occurs while there is still a
+    late waiter that has not yet resumed, and it happens to then match
+    the current g1_start low bits, and the pre-emption occurs after the
+    normal "closed group" checks (which are 64-bit) but then hits the
+    futex syscall and signal consuming code, then an A/B/A issue could
+    still result and cause an incorrect assumption about whether it
+    should block.  This particular scenario seems unlikely in practice.
+    Note that once awake from the futex, the waiter would notice the
+    closed group before consuming the signal (since that's still a 64-bit
+    check that would not be aliased in the wrap-around in g_signals),
+    so the biggest impact would be blocking on the futex until the next
+    full wakeup from a G1/G2 switch.
+    
+    Signed-off-by: Frank Barrus <frankbarrus_sw@shaggy.cc>
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+    (cherry picked from commit 1db84775f831a1494993ce9c118deaf9537cc50a)
+
+diff --git a/nptl/pthread_cond_common.c b/nptl/pthread_cond_common.c
+index 3487557bb8..4855b8899f 100644
+--- a/nptl/pthread_cond_common.c
++++ b/nptl/pthread_cond_common.c
+@@ -201,7 +201,6 @@ static bool __attribute__ ((unused))
+ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq,
+     unsigned int *g1index, int private)
+ {
+-  const unsigned int maxspin = 0;
+   unsigned int g1 = *g1index;
+ 
+   /* If there is no waiter in G2, we don't do anything.  The expression may
+@@ -222,84 +221,46 @@ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq,
+      * New waiters arriving concurrently with the group switching will all go
+        into G2 until we atomically make the switch.  Waiters existing in G2
+        are not affected.
+-     * Waiters in G1 will be closed out immediately by setting a flag in
+-       __g_signals, which will prevent waiters from blocking using a futex on
+-       __g_signals and also notifies them that the group is closed.  As a
+-       result, they will eventually remove their group reference, allowing us
+-       to close switch group roles.  */
+-
+-  /* First, set the closed flag on __g_signals.  This tells waiters that are
+-     about to wait that they shouldn't do that anymore.  This basically
+-     serves as an advance notification of the upcoming change to __g1_start;
+-     waiters interpret it as if __g1_start was larger than their waiter
+-     sequence position.  This allows us to change __g1_start after waiting
+-     for all existing waiters with group references to leave, which in turn
+-     makes recovery after stealing a signal simpler because it then can be
+-     skipped if __g1_start indicates that the group is closed (otherwise,
+-     we would have to recover always because waiters don't know how big their
+-     groups are).  Relaxed MO is fine.  */
+-  atomic_fetch_or_relaxed (cond->__data.__g_signals + g1, 1);
+-
+-  /* Wait until there are no group references anymore.  The fetch-or operation
+-     injects us into the modification order of __g_refs; release MO ensures
+-     that waiters incrementing __g_refs after our fetch-or see the previous
+-     changes to __g_signals and to __g1_start that had to happen before we can
+-     switch this G1 and alias with an older group (we have two groups, so
+-     aliasing requires switching group roles twice).  Note that nobody else
+-     can have set the wake-request flag, so we do not have to act upon it.
+-
+-     Also note that it is harmless if older waiters or waiters from this G1
+-     get a group reference after we have quiesced the group because it will
+-     remain closed for them either because of the closed flag in __g_signals
+-     or the later update to __g1_start.  New waiters will never arrive here
+-     but instead continue to go into the still current G2.  */
+-  unsigned r = atomic_fetch_or_release (cond->__data.__g_refs + g1, 0);
+-  while ((r >> 1) > 0)
+-    {
+-      for (unsigned int spin = maxspin; ((r >> 1) > 0) && (spin > 0); spin--)
+-	{
+-	  /* TODO Back off.  */
+-	  r = atomic_load_relaxed (cond->__data.__g_refs + g1);
+-	}
+-      if ((r >> 1) > 0)
+-	{
+-	  /* There is still a waiter after spinning.  Set the wake-request
+-	     flag and block.  Relaxed MO is fine because this is just about
+-	     this futex word.
+-
+-	     Update r to include the set wake-request flag so that the upcoming
+-	     futex_wait only blocks if the flag is still set (otherwise, we'd
+-	     violate the basic client-side futex protocol).  */
+-	  r = atomic_fetch_or_relaxed (cond->__data.__g_refs + g1, 1) | 1;
+-
+-	  if ((r >> 1) > 0)
+-	    futex_wait_simple (cond->__data.__g_refs + g1, r, private);
+-	  /* Reload here so we eventually see the most recent value even if we
+-	     do not spin.   */
+-	  r = atomic_load_relaxed (cond->__data.__g_refs + g1);
+-	}
+-    }
+-  /* Acquire MO so that we synchronize with the release operation that waiters
+-     use to decrement __g_refs and thus happen after the waiters we waited
+-     for.  */
+-  atomic_thread_fence_acquire ();
++     * Waiters in G1 will be closed out immediately by the advancing of
++       __g_signals to the next "lowseq" (low 31 bits of the new g1_start),
++       which will prevent waiters from blocking using a futex on
++       __g_signals since it provides enough signals for all possible
++       remaining waiters.  As a result, they can each consume a signal
++       and they will eventually remove their group reference.  */
+ 
+   /* Update __g1_start, which finishes closing this group.  The value we add
+      will never be negative because old_orig_size can only be zero when we
+      switch groups the first time after a condvar was initialized, in which
+-     case G1 will be at index 1 and we will add a value of 1.  See above for
+-     why this takes place after waiting for quiescence of the group.
++     case G1 will be at index 1 and we will add a value of 1.
+      Relaxed MO is fine because the change comes with no additional
+      constraints that others would have to observe.  */
+   __condvar_add_g1_start_relaxed (cond,
+       (old_orig_size << 1) + (g1 == 1 ? 1 : - 1));
+ 
+-  /* Now reopen the group, thus enabling waiters to again block using the
+-     futex controlled by __g_signals.  Release MO so that observers that see
+-     no signals (and thus can block) also see the write __g1_start and thus
+-     that this is now a new group (see __pthread_cond_wait_common for the
+-     matching acquire MO loads).  */
+-  atomic_store_release (cond->__data.__g_signals + g1, 0);
++  unsigned int lowseq = ((old_g1_start + old_orig_size) << 1) & ~1U;
++
++  /* If any waiters still hold group references (and thus could be blocked),
++     then wake them all up now and prevent any running ones from blocking.
++     This is effectively a catch-all for any possible current or future
++     bugs that can allow the group size to reach 0 before all G1 waiters
++     have been awakened or at least given signals to consume, or any
++     other case that can leave blocked (or about to block) older waiters..  */
++  if ((atomic_fetch_or_release (cond->__data.__g_refs + g1, 0) >> 1) > 0)
++   {
++    /* First advance signals to the end of the group (i.e. enough signals
++       for the entire G1 group) to ensure that waiters which have not
++       yet blocked in the futex will not block.
++       Note that in the vast majority of cases, this should never
++       actually be necessary, since __g_signals will have enough
++       signals for the remaining g_refs waiters.  As an optimization,
++       we could check this first before proceeding, although that
++       could still leave the potential for futex lost wakeup bugs
++       if the signal count was non-zero but the futex wakeup
++       was somehow lost.  */
++    atomic_store_release (cond->__data.__g_signals + g1, lowseq);
++
++    futex_wake (cond->__data.__g_signals + g1, INT_MAX, private);
++   }
+ 
+   /* At this point, the old G1 is now a valid new G2 (but not in use yet).
+      No old waiter can neither grab a signal nor acquire a reference without
+@@ -311,6 +272,10 @@ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq,
+   g1 ^= 1;
+   *g1index ^= 1;
+ 
++  /* Now advance the new G1 g_signals to the new lowseq, giving it
++     an effective signal count of 0 to start.  */
++  atomic_store_release (cond->__data.__g_signals + g1, lowseq);
++
+   /* These values are just observed by signalers, and thus protected by the
+      lock.  */
+   unsigned int orig_size = wseq - (old_g1_start + old_orig_size);
+diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
+index 66786c7b90..3d290e39c8 100644
+--- a/nptl/pthread_cond_wait.c
++++ b/nptl/pthread_cond_wait.c
+@@ -238,9 +238,7 @@ __condvar_cleanup_waiting (void *arg)
+    signaled), and a reference count.
+ 
+    The group reference count is used to maintain the number of waiters that
+-   are using the group's futex.  Before a group can change its role, the
+-   reference count must show that no waiters are using the futex anymore; this
+-   prevents ABA issues on the futex word.
++   are using the group's futex.
+ 
+    To represent which intervals in the waiter sequence the groups cover (and
+    thus also which group slot contains G1 or G2), we use a 64b counter to
+@@ -300,11 +298,12 @@ __condvar_cleanup_waiting (void *arg)
+        last reference.
+      * Reference count used by waiters concurrently with signalers that have
+        acquired the condvar-internal lock.
+-   __g_signals: The number of signals that can still be consumed.
++   __g_signals: The number of signals that can still be consumed, relative to
++     the current g1_start.  (i.e. bits 31 to 1 of __g_signals are bits
++     31 to 1 of g1_start with the signal count added)
+      * Used as a futex word by waiters.  Used concurrently by waiters and
+        signalers.
+-     * LSB is true iff this group has been completely signaled (i.e., it is
+-       closed).
++     * LSB is currently reserved and 0.
+    __g_size: Waiters remaining in this group (i.e., which have not been
+      signaled yet.
+      * Accessed by signalers and waiters that cancel waiting (both do so only
+@@ -328,18 +327,6 @@ __condvar_cleanup_waiting (void *arg)
+    sufficient because if a waiter can see a sufficiently large value, it could
+    have also consume a signal in the waiters group.
+ 
+-   Waiters try to grab a signal from __g_signals without holding a reference
+-   count, which can lead to stealing a signal from a more recent group after
+-   their own group was already closed.  They cannot always detect whether they
+-   in fact did because they do not know when they stole, but they can
+-   conservatively add a signal back to the group they stole from; if they
+-   did so unnecessarily, all that happens is a spurious wake-up.  To make this
+-   even less likely, __g1_start contains the index of the current g2 too,
+-   which allows waiters to check if there aliasing on the group slots; if
+-   there wasn't, they didn't steal from the current G1, which means that the
+-   G1 they stole from must have been already closed and they do not need to
+-   fix anything.
+-
+    It is essential that the last field in pthread_cond_t is __g_signals[1]:
+    The previous condvar used a pointer-sized field in pthread_cond_t, so a
+    PTHREAD_COND_INITIALIZER from that condvar implementation might only
+@@ -435,6 +422,9 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+     {
+       while (1)
+ 	{
++          uint64_t g1_start = __condvar_load_g1_start_relaxed (cond);
++          unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
++
+ 	  /* Spin-wait first.
+ 	     Note that spinning first without checking whether a timeout
+ 	     passed might lead to what looks like a spurious wake-up even
+@@ -446,35 +436,45 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ 	     having to compare against the current time seems to be the right
+ 	     choice from a performance perspective for most use cases.  */
+ 	  unsigned int spin = maxspin;
+-	  while (signals == 0 && spin > 0)
++	  while (spin > 0 && ((int)(signals - lowseq) < 2))
+ 	    {
+ 	      /* Check that we are not spinning on a group that's already
+ 		 closed.  */
+-	      if (seq < (__condvar_load_g1_start_relaxed (cond) >> 1))
+-		goto done;
++	      if (seq < (g1_start >> 1))
++		break;
+ 
+ 	      /* TODO Back off.  */
+ 
+ 	      /* Reload signals.  See above for MO.  */
+ 	      signals = atomic_load_acquire (cond->__data.__g_signals + g);
++              g1_start = __condvar_load_g1_start_relaxed (cond);
++              lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
+ 	      spin--;
+ 	    }
+ 
+-	  /* If our group will be closed as indicated by the flag on signals,
+-	     don't bother grabbing a signal.  */
+-	  if (signals & 1)
+-	    goto done;
+-
+-	  /* If there is an available signal, don't block.  */
+-	  if (signals != 0)
++          if (seq < (g1_start >> 1))
++	    {
++              /* If the group is closed already,
++	         then this waiter originally had enough extra signals to
++	         consume, up until the time its group was closed.  */
++	       goto done;
++            }
++
++	  /* If there is an available signal, don't block.
++             If __g1_start has advanced at all, then we must be in G1
++	     by now, perhaps in the process of switching back to an older
++	     G2, but in either case we're allowed to consume the available
++	     signal and should not block anymore.  */
++	  if ((int)(signals - lowseq) >= 2)
+ 	    break;
+ 
+ 	  /* No signals available after spinning, so prepare to block.
+ 	     We first acquire a group reference and use acquire MO for that so
+ 	     that we synchronize with the dummy read-modify-write in
+ 	     __condvar_quiesce_and_switch_g1 if we read from that.  In turn,
+-	     in this case this will make us see the closed flag on __g_signals
+-	     that designates a concurrent attempt to reuse the group's slot.
++	     in this case this will make us see the advancement of __g_signals
++	     to the upcoming new g1_start that occurs with a concurrent
++	     attempt to reuse the group's slot.
+ 	     We use acquire MO for the __g_signals check to make the
+ 	     __g1_start check work (see spinning above).
+ 	     Note that the group reference acquisition will not mask the
+@@ -482,15 +482,24 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ 	     an atomic read-modify-write operation and thus extend the release
+ 	     sequence.  */
+ 	  atomic_fetch_add_acquire (cond->__data.__g_refs + g, 2);
+-	  if (((atomic_load_acquire (cond->__data.__g_signals + g) & 1) != 0)
+-	      || (seq < (__condvar_load_g1_start_relaxed (cond) >> 1)))
++	  signals = atomic_load_acquire (cond->__data.__g_signals + g);
++          g1_start = __condvar_load_g1_start_relaxed (cond);
++          lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
++
++          if (seq < (g1_start >> 1))
+ 	    {
+-	      /* Our group is closed.  Wake up any signalers that might be
+-		 waiting.  */
++              /* group is closed already, so don't block */
+ 	      __condvar_dec_grefs (cond, g, private);
+ 	      goto done;
+ 	    }
+ 
++	  if ((int)(signals - lowseq) >= 2)
++	    {
++	      /* a signal showed up or G1/G2 switched after we grabbed the refcount */
++	      __condvar_dec_grefs (cond, g, private);
++	      break;
++            }
++
+ 	  // Now block.
+ 	  struct _pthread_cleanup_buffer buffer;
+ 	  struct _condvar_cleanup_buffer cbuffer;
+@@ -501,7 +510,7 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ 	  __pthread_cleanup_push (&buffer, __condvar_cleanup_waiting, &cbuffer);
+ 
+ 	  err = __futex_abstimed_wait_cancelable64 (
+-	    cond->__data.__g_signals + g, 0, clockid, abstime, private);
++	    cond->__data.__g_signals + g, signals, clockid, abstime, private);
+ 
+ 	  __pthread_cleanup_pop (&buffer, 0);
+ 
+@@ -524,6 +533,8 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ 	  signals = atomic_load_acquire (cond->__data.__g_signals + g);
+ 	}
+ 
++       if (seq < (__condvar_load_g1_start_relaxed (cond) >> 1))
++	 goto done;
+     }
+   /* Try to grab a signal.  Use acquire MO so that we see an up-to-date value
+      of __g1_start below (see spinning above for a similar case).  In
+@@ -532,69 +543,6 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+   while (!atomic_compare_exchange_weak_acquire (cond->__data.__g_signals + g,
+ 						&signals, signals - 2));
+ 
+-  /* We consumed a signal but we could have consumed from a more recent group
+-     that aliased with ours due to being in the same group slot.  If this
+-     might be the case our group must be closed as visible through
+-     __g1_start.  */
+-  uint64_t g1_start = __condvar_load_g1_start_relaxed (cond);
+-  if (seq < (g1_start >> 1))
+-    {
+-      /* We potentially stole a signal from a more recent group but we do not
+-	 know which group we really consumed from.
+-	 We do not care about groups older than current G1 because they are
+-	 closed; we could have stolen from these, but then we just add a
+-	 spurious wake-up for the current groups.
+-	 We will never steal a signal from current G2 that was really intended
+-	 for G2 because G2 never receives signals (until it becomes G1).  We
+-	 could have stolen a signal from G2 that was conservatively added by a
+-	 previous waiter that also thought it stole a signal -- but given that
+-	 that signal was added unnecessarily, it's not a problem if we steal
+-	 it.
+-	 Thus, the remaining case is that we could have stolen from the current
+-	 G1, where "current" means the __g1_start value we observed.  However,
+-	 if the current G1 does not have the same slot index as we do, we did
+-	 not steal from it and do not need to undo that.  This is the reason
+-	 for putting a bit with G2's index into__g1_start as well.  */
+-      if (((g1_start & 1) ^ 1) == g)
+-	{
+-	  /* We have to conservatively undo our potential mistake of stealing
+-	     a signal.  We can stop trying to do that when the current G1
+-	     changes because other spinning waiters will notice this too and
+-	     __condvar_quiesce_and_switch_g1 has checked that there are no
+-	     futex waiters anymore before switching G1.
+-	     Relaxed MO is fine for the __g1_start load because we need to
+-	     merely be able to observe this fact and not have to observe
+-	     something else as well.
+-	     ??? Would it help to spin for a little while to see whether the
+-	     current G1 gets closed?  This might be worthwhile if the group is
+-	     small or close to being closed.  */
+-	  unsigned int s = atomic_load_relaxed (cond->__data.__g_signals + g);
+-	  while (__condvar_load_g1_start_relaxed (cond) == g1_start)
+-	    {
+-	      /* Try to add a signal.  We don't need to acquire the lock
+-		 because at worst we can cause a spurious wake-up.  If the
+-		 group is in the process of being closed (LSB is true), this
+-		 has an effect similar to us adding a signal.  */
+-	      if (((s & 1) != 0)
+-		  || atomic_compare_exchange_weak_relaxed
+-		       (cond->__data.__g_signals + g, &s, s + 2))
+-		{
+-		  /* If we added a signal, we also need to add a wake-up on
+-		     the futex.  We also need to do that if we skipped adding
+-		     a signal because the group is being closed because
+-		     while __condvar_quiesce_and_switch_g1 could have closed
+-		     the group, it might still be waiting for futex waiters to
+-		     leave (and one of those waiters might be the one we stole
+-		     the signal from, which cause it to block using the
+-		     futex).  */
+-		  futex_wake (cond->__data.__g_signals + g, 1, private);
+-		  break;
+-		}
+-	      /* TODO Back off.  */
+-	    }
+-	}
+-    }
+-
+  done:
+ 
+   /* Confirm that we have been woken.  We do that before acquiring the mutex
+
+commit 88d999d840e77c9917f08870094a23ce42294848
+Author: Malte Skarupke <malteskarupke@fastmail.fm>
+Date:   Wed Dec 4 07:55:22 2024 -0500
+
+    nptl: Update comments and indentation for new condvar implementation
+    
+    Some comments were wrong after the most recent commit. This fixes that.
+    
+    Also fixing indentation where it was using spaces instead of tabs.
+    
+    Signed-off-by: Malte Skarupke <malteskarupke@fastmail.fm>
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+    (cherry picked from commit 0cc973160c23bb67f895bc887dd6942d29f8fee3)
+
+diff --git a/nptl/pthread_cond_common.c b/nptl/pthread_cond_common.c
+index 4855b8899f..3475d15123 100644
+--- a/nptl/pthread_cond_common.c
++++ b/nptl/pthread_cond_common.c
+@@ -221,8 +221,9 @@ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq,
+      * New waiters arriving concurrently with the group switching will all go
+        into G2 until we atomically make the switch.  Waiters existing in G2
+        are not affected.
+-     * Waiters in G1 will be closed out immediately by the advancing of
+-       __g_signals to the next "lowseq" (low 31 bits of the new g1_start),
++     * Waiters in G1 have already received a signal and been woken. If they
++       haven't woken yet, they will be closed out immediately by the advancing
++       of __g_signals to the next "lowseq" (low 31 bits of the new g1_start),
+        which will prevent waiters from blocking using a futex on
+        __g_signals since it provides enough signals for all possible
+        remaining waiters.  As a result, they can each consume a signal
+diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
+index 3d290e39c8..ad2cee7d59 100644
+--- a/nptl/pthread_cond_wait.c
++++ b/nptl/pthread_cond_wait.c
+@@ -249,7 +249,7 @@ __condvar_cleanup_waiting (void *arg)
+    figure out whether they are in a group that has already been completely
+    signaled (i.e., if the current G1 starts at a later position that the
+    waiter's position).  Waiters cannot determine whether they are currently
+-   in G2 or G1 -- but they do not have too because all they are interested in
++   in G2 or G1 -- but they do not have to because all they are interested in
+    is whether there are available signals, and they always start in G2 (whose
+    group slot they know because of the bit in the waiter sequence.  Signalers
+    will simply fill the right group until it is completely signaled and can
+@@ -412,7 +412,7 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+     }
+ 
+   /* Now wait until a signal is available in our group or it is closed.
+-     Acquire MO so that if we observe a value of zero written after group
++     Acquire MO so that if we observe (signals == lowseq) after group
+      switching in __condvar_quiesce_and_switch_g1, we synchronize with that
+      store and will see the prior update of __g1_start done while switching
+      groups too.  */
+@@ -422,8 +422,8 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+     {
+       while (1)
+ 	{
+-          uint64_t g1_start = __condvar_load_g1_start_relaxed (cond);
+-          unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
++	  uint64_t g1_start = __condvar_load_g1_start_relaxed (cond);
++	  unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
+ 
+ 	  /* Spin-wait first.
+ 	     Note that spinning first without checking whether a timeout
+@@ -447,21 +447,21 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ 
+ 	      /* Reload signals.  See above for MO.  */
+ 	      signals = atomic_load_acquire (cond->__data.__g_signals + g);
+-              g1_start = __condvar_load_g1_start_relaxed (cond);
+-              lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
++	      g1_start = __condvar_load_g1_start_relaxed (cond);
++	      lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
+ 	      spin--;
+ 	    }
+ 
+-          if (seq < (g1_start >> 1))
++	  if (seq < (g1_start >> 1))
+ 	    {
+-              /* If the group is closed already,
++	      /* If the group is closed already,
+ 	         then this waiter originally had enough extra signals to
+ 	         consume, up until the time its group was closed.  */
+ 	       goto done;
+-            }
++	    }
+ 
+ 	  /* If there is an available signal, don't block.
+-             If __g1_start has advanced at all, then we must be in G1
++	     If __g1_start has advanced at all, then we must be in G1
+ 	     by now, perhaps in the process of switching back to an older
+ 	     G2, but in either case we're allowed to consume the available
+ 	     signal and should not block anymore.  */
+@@ -483,22 +483,23 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ 	     sequence.  */
+ 	  atomic_fetch_add_acquire (cond->__data.__g_refs + g, 2);
+ 	  signals = atomic_load_acquire (cond->__data.__g_signals + g);
+-          g1_start = __condvar_load_g1_start_relaxed (cond);
+-          lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
++	  g1_start = __condvar_load_g1_start_relaxed (cond);
++	  lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
+ 
+-          if (seq < (g1_start >> 1))
++	  if (seq < (g1_start >> 1))
+ 	    {
+-              /* group is closed already, so don't block */
++	      /* group is closed already, so don't block */
+ 	      __condvar_dec_grefs (cond, g, private);
+ 	      goto done;
+ 	    }
+ 
+ 	  if ((int)(signals - lowseq) >= 2)
+ 	    {
+-	      /* a signal showed up or G1/G2 switched after we grabbed the refcount */
++	      /* a signal showed up or G1/G2 switched after we grabbed the
++	         refcount */
+ 	      __condvar_dec_grefs (cond, g, private);
+ 	      break;
+-            }
++	    }
+ 
+ 	  // Now block.
+ 	  struct _pthread_cleanup_buffer buffer;
+@@ -536,10 +537,8 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+        if (seq < (__condvar_load_g1_start_relaxed (cond) >> 1))
+ 	 goto done;
+     }
+-  /* Try to grab a signal.  Use acquire MO so that we see an up-to-date value
+-     of __g1_start below (see spinning above for a similar case).  In
+-     particular, if we steal from a more recent group, we will also see a
+-     more recent __g1_start below.  */
++  /* Try to grab a signal.  See above for MO.  (if we do another loop
++     iteration we need to see the correct value of g1_start)  */
+   while (!atomic_compare_exchange_weak_acquire (cond->__data.__g_signals + g,
+ 						&signals, signals - 2));
+ 
+
+commit 136a29f9d0a3924828d5a16be82d054637517c95
+Author: Malte Skarupke <malteskarupke@fastmail.fm>
+Date:   Wed Dec 4 07:55:50 2024 -0500
+
+    nptl: Remove unnecessary catch-all-wake in condvar group switch
+    
+    This wake is unnecessary. We only switch groups after every sleeper in a group
+    has been woken. Sure, they may take a while to actually wake up and may still
+    hold a reference, but waking them a second time doesn't speed that up. Instead
+    this just makes the code more complicated and may hide problems.
+    
+    In particular this safety wake wouldn't even have helped with the bug that was
+    fixed by Barrus' patch: The bug there was that pthread_cond_signal would not
+    switch g1 when it should, so we wouldn't even have entered this code path.
+    
+    Signed-off-by: Malte Skarupke <malteskarupke@fastmail.fm>
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+    (cherry picked from commit b42cc6af11062c260c7dfa91f1c89891366fed3e)
+
+diff --git a/nptl/pthread_cond_common.c b/nptl/pthread_cond_common.c
+index 3475d15123..30b8eee149 100644
+--- a/nptl/pthread_cond_common.c
++++ b/nptl/pthread_cond_common.c
+@@ -221,13 +221,7 @@ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq,
+      * New waiters arriving concurrently with the group switching will all go
+        into G2 until we atomically make the switch.  Waiters existing in G2
+        are not affected.
+-     * Waiters in G1 have already received a signal and been woken. If they
+-       haven't woken yet, they will be closed out immediately by the advancing
+-       of __g_signals to the next "lowseq" (low 31 bits of the new g1_start),
+-       which will prevent waiters from blocking using a futex on
+-       __g_signals since it provides enough signals for all possible
+-       remaining waiters.  As a result, they can each consume a signal
+-       and they will eventually remove their group reference.  */
++     * Waiters in G1 have already received a signal and been woken.  */
+ 
+   /* Update __g1_start, which finishes closing this group.  The value we add
+      will never be negative because old_orig_size can only be zero when we
+@@ -240,29 +234,6 @@ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq,
+ 
+   unsigned int lowseq = ((old_g1_start + old_orig_size) << 1) & ~1U;
+ 
+-  /* If any waiters still hold group references (and thus could be blocked),
+-     then wake them all up now and prevent any running ones from blocking.
+-     This is effectively a catch-all for any possible current or future
+-     bugs that can allow the group size to reach 0 before all G1 waiters
+-     have been awakened or at least given signals to consume, or any
+-     other case that can leave blocked (or about to block) older waiters..  */
+-  if ((atomic_fetch_or_release (cond->__data.__g_refs + g1, 0) >> 1) > 0)
+-   {
+-    /* First advance signals to the end of the group (i.e. enough signals
+-       for the entire G1 group) to ensure that waiters which have not
+-       yet blocked in the futex will not block.
+-       Note that in the vast majority of cases, this should never
+-       actually be necessary, since __g_signals will have enough
+-       signals for the remaining g_refs waiters.  As an optimization,
+-       we could check this first before proceeding, although that
+-       could still leave the potential for futex lost wakeup bugs
+-       if the signal count was non-zero but the futex wakeup
+-       was somehow lost.  */
+-    atomic_store_release (cond->__data.__g_signals + g1, lowseq);
+-
+-    futex_wake (cond->__data.__g_signals + g1, INT_MAX, private);
+-   }
+-
+   /* At this point, the old G1 is now a valid new G2 (but not in use yet).
+      No old waiter can neither grab a signal nor acquire a reference without
+      noticing that __g1_start is larger.
+
+commit 2a259b6d77dc5bdab5c8f4ee0e69572d5699d4bf
+Author: Malte Skarupke <malteskarupke@fastmail.fm>
+Date:   Wed Dec 4 07:56:13 2024 -0500
+
+    nptl: Remove unnecessary quadruple check in pthread_cond_wait
+    
+    pthread_cond_wait was checking whether it was in a closed group no less than
+    four times. Checking once is enough. Here are the four checks:
+    
+    1. While spin-waiting. This was dead code: maxspin is set to 0 and has been
+       for years.
+    2. Before deciding to go to sleep, and before incrementing grefs: I kept this
+    3. After incrementing grefs. There is no reason to think that the group would
+       close while we do an atomic increment. Obviously it could close at any
+       point, but that doesn't mean we have to recheck after every step. This
+       check was equally good as check 2, except it has to do more work.
+    4. When we find ourselves in a group that has a signal. We only get here after
+       we check that we're not in a closed group. There is no need to check again.
+       The check would only have helped in cases where the compare_exchange in the
+       next line would also have failed. Relying on the compare_exchange is fine.
+    
+    Removing the duplicate checks clarifies the code.
+    
+    Signed-off-by: Malte Skarupke <malteskarupke@fastmail.fm>
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+    (cherry picked from commit 4f7b051f8ee3feff1b53b27a906f245afaa9cee1)
+
+diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
+index ad2cee7d59..cfdd13bb87 100644
+--- a/nptl/pthread_cond_wait.c
++++ b/nptl/pthread_cond_wait.c
+@@ -366,7 +366,6 @@ static __always_inline int
+ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+     clockid_t clockid, const struct __timespec64 *abstime)
+ {
+-  const int maxspin = 0;
+   int err;
+   int result = 0;
+ 
+@@ -425,33 +424,6 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ 	  uint64_t g1_start = __condvar_load_g1_start_relaxed (cond);
+ 	  unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
+ 
+-	  /* Spin-wait first.
+-	     Note that spinning first without checking whether a timeout
+-	     passed might lead to what looks like a spurious wake-up even
+-	     though we should return ETIMEDOUT (e.g., if the caller provides
+-	     an absolute timeout that is clearly in the past).  However,
+-	     (1) spurious wake-ups are allowed, (2) it seems unlikely that a
+-	     user will (ab)use pthread_cond_wait as a check for whether a
+-	     point in time is in the past, and (3) spinning first without
+-	     having to compare against the current time seems to be the right
+-	     choice from a performance perspective for most use cases.  */
+-	  unsigned int spin = maxspin;
+-	  while (spin > 0 && ((int)(signals - lowseq) < 2))
+-	    {
+-	      /* Check that we are not spinning on a group that's already
+-		 closed.  */
+-	      if (seq < (g1_start >> 1))
+-		break;
+-
+-	      /* TODO Back off.  */
+-
+-	      /* Reload signals.  See above for MO.  */
+-	      signals = atomic_load_acquire (cond->__data.__g_signals + g);
+-	      g1_start = __condvar_load_g1_start_relaxed (cond);
+-	      lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
+-	      spin--;
+-	    }
+-
+ 	  if (seq < (g1_start >> 1))
+ 	    {
+ 	      /* If the group is closed already,
+@@ -482,24 +454,6 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ 	     an atomic read-modify-write operation and thus extend the release
+ 	     sequence.  */
+ 	  atomic_fetch_add_acquire (cond->__data.__g_refs + g, 2);
+-	  signals = atomic_load_acquire (cond->__data.__g_signals + g);
+-	  g1_start = __condvar_load_g1_start_relaxed (cond);
+-	  lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
+-
+-	  if (seq < (g1_start >> 1))
+-	    {
+-	      /* group is closed already, so don't block */
+-	      __condvar_dec_grefs (cond, g, private);
+-	      goto done;
+-	    }
+-
+-	  if ((int)(signals - lowseq) >= 2)
+-	    {
+-	      /* a signal showed up or G1/G2 switched after we grabbed the
+-	         refcount */
+-	      __condvar_dec_grefs (cond, g, private);
+-	      break;
+-	    }
+ 
+ 	  // Now block.
+ 	  struct _pthread_cleanup_buffer buffer;
+@@ -533,9 +487,6 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ 	  /* Reload signals.  See above for MO.  */
+ 	  signals = atomic_load_acquire (cond->__data.__g_signals + g);
+ 	}
+-
+-       if (seq < (__condvar_load_g1_start_relaxed (cond) >> 1))
+-	 goto done;
+     }
+   /* Try to grab a signal.  See above for MO.  (if we do another loop
+      iteration we need to see the correct value of g1_start)  */
+
+commit a2465f4293ecc37ac4650fbd02e517bc6fd801c6
+Author: Malte Skarupke <malteskarupke@fastmail.fm>
+Date:   Wed Dec 4 07:56:38 2024 -0500
+
+    nptl: Remove g_refs from condition variables
+    
+    This variable used to be needed to wait in group switching until all sleepers
+    have confirmed that they have woken. This is no longer needed. Nothing waits
+    on this variable so there is no need to track how many threads are currently
+    asleep in each group.
+    
+    Signed-off-by: Malte Skarupke <malteskarupke@fastmail.fm>
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+    (cherry picked from commit c36fc50781995e6758cae2b6927839d0157f213c)
+
+diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
+index cfdd13bb87..411fc0380b 100644
+--- a/nptl/pthread_cond_wait.c
++++ b/nptl/pthread_cond_wait.c
+@@ -143,23 +143,6 @@ __condvar_cancel_waiting (pthread_cond_t *cond, uint64_t seq, unsigned int g,
+     }
+ }
+ 
+-/* Wake up any signalers that might be waiting.  */
+-static void
+-__condvar_dec_grefs (pthread_cond_t *cond, unsigned int g, int private)
+-{
+-  /* Release MO to synchronize-with the acquire load in
+-     __condvar_quiesce_and_switch_g1.  */
+-  if (atomic_fetch_add_release (cond->__data.__g_refs + g, -2) == 3)
+-    {
+-      /* Clear the wake-up request flag before waking up.  We do not need more
+-	 than relaxed MO and it doesn't matter if we apply this for an aliased
+-	 group because we wake all futex waiters right after clearing the
+-	 flag.  */
+-      atomic_fetch_and_relaxed (cond->__data.__g_refs + g, ~(unsigned int) 1);
+-      futex_wake (cond->__data.__g_refs + g, INT_MAX, private);
+-    }
+-}
+-
+ /* Clean-up for cancellation of waiters waiting for normal signals.  We cancel
+    our registration as a waiter, confirm we have woken up, and re-acquire the
+    mutex.  */
+@@ -171,8 +154,6 @@ __condvar_cleanup_waiting (void *arg)
+   pthread_cond_t *cond = cbuffer->cond;
+   unsigned g = cbuffer->wseq & 1;
+ 
+-  __condvar_dec_grefs (cond, g, cbuffer->private);
+-
+   __condvar_cancel_waiting (cond, cbuffer->wseq >> 1, g, cbuffer->private);
+   /* FIXME With the current cancellation implementation, it is possible that
+      a thread is cancelled after it has returned from a syscall.  This could
+@@ -327,15 +308,6 @@ __condvar_cleanup_waiting (void *arg)
+    sufficient because if a waiter can see a sufficiently large value, it could
+    have also consume a signal in the waiters group.
+ 
+-   It is essential that the last field in pthread_cond_t is __g_signals[1]:
+-   The previous condvar used a pointer-sized field in pthread_cond_t, so a
+-   PTHREAD_COND_INITIALIZER from that condvar implementation might only
+-   initialize 4 bytes to zero instead of the 8 bytes we need (i.e., 44 bytes
+-   in total instead of the 48 we need).  __g_signals[1] is not accessed before
+-   the first group switch (G2 starts at index 0), which will set its value to
+-   zero after a harmless fetch-or whose return value is ignored.  This
+-   effectively completes initialization.
+-
+ 
+    Limitations:
+    * This condvar isn't designed to allow for more than
+@@ -440,21 +412,6 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ 	  if ((int)(signals - lowseq) >= 2)
+ 	    break;
+ 
+-	  /* No signals available after spinning, so prepare to block.
+-	     We first acquire a group reference and use acquire MO for that so
+-	     that we synchronize with the dummy read-modify-write in
+-	     __condvar_quiesce_and_switch_g1 if we read from that.  In turn,
+-	     in this case this will make us see the advancement of __g_signals
+-	     to the upcoming new g1_start that occurs with a concurrent
+-	     attempt to reuse the group's slot.
+-	     We use acquire MO for the __g_signals check to make the
+-	     __g1_start check work (see spinning above).
+-	     Note that the group reference acquisition will not mask the
+-	     release MO when decrementing the reference count because we use
+-	     an atomic read-modify-write operation and thus extend the release
+-	     sequence.  */
+-	  atomic_fetch_add_acquire (cond->__data.__g_refs + g, 2);
+-
+ 	  // Now block.
+ 	  struct _pthread_cleanup_buffer buffer;
+ 	  struct _condvar_cleanup_buffer cbuffer;
+@@ -471,18 +428,11 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ 
+ 	  if (__glibc_unlikely (err == ETIMEDOUT || err == EOVERFLOW))
+ 	    {
+-	      __condvar_dec_grefs (cond, g, private);
+-	      /* If we timed out, we effectively cancel waiting.  Note that
+-		 we have decremented __g_refs before cancellation, so that a
+-		 deadlock between waiting for quiescence of our group in
+-		 __condvar_quiesce_and_switch_g1 and us trying to acquire
+-		 the lock during cancellation is not possible.  */
++	      /* If we timed out, we effectively cancel waiting.  */
+ 	      __condvar_cancel_waiting (cond, seq, g, private);
+ 	      result = err;
+ 	      goto done;
+ 	    }
+-	  else
+-	    __condvar_dec_grefs (cond, g, private);
+ 
+ 	  /* Reload signals.  See above for MO.  */
+ 	  signals = atomic_load_acquire (cond->__data.__g_signals + g);
+diff --git a/nptl/tst-cond22.c b/nptl/tst-cond22.c
+index 1336e9c79d..bdcb45c536 100644
+--- a/nptl/tst-cond22.c
++++ b/nptl/tst-cond22.c
+@@ -106,13 +106,13 @@ do_test (void)
+       status = 1;
+     }
+ 
+-  printf ("cond = { 0x%x:%x, 0x%x:%x, %u/%u/%u, %u/%u/%u, %u, %u }\n",
++  printf ("cond = { 0x%x:%x, 0x%x:%x, %u/%u, %u/%u, %u, %u }\n",
+ 	  c.__data.__wseq.__value32.__high,
+ 	  c.__data.__wseq.__value32.__low,
+ 	  c.__data.__g1_start.__value32.__high,
+ 	  c.__data.__g1_start.__value32.__low,
+-	  c.__data.__g_signals[0], c.__data.__g_refs[0], c.__data.__g_size[0],
+-	  c.__data.__g_signals[1], c.__data.__g_refs[1], c.__data.__g_size[1],
++	  c.__data.__g_signals[0], c.__data.__g_size[0],
++	  c.__data.__g_signals[1], c.__data.__g_size[1],
+ 	  c.__data.__g1_orig_size, c.__data.__wrefs);
+ 
+   if (pthread_create (&th, NULL, tf, (void *) 1l) != 0)
+@@ -152,13 +152,13 @@ do_test (void)
+       status = 1;
+     }
+ 
+-  printf ("cond = { 0x%x:%x, 0x%x:%x, %u/%u/%u, %u/%u/%u, %u, %u }\n",
++  printf ("cond = { 0x%x:%x, 0x%x:%x, %u/%u, %u/%u, %u, %u }\n",
+ 	  c.__data.__wseq.__value32.__high,
+ 	  c.__data.__wseq.__value32.__low,
+ 	  c.__data.__g1_start.__value32.__high,
+ 	  c.__data.__g1_start.__value32.__low,
+-	  c.__data.__g_signals[0], c.__data.__g_refs[0], c.__data.__g_size[0],
+-	  c.__data.__g_signals[1], c.__data.__g_refs[1], c.__data.__g_size[1],
++	  c.__data.__g_signals[0], c.__data.__g_size[0],
++	  c.__data.__g_signals[1], c.__data.__g_size[1],
+ 	  c.__data.__g1_orig_size, c.__data.__wrefs);
+ 
+   return status;
+diff --git a/sysdeps/nptl/bits/thread-shared-types.h b/sysdeps/nptl/bits/thread-shared-types.h
+index df54eef6f7..a3d482f80f 100644
+--- a/sysdeps/nptl/bits/thread-shared-types.h
++++ b/sysdeps/nptl/bits/thread-shared-types.h
+@@ -95,8 +95,7 @@ struct __pthread_cond_s
+ {
+   __atomic_wide_counter __wseq;
+   __atomic_wide_counter __g1_start;
+-  unsigned int __g_refs[2] __LOCK_ALIGNMENT;
+-  unsigned int __g_size[2];
++  unsigned int __g_size[2] __LOCK_ALIGNMENT;
+   unsigned int __g1_orig_size;
+   unsigned int __wrefs;
+   unsigned int __g_signals[2];
+diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h
+index 3d4f4a756c..9af75d6eae 100644
+--- a/sysdeps/nptl/pthread.h
++++ b/sysdeps/nptl/pthread.h
+@@ -152,7 +152,7 @@ enum
+ 
+ 
+ /* Conditional variable handling.  */
+-#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, {0, 0}, 0, 0, {0, 0} } }
++#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, 0, 0, {0, 0} } }
+ 
+ 
+ /* Cleanup buffers */
+
+commit fa110993a6390ae5c97dff613ef02b59ec78c5da
+Author: Malte Skarupke <malteskarupke@fastmail.fm>
+Date:   Wed Dec 4 08:03:44 2024 -0500
+
+    nptl: Use a single loop in pthread_cond_wait instaed of a nested loop
+    
+    The loop was a little more complicated than necessary. There was only one
+    break statement out of the inner loop, and the outer loop was nearly empty.
+    So just remove the outer loop, moving its code to the one break statement in
+    the inner loop. This allows us to replace all gotos with break statements.
+    
+    Signed-off-by: Malte Skarupke <malteskarupke@fastmail.fm>
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+    (cherry picked from commit 929a4764ac90382616b6a21f099192b2475da674)
+
+diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
+index 411fc0380b..683cb2b133 100644
+--- a/nptl/pthread_cond_wait.c
++++ b/nptl/pthread_cond_wait.c
+@@ -382,17 +382,15 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+       return err;
+     }
+ 
+-  /* Now wait until a signal is available in our group or it is closed.
+-     Acquire MO so that if we observe (signals == lowseq) after group
+-     switching in __condvar_quiesce_and_switch_g1, we synchronize with that
+-     store and will see the prior update of __g1_start done while switching
+-     groups too.  */
+-  unsigned int signals = atomic_load_acquire (cond->__data.__g_signals + g);
+-
+-  do
+-    {
++
+       while (1)
+ 	{
++	  /* Now wait until a signal is available in our group or it is closed.
++	     Acquire MO so that if we observe (signals == lowseq) after group
++	     switching in __condvar_quiesce_and_switch_g1, we synchronize with that
++	     store and will see the prior update of __g1_start done while switching
++	     groups too.  */
++	  unsigned int signals = atomic_load_acquire (cond->__data.__g_signals + g);
+ 	  uint64_t g1_start = __condvar_load_g1_start_relaxed (cond);
+ 	  unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
+ 
+@@ -401,7 +399,7 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ 	      /* If the group is closed already,
+ 	         then this waiter originally had enough extra signals to
+ 	         consume, up until the time its group was closed.  */
+-	       goto done;
++	       break;
+ 	    }
+ 
+ 	  /* If there is an available signal, don't block.
+@@ -410,7 +408,16 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ 	     G2, but in either case we're allowed to consume the available
+ 	     signal and should not block anymore.  */
+ 	  if ((int)(signals - lowseq) >= 2)
+-	    break;
++	    {
++	      /* Try to grab a signal.  See above for MO.  (if we do another loop
++		 iteration we need to see the correct value of g1_start)  */
++		      if (atomic_compare_exchange_weak_acquire (
++		      		cond->__data.__g_signals + g,
++			&signals, signals - 2))
++		      	break;
++		      else
++		      	continue;
++	    }
+ 
+ 	  // Now block.
+ 	  struct _pthread_cleanup_buffer buffer;
+@@ -431,19 +438,9 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ 	      /* If we timed out, we effectively cancel waiting.  */
+ 	      __condvar_cancel_waiting (cond, seq, g, private);
+ 	      result = err;
+-	      goto done;
++	      break;
+ 	    }
+-
+-	  /* Reload signals.  See above for MO.  */
+-	  signals = atomic_load_acquire (cond->__data.__g_signals + g);
+ 	}
+-    }
+-  /* Try to grab a signal.  See above for MO.  (if we do another loop
+-     iteration we need to see the correct value of g1_start)  */
+-  while (!atomic_compare_exchange_weak_acquire (cond->__data.__g_signals + g,
+-						&signals, signals - 2));
+-
+- done:
+ 
+   /* Confirm that we have been woken.  We do that before acquiring the mutex
+      to allow for execution of pthread_cond_destroy while having acquired the
+
+commit afbf0d46850dcd1b626d892ad8fde2162067ddc7
+Author: Malte Skarupke <malteskarupke@fastmail.fm>
+Date:   Wed Dec 4 08:04:10 2024 -0500
+
+    nptl: Fix indentation
+    
+    In my previous change I turned a nested loop into a simple loop. I'm doing
+    the resulting indentation changes in a separate commit to make the diff on
+    the previous commit easier to review.
+    
+    Signed-off-by: Malte Skarupke <malteskarupke@fastmail.fm>
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+    (cherry picked from commit ee6c14ed59d480720721aaacc5fb03213dc153da)
+
+diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
+index 683cb2b133..7fc9dadf15 100644
+--- a/nptl/pthread_cond_wait.c
++++ b/nptl/pthread_cond_wait.c
+@@ -383,65 +383,65 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+     }
+ 
+ 
+-      while (1)
+-	{
+-	  /* Now wait until a signal is available in our group or it is closed.
+-	     Acquire MO so that if we observe (signals == lowseq) after group
+-	     switching in __condvar_quiesce_and_switch_g1, we synchronize with that
+-	     store and will see the prior update of __g1_start done while switching
+-	     groups too.  */
+-	  unsigned int signals = atomic_load_acquire (cond->__data.__g_signals + g);
+-	  uint64_t g1_start = __condvar_load_g1_start_relaxed (cond);
+-	  unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
+-
+-	  if (seq < (g1_start >> 1))
+-	    {
+-	      /* If the group is closed already,
+-	         then this waiter originally had enough extra signals to
+-	         consume, up until the time its group was closed.  */
+-	       break;
+-	    }
+-
+-	  /* If there is an available signal, don't block.
+-	     If __g1_start has advanced at all, then we must be in G1
+-	     by now, perhaps in the process of switching back to an older
+-	     G2, but in either case we're allowed to consume the available
+-	     signal and should not block anymore.  */
+-	  if ((int)(signals - lowseq) >= 2)
+-	    {
+-	      /* Try to grab a signal.  See above for MO.  (if we do another loop
+-		 iteration we need to see the correct value of g1_start)  */
+-		      if (atomic_compare_exchange_weak_acquire (
+-		      		cond->__data.__g_signals + g,
++  while (1)
++    {
++      /* Now wait until a signal is available in our group or it is closed.
++         Acquire MO so that if we observe (signals == lowseq) after group
++         switching in __condvar_quiesce_and_switch_g1, we synchronize with that
++         store and will see the prior update of __g1_start done while switching
++         groups too.  */
++      unsigned int signals = atomic_load_acquire (cond->__data.__g_signals + g);
++      uint64_t g1_start = __condvar_load_g1_start_relaxed (cond);
++      unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
++
++      if (seq < (g1_start >> 1))
++        {
++          /* If the group is closed already,
++             then this waiter originally had enough extra signals to
++             consume, up until the time its group was closed.  */
++           break;
++        }
++
++      /* If there is an available signal, don't block.
++         If __g1_start has advanced at all, then we must be in G1
++         by now, perhaps in the process of switching back to an older
++         G2, but in either case we're allowed to consume the available
++         signal and should not block anymore.  */
++      if ((int)(signals - lowseq) >= 2)
++        {
++	  /* Try to grab a signal.  See above for MO.  (if we do another loop
++	     iteration we need to see the correct value of g1_start)  */
++	    if (atomic_compare_exchange_weak_acquire (
++			cond->__data.__g_signals + g,
+ 			&signals, signals - 2))
+-		      	break;
+-		      else
+-		      	continue;
+-	    }
+-
+-	  // Now block.
+-	  struct _pthread_cleanup_buffer buffer;
+-	  struct _condvar_cleanup_buffer cbuffer;
+-	  cbuffer.wseq = wseq;
+-	  cbuffer.cond = cond;
+-	  cbuffer.mutex = mutex;
+-	  cbuffer.private = private;
+-	  __pthread_cleanup_push (&buffer, __condvar_cleanup_waiting, &cbuffer);
+-
+-	  err = __futex_abstimed_wait_cancelable64 (
+-	    cond->__data.__g_signals + g, signals, clockid, abstime, private);
+-
+-	  __pthread_cleanup_pop (&buffer, 0);
+-
+-	  if (__glibc_unlikely (err == ETIMEDOUT || err == EOVERFLOW))
+-	    {
+-	      /* If we timed out, we effectively cancel waiting.  */
+-	      __condvar_cancel_waiting (cond, seq, g, private);
+-	      result = err;
+ 	      break;
+-	    }
++	    else
++	      continue;
+ 	}
+ 
++      // Now block.
++      struct _pthread_cleanup_buffer buffer;
++      struct _condvar_cleanup_buffer cbuffer;
++      cbuffer.wseq = wseq;
++      cbuffer.cond = cond;
++      cbuffer.mutex = mutex;
++      cbuffer.private = private;
++      __pthread_cleanup_push (&buffer, __condvar_cleanup_waiting, &cbuffer);
++
++      err = __futex_abstimed_wait_cancelable64 (
++        cond->__data.__g_signals + g, signals, clockid, abstime, private);
++
++      __pthread_cleanup_pop (&buffer, 0);
++
++      if (__glibc_unlikely (err == ETIMEDOUT || err == EOVERFLOW))
++        {
++          /* If we timed out, we effectively cancel waiting.  */
++          __condvar_cancel_waiting (cond, seq, g, private);
++          result = err;
++          break;
++        }
++    }
++
+   /* Confirm that we have been woken.  We do that before acquiring the mutex
+      to allow for execution of pthread_cond_destroy while having acquired the
+      mutex.  */
+
+commit 2ad69497346cc20ef4d568108f1de49b2f451c55
+Author: Malte Skarupke <malteskarupke@fastmail.fm>
+Date:   Wed Dec 4 08:04:54 2024 -0500
+
+    nptl: rename __condvar_quiesce_and_switch_g1
+    
+    This function no longer waits for threads to leave g1, so rename it to
+    __condvar_switch_g1
+    
+    Signed-off-by: Malte Skarupke <malteskarupke@fastmail.fm>
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+    (cherry picked from commit 4b79e27a5073c02f6bff9aa8f4791230a0ab1867)
+
+diff --git a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c
+index aada91639a..38bba17bfc 100644
+--- a/nptl/pthread_cond_broadcast.c
++++ b/nptl/pthread_cond_broadcast.c
+@@ -60,7 +60,7 @@ ___pthread_cond_broadcast (pthread_cond_t *cond)
+ 				cond->__data.__g_size[g1] << 1);
+       cond->__data.__g_size[g1] = 0;
+ 
+-      /* We need to wake G1 waiters before we quiesce G1 below.  */
++      /* We need to wake G1 waiters before we switch G1 below.  */
+       /* TODO Only set it if there are indeed futex waiters.  We could
+ 	 also try to move this out of the critical section in cases when
+ 	 G2 is empty (and we don't need to quiesce).  */
+@@ -69,7 +69,7 @@ ___pthread_cond_broadcast (pthread_cond_t *cond)
+ 
+   /* G1 is complete.  Step (2) is next unless there are no waiters in G2, in
+      which case we can stop.  */
+-  if (__condvar_quiesce_and_switch_g1 (cond, wseq, &g1, private))
++  if (__condvar_switch_g1 (cond, wseq, &g1, private))
+     {
+       /* Step (3): Send signals to all waiters in the old G2 / new G1.  */
+       atomic_fetch_add_relaxed (cond->__data.__g_signals + g1,
+diff --git a/nptl/pthread_cond_common.c b/nptl/pthread_cond_common.c
+index 30b8eee149..5044273cc2 100644
+--- a/nptl/pthread_cond_common.c
++++ b/nptl/pthread_cond_common.c
+@@ -189,16 +189,15 @@ __condvar_get_private (int flags)
+     return FUTEX_SHARED;
+ }
+ 
+-/* This closes G1 (whose index is in G1INDEX), waits for all futex waiters to
+-   leave G1, converts G1 into a fresh G2, and then switches group roles so that
+-   the former G2 becomes the new G1 ending at the current __wseq value when we
+-   eventually make the switch (WSEQ is just an observation of __wseq by the
+-   signaler).
++/* This closes G1 (whose index is in G1INDEX), converts G1 into a fresh G2,
++   and then switches group roles so that the former G2 becomes the new G1
++   ending at the current __wseq value when we eventually make the switch
++   (WSEQ is just an observation of __wseq by the signaler).
+    If G2 is empty, it will not switch groups because then it would create an
+    empty G1 which would require switching groups again on the next signal.
+    Returns false iff groups were not switched because G2 was empty.  */
+ static bool __attribute__ ((unused))
+-__condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq,
++__condvar_switch_g1 (pthread_cond_t *cond, uint64_t wseq,
+     unsigned int *g1index, int private)
+ {
+   unsigned int g1 = *g1index;
+@@ -214,8 +213,7 @@ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq,
+ 	  + cond->__data.__g_size[g1 ^ 1]) == 0)
+ 	return false;
+ 
+-  /* Now try to close and quiesce G1.  We have to consider the following kinds
+-     of waiters:
++  /* We have to consider the following kinds of waiters:
+      * Waiters from less recent groups than G1 are not affected because
+        nothing will change for them apart from __g1_start getting larger.
+      * New waiters arriving concurrently with the group switching will all go
+@@ -223,12 +221,12 @@ __condvar_quiesce_and_switch_g1 (pthread_cond_t *cond, uint64_t wseq,
+        are not affected.
+      * Waiters in G1 have already received a signal and been woken.  */
+ 
+-  /* Update __g1_start, which finishes closing this group.  The value we add
+-     will never be negative because old_orig_size can only be zero when we
+-     switch groups the first time after a condvar was initialized, in which
+-     case G1 will be at index 1 and we will add a value of 1.
+-     Relaxed MO is fine because the change comes with no additional
+-     constraints that others would have to observe.  */
++  /* Update __g1_start, which closes this group.  The value we add will never
++     be negative because old_orig_size can only be zero when we switch groups
++     the first time after a condvar was initialized, in which case G1 will be
++     at index 1 and we will add a value of 1. Relaxed MO is fine because the
++     change comes with no additional constraints that others would have to
++     observe.  */
+   __condvar_add_g1_start_relaxed (cond,
+       (old_orig_size << 1) + (g1 == 1 ? 1 : - 1));
+ 
+diff --git a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c
+index 43d6286ecd..f095497142 100644
+--- a/nptl/pthread_cond_signal.c
++++ b/nptl/pthread_cond_signal.c
+@@ -69,18 +69,17 @@ ___pthread_cond_signal (pthread_cond_t *cond)
+   bool do_futex_wake = false;
+ 
+   /* If G1 is still receiving signals, we put the signal there.  If not, we
+-     check if G2 has waiters, and if so, quiesce and switch G1 to the former
+-     G2; if this results in a new G1 with waiters (G2 might have cancellations
+-     already, see __condvar_quiesce_and_switch_g1), we put the signal in the
+-     new G1.  */
++     check if G2 has waiters, and if so, switch G1 to the former G2; if this
++     results in a new G1 with waiters (G2 might have cancellations already,
++     see __condvar_switch_g1), we put the signal in the new G1. */
+   if ((cond->__data.__g_size[g1] != 0)
+-      || __condvar_quiesce_and_switch_g1 (cond, wseq, &g1, private))
++      || __condvar_switch_g1 (cond, wseq, &g1, private))
+     {
+       /* Add a signal.  Relaxed MO is fine because signaling does not need to
+-	 establish a happens-before relation (see above).  We do not mask the
+-	 release-MO store when initializing a group in
+-	 __condvar_quiesce_and_switch_g1 because we use an atomic
+-	 read-modify-write and thus extend that store's release sequence.  */
++         establish a happens-before relation (see above).  We do not mask the
++         release-MO store when initializing a group in __condvar_switch_g1
++         because we use an atomic read-modify-write and thus extend that
++         store's release sequence.  */
+       atomic_fetch_add_relaxed (cond->__data.__g_signals + g1, 2);
+       cond->__data.__g_size[g1]--;
+       /* TODO Only set it if there are indeed futex waiters.  */
+diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
+index 7fc9dadf15..80bb728211 100644
+--- a/nptl/pthread_cond_wait.c
++++ b/nptl/pthread_cond_wait.c
+@@ -354,8 +354,7 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+      because we do not need to establish any happens-before relation with
+      signalers (see __pthread_cond_signal); modification order alone
+      establishes a total order of waiters/signals.  We do need acquire MO
+-     to synchronize with group reinitialization in
+-     __condvar_quiesce_and_switch_g1.  */
++     to synchronize with group reinitialization in __condvar_switch_g1.  */
+   uint64_t wseq = __condvar_fetch_add_wseq_acquire (cond, 2);
+   /* Find our group's index.  We always go into what was G2 when we acquired
+      our position.  */
+@@ -387,9 +386,9 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+     {
+       /* Now wait until a signal is available in our group or it is closed.
+          Acquire MO so that if we observe (signals == lowseq) after group
+-         switching in __condvar_quiesce_and_switch_g1, we synchronize with that
+-         store and will see the prior update of __g1_start done while switching
+-         groups too.  */
++         switching in __condvar_switch_g1, we synchronize with that store and
++         will see the prior update of __g1_start done while switching groups
++         too.  */
+       unsigned int signals = atomic_load_acquire (cond->__data.__g_signals + g);
+       uint64_t g1_start = __condvar_load_g1_start_relaxed (cond);
+       unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
+
+commit 7f71824b8039b8afc150dd5c881b61faf10675ef
+Author: Malte Skarupke <malteskarupke@fastmail.fm>
+Date:   Wed Dec 4 08:05:40 2024 -0500
+
+    nptl: Use all of g1_start and g_signals
+    
+    The LSB of g_signals was unused. The LSB of g1_start was used to indicate
+    which group is G2. This was used to always go to sleep in pthread_cond_wait
+    if a waiter is in G2. A comment earlier in the file says that this is not
+    correct to do:
+    
+     "Waiters cannot determine whether they are currently in G2 or G1 -- but they
+      do not have to because all they are interested in is whether there are
+      available signals"
+    
+    I either would have had to update the comment, or get rid of the check. I
+    chose to get rid of the check. In fact I don't quite know why it was there.
+    There will never be available signals for group G2, so we didn't need the
+    special case. Even if there were, this would just be a spurious wake. This
+    might have caught some cases where the count has wrapped around, but it
+    wouldn't reliably do that, (and even if it did, why would you want to force a
+    sleep in that case?) and we don't support that many concurrent waiters
+    anyway. Getting rid of it allows us to use one more bit, making us more
+    robust to wraparound.
+    
+    Signed-off-by: Malte Skarupke <malteskarupke@fastmail.fm>
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+    (cherry picked from commit 91bb902f58264a2fd50fbce8f39a9a290dd23706)
+
+diff --git a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c
+index 38bba17bfc..51afa62adf 100644
+--- a/nptl/pthread_cond_broadcast.c
++++ b/nptl/pthread_cond_broadcast.c
+@@ -57,7 +57,7 @@ ___pthread_cond_broadcast (pthread_cond_t *cond)
+     {
+       /* Add as many signals as the remaining size of the group.  */
+       atomic_fetch_add_relaxed (cond->__data.__g_signals + g1,
+-				cond->__data.__g_size[g1] << 1);
++				cond->__data.__g_size[g1]);
+       cond->__data.__g_size[g1] = 0;
+ 
+       /* We need to wake G1 waiters before we switch G1 below.  */
+@@ -73,7 +73,7 @@ ___pthread_cond_broadcast (pthread_cond_t *cond)
+     {
+       /* Step (3): Send signals to all waiters in the old G2 / new G1.  */
+       atomic_fetch_add_relaxed (cond->__data.__g_signals + g1,
+-				cond->__data.__g_size[g1] << 1);
++				cond->__data.__g_size[g1]);
+       cond->__data.__g_size[g1] = 0;
+       /* TODO Only set it if there are indeed futex waiters.  */
+       do_futex_wake = true;
+diff --git a/nptl/pthread_cond_common.c b/nptl/pthread_cond_common.c
+index 5044273cc2..389402913c 100644
+--- a/nptl/pthread_cond_common.c
++++ b/nptl/pthread_cond_common.c
+@@ -208,9 +208,9 @@ __condvar_switch_g1 (pthread_cond_t *cond, uint64_t wseq,
+      behavior.
+      Note that this works correctly for a zero-initialized condvar too.  */
+   unsigned int old_orig_size = __condvar_get_orig_size (cond);
+-  uint64_t old_g1_start = __condvar_load_g1_start_relaxed (cond) >> 1;
+-  if (((unsigned) (wseq - old_g1_start - old_orig_size)
+-	  + cond->__data.__g_size[g1 ^ 1]) == 0)
++  uint64_t old_g1_start = __condvar_load_g1_start_relaxed (cond);
++  uint64_t new_g1_start = old_g1_start + old_orig_size;
++  if (((unsigned) (wseq - new_g1_start) + cond->__data.__g_size[g1 ^ 1]) == 0)
+ 	return false;
+ 
+   /* We have to consider the following kinds of waiters:
+@@ -221,16 +221,10 @@ __condvar_switch_g1 (pthread_cond_t *cond, uint64_t wseq,
+        are not affected.
+      * Waiters in G1 have already received a signal and been woken.  */
+ 
+-  /* Update __g1_start, which closes this group.  The value we add will never
+-     be negative because old_orig_size can only be zero when we switch groups
+-     the first time after a condvar was initialized, in which case G1 will be
+-     at index 1 and we will add a value of 1. Relaxed MO is fine because the
+-     change comes with no additional constraints that others would have to
+-     observe.  */
+-  __condvar_add_g1_start_relaxed (cond,
+-      (old_orig_size << 1) + (g1 == 1 ? 1 : - 1));
+-
+-  unsigned int lowseq = ((old_g1_start + old_orig_size) << 1) & ~1U;
++  /* Update __g1_start, which closes this group.  Relaxed MO is fine because
++     the change comes with no additional constraints that others would have
++     to observe.  */
++  __condvar_add_g1_start_relaxed (cond, old_orig_size);
+ 
+   /* At this point, the old G1 is now a valid new G2 (but not in use yet).
+      No old waiter can neither grab a signal nor acquire a reference without
+@@ -242,13 +236,13 @@ __condvar_switch_g1 (pthread_cond_t *cond, uint64_t wseq,
+   g1 ^= 1;
+   *g1index ^= 1;
+ 
+-  /* Now advance the new G1 g_signals to the new lowseq, giving it
++  /* Now advance the new G1 g_signals to the new g1_start, giving it
+      an effective signal count of 0 to start.  */
+-  atomic_store_release (cond->__data.__g_signals + g1, lowseq);
++  atomic_store_release (cond->__data.__g_signals + g1, (unsigned)new_g1_start);
+ 
+   /* These values are just observed by signalers, and thus protected by the
+      lock.  */
+-  unsigned int orig_size = wseq - (old_g1_start + old_orig_size);
++  unsigned int orig_size = wseq - new_g1_start;
+   __condvar_set_orig_size (cond, orig_size);
+   /* Use and addition to not loose track of cancellations in what was
+      previously G2.  */
+diff --git a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c
+index f095497142..fa3a5c3d8f 100644
+--- a/nptl/pthread_cond_signal.c
++++ b/nptl/pthread_cond_signal.c
+@@ -80,7 +80,7 @@ ___pthread_cond_signal (pthread_cond_t *cond)
+          release-MO store when initializing a group in __condvar_switch_g1
+          because we use an atomic read-modify-write and thus extend that
+          store's release sequence.  */
+-      atomic_fetch_add_relaxed (cond->__data.__g_signals + g1, 2);
++      atomic_fetch_add_relaxed (cond->__data.__g_signals + g1, 1);
+       cond->__data.__g_size[g1]--;
+       /* TODO Only set it if there are indeed futex waiters.  */
+       do_futex_wake = true;
+diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
+index 80bb728211..0f1dfcb595 100644
+--- a/nptl/pthread_cond_wait.c
++++ b/nptl/pthread_cond_wait.c
+@@ -84,7 +84,7 @@ __condvar_cancel_waiting (pthread_cond_t *cond, uint64_t seq, unsigned int g,
+      not hold a reference on the group.  */
+   __condvar_acquire_lock (cond, private);
+ 
+-  uint64_t g1_start = __condvar_load_g1_start_relaxed (cond) >> 1;
++  uint64_t g1_start = __condvar_load_g1_start_relaxed (cond);
+   if (g1_start > seq)
+     {
+       /* Our group is closed, so someone provided enough signals for it.
+@@ -259,7 +259,6 @@ __condvar_cleanup_waiting (void *arg)
+      * Waiters fetch-add while having acquire the mutex associated with the
+        condvar.  Signalers load it and fetch-xor it concurrently.
+    __g1_start: Starting position of G1 (inclusive)
+-     * LSB is index of current G2.
+      * Modified by signalers while having acquired the condvar-internal lock
+        and observed concurrently by waiters.
+    __g1_orig_size: Initial size of G1
+@@ -280,11 +279,9 @@ __condvar_cleanup_waiting (void *arg)
+      * Reference count used by waiters concurrently with signalers that have
+        acquired the condvar-internal lock.
+    __g_signals: The number of signals that can still be consumed, relative to
+-     the current g1_start.  (i.e. bits 31 to 1 of __g_signals are bits
+-     31 to 1 of g1_start with the signal count added)
++     the current g1_start.  (i.e. g1_start with the signal count added)
+      * Used as a futex word by waiters.  Used concurrently by waiters and
+        signalers.
+-     * LSB is currently reserved and 0.
+    __g_size: Waiters remaining in this group (i.e., which have not been
+      signaled yet.
+      * Accessed by signalers and waiters that cancel waiting (both do so only
+@@ -391,9 +388,8 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+          too.  */
+       unsigned int signals = atomic_load_acquire (cond->__data.__g_signals + g);
+       uint64_t g1_start = __condvar_load_g1_start_relaxed (cond);
+-      unsigned int lowseq = (g1_start & 1) == g ? signals : g1_start & ~1U;
+ 
+-      if (seq < (g1_start >> 1))
++      if (seq < g1_start)
+         {
+           /* If the group is closed already,
+              then this waiter originally had enough extra signals to
+@@ -406,13 +402,13 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
+          by now, perhaps in the process of switching back to an older
+          G2, but in either case we're allowed to consume the available
+          signal and should not block anymore.  */
+-      if ((int)(signals - lowseq) >= 2)
++      if ((int)(signals - (unsigned int)g1_start) > 0)
+         {
+ 	  /* Try to grab a signal.  See above for MO.  (if we do another loop
+ 	     iteration we need to see the correct value of g1_start)  */
+ 	    if (atomic_compare_exchange_weak_acquire (
+ 			cond->__data.__g_signals + g,
+-			&signals, signals - 2))
++			&signals, signals - 1))
+ 	      break;
+ 	    else
+ 	      continue;
+
+commit 8d3dd23e3de8b4c6e4b94f8bbfab971c3b8a55be
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Thu Mar 13 06:07:07 2025 +0100
+
+    nptl: PTHREAD_COND_INITIALIZER compatibility with pre-2.41 versions (bug 32786)
+    
+    The new initializer and struct layout does not initialize the
+    __g_signals field in the old struct layout before the change in
+    commit c36fc50781995e6758cae2b6927839d0157f213c ("nptl: Remove
+    g_refs from condition variables").  Bring back fields at the end
+    of struct __pthread_cond_s, so that they are again zero-initialized.
+    
+    Reviewed-by: Sam James <sam@gentoo.org>
+
+diff --git a/sysdeps/nptl/bits/thread-shared-types.h b/sysdeps/nptl/bits/thread-shared-types.h
+index a3d482f80f..bccc2003ec 100644
+--- a/sysdeps/nptl/bits/thread-shared-types.h
++++ b/sysdeps/nptl/bits/thread-shared-types.h
+@@ -99,6 +99,8 @@ struct __pthread_cond_s
+   unsigned int __g1_orig_size;
+   unsigned int __wrefs;
+   unsigned int __g_signals[2];
++  unsigned int __unused_initialized_1;
++  unsigned int __unused_initialized_2;
+ };
+ 
+ typedef unsigned int __tss_t;
+diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h
+index 9af75d6eae..e0f24418fe 100644
+--- a/sysdeps/nptl/pthread.h
++++ b/sysdeps/nptl/pthread.h
+@@ -152,7 +152,7 @@ enum
+ 
+ 
+ /* Conditional variable handling.  */
+-#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, 0, 0, {0, 0} } }
++#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, 0, 0, {0, 0}, 0, 0 } }
+ 
+ 
+ /* Cleanup buffers */
+
+commit 33b33e9dd0ff26158b1b83cc4347a39c073e490e
+Author: Arjun Shankar <arjun@redhat.com>
+Date:   Fri Oct 18 16:03:25 2024 +0200
+
+    libio: Fix a deadlock after fork in popen
+    
+    popen modifies its file handler book-keeping under a lock that wasn't
+    being taken during fork.  This meant that a concurrent popen and fork
+    could end up copying the lock in a "locked" state into the fork child,
+    where subsequently calling popen would lead to a deadlock due to the
+    already (spuriously) held lock.
+    
+    This commit fixes the deadlock by appropriately taking the lock before
+    fork, and releasing/resetting it in the parent/child after the fork.
+    
+    A new test for concurrent popen and fork is also added.  It consistently
+    hangs (and therefore fails via timeout) without the fix applied.
+    Reviewed-by: Florian Weimer <fweimer@redhat.com>
+    
+    (cherry picked from commit 9f0d2c0ee6c728643fcf9a4879e9f20f5e45ce5f)
+
+diff --git a/libio/Makefile b/libio/Makefile
+index 5292baa4e0..7faba230ac 100644
+--- a/libio/Makefile
++++ b/libio/Makefile
+@@ -117,6 +117,7 @@ tests = \
+   tst-mmap-offend \
+   tst-mmap-setvbuf \
+   tst-mmap2-eofsync \
++  tst-popen-fork \
+   tst-popen1 \
+   tst-setvbuf1 \
+   tst-sprintf-chk-ub \
+diff --git a/libio/iopopen.c b/libio/iopopen.c
+index d01cb0648e..352513a291 100644
+--- a/libio/iopopen.c
++++ b/libio/iopopen.c
+@@ -57,6 +57,26 @@ unlock (void *not_used)
+ }
+ #endif
+ 
++/* These lock/unlock/resetlock functions are used during fork.  */
++
++void
++_IO_proc_file_chain_lock (void)
++{
++  _IO_lock_lock (proc_file_chain_lock);
++}
++
++void
++_IO_proc_file_chain_unlock (void)
++{
++  _IO_lock_unlock (proc_file_chain_lock);
++}
++
++void
++_IO_proc_file_chain_resetlock (void)
++{
++  _IO_lock_init (proc_file_chain_lock);
++}
++
+ /* POSIX states popen shall ensure that any streams from previous popen()
+    calls that remain open in the parent process should be closed in the new
+    child process.
+diff --git a/libio/libioP.h b/libio/libioP.h
+index 616253fcd0..a83a411fdf 100644
+--- a/libio/libioP.h
++++ b/libio/libioP.h
+@@ -429,6 +429,12 @@ libc_hidden_proto (_IO_list_resetlock)
+ extern void _IO_enable_locks (void) __THROW;
+ libc_hidden_proto (_IO_enable_locks)
+ 
++/* Functions for operating popen's proc_file_chain_lock during fork.  */
++
++extern void _IO_proc_file_chain_lock (void) __THROW attribute_hidden;
++extern void _IO_proc_file_chain_unlock (void) __THROW attribute_hidden;
++extern void _IO_proc_file_chain_resetlock (void) __THROW attribute_hidden;
++
+ /* Default jumptable functions. */
+ 
+ extern int _IO_default_underflow (FILE *) __THROW;
+diff --git a/libio/tst-popen-fork.c b/libio/tst-popen-fork.c
+new file mode 100644
+index 0000000000..1df30fc6c0
+--- /dev/null
++++ b/libio/tst-popen-fork.c
+@@ -0,0 +1,80 @@
++/* Test concurrent popen and fork.
++   Copyright (C) 2024 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <stdio.h>
++#include <stdatomic.h>
++#include <pthread.h>
++#include <unistd.h>
++#include <sys/wait.h>
++
++#include <support/check.h>
++#include <support/xthread.h>
++#include <support/xunistd.h>
++
++static void
++popen_and_pclose (void)
++{
++  FILE *f = popen ("true", "r");
++  TEST_VERIFY_EXIT (f != NULL);
++  pclose (f);
++  return;
++}
++
++static atomic_bool done = ATOMIC_VAR_INIT (0);
++
++static void *
++popen_and_pclose_forever (__attribute__ ((unused))
++                          void *arg)
++{
++  while (!atomic_load_explicit (&done, memory_order_acquire))
++    popen_and_pclose ();
++  return NULL;
++}
++
++static int
++do_test (void)
++{
++
++  /* Repeatedly call popen in a loop during the entire test.  */
++  pthread_t t = xpthread_create (NULL, popen_and_pclose_forever, NULL);
++
++  /* Repeatedly fork off and reap child processes one-by-one.
++     Each child calls popen once, then exits, leading to the possibility
++     that a child forks *during* our own popen call, thus inheriting any
++     intermediate popen state, possibly including lock state(s).  */
++  for (int i = 0; i < 100; i++)
++    {
++      int cpid = xfork ();
++
++      if (cpid == 0)
++        {
++          popen_and_pclose ();
++          _exit (0);
++        }
++      else
++        xwaitpid (cpid, NULL, 0);
++    }
++
++  /* Stop calling popen.  */
++  atomic_store_explicit (&done, 1, memory_order_release);
++  xpthread_join (t);
++
++  return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/posix/fork.c b/posix/fork.c
+index 298765a1ff..cf9b80e7c0 100644
+--- a/posix/fork.c
++++ b/posix/fork.c
+@@ -62,6 +62,7 @@ __libc_fork (void)
+       call_function_static_weak (__nss_database_fork_prepare_parent,
+ 				 &nss_database_data);
+ 
++      _IO_proc_file_chain_lock ();
+       _IO_list_lock ();
+ 
+       /* Acquire malloc locks.  This needs to come last because fork
+@@ -92,6 +93,7 @@ __libc_fork (void)
+ 
+ 	  /* Reset locks in the I/O code.  */
+ 	  _IO_list_resetlock ();
++	  _IO_proc_file_chain_resetlock ();
+ 
+ 	  call_function_static_weak (__nss_database_fork_subprocess,
+ 				     &nss_database_data);
+@@ -121,6 +123,7 @@ __libc_fork (void)
+ 
+ 	  /* We execute this even if the 'fork' call failed.  */
+ 	  _IO_list_unlock ();
++	  _IO_proc_file_chain_unlock ();
+ 	}
+ 
+       /* Run the handlers registered for the parent.  */
+
+commit 7c3c9ae28685a9142a8cfa3521bbca74c1007d0b
+Author: Arjun Shankar <arjun@redhat.com>
+Date:   Fri Oct 25 09:33:45 2024 +0200
+
+    libio: Correctly link tst-popen-fork against libpthread
+    
+    tst-popen-fork failed to build for Hurd due to not being linked with
+    libpthread.  This commit fixes that.
+    
+    Tested with build-many-glibcs.py for i686-gnu.
+    
+    Reviewed-by: Florian Weimer <fweimer@redhat.com>
+    (cherry picked from commit 6a290b2895b77be839fcb7c44a6a9879560097ad)
+
+diff --git a/libio/Makefile b/libio/Makefile
+index 7faba230ac..f2e98f96eb 100644
+--- a/libio/Makefile
++++ b/libio/Makefile
+@@ -142,6 +142,8 @@ tests = \
+   tst_wscanf \
+   # tests
+ 
++$(objpfx)tst-popen-fork: $(shared-thread-library)
++
+ tests-internal = tst-vtables tst-vtables-interposed
+ 
+ ifeq (yes,$(build-shared))
+
+commit 8667345b83c8ca528a093d4db53f57a1bb1688e4
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Thu Feb 13 21:56:52 2025 +0100
+
+    elf: Keep using minimal malloc after early DTV resize (bug 32412)
+    
+    If an auditor loads many TLS-using modules during startup, it is
+    possible to trigger DTV resizing.  Previously, the DTV was marked
+    as allocated by the main malloc afterwards, even if the minimal
+    malloc was still in use.  With this change, _dl_resize_dtv marks
+    the resized DTV as allocated with the minimal malloc.
+    
+    The new test reuses TLS-using modules from other auditing tests.
+    
+    Reviewed-by: DJ Delorie <dj@redhat.com>
+    (cherry picked from commit aa3d7bd5299b33bffc118aa618b59bfa66059bcb)
+
+diff --git a/elf/Makefile b/elf/Makefile
+index dc686c3bff..be64c59887 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -378,6 +378,7 @@ tests += \
+   tst-align3 \
+   tst-audit-tlsdesc \
+   tst-audit-tlsdesc-dlopen \
++  tst-audit-tlsdesc-dlopen2 \
+   tst-audit1 \
+   tst-audit2 \
+   tst-audit8 \
+@@ -817,6 +818,7 @@ modules-names += \
+   tst-auditmanymod8 \
+   tst-auditmanymod9 \
+   tst-auditmod-tlsdesc  \
++  tst-auditmod-tlsdesc2 \
+   tst-auditmod1 \
+   tst-auditmod11 \
+   tst-auditmod12 \
+@@ -3040,6 +3042,9 @@ $(objpfx)tst-audit-tlsdesc.out: $(objpfx)tst-auditmod-tlsdesc.so
+ tst-audit-tlsdesc-ENV = LD_AUDIT=$(objpfx)tst-auditmod-tlsdesc.so
+ $(objpfx)tst-audit-tlsdesc-dlopen.out: $(objpfx)tst-auditmod-tlsdesc.so
+ tst-audit-tlsdesc-dlopen-ENV = LD_AUDIT=$(objpfx)tst-auditmod-tlsdesc.so
++$(objpfx)tst-audit-tlsdesc-dlopen2.out: $(objpfx)tst-auditmod-tlsdesc2.so \
++  $(patsubst %, $(objpfx)%.so, $(tlsmod17a-modules))
++tst-audit-tlsdesc-dlopen2-ENV = LD_AUDIT=$(objpfx)tst-auditmod-tlsdesc2.so
+ 
+ $(objpfx)tst-dlmopen-twice.out: \
+   $(objpfx)tst-dlmopen-twice-mod1.so \
+diff --git a/elf/dl-tls.c b/elf/dl-tls.c
+index 3d529b722c..b13e752358 100644
+--- a/elf/dl-tls.c
++++ b/elf/dl-tls.c
+@@ -528,6 +528,13 @@ _dl_resize_dtv (dtv_t *dtv, size_t max_modid)
+       if (newp == NULL)
+ 	oom ();
+       memcpy (newp, &dtv[-1], (2 + oldsize) * sizeof (dtv_t));
++#ifdef SHARED
++      /* Auditors can trigger a DTV resize event while the full malloc
++	 is not yet in use.  Mark the new DTV allocation as the
++	 initial allocation.  */
++      if (!__rtld_malloc_is_complete ())
++	GL(dl_initial_dtv) = &newp[1];
++#endif
+     }
+   else
+     {
+diff --git a/elf/tst-audit-tlsdesc-dlopen2.c b/elf/tst-audit-tlsdesc-dlopen2.c
+new file mode 100644
+index 0000000000..7ba2c4129a
+--- /dev/null
++++ b/elf/tst-audit-tlsdesc-dlopen2.c
+@@ -0,0 +1,46 @@
++/* Loading TLS-using modules from auditors (bug 32412).  Main program.
++   Copyright (C) 2021-2025 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <support/xdlfcn.h>
++#include <stdio.h>
++
++static int
++do_test (void)
++{
++  puts ("info: start of main program");
++
++  /* Load TLS-using modules, to trigger DTV resizing.  The dynamic
++     linker will load them again (requiring their own TLS) because the
++     dlopen calls from the auditor were in the auditing namespace.  */
++  for (int i = 1; i <= 19; ++i)
++    {
++      char dso[30];
++      snprintf (dso, sizeof (dso), "tst-tlsmod17a%d.so", i);
++      char sym[30];
++      snprintf (sym, sizeof(sym), "tlsmod17a%d", i);
++
++      void *handle = xdlopen (dso, RTLD_LAZY);
++      int (*func) (void) = xdlsym (handle, sym);
++      /* Trigger TLS allocation.  */
++      func ();
++    }
++
++  return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/elf/tst-auditmod-tlsdesc2.c b/elf/tst-auditmod-tlsdesc2.c
+new file mode 100644
+index 0000000000..50275cd34d
+--- /dev/null
++++ b/elf/tst-auditmod-tlsdesc2.c
+@@ -0,0 +1,59 @@
++/* Loading TLS-using modules from auditors (bug 32412).  Audit module.
++   Copyright (C) 2021-2025 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <dlfcn.h>
++#include <link.h>
++#include <stdbool.h>
++#include <stdio.h>
++#include <unistd.h>
++
++unsigned int
++la_version (unsigned int version)
++{
++  /* Open some modules, to trigger DTV resizing before the switch to
++     the main malloc.  */
++  for (int i = 1; i <= 19; ++i)
++    {
++      char dso[30];
++      snprintf (dso, sizeof (dso), "tst-tlsmod17a%d.so", i);
++      char sym[30];
++      snprintf (sym, sizeof(sym), "tlsmod17a%d", i);
++
++      void *handle = dlopen (dso, RTLD_LAZY);
++      if (handle == NULL)
++        {
++          printf ("error: dlmopen from auditor: %s\n", dlerror  ());
++          fflush (stdout);
++          _exit (1);
++        }
++      int (*func) (void) = dlsym (handle, sym);
++      if (func == NULL)
++        {
++          printf ("error: dlsym from auditor: %s\n", dlerror  ());
++          fflush (stdout);
++          _exit (1);
++        }
++      /* Trigger TLS allocation.  */
++      func ();
++    }
++
++  puts ("info: TLS-using modules loaded from auditor");
++  fflush (stdout);
++
++  return LAV_CURRENT;
++}
+
+commit b3002f303cedb8262cbc1ec22999ea36482efa0e
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Tue May 20 19:36:02 2025 +0200
+
+    support: Use const char * argument in support_capture_subprogram_self_sgid
+    
+    The function does not modify the passed-in string, so make this clear
+    via the prototype.
+    
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+    (cherry picked from commit f0c09fe61678df6f7f18fe1ebff074e62fa5ca7a)
+
+diff --git a/support/capture_subprocess.h b/support/capture_subprocess.h
+index 93b7245d2a..5406d9f6c0 100644
+--- a/support/capture_subprocess.h
++++ b/support/capture_subprocess.h
+@@ -45,8 +45,7 @@ struct support_capture_subprocess support_capture_subprogram
+ /* Copy the running program into a setgid binary and run it with CHILD_ID
+    argument.  If execution is successful, return the exit status of the child
+    program, otherwise return a non-zero failure exit code.  */
+-int support_capture_subprogram_self_sgid
+-  (char *child_id);
++int support_capture_subprogram_self_sgid (const char *child_id);
+ 
+ /* Deallocate the subprocess data captured by
+    support_capture_subprocess.  */
+diff --git a/support/support_capture_subprocess.c b/support/support_capture_subprocess.c
+index 53847194cb..2383481911 100644
+--- a/support/support_capture_subprocess.c
++++ b/support/support_capture_subprocess.c
+@@ -110,7 +110,7 @@ support_capture_subprogram (const char *file, char *const argv[],
+    safely make it SGID with the TARGET group ID.  Then runs the
+    executable.  */
+ static int
+-copy_and_spawn_sgid (char *child_id, gid_t gid)
++copy_and_spawn_sgid (const char *child_id, gid_t gid)
+ {
+   char *dirname = xasprintf ("%s/tst-tunables-setuid.%jd",
+ 			     test_dir, (intmax_t) getpid ());
+@@ -182,7 +182,7 @@ copy_and_spawn_sgid (char *child_id, gid_t gid)
+   ret = 0;
+   infd = outfd = -1;
+ 
+-  char * const args[] = {execname, child_id, NULL};
++  char * const args[] = {execname, (char *) child_id, NULL};
+ 
+   status = support_subprogram_wait (args[0], args);
+ 
+@@ -211,7 +211,7 @@ err:
+ }
+ 
+ int
+-support_capture_subprogram_self_sgid (char *child_id)
++support_capture_subprogram_self_sgid (const char *child_id)
+ {
+   gid_t target = 0;
+   const int count = 64;
+
+commit 61dcce21e06834f7248a8d516c9ec20788fc728c
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Mon Dec 23 13:57:55 2024 +0100
+
+    support: Add support_record_failure_barrier
+    
+    This can be used to stop execution after a TEST_COMPARE_BLOB
+    failure, for example.
+    
+    (cherry picked from commit d0b8aa6de4529231fadfe604ac2c434e559c2d9e)
+
+diff --git a/support/check.h b/support/check.h
+index 7ea22c7a2c..8f41e5b99f 100644
+--- a/support/check.h
++++ b/support/check.h
+@@ -207,6 +207,9 @@ void support_record_failure_reset (void);
+    failures or not.  */
+ int support_record_failure_is_failed (void);
+ 
++/* Terminate the process if any failures have been encountered so far.  */
++void support_record_failure_barrier (void);
++
+ __END_DECLS
+ 
+ #endif /* SUPPORT_CHECK_H */
+diff --git a/support/support_record_failure.c b/support/support_record_failure.c
+index 978123701d..72ee2b232f 100644
+--- a/support/support_record_failure.c
++++ b/support/support_record_failure.c
+@@ -112,3 +112,13 @@ support_record_failure_is_failed (void)
+      synchronization for reliable test error reporting anyway.  */
+   return __atomic_load_n (&state->failed, __ATOMIC_RELAXED);
+ }
++
++void
++support_record_failure_barrier (void)
++{
++  if (__atomic_load_n (&state->failed, __ATOMIC_RELAXED))
++    {
++      puts ("error: exiting due to previous errors");
++      exit (1);
++    }
++}
+
+commit 079ac4a172a8f6ba37acf1e80e57f5042d2c7561
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Tue May 20 19:45:06 2025 +0200
+
+    elf: Test case for bug 32976 (CVE-2025-4802)
+    
+    Check that LD_LIBRARY_PATH is ignored for AT_SECURE statically
+    linked binaries, using support_capture_subprogram_self_sgid.
+    
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+    (cherry picked from commit d8f7a79335b0d861c12c42aec94c04cd5bb181e2)
+
+diff --git a/elf/Makefile b/elf/Makefile
+index be64c59887..afd4eb6fdd 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -266,6 +266,7 @@ tests-static-normal := \
+   tst-array1-static \
+   tst-array5-static \
+   tst-dl-iter-static \
++  tst-dlopen-sgid \
+   tst-dst-static \
+   tst-env-setuid-static \
+   tst-getauxval-static \
+@@ -859,6 +860,7 @@ modules-names += \
+   tst-dlmopen-twice-mod1 \
+   tst-dlmopen-twice-mod2 \
+   tst-dlmopen1mod \
++  tst-dlopen-sgid-mod \
+   tst-dlopen-tlsreinitmod1 \
+   tst-dlopen-tlsreinitmod2 \
+   tst-dlopen-tlsreinitmod3 \
+@@ -3153,3 +3155,5 @@ $(objpfx)tst-dlopen-tlsreinit3.out: $(objpfx)tst-auditmod1.so
+ tst-dlopen-tlsreinit3-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so
+ $(objpfx)tst-dlopen-tlsreinit4.out: $(objpfx)tst-auditmod1.so
+ tst-dlopen-tlsreinit4-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so
++
++$(objpfx)tst-dlopen-sgid.out: $(objpfx)tst-dlopen-sgid-mod.so
+diff --git a/elf/tst-dlopen-sgid-mod.c b/elf/tst-dlopen-sgid-mod.c
+new file mode 100644
+index 0000000000..5eb79eef48
+--- /dev/null
++++ b/elf/tst-dlopen-sgid-mod.c
+@@ -0,0 +1 @@
++/* Opening this object should not succeed.  */
+diff --git a/elf/tst-dlopen-sgid.c b/elf/tst-dlopen-sgid.c
+new file mode 100644
+index 0000000000..47829a405e
+--- /dev/null
++++ b/elf/tst-dlopen-sgid.c
+@@ -0,0 +1,104 @@
++/* Test case for ignored LD_LIBRARY_PATH in static startug (bug 32976).
++   Copyright (C) 2025 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <dlfcn.h>
++#include <gnu/lib-names.h>
++#include <stddef.h>
++#include <stdint.h>
++#include <stdlib.h>
++#include <string.h>
++#include <support/capture_subprocess.h>
++#include <support/check.h>
++#include <support/support.h>
++#include <support/temp_file.h>
++#include <unistd.h>
++
++/* This is the name of our test object.  Use a custom module for
++   testing, so that this object does not get picked up from the system
++   path.  */
++static const char dso_name[] = "tst-dlopen-sgid-mod.so";
++
++/* Used to mark the recursive invocation.  */
++static const char magic_argument[] = "run-actual-test";
++
++static int
++do_test (void)
++{
++/* Pathname of the directory that receives the shared objects this
++   test attempts to load.  */
++  char *libdir = support_create_temp_directory ("tst-dlopen-sgid-");
++
++  /* This is supposed to be ignored and stripped.  */
++  TEST_COMPARE (setenv ("LD_LIBRARY_PATH", libdir, 1), 0);
++
++  /* Copy of libc.so.6.  */
++  {
++    char *from = xasprintf ("%s/%s", support_objdir_root, LIBC_SO);
++    char *to = xasprintf ("%s/%s", libdir, LIBC_SO);
++    add_temp_file (to);
++    support_copy_file (from, to);
++    free (to);
++    free (from);
++  }
++
++  /* Copy of the test object.   */
++  {
++    char *from = xasprintf ("%s/elf/%s", support_objdir_root, dso_name);
++    char *to = xasprintf ("%s/%s", libdir, dso_name);
++    add_temp_file (to);
++    support_copy_file (from, to);
++    free (to);
++    free (from);
++  }
++
++  TEST_COMPARE (support_capture_subprogram_self_sgid (magic_argument), 0);
++
++  free (libdir);
++
++  return 0;
++}
++
++static void
++alternative_main (int argc, char **argv)
++{
++  if (argc == 2 && strcmp (argv[1], magic_argument) == 0)
++    {
++      if (getgid () == getegid ())
++        /* This can happen if the file system is mounted nosuid.  */
++        FAIL_UNSUPPORTED ("SGID failed: GID and EGID match (%jd)\n",
++                          (intmax_t) getgid ());
++
++      /* Should be removed due to SGID.  */
++      TEST_COMPARE_STRING (getenv ("LD_LIBRARY_PATH"), NULL);
++
++      TEST_VERIFY (dlopen (dso_name, RTLD_NOW) == NULL);
++      {
++        const char *message = dlerror ();
++        TEST_COMPARE_STRING (message,
++                             "tst-dlopen-sgid-mod.so:"
++                             " cannot open shared object file:"
++                             " No such file or directory");
++      }
++
++      support_record_failure_barrier ();
++      exit (EXIT_SUCCESS);
++    }
++}
++
++#define PREPARE alternative_main
++#include <support/test-driver.c>
+
+commit 56e75b810ac39b0e390be5b66397dca0cdfa4d80
+Author: Sunil K Pandey <sunil.k.pandey@intel.com>
+Date:   Tue May 20 10:07:27 2025 -0700
+
+    x86_64: Fix typo in ifunc-impl-list.c.
+    
+    Fix wcsncpy and wcpncpy typo in ifunc-impl-list.c.
+    
+    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
+    (cherry picked from commit f2aeb6ff941dccc4c777b5621e77addea6cc076c)
+
+diff --git a/sysdeps/x86_64/multiarch/ifunc-impl-list.c b/sysdeps/x86_64/multiarch/ifunc-impl-list.c
+index 0bbb71bbbf..3db45db39b 100644
+--- a/sysdeps/x86_64/multiarch/ifunc-impl-list.c
++++ b/sysdeps/x86_64/multiarch/ifunc-impl-list.c
+@@ -922,7 +922,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
+ 				     (CPU_FEATURE_USABLE (AVX2)
+ 				      && CPU_FEATURE_USABLE (BMI2)),
+ 				     __wcsncpy_avx2)
+-	      X86_IFUNC_IMPL_ADD_V2 (array, i, wcpncpy,
++	      X86_IFUNC_IMPL_ADD_V2 (array, i, wcsncpy,
+ 				     1,
+ 				     __wcsncpy_generic))
+ 
+@@ -952,7 +952,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
+ 				     (CPU_FEATURE_USABLE (AVX2)
+ 				      && CPU_FEATURE_USABLE (BMI2)),
+ 				     __wcpncpy_avx2)
+-	      X86_IFUNC_IMPL_ADD_V2 (array, i, wcsncpy,
++	      X86_IFUNC_IMPL_ADD_V2 (array, i, wcpncpy,
+ 				     1,
+ 				     __wcpncpy_generic))
+ 
+
+commit c8e10f14328518954072df64aafd574e67cfdde5
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Wed May 21 08:43:32 2025 +0200
+
+    elf: Fix subprocess status handling for tst-dlopen-sgid (bug 32987)
+    
+    This should really move into support_capture_subprogram_self_sgid.
+    
+    Reviewed-by: Sam James <sam@gentoo.org>
+    (cherry picked from commit 35fc356fa3b4f485bd3ba3114c9f774e5df7d3c2)
+
+diff --git a/NEWS b/NEWS
+index 7a6985f5dd..4b290ad4bf 100644
+--- a/NEWS
++++ b/NEWS
+@@ -23,6 +23,7 @@ The following bugs are resolved with this release:
+   [32245] glibc -Wstringop-overflow= build failure on hppa
+   [32470] x86: Avoid integer truncation with large cache sizes
+   [32810] Crash on x86-64 if XSAVEC disable via tunable
++  [32987] elf: Fix subprocess status handling for tst-dlopen-sgid
+ 
+ Version 2.40
+ 
+diff --git a/elf/tst-dlopen-sgid.c b/elf/tst-dlopen-sgid.c
+index 47829a405e..5688b79f2e 100644
+--- a/elf/tst-dlopen-sgid.c
++++ b/elf/tst-dlopen-sgid.c
+@@ -26,6 +26,8 @@
+ #include <support/check.h>
+ #include <support/support.h>
+ #include <support/temp_file.h>
++#include <support/test-driver.h>
++#include <sys/wait.h>
+ #include <unistd.h>
+ 
+ /* This is the name of our test object.  Use a custom module for
+@@ -66,10 +68,16 @@ do_test (void)
+     free (from);
+   }
+ 
+-  TEST_COMPARE (support_capture_subprogram_self_sgid (magic_argument), 0);
+-
+   free (libdir);
+ 
++  int status = support_capture_subprogram_self_sgid (magic_argument);
++
++  if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
++    return EXIT_UNSUPPORTED;
++
++  if (!WIFEXITED (status))
++    FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status);
++
+   return 0;
+ }
+ 
+
+commit 42a5a940c974d02540c8da26d6374c744d148cb9
+Author: Carlos O'Donell <carlos@redhat.com>
+Date:   Wed Jun 11 09:19:17 2025 -0400
+
+    ppc64le: Revert "powerpc: Optimized strncmp for power10" (CVE-2025-5745)
+    
+    This reverts commit 23f0d81608d0ca6379894ef81670cf30af7fd081
+    
+    Reason for revert: Power10 strncmp clobbers non-volatile vector
+    registers (Bug 33060)
+    
+    Tested on ppc64le with no regressions.
+    
+    (cherry picked from commit 63c60101ce7c5eac42be90f698ba02099b41b965)
+
+diff --git a/sysdeps/powerpc/powerpc64/le/power10/strncmp.S b/sysdeps/powerpc/powerpc64/le/power10/strncmp.S
+deleted file mode 100644
+index d4ba76acae..0000000000
+--- a/sysdeps/powerpc/powerpc64/le/power10/strncmp.S
++++ /dev/null
+@@ -1,271 +0,0 @@
+-/* Optimized strncmp implementation for PowerPC64/POWER10.
+-   Copyright (C) 2024 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, see
+-   <https://www.gnu.org/licenses/>.  */
+-
+-#include <sysdep.h>
+-
+-/* Implements the function
+-
+-   int [r3] strncmp (const char *s1 [r3], const char *s2 [r4], size_t [r5] n)
+-
+-   The implementation uses unaligned doubleword access to avoid specialized
+-   code paths depending of data alignment for first 32 bytes and uses
+-   vectorised loops after that.  */
+-
+-#ifndef STRNCMP
+-# define STRNCMP strncmp
+-#endif
+-
+-/* TODO: Change this to actual instructions when minimum binutils is upgraded
+-   to 2.27.  Macros are defined below for these newer instructions in order
+-   to maintain compatibility.  */
+-
+-#define LXVP(xtp,dq,ra)              \
+-	.long(((6)<<(32-6))          \
+-	| ((((xtp)-32)>>1)<<(32-10)) \
+-	| ((1)<<(32-11))             \
+-	| ((ra)<<(32-16))            \
+-	| dq)
+-
+-#define COMPARE_16(vreg1,vreg2,offset) \
+-	lxv	  vreg1+32,offset(r3); \
+-	lxv	  vreg2+32,offset(r4); \
+-	vcmpnezb. v7,vreg1,vreg2;      \
+-	bne	  cr6,L(different);    \
+-	cmpldi	  cr7,r5,16;           \
+-	ble	  cr7,L(ret0);         \
+-	addi	  r5,r5,-16;
+-
+-#define COMPARE_32(vreg1,vreg2,offset,label1,label2) \
+-	LXVP(vreg1+32,offset,r3);                    \
+-	LXVP(vreg2+32,offset,r4);                    \
+-	vcmpnezb. v7,vreg1+1,vreg2+1;                \
+-	bne	  cr6,L(label1);                     \
+-	vcmpnezb. v7,vreg1,vreg2;                    \
+-	bne	  cr6,L(label2);                     \
+-	cmpldi	  cr7,r5,32;                         \
+-	ble	  cr7,L(ret0);                       \
+-	addi	  r5,r5,-32;
+-
+-#define TAIL_FIRST_16B(vreg1,vreg2) \
+-	vctzlsbb r6,v7;             \
+-	cmpld	 cr7,r5,r6;         \
+-	ble	 cr7,L(ret0);       \
+-	vextubrx r5,r6,vreg1;       \
+-	vextubrx r4,r6,vreg2;       \
+-	subf	 r3,r4,r5;          \
+-	blr;
+-
+-#define TAIL_SECOND_16B(vreg1,vreg2) \
+-	vctzlsbb r6,v7;              \
+-	addi	 r0,r6,16;           \
+-	cmpld	 cr7,r5,r0;          \
+-	ble	 cr7,L(ret0);        \
+-	vextubrx r5,r6,vreg1;        \
+-	vextubrx r4,r6,vreg2;        \
+-	subf	 r3,r4,r5;           \
+-	blr;
+-
+-#define CHECK_N_BYTES(reg1,reg2,len_reg) \
+-	sldi	  r6,len_reg,56;	 \
+-	lxvl	  32+v4,reg1,r6;	 \
+-	lxvl	  32+v5,reg2,r6;	 \
+-	add	  reg1,reg1,len_reg;	 \
+-	add	  reg2,reg2,len_reg;	 \
+-	vcmpnezb  v7,v4,v5;		 \
+-	vctzlsbb  r6,v7;		 \
+-	cmpld	  cr7,r6,len_reg;	 \
+-	blt	  cr7,L(different);	 \
+-	cmpld	  cr7,r5,len_reg;	 \
+-	ble	  cr7,L(ret0);		 \
+-	sub	  r5,r5,len_reg;	 \
+-
+-	/* TODO: change this to .machine power10 when the minimum required
+-	 binutils allows it.  */
+-	.machine  power9
+-ENTRY_TOCLESS (STRNCMP, 4)
+-	/* Check if size is 0.  */
+-	cmpdi	 cr0,r5,0
+-	beq	 cr0,L(ret0)
+-	andi.   r7,r3,4095
+-	andi.   r8,r4,4095
+-	cmpldi  cr0,r7,4096-16
+-	cmpldi  cr1,r8,4096-16
+-	bgt     cr0,L(crosses)
+-	bgt     cr1,L(crosses)
+-	COMPARE_16(v4,v5,0)
+-	addi	r3,r3,16
+-	addi	r4,r4,16
+-
+-L(crosses):
+-	andi.	 r7,r3,15
+-	subfic	 r7,r7,16	/* r7(nalign1) = 16 - (str1 & 15).  */
+-	andi.	 r9,r4,15
+-	subfic	 r8,r9,16	/* r8(nalign2) = 16 - (str2 & 15).  */
+-	cmpld	 cr7,r7,r8
+-	beq	 cr7,L(same_aligned)
+-	blt	 cr7,L(nalign1_min)
+-
+-	/* nalign2 is minimum and s2 pointer is aligned.  */
+-	CHECK_N_BYTES(r3,r4,r8)
+-	/* Are we on the 64B hunk which crosses a page?  */
+-	andi.   r10,r3,63       /* Determine offset into 64B hunk.  */
+-	andi.   r8,r3,15        /* The offset into the 16B hunk.  */
+-	neg     r7,r3
+-	andi.   r9,r7,15        /* Number of bytes after a 16B cross.  */
+-	rlwinm. r7,r7,26,0x3F   /* ((r4-4096))>>6&63.  */
+-	beq     L(compare_64_pagecross)
+-	mtctr   r7
+-	b       L(compare_64B_unaligned)
+-
+-	/* nalign1 is minimum and s1 pointer is aligned.  */
+-L(nalign1_min):
+-	CHECK_N_BYTES(r3,r4,r7)
+-	/* Are we on the 64B hunk which crosses a page?  */
+-	andi.   r10,r4,63       /* Determine offset into 64B hunk.  */
+-	andi.   r8,r4,15        /* The offset into the 16B hunk.  */
+-	neg     r7,r4
+-	andi.   r9,r7,15        /* Number of bytes after a 16B cross.  */
+-	rlwinm. r7,r7,26,0x3F   /* ((r4-4096))>>6&63.  */
+-	beq     L(compare_64_pagecross)
+-	mtctr   r7
+-
+-	.p2align 5
+-L(compare_64B_unaligned):
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	COMPARE_16(v4,v5,32)
+-	COMPARE_16(v4,v5,48)
+-	addi    r3,r3,64
+-	addi    r4,r4,64
+-	bdnz    L(compare_64B_unaligned)
+-
+-	/* Cross the page boundary of s2, carefully. Only for first
+-	iteration we have to get the count of 64B blocks to be checked.
+-	From second iteration and beyond, loop counter is always 63.  */
+-L(compare_64_pagecross):
+-	li      r11, 63
+-	mtctr   r11
+-	cmpldi  r10,16
+-	ble     L(cross_4)
+-	cmpldi  r10,32
+-	ble     L(cross_3)
+-	cmpldi  r10,48
+-	ble     L(cross_2)
+-L(cross_1):
+-	CHECK_N_BYTES(r3,r4,r9)
+-	CHECK_N_BYTES(r3,r4,r8)
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	COMPARE_16(v4,v5,32)
+-	addi    r3,r3,48
+-	addi    r4,r4,48
+-	b       L(compare_64B_unaligned)
+-L(cross_2):
+-	COMPARE_16(v4,v5,0)
+-	addi    r3,r3,16
+-	addi    r4,r4,16
+-	CHECK_N_BYTES(r3,r4,r9)
+-	CHECK_N_BYTES(r3,r4,r8)
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	addi    r3,r3,32
+-	addi    r4,r4,32
+-	b       L(compare_64B_unaligned)
+-L(cross_3):
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	addi    r3,r3,32
+-	addi    r4,r4,32
+-	CHECK_N_BYTES(r3,r4,r9)
+-	CHECK_N_BYTES(r3,r4,r8)
+-	COMPARE_16(v4,v5,0)
+-	addi    r3,r3,16
+-	addi    r4,r4,16
+-	b       L(compare_64B_unaligned)
+-L(cross_4):
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	COMPARE_16(v4,v5,32)
+-	addi    r3,r3,48
+-	addi    r4,r4,48
+-	CHECK_N_BYTES(r3,r4,r9)
+-	CHECK_N_BYTES(r3,r4,r8)
+-	b       L(compare_64B_unaligned)
+-
+-L(same_aligned):
+-	CHECK_N_BYTES(r3,r4,r7)
+-	/* Align s1 to 32B and adjust s2 address.
+-	   Use lxvp only if both s1 and s2 are 32B aligned.  */
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	COMPARE_16(v4,v5,32)
+-	COMPARE_16(v4,v5,48)
+-	addi	r3,r3,64
+-	addi	r4,r4,64
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	addi	r5,r5,32
+-
+-	clrldi  r6,r3,59
+-	subfic	r7,r6,32
+-	add	r3,r3,r7
+-	add	r4,r4,r7
+-	subf	r5,r7,r5
+-	andi.	r7,r4,0x1F
+-	beq	cr0,L(32B_aligned_loop)
+-
+-	.p2align 5
+-L(16B_aligned_loop):
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	COMPARE_16(v4,v5,32)
+-	COMPARE_16(v4,v5,48)
+-	addi	r3,r3,64
+-	addi	r4,r4,64
+-	b	L(16B_aligned_loop)
+-
+-	/* Calculate and return the difference.  */
+-L(different):
+-	TAIL_FIRST_16B(v4,v5)
+-
+-	.p2align 5
+-L(32B_aligned_loop):
+-	COMPARE_32(v14,v16,0,tail1,tail2)
+-	COMPARE_32(v18,v20,32,tail3,tail4)
+-	COMPARE_32(v22,v24,64,tail5,tail6)
+-	COMPARE_32(v26,v28,96,tail7,tail8)
+-	addi	r3,r3,128
+-	addi	r4,r4,128
+-	b	L(32B_aligned_loop)
+-
+-L(tail1): TAIL_FIRST_16B(v15,v17)
+-L(tail2): TAIL_SECOND_16B(v14,v16)
+-L(tail3): TAIL_FIRST_16B(v19,v21)
+-L(tail4): TAIL_SECOND_16B(v18,v20)
+-L(tail5): TAIL_FIRST_16B(v23,v25)
+-L(tail6): TAIL_SECOND_16B(v22,v24)
+-L(tail7): TAIL_FIRST_16B(v27,v29)
+-L(tail8): TAIL_SECOND_16B(v26,v28)
+-
+-	.p2align 5
+-L(ret0):
+-	li	r3,0
+-	blr
+-
+-END(STRNCMP)
+-libc_hidden_builtin_def(strncmp)
+diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile
+index b847c19049..a38ff46448 100644
+--- a/sysdeps/powerpc/powerpc64/multiarch/Makefile
++++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile
+@@ -34,7 +34,7 @@ ifneq (,$(filter %le,$(config-machine)))
+ sysdep_routines += memchr-power10 memcmp-power10 memcpy-power10 \
+ 		   memmove-power10 memset-power10 rawmemchr-power9 \
+ 		   rawmemchr-power10 strcmp-power9 strcmp-power10 \
+-		   strncmp-power9 strncmp-power10 strcpy-power9 stpcpy-power9 \
++		   strncmp-power9 strcpy-power9 stpcpy-power9 \
+ 		   strlen-power9 strncpy-power9 stpncpy-power9 strlen-power10
+ endif
+ CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
+diff --git a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
+index 2bb47d3527..30fd89e109 100644
+--- a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
++++ b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
+@@ -164,9 +164,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
+   /* Support sysdeps/powerpc/powerpc64/multiarch/strncmp.c.  */
+   IFUNC_IMPL (i, name, strncmp,
+ #ifdef __LITTLE_ENDIAN__
+-	      IFUNC_IMPL_ADD (array, i, strncmp, hwcap2 & PPC_FEATURE2_ARCH_3_1
+-			      && hwcap & PPC_FEATURE_HAS_VSX,
+-			      __strncmp_power10)
+ 	      IFUNC_IMPL_ADD (array, i, strncmp, hwcap2 & PPC_FEATURE2_ARCH_3_00
+ 			      && hwcap & PPC_FEATURE_HAS_ALTIVEC,
+ 			      __strncmp_power9)
+diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power10.S b/sysdeps/powerpc/powerpc64/multiarch/strncmp-power10.S
+deleted file mode 100644
+index d7026c12e2..0000000000
+--- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power10.S
++++ /dev/null
+@@ -1,25 +0,0 @@
+-/* Copyright (C) 2024 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, see
+-   <https://www.gnu.org/licenses/>.  */
+-
+-#if defined __LITTLE_ENDIAN__ && IS_IN (libc)
+-#define STRNCMP __strncmp_power10
+-
+-#undef libc_hidden_builtin_def
+-#define libc_hidden_builtin_def(name)
+-
+-#include <sysdeps/powerpc/powerpc64/le/power10/strncmp.S>
+-#endif
+diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp.c b/sysdeps/powerpc/powerpc64/multiarch/strncmp.c
+index a5ed67f766..6178f4a432 100644
+--- a/sysdeps/powerpc/powerpc64/multiarch/strncmp.c
++++ b/sysdeps/powerpc/powerpc64/multiarch/strncmp.c
+@@ -29,7 +29,6 @@ extern __typeof (strncmp) __strncmp_ppc attribute_hidden;
+ extern __typeof (strncmp) __strncmp_power8 attribute_hidden;
+ # ifdef __LITTLE_ENDIAN__
+ extern __typeof (strncmp) __strncmp_power9 attribute_hidden;
+-extern __typeof (strncmp) __strncmp_power10 attribute_hidden;
+ # endif
+ # undef strncmp
+ 
+@@ -37,9 +36,6 @@ extern __typeof (strncmp) __strncmp_power10 attribute_hidden;
+    ifunc symbol properly.  */
+ libc_ifunc_redirected (__redirect_strncmp, strncmp,
+ # ifdef __LITTLE_ENDIAN__
+-			(hwcap2 & PPC_FEATURE2_ARCH_3_1
+-			 && hwcap & PPC_FEATURE_HAS_VSX)
+-			? __strncmp_power10 :
+ 			(hwcap2 & PPC_FEATURE2_ARCH_3_00
+ 			 && hwcap & PPC_FEATURE_HAS_ALTIVEC)
+ 			? __strncmp_power9 :
+
+commit 2ad6e55ea5cb23af5af7af35d5f80cd93032f96a
+Author: Carlos O'Donell <carlos@redhat.com>
+Date:   Wed Jun 11 09:43:50 2025 -0400
+
+    ppc64le: Revert "powerpc: Fix performance issues of strcmp power10" (CVE-2025-5702)
+    
+    This reverts commit 90bcc8721ef82b7378d2b080141228660e862d56
+    
+    This change is in the chain of the final revert that fixes the CVE
+    i.e. 3367d8e180848030d1646f088759f02b8dfe0d6f
+    
+    Reason for revert: Power10 strcmp clobbers non-volatile vector
+    registers (Bug 33056)
+    
+    Tested on ppc64le with no regressions.
+    
+    (cherry picked from commit c22de63588df7a8a0edceea9bb02534064c9d201)
+
+diff --git a/sysdeps/powerpc/powerpc64/le/power10/strcmp.S b/sysdeps/powerpc/powerpc64/le/power10/strcmp.S
+index f0d6732a25..00f1e9c170 100644
+--- a/sysdeps/powerpc/powerpc64/le/power10/strcmp.S
++++ b/sysdeps/powerpc/powerpc64/le/power10/strcmp.S
+@@ -62,7 +62,7 @@
+ 	lxvl	  32+v5,reg2,r0;         \
+ 	add	  reg1,reg1,len_reg;     \
+ 	add	  reg2,reg2,len_reg;     \
+-	vcmpnezb  v7,v4,v5;              \
++	vcmpnezb. v7,v4,v5;              \
+ 	vctzlsbb  r6,v7;                 \
+ 	cmpld	  cr7,r6,len_reg;        \
+ 	blt	  cr7,L(different);      \
+@@ -72,110 +72,70 @@
+ 
+ 	.machine  power9
+ ENTRY_TOCLESS (STRCMP, 4)
+-	andi.	r7,r3,4095
+-	andi.	r8,r4,4095
+-	cmpldi	cr0,r7,4096-16
+-	cmpldi	cr1,r8,4096-16
+-	bgt	cr0,L(crosses)
+-	bgt	cr1,L(crosses)
+-	COMPARE_16(v4,v5,0)
+-
+-L(crosses):
+-	andi.	r7,r3,15
+-	subfic	r7,r7,16	/* r7(nalign1) = 16 - (str1 & 15).  */
+-	andi.	r9,r4,15
+-	subfic	r5,r9,16	/* r5(nalign2) = 16 - (str2 & 15).  */
+-	cmpld	cr7,r7,r5
+-	beq	cr7,L(same_aligned)
+-	blt	cr7,L(nalign1_min)
++	li	 r11,16
++	/* eq bit of cr1 used as swap status flag to indicate if
++	source pointers were swapped.  */
++	crclr	 4*cr1+eq
++	vspltisb v19,-1
++	andi.	 r7,r3,15
++	sub	 r7,r11,r7	/* r7(nalign1) = 16 - (str1 & 15).  */
++	andi.	 r9,r4,15
++	sub	 r5,r11,r9	/* r5(nalign2) = 16 - (str2 & 15).  */
++	cmpld	 cr7,r7,r5
++	beq	 cr7,L(same_aligned)
++	blt	 cr7,L(nalign1_min)
++	/* Swap r3 and r4, and r7 and r5 such that r3 and r7 hold the
++	pointer which is closer to the next 16B boundary so that only
++	one CHECK_N_BYTES is needed before entering the loop below.  */
++	mr	 r8,r4
++	mr	 r4,r3
++	mr	 r3,r8
++	mr	 r12,r7
++	mr	 r7,r5
++	mr	 r5,r12
++	crset	 4*cr1+eq	/* Set bit on swapping source pointers.  */
+ 
+-	/* nalign2 is minimum and s2 pointer is aligned.  */
+-	CHECK_N_BYTES(r3,r4,r5)
+-	/* Are we on the 64B hunk which crosses a page?  */
+-	andi.	r10,r3,63	/* Determine offset into 64B hunk.  */
+-	andi.	r8,r3,15        /* The offset into the 16B hunk.  */
+-	neg	r7,r3
+-	andi.	r9,r7,15	/* Number of bytes after a 16B cross.  */
+-	rlwinm.	r7,r7,26,0x3F	/* ((r3-4096))>>6&63.  */
+-	beq	L(compare_64_pagecross)
+-	mtctr	r7
+-	b	L(compare_64B_unaligned)
+-
+-	/* nalign1 is minimum and s1 pointer is aligned.  */
++	.p2align 5
+ L(nalign1_min):
+ 	CHECK_N_BYTES(r3,r4,r7)
+-	/* Are we on the 64B hunk which crosses a page?  */
+-	andi.	r10,r4,63	/* Determine offset into 64B hunk.  */
+-	andi.	r8,r4,15	/* The offset into the 16B hunk.  */
+-	neg	r7,r4
+-	andi.	r9,r7,15	/* Number of bytes after a 16B cross.  */
+-	rlwinm. r7,r7,26,0x3F	/* ((r4-4096))>>6&63.  */
+-	beq	L(compare_64_pagecross)
+-	mtctr	r7
+ 
+ 	.p2align 5
+-L(compare_64B_unaligned):
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	COMPARE_16(v4,v5,32)
+-	COMPARE_16(v4,v5,48)
+-	addi	r3,r3,64
+-	addi	r4,r4,64
+-	bdnz	L(compare_64B_unaligned)
++L(s1_aligned):
++	/* r9 and r5 is number of bytes to be read after and before
++	 page boundary correspondingly.  */
++	sub 	r5,r5,r7
++	subfic	r9,r5,16
++	/* Now let r7 hold the count of quadwords which can be
++	checked without crossing a page boundary. quadword offset is
++	(str2>>4)&0xFF.  */
++	rlwinm	r7,r4,28,0xFF
++	/* Below check is required only for first iteration. For second
++	iteration and beyond, the new loop counter is always 255.  */
++	cmpldi	r7,255
++	beq	L(L3)
++	/* Get the initial loop count by 255-((str2>>4)&0xFF).  */
++	subfic  r11,r7,255
+ 
+-	/* Cross the page boundary of s2, carefully. Only for first
+-	iteration we have to get the count of 64B blocks to be checked.
+-	From second iteration and beyond, loop counter is always 63.  */
+-L(compare_64_pagecross):
+-	li	r11, 63
++	.p2align 5
++L(L1):
+ 	mtctr	r11
+-	cmpldi	r10,16
+-	ble	L(cross_4)
+-	cmpldi	r10,32
+-	ble	L(cross_3)
+-	cmpldi	r10,48
+-	ble	L(cross_2)
+-L(cross_1):
+-	CHECK_N_BYTES(r3,r4,r9)
+-	CHECK_N_BYTES(r3,r4,r8)
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	COMPARE_16(v4,v5,32)
+-	addi	r3,r3,48
+-	addi	r4,r4,48
+-	b	L(compare_64B_unaligned)
+-L(cross_2):
+-	COMPARE_16(v4,v5,0)
+-	addi	r3,r3,16
+-	addi	r4,r4,16
+-	CHECK_N_BYTES(r3,r4,r9)
+-	CHECK_N_BYTES(r3,r4,r8)
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	addi	r3,r3,32
+-	addi	r4,r4,32
+-	b	L(compare_64B_unaligned)
+-L(cross_3):
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	addi	r3,r3,32
+-	addi	r4,r4,32
+-	CHECK_N_BYTES(r3,r4,r9)
+-	CHECK_N_BYTES(r3,r4,r8)
+-	COMPARE_16(v4,v5,0)
++
++	.p2align 5
++L(L2):
++	COMPARE_16(v4,v5,0)	/* Load 16B blocks using lxv.  */
+ 	addi	r3,r3,16
+ 	addi	r4,r4,16
+-	b	L(compare_64B_unaligned)
+-L(cross_4):
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	COMPARE_16(v4,v5,32)
+-	addi	r3,r3,48
+-	addi	r4,r4,48
++	bdnz	L(L2)
++	/* Cross the page boundary of s2, carefully.  */
++
++	.p2align 5
++L(L3):
++	CHECK_N_BYTES(r3,r4,r5)
+ 	CHECK_N_BYTES(r3,r4,r9)
+-	CHECK_N_BYTES(r3,r4,r8)
+-	b	L(compare_64B_unaligned)
++	li 	r11,255		/* Load the new loop counter.  */
++	b	L(L1)
+ 
++	.p2align 5
+ L(same_aligned):
+ 	CHECK_N_BYTES(r3,r4,r7)
+         /* Align s1 to 32B and adjust s2 address.
+@@ -208,7 +168,18 @@ L(16B_aligned_loop):
+ 
+ 	/* Calculate and return the difference.  */
+ L(different):
+-	TAIL(v4,v5)
++	vctzlsbb r6,v7
++	vextubrx r5,r6,v4
++	vextubrx r4,r6,v5
++	bt  	 4*cr1+eq,L(swapped)
++	subf	 r3,r4,r5
++	blr
++
++	/* If src pointers were swapped, then swap the
++	indices and calculate the return value.  */
++L(swapped):
++	subf     r3,r5,r4
++	blr
+ 
+ 	.p2align 5
+ L(32B_aligned_loop):
+
+commit 672f31b90e501b4ba10ba12ab4c6051f77589912
+Author: Carlos O'Donell <carlos@redhat.com>
+Date:   Wed Jun 11 09:33:45 2025 -0400
+
+    ppc64le: Revert "powerpc : Add optimized memchr for POWER10" (Bug 33059)
+    
+    This reverts commit b9182c793caa05df5d697427c0538936e6396d4b
+    
+    Reason for revert: Power10 memchr clobbers v20 vector register
+    (Bug 33059)
+    
+    This is not a security issue, unlike CVE-2025-5745 and
+    CVE-2025-5702.
+    
+    Tested on ppc64le without regression.
+    
+    (cherry picked from commit a7877bb6685300f159fa095c9f50b22b112cddb8)
+
+diff --git a/sysdeps/powerpc/powerpc64/le/power10/memchr.S b/sysdeps/powerpc/powerpc64/le/power10/memchr.S
+deleted file mode 100644
+index 53e5716d72..0000000000
+--- a/sysdeps/powerpc/powerpc64/le/power10/memchr.S
++++ /dev/null
+@@ -1,315 +0,0 @@
+-/* Optimized memchr implementation for POWER10 LE.
+-   Copyright (C) 2021-2024 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, see
+-   <https://www.gnu.org/licenses/>.  */
+-
+-#include <sysdep.h>
+-
+-# ifndef MEMCHR
+-#  define MEMCHR __memchr
+-# endif
+-# define M_VREG_ZERO v20
+-# define M_OFF_START_LOOP 256
+-# define MEMCHR_SUBTRACT_VECTORS \
+-	vsububm   v4,v4,v18;	    \
+-	vsububm   v5,v5,v18;	    \
+-	vsububm   v6,v6,v18;	    \
+-	vsububm   v7,v7,v18;
+-# define M_TAIL(vreg,increment)	   \
+-	vctzlsbb  r4,vreg;	   \
+-	cmpld     r5,r4;	   \
+-	ble       L(null);	   \
+-	addi	  r4,r4,increment; \
+-	add	  r3,r6,r4;	   \
+-	blr
+-
+-/* TODO: Replace macros by the actual instructions when minimum binutils becomes
+-   >= 2.35.  This is used to keep compatibility with older versions.  */
+-#define M_VEXTRACTBM(rt,vrb)	 \
+-	.long(((4)<<(32-6))	 \
+-	      | ((rt)<<(32-11))	 \
+-	      | ((8)<<(32-16))	 \
+-	      | ((vrb)<<(32-21)) \
+-	      | 1602)
+-
+-#define M_LXVP(xtp,dq,ra)		   \
+-	.long(((6)<<(32-6))		   \
+-	      | ((((xtp)-32)>>1)<<(32-10)) \
+-	      | ((1)<<(32-11))		   \
+-	      | ((ra)<<(32-16))		   \
+-	      | dq)
+-
+-#define CHECK16B(vreg,offset,addr,label) \
+-	lxv	  vreg+32,offset(addr);	\
+-	vcmpequb. vreg,vreg,v18;	\
+-	bne	  cr6,L(label);		\
+-	cmpldi	  r5,16;		\
+-	ble	  L(null);		\
+-	addi	  r5,r5,-16;
+-
+-/* Load 4 quadwords, merge into one VR for speed and check for NULLs.  r6 has #
+-   of bytes already checked.  */
+-#define CHECK64B(offset,addr,label)	    \
+-	M_LXVP(v4+32,offset,addr);	    \
+-	M_LXVP(v6+32,offset+32,addr);	    \
+-	MEMCHR_SUBTRACT_VECTORS;	    \
+-	vminub	  v14,v4,v5;		    \
+-	vminub	  v15,v6,v7;		    \
+-	vminub	  v16,v14,v15;		    \
+-	vcmpequb. v0,v16,M_VREG_ZERO;	    \
+-	beq	  cr6,$+12;		    \
+-	li	  r7,offset;		    \
+-	b     	  L(label);          	    \
+-	cmpldi	  r5,64;		    \
+-	ble	  L(null);		    \
+-	addi	  r5,r5,-64
+-
+-/* Implements the function
+-   void *[r3] memchr (const void *s [r3], int c [r4], size_t n [r5]).  */
+-
+-	.machine power9
+-
+-ENTRY_TOCLESS (MEMCHR)
+-	CALL_MCOUNT 3
+-
+-	cmpldi	r5,0
+-	beq	L(null)
+-	mr	r0,r5
+-	xori	r6,r4,0xff
+-
+-	mtvsrd	v18+32,r4	/* matching char in v18  */
+-	mtvsrd	v19+32,r6	/* non matching char in v19  */
+-
+-	vspltb	v18,v18,7	/* replicate  */
+-	vspltb	v19,v19,7	/* replicate  */
+-	vspltisb  M_VREG_ZERO,0
+-
+-	/* Next 16B-aligned address. Prepare address for L(aligned).  */
+-	addi	  r6,r3,16
+-	clrrdi	  r6,r6,4
+-
+-	/* Align data and fill bytes not loaded with non matching char.	 */
+-	lvx	  v0,0,r3
+-	lvsr	  v1,0,r3
+-	vperm	  v0,v19,v0,v1
+-
+-	vcmpequb. v6,v0,v18
+-	bne	  cr6,L(found)
+-	sub	  r4,r6,r3
+-	cmpld	  r5,r4
+-	ble	  L(null)
+-	sub	  r5,r5,r4
+-
+-	/* Test up to OFF_START_LOOP-16 bytes in 16B chunks.  The main loop is
+-	   optimized for longer strings, so checking the first bytes in 16B
+-	   chunks benefits a lot small strings.  */
+-	.p2align 5
+-L(aligned):
+-	cmpldi	r5,0
+-	beq     L(null)
+-
+-	CHECK16B(v0,0,r6,tail1)
+-	CHECK16B(v1,16,r6,tail2)
+-	CHECK16B(v2,32,r6,tail3)
+-	CHECK16B(v3,48,r6,tail4)
+-	CHECK16B(v4,64,r6,tail5)
+-	CHECK16B(v5,80,r6,tail6)
+-	CHECK16B(v6,96,r6,tail7)
+-	CHECK16B(v7,112,r6,tail8)
+-	CHECK16B(v8,128,r6,tail9)
+-	CHECK16B(v9,144,r6,tail10)
+-	CHECK16B(v10,160,r6,tail11)
+-	CHECK16B(v0,176,r6,tail12)
+-	CHECK16B(v1,192,r6,tail13)
+-	CHECK16B(v2,208,r6,tail14)
+-	CHECK16B(v3,224,r6,tail15)
+-
+-	cmpdi	cr5,r4,0	/* Check if c == 0.  This will be useful to
+-				   choose how we will perform the main loop.  */
+-
+-	/* Prepare address for the loop.  */
+-	addi	  r4,r3,M_OFF_START_LOOP
+-	clrrdi	  r4,r4,6
+-	sub	  r6,r4,r3
+-	sub	  r5,r0,r6
+-	addi	  r6,r4,128
+-
+-	/* If c == 0, use the loop without the vsububm.  */
+-	beq	cr5,L(loop)
+-
+-	/* This is very similar to the block after L(loop), the difference is
+-	   that here MEMCHR_SUBTRACT_VECTORS is not empty, and we subtract
+-	   each byte loaded by the char we are looking for, this way we can keep
+-	   using vminub to merge the results and checking for nulls.  */
+-	.p2align 5
+-L(memchr_loop):
+-	CHECK64B(0,r4,pre_tail_64b)
+-	CHECK64B(64,r4,pre_tail_64b)
+-	addi	r4,r4,256
+-
+-	CHECK64B(0,r6,tail_64b)
+-	CHECK64B(64,r6,tail_64b)
+-	addi	r6,r6,256
+-
+-	CHECK64B(0,r4,pre_tail_64b)
+-	CHECK64B(64,r4,pre_tail_64b)
+-	addi	r4,r4,256
+-
+-	CHECK64B(0,r6,tail_64b)
+-	CHECK64B(64,r6,tail_64b)
+-	addi	r6,r6,256
+-
+-	b	L(memchr_loop)
+-	/* Switch to a more aggressive approach checking 64B each time.  Use 2
+-	   pointers 128B apart and unroll the loop once to make the pointer
+-	   updates and usages separated enough to avoid stalls waiting for
+-	   address calculation.  */
+-	.p2align 5
+-L(loop):
+-#undef MEMCHR_SUBTRACT_VECTORS
+-#define MEMCHR_SUBTRACT_VECTORS /* nothing */
+-	CHECK64B(0,r4,pre_tail_64b)
+-	CHECK64B(64,r4,pre_tail_64b)
+-	addi	  r4,r4,256
+-
+-	CHECK64B(0,r6,tail_64b)
+-	CHECK64B(64,r6,tail_64b)
+-	addi	  r6,r6,256
+-
+-	CHECK64B(0,r4,pre_tail_64b)
+-	CHECK64B(64,r4,pre_tail_64b)
+-	addi      r4,r4,256
+-
+-	CHECK64B(0,r6,tail_64b)
+-	CHECK64B(64,r6,tail_64b)
+-	addi      r6,r6,256
+-
+-	b	  L(loop)
+-
+-	.p2align  5
+-L(pre_tail_64b):
+-	mr	r6,r4
+-L(tail_64b):
+-	/* OK, we found a null byte.  Let's look for it in the current 64-byte
+-	   block and mark it in its corresponding VR.  lxvp vx,0(ry) puts the
+-	   low 16B bytes into vx+1, and the high into vx, so the order here is
+-	   v5, v4, v7, v6.  */
+-	vcmpequb  v1,v5,M_VREG_ZERO
+-	vcmpequb  v2,v4,M_VREG_ZERO
+-	vcmpequb  v3,v7,M_VREG_ZERO
+-	vcmpequb  v4,v6,M_VREG_ZERO
+-
+-	/* Take into account the other 64B blocks we had already checked.  */
+-	add	r6,r6,r7
+-	/* Extract first bit of each byte.  */
+-	M_VEXTRACTBM(r8,v1)
+-	M_VEXTRACTBM(r9,v2)
+-	M_VEXTRACTBM(r10,v3)
+-	M_VEXTRACTBM(r11,v4)
+-
+-	/* Shift each value into their corresponding position.  */
+-	sldi	  r9,r9,16
+-	sldi	  r10,r10,32
+-	sldi	  r11,r11,48
+-
+-	/* Merge the results.  */
+-	or	  r8,r8,r9
+-	or	  r9,r10,r11
+-	or	  r11,r9,r8
+-
+-	cnttzd	  r0,r11	  /* Count trailing zeros before the match.  */
+-	cmpld     r5,r0
+-	ble	  L(null)
+-	add	  r3,r6,r0	  /* Compute final address.  */
+-	blr
+-
+-	.p2align  5
+-L(tail1):
+-	M_TAIL(v0,0)
+-
+-	.p2align  5
+-L(tail2):
+-	M_TAIL(v1,16)
+-
+-	.p2align  5
+-L(tail3):
+-	M_TAIL(v2,32)
+-
+-	.p2align  5
+-L(tail4):
+-	M_TAIL(v3,48)
+-
+-	.p2align  5
+-L(tail5):
+-	M_TAIL(v4,64)
+-
+-	.p2align  5
+-L(tail6):
+-	M_TAIL(v5,80)
+-
+-	.p2align  5
+-L(tail7):
+-	M_TAIL(v6,96)
+-
+-	.p2align  5
+-L(tail8):
+-	M_TAIL(v7,112)
+-
+-	.p2align  5
+-L(tail9):
+-	M_TAIL(v8,128)
+-
+-	.p2align  5
+-L(tail10):
+-	M_TAIL(v9,144)
+-
+-	.p2align  5
+-L(tail11):
+-	M_TAIL(v10,160)
+-
+-	.p2align  5
+-L(tail12):
+-	M_TAIL(v0,176)
+-
+-	.p2align  5
+-L(tail13):
+-	M_TAIL(v1,192)
+-
+-	.p2align  5
+-L(tail14):
+-	M_TAIL(v2,208)
+-
+-	.p2align  5
+-L(tail15):
+-	M_TAIL(v3,224)
+-
+-	.p2align  5
+-L(found):
+-	vctzlsbb  r7,v6
+-	cmpld     r5,r7
+-	ble       L(null)
+-	add       r3,r3,r7
+-	blr
+-
+-	.p2align  5
+-L(null):
+-	li	r3,0
+-	blr
+-
+-END (MEMCHR)
+-
+-weak_alias (__memchr, memchr)
+-libc_hidden_builtin_def (memchr)
+diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile
+index a38ff46448..fa1107dfd9 100644
+--- a/sysdeps/powerpc/powerpc64/multiarch/Makefile
++++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile
+@@ -31,10 +31,10 @@ sysdep_routines += memcpy-power8-cached memcpy-power7 memcpy-a2 memcpy-power6 \
+ 		   strncase-power8
+ 
+ ifneq (,$(filter %le,$(config-machine)))
+-sysdep_routines += memchr-power10 memcmp-power10 memcpy-power10 \
+-		   memmove-power10 memset-power10 rawmemchr-power9 \
+-		   rawmemchr-power10 strcmp-power9 strcmp-power10 \
+-		   strncmp-power9 strcpy-power9 stpcpy-power9 \
++sysdep_routines += memcmp-power10 memcpy-power10 memmove-power10 memset-power10 \
++		   rawmemchr-power9 rawmemchr-power10 \
++		   strcmp-power9 strcmp-power10 strncmp-power9 \
++		   strcpy-power9 stpcpy-power9 \
+ 		   strlen-power9 strncpy-power9 stpncpy-power9 strlen-power10
+ endif
+ CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
+diff --git a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
+index 30fd89e109..9b3e617306 100644
+--- a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
++++ b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
+@@ -226,12 +226,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
+ 
+   /* Support sysdeps/powerpc/powerpc64/multiarch/memchr.c.  */
+   IFUNC_IMPL (i, name, memchr,
+-#ifdef __LITTLE_ENDIAN__
+-	      IFUNC_IMPL_ADD (array, i, memchr,
+-		              hwcap2 & PPC_FEATURE2_ARCH_3_1
+-			      && hwcap & PPC_FEATURE_HAS_VSX,
+-			      __memchr_power10)
+-#endif
+ 	      IFUNC_IMPL_ADD (array, i, memchr,
+ 			      hwcap2 & PPC_FEATURE2_ARCH_2_07
+ 			      && hwcap & PPC_FEATURE_HAS_ALTIVEC,
+diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr-power10.S b/sysdeps/powerpc/powerpc64/multiarch/memchr-power10.S
+deleted file mode 100644
+index 7d35ef28a9..0000000000
+--- a/sysdeps/powerpc/powerpc64/multiarch/memchr-power10.S
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/* Optimized memchr implementation for POWER10/PPC64.
+-   Copyright (C) 2016-2024 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, see
+-   <https://www.gnu.org/licenses/>.  */
+-
+-#if defined __LITTLE_ENDIAN__ && IS_IN (libc)
+-#define MEMCHR __memchr_power10
+-
+-#undef libc_hidden_builtin_def
+-#define libc_hidden_builtin_def(name)
+-#undef weak_alias
+-#define weak_alias(name,alias)
+-
+-#include <sysdeps/powerpc/powerpc64/le/power10/memchr.S>
+-#endif
+diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr.c b/sysdeps/powerpc/powerpc64/multiarch/memchr.c
+index 57d23e7b18..b4655dfcaa 100644
+--- a/sysdeps/powerpc/powerpc64/multiarch/memchr.c
++++ b/sysdeps/powerpc/powerpc64/multiarch/memchr.c
+@@ -25,23 +25,15 @@ extern __typeof (__memchr) __memchr_ppc attribute_hidden;
+ extern __typeof (__memchr) __memchr_power7 attribute_hidden;
+ extern __typeof (__memchr) __memchr_power8 attribute_hidden;
+ 
+-# ifdef __LITTLE_ENDIAN__
+-extern __typeof (__memchr) __memchr_power10 attribute_hidden;
+-# endif
+ /* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
+    ifunc symbol properly.  */
+ libc_ifunc (__memchr,
+-# ifdef __LITTLE_ENDIAN__
+-	    (hwcap2 & PPC_FEATURE2_ARCH_3_1
+-	     && hwcap & PPC_FEATURE_HAS_VSX)
+-	    ? __memchr_power10 :
+-# endif
+-	      (hwcap2 & PPC_FEATURE2_ARCH_2_07
+-	      && hwcap & PPC_FEATURE_HAS_ALTIVEC)
+-	      ? __memchr_power8 :
+-	        (hwcap & PPC_FEATURE_ARCH_2_06)
+-	        ? __memchr_power7
+-	        : __memchr_ppc);
++	    (hwcap2 & PPC_FEATURE2_ARCH_2_07
++	     && hwcap & PPC_FEATURE_HAS_ALTIVEC)
++	    ? __memchr_power8 :
++	    (hwcap & PPC_FEATURE_ARCH_2_06)
++            ? __memchr_power7
++            : __memchr_ppc);
+ 
+ weak_alias (__memchr, memchr)
+ libc_hidden_builtin_def (memchr)
+
+commit 7e12550b8e3a11764a4a9090ce6bd3fc23fc8a8e
+Author: Carlos O'Donell <carlos@redhat.com>
+Date:   Mon Jun 16 13:09:57 2025 -0400
+
+    ppc64le: Revert "powerpc: Optimized strcmp for power10" (CVE-2025-5702)
+    
+    This reverts commit 3367d8e180848030d1646f088759f02b8dfe0d6f
+    
+    Reason for revert: Power10 strcmp clobbers non-volatile vector
+    registers (Bug 33056)
+    
+    Tested on ppc64le without regression.
+    
+    (cherry picked from commit 15808c77b35319e67ee0dc8f984a9a1a434701bc)
+
+diff --git a/sysdeps/powerpc/powerpc64/le/power10/strcmp.S b/sysdeps/powerpc/powerpc64/le/power10/strcmp.S
+deleted file mode 100644
+index 00f1e9c170..0000000000
+--- a/sysdeps/powerpc/powerpc64/le/power10/strcmp.S
++++ /dev/null
+@@ -1,204 +0,0 @@
+-/* Optimized strcmp implementation for PowerPC64/POWER10.
+-   Copyright (C) 2021-2024 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, see
+-   <https://www.gnu.org/licenses/>.  */
+-#include <sysdep.h>
+-
+-#ifndef STRCMP
+-# define STRCMP strcmp
+-#endif
+-
+-/* Implements the function
+-   int [r3] strcmp (const char *s1 [r3], const char *s2 [r4]).  */
+-
+-/* TODO: Change this to actual instructions when minimum binutils is upgraded
+-   to 2.27.  Macros are defined below for these newer instructions in order
+-   to maintain compatibility.  */
+-
+-#define LXVP(xtp,dq,ra)		     \
+-	.long(((6)<<(32-6))	     \
+-	| ((((xtp)-32)>>1)<<(32-10)) \
+-	| ((1)<<(32-11))	     \
+-	| ((ra)<<(32-16))	     \
+-	| dq)
+-
+-#define COMPARE_16(vreg1,vreg2,offset)  \
+-	lxv       vreg1+32,offset(r3);  \
+-	lxv       vreg2+32,offset(r4);	\
+-	vcmpnezb. v7,vreg1,vreg2;	\
+-	bne       cr6,L(different);     \
+-
+-#define COMPARE_32(vreg1,vreg2,offset,label1,label2) \
+-	LXVP(vreg1+32,offset,r3);                    \
+-	LXVP(vreg2+32,offset,r4);                    \
+-	vcmpnezb. v7,vreg1+1,vreg2+1;                \
+-	bne	  cr6,L(label1);                     \
+-	vcmpnezb. v7,vreg1,vreg2;                    \
+-	bne	  cr6,L(label2);                     \
+-
+-#define TAIL(vreg1,vreg2)     \
+-	vctzlsbb r6,v7;	      \
+-	vextubrx r5,r6,vreg1; \
+-	vextubrx r4,r6,vreg2; \
+-	subf	 r3,r4,r5;    \
+-	blr;                  \
+-
+-#define CHECK_N_BYTES(reg1,reg2,len_reg) \
+-	sldi	  r0,len_reg,56;         \
+-	lxvl	  32+v4,reg1,r0;         \
+-	lxvl	  32+v5,reg2,r0;         \
+-	add	  reg1,reg1,len_reg;     \
+-	add	  reg2,reg2,len_reg;     \
+-	vcmpnezb. v7,v4,v5;              \
+-	vctzlsbb  r6,v7;                 \
+-	cmpld	  cr7,r6,len_reg;        \
+-	blt	  cr7,L(different);      \
+-
+-	/* TODO: change this to .machine power10 when the minimum required
+-	binutils allows it.  */
+-
+-	.machine  power9
+-ENTRY_TOCLESS (STRCMP, 4)
+-	li	 r11,16
+-	/* eq bit of cr1 used as swap status flag to indicate if
+-	source pointers were swapped.  */
+-	crclr	 4*cr1+eq
+-	vspltisb v19,-1
+-	andi.	 r7,r3,15
+-	sub	 r7,r11,r7	/* r7(nalign1) = 16 - (str1 & 15).  */
+-	andi.	 r9,r4,15
+-	sub	 r5,r11,r9	/* r5(nalign2) = 16 - (str2 & 15).  */
+-	cmpld	 cr7,r7,r5
+-	beq	 cr7,L(same_aligned)
+-	blt	 cr7,L(nalign1_min)
+-	/* Swap r3 and r4, and r7 and r5 such that r3 and r7 hold the
+-	pointer which is closer to the next 16B boundary so that only
+-	one CHECK_N_BYTES is needed before entering the loop below.  */
+-	mr	 r8,r4
+-	mr	 r4,r3
+-	mr	 r3,r8
+-	mr	 r12,r7
+-	mr	 r7,r5
+-	mr	 r5,r12
+-	crset	 4*cr1+eq	/* Set bit on swapping source pointers.  */
+-
+-	.p2align 5
+-L(nalign1_min):
+-	CHECK_N_BYTES(r3,r4,r7)
+-
+-	.p2align 5
+-L(s1_aligned):
+-	/* r9 and r5 is number of bytes to be read after and before
+-	 page boundary correspondingly.  */
+-	sub 	r5,r5,r7
+-	subfic	r9,r5,16
+-	/* Now let r7 hold the count of quadwords which can be
+-	checked without crossing a page boundary. quadword offset is
+-	(str2>>4)&0xFF.  */
+-	rlwinm	r7,r4,28,0xFF
+-	/* Below check is required only for first iteration. For second
+-	iteration and beyond, the new loop counter is always 255.  */
+-	cmpldi	r7,255
+-	beq	L(L3)
+-	/* Get the initial loop count by 255-((str2>>4)&0xFF).  */
+-	subfic  r11,r7,255
+-
+-	.p2align 5
+-L(L1):
+-	mtctr	r11
+-
+-	.p2align 5
+-L(L2):
+-	COMPARE_16(v4,v5,0)	/* Load 16B blocks using lxv.  */
+-	addi	r3,r3,16
+-	addi	r4,r4,16
+-	bdnz	L(L2)
+-	/* Cross the page boundary of s2, carefully.  */
+-
+-	.p2align 5
+-L(L3):
+-	CHECK_N_BYTES(r3,r4,r5)
+-	CHECK_N_BYTES(r3,r4,r9)
+-	li 	r11,255		/* Load the new loop counter.  */
+-	b	L(L1)
+-
+-	.p2align 5
+-L(same_aligned):
+-	CHECK_N_BYTES(r3,r4,r7)
+-        /* Align s1 to 32B and adjust s2 address.
+-	   Use lxvp only if both s1 and s2 are 32B aligned.  */
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	COMPARE_16(v4,v5,32)
+-	COMPARE_16(v4,v5,48)
+-	addi	r3,r3,64
+-	addi	r4,r4,64
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-
+-	clrldi	r6,r3,59
+-	subfic	r5,r6,32
+-	add	r3,r3,r5
+-	add	r4,r4,r5
+-	andi.	r5,r4,0x1F
+-	beq	cr0,L(32B_aligned_loop)
+-
+-	.p2align 5
+-L(16B_aligned_loop):
+-	COMPARE_16(v4,v5,0)
+-	COMPARE_16(v4,v5,16)
+-	COMPARE_16(v4,v5,32)
+-	COMPARE_16(v4,v5,48)
+-	addi	r3,r3,64
+-	addi	r4,r4,64
+-	b	L(16B_aligned_loop)
+-
+-	/* Calculate and return the difference.  */
+-L(different):
+-	vctzlsbb r6,v7
+-	vextubrx r5,r6,v4
+-	vextubrx r4,r6,v5
+-	bt  	 4*cr1+eq,L(swapped)
+-	subf	 r3,r4,r5
+-	blr
+-
+-	/* If src pointers were swapped, then swap the
+-	indices and calculate the return value.  */
+-L(swapped):
+-	subf     r3,r5,r4
+-	blr
+-
+-	.p2align 5
+-L(32B_aligned_loop):
+-	COMPARE_32(v14,v16,0,tail1,tail2)
+-	COMPARE_32(v18,v20,32,tail3,tail4)
+-	COMPARE_32(v22,v24,64,tail5,tail6)
+-	COMPARE_32(v26,v28,96,tail7,tail8)
+-	addi	r3,r3,128
+-	addi	r4,r4,128
+-	b	L(32B_aligned_loop)
+-
+-L(tail1): TAIL(v15,v17)
+-L(tail2): TAIL(v14,v16)
+-L(tail3): TAIL(v19,v21)
+-L(tail4): TAIL(v18,v20)
+-L(tail5): TAIL(v23,v25)
+-L(tail6): TAIL(v22,v24)
+-L(tail7): TAIL(v27,v29)
+-L(tail8): TAIL(v26,v28)
+-
+-END (STRCMP)
+-libc_hidden_builtin_def (strcmp)
+diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile
+index fa1107dfd9..9f15f3207f 100644
+--- a/sysdeps/powerpc/powerpc64/multiarch/Makefile
++++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile
+@@ -33,8 +33,7 @@ sysdep_routines += memcpy-power8-cached memcpy-power7 memcpy-a2 memcpy-power6 \
+ ifneq (,$(filter %le,$(config-machine)))
+ sysdep_routines += memcmp-power10 memcpy-power10 memmove-power10 memset-power10 \
+ 		   rawmemchr-power9 rawmemchr-power10 \
+-		   strcmp-power9 strcmp-power10 strncmp-power9 \
+-		   strcpy-power9 stpcpy-power9 \
++		   strcmp-power9 strncmp-power9 strcpy-power9 stpcpy-power9 \
+ 		   strlen-power9 strncpy-power9 stpncpy-power9 strlen-power10
+ endif
+ CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
+diff --git a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
+index 9b3e617306..78443b7f34 100644
+--- a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
++++ b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
+@@ -377,10 +377,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
+   /* Support sysdeps/powerpc/powerpc64/multiarch/strcmp.c.  */
+   IFUNC_IMPL (i, name, strcmp,
+ #ifdef __LITTLE_ENDIAN__
+-	      IFUNC_IMPL_ADD (array, i, strcmp,
+-			      (hwcap2 & PPC_FEATURE2_ARCH_3_1)
+-			      && (hwcap & PPC_FEATURE_HAS_VSX),
+-			      __strcmp_power10)
+ 	      IFUNC_IMPL_ADD (array, i, strcmp,
+ 			      hwcap2 & PPC_FEATURE2_ARCH_3_00
+ 			      && hwcap & PPC_FEATURE_HAS_ALTIVEC,
+diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power10.S b/sysdeps/powerpc/powerpc64/multiarch/strcmp-power10.S
+deleted file mode 100644
+index 1a9f6069f5..0000000000
+--- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power10.S
++++ /dev/null
+@@ -1,26 +0,0 @@
+-/* Optimized strcmp implementation for POWER10/PPC64.
+-   Copyright (C) 2021-2024 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, see
+-   <https://www.gnu.org/licenses/>.  */
+-
+-#if defined __LITTLE_ENDIAN__ && IS_IN (libc)
+-#define STRCMP __strcmp_power10
+-
+-#undef libc_hidden_builtin_def
+-#define libc_hidden_builtin_def(name)
+-
+-#include <sysdeps/powerpc/powerpc64/le/power10/strcmp.S>
+-#endif /* __LITTLE_ENDIAN__ && IS_IN (libc) */
+diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp.c b/sysdeps/powerpc/powerpc64/multiarch/strcmp.c
+index ff32496fab..06b9b4090f 100644
+--- a/sysdeps/powerpc/powerpc64/multiarch/strcmp.c
++++ b/sysdeps/powerpc/powerpc64/multiarch/strcmp.c
+@@ -29,16 +29,12 @@ extern __typeof (strcmp) __strcmp_power7 attribute_hidden;
+ extern __typeof (strcmp) __strcmp_power8 attribute_hidden;
+ # ifdef __LITTLE_ENDIAN__
+ extern __typeof (strcmp) __strcmp_power9 attribute_hidden;
+-extern __typeof (strcmp) __strcmp_power10 attribute_hidden;
+ # endif
+ 
+ # undef strcmp
+ 
+ libc_ifunc_redirected (__redirect_strcmp, strcmp,
+ # ifdef __LITTLE_ENDIAN__
+-		        (hwcap2 & PPC_FEATURE2_ARCH_3_1
+-			 && hwcap & PPC_FEATURE_HAS_VSX)
+-			? __strcmp_power10 :
+ 			(hwcap2 & PPC_FEATURE2_ARCH_3_00
+ 			 && hwcap & PPC_FEATURE_HAS_ALTIVEC)
+ 			? __strcmp_power9 :
+
+commit 23a02e382c8ffebfed00a082d8898f1aa468b5da
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Wed May 21 16:47:34 2025 +0200
+
+    support: Pick group in support_capture_subprogram_self_sgid if UID == 0
+    
+    When running as root, it is likely that we can run under any group.
+    Pick a harmless group from /etc/group in this case.
+    
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+    (cherry picked from commit 2f769cec448d84a62b7dd0d4ff56978fe22c0cd6)
+
+diff --git a/support/support_capture_subprocess.c b/support/support_capture_subprocess.c
+index 2383481911..1cb344eb04 100644
+--- a/support/support_capture_subprocess.c
++++ b/support/support_capture_subprocess.c
+@@ -21,7 +21,11 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#include <grp.h>
++#include <scratch_buffer.h>
++#include <stdio_ext.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <support/check.h>
+ #include <support/xunistd.h>
+ #include <support/xsocket.h>
+@@ -210,10 +214,48 @@ err:
+   return status;
+ }
+ 
++/* Returns true if a group with NAME has been found, and writes its
++   GID to *TARGET.  */
++static bool
++find_sgid_group (gid_t *target, const char *name)
++{
++  /* Do not use getgrname_r because it does not work in statically
++     linked binaries if the system libc is different.  */
++  FILE *fp = fopen ("/etc/group", "rce");
++  if (fp == NULL)
++    return false;
++  __fsetlocking (fp, FSETLOCKING_BYCALLER);
++
++  bool ok = false;
++  struct scratch_buffer buf;
++  scratch_buffer_init (&buf);
++  while (true)
++    {
++      struct group grp;
++      struct group *result = NULL;
++      int status = fgetgrent_r (fp, &grp, buf.data, buf.length, &result);
++      if (status == 0 && result != NULL)
++	{
++	  if (strcmp (result->gr_name, name) == 0)
++	    {
++	      *target = result->gr_gid;
++	      ok = true;
++	      break;
++	    }
++	}
++      else if (errno != ERANGE)
++	break;
++      else if (!scratch_buffer_grow (&buf))
++	break;
++    }
++  scratch_buffer_free (&buf);
++  fclose (fp);
++  return ok;
++}
++
+ int
+ support_capture_subprogram_self_sgid (const char *child_id)
+ {
+-  gid_t target = 0;
+   const int count = 64;
+   gid_t groups[count];
+ 
+@@ -225,6 +267,7 @@ support_capture_subprogram_self_sgid (const char *child_id)
+ 		     (intmax_t) getuid ());
+ 
+   gid_t current = getgid ();
++  gid_t target = current;
+   for (int i = 0; i < ret; ++i)
+     {
+       if (groups[i] != current)
+@@ -234,9 +277,16 @@ support_capture_subprogram_self_sgid (const char *child_id)
+ 	}
+     }
+ 
+-  if (target == 0)
+-    FAIL_UNSUPPORTED("Could not find a suitable GID for user %jd\n",
+-		     (intmax_t) getuid ());
++  if (target == current)
++    {
++      /* If running as root, try to find a harmless group for SGID.  */
++      if (getuid () != 0
++	  || (!find_sgid_group (&target, "nogroup")
++	      && !find_sgid_group (&target, "bin")
++	      && !find_sgid_group (&target, "daemon")))
++	FAIL_UNSUPPORTED("Could not find a suitable GID for user %jd\n",
++			 (intmax_t) getuid ());
++    }
+ 
+   return copy_and_spawn_sgid (child_id, target);
+ }
+
+commit dbc83657e290bdad3245259be80fb84cbe10304c
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Thu May 22 14:36:37 2025 +0200
+
+    Fix error reporting (false negatives) in SGID tests
+    
+    And simplify the interface of support_capture_subprogram_self_sgid.
+    
+    Use the existing framework for temporary directories (now with
+    mode 0700) and directory/file deletion.  Handle all execution
+    errors within support_capture_subprogram_self_sgid.  In particular,
+    this includes test failures because the invoked program did not
+    exit with exit status zero.  Existing tests that expect exit
+    status 42 are adjusted to use zero instead.
+    
+    In addition, fix callers not to call exit (0) with test failures
+    pending (which may mask them, especially when running with --direct).
+    
+    Fixes commit 35fc356fa3b4f485bd3ba3114c9f774e5df7d3c2
+    ("elf: Fix subprocess status handling for tst-dlopen-sgid (bug 32987)").
+    
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+    (cherry picked from commit 3a3fb2ed83f79100c116c824454095ecfb335ad7)
+
+diff --git a/elf/tst-dlopen-sgid.c b/elf/tst-dlopen-sgid.c
+index 5688b79f2e..8aec52e19f 100644
+--- a/elf/tst-dlopen-sgid.c
++++ b/elf/tst-dlopen-sgid.c
+@@ -70,13 +70,7 @@ do_test (void)
+ 
+   free (libdir);
+ 
+-  int status = support_capture_subprogram_self_sgid (magic_argument);
+-
+-  if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
+-    return EXIT_UNSUPPORTED;
+-
+-  if (!WIFEXITED (status))
+-    FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status);
++  support_capture_subprogram_self_sgid (magic_argument);
+ 
+   return 0;
+ }
+diff --git a/elf/tst-env-setuid-tunables.c b/elf/tst-env-setuid-tunables.c
+index a47219047f..233eec7631 100644
+--- a/elf/tst-env-setuid-tunables.c
++++ b/elf/tst-env-setuid-tunables.c
+@@ -105,10 +105,7 @@ do_test (int argc, char **argv)
+ 
+       if (ret != 0)
+ 	exit (1);
+-
+-      /* Special return code to make sure that the child executed all the way
+-	 through.  */
+-      exit (42);
++      return 0;
+     }
+   else
+     {
+@@ -127,18 +124,7 @@ do_test (int argc, char **argv)
+ 	      continue;
+ 	    }
+ 
+-	  int status = support_capture_subprogram_self_sgid (buf);
+-
+-	  /* Bail out early if unsupported.  */
+-	  if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
+-	    return EXIT_UNSUPPORTED;
+-
+-	  if (WEXITSTATUS (status) != 42)
+-	    {
+-	      printf ("    [%d] child failed with status %d\n", i,
+-		      WEXITSTATUS (status));
+-	      support_record_failure ();
+-	    }
++	  support_capture_subprogram_self_sgid (buf);
+ 	}
+       return 0;
+     }
+diff --git a/elf/tst-env-setuid.c b/elf/tst-env-setuid.c
+index 59f2ffeb88..ee3f058468 100644
+--- a/elf/tst-env-setuid.c
++++ b/elf/tst-env-setuid.c
+@@ -147,10 +147,7 @@ do_test (int argc, char **argv)
+ 
+       if (ret != 0)
+ 	exit (1);
+-
+-      /* Special return code to make sure that the child executed all the way
+-	 through.  */
+-      exit (42);
++      return 0;
+     }
+   else
+     {
+@@ -174,17 +171,7 @@ do_test (int argc, char **argv)
+ 	free (profilepath);
+       }
+ 
+-      int status = support_capture_subprogram_self_sgid (SETGID_CHILD);
+-
+-      if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
+-	exit (EXIT_UNSUPPORTED);
+-
+-      if (WEXITSTATUS (status) != 42)
+-	{
+-	  printf ("    child failed with status %d\n",
+-		  WEXITSTATUS (status));
+-	  support_record_failure ();
+-	}
++      support_capture_subprogram_self_sgid (SETGID_CHILD);
+ 
+       return 0;
+     }
+diff --git a/stdlib/tst-secure-getenv.c b/stdlib/tst-secure-getenv.c
+index cc26ed6d15..cefee58d46 100644
+--- a/stdlib/tst-secure-getenv.c
++++ b/stdlib/tst-secure-getenv.c
+@@ -57,13 +57,7 @@ do_test (void)
+       exit (1);
+     }
+ 
+-  int status = support_capture_subprogram_self_sgid (MAGIC_ARGUMENT);
+-
+-  if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
+-    return EXIT_UNSUPPORTED;
+-
+-  if (!WIFEXITED (status))
+-    FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status);
++  support_capture_subprogram_self_sgid (MAGIC_ARGUMENT);
+ 
+   return 0;
+ }
+@@ -82,6 +76,7 @@ alternative_main (int argc, char **argv)
+       if (secure_getenv ("PATH") != NULL)
+ 	FAIL_EXIT (4, "PATH variable not filtered out\n");
+ 
++      support_record_failure_barrier ();
+       exit (EXIT_SUCCESS);
+     }
+ }
+diff --git a/support/capture_subprocess.h b/support/capture_subprocess.h
+index 5406d9f6c0..57bb941e7d 100644
+--- a/support/capture_subprocess.h
++++ b/support/capture_subprocess.h
+@@ -42,10 +42,12 @@ struct support_capture_subprocess support_capture_subprocess
+ struct support_capture_subprocess support_capture_subprogram
+   (const char *file, char *const argv[], char *const envp[]);
+ 
+-/* Copy the running program into a setgid binary and run it with CHILD_ID
+-   argument.  If execution is successful, return the exit status of the child
+-   program, otherwise return a non-zero failure exit code.  */
+-int support_capture_subprogram_self_sgid (const char *child_id);
++/* Copy the running program into a setgid binary and run it with
++   CHILD_ID argument.  If the program exits with a non-zero status,
++   exit with that exit status (or status 1 if the program did not exit
++   normally).  If the test cannot be performed, exit with
++   EXIT_UNSUPPORTED.  */
++void support_capture_subprogram_self_sgid (const char *child_id);
+ 
+ /* Deallocate the subprocess data captured by
+    support_capture_subprocess.  */
+diff --git a/support/support_capture_subprocess.c b/support/support_capture_subprocess.c
+index 1cb344eb04..cbc6951064 100644
+--- a/support/support_capture_subprocess.c
++++ b/support/support_capture_subprocess.c
+@@ -31,6 +31,7 @@
+ #include <support/xsocket.h>
+ #include <support/xspawn.h>
+ #include <support/support.h>
++#include <support/temp_file.h>
+ #include <support/test-driver.h>
+ 
+ static void
+@@ -113,105 +114,44 @@ support_capture_subprogram (const char *file, char *const argv[],
+ /* Copies the executable into a restricted directory, so that we can
+    safely make it SGID with the TARGET group ID.  Then runs the
+    executable.  */
+-static int
++static void
+ copy_and_spawn_sgid (const char *child_id, gid_t gid)
+ {
+-  char *dirname = xasprintf ("%s/tst-tunables-setuid.%jd",
+-			     test_dir, (intmax_t) getpid ());
++  char *dirname = support_create_temp_directory ("tst-glibc-sgid-");
+   char *execname = xasprintf ("%s/bin", dirname);
+-  int infd = -1;
+-  int outfd = -1;
+-  int ret = 1, status = 1;
+-
+-  TEST_VERIFY (mkdir (dirname, 0700) == 0);
+-  if (support_record_failure_is_failed ())
+-    goto err;
++  add_temp_file (execname);
+ 
+-  infd = open ("/proc/self/exe", O_RDONLY);
+-  if (infd < 0)
++  if (access ("/proc/self/exe", R_OK) != 0)
+     FAIL_UNSUPPORTED ("unsupported: Cannot read binary from procfs\n");
+ 
+-  outfd = open (execname, O_WRONLY | O_CREAT | O_EXCL, 0700);
+-  TEST_VERIFY (outfd >= 0);
+-  if (support_record_failure_is_failed ())
+-    goto err;
+-
+-  char buf[4096];
+-  for (;;)
+-    {
+-      ssize_t rdcount = read (infd, buf, sizeof (buf));
+-      TEST_VERIFY (rdcount >= 0);
+-      if (support_record_failure_is_failed ())
+-	goto err;
+-      if (rdcount == 0)
+-	break;
+-      char *p = buf;
+-      char *end = buf + rdcount;
+-      while (p != end)
+-	{
+-	  ssize_t wrcount = write (outfd, buf, end - p);
+-	  if (wrcount == 0)
+-	    errno = ENOSPC;
+-	  TEST_VERIFY (wrcount > 0);
+-	  if (support_record_failure_is_failed ())
+-	    goto err;
+-	  p += wrcount;
+-	}
+-    }
++  support_copy_file ("/proc/self/exe", execname);
+ 
+-  bool chowned = false;
+-  TEST_VERIFY ((chowned = fchown (outfd, getuid (), gid) == 0)
+-	       || errno == EPERM);
+-  if (support_record_failure_is_failed ())
+-    goto err;
+-  else if (!chowned)
+-    {
+-      ret = 77;
+-      goto err;
+-    }
++  if (chown (execname, getuid (), gid) != 0)
++    FAIL_UNSUPPORTED ("cannot change group of \"%s\" to %jd: %m",
++		      execname, (intmax_t) gid);
+ 
+-  TEST_VERIFY (fchmod (outfd, 02750) == 0);
+-  if (support_record_failure_is_failed ())
+-    goto err;
+-  TEST_VERIFY (close (outfd) == 0);
+-  if (support_record_failure_is_failed ())
+-    goto err;
+-  TEST_VERIFY (close (infd) == 0);
+-  if (support_record_failure_is_failed ())
+-    goto err;
++  if (chmod (execname, 02750) != 0)
++    FAIL_UNSUPPORTED ("cannot make \"%s\" SGID: %m ", execname);
+ 
+   /* We have the binary, now spawn the subprocess.  Avoid using
+      support_subprogram because we only want the program exit status, not the
+      contents.  */
+-  ret = 0;
+-  infd = outfd = -1;
+ 
+   char * const args[] = {execname, (char *) child_id, NULL};
++  int status = support_subprogram_wait (args[0], args);
+ 
+-  status = support_subprogram_wait (args[0], args);
++  free (execname);
++  free (dirname);
+ 
+-err:
+-  if (outfd >= 0)
+-    close (outfd);
+-  if (infd >= 0)
+-    close (infd);
+-  if (execname != NULL)
+-    {
+-      unlink (execname);
+-      free (execname);
+-    }
+-  if (dirname != NULL)
++  if (WIFEXITED (status))
+     {
+-      rmdir (dirname);
+-      free (dirname);
++      if (WEXITSTATUS (status) == 0)
++	return;
++      else
++	exit (WEXITSTATUS (status));
+     }
+-
+-  if (ret == 77)
+-    FAIL_UNSUPPORTED ("Failed to make sgid executable for test\n");
+-  if (ret != 0)
+-    FAIL_EXIT1 ("Failed to make sgid executable for test\n");
+-
+-  return status;
++  else
++    FAIL_EXIT1 ("subprogram failed with status %d", status);
+ }
+ 
+ /* Returns true if a group with NAME has been found, and writes its
+@@ -253,7 +193,7 @@ find_sgid_group (gid_t *target, const char *name)
+   return ok;
+ }
+ 
+-int
++void
+ support_capture_subprogram_self_sgid (const char *child_id)
+ {
+   const int count = 64;
+@@ -288,7 +228,7 @@ support_capture_subprogram_self_sgid (const char *child_id)
+ 			 (intmax_t) getuid ());
+     }
+ 
+-  return copy_and_spawn_sgid (child_id, target);
++  copy_and_spawn_sgid (child_id, target);
+ }
+ 
+ void
+
+commit 2eb180377b96771b8368b0915669c8c7b267e739
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Mon Jul 21 21:43:49 2025 +0200
+
+    posix: Fix double-free after allocation failure in regcomp (bug 33185)
+    
+    If a memory allocation failure occurs during bracket expression
+    parsing in regcomp, a double-free error may result.
+    
+    Reported-by: Anastasia Belova <abelova@astralinux.ru>
+    Co-authored-by: Paul Eggert <eggert@cs.ucla.edu>
+    Reviewed-by: Andreas K. Huettel <dilfridge@gentoo.org>
+    (cherry picked from commit 7ea06e994093fa0bcca0d0ee2c1db271d8d7885d)
+
+diff --git a/NEWS b/NEWS
+index 4b290ad4bf..253b07ae99 100644
+--- a/NEWS
++++ b/NEWS
+@@ -24,6 +24,7 @@ The following bugs are resolved with this release:
+   [32470] x86: Avoid integer truncation with large cache sizes
+   [32810] Crash on x86-64 if XSAVEC disable via tunable
+   [32987] elf: Fix subprocess status handling for tst-dlopen-sgid
++  [33185] Fix double-free after allocation failure in regcomp
+ 
+ Version 2.40
+ 
+diff --git a/posix/Makefile b/posix/Makefile
+index 2c598cd20a..830278a423 100644
+--- a/posix/Makefile
++++ b/posix/Makefile
+@@ -303,6 +303,7 @@ tests := \
+   tst-posix_spawn-setsid \
+   tst-preadwrite \
+   tst-preadwrite64 \
++  tst-regcomp-bracket-free \
+   tst-regcomp-truncated \
+   tst-regex \
+   tst-regex2 \
+diff --git a/posix/regcomp.c b/posix/regcomp.c
+index 5380d3c7b9..6595bb3c0d 100644
+--- a/posix/regcomp.c
++++ b/posix/regcomp.c
+@@ -3384,6 +3384,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
+     {
+ #ifdef RE_ENABLE_I18N
+       free_charset (mbcset);
++      mbcset = NULL;
+ #endif
+       /* Build a tree for simple bracket.  */
+       br_token.type = SIMPLE_BRACKET;
+@@ -3399,7 +3400,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
+  parse_bracket_exp_free_return:
+   re_free (sbcset);
+ #ifdef RE_ENABLE_I18N
+-  free_charset (mbcset);
++  if (__glibc_likely (mbcset != NULL))
++    free_charset (mbcset);
+ #endif /* RE_ENABLE_I18N */
+   return NULL;
+ }
+diff --git a/posix/tst-regcomp-bracket-free.c b/posix/tst-regcomp-bracket-free.c
+new file mode 100644
+index 0000000000..3c091d8c44
+--- /dev/null
++++ b/posix/tst-regcomp-bracket-free.c
+@@ -0,0 +1,176 @@
++/* Test regcomp bracket parsing with injected allocation failures (bug 33185).
++   Copyright (C) 2025 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++/* This test invokes regcomp multiple times, failing one memory
++   allocation in each call.  The function call should fail with
++   REG_ESPACE (or succeed if it can recover from the allocation
++   failure).  Previously, there was double-free bug.  */
++
++#include <errno.h>
++#include <regex.h>
++#include <stdio.h>
++#include <string.h>
++#include <support/check.h>
++#include <support/namespace.h>
++#include <support/support.h>
++
++/* Data structure allocated via MAP_SHARED, so that writes from the
++   subprocess are visible.  */
++struct shared_data
++{
++  /* Number of tracked allocations performed so far.  */
++  volatile unsigned int allocation_count;
++
++  /* If this number is reached, one allocation fails.  */
++  volatile unsigned int failing_allocation;
++
++  /* The subprocess stores the expected name here.  */
++  char name[100];
++};
++
++/* Allocation count in shared mapping.  */
++static struct shared_data *shared;
++
++/* Returns true if a failure should be injected for this allocation.  */
++static bool
++fail_this_allocation (void)
++{
++  if (shared != NULL)
++    {
++      unsigned int count = shared->allocation_count;
++      shared->allocation_count = count + 1;
++      return count == shared->failing_allocation;
++    }
++  else
++    return false;
++}
++
++/* Failure-injecting wrappers for allocation functions used by glibc.  */
++
++void *
++malloc (size_t size)
++{
++  if (fail_this_allocation ())
++    {
++      errno = ENOMEM;
++      return NULL;
++    }
++  extern __typeof (malloc) __libc_malloc;
++  return __libc_malloc (size);
++}
++
++void *
++calloc (size_t a, size_t b)
++{
++  if (fail_this_allocation ())
++    {
++      errno = ENOMEM;
++      return NULL;
++    }
++  extern __typeof (calloc) __libc_calloc;
++  return __libc_calloc (a, b);
++}
++
++void *
++realloc (void *ptr, size_t size)
++{
++  if (fail_this_allocation ())
++    {
++      errno = ENOMEM;
++      return NULL;
++    }
++  extern __typeof (realloc) __libc_realloc;
++  return __libc_realloc (ptr, size);
++}
++
++/* No-op subprocess to verify that support_isolate_in_subprocess does
++   not perform any heap allocations.  */
++static void
++no_op (void *ignored)
++{
++}
++
++/* Perform a regcomp call in a subprocess.  Used to count its
++   allocations.  */
++static void
++initialize (void *regexp1)
++{
++  const char *regexp = regexp1;
++
++  shared->allocation_count = 0;
++
++  regex_t reg;
++  TEST_COMPARE (regcomp (&reg, regexp, 0), 0);
++}
++
++/* Perform regcomp in a subprocess with fault injection.  */
++static void
++test_in_subprocess (void *regexp1)
++{
++  const char *regexp = regexp1;
++  unsigned int inject_at = shared->failing_allocation;
++
++  regex_t reg;
++  int ret = regcomp (&reg, regexp, 0);
++
++  if (ret != 0)
++    {
++      TEST_COMPARE (ret, REG_ESPACE);
++      printf ("info: allocation %u failure results in return value %d,"
++              " error %s (%d)\n",
++              inject_at, ret, strerrorname_np (errno), errno);
++    }
++}
++
++static int
++do_test (void)
++{
++  char regexp[] = "[:alpha:]";
++
++  shared = support_shared_allocate (sizeof (*shared));
++
++  /* Disable fault injection.  */
++  shared->failing_allocation = ~0U;
++
++  support_isolate_in_subprocess (no_op, NULL);
++  TEST_COMPARE (shared->allocation_count, 0);
++
++  support_isolate_in_subprocess (initialize, regexp);
++
++  /* The number of allocations in the successful case, plus some
++     slack.  Once the number of expected allocations is exceeded,
++     injecting further failures does not make a difference.  */
++  unsigned int maximum_allocation_count = shared->allocation_count;
++  printf ("info: successful call performs %u allocations\n",
++          maximum_allocation_count);
++  maximum_allocation_count += 10;
++
++  for (unsigned int inject_at = 0; inject_at <= maximum_allocation_count;
++       ++inject_at)
++    {
++      shared->allocation_count = 0;
++      shared->failing_allocation = inject_at;
++      support_isolate_in_subprocess (test_in_subprocess, regexp);
++    }
++
++  support_shared_free (shared);
++
++  return 0;
++}
++
++#include <support/test-driver.c>
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 94b59d23b9d0..a35e5085f87c 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (
       /*
         No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
          $ git fetch --all -p && git checkout origin/release/2.40/master && git describe
-         glibc-2.40-66-g7d4b6bcae9
+         glibc-2.40-142-g2eb180377b
          $ git show --minimal --reverse glibc-2.40.. ':!ADVISORIES' > 2.40-master.patch
 
         To compare the archive contents zdiff can be used.

From 36d94b3e6343bb15306333ccb5dd126496478c8e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 24 Jul 2025 21:38:55 +0300
Subject: [PATCH 0222/3724] qt6.qtbase: backport fix for HTTP/2 stream
 corruption

Recommended by KDE.
---
 .../development/libraries/qt-6/modules/qtbase/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index df8286ee8f46..62b18f42dcb5 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -80,6 +80,7 @@
   libinput,
   # options
   qttranslations ? null,
+  fetchpatch,
 }:
 
 let
@@ -217,6 +218,13 @@ stdenv.mkDerivation rec {
     ./qmlimportscanner-import-path.patch
     # don't pass qtbase's QML directory to qmlimportscanner if it's empty
     ./skip-missing-qml-directory.patch
+
+    # Backport patch recommended by KDE to fix HTTP2 stream corruption issues
+    # FIXME: remove in 6.9.2
+    (fetchpatch {
+      url = "https://invent.kde.org/qt/qt/qtbase/-/commit/904aec2f372e2981af19bf762583a0ef42ec6bb9.diff";
+      hash = "sha256-bSf4TgYUk7Ariu37NHGQKv6wFArVpQLlnHCTbCFzAfI=";
+    })
   ];
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

From d2bf2674c8f2bd3eb126ac61d82c9e9b24320293 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 24 Jul 2025 15:23:44 +0200
Subject: [PATCH 0223/3724] haskellPackages.llvm-ffi: 20.0 -> 21.0

We keep using LLVM 20, though, since LLVM 21 is still just a release
candidate on our branch and llvm-ffi doesn't yet supported a released
LLVM 21, just the git version. We can use the older version by passing
a specific cabal flag.

The evaluation warning reminding us to upgrade now also checks whether
LLVM is a release candidate before triggering.
---
 .../configuration-hackage2nix/main.yaml       |  2 --
 .../haskell-modules/configuration-nix.nix     | 27 +++++++++++--------
 .../haskell-modules/hackage-packages.nix      | 25 -----------------
 3 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 657c958b1d72..590ac810b291 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -37,8 +37,6 @@ default-package-overrides:
   - hsc3 < 0.21
   # 2024-12-31: last version that's compatible with GHC < 9.9
   - htree < 0.2.0.0
-  # 2025-07-10: use latest released version of LLVM
-  - llvm-ffi == 20.*
   # 2025-06-11: last version that supports pandoc == 3.6.* which is prescribed by LTS 23
   - pandoc-crossref < 0.3.20
 # keep-sorted end
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 0cb803f1c80c..2980fbfd0416 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -508,19 +508,24 @@ builtins.intersectAttrs super {
   # LLVM input that llvm-ffi declares.
   llvm-ffi =
     let
-      matchingLlvmVersion = lib.strings.toInt (lib.versions.major super.llvm-ffi.version);
-      nextLlvmVersion = matchingLlvmVersion + 1;
+      chosenLlvmVersion = 20;
+      nextLlvmAttr = "llvmPackages_${toString (chosenLlvmVersion + 1)}";
+      shouldUpgrade =
+        pkgs ? ${nextLlvmAttr} && (lib.strings.match ".+rc.+" pkgs.${nextLlvmAttr}.llvm.version) == null;
     in
-    lib.warnIf (pkgs ? "llvmPackages_${toString nextLlvmVersion}")
-      # This package can be updated by changing the version constraint in
-      # configuration-hackage2nix/main.yaml and regenerating the haskellPackages set.
-      "haskellPackages.llvm-ffi: LLVM ${toString nextLlvmVersion} is available in Nixpkgs, consider updating."
-      addBuildDepends
+    lib.warnIf shouldUpgrade
+      "haskellPackages.llvm-ffi: ${nextLlvmAttr} is available in Nixpkgs, consider updating."
+      lib.pipe
+      super.llvm-ffi
       [
-        pkgs."llvmPackages_${toString matchingLlvmVersion}".llvm.lib
-        pkgs."llvmPackages_${toString matchingLlvmVersion}".llvm.dev
-      ]
-      super.llvm-ffi;
+        # ATTN: There is no matching flag for the latest supported LLVM version,
+        # so you may need to remove this when updating chosenLlvmVersion
+        (enableCabalFlag "LLVM${toString chosenLlvmVersion}00")
+        (addBuildDepends [
+          pkgs."llvmPackages_${toString chosenLlvmVersion}".llvm.lib
+          pkgs."llvmPackages_${toString chosenLlvmVersion}".llvm.dev
+        ])
+      ];
 
   # Needs help finding LLVM.
   spaceprobe = addBuildTool self.buildHaskellPackages.llvmPackages.llvm super.spaceprobe;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c45ec5bff676..259c7a611ccb 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -425715,30 +425715,6 @@ self: {
   ) { };
 
   "llvm-ffi" = callPackage (
-    {
-      mkDerivation,
-      base,
-      enumset,
-      LLVM,
-    }:
-    mkDerivation {
-      pname = "llvm-ffi";
-      version = "20.0";
-      sha256 = "1vd9rzqq9fcml9zgrxrvplcgxd925xyy7ixprcxb8j4vc0a8hgzc";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        base
-        enumset
-      ];
-      librarySystemDepends = [ LLVM ];
-      description = "FFI bindings to the LLVM compiler toolkit";
-      license = lib.licenses.bsd3;
-      maintainers = [ lib.maintainers.thielema ];
-    }
-  ) { LLVM = null; };
-
-  "llvm-ffi_21_0" = callPackage (
     {
       mkDerivation,
       base,
@@ -425758,7 +425734,6 @@ self: {
       librarySystemDepends = [ LLVM-21git ];
       description = "FFI bindings to the LLVM compiler toolkit";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { LLVM-21git = null; };

From 0a5e424eebecd01677fa56c826873bf2b3a32259 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Jul 2025 20:45:56 +0000
Subject: [PATCH 0224/3724] cpuinfo: 0-unstable-2025-06-10 ->
 0-unstable-2025-07-24

---
 pkgs/by-name/cp/cpuinfo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix
index 36f4ad91c1f8..fdde7e38af04 100644
--- a/pkgs/by-name/cp/cpuinfo/package.nix
+++ b/pkgs/by-name/cp/cpuinfo/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpuinfo";
-  version = "0-unstable-2025-06-10";
+  version = "0-unstable-2025-07-24";
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "cpuinfo";
-    rev = "d7427551d6531037da216d20cd36feb19ed4905f";
-    hash = "sha256-gJgvE3823NyVOIL0Grkldde3U/N9NNqlLAA0btj3TSg=";
+    rev = "33ed0be77d7767d0e2010e2c3cf972ef36c7c307";
+    hash = "sha256-0rZzbZkOo6DAt1YnH4rtx0FvmCuYH8M6X3DNJ0gURpU=";
   };
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };

From 4fb181570f08b1448a22ec318cd20750cf70f4db Mon Sep 17 00:00:00 2001
From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com>
Date: Thu, 24 Jul 2025 23:33:17 +0200
Subject: [PATCH 0225/3724] clifm: 1.25 -> 1.26

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

diff --git a/pkgs/by-name/cl/clifm/package.nix b/pkgs/by-name/cl/clifm/package.nix
index 9376fa31f1e0..744b1b5e487e 100644
--- a/pkgs/by-name/cl/clifm/package.nix
+++ b/pkgs/by-name/cl/clifm/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clifm";
-  version = "1.25";
+  version = "1.26";
 
   src = fetchFromGitHub {
     owner = "leo-arch";
     repo = "clifm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q4BzkLclJJGybx6tnOhfRE3X5iFtuYTfbAvSLO7isX4=";
+    hash = "sha256-eNgghfK2NSSrzn0X1XNcaE+jErlLG5rhg4+RLjERsFU=";
   };
 
   buildInputs = [

From 00c97669d78041edc41a8743fad5f6e30edc79d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Jul 2025 22:41:02 +0000
Subject: [PATCH 0226/3724] geoserver: 2.27.1 -> 2.27.2

---
 pkgs/by-name/ge/geoserver/extensions.nix | 202 +++++++++++------------
 pkgs/by-name/ge/geoserver/package.nix    |   4 +-
 2 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/pkgs/by-name/ge/geoserver/extensions.nix b/pkgs/by-name/ge/geoserver/extensions.nix
index 267dc9e0314f..85c30ddd24de 100644
--- a/pkgs/by-name/ge/geoserver/extensions.nix
+++ b/pkgs/by-name/ge/geoserver/extensions.nix
@@ -42,325 +42,325 @@ in
 {
   app-schema = mkGeoserverExtension {
     name = "app-schema";
-    version = "2.27.1"; # app-schema
-    hash = "sha256-en9j/FhM7llsgvg26nIqqpt3wVJ9wtshkimMQ4bn1O4="; # app-schema
+    version = "2.27.2"; # app-schema
+    hash = "sha256-XJbuRdqvkusT1hZEuFoogTEB8vHOsX9cQxA0Mzhg1+8="; # app-schema
   };
 
   authkey = mkGeoserverExtension {
     name = "authkey";
-    version = "2.27.1"; # authkey
-    hash = "sha256-c2m5qfeeAlRoKl1ZgGzlURYivgUMh/22MBNXscKiRi8="; # authkey
+    version = "2.27.2"; # authkey
+    hash = "sha256-e43HG4iPgj9vj7lq0c9ATmWVumqHdtM9DrAwbQJqUcg="; # authkey
   };
 
   cas = mkGeoserverExtension {
     name = "cas";
-    version = "2.27.1"; # cas
-    hash = "sha256-42ePZ90vATFsTkT9e2XaKM2uR05K5xUYbmwFPyQR4xk="; # cas
+    version = "2.27.2"; # cas
+    hash = "sha256-kDYC8z5sRAycw6ZCKJ105XoYF5/ss4YTguqQ8pbnJls="; # cas
   };
 
   charts = mkGeoserverExtension {
     name = "charts";
-    version = "2.27.1"; # charts
-    hash = "sha256-y2N7/ZnxeiP0cNtLXMzN0jSIAGc8t1QzSLD1wEVa/LY="; # charts
+    version = "2.27.2"; # charts
+    hash = "sha256-zI+F21bQHcE4Lbh26bHeCTjTRJdswkUmmz+qAsP2t4k="; # charts
   };
 
   control-flow = mkGeoserverExtension {
     name = "control-flow";
-    version = "2.27.1"; # control-flow
-    hash = "sha256-/Vv2otkJuaPAHxs7bZZ4UkB5tXR7YLb2Qn0eA5wRJkk="; # control-flow
+    version = "2.27.2"; # control-flow
+    hash = "sha256-5XW3l9MFEUeYuhOKqN4EqjwpRlMc8P8Tn46A2Z89Jks="; # control-flow
   };
 
   css = mkGeoserverExtension {
     name = "css";
-    version = "2.27.1"; # css
-    hash = "sha256-ZQtyljZuQdX7fS+4oGALXZBsscr8M6m1hgAN0EoBRVM="; # css
+    version = "2.27.2"; # css
+    hash = "sha256-1fpP70Ed4iUrUyMMiMFhkykuPCzBV5+lWFicl9sUjAg="; # css
   };
 
   csw = mkGeoserverExtension {
     name = "csw";
-    version = "2.27.1"; # csw
-    hash = "sha256-P0PMs8JNxHXwPy610mYc9Fz6uO+LnYWm7fd8i2R3vTY="; # csw
+    version = "2.27.2"; # csw
+    hash = "sha256-4BYSY6tldkjd8KDlM/D+MNb9I8Ji0CVjyJcsBzRxC1Y="; # csw
   };
 
   csw-iso = mkGeoserverExtension {
     name = "csw-iso";
-    version = "2.27.1"; # csw-iso
-    hash = "sha256-aQCFUTQeTx+RuBjXksq3guHQ+LIaA3RCSLv9XQ9BdtA="; # csw-iso
+    version = "2.27.2"; # csw-iso
+    hash = "sha256-/0soY61A1d4yKJolRtymoFOsKf42B/RacUSUqN/7uXo="; # csw-iso
   };
 
   db2 = mkGeoserverExtension {
     name = "db2";
-    version = "2.27.1"; # db2
-    hash = "sha256-RO1IH1AZ3iiEHzx95ZC9+aqD7pB7lMQ0MQ8uHjfQLR4="; # db2
+    version = "2.27.2"; # db2
+    hash = "sha256-agZZHkwAx5YTOCzDlhpiTWxBTyhAoIW1BgW3QfV/kug="; # db2
   };
 
   # Needs wps extension.
   dxf = mkGeoserverExtension {
     name = "dxf";
-    version = "2.27.1"; # dxf
-    hash = "sha256-DxQWW59+FslrmX601CffZabF+uZA+ujHVGmbwatQT9M="; # dxf
+    version = "2.27.2"; # dxf
+    hash = "sha256-F93QOpe0nBQDD+8iDnenacNJ87h+jCqytJ3uz7weCcg="; # dxf
   };
 
   excel = mkGeoserverExtension {
     name = "excel";
-    version = "2.27.1"; # excel
-    hash = "sha256-G6KBuBVxW879GffpKJVJgK2sO65S+zfUsKomXPBUejA="; # excel
+    version = "2.27.2"; # excel
+    hash = "sha256-CYW9JBhDOLqxNKnlxNDy03sZzmGPLn9KaK4LScGMIIg="; # excel
   };
 
   feature-pregeneralized = mkGeoserverExtension {
     name = "feature-pregeneralized";
-    version = "2.27.1"; # feature-pregeneralized
-    hash = "sha256-wbUZAWTSFDutmGUhkFI0Hl/WbZRb5sLet2FdZmxLeLM="; # feature-pregeneralized
+    version = "2.27.2"; # feature-pregeneralized
+    hash = "sha256-0MuzhZ8Y/yy/AJ6vTvfJxXPgnf+fTJPfB8wNTboYHOw="; # feature-pregeneralized
   };
 
   # Note: The extension name ("gdal") clashes with pkgs.gdal.
   gdal = mkGeoserverExtension {
     name = "gdal";
-    version = "2.27.1"; # gdal
+    version = "2.27.2"; # gdal
     buildInputs = [ pkgs.gdal ];
-    hash = "sha256-xw6DoOxImOLnmPxYMkaH4bKes0vVobzvT1IiDywq828="; # gdal
+    hash = "sha256-Krdj96ddLsrA8J6B8ap3BBBe/+flVX7/GJRLN4UnKiY="; # gdal
   };
 
   # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box.
   #geofence = mkGeoserverExtension {
   #  name = "geofence";
-  #  version = "2.27.1"; # geofence
-  #  hash = "sha256-ccbCBCrb4zbZQ2eCDZo/FOT2IiUhruV62h7SrITdPdw="; # geofence
+  #  version = "2.27.2"; # geofence
+  #  hash = "sha256-Rzi8oZFy+SglTuPSYBFi/Wge4pOVY5yE50c8+jRI+4Y="; # geofence
   #};
 
   #geofence-server = mkGeoserverExtension {
   #  name = "geofence-server";
-  #  version = "2.27.1"; # geofence-server
+  #  version = "2.27.2"; # geofence-server
   #  hash = ""; # geofence-server
   #};
 
   #geofence-wps = mkGeoserverExtension {
   #  name = "geofence-wps";
-  #  version = "2.27.1"; # geofence-wps
-  #  hash = "sha256-k2z+xBUZw7cz/sPRjAEsKey6oqY1FzpaMGJcCm73kdg="; # geofence-wps
+  #  version = "2.27.2"; # geofence-wps
+  #  hash = "sha256-dry787XPCVBPi4TXKyFL85QZwX0WdWfiXqz/yriMiWc="; # geofence-wps
   #};
 
   geopkg-output = mkGeoserverExtension {
     name = "geopkg-output";
-    version = "2.27.1"; # geopkg-output
-    hash = "sha256-wECoUeBJLh00hJHT/adz7YF8AraPl1rOd9GLL1BP5dU="; # geopkg-output
+    version = "2.27.2"; # geopkg-output
+    hash = "sha256-LlYjYTa0mjOh+q2ILJORTAUlWy3mW9lEMd1vUyyhDV8="; # geopkg-output
   };
 
   grib = mkGeoserverExtension {
     name = "grib";
-    version = "2.27.1"; # grib
-    hash = "sha256-gu8sDIA46u0Uj9+lJJ65mn3FD6D+DjsTN8KbNUeoOP0="; # grib
+    version = "2.27.2"; # grib
+    hash = "sha256-/OBhwToUuJfDcRnx4aJbXDb6HdGGtM8SCkjmFgfX65s="; # grib
     buildInputs = [ netcdf ];
   };
 
   gwc-s3 = mkGeoserverExtension {
     name = "gwc-s3";
-    version = "2.27.1"; # gwc-s3
-    hash = "sha256-UBy17pwwjDJFBIgUyQSThj3Kn1bber/pglsUr/h4d+Q="; # gwc-s3
+    version = "2.27.2"; # gwc-s3
+    hash = "sha256-A0I2/+pRuvcXCVduTNn/e1nDZnNkt7cKtPNNO3Yo8Bk="; # gwc-s3
   };
 
   h2 = mkGeoserverExtension {
     name = "h2";
-    version = "2.27.1"; # h2
-    hash = "sha256-cXtc5OBAn3ppoGns6MvivgCYW841LJt1SPi5nNDE2O8="; # h2
+    version = "2.27.2"; # h2
+    hash = "sha256-kGXqb5xH4Jn6nhN8nfhldUcHtQodBUp9y3bviPim1Ak="; # h2
   };
 
   iau = mkGeoserverExtension {
     name = "iau";
-    version = "2.27.1"; # iau
-    hash = "sha256-77ULte2jCRN+gfd9/tOL26RX7EjKK6h5JaqQBR8TSI8="; # iau
+    version = "2.27.2"; # iau
+    hash = "sha256-KVkpQ92cvmc3nIsBygUU58vsIY8BZXEEXQrUeH/eEyM="; # iau
   };
 
   importer = mkGeoserverExtension {
     name = "importer";
-    version = "2.27.1"; # importer
-    hash = "sha256-qrwMz7R/m/BtwNUcJV+mJu8pTNS+00EjWq/hMnF3/T0="; # importer
+    version = "2.27.2"; # importer
+    hash = "sha256-Sumh9148zqwLCbpiknwLyVpxqufkoizMgszy//qC5dA="; # importer
   };
 
   inspire = mkGeoserverExtension {
     name = "inspire";
-    version = "2.27.1"; # inspire
-    hash = "sha256-fjMkmAmq9BGsnwjUH8I/iCZveAPEYi9E9/R2WNg6rxo="; # inspire
+    version = "2.27.2"; # inspire
+    hash = "sha256-IDX93Cu7BgrkmI5QcdYu++XzVwHOeCM17eXgqhDPSRQ="; # inspire
   };
 
   # Needs Kakadu plugin from
   # https://github.com/geosolutions-it/imageio-ext
   #jp2k = mkGeoserverExtension {
   #  name = "jp2k";
-  #  version = "2.27.1"; # jp2k
-  #  hash = "sha256-guNAdKOu32t0a648nuUjkt5bu17OKLAn6QXYeyAe1ZA="; # jp2k
+  #  version = "2.27.2"; # jp2k
+  #  hash = "sha256-Ar+mVXZqYfP6OGISdRzBntWRo2msL5RN44bgPeMOqQw="; # jp2k
   #};
 
   libjpeg-turbo = mkGeoserverExtension {
     name = "libjpeg-turbo";
-    version = "2.27.1"; # libjpeg-turbo
-    hash = "sha256-ZAIQJzzDNSgCX4BUchyRktobJkyLHgWYwfPz8B9vNTQ="; # libjpeg-turbo
+    version = "2.27.2"; # libjpeg-turbo
+    hash = "sha256-6e9Bdy/Lh7ZXPzHVGX/f/qa53v1JWrUshlrtcziIbQs="; # libjpeg-turbo
     buildInputs = [ libjpeg.out ];
   };
 
   mapml = mkGeoserverExtension {
     name = "mapml";
-    version = "2.27.1"; # mapml
-    hash = "sha256-znx6KjpTT109wG2wsTyvwKFcij29TVJ0cOkEIJw1D0g="; # mapml
+    version = "2.27.2"; # mapml
+    hash = "sha256-QTAoesynmxv+9bYwak6jat6J3In5ULdsy2ozjMbsoXI="; # mapml
   };
 
   mbstyle = mkGeoserverExtension {
     name = "mbstyle";
-    version = "2.27.1"; # mbstyle
-    hash = "sha256-t2g9Pm1PsfbiP1UWHcZaILZQFeOxnKUMXGS1sJfQcVg="; # mbstyle
+    version = "2.27.2"; # mbstyle
+    hash = "sha256-zKdX77zy72lkMB928XIjU0pYZ7zFVEI7OfbJ2ozFIHk="; # mbstyle
   };
 
   metadata = mkGeoserverExtension {
     name = "metadata";
-    version = "2.27.1"; # metadata
-    hash = "sha256-DPD83rrjn8oPRXn28EFDgvxdhUtI3goPN2FpyPjyGks="; # metadata
+    version = "2.27.2"; # metadata
+    hash = "sha256-VLBuqh9qfcv2BRHhjF1tAc6ACCOUPQcY4Yc0Vko/2l0="; # metadata
   };
 
   mongodb = mkGeoserverExtension {
     name = "mongodb";
-    version = "2.27.1"; # mongodb
-    hash = "sha256-lVaEOf91CKBYfI8QLXhERfQ+aWNTTok2DveiZlWygjQ="; # mongodb
+    version = "2.27.2"; # mongodb
+    hash = "sha256-xXgiOEMQhPbw6GorrkEiyV7isgmSuimzT/LK41c0bzA="; # mongodb
   };
 
   monitor = mkGeoserverExtension {
     name = "monitor";
-    version = "2.27.1"; # monitor
-    hash = "sha256-goZz5+dxB787hjcoR/Cmo92mw+rhpoooETzxg8bQ4eE="; # monitor
+    version = "2.27.2"; # monitor
+    hash = "sha256-1x+Rz8wXl3cAsX5rHgMEe1+h17QS7PDBJGDFmKf+SMY="; # monitor
   };
 
   mysql = mkGeoserverExtension {
     name = "mysql";
-    version = "2.27.1"; # mysql
-    hash = "sha256-jn+zmnrJHWw6/OXCnEpoBPtUALhINjL42va1+eGXgeU="; # mysql
+    version = "2.27.2"; # mysql
+    hash = "sha256-mmquP4u3YqqbGVK2jkbNtGiqVMENCThpRTWOz6f74Pk="; # mysql
   };
 
   netcdf = mkGeoserverExtension {
     name = "netcdf";
-    version = "2.27.1"; # netcdf
-    hash = "sha256-W/ICO05gBf5o6ZAc8vbxv9ZWd02m6AMQKqyimpVvRX8="; # netcdf
+    version = "2.27.2"; # netcdf
+    hash = "sha256-GhPde3Fw04lutbgPmDyxO/C7wkZO1ttASqqj2g6JuCM="; # netcdf
     buildInputs = [ netcdf ];
   };
 
   netcdf-out = mkGeoserverExtension {
     name = "netcdf-out";
-    version = "2.27.1"; # netcdf-out
-    hash = "sha256-0l74QlXo3CwTja2DDx8fmD9DTJV3S6fdCi2r6oq6UwE="; # netcdf-out
+    version = "2.27.2"; # netcdf-out
+    hash = "sha256-r4CyrlRm04tE3+vJfF+KlHAczrOy+dsTHXBG++GG0ys="; # netcdf-out
     buildInputs = [ netcdf ];
   };
 
   ogr-wfs = mkGeoserverExtension {
     name = "ogr-wfs";
-    version = "2.27.1"; # ogr-wfs
+    version = "2.27.2"; # ogr-wfs
     buildInputs = [ pkgs.gdal ];
-    hash = "sha256-UXTpC4vd/2lq2mRMaTEwiIb58NtnsM+PEX2F6hsCv3s="; # ogr-wfs
+    hash = "sha256-EI0FNYFwcmsLYiYauvCAvweAIn6bI7WaCVPcCtkGrys="; # ogr-wfs
   };
 
   # Needs ogr-wfs extension.
   ogr-wps = mkGeoserverExtension {
     name = "ogr-wps";
-    version = "2.27.1"; # ogr-wps
+    version = "2.27.2"; # ogr-wps
     # buildInputs = [ pkgs.gdal ];
-    hash = "sha256-GgVVGEBm7ci4Qxe+hNiIuGGOoJQRvaZE+NYKY0ZJlAQ="; # ogr-wps
+    hash = "sha256-CtsaQg9IZxlRW4oQwmdBA+VLWtsNP3+jS1Mj2RxAJw4="; # ogr-wps
   };
 
   oracle = mkGeoserverExtension {
     name = "oracle";
-    version = "2.27.1"; # oracle
-    hash = "sha256-7NH0XW+dZWIgJ8rwzNjCXLS2c4lCFg0FzNM8AD17Z3E="; # oracle
+    version = "2.27.2"; # oracle
+    hash = "sha256-8cRDvWWFJHZZGmbZEruvp1whfhXZ/c7TYha4Fa5DuzM="; # oracle
   };
 
   params-extractor = mkGeoserverExtension {
     name = "params-extractor";
-    version = "2.27.1"; # params-extractor
-    hash = "sha256-Z3pM5Mt1RE1+aDfsjcMrx4u6SvUzOUQmrmfghCCQIYk="; # params-extractor
+    version = "2.27.2"; # params-extractor
+    hash = "sha256-Y7tt0F//dANcKds/mU6702S5PMJNVLcxxc+hYFNOt5M="; # params-extractor
   };
 
   printing = mkGeoserverExtension {
     name = "printing";
-    version = "2.27.1"; # printing
-    hash = "sha256-/kkUQpARHi2J/+4Tc9z7pVGLhnwbrlxOxiUlbg646KQ="; # printing
+    version = "2.27.2"; # printing
+    hash = "sha256-I5vVlpX2kXof3wuyRs2QvhWdx0Okm7StYvY8I/AL8Ug="; # printing
   };
 
   pyramid = mkGeoserverExtension {
     name = "pyramid";
-    version = "2.27.1"; # pyramid
-    hash = "sha256-b4ZZNXHOgywXkPwTWBANyl0r1bok4bybusI0tKZ7rY8="; # pyramid
+    version = "2.27.2"; # pyramid
+    hash = "sha256-/iIwS5iw95qotmmLWGU11br36dVc+o5LmwTDXBL7zaY="; # pyramid
   };
 
   querylayer = mkGeoserverExtension {
     name = "querylayer";
-    version = "2.27.1"; # querylayer
-    hash = "sha256-8leo1ZtrYbN9XISJLVZvOF34arOEnh0Y8CIeWih8XOE="; # querylayer
+    version = "2.27.2"; # querylayer
+    hash = "sha256-G66AkPkytzXvEi9hbudvBphFKrvMrhUbPSVvexXRJh4="; # querylayer
   };
 
   sldservice = mkGeoserverExtension {
     name = "sldservice";
-    version = "2.27.1"; # sldservice
-    hash = "sha256-nKG1/+NwmTaardqZAhB4A1QV6bPxc30jW9Ip/q2vUJ0="; # sldservice
+    version = "2.27.2"; # sldservice
+    hash = "sha256-djERawjM06NtZK6RnNh/qIS/x5ZjSWeUMHlUSF4/5aA="; # sldservice
   };
 
   sqlserver = mkGeoserverExtension {
     name = "sqlserver";
-    version = "2.27.1"; # sqlserver
-    hash = "sha256-aqQf7NwUPnNn9Byu8YmbMnsU3n3aq832rvXbvicQsrM="; # sqlserver
+    version = "2.27.2"; # sqlserver
+    hash = "sha256-Kad2wJmN/67xlLDViFfYWxvsSjmW+j3/iQEAvwEMZW4="; # sqlserver
   };
 
   vectortiles = mkGeoserverExtension {
     name = "vectortiles";
-    version = "2.27.1"; # vectortiles
-    hash = "sha256-8nITeBDeFX6bDx+2Sn4yHfb333XUdNGPV6I883nZLV0="; # vectortiles
+    version = "2.27.2"; # vectortiles
+    hash = "sha256-S5ujjj8JLXbybbjpA8qLF4sapVIECDZ8l+iqqUoVHuc="; # vectortiles
   };
 
   wcs2_0-eo = mkGeoserverExtension {
     name = "wcs2_0-eo";
-    version = "2.27.1"; # wcs2_0-eo
-    hash = "sha256-y3QOWFmYW+dxIAAlolcotJ0oNulRIJKvLeQqSTZKq/w="; # wcs2_0-eo
+    version = "2.27.2"; # wcs2_0-eo
+    hash = "sha256-S2d3Yel0B0DJubuMUywPB2gDiWIpdkniDksZcq8j9BI="; # wcs2_0-eo
   };
 
   web-resource = mkGeoserverExtension {
     name = "web-resource";
-    version = "2.27.1"; # web-resource
-    hash = "sha256-hfP/qnb4isWg4eoxfBCDpiLS4GBG/ysrGBE6HVbglMg="; # web-resource
+    version = "2.27.2"; # web-resource
+    hash = "sha256-HJ+GPrprrCPlzh9q+PZr0QEJE/YVXaqgxhUlYHPkgho="; # web-resource
   };
 
   wmts-multi-dimensional = mkGeoserverExtension {
     name = "wmts-multi-dimensional";
-    version = "2.27.1"; # wmts-multi-dimensional
-    hash = "sha256-/KfE5dLvbSeMn/w7NYKQtUIY/Wb1oWeLvdMEqgrNAhg="; # wmts-multi-dimensional
+    version = "2.27.2"; # wmts-multi-dimensional
+    hash = "sha256-de+0UEsRJyl9plnmOaWSI8xNc6RG+U7uJVEyvgwng4Q="; # wmts-multi-dimensional
   };
 
   wps = mkGeoserverExtension {
     name = "wps";
-    version = "2.27.1"; # wps
-    hash = "sha256-rsBUWUthRrBkSNIzZZZzIy56bsJYt9zy3cIzWQVHVGc="; # wps
+    version = "2.27.2"; # wps
+    hash = "sha256-Fn0XWncwqUmMub9eBxb5GN2cc3eMdyB55NB9AUvVQpQ="; # wps
   };
 
   # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not
   # available in nixpgs as of 2024/01.
   #wps-cluster-hazelcast = mkGeoserverExtension {
   #  name = "wps-cluster-hazelcast";
-  #  version = "2.27.1"; # wps-cluster-hazelcast
-  #  hash = "sha256-W0hIz/Bx/x0ATLhcljSWa9/qzltt3FKlWyxub4Lnsx0="; # wps-cluster-hazelcast
+  #  version = "2.27.2"; # wps-cluster-hazelcast
+  #  hash = "sha256-xV6JddIC5Uq8H3RaE9tqCMK+5OA5WrXfh6O82BVw+P0="; # wps-cluster-hazelcast
   #};
 
   wps-download = mkGeoserverExtension {
     name = "wps-download";
-    version = "2.27.1"; # wps-download
-    hash = "sha256-gt3u/zm8ME99d7zJV1EHQQYjC1IZyG7f5pV+Zt2XeJU="; # wps-download
+    version = "2.27.2"; # wps-download
+    hash = "sha256-loP1oYqie2U00RWOwlLzprECfnBTG2MeJNhPZJx8Q1o="; # wps-download
   };
 
   # Needs Postrgres configuration or similar.
   # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html
   wps-jdbc = mkGeoserverExtension {
     name = "wps-jdbc";
-    version = "2.27.1"; # wps-jdbc
-    hash = "sha256-5RtViHAgqAtnHQolqGMC7QYgnwQmn/sO4WdUx2gyxe8="; # wps-jdbc
+    version = "2.27.2"; # wps-jdbc
+    hash = "sha256-LpxGscFx7DCeM90VGs4lAMoKNXJVDnSCptdC9VeeU/o="; # wps-jdbc
   };
 
   ysld = mkGeoserverExtension {
     name = "ysld";
-    version = "2.27.1"; # ysld
-    hash = "sha256-DvQ8b6ODmU09Qixwe14wze92ktWyt54+zaEMfXjiEko="; # ysld
+    version = "2.27.2"; # ysld
+    hash = "sha256-1yOaJcPyLOm/lYdOazHU5DjfahSjuN00yYvxgsE5RKM="; # ysld
   };
 
 }
diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix
index 572a4d044149..9364e1e84384 100644
--- a/pkgs/by-name/ge/geoserver/package.nix
+++ b/pkgs/by-name/ge/geoserver/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "geoserver";
-  version = "2.27.1";
+  version = "2.27.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/geoserver/GeoServer/${finalAttrs.version}/geoserver-${finalAttrs.version}-bin.zip";
-    hash = "sha256-7IrnznWa5NI/2gFHVTRQ0IerOkodStbr0aGpKPpeLQk=";
+    hash = "sha256-yzejVi+0FzTCtUirCvn3PsxLLmoIUSxS2sA1KWWo30U=";
   };
 
   sourceRoot = ".";

From 591335bdbe558bac9910cc24d102970f3cb5e26b Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 25 Jul 2025 06:06:55 +0300
Subject: [PATCH 0227/3724] equicord: 2025-04-17 -> 2025-07-25, fix version
 regex

---
 pkgs/by-name/eq/equicord/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index 11bf8e6e4226..91834cdeb634 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -14,19 +14,19 @@ stdenv.mkDerivation (finalAttrs: {
   # the Equicord repository. Dates as tags (and automatic releases) were the compromise
   # we came to with upstream. Please do not change the version schema (e.g., to semver)
   # unless upstream changes the tag schema from dates.
-  version = "2025-04-17";
+  version = "2025-07-25";
 
   src = fetchFromGitHub {
     owner = "Equicord";
     repo = "Equicord";
     tag = "${finalAttrs.version}";
-    hash = "sha256-pAuNqPrQBeL2qPIoIvyBl1PrUBz81TrBd5RT15Iuuus=";
+    hash = "sha256-6p7lfdRaxQusqZf86a1qclal2E0LusYYT1y3BPkOSKY=";
   };
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-fjfzBy1Z7AUKA53yjjCQ6yasHc5QMaOBtXtXA5fNK5s=";
+    hash = "sha256-LXbr/qh1QZXQ/Na5180Im2WW8KbWU78Oo0O12SiNMWg=";
   };
 
   nativeBuildInputs = [
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version-regex"
-      "^\d{4}-\d{2}-\d{2}$"
+      "^(\\d{4}-\\d{2}-\\d{2})$"
     ];
   };
 

From f6170e11983c999662127bcae9387646b147371c Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 25 Jul 2025 06:10:31 +0300
Subject: [PATCH 0228/3724] equibop: 2.1.4 -> 2.1.5

---
 .../by-name/eq/equibop/disable_update_checking.patch |  9 ++++-----
 pkgs/by-name/eq/equibop/package.nix                  | 12 ++++++------
 pkgs/by-name/eq/equibop/use_system_equicord.patch    |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/eq/equibop/disable_update_checking.patch b/pkgs/by-name/eq/equibop/disable_update_checking.patch
index 6b2a9a4cb577..c074a821e463 100644
--- a/pkgs/by-name/eq/equibop/disable_update_checking.patch
+++ b/pkgs/by-name/eq/equibop/disable_update_checking.patch
@@ -2,15 +2,14 @@ diff --git i/src/main/index.ts w/src/main/index.ts
 index 23ea0d6..1ef465f 100644
 --- i/src/main/index.ts
 +++ w/src/main/index.ts
-@@ -32,7 +32,9 @@ if (process.platform === "linux") {
- if (IS_DEV) {
-     require("source-map-support").install();
- } else {
+@@ -22,7 +22,9 @@ import { isDeckGameMode } from "./utils/steamOS";
+ 
+ if (!IS_DEV) {
 -    autoUpdater.checkForUpdatesAndNotify();
 +    console.log("Update checking is disabled. Skipping...");
 +    // autoUpdater.checkForUpdatesAndNotify();
 +
  }
  
- // Make the Vencord files use our DATA_DIR
+ console.log("Equibop v" + app.getVersion());
 
diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix
index 56c6f5540c0d..d13e39f570c6 100644
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@@ -12,7 +12,7 @@
   pipewire,
   libpulseaudio,
   autoPatchelfHook,
-  pnpm_9,
+  pnpm_10,
   nodejs,
   nix-update-script,
   withTTS ? true,
@@ -23,16 +23,16 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "equibop";
-  version = "2.1.4";
+  version = "2.1.5";
 
   src = fetchFromGitHub {
     owner = "Equicord";
     repo = "Equibop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-y5q3shwmMjXlMaLWfxjN164uM8hSbWymsHIIJxM82Nk=";
+    hash = "sha256-uod94pP261Alq+dby+/diiLT0KFjXswVapwXYAAAkbs=";
   };
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs)
       pname
       version
@@ -40,12 +40,12 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       ;
     fetcherVersion = 1;
-    hash = "sha256-laTyxRh54x3iopGVgoFtcgaV7R6IKux1O/+tzGEy0Fg=";
+    hash = "sha256-0UNScJAdpcMOcBHGGG+SeGQon89qLXTCNmaxEswNFBI=";
   };
 
   nativeBuildInputs = [
     nodejs
-    pnpm_9.configHook
+    pnpm_10.configHook
     # XXX: Equibop *does not* ship venmic as a prebuilt node module. The package
     # seems to build with or without this hook, but I (NotAShelf) don't have the
     # time to test the consequences of removing this hook. Please open a pull
diff --git a/pkgs/by-name/eq/equibop/use_system_equicord.patch b/pkgs/by-name/eq/equibop/use_system_equicord.patch
index 3321b72bb5e2..3401e10ba331 100644
--- a/pkgs/by-name/eq/equibop/use_system_equicord.patch
+++ b/pkgs/by-name/eq/equibop/use_system_equicord.patch
@@ -2,13 +2,13 @@ diff --git i/src/main/constants.ts w/src/main/constants.ts
 index afb171f..c6a014e 100644
 --- i/src/main/constants.ts
 +++ w/src/main/constants.ts
-@@ -47,10 +47,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes");
+@@ -30,10 +30,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes");
  
  // needs to be inline require because of circular dependency
  // as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised
 -export const VENCORD_DIR = (() => {
 -    const { State } = require("./settings") as typeof import("./settings");
--    return State.store.vencordDir ? join(State.store.vencordDir, "equibop") : join(SESSION_DATA_DIR, "equicord.asar");
+-    return State.store.equicordDir ? join(State.store.equicordDir, "equibop") : join(SESSION_DATA_DIR, "equicord.asar");
 -})();
 +export const VENCORD_DIR = "@equicord@";
  

From 4e2f0650396c0f03e9bd03e3e02adc01df9fb305 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 25 Jul 2025 10:07:33 +0800
Subject: [PATCH 0229/3724] uv: 0.8.2 -> 0.8.3

---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 09ee01b57795..ee9b2113720f 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-qMXXkf2hLyzd+4H85kGHiQIdAbvhMA2z+1z05ZF0hts=";
+    hash = "sha256-b/BXJPa85RrW+9kQ9xEJhbw52BADaw1pUeSbfhCgl20=";
   };
 
-  cargoHash = "sha256-G5mLFKy/khHlP32/VFudtJJC1CWpBNyx4yPx1Gc8pcY=";
+  cargoHash = "sha256-bH5GHm+f+QjdXpZdjzdJQ9JaaTQ+iGe/oqnyPbxDW0c=";
 
   buildInputs = [
     rust-jemalloc-sys

From 1c3b5fdb927f3a6bf4abee604828397ae6a9ad45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 09:59:06 +0000
Subject: [PATCH 0230/3724] pyright: 1.1.402 -> 1.1.403

---
 pkgs/by-name/py/pyright/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix
index 103afd11c679..9e649914c0bd 100644
--- a/pkgs/by-name/py/pyright/package.nix
+++ b/pkgs/by-name/py/pyright/package.nix
@@ -7,13 +7,13 @@
 }:
 
 let
-  version = "1.1.402";
+  version = "1.1.403";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "pyright";
     tag = version;
-    hash = "sha256-gB3psPkWVHUrXGQuuqMzy64Ir7hIRpMZ4dkZqusa1mo=";
+    hash = "sha256-vqE/3wK0rtFT9f399djm4QElRccXdOXyODsQMQySa9k=";
   };
 
   patchedPackageJSON = runCommand "package.json" { } ''
@@ -44,7 +44,7 @@ let
     pname = "pyright-internal";
     inherit version src;
     sourceRoot = "${src.name}/packages/pyright-internal";
-    npmDepsHash = "sha256-3eFxGufA41RwuLrwy6Y4Q25mTbfDjm1Ddo2XOwL9lAk=";
+    npmDepsHash = "sha256-Tc7v6sDu0PR//ukvw9hULX0KGpRkA0hEaeuKlPnpYl4=";
     dontNpmBuild = true;
     installPhase = ''
       runHook preInstall
@@ -58,7 +58,7 @@ buildNpmPackage rec {
   inherit version src;
 
   sourceRoot = "${src.name}/packages/pyright";
-  npmDepsHash = "sha256-HxvVBnvM0ocwc1ck0YEj5q5ea4bAfRmftZauJrnhHck=";
+  npmDepsHash = "sha256-wzjdeZr6tbaBuOWDJXeTFkQRUHnxYryvI7sfGsSEpVQ=";
 
   postPatch = ''
     chmod +w ../../

From e89df558c43a0b50b7f437d0019fcc32f686c77c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 25 Jul 2025 14:53:27 +0300
Subject: [PATCH 0231/3724] python313Packages.numpy: 2.3.1 -> 2.3.2

Changelog: https://github.com/numpy/numpy/releases/tag/v2.3.2
---
 pkgs/development/python-modules/numpy/2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
index d4ea336d499a..397b071909e8 100644
--- a/pkgs/development/python-modules/numpy/2.nix
+++ b/pkgs/development/python-modules/numpy/2.nix
@@ -59,7 +59,7 @@ let
 in
 buildPythonPackage rec {
   pname = "numpy";
-  version = "2.3.1";
+  version = "2.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -67,7 +67,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "tar.gz";
-    hash = "sha256-HsmuIKQibaN0NizKPGLNdT+vL5UUQLDjuY6TwjVEHSs=";
+    hash = "sha256-4EhqEewwzey1PxhNSW0caiB4bIHlXkFkAnATAFb47kg=";
   };
 
   patches = lib.optionals python.hasDistutilsCxxPatch [

From 859c24dfc86f8d9194bf50a2a5df0fe8d9eceec2 Mon Sep 17 00:00:00 2001
From: Kamil Zaripov <kamil@zaripov.net>
Date: Sun, 20 Jul 2025 14:38:48 +0300
Subject: [PATCH 0232/3724] rustc: Fix cross-compilation for the targets with
 dot in name

When you are trying to cross-compile rustc to the target platform with
the dot in name, e.g. "thumb8vm.main-none-eabi", rustc compilation fails
with this error during configuration:

    armv8m-unknown-none-eabi-rustc> Running phase: configurePhase
    armv8m-unknown-none-eabi-rustc> patching script interpreter paths in ./configure
    armv8m-unknown-none-eabi-rustc> ./configure: interpreter directive changed from "#!/bin/sh" to "/nix/store/ih68ar79msmj0496pgld4r3vqfr7bbin-bash-5.2p37/bin/sh"
    armv8m-unknown-none-eabi-rustc> configure flags: --prefix=/nix/store/wscr78z0s5v2hxx3p1n4qjgjnds8dm0g-armv8m-unknown-none-eabi-rustc-1.86.0 --sysconfdir=/nix/store/wscr78z0s5v2hxx3p1n4qjgjnds8dm0g-armv8m-unknown-none-eabi-rustc-1.86.0/etc --release-channel=stable --set=build.rustc=/nix/store/f9zdz15l2zd408yq7a3bgrj593kpwjqx-rustc-wrapper-1.86.0/bin/rustc --set=build.cargo=/nix/store/ygri5mmqmril5ll9lhawa01faa2qhdvd-cargo-1.86.0/bin/cargo --tools=rustc\,rustdoc\,rust-analyzer-proc-macro-srv --enable-rpath --enable-vendor --disable-lld --build=x86_64-unknown-linux-gnu --host=x86_64-unknown-linux-gnu --target=thumbv8m.main-none-eabi --set=target.x86_64-unknown-linux-gnu.cc=/nix/store/a0d7m3zn9p2dfa1h7ag9h2wzzr2w25sn-gcc-wrapper-14.2.1.20250322/bin/cc --set=target.x86_64-unknown-linux-gnu.cc=/nix/store/a0d7m3zn9p2dfa1h7ag9h2wzzr2w25sn-gcc-wrapper-14.2.1.20250322/bin/cc --set=target.thumbv8m.main-none-eabi.cc=/nix/store/wnnwk5vknch7d8jy3cdykbsnn5qrmjj3-armv8m-unknown-none-eabi-gcc-wrapper-14.2.1.20250322/bin/armv8m-unknown-none-eabi-cc --set=target.thumbv8m.main-none-eabi.linker=/nix/store/wnnwk5vknch7d8jy3cdykbsnn5qrmjj3-armv8m-unknown-none-eabi-gcc-wrapper-14.2.1.20250322/bin/armv8m-unknown-none-eabi-cc --set=target.x86_64-unknown-linux-gnu.linker=/nix/store/a0d7m3zn9p2dfa1h7ag9h2wzzr2w25sn-gcc-wrapper-14.2.1.20250322/bin/cc --set=target.x86_64-unknown-linux-gnu.linker=/nix/store/a0d7m3zn9p2dfa1h7ag9h2wzzr2w25sn-gcc-wrapper-14.2.1.20250322/bin/cc --set=target.x86_64-unknown-linux-gnu.cxx=/nix/store/a0d7m3zn9p2dfa1h7ag9h2wzzr2w25sn-gcc-wrapper-14.2.1.20250322/bin/c++ --set=target.x86_64-unknown-linux-gnu.cxx=/nix/store/a0d7m3zn9p2dfa1h7ag9h2wzzr2w25sn-gcc-wrapper-14.2.1.20250322/bin/c++ --set=target.thumbv8m.main-none-eabi.cxx=/nix/store/wnnwk5vknch7d8jy3cdykbsnn5qrmjj3-armv8m-unknown-none-eabi-gcc-wrapper-14.2.1.20250322/bin/armv8m-unknown-none-eabi-c++ --set=target.x86_64-unknown-linux-gnu.crt-static=false --set=target.x86_64-unknown-linux-gnu.crt-static=false --set=target.thumbv8m.main-none-eabi.crt-static=false --enable-llvm-link-shared --set=target.x86_64-unknown-linux-gnu.llvm-config=/nix/store/bw1i8r1ilp79xyybr2n633aq3jj1wrrd-llvm-19.1.7-dev/bin/llvm-config --set=target.x86_64-unknown-linux-gnu.llvm-config=/nix/store/bw1i8r1ilp79xyybr2n633aq3jj1wrrd-llvm-19.1.7-dev/bin/llvm-config --set=target.thumbv8m.main-none-eabi.llvm-config=/nix/store/bw1i8r1ilp79xyybr2n633aq3jj1wrrd-llvm-19.1.7-dev/bin/llvm-config --disable-llvm-bitcode-linker --disable-docs
    armv8m-unknown-none-eabi-rustc> configure: processing command line
    armv8m-unknown-none-eabi-rustc> configure:
    armv8m-unknown-none-eabi-rustc> configure: build.configure-args := ['--prefix=/nix/store/wscr78z0s5v2hxx3p1n4qjgj ...
    armv8m-unknown-none-eabi-rustc> configure: install.prefix       := /nix/store/wscr78z0s5v2hxx3p1n4qjgjnds8dm0g-ar ...
    armv8m-unknown-none-eabi-rustc> configure: install.sysconfdir   := /nix/store/wscr78z0s5v2hxx3p1n4qjgjnds8dm0g-ar ...
    armv8m-unknown-none-eabi-rustc> configure: rust.channel         := stable
    armv8m-unknown-none-eabi-rustc> configure: build.rustc          := /nix/store/f9zdz15l2zd408yq7a3bgrj593kpwjqx-ru ...
    armv8m-unknown-none-eabi-rustc> configure: build.cargo          := /nix/store/ygri5mmqmril5ll9lhawa01faa2qhdvd-ca ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.cc := /nix/store/a0d7m3zn9p2dfa1h7ag9h ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.cc := /nix/store/a0d7m3zn9p2dfa1h7ag9h ...
    armv8m-unknown-none-eabi-rustc> configure: target.thumbv8m.main-none-eabi.cc := /nix/store/wnnwk5vknch7d8jy3cdykb ...
    armv8m-unknown-none-eabi-rustc> configure: target.thumbv8m.main-none-eabi.linker := /nix/store/wnnwk5vknch7d8jy3c ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.linker := /nix/store/a0d7m3zn9p2dfa1h7 ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.linker := /nix/store/a0d7m3zn9p2dfa1h7 ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.cxx := /nix/store/a0d7m3zn9p2dfa1h7ag9 ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.cxx := /nix/store/a0d7m3zn9p2dfa1h7ag9 ...
    armv8m-unknown-none-eabi-rustc> configure: target.thumbv8m.main-none-eabi.cxx := /nix/store/wnnwk5vknch7d8jy3cdyk ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.crt-static := False
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.crt-static := False
    armv8m-unknown-none-eabi-rustc> configure: target.thumbv8m.main-none-eabi.crt-static := False
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.llvm-config := /nix/store/bw1i8r1ilp79 ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.llvm-config := /nix/store/bw1i8r1ilp79 ...
    armv8m-unknown-none-eabi-rustc> configure: target.thumbv8m.main-none-eabi.llvm-config := /nix/store/bw1i8r1ilp79x ...
    armv8m-unknown-none-eabi-rustc> configure: build.tools          := ['rustc', 'rustdoc', 'rust-analyzer-proc-macro ...
    armv8m-unknown-none-eabi-rustc> configure: rust.rpath           := True
    armv8m-unknown-none-eabi-rustc> configure: build.vendor         := True
    armv8m-unknown-none-eabi-rustc> configure: rust.lld             := False
    armv8m-unknown-none-eabi-rustc> configure: build.build          := x86_64-unknown-linux-gnu
    armv8m-unknown-none-eabi-rustc> configure: build.host           := ['x86_64-unknown-linux-gnu']
    armv8m-unknown-none-eabi-rustc> configure: build.target         := ['thumbv8m.main-none-eabi']
    armv8m-unknown-none-eabi-rustc> configure: llvm.link-shared     := True
    armv8m-unknown-none-eabi-rustc> configure: rust.llvm-bitcode-linker := False
    armv8m-unknown-none-eabi-rustc> configure: build.docs           := False
    armv8m-unknown-none-eabi-rustc> configure: profile              := dist
    armv8m-unknown-none-eabi-rustc> Traceback (most recent call last):
    armv8m-unknown-none-eabi-rustc>   File "/build/rustc-1.86.0-src/./src/bootstrap/configure.py", line 762, in <module>
    armv8m-unknown-none-eabi-rustc>     section_order, sections, targets = parse_args(sys.argv[1:])
    armv8m-unknown-none-eabi-rustc>                                        ^^^^^^^^^^^^^^^^^^^^^^^^
    armv8m-unknown-none-eabi-rustc>   File "/build/rustc-1.86.0-src/./src/bootstrap/configure.py", line 446, in parse_args
    armv8m-unknown-none-eabi-rustc>     return parse_example_config(known_args, config)
    armv8m-unknown-none-eabi-rustc>            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    armv8m-unknown-none-eabi-rustc>   File "/build/rustc-1.86.0-src/./src/bootstrap/configure.py", line 622, in parse_example_config
    armv8m-unknown-none-eabi-rustc>     configure_file(sections, top_level_keys, targets, config)
    armv8m-unknown-none-eabi-rustc>   File "/build/rustc-1.86.0-src/./src/bootstrap/configure.py", line 709, in configure_file
    armv8m-unknown-none-eabi-rustc>     configure_section(targets[target], section_config[target])
    armv8m-unknown-none-eabi-rustc>   File "/build/rustc-1.86.0-src/./src/bootstrap/configure.py", line 683, in configure_section
    armv8m-unknown-none-eabi-rustc>     raise RuntimeError("failed to find config line for {}".format(key))
    armv8m-unknown-none-eabi-rustc> RuntimeError: failed to find config line for main-none-eabi

This is probably related to
https://github.com/rust-lang/rust/issues/130602 and thus target string
should be double-quotted so bootstrap/configure.py can parse it
correctly.

Changes tested on x86_64-linux build machine with rustc built for
"thumb8vm.main-none-eabi" target.
---
 pkgs/development/compilers/rust/rustc.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 0f67f384f694..e204928eaaaf 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -111,9 +111,9 @@ stdenv.mkDerivation (finalAttrs: {
         stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang" else "cc"}";
       cxxPrefixForStdenv =
         stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang++" else "c++"}";
-      setBuild = "--set=target.${stdenv.buildPlatform.rust.rustcTarget}";
-      setHost = "--set=target.${stdenv.hostPlatform.rust.rustcTarget}";
-      setTarget = "--set=target.${stdenv.targetPlatform.rust.rustcTarget}";
+      setBuild = "--set=target.\"${stdenv.buildPlatform.rust.rustcTarget}\"";
+      setHost = "--set=target.\"${stdenv.hostPlatform.rust.rustcTarget}\"";
+      setTarget = "--set=target.\"${stdenv.targetPlatform.rust.rustcTarget}\"";
       ccForBuild = ccPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv;
       cxxForBuild = cxxPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv;
       ccForHost = ccPrefixForStdenv pkgsBuildHost.targetPackages.stdenv;

From 8f70ff81c02988b7d80ab49ca72faf374dad51a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Lima?= <me@limwa.pt>
Date: Wed, 16 Jul 2025 13:22:07 +0100
Subject: [PATCH 0233/3724] jdk{8,11,17,23,24}: always enable __structuredAttrs

---
 .../development/compilers/openjdk/generic.nix | 37 ++++++++-----------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index ef3a32eff46f..3530f463be9c 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -8,6 +8,7 @@
   fetchpatch,
 
   buildPackages,
+  autoPatchelfHook,
   pkg-config,
   autoconf,
   lndir,
@@ -242,6 +243,7 @@ stdenv.mkDerivation (finalAttrs: {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   nativeBuildInputs = [
+    autoPatchelfHook
     pkg-config
   ]
   ++ lib.optionals atLeast11 [
@@ -422,8 +424,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildFlags = if atLeast17 then [ "images" ] else [ "all" ];
 
-  separateDebugInfo = atLeast11;
-  __structuredAttrs = atLeast11;
+  separateDebugInfo = true;
+  __structuredAttrs = true;
 
   # -j flag is explicitly rejected by the build system:
   #     Error: 'make -jN' is not supported, use 'make JOBS=N'
@@ -621,26 +623,17 @@ stdenv.mkDerivation (finalAttrs: {
       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 {} \+ | ${
-        if atLeast17 then "sort -u" else "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
-  '';
+  # If binaries in the jre output have RPATH dependencies on libraries from the out output, Nix will
+  # detect a cyclic reference and abort the build.
+  # To fix that, we need to patch the binaries from each output in separate auto-patchelf executions.
+  dontAutoPatchelf = true;
+  postFixup =
+    ''
+      autoPatchelf -- $out
+    ''
+    + lib.optionalString (!atLeast11) ''
+      autoPatchelf -- $jre
+    '';
 
   # TODO: The OpenJDK 8 derivation got this wrong.
   disallowedReferences = [

From 1bc0ebeb6708d91b1b5309d35cad60e0592b0332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Lima?= <me@limwa.pt>
Date: Wed, 23 Jul 2025 11:10:11 +0100
Subject: [PATCH 0234/3724] jdk{8,11,17,23,24}: cleanup

---
 .../development/compilers/openjdk/generic.nix | 244 +++++++-----------
 1 file changed, 99 insertions(+), 145 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index 3530f463be9c..3588d94e690d 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -46,7 +46,6 @@
 
   versionCheckHook,
 
-  bash,
   liberation_ttf,
   cacert,
 
@@ -245,6 +244,11 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     autoPatchelfHook
     pkg-config
+    unzip
+    zip
+    which
+    # Probably for BUILD_CC but not sure, not in closure.
+    zlib
   ]
   ++ lib.optionals atLeast11 [
     autoconf
@@ -258,13 +262,6 @@ stdenv.mkDerivation (finalAttrs: {
     # Certificates generated using keytool in `installPhase`
     buildPackages.jdk8
   ]
-  ++ [
-    unzip
-    zip
-    which
-    # Probably for BUILD_CC but not sure, not in closure.
-    zlib
-  ]
   ++ lib.optionals atLeast21 [
     ensureNewerSourcesForZipFilesHook
   ]
@@ -279,49 +276,35 @@ stdenv.mkDerivation (finalAttrs: {
     file
     cups
     freetype
-  ]
-  ++ lib.optionals (atLeast11 && !atLeast21) [
-    harfbuzz
-  ]
-  ++ [
     alsa-lib
     libjpeg
     giflib
-  ]
-  ++ lib.optionals atLeast11 [
-    libpng
-    zlib # duplicate
-    lcms2
-  ]
-  ++ [
     libX11
     libICE
-  ]
-  ++ lib.optionals (!atLeast11) [
     libXext
-  ]
-  ++ [
     libXrender
-  ]
-  ++ lib.optionals atLeast11 [
-    libXext
-  ]
-  ++ [
     libXtst
     libXt
-    libXtst # duplicate
     libXi
     libXinerama
     libXcursor
     libXrandr
     fontconfig
   ]
+  ++ lib.optionals (atLeast11 && !atLeast21) [
+    harfbuzz
+  ]
+  ++ lib.optionals atLeast11 [
+    libpng
+    zlib # duplicate
+    lcms2
+  ]
   ++ lib.optionals (!headless && enableGtk) [
     (if atLeast11 then gtk3 else gtk2)
     glib
   ];
 
-  propagatedBuildInputs = lib.optionals (!atLeast11) [ setJavaClassPath ];
+  propagatedBuildInputs = [ setJavaClassPath ];
 
   nativeInstallCheckInputs = lib.optionals atLeast23 [
     versionCheckHook
@@ -330,14 +313,13 @@ stdenv.mkDerivation (finalAttrs: {
   # 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
-  ${if atLeast17 then "configurePlatforms" else null} = [
+  configurePlatforms = lib.optionals atLeast17 [
     "build"
     "host"
   ];
 
   # https://openjdk.org/groups/build/doc/building.html
   configureFlags = [
-    "--with-boot-jdk=${jdk-bootstrap'.home}"
     # https://github.com/openjdk/jdk/blob/471f112bca715d04304cbe35c6ed63df8c7b7fee/make/autoconf/util_paths.m4#L315
     # Ignoring value of READELF from the environment. Use command line variables instead.
     "READELF=${stdenv.cc.targetPrefix}readelf"
@@ -346,6 +328,12 @@ stdenv.mkDerivation (finalAttrs: {
     "NM=${stdenv.cc.targetPrefix}nm"
     "OBJDUMP=${stdenv.cc.targetPrefix}objdump"
     "OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
+    "--with-boot-jdk=${jdk-bootstrap'.home}"
+    "--enable-unlimited-crypto"
+    "--with-native-debug-symbols=internal"
+    "--with-stdc++lib=dynamic"
+    "--with-zlib=system"
+    "--with-giflib=system"
   ]
   ++ (
     if atLeast23 then
@@ -368,10 +356,6 @@ stdenv.mkDerivation (finalAttrs: {
         "--with-milestone=fcs"
       ]
   )
-  ++ [
-    "--enable-unlimited-crypto"
-    "--with-native-debug-symbols=internal"
-  ]
   ++ lib.optionals (!atLeast21) (
     if atLeast11 then
       [
@@ -383,23 +367,10 @@ stdenv.mkDerivation (finalAttrs: {
         "--disable-freetype-bundling"
       ]
   )
-  ++ (
-    if atLeast11 then
-      [
-        "--with-libjpeg=system"
-        "--with-giflib=system"
-        "--with-libpng=system"
-        "--with-zlib=system"
-        "--with-lcms=system"
-      ]
-    else
-      [
-        "--with-zlib=system"
-        "--with-giflib=system"
-      ]
-  )
-  ++ [
-    "--with-stdc++lib=dynamic"
+  ++ lib.optionals atLeast11 [
+    "--with-libjpeg=system"
+    "--with-libpng=system"
+    "--with-lcms=system"
   ]
   ++ lib.optionals (featureVersion == "11") [
     "--disable-warnings-as-errors"
@@ -433,6 +404,12 @@ stdenv.mkDerivation (finalAttrs: {
   # still runs in parallel.
   enableParallelBuilding = false;
 
+  preConfigure =
+    # Set number of jobs to use when building.
+    ''
+      configureFlags+=("--with-jobs=''${NIX_BUILD_CORES}")
+    '';
+
   env = {
     NIX_CFLAGS_COMPILE =
       if atLeast17 then
@@ -483,13 +460,14 @@ stdenv.mkDerivation (finalAttrs: {
     DISABLE_HOTSPOT_OS_VERSION_CHECK = "ok";
   };
 
-  ${if atLeast23 then "versionCheckProgram" else null} = "${placeholder "out"}/bin/java";
+  versionCheckProgram = lib.optionalString atLeast23 "${placeholder "out"}/bin/java";
 
-  ${if !atLeast11 then "doCheck" else null} = false; # fails with "No rule to make target 'y'."
+  # Fails with "No rule to make target 'y'."
+  doCheck = false;
 
   doInstallCheck = atLeast23;
 
-  ${if atLeast17 then "postPatch" else null} = ''
+  postPatch = ''
     chmod +x configure
     patchShebangs --build configure
   ''
@@ -498,43 +476,38 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs --build make/scripts
   '';
 
-  ${if !atLeast17 then "preConfigure" else null} = ''
-    chmod +x configure
-    substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
-  ''
-  + lib.optionalString (!atLeast11) ''
-    substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}"
-    substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path"
-  '';
-
   installPhase = ''
     mkdir -p $out/lib
-
     mv build/*/images/${if atLeast11 then "jdk" else "j2sdk-image"} $out/lib/openjdk
-
-    # Remove some broken manpages.
+  ''
+  # Remove some broken manpages.
+  + ''
     rm -rf $out/lib/openjdk/man/ja*
-
-    # Mirror some stuff in top-level.
+  ''
+  # Mirror some stuff in top-level.
+  + ''
     mkdir -p $out/share
+    ln -s $out/lib/openjdk/bin $out/bin
     ln -s $out/lib/openjdk/include $out/include
     ln -s $out/lib/openjdk/man $out/share/man
   ''
-  + lib.optionalString atLeast17 ''
-
-    # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
-  ''
+  # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
   + lib.optionalString atLeast11 ''
     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.
   + ''
-
-    # 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 (!atLeast11) " $out/lib/openjdk/sample"}
-    ${lib.optionalString headless (
+  ''
+  # Remove crap from the installation.
+  + (
+    ''
+      rm -rf $out/lib/openjdk/demo
+    ''
+    + lib.optionalString (!atLeast11) ''
+      rm -rf $out/lib/openjdk/sample
+    ''
+    + lib.optionalString headless (
       if atLeast11 then
         ''
           rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
@@ -545,37 +518,41 @@ stdenv.mkDerivation (finalAttrs: {
           rm $out/lib/openjdk/jre/bin/policytool
           rm $out/lib/openjdk/bin/{policytool,appletviewer}
         ''
-    )}
-  ''
-  + lib.optionalString (!atLeast11) ''
-
+    )
+  )
+  + lib.optionalString (!atLeast11) (
     # Move the JRE to a separate output
-    mkdir -p $jre/lib/openjdk
-    mv $out/lib/openjdk/jre $jre/lib/openjdk/jre
-    mkdir $out/lib/openjdk/jre
-    lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
+    ''
+      mkdir -p $jre/lib/openjdk
+      mv $out/lib/openjdk/jre $jre/lib/openjdk/jre
+      mkdir $out/lib/openjdk/jre
+      lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
 
+      ln -s $jre/lib/openjdk/jre $out/jre
+      ln -s $jre/lib/openjdk/jre/bin $jre/bin
+    ''
     # Make sure cmm/*.pf are not symlinks:
     # https://youtrack.jetbrains.com/issue/IDEA-147272
-    rm -rf $out/lib/openjdk/jre/lib/cmm
-    ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
-
+    + ''
+      rm -rf $out/lib/openjdk/jre/lib/cmm
+      ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
+    ''
     # Setup fallback fonts
-    ${lib.optionalString (!headless) ''
+    + lib.optionalString (!headless) ''
       mkdir -p $jre/lib/openjdk/jre/lib/fonts
       ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
-    ''}
-
+    ''
     # Remove duplicate binaries.
-    for i in $(cd $out/lib/openjdk/bin && echo *); do
-      if [ "$i" = java ]; then continue; fi
-      if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
-        ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
-      fi
-    done
-
+    + ''
+      for i in $(ls $out/lib/openjdk/bin); do
+        if [ "$i" = java ]; then continue; fi
+        if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
+          ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
+        fi
+      done
+    ''
     # Generate certificates.
-    (
+    + ''
       cd $jre/lib/openjdk/jre/lib/security
       rm cacerts
       perl ${./8/generate-cacerts.pl} ${
@@ -584,64 +561,41 @@ stdenv.mkDerivation (finalAttrs: {
         else
           "keytool"
       } ${cacert}/etc/ssl/certs/ca-bundle.crt
-    )
-  ''
-  + ''
-
-    ln -s $out/lib/openjdk/bin $out/bin
-  ''
-  + lib.optionalString (!atLeast11) ''
-    ln -s $jre/lib/openjdk/jre/bin $jre/bin
-    ln -s $jre/lib/openjdk/jre $out/jre
-  '';
+    ''
+  );
 
   preFixup =
-    (
-      if atLeast11 then
-        ''
-          # 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
-        ''
-      else
-        ''
-          # Propagate the setJavaClassPath setup hook from the JRE so that
-          # any package that depends on the JRE has $CLASSPATH set up
-          # properly.
-          mkdir -p $jre/nix-support
-          printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs
-        ''
-    )
-    + ''
-
-      # Set JAVA_HOME automatically.
+    # 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
+    ''
+    # Propagate the setJavaClassPath setup hook from the JRE so that
+    # any package that depends on the JRE has $CLASSPATH set up
+    # properly.
+    + lib.optionalString (!atLeast11) ''
+      mkdir -p $jre/nix-support
+      printWords "${setJavaClassPath}" > $jre/nix-support/propagated-build-inputs
     '';
 
   # If binaries in the jre output have RPATH dependencies on libraries from the out output, Nix will
   # detect a cyclic reference and abort the build.
   # To fix that, we need to patch the binaries from each output in separate auto-patchelf executions.
   dontAutoPatchelf = true;
-  postFixup =
-    ''
-      autoPatchelf -- $out
-    ''
-    + lib.optionalString (!atLeast11) ''
-      autoPatchelf -- $jre
-    '';
+  postFixup = ''
+    autoPatchelf -- $out
+  ''
+  + lib.optionalString (!atLeast11) ''
+    autoPatchelf -- $jre
+  '';
 
-  # TODO: The OpenJDK 8 derivation got this wrong.
-  disallowedReferences = [
-    (if atLeast11 then jdk-bootstrap' else jdk-bootstrap)
-  ];
+  disallowedReferences = [ jdk-bootstrap' ];
 
   passthru = {
     home = "${finalAttrs.finalPackage}/lib/openjdk";
+    # Shouldn't this be `jdk-bootstrap = jdk-bootstrap'`?
     inherit jdk-bootstrap;
     inherit (source) updateScript;
   }

From 45a890c4e328a2e2d0cde7a4854fd8314a26e336 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 25 Jul 2025 19:45:42 +0300
Subject: [PATCH 0235/3724] aws-c-common: 0.10.3 -> 0.12.4

Diff: https://www.github.com/awslabs/aws-c-common/compare/v0.10.3...v0.12.4
---
 pkgs/by-name/aw/aws-c-common/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/aws-c-common/package.nix b/pkgs/by-name/aw/aws-c-common/package.nix
index 4dc2d76162bf..e2b86d35fec9 100644
--- a/pkgs/by-name/aw/aws-c-common/package.nix
+++ b/pkgs/by-name/aw/aws-c-common/package.nix
@@ -9,13 +9,13 @@
 stdenv.mkDerivation rec {
   pname = "aws-c-common";
   # nixpkgs-update: no auto update
-  version = "0.10.3";
+  version = "0.12.4";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-common";
     rev = "v${version}";
-    hash = "sha256-sA6CsLLHh4Ce/+ffl4OhisMSgdrD+EmXvTNGSq7/vvk=";
+    hash = "sha256-hKCIPZlLPyH7D3Derk2onyqTzWGUtCx+f2+EKtAKlwA=";
   };
 
   nativeBuildInputs = [ cmake ];

From e14486315aa65fbc6a9a10641a80b3d14fcf4af8 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 25 Jul 2025 19:46:02 +0300
Subject: [PATCH 0236/3724] aws-c-compression: 0.3.0 -> 0.3.1

Diff: https://www.github.com/awslabs/aws-c-compression/compare/v0.3.0...v0.3.1
---
 pkgs/by-name/aw/aws-c-compression/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/aws-c-compression/package.nix b/pkgs/by-name/aw/aws-c-compression/package.nix
index dfd3f53b2935..04ea9c4105bb 100644
--- a/pkgs/by-name/aw/aws-c-compression/package.nix
+++ b/pkgs/by-name/aw/aws-c-compression/package.nix
@@ -10,13 +10,13 @@
 stdenv.mkDerivation rec {
   pname = "aws-c-compression";
   # nixpkgs-update: no auto update
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-compression";
     rev = "v${version}";
-    sha256 = "sha256-EjvOf2UMju6pycPdYckVxqQ34VOhrIIyvK+O3AVRED4=";
+    sha256 = "sha256-gpru+hnppgLHhcPfVBOaMdcT6e8wUjZmY7Caaa/KAW4=";
   };
 
   nativeBuildInputs = [

From ad19f8ce71e7054f506ac31baf5331fe316c7f33 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 25 Jul 2025 19:46:54 +0300
Subject: [PATCH 0237/3724] aws-c-auth: 0.8.1 -> 0.9.0

Diff: https://www.github.com/awslabs/aws-c-auth/compare/v0.8.1...v0.9.0
---
 pkgs/by-name/aw/aws-c-auth/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/aws-c-auth/package.nix b/pkgs/by-name/aw/aws-c-auth/package.nix
index d915ec34e562..48c1a85ac843 100644
--- a/pkgs/by-name/aw/aws-c-auth/package.nix
+++ b/pkgs/by-name/aw/aws-c-auth/package.nix
@@ -16,13 +16,13 @@
 stdenv.mkDerivation rec {
   pname = "aws-c-auth";
   # nixpkgs-update: no auto update
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-auth";
     rev = "v${version}";
-    hash = "sha256-p8D79BRjaPlhzap/FWbqMlkrbVELSgeJW8CljxBAaCI=";
+    hash = "sha256-HzDUINTmgjW7rNEe+5iwZBv6ayxNKmGAJy+Lg4tp1t0=";
   };
 
   nativeBuildInputs = [

From 8e2ee4700c0cc469590dd03f2342421dfe29b0aa Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 25 Jul 2025 19:46:57 +0300
Subject: [PATCH 0238/3724] aws-c-event-stream: 0.5.0 -> 0.5.5

Diff: https://www.github.com/awslabs/aws-c-event-stream/compare/v0.5.0...v0.5.5
---
 pkgs/by-name/aw/aws-c-event-stream/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/aws-c-event-stream/package.nix b/pkgs/by-name/aw/aws-c-event-stream/package.nix
index 30b47942fe50..d71b3861e6ab 100644
--- a/pkgs/by-name/aw/aws-c-event-stream/package.nix
+++ b/pkgs/by-name/aw/aws-c-event-stream/package.nix
@@ -15,13 +15,13 @@
 stdenv.mkDerivation rec {
   pname = "aws-c-event-stream";
   # nixpkgs-update: no auto update
-  version = "0.5.0";
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-event-stream";
     rev = "v${version}";
-    hash = "sha256-lg1qS/u5Fi8nt/tv2ekd8dgQ7rlrF3DrRxqidAoEywY=";
+    hash = "sha256-wVjpDKKwoksq5gFtvhH76c7ciP0XmMozhkWmzY6GwgU=";
   };
 
   nativeBuildInputs = [ cmake ];

From 9676fdfeca61a750e88a30e869485bd0866f0567 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 25 Jul 2025 19:46:59 +0300
Subject: [PATCH 0239/3724] aws-c-http: 0.9.2 -> 0.10.4

Diff: https://www.github.com/awslabs/aws-c-http/compare/v0.9.2...v0.10.4
---
 pkgs/by-name/aw/aws-c-http/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/aws-c-http/package.nix b/pkgs/by-name/aw/aws-c-http/package.nix
index 37a52c7c985f..8d7ebf6c5eaa 100644
--- a/pkgs/by-name/aw/aws-c-http/package.nix
+++ b/pkgs/by-name/aw/aws-c-http/package.nix
@@ -14,13 +14,13 @@
 stdenv.mkDerivation rec {
   pname = "aws-c-http";
   # nixpkgs-update: no auto update
-  version = "0.9.2";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-http";
     rev = "v${version}";
-    hash = "sha256-3nT64dFUcuwPfhQDwY5MTe/xPdr7XZMBpVL7V0y9tng=";
+    hash = "sha256-t9PoxOjgV9qLris+C18SaEwXodBGcgK591LZl0dajxU=";
   };
 
   nativeBuildInputs = [

From af28d439d8fcb369a4afcb99c8a10f74aedaf0d8 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 25 Jul 2025 19:47:02 +0300
Subject: [PATCH 0240/3724] aws-c-mqtt: 0.11.0 -> 0.13.3

Diff: https://www.github.com/awslabs/aws-c-mqtt/compare/v0.11.0...v0.13.3
---
 pkgs/by-name/aw/aws-c-mqtt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/aws-c-mqtt/package.nix b/pkgs/by-name/aw/aws-c-mqtt/package.nix
index 1734aea049ad..d09cb15ed80e 100644
--- a/pkgs/by-name/aw/aws-c-mqtt/package.nix
+++ b/pkgs/by-name/aw/aws-c-mqtt/package.nix
@@ -15,13 +15,13 @@
 stdenv.mkDerivation rec {
   pname = "aws-c-mqtt";
   # nixpkgs-update: no auto update
-  version = "0.11.0";
+  version = "0.13.3";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-mqtt";
     rev = "v${version}";
-    hash = "sha256-gIoC3OG6VFzNH9/DjuC42eCIuN+w1AikaGAbx6ao8qQ=";
+    hash = "sha256-Nf8c5iVl+NOPZFjsAPCMOGq2e7D8e7PafuMQh6t0DYw=";
   };
 
   nativeBuildInputs = [

From e53b60bc61f2c4a7a4f9cce9a913ca0adb096c9c Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 25 Jul 2025 19:47:04 +0300
Subject: [PATCH 0241/3724] aws-c-s3: 0.7.1 -> 0.8.6

Diff: https://www.github.com/awslabs/aws-c-s3/compare/v0.7.1...v0.8.6
---
 pkgs/by-name/aw/aws-c-s3/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/aws-c-s3/package.nix b/pkgs/by-name/aw/aws-c-s3/package.nix
index 0282ca459b94..88419b389db4 100644
--- a/pkgs/by-name/aw/aws-c-s3/package.nix
+++ b/pkgs/by-name/aw/aws-c-s3/package.nix
@@ -17,13 +17,13 @@
 stdenv.mkDerivation rec {
   pname = "aws-c-s3";
   # nixpkgs-update: no auto update
-  version = "0.7.1";
+  version = "0.8.6";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-s3";
     rev = "v${version}";
-    hash = "sha256-UE42U3UszobaUdo0ry9IlwTbSbGqmYkux19ILrVgUZY=";
+    hash = "sha256-g2w1igjv0N0o6+bewypJm2coHTvhYN2v8usdMN7TBI4=";
   };
 
   nativeBuildInputs = [

From 89247cf90706c30cd8d0e7804b986eaec478a760 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 25 Jul 2025 19:47:07 +0300
Subject: [PATCH 0242/3724] aws-c-io: 0.15.3 -> 0.21.2

Diff: https://www.github.com/awslabs/aws-c-io/compare/v0.15.3...v0.21.2
---
 pkgs/by-name/aw/aws-c-io/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/aws-c-io/package.nix b/pkgs/by-name/aw/aws-c-io/package.nix
index 2d6201cf37a2..68efabd3aef1 100644
--- a/pkgs/by-name/aw/aws-c-io/package.nix
+++ b/pkgs/by-name/aw/aws-c-io/package.nix
@@ -12,13 +12,13 @@
 stdenv.mkDerivation rec {
   pname = "aws-c-io";
   # nixpkgs-update: no auto update
-  version = "0.15.3";
+  version = "0.21.2";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-io";
     rev = "v${version}";
-    hash = "sha256-/pG/+MHAu/TYTtY/RQrr1U1ev2FZ1p/O8kIRUDDOcvQ=";
+    hash = "sha256-QNf4TJIqtypDliiu6I72CbgjyJhdS9Uuim9tZOb3SJs=";
   };
 
   nativeBuildInputs = [ cmake ];

From 006be67aa397160f15072140647b06493e6db839 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 25 Jul 2025 19:47:09 +0300
Subject: [PATCH 0243/3724] aws-checksums: 0.2.2 -> 0.2.7

Diff: https://www.github.com/awslabs/aws-checksums/compare/v0.2.2...v0.2.7
---
 pkgs/by-name/aw/aws-checksums/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/aws-checksums/package.nix b/pkgs/by-name/aw/aws-checksums/package.nix
index 6e1645620942..1b7d8fb34668 100644
--- a/pkgs/by-name/aw/aws-checksums/package.nix
+++ b/pkgs/by-name/aw/aws-checksums/package.nix
@@ -10,13 +10,13 @@
 stdenv.mkDerivation rec {
   pname = "aws-checksums";
   # nixpkgs-update: no auto update
-  version = "0.2.2";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-checksums";
     rev = "v${version}";
-    sha256 = "sha256-hiqV6FrOZ19YIxL3UKBuexLJwoC2mY7lqysnV7ze0gg=";
+    sha256 = "sha256-dYDTDWZJJ0JlvkMfLS376uUt5QzSmbV0UNRC4aq35TY=";
   };
 
   nativeBuildInputs = [ cmake ];

From 8362fde2cc0b717bd27ae779afeccb125048fdc8 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Fri, 25 Jul 2025 07:08:27 -0600
Subject: [PATCH 0244/3724] python3Packages.pygments: 2.19.1 -> 2.19.2

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

diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix
index 7b9829c0a8ee..41337dd70a9a 100644
--- a/pkgs/development/python-modules/pygments/default.nix
+++ b/pkgs/development/python-modules/pygments/default.nix
@@ -15,14 +15,12 @@
 let
   pygments = buildPythonPackage rec {
     pname = "pygments";
-    version = "2.19.1";
+    version = "2.19.2";
     pyproject = true;
 
-    disabled = pythonOlder "3.8"; # 2.18.0 requirement
-
     src = fetchPypi {
       inherit pname version;
-      hash = "sha256-YcFtKoV23AZJ2fOeCJtfArzSf7oQ2PtNzCgXP3pFFR8=";
+      hash = "sha256-Y2yyR3zsf4lSU2lwvFM7xDdDVC9wOSrgJjdGAK3VuIc=";
     };
 
     nativeBuildInputs = [ hatchling ];

From 2f9f0ac7054e314f0b000622966397aa1ea21d7d Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Thu, 24 Jul 2025 06:08:37 -0600
Subject: [PATCH 0245/3724] python3Packages.pygments: add ryand56 as maintainer

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

diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix
index 41337dd70a9a..7966f6ebd742 100644
--- a/pkgs/development/python-modules/pygments/default.nix
+++ b/pkgs/development/python-modules/pygments/default.nix
@@ -52,7 +52,10 @@ let
       description = "Generic syntax highlighter";
       mainProgram = "pygmentize";
       license = lib.licenses.bsd2;
-      maintainers = with lib.maintainers; [ sigmanificient ];
+      maintainers = with lib.maintainers; [
+        sigmanificient
+        ryand56
+      ];
     };
   };
 in

From 066625a5add5ccd2c4f3c2dacfdad5cf16f17d2e Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Fri, 25 Jul 2025 22:28:33 -0600
Subject: [PATCH 0246/3724] unclutter-xfixes: 1.6 -> 1.6-unstable-2024-11-25,
 adopt

---
 pkgs/by-name/un/unclutter-xfixes/package.nix | 21 ++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/un/unclutter-xfixes/package.nix b/pkgs/by-name/un/unclutter-xfixes/package.nix
index 4c04befe01c1..a05c5f73e6a8 100644
--- a/pkgs/by-name/un/unclutter-xfixes/package.nix
+++ b/pkgs/by-name/un/unclutter-xfixes/package.nix
@@ -11,17 +11,19 @@
   asciidoc,
   libxslt,
   docbook_xsl,
+
+  unstableGitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "unclutter-xfixes";
-  version = "1.6";
+  version = "1.6-unstable-2024-11-25";
 
   src = fetchFromGitHub {
     owner = "Airblader";
     repo = "unclutter-xfixes";
-    rev = "v${version}";
-    sha256 = "sha256-suKmaoJq0PBHZc7NzBQ60JGwJkAtWmvzPtTHWOPJEdc=";
+    rev = "0eb7a8f4365c05d09db048bd1a45f8943c1d5da3";
+    hash = "sha256-ipMifLFCh2vW8D9/KkxWL7W5T5dshRZ5wyQY0wgoaxQ=";
   };
 
   nativeBuildInputs = [
@@ -39,17 +41,20 @@ stdenv.mkDerivation rec {
   ];
 
   prePatch = ''
-    substituteInPlace Makefile --replace 'PKG_CONFIG =' 'PKG_CONFIG ?='
+    substituteInPlace Makefile --replace-fail 'PKG_CONFIG =' 'PKG_CONFIG ?='
   '';
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
 
   installFlags = [ "PREFIX=$(out)" ];
 
-  meta = with lib; {
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
     description = "Rewrite of unclutter using the X11 Xfixes extension";
-    platforms = platforms.unix;
+    homepage = "https://github.com/Airblader/unclutter-xfixes";
+    platforms = lib.platforms.unix;
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.ryand56 ];
     mainProgram = "unclutter";
   };
 }

From b532081b67d441db401838e1e98a004a41f1e8e9 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 26 Jul 2025 06:55:32 +0100
Subject: [PATCH 0247/3724] s2n-tls: 1.5.22 -> 1.5.23

Changes: https://github.com/aws/s2n-tls/releases/tag/v1.5.23
---
 pkgs/by-name/s2/s2n-tls/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix
index 79155dfb0d82..175edbdd09cb 100644
--- a/pkgs/by-name/s2/s2n-tls/package.nix
+++ b/pkgs/by-name/s2/s2n-tls/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "s2n-tls";
-  version = "1.5.22";
+  version = "1.5.23";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "s2n-tls";
     rev = "v${version}";
-    hash = "sha256-NIHtyoGjhAIiq9AsoKs3RtmMHePA4HIecPJTfkIin2Q=";
+    hash = "sha256-gg8JrkZ9W93sEQ4uEqCh+oaAqtUH+xAz4FdS0GD4F90=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     # Glob for 'shared' or 'static' subdir
     for f in $out/lib/s2n/cmake/*/s2n-targets.cmake; do
       substituteInPlace "$f" \
-        --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""'
+        --replace-fail 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""'
     done
   '';
 

From ed0971e829aa0fa271bc24478692b636fc22571e Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 26 Jul 2025 11:47:26 +0200
Subject: [PATCH 0248/3724] ncurses: Add patch to recognise
 linux-gnuabielfv{1,2}

---
 .../1001-ncurses-Support-gnuabielfv1-2.patch  | 72 +++++++++++++++++++
 .../development/libraries/ncurses/default.nix |  8 +++
 2 files changed, 80 insertions(+)
 create mode 100644 pkgs/development/libraries/ncurses/1001-ncurses-Support-gnuabielfv1-2.patch

diff --git a/pkgs/development/libraries/ncurses/1001-ncurses-Support-gnuabielfv1-2.patch b/pkgs/development/libraries/ncurses/1001-ncurses-Support-gnuabielfv1-2.patch
new file mode 100644
index 000000000000..6ce69e6846cb
--- /dev/null
+++ b/pkgs/development/libraries/ncurses/1001-ncurses-Support-gnuabielfv1-2.patch
@@ -0,0 +1,72 @@
+diff '--color=auto' -ruN a/aclocal.m4 b/aclocal.m4
+--- a/aclocal.m4	2025-07-19 18:19:51.000000000 +0200
++++ b/aclocal.m4	2025-07-25 14:11:19.900876172 +0200
+@@ -10290,7 +10290,7 @@
+ 	cf_xopen_source="-D_SGI_SOURCE"
+ 	cf_XOPEN_SOURCE=
+ 	;;
+-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+ 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
+ 	;;
+ linux*musl)
+diff '--color=auto' -ruN a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
+--- a/Ada95/aclocal.m4	2025-07-19 18:38:31.000000000 +0200
++++ b/Ada95/aclocal.m4	2025-07-25 14:11:57.495783459 +0200
+@@ -5430,7 +5430,7 @@
+ 	cf_xopen_source="-D_SGI_SOURCE"
+ 	cf_XOPEN_SOURCE=
+ 	;;
+-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+ 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
+ 	;;
+ linux*musl)
+diff '--color=auto' -ruN a/Ada95/configure b/Ada95/configure
+--- a/Ada95/configure	2025-07-19 18:40:05.000000000 +0200
++++ b/Ada95/configure	2025-07-25 14:11:49.981449762 +0200
+@@ -13955,7 +13955,7 @@
+ 	cf_xopen_source="-D_SGI_SOURCE"
+ 	cf_XOPEN_SOURCE=
+ 	;;
+-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+diff '--color=auto' -ruN a/configure b/configure
+--- a/configure	2025-07-19 19:00:40.000000000 +0200
++++ b/configure	2025-07-25 14:11:02.884551699 +0200
+@@ -10737,7 +10737,7 @@
+ 	cf_xopen_source="-D_SGI_SOURCE"
+ 	cf_XOPEN_SOURCE=
+ 	;;
+-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+diff '--color=auto' -ruN a/test/aclocal.m4 b/test/aclocal.m4
+--- a/test/aclocal.m4	2025-07-19 18:42:37.000000000 +0200
++++ b/test/aclocal.m4	2025-07-25 14:11:41.551475534 +0200
+@@ -4658,7 +4658,7 @@
+ 	cf_xopen_source="-D_SGI_SOURCE"
+ 	cf_XOPEN_SOURCE=
+ 	;;
+-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+ 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
+ 	;;
+ linux*musl)
+diff '--color=auto' -ruN a/test/configure b/test/configure
+--- a/test/configure	2025-06-14 15:40:22.000000000 +0200
++++ b/test/configure	2025-07-25 14:11:34.529155110 +0200
+@@ -4183,7 +4183,7 @@
+ 	cf_xopen_source="-D_SGI_SOURCE"
+ 	cf_XOPEN_SOURCE=
+ 	;;
+-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index c39042e4b4e7..bcd3314b515f 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -33,6 +33,14 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   setOutputFlags = false; # some aren't supported
 
+  patches = [
+    # linux-gnuabielfv{1,2} is not in ncurses' list of GNU-ish targets (or smth like that?).
+    # Causes some defines (_XOPEN_SOURCE=600, _DEFAULT_SOURCE) to not get set, so wcwidth is not exposed by system headers, which causes a FTBFS.
+    # Reported and fix submitted to upstream in https://lists.gnu.org/archive/html/bug-ncurses/2025-07/msg00040.html
+    # Backported to the 6.5 release (dropped some hunks for code that isn't in this release yet)
+    ./1001-ncurses-Support-gnuabielfv1-2.patch
+  ];
+
   postPatch = ''
     sed -i '1i #include <stdbool.h>' include/curses.h.in
   '';

From 8e437d789975fce518c71eecb9ed2faed49af612 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 25 Jul 2025 19:47:11 +0300
Subject: [PATCH 0249/3724] aws-crt-cpp: 0.29.4 -> 0.33.1

Diff: https://www.github.com/awslabs/aws-crt-cpp/compare/v0.29.4...v0.33.1
---
 ...ake-includedir-properly-overrideable.patch | 65 -------------------
 pkgs/by-name/aw/aws-crt-cpp/package.nix       | 14 ++--
 2 files changed, 5 insertions(+), 74 deletions(-)
 delete mode 100644 pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch

diff --git a/pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch b/pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
deleted file mode 100644
index 34f2434dbf9d..000000000000
--- a/pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From b3a46b9a2a9f86ff416a0ff5f84882c0dedebd14 Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <jtojnar@gmail.com>
-Date: Sun, 9 Jan 2022 01:57:18 +0100
-Subject: [PATCH] build: Make includedir properly overrideable
-
-This is required by some package managers like Nix.
-
-Co-authored-by: Artturin <Artturin@artturin.com>
----
- CMakeLists.txt | 26 +++++++++++++++-----------
- 1 file changed, 15 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9f062ca..b28f13c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,6 +49,10 @@ if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-     set(FIND_LIBRARY_USE_LIB64_PATHS true)
- endif()
- 
-+if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
-+    set(CMAKE_INSTALL_INCLUDEDIR "include")
-+endif()
-+
- if(NOT CMAKE_CXX_STANDARD)
-     set(CMAKE_CXX_STANDARD 11)
- endif()
-@@ -329,7 +333,7 @@ endif()
- target_include_directories(${PROJECT_NAME} PUBLIC
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-     $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
--    $<INSTALL_INTERFACE:include>)
-+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
- 
- aws_use_package(aws-c-http)
- aws_use_package(aws-c-mqtt)
-@@ -346,16 +350,16 @@ aws_add_sanitizers(${PROJECT_NAME})
- 
- target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS})
- 
--install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development)
--install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "include/aws/crt/auth" COMPONENT Development)
--install(FILES ${AWS_CRT_CHECKSUM_HEADERS} DESTINATION "include/aws/crt/checksum" COMPONENT Development)
--install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "include/aws/crt/crypto" COMPONENT Development)
--install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "include/aws/crt/io" COMPONENT Development)
--install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "include/aws/iot" COMPONENT Development)
--install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "include/aws/crt/mqtt" COMPONENT Development)
--install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "include/aws/crt/http" COMPONENT Development)
--install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "include/aws/crt/endpoints" COMPONENT Development)
--install(FILES ${AWS_CRT_CBOR_HEADERS} DESTINATION "include/aws/crt/cbor" COMPONENT Development)
-+install(FILES ${AWS_CRT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt" COMPONENT Development)
-+install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/auth" COMPONENT Development)
-+install(FILES ${AWS_CRT_CHECKSUM_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/checksum" COMPONENT Development)
-+install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/crypto" COMPONENT Development)
-+install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/io" COMPONENT Development)
-+install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/iot" COMPONENT Development)
-+install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/mqtt" COMPONENT Development)
-+install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/http" COMPONENT Development)
-+install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/endpoints" COMPONENT Development)
-+install(FILES ${AWS_CRT_CBOR_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/cbor" COMPONENT Development)
- 
- install(
-     TARGETS ${PROJECT_NAME}
--- 
-2.46.0
diff --git a/pkgs/by-name/aw/aws-crt-cpp/package.nix b/pkgs/by-name/aw/aws-crt-cpp/package.nix
index 3cf463a5fdf1..b8b35b095602 100644
--- a/pkgs/by-name/aw/aws-crt-cpp/package.nix
+++ b/pkgs/by-name/aw/aws-crt-cpp/package.nix
@@ -20,7 +20,7 @@
 stdenv.mkDerivation rec {
   pname = "aws-crt-cpp";
   # nixpkgs-update: no auto update
-  version = "0.29.4";
+  version = "0.33.1";
 
   outputs = [
     "out"
@@ -31,17 +31,13 @@ stdenv.mkDerivation rec {
     owner = "awslabs";
     repo = "aws-crt-cpp";
     rev = "v${version}";
-    sha256 = "sha256-Uv1BHM39f9soq7kziedqRhHqQ/xwnqcz++1UM5nuo8g=";
+    sha256 = "sha256-C8KWe5+CXujD8nN3gLkjaaMld15sat/ohwEKhyWELKI=";
   };
 
-  patches = [
-    # Correct include path for split outputs.
-    # https://github.com/awslabs/aws-crt-cpp/pull/325
-    ./0001-build-Make-includedir-properly-overrideable.patch
-  ];
-
   postPatch = ''
-    substituteInPlace CMakeLists.txt --replace '-Werror' ""
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "$<INSTALL_INTERFACE:include>" "$<INSTALL_INTERFACE:$dev/include>" \
+      --replace-fail '-Werror' ""
   '';
 
   nativeBuildInputs = [

From c66c7aea2d9996744347c61900471f8792cf9caf Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 25 Jul 2025 19:47:14 +0300
Subject: [PATCH 0250/3724] aws-c-sdkutils: 0.2.1 -> 0.2.4

Diff: https://www.github.com/awslabs/aws-c-sdkutils/compare/v0.2.1...v0.2.4
---
 pkgs/by-name/aw/aws-c-sdkutils/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/aws-c-sdkutils/package.nix b/pkgs/by-name/aw/aws-c-sdkutils/package.nix
index 2de7db683f34..3fe0136297b7 100644
--- a/pkgs/by-name/aw/aws-c-sdkutils/package.nix
+++ b/pkgs/by-name/aw/aws-c-sdkutils/package.nix
@@ -10,13 +10,13 @@
 stdenv.mkDerivation rec {
   pname = "aws-c-sdkutils";
   # nixpkgs-update: no auto update
-  version = "0.2.1";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-sdkutils";
     rev = "v${version}";
-    hash = "sha256-Z9c+uBiGMXW5v+khdNaElhno16ikBO4voTzwd2mP6rA=";
+    hash = "sha256-zc8E5ESZxXBJ6WA/V5i2Us61UcNf9wXa2k63NWqGRtI=";
   };
 
   nativeBuildInputs = [

From f37c2a71baa1d9f64b578897f78fdc75953dc5d4 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 25 Jul 2025 19:47:16 +0300
Subject: [PATCH 0251/3724] aws-c-cal: 0.8.0 -> 0.9.2

Diff: https://www.github.com/awslabs/aws-c-cal/compare/v0.8.0...v0.9.2

Patch made unnecessary by https://www.github.com/awslabs/aws-c-cal/commit/027d9760908c649d1f53e397d74d907babbde059
---
 .../aw/aws-c-cal/aws-c-cal-musl-compat.patch  | 33 -------------------
 pkgs/by-name/aw/aws-c-cal/package.nix         |  9 ++---
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/by-name/aw/aws-c-cal/aws-c-cal-musl-compat.patch

diff --git a/pkgs/by-name/aw/aws-c-cal/aws-c-cal-musl-compat.patch b/pkgs/by-name/aw/aws-c-cal/aws-c-cal-musl-compat.patch
deleted file mode 100644
index 2cf1d4e81e0b..000000000000
--- a/pkgs/by-name/aw/aws-c-cal/aws-c-cal-musl-compat.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Emil Lerch <emil@lerch.org>
-Date: Wed, 28 Apr 2021 17:46:24 -0700
-Subject: [PATCH] Allow dlopen to fail on musl systems
-
-Now that references are forced when linking statically, the assertion is
-no longer necessary. See https://github.com/awslabs/aws-c-cal/pull/54
----
- source/unix/openssl_platform_init.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/source/unix/openssl_platform_init.c b/source/unix/openssl_platform_init.c
-index 5266ecc1..99f210bd 100644
---- a/source/unix/openssl_platform_init.c
-+++ b/source/unix/openssl_platform_init.c
-@@ -496,7 +502,6 @@ static enum aws_libcrypto_version s_resolve_libcrypto(void) {
-     /* Try to auto-resolve against what's linked in/process space */
-     FLOGF("searching process and loaded modules");
-     void *process = dlopen(NULL, RTLD_NOW);
--    AWS_FATAL_ASSERT(process && "Unable to load symbols from process space");
-     enum aws_libcrypto_version result = s_resolve_libcrypto_symbols(AWS_LIBCRYPTO_LC, process);
-     if (result == AWS_LIBCRYPTO_NONE) {
-         result = s_resolve_libcrypto_symbols(AWS_LIBCRYPTO_1_0_2, process);
-@@ -504,7 +509,9 @@ static enum aws_libcrypto_version s_resolve_libcrypto(void) {
-     if (result == AWS_LIBCRYPTO_NONE) {
-         result = s_resolve_libcrypto_symbols(AWS_LIBCRYPTO_1_1_1, process);
-     }
--    dlclose(process);
-+    if (process) {
-+        dlclose(process);
-+    }
- 
-     if (result == AWS_LIBCRYPTO_NONE) {
-         FLOGF("libcrypto symbols were not statically linked, searching for shared libraries");
diff --git a/pkgs/by-name/aw/aws-c-cal/package.nix b/pkgs/by-name/aw/aws-c-cal/package.nix
index eceed9985693..97689d28c004 100644
--- a/pkgs/by-name/aw/aws-c-cal/package.nix
+++ b/pkgs/by-name/aw/aws-c-cal/package.nix
@@ -11,20 +11,15 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "aws-c-cal";
   # nixpkgs-update: no auto update
-  version = "0.8.0";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-cal";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-dYFUYdMQMT8CZFMrCrhQ8JPEhA4CVf+f7VLFt3JNmn8=";
+    hash = "sha256-ufMoB71xebxO/Cu/xVQ3BMrcCgIlkG+MXH2Ru2i6uXo=";
   };
 
-  patches = [
-    # Fix openssl adaptor code for musl based static binaries.
-    ./aws-c-cal-musl-compat.patch
-  ];
-
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [

From 3897bcab633af39f7feacced5d75900ccecd98f4 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 25 Jul 2025 19:48:58 +0300
Subject: [PATCH 0252/3724] aws-sdk-cpp: 1.11.448 -> 1.11.612

Diff: https://www.github.com/aws/aws-sdk-cpp/compare/1.11.448...1.11.612
---
 pkgs/by-name/aw/aws-sdk-cpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/aws-sdk-cpp/package.nix b/pkgs/by-name/aw/aws-sdk-cpp/package.nix
index 82147ae7213c..d49d199b2203 100644
--- a/pkgs/by-name/aw/aws-sdk-cpp/package.nix
+++ b/pkgs/by-name/aw/aws-sdk-cpp/package.nix
@@ -33,13 +33,13 @@ in
 stdenv.mkDerivation rec {
   pname = "aws-sdk-cpp";
   # nixpkgs-update: no auto update
-  version = "1.11.448";
+  version = "1.11.612";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sdk-cpp";
     rev = version;
-    hash = "sha256-K0UFs7vOeZeQIs3G5L4FfEWXDGTXT9ssr/vQwa1l2lw=";
+    hash = "sha256-W4eKgUvN2NLYEOO47HTJYJpEmyn10gNK29RIrvoXkek=";
   };
 
   postPatch = ''

From 12db043825cb2574093f8240b859a33ee1f0d143 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sat, 26 Jul 2025 14:56:14 +0300
Subject: [PATCH 0253/3724] nixVersions.nix_2_3.passthru.aws-sdk-cpp: Mark
 broken

---
 pkgs/tools/package-management/nix/dependencies.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/package-management/nix/dependencies.nix b/pkgs/tools/package-management/nix/dependencies.nix
index 281b1f6c390c..cf3312d74779 100644
--- a/pkgs/tools/package-management/nix/dependencies.nix
+++ b/pkgs/tools/package-management/nix/dependencies.nix
@@ -66,6 +66,13 @@ regular@{
 
           # only a stripped down version is build which takes a lot less resources to build
           requiredSystemFeatures = [ ];
+          meta = args.meta // {
+            description = "C++ interface for Amazon Web Services (Old version)";
+            # The aws packages got updated and are no longer compatible with this old version.
+            # If someone wants to fix it then start with the patch here
+            # https://github.com/NixOS/nixpkgs/pull/428410#issuecomment-3121681782
+            broken = true;
+          };
         });
 
     aws-sdk-cpp =

From 5a73e07b1089d7d43d5d97305aa5a843de97002f Mon Sep 17 00:00:00 2001
From: klchen0112 <klchen0112@gmail.com>
Date: Sat, 26 Jul 2025 23:58:54 +0800
Subject: [PATCH 0254/3724] libmamba: 2.1.1 -> 2.3.0

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

diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix
index 4f8c8cc0c843..e2e360d7ca3b 100644
--- a/pkgs/by-name/li/libmamba/package.nix
+++ b/pkgs/by-name/li/libmamba/package.nix
@@ -3,7 +3,7 @@
   lib,
   stdenv,
   cmake,
-  fmt,
+  fmt_11,
   spdlog,
   tl-expected,
   nlohmann_json,
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmamba";
-  version = "2.1.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "mamba-org";
     repo = "mamba";
     tag = finalAttrs.version;
-    hash = "sha256-JBwdfYM7J5R7HZyw5kVXwu4FlZUd2QPrsTaGuXnyAJI=";
+    hash = "sha256-EwG5pR3nOYffQdK3xIKJztkKLqMi6Hj9fmkihn9pZHE=";
   };
 
   nativeBuildInputs = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    fmt
+    fmt_11
     spdlog
     tl-expected
     nlohmann_json

From 113cd6243d55c8738aafa5cf088e5b09e020653f Mon Sep 17 00:00:00 2001
From: klchen0112 <klchen0112@gmail.com>
Date: Sat, 26 Jul 2025 23:59:03 +0800
Subject: [PATCH 0255/3724] mamba-cpp: use src and version from libmamba

---
 pkgs/by-name/ma/mamba-cpp/package.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ma/mamba-cpp/package.nix b/pkgs/by-name/ma/mamba-cpp/package.nix
index 75dbacee94dc..682f6464637b 100644
--- a/pkgs/by-name/ma/mamba-cpp/package.nix
+++ b/pkgs/by-name/ma/mamba-cpp/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
   bzip2,
   cmake,
   cli11,
@@ -15,16 +14,9 @@
   python3,
   versionCheckHook,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "mamba-cpp";
-  version = "2.1.1";
-
-  src = fetchFromGitHub {
-    owner = "mamba-org";
-    repo = "mamba";
-    tag = version;
-    hash = "sha256-JBwdfYM7J5R7HZyw5kVXwu4FlZUd2QPrsTaGuXnyAJI=";
-  };
+  inherit (libmamba) version src;
 
   nativeBuildInputs = [ cmake ];
 

From aa5f9058cd040168465e521179b9bdd425539015 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 26 Jul 2025 19:04:04 +0200
Subject: [PATCH 0256/3724] renpy: pin python3 to 3.12

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea2eb02b7cc5..2bed7effadd8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2375,6 +2375,8 @@ with pkgs;
 
   rare = python3Packages.callPackage ../games/rare { };
 
+  renpy = callPackage ../by-name/re/renpy/package.nix { python3 = python312; };
+
   rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { };
 
   remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { };

From fb5c5793ed1cf69574b50ba35a4542b4aa155938 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 26 Jul 2025 19:08:13 +0200
Subject: [PATCH 0257/3724] renpy: 8.3.7.25031702 -> 8.4.1.25072401

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/re/renpy/5687.patch  | 91 -------------------------------
 pkgs/by-name/re/renpy/package.nix | 13 +++--
 2 files changed, 7 insertions(+), 97 deletions(-)
 delete mode 100644 pkgs/by-name/re/renpy/5687.patch

diff --git a/pkgs/by-name/re/renpy/5687.patch b/pkgs/by-name/re/renpy/5687.patch
deleted file mode 100644
index 0ed4a883919f..000000000000
--- a/pkgs/by-name/re/renpy/5687.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From b120f82f9809b98231188daacb94f22a9e69187a Mon Sep 17 00:00:00 2001
-From: Gregor Riepl <onitake@gmail.com>
-Date: Thu, 8 Aug 2024 23:56:16 +0200
-Subject: [PATCH] Replace deprecated APIs when compiling against newer FFmpeg
-
----
- module/ffmedia.c | 37 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 37 insertions(+)
-
-diff --git a/module/ffmedia.c b/module/ffmedia.c
-index d4bb346ac35740711b8393e66d0bfc28c849ff0e..0f57e311f277359fad731e348531becbadbb06d4 100644
---- a/module/ffmedia.c
-+++ b/module/ffmedia.c
-@@ -71,7 +71,11 @@ static int rwops_read(void *opaque, uint8_t *buf, int buf_size) {
- 
- }
- 
-+#if (LIBAVFORMAT_VERSION_MAJOR < 61)
- static int rwops_write(void *opaque, uint8_t *buf, int buf_size) {
-+#else
-+static int rwops_write(void *opaque, const uint8_t *buf, int buf_size) {
-+#endif
-     printf("Writing to an SDL_rwops is a really bad idea.\n");
-     return -1;
- }
-@@ -690,9 +694,14 @@ static void decode_audio(MediaState *ms) {
- 			}
- 
-             converted_frame->sample_rate = audio_sample_rate;
-+#if (LIBAVUTIL_VERSION_MAJOR < 59)
-             converted_frame->channel_layout = AV_CH_LAYOUT_STEREO;
-+#else
-+            converted_frame->ch_layout = (AVChannelLayout) AV_CHANNEL_LAYOUT_STEREO;
-+#endif
-             converted_frame->format = AV_SAMPLE_FMT_S16;
- 
-+#if (LIBAVUTIL_VERSION_MAJOR < 59)
- 			if (!ms->audio_decode_frame->channel_layout) {
- 				ms->audio_decode_frame->channel_layout = av_get_default_channel_layout(ms->audio_decode_frame->channels);
- 
-@@ -711,6 +720,26 @@ static void decode_audio(MediaState *ms) {
- 				    swr_set_matrix(ms->swr, stereo_matrix, 1);
- 				}
- 			}
-+#else
-+			if (ms->audio_decode_frame->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) {
-+				av_channel_layout_default(&ms->audio_decode_frame->ch_layout, ms->audio_decode_frame->ch_layout.nb_channels);
-+
-+				if (audio_equal_mono && (ms->audio_decode_frame->ch_layout.nb_channels == 1)) {
-+				    swr_alloc_set_opts2(
-+                        &ms->swr,
-+                        &converted_frame->ch_layout,
-+                        converted_frame->format,
-+                        converted_frame->sample_rate,
-+                        &ms->audio_decode_frame->ch_layout,
-+                        ms->audio_decode_frame->format,
-+                        ms->audio_decode_frame->sample_rate,
-+                        0,
-+                        NULL);
-+
-+				    swr_set_matrix(ms->swr, stereo_matrix, 1);
-+				}
-+			}
-+#endif
- 
- 			if(swr_convert_frame(ms->swr, converted_frame, ms->audio_decode_frame)) {
- 				av_frame_free(&converted_frame);
-@@ -1159,7 +1188,11 @@ static int decode_thread(void *arg) {
- 
- 	// Compute the number of samples we need to play back.
- 	if (ms->audio_duration < 0) {
-+#if (LIBAVFORMAT_VERSION_MAJOR < 62)
- 		if (av_fmt_ctx_get_duration_estimation_method(ctx) != AVFMT_DURATION_FROM_BITRATE) {
-+#else
-+		if (ctx->duration_estimation_method != AVFMT_DURATION_FROM_BITRATE) {
-+#endif
- 
- 			long long duration = ((long long) ctx->duration) * audio_sample_rate;
- 			ms->audio_duration = (unsigned int) (duration /  AV_TIME_BASE);
-@@ -1319,7 +1352,11 @@ static int decode_sync_start(void *arg) {
- 
- 	// Compute the number of samples we need to play back.
- 	if (ms->audio_duration < 0) {
-+#if (LIBAVFORMAT_VERSION_MAJOR < 62)
- 		if (av_fmt_ctx_get_duration_estimation_method(ctx) != AVFMT_DURATION_FROM_BITRATE) {
-+#else
-+		if (ctx->duration_estimation_method != AVFMT_DURATION_FROM_BITRATE) {
-+#endif
- 
- 			long long duration = ((long long) ctx->duration) * audio_sample_rate;
- 			ms->audio_duration = (unsigned int) (duration /  AV_TIME_BASE);
diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix
index 06159e74d14c..d84ece254bb9 100644
--- a/pkgs/by-name/re/renpy/package.nix
+++ b/pkgs/by-name/re/renpy/package.nix
@@ -1,4 +1,5 @@
 {
+  assimp,
   fetchFromGitHub,
   ffmpeg,
   freetype,
@@ -25,13 +26,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "renpy";
-  version = "8.3.7.25031702";
+  version = "8.4.1.25072401";
 
   src = fetchFromGitHub {
     owner = "renpy";
     repo = "renpy";
     tag = finalAttrs.version;
-    hash = "sha256-QY6MMiagPVV+pCDM0FRD++r2fY3tD8qWmHj7fJKIxUQ=";
+    hash = "sha256-wJnMqUrRGWcsuZWdqbiUI/BD2sSRjJKEzsCOzSngoZM=";
   };
 
   nativeBuildInputs = [
@@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    assimp
     ffmpeg
     freetype
     fribidi
@@ -86,7 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./shutup-erofs-errors.patch
-    ./5687.patch
   ]
   ++ lib.optional withoutSteam ./noSteam.patch;
 
@@ -98,20 +99,20 @@ stdenv.mkDerivation (finalAttrs: {
     official = False
     nightly = False
     # Look at https://renpy.org/latest.html for what to put.
-    version_name = '64bit Sensation'
+    version_name = 'Tomorrowland'
     EOF
   '';
 
   buildPhase = ''
     runHook preBuild
-    ${python.pythonOnBuildForHost.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES
+    ${python.pythonOnBuildForHost.interpreter} setup.py build --parallel=$NIX_BUILD_CORES
     runHook postBuild
   '';
 
   installPhase = ''
     runHook preInstall
 
-    ${python.pythonOnBuildForHost.interpreter} module/setup.py install_lib -d $out/${python.sitePackages}
+    ${python.pythonOnBuildForHost.interpreter} setup.py install_lib -d $out/${python.sitePackages}
     mkdir -p $out/share/renpy
     cp -vr sdk-fonts gui launcher renpy the_question tutorial renpy.py $out/share/renpy
 

From f1ca05eb9d0e2fa1e13912e24ea9d481e6520a79 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Fri, 25 Jul 2025 12:37:44 +0200
Subject: [PATCH 0258/3724] zeromq: Fix cross-compilation

---
 pkgs/by-name/ze/zeromq/package.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ze/zeromq/package.nix b/pkgs/by-name/ze/zeromq/package.nix
index 845aef375bc5..918099c8b624 100644
--- a/pkgs/by-name/ze/zeromq/package.nix
+++ b/pkgs/by-name/ze/zeromq/package.nix
@@ -8,6 +8,7 @@
   asciidoc,
   xmlto,
   enableDrafts ? false,
+  fetchpatch,
   # for passthru.tests
   azmq,
   cppzmq,
@@ -25,10 +26,20 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "libzmq";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-q2h5y0Asad+fGB9haO4Vg7a1ffO2JSb7czzlhmT3VmI=";
   };
 
+  # Use proper STREQUAL instead of EQUAL to compare strings
+  # See: https://github.com/zeromq/libzmq/pull/4711
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/zeromq/libzmq/pull/4711/commits/55bd6b3df06734730d3012c17bc26681e25b549d.patch";
+      hash = "sha256-/FVah+s7f1hWXv3MXkYfIiV1XAiMVDa0tmt4BQmSgmY=";
+      name = "cacheline_undefined.patch";
+    })
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs = [

From 66ba8a58af5c40ae845da029aaf6d0a273b68ccd Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 26 Jul 2025 19:32:20 +0200
Subject: [PATCH 0259/3724] renpy: automatically update version codename

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/re/renpy/package.nix |  5 ++---
 pkgs/by-name/re/renpy/update.sh   | 11 +++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100755 pkgs/by-name/re/renpy/update.sh

diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix
index d84ece254bb9..103aef1baf65 100644
--- a/pkgs/by-name/re/renpy/package.nix
+++ b/pkgs/by-name/re/renpy/package.nix
@@ -11,7 +11,6 @@
   libGLU,
   libpng,
   makeWrapper,
-  nix-update-script,
   pkg-config,
   python3,
   SDL2,
@@ -99,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     official = False
     nightly = False
     # Look at https://renpy.org/latest.html for what to put.
-    version_name = 'Tomorrowland'
+    version_name = "Tomorrowland"
     EOF
   '';
 
@@ -131,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
   versionCheckProgramArg = "--version";
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = ./update.sh;
 
   meta = {
     description = "Visual Novel Engine";
diff --git a/pkgs/by-name/re/renpy/update.sh b/pkgs/by-name/re/renpy/update.sh
new file mode 100755
index 000000000000..b09d1fdad4b4
--- /dev/null
+++ b/pkgs/by-name/re/renpy/update.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nix-update html-xml-utils
+
+set -ex
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+codename=`curl -L https://renpy.org/latest.html | hxclean | hxselect -c h1 small`
+sed -E -i "s/(version_name = ).*/\1$codename/" $SCRIPT_DIR/package.nix
+
+nix-update renpy

From 957606ce4f3bd6f46454c5bd553f4ba375ff04bf Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 26 Jul 2025 21:52:51 +0200
Subject: [PATCH 0260/3724] haskell.packages.ghc912.doctest: correctly skip
 cabal-install tests

---
 .../haskell-modules/configuration-ghc-9.12.x.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
index f8ebfb2b06e6..63162d068237 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
@@ -78,7 +78,7 @@ with haskellLib;
   tagged = doDistribute self.tagged_0_8_9;
   time-compat = doDistribute self.time-compat_1_9_8;
   extensions = doDistribute self.extensions_0_1_0_3;
-  doctest = doDistribute self.doctest_0_24_2;
+  doctest = doDistribute self.doctest_0_24_2; # see :/doctest_0_24_2 =/ below
   ghc-syntax-highlighter = doDistribute self.ghc-syntax-highlighter_0_0_13_0;
   ghc-lib = doDistribute self.ghc-lib_9_12_2_20250421;
   ghc-exactprint = doDistribute self.ghc-exactprint_1_12_0_0;
@@ -128,14 +128,14 @@ with haskellLib;
 
   relude = dontCheck super.relude;
 
-  doctest_0_24_0 = overrideCabal (drv: {
+  doctest_0_24_2 = overrideCabal (drv: {
     testFlags = drv.testFlags or [ ] ++ [
       # These tests require cabal-install (would cause infinite recursion)
       "--skip=/Cabal.Options"
       "--skip=/Cabal.Paths/paths"
       "--skip=/Cabal.ReplOptions" # >= 0.23
     ];
-  }) super.doctest_0_24_0;
+  }) super.doctest_0_24_2;
 
   # https://gitlab.haskell.org/ghc/ghc/-/issues/25930
   generic-lens = dontCheck super.generic-lens;

From 3ddc9cb90a53f999a1b0c3b4b7a6215973fa6df0 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 26 Jul 2025 22:13:47 +0200
Subject: [PATCH 0261/3724] haskellPackages.hiedb: downgrade to < 0.7

ghcide doesn't support hiedb >= 0.7 in any released version yet. Even
though support for hiedb >= 0.7 is desireable (since it fixes some
bugs), it looks a little risky. It's probably better to wait for the
next release of ghcide.

See
- https://github.com/haskell/haskell-language-server/commit/0a9b1cb3ed772e52904e6b5ed6e6f2b2134dfb03
- https://github.com/haskell/haskell-language-server/commit/f43d81105608930d132fa149e0746f01f46599a6
---
 .../configuration-hackage2nix/main.yaml       |  2 +
 .../haskell-modules/hackage-packages.nix      | 70 +++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 590ac810b291..11b1ddd1a08f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -31,6 +31,8 @@ default-package-overrides:
   - extensions < 0.1.0.2 # Incompatible with Cabal < 3.12, the newest extensions version is only needed on ghc 9.10
   # 2021-11-09: ghc-bignum is bundled starting with 9.0.1; only 1.0 builds with GHCs prior to 9.2.1
   - ghc-bignum == 1.0
+  # 2025-07-26: HLS doesn't support hiedb >= 0.7 yet
+  - hiedb < 0.7
   # 2024-08-17: Stackage doesn't contain hnix-store-core >= 0.8 yet, so we need to restrict hnix-store-remote
   - hnix-store-remote < 0.7
   # 2025-01-17: need to match stackage version of hosc
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 058f2eac198e..ecff9120e3e3 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -327402,6 +327402,75 @@ self: {
   ) { };
 
   "hiedb" = callPackage (
+    {
+      mkDerivation,
+      algebraic-graphs,
+      ansi-terminal,
+      array,
+      base,
+      bytestring,
+      containers,
+      directory,
+      extra,
+      filepath,
+      ghc,
+      ghc-paths,
+      hie-compat,
+      hspec,
+      lucid,
+      mtl,
+      optparse-applicative,
+      process,
+      sqlite-simple,
+      temporary,
+      terminal-size,
+      text,
+    }:
+    mkDerivation {
+      pname = "hiedb";
+      version = "0.6.0.2";
+      sha256 = "0sfxykvg5n44lpjj069j25pnff30ckby8k3n7yhp8ixajfnfrb5i";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        algebraic-graphs
+        ansi-terminal
+        array
+        base
+        bytestring
+        containers
+        directory
+        extra
+        filepath
+        ghc
+        hie-compat
+        lucid
+        mtl
+        optparse-applicative
+        sqlite-simple
+        terminal-size
+        text
+      ];
+      executableHaskellDepends = [
+        base
+        ghc-paths
+      ];
+      testHaskellDepends = [
+        base
+        directory
+        filepath
+        ghc-paths
+        hspec
+        process
+        temporary
+      ];
+      description = "Generates a references DB from .hie files";
+      license = lib.licenses.bsd3;
+      mainProgram = "hiedb";
+    }
+  ) { };
+
+  "hiedb_0_7_0_0" = callPackage (
     {
       mkDerivation,
       algebraic-graphs,
@@ -327467,6 +327536,7 @@ self: {
       ];
       description = "Generates a references DB from .hie files";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "hiedb";
     }
   ) { };

From 8076d015a85606deafaa1b93c2f4cfa3d306d1f7 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 26 Jul 2025 22:38:19 +0200
Subject: [PATCH 0262/3724] haskell.packages.ghc{810,90}.hpack_0_38_1: avoid
 broken test dep

vcr needs GHC2021 and there is probably no point patching this out. It
is a little annoying since we probably skip the tests of hpack that need
vcr anyways (since they access the network), but we'll live.
---
 pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++
 pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index b8748b911eb9..38f53d3e04c9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -133,6 +133,9 @@ self: super: {
 
   hlint = self.hlint_3_4_1;
 
+  # test suite depends on vcr since hpack >= 0.38.1 which requires GHC2021
+  hpack_0_38_1 = dontCheck super.hpack_0_38_1;
+
   mime-string = disableOptimization super.mime-string;
 
   # weeder 2.3.* no longer supports GHC 8.10
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index a476886358b1..ab90e94de5ca 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -117,6 +117,9 @@ self: super: {
       "haskell-language-server has dropped support for ghc 9.0 in version 2.4.0.0, please use a newer ghc version or an older nixpkgs version"
       (markBroken super.haskell-language-server);
 
+  # test suite depends on vcr since hpack >= 0.38.1 which requires GHC2021
+  hpack_0_38_1 = dontCheck super.hpack_0_38_1;
+
   # Needs to use ghc-lib due to incompatible GHC
   ghc-tags = doDistribute self.ghc-tags_1_5;
 

From 73cfabbf21355dd061859120bff172edb0bf1a78 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 26 Jul 2025 21:43:22 +0100
Subject: [PATCH 0263/3724] darwin.libffi: backport automake-1.18 fix

Attempt to fix build failure reported at https://github.com/NixOS/nixpkgs/pull/340373#issuecomment-3122173611.
---
 .../apple-source-releases/libffi/package.nix       |  2 ++
 .../libffi/patches/automake-1.18.patch             | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libffi/patches/automake-1.18.patch

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix
index 4fe40e86aab9..942f0a26da43 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix
@@ -27,6 +27,8 @@ mkAppleDerivation (finalAttrs: {
     ./patches/llvm-18-compatibility.patch
     # Fix a memory leak when using the trampoline dylib. See https://github.com/libffi/libffi/pull/621#discussion_r955298301.
     ./patches/fix-tramponline-memory-leak.patch
+    # Fix automake-18.18 compatibility, https://github.com/libffi/libffi/issues/853#issuecomment-2909994482
+    ./patches/automake-1.18.patch
   ];
 
   # Make sure libffi is using the trampolines dylib in this package not the system one.
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/automake-1.18.patch b/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/automake-1.18.patch
new file mode 100644
index 000000000000..148baa6d1e86
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/automake-1.18.patch
@@ -0,0 +1,14 @@
+The hunk is used from https://github.com/libffi/libffi/issues/853#issuecomment-2909994482
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,6 +4,10 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
++# Alias required by AX_ENABLE_BUILDDIR / config-ml
++.PHONY: all-configured
++all-configured: all
++
+ SUBDIRS = include testsuite man
+ if BUILD_DOCS
+ ## This hack is needed because it doesn't seem possible to make a

From 083824d9b6af1c64d3bc274a44b2561d60eb35e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 21:37:32 +0000
Subject: [PATCH 0264/3724] publicsuffix-list: 0-unstable-2025-06-10 ->
 0-unstable-2025-07-22

---
 pkgs/by-name/pu/publicsuffix-list/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix
index 37ea38de462a..31d3a894674f 100644
--- a/pkgs/by-name/pu/publicsuffix-list/package.nix
+++ b/pkgs/by-name/pu/publicsuffix-list/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "publicsuffix-list";
-  version = "0-unstable-2025-06-10";
+  version = "0-unstable-2025-07-22";
 
   src = fetchFromGitHub {
     owner = "publicsuffix";
     repo = "list";
-    rev = "9f9c1865c17a23edce0491aa6e697cc987fcdafa";
-    hash = "sha256-BX8pFGtqTTlWgsZ5IJP7hApG4ysSYHTibT3+hwugSHA=";
+    rev = "66d74ce941749134f5b0c9f0b9ab3393084b0c21";
+    hash = "sha256-FKDL0cWyIP/zwKgqwZ8qb/Oc99CvXdXllMVnL2nnWRo=";
   };
 
   dontBuild = true;

From 29e26c8b6e2f1d0ea6e78260e15cde1dfb2b0f7b Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 26 Jul 2025 23:37:06 +0200
Subject: [PATCH 0265/3724] haskellPackages.ghc-hie: disable versioned ghc
 tests

ghc-hie has test targets for testing against a list of GHC versions. We
could in theory enable the test for the currently available GHC (it
succeeds), but it seems like hspecs pattern matching is not powerful
enough for this (with tasty you could probably do it).
---
 pkgs/development/haskell-modules/configuration-nix.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index addd37b41aef..5c5a46e167f5 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1343,6 +1343,13 @@ builtins.intersectAttrs super {
     (self.generateOptparseApplicativeCompletions [ "cloudy" ])
   ];
 
+  # We don't have multiple GHC versions to test against in PATH
+  ghc-hie = overrideCabal (drv: {
+    testFlags = drv.testFlags or [ ] ++ [
+      "--skip=/GHC.Iface.Ext.Binary/readHieFile"
+    ];
+  }) super.ghc-hie;
+
   # Wants running postgresql database accessible over ip, so postgresqlTestHook
   # won't work (or would need to patch test suite).
   domaindriven-core = dontCheck super.domaindriven-core;

From ed889fb40b730c2475ee3d5850eec810dbe15966 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sun, 27 Jul 2025 12:50:43 +0900
Subject: [PATCH 0266/3724] lima, lima-additional-guestagents: 1.2.0 -> 1.2.1

Diff: https://github.com/lima-vm/lima/compare/v1.2.0...v1.2.1
---
 pkgs/by-name/li/lima-additional-guestagents/package.nix | 4 ++--
 pkgs/by-name/li/lima/package.nix                        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/lima-additional-guestagents/package.nix b/pkgs/by-name/li/lima-additional-guestagents/package.nix
index d82812416219..2733e990996d 100644
--- a/pkgs/by-name/li/lima-additional-guestagents/package.nix
+++ b/pkgs/by-name/li/lima-additional-guestagents/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "lima-additional-guestagents";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "lima-vm";
     repo = "lima";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vrYsIYikoN4D3bxu/JTb9lMRcL5k9S6T473dl58SDW0=";
+    hash = "sha256-90fFsS5jidaovE2iqXfe4T2SgZJz6ScOwPPYxCsCk/k=";
   };
 
   vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os=";
diff --git a/pkgs/by-name/li/lima/package.nix b/pkgs/by-name/li/lima/package.nix
index ce0c159f5a20..12ff0ee0705e 100644
--- a/pkgs/by-name/li/lima/package.nix
+++ b/pkgs/by-name/li/lima/package.nix
@@ -22,13 +22,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "lima";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "lima-vm";
     repo = "lima";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vrYsIYikoN4D3bxu/JTb9lMRcL5k9S6T473dl58SDW0=";
+    hash = "sha256-90fFsS5jidaovE2iqXfe4T2SgZJz6ScOwPPYxCsCk/k=";
   };
 
   vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os=";

From 7ee7d1ea1fe9ae4ea6bd401d731859f099f25d0b Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sun, 27 Jul 2025 13:18:03 +0200
Subject: [PATCH 0267/3724] grpc: 1.73.1 -> 1.74.0

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

diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix
index 34ca53f27bc1..22004a58a728 100644
--- a/pkgs/by-name/gr/grpc/package.nix
+++ b/pkgs/by-name/gr/grpc/package.nix
@@ -26,7 +26,7 @@
 # nixpkgs-update: no auto update
 stdenv.mkDerivation rec {
   pname = "grpc";
-  version = "1.73.1"; # N.B: if you change this, please update:
+  version = "1.74.0"; # N.B: if you change this, please update:
   # pythonPackages.grpcio
   # pythonPackages.grpcio-channelz
   # pythonPackages.grpcio-health-checking
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
-    hash = "sha256-VAr+f+xqZfrP4XfCnZ9KxVTO6pHQe9gB2DgaQuen840=";
+    hash = "sha256-97+llHIubNYwULSD0KxEcGN+T8bQWufaEH6QT9oTgwg=";
     fetchSubmodules = true;
   };
 

From 862800980b6fcc6a7ea98e9f6e7ab9c817432021 Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sun, 27 Jul 2025 13:18:05 +0200
Subject: [PATCH 0268/3724] python3Packages.grpcio: 1.73.1 -> 1.74.0

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

diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index eb90a2b0e4f8..7c92d6904ec3 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -18,14 +18,14 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio";
-  version = "1.73.1";
+  version = "1.74.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-f84s0cDBEWzzhQVk6/wyZPunXTx0p0FDc/EjjqNl74c=";
+    hash = "sha256-gNH0+7NbB0LT49O7ZUtzgc1fAV+ElyeaHpwhumI+AbE=";
   };
 
   outputs = [

From 54935fcc2b0cf630c56a9ed5c603449f19a3a98c Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sun, 27 Jul 2025 13:18:06 +0200
Subject: [PATCH 0269/3724] python3Packages.grpcio-channelz: 1.73.1 -> 1.74.0

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

diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix
index 1b23f39166b4..ae82882b7ba8 100644
--- a/pkgs/development/python-modules/grpcio-channelz/default.nix
+++ b/pkgs/development/python-modules/grpcio-channelz/default.nix
@@ -12,13 +12,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-channelz";
-  version = "1.73.1";
+  version = "1.74.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "grpcio_channelz";
     inherit version;
-    hash = "sha256-5IxURNtQXZ5CzspDmcy5kmvOtBGJqJVhQKlNL5VTi+k=";
+    hash = "sha256-a4AHm21uNITq+J9OVHQ46Py4ZY8kQCfa+2eAO7vQfUs=";
   };
 
   build-system = [ setuptools ];

From 2cabb5950a82aaecf917b824f251d5359c7f3411 Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sun, 27 Jul 2025 13:18:07 +0200
Subject: [PATCH 0270/3724] python3Packages.grpcio-health-checking: 1.73.1 ->
 1.74.0

---
 .../python-modules/grpcio-health-checking/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix
index 0f21392ca7ad..ea3c3dbb14bc 100644
--- a/pkgs/development/python-modules/grpcio-health-checking/default.nix
+++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix
@@ -11,13 +11,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-health-checking";
-  version = "1.73.1";
+  version = "1.74.0";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "grpcio_health_checking";
     inherit version;
-    hash = "sha256-NSdTcT7euj8j6oozIMV1K+4YYALZR1plT1+BX/TgY0U=";
+    hash = "sha256-1nSUUdTO9UPD9iYK6ahshLmrAqkkIc7K5zpjLn/pIL8=";
   };
 
   propagatedBuildInputs = [

From 0a44c47be2a3c3e117cac6ed40160e62eda341e8 Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sun, 27 Jul 2025 13:18:08 +0200
Subject: [PATCH 0271/3724] python3Packages.grpcio-reflection: 1.73.1 -> 1.74.0

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

diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix
index 4f2551757836..35b0e1ca1e0c 100644
--- a/pkgs/development/python-modules/grpcio-reflection/default.nix
+++ b/pkgs/development/python-modules/grpcio-reflection/default.nix
@@ -12,13 +12,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-reflection";
-  version = "1.73.1";
+  version = "1.74.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "grpcio_reflection";
     inherit version;
-    hash = "sha256-LWpCAmTjHoPoERTdJYa1zQWmxomwHdXiEh2R8rThZ/I=";
+    hash = "sha256-xzJ9JSDc2sIJhy6/V3dMMjlkba2ILkq7Ste+vMrKLIM=";
   };
 
   build-system = [ setuptools ];

From 37d8088ef74d332c519f5d1068c16c2f3edf2694 Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sun, 27 Jul 2025 13:18:15 +0200
Subject: [PATCH 0272/3724] python3Packages.grpcio-status: 1.73.1 -> 1.74.0

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

diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix
index 2952084a783c..c003dda3cd2b 100644
--- a/pkgs/development/python-modules/grpcio-status/default.nix
+++ b/pkgs/development/python-modules/grpcio-status/default.nix
@@ -13,7 +13,7 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-status";
-  version = "1.73.1";
+  version = "1.74.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "grpcio_status";
     inherit version;
-    hash = "sha256-ko9JzPlojbXyDNnkXEV4odAczKKa6qvwZvKsdqqIZmg=";
+    hash = "sha256-xYwbJKpFTjDx/Gp+DbvBlMVKQIFDlxqUtfTkC7WDFDI=";
   };
 
   postPatch = ''

From 3397e9c79d967158d6dc49c1361ad3284ec6bb02 Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sun, 27 Jul 2025 13:18:21 +0200
Subject: [PATCH 0273/3724] python3Packages.grpcio-testing: 1.73.1 -> 1.74.0

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

diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix
index cd5854c7b166..b89cc4aa7df8 100644
--- a/pkgs/development/python-modules/grpcio-testing/default.nix
+++ b/pkgs/development/python-modules/grpcio-testing/default.nix
@@ -13,7 +13,7 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-testing";
-  version = "1.73.1";
+  version = "1.74.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "grpcio_testing";
     inherit version;
-    hash = "sha256-H7olzlrspjILsQShvdFoMvv2igiL9QUQm9AmHTCBeI4=";
+    hash = "sha256-Ed7bU6QQ/jsqK8mp7ZyaaXlCDJMkPafXh/fM+aJUPjc=";
   };
 
   postPatch = ''

From 6fd988a003059e4d00c118744b3cc235f47a55c8 Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sun, 27 Jul 2025 13:18:23 +0200
Subject: [PATCH 0274/3724] python3Packages.grpcio-tools: 1.73.1 -> 1.74.0

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

diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index 38bdc67c187c..ba25ada573e4 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -12,13 +12,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-tools";
-  version = "1.73.1";
+  version = "1.74.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "grpcio_tools";
     inherit version;
-    hash = "sha256-bgat7DsIcPWUeVOw74298s683/Yfsf4IEgzHSDx5eKo=";
+    hash = "sha256-iKuesYtqwbSHKt1rOUBzvY1E7ufDLk3GCgIuJf+v+5U=";
   };
 
   outputs = [

From e759a67713fe77900db3c7c13abf5ffba050b807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theo1.bori@epitech.eu>
Date: Sun, 27 Jul 2025 18:50:25 +0200
Subject: [PATCH 0275/3724] websurfx: 1.24.6 -> 1.24.22

---
 pkgs/by-name/we/websurfx/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix
index f93d0c649b20..4b48981c76ed 100644
--- a/pkgs/by-name/we/websurfx/package.nix
+++ b/pkgs/by-name/we/websurfx/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
 }:
 let
-  version = "1.24.6";
+  version = "1.24.22";
 in
 rustPlatform.buildRustPackage {
   pname = "websurfx";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
     owner = "neon-mmd";
     repo = "websurfx";
     tag = "v${version}";
-    hash = "sha256-T5ghMAR5fIFwbzBBl4wO+RIPkzbOK+ZAFnw5Id+aVlc=";
+    hash = "sha256-l04M2veWipVmmR4lN5+8mHpL2/16JMd3biRzEIacgac=";
   };
 
   nativeBuildInputs = [
@@ -27,10 +27,10 @@ rustPlatform.buildRustPackage {
     openssl
   ];
 
-  cargoHash = "sha256-vjvSOhyEQPW8sw1SjVWGvtnpzHGbyah1ufhLBUq7Qcw=";
+  cargoHash = "sha256-ekosi4t0InWh1c14jEe2MAWPCQ4qnqwPFvTAtAlwiuw=";
 
   postPatch = ''
-    substituteInPlace src/handler/mod.rs \
+    substituteInPlace src/handler.rs \
       --replace-fail "/etc/xdg" "$out/etc/xdg" \
       --replace-fail "/opt/websurfx" "$out/opt/websurfx"
   '';

From 4e6b9a1d40887ab285a1a95ea041bf00d66b2c33 Mon Sep 17 00:00:00 2001
From: benaryorg <binary@benary.org>
Date: Sat, 26 Jul 2025 15:26:04 +0000
Subject: [PATCH 0276/3724] snappy: restore of RTTI patch

This is required for *Ceph* to compile, as the comment states, and was accidentally removed.
A similar patch is also present for *leveldb* for instance.
Also bumps the patch to the appropriate version.

partial revert of 5240499fb672c5f7e25cd84bff780062cb3cf75a

Signed-off-by: benaryorg <binary@benary.org>
---
 pkgs/by-name/sn/snappy/package.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/by-name/sn/snappy/package.nix b/pkgs/by-name/sn/snappy/package.nix
index 566dddcc4473..40b0eba2f88a 100644
--- a/pkgs/by-name/sn/snappy/package.nix
+++ b/pkgs/by-name/sn/snappy/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  fetchpatch,
   static ? stdenv.hostPlatform.isStatic,
 }:
 
@@ -19,6 +20,22 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./revert-PUBLIC.patch
+    # Re-enable RTTI, without which other applications can't subclass snappy::Source
+    # While the patch was rejected upstream, it does not make it any less necessary to carry forward.
+    # ==> lack of RTTI *breaks* Ceph (and others) <==
+    #
+    # https://tracker.ceph.com/issues/53060
+    # https://build.opensuse.org/package/show/openSUSE:Factory/snappy
+    #
+    # Should this patch fail to apply use the above site to get the updated patch (rev in the url below).
+    # On the page there's a "latest revision" section which lists the last request which was merged into it.
+    # Click the "Request <insert number>" link, then view any file using "View file", and copy the rev from your address bar.
+    # For a different revision (in case nixpkgs is behind or something) you can go through the full revision history.
+    # Should the patch not be available for the nixpkgs version, ideally wait until the patch becomes available before bumping, or vendor it if necessary.
+    (fetchpatch {
+      url = "https://build.opensuse.org/public/source/openSUSE:Factory/snappy/reenable-rtti.patch?rev=e3449869b466869fc6b8a03a1a528fa6";
+      hash = "sha256-JhVhkHh7XPx1Bzf5xnOgWLgwh1oihX3O+emQWzE4Dho=";
+    })
   ];
 
   outputs = [

From b727207a973722fb50d2bb0773cae730006b1a29 Mon Sep 17 00:00:00 2001
From: benaryorg <binary@benary.org>
Date: Wed, 23 Jul 2025 23:11:12 +0000
Subject: [PATCH 0277/3724] ceph: arrow 19 compilation fix with protobuf 30

It seems that Arrow 20 which broke compilation initially causes issues with our tests when the patch which was merged upstream is applied.
At the same time the bundled Arrow 17 can't work with current Re2 due to its C++ version.
The thing that broke the Arrow 19 build is because Arrow 19 is itself not compatible with Protobuf 30, which is pulled in somewhere along the dependency graph by something else causing linking issues.
However, the patch for Protobuf 30 compat applies cleanly to our Arrow 19, which means we can dump the older version pin and instead use this patch to get Arrow 19 working again.

Signed-off-by: benaryorg <binary@benary.org>
---
 pkgs/tools/filesystems/ceph/arrow-cpp-19.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix b/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix
index d39d01245588..d4226feffb52 100644
--- a/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix
+++ b/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix
@@ -8,6 +8,7 @@
   stdenv,
   lib,
   fetchurl,
+  fetchpatch2,
   fetchFromGitHub,
   fixDarwinDylibNames,
   autoconf,
@@ -42,7 +43,7 @@
   openssl,
   perl,
   pkg-config,
-  protobuf_29,
+  protobuf,
   python3,
   rapidjson,
   re2,
@@ -67,9 +68,6 @@
 }:
 
 let
-  # https://github.com/apache/arrow/issues/45807
-  protobuf = protobuf_29;
-
   arrow-testing = fetchFromGitHub {
     name = "arrow-testing";
     owner = "apache";
@@ -101,6 +99,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/cpp";
 
+  patches = [
+    (fetchpatch2 {
+      name = "protobuf-30-compat.patch";
+      url = "https://github.com/apache/arrow/pull/46136.patch";
+      hash = "sha256-WTpe/eT3himlCHN/R78w1sF0HG859mE2ZN70U+9N8Ag=";
+      stripLen = 1;
+    })
+  ];
+
   # versions are all taken from
   # https://github.com/apache/arrow/blob/apache-arrow-${version}/cpp/thirdparty/versions.txt
 

From 494c6fb60c7992d0d9b9f5c30b57f0c7e35f5e4a Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 28 Jul 2025 02:16:03 +0200
Subject: [PATCH 0278/3724] haskellPackages: mark builds failing on hydra as
 broken

Based on <https://hydra.nixos.org/eval/1817170> (8076d01),
fetched at 2025-07-27 19:26 UTC.

(generated by maintainers/scripts/haskell/mark-broken.sh)
---
 .../configuration-hackage2nix/broken.yaml     | 36 ++++++++
 .../transitive-broken.yaml                    | 21 +++--
 .../haskell-modules/hackage-packages.nix      | 89 +++++++++++++++++--
 3 files changed, 135 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 373e989c9ff5..75bb85edb152 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -16,6 +16,7 @@ broken-packages:
   - AC-BuildPlatform # failure in job https://hydra.nixos.org/build/233219130 at 2023-09-02
   - AC-EasyRaster-GTK # failure in job https://hydra.nixos.org/build/233226232 at 2023-09-02
   - AC-HalfInteger # failure in job https://hydra.nixos.org/build/233239266 at 2023-09-02
+  - ac-library-hs # failure in job https://hydra.nixos.org/build/302800699 at 2025-07-27
   - ac-machine # failure in job https://hydra.nixos.org/build/233253535 at 2023-09-02
   - AC-MiniTest # failure in job https://hydra.nixos.org/build/233216015 at 2023-09-02
   - AC-Terminal # failure in job https://hydra.nixos.org/build/233192747 at 2023-09-02
@@ -256,6 +257,7 @@ broken-packages:
   - ascii-string # failure in job https://hydra.nixos.org/build/233249978 at 2023-09-02
   - ascii-vector-avc # failure in job https://hydra.nixos.org/build/233208533 at 2023-09-02
   - ascii85-conduit # failure in job https://hydra.nixos.org/build/233235427 at 2023-09-02
+  - ascii85x # failure in job https://hydra.nixos.org/build/302801241 at 2025-07-27
   - asciidiagram # failure in job https://hydra.nixos.org/build/233259020 at 2023-09-02
   - asif # failure in job https://hydra.nixos.org/build/233251551 at 2023-09-02
   - asil # failure in job https://hydra.nixos.org/build/233204081 at 2023-09-02
@@ -313,6 +315,7 @@ broken-packages:
   - auto # failure in job https://hydra.nixos.org/build/233211088 at 2023-09-02
   - auto-split # failure in job https://hydra.nixos.org/build/295091795 at 2025-04-22
   - autoapply # failure in job https://hydra.nixos.org/build/295091805 at 2025-04-22
+  - autodocodec-exact # failure in job https://hydra.nixos.org/build/302801281 at 2025-07-27
   - autom # failure in job https://hydra.nixos.org/build/234461198 at 2023-09-13
   - automata # failure in job https://hydra.nixos.org/build/295091890 at 2025-04-22
   - autonix-deps # failure in job https://hydra.nixos.org/build/233258269 at 2023-09-02
@@ -326,6 +329,7 @@ broken-packages:
   - avwx # failure in job https://hydra.nixos.org/build/233258167 at 2023-09-02
   - awesome-prelude # failure in job https://hydra.nixos.org/build/233232761 at 2023-09-02
   - awesomium-raw # failure in job https://hydra.nixos.org/build/233241036 at 2023-09-02
+  - aws-academy-grade-exporter # failure in job https://hydra.nixos.org/build/302801316 at 2025-07-27
   - aws-cloudfront-signed-cookies # failure in job https://hydra.nixos.org/build/252736035 at 2024-03-16
   - aws-cloudfront-signer # failure in job https://hydra.nixos.org/build/233194723 at 2023-09-02
   - aws-easy # failure building library in job https://hydra.nixos.org/build/237244335 at 2023-10-21
@@ -514,6 +518,8 @@ broken-packages:
   - bliplib # failure in job https://hydra.nixos.org/build/233195751 at 2023-09-02
   - blockchain # failure in job https://hydra.nixos.org/build/233245492 at 2023-09-02
   - blockhash # failure in job https://hydra.nixos.org/build/233227049 at 2023-09-02
+  - blockio-uring # failure in job https://hydra.nixos.org/build/302801498, https://github.com/well-typed/blockio-uring/issues/44 at 2025-07-27
+  - blockio-uring # https://github.com/well-typed/blockio-uring/issues/44, added 2025-07-27
   - Blogdown # failure in job https://hydra.nixos.org/build/233239841 at 2023-09-02
   - BlogLiterately # failure in job https://hydra.nixos.org/build/233202164 at 2023-09-02
   - bloodhound-amazonka-auth # failure building library in job https://hydra.nixos.org/build/237245625 at 2023-10-21
@@ -724,6 +730,7 @@ broken-packages:
   - category-printf # failure in job https://hydra.nixos.org/build/233216355 at 2023-09-02
   - category-traced # failure in job https://hydra.nixos.org/build/233193963 at 2023-09-02
   - catnplus # failure in job https://hydra.nixos.org/build/233241280 at 2023-09-02
+  - cauldron # failure in job https://hydra.nixos.org/build/302801682 at 2025-07-27
   - cautious-file # failure in job https://hydra.nixos.org/build/233218702 at 2023-09-02
   - cautious-gen # failure in job https://hydra.nixos.org/build/233258367 at 2023-09-02
   - cayene-lpp # failure in job https://hydra.nixos.org/build/233228959 at 2023-09-02
@@ -1019,6 +1026,7 @@ broken-packages:
   - contstuff-monads-tf # failure in job https://hydra.nixos.org/build/233224064 at 2023-09-02
   - contstuff-transformers # failure in job https://hydra.nixos.org/build/233244153 at 2023-09-02
   - conversion-bytestring # failure in job https://hydra.nixos.org/build/295092506 at 2025-04-22
+  - convex-schema-parser # failure in job https://hydra.nixos.org/build/302801971 at 2025-07-27
   - cookie-tray # failure in job https://hydra.nixos.org/build/295092527 at 2025-04-22
   - cooklang-hs # failure in job https://hydra.nixos.org/build/295092511 at 2025-04-22
   - copilot-bluespec # failure in job https://hydra.nixos.org/build/253685418 at 2024-03-31
@@ -1111,6 +1119,7 @@ broken-packages:
   - cuckoo # failure in job https://hydra.nixos.org/build/233210915 at 2023-09-02
   - cuckoo-filter # failure in job https://hydra.nixos.org/build/233226484 at 2023-09-02
   - cudd # failure in job https://hydra.nixos.org/build/252716117 at 2024-03-16
+  - cuddle # failure in job https://hydra.nixos.org/build/302802065 at 2025-07-27
   - curl-aeson # failure in job https://hydra.nixos.org/build/233210106 at 2023-09-02
   - curl-runnings # failure in job https://hydra.nixos.org/build/233258680 at 2023-09-02
   - currency-convert # failure in job https://hydra.nixos.org/build/233224509 at 2023-09-02
@@ -1644,6 +1653,7 @@ broken-packages:
   - exinst-hashable # failure in job https://hydra.nixos.org/build/233210438 at 2023-09-02
   - exists # failure in job https://hydra.nixos.org/build/233243541 at 2023-09-02
   - exitcode # failure in job https://hydra.nixos.org/build/233238454 at 2023-09-02
+  - exotic-list-monads # failure in job https://hydra.nixos.org/build/302802593 at 2025-07-27
   - exp-cache # failure in job https://hydra.nixos.org/build/233220561 at 2023-09-02
   - exp-extended # failure in job https://hydra.nixos.org/build/233236139 at 2023-09-02
   - experimenter # failure in job https://hydra.nixos.org/build/252726011 at 2024-03-16
@@ -2061,6 +2071,7 @@ broken-packages:
   - gi-gio-hs-list-model # failure in job https://hydra.nixos.org/build/233241640 at 2023-09-02
   - gi-gstapp # failure in job https://hydra.nixos.org/build/253686159 at 2024-03-31
   - gi-gsttag # failure in job https://hydra.nixos.org/build/233197576 at 2023-09-02
+  - gi-gtk4-layer-shell # failure in job https://hydra.nixos.org/build/302803068 at 2025-07-27
   - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02
   - gi-ibus # failure in job https://hydra.nixos.org/build/233220272 at 2023-09-02
   - gi-keybinder # failure in job https://hydra.nixos.org/build/265273447 at 2024-07-14
@@ -2069,6 +2080,7 @@ broken-packages:
   - giak # failure in job https://hydra.nixos.org/build/233242229 at 2023-09-02
   - gibberish # failure in job https://hydra.nixos.org/build/255688714 at 2024-04-16
   - Gifcurry # failure in job https://hydra.nixos.org/build/233200204 at 2023-09-02
+  - ginger2 # failure in job https://hydra.nixos.org/build/302803092 at 2025-07-27
   - gingersnap # failure in job https://hydra.nixos.org/build/233227186 at 2023-09-02
   - ginsu # failure in job https://hydra.nixos.org/build/233223259 at 2023-09-02
   - gipeda # failure in job https://hydra.nixos.org/build/233228149 at 2023-09-02
@@ -2503,6 +2515,7 @@ broken-packages:
   - hbeat # failure in job https://hydra.nixos.org/build/233228628 at 2023-09-02
   - hblas # failure in job https://hydra.nixos.org/build/233232561 at 2023-09-02
   - hblock # failure in job https://hydra.nixos.org/build/233205351 at 2023-09-02
+  - hblosc # failure in job https://hydra.nixos.org/build/302803521 at 2025-07-27
   - hburg # failure in job https://hydra.nixos.org/build/233247429 at 2023-09-02
   - hcad # failure in job https://hydra.nixos.org/build/233219976 at 2023-09-02
   - HCard # failure in job https://hydra.nixos.org/build/233231922 at 2023-09-02
@@ -2542,6 +2555,7 @@ broken-packages:
   - heckle # failure in job https://hydra.nixos.org/build/233228954 at 2023-09-02
   - heddit # failure in job https://hydra.nixos.org/build/233229058 at 2023-09-02
   - hedgehog-checkers # failure in job https://hydra.nixos.org/build/233229405 at 2023-09-02
+  - hedgehog-extras # failure in job https://hydra.nixos.org/build/302803553, https://github.com/input-output-hk/hedgehog-extras/issues/93 at 2025-07-27
   - hedgehog-gen # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237243271 at 2023-10-21
   - hedgehog-generic # failure in job https://hydra.nixos.org/build/233204695 at 2023-09-02
   - hedgehog-golden # failure in job https://hydra.nixos.org/build/233219619 at 2023-09-02
@@ -3114,6 +3128,7 @@ broken-packages:
   - IDynamic # failure in job https://hydra.nixos.org/build/233196222 at 2023-09-02
   - ieee-utils # failure in job https://hydra.nixos.org/build/233224430 at 2023-09-02
   - iexcloud # failure in job https://hydra.nixos.org/build/233224874 at 2023-09-02
+  - if-instance # failure in job https://hydra.nixos.org/build/302803982 at 2025-07-27
   - ifcxt # failure in job https://hydra.nixos.org/build/233196911 at 2023-09-02
   - IFS # failure in job https://hydra.nixos.org/build/233246865 at 2023-09-02
   - ig # failure in job https://hydra.nixos.org/build/233203872 at 2023-09-02
@@ -3310,6 +3325,7 @@ broken-packages:
   - json-qq # failure in job https://hydra.nixos.org/build/233196259 at 2023-09-02
   - json-rpc-generic # failure in job https://hydra.nixos.org/build/233201371 at 2023-09-02
   - json-rpc-server # failure in job https://hydra.nixos.org/build/233201284 at 2023-09-02
+  - json-schema # failure in job https://hydra.nixos.org/build/303231342 at 2025-07-27
   - json-syntax # failure in job https://hydra.nixos.org/build/233250639 at 2023-09-02
   - json-to-haskell # failure in job https://hydra.nixos.org/build/252711573 at 2024-03-16
   - json-to-type # failure in job https://hydra.nixos.org/build/275143966 at 2024-10-21
@@ -3636,6 +3652,7 @@ broken-packages:
   - llvm-base # failure in job https://hydra.nixos.org/build/233244366 at 2023-09-02
   - llvm-codegen # failure in job https://hydra.nixos.org/build/295095119 at 2025-04-22
   - llvm-extension # failure in job https://hydra.nixos.org/build/266355631 at 2024-07-14
+  - llvm-extra # failure in job https://hydra.nixos.org/build/303481607 at 2025-07-27
   - llvm-general-pure # failure in job https://hydra.nixos.org/build/233246430 at 2023-09-02
   - llvm-hs # failure in job https://hydra.nixos.org/build/233205149 at 2023-09-02
   - llvm-hs-pure # failure in job https://hydra.nixos.org/build/252721738 at 2024-03-16
@@ -3788,6 +3805,8 @@ broken-packages:
   - mcm # failure in job https://hydra.nixos.org/build/233229087 at 2023-09-02
   - mcmaster-gloss-examples # failure in job https://hydra.nixos.org/build/234457610 at 2023-09-13
   - mcmc-synthesis # failure in job https://hydra.nixos.org/build/233208414 at 2023-09-02
+  - mcp # failure in job https://hydra.nixos.org/build/302804588 at 2025-07-27
+  - mcp-server # failure in job https://hydra.nixos.org/build/302804602 at 2025-07-27
   - mcpi # failure in job https://hydra.nixos.org/build/233231465 at 2023-09-02
   - mdapi # failure in job https://hydra.nixos.org/build/233257724 at 2023-09-02
   - mdcat # failure in job https://hydra.nixos.org/build/233249429 at 2023-09-02
@@ -3994,6 +4013,7 @@ broken-packages:
   - movie-monad # failure in job https://hydra.nixos.org/build/233215402 at 2023-09-02
   - mpppc # failure in job https://hydra.nixos.org/build/233223008 at 2023-09-02
   - mpris # failure in job https://hydra.nixos.org/build/233259241 at 2023-09-02
+  - mptcp-pm # failure in job https://hydra.nixos.org/build/303231350 at 2025-07-27
   - mpvguihs # failure in job https://hydra.nixos.org/build/233196650 at 2023-09-02
   - mqtt # failure in job https://hydra.nixos.org/build/233202067 at 2023-09-02
   - mqtt-hs # failure in job https://hydra.nixos.org/build/233239399 at 2023-09-02
@@ -4003,6 +4023,8 @@ broken-packages:
   - ms-auth # failure in job https://hydra.nixos.org/build/233193383 at 2023-09-02
   - ms-azure-api # failure in job https://hydra.nixos.org/build/233202229 at 2023-09-02
   - ms-graph-api # failure in job https://hydra.nixos.org/build/233219042 at 2023-09-02
+  - msgpack-aeson # failure in job https://hydra.nixos.org/build/303231349 at 2025-07-27
+  - msgpack-rpc # failure in job https://hydra.nixos.org/build/303231348 at 2025-07-27
   - msgpack-types # failure in job https://hydra.nixos.org/build/233235351 at 2023-09-02
   - msh # failure in job https://hydra.nixos.org/build/233196466 at 2023-09-02
   - MTGBuilder # failure in job https://hydra.nixos.org/build/233227528 at 2023-09-02
@@ -4363,12 +4385,14 @@ broken-packages:
   - overloaded-records # failure in job https://hydra.nixos.org/build/233235922 at 2023-09-02
   - overture # failure in job https://hydra.nixos.org/build/233245959 at 2023-09-02
   - owoify-hs # failure in job https://hydra.nixos.org/build/233213422 at 2023-09-02
+  - ox-arrays # failure in job https://hydra.nixos.org/build/302805170 at 2025-07-27
   - pa-field-parser # failure in job https://hydra.nixos.org/build/295095885 at 2025-04-22
   - pack # failure in job https://hydra.nixos.org/build/233243562 at 2023-09-02
   - package-description-remote # failure in job https://hydra.nixos.org/build/233221358 at 2023-09-02
   - package-vt # failure in job https://hydra.nixos.org/build/233225831 at 2023-09-02
   - packdeps # failure in job https://hydra.nixos.org/build/233216607 at 2023-09-02
   - packed # failure in job https://hydra.nixos.org/build/233231889 at 2023-09-02
+  - packed-data # failure in job https://hydra.nixos.org/build/302805203 at 2025-07-27
   - packed-dawg # failure in job https://hydra.nixos.org/build/233207332 at 2023-09-02
   - packed-multikey-map # failure in job https://hydra.nixos.org/build/233234157 at 2023-09-02
   - packedstring # failure in job https://hydra.nixos.org/build/233240511 at 2023-09-02
@@ -4664,6 +4688,7 @@ broken-packages:
   - plural # failure in job https://hydra.nixos.org/build/233198934 at 2023-09-02
   - ply-loader # failure in job https://hydra.nixos.org/build/252720663 at 2024-03-16
   - plzwrk # failure in job https://hydra.nixos.org/build/233219630 at 2023-09-02
+  - pms-domain-model # failure in job https://hydra.nixos.org/build/302805399 at 2025-07-27
   - pngload-fixed # failure in job https://hydra.nixos.org/build/233233956 at 2023-09-02
   - pocket # failure in job https://hydra.nixos.org/build/233244120 at 2023-09-02
   - podenv # failure in job https://hydra.nixos.org/build/233210257 at 2023-09-02
@@ -5101,6 +5126,7 @@ broken-packages:
   - regexqq # failure in job https://hydra.nixos.org/build/233233149 at 2023-09-02
   - regions # failure in job https://hydra.nixos.org/build/233196483 at 2023-09-02
   - register-machine-typelevel # failure in job https://hydra.nixos.org/build/233217514 at 2023-09-02
+  - registry-messagepack # failure in job https://hydra.nixos.org/build/303231364 at 2025-07-27
   - registry-options # failure in job https://hydra.nixos.org/build/295096594 at 2025-04-22
   - regress # failure in job https://hydra.nixos.org/build/233208901 at 2023-09-02
   - regular # failure in job https://hydra.nixos.org/build/233232656 at 2023-09-02
@@ -5379,6 +5405,7 @@ broken-packages:
   - servant-docs-simple # failure in job https://hydra.nixos.org/build/233237374 at 2023-09-02
   - servant-ekg # failure in job https://hydra.nixos.org/build/295096851 at 2025-04-22
   - servant-errors # failure in job https://hydra.nixos.org/build/233239712 at 2023-09-02
+  - servant-event-stream # failure in job https://hydra.nixos.org/build/302806100 at 2025-07-27
   - servant-gdp # failure in job https://hydra.nixos.org/build/233191664 at 2023-09-02
   - servant-generate # failure in job https://hydra.nixos.org/build/233199452 at 2023-09-02
   - servant-generic # failure in job https://hydra.nixos.org/build/233211338 at 2023-09-02
@@ -5561,6 +5588,7 @@ broken-packages:
   - skemmtun # failure in job https://hydra.nixos.org/build/233223893 at 2023-09-02
   - sketch-frp-copilot # copilot >=4.3 && <4.4,
   - skew-list # failure in job https://hydra.nixos.org/build/295097034 at 2025-04-22
+  - skews # time out in job https://hydra.nixos.org/build/302806286 at 2025-07-27
   - skopedate # failure in job https://hydra.nixos.org/build/233220634 at 2023-09-02
   - skulk # failure in job https://hydra.nixos.org/build/233258672 at 2023-09-02
   - skylighting-extensions # failure in job https://hydra.nixos.org/build/233221387 at 2023-09-02
@@ -5652,6 +5680,7 @@ broken-packages:
   - socketed # failure in job https://hydra.nixos.org/build/233210087 at 2023-09-02
   - socketio # failure in job https://hydra.nixos.org/build/233214659 at 2023-09-02
   - sockets # failure in job https://hydra.nixos.org/build/295097095 at 2025-04-22
+  - socks5 # failure in job https://hydra.nixos.org/build/302806344 at 2025-07-27
   - sodium # failure in job https://hydra.nixos.org/build/233213989 at 2023-09-02
   - soegtk # failure in job https://hydra.nixos.org/build/233198991 at 2023-09-02
   - softfloat-hs # failure in job https://hydra.nixos.org/build/233205242 at 2023-09-02
@@ -5661,6 +5690,7 @@ broken-packages:
   - sonic-visualiser # failure in job https://hydra.nixos.org/build/233257956 at 2023-09-02
   - Sonnex # failure in job https://hydra.nixos.org/build/233229367 at 2023-09-02
   - SoOSiM # failure in job https://hydra.nixos.org/build/233224114 at 2023-09-02
+  - sop-satisfier # failure in job https://hydra.nixos.org/build/302806351 at 2025-07-27
   - sorted # failure in job https://hydra.nixos.org/build/233222633 at 2023-09-02
   - sorting # failure in job https://hydra.nixos.org/build/233214204 at 2023-09-02
   - sorty # failure in job https://hydra.nixos.org/build/233211118 at 2023-09-02
@@ -5992,6 +6022,7 @@ broken-packages:
   - tasty-grading-system # failure in job https://hydra.nixos.org/build/236673021 at 2023-10-04
   - tasty-hedgehog-coverage # failure in job https://hydra.nixos.org/build/233231332 at 2023-09-02
   - tasty-mgolden # failure in job https://hydra.nixos.org/build/233248196 at 2023-09-02
+  - tasty-papi # failure in job https://hydra.nixos.org/build/302806735, https://github.com/Shimuuar/tasty-papi/issues/4#issuecomment-3123432375 at 2025-07-27
   - tasty-process # failure in job https://hydra.nixos.org/build/253680638 at 2024-03-31
   - tasty-stats # failure in job https://hydra.nixos.org/build/233228752 at 2023-09-02
   - tasty-test-reporter # failure in job https://hydra.nixos.org/build/233208181 at 2023-09-02
@@ -6296,6 +6327,7 @@ broken-packages:
   - turing-music # failure in job https://hydra.nixos.org/build/233203435 at 2023-09-02
   - turtle-options # failure in job https://hydra.nixos.org/build/233255831 at 2023-09-02
   - tweak # failure in job https://hydra.nixos.org/build/233211020 at 2023-09-02
+  - twee # failure in job https://hydra.nixos.org/build/302807024 at 2025-07-27
   - twentefp-websockets # failure in job https://hydra.nixos.org/build/233207022 at 2023-09-02
   - twhs # failure in job https://hydra.nixos.org/build/233201182 at 2023-09-02
   - twilio # failure in job https://hydra.nixos.org/build/233199959 at 2023-09-02
@@ -6351,6 +6383,7 @@ broken-packages:
   - typed-wire # failure in job https://hydra.nixos.org/build/233237626 at 2023-09-02
   - typedquery # failure in job https://hydra.nixos.org/build/233215307 at 2023-09-02
   - typehash # failure in job https://hydra.nixos.org/build/233207184 at 2023-09-02
+  - typelet # failure in job https://hydra.nixos.org/build/302807072 at 2025-07-27
   - typelevel-rewrite-rules # failure in job https://hydra.nixos.org/build/233243365 at 2023-09-02
   - typelevel-tensor # failure in job https://hydra.nixos.org/build/233190827 at 2023-09-02
   - typeparams # failure in job https://hydra.nixos.org/build/233192078 at 2023-09-02
@@ -6731,6 +6764,7 @@ broken-packages:
   - X11-xfixes # failure in job https://hydra.nixos.org/build/233256494 at 2023-09-02
   - x86-64bit # failure in job https://hydra.nixos.org/build/252737465 at 2024-03-16
   - xcffib # failure in job https://hydra.nixos.org/build/295098351 at 2025-04-22
+  - xcframework # failure in job https://hydra.nixos.org/build/302807506 at 2025-07-27
   - xchat-plugin # failure in job https://hydra.nixos.org/build/233238679 at 2023-09-02
   - xcp # failure in job https://hydra.nixos.org/build/233208926 at 2023-09-02
   - Xec # failure in job https://hydra.nixos.org/build/233191564 at 2023-09-02
@@ -6757,6 +6791,7 @@ broken-packages:
   - xml-extractors # failure in job https://hydra.nixos.org/build/252718569 at 2024-03-16
   - xml-html-conduit-lens # failure in job https://hydra.nixos.org/build/233238471 at 2023-09-02
   - xml-indexed-cursor # failure in job https://hydra.nixos.org/build/295098303 at 2025-04-22
+  - xml-isogen # failure in job https://hydra.nixos.org/build/303231372 at 2025-07-27
   - xml-parsec # failure in job https://hydra.nixos.org/build/233208461 at 2023-09-02
   - xml-parser # failure in job https://hydra.nixos.org/build/252721082 at 2024-03-16
   - xml-prettify # failure in job https://hydra.nixos.org/build/233225974 at 2023-09-02
@@ -6776,6 +6811,7 @@ broken-packages:
   - xmonad-vanessa # failure in job https://hydra.nixos.org/build/233214303 at 2023-09-02
   - xmonad-wallpaper # failure in job https://hydra.nixos.org/build/233217165 at 2023-09-02
   - xmonad-windownames # failure in job https://hydra.nixos.org/build/233258043 at 2023-09-02
+  - xnobar # failure in job https://hydra.nixos.org/build/302807518 at 2025-07-27
   - xorshift-plus # failure in job https://hydra.nixos.org/build/233255176 at 2023-09-02
   - Xorshift128Plus # failure in job https://hydra.nixos.org/build/233225679 at 2023-09-02
   - xsact # failure in job https://hydra.nixos.org/build/233221821 at 2023-09-02
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index b722ae99b5af..6c2b389503a2 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -721,7 +721,6 @@ dont-distribute-packages:
  - dhall-secret
  - dia-functions
  - diagrams-html5
- - diagrams-reflex
  - diagrams-wx
  - dialog
  - diff
@@ -1932,6 +1931,7 @@ dont-distribute-packages:
  - kit
  - kmeans-par
  - kmeans-vector
+ - knead
  - knit-haskell
  - koji-install
  - koji-tool
@@ -2007,7 +2007,6 @@ dont-distribute-packages:
  - legion-discovery
  - legion-discovery-client
  - legion-extra
- - leksah
  - leksah-server
  - lens-utils
  - lenz
@@ -2069,6 +2068,7 @@ dont-distribute-packages:
  - llvm-base-types
  - llvm-base-util
  - llvm-data-interop
+ - llvm-dsl
  - llvm-general
  - llvm-general-quote
  - llvm-hs-pretty
@@ -2276,6 +2276,7 @@ dont-distribute-packages:
  - mpretty
  - mprover
  - mps
+ - mptcpanalyzer
  - msgpack-arbitrary
  - msgpack-binary
  - msgpack-idl
@@ -2523,6 +2524,7 @@ dont-distribute-packages:
  - partage
  - partial-semigroup-test
  - passman-cli
+ - patch-image
  - pathfindingcore
  - patterns
  - paypal-rest-client
@@ -2607,6 +2609,16 @@ dont-distribute-packages:
  - Plot-ho-matic
  - PlslTools
  - plugins-auto
+ - pms-application-service
+ - pms-domain-service
+ - pms-infra-cmdrun
+ - pms-infra-procspawn
+ - pms-infra-socket
+ - pms-infra-watch
+ - pms-infrastructure
+ - pms-ui-notification
+ - pms-ui-request
+ - pms-ui-response
  - png-file
  - pngload
  - pointless-lenses
@@ -2708,6 +2720,7 @@ dont-distribute-packages:
  - psql
  - ptera
  - ptera-th
+ - pty-mcp-server
  - publicsuffixlist
  - puffytools
  - Pugs
@@ -2829,12 +2842,10 @@ dont-distribute-packages:
  - refh
  - reflex-animation
  - reflex-backend-wai
- - reflex-dom-colonnade
  - reflex-ghci
  - reflex-gloss-scene
  - reflex-libtelnet
  - reflex-localize
- - reflex-localize-dom
  - reflex-monad-auth
  - reflex-process
  - reform-blaze
@@ -3246,7 +3257,6 @@ dont-distribute-packages:
  - spelling-suggest
  - sphero
  - spice
- - spike
  - SpinCounter
  - splines
  - sprinkles
@@ -3480,7 +3490,6 @@ dont-distribute-packages:
  - trasa-client
  - trasa-extra
  - trasa-form
- - trasa-reflex
  - trasa-server
  - trasa-th
  - traversal-template
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ecff9120e3e3..17f8d836258a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -49460,7 +49460,9 @@ self: {
       ];
       description = "Data structures and algorithms";
       license = lib.licenses.cc0;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "example-lazy-segtree";
+      broken = true;
     }
   ) { };
 
@@ -85175,7 +85177,9 @@ self: {
       ];
       description = "Displays TI-85 variable files as text";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "ascii85x";
+      broken = true;
     }
   ) { };
 
@@ -90411,6 +90415,8 @@ self: {
       ];
       description = "Exact decoder for autodocodec";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -92230,7 +92236,9 @@ self: {
       ];
       description = "Export grades from AWS Academy to different formats";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "aws-academy-grade-exporter";
+      broken = true;
     }
   ) { };
 
@@ -111656,6 +111664,8 @@ self: {
       benchmarkPkgconfigDepends = [ liburing ];
       description = "Perform batches of asynchronous disk IO operations";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { inherit (pkgs) liburing; };
 
@@ -133401,7 +133411,9 @@ self: {
       doHaddock = false;
       description = "Dependency injection library";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "cauldron-example-wiring";
+      broken = true;
     }
   ) { };
 
@@ -162503,7 +162515,9 @@ self: {
       doHaddock = false;
       description = "A type-safe client generator for Convex for both Rust and Python";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "convex-schema-parser";
+      broken = true;
     }
   ) { };
 
@@ -172920,7 +172934,9 @@ self: {
       ];
       description = "CDDL Generator and test utilities";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "cuddle";
+      broken = true;
     }
   ) { };
 
@@ -192810,7 +192826,6 @@ self: {
       ];
       description = "reflex backend for diagrams drawing EDSL";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -224459,6 +224474,8 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Non-standard monads on lists and non-empty lists";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -266282,6 +266299,8 @@ self: {
       libraryPkgconfigDepends = [ gtk4-layer-shell ];
       description = "gtk4-layer-shell bindings";
       license = lib.licenses.lgpl21Only;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { inherit (pkgs) gtk4-layer-shell; };
 
@@ -268447,7 +268466,9 @@ self: {
       ];
       description = "Jinja templates for Haskell";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "ginger2";
+      broken = true;
     }
   ) { };
 
@@ -315789,6 +315810,8 @@ self: {
       ];
       description = "Blosc (numerical compression library) bindings for Haskell";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -319223,6 +319246,8 @@ self: {
       testToolDepends = [ tasty-discover ];
       description = "Supplemental library for hedgehog";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -374222,6 +374247,8 @@ self: {
       doHaddock = false;
       description = "Branch on whether a constraint is satisfied";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -393938,6 +393965,8 @@ self: {
       ];
       description = "Types and type classes for defining JSON schemas";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -402605,6 +402634,7 @@ self: {
       ];
       description = "Repa-like array processing using LLVM JIT";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -414408,7 +414438,6 @@ self: {
       ];
       description = "Haskell IDE written in Haskell";
       license = "GPL";
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "leksah";
     }
   ) { inherit (pkgs) gtk3; };
@@ -425681,6 +425710,7 @@ self: {
       ];
       description = "Support for writing an EDSL with LLVM-JIT as target";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -425782,6 +425812,8 @@ self: {
       doHaddock = false;
       description = "Utility functions for the llvm interface";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -442156,6 +442188,8 @@ self: {
       testHaskellDepends = [ base ];
       description = "A Haskell implementation of the Model Context Protocol (MCP)";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -442214,6 +442248,8 @@ self: {
       ];
       description = "Library for building Model Context Protocol (MCP) servers";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -462490,7 +462526,9 @@ self: {
       description = "A Multipath TCP path manager";
       license = lib.licenses.gpl3Only;
       badPlatforms = lib.platforms.darwin;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "mptcp-pm";
+      broken = true;
     }
   ) { };
 
@@ -462667,6 +462705,7 @@ self: {
       ];
       description = "A Multipath TCP analyzer";
       license = lib.licenses.gpl3Only;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "mptcpanalyzer";
     }
   ) { };
@@ -463242,6 +463281,8 @@ self: {
       ];
       description = "Aeson adapter for MessagePack";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -463517,6 +463558,8 @@ self: {
       ];
       description = "A MessagePack-RPC Implementation";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -498672,6 +498715,8 @@ self: {
       doHaddock = false;
       description = "An efficient CPU-based multidimensional array (tensor) library";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -499252,7 +499297,9 @@ self: {
         vector
       ];
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "examples";
+      broken = true;
     }
   ) { };
 
@@ -525193,6 +525240,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "pms-application-service";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -525253,6 +525301,8 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "pms-domain-model";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -525325,6 +525375,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "pms-domain-service";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -525392,6 +525443,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-cmdrun";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -525459,6 +525511,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-procspawn";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -525530,6 +525583,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-socket";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -525599,6 +525653,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-watch";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -525672,6 +525727,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "pms-infrastructure";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -525732,6 +525788,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "pms-ui-notification";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -525792,6 +525849,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "pms-ui-request";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -525852,6 +525910,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "pms-ui-response";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -546637,6 +546696,7 @@ self: {
       ];
       description = "pty-mcp-server";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "pty-mcp-server";
     }
   ) { };
@@ -564687,7 +564747,6 @@ self: {
       ];
       description = "Use colonnade with reflex-dom";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -565696,7 +565755,6 @@ self: {
       description = "Helper widgets for reflex-localize";
       license = lib.licenses.mit;
       badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -568401,6 +568459,8 @@ self: {
       ];
       description = "MessagePack encoders / decoders";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -598955,6 +599015,8 @@ self: {
       testHaskellDepends = [ base ];
       description = "Servant support for Server-Sent events";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -616211,6 +616273,8 @@ self: {
       ];
       description = "A very quick-and-dirty WebSocket server";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -624779,6 +624843,8 @@ self: {
       ];
       description = "A SOCKS5 (RFC 1928) implementation";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -625305,6 +625371,8 @@ self: {
       ];
       description = "Check satisfiability of expressions on natural numbers";
       license = lib.licenses.bsd2;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -660255,6 +660323,8 @@ self: {
       description = "Bencmarking using instruction counting";
       license = lib.licenses.bsd3;
       platforms = lib.platforms.linux;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { inherit (pkgs) papi; };
 
@@ -684075,7 +684145,6 @@ self: {
       ];
       description = "Reactive Type Safe Routing";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -688295,7 +688364,9 @@ self: {
       ];
       description = "An equational theorem prover";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "twee";
+      broken = true;
     }
   ) { };
 
@@ -692502,6 +692573,8 @@ self: {
       ];
       description = "Plugin to faciliate type-level let";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -730197,6 +730270,8 @@ self: {
       ];
       description = "Cabal hooks for producing an XCFramework from a Haskell library";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -732321,6 +732396,8 @@ self: {
       ];
       description = "Generate XML-isomorphic types";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -734407,6 +734484,8 @@ self: {
       description = "Text-based notification server for XMobar";
       license = lib.licenses.bsd3;
       badPlatforms = lib.platforms.darwin;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 

From 653ed6376f5b0e900e6067aade36a52e4e4137f5 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Mon, 7 Jul 2025 06:58:15 -0700
Subject: [PATCH 0279/3724] zig.cc: set main program

---
 pkgs/development/compilers/zig/cc.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/zig/cc.nix b/pkgs/development/compilers/zig/cc.nix
index bfbfb49de365..f2716d395e69 100644
--- a/pkgs/development/compilers/zig/cc.nix
+++ b/pkgs/development/compilers/zig/cc.nix
@@ -14,7 +14,7 @@ in
 runCommand "zig-cc-${zig.version}"
   {
     pname = "zig-cc";
-    inherit (zig) version meta;
+    inherit (zig) version;
 
     nativeBuildInputs = [ makeWrapper ];
 
@@ -24,6 +24,10 @@ runCommand "zig-cc-${zig.version}"
     };
 
     inherit zig;
+
+    meta = zig.meta // {
+      mainProgram = "${targetPrefix}clang";
+    };
   }
   ''
     mkdir -p $out/bin

From a155990361349d1e871c0e09a0a81ce754c759b6 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Mon, 28 Jul 2025 00:07:28 -0700
Subject: [PATCH 0280/3724] gcc-unwrapped: set main program

---
 .../development/compilers/gcc/common/configure-flags.nix | 5 +----
 pkgs/development/compilers/gcc/common/meta.nix           | 7 ++++++-
 pkgs/development/compilers/gcc/default.nix               | 9 +++++++--
 pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix | 1 +
 pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix     | 1 +
 pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix       | 1 +
 pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix  | 1 +
 7 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
index 7cedb913b1a7..7afc8ca9079f 100644
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -20,6 +20,7 @@
   enablePlugin,
   disableGdbPlugin ? !enablePlugin,
   enableShared,
+  targetPrefix,
 
   langC,
   langCC,
@@ -59,10 +60,6 @@ let
   crossDarwin =
     (!lib.systems.equals targetPlatform hostPlatform) && targetPlatform.libc == "libSystem";
 
-  targetPrefix = lib.optionalString (
-    !lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform
-  ) "${stdenv.targetPlatform.config}-";
-
   crossConfigureFlags =
     # Ensure that -print-prog-name is able to find the correct programs.
     [
diff --git a/pkgs/development/compilers/gcc/common/meta.nix b/pkgs/development/compilers/gcc/common/meta.nix
index 716b6e875f24..c69f9956ddfc 100644
--- a/pkgs/development/compilers/gcc/common/meta.nix
+++ b/pkgs/development/compilers/gcc/common/meta.nix
@@ -1,4 +1,8 @@
-{ lib, version }:
+{
+  lib,
+  version,
+  targetPrefix,
+}:
 
 let
   inherit (lib)
@@ -24,5 +28,6 @@ in
 
   platforms = platforms.unix;
   teams = [ teams.gcc ];
+  mainProgram = "${targetPrefix}gcc";
 
 }
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 0e4a70f870d5..62993846d7a8 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -119,6 +119,10 @@ let
     !lib.systems.equals targetPlatform hostPlatform
   ) "${targetPlatform.config}${stageNameAddon}-";
 
+  targetPrefix = lib.optionalString (
+    !lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform
+  ) "${stdenv.targetPlatform.config}-";
+
   callFile = callPackageWith {
     # lets
     inherit
@@ -340,7 +344,7 @@ pipe
         "target"
       ];
 
-      configureFlags = callFile ./common/configure-flags.nix { };
+      configureFlags = callFile ./common/configure-flags.nix { inherit targetPrefix; };
 
       inherit targetConfig;
 
@@ -449,13 +453,14 @@ pipe
       inherit enableShared enableMultilib;
 
       meta = {
-        inherit (callFile ./common/meta.nix { })
+        inherit (callFile ./common/meta.nix { inherit targetPrefix; })
           homepage
           license
           description
           longDescription
           platforms
           teams
+          mainProgram
           ;
       }
       // optionalAttrs (!atLeast11) {
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix
index e899a0a7413e..f4bc0d4784c3 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix
@@ -102,6 +102,7 @@ bash.runCommand "${pname}-${version}"
       license = licenses.gpl3Plus;
       teams = [ teams.minimal-bootstrap ];
       platforms = platforms.unix;
+      mainProgram = "gcc";
     };
   }
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix
index 7b98276305b5..0acddf7e042c 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix
@@ -84,6 +84,7 @@ bash.runCommand "${pname}-${version}"
       license = licenses.gpl3Plus;
       teams = [ teams.minimal-bootstrap ];
       platforms = platforms.unix;
+      mainProgram = "gcc";
     };
   }
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix
index f0911017d221..8f996d7dea22 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix
@@ -101,6 +101,7 @@ bash.runCommand "${pname}-${version}"
       license = licenses.gpl3Plus;
       teams = [ teams.minimal-bootstrap ];
       platforms = platforms.unix;
+      mainProgram = "gcc";
     };
   }
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix
index 25c9f25e5c87..262232d669e5 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix
@@ -100,6 +100,7 @@ bash.runCommand "${pname}-${version}"
       license = licenses.gpl3Plus;
       teams = [ teams.minimal-bootstrap ];
       platforms = platforms.unix;
+      mainProgram = "gcc";
     };
   }
   ''

From e9b2edb4916328647571aee01b2a83c02e585df5 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <julian.stecklina@cyberus-technology.de>
Date: Wed, 19 Mar 2025 12:26:02 +0100
Subject: [PATCH 0281/3724] linux: un-simplify toolchain selection

This reverts commit 70cc251554d883130ae1a94ffd3508c2d521db6a.

This commit caused gcc to be pulled in as a target compiler for
pkgsLLVM.

Co-authored-by: Tristan Ross <tristan.ross@midstall.com>
---
 .../linux/kernel/common-config.nix            |  4 ++-
 .../os-specific/linux/kernel/common-flags.nix | 34 +++++++++++++++++++
 pkgs/os-specific/linux/kernel/generic.nix     | 15 ++++----
 .../linux/kernel/manual-config.nix            | 26 ++++++--------
 4 files changed, 56 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/common-flags.nix

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 99a187200997..ca4d2837da3f 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -525,7 +525,9 @@ let
         DRM_AMD_DC_DCN = lib.mkIf (with stdenv.hostPlatform; isx86 || isPower64) (
           whenBetween "5.11" "6.4" yes
         );
-        DRM_AMD_DC_FP = whenAtLeast "6.4" yes;
+        # Not available when using clang
+        # See: https://github.com/torvalds/linux/blob/172a9d94339cea832d89630b89d314e41d622bd8/drivers/gpu/drm/amd/display/Kconfig#L14
+        DRM_AMD_DC_FP = lib.mkIf (!stdenv.cc.isClang) (whenAtLeast "6.4" yes);
         DRM_AMD_DC_HDCP = whenBetween "5.5" "6.4" yes;
         DRM_AMD_DC_SI = whenAtLeast "5.10" yes;
 
diff --git a/pkgs/os-specific/linux/kernel/common-flags.nix b/pkgs/os-specific/linux/kernel/common-flags.nix
new file mode 100644
index 000000000000..2fb92049195d
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/common-flags.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  stdenv,
+  buildPackages,
+  extraMakeFlags ? [ ],
+}:
+# Absolute paths for compilers avoid any PATH-clobbering issues.
+[
+  #
+  # We use the unwrapped compiler, because the clang-wrapper doesn't like -target.
+  "CC=${lib.getExe stdenv.cc.cc}"
+  # The wrapper for ld.lld breaks linking the kernel. We use the unwrapped linker as workaround. See:
+  # https://github.com/NixOS/nixpkgs/issues/321667
+  "LD=${lib.getExe' stdenv.cc.bintools.bintools "${stdenv.cc.targetPrefix}ld"}"
+  "AR=${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}ar"}"
+  "NM=${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}nm"}"
+  "STRIP=${lib.getExe' stdenv.cc.bintools.bintools "${stdenv.cc.targetPrefix}strip"}"
+  "OBJCOPY=${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}objcopy"}"
+  "OBJDUMP=${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}objdump"}"
+  "READELF=${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}readelf"}"
+  "HOSTCC=${lib.getExe' buildPackages.stdenv.cc "${buildPackages.stdenv.cc.targetPrefix}cc"}"
+  "HOSTCXX=${lib.getExe' buildPackages.stdenv.cc "${buildPackages.stdenv.cc.targetPrefix}c++"}"
+  "HOSTAR=${lib.getExe' buildPackages.stdenv.cc.bintools "${buildPackages.stdenv.cc.targetPrefix}ar"}"
+  "HOSTLD=${lib.getExe' buildPackages.stdenv.cc.bintools "${buildPackages.stdenv.cc.targetPrefix}ld"}"
+  "ARCH=${stdenv.hostPlatform.linuxArch}"
+  "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+]
+# Add the built in headers the kernel needs
+++ lib.optionals (stdenv.cc.isClang) [
+  "CFLAGS_MODULE=-I${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include"
+  "CFLAGS_KERNEL=-I${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include"
+]
+++ (stdenv.hostPlatform.linux-kernel.makeFlags or [ ])
+++ extraMakeFlags
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 65583ad03f29..e98229c7e1d4 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -191,7 +191,7 @@ let
         ++ lib.optional (lib.versionAtLeast version "5.2") pahole
         ++ lib.optionals withRust [
           rust-bindgen
-          rustc
+          rustc.unwrapped
         ];
 
         RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
@@ -201,11 +201,14 @@ let
         kernelBaseConfig =
           if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig;
 
-        makeFlags =
-          lib.optionals (
-            stdenv.hostPlatform.linux-kernel ? makeFlags
-          ) stdenv.hostPlatform.linux-kernel.makeFlags
-          ++ extraMakeFlags;
+        makeFlags = import ./common-flags.nix {
+          inherit
+            lib
+            stdenv
+            buildPackages
+            extraMakeFlags
+            ;
+        };
 
         postPatch = kernel.postPatch + ''
           # Patch kconfig to print "###" after every question so that
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index c0c6713fc346..e054ab30ab4e 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -170,7 +170,7 @@ lib.makeOverridable (
         ++ optional (lib.versionAtLeast version "5.13") zstd
         ++ optionals withRust [
           rustc
-          rust-bindgen
+          rust-bindgen.unwrapped
         ];
 
       in
@@ -230,7 +230,7 @@ lib.makeOverridable (
         ]
         ++ optionals withRust [
           rustc
-          rust-bindgen
+          rust-bindgen.unwrapped
         ];
 
         RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
@@ -531,20 +531,14 @@ lib.makeOverridable (
         // extraMeta;
       };
 
-    # Absolute paths for compilers avoid any PATH-clobbering issues.
-    commonMakeFlags = [
-      "ARCH=${stdenv.hostPlatform.linuxArch}"
-      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-    ]
-    ++ lib.optionals (stdenv.isx86_64 && stdenv.cc.bintools.isLLVM) [
-      # The wrapper for ld.lld breaks linking the kernel. We use the
-      # unwrapped linker as workaround. See:
-      #
-      # https://github.com/NixOS/nixpkgs/issues/321667
-      "LD=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ld"
-    ]
-    ++ (stdenv.hostPlatform.linux-kernel.makeFlags or [ ])
-    ++ extraMakeFlags;
+    commonMakeFlags = import ./common-flags.nix {
+      inherit
+        lib
+        stdenv
+        buildPackages
+        extraMakeFlags
+        ;
+    };
   in
 
   stdenv.mkDerivation (

From c2420281d2c015ddbc3e14d0b5b19174f684dbd7 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <julian.stecklina@cyberus-technology.de>
Date: Sat, 26 Apr 2025 21:27:02 -0700
Subject: [PATCH 0282/3724] linux: verify basic configuration sanity

Co-authored-by: Tristan Ross <tristan.ross@midstall.com>
---
 pkgs/os-specific/linux/kernel/generic.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index e98229c7e1d4..11d7450a7e65 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -236,6 +236,24 @@ let
             KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \
             PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. MAKE_FLAGS="$makeFlags" \
             perl -w $generateConfig
+        ''
+        + lib.optionalString stdenv.cc.isClang ''
+          if ! grep -Fq CONFIG_CC_IS_CLANG=y $buildRoot/.config; then
+            echo "Kernel config didn't recognize the clang compiler?"
+            exit 1
+          fi
+        ''
+        + lib.optionalString stdenv.cc.bintools.isLLVM ''
+          if ! grep -Fq CONFIG_LD_IS_LLD=y $buildRoot/.config; then
+            echo "Kernel config didn't recognize the LLVM linker?"
+            exit 1
+          fi
+        ''
+        + lib.optionalString withRust ''
+          if ! grep -Fq CONFIG_RUST_IS_AVAILABLE=y $buildRoot/.config; then
+            echo "Kernel config didn't find Rust toolchain?"
+            exit 1
+          fi
         '';
 
         installPhase = "mv $buildRoot/.config $out";

From 86af86bd52d4af29f5f0633f42b2881514603b9b Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 13 Jun 2025 09:44:00 -0700
Subject: [PATCH 0283/3724] llvmPackages_20: 20.1.6 -> 20.1.8

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

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 2721bf24f56f..6762b272409d 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -31,7 +31,7 @@ let
     "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
     "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
-    "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
+    "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
     "21.1.0-rc1".officialRelease.sha256 = "sha256-EZMG3kNqGTvKSuvslbrtNnyqBCG5C2gN9Y2qHbiuh8Q=";
     "22.0.0-git".gitRelease = {
       rev = "f3a3270dbca3649b7d56aaa42cb8481fb34e2d67";

From 53e8ad37578005290b7a7e5376b99c902978e40a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Sat, 26 Jul 2025 22:37:52 +0200
Subject: [PATCH 0284/3724] haskellPackages.agda2hs: fix build with Agda 2.8.0

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
---
 .../haskell-modules/configuration-common.nix       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9f076876ae7b..4d345073e5b2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2953,6 +2953,20 @@ with haskellLib;
   # https://github.com/snoyberg/http-client/pull/563
   http-client-tls = doJailbreak super.http-client-tls;
 
+  # agda2hs 1.3 is not compatible with Agda 2.8.0
+  agda2hs = lib.pipe super.agda2hs [
+    (warnAfterVersion "1.3")
+    (overrideSrc {
+      version = "1.3-unstable-2025-07-25";
+      src = pkgs.fetchFromGitHub {
+        owner = "agda";
+        repo = "agda2hs";
+        rev = "01cc0532b522f64223782617cbde1a6f21b8880e";
+        hash = "sha256-SXhnkZa8OmgpYRTb2IVTfebtX+GG5mkVcqKchl2Noic=";
+      };
+    })
+  ];
+
   bsb-http-chunked = lib.pipe super.bsb-http-chunked [
     (warnAfterVersion "0.0.0.4")
     # Last released in 2018

From 196eb5312974580e085ffaf3eabc5393e4eb4c67 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 28 Jul 2025 12:31:35 +0200
Subject: [PATCH 0285/3724] kexec-tools: Only force ELFv2 on ppc64 when the
 platform settings aggree

Fixes building for ELFv1.
---
 pkgs/by-name/ke/kexec-tools/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ke/kexec-tools/package.nix b/pkgs/by-name/ke/kexec-tools/package.nix
index 13d3f55f1f40..9c32fb24d70d 100644
--- a/pkgs/by-name/ke/kexec-tools/package.nix
+++ b/pkgs/by-name/ke/kexec-tools/package.nix
@@ -23,17 +23,19 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    # Use ELFv2 ABI on ppc64be
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/void-linux/void-packages/6c1192cbf166698932030c2e3de71db1885a572d/srcpkgs/kexec-tools/patches/ppc64-elfv2.patch";
-      sha256 = "19wzfwb0azm932v0vhywv4221818qmlmvdfwpvvpfyw4hjsc2s1l";
-    })
     # Fix for static builds, will likely be removable on the next release
     (fetchpatch {
       url = "https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/patch/?id=daa29443819d3045338792b5ba950ed90e79d7a5";
       hash = "sha256-Nq5HIcLY6KSvvrs2sbfE/vovMbleJYElHW9AVRU5rSA=";
     })
   ]
+  ++ lib.optionals (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isAbiElfv2) [
+    # Use ELFv2 ABI on ppc64be
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/void-linux/void-packages/6c1192cbf166698932030c2e3de71db1885a572d/srcpkgs/kexec-tools/patches/ppc64-elfv2.patch";
+      sha256 = "19wzfwb0azm932v0vhywv4221818qmlmvdfwpvvpfyw4hjsc2s1l";
+    })
+  ]
   ++ lib.optional (stdenv.hostPlatform.useLLVM or false) ./fix-purgatory-llvm-libunwind.patch;
 
   hardeningDisable = [

From a6117acd6b61bd8075a3b9aeca52b0cf07a624b7 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 26 Jul 2025 23:16:53 +0200
Subject: [PATCH 0286/3724] haskellPackages.haskell-pgmq: provide
 postgresql+pgmq for tests

---
 .../haskell-modules/configuration-nix.nix            | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 5c5a46e167f5..fe1aa3fa7cec 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1144,6 +1144,18 @@ builtins.intersectAttrs super {
     ];
   }) super.relocant;
 
+  # https://gitlab.iscpif.fr/gargantext/haskell-pgmq/blob/9a869df2842eccc86a0f31a69fb8dc5e5ca218a8/README.md#running-test-cases
+  haskell-pgmq = overrideCabal (drv: {
+    env = drv.env or { } // {
+      postgresqlEnableTCP = toString true;
+    };
+    testToolDepends = drv.testToolDepends or [ ] ++ [
+      # otherwise .dev gets selected?!
+      (lib.getBin (pkgs.postgresql.withPackages (ps: [ ps.pgmq ])))
+      pkgs.postgresqlTestHook
+    ];
+  }) super.haskell-pgmq;
+
   retrie = addTestToolDepends [ pkgs.git pkgs.mercurial ] super.retrie;
   retrie_1_2_0_0 = addTestToolDepends [ pkgs.git pkgs.mercurial ] super.retrie_1_2_0_0;
   retrie_1_2_1_1 = addTestToolDepends [ pkgs.git pkgs.mercurial ] super.retrie_1_2_1_1;

From 54ba7d3e483f790ff0b4d092b2b4a0010b18b336 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 26 Jul 2025 23:23:16 +0200
Subject: [PATCH 0287/3724] haskellPackages.haskell-bee-redis: provide redis
 for tests

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index fe1aa3fa7cec..31f166460958 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1156,6 +1156,13 @@ builtins.intersectAttrs super {
     ];
   }) super.haskell-pgmq;
 
+  # https://gitlab.iscpif.fr/gargantext/haskell-bee/blob/19c8775f0d960c669235bf91131053cb6f69a1c1/README.md#redis
+  haskell-bee-redis = overrideCabal (drv: {
+    testToolDepends = drv.testToolDepends or [ ] ++ [
+      pkgs.redisTestHook
+    ];
+  }) super.haskell-bee-redis;
+
   retrie = addTestToolDepends [ pkgs.git pkgs.mercurial ] super.retrie;
   retrie_1_2_0_0 = addTestToolDepends [ pkgs.git pkgs.mercurial ] super.retrie_1_2_0_0;
   retrie_1_2_1_1 = addTestToolDepends [ pkgs.git pkgs.mercurial ] super.retrie_1_2_1_1;

From 9ec35680798a236a3dd1eed984c79dcd26f6498d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 28 Jul 2025 14:19:45 +0200
Subject: [PATCH 0288/3724] python3Packages.rich: 14.0.0 -> 14.1.0

https://github.com/Textualize/rich/blob/v14.1.0/CHANGELOG.md
---
 .../python-modules/rich/default.nix           | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index 6e381290a19a..fda066f3b813 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   poetry-core,
@@ -10,7 +9,6 @@
   # dependencies
   markdown-it-py,
   pygments,
-  typing-extensions,
 
   # optional-dependencies
   ipywidgets,
@@ -29,16 +27,14 @@
 
 buildPythonPackage rec {
   pname = "rich";
-  version = "14.0.0";
+  version = "14.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "rich";
     tag = "v${version}";
-    hash = "sha256-gnKzb4lw4zgepTfJahHnpw2/vcg8o1kv8KfeVDSHcQI=";
+    hash = "sha256-44L3eVf/gI0FlOlxzJ7/+A1jN6ILkeVEelaru1Io20U=";
   };
 
   build-system = [ poetry-core ];
@@ -46,8 +42,7 @@ buildPythonPackage rec {
   dependencies = [
     markdown-it-py
     pygments
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
+  ];
 
   optional-dependencies = {
     jupyter = [ ipywidgets ];
@@ -59,14 +54,6 @@ buildPythonPackage rec {
     which
   ];
 
-  disabledTests = [
-    # pygments 2.19 regressions
-    # https://github.com/Textualize/rich/issues/3612
-    "test_inline_code"
-    "test_blank_lines"
-    "test_python_render_simple_indent_guides"
-  ];
-
   pythonImportsCheck = [ "rich" ];
 
   passthru.tests = {

From 7568d3cb493a37a13a8c307814985314fcbd9cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 28 Jul 2025 15:19:24 +0200
Subject: [PATCH 0289/3724] open-vm-tools: convert sed to substituteInPlace
 --replace-fail

---
 pkgs/by-name/op/open-vm-tools/package.nix | 31 +++++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix
index d038aa0f1ced..626934935e04 100644
--- a/pkgs/by-name/op/open-vm-tools/package.nix
+++ b/pkgs/by-name/op/open-vm-tools/package.nix
@@ -107,26 +107,29 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = ''
-    sed -i Makefile.am \
-      -e 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,'
-    sed -i scripts/Makefile.am \
-      -e 's,^confdir = ,confdir = ''${prefix},' \
-      -e 's,usr/bin,''${prefix}/usr/bin,'
-    sed -i services/vmtoolsd/Makefile.am \
-      -e 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' \
-      -e 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),'
-    sed -i vgauth/service/Makefile.am \
-      -e 's,/etc/vmware-tools/vgauth/schemas,''${prefix}/etc/vmware-tools/vgauth/schemas,' \
-      -e 's,$(DESTDIR)/etc/vmware-tools/vgauth.conf,''${prefix}/etc/vmware-tools/vgauth.conf,'
+    substituteInPlace Makefile.am \
+      --replace-fail "etc/vmware-tools" "''${prefix}/etc/vmware-tools"
+    substituteInPlace scripts/Makefile.am \
+      --replace-fail "confdir = /etc/vmware-tools" "confdir = ''${prefix}/etc/vmware-tools" \
+      --replace-fail "/usr/bin" "''${prefix}/usr/bin"
+    substituteInPlace services/vmtoolsd/Makefile.am \
+      --replace-fail "etc/vmware-tools" "''${prefix}/etc/vmware-tools" \
+      --replace-fail "\$(PAM_PREFIX)" "''${prefix}/\$(PAM_PREFIX)"
+    substituteInPlace vgauth/service/Makefile.am \
+      --replace-fail "/etc/vmware-tools/vgauth/schemas" "''${prefix}/etc/vmware-tools/vgauth/schemas" \
+      --replace-fail "\$(DESTDIR)/etc/vmware-tools/vgauth.conf" "''${prefix}/etc/vmware-tools/vgauth.conf"
 
     # don't abort on any warning
-    sed -i 's,CFLAGS="$CFLAGS -Werror",,' configure.ac
+    substituteInPlace configure.ac \
+      --replace-fail 'CFLAGS="$CFLAGS -Werror"' ""
 
     # Make reboot work, shutdown is not in /sbin on NixOS
-    sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c
+    substituteInPlace lib/system/systemLinux.c \
+      --replace-fail "/sbin/shutdown" "shutdown"
 
     # Fix paths to fuse3 (we do not use fuse2 so that is not modified)
-    sed -i 's,/bin/fusermount3,${fuse3}/bin/fusermount3,' vmhgfs-fuse/config.c
+    substituteInPlace vmhgfs-fuse/config.c \
+      --replace-fail "/bin/fusermount3" "${fuse3}/bin/fusermount3"
 
     substituteInPlace services/plugins/vix/foundryToolsDaemon.c \
      --replace-fail "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \

From db9bcba7f81acb1f1ab6ad47c7eca5125352a7fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 14:28:54 +0000
Subject: [PATCH 0290/3724] python3Packages.dtlssocket: 0.2.2 -> 0.2.3

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

diff --git a/pkgs/development/python-modules/dtlssocket/default.nix b/pkgs/development/python-modules/dtlssocket/default.nix
index a9810c51cb07..699032aee4e1 100644
--- a/pkgs/development/python-modules/dtlssocket/default.nix
+++ b/pkgs/development/python-modules/dtlssocket/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "dtlssocket";
-  version = "0.2.2";
+  version = "0.2.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TnbXFXJuDEbcCeNdqbZxewY8I4mwbBcj3sw7o4tzh/Q=";
+    hash = "sha256-8Gy+Mt+FYtu8y+J0qvJ9J3PoSSqGxBwzSzoKcKUAN88=";
   };
 
   build-system = [

From d99faf6a26163fce2646aef7fe0988b540cc2830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 28 Jul 2025 15:20:39 +0200
Subject: [PATCH 0291/3724] open-vm-tools: fix dlopen path to
 libguestStoreClient.so.0

Jul 28 14:52:27 krypton vmsvc[733]: [critical] [guestStoreClient] [733] GuestStoreGetLibExportFunctions: dlopen failed: libguestStoreClient.so.0: cannot open shared object file: No such file or directory
---
 pkgs/by-name/op/open-vm-tools/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix
index 626934935e04..64cd802b6c33 100644
--- a/pkgs/by-name/op/open-vm-tools/package.nix
+++ b/pkgs/by-name/op/open-vm-tools/package.nix
@@ -134,6 +134,9 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace services/plugins/vix/foundryToolsDaemon.c \
      --replace-fail "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \
      --replace-fail "/bin/mount" "${util-linux}/bin/mount"
+
+    substituteInPlace lib/guestStoreClientHelper/guestStoreClient.c \
+      --replace-fail "libguestStoreClient.so.0" "$out/lib/libguestStoreClient.so.0"
   '';
 
   configureFlags = [

From eafd3478090b325150fac22f775def127904bae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 28 Jul 2025 15:55:19 +0200
Subject: [PATCH 0292/3724] open-vm-tools: move patching to postPatch

---
 pkgs/by-name/op/open-vm-tools/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix
index 64cd802b6c33..c4774f371a8f 100644
--- a/pkgs/by-name/op/open-vm-tools/package.nix
+++ b/pkgs/by-name/op/open-vm-tools/package.nix
@@ -137,6 +137,9 @@ stdenv.mkDerivation (finalAttrs: {
 
     substituteInPlace lib/guestStoreClientHelper/guestStoreClient.c \
       --replace-fail "libguestStoreClient.so.0" "$out/lib/libguestStoreClient.so.0"
+
+    substituteInPlace udev/99-vmware-scsi-udev.rules \
+      --replace-fail "/bin/sh" "${bash}/bin/sh"
   '';
 
   configureFlags = [
@@ -164,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
           which
         ]
       }"
-    substituteInPlace "$out/lib/udev/rules.d/99-vmware-scsi-udev.rules" --replace-fail "/bin/sh" "${bash}/bin/sh"
+
   '';
 
   meta = {

From 1443de732a005a4f24d81cb149c0eaa506a6d91c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 26 Jul 2025 07:00:26 +0100
Subject: [PATCH 0293/3724] qemu: 10.0.2 -> 10.0.3

Changes: https://lists.nongnu.org/archive/html/qemu-devel/2025-07/msg05540.html
---
 pkgs/applications/virtualization/qemu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index e37809a8e6f5..d8fc613e2f85 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -144,11 +144,11 @@ stdenv.mkDerivation (finalAttrs: {
     + lib.optionalString nixosTestRunner "-for-vm-tests"
     + lib.optionalString toolsOnly "-utils"
     + lib.optionalString userOnly "-user";
-  version = "10.0.2";
+  version = "10.0.3";
 
   src = fetchurl {
     url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";
-    hash = "sha256-73hvI5jLUYRgD2mu9NXWke/URXajz/QSbTjUxv7Id1k=";
+    hash = "sha256-XIkSZ7FTSndEZduLGg38sMXm1+y29xNFYlrfTgiJlFs=";
   };
 
   depsBuildBuild = [

From 09a11ee4725f0496e093a0c8735fd9a8e642621b Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Mon, 28 Jul 2025 21:46:35 +0300
Subject: [PATCH 0294/3724] nixVersions.nix_2_3: Remove aws support

---
 .../nix/common-autoconf.nix                   |   4 +-
 pkgs/tools/package-management/nix/default.nix |   6 +-
 .../package-management/nix/dependencies.nix   |  66 ---------
 ...-cpp-TransferManager-ContentEncoding.patch | 127 ------------------
 4 files changed, 4 insertions(+), 199 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix/patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch

diff --git a/pkgs/tools/package-management/nix/common-autoconf.nix b/pkgs/tools/package-management/nix/common-autoconf.nix
index 6f9b4fef5747..5f330ea6bee5 100644
--- a/pkgs/tools/package-management/nix/common-autoconf.nix
+++ b/pkgs/tools/package-management/nix/common-autoconf.nix
@@ -21,6 +21,7 @@
 }@args:
 assert (hash == null) -> (src != null);
 let
+  atLeast24 = lib.versionAtLeast version "2.4";
   atLeast224 = lib.versionAtLeast version "2.24pre";
   atLeast225 = lib.versionAtLeast version "2.25pre";
 in
@@ -75,7 +76,8 @@ in
   withAWS ?
     lib.meta.availableOn stdenv.hostPlatform aws-c-common
     && !enableStatic
-    && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin),
+    && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin)
+    && atLeast24,
   aws-c-common,
   aws-sdk-cpp,
   withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp,
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 4af9ac7f772b..033c560aa01c 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -29,11 +29,7 @@ let
           stateDir
           confDir
           ;
-        aws-sdk-cpp =
-          if lib.versionAtLeast args.version "2.12pre" then
-            nixDependencies.aws-sdk-cpp
-          else
-            nixDependencies.aws-sdk-cpp-old;
+        inherit (nixDependencies) aws-sdk-cpp;
       };
 
   # Called for Nix == 2.28. Transitional until we always use
diff --git a/pkgs/tools/package-management/nix/dependencies.nix b/pkgs/tools/package-management/nix/dependencies.nix
index cf3312d74779..a00078939ab7 100644
--- a/pkgs/tools/package-management/nix/dependencies.nix
+++ b/pkgs/tools/package-management/nix/dependencies.nix
@@ -9,72 +9,6 @@ regular@{
 {
   scopeFunction = scope: {
     boehmgc = regular.boehmgc.override { enableLargeConfig = true; };
-
-    # old nix fails to build with newer aws-sdk-cpp and the patch doesn't apply
-    aws-sdk-cpp-old =
-      (regular.aws-sdk-cpp.override {
-        apis = [
-          "s3"
-          "transfer"
-        ];
-        customMemoryManagement = false;
-      }).overrideAttrs
-        (args: rec {
-          # intentionally overriding postPatch
-          version = "1.9.294";
-
-          src = fetchFromGitHub {
-            owner = "aws";
-            repo = "aws-sdk-cpp";
-            rev = version;
-            hash = "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g=";
-          };
-          postPatch = ''
-            # Avoid blanket -Werror to evade build failures on less
-            # tested compilers.
-            substituteInPlace cmake/compiler_settings.cmake \
-              --replace '"-Werror"' ' '
-
-            # Missing includes for GCC11
-            sed '5i#include <thread>' -i \
-              aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp \
-              aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp \
-              aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp \
-              aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp \
-              aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp \
-              aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp \
-              aws-cpp-sdk-queues/source/sqs/SQSQueue.cpp \
-              aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp \
-              aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp \
-              aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp \
-              aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp \
-              aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp \
-              aws-cpp-sdk-transfer-tests/TransferTests.cpp
-            # Flaky on Hydra
-            rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
-            # Includes aws-c-auth private headers, so only works with submodule build
-            rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp
-            # TestRandomURLMultiThreaded fails
-            rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp
-          ''
-          + lib.optionalString aws-sdk-cpp.stdenv.hostPlatform.isi686 ''
-            # EPSILON is exceeded
-            rm aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp
-          '';
-
-          patches = (args.patches or [ ]) ++ [ ./patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch ];
-
-          # only a stripped down version is build which takes a lot less resources to build
-          requiredSystemFeatures = [ ];
-          meta = args.meta // {
-            description = "C++ interface for Amazon Web Services (Old version)";
-            # The aws packages got updated and are no longer compatible with this old version.
-            # If someone wants to fix it then start with the patch here
-            # https://github.com/NixOS/nixpkgs/pull/428410#issuecomment-3121681782
-            broken = true;
-          };
-        });
-
     aws-sdk-cpp =
       (regular.aws-sdk-cpp.override {
         apis = [
diff --git a/pkgs/tools/package-management/nix/patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch b/pkgs/tools/package-management/nix/patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch
deleted file mode 100644
index 59cc305a60bc..000000000000
--- a/pkgs/tools/package-management/nix/patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 7d58e303159b2fb343af9a1ec4512238efa147c7 Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <edolstra@gmail.com>
-Date: Mon, 6 Aug 2018 17:15:04 +0200
-Subject: [PATCH] TransferManager: Allow setting a content-encoding for S3 uploads
-
---- a/aws-cpp-sdk-transfer/include/aws/transfer/TransferHandle.h
-+++ b/aws-cpp-sdk-transfer/include/aws/transfer/TransferHandle.h
-@@ -297,6 +297,14 @@ namespace Aws
-              * Content type of the object being transferred
-              */
-             inline void SetContentType(const Aws::String& value) { std::lock_guard<std::mutex> locker(m_getterSetterLock); m_contentType = value; }
-+            /**
-+             * Content encoding of the object being transferred
-+             */
-+            inline const Aws::String GetContentEncoding() const { std::lock_guard<std::mutex> locker(m_getterSetterLock); return m_contentEncoding; }
-+            /**
-+             * Content type of the object being transferred
-+             */
-+            inline void SetContentEncoding(const Aws::String& value) { std::lock_guard<std::mutex> locker(m_getterSetterLock); m_contentEncoding = value; }
-             /**
-              * In case of an upload, this is the metadata that was placed on the object when it was uploaded.
-              * In the case of a download, this is the object metadata from the GetObject operation.
-@@ -383,6 +391,7 @@ namespace Aws
-             Aws::String m_key;
-             Aws::String m_fileName;
-             Aws::String m_contentType;
-+            Aws::String m_contentEncoding;
-             Aws::String m_versionId;
-             Aws::Map<Aws::String, Aws::String> m_metadata;
-             TransferStatus m_status;
---- a/aws-cpp-sdk-transfer/include/aws/transfer/TransferManager.h
-+++ b/aws-cpp-sdk-transfer/include/aws/transfer/TransferManager.h
-@@ -154,7 +154,8 @@ namespace Aws
-                                                        const Aws::String& keyName,
-                                                        const Aws::String& contentType, 
-                                                        const Aws::Map<Aws::String, Aws::String>& metadata,
--                                                       const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr);
-+                                                       const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr,
-+                                                       const Aws::String& contentEncoding = "");
- 
-             /**
-              * Downloads the contents of bucketName/keyName in S3 to the file specified by writeToFile. This will perform a GetObject operation.
-@@ -246,7 +247,8 @@ namespace Aws
-                                                                    const Aws::Map<Aws::String,
-                                                                    Aws::String>& metadata,
-                                                                    const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context,
--                                                                   const Aws::String& fileName = "");
-+                                                                   const Aws::String& fileName = "",
-+                                                                   const Aws::String& contentEncoding = "");
- 
-             /**
-              * Submits the actual task to task schecduler
-@@ -262,7 +264,8 @@ namespace Aws
-                                                          const Aws::String& keyName,
-                                                          const Aws::String& contentType,
-                                                          const Aws::Map<Aws::String, Aws::String>& metadata,
--                                                         const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context);
-+                                                         const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context,
-+                                                         const Aws::String& contentEncoding);
- 
-             /**
-              * Uploads the contents of file, to bucketName/keyName in S3. contentType and metadata will be added to the object. If the object is larger than the configured bufferSize,
---- a/aws-cpp-sdk-transfer/source/transfer/TransferManager.cpp
-+++ b/aws-cpp-sdk-transfer/source/transfer/TransferManager.cpp
-@@ -87,9 +87,10 @@ namespace Aws
-                                                                     const Aws::String& bucketName,
-                                                                     const Aws::String& keyName, const Aws::String& contentType,
-                                                                     const Aws::Map<Aws::String, Aws::String>& metadata,
--                                                                    const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context)
-+                                                                    const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context,
-+                                                                    const Aws::String& contentEncoding)
-         {
--            return this->DoUploadFile(fileStream, bucketName, keyName, contentType, metadata, context);
-+            return this->DoUploadFile(fileStream, bucketName, keyName, contentType, metadata, context, contentEncoding);
-         }
- 
-         std::shared_ptr<TransferHandle> TransferManager::DownloadFile(const Aws::String& bucketName,
-@@ -286,6 +287,9 @@ namespace Aws
-                 createMultipartRequest.WithKey(handle->GetKey());
-                 createMultipartRequest.WithMetadata(handle->GetMetadata());
- 
-+                if (handle->GetContentEncoding() != "")
-+                    createMultipartRequest.WithContentEncoding(handle->GetContentEncoding());
-+
-                 auto createMultipartResponse = m_transferConfig.s3Client->CreateMultipartUpload(createMultipartRequest);
-                 if (createMultipartResponse.IsSuccess())
-                 {
-@@ -441,6 +445,9 @@ namespace Aws
- 
-             putObjectRequest.SetContentType(handle->GetContentType());
- 
-+            if (handle->GetContentEncoding() != "")
-+                putObjectRequest.SetContentEncoding(handle->GetContentEncoding());
-+
-             auto buffer = m_bufferManager.Acquire();
- 
-             auto lengthToWrite = (std::min)(m_transferConfig.bufferSize, handle->GetBytesTotalSize());
-@@ -1140,12 +1147,15 @@ namespace Aws
-                                                                                 const Aws::String& contentType,
-                                                                                 const Aws::Map<Aws::String, Aws::String>& metadata,
-                                                                                 const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context,
--                                                                                const Aws::String& fileName)
-+                                                                                const Aws::String& fileName,
-+                                                                                const Aws::String& contentEncoding)
-         {
-             auto handle = Aws::MakeShared<TransferHandle>(CLASS_TAG, bucketName, keyName, 0, fileName);
-             handle->SetContentType(contentType);
-             handle->SetMetadata(metadata);
-             handle->SetContext(context);
-+            if (contentEncoding != "")
-+                handle->SetContentEncoding(contentEncoding);
- 
-             if (!fileStream->good())
-             {
-@@ -1213,9 +1223,10 @@ namespace Aws
-                                                                       const Aws::String& keyName,
-                                                                       const Aws::String& contentType,
-                                                                       const Aws::Map<Aws::String, Aws::String>& metadata,
--                                                                      const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context)
-+                                                                      const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context,
-+                                                                      const Aws::String& contentEncoding)
-         {
--            auto handle = CreateUploadFileHandle(fileStream.get(), bucketName, keyName, contentType, metadata, context);
-+            auto handle = CreateUploadFileHandle(fileStream.get(), bucketName, keyName, contentType, metadata, context, "", contentEncoding);
-             return SubmitUpload(handle, fileStream);
-         }
- 

From 8a815d62904bccd18554602486e27b1b17367069 Mon Sep 17 00:00:00 2001
From: n0099 <n@n0099.net>
Date: Mon, 28 Jul 2025 19:02:56 +0000
Subject: [PATCH 0295/3724] doc: fix link rot to `--keep-failed` in stdenv

---
 doc/stdenv/stdenv.chapter.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md
index 9cebd8818d03..f36f3a306adc 100644
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@@ -166,7 +166,7 @@ The following is a non-exhaustive list of such differences:
 - Other environment variables may be inconsistent with a `nix-build` either due to `nix-shell`'s initialization script or due to the use of `nix-shell` without the `--pure` option.
 
 If the build fails differently inside the shell than in the sandbox, consider using [`breakpointHook`](#breakpointhook) and invoking `nix-build` instead.
-The [`--keep-failed`](https://nixos.org/manual/nix/unstable/command-ref/conf-file#opt--keep-failed) option for `nix-build` may also be useful to examine the build directory of a failed build.
+The [`--keep-failed`](https://nixos.org/manual/nix/unstable/command-ref/conf-file#conf-keep-failed) option for `nix-build` may also be useful to examine the build directory of a failed build.
 :::
 
 ## Tools provided by `stdenv` {#sec-tools-of-stdenv}

From 4a550833a91f632d1486d0be4bfd8d4136d995a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 00:58:13 +0000
Subject: [PATCH 0296/3724] ipopt: 3.14.17 -> 3.14.18

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

diff --git a/pkgs/by-name/ip/ipopt/package.nix b/pkgs/by-name/ip/ipopt/package.nix
index 13b083cb7eb8..278de6699761 100644
--- a/pkgs/by-name/ip/ipopt/package.nix
+++ b/pkgs/by-name/ip/ipopt/package.nix
@@ -19,13 +19,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation rec {
   pname = "ipopt";
-  version = "3.14.17";
+  version = "3.14.18";
 
   src = fetchFromGitHub {
     owner = "coin-or";
     repo = "Ipopt";
     rev = "releases/${version}";
-    sha256 = "sha256-0IRHryADQArhhtfbQjCy+EDvVRi/ywc51IwiQOfWlR4=";
+    sha256 = "sha256-Tifw0awNLiJrWhMF61O2VW85I3eVxDChkod5avAV6zA=";
   };
 
   CXXDEFS = [

From 2dee29888f4022b8017dbe29b37cb5155c859f51 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 26 May 2025 14:48:51 +0300
Subject: [PATCH 0297/3724] teleport: migrate to new buildTeleport

This facilitates using different Go and wasm-bindgen-cli versions more
easily, which will be needed for the new teleport_18 version.
---
 .../0001-fix-add-nix-path-to-exec-env.patch   |   0
 pkgs/build-support/teleport/default.nix       | 215 ++++++++++++++++++
 .../disable-wasm-opt-for-ironrdp.patch        |   0
 .../teleport/rdpclient.patch                  |   0
 .../te => build-support}/teleport/tsh.patch   |   0
 pkgs/by-name/te/teleport/package.nix          | 211 +----------------
 pkgs/by-name/te/teleport_16/package.nix       |   9 +-
 pkgs/by-name/te/teleport_17/package.nix       |  16 +-
 pkgs/top-level/all-packages.nix               |   2 +
 9 files changed, 240 insertions(+), 213 deletions(-)
 rename pkgs/{by-name/te => build-support}/teleport/0001-fix-add-nix-path-to-exec-env.patch (100%)
 create mode 100644 pkgs/build-support/teleport/default.nix
 rename pkgs/{by-name/te => build-support}/teleport/disable-wasm-opt-for-ironrdp.patch (100%)
 rename pkgs/{by-name/te => build-support}/teleport/rdpclient.patch (100%)
 rename pkgs/{by-name/te => build-support}/teleport/tsh.patch (100%)

diff --git a/pkgs/by-name/te/teleport/0001-fix-add-nix-path-to-exec-env.patch b/pkgs/build-support/teleport/0001-fix-add-nix-path-to-exec-env.patch
similarity index 100%
rename from pkgs/by-name/te/teleport/0001-fix-add-nix-path-to-exec-env.patch
rename to pkgs/build-support/teleport/0001-fix-add-nix-path-to-exec-env.patch
diff --git a/pkgs/build-support/teleport/default.nix b/pkgs/build-support/teleport/default.nix
new file mode 100644
index 000000000000..c44c320addee
--- /dev/null
+++ b/pkgs/build-support/teleport/default.nix
@@ -0,0 +1,215 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchpatch,
+  makeWrapper,
+  binaryen,
+  cargo,
+  libfido2,
+  nodejs,
+  openssl,
+  pkg-config,
+  pnpm_10,
+  rustc,
+  stdenv,
+  xdg-utils,
+  wasm-pack,
+  nixosTests,
+}:
+
+{
+  version,
+  hash,
+  cargoHash,
+  pnpmHash,
+  vendorHash,
+  wasm-bindgen-cli,
+  buildGoModule,
+
+  withRdpClient ? true,
+  extPatches ? [ ],
+}:
+let
+
+  # This repo has a private submodule "e" which fetchgit cannot handle without failing.
+  src = fetchFromGitHub {
+    owner = "gravitational";
+    repo = "teleport";
+    tag = "v${version}";
+    inherit hash;
+  };
+  pname = "teleport";
+  inherit version;
+
+  rdpClient = rustPlatform.buildRustPackage (finalAttrs: {
+    pname = "teleport-rdpclient";
+    inherit cargoHash;
+    inherit version src;
+
+    buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient";
+
+    buildInputs = [ openssl ];
+    nativeBuildInputs = [ pkg-config ];
+
+    # https://github.com/NixOS/nixpkgs/issues/161570 ,
+    # buildRustPackage sets strictDeps = true;
+    nativeCheckInputs = finalAttrs.buildInputs;
+
+    OPENSSL_NO_VENDOR = "1";
+
+    postInstall = ''
+      mkdir -p $out/include
+      cp ${finalAttrs.buildAndTestSubdir}/librdprs.h $out/include/
+    '';
+  });
+
+  webassets = stdenv.mkDerivation {
+    pname = "teleport-webassets";
+    inherit src version;
+
+    cargoDeps = rustPlatform.fetchCargoVendor {
+      inherit src;
+      hash = cargoHash;
+    };
+
+    pnpmDeps = pnpm_10.fetchDeps {
+      inherit src pname version;
+      fetcherVersion = 1;
+      hash = pnpmHash;
+    };
+
+    nativeBuildInputs = [
+      binaryen
+      cargo
+      nodejs
+      pnpm_10.configHook
+      rustc
+      rustc.llvmPackages.lld
+      rustPlatform.cargoSetupHook
+      wasm-bindgen-cli
+      wasm-pack
+    ];
+
+    patches = [
+      ./disable-wasm-opt-for-ironrdp.patch
+    ];
+
+    configurePhase = ''
+      runHook preConfigure
+
+      export HOME=$(mktemp -d)
+
+      runHook postConfigure
+    '';
+
+    buildPhase = ''
+      PATH=$PATH:$PWD/node_modules/.bin
+
+      pushd web/packages
+      pushd shared
+      # https://github.com/gravitational/teleport/blob/6b91fe5bbb9e87db4c63d19f94ed4f7d0f9eba43/web/packages/teleport/README.md?plain=1#L18-L20
+      RUST_MIN_STACK=16777216 wasm-pack build ./libs/ironrdp --target web --mode no-install
+      popd
+      pushd teleport
+      vite build
+      popd
+      popd
+    '';
+
+    installPhase = ''
+      mkdir -p $out
+      cp -R webassets/. $out
+    '';
+  };
+in
+buildGoModule (finalAttrs: {
+  inherit pname src version;
+  inherit vendorHash;
+  proxyVendor = true;
+
+  subPackages = [
+    "tool/tbot"
+    "tool/tctl"
+    "tool/teleport"
+    "tool/tsh"
+  ];
+  tags = [
+    "libfido2"
+    "webassets_embed"
+  ]
+  ++ lib.optional withRdpClient "desktop_access_rdp";
+
+  buildInputs = [
+    openssl
+    libfido2
+  ];
+  nativeBuildInputs = [
+    makeWrapper
+    pkg-config
+  ];
+
+  patches = extPatches ++ [
+    ./0001-fix-add-nix-path-to-exec-env.patch
+    ./rdpclient.patch
+    ./tsh.patch
+  ];
+
+  # Reduce closure size for client machines
+  outputs = [
+    "out"
+    "client"
+  ];
+
+  preBuild = ''
+    cp -r ${webassets} webassets
+  ''
+  + lib.optionalString withRdpClient ''
+    ln -s ${rdpClient}/lib/* lib/
+    ln -s ${rdpClient}/include/* lib/srv/desktop/rdp/rdpclient/
+  '';
+
+  # Multiple tests fail in the build sandbox
+  # due to trying to spawn nixbld's shell (/noshell), etc.
+  doCheck = false;
+
+  postInstall = ''
+    mkdir -p $client/bin
+    mv {$out,$client}/bin/tsh
+    # make xdg-open overrideable at runtime
+    wrapProgram $client/bin/tsh --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
+    ln -s {$client,$out}/bin/tsh
+  '';
+
+  doInstallCheck = true;
+
+  installCheckPhase = ''
+    export HOME=$(mktemp -d)
+    $out/bin/tsh version | grep ${version} > /dev/null
+    $client/bin/tsh version | grep ${version} > /dev/null
+    $out/bin/tbot version | grep ${version} > /dev/null
+    $out/bin/tctl version | grep ${version} > /dev/null
+    $out/bin/teleport version | grep ${version} > /dev/null
+  '';
+
+  passthru.tests = nixosTests.teleport;
+
+  meta = {
+    description = "Certificate authority and access plane for SSH, Kubernetes, web applications, and databases";
+    homepage = "https://goteleport.com/";
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [
+      arianvp
+      justinas
+      sigma
+      tomberek
+      freezeboy
+      techknowlogick
+      juliusfreudenberger
+    ];
+    platforms = lib.platforms.unix;
+    # go-libfido2 is broken on platforms with less than 64-bit because it defines an array
+    # which occupies more than 31 bits of address space.
+    broken = stdenv.hostPlatform.parsed.cpu.bits < 64;
+  };
+})
diff --git a/pkgs/by-name/te/teleport/disable-wasm-opt-for-ironrdp.patch b/pkgs/build-support/teleport/disable-wasm-opt-for-ironrdp.patch
similarity index 100%
rename from pkgs/by-name/te/teleport/disable-wasm-opt-for-ironrdp.patch
rename to pkgs/build-support/teleport/disable-wasm-opt-for-ironrdp.patch
diff --git a/pkgs/by-name/te/teleport/rdpclient.patch b/pkgs/build-support/teleport/rdpclient.patch
similarity index 100%
rename from pkgs/by-name/te/teleport/rdpclient.patch
rename to pkgs/build-support/teleport/rdpclient.patch
diff --git a/pkgs/by-name/te/teleport/tsh.patch b/pkgs/build-support/teleport/tsh.patch
similarity index 100%
rename from pkgs/by-name/te/teleport/tsh.patch
rename to pkgs/build-support/teleport/tsh.patch
diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix
index e6f772045d2a..93697b54bc97 100644
--- a/pkgs/by-name/te/teleport/package.nix
+++ b/pkgs/by-name/te/teleport/package.nix
@@ -1,212 +1,5 @@
 {
-  lib,
-  buildGo123Module,
-  rustPlatform,
-  fetchFromGitHub,
-  fetchpatch,
-  makeWrapper,
-  binaryen,
-  cargo,
-  libfido2,
-  nodejs,
-  openssl,
-  pkg-config,
-  pnpm_10,
-  rustc,
-  stdenv,
-  xdg-utils,
-  wasm-bindgen-cli_0_2_95,
-  wasm-pack,
-  nixosTests,
-
-  withRdpClient ? true,
-
-  version ? "17.5.4",
-  hash ? "sha256-ojRIyPTrSG3/xuqdaUNrN4s5HP3E8pvzjG8h+qFEYrc=",
-  vendorHash ? "sha256-IHXwCp1MdcEKJhIs9DNf77Vd93Ai2as7ROlh6AJT9+Q=",
-  extPatches ? [ ],
-  cargoHash ? "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=",
-  pnpmHash ? "sha256-YwftGEQTEI8NvFTFLMJHhYkvaIIP9+bskCQCp5xuEtY=",
+  teleport_17,
 }:
-let
-  # This repo has a private submodule "e" which fetchgit cannot handle without failing.
-  src = fetchFromGitHub {
-    owner = "gravitational";
-    repo = "teleport";
-    rev = "v${version}";
-    inherit hash;
-  };
-  pname = "teleport";
-  inherit version;
 
-  rdpClient = rustPlatform.buildRustPackage (finalAttrs: {
-    pname = "teleport-rdpclient";
-
-    inherit cargoHash;
-    inherit version src;
-
-    buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient";
-
-    buildInputs = [ openssl ];
-    nativeBuildInputs = [ pkg-config ];
-
-    # https://github.com/NixOS/nixpkgs/issues/161570 ,
-    # buildRustPackage sets strictDeps = true;
-    nativeCheckInputs = finalAttrs.buildInputs;
-
-    OPENSSL_NO_VENDOR = "1";
-
-    postInstall = ''
-      mkdir -p $out/include
-      cp ${finalAttrs.buildAndTestSubdir}/librdprs.h $out/include/
-    '';
-  });
-
-  webassets = stdenv.mkDerivation {
-    pname = "teleport-webassets";
-    inherit src version;
-
-    cargoDeps = rustPlatform.fetchCargoVendor {
-      inherit src;
-      hash = cargoHash;
-    };
-
-    pnpmDeps = pnpm_10.fetchDeps {
-      inherit src pname version;
-      fetcherVersion = 1;
-      hash = pnpmHash;
-    };
-
-    nativeBuildInputs = [
-      binaryen
-      cargo
-      nodejs
-      pnpm_10.configHook
-      rustc
-      rustc.llvmPackages.lld
-      rustPlatform.cargoSetupHook
-      wasm-bindgen-cli_0_2_95
-      wasm-pack
-    ];
-
-    patches = [
-      ./disable-wasm-opt-for-ironrdp.patch
-    ];
-
-    configurePhase = ''
-      runHook preConfigure
-
-      export HOME=$(mktemp -d)
-
-      runHook postConfigure
-    '';
-
-    buildPhase = ''
-      PATH=$PATH:$PWD/node_modules/.bin
-
-      pushd web/packages
-      pushd shared
-      # https://github.com/gravitational/teleport/blob/6b91fe5bbb9e87db4c63d19f94ed4f7d0f9eba43/web/packages/teleport/README.md?plain=1#L18-L20
-      RUST_MIN_STACK=16777216 wasm-pack build ./libs/ironrdp --target web --mode no-install
-      popd
-      pushd teleport
-      vite build
-      popd
-      popd
-    '';
-
-    installPhase = ''
-      mkdir -p $out
-      cp -R webassets/. $out
-    '';
-  };
-in
-buildGo123Module (finalAttrs: {
-  inherit pname src version;
-  inherit vendorHash;
-  proxyVendor = true;
-
-  subPackages = [
-    "tool/tbot"
-    "tool/tctl"
-    "tool/teleport"
-    "tool/tsh"
-  ];
-  tags = [
-    "libfido2"
-    "webassets_embed"
-  ]
-  ++ lib.optional withRdpClient "desktop_access_rdp";
-
-  buildInputs = [
-    openssl
-    libfido2
-  ];
-  nativeBuildInputs = [
-    makeWrapper
-    pkg-config
-  ];
-
-  patches = extPatches ++ [
-    ./0001-fix-add-nix-path-to-exec-env.patch
-    ./rdpclient.patch
-    ./tsh.patch
-  ];
-
-  # Reduce closure size for client machines
-  outputs = [
-    "out"
-    "client"
-  ];
-
-  preBuild = ''
-    cp -r ${webassets} webassets
-  ''
-  + lib.optionalString withRdpClient ''
-    ln -s ${rdpClient}/lib/* lib/
-    ln -s ${rdpClient}/include/* lib/srv/desktop/rdp/rdpclient/
-  '';
-
-  # Multiple tests fail in the build sandbox
-  # due to trying to spawn nixbld's shell (/noshell), etc.
-  doCheck = false;
-
-  postInstall = ''
-    mkdir -p $client/bin
-    mv {$out,$client}/bin/tsh
-    # make xdg-open overrideable at runtime
-    wrapProgram $client/bin/tsh --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
-    ln -s {$client,$out}/bin/tsh
-  '';
-
-  doInstallCheck = true;
-
-  installCheckPhase = ''
-    $out/bin/tsh version | grep ${version} > /dev/null
-    $client/bin/tsh version | grep ${version} > /dev/null
-    $out/bin/tbot version | grep ${version} > /dev/null
-    $out/bin/tctl version | grep ${version} > /dev/null
-    $out/bin/teleport version | grep ${version} > /dev/null
-  '';
-
-  passthru.tests = nixosTests.teleport;
-
-  meta = {
-    description = "Certificate authority and access plane for SSH, Kubernetes, web applications, and databases";
-    homepage = "https://goteleport.com/";
-    license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [
-      arianvp
-      justinas
-      sigma
-      tomberek
-      freezeboy
-      techknowlogick
-      juliusfreudenberger
-    ];
-    platforms = lib.platforms.unix;
-    # go-libfido2 is broken on platforms with less than 64-bit because it defines an array
-    # which occupies more than 31 bits of address space.
-    broken = stdenv.hostPlatform.parsed.cpu.bits < 64;
-  };
-})
+teleport_17
diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix
index 62921b92b311..2ef76956122c 100644
--- a/pkgs/by-name/te/teleport_16/package.nix
+++ b/pkgs/by-name/te/teleport_16/package.nix
@@ -1,10 +1,15 @@
 {
-  teleport,
+  buildTeleport,
+  buildGo123Module,
+  wasm-bindgen-cli_0_2_95,
 }:
-teleport.override {
+buildTeleport rec {
   version = "16.5.13";
   hash = "sha256-X9Ujgvp+2dFCoku0tjGW4W05X8QrnExFE+H1kMhf91A=";
   vendorHash = "sha256-0+7xbIONnZs7dPpfpHPmep+k4XxQE8TS/eKz4F5a3V0=";
   pnpmHash = "sha256-waBzmNs20wbuoBDObVFnJjEYs3NJ/bzQksVz7ltMD7M=";
   cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";
+
+  wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
+  buildGoModule = buildGo123Module;
 }
diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix
index 9e9d580d4c33..68e642564971 100644
--- a/pkgs/by-name/te/teleport_17/package.nix
+++ b/pkgs/by-name/te/teleport_17/package.nix
@@ -1,4 +1,16 @@
 {
-  teleport,
+  buildTeleport,
+  buildGo123Module,
+  wasm-bindgen-cli_0_2_95,
 }:
-teleport
+
+buildTeleport rec {
+  version = "17.5.4";
+  hash = "sha256-ojRIyPTrSG3/xuqdaUNrN4s5HP3E8pvzjG8h+qFEYrc=";
+  vendorHash = "sha256-IHXwCp1MdcEKJhIs9DNf77Vd93Ai2as7ROlh6AJT9+Q=";
+  cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=";
+  pnpmHash = "sha256-YwftGEQTEI8NvFTFLMJHhYkvaIIP9+bskCQCp5xuEtY=";
+
+  wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
+  buildGoModule = buildGo123Module;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8aac496ba84..f4d505ba3ddc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4437,6 +4437,8 @@ with pkgs;
 
   teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };
 
+  buildTeleport = callPackage ../build-support/teleport { };
+
   telepresence = callPackage ../tools/networking/telepresence {
     pythonPackages = python3Packages;
   };

From c6d1d4dd2cd4f359770310e342124aca57299b7b Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 26 May 2025 14:50:46 +0300
Subject: [PATCH 0298/3724] wasm-bindgen-cli_0_2_99: init at 0.2.99

This is needed for teleport_18
---
 .../wa/wasm-bindgen-cli_0_2_99/package.nix    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 pkgs/by-name/wa/wasm-bindgen-cli_0_2_99/package.nix

diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_99/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_99/package.nix
new file mode 100644
index 000000000000..59a40d35f557
--- /dev/null
+++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_99/package.nix
@@ -0,0 +1,19 @@
+{
+  buildWasmBindgenCli,
+  fetchCrate,
+  rustPlatform,
+}:
+
+buildWasmBindgenCli rec {
+  src = fetchCrate {
+    pname = "wasm-bindgen-cli";
+    version = "0.2.99";
+    hash = "sha256-1AN2E9t/lZhbXdVznhTcniy+7ZzlaEp/gwLEAucs6EA=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    inherit (src) pname version;
+    hash = "sha256-HGcqXb2vt6nAvPXBZOJn7nogjIoAgXno2OJBE1trHpc=";
+  };
+}

From dc6b7b62b8bc703806dd356f8c0fb9750a025ff8 Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Tue, 29 Jul 2025 15:11:17 +0300
Subject: [PATCH 0299/3724] llvmPackages_20.llvm: always apply riscv64-specific
 patch

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

diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index 5d8506627aa7..928ec4fab8bb 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -296,7 +296,7 @@ stdenv.mkDerivation (
           # Just like the `llvm-lit-cfg` patch, but for `polly`.
           (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch")
       ++
-        lib.optional (lib.versions.major release_version == "20" && stdenv.hostPlatform.isRiscV)
+        lib.optional (lib.versions.major release_version == "20")
           # Test failure on riscv64, fixed in llvm 21
           # https://github.com/llvm/llvm-project/issues/150818
           (

From b3be5b6560f9f6dfef2e5f81446c533503016348 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Mon, 16 Dec 2024 06:49:12 +0000
Subject: [PATCH 0300/3724] nordpass: 5.23.12 -> 6.3.15

---
 pkgs/by-name/no/nordpass/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/no/nordpass/package.nix b/pkgs/by-name/no/nordpass/package.nix
index fd372d7c6bd3..f286ca185ef5 100644
--- a/pkgs/by-name/no/nordpass/package.nix
+++ b/pkgs/by-name/no/nordpass/package.nix
@@ -37,8 +37,8 @@
 let
   # determine these versions from
   # curl -H 'Snap-Device-Series: 16' http://api.snapcraft.io/v2/snaps/info/nordpass
-  version = "5.23.13";
-  snapVersion = "192";
+  version = "6.3.15";
+  snapVersion = "201";
   snapId = "00CQ2MvSr0Ex7zwdGhCYTa0ZLMw3H6hf";
   snapBaseUrl = "https://api.snapcraft.io/api/v1/snaps/download/";
 
@@ -95,7 +95,7 @@ let
 
     src = fetchurl {
       url = "${snapBaseUrl}${snapId}_${snapVersion}.snap";
-      hash = "sha256-teqeeLzqLVL/l5WsTXlRj3GM0YMHm+Z2MWy4GE8s7k8=";
+      hash = "sha256-paOwigiDay0pBt7p3Jatv8/1GL8PKUddz9NzEngpGJI=";
     };
 
     nativeBuildInputs = [ squashfsTools ];

From 731391c2b9e7b638eafe13799bfa2315895c2b66 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 29 Jul 2025 16:01:19 +0100
Subject: [PATCH 0301/3724] stdenvNoCC: fix `extraBuildInputs` on Darwin

Closes: #371465
Fixes: 4928668e21d1efb681434c1caa95c449db9dd599
---
 pkgs/top-level/stage.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index bfc2ee8f664c..90e842703417 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -54,8 +54,8 @@ in
 
   # `stdenv` without a C compiler. Passing in this helps avoid infinite
   # recursions, and may eventually replace passing in the full stdenv.
-  stdenvNoCC ? (
-    stdenv.override {
+  stdenvNoCC ? stdenv.override (
+    {
       cc = null;
       hasCC = false;
     }

From 76a80617b12c2d4b36cd07d5d67bb52a356751d5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 29 Jul 2025 16:56:47 +0100
Subject: [PATCH 0302/3724] libarchive: fix tests on Darwin with recent Nix/Lix

---
 .../fix-darwin-tmpdir-handling.patch          | 22 +++++++++++++++++++
 pkgs/by-name/li/libarchive/package.nix        |  5 +++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch

diff --git a/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch b/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch
new file mode 100644
index 000000000000..3e88c15dbdf2
--- /dev/null
+++ b/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch
@@ -0,0 +1,22 @@
+From 87bbe8ec8d343c70ae42ccb9606ec80ad73ceffb Mon Sep 17 00:00:00 2001
+From: Emily <hello@emily.moe>
+Date: Tue, 29 Jul 2025 16:53:15 +0100
+Subject: [PATCH] Fix setup_mac_metadata when TMPDIR does not end with a slash
+
+---
+ libarchive/archive_read_disk_entry_from_file.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
+index 19d049770b..87389642db 100644
+--- a/libarchive/archive_read_disk_entry_from_file.c
++++ b/libarchive/archive_read_disk_entry_from_file.c
+@@ -364,7 +364,7 @@ setup_mac_metadata(struct archive_read_disk *a,
+ 		tempdir = _PATH_TMP;
+ 	archive_string_init(&tempfile);
+ 	archive_strcpy(&tempfile, tempdir);
+-	archive_strcat(&tempfile, "tar.md.XXXXXX");
++	archive_strcat(&tempfile, "/tar.md.XXXXXX");
+ 	tempfd = mkstemp(tempfile.s);
+ 	if (tempfd < 0) {
+ 		archive_set_error(&a->archive, errno,
diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix
index 640914afd9a0..a3e0d592c26e 100644
--- a/pkgs/by-name/li/libarchive/package.nix
+++ b/pkgs/by-name/li/libarchive/package.nix
@@ -48,6 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/libarchive/libarchive/commit/489d0b8e2f1fafd3b7ebf98f389ca67462c34651.patch?full_index=1";
       hash = "sha256-r+tSJ+WA0VKCjg+8MfS5/RqcB+aAMZ2dK0YUh+U1q78=";
     })
+    # Fix the tests on Darwin when `$TMPDIR` does not end with a slash
+    # and its parent directory is not writable by the build user, as on
+    # Nix ≥ 2.30.0 and Lix ≥ 2.91.2, ≥ 2.92.2, ≥ 2.93.1.
+    # <https://github.com/libarchive/libarchive/pull/2708>
+    ./fix-darwin-tmpdir-handling.patch
   ];
 
   outputs = [

From 2fc95bd982f7f1f74e96c1ac13f72c0aba2c0dda Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 29 Jul 2025 18:20:42 +0100
Subject: [PATCH 0303/3724] re2: 2025-07-17 -> 2025-07-22

Changes: https://github.com/google/re2/compare/2025-07-17...2025-07-22
---
 pkgs/by-name/re/re2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix
index f7bd6fa4ceec..5a02e01fb94f 100644
--- a/pkgs/by-name/re/re2/package.nix
+++ b/pkgs/by-name/re/re2/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "re2";
-  version = "2025-07-17";
+  version = "2025-07-22";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "re2";
     rev = finalAttrs.version;
-    hash = "sha256-8wxAFu013Nc67vikwXt5+A/5odEk62yHpRbeH6zHrlY=";
+    hash = "sha256-e1PvcpZFl1lGOjwaK2ocBsQEQCYtCusdWM3b1KpHHnQ=";
   };
 
   outputs = [

From a413c6f5b4ac3561dcd2a0b11a746fb6660aea96 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 26 Jul 2025 22:30:59 +0100
Subject: [PATCH 0304/3724] cc-wrapper: use `-fmacro-prefix-map` to scrub
 `__FILE__` references

This accomplishes the same thing as `sanitiseHeaderPathsHook`, but
applies to every build input and should have fewer side effects.
---
 pkgs/build-support/cc-wrapper/default.nix     | 41 +++++++++++++++----
 pkgs/build-support/cc-wrapper/setup-hook.sh   |  9 ++++
 .../compilers/gcc/patches/default.nix         |  4 ++
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 2a88e3369a99..345aaa71cf78 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -363,6 +363,22 @@ let
     else
       targetPlatform.darwinPlatform
   );
+
+  # Header files that use `__FILE__` (e.g., for error reporting) lead
+  # to unwanted references to development packages and outputs in built
+  # binaries, like C++ programs depending on GCC and Boost at runtime.
+  #
+  # We use `-fmacro-prefix-map` to avoid the store references in these
+  # situations while keeping them in compiler diagnostics and debugging
+  # and profiling output.
+  #
+  # Unfortunately, doing this with GCC runs into issues with compiler
+  # argument length limits due to <https://gcc.gnu.org/PR111527>, so we
+  # disable it there in favour of our existing patch.
+  #
+  # TODO: Drop `mangle-NIX_STORE-in-__FILE__.patch` from GCC and make
+  # this unconditional once the upstream bug is fixed.
+  useMacroPrefixMap = !isGNU;
 in
 
 assert includeFortifyHeaders' -> fortify-headers != null;
@@ -455,6 +471,14 @@ stdenvNoCC.mkDerivation {
       substituteAll "$wrapper" "$out/bin/$dst"
       chmod +x "$out/bin/$dst"
     }
+
+    include() {
+      printf -- '%s %s\n' "$1" "$2"
+      ${lib.optionalString useMacroPrefixMap ''
+        local scrubbed="$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-''${2#"$NIX_STORE"/*-}"
+        printf -- '-fmacro-prefix-map=%s=%s\n' "$2" "$scrubbed"
+      ''}
+    }
   ''
 
   + (
@@ -673,13 +697,13 @@ stdenvNoCC.mkDerivation {
         echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags
       ''
       + optionalString (!(cc.langD or false)) ''
-        echo "-${
+        include "-${
           if isArocc then "I" else "idirafter"
-        } ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags
+        }" "${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags
       ''
       + optionalString (isGNU && (!(cc.langD or false))) ''
         for dir in "${cc}"/lib/gcc/*/*/include-fixed; do
-          echo '-idirafter' ''${dir} >> $out/nix-support/libc-cflags
+          include '-idirafter' ''${dir} >> $out/nix-support/libc-cflags
         done
       ''
       + ''
@@ -695,7 +719,7 @@ stdenvNoCC.mkDerivation {
       # like option that forces the libc headers before all -idirafter,
       # hence -isystem here.
       + optionalString includeFortifyHeaders' ''
-        echo "-isystem ${fortify-headers}/include" >> $out/nix-support/libc-cflags
+        include -isystem "${fortify-headers}/include" >> $out/nix-support/libc-cflags
       ''
     )
 
@@ -718,19 +742,19 @@ stdenvNoCC.mkDerivation {
     # https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903)
     + optionalString (libcxx == null && isClang && (useGccForLibs && gccForLibs.langCC or false)) ''
       for dir in ${gccForLibs}/include/c++/*; do
-        echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
+        include -isystem "$dir" >> $out/nix-support/libcxx-cxxflags
       done
       for dir in ${gccForLibs}/include/c++/*/${targetPlatform.config}; do
-        echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
+        include -isystem "$dir" >> $out/nix-support/libcxx-cxxflags
       done
     ''
     + optionalString (libcxx.isLLVM or false) ''
-      echo "-isystem ${getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags
+      include -isystem "${getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags
       echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags
     ''
     # GCC NG friendly libc++
     + optionalString (libcxx != null && libcxx.isGNU or false) ''
-      echo "-isystem ${getDev libcxx}/include" >> $out/nix-support/libcxx-cxxflags
+      include -isystem "${getDev libcxx}/include" >> $out/nix-support/libcxx-cxxflags
     ''
 
     ##
@@ -937,6 +961,7 @@ stdenvNoCC.mkDerivation {
     inherit libc_bin libc_dev libc_lib;
     inherit darwinPlatformForCC;
     default_hardening_flags_str = builtins.toString defaultHardeningFlags;
+    inherit useMacroPrefixMap;
   }
   // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) {
     # These will become empty strings when not targeting Darwin.
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 33a2b62a49b0..1c8b26061b03 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -68,12 +68,21 @@ ccWrapper_addCVars () {
     local role_post
     getHostRoleEnvHook
 
+    local found=
+
     if [ -d "$1/include" ]; then
         export NIX_CFLAGS_COMPILE${role_post}+=" -isystem $1/include"
+        found=1
     fi
 
     if [ -d "$1/Library/Frameworks" ]; then
         export NIX_CFLAGS_COMPILE${role_post}+=" -iframework $1/Library/Frameworks"
+        found=1
+    fi
+
+    if [[ -n "@useMacroPrefixMap@" && -n ${NIX_STORE:-} && -n $found ]]; then
+        local scrubbed="$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${1#"$NIX_STORE"/*-}"
+        export NIX_CFLAGS_COMPILE${role_post}+=" -fmacro-prefix-map=$1=$scrubbed"
     fi
 }
 
diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index 9a55332ade9b..dc6418c9241b 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -83,6 +83,10 @@ in
         # Do not try looking for binaries and libraries in /lib and /usr/lib
         ./13/no-sys-dirs-riscv.patch
         # Mangle the nix store hash in __FILE__ to prevent unneeded runtime references
+        #
+        # TODO: Remove these and the `useMacroPrefixMap` conditional
+        # in `cc-wrapper` once <https://gcc.gnu.org/PR111527>
+        # is fixed.
         ./13/mangle-NIX_STORE-in-__FILE__.patch
       ];
       "14" = [

From 6e2e0153b07d8909715b6d2dcae52b2f9c6bad56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Tue, 29 Jul 2025 19:38:24 +0000
Subject: [PATCH 0305/3724] ceph: 19.2.2 -> 19.2.3

* Removed upstream applied patches.
* libnbd became a new required dependency:
  https://github.com/ceph/ceph/commit/5a2c11c579f9a3516c8b532f9d2a79ba2990e03e
---
 pkgs/tools/filesystems/ceph/default.nix | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 6fbfbde63fc0..944a97bff76e 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -50,6 +50,7 @@
   kmod,
   libcap,
   libcap_ng,
+  libnbd,
   libnl,
   libxml2,
   lmdb,
@@ -360,10 +361,10 @@ let
   );
   inherit (ceph-python-env.python) sitePackages;
 
-  version = "19.2.2";
+  version = "19.2.3";
   src = fetchurl {
     url = "https://download.ceph.com/tarballs/ceph-${version}.tar.gz";
-    hash = "sha256-7FD9LJs25VzUCRIBm01Cm3ss1YLTN9YLwPZnHSMd8rs=";
+    hash = "sha256-zlgp28C81SZbaFJ4yvQk4ZgYz4K/aZqtcISTO8LscSU=";
   };
 in
 rec {
@@ -372,14 +373,6 @@ rec {
     inherit src version;
 
     patches = [
-      (fetchpatch2 {
-        name = "ceph-s3select-arrow-18-compat.patch";
-        url = "https://github.com/ceph/s3select/commit/f333ec82e6e8a3f7eb9ba1041d1442b2c7cd0f05.patch";
-        hash = "sha256-21fi5tMIs/JmuhwPYMWtampv/aqAe+EoPAXZLJlOvgo=";
-        stripLen = 1;
-        extraPrefix = "src/s3select/";
-      })
-
       ./boost-1.85.patch
 
       (fetchpatch2 {
@@ -393,14 +386,6 @@ rec {
       # * <https://aur.archlinux.org/cgit/aur.git/commit/?h=ceph&id=8c5cc7d8deec002f7596b6d0860859a0a718f12b>
       # * <https://github.com/ceph/ceph/pull/60999>
       ./boost-1.86-PyModule.patch
-
-      # TODO: Remove with Ceph >= 19.2.3
-      (fetchpatch2 {
-        name = "ceph-squid-client-disallow-unprivileged-users-to-escalate-root-privileges.patch";
-        url = "https://github.com/ceph/ceph/commit/380da5049e8ea7c35f34022fba24d3e2d4db6dd8.patch?full_index=1";
-        hash = "sha256-hVJ1v/n2YCJLusw+DEyK12MG73sJ/ccwbSc+2pLRxvw=";
-      })
-
     ];
 
     nativeBuildInputs = [
@@ -441,6 +426,7 @@ rec {
         gtest
         icu
         libcap
+        libnbd
         libnl
         libxml2
         lmdb

From e3b2113fc2c067688b9889892d67616638e6397a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 26 Jun 2025 06:30:28 +0100
Subject: [PATCH 0306/3724] nghttp2: 1.65.0 -> 1.66.0

Changes: https://github.com/nghttp2/nghttp2/releases/tag/v1.66.0
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/by-name/ng/nghttp2/package.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix
index c4558c101191..20cabbec1f7a 100644
--- a/pkgs/by-name/ng/nghttp2/package.nix
+++ b/pkgs/by-name/ng/nghttp2/package.nix
@@ -46,11 +46,11 @@ assert enableJemalloc -> enableApp;
 
 stdenv.mkDerivation rec {
   pname = "nghttp2";
-  version = "1.65.0";
+  version = "1.66.0";
 
   src = fetchurl {
-    url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-C9u3jcIYcEhP1URJBnZXtg47G3Im4RdM9WQBbG0zB/U=";
+    url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
+    hash = "sha256-HUhK03NU35/KuXCBTpOl3KkaUyVug/T1jdcxGcYyEBc=";
   };
 
   outputs = [
@@ -113,9 +113,6 @@ stdenv.mkDerivation rec {
     ''
     + lib.optionalString (enablePython) ''
       patchShebangs $out/share/nghttp2
-    ''
-    + lib.optionalString (!enablePython) ''
-      rm -r $out/share
     '';
 
   passthru.tests = {

From f073e6214c3f901184a625869c8761b6ae6f892f Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 26 May 2025 14:52:31 +0300
Subject: [PATCH 0307/3724] teleport_18: init at 18.1.1

---
 nixos/tests/teleport.nix                |  1 +
 pkgs/by-name/te/teleport_18/package.nix | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/by-name/te/teleport_18/package.nix

diff --git a/nixos/tests/teleport.nix b/nixos/tests/teleport.nix
index e9b3193448d3..6b8acb332c43 100644
--- a/nixos/tests/teleport.nix
+++ b/nixos/tests/teleport.nix
@@ -11,6 +11,7 @@ let
   packages = with pkgs; {
     "16" = teleport_16;
     "17" = teleport_17;
+    "18" = teleport_18;
   };
 
   minimal = package: {
diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix
new file mode 100644
index 000000000000..72a558a5e20b
--- /dev/null
+++ b/pkgs/by-name/te/teleport_18/package.nix
@@ -0,0 +1,16 @@
+{
+  buildTeleport,
+  buildGo124Module,
+  wasm-bindgen-cli_0_2_99,
+}:
+
+buildTeleport rec {
+  version = "18.1.1";
+  hash = "sha256-xhf6WwgR3VwjtvFo0/b9A0RcyY7dklPfPUakludUmm8=";
+  vendorHash = "sha256-63pqTI92045/V8Gf+TDKUWLV9eO4hVKOHtgWbYnAf6I=";
+  pnpmHash = "sha256-ZuMMacsyr2rGLVDlaEwA7IbZZfGBuTRBOv4Q6XIjDek=";
+  cargoHash = "sha256-ia4We4IfIkqz82aFMVvXdzjDXw0w+OJSPVdutfau6PA=";
+
+  wasm-bindgen-cli = wasm-bindgen-cli_0_2_99;
+  buildGoModule = buildGo124Module;
+}

From 704686cc6bb17c389c27259a764d823609bc09fa Mon Sep 17 00:00:00 2001
From: Stig Palmquist <git@stig.io>
Date: Tue, 29 Jul 2025 17:06:45 +0200
Subject: [PATCH 0308/3724] xkeyboard-config: add patch to fix us-mac

Add a patch that reverts a commit in 2.45 that broke the us-mac keyboard
layout.

Remove when 2.46 is released

https://github.com/NixOS/nixpkgs/issues/426375
---
 pkgs/by-name/xk/xkeyboard-config/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/xk/xkeyboard-config/package.nix b/pkgs/by-name/xk/xkeyboard-config/package.nix
index 2862769bb6cb..666de77d7b00 100644
--- a/pkgs/by-name/xk/xkeyboard-config/package.nix
+++ b/pkgs/by-name/xk/xkeyboard-config/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch2,
   pkg-config,
   meson,
   ninja,
@@ -20,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Fp4HWpLZV6V3h8GZ6E41nfKTG3GWwcW0o9V27mI1qHw=";
   };
 
+  patches = [
+    # Patch that reverts a commit in 2.45 that broke the us-mac keyboard layout.
+    # Remove when 2.46 is released.
+    # https://github.com/NixOS/nixpkgs/issues/426375
+    (fetchpatch2 {
+      url = "https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/11dbaeb23d06c0d21efe538c90b44ffc8fc3a071.patch";
+      hash = "sha256-qZkO1GQvbtTFeXqCuA7bjgQX5jq9c+LiKa/ziP1w2sI=";
+    })
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs = [

From 2ff9e8c46aad554df74875245162581fba05d14d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 02:03:40 +0000
Subject: [PATCH 0309/3724] bmake: 20250528 -> 20250707

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

diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix
index 4e68c32368e2..aa6b562a3b96 100644
--- a/pkgs/by-name/bm/bmake/package.nix
+++ b/pkgs/by-name/bm/bmake/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bmake";
-  version = "20250528";
+  version = "20250707";
 
   src = fetchurl {
     url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz";
-    hash = "sha256-DcOJpeApiqWFNTtgeW1dYy3mYNreWNAKzWCtcihGyaM=";
+    hash = "sha256-phJApAZdkMOSXdd0+Po9c97sGnMiiobulfzYIGPSiwg=";
   };
 
   patches = [

From 6ccf14ba235944f96f67e252812d59ef1fb15e38 Mon Sep 17 00:00:00 2001
From: Terje Larsen <terlar@gmail.com>
Date: Wed, 30 Jul 2025 15:07:00 +0200
Subject: [PATCH 0310/3724] dockerTools.streamLayeredImage: fix
 enableFakechroot

This broke with #417132 where the previous behaviour of suppressing
errors of the export into $NIX_BUILD_TOP/env-vars when dumping env vars.

This error seems to stem from the non-existance of $NIX_BUILD_TOP. This
fix ensures the NIX_BUILD_TOP propagates into the proot environment.
---
 pkgs/build-support/docker/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 14b952424ca0..ecc7b410b54f 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -1049,6 +1049,7 @@ rec {
           "/proc/"
           "/sys/"
           "${builtins.storeDir}/"
+          "$NIX_BUILD_TOP"
           "$out/layer.tar"
         ]
       );
@@ -1085,6 +1086,7 @@ rec {
                     --exclude=./proc \
                     --exclude=./sys \
                     --exclude=.${builtins.storeDir} \
+                    --exclude=".$NIX_BUILD_TOP" \
                     --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \
                     --hard-dereference \
                     -cf $out/layer.tar .

From ad36bee368c5ed7a1ed152697da97c6c68bba0ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Jul 2025 18:50:07 +0000
Subject: [PATCH 0311/3724] umockdev: 0.19.1 -> 0.19.2

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

diff --git a/pkgs/by-name/um/umockdev/package.nix b/pkgs/by-name/um/umockdev/package.nix
index ae00af50d2eb..91d213d7e08c 100644
--- a/pkgs/by-name/um/umockdev/package.nix
+++ b/pkgs/by-name/um/umockdev/package.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "umockdev";
-  version = "0.19.1";
+  version = "0.19.2";
 
   outputs = [
     "bin"
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz";
-    hash = "sha256-LOzg6ONmuJtAcL508zicn3+iGspW2KU1fpbjDNjU9CY=";
+    hash = "sha256-b92mdUTzZslfFVbeDR+C2xPyMbwDYsffA8w0uiaykmg=";
   };
 
   patches = [

From e10606c671c6a9f7329236908bcad02d9fcf6983 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 15 Oct 2024 14:56:41 +0300
Subject: [PATCH 0312/3724] iproute2: do not use dark blue in dark background
 palette

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

diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix
index 7e65da3972ab..77fe6c6bcc29 100644
--- a/pkgs/by-name/ip/iproute2/package.nix
+++ b/pkgs/by-name/ip/iproute2/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   buildPackages,
   bison,
   flex,
@@ -26,6 +27,16 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
+    (fetchpatch {
+      name = "color-assume-background-is-dark-if-unknown.patch";
+      url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/patch/?id=cc0f1109d2864686180ba2ce6fba5fcb3bf437bf";
+      hash = "sha256-BGD70cXKnDvk7IEU5RQA+pn1dErWjgr74GeSkYtFXoI=";
+    })
+    (fetchpatch {
+      name = "color-do-not-use-dark-blue-in-dark-background-palette.patch";
+      url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/patch/?id=46a4659313c2610427a088d8f03b731819f2b87a";
+      hash = "sha256-TXrmGZNsYWdYLsLoBXZEr3cd8HT4EhRg+jACRrC0gKE=";
+    })
     (fetchurl {
       name = "musl-endian.patch";
       url = "https://lore.kernel.org/netdev/20240712191209.31324-1-contact@hacktivis.me/raw";

From 50b5017b2b410d6759caaba6b703f90ef0965cf1 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Tue, 15 Apr 2025 02:28:22 +0200
Subject: [PATCH 0313/3724] libxdmcp: refactor, move to pkgs/by-name and rename
 from xorg.libXdmcp

---
 pkgs/by-name/li/libxdmcp/package.nix          | 50 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 34 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 ++
 pkgs/servers/x11/xorg/overrides.nix           | 11 ----
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 55 insertions(+), 44 deletions(-)
 create mode 100644 pkgs/by-name/li/libxdmcp/package.nix

diff --git a/pkgs/by-name/li/libxdmcp/package.nix b/pkgs/by-name/li/libxdmcp/package.nix
new file mode 100644
index 000000000000..974b02424756
--- /dev/null
+++ b/pkgs/by-name/li/libxdmcp/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxdmcp";
+  version = "1.1.5";
+
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXdmcp-${finalAttrs.version}.tar.xz";
+    hash = "sha256-2KUiKCjDratwrfaaVYPx0y617OBDBPf4OStqNTqiIow=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ xorgproto ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXdmcp \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X Display Manager Control Protocol library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxdmcp";
+    license = lib.licenses.mitOpenGroup;
+    maintainers = [ ];
+    pkgConfigModules = [ "xdmcp" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 72fa8f20b1b5..8e1363d7c91e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -9,6 +9,7 @@
   libpciaccess,
   libpthread-stubs,
   libxcvt,
+  libxdmcp,
   lndir,
   luit,
   makedepend,
@@ -45,6 +46,7 @@ self: with self; {
   fontalias = font-alias;
   fontutil = font-util;
   libpthreadstubs = libpthread-stubs;
+  libXdmcp = libxdmcp;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
@@ -2225,38 +2227,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXdmcp = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXdmcp";
-      version = "1.1.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXdmcp-1.1.5.tar.xz";
-        sha256 = "1312l8x3asib77wgf123w3nbabnky61mb6pnmmqapbf350l259fq";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [ xorgproto ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xdmcp" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXext = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 025c6e9e253d..d21e0ec7b4a8 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -41,6 +41,7 @@ $pcMap{"pciaccess"} = "libpciaccess";
 $pcMap{"pthread-stubs"} = "libpthreadstubs";
 $pcMap{"xbitmaps"} = "xbitmaps";
 $pcMap{"xcb-proto"} = "xcbproto";
+$pcMap{"xdmcp"} = "libXdmcp";
 $pcMap{"xtrans"} = "xtrans";
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "xorgproto";
@@ -283,6 +284,7 @@ print OUT <<EOF;
   libpciaccess,
   libpthread-stubs,
   libxcvt,
+  libxdmcp,
   lndir,
   luit,
   makedepend,
@@ -319,6 +321,7 @@ self: with self; {
   fontalias = font-alias;
   fontutil = font-util;
   libpthreadstubs = libpthread-stubs;
+  libXdmcp = libxdmcp;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 7752afca8594..f67fe6a350d8 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -243,17 +243,6 @@ self: super:
     propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.xorgproto ];
   });
 
-  libXdmcp = super.libXdmcp.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-      "doc"
-    ];
-    meta = attrs.meta // {
-      pkgConfigModules = [ "xdmcp" ];
-    };
-  });
-
   libXtst = super.libXtst.overrideAttrs (attrs: {
     meta = attrs.meta // {
       pkgConfigModules = [ "xtst" ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index ab2622766043..167c03fda65b 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -168,7 +168,6 @@ mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz
 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz
 mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz
 mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz
-mirror://xorg/individual/lib/libXdmcp-1.1.5.tar.xz
 mirror://xorg/individual/lib/libXext-1.3.6.tar.xz
 mirror://xorg/individual/lib/libXfixes-6.0.1.tar.xz
 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2

From 6ef2762479702f681bc030b3ee62ec56cb18310f Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Tue, 15 Apr 2025 11:28:47 +0200
Subject: [PATCH 0314/3724] libxau: refactor, move to pkgs/by-name and rename
 from xorg.libXau

---
 pkgs/by-name/li/libxau/package.nix            | 48 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 34 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 ++
 pkgs/servers/x11/xorg/overrides.nix           |  8 ----
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 53 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/li/libxau/package.nix

diff --git a/pkgs/by-name/li/libxau/package.nix b/pkgs/by-name/li/libxau/package.nix
new file mode 100644
index 000000000000..e9c67d2beb87
--- /dev/null
+++ b/pkgs/by-name/li/libxau/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxau";
+  version = "1.0.12";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXau-${finalAttrs.version}.tar.xz";
+    hash = "sha256-dNDk36PTmtiTnpm9o39ZZ6ulKCEQdoKEZNJ3fUd/wPs=";
+  };
+
+  strictDeps = true;
+  nativeBuildInputs = [ pkg-config ];
+  propagatedBuildInputs = [ xorgproto ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXau \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Functions for handling Xauthority files and entries.";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxau";
+    license = lib.licenses.mitOpenGroup;
+    maintainers = [ ];
+    pkgConfigModules = [ "xau" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8e1363d7c91e..43d59e70f75e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -8,6 +8,7 @@
   imake,
   libpciaccess,
   libpthread-stubs,
+  libxau,
   libxcvt,
   libxdmcp,
   lndir,
@@ -46,6 +47,7 @@ self: with self; {
   fontalias = font-alias;
   fontutil = font-util;
   libpthreadstubs = libpthread-stubs;
+  libXau = libxau;
   libXdmcp = libxdmcp;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
@@ -2032,38 +2034,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXau = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXau";
-      version = "1.0.12";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXau-1.0.12.tar.xz";
-        sha256 = "1yy0gx3psxyjcj284xhh44labav7b5zs7gcrks9xi6nklggy9l3l";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [ xorgproto ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xau" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXaw = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index d21e0ec7b4a8..ecb8522beda5 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -39,6 +39,7 @@ $pcMap{"hwdata"} = "hwdata";
 $pcMap{"fontutil"} = "fontutil";
 $pcMap{"pciaccess"} = "libpciaccess";
 $pcMap{"pthread-stubs"} = "libpthreadstubs";
+$pcMap{"xau"} = "libXau";
 $pcMap{"xbitmaps"} = "xbitmaps";
 $pcMap{"xcb-proto"} = "xcbproto";
 $pcMap{"xdmcp"} = "libXdmcp";
@@ -283,6 +284,7 @@ print OUT <<EOF;
   imake,
   libpciaccess,
   libpthread-stubs,
+  libxau,
   libxcvt,
   libxdmcp,
   lndir,
@@ -321,6 +323,7 @@ self: with self; {
   fontalias = font-alias;
   fontutil = font-util;
   libpthreadstubs = libpthread-stubs;
+  libXau = libxau;
   libXdmcp = libxdmcp;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index f67fe6a350d8..6d479bcb6ec2 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -235,14 +235,6 @@ self: super:
     };
   });
 
-  libXau = super.libXau.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.xorgproto ];
-  });
-
   libXtst = super.libXtst.overrideAttrs (attrs: {
     meta = attrs.meta // {
       pkgConfigModules = [ "xtst" ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 167c03fda65b..736181c63440 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -162,7 +162,6 @@ mirror://xorg/individual/lib/libICE-1.1.2.tar.xz
 mirror://xorg/individual/lib/libSM-1.2.6.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libX11-1.8.12.tar.xz
-mirror://xorg/individual/lib/libXau-1.0.12.tar.xz
 mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz
 mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz
 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz

From 316108c9d524d62991fe716475b58f3d931e1776 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Wed, 16 Apr 2025 16:37:02 +0200
Subject: [PATCH 0315/3724] libxcb: refactor and move to pkgs/by-name from xorg
 namespace

this removes all the configure flags because they are either default in
stdenv (--disable-shared on static) or are enabled by default and thus
not needed anymore

this also removes libxslt from the builtInputs since it seems to not be
needed according to nix-check-deps (if this makes problems please re-add it)
---
 pkgs/by-name/li/libxcb/package.nix            | 94 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 78 +--------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  8 ++
 pkgs/servers/x11/xorg/overrides.nix           | 47 ----------
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 104 insertions(+), 124 deletions(-)
 create mode 100644 pkgs/by-name/li/libxcb/package.nix

diff --git a/pkgs/by-name/li/libxcb/package.nix b/pkgs/by-name/li/libxcb/package.nix
new file mode 100644
index 000000000000..66c6bfa284b1
--- /dev/null
+++ b/pkgs/by-name/li/libxcb/package.nix
@@ -0,0 +1,94 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  python3,
+  libpthread-stubs,
+  libxau,
+  libxdmcp,
+  xcb-proto,
+  windows,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxcb";
+  version = "1.17.0";
+
+  outputs = [
+    "out"
+    "dev"
+    "man"
+    "doc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libxcb-${finalAttrs.version}.tar.xz";
+    hash = "sha256-WZ6/mZZxD+pxYi5uGE86itW0PQ5fqMTkBxI8iKWabVU=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    python3
+  ];
+
+  buildInputs = [
+    libpthread-stubs
+    libxau
+    libxdmcp
+    xcb-proto
+  ];
+
+  # $dev/include/xcb/xcb.h includes pthread.h
+  propagatedBuildInputs = lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads;
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "C interface to the X Window System protocol";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb";
+    # gitlab wrongly says X11 Distribute Modifications
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [
+      "xcb"
+      "xcb-composite"
+      "xcb-damage"
+      "xcb-dpms"
+      "xcb-dri2"
+      "xcb-dri3"
+      "xcb-glx"
+      "xcb-present"
+      "xcb-randr"
+      "xcb-record"
+      "xcb-render"
+      "xcb-res"
+      "xcb-screensaver"
+      "xcb-shape"
+      "xcb-shm"
+      "xcb-sync"
+      "xcb-xf86dri"
+      "xcb-xfixes"
+      "xcb-xinerama"
+      "xcb-xinput"
+      "xcb-xkb"
+      "xcb-xtest"
+      "xcb-xv"
+      "xcb-xvmc"
+    ];
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 43d59e70f75e..54ddae2f371e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -9,6 +9,7 @@
   libpciaccess,
   libpthread-stubs,
   libxau,
+  libxcb,
   libxcvt,
   libxdmcp,
   lndir,
@@ -34,6 +35,7 @@ self: with self; {
     gccmakedep
     imake
     libpciaccess
+    libxcb
     libxcvt
     lndir
     luit
@@ -3105,82 +3107,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libxcb = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libxslt,
-      libpthreadstubs,
-      libXau,
-      xcbproto,
-      libXdmcp,
-      python3,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libxcb";
-      version = "1.17.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz";
-        sha256 = "0mbdkajqhg0j0zjc9a2z1qyv9mca797ihvifc9qyl3vijscvz7jr";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        python3
-      ];
-      buildInputs = [
-        libxslt
-        libpthreadstubs
-        libXau
-        xcbproto
-        libXdmcp
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [
-          "xcb"
-          "xcb-composite"
-          "xcb-damage"
-          "xcb-dbe"
-          "xcb-dpms"
-          "xcb-dri2"
-          "xcb-dri3"
-          "xcb-ge"
-          "xcb-glx"
-          "xcb-present"
-          "xcb-randr"
-          "xcb-record"
-          "xcb-render"
-          "xcb-res"
-          "xcb-screensaver"
-          "xcb-shape"
-          "xcb-shm"
-          "xcb-sync"
-          "xcb-xevie"
-          "xcb-xf86dri"
-          "xcb-xfixes"
-          "xcb-xinerama"
-          "xcb-xinput"
-          "xcb-xkb"
-          "xcb-xprint"
-          "xcb-xselinux"
-          "xcb-xtest"
-          "xcb-xv"
-          "xcb-xvmc"
-        ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libxkbfile = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index ecb8522beda5..b33959252afb 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -49,6 +49,12 @@ $pcMap{"\$RENDERPROTO"} = "xorgproto";
 $pcMap{"\$DRI3PROTO"} = "xorgproto";
 $pcMap{"\$DRI2PROTO"} = "xorgproto";
 $pcMap{"\${XKBMODULE}"} = "libxkbfile";
+foreach my $mod ("xcb", "xcb-composite", "xcb-damage", "xcb-dpms", "xcb-dri2", "xcb-dri3",
+    "xcb-glx", "xcb-present", "xcb-randr", "xcb-record", "xcb-render", "xcb-res", "xcb-screensaver",
+    "xcb-shape", "xcb-shm", "xcb-sync", "xcb-xf86dri", "xcb-xfixes", "xcb-xinerama", "xcb-xinput",
+    "xcb-xkb", "xcb-xtest", "xcb-xv", "xcb-xvmc") {
+    $pcMap{$mod} = "libxcb";
+}
 foreach my $mod ("applewmproto", "bigreqsproto", "compositeproto", "damageproto", "dmxproto",
     "dpmsproto", "dri2proto", "dri3proto", "evieproto", "fixesproto", "fontcacheproto",
     "fontsproto", "glproto", "inputproto", "kbproto", "lg3dproto", "presentproto",
@@ -285,6 +291,7 @@ print OUT <<EOF;
   libpciaccess,
   libpthread-stubs,
   libxau,
+  libxcb,
   libxcvt,
   libxdmcp,
   lndir,
@@ -310,6 +317,7 @@ self: with self; {
     gccmakedep
     imake
     libpciaccess
+    libxcb
     libxcvt
     lndir
     luit
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 6d479bcb6ec2..e89c1e152604 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -151,53 +151,6 @@ self: super:
 
   mkfontdir = xorg.mkfontscale;
 
-  libxcb = super.libxcb.overrideAttrs (attrs: {
-    # $dev/include/xcb/xcb.h includes pthread.h
-    propagatedBuildInputs =
-      attrs.propagatedBuildInputs or [ ]
-      ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads;
-    configureFlags = [
-      "--enable-xkb"
-      "--enable-xinput"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared";
-    outputs = [
-      "out"
-      "dev"
-      "man"
-      "doc"
-    ];
-    meta = attrs.meta // {
-      pkgConfigModules = [
-        "xcb-composite"
-        "xcb-damage"
-        "xcb-dpms"
-        "xcb-dri2"
-        "xcb-dri3"
-        "xcb-glx"
-        "xcb-present"
-        "xcb-randr"
-        "xcb-record"
-        "xcb-render"
-        "xcb-res"
-        "xcb-screensaver"
-        "xcb-shape"
-        "xcb-shm"
-        "xcb-sync"
-        "xcb-xf86dri"
-        "xcb-xfixes"
-        "xcb-xinerama"
-        "xcb-xinput"
-        "xcb-xkb"
-        "xcb-xtest"
-        "xcb-xv"
-        "xcb-xvmc"
-        "xcb"
-      ];
-      platforms = lib.platforms.unix ++ lib.platforms.windows;
-    };
-  });
-
   libX11 = super.libX11.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 736181c63440..ca289c94754a 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -163,7 +163,6 @@ mirror://xorg/individual/lib/libSM-1.2.6.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libX11-1.8.12.tar.xz
 mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz
-mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz
 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz
 mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz
 mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz

From 3c1d6186b099969e1f9817dd9ca0711b61a69a79 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sat, 7 Jun 2025 17:35:18 +0200
Subject: [PATCH 0316/3724] libx11: refactor, move to pkgs/by-name and rename
 from xorg.libX11

refactorial changes:
- move `CPP` into `env`
- remove `sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure` because
  it didn't change anything other than the store paths in the resulting
  derivation (using `diff --recursive` (and `xxd` to diff binary files
  that changed))
- remove `xorg.buildPackages.libc.static` from `depsBuildBuild` since
  `xorg.buildPackages` doesn't exist (thus
  `xorg.buildPackages.libc.static or null` evaluating to `null`).
  Fixing that to `libc.static` (and moving it to `nativeBuildInputs`
  (where non-compiler deps belong)) actually broke the static build in
  a weird way i don't understand.
---
 lib/licenses.nix                              | 18 ++++
 pkgs/by-name/li/libx11/package.nix            | 93 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 45 +--------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  4 +
 pkgs/servers/x11/xorg/overrides.nix           | 27 ------
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 6 files changed, 117 insertions(+), 71 deletions(-)
 create mode 100644 pkgs/by-name/li/libx11/package.nix

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 7204e5e539c6..4ef966e57168 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -719,6 +719,16 @@ lib.mapAttrs mkLicense (
       spdxId = "HPND-sell-variant";
     };
 
+    hpndDoc = {
+      fullName = "Historical Permission Notice and Disclaimer - documentation variant";
+      spdxId = "HPND-doc";
+    };
+
+    hpndDocSell = {
+      fullName = "Historical Permission Notice and Disclaimer - documentation sell variant";
+      spdxId = "HPND-doc-sell";
+    };
+
     hpndUc = {
       spdxId = "HPND-UC";
       fullName = "Historical Permission Notice and Disclaimer - University of California variant";
@@ -1311,6 +1321,14 @@ lib.mapAttrs mkLicense (
       # Marc Weber (small nix contributor)
     };
 
+    tekHvcLicense = {
+      fullName = "TekHVC License";
+      url = "https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/7f8305c779ac6948d7261764f5ffb8ae9aa975b1/COPYING#L138-171";
+      # TODO: add spdxId when it gets accepted to spdx
+      # https://tools.spdx.org/app/license_requests/458
+      # https://github.com/spdx/license-list-XML/issues/2757
+    };
+
     tsl = {
       shortName = "TSL";
       fullName = "Timescale License Agreegment";
diff --git a/pkgs/by-name/li/libx11/package.nix b/pkgs/by-name/li/libx11/package.nix
new file mode 100644
index 000000000000..6405cbd46274
--- /dev/null
+++ b/pkgs/by-name/li/libx11/package.nix
@@ -0,0 +1,93 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  buildPackages,
+  pkg-config,
+  xorgproto,
+  libpthread-stubs,
+  libxcb,
+  xtrans,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libx11";
+  version = "1.8.12";
+
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libX11-${finalAttrs.version}.tar.xz";
+    hash = "sha256-+gJvm7AST01sgI+a70BXqtZeezXY/0OVHO8Kvga7mpo=";
+  };
+
+  strictDeps = true;
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libpthread-stubs
+    libxcb
+    xtrans
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  configureFlags =
+    lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull"
+    ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp";
+
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { CPP = "clang -E -"; };
+
+  postInstall = ''
+    # Remove useless DocBook XML files.
+    rm -r $out/share/doc
+  '';
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libX11 \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Core X11 protocol client library (aka \"Xlib\")";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libx11";
+    license = with lib.licenses; [
+      mit
+      mitOpenGroup
+      x11
+      hpndDoc
+      hpndSellVariant
+      tekHvcLicense
+      hpndDocSell
+      hpnd
+      bsd1
+      isc
+      # The "source code modified by FUJITSU LIMITED under the Joint Development Agreement for the
+      # CDE/Motif PST" is possibly unfree.
+      # upstream issue: https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/217
+      # unfree
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [
+      "x11"
+      "x11-xcb"
+    ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 54ddae2f371e..7117aa1efcd5 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -8,6 +8,7 @@
   imake,
   libpciaccess,
   libpthread-stubs,
+  libx11,
   libxau,
   libxcb,
   libxcvt,
@@ -49,6 +50,7 @@ self: with self; {
   fontalias = font-alias;
   fontutil = font-util;
   libpthreadstubs = libpthread-stubs;
+  libX11 = libx11;
   libXau = libxau;
   libXdmcp = libxdmcp;
   utilmacros = util-macros;
@@ -1915,49 +1917,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libX11 = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libpthreadstubs,
-      libxcb,
-      xtrans,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libX11";
-      version = "1.8.12";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libX11-1.8.12.tar.xz";
-        sha256 = "16lspc3bw2pg3jal7zyq6mxmxmmaax0fz6lgh1n4skqjn2dny0ps";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libpthreadstubs
-        libxcb
-        xtrans
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [
-          "x11"
-          "x11-xcb"
-        ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXScrnSaver = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index b33959252afb..583c6edfbb35 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -39,6 +39,8 @@ $pcMap{"hwdata"} = "hwdata";
 $pcMap{"fontutil"} = "fontutil";
 $pcMap{"pciaccess"} = "libpciaccess";
 $pcMap{"pthread-stubs"} = "libpthreadstubs";
+$pcMap{"x11"} = "libX11";
+$pcMap{"x11-xcb"} = "libX11";
 $pcMap{"xau"} = "libXau";
 $pcMap{"xbitmaps"} = "xbitmaps";
 $pcMap{"xcb-proto"} = "xcbproto";
@@ -290,6 +292,7 @@ print OUT <<EOF;
   imake,
   libpciaccess,
   libpthread-stubs,
+  libx11,
   libxau,
   libxcb,
   libxcvt,
@@ -331,6 +334,7 @@ self: with self; {
   fontalias = font-alias;
   fontutil = font-util;
   libpthreadstubs = libpthread-stubs;
+  libX11 = libx11;
   libXau = libxau;
   libXdmcp = libxdmcp;
   utilmacros = util-macros;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index e89c1e152604..2ac477c0776c 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -151,33 +151,6 @@ self: super:
 
   mkfontdir = xorg.mkfontscale;
 
-  libX11 = super.libX11.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-      "man"
-    ];
-    configureFlags =
-      attrs.configureFlags or [ ]
-      ++ malloc0ReturnsNullCrossFlag
-      ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp";
-    depsBuildBuild = [
-      buildPackages.stdenv.cc
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isStatic [
-      (xorg.buildPackages.libc.static or null)
-    ];
-    preConfigure = ''
-      sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
-    '';
-    postInstall = ''
-      # Remove useless DocBook XML files.
-      rm -rf $out/share/doc
-    '';
-    CPP = lib.optionalString stdenv.hostPlatform.isDarwin "clang -E -";
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.xorgproto ];
-  });
-
   libAppleWM = super.libAppleWM.overrideAttrs (attrs: {
     nativeBuildInputs = attrs.nativeBuildInputs ++ [
       autoreconfHook
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index ca289c94754a..b4fb4492d9e4 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -161,7 +161,6 @@ mirror://xorg/individual/lib/libFS-1.0.10.tar.xz
 mirror://xorg/individual/lib/libICE-1.1.2.tar.xz
 mirror://xorg/individual/lib/libSM-1.2.6.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.8.12.tar.xz
 mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz
 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz
 mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz

From 8ce173bef35972a7dce26a73ecaa31121986270f Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Thu, 17 Apr 2025 01:12:27 +0200
Subject: [PATCH 0317/3724] libxext: refactor, move to pkgs/by-name and rename
 from xorg.libXext

---
 pkgs/by-name/li/libxext/package.nix           | 74 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +---------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           | 14 ----
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 79 insertions(+), 51 deletions(-)
 create mode 100644 pkgs/by-name/li/libxext/package.nix

diff --git a/pkgs/by-name/li/libxext/package.nix b/pkgs/by-name/li/libxext/package.nix
new file mode 100644
index 000000000000..1b0843881116
--- /dev/null
+++ b/pkgs/by-name/li/libxext/package.nix
@@ -0,0 +1,74 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libX11,
+  xorgproto,
+  libxau,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxext";
+  version = "1.3.6";
+
+  outputs = [
+    "out"
+    "dev"
+    "man"
+    "doc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXext-${finalAttrs.version}.tar.xz";
+    hash = "sha256-7bWfojmU5AX9xbQAr99YIK5hYLlPNePcPaRFehbol1M=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libX11
+    xorgproto
+  ];
+  propagatedBuildInputs = [
+    xorgproto
+    libxau
+  ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXext \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Xlib-based library for common extensions to the X11 protocol";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxext";
+    license = with lib.licenses; [
+      mitOpenGroup
+      x11
+      hpnd
+      hpndSellVariant
+      hpndDocSell
+      hpndDoc
+      mit
+      isc
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xext" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 7117aa1efcd5..dab99654eb6e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -13,6 +13,7 @@
   libxcb,
   libxcvt,
   libxdmcp,
+  libxext,
   lndir,
   luit,
   makedepend,
@@ -53,6 +54,7 @@ self: with self; {
   libX11 = libx11;
   libXau = libxau;
   libXdmcp = libxdmcp;
+  libXext = libxext;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
@@ -2158,42 +2160,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXext = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXext";
-      version = "1.3.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXext-1.3.6.tar.xz";
-        sha256 = "0lwpx0b7lid47pff6dagp5h63bi0b3gsy05lqpyhbr4l76i9zdgd";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xext" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXfixes = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 583c6edfbb35..2515d4bd7e24 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -45,6 +45,7 @@ $pcMap{"xau"} = "libXau";
 $pcMap{"xbitmaps"} = "xbitmaps";
 $pcMap{"xcb-proto"} = "xcbproto";
 $pcMap{"xdmcp"} = "libXdmcp";
+$pcMap{"xext"} = "libXext";
 $pcMap{"xtrans"} = "xtrans";
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "xorgproto";
@@ -297,6 +298,7 @@ print OUT <<EOF;
   libxcb,
   libxcvt,
   libxdmcp,
+  libxext,
   lndir,
   luit,
   makedepend,
@@ -337,6 +339,7 @@ self: with self; {
   libX11 = libx11;
   libXau = libxau;
   libXdmcp = libxdmcp;
+  libXext = libxext;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 2ac477c0776c..8416c836dd66 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -316,20 +316,6 @@ self: super:
     };
   });
 
-  libXext = super.libXext.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-      "man"
-      "doc"
-    ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [
-      xorg.xorgproto
-      xorg.libXau
-    ];
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
-
   libXfixes = super.libXfixes.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index b4fb4492d9e4..059b308c7ed7 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -165,7 +165,6 @@ mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz
 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz
 mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz
 mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz
-mirror://xorg/individual/lib/libXext-1.3.6.tar.xz
 mirror://xorg/individual/lib/libXfixes-6.0.1.tar.xz
 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
 mirror://xorg/individual/lib/libXfont2-2.0.7.tar.xz

From 75f1b1067ca51de5592acb68783729ebd6de0f81 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 25 Jul 2025 10:31:13 +0200
Subject: [PATCH 0318/3724] qemu: use --replace-fail

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

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index b174fa607c6e..75945ebf8302 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -293,9 +293,9 @@ stdenv.mkDerivation (finalAttrs: {
     # avoid conflicts with libc++ include for <version>
     mv VERSION QEMU_VERSION
     substituteInPlace configure \
-      --replace '$source_path/VERSION' '$source_path/QEMU_VERSION'
+      --replace-fail '$source_path/VERSION' '$source_path/QEMU_VERSION'
     substituteInPlace meson.build \
-      --replace "'VERSION'" "'QEMU_VERSION'"
+      --replace-fail "'VERSION'" "'QEMU_VERSION'"
     substituteInPlace python/qemu/machine/machine.py \
       --replace-fail /var/tmp "$TMPDIR"
   '';

From c1c148864b181d31eb0fde10e6e1ba3370911847 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 21:18:59 +0200
Subject: [PATCH 0319/3724] cracklib: 2.10.0 -> 2.10.3

Use fetchFromGitHub to make the updateScript easier and avoid xz style
supply chain issues.

Separate into multiple outputs. The "out" output now doesn't have a bash
dependency anymore because all the scripts are in "bin".

Do not build the massive wordlist anymore. Instead rely on the built-in
one. This is also what e.g. archlinux does and it leads to a massively
smaller package: 10MiB -> 1MiB. This is especially dramatic/relevant
because cracklib is in the mandatory NixOS system closure because it's a
dependency of systemd. This change saves 9MiB transferred to literally
every NixOS machine.
---
 pkgs/by-name/cr/cracklib/package.nix | 108 +++++++++++++++------------
 1 file changed, 60 insertions(+), 48 deletions(-)

diff --git a/pkgs/by-name/cr/cracklib/package.nix b/pkgs/by-name/cr/cracklib/package.nix
index 76bdad640f0b..886428ae7652 100644
--- a/pkgs/by-name/cr/cracklib/package.nix
+++ b/pkgs/by-name/cr/cracklib/package.nix
@@ -1,70 +1,82 @@
-let
-  version = "2.10.0";
-in
 {
   stdenv,
   lib,
-  buildPackages,
-  fetchurl,
+  fetchFromGitHub,
+  autoreconfHook,
   zlib,
-  gettext,
-  fetchpatch2,
-  lists ? [
-    (fetchurl {
-      url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz";
-      hash = "sha256-JDLo/bSLIijC2DUl+8Q704i2zgw5cxL6t68wvuivPpY=";
-    })
-  ],
+  bash,
+  buildPackages,
+  nix-update-script,
+  pkgsCross,
+  pkgsStatic,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cracklib";
-  inherit version;
+  version = "2.10.3";
 
-  src = fetchurl {
-    url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    hash = "sha256-cAw5YMplCx6vAhfWmskZuBHyB1o4dGd7hMceOG3V51Y=";
+  src = fetchFromGitHub {
+    owner = "cracklib";
+    repo = "cracklib";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ORpJje4TGw1STtvRiNEwUwSDbLXdS+WgXGlc1Wtf/gw=";
   };
 
-  patches = lib.optionals stdenv.hostPlatform.isDarwin [
-    # Fixes build failure on Darwin due to missing byte order functions.
-    # https://github.com/cracklib/cracklib/pull/96
-    (fetchpatch2 {
-      url = "https://github.com/cracklib/cracklib/commit/dff319e543272c1fb958261cf9ee8bb82960bc40.patch";
-      hash = "sha256-QaWpEVV6l1kl4OIkJAqkXPVThbo040Rv9X2dY/+syqs=";
-      stripLen = 1;
-    })
+  sourceRoot = "${finalAttrs.src.name}/src";
+
+  outputs = [
+    "bin"
+    "out"
+    "dev"
+    "man"
   ];
 
-  nativeBuildInputs = lib.optional (
-    stdenv.hostPlatform != stdenv.buildPlatform
-  ) buildPackages.cracklib;
+  strictDeps = true;
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.cracklib ];
+
   buildInputs = [
     zlib
-    gettext
+    bash
   ];
 
-  postPatch =
-    lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
-      chmod +x util/cracklib-format
-      patchShebangs util
+  configureFlags = [
+    "--without-python"
+  ];
 
+  postInstall =
+    # For cross compilation use the tools from nativeBuildInputs. Otherwise use
+    # the ones in the util directory of the source tree.
+    lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+      PATH=$PATH:util
     ''
     + ''
-      ln -vs ${toString lists} dicts/
+      cracklib-format $out/share/cracklib/cracklib-small \
+      | cracklib-packer $out/share/cracklib/pw_dict
     '';
 
-  postInstall = ''
-    make dict-local
-  '';
-  doInstallCheck = true;
-  installCheckTarget = "test";
-
-  meta = with lib; {
-    homepage = "https://github.com/cracklib/cracklib";
-    description = "Library for checking the strength of passwords";
-    license = licenses.lgpl21; # Different license for the wordlist: http://www.openwall.com/wordlists
-    maintainers = with maintainers; [ lovek323 ];
-    platforms = platforms.unix;
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      cross =
+        let
+          systemString = if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform";
+        in
+        pkgsCross.${systemString}.cracklib;
+      static = pkgsStatic.cracklib;
+    };
   };
-}
+
+  meta = {
+    homepage = "https://github.com/cracklib/cracklib";
+    description = "Password checking library";
+    changelog = "https://github.com/cracklib/cracklib/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ lovek323 ];
+    platforms = lib.platforms.unix;
+  };
+})

From e2bd187078a96e9940a37dca0271184365cd75bf Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 31 Jul 2025 12:58:41 +0200
Subject: [PATCH 0320/3724] eos-installer: add missing xz dependency

Fixes: 6b2e5b947405 ("libtiff: don't propagate unnecessary build inputs")
---
 pkgs/by-name/eo/eos-installer/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/eo/eos-installer/package.nix b/pkgs/by-name/eo/eos-installer/package.nix
index 9bdfbccf6a1d..67980799fa91 100644
--- a/pkgs/by-name/eo/eos-installer/package.nix
+++ b/pkgs/by-name/eo/eos-installer/package.nix
@@ -14,6 +14,7 @@
   gtk3,
   systemdMinimal,
   udisks,
+  xz,
 }:
 
 stdenv.mkDerivation rec {
@@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
     gtk3
     systemdMinimal
     udisks
+    xz
   ];
 
   preConfigure = ''

From 5367e6770cebecde42c1a65cd5f9314f394c4dcb Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 31 Jul 2025 13:02:18 +0100
Subject: [PATCH 0321/3724] subsurface: fix bad shebang in update script

---
 pkgs/applications/misc/subsurface/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 6387913ac373..cbb9e9b1d3aa 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -167,6 +167,7 @@ stdenv.mkDerivation {
       pushd $tmpdir
       git clone -b current https://github.com/subsurface/subsurface.git
       cd subsurface
+      sed -i '1s/#!\/bin\/bash/#!\/usr\/bin\/env bash/' ./scripts/get-version.sh
       # this returns 6.0.????-local
       new_version=$(./scripts/get-version.sh | cut -d '-' -f 1)
       new_rev=$(git rev-list -1 HEAD)

From 562849de8b7941a4b68ac4ee2a15068b69c4e478 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 31 Jul 2025 12:44:53 +0100
Subject: [PATCH 0322/3724] subsurface: 6.0.5231 -> 6.0.5414

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

diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index cbb9e9b1d3aa..c360654469a9 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -30,14 +30,14 @@
 }:
 
 let
-  version = "6.0.5231";
+  version = "6.0.5414";
 
   subsurfaceSrc = (
     fetchFromGitHub {
       owner = "Subsurface";
       repo = "subsurface";
-      rev = "38a0050ac33566dfd34bf94cf1d7ac66034e4118";
-      hash = "sha256-6fNcBF/Ep2xs2z83ZQ09XNb/ZkhK1nUNLChV1x8qh0Y=";
+      rev = "528bc9785d53a485bf38270687abfe239060a8af";
+      hash = "sha256-TtqT+H/kvyP7LXrDv/pwPxmZcTCsmzuqS3/IJmBAdRY=";
       fetchSubmodules = true;
     }
   );

From 025e6374343d4729e4c70ef5a4eb0200ddfdecb0 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 31 Jul 2025 16:58:05 +0200
Subject: [PATCH 0323/3724] util-linux: split lastlog into dedicated output

---
 pkgs/by-name/ut/util-linux/package.nix | 28 +++++++++++++++++++++-----
 pkgs/top-level/all-packages.nix        |  1 +
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index fb957238eaad..03a2a82098cd 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -28,6 +28,8 @@
   installShellFiles,
   writeSupport ? stdenv.hostPlatform.isLinux,
   shadowSupport ? stdenv.hostPlatform.isLinux,
+  # Doesn't build on Darwin, also doesn't really make sense on Darwin
+  withLastlog ? !stdenv.hostPlatform.isDarwin,
   gitUpdater,
 }:
 
@@ -72,10 +74,15 @@ stdenv.mkDerivation (finalPackage: rec {
     "out"
     "lib"
     "man"
+    "login"
   ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ "mount" ]
-  ++ [ "login" ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ "swap" ];
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "mount"
+    "swap"
+  ]
+  ++ lib.optionals withLastlog [
+    "lastlog"
+  ];
   separateDebugInfo = true;
 
   postPatch = ''
@@ -129,8 +136,7 @@ stdenv.mkDerivation (finalPackage: rec {
     "--disable-ipcrm"
     "--disable-ipcs"
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # Doesn't build on Darwin, also doesn't really make sense on Darwin
+  ++ lib.optionals (!withLastlog) [
     "--disable-liblastlog2"
   ]
   ++ lib.optionals stdenv.hostPlatform.isStatic [
@@ -183,6 +189,18 @@ stdenv.mkDerivation (finalPackage: rec {
       prefix=$login _moveSbin
       ln -svf "$login/bin/"* $bin/bin/
     ''
+    + lib.optionalString withLastlog ''
+      # moveToOutput "lib/liblastlog2*" "$lastlog"
+      ${lib.optionalString (!stdenv.hostPlatform.isStatic) ''moveToOutput "lib/security" "$lastlog"''}
+      moveToOutput "lib/tmpfiles.d/lastlog2-tmpfiles.conf" "$lastlog"
+
+      moveToOutput "lib/systemd/system/lastlog2-import.service" "$lastlog"
+      substituteInPlace $lastlog/lib/systemd/system/lastlog2-import.service \
+        --replace-fail "$bin/bin/lastlog2" "$lastlog/bin/lastlog2"
+
+      moveToOutput "bin/lastlog2" "$lastlog"
+      ln -svf "$lastlog/bin/"* $bin/bin/
+    ''
     + lib.optionalString stdenv.hostPlatform.isLinux ''
 
       moveToOutput sbin/swapon "$swap"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0e953a8d19e..dc785cce91a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11387,6 +11387,7 @@ with pkgs;
     shadowSupport = false;
     systemdSupport = false;
     translateManpages = false;
+    withLastlog = false;
   };
 
   v4l-utils = qt6.callPackage ../os-specific/linux/v4l-utils { };

From d30eeb3ef4fe4830c11c3fea27e1476f69f56f22 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 28 Jul 2025 23:53:02 +0200
Subject: [PATCH 0324/3724] nixos/pam: switch to lastlog2

Adaptation of #282337 to use `util-linux` as `lastlog2` provider

Co-Authored-By: Maxine Aubrey <35892750+amaxine@users.noreply.github.com>
---
 nixos/modules/security/pam.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 3eba6d4b519e..e5e8d09a4f57 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -1311,7 +1311,7 @@ let
                 name = "lastlog";
                 enable = cfg.updateWtmp;
                 control = "required";
-                modulePath = "${package}/lib/security/pam_lastlog.so";
+                modulePath = "${pkgs.util-linux.lastlog}/lib/security/pam_lastlog2.so";
                 settings = {
                   silent = true;
                 };
@@ -2311,6 +2311,12 @@ in
 
     environment.etc = lib.mapAttrs' makePAMService enabledServices;
 
+    systemd = lib.optionalAttrs config.security.pam.services.login.updateWtmp {
+      tmpfiles.packages = [ pkgs.util-linux.lastlog ]; # /lib/tmpfiles.d/lastlog2-tmpfiles.conf
+      services.lastlog2-import.enable = true;
+      packages = [ pkgs.util-linux.lastlog ]; # lib/systemd/system/lastlog2-import.service
+    };
+
     security.pam.services = {
       other.text = ''
         auth     required pam_warn.so

From 4401eb4b3b27775878959127e72d62dd7a0d108b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 28 Jul 2025 01:58:11 +0100
Subject: [PATCH 0325/3724] sanitiseHeaderPathsHook: drop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is now handled by the compiler wrapper.

I have verified that `webkitgtk_6_0` still has no GCC dependency on
`aarch64-linux`, and that `watchman` doesn’t pull in any `dev`
outputs on `aarch64-darwin`.

Closes: #424844
Closes: #426934
Closes: #427475
Closes: #428546
---
 pkgs/by-name/ed/edencommon/package.nix         |  2 --
 pkgs/by-name/fb/fbthrift/package.nix           |  2 --
 pkgs/by-name/fi/fizz/package.nix               |  2 --
 pkgs/by-name/fo/folly/package.nix              |  2 --
 pkgs/by-name/gt/gtest/package.nix              |  2 --
 pkgs/by-name/mv/mvfst/package.nix              |  2 --
 .../sa/sanitiseHeaderPathsHook/package.nix     | 18 ------------------
 .../sanitise-header-paths-hook.bash            | 10 ----------
 pkgs/by-name/wa/wangle/package.nix             |  2 --
 .../compilers/gcc/common/dependencies.nix      |  5 -----
 pkgs/development/compilers/gcc/default.nix     |  2 --
 pkgs/development/libraries/boost/generic.nix   |  8 --------
 12 files changed, 57 deletions(-)
 delete mode 100644 pkgs/by-name/sa/sanitiseHeaderPathsHook/package.nix
 delete mode 100644 pkgs/by-name/sa/sanitiseHeaderPathsHook/sanitise-header-paths-hook.bash

diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix
index 85fe05ee86ab..0eaa0c65fa5f 100644
--- a/pkgs/by-name/ed/edencommon/package.nix
+++ b/pkgs/by-name/ed/edencommon/package.nix
@@ -6,7 +6,6 @@
 
   cmake,
   ninja,
-  sanitiseHeaderPathsHook,
 
   glog,
   gflags,
@@ -46,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     ninja
-    sanitiseHeaderPathsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix
index b7b61a363a82..8d6ab8df0fb0 100644
--- a/pkgs/by-name/fb/fbthrift/package.nix
+++ b/pkgs/by-name/fb/fbthrift/package.nix
@@ -7,7 +7,6 @@
 
   cmake,
   ninja,
-  sanitiseHeaderPathsHook,
 
   openssl,
   gflags,
@@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     ninja
-    sanitiseHeaderPathsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix
index 62b784232421..b100518c0e0d 100644
--- a/pkgs/by-name/fi/fizz/package.nix
+++ b/pkgs/by-name/fi/fizz/package.nix
@@ -6,7 +6,6 @@
 
   cmake,
   ninja,
-  sanitiseHeaderPathsHook,
 
   openssl,
   glog,
@@ -48,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     ninja
-    sanitiseHeaderPathsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix
index 0d6ab08f0dbd..48a590a3ed7b 100644
--- a/pkgs/by-name/fo/folly/package.nix
+++ b/pkgs/by-name/fo/folly/package.nix
@@ -8,7 +8,6 @@
   cmake,
   ninja,
   pkg-config,
-  sanitiseHeaderPathsHook,
 
   double-conversion,
   fast-float,
@@ -59,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     ninja
     pkg-config
-    sanitiseHeaderPathsHook
   ];
 
   # See CMake/folly-deps.cmake in the Folly source tree.
diff --git a/pkgs/by-name/gt/gtest/package.nix b/pkgs/by-name/gt/gtest/package.nix
index 33c07f339651..f279587ffe9d 100644
--- a/pkgs/by-name/gt/gtest/package.nix
+++ b/pkgs/by-name/gt/gtest/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   cmake,
   ninja,
-  sanitiseHeaderPathsHook,
   # Enable C++17 support
   #     https://github.com/google/googletest/issues/3081
   # Projects that require a higher standard can override this package.
@@ -48,7 +47,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     ninja
-    sanitiseHeaderPathsHook
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix
index 748b9fa92b98..b5e234128340 100644
--- a/pkgs/by-name/mv/mvfst/package.nix
+++ b/pkgs/by-name/mv/mvfst/package.nix
@@ -6,7 +6,6 @@
 
   cmake,
   ninja,
-  sanitiseHeaderPathsHook,
 
   folly,
   gflags,
@@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     ninja
-    sanitiseHeaderPathsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/sa/sanitiseHeaderPathsHook/package.nix b/pkgs/by-name/sa/sanitiseHeaderPathsHook/package.nix
deleted file mode 100644
index 6e6bd00ebf2f..000000000000
--- a/pkgs/by-name/sa/sanitiseHeaderPathsHook/package.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  lib,
-  makeSetupHook,
-  removeReferencesTo,
-}:
-
-makeSetupHook {
-  name = "sanitise-header-paths-hook";
-
-  substitutions = {
-    removeReferencesTo = lib.getExe removeReferencesTo;
-  };
-
-  meta = {
-    description = "Setup hook to sanitise header file paths to avoid leaked references through `__FILE__`";
-    maintainers = [ lib.maintainers.emily ];
-  };
-} ./sanitise-header-paths-hook.bash
diff --git a/pkgs/by-name/sa/sanitiseHeaderPathsHook/sanitise-header-paths-hook.bash b/pkgs/by-name/sa/sanitiseHeaderPathsHook/sanitise-header-paths-hook.bash
deleted file mode 100644
index 60e311e12a84..000000000000
--- a/pkgs/by-name/sa/sanitiseHeaderPathsHook/sanitise-header-paths-hook.bash
+++ /dev/null
@@ -1,10 +0,0 @@
-sanitiseHeaderPaths() {
-  local header
-  while IFS= read -r -d '' header; do
-    nixLog "sanitising header path in $header"
-    sed -i "1i#line 1 \"$header\"" "$header"
-    @removeReferencesTo@ -t "${!outputInclude}" "$header"
-  done < <(find "${!outputInclude}/include" -type f -print0)
-}
-
-preFixupHooks+=(sanitiseHeaderPaths)
diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix
index 2341006916f0..7f4aacb50d79 100644
--- a/pkgs/by-name/wa/wangle/package.nix
+++ b/pkgs/by-name/wa/wangle/package.nix
@@ -6,7 +6,6 @@
 
   cmake,
   ninja,
-  sanitiseHeaderPathsHook,
 
   folly,
   fizz,
@@ -44,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     ninja
-    sanitiseHeaderPathsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/development/compilers/gcc/common/dependencies.nix b/pkgs/development/compilers/gcc/common/dependencies.nix
index b27b59f2f2b9..292196338977 100644
--- a/pkgs/development/compilers/gcc/common/dependencies.nix
+++ b/pkgs/development/compilers/gcc/common/dependencies.nix
@@ -12,7 +12,6 @@
   gmp,
   mpfr,
   libmpc,
-  sanitiseHeaderPathsHook,
   libucontext ? null,
   libxcrypt ? null,
   isSnapshot ? false,
@@ -42,10 +41,6 @@ in
     texinfo
     which
     gettext
-
-    # Prevent GCC leaking into the runtime closure of C++ packages
-    # through headers using `__FILE__`.
-    sanitiseHeaderPathsHook
   ]
   ++ optionals (perl != null) [ perl ]
   ++ optionals (with stdenv.targetPlatform; isVc4 || isRedox || isSnapshot && flex != null) [ flex ]
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 62993846d7a8..442bf8eb2727 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -49,7 +49,6 @@
     !enablePlugin
     || (stdenv.targetPlatform.isAvr && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64),
   nukeReferences,
-  sanitiseHeaderPathsHook,
   callPackage,
   majorMinorVersion,
   apple-sdk,
@@ -184,7 +183,6 @@ let
       pkgsBuildTarget
       profiledCompiler
       reproducibleBuild
-      sanitiseHeaderPathsHook
       staticCompiler
       stdenv
       targetPackages
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index aa6f1059799c..3fb6dd96491d 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -10,7 +10,6 @@
   fixDarwinDylibNames,
   libiconv,
   libxcrypt,
-  sanitiseHeaderPathsHook,
   makePkgconfigItem,
   copyPkgconfigItems,
   boost-build,
@@ -347,7 +346,6 @@ stdenv.mkDerivation {
     which
     boost-build
     copyPkgconfigItems
-    sanitiseHeaderPathsHook
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs = [
@@ -395,12 +393,6 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  preFixup = ''
-    # Strip UTF‐8 BOMs for `sanitiseHeaderPathsHook`.
-    cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \
-      -exec sed '1s/^\xef\xbb\xbf//' -i '{}' \;
-  '';
-
   postFixup = lib.optionalString stdenv.hostPlatform.isMinGW ''
     $RANLIB "$out/lib/"*.a
   '';

From bd0d5449c00e16d6361d3f13519562c2083e6766 Mon Sep 17 00:00:00 2001
From: BENDI <dev@bendipowered.com>
Date: Thu, 31 Jul 2025 19:53:02 +0200
Subject: [PATCH 0326/3724] freac: Fix crash when selecting output folder

When trying to select an output directory, the program crashes with
`(freac:353602): GLib-GIO-ERROR **: 19:36:13.261: No GSettings schemas
are installed on the system`.

Adding `wrapGAppsHook3` to `buildInputs` fixes this.
---
 pkgs/by-name/fr/freac/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/fr/freac/package.nix b/pkgs/by-name/fr/freac/package.nix
index 15f374baf8bb..7e65b0f43e88 100644
--- a/pkgs/by-name/fr/freac/package.nix
+++ b/pkgs/by-name/fr/freac/package.nix
@@ -6,6 +6,7 @@
   boca,
   smooth,
   systemd,
+  wrapGAppsHook3,
 }:
 
 stdenv.mkDerivation rec {
@@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
     boca
     smooth
     systemd
+    wrapGAppsHook3
   ];
 
   makeFlags = [

From 0efdf36544bf6a2863a3fe6b8b383a3d01cb8db0 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 31 Jul 2025 22:27:18 +0200
Subject: [PATCH 0327/3724] nixos/tests/lastlog: init

---
 nixos/tests/all-tests.nix              |  1 +
 nixos/tests/pam/pam-lastlog.nix        | 21 +++++++++++++++++++++
 pkgs/by-name/li/linux-pam/package.nix  |  1 +
 pkgs/by-name/ut/util-linux/package.nix |  5 +++++
 4 files changed, 28 insertions(+)
 create mode 100644 nixos/tests/pam/pam-lastlog.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index b24bc4d7d7af..2032e5ae051e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1115,6 +1115,7 @@ in
   packagekit = runTest ./packagekit.nix;
   paisa = runTest ./paisa.nix;
   pam-file-contents = runTest ./pam/pam-file-contents.nix;
+  pam-lastlog = runTest ./pam/pam-lastlog.nix;
   pam-oath-login = runTest ./pam/pam-oath-login.nix;
   pam-u2f = runTest ./pam/pam-u2f.nix;
   pam-ussh = runTest ./pam/pam-ussh.nix;
diff --git a/nixos/tests/pam/pam-lastlog.nix b/nixos/tests/pam/pam-lastlog.nix
new file mode 100644
index 000000000000..837c84e1e601
--- /dev/null
+++ b/nixos/tests/pam/pam-lastlog.nix
@@ -0,0 +1,21 @@
+{ ... }:
+
+{
+  name = "pam-lastlog";
+
+  nodes.machine =
+    { ... }:
+    {
+      # we abuse run0 for a quick login as root as to not require setting up accounts and passwords
+      security.pam.services.systemd-run0 = {
+        updateWtmp = true; # enable lastlog
+      };
+    };
+
+  testScript = ''
+    machine.wait_for_unit("multi-user.target")
+    machine.succeed("run0 --pty true") # perform full login
+    print(machine.succeed("lastlog2 --active --user root"))
+    machine.succeed("stat /var/lib/lastlog/lastlog2.db")
+  '';
+}
diff --git a/pkgs/by-name/li/linux-pam/package.nix b/pkgs/by-name/li/linux-pam/package.nix
index 1078aaebbba2..97b67d2131bf 100644
--- a/pkgs/by-name/li/linux-pam/package.nix
+++ b/pkgs/by-name/li/linux-pam/package.nix
@@ -84,6 +84,7 @@ stdenv.mkDerivation rec {
     inherit (nixosTests)
       pam-oath-login
       pam-u2f
+      pam-lastlog
       shadow
       sssd-ldap
       ;
diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index 03a2a82098cd..6451e9f4834b 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -31,6 +31,7 @@
   # Doesn't build on Darwin, also doesn't really make sense on Darwin
   withLastlog ? !stdenv.hostPlatform.isDarwin,
   gitUpdater,
+  nixosTests,
 }:
 
 let
@@ -227,6 +228,10 @@ stdenv.mkDerivation (finalPackage: rec {
     # encode upstream assumption to be used in man-db
     # https://github.com/util-linux/util-linux/commit/8886d84e25a457702b45194d69a47313f76dc6bc
     hasCol = stdenv.hostPlatform.libc == "glibc";
+
+    tests = {
+      inherit (nixosTests) pam-lastlog;
+    };
   };
 
   meta = {

From 2493c8c13213c50d410119da18ee83ce3ad0648c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 31 Jul 2025 08:25:56 +0100
Subject: [PATCH 0328/3724] haskell.packages.ghc865Binary.exceptions: fix the
 eval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the eval fails as:

  $ nix build --no-link -f. haskell.packages.ghc865Binary.exceptions
  error: attribute 'exceptions_0_10_9' missing
       at pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix:94:16:
           93|   # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore.
           94|   exceptions = self.exceptions_0_10_9;
             |                ^
           95|
       Did you mean exceptions_0_10_10?
---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghcjs-8.x.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index d4bd67400d81..3258dd341465 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -91,7 +91,7 @@ self: super: {
   some = addBuildDepend self.base-orphans super.some;
 
   # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore.
-  exceptions = self.exceptions_0_10_9;
+  exceptions = self.exceptions_0_10_10;
 
   mime-string = disableOptimization super.mime-string;
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs-8.x.nix b/pkgs/development/haskell-modules/configuration-ghcjs-8.x.nix
index 7b23cb9f4b07..56776f094cb9 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs-8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs-8.x.nix
@@ -40,7 +40,7 @@ self: super:
   # GHCJS does not ship with the same core packages as GHC.
   # https://github.com/ghcjs/ghcjs/issues/676
   stm = doJailbreak self.stm_2_5_3_1;
-  exceptions = dontCheck self.exceptions_0_10_9;
+  exceptions = dontCheck self.exceptions_0_10_10;
 
   ## OTHER PACKAGES
 

From 07214519c6309b727e727fca62f0b606d8efd0b2 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 30 Jul 2025 18:23:57 +0000
Subject: [PATCH 0329/3724] uv: 0.8.3 -> 0.8.4

---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index ee9b2113720f..70365834c0e5 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-b/BXJPa85RrW+9kQ9xEJhbw52BADaw1pUeSbfhCgl20=";
+    hash = "sha256-P87yB7TSPjbUwc+FVzGkOYJ/bzlDbKMMeA3iebP7pIU=";
   };
 
-  cargoHash = "sha256-bH5GHm+f+QjdXpZdjzdJQ9JaaTQ+iGe/oqnyPbxDW0c=";
+  cargoHash = "sha256-oH5MzsvQoPP8ybSqnuYdzbzJr36iYAfHYlUtSB3EQUc=";
 
   buildInputs = [
     rust-jemalloc-sys

From 629f720b67025148a4e08ea15ea94327cf661a56 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Fri, 1 Aug 2025 00:32:49 +0200
Subject: [PATCH 0330/3724] nodejs_22: 22.17.1 -> 22.18.0

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

diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index ff3655c4db56..4300e2963713 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -14,15 +14,11 @@ let
     inherit openssl;
     python = python3;
   };
-
-  gypPatches = callPackage ./gyp-patches.nix {
-    patch_tools = false;
-  };
 in
 buildNodejs {
   inherit enableNpm;
-  version = "22.17.1";
-  sha256 = "327415fd76fcebb98133bf56e2d90e3ac048b038fac2676f03b6db91074575b9";
+  version = "22.18.0";
+  sha256 = "120e0f74419097a9fafae1fd80b9de7791a587e6f1c48c22b193239ccd0f7084";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
@@ -48,7 +44,6 @@ buildNodejs {
         hash = "sha256-hSTLljmVzYmc3WAVeRq9EPYluXGXFeWVXkykufGQPVw=";
       })
     ]
-    ++ gypPatches
     ++ [
       ./configure-armv6-vfpv2.patch
       ./disable-darwin-v8-system-instrumentation-node19.patch
@@ -56,12 +51,5 @@ buildNodejs {
       ./node-npm-build-npm-package-logic.patch
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
-
-      # Fix for flaky test
-      # TODO: remove when included in a release
-      (fetchpatch2 {
-        url = "https://github.com/nodejs/node/commit/cd685fe3b6b18d2a1433f2635470513896faebe6.patch?full_index=1";
-        hash = "sha256-KA7WBFnLXCKx+QVDGxFixsbj3Y7uJkAKEUTeLShI1Xo=";
-      })
     ];
 }

From c632f2a28bc26e848ba38bac2789e1d6c59a71ea Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Mon, 28 Jul 2025 14:39:59 -0700
Subject: [PATCH 0331/3724] slsk-batchdl: init at 2.4.7

---
 pkgs/by-name/sl/slsk-batchdl/deps.json   | 217 +++++++++++++++++++++++
 pkgs/by-name/sl/slsk-batchdl/package.nix |  58 ++++++
 2 files changed, 275 insertions(+)
 create mode 100644 pkgs/by-name/sl/slsk-batchdl/deps.json
 create mode 100644 pkgs/by-name/sl/slsk-batchdl/package.nix

diff --git a/pkgs/by-name/sl/slsk-batchdl/deps.json b/pkgs/by-name/sl/slsk-batchdl/deps.json
new file mode 100644
index 000000000000..e2c86476f9d0
--- /dev/null
+++ b/pkgs/by-name/sl/slsk-batchdl/deps.json
@@ -0,0 +1,217 @@
+[
+  {
+    "pname": "AngleSharp",
+    "version": "1.2.0",
+    "hash": "sha256-l8+Var9o773VL6Ybih3boaFf9sYjS7eqtLGd8DCIPsk="
+  },
+  {
+    "pname": "EmbedIO",
+    "version": "3.5.2",
+    "hash": "sha256-e6GfVHXxYeUw3ntCrHokNoAS6mXArO7+vdMeUFnsSo8="
+  },
+  {
+    "pname": "Goblinfactory.ProgressBar",
+    "version": "1.0.0",
+    "hash": "sha256-tV3Fw792zfYhB2dN97VKXBwS5eypqKExgAJy+bcDo8I="
+  },
+  {
+    "pname": "Google.Apis",
+    "version": "1.69.0",
+    "hash": "sha256-/9JN0CZIFZnmGS69ki38RlNzQiwp4yO0MFDeRk1slsg="
+  },
+  {
+    "pname": "Google.Apis.Auth",
+    "version": "1.69.0",
+    "hash": "sha256-T6n3hc+KpgHNqQQeJLOmgHQWkjBvnhIob5giHabREV8="
+  },
+  {
+    "pname": "Google.Apis.Core",
+    "version": "1.69.0",
+    "hash": "sha256-IW1AOY8o6hHkrc/tINsS/VCOUrOSoXb6OCSEF6gamkc="
+  },
+  {
+    "pname": "Google.Apis.YouTube.v3",
+    "version": "1.69.0.3680",
+    "hash": "sha256-3aNScBqmchnDkLejK5HYHiLVVDexrFUtZ6xe8cGP28M="
+  },
+  {
+    "pname": "HtmlAgilityPack",
+    "version": "1.11.72",
+    "hash": "sha256-MRt7yj6+/ORmr2WBERpQ+1gMRzIaPFKddHoB4zZmv2k="
+  },
+  {
+    "pname": "Microsoft.ApplicationInsights",
+    "version": "2.22.0",
+    "hash": "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="
+  },
+  {
+    "pname": "Microsoft.Bcl.AsyncInterfaces",
+    "version": "9.0.1",
+    "hash": "sha256-A3W2Hvhlf1ODx1NYWHwUyziZOGMaDPvXHZ/ubgNLYJA="
+  },
+  {
+    "pname": "Microsoft.CodeCoverage",
+    "version": "17.9.0",
+    "hash": "sha256-OaGa4+jRPHs+T+p/oekm2Miluqfd2IX8Rt+BmUx8kr4="
+  },
+  {
+    "pname": "Microsoft.CSharp",
+    "version": "4.7.0",
+    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
+  },
+  {
+    "pname": "Microsoft.NET.Test.Sdk",
+    "version": "17.9.0",
+    "hash": "sha256-q/1AJ7eNlk02wvN76qvjl2xBx5iJ+h5ssiE/4akLmtI="
+  },
+  {
+    "pname": "Microsoft.Testing.Extensions.Telemetry",
+    "version": "1.5.3",
+    "hash": "sha256-bIXwPSa3jkr2b6xINOqMUs6/uj/r4oVFM7xq3uVIZDU="
+  },
+  {
+    "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
+    "version": "1.5.3",
+    "hash": "sha256-IfMRfcyaIKEMRtx326ICKtinDBEfGw/Sv8ZHawJ96Yc="
+  },
+  {
+    "pname": "Microsoft.Testing.Extensions.VSTestBridge",
+    "version": "1.5.3",
+    "hash": "sha256-XpM/yFjhLSsuzyDV+xKubs4V1zVVYiV05E0+N4S1h0g="
+  },
+  {
+    "pname": "Microsoft.Testing.Platform",
+    "version": "1.5.3",
+    "hash": "sha256-y61Iih6w5D79dmrj2V675mcaeIiHoj1HSa1FRit2BLM="
+  },
+  {
+    "pname": "Microsoft.Testing.Platform.MSBuild",
+    "version": "1.5.3",
+    "hash": "sha256-YspvjE5Jfi587TAfsvfDVJXNrFOkx1B3y1CKV6m7YLY="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.ObjectModel",
+    "version": "17.12.0",
+    "hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.ObjectModel",
+    "version": "17.9.0",
+    "hash": "sha256-iiXUFzpvT8OWdzMj9FGJDqanwHx40s1TXVY9l3ii+s0="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.TestHost",
+    "version": "17.9.0",
+    "hash": "sha256-1BZIY1z+C9TROgdTV/tq4zsPy7Q71GQksr/LoMKAzqU="
+  },
+  {
+    "pname": "MSTest.Analyzers",
+    "version": "3.7.3",
+    "hash": "sha256-6mNfHtx9FBWA6/QrRUepwbxXWG/54GRyeZYazDiMacg="
+  },
+  {
+    "pname": "MSTest.TestAdapter",
+    "version": "3.7.3",
+    "hash": "sha256-3O/AXeS+3rHWstinivt73oa0QDp+xQpTc9p46EF+Mtc="
+  },
+  {
+    "pname": "MSTest.TestFramework",
+    "version": "3.7.3",
+    "hash": "sha256-RweCMMf14GI6HqjDIP68JM67IaJKYQTZy0jk5Q4DFxs="
+  },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.1",
+    "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
+  },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.3",
+    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
+  },
+  {
+    "pname": "SmallestCSVParser",
+    "version": "1.1.1",
+    "hash": "sha256-64E87w+4FcQtYsFIOMGGmYmjXVGBwsBqgLVb7p0wc04="
+  },
+  {
+    "pname": "Soulseek",
+    "version": "7.1.0",
+    "hash": "sha256-n6LUNuPmmy9QYNNALR0ObYyR9LJalf0H8P+SKnoqfFc="
+  },
+  {
+    "pname": "SpotifyAPI.Web",
+    "version": "7.2.1",
+    "hash": "sha256-gbTLJaj7DSXZQlo0xpegZ8HLruMe6WmDyD8+l6YE3hg="
+  },
+  {
+    "pname": "SpotifyAPI.Web.Auth",
+    "version": "7.2.1",
+    "hash": "sha256-uzpyPlXNCuSHrcK4SKH0ydY2HlDKXU51W5ahk2Oqu98="
+  },
+  {
+    "pname": "System.CodeDom",
+    "version": "7.0.0",
+    "hash": "sha256-7IPt39cY+0j0ZcRr/J45xPtEjnSXdUJ/5ai3ebaYQiE="
+  },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "5.0.0",
+    "hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4="
+  },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "9.0.1",
+    "hash": "sha256-CnmDanknCGbNnoDjgZw62M/Grg8IMTJDa8x3P07UR2A="
+  },
+  {
+    "pname": "System.Management",
+    "version": "7.0.2",
+    "hash": "sha256-bJ21ILQfbHb8mX2wnVh7WP/Ip7gdVPIw+BamQuifTVY="
+  },
+  {
+    "pname": "System.Memory",
+    "version": "4.6.0",
+    "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo="
+  },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "1.6.0",
+    "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "9.0.1",
+    "hash": "sha256-iuAVcTiiZQLCZjDfDqdLLPHqZdZqvFabwLFHiVYdRJo="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "9.0.1",
+    "hash": "sha256-2dqE+Mx5eJZ8db74ofUiUXHOSxDCmXw5n9VC9w4fUr0="
+  },
+  {
+    "pname": "System.Threading.Tasks.Extensions",
+    "version": "4.6.0",
+    "hash": "sha256-OwIB0dpcdnyfvTUUj6gQfKW2XF2pWsQhykwM1HNCHqY="
+  },
+  {
+    "pname": "System.ValueTuple",
+    "version": "4.5.0",
+    "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="
+  },
+  {
+    "pname": "TagLibSharp",
+    "version": "2.3.0",
+    "hash": "sha256-PD9bVZiPaeC8hNx2D+uDUf701cCaMi2IRi5oPTNN+/w="
+  },
+  {
+    "pname": "Unosquare.Swan.Lite",
+    "version": "3.1.0",
+    "hash": "sha256-PL8N3CqIz/wku8/mkRMC3X868Byv47C20/rBLBhkS3o="
+  },
+  {
+    "pname": "YoutubeExplode",
+    "version": "6.5.4",
+    "hash": "sha256-5sexIiBj5XP9rP5DA0NQ+vHJ9lpjwp00EvVux901WLc="
+  }
+]
diff --git a/pkgs/by-name/sl/slsk-batchdl/package.nix b/pkgs/by-name/sl/slsk-batchdl/package.nix
new file mode 100644
index 000000000000..5967bd8ed2ee
--- /dev/null
+++ b/pkgs/by-name/sl/slsk-batchdl/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+buildDotnetModule (finalAttrs: {
+  pname = "slsk-batchdl";
+  version = "2.4.7";
+
+  src = fetchFromGitHub {
+    owner = "fiso64";
+    repo = "slsk-batchdl";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-P7V7YJUA1bkfp13Glb1Q+NJ7iTya/xgO1TM88z1Nddc=";
+  };
+
+  postPatch = ''
+    # .NET 6 is EOL, .NET 8 works fine modulo the trimming flag.
+    # See: https://github.com/fiso64/slsk-batchdl/issues/112
+    substituteInPlace \
+        slsk-batchdl/slsk-batchdl.csproj \
+        slsk-batchdl.Tests/slsk-batchdl.Tests.csproj \
+        --replace-fail "<TargetFramework>net6.0</TargetFramework>" "<TargetFramework>net8.0</TargetFramework>"
+  '';
+
+  projectFile = "slsk-batchdl/slsk-batchdl.csproj";
+
+  # Tests fail to build.
+  # See: https://github.com/fiso64/slsk-batchdl/issues/111
+  # testProjectFile = "slsk-batchdl.Tests/slsk-batchdl.Tests.csproj";
+
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  nugetDeps = ./deps.json;
+  executables = [ "sldl" ];
+
+  dotnetFlags = [
+    "--property:PublishSingleFile=true"
+    # Note: This breaks Spotify authentication!
+    # See: https://github.com/fiso64/slsk-batchdl/issues/112
+    # "--property:PublishTrimmed=true"
+  ];
+
+  selfContainedBuild = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/fiso64/slsk-batchdl";
+    description = "Advanced download tool for Soulseek";
+    license = lib.licenses.gpl3Only;
+    maintainers = [
+      lib.maintainers._9999years
+    ];
+    mainProgram = "sldl";
+  };
+})

From 33a086ac03856a49abfdd35e800dc28ce8410e97 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 1 Aug 2025 07:06:20 +0100
Subject: [PATCH 0332/3724] bash: update hash following upstream re-release

In https://github.com/NixOS/nixpkgs/pull/427862#issuecomment-3141489866
we found out that `bash` did a re-release to regenerate `.gmo` files.
Let's update the hash.

Closes: https://github.com/NixOS/nixpkgs/issues/429953
---
 pkgs/shells/bash/5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix
index 70a615951c3e..424769a4a5c1 100644
--- a/pkgs/shells/bash/5.nix
+++ b/pkgs/shells/bash/5.nix
@@ -36,7 +36,7 @@ lib.warnIf (withDocs != null)
 
     src = fetchurl {
       url = "mirror://gnu/bash/bash-${lib.removeSuffix patch_suffix version}.tar.gz";
-      hash = "sha256-Yt1JxEw5ntGz9/cx6Hp4IzTYNPCOCYo18sh1R9Xbsmk=";
+      hash = "sha256-DVzYaWX4aaJs9k9Lcb57lvkKO6iz104n6OnZ1VUPMbo=";
     };
 
     hardeningDisable = [

From d1d1d334eadacb4d3a7d9dfa424c97c8f1243908 Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Fri, 1 Aug 2025 12:06:05 +0200
Subject: [PATCH 0333/3724] sratoolkit: fix build due to undefined
 ATTRIBUTE_UNUSED

---
 pkgs/by-name/sr/sratoolkit/attribute_unused.patch | 14 ++++++++++++++
 pkgs/by-name/sr/sratoolkit/package.nix            |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/by-name/sr/sratoolkit/attribute_unused.patch

diff --git a/pkgs/by-name/sr/sratoolkit/attribute_unused.patch b/pkgs/by-name/sr/sratoolkit/attribute_unused.patch
new file mode 100644
index 000000000000..203a9921fac6
--- /dev/null
+++ b/pkgs/by-name/sr/sratoolkit/attribute_unused.patch
@@ -0,0 +1,14 @@
+diff --git a/libs/kxml/xml.c b/libs/kxml/xml.c
+index ce445424..41e21612 100644
+--- a/libs/kxml/xml.c
++++ b/libs/kxml/xml.c
+@@ -46,6 +46,9 @@ struct s_KNodeNamelist;
+ #include <assert.h>
+ #include <string.h>
+ 
++#ifndef ATTRIBUTE_UNUSED
++#define ATTRIBUTE_UNUSED
++#endif
+ 
+ #define XML_DEBUG(msg) DBGMSG (DBG_XML, DBG_FLAG(DBG_XML_XML), msg)
+ 
diff --git a/pkgs/by-name/sr/sratoolkit/package.nix b/pkgs/by-name/sr/sratoolkit/package.nix
index fa7bd2f17c40..fae32aa5a2b1 100644
--- a/pkgs/by-name/sr/sratoolkit/package.nix
+++ b/pkgs/by-name/sr/sratoolkit/package.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-OeM4syv9c1rZn2ferrhXyKJu68ywVYwnHoqnviWBZy4=";
   };
 
+  patches = [ ./attribute_unused.patch ];
+
   cmakeFlags = [
     "-DVDB_INCDIR=${ncbi-vdb}/include"
     "-DVDB_LIBDIR=${ncbi-vdb}/lib"

From 067bdc6b9d7a79d4ea99d64a620a6c2d11597586 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 31 Jul 2025 19:47:02 +0300
Subject: [PATCH 0334/3724] v4l-utils: fix cross-compilation

Signed-off-by: Alexander V. Nikolaev <avn@avnik.info>
---
 pkgs/os-specific/linux/v4l-utils/default.nix | 22 ++++++++++++++------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 5518fe5d64b5..beaaeaffdd0f 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -19,10 +19,10 @@
   withUtils ? true,
   withGUI ? true,
   alsa-lib,
-  qt5compat,
-  qtbase,
   libGLU,
-  wrapQtAppsHook,
+  qt6Packages,
+  linuxHeaders,
+  buildPackages,
 }:
 
 # See libv4l in all-packages.nix for the libs only (overrides alsa, QT)
@@ -66,6 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isGnu [
     (lib.mesonOption "gconvsysdir" "${glibc.out}/lib/gconv")
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    # BPF support fail to cross compile, unable to find `linux/lirc.h`
+    (lib.mesonOption "bpf" "disabled")
   ];
 
   postFixup = ''
@@ -82,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
     perl
     udevCheckHook
   ]
-  ++ lib.optional withQt wrapQtAppsHook;
+  ++ lib.optional withQt qt6Packages.wrapQtAppsHook;
 
   buildInputs = [
     json_c
@@ -93,8 +97,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional (!stdenv.hostPlatform.isGnu) argp-standalone
   ++ lib.optionals withQt [
     alsa-lib
-    qt5compat
-    qtbase
+    qt6Packages.qt5compat
+    qt6Packages.qtbase
     libGLU
   ];
 
@@ -115,6 +119,12 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "get_option('datadir') / 'locale'" "get_option('localedir')"
   '';
 
+  # Meson unable to find moc/uic/rcc in case of cross-compilation
+  # https://github.com/mesonbuild/meson/issues/13018
+  preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+    export PATH=${buildPackages.qt6Packages.qtbase}/libexec:$PATH
+  '';
+
   enableParallelBuilding = true;
 
   doInstallCheck = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index affa0ae81764..c43d4a99f1b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11391,7 +11391,7 @@ with pkgs;
     translateManpages = false;
   };
 
-  v4l-utils = qt6.callPackage ../os-specific/linux/v4l-utils { };
+  v4l-utils = callPackage ../os-specific/linux/v4l-utils { };
 
   windows = callPackages ../os-specific/windows { };
 

From 0b35f8970dfdad4e45c387524cdf55771e44a9f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 13:22:04 +0000
Subject: [PATCH 0335/3724] ocamlPackages.macaddr: 5.6.0 -> 5.6.1

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

diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix
index b413e7570d74..d64ff8054935 100644
--- a/pkgs/development/ocaml-modules/macaddr/default.nix
+++ b/pkgs/development/ocaml-modules/macaddr/default.nix
@@ -9,13 +9,13 @@
 
 buildDunePackage rec {
   pname = "macaddr";
-  version = "5.6.0";
+  version = "5.6.1";
 
   minimalOCamlVersion = "4.04";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz";
-    hash = "sha256-njBDP9tMpDemqo/7RHuspeunYV+4jnsM2KS0FsMggTM=";
+    hash = "sha256-HmF9+KvUWEPII+m+dSZ9J0JstXhmHPJWItULJa4Uoxk=";
   };
 
   checkInputs = [

From 494514a67039f7d88e12e4ad454e29ebf1d1414c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 14:14:48 +0000
Subject: [PATCH 0336/3724] python3Packages.bitarray: 3.4.3 -> 3.6.0

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

diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix
index f99321e0e04f..0914b1ad5bfe 100644
--- a/pkgs/development/python-modules/bitarray/default.nix
+++ b/pkgs/development/python-modules/bitarray/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "bitarray";
-  version = "3.4.3";
+  version = "3.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-3d+yvwhrZq7BwBENxGZCtxYfWHpkQc/nTanjI5dfYvA=";
+    hash = "sha256-IP68hJofhY5qV6fUezI/6ecnxXnd1SbTF62IMXSKZqg=";
   };
 
   build-system = [ setuptools ];

From 313baaada1eb9226ec1a5dd3cdb5dea45f513300 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Thu, 10 Jul 2025 15:05:29 +0900
Subject: [PATCH 0337/3724] action-validator: 0.6.0-unstable-2025-02-16 ->
 0.7.1

Diff: https://github.com/mpalmer/action-validator/compare/2f8be1d2066eb3687496a156d00b4f1b3ea7b028...v0.7.1
---
 pkgs/by-name/ac/action-validator/package.nix | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ac/action-validator/package.nix b/pkgs/by-name/ac/action-validator/package.nix
index 9e686d16a40c..01848555df5d 100644
--- a/pkgs/by-name/ac/action-validator/package.nix
+++ b/pkgs/by-name/ac/action-validator/package.nix
@@ -2,27 +2,24 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  unstableGitUpdater,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "action-validator";
-  version = "0.6.0-unstable-2025-02-16";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "mpalmer";
     repo = "action-validator";
-    rev = "2f8be1d2066eb3687496a156d00b4f1b3ea7b028";
-    hash = "sha256-QDnikgAfkrvn7/vnmgTQ5J8Ro2HZ6SVkp9cPUYgejqM=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-pqWowcc/3NHtVcNDZ+4opgtwttcKdUVoi4qkv56JvY4=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-FuJ5NzeZhfN312wK5Q1DgIXUAN6hqxu/1BhGqasbdS8=";
+  cargoHash = "sha256-w6qC4gJ06TfoQl2WD8lgOxSxUWyG6Z8ma9mUvvYlkTU=";
 
-  passthru.updateScript = unstableGitUpdater {
-    tagPrefix = "v";
-    branch = "main";
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Tool to validate GitHub Action and Workflow YAML files";
@@ -31,4 +28,4 @@ rustPlatform.buildRustPackage {
     mainProgram = "action-validator";
     maintainers = with lib.maintainers; [ thiagokokada ];
   };
-}
+})

From 023310e44ece2909d40fe6cba62f3fcb7da47d7b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 31 Jul 2025 10:41:57 +0200
Subject: [PATCH 0338/3724] meson: 1.8.2 -> 1.8.3

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

diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 78680308f346..ca0071b30231 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -16,14 +16,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
-  version = "1.8.2";
+  version = "1.8.3";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "mesonbuild";
     repo = "meson";
     tag = version;
-    hash = "sha256-xH3JPlXXkLKKT8Gay6qHG/JXTT1UcUCQaSC65Vxhfl0=";
+    hash = "sha256-Htjr/gZ4G53XY/kuGsbToZOo+ptDoNA737aaqDT1AUo=";
   };
 
   patches = [

From 094b3521c515a43ff2675083128ddfdf96847165 Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Fri, 1 Aug 2025 21:46:58 -0400
Subject: [PATCH 0339/3724] chatgpt: 1.2025.063 -> 1.2025.203

---
 pkgs/by-name/ch/chatgpt/source.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chatgpt/source.nix b/pkgs/by-name/ch/chatgpt/source.nix
index d39eb64fc21f..ee7a715de7fc 100644
--- a/pkgs/by-name/ch/chatgpt/source.nix
+++ b/pkgs/by-name/ch/chatgpt/source.nix
@@ -1,7 +1,7 @@
 {
-  version = "1.2025.063";
+  version = "1.2025.203";
   src = {
-    url = "https://persistent.oaistatic.com/sidekick/public/ChatGPT_Desktop_public_1.2025.063_1741403068.dmg";
-    hash = "sha256-ZqQZtrN+t6C5BRCHh8iqA/e11EA2GCvVTcxAAjK7Vq0=";
+    url = "https://persistent.oaistatic.com/sidekick/public/ChatGPT_Desktop_public_1.2025.203_1753492939.dmg";
+    hash = "sha256-m+KvDXcNz4M6MhgOGwsTGytXzAuC6WKd/Dr+3PESQtg=";
   };
 }

From 27c9f0748771dc13430e0a4a9b31b8bde423b750 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sat, 2 Aug 2025 09:02:54 +0200
Subject: [PATCH 0340/3724] aligator: 0.14.0 -> 0.15.0

Diff: https://github.com/Simple-Robotics/aligator/compare/refs/tags/v0.14.0...refs/tags/v0.15.0

Changelog: https://github.com/Simple-Robotics/aligator/blob/v0.15.0/CHANGELOG.md
---
 pkgs/by-name/al/aligator/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix
index 4b21d4326b45..9b4057e58267 100644
--- a/pkgs/by-name/al/aligator/package.nix
+++ b/pkgs/by-name/al/aligator/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "aligator";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "Simple-Robotics";
     repo = "aligator";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SkhFV/a3A6BqzoicQa7MUgsEuDzd+JfgYvL4ztHg/K0=";
+    hash = "sha256-x9vOj5Dy2SaQOLBCM13wZ/4SxgBz+99K/UxJqhKTg3c=";
   };
 
   outputs = [

From de8aa73f5bdbc002dd8ead199632a1e23a115d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20=22Capypara=22=20K=C3=B6pcke?= <hello@capypara.de>
Date: Sat, 2 Aug 2025 11:02:31 +0200
Subject: [PATCH 0341/3724] google-lighthouse: 12.7.0 -> 12.8.1

---
 pkgs/by-name/go/google-lighthouse/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/google-lighthouse/package.nix b/pkgs/by-name/go/google-lighthouse/package.nix
index b20293e23aa8..5bbcddcc07a8 100644
--- a/pkgs/by-name/go/google-lighthouse/package.nix
+++ b/pkgs/by-name/go/google-lighthouse/package.nix
@@ -12,18 +12,18 @@
 }:
 stdenv.mkDerivation rec {
   pname = "google-lighthouse";
-  version = "12.7.0";
+  version = "12.8.1";
 
   src = fetchFromGitHub {
     owner = "GoogleChrome";
     repo = "lighthouse";
     tag = "v${version}";
-    hash = "sha256-5YSUbqjzgBTjBtZYLwiGFWdWD9aDZ9To8kBZd09Tzkw=";
+    hash = "sha256-7I2dtQIWbhkH4l3seDA76bkZWTT+izWASTQXsMb3d+Y=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-ySNsklPfhUm/RkXzAA2wlzx4jg61vL3zxlyhEBppMVE=";
+    hash = "sha256-wmzQE9gmjynHfS47fg/yDizf3/JAOfd+xeAh0XRIat8=";
   };
 
   yarnBuildScript = "build-report";

From 162645e9c4369546f05d311f0fce613a2db5b826 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Sat, 2 Aug 2025 13:40:59 +0200
Subject: [PATCH 0342/3724] flex-ncat: 0.5-2025031901 -> 0.6-20250801.0

---
 pkgs/by-name/fl/flex-ncat/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fl/flex-ncat/package.nix b/pkgs/by-name/fl/flex-ncat/package.nix
index 7e6abf1edeb2..ef1db211d8ea 100644
--- a/pkgs/by-name/fl/flex-ncat/package.nix
+++ b/pkgs/by-name/fl/flex-ncat/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "flex-ncat";
-  version = "0.5-2025031901";
+  version = "0.6-20250801.0";
 
   src = fetchFromGitHub {
     owner = "kc2g-flex-tools";
     repo = "nCAT";
-    rev = "v${version}";
-    hash = "sha256-hbsrs9lgpxNqG8mmXsft01LmpX4dBpl1ncpdTWBgrUQ=";
+    tag = "v${version}";
+    hash = "sha256-l+A7PlckZFGwibMU5QelMzANP1WS5WPApOnQV0P+SGw=";
   };
 
-  vendorHash = "sha256-RqQMCP9rmdTG5AXLXkIQz0vE7qF+3RZ1BDdVRYoHHQs=";
+  vendorHash = "sha256-daMeYk64xzDPIyZl7SdXaQbu2Dvdw/yVV87/8Agvxk0=";
 
   passthru.updateScript = nix-update-script { };
 

From c6cdef73de3ffa325fde886f31b993a632b52ca9 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Sat, 2 Aug 2025 13:50:23 +0200
Subject: [PATCH 0343/3724] flex-ndax: 0.4-20240818 -> 0.5-20250801.0

---
 pkgs/by-name/fl/flex-ndax/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fl/flex-ndax/package.nix b/pkgs/by-name/fl/flex-ndax/package.nix
index abc0e79ff7cc..a851705be671 100644
--- a/pkgs/by-name/fl/flex-ndax/package.nix
+++ b/pkgs/by-name/fl/flex-ndax/package.nix
@@ -9,18 +9,18 @@
 
 buildGoModule rec {
   pname = "flex-ndax";
-  version = "0.4-20240818";
+  version = "0.5-20250801.0";
 
   src = fetchFromGitHub {
     owner = "kc2g-flex-tools";
     repo = "nDAX";
-    rev = "v${version}";
-    hash = "sha256-FCF22apO6uAc24H36SkvfKEKdyqY4l+j7ABdOnhZP6M=";
+    tag = "v${version}";
+    hash = "sha256-2yHv1FSikQuPamAwSzZB6+ZoblFoD/8Jnvhhv9OO+VY=";
   };
 
   buildInputs = [ libpulseaudio ];
 
-  vendorHash = "sha256-05LWJm4MoJqjJaFrBZvutKlqSTGl4dSp433AfHHO6LU=";
+  vendorHash = "sha256-saQjN2G4mhS4XAxZbPnP2+F6n4pWw5bMNlcb8xEs11M=";
 
   passthru.updateScript = nix-update-script { };
 

From 1d616f33e40efc9a176a974cf7d7c00d3e601f0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 12:36:16 +0000
Subject: [PATCH 0344/3724] lhasa: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/by-name/lh/lhasa/package.nix b/pkgs/by-name/lh/lhasa/package.nix
index ee98f0ac5c61..418c2cb35c39 100644
--- a/pkgs/by-name/lh/lhasa/package.nix
+++ b/pkgs/by-name/lh/lhasa/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lhasa";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchurl {
     url = "https://soulsphere.org/projects/lhasa/lhasa-${version}.tar.gz";
-    sha256 = "sha256-p/yIPDBMUIVi+5P6MHpMNCsMiG/MJl8ouS3Aw5IgxbM=";
+    sha256 = "sha256-v4eFxwYJ0h62K32ueJTxOIiPiJ086Xho1QL24Tp5Kxw=";
   };
 
   meta = with lib; {

From 0de77985b71ccae2a607acfe78afbc3841ff7226 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sun, 29 Jun 2025 18:33:09 +0200
Subject: [PATCH 0345/3724] gradle_9: init at 9.0.0

Release notes: https://github.com/gradle/gradle/releases/tag/v9.0.0
---
 pkgs/development/tools/build-managers/gradle/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix                          | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 479f6afa75a4..7e7eb2d7a1aa 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -223,6 +223,11 @@ rec {
   # and respect the compatibility matrix at
   # https://docs.gradle.org/current/userguide/compatibility.html
 
+  gradle_9 = gen {
+    version = "9.0.0";
+    hash = "sha256-j609eClspRgRPz0pAWYXx/k2fcAF+TK9nZO/RbpGBys=";
+    defaultJava = jdk21;
+  };
   gradle_8 = gen {
     version = "8.14.3";
     hash = "sha256-vXEQIhNJMGCVbsIp2Ua+7lcVjb2J0OYrkbyg+ixfNTE=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15b7b79653f4..06ebea73f9dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7252,10 +7252,12 @@ with pkgs;
 
   gradle_7-unwrapped = callPackage gradle-packages.gradle_7 { };
   gradle_8-unwrapped = callPackage gradle-packages.gradle_8 { };
+  gradle_9-unwrapped = callPackage gradle-packages.gradle_9 { };
   gradle-unwrapped = gradle_8-unwrapped;
 
   gradle_7 = wrapGradle gradle_7-unwrapped null;
   gradle_8 = wrapGradle gradle_8-unwrapped null;
+  gradle_9 = wrapGradle gradle_9-unwrapped null;
   gradle = wrapGradle gradle-unwrapped "gradle-unwrapped";
 
   griffe = with python3Packages; toPythonApplication griffe;

From 3dd3090f9aa76d8fa866230621a3445d0468c63f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 15:19:44 +0000
Subject: [PATCH 0346/3724] oath-toolkit: 2.6.12 -> 2.6.13

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

diff --git a/pkgs/by-name/oa/oath-toolkit/package.nix b/pkgs/by-name/oa/oath-toolkit/package.nix
index 4754902de053..d994e61601d0 100644
--- a/pkgs/by-name/oa/oath-toolkit/package.nix
+++ b/pkgs/by-name/oa/oath-toolkit/package.nix
@@ -14,11 +14,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "oath-toolkit";
-  version = "2.6.12";
+  version = "2.6.13";
 
   src = fetchurl {
     url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
-    hash = "sha256-yv33ObHsSydkQcau2uZBFDS72HAHH2YVS5CcxuLZ6Lo=";
+    hash = "sha256-W12C6aRFUgbST8vX7li/THk5ii5nmX2AvUWuknWGsYs=";
   };
 
   buildInputs = [ securityDependency ];

From 26b2fa2426c96f88c9139104101f7c6da778d16c Mon Sep 17 00:00:00 2001
From: TheBarzani <ismaelmergasori@gmail.com>
Date: Sat, 2 Aug 2025 16:06:34 -0400
Subject: [PATCH 0347/3724] python310Packages.pip: fix build failure caused by
 sphinx-8.2.3

This is related to the issue #394105
---
 pkgs/development/python-modules/pip/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index dca65d503b20..44760b668b17 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonAtLeast,
 
   # build-system
   installShellFiles,
@@ -51,20 +52,24 @@ let
       installShellFiles
       setuptools
       wheel
-
+    ]
+    ++ lib.optionals (pythonAtLeast "3.11") [
       # docs
+      # (sphinx requires Python 3.11)
       sphinx
       sphinx-issues
     ];
 
     outputs = [
       "out"
+    ]
+    ++ lib.optionals (pythonAtLeast "3.11") [
       "man"
     ];
 
     # pip uses a custom sphinx extension and unusual conf.py location, mimic the internal build rather than attempting
     # to fit sphinxHook see https://github.com/pypa/pip/blob/0778c1c153da7da457b56df55fb77cbba08dfb0c/noxfile.py#L129-L148
-    postBuild = ''
+    postBuild = lib.optionalString (pythonAtLeast "3.11") ''
       cd docs
 
       # remove references to sphinx extentions only required for html doc generation

From 690e42e26a9b1f3abd4636cac431208427c50615 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Sat, 2 Aug 2025 08:35:49 -0700
Subject: [PATCH 0348/3724] stdenv: make dumpVars test if $NIX_BUILD_TOP is a
 directory

This resolves the spate of user reports about strange failures in various derivations.

See https://github.com/NixOS/nixpkgs/pull/417132#issuecomment-3136320269 and related.
---
 pkgs/stdenv/generic/setup.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 5a2121dc36be..b63741aae2ee 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1174,15 +1174,13 @@ substituteAllInPlace() {
 # What follows is the generic builder.
 
 
-# This function is useful for debugging broken Nix builds.  It dumps
-# all environment variables to a file `env-vars' in the build
-# directory.  If the build fails and the `-K' option is used, you can
-# then go to the build directory and source in `env-vars' to reproduce
-# the environment used for building.
+# This function is useful for debugging broken Nix builds. It dumps all environment variables to a
+# file `env-vars' in the Nix build directory. If the build fails and the `-K' option is used,
+# you can then go to the build directory and source the `env-vars' file to reproduce the environment
+# used for building. Set `noDumpEnvVars` in the derivation to avoid this, and if for whatever reason
+# `$NIX_BUILD_TOP` is not a directory, this function also does nothing.
 dumpVars() {
-    if [ "${noDumpEnvVars:-0}" != 1 ]; then
-        # Don't use `install` here to prevent executing a process each time.
-
+    if [[ "${noDumpEnvVars:-0}" != 1 && -d "$NIX_BUILD_TOP" ]]; then
         # Set umask to create env-vars file with 0600 permissions (owner read/write only)
         local old_umask
         old_umask=$(umask)

From e7a8ecd30cda4f174d2c29f15814b51f75c2d504 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 20:26:40 +0000
Subject: [PATCH 0349/3724] groonga: 15.1.3 -> 15.1.4

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

diff --git a/pkgs/by-name/gr/groonga/package.nix b/pkgs/by-name/gr/groonga/package.nix
index 70904c54acda..acea713b4330 100644
--- a/pkgs/by-name/gr/groonga/package.nix
+++ b/pkgs/by-name/gr/groonga/package.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "groonga";
-  version = "15.1.3";
+  version = "15.1.4";
 
   src = fetchurl {
     url = "https://packages.groonga.org/source/groonga/groonga-${finalAttrs.version}.tar.gz";
-    hash = "sha256-L8UHjYBQf9iADvIs7QNZA/81FmVY/+gCwS73ff62dYc=";
+    hash = "sha256-w5r7HiTQ1YZNdjTo3sDl0s++z0M3mAXtOjZWxrMhahk=";
   };
 
   patches = [

From 78ced76b003a19719a35f67f4359151ec2e11a09 Mon Sep 17 00:00:00 2001
From: Timon Schelling <me@timon.zip>
Date: Wed, 25 Jun 2025 14:53:42 +0000
Subject: [PATCH 0350/3724] nushellPlugins.desktop_notifications: init at
 0.106.1

---
 pkgs/shells/nushell/plugins/default.nix       |  1 +
 .../nushell/plugins/desktop_notifications.nix | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/shells/nushell/plugins/desktop_notifications.nix

diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix
index df15b6aadd15..b8424c75b3bf 100644
--- a/pkgs/shells/nushell/plugins/default.nix
+++ b/pkgs/shells/nushell/plugins/default.nix
@@ -58,6 +58,7 @@ lib.makeScope newScope (
         skim = callPackage ./skim.nix { };
         semver = callPackage ./semver.nix { };
         hcl = callPackage ./hcl.nix { };
+        desktop_notifications = callPackage ./desktop_notifications.nix { };
       }
       // lib.optionalAttrs config.allowAliases {
         regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release.";
diff --git a/pkgs/shells/nushell/plugins/desktop_notifications.nix b/pkgs/shells/nushell/plugins/desktop_notifications.nix
new file mode 100644
index 000000000000..1a87a0af4543
--- /dev/null
+++ b/pkgs/shells/nushell/plugins/desktop_notifications.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "nu_plugin_desktop_notifications";
+  version = "0.106.1";
+
+  src = fetchFromGitHub {
+    owner = "FMotalleb";
+    repo = "nu_plugin_desktop_notifications";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-FuiXHl7O6/DN7kENrVxOys8mJAGbpb11w9iJ+mqQ/ds=";
+  };
+
+  cargoHash = "sha256-yFkiRGrg8eGGap5vyZVRMpddsoTYNrwSC94uLYufmdc=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Nushell plugin for sending desktop notifications";
+    mainProgram = "nu_plugin_desktop_notifications";
+    homepage = "https://github.com/FMotalleb/nu_plugin_desktop_notifications";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ timon ];
+    platforms = lib.platforms.linux;
+  };
+})

From 55fe2325034f8b91d753b24ef748321c1c8e2710 Mon Sep 17 00:00:00 2001
From: Sebastien Bariteau <numkem@numkem.org>
Date: Sat, 2 Aug 2025 21:15:40 -0400
Subject: [PATCH 0351/3724] fix update script

---
 pkgs/by-name/vi/vivaldi-ffmpeg-codecs/update.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/update.sh b/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/update.sh
index fb6f3d47daf7..612ccadde5ba 100755
--- a/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/update.sh
+++ b/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p common-updater-scripts coreutils grep jq squashfsTools
+#!nix-shell -i bash -p common-updater-scripts coreutils gnugrep jq squashfsTools
 
 set -eu -o pipefail
 
@@ -18,7 +18,7 @@ function update_source() {
   local url=$(echo $selectedRelease | jq -r '.download.url')
   source="$(nix-prefetch-url "$url")"
   hash=$(nix-hash --to-sri --type sha256 "$source")
-  update-source-version vivaldi-ffmpeg-codecs "$version" "$hash" "$url" --ignore-same-version --system=$platform --source-key="sources.$platform"
+  update-source-version vivaldi-ffmpeg-codecs "$version" "$hash" "$url" --ignore-same-version --system=$platform --source-key="sources.$platform" --file "package.nix"
 }
 
 x86Release="$(echo $STABLE_RELEASES | jq 'select(.channel.architecture=="amd64")')"
@@ -26,7 +26,7 @@ x86CodecVersion=$(max_version "$x86Release")
 arm64Release="$(echo $STABLE_RELEASES | jq -r 'select(.channel.architecture=="arm64")')"
 arm64CodecVersion=$(max_version "$arm64Release")
 
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; vivaldi-ffmpeg-codecs.version or (lib.getVersion vivaldi-ffmpeg-codecs)" | tr -d '"')
+currentVersion=$(grep 'version =' ./package.nix | cut -d '"' -f 2)
 
 if [[ "$currentVersion" == "$x86CodecVersion" ]]; then
   exit 0

From 7c786e0360449301ec3aac0ce32d3cda4594f05b Mon Sep 17 00:00:00 2001
From: Sebastien Bariteau <numkem@numkem.org>
Date: Sat, 2 Aug 2025 21:16:16 -0400
Subject: [PATCH 0352/3724] vivaldi-ffmpeg-codecs: 119293 -> 120726

---
 .../vi/vivaldi-ffmpeg-codecs/package.nix        | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/package.nix b/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/package.nix
index 896adad9f151..1997b977c8f5 100644
--- a/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/package.nix
+++ b/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/package.nix
@@ -11,20 +11,19 @@
 let
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_73.snap";
-      hash = "sha256-YsAYQ/fKlrvu7IbIxLO0oVhWOtZZzUmA00lrU+z/0+s=";
+      url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_85.snap";
+      hash = "sha256-77lcQFFP0eXuaxN2UdsEjFXJt22L6Mp6Fe3ZYPpKVwM=";
     };
     aarch64-linux = fetchurl {
-      url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_74.snap";
-      hash = "sha256-zwCbaFeVmeHQLEp7nmD8VlEjSY9PqSVt6CdW4wPtw9o=";
+      url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_85.snap";
+      hash = "sha256-77lcQFFP0eXuaxN2UdsEjFXJt22L6Mp6Fe3ZYPpKVwM=";
     };
   };
 in
-stdenv.mkDerivation rec {
-
+stdenv.mkDerivation (finalAttrs: {
   pname = "chromium-codecs-ffmpeg-extra";
 
-  version = "119293";
+  version = "120726";
 
   src = sources."${stdenv.hostPlatform.system}";
 
@@ -35,7 +34,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    install -vD chromium-ffmpeg-${version}/chromium-ffmpeg/libffmpeg.so $out/lib/libffmpeg.so
+    install -vD chromium-ffmpeg-${finalAttrs.version}/chromium-ffmpeg/libffmpeg.so $out/lib/libffmpeg.so
   '';
 
   passthru = {
@@ -59,4 +58,4 @@ stdenv.mkDerivation rec {
       "aarch64-linux"
     ];
   };
-}
+})

From 6519e3fb71d167b435fa73ff7b06c338e5ef5714 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 1 Aug 2025 21:58:28 +0100
Subject: [PATCH 0353/3724] linuxHeaders: fix build on 32-bit systems with
 64-bit inodes

Without the change builx of `pkgsi686Linux.linuxHeaders` fails on my
`btrfs` with 64-bit inodes as:

    linux-headers> fixdep: error fstat'ing file: scripts/basic/.fixdep.d: Value too large for defined data type

Normally `Kbuild` attempts to pass correct LFS flags by extracting
them from `getconf` as:
    HOST_LFS_CFLAGS := $(shell getconf LFS_CFLAGS 2>/dev/null)

But `nixpkgs` does not provide it and the build fails.

The change hardcodes LFS flags for 32-bit systems.
---
 pkgs/os-specific/linux/kernel-headers/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 371eb343f74d..cd91b50d8df7 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -90,6 +90,16 @@ let
         # `$(..)` expanded by make alone
         "HOSTCC:=$(CC_FOR_BUILD)"
         "HOSTCXX:=$(CXX_FOR_BUILD)"
+        # To properly detect LFS flags 32-bit build environments like
+        # pkgsi686Linux.linuxHeaders Kbuild uses this Makefile bit:
+        #     HOST_LFS_CFLAGS := $(shell getconf LFS_CFLAGS 2>/dev/null)
+        #
+        # `getconf` is not available in early bootstrap and thus the
+        # build fails on filesystems with 64-bit inodes as:
+        #     linux-headers> fixdep: error fstat'ing file: scripts/basic/.fixdep.d: Value too large for defined data type
+        #
+        # Let's hardcode subset of the output of `getconf` for this case.
+        "HOST_LFS_CFLAGS=-D_FILE_OFFSET_BITS=64"
       ];
 
       # Skip clean on darwin, case-sensitivity issues.

From f441c08dc04b1a3c7f6b379c19bfbd0f80c84348 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 10:53:21 +0000
Subject: [PATCH 0354/3724] python3Packages.pyogrio: 0.11.0 -> 0.11.1

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

diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix
index 8c3ed073d9f0..330fcd31225c 100644
--- a/pkgs/development/python-modules/pyogrio/default.nix
+++ b/pkgs/development/python-modules/pyogrio/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pyogrio";
-  version = "0.11.0";
+  version = "0.11.1";
   pyproject = true;
   disabled = pythonOlder "3.9";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "geopandas";
     repo = "pyogrio";
     tag = "v${version}";
-    hash = "sha256-3XrP3/sqGRtA+sfaoOV/ByGAtfpGZB5RYRr5lyYZUj0=";
+    hash = "sha256-F6XfkihN3k2xquYS8jJMlqtLXzaTORaduJ2Q9LhSQGM=";
   };
 
   postPatch = ''
@@ -66,7 +66,7 @@ buildPythonPackage rec {
   meta = {
     description = "Vectorized spatial vector file format I/O using GDAL/OGR";
     homepage = "https://pyogrio.readthedocs.io/";
-    changelog = "https://github.com/geopandas/pyogrio/blob/${src.rev}/CHANGES.md";
+    changelog = "https://github.com/geopandas/pyogrio/blob/${src.tag}/CHANGES.md";
     license = lib.licenses.mit;
     teams = [ lib.teams.geospatial ];
   };

From 4641ef6c7928bc9e3f1b52d9efc47d8f8f22bf5c Mon Sep 17 00:00:00 2001
From: Yethal <26117918+Yethal@users.noreply.github.com>
Date: Sun, 3 Aug 2025 14:16:41 +0200
Subject: [PATCH 0355/3724] nushellPlugins.hcl: 0.105.1 -> 0.106.1

---
 pkgs/shells/nushell/plugins/hcl.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/hcl.nix b/pkgs/shells/nushell/plugins/hcl.nix
index de5522b049bc..f90f205cb2cb 100644
--- a/pkgs/shells/nushell/plugins/hcl.nix
+++ b/pkgs/shells/nushell/plugins/hcl.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_hcl";
-  version = "0.105.1";
+  version = "0.106.1";
 
   src = fetchFromGitHub {
     owner = "Yethal";
     repo = "nu_plugin_hcl";
     tag = finalAttrs.version;
-    hash = "sha256-V1RKZ0Tqq0LTGbHS2lLMyf6M4AgAgWSzkDeFUighO4k=";
+    hash = "sha256-LM5tDmPWmpHd4HNnWoEdDXdKUkFA8J8VeDFMw32JXLk=";
   };
 
-  cargoHash = "sha256-UbqKfQxut+76yB9F1gT8FEapbX/kHvaShltHpWUdhgc=";
+  cargoHash = "sha256-QCkNabv3pqtaRA7Ux5eiZPE/vRILlWKdQce7Gb0vzes=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 

From 670a072307f717197c7db3a7cfafa3a951ddf208 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Sun, 3 Aug 2025 14:24:05 +0200
Subject: [PATCH 0356/3724] tmux-sessionizer: 0.4.5 -> 0.5.0

---
 pkgs/by-name/tm/tmux-sessionizer/package.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/tm/tmux-sessionizer/package.nix b/pkgs/by-name/tm/tmux-sessionizer/package.nix
index 223edf4353ee..0a6b02e75fc7 100644
--- a/pkgs/by-name/tm/tmux-sessionizer/package.nix
+++ b/pkgs/by-name/tm/tmux-sessionizer/package.nix
@@ -3,7 +3,6 @@
   fetchFromGitHub,
   stdenv,
   rustPlatform,
-  openssl,
   pkg-config,
   testers,
   tmux-sessionizer,
@@ -12,7 +11,7 @@
 let
 
   name = "tmux-sessionizer";
-  version = "0.4.5";
+  version = "0.5.0";
 
 in
 rustPlatform.buildRustPackage {
@@ -23,24 +22,20 @@ rustPlatform.buildRustPackage {
     owner = "jrmoulton";
     repo = name;
     rev = "v${version}";
-    hash = "sha256-uoSm9oWZSiqwsg7dVVMay9COL5MEK3a5Pd+D66RzzPM=";
+    hash = "sha256-6eMKwp5639DIyhM6OD+db7jr4uF34JSt0Xg+lpyIPSI=";
   };
 
-  cargoHash = "sha256-fd0IEORqnqxKN9zisXTT0G8CwRNVsGd3HZmCVY5DKsM=";
+  cargoHash = "sha256-gIsqHbCmfYs1c3LPNbE4zLVjzU3GJ4MeHMt0DC5sS3c=";
 
   passthru.tests.version = testers.testVersion {
     package = tmux-sessionizer;
     version = version;
   };
 
-  # Needed to get openssl-sys to use pkg-config.
-  OPENSSL_NO_VENDOR = 1;
-
   nativeBuildInputs = [
     pkg-config
     installShellFiles
   ];
-  buildInputs = [ openssl ];
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd tms \

From 5c50fa8fbaebb3f780e21935daf2afc61141f2a2 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Sun, 3 Aug 2025 14:27:18 +0200
Subject: [PATCH 0357/3724] tmux-sessionizer: use finalAttrs

---
 pkgs/by-name/tm/tmux-sessionizer/package.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/tm/tmux-sessionizer/package.nix b/pkgs/by-name/tm/tmux-sessionizer/package.nix
index 0a6b02e75fc7..3a05d32d4215 100644
--- a/pkgs/by-name/tm/tmux-sessionizer/package.nix
+++ b/pkgs/by-name/tm/tmux-sessionizer/package.nix
@@ -8,20 +8,14 @@
   tmux-sessionizer,
   installShellFiles,
 }:
-let
-
-  name = "tmux-sessionizer";
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "tmux-sessionizer";
   version = "0.5.0";
 
-in
-rustPlatform.buildRustPackage {
-  pname = name;
-  inherit version;
-
   src = fetchFromGitHub {
     owner = "jrmoulton";
-    repo = name;
-    rev = "v${version}";
+    repo = "tmux-sessionizer";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-6eMKwp5639DIyhM6OD+db7jr4uF34JSt0Xg+lpyIPSI=";
   };
 
@@ -29,7 +23,7 @@ rustPlatform.buildRustPackage {
 
   passthru.tests.version = testers.testVersion {
     package = tmux-sessionizer;
-    version = version;
+    version = finalAttrs.version;
   };
 
   nativeBuildInputs = [
@@ -54,4 +48,4 @@ rustPlatform.buildRustPackage {
     ];
     mainProgram = "tms";
   };
-}
+})

From d01b0d116a146cdb0e9129ff495214a1d4091044 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Sun, 3 Aug 2025 14:31:38 +0200
Subject: [PATCH 0358/3724] tmux-sessionizer: formatting

---
 pkgs/by-name/tm/tmux-sessionizer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/tm/tmux-sessionizer/package.nix b/pkgs/by-name/tm/tmux-sessionizer/package.nix
index 3a05d32d4215..45dd3160795f 100644
--- a/pkgs/by-name/tm/tmux-sessionizer/package.nix
+++ b/pkgs/by-name/tm/tmux-sessionizer/package.nix
@@ -1,12 +1,12 @@
 {
-  lib,
   fetchFromGitHub,
-  stdenv,
-  rustPlatform,
+  installShellFiles,
+  lib,
   pkg-config,
+  rustPlatform,
+  stdenv,
   testers,
   tmux-sessionizer,
-  installShellFiles,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tmux-sessionizer";

From a91823e83339fcf571b2b5efea0a9fbc668b8cc8 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Sun, 3 Aug 2025 14:32:04 +0200
Subject: [PATCH 0359/3724] tmux-sessionizer: use versionCheckHook

---
 pkgs/by-name/tm/tmux-sessionizer/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/tm/tmux-sessionizer/package.nix b/pkgs/by-name/tm/tmux-sessionizer/package.nix
index 45dd3160795f..725c8e0a430f 100644
--- a/pkgs/by-name/tm/tmux-sessionizer/package.nix
+++ b/pkgs/by-name/tm/tmux-sessionizer/package.nix
@@ -5,8 +5,7 @@
   pkg-config,
   rustPlatform,
   stdenv,
-  testers,
-  tmux-sessionizer,
+  versionCheckHook,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tmux-sessionizer";
@@ -21,10 +20,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-gIsqHbCmfYs1c3LPNbE4zLVjzU3GJ4MeHMt0DC5sS3c=";
 
-  passthru.tests.version = testers.testVersion {
-    package = tmux-sessionizer;
-    version = finalAttrs.version;
-  };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
 
   nativeBuildInputs = [
     pkg-config

From 2c15bf9dda02727a45d2ad14756dc2deefd6f3aa Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 1 Aug 2025 17:02:38 +0200
Subject: [PATCH 0360/3724] Revert "abseil-cpp: 20250127.1 -> 20250512.1"

This reverts commit d3a1f2f9deadc3ef0fafd68cfee0c6544ac6b844.

abseil-cpp_202501 shouldn't become abseil-cpp_202505 silently, a
separate abseil-cpp_202505 attrset should be included.

Downstream abseil consumers are generally very picky about the version.
Maybe we should also do away with the abseil-cpp alias and be explicit
about the version everywhere, but that's unrelated to this revert.
---
 pkgs/by-name/ab/abseil-cpp_202501/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ab/abseil-cpp_202501/package.nix b/pkgs/by-name/ab/abseil-cpp_202501/package.nix
index c1884d4a953d..7fffca86c037 100644
--- a/pkgs/by-name/ab/abseil-cpp_202501/package.nix
+++ b/pkgs/by-name/ab/abseil-cpp_202501/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "abseil-cpp";
-  version = "20250512.1";
+  version = "20250127.1";
 
   src = fetchFromGitHub {
     owner = "abseil";
     repo = "abseil-cpp";
     tag = finalAttrs.version;
-    hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk=";
+    hash = "sha256-QTywqQCkyGFpdbtDBvUwz9bGXxbJs/qoFKF6zYAZUmQ=";
   };
 
   cmakeFlags = [

From 5226b9c27b90e09b0ffa407e4ae5e8c911e95911 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 29 Jul 2025 20:31:51 +0200
Subject: [PATCH 0361/3724] audit: enable io_uring support

---
 pkgs/by-name/au/audit/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index 177bf7212c05..1181fcd8514a 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -78,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--disable-zos-remote"
     "--with-arm"
     "--with-aarch64"
+    "--with-io_uring"
     # capability dropping, currently mostly for plugins as those get spawned as root
     # see auditd-plugins(5)
     "--with-libcap-ng=yes"

From e95522945e94f8f3a05f14285ecbc6cef08c7cfc Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 31 Jul 2025 21:45:56 +0200
Subject: [PATCH 0362/3724] audit: install bash completion

---
 pkgs/by-name/au/audit/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index 1181fcd8514a..ad32857876fd 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -10,6 +10,7 @@
   swig,
   pkgsCross,
   libcap_ng,
+  installShellFiles,
 
   # Enabling python support while cross compiling would be possible, but the
   # configure script tries executing python to gather info instead of relying on
@@ -61,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     autoreconfHook
+    installShellFiles
   ]
   ++ lib.optionals enablePython [
     python3
@@ -85,6 +87,10 @@ stdenv.mkDerivation (finalAttrs: {
     (if enablePython then "--with-python" else "--without-python")
   ];
 
+  postInstall = ''
+    installShellCompletion --bash init.d/audit.bash_completion
+  '';
+
   enableParallelBuilding = true;
 
   passthru = {

From 0e42aed2fb2c698f8b0d62dffad814225bb5fc51 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 31 Jul 2025 15:46:33 +0200
Subject: [PATCH 0363/3724] audit: 4.1.0 -> 4.1.1-unstable-2025-08-01

Release notes: https://github.com/linux-audit/audit-userspace/releases/tag/v4.1.1

Unstable patches:
- musl support
- `--disable-legacy-actions` support
- `--runstatedir` support
---
 pkgs/by-name/au/audit/musl.patch  | 76 -------------------------------
 pkgs/by-name/au/audit/package.nix | 16 +++----
 2 files changed, 7 insertions(+), 85 deletions(-)
 delete mode 100644 pkgs/by-name/au/audit/musl.patch

diff --git a/pkgs/by-name/au/audit/musl.patch b/pkgs/by-name/au/audit/musl.patch
deleted file mode 100644
index 8485a0759548..000000000000
--- a/pkgs/by-name/au/audit/musl.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 87c782153deb10bd8c3345723a8bcee343826e78 Mon Sep 17 00:00:00 2001
-From: Grimmauld <Grimmauld@grimmauld.de>
-Date: Thu, 10 Jul 2025 18:58:31 +0200
-Subject: [PATCH 1/2] lib/audit_logging.h: fix includes for musl
-
-`sys/types.h` is indirectly included with `glibc`,
-but needs to be specified explicitly on musl.
----
- lib/audit_logging.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/audit_logging.h b/lib/audit_logging.h
-index 9082a2720..c58861b1e 100644
---- a/lib/audit_logging.h
-+++ b/lib/audit_logging.h
-@@ -25,6 +25,7 @@
- 
- // Next include is to pick up the function attribute macros
- #include <features.h>
-+#include <sys/types.h>
- #include <audit-records.h>
- 
- #ifdef __cplusplus
-
-From 98adfcc4bfa66ac25db0b609d7172d7d40c4f85f Mon Sep 17 00:00:00 2001
-From: Grimmauld <Grimmauld@grimmauld.de>
-Date: Fri, 11 Jul 2025 08:11:21 +0200
-Subject: [PATCH 2/2] Guard __attr_dealloc_free seperately from __attr_dealloc
-
-Otherwise, header include order matters when building against a libc that
-does not itself define __attr_dealloc_free, such as musl.
----
- auparse/auparse.h   | 2 ++
- lib/audit_logging.h | 2 ++
- lib/libaudit.h      | 2 ++
- 3 files changed, 6 insertions(+)
-
-diff --git a/auparse/auparse.h b/auparse/auparse.h
-index 48375e2c7..ba5139625 100644
---- a/auparse/auparse.h
-+++ b/auparse/auparse.h
-@@ -31,6 +31,8 @@
- #endif
- #ifndef __attr_dealloc
- # define __attr_dealloc(dealloc, argno)
-+#endif
-+#ifndef __attr_dealloc_free
- # define __attr_dealloc_free
- #endif
- #ifndef __attribute_malloc__
-diff --git a/lib/audit_logging.h b/lib/audit_logging.h
-index c58861b1e..fab7e75d1 100644
---- a/lib/audit_logging.h
-+++ b/lib/audit_logging.h
-@@ -40,6 +40,8 @@ extern "C" {
- #endif
- #ifndef __attr_dealloc
- # define __attr_dealloc(dealloc, argno)
-+#endif
-+#ifndef __attr_dealloc_free
- # define __attr_dealloc_free
- #endif
- // Warn unused result
-diff --git a/lib/libaudit.h b/lib/libaudit.h
-index 2c51853b7..cce5dc493 100644
---- a/lib/libaudit.h
-+++ b/lib/libaudit.h
-@@ -43,6 +43,8 @@
- // malloc and free assignments
- #ifndef __attr_dealloc
- # define __attr_dealloc(dealloc, argno)
-+#endif
-+#ifndef __attr_dealloc_free
- # define __attr_dealloc_free
- #endif
- #ifndef __attribute_malloc__
diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index ad32857876fd..588e411c8dcc 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -22,20 +22,15 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "audit";
-  version = "4.1.0";
+  version = "4.1.1-unstable-2025-08-01";
 
   src = fetchFromGitHub {
     owner = "linux-audit";
     repo = "audit-userspace";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-MWlHaGue7Ca8ks34KNg74n4Rfj8ivqAhLOJHeyE2Q04=";
+    rev = "bee5984843d0b38992a369825a87a65fb54b18fc"; # musl fixes, --disable-legacy-actions and --runstatedir support
+    hash = "sha256-l3JHWEHz2xGrYxEvfCUD29W8xm5llUnXwX5hLymRG74=";
   };
 
-  patches = [
-    # https://github.com/linux-audit/audit-userspace/pull/476
-    ./musl.patch
-  ];
-
   postPatch = ''
     substituteInPlace bindings/swig/src/auditswig.i \
       --replace-fail "/usr/include/linux/audit.h" \
@@ -81,6 +76,9 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-arm"
     "--with-aarch64"
     "--with-io_uring"
+    # allows putting audit files in /run/audit, which removes the requirement
+    # to wait for tmpfiles to set up the /var/run -> /run symlink
+    "--runstatedir=/run"
     # capability dropping, currently mostly for plugins as those get spawned as root
     # see auditd-plugins(5)
     "--with-libcap-ng=yes"
@@ -105,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://people.redhat.com/sgrubb/audit/";
     description = "Audit Library";
-    changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v4.1.1";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ grimmauld ];
     pkgConfigModules = [

From a9fd61ff9f95a31b99471ff3dc07f731f6436acd Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 1 Aug 2025 15:44:39 +0200
Subject: [PATCH 0364/3724] audit: disable legacy actions

---
 pkgs/by-name/au/audit/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index 588e411c8dcc..bae6e65ee2b8 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -73,6 +73,10 @@ stdenv.mkDerivation (finalAttrs: {
     # z/OS plugin is not useful on Linux, and pulls in an extra openldap
     # dependency otherwise
     "--disable-zos-remote"
+    # remove legacy start/stop scripts to remove a bash dependency in $lib
+    # People interested in logging auditd interactions (e.g. for compliance) can start/stop audit using `auditctl --signal`
+    # See also https://github.com/linux-audit/audit-userspace?tab=readme-ov-file#starting-and-stopping-the-daemon
+    "--disable-legacy-actions"
     "--with-arm"
     "--with-aarch64"
     "--with-io_uring"

From 025afda8d8ea5076e8ade471dfd476a7ff33cb82 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 3 Aug 2025 21:23:44 +0200
Subject: [PATCH 0365/3724] audit: disallow bash requirement for lib output

---
 pkgs/by-name/au/audit/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index bae6e65ee2b8..e33b1116c061 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   autoreconfHook,
   bash,
+  bashNonInteractive,
   buildPackages,
   linuxHeaders,
   python3,
@@ -89,6 +90,14 @@ stdenv.mkDerivation (finalAttrs: {
     (if enablePython then "--with-python" else "--without-python")
   ];
 
+  __structuredAttrs = true;
+
+  # lib output is part of the mandatory nixos system closure, so avoid bash here
+  outputChecks.lib.disallowedRequisites = [
+    bash
+    bashNonInteractive
+  ];
+
   postInstall = ''
     installShellCompletion --bash init.d/audit.bash_completion
   '';

From 5ba6a021b54061b5bff4620ccedc14942c64009a Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 2 Aug 2025 17:15:58 +0100
Subject: [PATCH 0366/3724] python3: fix build directory scrubbing

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

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 2d85ee51d3fb..ec6d55011bad 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -635,7 +635,7 @@ stdenv.mkDerivation (finalAttrs: {
       # Get rid of retained dependencies on -dev packages, and remove
       # some $TMPDIR references to improve binary reproducibility.
       # Note that the .pyc file of _sysconfigdata.py should be regenerated!
-      for i in $out/lib/${libPrefix}/_sysconfigdata*.py $out/lib/${libPrefix}/config-${sourceVersion.major}${sourceVersion.minor}*/Makefile; do
+      for i in $out/lib/${libPrefix}/_sysconfigdata*.py $out/lib/${libPrefix}/config-${sourceVersion.major}.${sourceVersion.minor}*/Makefile; do
          sed -i $i -e "s|$TMPDIR|/no-such-path|g"
       done
 

From 7b250a8bcb84006c736621e1a00b8ee35590b04d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 3 Aug 2025 14:21:58 +0100
Subject: [PATCH 0367/3724] meson: increase the maximum length of test logs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Meson really doesn’t want us to get useful information from test
failures! There’s no way to disable this limit entirely, so we just
set it to something ridiculous.
---
 pkgs/by-name/me/meson/setup-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh
index 7d9fd6de0e6d..a9feb15eedd3 100644
--- a/pkgs/by-name/me/meson/setup-hook.sh
+++ b/pkgs/by-name/me/meson/setup-hook.sh
@@ -72,7 +72,7 @@ mesonCheckPhase() {
     TERM=dumb ninja -j"$buildCores" $ninjaFlags "${ninjaFlagsArray[@]}" meson-test-prereq
 
     echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}"
-    meson test --no-rebuild --print-errorlogs "${flagsArray[@]}"
+    meson test --no-rebuild --print-errorlogs --max-lines=1000000 "${flagsArray[@]}"
 
     runHook postCheck
 }

From 1620104ec6c1e40f8a55fd8459730f3e186f8950 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 31 Jul 2025 22:22:25 +0100
Subject: [PATCH 0368/3724] {nukeReferences,removeReferencesTo}: simplify and
 fix quoting

---
 .../nuke-references/darwin-sign-fixup.sh      |  5 -----
 .../build-support/nuke-references/default.nix | 15 +++------------
 .../nuke-references/nuke-refs.sh              | 11 +++++------
 .../remove-references-to/darwin-sign-fixup.sh |  5 -----
 .../remove-references-to/default.nix          | 19 +++++--------------
 .../remove-references-to.sh                   | 13 +++++--------
 6 files changed, 18 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/build-support/nuke-references/darwin-sign-fixup.sh
 delete mode 100644 pkgs/build-support/remove-references-to/darwin-sign-fixup.sh

diff --git a/pkgs/build-support/nuke-references/darwin-sign-fixup.sh b/pkgs/build-support/nuke-references/darwin-sign-fixup.sh
deleted file mode 100644
index 940c18e5a627..000000000000
--- a/pkgs/build-support/nuke-references/darwin-sign-fixup.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Fixup hook for nukeReferences, not stdenv
-
-source @signingUtils@
-
-fixupHooks+=(signIfRequired)
diff --git a/pkgs/build-support/nuke-references/default.nix b/pkgs/build-support/nuke-references/default.nix
index 6bdb81477aac..13f2061b5aa8 100644
--- a/pkgs/build-support/nuke-references/default.nix
+++ b/pkgs/build-support/nuke-references/default.nix
@@ -11,12 +11,6 @@
   shell ? stdenvNoCC.shell,
 }:
 
-let
-  stdenv = stdenvNoCC;
-
-  darwinCodeSign = stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64;
-in
-
 stdenvNoCC.mkDerivation {
   name = "nuke-references";
 
@@ -32,17 +26,14 @@ stdenvNoCC.mkDerivation {
     chmod a+x $out/bin/nuke-refs
   '';
 
-  postFixup = lib.optionalString darwinCodeSign ''
-    mkdir -p $out/nix-support
-    substituteAll ${./darwin-sign-fixup.sh} $out/nix-support/setup-hooks.sh
-  '';
-
   # FIXME: get rid of perl dependency.
   env = {
     inherit perl;
     inherit (builtins) storeDir;
     shell = lib.getBin shell + (shell.shellPath or "");
-    signingUtils = lib.optionalString darwinCodeSign signingUtils;
+    signingUtils = lib.optionalString (
+      stdenvNoCC.targetPlatform.isDarwin && stdenvNoCC.targetPlatform.isAarch64
+    ) signingUtils;
   };
 
   meta.mainProgram = "nuke-refs";
diff --git a/pkgs/build-support/nuke-references/nuke-refs.sh b/pkgs/build-support/nuke-references/nuke-refs.sh
index 21eb855cbad9..8a5a65973fca 100644
--- a/pkgs/build-support/nuke-references/nuke-refs.sh
+++ b/pkgs/build-support/nuke-references/nuke-refs.sh
@@ -2,8 +2,8 @@
 
 fixupHooks=()
 
-if [ -e @out@/nix-support/setup-hooks.sh ]; then
-    source @out@/nix-support/setup-hooks.sh
+if [[ -n "@signingUtils@" ]]; then
+    source "@signingUtils@"
 fi
 
 excludes=""
@@ -25,9 +25,8 @@ for i in "$@"; do
         cat "$i" | @perl@/bin/perl -pe "s|\Q@storeDir@\E/$excludes[a-z0-9]{32}-|@storeDir@/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > "$i.tmp"
         if test -x "$i"; then chmod +x "$i.tmp"; fi
         mv "$i.tmp" "$i"
-
-        for hook in "${fixupHooks[@]}"; do
-            eval "$hook" "$i"
-        done
+        if [[ -n "@signingUtils@" ]]; then
+            signIfRequired "$i"
+        fi
     fi
 done
diff --git a/pkgs/build-support/remove-references-to/darwin-sign-fixup.sh b/pkgs/build-support/remove-references-to/darwin-sign-fixup.sh
deleted file mode 100644
index 940c18e5a627..000000000000
--- a/pkgs/build-support/remove-references-to/darwin-sign-fixup.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Fixup hook for nukeReferences, not stdenv
-
-source @signingUtils@
-
-fixupHooks+=(signIfRequired)
diff --git a/pkgs/build-support/remove-references-to/default.nix b/pkgs/build-support/remove-references-to/default.nix
index 6ae3e3125c85..13d3eb8a78d8 100644
--- a/pkgs/build-support/remove-references-to/default.nix
+++ b/pkgs/build-support/remove-references-to/default.nix
@@ -10,13 +10,7 @@
   shell ? stdenvNoCC.shell,
 }:
 
-let
-  stdenv = stdenvNoCC;
-
-  darwinCodeSign = stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64;
-in
-
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   name = "remove-references-to";
 
   dontUnpack = true;
@@ -29,16 +23,13 @@ stdenv.mkDerivation {
     chmod a+x $out/bin/remove-references-to
   '';
 
-  postFixup = lib.optionalString darwinCodeSign ''
-    mkdir -p $out/nix-support
-    substituteAll ${./darwin-sign-fixup.sh} $out/nix-support/setup-hooks.sh
-  '';
-
   env = {
     inherit (builtins) storeDir;
     shell = lib.getBin shell + (shell.shellPath or "");
-  }
-  // lib.optionalAttrs darwinCodeSign { inherit signingUtils; };
+    signingUtils = lib.optionalString (
+      stdenvNoCC.targetPlatform.isDarwin && stdenvNoCC.targetPlatform.isAarch64
+    ) signingUtils;
+  };
 
   meta.mainProgram = "remove-references-to";
 }
diff --git a/pkgs/build-support/remove-references-to/remove-references-to.sh b/pkgs/build-support/remove-references-to/remove-references-to.sh
index a4d068eb591e..e24524d0c574 100755
--- a/pkgs/build-support/remove-references-to/remove-references-to.sh
+++ b/pkgs/build-support/remove-references-to/remove-references-to.sh
@@ -2,10 +2,6 @@
 
 fixupHooks=()
 
-if [ -e @out@/nix-support/setup-hooks.sh ]; then
-    source @out@/nix-support/setup-hooks.sh
-fi
-
 # References to remove
 targets=()
 while getopts t: o; do
@@ -30,8 +26,9 @@ for target in "${targets[@]}" ; do
     sed -i -e "s|$target|eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee|g" "${regions[@]}"
 done
 
-for region in "${regions[@]}"; do
-    for hook in "${fixupHooks[@]}"; do
-        eval "$hook" "$region"
+if [[ -n "@signingUtils@" ]]; then
+    source "@signingUtils@"
+    for region in "${regions[@]}"; do
+        signIfRequired "$region"
     done
-done
+fi

From 9d094a5f85170524c98343841363f028d1e5171f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 4 Aug 2025 00:51:07 +0200
Subject: [PATCH 0369/3724] abseil-cpp_202505: init at 20250512.1

---
 pkgs/by-name/ab/abseil-cpp_202505/package.nix | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/ab/abseil-cpp_202505/package.nix

diff --git a/pkgs/by-name/ab/abseil-cpp_202505/package.nix b/pkgs/by-name/ab/abseil-cpp_202505/package.nix
new file mode 100644
index 000000000000..c1884d4a953d
--- /dev/null
+++ b/pkgs/by-name/ab/abseil-cpp_202505/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  gtest,
+  static ? stdenv.hostPlatform.isStatic,
+  cxxStandard ? null,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "abseil-cpp";
+  version = "20250512.1";
+
+  src = fetchFromGitHub {
+    owner = "abseil";
+    repo = "abseil-cpp";
+    tag = finalAttrs.version;
+    hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk=";
+  };
+
+  cmakeFlags = [
+    (lib.cmakeBool "ABSL_BUILD_TEST_HELPERS" true)
+    (lib.cmakeBool "ABSL_USE_EXTERNAL_GOOGLETEST" true)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!static))
+  ]
+  ++ lib.optionals (cxxStandard != null) [
+    (lib.cmakeFeature "CMAKE_CXX_STANDARD" cxxStandard)
+  ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ gtest ];
+
+  meta = {
+    description = "Open-source collection of C++ code designed to augment the C++ standard library";
+    homepage = "https://abseil.io/";
+    changelog = "https://github.com/abseil/abseil-cpp/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.GaetanLepage ];
+  };
+})

From 71b2f8cd5f604a699d3527596b3aaaf610d61a50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 4 Aug 2025 00:35:40 +0000
Subject: [PATCH 0370/3724] libcerf: 3.0 -> 3.1

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

diff --git a/pkgs/by-name/li/libcerf/package.nix b/pkgs/by-name/li/libcerf/package.nix
index 4e34cc1a1a6a..8e49899bed6c 100644
--- a/pkgs/by-name/li/libcerf/package.nix
+++ b/pkgs/by-name/li/libcerf/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libcerf";
-  version = "3.0";
+  version = "3.1";
 
   src = fetchurl {
     url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz";
-    sha256 = "sha256-xhCPvaia839YgRnAxUK2wegkhFo2vqL6MfftLMGiRts=";
+    sha256 = "sha256-TAfiqOK00OTUjbng/JGRtDoOEg5XfVXYfibe6HRcb6s=";
   };
 
   nativeBuildInputs = [

From 90e9a58c9b841630692f311c148074262fe717ee Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen <hi@pluie.me>
Date: Mon, 4 Aug 2025 14:53:13 +0800
Subject: [PATCH 0371/3724] novelwriter: 2.6.3 -> 2.7.4

---
 pkgs/by-name/no/novelwriter/package.nix | 33 +++++++++++--------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix
index 96db76a40206..7ee3481f4fce 100644
--- a/pkgs/by-name/no/novelwriter/package.nix
+++ b/pkgs/by-name/no/novelwriter/package.nix
@@ -3,11 +3,11 @@
   stdenv,
   python3,
   fetchFromGitHub,
-  qt5,
+  qt6,
   nix-update-script,
 }:
 let
-  version = "2.6.3";
+  version = "2.7.4";
 in
 python3.pkgs.buildPythonApplication {
   pname = "novelwriter";
@@ -17,32 +17,27 @@ python3.pkgs.buildPythonApplication {
   src = fetchFromGitHub {
     owner = "vkbo";
     repo = "novelWriter";
-    rev = "v${version}";
-    hash = "sha256-262YMVqxSZv8G82amdRnHiW/5gnxkYyFSQDiS5gOdBE=";
+    tag = "v${version}";
+    hash = "sha256-um8D5wqAe8KYQBG8XPKKS6iYnHsPLxSHpW710winDkY=";
   };
 
-  nativeBuildInputs = [ qt5.wrapQtAppsHook ];
+  nativeBuildInputs = [ qt6.wrapQtAppsHook ];
+  buildInputs = [ qt6.qtbase ];
 
   build-system = with python3.pkgs; [ setuptools ];
-
   dependencies = with python3.pkgs; [
-    pyqt5
+    pyqt6
     pyenchant
-    qt5.qtbase
-    qt5.qtwayland
   ];
 
-  preBuild = ''
-    export QT_QPA_PLATFORM_PLUGIN_PATH=${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins/platforms
-  '';
-
+  # See setup/debian/install
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
-    mkdir -p $out/share/{icons,applications,pixmaps,mime/packages}
-
+    mkdir -p $out/share/icons
     cp -r setup/data/hicolor $out/share/icons
-    cp setup/data/novelwriter.desktop $out/share/applications
-    cp setup/data/novelwriter.png $out/share/pixmaps
-    cp setup/data/x-novelwriter-project.xml $out/share/mime/packages
+
+    install -Dm644 setup/data/novelwriter.png -t $out/share/pixmaps
+    install -Dm644 setup/data/novelwriter.desktop -t $out/share/applications
+    install -Dm644 setup/data/x-novelwriter-project.xml -t $out/share/mime/packages
   '';
 
   dontWrapQtApps = true;
@@ -63,7 +58,7 @@ python3.pkgs.buildPythonApplication {
     description = "Open source plain text editor designed for writing novels";
     homepage = "https://novelwriter.io";
     changelog = "https://github.com/vkbo/novelWriter/blob/main/CHANGELOG.md";
-    license = with lib.licenses; [ gpl3 ];
+    license = with lib.licenses; [ gpl3Only ];
     maintainers = with lib.maintainers; [ pluiedev ];
     mainProgram = "novelwriter";
 

From 7b4572ca905a01ad7363eeea484ed39436825dd6 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 4 Aug 2025 10:31:37 +0200
Subject: [PATCH 0372/3724] tests.fetchDebianPatch: fix patch name

---
 pkgs/build-support/fetchdebianpatch/tests.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchdebianpatch/tests.nix b/pkgs/build-support/fetchdebianpatch/tests.nix
index 58f3b395d1fc..9cc4c6dd844d 100644
--- a/pkgs/build-support/fetchdebianpatch/tests.nix
+++ b/pkgs/build-support/fetchdebianpatch/tests.nix
@@ -5,7 +5,7 @@
     pname = "pysimplesoap";
     version = "1.16.2";
     debianRevision = "5";
-    patch = "Add-quotes-to-SOAPAction-header-in-SoapClient";
+    patch = "Add-quotes-to-SOAPAction-header-in-SoapClient.patch";
     hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0=";
   };
 
@@ -13,7 +13,7 @@
     pname = "libfile-pid-perl";
     version = "1.01";
     debianRevision = "2";
-    patch = "missing-pidfile";
+    patch = "missing-pidfile.patch";
     hash = "sha256-VBsIYyCnjcZLYQ2Uq2MKPK3kF2wiMKvnq0m727DoavM=";
   };
 }

From c0e42f6d95b8dca4d852ee1c59205db05cac6880 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 31 Jul 2025 10:53:26 +0200
Subject: [PATCH 0373/3724] Revert "perf: inherit makeFlags from kernel"

This reverts commit 94276da9e98691be7d083b06301c3e434ba2cfa4.

Original justification[1] was:

> it reduces unnecessary code duplication and should help with cross
> compilation (although this cannot be tested yet because some
> dependencies fail).

However, as time as gone on its become increasingly clear that the
kernels make flags are going to be specific to building a kernel, not
a userspace program, hence them having been renamed to
kernelModuleMakeFlags in the meantime.  This has become even more
apparent now that we're using unwrapped compilers for the kernel,
which doesn't go at all well with building a userspace program like
perf, so we stop inheriting any make flags from the kernel, and
instead just set the two flags necessary for cross compilation to
work.

Link: https://github.com/NixOS/nixpkgs/pull/34068 [1]
Fixes: e9b2edb49163 ("linux: un-simplify toolchain selection")
---
 pkgs/os-specific/linux/kernel/perf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix
index d0caa28e1432..f3338cf51cf9 100644
--- a/pkgs/os-specific/linux/kernel/perf/default.nix
+++ b/pkgs/os-specific/linux/kernel/perf/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchurl,
   kernel,
-  kernelModuleMakeFlags,
   elfutils,
   python3,
   perl,
@@ -103,8 +102,9 @@ stdenv.mkDerivation {
     "prefix=$(out)"
     "WERROR=0"
     "ASCIIDOC8=1"
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
   ]
-  ++ kernelModuleMakeFlags
   ++ lib.optional (!withGtk) "NO_GTK2=1"
   ++ lib.optional (!withZstd) "NO_LIBZSTD=1"
   ++ lib.optional (!withLibcap) "NO_LIBCAP=1";

From 4b1d8433465b54a6db3d363dc2fc46dd5d22901a Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 4 Aug 2025 13:25:59 +0100
Subject: [PATCH 0374/3724] homepage-dashboard: fix update script

The update script had begun failing due to changes
in how `pnpm` and `nodejs` are packaged in
`unstable`.

This change ensures the correct tools are present
in the environment, such that the update script
can succeed.
---
 pkgs/by-name/ho/homepage-dashboard/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ho/homepage-dashboard/update.sh b/pkgs/by-name/ho/homepage-dashboard/update.sh
index 55ca003e8e23..0c39ecc6e158 100755
--- a/pkgs/by-name/ho/homepage-dashboard/update.sh
+++ b/pkgs/by-name/ho/homepage-dashboard/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl jq git pnpm_10 sd
+#!nix-shell -I nixpkgs=./. -i bash -p curl jq git nodejs pnpm sd
 # shellcheck shell=bash
 set -euo pipefail
 nixpkgs="$(pwd)"

From 8628f797b96d623cfadda6d6c93c13eb5e85c12d Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 4 Aug 2025 13:27:16 +0100
Subject: [PATCH 0375/3724] homepage-dashboard: 1.3.2 -> 1.4.3

---
 .../by-name/ho/homepage-dashboard/package.nix |  6 +-
 .../prerender_cache_path.patch                | 82 +++++++------------
 2 files changed, 33 insertions(+), 55 deletions(-)

diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix
index 601da8cb8c88..210c919e9cc8 100644
--- a/pkgs/by-name/ho/homepage-dashboard/package.nix
+++ b/pkgs/by-name/ho/homepage-dashboard/package.nix
@@ -28,13 +28,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "homepage-dashboard";
-  version = "1.3.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "gethomepage";
     repo = "homepage";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-45Z2XS+ij6J6WSCb9/oDQa2eC9wKu+D7ncYwcB6K5gQ=";
+    hash = "sha256-ib2sErgz1FPnHxmUE8LD/tD1smNcOc0/Ljncl+E9YdM=";
   };
 
   # This patch ensures that the cache implementation respects the env
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       ;
     fetcherVersion = 1;
-    hash = "sha256-aPkXHKG3vDsfYqYx9q9+2wZhuFqmPcXdoBqOfAvW9oA=";
+    hash = "sha256-IYmAl4eHR0jVpQJfxQRlOBTIbrrjS+dnJpUsl8ee6y4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch b/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch
index 2476c65ade35..15bf300ba93b 100644
--- a/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch
+++ b/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch
@@ -1,8 +1,8 @@
-diff --git a/package.json b/package.json
-index bb093c43..deeb4b8b 100644
---- a/package.json
-+++ b/package.json
-@@ -66,6 +66,9 @@
+diff --git c/package.json i/package.json
+index 536d73bf..565de99e 100644
+--- c/package.json
++++ i/package.json
+@@ -73,6 +73,9 @@
    "pnpm": {
      "onlyBuiltDependencies": [
        "sharp"
@@ -13,14 +13,14 @@ index bb093c43..deeb4b8b 100644
 +    }
    }
  }
-diff --git a/patches/next.patch b/patches/next.patch
+diff --git c/patches/next.patch i/patches/next.patch
 new file mode 100644
-index 00000000..dd1d8b7c
+index 00000000..52266e70
 --- /dev/null
-+++ b/patches/next.patch
++++ i/patches/next.patch
 @@ -0,0 +1,13 @@
 +diff --git a/dist/server/lib/incremental-cache/file-system-cache.js b/dist/server/lib/incremental-cache/file-system-cache.js
-+index c5bbdefd8aa2e97df91df00d1686d63fe54c8c0d..4dcdd8760e5ed135f7509c289abb33b5005ed470 100644
++index 0b6b2b30f29fbe60eec331c83f81b712c61f18b7..36572d52414927b2b092182c19940ec23cfec313 100644
 +--- a/dist/server/lib/incremental-cache/file-system-cache.js
 ++++ b/dist/server/lib/incremental-cache/file-system-cache.js
 +@@ -24,7 +24,7 @@ class FileSystemCache {
@@ -30,19 +30,19 @@ index 00000000..dd1d8b7c
 +-        this.serverDistDir = ctx.serverDistDir;
 ++        this.serverDistDir = require("path").join((process.env.NIXPKGS_HOMEPAGE_CACHE_DIR || "/var/cache/homepage-dashboard"), "homepage");
 +         this.revalidatedTags = ctx.revalidatedTags;
-+         this.debug = !!process.env.NEXT_PRIVATE_DEBUG_CACHE;
 +         if (ctx.maxMemoryCacheSize) {
-diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-index e3387dea..05918fa6 100644
---- a/pnpm-lock.yaml
-+++ b/pnpm-lock.yaml
++             if (!FileSystemCache.memoryCache) {
+diff --git c/pnpm-lock.yaml i/pnpm-lock.yaml
+index c7887131..55604102 100644
+--- c/pnpm-lock.yaml
++++ i/pnpm-lock.yaml
 @@ -4,6 +4,11 @@ settings:
    autoInstallPeers: true
    excludeLinksFromLockfile: false
  
 +patchedDependencies:
 +  next:
-+    hash: 9673472f3289a59e3cf64a56303c75752c2556c0d74d2a648eca3576b2695cab
++    hash: ec4324097eadbe8364e1a29668eeea85c2b267b7028a2be86a59a926fbd46666
 +    path: patches/next.patch
 +
  importers:
@@ -51,61 +51,39 @@ index e3387dea..05918fa6 100644
 @@ -52,10 +57,10 @@ importers:
          version: 1.2.2
        next:
-         specifier: ^15.3.1
--        version: 15.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-+        version: 15.3.1(patch_hash=9673472f3289a59e3cf64a56303c75752c2556c0d74d2a648eca3576b2695cab)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+         specifier: ^15.4.5
+-        version: 15.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
++        version: 15.4.5(patch_hash=ec4324097eadbe8364e1a29668eeea85c2b267b7028a2be86a59a926fbd46666)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
        next-i18next:
          specifier: ^12.1.0
--        version: 12.1.0(next@15.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-+        version: 12.1.0(next@15.3.1(patch_hash=9673472f3289a59e3cf64a56303c75752c2556c0d74d2a648eca3576b2695cab)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+-        version: 12.1.0(next@15.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
++        version: 12.1.0(next@15.4.5(patch_hash=ec4324097eadbe8364e1a29668eeea85c2b267b7028a2be86a59a926fbd46666)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
        ping:
          specifier: ^0.4.4
          version: 0.4.4
-@@ -98,10 +103,6 @@ importers:
-       xml-js:
-         specifier: ^1.6.11
-         version: 1.6.11
--    optionalDependencies:
--      osx-temperature-sensor:
--        specifier: ^1.0.8
--        version: 1.0.8
-     devDependencies:
-       '@tailwindcss/forms':
-         specifier: ^0.5.10
-@@ -151,6 +152,10 @@ importers:
-       typescript:
-         specifier: ^5.7.3
-         version: 5.7.3
-+    optionalDependencies:
-+      osx-temperature-sensor:
-+        specifier: ^1.0.8
-+        version: 1.0.8
- 
- packages:
- 
-@@ -4901,7 +4906,7 @@ snapshots:
+@@ -5060,7 +5065,7 @@ snapshots:
  
    natural-compare@1.4.0: {}
  
--  next-i18next@12.1.0(next@15.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
-+  next-i18next@12.1.0(next@15.3.1(patch_hash=9673472f3289a59e3cf64a56303c75752c2556c0d74d2a648eca3576b2695cab)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+-  next-i18next@12.1.0(next@15.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
++  next-i18next@12.1.0(next@15.4.5(patch_hash=ec4324097eadbe8364e1a29668eeea85c2b267b7028a2be86a59a926fbd46666)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
      dependencies:
        '@babel/runtime': 7.26.9
        '@types/hoist-non-react-statics': 3.3.6
-@@ -4909,14 +4914,14 @@ snapshots:
+@@ -5068,14 +5073,14 @@ snapshots:
        hoist-non-react-statics: 3.3.2
        i18next: 21.10.0
        i18next-fs-backend: 1.2.0
--      next: 15.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-+      next: 15.3.1(patch_hash=9673472f3289a59e3cf64a56303c75752c2556c0d74d2a648eca3576b2695cab)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+-      next: 15.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
++      next: 15.4.5(patch_hash=ec4324097eadbe8364e1a29668eeea85c2b267b7028a2be86a59a926fbd46666)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
        react: 18.3.1
        react-i18next: 11.18.6(i18next@21.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
      transitivePeerDependencies:
        - react-dom
        - react-native
  
--  next@15.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
-+  next@15.3.1(patch_hash=9673472f3289a59e3cf64a56303c75752c2556c0d74d2a648eca3576b2695cab)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+-  next@15.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
++  next@15.4.5(patch_hash=ec4324097eadbe8364e1a29668eeea85c2b267b7028a2be86a59a926fbd46666)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
      dependencies:
-       '@next/env': 15.3.1
-       '@swc/counter': 0.1.3
+       '@next/env': 15.4.5
+       '@swc/helpers': 0.5.15

From 48f71e5e09c441d41b8b5ebea062a5f8202dde27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 4 Aug 2025 13:51:05 +0000
Subject: [PATCH 0376/3724] hwdata: 0.397 -> 0.398

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

diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix
index 84a8760a8a97..729918d9f25d 100644
--- a/pkgs/by-name/hw/hwdata/package.nix
+++ b/pkgs/by-name/hw/hwdata/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hwdata";
-  version = "0.397";
+  version = "0.398";
 
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-+sspONNszkXVl357Gs40AYvppIYFvlaeVMuei9gpLLU=";
+    hash = "sha256-rHpXkltESdfBDZ/dySzPgoLPs3l5jyBfNFaZYlALfnk=";
   };
 
   doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus)

From f8218b54bda70ec1151b766bc2c6165458136625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 28 Jul 2025 15:19:41 +0200
Subject: [PATCH 0377/3724] open-vm-tools: move vm-support binary to $out/bin
 and fix missing tools

---
 pkgs/by-name/op/open-vm-tools/package.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix
index c4774f371a8f..8cd5040ace23 100644
--- a/pkgs/by-name/op/open-vm-tools/package.nix
+++ b/pkgs/by-name/op/open-vm-tools/package.nix
@@ -12,6 +12,7 @@
   xercesc,
   icu,
   libdnet,
+  pciutils,
   procps,
   libtirpc,
   rpcsvc-proto,
@@ -111,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "etc/vmware-tools" "''${prefix}/etc/vmware-tools"
     substituteInPlace scripts/Makefile.am \
       --replace-fail "confdir = /etc/vmware-tools" "confdir = ''${prefix}/etc/vmware-tools" \
-      --replace-fail "/usr/bin" "''${prefix}/usr/bin"
+      --replace-fail "/usr/bin" "''${prefix}/bin"
     substituteInPlace services/vmtoolsd/Makefile.am \
       --replace-fail "etc/vmware-tools" "''${prefix}/etc/vmware-tools" \
       --replace-fail "\$(PAM_PREFIX)" "''${prefix}/\$(PAM_PREFIX)"
@@ -131,6 +132,12 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace vmhgfs-fuse/config.c \
       --replace-fail "/bin/fusermount3" "${fuse3}/bin/fusermount3"
 
+    # do not break the PATHs set by makeWrapper, sudo resets PATH anyway.
+    substituteInPlace scripts/common/vm-support \
+      --replace-fail "export PATH=/bin:/sbin:/usr/bin:/usr/sbin" "" \
+      --replace-fail ". /etc/profile" ":" \
+      --replace-fail "/sbin/lsmod" "lsmod"
+
     substituteInPlace services/plugins/vix/foundryToolsDaemon.c \
      --replace-fail "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \
      --replace-fail "/bin/mount" "${util-linux}/bin/mount"
@@ -158,6 +165,16 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   postInstall = ''
+    wrapProgram "$out/bin/vm-support" \
+      --prefix PATH ':' "${
+        makeBinPath [
+          iproute2
+          pciutils # for lspci
+          systemd
+          which
+        ]
+      }"
+
     wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \
       --prefix PATH ':' "${
         makeBinPath [
@@ -167,7 +184,6 @@ stdenv.mkDerivation (finalAttrs: {
           which
         ]
       }"
-
   '';
 
   meta = {

From 42e35a4edce79c80aca54df64ed006891612bbde Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Mon, 4 Aug 2025 20:22:30 +0200
Subject: [PATCH 0378/3724] open62541: 1.4.12 -> 1.4.13

https://github.com/open62541/open62541/releases/tag/v1.4.13
---
 pkgs/by-name/op/open62541/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/open62541/package.nix b/pkgs/by-name/op/open62541/package.nix
index 003af800685a..18303e4e5a0d 100644
--- a/pkgs/by-name/op/open62541/package.nix
+++ b/pkgs/by-name/op/open62541/package.nix
@@ -33,13 +33,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "open62541";
-  version = "1.4.12";
+  version = "1.4.13";
 
   src = fetchFromGitHub {
     owner = "open62541";
     repo = "open62541";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-FhlYowmu3McXuhOplnN/tnfkHAvRJqIuk60ceFYOmR0=";
+    hash = "sha256-y4yxdO55fMmkP+nCU6ToabvAPi6hgXHiDXpF3tNEHNw=";
     fetchSubmodules = true;
   };
 

From 29dcdca5c303748381f0c73297e59aaa5c37c77b Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Mon, 4 Aug 2025 16:14:33 -0400
Subject: [PATCH 0379/3724] qtappinstancemanager: init at 1.3.0

---
 .../qt/qtappinstancemanager/package.nix       | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/qt/qtappinstancemanager/package.nix

diff --git a/pkgs/by-name/qt/qtappinstancemanager/package.nix b/pkgs/by-name/qt/qtappinstancemanager/package.nix
new file mode 100644
index 000000000000..c513a190740c
--- /dev/null
+++ b/pkgs/by-name/qt/qtappinstancemanager/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  qt6,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "qtappinstancemanager";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "oclero";
+    repo = "qtappinstancemanager";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/zvNR/RHNV19ZI8d+58sotWxY16q2a7wWIBuKO52H5M=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    qt6.qtbase
+  ];
+
+  dontWrapQtApps = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Single application instance manager for Qt6";
+    homepage = "https://github.com/oclero/qtappinstancemanager";
+    changelog = "https://github.com/oclero/qtappinstancemanager/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ normalcea ];
+    mainProgram = "qtappinstancemanager";
+    platforms = lib.platforms.all;
+  };
+})

From aa70f7ce1486889364d9d15e430e49a30fd0c402 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Mon, 4 Aug 2025 16:18:22 -0400
Subject: [PATCH 0380/3724] solarus-launcher: un-vendor qlementine within
 nixpkgs; refactor

---
 pkgs/by-name/so/solarus-launcher/package.nix | 47 +++++---------------
 1 file changed, 11 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/so/solarus-launcher/package.nix b/pkgs/by-name/so/solarus-launcher/package.nix
index ce8cd109a307..0e5d799a5cbf 100644
--- a/pkgs/by-name/so/solarus-launcher/package.nix
+++ b/pkgs/by-name/so/solarus-launcher/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  fetchFromGitHub,
   replaceVars,
   cmake,
   ninja,
@@ -16,38 +15,12 @@
   libvorbis,
   solarus,
   glm,
-  qt6Packages,
-  kdePackages,
+  qt6,
+  qlementine,
+  qlementine-icons,
+  qtappinstancemanager,
 }:
 
-let
-  qlementine-icons-src = fetchFromGitHub {
-    owner = "oclero";
-    repo = "qlementine-icons";
-    tag = "v1.8.0";
-    hash = "sha256-FPndzMEOQvYNYUbT2V6iDlwoYqOww38GW/T3zUID3g0=";
-  };
-
-  qlementine-src = fetchFromGitHub {
-    owner = "oclero";
-    repo = "qlementine";
-    tag = "v1.2.1";
-    hash = "sha256-CPQMmTXyUW+CyLjHYx+IdXY4I2mVPudOmAksjd+izPA=";
-  };
-
-  qtappinstancemanager-src = fetchFromGitHub {
-    owner = "oclero";
-    repo = "qtappinstancemanager";
-    tag = "v1.3.0";
-    hash = "sha256-/zvNR/RHNV19ZI8d+58sotWxY16q2a7wWIBuKO52H5M=";
-  };
-
-  inherit (qt6Packages)
-    qtbase
-    qttools
-    wrapQtAppsHook
-    ;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "solarus-launcher";
   version = "2.0.0";
@@ -61,7 +34,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     (replaceVars ./github-fetches.patch {
-      inherit qlementine-src qlementine-icons-src qtappinstancemanager-src;
+      qlementine-src = qlementine.src;
+      qlementine-icons-src = qlementine-icons.src;
+      qtappinstancemanager-src = qtappinstancemanager.src;
     })
   ];
 
@@ -69,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     ninja
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -83,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
     libmodplug
     libvorbis
     solarus
-    qtbase
-    kdePackages.qtsvg
+    qt6.qtbase
+    qt6.qtsvg
     glm
   ];
 

From 9acb58f589bd7dd0fc3cea82a51415683a1b5d04 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Mon, 4 Aug 2025 16:21:59 -0400
Subject: [PATCH 0381/3724] solarus-quest-editor: un-vendor qlementine within
 nixpkgs; refactor

---
 .../so/solarus-quest-editor/package.nix       | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/so/solarus-quest-editor/package.nix b/pkgs/by-name/so/solarus-quest-editor/package.nix
index 124e26d348f2..d6b80649daad 100644
--- a/pkgs/by-name/so/solarus-quest-editor/package.nix
+++ b/pkgs/by-name/so/solarus-quest-editor/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  fetchFromGitHub,
   replaceVars,
+  qlementine,
   cmake,
   ninja,
   luajit,
@@ -16,24 +16,9 @@
   libvorbis,
   solarus,
   glm,
-  qt6Packages,
-  kdePackages,
+  qt6,
 }:
 
-let
-  qlementine-src = fetchFromGitHub {
-    owner = "oclero";
-    repo = "qlementine";
-    tag = "v1.2.0";
-    hash = "sha256-25PKOpQl3IkBXX14gt8KKYXXJKeutQ75O7BftEqCAxk=";
-  };
-
-  inherit (qt6Packages)
-    qtbase
-    qttools
-    wrapQtAppsHook
-    ;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "solarus-quest-editor";
   version = "2.0.0";
@@ -46,15 +31,15 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    (replaceVars ./qlementine-src.patch { inherit qlementine-src; })
+    (replaceVars ./qlementine-src.patch { qlementine-src = qlementine.src; })
   ];
 
   strictDeps = true;
   nativeBuildInputs = [
     cmake
     ninja
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -67,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
     libmodplug
     libvorbis
     solarus
-    qtbase
-    kdePackages.qtsvg
+    qt6.qtbase
+    qt6.qtsvg
     glm
   ];
 

From f3793de1d596eb6920e15545cf639f9085697dbb Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 27 May 2025 16:19:49 +0000
Subject: [PATCH 0382/3724] papertrail: Refactor package definitions

papertrail: fix env
---
 pkgs/by-name/pa/papertrail/Gemfile.lock |  2 +-
 pkgs/by-name/pa/papertrail/package.nix  | 26 ++++++++++++-------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/pa/papertrail/Gemfile.lock b/pkgs/by-name/pa/papertrail/Gemfile.lock
index 5c3d3f0aa3c5..5cbf737b4029 100644
--- a/pkgs/by-name/pa/papertrail/Gemfile.lock
+++ b/pkgs/by-name/pa/papertrail/Gemfile.lock
@@ -14,4 +14,4 @@ DEPENDENCIES
   papertrail
 
 BUNDLED WITH
-   2.5.16
+   2.6.9
diff --git a/pkgs/by-name/pa/papertrail/package.nix b/pkgs/by-name/pa/papertrail/package.nix
index e1baafe00c05..631c32db1e2c 100644
--- a/pkgs/by-name/pa/papertrail/package.nix
+++ b/pkgs/by-name/pa/papertrail/package.nix
@@ -2,42 +2,40 @@
   lib,
   stdenv,
   bundlerEnv,
+  makeWrapper,
   ruby,
   bundlerUpdateScript,
   testers,
   papertrail,
 }:
+stdenv.mkDerivation rec {
+  pname = "papertrail";
+  version = (import ./gemset.nix).papertrail.version;
 
-let
-  papertrail-env = bundlerEnv {
-    name = "papertrail-env";
-    inherit ruby;
+  gems = bundlerEnv {
+    name = "papertrail";
     gemfile = ./Gemfile;
     lockfile = ./Gemfile.lock;
     gemset = ./gemset.nix;
   };
-in
-stdenv.mkDerivation {
-  pname = "papertrail";
-  version = (import ./gemset.nix).papertrail.version;
 
   dontUnpack = true;
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ gems ];
 
   installPhase = ''
     mkdir -p $out/bin
-    ln -s ${papertrail-env}/bin/papertrail $out/bin/papertrail
+    makeWrapper ${gems}/bin/papertrail $out/bin/papertrail
   '';
 
   passthru.updateScript = bundlerUpdateScript "papertrail";
 
-  passthru.tests.version = testers.testVersion { package = papertrail; };
-
-  meta = with lib; {
+  meta = {
     description = "Command-line client for Papertrail log management service";
     mainProgram = "papertrail";
     homepage = "https://github.com/papertrail/papertrail-cli/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ nicknovitski ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nicknovitski ];
     platforms = ruby.meta.platforms;
   };
 }

From 1ca98b8659093113a32d08381216915f8fa8e52b Mon Sep 17 00:00:00 2001
From: DPDmancul <davide.peressoni@tuta.io>
Date: Mon, 4 Aug 2025 23:46:01 +0200
Subject: [PATCH 0383/3724] wpaperd: add man pages and shell completions

fixes #430409
---
 pkgs/by-name/wp/wpaperd/package.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/by-name/wp/wpaperd/package.nix b/pkgs/by-name/wp/wpaperd/package.nix
index f65b27b1ce4b..6e6ccc9466a6 100644
--- a/pkgs/by-name/wp/wpaperd/package.nix
+++ b/pkgs/by-name/wp/wpaperd/package.nix
@@ -7,6 +7,8 @@
   wayland,
   libGL,
   dav1d,
+  installShellFiles,
+  scdoc,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -24,6 +26,8 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     pkg-config
+    installShellFiles
+    scdoc
   ];
   buildInputs = [
     wayland
@@ -36,6 +40,20 @@ rustPlatform.buildRustPackage rec {
     "avif"
   ];
 
+  postBuild = ''
+    scdoc < man/wpaperd-output.5.scd > man/wpaperd-output.5
+  '';
+
+  postInstall =
+    let
+      targetDir = "target/*/$cargoBuildType";
+    in
+    ''
+      installShellCompletion ${targetDir}/completions/*.{bash,fish}
+      installShellCompletion --zsh ${targetDir}/completions/_*
+      installManPage ${targetDir}/man/*.1 man/*.5
+    '';
+
   meta = with lib; {
     description = "Minimal wallpaper daemon for Wayland";
     longDescription = ''

From 66ec0c99cc9d0461f80c4d1acd5e433ac6ca6b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 4 Aug 2025 23:25:07 +0200
Subject: [PATCH 0384/3724] waydroid-helper: add missing pywayland dependency,
 wrap adb

Co-authored-by: ayasa520 <55699692+ayasa520@users.noreply.github.com>
---
 pkgs/by-name/wa/waydroid-helper/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix
index 81fa878b05ab..5380a61c29d1 100644
--- a/pkgs/by-name/wa/waydroid-helper/package.nix
+++ b/pkgs/by-name/wa/waydroid-helper/package.nix
@@ -14,6 +14,7 @@
   bash,
   bindfs,
   dbus,
+  android-tools,
   e2fsprogs,
   fakeroot,
   fuse,
@@ -83,6 +84,7 @@ python3Packages.buildPythonApplication {
     httpx
     pygobject3
     pyyaml
+    pywayland
   ];
 
   strictDeps = true;
@@ -93,6 +95,7 @@ python3Packages.buildPythonApplication {
     "\${gappsWrapperArgs[@]}"
     "--prefix PATH : ${
       lib.makeBinPath [
+        android-tools
         bindfs
         e2fsprogs
         fakeroot

From d291fcc46e00d7a588f6b64660cf0b4c799d199c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 May 2025 21:54:26 +0000
Subject: [PATCH 0385/3724] spice: 0.15.2 -> 0.16.0

---
 pkgs/by-name/sp/spice/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sp/spice/package.nix b/pkgs/by-name/sp/spice/package.nix
index 0d9c3f1b8450..28367a3a649f 100644
--- a/pkgs/by-name/sp/spice/package.nix
+++ b/pkgs/by-name/sp/spice/package.nix
@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation rec {
   pname = "spice";
-  version = "0.15.2";
+  version = "0.16.0";
 
   src = fetchurl {
     url = "https://www.spice-space.org/download/releases/spice-server/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-bZ62EX8DkXRxxLwQAEq+z/SKefuF64WhxF8CM3cBW4E=";
+    sha256 = "sha256-Cm7JUo8FNxJhu7LUb/Nee1xF/4m7l1qZr5Wl8g/0cX0=";
   };
 
   patches = [
@@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     python3
-    python3.pkgs.six
     python3.pkgs.pyparsing
   ];
 
@@ -85,9 +84,6 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs build-aux
-
-    # Forgotten in 0.15.2 tarball
-    sed -i /meson.add_dist_script/d meson.build
   '';
 
   postInstall = ''

From 3b1c1cd257759b4acc3f5d264aab16261d0a487d Mon Sep 17 00:00:00 2001
From: "Travis A. Everett" <travis.a.everett@gmail.com>
Date: Mon, 4 Aug 2025 22:01:34 -0500
Subject: [PATCH 0386/3724] yadm: 3.3.0 -> 3.5.0

Also:
- track TheLocehiliosan/yadm now redirecting to yadm-dev/yadm (new
  maintainer: https://github.com/yadm-dev/yadm/discussions/500)
- track nixpkgs reformat in some commented out lines that document
  dependencies we can't handle yet
---
 pkgs/by-name/ya/yadm/package.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ya/yadm/package.nix b/pkgs/by-name/ya/yadm/package.nix
index b7bd0d18da74..b870e885ac4c 100644
--- a/pkgs/by-name/ya/yadm/package.nix
+++ b/pkgs/by-name/ya/yadm/package.nix
@@ -16,8 +16,8 @@
     need both of these packages in their profile
     to support their use in yadm.
   */
-  # , git-crypt
-  # , transcrypt
+  # git-crypt,
+  # transcrypt,
   j2cli,
   esh,
   gnupg,
@@ -30,15 +30,15 @@
 
 resholve.mkDerivation rec {
   pname = "yadm";
-  version = "3.3.0";
+  version = "3.5.0";
 
   nativeBuildInputs = [ installShellFiles ];
 
   src = fetchFromGitHub {
-    owner = "TheLocehiliosan";
+    owner = "yadm-dev";
     repo = "yadm";
     rev = version;
-    hash = "sha256-VQhfRtg9wtquJGjhB8fFQqHIJ5GViMfNQQep13ZH5SE=";
+    hash = "sha256-hDo6zs70apNhKmuvR+eD51FzuTLj3SL/wHQXqLMD9QE=";
   };
 
   dontConfigure = true;
@@ -94,7 +94,8 @@ resholve.mkDerivation rec {
       };
       keep = {
         "$YADM_COMMAND" = true; # internal cmds
-        "$template_cmd" = true; # dynamic, template-engine
+        "$processor" = true; # dynamic, template-engine
+        "$log" = true; # dynamic level-specific loggers
         "$SHELL" = true; # probably user env? unsure
         "$hook_command" = true; # ~git hooks?
         "exec" = [ "$YADM_BOOTSTRAP" ]; # yadm bootstrap script
@@ -124,7 +125,7 @@ resholve.mkDerivation rec {
   };
 
   meta = {
-    homepage = "https://github.com/TheLocehiliosan/yadm";
+    homepage = "https://github.com/yadm-dev/yadm";
     description = "Yet Another Dotfiles Manager";
     longDescription = ''
       yadm is a dotfile management tool with 3 main features:
@@ -132,7 +133,7 @@ resholve.mkDerivation rec {
       * Provides a way to use alternate files on a specific OS or host.
       * Supplies a method of encrypting confidential data so it can safely be stored in your repository.
     '';
-    changelog = "https://github.com/TheLocehiliosan/yadm/blob/${version}/CHANGES";
+    changelog = "https://github.com/yadm-dev/yadm/blob/${version}/CHANGES";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ abathur ];
     platforms = lib.platforms.unix;

From 3c2523a1780c09a114b5687df62288a3c4be2f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 5 Aug 2025 13:39:46 +0200
Subject: [PATCH 0387/3724] Reapply "ibus: add meta.mainProgram"

This reverts commit 49bf0dc94956bef36f8d0255f30643b163ba1f2c.
/cc PR #431141 and PR #423754
---
 pkgs/tools/inputmethods/ibus/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index e38289e360b1..92ff966a5bc1 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -234,6 +234,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Intelligent Input Bus, input method framework";
     license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
+    mainProgram = "ibus";
     maintainers = with lib.maintainers; [ ttuegel ];
   };
 })

From 0e2015ef187b38291b77440aee7f1d6390c50735 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Tue, 5 Aug 2025 13:29:57 +0100
Subject: [PATCH 0388/3724] nixos/homepage-dashboard: add support for `proxmox`
 config

The upstream project recently added support for
a new configuration file named `proxmox.yaml`.

Without adding this, the server can fail to start
since it tries to create the file `proxmox.yaml`
but fails because `/etc` is read-only.

See https://gethomepage.dev/configs/proxmox/ for
details of the feature, which is handled here
similiarly to docker/kubernetes configs.
---
 nixos/modules/services/misc/homepage-dashboard.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/modules/services/misc/homepage-dashboard.nix b/nixos/modules/services/misc/homepage-dashboard.nix
index 07ccf7112d05..827c0f1b1590 100644
--- a/nixos/modules/services/misc/homepage-dashboard.nix
+++ b/nixos/modules/services/misc/homepage-dashboard.nix
@@ -191,6 +191,16 @@ in
         default = { };
       };
 
+      proxmox = lib.mkOption {
+        inherit (settingsFormat) type;
+        description = ''
+          Homepage proxmox configuration.
+
+          See <https://gethomepage.dev/configs/proxmox/>.
+        '';
+        default = { };
+      };
+
       settings = lib.mkOption {
         inherit (settingsFormat) type;
         description = ''
@@ -215,6 +225,7 @@ in
       "homepage-dashboard/services.yaml".source = settingsFormat.generate "services.yaml" cfg.services;
       "homepage-dashboard/settings.yaml".source = settingsFormat.generate "settings.yaml" cfg.settings;
       "homepage-dashboard/widgets.yaml".source = settingsFormat.generate "widgets.yaml" cfg.widgets;
+      "homepage-dashboard/proxmox.yaml".source = settingsFormat.generate "proxmox.yaml" cfg.proxmox;
     };
 
     systemd.services.homepage-dashboard = {

From 520f14f89c89a02f85058c34044109add55019c3 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Tue, 5 Aug 2025 14:11:19 +0100
Subject: [PATCH 0389/3724] nixos/tests/homepage-dashboard: fix failing tests

This commit adjusts the test suite slightly
to request a more "static" asset to ensure that
the configuration is reflected.

Rather than request the full page, which requires
Javascript to be accurate, we request from the
API the configured bookmarks and the site
manifest which contains the configured title.
---
 nixos/tests/homepage-dashboard.nix | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/homepage-dashboard.nix b/nixos/tests/homepage-dashboard.nix
index d654dcaf53df..0866e41ad4bf 100644
--- a/nixos/tests/homepage-dashboard.nix
+++ b/nixos/tests/homepage-dashboard.nix
@@ -7,6 +7,20 @@
     services.homepage-dashboard = {
       enable = true;
       settings.title = "test title rodUsEagid"; # something random/unique
+      bookmarks = [
+        {
+          Developer = [
+            {
+              nixpkgs = [
+                {
+                  abbr = "NX";
+                  href = "https://github.com/nixos/nixpkgs";
+                }
+              ];
+            }
+          ];
+        }
+      ];
     };
   };
 
@@ -19,8 +33,12 @@
     # Ensure /etc/homepage-dashboard is created.
     machine.succeed("test -d /etc/homepage-dashboard")
 
-    # Ensure that we see the custom title *only in the managed config*
-    page = machine.succeed("curl --fail http://localhost:8082/")
+    # Ensure that we see the custom title reflected in the manifest
+    page = machine.succeed("curl --fail http://localhost:8082/site.webmanifest?v=4")
     assert "test title rodUsEagid" in page, "Custom title not found"
+
+    # Ensure that we see the custom bookmarks on the page
+    page = machine.succeed("curl --fail http://127.0.0.1:8082/api/bookmarks")
+    assert "nixpkgs" in page, "Custom bookmarks not found"
   '';
 }

From d9e041f0e9b794413d392c8d4c704a0fae49b344 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 5 Aug 2025 15:45:01 +0200
Subject: [PATCH 0390/3724] sdl3: 3.2.18 -> 3.2.20

Changelog: https://github.com/libsdl-org/SDL/releases/tag/release-3.2.20
---
 pkgs/by-name/sd/sdl3/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index d6c21368d2d9..a3d3b7ee7fb1 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -62,7 +62,7 @@ assert lib.assertMsg (ibusSupport -> dbusSupport) "SDL3 requires dbus support to
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl3";
-  version = "3.2.18";
+  version = "3.2.20";
 
   outputs = [
     "lib"
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libsdl-org";
     repo = "SDL";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-z3SMxPoO5zWOvJvgkla3vMg51qdKqbMGudIwOr3265s=";
+    hash = "sha256-ESYjTN2prkAeHcTYurZaWeM3RgEKtwCZrt9gSMcOAe0=";
   };
 
   postPatch =

From f33d0ca45357dda16907d3e4a9ba85072935ddcb Mon Sep 17 00:00:00 2001
From: ern775 <eren.demir2479090@gmail.com>
Date: Tue, 5 Aug 2025 17:47:13 +0300
Subject: [PATCH 0391/3724] dopamine: 3.0.0-preview.38 -> 3.0.0-preview.39

---
 pkgs/by-name/do/dopamine/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix
index 594a9afe7af4..9d5475ee60fb 100644
--- a/pkgs/by-name/do/dopamine/package.nix
+++ b/pkgs/by-name/do/dopamine/package.nix
@@ -6,11 +6,11 @@
 }:
 appimageTools.wrapType2 rec {
   pname = "dopamine";
-  version = "3.0.0-preview.38";
+  version = "3.0.0-preview.39";
 
   src = fetchurl {
     url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage";
-    hash = "sha256-PWYymznUsJUaeC0wD5wK2bqU7y7lkY64/svB8Tw4JJQ=";
+    hash = "sha256-t4f+4ceGyEJHuJxk/8/BMWK0oGYoFXZMjk8UCHLJId8=";
   };
 
   extraInstallCommands =
@@ -32,7 +32,10 @@ appimageTools.wrapType2 rec {
     homepage = "https://github.com/digimezzo/dopamine";
     license = lib.licenses.gpl3Only;
     mainProgram = "dopamine";
-    maintainers = with lib.maintainers; [ Guanran928 ];
+    maintainers = with lib.maintainers; [
+      Guanran928
+      ern775
+    ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };

From 7404c06f3007ece43788ffa5941a97ab8b559e9a Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 5 Aug 2025 12:38:37 -0400
Subject: [PATCH 0392/3724] sudo-rs: add pam.services.su-l for su -l

---
 nixos/modules/security/sudo-rs.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/security/sudo-rs.nix b/nixos/modules/security/sudo-rs.nix
index a157bfebfab7..7fa795270b8b 100644
--- a/nixos/modules/security/sudo-rs.nix
+++ b/nixos/modules/security/sudo-rs.nix
@@ -298,13 +298,20 @@ in
 
     environment.systemPackages = [ cfg.package ];
 
-    security.pam.services.sudo = {
-      sshAgentAuth = true;
-      usshAuth = true;
-    };
-    security.pam.services.sudo-i = {
-      sshAgentAuth = true;
-      usshAuth = true;
+    security.pam.services = {
+      su-l = {
+        rootOK = true;
+        forwardXAuth = true;
+        logFailures = true;
+      };
+      sudo = {
+        sshAgentAuth = true;
+        usshAuth = true;
+      };
+      sudo-i = {
+        sshAgentAuth = true;
+        usshAuth = true;
+      };
     };
 
     environment.etc.sudoers = {

From a17b3d9f777ce49be61d1216a634c5293abc6797 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 13:16:54 +0000
Subject: [PATCH 0393/3724] linuxHeaders: 6.14.7 -> 6.16

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

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index cd91b50d8df7..0b36cdcbcedf 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -152,13 +152,13 @@ in
 
   linuxHeaders =
     let
-      version = "6.14.7";
+      version = "6.16";
     in
     makeLinuxHeaders {
       inherit version;
       src = fetchurl {
         url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz";
-        hash = "sha256-gRIgK8JtCGlXqU0hCabc1EeMW6GNDwpeHF3+6gH1SXI=";
+        hash = "sha256-Gkvi/mtSRqpKyJh6ikrzTEKo3X0ItGq0hRa8wb77zYM=";
       };
       patches = [
         ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms

From 0d2321b1e49dd3577c19f7e5198136ed97bf1144 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 5 Aug 2025 19:17:17 +0100
Subject: [PATCH 0394/3724] =?UTF-8?q?ghc{865,8107,902,924,963,984}Binary:?=
 =?UTF-8?q?=20don=E2=80=99t=20depend=20on=20`gcc`=20on=20Darwin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

At one point maybe these linked to libraries from GCC 6, but they
don’t seem to any more (checked 8.6.5 and 9.6.3).
---
 pkgs/development/compilers/ghc/8.10.7-binary.nix | 4 ++--
 pkgs/development/compilers/ghc/8.6.5-binary.nix  | 4 ++--
 pkgs/development/compilers/ghc/9.0.2-binary.nix  | 4 ++--
 pkgs/development/compilers/ghc/9.2.4-binary.nix  | 4 ++--
 pkgs/development/compilers/ghc/9.6.3-binary.nix  | 4 ++--
 pkgs/development/compilers/ghc/9.8.4-binary.nix  | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix
index f863573b2d5a..7a8f9ac39da6 100644
--- a/pkgs/development/compilers/ghc/8.10.7-binary.nix
+++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix
@@ -308,7 +308,7 @@ stdenv.mkDerivation {
         for exe in $(find . -type f -executable); do
           isScript $exe && continue
           ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-          install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+          install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
       ''
       + lib.optionalString stdenv.hostPlatform.isAarch64 ''
         # Resign the binary and set the linker-signed flag. Ignore failures when the file is an object file.
@@ -464,7 +464,7 @@ stdenv.mkDerivation {
       for exe in $(find "$out" -type f -executable); do
         isScript $exe && continue
         ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
       done
 
       for file in $(find "$out" -name setup-config); do
diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix
index 7837142b9a54..7c15730205b2 100644
--- a/pkgs/development/compilers/ghc/8.6.5-binary.nix
+++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
       for exe in $(find . -type f -executable); do
         isScript $exe && continue
         ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
       done
     ''
     +
@@ -210,7 +210,7 @@ stdenv.mkDerivation rec {
       for exe in $(find "$out" -type f -executable); do
         isScript $exe && continue
         ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
       done
 
       for file in $(find "$out" -name setup-config); do
diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix
index 0e6a0b4bb628..0b077dc8ae96 100644
--- a/pkgs/development/compilers/ghc/9.0.2-binary.nix
+++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix
@@ -281,7 +281,7 @@ stdenv.mkDerivation {
       for exe in $(find . -type f -executable); do
         isScript $exe && continue
         ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
       done
     ''
     +
@@ -432,7 +432,7 @@ stdenv.mkDerivation {
       for exe in $(find "$out" -type f -executable); do
         isScript $exe && continue
         ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
       done
 
       for file in $(find "$out" -name setup-config); do
diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix
index e9354461fdad..77986b76d64b 100644
--- a/pkgs/development/compilers/ghc/9.2.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix
@@ -275,7 +275,7 @@ stdenv.mkDerivation {
       for exe in $(find . -type f -executable); do
         isScript $exe && continue
         ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
       done
     ''
     +
@@ -417,7 +417,7 @@ stdenv.mkDerivation {
       for exe in $(find "$out" -type f -executable); do
         isScript $exe && continue
         ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
       done
 
       for file in $(find "$out" -name setup-config); do
diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix
index 9128c3717e76..72367c6b3d80 100644
--- a/pkgs/development/compilers/ghc/9.6.3-binary.nix
+++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix
@@ -274,7 +274,7 @@ stdenv.mkDerivation {
       for exe in $(find . -type f -executable); do
         isMachO $exe || continue
         ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
       done
     ''
 
@@ -409,7 +409,7 @@ stdenv.mkDerivation {
       for exe in $(find "$out" -type f -executable); do
         isMachO $exe || continue
         ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
       done
 
       for file in $(find "$out" -name setup-config); do
diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix
index 35e26baba956..e8e1e5e4397a 100644
--- a/pkgs/development/compilers/ghc/9.8.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix
@@ -288,7 +288,7 @@ stdenv.mkDerivation {
       for exe in $(find . -type f -executable); do
         isMachO $exe || continue
         ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
       done
     ''
 
@@ -424,7 +424,7 @@ stdenv.mkDerivation {
       for exe in $(find "$out" -type f -executable); do
         isMachO $exe || continue
         ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
       done
 
       for file in $(find "$out" -name setup-config); do

From 781246ded67c58672354107bae165927c399fec2 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 25 Jul 2025 09:40:32 +0000
Subject: [PATCH 0395/3724] ruff: 0.12.4 -> 0.12.5

---
 pkgs/by-name/ru/ruff/package.nix | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 76fc909d6ef4..bd4f97778d73 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,18 +16,39 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.12.4";
+  version = "0.12.5";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-XuHVKxzXYlm3iEhdAVCyd62uNyb3jeJRl3B0hnvUzX0=";
+    hash = "sha256-A+ivcL8c1K+IXbtrL1v4i0iRU6urBMvPbs01ZJNRLpM=";
   };
 
+  # Patch out test that fails due to ANSI escape codes being written as-is,
+  # causing a snapshot test to fail. The output itself is correct.
+  #
+  # This is the relevant test's output as of 0.12.5
+  # >     0       │-/home/ferris/project/code.py:1:1: E902 Permission denied (os error 13)
+  # >     1       │-/home/ferris/project/notebook.ipynb:1:1: E902 Permission denied (os error 13)
+  # >     2       │-/home/ferris/project/pyproject.toml:1:1: E902 Permission denied (os error 13)
+  # >           0 │+␛[1m/home/ferris/project/code.py␛[0m␛[36m:␛[0m1␛[36m:␛[0m1␛[36m:␛[0m ␛[1m␛[31mE902␛[0m Permission denied (os error 13)
+  # >           1 │+␛[1m/home/ferris/project/notebook.ipynb␛[0m␛[36m:␛[0m1␛[36m:␛[0m1␛[36m:␛[0m ␛[1m␛[31mE902␛[0m Permission denied (os error 13)
+  # >           2 │+␛[1m/home/ferris/project/pyproject.toml␛[0m␛[36m:␛[0m1␛[36m:␛[0m1␛[36m:␛[0m ␛[1m␛[31mE902␛[0m Permission denied (os error 13)
+  # > ────────────┴───────────────────────────────────────────────────────────────────
+  postPatch = ''
+    substituteInPlace crates/ruff/src/commands/check.rs --replace-fail '
+        #[test]
+        fn unreadable_files() -> Result<()> {' \
+    '
+        #[test]
+        #[ignore = "ANSI Escape Codes trigger snapshot diff"]
+        fn unreadable_files() -> Result<()> {'
+  '';
+
   cargoBuildFlags = [ "--package=ruff" ];
 
-  cargoHash = "sha256-cyjaGI7JoreAmHtUrRKNyiCaE8zveP/dFJROC2iIXr4=";
+  cargoHash = "sha256-pnYXqJ2Za8Y5RqSB4UL/VITCmY4EGQDTTLklyqJdB5w=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -66,6 +87,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--exclude=ty_project"
     "--exclude=ty_python_semantic"
     "--exclude=ty_server"
+    "--exclude=ty_static"
     "--exclude=ty_test"
     "--exclude=ty_vendored"
     "--exclude=ty_wasm"

From 4e2d650ccf3e115ac05a640a6662f1c7414fcf07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 Aug 2025 20:22:59 +0000
Subject: [PATCH 0396/3724] libraqm: 0.10.2 -> 0.10.3

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

diff --git a/pkgs/by-name/li/libraqm/package.nix b/pkgs/by-name/li/libraqm/package.nix
index 9df38707bcb3..7c5f35caa2d6 100644
--- a/pkgs/by-name/li/libraqm/package.nix
+++ b/pkgs/by-name/li/libraqm/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libraqm";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "HOST-Oman";
     repo = "libraqm";
     rev = "v${version}";
-    sha256 = "sha256-KhGE66GS5rIieVXJUFA3jSsXEpbdnzN0VIAF/zOelU4=";
+    sha256 = "sha256-URW29aEONbMN/DQ6mkKksnwtbIL+SGm5VvKsC9h5MH4=";
   };
 
   buildInputs = [

From f8a4ba73b10b00f8e12749b9af9d16b53799791c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 Aug 2025 22:13:31 +0000
Subject: [PATCH 0397/3724] tinty: 0.28.0 -> 0.29.0

---
 pkgs/by-name/ti/tinty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ti/tinty/package.nix b/pkgs/by-name/ti/tinty/package.nix
index da2ee0e2ff1e..f432dddf25a9 100644
--- a/pkgs/by-name/ti/tinty/package.nix
+++ b/pkgs/by-name/ti/tinty/package.nix
@@ -6,7 +6,7 @@
   nix-update-script,
 }:
 let
-  version = "0.28.0";
+  version = "0.29.0";
 in
 rustPlatform.buildRustPackage {
   pname = "tinty";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
     owner = "tinted-theming";
     repo = "tinty";
     tag = "v${version}";
-    hash = "sha256-9bMqB2TkLj/FjHpaHoOWZihKOvUAwCT5leyua70GEhg=";
+    hash = "sha256-p05fRJR0boNKGAZ7+KGPyY3XUmj20QfZteWr80cA/po=";
   };
 
-  cargoHash = "sha256-q0JPho+WSg4gDrfs+RevnJnQ3vdQ67uLPx7Afdidmu0=";
+  cargoHash = "sha256-Mdfz412Y1kb4V6LXOHxrbP3WsnWiZ+irCO5Qi3DRQ4c=";
 
   # Pretty much all tests require internet access
   doCheck = false;

From 68bcdbfc9efe20a27262c7ef79a3a2ab707d1e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 31 Oct 2023 01:09:57 +0100
Subject: [PATCH 0398/3724] nixos/prosody: substitute environment variables to
 allow securely loading secrets

---
 nixos/modules/services/networking/prosody.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index d1de1854c938..4fef467d1d97 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -879,7 +879,11 @@ in
       extraConfig = mkOption {
         type = types.lines;
         default = "";
-        description = "Additional prosody configuration";
+        description = ''
+          Additional prosody configuration
+
+          The generated file is processed by `envsubst` to allow secrets to be passed securely via environment variables.
+        '';
       };
 
       log = mkOption {
@@ -973,13 +977,19 @@ in
       wants = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
       restartTriggers = [ config.environment.etc."prosody/prosody.cfg.lua".source ];
+      preStart = ''
+        ${pkgs.envsubst}/bin/envsubst -i ${
+          config.environment.etc."prosody/prosody.cfg.lua".source
+        } -o /run/prosody/prosody.cfg.lua
+      '';
       serviceConfig = mkMerge [
         {
           User = cfg.user;
           Group = cfg.group;
           Type = "simple";
-          RuntimeDirectory = [ "prosody" ];
+          RuntimeDirectory = "prosody";
           PIDFile = "/run/prosody/prosody.pid";
+          Environment = "PROSODY_CONFIG=/run/prosody/prosody.cfg.lua";
           ExecStart = "${lib.getExe cfg.package} -F";
           ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
           Restart = "on-abnormal";

From 91c2eb95b5241867c124c84edbd314db0a561d35 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Tue, 5 Aug 2025 16:22:05 -0400
Subject: [PATCH 0399/3724] ruffle: fix building on darwin

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

diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 92e0be6b095f..5476b6f44ddc 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -75,7 +75,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     else
       null;
 
-  runtimeDependencies = [
+  runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [
     wayland
     xorg.libXcursor
     xorg.libXrandr

From 045cfbcd8976c6dc77e67505b907bae554c0edc7 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 6 Aug 2025 06:12:10 +0100
Subject: [PATCH 0400/3724] strace: 6.15 -> 6.16

Changes: https://github.com/strace/strace/releases/tag/v6.16
---
 pkgs/by-name/st/strace/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/strace/package.nix b/pkgs/by-name/st/strace/package.nix
index 42ce3aecae21..bb08112461f0 100644
--- a/pkgs/by-name/st/strace/package.nix
+++ b/pkgs/by-name/st/strace/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "strace";
-  version = "6.15";
+  version = "6.16";
 
   src = fetchurl {
     url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-hVLfqwirwioPIEjJj9lUH9TXG2iCUHlSeA2rfHxRL1E=";
+    hash = "sha256-PXrufk8ESy9n89UainbtoYB26fsndN5UrDUdd31Ov/o=";
   };
 
   separateDebugInfo = true;

From 7036f6374c0f59e0a63074e7425441e8293b1f7c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 07:38:29 +0000
Subject: [PATCH 0401/3724] upterm: 0.15.0 -> 0.15.2

---
 pkgs/by-name/up/upterm/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/up/upterm/package.nix b/pkgs/by-name/up/upterm/package.nix
index c0a99b7ef59f..c54f6b3d7568 100644
--- a/pkgs/by-name/up/upterm/package.nix
+++ b/pkgs/by-name/up/upterm/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "upterm";
-  version = "0.15.0";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "owenthereal";
     repo = "upterm";
     rev = "v${version}";
-    hash = "sha256-IBwue+1J8X3IJglGggS66eD1p4QOh9DdApFihp2PDg8=";
+    hash = "sha256-hZZAt3KTiDxQteS5InxW+uhdRuwb1GLIARKD35rOWPw=";
   };
 
-  vendorHash = "sha256-azcIb+ekGLvInfh6Z9iKmYh55cfiP/wwklIFH0sN3q8=";
+  vendorHash = "sha256-i92RshW5dsRE88X8bXyrj13va66cc0Yu/btpR0pvoSM=";
 
   subPackages = [
     "cmd/upterm"

From 102dbdf64bee8c17a83111bb1ce655d6e4cca29d Mon Sep 17 00:00:00 2001
From: ProxyVT <tikit.us@outlook.com>
Date: Wed, 6 Aug 2025 10:43:56 +0300
Subject: [PATCH 0402/3724] qmplay2: remove substituteInPlace

Fixes build error: substituteStream() in derivation qmplay2-qt6-25.06.27: ERROR: pattern getSubmitInfo\(\) doesn't match anything in file 'src/qmplay2/vulkan/VulkanWindow.cpp'
---
 pkgs/by-name/qm/qmplay2/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index 3f88b90470af..d5e1985bc0d0 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -43,8 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
     cp -va ${sources.qmvk.src}/* qmvk/
     chmod --recursive 744 qmvk
     popd
-    substituteInPlace src/qmplay2/vulkan/VulkanWindow.cpp \
-      --replace-fail "getSubmitInfo()" "getSubmitInfo(0)"
   '';
 
   nativeBuildInputs = [

From be02b28bbd354c117a3fec81ec31dc332b43e582 Mon Sep 17 00:00:00 2001
From: ProxyVT <tikit.us@outlook.com>
Date: Wed, 6 Aug 2025 12:13:57 +0300
Subject: [PATCH 0403/3724] qmplay2: remove fetchSubmodules

We are already fetching submodules directly (https://github.com/NixOS/nixpkgs/commit/365e7e5d07f3b2962ab87ed28fcf74204577a712); there is no need to use fetchSubmodules.
---
 pkgs/by-name/qm/qmplay2/sources.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/qm/qmplay2/sources.nix b/pkgs/by-name/qm/qmplay2/sources.nix
index 2ddfe376a38b..0e1ce2b25c9e 100644
--- a/pkgs/by-name/qm/qmplay2/sources.nix
+++ b/pkgs/by-name/qm/qmplay2/sources.nix
@@ -12,7 +12,6 @@
           repo = "QMPlay2";
           tag = self.version;
           hash = "sha256-Of/zEQ6o2J/wXfAoY10IPtCaMaSk8ux8L6MrimeMWVA=";
-          fetchSubmodules = true;
         };
       };
     in

From d93967f383ad332822456aeffd4a142cd9cab18d Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 6 Aug 2025 03:30:32 +0200
Subject: [PATCH 0404/3724] libx11: fix libxcb not being in
 propagatedBuildInputs

---
 pkgs/by-name/li/libx11/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libx11/package.nix b/pkgs/by-name/li/libx11/package.nix
index 6405cbd46274..cde598fa68cd 100644
--- a/pkgs/by-name/li/libx11/package.nix
+++ b/pkgs/by-name/li/libx11/package.nix
@@ -39,7 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
     xtrans
   ];
 
-  propagatedBuildInputs = [ xorgproto ];
+  propagatedBuildInputs = [
+    xorgproto
+    libxcb
+  ];
 
   configureFlags =
     lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull"

From b66de0973ddab400115f162dbc816cf64e5f1998 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 11:48:15 +0000
Subject: [PATCH 0405/3724] log4cxx: 1.2.0 -> 1.5.0

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

diff --git a/pkgs/by-name/lo/log4cxx/package.nix b/pkgs/by-name/lo/log4cxx/package.nix
index 175bdb5d471e..56965768132e 100644
--- a/pkgs/by-name/lo/log4cxx/package.nix
+++ b/pkgs/by-name/lo/log4cxx/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "log4cxx";
-  version = "1.2.0";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "mirror://apache/logging/log4cxx/${version}/apache-${pname}-${version}.tar.gz";
-    hash = "sha256-CfR0iqVnXvXAdwvtv14ASIZokzxak1pDrFuFviQ2xIo=";
+    hash = "sha256-qiP0fDFkqiz4SMIli0tLw3Lnlk1KPtR8K0pKkVxd+jc=";
   };
 
   postPatch = ''

From efaca0c196f8d9a40956a9df8b7927103514b876 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 6 Aug 2025 11:07:40 +0200
Subject: [PATCH 0406/3724] nixos/meta: Fix maintainers example

`maintainers.all` does not exist, and should not exist.

Neither does `alice`, but she's a metavariable.
---
 nixos/modules/misc/meta.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix
index 1e75a84452f8..19886fcc29fc 100644
--- a/nixos/modules/misc/meta.nix
+++ b/nixos/modules/misc/meta.nix
@@ -49,7 +49,7 @@ in
         type = listOfMaintainers;
         internal = true;
         default = [ ];
-        example = lib.literalExpression ''[ lib.maintainers.all ]'';
+        example = lib.literalExpression ''[ lib.maintainers.alice ]'';
         description = ''
           List of maintainers of each module.  This option should be defined at
           most once per module.

From dcc0ee9ea10ddfb31f1eb4827379ef0aa91e95d5 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 6 Aug 2025 14:31:48 +0200
Subject: [PATCH 0407/3724] nixos/documentation: Allow the inclusion of a
 nixpkgs/modules directory

---
 ci/eval/default.nix                  |  1 +
 nixos/lib/eval-cacheable-options.nix |  1 +
 nixos/modules/misc/documentation.nix | 20 ++++++++++++++++++--
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 56e07f8da670..9deb7dc008b0 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -31,6 +31,7 @@ let
           "doc"
           "lib"
           "maintainers"
+          "modules"
           "nixos"
           "pkgs"
           ".version"
diff --git a/nixos/lib/eval-cacheable-options.nix b/nixos/lib/eval-cacheable-options.nix
index 73cf5eda32ec..9641d8d8d422 100644
--- a/nixos/lib/eval-cacheable-options.nix
+++ b/nixos/lib/eval-cacheable-options.nix
@@ -49,6 +49,7 @@ let
     version = release;
     revision = "release-${release}";
     prefix = modulesPath;
+    extraSources = [ (dirOf nixosPath) ];
   };
 in
 docs.optionsNix
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index 3a60ae3286d2..7dd2a481004a 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -116,18 +116,34 @@ let
           && (t == "directory" -> baseNameOf n != "tests")
           && (t == "file" -> hasSuffix ".nix" n)
         );
+        prefixRegex = "^" + lib.strings.escapeRegex (toString pkgs.path) + "($|/(modules|nixos)($|/.*))";
+        filteredModules = builtins.path {
+          name = "source";
+          inherit (pkgs) path;
+          filter =
+            n: t:
+            builtins.match prefixRegex n != null
+            && cleanSourceFilter n t
+            && (t == "directory" -> baseNameOf n != "tests")
+            && (t == "file" -> hasSuffix ".nix" n);
+        };
       in
       pkgs.runCommand "lazy-options.json"
-        {
+        rec {
           libPath = filter (pkgs.path + "/lib");
           pkgsLibPath = filter (pkgs.path + "/pkgs/pkgs-lib");
-          nixosPath = filter (pkgs.path + "/nixos");
+          nixosPath = filteredModules + "/nixos";
           NIX_ABORT_ON_WARN = warningsAreErrors;
           modules =
             "[ "
             + concatMapStringsSep " " (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy
             + " ]";
           passAsFile = [ "modules" ];
+          disallowedReferences = [
+            filteredModules
+            libPath
+            pkgsLibPath
+          ];
         }
         ''
           export NIX_STORE_DIR=$TMPDIR/store

From 0c156a71440105a9fe1fbc1d89275ff3fe94c92a Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 6 Aug 2025 14:32:45 +0200
Subject: [PATCH 0408/3724] modules/generic/meta-maintainers: init

This factors out `meta.maintainers` from NixOS `misc/meta.nix` for use in arbitrary
Module System applications.

It is useful beyond NixOS and not coupled to it, although it is currently coupled to Nixpkgs'
`lib.maintainers`.
That restriction could be lifted optionally if there's future demand.
---
 modules/generic/meta-maintainers.nix      | 61 +++++++++++++++++++++++
 modules/generic/meta-maintainers/test.nix | 34 +++++++++++++
 nixos/modules/misc/meta.nix               | 52 +++----------------
 3 files changed, 101 insertions(+), 46 deletions(-)
 create mode 100644 modules/generic/meta-maintainers.nix
 create mode 100644 modules/generic/meta-maintainers/test.nix

diff --git a/modules/generic/meta-maintainers.nix b/modules/generic/meta-maintainers.nix
new file mode 100644
index 000000000000..e39d527764b2
--- /dev/null
+++ b/modules/generic/meta-maintainers.nix
@@ -0,0 +1,61 @@
+# Test:
+#   ./meta-maintainers/test.nix
+{ lib, ... }:
+let
+  inherit (lib)
+    mkOption
+    mkOptionType
+    types
+    ;
+
+  maintainer = mkOptionType {
+    name = "maintainer";
+    check = email: lib.elem email (lib.attrValues lib.maintainers);
+    merge =
+      loc: defs:
+      lib.listToAttrs (lib.singleton (lib.nameValuePair (lib.last defs).file (lib.last defs).value));
+  };
+
+  listOfMaintainers = types.listOf maintainer // {
+    merge =
+      loc: defs:
+      lib.zipAttrs (
+        lib.flatten (
+          lib.imap1 (
+            n: def:
+            lib.imap1 (
+              m: def':
+              maintainer.merge (loc ++ [ "[${toString n}-${toString m}]" ]) [
+                {
+                  inherit (def) file;
+                  value = def';
+                }
+              ]
+            ) def.value
+          ) defs
+        )
+      );
+  };
+in
+{
+  _class = null; # not specific to NixOS
+  options = {
+    meta = {
+      maintainers = mkOption {
+        type = listOfMaintainers;
+        default = [ ];
+        example = lib.literalExpression ''[ lib.maintainers.alice lib.maintainers.bob ]'';
+        description = ''
+          List of maintainers of each module.
+          This option should be defined at most once per module.
+
+          The option value is not a list of maintainers, but an attribute set that maps module file names to lists of maintainers.
+        '';
+      };
+    };
+  };
+  meta.maintainers = with lib.maintainers; [
+    pierron
+    roberth
+  ];
+}
diff --git a/modules/generic/meta-maintainers/test.nix b/modules/generic/meta-maintainers/test.nix
new file mode 100644
index 000000000000..73a431c34327
--- /dev/null
+++ b/modules/generic/meta-maintainers/test.nix
@@ -0,0 +1,34 @@
+# Run:
+#   $ nix-instantiate --eval 'modules/generic/meta-maintainers/test.nix'
+#
+# Expected output:
+#   { }
+#
+# Debugging:
+#   drop .test from the end of this file, then use nix repl on it
+rec {
+  lib = import ../../../lib;
+
+  example = lib.evalModules {
+    modules = [
+      ../meta-maintainers.nix
+      {
+        _file = "eelco.nix";
+        meta.maintainers = [ lib.maintainers.eelco ];
+      }
+    ];
+  };
+
+  test =
+    assert
+      example.config.meta.maintainers == {
+        ${toString ../meta-maintainers.nix} = [
+          lib.maintainers.pierron
+          lib.maintainers.roberth
+        ];
+        "eelco.nix" = [ lib.maintainers.eelco ];
+      };
+    { };
+
+}
+.test
diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix
index 19886fcc29fc..20a2c99904d1 100644
--- a/nixos/modules/misc/meta.nix
+++ b/nixos/modules/misc/meta.nix
@@ -1,39 +1,5 @@
 { lib, ... }:
 let
-  maintainer = lib.mkOptionType {
-    name = "maintainer";
-    check = email: lib.elem email (lib.attrValues lib.maintainers);
-    merge =
-      loc: defs:
-      lib.listToAttrs (lib.singleton (lib.nameValuePair (lib.last defs).file (lib.last defs).value));
-  };
-
-  listOfMaintainers = lib.types.listOf maintainer // {
-    # Returns list of
-    #   { "module-file" = [
-    #        "maintainer1 <first@nixos.org>"
-    #        "maintainer2 <second@nixos.org>" ];
-    #   }
-    merge =
-      loc: defs:
-      lib.zipAttrs (
-        lib.flatten (
-          lib.imap1 (
-            n: def:
-            lib.imap1 (
-              m: def':
-              maintainer.merge (loc ++ [ "[${toString n}-${toString m}]" ]) [
-                {
-                  inherit (def) file;
-                  value = def';
-                }
-              ]
-            ) def.value
-          ) defs
-        )
-      );
-  };
-
   docFile = lib.types.path // {
     # Returns tuples of
     #   { file = "module location"; value = <path/to/doc.xml>; }
@@ -42,20 +8,11 @@ let
 in
 
 {
+  imports = [ ../../../modules/generic/meta-maintainers.nix ];
+
   options = {
     meta = {
 
-      maintainers = lib.mkOption {
-        type = listOfMaintainers;
-        internal = true;
-        default = [ ];
-        example = lib.literalExpression ''[ lib.maintainers.alice ]'';
-        description = ''
-          List of maintainers of each module.  This option should be defined at
-          most once per module.
-        '';
-      };
-
       doc = lib.mkOption {
         type = docFile;
         internal = true;
@@ -84,5 +41,8 @@ in
     };
   };
 
-  meta.maintainers = lib.singleton lib.maintainers.pierron;
+  meta.maintainers = with lib.maintainers; [
+    pierron
+    roberth
+  ];
 }

From f7c74c9b197d7d14ff1100bfc5ae96100cc3e927 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Wed, 6 Aug 2025 15:15:39 +0200
Subject: [PATCH 0409/3724] icingaweb2: include schema/ in $out/

Icinga Web's database migration hook expects it there.
---
 pkgs/servers/icingaweb2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix
index ffa3325d52e2..5aa5e1bc9f32 100644
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/pkgs/servers/icingaweb2/default.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/share
-    cp -ra application bin etc library modules public $out
+    cp -ra application bin etc library modules public schema $out
     cp -ra doc $out/share
 
     wrapProgram $out/bin/icingacli --prefix PATH : "${lib.makeBinPath [ php83 ]}"

From 8d0b9ddcc55a6b60d3060a4894def12486ffab6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 6 Aug 2025 15:21:57 +0200
Subject: [PATCH 0410/3724] Revert "release: don't block on bootstrap tools,
 temporarily"

This reverts commit 6497d443452cfba1405034e2f54cec5801f2bfdc.
i.e. reverts PR #429030.
---
 pkgs/top-level/release.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index ce84a3b25f42..700815d5034f 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -272,9 +272,7 @@ let
           jobs.tests.stdenv.hooks.patch-shebangs.x86_64-linux
         */
       ]
-      # FIXME: these are just temporarily omitted until fixed
-      # see https://hydra.nixos.org/build/303330677#tabs-constituents
-      #++ collect isDerivation jobs.stdenvBootstrapTools
+      ++ collect isDerivation jobs.stdenvBootstrapTools
       ++ optionals supportDarwin.x86_64 [
         jobs.stdenv.x86_64-darwin
         jobs.cargo.x86_64-darwin

From 2e6f99eddd3af83e3bdf2bff4ee3ccf70a41b339 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 5 Aug 2025 16:39:25 +0200
Subject: [PATCH 0411/3724] srcOnly: add warning for usage with non-stdenv
 derivations

---
 pkgs/build-support/src-only/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix
index f8c3068d6c73..b732c6156041 100644
--- a/pkgs/build-support/src-only/default.nix
+++ b/pkgs/build-support/src-only/default.nix
@@ -69,12 +69,15 @@ if lib.isDerivation attrs && attrs ? overrideAttrs then
   attrs.overrideAttrs (_finalAttrs: prevAttrs: argsToOverride prevAttrs)
 else
   let
-    # TODO(@sternenseemann): remove drvAttrs special casing
     # If we don't have overrideAttrs, it is extremely unlikely that we are seeing
     # a derivation constructed by stdenv.mkDerivation. Since srcOnly assumes
     # that we are using stdenv's setup.sh, it therefore doesn't make sense to
     # have derivation specific logic in this branch.
-    args = attrs.drvAttrs or attrs;
+    # TODO(@sternenseemann): remove drvAttrs special casing in NixOS 26.05
+    args =
+      lib.warnIf (lib.isDerivation attrs)
+        "srcOnly: derivations not created by a variant of stdenv.mkDerivation are not supported. Code relying on behaviour of srcOnly with non-stdenv derivations may break in the future."
+        attrs.drvAttrs or attrs;
     stdenv = args.stdenv or (lib.warn "srcOnly: stdenv not provided, using stdenvNoCC" stdenvNoCC);
     drv = stdenv.mkDerivation (args // argsToOverride args);
   in

From 58376e1f1d079ac0f41515ce26801d442f691e61 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 6 Aug 2025 17:24:58 +0200
Subject: [PATCH 0412/3724] eigen: fix bdcsvd

---
 pkgs/by-name/ei/eigen/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ei/eigen/package.nix b/pkgs/by-name/ei/eigen/package.nix
index eaa298848184..898f83d2d136 100644
--- a/pkgs/by-name/ei/eigen/package.nix
+++ b/pkgs/by-name/ei/eigen/package.nix
@@ -20,6 +20,14 @@ stdenv.mkDerivation {
     ./include-dir.patch
   ];
 
+  # ref. https://gitlab.com/libeigen/eigen/-/merge_requests/977
+  # This was merged upstream and can be removed on next release
+  postPatch = ''
+    substituteInPlace Eigen/src/SVD/BDCSVD.h --replace-fail \
+      "if (l == 0) {" \
+      "if (i >= k && l == 0) {"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   meta = with lib; {

From 4f42092bebd1eb9117faf9e1bd8739726bdb982e Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <emmanuelrosa@protonmail.com>
Date: Tue, 8 Jul 2025 08:52:10 -0400
Subject: [PATCH 0413/3724] bisq2: add aarch64-linux support

- Add aarch64-linux as a platform.
- Use both GPG keys for signature verification.
- Remove lib anti-pattern in the meta attribute.

The bisq2 deb package is usually signed by one of two GPG keys.
Instead of having to modify the package to use the correct key,
this change adds both keys to the key ring. GPG will produce a
successful verification as long as one of the keys verifies.
---
 pkgs/by-name/bi/bisq2/package.nix | 39 +++++++++++++++++--------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/bi/bisq2/package.nix b/pkgs/by-name/bi/bisq2/package.nix
index 05519f122068..9b8fff374af9 100644
--- a/pkgs/by-name/bi/bisq2/package.nix
+++ b/pkgs/by-name/bi/bisq2/package.nix
@@ -33,25 +33,24 @@ let
   # A given release will be signed by either Alejandro Garcia or Henrik Jannsen
   # as indicated in the file
   # https://github.com/bisq-network/bisq2/releases/download/v${version}/signingkey.asc
-  publicKey =
-    {
-      "E222AA02" = fetchurl {
-        url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/E222AA02.asc";
-        hash = "sha256-31uBpe/+0QQwFyAsoCt1TUWRm0PHfCFOGOx1M16efoE=";
-      };
+  publicKey = {
+    "E222AA02" = fetchurl {
+      url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/E222AA02.asc";
+      hash = "sha256-31uBpe/+0QQwFyAsoCt1TUWRm0PHfCFOGOx1M16efoE=";
+    };
 
-      "387C8307" = fetchurl {
-        url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/387C8307.asc";
-        hash = "sha256-PrRYZLT0xv82dUscOBgQGKNf6zwzWUDhriAffZbNpmI=";
-      };
-    }
-    ."E222AA02";
+    "387C8307" = fetchurl {
+      url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/387C8307.asc";
+      hash = "sha256-PrRYZLT0xv82dUscOBgQGKNf6zwzWUDhriAffZbNpmI=";
+    };
+  };
 in
 stdenvNoCC.mkDerivation rec {
   inherit version;
 
   pname = "bisq2";
 
+  # nixpkgs-update: no auto update
   src = fetchurl {
     url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb";
     hash = "sha256-kNQbTZoHFR2qFw/Jjc9iaEews/oUOYoJanmbVH/vs44=";
@@ -69,7 +68,8 @@ stdenvNoCC.mkDerivation rec {
       mkdir -m 700 -p $GNUPGHOME
       ln -s $downloadedFile ./Bisq-${version}.deb
       ln -s ${signature} ./signature.asc
-      gpg --import ${publicKey}
+      gpg --import ${publicKey."E222AA02"}
+      gpg --import ${publicKey."387C8307"}
       gpg --batch --verify signature.asc Bisq-${version}.deb
       popd
       mv $downloadedFile $out
@@ -162,15 +162,18 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Decentralized bitcoin exchange network";
     homepage = "https://bisq.network";
     mainProgram = "bisq2";
-    sourceProvenance = with sourceTypes; [
+    sourceProvenance = with lib.sourceTypes; [
       binaryBytecode
     ];
-    license = licenses.mit;
-    maintainers = with maintainers; [ emmanuelrosa ];
-    platforms = [ "x86_64-linux" ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ emmanuelrosa ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
   };
 }

From e195343469f3419f47d36db43d7a68fef378f8dc Mon Sep 17 00:00:00 2001
From: sund3RRR <evenquantity@gmail.com>
Date: Wed, 6 Aug 2025 19:55:44 +0300
Subject: [PATCH 0414/3724] amnezia-vpn: 4.8.9.1 -> 4.8.9.2

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

diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix
index 97a68660a69b..40865fc86aff 100644
--- a/pkgs/by-name/am/amnezia-vpn/package.nix
+++ b/pkgs/by-name/am/amnezia-vpn/package.nix
@@ -65,13 +65,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "amnezia-vpn";
-  version = "4.8.9.1";
+  version = "4.8.9.2";
 
   src = fetchFromGitHub {
     owner = "amnezia-vpn";
     repo = "amnezia-client";
     tag = finalAttrs.version;
-    hash = "sha256-docQqOVzmgqWPhKzOmKeXhssjyhtfYy1fNn0ZGXjsZ0=";
+    hash = "sha256-UavKtAwnEa+Ym1a7XzC3JPDLovqggjsav4q2MiYUxbI=";
     fetchSubmodules = true;
   };
 

From 6d1a4c85b521736c6032d69bfd86348692591cad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 19:03:40 +0000
Subject: [PATCH 0415/3724] quarto: 1.7.32 -> 1.7.33

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

diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix
index 19a2d4206bb9..cc79e821bd78 100644
--- a/pkgs/development/libraries/quarto/default.nix
+++ b/pkgs/development/libraries/quarto/default.nix
@@ -39,11 +39,11 @@ let
 in
 stdenv.mkDerivation (final: {
   pname = "quarto";
-  version = "1.7.32";
+  version = "1.7.33";
 
   src = fetchurl {
     url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz";
-    hash = "sha256-JiUF49JkWcZOZu/v1LkkDrdV6iDdb+h21qpkx6exPSc=";
+    hash = "sha256-ODO8pp940pZtP53HEM8R9JPfjAKxShVvyABjcHdrlew=";
   };
 
   patches = [

From 1a5c67af7553db8873a2f5e15c841acf0c910885 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 19:29:29 +0000
Subject: [PATCH 0416/3724] ocamlPackages.miou: 0.3.1 -> 0.4.0

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

diff --git a/pkgs/development/ocaml-modules/miou/default.nix b/pkgs/development/ocaml-modules/miou/default.nix
index a1374cd17865..d02f4fd795c4 100644
--- a/pkgs/development/ocaml-modules/miou/default.nix
+++ b/pkgs/development/ocaml-modules/miou/default.nix
@@ -6,13 +6,13 @@
 
 buildDunePackage rec {
   pname = "miou";
-  version = "0.3.1";
+  version = "0.4.0";
 
   minimalOCamlVersion = "5.0.0";
 
   src = fetchurl {
     url = "https://github.com/robur-coop/miou/releases/download/v${version}/miou-${version}.tbz";
-    hash = "sha256-K3otUuwFmRVrbnxYYZDMmd2WTYQHmXY/byQHu4PjlHE=";
+    hash = "sha256-2a5SET2SPyQloTdcWU9KzPYRcXgK8e8hHbu6OP9R2s8=";
   };
 
   meta = {

From affbba20319280a16ebb19fe5c11715f5ad2d03a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 19:42:23 +0000
Subject: [PATCH 0417/3724] lego: 4.25.1 -> 4.25.2

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

diff --git a/pkgs/by-name/le/lego/package.nix b/pkgs/by-name/le/lego/package.nix
index 9b416530753d..6d336e783a38 100644
--- a/pkgs/by-name/le/lego/package.nix
+++ b/pkgs/by-name/le/lego/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "lego";
-  version = "4.25.1";
+  version = "4.25.2";
 
   src = fetchFromGitHub {
     owner = "go-acme";
     repo = "lego";
     tag = "v${version}";
-    hash = "sha256-71AaHvf2Vipmws38pcvZtsD+P6UX6dfY3d/4+0aOwVQ=";
+    hash = "sha256-VAYptzJYyo6o5MPq0DB8+VrhqzwJSPwZK6BuaXOn8VM=";
   };
 
   vendorHash = "sha256-8135PtcC98XxbdQnF58sglAgZUkuBA+A3bSxK0+tQ9U=";

From a8828d8cc25b47e3fd77513c434f7332e25eb1e6 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 6 Aug 2025 12:07:21 -0700
Subject: [PATCH 0418/3724] python3Packages.blockbuster: 1.5.23 -> 1.5.25

https://github.com/cbornet/blockbuster/compare/v1.5.23...v1.5.25
---
 pkgs/development/python-modules/blockbuster/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/blockbuster/default.nix b/pkgs/development/python-modules/blockbuster/default.nix
index 0560a02915a6..821764d5dcf0 100644
--- a/pkgs/development/python-modules/blockbuster/default.nix
+++ b/pkgs/development/python-modules/blockbuster/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "blockbuster";
-  version = "1.5.23";
+  version = "1.5.25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cbornet";
     repo = "blockbuster";
     tag = "v${version}";
-    hash = "sha256-AxRnP8/fIae5ovWQVpfs3ZLIIkxXqVZmuhGjPTX5B/g=";
+    hash = "sha256-1+Q1IdJXqLAy7kIcVU38TC3dtMeWAn7YOLyGrjCkxD0=";
   };
 
   build-system = [ hatchling ];

From cceefea34fb476cbf1c36e69b036677d6e11e37b Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 5 Aug 2025 14:16:05 +0000
Subject: [PATCH 0419/3724] bundler: 2.6.9 -> 2.7.1

---
 pkgs/by-name/bu/bundler/package.nix                     | 4 ++--
 pkgs/development/interpreters/ruby/rubygems/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/bu/bundler/package.nix b/pkgs/by-name/bu/bundler/package.nix
index ba02429ae0b9..e1e5c1fdbc36 100644
--- a/pkgs/by-name/bu/bundler/package.nix
+++ b/pkgs/by-name/bu/bundler/package.nix
@@ -13,8 +13,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "2.6.9";
-  source.sha256 = "sha256-olZ1/70FWuEYZ2bMHhILTPYliOiKu1m5nFfiKxxVyes=";
+  version = "2.7.1";
+  source.sha256 = "sha256-CtWgAqh5d2sqmL5lL1V6yHMb4zU2EtY/pO8bJwbcHgs=";
   dontPatchShebangs = true;
 
   postFixup = ''
diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix
index 5e0fd0a00f91..58295fb55547 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.6.9";
+  version = "3.7.1";
 
   src = fetchurl {
     url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
-    hash = "sha256-/91Gxq2+y52sVhzAA2ZkBu/S7ZPKIbX8xHBiAlAHIJ0=";
+    hash = "sha256-dQyMdxGA1B7SNYNE5UYe3ugxWMCoG3eZaaEzmWG8EWM=";
   };
 
   patches = [

From 623b61ac9240561534834fc1bdb59dcc0855b738 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 7 Aug 2025 09:06:08 +1000
Subject: [PATCH 0420/3724] go_1_24: 1.24.5 -> 1.24.6

Changelog: https://go.dev/doc/devel/release#go1.24
---
 pkgs/development/compilers/go/1.24.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix
index a3fc7aea6e48..aed38dafb9d1 100644
--- a/pkgs/development/compilers/go/1.24.nix
+++ b/pkgs/development/compilers/go/1.24.nix
@@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.24.5";
+  version = "1.24.6";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-dP2wnyNS4rJbeUPlaDbJtHNj0o3sHItWxKlXDzC49Z8=";
+    hash = "sha256-4ctVgqq1iGaLwEwH3hhogHD2uMmyqvNh+CHhm9R8/b0=";
   };
 
   strictDeps = true;

From 023037cc964cb51e968829d1436eab8d2f084eef Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 7 Aug 2025 06:32:49 +0100
Subject: [PATCH 0421/3724] libnftnl: 1.2.9 -> 1.3.0

Changes: https://www.spinics.net/lists/netfilter/msg62238.html
---
 pkgs/by-name/li/libnftnl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libnftnl/package.nix b/pkgs/by-name/li/libnftnl/package.nix
index 36a77b3ebf29..21cede656fd1 100644
--- a/pkgs/by-name/li/libnftnl/package.nix
+++ b/pkgs/by-name/li/libnftnl/package.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.9";
+  version = "1.3.0";
   pname = "libnftnl";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz";
-    hash = "sha256-6MIWJV4SnyYnBjn+53dSZWZaMbEaqSAlPD5dXWLfxLg=";
+    hash = "sha256-D0vkeou4t3o1DuWMvUtfrmJgrUhqUncGqxXP4d1Vo8Q=";
   };
 
   configureFlags = lib.optional (

From 27f515a135909980f47901ba17716938f259a0ad Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 7 Aug 2025 06:31:18 +0100
Subject: [PATCH 0422/3724] nftables: 1.1.3 -> 1.1.4

Changes: https://www.netfilter.org/projects/nftables/files/changes-nftables-1.1.4.txt
---
 pkgs/os-specific/linux/nftables/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index 0f9a175711f2..f260c8edc33b 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -26,12 +26,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.3";
+  version = "1.1.4";
   pname = "nftables";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.xz";
-    hash = "sha256-nIpktZyQsIJeVAqbj8udLZQsY2+BulAZnwaP3kTzTtg=";
+    hash = "sha256-NETwASrwRyOZ7q6Jp1i5xtxfMR9sZ6SJiPoWAPxLrIY=";
   };
 
   patches = [

From aee83dd489158ad8754b7509fd2eba0bb9be4df6 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Sun, 20 Jul 2025 05:52:28 -0700
Subject: [PATCH 0423/3724] tuatara: init at 1631040452-unstable-2025-04-29

---
 pkgs/by-name/tu/tuatara/package.nix | 51 +++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/tu/tuatara/package.nix

diff --git a/pkgs/by-name/tu/tuatara/package.nix b/pkgs/by-name/tu/tuatara/package.nix
new file mode 100644
index 000000000000..56fd5d90cf67
--- /dev/null
+++ b/pkgs/by-name/tu/tuatara/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  zig_0_13,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "tuatara";
+  version = "1631040452-unstable-2025-04-29";
+
+  src = fetchFromGitHub {
+    owner = "q60";
+    repo = "tuatara";
+    rev = "bc093e5fe1cb8dec667806f1b41c8e4e913368e8";
+    hash = "sha256-GLOb2vqDlcCQ3bPXC50t1j+DJFhl8JK117t7uRLrBbk=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ zig_0_13.hook ];
+
+  preBuild = ''
+    export ZIG_LOCAL_CACHE_DIR=$TMPDIR/zig-cache
+    export ZIG_GLOBAL_CACHE_DIR=$TMPDIR/zig-global-cache
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Ziggidy *nix system info fetcher";
+    longDescription = ''
+      tuatara is a ziggidy *nix system info fetcher. WIP. It is
+      descendant of disfetch. Although sharing some common concepts
+      and principles, they are different.
+
+      The main difference of tuatara from disfetch is that tuatara
+      will be highly customizable, while disfetch won't, because it
+      covers minimalism and simplicity. Though, they will share some
+      other principles regarding showing only needed information,
+      being fast and reliable and sharing the same handmade logos with
+      the principle of not-more-or-less-than 8 rows.
+    '';
+    homepage = "https://github.com/q60/tuatara";
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ yiyu ];
+    mainProgram = "tuatara";
+    platforms = lib.platforms.all;
+  };
+})

From 05320d369bd1f95b83db782e8ce10796f999250c Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 7 Aug 2025 09:40:44 +0200
Subject: [PATCH 0424/3724] gperftools: 2.15 -> 2.17

Changelog:
- https://github.com/gperftools/gperftools/releases/tag/gperftools-2.17
- https://github.com/gperftools/gperftools/releases/tag/gperftools-2.16

The TLS patch needed updating:
- https://src.fedoraproject.org/rpms/gperftools/blob/88ce8ee43a12b1a8146781a1b4d9abbd8df8af0e/f/gperftools-2.17-disable-generic-dynamic-tls.patch

Notable changes:
- pprof was removed -> no more perl dependency
- google/ headers were removed after "long deprecation" upstream
---
 pkgs/by-name/gp/gperftools/package.nix | 29 ++++++++++++--------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/gp/gperftools/package.nix b/pkgs/by-name/gp/gperftools/package.nix
index 6a4fe6e6af6c..5875bf80311c 100644
--- a/pkgs/by-name/gp/gperftools/package.nix
+++ b/pkgs/by-name/gp/gperftools/package.nix
@@ -5,36 +5,32 @@
   fetchpatch,
   autoreconfHook,
   libunwind,
-  perl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gperftools";
-  version = "2.15";
+  version = "2.17";
 
   src = fetchFromGitHub {
     owner = "gperftools";
     repo = "gperftools";
-    rev = "gperftools-${version}";
-    sha256 = "sha256-3ibr8AHzo7txX1U+9oOWA60qeeJs/OGeevv+sgBwQa0=";
+    tag = "gperftools-${finalAttrs.version}";
+    sha256 = "sha256-Tm+sYKwFSHAxOALgr9UGv7vBMlWqUymXsvNu7Sku6Kk=";
   };
 
   patches = [
     # Add the --disable-general-dynamic-tls configure option:
     # https://bugzilla.redhat.com/show_bug.cgi?id=1483558
     (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/gperftools/raw/f62d87a34f56f64fb8eb86727e34fbc2d3f5294a/f/gperftools-2.7.90-disable-generic-dynamic-tls.patch";
-      sha256 = "02falhpaqkl27hl1dib4yvmhwsddmgbw0krb46w31fyf3awb2ydv";
+      url = "https://src.fedoraproject.org/rpms/gperftools/raw/88ce8ee43a12b1a8146781a1b4d9abbd8df8af0e/f/gperftools-2.17-disable-generic-dynamic-tls.patch";
+      hash = "sha256-IOLUf9mCEA+fVSJKU94akcnXTIm7+t+S9cjBHsEDwFA=";
     })
   ];
 
   nativeBuildInputs = [ autoreconfHook ];
 
   # tcmalloc uses libunwind in a way that works correctly only on non-ARM dynamically linked linux
-  buildInputs = [
-    perl
-  ]
-  ++ lib.optional (
+  buildInputs = lib.optional (
     stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isStatic)
   ) libunwind;
 
@@ -54,11 +50,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/gperftools/gperftools/releases/tag/${finalAttrs.src.tag}";
     homepage = "https://github.com/gperftools/gperftools";
     description = "Fast, multi-threaded malloc() and nifty performance analysis tools";
-    platforms = platforms.all;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ vcunat ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ vcunat ];
   };
-}
+})

From 57aca6f5f081bc2b31b1c04aee221d0e6b374ab7 Mon Sep 17 00:00:00 2001
From: Pau Kailfer <pau@kaifler.me>
Date: Thu, 7 Aug 2025 09:58:55 +0200
Subject: [PATCH 0425/3724] typespec: 1.1.0 -> 1.3.0

---
 pkgs/by-name/ty/typespec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix
index df0d3ca91eb9..2671f0c9a10a 100644
--- a/pkgs/by-name/ty/typespec/package.nix
+++ b/pkgs/by-name/ty/typespec/package.nix
@@ -14,13 +14,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "typespec";
-  version = "1.1.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "typespec";
     tag = "typespec-stable@${finalAttrs.version}";
-    hash = "sha256-fUrBoDDv0UW5dqudD/bpzaT8SdIc5snI8Q/Fe5jWCvw=";
+    hash = "sha256-yf9Iz9chRzaRS9Mkw+Djr4zSbub5GIn9vlQI97nymyE=";
   };
 
   nativeBuildInputs = [
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       postPatch
       ;
     fetcherVersion = 1;
-    hash = "sha256-9RQZ2ycu78W3Ie6MLpo6x7Sa/iYsUdq5bYed56mOPxs=";
+    hash = "sha256-f0Amp6xS77cdD0+nQquEPnOpTPWyLza7T4FmGHOfTOo=";
   };
 
   postPatch = ''

From c1513a4fd70640aea4ce53fe9b3c99b4bde19990 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 7 Aug 2025 09:28:38 +0200
Subject: [PATCH 0426/3724] qdldl: init at 0.1.8

---
 pkgs/by-name/qd/qdldl/package.nix | 32 +++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/qd/qdldl/package.nix

diff --git a/pkgs/by-name/qd/qdldl/package.nix b/pkgs/by-name/qd/qdldl/package.nix
new file mode 100644
index 000000000000..b48088f8ab4b
--- /dev/null
+++ b/pkgs/by-name/qd/qdldl/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "qdldl";
+  version = "0.1.8";
+
+  src = fetchFromGitHub {
+    owner = "osqp";
+    repo = "qdldl";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-qCeOs4UjZLuqlbiLgp6BMxvw4niduCPDOOqFt05zi2E=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  meta = {
+    description = "Free LDL factorisation routine";
+    homepage = "https://github.com/osqp/qdldl";
+    changelog = "https://github.com/osqp/qdldl/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nim65s ];
+    mainProgram = "qdldl";
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
+  };
+})

From f2d448ac0e3ac44dcc169034a68a8dc527039cb5 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 7 Aug 2025 09:17:49 +0200
Subject: [PATCH 0427/3724] osqp: 0.6.3 -> 1.0.0

Diff: https://github.com/oxfordcontrol/osqp/compare/v0.6.3...v1.0.0
---
 pkgs/by-name/os/osqp/package.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/os/osqp/package.nix b/pkgs/by-name/os/osqp/package.nix
index da9ca6a4a140..230a3be5be3c 100644
--- a/pkgs/by-name/os/osqp/package.nix
+++ b/pkgs/by-name/os/osqp/package.nix
@@ -7,24 +7,16 @@
 
 stdenv.mkDerivation rec {
   pname = "osqp";
-  version = "0.6.3";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "oxfordcontrol";
     repo = "osqp";
     tag = "v${version}";
-    hash = "sha256-enkK5EFyAeLaUnHNYS3oq43HsHY5IuSLgsYP0k/GW8c=";
+    hash = "sha256-BOAytzJzHcggncQzeDrXwJOq8B3doWERJ6CKIVg1yJY=";
     fetchSubmodules = true;
   };
 
-  # ref https://github.com/osqp/osqp/pull/481
-  # but this patch does not apply directly on v0.6.3
-  postPatch = ''
-    substituteInPlace CMakeLists.txt --replace-fail \
-      "$<INSTALL_PREFIX>/\''${CMAKE_INSTALL_INCLUDEDIR}" \
-      "\''${CMAKE_INSTALL_FULL_INCLUDEDIR}"
-  '';
-
   nativeBuildInputs = [ cmake ];
 
   meta = with lib; {

From b9e14b77190996f65d2a70b19bb4a2d5f9881dde Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 7 Aug 2025 09:20:15 +0200
Subject: [PATCH 0428/3724] osqp: clean

---
 pkgs/by-name/os/osqp/package.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/os/osqp/package.nix b/pkgs/by-name/os/osqp/package.nix
index 230a3be5be3c..8cd284c3b3b6 100644
--- a/pkgs/by-name/os/osqp/package.nix
+++ b/pkgs/by-name/os/osqp/package.nix
@@ -5,25 +5,24 @@
   cmake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "osqp";
   version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "oxfordcontrol";
     repo = "osqp";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-BOAytzJzHcggncQzeDrXwJOq8B3doWERJ6CKIVg1yJY=";
-    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     description = "Quadratic programming solver using operator splitting";
     homepage = "https://osqp.org";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ taktoa ];
-    platforms = platforms.all;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ taktoa ];
+    platforms = lib.platforms.all;
   };
-}
+})

From c489b3928482d673ba83e49ebbfed1d4b86fdb5c Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 7 Aug 2025 09:41:46 +0200
Subject: [PATCH 0429/3724] osqp: use our qdldl src

This use `qdldl.src` in osqp `FetchContent` for now.

Attempts to improve that upstream were tried
(https://github.com/osqp/osqp/pull/567), but are not ready yet.
---
 pkgs/by-name/os/osqp/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/os/osqp/package.nix b/pkgs/by-name/os/osqp/package.nix
index 8cd284c3b3b6..a3da73c31ddf 100644
--- a/pkgs/by-name/os/osqp/package.nix
+++ b/pkgs/by-name/os/osqp/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  qdldl,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +17,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-BOAytzJzHcggncQzeDrXwJOq8B3doWERJ6CKIVg1yJY=";
   };
 
+  postPatch = ''
+    substituteInPlace algebra/_common/lin_sys/qdldl/qdldl.cmake --replace-fail \
+      "GIT_REPOSITORY https://github.com/osqp/qdldl.git" \
+      "URL ${qdldl.src}"
+  '';
+
   nativeBuildInputs = [ cmake ];
+  propagatedBuildInputs = [ qdldl ];
 
   meta = {
     description = "Quadratic programming solver using operator splitting";

From 3eb299d3f95ecb37b7e8ee1740198059bd05c319 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 7 Aug 2025 12:07:37 +0200
Subject: [PATCH 0430/3724] osqp: pass version

upstream use a funny
```cmake
set(OSQP_VERSION
    "0.0.0"
    CACHE STRING "The version number of OSQP")
```
---
 pkgs/by-name/os/osqp/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/os/osqp/package.nix b/pkgs/by-name/os/osqp/package.nix
index a3da73c31ddf..d2d718aa5295 100644
--- a/pkgs/by-name/os/osqp/package.nix
+++ b/pkgs/by-name/os/osqp/package.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
   propagatedBuildInputs = [ qdldl ];
+  cmakeFlags = [ (lib.cmakeFeature "OSQP_VERSION" finalAttrs.version) ];
 
   meta = {
     description = "Quadratic programming solver using operator splitting";

From f5462ca33320cad7b9bb5052585395669840fa66 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 7 Aug 2025 10:42:01 +0200
Subject: [PATCH 0431/3724] casadi: 3.7.0 -> 3.7.1

Diff: https://github.com/casadi/casadi/compare/3.7.0...3.7.1
---
 pkgs/by-name/ca/casadi/package.nix | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix
index 139aa6dce48d..97b6047d440e 100644
--- a/pkgs/by-name/ca/casadi/package.nix
+++ b/pkgs/by-name/ca/casadi/package.nix
@@ -38,24 +38,37 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "casadi";
-  version = "3.7.0";
+  version = "3.7.1";
 
   src = fetchFromGitHub {
     owner = "casadi";
     repo = "casadi";
-    rev = finalAttrs.version;
-    hash = "sha256-WumXAWO65XnNQqHMqAwfj2Y+KGOVTWx95qIuyE1M9us=";
+    tag = finalAttrs.version;
+    hash = "sha256-554ZN+GfkGHN0cthsb/fPWdo+U2IqLz4q+x60SxRAfk=";
   };
 
   patches = [
-    (fetchpatch {
-      name = "fix-FindMUMPS.cmake.patch";
-      url = "https://github.com/casadi/casadi/pull/3899/commits/274f4b23f73e60c5302bec0479fe1e92682b63d2.patch";
-      hash = "sha256-3GWEWlN8dKLD6htpnOQLChldcT3hE09JWLeuCfAhY+4=";
-    })
     # update include file path and link with clangAPINotes
     # https://github.com/casadi/casadi/issues/3969
     ./clang-19.diff
+
+    # Add missing include
+    # ref. https://github.com/casadi/casadi/pull/4192
+    (fetchpatch {
+      url = "https://github.com/casadi/casadi/pull/4192/commits/fc1a83e8db37f328657eabff41f00a9a34d3cc74.patch";
+      hash = "sha256-9GXOtYa/BFq5vp6tE8HxO8xW3ep3my6TPD3FvkDhUUA=";
+    })
+
+    # Fix build with osqp v1
+    # ref. https://github.com/casadi/casadi/pull/4105
+    (fetchpatch {
+      url = "https://github.com/casadi/casadi/pull/4105/commits/cca4eb5d423c9d034f0666f71338063d3f8c9c43.patch";
+      hash = "sha256-pDI9x4yzPj+rjtzZpFKwfSsyE52Jt20izfqo5blkUOA=";
+    })
+    (fetchpatch {
+      url = "https://github.com/casadi/casadi/pull/4105/commits/6035a95e48088928134c3827ab90a2a3a82b1389.patch";
+      hash = "sha256-1nOcCLXVwFBRH/abAhTly28+1oNjDumJCjT0NyRAgz0=";
+    })
   ];
 
   postPatch = ''

From 838a7bde50103c2622d47099863005ecf8527b82 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 13:45:49 +0200
Subject: [PATCH 0432/3724] python313: 3.13.5 -> 3.13.6

https://docs.python.org/release/3.13.6/whatsnew/changelog.html
---
 pkgs/development/interpreters/python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 5d60226aeb9c..322de044a111 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -20,10 +20,10 @@
         sourceVersion = {
           major = "3";
           minor = "13";
-          patch = "5";
+          patch = "6";
           suffix = "";
         };
-        hash = "sha256-k+WD8kNFTm6eRYjKLCZiIGrZYWWYYyd6/NuWgBZH1kA=";
+        hash = "sha256-F7pVCIGdhzahT7/EfTbhhJRqh3hRsunEtsQ6y0SjsQQ=";
       };
     };
 

From 607aeea392fb7a23ab707761b211f266ba1c7f1f Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <sergei@zimmerman.foo>
Date: Wed, 23 Jul 2025 01:04:04 +0300
Subject: [PATCH 0433/3724] opencl-headers: 2024.10.24 -> 2025.07.22

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

diff --git a/pkgs/by-name/op/opencl-headers/package.nix b/pkgs/by-name/op/opencl-headers/package.nix
index b0bfde105a11..86ab51dc5e33 100644
--- a/pkgs/by-name/op/opencl-headers/package.nix
+++ b/pkgs/by-name/op/opencl-headers/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "opencl-headers";
-  version = "2024.10.24";
+  version = "2025.07.22";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCL-Headers";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-KDlruE0IG8d+lAChxYyc6dg5XOvqCMrMyO69sdAzejA=";
+    sha256 = "sha256-XcDzBt4EAsip+5/lbZwPBO7/nDGAognUkJO/2Jg4OeY=";
   };
 
   nativeBuildInputs = [ cmake ];

From 0e3b104b424ac1a472c2015686411339a5dd9c1f Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <sergei@zimmerman.foo>
Date: Wed, 23 Jul 2025 01:04:14 +0300
Subject: [PATCH 0434/3724] opencl-clhpp: 2024.10.24 -> 2025.07.22

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

diff --git a/pkgs/by-name/op/opencl-clhpp/package.nix b/pkgs/by-name/op/opencl-clhpp/package.nix
index d7e3fc23f36d..b3b728561ade 100644
--- a/pkgs/by-name/op/opencl-clhpp/package.nix
+++ b/pkgs/by-name/op/opencl-clhpp/package.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "opencl-clhpp";
-  version = "2024.10.24";
+  version = "2025.07.22";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCL-CLHPP";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    sha256 = "sha256-3RVZJIt03pRmjrPa9q6h6uqFCuTnxvEqjUGUmdwybbY=";
+    sha256 = "sha256-afiHjAhdhjtNkGggCO69MwHiQuJZb028lfpQl3HIvXw=";
   };
 
   nativeBuildInputs = [

From 383c5e5dcadc85461668fbab46e6eacbf7379d1c Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <sergei@zimmerman.foo>
Date: Wed, 23 Jul 2025 01:04:27 +0300
Subject: [PATCH 0435/3724] khronos-ocl-icd-loader: 2024.10.24 -> 2025.07.22

---
 pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix b/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix
index 60fb02025d95..0632ad6a08f6 100644
--- a/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix
+++ b/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "opencl-icd-loader";
-  version = "2024.10.24";
+  version = "2025.07.22";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCL-ICD-Loader";
     rev = "v${version}";
-    hash = "sha256-A+Rd/3LyBoUW2MrRDMOcwsTqTADuNxSQdF1HHgfq3mY=";
+    hash = "sha256-jwviNwX7C7b9lqIS4oZ4YLEFBfBdmQfXHxW3FPPYxYs=";
   };
 
   nativeBuildInputs = [ cmake ];

From c7eb566c4197a26d5721c5f99bd9b800f10abaaf Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 7 Aug 2025 17:03:57 +0200
Subject: [PATCH 0436/3724] nixos/grafana: add `prune` option to
 provision.datasources

Closes #430532
---
 nixos/modules/services/monitoring/grafana.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index b597adc5e2bb..2d84636d436a 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -1320,6 +1320,16 @@ in
                     type = types.int;
                   };
 
+                  prune = mkOption {
+                    default = false;
+                    type = types.bool;
+                    description = ''
+                      When `true`, provisioned datasources from this file will be deleted
+                      automatically when removed from
+                      {option}`services.grafana.provision.datasources.settings.datasources`.
+                    '';
+                  };
+
                   datasources = mkOption {
                     description = "List of datasources to insert/update.";
                     default = [ ];

From c8dd37a4b095c636d2c646d7d295509973ae5b58 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Thu, 7 Aug 2025 19:17:33 +0300
Subject: [PATCH 0437/3724] nixos/regreet: replace deprecated package attrpath

A follow-up to #427540
---
 nixos/modules/programs/regreet.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/programs/regreet.nix b/nixos/modules/programs/regreet.nix
index d3990a9fbf49..b48ba26c3270 100644
--- a/nixos/modules/programs/regreet.nix
+++ b/nixos/modules/programs/regreet.nix
@@ -26,10 +26,7 @@ in
       '';
     };
 
-    package = lib.mkPackageOption pkgs [
-      "greetd"
-      "regreet"
-    ] { };
+    package = lib.mkPackageOption pkgs "regreet" { };
 
     settings = lib.mkOption {
       type = settingsFormat.type;

From 3dce7f4a77812afd69efcbfe15e5223f98c5c69e Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 7 Aug 2025 09:49:19 +0200
Subject: [PATCH 0438/3724] uv: 0.8.4 -> 0.8.6

Changelog: https://github.com/astral-sh/uv/releases/tag/0.8.5
Changelog: https://github.com/astral-sh/uv/releases/tag/0.8.6
---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 001c8b8e47b2..ce3acab23aa7 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.8.4";
+  version = "0.8.6";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-P87yB7TSPjbUwc+FVzGkOYJ/bzlDbKMMeA3iebP7pIU=";
+    hash = "sha256-82KKnz42Nn2Ef8DHBWBMPTrQVsM+klIOV8hqSKnXqEY=";
   };
 
-  cargoHash = "sha256-oH5MzsvQoPP8ybSqnuYdzbzJr36iYAfHYlUtSB3EQUc=";
+  cargoHash = "sha256-l2/PMPiSPE6WpXOuU21NsMx0vsz9cuy/QeCiSTkbvVw=";
 
   buildInputs = [
     rust-jemalloc-sys

From b0986e899d5dc8863fd8efc5eb0f66a238ecfcae Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 22 Jun 2025 19:59:20 +0200
Subject: [PATCH 0439/3724] gn: merge generic and package

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gn/generic.nix | 79 ----------------------------------
 pkgs/by-name/gn/gn/package.nix | 72 +++++++++++++++++++++++++++++--
 2 files changed, 69 insertions(+), 82 deletions(-)
 delete mode 100644 pkgs/by-name/gn/gn/generic.nix

diff --git a/pkgs/by-name/gn/gn/generic.nix b/pkgs/by-name/gn/gn/generic.nix
deleted file mode 100644
index 98328fcd97f3..000000000000
--- a/pkgs/by-name/gn/gn/generic.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchgit,
-  fetchpatch,
-  cctools,
-  writeText,
-  ninja,
-  python3,
-  ...
-}:
-
-{
-  rev,
-  revNum,
-  version,
-  sha256,
-}:
-
-let
-  revShort = builtins.substring 0 7 rev;
-  lastCommitPosition = writeText "last_commit_position.h" ''
-    #ifndef OUT_LAST_COMMIT_POSITION_H_
-    #define OUT_LAST_COMMIT_POSITION_H_
-
-    #define LAST_COMMIT_POSITION_NUM ${revNum}
-    #define LAST_COMMIT_POSITION "${revNum} (${revShort})"
-
-    #endif  // OUT_LAST_COMMIT_POSITION_H_
-  '';
-
-in
-stdenv.mkDerivation {
-  pname = "gn-unstable";
-  inherit version;
-
-  src = fetchgit {
-    # Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic!
-    url = "https://gn.googlesource.com/gn";
-    inherit rev sha256;
-  };
-
-  nativeBuildInputs = [
-    ninja
-    python3
-  ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    cctools
-  ];
-
-  env.NIX_CFLAGS_COMPILE = "-Wno-error";
-  # Relax hardening as otherwise gn unstable 2024-06-06 and later fail with:
-  # cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
-  hardeningDisable = [ "format" ];
-
-  buildPhase = ''
-    python build/gen.py --no-last-commit-position
-    ln -s ${lastCommitPosition} out/last_commit_position.h
-    ninja -j $NIX_BUILD_CORES -C out gn
-  '';
-
-  installPhase = ''
-    install -vD out/gn "$out/bin/gn"
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  meta = with lib; {
-    description = "Meta-build system that generates build files for Ninja";
-    mainProgram = "gn";
-    homepage = "https://gn.googlesource.com/gn";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
-      stesie
-      matthewbauer
-    ];
-  };
-}
diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index fa3322edd222..a9cb3782531a 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -1,10 +1,76 @@
-{ callPackage, ... }@args:
-
-callPackage ./generic.nix args {
+{
+  stdenv,
+  lib,
+  fetchgit,
+  cctools,
+  writeText,
+  ninja,
+  python3,
+}:
+let
   # Note: Please use the recommended version for Chromium stable, i.e. from
   # <nixpkgs>/pkgs/applications/networking/browsers/chromium/info.json
   rev = "85cc21e94af590a267c1c7a47020d9b420f8a033";
   revNum = "2233"; # git describe $rev --match initial-commit | cut -d- -f3
   version = "2025-04-28";
   sha256 = "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI=";
+
+  revShort = builtins.substring 0 7 rev;
+  lastCommitPosition = writeText "last_commit_position.h" ''
+    #ifndef OUT_LAST_COMMIT_POSITION_H_
+    #define OUT_LAST_COMMIT_POSITION_H_
+
+    #define LAST_COMMIT_POSITION_NUM ${revNum}
+    #define LAST_COMMIT_POSITION "${revNum} (${revShort})"
+
+    #endif  // OUT_LAST_COMMIT_POSITION_H_
+  '';
+
+in
+stdenv.mkDerivation {
+  pname = "gn-unstable";
+  inherit version;
+
+  src = fetchgit {
+    # Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic!
+    url = "https://gn.googlesource.com/gn";
+    inherit rev sha256;
+  };
+
+  nativeBuildInputs = [
+    ninja
+    python3
+  ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+  ];
+
+  env.NIX_CFLAGS_COMPILE = "-Wno-error";
+  # Relax hardening as otherwise gn unstable 2024-06-06 and later fail with:
+  # cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
+  hardeningDisable = [ "format" ];
+
+  buildPhase = ''
+    python build/gen.py --no-last-commit-position
+    ln -s ${lastCommitPosition} out/last_commit_position.h
+    ninja -j $NIX_BUILD_CORES -C out gn
+  '';
+
+  installPhase = ''
+    install -vD out/gn "$out/bin/gn"
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  meta = with lib; {
+    description = "Meta-build system that generates build files for Ninja";
+    mainProgram = "gn";
+    homepage = "https://gn.googlesource.com/gn";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [
+      stesie
+      matthewbauer
+    ];
+  };
 }

From c45027f5d605eb08260ceb0b9f38d80afa3cf1c9 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 8 Aug 2025 01:16:46 +0200
Subject: [PATCH 0440/3724] httptoolkit-server: 1.20.1 -> 1.22.0

---
 pkgs/by-name/ht/httptoolkit-server/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ht/httptoolkit-server/package.nix b/pkgs/by-name/ht/httptoolkit-server/package.nix
index 440916a58b96..acca4d3df9aa 100644
--- a/pkgs/by-name/ht/httptoolkit-server/package.nix
+++ b/pkgs/by-name/ht/httptoolkit-server/package.nix
@@ -16,13 +16,13 @@ let
   nodejs = nodejs_20;
   buildNpmPackage' = buildNpmPackage.override { inherit nodejs; };
 
-  version = "1.20.1";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "httptoolkit";
     repo = "httptoolkit-server";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-iEAYZX7WNk6TvZ44GAOgTqXOcW5oFn4gX+kzixZZbWA=";
+    tag = "v${version}";
+    hash = "sha256-4kvpTqajlBWIYveedmlo2yrnbEdN/V+96/Lf54miMuw=";
   };
 
   overridesNodeModules = buildNpmPackage' {
@@ -30,7 +30,7 @@ let
     inherit version src;
     sourceRoot = "${src.name}/overrides/js";
 
-    npmDepsHash = "sha256-Uw7XbfwLMX+zbSrzFgvB8lw3hxUyw1eRKazCITrT/28=";
+    npmDepsHash = "sha256-MtUJY9IxzkGPuoIXHAr9nNNF+NpEf2b/oAYauJPwdaw=";
 
     dontBuild = true;
 
@@ -47,7 +47,7 @@ let
     src = fetchFromGitHub {
       owner = "murat-dogan";
       repo = "node-datachannel";
-      rev = "refs/tags/v${nodeDatachannel.version}";
+      tag = "v${nodeDatachannel.version}";
       hash = "sha256-xjYja+e2Z7X5cU4sEuSsJzG0gtmTPl3VrUf+ypd3zdw=";
     };
 
@@ -102,7 +102,7 @@ buildNpmPackage' {
 
   patches = [ ./only-build-for-one-platform.patch ];
 
-  npmDepsHash = "sha256-gHXop4CTsQTSMrZ5mBHkMcmpOr2MIjVLrzjLLCfZ3As=";
+  npmDepsHash = "sha256-J6QmJsnl5UCxeSKIcekdguM+M5Z2HBYRat5nt18zPYU=";
 
   npmFlags = [ "--ignore-scripts" ];
 

From 4ecbc7a0c1f85aaa610a26c043856d365e7db0c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 22:58:56 +0000
Subject: [PATCH 0441/3724] httptoolkit: 1.20.1 -> 1.22.0

---
 pkgs/by-name/ht/httptoolkit/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix
index fd78ff33ee91..e955b1962f26 100644
--- a/pkgs/by-name/ht/httptoolkit/package.nix
+++ b/pkgs/by-name/ht/httptoolkit/package.nix
@@ -14,16 +14,16 @@ let
 in
 buildNpmPackage rec {
   pname = "httptoolkit";
-  version = "1.20.1";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "httptoolkit";
     repo = "httptoolkit-desktop";
     tag = "v${version}";
-    hash = "sha256-1m4okGTNrboyj+QiMFPT7Z0/+FxZtxrqqAbuAobRgvU=";
+    hash = "sha256-8zvY/40hcZcoMojARktf5dpCsFFQk6h7P5KwukbEnjw=";
   };
 
-  npmDepsHash = "sha256-NH6Ppj6SsM0BXAgboMgp1ZPwN43ciLNBaHkz5yq8Ff8=";
+  npmDepsHash = "sha256-yDXakndCGelLNTHD0atsb5MlWFiG8vINfNvsTTAXRTE=";
 
   makeCacheWritable = true;
 

From 5d7c4dfa66f56ae9ff56ac913fedd51ebc73c9fe Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 8 Aug 2025 01:03:52 +0200
Subject: [PATCH 0442/3724] ruff: 0.12.5 -> 0.12.8

Diff: https://github.com/astral-sh/ruff/compare/0.12.5...0.12.8

Changelog: https://github.com/astral-sh/ruff/releases/tag/0.12.8
---
 pkgs/by-name/ru/ruff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index bd4f97778d73..8dea56005858 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,13 +16,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.12.5";
+  version = "0.12.8";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-A+ivcL8c1K+IXbtrL1v4i0iRU6urBMvPbs01ZJNRLpM=";
+    hash = "sha256-ypYtAUQBFSf+cgly9K5eRMegtWrRmLmqrgfRmCJvXEk=";
   };
 
   # Patch out test that fails due to ANSI escape codes being written as-is,
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ruff" ];
 
-  cargoHash = "sha256-pnYXqJ2Za8Y5RqSB4UL/VITCmY4EGQDTTLklyqJdB5w=";
+  cargoHash = "sha256-0iYwS8Ssi4JDxwr0Q2+iKvYHb179L6BiiuXa2D4qiOA=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From e02db034031594c422fdcb517d5b5658a1f6e9bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 01:01:30 +0000
Subject: [PATCH 0443/3724] libcamera: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix
index 0822c26bf80e..15def0c69bd8 100644
--- a/pkgs/by-name/li/libcamera/package.nix
+++ b/pkgs/by-name/li/libcamera/package.nix
@@ -27,12 +27,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libcamera";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchgit {
     url = "https://git.libcamera.org/libcamera/libcamera.git";
     rev = "v${version}";
-    hash = "sha256-JV5sa/jiqubcenSeYC4jlB/RgGJt3o1HTIyy7U4Ljlg=";
+    hash = "sha256-nr1LmnedZMGBWLf2i5uw4E/OMeXObEKgjuO+PUx/GDY=";
   };
 
   outputs = [

From 5e3fae1957fe888008ff2ff5722b8b151a14e9e0 Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Fri, 8 Aug 2025 05:43:49 +0200
Subject: [PATCH 0444/3724] odin: dev-2025-07 -> dev-2025-08

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

diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix
index 731fe7e8aaa9..e5ea311510e7 100644
--- a/pkgs/by-name/od/odin/package.nix
+++ b/pkgs/by-name/od/odin/package.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "odin";
-  version = "dev-2025-07";
+  version = "dev-2025-08";
 
   src = fetchFromGitHub {
     owner = "odin-lang";
     repo = "Odin";
     tag = finalAttrs.version;
-    hash = "sha256-4jhxvQHirNm4B4Wf5Ak0lhAbwaRw6ajWA0JhIn1NYwM=";
+    hash = "sha256-08a5MFnHiG/HsetF7V913Hozev2rm1PaXdA/QJcDXTk=";
   };
 
   patches = [

From 7c496be46df8ad580ab67e84d9228216ff935a6b Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Fri, 8 Aug 2025 05:50:36 +0200
Subject: [PATCH 0445/3724] ols: 0-unstable-2025-06-05 -> 0-unstable-2025-08-08

---
 pkgs/by-name/ol/ols/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix
index 3e7cc1c10415..9084725204c5 100644
--- a/pkgs/by-name/ol/ols/package.nix
+++ b/pkgs/by-name/ol/ols/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "ols";
-  version = "0-unstable-2025-06-05";
+  version = "0-unstable-2025-08-08";
 
   src = fetchFromGitHub {
     owner = "DanielGavin";
     repo = "ols";
-    rev = "c2a2283bf4e0cc2c2b25a6ee2014a18c3b11f3c7";
-    hash = "sha256-1okhaQ8L60FUIDfFsQtlcWyRlVStaOMDAscw3YiZCYo=";
+    rev = "3e183972229782baefc269d8ca940a60caad83c1";
+    hash = "sha256-p5aHNWGNcHpB+uBBQ8Kh7mTbS6G2tRRXmM+Otb7NVHM=";
   };
 
   postPatch = ''

From 93bea48e4ca3b1652689624a392cc7d07e1aa829 Mon Sep 17 00:00:00 2001
From: andre4ik3 <andre4ik3@fastmail.com>
Date: Wed, 6 Aug 2025 21:23:43 +0000
Subject: [PATCH 0446/3724] fex: 2507.1 -> 2508.1

Also avoids unnecessarily setting `CMAKE_BUILD_TYPE`
---
 pkgs/by-name/fe/fex/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix
index a311d2536f84..4e77947df224 100644
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -15,14 +15,14 @@
 
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "fex";
-  version = "2507.1";
+  version = "2508.1";
 
   src = fetchFromGitHub {
     owner = "FEX-Emu";
     repo = "FEX";
     tag = "FEX-${finalAttrs.version}";
 
-    hash = "sha256-F6rMEPmw2UxWw+XWsUXrrUjvrDcIA1W+spkcq3tdUMI=";
+    hash = "sha256-yWUZF/Chgi9bd5gF9qU1jiiIvHOHBUw7tLWxyNUZy9g=";
 
     leaveDotGit = true;
     postFetch = ''
@@ -78,7 +78,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
   ]);
 
   cmakeFlags = [
-    (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
     (lib.cmakeFeature "USE_LINKER" "lld")
     (lib.cmakeBool "ENABLE_LTO" true)
     (lib.cmakeBool "ENABLE_ASSERTIONS" false)

From 580c7670a682000d93bffa74341b42eaae5ff447 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 05:29:13 +0000
Subject: [PATCH 0447/3724] osl: 1.14.6.0 -> 1.14.7.0

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

diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index ad77ad53e139..47f6518395df 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openshadinglanguage";
-  version = "1.14.6.0";
+  version = "1.14.7.0";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenShadingLanguage";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HVkZZkB15+PT9HcAo8NPhzM86wv5ZvnARQVu+n2gTGw=";
+    hash = "sha256-w78x0e9T0lYCAPDPkx6T/4TzAs/mpJ/24uQ+yH5gB5I=";
   };
 
   cmakeFlags = [

From 051ca9b296b100386b7d3c6431de62c19d849cad Mon Sep 17 00:00:00 2001
From: t-monaghan <tomaghan@gmail.com>
Date: Fri, 8 Aug 2025 17:43:47 +1000
Subject: [PATCH 0448/3724] maintainers: add t-monaghan

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e266c71b9ff8..8d2f746adfbb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24570,6 +24570,12 @@
     githubId = 143103;
     name = "Attila Sztupak";
   };
+  t-monaghan = {
+    email = "tomaghan@gmail.com";
+    github = "t-monaghan";
+    githubId = 62273348;
+    name = "Thomas Monaghan";
+  };
   t184256 = {
     email = "monk@unboiled.info";
     github = "t184256";

From 92d23e02622b3f15919cc3081b3943dac26c9dec Mon Sep 17 00:00:00 2001
From: t-monaghan <tomaghan@gmail.com>
Date: Fri, 8 Aug 2025 17:44:34 +1000
Subject: [PATCH 0449/3724] sesh: add t-monaghan to maintainers

---
 pkgs/by-name/se/sesh/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix
index 8c7e8dd3a897..d3c8cdaaeed1 100644
--- a/pkgs/by-name/se/sesh/package.nix
+++ b/pkgs/by-name/se/sesh/package.nix
@@ -26,7 +26,10 @@ buildGoModule rec {
     homepage = "https://github.com/joshmedeski/sesh";
     changelog = "https://github.com/joshmedeski/sesh/releases/tag/${src.rev}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ gwg313 ];
+    maintainers = with lib.maintainers; [
+      gwg313
+      t-monaghan
+    ];
     mainProgram = "sesh";
   };
 }

From 049d4a76494af00c3c223e91a0b65763f2d22792 Mon Sep 17 00:00:00 2001
From: Jan Votava <votava@deployment.cz>
Date: Fri, 8 Aug 2025 07:55:38 +0000
Subject: [PATCH 0450/3724] timoni: 0.25.1 -> 0.25.2

---
 pkgs/by-name/ti/timoni/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ti/timoni/package.nix b/pkgs/by-name/ti/timoni/package.nix
index 98bdda4b15c2..5d56c991b8c7 100644
--- a/pkgs/by-name/ti/timoni/package.nix
+++ b/pkgs/by-name/ti/timoni/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "timoni";
-  version = "0.25.1";
+  version = "0.25.2";
 
   src = fetchFromGitHub {
     owner = "stefanprodan";
     repo = "timoni";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iTVTlxMCLHTXQj3I+nDHhE5w4fDaaM7p52wuvZY2uy4=";
+    hash = "sha256-u59+FGBURP3p1zosZU+6IfCZMHl4plrf/8/FUUgj/qw=";
   };
 
-  vendorHash = "sha256-JFJZguXpPrLbIC5lzvcOMDv5n2K7OoNXKJvWWcNOzKc=";
+  vendorHash = "sha256-bWhXhZJHdiWY/Yz0l2VAPKJrMVb9XbvVEGPNZIQtvFQ=";
 
   subPackages = [ "cmd/timoni" ];
   nativeBuildInputs = [ installShellFiles ];

From 1f82bcd4b6531e5c30eeb2637c1d2f7674c0c017 Mon Sep 17 00:00:00 2001
From: Robert Sliwinski <r@sliwi.org>
Date: Fri, 8 Aug 2025 10:40:11 +0200
Subject: [PATCH 0451/3724] pythonPackages.pytest-plus: init at 0.8.1

---
 .../python-modules/pytest-plus/default.nix    | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-plus/default.nix

diff --git a/pkgs/development/python-modules/pytest-plus/default.nix b/pkgs/development/python-modules/pytest-plus/default.nix
new file mode 100644
index 000000000000..bcfd6cd33f2d
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-plus/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-plus";
+  version = "0.8.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "pytest-dev";
+    repo = "pytest-plus";
+    tag = "v${version}";
+    hash = "sha256-XlEtekOASIjZretTbQAf0eyQN6qZ9c6zI1ESss/hxfI=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  enabledTestPaths = [ "test/" ];
+
+  pythonImportsCheck = [ "pytest_plus" ];
+
+  meta = with lib; {
+    description = "pytest-plus adds new features to pytest";
+    homepage = "https://github.com/pytest-dev/pytest-plus";
+    changelog = "https://github.com/pytest-dev/pytest-plus/releases/tag/${src.tag}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ robsliwi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7457cb63d539..e3cd13b3bd99 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14299,6 +14299,8 @@ self: super: with self; {
 
   pytest-plt = callPackage ../development/python-modules/pytest-plt { };
 
+  pytest-plus = callPackage ../development/python-modules/pytest-plus { };
+
   pytest-pook = callPackage ../development/python-modules/pytest-pook { };
 
   pytest-postgresql = callPackage ../development/python-modules/pytest-postgresql { };

From 41205c0e6c894e01be1958b323eb015f95076caf Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 30 Jul 2025 10:49:57 +0200
Subject: [PATCH 0452/3724] util-linux: apply patch unconditionally

This was applied conditionally on staging-next to avoid throwing away
Linux builds.  It should have been changed to unconditional on
staging after that was merged, but I guess I forgot.  We generally
avoid conditional patch application wherever possible as it makes it
far too easy to miss when a patch needs to be removed or updated.
---
 pkgs/by-name/ut/util-linux/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index 36b12f19dda0..899c82c3e588 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -45,8 +45,6 @@ stdenv.mkDerivation (finalPackage: rec {
 
   patches = [
     ./rtcwake-search-PATH-for-shutdown.patch
-  ]
-  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
     (fetchurl {
       name = "bits-only-build-when-cpu_set_t-is-available.patch";
       url = "https://lore.kernel.org/util-linux/20250501075806.88759-1-hi@alyssa.is/raw";
@@ -138,12 +136,10 @@ stdenv.mkDerivation (finalPackage: rec {
   ];
 
   nativeBuildInputs = [
-    pkg-config
-    installShellFiles
-  ]
-  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
     autoconf
     automake116x
+    installShellFiles
+    pkg-config
   ]
   ++ lib.optionals translateManpages [ po4a ]
   ++ lib.optionals (cryptsetupSupport == "dlopen") [ cryptsetup ];

From 1abb38d2a5489a22b1126245650c14bca4eaf65a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 31 Jul 2025 09:22:19 +0200
Subject: [PATCH 0453/3724] linux: use consistent rustc and rust-bindgen

If we're going to use the unwrapped versions, we should do so
consistently in both parts of the kernel build, not mix and match.

Fixes: e9b2edb49163 ("linux: un-simplify toolchain selection")
---
 pkgs/os-specific/linux/kernel/generic.nix       | 2 +-
 pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 4936eb0f0526..047cff9b0081 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -190,7 +190,7 @@ let
         ]
         ++ lib.optional (lib.versionAtLeast version "5.2") pahole
         ++ lib.optionals withRust [
-          rust-bindgen
+          rust-bindgen.unwrapped
           rustc.unwrapped
         ];
 
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index e054ab30ab4e..8b33301ef6eb 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -169,7 +169,7 @@ lib.makeOverridable (
         ]
         ++ optional (lib.versionAtLeast version "5.13") zstd
         ++ optionals withRust [
-          rustc
+          rustc.unwrapped
           rust-bindgen.unwrapped
         ];
 
@@ -229,7 +229,7 @@ lib.makeOverridable (
           zlib
         ]
         ++ optionals withRust [
-          rustc
+          rustc.unwrapped
           rust-bindgen.unwrapped
         ];
 

From 0af7df6bd31faabb6e1e5480989cb28a4b786470 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 31 Jul 2025 13:42:52 +0200
Subject: [PATCH 0454/3724] rust-bindgen: link directly with libclang

There's not really any reason for bindgen to dlopen libclang at all in
Nixpkgs.  Moving this out of the wrapper means that it will still work
even when we don't want all the standard Nixpkgs cflags behavior, like
in the Linux kernel build.
---
 pkgs/development/tools/rust/bindgen/default.nix   | 2 --
 pkgs/development/tools/rust/bindgen/unwrapped.nix | 8 ++++++--
 pkgs/development/tools/rust/bindgen/wrapper.sh    | 2 --
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index b574eb546421..734d31aba2d3 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -1,5 +1,4 @@
 {
-  lib,
   rust-bindgen-unwrapped,
   zlib,
   bash,
@@ -14,7 +13,6 @@ let
         #for substituteAll
         inherit bash;
         unwrapped = rust-bindgen-unwrapped;
-        libclang = (lib.getLib clang.cc);
         meta = rust-bindgen-unwrapped.meta // {
           longDescription = rust-bindgen-unwrapped.meta.longDescription + ''
             This version of bindgen is wrapped with the required compiler flags
diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix
index c569789143d5..39b4de40b83b 100644
--- a/pkgs/development/tools/rust/bindgen/unwrapped.nix
+++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix
@@ -21,12 +21,16 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-K/iM79RfNU+3f2ae6wy/FMFAD68vfqzSUebqALPJpJY=";
 
-  buildInputs = [ (lib.getLib clang.cc) ];
-
   preConfigure = ''
     export LIBCLANG_PATH="${lib.getLib clang.cc}/lib"
   '';
 
+  # Disable the "runtime" feature, so libclang is linked.
+  buildNoDefaultFeatures = true;
+  buildFeatures = [ "logging" ];
+  checkNoDefaultFeatures = buildNoDefaultFeatures;
+  checkFeatures = buildFeatures;
+
   doCheck = true;
   nativeCheckInputs = [ clang ];
 
diff --git a/pkgs/development/tools/rust/bindgen/wrapper.sh b/pkgs/development/tools/rust/bindgen/wrapper.sh
index b7110385c26d..4311b9720aa8 100755
--- a/pkgs/development/tools/rust/bindgen/wrapper.sh
+++ b/pkgs/development/tools/rust/bindgen/wrapper.sh
@@ -27,10 +27,8 @@ fi;
 if [[ -n "$NIX_DEBUG" ]]; then
   set -x;
 fi;
-export LIBCLANG_PATH="@libclang@/lib"
 # shellcheck disable=SC2086
 # cxxflags and NIX_CFLAGS_COMPILE should be word-split
 exec -a "$0" @unwrapped@/bin/bindgen "$@" $sep $cxxflags @cincludes@ $NIX_CFLAGS_COMPILE
 # note that we add the flags after $@ which is incorrect. This is only for the sake
 # of simplicity.
-

From 6e35c11839e8e4bce1d18fa3b5921303bc5f23d5 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 30 Jul 2025 14:20:32 +0200
Subject: [PATCH 0455/3724] rustc-unwrapped: add attribute

rustc.unwrapped is available, but it isn't spliced correctly.  Having
this attribute available at the top level is consistent with
e.g. rust-bindgen-unwrapped.
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 665d4aab2500..1c49a16a71c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5870,6 +5870,7 @@ with pkgs;
     cargo-auditable-cargo-wrapper
     clippy
     rustc
+    rustc-unwrapped
     rustPlatform
     ;
 

From d0584aeeb0c2f5525252d5406e20456d34f7862a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 30 Jul 2025 14:21:02 +0200
Subject: [PATCH 0456/3724] linux: fix cross

The .unwrapped attributes are not correctly spliced.  Use the top
level attributes instead, which are spliced correctly.

Fixes: e9b2edb49163 ("linux: un-simplify toolchain selection")
---
 pkgs/os-specific/linux/kernel/generic.nix       | 10 +++++-----
 pkgs/os-specific/linux/kernel/manual-config.nix | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 047cff9b0081..38c518836fbf 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -11,9 +11,9 @@
   pahole,
   lib,
   stdenv,
-  rustc,
+  rustc-unwrapped,
   rustPlatform,
-  rust-bindgen,
+  rust-bindgen-unwrapped,
   # testing
   emptyFile,
   nixos,
@@ -126,7 +126,7 @@ let
 
       commonStructuredConfig = import ./common-config.nix {
         inherit lib stdenv version;
-        rustAvailable = lib.meta.availableOn stdenv.hostPlatform rustc;
+        rustAvailable = lib.meta.availableOn stdenv.hostPlatform rustc-unwrapped;
 
         features = kernelFeatures; # Ensure we know of all extra patches, etc.
       };
@@ -190,8 +190,8 @@ let
         ]
         ++ lib.optional (lib.versionAtLeast version "5.2") pahole
         ++ lib.optionals withRust [
-          rust-bindgen.unwrapped
-          rustc.unwrapped
+          rust-bindgen-unwrapped
+          rustc-unwrapped
         ];
 
         RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 8b33301ef6eb..b6ff72f0c884 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -22,8 +22,8 @@
   kmod,
   ubootTools,
   fetchpatch,
-  rustc,
-  rust-bindgen,
+  rustc-unwrapped,
+  rust-bindgen-unwrapped,
   rustPlatform,
 }:
 
@@ -169,8 +169,8 @@ lib.makeOverridable (
         ]
         ++ optional (lib.versionAtLeast version "5.13") zstd
         ++ optionals withRust [
-          rustc.unwrapped
-          rust-bindgen.unwrapped
+          rustc-unwrapped
+          rust-bindgen-unwrapped
         ];
 
       in
@@ -229,8 +229,8 @@ lib.makeOverridable (
           zlib
         ]
         ++ optionals withRust [
-          rustc.unwrapped
-          rust-bindgen.unwrapped
+          rustc-unwrapped
+          rust-bindgen-unwrapped
         ];
 
         RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;

From d93477c3b7b73ecfd9177ab8199364daa5fa2191 Mon Sep 17 00:00:00 2001
From: Robert Sliwinski <r@sliwi.org>
Date: Fri, 8 Aug 2025 10:43:27 +0200
Subject: [PATCH 0457/3724] pythonPackages.pytest-ansible: 25.5.0 -> 25.6.3

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

diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix
index 226f7d8c0b6c..85a9518ee499 100644
--- a/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -8,6 +8,9 @@
   fetchFromGitHub,
   packaging,
   pytest,
+  pytest-plus,
+  pytest-sugar,
+  pytest-xdist,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -16,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-ansible";
-  version = "25.5.0";
+  version = "25.6.3";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -25,7 +28,7 @@ buildPythonPackage rec {
     owner = "ansible";
     repo = "pytest-ansible";
     tag = "v${version}";
-    hash = "sha256-k6JFaB5VbUCwknN8SkNotdPRvSvW1tFmTx5p3hGfesg=";
+    hash = "sha256-NOvVzZCqbPbzbDgrs94qgS82c+8U+ysyH/LdQRsawt4=";
   };
 
   postPatch = ''
@@ -44,6 +47,9 @@ buildPythonPackage rec {
     ansible-core
     ansible-compat
     packaging
+    pytest-plus
+    pytest-sugar
+    pytest-xdist
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
@@ -55,6 +61,8 @@ buildPythonPackage rec {
   enabledTestPaths = [ "tests/" ];
 
   disabledTests = [
+    # pytest unrecognized arguments in test_pool.py
+    "test_ansible_test"
     # Host unreachable in the inventory
     "test_become"
     # [Errno -3] Temporary failure in name resolution

From 7cae352fd664a77e07aecf1cc69f0f88ff7c8074 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Fri, 1 Aug 2025 22:39:45 +0200
Subject: [PATCH 0458/3724] netpeek: init at 0.2.3.1

---
 pkgs/by-name/ne/netpeek/package.nix | 63 +++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/ne/netpeek/package.nix

diff --git a/pkgs/by-name/ne/netpeek/package.nix b/pkgs/by-name/ne/netpeek/package.nix
new file mode 100644
index 000000000000..9ecd9cd7f69c
--- /dev/null
+++ b/pkgs/by-name/ne/netpeek/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  appstream,
+  desktop-file-utils,
+  gobject-introspection,
+  wrapGAppsHook4,
+  pkg-config,
+  libadwaita,
+  libportal-gtk4,
+  gnome,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "netpeek";
+  version = "0.2.3.1";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "ZingyTomato";
+    repo = "NetPeek";
+    tag = "v${version}";
+    hash = "sha256-3PbGK8e/W4pHlXwIvW6kmyeBMvzBIS2DrV0pxafgJOY=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    appstream
+    desktop-file-utils
+    gobject-introspection
+    wrapGAppsHook4
+    pkg-config
+  ];
+
+  buildInputs = [
+    libadwaita
+    libportal-gtk4
+  ];
+
+  dependencies = with python3Packages; [
+    pygobject3
+    ping3
+  ];
+
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  meta = {
+    description = "Modern network scanner for GNOME";
+    homepage = "https://github.com/ZingyTomato/NetPeek";
+    changelog = "https://github.com/ZingyTomato/NetPeek/releases/tag/${src.tag}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ Cameo007 ];
+    mainProgram = "netpeek";
+    platforms = lib.platforms.linux;
+  };
+}

From 28b186ca10b2ec16c12cb2c375e44684f3032433 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 18 Jun 2025 11:39:44 +0000
Subject: [PATCH 0459/3724] libime: 1.1.10 -> 1.1.11

Diff: https://github.com/fcitx/libime/compare/1.1.10...1.1.11
---
 pkgs/by-name/li/libime/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/libime/package.nix b/pkgs/by-name/li/libime/package.nix
index 2f0413b43198..83c0aa518c91 100644
--- a/pkgs/by-name/li/libime/package.nix
+++ b/pkgs/by-name/li/libime/package.nix
@@ -22,21 +22,21 @@ let
     url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.zst";
     hash = "sha256-7oPs8g1S6LzNukz2zVcYPVPCV3E6Xrd+46Y9UPw3lt0=";
   };
-  dictVer = "20241001";
+  dictVer = "20250327";
   dict = fetchurl {
     url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.zst";
-    hash = "sha256-0zE7iKaGIKI7yNX5VkzxtniEjcevVBxPXwIZjlo2hr8=";
+    hash = "sha256-fKa+R1TA1MJ7p3AsDc5lFlm9LKH6pcvyhI2BoAU8jBM=";
   };
 in
 stdenv.mkDerivation rec {
   pname = "libime";
-  version = "1.1.10";
+  version = "1.1.11";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "libime";
     tag = version;
-    hash = "sha256-liVJEBUYcVYjjJCMW68xXbEHKQpAgTLCPm2yIdWG3IQ=";
+    hash = "sha256-C9l7VBSUdSpnt+8ghdmLljZXHFswTyi/ItqeeYTjF4Y=";
     fetchSubmodules = true;
   };
 

From 4454940477a67aa1c123853fb6387b947da6fc38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 12:46:20 +0000
Subject: [PATCH 0460/3724] polyml: 5.9.1 -> 5.9.2

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

diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index b93840c44d1e..c3c78d99990a 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "polyml";
-  version = "5.9.1";
+  version = "5.9.2";
 
   src = fetchFromGitHub {
     owner = "polyml";
     repo = "polyml";
     rev = "v${version}";
-    sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA=";
+    sha256 = "sha256-dHP5XNoLcFIqASfZVWu3MtY3B3H66skEl8ohlwTGyyM=";
   };
 
   postPatch = ''

From a959b9c014d1635463cdcffe51e4d33dbc28e983 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Tue, 22 Jul 2025 16:36:35 +0400
Subject: [PATCH 0461/3724] git: re-enable "format" hardening

Remove hardeningDisable = ["format"] because it is not necessary anymore
(the package builds without disabling it).
---
 pkgs/applications/version-management/git/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 93452cac87f2..cb34b54440c0 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -96,8 +96,6 @@ stdenv.mkDerivation (finalAttrs: {
   separateDebugInfo = true;
   __structuredAttrs = true;
 
-  hardeningDisable = [ "format" ];
-
   enableParallelBuilding = true;
   enableParallelInstalling = true;
 

From 7bc86a44d0de082486b67bc21db286929a54193a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 15:58:52 +0000
Subject: [PATCH 0462/3724] llvmPackages_21.lldbPlugins.llef: 1.2.1 -> 2.0.0

---
 pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix b/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix
index ba1afd633fa6..eb4fe6753ee9 100644
--- a/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix
+++ b/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "llef";
-  version = "1.2.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "foundryzero";
     repo = "llef";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-gbZDs3uurmi5YrnjumjQgzKhEumphvgYMk3R73vZiUA=";
+    hash = "sha256-pAFjLaZi4Sjlq3evKT2IG+0/imf4Fp5bM2gknLKpRvs=";
   };
 
   dontBuild = true;

From 8d60cafd69bf6508660fff76a77cef196c1d3f20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 16:12:51 +0000
Subject: [PATCH 0463/3724] imath: 3.1.12 -> 3.2.0

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

diff --git a/pkgs/by-name/im/imath/package.nix b/pkgs/by-name/im/imath/package.nix
index 9a3ddc0a1a5b..d36ff4a06815 100644
--- a/pkgs/by-name/im/imath/package.nix
+++ b/pkgs/by-name/im/imath/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "imath";
-  version = "3.1.12";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "imath";
     rev = "v${version}";
-    sha256 = "sha256-r4FNyNsWdmpZrHOpSvaSUWRYhAU+qnW4lE5uYPKn7Mw=";
+    sha256 = "sha256-tdJh8aRVakdu2zDeGA/0JCCNzdv6s6x55eUpgNJtuI0=";
   };
 
   nativeBuildInputs = [ cmake ];

From 18bf03bc482f260b3a45b4ee6d9b81725eeecaff Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 5 Aug 2025 21:36:51 +0100
Subject: [PATCH 0464/3724] gcc: pass `-Wno-complain-wrong-lang` when using
 `-fmacro-prefix-map`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This will break GCC < 13 when compiled with LLVM, but those versions
are EOL and should be removed anyway, so I’m happy to do the nudge
rather than spend more effort on this hopefully‐temporary hack.
---
 pkgs/development/compilers/gcc/common/builder.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix
index 7080666572d6..b1b5daeb00f1 100644
--- a/pkgs/development/compilers/gcc/common/builder.nix
+++ b/pkgs/development/compilers/gcc/common/builder.nix
@@ -126,6 +126,20 @@ originalAttrs:
               EXTRA_LDFLAGS_FOR_TARGET="$EXTRA_LDFLAGS"
           fi
 
+          # We include `-fmacro-prefix-map` in `cc-wrapper` for non‐GCC
+          # platforms only, but they get picked up and passed down to
+          # e.g. GFortran calls that complain about the option not
+          # applying to the language. Hack around it by asking GCC not
+          # to complain.
+          #
+          # TODO: Someone please fix this to do things that make sense.
+          if [[ $EXTRA_FLAGS_FOR_BUILD == *-fmacro-prefix-map* ]]; then
+              EXTRA_FLAGS_FOR_BUILD+=" -Wno-complain-wrong-lang"
+          fi
+          if [[ $EXTRA_FLAGS_FOR_TARGET == *-fmacro-prefix-map* ]]; then
+              EXTRA_FLAGS_FOR_TARGET+=" -Wno-complain-wrong-lang"
+          fi
+
           # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find
           # the startfiles.
           # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx

From 33faad38f9dabe8d98835fc1465636f3ca2a85ae Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 8 Aug 2025 21:27:19 +0100
Subject: [PATCH 0465/3724] re2: 2025-07-22 -> 2025-08-05

Changes: https://github.com/google/re2/compare/2025-07-22...2025-08-05
---
 pkgs/by-name/re/re2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix
index 5a02e01fb94f..39a5ecea8eff 100644
--- a/pkgs/by-name/re/re2/package.nix
+++ b/pkgs/by-name/re/re2/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "re2";
-  version = "2025-07-22";
+  version = "2025-08-05";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "re2";
     rev = finalAttrs.version;
-    hash = "sha256-e1PvcpZFl1lGOjwaK2ocBsQEQCYtCusdWM3b1KpHHnQ=";
+    hash = "sha256-Q4/xab6Jqhai/WIMND5YWOrPmNyDDf3HysKDqum3RgQ=";
   };
 
   outputs = [

From ab4295ea0fac84bcc245180db5af5ea007c40358 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 8 Aug 2025 21:50:01 +0100
Subject: [PATCH 0466/3724] stdenv/setup.sh: fix isMachO detection after
 bash-5.3 update

Without the change isMachO fails to work on UTF-8 locales as `read -u 4`
decoders 4 UTF-8 chars and not 4 bytes. `LANG=C` forces it to read bytes.

Closes: https://github.com/NixOS/nixpkgs/issues/431934
---
 pkgs/stdenv/generic/setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 5a2121dc36be..81e65129b88f 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -519,7 +519,7 @@ isELF() {
     local fd
     local magic
     exec {fd}< "$fn"
-    read -r -n 4 -u "$fd" magic
+    LANG=C read -r -n 4 -u "$fd" magic
     exec {fd}<&-
     if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi
 }
@@ -530,7 +530,7 @@ isMachO() {
     local fd
     local magic
     exec {fd}< "$fn"
-    read -r -n 4 -u "$fd" magic
+    LANG=C read -r -n 4 -u "$fd" magic
     exec {fd}<&-
 
     # nix uses 'declare -F' in get-env.sh to retrieve the loaded functions.
@@ -559,7 +559,7 @@ isScript() {
     local fd
     local magic
     exec {fd}< "$fn"
-    read -r -n 2 -u "$fd" magic
+    LANG=C read -r -n 2 -u "$fd" magic
     exec {fd}<&-
     if [[ "$magic" =~ \#! ]]; then return 0; else return 1; fi
 }

From 294e11b8f4fffe00efd2056b95e059c501b32840 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 21:00:38 +0000
Subject: [PATCH 0467/3724] oneDNN: 3.8.1 -> 3.9

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

diff --git a/pkgs/by-name/on/oneDNN/package.nix b/pkgs/by-name/on/oneDNN/package.nix
index e6e18adcf21a..c8e011b94cc1 100644
--- a/pkgs/by-name/on/oneDNN/package.nix
+++ b/pkgs/by-name/on/oneDNN/package.nix
@@ -11,13 +11,13 @@
 # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
 stdenv.mkDerivation (finalAttrs: {
   pname = "oneDNN";
-  version = "3.8.1";
+  version = "3.9";
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "oneDNN";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-x4leRd0xPFUygjAv/D125CIXn7lYSyzUKsd9IDh/vCc=";
+    hash = "sha256-YSHHdXZaSHb1vVRI8MTW2BFoSSUEzIpb/AhhuAQYJls=";
   };
 
   outputs = [

From f6a25cabc44ed2abec1b67b1dd32b10ca78b4ce9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 23:48:29 +0000
Subject: [PATCH 0468/3724] vscode-extensions.jeff-hykin.better-nix-syntax:
 1.1.5 -> 2.2.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 25c542dd9985..c889424b9d08 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2556,8 +2556,8 @@ let
         mktplcRef = {
           publisher = "jeff-hykin";
           name = "better-nix-syntax";
-          version = "1.1.5";
-          hash = "sha256-9V+ziWk9V4LyQiVNSC6DniJDun+EvcK30ykPjyNsvp0=";
+          version = "2.2.0";
+          hash = "sha256-MmmRKq/7uTCywnEceKukJW/jIc0oIx0GIz55ugh4gQg=";
         };
         meta = {
           description = "Visual Studio Code extension providing Nix Syntax highlighting";

From da72675b7cef25c3aa8fcc19d5511c170029bde8 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Fri, 8 Aug 2025 02:46:30 -0700
Subject: [PATCH 0469/3724] tilinggallery: init at 0.3.0

---
 pkgs/by-name/ti/tilinggallery/package.nix | 48 +++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 pkgs/by-name/ti/tilinggallery/package.nix

diff --git a/pkgs/by-name/ti/tilinggallery/package.nix b/pkgs/by-name/ti/tilinggallery/package.nix
new file mode 100644
index 000000000000..9ba4ffa3bfbd
--- /dev/null
+++ b/pkgs/by-name/ti/tilinggallery/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  fontconfig,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "tiling-gallery";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "roothch";
+    repo = "TilingGallery";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-k6AHNvizXitrdY/K13B/eVBCvdmfVou7Zv3tslHA4T8=";
+  };
+
+  cargoHash = "sha256-xr+gVDaxGtu7U/HaJoFXzNztvp+LNYAGuMqKA9QyXHg=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ fontconfig ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "CLI tool for generating aperiodic tilings";
+    longDescription = ''
+      Tiling Gallery is a Rust-based CLI tool for generating SVG
+      images of two types of aperiodic tilings:
+
+      - Penrose tiling using the De Bruijn pentagrid method Pinwheel
+
+      - tiling with recursive triangle subdivision
+
+      This project is ideal for generating mathematical and artistic
+      patterns based on non-periodic tilings.
+    '';
+    homepage = "https://github.com/roothch/TilingGallery";
+    changelog = "https://github.com/roothch/TilingGallery/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ yiyu ];
+    mainProgram = "tiling-gallery";
+  };
+})

From 164d0097f279893f769f43a8f65b695c7b91c421 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 04:39:22 +0000
Subject: [PATCH 0470/3724] vscode-extensions.ms-python.python: 2025.10.1 ->
 2025.12.0

---
 .../editors/vscode/extensions/ms-python.python/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
index e0fc18b9345e..83e2493bf60d 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
@@ -15,8 +15,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
   mktplcRef = {
     name = "python";
     publisher = "ms-python";
-    version = "2025.10.1";
-    hash = "sha256-3hd940mfxnvqoblIrx/S0A8KwHtYLFuonu52/HGGfak=";
+    version = "2025.12.0";
+    hash = "sha256-IY4xrAFLGe8JCgdx2H3kiQTCh9i5wOykL9hfpztV+44=";
   };
 
   buildInputs = [ icu ];

From 5a0dd0acf096c4fe8d10dff9f56f62c2f4bb2486 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 9 Aug 2025 09:27:04 +0300
Subject: [PATCH 0471/3724] ffmpeg: enable svt-av1 and vmaf on aarch64

Those were there from the very start, seemingly as platform checks,
but aren't actually necessary, and in fact Jellyfin explicitly wants
svt-av1 on all platforms.
---
 pkgs/development/libraries/ffmpeg/generic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 76bd9e39a938..55b991548309 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -134,7 +134,7 @@
   withSrt ? withHeadlessDeps, # Secure Reliable Transport (SRT) protocol
   withSsh ? withHeadlessDeps, # SFTP protocol
   withSvg ? withFullDeps, # SVG protocol
-  withSvtav1 ? withHeadlessDeps && !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isMinGW, # AV1 encoder/decoder (focused on speed and correctness)
+  withSvtav1 ? withHeadlessDeps && !stdenv.hostPlatform.isMinGW, # AV1 encoder/decoder (focused on speed and correctness)
   withTensorflow ? false, # Tensorflow dnn backend support (Increases closure size by ~390 MiB)
   withTheora ? withHeadlessDeps, # Theora encoder
   withTwolame ? withFullDeps, # MP2 encoding
@@ -144,7 +144,7 @@
   withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD), # Vaapi hardware acceleration
   withVdpau ? withSmallDeps && !stdenv.hostPlatform.isMinGW, # Vdpau hardware acceleration
   withVidStab ? withHeadlessDeps && withGPL, # Video stabilization
-  withVmaf ? withFullDeps && !stdenv.hostPlatform.isAarch64 && lib.versionAtLeast version "5", # Netflix's VMAF (Video Multi-Method Assessment Fusion)
+  withVmaf ? withFullDeps && lib.versionAtLeast version "5", # Netflix's VMAF (Video Multi-Method Assessment Fusion)
   withVoAmrwbenc ? withFullDeps && withVersion3, # AMR-WB encoder
   withVorbis ? withHeadlessDeps, # Vorbis de/encoding, native encoder exists
   withVpl ? withFullDeps && stdenv.hostPlatform.isLinux, # Hardware acceleration via intel libvpl

From 52f6dc3efc4cbf926c58442b48bb440eaf5420da Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 2 Aug 2025 12:25:17 +0200
Subject: [PATCH 0472/3724] tomlc17: init at 250712

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/to/tomlc17/package.nix | 35 +++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/to/tomlc17/package.nix

diff --git a/pkgs/by-name/to/tomlc17/package.nix b/pkgs/by-name/to/tomlc17/package.nix
new file mode 100644
index 000000000000..d8269d8c53db
--- /dev/null
+++ b/pkgs/by-name/to/tomlc17/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tomlc17";
+  version = "250712";
+
+  src = fetchFromGitHub {
+    owner = "cktan";
+    repo = "tomlc17";
+    tag = "R${finalAttrs.version}";
+    hash = "sha256-0if07Zj7Og+DBc/gxmAEHQh7QwAo8C/4S+x9IttEUjI=";
+  };
+
+  doCheck = false; # tries to download toml-test suite
+
+  installFlags = [
+    "prefix=${placeholder "out"}"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/cktan/tomlc17";
+    changelog = "https://github.com/cktan/tomlc17/releases/tag/R${finalAttrs.version}";
+    description = "TOML parser in C17";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ marcin-serwin ];
+    platforms = with lib.platforms; unix;
+  };
+})

From 44f44058e64d2098a7ba12f5f7d49d1fc001dd40 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 22 Jun 2025 20:34:12 +0200
Subject: [PATCH 0473/3724] gn: get revNum and revShort in src's postFetch

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gn/package.nix | 51 ++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index a9cb3782531a..54764e338e85 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -3,38 +3,30 @@
   lib,
   fetchgit,
   cctools,
-  writeText,
   ninja,
   python3,
 }:
-let
-  # Note: Please use the recommended version for Chromium stable, i.e. from
-  # <nixpkgs>/pkgs/applications/networking/browsers/chromium/info.json
-  rev = "85cc21e94af590a267c1c7a47020d9b420f8a033";
-  revNum = "2233"; # git describe $rev --match initial-commit | cut -d- -f3
-  version = "2025-04-28";
-  sha256 = "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI=";
 
-  revShort = builtins.substring 0 7 rev;
-  lastCommitPosition = writeText "last_commit_position.h" ''
-    #ifndef OUT_LAST_COMMIT_POSITION_H_
-    #define OUT_LAST_COMMIT_POSITION_H_
-
-    #define LAST_COMMIT_POSITION_NUM ${revNum}
-    #define LAST_COMMIT_POSITION "${revNum} (${revShort})"
-
-    #endif  // OUT_LAST_COMMIT_POSITION_H_
-  '';
-
-in
 stdenv.mkDerivation {
   pname = "gn-unstable";
-  inherit version;
+  version = "2025-04-28";
 
   src = fetchgit {
     # Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic!
     url = "https://gn.googlesource.com/gn";
-    inherit rev sha256;
+    # Note: Please use the recommended version for Chromium stable, i.e. from
+    # <nixpkgs>/pkgs/applications/networking/browsers/chromium/info.json
+    rev = "85cc21e94af590a267c1c7a47020d9b420f8a033";
+    hash = "sha256-SYpWYvGGNLMZPR1LdKKgubbv+4QcxRw8EYp7cNI5wQQ=";
+    leaveDotGit = true;
+    deepClone = true;
+    postFetch = ''
+      cd "$out"
+      mkdir .nix-files
+      git rev-parse --short=12 HEAD > .nix-files/REV_SHORT
+      git describe --match initial-commit | cut -d- -f3 > .nix-files/REV_NUM
+      find "$out" -name .git -print0 | xargs -0 rm -rf
+    '';
   };
 
   nativeBuildInputs = [
@@ -50,9 +42,20 @@ stdenv.mkDerivation {
   # cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
   hardeningDisable = [ "format" ];
 
-  buildPhase = ''
+  configurePhase = ''
     python build/gen.py --no-last-commit-position
-    ln -s ${lastCommitPosition} out/last_commit_position.h
+    cat > out/last_commit_position.h << EOF
+    #ifndef OUT_LAST_COMMIT_POSITION_H_
+    #define OUT_LAST_COMMIT_POSITION_H_
+
+    #define LAST_COMMIT_POSITION_NUM $(<.nix-files/REV_NUM)
+    #define LAST_COMMIT_POSITION "$(<.nix-files/REV_NUM) ($(<.nix-files/REV_SHORT))"
+
+    #endif  // OUT_LAST_COMMIT_POSITION_H_
+    EOF
+  '';
+
+  buildPhase = ''
     ninja -j $NIX_BUILD_CORES -C out gn
   '';
 

From ec546981515d89a8bc11b7e7435546b59bcbe612 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Mon, 23 Jun 2025 19:21:37 +0200
Subject: [PATCH 0474/3724] gn: drop "-unstable" suffix from pname

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gn/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index 54764e338e85..8339722c0cbc 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -8,8 +8,8 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "gn-unstable";
-  version = "2025-04-28";
+  pname = "gn";
+  version = "0-unstable-2025-04-28";
 
   src = fetchgit {
     # Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic!

From d66400cd89bbd14d7004b1c34b7efed0ea982fdc Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Mon, 23 Jun 2025 19:23:38 +0200
Subject: [PATCH 0475/3724] gn: run hooks in build phases

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gn/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index 8339722c0cbc..3f54d8a0fe8b 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -43,6 +43,8 @@ stdenv.mkDerivation {
   hardeningDisable = [ "format" ];
 
   configurePhase = ''
+    runHook preConfigure
+
     python build/gen.py --no-last-commit-position
     cat > out/last_commit_position.h << EOF
     #ifndef OUT_LAST_COMMIT_POSITION_H_
@@ -53,14 +55,24 @@ stdenv.mkDerivation {
 
     #endif  // OUT_LAST_COMMIT_POSITION_H_
     EOF
+
+    runHook postConfigure
   '';
 
   buildPhase = ''
+    runHook preBuild
+
     ninja -j $NIX_BUILD_CORES -C out gn
+
+    runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
+
     install -vD out/gn "$out/bin/gn"
+
+    runHook postInstall
   '';
 
   setupHook = ./setup-hook.sh;

From 4f436a39c32e556050feb66176274217cd6b08e4 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Mon, 23 Jun 2025 19:26:17 +0200
Subject: [PATCH 0476/3724] gn: remove with lib; from meta

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gn/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index 3f54d8a0fe8b..b408e835dca4 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -77,13 +77,13 @@ stdenv.mkDerivation {
 
   setupHook = ./setup-hook.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Meta-build system that generates build files for Ninja";
     mainProgram = "gn";
     homepage = "https://gn.googlesource.com/gn";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       stesie
       matthewbauer
     ];

From a760bcce342bdf28ea62b069d72422d26a3c57f4 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 22 Jun 2025 20:56:49 +0200
Subject: [PATCH 0477/3724] gn: add update script

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gn/package.nix |  2 ++
 pkgs/by-name/gn/gn/update.sh   | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100755 pkgs/by-name/gn/gn/update.sh

diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index b408e835dca4..b6c90306e030 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -77,6 +77,8 @@ stdenv.mkDerivation {
 
   setupHook = ./setup-hook.sh;
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "Meta-build system that generates build files for Ninja";
     mainProgram = "gn";
diff --git a/pkgs/by-name/gn/gn/update.sh b/pkgs/by-name/gn/gn/update.sh
new file mode 100755
index 000000000000..e6a498fd2778
--- /dev/null
+++ b/pkgs/by-name/gn/gn/update.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p jq curl common-updater-scripts
+
+set -ex
+
+rev=$(
+  curl --location "https://raw.githubusercontent.com/NixOS/nixpkgs/refs/heads/master/pkgs/applications/networking/browsers/chromium/info.json" \
+  | jq -r ".chromium.deps.gn.rev"
+)
+
+commit_time=$(
+  curl "https://gn.googlesource.com/gn/+/$rev?format=json" \
+  | sed "s/)]}'//" \
+  | jq -r ".committer.time" \
+  | awk '{print $2, $3, $5, $4 $6}'
+)
+
+commit_date=$(TZ= date --date "$commit_time" --iso-8601)
+version="0-unstable-$commit_date"
+
+update-source-version --rev="$rev" --version-key="version" "gn" "$version"

From d654f142e7eabd54d62e1cbea19b37b44390904e Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Mon, 23 Jun 2025 19:26:34 +0200
Subject: [PATCH 0478/3724] gn: add marcin-serwin to maintainers

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gn/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index b6c90306e030..65e7f997ed4f 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -88,6 +88,7 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [
       stesie
       matthewbauer
+      marcin-serwin
     ];
   };
 }

From e2e3860a20336ef1a55a530425348def3b54ff5b Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 27 Jul 2025 10:01:35 +0200
Subject: [PATCH 0479/3724] gn: make src version overridable

Co-authored-by: emilylange <git@emilylange.de>
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gn/package.nix | 18 +++++++++++++-----
 pkgs/by-name/gn/gn/update.sh   |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index 65e7f997ed4f..752ada43ae1b 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -5,19 +5,27 @@
   cctools,
   ninja,
   python3,
+
+  # Note: Please use the recommended version for Chromium stable, i.e. from
+  # <nixpkgs>/pkgs/applications/networking/browsers/chromium/info.json
+  version ?
+    # This is a workaround for update-source-version to be able to update this
+    let
+      _version = "0-unstable-2025-04-28";
+    in
+    _version,
+  rev ? "85cc21e94af590a267c1c7a47020d9b420f8a033",
+  hash ? "sha256-SYpWYvGGNLMZPR1LdKKgubbv+4QcxRw8EYp7cNI5wQQ=",
 }:
 
 stdenv.mkDerivation {
   pname = "gn";
-  version = "0-unstable-2025-04-28";
+  inherit version;
 
   src = fetchgit {
     # Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic!
     url = "https://gn.googlesource.com/gn";
-    # Note: Please use the recommended version for Chromium stable, i.e. from
-    # <nixpkgs>/pkgs/applications/networking/browsers/chromium/info.json
-    rev = "85cc21e94af590a267c1c7a47020d9b420f8a033";
-    hash = "sha256-SYpWYvGGNLMZPR1LdKKgubbv+4QcxRw8EYp7cNI5wQQ=";
+    inherit rev hash;
     leaveDotGit = true;
     deepClone = true;
     postFetch = ''
diff --git a/pkgs/by-name/gn/gn/update.sh b/pkgs/by-name/gn/gn/update.sh
index e6a498fd2778..692426e8f149 100755
--- a/pkgs/by-name/gn/gn/update.sh
+++ b/pkgs/by-name/gn/gn/update.sh
@@ -18,4 +18,4 @@ commit_time=$(
 commit_date=$(TZ= date --date "$commit_time" --iso-8601)
 version="0-unstable-$commit_date"
 
-update-source-version --rev="$rev" --version-key="version" "gn" "$version"
+update-source-version --rev="$rev" --version-key="_version" "gn" "$version"

From ab7460070860e48e56bf5c873b2c80ca02030db6 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 27 Jul 2025 10:01:35 +0200
Subject: [PATCH 0480/3724] chromium, electron: use override instead of
 overrideAttrs for gn

Co-authored-by: emilylange <git@emilylange.de>
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 .../networking/browsers/chromium/default.nix      |  8 +-------
 .../networking/browsers/chromium/info.json        |  6 ++++--
 pkgs/development/tools/electron/info.json         | 15 ++++++---------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 990eafa06677..58cb30f335ad 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -79,13 +79,7 @@ let
         pulseSupport
         ungoogled
         ;
-      gnChromium = buildPackages.gn.overrideAttrs (oldAttrs: {
-        version = if (upstream-info.deps.gn ? "version") then upstream-info.deps.gn.version else "0";
-        src = fetchgit {
-          url = "https://gn.googlesource.com/gn";
-          inherit (upstream-info.deps.gn) rev hash;
-        };
-      });
+      gnChromium = buildPackages.gn.override upstream-info.deps.gn;
     });
 
     browser = callPackage ./browser.nix {
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index eb1b32f6892f..0018ece27e34 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -12,8 +12,9 @@
         "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo="
       },
       "gn": {
+        "version": "0-unstable-2025-06-19",
         "rev": "97b68a0bb62b7528bc3491c7949d6804223c2b82",
-        "hash": "sha256-m+z10s40Q/iYcoMw3o/+tmhIdqHMsYJjdGabHrK/aqo="
+        "hash": "sha256-gwptzuirIdPAV9XCaAT09aM/fY7d6xgBU7oSu9C4tmE="
       },
       "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI="
     },
@@ -809,8 +810,9 @@
         "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo="
       },
       "gn": {
+        "version": "0-unstable-2025-06-19",
         "rev": "97b68a0bb62b7528bc3491c7949d6804223c2b82",
-        "hash": "sha256-m+z10s40Q/iYcoMw3o/+tmhIdqHMsYJjdGabHrK/aqo="
+        "hash": "sha256-gwptzuirIdPAV9XCaAT09aM/fY7d6xgBU7oSu9C4tmE="
       },
       "ungoogled-patches": {
         "rev": "139.0.7258.66-1",
diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 13aa8d2762f8..9719f9c19b00 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -4,10 +4,9 @@
         "chromium": {
             "deps": {
                 "gn": {
-                    "hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U=",
+                    "hash": "sha256-U0f/Q134UJrSke+/o9Hs4+mQa/vSM2hdkRXhLfhnqME=",
                     "rev": "ed1abc107815210dc66ec439542bee2f6cbabc00",
-                    "url": "https://gn.googlesource.com/gn",
-                    "version": "2025-01-13"
+                    "version": "0-unstable-2025-01-13"
                 }
             },
             "version": "134.0.6998.205"
@@ -1313,10 +1312,9 @@
         "chromium": {
             "deps": {
                 "gn": {
-                    "hash": "sha256-vDKMt23RMDI+KX6CmjfeOhRv2haf/mDOuHpWKnlODcg=",
+                    "hash": "sha256-MnGl+D9ahQibUHCtyOUf1snvmeupUn4D2yrDj55JTe4=",
                     "rev": "6e8e0d6d4a151ab2ed9b4a35366e630c55888444",
-                    "url": "https://gn.googlesource.com/gn",
-                    "version": "2025-03-24"
+                    "version": "0-unstable-2025-03-24"
                 }
             },
             "version": "136.0.7103.177"
@@ -2638,10 +2636,9 @@
         "chromium": {
             "deps": {
                 "gn": {
-                    "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM=",
+                    "hash": "sha256-BplU8qNKObVrKMLKTyqivPF1L6bbJulFC+Zop9UpmZY=",
                     "rev": "ebc8f16ca7b0d36a3e532ee90896f9eb48e5423b",
-                    "url": "https://gn.googlesource.com/gn",
-                    "version": "2025-05-21"
+                    "version": "0-unstable-2025-05-21"
                 }
             },
             "version": "138.0.7204.185"

From e5a76165ea234d37948bb06e2448020ac7e3582c Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 27 Jul 2025 10:01:35 +0200
Subject: [PATCH 0481/3724] electron: adapt updater to the new gn package

Co-authored-by: emilylange <git@emilylange.de>
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/development/tools/electron/update.py | 41 ++++++++++++++---------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py
index 0303cb1c682b..6baf1135a796 100755
--- a/pkgs/development/tools/electron/update.py
+++ b/pkgs/development/tools/electron/update.py
@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nix-prefetch-git prefetch-yarn-deps prefetch-npm-deps gclient2nix
+#! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nurl prefetch-yarn-deps prefetch-npm-deps gclient2nix
 """
 electron updater
 
@@ -32,7 +32,7 @@ import urllib.request
 import click
 import click_log
 
-from datetime import datetime
+from datetime import datetime, UTC
 from typing import Iterable, Tuple
 from urllib.request import urlopen
 from joblib import Parallel, delayed, Memory
@@ -44,6 +44,9 @@ SOURCE_INFO_JSON = "info.json"
 
 os.chdir(os.path.dirname(__file__))
 
+# Absolute path of nixpkgs top-level directory
+NIXPKGS_PATH = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode("utf-8").strip()
+
 memory: Memory = Memory("cache", verbose=0)
 
 logger = logging.getLogger(__name__)
@@ -78,26 +81,34 @@ def get_electron_file(electron_tag: str, filepath: str) -> str:
     )
 
 
+@memory.cache
+def get_gn_hash(gn_version, gn_commit):
+    print("gn.override", file=sys.stderr)
+    expr = f'(import {NIXPKGS_PATH} {{}}).gn.override {{ version = "{gn_version}"; rev = "{gn_commit}"; hash = ""; }}'
+    out = subprocess.check_output(["nurl", "--hash", "--expr", expr])
+    return out.decode("utf-8").strip()
+
 @memory.cache
 def get_chromium_gn_source(chromium_tag: str) -> dict:
     gn_pattern = r"'gn_version': 'git_revision:([0-9a-f]{40})'"
     gn_commit = re.search(gn_pattern, get_chromium_file(chromium_tag, "DEPS")).group(1)
-    gn_prefetch: bytes = subprocess.check_output(
-        [
-            "nix-prefetch-git",
-            "--quiet",
-            "https://gn.googlesource.com/gn",
-            "--rev",
-            gn_commit,
-        ]
+
+    gn_commit_info = json.loads(
+        urlopen(f"https://gn.googlesource.com/gn/+/{gn_commit}?format=json")
+        .read()
+        .decode("utf-8")
+        .split(")]}'\n")[1]
     )
-    gn: dict = json.loads(gn_prefetch)
+
+    gn_commit_date = datetime.strptime(gn_commit_info["commiter"]["time"], "%a %b %d %H:%M:%S %Y %z")
+    gn_date = gn_commit_date.astimezone(UTC).date().isoformat()
+    gn_version = f"0-unstable-{gn_date}"
+
     return {
         "gn": {
-            "version": datetime.fromisoformat(gn["date"]).date().isoformat(),
-            "url": gn["url"],
-            "rev": gn["rev"],
-            "hash": gn["hash"],
+            "version": gn_version,
+            "rev": gn_commit,
+            "hash": get_gn_hash(gn_version, gn_commit),
         }
     }
 

From 9b4cbadf484fbc1af19349ff48cacfee6ff46fb6 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 27 Jul 2025 10:01:35 +0200
Subject: [PATCH 0482/3724] chromium: adapt updater to the new gn package

Co-authored-by: emilylange <git@emilylange.de>
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 .../networking/browsers/chromium/update.mjs   | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/update.mjs b/pkgs/applications/networking/browsers/chromium/update.mjs
index 42483eb06b40..838c07ae6814 100755
--- a/pkgs/applications/networking/browsers/chromium/update.mjs
+++ b/pkgs/applications/networking/browsers/chromium/update.mjs
@@ -62,7 +62,7 @@ for (const attr_path of Object.keys(lockfile)) {
       chromedriver: !ungoogled ? await fetch_chromedriver_binaries(await get_latest_chromium_release('mac')) : undefined,
       deps: {
         depot_tools: {},
-        gn: {},
+        gn: await fetch_gn(chromium_rev, lockfile_initial[attr_path].deps.gn),
         'ungoogled-patches': !ungoogled ? undefined : {
           rev: ungoogled_patches.rev,
           hash: ungoogled_patches.hash,
@@ -78,12 +78,6 @@ for (const attr_path of Object.keys(lockfile)) {
       hash: depot_tools.hash,
     }
 
-    const gn = await fetch_gn(chromium_rev, lockfile_initial[attr_path].deps.gn)
-    lockfile[attr_path].deps.gn = {
-      rev: gn.rev,
-      hash: gn.hash,
-    }
-
     // DEPS update loop
     lockfile[attr_path].DEPS = await resolve_DEPS(depot_tools.out, chromium_rev)
     for (const [path, value] of Object.entries(lockfile[attr_path].DEPS)) {
@@ -133,10 +127,34 @@ for (const attr_path of Object.keys(lockfile)) {
 
 async function fetch_gn(chromium_rev, gn_previous) {
   const DEPS_file = await get_gitiles_file('https://chromium.googlesource.com/chromium/src', chromium_rev, 'DEPS')
-  const gn_rev = /^\s+'gn_version': 'git_revision:(?<rev>.+)',$/m.exec(DEPS_file).groups.rev
-  const hash = gn_rev === gn_previous.rev ? gn_previous.hash : ''
+  const { rev } = /^\s+'gn_version': 'git_revision:(?<rev>.+)',$/m.exec(DEPS_file).groups
 
-  return await prefetch_gitiles('https://gn.googlesource.com/gn', gn_rev, hash)
+  const cache_hit = rev === gn_previous.rev;
+  if (cache_hit) {
+    return gn_previous
+  }
+
+  const commit_date = await get_gitiles_commit_date('https://gn.googlesource.com/gn', rev)
+  const version = `0-unstable-${commit_date}`
+
+  const expr = [`(import ./. {}).gn.override { version = "${version}"; rev = "${rev}"; hash = ""; }`]
+  const derivation = await $nixpkgs`nix-instantiate --expr ${expr}`
+
+  return {
+    version,
+    rev,
+    hash: await prefetch_FOD(derivation),
+  }
+}
+
+
+async function get_gitiles_commit_date(base_url, rev) {
+  const url = `${base_url}/+/${rev}?format=json`
+  const response = await (await fetch(url)).text()
+  const json = JSON.parse(response.replace(`)]}'\n`, ''))
+
+  const date = new Date(json.commiter.time)
+  return date.toISOString().split("T")[0]
 }
 
 
@@ -259,4 +277,3 @@ async function prefetch_FOD(...args) {
 
   return hash
 }
-

From b59bfde89d116c180cc20962fdecbf40d92f8ce7 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 8 Aug 2025 17:57:43 +0200
Subject: [PATCH 0483/3724] gn: 0-unstable-2025-04-28 -> 0-unstable-2025-06-19

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gn/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index 752ada43ae1b..4c244f53e1b3 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -11,11 +11,11 @@
   version ?
     # This is a workaround for update-source-version to be able to update this
     let
-      _version = "0-unstable-2025-04-28";
+      _version = "0-unstable-2025-06-19";
     in
     _version,
-  rev ? "85cc21e94af590a267c1c7a47020d9b420f8a033",
-  hash ? "sha256-SYpWYvGGNLMZPR1LdKKgubbv+4QcxRw8EYp7cNI5wQQ=",
+  rev ? "97b68a0bb62b7528bc3491c7949d6804223c2b82",
+  hash ? "sha256-gwptzuirIdPAV9XCaAT09aM/fY7d6xgBU7oSu9C4tmE=",
 }:
 
 stdenv.mkDerivation {

From 4e3a8af46e4445e67ae14b13ac6905c3c41bca6e Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 27 Jul 2025 11:29:31 +0200
Subject: [PATCH 0484/3724] gn: remove outdated comment

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gn/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index 4c244f53e1b3..c989ff6a1417 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation {
   inherit version;
 
   src = fetchgit {
-    # Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic!
     url = "https://gn.googlesource.com/gn";
     inherit rev hash;
     leaveDotGit = true;

From 1282ed597393aa696351bf24f50da4701f71cd94 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 27 Jul 2025 11:30:37 +0200
Subject: [PATCH 0485/3724] gn: add emilylange to maintainers

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gn/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index c989ff6a1417..df85681de9f8 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -96,6 +96,7 @@ stdenv.mkDerivation {
       stesie
       matthewbauer
       marcin-serwin
+      emilylange
     ];
   };
 }

From 28cefc6266c46fa770b2ec8c6d6990dbbce1c1ab Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 27 Jul 2025 12:20:52 +0200
Subject: [PATCH 0486/3724] gn: enable ninja verbose mode to show build
 progress

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gn/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index df85681de9f8..988151f91b12 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation {
   buildPhase = ''
     runHook preBuild
 
-    ninja -j $NIX_BUILD_CORES -C out gn
+    ninja -v -j $NIX_BUILD_CORES -C out gn
 
     runHook postBuild
   '';

From d10d07d6a17504fa407a062a3fac8d229471a39e Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Fri, 8 Aug 2025 18:59:34 +0400
Subject: [PATCH 0487/3724] git: re-enable a test and remove unneeded patch

Re-enables a test that now passes, and removes an unneeded patch that
was useful for testing at some point.
---
 pkgs/applications/version-management/git/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index cb34b54440c0..50de22322407 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -103,7 +103,6 @@ stdenv.mkDerivation (finalAttrs: {
     ./docbook2texi.patch
     ./git-sh-i18n.patch
     ./git-send-email-honor-PATH.patch
-    ./installCheck-path.patch
   ]
   ++ lib.optionals withSsh [
     ./ssh-path.patch
@@ -474,9 +473,6 @@ stdenv.mkDerivation (finalAttrs: {
     disable_test t1301-shared-repo
     # /build/git-2.44.0/contrib/completion/git-completion.bash: line 452: compgen: command not found
     disable_test t9902-completion
-
-    # Our patched gettext never fallbacks
-    disable_test t0201-gettext-fallbacks
   ''
   + lib.optionalString (!sendEmailSupport) ''
     # Disable sendmail tests

From 3f2212cdbbe320d320830b7045502ade72fa4a09 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Fri, 8 Aug 2025 17:27:06 +0400
Subject: [PATCH 0488/3724] git: add comments for patches

Adds inline comments for all patches as per CONTRIBUTING.md
---
 pkgs/applications/version-management/git/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 50de22322407..0ed21e8e034f 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -100,11 +100,19 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelInstalling = true;
 
   patches = [
+    # This patch does two things: (1) use the right name for `docbook2texi',
+    # and (2) make sure `gitman.info' isn't produced since it's broken
+    # (duplicate node names).
     ./docbook2texi.patch
+    # Fix references to gettext.sh at runtime: hard-code it to
+    # ${pkgs.gettext}/bin/gettext.sh instead of assuming gettext.sh is in $PATH
     ./git-sh-i18n.patch
+    # Do not search for sendmail in /usr, only in $PATH
     ./git-send-email-honor-PATH.patch
   ]
   ++ lib.optionals withSsh [
+    # Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of
+    # searching in $PATH
     ./ssh-path.patch
   ];
 

From fd015afe063bd4283b63730a78c2b69a93e9d494 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 10:33:56 +0000
Subject: [PATCH 0489/3724] vscode-extensions.redhat.java: 1.43.1 -> 1.44.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 185f48bfdd96..678e61b9320d 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3936,8 +3936,8 @@ let
         mktplcRef = {
           publisher = "redhat";
           name = "java";
-          version = "1.43.1";
-          hash = "sha256-RMJKhGVziSg/N0Z62+rwna2jCZd4/8JIG7wdGpRfZYg=";
+          version = "1.44.0";
+          hash = "sha256-KlB0YlAIdVMuLzBv5S9DbANBBDQoTog1FC8ykFeTvnM=";
         };
         buildInputs = [ jdk ];
         meta = {

From 3be7b9f72a59dd6ab1e66420384fc458638ce53c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 Aug 2025 06:53:54 +0000
Subject: [PATCH 0490/3724] tomb: 2.12 -> 2.13

---
 pkgs/by-name/to/tomb/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/to/tomb/package.nix b/pkgs/by-name/to/tomb/package.nix
index f240d3911818..171751e5f84f 100644
--- a/pkgs/by-name/to/tomb/package.nix
+++ b/pkgs/by-name/to/tomb/package.nix
@@ -43,13 +43,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tomb";
-  version = "2.12";
+  version = "2.13";
 
   src = fetchFromGitHub {
     owner = "dyne";
-    repo = "Tomb";
+    repo = "tomb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-P8YS6PlfrAHY2EsSyCG8QAeDbN7ChHmjxtqIAtMLomk=";
+    hash = "sha256-z7LkCes0wg+1bZrNXXy4Lh5VwMotCULJQy5DmCisu+Q=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -63,6 +63,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # if not, it shows .tomb-wrapped when running
     substituteInPlace tomb \
       --replace-fail 'TOMBEXEC=$0' 'TOMBEXEC=tomb'
+
+    # Fix version variable
+    sed -i 's/VERSION=".*"/VERSION="${finalAttrs.version}"/' tomb
   '';
 
   installPhase = ''
@@ -84,7 +87,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "File encryption on GNU/Linux";
     homepage = "https://dyne.org/tomb/";
-    changelog = "https://github.com/dyne/Tomb/blob/v${finalAttrs.version}/ChangeLog.md";
+    changelog = "https://github.com/dyne/tomb/blob/v${finalAttrs.version}/ChangeLog.md";
     license = lib.licenses.gpl3Only;
     mainProgram = "tomb";
     maintainers = with lib.maintainers; [

From 423477766b7ad39e2fe3b82a0230c42416006e53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 12:40:43 +0000
Subject: [PATCH 0491/3724] vscode-extensions.marp-team.marp-vscode: 3.2.1 ->
 3.3.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 185f48bfdd96..77080c990620 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2972,8 +2972,8 @@ let
         mktplcRef = {
           name = "marp-vscode";
           publisher = "marp-team";
-          version = "3.2.1";
-          hash = "sha256-c3e4vWmnR/enummRSfwlulPEAjZ9TlncnAU3SJcUEaI=";
+          version = "3.3.0";
+          hash = "sha256-Z/dhVvmyhyjEM3QUswLA2ExXeFIRzNOUn7Kd6s/C50k=";
         };
         meta = {
           license = lib.licenses.mit;

From 45d6f4fe1119fb3d0401927117babc9c6cdf550b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 12:41:46 +0000
Subject: [PATCH 0492/3724] moodle: 5.0.1 -> 5.0.2

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

diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix
index 0f248ee2ffe2..380b397cdf73 100644
--- a/pkgs/servers/web-apps/moodle/default.nix
+++ b/pkgs/servers/web-apps/moodle/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "5.0.1";
+  version = "5.0.2";
 
   versionParts = lib.take 2 (lib.splitVersion version);
   # 4.2 -> 402, 3.11 -> 311
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz";
-    hash = "sha256-YSAUMr3vTgqORO70pok+lIzA1sPMstFqcdHWbMwNQ3g=";
+    hash = "sha256-p9kXrUnsFNHJ3k5EwSYO/iXNlN1AanOGln1TQSFiCUI=";
   };
 
   phpConfig = writeText "config.php" ''

From 0db50dcdfe54b5857a4027d0419318fe09e4a198 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sat, 9 Aug 2025 10:09:35 -0400
Subject: [PATCH 0493/3724] python313Packages.intensity-normalization: 2.2.4 ->
 3.0.1

---
 .../intensity-normalization/default.nix       | 53 ++++++++-----------
 1 file changed, 21 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix
index e0beea29d83f..686d27bfe575 100644
--- a/pkgs/development/python-modules/intensity-normalization/default.nix
+++ b/pkgs/development/python-modules/intensity-normalization/default.nix
@@ -4,67 +4,56 @@
   fetchPypi,
   pythonOlder,
   pytestCheckHook,
-  matplotlib,
+  pytest-cov-stub,
+  hatchling,
   nibabel,
   numpy,
-  pydicom,
-  pymedio,
   scikit-fuzzy,
-  scikit-image,
-  scikit-learn,
   scipy,
-  simpleitk,
-  statsmodels,
 }:
 
 buildPythonPackage rec {
   pname = "intensity-normalization";
-  version = "2.2.4";
-  format = "setuptools";
+  version = "3.0.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     pname = "intensity_normalization";
     inherit version;
-    hash = "sha256-s/trDIRoqLFj3NO+iv3E+AEB4grBAHDlEL6+TCdsgmg=";
+    hash = "sha256-d5f+Ug/ta9RQjk3JwHmVJQr8g93glzf7IcmLxLeA1tQ=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.cfg --replace "!=3.10.*," "" --replace "!=3.11.*" ""
-    substituteInPlace setup.cfg --replace "pytest-runner" ""
-  '';
+  build-system = [ hatchling ];
 
-  pythonRelaxDeps = [ "nibabel" ];
-
-  propagatedBuildInputs = [
-    matplotlib
+  dependencies = [
     nibabel
     numpy
-    pydicom
-    pymedio
     scikit-fuzzy
-    scikit-image
-    scikit-learn
     scipy
-    simpleitk
-    statsmodels
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+  ];
   enabledTestPaths = [ "tests" ];
 
   pythonImportsCheck = [
     "intensity_normalization"
-    "intensity_normalization.normalize"
-    "intensity_normalization.plot"
-    "intensity_normalization.util"
+    "intensity_normalization.adapters"
+    "intensity_normalization.domain"
+    "intensity_normalization.normalizers"
+    "intensity_normalization.services"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/jcreinhold/intensity-normalization";
     description = "MRI intensity normalization tools";
-    maintainers = with maintainers; [ bcdarwin ];
-    license = licenses.asl20;
+    changelog = "https://github.com/jcreinhold/intensity-normalization/releases/tag/${version}";
+    maintainers = with lib.maintainers; [ bcdarwin ];
+    license = lib.licenses.asl20;
+    mainProgram = "intensity-normalize";
   };
 }

From 7bd253891f24b0013b78efa852b153b4a2314e03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 14:43:31 +0000
Subject: [PATCH 0494/3724] python3Packages.h5netcdf: 1.6.3 -> 1.6.4

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

diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix
index 21ba08cf7142..97577acf567f 100644
--- a/pkgs/development/python-modules/h5netcdf/default.nix
+++ b/pkgs/development/python-modules/h5netcdf/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "h5netcdf";
-  version = "1.6.3";
+  version = "1.6.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "h5netcdf";
     repo = "h5netcdf";
     tag = "v${version}";
-    hash = "sha256-frKnnUh5OFeQGAhf/y5idMWGb0ufHznz4u5A8FRJSuA=";
+    hash = "sha256-SFlea/ABP78GQgGkh7hscAlGfpKVnXN2zr99D9LCpeQ=";
   };
 
   build-system = [

From 000f977c977d75c72dcc6f489a5322b3b5f75391 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Sat, 9 Aug 2025 17:33:28 +0200
Subject: [PATCH 0495/3724] maintainers: add keyzox

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9e23d7401e46..976d165eca8b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13204,6 +13204,13 @@
     githubId = 9433472;
     name = "ash";
   };
+  keyzox = {
+    email = "nixpkgs@adjoly.fr";
+    github = "keyzox71";
+    matrix = "@keyzox:matrix.org";
+    githubId = 18579667;
+    name = "Adam J.";
+  };
   kfollesdal = {
     email = "kfollesdal@gmail.com";
     github = "kfollesdal";

From 1cbb00d98693806dc6b46b96adfdd2a23faaaf99 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Sat, 9 Aug 2025 17:33:38 +0200
Subject: [PATCH 0496/3724] python3Packages.st-pages: init at 1.0.1

---
 .../python-modules/st-pages/default.nix       | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/st-pages/default.nix

diff --git a/pkgs/development/python-modules/st-pages/default.nix b/pkgs/development/python-modules/st-pages/default.nix
new file mode 100644
index 000000000000..7a52543e66ed
--- /dev/null
+++ b/pkgs/development/python-modules/st-pages/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  streamlit,
+  poetry-core,
+}:
+buildPythonPackage rec {
+  pname = "st-pages";
+  version = "1.0.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "blackary";
+    repo = "st_pages";
+    tag = "v${version}";
+    hash = "sha256-sJXgpRiducJVYuyvVvTZthHnIJyIRn+f9Uw/wAMfnm0=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    streamlit
+  ];
+
+  meta = {
+    description = "An experimental version of Streamlit Multi-Page Apps";
+    homepage = "https://github.com/blackary/st_pages";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      keyzox
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4870605e1404..0f6cecbdd42f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17235,6 +17235,8 @@ self: super: with self; {
 
   ssort = callPackage ../development/python-modules/ssort { };
 
+  st-pages = callPackage ../development/python-modules/st-pages { };
+
   stable-baselines3 = callPackage ../development/python-modules/stable-baselines3 { };
 
   stack-data = callPackage ../development/python-modules/stack-data { };

From 39352ff617ad2ac06cc5b5dae824052a85e7d226 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 16:21:01 +0000
Subject: [PATCH 0497/3724] vscode-extensions.gitlab.gitlab-workflow: 6.35.3 ->
 6.36.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 185f48bfdd96..62e14134de43 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2045,8 +2045,8 @@ let
         mktplcRef = {
           name = "gitlab-workflow";
           publisher = "gitlab";
-          version = "6.35.3";
-          hash = "sha256-VYhKuLiXjLDyRYIE6zg3ZzDeVs9ulTHaAT18BTLz1/M=";
+          version = "6.36.0";
+          hash = "sha256-A0EuYOJLH+FXhz2DAem9vDCRkwPOfZ01cWkWEffO7FE=";
         };
         meta = {
           description = "GitLab extension for Visual Studio Code";

From e1338b72675e27704b900631e44c06d2a3acd828 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 3 Aug 2025 22:24:46 +0200
Subject: [PATCH 0498/3724] python3Packages.build: 1.2.2.post1 -> 1.3.0

https://github.com/pypa/build/blob/1.3.0/CHANGELOG.rst
---
 .../python-modules/build/default.nix          | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index ae2fe86d38f6..61a426b2cf28 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -21,26 +21,21 @@
 
 buildPythonPackage rec {
   pname = "build";
-  version = "1.2.2.post1";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  version = "1.3.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "build";
-    rev = "refs/tags/${version}";
-    hash = "sha256-PHS7CjdKo5u4VTpbo409zLQAOmslV9bX0j0S83Gdv1U=";
+    tag = version;
+    hash = "sha256-w2YKQzni8e6rpnQJH2J0bHzRigjWOlWiI8Po5d3ZqS8=";
   };
 
-  postPatch = ''
-    # not strictly required, causes circular dependency cycle
-    sed -i '/importlib-metadata >= 4.6/d' pyproject.toml
-  '';
+  build-system = [ flit-core ];
 
-  nativeBuildInputs = [ flit-core ];
+  pythonRemoveDeps = [ "importlib-metadata" ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     packaging
     pyproject-hooks
   ]
@@ -107,7 +102,7 @@ buildPythonPackage rec {
       is a simple build tool and does not perform any dependency management.
     '';
     homepage = "https://github.com/pypa/build";
-    changelog = "https://github.com/pypa/build/blob/${version}/CHANGELOG.rst";
+    changelog = "https://github.com/pypa/build/blob/${src.tag}/CHANGELOG.rst";
     license = licenses.mit;
     maintainers = [ maintainers.fab ];
     teams = [ teams.python ];

From 066e42d4fcca9ea3054b8f486c50a3aec5d37ebd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 3 Aug 2025 22:26:06 +0200
Subject: [PATCH 0499/3724] python3Packages.setuptools: 80.7.1 -> 80.9.0

https://setuptools.pypa.io/en/stable/history.html#v80-9-0
---
 pkgs/development/python-modules/setuptools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 6590a4d126d7..03156d16334c 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "setuptools";
-  version = "80.7.1";
+  version = "80.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "setuptools";
     tag = "v${version}";
-    hash = "sha256-lOGvJoVwFxASI7e5fJkeS7iGOIPklGRYmmMfclqn0H4=";
+    hash = "sha256-wueVQsV0ja/iPFRK7OKV27FQ7hYKF8cP3WH5wJeIXnI=";
   };
 
   patches = [

From 9d86ede4541578fb848705dac3394db2be799b24 Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Thu, 10 Jul 2025 20:51:43 -0400
Subject: [PATCH 0500/3724] python313Packages.wheel: update hash to include
 changes from 0.46.1

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

diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix
index ffed1c4a18e0..1bc96ff57b58 100644
--- a/pkgs/development/python-modules/wheel/default.nix
+++ b/pkgs/development/python-modules/wheel/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     owner = "pypa";
     repo = "wheel";
     tag = version;
-    hash = "sha256-tgueGEWByS5owdA5rhXGn3qh1Vtf0HGYC6+BHfrnGAs=";
+    hash = "sha256-iyGfGr3pLVZSEIHetjsPbIIXkuXrmIPiSqqOw31l9Qw=";
   };
 
   nativeBuildInputs = [ flit-core ];

From a533d8cd248191c4f5f84ad19a4acef9a04842b0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 3 Aug 2025 23:05:02 +0200
Subject: [PATCH 0501/3724] python3Packages.hypothesis: 6.131.17 -> 6.136.7

https://hypothesis.readthedocs.io/en/latest/changes.html#v6-136-7
---
 pkgs/development/python-modules/hypothesis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index a46583e063b5..745aec234c86 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "hypothesis";
-  version = "6.131.17";
+  version = "6.136.7";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "HypothesisWorks";
     repo = "hypothesis";
     rev = "hypothesis-python-${version}";
-    hash = "sha256-bNaDC2n0VaI7L4/FdD8eQ4cqn5ewquy89wV/pQn9uo0=";
+    hash = "sha256-V1X9gLNM6WJO7TA+S89hu7p3I+kDs1OfigH1tBfm/cU=";
   };
 
   # I tried to package sphinx-selective-exclude, but it throws

From 003c2ed6190444d9b68ea7a5a390c07d0d4d2872 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 3 Aug 2025 23:07:47 +0200
Subject: [PATCH 0502/3724] python3Packages.pytest: 8.3.5 -> 8.4.1

https://github.com/pytest-dev/pytest/releases/tag/8.4.1
---
 pkgs/development/python-modules/pytest/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 6eb3a02661cb..17d42090876c 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -29,12 +29,12 @@
 
 buildPythonPackage rec {
   pname = "pytest";
-  version = "8.3.5";
+  version = "8.4.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9O/nDMFOURVlrEdrV8J54SqFWxH0jyEq8QgO8iY9OEU=";
+    hash = "sha256-fGf9aRdIdzWe2Tcew6+KPSsEdBgYxR5emcwXQiUfqTw=";
   };
 
   outputs = [
@@ -42,15 +42,16 @@ buildPythonPackage rec {
     "testout"
   ];
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     iniconfig
     packaging
     pluggy
+    pygments
   ]
   ++ lib.optionals (pythonOlder "3.11") [
     exceptiongroup
@@ -63,7 +64,6 @@ buildPythonPackage rec {
       attrs
       hypothesis
       mock
-      pygments
       requests
       setuptools
       xmlschema

From fc4cb6dcdd0698ae59095c6bcb6e7afe36f61131 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 3 Aug 2025 23:20:12 +0200
Subject: [PATCH 0503/3724] python3Packages.pytest-xdist: 3.6.1 -> 3.8.0

https://github.com/pytest-dev/pytest-xdist/blob/v3.8.0/CHANGELOG.rst
---
 pkgs/development/python-modules/pytest-xdist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 5660820d969c..3fd5f57fc93c 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
-  version = "3.6.1";
+  version = "3.8.0";
   disabled = pythonOlder "3.7";
 
   pyproject = true;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pytest_xdist";
     inherit version;
-    hash = "sha256-6tFWpNsjHux2lzf1dmjvWKIISjSy5VxKj6INhhEHMA0=";
+    hash = "sha256-fleBJeybxgUIYaqT8tWfHY0IVZXWVRwskLb0+tjTqfE=";
   };
 
   build-system = [

From 536eec89b8eb98913cd27591071ae97de6f768cd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 3 Aug 2025 23:23:13 +0200
Subject: [PATCH 0504/3724] python3Packages.gevent: 24.11.1 -> 25.5.1

https://github.com/gevent/gevent/blob/25.5.1/CHANGES.rst
---
 .../development/python-modules/gevent/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix
index bc996a338ab3..4158ef056ad5 100644
--- a/pkgs/development/python-modules/gevent/default.nix
+++ b/pkgs/development/python-modules/gevent/default.nix
@@ -11,10 +11,8 @@
   greenlet,
   importlib-metadata,
   setuptools,
-  wheel,
   zope-event,
   zope-interface,
-  pythonOlder,
   c-ares,
   libuv,
 
@@ -26,20 +24,17 @@
 
 buildPythonPackage rec {
   pname = "gevent";
-  version = "24.11.1";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  version = "25.5.1";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-i9FBkRTp5KPtM6W612av/5o892XLRApYKhs6m8gMGso=";
+    hash = "sha256-WCyUj6miMYi4kNC8Ewc0pQbQOaLlrYfa4nakVsxoPmE=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     cython
     setuptools
-    wheel
   ]
   ++ lib.optionals (!isPyPy) [ cffi ];
 
@@ -49,7 +44,7 @@ buildPythonPackage rec {
     c-ares
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     importlib-metadata
     zope-event
     zope-interface

From fd2d6109ba102faaf8ece2cd2843d4acf7aa9dfd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 3 Aug 2025 23:43:35 +0200
Subject: [PATCH 0505/3724] python3Packages.pytest-relaxed: fix pytest8.4
 compat

---
 .../python-modules/pytest-relaxed/default.nix | 10 +++++++++
 .../fix-oldstyle-hookimpl-setup.patch         | 22 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-relaxed/fix-oldstyle-hookimpl-setup.patch

diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix
index a706d0fc87dc..7f317759960b 100644
--- a/pkgs/development/python-modules/pytest-relaxed/default.nix
+++ b/pkgs/development/python-modules/pytest-relaxed/default.nix
@@ -21,6 +21,12 @@ buildPythonPackage rec {
     hash = "sha256-lW6gKOww27+2gN2Oe0p/uPgKI5WV6Ius4Bi/LA1xgkg=";
   };
 
+  patches = [
+    # https://github.com/bitprophet/pytest-relaxed/issues/28
+    # https://github.com/bitprophet/pytest-relaxed/pull/29
+    ./fix-oldstyle-hookimpl-setup.patch
+  ];
+
   buildInputs = [ pytest ];
 
   propagatedBuildInputs = [ decorator ];
@@ -32,6 +38,10 @@ buildPythonPackage rec {
 
   enabledTestPaths = [ "tests" ];
 
+  disabledTests = [
+    "test_skips_pytest_fixtures"
+  ];
+
   pythonImportsCheck = [ "pytest_relaxed" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/pytest-relaxed/fix-oldstyle-hookimpl-setup.patch b/pkgs/development/python-modules/pytest-relaxed/fix-oldstyle-hookimpl-setup.patch
new file mode 100644
index 000000000000..ef44c262ca51
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-relaxed/fix-oldstyle-hookimpl-setup.patch
@@ -0,0 +1,22 @@
+From ec22fc4da8cc081c53da7b3aaaa2d5095b7abdec Mon Sep 17 00:00:00 2001
+From: Marcel Telka <marcel@telka.sk>
+Date: Mon, 13 Nov 2023 16:18:28 +0100
+Subject: [PATCH] Fix deprecation warning
+
+---
+ pytest_relaxed/plugin.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pytest_relaxed/plugin.py b/pytest_relaxed/plugin.py
+index 562a597..28798d3 100644
+--- a/pytest_relaxed/plugin.py
++++ b/pytest_relaxed/plugin.py
+@@ -37,7 +37,7 @@ def pytest_collect_file(file_path, parent):
+     return SpecModule.from_parent(parent=parent, path=file_path)
+ 
+ 
+-@pytest.mark.trylast  # So we can be sure builtin terminalreporter exists
++@pytest.hookimpl(trylast=True)  # Be sure builtin terminalreporter exists
+ def pytest_configure(config):
+     # TODO: we _may_ sometime want to do the isatty/slaveinput/etc checks that
+     # pytest-sugar does?

From 119e253c46a465f88d57dd16a1366962d62c8f59 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 3 Aug 2025 23:43:54 +0200
Subject: [PATCH 0506/3724] python3Packages.paramterized: disable tests with
 pytest 8.4

They are broken and the package is likely abandonware.
---
 pkgs/development/python-modules/parameterized/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix
index 643bab1e58dc..0e14c59f6f2e 100644
--- a/pkgs/development/python-modules/parameterized/default.nix
+++ b/pkgs/development/python-modules/parameterized/default.nix
@@ -40,6 +40,9 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools ];
 
+  # 'yield' keyword is allowed in fixtures, but not in tests (test_naked_function)
+  doCheck = false;
+
   checkInputs = [
     mock
     pytestCheckHook

From fd8a0da1d820ca34c2fc29567006b13c904ff4c6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 3 Aug 2025 23:44:50 +0200
Subject: [PATCH 0507/3724] python3Packages.freezegun: 1.5.1 -> 1.5.4

https://github.com/spulec/freezegun/blob/1.5.4/CHANGELOG
---
 pkgs/development/python-modules/freezegun/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix
index 046b3f20046f..991a4d67c5b1 100644
--- a/pkgs/development/python-modules/freezegun/default.nix
+++ b/pkgs/development/python-modules/freezegun/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "freezegun";
-  version = "1.5.1";
+  version = "1.5.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-sp3t/NptXo4IPOcbK1QnU61Iz+xEA3s/x5cC4pgKiek=";
+    hash = "sha256-eYuTcv3U2QfzPotqWLxk5oLZ/6jUlM5g94AZfugfrtE=";
   };
 
   build-system = [ setuptools ];

From 7af959061daea89c79c1eeb8d9e95160d28fe6b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 18 Jun 2025 19:57:45 -0700
Subject: [PATCH 0508/3724] python3Packages.cython: 3.0.12 -> 3.1.2

Diff: https://github.com/cython/cython/compare/refs/tags/3.0.12...refs/tags/3.1.2

Changelog: https://github.com/cython/cython/blob/3.1.2/CHANGES.rst
---
 pkgs/development/python-modules/aiohttp/default.nix    |  4 ++--
 .../development/python-modules/basswood-av/default.nix |  4 ++--
 pkgs/development/python-modules/cython/default.nix     |  4 ++--
 pkgs/development/python-modules/pyyaml-ft/default.nix  |  4 ++--
 pkgs/development/python-modules/srctools/default.nix   |  4 ++--
 pkgs/development/python-modules/yarl/default.nix       |  4 ++--
 pkgs/top-level/python-packages.nix                     | 10 ----------
 7 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index b12fa8da9a9d..99bbd4f05fe0 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -8,7 +8,7 @@
   isPyPy,
 
   # build-system
-  cython_3_1,
+  cython,
   pkgconfig,
   setuptools,
 
@@ -75,7 +75,7 @@ buildPythonPackage rec {
   '';
 
   build-system = [
-    cython_3_1
+    cython
     pkgconfig
     setuptools
   ];
diff --git a/pkgs/development/python-modules/basswood-av/default.nix b/pkgs/development/python-modules/basswood-av/default.nix
index 2d9f44b5b5be..e6588b8962cd 100644
--- a/pkgs/development/python-modules/basswood-av/default.nix
+++ b/pkgs/development/python-modules/basswood-av/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   setuptools,
   pkg-config,
-  cython_3_1,
+  cython,
   ffmpeg,
 }:
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
-    cython_3_1
+    cython
   ];
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix
index 45fc174577ae..f62acbab3b90 100644
--- a/pkgs/development/python-modules/cython/default.nix
+++ b/pkgs/development/python-modules/cython/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "cython";
-  version = "3.0.12";
+  version = "3.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cython";
     repo = "cython";
     tag = version;
-    hash = "sha256-clJXjQb6rVECirKRUGX0vD5a6LILzPwNo7+6KKYs2pI=";
+    hash = "sha256-lP8ILCzAZuoPzFhCqGXwIpifN8XoWz93SJ7c3XVe69Y=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pyyaml-ft/default.nix b/pkgs/development/python-modules/pyyaml-ft/default.nix
index 65061acf48ec..15abcf542c44 100644
--- a/pkgs/development/python-modules/pyyaml-ft/default.nix
+++ b/pkgs/development/python-modules/pyyaml-ft/default.nix
@@ -1,6 +1,6 @@
 {
   buildPythonPackage,
-  cython_3_1,
+  cython,
   fetchFromGitHub,
   lib,
   libyaml,
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   };
 
   build-system = [
-    cython_3_1
+    cython
     setuptools
   ];
 
diff --git a/pkgs/development/python-modules/srctools/default.nix b/pkgs/development/python-modules/srctools/default.nix
index 117a97e5b39a..7d6de7ff2184 100644
--- a/pkgs/development/python-modules/srctools/default.nix
+++ b/pkgs/development/python-modules/srctools/default.nix
@@ -4,7 +4,7 @@
   fetchPypi,
   meson,
   meson-python,
-  cython_3_1,
+  cython,
   attrs,
   useful-types,
   pytestCheckHook,
@@ -28,7 +28,7 @@ buildPythonPackage {
   build-system = [
     meson
     meson-python
-    cython_3_1
+    cython
   ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 5805d35482d1..36184650fcb9 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  cython_3_1,
+  cython,
   expandvars,
   setuptools,
   idna,
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   };
 
   build-system = [
-    cython_3_1
+    cython
     expandvars
     setuptools
   ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f5f7ded17ae..ca9dbdeee1ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3222,16 +3222,6 @@ self: super: with self; {
 
   cython_0 = callPackage ../development/python-modules/cython/0.nix { };
 
-  cython_3_1 = cython.overridePythonAttrs rec {
-    version = "3.1.2";
-    src = pkgs.fetchFromGitHub {
-      owner = "cython";
-      repo = "cython";
-      tag = version;
-      hash = "sha256-lP8ILCzAZuoPzFhCqGXwIpifN8XoWz93SJ7c3XVe69Y=";
-    };
-  };
-
   cytoolz = callPackage ../development/python-modules/cytoolz { };
 
   dacite = callPackage ../development/python-modules/dacite { };

From 9a0ae724ec89a7049ac23e845b86d5bf6392c3fd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 3 Aug 2025 23:56:56 +0200
Subject: [PATCH 0509/3724] python3Packages.pytest-asyncio: 0.26.0 -> 1.1.0

https://github.com/pytest-dev/pytest-asyncio/blob/v1.1.0/docs/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 e6887edf85e1..5ac0fdc37f87 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-asyncio";
-  version = "0.26.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests
+  version = "1.1.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-asyncio";
     tag = "v${version}";
-    hash = "sha256-GEhFwwQCXwtqfSiew/sOvJYV3JREqOGD4fQONlRR/Mw=";
+    hash = "sha256-+dLOzMPKI3nawfyZVZZ6hg6OkaEGZBp8oC5VIr7y0es=";
   };
 
   outputs = [

From 33a80986634bff7a38311c5429e1e4dac9e9b86d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 4 Aug 2025 00:03:17 +0200
Subject: [PATCH 0510/3724] python3Packages.lxml: 5.4.0 -> 6.0.0

https://github.com/lxml/lxml/blob/lxml-6.0.0/CHANGES.txt
---
 pkgs/development/python-modules/lxml/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index ec8c3e0c7a90..de73a2010d1c 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -3,7 +3,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   cython,
@@ -18,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "lxml";
-  version = "5.4.0";
+  version = "6.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lxml";
     repo = "lxml";
     tag = "lxml-${version}";
-    hash = "sha256-yp0Sb/0Em3HX1XpDNFpmkvW/aXwffB4D1sDYEakwKeY=";
+    hash = "sha256-e1Lhtn8cjuDWkBV29icIqe0CJ59Ab05hBGMa+eRBzAw=";
   };
 
   build-system = [

From c9a2e82b8ab81fc71b18eeb93dce08e16612ce9a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 4 Aug 2025 17:23:49 +0200
Subject: [PATCH 0511/3724] python3Packages.pillow: fix with build==1.3.0

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

diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index 050c403b763a..153192fb6dbf 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -74,7 +74,7 @@ buildPythonPackage rec {
 
   pypaBuildFlags = [
     # Disable platform guessing, which tries various FHS paths
-    "--config=setting=--disable-platform-guessing"
+    "--config-setting=--disable-platform-guessing"
   ];
 
   preConfigure =

From 1b205d1645d52b27f100ab609800ad67fbfa3609 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 4 Aug 2025 17:59:25 +0200
Subject: [PATCH 0512/3724] python3Packages.matplotlib: 3.10.3 -> 3.10.5

https://github.com/matplotlib/matplotlib/releases/tag/v3.10.4
https://github.com/matplotlib/matplotlib/releases/tag/v3.10.5
---
 pkgs/development/python-modules/matplotlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 7f151fe2d364..4c23466b9880 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -80,7 +80,7 @@ let
 in
 
 buildPythonPackage rec {
-  version = "3.10.3";
+  version = "3.10.5";
   pname = "matplotlib";
   pyproject = true;
 
@@ -88,7 +88,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-L4LSxbt66TqqpM1CrKZdds5jdvgzBPo6YwtWmsonTfA=";
+    hash = "sha256-NS7WzPt5mKAIgWkvOLTKCDxpHT4nW0FFQjcEw0yQkHY=";
   };
 
   env.XDG_RUNTIME_DIR = "/tmp";

From 827be3a0738affcae3f8b00120dc4ec84fc21313 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 4 Aug 2025 18:21:16 +0200
Subject: [PATCH 0513/3724] maturin: 1.9.1 -> 1.9.3

https://github.com/PyO3/maturin/blob/v1.9.3/Changelog.md
---
 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 f1befa6b5b71..1a5a7472b87a 100644
--- a/pkgs/by-name/ma/maturin/package.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "maturin";
-  version = "1.9.1";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    hash = "sha256-nqi3t1rK2ZTIwFra1avnnhJSMbRI64t5/wP3dCyCY3A=";
+    hash = "sha256-VhL4nKXyONXbxriEHta0vCnWY1j82oDOLoxVigaggSc=";
   };
 
-  cargoHash = "sha256-ZszmCXvPRpt6+cTDU1GD3K81Qw4UVFMDKLOlb1R6KiE=";
+  cargoHash = "sha256-Iom4GoTBFJ9P5UQnYF5JbeQeO2Eh1MwKOwbo+PhgtQM=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv

From f04bb245bade9f88d7513ad97131a4286826a253 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 4 Aug 2025 18:29:21 +0200
Subject: [PATCH 0514/3724] python3Packages.soxr: fix with build==1.3.0

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

diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix
index 3470810e5b7e..a090b6d24bd2 100644
--- a/pkgs/development/python-modules/soxr/default.nix
+++ b/pkgs/development/python-modules/soxr/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
   dontUseCmakeConfigure = true;
 
   pypaBuildFlags = [
-    "--config=cmake.define.USE_SYSTEM_LIBSOXR=ON"
+    "--config-setting=cmake.define.USE_SYSTEM_LIBSOXR=ON"
   ];
 
   build-system = [

From 4588a371311d39bd7fbf57da7d5447ffc955e01b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 4 Aug 2025 18:44:45 +0200
Subject: [PATCH 0515/3724] python3Packages.pandas: 2.2.3 -> 2.3.1

https://pandas.pydata.org/docs/whatsnew/v2.3.0.html
https://pandas.pydata.org/docs/whatsnew/v2.3.1.html
---
 .../python-modules/pandas/default.nix         | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 82351f93e3b1..970a880d0fe6 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   pythonOlder,
 
   # build-system
@@ -64,7 +63,7 @@
 let
   pandas = buildPythonPackage rec {
     pname = "pandas";
-    version = "2.2.3";
+    version = "2.3.1";
     pyproject = true;
 
     disabled = pythonOlder "3.9";
@@ -73,17 +72,9 @@ let
       owner = "pandas-dev";
       repo = "pandas";
       tag = "v${version}";
-      hash = "sha256-6YUROcqOV2P1AbJF9IMBIqTt7/PSTeXDwGgE4uI9GME=";
+      hash = "sha256-xvdiWjJ5uHfrzXB7c4cYjFjZ6ue5i7qzb4tAEPJMAV0=";
     };
 
-    patches = [
-      (fetchpatch {
-        name = "musl.patch";
-        url = "https://github.com/pandas-dev/pandas/commit/1e487982ff7501f07e2bba7a7d924fb92b3d5c7f.patch";
-        hash = "sha256-F1pVce1W951Ea82Ux198e5fBFH6kDOG+EeslDTYbjio=";
-      })
-    ];
-
     # A NOTE regarding the Numpy version relaxing: Both Numpy versions 1.x &
     # 2.x are supported. However upstream wants to always build with Numpy 2,
     # and with it to still be able to run with a Numpy 1 or 2. We insist to
@@ -97,12 +88,10 @@ let
     # that override globally the `numpy` attribute to point to `numpy_1`.
     postPatch = ''
       substituteInPlace pyproject.toml \
-        --replace-fail "numpy>=2.0" numpy \
-        --replace-fail "meson-python==0.13.1" "meson-python>=0.13.1" \
-        --replace-fail "meson==1.2.1" "meson>=1.2.1"
+        --replace-fail "numpy>=2.0" numpy
     '';
 
-    nativeBuildInputs = [
+    build-system = [
       cython
       meson-python
       meson
@@ -115,7 +104,7 @@ let
 
     enableParallelBuilding = true;
 
-    propagatedBuildInputs = [
+    dependencies = [
       numpy
       python-dateutil
       pytz

From a53b38be9a6046db0e2261ab8c627dd48a28d704 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 4 Aug 2025 19:17:38 +0200
Subject: [PATCH 0516/3724] python3Packages.astroid: 3.3.10 -> 3.3.11

https://github.com/PyCQA/astroid/blob/v3.3.11/ChangeLog
---
 pkgs/development/python-modules/astroid/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index 2e82ff76ea46..645fa378aea7 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "astroid";
-  version = "3.3.10"; # Check whether the version is compatible with pylint
+  version = "3.3.11"; # Check whether the version is compatible with pylint
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "PyCQA";
     repo = "astroid";
     tag = "v${version}";
-    hash = "sha256-q4ZPXz2xaKJ39q6g1c9agktKSCfbRp+3INDfXg/wP8k=";
+    hash = "sha256-lv+BQDYP7N4UGMf7XhB6HVDORPU0kZQPYveQWOcAqfQ=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -33,6 +33,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # UserWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html.
+    "test_identify_old_namespace_package_protocol"
+  ];
+
   disabledTestPaths = [
     # requires mypy
     "tests/test_raw_building.py"

From 83a268f22dd8b5be5788229f3c39dd9277d06fa3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 01:34:38 +0200
Subject: [PATCH 0517/3724] python3Packages.executing: fix pytest 8.4.1 compat

---
 pkgs/development/python-modules/executing/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix
index cee6db453e43..edf61a807868 100644
--- a/pkgs/development/python-modules/executing/default.nix
+++ b/pkgs/development/python-modules/executing/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   pythonAtLeast,
   pythonOlder,
 
@@ -30,6 +31,14 @@ buildPythonPackage rec {
     hash = "sha256-2BT4VTZBAJx8Gk4qTTyhSoBMjJvKzmL4PO8IfTpN+2g=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "pytest-8.4.1-compat.patch";
+      url = "https://github.com/alexmojaki/executing/commit/fae0dd2f4bd0e74b8a928e19407fd4167f4b2295.patch";
+      hash = "sha256-ccYBeP4yXf3U4sRyeGUYhLz7QHbXFiMviQ1n+AIVMdo=";
+    })
+  ];
+
   build-system = [
     setuptools
     setuptools-scm

From 54377669994f57d7eb824ba9c7edd7934dc0ceb6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 01:38:43 +0200
Subject: [PATCH 0518/3724] python3Packages.pytest-asyncio_0: re-init at 0.26.0

Reintroduced for compat reasons.
---
 .../python-modules/pytest-asyncio/0.nix       | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-asyncio/0.nix

diff --git a/pkgs/development/python-modules/pytest-asyncio/0.nix b/pkgs/development/python-modules/pytest-asyncio/0.nix
new file mode 100644
index 000000000000..e6887edf85e1
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-asyncio/0.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  callPackage,
+  fetchFromGitHub,
+  pytest,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-asyncio";
+  version = "0.26.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pytest-dev";
+    repo = "pytest-asyncio";
+    tag = "v${version}";
+    hash = "sha256-GEhFwwQCXwtqfSiew/sOvJYV3JREqOGD4fQONlRR/Mw=";
+  };
+
+  outputs = [
+    "out"
+    "testout"
+  ];
+
+  build-system = [ setuptools-scm ];
+
+  buildInputs = [ pytest ];
+
+  postInstall = ''
+    mkdir $testout
+    cp -R tests $testout/tests
+  '';
+
+  doCheck = false;
+  passthru.tests.pytest = callPackage ./tests.nix { };
+
+  pythonImportsCheck = [ "pytest_asyncio" ];
+
+  meta = with lib; {
+    description = "Library for testing asyncio code with pytest";
+    homepage = "https://github.com/pytest-dev/pytest-asyncio";
+    changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/${src.tag}/docs/reference/changelog.rst";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ca9dbdeee1ad..e398e398f8a4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14139,6 +14139,8 @@ self: super: with self; {
     callPackage ../development/python-modules/pytest-asyncio-cooperative
       { };
 
+  pytest-asyncio_0 = callPackage ../development/python-modules/pytest-asyncio/0.nix { };
+
   pytest-asyncio_0_21 = pytest-asyncio.overridePythonAttrs (old: rec {
     version = "0.21.2";
     src = pkgs.fetchFromGitHub {

From d11811eabec80ca2b95816de7049e05d2644a605 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 01:39:18 +0200
Subject: [PATCH 0519/3724] python3Packages.aiohappyeyeballs: pin
 pytest-asyncio_0

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

diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
index f1c32db66e93..1ed3bcfe9b66 100644
--- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix
+++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
@@ -14,7 +14,7 @@
   sphinxHook,
 
   # tests
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-cov-stub,
   pytestCheckHook,
 }:
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
-    pytest-asyncio
+    pytest-asyncio_0
     pytest-cov-stub
     pytestCheckHook
   ];

From de9ac428927ee1dbbf9ab1a14067da17c8e207b1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 01:48:58 +0200
Subject: [PATCH 0520/3724] python3Packages.aiohttp: 3.12.14 -> 3.12.15

https://docs.aiohttp.org/en/v3.12.15/changes.html
---
 pkgs/development/python-modules/aiohttp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 99bbd4f05fe0..d39e8318943e 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -50,14 +50,14 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.12.14";
+  version = "3.12.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiohttp";
     tag = "v${version}";
-    hash = "sha256-KPPxP6x/3sz2mDJNswh/xPatcMtVdYv3aArg//7tSao=";
+    hash = "sha256-nVDGSbzjCdyJFCsHq8kJigNA4vGs4Pg1Vyyvw+gKg2w=";
   };
 
   patches = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform isa-l) [

From 2f9026647ed5abdd82d91a8c5e54a93ea34d2e61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 15 Jul 2025 20:45:18 -0700
Subject: [PATCH 0521/3724] python3Packages.coverage: 7.8.2 -> 7.9.2

Diff: https://github.com/nedbat/coveragepy/compare/refs/tags/7.8.2...refs/tags/7.9.2

Changelog: https://github.com/nedbat/coveragepy/blob/7.9.2/CHANGES.rst
---
 pkgs/development/python-modules/coverage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index f9b863a8cc0b..e7e4029d11a5 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "coverage";
-  version = "7.8.2";
+  version = "7.9.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nedbat";
     repo = "coveragepy";
     tag = version;
-    hash = "sha256-PCMGxyG5zIc8iigi9BsuhyuyQindZnewqTgxErT/jHw=";
+    hash = "sha256-gtjmyE6FN3LGZ87PXuPDsyRY1iUNn2D1SfY4H0rbNMM=";
   };
 
   postPatch = ''

From ec03afc6c449fe4346dffb059b3d0f028f210a9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 15 Jul 2025 21:29:49 -0700
Subject: [PATCH 0522/3724] python3Packages.typer: 0.15.4 -> 0.16.0

Diff: https://github.com/fastapi/typer/compare/refs/tags/0.15.4...refs/tags/0.16.0

Changelog: https://github.com/tiangolo/typer/releases/tag/0.16.0
---
 pkgs/development/python-modules/typer/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix
index 044cda773072..337369c869df 100644
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "typer";
-  version = "0.15.4";
+  version = "0.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastapi";
     repo = "typer";
     tag = version;
-    hash = "sha256-lZJKE8bxYxmDxAmnL7L/fL89gMe44voyHT20DUazd9E=";
+    hash = "sha256-WB9PIxagTHutfk3J+mNTVK8bC7TMDJquu3GLBQgaras=";
   };
 
   build-system = [ pdm-backend ];
@@ -73,6 +73,12 @@ buildPythonPackage rec {
     "test_install_completion"
   ];
 
+  disabledTestPaths = [
+    # likely click 8.2 compat issue
+    "tests/test_tutorial/test_parameter_types/test_bool/test_tutorial002_an.py"
+    "tests/test_tutorial/test_parameter_types/test_bool/test_tutorial002.py"
+  ];
+
   pythonImportsCheck = [ "typer" ];
 
   meta = {

From 889d268452268813fbd8c3b469aad3dd1db1034b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 15 Jul 2025 21:25:39 -0700
Subject: [PATCH 0523/3724] python3Packages.safety: 3.5.2 -> 3.6.0

Diff: https://github.com/pyupio/safety/compare/refs/tags/3.5.2...refs/tags/3.6.0

Changelog: https://github.com/pyupio/safety/blob/3.6.0/CHANGELOG.md
---
 pkgs/development/python-modules/safety/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix
index 020178ff3c14..2a7bb2ada2e8 100644
--- a/pkgs/development/python-modules/safety/default.nix
+++ b/pkgs/development/python-modules/safety/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "safety";
-  version = "3.5.2";
+  version = "3.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyupio";
     repo = "safety";
     tag = version;
-    hash = "sha256-kYGoJpFkZo4kZmbmak/+nOS2gzDO/xAwfbcGPOFxyrY=";
+    hash = "sha256-YJUehO91TJ7mGaB1hEgZSF0ds3SlZ01Z59RcR/B56tI=";
   };
 
   patches = [

From 29a631d120ce22aa3f4364aef163dafa68660db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 15 Jul 2025 21:43:31 -0700
Subject: [PATCH 0524/3724] python3Packages.multidict: 6.4.4 -> 6.6.3

Diff: https://github.com/aio-libs/multidict/compare/refs/tags/v6.4.4...refs/tags/v6.6.3

Changelog: https://github.com/aio-libs/multidict/blob/v6.6.3/CHANGES.rst
---
 pkgs/development/python-modules/multidict/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index 7f731d7bb8c7..75f50f00d240 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "multidict";
-  version = "6.4.4";
+  version = "6.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "multidict";
     tag = "v${version}";
-    hash = "sha256-crnWaThjymY0nbY4yvD+wX20vQcBkPrFAI+UkexNAbo=";
+    hash = "sha256-AB35kVgKizzPi3r4tDVQ7vI50Xsb2BeBp3rFh+UOXQc=";
   };
 
   postPatch = ''

From 63a8f6bb317cb398cbacccefb902130998f6e2b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20=22Capypara=22=20K=C3=B6pcke?= <hello@capypara.de>
Date: Wed, 16 Jul 2025 23:10:44 +0200
Subject: [PATCH 0525/3724] python3Packages.click: 8.1.8 -> 8.2.2

https://github.com/pallets/click/releases/tag/8.2.0
https://github.com/pallets/click/releases/tag/8.2.1
https://github.com/pallets/click/releases/tag/8.2.2
---
 .../python-modules/click/default.nix            | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index ec105f1ef7d5..28d22e503e90 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  importlib-metadata,
   pytestCheckHook,
 
   # large-rebuild downstream dependencies and applications
@@ -17,26 +16,28 @@
 
 buildPythonPackage rec {
   pname = "click";
-  version = "8.1.8";
+  version = "8.2.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "pallets";
     repo = "click";
     tag = version;
-    hash = "sha256-pAAqf8jZbDfVZUoltwIFpov/1ys6HSYMyw3WV2qcE/M=";
+    hash = "sha256-cBvibVZKCppFJiRS8MNc3YT1JxmlXhRci7LHsrd4JGs=";
   };
 
   build-system = [ flit-core ];
-  dependencies = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   disabledTests = [
-    # test fails with filename normalization on zfs
-    "test_file_surrogates"
+    # for some reason the tests fail to execute cat, even though they run with less just fine,
+    # even adding coreutils to nativeCheckInputs explicitly does not change anything
+    "test_echo_via_pager"
   ];
 
   passthru.tests = {

From d63334154c7a7de889ba0e324e370533652978f8 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Sat, 5 Jul 2025 17:20:14 +0900
Subject: [PATCH 0526/3724] python3Packages.typing-extensions: 4.13.2 -> 4.14.1

https://github.com/python/typing_extensions/blob/4.14.1/CHANGELOG.md#release-4140-june-2-2025
https://github.com/python/typing_extensions/blob/4.14.1/CHANGELOG.md#release-4141-july-4-2025

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/development/python-modules/typing-extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix
index b31e894e59db..662ad9c5eb9a 100644
--- a/pkgs/development/python-modules/typing-extensions/default.nix
+++ b/pkgs/development/python-modules/typing-extensions/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "typing-extensions";
-  version = "4.13.2";
+  version = "4.14.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python";
     repo = "typing_extensions";
     tag = version;
-    hash = "sha256-6wG+f0+sGI3sWy4EYeWDTffLicMiIkACHwrw0oP4Z1w=";
+    hash = "sha256-KzfxVUgPN1cLg73A3TC2zQjYfeLc8x9TtbLmOfmlOkY=";
   };
 
   nativeBuildInputs = [ flit-core ];

From 697aa52d78c534fa72ee38f0da4b369093898f97 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 5 Jul 2025 20:30:11 +0200
Subject: [PATCH 0527/3724] python3Packages.greenlet: Fix build on powerpc64*

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

diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix
index aecb96244991..fdabde2bb65a 100644
--- a/pkgs/development/python-modules/greenlet/default.nix
+++ b/pkgs/development/python-modules/greenlet/default.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   buildPythonPackage,
   fetchPypi,
@@ -35,6 +36,9 @@ let
       unittestCheckHook
     ];
 
+    # https://github.com/python-greenlet/greenlet/issues/395
+    env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isPower64 "-fomit-frame-pointer";
+
     preCheck = ''
       pushd ${placeholder "out"}/${python.sitePackages}
     '';

From 6ba92f39cac160bc13b35101a0f866527f4df5aa Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Wed, 9 Jul 2025 11:20:58 +0900
Subject: [PATCH 0528/3724] python3Packages.python-dotenv: 1.1.0 -> 1.1.1

https://github.com/theskumar/python-dotenv/releases/tag/v1.1.1

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/development/python-modules/python-dotenv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix
index 2d46ddd688d3..44e978008bdf 100644
--- a/pkgs/development/python-modules/python-dotenv/default.nix
+++ b/pkgs/development/python-modules/python-dotenv/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "python-dotenv";
-  version = "1.1.0";
+  version = "1.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "theskumar";
     repo = "python-dotenv";
     tag = "v${version}";
-    hash = "sha256-jpSOChCUgJxrA5n+DNQX3dtFQ5Q6VG4g4pdWRIh+dOo=";
+    hash = "sha256-GeN6/pnqhm7TTP+H9bKhJat6EwEl2EPl46mNSJWwFKk=";
   };
 
   build-system = [ setuptools ];

From 01ad9f01f05dd8ae85fbabd8e27f46958f7872c1 Mon Sep 17 00:00:00 2001
From: Iwan <tracnar@gmail.com>
Date: Sun, 16 Mar 2025 20:28:12 +0100
Subject: [PATCH 0529/3724] typeguard: avoid writing bytecode during tests to
 make reproducible #384704

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

diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index 4873e61061da..4f74f088f82d 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -53,6 +53,10 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  # To prevent test from writing out non-reproducible .pyc files
+  # https://github.com/agronholm/typeguard/blob/ca512c28132999da514f31b5e93ed2f294ca8f77/tests/test_typechecked.py#L641
+  preCheck = "export PYTHONDONTWRITEBYTECODE=1";
+
   pythonImportsCheck = [ "typeguard" ];
 
   meta = {

From 8969b8799b552b0ba42cb56ebc7da9a23f6442c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 15 Jul 2025 20:27:52 -0700
Subject: [PATCH 0530/3724] python3Packages.josepy: 2.0.0 -> 2.1.0

Diff: https://github.com/certbot/josepy/compare/refs/tags/v2.0.0...refs/tags/v2.1.0

Changelog: https://github.com/certbot/josepy/blob/v2.1.0/CHANGELOG.rst
---
 pkgs/development/python-modules/josepy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix
index 7358a9375e00..15f1282b8bf0 100644
--- a/pkgs/development/python-modules/josepy/default.nix
+++ b/pkgs/development/python-modules/josepy/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "josepy";
-  version = "2.0.0";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "certbot";
     repo = "josepy";
     tag = "v${version}";
-    hash = "sha256-9hY3A+XSoVrRLds4tNV+5HWkmMwcS9UtehrKoj0OIEw=";
+    hash = "sha256-gXXsipvlxLs/dc0rjnaKlR4lySDfDfpo0tcSVrOz9P4=";
   };
 
   build-system = [ poetry-core ];

From 8040efbea2d19fe12e362cf116174d0937e6f6af Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 19 Jul 2025 23:46:27 +0200
Subject: [PATCH 0531/3724] python3Packages.fonttools: 4.56.0 -> 4.59.0

- ufo extra no longer depends on fs
- python 3.14 change has been merged upstream
- test suite automatically skips tests that are missing dependencies in
  the test environment, so we don't need to maintain a list of them.
- issue with pytest >= 8.0.1 has been resolved upstream

https://github.com/fonttools/fonttools/releases/tag/4.57.0
https://github.com/fonttools/fonttools/releases/tag/4.58.0
https://github.com/fonttools/fonttools/releases/tag/4.58.1
https://github.com/fonttools/fonttools/releases/tag/4.58.2
https://github.com/fonttools/fonttools/releases/tag/4.58.3
https://github.com/fonttools/fonttools/releases/tag/4.58.4
https://github.com/fonttools/fonttools/releases/tag/4.58.5
https://github.com/fonttools/fonttools/releases/tag/4.59.0
---
 .../python-modules/fonttools/default.nix      | 26 +++----------------
 .../fonttools/python-3.13.4.patch             | 25 ------------------
 2 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/development/python-modules/fonttools/python-3.13.4.patch

diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 42c64e016bf9..3c08366084f9 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -7,7 +7,6 @@
   fetchFromGitHub,
   setuptools,
   setuptools-scm,
-  fs,
   lxml,
   brotli,
   brotlicffi,
@@ -27,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "4.56.0";
+  version = "4.59.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -36,15 +35,9 @@ buildPythonPackage rec {
     owner = "fonttools";
     repo = "fonttools";
     tag = version;
-    hash = "sha256-ZkC1+I2d9wY9J7IoCGHGWG2gOVN7wW274UpN1lQxmJY=";
+    hash = "sha256-f3iedVwwh98XkFzPJ/+XZ2n4pcDXDoPlQki+neGVuXE=";
   };
 
-  patches = [
-    # https://github.com/fonttools/fonttools/pull/3855
-    # FIXME: remove when merged
-    ./python-3.13.4.patch
-  ];
-
   build-system = [
     setuptools
     setuptools-scm
@@ -53,7 +46,7 @@ buildPythonPackage rec {
   optional-dependencies =
     let
       extras = {
-        ufo = [ fs ];
+        ufo = [ ];
         lxml = [ lxml ];
         woff = [
           (if isPyPy then brotlicffi else brotli)
@@ -108,19 +101,6 @@ buildPythonPackage rec {
     "test_ttcompile_timestamp_calcs"
   ];
 
-  disabledTestPaths = [
-    # avoid test which depend on fs and matplotlib
-    # fs and matplotlib were removed to prevent strong cyclic dependencies
-    "Tests/misc/plistlib_test.py"
-    "Tests/pens"
-    "Tests/ufoLib"
-
-    # test suite fails with pytest>=8.0.1
-    # https://github.com/fonttools/fonttools/issues/3458
-    "Tests/ttLib/woff2_test.py"
-    "Tests/ttx/ttx_test.py"
-  ];
-
   meta = with lib; {
     homepage = "https://github.com/fonttools/fonttools";
     description = "Library to manipulate font files from Python";
diff --git a/pkgs/development/python-modules/fonttools/python-3.13.4.patch b/pkgs/development/python-modules/fonttools/python-3.13.4.patch
deleted file mode 100644
index c05def255b17..000000000000
--- a/pkgs/development/python-modules/fonttools/python-3.13.4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Lib/fontTools/feaLib/ast.py b/Lib/fontTools/feaLib/ast.py
-index efcce8c680..18e5a891d3 100644
---- a/Lib/fontTools/feaLib/ast.py
-+++ b/Lib/fontTools/feaLib/ast.py
-@@ -719,7 +719,8 @@ def __init__(self, prefix, glyphs, suffix, lookups, location=None):
-         for i, lookup in enumerate(lookups):
-             if lookup:
-                 try:
--                    (_ for _ in lookup)
-+                    for _ in lookup:
-+                        break
-                 except TypeError:
-                     self.lookups[i] = [lookup]
- 
-@@ -777,7 +778,8 @@ def __init__(self, prefix, glyphs, suffix, lookups, location=None):
-         for i, lookup in enumerate(lookups):
-             if lookup:
-                 try:
--                    (_ for _ in lookup)
-+                    for _ in lookup:
-+                        break
-                 except TypeError:
-                     self.lookups[i] = [lookup]
- 
-

From 2e3269fae1b515bdf1d70b6ee984f3848f327615 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 19 Jul 2025 23:53:19 +0200
Subject: [PATCH 0532/3724] python3Packages.defcon: 0.12.1 -> 0.12.2

https://github.com/robotools/defcon/releases/tag/0.12.2
---
 pkgs/development/python-modules/defcon/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix
index 06efc8018d32..4c9beacba974 100644
--- a/pkgs/development/python-modules/defcon/default.nix
+++ b/pkgs/development/python-modules/defcon/default.nix
@@ -11,15 +11,14 @@
 
 buildPythonPackage rec {
   pname = "defcon";
-  version = "0.12.1";
+  version = "0.12.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-rKhnSo9xcjr2oI8zLz7TFWug/gBZHrWv91csqtFHLQk=";
-    extension = "zip";
+    hash = "sha256-Jd/n/QFSzPKSyxkNGSikfViImcILBGhUKT4DnhyT5eA=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 3c01b4e1a920a99bb372eacb20d5377b4d3148a8 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 20 Jul 2025 00:34:45 +0200
Subject: [PATCH 0533/3724] python3Packages.ufolib2: 0.17.1 -> 0.18.1

https://github.com/fonttools/ufoLib2/releases/tag/v0.18.0
https://github.com/fonttools/ufoLib2/releases/tag/v0.18.1
---
 pkgs/development/python-modules/ufolib2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ufolib2/default.nix b/pkgs/development/python-modules/ufolib2/default.nix
index 6597a46dabeb..6d6ab0af094c 100644
--- a/pkgs/development/python-modules/ufolib2/default.nix
+++ b/pkgs/development/python-modules/ufolib2/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "ufolib2";
-  version = "0.17.1";
+  version = "0.18.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "fonttools";
     repo = "ufoLib2";
     tag = "v${version}";
-    hash = "sha256-pVwQOVtUUDphBZIUoiIf19DdZ+t7uS32Ery8+e2ZLlE=";
+    hash = "sha256-YFGgPpiEurPaTUFaSMsVBKS4Ob+vPyZhputfRE39wtg=";
   };
 
   build-system = [ setuptools-scm ];

From 7f1c4a82d9937cafedbd2222ae37f1e6e65adba6 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 20 Jul 2025 00:41:16 +0200
Subject: [PATCH 0534/3724] python3.pkgs.ufo2ft: apply patch for fonttools >=
 4.58.5

---
 pkgs/development/python-modules/ufo2ft/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix
index a7b85b658083..c3a9401600a1 100644
--- a/pkgs/development/python-modules/ufo2ft/default.nix
+++ b/pkgs/development/python-modules/ufo2ft/default.nix
@@ -15,6 +15,7 @@
   skia-pathops,
   syrupy,
   ufolib2,
+  fetchpatch,
 }:
 
 buildPythonPackage rec {
@@ -29,6 +30,16 @@ buildPythonPackage rec {
     hash = "sha256-FUITbL+FnscmZjZMlgh/dX4+tJR6MD0LoH5jDNisQkI=";
   };
 
+  patches = [
+    # Unreleased patch for fonttools >= 4.58.5
+    # https://github.com/googlefonts/ufo2ft/issues/920
+    (fetchpatch {
+      name = "ufo2ft-fonttools-4.58.5.patch";
+      url = "https://github.com/googlefonts/ufo2ft/commit/5ca4800ef39167c377fc669b41e146520cfa641b.patch";
+      hash = "sha256-7hEO6D7LK+LxTK1jcaC8kLw/9ZOOpr41qFysLrZBZ4M=";
+    })
+  ];
+
   build-system = [
     setuptools-scm
   ];

From 04e26ba039a7498143b316857d1adb32ee41dc24 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 20 Jul 2025 00:47:43 +0200
Subject: [PATCH 0535/3724] python3Packages.fontfeatures: 1.8.0 -> 1.9.0

https://github.com/simoncozens/fontFeatures/releases/tag/v1.9.0
---
 .../python-modules/fontfeatures/default.nix           | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/fontfeatures/default.nix b/pkgs/development/python-modules/fontfeatures/default.nix
index 11943c36e05b..5648e37ed9f1 100644
--- a/pkgs/development/python-modules/fontfeatures/default.nix
+++ b/pkgs/development/python-modules/fontfeatures/default.nix
@@ -9,17 +9,20 @@
   lxml,
   pytestCheckHook,
   youseedee,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "fontfeatures";
-  version = "1.8.0";
-  format = "setuptools";
+  version = "1.9.0";
+
+  pyproject = true;
+  build-system = [ setuptools-scm ];
 
   src = fetchPypi {
-    pname = "fontFeatures";
+    pname = "fontfeatures";
     inherit version;
-    hash = "sha256-XLJD91IyUUjeSqdhWFfIqv9yISPcbU4bgRvXETSHOiY=";
+    hash = "sha256-3PpUgaTXyFcthJrFaQqeUOvDYYFosJeXuRFnFrwp0R8=";
   };
 
   propagatedBuildInputs = [

From b2c2c2302b94b43c0465a01119bdf5ce028eeedb Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 20 Jul 2025 10:47:26 +0200
Subject: [PATCH 0536/3724] python3Packages.opentypespec: 1.9.1 -> 1.9.2

Seems to only change the build system (?).
---
 .../python-modules/opentypespec/default.nix         | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/opentypespec/default.nix b/pkgs/development/python-modules/opentypespec/default.nix
index 81fc60e5dc55..8359a2687d5d 100644
--- a/pkgs/development/python-modules/opentypespec/default.nix
+++ b/pkgs/development/python-modules/opentypespec/default.nix
@@ -3,16 +3,23 @@
   buildPythonPackage,
   fetchPypi,
   unittestCheckHook,
+  setuptools-scm,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "opentypespec";
-  version = "1.9.1";
-  format = "setuptools";
+  version = "1.9.2";
+  pyproject = true;
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fOEHmtlCkFhn1jyIA+CsHIfud7x3PPb7UWQsnrVyDqY=";
+    hash = "sha256-5j89rMDKxGLLoN88/T7+e0xE8/eOmKN3eDpWxekJGiQ=";
   };
 
   nativeCheckInputs = [ unittestCheckHook ];

From 3ab9765ca778360369dfdd29ebaa7ed8bc2985ad Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 20 Jul 2025 10:48:02 +0200
Subject: [PATCH 0537/3724] python3Packages.fontbakery: 0.13.2 -> 1.0.1

https://github.com/fonttools/fontbakery/blob/2b130c8e83a1e23835826cbebd0e7ce49574b8ab/CHANGELOG.md#100-2025-05-07
https://github.com/fonttools/fontbakery/blob/2b130c8e83a1e23835826cbebd0e7ce49574b8ab/CHANGELOG.md#100-2025-05-07
---
 pkgs/development/python-modules/fontbakery/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix
index e2d2ab0c9218..38210d8004ae 100644
--- a/pkgs/development/python-modules/fontbakery/default.nix
+++ b/pkgs/development/python-modules/fontbakery/default.nix
@@ -47,12 +47,12 @@
 
 buildPythonPackage rec {
   pname = "fontbakery";
-  version = "0.13.2";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/wyrBoSUVjdKIIlK3HoDeHQ3yhMPT/0G05llWzDoE50=";
+    hash = "sha256-OPOUNKy70sm/kqrxRi61MjfQp74AdqZh6Gt93LdlmU0=";
   };
 
   env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";

From 493c522081ee4d5fabb36f97ab64ad35c8189e1c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 12 Jul 2025 20:40:18 +0200
Subject: [PATCH 0538/3724] python313Packages.pook: 2.1.3 -> 2.1.4

Changelog: https://github.com/h2non/pook/blob/v2.1.4/History.rst
---
 pkgs/development/python-modules/pook/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix
index 66d6e2da8db8..c099c5677a48 100644
--- a/pkgs/development/python-modules/pook/default.nix
+++ b/pkgs/development/python-modules/pook/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   buildPythonPackage,
+  falcon,
   fetchFromGitHub,
   furl,
   hatchling,
@@ -15,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pook";
-  version = "2.1.3";
+  version = "2.1.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +25,7 @@ buildPythonPackage rec {
     owner = "h2non";
     repo = "pook";
     tag = "v${version}";
-    hash = "sha256-DDHaKsye28gxyorILulrLRBy/B9zV673jeVZ85uPZAo=";
+    hash = "sha256-z0QaMdsX2xLXICgQwnlUD2KsgCn0jB4wO83+6O4B3D8=";
   };
 
   nativeBuildInputs = [ hatchling ];
@@ -36,6 +37,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    falcon
     pytest-asyncio
     pytest-httpbin
     pytest-pook

From 3d85ad19d3b346e05ef2c336ba2c4c88a20f6c0b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 12 Jul 2025 20:43:12 +0200
Subject: [PATCH 0539/3724] python313Packages.pook: refactor

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

diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix
index c099c5677a48..ba904883f880 100644
--- a/pkgs/development/python-modules/pook/default.nix
+++ b/pkgs/development/python-modules/pook/default.nix
@@ -10,7 +10,6 @@
   pytest-httpbin,
   pytest-pook,
   pytestCheckHook,
-  pythonOlder,
   xmltodict,
 }:
 
@@ -19,8 +18,6 @@ buildPythonPackage rec {
   version = "2.1.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "h2non";
     repo = "pook";
@@ -28,9 +25,9 @@ buildPythonPackage rec {
     hash = "sha256-z0QaMdsX2xLXICgQwnlUD2KsgCn0jB4wO83+6O4B3D8=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     furl
     jsonschema
     xmltodict
@@ -64,8 +61,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "HTTP traffic mocking and testing";
     homepage = "https://github.com/h2non/pook";
-    changelog = "https://github.com/h2non/pook/blob/v${version}/History.rst";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/h2non/pook/blob/v${src.tag}/History.rst";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }

From 3745418ef6ffcc6cbbdd8d796ec3ce45c4245bd7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 19 Jul 2025 19:03:45 +0200
Subject: [PATCH 0540/3724] python3Packages.tensorboard: 2.19.0 -> 2.20.0

Diff: https://github.com/tensorflow/tensorboard/compare/2.19.0...2.20.0

Changelog: https://github.com/tensorflow/tensorboard/releases/tag/2.20.0
---
 pkgs/development/python-modules/tensorboard/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix
index 2a7be3be31b1..f145e93f0791 100644
--- a/pkgs/development/python-modules/tensorboard/default.nix
+++ b/pkgs/development/python-modules/tensorboard/default.nix
@@ -9,9 +9,9 @@
   markdown,
   numpy,
   packaging,
+  pillow,
   protobuf,
   setuptools,
-  six,
   tensorboard-data-server,
   werkzeug,
   standard-imghdr,
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "tensorboard";
-  version = "2.19.0";
+  version = "2.20.0";
   format = "wheel";
 
   # tensorflow/tensorboard is built from a downloaded wheel, because
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     inherit pname version format;
     dist = "py3";
     python = "py3";
-    hash = "sha256-XnG5hmOmQafOim5wsL6OGkwMRdSHYLB2ODrEdVw1uaA=";
+    hash = "sha256-ncn5eMuEwHI6z5o0XZbBhPApPRjxZruNWe4Jjmz6q6Y=";
   };
 
   pythonRelaxDeps = [
@@ -44,9 +44,9 @@ buildPythonPackage rec {
     markdown
     numpy
     packaging
+    pillow
     protobuf
     setuptools
-    six
     tensorboard-data-server
     werkzeug
 

From 777bf3bb1b3c40fe8a3361087620f9a3731063b9 Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Sun, 13 Jul 2025 13:02:44 +0200
Subject: [PATCH 0541/3724] python313Packages.oauthlib: 3.2.2 -> 3.3.1

https://github.com/oauthlib/oauthlib/releases/tag/v3.3.0
https://github.com/oauthlib/oauthlib/releases/tag/v3.3.1
---
 .../python-modules/oauthlib/default.nix        | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix
index 9fd14254fd49..224a1eb15394 100644
--- a/pkgs/development/python-modules/oauthlib/default.nix
+++ b/pkgs/development/python-modules/oauthlib/default.nix
@@ -20,16 +20,16 @@
 
 buildPythonPackage rec {
   pname = "oauthlib";
-  version = "3.2.2";
+  version = "3.3.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "oauthlib";
     repo = "oauthlib";
-    rev = "v${version}";
-    hash = "sha256-KADS1pEaLYi86LEt2VVuz8FVTBANzxC8EeQLgGMxuBU=";
+    tag = "v${version}";
+    hash = "sha256-ZTmR+pTNQaRQMnUA+8hXM5VACRd8Hn62KTNooy5FQyk=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -49,14 +49,6 @@ buildPythonPackage rec {
   ]
   ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  disabledTests = [
-    # https://github.com/oauthlib/oauthlib/issues/877
-    "test_rsa_bad_keys"
-  ]
-  ++ lib.optionals (pythonAtLeast "3.13") [
-    "test_filter_params"
-  ];
-
   pythonImportsCheck = [ "oauthlib" ];
 
   passthru.tests = {
@@ -69,7 +61,7 @@ buildPythonPackage rec {
   };
 
   meta = with lib; {
-    changelog = "https://github.com/oauthlib/oauthlib/blob/${src.rev}/CHANGELOG.rst";
+    changelog = "https://github.com/oauthlib/oauthlib/blob/${src.tag}/CHANGELOG.rst";
     description = "Generic, spec-compliant, thorough implementation of the OAuth request-signing logic";
     homepage = "https://github.com/oauthlib/oauthlib";
     license = licenses.bsd3;

From cdac967ea9d6b92f466da0b5d38b560b602b5212 Mon Sep 17 00:00:00 2001
From: Johan Herland <johan@herland.net>
Date: Tue, 15 Jul 2025 15:17:15 +0000
Subject: [PATCH 0542/3724] python3Packages.pytz: use system tzdata

We update that one more reliably, and it allows system-level
customizations to apply to pytz as well. This is in line with the
zoneinfo stdlib module in Python >=v3.9 which accesses the system
timezone database directly.

This is modeled on how the certifi module uses the system-wide
ca-bundle, see commit 8d7cc9cac9ecdf95f554c5ea7ca15118baa06c39.
---
 pkgs/development/python-modules/pytz/default.nix | 12 +++++++++++-
 pkgs/top-level/python-packages.nix               |  4 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix
index d258ad926ec2..5049c209f088 100644
--- a/pkgs/development/python-modules/pytz/default.nix
+++ b/pkgs/development/python-modules/pytz/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   setuptools,
+  tzdata,
   unittestCheckHook,
 }:
 
@@ -16,6 +17,12 @@ buildPythonPackage rec {
     hash = "sha256-NguePbtJognCGtYYCcf7RTZD4EiziSTHZYE1RnRugcM=";
   };
 
+  postPatch = ''
+    # Use our system-wide zoneinfo dir instead of the bundled one
+    rm -rf pytz/zoneinfo
+    ln -snvf ${tzdata}/share/zoneinfo pytz/zoneinfo
+  '';
+
   build-system = [ setuptools ];
 
   nativeCheckInputs = [ unittestCheckHook ];
@@ -32,6 +39,9 @@ buildPythonPackage rec {
     description = "World timezone definitions, modern and historical";
     homepage = "https://pythonhosted.org/pytz";
     license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    maintainers = with maintainers; [
+      dotlambda
+      jherland
+    ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e398e398f8a4..71d84a38372a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15008,7 +15008,9 @@ self: super: with self; {
 
   pytweening = callPackage ../development/python-modules/pytweening { };
 
-  pytz = callPackage ../development/python-modules/pytz { };
+  pytz = callPackage ../development/python-modules/pytz {
+    inherit (pkgs) tzdata;
+  };
 
   pytz-deprecation-shim = callPackage ../development/python-modules/pytz-deprecation-shim { };
 

From 2918191442f6b24b7b2c61952aadb55d6c5ab589 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 30 Jul 2025 22:39:38 +0200
Subject: [PATCH 0543/3724] python3Packages.sqlalchemy: configure update script

---
 pkgs/development/python-modules/sqlalchemy/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index f48abe0214be..4f597f98ed18 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -4,6 +4,7 @@
   pythonOlder,
   fetchFromGitHub,
   buildPythonPackage,
+  nix-update-script,
 
   # build
   cython,
@@ -109,6 +110,13 @@ buildPythonPackage rec {
     "test/aaa_profiling"
   ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "([0-9.]+)"
+    ];
+  };
+
   meta = with lib; {
     changelog = "https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_${
       builtins.replaceStrings [ "." ] [ "_" ] version

From a861c9edcd8410bd7d47d5da66601353f1361897 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 30 Jul 2025 23:39:07 +0200
Subject: [PATCH 0544/3724] python3Packages.sqlalchemy: 2.0.41 -> 2.0.42

https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_42
---
 pkgs/development/python-modules/sqlalchemy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 4f597f98ed18..5bc964ff493a 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "sqlalchemy";
-  version = "2.0.41";
+  version = "2.0.42";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "sqlalchemy";
     repo = "sqlalchemy";
     tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-DixgBUI+HJLTCsunN5Y+ogcAHnRnQ3CKSFc6HrxzsPM=";
+    hash = "sha256-e/DkS9CioMLG/qMOf0//DxMFDTep4xEtCVTp/Hn0Wiw=";
   };
 
   postPatch = ''
@@ -113,7 +113,7 @@ buildPythonPackage rec {
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version-regex"
-      "([0-9.]+)"
+      "^rel_([0-9]+)_([0-9]+)_([0-9]+)$"
     ];
   };
 

From 3c8d7074d7e4c5a98003306bba4348aeac1d8ee2 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Wed, 30 Jul 2025 19:12:34 +0200
Subject: [PATCH 0545/3724] python3Packages.aioboto3: 14.3.0 -> 15.0.0

Diff: https://github.com/terricain/aioboto3/compare/refs/tags/v14.3.0...refs/tags/v15.0.0

Changelog: https://github.com/terricain/aioboto3/blob/refs/tags/v15.0.0/CHANGELOG.rst
---
 pkgs/development/python-modules/aioboto3/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix
index c36746e5cc71..a915813c9e18 100644
--- a/pkgs/development/python-modules/aioboto3/default.nix
+++ b/pkgs/development/python-modules/aioboto3/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "aioboto3";
-  version = "14.3.0";
+  version = "15.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "terrycain";
+    owner = "terricain";
     repo = "aioboto3";
     tag = "v${version}";
-    hash = "sha256-3GdTpbU0uEEzezQPHJTGPB42Qu604eIhcIAP4rZMQiY=";
+    hash = "sha256-Z4tUwTFaXC3BGUKc1FPY0xoaUViAEiZNeP5REWotw2M=";
   };
 
   pythonRelaxDeps = [
@@ -63,8 +63,8 @@ buildPythonPackage rec {
 
   meta = {
     description = "Wrapper to use boto3 resources with the aiobotocore async backend";
-    homepage = "https://github.com/terrycain/aioboto3";
-    changelog = "https://github.com/terrycain/aioboto3/blob/${src.rev}/CHANGELOG.rst";
+    homepage = "https://github.com/terricain/aioboto3";
+    changelog = "https://github.com/terricain/aioboto3/blob/${src.rev}/CHANGELOG.rst";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ mbalatsko ];
   };

From 82f8ae9aa2f44e3f51bcc29353b21661afd54732 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Wed, 30 Jul 2025 19:13:58 +0200
Subject: [PATCH 0546/3724] python3Packages.aiobotocore: 2.22.0 -> 2.23.2

Diff: https://github.com/aio-libs/aiobotocore/compare/refs/tags/2.22.0...refs/tags/2.23.2

Changelog: https://github.com/aio-libs/aiobotocore/blob/2.23.2/CHANGES.rst
---
 .../python-modules/aiobotocore/default.nix          | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix
index a1dbe65c0123..3fc040672435 100644
--- a/pkgs/development/python-modules/aiobotocore/default.nix
+++ b/pkgs/development/python-modules/aiobotocore/default.nix
@@ -17,20 +17,21 @@
   werkzeug,
   awscli,
   boto3,
+  httpx,
   setuptools,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "aiobotocore";
-  version = "2.22.0";
+  version = "2.23.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiobotocore";
     tag = version;
-    hash = "sha256-Zzwj0osXqWSCWsuxlpiqpptzjLhFwlqfXqiWMP7CgXg=";
+    hash = "sha256-3aqA+zjXgYGqDRF0x2eS458A0N7Dmc0tfOcnukjf0DM=";
   };
 
   # Relax version constraints: aiobotocore works with newer botocore versions
@@ -55,6 +56,7 @@ buildPythonPackage rec {
   optional-dependencies = {
     awscli = [ awscli ];
     boto3 = [ boto3 ];
+    httpx = [ httpx ];
   };
 
   nativeCheckInputs = [
@@ -72,8 +74,6 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # Test requires network access
     "tests/test_version.py"
-    # Test not compatible with latest moto
-    "tests/python3.8/test_eventstreams.py"
     "tests/test_basic_s3.py"
     "tests/test_batch.py"
     "tests/test_dynamodb.py"
@@ -86,6 +86,11 @@ buildPythonPackage rec {
     "tests/test_waiter.py"
   ];
 
+  disabledTestMarks = [
+    # Exclude localonly tests (incompatible with moto mocks)
+    "localonly"
+  ];
+
   __darwinAllowLocalNetworking = true;
 
   meta = {

From fbf530c1c53299b56ec184d56fecce60b0242dd8 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Wed, 30 Jul 2025 19:31:36 +0200
Subject: [PATCH 0547/3724] python3Packages.moto: 5.1.4 -> 5.1.9

Diff: https://github.com/getmoto/moto/compare/refs/tags/5.1.4...refs/tags/5.1.9

Changelog: https://github.com/getmoto/moto/blob/5.1.9/CHANGELOG.md
---
 .../python-modules/moto/default.nix           | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index 3fe8eaea2371..bf54158febbf 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -10,7 +10,6 @@
   cryptography,
   docker,
   fetchFromGitHub,
-  fetchpatch,
   flask-cors,
   flask,
   freezegun,
@@ -38,7 +37,7 @@
 
 buildPythonPackage rec {
   pname = "moto";
-  version = "5.1.4";
+  version = "5.1.9";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -47,18 +46,9 @@ buildPythonPackage rec {
     owner = "getmoto";
     repo = "moto";
     tag = version;
-    hash = "sha256-bDRd1FTBpv6t2j8cBzcYiK4B0F4sLcoW9K0Wnd0oo+4=";
+    hash = "sha256-UbCSGpvS8Jvpe8iV1rVplSoGykHSup9pVTd3odbPq6Y=";
   };
 
-  # Fix tests with botocore 1.38.32
-  # FIXME: remove in next update
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/getmoto/moto/commit/8dcaaca0eefdf9ac957650c1562317b6d07fadf9.diff";
-      hash = "sha256-5zaerJR1rsMZQLn8cXjS8RYiKlSQ6azp7dk7JzLp+7I=";
-    })
-  ];
-
   build-system = [
     setuptools
   ];
@@ -364,9 +354,6 @@ buildPythonPackage rec {
     # Parameter validation fails
     "test_conditional_write"
 
-    # Requires newer botocore version
-    "test_dynamodb_with_account_id_routing"
-
     # Assumes too much about threading.Timer() behavior (that it honors the
     # timeout precisely and that the thread handler will complete in just 0.1s
     # from the requested timeout)
@@ -395,6 +382,9 @@ buildPythonPackage rec {
 
     # botocore.exceptions.ParamValidationError: Parameter validation failed: Unknown parameter in input: "EnableWorkDocs", must be one of: [...]
     "tests/test_workspaces/test_workspaces.py"
+
+    # Requires sagemaker client
+    "other_langs/tests_sagemaker_client/test_model_training.py"
   ];
 
   meta = {

From c48f5b981deac819f403350c1a457010d65e0b3f Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sat, 2 Aug 2025 18:49:54 -0400
Subject: [PATCH 0548/3724] python312Packages.pytest-datadir: 1.7.2 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix
index ecd1d81e4517..0b8532f1ed49 100644
--- a/pkgs/development/python-modules/pytest-datadir/default.nix
+++ b/pkgs/development/python-modules/pytest-datadir/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-datadir";
-  version = "1.7.2";
+  version = "1.8.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "gabrielcnr";
     repo = "pytest-datadir";
     tag = "v${version}";
-    hash = "sha256-0y+1Al8nocCJXZyu8gLbYnXJzUu/oD31Zhn901XxWds=";
+    hash = "sha256-ttzYFzePPpFY6DfMGLVImZMiehuR9IhmIFxBlgrDDmk=";
   };
 
   nativeBuildInputs = [

From 8ae57c4259dbddef60201d59f9f669810ed4d7ae Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 3 Aug 2025 20:02:29 +0300
Subject: [PATCH 0549/3724] python313Packages.scipy: 1.16.0 -> 1.16.1

Diff: https://github.com/scipy/scipy/compare/refs/tags/v1.16.0...refs/tags/v1.16.1

Changelog: https://github.com/scipy/scipy/releases/tag/v1.16.1
---
 pkgs/development/python-modules/scipy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index c03bc058262f..92151e468259 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -50,8 +50,8 @@ let
   #     nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy
   #
   # The update script uses sed regexes to replace them with the updated hashes.
-  version = "1.16.0";
-  srcHash = "sha256-PFWUq7RsqMgBK1bTw52y1renoPygWNreikNTFHWE2Ig=";
+  version = "1.16.1";
+  srcHash = "sha256-/LgYQUMGoQjSWMCWBgnekNGzEc0LVg2qiN2tV399rQU=";
   datasetsHashes = {
     ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3";
     ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj";

From b39dd739b4697c20888e83c4aac9babc8e1d1650 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:05 +0200
Subject: [PATCH 0550/3724] python3Packages.a2wsgi: 1.10.8 -> 1.10.10

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/a2wsgi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix
index f281c25b3884..e38f47e6bcd8 100644
--- a/pkgs/development/python-modules/a2wsgi/default.nix
+++ b/pkgs/development/python-modules/a2wsgi/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "a2wsgi";
-  version = "1.10.8";
+  version = "1.10.10";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/AC6sfx5L4mozhtJGyrRcXsUXYyu+3XQqFhpRu3JfLI=";
+    hash = "sha256-pbz/tSCBujnfDV6aiE/G+BnZLjpCOJNDunfL+An+H0U=";
   };
 
   build-system = [ pdm-backend ];

From 0d0195ad7d4a5fe6cd578231908c50cbe04683db Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:06 +0200
Subject: [PATCH 0551/3724] python3Packages.abjad: 3.22 -> 3.28

https://abjad.github.io/appendices/changes.html

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/abjad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/abjad/default.nix b/pkgs/development/python-modules/abjad/default.nix
index e03212322041..4f89767c1b7a 100644
--- a/pkgs/development/python-modules/abjad/default.nix
+++ b/pkgs/development/python-modules/abjad/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "abjad";
-  version = "3.22";
+  version = "3.28";
   format = "setuptools";
 
   # see issue upstream indicating Python 3.12 support will come
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cTll4E5qPuacc7K3TFfK4IqtXGUHuiiU5J20poRuWbI=";
+    hash = "sha256-J4LPOSz34GvDRwpCG8yt4LAqt+dhDrfG/W451bZRpgk=";
   };
 
   propagatedBuildInputs = [

From f4e2359f79cd0b08372a9ce78236f6c40d62f194 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:07 +0200
Subject: [PATCH 0552/3724] python3Packages.about-time: 4.2.1 -> 4.2.2

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/about-time/default.nix     | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/about-time/default.nix b/pkgs/development/python-modules/about-time/default.nix
index 02f1ca4f917d..3271a11755b4 100644
--- a/pkgs/development/python-modules/about-time/default.nix
+++ b/pkgs/development/python-modules/about-time/default.nix
@@ -1,33 +1,31 @@
 {
   lib,
-  fetchPypi,
+  fetchFromGitHub,
   buildPythonPackage,
-  python,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "about-time";
-  version = "4.2.1";
-  format = "setuptools";
+  version = "4.2.2";
+  pyproject = true;
 
-  # PyPi release does not contain test files, but the repo has no release tags,
-  # so while having no tests is not ideal, follow the PyPi releases for now
-  # TODO: switch to fetchFromGitHub once this issue is fixed:
-  # https://github.com/rsalmei/about-time/issues/15
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-alOIYtM85n2ZdCnRSZgxDh2/2my32bv795nEcJhH/s4=";
+  src = fetchFromGitHub {
+    owner = "rsalmei";
+    repo = "about-time";
+    tag = "v${version}";
+    hash = "sha256-a7jFVrxUvdR5UdeNNXSTsXC/Q76unedMLmcu0iTS3Tk=";
   };
 
-  doCheck = false;
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools~=75.3" setuptools
+  '';
+
+  build-system = [ setuptools ];
 
   pythonImportsCheck = [ "about_time" ];
 
-  postInstall = ''
-    mkdir -p $out/share/doc/python${python.pythonVersion}-$pname-$version/
-    mv $out/LICENSE $out/share/doc/python${python.pythonVersion}-$pname-$version/
-  '';
-
   meta = with lib; {
     description = "Cool helper for tracking time and throughput of code blocks, with beautiful human friendly renditions";
     homepage = "https://github.com/rsalmei/about-time";

From 893d359763e663fb6495558a1c8617d27adc1e47 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:08 +0200
Subject: [PATCH 0553/3724] python3Packages.absl-py: 2.2.2 -> 2.3.1

https://github.com/abseil/abseil-py/blob/v2.3.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/absl-py/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix
index ca12c857ca09..21552b076199 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/pkgs/development/python-modules/absl-py/default.nix
@@ -2,22 +2,22 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
+  hatchling,
 }:
 
 buildPythonPackage rec {
   pname = "absl-py";
-  version = "2.2.2";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "abseil";
     repo = "abseil-py";
     tag = "v${version}";
-    hash = "sha256-KsaFfdq6+Pc8k0gM1y+HJ1v6VrTAK7TBgh92BSFuc+Q=";
+    hash = "sha256-U8doys7SoOhtUkF0dsCFKnM9ItOoi5a6cK6zGOe/U8s=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   # checks use bazel; should be revisited
   doCheck = false;
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Abseil Python Common Libraries";
     homepage = "https://github.com/abseil/abseil-py";
-    changelog = "https://github.com/abseil/abseil-py/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/abseil/abseil-py/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };

From c53a6036f04411be66cef72634a9e5d61fc41822 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:12 +0200
Subject: [PATCH 0554/3724] python3Packages.aiodiscover: 2.7.0 -> 2.7.1

https://github.com/bdraco/aiodiscover/releases/tag/v2.7.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/aiodiscover/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix
index 8420da320779..18845fc8c92a 100644
--- a/pkgs/development/python-modules/aiodiscover/default.nix
+++ b/pkgs/development/python-modules/aiodiscover/default.nix
@@ -58,7 +58,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module to discover hosts via ARP and PTR lookup";
     homepage = "https://github.com/bdraco/aiodiscover";
-    changelog = "https://github.com/bdraco/aiodiscover/releases/tag/v${version}";
+    changelog = "https://github.com/bdraco/aiodiscover/releases/tag/${src.tag}";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };

From e9e5b6327138b28f38969f34ff2fb2d5ab633b99 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:16 +0200
Subject: [PATCH 0555/3724] python3Packages.aiomisc-pytest: 1.2.1 -> 1.3.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/aiomisc-pytest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiomisc-pytest/default.nix b/pkgs/development/python-modules/aiomisc-pytest/default.nix
index 0e0add78bf19..1db59e19c44b 100644
--- a/pkgs/development/python-modules/aiomisc-pytest/default.nix
+++ b/pkgs/development/python-modules/aiomisc-pytest/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aiomisc-pytest";
-  version = "1.2.1";
+  version = "1.3.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "aiomisc_pytest";
     inherit version;
-    hash = "sha256-4mWP77R3CoX+XhoT6BbxQtxpINpdmeozjYUsegNfMyU=";
+    hash = "sha256-9Of1pSUcMiIhkz7OW5erF4oDlf/ABkaamDBPg7+WbBE=";
   };
 
   build-system = [ poetry-core ];

From 19ee1425dcbc8d21726bbaf34a0fb8712233b56c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:17 +0200
Subject: [PATCH 0556/3724] python3Packages.aiomisc: 17.7.8 -> 17.9.4

https://github.com/aiokitchen/aiomisc/blob/master/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/aiomisc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix
index f92816215373..b61f558e7146 100644
--- a/pkgs/development/python-modules/aiomisc/default.nix
+++ b/pkgs/development/python-modules/aiomisc/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "aiomisc";
-  version = "17.7.8";
+  version = "17.9.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Wfum+9M0Kx9GA9F2/fzhvETsQodNKnoRXSADFZl6Sf4=";
+    hash = "sha256-oSwMhomcPIN2JYterJuBUcmJtUx3rayADH1ugah+pI8=";
   };
 
   build-system = [ poetry-core ];

From 2f15c9f7f90ac4eead514d94ff8718ac0563c658 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:18 +0200
Subject: [PATCH 0557/3724] python3Packages.aionotion: 2024.03.0 -> 2025.02.0

https://github.com/bachya/aionotion/releases/tag/2025.02.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/aionotion/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix
index fb7ab4d6bad1..26fa8135038f 100644
--- a/pkgs/development/python-modules/aionotion/default.nix
+++ b/pkgs/development/python-modules/aionotion/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "aionotion";
-  version = "2024.03.0";
+  version = "2025.02.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "bachya";
     repo = "aionotion";
     tag = version;
-    hash = "sha256-BsbfLb5wCVxR8v2U2Zzt7LMl7XJcZWfVjZN47VDkhFc=";
+    hash = "sha256-MqH3CPp+dAX5DXtnHio95KGQ+Ok2TXrX6rn/AMx5OsY=";
   };
 
   nativeBuildInputs = [ poetry-core ];
@@ -61,7 +61,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library for Notion Home Monitoring";
     homepage = "https://github.com/bachya/aionotion";
-    changelog = "https://github.com/bachya/aionotion/releases/tag/${version}";
+    changelog = "https://github.com/bachya/aionotion/releases/tag/${src.tag}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From 6e11fc7ca84f0850914ae4183731fb3446eaa068 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:19 +0200
Subject: [PATCH 0558/3724] python3Packages.aiortm: 0.10.0 -> 0.11.0

https://github.com/MartinHjelmare/aiortm/blob/v0.11.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/aiortm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix
index 4bc009caa27c..a55633c9f229 100644
--- a/pkgs/development/python-modules/aiortm/default.nix
+++ b/pkgs/development/python-modules/aiortm/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "aiortm";
-  version = "0.10.0";
+  version = "0.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiortm";
     tag = "v${version}";
-    hash = "sha256-YclrU24eyk88eOc/nlgeWJ/Fo9SveCzRqQCKYAA9Y9s=";
+    hash = "sha256-KghKxaa1MhNH13NdUpDiT5h8ZEj5aWLUVhvQKvLC+oM=";
   };
 
   pythonRelaxDeps = [ "typer" ];
@@ -57,7 +57,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library for the Remember the Milk API";
     homepage = "https://github.com/MartinHjelmare/aiortm";
-    changelog = "https://github.com/MartinHjelmare/aiortm/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/MartinHjelmare/aiortm/blob/${src.tag}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
     mainProgram = "aiortm";

From d61ead1d7c277ab52555f3443d6d836f8e734ed7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:21 +0200
Subject: [PATCH 0559/3724] python3Packages.aiosonic: 0.22.0 -> 0.24.0

https://github.com/sonic182/aiosonic/blob/0.24.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/aiosonic/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aiosonic/default.nix b/pkgs/development/python-modules/aiosonic/default.nix
index 4a7872e14464..e1586de94bfb 100644
--- a/pkgs/development/python-modules/aiosonic/default.nix
+++ b/pkgs/development/python-modules/aiosonic/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "aiosonic";
-  version = "0.22.0";
+  version = "0.24.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "sonic182";
     repo = "aiosonic";
     tag = version;
-    hash = "sha256-wBYGiSTSRhi11uqTyGgF1YpnBVoDraCr2GKC8VkQEWc=";
+    hash = "sha256-Yh1AD/tBHQBpwAA86XuP9UuXnCAFcMw/XSv6z46XP0k=";
   };
 
   postPatch = ''
@@ -113,7 +113,7 @@ buildPythonPackage rec {
     ];
 
   meta = {
-    changelog = "https://github.com/sonic182/aiosonic/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/sonic182/aiosonic/blob/${src.tag}/CHANGELOG.md";
     description = "Very fast Python asyncio http client";
     license = lib.licenses.mit;
     homepage = "https://github.com/sonic182/aiosonic";

From cda9903ed1a8f29209ed28d8fbce19e35052cfa4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:22 +0200
Subject: [PATCH 0560/3724] python3Packages.aiosql: 13.3 -> 13.4

https://github.com/nackjicholson/aiosql/releases/tag/13.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/aiosql/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix
index 4528d603b2a3..1c233d8f9f2c 100644
--- a/pkgs/development/python-modules/aiosql/default.nix
+++ b/pkgs/development/python-modules/aiosql/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiosql";
-  version = "13.3";
+  version = "13.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "nackjicholson";
     repo = "aiosql";
     tag = version;
-    hash = "sha256-FCCS91nH/HPhez+bJE7+JoFW4hKkXMdY4bAaEOZ06jU=";
+    hash = "sha256-a3pRzcDMXdaDs0ub6k5bPRwnk+RCbxZ7ceIt8/fMSPg=";
   };
 
   sphinxRoot = "docs/source";
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Simple SQL in Python";
     homepage = "https://nackjicholson.github.io/aiosql/";
-    changelog = "https://github.com/nackjicholson/aiosql/releases/tag/${version}";
+    changelog = "https://github.com/nackjicholson/aiosql/releases/tag/${src.tag}";
     license = with licenses; [ bsd2 ];
     maintainers = with maintainers; [ kaction ];
   };

From 839d6885f1c92a80d4edd91e772b30b0fa33f377 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:23 +0200
Subject: [PATCH 0561/3724] python3Packages.aiostream: 0.6.4 -> 0.7.0

https://github.com/vxgmichel/aiostream/releases/tag/v0.7.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/aiostream/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix
index 3d4bbd2dc63b..de2b2fec0067 100644
--- a/pkgs/development/python-modules/aiostream/default.nix
+++ b/pkgs/development/python-modules/aiostream/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "aiostream";
-  version = "0.6.4";
+  version = "0.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "vxgmichel";
     repo = "aiostream";
     tag = "v${version}";
-    hash = "sha256-hRbPK1JsB/JQuSjj81YMUAI8eDUyXCOFhdW22ZJ47xU=";
+    hash = "sha256-oOx1LG3UyMJRm/HvmrHT00jTp3+XzmvS2XRH4BJNyPE=";
   };
 
   build-system = [ setuptools ];
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Generator-based operators for asynchronous iteration";
     homepage = "https://aiostream.readthedocs.io";
-    changelog = "https://github.com/vxgmichel/aiostream/releases/tag/v${version}";
+    changelog = "https://github.com/vxgmichel/aiostream/releases/tag/${src.tag}";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ rmcgibbo ];
   };

From 6ca4b4658e52218e6348d03fb6f93d6bfac318f1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:25 +0200
Subject: [PATCH 0562/3724] python3Packages.albucore: 0.0.24 -> 0.0.33

https://github.com/albumentations-team/albucore/releases/tag/0.0.33

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/albucore/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix
index 4ca66b260401..6a4491840858 100644
--- a/pkgs/development/python-modules/albucore/default.nix
+++ b/pkgs/development/python-modules/albucore/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "albucore";
-  version = "0.0.24";
+  version = "0.0.33";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "albumentations-team";
     repo = "albucore";
     tag = version;
-    hash = "sha256-frVMPW3au/6vPRY89GIt7chCPkUMl13DpPqCPqIjz/o=";
+    hash = "sha256-OQYIvJM3pLna5rr1H7pVDhUR9sLmx032AZ9SWXQqMjc=";
   };
 
   pythonRelaxDeps = [ "opencv-python" ];
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = {
     description = "High-performance image processing library to optimize and extend Albumentations with specialized functions for image transformations";
     homepage = "https://github.com/albumentations-team/albucore";
-    changelog = "https://github.com/albumentations-team/albucore/releases/tag/${version}";
+    changelog = "https://github.com/albumentations-team/albucore/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bcdarwin ];
   };

From d58ef1a5aba4fafc52c905764aa2c64d3393dddd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:26 +0200
Subject: [PATCH 0563/3724] python3Packages.alembic: 1.15.2 -> 1.16.4

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/alembic/default.nix        | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 3ea57cab5cea..1962325dc373 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -2,34 +2,30 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
 
   # build-system
   setuptools,
 
   # dependencies
-  importlib-metadata,
-  importlib-resources,
   mako,
   sqlalchemy,
   typing-extensions,
 
   # tests
-  pytest7CheckHook,
+  black,
+  pytestCheckHook,
   pytest-xdist,
   python-dateutil,
 }:
 
 buildPythonPackage rec {
   pname = "alembic";
-  version = "1.15.2";
+  version = "1.16.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HHI5G73v/M/jF+77pobLmjwHgAVHiIVBO5XDsmxXqKc=";
+    hash = "sha256-76tq2g3Q+uLJIGCADgv1wdwmrxWhDgL7S6v/FktHJeI=";
   };
 
   build-system = [ setuptools ];
@@ -38,16 +34,13 @@ buildPythonPackage rec {
     mako
     sqlalchemy
     typing-extensions
-  ]
-  ++ lib.optionals (pythonOlder "3.9") [
-    importlib-resources
-    importlib-metadata
   ];
 
   pythonImportsCheck = [ "alembic" ];
 
   nativeCheckInputs = [
-    pytest7CheckHook
+    black
+    pytestCheckHook
     pytest-xdist
     python-dateutil
   ];

From 5711a4d92940afe06da1db1fcbd1219f1f0b3334 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:28 +0200
Subject: [PATCH 0564/3724] python3Packages.allure-behave: 2.13.5 -> 2.15.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/allure-behave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix
index 4b80c97c8777..8dcc076cab59 100644
--- a/pkgs/development/python-modules/allure-behave/default.nix
+++ b/pkgs/development/python-modules/allure-behave/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "allure-behave";
-  version = "2.13.5";
+  version = "2.15.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-M4yizHOV0e491y9dfZLYkg8a3g4H3evGN7OOYeBtyNw=";
+    hash = "sha256-puJuaeA6uFJRF1ZS7jWY55Mmk2Y4SQiuhZGEGi7yexs=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From d1c9b2171f081da04e63fe4b4464b1cdcd216e39 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:29 +0200
Subject: [PATCH 0565/3724] python3Packages.allure-pytest: 2.13.5 -> 2.15.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/allure-pytest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/allure-pytest/default.nix b/pkgs/development/python-modules/allure-pytest/default.nix
index 88fc7054f1e6..6eaec2b6e5ad 100644
--- a/pkgs/development/python-modules/allure-pytest/default.nix
+++ b/pkgs/development/python-modules/allure-pytest/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "allure-pytest";
-  version = "2.13.5";
+  version = "2.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-DvjheQxEqYjba4PE1PXpFFHixMjqEGAd+ohSjSOvz24=";
+    hash = "sha256-uPRk07/rbLXmp35w6s0ao3YhM2d8q+zlegfJ87zUseg=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 7c29b9bde8edd955e453a2bb2ae84830c7596bea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:30 +0200
Subject: [PATCH 0566/3724] python3Packages.allure-python-commons-test: 2.13.5
 -> 2.15.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/allure-python-commons-test/default.nix  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/allure-python-commons-test/default.nix b/pkgs/development/python-modules/allure-python-commons-test/default.nix
index 5a4f5049d9cc..764641b7c6bb 100644
--- a/pkgs/development/python-modules/allure-python-commons-test/default.nix
+++ b/pkgs/development/python-modules/allure-python-commons-test/default.nix
@@ -12,12 +12,13 @@
 
 buildPythonPackage rec {
   pname = "allure-python-commons-test";
-  version = "2.13.5";
+  version = "2.15.0";
   format = "setuptools";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-pWkLVfBrLEhdhuTE95K3aqrhEY2wEyo5uRzuJC3ngjE=";
+    pname = "allure_python_commons_test";
+    inherit version;
+    hash = "sha256-5l/9K6ToYEGaYXOmVxB188wu9gQ+2cMHxfVNlX8Rz9g=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From f2a3040c5f1da1c1b9f18646bd22a170b5a8727e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:31 +0200
Subject: [PATCH 0567/3724] python3Packages.allure-python-commons: 2.13.5 ->
 2.15.0

This commit was automatically generated using update-python-libraries.
---
 .../allure-python-commons/default.nix         | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/allure-python-commons/default.nix b/pkgs/development/python-modules/allure-python-commons/default.nix
index 30881b90f3fd..57571c89095c 100644
--- a/pkgs/development/python-modules/allure-python-commons/default.nix
+++ b/pkgs/development/python-modules/allure-python-commons/default.nix
@@ -13,30 +13,22 @@
 
 buildPythonPackage rec {
   pname = "allure-python-commons";
-  version = "2.13.5";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "2.15.0";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ojLnlVgR+Yjkmkwd1sFszn6bgdDqBCKx5WVNMlTiyvM=";
+    pname = "allure_python_commons";
+    inherit version;
+    hash = "sha256-T2Oci7S3nfDZTxuqiHgsk5m+P0X9g5rlg6MUpdRRuXg=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     pluggy
-    six
-    allure-python-commons-test
   ];
 
-  checkPhase = ''
-    ${python.interpreter} -m doctest ./src/utils.py
-    ${python.interpreter} -m doctest ./src/mapping.py
-  '';
-
   pythonImportsCheck = [
     "allure"
     "allure_commons"

From 2157043be11ccd3b72ee1811a26ad16a97a6d148 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:32 +0200
Subject: [PATCH 0568/3724] python3Packages.amazon-kclpy: 3.0.1 -> 3.1.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/amazon-kclpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/amazon-kclpy/default.nix b/pkgs/development/python-modules/amazon-kclpy/default.nix
index 591ee5568390..3c039de4dbab 100644
--- a/pkgs/development/python-modules/amazon-kclpy/default.nix
+++ b/pkgs/development/python-modules/amazon-kclpy/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "amazon-kclpy";
-  version = "3.0.1";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "amazon-kinesis-client-python";
     tag = "v${version}";
-    hash = "sha256-P/kYRFDmWcqvnAaKYx22PwtC51JlYB0qopO3+QuRHAk=";
+    hash = "sha256-nboEZwRlhbr176H4b6ESm3LfVZCoKz3yKrQptERsLgg=";
   };
 
   patches = [

From 80822396403f9a40791f32b17d816ea774ebca23 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:33 +0200
Subject: [PATCH 0569/3724] python3Packages.amcrest: 1.9.8 -> 1.9.9

https://github.com/tchellomello/python-amcrest/releases/tag/1.9.9

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/amcrest/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix
index b3fd5616ea92..2d48513f3fd3 100644
--- a/pkgs/development/python-modules/amcrest/default.nix
+++ b/pkgs/development/python-modules/amcrest/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module for Amcrest and Dahua Cameras";
     homepage = "https://github.com/tchellomello/python-amcrest";
-    changelog = "https://github.com/tchellomello/python-amcrest/releases/tag/${version}";
+    changelog = "https://github.com/tchellomello/python-amcrest/releases/tag/${src.tag}";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ fab ];
   };

From 57c4c643356017aba400db5946413f5dc7899fd2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:34 +0200
Subject: [PATCH 0570/3724] python3Packages.anndata: 0.11.4 -> 0.12.1

https://github.com/scverse/anndata/blob/main/docs/release-notes/0.12.1.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/anndata/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/anndata/default.nix b/pkgs/development/python-modules/anndata/default.nix
index dac4af2f18d0..de98a116f529 100644
--- a/pkgs/development/python-modules/anndata/default.nix
+++ b/pkgs/development/python-modules/anndata/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "anndata";
-  version = "0.11.4";
+  version = "0.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scverse";
     repo = "anndata";
     tag = version;
-    hash = "sha256-9RDR0veZ8n2sq0kUbAkS2nP57u47cQxmubzuWWYBKBY=";
+    hash = "sha256-vxyRJ77PIkRIyl4aTQggXSQVoMKLQe3mCA5H3W/wmN8=";
   };
 
   build-system = [
@@ -148,7 +148,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "anndata" ];
 
   meta = {
-    changelog = "https://github.com/scverse/anndata/blob/main/docs/release-notes/${version}.md";
+    changelog = "https://github.com/scverse/anndata/blob/main/docs/release-notes/${src.tag}.md";
     description = "Python package for handling annotated data matrices in memory and on disk";
     homepage = "https://anndata.readthedocs.io/";
     license = lib.licenses.bsd3;

From e7590d6f1a00e35da19266c3edd484aca04fd119 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:35 +0200
Subject: [PATCH 0571/3724] python3Packages.annotatedyaml: 0.4.5 -> 1.0.0

https://github.com/home-assistant-libs/annotatedyaml/blob/v1.0.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/annotatedyaml/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/annotatedyaml/default.nix b/pkgs/development/python-modules/annotatedyaml/default.nix
index dc790ed0902b..16d589e587e0 100644
--- a/pkgs/development/python-modules/annotatedyaml/default.nix
+++ b/pkgs/development/python-modules/annotatedyaml/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "annotatedyaml";
-  version = "0.4.5";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "annotatedyaml";
     tag = "v${version}";
-    hash = "sha256-AmgM5KF8O8/rkR/9PmTzcyQaSlEDcYBDDRq5ujwANR0=";
+    hash = "sha256-bVXhKm69A5FIXYY2yq7jXPIK7lSCQD20a3oX1GdqOLY=";
   };
 
   build-system = [
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   meta = {
     description = "Annotated YAML that supports secrets for Python";
     homepage = "https://github.com/home-assistant-libs/annotatedyaml";
-    changelog = "https://github.com/home-assistant-libs/annotatedyaml/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/home-assistant-libs/annotatedyaml/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };

From 7f7fb4e90969a853922d3b1f1ca7888edf50d1a1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:41 +0200
Subject: [PATCH 0572/3724] python3Packages.anthropic: 0.59.0 -> 0.60.0

https://github.com/anthropics/anthropic-sdk-python/releases/tag/v0.60.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/anthropic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix
index 00073ddaf14d..397c4f6e3bfa 100644
--- a/pkgs/development/python-modules/anthropic/default.nix
+++ b/pkgs/development/python-modules/anthropic/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "anthropic";
-  version = "0.59.0";
+  version = "0.60.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthropics";
     repo = "anthropic-sdk-python";
     tag = "v${version}";
-    hash = "sha256-JUgJB0+9zfmj3asjn7FOozNB9STkKEvObbTP3KLDV+M=";
+    hash = "sha256-NwwZjpamBtRHYs/k+i2TfydTEzU2aB5+IxkONXlCqEk=";
   };
 
   postPatch = ''

From 09b5bdb6c15054b625cded90081c40e6b07b2041 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:42 +0200
Subject: [PATCH 0573/3724] python3Packages.anyio: 4.9.0 -> 4.10.0

https://github.com/agronholm/anyio/blob/4.10.0/docs/versionhistory.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/anyio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index afe573ab3feb..99fd7ff5dcab 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "anyio";
-  version = "4.9.0";
+  version = "4.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "agronholm";
     repo = "anyio";
     tag = version;
-    hash = "sha256-kISaBHDkMOYYU9sdiQAXiq3jp1ehWOYFpvFbuceBWB0=";
+    hash = "sha256-9nOGQTqdO3VzA9c97BpZqqwpll5O5+3gRvF/l2Y2ars=";
   };
 
   build-system = [ setuptools-scm ];

From 2285a75f1fedc76c5fb58b273be4e3785004fdd0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:43 +0200
Subject: [PATCH 0574/3724] python3Packages.apache-beam: 2.65.0 -> 2.66.0

https://github.com/apache/beam/blob/release-v2.66.0/CHANGES.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/apache-beam/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix
index 73c85297671d..f13ce79961f7 100644
--- a/pkgs/development/python-modules/apache-beam/default.nix
+++ b/pkgs/development/python-modules/apache-beam/default.nix
@@ -62,14 +62,14 @@
 
 buildPythonPackage rec {
   pname = "apache-beam";
-  version = "2.65.0";
+  version = "2.66.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "beam";
     tag = "v${version}";
-    hash = "sha256-vDW0PVNep+egIZBe4t8IPwLgsQDmoO4rrA4wUoAHzfg=";
+    hash = "sha256-nRofy9pvhO5SUvkIk73ViFm1gPWxEhj1rAUeCVYIpYs=";
   };
 
   pythonRelaxDeps = [
@@ -372,7 +372,7 @@ buildPythonPackage rec {
   meta = {
     description = "Unified model for defining both batch and streaming data-parallel processing pipelines";
     homepage = "https://beam.apache.org/";
-    changelog = "https://github.com/apache/beam/blob/release-${version}/CHANGES.md";
+    changelog = "https://github.com/apache/beam/blob/release-${src.tag}/CHANGES.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ ndl ];
   };

From 503975fba6b7df14a311bca812bfdbfcf108ffcf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:45 +0200
Subject: [PATCH 0575/3724] python3Packages.apycula: 0.18 -> 0.21

https://github.com/YosysHQ/apicula/releases/tag/0.21

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/apycula/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix
index d3029efed1bd..2d882dc92005 100644
--- a/pkgs/development/python-modules/apycula/default.nix
+++ b/pkgs/development/python-modules/apycula/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "apycula";
-  version = "0.18";
+  version = "0.21";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "Apycula";
-    hash = "sha256-nUaXnx4xFNH5wKZRaFXt0uLAgLm5/dTSKhiZQoSL8pg=";
+    hash = "sha256-rh+1U1bqyrX3Mv1HUl22ykUHx5Zaq59suc7ZVAOi0mo=";
   };
 
   build-system = [ setuptools-scm ];

From 153dc5deb8341652f5e3e999d205cd0786e14d94 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:46 +0200
Subject: [PATCH 0576/3724] python3Packages.arcam-fmj: 1.8.2 -> 2.0.0

https://github.com/elupus/arcam_fmj/releases/tag/2.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/arcam-fmj/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix
index b626683a1188..94ce7ed66ada 100644
--- a/pkgs/development/python-modules/arcam-fmj/default.nix
+++ b/pkgs/development/python-modules/arcam-fmj/default.nix
@@ -8,6 +8,7 @@
   aiohttp,
   attrs,
   defusedxml,
+  pytest-asyncio_0,
   pytest-aiohttp,
   pytest-mock,
   pytestCheckHook,
@@ -15,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "arcam-fmj";
-  version = "1.8.2";
+  version = "2.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +25,7 @@ buildPythonPackage rec {
     owner = "elupus";
     repo = "arcam_fmj";
     tag = version;
-    hash = "sha256-iks3ENcv7OtU30kZyG6Z7bG/WrYQQLbfXP55IkltmaE=";
+    hash = "sha256-OiBTlAcSLhaMWbp5k+0yU1amSpLKnJA+3Q56lyiSDUA=";
   };
 
   build-system = [ setuptools ];
@@ -36,6 +37,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    pytest-asyncio_0
     pytest-aiohttp
     pytest-mock
     pytestCheckHook
@@ -65,7 +67,7 @@ buildPythonPackage rec {
     description = "Python library for speaking to Arcam receivers";
     mainProgram = "arcam-fmj";
     homepage = "https://github.com/elupus/arcam_fmj";
-    changelog = "https://github.com/elupus/arcam_fmj/releases/tag/${version}";
+    changelog = "https://github.com/elupus/arcam_fmj/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };

From 2558ac7c3ea4a6d9c4460b63dced3d501353ad19 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:47 +0200
Subject: [PATCH 0577/3724] python3Packages.argon2-cffi-bindings: 21.2.0 ->
 25.1.0

This commit was automatically generated using update-python-libraries.
---
 .../argon2-cffi-bindings/default.nix          | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix
index 0df49f583588..2f9c1b7f70b7 100644
--- a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix
+++ b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix
@@ -1,38 +1,42 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   libargon2,
   cffi,
   setuptools-scm,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "argon2-cffi-bindings";
-  version = "21.2.0";
-  format = "setuptools";
+  version = "25.1.0";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3";
+  src = fetchFromGitHub {
+    owner = "hynek";
+    repo = "argon2-cffi-bindings";
+    tag = version;
+    hash = "sha256-UDPxwqEpsmByAPM7lz3cxZz8jWwCEdghPlKXt8zQrfc=";
   };
 
   buildInputs = [ libargon2 ];
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools-scm
     cffi
   ];
 
-  propagatedBuildInputs = [ cffi ];
+  dependencies = [ cffi ];
 
   env.ARGON2_CFFI_USE_SYSTEM = 1;
 
-  # tarball doesn't include tests, but the upstream tests are minimal
-  doCheck = false;
+  nativeCheckInputs = [ pytestCheckHook ];
+
   pythonImportsCheck = [ "_argon2_cffi_bindings" ];
 
   meta = with lib; {
+    changelog = "https://github.com/hynek/argon2-cffi-bindings/releases/tag/${src.tag}";
     description = "Low-level CFFI bindings for Argon2";
     homepage = "https://github.com/hynek/argon2-cffi-bindings";
     license = licenses.mit;

From 82f454801fa6636f0d384a9f38ce788c441d8857 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:48 +0200
Subject: [PATCH 0578/3724] python3Packages.argon2-cffi: 23.1.0 -> 25.1.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/argon2-cffi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/argon2-cffi/default.nix b/pkgs/development/python-modules/argon2-cffi/default.nix
index 2ab26082ad16..ec4b5a4f9c37 100644
--- a/pkgs/development/python-modules/argon2-cffi/default.nix
+++ b/pkgs/development/python-modules/argon2-cffi/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "argon2-cffi";
-  version = "23.1.0";
+  version = "25.1.0";
   format = "pyproject";
 
   src = fetchPypi {
     pname = "argon2_cffi";
     inherit version;
-    hash = "sha256-h5w+eaJynOdo67fTbUYJ46eKTKLsOp8SKGygV+PQ2wg=";
+    hash = "sha256-aUrlzIpC9MTivyyg5k5R4joEDGpReoUHRoPTlZ4TRsE=";
   };
 
   nativeBuildInputs = [

From bb64dee2d041218347077c30069389ae65277153 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:49 +0200
Subject: [PATCH 0579/3724] python3Packages.argos-translate-files: 1.2.0 ->
 1.4.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/argos-translate-files/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/argos-translate-files/default.nix b/pkgs/development/python-modules/argos-translate-files/default.nix
index be863989ac97..933238b68cba 100644
--- a/pkgs/development/python-modules/argos-translate-files/default.nix
+++ b/pkgs/development/python-modules/argos-translate-files/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "argos-translate-files";
-  version = "1.2.0";
+  version = "1.4.0";
 
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-vIwZ2jdrBXtz6gG+Zfgqq6HVfdzmQf7nLqCDaQZT4js=";
+    hash = "sha256-vKnPL0xgyJ1vYtB2AgnKv4BqigSiFYmIm5HBq4hQ7nI=";
   };
 
   propagatedBuildInputs = [

From 8b4d796cab20e15e02d033ba9a984a5c73e2d5e4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:50 +0200
Subject: [PATCH 0580/3724] python3Packages.array-api-compat: 1.11.2 -> 1.12

https://github.com/data-apis/array-api-compat/releases/tag/1.12

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/array-api-compat/default.nix        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/array-api-compat/default.nix b/pkgs/development/python-modules/array-api-compat/default.nix
index e38443513a14..778fb21a861a 100644
--- a/pkgs/development/python-modules/array-api-compat/default.nix
+++ b/pkgs/development/python-modules/array-api-compat/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   pytestCheckHook,
   setuptools,
+  setuptools-scm,
   numpy,
   jaxlib,
   jax,
@@ -18,17 +19,20 @@
 
 buildPythonPackage rec {
   pname = "array-api-compat";
-  version = "1.11.2";
+  version = "1.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "data-apis";
     repo = "array-api-compat";
     tag = version;
-    hash = "sha256-qGf1XDhRx9hJJP0LcZF7lA8tl+LKYNCw0xTqGjsZYj8=";
+    hash = "sha256-Hb0bFjVMl4CBI3gN3abTO2QUPAOvUaFE0GdPjdops5E=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook

From 5d6fdedc202f2234506277b6f36719153175727b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:52 +0200
Subject: [PATCH 0581/3724] python3Packages.asdf: 4.1.0 -> 4.3.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/asdf/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix
index 847b9eca0a38..d0dc783b7820 100644
--- a/pkgs/development/python-modules/asdf/default.nix
+++ b/pkgs/development/python-modules/asdf/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  aiohttp,
   asdf-standard,
   asdf-transform-schemas,
   attrs,
@@ -16,6 +17,7 @@
   pytestCheckHook,
   pythonOlder,
   pyyaml,
+  requests,
   semantic-version,
   setuptools,
   setuptools-scm,
@@ -23,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "asdf";
-  version = "4.1.0";
+  version = "4.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,7 +34,7 @@ buildPythonPackage rec {
     owner = "asdf-format";
     repo = "asdf";
     tag = version;
-    hash = "sha256-h7OkLq9+sW507Va22cF0eez6xrI7iIaLV5D7EZFWxJQ=";
+    hash = "sha256-sCjDZ/6KiFH9LbdDpco8z1xRgJe0dm0HVhpRbO51RDI=";
   };
 
   build-system = [
@@ -53,11 +55,13 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    aiohttp
     fsspec
     lz4
     psutil
     pytest-remotedata
     pytestCheckHook
+    requests
   ];
 
   disabledTests = [

From b58c758dd8f71adea8a9af8c97c66cb09a040526 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:54 +0200
Subject: [PATCH 0582/3724] python3Packages.astropy-iers-data:
 0.2025.3.31.0.36.18 -> 0.2025.8.4.0.42.59

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/astropy-iers-data/default.nix  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix
index f9a3e1f5783d..e7fd9b9ec84f 100644
--- a/pkgs/development/python-modules/astropy-iers-data/default.nix
+++ b/pkgs/development/python-modules/astropy-iers-data/default.nix
@@ -2,28 +2,25 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
-  setuptools,
-  setuptools-scm,
+  hatchling,
+  hatch-vcs,
 }:
 
 buildPythonPackage rec {
   pname = "astropy-iers-data";
-  version = "0.2025.3.31.0.36.18";
+  version = "0.2025.8.4.0.42.59";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "astropy";
     repo = "astropy-iers-data";
     tag = "v${version}";
-    hash = "sha256-51U5QStpzTGwg1MC1NJPMnothjF3Aa7j3dxiRUfnqDE=";
+    hash = "sha256-Izqm626PZzjnMNUzPW2x15ER7fn5f9+m2X434vXV/yo=";
   };
 
   build-system = [
-    setuptools
-    setuptools-scm
+    hatchling
+    hatch-vcs
   ];
 
   pythonImportsCheck = [ "astropy_iers_data" ];

From 952226dd8aa61360c57d36a73ae61e47b1313269 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:55 +0200
Subject: [PATCH 0583/3724] python3Packages.astropy: 7.0.1 -> 7.1.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/astropy/default.nix        |  8 ++---
 .../test_z_at_value_numpyvectorize.patch      | 33 -------------------
 2 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/development/python-modules/astropy/test_z_at_value_numpyvectorize.patch

diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index bb643c6742ea..d8751b9e6c7d 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -52,20 +52,16 @@
 
 buildPythonPackage rec {
   pname = "astropy";
-  version = "7.0.1";
+  version = "7.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OS/utEOyQ3zUwuBkGmXg8VunkeFI6bHl7X3n38s45GA=";
+    hash = "sha256-yPJUMiKVsbjPJDA9bxVb9+/bbBKCiCuWbOMEDv+MU8U=";
   };
 
-  patches = [
-    ./test_z_at_value_numpyvectorize.patch
-  ];
-
   env = lib.optionalAttrs stdenv.cc.isClang {
     NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument";
   };
diff --git a/pkgs/development/python-modules/astropy/test_z_at_value_numpyvectorize.patch b/pkgs/development/python-modules/astropy/test_z_at_value_numpyvectorize.patch
deleted file mode 100644
index 5ffa586d06d5..000000000000
--- a/pkgs/development/python-modules/astropy/test_z_at_value_numpyvectorize.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9a7f821351f0870608b2fa3e1be31bda70707913 Mon Sep 17 00:00:00 2001
-From: "P. L. Lim" <2090236+pllim@users.noreply.github.com>
-Date: Fri, 2 May 2025 13:49:06 -0400
-Subject: [PATCH] TST: xfail test_z_at_value_numpyvectorize for numpy 2.3.dev
- and later until we can fix the underlying issue
-
-Originally this is
-https://github.com/astropy/astropy/commit/9fce0d46c5e1807d7e1030c3cb0b1a9c0a359dd9
-but the path to the file has changed since the release currently in nixpkgs.
----
- astropy/cosmology/_src/tests/funcs/test_funcs.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/astropy/cosmology/funcs/tests/test_funcs.py
-+++ b/astropy/cosmology/funcs/tests/test_funcs.py
-@@ -31,6 +31,7 @@
- )
- from astropy.cosmology._src.funcs.optimize import _z_at_scalar_value
- from astropy.units import allclose
-+from astropy.utils.compat import NUMPY_LT_2_3
- from astropy.utils.compat.optional_deps import HAS_SCIPY
- from astropy.utils.exceptions import AstropyUserWarning
- 
-@@ -173,6 +174,9 @@ def test_scalar_input_to_output(self):
- 
- 
- @pytest.mark.skipif(not HAS_SCIPY, reason="test requires scipy")
-+@pytest.mark.xfail(
-+    not NUMPY_LT_2_3, reason="TODO fix: https://github.com/astropy/astropy/issues/18045"
-+)
- def test_z_at_value_numpyvectorize():
-     """Test that numpy vectorize fails on Quantities.
- 

From d898ec8751b7512d0588110679e24d7e6e75644f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:58 +0200
Subject: [PATCH 0584/3724] python3Packages.asyncssh: 2.20.0 -> 2.21.0

https://github.com/ronf/asyncssh/blob/v2.21.0/docs/changes.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/asyncssh/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index adc123e7e013..76216913df50 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "asyncssh";
-  version = "2.20.0";
+  version = "2.21.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AgtuOEsjKO+Gg5CK2Oc96ewrm2L9lkVx6pV7uphBKYM=";
+    hash = "sha256-RQ/hO7jYao9OfXtfr853kRgco+fJLhW7xF37JYZuSLM=";
   };
 
   build-system = [ setuptools ];
@@ -81,6 +81,8 @@ buildPythonPackage rec {
     "test_connect_timeout_exceeded"
     # Fails in the sandbox
     "test_forward_remote"
+    # (2.21.0) SFTP copy ends up with an empty file
+    "test_copy_max_requests"
   ];
 
   pythonImportsCheck = [ "asyncssh" ];

From 208d865f5993a29077d219220851bf52b51f16dc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:34:59 +0200
Subject: [PATCH 0585/3724] python3Packages.asyncua: 1.1.5 -> 1.1.6

https://github.com/FreeOpcUa/opcua-asyncio/releases/tag/v1.1.6

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/asyncua/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix
index 4102aa6bd30f..6e77e4b1d1b2 100644
--- a/pkgs/development/python-modules/asyncua/default.nix
+++ b/pkgs/development/python-modules/asyncua/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "asyncua";
-  version = "1.1.5";
+  version = "1.1.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "FreeOpcUa";
     repo = "opcua-asyncio";
     tag = "v${version}";
-    hash = "sha256-XXjzYDOEBdA4uk0VCzscHrPCY2Lgin0JBAVDdxmSOio=";
+    hash = "sha256-GxjEbzPvley0EL7xuZWr1jzR9Lpui1fVL2FOWnRL34Q=";
     fetchSubmodules = true;
   };
 
@@ -83,7 +83,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "OPC UA / IEC 62541 Client and Server for Python";
     homepage = "https://github.com/FreeOpcUa/opcua-asyncio";
-    changelog = "https://github.com/FreeOpcUa/opcua-asyncio/releases/tag/v${version}";
+    changelog = "https://github.com/FreeOpcUa/opcua-asyncio/releases/tag/${src.tag}";
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ harvidsen ];
   };

From 0ca97483b6c30682246e21bb0a53dbda596f69c3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:00 +0200
Subject: [PATCH 0586/3724] python3Packages.atopile: 0.2.69 -> 0.11.1

https://github.com/atopile/atopile/releases/tag/v0.11.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/atopile/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix
index 8f43b9091078..66fc8d1b4e88 100644
--- a/pkgs/development/python-modules/atopile/default.nix
+++ b/pkgs/development/python-modules/atopile/default.nix
@@ -47,14 +47,14 @@
 
 buildPythonPackage rec {
   pname = "atopile";
-  version = "0.2.69";
+  version = "0.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "atopile";
     repo = "atopile";
     tag = "v${version}";
-    hash = "sha256-mQYnaWch0lVzz1hV6WboYxBGe3ruw+mK2AwMx13DQJM=";
+    hash = "sha256-rf8dWeZYnL0Ce4TDEyediYN+jc+StsGZrpp9OohSz8g=";
   };
 
   build-system = [
@@ -118,7 +118,7 @@ buildPythonPackage rec {
     description = "Design circuit boards with code";
     homepage = "https://aiopg.readthedocs.io/";
     downloadPage = "https://github.com/atopile/atopile";
-    changelog = "https://github.com/atopile/atopile/releases/tag/${src.rev}";
+    changelog = "https://github.com/atopile/atopile/releases/tag/${src.tag}";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ sigmanificient ];
     mainProgram = "ato";

From 111070854325fc8104eec56f92a9cdcc51a48e52 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:02 +0200
Subject: [PATCH 0587/3724] python3Packages.automat: 24.8.1 -> 25.4.16

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/automat/default.nix          | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix
index 76bfc2a42dd4..878c37ee0398 100644
--- a/pkgs/development/python-modules/automat/default.nix
+++ b/pkgs/development/python-modules/automat/default.nix
@@ -2,29 +2,26 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  attrs,
+  hatch-vcs,
   pytest-benchmark,
   pytestCheckHook,
-  setuptools-scm,
-  six,
+  setuptools,
 }:
 
 let
   automat = buildPythonPackage rec {
-    version = "24.8.1";
+    version = "25.4.16";
     format = "pyproject";
     pname = "automat";
 
     src = fetchPypi {
       inherit pname version;
-      hash = "sha256-s0Inz2P2MluK0jme3ngGdQg+Q5sgwyPTdjc9juYwbYg=";
+      hash = "sha256-ABdZGlR3Bm6Q0msOaW3cFDuq/Ye1iM+sgQC8a+ljTeA=";
     };
 
-    nativeBuildInputs = [ setuptools-scm ];
-
-    propagatedBuildInputs = [
-      six
-      attrs
+    build-system = [
+      setuptools
+      hatch-vcs
     ];
 
     nativeCheckInputs = [

From 86db5f1a30705f611091959f03c130a056308d35 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:03 +0200
Subject: [PATCH 0588/3724] python3Packages.avidtools: 0.1.2 -> 0.2.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/avidtools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/avidtools/default.nix b/pkgs/development/python-modules/avidtools/default.nix
index 3b58583c4fd2..0326b2add22d 100644
--- a/pkgs/development/python-modules/avidtools/default.nix
+++ b/pkgs/development/python-modules/avidtools/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "avidtools";
-  version = "0.1.2";
+  version = "0.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2YtX+kUryTwaQ4QvExw5OJ4Rx8JoTzBeC8VSyNEL7OY=";
+    hash = "sha256-rYkA/+YfFhrS/WSx+jUWCsXDjp03aMoMiGdXeK3Kf4M=";
   };
 
   postPatch = ''

From db53439c2ef9f756fc981ea6bc5fcb820a189031 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:04 +0200
Subject: [PATCH 0589/3724] python3Packages.awesomeversion: 24.6.0 -> 25.8.0

https://github.com/ludeeus/awesomeversion/releases/tag/25.8.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/awesomeversion/default.nix        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix
index 001ddf58a9a1..70e9f56b430e 100644
--- a/pkgs/development/python-modules/awesomeversion/default.nix
+++ b/pkgs/development/python-modules/awesomeversion/default.nix
@@ -3,14 +3,15 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
-  poetry-core,
+  hatchling,
+  pytest-codspeed,
   pytest-snapshot,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "awesomeversion";
-  version = "24.6.0";
+  version = "25.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +20,7 @@ buildPythonPackage rec {
     owner = "ludeeus";
     repo = "awesomeversion";
     tag = version;
-    hash = "sha256-lpG42Be0MVinWX5MyDvBPdoZFx66l6tpUxpAJRqEf88=";
+    hash = "sha256-2CEuJagUkYwtjzpQLYLlz+V5e2feEU6di3wI0+uWuy4=";
   };
 
   postPatch = ''
@@ -28,11 +29,12 @@ buildPythonPackage rec {
       --replace-fail 'version = "0"' 'version = "${version}"'
   '';
 
-  nativeBuildInputs = [ poetry-core ];
+  nativeBuildInputs = [ hatchling ];
 
   pythonImportsCheck = [ "awesomeversion" ];
 
   nativeCheckInputs = [
+    pytest-codspeed
     pytest-snapshot
     pytestCheckHook
   ];
@@ -40,7 +42,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module to deal with versions";
     homepage = "https://github.com/ludeeus/awesomeversion";
-    changelog = "https://github.com/ludeeus/awesomeversion/releases/tag/${version}";
+    changelog = "https://github.com/ludeeus/awesomeversion/releases/tag/${src.tag}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From 0451f26d856e59ac30a5b7d20aebafb1497344ec Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:07 +0200
Subject: [PATCH 0590/3724] python3Packages.aws-adfs: 2.11.2 -> 2.12.0

https://github.com/venth/aws-adfs/releases/tag/v2.12.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/aws-adfs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix
index ea09c20e51c0..810714b0eba1 100644
--- a/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/pkgs/development/python-modules/aws-adfs/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aws-adfs";
-  version = "2.11.2";
+  version = "2.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "venth";
     repo = "aws-adfs";
     tag = "v${version}";
-    hash = "sha256-ZzQ92VBa8CApd0WkfPrUZsEZICK2fhwmt45P2sx2mK0=";
+    hash = "sha256-TYfKeLe1zp6d5/JPURAcCAfjtaiWHkkmP1+zE+PiiR4=";
   };
 
   build-system = [
@@ -66,7 +66,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Command line tool to ease AWS CLI authentication against ADFS";
     homepage = "https://github.com/venth/aws-adfs";
-    changelog = "https://github.com/venth/aws-adfs/releases/tag/v${version}";
+    changelog = "https://github.com/venth/aws-adfs/releases/tag/${src.tag}";
     license = licenses.psfl;
     maintainers = with maintainers; [ bhipple ];
     mainProgram = "aws-adfs";

From 5b6a8feee8a430f2274454706158de231b45d901 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:08 +0200
Subject: [PATCH 0591/3724] python3Packages.aws-encryption-sdk: 4.0.1 -> 4.0.2

https://github.com/aws/aws-encryption-sdk-python/blob/v4.0.2/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/aws-encryption-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aws-encryption-sdk/default.nix b/pkgs/development/python-modules/aws-encryption-sdk/default.nix
index 178aa2a7d50e..bdfe21d15840 100644
--- a/pkgs/development/python-modules/aws-encryption-sdk/default.nix
+++ b/pkgs/development/python-modules/aws-encryption-sdk/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "aws-encryption-sdk";
-  version = "4.0.1";
+  version = "4.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cyDcTPjY1am0yIo0O+k4NdoYdW4FMI01NlVL4MooiaU=";
+    hash = "sha256-kRqQCYBzLlCbhuBEP+O9zuSAdgpGDg9wLzYFZaIPOIg=";
   };
 
   build-system = [ setuptools ];

From b0ade8079bc84d9b7cb09155bb719d3c6e1957dc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:10 +0200
Subject: [PATCH 0592/3724] python3Packages.aws-lambda-builders: 1.53.0 ->
 1.56.0

https://github.com/aws/aws-lambda-builders/releases/tag/v1.56.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/aws-lambda-builders/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix
index 3f49679b12ae..8f28fc43296b 100644
--- a/pkgs/development/python-modules/aws-lambda-builders/default.nix
+++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aws-lambda-builders";
-  version = "1.53.0";
+  version = "1.56.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "awslabs";
     repo = "aws-lambda-builders";
     tag = "v${version}";
-    hash = "sha256-4OiXri1u4co1cuDm7bLyw8XfMg2S3sKrkPWF2tD8zg8=";
+    hash = "sha256-7fXuDR5AYAtnJapTTJ1QE45aP2l80ao/8RFwM7bgA4w=";
   };
 
   postPatch = ''
@@ -76,7 +76,7 @@ buildPythonPackage rec {
     description = "Tool to compile, build and package AWS Lambda functions";
     mainProgram = "lambda-builders";
     homepage = "https://github.com/awslabs/aws-lambda-builders";
-    changelog = "https://github.com/aws/aws-lambda-builders/releases/tag/v${version}";
+    changelog = "https://github.com/aws/aws-lambda-builders/releases/tag/${src.tag}";
     longDescription = ''
       Lambda Builders is a Python library to compile, build and package
       AWS Lambda functions for several runtimes & frameworks.

From 10a17453711d35fd401effdc38306c017d2244d5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:11 +0200
Subject: [PATCH 0593/3724] python3Packages.aws-sam-translator: 1.98.0 ->
 1.99.0

https://github.com/aws/serverless-application-model/releases/tag/v1.99.0

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/aws-sam-translator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
index e9e46a05b4f0..c9ba2878ef13 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "aws-sam-translator";
-  version = "1.98.0";
+  version = "1.99.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "aws";
     repo = "serverless-application-model";
     tag = "v${version}";
-    hash = "sha256-OfWH1V+F90ukVgan+eZKo00hrOMf/6x6HqxARzFiKHI=";
+    hash = "sha256-Y82qN2bmzE5Xqz2wSw9lWItsPbsRevLL7FlLN0FGKs0=";
   };
 
   postPatch = ''

From 256f7b36b8c715c1b6734599fd9e377baed9eb9a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:13 +0200
Subject: [PATCH 0594/3724] python3Packages.awsiotpythonsdk: 1.5.4 -> 1.5.5

https://github.com/aws/aws-iot-device-sdk-python/releases/tag/v1.5.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/awsiotpythonsdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/pkgs/development/python-modules/awsiotpythonsdk/default.nix
index 486cfcc86d22..151dabb399cd 100644
--- a/pkgs/development/python-modules/awsiotpythonsdk/default.nix
+++ b/pkgs/development/python-modules/awsiotpythonsdk/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "awsiotpythonsdk";
-  version = "1.5.4";
+  version = "1.5.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "aws";
     repo = "aws-iot-device-sdk-python";
     tag = "v${version}";
-    hash = "sha256-TUNIWGal7NQy2qmHVTiw6eX4t/Yt3NnM3HHztBwMfoM=";
+    hash = "sha256-mgf2hb7dWOGzaHnOQDz7GJeQV3Pa0X56X8nC15Tq0dY=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python SDK for connecting to AWS IoT";
     homepage = "https://github.com/aws/aws-iot-device-sdk-python";
-    changelog = "https://github.com/aws/aws-iot-device-sdk-python/releases/tag/v${version}";
+    changelog = "https://github.com/aws/aws-iot-device-sdk-python/releases/tag/${src.tag}";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };

From 6ec5b8a687dbdb1f983b8b5b0688b17e5007c64f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:14 +0200
Subject: [PATCH 0595/3724] python3Packages.awswrangler: 3.12.0 -> 3.12.1

https://github.com/aws/aws-sdk-pandas/releases/tag/3.12.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/awswrangler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix
index 260bf04247f7..ef33e99adc91 100644
--- a/pkgs/development/python-modules/awswrangler/default.nix
+++ b/pkgs/development/python-modules/awswrangler/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "awswrangler";
-  version = "3.12.0";
+  version = "3.12.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "aws";
     repo = "aws-sdk-pandas";
     tag = version;
-    hash = "sha256-BudK7pP7b8YJRyDCQAZv8FtxF5paA+AR/ZBt9UO3XjM=";
+    hash = "sha256-N4IqeAfW4PqgQcBFaFK/Ugbcsz8pLiFzkBr9SRm7AOs=";
   };
 
   pythonRelaxDeps = [

From 54a4e2dc3a2af5c22b3a1dcb2b7d3cfa0c5cfa2b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:15 +0200
Subject: [PATCH 0596/3724] python3Packages.axisregistry: 0.4.12 -> 0.4.16

https://github.com/googlefonts/axisregistry/blob/v0.4.16/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/axisregistry/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/axisregistry/default.nix b/pkgs/development/python-modules/axisregistry/default.nix
index fe5efc40c7fe..e9cb74745b95 100644
--- a/pkgs/development/python-modules/axisregistry/default.nix
+++ b/pkgs/development/python-modules/axisregistry/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "axisregistry";
-  version = "0.4.12";
+  version = "0.4.16";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-d60VbzlDiAL+J8sCE0sp2RgB02WGrigqcdzqW55ex1s=";
+    hash = "sha256-eohwtlFSTuttPv0PsOy1uezGT1NNlwm8ZunVJd1a9zo=";
   };
 
   # Relax the dependency on protobuf 3. Other packages in the Google Fonts

From eba2d6f425c71c98511b9fcd2a2f57bbc47ce302 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:16 +0200
Subject: [PATCH 0597/3724] python3Packages.azure-ai-vision-imageanalysis:
 1.0.0b3 -> 39.0.0

This commit was automatically generated using update-python-libraries.
---
 .../azure-ai-vision-imageanalysis/default.nix               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix b/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix
index fe71a257941b..fd508eb915fa 100644
--- a/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix
+++ b/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "azure-ai-vision-imageanalysis";
-  version = "1.0.0b3";
+  version = "39.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-sdk-for-python";
-    tag = "azure-ai-vision-imageanalysis_${version}";
-    hash = "sha256-Hkj9mrjCc8Li8z6e1BjpzANRVx6+DjN0MhTLANMT78E=";
+    tag = "azure-mgmt-containerservice_${version}";
+    hash = "sha256-zufXc8LR4STHi/jjV0bcLsifcHIif2m+3Q/KZlsSkRw=";
   };
 
   sourceRoot = "${src.name}/sdk/vision/azure-ai-vision-imageanalysis";

From 462f2e77e4dfd58a205f104f984390f6d1bdd1fd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:17 +0200
Subject: [PATCH 0598/3724] python3Packages.azure-core: 1.32.0 -> 1.35.0

https://github.com/Azure/azure-sdk-for-python/blob/azure-core_1.35.0/sdk/core/azure-core/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/azure-core/default.nix     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix
index 6bcdd65876ef..4f4e81311ed0 100644
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/pkgs/development/python-modules/azure-core/default.nix
@@ -8,6 +8,10 @@
   aiohttp,
   flask,
   mock,
+  opentelemetry-api,
+  opentelemetry-instrumentation,
+  opentelemetry-instrumentation-requests,
+  opentelemetry-sdk,
   pytest,
   pytest-asyncio,
   pytest-trio,
@@ -20,7 +24,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.32.0";
+  version = "1.35.0";
   pname = "azure-core";
   pyproject = true;
 
@@ -31,12 +35,12 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_core";
     inherit version;
-    hash = "sha256-IrPDXWstrhSZD2wb4pEr8j/+ULIg5wiiirG7krHHMOU=";
+    hash = "sha256-wL5ShIlIXp7eWbaXHrY8HqrPg+9TABv+OQTkdelyvlw=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     requests
     six
     typing-extensions
@@ -44,12 +48,16 @@ buildPythonPackage rec {
 
   optional-dependencies = {
     aio = [ aiohttp ];
+    tracing = [ opentelemetry-api ];
   };
 
   nativeCheckInputs = [
     aiodns
     flask
     mock
+    opentelemetry-instrumentation
+    opentelemetry-instrumentation-requests
+    opentelemetry-sdk
     pytest
     pytest-trio
     pytest-asyncio
@@ -95,6 +103,10 @@ buildPythonPackage rec {
     "tests/test_polling.py"
     "tests/async_tests/test_base_polling_async.py"
     "tests/async_tests/test_polling_async.py"
+    # infinite recursion with azure-storage-blob
+    "tests/async_tests/test_tracing_live_async.py"
+    "tests/test_serialization.py"
+    "tests/test_tracing_live.py"
   ];
 
   meta = with lib; {

From 4d32db474aeb074886f3497ccaeab0fb2d41cb48 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:18 +0200
Subject: [PATCH 0599/3724] python3Packages.azure-datalake-store: 0.0.53 ->
 1.0.1

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/azure-datalake-store/default.nix        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix
index 1552f1c4b75d..2491d213be6a 100644
--- a/pkgs/development/python-modules/azure-datalake-store/default.nix
+++ b/pkgs/development/python-modules/azure-datalake-store/default.nix
@@ -11,14 +11,15 @@
 
 buildPythonPackage rec {
   pname = "azure-datalake-store";
-  version = "0.0.53";
+  version = "1.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-BbbeYu4/KgpuaUHmkzt5K4AMPn9v/OL8MkvBmHV1c5M=";
+    pname = "azure_datalake_store";
+    inherit version;
+    hash = "sha256-U2TURFqrFUocfLECFWKcPORs5ceqrxYHGJDAP65ToDU=";
   };
 
   propagatedBuildInputs = [

From fca4953a32752bc9997c48b2dc25ebaaa18a3590 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:19 +0200
Subject: [PATCH 0600/3724] python3Packages.azure-eventhub: 5.15.0 -> 39.0.0

https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-containerservice_39.0.0/sdk/eventhub/azure-eventhub/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/azure-eventhub/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix
index 1cfda2439a9e..814fc18681a1 100644
--- a/pkgs/development/python-modules/azure-eventhub/default.nix
+++ b/pkgs/development/python-modules/azure-eventhub/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "azure-eventhub";
-  version = "5.15.0";
+  version = "39.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-sdk-for-python";
-    tag = "azure-eventhub_${version}";
-    hash = "sha256-zpj1DUeFCXgVw44LcBCYtuFcQtA9BnrDKAxKSYzu4ts=";
+    tag = "azure-mgmt-containerservice_${version}";
+    hash = "sha256-zufXc8LR4STHi/jjV0bcLsifcHIif2m+3Q/KZlsSkRw=";
   };
 
   sourceRoot = "${src.name}/sdk/eventhub/azure-eventhub";

From 31775b74fa2234e736039b05d59169106407e666 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:21 +0200
Subject: [PATCH 0601/3724] python3Packages.azure-identity: 1.21.0 -> 1.23.1

https://github.com/Azure/azure-sdk-for-python/blob/azure-identity_1.23.1/sdk/identity/azure-identity/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/azure-identity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix
index 0844690094f9..ef5a195b1356 100644
--- a/pkgs/development/python-modules/azure-identity/default.nix
+++ b/pkgs/development/python-modules/azure-identity/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "azure-identity";
-  version = "1.21.0";
+  version = "1.23.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_identity";
     inherit version;
-    hash = "sha256-6iLObmsPQpvBuNkhLVufmHe9TILxckv6kQdgYSwHqaY=";
+    hash = "sha256-Imwe+YKp+NXc9uD57TXq7ypNlx592GMX6bnVLnCgNeQ=";
   };
 
   build-system = [ setuptools ];

From 179091f8093160cbc77f793f3ea30640d8c557ae Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:22 +0200
Subject: [PATCH 0602/3724] python3Packages.azure-keyvault-keys: 4.10.0 ->
 4.11.0

https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-keys_4.11.0/sdk/keyvault/azure-keyvault-keys

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/azure-keyvault-keys/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
index 3e53dd4ce7df..21cb1fa32c4d 100644
--- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "azure-keyvault-keys";
-  version = "4.10.0";
+  version = "4.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_keyvault_keys";
     inherit version;
-    hash = "sha256-URIGrpCuwXJqTW/1qS11S9DA8eh1GJE2jTD7cLYpVfE=";
+    hash = "sha256-8lexkXosOoiYPj9WdaZBlEnrJiMYiI1bUeHLO+15d5o=";
   };
 
   build-system = [ setuptools ];

From c688a1f976f1e8d4e4d05227e32f7d915d534555 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:23 +0200
Subject: [PATCH 0603/3724] python3Packages.azure-kusto-data: 4.6.3 -> 5.0.5

https://github.com/Azure/azure-kusto-python/releases/tag/v5.0.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/azure-kusto-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-kusto-data/default.nix b/pkgs/development/python-modules/azure-kusto-data/default.nix
index 9ef5b0b7d97c..5fa85ce9827d 100644
--- a/pkgs/development/python-modules/azure-kusto-data/default.nix
+++ b/pkgs/development/python-modules/azure-kusto-data/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "azure-kusto-data";
-  version = "4.6.3";
+  version = "5.0.5";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "Azure";
     repo = "azure-kusto-python";
     tag = "v${version}";
-    hash = "sha256-VndOEvSi4OMf/yAjNl34X9IFF0T+wNfjlPW8NfdrwUo=";
+    hash = "sha256-DEHTxSvc6AeBMEJuAiDavFj2xVfPmWKpZBaZcpHWHak=";
   };
 
   sourceRoot = "${src.name}/${pname}";

From 7e62b0bc27de761d1ebd6589050a97251b143249 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:24 +0200
Subject: [PATCH 0604/3724] python3Packages.azure-kusto-ingest: 4.6.3 -> 5.0.5

https://github.com/Azure/azure-kusto-python/releases/tag/v5.0.5

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/azure-kusto-ingest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-kusto-ingest/default.nix b/pkgs/development/python-modules/azure-kusto-ingest/default.nix
index b9aa9fac7f94..d7665307e481 100644
--- a/pkgs/development/python-modules/azure-kusto-ingest/default.nix
+++ b/pkgs/development/python-modules/azure-kusto-ingest/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "azure-kusto-ingest";
-  version = "4.6.3";
+  version = "5.0.5";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "Azure";
     repo = "azure-kusto-python";
     tag = "v${version}";
-    hash = "sha256-VndOEvSi4OMf/yAjNl34X9IFF0T+wNfjlPW8NfdrwUo=";
+    hash = "sha256-DEHTxSvc6AeBMEJuAiDavFj2xVfPmWKpZBaZcpHWHak=";
   };
 
   sourceRoot = "${src.name}/${pname}";

From f883af3166a9c8b78102617a72f5f75cb0ff7f33 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:25 +0200
Subject: [PATCH 0605/3724] python3Packages.azure-mgmt-containerservice: 37.0.0
 -> 39.0.0

https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-containerservice_39.0.0/sdk/containerservice/azure-mgmt-containerservice/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/azure-mgmt-containerservice/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index cab199d3eaa4..a9466082adce 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerservice";
-  version = "37.0.0";
+  version = "39.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_mgmt_containerservice";
     inherit version;
-    hash = "sha256-F02cVmGhYuxDoK95BbzxHNIJpugARaj0I31TcB0qkTs=";
+    hash = "sha256-qgAWke3WPQc3S1gggcC7IMi+b/uIWlkqFXfSH0EYqDc=";
   };
 
   build-system = [ setuptools ];

From 3212f5ed65151ae9628fe04c0ab8c4a9ad737af8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:26 +0200
Subject: [PATCH 0606/3724] python3Packages.azure-mgmt-core: 1.5.0 -> 1.6.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/azure-mgmt-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix
index d69683337d22..e9e2eb34c9c2 100644
--- a/pkgs/development/python-modules/azure-mgmt-core/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix
@@ -7,7 +7,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.5.0";
+  version = "1.6.0";
   format = "setuptools";
   pname = "azure-mgmt-core";
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     pname = "azure_mgmt_core";
     inherit version;
     extension = "tar.gz";
-    hash = "sha256-OArj36Njn0pcJGp9t+0tCDdOiCMP0No+uJn3wR5cRBo=";
+    hash = "sha256-smIyr4V7Ah5h2BPZ9K5TBGUlXLELPd6UWtN0P3pY55w=";
   };
 
   propagatedBuildInputs = [

From b4637f06a29e37f6b6dcfca0c2e6a81dab9c73bb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:27 +0200
Subject: [PATCH 0607/3724] python3Packages.azure-mgmt-iothub: 3.0.0 -> 4.0.0

https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-iothub_4.0.0/sdk/iothub/azure-mgmt-iothub/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../azure-mgmt-iothub/default.nix             | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
index fee59741d9d1..f4d17304e312 100644
--- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
@@ -5,28 +5,27 @@
   buildPythonPackage,
   fetchPypi,
   isodate,
-  pythonOlder,
-  typing-extensions,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-iothub";
-  version = "3.0.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "4.0.0";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-2vIfyYxoo1PsYWMYwOYr4EyNaJmWC+jCy/mRZzrItyI=";
+    pname = "azure_mgmt_iothub";
+    inherit version;
+    hash = "sha256-B/Jb1vZzdLqxfMEZL5+SGzUONWAlHxkGnmZlg1Qe1Ng=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     azure-common
     azure-mgmt-core
     isodate
-  ]
-  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ];
 
   # Module has no tests
   doCheck = false;

From c5a3182a0314b8f4aabdc895f72888588e92c4c0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:28 +0200
Subject: [PATCH 0608/3724] python3Packages.azure-mgmt-keyvault: 11.0.0 ->
 12.0.0

https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-keyvault_12.0.0/sdk/keyvault/azure-mgmt-keyvault/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/azure-mgmt-keyvault/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
index eeaeb6fb85b3..e26a0010caf7 100644
--- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-keyvault";
-  version = "11.0.0";
+  version = "12.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_mgmt_keyvault";
     inherit version;
-    hash = "sha256-/PsTZoUpJvKjEeG8bmp4brioof1G5gJdTBFO3iy0ZC4=";
+    hash = "sha256-4s8Y6KSSi10cqxJ75C6prQJG1ofKEvwnoq1mSHzhyGs=";
   };
 
   build-system = [ setuptools ];

From 3fb09388d7f7725a1a245d0aacdaf669a677fa5a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:29 +0200
Subject: [PATCH 0609/3724] python3Packages.azure-mgmt-monitor: 6.0.2 -> 7.0.0

This commit was automatically generated using update-python-libraries.
---
 .../azure-mgmt-monitor/default.nix            | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
index 6ce2643655de..575ccb77b587 100644
--- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
@@ -5,28 +5,27 @@
   buildPythonPackage,
   fetchPypi,
   isodate,
-  pythonOlder,
-  typing-extensions,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-monitor";
-  version = "6.0.2";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "7.0.0";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-X/v1AOSZq3kSsbptJs7yZIDZrkEVMgGbt41yViGW4Hs=";
+    pname = "azure_mgmt_monitor";
+    inherit version;
+    hash = "sha256-t19TZEHUMPaf+HOhZG5fXbyzCAoQdopZ0K3AFUFiOBY=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     isodate
     azure-common
     azure-mgmt-core
-  ]
-  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ];
 
   pythonNamespaces = [ "azure.mgmt" ];
 

From 860b4846fbb536b7b0ac18b6e34031b22d8aea1b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:30 +0200
Subject: [PATCH 0610/3724] python3Packages.azure-mgmt-recoveryservices: 3.0.0
 -> 3.1.0

https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-recoveryservices_3.1.0/sdk/recoveryservices/azure-mgmt-recoveryservices/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../azure-mgmt-recoveryservices/default.nix   | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
index 314938116ddc..d4028f823225 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
@@ -5,28 +5,27 @@
   buildPythonPackage,
   fetchPypi,
   isodate,
-  pythonOlder,
-  typing-extensions,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-recoveryservices";
-  version = "3.0.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "3.1.0";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-3yEt+t+8xlnDEjHD4XCqt8IRRNFysPiCaKsPWtjpWII=";
+    pname = "azure_mgmt_recoveryservices";
+    inherit version;
+    hash = "sha256-fy25hAFwjPFFMi9QvEkcr3lnvsSvO/ewmEufB9MJJoc=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     azure-common
     azure-mgmt-core
     isodate
-  ]
-  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ];
 
   # Module has no tests
   doCheck = false;

From f85c344db4ee87dd865b95d084a5c8a3aff535fd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:31 +0200
Subject: [PATCH 0611/3724] python3Packages.azure-mgmt-resource: 23.4.0 ->
 24.0.0

https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource_24.0.0/sdk/resources/azure-mgmt-resource/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/azure-mgmt-resource/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index d865e6ecf0c8..17e7eb95c2c7 100644
--- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-resource";
-  version = "23.4.0";
+  version = "24.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_mgmt_resource";
     inherit version;
-    hash = "sha256-fMCQkYS9AUOeJF9fLiCUWjZo1FpndOHwCCJ7szpzPRY=";
+    hash = "sha256-z2uJlfzdQHrJ/x3UdAhxKUKaHZDbsax3+XwZuWI3smU=";
   };
 
   build-system = [ setuptools ];

From 1a40f012bba88a26e0541e4d294e6ae41d164293 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:32 +0200
Subject: [PATCH 0612/3724] python3Packages.azure-mgmt-search: 9.1.0 -> 9.2.0

https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-search_9.2.0/sdk/search/azure-mgmt-search/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../azure-mgmt-search/default.nix             | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix
index 7a8b87c32bb6..b877e2995618 100644
--- a/pkgs/development/python-modules/azure-mgmt-search/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix
@@ -5,28 +5,27 @@
   buildPythonPackage,
   fetchPypi,
   isodate,
-  pythonOlder,
-  typing-extensions,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-search";
-  version = "9.1.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "9.2.0";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-U7xu6tsJdNIfEguyG7Xmgn321lDhc0dGD9g+LWiINZk=";
+    pname = "azure_mgmt_search";
+    inherit version;
+    hash = "sha256-oNoOwzLR9D0PastjuM/YAIWwdeka/PgS+MdprZ/crYQ=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     azure-common
     azure-mgmt-core
     isodate
-  ]
-  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ];
 
   # Module has no tests
   doCheck = false;

From 60dc0460e96ae130b9f57e9a9bc69b614871776c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:33 +0200
Subject: [PATCH 0613/3724] python3Packages.azure-monitor-ingestion: 1.0.4 ->
 1.1.0

https://github.com/Azure/azure-sdk-for-python/blob/azure-monitor-ingestion_1.1.0/sdk/monitor/azure-monitor-ingestion/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/azure-monitor-ingestion/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-monitor-ingestion/default.nix b/pkgs/development/python-modules/azure-monitor-ingestion/default.nix
index e77ae5df94d3..e7ab2783c853 100644
--- a/pkgs/development/python-modules/azure-monitor-ingestion/default.nix
+++ b/pkgs/development/python-modules/azure-monitor-ingestion/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "azure-monitor-ingestion";
-  version = "1.0.4";
+  version = "1.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JU11mTof5wfRmPAUrvWhT6pXDO5zabNbsDriqo+Zvnk=";
+    hash = "sha256-l6/ueA2a4waRKM3ncCfUzGL6gk/mTVusiArEpksKDE4=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 9d852565040e892d4e5e1e34acfca8c9988881ca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:34 +0200
Subject: [PATCH 0614/3724] python3Packages.azure-multiapi-storage: 1.4.1 ->
 1.5.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/azure-multiapi-storage/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix
index 57ddf17de1ab..5482d0817956 100644
--- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix
+++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "azure-multiapi-storage";
-  version = "1.4.1";
+  version = "1.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_multiapi_storage";
     inherit version;
-    hash = "sha256-INTvVn+1ysQHKRyI0Q4p43Ynyyj2BiBPVMcfaAEDCyg=";
+    hash = "sha256-g/5BOsU3OzvpxMnySPVNoaXLrmwjb8aq3hetC/jsEWY=";
   };
 
   build-system = [ setuptools ];

From 26978a401dde87f2d09ed1cb87997c2a2c4cc83a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:36 +0200
Subject: [PATCH 0615/3724] python3Packages.azure-storage-blob: 12.25.1 ->
 12.26.0

https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-blob_12.26.0/sdk/storage/azure-storage-blob/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/azure-storage-blob/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix
index abe4710cf0c9..491f35a9c797 100644
--- a/pkgs/development/python-modules/azure-storage-blob/default.nix
+++ b/pkgs/development/python-modules/azure-storage-blob/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "azure-storage-blob";
-  version = "12.25.1";
+  version = "12.26.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_storage_blob";
     inherit version;
-    hash = "sha256-TylN3JvEeQmsZriTS9JrUNIAAnixCtgswQl2T9xuDjs=";
+    hash = "sha256-XdfXgkIk994Av+sDJ1NgHJgmVRcwYeJC8Tvm4m141x8=";
   };
 
   build-system = [ setuptools ];

From 8590ea1e98d0d25b2158c3990063cfb2575a5ed8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:37 +0200
Subject: [PATCH 0616/3724] python3Packages.azure-storage-file-share: 12.21.0
 -> 12.22.0

https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-file-share_12.22.0/sdk/storage/azure-storage-file-share/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/azure-storage-file-share/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix
index 2fa9f218cced..0c9b0fc40afe 100644
--- a/pkgs/development/python-modules/azure-storage-file-share/default.nix
+++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "azure-storage-file-share";
-  version = "12.21.0";
+  version = "12.22.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_storage_file_share";
     inherit version;
-    hash = "sha256-20K/a0OzwMJ8kVIgKVUnffwmpZ9/rSbAWEMaaumVgM4=";
+    hash = "sha256-5YPI4IbufW7FDMI9r0KDnBjc4Rs2s9E2TBNxTAi1NFI=";
   };
 
   build-system = [ setuptools ];

From f02a4748716229a60bd9a25f22b8ba539eb210a0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:38 +0200
Subject: [PATCH 0617/3724] python3Packages.azure-storage-queue: 12.12.0 ->
 12.13.0

https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-queue_12.13.0/sdk/storage/azure-storage-queue/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/azure-storage-queue/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix
index dbeb4286bbfe..8e0814f06fa5 100644
--- a/pkgs/development/python-modules/azure-storage-queue/default.nix
+++ b/pkgs/development/python-modules/azure-storage-queue/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "azure-storage-queue";
-  version = "12.12.0";
+  version = "12.13.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_storage_queue";
     inherit version;
-    hash = "sha256-uvLxvIK31PUpGSLD6k8jziJD6ULb50lPyheCKQs38eQ=";
+    hash = "sha256-JWkeeVjSSXA5JFETTfpUdjf9Lfz95bNHai4VLlaXP4w=";
   };
 
   build-system = [ setuptools ];

From c56bb17975941fcbfb21b7ab5b691fdd354b1f5c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:39 +0200
Subject: [PATCH 0618/3724] python3Packages.backrefs: 5.9 -> 6.0.1

https://github.com/facelessuser/backrefs/releases/tag/6.0.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/backrefs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/backrefs/default.nix b/pkgs/development/python-modules/backrefs/default.nix
index 2446f8379b04..41d43f18495c 100644
--- a/pkgs/development/python-modules/backrefs/default.nix
+++ b/pkgs/development/python-modules/backrefs/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "backrefs";
-  version = "5.9";
+  version = "6.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "facelessuser";
     repo = "backrefs";
     tag = version;
-    hash = "sha256-W75JLoBn990PoO3Ej3nb3BjOGm0c71o8hDDBUFWr8i4=";
+    hash = "sha256-7kB8z8pNU6eLuz4eSYXkSDL5npowlYsm0hjjh8zcAK0=";
   };
 
   build-system = [
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Wrapper around re or regex that adds additional back references";
     homepage = "https://github.com/facelessuser/backrefs";
-    changelog = "https://github.com/facelessuser/backrefs/releases/tag/${version}";
+    changelog = "https://github.com/facelessuser/backrefs/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ drupol ];
   };

From f6c878f8c4bf795d98cfe5b9cba91183e71760ad Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:41 +0200
Subject: [PATCH 0619/3724] python3Packages.bandit: 1.8.5 -> 1.8.6

https://github.com/PyCQA/bandit/releases/tag/1.8.6

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/bandit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix
index 983ef8fba2e7..ea061336c5dc 100644
--- a/pkgs/development/python-modules/bandit/default.nix
+++ b/pkgs/development/python-modules/bandit/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "bandit";
-  version = "1.8.5";
+  version = "1.8.6";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-24EunDm4howP7VJ4t3//u6uoKLSJG8gONLnFA3MgHP0=";
+    hash = "sha256-2/6cJfxpYcIHhZPeVf0Z8lWfnkW5nxJyNB9bld6k5Ws=";
   };
 
   nativeBuildInputs = [ pbr ];

From 48953c8f5bd21a7feec1009512b5a3e969477b02 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:42 +0200
Subject: [PATCH 0620/3724] python3Packages.basemap: 1.4.1 -> 2.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/basemap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix
index 0551f450c4e7..415b6addd73b 100644
--- a/pkgs/development/python-modules/basemap/default.nix
+++ b/pkgs/development/python-modules/basemap/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "basemap";
-  version = "1.4.1";
+  version = "2.0.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "matplotlib";
     repo = "basemap";
     tag = "v${version}";
-    hash = "sha256-0rTGsphwLy2yGvhO7bcmFqdgysIXXkDBmURwRVw3ZHY=";
+    hash = "sha256-1T1FTcR99KbpqiYzrd2r5h1wTcygBEU7BLZXZ8uMthU=";
   };
 
   sourceRoot = "${src.name}/packages/basemap";

From ca26ae7e979c93e41378e5ac7ed47ea40228dd09 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:43 +0200
Subject: [PATCH 0621/3724] python3Packages.bayesian-optimization: 3.0.1 ->
 3.1.0

https://github.com/bayesian-optimization/BayesianOptimization/releases/tag/v3.1.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/bayesian-optimization/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix
index 22fc9d78767c..0de71843bf96 100644
--- a/pkgs/development/python-modules/bayesian-optimization/default.nix
+++ b/pkgs/development/python-modules/bayesian-optimization/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "bayesian-optimization";
-  version = "3.0.1";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bayesian-optimization";
     repo = "BayesianOptimization";
     tag = "v${version}";
-    hash = "sha256-dq5R0/gqjSzQPAmYvtByJ6gT8pOiXcezfYlKpFLnryk=";
+    hash = "sha256-CYkFobGLlh5cPLwChRWXCow0d5uz8eN5hcRanNMfW8s=";
   };
 
   build-system = [ poetry-core ];

From b7fdbf746e9fa0a07ffb03000f453d995606a32b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:44 +0200
Subject: [PATCH 0622/3724] python3Packages.bc-python-hcl2: 0.4.2 -> 0.4.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/bc-python-hcl2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix
index 506352b25d32..e253b4a1911e 100644
--- a/pkgs/development/python-modules/bc-python-hcl2/default.nix
+++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "bc-python-hcl2";
-  version = "0.4.2";
+  version = "0.4.3";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-rI/1n7m9Q36im4mn18UH/QoelXhFuumurGnyiSuNaB4=";
+    hash = "sha256-+uYrKkGmda0zDRNNgldlJtt1X3K70OWoUN49hfwkxA4=";
   };
 
   build-system = [ setuptools ];

From 8c3b2c98e8937e24497ee872f23830f7496a1d86 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:45 +0200
Subject: [PATCH 0623/3724] python3Packages.beanhub-cli: 2.1.1 -> 3.0.1

https://github.com/LaunchPlatform/beanhub-cli/releases/tag/3.0.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/beanhub-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix
index c9a1f7abe3c8..178476f284b9 100644
--- a/pkgs/development/python-modules/beanhub-cli/default.nix
+++ b/pkgs/development/python-modules/beanhub-cli/default.nix
@@ -39,7 +39,7 @@
 
 buildPythonPackage rec {
   pname = "beanhub-cli";
-  version = "2.1.1";
+  version = "3.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     owner = "LaunchPlatform";
     repo = "beanhub-cli";
     tag = version;
-    hash = "sha256-mGLg6Kgur2LAcujFzO/rkSPAC2t3wR5CO2AeOO0+bFI=";
+    hash = "sha256-hreVGsptCGW6L3rj6Ec8+lefZWpQ4tZtUEJI+NxTO7w=";
   };
 
   pythonRelaxDeps = [

From 8bcc8ca22488bebcc3efdb2d2eaf027eeccfc31e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:46 +0200
Subject: [PATCH 0624/3724] python3Packages.beanhub-extract: 0.1.5 -> 0.1.6

https://github.com/LaunchPlatform/beanhub-extract/releases/tag/0.1.6

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/beanhub-extract/default.nix         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/beanhub-extract/default.nix b/pkgs/development/python-modules/beanhub-extract/default.nix
index bf21ebb68d4a..6030be8ee225 100644
--- a/pkgs/development/python-modules/beanhub-extract/default.nix
+++ b/pkgs/development/python-modules/beanhub-extract/default.nix
@@ -3,16 +3,16 @@
   fetchFromGitHub,
   buildPythonPackage,
   pythonOlder,
+  hatchling,
   pytestCheckHook,
   iso8601,
-  poetry-core,
   pytest-lazy-fixture,
   pytz,
 }:
 
 buildPythonPackage rec {
   pname = "beanhub-extract";
-  version = "0.1.5";
+  version = "0.1.6";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,10 +21,10 @@ buildPythonPackage rec {
     owner = "LaunchPlatform";
     repo = "beanhub-extract";
     tag = version;
-    hash = "sha256-L3TM3scBJGlOXXxeJAkiqMkpBmhJZB6b+IQT2DGIfO0=";
+    hash = "sha256-N4LCMZRPbIzVUPDCW3mAVw6WwpuvxiJmMIoyk8VwXS0=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   pythonRelaxDeps = [ "pytz" ];
 
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = {
     description = "Simple library for extracting all kind of bank account transaction export files, mostly for beanhub-import to ingest and generate transactions";
     homepage = "https://github.com/LaunchPlatform/beanhub-extract/";
-    changelog = "https://github.com/LaunchPlatform/beanhub-extract/releases/tag/${version}";
+    changelog = "https://github.com/LaunchPlatform/beanhub-extract/releases/tag/${src.tag}";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fangpen ];
   };

From 01662d1d76a0e77f8f972cee6f59eb29f393ba66 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:47 +0200
Subject: [PATCH 0625/3724] python3Packages.beartype: 0.19.0 -> 0.21.0

https://github.com/beartype/beartype/releases/tag/v0.21.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/beartype/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix
index 2873b74ba566..1458225ed605 100644
--- a/pkgs/development/python-modules/beartype/default.nix
+++ b/pkgs/development/python-modules/beartype/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "beartype";
-  version = "0.19.0";
+  version = "0.21.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "beartype";
     repo = "beartype";
     tag = "v${version}";
-    hash = "sha256-uUwqgK7K8x61J7A6S/DGLJljSKABxsbOCsFBDtsameU=";
+    hash = "sha256-oD7LS+c+mZ8W4YnAaAYxQkbUlmO8E2TPxy0PBI7Jr7A=";
   };
 
   build-system = [ hatchling ];
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "Fast runtime type checking for Python";
     homepage = "https://github.com/beartype/beartype";
-    changelog = "https://github.com/beartype/beartype/releases/tag/v${version}";
+    changelog = "https://github.com/beartype/beartype/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bcdarwin ];
   };

From d0685e0664f4cdcb468154e63c198f3874bdfe7a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:51 +0200
Subject: [PATCH 0626/3724] python3Packages.bentoml: 1.3.20 -> 1.4.19

https://github.com/bentoml/BentoML/releases/tag/v1.4.19

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/bentoml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix
index 57bbfbf1e6c1..12f5cf61a0c0 100644
--- a/pkgs/development/python-modules/bentoml/default.nix
+++ b/pkgs/development/python-modules/bentoml/default.nix
@@ -74,7 +74,7 @@
 }:
 
 let
-  version = "1.3.20";
+  version = "1.4.19";
   aws = [ fs-s3fs ];
   grpc = [
     grpcio
@@ -124,7 +124,7 @@ let
     owner = "bentoml";
     repo = "BentoML";
     tag = "v${version}";
-    hash = "sha256-zc/JvnEEoV21EbBHhLBWvilidXHx1pxYsBYISFg16Us=";
+    hash = "sha256-sRQfjB3K5F6lYeW92O7BV2slQ+DRCuMTVqRG8vT+9wc=";
   };
 in
 buildPythonPackage {

From cd05e22492b892811b71839ff7d6e628749a3dcb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:53 +0200
Subject: [PATCH 0627/3724] python3Packages.binsync: 5.3.0 -> 5.5.1

https://github.com/binsync/binsync/releases/tag/v5.5.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/binsync/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/binsync/default.nix b/pkgs/development/python-modules/binsync/default.nix
index 2e396eeb365e..7883e9b5ed42 100644
--- a/pkgs/development/python-modules/binsync/default.nix
+++ b/pkgs/development/python-modules/binsync/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "binsync";
-  version = "5.3.0";
+  version = "5.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "binsync";
     repo = "binsync";
     tag = "v${version}";
-    hash = "sha256-f0pPuNTrZ5+iuJgtxLXJF89C9hKXwplhBA/olyhfsQ4=";
+    hash = "sha256-C9yIb//h1pAJnlWT4+VgeVzeSjd0sfn8o4yfePNF/YM=";
   };
 
   build-system = [ setuptools ];
@@ -61,7 +61,7 @@ buildPythonPackage rec {
   meta = {
     description = "Reversing plugin for cross-decompiler collaboration, built on git";
     homepage = "https://github.com/binsync/binsync";
-    changelog = "https://github.com/binsync/binsync/releases/tag/v${version}";
+    changelog = "https://github.com/binsync/binsync/releases/tag/${src.tag}";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ scoder12 ];
   };

From 952b83c80cbe89862888e478c01ed1df009d4e08 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:54 +0200
Subject: [PATCH 0628/3724] python3Packages.biosppy: 2.2.2 -> 2.2.3

https://github.com/scientisst/BioSPPy/releases/tag/v2.2.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/biosppy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/biosppy/default.nix b/pkgs/development/python-modules/biosppy/default.nix
index b47e9efba4b2..29d1968731ff 100644
--- a/pkgs/development/python-modules/biosppy/default.nix
+++ b/pkgs/development/python-modules/biosppy/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "biosppy";
-  version = "2.2.2";
+  version = "2.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scientisst";
     repo = "BioSPPy";
     tag = "v${version}";
-    hash = "sha256-U0ZftAlRlazSO66raH74o/6eP1RpmuFoA6HJ+xmgKR8=";
+    hash = "sha256-R+3K8r+nzrCiZegxur/rf3/gDGhN9bVNMhlK94SHer0=";
   };
 
   build-system = [
@@ -64,7 +64,7 @@ buildPythonPackage rec {
   meta = {
     description = "Biosignal Processing in Python";
     homepage = "https://biosppy.readthedocs.io/";
-    changelog = "https://github.com/scientisst/BioSPPy/releases/tag/v${version}";
+    changelog = "https://github.com/scientisst/BioSPPy/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ genga898 ];
   };

From 3f3a7f71b2951b0712f76e389c6b95f20252097b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:55 +0200
Subject: [PATCH 0629/3724] python3Packages.bitarray: 3.4.3 -> 3.6.0

https://github.com/ilanschnell/bitarray/raw/3.6.0/CHANGE_LOG

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/bitarray/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix
index f99321e0e04f..0914b1ad5bfe 100644
--- a/pkgs/development/python-modules/bitarray/default.nix
+++ b/pkgs/development/python-modules/bitarray/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "bitarray";
-  version = "3.4.3";
+  version = "3.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-3d+yvwhrZq7BwBENxGZCtxYfWHpkQc/nTanjI5dfYvA=";
+    hash = "sha256-IP68hJofhY5qV6fUezI/6ecnxXnd1SbTF62IMXSKZqg=";
   };
 
   build-system = [ setuptools ];

From dceb95184cf20f4af8b7dd691e3175f027dba55f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:56 +0200
Subject: [PATCH 0630/3724] python3Packages.bitbox02: 6.3.0 -> 7.0.0

https://github.com/digitalbitbox/bitbox02-firmware/blob/py-bitbox02-7.0.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/bitbox02/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix
index 69b2b258e1f2..62c9ca5edcc1 100644
--- a/pkgs/development/python-modules/bitbox02/default.nix
+++ b/pkgs/development/python-modules/bitbox02/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "bitbox02";
-  version = "6.3.0";
+  version = "7.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0D+yIovlYw8dfDUeW+vcualbvmLs+IySkTpmHwk2meM=";
+    hash = "sha256-J9UQXrFaVTcZ+p0+aJIchksAyGGzpkQETZrGhCbxhEc=";
   };
 
   build-system = [ setuptools ];

From 67ec65dc952ecfca9411075fea5d53c85bc0c873 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:35:57 +0200
Subject: [PATCH 0631/3724] python3Packages.bitsandbytes: 0.46.0 -> 0.46.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/bitsandbytes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix
index 14299f664c4b..6dd1b0bd30a5 100644
--- a/pkgs/development/python-modules/bitsandbytes/default.nix
+++ b/pkgs/development/python-modules/bitsandbytes/default.nix
@@ -11,7 +11,7 @@
 
 let
   pname = "bitsandbytes";
-  version = "0.46.0";
+  version = "0.46.1";
 
   inherit (torch) cudaPackages cudaSupport;
   inherit (cudaPackages) cudaMajorMinorVersion;
@@ -57,7 +57,7 @@ buildPythonPackage {
     owner = "bitsandbytes-foundation";
     repo = "bitsandbytes";
     tag = version;
-    hash = "sha256-q1ltNYO5Ex6F2bfCcsekdsWjzXoal7g4n/LIHVGuj+k=";
+    hash = "sha256-CAGKp8aFp1GjJ1uR+O1Ptxr8wfz1zECCEWhWMYs3zEQ=";
   };
 
   # By default, which library is loaded depends on the result of `torch.cuda.is_available()`.

From 26144af2293cd766ad7f8488ec969f929e2c0054 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:00 +0200
Subject: [PATCH 0632/3724] python3Packages.bleak: 0.22.3 -> 1.0.1

https://github.com/hbldh/bleak/blob/v1.0.1/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/bleak/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index 6a558e4aa620..6ec575619579 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Bluetooth Low Energy platform agnostic client";
     homepage = "https://github.com/hbldh/bleak";
-    changelog = "https://github.com/hbldh/bleak/blob/v${version}/CHANGELOG.rst";
+    changelog = "https://github.com/hbldh/bleak/blob/${src.tag}/CHANGELOG.rst";
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ oxzi ];

From 81e6bac96c7c39f5cf4693e33f9d28da073d62e2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:01 +0200
Subject: [PATCH 0633/3724] python3Packages.blessed: 1.20.0 -> 1.21.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/blessed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix
index 6bb56aaab30e..2e416b2403eb 100644
--- a/pkgs/development/python-modules/blessed/default.nix
+++ b/pkgs/development/python-modules/blessed/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "blessed";
-  version = "1.20.0";
+  version = "1.21.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LN1n+HRuBI8A30eiiA9NasvNs5kDG2BONLqPcdV4doA=";
+    hash = "sha256-7Oi7xHWKuRdkUvTjpxnXAIjrVzl5jNVYLJ4F8qKDN+w=";
   };
 
   nativeCheckInputs = [

From 7dd41273a8f7967b33eb749c09ed2970d1f1441c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:04 +0200
Subject: [PATCH 0634/3724] python3Packages.boost-histogram: 1.5.1 -> 1.5.2

https://github.com/scikit-hep/boost-histogram/releases/tag/v1.5.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/boost-histogram/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix
index 11e569659ab8..667d5e177ebd 100644
--- a/pkgs/development/python-modules/boost-histogram/default.nix
+++ b/pkgs/development/python-modules/boost-histogram/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "boost-histogram";
-  version = "1.5.1";
+  version = "1.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "boost-histogram";
     tag = "v${version}";
-    hash = "sha256-7E4y3P3RzVmIHb5mEoEYWZSwWnmL3LbGqYjGbnszM98=";
+    hash = "sha256-fWbvv9MiBZZiTZLu78tMR5Cx0/7xSuVIya3dkuahPE4=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -69,7 +69,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python bindings for the C++14 Boost::Histogram library";
     homepage = "https://github.com/scikit-hep/boost-histogram";
-    changelog = "https://github.com/scikit-hep/boost-histogram/releases/tag/v${version}";
+    changelog = "https://github.com/scikit-hep/boost-histogram/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ veprbl ];
   };

From 9524dcd2e4c7378a6889a73362144e1f3fc895ea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:06 +0200
Subject: [PATCH 0635/3724] python3Packages.bottle: 0.13.3 -> 0.13.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/bottle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix
index 5d7a8d100f24..72df474668ac 100644
--- a/pkgs/development/python-modules/bottle/default.nix
+++ b/pkgs/development/python-modules/bottle/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "bottle";
-  version = "0.13.3";
+  version = "0.13.4";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HCOuswqooT85xgwNpJRTDd1d49ojW8QxuBilDZmd5J8=";
+    hash = "sha256-eH54Mn4SsieTjeAiSDM9eIz+RZh+3Kc1+PiOA0csP0c=";
   };
 
   nativeBuildInputs = [ setuptools ];

From cf956dcc735097152ab4e49326c0464d1fe76655 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:08 +0200
Subject: [PATCH 0636/3724] python3Packages.brevo-python: 1.1.2 -> 1.2.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/brevo-python/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/brevo-python/default.nix b/pkgs/development/python-modules/brevo-python/default.nix
index 965fcdfee708..746776e97ca9 100644
--- a/pkgs/development/python-modules/brevo-python/default.nix
+++ b/pkgs/development/python-modules/brevo-python/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "brevo-python";
-  version = "1.1.2";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getbrevo";
     repo = "brevo-python";
     tag = "v${version}";
-    hash = "sha256-XOUFyUrqVlI7Qr4uzeXr6GJuQ+QTVhsueT1xxVQMm14=";
+    hash = "sha256-VYj1r69pgKgNCXzxRqvwlj5w+y3IIu21bsZJAe/7zf8=";
   };
 
   build-system = [ setuptools ];
@@ -35,6 +35,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestPaths = [
+    # broken import; https://github.com/getbrevo/brevo-python/issues/2
+    "test/test_configuration.py"
+  ];
+
   pythonImportsCheck = [ "brevo_python" ];
 
   meta = {

From 131f180595dfa37af902c87c658fa875b18ad24e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:09 +0200
Subject: [PATCH 0637/3724] python3Packages.bthome-ble: 3.13.1 -> 3.14.0

https://github.com/bluetooth-devices/bthome-ble/blob/v3.14.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/bthome-ble/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix
index 5d9294e1b658..665094952cc1 100644
--- a/pkgs/development/python-modules/bthome-ble/default.nix
+++ b/pkgs/development/python-modules/bthome-ble/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "bthome-ble";
-  version = "3.13.1";
+  version = "3.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bthome-ble";
     tag = "v${version}";
-    hash = "sha256-oGFjWe9e386EPAJGKL8Qk55iXoyW3rXuyG7ElyQYurg=";
+    hash = "sha256-1jgrE7EwYJPb/F5gIXmRFU3xBG00tIXRA8BsE20Tw6Y=";
   };
 
   build-system = [ poetry-core ];

From 9c57b224b7688e16c677cc509410388a1a8ebb6f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:10 +0200
Subject: [PATCH 0638/3724] python3Packages.buildcatrust: 0.3.0 -> 0.4.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/buildcatrust/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/buildcatrust/default.nix b/pkgs/development/python-modules/buildcatrust/default.nix
index cc2b5b5a2946..c8d57ce48032 100644
--- a/pkgs/development/python-modules/buildcatrust/default.nix
+++ b/pkgs/development/python-modules/buildcatrust/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "buildcatrust";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Ac10CZdihFBmr5LE6xFKx4+zr2n5nyR23px6N4vN05M=";
+    hash = "sha256-GYw/RN1OK5fqo3em8hia2l/IwN76hnPnFuYprqeX144=";
   };
 
   nativeBuildInputs = [ flit-core ];

From 0bcd2ae4ba5e679a47be8b2ea138e4379c63bacf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:11 +0200
Subject: [PATCH 0639/3724] python3Packages.bumps: 0.9.3 -> 1.0.2

https://github.com/bumps/bumps/releases/tag/v1.0.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/bumps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix
index 0070effd7a0a..c9ffdad6bb8f 100644
--- a/pkgs/development/python-modules/bumps/default.nix
+++ b/pkgs/development/python-modules/bumps/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "bumps";
-  version = "0.9.3";
+  version = "1.0.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MpUpj3/hsjkrsv+Ix6Cuadd6dpivWAqBVwBSygW6Uw8=";
+    hash = "sha256-YfnBA1rCD05B4XOS611qgi4ab3xKoYs108mwhj/I+sg=";
   };
 
   # Module has no tests

From fe88f271cfdbadb0c1adaa82eb59af29d2d2d089 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:12 +0200
Subject: [PATCH 0640/3724] python3Packages.busylight-for-humans: 0.35.2 ->
 0.37.0

https://github.com/JnyJny/busylight/releases/tag/v0.37.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/busylight-for-humans/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/busylight-for-humans/default.nix b/pkgs/development/python-modules/busylight-for-humans/default.nix
index f60436f64846..1cbb1d14136c 100644
--- a/pkgs/development/python-modules/busylight-for-humans/default.nix
+++ b/pkgs/development/python-modules/busylight-for-humans/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "busylight-for-humans";
-  version = "0.35.2";
+  version = "0.37.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "JnyJny";
     repo = "busylight";
     tag = "v${version}";
-    hash = "sha256-0jmaVMN4wwqoO5wGMaV4kJefNUPOuJpWbsqHcZZ0Nh4=";
+    hash = "sha256-uKuQy4ce6WTTpprAbQ6QE7WlotMlVacaDZ+dsvY1N58=";
   };
 
   build-system = [ poetry-core ];
@@ -58,7 +58,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Control USB connected presence lights from multiple vendors via the command-line or web API";
     homepage = "https://github.com/JnyJny/busylight";
-    changelog = "https://github.com/JnyJny/busylight/releases/tag/${version}";
+    changelog = "https://github.com/JnyJny/busylight/releases/tag/${src.tag}";
     license = licenses.asl20;
     teams = [ teams.helsinki-systems ];
     mainProgram = "busylight";

From cc2cc60fce055411c33dd253f7195ce0425d9f20 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:13 +0200
Subject: [PATCH 0641/3724] python3Packages.cachier: 3.1.2 -> 4.1.0

https://github.com/python-cachier/cachier/releases/tag/v4.1.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/cachier/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix
index dc6371f50c5c..60f46103311d 100644
--- a/pkgs/development/python-modules/cachier/default.nix
+++ b/pkgs/development/python-modules/cachier/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "cachier";
-  version = "3.1.2";
+  version = "4.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "python-cachier";
     repo = "cachier";
     tag = "v${version}";
-    hash = "sha256-siighT6hMicN+F/LIXfUAPQ2kkRiyk7CtjqmyC/qCFg=";
+    hash = "sha256-FmrwH5Ksmgt0HA5eUN5LU36P5sY4PymRKsUWVkQlvBo=";
   };
 
   pythonRemoveDeps = [ "setuptools" ];
@@ -80,7 +80,7 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "https://github.com/python-cachier/cachier";
-    changelog = "https://github.com/python-cachier/cachier/releases/tag/v${version}";
+    changelog = "https://github.com/python-cachier/cachier/releases/tag/${src.tag}";
     description = "Persistent, stale-free, local and cross-machine caching for functions";
     mainProgram = "cachier";
     maintainers = with lib.maintainers; [ pbsds ];

From a0cf1ab1c02b8f57164bc41821546f3711fdc5b7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:14 +0200
Subject: [PATCH 0642/3724] python3Packages.caldav: 1.6.0 -> 2.0.1

https://github.com/python-caldav/caldav/blob/v2.0.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/caldav/default.nix         | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix
index 99a18e14a498..bbff613096a2 100644
--- a/pkgs/development/python-modules/caldav/default.nix
+++ b/pkgs/development/python-modules/caldav/default.nix
@@ -5,33 +5,35 @@
   icalendar,
   lxml,
   pytestCheckHook,
-  pythonOlder,
   python,
   recurring-ical-events,
   requests,
-  setuptools,
-  setuptools-scm,
+  hatchling,
+  hatch-vcs,
+  proxy-py,
+  pyfakefs,
   toPythonModule,
   tzlocal,
   vobject,
   xandikos,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "caldav";
-  version = "1.6.0";
+  version = "2.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-caldav";
     repo = "caldav";
     tag = "v${version}";
-    hash = "sha256-SWecaXiXp8DSOLVWzgPsbL7UGCtTBfNXYmuDQGdyqbQ=";
+    hash = "sha256-n7ZKTBXg66firbS34J41NrTM/PL/OrKMnS4iguRz4Ho=";
   };
 
   build-system = [
-    setuptools
-    setuptools-scm
+    hatchling
+    hatch-vcs
   ];
 
   dependencies = [
@@ -43,9 +45,17 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    proxy-py
+    pyfakefs
     pytestCheckHook
     tzlocal
     (toPythonModule (xandikos.override { python3Packages = python.pkgs; }))
+    writableTmpDirAsHomeHook
+  ];
+
+  disabledTestPaths = [
+    "tests/test_docs.py"
+    "tests/test_examples.py"
   ];
 
   pythonImportsCheck = [ "caldav" ];
@@ -53,7 +63,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "CalDAV (RFC4791) client library";
     homepage = "https://github.com/python-caldav/caldav";
-    changelog = "https://github.com/python-caldav/caldav/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/python-caldav/caldav/blob/${src.tag}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [
       marenz

From a2db2d2b32c8732ce918e22bc4b2277977f75de4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:15 +0200
Subject: [PATCH 0643/3724] python3Packages.canonical-sphinx-extensions: 0.0.27
 -> 0.0.33

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/canonical-sphinx-extensions/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix b/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix
index d87c3c5dd876..c4c8d9dab408 100644
--- a/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix
+++ b/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "canonical-sphinx-extensions";
-  version = "0.0.27";
+  version = "0.0.33";
   pyproject = true;
 
   src = fetchPypi {
     pname = "canonical_sphinx_extensions";
     inherit version;
-    hash = "sha256-ZorSmn+PAVS8xO7X3zk6u3W7pn3JB9w0PhFAXzv6l78=";
+    hash = "sha256-Rb4FK1e0pb+fub58Fq61i3kMhRm/nekHNr91zft8iJY=";
   };
 
   build-system = [

From 554fc0a062d34e1212b3fe1d77960abcb9801a9a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:16 +0200
Subject: [PATCH 0644/3724] python3Packages.cantools: 40.2.3 -> 40.3.0

https://github.com/cantools/cantools/releases/tag/40.3.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/cantools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix
index 2710187e569d..2fd9f9b31bab 100644
--- a/pkgs/development/python-modules/cantools/default.nix
+++ b/pkgs/development/python-modules/cantools/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "cantools";
-  version = "40.2.3";
+  version = "40.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-PFXL19fVJ6VluYEj+7uPXfCRMvdM63Iv9UH9gLWZFCQ=";
+    hash = "sha256-xucuPUaMi3ECi+vPR3MFcE74F95eTWlGS/CNIoi+gSU=";
   };
 
   nativeBuildInputs = [

From f7fac278636fbccb1100c4ded8dd4683d99312f7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:17 +0200
Subject: [PATCH 0645/3724] python3Packages.cartopy: 0.24.1 -> 0.25.0

https://github.com/SciTools/cartopy/releases/tag/v0.25.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/cartopy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index fc842ff4fd4c..8df52e398f07 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "cartopy";
-  version = "0.24.1";
+  version = "0.25.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AckQ1WNMaafv3sRuChfUc9Iyh2fwAdTcC1xLSOWFyL0=";
+    hash = "sha256-VfGjkOXz8HWyIcfZH7ECWK2XjbeGx5MOugbrRdKHU/4=";
   };
 
   build-system = [ setuptools-scm ];

From fac9a244eb49078095a867c853fdace7fa7f2b33 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:18 +0200
Subject: [PATCH 0646/3724] python3Packages.catppuccin: 2.4.1 -> 2.5.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/catppuccin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/catppuccin/default.nix b/pkgs/development/python-modules/catppuccin/default.nix
index d0fc7210c542..84b5be78fc3f 100644
--- a/pkgs/development/python-modules/catppuccin/default.nix
+++ b/pkgs/development/python-modules/catppuccin/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "catppuccin";
-  version = "2.4.1";
+  version = "2.5.0";
 
   pyproject = true;
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "catppuccin";
     repo = "python";
     tag = "v${version}";
-    hash = "sha256-lQsJnzOnyDIUu1mbydiyfRwh0zCRGU35p0Kn2a3H/48=";
+    hash = "sha256-wumJ8kpr+C2pdw8jYf+IqYTdSB6Iy37yZqPKycYmOSs=";
   };
 
   build-system = [ hatchling ];

From c90b8e51f896c10b30198332cf46aa948e4aebde Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:20 +0200
Subject: [PATCH 0647/3724] python3Packages.cattrs: 24.1.3 -> 25.1.1

https://github.com/python-attrs/cattrs/blob/v25.1.1/HISTORY.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/cattrs/default.nix         | 28 +++----------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix
index ee3d8559806f..9d635cd1c9bb 100644
--- a/pkgs/development/python-modules/cattrs/default.nix
+++ b/pkgs/development/python-modules/cattrs/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   cbor2,
   fetchFromGitHub,
-  fetchpatch2,
   exceptiongroup,
   hatchling,
   hatch-vcs,
@@ -26,34 +25,16 @@
 
 buildPythonPackage rec {
   pname = "cattrs";
-  version = "24.1.3";
+  version = "25.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-attrs";
     repo = "cattrs";
     tag = "v${version}";
-    hash = "sha256-yrrb2Lvq7zMzeOLr8wwxVsKmPYEZxzDKR2mnCMNuHdE=";
+    hash = "sha256-kaB/UJcd4E4PUkz6mD53lXtmj4Z4P+Tuu7bSljYVOO4=";
   };
 
-  patches = [
-    # https://github.com/python-attrs/cattrs/pull/576
-    (fetchpatch2 {
-      name = "attrs-24_2-compatibility1.patch";
-      url = "https://github.com/python-attrs/cattrs/commit/2d37226ff19506e23bbc291125a29ce514575819.patch";
-      excludes = [
-        "pyproject.toml"
-        "pdm.lock"
-      ];
-      hash = "sha256-nbk7rmOFk42DXYdOgw4Oe3gl3HbxNEtaJ7ZiVSBb3YA=";
-    })
-    (fetchpatch2 {
-      name = "attrs-24_2-compatibility2.patch";
-      url = "https://github.com/python-attrs/cattrs/commit/4bd6dde556042241c6381e1993cedd6514921f58.patch";
-      hash = "sha256-H1xSAYjvVUI8/jON3LWg2F2TlSxejf6TU1jpCeqly6I=";
-    })
-  ];
-
   build-system = [
     hatchling
     hatch-vcs
@@ -61,10 +42,10 @@ buildPythonPackage rec {
 
   dependencies = [
     attrs
+    typing-extensions
   ]
   ++ lib.optionals (pythonOlder "3.11") [
     exceptiongroup
-    typing-extensions
   ];
 
   nativeCheckInputs = [
@@ -79,7 +60,6 @@ buildPythonPackage rec {
     pytestCheckHook
     pyyaml
     tomlkit
-    typing-extensions
     ujson
   ];
 
@@ -117,7 +97,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python custom class converters for attrs";
     homepage = "https://github.com/python-attrs/cattrs";
-    changelog = "https://github.com/python-attrs/cattrs/blob/${src.rev}/HISTORY.md";
+    changelog = "https://github.com/python-attrs/cattrs/blob/${src.tag}/HISTORY.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
   };

From 63e9c5cb5ce054d9fd8a472aa8e008a4bf3b6930 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:21 +0200
Subject: [PATCH 0648/3724] python3Packages.causal-conv1d: 1.5.0.post8 -> 1.5.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/causal-conv1d/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/causal-conv1d/default.nix b/pkgs/development/python-modules/causal-conv1d/default.nix
index 924cc8b07df3..ffc494ce6ff3 100644
--- a/pkgs/development/python-modules/causal-conv1d/default.nix
+++ b/pkgs/development/python-modules/causal-conv1d/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "causal-conv1d";
-  version = "1.5.0.post8";
+  version = "1.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Dao-AILab";
     repo = "causal-conv1d";
     tag = "v${version}";
-    hash = "sha256-CuDAEjRG6NGCoYx5r8pFVnec+3Pqh8ZldzTVx09N6E0=";
+    hash = "sha256-B2I5QiJl0p5d1BeQcMbJBAYUb10HzqFd88QMM8Rerm0=";
   };
 
   build-system = [

From c6c2544221bb97a2811ceb62fb29018ccf7c07ae Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:22 +0200
Subject: [PATCH 0649/3724] python3Packages.celery-redbeat: 2.3.2 -> 2.3.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/celery-redbeat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/celery-redbeat/default.nix b/pkgs/development/python-modules/celery-redbeat/default.nix
index f79f5e94b4bf..c8d04153df73 100644
--- a/pkgs/development/python-modules/celery-redbeat/default.nix
+++ b/pkgs/development/python-modules/celery-redbeat/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "celery-redbeat";
-  version = "2.3.2";
+  version = "2.3.3";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "sibson";
     repo = "redbeat";
     tag = "v${version}";
-    hash = "sha256-nUVioETVIAjLPOmhBSf+bOUsYuV1C1VGwHz5KjbIjHc=";
+    hash = "sha256-bptEAOVxuwj9Y7LyBhtMU22Z1uCiJ4O4BZT2ytqQI80=";
   };
 
   propagatedBuildInputs = [

From f601eb9aceecb95d4b58b7ccc5f82c56b843650c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:23 +0200
Subject: [PATCH 0650/3724] python3Packages.certbot: 4.0.0 -> 4.1.1

https://github.com/certbot/certbot/blob/v4.1.1/certbot/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/certbot/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index 08cb1c05d5e5..0bb466a705b5 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "certbot";
-  version = "4.0.0";
+  version = "4.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "certbot";
     repo = "certbot";
     tag = "v${version}";
-    hash = "sha256-GS4JLLXrX4+BQ4S6ySbOHUaUthCFYTCHWnOaMpfnIj8=";
+    hash = "sha256-nlNjBbXd4ujzVx10+UwqbXliuLVVf+UHR8Dl5CQzsZo=";
   };
 
   postPatch = "cd certbot"; # using sourceRoot would interfere with patches
@@ -66,6 +66,11 @@ buildPythonPackage rec {
     "-Wignore::DeprecationWarning"
   ];
 
+  disabledTests = [
+    # network access
+    "test_lock_order"
+  ];
+
   makeWrapperArgs = [ "--prefix PATH : ${dialog}/bin" ];
 
   # certbot.withPlugins has a similar calling convention as python*.withPackages

From d279d9851fc56d4f655e6ef2d21e3a29c2a4fcef Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:24 +0200
Subject: [PATCH 0651/3724] python3Packages.cfn-lint: 1.32.1 -> 1.38.2

https://github.com/aws-cloudformation/cfn-lint/blob/v1.38.2/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/cfn-lint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix
index b13885318ae2..1f3434430a7c 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/pkgs/development/python-modules/cfn-lint/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "cfn-lint";
-  version = "1.32.1";
+  version = "1.38.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "aws-cloudformation";
     repo = "cfn-lint";
     tag = "v${version}";
-    hash = "sha256-s0CYQ6r3rA1PEiZ9LLFL3RC2PdfCgZHTqQ9nZUi1m+Q=";
+    hash = "sha256-oHbTB4XOyYSazyhO6No2+Z9QRR8tnuB3E4kGzG1HwTk=";
   };
 
   build-system = [ setuptools ];

From 104c6eab3ac4c9a591e99bff5290101a8768754c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:25 +0200
Subject: [PATCH 0652/3724] python3Packages.cgen: 2020.1 -> 2025.1

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/cgen/default.nix           | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix
index 186422a49c34..0821e5fc84ad 100644
--- a/pkgs/development/python-modules/cgen/default.nix
+++ b/pkgs/development/python-modules/cgen/default.nix
@@ -2,30 +2,32 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  hatchling,
   pytools,
   numpy,
-  pytest,
+  typing-extensions,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "cgen";
-  version = "2020.1";
-  format = "setuptools";
+  version = "2025.1";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4ec99d0c832d9f95f5e51dd18a629ad50df0b5464ce557ef42c6e0cd9478bfcf";
+    hash = "sha256-efAeAQ1JwT5YtMqPLUmWprcXiWj18tkGJiczSArnotQ=";
   };
 
-  nativeCheckInputs = [ pytest ];
-  propagatedBuildInputs = [
+  build-system = [ hatchling ];
+
+  dependencies = [
     pytools
     numpy
+    typing-extensions
   ];
 
-  checkPhase = ''
-    pytest
-  '';
+  nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {
     description = "C/C++ source generation from an AST";

From a2bca54c47226e7fb5047907501f2527c6298d9a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:26 +0200
Subject: [PATCH 0653/3724] python3Packages.checkdmarc: 5.8.1 -> 5.8.6

https://github.com/domainaware/checkdmarc/blob/5.8.6/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/checkdmarc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix
index 2f7c6473fc94..fcf750f68395 100644
--- a/pkgs/development/python-modules/checkdmarc/default.nix
+++ b/pkgs/development/python-modules/checkdmarc/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "checkdmarc";
-  version = "5.8.1";
+  version = "5.8.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "domainaware";
     repo = "checkdmarc";
     tag = version;
-    hash = "sha256-mdEfVfqK277A8QUc8rpLxS2pfdyg4Z5XqWpWkh9mFLk=";
+    hash = "sha256-MlHRBedBbcFbVga5q0havdD6M/YOlFW8SX0k1tRngmc=";
   };
 
   pythonRelaxDeps = [ "xmltodict" ];

From b2ccd090762eb3ac330c4d43d8c17ed4ada8eb64 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:27 +0200
Subject: [PATCH 0654/3724] python3Packages.cirq-core: 1.5.0 -> 1.6.0

https://github.com/quantumlib/Cirq/releases/tag/v1.6.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/cirq-core/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix
index 7391d4563145..f0962e14788a 100644
--- a/pkgs/development/python-modules/cirq-core/default.nix
+++ b/pkgs/development/python-modules/cirq-core/default.nix
@@ -37,14 +37,14 @@
 
 buildPythonPackage rec {
   pname = "cirq-core";
-  version = "1.5.0";
+  version = "1.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "quantumlib";
     repo = "cirq";
     tag = "v${version}";
-    hash = "sha256-4FgXX4ox7BkjmLecxsvg0/JpcrHPn6hlFw5rk4bn9Cc=";
+    hash = "sha256-LlWv4wWQWZsTB9JXS21O1WkIYhKkJwY5SM70hnzfnDQ=";
   };
 
   sourceRoot = "${src.name}/${pname}";
@@ -105,7 +105,7 @@ buildPythonPackage rec {
   meta = {
     description = "Framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits";
     homepage = "https://github.com/quantumlib/cirq";
-    changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}";
+    changelog = "https://github.com/quantumlib/Cirq/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       drewrisinger

From ff7f274de49bf9ec7fb64f10095df8540476d578 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:29 +0200
Subject: [PATCH 0655/3724] python3Packages.clarifai-grpc: 11.5.5 -> 11.6.6

https://github.com/Clarifai/clarifai-python-grpc/releases/tag/11.6.6

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/clarifai-grpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix
index 632a7d39c118..84a99d7ff11d 100644
--- a/pkgs/development/python-modules/clarifai-grpc/default.nix
+++ b/pkgs/development/python-modules/clarifai-grpc/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "clarifai-grpc";
-  version = "11.5.5";
+  version = "11.6.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Clarifai";
     repo = "clarifai-python-grpc";
     tag = version;
-    hash = "sha256-ijfuZh35HpmR3p7n2S+cCpcO4ld52StQOpxgPJtRqM4=";
+    hash = "sha256-/LCTiGJOdvMp+I/Gl0iySMg5MTPjBi3FatnkfifFkG0=";
   };
 
   build-system = [ setuptools ];

From 81bc38e9b2c0ef22092a2b5b8cf2eef39308b439 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:30 +0200
Subject: [PATCH 0656/3724] python3Packages.clarifai: 11.0.5 -> 11.6.7

https://github.com/Clarifai/clarifai-python/releases/tag/11.6.7

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/clarifai/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix
index 433df5084cb5..f0cd9a2468f2 100644
--- a/pkgs/development/python-modules/clarifai/default.nix
+++ b/pkgs/development/python-modules/clarifai/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "clarifai";
-  version = "11.0.5";
+  version = "11.6.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "Clarifai";
     repo = "clarifai-python";
     tag = version;
-    hash = "sha256-JLZGVVrvGVUWr7WCTu2alVl+4GuYqLWP2dodgxYbmgc=";
+    hash = "sha256-1ftwsIKJ494F8q45x0LtvOZhM72AAhJWe0LligNNpkQ=";
   };
 
   pythonRelaxDeps = [

From d7ce61ef626bc65e81939cd983577f7091a2bb70 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:32 +0200
Subject: [PATCH 0657/3724] python3Packages.cli-helpers: 2.4.0 -> 2.7.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/cli-helpers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix
index 9655cd190758..fdd1962b5c87 100644
--- a/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/pkgs/development/python-modules/cli-helpers/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "cli-helpers";
-  version = "2.4.0";
+  version = "2.7.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "cli_helpers";
     inherit version;
-    hash = "sha256-VZA7cFohKkc3Mdsg+ib1hlXjVAeLmcsTyZ7AaUAoek0=";
+    hash = "sha256-YtEXENvrwvxGAAPeEhVogyXYY2hZBW1oizhBm9QEi8A=";
   };
 
   propagatedBuildInputs = [

From e23d04d3d2152f8073d081b57db9d6c3f9a65885 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:33 +0200
Subject: [PATCH 0658/3724] python3Packages.click-plugins: 1.1.1 -> 1.1.1.2

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/click-plugins/default.nix       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix
index bf4a347b92d7..2a5d4ccd334f 100644
--- a/pkgs/development/python-modules/click-plugins/default.nix
+++ b/pkgs/development/python-modules/click-plugins/default.nix
@@ -4,19 +4,23 @@
   fetchPypi,
   click,
   pytest,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "click-plugins";
-  version = "1.1.1";
-  format = "setuptools";
+  version = "1.1.1.2";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "46ab999744a9d831159c3411bb0c79346d94a444df9a3a3742e9ed63645f264b";
+    pname = "click_plugins";
+    inherit version;
+    sha256 = "sha256-1685hKmdJDwTGqGoKDMedjD0qIqXQf0FySeyBLz5ImE=";
   };
 
-  propagatedBuildInputs = [ click ];
+  build-system = [ setuptools ];
+
+  dependencies = [ click ];
 
   nativeCheckInputs = [ pytest ];
 

From 076feb423092a6844b3a2cc2390915b12c3e1125 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:34 +0200
Subject: [PATCH 0659/3724] python3Packages.clickhouse-connect: 0.8.17 ->
 0.8.18

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/clickhouse-connect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix
index 3600ddedd7fe..020ecd26d6df 100644
--- a/pkgs/development/python-modules/clickhouse-connect/default.nix
+++ b/pkgs/development/python-modules/clickhouse-connect/default.nix
@@ -24,7 +24,7 @@
 }:
 buildPythonPackage rec {
   pname = "clickhouse-connect";
-  version = "0.8.17";
+  version = "0.8.18";
 
   format = "setuptools";
 
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     repo = "clickhouse-connect";
     owner = "ClickHouse";
     tag = "v${version}";
-    hash = "sha256-UFsAKROnzaaAyUDHHARZIO8zZP3knUYoBdGSf9ZGjXo=";
+    hash = "sha256-lU35s8hldexyH8YC942r+sYm5gZCWqO2GXW0qtTTWWY=";
   };
 
   nativeBuildInputs = [ cython ];

From 1dc13fba1d20987c66fc202da5980ba5f7ebb04c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:35 +0200
Subject: [PATCH 0660/3724] python3Packages.cma: 4.0.0 -> 4.3.0

https://github.com/CMA-ES/pycma/releases/tag/rr4.3.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/cma/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix
index 88d0a858d387..82b689d06ddd 100644
--- a/pkgs/development/python-modules/cma/default.nix
+++ b/pkgs/development/python-modules/cma/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "cma";
-  version = "4.0.0";
+  version = "4.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "CMA-ES";
     repo = "pycma";
     tag = "r${version}";
-    hash = "sha256-W4KDtX/Ho/XUrZr2cmS66Q0q90FEHRJN0VF4sMgonRw=";
+    hash = "sha256-2uCn5CZma9RLK8zaaPhiQCqnK+2dWgLNr5+Ck2cV6vI=";
   };
 
   build-system = [ setuptools ];
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library for Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization";
     homepage = "https://github.com/CMA-ES/pycma";
-    changelog = "https://github.com/CMA-ES/pycma/releases/tag/r${version}";
+    changelog = "https://github.com/CMA-ES/pycma/releases/tag/r${src.tag}";
     license = licenses.bsd3;
     maintainers = [ ];
   };

From 763be85735fe78feef20d2401414fc2b0e00c000 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:36 +0200
Subject: [PATCH 0661/3724] python3Packages.cmd2: 2.6.1 -> 2.7.0

https://github.com/python-cmd2/cmd2/releases/tag/2.7.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/cmd2/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index 2a49262b1662..4f3a9c1330f7 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -1,9 +1,7 @@
 {
   lib,
   stdenv,
-  attrs,
   buildPythonPackage,
-  colorama,
   fetchPypi,
   glibcLocales,
   gnureadline,
@@ -12,28 +10,28 @@
   pytest-mock,
   pytestCheckHook,
   pythonOlder,
+  rich-argparse,
   setuptools-scm,
   wcwidth,
 }:
 
 buildPythonPackage rec {
   pname = "cmd2";
-  version = "2.6.1";
+  version = "2.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ZQpYkr8psjPT1ndbXjzIE2SM/w15E09weYH2a6rtn0I=";
+    hash = "sha256-gdgTW0YhDh0DpagQuvhZBppiIUeIzu7DWI9E7thvvus=";
   };
 
   build-system = [ setuptools-scm ];
 
   dependencies = [
-    attrs
-    colorama
     pyperclip
+    rich-argparse
     wcwidth
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin gnureadline;

From fc1c3d1f8bc75ff0a98cdf40ffedc261fc1a805e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:37 +0200
Subject: [PATCH 0662/3724] python3Packages.codepy: 2019.1 -> 2025.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/codepy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/codepy/default.nix b/pkgs/development/python-modules/codepy/default.nix
index cf0410cc592c..44121e8a81da 100644
--- a/pkgs/development/python-modules/codepy/default.nix
+++ b/pkgs/development/python-modules/codepy/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "codepy";
-  version = "2019.1";
+  version = "2025.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "inducer";
     repo = "codepy";
-    rev = "v${version}";
-    hash = "sha256-viMfB/nDrvDA/IGRZEX+yXylxbbmqbh/fgdYXBzK0zM=";
+    tag = "v${version}";
+    hash = "sha256-PHIC3q9jQlRRoUoemVtyrl5hcZXMX28gRkI5Xpk9yBY=";
   };
 
   buildInputs = [

From 05d04a93af8473fc9da5b9a359dae5e2f1dba7a8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:38 +0200
Subject: [PATCH 0663/3724] python3Packages.cohere: 5.15.0 -> 5.16.2

https://github.com/cohere-ai/cohere-python/releases/tag/5.16.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/cohere/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix
index afd0c794cf8c..bcc2fb709123 100644
--- a/pkgs/development/python-modules/cohere/default.nix
+++ b/pkgs/development/python-modules/cohere/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "cohere";
-  version = "5.15.0";
+  version = "5.16.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cohere-ai";
     repo = "cohere-python";
     tag = version;
-    hash = "sha256-X/6eAST9du6GT3j0d1xZuYfzN5p7rYlgGIIqv7V6vik=";
+    hash = "sha256-/knKmNbvMC+efdY+0adM62W81e/pMhGCxLU0KwxUhOE=";
   };
 
   build-system = [ poetry-core ];

From f79319d686d82383073fde65054805422c425901 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:40 +0200
Subject: [PATCH 0664/3724] python3Packages.coincurve: 20.0.0 -> 21.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/coincurve/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix
index 01d8b292cbef..d70b8a020255 100644
--- a/pkgs/development/python-modules/coincurve/default.nix
+++ b/pkgs/development/python-modules/coincurve/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "coincurve";
-  version = "20.0.0";
+  version = "21.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "ofek";
     repo = "coincurve";
     tag = "v${version}";
-    hash = "sha256-NKx/iLuzFEu1UBuwa14x55Ab3laVAKEtX6dtoWi0dOg=";
+    hash = "sha256-+8/CsV2BTKZ5O2LIh5/kOKMfFrkt2Jsjuj37oiOgO6Y=";
   };
 
   build-system = [

From 4607929906c4408c79e3727be275e4a0861de009 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:42 +0200
Subject: [PATCH 0665/3724] python3Packages.comm: 0.2.2 -> 0.2.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/comm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/comm/default.nix b/pkgs/development/python-modules/comm/default.nix
index 228381305e7a..9ef330e6be2a 100644
--- a/pkgs/development/python-modules/comm/default.nix
+++ b/pkgs/development/python-modules/comm/default.nix
@@ -9,7 +9,7 @@
 
 let
   pname = "comm";
-  version = "0.2.2";
+  version = "0.2.3";
 in
 buildPythonPackage {
   inherit pname version;
@@ -19,7 +19,7 @@ buildPythonPackage {
     owner = "ipython";
     repo = "comm";
     tag = "v${version}";
-    hash = "sha256-51HSSULhbKb1NdLJ//b3Vh6sOLWp0B4KW469htpduqM=";
+    hash = "sha256-gDggPu2h43lGyovTND9a3o9F2hWppV5uvAJa78JxJCo=";
   };
 
   nativeBuildInputs = [ hatchling ];

From 3804955c6fbc7dca06d413c943d29aef01fe848e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:45 +0200
Subject: [PATCH 0666/3724] python3Packages.compressed-tensors: 0.9.2 -> 0.10.2

https://github.com/neuralmagic/compressed-tensors/releases/tag/0.10.2

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/compressed-tensors/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/compressed-tensors/default.nix b/pkgs/development/python-modules/compressed-tensors/default.nix
index dd9b49ac57f7..4c5eea81b0b6 100644
--- a/pkgs/development/python-modules/compressed-tensors/default.nix
+++ b/pkgs/development/python-modules/compressed-tensors/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "compressed-tensors";
-  version = "0.9.2";
+  version = "0.10.2";
   pyproject = true;
 
   # Release on PyPI is missing the `utils` directory, which `setup.py` wants to import
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "neuralmagic";
     repo = "compressed-tensors";
     tag = version;
-    hash = "sha256-PxW8zseDUF0EOh7E/N8swwgFTfvkoTpp+d3ngAUpFNU=";
+    hash = "sha256-BJsMyCs+rupt5+i5JlO7oY08Udc8hI3ZnMiN+8ja0mc=";
   };
 
   build-system = [ setuptools ];
@@ -61,7 +61,7 @@ buildPythonPackage rec {
   meta = {
     description = "Safetensors extension to efficiently store sparse quantized tensors on disk";
     homepage = "https://github.com/neuralmagic/compressed-tensors";
-    changelog = "https://github.com/neuralmagic/compressed-tensors/releases/tag/${version}";
+    changelog = "https://github.com/neuralmagic/compressed-tensors/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };

From 25d3205d43a95326b3f8808692bf2258c0036329 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:46 +0200
Subject: [PATCH 0667/3724] python3Packages.concurrent-log-handler: 0.9.26 ->
 0.9.28

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/concurrent-log-handler/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/concurrent-log-handler/default.nix b/pkgs/development/python-modules/concurrent-log-handler/default.nix
index 777a232ce1dd..752a59b9222b 100644
--- a/pkgs/development/python-modules/concurrent-log-handler/default.nix
+++ b/pkgs/development/python-modules/concurrent-log-handler/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "concurrent-log-handler";
-  version = "0.9.26";
+  version = "0.9.28";
   pyproject = true;
 
   src = fetchPypi {
     pname = "concurrent_log_handler";
     inherit version;
-    hash = "sha256-jyK/eXJKAVK56X2cLc9OyzOWB8gL8xL2gGYHAkMAa0k=";
+    hash = "sha256-TMJ5abNCAjm9FTd5Jm9A2XE+zoFOMSt6p1POYsbqzbg=";
   };
 
   build-system = [ hatchling ];

From a695cc75f2b27bc4b182be3d2f97046eb83a239d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:47 +0200
Subject: [PATCH 0668/3724] python3Packages.conda: 25.5.1 -> 25.7.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/conda/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix
index 06e04c0b04ed..cc9512bd9bbc 100644
--- a/pkgs/development/python-modules/conda/default.nix
+++ b/pkgs/development/python-modules/conda/default.nix
@@ -28,7 +28,7 @@
 buildPythonPackage rec {
   __structuredAttrs = true;
   pname = "conda";
-  version = "25.5.1";
+  version = "25.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "conda";
     repo = "conda";
     tag = version;
-    hash = "sha256-BHy0t+5jz1WdSElCQBgFh5VJC3iIYelS01iQeQByr+0=";
+    hash = "sha256-lvqR1ksYE23enSf4pxFpb/Z8yPoU9bVb4Hi2ZrhI0XA=";
   };
 
   build-system = [

From 86702b6b75292d7ba729267bf379367decf45ac9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:48 +0200
Subject: [PATCH 0669/3724] python3Packages.configargparse: 1.7 -> 1.7.1

https://github.com/bw2/ConfigArgParse/releases/tag/1.7.1

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/configargparse/default.nix |  11 +-
 .../configargparse/python3.13-compat.patch    | 112 ------------------
 2 files changed, 3 insertions(+), 120 deletions(-)
 delete mode 100644 pkgs/development/python-modules/configargparse/python3.13-compat.patch

diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix
index df563510d24f..aa6531fdb91e 100644
--- a/pkgs/development/python-modules/configargparse/default.nix
+++ b/pkgs/development/python-modules/configargparse/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "configargparse";
-  version = "1.7";
+  version = "1.7.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,14 +20,9 @@ buildPythonPackage rec {
     owner = "bw2";
     repo = "ConfigArgParse";
     tag = version;
-    hash = "sha256-m77MY0IZ1AJkd4/Y7ltApvdF9y17Lgn92WZPYTCU9tA=";
+    hash = "sha256-wrWfQzr0smM83helOEJPbayrEpAtXJYYXIw4JnGLNho=";
   };
 
-  patches = [
-    # https://github.com/bw2/ConfigArgParse/pull/295
-    ./python3.13-compat.patch
-  ];
-
   optional-dependencies = {
     yaml = [ pyyaml ];
   };
@@ -48,7 +43,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Drop-in replacement for argparse";
     homepage = "https://github.com/bw2/ConfigArgParse";
-    changelog = "https://github.com/bw2/ConfigArgParse/releases/tag/${version}";
+    changelog = "https://github.com/bw2/ConfigArgParse/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/configargparse/python3.13-compat.patch b/pkgs/development/python-modules/configargparse/python3.13-compat.patch
deleted file mode 100644
index a079f37a18e6..000000000000
--- a/pkgs/development/python-modules/configargparse/python3.13-compat.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From c6a974211f1a13d492bb807ff6d07cefcc948a87 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 12 Jul 2024 08:15:40 +0200
-Subject: [PATCH 1/2] update test expectations for Python 3.13
-
-Python 3.13 no longer repeats the placeholder for options with multiple
-aliases in the help message.  For example, rather than:
-
-    -c CONFIG_FILE, --config CONFIG_FILE
-
-it now outputs:
-
-    -c, --config CONFIG_FILE
-
-Update the regular expressions to account for both possibilities.
-
-Fixes #294
----
- tests/test_configargparse.py | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py
-index 288e082..e325afd 100644
---- a/tests/test_configargparse.py
-+++ b/tests/test_configargparse.py
-@@ -271,9 +271,9 @@ def testBasicCase2(self, use_groups=False):
-                 '  -h, --help \\s+ show this help message and exit\n'
-                 '  --genome GENOME \\s+ Path to genome file\n'
-                 '  -v\n'
--                '  -g MY_CFG_FILE, --my-cfg-file MY_CFG_FILE\n'
--                '  -d DBSNP, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n'
--                '  -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING +
-+                '  -g( MY_CFG_FILE)?, --my-cfg-file MY_CFG_FILE\n'
-+                '  -d( DBSNP)?, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n'
-+                '  -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING +
-                 7*r'(.+\s*)')
-         else:
-             self.assertRegex(self.format_help(),
-@@ -286,10 +286,10 @@ def testBasicCase2(self, use_groups=False):
-                 'g1:\n'
-                 '  --genome GENOME \\s+ Path to genome file\n'
-                 '  -v\n'
--                '  -g MY_CFG_FILE, --my-cfg-file MY_CFG_FILE\n\n'
-+                '  -g( MY_CFG_FILE)?, --my-cfg-file MY_CFG_FILE\n\n'
-                 'g2:\n'
--                '  -d DBSNP, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n'
--                '  -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING +
-+                '  -d( DBSNP)?, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n'
-+                '  -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING +
-                 7*r'(.+\s*)')
- 
-         self.assertParseArgsRaises("invalid choice: 'ZZZ'",
-@@ -387,9 +387,9 @@ def testMutuallyExclusiveArgs(self):
-             ' \\s*-f2 TYPE2_CFG_FILE\\)\\s+\\(-f FRMT \\| -b\\)\n\n'
-             '%s:\n'
-             '  -h, --help            show this help message and exit\n'
--            '  -f1 TYPE1_CFG_FILE, --type1-cfg-file TYPE1_CFG_FILE\n'
--            '  -f2 TYPE2_CFG_FILE, --type2-cfg-file TYPE2_CFG_FILE\n'
--            '  -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n'
-+            '  -f1( TYPE1_CFG_FILE)?, --type1-cfg-file TYPE1_CFG_FILE\n'
-+            '  -f2( TYPE2_CFG_FILE)?, --type2-cfg-file TYPE2_CFG_FILE\n'
-+            '  -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n'
-             '  -b, --bam\\s+\\[env var: BAM_FORMAT\\]\n\n'
-             'group1:\n'
-             '  --genome GENOME       Path to genome file\n'
-@@ -875,7 +875,7 @@ def testConstructor_ConfigFileArgs(self):
-             'usage: .* \\[-h\\] -c CONFIG_FILE --genome GENOME\n\n'
-             '%s:\n'
-             '  -h, --help\\s+ show this help message and exit\n'
--            '  -c CONFIG_FILE, --config CONFIG_FILE\\s+ my config file\n'
-+            '  -c( CONFIG_FILE)?, --config CONFIG_FILE\\s+ my config file\n'
-             '  --genome GENOME\\s+ Path to genome file\n\n'%OPTIONAL_ARGS_STRING +
-             5*r'(.+\s*)')
- 
-@@ -935,8 +935,8 @@ def test_FormatHelp(self):
-             r'\[-w CONFIG_OUTPUT_PATH\]\s* --arg1\s+ARG1\s*\[--flag\]\s*'
-             '%s:\\s*'
-             '-h, --help \\s* show this help message and exit '
--            r'-c CONFIG_FILE, --config CONFIG_FILE\s+my config file '
--            r'-w CONFIG_OUTPUT_PATH, --write-config CONFIG_OUTPUT_PATH takes '
-+            r'-c( CONFIG_FILE)?, --config CONFIG_FILE\s+my config file '
-+            r'-w( CONFIG_OUTPUT_PATH)?, --write-config CONFIG_OUTPUT_PATH takes '
-             r'the current command line args and writes them '
-             r'out to a config file at the given path, then exits '
-             r'--arg1 ARG1 Arg1 help text '
-
-From 5e9f442374bc6d9707a43df13aaff684dff6b535 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 12 Jul 2024 08:25:30 +0200
-Subject: [PATCH 2/2] skip exit_on_error* tests to fix 3.13 test failures
-
-Skip `exit_on_error*` tests from `test.test_argparse` to avoid test
-failures on Python 3.13.  The `exit_on_error=False` semantics
-is not supported by ConfigArgParse at the moment.
----
- tests/test_configargparse.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py
-index e325afd..9718d86 100644
---- a/tests/test_configargparse.py
-+++ b/tests/test_configargparse.py
-@@ -1533,7 +1533,8 @@ def testYAMLConfigFileParser_w_ArgumentParser_parsed_values(self):
-     test_argparse_source_code = test_argparse_source_code.replace(
-         'argparse.ArgumentParser', 'configargparse.ArgumentParser').replace(
-         'TestHelpFormattingMetaclass', '_TestHelpFormattingMetaclass').replace(
--        'test_main', '_test_main')
-+        'test_main', '_test_main').replace(
-+        'test_exit_on_error', '_test_exit_on_error')
- 
-     # pytest tries to collect tests from TestHelpFormattingMetaclass, and
-     # test_main, and raises a warning when it finds it's not a test class

From 93750d80099e80fd756809a44844e82602b49ade Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 03:05:49 +0200
Subject: [PATCH 0670/3724] rdkafka: 2.10.1 -> 2.11.0

https://github.com/confluentinc/librdkafka/compare/refs/tags/v2.10.1...refs/tags/v2.11.0
---
 pkgs/by-name/rd/rdkafka/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/rd/rdkafka/package.nix b/pkgs/by-name/rd/rdkafka/package.nix
index 976c1c044179..89c5701e3880 100644
--- a/pkgs/by-name/rd/rdkafka/package.nix
+++ b/pkgs/by-name/rd/rdkafka/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rdkafka";
-  version = "2.10.1";
+  version = "2.11.0";
 
   src = fetchFromGitHub {
     owner = "confluentinc";
     repo = "librdkafka";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-+ACn+1fjWEnUB32gUCoMpnq+6YBu+rufPT8LY920DBk=";
+    sha256 = "sha256-37lCQ+CFeTRQwL6FCl79RSGw+nRKr0DeuXob9CjiVnk=";
   };
 
   outputs = [

From 031ca3a36e5b1d2b790847874909e25c866c8ad1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:50 +0200
Subject: [PATCH 0671/3724] python3Packages.confluent-kafka: 2.10.0 -> 2.11.0

https://github.com/confluentinc/confluent-kafka-python/blob/v2.11.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/confluent-kafka/default.nix    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index e4f6805921f5..7b19da5033d5 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "confluent-kafka";
-  version = "2.10.0";
+  version = "2.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     owner = "confluentinc";
     repo = "confluent-kafka-python";
     tag = "v${version}";
-    hash = "sha256-JJSGYGM/ukEABgzlHbw8xJr1HKVm/EW6EXEIJQBSCt8=";
+    hash = "sha256-s4UeuFXieyUcFJsYHTaJBKfUssYZ7mt4YoHgXN7bZKI=";
   };
 
   buildInputs = [ rdkafka ];
@@ -101,12 +101,15 @@ buildPythonPackage rec {
     "tests/integration/"
     "tests/test_Admin.py"
     "tests/test_misc.py"
+    # Failed: async def functions are not natively supported.
+    "tests/schema_registry/_async"
     # missing cel-python dependency
-    "tests/schema_registry/test_avro_serdes.py"
-    "tests/schema_registry/test_json_serdes.py"
-    "tests/schema_registry/test_proto_serdes.py"
+    "tests/schema_registry/_sync/test_avro_serdes.py"
+    "tests/schema_registry/_sync/test_json_serdes.py"
+    "tests/schema_registry/_sync/test_proto_serdes.py"
     # missing tink dependency
-    "tests/schema_registry/test_config.py"
+    "tests/schema_registry/_async/test_config.py"
+    "tests/schema_registry/_sync/test_config.py"
     # crashes the test runner on shutdown
     "tests/test_KafkaError.py"
   ];

From b3baaea87dce32977a775cf78c2f0c052ef9b04f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:51 +0200
Subject: [PATCH 0672/3724] python3Packages.cons: 0.4.6 -> 0.4.7

https://github.com/pythological/python-cons/releases/tag/v0.4.7

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/cons/default.nix           | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/cons/default.nix b/pkgs/development/python-modules/cons/default.nix
index 2bf66255fd27..14c4c08d0b13 100644
--- a/pkgs/development/python-modules/cons/default.nix
+++ b/pkgs/development/python-modules/cons/default.nix
@@ -6,24 +6,28 @@
   py,
   pytestCheckHook,
   pytest-html,
-  pythonOlder,
+  setuptools,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "cons";
-  version = "0.4.6";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "0.4.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pythological";
     repo = "python-cons";
     tag = "v${version}";
-    hash = "sha256-XssERKiv4A8x7dZhLeFSciN6RCEfGs0or3PAQiYSPII=";
+    hash = "sha256-BS7lThnv+dxtztvw2aRhQa8yx2cRfrZLiXjcwvZ8QR0=";
   };
 
-  propagatedBuildInputs = [ logical-unification ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [ logical-unification ];
 
   nativeCheckInputs = [
     py
@@ -41,7 +45,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Implementation of Lisp/Scheme-like cons in Python";
     homepage = "https://github.com/pythological/python-cons";
-    changelog = "https://github.com/pythological/python-cons/releases/tag/v${version}";
+    changelog = "https://github.com/pythological/python-cons/releases/tag/${src.tag}";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ Etjean ];
   };

From f4d88147b9b78142a6575f4c2efc7398cfba4608 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:52 +0200
Subject: [PATCH 0673/3724] python3Packages.contourpy: 1.3.2 -> 1.3.3

https://github.com/contourpy/contourpy/releases/tag/v1.3.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/contourpy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix
index 3215238120ff..d85e5f8dfbdf 100644
--- a/pkgs/development/python-modules/contourpy/default.nix
+++ b/pkgs/development/python-modules/contourpy/default.nix
@@ -31,7 +31,7 @@
 let
   contourpy = buildPythonPackage rec {
     pname = "contourpy";
-    version = "1.3.2";
+    version = "1.3.3";
     format = "pyproject";
 
     disabled = pythonOlder "3.8";
@@ -40,7 +40,7 @@ let
       owner = "contourpy";
       repo = "contourpy";
       tag = "v${version}";
-      hash = "sha256-mtD54KfCm1vNBjcGuAKqRpKF+FLy3WmTYo7FLoE01QY=";
+      hash = "sha256-/tE+F1wH7YkqfgenXwtcfkjxUR5FwfgoS4NYC6n+/2M=";
     };
 
     # prevent unnecessary references to the build python when cross compiling
@@ -92,7 +92,7 @@ let
     '';
 
     meta = with lib; {
-      changelog = "https://github.com/contourpy/contourpy/releases/tag/v${version}";
+      changelog = "https://github.com/contourpy/contourpy/releases/tag/${src.tag}";
       description = "Python library for calculating contours in 2D quadrilateral grids";
       homepage = "https://github.com/contourpy/contourpy";
       license = licenses.bsd3;

From 9b6cc651dd1ad624b6a09feb30a3f7ec05c21fcd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:53 +0200
Subject: [PATCH 0674/3724] python3Packages.control: 0.10.1 -> 0.10.2

https://github.com/python-control/python-control/releases/tag/0.10.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/control/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/control/default.nix b/pkgs/development/python-modules/control/default.nix
index e7f449273b62..16bb10a94ea0 100644
--- a/pkgs/development/python-modules/control/default.nix
+++ b/pkgs/development/python-modules/control/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "control";
-  version = "0.10.1";
+  version = "0.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-control";
     repo = "python-control";
     tag = version;
-    hash = "sha256-wLDYPuLnsZ2+cXf7j3BxUbn4IjHPt09LE9cjQGXWrO0=";
+    hash = "sha256-E9RZDUK01hzjutq83XdLr3d97NwjmQzt65hqVg2TBGE=";
   };
 
   build-system = [

From 9cfa7f166a54e7a674b864f6dcf3a28f0459c21b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:54 +0200
Subject: [PATCH 0675/3724] python3Packages.copier: 9.6.0 -> 9.9.0

https://github.com/copier-org/copier/blob/v9.9.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/copier/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix
index 0ec4b1471609..74fe3d969934 100644
--- a/pkgs/development/python-modules/copier/default.nix
+++ b/pkgs/development/python-modules/copier/default.nix
@@ -6,6 +6,8 @@
   fetchFromGitHub,
   funcy,
   git,
+  hatchling,
+  hatch-vcs,
   iteration-utilities,
   jinja2,
   jinja2-ansible-filters,
@@ -17,8 +19,6 @@
   packaging,
   pathspec,
   plumbum,
-  poetry-core,
-  poetry-dynamic-versioning,
   pydantic,
   pygments,
   pyyaml,
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "copier";
-  version = "9.6.0";
+  version = "9.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -39,14 +39,14 @@ buildPythonPackage rec {
     postFetch = ''
       rm $out/tests/demo/doc/ma*ana.txt
     '';
-    hash = "sha256-mezmXrOvfqbZGZadNZklQZt/OEKqRYnwugNkZc88t6o=";
+    hash = "sha256-J+8MSlVKJb6Dr48pgy2OCBZpctGsVm23BcV4B9nk7o4=";
   };
 
   POETRY_DYNAMIC_VERSIONING_BYPASS = version;
 
   build-system = [
-    poetry-core
-    poetry-dynamic-versioning
+    hatchling
+    hatch-vcs
   ];
 
   dependencies = [
@@ -77,7 +77,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library and command-line utility for rendering projects templates";
     homepage = "https://copier.readthedocs.io";
-    changelog = "https://github.com/copier-org/copier/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/copier-org/copier/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ greg ];
     mainProgram = "copier";

From 7253c001cbf846a77bc9da1957e89dcd1e6f8d3b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:55 +0200
Subject: [PATCH 0676/3724] python3Packages.coredis: 4.24.0 -> 5.0.1

https://github.com/alisaifee/coredis/blob/5.0.1/HISTORY.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/coredis/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coredis/default.nix b/pkgs/development/python-modules/coredis/default.nix
index 1ed84d1ceb43..c3bd2b0f1859 100644
--- a/pkgs/development/python-modules/coredis/default.nix
+++ b/pkgs/development/python-modules/coredis/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   async-timeout,
+  beartype,
   buildPythonPackage,
   setuptools,
   versioneer,
@@ -18,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "coredis";
-  version = "4.24.0";
+  version = "5.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "alisaifee";
     repo = "coredis";
     tag = version;
-    hash = "sha256-vqgxj366x+TphGxUBXUHJpEM0zAdr6Ia4pDPKGWUx14=";
+    hash = "sha256-LDK/tVGBsuhf0WzGjdCJznUVh9vrtRrjtU0wKpsr/Ag=";
   };
 
   postPatch = ''
@@ -44,6 +45,7 @@ buildPythonPackage rec {
 
   dependencies = [
     async-timeout
+    beartype
     deprecated
     packaging
     pympler

From 3a7f8bc108eedf43505a7a925740c480f0252e0e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:56 +0200
Subject: [PATCH 0677/3724] python3Packages.coverage: 7.9.2 -> 7.10.2

https://github.com/nedbat/coveragepy/blob/7.10.2/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/coverage/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index e7e4029d11a5..06eb295484f3 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -15,22 +15,16 @@
 
 buildPythonPackage rec {
   pname = "coverage";
-  version = "7.9.2";
+  version = "7.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nedbat";
     repo = "coveragepy";
     tag = version;
-    hash = "sha256-gtjmyE6FN3LGZ87PXuPDsyRY1iUNn2D1SfY4H0rbNMM=";
+    hash = "sha256-OXi5FCLcfhseNDerwHdsVHF31Jy+ZSz2RU05vqPxQis=";
   };
 
-  postPatch = ''
-    # don't write to Nix store
-    substituteInPlace tests/conftest.py \
-      --replace-fail 'if WORKER == "none":' "if False:"
-  '';
-
   build-system = [ setuptools ];
 
   optional-dependencies = {

From 8d44a8516f5393eb790f0f0e05d74ed134deaa42 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:57 +0200
Subject: [PATCH 0678/3724] python3Packages.cppy: 1.3.0 -> 1.3.1

https://github.com/nucleic/cppy/releases/tag/1.3.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/cppy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cppy/default.nix b/pkgs/development/python-modules/cppy/default.nix
index b0f48f69927d..14fc793caaba 100644
--- a/pkgs/development/python-modules/cppy/default.nix
+++ b/pkgs/development/python-modules/cppy/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "cppy";
-  version = "1.3.0";
+  version = "1.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "nucleic";
     repo = "cppy";
     tag = version;
-    hash = "sha256-RwwXwdjpq4ZjUyHkWoh3eaJDzIV3MargeoBJ+nTHsyg=";
+    hash = "sha256-/u9JQ2ivjSlBPodfAjeDmJ+HUu1rFZ58p3V5L2dy4Jk=";
   };
 
   build-system = [ setuptools-scm ];

From a6d565f2318b3b8d102f8a1ef7080cceddcc59f0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:58 +0200
Subject: [PATCH 0679/3724] python3Packages.craft-parts: 2.19.0 -> 2.20.0

https://github.com/canonical/craft-parts/releases/tag/2.20.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/craft-parts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix
index cc5769fa57bd..c675d3d4834f 100644
--- a/pkgs/development/python-modules/craft-parts/default.nix
+++ b/pkgs/development/python-modules/craft-parts/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "craft-parts";
-  version = "2.19.0";
+  version = "2.20.0";
 
   pyproject = true;
 
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-parts";
     tag = version;
-    hash = "sha256-qzaQW+bKq+sDjRsDDY5oYQWMX50rEskgxyKwhLpFpt4=";
+    hash = "sha256-apuAV17IlxbkaQvCzyqEhQwTYvqHibwvWHUEPYUiCJQ=";
   };
 
   patches = [ ./bash-path.patch ];

From 290c979ee9e3a912c9211aa86e6e1466588e1876 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:36:59 +0200
Subject: [PATCH 0680/3724] python3Packages.crccheck: 1.3.0 -> 1.3.1

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/crccheck/default.nix          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix
index 0964aa45f5c5..b822ef875f06 100644
--- a/pkgs/development/python-modules/crccheck/default.nix
+++ b/pkgs/development/python-modules/crccheck/default.nix
@@ -2,27 +2,31 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  isPy3k,
   unittestCheckHook,
+  setuptools,
+  setuptools-scm,
 }:
 
 let
   pname = "crccheck";
-  version = "1.3.0";
+  version = "1.3.1";
 in
 buildPythonPackage {
   inherit pname version;
-  format = "setuptools";
-
-  disabled = !isPy3k;
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MartinScharrer";
     repo = "crccheck";
     tag = "v${version}";
-    hash = "sha256-nujt3RWupvCtk7gORejtSwqqVjW9VwztOVGXBHW9T+k=";
+    hash = "sha256-hT+8+moni7turn5MK719b4Xy336htyWWmoMnhgxKkYo=";
   };
 
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
   nativeCheckInputs = [ unittestCheckHook ];
 
   meta = with lib; {

From 553410cb6c72b35734ab34e75741075c7e4f0581 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:00 +0200
Subject: [PATCH 0681/3724] python3Packages.cupy: 13.3.0 -> 13.5.1

https://github.com/cupy/cupy/releases/tag/v13.5.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/cupy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index a8f0cde1f0ca..719a23037325 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -58,7 +58,7 @@ let
 in
 buildPythonPackage rec {
   pname = "cupy";
-  version = "13.3.0";
+  version = "13.5.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -69,7 +69,7 @@ buildPythonPackage rec {
     owner = "cupy";
     repo = "cupy";
     tag = "v${version}";
-    hash = "sha256-eQZwOGCaWZ4b0JCHZlrPHVQVXQwSkibHb02j0czAMt8=";
+    hash = "sha256-8RgyvsU3lnt6nO0J1tiLBOdYsX0jJkjPH/SpKQz4o7s=";
     fetchSubmodules = true;
   };
 
@@ -126,7 +126,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "NumPy-compatible matrix library accelerated by CUDA";
     homepage = "https://cupy.chainer.org/";
-    changelog = "https://github.com/cupy/cupy/releases/tag/v${version}";
+    changelog = "https://github.com/cupy/cupy/releases/tag/${src.tag}";
     license = licenses.mit;
     platforms = [
       "aarch64-linux"

From f9afb0be61eace1c04e1756b8e03d63ab4c2afc7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:01 +0200
Subject: [PATCH 0682/3724] python3Packages.curl-cffi: 0.11.1 -> 0.12.0

https://github.com/lexiforest/curl_cffi/releases/tag/v0.12.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/curl-cffi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix
index 6294177d069e..79db35a65e95 100644
--- a/pkgs/development/python-modules/curl-cffi/default.nix
+++ b/pkgs/development/python-modules/curl-cffi/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "curl-cffi";
-  version = "0.11.1";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lexiforest";
     repo = "curl_cffi";
     tag = "v${version}";
-    hash = "sha256-hpsAga5741oTBT87Rt7XTyxxu7SQ5Usw+2VVr54oA8k=";
+    hash = "sha256-VE/b1Cs/wpZlu7lOURT/QfP7DuNudD441zG603LT4LM=";
   };
 
   patches = [ ./use-system-libs.patch ];

From e4dbda8dbfa36f7b55f42e5a7496f371adfb5394 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:02 +0200
Subject: [PATCH 0683/3724] python3Packages.cvss: 3.4 -> 3.6

https://github.com/RedHatProductSecurity/cvss/releases/tag/v3.6

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/cvss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cvss/default.nix b/pkgs/development/python-modules/cvss/default.nix
index 791bd43df9fe..c348337e0cca 100644
--- a/pkgs/development/python-modules/cvss/default.nix
+++ b/pkgs/development/python-modules/cvss/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "cvss";
-  version = "3.4";
+  version = "3.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "RedHatProductSecurity";
     repo = "cvss";
     tag = "v${version}";
-    hash = "sha256-g6+ccoIgqs7gZPrTuKm3em+PzLvpupb9JXOGMqf2Uv0=";
+    hash = "sha256-udUs76wfvC9LfjlKyWmuPV0RT2P/COTwYw3hgDt3tPs=";
   };
 
   build-system = [ setuptools ];

From 97bd111d1435cf9d4072c480a621f45adaf10b26 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:03 +0200
Subject: [PATCH 0684/3724] python3Packages.cyclonedx-python-lib: 8.8.0 ->
 11.0.0

https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/v11.0.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/cyclonedx-python-lib/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index 140adeda4e8d..2b3b5c5c27b8 100644
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "cyclonedx-python-lib";
-  version = "8.8.0";
+  version = "11.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "CycloneDX";
     repo = "cyclonedx-python-lib";
     tag = "v${version}";
-    hash = "sha256-igT1QroP260cqSAiaJv4Zrji691WIjyDLZ1p5dtPF5Y=";
+    hash = "sha256-TS/3O/ojabMUUW8RVd1ymo67rjNoRCtrIqZcUygpW+Y=";
   };
 
   pythonRelaxDeps = [ "py-serializable" ];

From 5a90f86f2d57e6d24b0eef61ccd2288f4a95d417 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:05 +0200
Subject: [PATCH 0685/3724] python3Packages.cynthion: 0.2.2 -> 0.2.3

https://github.com/greatscottgadgets/cynthion/releases/tag/0.2.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/cynthion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cynthion/default.nix b/pkgs/development/python-modules/cynthion/default.nix
index 1d265c8da52d..f0d8d55b6c94 100644
--- a/pkgs/development/python-modules/cynthion/default.nix
+++ b/pkgs/development/python-modules/cynthion/default.nix
@@ -26,14 +26,14 @@
 }:
 buildPythonPackage rec {
   pname = "cynthion";
-  version = "0.2.2";
+  version = "0.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "cynthion";
     tag = version;
-    hash = "sha256-xL1/ckX+xKUQpugQkLB3SlZeNcBEaTMascTgoQ4C+hA=";
+    hash = "sha256-NAsELeOnWgMa6iWCJ0+hpbHIO3BsZBv0N/nK1XP+IpU=";
   };
 
   sourceRoot = "${src.name}/cynthion/python";

From ef725f0ff8246d51d676aa7cc3d02b2ed008b818 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:06 +0200
Subject: [PATCH 0686/3724] python3Packages.dash: 3.0.4 -> 3.2.0

https://github.com/plotly/dash/blob/v3.2.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/dash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix
index 3f185c962a25..953eb9064a74 100644
--- a/pkgs/development/python-modules/dash/default.nix
+++ b/pkgs/development/python-modules/dash/default.nix
@@ -36,14 +36,14 @@
 
 buildPythonPackage rec {
   pname = "dash";
-  version = "3.0.4";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "plotly";
     repo = "dash";
     tag = "v${version}";
-    hash = "sha256-KCGVdD1L+U2KbktU2GU19BQ6wRcmEeYtC/v8UrFTyto=";
+    hash = "sha256-7wSUPAcPvY5Q5Ws2mLjiY599oZlo5SA6Pa8QnS7pgvg=";
   };
 
   nativeBuildInputs = [

From 7e0c4118d39a936afcc7e8cedf52d85b4f9b4e6d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:08 +0200
Subject: [PATCH 0687/3724] python3Packages.dask: 2025.3.0 -> 2025.7.0

https://docs.dask.org/en/latest/changelog.html

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/dask/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 9322d3c03aba..fd60adb945d1 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -38,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "2025.3.0";
+  version = "2025.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask";
     tag = version;
-    hash = "sha256-j25+DfWReonXKqxkX9OVHjKo+Indh13rlBE5PyGe69c=";
+    hash = "sha256-bwM4Q95YTEp9pDz6LmBLOeYjmi8nH8Cc/srZlXfEIlg=";
   };
 
   postPatch = ''

From 36f5b6ddad22cf258ef6cd915b6905d95c72e112 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:09 +0200
Subject: [PATCH 0688/3724] python3Packages.databricks-sql-connector: 4.0.3 ->
 4.0.5

https://github.com/databricks/databricks-sql-python/blob/v4.0.5/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/databricks-sql-connector/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix
index 9d4689b5f147..4f1055f65296 100644
--- a/pkgs/development/python-modules/databricks-sql-connector/default.nix
+++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "databricks-sql-connector";
-  version = "4.0.3";
+  version = "4.0.5";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "databricks";
     repo = "databricks-sql-python";
     tag = "v${version}";
-    hash = "sha256-9+U5XOlvPQF6fLkT6/bgjSqSlGj0995mNVH0PCGQEYE=";
+    hash = "sha256-CzS6aVOFkBSJ9+0KJOaJLxK2ZiRY4OybNkCX5VdybqY=";
   };
 
   pythonRelaxDeps = [

From 30572dc322321edf1a2b067390fffb013a0791c3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:10 +0200
Subject: [PATCH 0689/3724] python3Packages.datamodel-code-generator: 0.26.5 ->
 0.32.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/datamodel-code-generator/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/datamodel-code-generator/default.nix b/pkgs/development/python-modules/datamodel-code-generator/default.nix
index f4a8c4377666..114c02db162a 100644
--- a/pkgs/development/python-modules/datamodel-code-generator/default.nix
+++ b/pkgs/development/python-modules/datamodel-code-generator/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "datamodel-code-generator";
-  version = "0.26.5";
+  version = "0.32.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "koxudaxi";
     repo = "datamodel-code-generator";
     tag = version;
-    hash = "sha256-CYNEpQFIWR7i7I7YJ5q/34KNhtQ7cjya97Z0fyeO5g8=";
+    hash = "sha256-sFMNs8wHRTxK1TU4IWfbKf/qUCb11bh2Td1/FngFavo=";
   };
 
   pythonRelaxDeps = [

From 97ca5d08dd86134fbb4bffd06b816a7da6a3eeb0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:11 +0200
Subject: [PATCH 0690/3724] python3Packages.datasalad: 0.4.0 -> 0.5.0

https://github.com/datalad/datasalad/blob/main/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/datasalad/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/datasalad/default.nix b/pkgs/development/python-modules/datasalad/default.nix
index 0e0eaacbea2f..9ea994007bed 100644
--- a/pkgs/development/python-modules/datasalad/default.nix
+++ b/pkgs/development/python-modules/datasalad/default.nix
@@ -4,6 +4,7 @@
   hatchling,
   hatch-vcs,
   lib,
+  gitMinimal,
   more-itertools,
   psutil,
   pytestCheckHook,
@@ -12,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "datasalad";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "datalad";
     repo = "datasalad";
     tag = "v${version}";
-    hash = "sha256-UIrbvFz674+HarFbv1eF++flj1hOR0cZyqKQSl+G7xY=";
+    hash = "sha256-v0qq9uzO2nD2RZ9LlmBzs3OOAriylrq9mcmgpDga4gw=";
   };
 
   build-system = [
@@ -28,6 +29,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    gitMinimal
     pytestCheckHook
     more-itertools
     psutil

From e80cc8d10b4ebb89f83d0943c754bd662f701de2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:12 +0200
Subject: [PATCH 0691/3724] python3Packages.datasets: 3.6.0 -> 4.0.0

https://github.com/huggingface/datasets/releases/tag/4.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/datasets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix
index 49e474a53b49..7986fe8ff6bb 100644
--- a/pkgs/development/python-modules/datasets/default.nix
+++ b/pkgs/development/python-modules/datasets/default.nix
@@ -19,14 +19,14 @@
 }:
 buildPythonPackage rec {
   pname = "datasets";
-  version = "3.6.0";
+  version = "4.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "datasets";
     tag = version;
-    hash = "sha256-/xhu0cDKfCEwrp9IzKd0+AeQky1198f9sba/pdutvAk=";
+    hash = "sha256-Cr25PgLNGX/KcFZE5h1oiaDW9J50ccMqA5z3q4sITus=";
   };
 
   build-system = [

From b98dc4e0305c267d5ef1d8e91ff8df12186e8a34 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:14 +0200
Subject: [PATCH 0692/3724] python3Packages.dazl: 8.3.0 -> 8.4.2

https://github.com/digital-asset/dazl-client/releases/tag/v8.4.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/dazl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dazl/default.nix b/pkgs/development/python-modules/dazl/default.nix
index ee74e5e21878..be4ac05588ff 100644
--- a/pkgs/development/python-modules/dazl/default.nix
+++ b/pkgs/development/python-modules/dazl/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "dazl";
-  version = "8.3.0";
+  version = "8.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "digital-asset";
     repo = "dazl-client";
     tag = "v${version}";
-    hash = "sha256-w0jWhOOjOVLKUcfY2zR8dgckp7r/Gko+p3cuO8IIrM4=";
+    hash = "sha256-NJHcjzdtKTUnFideUm4fHof4A16nEFeYIXehR9/Bn1s=";
   };
 
   pythonRelaxDeps = [

From 3f4843fb867fb67e782a72eb0a531769d64d50af Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:15 +0200
Subject: [PATCH 0693/3724] python3Packages.db-dtypes: 1.4.2 -> 1.4.3

https://github.com/googleapis/python-db-dtypes-pandas/blob/v1.4.3/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/db-dtypes/default.nix          | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix
index 5c17b49c2b03..23713484c397 100644
--- a/pkgs/development/python-modules/db-dtypes/default.nix
+++ b/pkgs/development/python-modules/db-dtypes/default.nix
@@ -6,14 +6,14 @@
   packaging,
   pandas,
   pyarrow,
-  pytestCheckHook,
+  pytest8_3CheckHook,
   pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "db-dtypes";
-  version = "1.4.2";
+  version = "1.4.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "googleapis";
     repo = "python-db-dtypes-pandas";
     tag = "v${version}";
-    hash = "sha256-CW8BgUZu6EGOXEwapwXadjySbzlo8j9I8ft7OuSMVqs=";
+    hash = "sha256-AyO/GwtExMWi4mB3OMtYPFvAVS/ylcBXGiGXgaScyCA=";
   };
 
   build-system = [ setuptools ];
@@ -34,7 +34,14 @@ buildPythonPackage rec {
     pyarrow
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ pytest8_3CheckHook ];
+
+  disabledTests = [
+    # ValueError: Unable to avoid copy while creating an array as requested.
+    "test_array_interface_copy"
+    # Failed: DID NOT RAISE <class 'TypeError'>
+    "test_reduce_series_numeric"
+  ];
 
   pythonImportsCheck = [ "db_dtypes" ];
 

From e01afdcc6f882588752edaae9f65285145da4557 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:17 +0200
Subject: [PATCH 0694/3724] python3Packages.dbt-core: 1.10.0b2 -> 1.10.6

https://github.com/dbt-labs/dbt-core/blob/v1.10.6/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/dbt-core/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix
index 2f6937cda7f2..4fd76d96d919 100644
--- a/pkgs/development/python-modules/dbt-core/default.nix
+++ b/pkgs/development/python-modules/dbt-core/default.nix
@@ -13,6 +13,7 @@
   dbt-adapters,
   dbt-common,
   dbt-extractor,
+  dbt-protos,
   dbt-semantic-interfaces,
   jinja2,
   logbook,
@@ -36,23 +37,16 @@
 
 buildPythonPackage rec {
   pname = "dbt-core";
-  version = "1.10.0b2";
+  version = "1.10.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dbt-labs";
     repo = "dbt-core";
     tag = "v${version}";
-    hash = "sha256-MTrdpbPqdakFDmLKRFJ23u9hLgGhZ5T+r4om9HPBjkw=";
+    hash = "sha256-tMrtn5NYkRpok6mv4/CBXGPQuHWpL/raejPXyagj7Bs=";
   };
 
-  postPatch = ''
-    substituteInPlace dbt/utils/artifact_upload.py \
-      --replace-fail \
-        "from pydantic import BaseSettings" \
-        "from pydantic_settings import BaseSettings"
-  '';
-
   sourceRoot = "${src.name}/core";
 
   pythonRelaxDeps = [
@@ -80,6 +74,7 @@ buildPythonPackage rec {
     dbt-adapters
     dbt-common
     dbt-extractor
+    dbt-protos
     dbt-semantic-interfaces
     jinja2
     logbook

From e266ed5e79b6fe885a5aabf4a0e94b609d21a85d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:18 +0200
Subject: [PATCH 0695/3724] python3Packages.dbus-fast: 2.44.1 -> 2.44.3

https://github.com/Bluetooth-Devices/dbus-fast/blob/v2.44.3/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/dbus-fast/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix
index 6a1d1b2b10f0..2a2a171502c7 100644
--- a/pkgs/development/python-modules/dbus-fast/default.nix
+++ b/pkgs/development/python-modules/dbus-fast/default.nix
@@ -29,6 +29,11 @@ buildPythonPackage rec {
     hash = "sha256-ZpTQjAmrLoenDWzd/0NpD7fqTd6Dv1J0Ks0db4twwYk=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "Cython>=3,<3.1.0" Cython
+  '';
+
   # The project can build both an optimized cython version and an unoptimized
   # python version. This ensures we fail if we build the wrong one.
   env.REQUIRE_CYTHON = 1;

From 0074295cdecece3cd322370c950aec1c3babee6a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:19 +0200
Subject: [PATCH 0696/3724] python3Packages.dbutils: 3.1.0 -> 3.1.1

https://webwareforpython.github.io/DBUtils/changelog.html

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/dbutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix
index 2995db09d4a6..e287ecb5caad 100644
--- a/pkgs/development/python-modules/dbutils/default.nix
+++ b/pkgs/development/python-modules/dbutils/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "dbutils";
-  version = "3.1.0";
+  version = "3.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "DBUtils";
-    hash = "sha256-6lKLoRBjJA7qgjRevG98yTJMBuQulCCwC80kWpW/zCQ=";
+    hash = "sha256-reefvFeG10ltQThyL7yiQ0DPfHO11m3wUpb2Vv8Ia78=";
   };
 
   nativeBuildInputs = [ setuptools ];

From b796a663925a64a8c71573115d33653b4ffa039a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:21 +0200
Subject: [PATCH 0697/3724] python3Packages.deep-chainmap: 0.1.2 -> 0.1.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/deep-chainmap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/deep-chainmap/default.nix b/pkgs/development/python-modules/deep-chainmap/default.nix
index 9b3c6c9ac240..1b12d8bd9d56 100644
--- a/pkgs/development/python-modules/deep-chainmap/default.nix
+++ b/pkgs/development/python-modules/deep-chainmap/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "deep-chainmap";
-  version = "0.1.2";
+  version = "0.1.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "deep_chainmap";
     inherit version;
-    hash = "sha256-R7Pfh+1bYJ7LCU+0SyZi2XGOsgL1zWiMkp1z9HD1I1w=";
+    hash = "sha256-Cw6Eiey501mzeigfdwnMuZH28abG4rcoACUGlmkzECA=";
   };
 
   build-system = [ hatchling ];

From a611aa4031075efd9f3849d30742960d9c3f4b84 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:22 +0200
Subject: [PATCH 0698/3724] python3Packages.deepface: 0.0.93 -> 0.0.94

https://github.com/serengil/deepface/releases/tag/v0.0.94

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/deepface/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/deepface/default.nix b/pkgs/development/python-modules/deepface/default.nix
index f6984e4da51b..cc877c8d8ea9 100644
--- a/pkgs/development/python-modules/deepface/default.nix
+++ b/pkgs/development/python-modules/deepface/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "deepface";
-  version = "0.0.93";
+  version = "0.0.94";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "serengil";
     repo = "deepface";
     tag = "v${version}";
-    hash = "sha256-G/e0tvf4GbXPjqJCTMgWDe59701fxfrtAf+bioEn8io=";
+    hash = "sha256-jtDj1j2STjoEW6MdQai6ZuRYVmLo0Ga+VPJ01105Byc=";
   };
 
   postPatch = ''

From 19748820afefb3167b44b0002208cd3403b9da68 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:24 +0200
Subject: [PATCH 0699/3724] python3Packages.dep-logic: 0.5.1 -> 0.5.2

https://github.com/pdm-project/dep-logic/releases/tag/0.5.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/dep-logic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix
index c85fc1b95e29..845203c5d99f 100644
--- a/pkgs/development/python-modules/dep-logic/default.nix
+++ b/pkgs/development/python-modules/dep-logic/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "dep-logic";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "pdm-project";
     repo = "dep-logic";
     tag = version;
-    hash = "sha256-W/y5iM9dHnle7y3VzqvW7DSGy8ALvjqt5CN/2z5oEi8=";
+    hash = "sha256-BjqPtfYsHSDQoaYs+hB0r/mRuONqBHOb6goi1dxkFWo=";
   };
 
   nativeBuildInputs = [ pdm-backend ];

From f01a03e0aabf54f9c7b165068186318201fc5b22 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:25 +0200
Subject: [PATCH 0700/3724] python3Packages.dependency-injector: 4.42.0 ->
 4.48.0

https://github.com/ets-labs/python-dependency-injector/blob/4.48.0/docs/main/changelog.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/dependency-injector/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix
index cd48ac472e5e..54154d299104 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "dependency-injector";
-  version = "4.42.0";
+  version = "4.48.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "ets-labs";
     repo = "python-dependency-injector";
     tag = version;
-    hash = "sha256-ryPNmiIKQzR4WSjt7hi4C+iTsYvfj5TYGy+9PJxX+10=";
+    hash = "sha256-jsV+PmUGtK8QiI2ga963H/gkd31UEq0SouEia+spSpg=";
   };
 
   build-system = [ setuptools ];
@@ -64,7 +64,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Dependency injection microframework for Python";
     homepage = "https://github.com/ets-labs/python-dependency-injector";
-    changelog = "https://github.com/ets-labs/python-dependency-injector/blob/${version}/docs/main/changelog.rst";
+    changelog = "https://github.com/ets-labs/python-dependency-injector/blob/${src.tag}/docs/main/changelog.rst";
     license = licenses.bsd3;
     maintainers = with maintainers; [ gerschtli ];
     # https://github.com/ets-labs/python-dependency-injector/issues/726

From 883419dc156c5f9091009445f2d1becba87858a9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:26 +0200
Subject: [PATCH 0701/3724] python3Packages.devpi-common: 4.0.4 -> 4.1.0

https://github.com/devpi/devpi/blob/common-4.1.0/common/CHANGELOG

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/devpi-common/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix
index 7197be7d2336..99ddb9b692ef 100644
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -15,15 +15,15 @@
 
 buildPythonPackage rec {
   pname = "devpi-common";
-  version = "4.0.4";
+  version = "4.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    pname = "devpi_common";
+    pname = "devpi-common";
     inherit version;
-    hash = "sha256-I1oKmkXJblTGC6a6L3fYVs+Q8aacG+6UmIfp7cA6Qcw=";
+    hash = "sha256-WNf3YeP+f9/kScSmqeI1DU3fvrZssPbSCAJRQpQwMNM=";
   };
 
   build-system = [

From a40e67654413be3ba49a9b04ca9c463e0b6f25f1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:27 +0200
Subject: [PATCH 0702/3724] python3Packages.dicomweb-client: 0.59.3 -> 0.60.1

https://github.com/ImagingDataCommons/dicomweb-client/releases/tag/v0.60.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/dicomweb-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dicomweb-client/default.nix b/pkgs/development/python-modules/dicomweb-client/default.nix
index 0e886d8325b0..2d34fa5b8455 100644
--- a/pkgs/development/python-modules/dicomweb-client/default.nix
+++ b/pkgs/development/python-modules/dicomweb-client/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "dicomweb-client";
-  version = "0.59.3";
+  version = "0.60.1";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "ImagingDataCommons";
     repo = "dicomweb-client";
     tag = "v${version}";
-    hash = "sha256-D3j5EujrEdGTfR8/V3o2VJ/VkGdZ8IifPYMhP4ppXhw=";
+    hash = "sha256-ZxeZiCw8I5+Bf266PQ6WQA8mBRC7K3/kZrmuW4l6kQU=";
   };
 
   build-system = [ setuptools ];
@@ -47,7 +47,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python client for DICOMweb RESTful services";
     homepage = "https://dicomweb-client.readthedocs.io";
-    changelog = "https://github.com/ImagingDataCommons/dicomweb-client/releases/tag/v${version}";
+    changelog = "https://github.com/ImagingDataCommons/dicomweb-client/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ bcdarwin ];
     mainProgram = "dicomweb_client";

From 17acabf5cbb762cb904b4488a19ecfcad252acba Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:29 +0200
Subject: [PATCH 0703/3724] python3Packages.diofant: 0.14.0 -> 0.15.0

https://diofant.readthedocs.io/en/latest/release/notes-v0.15.0.html

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/diofant/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix
index 696e8e4e63ad..0deaf22888cb 100644
--- a/pkgs/development/python-modules/diofant/default.nix
+++ b/pkgs/development/python-modules/diofant/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "diofant";
-  version = "0.14.0";
+  version = "0.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "diofant";
     repo = "diofant";
     tag = "v${version}";
-    hash = "sha256-+VM5JBj4NRhNwyAVhnsACg5cVyyxJ3IcOKNL1osr67E=";
+    hash = "sha256-uQvAYSURDhuAKcX0WVMk4y2ZXiiq0lPZct/7A5n5t34=";
   };
 
   patches = [
@@ -81,7 +81,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "diofant" ];
 
   meta = with lib; {
-    changelog = "https://diofant.readthedocs.io/en/latest/release/notes-${version}.html";
+    changelog = "https://diofant.readthedocs.io/en/latest/release/notes-${src.tag}.html";
     description = "Python CAS library";
     homepage = "https://github.com/diofant/diofant";
     license = licenses.bsd3;

From 1a0310740ca06b510b4791c6d5f172dc0a8ce2bb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:30 +0200
Subject: [PATCH 0704/3724] python3Packages.discid: 1.2.0 -> 1.3.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/discid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix
index 83cc31223521..75439108a15b 100644
--- a/pkgs/development/python-modules/discid/default.nix
+++ b/pkgs/development/python-modules/discid/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "discid";
-  version = "1.2.0";
+  version = "1.3.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fc6kvnqwaz9lrs2qgsp8wh0nabf49010r0r53wnsmpmafy315nd";
+    sha256 = "sha256-cWChIRrD1qbYIT+4jdPXPjKr5eATNqWkyYWwgql9QzU=";
   };
 
   patchPhase =

From 047781e2d9150f8780f006cdb30115c31ebe74b2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:31 +0200
Subject: [PATCH 0705/3724] python3Packages.dissect-fve: 4.1 -> 4.2

https://github.com/fox-it/dissect.fve/releases/tag/4.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/dissect-fve/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dissect-fve/default.nix b/pkgs/development/python-modules/dissect-fve/default.nix
index d8ffe7bbd871..a7608a4012af 100644
--- a/pkgs/development/python-modules/dissect-fve/default.nix
+++ b/pkgs/development/python-modules/dissect-fve/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-fve";
-  version = "4.1";
+  version = "4.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.fve";
     tag = version;
-    hash = "sha256-xPjwyI134E0JWkM+S2ae9TuBGHMSrgyjooM9CGECqgg=";
+    hash = "sha256-OgagTnt4y6Fzd7jbsCgbkTzcsdnozImfdKI9ew9JaqI=";
   };
 
   build-system = [

From 2d2ea356603659d7d4f5485a3e6ceef8a7484eb7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:32 +0200
Subject: [PATCH 0706/3724] python3Packages.distlib: 0.3.9 -> 0.4.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/distlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix
index 0a636477ea7b..02e084b0f686 100644
--- a/pkgs/development/python-modules/distlib/default.nix
+++ b/pkgs/development/python-modules/distlib/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "distlib";
-  version = "0.3.9";
+  version = "0.4.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pg8g3qZGuKM/Pndy903AstB3LSg37hNCoAZFyB7flAM=";
+    hash = "sha256-/uxAB1vgOgRQGpc9gfYzc1tLafmLBUUFkjEMD0AaTg0=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 8d37eb3e539ea018b0c12fe734a6ef930b259a42 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:33 +0200
Subject: [PATCH 0707/3724] python3Packages.distributed: 2025.3.0 -> 2025.7.0

https://github.com/dask/distributed/releases/tag/2025.7.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/distributed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 6f2bb78a106f..db117b6a05af 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "2025.3.0";
+  version = "2025.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = "distributed";
     tag = version;
-    hash = "sha256-+vegdEXhQi3ns5iMs6FavKnAlRNIWCUNyZENVBWZsuQ=";
+    hash = "sha256-np4hCamNTbnmLdfjFeHsxEEm9XI1O0kOczDe1YjSziw=";
   };
 
   postPatch = ''

From 3fa23e9815b0e4a02796827921ac74e04f26790e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:35 +0200
Subject: [PATCH 0708/3724] python3Packages.django-auditlog: 3.1.2 -> 3.2.0

https://github.com/jazzband/django-auditlog/blob/v3.2.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/django-auditlog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix
index 4b488a328ae8..80af50656ca1 100644
--- a/pkgs/development/python-modules/django-auditlog/default.nix
+++ b/pkgs/development/python-modules/django-auditlog/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "django-auditlog";
-  version = "3.1.2";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-auditlog";
     tag = "v${version}";
-    hash = "sha256-xb6pTsXkB8HVpXvB9WzBUlRcjh5cn1CdmMYQQVCQ/GU=";
+    hash = "sha256-NOtpnYh6HUo7VRSyCUhbpNDv0V9KWST0OEzl7Pt6eR8=";
   };
 
   nativeBuildInputs = [

From 38752a5333f5d83a616f67dc29889d5379cdf86d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:36 +0200
Subject: [PATCH 0709/3724] python3Packages.django-cachalot: 2.7.0 -> 2.8.0

https://github.com/noripyt/django-cachalot/blob/v2.8.0/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/django-cachalot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix
index 3b83eb8f6a16..4c6c85a46d67 100644
--- a/pkgs/development/python-modules/django-cachalot/default.nix
+++ b/pkgs/development/python-modules/django-cachalot/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "django-cachalot";
-  version = "2.7.0";
+  version = "2.8.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "noripyt";
     repo = "django-cachalot";
     tag = "v${version}";
-    hash = "sha256-Fi5UvqH2bVb4v/GWDkEYIcBMBVos+35g4kcEnZTOQvw=";
+    hash = "sha256-3W+9cULL3mMtAkxbqetoIj2FL/HRbzWHIDMe9O1e6BM=";
   };
 
   patches = [
@@ -58,7 +58,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "No effort, no worry, maximum performance";
     homepage = "https://github.com/noripyt/django-cachalot";
-    changelog = "https://github.com/noripyt/django-cachalot/blob/${src.rev}/CHANGELOG.rst";
+    changelog = "https://github.com/noripyt/django-cachalot/blob/${src.tag}/CHANGELOG.rst";
     license = licenses.bsd3;
     maintainers = with maintainers; [ onny ];
   };

From 16070112b867e64e2a8515b8d06224f42040a68e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:37 +0200
Subject: [PATCH 0710/3724] python3Packages.django-cms: 4.1.6 -> 5.0.2

https://github.com/django-cms/django-cms/releases/tag/5.0.2

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/django-cms/default.nix     | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/django-cms/default.nix b/pkgs/development/python-modules/django-cms/default.nix
index a33caa7b8024..ca3034af5512 100644
--- a/pkgs/development/python-modules/django-cms/default.nix
+++ b/pkgs/development/python-modules/django-cms/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "django-cms";
-  version = "4.1.6";
+  version = "5.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -30,24 +30,9 @@ buildPythonPackage rec {
     owner = "django-cms";
     repo = "django-cms";
     tag = version;
-    hash = "sha256-KowhiJz84hR5VqW+WNIBEhC+X9zPE1opDWygFfsFfPE=";
+    hash = "sha256-qv6eVs5jKJXQczEa6+H5n4+pw1JFTkb7XJD+0DBVFM0=";
   };
 
-  patches = [
-    # Removed django-app-manage dependency by updating ./manage.py
-    # https://github.com/django-cms/django-cms/pull/8061
-    (fetchpatch {
-      url = "https://github.com/django-cms/django-cms/commit/3270edb72f6a736b5cb448864ce2eaf68f061740.patch";
-      hash = "sha256-DkgAfE/QGAXwKMNvgcYxtO0yAc7oAaAAui2My8ml1Vk=";
-      name = "remove_django_app_manage_dependency.patch";
-    })
-    (fetchpatch {
-      url = "https://github.com/django-cms/django-cms/pull/8061/commits/04005ff693e775db645c62fefbb62367822e66f9.patch";
-      hash = "sha256-4M/VKEv7pnqCk6fDyA6FurSCCu/k9tNnz16wT4Tr0Rw=";
-      name = "manage_py_update_dj_database_url.patch";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [

From bedfde3e0441c732f317af2aec5f5805196cdeb0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:38 +0200
Subject: [PATCH 0711/3724] python3Packages.django-csp: 3.8 -> 4.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/django-csp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-csp/default.nix b/pkgs/development/python-modules/django-csp/default.nix
index 5c5920404fbc..70ec6444eee8 100644
--- a/pkgs/development/python-modules/django-csp/default.nix
+++ b/pkgs/development/python-modules/django-csp/default.nix
@@ -17,13 +17,13 @@
 
 buildPythonPackage rec {
   pname = "django-csp";
-  version = "3.8";
+  version = "4.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "django_csp";
-    hash = "sha256-7w8an32Nporm4WnALprGYcDs8E23Dg0dhWQFEqaEccA=";
+    hash = "sha256-snAQu3Ausgo9rTKReN8rYaK4LTOLcPvcE8OjvShxKDM=";
   };
 
   postPatch = ''

From dbda9b3f58a0dbf9fe88af977fe635e10e21ee27 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:40 +0200
Subject: [PATCH 0712/3724] python3Packages.django-guardian: 2.4.0 -> 3.0.3

This commit was automatically generated using update-python-libraries.
---
 .../django-guardian/default.nix               | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/django-guardian/default.nix b/pkgs/development/python-modules/django-guardian/default.nix
index a6727b8f055b..2f03409bcd59 100644
--- a/pkgs/development/python-modules/django-guardian/default.nix
+++ b/pkgs/development/python-modules/django-guardian/default.nix
@@ -1,29 +1,32 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   django-environ,
-  mock,
   django,
   pytestCheckHook,
   pytest-django,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "django-guardian";
-  version = "2.4.0";
-  format = "setuptools";
+  version = "3.0.3";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c58a68ae76922d33e6bdc0e69af1892097838de56e93e78a8361090bcd9f89a0";
+  src = fetchFromGitHub {
+    owner = "django-guardian";
+    repo = "django-guardian";
+    tag = version;
+    hash = "sha256-0rOEue+OApWQmSBuwTLnu/yU5HUa5pgvVBUG5fT4iwY=";
   };
 
-  propagatedBuildInputs = [ django ];
+  build-system = [ setuptools ];
+
+  dependencies = [ django ];
 
   nativeCheckInputs = [
     django-environ
-    mock
     pytestCheckHook
     pytest-django
   ];
@@ -33,10 +36,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Per object permissions for Django";
     homepage = "https://github.com/django-guardian/django-guardian";
-    license = with licenses; [
-      mit
-      bsd2
-    ];
+    license = with licenses; [ bsd2 ];
     maintainers = [ ];
   };
 }

From 2a70195ea89a57a72a03106545e3bb6f9bb6baf8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:41 +0200
Subject: [PATCH 0713/3724] python3Packages.django-health-check: 3.18.3 ->
 3.20.0

https://github.com/revsys/django-health-check/releases/tag/3.20.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/django-health-check/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix
index 17d187a6a6cb..229f31e1892e 100644
--- a/pkgs/development/python-modules/django-health-check/default.nix
+++ b/pkgs/development/python-modules/django-health-check/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "django-health-check";
-  version = "3.18.3";
+  version = "3.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "KristianOellegaard";
     repo = "django-health-check";
     tag = version;
-    hash = "sha256-+6+YxB/x4JdKUCwxxe+YIc+r1YAzngFUHiS6atupWM8=";
+    hash = "sha256-qgABCDWKGYZ67sKvCozUQfmYcKWMpEVNLxInTnIaojk=";
   };
 
   build-system = [ setuptools-scm ];
@@ -58,7 +58,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Pluggable app that runs a full check on the deployment";
     homepage = "https://github.com/KristianOellegaard/django-health-check";
-    changelog = "https://github.com/revsys/django-health-check/releases/tag/${version}";
+    changelog = "https://github.com/revsys/django-health-check/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ onny ];
   };

From 3498d6fead9c63ddd7bd1b1d90d8b23b87b9ef0e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:42 +0200
Subject: [PATCH 0714/3724] python3Packages.django-hijack: 3.7.2 -> 3.7.3

https://github.com/django-hijack/django-hijack/releases/tag/3.7.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/django-hijack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix
index 55b6bf4244f9..872f77d95671 100644
--- a/pkgs/development/python-modules/django-hijack/default.nix
+++ b/pkgs/development/python-modules/django-hijack/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "django-hijack";
-  version = "3.7.2";
+  version = "3.7.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-hijack";
     repo = "django-hijack";
     tag = version;
-    hash = "sha256-JGcVXM/kWsahGNh1llV4NB+/FLAh3hqFRbs3PyYqRnA=";
+    hash = "sha256-0Ix8bTOt+5Bzvbx0OrgxvQU/t9IaZlq7gLtCeVPR2qc=";
   };
 
   build-system = [
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Allows superusers to hijack (=login as) and work on behalf of another user";
     homepage = "https://github.com/django-hijack/django-hijack";
-    changelog = "https://github.com/django-hijack/django-hijack/releases/tag/${version}";
+    changelog = "https://github.com/django-hijack/django-hijack/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ ris ];
   };

From 128ec7a0d345327a454a40702ff0e19bb31aa821 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:43 +0200
Subject: [PATCH 0715/3724] python3Packages.django-modeltranslation: 0.19.14 ->
 0.19.16

https://github.com/deschler/django-modeltranslation/blob/vv0.19.16/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/django-modeltranslation/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix
index 65bcd446d902..91ee56a3382d 100644
--- a/pkgs/development/python-modules/django-modeltranslation/default.nix
+++ b/pkgs/development/python-modules/django-modeltranslation/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "django-modeltranslation";
-  version = "0.19.14";
+  version = "0.19.16";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "deschler";
     repo = "django-modeltranslation";
     tag = "v${version}";
-    hash = "sha256-jvVzSltq4wkSmndyyOGxldXJVpydmCCrHMGTGiMUNA0=";
+    hash = "sha256-8A5fIZuUMlXe8bHQR0Ha5HoT9VIQsgqpJVMONB5KqCI=";
   };
 
   build-system = [ setuptools ];

From 8e552b682825817185592f70f1358ed66eb57012 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:44 +0200
Subject: [PATCH 0716/3724] python3Packages.django-multiselectfield: 0.1.13 ->
 1.0.1

https://github.com/goinnn/django-multiselectfield/blob/master/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/django-multiselectfield/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix
index ad365b7062f3..0945ab27d9e5 100644
--- a/pkgs/development/python-modules/django-multiselectfield/default.nix
+++ b/pkgs/development/python-modules/django-multiselectfield/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "django-multiselectfield";
-  version = "0.1.13";
+  version = "1.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "django_multiselectfield";
     inherit version;
-    hash = "sha256-Q31yYy9MDKQWlRkXYyUpw9HUK2K7bDwD4zlvpQJlvpQ=";
+    hash = "sha256-P4tP/z4H1Kkci7S4Cbw1yusitBdptgb0ye3FO41ypmc=";
   };
 
   build-system = [ setuptools ];

From 6ad7b452d57d06cb8669df1227060d1a521e6ab6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:45 +0200
Subject: [PATCH 0717/3724] python3Packages.django-pattern-library: 1.3.0 ->
 1.5.0

https://github.com/torchbox/django-pattern-library/blob/v1.5.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/django-pattern-library/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-pattern-library/default.nix b/pkgs/development/python-modules/django-pattern-library/default.nix
index 268187cf852c..da43dd05c8ac 100644
--- a/pkgs/development/python-modules/django-pattern-library/default.nix
+++ b/pkgs/development/python-modules/django-pattern-library/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "django-pattern-library";
-  version = "1.3.0";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "torchbox";
     repo = "django-pattern-library";
     tag = "v${version}";
-    hash = "sha256-2a/Rg6ljBe1J0FOob7Z9aNVZZ3l+gTD34QCRjk4PiQg=";
+    hash = "sha256-urK34rlBU5GuEOlUtmJLGv6wlTP5H/RMAkwQu5S2Jbo=";
   };
 
   nativeBuildInputs = [ poetry-core ];
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "UI pattern libraries for Django templates";
     homepage = "https://github.com/torchbox/django-pattern-library/";
-    changelog = "https://github.com/torchbox/django-pattern-library/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/torchbox/django-pattern-library/blob/${src.tag}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ sephi ];
   };

From 54d1c13cd013cacde0567bc037926ba2825dfd54 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:46 +0200
Subject: [PATCH 0718/3724] python3Packages.django-polymorphic: 4.0.0 -> 4.1.0

https://github.com/jazzband/django-polymorphic/releases/tag/v4.1.0

This commit was automatically generated using update-python-libraries.
---
 .../django-polymorphic/default.nix            |  9 ++------
 .../django-5.1-compat.patch                   | 22 -------------------
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/python-modules/django-polymorphic/django-5.1-compat.patch

diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix
index ff2682c6d3e7..bcc8f58aae38 100644
--- a/pkgs/development/python-modules/django-polymorphic/default.nix
+++ b/pkgs/development/python-modules/django-polymorphic/default.nix
@@ -11,21 +11,16 @@
 
 buildPythonPackage rec {
   pname = "django-polymorphic";
-  version = "4.0.0";
+  version = "4.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-polymorphic";
     repo = "django-polymorphic";
     tag = "v${version}";
-    hash = "sha256-cEV9gnc9gLpAVmYkzSaQwDbgXsklMTq71edndDJeP9E=";
+    hash = "sha256-QcJUKGhWPUHhVVsEZhhjN411Pz4Wn7OL2fhotPOGVm4=";
   };
 
-  patches = [
-    # https://github.com/jazzband/django-polymorphic/issues/616
-    ./django-5.1-compat.patch
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [ django ];
diff --git a/pkgs/development/python-modules/django-polymorphic/django-5.1-compat.patch b/pkgs/development/python-modules/django-polymorphic/django-5.1-compat.patch
deleted file mode 100644
index 42976118728a..000000000000
--- a/pkgs/development/python-modules/django-polymorphic/django-5.1-compat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a2c48cedc45db52469b93b6fa7a5d50c6722586f Mon Sep 17 00:00:00 2001
-From: Ben Gosney <bengosney@googlemail.com>
-Date: Sun, 25 Aug 2024 14:49:33 +0100
-Subject: [PATCH] fix(query): handle None
-
----
- polymorphic/query.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/polymorphic/query.py b/polymorphic/query.py
-index 8e93281a..2d2df6c3 100644
---- a/polymorphic/query.py
-+++ b/polymorphic/query.py
-@@ -278,7 +278,7 @@ def tree_node_test___lookup(my_model, node):
-             elif hasattr(a, "get_source_expressions"):
-                 for source_expression in a.get_source_expressions():
-                     test___lookup(source_expression)
--            else:
-+            elif a is not None:
-                 assert "___" not in a.name, ___lookup_assert_msg
- 
-         for a in args:

From 24a48da674f56ac6778654b073fdabc842e4310f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:47 +0200
Subject: [PATCH 0719/3724] python3Packages.django-rq: 3.0.1 -> 3.1

https://github.com/rq/django-rq/releases/tag/v3.1

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/django-rq/default.nix      | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix
index 9d5c228222c1..1cbd4d7c3011 100644
--- a/pkgs/development/python-modules/django-rq/default.nix
+++ b/pkgs/development/python-modules/django-rq/default.nix
@@ -1,34 +1,44 @@
 {
   lib,
   buildPythonPackage,
-  isPy27,
   fetchFromGitHub,
+  hatchling,
   django,
   redis,
   rq,
+  prometheus-client,
   sentry-sdk,
+  psycopg,
+  pytest-django,
+  pytestCheckHook,
+  redisTestHook,
 }:
 
 buildPythonPackage rec {
   pname = "django-rq";
-  version = "3.0.1";
-  format = "setuptools";
-  disabled = isPy27;
+  version = "3.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rq";
     repo = "django-rq";
     tag = "v${version}";
-    hash = "sha256-f4ilMKMWNr/NVKRhylr0fFiKFEKHXU/zIlPnq7fCYNs=";
+    hash = "sha256-TnOKgw52ykKcR0gHXcdYfv77js7I63PE1F3POdwJgvc=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ hatchling ];
+
+  dependencies = [
     django
     redis
     rq
-    sentry-sdk
   ];
 
+  optional-dependencies = {
+    prometheus = [ prometheus-client ];
+    sentry = [ sentry-sdk ];
+  };
+
   pythonImportsCheck = [ "django_rq" ];
 
   doCheck = false; # require redis-server

From 95344b5f01b5888607bffa4838a8002a56d00880 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:48 +0200
Subject: [PATCH 0720/3724] python3Packages.django-scim2: 0.19.0 -> 0.20.0

https://github.com/15five/django-scim2/blob/0.20.0/CHANGES.txt

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/django-scim2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-scim2/default.nix b/pkgs/development/python-modules/django-scim2/default.nix
index 7125394c00fe..fa91f8fe1e76 100644
--- a/pkgs/development/python-modules/django-scim2/default.nix
+++ b/pkgs/development/python-modules/django-scim2/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "django-scim2";
-  version = "0.19.0";
+  version = "0.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "15five";
     repo = "django-scim2";
     tag = version;
-    hash = "sha256-larDh4f9/xVr11/n/WfkJ2Tx45DMQqyK3ZzkWAvzeig=";
+    hash = "sha256-OsfC6Jc/oQl6nzy3Nr3vkY+XicRxUoV62hK8MHa3LJ8=";
   };
 
   # remove this when upstream releases a new version > 0.19.0
@@ -51,7 +51,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    changelog = "https://github.com/15five/django-scim2/blob/${src.rev}/CHANGES.txt";
+    changelog = "https://github.com/15five/django-scim2/blob/${src.tag}/CHANGES.txt";
     description = "SCIM 2.0 Service Provider Implementation (for Django)";
     homepage = "https://github.com/15five/django-scim2";
     license = licenses.mit;

From 4fd0fc8348ea9789ef4c3302e605d7f93eae4cf7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:50 +0200
Subject: [PATCH 0721/3724] python3Packages.django-simple-history: 3.9.0 ->
 3.10.1

https://github.com/jazzband/django-simple-history/releases/tag/3.10.1

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/django-simple-history/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-simple-history/default.nix b/pkgs/development/python-modules/django-simple-history/default.nix
index 248d70052120..730217b039da 100644
--- a/pkgs/development/python-modules/django-simple-history/default.nix
+++ b/pkgs/development/python-modules/django-simple-history/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "django-simple-history";
-  version = "3.9.0";
+  version = "3.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "jazzband";
     repo = "django-simple-history";
     tag = version;
-    hash = "sha256-df6AWyliKSqKH0yacpHgGZXNvmjiJuFJWoJ7502IMB4=";
+    hash = "sha256-th0ZkHMKWcI6nNhgjpkvmyKaJ/TdWK12mBPUTFab8g4=";
   };
 
   build-system = [

From 30e8cd34f54985f93e25af170fcb800e47ac8524 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:51 +0200
Subject: [PATCH 0722/3724] python3Packages.django-stubs-ext: 5.2.0 -> 5.2.2

https://github.com/typeddjango/django-stubs/releases/tag/5.2.2

This commit was automatically generated using update-python-libraries.
---
 .../django-stubs-ext/default.nix              | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/django-stubs-ext/default.nix b/pkgs/development/python-modules/django-stubs-ext/default.nix
index 40464d29fcff..1931b9f6b6c5 100644
--- a/pkgs/development/python-modules/django-stubs-ext/default.nix
+++ b/pkgs/development/python-modules/django-stubs-ext/default.nix
@@ -2,29 +2,34 @@
   lib,
   buildPythonPackage,
   django,
-  fetchPypi,
+  fetchFromGitHub,
+  hatchling,
   oracledb,
+  pytest-mypy-plugins,
+  pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
   redis,
-  setuptools,
   typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "django-stubs-ext";
-  version = "5.2.0";
+  version = "5.2.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
-  src = fetchPypi {
-    pname = "django_stubs_ext";
-    inherit version;
-    hash = "sha256-AMSuMHtTj1ZDr3YakUw/jk4/JfTnxtcJjxkGwNjyqsk=";
+  src = fetchFromGitHub {
+    owner = "typeddjango";
+    repo = "django-stubs";
+    tag = version;
+    hash = "sha256-kF5g0/rkMQxYTfSrTqzZ6BuqGlE42K/AVhc1/ARc+/c=";
   };
 
-  build-system = [ setuptools ];
+  postPatch = ''
+    cd ext
+    ln -s ../scripts
+  '';
+
+  build-system = [ hatchling ];
 
   dependencies = [
     django
@@ -36,7 +41,16 @@ buildPythonPackage rec {
     oracle = [ oracledb ];
   };
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-mypy-plugins
+    pytest-xdist
+    pytestCheckHook
+  ];
+
+  disabledTestPaths = [
+    # error: Skipping analyzing "django.db": module is installed, but missing library stubs or py.typed marker  [import-untyped] (diff)
+    "tests/typecheck"
+  ];
 
   pythonImportsCheck = [ "django_stubs_ext" ];
 

From 5ab327a8209c773f1787314aa01aed5117747a04 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:52 +0200
Subject: [PATCH 0723/3724] python3Packages.django-stubs: 5.2.0 -> 5.2.2

https://github.com/typeddjango/django-stubs/releases/tag/5.2.2

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/django-stubs/default.nix   | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix
index bc7897dd6ba9..e80d281e5200 100644
--- a/pkgs/development/python-modules/django-stubs/default.nix
+++ b/pkgs/development/python-modules/django-stubs/default.nix
@@ -3,11 +3,12 @@
   buildPythonPackage,
   django,
   django-stubs-ext,
-  fetchPypi,
+  fetchFromGitHub,
   mypy,
+  pytest-mypy-plugins,
   pytestCheckHook,
   pythonOlder,
-  setuptools,
+  hatchling,
   tomli,
   types-pytz,
   types-pyyaml,
@@ -16,23 +17,17 @@
 
 buildPythonPackage rec {
   pname = "django-stubs";
-  version = "5.2.0";
+  version = "5.2.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    pname = "django_stubs";
-    inherit version;
-    hash = "sha256-B+JcLTy/9b5UAif/N3GcyJ8hXfqqpesDinWwG7+7JyI=";
+  src = fetchFromGitHub {
+    owner = "typeddjango";
+    repo = "django-stubs";
+    tag = version;
+    hash = "sha256-kF5g0/rkMQxYTfSrTqzZ6BuqGlE42K/AVhc1/ARc+/c=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools<79.0.0" setuptools
-  '';
-
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   dependencies = [
     django
@@ -48,9 +43,19 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
+    pytest-mypy-plugins
     pytestCheckHook
   ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.flatten (lib.attrValues optional-dependencies);
+
+  disabledTests = [
+    # AttributeError: module 'django.contrib.auth.forms' has no attribute 'SetUnusablePasswordMixin'
+    "test_find_classes_inheriting_from_generic"
+  ];
+
+  disabledTestPaths = [
+    "tests/typecheck"
+  ];
 
   pythonImportsCheck = [ "django-stubs" ];
 

From 26c9e1253363cf85be1d2dab12525e6ca47eec18 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:53 +0200
Subject: [PATCH 0724/3724] python3Packages.django-tasks: 0.7.0 -> 0.8.1

https://github.com/RealOrangeOne/django-tasks/releases/tag/0.8.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/django-tasks/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-tasks/default.nix b/pkgs/development/python-modules/django-tasks/default.nix
index b7798dce2319..03ad9c4065e1 100644
--- a/pkgs/development/python-modules/django-tasks/default.nix
+++ b/pkgs/development/python-modules/django-tasks/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "django-tasks";
-  version = "0.7.0";
+  version = "0.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "RealOrangeOne";
     repo = "django-tasks";
     tag = version;
-    hash = "sha256-AWsqAvn11uklrFXtiV2a6fR3owZ02osEzrdHZgDKkOM=";
+    hash = "sha256-fXXqPmpyIq+66okWDmTIBaoaslY8BSILXjJWn8cXnMM=";
   };
 
   build-system = [
@@ -74,7 +74,7 @@ buildPythonPackage rec {
   meta = {
     description = "Reference implementation and backport of background workers and tasks in Django";
     homepage = "https://github.com/RealOrangeOne/django-tasks";
-    changelog = "https://github.com/RealOrangeOne/django-tasks/releases/tag/${version}";
+    changelog = "https://github.com/RealOrangeOne/django-tasks/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };

From 780ac073d0614561265a2ee5c8f110cfb58eb178 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:54 +0200
Subject: [PATCH 0725/3724] python3Packages.django-webpack-loader: 3.1.1 ->
 3.2.1

https://github.com/django-webpack/django-webpack-loader/blob/3.2.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../django-webpack-loader/default.nix          | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix
index 30bd093ac061..1d9693514dca 100644
--- a/pkgs/development/python-modules/django-webpack-loader/default.nix
+++ b/pkgs/development/python-modules/django-webpack-loader/default.nix
@@ -2,29 +2,27 @@
   lib,
   buildPythonPackage,
   django,
-  fetchPypi,
-  pythonOlder,
+  fetchFromGitHub,
   setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "django-webpack-loader";
-  version = "3.1.1";
+  version = "3.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-8Rt5cA0b/BKZExvfS6R5wewgD4OhQA4aL+tcK6e2+MQ=";
+  src = fetchFromGitHub {
+    owner = "django-webpack";
+    repo = "django-webpack-loader";
+    tag = version;
+    hash = "sha256-2CmIaVDSZlqfSJVPVBmOcT89znjxQhe7ZHhe7i6DCGY=";
   };
 
   build-system = [ setuptools-scm ];
 
   dependencies = [ django ];
 
-  # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?)
-  doCheck = false;
+  doCheck = false; # tests require fetching node_modules
 
   pythonImportsCheck = [ "webpack_loader" ];
 

From 801f82afdd4ead30dee5c37d4a5f2d572a1146d0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:55 +0200
Subject: [PATCH 0726/3724] python3Packages.djangorestframework-simplejwt:
 5.5.0 -> 5.5.1

https://github.com/jazzband/djangorestframework-simplejwt/blob/v5.5.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/djangorestframework-simplejwt/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
index ed2d7aa31830..07794f2a21d4 100644
--- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "djangorestframework-simplejwt";
-  version = "5.5.0";
+  version = "5.5.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "djangorestframework_simplejwt";
     inherit version;
-    hash = "sha256-R0obc3Bn5kYrNgliejktE6Taigix8FdBBKxtexQG+Q4=";
+    hash = "sha256-5yxVcvUdeAMCEojiBXr8vQPxf+EdSECW9ApGCrx26H8=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From dddf25d80485fd49e44344a2f3193c7952fe37b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:56 +0200
Subject: [PATCH 0727/3724] python3Packages.djangorestframework-stubs: 3.16.0
 -> 3.16.1

https://github.com/typeddjango/djangorestframework-stubs/releases/tag/3.16.1

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/djangorestframework-stubs/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/pkgs/development/python-modules/djangorestframework-stubs/default.nix
index b0434f169f43..941f231d288d 100644
--- a/pkgs/development/python-modules/djangorestframework-stubs/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-stubs/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "djangorestframework-stubs";
-  version = "3.16.0";
+  version = "3.16.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "typeddjango";
     repo = "djangorestframework-stubs";
     tag = version;
-    hash = "sha256-q/9tCMT79TMHIQ4KH8tiunaTt7L6IItwNYBFlbNxBcE=";
+    hash = "sha256-TTv6v7G3LODrUDSYSNNa4+dujih7QElmvK3mMQg9EuQ=";
   };
 
   nativeBuildInputs = [ setuptools ];

From b3cd3b1aa1baa4d7abd72eb7f994d0bf395343ed Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:37:58 +0200
Subject: [PATCH 0728/3724] python3Packages.djoser: 2.3.1 -> 2.3.3

https://github.com/sunscrapers/djoser/releases/tag/2.3.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/djoser/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/djoser/default.nix b/pkgs/development/python-modules/djoser/default.nix
index cffcd3376600..cad26f0dc57c 100644
--- a/pkgs/development/python-modules/djoser/default.nix
+++ b/pkgs/development/python-modules/djoser/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "djoser";
-  version = "2.3.1";
+  version = "2.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sunscrapers";
     repo = "djoser";
     tag = version;
-    hash = "sha256-xPhf7FiJSq5bHfAU5RKbobgnsRh/6cLcXP6vfrLdzJA=";
+    hash = "sha256-RFOKEjAh5k/Bx7cj6ty2vQsW61lsXfJIJDOZeqL6iCE=";
   };
 
   build-system = [ poetry-core ];
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "djoser" ];
 
   meta = {
-    changelog = "https://github.com/sunscrapers/djoser/releases/tag/${version}";
+    changelog = "https://github.com/sunscrapers/djoser/releases/tag/${src.tag}";
     description = "REST implementation of Django authentication system";
     homepage = "https://github.com/sunscrapers/djoser";
     maintainers = with lib.maintainers; [ MostafaKhaled ];

From 684a6eb3e58e2a7fd32f85f33a278078cd746d84 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:00 +0200
Subject: [PATCH 0729/3724] python3Packages.dnachisel: 3.2.13 -> 3.2.16

https://github.com/Edinburgh-Genome-Foundry/DnaChisel/releases/tag/v3.2.16

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/dnachisel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dnachisel/default.nix b/pkgs/development/python-modules/dnachisel/default.nix
index e2e7de4adb18..ad0ec55aec7c 100644
--- a/pkgs/development/python-modules/dnachisel/default.nix
+++ b/pkgs/development/python-modules/dnachisel/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "dnachisel";
-  version = "3.2.13";
+  version = "3.2.16";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "Edinburgh-Genome-Foundry";
     repo = "DnaChisel";
     tag = "v${version}";
-    hash = "sha256-XmaUkmRGD1py5+8gfRe/6WegX1bOQtbTDDUT6RO2rBk=";
+    hash = "sha256-F+G7dwehUCHYKSGsLQR4OZg2NQ4677XMlN6jOcmz8No=";
   };
 
   propagatedBuildInputs = [

From 7d5136277bd1ea20d4346cc7ebbffcd970e133c3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:01 +0200
Subject: [PATCH 0730/3724] python3Packages.docling-jobkit: 1.1.1 -> 1.2.0

https://github.com/docling-project/docling-jobkit/blob/v1.2.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/docling-jobkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/docling-jobkit/default.nix b/pkgs/development/python-modules/docling-jobkit/default.nix
index c9e6e82b2dec..43bc73a5c1fe 100644
--- a/pkgs/development/python-modules/docling-jobkit/default.nix
+++ b/pkgs/development/python-modules/docling-jobkit/default.nix
@@ -36,14 +36,14 @@
 
 buildPythonPackage rec {
   pname = "docling-jobkit";
-  version = "1.1.1";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling-jobkit";
     tag = "v${version}";
-    hash = "sha256-Q4RCA/gJxyfOfzuRnuCmndVEeV0JUCTU389KSEv7vVk=";
+    hash = "sha256-bLLcMbN6GNpZ8U5Fhyq/XaHawOFcrFrobY7Jtpdm8Qo=";
   };
 
   build-system = [

From e678322cf33f2f5856eeda3124c738f46ad0a8d9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:02 +0200
Subject: [PATCH 0731/3724] python3Packages.docling-serve: 1.0.1 -> 1.1.0

https://github.com/docling-project/docling-serve/blob/v1.1.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/docling-serve/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/docling-serve/default.nix b/pkgs/development/python-modules/docling-serve/default.nix
index af20571493ae..0b0230b88d39 100644
--- a/pkgs/development/python-modules/docling-serve/default.nix
+++ b/pkgs/development/python-modules/docling-serve/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "docling-serve";
-  version = "1.0.1";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling-serve";
     tag = "v${version}";
-    hash = "sha256-/jaSmDk8eweXbYO0yyhXiLvp/T4viFsNC4vGoTMhbbU=";
+    hash = "sha256-A8q1mjrtm8VgwsOpBCVD61K88wrjsYHiWdbv0XvACG4=";
   };
 
   build-system = [

From 87758e76ecf0a95619c38afee540761f18399343 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:03 +0200
Subject: [PATCH 0732/3724] python3Packages.docling: 2.42.0 -> 2.43.0

https://github.com/DS4SD/docling/blob/v2.43.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/docling/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/docling/default.nix b/pkgs/development/python-modules/docling/default.nix
index cbb5993b93d7..54731e8bcb56 100644
--- a/pkgs/development/python-modules/docling/default.nix
+++ b/pkgs/development/python-modules/docling/default.nix
@@ -52,14 +52,14 @@
 
 buildPythonPackage rec {
   pname = "docling";
-  version = "2.42.0";
+  version = "2.43.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling";
     tag = "v${version}";
-    hash = "sha256-9HUomW55Yg5N7u3Wb4imzRUYECeGkb3lkHPLEGzuAnA=";
+    hash = "sha256-fMLED97DhfHp74GVDtdPXrJvfpKw6bOvQAaGTWZrPyE=";
   };
 
   build-system = [

From c74865ab5efe337eeb15f11c601e8e285769e02d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:04 +0200
Subject: [PATCH 0733/3724] python3Packages.docplex: 2.29.245 -> 2.30.251

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/docplex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix
index 2095590adb2c..5931a41fbdbc 100644
--- a/pkgs/development/python-modules/docplex/default.nix
+++ b/pkgs/development/python-modules/docplex/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "docplex";
-  version = "2.29.245";
+  version = "2.30.251";
   pyproject = true;
 
   # No source available from official repo
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pCb+P6WQUPX+dzFfe6Hcfao1fH2NDtBmpYNWRx2FPko=";
+    hash = "sha256-ZQMhn1tRJ1p+TnfKQzKQOw+Akl0gUDCkjT9qp8oNvyo=";
   };
 
   postPatch = ''

From a6b12464e6f9d6fc88ae4019992b390cc3eee4ce Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:05 +0200
Subject: [PATCH 0734/3724] python3Packages.docstring-to-markdown: 0.15 -> 0.17

https://github.com/python-lsp/docstring-to-markdown/releases/tag/v0.17

This commit was automatically generated using update-python-libraries.
---
 .../docstring-to-markdown/default.nix         | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/docstring-to-markdown/default.nix b/pkgs/development/python-modules/docstring-to-markdown/default.nix
index ae8696f13418..c47f3f3338e0 100644
--- a/pkgs/development/python-modules/docstring-to-markdown/default.nix
+++ b/pkgs/development/python-modules/docstring-to-markdown/default.nix
@@ -2,28 +2,35 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  importlib-metadata,
   pytestCheckHook,
-  pythonOlder,
+  setuptools,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "docstring-to-markdown";
-  version = "0.15";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "0.17";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-lsp";
     repo = "docstring-to-markdown";
     tag = "v${version}";
-    hash = "sha256-ykqY7LFIOTuAddYkKDzIltq8FpLVz4v2ZA3Y0cZH9ms=";
+    hash = "sha256-conwwToBrlDL487zf2ldCOxFFKxP1a8LnU0KocI8riI=";
   };
 
   postPatch = ''
     sed -i -E '/--(cov|flake8)/d' setup.cfg
   '';
 
+  build-system = [ setuptools ];
+
+  dependencies = [
+    importlib-metadata
+    typing-extensions
+  ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "docstring_to_markdown" ];
@@ -31,7 +38,7 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = "https://github.com/python-lsp/docstring-to-markdown";
     description = "On the fly conversion of Python docstrings to markdown";
-    changelog = "https://github.com/python-lsp/docstring-to-markdown/releases/tag/v${version}";
+    changelog = "https://github.com/python-lsp/docstring-to-markdown/releases/tag/${src.tag}";
     license = licenses.lgpl2Plus;
     maintainers = with maintainers; [ doronbehar ];
   };

From 14487a21d392a937778ea398f53004cde9a23432 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:06 +0200
Subject: [PATCH 0735/3724] python3Packages.dom-toml: 2.0.1 -> 2.1.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/dom-toml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dom-toml/default.nix b/pkgs/development/python-modules/dom-toml/default.nix
index 0b190913a658..3c54e8023d70 100644
--- a/pkgs/development/python-modules/dom-toml/default.nix
+++ b/pkgs/development/python-modules/dom-toml/default.nix
@@ -9,13 +9,13 @@
 }:
 buildPythonPackage rec {
   pname = "dom-toml";
-  version = "2.0.1";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "dom_toml";
-    hash = "sha256-McWHRZXHd/QcwZHDTGbb6iFcgomnsUi0Jft6EMP0+8g=";
+    hash = "sha256-XMDdEM4lZtNbwdlKbvFsBilx/wMYxvNwWADWHSB1raw=";
   };
 
   build-system = [ flit-core ];

From be25b313c617383263b0b8ace8ce43045c04600b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:07 +0200
Subject: [PATCH 0736/3724] python3Packages.drf-standardized-errors: 0.14.1 ->
 0.15.0

https://github.com/ghazi-git/drf-standardized-errors/releases/tag/v0.15.0

This commit was automatically generated using update-python-libraries.
---
 .../drf-standardized-errors/default.nix              | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/drf-standardized-errors/default.nix b/pkgs/development/python-modules/drf-standardized-errors/default.nix
index 484e5c12325c..457849c8df4a 100644
--- a/pkgs/development/python-modules/drf-standardized-errors/default.nix
+++ b/pkgs/development/python-modules/drf-standardized-errors/default.nix
@@ -15,24 +15,16 @@
 
 buildPythonPackage rec {
   pname = "drf-standardized-errors";
-  version = "0.14.1";
+  version = "0.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ghazi-git";
     repo = "drf-standardized-errors";
     tag = "v${version}";
-    hash = "sha256-Gr4nj2dd0kZTc4IbLhb0i3CnY+VZaNnr3YJctyxIgQU=";
+    hash = "sha256-OM1bTqM3yQSPuerTrq5FKTf5eKpZsF6/QgupMtnnT4Q=";
   };
 
-  patches = [
-    # fix test_openapi_utils test
-    (fetchpatch {
-      url = "https://github.com/ghazi-git/drf-standardized-errors/commit/dbc37d4228bdefa858ab299517097d6e52a0b698.patch";
-      hash = "sha256-CZTBmhAFKODGLiN2aQNKMaR8VyKs0H55Tzu4Rh6X9R8=";
-    })
-  ];
-
   build-system = [ flit-core ];
 
   dependencies = [

From 2e62e7063a6a5d8b431f61290728faeed301bbaa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:08 +0200
Subject: [PATCH 0737/3724] python3Packages.dtlssocket: 0.2.2 -> 0.2.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/dtlssocket/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dtlssocket/default.nix b/pkgs/development/python-modules/dtlssocket/default.nix
index a9810c51cb07..699032aee4e1 100644
--- a/pkgs/development/python-modules/dtlssocket/default.nix
+++ b/pkgs/development/python-modules/dtlssocket/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "dtlssocket";
-  version = "0.2.2";
+  version = "0.2.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TnbXFXJuDEbcCeNdqbZxewY8I4mwbBcj3sw7o4tzh/Q=";
+    hash = "sha256-8Gy+Mt+FYtu8y+J0qvJ9J3PoSSqGxBwzSzoKcKUAN88=";
   };
 
   build-system = [

From 15d1622873a34c7f0a7b83a8ce6d814a89a7f1b6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:09 +0200
Subject: [PATCH 0738/3724] python3Packages.duckduckgo-search: 8.1.1 -> 9.5.1

https://github.com/deedy5/ddgs/releases/tag/v9.5.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/duckduckgo-search/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix
index 644f6dc45646..4e82b6382161 100644
--- a/pkgs/development/python-modules/duckduckgo-search/default.nix
+++ b/pkgs/development/python-modules/duckduckgo-search/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "duckduckgo-search";
-  version = "8.1.1";
+  version = "9.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "deedy5";
     repo = "ddgs";
     tag = "v${version}";
-    hash = "sha256-ikNGBkDRyhX8yO/7DYMh1w4q3LCN7A7jsuqFsNQGsy4=";
+    hash = "sha256-8OGO70J/o6oUfgdMKgZOtmOf4Nenk3VcV8kxU6UnEFQ=";
   };
 
   build-system = [ setuptools ];

From a175358cf3206d4a475934a3013f3f766cc30abf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:10 +0200
Subject: [PATCH 0739/3724] python3Packages.dulwich: 0.22.8 -> 0.24.1

https://github.com/jelmer/dulwich/blob/dulwich-dulwich-0.24.1/NEWS

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/dulwich/default.nix        | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 00f06e0a8c4b..09dd99fbb1e3 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
+  cargo,
   fastimport,
   fetchFromGitHub,
   gevent,
@@ -10,17 +10,22 @@
   glibcLocales,
   gnupg,
   gpgme,
+  merge3,
   paramiko,
   pytestCheckHook,
   pythonOlder,
+  rich,
+  rustPlatform,
+  rustc,
   setuptools,
   setuptools-rust,
+  typing-extensions,
   urllib3,
 }:
 
 buildPythonPackage rec {
   pname = "dulwich";
-  version = "0.22.8";
+  version = "0.24.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,21 +34,37 @@ buildPythonPackage rec {
     owner = "jelmer";
     repo = "dulwich";
     tag = "dulwich-${version}";
-    hash = "sha256-T0Tmu5sblTkqiak9U4ltkGbWw8ZE91pTlhPVMRi5Pxk=";
+    hash = "sha256-GGVvTKDLWPcx1f28Esl9sDXj33157NhSssYD/C+fLy4=";
   };
 
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version src;
+    hash = "sha256-qGAvy0grueKI+A0nsXntf/EWtozSc138iFDhlfiktK8=";
+  };
+
+  nativeBuildInputs = [
+    rustPlatform.cargoSetupHook
+    cargo
+    rustc
+  ];
+
   build-system = [
     setuptools
     setuptools-rust
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     urllib3
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    typing-extensions
   ];
 
   optional-dependencies = {
+    colordiff = [ rich ];
     fastimport = [ fastimport ];
     https = [ urllib3 ];
+    merge = [ merge3 ];
     pgp = [
       gpgme
       gnupg
@@ -65,6 +86,14 @@ buildPythonPackage rec {
   disabledTests = [
     # AssertionError: 'C:\\\\foo.bar\\\\baz' != 'C:\\foo.bar\\baz'
     "test_file_win"
+    # dulwich.errors.NotGitRepository: No git repository was found at .
+    "WorktreeCliTests"
+    # 'SwiftPackData' object has no attribute '_file'
+    "test_iterobjects_subset_all_present"
+    "test_iterobjects_subset_missing_allowed"
+    "test_iterobjects_subset_missing_not_allowed"
+    # Adding a symlink to a directory outside the repo doesn't raise
+    "test_add_symlink_absolute_to_system"
   ];
 
   disabledTestPaths = [

From 837660f24f328bc9b30adcdfbf7e560779240150 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:11 +0200
Subject: [PATCH 0740/3724] python3Packages.dunamai: 1.23.0 -> 1.25.0

https://github.com/mtkennerly/dunamai/blob/v1.25.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/dunamai/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix
index 105302ca0d3a..9de31f0a3dd5 100644
--- a/pkgs/development/python-modules/dunamai/default.nix
+++ b/pkgs/development/python-modules/dunamai/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "dunamai";
-  version = "1.23.0";
+  version = "1.25.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mtkennerly";
     repo = "dunamai";
     tag = "v${version}";
-    hash = "sha256-JuW/VL8kfzz5mSXRHtrg/hHykgcewaQYfDuO2PALbWc=";
+    hash = "sha256-kPOEhJwsSzGea7fS5y5tbAvzZZ+OxIyjpYpS6i++rHE=";
   };
 
   build-system = [ poetry-core ];
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     description = "Dynamic version generation";
     mainProgram = "dunamai";
     homepage = "https://github.com/mtkennerly/dunamai";
-    changelog = "https://github.com/mtkennerly/dunamai/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/mtkennerly/dunamai/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ jmgilman ];
   };

From f75a377c1e8f13e4142e7d0f9ff6b07147c4499d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 16:59:14 +0000
Subject: [PATCH 0741/3724] alacritty-theme: 0-unstable-2025-07-16 ->
 0-unstable-2025-08-04

---
 pkgs/by-name/al/alacritty-theme/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/alacritty-theme/package.nix b/pkgs/by-name/al/alacritty-theme/package.nix
index e441805d46c3..7c9bc9db683f 100644
--- a/pkgs/by-name/al/alacritty-theme/package.nix
+++ b/pkgs/by-name/al/alacritty-theme/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (self: {
   pname = "alacritty-theme";
-  version = "0-unstable-2025-07-16";
+  version = "0-unstable-2025-08-04";
 
   src = fetchFromGitHub {
     owner = "alacritty";
     repo = "alacritty-theme";
-    rev = "6c91a0e913396daafdb7ca43e84014d4e176623c";
-    hash = "sha256-Rq5AB9BktTaCQ1UzUITgu6g5a74C0sHpiiHAjeC1RiA=";
+    rev = "a2f966e33fbb26d8d34b9c78d49c95158720d2e4";
+    hash = "sha256-KG3guGyEY4AgO/tcRgq6De2kv+/JmFI8/RfzRG+QAXs=";
     sparseCheckout = [ "themes" ];
   };
 

From 50b018896a41b965f7d38981eecbdc8e0720b975 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:12 +0200
Subject: [PATCH 0742/3724] python3Packages.dvc-data: 3.16.10 -> 3.16.11

https://github.com/iterative/dvc-data/releases/tag/3.16.11

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/dvc-data/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix
index da6dafe5f08b..fc17f023f46d 100644
--- a/pkgs/development/python-modules/dvc-data/default.nix
+++ b/pkgs/development/python-modules/dvc-data/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-data";
-  version = "3.16.10";
+  version = "3.16.11";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "dvc-data";
     tag = version;
-    hash = "sha256-kYPgEsLrcSYf6YAjFENf2HZKdQ4391pFxaZDIFOubkY=";
+    hash = "sha256-BuGJzIZzHr/Q7N+bO3WUb92I6fs3tWxb/xdf22vFbj8=";
   };
 
   build-system = [ setuptools-scm ];
@@ -51,7 +51,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "DVC's data management subsystem";
     homepage = "https://github.com/iterative/dvc-data";
-    changelog = "https://github.com/iterative/dvc-data/releases/tag/${version}";
+    changelog = "https://github.com/iterative/dvc-data/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
     mainProgram = "dvc-data";

From 011eeac466d2554a7ab79851da9c41f29e97fc8b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:16 +0200
Subject: [PATCH 0743/3724] python3Packages.dvclive: 3.48.3 -> 3.48.4

https://github.com/iterative/dvclive/releases/tag/3.48.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/dvclive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix
index 0e0a75c5c4e1..31d2539af170 100644
--- a/pkgs/development/python-modules/dvclive/default.nix
+++ b/pkgs/development/python-modules/dvclive/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "dvclive";
-  version = "3.48.3";
+  version = "3.48.4";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "dvclive";
     tag = version;
-    hash = "sha256-peT7L4SpCtjOVr4qaLyFtqEIiqAnEaTMfYxu02L9q2s=";
+    hash = "sha256-fs0NbsjpGaR4cXE/ajfeF6ZJ3fc7K28KDJ0LIJ/vsdg=";
   };
 
   build-system = [ setuptools-scm ];

From f8fb88b5e26f23c4c3505a0d846121b1744af1b6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:17 +0200
Subject: [PATCH 0744/3724] python3Packages.e3-core: 22.6.0 -> 22.10.0

https://github.com/AdaCore/e3-core/releases/tag/v22.10.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/e3-core/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/e3-core/default.nix b/pkgs/development/python-modules/e3-core/default.nix
index a391fe073081..3c5f7e79ee60 100644
--- a/pkgs/development/python-modules/e3-core/default.nix
+++ b/pkgs/development/python-modules/e3-core/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "e3-core";
-  version = "22.6.0";
+  version = "22.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "AdaCore";
     repo = "e3-core";
     tag = "v${version}";
-    hash = "sha256-6rClGDo8KhBbOg/Rw0nVISVtOAACf5cwSafNInlBGCw=";
+    hash = "sha256-LHWtgIvbS1PaF85aOpdhR0rWQGRUtbY0Qg1SZxQOsSc=";
   };
 
   build-system = [ setuptools ];
@@ -61,7 +61,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    changelog = "https://github.com/AdaCore/e3-core/releases/tag/v${version}";
+    changelog = "https://github.com/AdaCore/e3-core/releases/tag/${src.tag}";
     homepage = "https://github.com/AdaCore/e3-core/";
     description = "Core framework for developing portable automated build systems";
     license = licenses.gpl3Only;

From fb34180fbeec92ec315d55382522d2e4dbe0d1fc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:18 +0200
Subject: [PATCH 0745/3724] python3Packages.ebooklib: 0.18 -> 0.19

https://github.com/aerkalov/ebooklib/blob/v0.19/CHANGES.txt

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ebooklib/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/ebooklib/default.nix b/pkgs/development/python-modules/ebooklib/default.nix
index 67e00275f3b9..a253169235be 100644
--- a/pkgs/development/python-modules/ebooklib/default.nix
+++ b/pkgs/development/python-modules/ebooklib/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "ebooklib";
-  version = "0.18";
+  version = "0.19";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "aerkalov";
     repo = "ebooklib";
-    rev = "v${version}";
-    hash = "sha256-Ciks/eeRpkqkWnyLgyHC+x/dSOcj/ZT45KUElKqv1F8=";
+    tag = "v${version}";
+    hash = "sha256-al5iSw3sIIjIYRZPrYgbBQ7V324f6OTxmtrnoOHafSQ=";
   };
 
   propagatedBuildInputs = [
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python E-book library for handling books in EPUB2/EPUB3  format";
     homepage = "https://github.com/aerkalov/ebooklib";
-    changelog = "https://github.com/aerkalov/ebooklib/blob/${src.rev}/CHANGES.txt";
+    changelog = "https://github.com/aerkalov/ebooklib/blob/${src.tag}/CHANGES.txt";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ Scrumplex ];
   };

From 68111701ca6a0319916dbab4785dfdb66dd153f7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:19 +0200
Subject: [PATCH 0746/3724] python3Packages.echo: 0.10.0 -> 0.11.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/echo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix
index 71bdcd1b40a4..ca2d32af37a7 100644
--- a/pkgs/development/python-modules/echo/default.nix
+++ b/pkgs/development/python-modules/echo/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "echo";
-  version = "0.10.0";
+  version = "0.11.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "glue-viz";
     repo = "echo";
     tag = "v${version}";
-    sha256 = "sha256-RlTscoStJQ0vjrrk14xHRsMZOJt8eJSqinc4rY/lW4k=";
+    sha256 = "sha256-Uikzn9vbLctiZ6W0uA6hNvr7IB/FhCcHk+JxBW7yrA4=";
   };
 
   nativeBuildInputs = [

From 296b6319881387786e242574290606b7188ba3b7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:22 +0200
Subject: [PATCH 0747/3724] python3Packages.elasticsearch8: 8.17.2 -> 8.19.0

https://github.com/elastic/elasticsearch-py/releases/tag/v8.19.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/elasticsearch8/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix
index 2e4deb6c103a..de8d5ebb3730 100644
--- a/pkgs/development/python-modules/elasticsearch8/default.nix
+++ b/pkgs/development/python-modules/elasticsearch8/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "elasticsearch8";
-  version = "8.17.2";
+  version = "8.19.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-j6FaQWPFJ8kqoTwjIPyMDcOZBg8mOO0BbKCFn4ESCAM=";
+    hash = "sha256-7D4M4iw+d2Ok21twUxX/PKDxtC6++bPicYI18jrHlY0=";
   };
 
   build-system = [ hatchling ];

From b0c5ee065c0010ff7934e41927870ed0205cbac5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:23 +0200
Subject: [PATCH 0748/3724] python3Packages.elementpath: 4.8.0 -> 5.0.3

https://github.com/sissaschool/elementpath/blob/v5.0.3/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/elementpath/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix
index 6f0a61cfcb7e..de31d75927d9 100644
--- a/pkgs/development/python-modules/elementpath/default.nix
+++ b/pkgs/development/python-modules/elementpath/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "elementpath";
-  version = "4.8.0";
+  version = "5.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "sissaschool";
     repo = "elementpath";
     tag = "v${version}";
-    hash = "sha256-MHE3uzO1HTd1CGWwTeztDjNIe2EvS8AOYJhCZ2Wjjzo=";
+    hash = "sha256-gjJsgc3JrFHgdhDDzLHQspoj99jHmIbkCULEq20yAss=";
   };
 
   build-system = [ setuptools ];

From ab1ced9a471f38144909ea44f703f0fdc1a7afa0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:24 +0200
Subject: [PATCH 0749/3724] python3Packages.elevenlabs: 2.7.1 -> 2.8.2

https://github.com/elevenlabs/elevenlabs-python/releases/tag/v2.8.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/elevenlabs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix
index a1f3fe145dfb..0a0fb3b88b5e 100644
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -13,7 +13,7 @@
 }:
 
 let
-  version = "2.7.1";
+  version = "2.8.2";
   tag = "v${version}";
 in
 buildPythonPackage {
@@ -25,7 +25,7 @@ buildPythonPackage {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
     inherit tag;
-    hash = "sha256-QbjVd+cVe6Y/deTeO31bwjGHNl9ykOrWFdFhOepFnxY=";
+    hash = "sha256-QHWY8I4saucDLDX29EmyPFKCS5MxAC5Le2GEFZk4GBw=";
   };
 
   build-system = [ poetry-core ];

From 09d5f2d1028eab7af9db059c88b9a3292b1551d9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:25 +0200
Subject: [PATCH 0750/3724] python3Packages.epicstore-api: 0.1.9 -> 0.2.0

https://github.com/SD4RK/epicstore_api/releases/tag/v_v_0.2.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/epicstore-api/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/epicstore-api/default.nix b/pkgs/development/python-modules/epicstore-api/default.nix
index 5c7cb927b3f3..4bc4e125c364 100644
--- a/pkgs/development/python-modules/epicstore-api/default.nix
+++ b/pkgs/development/python-modules/epicstore-api/default.nix
@@ -3,25 +3,25 @@
   fetchFromGitHub,
   lib,
   pytestCheckHook,
-  requests,
+  cloudscraper,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "epicstore-api";
-  version = "0.1.9";
+  version = "0.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SD4RK";
     repo = "epicstore_api";
     tag = "v_${version}";
-    hash = "sha256-9Gh9bsNgZx/SinKr7t1dvqrOUP+z4Gs8BFMLYtboFmg=";
+    hash = "sha256-XSynUz8rAl/+jcPMCZoVKlGZLVcTCAr36VEWVhAydoM=";
   };
 
   build-system = [ setuptools ];
 
-  dependencies = [ requests ];
+  dependencies = [ cloudscraper ];
 
   pythonImportsCheck = [ "epicstore_api" ];
 
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    changelog = "https://github.com/SD4RK/epicstore_api/releases/tag/v_${version}";
+    changelog = "https://github.com/SD4RK/epicstore_api/releases/tag/v_${src.tag}";
     description = "Epic Games Store Web API Wrapper written in Python";
     homepage = "https://github.com/SD4RK/epicstore_api";
     license = lib.licenses.mit;

From 85ff617a981d0b69af50796fc0e0ce090f4b959d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:26 +0200
Subject: [PATCH 0751/3724] python3Packages.eradicate: 2.3.0 -> 3.0.0

https://github.com/wemake-services/eradicate/releases/tag/3.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/eradicate/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix
index 987cfbd7d0ce..621f0bdb5dd8 100644
--- a/pkgs/development/python-modules/eradicate/default.nix
+++ b/pkgs/development/python-modules/eradicate/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "eradicate";
-  version = "2.3.0";
+  version = "3.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "wemake-services";
     repo = "eradicate";
     tag = version;
-    hash = "sha256-ikiqNe1a+OeRraNBbtAx6v3LsTajWlgxm4wR2Tcbmjk=";
+    hash = "sha256-V3g9qYM/TiOz83IMoUwu0CvFWBxB5Yk3Dy3G/Dz3vYw=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     description = "Library to remove commented-out code from Python files";
     mainProgram = "eradicate";
     homepage = "https://github.com/myint/eradicate";
-    changelog = "https://github.com/wemake-services/eradicate/releases/tag/${version}";
+    changelog = "https://github.com/wemake-services/eradicate/releases/tag/${src.tag}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ mmlb ];
   };

From 6840f5d992c978bb1af1d4634ed358d46d9acd46 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:28 +0200
Subject: [PATCH 0752/3724] python3Packages.es-client: 8.17.4 -> 8.18.2

https://github.com/untergeek/es_client/releases/tag/v8.18.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/es-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix
index da67670cc4ea..5f8397da9b3e 100644
--- a/pkgs/development/python-modules/es-client/default.nix
+++ b/pkgs/development/python-modules/es-client/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "es-client";
-  version = "8.17.4";
+  version = "8.18.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "untergeek";
     repo = "es_client";
     tag = "v${version}";
-    hash = "sha256-43LB0QceljuS3k+yYtJCbJsstsFr3d2h2Gnjal2HcdQ=";
+    hash = "sha256-siB17xVRS/eeKOsJcWdh4foOHXbeV8wwRclXDHodADM=";
   };
 
   pythonRelaxDeps = true;

From f9b3534a2b806ebeb7c425ec806db031b10c71a6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:30 +0200
Subject: [PATCH 0753/3724] python3Packages.essentials: 1.1.5 -> 1.1.6

https://github.com/Neoteroi/essentials/releases/v1.1.6

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/essentials/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/essentials/default.nix b/pkgs/development/python-modules/essentials/default.nix
index f0174bb0a081..9854a018afae 100644
--- a/pkgs/development/python-modules/essentials/default.nix
+++ b/pkgs/development/python-modules/essentials/default.nix
@@ -8,14 +8,14 @@
 }:
 buildPythonPackage rec {
   pname = "essentials";
-  version = "1.1.5";
+  version = "1.1.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Neoteroi";
     repo = "essentials";
-    rev = "v${version}";
-    hash = "sha256-WMHjBVkeSoQ4Naj1U7Bg9j2hcoErH1dx00BPKiom9T4=";
+    tag = "v${version}";
+    hash = "sha256-wOZ0y6sAPEy2MgcwmM9SjnULe6oWlVuNeC7Zl070CK4=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = "https://github.com/Neoteroi/essentials";
     description = "General purpose classes and functions";
-    changelog = "https://github.com/Neoteroi/essentials/releases/v${version}";
+    changelog = "https://github.com/Neoteroi/essentials/releases/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [
       aldoborrero

From cc5925a8860a86dd63cce49da50928e4e4864ec3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:31 +0200
Subject: [PATCH 0754/3724] python3Packages.eternalegypt: 0.0.16 -> 0.0.17

https://github.com/amelchio/eternalegypt/releases/tag/v0.0.17

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/eternalegypt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/eternalegypt/default.nix b/pkgs/development/python-modules/eternalegypt/default.nix
index e1e103482e62..14ee157d9e30 100644
--- a/pkgs/development/python-modules/eternalegypt/default.nix
+++ b/pkgs/development/python-modules/eternalegypt/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "eternalegypt";
-  version = "0.0.16";
+  version = "0.0.17";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "amelchio";
     repo = "eternalegypt";
     tag = "v${version}";
-    hash = "sha256-ubKepd3yBaoYrIUe5WCt1zd4CjvU7SeftOR+2cBaEf0=";
+    hash = "sha256-Qb8s8jU5yn7BIXVIV5cjwE0OnZOWEK8dzTmQDJM22rE=";
   };
 
   propagatedBuildInputs = [
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python API for Netgear LTE modems";
     homepage = "https://github.com/amelchio/eternalegypt";
-    changelog = "https://github.com/amelchio/eternalegypt/releases/tag/v${version}";
+    changelog = "https://github.com/amelchio/eternalegypt/releases/tag/${src.tag}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From c0d3f62bc09e3b025d23555ccf048e64de885fb0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:32 +0200
Subject: [PATCH 0755/3724] python3Packages.etuples: 0.3.9 -> 0.3.10

https://github.com/pythological/etuples/releases/tag/v0.3.10

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/etuples/default.nix        | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/etuples/default.nix b/pkgs/development/python-modules/etuples/default.nix
index 855e42fa6e86..cbdcba528193 100644
--- a/pkgs/development/python-modules/etuples/default.nix
+++ b/pkgs/development/python-modules/etuples/default.nix
@@ -7,24 +7,28 @@
   py,
   pytestCheckHook,
   pytest-html,
-  pythonOlder,
+  setuptools,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "etuples";
-  version = "0.3.9";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.8";
+  version = "0.3.10";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pythological";
     repo = "etuples";
     tag = "v${version}";
-    hash = "sha256-dl+exar98PnqEiCNX+Ydllp7aohsAYrFtxb2Q1Lxx6Y=";
+    hash = "sha256-h5MLj1z3qZiUXcNIDtUIbV5zeyTzxerbSezFD5Q27n0=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
     cons
     multipledispatch
   ];
@@ -45,7 +49,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python S-expression emulation using tuple-like objects";
     homepage = "https://github.com/pythological/etuples";
-    changelog = "https://github.com/pythological/etuples/releases/tag/v${version}";
+    changelog = "https://github.com/pythological/etuples/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ Etjean ];
   };

From 8de34ab4c72b40e202f5eabe96f013da30df18e7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:33 +0200
Subject: [PATCH 0756/3724] python3Packages.exifread: 3.0.0 -> 3.4.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/exifread/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/exifread/default.nix b/pkgs/development/python-modules/exifread/default.nix
index a517d5adf55a..d1d3198525fa 100644
--- a/pkgs/development/python-modules/exifread/default.nix
+++ b/pkgs/development/python-modules/exifread/default.nix
@@ -2,19 +2,21 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "exifread";
-  version = "3.0.0";
-  format = "setuptools";
+  version = "3.4.0";
+  pyproject = true;
 
   src = fetchPypi {
-    pname = "ExifRead";
-    inherit version;
-    hash = "sha256-CsWjZBadvfK9YvlPXAc5cKtmlKMWYXf15EixDJQ+LKQ=";
+    inherit pname version;
+    hash = "sha256-3H+Np3OWcJykFKDu4cJikC9xOvycBDuqi4IzfXYwb/w=";
   };
 
+  build-system = [ setuptools ];
+
   meta = with lib; {
     description = "Easy to use Python module to extract Exif metadata from tiff and jpeg files";
     mainProgram = "EXIF.py";

From 4f8e9ec28dd0b2be78ac448a1ddd685cd9b28803 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:34 +0200
Subject: [PATCH 0757/3724] python3Packages.expandvars: 1.0.0 -> 1.1.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/expandvars/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/expandvars/default.nix b/pkgs/development/python-modules/expandvars/default.nix
index 3a2c00137820..627093b5d5b1 100644
--- a/pkgs/development/python-modules/expandvars/default.nix
+++ b/pkgs/development/python-modules/expandvars/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "expandvars";
-  version = "1.0.0";
+  version = "1.1.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8EBwuCYCZBhfgRQs2F5d+c7vcinoNsWEQwLEzPoAww0=";
+    hash = "sha256-mK3YJot2Df7kV73hwXv3RXlf3rwit92rdf0yeGU/HgU=";
   };
 
   nativeBuildInputs = [ hatchling ];

From 929aa40df8be33d08a79b5f07d5d97e04109e832 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:35 +0200
Subject: [PATCH 0758/3724] python3Packages.extension-helpers: 1.2.0 -> 1.4.0

https://github.com/astropy/extension-helpers/blob/v1.4.0/CHANGES.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/extension-helpers/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/extension-helpers/default.nix b/pkgs/development/python-modules/extension-helpers/default.nix
index 1202333dd8a4..6908f66127ef 100644
--- a/pkgs/development/python-modules/extension-helpers/default.nix
+++ b/pkgs/development/python-modules/extension-helpers/default.nix
@@ -2,17 +2,19 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pip,
+  build,
+  cython,
   pytestCheckHook,
   pythonOlder,
   setuptools-scm,
   setuptools,
   tomli,
+  wheel,
 }:
 
 buildPythonPackage rec {
   pname = "extension-helpers";
-  version = "1.2.0";
+  version = "1.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +23,7 @@ buildPythonPackage rec {
     owner = "astropy";
     repo = "extension-helpers";
     tag = "v${version}";
-    hash = "sha256-qneulhSYB2gYiCdgoU7Dqg1luLWhVouFVihcKeOA37E=";
+    hash = "sha256-coSgaPoz93CqJRb65xYs1sNOwoGhcxWGJF7Jc9N2W1I=";
   };
 
   build-system = [
@@ -32,8 +34,10 @@ buildPythonPackage rec {
   dependencies = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   nativeCheckInputs = [
+    build
+    cython
     pytestCheckHook
-    pip
+    wheel
   ];
 
   pythonImportsCheck = [ "extension_helpers" ];
@@ -43,12 +47,14 @@ buildPythonPackage rec {
   disabledTests = [
     # Test require network access
     "test_only_pyproject"
+    # ModuleNotFoundError
+    "test_no_setup_py"
   ];
 
   meta = with lib; {
     description = "Helpers to assist with building Python packages with compiled C/Cython extensions";
     homepage = "https://github.com/astropy/extension-helpers";
-    changelog = "https://github.com/astropy/extension-helpers/blob/${version}/CHANGES.md";
+    changelog = "https://github.com/astropy/extension-helpers/blob/${src.tag}/CHANGES.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ fab ];
   };

From 897c0f1d8633493ea11199a1fbc5e30f44d72aa9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:36 +0200
Subject: [PATCH 0759/3724] python3Packages.eyeD3: 0.9.7 -> 0.9.8

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/eyed3/default.nix          | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix
index be683a9cc0c9..10dc8a3bf455 100644
--- a/pkgs/development/python-modules/eyed3/default.nix
+++ b/pkgs/development/python-modules/eyed3/default.nix
@@ -1,37 +1,42 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   isPyPy,
-  six,
+  setuptools,
   filetype,
   deprecation,
 }:
 
 buildPythonPackage rec {
-  version = "0.9.7";
-  format = "setuptools";
-  pname = "eyeD3";
+  version = "0.9.8";
+  pname = "eyed3";
+  pyproject = true;
+
   disabled = isPyPy;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-k7GOk5M3akURT5QJ18yhGftvT5o31LaXtQCvSLTFzw8=";
+  src = fetchFromGitHub {
+    owner = "nicfit";
+    repo = "eyeD3";
+    tag = "v${version}";
+    hash = "sha256-erjTgHjtrUMBj09/s3sZzct6Tg979a16a4fVGnwT0qk=";
   };
 
+  build-system = [ setuptools ];
+
+  dependencies = [
+    deprecation
+    filetype
+  ];
+
   # requires special test data:
   # https://github.com/nicfit/eyeD3/blob/103198e265e3279384f35304e8218be6717c2976/Makefile#L97
   doCheck = false;
 
-  propagatedBuildInputs = [
-    deprecation
-    filetype
-    six
-  ];
-
   meta = with lib; {
     description = "Python module and command line program for processing ID3 tags";
     mainProgram = "eyeD3";
+    downloadPage = "https://github.com/nicfit/eyeD3";
     homepage = "https://eyed3.nicfit.net/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 ];

From 479cf008f153b0de074cb9f41c86fb2095cfa058 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:37 +0200
Subject: [PATCH 0760/3724] python3Packages.facedancer: 3.1.0 -> 3.1.1

https://github.com/greatscottgadgets/facedancer/releases/tag/3.1.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/facedancer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/facedancer/default.nix b/pkgs/development/python-modules/facedancer/default.nix
index e341d09aff69..a3720a6d4cec 100644
--- a/pkgs/development/python-modules/facedancer/default.nix
+++ b/pkgs/development/python-modules/facedancer/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "facedancer";
-  version = "3.1.0";
+  version = "3.1.1";
   pyproject = true;
   disabled = pythonOlder "3.10";
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "greatscottgadgets";
     repo = "facedancer";
     tag = version;
-    hash = "sha256-u1fvrfjk79R16MUuYx8m63EkgHJiMmAksaduk4lVnTw=";
+    hash = "sha256-Qe8DPUKwlukPftc7SOZIcY/do/14UdS61WH0g5dFeMI=";
   };
 
   postPatch = ''
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/greatscottgadgets/facedancer/releases/tag/${version}";
+    changelog = "https://github.com/greatscottgadgets/facedancer/releases/tag/${src.tag}";
     description = "Implement your own USB device in Python, supported by a hardware peripheral such as Cynthion or GreatFET";
     homepage = "https://github.com/greatscottgadgets/facedancer";
     license = lib.licenses.bsd3;

From ea23ffb298257b6ca5622c80daf2e1b054302648 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:38 +0200
Subject: [PATCH 0761/3724] python3Packages.faker: 37.3.0 -> 37.5.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/faker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index 6ae251e20af2..6107ff2350e4 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "faker";
-  version = "37.3.0";
+  version = "37.5.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-d7eeeiIo1XF1Ezrwu83SbcYj34HbOQ7lL1EE1GwBDy8=";
+    hash = "sha256-gxXY/01vT1iL1C/+Y6vVmYhseFBz4mpEcH4Q7rpXE9w=";
   };
 
   build-system = [ setuptools ];

From 943e7155e17e627543126f4d00b4ef67bfcba7c1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:39 +0200
Subject: [PATCH 0762/3724] python3Packages.fakeredis: 2.29.0 -> 2.30.3

https://github.com/cunla/fakeredis-py/releases/tag/v2.30.3

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/fakeredis/default.nix      | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 78151cd6f485..0a475eccd8ec 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -5,9 +5,9 @@
   hypothesis,
   jsonpath-ng,
   lupa,
-  poetry-core,
+  hatchling,
   pyprobables,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-mock,
   pytestCheckHook,
   pythonOlder,
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "fakeredis";
-  version = "2.29.0";
+  version = "2.30.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -27,10 +27,10 @@ buildPythonPackage rec {
     owner = "dsoftwareinc";
     repo = "fakeredis-py";
     tag = "v${version}";
-    hash = "sha256-wBUsoPmTIE3VFvmMnW4B9Unw/V63dIvsBTYCloElamA=";
+    hash = "sha256-SQVLuO5cA+XO7hEBph7XGlnomTcysB3ye9jZ8sy9GAI=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     redis
@@ -47,7 +47,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     hypothesis
-    pytest-asyncio
+    pytest-asyncio_0
     pytest-mock
     pytestCheckHook
     redisTestHook
@@ -57,6 +57,11 @@ buildPythonPackage rec {
 
   disabledTestMarks = [ "slow" ];
 
+  disabledTests = [
+    "test_init_args" # AttributeError: module 'fakeredis' has no attribute 'FakeValkey'
+    "test_async_init_kwargs" # AttributeError: module 'fakeredis' has no attribute 'FakeAsyncValkey'"
+  ];
+
   preCheck = ''
     redisTestPort=6390
   '';
@@ -64,7 +69,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Fake implementation of Redis API";
     homepage = "https://github.com/dsoftwareinc/fakeredis-py";
-    changelog = "https://github.com/cunla/fakeredis-py/releases/tag/v${version}";
+    changelog = "https://github.com/cunla/fakeredis-py/releases/tag/${src.tag}";
     license = with licenses; [ bsd3 ];
     maintainers = with maintainers; [ fab ];
   };

From 34f78d4404e672846f0702ae9d5f8fa4a52966dd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:43 +0200
Subject: [PATCH 0763/3724] python3Packages.fastapi-cli: 0.0.7 -> 0.0.8

https://github.com/tiangolo/fastapi-cli/releases/tag/0.0.8

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/fastapi-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fastapi-cli/default.nix b/pkgs/development/python-modules/fastapi-cli/default.nix
index 89384a31070b..b40e8800e684 100644
--- a/pkgs/development/python-modules/fastapi-cli/default.nix
+++ b/pkgs/development/python-modules/fastapi-cli/default.nix
@@ -15,14 +15,14 @@
 let
   self = buildPythonPackage rec {
     pname = "fastapi-cli";
-    version = "0.0.7";
+    version = "0.0.8";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "tiangolo";
       repo = "fastapi-cli";
       tag = version;
-      hash = "sha256-LLk9DMYRqSgiisDfJVP961Blp2u8XLeGDVuDY7IBv/k=";
+      hash = "sha256-7SYsIgRSFZgtIHBC5Ic9Nlh+LtGJDz0Xx1yxMarAuYY=";
     };
 
     build-system = [ pdm-backend ];

From 39df5fa3bbcf32dd1c88f161585766f54fa7c012 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:45 +0200
Subject: [PATCH 0764/3724] python3Packages.fastapi: 0.115.12 -> 0.116.1

https://github.com/fastapi/fastapi/releases/tag/0.116.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/fastapi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index a18094d8defa..77246fb7eb78 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -41,7 +41,7 @@
 
 buildPythonPackage rec {
   pname = "fastapi";
-  version = "0.115.12";
+  version = "0.116.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -50,7 +50,7 @@ buildPythonPackage rec {
     owner = "tiangolo";
     repo = "fastapi";
     tag = version;
-    hash = "sha256-qUJFBOwXIizgIrTYbueflimni+/BhbuTEf45dsjShKE=";
+    hash = "sha256-sd0SnaxuuF3Zaxx7rffn4ttBpRmWQoOtXln/amx9rII=";
   };
 
   build-system = [ pdm-backend ];
@@ -136,7 +136,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "fastapi" ];
 
   meta = with lib; {
-    changelog = "https://github.com/fastapi/fastapi/releases/tag/${version}";
+    changelog = "https://github.com/fastapi/fastapi/releases/tag/${src.tag}";
     description = "Web framework for building APIs";
     homepage = "https://github.com/fastapi/fastapi";
     license = licenses.mit;

From 0fddb922e1264b7dc7168ebae0f76b11395f3e47 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:46 +0200
Subject: [PATCH 0765/3724] python3Packages.fastavro: 1.11.1 -> 1.12.0

https://github.com/fastavro/fastavro/blob/1.12.0/ChangeLog

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/fastavro/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix
index 9fbbaccbc289..04c419eaedcd 100644
--- a/pkgs/development/python-modules/fastavro/default.nix
+++ b/pkgs/development/python-modules/fastavro/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "fastavro";
-  version = "1.11.1";
+  version = "1.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "fastavro";
     repo = "fastavro";
     tag = version;
-    hash = "sha256-I8Te1Ae20UrE5qI2nwktU0Ubip7Jx4/NWteSKsSz7tg=";
+    hash = "sha256-r/dNXBmsNnvYbvXdZC5++1B9884dQV76pLga6u3XtO8=";
   };
 
   preBuild = ''
@@ -72,7 +72,7 @@ buildPythonPackage rec {
     description = "Fast read/write of AVRO files";
     mainProgram = "fastavro";
     homepage = "https://github.com/fastavro/fastavro";
-    changelog = "https://github.com/fastavro/fastavro/blob/${version}/ChangeLog";
+    changelog = "https://github.com/fastavro/fastavro/blob/${src.tag}/ChangeLog";
     license = licenses.mit;
     maintainers = with maintainers; [ samuela ];
   };

From 916e9f54fb7e2db32bd357d34a84c37a39bb45cf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:47 +0200
Subject: [PATCH 0766/3724] python3Packages.fastbencode: 0.3.2 -> 0.3.5

https://github.com/breezy-team/fastbencode/releases/tag/v0.3.3
https://github.com/breezy-team/fastbencode/releases/tag/v0.3.4
https://github.com/breezy-team/fastbencode/releases/tag/v0.3.5

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/fastbencode/default.nix    | 42 +++++++++++++------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix
index ab515a234fa1..bb93f32fc693 100644
--- a/pkgs/development/python-modules/fastbencode/default.nix
+++ b/pkgs/development/python-modules/fastbencode/default.nix
@@ -1,33 +1,49 @@
 {
   lib,
   buildPythonPackage,
-  cython,
-  fetchPypi,
-  python,
-  pythonOlder,
+  fetchFromGitHub,
+  cargo,
+  rustc,
+  rustPlatform,
   setuptools,
+  setuptools-rust,
+  python,
 }:
 
 buildPythonPackage rec {
   pname = "fastbencode";
-  version = "0.3.2";
+  version = "0.3.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-o0wyxQSw7J3hpJk0btJJMjWetGI0sotwl1pQ/fqhSrU=";
+  src = fetchFromGitHub {
+    owner = "breezy-team";
+    repo = "fastbencode";
+    tag = "v${version}";
+    hash = "sha256-E02MASmHsXWIqVQuFVwXK0MRocrA7LSga7o42au1gGE=";
   };
 
-  build-system = [ setuptools ];
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version src;
+    hash = "sha256-r229xfSrkbDEfm/nGFuQshyP4o04US0xJiRK4oXtaYE=";
+  };
 
-  nativeBuildInputs = [ cython ];
+  nativeBuildInputs = [
+    cargo
+    rustPlatform.cargoSetupHook
+    rustc
+  ];
+
+  build-system = [
+    setuptools
+    setuptools-rust
+  ];
 
   pythonImportsCheck = [ "fastbencode" ];
 
   checkPhase = ''
-    ${python.interpreter} -m unittest fastbencode.tests.test_suite
+    runHook preCheck
+    ${python.interpreter} -m unittest tests.test_suite
+    runHook postCheck
   '';
 
   meta = with lib; {

From af868c0a3e368e63fee85d6fc8e7a537fe60e51b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:48 +0200
Subject: [PATCH 0767/3724] python3Packages.fastjet: 3.4.3.1 -> 3.5.1.1

https://github.com/scikit-hep/fastjet/releases/tag/v3.5.1.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/fastjet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fastjet/default.nix b/pkgs/development/python-modules/fastjet/default.nix
index f1708d02cf81..08b3098d4825 100644
--- a/pkgs/development/python-modules/fastjet/default.nix
+++ b/pkgs/development/python-modules/fastjet/default.nix
@@ -31,13 +31,13 @@ in
 
 buildPythonPackage rec {
   pname = "fastjet";
-  version = "3.4.3.1";
+  version = "3.5.1.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "fastjet";
     inherit version;
-    hash = "sha256-c9LE3axkm3tJt6RfHHIbJZsA/0s2Cl1UqxGKqKvospI=";
+    hash = "sha256-2GG9A+/2rgYpsJo1tu3BprOM7bKwYVV6/qIIMtYSr9o=";
   };
 
   # unvendor fastjet/fastjet-contrib

From a7c67d0d682744dcd7b3e1be4ef10b6ae6312a3d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:49 +0200
Subject: [PATCH 0768/3724] python3Packages.fastmcp: 2.10.6 -> 2.11.1

https://github.com/jlowin/fastmcp/releases/tag/v2.11.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/fastmcp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fastmcp/default.nix b/pkgs/development/python-modules/fastmcp/default.nix
index c87ef6e3e938..418fdfef0075 100644
--- a/pkgs/development/python-modules/fastmcp/default.nix
+++ b/pkgs/development/python-modules/fastmcp/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "fastmcp";
-  version = "2.10.6";
+  version = "2.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jlowin";
     repo = "fastmcp";
     tag = "v${version}";
-    hash = "sha256-Wxugk2ocuur710WZLG7xph2R/n02Y9BvH7Lf4BuEMYs=";
+    hash = "sha256-Y71AJdWcRBDbq63p+lcQplqutz2UTQ3f+pTyhcolpuw=";
   };
 
   postPatch = ''
@@ -115,7 +115,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Fast, Pythonic way to build MCP servers and clients";
-    changelog = "https://github.com/jlowin/fastmcp/releases/tag/v${version}";
+    changelog = "https://github.com/jlowin/fastmcp/releases/tag/${src.tag}";
     homepage = "https://github.com/jlowin/fastmcp";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ GaetanLepage ];

From b904ee4ccee32f197689db5f5f8290fccef13f63 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:50 +0200
Subject: [PATCH 0769/3724] python3Packages.feedgenerator: 2.1.0 -> 2.2.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/feedgenerator/default.nix  | 29 ++++++-------------
 pkgs/top-level/python-packages.nix            |  4 +--
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix
index 725150b18fb6..0f79decf5377 100644
--- a/pkgs/development/python-modules/feedgenerator/default.nix
+++ b/pkgs/development/python-modules/feedgenerator/default.nix
@@ -2,39 +2,28 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  glibcLocales,
+  hatchling,
+  pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
-  pytz,
-  six,
 }:
 
 buildPythonPackage rec {
   pname = "feedgenerator";
-  version = "2.1.0";
-  format = "setuptools";
-  disabled = pythonOlder "3.6";
+  version = "2.2.0";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8HXyPyj9In8JfDayEhYcbPAS4cbKr3/1PV1rsCzUK50=";
+    hash = "sha256-KXb2zMWYmpZyAto0PqFFwhrtq74ANccIjWS6CqlyWmA=";
   };
 
-  postPatch = ''
-    sed -i '/cov/d' setup.cfg
-  '';
+  build-system = [ hatchling ];
 
-  buildInputs = [ glibcLocales ];
-
-  LC_ALL = "en_US.UTF-8";
-
-  propagatedBuildInputs = [
-    pytz
-    six
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
-
   pythonImportsCheck = [ "feedgenerator" ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71d84a38372a..b1e608fbe73c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5039,9 +5039,7 @@ self: super: with self; {
 
   feedgen = callPackage ../development/python-modules/feedgen { };
 
-  feedgenerator = callPackage ../development/python-modules/feedgenerator {
-    inherit (pkgs) glibcLocales;
-  };
+  feedgenerator = callPackage ../development/python-modules/feedgenerator { };
 
   feedparser = callPackage ../development/python-modules/feedparser { };
 

From 2e13b12d10b5e194f405d3dc9480cdc83a2c17e9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:51 +0200
Subject: [PATCH 0770/3724] python3Packages.fido2: 1.2.0 -> 2.0.0

https://github.com/Yubico/python-fido2/releases/tag/2.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/fido2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix
index 9b08a708cfb1..eb93e5a454a9 100644
--- a/pkgs/development/python-modules/fido2/default.nix
+++ b/pkgs/development/python-modules/fido2/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "fido2";
-  version = "1.2.0";
+  version = "2.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-45+VkgEi1kKD/aXlWB2VogbnBPpChGv6RmL4aqDTMzs=";
+    hash = "sha256-MGHNBec7Og72r8O4A9V8gmqi1qlzLRar1ydzYfWOeWQ=";
   };
 
   build-system = [ poetry-core ];

From ca1f173e6777cd6c9bd7c4f34e8a753b738201bd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:52 +0200
Subject: [PATCH 0771/3724] python3Packages.file-read-backwards: 3.1.0 -> 3.2.0

https://github.com/RobinNil/file_read_backwards/blob/v3.2.0/HISTORY.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/file-read-backwards/default.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/file-read-backwards/default.nix b/pkgs/development/python-modules/file-read-backwards/default.nix
index ddb141b8ac7c..37669b8f32b7 100644
--- a/pkgs/development/python-modules/file-read-backwards/default.nix
+++ b/pkgs/development/python-modules/file-read-backwards/default.nix
@@ -2,15 +2,15 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  mock,
   pythonOlder,
   setuptools,
-  unittestCheckHook,
+  pytest-mock,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "file-read-backwards";
-  version = "3.1.0";
+  version = "3.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,14 +18,14 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "file_read_backwards";
     inherit version;
-    hash = "sha256-vQRZO8GTigAyJL5FHV1zXx9EkOHnClaM6NMwu3ZSpoQ=";
+    hash = "sha256-VHjTBeuuquj+PGWFok38MmIXAiRFCsyTITmPDSbN0Qk=";
   };
 
   build-system = [ setuptools ];
 
   nativeCheckInputs = [
-    mock
-    unittestCheckHook
+    pytest-mock
+    pytestCheckHook
   ];
 
   pythonImportsCheck = [ "file_read_backwards" ];

From 324e87ce1ca74df623a21357464ed905fb756b5e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:53 +0200
Subject: [PATCH 0772/3724] python3Packages.findpython: 0.6.3 -> 0.7.0

https://github.com/frostming/findpython/releases/tag/0.7.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/findpython/default.nix        | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix
index b755709b553a..4116f0ec2c88 100644
--- a/pkgs/development/python-modules/findpython/default.nix
+++ b/pkgs/development/python-modules/findpython/default.nix
@@ -9,6 +9,7 @@
 
   # runtime
   packaging,
+  platformdirs,
 
   # tests
   pytestCheckHook,
@@ -16,22 +17,23 @@
 
 let
   pname = "findpython";
-  version = "0.6.3";
+  version = "0.7.0";
 in
 buildPythonPackage {
   inherit pname version;
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WGPqVVVtiq3Gk0gaFKxPNiSVJxnvwcVZGrsLSp6WXJQ=";
+    hash = "sha256-izFkfHY1J3mjwaCAZpm2jmp73AtcLd2a8qB6DUDGc9w=";
   };
 
-  nativeBuildInputs = [ pdm-backend ];
+  build-system = [ pdm-backend ];
 
-  propagatedBuildInputs = [ packaging ];
+  dependencies = [
+    packaging
+    platformdirs
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From ad0c585edbc3bdacce631d15c22f1c9e19c9aeb5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 16:12:08 +0200
Subject: [PATCH 0773/3724] poetry: pin findpython 0.6.3

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

diff --git a/pkgs/by-name/po/poetry/package.nix b/pkgs/by-name/po/poetry/package.nix
index b17bd307b3dd..b96a4cce5b14 100644
--- a/pkgs/by-name/po/poetry/package.nix
+++ b/pkgs/by-name/po/poetry/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3,
   fetchFromGitHub,
+  fetchPypi,
 }:
 
 let
@@ -25,6 +26,16 @@ let
           hash = "sha256-CgaWlqjvBTN7GuerzmO5IiEdXxYH6pmTDj9IsNJlCBE=";
         };
       });
+
+      findpython = super.findpython.overridePythonAttrs (old: rec {
+        version = "0.6.3";
+
+        src = fetchPypi {
+          inherit (old) pname;
+          inherit version;
+          hash = "sha256-WGPqVVVtiq3Gk0gaFKxPNiSVJxnvwcVZGrsLSp6WXJQ=";
+        };
+      });
     }
     // (plugins self);
   python = python3.override (old: {

From 5bc38323df0c2f4490f3799fe40ded99615b319f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:54 +0200
Subject: [PATCH 0774/3724] python3Packages.firebase-admin: 6.9.0 -> 7.1.0

https://github.com/firebase/firebase-admin-python/releases/tag/v7.1.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/firebase-admin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/firebase-admin/default.nix b/pkgs/development/python-modules/firebase-admin/default.nix
index 2b4f9f979d73..65e61d7321e0 100644
--- a/pkgs/development/python-modules/firebase-admin/default.nix
+++ b/pkgs/development/python-modules/firebase-admin/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "firebase-admin";
-  version = "6.9.0";
+  version = "7.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-admin-python";
     tag = "v${version}";
-    hash = "sha256-TB5YIprtSXHbeWlu9U4fDjWCZdO5vM695u28Hv6w2e0=";
+    hash = "sha256-xlKrtH8f9UzY9OGYrpNH0i2OAlcxTrpzPC5JEuL8plM=";
   };
 
   build-system = [ setuptools ];

From 534a0dbe603505448dd7a5e4548b5de010b02e47 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:56 +0200
Subject: [PATCH 0775/3724] python3Packages.firecrawl-py: 1.7.0 -> 1.15.0

https://github.com/mendableai/firecrawl/releases/tag/v1.15.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/firecrawl-py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/firecrawl-py/default.nix b/pkgs/development/python-modules/firecrawl-py/default.nix
index 73985ce40596..10d957fecdea 100644
--- a/pkgs/development/python-modules/firecrawl-py/default.nix
+++ b/pkgs/development/python-modules/firecrawl-py/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "firecrawl-py";
-  version = "1.7.0";
+  version = "1.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mendableai";
     repo = "firecrawl";
     tag = "v${version}";
-    hash = "sha256-Tsw5OMjv/t9lt3seG31958R9o+s/6N7MGzHgqgkHrzQ=";
+    hash = "sha256-GIde8FiU1/gS3oFfTf7f7Tc4KvDVL873VE5kjyh33Is=";
   };
 
   sourceRoot = "${src.name}/apps/python-sdk";

From ed1797a7b4cb5697f7c3148ad57467a0846a92bc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:57 +0200
Subject: [PATCH 0776/3724] python3Packages.firedrake: 2025.4.2 -> 20250331.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/firedrake/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/firedrake/default.nix b/pkgs/development/python-modules/firedrake/default.nix
index b223e632552c..63977170c065 100644
--- a/pkgs/development/python-modules/firedrake/default.nix
+++ b/pkgs/development/python-modules/firedrake/default.nix
@@ -57,14 +57,14 @@ let
 in
 buildPythonPackage rec {
   pname = "firedrake";
-  version = "2025.4.2";
+  version = "20250331.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "firedrakeproject";
     repo = "firedrake";
-    tag = version;
-    hash = "sha256-bAGmXoHPAdMYJMMQYVq98LYro1Vd+o9pfvXC3BsQUf0=";
+    tag = "Firedrake_${version}";
+    hash = "sha256-J0oAZWkzcrgbry5OTG8hKrIgHcwJtzaDw8staOLM9u4=";
   };
 
   postPatch =

From 313d0c772feebd14472a587b006c74ba622fdd80 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:58 +0200
Subject: [PATCH 0777/3724] python3Packages.fixtures: 4.2.4.post1 -> 4.2.6

https://github.com/testing-cabal/fixtures/blob/4.2.6/NEWS

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/fixtures/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix
index 8989e474942f..1396001b00fd 100644
--- a/pkgs/development/python-modules/fixtures/default.nix
+++ b/pkgs/development/python-modules/fixtures/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "fixtures";
-  version = "4.2.4.post1";
+  version = "4.2.6";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-A0xL0d6qYKW/y2CM5T2Z6Dkr9HyRplNgWuvdagUkjy4=";
+    hash = "sha256-lUcrFbFFBjpnL74zsSRMz/gp++yX1TDYYtJvQW0WyQs=";
   };
 
   build-system = [

From f2b27866c2181a24af1f19d5344ca9e3b80cd9b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:38:59 +0200
Subject: [PATCH 0778/3724] python3Packages.flake8-import-order: 0.18.2 ->
 0.19.2

https://github.com/PyCQA/flake8-import-order/blob/0.19.2/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/flake8-import-order/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix
index ea860b563edb..9dd465ada993 100644
--- a/pkgs/development/python-modules/flake8-import-order/default.nix
+++ b/pkgs/development/python-modules/flake8-import-order/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "flake8-import-order";
-  version = "0.18.2";
+  version = "0.19.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4jlB+JLaPgwJ1xG6u7DHO8c1JC6bIWtyZhZ1ipINkA4=";
+    hash = "sha256-Ezs8VUl2MeQjUHT8mKlQeLuoF4MjefIqMfCtJFW8sLI=";
   };
 
   propagatedBuildInputs = [ pycodestyle ];

From d1edb8bda45cd159d6b8728a2626d6ba7d83f147 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:00 +0200
Subject: [PATCH 0779/3724] python3Packages.flametree: 0.2.0 -> 0.2.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/flametree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flametree/default.nix b/pkgs/development/python-modules/flametree/default.nix
index 0dfd2447b7aa..8070c91bc66e 100644
--- a/pkgs/development/python-modules/flametree/default.nix
+++ b/pkgs/development/python-modules/flametree/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "flametree";
-  version = "0.2.0";
+  version = "0.2.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "Edinburgh-Genome-Foundry";
     repo = "Flametree";
     tag = "v${version}";
-    hash = "sha256-4yU4u5OmVP3adz9DNsU0BtuQ7LZYqbOLxbuS48lksHM=";
+    hash = "sha256-5vtDfGmSX5niMXLnMqmafhq6D1gxhxVS3xbOAvQs3Po=";
   };
 
   nativeCheckInputs = [

From 7d11f5e5100fc368ebc76bf9f4b4515ab4e2442c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:01 +0200
Subject: [PATCH 0780/3724] python3Packages.flashinfer: 0.2.5 -> 0.2.9

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/flashinfer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/flashinfer/default.nix b/pkgs/development/python-modules/flashinfer/default.nix
index 430d5254c3e6..5c4c653ed981 100644
--- a/pkgs/development/python-modules/flashinfer/default.nix
+++ b/pkgs/development/python-modules/flashinfer/default.nix
@@ -19,13 +19,13 @@
 
 let
   pname = "flashinfer";
-  version = "0.2.5";
+  version = "0.2.9";
 
   src_cutlass = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "cutlass";
     # Using the revision obtained in submodule inside flashinfer's `3rdparty`.
-    rev = "df8a550d3917b0e97f416b2ed8c2d786f7f686a3";
+    tag = "v${version}";
     hash = "sha256-d4czDoEv0Focf1bJHOVGX4BDS/h5O7RPoM/RrujhgFQ=";
   };
 
@@ -38,7 +38,7 @@ buildPythonPackage {
     owner = "flashinfer-ai";
     repo = "flashinfer";
     tag = "v${version}";
-    hash = "sha256-YrYfatkI9DQkFEEGiF8CK/bTafaNga4Ufyt+882C0bQ=";
+    hash = "sha256-M0q6d+EpuTehbw68AQ73Fhwmw2tzjymYjSXaol9QC7Y=";
   };
 
   build-system = [ setuptools ];

From dbac7f0de047f810f39b5fd5b3deaf4ac203bdcd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:02 +0200
Subject: [PATCH 0781/3724] python3Packages.flask-appbuilder: 4.6.1 -> 4.8.0

https://github.com/dpgaspar/Flask-AppBuilder/blob/v4.8.0/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/flask-appbuilder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix
index a4d08de5452b..8203e26e075a 100644
--- a/pkgs/development/python-modules/flask-appbuilder/default.nix
+++ b/pkgs/development/python-modules/flask-appbuilder/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "flask-appbuilder";
-  version = "4.6.1";
+  version = "4.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Flask-AppBuilder";
     inherit version;
-    hash = "sha256-Z1PZbSjiPb97ShMhkk6oyD9/AW/oAhDFZYkTErEZBmA=";
+    hash = "sha256-MrkDcUCNgHzHnTM3DJenPXOP7HLTTthD/YBtupNprhM=";
   };
 
   propagatedBuildInputs = [

From 2d48fcd775c439343f7d5c04799fd2504a855e90 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:03 +0200
Subject: [PATCH 0782/3724] python3Packages.flask-cors: 6.0.0 -> 6.0.1

https://github.com/corydolphin/flask-cors/releases/tag/6.0.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/flask-cors/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix
index e34dfee61402..6565d6ed6503 100644
--- a/pkgs/development/python-modules/flask-cors/default.nix
+++ b/pkgs/development/python-modules/flask-cors/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "flask-cors";
-  version = "6.0.0";
+  version = "6.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "corydolphin";
     repo = "flask-cors";
     tag = version;
-    hash = "sha256-J9OTWVS0GXxfSedfHeifaJ0LR8xFKksf0RGsKSc581E=";
+    hash = "sha256-ySn5o9yDlCYqHozGJ82cPtty/N+EK/NvIynxv9w+hwc=";
   };
 
   build-system = [

From f14d580739e69dfd7d85585b46f80efabb4d6eed Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:04 +0200
Subject: [PATCH 0783/3724] python3Packages.flask-swagger-ui: 4.11.1 -> 5.21.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/flask-swagger-ui/default.nix            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/flask-swagger-ui/default.nix b/pkgs/development/python-modules/flask-swagger-ui/default.nix
index b8fbada07ee9..5b67e456d090 100644
--- a/pkgs/development/python-modules/flask-swagger-ui/default.nix
+++ b/pkgs/development/python-modules/flask-swagger-ui/default.nix
@@ -7,12 +7,13 @@
 
 buildPythonPackage rec {
   pname = "flask-swagger-ui";
-  version = "4.11.1";
+  version = "5.21.0";
   format = "setuptools";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-o3AZmngNZ4sy448b4Q1Nge+g7mPp/i+3Zv8aS2w32sg=";
+    pname = "flask_swagger_ui";
+    inherit version;
+    hash = "sha256-hy0DjcEaaOrKuI9vBb48UzqjAEU+Jzd12tPgKbMeA9Q=";
   };
 
   doCheck = false; # there are no tests

From d8f2bf9a602348a7f02480780d7f394b7d5c4457 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:05 +0200
Subject: [PATCH 0784/3724] python3Packages.flowjax: 17.1.2 -> 17.2.0

https://github.com/danielward27/flowjax/releases/tag/v17.2.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/flowjax/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/flowjax/default.nix b/pkgs/development/python-modules/flowjax/default.nix
index 48cc10ee2233..16f7473b783c 100644
--- a/pkgs/development/python-modules/flowjax/default.nix
+++ b/pkgs/development/python-modules/flowjax/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "flowjax";
-  version = "17.1.2";
+  version = "17.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "danielward27";
     repo = "flowjax";
     tag = "v${version}";
-    hash = "sha256-NTP5QFJDe4tSAuHsQB4ZWyCcqLgW6uUaABfOG/TFgu0=";
+    hash = "sha256-gaHlXm1M41njtgQt+f77Wd7q+PQ+1ipZiLtv59z1ma4=";
   };
 
   build-system = [
@@ -58,7 +58,7 @@ buildPythonPackage rec {
   meta = {
     description = "Distributions, bijections and normalizing flows using Equinox and JAX";
     homepage = "https://github.com/danielward27/flowjax";
-    changelog = "https://github.com/danielward27/flowjax/releases/tag/v${version}";
+    changelog = "https://github.com/danielward27/flowjax/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };

From 4b1b2cca5818209593609ad4685feb453cb081d1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:06 +0200
Subject: [PATCH 0785/3724] python3Packages.fnllm: 0.2.8 -> 0.3.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/fnllm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fnllm/default.nix b/pkgs/development/python-modules/fnllm/default.nix
index 5e1afe742821..d3368493a984 100644
--- a/pkgs/development/python-modules/fnllm/default.nix
+++ b/pkgs/development/python-modules/fnllm/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "fnllm";
-  version = "0.2.8";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FafxygW5aZ3U24mesFZI5cmLd1L1FE8rHOrOgL3R+9g=";
+    hash = "sha256-q7aeFXuXIrwjjXEHVpACohWommIxJZo9PRUgh4uLtfA=";
   };
 
   build-system = [ hatchling ];

From fe9480b0b89a449f044f56f04b823f37ad0d7cb2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:07 +0200
Subject: [PATCH 0786/3724] python3Packages.fnvhash: 0.1.0 -> 0.2.1

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/fnvhash/default.nix           | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/fnvhash/default.nix b/pkgs/development/python-modules/fnvhash/default.nix
index 76ec4ed770b4..1ee089150e1c 100644
--- a/pkgs/development/python-modules/fnvhash/default.nix
+++ b/pkgs/development/python-modules/fnvhash/default.nix
@@ -3,25 +3,33 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
+  setuptools,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "fnvhash";
-  version = "0.1.0";
-  format = "setuptools";
+  version = "0.2.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "znerol";
     repo = "py-fnvhash";
-    rev = "v${version}";
-    sha256 = "00h8i70qd3dpsyf2dp7fkcb9m2prd6m3l33qv3wf6idpnqgjz6fq";
+    tag = "v${version}";
+    hash = "sha256-vAflKSvi0PD5r1q6GCTt6a4vTCsdBIebecRCKbbBphE=";
   };
 
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "fnvhash" ];
 
   meta = with lib; {
+    changelog = "https://github.com/znerol/py-fnvhash/releases/tag/${src.tag}";
     description = "Python FNV hash implementation";
     homepage = "https://github.com/znerol/py-fnvhash";
     license = with licenses; [ mit ];

From b31a483ff9795fac7b000e4b4dcd153ea1fd8118 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:08 +0200
Subject: [PATCH 0787/3724] python3Packages.folium: 0.19.5 -> 0.20.0

https://github.com/python-visualization/folium/releases/tag/v0.20.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/folium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix
index cc77d9180111..a63d9626fb87 100644
--- a/pkgs/development/python-modules/folium/default.nix
+++ b/pkgs/development/python-modules/folium/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "folium";
-  version = "0.19.5";
+  version = "0.20.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "python-visualization";
     repo = "folium";
     tag = "v${version}";
-    hash = "sha256-jZrGJWSmQXQNlZYldeNSh5AhlTHow5gxCEkksEoKZ7E=";
+    hash = "sha256-yLF4TdrMVEtWvGXZGbwa3OxCkdXMsN4m45rPrGDHlCU=";
   };
 
   build-system = [

From 48f51aeea15a241c7effc57da87d4560e3953e77 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:09 +0200
Subject: [PATCH 0788/3724] python3Packages.fontmake: 3.10.0 -> 3.10.1

https://github.com/googlefonts/fontmake/releases/tag/v3.10.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/fontmake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix
index 770b40718ba1..8fb3c30f6df4 100644
--- a/pkgs/development/python-modules/fontmake/default.nix
+++ b/pkgs/development/python-modules/fontmake/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "fontmake";
-  version = "3.10.0";
+  version = "3.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "fontmake";
     tag = "v${version}";
-    hash = "sha256-ZlK8QyZ5cIEphFiZXMV/Z5pL9H62X2UwLBtpwLGpUMQ=";
+    hash = "sha256-cHFxb7lWUj/7ATynoMGQkhArKWCHHLYvQG5IoaXwVBs=";
   };
 
   patches = [

From b5a6aa576b7282e64252d788a584b5d4fff2c5fc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:11 +0200
Subject: [PATCH 0789/3724] python3Packages.foxdot: 0.8.12 -> 0.9.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/foxdot/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix
index c9bdda75abb6..1fdce0278694 100644
--- a/pkgs/development/python-modules/foxdot/default.nix
+++ b/pkgs/development/python-modules/foxdot/default.nix
@@ -3,22 +3,24 @@
   stdenv,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   tkinter,
   supercollider,
 }:
 
 buildPythonPackage rec {
   pname = "foxdot";
-  version = "0.8.12";
-  format = "setuptools";
+  version = "0.9.0";
+  pyproject = true;
 
   src = fetchPypi {
-    pname = "FoxDot";
-    inherit version;
-    sha256 = "528999da55ad630e540a39c0eaeacd19c58c36f49d65d24ea9704d0781e18c90";
+    inherit pname version;
+    hash = "sha256-9dIaqrGcYpZeWlRlymRvG9YnTRav0zktfmUpFBlN/7E=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     tkinter
   ]
   # we currently build SuperCollider only on Linux

From c867efa88a1618f5aa111f864d61e7d957abac3e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:12 +0200
Subject: [PATCH 0790/3724] python3Packages.fpdf2: 2.8.2 -> 2.8.3

https://github.com/py-pdf/fpdf2/blob/2.8.3/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/fpdf2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fpdf2/default.nix b/pkgs/development/python-modules/fpdf2/default.nix
index 55a223cc859a..41e518d00490 100644
--- a/pkgs/development/python-modules/fpdf2/default.nix
+++ b/pkgs/development/python-modules/fpdf2/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "fpdf2";
-  version = "2.8.2";
+  version = "2.8.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "py-pdf";
     repo = "fpdf2";
     tag = version;
-    hash = "sha256-NfHMmyFT+ZpqfRc41DetbFXs/twr12XagOkk3nGhrYk=";
+    hash = "sha256-uLaVRseakLg7Q9QO4F6BM7vQIFeA44ry8cqDfas8oMA=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -63,7 +63,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/py-pdf/fpdf2";
     description = "Simple PDF generation for Python";
-    changelog = "https://github.com/py-pdf/fpdf2/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/py-pdf/fpdf2/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ jfvillablanca ];
   };

From 4c8c77bcb69fec0a4b395da9f83ac0b16a6384aa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:13 +0200
Subject: [PATCH 0791/3724] python3Packages.freud: 3.1.0 -> 3.3.1

https://github.com/glotzerlab/freud/blob/v3.3.1/ChangeLog.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/freud/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/freud/default.nix b/pkgs/development/python-modules/freud/default.nix
index 360b15d8439c..b7f7646f18bd 100644
--- a/pkgs/development/python-modules/freud/default.nix
+++ b/pkgs/development/python-modules/freud/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "freud";
-  version = "3.1.0";
+  version = "3.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "glotzerlab";
     repo = "freud";
     tag = "v${version}";
-    hash = "sha256-jlscEHQ1q4oqxE06NhVWCOlPRcjDcJVrvy4h6iYrkz0=";
+    hash = "sha256-3THoGPjfaDy2s96+Oaf1f2SDzxTaqRDQlNa3gZ/ytUU=";
     fetchSubmodules = true;
   };
 
@@ -93,7 +93,7 @@ buildPythonPackage rec {
   meta = {
     description = "Powerful, efficient particle trajectory analysis in scientific Python";
     homepage = "https://github.com/glotzerlab/freud";
-    changelog = "https://github.com/glotzerlab/freud/blob/${src.rev}/ChangeLog.md";
+    changelog = "https://github.com/glotzerlab/freud/blob/${src.tag}/ChangeLog.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ doronbehar ];
   };

From 52443f02fcb023169c7f6427bc6743fa69dbe007 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:14 +0200
Subject: [PATCH 0792/3724] python3Packages.frozenlist: 1.6.0 -> 1.7.0

https://github.com/aio-libs/frozenlist/blob/v1.7.0/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/frozenlist/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix
index 967df73bac5d..3a18ffc017d6 100644
--- a/pkgs/development/python-modules/frozenlist/default.nix
+++ b/pkgs/development/python-modules/frozenlist/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "frozenlist";
-  version = "1.6.0";
+  version = "1.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "aio-libs";
     repo = "frozenlist";
     tag = "v${version}";
-    hash = "sha256-x2o4eiSDxA7nvrifzvV38kjIGmOY8gaQrPNDhCupovg=";
+    hash = "sha256-aBHX/U1L2mcah80edJFY/iXsM05DVas7lJT8yVTjER8=";
   };
 
   postPatch = ''
@@ -48,7 +48,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module for list-like structure";
     homepage = "https://github.com/aio-libs/frozenlist";
-    changelog = "https://github.com/aio-libs/frozenlist/blob/v${version}/CHANGES.rst";
+    changelog = "https://github.com/aio-libs/frozenlist/blob/${src.tag}/CHANGES.rst";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

From 5a5a40d99c6bd0d03805fd8c4e7876dc1b038de6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:15 +0200
Subject: [PATCH 0793/3724] python3Packages.functions-framework: 3.8.3 -> 3.9.2

https://github.com/GoogleCloudPlatform/functions-framework-python/blob/v3.9.2/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/functions-framework/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/functions-framework/default.nix b/pkgs/development/python-modules/functions-framework/default.nix
index cd0e2177eba6..20cd253b2e0a 100644
--- a/pkgs/development/python-modules/functions-framework/default.nix
+++ b/pkgs/development/python-modules/functions-framework/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "functions-framework-python";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TvC+URJtsquBX/5F5Z2Nw/4sD3hsvF2c/jlv87lGjfM=";
   };
 
@@ -67,7 +67,7 @@ buildPythonPackage rec {
   meta = {
     description = "FaaS (Function as a service) framework for writing portable Python functions";
     homepage = "https://github.com/GoogleCloudPlatform/functions-framework-python";
-    changelog = "https://github.com/GoogleCloudPlatform/functions-framework-python/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/GoogleCloudPlatform/functions-framework-python/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };

From fe2ae577b7091540264eede09d67284a53c5eedd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:16 +0200
Subject: [PATCH 0794/3724] python3Packages.functiontrace: 0.3.10 -> 0.5.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/functiontrace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/functiontrace/default.nix b/pkgs/development/python-modules/functiontrace/default.nix
index 7da09ce41208..e08ca4340ac1 100644
--- a/pkgs/development/python-modules/functiontrace/default.nix
+++ b/pkgs/development/python-modules/functiontrace/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "functiontrace";
-  version = "0.3.10";
+  version = "0.5.1";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-E2MNp3wKb9FEjEQK/vL/XBfScPuAwbWV5JeA9+ujckY=";
+    hash = "sha256-yRzcg8BDuwF74J2EYa/3GMkTaRGsx0WyDIQEWHwj12M=";
   };
 
   nativeBuildInputs = [

From 7e8135c8e1c7b9283fa0cf7965fe11027a3fe9ea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:17 +0200
Subject: [PATCH 0795/3724] python3Packages.furo: 2024.8.6 -> 2025.7.19

https://github.com/pradyunsg/furo/blob/2025.7.19/docs/changelog.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/furo/default.nix           | 79 +++++++++++++------
 1 file changed, 53 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix
index 71bc32d7a516..2bb4606fada4 100644
--- a/pkgs/development/python-modules/furo/default.nix
+++ b/pkgs/development/python-modules/furo/default.nix
@@ -1,48 +1,75 @@
 {
   lib,
+  buildNpmPackage,
   buildPythonPackage,
-  pythonOlder,
-  fetchPypi,
-  sphinx,
+  fetchFromGitHub,
+  flit-core,
+  accessible-pygments,
   beautifulsoup4,
+  pygments,
+  sphinx,
   sphinx-basic-ng,
 }:
 
-buildPythonPackage rec {
+let
   pname = "furo";
-  version = "2024.8.6";
-  format = "wheel";
+  version = "2025.07.19";
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit pname version format;
-    dist = "py3";
-    python = "py3";
-    hash = "sha256-bNl8WLR4E9NhnmPpCBFpiA++Mx8MqIPIcf8fPxGBT1w=";
+  src = fetchFromGitHub {
+    owner = "pradyunsg";
+    repo = "furo";
+    tag = version;
+    hash = "sha256-pIF5zrh5YbkuSkrateEB/tDULSNbeVn2Qx+Fm3nOYGE=";
   };
 
+  web = buildNpmPackage {
+    pname = "${pname}-web";
+    inherit version src;
+
+    npmDepsHash = "sha256-dcdHoyqF9zC/eKtEqMho7TK2E1KIvoXo0iwSPTzj+Kw=";
+
+    installPhase = ''
+      pushd src/furo/theme/furo/static
+      mkdir $out
+      cp -rv scripts styles $out/
+      popd
+    '';
+  };
+in
+
+buildPythonPackage rec {
+  inherit pname version src;
+  pyproject = true;
+
+  postPatch = ''
+    # build with boring backend that does not manage a node env
+    substituteInPlace pyproject.toml \
+      --replace-fail "sphinx-theme-builder >= 0.2.0a10" "flit-core" \
+      --replace-fail "sphinx_theme_builder" "flit_core.buildapi"
+
+    pushd src/furo/theme/furo/static
+    cp -rv ${web}/{scripts,styles} .
+    popd
+  '';
+
+  build-system = [ flit-core ];
+
   pythonRelaxDeps = [ "sphinx" ];
 
-  propagatedBuildInputs = [
-    sphinx
+  dependencies = [
+    accessible-pygments
     beautifulsoup4
+    pygments
+    sphinx
     sphinx-basic-ng
   ];
 
-  installCheckPhase = ''
-    # furo was built incorrectly if this directory is empty
-    # Ignore the hidden file .gitignore
-    cd "$out/lib/python"*
-    if [ "$(ls 'site-packages/furo/theme/furo/static/' | wc -l)" -le 0 ]; then
-      echo 'static directory must not be empty'
-      exit 1
-    fi
-    cd -
-  '';
-
   pythonImportsCheck = [ "furo" ];
 
+  passthru = {
+    inherit web;
+  };
+
   meta = with lib; {
     description = "Clean customizable documentation theme for Sphinx";
     homepage = "https://github.com/pradyunsg/furo";

From 27dcc50355948af6658da654f0efe3de2a41a571 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:19 +0200
Subject: [PATCH 0796/3724] python3Packages.gdsfactory: 9.5.2 -> 9.12.0

https://github.com/gdsfactory/gdsfactory/blob/v9.12.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/gdsfactory/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gdsfactory/default.nix b/pkgs/development/python-modules/gdsfactory/default.nix
index cfd04c5ec56a..b591a368133f 100644
--- a/pkgs/development/python-modules/gdsfactory/default.nix
+++ b/pkgs/development/python-modules/gdsfactory/default.nix
@@ -46,14 +46,14 @@
 }:
 buildPythonPackage rec {
   pname = "gdsfactory";
-  version = "9.5.2";
+  version = "9.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gdsfactory";
     repo = "gdsfactory";
     tag = "v${version}";
-    hash = "sha256-BcFEMcHt0qUQ0hTLSznuIH37rAk+10JGrPdrhE/sTfU=";
+    hash = "sha256-en976F8BjMK8Ku1QXz4MIxTs+mswVBascmGguPXeEbI=";
   };
 
   build-system = [ flit-core ];

From 6a83d82b5584a9ef62185d9efce1bae91aa06a1c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:20 +0200
Subject: [PATCH 0797/3724] python3Packages.geoalchemy2: 0.17.1 -> 0.18.0

https://github.com/geoalchemy/geoalchemy2/releases/tag/0.18.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/geoalchemy2/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix
index ac3b0e6e2057..5609564aeb0c 100644
--- a/pkgs/development/python-modules/geoalchemy2/default.nix
+++ b/pkgs/development/python-modules/geoalchemy2/default.nix
@@ -8,13 +8,14 @@
   shapely,
   sqlalchemy,
   alembic,
+  pytest-benchmark,
   pytestCheckHook,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "geoalchemy2";
-  version = "0.17.1";
+  version = "0.18.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +24,7 @@ buildPythonPackage rec {
     owner = "geoalchemy";
     repo = "geoalchemy2";
     tag = version;
-    hash = "sha256-ze0AWwlmBsMUhbmaCNUeEwhFcLxRDeal0IDO421++ck=";
+    hash = "sha256-xQxry/JJTkhsailk12lhu1SkpLlx0By/D35VSw+S/4M=";
   };
 
   build-system = [
@@ -38,10 +39,13 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     alembic
+    pytest-benchmark
     pytestCheckHook
   ]
   ++ optional-dependencies.shapely;
 
+  pytestFlags = [ "--benchmark-disable" ];
+
   disabledTestPaths = [
     # tests require live databases
     "tests/gallery/test_decipher_raster.py"

From 3a57afb3f12fe6d60cb9ca9e15aa6f6233f6393b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:21 +0200
Subject: [PATCH 0798/3724] python3Packages.geoip2: 5.0.1 -> 5.1.0

https://github.com/maxmind/GeoIP2-python/blob/v5.1.0/HISTORY.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/geoip2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix
index 01c3a58f6fb4..0a397725ac9c 100644
--- a/pkgs/development/python-modules/geoip2/default.nix
+++ b/pkgs/development/python-modules/geoip2/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "geoip2";
-  version = "5.0.1";
+  version = "5.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-kK+LbTaH877yUfJwitAXsw1ifRFEwAQOq8TJAXqAfYY=";
+    hash = "sha256-7j+H8M6TJetkhP4Yy9l3GgPQorrR3RVvo1hPr6Vi05o=";
   };
 
   build-system = [

From fa43881e7c62825a292bb4b5c98388b375e3c90b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:22 +0200
Subject: [PATCH 0799/3724] python3Packages.geopandas: 1.0.1 -> 1.1.1

https://github.com/geopandas/geopandas/blob/v1.1.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/geopandas/default.nix      | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index 9d7d1e1d9bf4..3c9c36b0311b 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -1,11 +1,8 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 
   packaging,
@@ -29,27 +26,16 @@
 
 buildPythonPackage rec {
   pname = "geopandas";
-  version = "1.0.1";
+  version = "1.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "geopandas";
     repo = "geopandas";
     tag = "v${version}";
-    hash = "sha256-SZizjwkx8dsnaobDYpeQm9jeXZ4PlzYyjIScnQrH63Q=";
+    hash = "sha256-7ZsO4jresikA17M8cyHskdcVnTscGHxTCLJv5p1SvfI=";
   };
 
-  patches = [
-    (fetchpatch {
-      # Remove geom_almost_equals, because it broke with shapely 2.1.0 and is not being updated
-      url = "https://github.com/geopandas/geopandas/commit/0e1f871a02e9612206dcadd6817284131026f61c.patch";
-      excludes = [ "CHANGELOG.md" ];
-      hash = "sha256-n9AmmbjjNwV66lxDQV2hfkVVfxRgMfEGfHZT6bql684=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -102,7 +88,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python geospatial data analysis framework";
     homepage = "https://geopandas.org";
-    changelog = "https://github.com/geopandas/geopandas/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/geopandas/geopandas/blob/${src.tag}/CHANGELOG.md";
     license = licenses.bsd3;
     teams = [ teams.geospatial ];
   };

From 26cc1e3ab59c9a2221cb815f0bfdd16f9ba75912 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:24 +0200
Subject: [PATCH 0800/3724] python3Packages.githubkit: 0.12.13 -> 0.13.0

https://github.com/yanyongyu/githubkit/releases/tag/v0.13.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/githubkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix
index 4b8b24fdf04b..b24fdbe1e639 100644
--- a/pkgs/development/python-modules/githubkit/default.nix
+++ b/pkgs/development/python-modules/githubkit/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "githubkit";
-  version = "0.12.13";
+  version = "0.13.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "yanyongyu";
     repo = "githubkit";
     tag = "v${version}";
-    hash = "sha256-TMn81YY44bXUyU6GHSGtLtQ7aC2/vA9nZf/PaGhBi0s=";
+    hash = "sha256-BhTGik8JZ9QxE8zmfgToU7rVkY8T5iykJx4Bg4evyzY=";
   };
 
   pythonRelaxDeps = [ "hishel" ];

From e608e3892daccce559fde7d55c1393e5430b441f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:25 +0200
Subject: [PATCH 0801/3724] python3Packages.gitingest: 0.1.5 -> 0.3.1

https://github.com/cyclotruc/gitingest/releases/tag/v0.3.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/gitingest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gitingest/default.nix b/pkgs/development/python-modules/gitingest/default.nix
index cbd1942461cb..f78f92500c83 100644
--- a/pkgs/development/python-modules/gitingest/default.nix
+++ b/pkgs/development/python-modules/gitingest/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "gitingest";
-  version = "0.1.5";
+  version = "0.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cyclotruc";
     repo = "gitingest";
     tag = "v${version}";
-    hash = "sha256-f/srwLhTXboSlW28qnShqTuc2yLMuHH3MyzfKpDIitQ=";
+    hash = "sha256-drsncGneZyOCC2GJbrDM+bf4QGI2luacxMhrmdk03l4=";
   };
 
   build-system = [

From e80ba0828fedb4b6ff8e23cc8e32fd5e927c476b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:26 +0200
Subject: [PATCH 0802/3724] python3Packages.gitpython: 3.1.44 -> 3.1.45

https://github.com/gitpython-developers/GitPython/blob/3.1.45/doc/source/changes.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/gitpython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix
index e3e9d05ae8d8..5bfda634e136 100644
--- a/pkgs/development/python-modules/gitpython/default.nix
+++ b/pkgs/development/python-modules/gitpython/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "gitpython";
-  version = "3.1.44";
+  version = "3.1.45";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "gitpython-developers";
     repo = "GitPython";
     tag = version;
-    hash = "sha256-KnKaBv/tKk4wiGWUWCEgd1vgrTouwUhqxJ1/nMjRaWk=";
+    hash = "sha256-VHnuHliZEc/jiSo/Zi9J/ipAykj7D6NttuzPZiE8svM=";
   };
 
   propagatedBuildInputs = [

From 81ae914aaafe61bb0e03074a36f170361d7f4c81 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:28 +0200
Subject: [PATCH 0803/3724] python3Packages.glean-parser: 17.1.0 -> 17.3.0

https://github.com/mozilla/glean_parser/blob/v17.3.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/glean-parser/default.nix     | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix
index cdb94a007b64..fb91ab4ebe95 100644
--- a/pkgs/development/python-modules/glean-parser/default.nix
+++ b/pkgs/development/python-modules/glean-parser/default.nix
@@ -4,34 +4,29 @@
   click,
   diskcache,
   fetchPypi,
+  hatchling,
+  hatch-vcs,
   jinja2,
   jsonschema,
   platformdirs,
   pytestCheckHook,
   pyyaml,
-  setuptools,
-  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "glean-parser";
-  version = "17.1.0";
+  version = "17.3.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "glean_parser";
     inherit version;
-    hash = "sha256-pZq2bdc0qL6n16LLYyJ2YC3YmUEe4cHLifQ5qDO6FZg=";
+    hash = "sha256-9w+0SWQ2Bo+B73hgKaGzafYa4vkyfusvpQM126We4hQ=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "pytest-runner" ""
-  '';
-
   build-system = [
-    setuptools
-    setuptools-scm
+    hatchling
+    hatch-vcs
   ];
 
   dependencies = [

From a9fb761209924c234dc2f72e2b7443f166319684 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:29 +0200
Subject: [PATCH 0804/3724] python3Packages.globus-sdk: 3.61.0 -> 3.62.0

https://github.com/globus/globus-sdk-python/releases/tag/3.62.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/globus-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index d0fda3d3ef12..f63db1ad80ce 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "globus-sdk";
-  version = "3.61.0";
+  version = "3.62.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "globus";
     repo = "globus-sdk-python";
     tag = version;
-    hash = "sha256-DFLWFdwgKLhGde8ZH40YJ2434cl9nSrEfU6DfHANChE=";
+    hash = "sha256-uvvv96ztvzCmXx63brvnoKcfXUsDgZA9cNeCB7jdawQ=";
   };
 
   build-system = [ setuptools ];

From e31fa674a236908ba0a7bd77d27607960842fe51 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:30 +0200
Subject: [PATCH 0805/3724] python3Packages.glocaltokens: 0.7.5 -> 0.7.6

https://github.com/leikoilja/glocaltokens/releases/tag/v0.7.6

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/glocaltokens/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/glocaltokens/default.nix b/pkgs/development/python-modules/glocaltokens/default.nix
index 42f0d66968a1..118ef46fe4d7 100644
--- a/pkgs/development/python-modules/glocaltokens/default.nix
+++ b/pkgs/development/python-modules/glocaltokens/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "glocaltokens";
-  version = "0.7.5";
+  version = "0.7.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "leikoilja";
     repo = "glocaltokens";
     tag = "v${version}";
-    hash = "sha256-anIiYNUVHHzv21yV7Y3S+lIst3iWEwgQZD9Ymx86tbk=";
+    hash = "sha256-+7HpyZUumu1r/UXM4awckjTkpVbCz7MsAJOp2JiJzho=";
   };
 
   build-system = [

From ee11aebe9a4a0d1670dd3648819062e2ff0e0d0c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:31 +0200
Subject: [PATCH 0806/3724] python3Packages.glueviz: 1.22.2 -> 1.23.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/glueviz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/glueviz/default.nix b/pkgs/development/python-modules/glueviz/default.nix
index 31d3a412118c..e33d009e8748 100644
--- a/pkgs/development/python-modules/glueviz/default.nix
+++ b/pkgs/development/python-modules/glueviz/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "glueviz";
-  version = "1.22.2";
+  version = "1.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "glue-viz";
     repo = "glue";
     tag = "v${version}";
-    hash = "sha256-5YwZxVer3icA/7YmUIXTuyIlZYKrlFn5+4OYMbfvIlU=";
+    hash = "sha256-Ql5eMyMm48zNLQ3tkPyqM4+r3QfxqVAGHx1/LcLUiyo=";
   };
 
   buildInputs = [ pyqt-builder ];

From b358755d02de004648c4436410ba605d61b96d75 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:32 +0200
Subject: [PATCH 0807/3724] python3Packages.glyphslib: 6.11.0 -> 6.11.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/glyphslib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix
index 3cd569339bf0..5827c8bdabef 100644
--- a/pkgs/development/python-modules/glyphslib/default.nix
+++ b/pkgs/development/python-modules/glyphslib/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "glyphslib";
-  version = "6.11.0";
+  version = "6.11.4";
 
   pyproject = true;
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "googlefonts";
     repo = "glyphsLib";
     tag = "v${version}";
-    hash = "sha256-hJLJ30ZT6uRSVTUi6XPGyn9fncy1A1hvhgRKTL9a2gs=";
+    hash = "sha256-gOzETXI2ZgW69qxbrXxsXfBEJaVhYrcqwjRjCsryqmk=";
   };
 
   build-system = [ setuptools-scm ];

From ec861243776172dc5be1da7eec9dcf7639782da2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:33 +0200
Subject: [PATCH 0808/3724] python3Packages.google-api-core: 2.24.2 -> 2.25.1

https://github.com/googleapis/python-api-core/blob/v2.25.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/google-api-core/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix
index 76b7f78528eb..9269c2d259cd 100644
--- a/pkgs/development/python-modules/google-api-core/default.nix
+++ b/pkgs/development/python-modules/google-api-core/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "google-api-core";
-  version = "2.24.2";
+  version = "2.25.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "googleapis";
     repo = "python-api-core";
     tag = "v${version}";
-    hash = "sha256-7/9oU8KqwvL7DIDKDIUlGxfJZp7kGp1W6/tsEp6zcuc=";
+    hash = "sha256-lh4t03upQQxY2KGwucXfEeNvqVVXlZ6hjR/e47imetk=";
   };
 
   build-system = [ setuptools ];
@@ -86,7 +86,7 @@ buildPythonPackage rec {
       helpers used by all Google API clients.
     '';
     homepage = "https://github.com/googleapis/python-api-core";
-    changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/googleapis/python-api-core/blob/${src.tag}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = [ ];
   };

From 0ae32cd2db8cc14fa4da26fd08406904566ef681 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:34 +0200
Subject: [PATCH 0809/3724] python3Packages.google-api-python-client: 2.169.0
 -> 2.177.0

https://github.com/googleapis/google-api-python-client/releases/tag/v2.177.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/google-api-python-client/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index 35a3b4b54d75..304595531a24 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
-  version = "2.169.0";
+  version = "2.177.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-api-python-client";
     tag = "v${version}";
-    hash = "sha256-XJwZ/gWL2pO9P+HuN6BtVbacNjwbZV2jW6FVLgNsj/0=";
+    hash = "sha256-CEjbUIXtG5z1/28DsNCm/npMSd/+DyY5PMJHm9XDe2M=";
   };
 
   build-system = [ setuptools ];
@@ -43,7 +43,7 @@ buildPythonPackage rec {
       any new features.
     '';
     homepage = "https://github.com/google/google-api-python-client";
-    changelog = "https://github.com/googleapis/google-api-python-client/releases/tag/v${version}";
+    changelog = "https://github.com/googleapis/google-api-python-client/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.sarahec ];
   };

From d78a095e1877a184a3aa4d36bb4a97bdae57d82e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:35 +0200
Subject: [PATCH 0810/3724] python3Packages.google-auth: 2.40.2 -> 2.40.3

https://github.com/googleapis/google-auth-library-python/blob/v2.40.3/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/google-auth/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index 1990720e3159..b5677af717a9 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "google-auth";
-  version = "2.40.2";
+  version = "2.40.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-auth-library-python";
     tag = "v${version}";
-    hash = "sha256-jO6brNdTH8BitLKKP/nwrlUo5hfQnThT/bPbzefvRbM=";
+    hash = "sha256-X1HTh24oos2GUxB9DDLtNH7BsBRLD0S/ngjsDAQYvhI=";
   };
 
   build-system = [ setuptools ];
@@ -101,7 +101,7 @@ buildPythonPackage rec {
       authentication mechanisms to access Google APIs.
     '';
     homepage = "https://github.com/googleapis/google-auth-library-python";
-    changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/googleapis/google-auth-library-python/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.sarahec ];
   };

From e44a65e2da5ad13605f2a903afb4dd142162e2fc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:36 +0200
Subject: [PATCH 0811/3724] python3Packages.google-cloud-asset: 3.30.1 ->
 3.31.3

https://github.com/googleapis/google-cloud-python/blob/google-cloud-asset-google-cloud-build-v3.31.3/packages/google-cloud-asset/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/google-cloud-asset/default.nix         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix
index 6c8f06f8d6f3..6cc9e31a97f5 100644
--- a/pkgs/development/python-modules/google-cloud-asset/default.nix
+++ b/pkgs/development/python-modules/google-cloud-asset/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-asset";
-  version = "3.30.1";
+  version = "3.31.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-python";
-    tag = "google-cloud-asset-v${version}";
-    sha256 = "sha256-4Ifg9igzsVR8pWH/lcrGwCnByqYQjPKChNPJGmmQbKI=";
+    tag = "google-cloud-build-v${version}";
+    sha256 = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U=";
   };
 
   sourceRoot = "${src.name}/packages/google-cloud-asset";
@@ -76,7 +76,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Client for Google Cloud Asset API";
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-asset";
-    changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-asset-v${version}/packages/google-cloud-asset/CHANGELOG.md";
+    changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-asset-${src.tag}/packages/google-cloud-asset/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.sarahec ];
   };

From 9062bb7b9e4ffa61514ac204de3021a49ae038c7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:37 +0200
Subject: [PATCH 0812/3724] python3Packages.google-cloud-bigquery-storage:
 2.30.0 -> 2.32.0

https://github.com/googleapis/python-bigquery-storage/blob/v2.32.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/google-cloud-bigquery-storage/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
index 2d63743221f3..f146ff26ee1d 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery-storage";
-  version = "2.30.0";
+  version = "2.32.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_bigquery_storage";
     inherit version;
-    hash = "sha256-QayD+p7dvIIBAhd5hKuS+Le736fZDqZLOgr17LT8o/I=";
+    hash = "sha256-6UT19DhfC+J+BJ5z5NzPVIt3NIMBZjp3O10Dq9vUniA=";
   };
 
   build-system = [ setuptools ];

From 721fc0f875e9ec3c12453634688637f6560d7c7f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:37 +0200
Subject: [PATCH 0813/3724] python3Packages.google-cloud-bigquery: 3.31.0 ->
 3.35.1

https://github.com/googleapis/python-bigquery/blob/v3.35.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/google-cloud-bigquery/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index b98ab101924b..73cb6d083298 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -37,13 +37,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery";
-  version = "3.31.0";
+  version = "3.35.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_bigquery";
     inherit version;
-    hash = "sha256-uJ3HFtvkq9t6T4c/cFAQAoe8mFFOBhTF1UzWqOn7CZE=";
+    hash = "sha256-WZ8mys8ZCs/ogAD2zF9Lyea6rHiZ5PQGygVPGQb3GWA=";
   };
 
   build-system = [ setuptools ];

From 7e02acf51a081edb74d2b6ff09331a312c40d228 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:38 +0200
Subject: [PATCH 0814/3724] python3Packages.google-cloud-container: 2.58.0 ->
 2.59.0

https://github.com/googleapis/google-cloud-python/blob/google-cloud-container-v2.59.0/packages/google-cloud-container/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/google-cloud-container/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix
index 46434bc8abab..ee481619546d 100644
--- a/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-container";
-  version = "2.58.0";
+  version = "2.59.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_container";
     inherit version;
-    hash = "sha256-dA7lsWf3BmxIXXnPejksi21A7N9V0Ka27MeET8TNmts=";
+    hash = "sha256-ZsTKUV0zzGbzf9jltrqJBjsG66sz4UlbjEJMcgs/tgM=";
   };
 
   build-system = [ setuptools ];

From 90cccbb50fd08dcfbe2c0e4ae6e6efbaad2ee320 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:38 +0200
Subject: [PATCH 0815/3724] python3Packages.google-cloud-datacatalog: 3.27.1 ->
 3.31.3

https://github.com/googleapis/google-cloud-python/blob/google-cloud-datacatalog-google-cloud-build-v3.31.3/packages/google-cloud-datacatalog/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/google-cloud-datacatalog/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
index de60cd24d2a3..86061cedbc54 100644
--- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-datacatalog";
-  version = "3.27.1";
+  version = "3.31.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-python";
-    tag = "google-cloud-datacatalog-v${version}";
-    hash = "sha256-4Ifg9igzsVR8pWH/lcrGwCnByqYQjPKChNPJGmmQbKI=";
+    tag = "google-cloud-build-v${version}";
+    hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U=";
   };
 
   sourceRoot = "${src.name}/packages/google-cloud-datacatalog";
@@ -57,7 +57,7 @@ buildPythonPackage rec {
   meta = {
     description = "Google Cloud Data Catalog API API client library";
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-datacatalog";
-    changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-datacatalog-v${version}/packages/google-cloud-datacatalog/CHANGELOG.md";
+    changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-datacatalog-${src.tag}/packages/google-cloud-datacatalog/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.sarahec ];
   };

From 984c12a99089d7a55261e87400e48d1a8b0016a2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:39 +0200
Subject: [PATCH 0816/3724] python3Packages.google-cloud-iam: 2.19.0 -> 3.31.3

https://github.com/googleapis/google-cloud-python/blob/google-cloud-build-v3.31.3/packages/google-cloud-iam/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/google-cloud-iam/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix
index a9f77a1c8582..21e96f3e9aa9 100644
--- a/pkgs/development/python-modules/google-cloud-iam/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-iam";
-  version = "2.19.0";
+  version = "3.31.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-python";
-    tag = "google-cloud-iam-v${version}";
-    hash = "sha256-E1LISOLQcXqUMTTPLR+lwkR6gF1fuGGB44j38cIK/Z4=";
+    tag = "google-cloud-build-v${version}";
+    hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U=";
   };
 
   sourceRoot = "${src.name}/packages/google-cloud-iam";

From 0b643fb31df5d4ebf74e8188041021dc2a6abb3c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:40 +0200
Subject: [PATCH 0817/3724] python3Packages.google-cloud-kms: 3.4.1 -> 3.31.3

https://github.com/googleapis/google-cloud-python/blob/google-cloud-build-v3.31.3/packages/google-cloud-kms/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/google-cloud-kms/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix
index b671e36c0c90..7dafc791f334 100644
--- a/pkgs/development/python-modules/google-cloud-kms/default.nix
+++ b/pkgs/development/python-modules/google-cloud-kms/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-kms";
-  version = "3.4.1";
+  version = "3.31.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-python";
-    tag = "google-cloud-kms-v${version}";
-    hash = "sha256-5PzidE1CWN+pt7+gcAtbuXyL/pq6cnn0MCRkBfmeUSw=";
+    tag = "google-cloud-build-v${version}";
+    hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U=";
   };
 
   sourceRoot = "${src.name}/packages/google-cloud-kms";

From 22c0f1c900154e191c2749c06d81958d78f8b17c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:40 +0200
Subject: [PATCH 0818/3724] python3Packages.google-cloud-netapp: 0.3.23 ->
 3.31.3

https://github.com/googleapis/google-cloud-python/blob/google-cloud-netapp-google-cloud-build-v3.31.3/packages/google-cloud-netapp/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/google-cloud-netapp/default.nix        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix
index 8cb21256a174..7b8efdc6c254 100644
--- a/pkgs/development/python-modules/google-cloud-netapp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-netapp";
-  version = "0.3.23";
+  version = "3.31.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-python";
-    rev = "google-cloud-netapp-v${version}";
-    hash = "sha256-ietiyPCghGUD1jlGdZMhVgVozAlyfdvYgkV6NNlzLQg=";
+    tag = "google-cloud-build-v${version}";
+    hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U=";
   };
 
   sourceRoot = "${src.name}/packages/google-cloud-netapp";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Client for NetApp API";
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-netapp";
-    changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-netapp-v${version}/packages/google-cloud-netapp/CHANGELOG.md";
+    changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-netapp-${src.tag}/packages/google-cloud-netapp/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.sarahec ];
   };

From 9c50fa04aad0fc6ce977d2fa66f2a0251e066f38 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:42 +0200
Subject: [PATCH 0819/3724] python3Packages.google-cloud-storage: 3.1.0 ->
 3.2.0

https://github.com/googleapis/python-storage/blob/v3.2.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/google-cloud-storage/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index 431672efee5a..84fa74f9e9e0 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-storage";
-  version = "3.1.0";
+  version = "3.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_storage";
     inherit version;
-    hash = "sha256-lEJzF5iXx8igfuFfLmRmoC2gx8S57M6sKiYBfLKXIEk=";
+    hash = "sha256-3syoQwdgNvRWMxmMEl0YYf+/R+v1wOO5jcubLbFViWw=";
   };
 
   pythonRelaxDeps = [ "google-auth" ];

From 6de8727f8e8d820fd3560cd7e29ffd1d1cc8731c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:43 +0200
Subject: [PATCH 0820/3724] python3Packages.google-genai: 1.20.0 -> 1.28.0

https://github.com/googleapis/python-genai/blob/v1.28.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/google-genai/default.nix            | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix
index 76c5c3b78d66..35a27dd48fd0 100644
--- a/pkgs/development/python-modules/google-genai/default.nix
+++ b/pkgs/development/python-modules/google-genai/default.nix
@@ -12,6 +12,7 @@
   pytestCheckHook,
   requests,
   setuptools,
+  tenacity,
   twine,
   typing-extensions,
   websockets,
@@ -19,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "google-genai";
-  version = "1.20.0";
+  version = "1.28.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-genai";
     tag = "v${version}";
-    hash = "sha256-7DwLIK3/VCVSt9lq0Q0IRbhfLXOWw1TbPpDgI4jr9cg=";
+    hash = "sha256-tQ6iWIUUl9mtWz6Pa0tBOsoGcFQNe62NqXhob53AVq4=";
   };
 
   build-system = [
@@ -36,7 +37,9 @@ buildPythonPackage rec {
     twine
   ];
 
-  pythonRelaxDeps = [ "websockets" ];
+  pythonRelaxDeps = [
+    "tenacity"
+  ];
 
   dependencies = [
     anyio
@@ -44,6 +47,7 @@ buildPythonPackage rec {
     httpx
     pydantic
     requests
+    tenacity
     typing-extensions
     websockets
   ];

From 88559f23b3127805c43bae40c6ffdec413e61dee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:43 +0200
Subject: [PATCH 0821/3724] python3Packages.google-geo-type: 0.3.13 -> 3.31.3

https://github.com/googleapis/google-cloud-python/blob/google-cloud-build-v3.31.3/packages/google-geo-type/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/google-geo-type/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-geo-type/default.nix b/pkgs/development/python-modules/google-geo-type/default.nix
index 5bacb21694c7..4dff787e4bf7 100644
--- a/pkgs/development/python-modules/google-geo-type/default.nix
+++ b/pkgs/development/python-modules/google-geo-type/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-geo-type";
-  version = "0.3.13";
+  version = "3.31.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-python";
-    tag = "google-geo-type-v${version}";
-    hash = "sha256-VYkgkVrUgBiUEFF2J8ZFrh2Sw7h653stYxNcpYfRAj4=";
+    tag = "google-cloud-build-v${version}";
+    hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U=";
   };
 
   sourceRoot = "${src.name}/packages/google-geo-type";

From 6ff9db1ffc3d741d80f6c67fbfcc02a46756deb4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:44 +0200
Subject: [PATCH 0822/3724] python3Packages.google-maps-routing: 0.6.16 ->
 3.31.3

https://github.com/googleapis/google-cloud-python/blob/google-cloud-build-v3.31.3/packages/google-maps-routing/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/google-maps-routing/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-maps-routing/default.nix b/pkgs/development/python-modules/google-maps-routing/default.nix
index a6b7031eb30b..d2669fb55b7d 100644
--- a/pkgs/development/python-modules/google-maps-routing/default.nix
+++ b/pkgs/development/python-modules/google-maps-routing/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "google-maps-routing";
-  version = "0.6.16";
+  version = "3.31.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-python";
-    tag = "google-maps-routing-v${version}";
-    hash = "sha256-VYkgkVrUgBiUEFF2J8ZFrh2Sw7h653stYxNcpYfRAj4=";
+    tag = "google-cloud-build-v${version}";
+    hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U=";
   };
 
   sourceRoot = "${src.name}/packages/google-maps-routing";

From 6cd18567ede960c320471d0a6d4cadac600806d6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:44 +0200
Subject: [PATCH 0823/3724] python3Packages.google-re2: 1.1.20240702 ->
 1.1.20250722

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/google-re2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-re2/default.nix b/pkgs/development/python-modules/google-re2/default.nix
index dea16732f29a..da3a9ab52a23 100644
--- a/pkgs/development/python-modules/google-re2/default.nix
+++ b/pkgs/development/python-modules/google-re2/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "google-re2";
-  version = "1.1.20240702";
+  version = "1.1.20250722";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_re2";
     inherit version;
-    hash = "sha256-h4jbafbJPLIp32LHSy2aqOZL91TpSVcA+FgSr6Mu/Ss=";
+    hash = "sha256-XipGTfddvO+f4Nrxinj3PD8KUbgc24ZUYKBXmyJvLvM=";
   };
 
   build-system = [ setuptools ];

From 8509e9927a04bc6159a45dd1653ca5f790780d32 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:44 +0200
Subject: [PATCH 0824/3724] python3Packages.googleapis-common-protos: 1.70.0 ->
 3.31.3

https://github.com/googleapis/python-api-common-protos/releases/tag/google-cloud-build-v3.31.3

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/googleapis-common-protos/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix
index 5195d3472c5f..0c065525c0ce 100644
--- a/pkgs/development/python-modules/googleapis-common-protos/default.nix
+++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "googleapis-common-protos";
-  version = "1.70.0";
+  version = "3.31.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-python";
-    rev = "googleapis-common-protos-v${version}";
-    hash = "sha256-E1LISOLQcXqUMTTPLR+lwkR6gF1fuGGB44j38cIK/Z4=";
+    tag = "google-cloud-build-v${version}";
+    hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U=";
   };
 
   sourceRoot = "${src.name}/packages/googleapis-common-protos";
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   meta = {
     description = "Common protobufs used in Google APIs";
     homepage = "https://github.com/googleapis/python-api-common-protos";
-    changelog = "https://github.com/googleapis/python-api-common-protos/releases/tag/v${version}";
+    changelog = "https://github.com/googleapis/python-api-common-protos/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.sarahec ];
   };

From e21030c18112b370b8de5710e2da9e399a87cef3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:45 +0200
Subject: [PATCH 0825/3724] python3Packages.gotrue: 2.12.0 -> 2.12.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/gotrue/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gotrue/default.nix b/pkgs/development/python-modules/gotrue/default.nix
index 8ef7436ecc04..28cdc92a1307 100644
--- a/pkgs/development/python-modules/gotrue/default.nix
+++ b/pkgs/development/python-modules/gotrue/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "gotrue";
-  version = "2.12.0";
+  version = "2.12.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ueoWTuUpZNg2TFUM3hbdDpV2JBpM/+qlLsozn2HR0Us=";
+    hash = "sha256-+HTPnQsvAzW/vQ1uKeP3r/eZmM0cFNKtgU24wGzuOFI=";
   };
 
   build-system = [ poetry-core ];

From 4199071136d89eb56abccce35fd786dcf8f7da08 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:46 +0200
Subject: [PATCH 0826/3724] python3Packages.gpsoauth: 1.1.1 -> 2.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/gpsoauth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix
index d40d2f3c6174..bf604c9f7138 100644
--- a/pkgs/development/python-modules/gpsoauth/default.nix
+++ b/pkgs/development/python-modules/gpsoauth/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "gpsoauth";
-  version = "1.1.1";
+  version = "2.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WCAu0wM5fSkntGTcleJxS///haGw+Iv2jzrWOFnr5DU=";
+    hash = "sha256-njt2WmpOA2TewbxBV70+1+XsMGZYnihdC0aYaRCqa9I=";
   };
 
   nativeBuildInputs = [

From 0e9f09a8f8fd7a553c81e031d76be351426ed40a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:46 +0200
Subject: [PATCH 0827/3724] python3Packages.gradient: 2.0.6 -> 2.99.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/gradient/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix
index 36c3e2d82495..f8a9896b1f8b 100644
--- a/pkgs/development/python-modules/gradient/default.nix
+++ b/pkgs/development/python-modules/gradient/default.nix
@@ -24,12 +24,12 @@
 
 buildPythonPackage rec {
   pname = "gradient";
-  version = "2.0.6";
+  version = "2.99.3";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pqyyNzx2YPP3qmWQbzGd3q2HzCkrWlIVSJZeFrGm9dk=";
+    hash = "sha256-Ep3Qh9Q1xWt2JveCf/A/KInQ3cnGE7D1YNdavDS0ZE8=";
   };
 
   postPatch = ''

From a14042fed2566bc6f20b41ade3b12c3be3f37549 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:47 +0200
Subject: [PATCH 0828/3724] python3Packages.graphql-core: 3.2.5 -> 3.2.6

https://github.com/graphql-python/graphql-core/releases/tag/v3.2.6

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/graphql-core/default.nix          | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix
index fa1aa996d623..c1c49ee45448 100644
--- a/pkgs/development/python-modules/graphql-core/default.nix
+++ b/pkgs/development/python-modules/graphql-core/default.nix
@@ -6,27 +6,23 @@
   pytest-benchmark,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "graphql-core";
-  version = "3.2.5";
+  version = "3.2.6";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
   src = fetchFromGitHub {
     owner = "graphql-python";
     repo = "graphql-core";
     tag = "v${version}";
-    hash = "sha256-xZOiQOFWnImDXuvHP9V6BDjIZwlwHSxN/os+UYV4A0M=";
+    hash = "sha256-RkVyoTSVmtKhs42IK+oOrOL4uBs3As3N5KY0Sz1VaDQ=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "poetry_core>=1,<2" "poetry-core" \
-      --replace-fail ', "setuptools>=59,<70"' ""
+      --replace-fail ', "setuptools>=59,<76"' ""
   '';
 
   build-system = [
@@ -44,7 +40,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "graphql" ];
 
   meta = with lib; {
-    changelog = "https://github.com/graphql-python/graphql-core/releases/tag/v${version}";
+    changelog = "https://github.com/graphql-python/graphql-core/releases/tag/${src.tag}";
     description = "Port of graphql-js to Python";
     homepage = "https://github.com/graphql-python/graphql-core";
     license = licenses.mit;

From 10c7104ef9d94aad38cd5368b7a56b9d961c7985 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:47 +0200
Subject: [PATCH 0829/3724] python3Packages.graphrag: 1.2.0 -> 2.4.0

https://github.com/microsoft/graphrag/blob/v.2.4.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/graphrag/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/graphrag/default.nix b/pkgs/development/python-modules/graphrag/default.nix
index 606bf11bb936..f44129f282af 100644
--- a/pkgs/development/python-modules/graphrag/default.nix
+++ b/pkgs/development/python-modules/graphrag/default.nix
@@ -40,14 +40,14 @@
 
 buildPythonPackage rec {
   pname = "graphrag";
-  version = "1.2.0";
+  version = "2.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "graphrag";
-    tag = "v${version}";
-    hash = "sha256-z3gO0wV8YBNi2Z53avujAt/Es9mSzugEFa/qRgq7ItM=";
+    tag = "v.${version}";
+    hash = "sha256-a8t6Nl9W/Cr7eueAvJ3dbz5G0oIhddqFMIm7HeZ8N9A=";
   };
 
   build-system = [

From d0f56caa0bbc55fb90faf1ca2097278779a22d13 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:48 +0200
Subject: [PATCH 0830/3724] python3Packages.great-expectations: 1.3.2 -> 1.5.7

https://github.com/great-expectations/great_expectations/releases/tag/1.5.7

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/great-expectations/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/great-expectations/default.nix b/pkgs/development/python-modules/great-expectations/default.nix
index ca563093c75e..8ba61a03efae 100644
--- a/pkgs/development/python-modules/great-expectations/default.nix
+++ b/pkgs/development/python-modules/great-expectations/default.nix
@@ -40,14 +40,14 @@
 
 buildPythonPackage rec {
   pname = "great-expectations";
-  version = "1.3.2";
+  version = "1.5.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "great-expectations";
     repo = "great_expectations";
     tag = version;
-    hash = "sha256-MV6T8PyOyAQ2SfT8B38YdCtqj6oeZCW+z08koBR739A=";
+    hash = "sha256-pa44metr9KP2KF2ulq7kd84BVdBMvMhsWJeBsJ2AnG0=";
   };
 
   postPatch = ''

From db79acad2be33e5992f18bd07aaa54f26f531c0e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:48 +0200
Subject: [PATCH 0831/3724] python3Packages.greenlet: 3.2.2 -> 3.2.3

https://github.com/python-greenlet/greenlet/blob/3.2.3/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/greenlet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix
index fdabde2bb65a..03638e41377b 100644
--- a/pkgs/development/python-modules/greenlet/default.nix
+++ b/pkgs/development/python-modules/greenlet/default.nix
@@ -17,12 +17,12 @@
 let
   greenlet = buildPythonPackage rec {
     pname = "greenlet";
-    version = "3.2.2";
+    version = "3.2.3";
     pyproject = true;
 
     src = fetchPypi {
       inherit pname version;
-      hash = "sha256-rQU9NEIaLeu6Rao8w5rPRUrLzQJbP8Gp+KDe4jer1IU=";
+      hash = "sha256-iw3YrkwNb15U7lW6k17rPXNam1iooeW1y6tk4Bo582U=";
     };
 
     build-system = [ setuptools ];

From 28b99fc65f237529e3986b37180c09d7698cb5fc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:49 +0200
Subject: [PATCH 0832/3724] python3Packages.greynoise: 2.3.0 -> 3.0.1

https://github.com/GreyNoise-Intelligence/pygreynoise/blob/v3.0.1/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/greynoise/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix
index 716e0fc1b498..935b0220e619 100644
--- a/pkgs/development/python-modules/greynoise/default.nix
+++ b/pkgs/development/python-modules/greynoise/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "greynoise";
-  version = "2.3.0";
+  version = "3.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "GreyNoise-Intelligence";
     repo = "pygreynoise";
     tag = "v${version}";
-    hash = "sha256-17NieDQ57qVT2i4S26vLS9N6zALZ+eTtCCcBbhQ8fhQ=";
+    hash = "sha256-wJDO666HC3EohfR+LbG5F0Cp/eL7q4kXniWhJfc7C3s=";
   };
 
   propagatedBuildInputs = [
@@ -57,7 +57,7 @@ buildPythonPackage rec {
     description = "Python3 library and command line for GreyNoise";
     mainProgram = "greynoise";
     homepage = "https://github.com/GreyNoise-Intelligence/pygreynoise";
-    changelog = "https://github.com/GreyNoise-Intelligence/pygreynoise/blob/${src.rev}/CHANGELOG.rst";
+    changelog = "https://github.com/GreyNoise-Intelligence/pygreynoise/blob/${src.tag}/CHANGELOG.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ mbalatsko ];
   };

From b9b5d4208ca1f16e71854c54b1a8f7ae42ea24f0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:49 +0200
Subject: [PATCH 0833/3724] python3Packages.griffe: 1.8.0 -> 1.9.0

https://github.com/mkdocstrings/griffe/blob/1.9.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/griffe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix
index 375ff0c717cd..33c4c9f5a4e1 100644
--- a/pkgs/development/python-modules/griffe/default.nix
+++ b/pkgs/development/python-modules/griffe/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "griffe";
-  version = "1.8.0";
+  version = "1.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mkdocstrings";
     repo = "griffe";
     tag = version;
-    hash = "sha256-p+igAui0LNMj8tMBmw59K8mNdixqfxU8P9lHDZkoFaY=";
+    hash = "sha256-kP3n9NJ9dW8S2zEMAHgtWbJUQiYt7NadgrR7DD67+Vs=";
   };
 
   build-system = [ pdm-backend ];

From d140b40f06be6d22ce650cc784fb0f621095b514 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:50 +0200
Subject: [PATCH 0834/3724] python3Packages.grpc-google-iam-v1: 0.14.2 ->
 3.31.3

https://github.com/googleapis/google-cloud-python/blob/google-cloud-build-v3.31.3/packages/grpc-google-iam-v1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/grpc-google-iam-v1/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix
index c0aaca146664..aba72a96b8aa 100644
--- a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix
+++ b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "grpc-google-iam-v1";
-  version = "0.14.2";
+  version = "3.31.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-python";
-    tag = "grpc-google-iam-v1-v${version}";
-    hash = "sha256-5PzidE1CWN+pt7+gcAtbuXyL/pq6cnn0MCRkBfmeUSw=";
+    tag = "google-cloud-build-v${version}";
+    hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U=";
   };
 
   sourceRoot = "${src.name}/packages/grpc-google-iam-v1";

From 4223161dc29503694a042a8085cc2787f5ed56a2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:50 +0200
Subject: [PATCH 0835/3724] python3Packages.guidance: 0.2.1 -> 0.2.5

https://github.com/guidance-ai/guidance/releases/tag/0.2.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/guidance/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix
index 2f9c1bfe8ffd..ed279cf885ae 100644
--- a/pkgs/development/python-modules/guidance/default.nix
+++ b/pkgs/development/python-modules/guidance/default.nix
@@ -36,14 +36,14 @@
 
 buildPythonPackage rec {
   pname = "guidance";
-  version = "0.2.1";
+  version = "0.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "guidance-ai";
     repo = "guidance";
     tag = version;
-    hash = "sha256-FBnND9kCIVmE/IEz3TNOww8x0EAH6TTBYfKTprqSbDg=";
+    hash = "sha256-dTMJOBGirEumbpTanCVZQJATfLxqxmpUCqE7pah97Zw=";
   };
 
   build-system = [
@@ -119,7 +119,7 @@ buildPythonPackage rec {
   meta = {
     description = "Guidance language for controlling large language models";
     homepage = "https://github.com/guidance-ai/guidance";
-    changelog = "https://github.com/guidance-ai/guidance/releases/tag/v${version}";
+    changelog = "https://github.com/guidance-ai/guidance/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
   };

From 1c1d3153cd2da4398cdf06a83846afc9b8627dce Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:51 +0200
Subject: [PATCH 0836/3724] python3Packages.gym-notices: 0.0.8 -> 0.1.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/gym-notices/default.nix           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/gym-notices/default.nix b/pkgs/development/python-modules/gym-notices/default.nix
index 0a4e2bd4089c..1132fa795d5b 100644
--- a/pkgs/development/python-modules/gym-notices/default.nix
+++ b/pkgs/development/python-modules/gym-notices/default.nix
@@ -2,18 +2,22 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "gym-notices";
-  version = "0.0.8";
-  format = "setuptools";
+  version = "0.1.0";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-rSXiAEh8r6NpcoYl/gZOiK2hNGYYUmECZZtGQPK0uRE=";
+    pname = "gym_notices";
+    inherit version;
+    hash = "sha256-n5R372iowV5CYl1PpTYxI34+aulH8yW1wUnAgUma3Bs=";
   };
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "gym_notices" ];
 
   meta = with lib; {

From eda07d310124e16617f0f9d0498c240f3a1863d9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:51 +0200
Subject: [PATCH 0837/3724] python3Packages.h3: 4.2.2 -> 4.3.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/h3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix
index f1379544ba21..5d9b87746bfc 100644
--- a/pkgs/development/python-modules/h3/default.nix
+++ b/pkgs/development/python-modules/h3/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "h3";
-  version = "4.2.2";
+  version = "4.3.0";
   pyproject = true;
 
   # pypi version does not include tests
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "uber";
     repo = "h3-py";
     tag = "v${version}";
-    hash = "sha256-HvJT5SuE7UHhGMlaQG3YSHfGkgsdDAVVGsGRsAeNHGQ=";
+    hash = "sha256-D2imgxGzJpOEQ3xddM42SKWPZEIwuXQ31mm8ZIQhqkE=";
   };
 
   dontConfigure = true;

From 4b3ac8ae846950d4962f9086dc61f1ab83f566de Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:52 +0200
Subject: [PATCH 0838/3724] python3Packages.h5py: 3.13.0 -> 3.14.0

https://github.com/h5py/h5py/blob/3.14.0/docs/whatsnew/3.14.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/h5py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index cd43c0e05798..1deb3ab9f2cf 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -22,7 +22,7 @@ let
   mpiSupport = hdf5.mpiSupport;
 in
 buildPythonPackage rec {
-  version = "3.13.0";
+  version = "3.14.0";
   pname = "h5py";
   pyproject = true;
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-GHDkZRhyACPahdCJWhlg/yzjmMVnHqw7GkHsaWtxBcM=";
+    hash = "sha256-I3IRay4NXT5ecFt/Zj98jZb6eaQFLSUEhO+R0k1qCPQ=";
   };
 
   pythonRelaxDeps = [ "mpi4py" ];

From 58886537e66ada54639b045903c57abadcbc9eac Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:52 +0200
Subject: [PATCH 0839/3724] python3Packages.habluetooth: 3.49.0 -> 4.0.2

https://github.com/Bluetooth-Devices/habluetooth/blob/v4.0.2/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/habluetooth/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix
index ab77d4cdfeb1..b491a740e1d4 100644
--- a/pkgs/development/python-modules/habluetooth/default.nix
+++ b/pkgs/development/python-modules/habluetooth/default.nix
@@ -33,6 +33,11 @@ buildPythonPackage rec {
     hash = "sha256-82eV76oY/exkHbhZt3OaifOoKxN2D6npstvfBDVgszw=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'Cython>=3,<3.1' 'Cython'
+  '';
+
   build-system = [
     cython
     poetry-core

From 56fe99487627f2d8c8c54fb1c3559a29c37df1d3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 20:59:24 +0200
Subject: [PATCH 0840/3724] python3Packages.hass-nabucasa: 0.106.0 -> 0.111.1

https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.111.1
---
 pkgs/development/python-modules/hass-nabucasa/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index 15bbb7d091ab..4dfcb4a63f91 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -43,6 +43,7 @@ buildPythonPackage rec {
   pythonRelaxDeps = [
     "acme"
     "josepy"
+    "snitun"
   ];
 
   dependencies = [

From 0b476031888723732c51c5856344fb4409918807 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:53 +0200
Subject: [PATCH 0841/3724] python3Packages.hassil: 2.2.3 -> 3.1.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/hassil/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix
index 9c68f8c18c3c..ec274094ab26 100644
--- a/pkgs/development/python-modules/hassil/default.nix
+++ b/pkgs/development/python-modules/hassil/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   setuptools,
@@ -17,9 +16,9 @@
 
 let
   pname = "hassil";
-  version = "2.2.3";
+  version = "3.1.0";
 in
-buildPythonPackage {
+buildPythonPackage rec {
   inherit pname version;
   pyproject = true;
 
@@ -27,7 +26,7 @@ buildPythonPackage {
     owner = "home-assistant";
     repo = "hassil";
     tag = "v${version}";
-    hash = "sha256-rP7F0BovD0Klf06lywo+1uFhPf+dS0qbNBZluun8+cE=";
+    hash = "sha256-GwlnlOeG4uMMbT09Nm+UIr5FcOJf00+7r/2Kls4Rb4g=";
   };
 
   build-system = [ setuptools ];
@@ -39,8 +38,13 @@ buildPythonPackage {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  disabledTestPaths = [
+    # infinite recursion with home-assistant.intents
+    "tests/test_fuzzy.py"
+  ];
+
   meta = with lib; {
-    changelog = "https://github.com/home-assistant/hassil/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/home-assistant/hassil/blob/${src.tag}/CHANGELOG.md";
     description = "Intent parsing for Home Assistant";
     mainProgram = "hassil";
     homepage = "https://github.com/home-assistant/hassil";

From 07bac06b783049cb5e0b9ec9592ca689eec568d4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 13:17:55 +0200
Subject: [PATCH 0842/3724] home-assistant: pin hassil at 2.2.3

---
 pkgs/servers/home-assistant/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 94742e065ab4..a01951846239 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -138,6 +138,18 @@ let
         ];
       });
 
+      hassil = super.hassil.overridePythonAttrs (oldAttrs: rec {
+        version = "2.2.3";
+
+        src = fetchFromGitHub {
+          inherit (oldAttrs.src) repo owner;
+          tag = "v${version}";
+          hash = "sha256-rP7F0BovD0Klf06lywo+1uFhPf+dS0qbNBZluun8+cE=";
+        };
+
+        disabledTestPaths = [ ];
+      });
+
       mcp = super.mcp.overridePythonAttrs (oldAttrs: rec {
         version = "1.5.0";
         src = fetchFromGitHub {

From e17f85e7fbf462eddaf94a4e9f6a7e17b8e07c73 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:54 +0200
Subject: [PATCH 0843/3724] python3Packages.hatch-fancy-pypi-readme: 24.1.0 ->
 25.1.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/hatch-fancy-pypi-readme/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix
index c8efd2065cc4..61b5824ba7b7 100644
--- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix
+++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "hatch-fancy-pypi-readme";
-  version = "24.1.0";
+  version = "25.1.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "hatch_fancy_pypi_readme";
     inherit version;
-    hash = "sha256-RN0jnxp3m53PjryUAaYR/X9+PhRXjc8iwmXfr3wVFLg=";
+    hash = "sha256-nFjtPf+Q1R9DQUzjcAmtHVsPCP/J/CFpmKBjgPAcAEU=";
   };
 
   nativeBuildInputs = [ hatchling ];

From f745be201beebf13a0887a704187b6c5f80e45e8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:54 +0200
Subject: [PATCH 0844/3724] python3Packages.hatch-nodejs-version: 0.3.2 ->
 0.4.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/hatch-nodejs-version/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hatch-nodejs-version/default.nix b/pkgs/development/python-modules/hatch-nodejs-version/default.nix
index 376f3f1390a2..e46a1d40b92f 100644
--- a/pkgs/development/python-modules/hatch-nodejs-version/default.nix
+++ b/pkgs/development/python-modules/hatch-nodejs-version/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "hatch-nodejs-version";
-  version = "0.3.2";
+  version = "0.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "agoose77";
     repo = "hatch-nodejs-version";
     tag = "v${version}";
-    hash = "sha256-hknlb11DCe+b55CfF3Pr62ccWPxVrjQ197ZagSiH/zU=";
+    hash = "sha256-Oe07HFzhhnAGTWM51xSgRmpJgIZg0oMIxkmMxKRPMwI=";
   };
 
   propagatedBuildInputs = [ hatchling ];

From 30c90446fb01281880ba37a6b8a3a6d19eddade3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:55 +0200
Subject: [PATCH 0845/3724] python3Packages.hatch-vcs: 0.4.0 -> 0.5.0

https://github.com/ofek/hatch-vcs/releases/tag/v0.5.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/hatch-vcs/default.nix          | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix
index e3be83a0f2d4..2bdb4e7622a5 100644
--- a/pkgs/development/python-modules/hatch-vcs/default.nix
+++ b/pkgs/development/python-modules/hatch-vcs/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "hatch-vcs";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "hatch_vcs";
     inherit version;
-    hash = "sha256-CTgQdI/gHbDUUfq88sGsJojK79Iy1O3pZwkLHBsH2fc=";
+    hash = "sha256-A5X6EmlANAIVCQw0Siv04qd7y+faqxb0Gze5jJWAn/k=";
   };
 
   build-system = [ hatchling ];
@@ -35,15 +35,8 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
-    # incompatible with setuptools-scm>=7
-    # https://github.com/ofek/hatch-vcs/issues/8
-    "test_write"
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    # https://github.com/pypa/setuptools_scm/issues/1038, fixed in setuptools_scm@8.1.0
-    "test_basic"
-    "test_root"
-    "test_metadata"
+    # reacts to our setup-hook pretending a version
+    "test_custom_tag_pattern_get_version"
   ];
 
   pythonImportsCheck = [ "hatch_vcs" ];

From e6741cc34459f0890778a2144b61f18d682de4e3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:55 +0200
Subject: [PATCH 0846/3724] python3Packages.haystack-ai: 2.9.0 -> 2.16.1

https://github.com/deepset-ai/haystack/releases/tag/v2.16.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/haystack-ai/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix
index dec9d6684d27..ba792ffa3e7f 100644
--- a/pkgs/development/python-modules/haystack-ai/default.nix
+++ b/pkgs/development/python-modules/haystack-ai/default.nix
@@ -91,14 +91,14 @@
 
 buildPythonPackage rec {
   pname = "haystack-ai";
-  version = "2.9.0";
+  version = "2.16.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "deepset-ai";
     repo = "haystack";
     tag = "v${version}";
-    hash = "sha256-h/4KskpzO3+e6aLQlBb8yitmfdbdc+J6Hz6TMs8bnr8=";
+    hash = "sha256-Z5T5X92Hig7nW1fUc8b+LuegJlIZbMfyjJ0PnVudPew=";
   };
 
   nativeBuildInputs = [

From f2e2967483cb5156f83365d383eb5db1b9e90940 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:56 +0200
Subject: [PATCH 0847/3724] python3Packages.hg-evolve: 11.1.8 -> 11.1.9

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/hg-evolve/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix
index d332237010f2..a6f28d87a60d 100644
--- a/pkgs/development/python-modules/hg-evolve/default.nix
+++ b/pkgs/development/python-modules/hg-evolve/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "hg-evolve";
-  version = "11.1.8";
+  version = "11.1.9";
   pyproject = true;
 
   src = fetchPypi {
     pname = "hg_evolve";
     inherit version;
-    hash = "sha256-JIberZCiRmxPkn0P+Dsps42jHWhkA1hLKGXPlbb+APU=";
+    hash = "sha256-sypSfUqXQkmDSITJq/XHH82EGNIMvjgocc+3mLK+n0A=";
   };
 
   build-system = [ setuptools ];

From 969854a3786adaa1b51370a392e66a719296fca0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:56 +0200
Subject: [PATCH 0848/3724] python3Packages.hid-parser: 0.0.3 -> 0.1.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/hid-parser/default.nix     | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/hid-parser/default.nix b/pkgs/development/python-modules/hid-parser/default.nix
index 1106accebf07..91cb21d24cfa 100644
--- a/pkgs/development/python-modules/hid-parser/default.nix
+++ b/pkgs/development/python-modules/hid-parser/default.nix
@@ -1,26 +1,28 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  setuptools,
-  pytest7CheckHook,
+  fetchFromGitHub,
+  flit-core,
+  pytestCheckHook,
   hypothesis,
 }:
 
 buildPythonPackage rec {
   pname = "hid-parser";
-  version = "0.0.3";
-  format = "pyproject";
+  version = "0.1.0";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-zbm+h+ieDmd1K0uH+9B8EWtYScxqYJXVpY9bXdBivA4=";
+  src = fetchFromGitHub {
+    owner = "usb-tools";
+    repo = "python-hid-parser";
+    tag = version;
+    hash = "sha256-8aGyLTsBK5etwbqFkNinbLHCt20fsQEmuBvu3RrwCDA=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ flit-core ];
 
   nativeCheckInputs = [
-    pytest7CheckHook
+    pytestCheckHook
     hypothesis
   ];
 

From 732438f5782248044ac90bffd26d6a8b578a8af6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:57 +0200
Subject: [PATCH 0849/3724] python3Packages.hijri-converter: 2.3.1 ->
 2.3.2.post1

https://github.com/dralshehri/hijridate/blob/v2.3.2.post1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/hijri-converter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hijri-converter/default.nix b/pkgs/development/python-modules/hijri-converter/default.nix
index f99bddec4593..ab4fa261ae1f 100644
--- a/pkgs/development/python-modules/hijri-converter/default.nix
+++ b/pkgs/development/python-modules/hijri-converter/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "hijri-converter";
-  version = "2.3.1";
+  version = "2.3.2.post1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BptniSkeCDD0hgp53NNPs87qO5VRbtQBAgK5ZWuhq2E=";
+    hash = "sha256-mGZXzNg6W+ryM85aIZZFdH6IXEXUgzvSqPobkn+jlXA=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];

From 0ce3df6b3995c5780f9354f71f952641ebcdb448 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:58 +0200
Subject: [PATCH 0850/3724] python3Packages.hikari-crescent: 1.2.0 -> 1.3.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/hikari-crescent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hikari-crescent/default.nix b/pkgs/development/python-modules/hikari-crescent/default.nix
index 28e809136ed3..b13050474204 100644
--- a/pkgs/development/python-modules/hikari-crescent/default.nix
+++ b/pkgs/development/python-modules/hikari-crescent/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "hikari-crescent";
-  version = "1.2.0";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hikari-crescent";
     repo = "hikari-crescent";
     tag = "v${version}";
-    hash = "sha256-aQjT5sAaqConUtRGcqddzwcbBJkbwYOCxvnNJpKu3yI=";
+    hash = "sha256-wFWltwhayvv/zkIWMGogjTqy/qZfO1hUU6CzF3T9E1Y=";
   };
 
   build-system = [ poetry-core ];

From abd535a8a5c80b47a41d8cdb630451c5b68fdad4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:58 +0200
Subject: [PATCH 0851/3724] python3Packages.hikari-lightbulb: 2.3.5.post1 ->
 3.1.1

This commit was automatically generated using update-python-libraries.
---
 .../hikari-lightbulb/default.nix              | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/hikari-lightbulb/default.nix b/pkgs/development/python-modules/hikari-lightbulb/default.nix
index f9af95b70147..92d2ea4d1f0f 100644
--- a/pkgs/development/python-modules/hikari-lightbulb/default.nix
+++ b/pkgs/development/python-modules/hikari-lightbulb/default.nix
@@ -2,30 +2,30 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
-  wheel,
+  flit-core,
   hikari,
   croniter,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "hikari-lightbulb";
-  version = "2.3.5.post1";
+  version = "3.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tandemdude";
     repo = "hikari-lightbulb";
     tag = version;
-    hash = "sha256-sxBrOgMgUcPjqtNuuq5+NfyxR5V812dfHnGoO9DhdXU=";
+    hash = "sha256-hsd7K7VFXndQ3tE8UkIcFXADgG/Kjd2oNWdFvwAwUtw=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-    wheel
-  ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [ hikari ];
+  dependencies = [
+    hikari
+    typing-extensions
+  ];
 
   optional-dependencies = {
     crontrigger = [ croniter ];
@@ -34,6 +34,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "lightbulb" ];
 
   meta = with lib; {
+    broken = true; # missing linkd and confspec dependencies
     description = "Command handler for Hikari, the Python Discord API wrapper library";
     longDescription = ''
       Lightbulb is designed to be an easy to use command handler library that integrates with the Discord API wrapper library for Python, Hikari.

From 34f353f251540c312f2f31fd9c6c632eea347d03 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:58 +0200
Subject: [PATCH 0852/3724] python3Packages.hikari: 2.1.0 -> 2.3.5

https://github.com/hikari-py/hikari/releases/tag/2.3.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/hikari/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix
index 7be50c2b2d2b..ee7fce10d6fc 100644
--- a/pkgs/development/python-modules/hikari/default.nix
+++ b/pkgs/development/python-modules/hikari/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   pytestCheckHook,
   pythonOlder,
+  hatchling,
   aiohttp,
   attrs,
   multidict,
@@ -16,14 +17,14 @@
 }:
 buildPythonPackage rec {
   pname = "hikari";
-  version = "2.1.0";
-  format = "setuptools";
+  version = "2.3.5";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hikari-py";
     repo = "hikari";
     tag = version;
-    hash = "sha256-/A3D3nG1lSCQU92dM+6YroxWlGKrv47ntkZaJZTAJUA=";
+    hash = "sha256-jcPgO4tJKHzrA1fFeksSL9PVMsxnHuzh4CLVwTq06sM=";
     # The git commit is part of the `hikari.__git_sha1__` original output;
     # leave that output the same in nixpkgs. Use the `.git` directory
     # to retrieve the commit SHA, and remove the directory afterwards,
@@ -36,6 +37,8 @@ buildPythonPackage rec {
     '';
   };
 
+  build-system = [ hatchling ];
+
   propagatedBuildInputs = [
     aiohttp
     attrs
@@ -72,7 +75,7 @@ buildPythonPackage rec {
   meta = {
     description = "Discord API wrapper for Python written with asyncio";
     homepage = "https://www.hikari-py.dev/";
-    changelog = "https://github.com/hikari-py/hikari/releases/tag/${version}";
+    changelog = "https://github.com/hikari-py/hikari/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       tomodachi94

From 090ccc71bbf7204051c959e8d298cbcdfd2a4575 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:39:59 +0200
Subject: [PATCH 0853/3724] python3Packages.holidays: 0.75 -> 0.78

https://github.com/vacanza/python-holidays/releases/tag/v0.78

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/holidays/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 5ec47d5f6efc..95e439e827d0 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -60,7 +60,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Generate and work with holidays in Python";
     homepage = "https://github.com/vacanza/python-holidays";
-    changelog = "https://github.com/vacanza/python-holidays/releases/tag/v${version}";
+    changelog = "https://github.com/vacanza/python-holidays/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [
       fab

From a87bcba102e1d52fad3d00c330a96795f3bdf811 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:00 +0200
Subject: [PATCH 0854/3724] python3Packages.home-assistant-bluetooth: 1.13.1 ->
 2.0.0

https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/v2.0.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../home-assistant-bluetooth/default.nix           | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix
index dfa41a0bfedf..d1ea3bd04662 100644
--- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix
+++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   pythonOlder,
 
   # build-system
@@ -20,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "home-assistant-bluetooth";
-  version = "1.13.1";
+  version = "2.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -29,18 +28,9 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "home-assistant-bluetooth";
     tag = "v${version}";
-    hash = "sha256-piX812Uzd2F8A8+IF/17N+xy6ENpfRVJ1BxsAxL5aj0=";
+    hash = "sha256-A29Jezj9kQ/v4irvpcpCiZlrNQBQwByrSJOx4HaXTdc=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-tests-with-habluetooth-3.42.0.patch";
-      url = "https://github.com/home-assistant-libs/home-assistant-bluetooth/commit/515516bf9b2577c5d4af25cd2f052023ccb8b108.patch";
-      includes = [ "tests/test_models.py" ];
-      hash = "sha256-9t8VRKQSDxSYiy7bFII62B4O5w5Hx9AbRgvzcT6z1BQ=";
-    })
-  ];
-
   build-system = [
     poetry-core
     setuptools

From bccdc437dc3921cad0f1d6656c652325bca5a27d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:01 +0200
Subject: [PATCH 0855/3724] python3Packages.html2image: 2.0.5 -> 2.0.7

https://github.com/vgalin/html2image/releases/tag/2.0.7

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/html2image/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/html2image/default.nix b/pkgs/development/python-modules/html2image/default.nix
index 4e5d1d50dbd6..bca718a33311 100644
--- a/pkgs/development/python-modules/html2image/default.nix
+++ b/pkgs/development/python-modules/html2image/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "html2image";
-  version = "2.0.5";
+  version = "2.0.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vgalin";
     repo = "html2image";
     tag = version;
-    hash = "sha256-k5y89nUF+fhUj9uzTAPkkAdOb2TsTL2jm/ZXwHlxu/A=";
+    hash = "sha256-qGp6i4fNmduTZfdxNvYJTAQV/Ovm3XFNOJ8uSj6Ipic=";
   };
 
   postPatch = ''
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Package acting as a wrapper around the headless mode of existing web browsers to generate images from URLs and from HTML+CSS strings or files";
     homepage = "https://github.com/vgalin/html2image";
-    changelog = "https://github.com/vgalin/html2image/releases/tag/${version}";
+    changelog = "https://github.com/vgalin/html2image/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ happysalada ];
   };

From 5a46197f9ddfb1e4536090973573d0e779b687a6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:01 +0200
Subject: [PATCH 0856/3724] python3Packages.html2text: 2024.2.26 -> 2025.4.15

https://github.com/Alir3z4/html2text/blob/2025.4.15/ChangeLog.rst

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/html2text/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix
index 656370931ca4..bf13a97b9561 100644
--- a/pkgs/development/python-modules/html2text/default.nix
+++ b/pkgs/development/python-modules/html2text/default.nix
@@ -5,11 +5,12 @@
   pythonOlder,
   pytestCheckHook,
   setuptools,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "html2text";
-  version = "2024.2.26";
+  version = "2025.4.15";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,10 +19,13 @@ buildPythonPackage rec {
     owner = "Alir3z4";
     repo = "html2text";
     tag = version;
-    hash = "sha256-1CLkTFR+/XQ428WjMF7wliyAG6CB+n8JSsLDdLHPO7I=";
+    hash = "sha256-SMdILvCVXMe3Tlf3kK54VfEKsQ/KvpBZK3xZ4zVwcfo=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -30,7 +34,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Turn HTML into equivalent Markdown-structured text";
     homepage = "https://github.com/Alir3z4/html2text/";
-    changelog = "https://github.com/Alir3z4/html2text/blob/${src.rev}/ChangeLog.rst";
+    changelog = "https://github.com/Alir3z4/html2text/blob/${src.tag}/ChangeLog.rst";
     license = licenses.gpl3Only;
     maintainers = [ ];
     mainProgram = "html2text";

From 357442785b97e947599cfc4ac5d8fdbf32cfffe2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:02 +0200
Subject: [PATCH 0857/3724] python3Packages.http-message-signatures: 0.5.0 ->
 1.0.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/http-message-signatures/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix
index d3fcc3296dad..c5877acb8119 100644
--- a/pkgs/development/python-modules/http-message-signatures/default.nix
+++ b/pkgs/development/python-modules/http-message-signatures/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "http-message-signatures";
-  version = "0.5.0";
+  version = "1.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyauth";
     repo = "http-message-signatures";
-    rev = "v${version}";
-    hash = "sha256-Jsivw4lNA/2oqsOGGx8D4gUPftzuys877A9RXyapnSQ=";
+    tag = "v${version}";
+    hash = "sha256-vPZeAS3hR7Bmj2FtME+V9WU3TViBndrBb9GLkdMVh2Q=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From e44812adc2effb12bff9e479e00139dc4f9fbdd9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:02 +0200
Subject: [PATCH 0858/3724] python3Packages.httpx-sse: 0.4.0 -> 0.4.1

https://github.com/florimondmanca/httpx-sse/blob/0.4.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/httpx-sse/default.nix         | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/httpx-sse/default.nix b/pkgs/development/python-modules/httpx-sse/default.nix
index 622e8ae033d4..a719fe96f369 100644
--- a/pkgs/development/python-modules/httpx-sse/default.nix
+++ b/pkgs/development/python-modules/httpx-sse/default.nix
@@ -2,10 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
   setuptools,
   setuptools-scm,
-  wheel,
   httpx,
   pytest-asyncio,
   pytestCheckHook,
@@ -14,23 +12,16 @@
 
 buildPythonPackage rec {
   pname = "httpx-sse";
-  version = "0.4.0";
+  version = "0.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "florimondmanca";
     repo = "httpx-sse";
     tag = version;
-    hash = "sha256-nU8vkmV/WynzQrSrq9+FQXtfAJPVLpMsRSuntU0HWrE=";
+    hash = "sha256-bSozSZmbRU5sc3jvVUOAXQWVBA8GhzM2R26uPdabS+w=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      url = "https://github.com/florimondmanca/httpx-sse/commit/643938c805e671fa20adcf314b447f862b77bcda.patch?full_index=1";
-      hash = "sha256-V2PyTlleyoLa0DuvdlU8zGNsI9C8bTjMUcLjx81/e5k=";
-    })
-  ];
-
   # pytest-cov configuration is not necessary for packaging
   postPatch = ''
     rm setup.cfg
@@ -39,7 +30,6 @@ buildPythonPackage rec {
   build-system = [
     setuptools
     setuptools-scm
-    wheel
   ];
 
   dependencies = [ httpx ];
@@ -55,7 +45,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Consume Server-Sent Event (SSE) messages with HTTPX";
     homepage = "https://github.com/florimondmanca/httpx-sse";
-    changelog = "https://github.com/florimondmanca/httpx-sse/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/florimondmanca/httpx-sse/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ natsukium ];
   };

From 009f59aa07a1b699f1f6c28e1a5d9bd86338d4c2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:04 +0200
Subject: [PATCH 0859/3724] python3Packages.hyperscan: 0.7.16 -> 0.7.22

https://github.com/darvid/python-hyperscan/blob/v0.7.22/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/hyperscan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix
index 8850d1a53283..e63a155781d3 100644
--- a/pkgs/development/python-modules/hyperscan/default.nix
+++ b/pkgs/development/python-modules/hyperscan/default.nix
@@ -23,14 +23,14 @@ let
 in
 buildPythonPackage rec {
   pname = "hyperscan";
-  version = "0.7.16";
+  version = "0.7.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "darvid";
     repo = "python-hyperscan";
     tag = "v${version}";
-    hash = "sha256-iinBu/6zSbRiuxytHnS3G+8OffcdLdCTqKzj44NQqcU=";
+    hash = "sha256-99PkxxGCwyGa5xhfHLa7+1JnTgcRfDEKcTRopGzqkh8=";
   };
 
   env.CMAKE_ARGS = "-DHS_SRC_ROOT=${pkgs.hyperscan.src} -DHS_BUILD_LIB_ROOT=${lib-deps}/lib";

From aa2829c9a50cb038f6c213f4b1e3b7fee2dbacca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:04 +0200
Subject: [PATCH 0860/3724] python3Packages.hypothesis: 6.136.7 -> 6.136.9

https://hypothesis.readthedocs.io/en/latest/changes.html#v6-136-9

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/hypothesis/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index 745aec234c86..ea6abf7e8384 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "hypothesis";
-  version = "6.136.7";
+  version = "6.136.9";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,8 +32,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "HypothesisWorks";
     repo = "hypothesis";
-    rev = "hypothesis-python-${version}";
-    hash = "sha256-V1X9gLNM6WJO7TA+S89hu7p3I+kDs1OfigH1tBfm/cU=";
+    tag = "hypothesis-python-${version}";
+    hash = "sha256-Q1wxIJwAYKZ0x6c85CJSGgcdKw9a3xFw8YpJROElSNU=";
   };
 
   # I tried to package sphinx-selective-exclude, but it throws

From 1e51134bbd0faedee118c4f7aaa16e724fbd4656 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:05 +0200
Subject: [PATCH 0861/3724] python3Packages.ibis-framework: 10.5.0 -> 10.8.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ibis-framework/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix
index e800262be966..2939b7c2ab9c 100644
--- a/pkgs/development/python-modules/ibis-framework/default.nix
+++ b/pkgs/development/python-modules/ibis-framework/default.nix
@@ -98,14 +98,14 @@ in
 
 buildPythonPackage rec {
   pname = "ibis-framework";
-  version = "10.5.0";
+  version = "10.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ibis-project";
     repo = "ibis";
     tag = version;
-    hash = "sha256-KJPl5bkD/tQlHY2k0b9zok5YCPekaXw7Y9z8P4AD3FQ=";
+    hash = "sha256-Uuqm9Exu/oK3BGBL4ViUOGArMWhVutUn1gFRj1I4vt4=";
   };
 
   build-system = [
@@ -142,6 +142,7 @@ buildPythonPackage rec {
 
   pytestFlags = [
     "--benchmark-disable"
+    "-Wignore::FutureWarning"
   ];
 
   enabledTestMarks = testBackends ++ [ "core" ];
@@ -353,7 +354,7 @@ buildPythonPackage rec {
   meta = {
     description = "Productivity-centric Python Big Data Framework";
     homepage = "https://github.com/ibis-project/ibis";
-    changelog = "https://github.com/ibis-project/ibis/blob/${version}/docs/release_notes.md";
+    changelog = "https://github.com/ibis-project/ibis/blob/${src.tag}/docs/release_notes.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       cpcloud

From 7f1fc60f27f1d1e75571747578129092ae55c6af Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:05 +0200
Subject: [PATCH 0862/3724] python3Packages.icecream: 2.1.4 -> 2.1.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/icecream/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix
index 6ae3f20ad9ad..f3ed505cfae5 100644
--- a/pkgs/development/python-modules/icecream/default.nix
+++ b/pkgs/development/python-modules/icecream/default.nix
@@ -18,12 +18,12 @@
 
 buildPythonPackage rec {
   pname = "icecream";
-  version = "2.1.4";
+  version = "2.1.5";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WHVeWDl9U1CnbyWXbe57YH9f67PG4c3f5rGVGJbpFXM=";
+    hash = "sha256-FNIeM4MyammowaO88R+DKDRZ8NJp7OWvg/ziwNZj7+w=";
   };
 
   postPatch = ''

From 75e9392ed62f17aad220ee6f26833f1d385ce8f0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:06 +0200
Subject: [PATCH 0863/3724] python3Packages.imagecodecs: 2025.3.30 -> 2025.8.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/imagecodecs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/imagecodecs/default.nix b/pkgs/development/python-modules/imagecodecs/default.nix
index 30dfe4dc7de7..6d0411ce16d9 100644
--- a/pkgs/development/python-modules/imagecodecs/default.nix
+++ b/pkgs/development/python-modules/imagecodecs/default.nix
@@ -21,9 +21,9 @@
 }:
 
 let
-  version = "2025.3.30";
+  version = "2025.8.2";
 in
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "imagecodecs";
   inherit version;
   pyproject = true;
@@ -32,7 +32,7 @@ buildPythonPackage {
     owner = "cgohlke";
     repo = "imagecodecs";
     tag = "v${version}";
-    hash = "sha256-KtrQNABQOr3mNiWOfaZBcFceSCixPGV8Hte2uPKn1+k=";
+    hash = "sha256-HDyA5SQNZe9G83ARfvD4AAIIos8Oatp+RhnEQTdnRp4=";
   };
 
   build-system = [
@@ -83,7 +83,7 @@ buildPythonPackage {
   meta = {
     description = "Image transformation, compression, and decompression codecs";
     homepage = "https://github.com/cgohlke/imagecodecs";
-    changelog = "https://github.com/cgohlke/imagecodecs/blob/v${version}/CHANGES.rst";
+    changelog = "https://github.com/cgohlke/imagecodecs/blob/${src.tag}/CHANGES.rst";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ yzx9 ];
   };

From ba26bde7900e766f371f4188e636969bd5d4b772 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:06 +0200
Subject: [PATCH 0864/3724] python3Packages.imagededup: 0.3.2 -> 03.3

https://github.com/idealo/imagededup/releases/tag/v03.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/imagededup/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/imagededup/default.nix b/pkgs/development/python-modules/imagededup/default.nix
index 4ecc2f693c78..d5993e358643 100644
--- a/pkgs/development/python-modules/imagededup/default.nix
+++ b/pkgs/development/python-modules/imagededup/default.nix
@@ -33,7 +33,7 @@ let
 in
 buildPythonPackage rec {
   pname = "imagededup";
-  version = "0.3.2";
+  version = "03.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "idealo";
     repo = "imagededup";
     tag = "v${version}";
-    hash = "sha256-B2IuNMTZnzBi6IxrHBoMDsmIcqGQpznd/2f1XKo1Oa4=";
+    hash = "sha256-tm6WGf74xu3CcwpyeA7+rvO5wemO0daXpj/jvYrH19E=";
   };
 
   nativeBuildInputs = [
@@ -88,7 +88,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     homepage = "https://idealo.github.io/imagededup/";
-    changelog = "https://github.com/idealo/imagededup/releases/tag/v${version}";
+    changelog = "https://github.com/idealo/imagededup/releases/tag/${src.tag}";
     description = "Finding duplicate images made easy";
     license = licenses.asl20;
     maintainers = with maintainers; [ stunkymonkey ];

From cbbf25cecdd27800347ea9ec13aef16ed3ddc2ac Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:07 +0200
Subject: [PATCH 0865/3724] python3Packages.imap-tools: 1.10.0 -> 1.11.0

https://github.com/ikvk/imap_tools/blob/v1.11.0/docs/release_notes.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/imap-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix
index e71956c5835e..ec192f63fbc0 100644
--- a/pkgs/development/python-modules/imap-tools/default.nix
+++ b/pkgs/development/python-modules/imap-tools/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "imap-tools";
-  version = "1.10.0";
+  version = "1.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ikvk";
     repo = "imap_tools";
     tag = "v${version}";
-    hash = "sha256-lan12cHkoxCKadgyFey4ShcnwFg3Gl/VqKWlYAkvF3Y=";
+    hash = "sha256-8oPiCFoJ0mV7ZnteM9lufIbxwA/7hV91959weEx/e30=";
   };
 
   build-system = [ setuptools ];

From 202f9ec03624d9b35d91133b61138d7bb9ff12c2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 01:31:23 +0200
Subject: [PATCH 0866/3724] python3Packages.inline-snapshot: 0.23.0 -> 0.24.0

https://github.com/15r10nk/inline-snapshot/blob/0.24.0/CHANGELOG.md
---
 pkgs/development/python-modules/inline-snapshot/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix
index 635bdf36c530..bff769ab1ec5 100644
--- a/pkgs/development/python-modules/inline-snapshot/default.nix
+++ b/pkgs/development/python-modules/inline-snapshot/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "inline-snapshot";
-  version = "0.23.0";
+  version = "0.24.0";
   pyproject = true;
 
   src = fetchFromGitHub {

From cec86165ec314cd1cfbf871cdc01765ee7f754f9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:08 +0200
Subject: [PATCH 0867/3724] python3Packages.instructor: 1.7.9 -> 1.10.0

https://github.com/jxnl/instructor/releases/tag/1.10.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/instructor/default.nix      | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix
index 97c1d863d189..959449e53e76 100644
--- a/pkgs/development/python-modules/instructor/default.nix
+++ b/pkgs/development/python-modules/instructor/default.nix
@@ -23,6 +23,7 @@
   anthropic,
   diskcache,
   fastapi,
+  google-genai,
   google-generativeai,
   pytest-asyncio,
   pytestCheckHook,
@@ -32,16 +33,14 @@
 
 buildPythonPackage rec {
   pname = "instructor";
-  version = "1.7.9";
+  version = "1.10.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "jxnl";
     repo = "instructor";
     tag = version;
-    hash = "sha256-3IwvbepDrylOIlL+IteyFChqYc/ZIu6IieIkbAPL+mw=";
+    hash = "sha256-vknPfRHyLoLo2838p/fbjrqyaBORZzLp9+fN98yVDz0=";
   };
 
   build-system = [ hatchling ];
@@ -65,6 +64,7 @@ buildPythonPackage rec {
     anthropic
     diskcache
     fastapi
+    google-genai
     google-generativeai
     pytest-asyncio
     pytestCheckHook
@@ -90,12 +90,20 @@ buildPythonPackage rec {
     # Performance benchmarks that sometimes fail when running many parallel builds
     "test_combine_system_messages_benchmark"
     "test_extract_system_messages_benchmark"
+
+    # pydantic validation mismatch
+    "test_control_characters_not_allowed_in_anthropic_json_strict_mode"
+    "test_control_characters_allowed_in_anthropic_json_non_strict_mode"
   ];
 
   disabledTestPaths = [
     # Tests require OpenAI API key
-    "tests/test_distil.py"
     "tests/llm/"
+    # Network and requires API keys
+    "tests/test_auto_client.py"
+    # annoying dependencies
+    "tests/docs"
+    "examples"
   ];
 
   meta = {

From dd1e3dfecff1d09aa5935939bf7076ac74f6debb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:09 +0200
Subject: [PATCH 0868/3724] python3Packages.intensity-normalization: 2.2.4 ->
 3.0.1

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/intensity-normalization/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix
index e0beea29d83f..a6f9db795795 100644
--- a/pkgs/development/python-modules/intensity-normalization/default.nix
+++ b/pkgs/development/python-modules/intensity-normalization/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "intensity-normalization";
-  version = "2.2.4";
+  version = "3.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "intensity_normalization";
     inherit version;
-    hash = "sha256-s/trDIRoqLFj3NO+iv3E+AEB4grBAHDlEL6+TCdsgmg=";
+    hash = "sha256-d5f+Ug/ta9RQjk3JwHmVJQr8g93glzf7IcmLxLeA1tQ=";
   };
 
   postPatch = ''

From 95fde94d0511f68b865706bfbf367553fbd40510 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:09 +0200
Subject: [PATCH 0869/3724] python3Packages.ionoscloud: 6.1.11 -> 6.1.12

https://github.com/ionos-cloud/sdk-python/blob/v6.1.12/docs/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ionoscloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ionoscloud/default.nix b/pkgs/development/python-modules/ionoscloud/default.nix
index 8c4d079a5b9e..d0ee3b283306 100644
--- a/pkgs/development/python-modules/ionoscloud/default.nix
+++ b/pkgs/development/python-modules/ionoscloud/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "ionoscloud";
-  version = "6.1.11";
+  version = "6.1.12";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OQNdif263rY7c3tytKPMjXESmYsCBVtk0M25M3XDSJM=";
+    hash = "sha256-sc1qJjfLiI+KjLe3b+JE66giV1pIakYT7FsSjQjWA30=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 8e74fa74611e19df1e60db71e4c6b4c95f6dd085 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:10 +0200
Subject: [PATCH 0870/3724] python3Packages.iplotx: 0.4.0 -> 0.6.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/iplotx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iplotx/default.nix b/pkgs/development/python-modules/iplotx/default.nix
index bb7623222c28..f01b9b0f0ef3 100644
--- a/pkgs/development/python-modules/iplotx/default.nix
+++ b/pkgs/development/python-modules/iplotx/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "iplotx";
-  version = "0.4.0";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fabilab";
     repo = "iplotx";
     tag = version;
-    hash = "sha256-5piMXKr61F3euiCOlamZD7Iv6FQtrlbxwYYbZmD92Cg=";
+    hash = "sha256-RleGCDsH9VLX5hgU1l5pN6a1x9p52VA35CM5B9rJiy0=";
   };
 
   build-system = [ hatchling ];

From ecbc88114b82f1e7947409254ee63136108de905 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:10 +0200
Subject: [PATCH 0871/3724] python3Packages.ipykernel: 6.29.5 -> 6.30.1

https://github.com/ipython/ipykernel/releases/tag/v6.30.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ipykernel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index 2ccb4cd94ee3..8751238168fe 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "ipykernel";
-  version = "6.29.5";
+  version = "6.30.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8JOiLEpA+IKPjjMKnCl8uT3KsTvZZ43tbejlz4HFYhU=";
+    hash = "sha256-arsnAWGJZALna5E5T83OXRvl1F9FZnHlCAVy+FBb45s=";
   };
 
   # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767

From 5207ab8d1ebc8c953939c52d56cd54c1609eb772 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:11 +0200
Subject: [PATCH 0872/3724] python3Packages.ipyniivue: 2.1.0 -> 2.4.0

https://github.com/niivue/ipyniivue/releases/tag/v2.4.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ipyniivue/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/ipyniivue/default.nix b/pkgs/development/python-modules/ipyniivue/default.nix
index cdc0a1d2308d..6668878703a0 100644
--- a/pkgs/development/python-modules/ipyniivue/default.nix
+++ b/pkgs/development/python-modules/ipyniivue/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "ipyniivue";
-  version = "2.1.0";
+  version = "2.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,8 +22,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "niivue";
     repo = "ipyniivue";
-    rev = "v${version}";
-    hash = "sha256-rgScBBJ0Jqr5REZ+YFJcKwWcV33RzJ/sn6RqTL/limo=";
+    tag = "v${version}";
+    hash = "sha256-APxxYflEYcjQGloLvdOGMlOnOL/0ttGVvTCLEMqp1W0=";
   };
 
   npmDeps = fetchNpmDeps {
@@ -58,7 +58,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Show a nifti image in a webgl 2.0 canvas within a jupyter notebook cell";
     homepage = "https://github.com/niivue/ipyniivue";
-    changelog = "https://github.com/niivue/ipyniivue/releases/tag/${version}";
+    changelog = "https://github.com/niivue/ipyniivue/releases/tag/${src.tag}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ bcdarwin ];
   };

From 8d7e1b6ff77cd0fb77dae0e79fdc0d2fa6304096 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:11 +0200
Subject: [PATCH 0873/3724] python3Packages.ipython: 9.3.0 -> 9.4.0

https://github.com/ipython/ipython/blob/9.4.0/docs/source/whatsnew/version9.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ipython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index 66680b336217..a2f8bac3b77a 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -36,12 +36,12 @@
 
 buildPythonPackage rec {
   pname = "ipython";
-  version = "9.3.0";
+  version = "9.4.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-eeuJb58j9QrRbDvCBfaG9uAwrSRswwnGJ5okKxSv6dg=";
+    hash = "sha256-wDPG1OeRTD2XaKq+drvoe6HcZqkqBdtr+hEl2B8u4nA=";
   };
 
   build-system = [ setuptools ];

From f5090c64a8760de0ddc43cc9ed6e1154f112747c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:12 +0200
Subject: [PATCH 0874/3724] python3Packages.israel-rail-api: 0.1.2 -> 0.1.3

https://github.com/sh0oki/israel-rail-api/releases/tag/v0.1.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/israel-rail-api/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/israel-rail-api/default.nix b/pkgs/development/python-modules/israel-rail-api/default.nix
index 885d284a4256..2a5c46e00199 100644
--- a/pkgs/development/python-modules/israel-rail-api/default.nix
+++ b/pkgs/development/python-modules/israel-rail-api/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {
-    changelog = "https://github.com/sh0oki/israel-rail-api/releases/tag/v${version}";
+    changelog = "https://github.com/sh0oki/israel-rail-api/releases/tag/${src.tag}";
     description = "Python wrapping of the Israeli Rail API";
     homepage = "https://github.com/sh0oki/israel-rail-api";
     license = lib.licenses.mit;

From adbb3e3d8ced0f5dcabccf9ac848055a10e7e36b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:12 +0200
Subject: [PATCH 0875/3724] python3Packages.itemadapter: 0.11.0 -> 0.12.0

https://github.com/scrapy/itemadapter/raw/v0.12.0/Changelog.md

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/itemadapter/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix
index 459c6b9a76fc..72c2d930334d 100644
--- a/pkgs/development/python-modules/itemadapter/default.nix
+++ b/pkgs/development/python-modules/itemadapter/default.nix
@@ -3,25 +3,23 @@
   attrs,
   buildPythonPackage,
   fetchPypi,
+  hatchling,
   pydantic,
   pythonOlder,
   scrapy,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "itemadapter";
-  version = "0.11.0";
+  version = "0.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Ow8n9MXi6K5BXYPj1g0zrbe6CbmMMGOLxgb7Hf8uzdI=";
+    hash = "sha256-pQiCQ+iO/jCY8XIIVecHF25zVa2H0dIOKwMpf10V0b4=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   optional-dependencies = {
     attrs = [ attrs ];

From 73a019ca03c4f122209b44a50960be397cbe0a60 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:13 +0200
Subject: [PATCH 0876/3724] python3Packages.itemdb: 1.2.0 -> 1.3.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/itemdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/itemdb/default.nix b/pkgs/development/python-modules/itemdb/default.nix
index 20148a8b6d0c..5b92b75044b0 100644
--- a/pkgs/development/python-modules/itemdb/default.nix
+++ b/pkgs/development/python-modules/itemdb/default.nix
@@ -6,7 +6,7 @@
 
 buildPythonPackage rec {
   pname = "itemdb";
-  version = "1.2.0";
+  version = "1.3.0";
   format = "setuptools";
 
   # PyPI tarball doesn't include tests directory
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     owner = "almarklein";
     repo = "itemdb";
     tag = "v${version}";
-    sha256 = "sha256-egxQ1tGC6R5p1stYm4r05+b2HkuT+nBySTZPGqeAbSE=";
+    sha256 = "sha256-HXdOERq2td6CME8zWN0DRVkSlmdqTg2po7aJrOuITHE=";
   };
 
   meta = with lib; {

From e142e911812c6b395efd9f9058dd44ca78b2079b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:13 +0200
Subject: [PATCH 0877/3724] python3Packages.iterm2: 2.9 -> 2.10

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/iterm2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix
index 22ddacfb0cba..6e92003720ef 100644
--- a/pkgs/development/python-modules/iterm2/default.nix
+++ b/pkgs/development/python-modules/iterm2/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "iterm2";
-  version = "2.9";
+  version = "2.10";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FoR17UloBtFg3pRurquHCzGaySehUPhVtmQmNkhWTz4=";
+    hash = "sha256-jAz5X/yp8b90CYg2GN7uZqzXPGOSkiLiNDV4DcxRaGk=";
   };
 
   propagatedBuildInputs = [

From 81994b5e786807327b9248d48064148a853087a6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:14 +0200
Subject: [PATCH 0878/3724] python3Packages.jaraco-abode: 6.3.0 -> 6.4.0

https://github.com/jaraco/jaraco.abode/blob/v6.4.0/NEWS.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/jaraco-abode/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix
index e5c4147dd0ac..fe1f78a4c250 100644
--- a/pkgs/development/python-modules/jaraco-abode/default.nix
+++ b/pkgs/development/python-modules/jaraco-abode/default.nix
@@ -25,16 +25,20 @@
 
 buildPythonPackage rec {
   pname = "jaraco-abode";
-  version = "6.3.0";
+  version = "6.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "jaraco.abode";
     tag = "v${version}";
-    hash = "sha256-AqnyQdLkg2vobVJ84X15AB0Yyj3gZf4rP3pEdk3MqZ4=";
+    hash = "sha256-nnnVtNXQ7Sa4wXl0ay3OyjvOq2j90pTwhK24WR8mrBo=";
   };
 
+  postPatch = ''
+    sed -i "/coherent\.licensed/d" pyproject.toml
+  '';
+
   build-system = [
     setuptools
     setuptools-scm

From 3168dce5b01e66238f0c2633aaf73d0ae9fc9e3c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:14 +0200
Subject: [PATCH 0879/3724] python3Packages.jaraco-collections: 5.1.0 -> 5.2.1

https://github.com/jaraco/jaraco.collections/blob/v5.2.1/NEWS.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/jaraco-collections/default.nix          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/jaraco-collections/default.nix b/pkgs/development/python-modules/jaraco-collections/default.nix
index 128592ba047d..8f913f2d11a3 100644
--- a/pkgs/development/python-modules/jaraco-collections/default.nix
+++ b/pkgs/development/python-modules/jaraco-collections/default.nix
@@ -10,18 +10,17 @@
 
 buildPythonPackage rec {
   pname = "jaraco-collections";
-  version = "5.1.0";
+  version = "5.2.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "jaraco_collections";
     inherit version;
-    hash = "sha256-DkgpQJ05rRikCqZ1T+4nZ/TZcwxLpm3J34nx0nVplMI=";
+    hash = "sha256-2rgZcLrW8KtTsgdF8bAdo3km5MD81CUEaqReDY76GO0=";
   };
 
   postPatch = ''
-    # break dependency cycle
-    sed -i "/'jaraco.text',/d" setup.cfg
+    sed -i "/coherent\.licensed/d" pyproject.toml
   '';
 
   build-system = [

From e22fdd15ca918b9d20e1258f307fb2a7a497913a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:15 +0200
Subject: [PATCH 0880/3724] python3Packages.jaraco-functools: 4.1.0 -> 4.2.1

https://github.com/jaraco/jaraco.functools/blob/v4.2.1/NEWS.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/jaraco-functools/default.nix           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jaraco-functools/default.nix b/pkgs/development/python-modules/jaraco-functools/default.nix
index 20f50cb6a789..90b983a1c504 100644
--- a/pkgs/development/python-modules/jaraco-functools/default.nix
+++ b/pkgs/development/python-modules/jaraco-functools/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "jaraco-functools";
-  version = "4.1.0";
+  version = "4.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,9 +21,13 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "jaraco_functools";
     inherit version;
-    hash = "sha256-cPfg4q4HZJjiElYjJegFIE/Akte0wX4OhslZ4klwGp0=";
+    hash = "sha256-vmNKv8yrzlb6MFP4x+vje2gmg6Tud5NnDO0XurAIc1M=";
   };
 
+  postPatch = ''
+    sed -i "/coherent\.licensed/d" pyproject.toml
+  '';
+
   build-system = [
     setuptools
     setuptools-scm

From 465ed2142924d27cf4c331d761f0b74ac5b09209 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:15 +0200
Subject: [PATCH 0881/3724] python3Packages.jaraco-itertools: 6.4.1 -> 6.4.3

This commit was automatically generated using update-python-libraries.
---
 .../jaraco-itertools/default.nix              | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/jaraco-itertools/default.nix b/pkgs/development/python-modules/jaraco-itertools/default.nix
index 07c1cd338518..971dbd9aba1c 100644
--- a/pkgs/development/python-modules/jaraco-itertools/default.nix
+++ b/pkgs/development/python-modules/jaraco-itertools/default.nix
@@ -1,41 +1,40 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools-scm,
   inflect,
   more-itertools,
-  six,
-  pytest,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "jaraco-itertools";
-  version = "6.4.1";
-  format = "pyproject";
+  version = "6.4.3";
+  pyproject = true;
 
-  src = fetchPypi {
-    pname = "jaraco.itertools";
-    inherit version;
-    hash = "sha256-MU/OVi67RepIIqmLvXsi5f6sfVEY28Gk8ess0Ea/+kc=";
+  src = fetchFromGitHub {
+    owner = "jaraco";
+    repo = "jaraco.itertools";
+    tag = "v${version}";
+    hash = "sha256-LjWkyY9I8BBYpFm8TT3kq4vk63pNQrnZ15haJCQ5xlk=";
   };
 
   pythonNamespaces = [ "jaraco" ];
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  postPatch = ''
+    # downloads license texts at build time
+    sed -i "/coherent\.licensed/d" pyproject.toml
+  '';
+
+  dependencies = [
     inflect
     more-itertools
-    six
   ];
-  nativeCheckInputs = [ pytest ];
 
-  # tests no longer available through pypi
-  doCheck = false;
-  checkPhase = ''
-    pytest
-  '';
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "jaraco.itertools" ];
 

From 4f64e0cd3c982d5708c3c4c091febc140a4c9192 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:16 +0200
Subject: [PATCH 0882/3724] python3Packages.jaraco-logging: 3.3.0 -> 3.4.0

https://github.com/jaraco/jaraco.logging/blob/v3.4.0/NEWS.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/jaraco-logging/default.nix          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/jaraco-logging/default.nix b/pkgs/development/python-modules/jaraco-logging/default.nix
index 3368ac4ae19e..44e8ad050bcf 100644
--- a/pkgs/development/python-modules/jaraco-logging/default.nix
+++ b/pkgs/development/python-modules/jaraco-logging/default.nix
@@ -10,17 +10,21 @@
 
 buildPythonPackage rec {
   pname = "jaraco-logging";
-  version = "3.3.0";
+  version = "3.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    pname = "jaraco.logging";
+    pname = "jaraco_logging";
     inherit version;
-    hash = "sha256-9KfPusuGqDTCiGwBo7UrxM3icowdlxfEnU3OHWJI8Hs=";
+    hash = "sha256-59bcg2hHfOaesdbthR2AWJahypQs4/0Xc1gDEbC3dfs=";
   };
 
+  postPatch = ''
+    sed -i "/coherent\.licensed/d" pyproject.toml
+  '';
+
   pythonNamespaces = [ "jaraco" ];
 
   nativeBuildInputs = [

From 4f92e14644505c30c3b47ca32d6529fcc2aac2f4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:16 +0200
Subject: [PATCH 0883/3724] python3Packages.jiwer: 3.04 -> 4.0.0

https://github.com/jitsi/jiwer/releases/tag/v4.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/jiwer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/jiwer/default.nix b/pkgs/development/python-modules/jiwer/default.nix
index 5f0ab0b1b73d..86891d10edcb 100644
--- a/pkgs/development/python-modules/jiwer/default.nix
+++ b/pkgs/development/python-modules/jiwer/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "jiwer";
-  version = "3.04";
+  version = "4.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "jitsi";
     repo = "jiwer";
     tag = "v${version}";
-    hash = "sha256-2LzAOgABK00Pz3v5WWYUAcZOYcTbRKfgw7U5DOohB/Q=";
+    hash = "sha256-iyFcxZGYMeQXSZBHJg7kBWyOciZyEV7gSzSy4SvBGzw=";
   };
 
   build-system = [
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Simple and fast python package to evaluate an automatic speech recognition system";
     mainProgram = "jiwer";
     homepage = "https://github.com/jitsi/jiwer";
-    changelog = "https://github.com/jitsi/jiwer/releases/tag/v${version}";
+    changelog = "https://github.com/jitsi/jiwer/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ GaetanLepage ];
   };

From 3c5a335a269c34960bb92144a769ee0e3f542aec Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:17 +0200
Subject: [PATCH 0884/3724] python3Packages.joblib: 1.5.0 -> 1.5.1

https://github.com/joblib/joblib/releases/tag/1.5.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/joblib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index ac35a717420d..4959b53e2283 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "joblib";
-  version = "1.5.0";
+  version = "1.5.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2HV/lVOJo916IxUuQ7wpfC4MLTBgBW2tD+78iKBpObU=";
+    hash = "sha256-9PhuNR85/j0NMqnyw9ivHuTOwoWq/LJwA92lIFV2tEQ=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 4b557cdf3f91c39b5e9cfd978ece360204dd2513 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:17 +0200
Subject: [PATCH 0885/3724] python3Packages.joserfc: 1.1.0 -> 1.2.2

https://github.com/authlib/joserfc/blob/1.2.2/docs/changelog.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/joserfc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/joserfc/default.nix b/pkgs/development/python-modules/joserfc/default.nix
index 9823612e5371..5cbe913821b5 100644
--- a/pkgs/development/python-modules/joserfc/default.nix
+++ b/pkgs/development/python-modules/joserfc/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "joserfc";
-  version = "1.1.0";
+  version = "1.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "authlib";
     repo = "joserfc";
     tag = version;
-    hash = "sha256-95xtUzzIxxvDtpHX/5uCHnTQTB8Fc08DZGUOR/SdKLs=";
+    hash = "sha256-GS1UvhOdeuyGaF/jS0zgdYkRxz6M8w4lFXcbtIPqQcY=";
   };
 
   build-system = [ setuptools ];

From 4f01cff11e46f005632fff969b530ba8239feaeb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:17 +0200
Subject: [PATCH 0886/3724] python3Packages.jsonfield: 3.1.0 -> 3.2.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/jsonfield/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jsonfield/default.nix b/pkgs/development/python-modules/jsonfield/default.nix
index bf7e67eb6207..b6139135a560 100644
--- a/pkgs/development/python-modules/jsonfield/default.nix
+++ b/pkgs/development/python-modules/jsonfield/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "jsonfield";
-  version = "3.1.0";
+  version = "3.2.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0yl828cd0m8jsyr4di6hcjdqmi31ijh5vk57mbpfl7p2gmcq8kky";
+    sha256 = "sha256-ylOHG8MwiuT0zdw7T5ntXG/Gq7GDL7+0mbxtpWbHDko=";
   };
 
   nativeCheckInputs = [

From 924ff67ad2d83ec2a1e34281e3274cb135d5ab9e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:18 +0200
Subject: [PATCH 0887/3724] python3Packages.jsonpickle: 4.0.5 -> 4.1.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/jsonpickle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix
index d8da4abe884d..c67eb0b78f00 100644
--- a/pkgs/development/python-modules/jsonpickle/default.nix
+++ b/pkgs/development/python-modules/jsonpickle/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "jsonpickle";
-  version = "4.0.5";
+  version = "4.1.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8pmBizk2fDYbPya9uoJ9QkmrXTg82TFE0PlLVBeqyzU=";
+    hash = "sha256-+G4Y8T4rlsHB7t4Le5AJW7th2Z/twUgTxE3C82HbuuE=";
   };
 
   build-system = [

From 16f8c8a04ad981085d69f040105d038eab96e1b1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 12:27:27 +0200
Subject: [PATCH 0888/3724] python3Packages.rfc3987-syntax: init at 1.1.0

---
 .../python-modules/rfc3987-syntax/default.nix | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/rfc3987-syntax/default.nix

diff --git a/pkgs/development/python-modules/rfc3987-syntax/default.nix b/pkgs/development/python-modules/rfc3987-syntax/default.nix
new file mode 100644
index 000000000000..6de67fae9bde
--- /dev/null
+++ b/pkgs/development/python-modules/rfc3987-syntax/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  lark,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "rfc3987-syntax";
+  version = "1.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "willynilly";
+    repo = "rfc3987-syntax";
+    tag = "v${version}";
+    hash = "sha256-6jA/x8KnwBvyW2k384/EB/NJ8BmJJTEHA8YUlQP+1Y4=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    lark
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "rfc3987_syntax"
+  ];
+
+  meta = {
+    changelog = "https://github.com/willynilly/rfc3987-syntax/releases/tag/${src.tag}";
+    description = "Helper functions to syntactically validate strings according to RFC 3987";
+    homepage = "https://github.com/willynilly/rfc3987-syntax";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b1e608fbe73c..5de0a66c0300 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15677,6 +15677,8 @@ self: super: with self; {
 
   rfc3987 = callPackage ../development/python-modules/rfc3987 { };
 
+  rfc3987-syntax = callPackage ../development/python-modules/rfc3987-syntax { };
+
   rfc6555 = callPackage ../development/python-modules/rfc6555 { };
 
   rfc7464 = callPackage ../development/python-modules/rfc7464 { };

From 7a7731695ff693745cefcf440fbf8c3feec44826 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:18 +0200
Subject: [PATCH 0889/3724] python3Packages.jsonschema: 4.23.0 -> 4.25.0

https://github.com/python-jsonschema/jsonschema/blob/v4.25.0/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/jsonschema/default.nix       | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix
index 0407a46ba198..9eb7cdf30e5c 100644
--- a/pkgs/development/python-modules/jsonschema/default.nix
+++ b/pkgs/development/python-modules/jsonschema/default.nix
@@ -6,12 +6,10 @@
   hatch-fancy-pypi-readme,
   hatch-vcs,
   hatchling,
-  importlib-resources,
+  jsonpath-ng,
   jsonschema-specifications,
-  pkgutil-resolve-name,
   pip,
   pytestCheckHook,
-  pythonOlder,
   referencing,
   rpds-py,
 
@@ -23,20 +21,19 @@
   rfc3339-validator,
   rfc3986-validator,
   rfc3987,
+  rfc3987-syntax,
   uri-template,
   webcolors,
 }:
 
 buildPythonPackage rec {
   pname = "jsonschema";
-  version = "4.23.0";
+  version = "4.25.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1xSX/vJjUaMyZTN/p3/+uCQj8+ohKDzZRnuwOZkma8Q=";
+    hash = "sha256-5jrPXBF2LA5mcv+2FIK99X8IdmhNjSScD+LXMNSLxV8=";
   };
 
   postPatch = ''
@@ -51,13 +48,10 @@ buildPythonPackage rec {
 
   dependencies = [
     attrs
+    jsonpath-ng
     jsonschema-specifications
     referencing
     rpds-py
-  ]
-  ++ lib.optionals (pythonOlder "3.9") [
-    importlib-resources
-    pkgutil-resolve-name
   ];
 
   optional-dependencies = {
@@ -78,6 +72,7 @@ buildPythonPackage rec {
       jsonpointer
       rfc3339-validator
       rfc3986-validator
+      rfc3987-syntax
       uri-template
       webcolors
     ];

From ae89e2a8a30e5a7a229d3c1451f853e335be2c8f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:19 +0200
Subject: [PATCH 0890/3724] python3Packages.jug: 2.3.1 -> 2.4.0

https://github.com/luispedro/jug/blob/v2.4.0/ChangeLog

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/jug/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix
index ed62d6306221..311ace4bcdc8 100644
--- a/pkgs/development/python-modules/jug/default.nix
+++ b/pkgs/development/python-modules/jug/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "jug";
-  version = "2.3.1";
+  version = "2.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Jug";
     inherit version;
-    hash = "sha256-Y2TWqJi7GjmWUFpe1b150NgwRw9VKhCk5EoN5NDcPXU=";
+    hash = "sha256-B6We+9bW0dfT5DUsxU212e7ueyRc8GgBVPVnIek8ckU=";
   };
 
   propagatedBuildInputs = [ bottle ];

From bd233e8e8c88788fcec84a89818b0af5185cdf53 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:19 +0200
Subject: [PATCH 0891/3724] python3Packages.jupyter-lsp: 2.2.5 -> 2.2.6

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/jupyter-lsp/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix
index 54ce115af8df..d2c97fb65985 100644
--- a/pkgs/development/python-modules/jupyter-lsp/default.nix
+++ b/pkgs/development/python-modules/jupyter-lsp/default.nix
@@ -8,12 +8,13 @@
 
 buildPythonPackage rec {
   pname = "jupyter-lsp";
-  version = "2.2.5";
+  version = "2.2.6";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-eTFHoFrURvgJ/VPvHNGan1JW/Qota3zpQ6mCy09UUAE=";
+    pname = "jupyter_lsp";
+    inherit version;
+    hash = "sha256-BWa9m7BP2eZ3SpN+0BUitVW6eL43vr73h8irIt5MA2E=";
   };
 
   nativeBuildInputs = [ setuptools ];

From f8fcc72011221283bc8e22314f92614c261ddec1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:20 +0200
Subject: [PATCH 0892/3724] python3Packages.jupyter-repo2docker: 2024.07.0 ->
 2025.08.0

https://github.com/jupyterhub/repo2docker/blob/2025.08.0/docs/source/changelog.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/jupyter-repo2docker/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
index e88befd0acd1..bcf31bfb43af 100644
--- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix
+++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "jupyter-repo2docker";
-  version = "2024.07.0";
+  version = "2025.08.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "jupyterhub";
     repo = "repo2docker";
     tag = version;
-    hash = "sha256-ZzZBuJBPDG4to1fSYn2xysupXbPS9Q6wqWr3Iq/Vds8=";
+    hash = "sha256-vqLZbqshEl3xC5hcE4OkWfZpPSlSfv70oygEYPFqyFE=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -64,7 +64,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Turn code repositories into Jupyter enabled Docker Images";
     homepage = "https://repo2docker.readthedocs.io/";
-    changelog = "https://github.com/jupyterhub/repo2docker/blob/${src.rev}/docs/source/changelog.md";
+    changelog = "https://github.com/jupyterhub/repo2docker/blob/${src.tag}/docs/source/changelog.md";
     license = licenses.bsd3;
     maintainers = [ ];
   };

From ad4505a0ef827a624863a3251a210cc99ac8aefe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:20 +0200
Subject: [PATCH 0893/3724] python3Packages.jupyterlab: 4.4.3 -> 4.4.5

https://github.com/jupyterlab/jupyterlab/blob/v4.4.5/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/jupyterlab/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index 1be0da1b95ea..5a95b9481025 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab";
-  version = "4.4.3";
+  version = "4.4.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jupyterlab";
     repo = "jupyterlab";
     tag = "v${version}";
-    hash = "sha256-ZenPoUnUlNLiOVI6tkF/Lq6l3tMA8WXKg9ENwOgS720=";
+    hash = "sha256-Joc8gtUJS8J2SLJqBV3f4bzmOje1grdgIMUkcwl9K44=";
   };
 
   nativeBuildInputs = [
@@ -48,7 +48,7 @@ buildPythonPackage rec {
   offlineCache = yarn-berry_3.fetchYarnBerryDeps {
     inherit src;
     sourceRoot = "${src.name}/jupyterlab/staging";
-    hash = "sha256-qW0SiISQhwVPk0wwnEtxB4fJMyVS3wzp/4pS8bPleM4=";
+    hash = "sha256-EwR1gVrEy7QV8DnJBPx1AlbWY10FFngpLXdAIKn1HI0=";
   };
 
   preBuild = ''

From 79c8e4da6dfe62f972dbf6db6a95215b42cd7c59 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:21 +0200
Subject: [PATCH 0894/3724] python3Packages.kajiki: 0.9.2 -> 1.0.1

https://github.com/jackrosenthal/kajiki/releases/tag/v1.0.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/kajiki/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix
index 1632d83f1af9..e801f49aca4a 100644
--- a/pkgs/development/python-modules/kajiki/default.nix
+++ b/pkgs/development/python-modules/kajiki/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "kajiki";
-  version = "0.9.2";
+  version = "1.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "jackrosenthal";
     repo = "kajiki";
     tag = "v${version}";
-    hash = "sha256-EbXe4Jh2IKAYw9GE0kFgKVv9c9uAOiFFYaMF8CGaOfg=";
+    hash = "sha256-5qsRxKeWCndi2r1HaIX/bm92oOWU4J4eM9aud6ai8ZQ=";
   };
 
   propagatedBuildInputs = [ linetable ];
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Module provides fast well-formed XML templates";
     mainProgram = "kajiki";
     homepage = "https://github.com/nandoflorestan/kajiki";
-    changelog = "https://github.com/jackrosenthal/kajiki/releases/tag/v${version}";
+    changelog = "https://github.com/jackrosenthal/kajiki/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ onny ];
   };

From 47b88de1a52e0897f0fd51927e7d3a95f2ea2276 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:21 +0200
Subject: [PATCH 0895/3724] python3Packages.kernels: 0.7.0 -> 0.9.0

https://github.com/huggingface/kernels/releases/tag/v0.9.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/kernels/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kernels/default.nix b/pkgs/development/python-modules/kernels/default.nix
index 4f97afd113e0..47e087b90b3f 100644
--- a/pkgs/development/python-modules/kernels/default.nix
+++ b/pkgs/development/python-modules/kernels/default.nix
@@ -7,14 +7,14 @@
 }:
 buildPythonPackage rec {
   pname = "kernels";
-  version = "0.7.0";
+  version = "0.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "kernels";
     tag = "v${version}";
-    hash = "sha256-IbOadtnuRgN54Sg+mFULkkqi6LVlW+ohBgtemz/Pxxc=";
+    hash = "sha256-lREccuvahjNV44reYNF8fkJ2o4fMZRB9Ddr9r4HmT2k=";
   };
 
   build-system = [

From 6d50bfc9b5db038bed1530a6bc2dd37df7e8ac88 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:22 +0200
Subject: [PATCH 0896/3724] python3Packages.kestra: 0.21.0 -> 0.23.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/kestra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kestra/default.nix b/pkgs/development/python-modules/kestra/default.nix
index 31653a931a3c..c6039c8a121c 100644
--- a/pkgs/development/python-modules/kestra/default.nix
+++ b/pkgs/development/python-modules/kestra/default.nix
@@ -9,14 +9,14 @@
 }:
 buildPythonPackage rec {
   pname = "kestra";
-  version = "0.21.0";
+  version = "0.23.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kestra-io";
     repo = "libs";
     tag = "v${version}";
-    hash = "sha256-WaAw/PKoHPjbNrpCV6CuqUIb2Ysv4rHYFJbgGyU6li0=";
+    hash = "sha256-WtwvOSgAcN+ly0CnkL0Y7lrO4UhSSiXmoAyGXP/hFtE=";
   };
 
   sourceRoot = "${src.name}/python";

From 5a53cc7e2d3dbceb88ca9f46627fcbd7b54168af Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:22 +0200
Subject: [PATCH 0897/3724] python3Packages.kfactory: 1.4.4 -> 1.12.1

https://github.com/gdsfactory/kfactory/blob/v1.12.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/kfactory/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/kfactory/default.nix b/pkgs/development/python-modules/kfactory/default.nix
index 2f661515e329..a164a03d5ccb 100644
--- a/pkgs/development/python-modules/kfactory/default.nix
+++ b/pkgs/development/python-modules/kfactory/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "kfactory";
-  version = "1.4.4";
+  version = "1.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gdsfactory";
     repo = "kfactory";
     tag = "v${version}";
-    hash = "sha256-/dhlAcrqQP/YeKGhnBAVMEy80X3yShn65ywoZMRU/ZM=";
+    hash = "sha256-C7ner1jkMCHI8/sRiw82l+THhAIWhwJuZ/ctJ9V76Us=";
   };
 
   build-system = [
@@ -77,7 +77,7 @@ buildPythonPackage rec {
   meta = {
     description = "KLayout API implementation of gdsfactory";
     homepage = "https://github.com/gdsfactory/kfactory";
-    changelog = "https://github.com/gdsfactory/kfactory/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/gdsfactory/kfactory/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fbeffa ];
   };

From 89c2f5ccbb589b406037361a68482d685130b15a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:23 +0200
Subject: [PATCH 0898/3724] python3Packages.kiss-headers: 2.4.3 -> 2.5.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/kiss-headers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kiss-headers/default.nix b/pkgs/development/python-modules/kiss-headers/default.nix
index 3bc40680fb7e..79011b9660bf 100644
--- a/pkgs/development/python-modules/kiss-headers/default.nix
+++ b/pkgs/development/python-modules/kiss-headers/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "kiss-headers";
-  version = "2.4.3";
+  version = "2.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Ousret";
     repo = "kiss-headers";
     tag = version;
-    hash = "sha256-WeAzlC1yT+0nPSuB278z8T0XvPjbre051f/Rva5ujAk=";
+    hash = "sha256-h0e7kFbn6qxIeSG85qetBg6IeSi/2YAaZLGS0+JH2g8=";
   };
 
   nativeBuildInputs = [ hatchling ];

From 10ef53b7e441e2036b007585c4008bfc9d5a828d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:23 +0200
Subject: [PATCH 0899/3724] python3Packages.kornia: 0.8.0 -> 0.8.1

https://github.com/kornia/kornia/releases/tag/v0.8.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/kornia/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/kornia/default.nix b/pkgs/development/python-modules/kornia/default.nix
index 943bcf4931ac..0ea0b2eaf1b7 100644
--- a/pkgs/development/python-modules/kornia/default.nix
+++ b/pkgs/development/python-modules/kornia/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "kornia";
-  version = "0.8.0";
+  version = "0.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "kornia";
     repo = "kornia";
     tag = "v${version}";
-    hash = "sha256-pMCGL33DTnMLlxRbhBhRuR/ZA575+kbUJ59N3nuqpdI=";
+    hash = "sha256-LT+F/tskySvSmaBufIaQhI4+wK5DZBNanQbnYj4ywGo=";
   };
 
   build-system = [ setuptools ];
@@ -52,7 +52,7 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "https://kornia.readthedocs.io";
-    changelog = "https://github.com/kornia/kornia/releases/tag/v${version}";
+    changelog = "https://github.com/kornia/kornia/releases/tag/${src.tag}";
     description = "Differentiable computer vision library";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ bcdarwin ];

From 5f03006a5f3be78d87473892a7ed9853fe2a6c9c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:24 +0200
Subject: [PATCH 0900/3724] python3Packages.kubernetes: 32.0.1 -> 33.1.0

https://github.com/kubernetes-client/python/releases/tag/v33.1.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/kubernetes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index de99487b2503..7861d5e2ff1b 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "kubernetes";
-  version = "32.0.1";
+  version = "33.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "kubernetes-client";
     repo = "python";
     tag = "v${version}";
-    hash = "sha256-pQuo2oLWMmq4dHTqJYL+Z1xg3ZoYp9ZzLDT7jWIsglo=";
+    hash = "sha256-+jL0XS7Y8qOqzZ5DcG/hZFUpj7krJAaA4fgPNSEgIAE=";
   };
 
   build-system = [

From 20734b2ca1f22906ef20e8e2147a9d0ae7232a5c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:25 +0200
Subject: [PATCH 0901/3724] python3Packages.labelbox: 6.10.0 -> 7.1.1

https://github.com/Labelbox/labelbox-python/releases/tag/v.v7.1.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/labelbox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index 50ba167f6f47..2c9d723afd2c 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -29,14 +29,14 @@
 }:
 
 let
-  version = "6.10.0";
+  version = "7.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Labelbox";
     repo = "labelbox-python";
-    tag = "v.${version}";
-    hash = "sha256-EstHsY9yFeUhQAx3pgvKk/o3EMkr3JeHDDg/p6meDIE=";
+    tag = "v${version}";
+    hash = "sha256-zlcyvouvemHhbD1UcYbbbkmCkTVwarSTF9mCi0I/ZzY=";
   };
 
   lbox-clients = buildPythonPackage {

From b996d700b74fc0baf18a3f91b32717621fed6725 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:25 +0200
Subject: [PATCH 0902/3724] python3Packages.labgrid: 25.0 -> 25.0.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/labgrid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix
index f0e6b5b61a9e..a73a98615485 100644
--- a/pkgs/development/python-modules/labgrid/default.nix
+++ b/pkgs/development/python-modules/labgrid/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "labgrid";
-  version = "25.0";
+  version = "25.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "labgrid-project";
     repo = "labgrid";
     tag = "v${version}";
-    hash = "sha256-Czq8Wx8ThKLcR8GjdlRND+Y1nY1PTl6wDkz9ml83DBk=";
+    hash = "sha256-cLofkkp2T6Y9nQ5LIS7w9URZlt8DQNN8dm3NnrvcKWY=";
   };
 
   # Remove after package bump

From 318659e7dba69df944f1b13e436e8b1a1fdb6d95 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:26 +0200
Subject: [PATCH 0903/3724] python3Packages.lacuscore: 1.14.0 -> 1.16.6

https://github.com/ail-project/LacusCore/releases/tag/v1.16.6

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/lacuscore/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix
index 573090fad011..3d29e1bdfe01 100644
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "lacuscore";
-  version = "1.14.0";
+  version = "1.16.6";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "ail-project";
     repo = "LacusCore";
     tag = "v${version}";
-    hash = "sha256-szcvg4jfJ84kHYWjPBwecfvfsc258SS0OIuYle1lC1g=";
+    hash = "sha256-LcqGJU+wMKTF1E4asysQPcfURqmgc4WQompPpHEgjb8=";
   };
 
   pythonRelaxDeps = [
@@ -60,7 +60,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Modulable part of Lacus";
     homepage = "https://github.com/ail-project/LacusCore";
-    changelog = "https://github.com/ail-project/LacusCore/releases/tag/v${version}";
+    changelog = "https://github.com/ail-project/LacusCore/releases/tag/${src.tag}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ fab ];
   };

From 52e3d67a9f1266ccd1033bb2118bd80c24e8f70a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:26 +0200
Subject: [PATCH 0904/3724] python3Packages.langchain-anthropic: 0.3.17 ->
 0.3.72

https://github.com/langchain-ai/langchain-anthropic/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/langchain-anthropic/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-anthropic/default.nix b/pkgs/development/python-modules/langchain-anthropic/default.nix
index 56bffb3d8dcb..5de2eacc5a5f 100644
--- a/pkgs/development/python-modules/langchain-anthropic/default.nix
+++ b/pkgs/development/python-modules/langchain-anthropic/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-anthropic";
-  version = "0.3.17";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-anthropic==${version}";
-    hash = "sha256-oUT4Mu/vG+bVF6zLQX2RbVUglJ6VMyBt8XtCBSlBlpU=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/anthropic";

From 68f466d0107360ca2ec3a37cbd0dab37876e6052 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:27 +0200
Subject: [PATCH 0905/3724] python3Packages.langchain-azure-dynamic-sessions:
 0.2.0 -> 0.3.72

https://github.com/langchain-ai/langchain/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 .../langchain-azure-dynamic-sessions/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
index a278a133bba1..f404c0562d97 100644
--- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
+++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-azure-dynamic-sessions";
-  version = "0.2.0";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-azure-dynamic-sessions==${version}";
-    hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/azure-dynamic-sessions";

From 2e22fab1dcec08ffb5508293493224db9c12f52a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:28 +0200
Subject: [PATCH 0906/3724] python3Packages.langchain-chroma: 0.2.4 -> 0.3.72

https://github.com/langchain-ai/langchain/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/langchain-chroma/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix
index 7b0c8ed4ca24..9c670e44b09e 100644
--- a/pkgs/development/python-modules/langchain-chroma/default.nix
+++ b/pkgs/development/python-modules/langchain-chroma/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-chroma";
-  version = "0.2.4";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-chroma==${version}";
-    hash = "sha256-w4xvPPLYkPiQA34bimVHLe+vghMI9Pq36CHoE/EMnr8=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/chroma";

From cbd148c254ea3251a98950e32fed153f95bc8650 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:28 +0200
Subject: [PATCH 0907/3724] python3Packages.langchain-deepseek: 0.1.4 -> 0.3.72

https://github.com/langchain-ai/langchain/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/langchain-deepseek/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-deepseek/default.nix b/pkgs/development/python-modules/langchain-deepseek/default.nix
index 9830a391d323..f26769315352 100644
--- a/pkgs/development/python-modules/langchain-deepseek/default.nix
+++ b/pkgs/development/python-modules/langchain-deepseek/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-deepseek";
-  version = "0.1.4";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-deepseek==${version}";
-    hash = "sha256-lIlThVpyZF5osiCyYMO8kQUNtG5eUjXGZLdgRraj4Yc=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/deepseek";

From 7faa08463f613bb2bc11a56e43bf4bc4619d992f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:29 +0200
Subject: [PATCH 0908/3724] python3Packages.langchain-fireworks: 0.3.0 ->
 0.3.72

https://github.com/langchain-ai/langchain/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/langchain-fireworks/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-fireworks/default.nix b/pkgs/development/python-modules/langchain-fireworks/default.nix
index 460c842ebebd..48a221a7766c 100644
--- a/pkgs/development/python-modules/langchain-fireworks/default.nix
+++ b/pkgs/development/python-modules/langchain-fireworks/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-fireworks";
-  version = "0.3.0";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-fireworks==${version}";
-    hash = "sha256-OZou323FAk2I4YuQV7sllbzDwFQWy/90FK3gIHnEBd0=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/fireworks";

From 1376933b99116c8e1f3149d83492878af956eb54 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:29 +0200
Subject: [PATCH 0909/3724] python3Packages.langchain-google-genai: 2.1.8 ->
 2.1.9

https://github.com/langchain-ai/langchain-google/releases/tag/libs/genai/v2.1.9

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/langchain-google-genai/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-google-genai/default.nix b/pkgs/development/python-modules/langchain-google-genai/default.nix
index c1b2989e55e5..9ebf4abbc76d 100644
--- a/pkgs/development/python-modules/langchain-google-genai/default.nix
+++ b/pkgs/development/python-modules/langchain-google-genai/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-google-genai";
-  version = "2.1.8";
+  version = "2.1.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-google";
     tag = "libs/genai/v${version}";
-    hash = "sha256-ObeQuxBEiJhR2AgkFeIZ1oe2GxhhQywRA8eCALOwkT8=";
+    hash = "sha256-9jXiX4WDx5YY39MytuzAWGuDzLkGmtq95ShAIW3zH0U=";
   };
 
   sourceRoot = "${src.name}/libs/genai";

From ecba40d1614b396e4f42d64c91a5491ad6daf9f6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:29 +0200
Subject: [PATCH 0910/3724] python3Packages.langchain-groq: 0.3.6 -> 0.3.72

https://github.com/langchain-ai/langchain/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/langchain-groq/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-groq/default.nix b/pkgs/development/python-modules/langchain-groq/default.nix
index 58d01224f502..0acb97a7dc43 100644
--- a/pkgs/development/python-modules/langchain-groq/default.nix
+++ b/pkgs/development/python-modules/langchain-groq/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-groq";
-  version = "0.3.6";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-groq==${version}";
-    hash = "sha256-f0s8fBT1+uZbatWSPehKfrGYGotBFeNixCiGaAc753o=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/groq";

From 96fa35a3e14cc84aba2ce11fa20e0296747ff000 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:30 +0200
Subject: [PATCH 0911/3724] python3Packages.langchain-huggingface: 0.3.0 ->
 0.3.72

https://github.com/langchain-ai/langchain/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/langchain-huggingface/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix
index 0d267785c342..e95295bff6c2 100644
--- a/pkgs/development/python-modules/langchain-huggingface/default.nix
+++ b/pkgs/development/python-modules/langchain-huggingface/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-huggingface";
-  version = "0.3.0";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-huggingface==${version}";
-    hash = "sha256-+7fxCw4YYyfXwXw30lf1Xb01aj01C6X0B5yUrNPQzNY=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/huggingface";

From e07ed386a98c0da104e3bf82f06fedbdab146fa8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:30 +0200
Subject: [PATCH 0912/3724] python3Packages.langchain-mistralai: 0.2.11 ->
 0.3.72

https://github.com/langchain-ai/langchain-mistralai/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/langchain-mistralai/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-mistralai/default.nix b/pkgs/development/python-modules/langchain-mistralai/default.nix
index 69ca22771391..e7e45057e77c 100644
--- a/pkgs/development/python-modules/langchain-mistralai/default.nix
+++ b/pkgs/development/python-modules/langchain-mistralai/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-mistralai";
-  version = "0.2.11";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-mistralai==${version}";
-    hash = "sha256-14mYvW7j2hxAFZanRhuuo1seX6E4+tAuEPExDbdwHKg=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/mistralai";

From 89bc6d489e511904dfba570f75a009fc9606ab09 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:31 +0200
Subject: [PATCH 0913/3724] python3Packages.langchain-mongodb: 0.2.0 -> 0.3.72

https://github.com/langchain-ai/langchain/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/langchain-mongodb/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix
index 978bfffbc6ed..212efde0e232 100644
--- a/pkgs/development/python-modules/langchain-mongodb/default.nix
+++ b/pkgs/development/python-modules/langchain-mongodb/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-mongodb";
-  version = "0.2.0";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-mongodb==${version}";
-    hash = "sha256-Jd9toXkS9dGtSIrJQ/5W+swV1z2BJOJKBtkyGzj3oSc=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/mongodb";

From dd628746557586de08027c256b113ad9bc97bcbc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:31 +0200
Subject: [PATCH 0914/3724] python3Packages.langchain-ollama: 0.3.6 -> 0.3.72

https://github.com/langchain-ai/langchain/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/langchain-ollama/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix
index 75a6c8f8e55d..d76f1cef40c4 100644
--- a/pkgs/development/python-modules/langchain-ollama/default.nix
+++ b/pkgs/development/python-modules/langchain-ollama/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-ollama";
-  version = "0.3.6";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-ollama==${version}";
-    hash = "sha256-GQkyJaYvwRbjDR0Rfen7/X5hFhY2+WU74B6/9Ufhpo4=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/ollama";

From ea369221dd892694c9836fe523414bf0df1bf82c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:32 +0200
Subject: [PATCH 0915/3724] python3Packages.langchain-openai: 0.3.28 -> 0.3.72

https://github.com/langchain-ai/langchain/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/langchain-openai/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix
index fa62fad8522c..142098443e91 100644
--- a/pkgs/development/python-modules/langchain-openai/default.nix
+++ b/pkgs/development/python-modules/langchain-openai/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-openai";
-  version = "0.3.28";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-openai==${version}";
-    hash = "sha256-HpAdCHxmfGJcqXArvtlYagNuEBGBjrbICIwh9nI0qMQ=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/openai";

From d417921bdf724c54450c171e4f1d948ef9cce13b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:32 +0200
Subject: [PATCH 0916/3724] python3Packages.langchain-perplexity: 0.1.2 ->
 0.3.72

https://github.com/langchain-ai/langchain-perplexity/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/langchain-perplexity/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-perplexity/default.nix b/pkgs/development/python-modules/langchain-perplexity/default.nix
index 0afbb0d521a4..79f6078643a5 100644
--- a/pkgs/development/python-modules/langchain-perplexity/default.nix
+++ b/pkgs/development/python-modules/langchain-perplexity/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-perplexity";
-  version = "0.1.2";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-perplexity==${version}";
-    hash = "sha256-4KYLyhGbG8Y8cDGffE4/8OM61eAKRFTgxKDKMTQExic=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/perplexity";

From a07a471bd28298f8502c461d1d0b07697c9d6571 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:33 +0200
Subject: [PATCH 0917/3724] python3Packages.langchain-tests: 0.3.20 -> 0.3.72

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/langchain-tests/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix
index 495d77229666..4a46ed7c3142 100644
--- a/pkgs/development/python-modules/langchain-tests/default.nix
+++ b/pkgs/development/python-modules/langchain-tests/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-tests";
-  version = "0.3.20";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-tests==${version}";
-    hash = "sha256-RMuxWA/n8d71FReFKO3Y/5P0MYk4aZ5WU2/TRxf9UuE=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/standard-tests";

From fbe90712c9c2fd6979f5a891b7fc10a9e45beace Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:33 +0200
Subject: [PATCH 0918/3724] python3Packages.langchain-text-splitters: 0.3.9 ->
 0.3.72

https://github.com/langchain-ai/langchain/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/langchain-text-splitters/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix
index 73398f9cf85b..53ddcc2ae78c 100644
--- a/pkgs/development/python-modules/langchain-text-splitters/default.nix
+++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-text-splitters";
-  version = "0.3.9";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-text-splitters==${version}";
-    hash = "sha256-dMGvGZyux38Svl0OYgiAoYLdAf0lv27lzXgHFTBp3cs=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/text-splitters";

From 1dd963e052d0afac78f6698f63f8bb6262264632 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:34 +0200
Subject: [PATCH 0919/3724] python3Packages.langchain-xai: 0.2.5 -> 0.3.72

https://github.com/langchain-ai/langchain-xai/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/langchain-xai/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-xai/default.nix b/pkgs/development/python-modules/langchain-xai/default.nix
index 655813d52e14..9d61f9437079 100644
--- a/pkgs/development/python-modules/langchain-xai/default.nix
+++ b/pkgs/development/python-modules/langchain-xai/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-xai";
-  version = "0.2.5";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-xai==${version}";
-    hash = "sha256-nae7KwCKjkvenOO8vErxFQStHolc+N8EUuK6U8r48Kc=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/xai";

From 646bcc69921e7f305ac2d42fd1eec70a9158522b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:34 +0200
Subject: [PATCH 0920/3724] python3Packages.langchain: 0.3.27 -> 0.3.72

https://github.com/langchain-ai/langchain/releases/tag/langchain-core==0.3.72

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/langchain/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index 39b81c33af58..96754ea94d52 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -44,14 +44,14 @@
 
 buildPythonPackage rec {
   pname = "langchain";
-  version = "0.3.27";
+  version = "0.3.72";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain==${version}";
-    hash = "sha256-bqzJ0017Td65rhDCr2wfx+SCaJzPZTFzQpzy3RlaRj4=";
+    tag = "langchain-core==${version}";
+    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
   };
 
   sourceRoot = "${src.name}/libs/langchain";

From eb7dd6e9c9978994afe7759bc182ec4a5f31ce52 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:34 +0200
Subject: [PATCH 0921/3724] python3Packages.langfuse: 2.60.7 -> 3.2.1

https://github.com/langfuse/langfuse-python/releases/tag/v3.2.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/langfuse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix
index 11447656a919..d0331f9b16f6 100644
--- a/pkgs/development/python-modules/langfuse/default.nix
+++ b/pkgs/development/python-modules/langfuse/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "langfuse";
-  version = "2.60.7";
+  version = "3.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langfuse";
     repo = "langfuse-python";
     tag = "v${version}";
-    hash = "sha256-8IlqHO46Kzz+ifmIu2y5SxshNv/lpZO74b1KTE2Opk4=";
+    hash = "sha256-O2mu152aQnYZkPgJTf9TGrC4Ohcp89qQxxrup63yxu8=";
   };
 
   build-system = [ poetry-core ];

From 8143e35fb34e6569b21612ec904037538409f6dd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:35 +0200
Subject: [PATCH 0922/3724] python3Packages.langgraph-checkpoint-postgres:
 2.0.23 -> 2.1.1

https://github.com/langchain-ai/langgraph/releases/tag/checkpoint==2.1.1

This commit was automatically generated using update-python-libraries.
---
 .../langgraph-checkpoint-postgres/default.nix               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
index 590d0ecefcdb..c1ea48e77f52 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-checkpoint-postgres";
-  version = "2.0.23";
+  version = "2.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
-    tag = "checkpointpostgres==${version}";
-    hash = "sha256-QAzT8T3bf3R3gwI/iWDYYDz0SxgLZsP61oMk72dYz4s=";
+    tag = "checkpoint==${version}";
+    hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U=";
   };
 
   postgresqlTestSetupPost = ''

From b1586119926ab4bf8325989fe50fbbb0346dbe92 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:36 +0200
Subject: [PATCH 0923/3724] python3Packages.langgraph-cli: 0.3.6 -> 2.1.1

https://github.com/langchain-ai/langgraph/releases/tag/checkpoint==2.1.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/langgraph-cli/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix
index f395d6b61d2c..312d92cf4549 100644
--- a/pkgs/development/python-modules/langgraph-cli/default.nix
+++ b/pkgs/development/python-modules/langgraph-cli/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-cli";
-  version = "0.3.6";
+  version = "2.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
-    tag = "cli==${version}";
-    hash = "sha256-tBMdFOHSRjw0PtE19XytLU4MmjR3NBLJxUqWoG4L2F8=";
+    tag = "checkpoint==${version}";
+    hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U=";
   };
 
   sourceRoot = "${src.name}/libs/cli";
@@ -87,7 +87,7 @@ buildPythonPackage rec {
   meta = {
     description = "Official CLI for LangGraph API";
     homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/cli";
-    changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${version}";
+    changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${src.tag}";
     mainProgram = "langgraph";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sarahec ];

From 0fd241934eea6b3ec2fe6073d4cc6f7a7d2580b6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:37 +0200
Subject: [PATCH 0924/3724] python3Packages.langgraph-sdk: 0.2.0 -> 2.1.1

https://github.com/langchain-ai/langgraph/releases/tag/checkpoint==2.1.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/langgraph-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix
index 0b1ce1827528..4b5515c2a5ea 100644
--- a/pkgs/development/python-modules/langgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/langgraph-sdk/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-sdk";
-  version = "0.2.0";
+  version = "2.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
-    tag = "sdk==${version}";
-    hash = "sha256-uhVdtB/fLy0hfZKfzNV2eoO83bvKppGVl4Lm8IEscL0=";
+    tag = "checkpoint==${version}";
+    hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U=";
   };
 
   sourceRoot = "${src.name}/libs/sdk-py";

From e8b98560950a18e9686f929a676844e1e2946980 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:37 +0200
Subject: [PATCH 0925/3724] python3Packages.langgraph: 0.6.1 -> 2.1.1

https://github.com/langchain-ai/langgraph/releases/tag/checkpoint==2.1.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/langgraph/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index fa5efe2b2ba3..75594ca5d28c 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -38,14 +38,14 @@
 }:
 buildPythonPackage rec {
   pname = "langgraph";
-  version = "0.6.1";
+  version = "2.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
-    tag = version;
-    hash = "sha256-8mubZSV1CDgYzykKaaWqn04yJldAgdGmgZDm54towWc=";
+    tag = "checkpoint==${version}";
+    hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U=";
   };
 
   postgresqlTestSetupPost = ''

From db06a618d44cc4439858ad486f6ef7737f8fd13a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:38 +0200
Subject: [PATCH 0926/3724] python3Packages.langsmith: 0.4.9 -> 0.4.11

https://github.com/langchain-ai/langsmith-sdk/releases/tag/v0.4.11

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/langsmith/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix
index dfa95995f5be..333f714777ca 100644
--- a/pkgs/development/python-modules/langsmith/default.nix
+++ b/pkgs/development/python-modules/langsmith/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
 
   # build-system
-  poetry-core,
+  hatchling,
 
   # dependencies
   httpx,
@@ -31,21 +31,21 @@
 
 buildPythonPackage rec {
   pname = "langsmith";
-  version = "0.4.9";
+  version = "0.4.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langsmith-sdk";
     tag = "v${version}";
-    hash = "sha256-7XV85/IN1hG9hYBSg73pymIwIWYAay/18NAsV6Jz4Ik=";
+    hash = "sha256-bLHCkTMgnHM/m9EfzrfIY5148IpAnaCPft718b9/2jM=";
   };
 
   sourceRoot = "${src.name}/python";
 
   pythonRelaxDeps = [ "orjson" ];
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     httpx

From 3ba12014021b39c5a56524bd0e633b9cb059173c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:39 +0200
Subject: [PATCH 0927/3724] python3Packages.lazy-object-proxy: 1.10.0 -> 1.11.0

This commit was automatically generated using update-python-libraries.
---
 .../lazy-object-proxy/default.nix             | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix
index 33467e6f3b1e..a3d7834f7f50 100644
--- a/pkgs/development/python-modules/lazy-object-proxy/default.nix
+++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix
@@ -1,27 +1,24 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytestCheckHook,
   setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "lazy-object-proxy";
-  version = "1.10.0";
-  format = "setuptools";
+  version = "1.11.0";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-eCR7bUX0OlLvNcJbVYFFnoURciVAikEoo9r4v5ZIrGk=";
+  src = fetchFromGitHub {
+    owner = "ionelmc";
+    repo = "python-lazy-object-proxy";
+    tag = "v${version}";
+    hash = "sha256-iOftyGx5wLxIUwlmo1lY06MXqgxfZek6RR1S5UydOEs=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
-
-  postPatch = ''
-    substituteInPlace pyproject.toml --replace ",<6.0" ""
-    substituteInPlace setup.cfg --replace ",<6.0" ""
-  '';
+  build-system = [ setuptools-scm ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 4051e75a38a9a71f89916646d919b437f7446188 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:39 +0200
Subject: [PATCH 0928/3724] python3Packages.ledgerblue: 0.1.54 -> 0.1.55

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ledgerblue/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index a53dfbce8b96..95c9c6cb6474 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "ledgerblue";
-  version = "0.1.54";
+  version = "0.1.55";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Hn99ST6RnER6XI6+rqA3O9/aC+whYoTOzeoHGF/fFz4=";
+    hash = "sha256-6s2V8cXik6jEg8z3UK49qVwodPbwXMIkWk7iJ7OY0rM=";
   };
 
   build-system = [

From 5c6c2cbe31792cf0d691998c261a9235e7dc2e59 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:40 +0200
Subject: [PATCH 0929/3724] python3Packages.lib4sbom: 0.8.4 -> 0.8.7

https://github.com/anthonyharrison/lib4sbom/releases/tag/v0.8.7

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/lib4sbom/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix
index 5b8b4297cdf3..9515619827df 100644
--- a/pkgs/development/python-modules/lib4sbom/default.nix
+++ b/pkgs/development/python-modules/lib4sbom/default.nix
@@ -3,16 +3,18 @@
   buildPythonPackage,
   defusedxml,
   fetchFromGitHub,
+  jsonschema,
   pytestCheckHook,
   pythonOlder,
   pyyaml,
   semantic-version,
   setuptools,
+  xmlschema,
 }:
 
 buildPythonPackage rec {
   pname = "lib4sbom";
-  version = "0.8.4";
+  version = "0.8.7";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,15 +23,17 @@ buildPythonPackage rec {
     owner = "anthonyharrison";
     repo = "lib4sbom";
     tag = "v${version}";
-    hash = "sha256-QTYtaEo5LdDPfv8KgQ3IUJgKphQl2xyQXrcSn19IeKo=";
+    hash = "sha256-qHKedDh7G6yvk6LOs5drJJbkLo20/dP49GG7Q/pOmBw=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
     defusedxml
+    jsonschema
     pyyaml
     semantic-version
+    xmlschema
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];

From 14f45dddd4d83aa9dcd6cc102094ccc3ce7b390b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:41 +0200
Subject: [PATCH 0930/3724] python3Packages.libarchive-c: 5.1 -> 5.3

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/libarchive-c/default.nix       | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix
index 4eb83031c885..286148a639a7 100644
--- a/pkgs/development/python-modules/libarchive-c/default.nix
+++ b/pkgs/development/python-modules/libarchive-c/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   libarchive,
   glibcLocales,
   mock,
@@ -12,28 +11,20 @@
 
 buildPythonPackage rec {
   pname = "libarchive-c";
-  version = "5.1";
+  version = "5.3";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "Changaco";
     repo = "python-${pname}";
     tag = version;
-    sha256 = "sha256-CO9llPIbVTuE74AeohrMAu5ICkuT/MorRlYEEFne6Uk=";
+    sha256 = "sha256-JqXTV1aD3k88OlW+8rT3xsDuW34+1xErG7hkupvL7Uo=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-tests-with-recent-libarchive.patch";
-      url = "https://github.com/Changaco/python-libarchive-c/commit/a56e9402c76c2fb9631651de7bae07b5fbb0b624.patch";
-      hash = "sha256-OLwJQurEFAmwZJbQfhkibrR7Rcnc9vpWwBuhKxgmT7g=";
-    })
-  ];
-
   LC_ALL = "en_US.UTF-8";
 
   postPatch = ''
-    substituteInPlace libarchive/ffi.py --replace \
+    substituteInPlace libarchive/ffi.py --replace-fail \
       "find_library('archive')" "'${libarchive.lib}/lib/libarchive${stdenv.hostPlatform.extensions.sharedLibrary}'"
   '';
 

From e9207255abf7ca2f309a65f7784736fa6fce8809 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:42 +0200
Subject: [PATCH 0931/3724] python3Packages.libbs: 2.13.0 -> 2.15.4

https://github.com/binsync/libbs/releases/tag/v2.15.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/libbs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/libbs/default.nix b/pkgs/development/python-modules/libbs/default.nix
index d52182af3482..b69b2c3ddde6 100644
--- a/pkgs/development/python-modules/libbs/default.nix
+++ b/pkgs/development/python-modules/libbs/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "libbs";
-  version = "2.13.0";
+  version = "2.15.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "binsync";
     repo = "libbs";
     tag = "v${version}";
-    hash = "sha256-QNiI8qNqh3DlYoGcfExu5PXK1FHXRmcyefMsAfpOMy0=";
+    hash = "sha256-i5y0aPCBcCzR2pYYtdxy9OEFFF47chINMRfhj9zAf7g=";
   };
 
   build-system = [ setuptools ];

From 8955b4a9802a3d0e2b8574f23a51975da5b46602 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:42 +0200
Subject: [PATCH 0932/3724] python3Packages.libevdev: 0.11 -> 0.12

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/libevdev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix
index 1d511b3afae5..814dee247324 100644
--- a/pkgs/development/python-modules/libevdev/default.nix
+++ b/pkgs/development/python-modules/libevdev/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "libevdev";
-  version = "0.11";
+  version = "0.12";
   format = "setuptools";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6coAak3ySIpgvZp0ABHulI2BkEviNk8BflYBaVCPVg8=";
+    hash = "sha256-AulSYy7GwknLucZvb6AAEupEiwZgbHfNE5EzvC/kawg=";
   };
 
   patches = [

From 5703bcb63b04fbbcfe9cacd31dd157928602f5c3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:43 +0200
Subject: [PATCH 0933/3724] python3Packages.libpass: 1.9.1 -> 1.9.1.post0

https://github.com/ThirVondukr/passlib/blob/1.9.1.post0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/libpass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/libpass/default.nix b/pkgs/development/python-modules/libpass/default.nix
index cfa17149b350..80480c9e22c8 100644
--- a/pkgs/development/python-modules/libpass/default.nix
+++ b/pkgs/development/python-modules/libpass/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "libpass";
-  version = "1.9.1";
+  version = "1.9.1.post0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ThirVondukr";
     repo = "passlib";
     tag = version;
-    hash = "sha256-G6Fu1RjVb+OPdxt2hWpgAzTefRA41S0zV4hSvvCEWEA=";
+    hash = "sha256-4J18UktqllRA8DVdHL4AJUuAkjZRdUjiql9a71XXhCA=";
   };
 
   build-system = [ hatchling ];

From 8f3fd4e6d398d5bf0b14e812d1f64347ecdd4ac2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:44 +0200
Subject: [PATCH 0934/3724] python3Packages.limnoria: 2025.5.3 -> 2025.7.18

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/limnoria/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix
index bef6495dd28f..951b441068f6 100644
--- a/pkgs/development/python-modules/limnoria/default.nix
+++ b/pkgs/development/python-modules/limnoria/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "limnoria";
-  version = "2025.5.3";
+  version = "2025.7.18";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-EZ42Ufnw3sUM1fM3+hTreKr58QOgeRANilXP9uxU/Cs=";
+    hash = "sha256-iXu+ObOFd0iQae8/mY2ztt7s4kuKutX3huHN7jP3cHE=";
   };
 
   build-system = [ setuptools ];

From ee9aae17955d3fac5cf5d1506c52ff13b3f1fc50 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:44 +0200
Subject: [PATCH 0935/3724] python3Packages.line-profiler: 4.2.0 -> 5.0.0

https://github.com/pyutils/line_profiler/blob/v5.0.0/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/line-profiler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix
index 7d1642440914..5bc0a75e4209 100644
--- a/pkgs/development/python-modules/line-profiler/default.nix
+++ b/pkgs/development/python-modules/line-profiler/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "line-profiler";
-  version = "4.2.0";
+  version = "5.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8" || isPyPy;
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "line_profiler";
     inherit version;
-    hash = "sha256-CeEPJfh2UUOAs/rubek/sMIoq7qFgguhpZHds+tFGpY=";
+    hash = "sha256-qA8K+wW6DSddnd3F/5fqtjdHEWf/Pmbcx9E1dVBZOYw=";
   };
 
   nativeBuildInputs = [

From c359865e6dddfee5742733df6d96fa03ef5ab979 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:45 +0200
Subject: [PATCH 0936/3724] python3Packages.litestar: 2.13.0 -> 2.16.0

https://github.com/litestar-org/litestar/releases/tag/v2.16.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/litestar/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/litestar/default.nix b/pkgs/development/python-modules/litestar/default.nix
index abf46e6fce89..ed087bbc005d 100644
--- a/pkgs/development/python-modules/litestar/default.nix
+++ b/pkgs/development/python-modules/litestar/default.nix
@@ -43,14 +43,14 @@
 
 buildPythonPackage rec {
   pname = "litestar";
-  version = "2.13.0";
+  version = "2.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "litestar-org";
     repo = "litestar";
     tag = "v${version}";
-    hash = "sha256-PR2DVNRtILHs7XwVi9/ZCVRJQFqfGLn1x2gpYtYjHDo=";
+    hash = "sha256-67O/NxPBBLa1QfH1o9laOAQEin8jRA8SkcV7QEzCjI0=";
   };
 
   build-system = [
@@ -105,7 +105,7 @@ buildPythonPackage rec {
     homepage = "https://litestar.dev/";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ bot-wxt1221 ];
-    changelog = "https://github.com/litestar-org/litestar/releases/tag/v${version}";
+    changelog = "https://github.com/litestar-org/litestar/releases/tag/${src.tag}";
     description = "Production-ready, Light, Flexible and Extensible ASGI API framework";
     license = lib.licenses.mit;
     mainProgram = "litestar";

From 578d6b6c10e67b599c9115008ea7b18038684d6a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:45 +0200
Subject: [PATCH 0937/3724] python3Packages.livekit-api: 1.0.5 -> 1.0.12

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/livekit-api/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/livekit-api/default.nix b/pkgs/development/python-modules/livekit-api/default.nix
index d1b13ef1e49f..6dc8377f023a 100644
--- a/pkgs/development/python-modules/livekit-api/default.nix
+++ b/pkgs/development/python-modules/livekit-api/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "livekit-api";
-  version = "1.0.5";
+  version = "1.0.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "python-sdks";
-    tag = "api-v${version}";
-    hash = "sha256-GoVPOLA4aCC26+x9//mlmOO6tb3dczN+s1C+VtGRiRE=";
+    tag = "rtc-v${version}";
+    hash = "sha256-NfFlj44aRMA7oUXyIKljNdtb/2MLvjIJGcAvIGNbNxM=";
   };
 
   pypaBuildFlags = [ "livekit-api" ];

From ca9a5ec674b28de5a87ceb99dc93c2f202195202 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:46 +0200
Subject: [PATCH 0938/3724] python3Packages.livekit-protocol: 1.0.4 -> 1.0.12

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/livekit-protocol/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/livekit-protocol/default.nix b/pkgs/development/python-modules/livekit-protocol/default.nix
index af1cf54caf20..c2dfe95f1243 100644
--- a/pkgs/development/python-modules/livekit-protocol/default.nix
+++ b/pkgs/development/python-modules/livekit-protocol/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "livekit-protocol";
-  version = "1.0.4";
+  version = "1.0.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "python-sdks";
-    tag = "protocol-v${version}";
-    hash = "sha256-W9WmruzN5Nm9vrjG1Kcf3Orst0b2Mxm80hKLjwXowl8=";
+    tag = "rtc-v${version}";
+    hash = "sha256-NfFlj44aRMA7oUXyIKljNdtb/2MLvjIJGcAvIGNbNxM=";
   };
 
   pypaBuildFlags = [ "livekit-protocol" ];

From 882ec8463f4519bccff4e1a2d67a4f85dfbd63d3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:46 +0200
Subject: [PATCH 0939/3724] python3Packages.livisi: 0.0.25 -> 1.0.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/livisi/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/livisi/default.nix b/pkgs/development/python-modules/livisi/default.nix
index 5bb7bfc5208d..ac9f5f3d24ad 100644
--- a/pkgs/development/python-modules/livisi/default.nix
+++ b/pkgs/development/python-modules/livisi/default.nix
@@ -4,20 +4,21 @@
   colorlog,
   fetchFromGitHub,
   lib,
+  python-dateutil,
   setuptools,
   websockets,
 }:
 
 buildPythonPackage rec {
   pname = "livisi";
-  version = "0.0.25";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "planbnet";
     repo = "livisi";
     tag = "v${version}";
-    hash = "sha256-kEkbuZmYzxhrbTdo7eZJYu2N2uJtfspgqepplXvSXFg=";
+    hash = "sha256-5TRJfI4irg2/ZxpfgzShXE08HWU2aWLR8zGbrZKpwbc=";
   };
 
   pythonRelaxDeps = [ "colorlog" ];
@@ -27,6 +28,7 @@ buildPythonPackage rec {
   dependencies = [
     aiohttp
     colorlog
+    python-dateutil
     websockets
   ];
 

From 8e10d67e3e27705bf51fb59cbf290966c8bd966c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:47 +0200
Subject: [PATCH 0940/3724] python3Packages.llama-cloud: 0.1.34 -> 0.1.37

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/llama-cloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix
index 532633f8a955..b74c23ce0d30 100644
--- a/pkgs/development/python-modules/llama-cloud/default.nix
+++ b/pkgs/development/python-modules/llama-cloud/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-cloud";
-  version = "0.1.34";
+  version = "0.1.37";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_cloud";
     inherit version;
-    hash = "sha256-aGbkurR9LBhAvfFpwTwGF2kxwdMGl6wfpxureUKgQek=";
+    hash = "sha256-ttYuc4bRqoWQW34/fBmkBpS+VMFZZmi86qRWzYTt5mY=";
   };
 
   build-system = [ poetry-core ];

From 6767fe08d6041d30e968772b6a07cb795987d74b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:48 +0200
Subject: [PATCH 0941/3724] python3Packages.llama-index-cli: 0.4.4 -> 0.5.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/llama-index-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix
index 64e8f8d4d8ec..62517983f525 100644
--- a/pkgs/development/python-modules/llama-index-cli/default.nix
+++ b/pkgs/development/python-modules/llama-index-cli/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "llama-index-cli";
-  version = "0.4.4";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_cli";
     inherit version;
-    hash = "sha256-w68M8eKn5e9E0Lrlqo6IcrVMXda3Ma+66fE//rSZe+A=";
+    hash = "sha256-LrlCYjLo2J/98PpnhP+NoJRJ2SDXHQ/MgdB76Tz5Np8=";
   };
 
   build-system = [ hatchling ];

From 96f268d326652a218aa98fc3f0a0b8dd4a80f3bb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:48 +0200
Subject: [PATCH 0942/3724] python3Packages.llama-index-core: 0.12.46 ->
 0.13.0.post1

https://github.com/run-llama/llama_index/blob/v0.13.0.post1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/llama-index-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix
index 3109f18373b7..688c6238544a 100644
--- a/pkgs/development/python-modules/llama-index-core/default.nix
+++ b/pkgs/development/python-modules/llama-index-core/default.nix
@@ -39,7 +39,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-core";
-  version = "0.12.46";
+  version = "0.13.0.post1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     owner = "run-llama";
     repo = "llama_index";
     tag = "v${version}";
-    hash = "sha256-B1i5zabacapc/ipPTQtQzLVZql5ifqxfFoDhaBR+eYc=";
+    hash = "sha256-X4PDvxynQkHOdhDC5Aqwnr3jSF/83VgbFiDD1M9LOoM=";
   };
 
   sourceRoot = "${src.name}/${pname}";

From 8561a426ba5d080064487635aae964a4e733c46c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:49 +0200
Subject: [PATCH 0943/3724] python3Packages.llama-index-embeddings-gemini:
 0.3.2 -> 0.4.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-embeddings-gemini/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
index 8022f766c45c..2bf7acb72d83 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-gemini";
-  version = "0.3.2";
+  version = "0.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_embeddings_gemini";
     inherit version;
-    hash = "sha256-Ske1mqNVBXYirf3BGFAkZqeFywXntMLHNuR/+pjDupU=";
+    hash = "sha256-Cyy89LP4B+J4fbMQmyZyH3VrRSnX7A0U6zGIvS0xPqw=";
   };
 
   pythonRelaxDeps = [ "google-generativeai" ];

From a80d97a7a510a723b30c1b1451677776842342c8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:49 +0200
Subject: [PATCH 0944/3724] python3Packages.llama-index-embeddings-google:
 0.3.1 -> 0.4.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-embeddings-google/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix
index b5cfb79df1ff..e984a934cc0b 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-google";
-  version = "0.3.1";
+  version = "0.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_embeddings_google";
     inherit version;
-    hash = "sha256-gMFfA/USIYkOIaNPZfpLoRzkDGnN2e+gNlylAOrTxKs=";
+    hash = "sha256-wVtJ+BAX49/Ijga9cUXB6xcOrK+IkOzjj+Wgd0cRRb0=";
   };
 
   pythonRelaxDeps = [ "google-generativeai" ];

From a5d96575343dee054705ec17e8eeab8b8a37c90c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:50 +0200
Subject: [PATCH 0945/3724] python3Packages.llama-index-embeddings-huggingface:
 0.5.5 -> 0.6.0

This commit was automatically generated using update-python-libraries.
---
 .../llama-index-embeddings-huggingface/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix
index 39c334ced50f..5add4ba28966 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-huggingface";
-  version = "0.5.5";
+  version = "0.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_embeddings_huggingface";
     inherit version;
-    hash = "sha256-f26aAx2RRvI131l8DM1igM3pa5tDf5kFLOebty5frF4=";
+    hash = "sha256-Ps59jFtoPSBV/t7KRFfeoT91yBptf7lNd+h4zXPZDZc=";
   };
 
   build-system = [ hatchling ];

From bc80b2f520a7ead580a1be6ffaa389a3e065bee7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:50 +0200
Subject: [PATCH 0946/3724] python3Packages.llama-index-embeddings-ollama:
 0.6.0 -> 0.7.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-embeddings-ollama/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix
index 4ad411a7a43b..b6e00c2d616c 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-ollama";
-  version = "0.6.0";
+  version = "0.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_embeddings_ollama";
     inherit version;
-    hash = "sha256-7GL6vymKzrNNIFpQmKLcK9eSTT2bVmwkyh69ZLw9/pA=";
+    hash = "sha256-StV3rCFInL4oi/YEytu9s1a9rx9qdC7MG6uN855pOvQ=";
   };
 
   pythonRelaxDeps = [ "ollama" ];

From 8819f5294c9e4565267b97ce6051170c4db1733e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:51 +0200
Subject: [PATCH 0947/3724] python3Packages.llama-index-embeddings-openai:
 0.3.1 -> 0.5.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-embeddings-openai/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix
index 4040659ac664..1f4da3f6b17c 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-openai";
-  version = "0.3.1";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_embeddings_openai";
     inherit version;
-    hash = "sha256-E2iq084ky67SPVrSUTQ87x63tKBtZWPWYG1ZyzR/7yA=";
+    hash = "sha256-rFh4OaERCJ6opiVfkhQBbXqBOzg7u7+SB3mb4RAHWOs=";
   };
 
   build-system = [ poetry-core ];

From 9f1e6ee02a17092486ca8e71c2ff602d90f7abd3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:51 +0200
Subject: [PATCH 0948/3724] python3Packages.llama-index-graph-stores-nebula:
 0.4.2 -> 0.5.0

This commit was automatically generated using update-python-libraries.
---
 .../llama-index-graph-stores-nebula/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix
index b89b802b0d77..f08c410a191e 100644
--- a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix
+++ b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-graph-stores-nebula";
-  version = "0.4.2";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_graph_stores_nebula";
     inherit version;
-    hash = "sha256-0CooGtmDz9OAJ+B543eFbrFTzii5iXwmo0dV4c/E/es=";
+    hash = "sha256-BzArWYZIY1SRl1q48wAdAy+mWoId+lNbcsw9LQmmw7Q=";
   };
 
   build-system = [ poetry-core ];

From 59d8c795b428298a5286f5a2fd506f8c458a3253 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:52 +0200
Subject: [PATCH 0949/3724] python3Packages.llama-index-graph-stores-neo4j:
 0.4.6 -> 0.5.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-graph-stores-neo4j/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
index 0c253982aa61..ee1a9fa73c3f 100644
--- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
+++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-graph-stores-neo4j";
-  version = "0.4.6";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_graph_stores_neo4j";
     inherit version;
-    hash = "sha256-wTmLGWu/Wnrs1sXqs4LFigJVR+/iAGWxUv6oTFGfLBQ=";
+    hash = "sha256-Iumsnln5iGMAoB3aY4haecm87jYXlEW4/2+uppW8m9c=";
   };
 
   build-system = [ poetry-core ];

From 6984aa5ab1db1333bf6243ca05f55147787cfdb2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:52 +0200
Subject: [PATCH 0950/3724] python3Packages.llama-index-graph-stores-neptune:
 0.3.3 -> 0.4.0

This commit was automatically generated using update-python-libraries.
---
 .../llama-index-graph-stores-neptune/default.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix
index 98bf1e735e19..79c0866688bb 100644
--- a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix
+++ b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-graph-stores-neptune";
-  version = "0.3.3";
+  version = "0.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_graph_stores_neptune";
     inherit version;
-    hash = "sha256-IqY4dEWcbM9371vuZ7C9NlDux9O/j6wF7Hcc4aiBiIE=";
+    hash = "sha256-kSAfIh683fwahMjSgp0dYHmNR+NGBr71Q/OFxGtkUTc=";
   };
 
   build-system = [ hatchling ];

From f3819409079bafde5b2ebd52409c1c4551a1285f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:52 +0200
Subject: [PATCH 0951/3724] 
 python3Packages.llama-index-indices-managed-llama-cloud: 0.7.10 -> 0.9.0

This commit was automatically generated using update-python-libraries.
---
 .../llama-index-indices-managed-llama-cloud/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix
index 0372283f8d2a..4d4ebf6add42 100644
--- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix
+++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-indices-managed-llama-cloud";
-  version = "0.7.10";
+  version = "0.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_indices_managed_llama_cloud";
     inherit version;
-    hash = "sha256-UyZ5B+I9j7y7l8epYXekFEbeGFUMpgMCdgkuc7RcqIA=";
+    hash = "sha256-+6rbauPucS2vQ5qpvjZ+3h+LGQAYtVAQ18NTddKc5Lc=";
   };
 
   pythonRelaxDeps = [ "llama-cloud" ];

From 759b8146d15f00cd7370714e0832ac1a1f57175b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:53 +0200
Subject: [PATCH 0952/3724] python3Packages.llama-index-llms-ollama: 0.6.2 ->
 0.7.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-llms-ollama/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
index 85be869d1e2d..675e10bbd9fb 100644
--- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-ollama";
-  version = "0.6.2";
+  version = "0.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_ollama";
     inherit version;
-    hash = "sha256-G+QIHwupyd07XScMLoAJwlaztqExLLOKDHJNuousEwQ=";
+    hash = "sha256-ThKtTl6mEAZsTgeTVpnFnZMkffIhh27X9+Gn9wwzs8c=";
   };
 
   build-system = [ hatchling ];

From c13724ed67a773f5fadae90ffcb9e7f33a726395 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:53 +0200
Subject: [PATCH 0953/3724] python3Packages.llama-index-llms-openai-like: 0.4.0
 -> 0.5.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-llms-openai-like/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix
index 7fb71c87f8e5..1668fd637929 100644
--- a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-openai-like";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_openai_like";
     inherit version;
-    hash = "sha256-Fa4cFrAboL+oItU5APA+NcGf/ke1KJWCNL8ZQqkfWHw=";
+    hash = "sha256-lFe+3rY7aVThUPxntC5EbjdTpxSqkDoAdiUvt8IN/+4=";
   };
 
   build-system = [ hatchling ];

From a82d24a6bb5ee41a8217a65b165be6b249acb6e6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:54 +0200
Subject: [PATCH 0954/3724] python3Packages.llama-index-llms-openai: 0.4.7 ->
 0.5.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-llms-openai/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
index 6c8184258300..b81017db54ed 100644
--- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-openai";
-  version = "0.4.7";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_openai";
     inherit version;
-    hash = "sha256-Vkr4qzn7Pzrf6uc6WcDcpGwJmrhEoo5yXu4MVR1Iafg=";
+    hash = "sha256-CJlnMoLFjRmlu/ImFqAQkCROMIcm05KiTkZJOZMkdg8=";
   };
 
   pythonRemoveDeps = [

From c94cc873565e0a9c653c278400a5a658eba46d81 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:54 +0200
Subject: [PATCH 0955/3724] 
 python3Packages.llama-index-multi-modal-llms-openai: 0.5.1 -> 0.6.0

This commit was automatically generated using update-python-libraries.
---
 .../llama-index-multi-modal-llms-openai/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
index 63bac0367ff0..2b1954b76fa3 100644
--- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "llama-index-multi-modal-llms-openai";
-  version = "0.5.1";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_multi_modal_llms_openai";
     inherit version;
-    hash = "sha256-3zr/AMNgI8X4xJ+XKjJfcYI+0PTdnNR5lV12r8FGV18=";
+    hash = "sha256-4YWvPQH5GevRVsmegIXU5AApt+nsMEj0DSDebWsPYR4=";
   };
 
   build-system = [ hatchling ];

From 4c5543c1ffcae7ba41df86630b82a47c20b1fa01 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:55 +0200
Subject: [PATCH 0956/3724] python3Packages.llama-index-readers-database: 0.4.0
 -> 0.5.0

https://github.com/run-llama/llama_index/blob/main/llama-index-integrations/readers/llama-index-readers-database/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-readers-database/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-database/default.nix b/pkgs/development/python-modules/llama-index-readers-database/default.nix
index aecb2c627899..c52b6f97c072 100644
--- a/pkgs/development/python-modules/llama-index-readers-database/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-database/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-database";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_database";
     inherit version;
-    hash = "sha256-BdZzn2T3EkR0N3C0uEF3kj1QV5Qnzut7yapAVxdc7C8=";
+    hash = "sha256-5eaNufjXiM4sgc101d19Z3W3CQLE3m8uLa1GOPh05ek=";
   };
 
   build-system = [ poetry-core ];

From 08a0230a07869afbe905fb5bd3d20c2c0a0117fd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:55 +0200
Subject: [PATCH 0957/3724] python3Packages.llama-index-readers-file: 0.4.11 ->
 0.5.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-readers-file/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix
index ed3ba1adece5..c3af3b457026 100644
--- a/pkgs/development/python-modules/llama-index-readers-file/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-file";
-  version = "0.4.11";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_file";
     inherit version;
-    hash = "sha256-GyHLZteN1fYOhxZgfZpHzNgbs5EG1FlmW+HKd5npWXs=";
+    hash = "sha256-8yRhe/xNmzITbSX/U1G5K8C1aaKWFz7iqFkcH4hu/ww=";
   };
 
   pythonRelaxDeps = [

From 646c5a04f32e952b087f6e8f68d63bb6abf23161 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:56 +0200
Subject: [PATCH 0958/3724] python3Packages.llama-index-readers-json: 0.3.0 ->
 0.4.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-readers-json/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-json/default.nix b/pkgs/development/python-modules/llama-index-readers-json/default.nix
index f16f736469c2..434430ee7969 100644
--- a/pkgs/development/python-modules/llama-index-readers-json/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-json/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-json";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_json";
     inherit version;
-    hash = "sha256-mS8nEK8LV1wVh0wV7W8EujLH7QcPagHI4P5cT0bHAJ4=";
+    hash = "sha256-ThQWERdEzPIAUaYWQDkSJdIIvixrKv0eN4LGRaNaS3U=";
   };
 
   build-system = [ poetry-core ];

From 05bad09d9b0d32a4091805757fbd715dca1e4ebe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:56 +0200
Subject: [PATCH 0959/3724] python3Packages.llama-index-readers-llama-parse:
 0.4.0 -> 0.5.0

This commit was automatically generated using update-python-libraries.
---
 .../llama-index-readers-llama-parse/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix
index d06fd69723ec..9b415779ee92 100644
--- a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-llama-parse";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_llama_parse";
     inherit version;
-    hash = "sha256-6Z7Fb0+FRtf9oafBriYWL7mst+vKw0O1q9tCNLRkTg8=";
+    hash = "sha256-iRsh+2P+H+ci4jz6Jjp02ac1Tl2NegHy1AQKUvjY/u8=";
   };
 
   pythonRelaxDeps = [ "llama-parse" ];

From c8e90874cbea60150f0c249bd064c4fe2fd0b393 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:57 +0200
Subject: [PATCH 0960/3724] python3Packages.llama-index-readers-s3: 0.4.0 ->
 0.5.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-readers-s3/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/pkgs/development/python-modules/llama-index-readers-s3/default.nix
index f7cf53876802..9f40cadfdf5c 100644
--- a/pkgs/development/python-modules/llama-index-readers-s3/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-s3/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-s3";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_s3";
     inherit version;
-    hash = "sha256-oCXpLZyIrZKNNDg8hkEh5xxXEqz7B1hLjE5OUwEIozg=";
+    hash = "sha256-3wzxfKkwhC4YfUYPBa/XKqIZQ6zLgB9SSHR+vPhwzOA=";
   };
 
   build-system = [ poetry-core ];

From 6eb0036ccf9dfcf8782af2c645649ec0b23636bc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:57 +0200
Subject: [PATCH 0961/3724] python3Packages.llama-index-readers-twitter: 0.3.0
 -> 0.4.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-readers-twitter/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix
index 6cc9844dcbc3..97e07d49f89d 100644
--- a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-twitter";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_twitter";
     inherit version;
-    hash = "sha256-I7xZQj/Kpwl6D0ltNuKI7TYoQVD9lBiM6I63C23hCwY=";
+    hash = "sha256-AfruOaKbPJasPS0eQjr6501yt32nQ7PvFwD2QVdgBYA=";
   };
 
   build-system = [ poetry-core ];

From bd2adeddde3bf01c7b9d4215c939185eeca8ff7e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:58 +0200
Subject: [PATCH 0962/3724] python3Packages.llama-index-readers-txtai: 0.3.0 ->
 0.4.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-readers-txtai/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix
index 4024b1c33f95..a6cfc2c6568b 100644
--- a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-txtai";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_txtai";
     inherit version;
-    hash = "sha256-N5FiwVZ+KWEQlcfVqHVcHJHzRb6Ct+iR2Dc+Wee7y+M=";
+    hash = "sha256-0eOJ9r27lG6WwOz27+N5qldROoaU5UAewtY4N4m8Kcs=";
   };
 
   build-system = [ poetry-core ];

From 6d70ba9c63b5cca6d113101444246728dee4a9d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:58 +0200
Subject: [PATCH 0963/3724] python3Packages.llama-index-readers-weather: 0.3.0
 -> 0.4.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/llama-index-readers-weather/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/pkgs/development/python-modules/llama-index-readers-weather/default.nix
index 225cfb6c75b7..6b24f3b8f9f5 100644
--- a/pkgs/development/python-modules/llama-index-readers-weather/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-weather/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-weather";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_weather";
     inherit version;
-    hash = "sha256-oGk2M/YaVm8pY4JDFOWGkKbDhEfd/OYBgWLSzV3peAQ=";
+    hash = "sha256-qgrHlJXOKWY5UnB2lZAJun3xA9sxn5+ZNNI6+aDnE98=";
   };
 
   build-system = [ poetry-core ];

From e6d9ad5444f8e0b646a648fdc3cf467a4f1c41e7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:59 +0200
Subject: [PATCH 0964/3724] python3Packages.llama-index-vector-stores-chroma:
 0.4.2 -> 0.5.0

This commit was automatically generated using update-python-libraries.
---
 .../llama-index-vector-stores-chroma/default.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix
index 1fb8eaf7c126..53d96d53493f 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-chroma";
-  version = "0.4.2";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_vector_stores_chroma";
     inherit version;
-    hash = "sha256-F0YzgV4KiDiutiiBbiz10djG+PaEf0J+ADLTUHHq0ME=";
+    hash = "sha256-5gkwYvmBXeRxGBL1CoM5H/obYDTceap1TP00uv8SDs4=";
   };
 
   build-system = [ hatchling ];

From 779c01e2a58d8aefb35eccf9ac2a5a63802549a2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:59 +0200
Subject: [PATCH 0965/3724] python3Packages.llama-index-vector-stores-google:
 0.3.0 -> 0.4.0

This commit was automatically generated using update-python-libraries.
---
 .../llama-index-vector-stores-google/default.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix
index ca7b63b1c078..7449e0113e1a 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-google";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_vector_stores_google";
     inherit version;
-    hash = "sha256-6l4MFO7h5xJexN3Sf78F+OgzaKHNWxOffQvkqRhXEJw=";
+    hash = "sha256-EjokpP+46z/OwgmtQO4OnL+w4mUFR0M+2MmycojAc7E=";
   };
 
   pythonRelaxDeps = [ "google-generativeai" ];

From 01132231b3fc8c6f94f622d9dbace46b78d6f510 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:40:59 +0200
Subject: [PATCH 0966/3724] python3Packages.llama-index-vector-stores-postgres:
 0.5.5 -> 0.6.1

This commit was automatically generated using update-python-libraries.
---
 .../llama-index-vector-stores-postgres/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
index ae044cb1e4a4..ab54499442bf 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-postgres";
-  version = "0.5.5";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_vector_stores_postgres";
     inherit version;
-    hash = "sha256-R0dJXw6msPwO7kjsLLXyxSsmmAC64yviJZzb8YUbrlQ=";
+    hash = "sha256-E+PFvOTRO3FGGSwFwEUe0fEpmuE/fmRtiCGHwO53qm4=";
   };
 
   pythonRemoveDeps = [ "psycopg2-binary" ];

From 53dae8f802e5c146f50e22229ce4b931a6b14983 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:00 +0200
Subject: [PATCH 0967/3724] python3Packages.llama-index-vector-stores-qdrant:
 0.6.1 -> 0.7.1

This commit was automatically generated using update-python-libraries.
---
 .../llama-index-vector-stores-qdrant/default.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix
index d5cc82737303..b77fe1aeee91 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-qdrant";
-  version = "0.6.1";
+  version = "0.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_vector_stores_qdrant";
     inherit version;
-    hash = "sha256-14hQ/MCrwf1tucVprPbo2mLRuBWaHI0S515sbNB3Q1I=";
+    hash = "sha256-1RpWHcWq0nDEu+1yNwzqkALkty0AOOxbRl9rzbZ7EhM=";
   };
 
   build-system = [ hatchling ];

From 8063117a58a9963f920fd20100dd60e4912f86a3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:01 +0200
Subject: [PATCH 0968/3724] python3Packages.lm-eval: 0.4.8 -> 0.4.9.1

https://github.com/EleutherAI/lm-evaluation-harness/releases/tag/v0.4.9.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/lm-eval/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lm-eval/default.nix b/pkgs/development/python-modules/lm-eval/default.nix
index 63087a8505a0..ea57224a4d6c 100644
--- a/pkgs/development/python-modules/lm-eval/default.nix
+++ b/pkgs/development/python-modules/lm-eval/default.nix
@@ -46,14 +46,14 @@
 
 buildPythonPackage rec {
   pname = "lm-eval";
-  version = "0.4.8";
+  version = "0.4.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "EleutherAI";
     repo = "lm-evaluation-harness";
     tag = "v${version}";
-    hash = "sha256-F8oy6XTovqiU7FQyuubRsiblSdvfZg9RPIyzRw2GH18=";
+    hash = "sha256-N5NRRabjWxPchwOIkjqYTCKInCmVSY6T5cAmdxNbCkU=";
   };
 
   build-system = [

From 7d536b32d46ae13c335c5fa0959b53211c24817b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:01 +0200
Subject: [PATCH 0969/3724] python3Packages.lm-format-enforcer: 0.10.11 ->
 0.10.12

https://github.com/noamgat/lm-format-enforcer/releases/tag/v0.10.12

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/lm-format-enforcer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lm-format-enforcer/default.nix b/pkgs/development/python-modules/lm-format-enforcer/default.nix
index c44943046550..2086dcc17e90 100644
--- a/pkgs/development/python-modules/lm-format-enforcer/default.nix
+++ b/pkgs/development/python-modules/lm-format-enforcer/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "lm-format-enforcer";
-  version = "0.10.11";
+  version = "0.10.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "noamgat";
     repo = "lm-format-enforcer";
     tag = "v${version}";
-    hash = "sha256-8BsfA1R/X+wA0H0MqQKn+CljUIT8VdoInoczSGvu74o=";
+    hash = "sha256-7QNJtuRIuHHSXmiyO+6TDxswsbLET2ucXjhz0j7xTvQ=";
   };
 
   build-system = [ poetry-core ];

From bb70b6a96fe4efdb10c8dfd3c97c04243bb88021 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:02 +0200
Subject: [PATCH 0970/3724] python3Packages.lmdb: 1.6.2 -> 1.7.3

https://github.com/jnwatson/py-lmdb/blob/py-lmdb_1.7.3/ChangeLog

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/lmdb/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix
index f78b3fe2cf11..a97f71dad212 100644
--- a/pkgs/development/python-modules/lmdb/default.nix
+++ b/pkgs/development/python-modules/lmdb/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   setuptools,
+  patch-ng,
   pytestCheckHook,
   cffi,
   lmdb,
@@ -11,20 +12,24 @@
 
 buildPythonPackage rec {
   pname = "lmdb";
-  version = "1.6.2";
+  version = "1.7.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0o4/pZk1/2iIWHYOxS8gLsuMEImj9o0fFi6jB40VHnM=";
+    hash = "sha256-1KJ7evT+OPNAnZ+/v0e2F7PZTe6YoAvIwqgzbM0/mxU=";
   };
 
   build-system = [ setuptools ];
 
   buildInputs = [ lmdb ];
 
+  env.LMDB_FORCE_SYSTEM = 1;
+
+  dependencies = [ patch-ng ];
+
   pythonImportsCheck = [ "lmdb" ];
 
   nativeCheckInputs = [
@@ -32,8 +37,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  LMDB_FORCE_SYSTEM = 1;
-
   meta = {
     description = "Universal Python binding for the LMDB 'Lightning' Database";
     homepage = "https://github.com/dw/py-lmdb";

From 0980c6866ce208bf3f630f627890928205cd211a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:02 +0200
Subject: [PATCH 0971/3724] python3Packages.localstack-ext: 4.3.0 -> 4.7.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/localstack-ext/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix
index f1fa5ba5278f..0973bccb4157 100644
--- a/pkgs/development/python-modules/localstack-ext/default.nix
+++ b/pkgs/development/python-modules/localstack-ext/default.nix
@@ -21,13 +21,13 @@
 
 buildPythonPackage rec {
   pname = "localstack-ext";
-  version = "4.3.0";
+  version = "4.7.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "localstack_ext";
     inherit version;
-    hash = "sha256-YlKGdIteeIjqqO9L4BAfEEurOa7vrYaAmreH8gIRcPU=";
+    hash = "sha256-OLeCbAybP6SgHb2DNf8rXUrxt89mOiQfp2wxdh2A3F4=";
   };
 
   build-system = [

From 0c5bbee473da46c8426bb573535824533205fa84 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:03 +0200
Subject: [PATCH 0972/3724] python3Packages.locust: 2.33.1 -> 2.37.14

https://github.com/locustio/locust/blob/2.37.14/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/locust/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/locust/default.nix b/pkgs/development/python-modules/locust/default.nix
index 1d7056d38a80..2ed342d62a4f 100644
--- a/pkgs/development/python-modules/locust/default.nix
+++ b/pkgs/development/python-modules/locust/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "locust";
-  version = "2.33.1";
+  version = "2.37.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "locustio";
     repo = "locust";
     tag = version;
-    hash = "sha256-cOYdf3F1OF1P4xFEG3isuiePIl1tHnjL7UVoFIpb40A=";
+    hash = "sha256-16pMl72OIZlAi6jNx0qv0TO9RTm6O9CgiE84sndsEhc=";
   };
 
   postPatch = ''

From 8e5cd089ec7378e2cc1de4585fb1b6ad1b329137 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:03 +0200
Subject: [PATCH 0973/3724] python3Packages.loopy: 2025.1 -> 2025.2

https://github.com/inducer/loopy/releases/tag/v2025.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/loopy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/loopy/default.nix b/pkgs/development/python-modules/loopy/default.nix
index 0be0d9802eb9..4af0824f633a 100644
--- a/pkgs/development/python-modules/loopy/default.nix
+++ b/pkgs/development/python-modules/loopy/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "loopy";
-  version = "2025.1";
+  version = "2025.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "inducer";
     repo = "loopy";
     tag = "v${version}";
-    hash = "sha256-3Ebnje+EBw2Jdp2xLqffWx592OoUrSdRDXQkw6FpEzc=";
+    hash = "sha256-VgsUOMCIg61mYNDMcGpMs5I1CkobhUFVjoQFdD8Vchs=";
     fetchSubmodules = true; # submodule at `loopy/target/c/compyte`
   };
 

From afec46afffb5a8b12ddc451e951d2a69d24a8d3f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:04 +0200
Subject: [PATCH 0974/3724] python3Packages.lsprotocol: 2023.0.1 -> 2025.0.0

https://github.com/microsoft/lsprotocol/releases/tag/2025.0.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/lsprotocol/default.nix     | 37 ++++++++-----------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/lsprotocol/default.nix b/pkgs/development/python-modules/lsprotocol/default.nix
index 06e85fae1e73..fdb10e5dd3c5 100644
--- a/pkgs/development/python-modules/lsprotocol/default.nix
+++ b/pkgs/development/python-modules/lsprotocol/default.nix
@@ -7,15 +7,14 @@
   flit-core,
   importlib-resources,
   jsonschema,
-  nox,
   pyhamcrest,
-  pytest,
+  pytestCheckHook,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "lsprotocol";
-  version = "2023.0.1";
+  version = "2025.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,20 +23,23 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "lsprotocol";
     tag = version;
-    hash = "sha256-PHjLKazMaT6W4Lve1xNxm6hEwqE3Lr2m5L7Q03fqb68=";
+    hash = "sha256-DrWXHMgDZSQQ6vsmorThMrUTX3UQU+DajSEOdxoXrFQ=";
   };
 
-  nativeBuildInputs = [
+  postPatch = ''
+    pushd packages/python
+  '';
+
+  build-system = [
     flit-core
-    nox
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     cattrs
   ];
 
-  nativeCheckInputs = [ pytest ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   checkInputs = [
     importlib-resources
@@ -45,21 +47,12 @@ buildPythonPackage rec {
     pyhamcrest
   ];
 
-  preBuild = ''
-    cd packages/python
-  '';
+  disabledTests = [
+    "test_notebook_sync_options"
+  ];
 
   preCheck = ''
-    cd ../../
-  '';
-
-  checkPhase = ''
-    runHook preCheck
-
-    sed -i "/^    _install_requirements/d" noxfile.py
-    nox --session tests
-
-    runHook postCheck
+    popd
   '';
 
   pythonImportsCheck = [ "lsprotocol" ];
@@ -67,7 +60,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python implementation of the Language Server Protocol";
     homepage = "https://github.com/microsoft/lsprotocol";
-    changelog = "https://github.com/microsoft/lsprotocol/releases/tag/${version}";
+    changelog = "https://github.com/microsoft/lsprotocol/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [
       doronbehar

From cf65807870f077b0de90324a65f41947358cf131 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:04 +0200
Subject: [PATCH 0975/3724] python3Packages.luna-usb: 0.2.1 -> 0.2.2

https://github.com/greatscottgadgets/luna/releases/tag/0.2.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/luna-usb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/luna-usb/default.nix b/pkgs/development/python-modules/luna-usb/default.nix
index 313f626cd491..1ea097280ed0 100644
--- a/pkgs/development/python-modules/luna-usb/default.nix
+++ b/pkgs/development/python-modules/luna-usb/default.nix
@@ -20,14 +20,14 @@
 }:
 buildPythonPackage rec {
   pname = "luna-usb";
-  version = "0.2.1";
+  version = "0.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "luna";
     tag = version;
-    hash = "sha256-8onTF0iJF7HpNCjNxUg89YRjfYb94CrFgGtmprp7g2E=";
+    hash = "sha256-gySaNbebWUS8wS8adPQo1mT+jmdb+2ddlMckTa36JCY=";
   };
 
   postPatch = ''

From 1a8ae04591f8d84e5c4ec27cf8cc6fe5b8ae78f8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:05 +0200
Subject: [PATCH 0976/3724] python3Packages.lupa: 2.4 -> 2.5

https://github.com/scoder/lupa/blob/lupa-2.5/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/lupa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix
index a34a52b5988b..3acc709a3023 100644
--- a/pkgs/development/python-modules/lupa/default.nix
+++ b/pkgs/development/python-modules/lupa/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "lupa";
-  version = "2.4";
+  version = "2.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-UwDSH4GqG9TUX1XjHd26O4eYlWlgaKP4TPy1/ZFIqs0=";
+    hash = "sha256-acaonyt7CKMEDX7Soe7MujejHdyS+hmTOcU6KuPEjDQ=";
   };
 
   build-system = [

From 7e3ab7525ae0586349fbabd44fe67ddd05b47425 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:05 +0200
Subject: [PATCH 0977/3724] python3Packages.m2crypto: 0.45.0 -> 0.45.1

https://gitlab.com/m2crypto/m2crypto/-/blob/0.45.1/CHANGES

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/m2crypto/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix
index ca976b887cf6..da94945fa869 100644
--- a/pkgs/development/python-modules/m2crypto/default.nix
+++ b/pkgs/development/python-modules/m2crypto/default.nix
@@ -13,21 +13,15 @@
 
 buildPythonPackage rec {
   pname = "m2crypto";
-  version = "0.45.0";
+  version = "0.45.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/8ENTQmQFRT0CNx09gpNffIcROvJv3dslHv9xzWUIc8=";
+    hash = "sha256-0PyBqIKO2/QwhDKzBAvwa7JrrZWruefUaQthGFUeduw=";
   };
-  patches = [
-    (fetchurl {
-      url = "https://sources.debian.org/data/main/m/m2crypto/0.42.0-2.1/debian/patches/0004-swig-Workaround-for-reading-sys-select.h-ending-with.patch";
-      hash = "sha256-/Bkuqu/Od+S56AUWo0ZzpZF7FGMxP766K2GJnfKXrOI=";
-    })
-  ];
 
   build-system = [ setuptools ];
 

From 00a376148d814428712b398e5917341176a9082d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:06 +0200
Subject: [PATCH 0978/3724] python3Packages.mail-parser: 4.1.3 -> 4.1.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mail-parser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix
index 25466ec4ff7f..5f31ca8d35c5 100644
--- a/pkgs/development/python-modules/mail-parser/default.nix
+++ b/pkgs/development/python-modules/mail-parser/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "mail-parser";
-  version = "4.1.3";
+  version = "4.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SpamScope";
     repo = "mail-parser";
     tag = version;
-    hash = "sha256-aNPBWxAysxHTuzaupi/CSSBUsGTsFanuPldz6BRr2V0=";
+    hash = "sha256-wwLUD/k26utugK/Yx9eXYEdSOvrk0Cy6RkXGDnzZ+fE=";
   };
 
   LC_ALL = "en_US.utf-8";

From e778ec435a35a907c9866c44cf09c8400ab53ca6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:06 +0200
Subject: [PATCH 0979/3724] python3Packages.manifestoo-core: 1.9 -> 1.10

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/manifestoo-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix
index c9164c3bce05..8c5d9bebc78e 100644
--- a/pkgs/development/python-modules/manifestoo-core/default.nix
+++ b/pkgs/development/python-modules/manifestoo-core/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "manifestoo-core";
-  version = "1.9";
+  version = "1.10";
   format = "pyproject";
 
   src = fetchPypi {
     inherit version;
     pname = "manifestoo_core";
-    hash = "sha256-4cBgxbjXfOVMRQ+iQnjb/LdRUkoeb2hWI6VhSnqSMVM=";
+    hash = "sha256-LLxr96/cuAAncddMeBBVlFq2Hl5+pNXqgMbvbnfzcE8=";
   };
 
   nativeBuildInputs = [ hatch-vcs ];

From 61492ddc2f622931de409e8c914e53aed7c191d4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:07 +0200
Subject: [PATCH 0980/3724] python3Packages.mapclassify: 2.8.1 -> 2.10.0

https://github.com/pysal/mapclassify/releases/tag/v2.10.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mapclassify/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mapclassify/default.nix b/pkgs/development/python-modules/mapclassify/default.nix
index 7bf817fab321..ef30592b9b66 100644
--- a/pkgs/development/python-modules/mapclassify/default.nix
+++ b/pkgs/development/python-modules/mapclassify/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "mapclassify";
-  version = "2.8.1";
+  version = "2.10.0";
   pyproject = true;
   disabled = pythonOlder "3.9";
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "pysal";
     repo = "mapclassify";
     tag = "v${version}";
-    hash = "sha256-VClkMOR8P9sX3slVjJ2xYYLVnvZuOgVYZiCGrBxoZEc=";
+    hash = "sha256-OQpDrxa0zRPDAdyS6KP5enb/JZwbYoXTV8kUijV3tNM=";
   };
 
   build-system = [ setuptools-scm ];
@@ -59,7 +59,7 @@ buildPythonPackage rec {
   meta = {
     description = "Classification Schemes for Choropleth Maps";
     homepage = "https://pysal.org/mapclassify/";
-    changelog = "https://github.com/pysal/mapclassify/releases/tag/v${version}";
+    changelog = "https://github.com/pysal/mapclassify/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     teams = [ lib.teams.geospatial ];
   };

From 75bf77f5064d97fd11f4ecf6aab7373cf0aaa17a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:07 +0200
Subject: [PATCH 0981/3724] python3Packages.mariadb: 1.1.11 -> 1.1.13

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mariadb/default.nix b/pkgs/development/python-modules/mariadb/default.nix
index b4b20905dfd4..fde0be2c4c16 100644
--- a/pkgs/development/python-modules/mariadb/default.nix
+++ b/pkgs/development/python-modules/mariadb/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "mariadb";
-  version = "1.1.11";
+  version = "1.1.13";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "mariadb-corporation";
     repo = "mariadb-connector-python";
     tag = "v${version}";
-    hash = "sha256-f3WeVtsjxm/HVPv0cbpPkmklcNFWJaFqI2LxDElcCFw=";
+    hash = "sha256-BYE+W/P2/kPtbi6tzE1FQkI/KFCO5C1KQnB67XfJqkA=";
   };
 
   build-system = [ setuptools ];

From 5ba5547e49071db4cd2c0241701cd79892f59000 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:07 +0200
Subject: [PATCH 0982/3724] python3Packages.marimo: 0.13.6 -> 0.14.16

https://github.com/marimo-team/marimo/releases/tag/0.14.16

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/marimo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 69ba558d227d..267cfc589754 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -33,13 +33,13 @@
 
 buildPythonPackage rec {
   pname = "marimo";
-  version = "0.13.6";
+  version = "0.14.16";
   pyproject = true;
 
   # The github archive does not include the static assets
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Qsz0SJvWOJ/MH9eIMyBODCBCGC7vp2lzPsq+32tRKU8=";
+    hash = "sha256-8PKRrH+m+HyAcvQBnG6fY1rX77N+AhTyJUPI3ZgwQtE=";
   };
 
   build-system = [ hatchling ];

From 72f93808a868e40c7430d2737aa3b5a8a22b3fa1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:08 +0200
Subject: [PATCH 0983/3724] python3Packages.markdown: 3.8 -> 3.8.2

https://github.com/Python-Markdown/markdown/blob/3.8.2/docs/changelog.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/markdown/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix
index 87020cb9e10f..39f3dda5f21e 100644
--- a/pkgs/development/python-modules/markdown/default.nix
+++ b/pkgs/development/python-modules/markdown/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+  fetchpatch,
   importlib-metadata,
   pyyaml,
   setuptools,
@@ -11,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "markdown";
-  version = "3.8";
+  version = "3.8.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,9 +21,16 @@ buildPythonPackage rec {
     owner = "Python-Markdown";
     repo = "markdown";
     tag = version;
-    hash = "sha256-H1xvDM2ShiPbfcpW+XGrxCxtaRFVaquuMuGg1RhjeNA=";
+    hash = "sha256-L5OTjllMUrpsKZbK+EHcqlua/6I4onJvRC3povbHgfY=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/Python-Markdown/markdown/commit/23c301de28e12426408656efdfa153b11d4ff558.patch";
+      hash = "sha256-85HP97iL1umG60jwUgfnHvKHYmws5FSL0xfgZF95aiQ=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = lib.optionals (pythonOlder "3.10") [ importlib-metadata ];

From 2175ae407823f41a78e120d634759afe3dd21e1d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:08 +0200
Subject: [PATCH 0984/3724] python3Packages.mashumaro: 3.15 -> 3.16

https://github.com/Fatal1ty/mashumaro/releases/tag/v3.16

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mashumaro/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix
index e9e06355a552..d0acb1d790d8 100644
--- a/pkgs/development/python-modules/mashumaro/default.nix
+++ b/pkgs/development/python-modules/mashumaro/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Serialization library on top of dataclasses";
     homepage = "https://github.com/Fatal1ty/mashumaro";
-    changelog = "https://github.com/Fatal1ty/mashumaro/releases/tag/v${version}";
+    changelog = "https://github.com/Fatal1ty/mashumaro/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ tjni ];
   };

From 366aa8382be99d51545a5c932c6feacbb5e5965c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:09 +0200
Subject: [PATCH 0985/3724] python3Packages.maxminddb: 2.6.3 -> 2.8.2

https://github.com/maxmind/MaxMind-DB-Reader-python/blob/v2.8.2/HISTORY.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/maxminddb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix
index 25de18f228a2..df4ea5f300a9 100644
--- a/pkgs/development/python-modules/maxminddb/default.nix
+++ b/pkgs/development/python-modules/maxminddb/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "maxminddb";
-  version = "2.6.3";
+  version = "2.8.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0sOAa6p6oEeqG6x0GefjU9tDX4jwnVEQaoTbrPZF0lQ=";
+    hash = "sha256-JqjlNiKNjMKMW49XSlcaJwS+/OOzaM7KWTp21WtlkPk=";
   };
 
   buildInputs = [ libmaxminddb ];

From d171e175d7361453b7deb109e05319ee6a2fe4bf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:10 +0200
Subject: [PATCH 0986/3724] python3Packages.mdtraj: 1.10.3 -> 1.11.0

https://github.com/mdtraj/mdtraj/releases/tag/1.11.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mdtraj/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix
index 6d8afed4ab34..fcbc8f4c931c 100644
--- a/pkgs/development/python-modules/mdtraj/default.nix
+++ b/pkgs/development/python-modules/mdtraj/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "mdtraj";
-  version = "1.10.3";
+  version = "1.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mdtraj";
     repo = "mdtraj";
     tag = version;
-    hash = "sha256-xmxVPF6GhZpyuTxdmxB7mkfrDb1FIh9Z3obgUOdQmrw=";
+    hash = "sha256-Re8noXZGT+WEW8HzdoHSsr52R06TzLPzfPzHdvweRdQ=";
   };
 
   patches = [

From 8e44b14dfac60bbe6bbe08d5f93d9ec458ed8b4d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:11 +0200
Subject: [PATCH 0987/3724] python3Packages.mesa: 3.1.5 -> 3.2.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix
index e34ce49d24ec..c26bf68c8582 100644
--- a/pkgs/development/python-modules/mesa/default.nix
+++ b/pkgs/development/python-modules/mesa/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "mesa";
-  version = "3.1.5";
+  version = "3.2.0";
   format = "setuptools";
 
   # According to their docs, this library is for Python 3+.
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "mesa";
     inherit version;
-    hash = "sha256-ZXWQrCwA8PCRNBGpVNxXrpxfx5wMtKPH2djmxqRwwdA=";
+    hash = "sha256-k4UjkUGL4qDgOhucQU7svRNZtM3ZqtO6NUxpl4NhQl0=";
   };
 
   propagatedBuildInputs = [

From 6e55da05723f81e5fcae172debe84b31dd2a71a1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:12 +0200
Subject: [PATCH 0988/3724] python3Packages.mezzanine: 6.0.0 -> 6.1.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mezzanine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix
index d7f21ee8e2a6..c28ab57e67f8 100644
--- a/pkgs/development/python-modules/mezzanine/default.nix
+++ b/pkgs/development/python-modules/mezzanine/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "mezzanine";
-  version = "6.0.0";
+  version = "6.1.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7" || isPyPy;
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Mezzanine";
     inherit version;
-    hash = "sha256-R/PB4PFQpVp6jnCasyPszgC294SKjLzq2oMkR2qV86s=";
+    hash = "sha256-RZ/9ltvZUz1eXxeaVqS9ZE69+a9XWt6fxMcss+yTVP4=";
   };
 
   buildInputs = [

From ff1f90086e9159bc4f8608be4676e12f381a1995 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:12 +0200
Subject: [PATCH 0989/3724] 
 python3Packages.microsoft-kiota-authentication-azure: 1.9.3 -> 1.9.5

https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-authentication-azure-microsoft-kiota-serialization-text-v1.9.5

This commit was automatically generated using update-python-libraries.
---
 .../microsoft-kiota-authentication-azure/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
index 49a6c420de00..6a32370d1fdf 100644
--- a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "microsoft-kiota-authentication-azure";
-  version = "1.9.3";
+  version = "1.9.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "kiota-python";
     tag = "microsoft-kiota-serialization-text-v${version}";
-    hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8=";
+    hash = "sha256-h0sZhBIGZyhzYtCvLHRAn73HspgyOAKU3p4xSn+uXFU=";
   };
 
   sourceRoot = "${src.name}/packages/authentication/azure/";

From 6536827e82c3547c51c97a11261d097102579336 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:13 +0200
Subject: [PATCH 0990/3724] python3Packages.microsoft-kiota-http: 1.9.4 ->
 1.9.5

https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-http-microsoft-kiota-serialization-text-v1.9.5

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/microsoft-kiota-http/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix
index b0633edf960e..2184b1b5378e 100644
--- a/pkgs/development/python-modules/microsoft-kiota-http/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "microsoft-kiota-http";
-  version = "1.9.4";
+  version = "1.9.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "kiota-python";
     tag = "microsoft-kiota-serialization-text-v${version}";
-    hash = "sha256-59vuJc7Wb/6PsPA4taAFA2UK8bdz+raZ+NB4S8LahtM=";
+    hash = "sha256-h0sZhBIGZyhzYtCvLHRAn73HspgyOAKU3p4xSn+uXFU=";
   };
 
   sourceRoot = "${src.name}/packages/http/httpx/";

From 60270cf714928e01fcaf06bac46bf9a6fc46eb9c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:13 +0200
Subject: [PATCH 0991/3724] python3Packages.microsoft-kiota-serialization-form:
 1.9.3 -> 1.9.5

https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-form-microsoft-kiota-serialization-text-v1.9.5

This commit was automatically generated using update-python-libraries.
---
 .../microsoft-kiota-serialization-form/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix
index 3436f98d41e6..925e3a068bad 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "microsoft-kiota-serialization-form";
-  version = "1.9.3";
+  version = "1.9.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-python";
-    tag = "microsoft-kiota-serialization-form-v${version}";
-    hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8=";
+    tag = "microsoft-kiota-serialization-text-v${version}";
+    hash = "sha256-h0sZhBIGZyhzYtCvLHRAn73HspgyOAKU3p4xSn+uXFU=";
   };
 
   sourceRoot = "${src.name}/packages/serialization/form/";

From 0407c4dcbc63c6c740d7e2e4803a49ad3f58ba4a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:14 +0200
Subject: [PATCH 0992/3724] python3Packages.microsoft-kiota-serialization-json:
 1.9.3 -> 1.9.5

https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-json-microsoft-kiota-serialization-text-v1.9.5

This commit was automatically generated using update-python-libraries.
---
 .../microsoft-kiota-serialization-json/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
index d7aef7c3100e..3efa60b16cf8 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "microsoft-kiota-serialization-json";
-  version = "1.9.3";
+  version = "1.9.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-python";
-    tag = "microsoft-kiota-serialization-json-v${version}";
-    hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8=";
+    tag = "microsoft-kiota-serialization-text-v${version}";
+    hash = "sha256-h0sZhBIGZyhzYtCvLHRAn73HspgyOAKU3p4xSn+uXFU=";
   };
 
   sourceRoot = "${src.name}/packages/serialization/json/";

From 346fbb7a483e494640877e8d6110c1baaaf4f79e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:14 +0200
Subject: [PATCH 0993/3724] 
 python3Packages.microsoft-kiota-serialization-multipart: 1.9.3 -> 1.9.5

https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-multipart-microsoft-kiota-serialization-text-v1.9.5

This commit was automatically generated using update-python-libraries.
---
 .../microsoft-kiota-serialization-multipart/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix
index eee939de8263..02a73cf76780 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "microsoft-kiota-serialization-multipart";
-  version = "1.9.3";
+  version = "1.9.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-python";
-    tag = "microsoft-kiota-serialization-multipart-v${version}";
-    hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8=";
+    tag = "microsoft-kiota-serialization-text-v${version}";
+    hash = "sha256-h0sZhBIGZyhzYtCvLHRAn73HspgyOAKU3p4xSn+uXFU=";
   };
 
   sourceRoot = "${src.name}/packages/serialization/multipart/";

From 241845703cacc689faea3a1d49b9c816739ac38a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:15 +0200
Subject: [PATCH 0994/3724] python3Packages.microsoft-kiota-serialization-text:
 1.9.3 -> 1.9.5

https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-text-microsoft-kiota-serialization-text-v1.9.5

This commit was automatically generated using update-python-libraries.
---
 .../microsoft-kiota-serialization-text/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix
index 4fc7fb84b474..4f627b3ee53d 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "microsoft-kiota-serialization-text";
-  version = "1.9.3";
+  version = "1.9.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "kiota-python";
     tag = "microsoft-kiota-serialization-text-v${version}";
-    hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8=";
+    hash = "sha256-h0sZhBIGZyhzYtCvLHRAn73HspgyOAKU3p4xSn+uXFU=";
   };
 
   sourceRoot = "${src.name}/packages/serialization/text/";

From c332145d3fe384d3c6a61d248c6a07070a5edaf9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:15 +0200
Subject: [PATCH 0995/3724] python3Packages.mindsdb-evaluator: 0.0.16 -> 0.0.18

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mindsdb-evaluator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix
index 3abef9cf4cda..2f7b18a34653 100644
--- a/pkgs/development/python-modules/mindsdb-evaluator/default.nix
+++ b/pkgs/development/python-modules/mindsdb-evaluator/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "mindsdb-evaluator";
-  version = "0.0.16";
+  version = "0.0.18";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "mindsdb_evaluator";
     inherit version;
-    hash = "sha256-92XGu6ob1AfOoqcB/hqDf+lSDAUjZ5SPju5FkpcbOHA=";
+    hash = "sha256-UGg7P/OKmRi70z2roRBsA95FAXm7CG+TdPzTRy7+p4w=";
   };
 
   build-system = [ poetry-core ];

From 22a1f1a15ce0857d57f8e748b31c0cbf65df8f01 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:15 +0200
Subject: [PATCH 0996/3724] python3Packages.minikanren: 1.0.3 -> 1.0.5

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/minikanren/default.nix     | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/minikanren/default.nix b/pkgs/development/python-modules/minikanren/default.nix
index 9e28d4c6bb8d..911b6edbbd65 100644
--- a/pkgs/development/python-modules/minikanren/default.nix
+++ b/pkgs/development/python-modules/minikanren/default.nix
@@ -10,21 +10,28 @@
   py,
   pytestCheckHook,
   pytest-html,
+  setuptools,
+  setuptools-scm,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "minikanren";
-  version = "1.0.3";
-  format = "setuptools";
+  version = "1.0.5";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pythological";
     repo = "kanren";
-    rev = "5aa9b1734cbb3fe072a7c72b46e1b72a174d28ac";
-    hash = "sha256-daAtREgm91634Q0mc0/WZivDiyZHC7TIRoGRo8hMnGE=";
+    tag = "v${version}";
+    hash = "sha256-lCQ0mKT99zK5A74uoo/9bP+eFdm3MC43Fh8+P2krXrs=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
     toolz
     cons
     multipledispatch
@@ -48,7 +55,7 @@ buildPythonPackage {
   meta = with lib; {
     description = "Relational programming in Python";
     homepage = "https://github.com/pythological/kanren";
-    changelog = "https://github.com/pythological/kanren/releases";
+    changelog = "https://github.com/pythological/kanren/releases/tag/${src.tag}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ Etjean ];
   };

From 06c72a45d4c52d3f4c973837fb2adf3f742fa711 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:16 +0200
Subject: [PATCH 0997/3724] python3Packages.mistral-common: 1.5.6 -> 1.8.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mistral-common/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mistral-common/default.nix b/pkgs/development/python-modules/mistral-common/default.nix
index 2c6b42a76333..e245f5b7e524 100644
--- a/pkgs/development/python-modules/mistral-common/default.nix
+++ b/pkgs/development/python-modules/mistral-common/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "mistral-common";
-  version = "1.5.6";
+  version = "1.8.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "mistral_common";
     inherit version;
-    hash = "sha256-TauSQwaEMhFKFfLEb/SRagViCnIrDfjetJ3POD+34r8=";
+    hash = "sha256-DRl52CIntiX21xs8goF28FnajQ9aMwfN9TtIQJo5cKQ=";
   };
 
   pythonRelaxDeps = [

From 4ee414fd2eea89903b126999dd0541913e46677d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:17 +0200
Subject: [PATCH 0998/3724] python3Packages.mkdocs-material: 9.6.15 -> 9.6.16

https://github.com/squidfunk/mkdocs-material/blob/9.6.16/CHANGELOG

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mkdocs-material/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix
index f7ad8267ef8c..3717e7e03b89 100644
--- a/pkgs/development/python-modules/mkdocs-material/default.nix
+++ b/pkgs/development/python-modules/mkdocs-material/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-material";
-  version = "9.6.15";
+  version = "9.6.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "squidfunk";
     repo = "mkdocs-material";
     tag = version;
-    hash = "sha256-EksLvPl/VfGSufdqgWlQTd6kz07/pTIAOz7hMBdy8Ro=";
+    hash = "sha256-wGzrlDf6bJFIfJXlCMlOQvRlpOcDXeMVY2/GRjOG1H4=";
   };
 
   nativeBuildInputs = [
@@ -60,6 +60,8 @@ buildPythonPackage rec {
     requests
   ];
 
+  pythonRelaxDeps = [ "backrefs" ];
+
   optional-dependencies = {
     recommended = [
       mkdocs-minify-plugin

From a27479ac74a1152d248047a37b1cd15c5d32ad66 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:17 +0200
Subject: [PATCH 0999/3724] python3Packages.mkdocs-swagger-ui-tag: 0.6.11 ->
 0.7.1

https://github.com/blueswen/mkdocs-swagger-ui-tag/blob/v0.7.1/CHANGELOG

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/mkdocs-swagger-ui-tag/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
index 095300fa5846..e3174f10b0ad 100644
--- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
+++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-swagger-ui-tag";
-  version = "0.6.11";
+  version = "0.7.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "Blueswen";
     repo = "mkdocs-swagger-ui-tag";
     tag = "v${version}";
-    hash = "sha256-hxf7onjH26QsdB19r71NSC/67u+pEYdJo3e4OvWGgtI=";
+    hash = "sha256-zn+ASunOiAg/kxsvaHUYKuWc5UZ406RO/LSQ+qkAEn0=";
   };
 
   propagatedBuildInputs = [
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "MkDocs plugin supports for add Swagger UI in page";
     homepage = "https://github.com/Blueswen/mkdocs-swagger-ui-tag";
-    changelog = "https://github.com/blueswen/mkdocs-swagger-ui-tag/blob/v${version}/CHANGELOG";
+    changelog = "https://github.com/blueswen/mkdocs-swagger-ui-tag/blob/${src.tag}/CHANGELOG";
     license = licenses.mit;
     maintainers = with maintainers; [ snpschaaf ];
   };

From 186d03422c9a5d80382ee7819342ec6a20f27341 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:18 +0200
Subject: [PATCH 1000/3724] python3Packages.mkl-service: 2.4.2 -> 2.5.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mkl-service/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix
index a437f066f4b0..07e7a870b38d 100644
--- a/pkgs/development/python-modules/mkl-service/default.nix
+++ b/pkgs/development/python-modules/mkl-service/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "mkl-service";
-  version = "2.4.2";
+  version = "2.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "IntelPython";
     repo = "mkl-service";
     tag = "v${version}";
-    hash = "sha256-o5mjZhqQc7tu44EjrScuGzv6pZNlnZnndMIAhl8pY5o=";
+    hash = "sha256-uP4TzBLhlpT83FIYCjolP3QN5/90YjBOnauy780gUJc=";
   };
 
   build-system = [

From 05fed8b5bdd205b008ef78a633ae7cb2c9df9eda Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:18 +0200
Subject: [PATCH 1001/3724] python3Packages.mlcroissant: 1.0.17 -> 1.0.21

https://github.com/mlcommons/croissant/releases/tag/v1.0.21

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mlcroissant/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mlcroissant/default.nix b/pkgs/development/python-modules/mlcroissant/default.nix
index 96bf7b6dc9f6..510c7d617ace 100644
--- a/pkgs/development/python-modules/mlcroissant/default.nix
+++ b/pkgs/development/python-modules/mlcroissant/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "mlcroissant";
-  version = "1.0.17";
+  version = "1.0.21";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mlcommons";
     repo = "croissant";
     tag = "v${version}";
-    hash = "sha256-jiyr8x+YRSsRwOVxDPaWemPqglTKVb5jg4rRzUXd3BE=";
+    hash = "sha256-yUAF/NQHz8WUIaIIsqOwTMppl5+EZhURFpHnde9OOpE=";
   };
 
   sourceRoot = "${src.name}/python/mlcroissant";
@@ -89,7 +89,7 @@ buildPythonPackage rec {
   meta = {
     description = "High-level format for machine learning datasets that brings together four rich layers";
     homepage = "https://github.com/mlcommons/croissant";
-    changelog = "https://github.com/mlcommons/croissant/releases/tag/v${version}";
+    changelog = "https://github.com/mlcommons/croissant/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ GaetanLepage ];
     platforms = lib.platforms.all;

From 44f3b4dea65cfd2c3c4a5e8343b4e2a39759ce4e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:19 +0200
Subject: [PATCH 1002/3724] python3Packages.mlflow: 2.20.3 -> 3.1.4

https://github.com/mlflow/mlflow/blob/v3.1.4/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mlflow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index bc36ab6d3465..3abe96a35935 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -71,14 +71,14 @@
 
 buildPythonPackage rec {
   pname = "mlflow";
-  version = "2.20.3";
+  version = "3.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mlflow";
     repo = "mlflow";
     tag = "v${version}";
-    hash = "sha256-kgohENAx5PpLQ9pBfl/zSq65l/DqJfufBf0gWR1WJHY=";
+    hash = "sha256-GU1CVwc31bLai8QoXch/UTx//+OG2V/6jG9Ocz4MDuA=";
   };
 
   pythonRelaxDeps = [

From 121c40dc416c286d79ee40897ccced2b64ad5082 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:19 +0200
Subject: [PATCH 1003/3724] python3Packages.mlx-lm: 0.26.0 -> 0.26.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mlx-lm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mlx-lm/default.nix b/pkgs/development/python-modules/mlx-lm/default.nix
index e724bb22ff16..214232169490 100644
--- a/pkgs/development/python-modules/mlx-lm/default.nix
+++ b/pkgs/development/python-modules/mlx-lm/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "mlx-lm";
-  version = "0.26.0";
+  version = "0.26.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ml-explore";
     repo = "mlx-lm";
     tag = "v${version}";
-    hash = "sha256-J69XIqsjQ4sQqhx+EkjKcVXVlQ4A4PGJvICSiCfoSOA=";
+    hash = "sha256-D5csHfkmIM01PkCMT+DDJ2+6as6eVdKNvvHzXcVqdEY=";
   };
 
   build-system = [

From 01c2758ca3f84bfde546892795c418b4efcd5a2e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:20 +0200
Subject: [PATCH 1004/3724] python3Packages.mocket: 3.13.4 -> 3.13.10

https://github.com/mindflayer/python-mocket/releases/tag/3.13.10

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mocket/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index 7dac034861b0..7c0ae8c4335b 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -36,12 +36,12 @@
 
 buildPythonPackage rec {
   pname = "mocket";
-  version = "3.13.4";
+  version = "3.13.10";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KoZ2V0M4ezW58c65wc9vJHrYMZ2ywKUjCOietKYS94Q=";
+    hash = "sha256-MnFH77ryrLyu//IH6FYb3ZVFlsdkimJKzKGbDH1sgmw=";
   };
 
   build-system = [ hatchling ];

From 62f49c07c2448aeb44bbf8c774218fd795c28493 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:21 +0200
Subject: [PATCH 1005/3724] python3Packages.modelcif: 1.3 -> 1.4

https://github.com/ihmwg/python-modelcif/blob/1.4/ChangeLog.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/modelcif/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/modelcif/default.nix b/pkgs/development/python-modules/modelcif/default.nix
index e8b03321620f..242986272bc5 100644
--- a/pkgs/development/python-modules/modelcif/default.nix
+++ b/pkgs/development/python-modules/modelcif/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "modelcif";
-  version = "1.3";
+  version = "1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ihmwg";
     repo = "python-modelcif";
     tag = version;
-    hash = "sha256-3wuKD6oQp3QdsWRpYsnC5IPpVRcQVDERSClEKJko3dg=";
+    hash = "sha256-Uj6E25uqFdCo2lGf0Cmhc7rs3Rwj7vkpe2G0uhv53gc=";
   };
 
   build-system = [
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python package for handling ModelCIF mmCIF and BinaryCIF files";
     homepage = "https://github.com/ihmwg/python-modelcif";
-    changelog = "https://github.com/ihmwg/python-modelcif/blob/${src.rev}/ChangeLog.rst";
+    changelog = "https://github.com/ihmwg/python-modelcif/blob/${src.tag}/ChangeLog.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ natsukium ];
   };

From 60c1010f4e02a755180c88b501ac4a355cb3d23b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:21 +0200
Subject: [PATCH 1006/3724] python3Packages.monai-deploy: 0.5.1 -> 3.0.0

https://github.com/Project-MONAI/monai-deploy-app-sdk/blob/main/docs/source/release_notes/3.0.0.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/monai-deploy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/monai-deploy/default.nix b/pkgs/development/python-modules/monai-deploy/default.nix
index fc5982711dfa..3ae67044ff93 100644
--- a/pkgs/development/python-modules/monai-deploy/default.nix
+++ b/pkgs/development/python-modules/monai-deploy/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "monai-deploy";
-  version = "0.5.1";
+  version = "3.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "Project-MONAI";
     repo = "monai-deploy-app-sdk";
     tag = version;
-    hash = "sha256-a5WtU+1XjsYsXB/uZS8ufE0fOOWDf+Wy7mOX2xPEQEg=";
+    hash = "sha256-W2GXVd4gWgfGLjXR+8m/Ztm52Agj4FGWtEFrh4mjYk0=";
   };
 
   postPatch = ''
@@ -68,7 +68,7 @@ buildPythonPackage rec {
     description = "Framework and tools to design, develop and verify AI applications in healthcare imaging";
     mainProgram = "monai-deploy";
     homepage = "https://monai.io/deploy.html";
-    changelog = "https://github.com/Project-MONAI/monai-deploy-app-sdk/blob/main/docs/source/release_notes/v${version}.md";
+    changelog = "https://github.com/Project-MONAI/monai-deploy-app-sdk/blob/main/docs/source/release_notes/${src.tag}.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ bcdarwin ];
   };

From 32b6b9d592300dc110f2cec3d5e2a9ff14771b80 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:22 +0200
Subject: [PATCH 1007/3724] python3Packages.motor: 3.7.0 -> 3.7.1

https://github.com/mongodb/motor/releases/tag/3.7.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/motor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix
index f0d13adab90e..d62180f93e19 100644
--- a/pkgs/development/python-modules/motor/default.nix
+++ b/pkgs/development/python-modules/motor/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "motor";
-  version = "3.7.0";
+  version = "3.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "motor";
     tag = version;
-    hash = "sha256-O3MHVzL/ECO0vnzJItXTDmmMN8aicbvh0Sve/HlAlZw=";
+    hash = "sha256-ul2GKzSiAewwGEuCpQQ61h3cqrJikaJeKs5KlX+aAjo=";
   };
 
   build-system = [

From 5c34f58a30f2c22f5326631be37d1ae9eb08f617 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:22 +0200
Subject: [PATCH 1008/3724] python3Packages.mozjpeg_lossless_optimization:
 1.3.0 -> 1.3.1

https://github.com/wanadev/mozjpeg-lossless-optimization/releases/tag/v1.3.1

This commit was automatically generated using update-python-libraries.
---
 .../mozjpeg_lossless_optimization/default.nix             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix b/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix
index 684d15400c4a..51353639a647 100644
--- a/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix
+++ b/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix
@@ -12,15 +12,15 @@
 }:
 buildPythonPackage rec {
   pname = "mozjpeg_lossless_optimization";
-  version = "1.3.0";
+  version = "1.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "wanadev";
     repo = "mozjpeg-lossless-optimization";
     # https://github.com/NixOS/nixpkgs/issues/26302
-    rev = "refs/tags/v${version}";
-    hash = "sha256-g2+QpV3F7wtu37qRJlA4a5r1J9yuJZcC99fDDy03JqU=";
+    tag = "v${version}";
+    hash = "sha256-HAOmD87oazwlGx1O+tAV5qzSn4EHbzeYQ5e8kmegwbo=";
     fetchSubmodules = true;
   };
 
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to optimize JPEGs losslessly using MozJPEG";
     homepage = "https://github.com/wanadev/mozjpeg-lossless-optimization";
-    changelog = "https://github.com/wanadev/mozjpeg-lossless-optimization/releases/tag/v${version}";
+    changelog = "https://github.com/wanadev/mozjpeg-lossless-optimization/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.adfaure ];
   };

From bf3623b84133b4cee164a3353aeb119da1a650a1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:23 +0200
Subject: [PATCH 1009/3724] python3Packages.mpi4py: 4.0.3 -> 4.1.0

https://github.com/mpi4py/mpi4py/blob/4.1.0/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mpi4py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index bf894a84e568..202ba506dfe1 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "mpi4py";
-  version = "4.0.3";
+  version = "4.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     repo = "mpi4py";
     owner = "mpi4py";
     tag = version;
-    hash = "sha256-eN/tjlnNla6RHYOXcprVVqtec1nwCEGn+MBcV/5mHJg=";
+    hash = "sha256-Hm+x79utOrjAbprud2MECgakyOzgShSwNuoyZUcTluQ=";
   };
 
   build-system = [

From 724db90d26b43b988d87ab933214405456053364 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:23 +0200
Subject: [PATCH 1010/3724] python3Packages.mpl-typst: 0.1.0 -> 0.2.1

https://github.com/daskol/mpl-typst/releases/tag/v0.2.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mpl-typst/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mpl-typst/default.nix b/pkgs/development/python-modules/mpl-typst/default.nix
index 040807fde8cd..c2d0d1ffc697 100644
--- a/pkgs/development/python-modules/mpl-typst/default.nix
+++ b/pkgs/development/python-modules/mpl-typst/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "mpl-typst";
-  version = "0.1.0";
+  version = "0.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "daskol";
     repo = "mpl-typst";
     tag = "v${version}";
-    hash = "sha256-Pm5z4tkpgwjYtpBh9+AJWlsHl7HNGxyftfaNSwQDpdk=";
+    hash = "sha256-lkO4BTo3duNAsppTjteeBuzgSJL/UnKVW2QXgrfVrqM=";
   };
 
   build-system = [
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   meta = {
     description = "Typst backend for matplotlib";
     homepage = "https://github.com/daskol/mpl-typst";
-    changelog = "https://github.com/daskol/mpl-typst/releases/tag/v${version}";
+    changelog = "https://github.com/daskol/mpl-typst/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ genga898 ];
   };

From 5f4aa08a2072d9770cb479becac05297aa76db05 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:24 +0200
Subject: [PATCH 1011/3724] python3Packages.mplhep: 0.3.59 -> 0.4.0

https://github.com/scikit-hep/mplhep/releases/tag/v0.4.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mplhep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix
index c34460357977..36729e8c5285 100644
--- a/pkgs/development/python-modules/mplhep/default.nix
+++ b/pkgs/development/python-modules/mplhep/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "mplhep";
-  version = "0.3.59";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "mplhep";
     tag = "v${version}";
-    hash = "sha256-Xanj2AkFRq/zu2ntTHVt1QkikN0bYfRcBj6CBho15os=";
+    hash = "sha256-VpdhgFUX1qUiUT5HlA2j3QQv7s3bF671e1I53MsML8w=";
   };
 
   build-system = [

From d7f633e8a928d5fd443ed323903340d7d782068e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:24 +0200
Subject: [PATCH 1012/3724] python3Packages.mrsqm: 0.0.7 -> 4

https://github.com/mlgig/mrsqm/releases/tag/v.r4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mrsqm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix
index e6828479a5dd..e8a2a0ffea8b 100644
--- a/pkgs/development/python-modules/mrsqm/default.nix
+++ b/pkgs/development/python-modules/mrsqm/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "mrsqm";
-  version = "0.0.7";
+  version = "4";
   pyproject = true;
 
   build-system = [
@@ -28,8 +28,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mlgig";
     repo = "mrsqm";
-    tag = "v.${version}";
-    hash = "sha256-5K6vCU0HExnmYNThZNDCbEtII9bUGauxDtKkJXe/85Q=";
+    tag = "r${version}";
+    hash = "sha256-59f18zItV3K6tXcg1v1q2Z8HYrQB8T0ntaaqjxeAEbM=";
   };
 
   buildInputs = [ fftw ];

From d063c7268659d77ae9557f6152689be3a00aaad6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:24 +0200
Subject: [PATCH 1013/3724] python3Packages.msal: 1.32.3 -> 1.33.0

https://github.com/AzureAD/microsoft-authentication-library-for-python/releases/tag/1.33.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/msal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix
index 955c4f97a85b..2d570ab0d594 100644
--- a/pkgs/development/python-modules/msal/default.nix
+++ b/pkgs/development/python-modules/msal/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "msal";
-  version = "1.32.3";
+  version = "1.33.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XuoDhonHilpwyo7L4SRUWLVahXvQlu+2mJxpuhWYXTU=";
+    hash = "sha256-g2rYD6o+JafXEBXJkM5h9wSocyix5zvLsGI6GMvxdRA=";
   };
 
   build-system = [ setuptools ];

From 9e34830ae986fe00e5e08375baf7c47ed2ac36ab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:25 +0200
Subject: [PATCH 1014/3724] python3Packages.msgpack: 1.1.0 -> 1.1.1

https://github.com/msgpack/msgpack-python/blob/v1.1.1/ChangeLog.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/msgpack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix
index ea30f58d8109..36f886ad7609 100644
--- a/pkgs/development/python-modules/msgpack/default.nix
+++ b/pkgs/development/python-modules/msgpack/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "msgpack";
-  version = "1.1.0";
+  version = "1.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "msgpack";
     repo = "msgpack-python";
     tag = "v${version}";
-    hash = "sha256-yKQcQi0oSJ33gzsx1Q6ME3GbuSaHR091n7maU6F5QlU=";
+    hash = "sha256-j1MpdnfG6tCgAFlza64erMhJm/MkSK2QnixNv7MrQes=";
   };
 
   build-system = [ setuptools ];
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "MessagePack serializer implementation";
     homepage = "https://github.com/msgpack/msgpack-python";
-    changelog = "https://github.com/msgpack/msgpack-python/blob/v${version}/ChangeLog.rst";
+    changelog = "https://github.com/msgpack/msgpack-python/blob/${src.tag}/ChangeLog.rst";
     license = licenses.asl20;
     maintainers = with maintainers; [ nickcao ];
   };

From 0bff3bc7c97a543d8066c18f04d0e574656e774f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:25 +0200
Subject: [PATCH 1015/3724] python3Packages.msgraph-core: 1.3.4 -> 1.3.5

https://github.com/microsoftgraph/msgraph-sdk-python-core/releases/tag/v1.3.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/msgraph-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix
index a684239a6d01..235a8be3a46a 100644
--- a/pkgs/development/python-modules/msgraph-core/default.nix
+++ b/pkgs/development/python-modules/msgraph-core/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "msgraph-core";
-  version = "1.3.4";
+  version = "1.3.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python-core";
     tag = "v${version}";
-    hash = "sha256-F3vZUglO0AvWZPwV8329Wrd5S4PHShBv8Gg3Jvsz6Kk=";
+    hash = "sha256-0ey8sV0JDuOjdrOeO/hRxZ847DMcWai0B/YUWZ1VJ48=";
   };
 
   build-system = [ setuptools ];

From 9df3de438fcd94740a63f578df7388d42cde093f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:26 +0200
Subject: [PATCH 1016/3724] python3Packages.multipart: 1.2.1 -> 1.3.0

https://github.com/defnull/multipart/blob/v1.3.0/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/multipart/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/multipart/default.nix b/pkgs/development/python-modules/multipart/default.nix
index 587c2e3aa109..4eb143a42c57 100644
--- a/pkgs/development/python-modules/multipart/default.nix
+++ b/pkgs/development/python-modules/multipart/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "multipart";
-  version = "1.2.1";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "defnull";
     repo = "multipart";
     tag = "v${version}";
-    hash = "sha256-mQMv5atWrWpwyY9YYjaRYNDm5AfW54drPSKL7qiae+I=";
+    hash = "sha256-6vlyoi4nayZOKyfO4jbKNzUy7G6K7mySYzkqfp+45O4=";
   };
 
   build-system = [ flit-core ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "multipart" ];
 
   meta = {
-    changelog = "https://github.com/defnull/multipart/blob/${src.rev}/CHANGELOG.rst";
+    changelog = "https://github.com/defnull/multipart/blob/${src.tag}/CHANGELOG.rst";
     description = "Parser for multipart/form-data";
     homepage = "https://github.com/defnull/multipart";
     license = lib.licenses.mit;

From 4c4f2fe71ea7a91c977e62571c1a7700ab3da621 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:27 +0200
Subject: [PATCH 1017/3724] python3Packages.mwparserfromhell: 0.6.6 -> 0.7.2

https://github.com/earwig/mwparserfromhell/releases/tag/v0.7.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/mwparserfromhell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix
index 55d9c63c640d..b4f5e86efcbe 100644
--- a/pkgs/development/python-modules/mwparserfromhell/default.nix
+++ b/pkgs/development/python-modules/mwparserfromhell/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "mwparserfromhell";
-  version = "0.6.6";
+  version = "0.7.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ca/sHpeEulduldbzSEVYLTxzOjpSuncN2KnDpA5bZJ8=";
+    hash = "sha256-9Bkwcunqk7noj3cvYKAhJcBgLTKJDQu9yyde1YyLN2M=";
   };
 
   postPatch = ''

From 3825ae86affd629ef30dac513dc9d089568c4832 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:28 +0200
Subject: [PATCH 1018/3724] python3Packages.myst-nb: 1.2.0 -> 1.3.0

https://github.com/executablebooks/MyST-NB/raw/v1.3.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/myst-nb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix
index f12ee7e8c1b7..cba8ec711379 100644
--- a/pkgs/development/python-modules/myst-nb/default.nix
+++ b/pkgs/development/python-modules/myst-nb/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "myst-nb";
-  version = "1.2.0";
+  version = "1.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "myst_nb";
-    hash = "sha256-r0Wex1OzQZUhgrRbCoC0d2zr+Aye5qrKKj9AJ7RAyd4=";
+    hash = "sha256-3zzUaA9Rpa9nP9RrOLVivjVZrvFHXpBu0PLmbkWHzks=";
   };
 
   nativeBuildInputs = [ flit-core ];

From f94b63440c86c79e6e84805c774596cc7f4377b0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:28 +0200
Subject: [PATCH 1019/3724] python3Packages.nanoeigenpy: 0.3.0 -> 0.4.0

https://github.com/Simple-Robotics/nanoeigenpy/releases/tag/v0.4.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/nanoeigenpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nanoeigenpy/default.nix b/pkgs/development/python-modules/nanoeigenpy/default.nix
index 9e1f0378dc3f..29bb740b4aaa 100644
--- a/pkgs/development/python-modules/nanoeigenpy/default.nix
+++ b/pkgs/development/python-modules/nanoeigenpy/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "nanoeigenpy";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = false; # Built with cmake
 
   src = fetchFromGitHub {
     owner = "Simple-Robotics";
     repo = "nanoeigenpy";
     tag = "v${version}";
-    hash = "sha256-asDe1mrTsAxVl0gAo7zlWqQRfWYBiSLqQk1d8bEBsn4=";
+    hash = "sha256-2Lp3fYw3rQYxjkCQCeHI+N32Y4vTJ8l+PoKqLCmAXIU=";
   };
 
   # Fix:

From 8a276cbfa14ec30f33ef9520be8403be396f96a9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:29 +0200
Subject: [PATCH 1020/3724] python3Packages.napari-npe2: 0.7.8 -> 0.7.9

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/napari-npe2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix
index e9a9beeed4cd..02a0a99047e3 100644
--- a/pkgs/development/python-modules/napari-npe2/default.nix
+++ b/pkgs/development/python-modules/napari-npe2/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "napari-npe2";
-  version = "0.7.8";
+  version = "0.7.9";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "napari";
     repo = "npe2";
     tag = "v${version}";
-    hash = "sha256-J15CmJ1L173M54fCo4oTV9XP7946c0aHzLqKjTvzG0g=";
+    hash = "sha256-q+vgzUuSSHFR64OajT/j/tLsNgSm3azQPCvDlrIvceM=";
   };
 
   build-system = [

From 27dbccba7e10f82dddd65d312c65f15c3e41a920 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:29 +0200
Subject: [PATCH 1021/3724] python3Packages.napari: 0.6.2 -> 0.6.3

https://github.com/napari/napari/releases/tag/v0.6.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/napari/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix
index 3d49194633e6..48f842bc15a6 100644
--- a/pkgs/development/python-modules/napari/default.nix
+++ b/pkgs/development/python-modules/napari/default.nix
@@ -45,14 +45,14 @@
 
 mkDerivationWith buildPythonPackage rec {
   pname = "napari";
-  version = "0.6.2";
+  version = "0.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "napari";
     repo = "napari";
     tag = "v${version}";
-    hash = "sha256-p6deNHnlvgZXV3Ym3OADC44j5bOkMDjlmM2N3yE5GxE=";
+    hash = "sha256-OPbjq9jXA5onLBCVvCx4g935y7GNvf4GA5s5sfNjIKY=";
   };
 
   postPatch = ''

From 13973d42718c843cf66d945280ce486d4c8414fe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:30 +0200
Subject: [PATCH 1022/3724] python3Packages.narwhals: 1.40.0 -> 2.0.1

https://github.com/narwhals-dev/narwhals/releases/tag/v2.0.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/narwhals/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix
index 35d4ac513145..71e531679c3e 100644
--- a/pkgs/development/python-modules/narwhals/default.nix
+++ b/pkgs/development/python-modules/narwhals/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "narwhals";
-  version = "1.40.0";
+  version = "2.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "narwhals-dev";
     repo = "narwhals";
     tag = "v${version}";
-    hash = "sha256-cCgWKH4DzENTI1vwxOU+GRp/poUe55XqSPY8UHYy9PI=";
+    hash = "sha256-NptQHnv0PoAbD0RIghBrtDPsYidq1k4LN/mUfz4n6G0=";
   };
 
   build-system = [ hatchling ];

From 38f884b81a5c382243f227c3285b6d483d8371d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:31 +0200
Subject: [PATCH 1023/3724] python3Packages.nbdev: 2.4.2 -> 2.4.5

https://github.com/fastai/nbdev/blob/2.4.5/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/nbdev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix
index d14141e18966..6a582a67d6c8 100644
--- a/pkgs/development/python-modules/nbdev/default.nix
+++ b/pkgs/development/python-modules/nbdev/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "nbdev";
-  version = "2.4.2";
+  version = "2.4.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OtCpN2Jw4ghv19jY4N2Yn46CxxZuPQSybFw62MIIf0g=";
+    hash = "sha256-Evp67exwUVu7Dv3z85AAeTVB4CCcBHzRFXYcq+KEpj0=";
   };
 
   pythonRelaxDeps = [ "ipywidgets" ];

From b55b41b7dd78f6899c5b808e30cbefd5433550e2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:31 +0200
Subject: [PATCH 1024/3724] python3Packages.ndindex: 1.9.2 -> 1.10.0

https://github.com/Quansight-Labs/ndindex/releases/tag/1.10.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ndindex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix
index 54edcb1b2e4c..c4eef602132b 100644
--- a/pkgs/development/python-modules/ndindex/default.nix
+++ b/pkgs/development/python-modules/ndindex/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "ndindex";
-  version = "1.9.2";
+  version = "1.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Quansight-Labs";
     repo = "ndindex";
     tag = version;
-    hash = "sha256-5S4HN5MFLgURImwFsyyTOxDhrZJ5Oe+Ln/TA/bsCsek=";
+    hash = "sha256-gPhRln7cUoRmypuTDTwoz4LyCBX3EwuKes/SEoz9NYM=";
   };
 
   build-system = [
@@ -76,7 +76,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library for manipulating indices of ndarrays";
     homepage = "https://github.com/Quansight-Labs/ndindex";
-    changelog = "https://github.com/Quansight-Labs/ndindex/releases/tag/${version}";
+    changelog = "https://github.com/Quansight-Labs/ndindex/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = [ ];
   };

From 947fa42d0d2108b34d5b8129b9a1294f27da7648 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:32 +0200
Subject: [PATCH 1025/3724] python3Packages.neo4j: 5.28.1 -> 5.28.2

https://github.com/neo4j/neo4j-python-driver/releases/tag/5.28.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/neo4j/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix
index 7a9110fdd9c5..36d64c317dd0 100644
--- a/pkgs/development/python-modules/neo4j/default.nix
+++ b/pkgs/development/python-modules/neo4j/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "neo4j";
-  version = "5.28.1";
+  version = "5.28.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "neo4j";
     repo = "neo4j-python-driver";
     tag = version;
-    hash = "sha256-6Qa6llM8ke9dOkZ7q057ruM0h7pByxAQ+I6Mus2ExVA=";
+    hash = "sha256-dQvQO+Re+ki9w+itzE6/WdiiLdMlU4yePt01vAPe4+M=";
   };
 
   postPatch = ''
@@ -58,7 +58,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Neo4j Bolt Driver for Python";
     homepage = "https://github.com/neo4j/neo4j-python-driver";
-    changelog = "https://github.com/neo4j/neo4j-python-driver/releases/tag/${version}";
+    changelog = "https://github.com/neo4j/neo4j-python-driver/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

From 7342c10a85130d09f60b01b8d6a37c96e46a732e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:32 +0200
Subject: [PATCH 1026/3724] python3Packages.neoteroi-mkdocs: 1.1.2 -> 1.1.3

https://github.com/Neoteroi/mkdocs-plugins/releases/v1.1.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/neoteroi-mkdocs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
index cc7fd7dc4542..bec4a6bad974 100644
--- a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
+++ b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
@@ -16,14 +16,14 @@
 }:
 buildPythonPackage rec {
   pname = "neoteroi-mkdocs";
-  version = "1.1.2";
+  version = "1.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Neoteroi";
     repo = "mkdocs-plugins";
     tag = "v${version}";
-    hash = "sha256-+bH4pkY+BE31t3b750ZAbbesKLFjgx6KF9b2tXFTmhI=";
+    hash = "sha256-4Rd4VhgaMzoSZ87FMQsUxadGG1ucQgGY0Y4uZoZl380=";
   };
 
   buildInputs = [ hatchling ];

From 0d41000235492c7296cefb43ab74906a016e4dde Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:33 +0200
Subject: [PATCH 1027/3724] python3Packages.nethsm: 1.4.0 -> 1.4.1

https://github.com/Nitrokey/nethsm-sdk-py/releases/tag/v1.4.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/nethsm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nethsm/default.nix b/pkgs/development/python-modules/nethsm/default.nix
index 32db3764b628..426e93f4bba6 100644
--- a/pkgs/development/python-modules/nethsm/default.nix
+++ b/pkgs/development/python-modules/nethsm/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "nethsm";
-  version = "1.4.0";
+  version = "1.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Nitrokey";
     repo = "nethsm-sdk-py";
     tag = "v${version}";
-    hash = "sha256-cbBYElR2J35ZHW5zvL9jlMg9KSerqjFBLsg5QdmqAoA=";
+    hash = "sha256-guW3KKIrRKSw8TsvPMTPJUyzISBNUoBqsGBWuv7Nf7M=";
   };
 
   pythonRelaxDeps = true;

From 0643a426a0dd8002a37d245545ec9efaa9785f81 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:33 +0200
Subject: [PATCH 1028/3724] python3Packages.netmiko: 4.5.0 -> 4.6.0

https://github.com/ktbyers/netmiko/releases/tag/v4.6.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/netmiko/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix
index cf9a77afe338..659151015602 100644
--- a/pkgs/development/python-modules/netmiko/default.nix
+++ b/pkgs/development/python-modules/netmiko/default.nix
@@ -6,7 +6,6 @@
   paramiko,
   poetry-core,
   pyserial,
-  pythonOlder,
   pyyaml,
   rich,
   ruamel-yaml,
@@ -16,22 +15,14 @@
 
 buildPythonPackage rec {
   pname = "netmiko";
-  version = "4.5.0";
+  version = "4.6.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-29/CC2yq+OXXpXC7G0Kia5pvjYI06R9cZfTb/gwOT1A=";
+    hash = "sha256-lwG7LBoV6y6AdMsuKMoAfGm5+lKWG4O5jHV+rWuA3u8=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "poetry>=1.6.1" "poetry-core" \
-      --replace-fail "poetry.masonry.api" "poetry.core.masonry.api"
-  '';
-
   build-system = [ poetry-core ];
 
   dependencies = [

From 166f3bcec5ac132ac8777d7db35ac2bb2112e6d9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:34 +0200
Subject: [PATCH 1029/3724] python3Packages.netutils: 1.13.0 -> 1.14.1

https://github.com/networktocode/netutils/releases/tag/v1.14.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/netutils/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix
index eabb25dd11b5..3f4d14d6294c 100644
--- a/pkgs/development/python-modules/netutils/default.nix
+++ b/pkgs/development/python-modules/netutils/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "netutils";
-  version = "1.13.0";
+  version = "1.14.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "networktocode";
     repo = "netutils";
     tag = "v${version}";
-    hash = "sha256-lUtxTzL3nkdICvTKozdnyx1wtwE4xwY7mcUqv3Wgw3Y=";
+    hash = "sha256-w+31rv/0EgAT8gv/Oqlbq/djbHIgK3YF792sxBDXHEQ=";
   };
 
   build-system = [ poetry-core ];
@@ -62,7 +62,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library that is a collection of objects for common network automation tasks";
     homepage = "https://github.com/networktocode/netutils";
-    changelog = "https://github.com/networktocode/netutils/releases/tag/v${version}";
+    changelog = "https://github.com/networktocode/netutils/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

From 568c06b293c0eb0ba4efca7f46184947af796bad Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:34 +0200
Subject: [PATCH 1030/3724] python3Packages.networkx: 3.4.2 -> 3.5

https://github.com/networkx/networkx/blob/networkx-3.5/doc/release/release_3.5.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/networkx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix
index 91ff6b59b531..089c28778475 100644
--- a/pkgs/development/python-modules/networkx/default.nix
+++ b/pkgs/development/python-modules/networkx/default.nix
@@ -29,14 +29,14 @@
 buildPythonPackage rec {
   pname = "networkx";
   # upgrade may break sage, please test the sage build or ping @timokau on upgrade
-  version = "3.4.2";
+  version = "3.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MHw2aUKMU2KqsnyKEmCqj0fE6R04kfSL4BQXONjQU+E=";
+    hash = "sha256-1Mb5z4H1LWkjCGZ5a4KvvM3sPbeuT70bZep1D+7VADc=";
   };
 
   # backport patch to fix tests with Python 3.13.4

From 66a44392ce114bc69888f74d059b4c0335cf7bcc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:35 +0200
Subject: [PATCH 1031/3724] python3Packages.neurokit2: 0.2.10 -> 0.2.12

https://github.com/neuropsychology/NeuroKit/releases/tag/v0.2.12

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/neurokit2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/neurokit2/default.nix b/pkgs/development/python-modules/neurokit2/default.nix
index 923eaa7b7e42..9e2f9acbee32 100644
--- a/pkgs/development/python-modules/neurokit2/default.nix
+++ b/pkgs/development/python-modules/neurokit2/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "neurokit2";
-  version = "0.2.10";
+  version = "0.2.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "neuropsychology";
     repo = "NeuroKit";
     tag = "v${version}";
-    hash = "sha256-e/B1JvO6uYZ6iVskFvxZLSSXi0cPep9bBZ0JXZTVS28=";
+    hash = "sha256-gn02l0vYl+/7hXp4gFVlgblxC4dewXckW3JL3wPC89Y=";
   };
 
   postPatch = ''
@@ -104,7 +104,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Toolbox for Neurophysiological Signal Processing";
     homepage = "https://github.com/neuropsychology/NeuroKit";
-    changelog = "https://github.com/neuropsychology/NeuroKit/releases/tag/v${version}";
+    changelog = "https://github.com/neuropsychology/NeuroKit/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ genga898 ];
   };

From 26c4caa9048a65e211d5acd9df079432d4e088cf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:35 +0200
Subject: [PATCH 1032/3724] python3Packages.niaarm: 0.4.2 -> 0.13.4

https://github.com/firefly-cpp/NiaARM/releases/tag/0.13.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/niaarm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix
index c0979f4c7a4f..a324761df895 100644
--- a/pkgs/development/python-modules/niaarm/default.nix
+++ b/pkgs/development/python-modules/niaarm/default.nix
@@ -24,14 +24,14 @@
 buildPythonPackage rec {
   pname = "niaarm";
   # nixpkgs-update: no auto update
-  version = "0.4.2";
+  version = "0.13.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "firefly-cpp";
     repo = "NiaARM";
     tag = version;
-    hash = "sha256-WvVXL1a1DvgLF3upbGUi1+nH5aDBUNx5Bitlkb8lQkc=";
+    hash = "sha256-524rJ5b9e0U1rqu1iCGMA3Tgnn9bO4biCC1FMoGNqms=";
   };
 
   pythonRelaxDeps = [

From 6d68f42b629c4be78a6986e7f9ab1cc154f731f9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:35 +0200
Subject: [PATCH 1033/3724] python3Packages.nidaqmx: 1.1.0 -> 1.2.0

https://github.com/ni/nidaqmx-python/releases/tag/1.2.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/nidaqmx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix
index 76b93355d968..8beeb417972f 100644
--- a/pkgs/development/python-modules/nidaqmx/default.nix
+++ b/pkgs/development/python-modules/nidaqmx/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "nidaqmx";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ni";
     repo = "nidaqmx-python";
     tag = version;
-    hash = "sha256-WNr+zVrA4X2AjizsmMEau54Vv1Svey3LNsCo8Bm/W+A=";
+    hash = "sha256-uxf+1nmJ+YFS3zGu+0YP4zOdBlSCHPYC8euqZIGwb00=";
   };
 
   disabled = pythonOlder "3.8";

From 6d53c812988db421dd6f1c830703824bb116214b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:36 +0200
Subject: [PATCH 1034/3724] python3Packages.nikola: 8.3.1 -> 8.3.3

https://github.com/getnikola/nikola/blob/v8.3.3/CHANGES.txt

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/nikola/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nikola/default.nix b/pkgs/development/python-modules/nikola/default.nix
index e4a490760249..570f03feec97 100644
--- a/pkgs/development/python-modules/nikola/default.nix
+++ b/pkgs/development/python-modules/nikola/default.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "nikola";
-  version = "8.3.1";
+  version = "8.3.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Nikola";
     inherit version;
-    hash = "sha256-IfJB2Rl3c1MyEiuyNpT3udfpM480VvFD8zosJFDHr7k=";
+    hash = "sha256-Y219b/wqsk9MJknoaV+LtWBOMJFT6ktgt4b6yuA6scc=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 2f5c4f36c261fdbc0e89f212acfc779843ecb911 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:36 +0200
Subject: [PATCH 1035/3724] python3Packages.nilearn: 0.11.1 -> 0.12.0

https://github.com/nilearn/nilearn/releases/tag/0.12.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/nilearn/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index d9da5fcf52d6..95709d26c281 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "nilearn";
-  version = "0.11.1";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nilearn";
     repo = "nilearn";
     tag = version;
-    hash = "sha256-ZvodSRJkKwPwpYHOLmxAYIIv7f9AlrjmZS9KLPjz5rM=";
+    hash = "sha256-olA3Yqf+upMJZiwpQp6HDSMxe9OssGLGMdHbZARg0+Y=";
   };
 
   postPatch = ''
@@ -71,7 +71,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module for statistical learning on neuroimaging data";
     homepage = "https://nilearn.github.io";
-    changelog = "https://github.com/nilearn/nilearn/releases/tag/${version}";
+    changelog = "https://github.com/nilearn/nilearn/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };

From ef724767bb3ce511db4b142bdb342cea13e30418 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:37 +0200
Subject: [PATCH 1036/3724] python3Packages.nitrokey: 0.3.2 -> 0.4.0

https://github.com/Nitrokey/nitrokey-sdk-py/releases/tag/v0.4.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/nitrokey/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nitrokey/default.nix b/pkgs/development/python-modules/nitrokey/default.nix
index 8258a73e57bd..158925460e5c 100644
--- a/pkgs/development/python-modules/nitrokey/default.nix
+++ b/pkgs/development/python-modules/nitrokey/default.nix
@@ -17,12 +17,12 @@
 
 buildPythonPackage rec {
   pname = "nitrokey";
-  version = "0.3.2";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JAgorA2V+WHgqtwk8fEPjdwoog7Q3xk93aKSJ0mxHkQ=";
+    hash = "sha256-uZ3KF+8PUwVjwf73buFpq/6Fu+fqkfIecP3A33FmtKk=";
   };
 
   disabled = pythonOlder "3.9";

From 3608ffd62b0dba2dcefd22dd8c0dbee317d2adfa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:37 +0200
Subject: [PATCH 1037/3724] python3Packages.niworkflows: 1.12.2 -> 1.13.5

https://github.com/nipreps/niworkflows/blob/1.13.5/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/niworkflows/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix
index a91d07cf99a3..784be8a25b90 100644
--- a/pkgs/development/python-modules/niworkflows/default.nix
+++ b/pkgs/development/python-modules/niworkflows/default.nix
@@ -40,14 +40,14 @@
 
 buildPythonPackage rec {
   pname = "niworkflows";
-  version = "1.12.2";
+  version = "1.13.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nipreps";
     repo = "niworkflows";
     tag = version;
-    hash = "sha256-rgnfp12SHlL3LFFMSrHlTd0tWNnA4ekxZ9kKYRvZWlw=";
+    hash = "sha256-Q43IXlzmCO7m9y/tRlJJ2Dz4wNeK+kXtLLLrthO+n58=";
   };
 
   pythonRelaxDeps = [ "traits" ];

From e6e4800d8a2b51735aac8204c3608458c27847c0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:38 +0200
Subject: [PATCH 1038/3724] python3Packages.nixpkgs-updaters-library: 1.2.0 ->
 3.0.0

https://github.com/PerchunPak/nixpkgs-updaters-library/blob/v3.0.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/nixpkgs-updaters-library/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix b/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix
index 30ef74dbe66e..661dd2d8721a 100644
--- a/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix
+++ b/pkgs/development/python-modules/nixpkgs-updaters-library/default.nix
@@ -74,7 +74,7 @@ buildPythonPackage rec {
   meta = {
     description = "Boilerplate-less updater library for Nixpkgs ecosystems";
     homepage = "https://github.com/PerchunPak/nixpkgs-updaters-library";
-    changelog = "https://github.com/PerchunPak/nixpkgs-updaters-library/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/PerchunPak/nixpkgs-updaters-library/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ perchun ];
   };

From 6bc8f190df7f858b9c7b178885b4424dc78d4bd2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:38 +0200
Subject: [PATCH 1039/3724] python3Packages.nocasedict: 2.0.4 -> 2.1.0

https://github.com/pywbem/nocasedict/blob/2.1.0/docs/changes.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/nocasedict/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix
index f50c1df9902f..4397658c0bf4 100644
--- a/pkgs/development/python-modules/nocasedict/default.nix
+++ b/pkgs/development/python-modules/nocasedict/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "nocasedict";
-  version = "2.0.4";
+  version = "2.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TKk09l31exDQ/KtfDDnp3MuTV3/58ivvmCZd2/EvivE=";
+    hash = "sha256-tWPVhRy7DgsQ+7YYm6h+BhLSLlpvOgBKRXOrWziqqn0=";
   };
 
   build-system = [ setuptools ];

From 850e9e5ea252801f450c59fcd2c77c7e22d516b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:39 +0200
Subject: [PATCH 1040/3724] python3Packages.nocaselist: 2.0.3 -> 2.1.0

https://github.com/pywbem/nocaselist/blob/2.1.0/docs/changes.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/nocaselist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix
index ddb10ecf6fdc..c76216939c54 100644
--- a/pkgs/development/python-modules/nocaselist/default.nix
+++ b/pkgs/development/python-modules/nocaselist/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "nocaselist";
-  version = "2.0.3";
+  version = "2.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-VXFNqEM/tIQ855dASXfkOF1ePfnkqgD33emD/YdBD+8=";
+    hash = "sha256-+3MG9aPgRVNOc3q37L7uA5ul6br7xbXyMfYW1+khG2U=";
   };
 
   build-system = [ setuptools ];

From 6615d75726542d1a38d8cb65d5c487874f2f4971 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:39 +0200
Subject: [PATCH 1041/3724] python3Packages.nominal-api-protos: 0.708.0 ->
 0.806.0

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/nominal-api-protos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nominal-api-protos/default.nix b/pkgs/development/python-modules/nominal-api-protos/default.nix
index 2e080e4ff2c3..0c39ac7fd383 100644
--- a/pkgs/development/python-modules/nominal-api-protos/default.nix
+++ b/pkgs/development/python-modules/nominal-api-protos/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "nominal-api-protos";
-  version = "0.708.0";
+  version = "0.806.0";
   pyproject = true;
 
   # nixpkgs-update: no auto update
   src = fetchPypi {
     inherit version;
     pname = "nominal_api_protos";
-    hash = "sha256-EYyBRmmCq4OA6xgf4JpajUtlJClkxxPn48Wmmy2mqN4=";
+    hash = "sha256-wbMGgW3YYX+MVc525rH6pOk72H7NlmiyEJiFtz+Osoo=";
   };
 
   build-system = [ setuptools ];

From b7b11014af8b22243be04259aeb56aa4a7296e21 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:40 +0200
Subject: [PATCH 1042/3724] python3Packages.nominal-api: 0.708.0 -> 0.806.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/nominal-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nominal-api/default.nix b/pkgs/development/python-modules/nominal-api/default.nix
index 0554264d1f3f..fb5a51f4cfa1 100644
--- a/pkgs/development/python-modules/nominal-api/default.nix
+++ b/pkgs/development/python-modules/nominal-api/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "nominal-api";
-  version = "0.708.0";
+  version = "0.806.0";
   pyproject = true;
 
   # nixpkgs-update: no auto update
   src = fetchPypi {
     inherit version;
     pname = "nominal_api";
-    hash = "sha256-gaMQ4bLhdBkDTUoHP5Cb0vS5emNcYga5eTvV2TEWQiU=";
+    hash = "sha256-V9zncQFNBi3MtgBHmwY4SoSgI9cjQuBt90PeRHjaXsw=";
   };
 
   build-system = [ setuptools ];

From be2f9949ce93836a7530c22ab835e4a609c47e51 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:40 +0200
Subject: [PATCH 1043/3724] python3Packages.nominal: 1.66.0 -> 1.71.0

https://github.com/nominal-io/nominal-client/releases/tag/v1.71.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/nominal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nominal/default.nix b/pkgs/development/python-modules/nominal/default.nix
index 75233a1421d5..c4183dfa4107 100644
--- a/pkgs/development/python-modules/nominal/default.nix
+++ b/pkgs/development/python-modules/nominal/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "nominal";
-  version = "1.66.0";
+  version = "1.71.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nominal-io";
     repo = "nominal-client";
     tag = "v${version}";
-    hash = "sha256-xRt8xRMjjQQ+2IujW//F6Z3xaPz4+YuV0AP4Km8mc04=";
+    hash = "sha256-C0afrzWlq2Z3a21MIJ/3XgvjkEZONwBgCZ+06XIYFGE=";
   };
 
   build-system = [ hatchling ];

From bc8e8ab6252775e4cb140d0a49f52cb30cebc700 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:40 +0200
Subject: [PATCH 1044/3724] python3Packages.notebook: 7.4.3 -> 7.4.4

https://github.com/jupyter/notebook/blob/v7.4.4/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/notebook/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index b25773185de5..2235147911ae 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "notebook";
-  version = "7.4.3";
+  version = "7.4.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jupyter";
     repo = "notebook";
     tag = "v${version}";
-    hash = "sha256-DpGWBV5MeCvoGSBadObVEaYwA5kRmHj8NdVWpJ+pHjA=";
+    hash = "sha256-bj4iQvm0TGBiCu9drJ8QFXsedzm/cEjevNQS6UsasNs=";
   };
 
   postPatch = ''
@@ -54,7 +54,7 @@ buildPythonPackage rec {
 
   offlineCache = yarn-berry_3.fetchYarnBerryDeps {
     inherit src missingHashes;
-    hash = "sha256-S0lnRJ+9F1RhymlAOxo3sEJJrHYo5IWeWn80obcgVlM=";
+    hash = "sha256-nRaWzr5Q904KojfK0mPgLX9be82axb8Aab0SJULE7RU=";
   };
 
   build-system = [
@@ -88,7 +88,7 @@ buildPythonPackage rec {
   __darwinAllowLocalNetworking = true;
 
   meta = {
-    changelog = "https://github.com/jupyter/notebook/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/jupyter/notebook/blob/${src.tag}/CHANGELOG.md";
     description = "Web-based notebook environment for interactive computing";
     homepage = "https://github.com/jupyter/notebook";
     license = lib.licenses.bsd3;

From 7c11adca921d83d5a6d63f1fa2f67f72d7bee42b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:41 +0200
Subject: [PATCH 1045/3724] python3Packages.nox: 2024.10.09 -> 2025.05.01

https://github.com/wntrblm/nox/blob/2025.05.01/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/nox/default.nix            | 18 +++++-----
 .../fix-broken-mock-on-cpython-3.12.8.patch   | 35 -------------------
 2 files changed, 10 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/development/python-modules/nox/fix-broken-mock-on-cpython-3.12.8.patch

diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix
index 91e23202c525..f419359780c6 100644
--- a/pkgs/development/python-modules/nox/default.nix
+++ b/pkgs/development/python-modules/nox/default.nix
@@ -1,8 +1,10 @@
 {
   lib,
   argcomplete,
+  attrs,
   buildPythonPackage,
   colorlog,
+  dependency-groups,
   fetchFromGitHub,
   hatchling,
   jinja2,
@@ -17,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "nox";
-  version = "2024.10.09";
+  version = "2025.05.01";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,19 +28,16 @@ buildPythonPackage rec {
     owner = "wntrblm";
     repo = "nox";
     tag = version;
-    hash = "sha256-GdNz34A8IKwPG/270sY5t3SoggGCZMWfDq/Wyhk0ez8=";
+    hash = "sha256-qH8oh7tmiJkXOobyDZMRZ62w2sRHJF8sh4PX+6s7M70=";
   };
 
-  patches = [
-    # Backport of https://github.com/wntrblm/nox/pull/903, which can be removed on next release
-    ./fix-broken-mock-on-cpython-3.12.8.patch
-  ];
-
   build-system = [ hatchling ];
 
   dependencies = [
     argcomplete
+    attrs
     colorlog
+    dependency-groups
     packaging
     virtualenv
   ]
@@ -67,6 +66,9 @@ buildPythonPackage rec {
     "test__create_venv_options"
     # Assertion errors
     "test_uv"
+    # calls to naked python
+    "test_noxfile_script_mode"
+    "test_noxfile_script_mode_url_req"
   ];
 
   disabledTestPaths = [
@@ -77,7 +79,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Flexible test automation for Python";
     homepage = "https://nox.thea.codes/";
-    changelog = "https://github.com/wntrblm/nox/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/wntrblm/nox/blob/${src.tag}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [
       doronbehar
diff --git a/pkgs/development/python-modules/nox/fix-broken-mock-on-cpython-3.12.8.patch b/pkgs/development/python-modules/nox/fix-broken-mock-on-cpython-3.12.8.patch
deleted file mode 100644
index f634c3534b93..000000000000
--- a/pkgs/development/python-modules/nox/fix-broken-mock-on-cpython-3.12.8.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/nox/command.py b/nox/command.py
-index 671875c..4984168 100644
---- a/nox/command.py
-+++ b/nox/command.py
-@@ -30,6 +30,8 @@ TYPE_CHECKING = False
- if TYPE_CHECKING:
-     from typing import IO
- 
-+_PLATFORM = sys.platform
-+
- ExternalType = Literal["error", True, False]
- 
- 
-@@ -63,7 +65,7 @@ def _clean_env(env: Mapping[str, str | None] | None = None) -> dict[str, str] |
-     clean_env = {k: v for k, v in env.items() if v is not None}
- 
-     # Ensure systemroot is passed down, otherwise Windows will explode.
--    if sys.platform == "win32":
-+    if _PLATFORM.startswith("win"):
-         clean_env.setdefault("SYSTEMROOT", os.environ.get("SYSTEMROOT", ""))
- 
-     return clean_env
-diff --git a/tests/test_command.py b/tests/test_command.py
-index ae398e9..904cf34 100644
---- a/tests/test_command.py
-+++ b/tests/test_command.py
-@@ -157,7 +157,7 @@ def test_run_env_remove(monkeypatch):
-     )
- 
- 
--@mock.patch("sys.platform", "win32")
-+@mock.patch("nox.command._PLATFORM", "win32")
- def test_run_env_systemroot():
-     systemroot = os.environ.setdefault("SYSTEMROOT", "sigil")
- 

From f46ff46be30e7382c7f4e4de6951082d5748187a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:41 +0200
Subject: [PATCH 1046/3724] python3Packages.nskeyedunarchiver: 1.5 -> 1.5.2

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/nskeyedunarchiver/default.nix           | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/nskeyedunarchiver/default.nix b/pkgs/development/python-modules/nskeyedunarchiver/default.nix
index 1141248f8457..c63b8793fb3f 100644
--- a/pkgs/development/python-modules/nskeyedunarchiver/default.nix
+++ b/pkgs/development/python-modules/nskeyedunarchiver/default.nix
@@ -7,13 +7,12 @@
 
 buildPythonPackage rec {
   pname = "nskeyedunarchiver";
-  version = "1.5";
+  version = "1.5.2";
   pyproject = true;
 
   src = fetchPypi {
-    inherit version;
-    pname = "NSKeyedUnArchiver";
-    hash = "sha256-7toEgAIYFzNuD/6sqAN3wajwjsxfwGvkg7SMRLrUFPQ=";
+    inherit pname version;
+    hash = "sha256-2aLV1I6p4seNMb+/xKl8AnlBkvO0VINC1yfVS90gvro=";
   };
 
   build-system = [ setuptools ];

From a2f78c5729aacb74e5983bb7dfa675f8cf3b55a2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:42 +0200
Subject: [PATCH 1047/3724] python3Packages.numcodecs: 0.15.1 -> 0.16.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/numcodecs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix
index 4cb141e8fb34..ae55cda810bf 100644
--- a/pkgs/development/python-modules/numcodecs/default.nix
+++ b/pkgs/development/python-modules/numcodecs/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "numcodecs";
-  version = "0.15.1";
+  version = "0.16.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7u135NZjZkGizGBfvGB4x6jyzEDz36Kz9h5S5gkbBP8=";
+    hash = "sha256-xH8g1lZFRWjGtGl84CCB5ru1EvGYc4xqVvr+gCnJf7E=";
   };
 
   build-system = [

From 5ec8104bd8ca97cdc91958476f6e6a303437d479 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:42 +0200
Subject: [PATCH 1048/3724] python3Packages.nvdlib: 0.8.0 -> 0.8.1

https://github.com/vehemont/nvdlib/releases/tag/v0.8.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/nvdlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nvdlib/default.nix b/pkgs/development/python-modules/nvdlib/default.nix
index f9c669ca73d8..b775e05126e6 100644
--- a/pkgs/development/python-modules/nvdlib/default.nix
+++ b/pkgs/development/python-modules/nvdlib/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "nvdlib";
-  version = "0.8.0";
+  version = "0.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "Vehemont";
     repo = "nvdlib";
     tag = "v${version}";
-    hash = "sha256-fj7tgTv3r++oo+45QFQy/rmXYdKyKhR74maHOdp+0yA=";
+    hash = "sha256-8Tg9JN63+zGRUppIXBQ46mKeDq+nLNQvAjtCwcTuC1g=";
   };
 
   nativeBuildInputs = [ setuptools ];

From f07454f167bc78ddb058ea1deedc83a2b5308c9f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:43 +0200
Subject: [PATCH 1049/3724] python3Packages.odc-stac: 0.4.0rc2 -> 0.4.0

https://github.com/opendatacube/odc-stac/tag/v0.4.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/odc-stac/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/odc-stac/default.nix b/pkgs/development/python-modules/odc-stac/default.nix
index d077e9c37db5..00ec04b1f674 100644
--- a/pkgs/development/python-modules/odc-stac/default.nix
+++ b/pkgs/development/python-modules/odc-stac/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "odc-stac";
-  version = "0.4.0rc2";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "opendatacube";
     repo = "odc-stac";
     tag = "v${version}";
-    hash = "sha256-I25qAJEryYaYO7KIVIoTlgzLS6PWkNG6b4NFyhghyKQ=";
+    hash = "sha256-Ekyavcin13B4DAxv0/XG5QTBuLE7PRospAXe40fHeX0=";
   };
 
   build-system = [
@@ -88,7 +88,7 @@ buildPythonPackage rec {
   meta = {
     description = "Load STAC items into xarray Datasets";
     homepage = "https://github.com/opendatacube/odc-stac/";
-    changelog = "https://github.com/opendatacube/odc-stac/tag/v${version}";
+    changelog = "https://github.com/opendatacube/odc-stac/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ daspk04 ];
   };

From 5e71237afe41e142acf80d89d008c2f05a077d90 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:44 +0200
Subject: [PATCH 1050/3724] python3Packages.oelint-data: 1.0.24 -> 1.0.25

https://github.com/priv-kweihmann/oelint-data/releases/tag/1.0.25

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/oelint-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
index 9ef22aaebe2b..12aed15167c0 100644
--- a/pkgs/development/python-modules/oelint-data/default.nix
+++ b/pkgs/development/python-modules/oelint-data/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "oelint-data";
-  version = "1.0.24";
+  version = "1.0.25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = version;
-    hash = "sha256-vKXRlqpFxdmq+UOGCm59LVwjLW8h1N/fQr4kx1eW8ys=";
+    hash = "sha256-obX8grYYSa9H/UoSBQon44Of4Eh4BtqJrfwZbaqh6IU=";
   };
 
   build-system = [

From 22ef84a3804e868a56a538a2248feac9c74904d9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:44 +0200
Subject: [PATCH 1051/3724] python3Packages.okonomiyaki: 2.0.0 -> 3.0.0

https://github.com/enthought/okonomiyaki/releases/tag/3.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/okonomiyaki/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/okonomiyaki/default.nix b/pkgs/development/python-modules/okonomiyaki/default.nix
index 5f57b9968304..812379dda907 100644
--- a/pkgs/development/python-modules/okonomiyaki/default.nix
+++ b/pkgs/development/python-modules/okonomiyaki/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "okonomiyaki";
-  version = "2.0.0";
+  version = "3.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "enthought";
     repo = "okonomiyaki";
     tag = version;
-    hash = "sha256-JQZhw0H4iSdxoyS6ODICJz1vAZsOISQitX7wTgSS1xc=";
+    hash = "sha256-xAF9Tdr+IM3lU+mcNcAWATJLZOVvbx0llqznqHLVqDc=";
   };
 
   postPatch = ''
@@ -79,7 +79,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Experimental library aimed at consolidating a lot of low-level code used for Enthought's eggs";
     homepage = "https://github.com/enthought/okonomiyaki";
-    changelog = "https://github.com/enthought/okonomiyaki/releases/tag/${version}";
+    changelog = "https://github.com/enthought/okonomiyaki/releases/tag/${src.tag}";
     maintainers = with maintainers; [ genericnerdyusername ];
     license = licenses.bsd3;
   };

From df988213ca4b7c8c34034d8423a6bec30911f1ba Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:45 +0200
Subject: [PATCH 1052/3724] python3Packages.onnxconverter-common: 1.14.0 ->
 1.15.0

https://github.com/microsoft/onnxconverter-common/releases/tag/v1.15.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/onnxconverter-common/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/onnxconverter-common/default.nix b/pkgs/development/python-modules/onnxconverter-common/default.nix
index 075f2bb29ef4..f1abe38004fd 100644
--- a/pkgs/development/python-modules/onnxconverter-common/default.nix
+++ b/pkgs/development/python-modules/onnxconverter-common/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "onnxconverter-common";
-  version = "1.14.0";
+  version = "1.15.0";
 
   pyproject = true;
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "onnxconverter-common";
     tag = "v${version}";
-    hash = "sha256-NbHyjLcr/Gq1zRiJW3ZBpEVQGVQGhp7SmfVd5hBIi2o=";
+    hash = "sha256-e4rk1qTTSEFu+g/cP+RmMUqxkBQfodIpr2CVK24DPv4=";
   };
 
   build-system = [
@@ -56,7 +56,7 @@ buildPythonPackage rec {
   meta = {
     description = "ONNX Converter and Optimization Tools";
     homepage = "https://github.com/microsoft/onnxconverter-common";
-    changelog = "https://github.com/microsoft/onnxconverter-common/releases/tag/v${version}";
+    changelog = "https://github.com/microsoft/onnxconverter-common/releases/tag/${src.tag}";
     license = with lib.licenses; [ mit ];
   };
 }

From 228c70959bbd3cef19aba351735f4f6b15a3cdd5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:45 +0200
Subject: [PATCH 1053/3724] python3Packages.onnxmltools: 1.13 -> 1.14.0

https://github.com/onnx/onnxmltools/blob/1.14.0/CHANGELOGS.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/onnxmltools/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/onnxmltools/default.nix b/pkgs/development/python-modules/onnxmltools/default.nix
index 350cea07a6d0..809ab48115ba 100644
--- a/pkgs/development/python-modules/onnxmltools/default.nix
+++ b/pkgs/development/python-modules/onnxmltools/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "onnxmltools";
-  version = "1.13";
+  version = "1.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "onnx";
     repo = "onnxmltools";
-    tag = "v${version}";
-    hash = "sha256-uNd7N7/FgX8zaJp8ouvftwGqGqas8lZRXFmjpS+t2B4=";
+    tag = version;
+    hash = "sha256-CcZlGLX8/ANHnhoOv5s/ybBN74gRH/8eLYJ6q/BJo/4=";
   };
 
   postPatch = ''
@@ -71,7 +71,7 @@ buildPythonPackage rec {
   meta = {
     description = "ONNXMLTools enables conversion of models to ONNX";
     homepage = "https://github.com/onnx/onnxmltools";
-    changelog = "https://github.com/onnx/onnxmltools/blob/v${version}/CHANGELOGS.md";
+    changelog = "https://github.com/onnx/onnxmltools/blob/${src.tag}/CHANGELOGS.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ happysalada ];
   };

From ffbfcd1289951ab79c8af89e7d891d6362cc85b3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:46 +0200
Subject: [PATCH 1054/3724] python3Packages.onnxslim: 0.1.57 -> 0.1.62

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/onnxslim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/onnxslim/default.nix b/pkgs/development/python-modules/onnxslim/default.nix
index 6710f1064990..a2e35dc06d0e 100644
--- a/pkgs/development/python-modules/onnxslim/default.nix
+++ b/pkgs/development/python-modules/onnxslim/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "onnxslim";
-  version = "0.1.57";
+  version = "0.1.62";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-VI1OaNMHuL2AhYxZ/n5zrwlqnfcCbjY39QXHX8gcdw8=";
+    hash = "sha256-f9SYFsqIM1h+W62ut3gezrNvv02mMVM/Q9UONJsE2Wg=";
   };
 
   build-system = [

From 9ed46bbda52baf7a05242408cc8789b50a892be9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:46 +0200
Subject: [PATCH 1055/3724] python3Packages.open-clip-torch: 2.32.0 -> 3.0.0

https://github.com/mlfoundations/open_clip/releases/tag/v3.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/open-clip-torch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix
index e35c30030bda..e3a61f9300f9 100644
--- a/pkgs/development/python-modules/open-clip-torch/default.nix
+++ b/pkgs/development/python-modules/open-clip-torch/default.nix
@@ -29,14 +29,14 @@
 }:
 buildPythonPackage rec {
   pname = "open-clip-torch";
-  version = "2.32.0";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mlfoundations";
     repo = "open_clip";
     tag = "v${version}";
-    hash = "sha256-HXzorEAVPieCHfW3xzXqNTTIzJSbIuaZhcfcp0htdCk=";
+    hash = "sha256-MMvDg5opsu9ILGHc1rJjWQfTb3T0PZ0i+8GSrQvIu8Y=";
   };
 
   build-system = [ pdm-backend ];

From c8b96c01776d5dac8ef1a2362974f9d406d4b00b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:47 +0200
Subject: [PATCH 1056/3724] python3Packages.openai: 1.97.1 -> 1.99.1

https://github.com/openai/openai-python/blob/v1.99.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/openai/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index 6bffb9b214e2..71c1af3f0f4e 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -136,7 +136,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python client library for the OpenAI API";
     homepage = "https://github.com/openai/openai-python";
-    changelog = "https://github.com/openai/openai-python/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/openai/openai-python/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.malo ];
     mainProgram = "openai";

From 69bbcb087e9a4712fb281a1a3b39c37a304dffa2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:48 +0200
Subject: [PATCH 1057/3724] python3Packages.openapi-spec-validator: 0.7.1 ->
 0.7.2

https://github.com/p1c2u/openapi-spec-validator/releases/tag/0.7.2

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/openapi-spec-validator/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix
index 7bb12970bd87..9e87a51128d1 100644
--- a/pkgs/development/python-modules/openapi-spec-validator/default.nix
+++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "openapi-spec-validator";
-  version = "0.7.1";
+  version = "0.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "python-openapi";
     repo = "openapi-spec-validator";
     tag = version;
-    hash = "sha256-X0ePdHQeBSWjsCFQgCoNloQZRhKbvPBE43aavBppvmg=";
+    hash = "sha256-APEx7+vc824DLmdzLvhfFVrcjPxVwwUwxkh19gjXEvc=";
   };
 
   nativeBuildInputs = [ poetry-core ];
@@ -62,7 +62,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    changelog = "https://github.com/p1c2u/openapi-spec-validator/releases/tag/${version}";
+    changelog = "https://github.com/p1c2u/openapi-spec-validator/releases/tag/${src.tag}";
     description = "Validates OpenAPI Specs against the OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0.0 specification";
     mainProgram = "openapi-spec-validator";
     homepage = "https://github.com/p1c2u/openapi-spec-validator";

From 4eca21c9b26dd1eb0078543f16f99667b47ff3ee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:48 +0200
Subject: [PATCH 1058/3724] python3Packages.opencensus-ext-azure: 1.1.14 ->
 1.1.15

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/opencensus-ext-azure/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/opencensus-ext-azure/default.nix b/pkgs/development/python-modules/opencensus-ext-azure/default.nix
index 34db90917e06..07dab62b2ec9 100644
--- a/pkgs/development/python-modules/opencensus-ext-azure/default.nix
+++ b/pkgs/development/python-modules/opencensus-ext-azure/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "opencensus-ext-azure";
-  version = "1.1.14";
+  version = "1.1.15";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ycbrrVQq62GBMyLmJ9WImlY+e4xOAkv1hGnQbbc6sUg=";
+    hash = "sha256-jRCK8Vh16jxSI4ZG+6kkw7qfv6rx/Q01BwfcW3iArec=";
   };
 
   build-system = [ setuptools ];

From c31236e82336d078ca37f2ec9c00e161b571e224 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:50 +0200
Subject: [PATCH 1059/3724] python3Packages.openusd: 25.05.01 -> 25.08

https://github.com/PixarAnimationStudios/OpenUSD/v25.08/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/openusd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index 32937c89d3ed..5864feb8fef2 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -51,14 +51,14 @@ in
 
 buildPythonPackage rec {
   pname = "openusd";
-  version = "25.05.01";
+  version = "25.08";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenUSD";
     tag = "v${version}";
-    hash = "sha256-gxikEC4MqTkhgYaRsCVYtS/VmXClSaCMdzpQ0LmiR7Q=";
+    hash = "sha256-k+rmC/e8fJexZ++AAinuDJFOK/oqC90B4NriJvaX71w=";
   };
 
   stdenv = python.stdenv;

From 12a71b24feb0580754b7878fff83a9c297cfde2e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:51 +0200
Subject: [PATCH 1060/3724] python3Packages.optimum: 1.26.1 -> 1.27.0

https://github.com/huggingface/optimum/releases/tag/v1.27.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/optimum/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix
index 79959c3a651e..d63eeb4af122 100644
--- a/pkgs/development/python-modules/optimum/default.nix
+++ b/pkgs/development/python-modules/optimum/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "optimum";
-  version = "1.26.1";
+  version = "1.27.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "huggingface";
     repo = "optimum";
     tag = "v${version}";
-    hash = "sha256-GfUlvz7b0DlqBPibndRzUkszGnbYXg6E8u144ZFAZxA=";
+    hash = "sha256-ZH7D3dc6f33Jl1JN7BIGUhTXDxOLv0FR9T3c5LMmhiY=";
   };
 
   build-system = [ setuptools ];

From e38884895dadba59c31e66b4d87b70e5cca7e73f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:51 +0200
Subject: [PATCH 1061/3724] python3Packages.optree: 0.14.1 -> 0.17.0

https://github.com/metaopt/optree/releases

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/optree/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/optree/default.nix b/pkgs/development/python-modules/optree/default.nix
index f6ef3fd6b63f..5b7be8f92b5e 100644
--- a/pkgs/development/python-modules/optree/default.nix
+++ b/pkgs/development/python-modules/optree/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "optree";
-  version = "0.14.1";
+  version = "0.17.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "metaopt";
     repo = "optree";
     tag = "v${version}";
-    hash = "sha256-5PIe/mXPNohwM0oNT/zSPmNUycjXuujtIFCki5t7V1I=";
+    hash = "sha256-4ZkUdGF+Fauy6KWbyrGQ684Ay5XlFT2S2I9lv/1KeWs=";
   };
 
   dontUseCmakeConfigure = true;
@@ -41,6 +41,10 @@ buildPythonPackage rec {
   disabledTests = [
     # Fails because the 'test_treespec' module can't be found
     "test_treespec_pickle_missing_registration"
+    # optree import during tests raises CalledProcessError
+    "test_warn_deprecated_import"
+    "test_import_no_warnings"
+    "test_treespec_construct"
   ];
   pythonImportsCheck = [ "optree" ];
 

From abefc3da0d76d7ac5ce52e2029de1dedb9091550 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:52 +0200
Subject: [PATCH 1062/3724] python3Packages.optuna: 4.2.1 -> 4.4.0

https://github.com/optuna/optuna/releases/tag/v4.4.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/optuna/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix
index 007b43ef6bfc..7bc6f58ee068 100644
--- a/pkgs/development/python-modules/optuna/default.nix
+++ b/pkgs/development/python-modules/optuna/default.nix
@@ -43,14 +43,14 @@
 
 buildPythonPackage rec {
   pname = "optuna";
-  version = "4.2.1";
+  version = "4.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "optuna";
     repo = "optuna";
     tag = "v${version}";
-    hash = "sha256-WLrdHrdfCtCZMW2J375N8vmod7FcKCMwQPGKicRA878=";
+    hash = "sha256-S9F9xni1cnmIbWu5n7BFvUCvQmBP3iBYS1ntg6vQ8ZQ=";
   };
 
   build-system = [
@@ -143,7 +143,7 @@ buildPythonPackage rec {
   meta = {
     description = "Hyperparameter optimization framework";
     homepage = "https://optuna.org/";
-    changelog = "https://github.com/optuna/optuna/releases/tag/${version}";
+    changelog = "https://github.com/optuna/optuna/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
     mainProgram = "optuna";

From 53461d0f211c112f05181f95f958d045fb8bc55a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:52 +0200
Subject: [PATCH 1063/3724] python3Packages.optype: 0.12.0 -> 0.13.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/optype/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/optype/default.nix b/pkgs/development/python-modules/optype/default.nix
index 0b29c8a5fddf..e810b2744f41 100644
--- a/pkgs/development/python-modules/optype/default.nix
+++ b/pkgs/development/python-modules/optype/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "optype";
-  version = "0.12.0";
+  version = "0.13.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jorenham";
     repo = "optype";
     tag = "v${version}";
-    hash = "sha256-sDMB9gSYf108Elsqj6Obk+6B4QKiJcStkJndVrIAWQI=";
+    hash = "sha256-GhG2TR5FJgEXBXLyGTNQKFYtR2iZ0tLgZ9B0YL8SXu8=";
   };
 
   disabled = pythonOlder "3.11";

From 8552b29a8fc63a14d17ef69d5c37660a8a5976a3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:53 +0200
Subject: [PATCH 1064/3724] python3Packages.oracledb: 3.2.0 -> 3.3.0

https://github.com/oracle/python-oracledb/blob/v3.3.0/doc/src/release_notes.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/oracledb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix
index 682170154934..e0ea963e9d4e 100644
--- a/pkgs/development/python-modules/oracledb/default.nix
+++ b/pkgs/development/python-modules/oracledb/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "oracledb";
-  version = "3.2.0";
+  version = "3.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-m/nxyT5TFCsz0cXr9aur7r0gYqAdXq1ou7ZAQ57PIiM=";
+    hash = "sha256-6DDTVEoVeClryqVMboyK4QpYx9tGfFKMSyetv5yLTLA=";
   };
 
   build-system = [

From ad8d03e8ebdb84c6a1efe716a00f23e7ea18f6f8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:53 +0200
Subject: [PATCH 1065/3724] python3Packages.orange-canvas-core: 0.2.5 -> 0.2.6

https://github.com/biolab/orange-canvas-core/releases/tag/0.2.6

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/orange-canvas-core/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix
index 354e8e5d4f48..91ad4e2334c1 100644
--- a/pkgs/development/python-modules/orange-canvas-core/default.nix
+++ b/pkgs/development/python-modules/orange-canvas-core/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "orange-canvas-core";
-  version = "0.2.5";
+  version = "0.2.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "biolab";
     repo = "orange-canvas-core";
     tag = version;
-    hash = "sha256-uh9wNqgLYRcnCSOdpeLx6ZTRC0cpq6lG/sqmrYLR+3g=";
+    hash = "sha256-cEy9ADU/jZoKmGXVlqwG+qWKZ22STjALgCb1IxAwpO0=";
   };
 
   build-system = [ setuptools ];
@@ -95,7 +95,7 @@ buildPythonPackage rec {
   meta = {
     description = "Orange framework for building graphical user interfaces for editing workflows";
     homepage = "https://github.com/biolab/orange-canvas-core";
-    changelog = "https://github.com/biolab/orange-canvas-core/releases/tag/${version}";
+    changelog = "https://github.com/biolab/orange-canvas-core/releases/tag/${src.tag}";
     license = [ lib.licenses.gpl3 ];
     maintainers = [ lib.maintainers.lucasew ];
     # Segmentation fault during tests

From 2fabe1518a7ed8e47e4f4de4a18b56929c567ee4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:54 +0200
Subject: [PATCH 1066/3724] python3Packages.orange3: 3.38.1 -> 3.39.0

https://github.com/biolab/orange3/blob/3.39.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/orange3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix
index c98128db9d73..30a49b4edc40 100644
--- a/pkgs/development/python-modules/orange3/default.nix
+++ b/pkgs/development/python-modules/orange3/default.nix
@@ -58,14 +58,14 @@
 let
   self = buildPythonPackage rec {
     pname = "orange3";
-    version = "3.38.1";
+    version = "3.39.0";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "biolab";
       repo = "orange3";
       tag = version;
-      hash = "sha256-bzF2rK8/cKAoe9Wzj+rQJatgBQTP3KVtT6xU+IzKYIY=";
+      hash = "sha256-P2e3Wq33UXnTmGSxkoW8kYYCBfYBB9Z50v4g7n//Fbw=";
     };
 
     build-system = [

From 3ef1a8ce368f556a66b21f690ead143efcec793f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:54 +0200
Subject: [PATCH 1067/3724] python3Packages.orderly-set: 5.4.1 -> 5.5.0

https://github.com/seperman/orderly-set/blob/5.5.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/orderly-set/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/orderly-set/default.nix b/pkgs/development/python-modules/orderly-set/default.nix
index be269ed8c173..3d7c05c53fb3 100644
--- a/pkgs/development/python-modules/orderly-set/default.nix
+++ b/pkgs/development/python-modules/orderly-set/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  setuptools,
+  flit-core,
 
   # tests
   pytestCheckHook,
@@ -12,18 +12,18 @@
 
 buildPythonPackage rec {
   pname = "orderly-set";
-  version = "5.4.1";
+  version = "5.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "seperman";
     repo = "orderly-set";
     tag = version;
-    hash = "sha256-0B8qnXU6oET1J933uTVDf2XIHwNzecxQ3FiP7EMnxQc=";
+    hash = "sha256-xrxH/LB+cyZlVf+sVwOtAf9+DojYPDnudHpqlVuARLg=";
   };
 
   build-system = [
-    setuptools
+    flit-core
   ];
 
   pythonImportsCheck = [

From 7293d95edecf168eddb4a1062fc23d3378264a53 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:55 +0200
Subject: [PATCH 1068/3724] python3Packages.orgparse: 0.4.20231004 ->
 0.4.20250520

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/orgparse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/orgparse/default.nix b/pkgs/development/python-modules/orgparse/default.nix
index 65b99928cd61..025f607958f8 100644
--- a/pkgs/development/python-modules/orgparse/default.nix
+++ b/pkgs/development/python-modules/orgparse/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "orgparse";
-  version = "0.4.20231004";
+  version = "0.4.20250520";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pOOK6tq/mYiw9npmrNCCedGCILy8QioSkGDCiQu6kaA=";
+    hash = "sha256-ZHL9Ft3Ku1I5GFBchlJjq/oFrIC1k+ZooInNopGxot4=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From eebbc829049a2d165f57dda910e13d846ef37d9b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:56 +0200
Subject: [PATCH 1069/3724] python3Packages.osxphotos: 0.69.2 -> 0.72.1

https://github.com/RhetTbull/osxphotos/blob/v0.72.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/osxphotos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix
index eece6a6c86b3..d4cef60586d9 100644
--- a/pkgs/development/python-modules/osxphotos/default.nix
+++ b/pkgs/development/python-modules/osxphotos/default.nix
@@ -35,14 +35,14 @@
 
 buildPythonPackage rec {
   pname = "osxphotos";
-  version = "0.69.2";
+  version = "0.72.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "RhetTbull";
     repo = "osxphotos";
     tag = "v${version}";
-    hash = "sha256-uVcoGIfxz+jKirnE3giST/v20eA5pq+LHgrsRb5b+Lc=";
+    hash = "sha256-6BUdF2l/C0Zim7ei/t4DKs4RUIDMWikhZmhattYrXmg=";
   };
 
   build-system = [ setuptools ];

From f1d1074a3b3710c6b950464eda5aea73305eb59b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:56 +0200
Subject: [PATCH 1070/3724] python3Packages.outlines: 0.1.13 -> 1.2.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/outlines/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix
index f29fdac01667..6cef333055bd 100644
--- a/pkgs/development/python-modules/outlines/default.nix
+++ b/pkgs/development/python-modules/outlines/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "outlines";
-  version = "0.1.13";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "outlines-dev";
     repo = "outlines";
     tag = version;
-    hash = "sha256-HuJqLbBHyoyY5ChQQi+9ftvPjLuh63Guk2w6KSZxq6s=";
+    hash = "sha256-WmkA+plIouEzleo3yoSxfCjK0E3EfMGQIPl20aIKxl8=";
   };
 
   build-system = [

From c8afd15d4fd53ff7d9fb1a3fd42f433441577d69 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:57 +0200
Subject: [PATCH 1071/3724] python3Packages.packageurl-python: 0.16.0 -> 0.17.3

https://github.com/package-url/packageurl-python/blob/v0.17.3/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/packageurl-python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix
index c3d4e4e792ba..8d8eb1394455 100644
--- a/pkgs/development/python-modules/packageurl-python/default.nix
+++ b/pkgs/development/python-modules/packageurl-python/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "packageurl-python";
-  version = "0.16.0";
+  version = "0.17.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "packageurl_python";
     inherit version;
-    hash = "sha256-aeO/ijky/pwkAPVqrrn4aRHs7i+TmNvhtY7DQ0C+Nl0=";
+    hash = "sha256-cZmV8Mf3BokCd7pX7JWvyqlpbINqdnV3ChJ5sBpB974=";
   };
 
   build-system = [ setuptools ];

From edce21ad7135f2959fe4f2556cf22a7a7da725f0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:57 +0200
Subject: [PATCH 1072/3724] python3Packages.panel: 1.7.2 -> 1.7.5

https://github.com/holoviz/panel/releases/tag/v1.7.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix
index 5269e2bf612e..85779346c836 100644
--- a/pkgs/development/python-modules/panel/default.nix
+++ b/pkgs/development/python-modules/panel/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "panel";
-  version = "1.7.2";
+  version = "1.7.5";
 
   format = "wheel";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # tries to fetch even more artifacts
   src = fetchPypi {
     inherit pname version format;
-    hash = "sha256-5gFBqEupP+v/W+tWe+x9wScejTJcvaplXtt1Gidoazo=";
+    hash = "sha256-HDtKM11W1aoM9dbhw2hKKX4kpiz5k0XF6euFUoN7l8M=";
     dist = "py3";
     python = "py3";
   };

From 763d843b44d917bc5b7506df2e886e1e852464e7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:58 +0200
Subject: [PATCH 1073/3724] python3Packages.panphon: 0.22.0 -> 0.22.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/panphon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/panphon/default.nix b/pkgs/development/python-modules/panphon/default.nix
index 230c7a310ba8..183d440da9de 100644
--- a/pkgs/development/python-modules/panphon/default.nix
+++ b/pkgs/development/python-modules/panphon/default.nix
@@ -18,12 +18,12 @@
 
 buildPythonPackage rec {
   pname = "panphon";
-  version = "0.22.0";
+  version = "0.22.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-iSdCZjzeZhxsrkaRYHpg60evmo9g09a9Fwr0I5WWd1A=";
+    hash = "sha256-OD1HfVh/66HKWoKHjiT+d8FkXW++ngHJ6X1JjYopujU=";
   };
 
   build-system = [ setuptools ];

From c1a727a18ee9ac413f1306995190c2c9300cef18 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:58 +0200
Subject: [PATCH 1074/3724] python3Packages.paramiko: 3.5.1 -> 4.0.0

https://github.com/paramiko/paramiko/blob/4.0.0/sites/www/changelog.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/paramiko/default.nix            | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix
index c779ec730b49..7cb53debdf75 100644
--- a/pkgs/development/python-modules/paramiko/default.nix
+++ b/pkgs/development/python-modules/paramiko/default.nix
@@ -3,7 +3,6 @@
   bcrypt,
   buildPythonPackage,
   cryptography,
-  fetchpatch,
   fetchPypi,
   gssapi,
   icecream,
@@ -18,23 +17,14 @@
 
 buildPythonPackage rec {
   pname = "paramiko";
-  version = "3.5.1";
+  version = "4.0.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ssZlvEWyshW9fX8DmQGxSwZ9oA86EeZkCZX9WPJmSCI=";
+    hash = "sha256-aiXwezgMycmojSuSCtNxZ6xGZ/jZiGzOvY+Q9lS11p8=";
   };
 
-  patches = [
-    # Fix usage of dsa keys
-    # https://github.com/paramiko/paramiko/pull/1606/
-    (fetchpatch {
-      url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch";
-      hash = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [

From 60bbd2437466685a01d74a33f28c0f8d94091f70 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:59 +0200
Subject: [PATCH 1075/3724] python3Packages.partial-json-parser: 0.2.1.1.post5
 -> 0.2.1.1.post6

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/partial-json-parser/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/partial-json-parser/default.nix b/pkgs/development/python-modules/partial-json-parser/default.nix
index f356e6e0a312..6125d6a66c18 100644
--- a/pkgs/development/python-modules/partial-json-parser/default.nix
+++ b/pkgs/development/python-modules/partial-json-parser/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "partial-json-parser";
-  version = "0.2.1.1.post5";
+  version = "0.2.1.1.post6";
   pyproject = true;
 
   src = fetchPypi {
     pname = "partial_json_parser";
     inherit version;
-    hash = "sha256-mScQrGfpCzZ5IdUnJ2mJKAQPdxO6fsszuWNx6nrsgso=";
+    hash = "sha256-Q4lraJKWeCJMu+SISmpf6SUd7UswuLfX61aeX+6pOvw=";
   };
 
   build-system = [ pdm-backend ];

From 606898fab1a8ad23204f5796702a479a2336c718 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:59 +0200
Subject: [PATCH 1076/3724] python3Packages.path: 17.1.0 -> 17.1.1

https://github.com/jaraco/path/blob/v17.1.1/NEWS.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/path/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix
index 1f7c3361eb3a..1fa86795c4af 100644
--- a/pkgs/development/python-modules/path/default.nix
+++ b/pkgs/development/python-modules/path/default.nix
@@ -11,16 +11,20 @@
 
 buildPythonPackage rec {
   pname = "path";
-  version = "17.1.0";
+  version = "17.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1B4F7U+h1PbXAt88HgoaJV17VEKHQyRWRV3HxR5fmOk=";
+    hash = "sha256-Lfy/7ItNlg80acUqzxMxE8KovxKse5jWKfqRr4ckjUI=";
   };
 
+  postPatch = ''
+    sed -i "/coherent\.licensed/d" pyproject.toml
+  '';
+
   nativeBuildInputs = [
     setuptools
     setuptools-scm

From acce0ab398dae60455d85242c2567027b32c46f8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:41:59 +0200
Subject: [PATCH 1077/3724] python3Packages.pathvalidate: 3.2.3 -> 3.3.1

https://github.com/thombashi/pathvalidate/releases/tag/v3.3.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pathvalidate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pathvalidate/default.nix b/pkgs/development/python-modules/pathvalidate/default.nix
index 0927f880fd46..f4c8a5133500 100644
--- a/pkgs/development/python-modules/pathvalidate/default.nix
+++ b/pkgs/development/python-modules/pathvalidate/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pathvalidate";
-  version = "3.2.3";
+  version = "3.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WbW5J44wOC1tITSXYjBD6+Y/EOKQVb5EGanATHIXOcs=";
+    hash = "sha256-sYwHISv+rWJDRbuOHWFBzc8Vo5c2mU6guUA1rSsboXc=";
   };
 
   build-system = [ setuptools-scm ];

From a2001f2ef1927f56c1b0c94ad9f58f5aa70a9f15 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:00 +0200
Subject: [PATCH 1078/3724] python3Packages.pcffont: 0.0.20 -> 0.0.21

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pcffont/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pcffont/default.nix b/pkgs/development/python-modules/pcffont/default.nix
index 952e466262dd..59cff062a80b 100644
--- a/pkgs/development/python-modules/pcffont/default.nix
+++ b/pkgs/development/python-modules/pcffont/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pcffont";
-  version = "0.0.20";
+  version = "0.0.21";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pcffont";
     inherit version;
-    hash = "sha256-dkf0irrrlSoj8TH+C/kmkVPJORWGl0EbgvckfPBes7I=";
+    hash = "sha256-RWmR6shNFuJytOfRAVTiNdIJMRpkBchBj8zOy4ybE9o=";
   };
 
   build-system = [ hatchling ];

From 5b4170e39f1eb3529c321f70aec262a906cf32fc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:01 +0200
Subject: [PATCH 1079/3724] python3Packages.peft: 0.15.2 -> 0.17.0

https://github.com/huggingface/peft/releases/tag/v0.17.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/peft/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix
index e77696cae0df..e29a2eee51fc 100644
--- a/pkgs/development/python-modules/peft/default.nix
+++ b/pkgs/development/python-modules/peft/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "peft";
-  version = "0.15.2";
+  version = "0.17.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "peft";
     tag = "v${version}";
-    hash = "sha256-c9oHBQCdJpPAeI7xwePXx75Sp39I8QVjRZSxxSOm2PM=";
+    hash = "sha256-YkJGVSeeEs+ErOUgRL5OXDUaJDqABjOTicM+1gX+CDM=";
   };
 
   build-system = [ setuptools ];
@@ -102,6 +102,9 @@ buildPythonPackage rec {
     "tests/test_tuners_utils.py"
     "tests/test_vision_models.py"
     "tests/test_xlora.py"
+    "tests/test_target_parameters.py"
+    "tests/test_seq_classifier.py"
+    "tests/test_low_level_api.py"
   ];
 
   meta = {

From 1809a95a5af98c00e95a1ed65bcad635aa505228 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:01 +0200
Subject: [PATCH 1080/3724] python3Packages.pg8000: 1.31.2 -> 1.31.4

https://github.com/tlocke/pg8000#release-notes

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pg8000/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index 2500db486c60..094ee63ca9a1 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pg8000";
-  version = "1.31.2";
+  version = "1.31.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HqRs8J2Oygf+fqre/XlR43vuf6vmdd8WTxpXL/swCHY=";
+    hash = "sha256-5+zOQzmJHyewsi4veeue/kQRi9OEIHNZ/Bg1D3iKzgA=";
   };
 
   build-system = [

From 480189e421ba0d3d385951a2acab35b3eb30ebbd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:02 +0200
Subject: [PATCH 1081/3724] python3Packages.pgmpy: 0.1.26 -> 1.0.0

https://github.com/pgmpy/pgmpy/releases/tag/v1.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pgmpy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pgmpy/default.nix b/pkgs/development/python-modules/pgmpy/default.nix
index 6e9f962c60bd..80d79d8978f5 100644
--- a/pkgs/development/python-modules/pgmpy/default.nix
+++ b/pkgs/development/python-modules/pgmpy/default.nix
@@ -27,14 +27,14 @@
 }:
 buildPythonPackage rec {
   pname = "pgmpy";
-  version = "0.1.26";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pgmpy";
     repo = "pgmpy";
     tag = "v${version}";
-    hash = "sha256-RusVREhEXYaJuQXTaCQ7EJgbo4+wLB3wXXCAc3sBGtU=";
+    hash = "sha256-WmRtek3lN7vEfXqoaZDiaNjMQ7R2PmJ/OEwxOV7m5sE=";
   };
 
   dependencies = [
@@ -78,7 +78,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Library for learning (Structure and Parameter), inference (Probabilistic and Causal), and simulations in Bayesian Networks";
     homepage = "https://github.com/pgmpy/pgmpy";
-    changelog = "https://github.com/pgmpy/pgmpy/releases/tag/v${version}";
+    changelog = "https://github.com/pgmpy/pgmpy/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ happysalada ];
   };

From f977bbc855e6263499928ab29bc05c88a66a6f2f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:02 +0200
Subject: [PATCH 1082/3724] python3Packages.pgspecial: 2.1.3 -> 2.2.1

https://github.com/dbcli/pgspecial/releases/tag/v2.2.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pgspecial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix
index 641416809161..5876bab95168 100644
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pgspecial";
-  version = "2.1.3";
+  version = "2.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-bU0jFq/31HlU25nUw5HWwLsmVo68udFR9l2reTi2y+I=";
+    hash = "sha256-2mx/zHvve7ATLcIEb3TsZROx/m8MgOVSjWMNFLfEhJ0=";
   };
 
   build-system = [ setuptools ];

From 0e00c8dc570641348911f2c76396b91b99d471eb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:03 +0200
Subject: [PATCH 1083/3724] python3Packages.phik: 0.12.4 -> 0.12.5

https://github.com/KaveIO/PhiK/blob/v0.12.5/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/phik/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix
index 90c5eebb2721..72e4d48abf2f 100644
--- a/pkgs/development/python-modules/phik/default.nix
+++ b/pkgs/development/python-modules/phik/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "phik";
-  version = "0.12.4";
+  version = "0.12.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "KaveIO";
     repo = "PhiK";
     tag = "v${version}";
-    hash = "sha256-YsH7vVn6gzejunUjUY/RIcvWtaQ/W1gbciJWKi5LDTk=";
+    hash = "sha256-/Zzin3IHwlFEDQwKjzTwY4ET2r0k3Ne/2lGzXkur9p8=";
   };
 
   build-system = [
@@ -67,7 +67,7 @@ buildPythonPackage rec {
       Pearson’s hypothesis test of independence of two variables.
     '';
     homepage = "https://phik.readthedocs.io/";
-    changelog = "https://github.com/KaveIO/PhiK/blob/${version}/CHANGES.rst";
+    changelog = "https://github.com/KaveIO/PhiK/blob/${src.tag}/CHANGES.rst";
     license = licenses.asl20;
     maintainers = with maintainers; [ melsigl ];
   };

From e72439855e5fe591c0b0345da007ecea9fd039b9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:03 +0200
Subject: [PATCH 1084/3724] python3Packages.phonenumbers: 9.0.5 -> 9.0.10

https://github.com/daviddrysdale/python-phonenumbers/blob/v9.0.10/python/HISTORY.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/phonenumbers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index e8b59a144158..ce2ab2e57b44 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "9.0.5";
+  version = "9.0.10";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cP3haKkt2cc/V4cjWVFRgdbN5ruOfsVmDpTEykVpLFA=";
+    hash = "sha256-wtFaap0FNLFKd2T1EkatqZVj4mP2W4CwJR0adgrEobo=";
   };
 
   build-system = [ setuptools ];

From cb8d895df44042ff5b6c61f959ac5bb451352c80 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:04 +0200
Subject: [PATCH 1085/3724] python3Packages.pillow-avif-plugin: 1.4.6 -> 1.5.2

This commit was automatically generated using update-python-libraries.
---
 .../pillow-avif-plugin/default.nix            | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pillow-avif-plugin/default.nix b/pkgs/development/python-modules/pillow-avif-plugin/default.nix
index 3750e1d1dd4c..4f06ceba1bb5 100644
--- a/pkgs/development/python-modules/pillow-avif-plugin/default.nix
+++ b/pkgs/development/python-modules/pillow-avif-plugin/default.nix
@@ -1,25 +1,32 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   libavif,
   pillow,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pillow-avif-plugin";
-  version = "1.4.6";
+  version = "1.5.2";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-hVz1DQP2/Bbh/V42SzzqC3n0v5DTn/ISOWlzXYUeCLo=";
+  src = fetchFromGitHub {
+    owner = "fdintino";
+    repo = "pillow-avif-plugin";
+    tag = "v${version}";
+    hash = "sha256-gdDVgVNympxlTzj1VUqO+aU1/xWNjDm97a0biOTlKtA=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
+
   buildInputs = [ libavif ];
-  propagatedBuildInputs = [ pillow ];
+
+  dependencies = [ pillow ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {
     description = "Pillow plugin that adds support for AVIF files";

From c277d3058438113849a9f951b22cd9608333b6b6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:05 +0200
Subject: [PATCH 1086/3724] python3Packages.pillow-heif: 0.22.0 -> 1.1.0

https://github.com/bigcat88/pillow_heif/releases/tag/v1.1.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pillow-heif/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix
index 55114a3c6672..69826e90b683 100644
--- a/pkgs/development/python-modules/pillow-heif/default.nix
+++ b/pkgs/development/python-modules/pillow-heif/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "pillow-heif";
-  version = "0.22.0";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bigcat88";
     repo = "pillow_heif";
     tag = "v${version}";
-    hash = "sha256-xof6lFb0DhmWVmYuBNslcGZs82NRkcgZgt+SX9gsrBY=";
+    hash = "sha256-CY//orCEKBfgHF7lTTSMenDsvf9NOQo8iiQS3p9NMH8=";
   };
 
   postPatch = ''

From 4e7c308fa67b26a031a6c20e451417ba17d7b86c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:05 +0200
Subject: [PATCH 1087/3724] python3Packages.pinecone-client: 5.4.2 -> 7.3.0

https://github.com/pinecone-io/pinecone-python-client/releases/tag/v7.3.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pinecone-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix
index eff92a25eec1..a1aee13ecc50 100644
--- a/pkgs/development/python-modules/pinecone-client/default.nix
+++ b/pkgs/development/python-modules/pinecone-client/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "pinecone-client";
-  version = "5.4.2";
+  version = "7.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "pinecone-io";
     repo = "pinecone-python-client";
     tag = "v${version}";
-    hash = "sha256-5BCjqcJ+xCTTF/Q+PrgNV4Y/GcT2cfNqvY1ydUL6EZ8=";
+    hash = "sha256-PT8Jr3sq5iZ9VFt6H6t4lLk72FXnHdyPUbcNGftg4QU=";
   };
 
   build-system = [
@@ -56,7 +56,7 @@ buildPythonPackage rec {
   meta = {
     description = "Pinecone python client";
     homepage = "https://www.pinecone.io/";
-    changelog = "https://github.com/pinecone-io/pinecone-python-client/releases/tag/v${version}";
+    changelog = "https://github.com/pinecone-io/pinecone-python-client/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ happysalada ];
   };

From 6f07657f718248c43a12361e12796ae3952b1fd6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:05 +0200
Subject: [PATCH 1088/3724] python3Packages.pins: 0.8.7 -> 0.9.0

https://github.com/rstudio/pins-python/releases/tag/v0.9.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pins/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pins/default.nix b/pkgs/development/python-modules/pins/default.nix
index e30b2f326a3e..1a2d5b2a05ff 100644
--- a/pkgs/development/python-modules/pins/default.nix
+++ b/pkgs/development/python-modules/pins/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "pins";
-  version = "0.8.7";
+  version = "0.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "rstudio";
     repo = "pins-python";
     tag = "v${version}";
-    hash = "sha256-79TVAfr872Twc7D2iej51jiKNwZ9ESOa66ItNDmyfFM=";
+    hash = "sha256-1NoJ2PA0ov9ZOWaZdlajV23UqTelRzfW7jESMsfOxkg=";
   };
 
   build-system = [
@@ -89,7 +89,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to publishes data, models and other Python objects";
     homepage = "https://github.com/rstudio/pins-python";
-    changelog = "https://github.com/rstudio/pins-python/releases/tag/v${version}";
+    changelog = "https://github.com/rstudio/pins-python/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From 5a282b8d162de0307038c5210ddcd2d2a9b5c713 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:06 +0200
Subject: [PATCH 1089/3724] python3Packages.pip-system-certs: 4.0 -> 5.2

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pip-system-certs/default.nix      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pip-system-certs/default.nix b/pkgs/development/python-modules/pip-system-certs/default.nix
index 0476aed56212..3503ba4d8405 100644
--- a/pkgs/development/python-modules/pip-system-certs/default.nix
+++ b/pkgs/development/python-modules/pip-system-certs/default.nix
@@ -3,29 +3,27 @@
   buildPythonPackage,
   fetchPypi,
   setuptools-scm,
-  wheel,
   git-versioner,
-  wrapt,
+  pip,
 }:
 
 buildPythonPackage rec {
   pname = "pip-system-certs";
-  version = "4.0";
+  version = "5.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "pip_system_certs";
-    hash = "sha256-245qMTiNl5XskTmVffGon6UnT7ZhZEVv0JGl0+lMNQw=";
+    hash = "sha256-gLd2tc8XGRv5nTE2mbf84v24Tre7siX9E0EJqCcGQG8=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools-scm
-    wheel
     git-versioner
   ];
 
-  propagatedBuildInputs = [ wrapt ];
+  dependencies = [ pip ];
 
   pythonImportsCheck = [
     "pip_system_certs.wrapt_requests"

From 7f99ca4b3040478f7ce6d15b992a8d8dfc22f99a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:06 +0200
Subject: [PATCH 1090/3724] python3Packages.pip-tools: 7.4.1 -> 7.5.0

https://github.com/jazzband/pip-tools/releases/tag/7.5.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pip-tools/default.nix      | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index a5a04a886480..a6d8c36cb48c 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   build,
   click,
-  fetchPypi,
+  fetchFromGitHub,
   pep517,
   pip,
   pytest-xdist,
@@ -19,14 +19,16 @@
 
 buildPythonPackage rec {
   pname = "pip-tools";
-  version = "7.4.1";
+  version = "7.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-hkgm9Qc4ZEUOJNvuuFzjkgzfsJhIo9aev1N7Uh8UvMk=";
+  src = fetchFromGitHub {
+    owner = "jazzband";
+    repo = "pip-tools";
+    tag = "v${version}";
+    hash = "sha256-F2SuuY2tN0HEbkWMBdGVuWBwu2onOdMDcWLal8jke2s=";
   };
 
   patches = [ ./fix-setup-py-bad-syntax-detection.patch ];
@@ -82,6 +84,15 @@ buildPythonPackage rec {
     "test_no_candidates"
     "test_no_candidates_pre"
     "test_failure_of_legacy_resolver_prompts_for_backtracking"
+
+    # ValueError: I/O operation on closed file.
+    "test_indentation"
+
+    # unexpected warnings due to legacy resolver deprecation
+    "test_show_warning_on_default_strip_extras_option"
+
+    # generator fails to yield
+    "test_compile_build_targets_setuptools_no_wheel_dep"
   ];
 
   pythonImportsCheck = [ "piptools" ];

From db4561844a40da50c704a2ff3446c437d2f4f953 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:07 +0200
Subject: [PATCH 1091/3724] python3Packages.piqp: 0.4.2 -> 0.6.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/piqp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/piqp/default.nix b/pkgs/development/python-modules/piqp/default.nix
index 15b609181960..63c7bd058b37 100644
--- a/pkgs/development/python-modules/piqp/default.nix
+++ b/pkgs/development/python-modules/piqp/default.nix
@@ -20,7 +20,7 @@
 }:
 buildPythonPackage rec {
   pname = "piqp";
-  version = "0.4.2";
+  version = "0.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "PREDICT-EPFL";
     repo = "piqp";
     tag = "v${version}";
-    hash = "sha256-/lADjg4NyDdV9yeYBW2gbPydY8TfV247B/dI/ViRVlI=";
+    hash = "sha256-hVUeDV2GrBAOIgaWhg+RV+8CFRIm8Kv6/wCs5bXs2aY=";
   };
 
   postPatch =

From 8725558fea5643b7c52c02c4154552b422d91aee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:07 +0200
Subject: [PATCH 1092/3724] python3Packages.pixel-font-builder: 0.0.34 ->
 0.0.37

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/pixel-font-builder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix
index 0dd26012e434..66ef417e6b5d 100644
--- a/pkgs/development/python-modules/pixel-font-builder/default.nix
+++ b/pkgs/development/python-modules/pixel-font-builder/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pixel-font-builder";
-  version = "0.0.34";
+  version = "0.0.37";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pixel_font_builder";
     inherit version;
-    hash = "sha256-+t1N2GlIyPr7OHppP3h0TDQNYhrQCrBHc8fGyYq2AiM=";
+    hash = "sha256-qlF+dp2umL3H7l/9R5kbpFLOsaZnl5V2WjLaeXMzGls=";
   };
 
   build-system = [ hatchling ];

From deed86140353dcda3902c7de52782f2151661cc9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:08 +0200
Subject: [PATCH 1093/3724] python3Packages.pkg-about: 1.2.11 -> 1.3.7

https://github.com/karpierz/pkg_about/blob/1.3.7/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pkg-about/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix
index 58d217546d34..f357ec7d6732 100644
--- a/pkgs/development/python-modules/pkg-about/default.nix
+++ b/pkgs/development/python-modules/pkg-about/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pkg-about";
-  version = "1.2.11";
+  version = "1.3.7";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pkg_about";
     inherit version;
-    hash = "sha256-fm/b4Vm7YGTq+BXVltwRz42qXYULXL9KBCINB8mMuWI=";
+    hash = "sha256-xYGDHXLRWxqA7dxs4hhh+qsEcdNwSh1jvAhpyUdbJOg=";
   };
 
   # tox is listed in build requirements but not actually used to build

From 439466b87b100a025a30792ac408e92b5835f103 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:08 +0200
Subject: [PATCH 1094/3724] python3Packages.playwrightcapture: 1.29.1 -> 1.31.7

https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.31.7

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix
index a89e5305117c..bd8e3cd62cca 100644
--- a/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/pkgs/development/python-modules/playwrightcapture/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "playwrightcapture";
-  version = "1.29.1";
+  version = "1.31.7";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "Lookyloo";
     repo = "PlaywrightCapture";
     tag = "v${version}";
-    hash = "sha256-n2lVP+oThZ2hRVOadudaaNFU2KI14rrkG7ipJ0vrj20=";
+    hash = "sha256-+yVAqDbPuul9pZaEiABFVEmWbfq89SyCULHYRWpXKNc=";
   };
 
   pythonRelaxDeps = [

From be5228d318a286c906dc63fe81a5b6988932f31e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:09 +0200
Subject: [PATCH 1095/3724] python3Packages.poetry-dynamic-versioning: 1.7.0 ->
 1.9.1

https://github.com/mtkennerly/poetry-dynamic-versioning/blob/v1.9.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/poetry-dynamic-versioning/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
index fe2bec35dc90..c5910a0d79dd 100644
--- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
+++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "poetry-dynamic-versioning";
-  version = "1.7.0";
+  version = "1.9.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "mtkennerly";
     repo = "poetry-dynamic-versioning";
     tag = "v${version}";
-    hash = "sha256-V5UuODRwm829c1KPdQm9oqeN6YdcCo1ODDsEHbm4e/Y=";
+    hash = "sha256-SKVx20RrwhCpdDIc2Pu1oFaXWe2d2GnbJGUX7KqMvo0=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From 667c3db70f5c2d1cadc2f32cc35af606c43976e4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:10 +0200
Subject: [PATCH 1096/3724] python3Packages.portalocker: 3.1.1 -> 3.2.0

https://github.com/wolph/portalocker/releases/tag/v3.2.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/portalocker/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix
index cb01274dfea1..4c45509dc8de 100644
--- a/pkgs/development/python-modules/portalocker/default.nix
+++ b/pkgs/development/python-modules/portalocker/default.nix
@@ -14,19 +14,21 @@
   # tests
   pygments,
   pytest-cov-stub,
+  pytest-rerunfailures,
+  pytest-timeout,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "portalocker";
-  version = "3.1.1";
+  version = "3.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7CD23aKtnOifo5ml8x9PFJX1FZWPDLfKZUPO97tadJ4=";
+    hash = "sha256-HzAClWpUqMNzBYbFx3vxj65BSeB+rxwp/D+vTVo/iaw=";
   };
 
   nativeBuildInputs = [
@@ -39,6 +41,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pygments
     pytest-cov-stub
+    pytest-rerunfailures
+    pytest-timeout
     pytestCheckHook
   ];
 

From 2488913a23efed1cb316eb4d6059f709f74c93b0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:10 +0200
Subject: [PATCH 1097/3724] python3Packages.portend: 3.2.0 -> 3.2.1

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/portend/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix
index 35bf5d1a8be5..6411878265e2 100644
--- a/pkgs/development/python-modules/portend/default.nix
+++ b/pkgs/development/python-modules/portend/default.nix
@@ -10,19 +10,23 @@
 
 buildPythonPackage rec {
   pname = "portend";
-  version = "3.2.0";
-  format = "pyproject";
+  version = "3.2.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-UlCjUsGclZ12fKyHi4Kdk+XcdiWlFDOZoqANxmKP+3I=";
+    hash = "sha256-qp1Aqx+eFL231AH0IhDfNdAXybl5kbrrGFaM7fuMZIk=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  postPatch = ''
+    sed -i "/coherent\.licensed/d" pyproject.toml;
+  '';
 
-  propagatedBuildInputs = [ tempora ];
+  build-system = [ setuptools-scm ];
+
+  dependencies = [ tempora ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From a8c8c2469c525998245a5e978f8793f96cc1feb9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:11 +0200
Subject: [PATCH 1098/3724] python3Packages.primer3: 2.1.0 -> 2.2.0

https://github.com/libnano/primer3-py/blob/v2.2.0/CHANGES

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/primer3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix
index 12fe9407cb73..2c93e066ad14 100644
--- a/pkgs/development/python-modules/primer3/default.nix
+++ b/pkgs/development/python-modules/primer3/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "primer3";
-  version = "2.1.0";
+  version = "2.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "libnano";
     repo = "primer3-py";
     tag = "v${version}";
-    hash = "sha256-Kp4JH57gEdj7SzY+7XGBzGloWuTSwUQRBK9QbgXQfUE=";
+    hash = "sha256-GrVYYjS/+LZScZETfk7YcSy2yrWc3SPumXvyQeEpFUg=";
   };
 
   build-system = [ setuptools ];

From 0694366b2ad7b4aeb8746c4f37054bfbf272902e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:11 +0200
Subject: [PATCH 1099/3724] python3Packages.progress: 1.6 -> 1.6.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/progress/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/progress/default.nix b/pkgs/development/python-modules/progress/default.nix
index 20c2954a10f7..26edbf0a1d58 100644
--- a/pkgs/development/python-modules/progress/default.nix
+++ b/pkgs/development/python-modules/progress/default.nix
@@ -2,21 +2,26 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   python,
 }:
 
 buildPythonPackage rec {
-  version = "1.6";
-  format = "setuptools";
+  version = "1.6.1";
   pname = "progress";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c9c86e98b5c03fa1fe11e3b67c1feda4788b8d0fe7336c2ff7d5644ccfba34cd";
+    hash = "sha256-wbpxn4Ys6IUjKnWeq0eXH+dN/Hu3arilHvWUC601CGw=";
   };
 
+  build-system = [ setuptools ];
+
   checkPhase = ''
+    runHook preCheck
     ${python.interpreter} test_progress.py
+    runHook postCheck
   '';
 
   meta = with lib; {

From b25a3c7565e4e9557e98f18522c93fd035c41840 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:12 +0200
Subject: [PATCH 1100/3724] python3Packages.prometheus-client: 0.22.0 -> 0.22.1

https://github.com/prometheus/client_python/releases/tag/v0.22.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/prometheus-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix
index 1efd9a4d9a1c..88e9c6fff24e 100644
--- a/pkgs/development/python-modules/prometheus-client/default.nix
+++ b/pkgs/development/python-modules/prometheus-client/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "prometheus-client";
-  version = "0.22.0";
+  version = "0.22.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "prometheus";
     repo = "client_python";
     tag = "v${version}";
-    hash = "sha256-JLkDFciDsfjfrA7BiIq3js+UtLRA/lzcdFvqPhUJyB8=";
+    hash = "sha256-DEuIoVpRDJTd9qXBeHa5jrBscmGgosCKAluqCuUBzuU=";
   };
 
   build-system = [ setuptools ];

From f86b0ddedf641e34e65e39db72c601e579b71db0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:12 +0200
Subject: [PATCH 1101/3724] python3Packages.propcache: 0.3.1 -> 0.3.2

https://github.com/aio-libs/propcache/blob/v0.3.2/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/propcache/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/propcache/default.nix b/pkgs/development/python-modules/propcache/default.nix
index 67fbfd5422a2..b07c062c96fb 100644
--- a/pkgs/development/python-modules/propcache/default.nix
+++ b/pkgs/development/python-modules/propcache/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "propcache";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "aio-libs";
     repo = "propcache";
     tag = "v${version}";
-    hash = "sha256-sVZsa6WkG1wUj9G+1vzgT+HT4fWLBqRNmn5nlEj5J0w=";
+    hash = "sha256-G8SLIZaJUu3uwyFicrQF+PjKp3vsUh/pNUsmDpnnAAg=";
   };
 
   postPatch = ''

From 673022fc3657d77bb10fc0d4f7d21e9ca0370044 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:13 +0200
Subject: [PATCH 1102/3724] python3Packages.protego: 0.4.0 -> 0.5.0

https://github.com/scrapy/protego/blob/0.5.0/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/protego/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix
index 5823c42526c0..372715859af0 100644
--- a/pkgs/development/python-modules/protego/default.nix
+++ b/pkgs/development/python-modules/protego/default.nix
@@ -2,14 +2,14 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  hatchling,
   pytestCheckHook,
   pythonOlder,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "protego";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,10 +18,10 @@ buildPythonPackage rec {
     owner = "scrapy";
     repo = "protego";
     tag = version;
-    hash = "sha256-2vyETqRYeof5CzOCXCGUYb5vSyV/eT5+lm2GNWiuaF0=";
+    hash = "sha256-70/DPap3FgLfh4ldYSve5Pt8o7gM1lME/OmRFaew/38=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 70d1d0051edccf70d60bbf6ebd63e22137564844 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:13 +0200
Subject: [PATCH 1103/3724] python3Packages.prov: 2.0.1 -> 2.1.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/prov/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix
index f4606cda7f48..ef7361277d5e 100644
--- a/pkgs/development/python-modules/prov/default.nix
+++ b/pkgs/development/python-modules/prov/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "prov";
-  version = "2.0.1";
+  version = "2.1.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-DiOMFAXRpVxyvTmzttc9b3q/2dCn+rLsBpOhmimlYX8=";
+    hash = "sha256-fQErFk9bu0LhGO2dJXiKsBLQkIK3Iryd1OgRownqV/U=";
   };
 
   propagatedBuildInputs = [

From 934dcca7f6800e2e4555a4302e6feb7478724b11 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:14 +0200
Subject: [PATCH 1104/3724] python3Packages.proxy-py: 2.4.9 -> 2.4.10

https://github.com/abhinavsingh/proxy.py/releases/tag/v2.4.10

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/proxy-py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix
index fd4779abeab3..7011a191dc07 100644
--- a/pkgs/development/python-modules/proxy-py/default.nix
+++ b/pkgs/development/python-modules/proxy-py/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "proxy-py";
-  version = "2.4.9";
+  version = "2.4.10";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "abhinavsingh";
     repo = "proxy.py";
     tag = "v${version}";
-    hash = "sha256-q7GfPVPtlH5XlOFDEHUwLYp5ZSBF4lrZOU2AsktHlcI=";
+    hash = "sha256-47Qt8J60QFfHUSquD17xMfl+wBTsSimaPSRvS/sSPMI=";
   };
 
   postPatch = ''

From 9c5b166446dcc00e3f10f5492741908d723b2abc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:14 +0200
Subject: [PATCH 1105/3724] python3Packages.pscript: 0.7.7 -> 0.8.0

https://github.com/flexxui/pscript/blob/v0.8.0/docs/releasenotes.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pscript/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pscript/default.nix b/pkgs/development/python-modules/pscript/default.nix
index 499f479b4d88..c9673c7eb900 100644
--- a/pkgs/development/python-modules/pscript/default.nix
+++ b/pkgs/development/python-modules/pscript/default.nix
@@ -2,15 +2,15 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  flit-core,
   pytestCheckHook,
   nodejs,
   pythonOlder,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pscript";
-  version = "0.7.7";
+  version = "0.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,10 +19,10 @@ buildPythonPackage rec {
     owner = "flexxui";
     repo = "pscript";
     tag = "v${version}";
-    hash = "sha256-AhVI+7FiWyH+DfAXnau4aAHJAJtsWEpmnU90ey2z35o=";
+    hash = "sha256-pqjig3dFJ4zfpor6TT6fiBMS7lAtJE/bAYbzl46W/YY=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ flit-core ];
 
   nativeCheckInputs = [
     pytestCheckHook
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python to JavaScript compiler";
     homepage = "https://pscript.readthedocs.io";
-    changelog = "https://github.com/flexxui/pscript/blob/v${version}/docs/releasenotes.rst";
+    changelog = "https://github.com/flexxui/pscript/blob/${src.tag}/docs/releasenotes.rst";
     license = licenses.bsd2;
     maintainers = with maintainers; [ matthiasbeyer ];
   };

From 51f5a811737d1860ff8869f84276dc8334f50caf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:14 +0200
Subject: [PATCH 1106/3724] python3Packages.psygnal: 0.13.0 -> 0.14.0

https://github.com/pyapp-kit/psygnal/blob/v0.14.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/psygnal/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix
index f5fe9fff8ded..40191587278b 100644
--- a/pkgs/development/python-modules/psygnal/default.nix
+++ b/pkgs/development/python-modules/psygnal/default.nix
@@ -7,6 +7,7 @@
   mypy-extensions,
   numpy,
   pydantic,
+  pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
   toolz,
@@ -17,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "psygnal";
-  version = "0.13.0";
+  version = "0.14.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -26,7 +27,7 @@ buildPythonPackage rec {
     owner = "pyapp-kit";
     repo = "psygnal";
     tag = "v${version}";
-    hash = "sha256-ZEN8S2sI1usXl5A1Ow1+l4BBB6qNnlVt/nvFtAX4maY=";
+    hash = "sha256-RQ53elonwvna5UDVell3JI1dcZSMHREyB51r+ddsW2M=";
   };
 
   build-system = [
@@ -42,6 +43,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     numpy
     pydantic
+    pytest-asyncio
     pytestCheckHook
     toolz
     wrapt

From 3ca4fa576461c04843e68682ffdd3ddd6e5bc275 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:15 +0200
Subject: [PATCH 1107/3724] python3Packages.ptpython: 3.0.29 -> 3.0.30

https://github.com/prompt-toolkit/ptpython/blob/3.0.30/CHANGELOG

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ptpython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix
index 3ec9a6f76d76..2d6a19ca74ef 100644
--- a/pkgs/development/python-modules/ptpython/default.nix
+++ b/pkgs/development/python-modules/ptpython/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "ptpython";
-  version = "3.0.29";
+  version = "3.0.30";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-udYlGDrvk6Zz/DLL4cH8r1FBLnpPGVkFIc2syt8lGG4=";
+    hash = "sha256-UaB/m46/hDWlqusigxzKSlLocCl3GiY33ydjx509h3Y=";
   };
 
   build-system = [ setuptools ];

From 35c753c483f9831c1c0344e338fa3e79e344e56b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:15 +0200
Subject: [PATCH 1108/3724] python3Packages.pulumi-aws: 6.66.3 -> 7.2.0

https://github.com/pulumi/pulumi-aws/releases/tag/v7.2.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pulumi-aws/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix
index 30983db1986b..5d4928938c26 100644
--- a/pkgs/development/python-modules/pulumi-aws/default.nix
+++ b/pkgs/development/python-modules/pulumi-aws/default.nix
@@ -12,7 +12,7 @@
 buildPythonPackage rec {
   pname = "pulumi-aws";
   # Version is independent of pulumi's.
-  version = "6.66.3";
+  version = "7.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "pulumi";
     repo = "pulumi-aws";
     tag = "v${version}";
-    hash = "sha256-BPL4B0KwXQld+/aPTJKhsFMPEbJByccTj+Zs70b8O6A=";
+    hash = "sha256-fYcApSVMBSlw9YMf1J5PRma8GXPCGKDpnPd1BXJh5EE=";
   };
 
   sourceRoot = "${src.name}/sdk/python";

From 0df24af4ed8fbbe05ff941acb5218265a1082f4d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:16 +0200
Subject: [PATCH 1109/3724] python3Packages.puremagic: 1.28 -> 1.30

https://github.com/cdgriffith/puremagic/blob/1.30/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/puremagic/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix
index accf500a91fa..51cdabd8e0d6 100644
--- a/pkgs/development/python-modules/puremagic/default.nix
+++ b/pkgs/development/python-modules/puremagic/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "puremagic";
-  version = "1.28";
+  version = "1.30";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "cdgriffith";
     repo = "puremagic";
     tag = version;
-    hash = "sha256-a7jRQUSbH3E6eJiXNKr4ikdSXRZ6+/csl/EMiKXMzmk=";
+    hash = "sha256-k2xrcML8XxI9cMTQTv0pDLkOrmEr5mbDnVsyWuD1rEc=";
   };
 
   build-system = [ setuptools ];
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Implementation of magic file detection";
     homepage = "https://github.com/cdgriffith/puremagic";
-    changelog = "https://github.com/cdgriffith/puremagic/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/cdgriffith/puremagic/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ globin ];
   };

From d69b992493bf742a0f4521fa80c06d85b90ec381 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:16 +0200
Subject: [PATCH 1110/3724] python3Packages.py-ccm15: 0.0.9 -> 0.1.2

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/py-ccm15/default.nix            | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/py-ccm15/default.nix b/pkgs/development/python-modules/py-ccm15/default.nix
index aa4ccf9928e2..14008ca3f28d 100644
--- a/pkgs/development/python-modules/py-ccm15/default.nix
+++ b/pkgs/development/python-modules/py-ccm15/default.nix
@@ -9,9 +9,9 @@
   aiohttp,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "py-ccm15";
-  version = "0.0.9";
+  version = "0.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -20,8 +20,8 @@ buildPythonPackage {
     # Upstream does not have a tag for this release and this is the exact release commit
     # Therefore it should not be marked unstable
     # upstream issue: https://github.com/ocalvo/py-ccm15/issues/10
-    rev = "3891d840e69d241c85bf9486e7fe0bb3c7443980";
-    hash = "sha256-I2/AdG07PAvuC8rQKOIAUk7u3pJpANMaFpvEsejWeBU=";
+    tag = "v${version}";
+    hash = "sha256-QfitJzCFk0gnlcCvvKzuI4fS1lVm79q4xaDZFKKt458=";
   };
 
   build-system = [ setuptools ];
@@ -34,9 +34,15 @@ buildPythonPackage {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  disabledTests = [
+    # tests use outdated function signature
+    "test_async_set_state"
+  ];
+
   pythonImportsCheck = [ "ccm15" ];
 
   meta = {
+    changelog = "https://github.com/ocalvo/py-ccm15/releases/tag/${src.tag}";
     description = "Python Library to access a Midea CCM15 data converter";
     homepage = "https://github.com/ocalvo/py-ccm15";
     license = lib.licenses.mit;

From 02119bb7ce462c2f45c5ef943754e4255e26e3cd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:17 +0200
Subject: [PATCH 1111/3724] python3Packages.py-multiaddr: 0.0.9 -> 0.0.10

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/py-multiaddr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/py-multiaddr/default.nix b/pkgs/development/python-modules/py-multiaddr/default.nix
index 49ba5ea55091..92bc2ac0987d 100644
--- a/pkgs/development/python-modules/py-multiaddr/default.nix
+++ b/pkgs/development/python-modules/py-multiaddr/default.nix
@@ -14,15 +14,15 @@
 
 buildPythonPackage rec {
   pname = "py-multiaddr";
-  version = "0.0.9";
+  version = "0.0.10";
   format = "setuptools";
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = "multiformats";
     repo = "py-multiaddr";
-    rev = "v${version}";
-    hash = "sha256-cGM7iYQPP+UOkbTxRhzuED0pkcydFCO8vpx9wTc0/HI=";
+    tag = "v${version}";
+    hash = "sha256-N46D2H3RG6rtdBrSyDjh8UxD+Ph/FXEa4FcEI2uz4y8=";
   };
 
   postPatch = ''

From 83008ee916eee03e3d4df3f4f5948ce8906ef1e6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:18 +0200
Subject: [PATCH 1112/3724] python3Packages.py-serializable: 1.1.2 -> 2.1.0

https://github.com/madpah/serializable/blob/v2.1.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/py-serializable/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/py-serializable/default.nix b/pkgs/development/python-modules/py-serializable/default.nix
index 6cbf0a63200d..7b48a7c04950 100644
--- a/pkgs/development/python-modules/py-serializable/default.nix
+++ b/pkgs/development/python-modules/py-serializable/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "py-serializable";
-  version = "1.1.2";
+  version = "2.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "madpah";
     repo = "serializable";
     tag = "v${version}";
-    hash = "sha256-2A+QjokZ7gtgstclZ7PFSPymYjQYKsLVXy9xbFOfxLo=";
+    hash = "sha256-nou1/80t9d2iKOdZZbcN4SI3dlvuC8T55KMCP/cDEEU=";
   };
 
   build-system = [ poetry-core ];
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     xmldiff
   ];
 
-  pythonImportsCheck = [ "serializable" ];
+  pythonImportsCheck = [ "py_serializable" ];
 
   disabledTests = [
     # AssertionError: '<ns0[155 chars]itle>The Phoenix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library to aid with serialisation and deserialisation to/from JSON and XML";
     homepage = "https://github.com/madpah/serializable";
-    changelog = "https://github.com/madpah/serializable/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/madpah/serializable/blob/${src.tag}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

From 508eb5bead4029f5f5b25e0fa49cd09bd23ca701 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:19 +0200
Subject: [PATCH 1113/3724] python3Packages.py7zr: 0.22.0 -> 1.0.0

https://github.com/miurahr/py7zr/blob/v1.0.0/docs/Changelog.rst#v100

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/py7zr/default.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/py7zr/default.nix b/pkgs/development/python-modules/py7zr/default.nix
index 9e986b4cae52..0a96e999ec49 100644
--- a/pkgs/development/python-modules/py7zr/default.nix
+++ b/pkgs/development/python-modules/py7zr/default.nix
@@ -15,31 +15,25 @@
   texttable,
   py-cpuinfo,
   pytest-benchmark,
+  pytest-httpserver,
   pytest-remotedata,
   pytest-timeout,
   pytestCheckHook,
+  requests,
 }:
 
 buildPythonPackage rec {
   pname = "py7zr";
-  version = "0.22.0";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "miurahr";
     repo = "py7zr";
     tag = "v${version}";
-    hash = "sha256-YR2cuHZWwqrytidAMbNvRV1/N4UZG8AMMmzcTcG9FvY=";
+    hash = "sha256-uV4zBQZlHfHgM/NiVSjI5I9wJRk9i4ihJn4B2R6XRuM=";
   };
 
-  postPatch =
-    # Replace inaccessible mirror (qt.mirrors.tds.net):
-    # upstream PR: https://github.com/miurahr/py7zr/pull/637
-    ''
-      substituteInPlace tests/test_concurrent.py \
-        --replace-fail 'http://qt.mirrors.tds.net/qt/' 'https://download.qt.io/'
-    '';
-
   build-system = [
     setuptools
     setuptools-scm
@@ -60,9 +54,11 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     py-cpuinfo
     pytest-benchmark
+    pytest-httpserver
     pytest-remotedata
     pytest-timeout
     pytestCheckHook
+    requests
   ];
 
   pytestFlags = [ "--benchmark-disable" ];

From e82d5fbf781fb3c1222d9e2a5b5d27a1c03d54f0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:19 +0200
Subject: [PATCH 1114/3724] python3Packages.pyaml: 25.5.0 -> 25.7.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix
index e7902b1d72a4..7088ee5ae36b 100644
--- a/pkgs/development/python-modules/pyaml/default.nix
+++ b/pkgs/development/python-modules/pyaml/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "pyaml";
-  version = "25.5.0";
+  version = "25.7.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-V5lWDHscna81p6RTX1PiwwMj90y9fLTy5xWxbdaBpYo=";
+    hash = "sha256-4ROmTsFogb8rCS4r64S33PG9mAlq0X9fFOj7eCp12Zs=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 87db6f393290a9b71e6c57d47c58b48d1c7493c0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:20 +0200
Subject: [PATCH 1115/3724] python3Packages.pyaussiebb: 0.1.5 -> 0.1.6

https://github.com/yaleman/pyaussiebb/blob/v0.1.6/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pyaussiebb/default.nix      | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/pyaussiebb/default.nix b/pkgs/development/python-modules/pyaussiebb/default.nix
index 78875a02e780..190bc5f67288 100644
--- a/pkgs/development/python-modules/pyaussiebb/default.nix
+++ b/pkgs/development/python-modules/pyaussiebb/default.nix
@@ -4,32 +4,24 @@
   buildPythonPackage,
   fetchFromGitHub,
   loguru,
+  pdm-backend,
   pydantic,
-  poetry-core,
-  pythonOlder,
   requests,
 }:
 
 buildPythonPackage rec {
   pname = "pyaussiebb";
-  version = "0.1.5";
+  version = "0.1.6";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "yaleman";
     repo = "aussiebb";
     tag = "v${version}";
-    hash = "sha256-ejaHweoRNrJJq6XGeTrENco8SPwwu6rSpGzksu0CsCY=";
+    hash = "sha256-GD04Bq+uJs2JuTjtnGh6QKD4uFXwmGcOMB1Hu9yBlkI=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail 'requests = "^2.27.1"' 'requests = "*"'
-  '';
-
-  build-system = [ poetry-core ];
+  build-system = [ pdm-backend ];
 
   dependencies = [
     aiohttp
@@ -46,7 +38,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module for interacting with the Aussie Broadband APIs";
     homepage = "https://github.com/yaleman/aussiebb";
-    changelog = "https://github.com/yaleman/pyaussiebb/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/yaleman/pyaussiebb/blob/${src.tag}/CHANGELOG.md";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From 31004a177d95b81d3ac19ced8be005a63b29033e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:21 +0200
Subject: [PATCH 1116/3724] python3Packages.pyblu: 2.0.1 -> 2.0.4

https://github.com/LouisChrist/pyblu/releases/tag/v2.0.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyblu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyblu/default.nix b/pkgs/development/python-modules/pyblu/default.nix
index 5ba66443feda..5dd61924f9e5 100644
--- a/pkgs/development/python-modules/pyblu/default.nix
+++ b/pkgs/development/python-modules/pyblu/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/LouisChrist/pyblu/releases/tag/v${version}";
+    changelog = "https://github.com/LouisChrist/pyblu/releases/tag/${src.tag}";
     description = "BluOS API client";
     homepage = "https://github.com/LouisChrist/pyblu";
     license = lib.licenses.mit;

From 18597dbfffe647d4e83385f31528475e6548bec9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:21 +0200
Subject: [PATCH 1117/3724] python3Packages.pycairo: 1.27.0 -> 1.28.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pycairo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 883a879d3b1f..e3ee49b20113 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pycairo";
-  version = "1.27.0";
+  version = "1.28.0";
 
   disabled = pythonOlder "3.6";
 
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "pygobject";
     repo = "pycairo";
     tag = "v${version}";
-    hash = "sha256-P9AC8+WlokAxoy6KTJqAz7kOYK/FQVjIKWuj8jQw2OA=";
+    hash = "sha256-OAF1Yv9aoUctklGzH2xM+cVu5csyEnX2AV9n0OeoFUw=";
   };
 
   nativeBuildInputs = [

From d391fa93e46edc0b9d9e5f418340ea4d6a605a63 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:22 +0200
Subject: [PATCH 1118/3724] python3Packages.pycasbin: 1.45.0 -> 1.48.0

https://github.com/casbin/pycasbin/blob/v1.48.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pycasbin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pycasbin/default.nix b/pkgs/development/python-modules/pycasbin/default.nix
index 40129fd8e1fb..eaad1ff8be75 100644
--- a/pkgs/development/python-modules/pycasbin/default.nix
+++ b/pkgs/development/python-modules/pycasbin/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pycasbin";
-  version = "1.45.0";
+  version = "1.48.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "casbin";
     repo = "pycasbin";
     tag = "v${version}";
-    hash = "sha256-pErgGW9zSux2ki7WItHjkMncC2kiuxcRkcGmCtFUtCo=";
+    hash = "sha256-jfWWlLkJernwnXIj6jTcGNZleLZ6axtFPoOprOQktfU=";
   };
 
   build-system = [ setuptools ];

From a69ac1a8504808ac57b82d797296d7489f1b3c6f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:22 +0200
Subject: [PATCH 1119/3724] python3Packages.pycocotools: 2.0.9 -> 2.0.10

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pycocotools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pycocotools/default.nix b/pkgs/development/python-modules/pycocotools/default.nix
index 304b04df00be..c5bfa9e4d0a0 100644
--- a/pkgs/development/python-modules/pycocotools/default.nix
+++ b/pkgs/development/python-modules/pycocotools/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "pycocotools";
-  version = "2.0.9";
+  version = "2.0.10";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uoLlUGcKoRgqkR+z5fDoM0VDIERDhwe9UsJRnNoWhyo=";
+    hash = "sha256-ekdgnN78leXhUTE8fZOmHPBuFdQse6mbYB47wPns4uE=";
   };
 
   propagatedBuildInputs = [

From 512125ed2d20b01e9f2098667cd978c987a4fcbc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:23 +0200
Subject: [PATCH 1120/3724] python3Packages.pycomposefile: 0.0.32 -> 0.0.34

https://github.com/smurawski/pycomposefile/releases/tag/v0.0.34

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pycomposefile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pycomposefile/default.nix b/pkgs/development/python-modules/pycomposefile/default.nix
index b907155a4195..e8eb77a8ec00 100644
--- a/pkgs/development/python-modules/pycomposefile/default.nix
+++ b/pkgs/development/python-modules/pycomposefile/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pycomposefile";
-  version = "0.0.32";
+  version = "0.0.34";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-o1XVFcTE/5LuWhZZDeizZ6O+SCcEZZLQhw+MtqxKbjQ=";
+    hash = "sha256-kzqTtDn4aSiCtNUP90ThKj2ZYEAGjpZlGjfdhCEmpQg=";
   };
 
   build-system = [ setuptools ];

From bed1841135644d3021abe2b2af2b924b34f748b5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:23 +0200
Subject: [PATCH 1121/3724] python3Packages.pycrdt-websocket: 0.15.5 -> 0.16.0

https://github.com/jupyter-server/pycrdt-websocket/blob/0.16.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pycrdt-websocket/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix
index 7a3a2362de00..573c4917bbc5 100644
--- a/pkgs/development/python-modules/pycrdt-websocket/default.nix
+++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "pycrdt-websocket";
-  version = "0.15.5";
+  version = "0.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jupyter-server";
     repo = "pycrdt-websocket";
-    tag = "v${version}";
-    hash = "sha256-piNd85X5YsTAOC9frYQRDyb/DPfzZicIPJ+bEVzgOsU=";
+    tag = version;
+    hash = "sha256-Qux8IxJR1nGbdpGz7RZBKJjYN0qfwfEpd2UDlduOna0=";
   };
 
   build-system = [ hatchling ];
@@ -77,7 +77,7 @@ buildPythonPackage rec {
   meta = {
     description = "WebSocket Connector for pycrdt";
     homepage = "https://github.com/jupyter-server/pycrdt-websocket";
-    changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     teams = [ lib.teams.jupyter ];
   };

From bcd9960606d36fb354bdf2a0f370b94af0874445 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:23 +0200
Subject: [PATCH 1122/3724] python3Packages.pydal: 20250607.2 -> 20250629.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pydal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix
index ab696abe6d18..eb890f9ea391 100644
--- a/pkgs/development/python-modules/pydal/default.nix
+++ b/pkgs/development/python-modules/pydal/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pydal";
-  version = "20250607.2";
+  version = "20250629.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Zr1d6kCwAyhjeV2tQ+n9y9x80yD/Atb6TJq7AnRz+PQ=";
+    hash = "sha256-P65iULncYasN7ahwD75czGlwum+N4D1Y0WCd6XpBXSk=";
   };
 
   build-system = [ setuptools ];

From 1f628c89d5bafb3679f66a0c10248684fa0ec16d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:24 +0200
Subject: [PATCH 1123/3724] python3Packages.pydevccu: 0.1.11 -> 0.1.14

https://github.com/SukramJ/pydevccu/releases/tag/0.1.14

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pydevccu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix
index 3441611d1f0b..ace4e1f48a14 100644
--- a/pkgs/development/python-modules/pydevccu/default.nix
+++ b/pkgs/development/python-modules/pydevccu/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pydevccu";
-  version = "0.1.11";
+  version = "0.1.14";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "SukramJ";
     repo = "pydevccu";
     tag = version;
-    hash = "sha256-Ar9KNOkiy60HTGKz8br701v8xF470dz1jv8sp/CZbpw=";
+    hash = "sha256-UiMY9qz2b8Mdi8L9mB5jcC7fF8/YUYYiNbaWsXze0vA=";
   };
 
   postPatch = ''

From 01f81eaa4ab6d4d8561e14d12a7953303bb4a85a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:24 +0200
Subject: [PATCH 1124/3724] python3Packages.pydmd: 2025.06.01 -> 2025.08.01

https://github.com/PyDMD/PyDMD/releases/tag/2025.08.01

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pydmd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix
index b5041e8e73ff..d05de4c77997 100644
--- a/pkgs/development/python-modules/pydmd/default.nix
+++ b/pkgs/development/python-modules/pydmd/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "pydmd";
-  version = "2025.06.01";
+  version = "2025.08.01";
   pyproject = true;
 
   src = fetchFromGitHub {

From 23b17b730408517e4b5e7b4287a952b757cabdc3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:25 +0200
Subject: [PATCH 1125/3724] python3Packages.pydot: 4.0.0 -> 4.0.1

https://github.com/pydot/pydot/blob/v4.0.1/ChangeLog

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pydot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix
index eb16cd4481dd..d71957a1a989 100644
--- a/pkgs/development/python-modules/pydot/default.nix
+++ b/pkgs/development/python-modules/pydot/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pydot";
-  version = "4.0.0";
+  version = "4.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-EvFkkzN8reL3YxuHyMzSmbouJR8+5dBzKgWN8oh6/pc=";
+    hash = "sha256-whSPaBxKM+CL8OJqnl+OQJmoLg4qBoCY8yzoZXc2StU=";
   };
 
   build-system = [

From f53473542e9fc4aaaedc8b12faf2893b9e96f1e1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:25 +0200
Subject: [PATCH 1126/3724] python3Packages.pyephember2: 0.4.12 -> 2

https://github.com/roberty99/pyephember2/releases/tag/Release2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyephember2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyephember2/default.nix b/pkgs/development/python-modules/pyephember2/default.nix
index 35af2f5e8da1..fd4ee04d2abd 100644
--- a/pkgs/development/python-modules/pyephember2/default.nix
+++ b/pkgs/development/python-modules/pyephember2/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyephember2";
-  version = "0.4.12";
+  version = "2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "roberty99";
     repo = "pyephember2";
-    tag = version;
-    hash = "sha256-R63Ts+1620QQOFF8o2/6CFNZi5jAeWTQkElgqZhNA7c=";
+    tag = "Release${version}";
+    hash = "sha256-BxDXjrXPx6UNWo7mGLzbIGtenE0B10x39iCUCzGFAr0=";
   };
 
   build-system = [ setuptools ];

From 8c55dcd5f34d77db8d97ff39d22064a7a97fdd45 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:26 +0200
Subject: [PATCH 1127/3724] python3Packages.pyexcel-xls: 0.7.0 -> 0.7.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyexcel-xls/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix
index 81bcc8ade772..eede60aa59a9 100644
--- a/pkgs/development/python-modules/pyexcel-xls/default.nix
+++ b/pkgs/development/python-modules/pyexcel-xls/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pyexcel-xls";
-  version = "0.7.0";
+  version = "0.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyexcel";
     repo = "pyexcel-xls";
-    rev = "v${version}";
-    hash = "sha256-wxsx/LfeBxi+NnHxfxk3svzsBcdwOiLQ1660eoHfmLg=";
+    tag = "v${version}";
+    hash = "sha256-+iwdMSGUsUbWFO4s4+3Zf+47J9bzFffWthZoeThT8f0=";
   };
 
   patches = [

From 9dac255107e30210f1267ae70ffccaca631d84f2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:27 +0200
Subject: [PATCH 1128/3724] python3Packages.pyfakefs: 5.8.0 -> 5.9.2

https://github.com/jmcgeheeiv/pyfakefs/blob/v5.9.2/CHANGES.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyfakefs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix
index 99379e07d034..82b7874d2667 100644
--- a/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/pkgs/development/python-modules/pyfakefs/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyfakefs";
-  version = "5.8.0";
+  version = "5.9.2";
   pyproject = true;
 
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-flRX7jzGcGnTzvbieCJ+z8gL+2HpJbwKTTsK8y0cmc4=";
+    hash = "sha256-ZsXGzNQJe0hPh4L5pQeP7gUz1GXg2cr1lMkVfVQ4JVM=";
   };
 
   build-system = [ setuptools ];

From 16619ee9da1f5f198e0f11ff71b8de32a1d78edc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:27 +0200
Subject: [PATCH 1129/3724] python3Packages.pygelf: 0.4.2 -> 0.4.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pygelf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pygelf/default.nix b/pkgs/development/python-modules/pygelf/default.nix
index bb5735771c74..975644043daf 100644
--- a/pkgs/development/python-modules/pygelf/default.nix
+++ b/pkgs/development/python-modules/pygelf/default.nix
@@ -9,13 +9,13 @@
 }:
 buildPythonPackage rec {
   pname = "pygelf";
-  version = "0.4.2";
+  version = "0.4.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "pygelf";
     inherit version;
-    hash = "sha256-0LuPRf9kipoYdxP0oFwJ9oX8uK3XsEu3Rx8gBxvRGq0=";
+    hash = "sha256-jtlyVjvjyPFoSD8B2/UitrxpeVnJej9IgTJLP3ljiRE=";
   };
 
   build-system = [ setuptools ];

From fa10fb264af9f0b6690bd92339790318c85ae1d2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:27 +0200
Subject: [PATCH 1130/3724] python3Packages.pygeocodio: 1.4.0 -> 2.0.1

https://github.com/bennylope/pygeocodio/blob/v2.0.1/HISTORY.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pygeocodio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pygeocodio/default.nix b/pkgs/development/python-modules/pygeocodio/default.nix
index 6f23fa579352..cf06e8687ca9 100644
--- a/pkgs/development/python-modules/pygeocodio/default.nix
+++ b/pkgs/development/python-modules/pygeocodio/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pygeocodio";
-  version = "1.4.0";
+  version = "2.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bennylope";
     repo = "pygeocodio";
     tag = "v${version}";
-    hash = "sha256-s6sY+iHuWv7+6ydxDWoN9eKiAXw0jeASWiMtz12TTHo=";
+    hash = "sha256-4jT/PX+jvJx81eaSXTsb/vLNbv4dNNVgeYrE7QwGlL8=";
   };
 
   build-system = [
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python wrapper for the Geocodio geolocation service API";
     downloadPage = "https://github.com/bennylope/pygeocodio/tree/master";
-    changelog = "https://github.com/bennylope/pygeocodio/blob/v${version}/HISTORY.rst";
+    changelog = "https://github.com/bennylope/pygeocodio/blob/${src.tag}/HISTORY.rst";
     homepage = "https://www.geocod.io/docs/#introduction";
     license = with lib.licenses; [ bsd3 ];
     maintainers = with lib.maintainers; [ ethancedwards8 ];

From 357e45782670f67edcadf52cc99f1b9af490c7fe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:28 +0200
Subject: [PATCH 1131/3724] python3Packages.pygit2: 1.18.0 -> 1.18.1

https://github.com/libgit2/pygit2/blob/v1.18.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pygit2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index 3e62e5dd42f7..efee1979e1a3 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "pygit2";
-  version = "1.18.0";
+  version = "1.18.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+9AdBKTSziiaqgLPhYBDZ5vw3R+YVca4jtlTgsH1ARo=";
+    hash = "sha256-hOBvw3CLjTvu787GN/Ydh96zgnLnSH6hxSkXQYT/9sQ=";
   };
 
   preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''

From ca113f786f43dee26f1f0ca27a9a7223cd9f18ea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:29 +0200
Subject: [PATCH 1132/3724] python3Packages.pygitguardian: 1.23.0 -> 1.24.0

https://github.com/GitGuardian/py-gitguardian/blob/v1.24.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pygitguardian/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix
index 323aa1d69b07..c759e67bbf07 100644
--- a/pkgs/development/python-modules/pygitguardian/default.nix
+++ b/pkgs/development/python-modules/pygitguardian/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pygitguardian";
-  version = "1.23.0";
+  version = "1.24.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "GitGuardian";
     repo = "py-gitguardian";
     tag = "v${version}";
-    hash = "sha256-vpz7HBxRu1srqe+EBnjwNJ7xJ1TMrOIXBulPjDTTk3k=";
+    hash = "sha256-9Zk2XpMS8WhCOGYwtUgsjWKbUhmtKOgVWyqskLJ8DOw=";
   };
 
   pythonRelaxDeps = [
@@ -56,7 +56,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library to access the GitGuardian API";
     homepage = "https://github.com/GitGuardian/py-gitguardian";
-    changelog = "https://github.com/GitGuardian/py-gitguardian/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/GitGuardian/py-gitguardian/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From 21c8ee6acd9ecf8fdb68d603e3433ee062e12a36 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:29 +0200
Subject: [PATCH 1133/3724] python3Packages.pygithub: 2.6.1 -> 2.7.0

https://github.com/PyGithub/PyGithub/raw/v2.7.0/doc/changes.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pygithub/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pygithub/default.nix b/pkgs/development/python-modules/pygithub/default.nix
index 86cc0e436660..38777b3b88ba 100644
--- a/pkgs/development/python-modules/pygithub/default.nix
+++ b/pkgs/development/python-modules/pygithub/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pygithub";
-  version = "2.6.1";
+  version = "2.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "PyGithub";
     repo = "PyGithub";
     tag = "v${version}";
-    hash = "sha256-CfAgN5vxHbVyDSeP0KR1QFnL6gDQsd46Q0zosr0ALqM=";
+    hash = "sha256-meWuetrgE2ks3BEQedrvrfYEVAJsFGgYO6GXPRUcJv4=";
   };
 
   build-system = [

From 71c4cacb4aabe4f476b08c6e15a6f9fe3eb3561a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:29 +0200
Subject: [PATCH 1134/3724] python3Packages.pyglm: 2.7.3 -> 2.8.2

https://github.com/Zuzu-Typ/PyGLM/releases/tag/2.8.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyglm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyglm/default.nix b/pkgs/development/python-modules/pyglm/default.nix
index 6dd07457ebd2..41d7277b1ac2 100644
--- a/pkgs/development/python-modules/pyglm/default.nix
+++ b/pkgs/development/python-modules/pyglm/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyglm";
-  version = "2.7.3";
+  version = "2.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Zuzu-Typ";
     repo = "PyGLM";
     tag = version;
-    hash = "sha256-5NXueFZ4+hIP1xd30Dt7sv/oxEqh6ejJoJtQv2rpGyQ=";
+    hash = "sha256-oLPZ6sCIAt12iolcSBNXEjbHGE4ou+dgoFhB400pyRk=";
     fetchSubmodules = true;
   };
 

From b2e462278c9a0bae6c0a90e998006905ee66977f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:30 +0200
Subject: [PATCH 1135/3724] python3Packages.pyinfra: 3.2 -> 3.4.1

https://github.com/Fizzadar/pyinfra/blob/v3.4.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyinfra/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix
index 88bd5a77e525..7276fa1f1b47 100644
--- a/pkgs/development/python-modules/pyinfra/default.nix
+++ b/pkgs/development/python-modules/pyinfra/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "pyinfra";
-  version = "3.2";
+  version = "3.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "Fizzadar";
     repo = "pyinfra";
     tag = "v${version}";
-    hash = "sha256-l0RD4lOLjzM9Ydf7vJr+PXpUGsVdAZN/dTUFJ3fo078=";
+    hash = "sha256-7bNkDm5SyIgVkrGQ95/q7AiY/JnxtWx+jkDO/rJQ2WQ=";
   };
 
   build-system = [ setuptools ];
@@ -66,7 +66,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://pyinfra.com";
     downloadPage = "https://pyinfra.com/Fizzadar/pyinfra/releases";
-    changelog = "https://github.com/Fizzadar/pyinfra/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/Fizzadar/pyinfra/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ totoroot ];
     mainProgram = "pyinfra";

From 11e231a73ca3fe396406cb9f7533acb061fa7f0a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:30 +0200
Subject: [PATCH 1136/3724] python3Packages.pyinstaller-hooks-contrib: 2025.5
 -> 2025.8

https://github.com/pyinstaller/pyinstaller-hooks-contrib/blob/master/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pyinstaller-hooks-contrib/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
index 4747662e6dcf..fefa0bc3cdf5 100644
--- a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
+++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pyinstaller-hooks-contrib";
-  version = "2025.5";
+  version = "2025.8";
 
   pyproject = true;
 
   src = fetchPypi {
     pname = "pyinstaller_hooks_contrib";
     inherit version;
-    hash = "sha256-cHOGdwuP4GbASq0YpxvEg8eyXhi0dQp1aZn32iqzGYI=";
+    hash = "sha256-NAKtQd/ptREK8TRCLjf8XUIbo0LGy5gL1nyzC3QVZBw=";
   };
 
   build-system = [ setuptools ];

From 7671aa6d3d09091c00c07ffd204d6bfea3defe38 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:31 +0200
Subject: [PATCH 1137/3724] python3Packages.pyinstaller-versionfile: 2.1.1 ->
 3.0.1

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pyinstaller-versionfile/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
index 9659cd9bae80..2962ea7b3004 100644
--- a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
+++ b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
@@ -9,15 +9,15 @@
 
 buildPythonPackage rec {
   pname = "pyinstaller-versionfile";
-  version = "2.1.1";
+  version = "3.0.1";
 
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "DudeNr33";
     repo = "pyinstaller-versionfile";
-    rev = "v${version}";
-    hash = "sha256-lz1GuiXU+r8sMld5SsG3qS+FOsWfbvkQmO2bxAR3XcY=";
+    tag = "v${version}";
+    hash = "sha256-UNrXP5strO6LIkIM3etBo1+Vm+1lR5wF0VfKtZYRoYc=";
   };
 
   propagatedBuildInputs = [

From 7769ce6666d4debf331a40249fd6d2c19eb7a134 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:31 +0200
Subject: [PATCH 1138/3724] python3Packages.pyinstaller: 6.14.2 -> 6.15.0

https://pyinstaller.org/en/v6.15.0/CHANGES.html

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyinstaller/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix
index 207e4deae50e..b80a5945fbc8 100644
--- a/pkgs/development/python-modules/pyinstaller/default.nix
+++ b/pkgs/development/python-modules/pyinstaller/default.nix
@@ -25,12 +25,12 @@
 
 buildPythonPackage rec {
   pname = "pyinstaller";
-  version = "6.14.2";
+  version = "6.15.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FCzOBxnnkxXwzCZADC5cRdm2sX5+BJH+5ESp+PFvSRc=";
+    hash = "sha256-pI/EZE7kqiqio157UfSW+PvX7s9qIVBka78WE60HvC0=";
   };
 
   build-system = [ setuptools ];

From 29072b585e2418d268f34f9259ac794610e39d65 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:32 +0200
Subject: [PATCH 1139/3724] python3Packages.pykcs11: 1.5.17 -> 1.5.18

https://github.com/LudovicRousseau/PyKCS11/releases/tag/1.5.18

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pykcs11/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pykcs11/default.nix b/pkgs/development/python-modules/pykcs11/default.nix
index fe3cd809bcca..7edb41e9dcab 100644
--- a/pkgs/development/python-modules/pykcs11/default.nix
+++ b/pkgs/development/python-modules/pykcs11/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "pykcs11";
-  version = "1.5.17";
+  version = "1.5.18";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-e2Z+lZ+gtq0HULA+IIGgWcvppieJdmFD5Q+QmIoziZQ=";
+    hash = "sha256-Ev2HizaYIdgMG+ihQMheig+xNY/Kq6ZspmhpITaS8ic=";
   };
 
   build-system = [ setuptools ];

From da0574d724e1f366131f02d1ce7fb6cddca475ab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:32 +0200
Subject: [PATCH 1140/3724] python3Packages.pykdtree: 1.4.1 -> 1.4.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pykdtree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix
index a1958b26bb2f..1e311b580ebf 100644
--- a/pkgs/development/python-modules/pykdtree/default.nix
+++ b/pkgs/development/python-modules/pykdtree/default.nix
@@ -17,12 +17,12 @@
 
 buildPythonPackage rec {
   pname = "pykdtree";
-  version = "1.4.1";
+  version = "1.4.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-EISP9qxzMraOZb+MLolme2tisHWq0nI0d0Smm/HIrX4=";
+    hash = "sha256-vSuWehalUQ76hz7lLZWdDYITicx0m7UWc65oMW7rZfU=";
   };
 
   nativeBuildInputs = [

From 5d305e8c4dd81d18614d85cd2c7be246c7714b59 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:33 +0200
Subject: [PATCH 1141/3724] python3Packages.pykka: 4.1.1 -> 4.2.0

https://github.com/jodal/pykka/releases/tag/v4.2.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pykka/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix
index 209624aa801f..de877d4e3442 100644
--- a/pkgs/development/python-modules/pykka/default.nix
+++ b/pkgs/development/python-modules/pykka/default.nix
@@ -3,30 +3,25 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  poetry-core,
+  hatchling,
   pydantic,
   pytestCheckHook,
   pytest-mock,
-  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "pykka";
-  version = "4.1.1";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.8";
+  version = "4.2.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jodal";
     repo = "pykka";
     tag = "v${version}";
-    hash = "sha256-n9TgXcmUEIQdqtrY+9T+EtPys+7OzXCemRwNPj1xPDw=";
+    hash = "sha256-cxW6xKG0x7pPXvCanh0ZNMYRSdnCf8JrnJbjYgDUQSI=";
   };
 
-  build-system = [ poetry-core ];
-
-  dependencies = lib.optionals (pythonOlder "3.10") [ typing-extensions ];
+  build-system = [ hatchling ];
 
   nativeCheckInputs = [
     pydantic

From 4bd977a609246c7b6f7b6ab782057b486b63a075 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:33 +0200
Subject: [PATCH 1142/3724] python3Packages.pylibacl: 0.7.2 -> 0.7.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pylibacl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix
index 878c91a71bb8..ef94e00dacb6 100644
--- a/pkgs/development/python-modules/pylibacl/default.nix
+++ b/pkgs/development/python-modules/pylibacl/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "pylibacl";
-  version = "0.7.2";
+  version = "0.7.3";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-VsFehn/kxyRTG7+XQHWJy7+NvShajYT+fsyQ/DIjeNc=";
+    hash = "sha256-nZ/7WA4MWC1d5ZgIf3X2lARYsjgQxhVSkUPGGxcr+SI=";
   };
 
   # ERROR: testExtended (tests.test_acls.AclExtensions)

From 139d4a428d93d5ccb8ed85e03679ee35c395325b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:34 +0200
Subject: [PATCH 1143/3724] python3Packages.pylink-square: 1.4.0 -> 1.6.0

https://github.com/square/pylink/blob/v1.6.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pylink-square/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix
index b23aca51e529..d2e365e86b50 100644
--- a/pkgs/development/python-modules/pylink-square/default.nix
+++ b/pkgs/development/python-modules/pylink-square/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pylink-square";
-  version = "1.4.0";
+  version = "1.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "square";
     repo = "pylink";
     tag = "v${version}";
-    hash = "sha256-Fjulh2wmcVO+/608uTO10orRz8Pq0I+ZhJ8zMa3YFC0=";
+    hash = "sha256-rkkdnpkl9UHcBDjp6lsFXR1zNn7tH1KeTQ7wV+yJ3m0=";
   };
 
   build-system = [ setuptools ];

From c65e3431f48e85f2b7ae3307a51f608bf3dd6768 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:34 +0200
Subject: [PATCH 1144/3724] python3Packages.pymavlink: 2.4.43 -> 2.4.49

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pymavlink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix
index fda09c5f6a49..6ac68fcf73f5 100644
--- a/pkgs/development/python-modules/pymavlink/default.nix
+++ b/pkgs/development/python-modules/pymavlink/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "pymavlink";
-  version = "2.4.43";
+  version = "2.4.49";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-IcShujVcBXQtKvQVEFdtbgjboNd2AunqY1MxzQdV7nY=";
+    hash = "sha256-188Q1VktA4oYqpcnERd+u4i+IUPvzCWN9jCwUT6dosI=";
   };
 
   propagatedBuildInputs = [

From 16cd4b752e2ed7c7050436316a076defbc993299 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:37 +0200
Subject: [PATCH 1145/3724] python3Packages.pymongo: 4.13.0 -> 4.13.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pymongo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix
index ce570a857265..4f747ea9a321 100644
--- a/pkgs/development/python-modules/pymongo/default.nix
+++ b/pkgs/development/python-modules/pymongo/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "pymongo";
-  version = "4.13.0";
+  version = "4.13.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "pymongo";
-    hash = "sha256-kqBuNwnjx+UIINNS09TmABVAa8ummAiTfawqbSIib94=";
+    hash = "sha256-D2TGRpwjYpYubOlyWK4Tkau6FWapU6SSVi0pJLRIFcI=";
   };
 
   build-system = [

From 855fe9ce2e77b420a5764d98bcc10a3072f6bb7a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:37 +0200
Subject: [PATCH 1146/3724] python3Packages.pymoo: 0.6.1.3 -> 0.6.1.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pymoo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pymoo/default.nix b/pkgs/development/python-modules/pymoo/default.nix
index 82d137ae4592..350e7b5144d3 100644
--- a/pkgs/development/python-modules/pymoo/default.nix
+++ b/pkgs/development/python-modules/pymoo/default.nix
@@ -29,20 +29,20 @@ let
   pymoo_data = fetchFromGitHub {
     owner = "anyoptimization";
     repo = "pymoo-data";
-    rev = "33f61a78182ceb211b95381dd6d3edee0d2fc0f3";
+    tag = "33f61a78182ceb211b95381dd6d3edee0d2fc0f3";
     hash = "sha256-iGWPepZw3kJzw5HKV09CvemVvkvFQ38GVP+BAryBSs0=";
   };
 in
 buildPythonPackage rec {
   pname = "pymoo";
-  version = "0.6.1.3";
+  version = "0.6.1.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anyoptimization";
     repo = "pymoo";
     tag = version;
-    hash = "sha256-CbeJwv51lu4cABgGieqy/8DCDJCb8wOPPVqUHk8Jb7E=";
+    hash = "sha256-IRNYluK6fO1cQq0u9dIJYnI5HWqtTPLXARXNoHa4F0I=";
   };
 
   postPatch = ''

From a3b2e4da808b351879e2b0afe32e435a7abbe2ee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:37 +0200
Subject: [PATCH 1147/3724] python3Packages.pymssql: 2.3.4 -> 2.3.7

https://github.com/pymssql/pymssql/blob/v2.3.7/ChangeLog.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pymssql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix
index 25e904ea2490..959d7b69e6da 100644
--- a/pkgs/development/python-modules/pymssql/default.nix
+++ b/pkgs/development/python-modules/pymssql/default.nix
@@ -16,12 +16,12 @@
 
 buildPythonPackage rec {
   pname = "pymssql";
-  version = "2.3.4";
+  version = "2.3.7";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-EXyC16qQIRcaqb6YNoR1UZ8z2cMgc83Pmw12Ixq8ZDY=";
+    hash = "sha256-Xm15x7HOxArr7EsJnG5EXMqsJFGeXnZ7SaTm9IwIflA=";
   };
 
   postPatch = ''

From d797fae4c8e30269dd04e311fe88b2486a5e0923 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:38 +0200
Subject: [PATCH 1148/3724] python3Packages.pymunk: 7.0.1 -> 7.1.0

https://github.com/viblo/pymunk/releases/tag/7.1.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pymunk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix
index d69adbdf3c63..bc25bb966d19 100644
--- a/pkgs/development/python-modules/pymunk/default.nix
+++ b/pkgs/development/python-modules/pymunk/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pymunk";
-  version = "7.0.1";
+  version = "7.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lqOOgSP02J+IILQ2QPH2I9aETx+X7qCcRmDwMXgKn/g=";
+    hash = "sha256-8wRYlyYTJbs+iShEAt1DuQjQpYcdwgEFl+NrQwnwIps=";
   };
 
   nativeBuildInputs = [ cffi ];

From 27f650129388cf20aef67a9c293af95d222803c8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:38 +0200
Subject: [PATCH 1149/3724] python3Packages.pymupdf: 1.26.1 -> 1.26.3

https://github.com/pymupdf/PyMuPDF/releases/tag/1.26.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pymupdf/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index 9cd4b74ee0ed..15a7a69ba947 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  fetchpatch,
   python,
   toPythonModule,
 
@@ -46,7 +45,7 @@ let
 in
 buildPythonPackage rec {
   pname = "pymupdf";
-  version = "1.26.1";
+  version = "1.26.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -55,7 +54,7 @@ buildPythonPackage rec {
     owner = "pymupdf";
     repo = "PyMuPDF";
     tag = version;
-    hash = "sha256-Z+TO4MaLFmgNSRMTltY77bHnA5RHc4Ii45sDjJsFZto=";
+    hash = "sha256-djTbALLvdX2jOTGgoyUIBhiqJ6KzM+Dkb4M7d2eVoPM=";
   };
 
   # swig is not wrapped as Python package
@@ -127,6 +126,11 @@ buildPythonPackage rec {
     "test_open2"
   ];
 
+  disabledTestPaths = [
+    # mad about markdown table formatting
+    "tests/test_tables.py::test_markdown"
+  ];
+
   pythonImportsCheck = [
     "pymupdf"
     "fitz"

From a72a324d747e9336d35783f18a7cfa5e34be738a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:39 +0200
Subject: [PATCH 1150/3724] python3Packages.pymupdf4llm: 0.0.25 -> 0.0.27

https://github.com/pymupdf/RAG/blob/v0.0.27/CHANGES.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pymupdf4llm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymupdf4llm/default.nix b/pkgs/development/python-modules/pymupdf4llm/default.nix
index c2fc51f7be96..d1eb118e26b7 100644
--- a/pkgs/development/python-modules/pymupdf4llm/default.nix
+++ b/pkgs/development/python-modules/pymupdf4llm/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pymupdf4llm";
-  version = "0.0.25";
+  version = "0.0.27";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pymupdf";
     repo = "RAG";
     tag = "v${version}";
-    hash = "sha256-20upIcCoUB8zjW/qBvA3kFxJ6jcdXV3ohkurMmnlMkc=";
+    hash = "sha256-rezdDsjNCDetvrX3uvykYuL/y40MZnr0fFMvQY3JRr0=";
   };
 
   sourceRoot = "${src.name}/pymupdf4llm";

From a2f4136497522081f4148912adbcec64cd55b259 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:39 +0200
Subject: [PATCH 1151/3724] python3Packages.pynamodb: 6.0.2 -> 6.1.0

https://github.com/pynamodb/PynamoDB/releases/tag/6.1.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pynamodb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix
index c79ffdb9f624..862971e81f33 100644
--- a/pkgs/development/python-modules/pynamodb/default.nix
+++ b/pkgs/development/python-modules/pynamodb/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pynamodb";
-  version = "6.0.2";
+  version = "6.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "pynamodb";
     repo = "PynamoDB";
     tag = version;
-    hash = "sha256-i4cO1fzERKHJW2Ym0ogc2YID3IXVpBVDE33UumxvvHE=";
+    hash = "sha256-i4oxZO3gBVc2PMFSISeytaO8YrzYR9YuUMxrEqrg2c4=";
   };
 
   build-system = [ setuptools ];
@@ -69,7 +69,7 @@ buildPythonPackage rec {
       verbose. PynamoDB presents you with a simple, elegant API.
     '';
     homepage = "http://jlafon.io/pynamodb.html";
-    changelog = "https://github.com/pynamodb/PynamoDB/releases/tag/${version}";
+    changelog = "https://github.com/pynamodb/PynamoDB/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = [ ];
   };

From de1b77e2af5d1440d2fac1c774a84516313e2e4b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:40 +0200
Subject: [PATCH 1152/3724] python3Packages.pyngrok: 7.2.12 -> 7.3.0

https://github.com/alexdlaird/pyngrok/blob/7.3.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyngrok/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix
index d20b3a5a8335..6866321a7ec3 100644
--- a/pkgs/development/python-modules/pyngrok/default.nix
+++ b/pkgs/development/python-modules/pyngrok/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyngrok";
-  version = "7.2.12";
+  version = "7.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HM5NeFYZuAZLyn5vbIo0VNaaql/P8PNb0FqoElTOEv8=";
+    hash = "sha256-8iQOSbneybJ+ugDxREzTzOesRdG8xJOpt27mPC2piCw=";
   };
 
   build-system = [

From bf432ae2a443d10536c87b0f37758bc0959ec228 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:40 +0200
Subject: [PATCH 1153/3724] python3Packages.pynitrokey: 0.8.5 -> 0.9.3

https://github.com/Nitrokey/pynitrokey/releases/tag/v0.9.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pynitrokey/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix
index 1586313a8823..962589b47a4b 100644
--- a/pkgs/development/python-modules/pynitrokey/default.nix
+++ b/pkgs/development/python-modules/pynitrokey/default.nix
@@ -30,7 +30,7 @@
 
 let
   pname = "pynitrokey";
-  version = "0.8.5";
+  version = "0.9.3";
   mainProgram = "nitropy";
 in
 
@@ -40,7 +40,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mPhH4IdpKKA9d8sJOGMWpGerzki5qZHFHe4u4ao2RgE=";
+    hash = "sha256-nZBgKJfRIte/KyHqdBLe6spudJW7livyA9OvdZ4/q4o=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 8eecdb903d47dd8ebd7146a298a24746606386e1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:42 +0200
Subject: [PATCH 1154/3724] python3Packages.pyocd: 0.36.0 -> 0.38.0

https://github.com/pyocd/pyOCD/releases/tag/v0.38.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyocd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix
index 35d09a9373a0..a6ba9cd6c745 100644
--- a/pkgs/development/python-modules/pyocd/default.nix
+++ b/pkgs/development/python-modules/pyocd/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "pyocd";
-  version = "0.36.0";
+  version = "0.38.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyocd";
     repo = "pyOCD";
     tag = "v${version}";
-    hash = "sha256-CSdVWDiSe+xd0MzD9tsKs3DklNjnhchYFuI3Udi0O20=";
+    hash = "sha256-4fdVcTNH125e74S3mA/quuDun17ntGCazX6CV+obUGc=";
   };
 
   patches = [
@@ -81,7 +81,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pytestCheckHook ];
 
   meta = with lib; {
-    changelog = "https://github.com/pyocd/pyOCD/releases/tag/v${version}";
+    changelog = "https://github.com/pyocd/pyOCD/releases/tag/${src.tag}";
     description = "Python library for programming and debugging Arm Cortex-M microcontrollers";
     downloadPage = "https://github.com/pyocd/pyOCD";
     homepage = "https://pyocd.io";

From cced440eff7d7a5b5ce927ee03c6de7c181b3934 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:42 +0200
Subject: [PATCH 1155/3724] python3Packages.pyogrio: 0.11.0 -> 0.11.1

https://github.com/geopandas/pyogrio/blob/v0.11.1/CHANGES.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyogrio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix
index 8c3ed073d9f0..330fcd31225c 100644
--- a/pkgs/development/python-modules/pyogrio/default.nix
+++ b/pkgs/development/python-modules/pyogrio/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pyogrio";
-  version = "0.11.0";
+  version = "0.11.1";
   pyproject = true;
   disabled = pythonOlder "3.9";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "geopandas";
     repo = "pyogrio";
     tag = "v${version}";
-    hash = "sha256-3XrP3/sqGRtA+sfaoOV/ByGAtfpGZB5RYRr5lyYZUj0=";
+    hash = "sha256-F6XfkihN3k2xquYS8jJMlqtLXzaTORaduJ2Q9LhSQGM=";
   };
 
   postPatch = ''
@@ -66,7 +66,7 @@ buildPythonPackage rec {
   meta = {
     description = "Vectorized spatial vector file format I/O using GDAL/OGR";
     homepage = "https://pyogrio.readthedocs.io/";
-    changelog = "https://github.com/geopandas/pyogrio/blob/${src.rev}/CHANGES.md";
+    changelog = "https://github.com/geopandas/pyogrio/blob/${src.tag}/CHANGES.md";
     license = lib.licenses.mit;
     teams = [ lib.teams.geospatial ];
   };

From 3c873f90972fcad89c7eed23fcf41654050652df Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:43 +0200
Subject: [PATCH 1156/3724] python3Packages.pypdf: 5.7.0 -> 5.9.0

https://github.com/py-pdf/pypdf/blob/5.9.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pypdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix
index 42ad1e795efa..f3757208596f 100644
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/pkgs/development/python-modules/pypdf/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "pypdf";
-  version = "5.7.0";
+  version = "5.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     tag = version;
     # fetch sample files used in tests
     fetchSubmodules = true;
-    hash = "sha256-O1kV9VKbI3MFsWvr3jrDg9rJ0G+92ny0v7g4Xx/1ytM=";
+    hash = "sha256-WM7eAXDdrnbm1olS+3WPF6FhTUbdIHojtGbJdPHvxv4=";
   };
 
   outputs = [

From 8eccef028aae8b6d37c8f1d54a0df7b43f40bc1f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:43 +0200
Subject: [PATCH 1157/3724] python3Packages.pyprecice: 3.1.2 -> 3.2.1

https://github.com/precice/python-bindings/blob/v3.2.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyprecice/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix
index 48bf841129f8..2e8cea421b3a 100644
--- a/pkgs/development/python-modules/pyprecice/default.nix
+++ b/pkgs/development/python-modules/pyprecice/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pyprecice";
-  version = "3.1.2";
+  version = "3.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "precice";
     repo = "python-bindings";
     tag = "v${version}";
-    hash = "sha256-/atuMJVgvY4kgvrB+LuQZmJuSK4O8TJdguC7NCiRS2Y=";
+    hash = "sha256-8AM2wbPX54UaMO4MzLOV0TljLTAPOqR9gUbtT2McNjs=";
   };
 
   postPatch = ''
@@ -58,7 +58,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python language bindings for preCICE";
     homepage = "https://github.com/precice/python-bindings";
-    changelog = "https://github.com/precice/python-bindings/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/precice/python-bindings/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ Scriptkiddi ];
   };

From c613f3500edc5ea794519f31e95e890db8e6b304 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:44 +0200
Subject: [PATCH 1158/3724] python3Packages.pyqt-builder: 1.18.1 -> 1.18.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyqt-builder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix
index a256e3faa146..442339d6e528 100644
--- a/pkgs/development/python-modules/pyqt-builder/default.nix
+++ b/pkgs/development/python-modules/pyqt-builder/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "pyqt-builder";
-  version = "1.18.1";
+  version = "1.18.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "pyqt_builder";
     inherit version;
-    hash = "sha256-P3o6JxWUeik6l1MKdv1Z8TCfy45XpYMPRcef5ySbOZg=";
+    hash = "sha256-Vt/qRhSEqHqPDIsCKRkN78Q21+xd5xEC4gs15WORgLw=";
   };
 
   build-system = [

From 85edda88ca7f0085dc617a950a353b74762f39a1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:44 +0200
Subject: [PATCH 1159/3724] python3Packages.pyqt6-charts: 6.8.0 -> 6.9.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyqt6-charts/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt6-charts/default.nix b/pkgs/development/python-modules/pyqt6-charts/default.nix
index b50651cfcc2b..758ae6e93bfd 100644
--- a/pkgs/development/python-modules/pyqt6-charts/default.nix
+++ b/pkgs/development/python-modules/pyqt6-charts/default.nix
@@ -13,15 +13,15 @@
 
 buildPythonPackage rec {
   pname = "pyqt6-charts";
-  version = "6.8.0";
+  version = "6.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
-    pname = "PyQt6_Charts";
+    pname = "pyqt6_charts";
     inherit version;
-    hash = "sha256-+GcFuHQOMEFmfOIRrqogW3UOtrr0yQj04/bcjHINEPE=";
+    hash = "sha256-fvvpu35q1PmEUhGg7+D5HKXhT5Ni7RuoTVXyuFFQkfc=";
   };
 
   # fix include path and increase verbosity

From 5706bf0afb27d48b9aded9e35ddb1d256d9008ed Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:44 +0200
Subject: [PATCH 1160/3724] python3Packages.pyqt6-webengine: 6.8.0 -> 6.9.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pyqt6-webengine/default.nix           | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt6-webengine/default.nix b/pkgs/development/python-modules/pyqt6-webengine/default.nix
index e71d5128184f..8cafdbf543be 100644
--- a/pkgs/development/python-modules/pyqt6-webengine/default.nix
+++ b/pkgs/development/python-modules/pyqt6-webengine/default.nix
@@ -7,7 +7,6 @@
   sip,
   pyqt-builder,
   qt6Packages,
-  pythonOlder,
   pyqt6,
   python,
   mesa,
@@ -15,15 +14,13 @@
 
 buildPythonPackage rec {
   pname = "pyqt6-webengine";
-  version = "6.8.0";
+  version = "6.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchPypi {
-    pname = "PyQt6_WebEngine";
+    pname = "pyqt6_webengine";
     inherit version;
-    hash = "sha256-ZARepiK2pBiCwrGPVa6XFLhmCs/walTpEOtygiwvP/I=";
+    hash = "sha256-auU347vaBrjgZTXkhSKX4Lw7AFQ8R5KVQfzJsRmBqiU=";
   };
 
   patches = [

From 56aa82eb00272840a2ad4ff7421cc83524c3ed34 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:45 +0200
Subject: [PATCH 1161/3724] python3Packages.pyrate-limiter: 3.7.0 -> 3.9.0

https://github.com/vutran1710/PyrateLimiter/blob/v3.9.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pyrate-limiter/default.nix       | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pyrate-limiter/default.nix b/pkgs/development/python-modules/pyrate-limiter/default.nix
index 45867188d206..3d15ac47bd26 100644
--- a/pkgs/development/python-modules/pyrate-limiter/default.nix
+++ b/pkgs/development/python-modules/pyrate-limiter/default.nix
@@ -4,8 +4,6 @@
   fetchFromGitHub,
   filelock,
   poetry-core,
-  postgresql,
-  postgresqlTestHook,
   psycopg,
   psycopg-pool,
   pytestCheckHook,
@@ -17,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyrate-limiter";
-  version = "3.7.0";
+  version = "3.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vutran1710";
     repo = "PyrateLimiter";
     tag = "v${version}";
-    hash = "sha256-oNwFxH75TJm0iJSbLIO8SlIih72ImlHIhUW7GjOEorw=";
+    hash = "sha256-CAN3OWxXQaAzrh2q6z0OxPs4i02L/g2ISYFdUMHsHpg=";
   };
 
   postPatch = ''
@@ -51,12 +49,17 @@ buildPythonPackage rec {
   ]
   ++ lib.flatten (lib.attrValues optional-dependencies);
 
+  disabledTests = [
+    # hangs
+    "test_limiter_01"
+  ];
+
   pythonImportsCheck = [ "pyrate_limiter" ];
 
   meta = with lib; {
     description = "Python Rate-Limiter using Leaky-Bucket Algorimth Family";
     homepage = "https://github.com/vutran1710/PyrateLimiter";
-    changelog = "https://github.com/vutran1710/PyrateLimiter/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/vutran1710/PyrateLimiter/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ kranzes ];
   };

From 545478519c6bb7ffe7897f2a1669e3ab005cc8a7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:45 +0200
Subject: [PATCH 1162/3724] python3Packages.pyrevolve: 2.2.4 -> 2.2.6

https://github.com/devitocodes/pyrevolve/releases/tag/v2.2.6

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyrevolve/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyrevolve/default.nix b/pkgs/development/python-modules/pyrevolve/default.nix
index 0af3e6fe85ec..ba3b693a4ff8 100644
--- a/pkgs/development/python-modules/pyrevolve/default.nix
+++ b/pkgs/development/python-modules/pyrevolve/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pyrevolve";
-  version = "2.2.4";
+  version = "2.2.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "devitocodes";
     repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-fcIq/zuKO3W7K9N2E4f2Q6ZVcssZwN/n8o9cCOYmr3E=";
+    tag = "v${version}";
+    hash = "sha256-jjiFOlxXjaa4L4IEtojeeS0jx4GsftAeIGBpJLhUcY4=";
   };
 
   postPatch = ''
@@ -51,7 +51,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     homepage = "https://github.com/devitocodes/pyrevolve";
-    changelog = "https://github.com/devitocodes/pyrevolve/releases/tag/v${version}";
+    changelog = "https://github.com/devitocodes/pyrevolve/releases/tag/${src.tag}";
     description = "Python library to manage checkpointing for adjoints";
     license = licenses.epl10;
     maintainers = with maintainers; [ atila ];

From ce87e58053de01086d1d2cabada51e6844c89ddd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:46 +0200
Subject: [PATCH 1163/3724] python3Packages.pyroute2: 0.9.2 -> 0.9.4

https://github.com/svinota/pyroute2/blob/0.9.4/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyroute2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 9b1fd1924ec4..b501bddec5df 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2";
-  version = "0.9.2";
+  version = "0.9.4";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "svinota";
     repo = "pyroute2";
     tag = version;
-    hash = "sha256-46QpFW9Yo1fHH9m8hxpdPRMBdiE6ptWAWRcaizKjBOw=";
+    hash = "sha256-D603ZrLbc/6REx6X0bMvZzeyo0fgTsFL7J+iRTiQLgQ=";
   };
 
   build-system = [ setuptools ];
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python Netlink library";
     homepage = "https://github.com/svinota/pyroute2";
-    changelog = "https://github.com/svinota/pyroute2/blob/${version}/CHANGELOG.rst";
+    changelog = "https://github.com/svinota/pyroute2/blob/${src.tag}/CHANGELOG.rst";
     license = with licenses; [
       asl20 # or
       gpl2Plus

From 701b40f37a5a4b08caf49b88fbc3e58207b84b61 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:47 +0200
Subject: [PATCH 1164/3724] python3Packages.pyscard: 2.2.2 -> 2.3.0

https://github.com/LudovicRousseau/pyscard/releases/tag/2.3.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyscard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index 6440d5839f9e..7f19bfb0c4c1 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyscard";
-  version = "2.2.2";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "LudovicRousseau";
     repo = "pyscard";
     tag = version;
-    hash = "sha256-oaKmWLydwfWPnED11dbJKob9vxkl+pgOS0mvhL6XWrM=";
+    hash = "sha256-rz3m8eVbmJUMcQFuEMZwF3k/ES75KcNA8R+xix+Mgq8=";
   };
 
   build-system = [ setuptools ];

From 3892341d4b3d87540594858572a8aa757efa04d7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:47 +0200
Subject: [PATCH 1165/3724] python3Packages.pyshp: 2.4.1 -> 3.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyshp/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix
index 623fbebfb6d7..7811afc42edd 100644
--- a/pkgs/development/python-modules/pyshp/default.nix
+++ b/pkgs/development/python-modules/pyshp/default.nix
@@ -2,24 +2,24 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  hatchling,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pyshp";
-  version = "2.4.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "3.0.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GeospatialPython";
     repo = "pyshp";
     tag = version;
-    hash = "sha256-NBZCqCbrCUIowj/EwWfC1vNC1fyNdg7EC06RRi6pul0=";
+    hash = "sha256-bN6n/cHuhoJPP2N9hcaPY87QgLNDSNdjHkpmyjO/+70=";
   };
 
+  build-system = [ hatchling ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "shapefile" ];

From 707605910b4c89429f82d1553ccd0715858ec76d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:48 +0200
Subject: [PATCH 1166/3724] python3Packages.pyside6-fluent-widgets: 1.8.3 ->
 1.8.6

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pyside6-fluent-widgets/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyside6-fluent-widgets/default.nix b/pkgs/development/python-modules/pyside6-fluent-widgets/default.nix
index 475646e64114..bdc66df7c5ef 100644
--- a/pkgs/development/python-modules/pyside6-fluent-widgets/default.nix
+++ b/pkgs/development/python-modules/pyside6-fluent-widgets/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "pyside6-fluent-widgets";
-  version = "1.8.3";
+  version = "1.8.6";
   pyproject = true;
 
   src = fetchPypi {
     pname = "pyside6_fluent_widgets";
     inherit version;
-    hash = "sha256-A9lKRFGpfrWKGAKJS9ETIbSTBF/Ba6KUBBc4Pht2eBE=";
+    hash = "sha256-JuqZSYAGnmO/0GMIojpP3XB0mx4k/GecOkl/xsafOu8=";
   };
 
   build-system = [ setuptools ];

From d2987c9c7e3532706344780745980334a5d8fcc4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:49 +0200
Subject: [PATCH 1167/3724] python3Packages.pysnooper: 1.2.1 -> 1.2.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pysnooper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix
index f8ce981e1d38..e9f9e7e86232 100644
--- a/pkgs/development/python-modules/pysnooper/default.nix
+++ b/pkgs/development/python-modules/pysnooper/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pysnooper";
-  version = "1.2.1";
+  version = "1.2.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "PySnooper";
-    hash = "sha256-2DLd8myARAqUVrOmZNr/lX9zfnMTxAt2JQ69tczbajE=";
+    hash = "sha256-H6FCVESnr0UQiq7YYLXKi2KyW7olsLA3wFm6NT2PHnQ=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];

From 45fa8411dd0a4741c15391e36b8b30d457967347 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:50 +0200
Subject: [PATCH 1168/3724] python3Packages.pyssim: 0.7 -> 0.7.1

https://github.com/jterrace/pyssim/blob/v0.7.1/CHANGES.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyssim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix
index 1d49929d2710..6c08c68b5278 100644
--- a/pkgs/development/python-modules/pyssim/default.nix
+++ b/pkgs/development/python-modules/pyssim/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pyssim";
-  version = "0.7";
+  version = "0.7.1";
   pyproject = true;
 
   build-system = [
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "jterrace";
     repo = "pyssim";
     tag = "v${version}";
-    sha256 = "sha256-LDNIugQeRqNsAZ5ZxS/NxHokEAwefpfRutTRpR0IcXk=";
+    sha256 = "sha256-6393EATaXg12pYXPaHty+8LepUM6kgtZ0zSjZ1Izytg=";
   };
 
   patches = [

From 5513c3f62c6beb965165873db3dabe16a4b5231e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:51 +0200
Subject: [PATCH 1169/3724] python3Packages.pystemd: 0.13.2 -> 0.13.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pystemd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix
index f91803243e67..f3847e030065 100644
--- a/pkgs/development/python-modules/pystemd/default.nix
+++ b/pkgs/development/python-modules/pystemd/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "pystemd";
-  version = "0.13.2";
+  version = "0.13.4";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Tc+ksTpVaFxJ09F8EGMeyhjDN3D2Yxb47yM3uJUcwUQ=";
+    hash = "sha256-8G1OWyGIGnyRAEkuYMzC9LZOULTWt3c8lAE9LG8aANs=";
   };
 
   postPatch = ''

From fdb6aecdefa08f778b09fd0ad8366e85aed66f07 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:51 +0200
Subject: [PATCH 1170/3724] python3Packages.pysunspec2: 1.2.1 -> 1.3.2

https://github.com/sunspec/pysunspec2/releases/tag/v1.3.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pysunspec2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysunspec2/default.nix b/pkgs/development/python-modules/pysunspec2/default.nix
index e3d321895db6..0e8f04916660 100644
--- a/pkgs/development/python-modules/pysunspec2/default.nix
+++ b/pkgs/development/python-modules/pysunspec2/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pysunspec2";
-  version = "1.2.1";
+  version = "1.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.5";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "sunspec";
     repo = "pysunspec2";
     tag = "v${version}";
-    hash = "sha256-N3Daa1l2uzRbj2GpgdulzNhqxtRLvxZuEHxlKMsAdso=";
+    hash = "sha256-a5dync6B0KA1Qus/3xfDzASirEh7yLuiUrQXB2jMVQw=";
     fetchSubmodules = true;
   };
 

From 55d1e286a2a4150e0546a1f169262e076f7e75c4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:52 +0200
Subject: [PATCH 1171/3724] python3Packages.pytapo: 3.3.48 -> 3.3.49

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pytapo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix
index e24e88f1e62f..852802ede046 100644
--- a/pkgs/development/python-modules/pytapo/default.nix
+++ b/pkgs/development/python-modules/pytapo/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pytapo";
-  version = "3.3.48";
+  version = "3.3.49";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2MBolLmcInRO1EMYsV0cV4AsvS9cJATDiP5iBjPkrk0=";
+    hash = "sha256-urAGAcSoJ8AkHHIPEBEfk08Y34URVN/sX0N4WkIcUR4=";
   };
 
   build-system = [ setuptools ];

From 88e059b26ab79186317019b1f63c481fa23ca43c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:52 +0200
Subject: [PATCH 1172/3724] python3Packages.pytask: 0.5.2 -> 0.5.5

https://github.com/pytask-dev/pytask/releases/tag/v0.5.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pytask/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytask/default.nix b/pkgs/development/python-modules/pytask/default.nix
index af475846e3a0..7e1ae80c0b6a 100644
--- a/pkgs/development/python-modules/pytask/default.nix
+++ b/pkgs/development/python-modules/pytask/default.nix
@@ -25,7 +25,7 @@
 }:
 buildPythonPackage rec {
   pname = "pytask";
-  version = "0.5.2";
+  version = "0.5.5";
   pyproject = true;
   disabled = pythonOlder "3.8";
 
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "pytask-dev";
     repo = "pytask";
     tag = "v${version}";
-    hash = "sha256-YJouWQ9Edj27nD72m7EDSH9TXcrsu6X+pGDo5fgGU5U=";
+    hash = "sha256-0e1pJzoszTW8n+uFJlEeYstvHf4v+I2Is7oEHJ1qV7o=";
   };
 
   build-system = [
@@ -79,7 +79,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Workflow management system that facilitates reproducible data analyses";
     homepage = "https://github.com/pytask-dev/pytask";
-    changelog = "https://github.com/pytask-dev/pytask/releases/tag/v${version}";
+    changelog = "https://github.com/pytask-dev/pytask/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ erooke ];
   };

From c786d7391ecffcabe4690ad830e15ffa01760cf9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:53 +0200
Subject: [PATCH 1173/3724] python3Packages.pytelegrambotapi: 4.27.0 -> 4.28.0

https://github.com/eternnoir/pyTelegramBotAPI/releases/tag/4.28.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
index 550809f9150d..ee3cc7a354e8 100644
--- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
+++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "pytelegrambotapi";
-  version = "4.27.0";
+  version = "4.28.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "eternnoir";
     repo = "pyTelegramBotAPI";
     tag = version;
-    hash = "sha256-UozVUdqNxxwWTBoq7ekr8ZX5KdkvQj+SiNSwebVXblI=";
+    hash = "sha256-T6OzlL+IzQr38sjE8DhVO3NN3apgHzJQjGx3No8kRNA=";
   };
 
   build-system = [ hatchling ];

From 01e2ef9368e4b468c14255c4e3274242fc15c910 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:53 +0200
Subject: [PATCH 1174/3724] python3Packages.pytensor: 2.31.7 -> 2.32.0

https://github.com/pymc-devs/pytensor/releases/tag/rel-rel-2.32.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pytensor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix
index 41a075b0229a..d5212c6533bd 100644
--- a/pkgs/development/python-modules/pytensor/default.nix
+++ b/pkgs/development/python-modules/pytensor/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "pytensor";
-  version = "2.31.7";
+  version = "2.32.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     postFetch = ''
       sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/pytensor/_version.py
     '';
-    hash = "sha256-FtB5DfeKHl3zlnDxsRn0rs08EJhPwVkXFBFLVA0k6oA=";
+    hash = "sha256-B72BZmSYl/trpgaTUXwjWo95gR90pNPcKgpnnOqP7Tg=";
   };
 
   build-system = [
@@ -167,7 +167,7 @@ buildPythonPackage rec {
     description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays";
     mainProgram = "pytensor-cache";
     homepage = "https://github.com/pymc-devs/pytensor";
-    changelog = "https://github.com/pymc-devs/pytensor/releases/tag/rel-${version}";
+    changelog = "https://github.com/pymc-devs/pytensor/releases/tag/rel-${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       bcdarwin

From eb22a2f194f8cdaf11998c53ee266f375ae5182e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:54 +0200
Subject: [PATCH 1175/3724] python3Packages.pytest-ansible: 25.5.0 -> 25.6.3

https://github.com/ansible-community/pytest-ansible/releases/tag/v25.6.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pytest-ansible/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix
index 226f7d8c0b6c..a0e5024d8c1f 100644
--- a/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-ansible";
-  version = "25.5.0";
+  version = "25.6.3";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "ansible";
     repo = "pytest-ansible";
     tag = "v${version}";
-    hash = "sha256-k6JFaB5VbUCwknN8SkNotdPRvSvW1tFmTx5p3hGfesg=";
+    hash = "sha256-NOvVzZCqbPbzbDgrs94qgS82c+8U+ysyH/LdQRsawt4=";
   };
 
   postPatch = ''

From 33f1b2550fd351caf2422ca618fd4f57bf6de169 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:54 +0200
Subject: [PATCH 1176/3724] python3Packages.pytest-celery: 1.1.3 -> 1.2.1

https://github.com/celery/pytest-celery/blob/v1.2.1/Changelog.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pytest-celery/default.nix          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix
index 9c3555f1012d..568159010c9d 100644
--- a/pkgs/development/python-modules/pytest-celery/default.nix
+++ b/pkgs/development/python-modules/pytest-celery/default.nix
@@ -5,12 +5,11 @@
   debugpy,
   docker,
   fetchFromGitHub,
+  kombu,
   poetry-core,
   psutil,
-  pytest-cov-stub,
   pytest-docker-tools,
   pytest,
-  pytestCheckHook,
   pythonOlder,
   setuptools,
   tenacity,
@@ -18,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-celery";
-  version = "1.1.3";
+  version = "1.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,7 +26,7 @@ buildPythonPackage rec {
     owner = "celery";
     repo = "pytest-celery";
     tag = "v${version}";
-    hash = "sha256-TUtKfGOxvVkiMhsUqyNDK08OTuzzKHrBiPU4JCKsIKM=";
+    hash = "sha256-E8GO/00IC9kUvQLZmTFaK4FFQ7d+/tw/kVTQbAqRRRM=";
   };
 
   postPatch = ''
@@ -46,8 +45,10 @@ buildPythonPackage rec {
   buildInput = [ pytest ];
 
   dependencies = [
+    (celery.overridePythonAttrs { doCheck = false; })
     debugpy
     docker
+    kombu
     psutil
     pytest-docker-tools
     setuptools
@@ -60,7 +61,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Pytest plugin to enable celery.contrib.pytest";
     homepage = "https://github.com/celery/pytest-celery";
-    changelog = "https://github.com/celery/pytest-celery/blob/v${version}/Changelog.rst";
+    changelog = "https://github.com/celery/pytest-celery/blob/${src.tag}/Changelog.rst";
     license = licenses.mit;
     maintainers = [ ];
   };

From cf8be26716bff33865f66d72f4db6f9fcf974cc2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:55 +0200
Subject: [PATCH 1177/3724] python3Packages.pytest-codspeed: 3.2.0 -> 4.0.0

https://github.com/CodSpeedHQ/pytest-codspeed/releases/tag/v4.0.0

This commit was automatically generated using update-python-libraries.
---
 .../pytest-codspeed/default.nix               | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-codspeed/default.nix b/pkgs/development/python-modules/pytest-codspeed/default.nix
index dbf611fa5b1a..0de2195da0fc 100644
--- a/pkgs/development/python-modules/pytest-codspeed/default.nix
+++ b/pkgs/development/python-modules/pytest-codspeed/default.nix
@@ -16,18 +16,34 @@
   setuptools,
 }:
 
+let
+  instrument-hooks = fetchFromGitHub {
+    owner = "CodSpeedHQ";
+    repo = "instrument-hooks";
+    rev = "b003e5024d61cfb784d6ac6f3ffd7d61bf7b9ec9";
+    hash = "sha256-JTSH4wOpOGJ97iV6sagiRUu8d3sKM2NJRXcB3NmozNQ=";
+  };
+in
+
 buildPythonPackage rec {
   pname = "pytest-codspeed";
-  version = "3.2.0";
+  version = "4.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CodSpeedHQ";
     repo = "pytest-codspeed";
     tag = "v${version}";
-    hash = "sha256-SNVJtnanaSQTSeX3EFG+21GFC1WFCQTbaNyi7QjQROw=";
+    hash = "sha256-5fdG7AEiLD3ZZzU/7zBK0+LDacTZooyDUo+FefcE4uQ=";
   };
 
+  postPatch = ''
+    pushd src/pytest_codspeed/instruments/hooks
+    rmdir instrument-hooks
+    ln -nsf ${instrument-hooks} instrument-hooks
+    popd
+  '';
+
   build-system = [ hatchling ];
 
   buildInputs = [ pytest ];

From d9a7429a44fd1b1a5d7353a8a1bfc0796fe6af42 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:55 +0200
Subject: [PATCH 1178/3724] python3Packages.pytest-cov: 6.1.1 -> 6.2.1

https://github.com/pytest-dev/pytest-cov/blob/v6.2.1/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pytest-cov/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix
index a7dbf32414b1..67da986e1e91 100644
--- a/pkgs/development/python-modules/pytest-cov/default.nix
+++ b/pkgs/development/python-modules/pytest-cov/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "pytest-cov";
-  version = "6.1.1";
+  version = "6.2.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "pytest_cov";
     inherit version;
-    hash = "sha256-RpNfeq77p2DnFsLr++HCFiQLlZKWbn2pnqgpLU0+Kgo=";
+    hash = "sha256-JcxswKU1ggS4EI7O3FGptXs0zGuMlnzCwBpOANimfaI=";
   };
 
   build-system = [ setuptools ];

From 231b9eb14848a97631745e85e4149fd04e987dca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:55 +0200
Subject: [PATCH 1179/3724] python3Packages.pytest-httpserver: 1.1.2 -> 1.1.3

https://github.com/csernazs/pytest-httpserver/blob/1.1.3/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pytest-httpserver/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix
index 6a136e9d3c05..bf2016701dde 100644
--- a/pkgs/development/python-modules/pytest-httpserver/default.nix
+++ b/pkgs/development/python-modules/pytest-httpserver/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-httpserver";
-  version = "1.1.2";
+  version = "1.1.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "csernazs";
     repo = "pytest-httpserver";
     tag = version;
-    hash = "sha256-41JrZ3ubaJHNzwGDWUSseJ3Z405k21SOpwW7jG5rNxg=";
+    hash = "sha256-5pyCDzt9nCwYcUdCjWlJiAkyNmf6oWBqSHQL7kJJluA=";
   };
 
   nativeBuildInputs = [ poetry-core ];
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "HTTP server for pytest to test HTTP clients";
     homepage = "https://www.github.com/csernazs/pytest-httpserver";
-    changelog = "https://github.com/csernazs/pytest-httpserver/blob/${version}/CHANGES.rst";
+    changelog = "https://github.com/csernazs/pytest-httpserver/blob/${src.tag}/CHANGES.rst";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From 89810858182f775414a71d79042b3c111e25d456 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:56 +0200
Subject: [PATCH 1180/3724] python3Packages.pytest-lazy-fixtures: 1.1.2 ->
 1.3.2

This commit was automatically generated using update-python-libraries.
---
 .../pytest-lazy-fixtures/default.nix          | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix
index 6bb33a00394f..4acc40ff1934 100644
--- a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix
+++ b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix
@@ -2,25 +2,40 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  poetry-core,
+  hatchling,
+  pytest,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pytest-lazy-fixtures";
-  version = "1.1.2";
+  version = "1.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dev-petrov";
     repo = "pytest-lazy-fixtures";
     tag = version;
-    hash = "sha256-EkvSmSTwoWmQlUZ4qBBqboOomxwn72H8taJ3CY142ms=";
+    hash = "sha256-h2Zm8Vbw3L9WeXaeFE/fJqiOgI3r+XnJUnnELDkmyaU=";
   };
 
-  build-system = [ poetry-core ];
+  postPatch = ''
+    # Prevent double registration here and in the pyproject.toml entrypoint
+    # ValueError: Plugin already registered under a different name:
+    substituteInPlace tests/conftest.py \
+      --replace-fail '"pytest_lazy_fixtures.plugin",' ""
+  '';
 
-  dependencies = [ pytestCheckHook ];
+  build-system = [ hatchling ];
+
+  dependencies = [ pytest ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  disabledTestPaths = [
+    # missing pytest-deadfixtures
+    "tests/test_deadfixtures_support.py"
+  ];
 
   pythonImportsCheck = [ "pytest_lazy_fixtures" ];
 

From b935896640c0d5d253c086e659bf4ba99433ba70 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:56 +0200
Subject: [PATCH 1181/3724] python3Packages.pytest-qt: 4.4.0 -> 4.5.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pytest-qt/default.nix      | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix
index eac27debb474..36758f51da08 100644
--- a/pkgs/development/python-modules/pytest-qt/default.nix
+++ b/pkgs/development/python-modules/pytest-qt/default.nix
@@ -1,29 +1,35 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools-scm,
   pytest,
+  pluggy,
+  typing-extensions,
   pyqt5,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pytest-qt";
-  version = "4.4.0";
-  format = "setuptools";
+  version = "4.5.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-dolhQqlApChTOQCNaSijbUvnSv7H5jRXfoQsnMXFaEQ=";
+  src = fetchFromGitHub {
+    owner = "pytest-dev";
+    repo = "pytest-qt";
+    tag = version;
+    hash = "sha256-ZCWWhd1/7qdSgGLNbsjPlxg24IFdqbNtLRktgMFVCJY=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
   buildInputs = [ pytest ];
 
+  dependencies = [
+    pluggy
+    typing-extensions
+  ];
+
   nativeCheckInputs = [ pyqt5 ];
 
   pythonImportsCheck = [ "pytestqt" ];

From 70fe6da9bdc28d199e17bc12d41b869d6a5ed465 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:57 +0200
Subject: [PATCH 1182/3724] python3Packages.pytest-random-order: 1.1.1 -> 1.2.0

https://github.com/jbasko/pytest-random-order/releases/tag/v1.2.0

This commit was automatically generated using update-python-libraries.
---
 .../pytest-random-order/default.nix           | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix
index 9886bcf7f869..1c900d4b6e84 100644
--- a/pkgs/development/python-modules/pytest-random-order/default.nix
+++ b/pkgs/development/python-modules/pytest-random-order/default.nix
@@ -1,28 +1,31 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   py,
   pytest,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "pytest-random-order";
-  version = "1.1.1";
+  version = "1.2.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.5";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-RHLX008fHF86NZxP/FwT7QZSMvMeyhnIhEwatAbnkIA=";
+  src = fetchFromGitHub {
+    owner = "jbasko";
+    repo = "pytest-random-order";
+    tag = "v${version}";
+    hash = "sha256-c282PrdXxG7WChnkpLWe059OmtTOl1Mn6yWgMRfCjBA=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   buildInputs = [ pytest ];
 

From 0114614321048b3605341846edce592a5871d055 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:57 +0200
Subject: [PATCH 1183/3724] python3Packages.pytest-regressions: 2.7.0 -> 2.8.1

https://github.com/ESSS/pytest-regressions/blob/v2.8.1/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/pytest-regressions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix
index 337c5f048a17..18286d14fcd9 100644
--- a/pkgs/development/python-modules/pytest-regressions/default.nix
+++ b/pkgs/development/python-modules/pytest-regressions/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-regressions";
-  version = "2.7.0";
+  version = "2.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "ESSS";
     repo = "pytest-regressions";
     tag = "v${version}";
-    hash = "sha256-w9uwJJtikbjUtjpJJ3dEZ1zU0KbdyLaDuJWJr45WpCg=";
+    hash = "sha256-8FbPWKYHy/0ITrCx9044iYOR7B9g8tgEdV+QfUg4esk=";
   };
 
   build-system = [ setuptools-scm ];

From 9cfca49b988f3f179419b1c4fe4f6f93abbb5a3a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:58 +0200
Subject: [PATCH 1184/3724] python3Packages.pytest-run-parallel: 0.3.1 -> 0.6.0

https://github.com/Quansight-Labs/pytest-run-parallel/blob/v0.6.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pytest-run-parallel/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-run-parallel/default.nix b/pkgs/development/python-modules/pytest-run-parallel/default.nix
index cad82d8f2244..4a061f97c686 100644
--- a/pkgs/development/python-modules/pytest-run-parallel/default.nix
+++ b/pkgs/development/python-modules/pytest-run-parallel/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-run-parallel";
-  version = "0.3.1";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Quansight-Labs";
     repo = "pytest-run-parallel";
     tag = "v${version}";
-    hash = "sha256-YBky+aoMO3dclod6RTQZF0X8fE8CAgHHY4es8vWHb3U=";
+    hash = "sha256-6cfpPJItOmb79KERqpKz/nQlyTrAj4yv+bGM8SXrsXg=";
   };
 
   build-system = [ setuptools ];

From df1ea24ed0e3ff3e34d35b0d9d97f3753bfb24a6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:58 +0200
Subject: [PATCH 1185/3724] python3Packages.pytest-services: 2.2.1 -> 2.2.2

https://github.com/pytest-dev/pytest-services/blob/v2.2.2/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pytest-services/default.nix | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix
index 537e06b5e04b..c45a7649629f 100644
--- a/pkgs/development/python-modules/pytest-services/default.nix
+++ b/pkgs/development/python-modules/pytest-services/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   psutil,
   pylibmc,
   pytest,
@@ -17,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-services";
-  version = "2.2.1";
+  version = "2.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,19 +24,10 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-services";
-    tag = version;
-    hash = "sha256-E/VcKcAb1ekypm5jP4lsSz1LYJTcTSed6i5OY5ihP30=";
+    tag = "v${version}";
+    hash = "sha256-kWgqb7+3/hZKUz7B3PnfxHZq6yU3JUeJ+mruqrMD/NE=";
   };
 
-  patches = [
-    # Replace distutils.spawn.find_executable with shutil.which, https://github.com/pytest-dev/pytest-services/pull/46
-    (fetchpatch {
-      name = "replace-distutils.patch";
-      url = "https://github.com/pytest-dev/pytest-services/commit/e0e2a85434a2dcbcc0584299c5b2b751efe0b6db.patch";
-      hash = "sha256-hvr7EedfjfonHDn6v2slwUBqz1xQoF7Ez/kqAhZRXEc=";
-    })
-  ];
-
   nativeBuildInputs = [
     setuptools-scm
     toml
@@ -72,7 +62,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Services plugin for pytest testing framework";
     homepage = "https://github.com/pytest-dev/pytest-services";
-    changelog = "https://github.com/pytest-dev/pytest-services/blob/${version}/CHANGES.rst";
+    changelog = "https://github.com/pytest-dev/pytest-services/blob/${src.tag}/CHANGES.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };

From 6da4b703bb8552ccb61aa3bff7ca3350ce946a7b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:59 +0200
Subject: [PATCH 1186/3724] python3Packages.pytest-subtests: 0.14.1 -> 0.14.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pytest-subtests/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix
index 0b4f03e7942b..2826f917cee1 100644
--- a/pkgs/development/python-modules/pytest-subtests/default.nix
+++ b/pkgs/development/python-modules/pytest-subtests/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-subtests";
-  version = "0.14.1";
+  version = "0.14.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pytest_subtests";
     inherit version;
-    hash = "sha256-NQwArcNsOv9namYTXIGu2eIYLhX2w+yHITZpGLu/dYA=";
+    hash = "sha256-cVSoZl/VKO5wp20AIWpE0TncPJyDUhoPd597CtT4AN4=";
   };
 
   nativeBuildInputs = [

From 8aed0533320cce1d204a336b5f6703dfd504597f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:42:59 +0200
Subject: [PATCH 1187/3724] python3Packages.python-binance: 1.0.27 -> 1.0.29

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/python-binance/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix
index 77db7394f7e1..5f7c7d37e4c0 100644
--- a/pkgs/development/python-modules/python-binance/default.nix
+++ b/pkgs/development/python-modules/python-binance/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "python-binance";
-  version = "1.0.27";
+  version = "1.0.29";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "sammchardy";
     repo = "python-binance";
     tag = "v${version}";
-    hash = "sha256-nsJuHxPXhMBRY4BUDDLj5sHK/GuJA0pBU3RGUDxVm50=";
+    hash = "sha256-Hqd6228k2j1BPzBBCRpdEp0rAGxZt00XPnzpCPlwIfg=";
   };
 
   build-system = [ setuptools ];

From 0d779f21aec7850f839a59a9d3e9ae47d467dfa9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:00 +0200
Subject: [PATCH 1188/3724] python3Packages.python-codon-tables: 0.1.15 ->
 0.1.18

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/python-codon-tables/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-codon-tables/default.nix b/pkgs/development/python-modules/python-codon-tables/default.nix
index af0e275321d1..af72906af4eb 100644
--- a/pkgs/development/python-modules/python-codon-tables/default.nix
+++ b/pkgs/development/python-modules/python-codon-tables/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "python-codon-tables";
-  version = "0.1.15";
+  version = "0.1.18";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "python_codon_tables";
     inherit version;
-    hash = "sha256-bK0Y8y5W6xmtGeRUtLDGsg1voVKp1uU37tBqi0/raLY=";
+    hash = "sha256-c/VSmArSkq+46LzW3r+CQEG1mwp87ACbZ7EWkMOGOQc=";
   };
 
   # no tests in tarball

From 29b3b0af488f2fc4319dce394ad5c7d1965b8211 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:00 +0200
Subject: [PATCH 1189/3724] python3Packages.python-constraint: 1.4.0 -> 2.4.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/python-constraint/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python-constraint/default.nix b/pkgs/development/python-modules/python-constraint/default.nix
index ae00c34c3354..2ac55f35c9f1 100644
--- a/pkgs/development/python-modules/python-constraint/default.nix
+++ b/pkgs/development/python-modules/python-constraint/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "python-constraint";
-  version = "1.4.0";
+  version = "2.4.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "python-constraint";
     repo = "python-constraint";
-    rev = version;
-    sha256 = "1dv11406yxmmgkkhwzqicajbg2bmla5xfad7lv57zyahxz8jzz94";
+    tag = version;
+    sha256 = "sha256-Vi+dD/QmHfUrL0l5yTb7B1ILuXj3HYfT0QINdyfoqFo=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];

From a01969886af9648fe62d7b438224ec43173792a4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:01 +0200
Subject: [PATCH 1190/3724] python3Packages.python-crontab: 3.2.0 -> 3.3.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/python-crontab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-crontab/default.nix b/pkgs/development/python-modules/python-crontab/default.nix
index c89cd3d07bda..9fd4c03572ed 100644
--- a/pkgs/development/python-modules/python-crontab/default.nix
+++ b/pkgs/development/python-modules/python-crontab/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "python-crontab";
-  version = "3.2.0";
+  version = "3.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "python_crontab";
     inherit version;
-    hash = "sha256-QAZ9HdOa3jRgsq2FV8dlFRTNOFHe//9hxcYOEifFw2s=";
+    hash = "sha256-AHyK7mjd3z4E7E3OD6wSS5O9aL50cPyV0qlhehXeKRs=";
   };
 
   build-system = [ setuptools ];

From c0b225182134682fbd91d46b9d8ed0cd60d9504c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:01 +0200
Subject: [PATCH 1191/3724] python3Packages.python-dbusmock: 0.34.2 -> 0.36.0

https://github.com/martinpitt/python-dbusmock/releases/tag/0.36.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/python-dbusmock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix
index 18cd8884ee1f..48dc270bac44 100644
--- a/pkgs/development/python-modules/python-dbusmock/default.nix
+++ b/pkgs/development/python-modules/python-dbusmock/default.nix
@@ -30,14 +30,14 @@ let
 in
 buildPythonPackage rec {
   pname = "python-dbusmock";
-  version = "0.34.2";
+  version = "0.36.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "martinpitt";
     repo = "python-dbusmock";
     tag = version;
-    hash = "sha256-7h5SIcgWcbzInmCkbGz/ulfPJvqPPguWLJY+AXJuo0c=";
+    hash = "sha256-9YnMOQUuwAcrL0ZaQr7iGly9esZaSRIFThQRNUtSndo=";
   };
 
   build-system = [

From 9c29137e7ef33ab41e214f89584b380ab19d90f0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:01 +0200
Subject: [PATCH 1192/3724] python3Packages.python-fontconfig: 0.6.0 -> 0.6.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/python-fontconfig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix
index f249489e4bac..18f40cbb647c 100644
--- a/pkgs/development/python-modules/python-fontconfig/default.nix
+++ b/pkgs/development/python-modules/python-fontconfig/default.nix
@@ -22,13 +22,13 @@ let
 in
 buildPythonPackage rec {
   pname = "python-fontconfig";
-  version = "0.6.0";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "python_fontconfig";
     inherit version;
-    sha256 = "sha256-1esVZVMvkcAKWchaOrIki2CYoJDffN1PW+A9nXWjCeU=";
+    sha256 = "sha256-qka4KksXW9LPn+Grmyng3kyrhwIEG7UEpVDeKfX89zM=";
   };
 
   build-system = [

From 1b8fdf50c32b194fb059a580eedbda52b2f46128 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:02 +0200
Subject: [PATCH 1193/3724] python3Packages.python-gitlab: 6.1.0 -> 6.2.0

https://github.com/python-gitlab/python-gitlab/blob/v6.2.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/python-gitlab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
index fb351f79bb97..d55bd12447c4 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "python-gitlab";
-  version = "6.1.0";
+  version = "6.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "python_gitlab";
     inherit version;
-    hash = "sha256-Bi1pQ2mbCbzkD3J/DQkGoLJUykVVk/gXRbsaNSU17nc=";
+    hash = "sha256-uIx5zqZd0kJZIsgpcw6pWCftcTLYabhTK5CoxxmcwaY=";
   };
 
   build-system = [ setuptools ];

From e88d01a562a82f78f7e9eced6857418c88f12bb6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:02 +0200
Subject: [PATCH 1194/3724] python3Packages.python-gnupg: 0.5.4 -> 0.5.5

https://github.com/vsajip/python-gnupg/releases/tag/0.5.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/python-gnupg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix
index 8fb7866efbd0..0ba82fdcccb8 100644
--- a/pkgs/development/python-modules/python-gnupg/default.nix
+++ b/pkgs/development/python-modules/python-gnupg/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "python-gnupg";
-  version = "0.5.4";
+  version = "0.5.5";
 
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8v21+ylhXHfCdD4cs9kxQ1Om6HsQw30jjZGuHG/q4IY=";
+    hash = "sha256-P9yvdvYKG5SP+ON9w5jQPPnOdCcGXVgwgrktp6T/WmM=";
   };
 
   postPatch = ''

From 1a6a05482b843a5d3ed8b689daf6b925c3093afe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:03 +0200
Subject: [PATCH 1195/3724] python3Packages.python-hosts: 1.0.7 -> 1.1.2

https://github.com/jonhadfield/python-hosts/blob/1.1.2/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/python-hosts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix
index 0f582e760250..7eb9ce7dbad7 100644
--- a/pkgs/development/python-modules/python-hosts/default.nix
+++ b/pkgs/development/python-modules/python-hosts/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "python-hosts";
-  version = "1.0.7";
+  version = "1.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "python_hosts";
     inherit version;
-    hash = "sha256-TFaZHiL2v/woCWgz3nh/kjUOhbfN1ghnBnJcVcTwSrk=";
+    hash = "sha256-XiU6aO6EhFVgj1g7TYMdbgg7IvjkU2DFoiwYikrB13A=";
   };
 
   build-system = [ setuptools ];

From 4c00e0c2e05a18a51662953fb33e3892c97a7c1f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:03 +0200
Subject: [PATCH 1196/3724] python3Packages.python-jenkins: 1.8.2 -> 1.8.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/python-jenkins/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix
index e06a0760fbdd..6e2eb9c169ba 100644
--- a/pkgs/development/python-modules/python-jenkins/default.nix
+++ b/pkgs/development/python-modules/python-jenkins/default.nix
@@ -18,12 +18,13 @@
 
 buildPythonPackage rec {
   pname = "python-jenkins";
-  version = "1.8.2";
+  version = "1.8.3";
   format = "setuptools";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-VufauwYHvbjh1vxtLUMBq+2+2RZdorIG+svTBxy27ss=";
+    pname = "python_jenkins";
+    inherit version;
+    hash = "sha256-j0dhw5GsEejB8j93EBCSDBBEBJdwWrcXXVI1j1oS3Jg=";
   };
 
   # test uses timeout mechanism unsafe for use with the "spawn"

From e5610b3ef8784089463fb266c372fd14f8e47194 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:04 +0200
Subject: [PATCH 1197/3724] python3Packages.python-json-logger: 3.2.1 -> 3.3.0

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/python-json-logger/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix
index 9e7a8198ecb4..acae4e2689da 100644
--- a/pkgs/development/python-modules/python-json-logger/default.nix
+++ b/pkgs/development/python-modules/python-json-logger/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "python-json-logger";
-  version = "3.2.1";
+  version = "3.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nhairs";
     repo = "python-json-logger";
     tag = "v${version}";
-    hash = "sha256-dM9/ehPY/BnJSNBq1BiTUpJRigdzbGb3jD8Uhx+hmKc=";
+    hash = "sha256-q1s+WRU5xTmF4YW20DrDnXbMeW6vGYzVekxxIDVt8gw=";
   };
 
   build-system = [ setuptools ];

From b54317814508e99505964383d14e625076754e72 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:04 +0200
Subject: [PATCH 1198/3724] python3Packages.python-markdown-math: 0.8 -> 0.9

This commit was automatically generated using update-python-libraries.
---
 .../python-markdown-math/default.nix          | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/python-markdown-math/default.nix b/pkgs/development/python-modules/python-markdown-math/default.nix
index 3bf104029b40..508229050afe 100644
--- a/pkgs/development/python-modules/python-markdown-math/default.nix
+++ b/pkgs/development/python-modules/python-markdown-math/default.nix
@@ -1,22 +1,25 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  setuptools,
   markdown,
-  isPy27,
 }:
 
 buildPythonPackage rec {
   pname = "python-markdown-math";
-  version = "0.8";
-  format = "setuptools";
-  disabled = isPy27;
+  version = "0.9";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "8564212af679fc18d53f38681f16080fcd3d186073f23825c7ce86fadd3e3635";
+  src = fetchFromGitHub {
+    owner = "mitya57";
+    repo = "python-markdown-math";
+    tag = version;
+    hash = "sha256-m/i43lvOehZSazHXhoAZTRSB5BQgn2VFjXADxSKeXfs=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ markdown ];
 
   meta = {

From dc4fb6e847db816a46c74569cba83bbf82c5e84c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:04 +0200
Subject: [PATCH 1199/3724] python3Packages.python-on-whales: 0.75.1 -> 0.78.0

https://github.com/gabrieldemarmiesse/python-on-whales/releases/tag/v0.78.0

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/python-on-whales/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix
index bbe238cde817..9b917d59b2ba 100644
--- a/pkgs/development/python-modules/python-on-whales/default.nix
+++ b/pkgs/development/python-modules/python-on-whales/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "python-on-whales";
-  version = "0.75.1";
+  version = "0.78.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gabrieldemarmiesse";
     repo = "python-on-whales";
     tag = "v${version}";
-    hash = "sha256-JjzBFVgPNnU0q5hL+RZJMs3WxbeZbBKyvsV6clUFjpE=";
+    hash = "sha256-mpCBqFxxFxljhoTveLmk4XfqngiQPsufqr927hSwNfA=";
   };
 
   build-system = [ setuptools ];
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "Docker client for Python, designed to be fun and intuitive";
     homepage = "https://github.com/gabrieldemarmiesse/python-on-whales";
-    changelog = "https://github.com/gabrieldemarmiesse/python-on-whales/releases/tag/v${version}";
+    changelog = "https://github.com/gabrieldemarmiesse/python-on-whales/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bcdarwin ];
   };

From fac256815cdc98ace94b26ba21a0c2201685a958 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:05 +0200
Subject: [PATCH 1200/3724] python3Packages.python-owasp-zap-v2-4: 0.0.18 ->
 0.4.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/python-owasp-zap-v2-4/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix b/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix
index 5aaca9b14f11..6c11fb6da120 100644
--- a/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix
+++ b/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "python-owasp-zap-v2-4";
-  version = "0.0.18";
+  version = "0.4.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "zaproxy";
     repo = "zap-api-python";
-    rev = version;
-    sha256 = "0b46m9s0vwaaq8vhiqspdr2ns9qdw65fnjh8mf58gjinlsd27ygk";
+    tag = version;
+    sha256 = "sha256-UG8+0jJwnywvuc68/9r10kKMqxNIOg5mIdPt2Fx2BZA=";
   };
 
   propagatedBuildInputs = [

From e356f9ea750c7a5da0bea30e5680489b2cfde8fd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:05 +0200
Subject: [PATCH 1201/3724] python3Packages.python-pkcs11: 0.7.0 -> 0.8.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/python-pkcs11/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/python-pkcs11/default.nix b/pkgs/development/python-modules/python-pkcs11/default.nix
index 10e37e558501..baa6e6b45e63 100644
--- a/pkgs/development/python-modules/python-pkcs11/default.nix
+++ b/pkgs/development/python-modules/python-pkcs11/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "python-pkcs11";
-  version = "0.7.0";
-  format = "setuptools";
+  version = "0.8.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "danni";
     repo = "python-pkcs11";
-    rev = "v${version}";
-    sha256 = "0kncbipfpsb7m7mhv5s5b9wk604h1j08i2j26fn90pklgqll0xhv";
+    tag = "v${version}";
+    sha256 = "sha256-iCfcVVzAwwg69Ym1uVimSzYZBQmC+Yppl5YXDaLIcqc=";
   };
 
   nativeBuildInputs = [

From e09691c74fdac5b5faf60a54085a7b5af8824b91 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:06 +0200
Subject: [PATCH 1202/3724] python3Packages.python-roborock: 2.25.0 -> 2.27.0

https://github.com/humbertogontijo/python-roborock/blob/v2.27.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/python-roborock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index d6fb0b903251..faa5d84101c1 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "python-roborock";
-  version = "2.25.0";
+  version = "2.27.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "humbertogontijo";
     repo = "python-roborock";
     tag = "v${version}";
-    hash = "sha256-RsNWhcScp81plqXg9NmRFJhF+aLA0ld0A5H6mHo60uE=";
+    hash = "sha256-3iNqeRCdkkL77hYlh+LRo8ZKExcpk075eBbnp8oJQ8w=";
   };
 
   postPatch = ''

From f7808a6e4c989d175e31c139d9c41a67531e30b0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:06 +0200
Subject: [PATCH 1203/3724] python3Packages.python-socks: 2.7.1 -> 2.7.2

https://github.com/romis2012/python-socks/releases/tag/v2.7.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/python-socks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix
index 8d0c255cbbc2..183fdd950cb5 100644
--- a/pkgs/development/python-modules/python-socks/default.nix
+++ b/pkgs/development/python-modules/python-socks/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "python-socks";
-  version = "2.7.1";
+  version = "2.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.6.2";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "romis2012";
     repo = "python-socks";
     tag = "v${version}";
-    hash = "sha256-7BfdyQDfRIPSC3Iv+cDcR0VFHX+l1OPRMElzHGL2x3M=";
+    hash = "sha256-9RzlK8iErM94vpVLeildYjqXbRxdiVyxASCZHKd0mao=";
   };
 
   build-system = [ setuptools ];

From 04f9b2ac74f0a26c93cd3e1a0ab3674bde3f3abf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:07 +0200
Subject: [PATCH 1204/3724] python3Packages.python-stdnum: 1.20 -> 2.1

https://github.com/arthurdejong/python-stdnum/blob/2.1/ChangeLog

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/python-stdnum/default.nix  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix
index cf0c31466010..15722e6b4496 100644
--- a/pkgs/development/python-modules/python-stdnum/default.nix
+++ b/pkgs/development/python-modules/python-stdnum/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytestCheckHook,
   pytest-cov-stub,
   setuptools,
@@ -13,23 +13,24 @@ buildPythonPackage rec {
   version = "2.1";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "python_stdnum";
-    inherit version;
-    hash = "sha256-awFkWWnrPf1VBhoBFNWTdTzZ5lPOqQgxmLfuoSZEOXo=";
+  src = fetchFromGitHub {
+    owner = "arthurdejong";
+    repo = "python-stdnum";
+    tag = version;
+    hash = "sha256-9m4tO9TX9lV4V3wTkMFDj0Mc+jl4bKsHM/adeF3cBTE=";
   };
 
   build-system = [ setuptools ];
 
+  optional-dependencies = {
+    SOAP = [ zeep ];
+  };
+
   nativeCheckInputs = [
     pytestCheckHook
     pytest-cov-stub
   ];
 
-  optional-dependencies = {
-    SOAP = [ zeep ];
-  };
-
   pythonImportsCheck = [ "stdnum" ];
 
   meta = with lib; {

From f001ecef6e818eceac5dfbd3c8d5b6b6a5def628 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:07 +0200
Subject: [PATCH 1205/3724] python3Packages.python-tado: 0.18.15 -> 0.19.2

https://github.com/wmalgadey/PyTado/releases/tag/0.19.2

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/python-tado/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix
index 7cde7aa3d8e6..7ef8016aad0f 100644
--- a/pkgs/development/python-modules/python-tado/default.nix
+++ b/pkgs/development/python-modules/python-tado/default.nix
@@ -2,33 +2,35 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  poetry-core,
   pytest-cov-stub,
   pytest-mock,
+  pytest-socket,
   pytestCheckHook,
   requests,
   responses,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "python-tado";
-  version = "0.18.15";
+  version = "0.19.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "wmalgadey";
     repo = "PyTado";
     tag = version;
-    hash = "sha256-FUnD5JVS816XQYqXGSDnypqcYuKVhEeFIFcENf8BkcU=";
+    hash = "sha256-me62VPjKU+vh0vo4Fl86sEse1QZYD2zDpxchSiUcxTY=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ poetry-core ];
 
   dependencies = [ requests ];
 
   nativeCheckInputs = [
     pytest-cov-stub
     pytest-mock
+    pytest-socket
     pytestCheckHook
     responses
   ];

From 99816db744e485c2db14e0dcce04237a915b13df Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:08 +0200
Subject: [PATCH 1206/3724] python3Packages.python-telegram-bot: 22.1 -> 22.3

https://github.com/python-telegram-bot/python-telegram-bot/blob/v22.3/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/python-telegram-bot/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index c815561a0b03..8340153612d8 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "python-telegram-bot";
-  version = "22.1";
+  version = "22.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "python-telegram-bot";
     repo = "python-telegram-bot";
     tag = "v${version}";
-    hash = "sha256-zysqE1WZCHdoJUr9+yE7L5xY5pInNUKC4qw4v3zPSRg=";
+    hash = "sha256-mckCkz5DBRjO4iFvRpkqLa7H8GBE/Lwi9CQ902pQ1nQ=";
   };
 
   build-system = [

From 605b037cc87f09362e36840858089f9bc39d245a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:08 +0200
Subject: [PATCH 1207/3724] python3Packages.pytraccar: 2.1.1 -> 3.0.0

https://github.com/ludeeus/pytraccar/releases/tag/3.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pytraccar/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix
index 6344f1e6d9bd..47c3a7233882 100644
--- a/pkgs/development/python-modules/pytraccar/default.nix
+++ b/pkgs/development/python-modules/pytraccar/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pytraccar";
-  version = "2.1.1";
+  version = "3.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "ludeeus";
     repo = "pytraccar";
     tag = version;
-    hash = "sha256-WTRqYw66iD4bbb1aWJfBI67+DtE1FE4oiuUKpfVqypE=";
+    hash = "sha256-DtxZCvLuvQpbu/1lIXz2BVbACt5Q1N2txVMyqwd4d9A=";
   };
 
   nativeBuildInputs = [ poetry-core ];
@@ -48,7 +48,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library to handle device information from Traccar";
     homepage = "https://github.com/ludeeus/pytraccar";
-    changelog = "https://github.com/ludeeus/pytraccar/releases/tag/${version}";
+    changelog = "https://github.com/ludeeus/pytraccar/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From 473f3d9944ac1c8111f87db55b6e30fc0272f6fd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:09 +0200
Subject: [PATCH 1208/3724] python3Packages.pytransportnswv2: 0.8.7 -> 0.9.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pytransportnswv2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix
index f512ae5cb7ab..83e7b8452d2a 100644
--- a/pkgs/development/python-modules/pytransportnswv2/default.nix
+++ b/pkgs/development/python-modules/pytransportnswv2/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pytransportnswv2";
-  version = "0.8.7";
+  version = "0.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyTransportNSWv2";
     inherit version;
-    hash = "sha256-Jg/oEgbxn0eGf9Bn9wte6Wqc1TYVb8GjzU1mLWk1qtE=";
+    hash = "sha256-J3OW8fWldbkKzCDlXSv7nucVdyEnDFx8uCicF+ELQkQ=";
   };
 
   build-system = [ setuptools ];

From 96b6fcd754954a8f949fa81427bd6e1b0fa09412 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:09 +0200
Subject: [PATCH 1209/3724] python3Packages.pyttsx3: 2.98 -> 2.99

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyttsx3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyttsx3/default.nix b/pkgs/development/python-modules/pyttsx3/default.nix
index ba9afeb6be85..a66e1ca4489a 100644
--- a/pkgs/development/python-modules/pyttsx3/default.nix
+++ b/pkgs/development/python-modules/pyttsx3/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "pyttsx3";
-  version = "2.98";
+  version = "2.99";
   format = "wheel";
 
   src = fetchPypi {
     inherit pname version format;
-    sha256 = "sha256-s/tMpNWuT45oNtaze/X+4P1R0Vf/on+5Bkvm5749o3o=";
+    sha256 = "sha256-/z5P91bCTXK58/LzBODtqv0PWK2w5vS5DZMEQM2osgc=";
     dist = "py3";
     python = "py3";
   };

From d441ffb3c8fdad29a2cae96c6ba3e2bc14ce8ac4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:10 +0200
Subject: [PATCH 1210/3724] python3Packages.pytubefix: 9.2.2 -> 9.4.1

https://github.com/JuanBindez/pytubefix/releases/tag/v9.4.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pytubefix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix
index 77d81e25bd5b..45a8742b4e0b 100644
--- a/pkgs/development/python-modules/pytubefix/default.nix
+++ b/pkgs/development/python-modules/pytubefix/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pytubefix";
-  version = "9.2.2";
+  version = "9.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "JuanBindez";
     repo = "pytubefix";
     tag = "v${version}";
-    hash = "sha256-Abx4VIA8dnEZpl86IyGJYSR8n6sPmtCTq5eJbqKyNRM=";
+    hash = "sha256-aw17XiWdr8cDIL8o4Dc91YLi3t4B8r5VAhBgZtCm3x8=";
   };
 
   build-system = [ setuptools ];

From b861bdeea547438a1af13482d96e36e44f3c7420 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:10 +0200
Subject: [PATCH 1211/3724] python3Packages.pyturbojpeg: 1.8.0 -> 1.8.2

https://github.com/lilohuang/PyTurboJPEG/releases/tag/v1.8.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyturbojpeg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix
index 8cfb975b808c..881ff4ec7182 100644
--- a/pkgs/development/python-modules/pyturbojpeg/default.nix
+++ b/pkgs/development/python-modules/pyturbojpeg/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyturbojpeg";
-  version = "1.8.0";
+  version = "1.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lilohuang";
     repo = "PyTurboJPEG";
     tag = "v${version}";
-    hash = "sha256-4DPkzHjEsVjioRNLZii/5gZIEbj8A8rNkL8UXUQsgdY=";
+    hash = "sha256-zyLNIo7hQuzTlEgdvri3bSnAiRRKKup57tfCIxiBq24=";
   };
 
   patches = [
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "turbojpeg" ];
 
   meta = with lib; {
-    changelog = "https://github.com/lilohuang/PyTurboJPEG/releases/tag/v${version}";
+    changelog = "https://github.com/lilohuang/PyTurboJPEG/releases/tag/${src.tag}";
     description = "Python wrapper of libjpeg-turbo for decoding and encoding JPEG image";
     homepage = "https://github.com/lilohuang/PyTurboJPEG";
     license = licenses.mit;

From ef4eac459c6be5aefc0b2ae7a57abbafa335f48a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:11 +0200
Subject: [PATCH 1212/3724] python3Packages.pyvesync: 2.1.18 -> 2.18

https://github.com/webdjoe/pyvesync/releases/tag/2.18

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyvesync/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix
index fbc5ae395b98..70e1197a90a2 100644
--- a/pkgs/development/python-modules/pyvesync/default.nix
+++ b/pkgs/development/python-modules/pyvesync/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyvesync";
-  version = "2.1.18";
+  version = "2.18";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "webdjoe";
     repo = "pyvesync";
     tag = version;
-    hash = "sha256-p46QVjJ8MzvsAu9JAQo4XN+z96arWLoJakdT81ITasU=";
+    hash = "sha256-bcjFa/6GgWk9UZLaB+oUOWVb6b7o0kKB2jzHr9I48eI=";
   };
 
   build-system = [ setuptools ];

From 0f58e15d40d776773c9091f48a4795a6d6a727bf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:12 +0200
Subject: [PATCH 1213/3724] python3Packages.pyvisa-py: 0.7.2 -> 0.8.0

https://github.com/pyvisa/pyvisa-py/blob/0.8.0/CHANGES

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyvisa-py/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix
index f432fa6c1112..aa05ec2c606e 100644
--- a/pkgs/development/python-modules/pyvisa-py/default.nix
+++ b/pkgs/development/python-modules/pyvisa-py/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pyvisa-py";
-  version = "0.7.2";
+  version = "0.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "pyvisa";
     repo = "pyvisa-py";
     tag = version;
-    hash = "sha256-UFAKLrZ1ZrTmFXwVuyTCPVo3Y1YIDOvkx5krpsz71BM=";
+    hash = "sha256-bYxl7zJ36uorEasAKvPiVWLaG2ISQGBHrQZJcnkbfzU=";
   };
 
   nativeBuildInputs = [
@@ -53,7 +53,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module that implements the Virtual Instrument Software Architecture";
     homepage = "https://github.com/pyvisa/pyvisa-py";
-    changelog = "https://github.com/pyvisa/pyvisa-py/blob/${version}/CHANGES";
+    changelog = "https://github.com/pyvisa/pyvisa-py/blob/${src.tag}/CHANGES";
     license = licenses.mit;
     maintainers = with maintainers; [ mvnetbiz ];
   };

From 6e784c200d4476b0d3ce4c77f9c338480f85d1a8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:12 +0200
Subject: [PATCH 1214/3724] python3Packages.pyvisa-sim: 0.6.0 -> 0.7.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pyvisa-sim/default.nix         | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pyvisa-sim/default.nix b/pkgs/development/python-modules/pyvisa-sim/default.nix
index 69e61ea9d034..0dc5ab72663f 100644
--- a/pkgs/development/python-modules/pyvisa-sim/default.nix
+++ b/pkgs/development/python-modules/pyvisa-sim/default.nix
@@ -15,24 +15,21 @@
 
 buildPythonPackage rec {
   pname = "pyvisa-sim";
-  version = "0.6.0";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.8";
+  version = "0.7.0";
+  pyproject = true;
 
   src = fetchPypi {
-    pname = "PyVISA-sim";
+    pname = "pyvisa_sim";
     inherit version;
-    hash = "sha256-kHahaRKoEUtDxEsdMolPwfEy1DidiytxmvYiQeQhYcE=";
+    hash = "sha256-fVpnLKSK25SL5hbwYSuFMrHu5mSvZ8Gt8Qv/Tjv7+NA=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
-    wheel
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     pyvisa
     pyyaml
     stringparser

From 60e7f75c8aa399b8d77e74cb7e0065fd9b4a35a4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:12 +0200
Subject: [PATCH 1215/3724] python3Packages.pyvmomi: 8.0.3.0.1 -> 9.0.0.0

https://github.com/vmware/pyvmomi/releases/tag/v9.0.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyvmomi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix
index 5ebc09edb239..7c9102a7c0d2 100644
--- a/pkgs/development/python-modules/pyvmomi/default.nix
+++ b/pkgs/development/python-modules/pyvmomi/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyvmomi";
-  version = "8.0.3.0.1";
+  version = "9.0.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "vmware";
     repo = "pyvmomi";
     tag = "v${version}";
-    hash = "sha256-wJe45r9fWNkg8oWJZ47bcqoWzOvxpO4soV2SU4N0tb0=";
+    hash = "sha256-4r0UtLR1dhhNQ+Lx12JiEozDAjMxPly+RR0LWRg/A4E=";
   };
 
   propagatedBuildInputs = [
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python SDK for the VMware vSphere API that allows you to manage ESX, ESXi, and vCenter";
     homepage = "https://github.com/vmware/pyvmomi";
-    changelog = "https://github.com/vmware/pyvmomi/releases/tag/v${version}";
+    changelog = "https://github.com/vmware/pyvmomi/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = [ ];
   };

From 40a02cba632e021f6c716e6d92a7ac4507e06b17 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:13 +0200
Subject: [PATCH 1216/3724] python3Packages.pywatchman: 2.0.0 -> 3.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pywatchman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/pkgs/development/python-modules/pywatchman/default.nix
index f51d3c2dbce5..27beb138785d 100644
--- a/pkgs/development/python-modules/pywatchman/default.nix
+++ b/pkgs/development/python-modules/pywatchman/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "pywatchman";
-  version = "2.0.0";
+  version = "3.0.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JTVNnjZH+UQRpME+UQyDoc7swXl3sFJbpBsW5wGceww=";
+    hash = "sha256-79MqFzkaWHIRjFUEHacaIJYORrpLc0QMJO+sKH7qkR4=";
   };
 
   postPatch = ''

From e38a832b2d2f0ad57085c8b1cdc5bae99c06010c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:13 +0200
Subject: [PATCH 1217/3724] python3Packages.pywavelets: 1.8.0 -> 1.9.0

https://github.com/PyWavelets/pywt/releases/tag/v1.9.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pywavelets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix
index 4bb23a6acd42..c61dff8b51ca 100644
--- a/pkgs/development/python-modules/pywavelets/default.nix
+++ b/pkgs/development/python-modules/pywavelets/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pywavelets";
-  version = "1.8.0";
+  version = "1.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "PyWavelets";
     repo = "pywt";
     tag = "v${version}";
-    hash = "sha256-v5NkzgIztREYz2Idg0E3grejWhZ/5BX0nCexUX8XcTQ=";
+    hash = "sha256-UVQWZPuOyUPcWI3cV2u+jQyAZN/RV3aKAT6BQxqRE4M=";
   };
 
   build-system = [

From b91914052c3ed84b00bbe86f5ccfb8b997fc71c3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:14 +0200
Subject: [PATCH 1218/3724] python3Packages.pywebview: 5.3.2 -> 5.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pywebview/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix
index ca01c3e7ca9f..b7b2096f27a9 100644
--- a/pkgs/development/python-modules/pywebview/default.nix
+++ b/pkgs/development/python-modules/pywebview/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pywebview";
-  version = "5.3.2";
+  version = "5.4";
   pyproject = true;
 
   disabled = pythonOlder "3.5";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "r0x0r";
     repo = "pywebview";
     tag = version;
-    hash = "sha256-/jKauq+G3Nz91n/keTZGNDTaW5EhdyCx4c2Nylxqc+0=";
+    hash = "sha256-HQ95tg1BuOr+SyOEDCbIc6Xm2dzzWS0mMcnV4bHMNBs=";
   };
 
   nativeBuildInputs = [

From f2b628d9008470e82067723034c38b2683021259 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:14 +0200
Subject: [PATCH 1219/3724] python3Packages.pywikibot: 10.2.0 -> 10.3.0

https://doc.wikimedia.org/pywikibot/master/changelog.html

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pywikibot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pywikibot/default.nix b/pkgs/development/python-modules/pywikibot/default.nix
index 6c05e1e533a4..9375756f4eb2 100644
--- a/pkgs/development/python-modules/pywikibot/default.nix
+++ b/pkgs/development/python-modules/pywikibot/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pywikibot";
-  version = "10.2.0";
+  version = "10.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pwXF2JgcK6rA1YNQ2VQ1svBDsc8xt3Xx2+o0Xr+cOZM=";
+    hash = "sha256-QXgv++Vr2HYzoAAwk2eVg/EnKqX9EFUJo6OBHvlYbjQ=";
   };
 
   propagatedBuildInputs = [

From 511fee924ddff1112a7e18e497213b6975137872 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:15 +0200
Subject: [PATCH 1220/3724] python3Packages.pyyaml-env-tag: 0.1 -> 1.1

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/pyyaml-env-tag/default.nix       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pyyaml-env-tag/default.nix b/pkgs/development/python-modules/pyyaml-env-tag/default.nix
index 8167c85c6534..69014895c8ce 100644
--- a/pkgs/development/python-modules/pyyaml-env-tag/default.nix
+++ b/pkgs/development/python-modules/pyyaml-env-tag/default.nix
@@ -2,24 +2,25 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   pyyaml,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pyyaml-env-tag";
-  version = "0.1";
-  format = "setuptools";
-  disabled = pythonOlder "3.6";
+  version = "1.1";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "pyyaml_env_tag";
     inherit version;
-    sha256 = "1nsva88jsmwn0cb9jnrfiz4dvs9xakkpgfii7g1xwkx1pmsjc2bh";
+    sha256 = "sha256-LrOLdaLSHuBHXW2X7BnGMoen4UAjHkIUlp0OrJI81/8=";
   };
 
-  propagatedBuildInputs = [ pyyaml ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pyyaml ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 1d416fd0c98ec159716f21a99d38f77acfcd57e4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:15 +0200
Subject: [PATCH 1221/3724] python3Packages.pyzmq: 26.4.0 -> 27.0.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/pyzmq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix
index 40789b68dbc0..723997fc32ce 100644
--- a/pkgs/development/python-modules/pyzmq/default.nix
+++ b/pkgs/development/python-modules/pyzmq/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "pyzmq";
-  version = "26.4.0";
+  version = "27.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-S9E/hfgJYvkaZRpzVv4EcnkaX3qS8ieCK1rPRHlcYm0=";
+    hash = "sha256-RcVJIEvCDnSE/9JVX2zwLlckQOzy873WDUQEsg/d9ks=";
   };
 
   build-system = [

From 3adca3400a86bc5d0359c236d10a880d190e686d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:17 +0200
Subject: [PATCH 1222/3724] python3Packages.qcodes: 0.52.0 -> 0.53.0

https://github.com/QCoDeS/Qcodes/releases/tag/v0.53.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/qcodes/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix
index 451a7f43bb45..337f078f8855 100644
--- a/pkgs/development/python-modules/qcodes/default.nix
+++ b/pkgs/development/python-modules/qcodes/default.nix
@@ -61,14 +61,14 @@
 
 buildPythonPackage rec {
   pname = "qcodes";
-  version = "0.52.0";
+  version = "0.53.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "Qcodes";
     tag = "v${version}";
-    hash = "sha256-AQBzYKD4RsPQBtq/FxFwYnSUf8wW87JOb2cOnk9MHDY=";
+    hash = "sha256-uXVL25U7szJF/v7OEsB9Ww1h6ziBxsMJdqhZG5qn0VU=";
   };
 
   postPatch = ''
@@ -200,7 +200,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Python-based data acquisition framework";
-    changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}";
+    changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/${src.tag}";
     downloadPage = "https://github.com/QCoDeS/Qcodes";
     homepage = "https://qcodes.github.io/Qcodes/";
     license = lib.licenses.mit;

From fcb029da0d384cb4d53b0f883df421d56588764f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:18 +0200
Subject: [PATCH 1223/3724] python3Packages.qiskit-aer: 0.16.0.1 -> 0.17.1

https://qiskit.org/documentation/release_notes.html

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/qiskit-aer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix
index ef15dc42303c..6e208ebb8069 100644
--- a/pkgs/development/python-modules/qiskit-aer/default.nix
+++ b/pkgs/development/python-modules/qiskit-aer/default.nix
@@ -29,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "qiskit-aer";
-  version = "0.16.0.1";
+  version = "0.17.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "Qiskit";
     repo = "qiskit-aer";
     tag = version;
-    hash = "sha256-YF5X//X0fvJyALEB4gqsKRNWSoEsOrZFLVQUgHOA+0A=";
+    hash = "sha256-jvapuARJUHgAKFUzGb5MUft01LNefVIXtStJqFnCo90=";
   };
 
   postPatch = ''

From c62c900cc9966f18c280949823107d49ea8d7dbb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:18 +0200
Subject: [PATCH 1224/3724] python3Packages.qiskit-machine-learning: 0.8.2 ->
 0.8.3

https://qiskit.org/documentation/release_notes.html

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/qiskit-machine-learning/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix
index 4a872f34f554..559d858e0fbb 100644
--- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix
+++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "qiskit-machine-learning";
-  version = "0.8.2";
+  version = "0.8.3";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "qiskit";
     repo = pname;
     tag = version;
-    hash = "sha256-dvGUtB7R44B+DYZKl4R2Q0GdvLTjVKWD0KmuyCoaOSc=";
+    hash = "sha256-XnLCejK6m8p/OC5gKCoP1UXVblISChu3lKF8BnrnRbk=";
   };
 
   nativeBuildInputs = [ setuptools ];

From a4e356e164dd653bd88fd474502f04f62a9d14e9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:19 +0200
Subject: [PATCH 1225/3724] python3Packages.qiskit: 1.3.1 -> 2.1.1

https://qiskit.org/documentation/release_notes.html

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/qiskit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index ac39260c0df0..38bd460cff8a 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -33,7 +33,7 @@ in
 buildPythonPackage rec {
   pname = "qiskit";
   # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
-  version = "1.3.1";
+  version = "2.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "Qiskit";
     repo = "qiskit";
     tag = version;
-    hash = "sha256-Dqd8ywnACfvrfY7Fzw5zYwhlsDvHZErPGvxBPs2pS04=";
+    hash = "sha256-WHfsl/T4lmnvkGY7gF5PStilGq3G66TZG9oB1tKwuOQ=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 6ad6a134a7881c7167ad7691dab8318cf55d6bea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:19 +0200
Subject: [PATCH 1226/3724] python3Packages.qnapstats: 0.5.0 -> 0.6.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/qnapstats/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qnapstats/default.nix b/pkgs/development/python-modules/qnapstats/default.nix
index 2cfa9edc6593..1e2033a59191 100644
--- a/pkgs/development/python-modules/qnapstats/default.nix
+++ b/pkgs/development/python-modules/qnapstats/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "qnapstats";
-  version = "0.5.0";
+  version = "0.6.0";
 
   format = "setuptools";
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "colinodell";
     repo = "python-qnapstats";
     tag = version;
-    hash = "sha256-dpxl6a61h8zB7eS/2lxG+2//bOTzV6s4T1W+DVj0fnI=";
+    hash = "sha256-4zGCMwuPL9QFVLgyZ6/aV9YBQJBomPkX34C7ULEd4Fw=";
   };
 
   propagatedBuildInputs = [
@@ -28,6 +28,10 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ responses ];
 
+  # File "/build/source/tests/test-models.py", line 124, in <module>
+  #   assert json.dumps(qnap.get_system_stats(), sort_keys=True) == systemstats
+  doCheck = false;
+
   checkPhase = ''
     runHook preCheck
 

From 7b21af5aba61994e437adf3470e2579654d3f91b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:20 +0200
Subject: [PATCH 1227/3724] python3Packages.qt-material: 2.14 -> 2.17

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/qt-material/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qt-material/default.nix b/pkgs/development/python-modules/qt-material/default.nix
index 2a6d64c55e22..24c279dc3e89 100644
--- a/pkgs/development/python-modules/qt-material/default.nix
+++ b/pkgs/development/python-modules/qt-material/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "qt-material";
-  version = "2.14";
+  version = "2.17";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tdu1relyF8964za7fAR8kL6zncfyBIpJjJFq1fL3riM=";
+    hash = "sha256-tQCgwfXvj0aozwN9GqW9+epOthgYC2MyU5373QZHrQ0=";
   };
 
   propagatedBuildInputs = [ jinja2 ];

From 7bcf582f615df69d66171c906f0d67d8800e93ee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:20 +0200
Subject: [PATCH 1228/3724] python3Packages.rapidgzip: 0.14.4 -> 0.14.5

https://github.com/mxmlnkn/rapidgzip/blob/rapidgzip-v0.14.5/python/rapidgzip/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/rapidgzip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rapidgzip/default.nix b/pkgs/development/python-modules/rapidgzip/default.nix
index 230f94c0ad73..4e1e2e7870a4 100644
--- a/pkgs/development/python-modules/rapidgzip/default.nix
+++ b/pkgs/development/python-modules/rapidgzip/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "rapidgzip";
-  version = "0.14.4";
+  version = "0.14.5";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-sHtL5TKVR6iP9pRg0/omw0gXqxgEQG8VcTAzkL3jjWs=";
+    hash = "sha256-+u1GAToaYqUZPElhWolmg+pcFO1HRLy0vRhpsUIFUdg=";
   };
 
   prePatch = ''

From ea9aaaf8d322b05a12fe3339d403fde6a4020476 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:21 +0200
Subject: [PATCH 1229/3724] python3Packages.rapidocr-onnxruntime: 2.1.0 ->
 3.3.1

https://github.com/RapidAI/RapidOCR/releases/tag/v3.3.1

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/rapidocr-onnxruntime/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix
index e0af42135d96..1ead42bb779b 100644
--- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix
+++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix
@@ -21,13 +21,13 @@
   requests,
 }:
 let
-  version = "2.1.0";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "RapidAI";
     repo = "RapidOCR";
     tag = "v${version}";
-    hash = "sha256-4R2rOCfnhElII0+a5hnvbn+kKQLEtH1jBvfFdxpLEBk=";
+    hash = "sha256-EgVBMQX+E8ejUd/6FUQ+uJoWjrQSVznpPcc2gA2wAOE=";
   };
 
   models =

From 595800b31d3e51f61e580f3474baa258e627b214 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:21 +0200
Subject: [PATCH 1230/3724] python3Packages.ratarmount: 1.0.0 -> 1.1.2

https://github.com/mxmlnkn/ratarmount/blob/v1.1.2/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ratarmount/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ratarmount/default.nix b/pkgs/development/python-modules/ratarmount/default.nix
index 8cc31927bcf7..c6ae9038fb85 100644
--- a/pkgs/development/python-modules/ratarmount/default.nix
+++ b/pkgs/development/python-modules/ratarmount/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "ratarmount";
-  version = "1.0.0";
+  version = "1.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cXm301LMEsiE1eKJO70gTy7asdZ5CKnKtxLinW2+iJ4=";
+    hash = "sha256-XiwtmZ7HGZwjJJrUD3TOP3o19RBwB/Yu09xdwK13+hk=";
   };
 
   pythonRelaxDeps = [ "python-xz" ];

From 77cad37650a8304c0106428a3df0a5e6860f9e81 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:22 +0200
Subject: [PATCH 1231/3724] python3Packages.ratarmountcore: 1.0.0 -> 1.1.2

https://github.com/mxmlnkn/ratarmount/blob/core-v1.1.2/core/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ratarmountcore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ratarmountcore/default.nix b/pkgs/development/python-modules/ratarmountcore/default.nix
index 3d5ef3529f57..c0d4e5c06dc0 100644
--- a/pkgs/development/python-modules/ratarmountcore/default.nix
+++ b/pkgs/development/python-modules/ratarmountcore/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "ratarmountcore";
-  version = "1.0.0";
+  version = "1.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "mxmlnkn";
     repo = "ratarmount";
     tag = "v${version}";
-    hash = "sha256-nTKbwZoD7nf3cKFJOR5p6ZRFHsKVeJXboOAhPjvnQAM=";
+    hash = "sha256-8DjmYYTb0BR5KvtSeI2s7VtYdbRSI+QCjhZfDwqnk3M=";
     fetchSubmodules = true;
   };
 

From 8456051f93bda16d98198cf29b8a65571f5adbb2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:22 +0200
Subject: [PATCH 1232/3724] python3Packages.rawpy: 0.24.0 -> 0.25.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/rawpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rawpy/default.nix b/pkgs/development/python-modules/rawpy/default.nix
index 6270febe7bfa..ed82047d9a29 100644
--- a/pkgs/development/python-modules/rawpy/default.nix
+++ b/pkgs/development/python-modules/rawpy/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "rawpy";
-  version = "0.24.0";
+  version = "0.25.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "letmaik";
     repo = "rawpy";
     tag = "v${version}";
-    hash = "sha256-u/KWbviyhbMts40Gc/9shXSESwihWZQQaf3Z44gMgvs=";
+    hash = "sha256-d3TxPW3GdCQT8bBbnveSxtWHkf5zinM8nSy4m/P7m7Q=";
   };
 
   build-system = [

From c3503993c800c78a4a7eaf5db4061d4a6e1c043c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:22 +0200
Subject: [PATCH 1233/3724] python3Packages.recline: 2024.7.1 -> 2025.6

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/recline/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/recline/default.nix b/pkgs/development/python-modules/recline/default.nix
index d7c3d896ee28..3b88fda29ef9 100644
--- a/pkgs/development/python-modules/recline/default.nix
+++ b/pkgs/development/python-modules/recline/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "recline";
-  version = "2024.7.1";
+  version = "2025.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "NetApp";
     repo = "recline";
     tag = "v${version}";
-    sha256 = "sha256-Qc4oofuhSZ2S5zuCY9Ce9ISldYI3MDUJXFc8VcXdLIU=";
+    sha256 = "sha256-WBMt5jDPCBmTgVdYDN662uU2HVjB1U3GYJwn0P56WsI=";
   };
 
   patches = [

From 94a63f7754ff071d24b65f83f830ca06db5209dc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:23 +0200
Subject: [PATCH 1234/3724] python3Packages.redis-om: 0.3.3 -> 0.3.5

https://github.com/redis/redis-om-python/releases/tag/v0.3.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/redis-om/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix
index be929f9cd306..5800bcb20004 100644
--- a/pkgs/development/python-modules/redis-om/default.nix
+++ b/pkgs/development/python-modules/redis-om/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "redis-om";
-  version = "0.3.3";
+  version = "0.3.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "redis";
     repo = "redis-om-python";
     tag = "v${version}";
-    hash = "sha256-Pp404HaFpYEPie9xknoabotFrqcI2ibDlPTM+MmnMbg=";
+    hash = "sha256-TfwMYDZYDKCdI5i8izBVZaXN5GC/Skhkl905c/DHuXY=";
   };
 
   build-system = [
@@ -77,7 +77,7 @@ buildPythonPackage rec {
     description = "Object mapping, and more, for Redis and Python";
     mainProgram = "migrate";
     homepage = "https://github.com/redis/redis-om-python";
-    changelog = "https://github.com/redis/redis-om-python/releases/tag/v${version}";
+    changelog = "https://github.com/redis/redis-om-python/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ natsukium ];
   };

From 3bd4fda37b63961938c006430f11b8ad69acc1d6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:23 +0200
Subject: [PATCH 1235/3724] python3Packages.redis: 6.1.0 -> 6.2.0

https://github.com/redis/redis-py/releases/tag/v6.2.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/redis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
index 64ec9fa2f62a..35f2e517fc3a 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "redis";
-  version = "6.1.0";
+  version = "6.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ySjiZ61p0waa8oqYI6B3Ju33LH43dk9D3AEj83kowHU=";
+    hash = "sha256-6CHxKbdd3my5ndNeXHboxJUSpaDY39xWCy+9RLhcqXc=";
   };
 
   build-system = [ hatchling ];

From 9f814efce4f37005341e3fdbcd116b6da03bae90 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:24 +0200
Subject: [PATCH 1236/3724] python3Packages.reflex-chakra: 0.7.1 -> 0.8.2post1

https://github.com/reflex-dev/reflex-chakra/releases/tag/v0.8.2post1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/reflex-chakra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix
index 188c96298e7e..05419d4d0a34 100644
--- a/pkgs/development/python-modules/reflex-chakra/default.nix
+++ b/pkgs/development/python-modules/reflex-chakra/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "reflex-chakra";
-  version = "0.7.1";
+  version = "0.8.2post1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "reflex-dev";
     repo = "reflex-chakra";
     tag = "v${version}";
-    hash = "sha256-dAenwsFhRj9BzdGyaC38TwBWog95H0mSA0ullt4otHA=";
+    hash = "sha256-DugZRZpGP90EFkBjpAS1XkjrNPG6WWwCQPUcEZJ0ff8=";
   };
 
   build-system = [ hatchling ];

From 4aea9f02fcba207b42c5553d0b49d87ae2a32cbf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:24 +0200
Subject: [PATCH 1237/3724] python3Packages.reflex-hosting-cli: 0.1.50 ->
 0.1.53

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/reflex-hosting-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix
index aea9e53115d5..ecf9faf897a0 100644
--- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix
+++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "reflex-hosting-cli";
-  version = "0.1.50";
+  version = "0.1.53";
   pyproject = true;
 
   # source is not published https://github.com/reflex-dev/reflex/issues/3762
   src = fetchPypi {
     pname = "reflex_hosting_cli";
     inherit version;
-    hash = "sha256-1ZTTc09P/0rTNhiqsNDB2RMLcUjKt1rIWtufakkFWkg=";
+    hash = "sha256-pxUnZzAuecgzbEi+PNXOry9yRjAsPhzobjSV7+PPDuk=";
   };
 
   pythonRelaxDeps = [

From 05a815f3b2a113be7b9bad35d068400b566bb82c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:25 +0200
Subject: [PATCH 1238/3724] python3Packages.reflex: 0.7.14 -> 0.8.5

https://github.com/reflex-dev/reflex/releases/tag/v0.8.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/reflex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix
index 83c179a05136..343e33431531 100644
--- a/pkgs/development/python-modules/reflex/default.nix
+++ b/pkgs/development/python-modules/reflex/default.nix
@@ -43,14 +43,14 @@
 
 buildPythonPackage rec {
   pname = "reflex";
-  version = "0.7.14";
+  version = "0.8.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "reflex-dev";
     repo = "reflex";
     tag = "v${version}";
-    hash = "sha256-yuVBQYP0YlvAIWF/+oSfCLbfj1GLtnYajU3WoolyTjY=";
+    hash = "sha256-OBGDOVWjm3DbN41e3/RrOvCBvd5Uv6VyOvPA8/FWsiU=";
   };
 
   # 'rich' is also somehow checked when building the wheel,

From 713f707b89870ea990fd42dba7052c77f2958a95 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:25 +0200
Subject: [PATCH 1239/3724] python3Packages.regex: 2024.11.6 -> 2025.7.34

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/regex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index 8c9810bdd5fa..7d50f3051cbd 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "regex";
-  version = "2024.11.6";
+  version = "2025.7.34";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-erFZsGPFKgMzyITkZ5+NeoURLuMHj+PZAEst2HVYVRk=";
+    hash = "sha256-nq2XZSF6/QSoaCLfzU7SdH3+Qm6IfaQTsV/wrCRX4ho=";
   };
 
   checkPhase = ''

From bc7b071151fd3ef15f83bc59b60a807fb7a3423c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:26 +0200
Subject: [PATCH 1240/3724] python3Packages.repl-python-wakatime: 0.0.11 ->
 0.0.12

https://github.com/wakatime/repl-python-wakatime/releases/tag/0.0.12

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/repl-python-wakatime/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/repl-python-wakatime/default.nix b/pkgs/development/python-modules/repl-python-wakatime/default.nix
index 72bdb809a8cb..9ec6223f9296 100644
--- a/pkgs/development/python-modules/repl-python-wakatime/default.nix
+++ b/pkgs/development/python-modules/repl-python-wakatime/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "repl-python-wakatime";
-  version = "0.0.11";
+  version = "0.0.12";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HoCdeo03Lf3g5Xg0GgAyWOu2PtGqy33vg5bQrfkEPkE=";
+    hash = "sha256-U5kg4GbfhyHno1DNbF1uOfHOjgCstYdyDgvwEXqnCZg=";
   };
 
   build-system = [

From 5cec75e7860fe8eb98d4828a256dec4a5d32a6b7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:26 +0200
Subject: [PATCH 1241/3724] python3Packages.reportlab: 4.4.1 -> 4.4.3

https://hg.reportlab.com/hg-public/reportlab/file/tip/CHANGES.md

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/reportlab/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 04d6fada9d2d..c6bed3f383fb 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  chardet,
+  charset-normalizer,
   fetchPypi,
   freetype,
   pillow,
@@ -17,7 +17,7 @@ let
 in
 buildPythonPackage rec {
   pname = "reportlab";
-  version = "4.4.1";
+  version = "4.4.3";
   pyproject = true;
 
   # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-X5ufwLekjokSwlzPadJrgpgKsNpxjk9YP6cg6Pj1Bz8=";
+    hash = "sha256-BzsJddq2lTas0yUYWOawUk7T4IfnHx0NGJWstQrPnHs=";
   };
 
   postPatch = ''
@@ -39,12 +39,12 @@ buildPythonPackage rec {
     rm tests/test_graphics_charts.py
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   buildInputs = [ ft ];
 
-  propagatedBuildInputs = [
-    chardet
+  dependencies = [
+    charset-normalizer
     pillow
   ];
 

From d60bceab3b0012a4133da7456ee7bc51d0aff6dd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:27 +0200
Subject: [PATCH 1242/3724] python3Packages.reproject: 0.14.1 -> 0.15.0

https://github.com/astropy/reproject/releases/tag/v0.15.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/reproject/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix
index b81f576584f5..46f718077684 100644
--- a/pkgs/development/python-modules/reproject/default.nix
+++ b/pkgs/development/python-modules/reproject/default.nix
@@ -7,6 +7,7 @@
   cloudpickle,
   cython,
   dask,
+  extension-helpers,
   fetchPypi,
   fsspec,
   numpy,
@@ -20,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "reproject";
-  version = "0.14.1";
+  version = "0.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-U8jqJ5uLVX8zoeQwr14FPNdHACRA4HK65q2TAtRr5Xk=";
+    hash = "sha256-l9pmxtXIGnl8T8fCsUp/5y3kReg3MXdaN0i2rpcEqE4=";
   };
 
   postPatch = ''
@@ -47,6 +48,7 @@ buildPythonPackage rec {
     astropy-healpix
     cloudpickle
     dask
+    extension-helpers
     fsspec
     numpy
     scipy

From 589487054e0fc66bc24c2f88f44ea628286d7749 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:27 +0200
Subject: [PATCH 1243/3724] python3Packages.reptor: 0.31 -> 0.32

https://github.com/Syslifters/reptor/releases/tag/0.32

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/reptor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix
index 168ee1054606..4611e85cf013 100644
--- a/pkgs/development/python-modules/reptor/default.nix
+++ b/pkgs/development/python-modules/reptor/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "reptor";
-  version = "0.31";
+  version = "0.32";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Syslifters";
     repo = "reptor";
     tag = version;
-    hash = "sha256-AbrfQJQvKXpV4FrhkGZOLYX3px9dzr9whJZwzR/7UYM=";
+    hash = "sha256-nNG4rQHloOqcPZPnvw3hbw0+wCbB2XAdQ5/XnJtCHnE=";
   };
 
   pythonRelaxDeps = true;

From 6ca0d46d790c14f04722b2854ffa11028117718b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:28 +0200
Subject: [PATCH 1244/3724] python3Packages.reqif: 0.0.42 -> 0.0.46

https://github.com/strictdoc-project/reqif/releases/tag/0.0.46

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/reqif/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix
index aa3ab6303cc6..b45ca4d2bad6 100644
--- a/pkgs/development/python-modules/reqif/default.nix
+++ b/pkgs/development/python-modules/reqif/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "reqif";
-  version = "0.0.42";
+  version = "0.0.46";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "strictdoc-project";
     repo = "reqif";
     tag = version;
-    hash = "sha256-cQhis7jrcly3cw2LRv7hpPBFAB0Uag69czf+wJvbh/Q=";
+    hash = "sha256-QI+OhhV+jKw3g2erSCdTj10JW+XFQQyXuAC0LAnts7c=";
   };
 
   postPatch = ''
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Python library for ReqIF format";
     mainProgram = "reqif";
     homepage = "https://github.com/strictdoc-project/reqif";
-    changelog = "https://github.com/strictdoc-project/reqif/releases/tag/${version}";
+    changelog = "https://github.com/strictdoc-project/reqif/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ yuu ];
   };

From 8a1db70e7a3bcbf895c2a20ec151fad88d078277 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:28 +0200
Subject: [PATCH 1245/3724] python3Packages.retrying: 1.3.4 -> 1.4.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/retrying/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix
index ebef0e8ee677..6339e060e364 100644
--- a/pkgs/development/python-modules/retrying/default.nix
+++ b/pkgs/development/python-modules/retrying/default.nix
@@ -2,23 +2,26 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   six,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "retrying";
-  version = "1.4.1";
-  format = "setuptools";
+  version = "1.4.2";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TSBuDtKv9e8vPNhnq7lRHp6PMRJ8Wsog8dUkbkdpA7A=";
+    hash = "sha256-0QLnXVPY0wuIVi1FNh1sbJNNoG+rMb2BwEIKy5eoujk=";
   };
 
-  propagatedBuildInputs = [ six ];
+  build-system = [ setuptools ];
+
+  dependencies = [ six ];
 
   # doesn't ship tests in tarball
   doCheck = false;

From f042c485c69d7e7ce8b93ade616ba6beb58b908f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:29 +0200
Subject: [PATCH 1246/3724] python3Packages.returns: 0.24.0 -> 0.26.0

https://github.com/dry-python/returns/blob/0.26.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/returns/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/returns/default.nix b/pkgs/development/python-modules/returns/default.nix
index 82e00f458316..dc2a443f4a95 100644
--- a/pkgs/development/python-modules/returns/default.nix
+++ b/pkgs/development/python-modules/returns/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "returns";
-  version = "0.24.0";
+  version = "0.26.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "dry-python";
     repo = "returns";
     tag = version;
-    hash = "sha256-qmBxW1XxUlFpAqf2t2ix01TN5NSxOtnYqLyE5ovZU58=";
+    hash = "sha256-VQzsa/uNTQVND0kc20d25to/6LELEiS3cqvG7a1kDw4=";
   };
 
   postPatch = ''
@@ -63,7 +63,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Make your functions return something meaningful, typed, and safe";
     homepage = "https://github.com/dry-python/returns";
-    changelog = "https://github.com/dry-python/returns/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/dry-python/returns/blob/${src.tag}/CHANGELOG.md";
     license = licenses.bsd2;
     maintainers = with maintainers; [ jessemoore ];
   };

From d7576c43b4ab0cf8ea63ae019d2b6056b41c1231 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:29 +0200
Subject: [PATCH 1247/3724] python3Packages.reverse-geocode: 1.6.5 -> 1.6.6

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/reverse-geocode/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reverse-geocode/default.nix b/pkgs/development/python-modules/reverse-geocode/default.nix
index 8c87d9b7c5b0..04b6ff052ac2 100644
--- a/pkgs/development/python-modules/reverse-geocode/default.nix
+++ b/pkgs/development/python-modules/reverse-geocode/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "reverse-geocode";
-  version = "1.6.5";
+  version = "1.6.6";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "reverse_geocode";
     inherit version;
-    hash = "sha256-AyqkLnbHa8ZylVfrJHpsxLeBfLTl6u9IQ3EV8grXrkE=";
+    hash = "sha256-FBZYFYFsxjnddOtmCnTkZK7rzR0IFN50qJfWIHHJnyo=";
   };
 
   build-system = [ setuptools ];

From 4937e982d64bb09229a4235e0a222449178951e6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:29 +0200
Subject: [PATCH 1248/3724] python3Packages.rich-toolkit: 0.14.6 -> 0.14.9

https://github.com/patrick91/rich-toolkit/releases/tag/v0.14.9

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/rich-toolkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rich-toolkit/default.nix b/pkgs/development/python-modules/rich-toolkit/default.nix
index 12a34cb96ccf..f80020bdd9a9 100644
--- a/pkgs/development/python-modules/rich-toolkit/default.nix
+++ b/pkgs/development/python-modules/rich-toolkit/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "rich-toolkit";
-  version = "0.14.6";
+  version = "0.14.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "patrick91";
     repo = "rich-toolkit";
     tag = "v${version}";
-    hash = "sha256-SHQZ0idEx/zDEtP0xQoJg7eUT8+SqLdWljxfTgXzjkk=";
+    hash = "sha256-bX6HqUwFkXXc2Z1LF6BSVBEOl2UUJE9pCBKsfOxUoc0=";
   };
 
   build-system = [

From 8666e6472cb369910f47f8a2927bd6c2acb8e42c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:30 +0200
Subject: [PATCH 1249/3724] python3Packages.rio-tiler: 7.3.0 -> 7.8.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/rio-tiler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix
index 18c173923161..1be8c56cf9ac 100644
--- a/pkgs/development/python-modules/rio-tiler/default.nix
+++ b/pkgs/development/python-modules/rio-tiler/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "rio-tiler";
-  version = "7.3.0";
+  version = "7.8.1";
   pyproject = true;
   disabled = pythonOlder "3.8";
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "cogeotiff";
     repo = "rio-tiler";
     tag = version;
-    hash = "sha256-8Ly1QKKFzct0CPAN/54/kzNUE2FPiwvM+EqmX1utboU=";
+    hash = "sha256-w7uw5PY3uiJmxsgSB1YDbtG7IY1pd4WU3JExZRc40gs=";
   };
 
   build-system = [ hatchling ];

From 5267f8a0108ebeeea1252b176976ca252bf2dd5e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:30 +0200
Subject: [PATCH 1250/3724] python3Packages.rlax: 0.1.6 -> 0.1.7

https://github.com/google-deepmind/rlax/releases/tag/v0.1.7

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/rlax/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix
index 7d800cc5e62f..b6a8a8c0a753 100644
--- a/pkgs/development/python-modules/rlax/default.nix
+++ b/pkgs/development/python-modules/rlax/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "rlax";
-  version = "0.1.6";
+  version = "0.1.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google-deepmind";
     repo = "rlax";
     tag = "v${version}";
-    hash = "sha256-v2Lbzya+E9d7tlUVlQQa4fuPp2q3E309Qvyt70mcdb0=";
+    hash = "sha256-w5vhXBMUlcqlLTKA58QgQ4pxyGs3etxJLIFUVPhE7H8=";
   };
 
   # TODO: remove these patches at the next release (already on master)
@@ -111,7 +111,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library of reinforcement learning building blocks in JAX";
     homepage = "https://github.com/deepmind/rlax";
-    changelog = "https://github.com/google-deepmind/rlax/releases/tag/v${version}";
+    changelog = "https://github.com/google-deepmind/rlax/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ onny ];
   };

From 96afc8c8023ebf34feca526f970eee5c8b6f8f8f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:31 +0200
Subject: [PATCH 1251/3724] python3Packages.roadtx: 1.17.0 -> 1.18.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/roadtx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix
index 67313581adb6..bdd0c68c8b17 100644
--- a/pkgs/development/python-modules/roadtx/default.nix
+++ b/pkgs/development/python-modules/roadtx/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "roadtx";
-  version = "1.17.0";
+  version = "1.18.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-C/s5zNvqREDc6r9EdPrN4+L913XWYTniKQVbaosh9iE=";
+    hash = "sha256-tJLsxo8XQ0FGyob2SSpjvN9RgVYYhDxGcbP6jytcjaU=";
   };
 
   build-system = [ setuptools ];

From c3b2785d6cb3f5cdc1a2c5e184d3fae92eb44b25 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:31 +0200
Subject: [PATCH 1252/3724] python3Packages.robotstatuschecker: 3.0.1 -> 4.1.1

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/robotstatuschecker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix
index 95efb791fe19..69ea26d867df 100644
--- a/pkgs/development/python-modules/robotstatuschecker/default.nix
+++ b/pkgs/development/python-modules/robotstatuschecker/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "robotstatuschecker";
-  version = "3.0.1";
+  version = "4.1.1";
   pyproject = true;
 
   # no tests included in PyPI tarball
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "robotframework";
     repo = "statuschecker";
     tag = "v${version}";
-    hash = "sha256-yW6353gDwo/IzoWOB8oelaS6IUbvTtwwDT05yD7w6UA=";
+    hash = "sha256-YyiGd3XSIe+4PEL2l9LYDGH3lt1iRAAJflcBGYXaBzY=";
   };
 
   postPatch = ''

From a58ba91f88a701d4fa8295da9eea870dff22d1e8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:32 +0200
Subject: [PATCH 1253/3724] python3Packages.rotary-embedding-torch: 0.8.7 ->
 0.8.9

https://github.com/lucidrains/rotary-embedding-torch/releases/tag/0.8.9

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/rotary-embedding-torch/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix
index 6ddff713ea0f..6668fde9720a 100644
--- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix
+++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "rotary-embedding-torch";
-  version = "0.8.7";
+  version = "0.8.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lucidrains";
     repo = "rotary-embedding-torch";
     tag = version;
-    hash = "sha256-xnLZ19IH6ellTmOjj7XVZ21Kly+Exe3ZQwaGzhSRGIA=";
+    hash = "sha256-mPiOtEmRtn73KGoYMum80q0iETJa9zZW9KIWL8O0dnM=";
   };
 
   nativeBuildInputs = [

From b6b3f32bea671b620d4ac49284019e506bd0cdd9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:32 +0200
Subject: [PATCH 1254/3724] python3Packages.rpy2: 3.5.17 -> 3.6.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/rpy2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix
index 8a6a5fe9bcaa..0f6b273fa3ab 100644
--- a/pkgs/development/python-modules/rpy2/default.nix
+++ b/pkgs/development/python-modules/rpy2/default.nix
@@ -27,14 +27,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.5.17";
+  version = "3.6.2";
   format = "setuptools";
   pname = "rpy2";
 
   disabled = isPyPy;
   src = fetchPypi {
     inherit version pname;
-    hash = "sha256-2/8Iww89eRYZImI4WKWztoo/uo7hdH1q9BvEumjz1YI=";
+    hash = "sha256-F06ld2qR0Ds13VYRiJlg4PVFHp0KvqSr/IwL5qhTd9A=";
   };
 
   patches = [

From 6a979a6d4640dc957641d2366f87f671877df00a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:33 +0200
Subject: [PATCH 1255/3724] python3Packages.rq: 2.4 -> 2.4.1

https://github.com/rq/rq/releases/tag/v2.4.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/rq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix
index fd802dd70f70..a18a535ddd91 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "rq";
-  version = "2.4";
+  version = "2.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rq";
     repo = "rq";
     tag = "v${version}";
-    hash = "sha256-7aq9JeyM+IjlRPgh4gs1DmkF0hU5EasgTuUPPlf8960=";
+    hash = "sha256-CtxirZg6WNQpTMoXQRvB8i/KB3r58WlKh+wjBvyVMMs=";
   };
 
   build-system = [ hatchling ];

From f7ca4ebcbb3715a85a0f0a4591582ff4be379b61 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:33 +0200
Subject: [PATCH 1256/3724] python3Packages.rtslib-fb: 2.2.2 -> 2.2.3

https://github.com/open-iscsi/rtslib-fb/releases/tag/v2.2.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/rtslib-fb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/rtslib-fb/default.nix b/pkgs/development/python-modules/rtslib-fb/default.nix
index ab2f3b9d5553..5704aec8ddb7 100644
--- a/pkgs/development/python-modules/rtslib-fb/default.nix
+++ b/pkgs/development/python-modules/rtslib-fb/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "rtslib-fb";
-  version = "2.2.2";
+  version = "2.2.3";
   pyproject = true;
 
   # TypeError: 'method' object does not support the context manager protocol
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "open-iscsi";
     repo = "rtslib-fb";
     tag = "v${version}";
-    hash = "sha256-FuXO/yGZBR+QRvB5s1tE77hjnisSfjjHSCPLvGJOYdM=";
+    hash = "sha256-UGRQMdOkyPZWjXoJUsXuWqstb473KR+Sf9XHbjIdfJ8=";
   };
 
   build-system = [
@@ -48,7 +48,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python object API for managing the Linux LIO kernel target";
     homepage = "https://github.com/open-iscsi/rtslib-fb";
-    changelog = "https://github.com/open-iscsi/rtslib-fb/releases/tag/v${version}";
+    changelog = "https://github.com/open-iscsi/rtslib-fb/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
     mainProgram = "targetctl";

From 74298941a77e415b918ff280acb79ef961395c7e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:34 +0200
Subject: [PATCH 1257/3724] python3Packages.ruamel-yaml: 0.18.10 -> 0.18.14

https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/CHANGES

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ruamel-yaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix
index 9d1aee84809d..4096a930e5bf 100644
--- a/pkgs/development/python-modules/ruamel-yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel-yaml/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "ruamel-yaml";
-  version = "0.18.10";
+  version = "0.18.14";
   pyproject = true;
 
   src = fetchPypi {
     pname = "ruamel.yaml";
     inherit version;
-    hash = "sha256-IMhqsprCFT+ApCjhJUqK32htM4PfBEkFFMo7eaNi21g=";
+    hash = "sha256-cie3aq7DZN8Vk2cw7799crMMC3mx1Xi7uOPcstgfUrc=";
   };
 
   nativeBuildInputs = [ setuptools ];

From aedd386d3019a1cbabb2a1e32b9f0c5e6a5f0b62 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:34 +0200
Subject: [PATCH 1258/3724] python3Packages.rubicon-objc: 0.5.0 -> 0.5.1

https://github.com/beeware/rubicon-objc/releases/tag/v0.5.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/rubicon-objc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rubicon-objc/default.nix b/pkgs/development/python-modules/rubicon-objc/default.nix
index 83fe9636748c..cab1a5684b8d 100644
--- a/pkgs/development/python-modules/rubicon-objc/default.nix
+++ b/pkgs/development/python-modules/rubicon-objc/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "rubicon-objc";
-  version = "0.5.0";
+  version = "0.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "beeware";
     repo = "rubicon-objc";
     tag = "v${version}";
-    hash = "sha256-yEsW8xHW004O7aDU4/mlbfTuF2H5UcpbNR9NACxQv3M=";
+    hash = "sha256-HnPp7VUrcTfkl5XdXYasydMqxhp7eb7r5RW/7yRWmko=";
   };
 
   postPatch = ''

From 5406fe5268f895a6d1dfbe7a4628ed9e91f92fd3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:35 +0200
Subject: [PATCH 1259/3724] python3Packages.rucio: 32.8.6 -> 37.7.1

https://github.com/rucio/rucio/releases/tag/37.7.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/rucio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix
index 15ffb3309b94..7e43bc92ac3d 100644
--- a/pkgs/development/python-modules/rucio/default.nix
+++ b/pkgs/development/python-modules/rucio/default.nix
@@ -37,14 +37,14 @@
 
 buildPythonPackage rec {
   pname = "rucio";
-  version = "32.8.6";
+  version = "37.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rucio";
     repo = "rucio";
     tag = version;
-    hash = "sha256-VQQ4gy9occism1WDrlcHnB7b7D5/G68wKct2PhD59FA=";
+    hash = "sha256-PZ6g/ILs1ed+lxcH2GyV1YJyJqLgYb5/xQ31OXiXnBU=";
   };
 
   pythonRelaxDeps = [
@@ -107,7 +107,7 @@ buildPythonPackage rec {
   meta = {
     description = "Tool for Scientific Data Management";
     homepage = "http://rucio.cern.ch/";
-    changelog = "https://github.com/rucio/rucio/releases/tag/${version}";
+    changelog = "https://github.com/rucio/rucio/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ veprbl ];
   };

From b720f35236cc8b18406bb5436eecd427301d43e9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:36 +0200
Subject: [PATCH 1260/3724] python3Packages.sagemaker: 2.244.0 -> 2.249.0

https://github.com/aws/sagemaker-python-sdk/blob/v2.249.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/sagemaker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 387c831757e4..fa226744b5c0 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -40,14 +40,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker";
-  version = "2.244.0";
+  version = "2.249.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-python-sdk";
     tag = "v${version}";
-    hash = "sha256-T4E1zoZBDUbvnpndhUGYeIG845i5SvpOeYI3VSThUeU=";
+    hash = "sha256-CXEIRFr0rrdydPOKp4HxErUUew86toGAkKo8X5Bz2Bo=";
   };
 
   build-system = [

From ee52e9120d19d81c515cd7fdb9c8fbd0c9063d37 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:36 +0200
Subject: [PATCH 1261/3724] python3Packages.sasmodels: 1.0.9 -> 1.0.10

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/sasmodels/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix
index 15bed29c2ea7..73a4b92b4092 100644
--- a/pkgs/development/python-modules/sasmodels/default.nix
+++ b/pkgs/development/python-modules/sasmodels/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "sasmodels";
-  version = "1.0.9";
+  version = "1.0.10";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "SasView";
     repo = "sasmodels";
     tag = "v${version}";
-    hash = "sha256-eD0YTQYR64tKwG7VxmQkHV2ZACs24hx/sS4me7qTcu4=";
+    hash = "sha256-cTXFlTCm521+xhcggFvDqVZrTJuDiVZ8PazBwA3mKJU=";
   };
 
   build-system = [ setuptools ];

From cec6bab91132bd2e5c478ced28e140ca48cbf089 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:37 +0200
Subject: [PATCH 1262/3724] python3Packages.schema-salad: 8.9.20250408123006 ->
 8.9.20250723145140

https://github.com/common-workflow-language/schema_salad/releases/tag/8.9.20250723145140

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/schema-salad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index 144dc0cc6995..872f8073f0ca 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "schema-salad";
-  version = "8.9.20250408123006";
+  version = "8.9.20250723145140";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "common-workflow-language";
     repo = "schema_salad";
     tag = version;
-    hash = "sha256-sPPHz43zvqdQ3eruRlVxLLP1ZU/UoVdtDhtQRAo8vNg=";
+    hash = "sha256-FEdv0VORkvXhqXPrmyCZ1Ib5Lz4fKwRkEqEcEXpfGq8=";
   };
 
   pythonRelaxDeps = [ "mistune" ];

From 2835f82c07d8ada05045540bcd8ca341c005b323 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:38 +0200
Subject: [PATCH 1263/3724] python3Packages.scikit-bio: 0.6.3 -> 0.7.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/scikit-bio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix
index 3da89a537923..347c9364e41b 100644
--- a/pkgs/development/python-modules/scikit-bio/default.nix
+++ b/pkgs/development/python-modules/scikit-bio/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "scikit-bio";
-  version = "0.6.3";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-bio";
     repo = "scikit-bio";
     tag = version;
-    hash = "sha256-yZa9Kl7+Rk4FLQkZIxa9UIsIGAo6YI4UAiJYbhhPIaI=";
+    hash = "sha256-M0P5DUAMlRTkaIPbxSvO99N3y5eTrkg4NMlkIpGr4/g=";
   };
 
   build-system = [

From b3eb9fa5a33a0ff4ef21fc506554994b0ad6dbc0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:38 +0200
Subject: [PATCH 1264/3724] python3Packages.scikit-build-core: 0.11.3 -> 0.11.5

https://github.com/scikit-build/scikit-build-core/blob/v0.11.5/docs/about/changelog.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/scikit-build-core/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix
index ebca328cc73a..d4f73945c8be 100644
--- a/pkgs/development/python-modules/scikit-build-core/default.nix
+++ b/pkgs/development/python-modules/scikit-build-core/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "scikit-build-core";
-  version = "0.11.3";
+  version = "0.11.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-build";
     repo = "scikit-build-core";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-RtRk0g0ZREFPjm2i2uTqV3UfKZ/aDHUGyju3SI8vs0Y=";
+    tag = "v${version}";
+    hash = "sha256-4DwODJw1U/0+K/d7znYtDO2va71lzp1gDm4Bg9OBjQY=";
   };
 
   postPatch = lib.optionalString (pythonOlder "3.11") ''
@@ -91,7 +91,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Next generation Python CMake adaptor and Python API for plugins";
     homepage = "https://github.com/scikit-build/scikit-build-core";
-    changelog = "https://github.com/scikit-build/scikit-build-core/blob/${src.rev}/docs/about/changelog.md";
+    changelog = "https://github.com/scikit-build/scikit-build-core/blob/${src.tag}/docs/about/changelog.md";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ veprbl ];
   };

From 3d644cd7b0590b374182d63d928d2952e9d6953d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:39 +0200
Subject: [PATCH 1265/3724] python3Packages.scikit-learn: 1.6.1 -> 1.7.1

https://scikit-learn.org/stable/whats_new/v1.7.html#version-1-7-1

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/scikit-learn/default.nix          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix
index b264eabd5ec1..9ebbffd136c2 100644
--- a/pkgs/development/python-modules/scikit-learn/default.nix
+++ b/pkgs/development/python-modules/scikit-learn/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   __structuredAttrs = true;
 
   pname = "scikit-learn";
-  version = "1.6.1";
+  version = "1.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -34,13 +34,16 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "scikit_learn";
     inherit version;
-    hash = "sha256-tPwlJeyixppZJg9YPFanVXxszfjer9um4GD5TBxZc44=";
+    hash = "sha256-JLPx6XakZlqnTuD8qsK4/Mxq53yOB6sl2jum0ykrmAI=";
   };
 
   postPatch = ''
     substituteInPlace meson.build --replace-fail \
       "run_command('sklearn/_build_utils/version.py', check: true).stdout().strip()," \
       "'${version}',"
+    substituteInPlace pyproject.toml \
+      --replace-fail "numpy>=2,<2.3.0" numpy \
+      --replace-fail "scipy>=1.8.0,<1.16.0" scipy
   '';
 
   buildInputs = [
@@ -68,6 +71,11 @@ buildPythonPackage rec {
     threadpoolctl
   ];
 
+  pythonRelaxDeps = [
+    "numpy"
+    "scipy"
+  ];
+
   nativeCheckInputs = [
     pytestCheckHook
     pytest-xdist

From d8729e7b350f1ef75690d22d20f347d5fcf7e3f6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:39 +0200
Subject: [PATCH 1266/3724] python3Packages.scikit-rf: 1.7.0 -> 1.8.0

https://github.com/scikit-rf/scikit-rf/releases/tag/v1.8.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/scikit-rf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix
index 7948fe945b72..ffb55f28ca28 100644
--- a/pkgs/development/python-modules/scikit-rf/default.nix
+++ b/pkgs/development/python-modules/scikit-rf/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "scikit-rf";
-  version = "1.7.0";
+  version = "1.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "scikit-rf";
     repo = "scikit-rf";
     tag = "v${version}";
-    hash = "sha256-Ovrr1U7VuuGKDNSBSCyYSz3DNpaJrA57ccl4AFdzC5E=";
+    hash = "sha256-wQOphwG5/4Bfa+re3S0d7lS4CJlKRjrRqnFZKaTG70M=";
   };
 
   build-system = [ setuptools ];

From d16f2424a64843d1559673ec9bf02cafde64d2df Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:40 +0200
Subject: [PATCH 1267/3724] python3Packages.scim2-client: 0.5.2 -> 0.6.1

https://github.com/python-scim/scim2-client/releases/tag/0.6.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/scim2-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scim2-client/default.nix b/pkgs/development/python-modules/scim2-client/default.nix
index 388c21af3852..8748ccf4e62b 100644
--- a/pkgs/development/python-modules/scim2-client/default.nix
+++ b/pkgs/development/python-modules/scim2-client/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "scim2-client";
-  version = "0.5.2";
+  version = "0.6.1";
 
   pyproject = true;
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "scim2_client";
-    hash = "sha256-viIriAFyfJVrJRr04GBD3dhaQ+iUVujigsx1ucSSeqA=";
+    hash = "sha256-5XOUOKf0vYHkewY22x5NQdhICXCd+EftKhsxtQurgHQ=";
   };
 
   build-system = [ hatchling ];

From f48e3d601ff4fe27edc80a63f38a7b050ab84a1f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:40 +0200
Subject: [PATCH 1268/3724] python3Packages.scim2-models: 0.3.5 -> 0.4.1

https://github.com/python-scim/scim2-models/releases/tag/0.4.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/scim2-models/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scim2-models/default.nix b/pkgs/development/python-modules/scim2-models/default.nix
index a3e2681e7ad9..2ea8a47a578a 100644
--- a/pkgs/development/python-modules/scim2-models/default.nix
+++ b/pkgs/development/python-modules/scim2-models/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "scim2-models";
-  version = "0.3.5";
+  version = "0.4.1";
 
   pyproject = true;
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "scim2_models";
-    hash = "sha256-nOLCYyyB7Si+KfwdWM7DCkDoaVEj/coUA//ZW3hKHuA=";
+    hash = "sha256-SRUPO67otfZsrdjGQyTul5vIrYRU2WFaL0fvAtVd/1c=";
   };
 
   build-system = [ hatchling ];

From 1f462a5cab608a83940034313848e3530961db6a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:41 +0200
Subject: [PATCH 1269/3724] python3Packages.scim2-server: 0.1.5 -> 0.1.7

https://github.com/python-scim/scim2-server/releases/tag/0.1.7

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/scim2-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scim2-server/default.nix b/pkgs/development/python-modules/scim2-server/default.nix
index fa844171be8b..3f5ea98884eb 100644
--- a/pkgs/development/python-modules/scim2-server/default.nix
+++ b/pkgs/development/python-modules/scim2-server/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "scim2-server";
-  version = "0.1.5";
+  version = "0.1.7";
 
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "scim2_server";
-    hash = "sha256-VCJVLnYg3+Kz7/DXWnZXkFqXVszsd2hm3cLY22J4NRw=";
+    hash = "sha256-nMS6vjMZ/Lyu0kiVH+IlmxZsuu7McY7AZS/xamfZSlk=";
   };
 
   build-system = [ hatchling ];

From 2e64fc82d82e5c7c6277c2645f3e4b0356eab4e7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:41 +0200
Subject: [PATCH 1270/3724] python3Packages.scipy-stubs: 1.16.0.2 -> 1.16.1.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/scipy-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scipy-stubs/default.nix b/pkgs/development/python-modules/scipy-stubs/default.nix
index ce38381ca3ef..984c29e674e4 100644
--- a/pkgs/development/python-modules/scipy-stubs/default.nix
+++ b/pkgs/development/python-modules/scipy-stubs/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "scipy-stubs";
-  version = "1.16.0.2";
+  version = "1.16.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scipy";
     repo = "scipy-stubs";
     tag = "v${version}";
-    hash = "sha256-xaBii3vONwfHlrsLr+uvXvirZ2WT1OgUzlYxRIRnGdI=";
+    hash = "sha256-KRwFQG1Nb+Kh9OpQCGtvUzQA0MHNEZnRlzSkpZCNxuw=";
   };
 
   disabled = pythonOlder "3.11";

From 066e0218f7c805abf1eda736dae711d1a4901d72 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:42 +0200
Subject: [PATCH 1271/3724] python3Packages.scmrepo: 3.3.11 -> 3.5.1

https://github.com/iterative/scmrepo/releases/tag/3.5.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/scmrepo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix
index 012ddd088a50..c6bfc4ec364f 100644
--- a/pkgs/development/python-modules/scmrepo/default.nix
+++ b/pkgs/development/python-modules/scmrepo/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "scmrepo";
-  version = "3.3.11";
+  version = "3.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "scmrepo";
     tag = version;
-    hash = "sha256-0vgpfUeqhol3AZuUotSbGYVyknVSxRLBwVMkcKx3m48=";
+    hash = "sha256-pAORKgS6IivDjx5sms/9XYZKQ3+hRuRvsEFGkfKj0ME=";
   };
 
   build-system = [

From 9f8ac39a5b85e3ded428cf94fd077c896f24df2b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:43 +0200
Subject: [PATCH 1272/3724] python3Packages.segyio: 1.9.12 -> 1.9.13

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/segyio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/segyio/default.nix b/pkgs/development/python-modules/segyio/default.nix
index 005a194afd6d..1346623c9807 100644
--- a/pkgs/development/python-modules/segyio/default.nix
+++ b/pkgs/development/python-modules/segyio/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "segyio";
-  version = "1.9.12";
+  version = "1.9.13";
   pyproject = false; # Built with cmake
 
   patches = [
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "equinor";
     repo = "segyio";
     tag = "v${version}";
-    hash = "sha256-+N2JvHBxpdbysn4noY/9LZ4npoQ9143iFEzaxoafnms=";
+    hash = "sha256-uVQ5cs9EPGUTSbaclLjFDwnbJevtv6ie94FLi+9vd94=";
   };
 
   nativeBuildInputs = [

From 0f3c70badf8ba91e828e7c58498f872a1ddedf28 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:44 +0200
Subject: [PATCH 1273/3724] python3Packages.sensor-state-data: 2.18.1 -> 2.19.0

https://github.com/Bluetooth-Devices/sensor-state-data/releases/tag/v2.19.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/sensor-state-data/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix
index fd414913be3e..12a40c0af256 100644
--- a/pkgs/development/python-modules/sensor-state-data/default.nix
+++ b/pkgs/development/python-modules/sensor-state-data/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "sensor-state-data";
-  version = "2.18.1";
+  version = "2.19.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "sensor-state-data";
     tag = "v${version}";
-    hash = "sha256-9GdBKUhueis8pnQP5ZNxvEyRXVGINTueVzLOR4xx5mU=";
+    hash = "sha256-Jl+kyr9WhYEzvsnSdqfeDDWgcEU9Yi6Snd67YQ+1MqQ=";
   };
 
   nativeBuildInputs = [ poetry-core ];
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Models for storing and converting Sensor Data state";
     homepage = "https://github.com/bluetooth-devices/sensor-state-data";
-    changelog = "https://github.com/Bluetooth-Devices/sensor-state-data/releases/tag/v${version}";
+    changelog = "https://github.com/Bluetooth-Devices/sensor-state-data/releases/tag/${src.tag}";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };

From 345ade729740b4bee4c513faab64305660aaa05f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:45 +0200
Subject: [PATCH 1274/3724] python3Packages.sentry-sdk: 2.25.0 -> 2.34.1

https://github.com/getsentry/sentry-python/blob/2.34.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/sentry-sdk/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 076a82996763..c23fc3a688a4 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -67,14 +67,14 @@
 
 buildPythonPackage rec {
   pname = "sentry-sdk";
-  version = "2.25.0";
+  version = "2.34.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-python";
     tag = version;
-    hash = "sha256-HQxZczpfTURbkLaWjOqnYB86UuFHD71kE7HPPjlkUqc=";
+    hash = "sha256-RQnjvX3bDiB9csn/DsQ769EiVm7HY+B7x9V5jpvsOOA=";
   };
 
   postPatch = ''
@@ -214,6 +214,7 @@ buildPythonPackage rec {
     "test_http_timeout"
     # KeyError: 'sentry.release'
     "test_logs_attributes"
+    "test_logger_with_all_attributes"
   ];
 
   pythonImportsCheck = [ "sentry_sdk" ];
@@ -221,7 +222,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Official Python SDK for Sentry.io";
     homepage = "https://github.com/getsentry/sentry-python";
-    changelog = "https://github.com/getsentry/sentry-python/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/getsentry/sentry-python/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ hexa ];
   };

From 12eb399f127860df584694a876a0d0ac349ec7bb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:45 +0200
Subject: [PATCH 1275/3724] python3Packages.shap: 0.46.0 -> 0.48.0

https://github.com/slundberg/shap/releases/tag/v0.48.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/shap/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix
index 3c4a217fb2b3..498899a7e78f 100644
--- a/pkgs/development/python-modules/shap/default.nix
+++ b/pkgs/development/python-modules/shap/default.nix
@@ -7,6 +7,7 @@
   writeText,
   catboost,
   cloudpickle,
+  cython,
   ipython,
   lightgbm,
   lime,
@@ -30,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "shap";
-  version = "0.46.0";
+  version = "0.48.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -39,15 +40,17 @@ buildPythonPackage rec {
     owner = "slundberg";
     repo = "shap";
     tag = "v${version}";
-    hash = "sha256-qW36/Xw5oaYKmaMfE5euzkED9CKkjl2O55aO0OpCkfI=";
+    hash = "sha256-eWZhyrFpEFlmTFPTHZng9V+uMRMXDVzFdgrqIzRQTws=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
+      --replace-fail "cython>=3.0.11" cython \
       --replace-fail "numpy>=2.0" "numpy"
   '';
 
   build-system = [
+    cython
     numpy
     setuptools
     setuptools-scm
@@ -147,7 +150,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Unified approach to explain the output of any machine learning model";
     homepage = "https://github.com/slundberg/shap";
-    changelog = "https://github.com/slundberg/shap/releases/tag/v${version}";
+    changelog = "https://github.com/slundberg/shap/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [
       evax

From 8834c348f013d7e47000fef732ad78907f21fa36 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:46 +0200
Subject: [PATCH 1276/3724] python3Packages.shapely: 2.1.0 -> 2.1.1

https://github.com/shapely/shapely/blob/2.1.1/CHANGES.txt

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/shapely/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix
index 3e204277afbe..ccad45bbac48 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/pkgs/development/python-modules/shapely/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "shapely";
-  version = "2.1.0";
+  version = "2.1.1";
   pyproject = true;
   disabled = pythonOlder "3.7";
 
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "shapely";
     repo = "shapely";
     tag = version;
-    hash = "sha256-Co3acjWsGWjwzMoklRx2CqBDOlEpaj3wWenLWxopvKY=";
+    hash = "sha256-qIITlPym92wfq0byqjRxofpmYYg7vohbi1qPVEu6hRg=";
   };
 
   nativeBuildInputs = [
@@ -61,7 +61,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "shapely" ];
 
   meta = {
-    changelog = "https://github.com/shapely/shapely/blob/${version}/CHANGES.txt";
+    changelog = "https://github.com/shapely/shapely/blob/${src.tag}/CHANGES.txt";
     description = "Manipulation and analysis of geometric objects";
     homepage = "https://github.com/shapely/shapely";
     license = lib.licenses.bsd3;

From fc2729875ed7bd32e249c12597a3fe67ee2be254 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:47 +0200
Subject: [PATCH 1277/3724] python3Packages.shazamio: 0.7.0 -> 0.8.1

https://github.com/dotX12/ShazamIO/releases/tag/0.8.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/shazamio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix
index eec2b5bdcc73..d46ea0258aa1 100644
--- a/pkgs/development/python-modules/shazamio/default.nix
+++ b/pkgs/development/python-modules/shazamio/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "shazamio";
-  version = "0.7.0";
+  version = "0.8.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "dotX12";
     repo = "ShazamIO";
     tag = version;
-    hash = "sha256-72bZyEKvCt/MSqQKzEMQZUC3z53rGm0LJCv6oBCQEYE=";
+    hash = "sha256-beEEr9Y8w0XlC/0+mNL/oWscmnfwt9KChlZ7Ullyk3E=";
   };
 
   patches = [

From 591f9d4a7ea420247e6f6854c34bbd95ed9d715a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:47 +0200
Subject: [PATCH 1278/3724] python3Packages.shtab: 1.7.1 -> 1.7.2

https://github.com/iterative/shtab/releases/tag/v1.7.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/shtab/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix
index f89577c49a5a..9d78fa5d95b2 100644
--- a/pkgs/development/python-modules/shtab/default.nix
+++ b/pkgs/development/python-modules/shtab/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "shtab";
-  version = "1.7.1";
+  version = "1.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "shtab";
     tag = "v${version}";
-    hash = "sha256-8bAwLSdJCzFw5Vf9CKBrH5zOoojeXds7aIRncl+sLBI=";
+    hash = "sha256-ngTAST+6lBek0PHvULmlJZAHVU49YN5+XAu5KEk6cIM=";
   };
 
   nativeBuildInputs = [
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     description = "Module for shell tab completion of Python CLI applications";
     mainProgram = "shtab";
     homepage = "https://docs.iterative.ai/shtab/";
-    changelog = "https://github.com/iterative/shtab/releases/tag/v${version}";
+    changelog = "https://github.com/iterative/shtab/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

From 6b64be8f64509e41d6351aa5dbef8365e1f27567 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:48 +0200
Subject: [PATCH 1279/3724] python3Packages.simplesat: 0.9.1 -> 0.9.2

https://github.com/enthought/sat-solver/blob/v0.9.2/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/simplesat/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/simplesat/default.nix b/pkgs/development/python-modules/simplesat/default.nix
index 391701e6ca24..d325847f9ab0 100644
--- a/pkgs/development/python-modules/simplesat/default.nix
+++ b/pkgs/development/python-modules/simplesat/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "simplesat";
-  version = "0.9.1";
+  version = "0.9.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "enthought";
     repo = "sat-solver";
     tag = "v${version}";
-    hash = "sha256-/fBnpf1DtaF+wQYZztcB8Y20/ZMYxrF3fH5qRsMucL0=";
+    hash = "sha256-C3AQN999iuckaY9I0RTI8Uj6hrV4UB1XYvua5VG8hHw=";
   };
 
   postPatch = ''
@@ -57,7 +57,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Prototype for SAT-based dependency handling";
     homepage = "https://github.com/enthought/sat-solver";
-    changelog = "https://github.com/enthought/sat-solver/blob/v${version}/CHANGES.rst";
+    changelog = "https://github.com/enthought/sat-solver/blob/${src.tag}/CHANGES.rst";
     license = licenses.bsd3;
     maintainers = with maintainers; [ genericnerdyusername ];
   };

From 2136e3982f731a696bfbfbf78c4f927aa402ba18 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:48 +0200
Subject: [PATCH 1280/3724] python3Packages.sip: 6.10.0 -> 6.12.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/sip/default.nix            |  9 ++----
 .../python-modules/sip/sip-builder.patch      | 28 -------------------
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/development/python-modules/sip/sip-builder.patch

diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 067560caee50..c5059665cd78 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -16,19 +16,14 @@
 
 buildPythonPackage rec {
   pname = "sip";
-  version = "6.10.0";
+  version = "6.12.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+gUVaX1MmNvgTZ6JjYFt4UJ+W5rl0OFSFpEJ/SH10pw=";
+    hash = "sha256-CDztlPhTFUkyMRGaY5cLK6QrHTizjnMKcOAqmRkaicY=";
   };
 
-  patches = [
-    # Make wheel file generation deterministic https://github.com/NixOS/nixpkgs/issues/383885
-    ./sip-builder.patch
-  ];
-
   build-system = [
     setuptools
     setuptools-scm
diff --git a/pkgs/development/python-modules/sip/sip-builder.patch b/pkgs/development/python-modules/sip/sip-builder.patch
deleted file mode 100644
index 2a7e1a5753d7..000000000000
--- a/pkgs/development/python-modules/sip/sip-builder.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/sipbuild/builder.py	2025-04-21 12:19:34
-+++ b/sipbuild/builder.py	2025-04-21 12:27:09
-@@ -177,16 +177,23 @@
-         saved_cwd = os.getcwd()
-         os.chdir(wheel_build_dir)
- 
--        from zipfile import ZipFile, ZIP_DEFLATED
-+        from zipfile import ZipFile, ZipInfo, ZIP_DEFLATED
-+        import time
- 
-+        epoch = int(os.environ.get('SOURCE_DATE_EPOCH', '946684800'))
-+        zip_timestamp = time.gmtime(epoch)[:6]
-+
-         with ZipFile(wheel_path, 'w', compression=ZIP_DEFLATED) as zf:
-             for dirpath, _, filenames in os.walk('.'):
-                 for filename in filenames:
-                     # This will result in a name with no leading '.'.
-                     name = os.path.relpath(os.path.join(dirpath, filename))
- 
--                    zf.write(name)
-+                    zi = ZipInfo(name, zip_timestamp)
- 
-+                    with open(name, 'rb') as f:
-+                        zf.writestr(zi, f.read())
-+
-         os.chdir(saved_cwd)
- 
-         return wheel_file

From 1c81c19bcdc7d390ffe885d6ce4fa60bc51f3e54 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:49 +0200
Subject: [PATCH 1281/3724] python3Packages.sismic: 1.6.8 -> 1.6.10

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/sismic/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/sismic/default.nix b/pkgs/development/python-modules/sismic/default.nix
index 1d61ad2689c9..c4b177050df0 100644
--- a/pkgs/development/python-modules/sismic/default.nix
+++ b/pkgs/development/python-modules/sismic/default.nix
@@ -11,9 +11,9 @@
 }:
 
 let
-  version = "1.6.8";
+  version = "1.6.10";
 in
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "sismic";
   inherit version;
   pyproject = true;
@@ -24,7 +24,7 @@ buildPythonPackage {
     owner = "AlexandreDecan";
     repo = "sismic";
     tag = version;
-    hash = "sha256-0g39jJI3UIniJY/oHQMZ53GCOJIbqdVeOED9PWxlw6E=";
+    hash = "sha256-FUjOn2b4nhHf2DfYbY+wsRMaVEG90nPgLlNbNTiq3fQ=";
   };
 
   pythonRelaxDeps = [ "behave" ];
@@ -50,7 +50,7 @@ buildPythonPackage {
   ];
 
   meta = {
-    changelog = "https://github.com/AlexandreDecan/sismic/releases/tag/${version}";
+    changelog = "https://github.com/AlexandreDecan/sismic/releases/tag/${src.tag}";
     description = "Sismic Interactive Statechart Model Interpreter and Checker";
     homepage = "https://github.com/AlexandreDecan/sismic";
     license = lib.licenses.lgpl3Only;

From 9cd635c199081be5129a30770004719ae5920aca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:49 +0200
Subject: [PATCH 1282/3724] python3Packages.skops: 0.11.0 -> 0.12.0

https://github.com/skops-dev/skops/releases/tag/v0.12.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/skops/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix
index 2f911749e5f4..4356e4fe4983 100644
--- a/pkgs/development/python-modules/skops/default.nix
+++ b/pkgs/development/python-modules/skops/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "skops";
-  version = "0.11.0";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "skops-dev";
     repo = "skops";
     tag = "v${version}";
-    hash = "sha256-23Wy/VSd/CvpqT/zDX4ApplfsUwbjOj9q+T8YCKs8X4=";
+    hash = "sha256-OLRnaG++5Z7Y0WZnvfdPn6iIXzum5FTL0+geiO5QjYs=";
   };
 
   build-system = [ hatchling ];

From d05e1e9e2a53b3c0b81e701009e5ae1f171b798e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:50 +0200
Subject: [PATCH 1283/3724] python3Packages.slapd: 0.1.5 -> 0.1.6

https://github.com/python-ldap/python-slapd/blob/0.1.6/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/slapd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/slapd/default.nix b/pkgs/development/python-modules/slapd/default.nix
index 2e466bec45af..789ecbb24e58 100644
--- a/pkgs/development/python-modules/slapd/default.nix
+++ b/pkgs/development/python-modules/slapd/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "slapd";
-  version = "0.1.5";
+  version = "0.1.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "python-ldap";
     repo = "python-slapd";
     tag = version;
-    hash = "sha256-AiJvhgJ62vCj75m6l5kuIEb7k2qCh/QJybS0uqw2vBY=";
+    hash = "sha256-xXIKC8xDJ3Q6yV1BL5Io0PkLqVbFRbbkB0QSXQGHMNg=";
   };
 
   build-system = [ poetry-core ];
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Controls a slapd process in a pythonic way";
     homepage = "https://github.com/python-ldap/python-slapd";
-    changelog = "https://github.com/python-ldap/python-slapd/blob/${src.rev}/CHANGES.rst";
+    changelog = "https://github.com/python-ldap/python-slapd/blob/${src.tag}/CHANGES.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ erictapen ];
   };

From e5f6772814b8180d0c3ad34a58dde92eb913881b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:50 +0200
Subject: [PATCH 1284/3724] python3Packages.smart-open: 7.2.0 -> 7.3.0.post1

https://github.com/piskvorky/smart_open/releases/tag/v7.3.0.post1

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/smart-open/default.nix     | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix
index 1f078d327c75..4c25a8091069 100644
--- a/pkgs/development/python-modules/smart-open/default.nix
+++ b/pkgs/development/python-modules/smart-open/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+  awscli,
   azure-common,
   azure-core,
   azure-storage-blob,
@@ -10,17 +11,21 @@
   google-cloud-storage,
   requests,
   moto,
+  numpy,
   paramiko,
+  pytest-cov-stub,
   pytestCheckHook,
+  pyopenssl,
   responses,
   setuptools,
+  setuptools-scm,
   wrapt,
   zstandard,
 }:
 
 buildPythonPackage rec {
   pname = "smart-open";
-  version = "7.2.0";
+  version = "7.3.0.post1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,10 +34,13 @@ buildPythonPackage rec {
     owner = "RaRe-Technologies";
     repo = "smart_open";
     tag = "v${version}";
-    hash = "sha256-/16Is90235scTAYUW/65QxcTddD0+aiG5TLzYsBUE1A=";
+    hash = "sha256-79q1uQML7WMHsaKQ7+4JA6LpeysJRA4fFxYVqQFntag=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   dependencies = [ wrapt ];
 
@@ -53,13 +61,18 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "smart_open" ];
 
   nativeCheckInputs = [
+    awscli
     moto
+    numpy
+    pytest-cov-stub
     pytestCheckHook
+    pyopenssl
     responses
   ]
+  ++ moto.optional-dependencies.server
   ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  enabledTestPaths = [ "smart_open" ];
+  enabledTestPaths = [ "tests" ];
 
   disabledTests = [
     # https://github.com/RaRe-Technologies/smart_open/issues/784
@@ -72,7 +85,7 @@ buildPythonPackage rec {
   meta = with lib; {
     changelog = "https://github.com/piskvorky/smart_open/releases/tag/${src.tag}";
     description = "Library for efficient streaming of very large file";
-    homepage = "https://github.com/RaRe-Technologies/smart_open";
+    homepage = "https://github.com/piskvorky/smart_open";
     license = licenses.mit;
   };
 }

From f5fafff4974bfc24f86e6ae815ababb960fcf2b9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:53 +0200
Subject: [PATCH 1285/3724] python3Packages.snitun: 0.40.0 -> 0.44.0

https://github.com/NabuCasa/snitun/releases/tag/0.44.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/snitun/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix
index 3f95f9cd081b..b17c173e0144 100644
--- a/pkgs/development/python-modules/snitun/default.nix
+++ b/pkgs/development/python-modules/snitun/default.nix
@@ -8,6 +8,7 @@
   cryptography,
   fetchFromGitHub,
   pytest-aiohttp,
+  pytest-codspeed,
   pytestCheckHook,
   pythonAtLeast,
   pythonOlder,
@@ -16,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "snitun";
-  version = "0.40.0";
+  version = "0.44.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -25,9 +26,14 @@ buildPythonPackage rec {
     owner = "NabuCasa";
     repo = "snitun";
     tag = version;
-    hash = "sha256-wit0GVuWFMl1u+VC7Aw+dPcvqLGyviSz/DVUKXvSvAs=";
+    hash = "sha256-jZRA/UKamB5fUSvyaemN0Vq4GX6bNL8rsYCgToEkIL4=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"'
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -39,6 +45,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytest-aiohttp
+    pytest-codspeed
     pytestCheckHook
   ];
 

From 007874fbd4dd3e746557e51c79d0d862a894de66 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:53 +0200
Subject: [PATCH 1286/3724] python3Packages.snowflake-connector-python: 3.15.0
 -> 3.16.0

https://github.com/snowflakedb/snowflake-connector-python/blob/v3.16.0/DESCRIPTION.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/snowflake-connector-python/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index 2bcb2cc5f969..c0f0b7773b8b 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -13,6 +13,7 @@
   filelock,
   idna,
   keyring,
+  numpy,
   packaging,
   pandas,
   platformdirs,
@@ -32,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "snowflake-connector-python";
-  version = "3.15.0";
+  version = "3.16.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -41,7 +42,7 @@ buildPythonPackage rec {
     owner = "snowflakedb";
     repo = "snowflake-connector-python";
     tag = "v${version}";
-    hash = "sha256-Dz5jxmbBfWThmd7H0MIO5+DfnjpDw9ADHg5Sc7P+DYs=";
+    hash = "sha256-mow8TxmkeaMkgPTLUpx5Gucn4347gohHPyiBYjI/cDs=";
   };
 
   build-system = [
@@ -87,6 +88,7 @@ buildPythonPackage rec {
   '';
 
   nativeCheckInputs = [
+    numpy
     pytest-xdist
     pytestCheckHook
   ];
@@ -125,7 +127,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Snowflake Connector for Python";
     homepage = "https://github.com/snowflakedb/snowflake-connector-python";
-    changelog = "https://github.com/snowflakedb/snowflake-connector-python/blob/v${version}/DESCRIPTION.md";
+    changelog = "https://github.com/snowflakedb/snowflake-connector-python/blob/${src.tag}/DESCRIPTION.md";
     license = licenses.asl20;
     maintainers = [ ];
   };

From 7c8fb552ac4f686df4e2d69026b7b1f3684339ab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:54 +0200
Subject: [PATCH 1287/3724] python3Packages.snowflake-core: 1.4.0 -> 1.7.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/snowflake-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snowflake-core/default.nix b/pkgs/development/python-modules/snowflake-core/default.nix
index 09d8a36822a9..98a78511d16f 100644
--- a/pkgs/development/python-modules/snowflake-core/default.nix
+++ b/pkgs/development/python-modules/snowflake-core/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "snowflake-core";
-  version = "1.4.0";
+  version = "1.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "snowflake_core";
     inherit version;
-    hash = "sha256-3BzO3s5BtS/cuF+JwKuAG8Usca5oo79ffp33TXUP5E8=";
+    hash = "sha256-hlWpTCEa4E0dgD28h2JJ3m0/gCHMVzjWia6oQtG2an8=";
   };
 
   build-system = [ hatchling ];

From 10d482011904f0f2ff0a864c58153de1b175b242 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:54 +0200
Subject: [PATCH 1288/3724] python3Packages.snowflake-sqlalchemy: 1.7.4 ->
 1.7.6

https://github.com/snowflakedb/snowflake-sqlalchemy/blob/v1.7.6/DESCRIPTION.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/snowflake-sqlalchemy/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
index 3062d7b8758d..9f15789497d2 100644
--- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "snowflake-sqlalchemy";
-  version = "1.7.4";
+  version = "1.7.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snowflakedb";
     repo = "snowflake-sqlalchemy";
     tag = "v${version}";
-    hash = "sha256-Twv8ugLrQT9y4wHNo0B8vkWOFNSci/t4eY9XvFlq/TE=";
+    hash = "sha256-8Q4cqfldSilBpj/1/4u5HRUDT8fD9MPzVGcokYt0dJA=";
   };
 
   build-system = [ hatchling ];

From 68863338f02efa51f8f5d4a97561ee7774373612 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:55 +0200
Subject: [PATCH 1289/3724] python3Packages.social-auth-app-django: 5.4.2 ->
 5.5.1

https://github.com/python-social-auth/social-app-django/blob/5.5.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../social-auth-app-django/default.nix        | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/social-auth-app-django/default.nix b/pkgs/development/python-modules/social-auth-app-django/default.nix
index bec09abd2fe5..a819b8a46831 100644
--- a/pkgs/development/python-modules/social-auth-app-django/default.nix
+++ b/pkgs/development/python-modules/social-auth-app-django/default.nix
@@ -2,40 +2,48 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  social-auth-core,
+  setuptools,
   django,
-  python,
-  pythonOlder,
+  social-auth-core,
+  pytest-django,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "social-auth-app-django";
-  version = "5.4.2";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.8";
+  version = "5.5.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-social-auth";
     repo = "social-app-django";
     tag = version;
-    hash = "sha256-W9boogixZ7X6qysfh2YEat+TOBy1VNreGr27y8hno+0=";
+    hash = "sha256-XS7Uj0h2kb+NfO/9S5DAwZ+6LSjqeNslLwNbbVZmkTw=";
   };
 
-  propagatedBuildInputs = [ social-auth-core ];
+  build-system = [ setuptools ];
+
+  dependencies = [
+    django
+    social-auth-core
+  ];
 
   pythonImportsCheck = [ "social_django" ];
 
-  nativeCheckInputs = [ django ];
+  nativeCheckInputs = [
+    pytest-django
+    pytestCheckHook
+  ];
 
-  checkPhase = ''
-    ${python.interpreter} -m django test --settings="tests.settings"
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=tests.settings
   '';
 
   meta = with lib; {
+    broken = lib.versionOlder django.version "5.1";
     description = "Module for social authentication/registration mechanism";
     homepage = "https://github.com/python-social-auth/social-app-django";
-    changelog = "https://github.com/python-social-auth/social-app-django/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/python-social-auth/social-app-django/blob/${src.tag}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ ];
   };

From eeb8787bb303df3d492a8f81867f7d7dfa2f3d08 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:55 +0200
Subject: [PATCH 1290/3724] python3Packages.social-auth-core: 4.5.4 -> 4.7.0

https://github.com/python-social-auth/social-core/blob/4.7.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../social-auth-core/default.nix              | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix
index 860b3981b408..2ea49b464d6e 100644
--- a/pkgs/development/python-modules/social-auth-core/default.nix
+++ b/pkgs/development/python-modules/social-auth-core/default.nix
@@ -8,6 +8,7 @@
   lxml,
   oauthlib,
   pyjwt,
+  pytest-xdist,
   pytestCheckHook,
   python-jose,
   python3-openid,
@@ -15,12 +16,14 @@
   pythonOlder,
   requests,
   requests-oauthlib,
+  responses,
   setuptools,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "social-auth-core";
-  version = "4.5.4";
+  version = "4.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,7 +32,7 @@ buildPythonPackage rec {
     owner = "python-social-auth";
     repo = "social-core";
     tag = version;
-    hash = "sha256-tFaRvNoO5K7ytqMhL//Ntasc7jb4PYXB1yyjFvFqQH8=";
+    hash = "sha256-PQPnLTTCAUE1UmaDRmEXLozY0607e2/fLsvzcJzo4bQ=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -54,27 +57,29 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
+    pytest-xdist
     pytestCheckHook
     httpretty
+    responses
+    typing-extensions
   ]
   ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  # Disable checking the code coverage
-  prePatch = ''
-    substituteInPlace social_core/tests/requirements.txt \
-      --replace "coverage>=3.6" "" \
-      --replace "pytest-cov>=2.7.1" ""
+  disabledTestPaths = [
+    # missing google-auth-stubs
+    "social_core/tests/backends/test_google.py"
 
-    substituteInPlace tox.ini \
-      --replace "{posargs:-v --cov=social_core}" "{posargs:-v}"
-  '';
+    # network access
+    "social_core/tests/backends/test_steam.py::SteamOpenIdMissingSteamIdTest::test_login"
+    "social_core/tests/backends/test_steam.py::SteamOpenIdMissingSteamIdTest::test_partial_pipeline"
+  ];
 
   pythonImportsCheck = [ "social_core" ];
 
   meta = with lib; {
     description = "Module for social authentication/registration mechanisms";
     homepage = "https://github.com/python-social-auth/social-core";
-    changelog = "https://github.com/python-social-auth/social-core/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/python-social-auth/social-core/blob/${src.tag}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ ];
   };

From 1c049e5946156dd3b8db8eb830b50c5afea3bd8a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:56 +0200
Subject: [PATCH 1291/3724] python3Packages.solc-select: 1.0.4 -> 1.1.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/solc-select/default.nix    | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/solc-select/default.nix b/pkgs/development/python-modules/solc-select/default.nix
index 3a9e0f7bb4a9..38525508feb1 100644
--- a/pkgs/development/python-modules/solc-select/default.nix
+++ b/pkgs/development/python-modules/solc-select/default.nix
@@ -1,22 +1,27 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  setuptools,
   packaging,
   pycryptodome,
 }:
 
 buildPythonPackage rec {
   pname = "solc-select";
-  version = "1.0.4";
-  format = "setuptools";
+  version = "1.1.0";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-23ud4AmvbeOlQWuAu+W21ja/MUcDwBYxm4wSMeJIpsc=";
+  src = fetchFromGitHub {
+    owner = "crytic";
+    repo = "solc-select";
+    tag = "v${version}";
+    hash = "sha256-ZB9WM6YTWEqfs5y1DqxbSADiFw997PHIR9uVSjJg1/E=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     packaging
     pycryptodome
   ];

From 865219e4a0401d002162a171274081eefc6d3b6e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:56 +0200
Subject: [PATCH 1292/3724] python3Packages.sopel: 8.0.2 -> 8.0.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/sopel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix
index 0c6298207e68..02da03091cfd 100644
--- a/pkgs/development/python-modules/sopel/default.nix
+++ b/pkgs/development/python-modules/sopel/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "sopel";
-  version = "8.0.2";
+  version = "8.0.3";
   pyproject = true;
 
   disabled = isPyPy || pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7LNbnSri+yjH2Nw8rBCTO8Lg84VXY6A+xMXscEkUVK8=";
+    hash = "sha256-lhoEgfYaqaZfrfVgyHSwl/algqjnvAc/pnVPwK8YdCc=";
   };
 
   build-system = [ setuptools ];

From 7531097ef32740aa7ce540a9c8937c12cffb657b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:57 +0200
Subject: [PATCH 1293/3724] python3Packages.sounddevice: 0.5.1 -> 0.5.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/sounddevice/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix
index 8784657600b9..8481f75272eb 100644
--- a/pkgs/development/python-modules/sounddevice/default.nix
+++ b/pkgs/development/python-modules/sounddevice/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "sounddevice";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-CcqZHa7ajOS+mskeFamoHI+B76a2laNIyRceoMFssEE=";
+    hash = "sha256-xjTVG9TpItbw+l4al1zIl8lH9h0x2p95un6jTf9Ei0k=";
   };
 
   build-system = [ setuptools ];

From f1e59702ec235697d943ebdf6368859457c5c8da Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:57 +0200
Subject: [PATCH 1294/3724] python3Packages.sparklines: 0.5.0 -> 0.7.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/sparklines/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sparklines/default.nix b/pkgs/development/python-modules/sparklines/default.nix
index c04f1908def7..afcf086f0cca 100644
--- a/pkgs/development/python-modules/sparklines/default.nix
+++ b/pkgs/development/python-modules/sparklines/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "sparklines";
-  version = "0.5.0";
+  version = "0.7.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "deeplook";
     repo = "sparklines";
     tag = "v${version}";
-    sha256 = "sha256-oit1bDqP96wwfTRCV8V0N9P/+pkdW2WYOWT6u3lb4Xs=";
+    sha256 = "sha256-jiMrxZMWN+moap0bDH+uy66gF4XdGst9HJpnboJrQm4=";
   };
 
   propagatedBuildInputs = [ future ];

From ecc51362842510596eef49c3ddd1197cc7302567 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:58 +0200
Subject: [PATCH 1295/3724] python3Packages.sparsezoo: 1.8.1 -> 1.9.0

https://github.com/neuralmagic/sparsezoo/releases/tag/v1.9.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/sparsezoo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sparsezoo/default.nix b/pkgs/development/python-modules/sparsezoo/default.nix
index 9df360195f92..47333d8710fe 100644
--- a/pkgs/development/python-modules/sparsezoo/default.nix
+++ b/pkgs/development/python-modules/sparsezoo/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "sparsezoo";
-  version = "1.8.1";
+  version = "1.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "neuralmagic";
     repo = "sparsezoo";
     tag = "v${version}";
-    hash = "sha256-c4F95eVvj673eFO/rbmv4LY3pGmqo+arbsYqElznwdA=";
+    hash = "sha256-eMP/whm06QX5x/RBoYsYwuKxFnpFmqlgh2uDsI3Vaog=";
   };
 
   build-system = [ setuptools ];
@@ -114,7 +114,7 @@ buildPythonPackage rec {
   meta = {
     description = "Neural network model repository for highly sparse and sparse-quantized models with matching sparsification recipes";
     homepage = "https://github.com/neuralmagic/sparsezoo";
-    changelog = "https://github.com/neuralmagic/sparsezoo/releases/tag/v${version}";
+    changelog = "https://github.com/neuralmagic/sparsezoo/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };

From c681f1eae6f876ab4e78085fa3d3ad9070a4fe8c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:58 +0200
Subject: [PATCH 1296/3724] python3Packages.spatial-image: 1.2.1 -> 1.2.2

https://github.com/spatial-image/spatial-image/releases/tag/v1.2.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/spatial-image/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/spatial-image/default.nix b/pkgs/development/python-modules/spatial-image/default.nix
index bd50198af431..fb14578b4610 100644
--- a/pkgs/development/python-modules/spatial-image/default.nix
+++ b/pkgs/development/python-modules/spatial-image/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "spatial-image";
-  version = "1.2.1";
+  version = "1.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "spatial-image";
     repo = "spatial-image";
     tag = "v${version}";
-    hash = "sha256-PGc2uey2xcfE0PcYDaCp7U0lgeGL1I6MMP3vbTN+Alk=";
+    hash = "sha256-Frvr8uJ3dD2lZFfqrNnki+JUbjhBdRK3BBAtIRtFqvs=";
   };
 
   build-system = [ hatchling ];
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = {
     description = "Multi-dimensional spatial image data structure for scientific Python";
     homepage = "https://github.com/spatial-image/spatial-image";
-    changelog = "https://github.com/spatial-image/spatial-image/releases/tag/v${version}";
+    changelog = "https://github.com/spatial-image/spatial-image/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bcdarwin ];
   };

From ae27bf2a4969444a105eb782b33ff30aba1232be Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:59 +0200
Subject: [PATCH 1297/3724] python3Packages.sphinx-intl: 2.3.1 -> 2.3.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/sphinx-intl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx-intl/default.nix b/pkgs/development/python-modules/sphinx-intl/default.nix
index 42b2ff02e0fc..d99b107cc747 100644
--- a/pkgs/development/python-modules/sphinx-intl/default.nix
+++ b/pkgs/development/python-modules/sphinx-intl/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "sphinx-intl";
-  version = "2.3.1";
+  version = "2.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sphinx-doc";
     repo = "sphinx-intl";
     tag = version;
-    hash = "sha256-VrWtRdI9j/y2m7kN7/m/5cdxpI0dAaiprdXKt8m6MPc=";
+    hash = "sha256-5Ro+UG9pwwp656fYyCsna6P4s9Gb86Tu3Qm2WUI7tsE=";
   };
 
   build-system = [ setuptools ];

From 5b674bed59625b8fe1f3b66491b6688dcd53d369 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:43:59 +0200
Subject: [PATCH 1298/3724] python3Packages.sphinx-reredirects: 0.1.6 -> 1.0.0

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/sphinx-reredirects/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx-reredirects/default.nix b/pkgs/development/python-modules/sphinx-reredirects/default.nix
index 8fc57ab6d1f0..b250106a46c9 100644
--- a/pkgs/development/python-modules/sphinx-reredirects/default.nix
+++ b/pkgs/development/python-modules/sphinx-reredirects/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "sphinx-reredirects";
-  version = "0.1.6";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "sphinx_reredirects";
     inherit version;
-    hash = "sha256-xJHLpUX2e+lpdQhyeBjYYmYmNmJFrmRFb+KfN+m76mQ=";
+    hash = "sha256-fJutqfEzBIn89Mcpei1toqScpId9P0LROIrh3hAZv1w=";
   };
 
   build-system = [

From df964446d7b68ae8d76f86d5c4cd794036f5ab62 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:00 +0200
Subject: [PATCH 1299/3724] python3Packages.sphinx-sitemap: 2.6.0 -> 2.7.2

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/sphinx-sitemap/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx-sitemap/default.nix b/pkgs/development/python-modules/sphinx-sitemap/default.nix
index 84155186c163..97d643eb95ab 100644
--- a/pkgs/development/python-modules/sphinx-sitemap/default.nix
+++ b/pkgs/development/python-modules/sphinx-sitemap/default.nix
@@ -10,9 +10,9 @@
 }:
 let
   pname = "sphinx-sitemap";
-  version = "2.6.0";
+  version = "2.7.2";
 in
-buildPythonPackage {
+buildPythonPackage rec {
   inherit pname version;
   pyproject = true;
 
@@ -20,7 +20,7 @@ buildPythonPackage {
     owner = "jdillard";
     repo = "sphinx-sitemap";
     tag = "v${version}";
-    hash = "sha256-RERa+/MVug2OQ/FAXS4LOQHB4eEuIW2rwcdZUOrr6g8=";
+    hash = "sha256-b8eo77Ab9w8JR6mLqXcIWeTkuJFTHjJBk440fksBbyw=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -34,7 +34,7 @@ buildPythonPackage {
   ];
 
   meta = with lib; {
-    changelog = "https://github.com/jdillard/sphinx-sitemap/releases/tag/v${version}";
+    changelog = "https://github.com/jdillard/sphinx-sitemap/releases/tag/${src.tag}";
     description = "Sitemap generator for Sphinx";
     homepage = "https://github.com/jdillard/sphinx-sitemap";
     maintainers = with maintainers; [ alejandrosame ];

From 8fb6a7ff2aa00ccfe8090e561cc00eda78cc05dd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:00 +0200
Subject: [PATCH 1300/3724] python3Packages.sphinxcontrib-confluencebuilder:
 2.13.0 -> 2.14.0

https://github.com/sphinx-contrib/confluencebuilder/blob/v2.14.0/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 .../sphinxcontrib-confluencebuilder/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
index 83b3f959af1a..0329aab01206 100644
--- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-confluencebuilder";
-  version = "2.13.0";
+  version = "2.14.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "sphinxcontrib_confluencebuilder";
     inherit version;
-    hash = "sha256-2Sl0ZwdHn0dXf+kbNcxaDMfWLaGdfUgCRjKTADA+unM=";
+    hash = "sha256-3XWs1SCb6AJpYC3njbBFXsSOebNjRh0Gp1Fqi5E51lI=";
   };
 
   build-system = [ flit-core ];

From 504515eb1aed2ce36b5709106192d73f26121f15 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:01 +0200
Subject: [PATCH 1301/3724] python3Packages.sphinxcontrib-katex: 0.9.10 ->
 0.9.11

https://github.com/hagenw/sphinxcontrib-katex/blob/v0.9.11/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/sphinxcontrib-katex/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix
index 44f1e74e62b0..987e4d2b94d9 100644
--- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-katex";
-  version = "0.9.10";
+  version = "0.9.11";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "sphinxcontrib_katex";
     inherit version;
-    hash = "sha256-MJqS2uJF28WE/36l+2VJcnuuleTlIAi3TSWdL9GtDew=";
+    hash = "sha256-LTKyENILvuRRpR0ZZF9v719VaLmlTigTr/uW76ZhI4o=";
   };
 
   build-system = [ setuptools ];

From 52fe39ec7af3c9190af8950fceacfa5bec0bb365 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:01 +0200
Subject: [PATCH 1302/3724] python3Packages.sphinxext-opengraph: 0.9.1 ->
 0.12.0

https://github.com/wpilibsuite/sphinxext-opengraph/releases/tag/v0.12.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/sphinxext-opengraph/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix
index 2f2d76bd9913..70bd42464cae 100644
--- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix
+++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "sphinxext-opengraph";
-  version = "0.9.1";
+  version = "0.12.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "wpilibsuite";
     repo = "sphinxext-opengraph";
     tag = "v${version}";
-    hash = "sha256-B+bJ1tKqTTlbNeJLxk56o2a21n3Yg6OHwJiFfCx46aw=";
+    hash = "sha256-2ch9BxgrqbfIJ8fzFKYscha4+G7OAVz+OIOqYwX2gSA=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Sphinx extension to generate unique OpenGraph metadata";
     homepage = "https://github.com/wpilibsuite/sphinxext-opengraph";
-    changelog = "https://github.com/wpilibsuite/sphinxext-opengraph/releases/tag/v${version}";
+    changelog = "https://github.com/wpilibsuite/sphinxext-opengraph/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ Luflosi ];
   };

From 6f2229a0c711f8cb605d2a706b6e4b6116b4215c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:02 +0200
Subject: [PATCH 1303/3724] python3Packages.spotifyaio: 0.8.11 -> 1.0.0

https://github.com/joostlek/python-spotify/releases/tag/v1.0.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/spotifyaio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/spotifyaio/default.nix b/pkgs/development/python-modules/spotifyaio/default.nix
index b08260bf1494..5fafd5db1f8f 100644
--- a/pkgs/development/python-modules/spotifyaio/default.nix
+++ b/pkgs/development/python-modules/spotifyaio/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "spotifyaio";
-  version = "0.8.11";
+  version = "1.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "joostlek";
     repo = "python-spotify";
     tag = "v${version}";
-    hash = "sha256-mRv/bsMER+rn4JOSe2EK0ykP5oEydl8QNhtn7yN+ykE=";
+    hash = "sha256-wl8THtmdJ2l6XNDtmmnk/MF+qTZL0UsbL8o6i/Vwf5k=";
   };
 
   build-system = [ poetry-core ];
@@ -54,7 +54,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module for interacting with for Spotify";
     homepage = "https://github.com/joostlek/python-spotify/";
-    changelog = "https://github.com/joostlek/python-spotify/releases/tag/v${version}";
+    changelog = "https://github.com/joostlek/python-spotify/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };

From d7429ff653c364ece8bcffc2d446777c56beb441 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:02 +0200
Subject: [PATCH 1304/3724] python3Packages.spsdk: 2.6.1 -> 3.1.0

https://github.com/nxp-mcuxpresso/spsdk/blob/v3.1.0/docs/release_notes.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/spsdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix
index cc518a0b3343..edc8c5e9eeb0 100644
--- a/pkgs/development/python-modules/spsdk/default.nix
+++ b/pkgs/development/python-modules/spsdk/default.nix
@@ -49,14 +49,14 @@
 
 buildPythonPackage rec {
   pname = "spsdk";
-  version = "2.6.1";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nxp-mcuxpresso";
     repo = "spsdk";
     tag = "v${version}";
-    hash = "sha256-AdW19Zf5TZ6hChXbW9dLGcMpFTQOT1wrPzEqaSfWzDE=";
+    hash = "sha256-G8UNT9lsUt6Xe++xx+Pqv4hmrkGv68w7FrZSgWJHb1k=";
   };
 
   postPatch = ''
@@ -137,7 +137,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/v${version}/docs/release_notes.rst";
+    changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/${src.tag}/docs/release_notes.rst";
     description = "NXP Secure Provisioning SDK";
     homepage = "https://github.com/nxp-mcuxpresso/spsdk";
     license = lib.licenses.bsd3;

From 6ec69a8f8b949e723e354f0c93db142e17cff32b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:03 +0200
Subject: [PATCH 1305/3724] python3Packages.sqlalchemy-cockroachdb: 2.0.2 ->
 2.0.3

This commit was automatically generated using update-python-libraries.
---
 .../sqlalchemy-cockroachdb/default.nix            | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy-cockroachdb/default.nix b/pkgs/development/python-modules/sqlalchemy-cockroachdb/default.nix
index 0cbdb6651a97..4d0ba47d58ab 100644
--- a/pkgs/development/python-modules/sqlalchemy-cockroachdb/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-cockroachdb/default.nix
@@ -3,26 +3,25 @@
   buildPythonPackage,
   fetchPypi,
   setuptools,
-  wheel,
   sqlalchemy,
 }:
 
 buildPythonPackage rec {
   pname = "sqlalchemy-cockroachdb";
-  version = "2.0.2";
+  version = "2.0.3";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-EZdW65BYVdahE0W5nP6FMDGj/lmKnEvzWo3ayfif6Mw=";
+    pname = "sqlalchemy_cockroachdb";
+    inherit version;
+    hash = "sha256-SLdj/9iypNydVkWZNKVtfV/61BXG5o0RS67l0Sz3nB0=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
-    wheel
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     sqlalchemy
   ];
 
@@ -30,7 +29,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "CockroachDB dialect for SQLAlchemy";
-    homepage = "https://pypi.org/project/sqlalchemy-cockroachdb";
+    homepage = "https://github.com/cockroachdb/sqlalchemy-cockroachdb/tree/master/sqlalchemy_cockroachdb";
     license = licenses.asl20;
     maintainers = with maintainers; [ pinpox ];
   };

From fe2557b166b44d3215391ef14ed43c001ac4e29e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:03 +0200
Subject: [PATCH 1306/3724] python3Packages.sqlframe: 3.31.3 -> 3.38.0

https://github.com/eakmanrq/sqlframe/releases/tag/v3.38.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/sqlframe/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sqlframe/default.nix b/pkgs/development/python-modules/sqlframe/default.nix
index 84885a2767cc..8ec28de12a82 100644
--- a/pkgs/development/python-modules/sqlframe/default.nix
+++ b/pkgs/development/python-modules/sqlframe/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "sqlframe";
-  version = "3.31.3";
+  version = "3.38.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eakmanrq";
     repo = "sqlframe";
     tag = "v${version}";
-    hash = "sha256-x9ILbtl71Xp4p5OWQ/goays5W6uE17FCes7ZVfWZBwY=";
+    hash = "sha256-zzYhKAteYKvm6p6LkuGEDHJcOz9Miaqv2zztLlfTY1A=";
   };
 
   build-system = [
@@ -72,7 +72,7 @@ buildPythonPackage rec {
   meta = {
     description = "Turning PySpark Into a Universal DataFrame API";
     homepage = "https://github.com/eakmanrq/sqlframe";
-    changelog = "https://github.com/eakmanrq/sqlframe/releases/tag/v${version}";
+    changelog = "https://github.com/eakmanrq/sqlframe/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };

From 93e2fa35d21f78774f0c66fcdf42e0dd18509f82 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:04 +0200
Subject: [PATCH 1307/3724] python3Packages.sse-starlette: 2.3.6 -> 3.0.2

https://github.com/sysid/sse-starlette/blob/v3.0.2/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/sse-starlette/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sse-starlette/default.nix b/pkgs/development/python-modules/sse-starlette/default.nix
index e64e15fe2c0a..7298d302a41b 100644
--- a/pkgs/development/python-modules/sse-starlette/default.nix
+++ b/pkgs/development/python-modules/sse-starlette/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "sse-starlette";
-  version = "2.3.6";
+  version = "3.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "sysid";
     repo = "sse-starlette";
     tag = "v${version}";
-    hash = "sha256-7FlyV+TsVKGFsecONPm/Z50cCnyuUsr6pimPdc4Cs6c=";
+    hash = "sha256-9NI6CUcK5AqITKxtCMz9Z1+Ke87u2y2E0LlwsFUDhgw=";
   };
 
   build-system = [ setuptools ];

From 03038230f9505686eb39c0c04105f92244e865cc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:04 +0200
Subject: [PATCH 1308/3724] python3Packages.ssh-python: 1.1.1 -> 03.0

https://github.com/ParallelSSH/ssh-python/blob/03.0/Changelog.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ssh-python/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ssh-python/default.nix b/pkgs/development/python-modules/ssh-python/default.nix
index c87730307d50..2cd514419151 100644
--- a/pkgs/development/python-modules/ssh-python/default.nix
+++ b/pkgs/development/python-modules/ssh-python/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "ssh-python";
-  version = "1.1.1";
+  version = "03.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "ParallelSSH";
     repo = "ssh-python";
     tag = version;
-    hash = "sha256-kidz4uHT5C8TUROLGQUHihemYtwOoWZQNw7ElbwYKLM=";
+    hash = "sha256-hrTf0eywmK/sbZ7fVPatJvcWh5e1/rCLpk0yQKlyLYU=";
   };
 
   build-system = [ setuptools ];
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python bindings for libssh C library";
     homepage = "https://github.com/ParallelSSH/ssh-python";
-    changelog = "https://github.com/ParallelSSH/ssh-python/blob/${version}/Changelog.rst";
+    changelog = "https://github.com/ParallelSSH/ssh-python/blob/${src.tag}/Changelog.rst";
     license = lib.licenses.lgpl21Only;
     maintainers = with lib.maintainers; [ infinidoge ];
   };

From f1930930ef9baaeb96d8b830d9282fbf29d99162 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:05 +0200
Subject: [PATCH 1309/3724] python3Packages.stamina: 24.3.0 -> 25.1.0

https://github.com/hynek/stamina/blob/25.1.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/stamina/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/stamina/default.nix b/pkgs/development/python-modules/stamina/default.nix
index e1eda7924fcd..7b764abe8bcb 100644
--- a/pkgs/development/python-modules/stamina/default.nix
+++ b/pkgs/development/python-modules/stamina/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "stamina";
-  version = "24.3.0";
+  version = "25.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hynek";
     repo = "stamina";
     tag = version;
-    hash = "sha256-DasubVqKRhX4CRyKyJ3fIA9Rxmy+kGxkW0pDdu8OPPo=";
+    hash = "sha256-TehGqR3vbjLNByHZE2+Ytq52dpEpiL6+7TRUKwXcC1M=";
   };
 
   nativeBuildInputs = [
@@ -47,7 +47,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Production-grade retries for Python";
     homepage = "https://github.com/hynek/stamina";
-    changelog = "https://github.com/hynek/stamina/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/hynek/stamina/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ mbalatsko ];
   };

From c5e8f06e4d82d02c126bfafcbc65d81c22fedd64 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:05 +0200
Subject: [PATCH 1310/3724] python3Packages.starlette: 0.46.2 -> 0.47.2

https://www.starlette.io/release-notes/#0472

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/starlette/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix
index 91ae514304b6..c327f0bf46db 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "starlette";
-  version = "0.46.2";
+  version = "0.47.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "encode";
     repo = "starlette";
     tag = version;
-    hash = "sha256-K/0Y6plw+zbRKpzSLbEG6xb30e/Ou//4jddpUYdfs/k=";
+    hash = "sha256-FseSZrLWuNaLro2iLMcfiCrbx2Gz8+aEmLaSk/+PgN4=";
   };
 
   build-system = [ hatchling ];

From e91cb68448401073aef8d538926737c726445c46 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:06 +0200
Subject: [PATCH 1311/3724] python3Packages.statmake: 0.6.0 -> 1.1.0

https://github.com/daltonmaag/statmake/releases/tag/v1.1.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/statmake/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix
index ffaa22ef6841..1dbb09f0d5f4 100644
--- a/pkgs/development/python-modules/statmake/default.nix
+++ b/pkgs/development/python-modules/statmake/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "statmake";
-  version = "0.6.0";
+  version = "1.1.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "daltonmaag";
     repo = "statmake";
     tag = "v${version}";
-    hash = "sha256-3BZ71JVvj7GCojM8ycu160viPj8BLJ1SiW86Df2fzsw=";
+    hash = "sha256-UqL3l27Icu5DoVvFYctbOF7gvKvVV6hK1R5A1y9SYkU=";
   };
 
   nativeBuildInputs = [ poetry-core ];
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     description = "Applies STAT information from a Stylespace to a variable font";
     mainProgram = "statmake";
     homepage = "https://github.com/daltonmaag/statmake";
-    changelog = "https://github.com/daltonmaag/statmake/releases/tag/v${version}";
+    changelog = "https://github.com/daltonmaag/statmake/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = [ ];
   };

From 4fc84852b17debc91b7d6bd13e4205d1e6676dfc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:06 +0200
Subject: [PATCH 1312/3724] python3Packages.stone: 3.3.8 -> 3.3.9

https://github.com/dropbox/stone/releases/tag/v3.3.9

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/stone/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix
index e58b1870a6d5..d567ff447c5d 100644
--- a/pkgs/development/python-modules/stone/default.nix
+++ b/pkgs/development/python-modules/stone/default.nix
@@ -2,6 +2,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   lib,
+  jinja2,
   mock,
   packaging,
   ply,
@@ -13,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "stone";
-  version = "3.3.8";
+  version = "3.3.9";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +23,7 @@ buildPythonPackage rec {
     owner = "dropbox";
     repo = "stone";
     tag = "v${version}";
-    hash = "sha256-W+wRVWPaAzhdHMVE54GEJC/YJqYZVJhwFDWWSMKUPdw=";
+    hash = "sha256-3tUV2JrE3S2Tj/9aHvzfBTkIWUmWzkWNsVLr5yWRE/Q=";
   };
 
   postPatch = ''
@@ -33,6 +34,7 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
+    jinja2
     ply
     six
     packaging
@@ -46,9 +48,9 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "stone" ];
 
   meta = with lib; {
-    description = "Official Api Spec Language for Dropbox";
+    description = "Official API Spec Language for Dropbox API V2";
     homepage = "https://github.com/dropbox/stone";
-    changelog = "https://github.com/dropbox/stone/releases/tag/v${version}";
+    changelog = "https://github.com/dropbox/stone/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = [ ];
     mainProgram = "stone";

From 6543d98b337989b23f5235c67bd7717e71d9fdef Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:07 +0200
Subject: [PATCH 1313/3724] python3Packages.strawberry-django: 0.60.0 -> 0.65.1

https://github.com/strawberry-graphql/strawberry-django/blob/v0.65.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/strawberry-django/default.nix      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/strawberry-django/default.nix b/pkgs/development/python-modules/strawberry-django/default.nix
index 5f4dddff4a8e..b5abd44e5a9b 100644
--- a/pkgs/development/python-modules/strawberry-django/default.nix
+++ b/pkgs/development/python-modules/strawberry-django/default.nix
@@ -26,6 +26,7 @@
   factory-boy,
   pillow,
   psycopg2,
+  pytest-asyncio,
   pytest-cov-stub,
   pytest-django,
   pytest-mock,
@@ -34,16 +35,21 @@
 
 buildPythonPackage rec {
   pname = "strawberry-django";
-  version = "0.60.0";
+  version = "0.65.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "strawberry-graphql";
     repo = "strawberry-django";
     tag = "v${version}";
-    hash = "sha256-mMI/tPdt9XK6Lz7VmI3uDxcCjIuidUeGHjG+6AQLoeQ=";
+    hash = "sha256-cX/eG6qWe/h9U4p1pMhhI+bZ5pLmiwGeYxNthKvdI6o=";
   };
 
+  postPatch = ''
+    # django.core.exceptions.ImproperlyConfigured: You're using the staticfiles app without having set the required STATIC_URL setting.
+    echo 'STATIC_URL = "static/"' >> tests/django_settings.py
+  '';
+
   build-system = [
     poetry-core
     setuptools
@@ -71,6 +77,7 @@ buildPythonPackage rec {
     factory-boy
     pillow
     psycopg2
+    pytest-asyncio
     pytest-cov-stub
     pytest-django
     pytest-mock

From 2af38ecb03b0551950f68051d981cc779b0b4e33 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:07 +0200
Subject: [PATCH 1314/3724] python3Packages.strawberry-graphql: 0.275.5 ->
 0.278.0

https://github.com/strawberry-graphql/strawberry/blob/0.278.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/strawberry-graphql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix
index 8db811e095b9..7378ba44d71b 100644
--- a/pkgs/development/python-modules/strawberry-graphql/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql/default.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "strawberry-graphql";
-  version = "0.275.5";
+  version = "0.278.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "strawberry-graphql";
     repo = "strawberry";
     tag = version;
-    hash = "sha256-bgKxZuk0cp43oyPbgTdx5aG5l1HSCz0JOVNeaCJRhdo=";
+    hash = "sha256-GNjjSD40fhbMqfvuYSuP3tU8lfOqBGJIsoGWZCfj6C4=";
   };
 
   postPatch = ''

From aa5652121e7f2478cdc3273c96b766148ae2f664 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:08 +0200
Subject: [PATCH 1315/3724] python3Packages.streamdeck: 0.9.6 -> 0.9.7

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/streamdeck/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/streamdeck/default.nix b/pkgs/development/python-modules/streamdeck/default.nix
index 2d4009c57c7e..16ba119d7ca2 100644
--- a/pkgs/development/python-modules/streamdeck/default.nix
+++ b/pkgs/development/python-modules/streamdeck/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "streamdeck";
-  version = "0.9.6";
+  version = "0.9.7";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7ELZtxGzUuonStMFputI7OHu06W//nC5KOCC3OD3iPA=";
+    hash = "sha256-jVhuZihvjuA5rwl55JAmtFq+h/f5M68Vo44jh8HjUI4=";
   };
 
   patches = [

From bc367a3475ee1f3294049105be873fb9d9d5b312 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:08 +0200
Subject: [PATCH 1316/3724] python3Packages.stripe: 12.1.0 -> 12.4.0

https://github.com/stripe/stripe-python/blob/v12.4.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/stripe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 60e199561ab8..618d1cf3a1cd 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "12.1.0";
+  version = "12.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-SkuFFpUs9QlemCJX8NR8RcHSu/d0PiyxLWaF9V2ouNQ=";
+    hash = "sha256-HNH1sFeYZ5IwgbrPWUlZ0fQD8hgiOgbcOCc76wfQFWc=";
   };
 
   build-system = [ setuptools ];

From a27431676c7e1877c51c71542d39c3b106cef619 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:09 +0200
Subject: [PATCH 1317/3724] python3Packages.subliminal: 2.2.1 -> 2.3.2

https://github.com/Diaoul/subliminal/blob/2.3.2/HISTORY.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/subliminal/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix
index 638f8a1315a8..43fa45173a13 100644
--- a/pkgs/development/python-modules/subliminal/default.nix
+++ b/pkgs/development/python-modules/subliminal/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "subliminal";
-  version = "2.2.1";
+  version = "2.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     owner = "Diaoul";
     repo = "subliminal";
     tag = version;
-    hash = "sha256-g7gg2qdLKl7bg/nNXRWN9wZaNShOOc38sVASZrIycMU=";
+    hash = "sha256-eAXzD6diep28wCZjWLOZpOX1bnakEldhs2LX5CPu5OI=";
   };
 
   build-system = [ setuptools ];
@@ -85,7 +85,7 @@ buildPythonPackage rec {
     description = "Python library to search and download subtitles";
     mainProgram = "subliminal";
     homepage = "https://github.com/Diaoul/subliminal";
-    changelog = "https://github.com/Diaoul/subliminal/blob/${version}/HISTORY.rst";
+    changelog = "https://github.com/Diaoul/subliminal/blob/${src.tag}/HISTORY.rst";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ doronbehar ];
   };

From e93bfe9d392b2fd8b6ad777812fc77e0dbb2a459 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:09 +0200
Subject: [PATCH 1318/3724] python3Packages.sunpy: 6.1.1 -> 7.0.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/sunpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix
index 44ef351a37c3..e09eae34658e 100644
--- a/pkgs/development/python-modules/sunpy/default.nix
+++ b/pkgs/development/python-modules/sunpy/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "sunpy";
-  version = "6.1.1";
+  version = "7.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-xgmmsbC7KGvUJ4mUD1T8t9aQDfz+IX31T4Wf9gguE9s=";
+    hash = "sha256-9ZCG9CtTpgGGlqtXcl2epRBzFcbVvIMzZcXk5CQ5/+A=";
   };
 
   nativeBuildInputs = [

From b8df49609e8a88401bdd063563c2fe84de3def20 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:10 +0200
Subject: [PATCH 1319/3724] python3Packages.svg-py: 1.6.0 -> 1.7.0

https://github.com/orsinium-labs/svg.py/releases/tag/1.7.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/svg-py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/svg-py/default.nix b/pkgs/development/python-modules/svg-py/default.nix
index add0da17c737..759e8bef0001 100644
--- a/pkgs/development/python-modules/svg-py/default.nix
+++ b/pkgs/development/python-modules/svg-py/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "svg-py";
-  version = "1.6.0";
+  version = "1.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "orsinium-labs";
     repo = "svg.py";
     tag = version;
-    hash = "sha256-XuSv4CVcbwWHuHiXxx4PfGJ8Pi+tfufbAdUiTFWNLcc=";
+    hash = "sha256-WRPHNgaKjim91pLdM8iQ1/1DBm7+lU7hFH0vXTguG1s=";
   };
 
   build-system = [ flit-core ];

From 768f561ad3e38b472ea2e7375e441ba11f4a3ef3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:10 +0200
Subject: [PATCH 1320/3724] python3Packages.svgdigitizer: 0.12.6 -> 0.13.0

https://github.com/echemdb/svgdigitizer/blob/0.13.0/ChangeLog

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/svgdigitizer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/svgdigitizer/default.nix b/pkgs/development/python-modules/svgdigitizer/default.nix
index 025fb86893b7..ce39c5090344 100644
--- a/pkgs/development/python-modules/svgdigitizer/default.nix
+++ b/pkgs/development/python-modules/svgdigitizer/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "svgdigitizer";
-  version = "0.12.6";
+  version = "0.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "echemdb";
     repo = "svgdigitizer";
     tag = version;
-    hash = "sha256-aodPjms92+/6bbheIs/8w+M4T+mfw5PWf1dsxFuojwA=";
+    hash = "sha256-UlcvCfNoEijIKoqSbufEZ6988rqwT2xDEy4P/9fdgVM=";
   };
 
   build-system = [
@@ -77,7 +77,7 @@ buildPythonPackage rec {
   meta = {
     description = "(x,y) Data Points from SVG files";
     homepage = "https://github.com/echemdb/svgdigitizer";
-    changelog = "https://github.com/echemdb/svgdigitizer/blob/${src.rev}/ChangeLog";
+    changelog = "https://github.com/echemdb/svgdigitizer/blob/${src.tag}/ChangeLog";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ doronbehar ];
   };

From f7e042968235cf38144cb2ab7423bbbf42df60e9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:11 +0200
Subject: [PATCH 1321/3724] python3Packages.swcgeom: 0.19.3 -> 0.19.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/swcgeom/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/swcgeom/default.nix b/pkgs/development/python-modules/swcgeom/default.nix
index e940ac5e6c49..a2654535d466 100644
--- a/pkgs/development/python-modules/swcgeom/default.nix
+++ b/pkgs/development/python-modules/swcgeom/default.nix
@@ -26,9 +26,9 @@
 }:
 
 let
-  version = "0.19.3";
+  version = "0.19.4";
 in
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "swcgeom";
   inherit version;
   pyproject = true;
@@ -37,7 +37,7 @@ buildPythonPackage {
     owner = "yzx9";
     repo = "swcgeom";
     tag = "v${version}";
-    hash = "sha256-mpp8Dw0XcU59fYt7vjswAnXCmrRP3mhbgTDG+J4UwzI=";
+    hash = "sha256-emffSI4LO+5UU267d+qj/NCVvHmRpzikJ7jdCOtPFNo=";
   };
 
   build-system = [
@@ -88,7 +88,7 @@ buildPythonPackage {
   meta = {
     description = "Neuron geometry library for swc format";
     homepage = "https://github.com/yzx9/swcgeom";
-    changelog = "https://github.com/yzx9/swcgeom/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/yzx9/swcgeom/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ yzx9 ];
   };

From 6a4572e7792d3938bfb1bc6060d1990d4d096113 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:11 +0200
Subject: [PATCH 1322/3724] python3Packages.systemdunitparser: 0.3 -> 0.4

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/systemdunitparser/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/systemdunitparser/default.nix b/pkgs/development/python-modules/systemdunitparser/default.nix
index 0b3431c06680..b3e008f0d744 100644
--- a/pkgs/development/python-modules/systemdunitparser/default.nix
+++ b/pkgs/development/python-modules/systemdunitparser/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "systemdunitparser";
-  version = "0.3";
+  version = "0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sgallagher";
     repo = "systemdunitparser";
-    rev = version;
-    hash = "sha256-lcvXEieaifPUDhLdaz2FXaNdbw7wKR+x/kC+MMDT0tE=";
+    tag = version;
+    hash = "sha256-BlOj1rvRfh0SQ7io2N8MsMvAtWvXk0V6hYzlOSrr7hU=";
   };
 
   build-system = [

From d5d5b2cc094aa18cf05a3940de655ae6831ffa22 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:12 +0200
Subject: [PATCH 1323/3724] python3Packages.tagoio-sdk: 4.3.0 -> 5.0.3

https://github.com/tago-io/sdk-python/releases/tag/v5.0.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/tagoio-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tagoio-sdk/default.nix b/pkgs/development/python-modules/tagoio-sdk/default.nix
index 8a7687a66602..efc9fff18e22 100644
--- a/pkgs/development/python-modules/tagoio-sdk/default.nix
+++ b/pkgs/development/python-modules/tagoio-sdk/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "tagoio-sdk";
-  version = "4.3.0";
+  version = "5.0.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "tago-io";
     repo = "sdk-python";
     tag = "v${version}";
-    hash = "sha256-37/fg2vbwYPhYPvSJ2YxWAPrfspqTE3thIL/VR1+AkI=";
+    hash = "sha256-PNPG1FUniwZhOKjynp4ba6kjGJmB/OW0F5b2ZOYaYwY=";
   };
 
   pythonRelaxDeps = [ "requests" ];
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module for interacting with Tago.io";
     homepage = "https://github.com/tago-io/sdk-python";
-    changelog = "https://github.com/tago-io/sdk-python/releases/tag/v${version}";
+    changelog = "https://github.com/tago-io/sdk-python/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

From 44bcee4fc58dbee85f76930d69ed42320efd6bb7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:12 +0200
Subject: [PATCH 1324/3724] python3Packages.tcxparser: 2.4.0 -> 2.4.0-r1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/tcxparser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tcxparser/default.nix b/pkgs/development/python-modules/tcxparser/default.nix
index 5c06e2f83bf0..97b1e8d97c79 100644
--- a/pkgs/development/python-modules/tcxparser/default.nix
+++ b/pkgs/development/python-modules/tcxparser/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "tcxparser";
-  version = "2.4.0";
+  version = "2.4.0-r1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "vkurup";
     repo = "python-tcxparser";
     tag = version;
-    hash = "sha256-YZgzvwRy47MOTClAeJhzD6kZhGgCeVSGko6LgR/Uy0o=";
+    hash = "sha256-lQczTuxmxu4nCPJsgblrW2RXST7kvhtPnscemwXCx0Y=";
   };
 
   build-system = [

From a7aaa69efd79da7c67c377df45d78eb267f729b4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:13 +0200
Subject: [PATCH 1325/3724] python3Packages.tempora: 5.8.0 -> 5.8.1

https://github.com/jaraco/tempora/blob/v5.8.1/NEWS.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/tempora/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index 070a3637b803..15ad8fc444ab 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "tempora";
-  version = "5.8.0";
+  version = "5.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,9 +21,13 @@ buildPythonPackage rec {
     owner = "jaraco";
     repo = "tempora";
     tag = "v${version}";
-    hash = "sha256-ojllPOmz+laxFMCobLcDnCVMvo1354vS5nBnO1mxokM=";
+    hash = "sha256-1Zeo8bUCHKPZ6I0HGT7bIh7IgbRL4j9Cv3t9FFiZ72s=";
   };
 
+  postPatch = ''
+    sed -i "/coherent\.licensed/d" pyproject.toml
+  '';
+
   build-system = [ setuptools-scm ];
 
   dependencies = [

From 902103eac8362905fe37409be56f5cce22b4b16a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:14 +0200
Subject: [PATCH 1326/3724] python3Packages.testfixtures: 8.3.0 -> 9.1.0

https://github.com/simplistix/testfixtures/blob/9.1.0/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/testfixtures/default.nix    | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix
index 0cc3d187af0b..547ad584741a 100644
--- a/pkgs/development/python-modules/testfixtures/default.nix
+++ b/pkgs/development/python-modules/testfixtures/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  fetchpatch2,
   fetchPypi,
   mock,
   pytestCheckHook,
@@ -13,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "testfixtures";
-  version = "8.3.0";
+  version = "9.1.0";
   pyproject = true;
   # DO NOT CONTACT upstream.
   # https://github.com/simplistix/ is only concerned with internal CI process.
@@ -26,17 +25,9 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1MC4SvLyZ2EPkIAJtQ1vmDpOWK3iLGe6tnh7WkAtWcA=";
+    hash = "sha256-UX6c81OUJyNTOuEQDKRd0n/geFw60nZQdfXLHLzgFII=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "python313-compat.patch";
-      url = "https://github.com/simplistix/testfixtures/commit/a23532c7bc685589cce6a5037821a74da48959e7.patch?full_index=1";
-      hash = "sha256-k0j/WgA+6LNTYJ233GJjeRU403bJJRxbpOu+BUsMeyQ=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   nativeCheckInputs = [
@@ -46,6 +37,11 @@ buildPythonPackage rec {
     twisted
   ];
 
+  disabledTests = [
+    "test_filter_missing"
+    "test_filter_present"
+  ];
+
   disabledTestPaths = [
     # Django is too much hasle to setup at the moment
     "testfixtures/tests/test_django"

From 0c6d937f595cfc271807b4d581eb61f570ffc811 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:14 +0200
Subject: [PATCH 1327/3724] python3Packages.testrail-api: 1.13.3 -> 1.13.4

https://github.com/tolstislon/testrail-api/releases/tag/1.13.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/testrail-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/testrail-api/default.nix b/pkgs/development/python-modules/testrail-api/default.nix
index 309f46fd27db..7a7d3cbcf0ab 100644
--- a/pkgs/development/python-modules/testrail-api/default.nix
+++ b/pkgs/development/python-modules/testrail-api/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "testrail-api";
-  version = "1.13.3";
+  version = "1.13.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "tolstislon";
     repo = "testrail-api";
     tag = version;
-    hash = "sha256-jsdxKcXFjP9ifQLwRN3M2xpx1a+KpGv469Ag6NNph6w=";
+    hash = "sha256-0RrNqSuimXXBEkjmnRQiIXUDy6z2y9wKneWqBTi5FHY=";
   };
 
   build-system = [

From 5d37dab10bde5fb390d2ad7a813ab2123aad68f0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:15 +0200
Subject: [PATCH 1328/3724] python3Packages.textstat: 0.7.4 -> 0.7.8

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/textstat/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/textstat/default.nix b/pkgs/development/python-modules/textstat/default.nix
index d5dacef7917c..c0d3ef77cc89 100644
--- a/pkgs/development/python-modules/textstat/default.nix
+++ b/pkgs/development/python-modules/textstat/default.nix
@@ -8,15 +8,15 @@
   pytest,
 }:
 buildPythonPackage rec {
-  version = "0.7.4";
+  version = "0.7.8";
   pname = "textstat";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "textstat";
     repo = "textstat";
-    rev = version;
-    hash = "sha256-UOCWsIdoVGxmkro4kNBYNMYhA3kktngRDxKjo6o+GXY=";
+    tag = version;
+    hash = "sha256-EEGTmZXTAZ4fsfZk/ictvjQ6lCAi5Ma/Ae83ziGDQXQ=";
   };
 
   build-system = [

From bbc0262af0d1eb2ce47eaa636b62487d71df9c71 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:15 +0200
Subject: [PATCH 1329/3724] python3Packages.textual-autocomplete: 4.0.4 ->
 4.0.5

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/textual-autocomplete/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/textual-autocomplete/default.nix b/pkgs/development/python-modules/textual-autocomplete/default.nix
index 22ef79217757..5b2768f33090 100644
--- a/pkgs/development/python-modules/textual-autocomplete/default.nix
+++ b/pkgs/development/python-modules/textual-autocomplete/default.nix
@@ -9,13 +9,13 @@
 }:
 buildPythonPackage rec {
   pname = "textual-autocomplete";
-  version = "4.0.4";
+  version = "4.0.5";
   pyproject = true;
 
   src = fetchPypi {
     pname = "textual_autocomplete";
     inherit version;
-    hash = "sha256-CWmYe5ClPB91dT3+OtLH6g2XS1g53CoAotMywAAFeHE=";
+    hash = "sha256-24Bm/H2Hx0r9CDZ/j8IUS87F3b3qY6Y3JJdU6dH9h1U=";
   };
 
   build-system = [

From 22d3dcf2cf8d643d1d337907bc7228ea678e9b3f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:16 +0200
Subject: [PATCH 1330/3724] python3Packages.textual: 4.0.0 -> 5.2.0

https://github.com/Textualize/textual/blob/v5.2.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/textual/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index 45dcec6ce6a5..de8a460ee8ae 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "4.0.0";
+  version = "5.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "textual";
     tag = "v${version}";
-    hash = "sha256-rVDr4Snp5qnErxWRM9yoxnzzX8gg8nD3RbBkL1rmgqI=";
+    hash = "sha256-cv8pLEPmL4jtiMCohDPqBJwGnLcr3d1MXKdNvQHEQN8=";
   };
 
   build-system = [ poetry-core ];

From 89af1fa9f97aff0171cbc60ba2af2eeb68615971 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:16 +0200
Subject: [PATCH 1331/3724] python3Packages.thinc: 8.3.6 -> 9.1.1

https://github.com/explosion/thinc/releases/tag/v9.1.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/thinc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index b577d4cbf2b2..37115ac988aa 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -22,12 +22,12 @@
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "8.3.6";
+  version = "9.1.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-SZg/m33cQ0OpUyaUqRGN0hbXpgBSCiGEmkO2wmjsbK0=";
+    hash = "sha256-IfrimG13d6bwULkEbcnqsRhS8cmpl9zJAy8+zCJ4Sko=";
   };
 
   build-system = [

From 9a77347d837dd6ff182fee2f93ab523d719e9c9a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:17 +0200
Subject: [PATCH 1332/3724] python3Packages.thrift: 0.21.0 -> 0.22.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/thrift/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix
index e3301d3ab4cc..214aaea6ced1 100644
--- a/pkgs/development/python-modules/thrift/default.nix
+++ b/pkgs/development/python-modules/thrift/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "thrift";
-  version = "0.21.0";
+  version = "0.22.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Xm98UPk26/oj6SQimvyV6yGfjI5agyAt1KORJEgD5AI=";
+    hash = "sha256-QugnavvV9U/h02SFi2h3vF5aSl7Wn2oAW5TKSRj+FGY=";
   };
 
   build-system = [

From d7eb32a1cc5f0df14611840378bebdb3b54202f2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:17 +0200
Subject: [PATCH 1333/3724] python3Packages.thriftpy2: 0.5.2 -> 0.5.3

https://github.com/Thriftpy/thriftpy2/blob/v0.5.3/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/thriftpy2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix
index db5292a9f5d6..03ac0195c2d3 100644
--- a/pkgs/development/python-modules/thriftpy2/default.nix
+++ b/pkgs/development/python-modules/thriftpy2/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "thriftpy2";
-  version = "0.5.2";
+  version = "0.5.3";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Thriftpy";
     repo = "thriftpy2";
     tag = "v${version}";
-    hash = "sha256-GBJL+IqZpT1/msJLiwiS5YDyB4hIe/e3pYPWx0A+lWY=";
+    hash = "sha256-idUKqpyRj8lq9Aq6vEEeYEawzRPOdNsySnkgfhwPtMc=";
   };
 
   build-system = [ setuptools ];
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module for Apache Thrift";
     homepage = "https://github.com/Thriftpy/thriftpy2";
-    changelog = "https://github.com/Thriftpy/thriftpy2/blob/v${version}/CHANGES.rst";
+    changelog = "https://github.com/Thriftpy/thriftpy2/blob/${src.tag}/CHANGES.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From b2bae59ba8cda96330f083c4787ab6fb88723d5b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:18 +0200
Subject: [PATCH 1334/3724] python3Packages.tianshou: 1.1.0 -> 1.2.0

https://github.com/thu-ml/tianshou/releases/tag/v1.2.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/tianshou/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tianshou/default.nix b/pkgs/development/python-modules/tianshou/default.nix
index 2336768719cf..7cb9052c2d02 100644
--- a/pkgs/development/python-modules/tianshou/default.nix
+++ b/pkgs/development/python-modules/tianshou/default.nix
@@ -47,7 +47,7 @@
 
 buildPythonPackage rec {
   pname = "tianshou";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     owner = "thu-ml";
     repo = "tianshou";
     tag = "v${version}";
-    hash = "sha256-eiwbSX8Q3KF6h7CfjuZ+7HlXwpvLga1NVr3e+FkPaHc=";
+    hash = "sha256-lJAxjE+GMwssov1r4jOCOTf5Aonu+q6FSz5oWvZpuQQ=";
   };
 
   pythonRelaxDeps = [
@@ -182,7 +182,7 @@ buildPythonPackage rec {
   meta = {
     description = "Elegant PyTorch deep reinforcement learning library";
     homepage = "https://github.com/thu-ml/tianshou";
-    changelog = "https://github.com/thu-ml/tianshou/releases/tag/v${version}";
+    changelog = "https://github.com/thu-ml/tianshou/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ derdennisop ];
   };

From 80fabd448ecf0886aa4d0edc534ce808550de0e2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:18 +0200
Subject: [PATCH 1335/3724] python3Packages.tifffile: 2025.5.10 -> 2025.6.11

https://github.com/cgohlke/tifffile/blob/v2025.6.11/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/tifffile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix
index 763049874841..f9d0087ee418 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/pkgs/development/python-modules/tifffile/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "tifffile";
-  version = "2025.5.10";
+  version = "2025.6.11";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AYM100KDqj/YwmO65cPCtmHrxFVI/eMVBAFvyue/EQM=";
+    hash = "sha256-Ds5MLnoQZWlX1Wigk7B1E8ByjTDBvYzBJyWQH//bcUM=";
   };
 
   build-system = [ setuptools ];

From a256d9ece98d7e73b47529e33172b185a5d14a82 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:18 +0200
Subject: [PATCH 1336/3724] python3Packages.tika-client: 0.9.0 -> 0.10.0

https://github.com/stumpylog/tika-client/blob/0.10.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/tika-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix
index f70747fef55b..0639af3739a2 100644
--- a/pkgs/development/python-modules/tika-client/default.nix
+++ b/pkgs/development/python-modules/tika-client/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "tika-client";
-  version = "0.9.0";
+  version = "0.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "stumpylog";
     repo = "tika-client";
     tag = version;
-    hash = "sha256-lg6syUbEbPb70iBa4lw5fVN8cvfWY3bkG2jNGxxNLDo=";
+    hash = "sha256-XYyMp+02lWzE+3Txr+shVGVwalLEJHvoy988tA7SWgY=";
   };
 
   build-system = [ hatchling ];

From 893e811766c2b198f808ceaaae3f4e2479739216 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:19 +0200
Subject: [PATCH 1337/3724] python3Packages.tiledb: 0.33.2 -> 0.34.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/tiledb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix
index ca08af4ac055..d43419139032 100644
--- a/pkgs/development/python-modules/tiledb/default.nix
+++ b/pkgs/development/python-modules/tiledb/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "tiledb";
-  version = "0.33.2";
+  version = "0.34.2";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "TileDB-Inc";
     repo = "TileDB-Py";
     tag = version;
-    hash = "sha256-c7mEYgk+9sHvOI7z/jp/VI3mA7XOlNFik8X5rTyBclg=";
+    hash = "sha256-EXRrWp/2sMn7DCzgXk5L0692rhGtQZwWpVWYnfrxmGA=";
   };
 
   nativeBuildInputs = [

From 22859e2d380751a4fc18756bc0873714cf825901 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:19 +0200
Subject: [PATCH 1338/3724] python3Packages.tiler: 0.5.7 -> 0.6.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/tiler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tiler/default.nix b/pkgs/development/python-modules/tiler/default.nix
index 40766f6436c6..16dc515e04f2 100644
--- a/pkgs/development/python-modules/tiler/default.nix
+++ b/pkgs/development/python-modules/tiler/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "tiler";
-  version = "0.5.7";
+  version = "0.6.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2HWO/iJ9RCWNVmw2slu9F/+Mchk3evB5/F8EfbuMI/Y=";
+    hash = "sha256-ps0uHgzPa+ZoXXrB+0gfuVIEBUNmym/ym6xCxiyHhxA=";
   };
 
   patches = [

From 7c1e038c291851ed656a06e2876a71e8d09df495 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:20 +0200
Subject: [PATCH 1339/3724] python3Packages.tld: 0.13 -> 0.13.1

https://github.com/barseghyanartur/tld/blob/0.13.1/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/tld/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix
index 767651e322df..c07115722106 100644
--- a/pkgs/development/python-modules/tld/default.nix
+++ b/pkgs/development/python-modules/tld/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "tld";
-  version = "0.13";
+  version = "0.13.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-k93l4cBL3xhEl26uRAcGN50h9KsjW3PAXXSD4HT7Vik=";
+    hash = "sha256-dewAk2y89WT2c2HEFxM2NEC2xO8PDBWStbD75ywXo1A=";
   };
 
   nativeCheckInputs = [
@@ -31,6 +31,8 @@ buildPythonPackage rec {
     faker
   ];
 
+  doCheck = false; # missing pytest-codeblock
+
   # These tests require network access, but disabledTestPaths doesn't work.
   # the file needs to be `import`ed by another Python test file, so it
   # can't simply be removed.

From 9b60d7e8311b5fd9aace327c7cdbfc6c7554c6b1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:21 +0200
Subject: [PATCH 1340/3724] python3Packages.torchio: 0.20.17 -> 0.20.19

https://github.com/TorchIO-project/torchio/blob/v0.20.19/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/torchio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix
index fe99a4035539..bab297da0a92 100644
--- a/pkgs/development/python-modules/torchio/default.nix
+++ b/pkgs/development/python-modules/torchio/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "torchio";
-  version = "0.20.17";
+  version = "0.20.19";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TorchIO-project";
     repo = "torchio";
     tag = "v${version}";
-    hash = "sha256-kZCbQGIkWmlXl25UviPrSDo0swCjWnvTTkBnxGI0Y7U=";
+    hash = "sha256-fx3aExmRMbzXG2MVpWrsssH658Ll4x+FC2ARK6oIGBw=";
   };
 
   build-system = [

From 84a5d0c62abbccfa204fbc7fb38788a9b079e246 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:21 +0200
Subject: [PATCH 1341/3724] python3Packages.total-connect-client: 2025.1.4 ->
 2025.5

https://github.com/craigjmidwinter/total-connect-client/releases/tag/2025.5

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/total-connect-client/default.nix       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix
index 79c1d1860437..5f61748dc1fc 100644
--- a/pkgs/development/python-modules/total-connect-client/default.nix
+++ b/pkgs/development/python-modules/total-connect-client/default.nix
@@ -7,13 +7,14 @@
   pytestCheckHook,
   pythonOlder,
   requests-mock,
+  requests-oauthlib,
   setuptools,
   zeep,
 }:
 
 buildPythonPackage rec {
   pname = "total-connect-client";
-  version = "2025.1.4";
+  version = "2025.5";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -22,7 +23,7 @@ buildPythonPackage rec {
     owner = "craigjmidwinter";
     repo = "total-connect-client";
     tag = version;
-    hash = "sha256-zzSYi/qhHmugH30bnYHK9lCBVN5wuv6n9rvaZC/sIag=";
+    hash = "sha256-xVpR5gd185eZBoqUhVVcFGPbPFjCavwOZP7yFObzGic=";
   };
 
   build-system = [ setuptools ];
@@ -32,6 +33,7 @@ buildPythonPackage rec {
   dependencies = [
     pycryptodome
     pyjwt
+    requests-oauthlib
     zeep
   ];
 
@@ -45,7 +47,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Interact with Total Connect 2 alarm systems";
     homepage = "https://github.com/craigjmidwinter/total-connect-client";
-    changelog = "https://github.com/craigjmidwinter/total-connect-client/releases/tag/${version}";
+    changelog = "https://github.com/craigjmidwinter/total-connect-client/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };

From 5f1b2e9e24f0e5a0377d956ee4f50a55f657e86d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:22 +0200
Subject: [PATCH 1342/3724] python3Packages.tox: 4.26.0 -> 4.28.4

https://github.com/tox-dev/tox/releases/tag/4.28.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/tox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix
index 0427ed68a800..93be8bfdb688 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "tox";
-  version = "4.26.0";
+  version = "4.28.4";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "tox-dev";
     repo = "tox";
     tag = version;
-    hash = "sha256-VySdeZDC71vi2mOtjdFJ4iCSpWbFEW3nzrVucPUz/oc=";
+    hash = "sha256-EKJsFf4LvfDi3OL6iNhKEBl5zlpdLET9RkfHEP7E9xU=";
   };
 
   postPatch = ''

From b260f553ad6b5df7f2d02a27af444a57861357c4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:22 +0200
Subject: [PATCH 1343/3724] python3Packages.trackpy: 0.6.4 -> 0.7

https://github.com/soft-matter/trackpy/releases/tag/v0.7

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/trackpy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix
index 1190aad1f313..2f7b012cf10b 100644
--- a/pkgs/development/python-modules/trackpy/default.nix
+++ b/pkgs/development/python-modules/trackpy/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "trackpy";
-  version = "0.6.4";
+  version = "0.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "soft-matter";
     repo = "trackpy";
     tag = "v${version}";
-    hash = "sha256-6i1IfdxgV6bpf//mXATpnsQ0zN26S8rlL0/1ql68sd8=";
+    hash = "sha256-3e+gHdn/4n8T78eA3Gjz1TdSI4Hd935U2pqd8wG+U0M=";
   };
 
   propagatedBuildInputs = [
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Particle-tracking toolkit";
     homepage = "https://github.com/soft-matter/trackpy";
-    changelog = "https://github.com/soft-matter/trackpy/releases/tag/v${version}";
+    changelog = "https://github.com/soft-matter/trackpy/releases/tag/${src.tag}";
     license = licenses.bsd3;
     maintainers = [ ];
     broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);

From 41c4803111b0a1c613b0083e052d42ab4c4ec424 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:23 +0200
Subject: [PATCH 1344/3724] python3Packages.trakit: 0.2.2 -> 0.2.5

https://github.com/ratoaq2/trakit/releases/tag/0.2.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/trakit/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/trakit/default.nix b/pkgs/development/python-modules/trakit/default.nix
index 5fbe67a6cf17..afbd0c8f0424 100644
--- a/pkgs/development/python-modules/trakit/default.nix
+++ b/pkgs/development/python-modules/trakit/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "trakit";
-  version = "0.2.2";
+  version = "0.2.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,8 +28,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ratoaq2";
     repo = "trakit";
-    rev = version;
-    hash = "sha256-VV+pdsQ5WEALYZgu4AmvNce1rCTLSYPZtTMjh+aExsU=";
+    tag = version;
+    hash = "sha256-x/83yRzvQ81+wS0lJr52KYBMoPvSVDr17ppxG/lSfUg=";
   };
 
   build-system = [ poetry-core ];
@@ -57,7 +57,7 @@ buildPythonPackage rec {
   meta = {
     description = "Guess additional information from track titles";
     homepage = "https://github.com/ratoaq2/trakit";
-    changelog = "https://github.com/ratoaq2/trakit/releases/tag/${version}";
+    changelog = "https://github.com/ratoaq2/trakit/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ eljamm ];
   };

From acca0def19f3c59a973c97bb5236f33ece8e8646 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:24 +0200
Subject: [PATCH 1345/3724] python3Packages.tree-sitter-markdown: 0.3.2 ->
 0.5.0

https://github.com/tree-sitter-grammars/tree-sitter-markdown/releases/tag/v0.5.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/tree-sitter-markdown/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tree-sitter-markdown/default.nix b/pkgs/development/python-modules/tree-sitter-markdown/default.nix
index 70511b603127..554324248f4b 100644
--- a/pkgs/development/python-modules/tree-sitter-markdown/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-markdown/default.nix
@@ -11,14 +11,14 @@
 buildPythonPackage rec {
   pname = "tree-sitter-markdown";
   # only update to the latest version on PyPI
-  version = "0.3.2";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tree-sitter-grammars";
     repo = "tree-sitter-markdown";
     tag = "v${version}";
-    hash = "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8=";
+    hash = "sha256-I9KDE1yZce8KIGPLG5tmv5r/NCWwN95R6fIyvGdx+So=";
   };
 
   build-system = [

From 33236c1143471444babcf2ab79a670a524f93de2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:25 +0200
Subject: [PATCH 1346/3724] python3Packages.tree-sitter-rust: 0.23.2 -> 0.24.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/tree-sitter-rust/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tree-sitter-rust/default.nix b/pkgs/development/python-modules/tree-sitter-rust/default.nix
index 8820bd0680b4..f720341200b1 100644
--- a/pkgs/development/python-modules/tree-sitter-rust/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-rust/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "tree-sitter-rust";
-  version = "0.23.2";
+  version = "0.24.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
     repo = "tree-sitter-rust";
     tag = "v${version}";
-    hash = "sha256-aT+tlrEKMgWqTEq/NHh8Vj92h6i1aU6uPikDyaP2vfc=";
+    hash = "sha256-y3sJURlSTM7LRRN5WGIAeslsdRZU522Tfcu6dnXH/XQ=";
   };
 
   build-system = [

From d1f7e12d7e2f58912ccb44bb19c8cb83591ee89a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:25 +0200
Subject: [PATCH 1347/3724] python3Packages.tree-sitter: 0.24.0 -> 0.25.0

https://github.com/tree-sitter/py-tree-sitter/releases/tag/v0.25.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/tree-sitter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix
index 4c176538beb0..74d54cfedbd6 100644
--- a/pkgs/development/python-modules/tree-sitter/default.nix
+++ b/pkgs/development/python-modules/tree-sitter/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "tree-sitter";
-  version = "0.24.0";
+  version = "0.25.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-q9la9lyi9Pfso1Y0M5HtZp52Tzd0i1NSlG8A9/x45zQ=";
+    hash = "sha256-FciHdc8k2wZne6/mLfBYpkV9im3eZ7qkjdNyO5BeeaY=";
   };
 
   # see https://github.com/tree-sitter/py-tree-sitter/issues/330#issuecomment-2629403946

From eb2774e162d5b92c7581fa2ba14b2bcaed0ba299 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:26 +0200
Subject: [PATCH 1348/3724] python3Packages.treelib: 1.7.1 -> 1.8.0

https://github.com/caesar0301/treelib/releases/tag/v1.8.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/treelib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/treelib/default.nix b/pkgs/development/python-modules/treelib/default.nix
index 1fd566f4c27d..77b3fc634047 100644
--- a/pkgs/development/python-modules/treelib/default.nix
+++ b/pkgs/development/python-modules/treelib/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "treelib";
-  version = "1.7.1";
+  version = "1.8.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "caesar0301";
     repo = "treelib";
     tag = "v${version}";
-    hash = "sha256-+6Ur2hEhUxHccZLdWHCyCkdI6Zr/wGTBIIzzbpEEiSY=";
+    hash = "sha256-jvaZVy+FUcCcIdvWK6zFL8IBVH+hMiPMmv5shFXLo0k=";
   };
 
   propagatedBuildInputs = [ six ];

From 2636dec378525d0e89fe8e26094b0f601c936cc3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:26 +0200
Subject: [PATCH 1349/3724] python3Packages.treq: 24.9.1 -> 25.5.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/treq/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index 2f19ecf00a0a..621dc5ad2acc 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -5,11 +5,12 @@
 
   # build-system
   incremental,
-  setuptools,
+  hatchling,
 
   # dependencies
   attrs,
   hyperlink,
+  multipart,
   requests,
   twisted,
 
@@ -19,23 +20,24 @@
 
 buildPythonPackage rec {
   pname = "treq";
-  version = "24.9.1";
+  version = "25.5.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Fdp/xATz5O1Z0Kvl+O70lm+rvmGAOaKiO8fBUwXO/qg=";
+    hash = "sha256-Jd3jpVroXsLyxWMyyZrvJVqxT5l9DQBVLr/xNTipgEo=";
   };
 
   nativeBuildInputs = [
     incremental
-    setuptools
+    hatchling
   ];
 
   propagatedBuildInputs = [
     attrs
     hyperlink
     incremental
+    multipart
     requests
     twisted
   ]

From 7e261a4380df53bee7af340746e2765a8777a116 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:26 +0200
Subject: [PATCH 1350/3724] python3Packages.trino-python-client: 0.323.0 ->
 0.334.0

https://github.com/trinodb/trino-python-client/blob/0.334.0/CHANGES.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/trino-python-client/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix
index 333d3fc2ee2d..bbf712cdf37e 100644
--- a/pkgs/development/python-modules/trino-python-client/default.nix
+++ b/pkgs/development/python-modules/trino-python-client/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "trino-python-client";
-  version = "0.323.0";
+  version = "0.334.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     repo = "trino-python-client";
     owner = "trinodb";
     tag = version;
-    hash = "sha256-Nr7p7x5cxxuPv2NUh1uMth97OQ+H2KBlu0SHVJ7Zu1M=";
+    hash = "sha256-cSwMmzIUFYX8VgSwobth8EsARUff3hhfBf+IrhuFSYM=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -62,7 +62,7 @@ buildPythonPackage rec {
   disabledTestMarks = [ "auth" ];
 
   meta = with lib; {
-    changelog = "https://github.com/trinodb/trino-python-client/blob/${version}/CHANGES.md";
+    changelog = "https://github.com/trinodb/trino-python-client/blob/${src.tag}/CHANGES.md";
     description = "Client for the Trino distributed SQL Engine";
     homepage = "https://github.com/trinodb/trino-python-client";
     license = licenses.asl20;

From f74c3d06275c66728afd47da7c0af594f31a6646 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:27 +0200
Subject: [PATCH 1351/3724] python3Packages.trl: 0.19.0 -> 0.20.0

https://github.com/huggingface/trl/releases/tag/v0.20.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/trl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trl/default.nix b/pkgs/development/python-modules/trl/default.nix
index 102e879db55f..bc89ac18fd4b 100644
--- a/pkgs/development/python-modules/trl/default.nix
+++ b/pkgs/development/python-modules/trl/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "trl";
-  version = "0.19.0";
+  version = "0.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "trl";
     tag = "v${version}";
-    hash = "sha256-TlTq3tIQfNuI+CPvIy/qPFiKPhoSQd7g7FDj4F7C3CQ=";
+    hash = "sha256-z14refdNySnKcfFq54l+slsi4SLe5FG8UNoAKxfmAy0=";
   };
 
   build-system = [

From 7612a932f024574503ba15d0b4fd9d7b913612b4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:28 +0200
Subject: [PATCH 1352/3724] python3Packages.trytond: 7.6.3 -> 7.6.5

https://foss.heptapod.net/tryton/tryton/-/blob/trytond-7.6.5/trytond/CHANGELOG?ref_type=tags

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/trytond/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix
index 19c9040d1f60..7ce695852925 100644
--- a/pkgs/development/python-modules/trytond/default.nix
+++ b/pkgs/development/python-modules/trytond/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "trytond";
-  version = "7.6.3";
+  version = "7.6.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-i/EI9XGtQhdWPfyVIsiFX01b+nv2VmTOuevVKUu43nI=";
+    hash = "sha256-1HMFHBRuVJG5oonfxQzsgonJGG5ZmOXoLDkRlryTSXM=";
   };
 
   build-system = [ setuptools ];

From fdff14cc9e866cb279b661cd0b926d96c085c6b2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:29 +0200
Subject: [PATCH 1353/3724] python3Packages.ttkbootstrap: 1.12.1 -> 1.14.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ttkbootstrap/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ttkbootstrap/default.nix b/pkgs/development/python-modules/ttkbootstrap/default.nix
index 458ae0b51d69..626030ea4d8a 100644
--- a/pkgs/development/python-modules/ttkbootstrap/default.nix
+++ b/pkgs/development/python-modules/ttkbootstrap/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "ttkbootstrap";
-  version = "1.12.1";
-  format = "setuptools";
+  version = "1.14.2";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "israel-dryer";
     repo = "ttkbootstrap";
     tag = "v${version}";
-    hash = "sha256-Pkp45lB1Xeu9ZoLjKS8aSW2By/k3ID1qwMig/jdYHh4=";
+    hash = "sha256-D1Gx+gP6xbeOhKcjb2uhwhHlYFhma9y04tp0ibJCw6g=";
   };
 
   build-system = [
@@ -27,6 +27,8 @@ buildPythonPackage rec {
     pillow
   ];
 
+  pythonRelaxDeps = [ "pillow" ];
+
   # As far as I can tell, all tests require a display and are not normal-ish pytests
   # but appear to just be python scripts that run demos of components?
   doCheck = false;

From 568fc8d97398b39c34e984573daa69193d39cffd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:29 +0200
Subject: [PATCH 1354/3724] python3Packages.twisted: 24.11.0 -> 25.5.0

https://github.com/twisted/twisted/blob/twisted-25.5.0/NEWS.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/twisted/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 678392a3c3fa..4b3c8b3e576f 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -55,7 +55,7 @@
 
 buildPythonPackage rec {
   pname = "twisted";
-  version = "24.11.0";
+  version = "25.5.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -63,7 +63,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "tar.gz";
-    hash = "sha256-aV0FVtXsV53MRk0oVrY0iA7RMZ9FsQ0ZBD8rV+sBFbU=";
+    hash = "sha256-HesnI1jLa+Hj6PxvnIs2946w+nwiM9Lb4R7G/uBOoxY=";
   };
 
   __darwinAllowLocalNetworking = true;

From b54c566deeb835c830f37699b9eb116d586de2b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:30 +0200
Subject: [PATCH 1355/3724] python3Packages.type-infer: 0.0.21 -> 0.0.23

https://github.com/mindsdb/type_infer/releases/tag/v0.0.23

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/type-infer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix
index 371708f7d0d0..5bc50ccf9e45 100644
--- a/pkgs/development/python-modules/type-infer/default.nix
+++ b/pkgs/development/python-modules/type-infer/default.nix
@@ -24,7 +24,7 @@ let
     d.stopwords
   ]);
 
-  version = "0.0.21";
+  version = "0.0.23";
   tag = "v${version}";
 in
 buildPythonPackage {
@@ -38,7 +38,7 @@ buildPythonPackage {
     owner = "mindsdb";
     repo = "type_infer";
     inherit tag;
-    hash = "sha256-Q5f4WihaT88R+x4jMUuRNBvWglkGdS5oi+o9jOk+tSE=";
+    hash = "sha256-tqT/MTcSHcKGoPUUzjPLFpOTchannFsCd2VMC+8kVZ8=";
   };
 
   pythonRelaxDeps = [

From f199081f194a2a079b4dab48de38988506c14d3d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:30 +0200
Subject: [PATCH 1356/3724] python3Packages.typed-settings: 24.6.0 -> 25.0.0

https://gitlab.com/sscherfke/typed-settings/-/blob/25.0.0/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/typed-settings/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix
index 2e37f4f02ac1..78802f283b33 100644
--- a/pkgs/development/python-modules/typed-settings/default.nix
+++ b/pkgs/development/python-modules/typed-settings/default.nix
@@ -21,7 +21,7 @@
 }:
 buildPythonPackage rec {
   pname = "typed-settings";
-  version = "24.6.0";
+  version = "25.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "typed_settings";
     inherit version;
-    hash = "sha256-mlWV3jP4BFKiA44Bi8RVCP/8I4qHUvCPXAPcjnvA0eI=";
+    hash = "sha256-Kbr9Mc1PXgD+OAw/ADp3HXC+rnAJcFEqjlXxQq/1wRM=";
   };
 
   build-system = [ hatchling ];

From 3cc87f1346bcbad7cfd1a28390f978c7a907cbff Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:31 +0200
Subject: [PATCH 1357/3724] python3Packages.typeguard: 4.4.2 -> 4.4.4

https://github.com/agronholm/typeguard/releases/tag/4.4.4

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/typeguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index 4f74f088f82d..b14939e91f51 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "typeguard";
-  version = "4.4.2";
+  version = "4.4.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pvEGWBPjLvNlvDs/UDr4qW+d1OADOgLCjEpJg96MbEk=";
+    hash = "sha256-On/S3/twXU0O+u1DBqcEyJud7oULaI8GCosWFaeeX3Q=";
   };
 
   outputs = [

From d26aacdc411adcf4a70223ce26ff6c70960aa40e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:31 +0200
Subject: [PATCH 1358/3724] python3Packages.types-colorama: 0.4.15.20240311 ->
 0.4.15.20250801

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/types-colorama/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix
index c14b2e4ded7a..404583aeffda 100644
--- a/pkgs/development/python-modules/types-colorama/default.nix
+++ b/pkgs/development/python-modules/types-colorama/default.nix
@@ -7,12 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-colorama";
-  version = "0.4.15.20240311";
+  version = "0.4.15.20250801";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-oo5/mNF9KxT7lWXTI4jkGfQQj1V6fZOaZjGZabK5nHo=";
+    pname = "types_colorama";
+    inherit version;
+    hash = "sha256-AlZdE9aJY9EiN9PzMPXs1iKjF597WxTufxYUYnDDV/U=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 08d915396df270ffc0651b3110ae715d4adbbb13 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:32 +0200
Subject: [PATCH 1359/3724] python3Packages.types-lxml: 2025.03.04 ->
 2025.03.30

https://github.com/abelcheung/types-lxml/releases/tag/2025.03.30

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/types-lxml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix
index 270dac5caa1d..02e93cd4cd46 100644
--- a/pkgs/development/python-modules/types-lxml/default.nix
+++ b/pkgs/development/python-modules/types-lxml/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "types-lxml";
-  version = "2025.03.04";
+  version = "2025.03.30";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "abelcheung";
     repo = "types-lxml";
     tag = version;
-    hash = "sha256-dA9sspqEChHarwk2LrK2F7Ehri2ffjOlGk3nj4KFsfU=";
+    hash = "sha256-+H1VOO72/zq0nITq2a+4wEarPqBdBF7wIfRShFBsLPw=";
   };
 
   pythonRelaxDeps = [ "beautifulsoup4" ];

From e3ed00e9e8c7c6c799ef811184969ad89560be76 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:32 +0200
Subject: [PATCH 1360/3724] python3Packages.types-protobuf: 5.29.1.20250315 ->
 6.30.2.20250703

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/types-protobuf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix
index 75d8c55bfaa3..f8f2066c7bd5 100644
--- a/pkgs/development/python-modules/types-protobuf/default.nix
+++ b/pkgs/development/python-modules/types-protobuf/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-protobuf";
-  version = "5.29.1.20250315";
+  version = "6.30.2.20250703";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "types_protobuf";
     inherit version;
-    hash = "sha256-CwW8NGIdBG3lS5T93V9Os7+En+LhOlD4+46J81BF/0k=";
+    hash = "sha256-YJqXR1S7tx+hePxkH1EFA5Xo4YSfSdBCCmKB7Y0d30Y=";
   };
 
   propagatedBuildInputs = [ types-futures ];

From df5fdc35cc60d042d699c1605f52ce6318f69a62 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:33 +0200
Subject: [PATCH 1361/3724] python3Packages.types-psutil: 7.0.0.20250401 ->
 7.0.0.20250801

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/types-psutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix
index 92cd3efb2a96..008396640946 100644
--- a/pkgs/development/python-modules/types-psutil/default.nix
+++ b/pkgs/development/python-modules/types-psutil/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "types-psutil";
-  version = "7.0.0.20250401";
+  version = "7.0.0.20250801";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "types_psutil";
     inherit version;
-    hash = "sha256-Kn1mPAiIoHn8FkPrwQmtEuV6IclVKp4gNdpQQZEzbb8=";
+    hash = "sha256-AjC1YjQlLMb1nDYdzLqqCPMIjqNWk2er5pAEhdOIyX0=";
   };
 
   # Module doesn't have tests

From d40aa8197a406e0b87034ce2179b1d6a4f665ef6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:33 +0200
Subject: [PATCH 1362/3724] python3Packages.types-python-dateutil:
 2.9.0.20241206 -> 2.9.0.20250708

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/types-python-dateutil/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix
index 0dd1b01af601..a7590da661ba 100644
--- a/pkgs/development/python-modules/types-python-dateutil/default.nix
+++ b/pkgs/development/python-modules/types-python-dateutil/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-python-dateutil";
-  version = "2.9.0.20241206";
+  version = "2.9.0.20250708";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_python_dateutil";
     inherit version;
-    hash = "sha256-GPSTQUwm/7ppKnI2n+p6FUxQJkYwHr/j1WoEs3ZyhMs=";
+    hash = "sha256-zNvXXastbJaWw1BXnzTP/iwoHkxfJ6WFsqJDjdHVyKs=";
   };
 
   build-system = [ setuptools ];

From 665d9b6ba45270878d461d92e2255ef9add29d00 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:34 +0200
Subject: [PATCH 1363/3724] python3Packages.types-pyyaml: 6.0.12.20250402 ->
 6.0.12.20250516

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/types-pyyaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-pyyaml/default.nix b/pkgs/development/python-modules/types-pyyaml/default.nix
index 46893f2f9f57..e9dbdeb82433 100644
--- a/pkgs/development/python-modules/types-pyyaml/default.nix
+++ b/pkgs/development/python-modules/types-pyyaml/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-pyyaml";
-  version = "6.0.12.20250402";
+  version = "6.0.12.20250516";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_pyyaml";
     inherit version;
-    hash = "sha256-18E8Pm0zW2r0sBIqAf8dJwq6hKuW0aGhBj7Lo+E+wHU=";
+    hash = "sha256-nyGnAhb8D6GyFqgXbbX54K9us10vKTKsuHaJ0Dpb9ro=";
   };
 
   build-system = [ setuptools ];

From 0814bf68aef90fc7168d5ae9f0d86b23f56cce89 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:34 +0200
Subject: [PATCH 1364/3724] python3Packages.types-setuptools: 78.1.0.20250329
 -> 80.9.0.20250801

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/types-setuptools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix
index 6c508858478f..8fdcc17567d7 100644
--- a/pkgs/development/python-modules/types-setuptools/default.nix
+++ b/pkgs/development/python-modules/types-setuptools/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-setuptools";
-  version = "78.1.0.20250329";
+  version = "80.9.0.20250801";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_setuptools";
     inherit version;
-    hash = "sha256-MeYpUMOLjMHFEUsHdQTjZCaGCgZCh8rBG5ZmqzpIMjQ=";
+    hash = "sha256-4ekmgvoHImQVOWu04tMfEWoW/75YOwWwH5kQ/N6jt+g=";
   };
 
   nativeBuildInputs = [ setuptools ];

From c9cc97fdb5fa00515d3d92a41aed73dc1c28dd21 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:35 +0200
Subject: [PATCH 1365/3724] python3Packages.typeshed-client: 2.7.0 -> 2.8.2

https://github.com/JelleZijlstra/typeshed_client/releases/tag/v2.8.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/typeshed-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/typeshed-client/default.nix b/pkgs/development/python-modules/typeshed-client/default.nix
index 748fe0f05016..507bfd771f41 100644
--- a/pkgs/development/python-modules/typeshed-client/default.nix
+++ b/pkgs/development/python-modules/typeshed-client/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "typeshed-client";
-  version = "2.7.0";
+  version = "2.8.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "JelleZijlstra";
     repo = "typeshed_client";
     tag = "v${version}";
-    hash = "sha256-dEfKZ930Jxa84HUqKpsL2JWQLeeWx6gIMtFHTbiw3Es=";
+    hash = "sha256-+muWm2/Psp8V1n7mEloc+ltuwHG/uRvDUgSFRNzz5EQ=";
   };
 
   build-system = [ setuptools ];
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Retrieve information from typeshed and other typing stubs";
     homepage = "https://github.com/JelleZijlstra/typeshed_client";
-    changelog = "https://github.com/JelleZijlstra/typeshed_client/releases/tag/v${version}";
+    changelog = "https://github.com/JelleZijlstra/typeshed_client/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = [ ];
   };

From f1160d31e0095c03aed99fedea6b5835e087ad54 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:35 +0200
Subject: [PATCH 1366/3724] python3Packages.tyro: 0.9.19 -> 0.9.27

https://github.com/brentyi/tyro/releases/tag/v0.9.27

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/tyro/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tyro/default.nix b/pkgs/development/python-modules/tyro/default.nix
index c0d4ccddee26..6422a960ccd1 100644
--- a/pkgs/development/python-modules/tyro/default.nix
+++ b/pkgs/development/python-modules/tyro/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "tyro";
-  version = "0.9.19";
+  version = "0.9.27";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "brentyi";
     repo = "tyro";
     tag = "v${version}";
-    hash = "sha256-A1Vplc84Xy8TufqmklPUzIdgiPpFcIjqV0eUgdKmYRM=";
+    hash = "sha256-2duLVdBwNpGWCV+WgtzyXjoVhukVjUUhIWXVBEk4QIA=";
   };
 
   build-system = [ hatchling ];
@@ -62,7 +62,7 @@ buildPythonPackage rec {
   meta = {
     description = "CLI interfaces & config objects, from types";
     homepage = "https://github.com/brentyi/tyro";
-    changelog = "https://github.com/brentyi/tyro/releases/tag/v${version}";
+    changelog = "https://github.com/brentyi/tyro/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ hoh ];
   };

From b92c7245993e3cb1c99067308fd534411a8ad7b6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:36 +0200
Subject: [PATCH 1367/3724] python3Packages.uart-devices: 0.1.0 -> 0.1.1

https://github.com/bdraco/uart-devices/blob/v0.1.1/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/uart-devices/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/uart-devices/default.nix b/pkgs/development/python-modules/uart-devices/default.nix
index a8ae51c93c63..3005eb14e7d2 100644
--- a/pkgs/development/python-modules/uart-devices/default.nix
+++ b/pkgs/development/python-modules/uart-devices/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "uart-devices";
-  version = "0.1.0";
+  version = "0.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "uart-devices";
     tag = "v${version}";
-    hash = "sha256-rmOWyTdOwnlr8Rwsvd2oeZq79LuGVJDAkIW2/9gGrKQ=";
+    hash = "sha256-vBwQXeXw9y7eETtlC4dcqGytIgrAm7iomnvoaxhl6JI=";
   };
 
   postPatch = ''
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "UART Devices for Linux";
     homepage = "https://github.com/bdraco/uart-devices";
-    changelog = "https://github.com/bdraco/uart-devices/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/bdraco/uart-devices/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
     platforms = platforms.linux;

From b8bfddfdbb2f834f7ed8ffb7d2b5c1a5f6611bbe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:36 +0200
Subject: [PATCH 1368/3724] python3Packages.ueberzug: 18.1.9 -> 18.3.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ueberzug/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix
index 633e2d9d7db2..d0169e0f6e39 100644
--- a/pkgs/development/python-modules/ueberzug/default.nix
+++ b/pkgs/development/python-modules/ueberzug/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "ueberzug";
-  version = "18.1.9";
+  version = "18.3.1";
   format = "setuptools";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7ce49f351132c7d1b0f8097f6e4c5635376151ca59318540da3e296e5b21adc3";
+    sha256 = "sha256-1Lk4E5YwEq2mUnYbIWDhzz9/CCwfXMJ11/TtJ44ugOk=";
   };
 
   buildInputs = [

From fd87e2d1154525d3befe7ffe4a712b64e7732c49 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:37 +0200
Subject: [PATCH 1369/3724] python3Packages.ufo2ft: 3.5.1 -> 3.6.0

https://github.com/googlefonts/ufo2ft/releases/tag/v3.6.0

This commit was automatically generated using update-python-libraries.
---
 .../development/python-modules/ufo2ft/default.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix
index c3a9401600a1..871fb640c09f 100644
--- a/pkgs/development/python-modules/ufo2ft/default.nix
+++ b/pkgs/development/python-modules/ufo2ft/default.nix
@@ -15,31 +15,20 @@
   skia-pathops,
   syrupy,
   ufolib2,
-  fetchpatch,
 }:
 
 buildPythonPackage rec {
   pname = "ufo2ft";
-  version = "3.5.1";
+  version = "3.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FUITbL+FnscmZjZMlgh/dX4+tJR6MD0LoH5jDNisQkI=";
+    hash = "sha256-hKqTjD8cTgyxHZnaojPAT5JY11okvLiNOnemoULnpmw=";
   };
 
-  patches = [
-    # Unreleased patch for fonttools >= 4.58.5
-    # https://github.com/googlefonts/ufo2ft/issues/920
-    (fetchpatch {
-      name = "ufo2ft-fonttools-4.58.5.patch";
-      url = "https://github.com/googlefonts/ufo2ft/commit/5ca4800ef39167c377fc669b41e146520cfa641b.patch";
-      hash = "sha256-7hEO6D7LK+LxTK1jcaC8kLw/9ZOOpr41qFysLrZBZ4M=";
-    })
-  ];
-
   build-system = [
     setuptools-scm
   ];

From 54915cb23257d7d0ef43c381f9a56265596225be Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:37 +0200
Subject: [PATCH 1370/3724] python3Packages.uharfbuzz: 0.45.0 -> 0.51.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/uharfbuzz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix
index b04167f1e6db..d03057e8cc14 100644
--- a/pkgs/development/python-modules/uharfbuzz/default.nix
+++ b/pkgs/development/python-modules/uharfbuzz/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "uharfbuzz";
-  version = "0.45.0";
+  version = "0.51.1";
   pyproject = true;
 
   disabled = pythonOlder "3.5";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     repo = "uharfbuzz";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-dfEyeejJdLHGHH+YI0mWdjF2rvFpM6/KVm2tLo9ssUs=";
+    hash = "sha256-mVxG0unTjMjb0/6w58Py+TARw8YmOWljTlQQwUEdMpg=";
   };
 
   postPatch = ''

From b82e906f23dc1a671922a1c2f6c774ea1301a603 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:38 +0200
Subject: [PATCH 1371/3724] python3Packages.ultralytics: 8.3.143 -> 8.3.174

https://github.com/ultralytics/ultralytics/releases/tag/v8.3.174

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/ultralytics/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix
index 926844ac46f6..04048239733f 100644
--- a/pkgs/development/python-modules/ultralytics/default.nix
+++ b/pkgs/development/python-modules/ultralytics/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "ultralytics";
-  version = "8.3.143";
+  version = "8.3.174";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ultralytics";
     repo = "ultralytics";
     tag = "v${version}";
-    hash = "sha256-qpFQcGLTEQS7Bt9CvdXgv2JyNfOONS0Cf71dckCrlPw=";
+    hash = "sha256-wQ16e67ldrV8KwAXoLyxqzx9DG+LAmU5Mt+65dQzUkY=";
   };
 
   build-system = [ setuptools ];

From 114b5a3dcc335ebe012d9186ce902a9c9d33acf9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:39 +0200
Subject: [PATCH 1372/3724] python3Packages.umap-learn: 0.5.8 -> 0.5.9.post2

https://github.com/lmcinnes/umap/releases/tag/release-release-0.5.9.post2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/umap-learn/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix
index 616aefb657eb..5b462a1c3769 100644
--- a/pkgs/development/python-modules/umap-learn/default.nix
+++ b/pkgs/development/python-modules/umap-learn/default.nix
@@ -34,14 +34,14 @@
 
 buildPythonPackage rec {
   pname = "umap-learn";
-  version = "0.5.8";
+  version = "0.5.9.post2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lmcinnes";
     repo = "umap";
     tag = "release-${version}";
-    hash = "sha256-VR+qBZyFtpW/xuFXI8pxDkkwJKt9qajnUtvuZLFZtF0=";
+    hash = "sha256-ollUXPVB07v6DkQ/d1eke0/j1f4Ekfygo1r6CtIRTuk=";
   };
 
   build-system = [ setuptools ];
@@ -101,7 +101,7 @@ buildPythonPackage rec {
   meta = {
     description = "Uniform Manifold Approximation and Projection";
     homepage = "https://github.com/lmcinnes/umap";
-    changelog = "https://github.com/lmcinnes/umap/releases/tag/release-${version}";
+    changelog = "https://github.com/lmcinnes/umap/releases/tag/release-${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = [ ];
   };

From 91fcdb6856ef2bda33688f160567b946ca53d746 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:39 +0200
Subject: [PATCH 1373/3724] python3Packages.unidata-blocks: 0.0.16 -> 0.0.17

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/unidata-blocks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix
index df0f39d9ce77..716e67b2f29c 100644
--- a/pkgs/development/python-modules/unidata-blocks/default.nix
+++ b/pkgs/development/python-modules/unidata-blocks/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "unidata-blocks";
-  version = "0.0.16";
+  version = "0.0.17";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "unidata_blocks";
     inherit version;
-    hash = "sha256-b/5Yq9wI+qSYSObBMCqZ3j8fSXwe4ssenNlvpkJSZro=";
+    hash = "sha256-QI9niECwNRyVpyzjaibPmlXxLpIbVA5v0bz94s0dDtM=";
   };
 
   build-system = [ hatchling ];

From 081f3f03f2a4253fd6bf8c1a441a51c89456a15b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:40 +0200
Subject: [PATCH 1374/3724] python3Packages.unsloth-zoo: 2025.6.4 -> 2025.8.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/unsloth-zoo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/unsloth-zoo/default.nix b/pkgs/development/python-modules/unsloth-zoo/default.nix
index 03f4a6e9d577..d5f50d0578ec 100644
--- a/pkgs/development/python-modules/unsloth-zoo/default.nix
+++ b/pkgs/development/python-modules/unsloth-zoo/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "unsloth-zoo";
-  version = "2025.6.4";
+  version = "2025.8.1";
   pyproject = true;
 
   # no tags on GitHub
   src = fetchPypi {
     pname = "unsloth_zoo";
     inherit version;
-    hash = "sha256-3KLsFYhnTPqaeydFJDHr+qNkTVi2NL3ADjzkd0NBOQQ=";
+    hash = "sha256-AkAfd+dJb8A9cUYK/VH30Q5xN2BW/x4zyndnIyN9y14=";
   };
 
   # pyproject.toml requires an obsolete version of protobuf,

From 03ff6705722205cb285524c57058a4fb58a83218 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:40 +0200
Subject: [PATCH 1375/3724] python3Packages.unsloth: 2025.6.5 -> 2025.8.1

https://github.com/unslothai/unsloth/releases/tag/2025.8.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/unsloth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/unsloth/default.nix b/pkgs/development/python-modules/unsloth/default.nix
index 1e9124ad1a62..dc45bf8ded2f 100644
--- a/pkgs/development/python-modules/unsloth/default.nix
+++ b/pkgs/development/python-modules/unsloth/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "unsloth";
-  version = "2025.6.5";
+  version = "2025.8.1";
   pyproject = true;
 
   # Tags on the GitHub repo don't match
   src = fetchPypi {
     pname = "unsloth";
     inherit version;
-    hash = "sha256-o4c4gANnjM+z4Dp/0BZ48SMLMbCyIgjF3C5Q/AXV49A=";
+    hash = "sha256-hkE+f6apgilrE0lFTWRe8PEvRQ71YuoHpQgzd/R/FaI=";
   };
 
   build-system = [

From 0e5bc6ff230d183c10164a588a0ea5c309da687f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:40 +0200
Subject: [PATCH 1376/3724] python3Packages.unstructured-client: 0.38.1 ->
 0.42.0

https://github.com/Unstructured-IO/unstructured-python-client/blob/v0.42.0/RELEASES.md

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/unstructured-client/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix
index b3c58f576e57..c92072ee35b8 100644
--- a/pkgs/development/python-modules/unstructured-client/default.nix
+++ b/pkgs/development/python-modules/unstructured-client/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "unstructured-client";
-  version = "0.38.1";
+  version = "0.42.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Unstructured-IO";
     repo = "unstructured-python-client";
     tag = "v${version}";
-    hash = "sha256-gzNPzS//7MU6nX3cA0p6dPqIG273VlGMU0ePyObn4d4=";
+    hash = "sha256-LXCKD2LL1rFObr2Ew0vsa5Uh96sR8/821ecL/il30r0=";
   };
 
   preBuild = ''

From d4dcf337a6c9839eea95ae42323e3b1036523ca1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:41 +0200
Subject: [PATCH 1377/3724] python3Packages.unstructured: 0.17.2 -> 0.18.12

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/unstructured/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix
index fb11ac599003..5cd2137eca44 100644
--- a/pkgs/development/python-modules/unstructured/default.nix
+++ b/pkgs/development/python-modules/unstructured/default.nix
@@ -116,9 +116,9 @@
   grpcio,
 }:
 let
-  version = "0.17.2";
+  version = "0.18.12";
 in
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "unstructured";
   inherit version;
   pyproject = true;
@@ -127,7 +127,7 @@ buildPythonPackage {
     owner = "Unstructured-IO";
     repo = "unstructured";
     tag = version;
-    hash = "sha256-DbNfhJzpPJObACWSc2r16kjIE2X/CrOCiT7fdgGNwIg=";
+    hash = "sha256-YZsfpfkvjkNStYhU4lC3I/Hr1ahJ1wccyJ8lckwejaA=";
   };
 
   build-system = [ setuptools ];
@@ -278,7 +278,7 @@ buildPythonPackage {
     description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines";
     mainProgram = "unstructured-ingest";
     homepage = "https://github.com/Unstructured-IO/unstructured";
-    changelog = "https://github.com/Unstructured-IO/unstructured/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/Unstructured-IO/unstructured/blob/${src.tag}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ happysalada ];
   };

From 14872db2478c1f3cbc67481ed12a711450662a8b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:41 +0200
Subject: [PATCH 1378/3724] python3Packages.upcloud-api: 2.6.0 -> 2.7.0

https://github.com/UpCloudLtd/upcloud-python-api/blob/v2.7.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/upcloud-api/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/upcloud-api/default.nix b/pkgs/development/python-modules/upcloud-api/default.nix
index e4b35381fbd7..2d5c43ecfbdc 100644
--- a/pkgs/development/python-modules/upcloud-api/default.nix
+++ b/pkgs/development/python-modules/upcloud-api/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "upcloud-api";
-  version = "2.6.0";
+  version = "2.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "UpCloudLtd";
     repo = "upcloud-python-api";
     tag = "v${version}";
-    hash = "sha256-RDGRue9hejNPKIP61GtJHMG5rG3CKvJdsYxVrp6I5W0=";
+    hash = "sha256-YTccjuoagjS/Gllw8VtJ4NFoVqN1YeqXdgHI7BtP98w=";
   };
 
   build-system = [ setuptools ];
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "upcloud_api" ];
 
   meta = with lib; {
-    changelog = "https://github.com/UpCloudLtd/upcloud-python-api/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/UpCloudLtd/upcloud-python-api/blob/${src.tag}/CHANGELOG.md";
     description = "UpCloud API Client";
     homepage = "https://github.com/UpCloudLtd/upcloud-python-api";
     license = licenses.mit;

From 65d4759e81f755762cf0065c470f1f6e7aaa0cc0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:42 +0200
Subject: [PATCH 1379/3724] python3Packages.uqbar: 0.7.4 -> 0.9.5

https://github.com/josiah-wolf-oberholtzer/uqbar/releases/tag/v0.9.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/uqbar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uqbar/default.nix b/pkgs/development/python-modules/uqbar/default.nix
index 68eca27e0128..4b19a46863cc 100644
--- a/pkgs/development/python-modules/uqbar/default.nix
+++ b/pkgs/development/python-modules/uqbar/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "uqbar";
-  version = "0.7.4";
+  version = "0.9.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-q4p+ki5wA/gYGWnt2tzCiEakk4fBl9P96ONz2ZxlCCg=";
+    hash = "sha256-MHSnuPiJu2p3NiG/bV6qFUO90xQEFcyQrcxMY0hw8E8=";
   };
 
   postPatch = ''

From 8e3459e47b14f2d75548fe98d9ab05819b5d77b5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:42 +0200
Subject: [PATCH 1380/3724] python3Packages.uritemplate: 4.1.1 -> 4.2.0

https://github.com/python-hyper/uritemplate/blob/4.2.0/HISTORY.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/uritemplate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/pkgs/development/python-modules/uritemplate/default.nix
index 1d757d4134a7..2cf866a315b2 100644
--- a/pkgs/development/python-modules/uritemplate/default.nix
+++ b/pkgs/development/python-modules/uritemplate/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "uritemplate";
-  version = "4.1.1";
+  version = "4.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Q0bt/Fw7efaUvM1tYJmjIrvrYo2/LNhu6lWkVs5RJPA=";
+    hash = "sha256-SAwu0YCHiVWGMyPuoxsO3maHld4YJhf++cbKCebsnQ4=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 490df338d7a05798533cb29fb146067067a81fda Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:43 +0200
Subject: [PATCH 1381/3724] python3Packages.urllib3: 2.4.0 -> 2.5.0

https://github.com/urllib3/urllib3/blob/2.5.0/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/urllib3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index 624db352750b..dc548d262b59 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -24,12 +24,12 @@
 let
   self = buildPythonPackage rec {
     pname = "urllib3";
-    version = "2.4.0";
+    version = "2.5.0";
     pyproject = true;
 
     src = fetchPypi {
       inherit pname version;
-      hash = "sha256-QUvGU1t4f+vXVngEzAFf7jnaq4rYYmjxMQqSUGl95GY=";
+      hash = "sha256-P8R3M8fkGdS8P2s9wrT4kLt0OQajDVa6Slv6S7/5J2A=";
     };
 
     build-system = [

From c9525697a51bd50bb229dab81d06d1322d95ede5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:43 +0200
Subject: [PATCH 1382/3724] python3Packages.urwid: 2.6.16 -> 3.0.2

https://github.com/urwid/urwid/releases/tag/3.0.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/urwid/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index 2b3f67d2a0d2..464b2609fd7d 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "urwid";
-  version = "2.6.16";
+  version = "3.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "urwid";
     repo = "urwid";
     tag = version;
-    hash = "sha256-D5NHtU7XQRh8OqkwrN5r8U/VGF87LGwdnaqGhdjN8AE=";
+    hash = "sha256-pMGNybuJZeCzZRZr0/+N87/z+ZtLmSaWW47MWDirTjQ=";
   };
 
   postPatch = ''
@@ -83,7 +83,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Full-featured console (xterm et al.) user interface library";
-    changelog = "https://github.com/urwid/urwid/releases/tag/${version}";
+    changelog = "https://github.com/urwid/urwid/releases/tag/${src.tag}";
     downloadPage = "https://github.com/urwid/urwid";
     homepage = "https://urwid.org/";
     license = licenses.lgpl21Plus;

From 8d0e1bbca300bd4d6339f96551c4b8a77d41fabf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:44 +0200
Subject: [PATCH 1383/3724] python3Packages.urwidtrees: 1.0.3 -> 1.0.4

https://github.com/pazz/urwidtrees/releases/tag/1.0.4

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/urwidtrees/default.nix           | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix
index 3928a034a08c..f9085a6479a4 100644
--- a/pkgs/development/python-modules/urwidtrees/default.nix
+++ b/pkgs/development/python-modules/urwidtrees/default.nix
@@ -9,23 +9,16 @@
 
 buildPythonPackage rec {
   pname = "urwidtrees";
-  version = "1.0.3";
+  version = "1.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pazz";
     repo = "urwidtrees";
     tag = version;
-    hash = "sha256-yGSjwagCd5TiwEFtF6ZhDuVqj4PTa5pVXhs8ebr2O/g=";
+    hash = "sha256-MQy2b0Q3gTbY8lmmt39Z1Nix0UpQtj+14T/zE1F/YJ4=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/pazz/urwidtrees/commit/ed39dbc4fc67b0e0249bf108116a88cd18543aa9.patch";
-      hash = "sha256-fA+30d2uVaoNCg4rtoWLNPvrZtq41Co4vcmM80hkURs=";
-    })
-  ];
-
   nativeBuildInputs = [ setuptools ];
 
   propagatedBuildInputs = [ urwid ];
@@ -38,7 +31,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Tree widgets for urwid";
     homepage = "https://github.com/pazz/urwidtrees";
-    changelog = "https://github.com/pazz/urwidtrees/releases/tag/${version}";
+    changelog = "https://github.com/pazz/urwidtrees/releases/tag/${src.tag}";
     license = licenses.gpl3Plus;
     maintainers = [ ];
   };

From 805ed7ca3f8f53e405dc533d115867f08117fe2b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:44 +0200
Subject: [PATCH 1384/3724] python3Packages.uuid6: 2024.7.10 -> 2025.0.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/uuid6/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uuid6/default.nix b/pkgs/development/python-modules/uuid6/default.nix
index 256816442b56..2b0744f3a2cb 100644
--- a/pkgs/development/python-modules/uuid6/default.nix
+++ b/pkgs/development/python-modules/uuid6/default.nix
@@ -7,12 +7,12 @@
 }:
 buildPythonPackage rec {
   pname = "uuid6";
-  version = "2024.7.10";
+  version = "2025.0.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LSnX9j9ZPKruoODQ3QrYEpycZjsp4ZvfiC6GS+3xj7A=";
+    hash = "sha256-zQr5T6QoZ1pE4yxTGexaNIUiW6IXnu/PTD8gWuMKgb0=";
   };
 
   # https://github.com/oittaa/uuid6-python/blob/e647035428d984452b9906b75bb007198533dfb1/setup.py#L12-L19

From f4bb2187c99b9796ee502b1683e554b36fee3515 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:45 +0200
Subject: [PATCH 1385/3724] python3Packages.uvicorn: 0.34.2 -> 0.35.0

https://github.com/encode/uvicorn/blob/0.35.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/uvicorn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index cb436823f6ad..ed7eb42839f7 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "uvicorn";
-  version = "0.34.2";
+  version = "0.35.0";
   disabled = pythonOlder "3.8";
 
   pyproject = true;
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "encode";
     repo = "uvicorn";
     tag = version;
-    hash = "sha256-r5G3Z2sMFCs5HlUpVQ05Vip+3MjlSy+3Dkv6FO52uh4=";
+    hash = "sha256-6tuLL0KMggujYI97HSSBHjiLrePwEkxFHjq2HWl8kqE=";
   };
 
   outputs = [

From e709fa8939ee919b457d2777d087040792d28011 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:45 +0200
Subject: [PATCH 1386/3724] python3Packages.uxsim: 1.7.2 -> 1.8.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/uxsim/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix
index 345d78df0aeb..6b84988e90d4 100644
--- a/pkgs/development/python-modules/uxsim/default.nix
+++ b/pkgs/development/python-modules/uxsim/default.nix
@@ -8,6 +8,7 @@
   python,
   dill,
   matplotlib,
+  networkx,
   numpy,
   pandas,
   pillow,
@@ -17,26 +18,24 @@
 }:
 buildPythonPackage rec {
   pname = "uxsim";
-  version = "1.7.2";
+  version = "1.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "toruseo";
     repo = "UXsim";
     tag = "v${version}";
-    hash = "sha256-5up44edivGWj0nQOOL3+lqjdOBBfxk01nFokG5ht+5Y=";
+    hash = "sha256-aHJ2AAoSm+5viEieAHzhU0EDyS+VQrMWlhm0CkV7/s4=";
   };
 
   patches = [ ./add-qt-plugin-path-to-env.patch ];
 
-  nativeBuildInputs = [
-    setuptools
-    wheel
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     dill
     matplotlib
+    networkx
     numpy
     pandas
     pillow

From 8682e18cedccb7d2039762be32c957290f8add9e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:46 +0200
Subject: [PATCH 1387/3724] python3Packages.versioningit: 3.1.2 -> 3.3.0

https://versioningit.readthedocs.io/en/latest/changelog.html

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/versioningit/default.nix      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix
index 781f10df2ce4..42cf3a141c0d 100644
--- a/pkgs/development/python-modules/versioningit/default.nix
+++ b/pkgs/development/python-modules/versioningit/default.nix
@@ -3,9 +3,9 @@
   buildPythonPackage,
   pythonOlder,
   fetchPypi,
-  importlib-metadata,
   packaging,
   tomli,
+  coverage,
   pytestCheckHook,
   build,
   hatchling,
@@ -19,14 +19,12 @@
 
 buildPythonPackage rec {
   pname = "versioningit";
-  version = "3.1.2";
+  version = "3.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Tbg+2Z9WsH2DlAvuNEXKRsoSDRO2swTNtftE5apO3sA=";
+    hash = "sha256-uRrX1z5z0hIg5pVA8gIT8rcpofmzXATp4Tfq8o0iFNo=";
   };
 
   build-system = [ hatchling ];
@@ -34,13 +32,10 @@ buildPythonPackage rec {
   dependencies = [
     packaging
   ]
-  ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]
   ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
-  # AttributeError: type object 'CaseDetails' has no attribute 'model_validate_json'
-  doCheck = lib.versionAtLeast pydantic.version "2";
-
   nativeCheckInputs = [
+    coverage
     pytestCheckHook
     build
     hatchling
@@ -55,6 +50,9 @@ buildPythonPackage rec {
   disabledTests = [
     # wants to write to the Nix store
     "test_editable_mode"
+    # network access
+    "test_install_from_git_url"
+    "test_install_from_zip_url"
   ];
 
   pythonImportsCheck = [ "versioningit" ];

From 160200fe3c7b90b2aa495f1108c6e304f2ed5971 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:46 +0200
Subject: [PATCH 1388/3724] python3Packages.vfblib: 0.9.5 -> 0.10.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/vfblib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/vfblib/default.nix b/pkgs/development/python-modules/vfblib/default.nix
index fd7f6c3ddae5..c32bfe946fec 100644
--- a/pkgs/development/python-modules/vfblib/default.nix
+++ b/pkgs/development/python-modules/vfblib/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "vfblib";
-  version = "0.9.5";
+  version = "0.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "LucasFonts";
     repo = "vfbLib";
-    rev = "v${version}";
-    hash = "sha256-nWySeGikbPhZmJ9yLpcFeTNxaG2EmMhTBtZvykrMsBo=";
+    tag = "v${version}";
+    hash = "sha256-lcYk6h2kWFIknCHKkrxdSKab7szvSZhFwmFvkT6VTEo=";
   };
 
   build-system = [

From d8b286440368e91b5759936fbe0af26dae837a13 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:46 +0200
Subject: [PATCH 1389/3724] python3Packages.viewstate: 0.6.0 -> 0.7.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/viewstate/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/viewstate/default.nix b/pkgs/development/python-modules/viewstate/default.nix
index 9200466e07a3..b42703cb038a 100644
--- a/pkgs/development/python-modules/viewstate/default.nix
+++ b/pkgs/development/python-modules/viewstate/default.nix
@@ -2,23 +2,23 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  poetry-core,
+  setuptools,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "viewstate";
-  version = "0.6.0";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yuvadm";
     repo = "viewstate";
     tag = "v${version}";
-    sha256 = "sha256-cXT5niE3rNdqmNqnITWy9c9/MF0gZ6LU2i1uzfOzkUI=";
+    sha256 = "sha256-fvqz03rKkA2WVVXU74eo0otnuRseE83cv6pw3rMso34=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ setuptools ];
 
   nativeCheckInputs = [
     pytestCheckHook

From 3e3428712c2b8976a9f2903587b0665bc11a7b20 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:47 +0200
Subject: [PATCH 1390/3724] python3Packages.virtualenv: 20.31.2 -> 20.33.1

https://github.com/pypa/virtualenv/blob/20.33.1/docs/changelog.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/virtualenv/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index e058d36035cb..5d26d7d54820 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "20.31.2";
+  version = "20.33.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4QwKnQKDXlklIb5IszK2yu5oh/MywRGqeaCbnnnvwq8=";
+    hash = "sha256-G0RHjZ4mGz+4uqXnSgyjvA4F8hqjYWe/nL+FDlQnZbg=";
   };
 
   nativeBuildInputs = [
@@ -69,9 +69,12 @@ buildPythonPackage rec {
     "test_seed_link_via_app_data"
     # Permission Error
     "test_bad_exe_py_info_no_raise"
+    # https://github.com/pypa/virtualenv/issues/2933
+    # https://github.com/pypa/virtualenv/issues/2939
+    "test_py_info_cache_invalidation_on_py_info_change"
   ]
   ++ lib.optionals (pythonOlder "3.11") [ "test_help" ]
-  ++ lib.optionals (isPyPy) [
+  ++ lib.optionals isPyPy [
     # encoding problems
     "test_bash"
     # permission error

From c2f687d14f41ee0db11b6f585d409391bee5ab3a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:47 +0200
Subject: [PATCH 1391/3724] python3Packages.viser: 1.0.0 -> 1.0.3

https://github.com/nerfstudio-project/viser/releases/tag/v1.0.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/viser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/viser/default.nix b/pkgs/development/python-modules/viser/default.nix
index 8ae02805aefb..211c755e1ed7 100644
--- a/pkgs/development/python-modules/viser/default.nix
+++ b/pkgs/development/python-modules/viser/default.nix
@@ -50,14 +50,14 @@
 
 buildPythonPackage rec {
   pname = "viser";
-  version = "1.0.0";
+  version = "1.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nerfstudio-project";
     repo = "viser";
     tag = "v${version}";
-    hash = "sha256-itFJ9mlN2VaWbLzQp1ERMxBvXg0O7SMWzEWDdxoTA/0=";
+    hash = "sha256-zufWYq4HvkmbSawTq8G7TheWNpspRL/dptyLuGnUQ2U=";
   };
 
   postPatch = ''

From ab704df9ab4da297f510a25e9962bd47a5cecde5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:48 +0200
Subject: [PATCH 1392/3724] python3Packages.wagtail: 6.4.1 -> 7.1

https://github.com/wagtail/wagtail/blob/v7.1/CHANGELOG.txt

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/wagtail/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix
index fe49bbaf53a6..18e4aba217eb 100644
--- a/pkgs/development/python-modules/wagtail/default.nix
+++ b/pkgs/development/python-modules/wagtail/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "wagtail";
-  version = "6.4.1";
+  version = "7.1";
   pyproject = true;
 
   # The GitHub source requires some assets to be compiled, which in turn
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   # until https://github.com/wagtail/wagtail/pull/13136 gets merged.
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zsPm1JIKbRePoetvSvgLNw/dVXDtkkuXkQThV/EMoJc=";
+    hash = "sha256-4d4q+Ctiy/TTt3qTxVd5vGetezF5trT4JOxPIU1XDAE=";
   };
 
   build-system = [

From 8e305e411f198ceeded31a00e5a3398a63e15e89 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:49 +0200
Subject: [PATCH 1393/3724] python3Packages.weasyprint: 65.1 -> 66.0

https://github.com/Kozea/WeasyPrint/releases/tag/v66.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/weasyprint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index 84f96cdfc1e7..47c6a12e51fb 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "weasyprint";
-  version = "65.1";
+  version = "66.0";
   pyproject = true;
 
   __darwinAllowLocalNetworking = true;
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     owner = "Kozea";
     repo = "WeasyPrint";
     tag = "v${version}";
-    hash = "sha256-iSeuRX1dnnrGZbcb1yTxOJPD5kgIWY6oz/0v02QJqSs=";
+    hash = "sha256-wmEDVEbikBpOQ5394IBPWQRjWZOLfMzEGxTtq4tt2Tw=";
   };
 
   patches = [
@@ -108,7 +108,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "weasyprint" ];
 
   meta = {
-    changelog = "https://github.com/Kozea/WeasyPrint/releases/tag/v${version}";
+    changelog = "https://github.com/Kozea/WeasyPrint/releases/tag/${src.tag}";
     description = "Converts web documents to PDF";
     mainProgram = "weasyprint";
     homepage = "https://weasyprint.org/";

From f8c4605ddc87772642bf7abfdc5e7874315d7539 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:50 +0200
Subject: [PATCH 1394/3724] python3Packages.weatherflow4py: 1.3.1 -> 1.4.1

https://github.com/jeeftor/weatherflow4py/releases/tag/v1.4.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/weatherflow4py/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix
index 192263120598..627eae7a30a2 100644
--- a/pkgs/development/python-modules/weatherflow4py/default.nix
+++ b/pkgs/development/python-modules/weatherflow4py/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to interact with the WeatherFlow REST API";
     homepage = "https://github.com/jeeftor/weatherflow4py";
-    changelog = "https://github.com/jeeftor/weatherflow4py/releases/tag/v${version}";
+    changelog = "https://github.com/jeeftor/weatherflow4py/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From 87c18a0c968f0bde0cb634c1c9717afd77e42f51 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:50 +0200
Subject: [PATCH 1395/3724] python3Packages.weaviate-client: 4.12.0 -> 4.16.5

https://github.com/weaviate/weaviate-python-client/releases/tag/v4.16.5

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/weaviate-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix
index 69fd64c3b8c5..6f94a76e928b 100644
--- a/pkgs/development/python-modules/weaviate-client/default.nix
+++ b/pkgs/development/python-modules/weaviate-client/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "weaviate-client";
-  version = "4.12.0";
+  version = "4.16.5";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "weaviate";
     repo = "weaviate-python-client";
     tag = "v${version}";
-    hash = "sha256-7Mg6d7gbBQfbkxsZI6aGVpfdhBS6MwmK6cl/8koy46k=";
+    hash = "sha256-AjZZ9kmVxePlomX6bXUohZZXl2IXMbrjG00qNlGdjRc=";
   };
 
   pythonRelaxDeps = [

From a7a3a003095235976d13e5dae1e241f6388782ff Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:51 +0200
Subject: [PATCH 1396/3724] python3Packages.webssh: 1.6.2 -> 1.6.3

https://github.com/huashengdun/webssh/releases/tag/v1.6.3

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/webssh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix
index deb657038054..ae4043556e20 100644
--- a/pkgs/development/python-modules/webssh/default.nix
+++ b/pkgs/development/python-modules/webssh/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "webssh";
-  version = "1.6.2";
+  version = "1.6.3";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mRestRJukaf7ti3vIs/MM/R+zpGmK551j5HAM2chBsE=";
+    hash = "sha256-K85buvIGrTRZEMfk3IAks8QY5oHJ9f8JjxgCvv924QA=";
   };
 
   patches = [

From 5ddc7d276f732c1f5a16f93c2f85f61280118fe2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:52 +0200
Subject: [PATCH 1397/3724] python3Packages.webtest: 3.0.4 -> 3.0.6

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/webtest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix
index 1759284570c1..9d5773b6c407 100644
--- a/pkgs/development/python-modules/webtest/default.nix
+++ b/pkgs/development/python-modules/webtest/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "webtest";
-  version = "3.0.4";
+  version = "3.0.6";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lHeNGaN+Wr1ziNrU2Th0QQ7M7VOhc5qOX/Lby6HPwMQ=";
+    hash = "sha256-Qlb9UkJEj1bFdby5r+J14wWm8HI8SwFDjb3U3VNElEs=";
   };
 
   build-system = [ setuptools ];

From baed23c5ecd48a6f2f13439992916cdd1b9a4068 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:52 +0200
Subject: [PATCH 1398/3724] python3Packages.wgpu-py: 0.22.2 -> 0.23.0

https://github.com/pygfx/wgpu-py/blob/v0.23.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/wgpu-py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/wgpu-py/default.nix b/pkgs/development/python-modules/wgpu-py/default.nix
index e951f5a30933..0760ef3f2270 100644
--- a/pkgs/development/python-modules/wgpu-py/default.nix
+++ b/pkgs/development/python-modules/wgpu-py/default.nix
@@ -38,14 +38,14 @@
 }:
 buildPythonPackage rec {
   pname = "wgpu-py";
-  version = "0.22.2";
+  version = "0.23.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pygfx";
     repo = "wgpu-py";
     tag = "v${version}";
-    hash = "sha256-HGpOEsTj4t57z38qKF6i1oUj7R7aFl8Xgk5y0TtgyMg=";
+    hash = "sha256-z9MRnhPSI+9lGS0UQ5VnSwdCGdYdNnqlDQmb8JAqmyc=";
   };
 
   postPatch =

From adb747c3d1de6b762b390aaaf1601f2b4006ddc8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:53 +0200
Subject: [PATCH 1399/3724] python3Packages.whisperx: 3.3.2 -> 3.4.2

https://github.com/m-bain/whisperX/releases/tag/v3.4.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/whisperx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/whisperx/default.nix b/pkgs/development/python-modules/whisperx/default.nix
index e08506532d80..72883f63cf76 100644
--- a/pkgs/development/python-modules/whisperx/default.nix
+++ b/pkgs/development/python-modules/whisperx/default.nix
@@ -35,14 +35,14 @@ let
 in
 buildPythonPackage rec {
   pname = "whisperx";
-  version = "3.3.2";
+  version = "3.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "m-bain";
     repo = "whisperX";
     tag = "v${version}";
-    hash = "sha256-JJa8gUQjIcgJ5lug3ULGkHxkl66qnXkiUA3SwwUVpqk=";
+    hash = "sha256-7MjrtvZGWfgtdQNotzdVMjj0sYfab/6PLQcZCOoqoNM=";
   };
 
   build-system = [ setuptools ];

From 355d7f8b6d26f41f0a4347dbd5bb9a7007c1fa6d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:54 +0200
Subject: [PATCH 1400/3724] python3Packages.wn: 0.11.0 -> 0.13.0

https://github.com/goodmami/wn/blob/v0.13.0/CHANGELOG.md

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/wn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/wn/default.nix b/pkgs/development/python-modules/wn/default.nix
index b742ee5902b4..6637038c34a5 100644
--- a/pkgs/development/python-modules/wn/default.nix
+++ b/pkgs/development/python-modules/wn/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "wn";
-  version = "0.11.0";
+  version = "0.13.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TDvTNh+5cxgBoy9nuXItHOdtfbsP+3F16egZjUBSpak=";
+    hash = "sha256-wOaFLlFCNUo7RWWiMXRuztyVJTXpJtPvZJi9d6UmkcY=";
   };
 
   build-system = [ hatchling ];

From faf688b2ebefc52c0a53ba6005d10e46569d221b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:54 +0200
Subject: [PATCH 1401/3724] python3Packages.wrf-python: 1.3.4.1 -> 1.4.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/wrf-python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix
index 0bac9b4da09e..ce8dfd259aab 100644
--- a/pkgs/development/python-modules/wrf-python/default.nix
+++ b/pkgs/development/python-modules/wrf-python/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "wrf-python";
-  version = "1.3.4.1";
+  version = "1.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "NCAR";
     repo = "wrf-python";
     tag = "v${version}";
-    hash = "sha256-4iIs/M9fzGJsnKCDSl09OTUoh7j6REBXuutE5uXFe3k=";
+    hash = "sha256-LvNorZ28j/O8fs9z6jhYWC8RcCDIwh7k5iR9iumCvnQ=";
   };
 
   nativeBuildInputs = [ gfortran ];

From 19838408c4ea51fbdd733ac2920e317369fd7282 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:55 +0200
Subject: [PATCH 1402/3724] python3Packages.x-transformers: 2.5.6 -> 2.6.1

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/x-transformers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/x-transformers/default.nix b/pkgs/development/python-modules/x-transformers/default.nix
index ffdc30857b50..9aae527a124d 100644
--- a/pkgs/development/python-modules/x-transformers/default.nix
+++ b/pkgs/development/python-modules/x-transformers/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "x-transformers";
-  version = "2.5.6";
+  version = "2.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lucidrains";
     repo = "x-transformers";
     tag = version;
-    hash = "sha256-9PUOPcTm2xvtKV4T2lAGu/3BiQZzSlwo43i0x1gbrAM=";
+    hash = "sha256-UDZBN/k1VDnfxv1t4EpvXJ6rfC0XgGCWSFBaCGN43E0=";
   };
 
   build-system = [ hatchling ];

From 030c3b8509bd6b9327759b976b0a0f2be401b8b6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:55 +0200
Subject: [PATCH 1403/3724] python3Packages.xarray: 2025.04.0 -> 2025.07.1

https://github.com/pydata/xarray/blob/v2025.07.1/doc/whats-new.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/xarray/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index b089e18cb966..012d46b52a06 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "xarray";
-  version = "2025.04.0";
+  version = "2025.07.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "pydata";
     repo = "xarray";
     tag = "v${version}";
-    hash = "sha256-HEad3+JvLeBl4/vUFzTTdHz3Y4QjwvnycVkb9gV/8Qk=";
+    hash = "sha256-UvBRGYZFkjxUYT+S4By+7xQZW6h0usQ26iFeJvWcxo0=";
   };
 
   postPatch = ''

From 2883cd82a4cc3e077f8828c168f7471f6b1ff19d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:56 +0200
Subject: [PATCH 1404/3724] python3Packages.xgrammar: 0.1.19 -> 0.1.22

https://github.com/mlc-ai/xgrammar/releases/tag/v0.1.22

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/xgrammar/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/xgrammar/default.nix b/pkgs/development/python-modules/xgrammar/default.nix
index 66022da38e27..9f653da2d179 100644
--- a/pkgs/development/python-modules/xgrammar/default.nix
+++ b/pkgs/development/python-modules/xgrammar/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "xgrammar";
-  version = "0.1.19";
+  version = "0.1.22";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     repo = "xgrammar";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-0b2tJx1D/2X/uosbthHfevUpTCBtuSKNlxOKyidTotA=";
+    hash = "sha256-mz6eabETkAzDoPjXE5VJvgrR1vnXXmx3JO4xZRH4TRQ=";
   };
 
   patches = [
@@ -92,7 +92,7 @@ buildPythonPackage rec {
   meta = {
     description = "Efficient, Flexible and Portable Structured Generation";
     homepage = "https://xgrammar.mlc.ai";
-    changelog = "https://github.com/mlc-ai/xgrammar/releases/tag/v${version}";
+    changelog = "https://github.com/mlc-ai/xgrammar/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
   };
 }

From 5d9a55cb23cca2701b68a680b5812cdb79ef4c18 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:58 +0200
Subject: [PATCH 1405/3724] python3Packages.xmlschema: 4.0.1 -> 4.1.0

https://github.com/sissaschool/xmlschema/blob/v4.1.0/CHANGELOG.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/xmlschema/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix
index 9e27d760c19e..be3f1ecb12ec 100644
--- a/pkgs/development/python-modules/xmlschema/default.nix
+++ b/pkgs/development/python-modules/xmlschema/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "xmlschema";
-  version = "4.0.1";
+  version = "4.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "sissaschool";
     repo = "xmlschema";
     tag = "v${version}";
-    hash = "sha256-J2A1dBLo5LtO1ldRuopfTjaew38B27D4wE+y387bQvs=";
+    hash = "sha256-3nvl49rlwQpNARmWBSw+faL+yNGqNecokjGGpnaC8a0=";
   };
 
   build-system = [ setuptools ];

From 8735358901584ed9f1d7fda7efc9a0dd3ed118ab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:58 +0200
Subject: [PATCH 1406/3724] python3Packages.xmlsec: 1.3.15 -> 1.3.16

https://github.com/xmlsec/python-xmlsec/releases/tag/1.3.16

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/xmlsec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix
index 7df8431b77ce..159500e51baf 100644
--- a/pkgs/development/python-modules/xmlsec/default.nix
+++ b/pkgs/development/python-modules/xmlsec/default.nix
@@ -16,12 +16,12 @@
 
 buildPythonPackage rec {
   pname = "xmlsec";
-  version = "1.3.15";
+  version = "1.3.16";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uqhWuD0AEuJ45vbL7JasgSjeZnyp+pou6wLHUugW9tg=";
+    hash = "sha256-K2xwVExtHUygBqqjFJWODvNRTcgf/94bI/LsQaV5H50=";
   };
 
   build-system = [ setuptools-scm ];

From 7d5e67c6e1378240cc6b60fbd4e454eb5bd9fb87 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:59 +0200
Subject: [PATCH 1407/3724] python3Packages.xvfbwrapper: 0.2.10 -> 0.2.13

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/xvfbwrapper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix
index 2b7e7d63cb53..966e4f18b4be 100644
--- a/pkgs/development/python-modules/xvfbwrapper/default.nix
+++ b/pkgs/development/python-modules/xvfbwrapper/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "xvfbwrapper";
-  version = "0.2.10";
+  version = "0.2.13";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1mLPjyZu/T0KHAIu67jSwECD1uh/2BOS+1QA2VA27Yw=";
+    sha256 = "sha256-ouR2yaTxlzf+Ky0LgB5m8P9wH9oz2YakvzTdxBR1QQI=";
   };
   propagatedBuildInputs = [ xorg.xvfb ];
 

From fcb6141a3b7bd41d9b511a1306e0e14ba701de77 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:44:59 +0200
Subject: [PATCH 1408/3724] python3Packages.xyzservices: 2025.1.0 -> 2025.4.0

https://github.com/geopandas/xyzservices/releases/tag/2025.4.0

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/xyzservices/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix
index 347e5f0b6296..c96c0c65d028 100644
--- a/pkgs/development/python-modules/xyzservices/default.nix
+++ b/pkgs/development/python-modules/xyzservices/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "xyzservices";
-  version = "2025.1.0";
+  version = "2025.4.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XNuwkHwgvhvgZsbi3GnGRYQtEROk6D5kIGVgSiHyVLo=";
+    hash = "sha256-b+dkcTZI+sU0UPvGGjw2bLauUzWhsq4MN5a0ld43Cdg=";
   };
 
   nativeBuildInputs = [

From f7e5cf02720ed94bbeca84d291687619bc857812 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:45:01 +0200
Subject: [PATCH 1409/3724] python3Packages.youseedee: 0.6.0 -> 0.7.0

This commit was automatically generated using update-python-libraries.
---
 .../0001-use-packaged-unicode-data.patch      | 35 ++++++++-----------
 .../python-modules/youseedee/default.nix      |  6 ++--
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch b/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch
index a1bc6fd92cc6..88a2e10b7096 100644
--- a/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch
+++ b/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch
@@ -1,33 +1,26 @@
 diff --git a/lib/youseedee/__init__.py b/lib/youseedee/__init__.py
-index 8db9c5f..9ad6618 100644
+index 5e73ef8..2cdbdd0 100644
 --- a/lib/youseedee/__init__.py
 +++ b/lib/youseedee/__init__.py
-@@ -38,12 +38,7 @@ UCD_URL = "https://unicode.org/Public/UCD/latest/ucd/UCD.zip"
+@@ -38,19 +38,12 @@ UCD_URL = "https://unicode.org/Public/UCD/latest/ucd/UCD.zip"
  
  def ucd_dir():
      """Return the directory where Unicode data is stored"""
--    ucddir = expanduser("~/.youseedee")
--    try:
--        os.mkdir(ucddir)
--    except FileExistsError:
--        pass
--    return ucddir
-+    return "@ucd_dir@"
+-    return Path(platformdirs.user_cache_dir("youseedee", ensure_exists=True))
++    return Path("@ucd_dir@")
  
  
- def up_to_date():
-@@ -65,14 +60,6 @@ def up_to_date():
- 
  def ensure_files():
      """Ensure the Unicode data files are downloaded and up to date, and download them if not"""
--    if not os.path.isfile(os.path.join(ucd_dir(), "UnicodeData.txt")):
--        download_files()
--    if not up_to_date():
--        # Remove the zip if it exists
--        zip_path = os.path.join(ucd_dir(), "UCD.zip")
--        if os.path.isfile(zip_path):
--            os.unlink(zip_path)
--        download_files()
-     return
+-    file_lock = FileLock(ucd_dir() / ".youseedee_ensure_files.lock")
+-    with file_lock:
+-        if not (ucd_dir() / "UnicodeData.txt").is_file():
+-            _download_files()
+-        if not _up_to_date():
+-            # Remove the zip if it exists
+-            (ucd_dir() / "UCD.zip").unlink(missing_ok=True)
+-            _download_files()
++    return
  
  
+ def _up_to_date():
diff --git a/pkgs/development/python-modules/youseedee/default.nix b/pkgs/development/python-modules/youseedee/default.nix
index 6117e329d62a..26b2bfe877be 100644
--- a/pkgs/development/python-modules/youseedee/default.nix
+++ b/pkgs/development/python-modules/youseedee/default.nix
@@ -7,17 +7,18 @@
   setuptools-scm,
   filelock,
   requests,
+  platformdirs,
   unicode-character-database,
 }:
 
 buildPythonPackage rec {
   pname = "youseedee";
-  version = "0.6.0";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9w6yr28zq0LgOvMp5fCFaHGOwK4wbbDo/g1jH4Uky0E=";
+    hash = "sha256-b5gxBIr/mowzlG4/N0C22S1XTq0NAGTq1/+iMUfxD18=";
   };
 
   patches = [
@@ -36,6 +37,7 @@ buildPythonPackage rec {
   dependencies = [
     filelock
     requests
+    platformdirs
   ];
 
   # Package has no unit tests, but we can check an example as per README.rst:

From 95953278141a1cd4106cb02033ccfe535ed38bdf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:45:02 +0200
Subject: [PATCH 1410/3724] python3Packages.youtube-transcript-api: 1.0.3 ->
 1.2.2

https://github.com/jdepoix/youtube-transcript-api/releases/tag/v1.2.2

This commit was automatically generated using update-python-libraries.
---
 .../youtube-transcript-api/default.nix           | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix
index 4942bd2492bc..fe35393e7f92 100644
--- a/pkgs/development/python-modules/youtube-transcript-api/default.nix
+++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "youtube-transcript-api";
-  version = "1.0.3";
+  version = "1.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "jdepoix";
     repo = "youtube-transcript-api";
     tag = "v${version}";
-    hash = "sha256-MDa19rI5DaIzrrEt7uNQ5+xSFkRXI5iwt/u5UNvT1f4=";
+    hash = "sha256-nr8WeegMv7zSqlzcLSG224O9fRXA6jIlYQN4vV6lW24=";
   };
 
   build-system = [ poetry-core ];
@@ -40,6 +40,18 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  preCheck = ''
+    export PATH=$out/bin:$PATH
+  '';
+
+  disabledTests = [
+    # network access
+    "test_fetch__create_consent_cookie_if_needed"
+    "test_fetch__with_generic_proxy_reraise_when_blocked"
+    "test_fetch__with_proxy_retry_when_blocked"
+    "test_fetch__with_webshare_proxy_reraise_when_blocked"
+  ];
+
   pythonImportsCheck = [ "youtube_transcript_api" ];
 
   meta = with lib; {

From aca264faf364f8347a77ccd87001beca111650ee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:45:03 +0200
Subject: [PATCH 1411/3724] python3Packages.z3c-checkversions: 2.1 -> 3.0

https://github.com/zopefoundation/z3c.checkversions/blob/3.0/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/z3c-checkversions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix
index 400d22584451..838192b4b258 100644
--- a/pkgs/development/python-modules/z3c-checkversions/default.nix
+++ b/pkgs/development/python-modules/z3c-checkversions/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "z3c-checkversions";
-  version = "2.1";
+  version = "3.0";
   format = "setuptools";
 
   # distutils usage
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "z3c.checkversions";
-    hash = "sha256-j5So40SyJf7XfCz3P9YFR/6z94up3LY2/dfEmmIbxAk=";
+    hash = "sha256-VMGSlocgEddBrUT0A4ihtCdhSbirWYe9FmQ0QyOGOEs=";
   };
 
   propagatedBuildInputs = [ zc-buildout ];

From e684d9d9eac93c50ac3d71ea2dee85146cf6462f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:45:03 +0200
Subject: [PATCH 1412/3724] python3Packages.zdaemon: 5.1 -> 5.2.1

https://github.com/zopefoundation/zdaemon/blob/5.2.1/CHANGES.rst

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/zdaemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix
index 58b4fccde1e7..5501429c8367 100644
--- a/pkgs/development/python-modules/zdaemon/default.nix
+++ b/pkgs/development/python-modules/zdaemon/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "zdaemon";
-  version = "5.1";
+  version = "5.2.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Iun+UFDq67ngPZrWTk9jzNheBMOP2zUc8RO+9vaNt6Q=";
+    hash = "sha256-8GwsfK9RnHYINPj+JuVzWVDVAX9y1cII3IsZABQFlM0=";
   };
 
   build-system = [ setuptools ];

From 0832a363402e1ac629052d3f25486015f5af809d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:45:06 +0200
Subject: [PATCH 1413/3724] python3Packages.zimports: 0.6.1 -> 0.6.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/zimports/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix
index f5d50241a881..4d1a4f1902c4 100644
--- a/pkgs/development/python-modules/zimports/default.nix
+++ b/pkgs/development/python-modules/zimports/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "zimports";
-  version = "0.6.1";
+  version = "0.6.2";
   format = "setuptools";
 
   # upstream technically support 3.7 through 3.9, but 3.10 happens to work while 3.11 breaks with an import error
@@ -22,8 +22,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sqlalchemyorg";
     repo = "zimports";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-+sDvl8z0O0cZyS1oZgt924hlOkYeHiStpXL9y9+JZ5I=";
+    tag = "v${version}";
+    hash = "sha256-yI/ZTNqVIu76xivXJ+MoLpPupf0RQjQOnP6OWMPajBo=";
   };
 
   propagatedBuildInputs = [

From fa980c23117a15bcb7a2b13832ad7cb257d42e19 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:45:06 +0200
Subject: [PATCH 1414/3724] python3Packages.zipp: 3.21.0 -> 3.23.0

This commit was automatically generated using update-python-libraries.
---
 .../python-modules/zipp/default.nix           | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix
index d7b11ad7a8ab..f7c9a5ad3149 100644
--- a/pkgs/development/python-modules/zipp/default.nix
+++ b/pkgs/development/python-modules/zipp/default.nix
@@ -1,27 +1,35 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   func-timeout,
   jaraco-itertools,
-  pythonOlder,
+  setuptools,
   setuptools-scm,
 }:
 
 let
   zipp = buildPythonPackage rec {
     pname = "zipp";
-    version = "3.21.0";
-    format = "pyproject";
+    version = "3.23.0";
+    pyproject = true;
 
-    disabled = pythonOlder "3.7";
-
-    src = fetchPypi {
-      inherit pname version;
-      hash = "sha256-LJlY9kMKIEA0GlLrYI7W3ZPvQ5LgL/4hlBfBsotd0fQ=";
+    src = fetchFromGitHub {
+      owner = "jaraco";
+      repo = "zipp";
+      tag = "v${version}";
+      hash = "sha256-iao7Aco1Ktvyt1uQCD/le4tAdyVpxfKPi3TRT12YHuU=";
     };
 
-    nativeBuildInputs = [ setuptools-scm ];
+    postPatch = ''
+      # Downloads license text at build time
+      sed -i "/coherent\.licensed/d" pyproject.toml
+    '';
+
+    build-system = [
+      setuptools
+      setuptools-scm
+    ];
 
     # Prevent infinite recursion with pytest
     doCheck = false;

From 3fcab748b569d7d21ce3d745a887a29f383e5e5d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 04:45:07 +0200
Subject: [PATCH 1415/3724] python3Packages.zstd: 1.5.6.6 -> 1.5.7.2

This commit was automatically generated using update-python-libraries.
---
 pkgs/development/python-modules/zstd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix
index fd1333d09201..32b453396b34 100644
--- a/pkgs/development/python-modules/zstd/default.nix
+++ b/pkgs/development/python-modules/zstd/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "zstd";
-  version = "1.5.6.6";
+  version = "1.5.7.2";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-gixLZXXc0waR695lRUJbUcFOwbLlGfaE70sNBhaSEIg=";
+    hash = "sha256-bYaExpAJvknhsY7CUaXrDX4k+TYkmQqKEkodpmqS/Io=";
   };
 
   postPatch = ''

From bce0bb82a075e59e42090e0810670f065a2f8c91 Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Tue, 17 Jun 2025 21:10:47 +0700
Subject: [PATCH 1416/3724] python3Minimal: refactor - add withMinimal flag

simplifies the interface of building cpython minimally
---
 .../interpreters/python/cpython/default.nix   | 69 +++++++++++--------
 .../interpreters/python/default.nix           | 32 +--------
 2 files changed, 43 insertions(+), 58 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index ec6d55011bad..e3874a4b8d42 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -12,17 +12,23 @@
   pkg-config,
   python-setup-hook,
 
+  # high level switches
+  withMinimalDeps ? false,
+
   # runtime dependencies
   bzip2,
-  withExpat ? true,
+  withExpat ? !withMinimalDeps,
   expat,
   libffi,
   libuuid,
+  withLibxcrypt ? !withMinimalDeps,
   libxcrypt,
-  withMpdecimal ? true,
+  withMpdecimal ? !withMinimalDeps,
   mpdecimal,
   ncurses,
+  withOpenssl ? !withMinimalDeps,
   openssl,
+  withSqlite ? !withMinimalDeps,
   sqlite,
   xz,
   zlib,
@@ -35,12 +41,12 @@
   # optional dependencies
   bluezSupport ? false,
   bluez,
-  mimetypesSupport ? true,
+  mimetypesSupport ? !withMinimalDeps,
   mailcap,
   tzdata,
-  withGdbm ? !stdenv.hostPlatform.isWindows,
+  withGdbm ? !withMinimalDeps && !stdenv.hostPlatform.isWindows,
   gdbm,
-  withReadline ? !stdenv.hostPlatform.isWindows,
+  withReadline ? !withMinimalDeps && !stdenv.hostPlatform.isWindows,
   readline,
   x11Support ? false,
   tcl,
@@ -63,13 +69,13 @@
   sourceVersion,
   hash,
   passthruFun,
-  stripConfig ? false,
-  stripIdlelib ? false,
-  stripTests ? false,
-  stripTkinter ? false,
-  rebuildBytecode ? true,
+  stripConfig ? withMinimalDeps,
+  stripIdlelib ? withMinimalDeps,
+  stripTests ? withMinimalDeps,
+  stripTkinter ? withMinimalDeps,
+  rebuildBytecode ? !withMinimalDeps,
   stripBytecode ? true,
-  includeSiteCustomize ? true,
+  includeSiteCustomize ? !withMinimalDeps,
   static ? stdenv.hostPlatform.isStatic,
   enableFramework ? false,
   noldconfigPatch ? ./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch",
@@ -85,7 +91,8 @@
 
   # enabling LTO on 32bit arch causes downstream packages to fail when linking
   enableLTO ?
-    stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.is64bit && stdenv.hostPlatform.isLinux),
+    !withMinimalDeps
+    && (stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.is64bit && stdenv.hostPlatform.isLinux)),
 
   # enable asserts to ensure the build remains reproducible
   reproducibleBuild ? false,
@@ -97,7 +104,9 @@
   testers,
 
   # allow pythonMinimal to prevent accidental dependencies it doesn't want
-  allowedReferenceNames ? [ ],
+  # Having this as an option is useful to allow overriding, eg. adding things to
+  # python3Minimal
+  allowedReferenceNames ? if withMinimalDeps then [ "bashNonInteractive" ] else [ ],
 
 }@inputs:
 
@@ -140,12 +149,12 @@ let
     ;
 
   # mixes libc and libxcrypt headers and libs and causes segfaults on importing crypt
-  libxcrypt = if stdenv.hostPlatform.isFreeBSD then null else inputs.libxcrypt;
+  libxcrypt = if stdenv.hostPlatform.isFreeBSD && withMinimalDeps then null else inputs.libxcrypt;
 
   buildPackages = pkgsBuildHost;
   inherit (passthru) pythonOnBuildForHost;
 
-  tzdataSupport = tzdata != null && passthru.pythonAtLeast "3.9";
+  tzdataSupport = !withMinimalDeps && tzdata != null && passthru.pythonAtLeast "3.9";
 
   passthru =
     let
@@ -223,19 +232,22 @@ let
       ];
 
   buildInputs = lib.filter (p: p != null) (
-    [
+    optionals (!withMinimalDeps) [
       bzip2
       libffi
       libuuid
-      libxcrypt
       ncurses
-      openssl
-      sqlite
       xz
       zlib
     ]
-    ++ optionals (passthru.pythonAtLeast "3.14") [
-      zstd
+    ++ optionals withLibxcrypt [
+      libxcrypt
+    ]
+    ++ optionals withOpenssl [
+      openssl
+    ]
+    ++ optionals withSqlite [
+      sqlite
     ]
     ++ optionals withMpdecimal [
       mpdecimal
@@ -243,6 +255,9 @@ let
     ++ optionals withExpat [
       expat
     ]
+    ++ optionals (passthru.pythonAtLeast "3.14") [
+      zstd
+    ]
     ++ optionals bluezSupport [
       bluez
     ]
@@ -435,7 +450,7 @@ stdenv.mkDerivation (finalAttrs: {
   env = {
     CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs);
     LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs);
-    LIBS = "${optionalString (!stdenv.hostPlatform.isDarwin && libxcrypt != null) "-lcrypt"}";
+    LIBS = "${optionalString (!stdenv.hostPlatform.isDarwin && withLibxcrypt) "-lcrypt"}";
     NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) (
       {
         "glibc" = "-lgcc_s";
@@ -457,7 +472,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals withMpdecimal [
     "--with-system-libmpdec"
   ]
-  ++ optionals (openssl != null) [
+  ++ optionals withOpenssl [
     "--with-openssl=${openssl.dev}"
   ]
   ++ optionals tzdataSupport [
@@ -484,10 +499,10 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals enableDebug [
     "--with-pydebug"
   ]
-  ++ optionals (sqlite != null) [
+  ++ optionals withSqlite [
     "--enable-loadable-sqlite-extensions"
   ]
-  ++ optionals (libxcrypt != null) [
+  ++ optionals withLibxcrypt [
     "CFLAGS=-I${libxcrypt}/include"
     "LIBS=-L${libxcrypt}/lib"
   ]
@@ -592,7 +607,7 @@ stdenv.mkDerivation (finalAttrs: {
         [
           (placeholder "out")
         ]
-        ++ lib.optional (libxcrypt != null) libxcrypt
+        ++ lib.optional withLibxcrypt libxcrypt
         ++ lib.optional tzdataSupport tzdata
       );
     in
@@ -758,7 +773,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Enforce that we don't have references to the OpenSSL -dev package, which we
   # explicitly specify in our configure flags above.
   disallowedReferences =
-    lib.optionals (openssl != null && !static && !enableFramework) [
+    lib.optionals (withOpenssl && !static && !enableFramework) [
       openssl.dev
     ]
     ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 322de044a111..9679b39a2890 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -105,37 +105,7 @@
           inherit passthruFun;
           pythonAttr = "python3Minimal";
           # strip down that python version as much as possible
-          openssl = null;
-          readline = null;
-          ncurses = null;
-          gdbm = null;
-          sqlite = null;
-          tzdata = null;
-          libuuid = null;
-          bzip2 = null;
-          libxcrypt = null;
-          xz = null;
-          zlib = null;
-          libffi = null;
-          stripConfig = true;
-          stripIdlelib = true;
-          stripTests = true;
-          stripTkinter = true;
-          rebuildBytecode = false;
-          stripBytecode = true;
-          includeSiteCustomize = false;
-          enableOptimizations = false;
-          enableLTO = false;
-          mimetypesSupport = false;
-          withExpat = false;
-          withMpdecimal = false;
-          /*
-            The actual 'allowedReferences' attribute is set inside the cpython derivation.
-            This is necessary in order to survive overrides of dependencies.
-          */
-          allowedReferenceNames = [
-            "bashNonInteractive"
-          ];
+          withMinimalDeps = true;
         }
         // sources.python313
       )).overrideAttrs

From 9edd40908d9eb3d602eeba9af92f135b373f24e5 Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Tue, 17 Jun 2025 22:14:56 +0700
Subject: [PATCH 1417/3724] python3Minimal: remove pkg-config dependency

Removes the build time dependency on pkg-config if python3 is build with the `withMinimal` flag enabled

This change is driven by the motivation to use python3 earlier in stdenv for hooks.
---
 .../interpreters/python/cpython/default.nix            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index e3874a4b8d42..abdf0a1ceb22 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -209,13 +209,15 @@ let
   nativeBuildInputs = [
     nukeReferences
   ]
-  ++ optionals (!stdenv.hostPlatform.isDarwin) [
+  ++ optionals (!stdenv.hostPlatform.isDarwin && !withMinimalDeps) [
     autoconf-archive # needed for AX_CHECK_COMPILE_FLAG
     autoreconfHook
   ]
-  ++ optionals (!stdenv.hostPlatform.isDarwin || passthru.pythonAtLeast "3.14") [
-    pkg-config
-  ]
+  ++
+    optionals ((!stdenv.hostPlatform.isDarwin || passthru.pythonAtLeast "3.14") && !withMinimalDeps)
+      [
+        pkg-config
+      ]
   ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     buildPackages.stdenv.cc
     pythonOnBuildForHost

From 761b037b8fbd677dccadd776d5c0b354ae6ddab0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 14:56:08 +0200
Subject: [PATCH 1418/3724] python3Packages.setuptools-scm: 8.3.1 -> 9.0.1

https://github.com/pypa/setuptools_scm/blob/9.0.1/CHANGELOG.md
---
 pkgs/development/python-modules/setuptools-scm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix
index e8eb947c1830..a576af2ce364 100644
--- a/pkgs/development/python-modules/setuptools-scm/default.nix
+++ b/pkgs/development/python-modules/setuptools-scm/default.nix
@@ -19,13 +19,13 @@
 
 buildPythonPackage rec {
   pname = "setuptools-scm";
-  version = "8.3.1";
+  version = "9.0.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "setuptools_scm";
     inherit version;
-    hash = "sha256-PVVekrddrNA30yuv35T5evUeoprox7I0z5S3pb0kKmM=";
+    hash = "sha256-RuHPfooJZSthP5uk/ptV8vSW56Iz5OANJafLQflMPAs=";
   };
 
   postPatch =

From 158db6734856ca359418a860f6e3e5e6774985e4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 16:10:05 +0200
Subject: [PATCH 1419/3724] python3Packages.urllib3: unpin setuptools-scm

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

diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index dc548d262b59..8a98c2c5bd59 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -37,6 +37,11 @@ let
       hatch-vcs
     ];
 
+    postPatch = ''
+      substituteInPlace pyproject.toml \
+        --replace-fail ', "setuptools-scm>=8,<9"' ""
+    '';
+
     optional-dependencies = {
       brotli = if isPyPy then [ brotlicffi ] else [ brotli ];
       socks = [ pysocks ];

From 8d254a910b5a67a5fed8a8621c5a061045b840b9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 5 Aug 2025 23:33:30 +0200
Subject: [PATCH 1420/3724] python3Packages.cachetools: 5.5.2 -> 6.1.0

https://github.com/tkem/cachetools/blob/v6.1.0/CHANGELOG.rst
---
 pkgs/development/python-modules/cachetools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix
index 4411b9c91bf1..39923013689a 100644
--- a/pkgs/development/python-modules/cachetools/default.nix
+++ b/pkgs/development/python-modules/cachetools/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "cachetools";
-  version = "5.5.2";
+  version = "6.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "tkem";
     repo = "cachetools";
     tag = "v${version}";
-    hash = "sha256-CWgl2UW7+rBXRQ6N/QY3vJiLsrPfmplmQbxPp2vcdU0=";
+    hash = "sha256-o3Ice6w7Ovot+nsmTpsl/toosZuVbi9RvRGs07W4H0Y=";
   };
 
   build-system = [ setuptools ];

From 5c58dace029e08b9630ba2a4dd418cf0dad5e533 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 00:18:33 +0200
Subject: [PATCH 1421/3724] python3Packages.nbformat: ignore unraisable
 exceptions during tests

---
 pkgs/development/python-modules/nbformat/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
index 7c31e3e4acc7..2274c41496dd 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -46,13 +46,7 @@ buildPythonPackage rec {
     testpath
   ];
 
-  disabledTestPaths = lib.optionals (pythonAtLeast "3.13") [
-    # ResourceWarning: unclosed database in <sqlite3.Connection object at 0x7ffff54954e0>
-    "tests/test_validator.py"
-    "tests/v4/test_convert.py"
-    "tests/v4/test_json.py"
-    "tests/v4/test_validate.py"
-  ];
+  pytestFlags = [ "-Wignore::pytest.PytestUnraisableExceptionWarning" ];
 
   # Some of the tests use localhost networking.
   __darwinAllowLocalNetworking = true;

From 9589985109df57a6b29c1e76b7830ba4a6dbf637 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 01:38:22 +0200
Subject: [PATCH 1422/3724] python3Packages.fnv-hash-fast: relax fnvhash
 constraint

---
 pkgs/development/python-modules/fnv-hash-fast/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/fnv-hash-fast/default.nix b/pkgs/development/python-modules/fnv-hash-fast/default.nix
index ec767a4a1620..98ad5d699e0a 100644
--- a/pkgs/development/python-modules/fnv-hash-fast/default.nix
+++ b/pkgs/development/python-modules/fnv-hash-fast/default.nix
@@ -31,6 +31,8 @@ buildPythonPackage rec {
 
   dependencies = [ fnvhash ];
 
+  pythonRelaxDeps = [ "fnvhash" ];
+
   pythonImportsCheck = [ "fnv_hash_fast" ];
 
   nativeCheckInputs = [

From 129eb9eb80d22512865f02ad94200d53377f6c9c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 02:26:44 +0200
Subject: [PATCH 1423/3724] python3Packages.pytest-aiohttp: ignore pytest
 deprecation warnings

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

diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix
index 5ef7d3de55ae..79df48b8250f 100644
--- a/pkgs/development/python-modules/pytest-aiohttp/default.nix
+++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix
@@ -38,6 +38,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  pytestFlags = [ "-Wignore::pytest.PytestDeprecationWarning" ];
+
   meta = with lib; {
     homepage = "https://github.com/aio-libs/pytest-aiohttp/";
     changelog = "https://github.com/aio-libs/pytest-aiohttp/blob/${src.rev}/CHANGES.rst";

From 34f9c7ae4fe62935c8480b30ea899d0aee27738b Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Tue, 5 Aug 2025 23:10:22 +0200
Subject: [PATCH 1424/3724] python3Packages.pynitrokey: 0.9.3 -> 0.10.0

https://github.com/Nitrokey/pynitrokey/releases/tag/v0.10.0
---
 .../python-modules/pynitrokey/default.nix     | 39 +++++++------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix
index 962589b47a4b..187d08594334 100644
--- a/pkgs/development/python-modules/pynitrokey/default.nix
+++ b/pkgs/development/python-modules/pynitrokey/default.nix
@@ -4,33 +4,27 @@
   fetchPypi,
   installShellFiles,
   libnitrokey,
-  flit-core,
-  certifi,
+  poetry-core,
   cffi,
   click,
   cryptography,
-  ecdsa,
   fido2,
+  hidapi,
   intelhex,
   nkdfu,
-  python-dateutil,
   pyusb,
   requests,
   tqdm,
   tlv8,
-  typing-extensions,
-  click-aliases,
   semver,
   nethsm,
-  importlib-metadata,
   nitrokey,
   pyscard,
-  asn1crypto,
 }:
 
 let
   pname = "pynitrokey";
-  version = "0.9.3";
+  version = "0.10.0";
   mainProgram = "nitropy";
 in
 
@@ -40,49 +34,42 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-nZBgKJfRIte/KyHqdBLe6spudJW7livyA9OvdZ4/q4o=";
+    hash = "sha256-Kr6VtBADLvXUva7csbsHujGzBfRG1atJLF7qbIWmToM=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  build-system = [ flit-core ];
+  build-system = [ poetry-core ];
 
   dependencies = [
-    certifi
     cffi
     click
     cryptography
-    ecdsa
     fido2
+    hidapi
     intelhex
     nkdfu
-    python-dateutil
+    nitrokey
     pyusb
     requests
     tqdm
     tlv8
-    typing-extensions
-    click-aliases
     semver
     nethsm
-    importlib-metadata
-    nitrokey
-    pyscard
-    asn1crypto
   ];
 
-  pythonRelaxDeps = true;
+  optional-dependencies = {
+    pcsc = [
+      pyscard
+    ];
+  };
 
-  # pythonRelaxDepsHook runs in postBuild so cannot be used
-  pypaBuildFlags = [ "--skip-dependency-check" ];
+  pythonRelaxDeps = true;
 
   # libnitrokey is not propagated to users of the pynitrokey Python package.
   # It is only usable from the wrapped bin/nitropy
   makeWrapperArgs = [ "--set LIBNK_PATH ${lib.makeLibraryPath [ libnitrokey ]}" ];
 
-  # no tests
-  doCheck = false;
-
   pythonImportsCheck = [ "pynitrokey" ];
 
   postInstall = ''

From 2e11500ee74a6079c6bbddd4d80cd9c79d26614f Mon Sep 17 00:00:00 2001
From: panicgh <79252025+panicgh@users.noreply.github.com>
Date: Wed, 6 Aug 2025 01:37:23 +0000
Subject: [PATCH 1425/3724] python3Packages.fido2: skip device tests (#431308)

By default, unit tests include hardware authenticator device tests. They
hang nixpkgs builds for a long time waiting for a touch of the
authenticator device. Skip such tests to avoid waiting.
---
 pkgs/development/python-modules/fido2/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix
index eb93e5a454a9..48bafe381f7d 100644
--- a/pkgs/development/python-modules/fido2/default.nix
+++ b/pkgs/development/python-modules/fido2/default.nix
@@ -5,7 +5,6 @@
   fetchPypi,
   poetry-core,
   pyscard,
-  pythonOlder,
   pytestCheckHook,
 }:
 
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "2.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-MGHNBec7Og72r8O4A9V8gmqi1qlzLRar1ydzYfWOeWQ=";
@@ -33,7 +30,10 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  unittestFlagsArray = [ "-v" ];
+  pytestFlags = [
+    "-v"
+    "--no-device"
+  ];
 
   pythonImportsCheck = [ "fido2" ];
 

From 44e023f9654bce3301a2ba27efdf476a1b05aa98 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 03:35:46 +0200
Subject: [PATCH 1426/3724] python3Packages.psycopg: relax deps and clean up

---
 .../python-modules/psycopg/default.nix            | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index d1812889b663..d50a40738b06 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchurl,
-  pythonOlder,
   replaceVars,
 
   # build
@@ -69,6 +68,9 @@ let
     # move into source root after patching
     postPatch = ''
       cd psycopg_c
+
+      substituteInPlace pyproject.toml \
+        --replace-fail "Cython >= 3.0.0, < 3.1.0" "Cython"
     '';
 
     nativeBuildInputs = [
@@ -116,9 +118,7 @@ in
 
 buildPythonPackage rec {
   inherit pname version src;
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   outputs = [
     "out"
@@ -143,15 +143,15 @@ buildPythonPackage rec {
   '';
 
   nativeBuildInputs = [
-    furo
     setuptools
-    shapely
   ]
   # building the docs fails with the following error when cross compiling
   #  AttributeError: module 'psycopg_c.pq' has no attribute '__impl__'
   ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
+    furo
     sphinx-autodoc-typehints
     sphinxHook
+    shapely
   ];
 
   propagatedBuildInputs = [
@@ -209,9 +209,6 @@ buildPythonPackage rec {
     # Mypy typing test
     "tests/test_typing.py"
     "tests/crdb/test_typing.py"
-    # https://github.com/psycopg/psycopg/pull/915
-    "tests/test_notify.py"
-    "tests/test_notify_async.py"
   ];
 
   pytestFlags = [

From 35bc0bc48129393f530ad9a2f16fd9940b126552 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 03:45:47 +0200
Subject: [PATCH 1427/3724] python3Packages.oauthlib: disable failing test

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

diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix
index 224a1eb15394..c34c9ccfc667 100644
--- a/pkgs/development/python-modules/oauthlib/default.nix
+++ b/pkgs/development/python-modules/oauthlib/default.nix
@@ -7,8 +7,6 @@
   mock,
   pyjwt,
   pytestCheckHook,
-  pythonAtLeast,
-  pythonOlder,
   setuptools,
 
   # for passthru.tests
@@ -23,8 +21,6 @@ buildPythonPackage rec {
   version = "3.3.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "oauthlib";
     repo = "oauthlib";
@@ -49,6 +45,11 @@ buildPythonPackage rec {
   ]
   ++ lib.flatten (lib.attrValues optional-dependencies);
 
+  disabledTests = [
+    # too narrow time comparison issues
+    "test_fetch_access_token"
+  ];
+
   pythonImportsCheck = [ "oauthlib" ];
 
   passthru.tests = {

From 7e0fe3a270f2a2b21d4b3d05bbce355fcb327060 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 04:02:55 +0200
Subject: [PATCH 1428/3724] python3Packages.pytest-benchmark: remove xdist

This causes internal errors with pytest 8.4.
---
 pkgs/development/python-modules/pytest-benchmark/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix
index 7fca87e44542..1b14abd0d189 100644
--- a/pkgs/development/python-modules/pytest-benchmark/default.nix
+++ b/pkgs/development/python-modules/pytest-benchmark/default.nix
@@ -12,7 +12,6 @@
   pygal,
   pytest,
   pytestCheckHook,
-  pytest-xdist,
   pythonAtLeast,
   pythonOlder,
   setuptools,
@@ -56,7 +55,6 @@ buildPythonPackage rec {
     mercurial
     nbmake
     pytestCheckHook
-    pytest-xdist
   ]
   ++ lib.flatten (lib.attrValues optional-dependencies);
 

From f4cce2be074abc8631eae6de17f72cbeb5bd67c8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 04:22:32 +0200
Subject: [PATCH 1429/3724] python3Packages.black: fix click 8.2 compat

---
 .../python-modules/black/default.nix          | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix
index 2dbdeb9906af..70fac527e59e 100644
--- a/pkgs/development/python-modules/black/default.nix
+++ b/pkgs/development/python-modules/black/default.nix
@@ -3,6 +3,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  fetchpatch,
   pythonOlder,
   pytestCheckHook,
   aiohttp,
@@ -35,6 +36,24 @@ buildPythonPackage rec {
     hash = "sha256-M0ltXNEiKtczkTUrSujaFSU8Xeibk6gLPiyNmhnsJmY=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "click-8.2-compat-1.patch";
+      url = "https://github.com/psf/black/commit/14e1de805a5d66744a08742cad32d1660bf7617a.patch";
+      hash = "sha256-fHRlMetE6+09MKkuFNQQr39nIKeNrqwQuBNqfIlP4hc=";
+    })
+    (fetchpatch {
+      name = "click-8.2-compat-2.patch";
+      url = "https://github.com/psf/black/commit/ed64d89faa7c738c4ba0006710f7e387174478af.patch";
+      hash = "sha256-df/J6wiRqtnHk3mAY3ETiRR2G4hWY1rmZMfm2rjP2ZQ=";
+    })
+    (fetchpatch {
+      name = "click-8.2-compat-3.patch";
+      url = "https://github.com/psf/black/commit/b0f36f5b4233ef4cf613daca0adc3896d5424159.patch";
+      hash = "sha256-SGLCxbgrWnAi79IjQOb2H8mD/JDbr2SGfnKyzQsJrOA=";
+    })
+  ];
+
   nativeBuildInputs = [
     hatch-fancy-pypi-readme
     hatch-vcs

From 87dfd9b45260b101f67ec004aac60293ae939534 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 04:29:03 +0200
Subject: [PATCH 1430/3724] python3Packages.requests-oauthlib: disable failing
 test

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

diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix
index 27b2ae885573..2cb1259f9315 100644
--- a/pkgs/development/python-modules/requests-oauthlib/default.nix
+++ b/pkgs/development/python-modules/requests-oauthlib/default.nix
@@ -30,11 +30,13 @@ buildPythonPackage rec {
     requests-mock
   ];
 
-  # Exclude tests which require network access
   disabledTests = [
+    # Exclude tests which require network access
     "testCanPostBinaryData"
     "test_content_type_override"
     "test_url_is_native_str"
+    # too narrow time comparison
+    "test_fetch_access_token"
   ];
 
   # Requires selenium and chrome

From 90d1c27ea5330b4c618b1fc05c5df9d11d6ec09b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 04:30:48 +0200
Subject: [PATCH 1431/3724] python3Packages.volvooncall: pin to pytest-asyncio
 0.x

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

diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix
index bb630bbe02ed..deaa8c466f37 100644
--- a/pkgs/development/python-modules/volvooncall/default.nix
+++ b/pkgs/development/python-modules/volvooncall/default.nix
@@ -9,7 +9,7 @@
   fetchpatch,
   geopy,
   mock,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytestCheckHook,
   pythonOlder,
 }:
@@ -53,7 +53,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     mock
-    pytest-asyncio
+    pytest-asyncio_0
     pytestCheckHook
   ]
   ++ optional-dependencies.mqtt;

From 430531f1a19aa1aa59286b92bcf8038e41e6b166 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 04:48:01 +0200
Subject: [PATCH 1432/3724] python3Packages.google-auth: relax cachetools
 constraint

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

diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index b5677af717a9..e0389c8f8f41 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -64,6 +64,8 @@ buildPythonPackage rec {
     requests = [ requests ];
   };
 
+  pythonRelaxDeps = [ "cachetools" ];
+
   nativeCheckInputs = [
     aioresponses
     flask

From 56a5f4798957125c5e5df7bf464a9a1918ba0877 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 04:54:41 +0200
Subject: [PATCH 1433/3724] python3Packages.aws-xray-sdk: pin pytest-asyncio
 0.x and disable failing tests

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

diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix
index 4b509361fb92..ee6ad97f7207 100644
--- a/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix
@@ -10,7 +10,7 @@
   importlib-metadata,
   jsonpickle,
   pymysql,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pynamodb,
   pytestCheckHook,
   pythonOlder,
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     httpx
     pymysql
     pynamodb
-    pytest-asyncio
+    pytest-asyncio_0
     pytestCheckHook
     sqlalchemy
     webtest
@@ -64,6 +64,8 @@ buildPythonPackage rec {
     # We don't care about benchmarks
     "tests/test_local_sampling_benchmark.py"
     "tests/test_patcher.py"
+    # async def functions are not natively supported.
+    "tests/test_async_recorder.py"
   ];
 
   pythonImportsCheck = [ "aws_xray_sdk" ];

From 0cd08cff360ff859df792ded15a48f0aa9566fda Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 16:45:04 +0200
Subject: [PATCH 1434/3724] Revert "python3Packages.click: 8.1.8 -> 8.2.2"

This reverts commit ab14a5defe0b15296f6abd1dbf4f8328472ceaea.

Backed out due to breakages in click-repl, which breaks celery.
---
 .../python-modules/click/default.nix            | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index 28d22e503e90..ec105f1ef7d5 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+  importlib-metadata,
   pytestCheckHook,
 
   # large-rebuild downstream dependencies and applications
@@ -16,28 +17,26 @@
 
 buildPythonPackage rec {
   pname = "click";
-  version = "8.2.2";
+  version = "8.1.8";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "pallets";
     repo = "click";
     tag = version;
-    hash = "sha256-cBvibVZKCppFJiRS8MNc3YT1JxmlXhRci7LHsrd4JGs=";
+    hash = "sha256-pAAqf8jZbDfVZUoltwIFpov/1ys6HSYMyw3WV2qcE/M=";
   };
 
   build-system = [ flit-core ];
+  dependencies = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
-  nativeCheckInputs = [
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTests = [
-    # for some reason the tests fail to execute cat, even though they run with less just fine,
-    # even adding coreutils to nativeCheckInputs explicitly does not change anything
-    "test_echo_via_pager"
+    # test fails with filename normalization on zfs
+    "test_file_surrogates"
   ];
 
   passthru.tests = {

From 95e106c7f465a481b8e232b84421d486595e5654 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 18:02:01 +0200
Subject: [PATCH 1435/3724] python3Packages.remarshal: add testing hint

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

diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix
index 45b745d0f887..e7c64d8354ad 100644
--- a/pkgs/development/python-modules/remarshal/default.nix
+++ b/pkgs/development/python-modules/remarshal/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "remarshal";
-  version = "1.0.0";
+  version = "1.0.0"; # test with `nix-build pkgs/pkgs-lib/format`
   pyproject = true;
 
   src = fetchFromGitHub {

From 5629eae134f378631f54ce0609218824b135fc46 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 18:10:59 +0200
Subject: [PATCH 1436/3724] python3Packages.audioop-lts: 0.2.1 -> 0.2.2

https://github.com/AbstractUmbra/audioop/releases/tag/0.2.2
---
 pkgs/development/python-modules/audioop-lts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/audioop-lts/default.nix b/pkgs/development/python-modules/audioop-lts/default.nix
index 63db1dbfc60b..726ceca435c0 100644
--- a/pkgs/development/python-modules/audioop-lts/default.nix
+++ b/pkgs/development/python-modules/audioop-lts/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "audioop-lts";
-  version = "0.2.1";
+  version = "0.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "AbstractUmbra";
     repo = "audioop";
     tag = version;
-    hash = "sha256-tx5/dcyEfHlYRohfYW/t0UkLiZ9LJHmI8g3sC3+DGAE=";
+    hash = "sha256-C1z24kH5t0RSVqjT8SBdrilMtVs7pTI1vd+iwMk3RXE=";
   };
 
   build-system = [ setuptools ];

From c46ec160f64440701923fb1a12c834b4d3a04708 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 18:45:15 +0200
Subject: [PATCH 1437/3724] python3Packages.aresponses: pin pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix
index 5c8c98177b69..d3557ea7278e 100644
--- a/pkgs/development/python-modules/aresponses/default.nix
+++ b/pkgs/development/python-modules/aresponses/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytestCheckHook,
   setuptools,
 }:
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   dependencies = [
     aiohttp
-    pytest-asyncio
+    pytest-asyncio_0
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];

From 1814a67405fcc4d3fd6fa5af121ad41bd2cbbead Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 18:51:30 +0200
Subject: [PATCH 1438/3724] python3Packages.backoff: pin to pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix
index a068a640914b..1d7cb898d244 100644
--- a/pkgs/development/python-modules/backoff/default.nix
+++ b/pkgs/development/python-modules/backoff/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   poetry-core,
   pytestCheckHook,
-  pytest-asyncio,
+  pytest-asyncio_0,
   responses,
 }:
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ poetry-core ];
 
   nativeCheckInputs = [
-    pytest-asyncio
+    pytest-asyncio_0
     pytestCheckHook
     responses
   ];

From 3444c54f4816e2e063005b73f59bffae6628454d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 18:55:38 +0200
Subject: [PATCH 1439/3724] python3Packages.pytest-bdd: pin to pytest7

This package requires an update, which depends on the introduction of the
gherkin parser/compiler (https://github.com/cucumber/gherkin).
---
 pkgs/development/python-modules/pytest-bdd/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix
index 0bd4ae71d8b0..df3b22f92089 100644
--- a/pkgs/development/python-modules/pytest-bdd/default.nix
+++ b/pkgs/development/python-modules/pytest-bdd/default.nix
@@ -7,7 +7,7 @@
   parse-type,
   poetry-core,
   pytest,
-  pytestCheckHook,
+  pytest7CheckHook,
   pythonOlder,
   typing-extensions,
 }:
@@ -37,7 +37,8 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  # requires an update for pytest 8.4 compat
+  nativeCheckInputs = [ pytest7CheckHook ];
 
   preCheck = ''
     export PATH=$PATH:$out/bin

From ad471b0375fd61cc1a12065c9f3fa644ef3bc9ae Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 6 Aug 2025 20:18:20 +0200
Subject: [PATCH 1440/3724] python3Packages.remarshal: 1.0.0 -> 1.0.1

https://github.com/remarshal-project/remarshal/releases/tag/v1.0.1
---
 pkgs/development/python-modules/remarshal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix
index e7c64d8354ad..e6d70e5dad6a 100644
--- a/pkgs/development/python-modules/remarshal/default.nix
+++ b/pkgs/development/python-modules/remarshal/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "remarshal";
-  version = "1.0.0"; # test with `nix-build pkgs/pkgs-lib/format`
+  version = "1.0.1"; # test with `nix-build pkgs/pkgs-lib/format`
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dbohdan";
     repo = "remarshal";
     tag = "v${version}";
-    hash = "sha256-14vkLX7wKi+AYv2wPeHJ7MhKBKp+GB3oHWqxiPdkQhs=";
+    hash = "sha256-7Gng/Oc9dwtWx4Xej6hf5IuUGM9/E9Hk9QTntqWk/Z0=";
   };
 
   build-system = [ poetry-core ];

From 11bd9861678d87bc2494cc24dabd679b634e8843 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 02:22:50 +0200
Subject: [PATCH 1441/3724] python3Packages.promise: disable failing test

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

diff --git a/pkgs/development/python-modules/promise/default.nix b/pkgs/development/python-modules/promise/default.nix
index ee6df45657a9..d182becf95be 100644
--- a/pkgs/development/python-modules/promise/default.nix
+++ b/pkgs/development/python-modules/promise/default.nix
@@ -46,6 +46,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # Failed: async def functions are not natively supported
+    "test_issue_9_safe"
+  ];
+
   disabledTestPaths = [ "tests/test_benchmark.py" ];
 
   pythonImportsCheck = [ "promise" ];

From 5ecd9ebf8968a18ecc91759f773be4f3fba10237 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 02:36:03 +0200
Subject: [PATCH 1442/3724] python3Packages.botocore: 1.38.32 -> 1.40.4

https://github.com/boto/botocore/blob/1.40.4/CHANGELOG.rst
---
 pkgs/development/python-modules/boto3/default.nix    | 2 +-
 pkgs/development/python-modules/botocore/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 39b5dd0c3cad..05ba5ae02f3b 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "boto";
     repo = "boto3";
     tag = version;
-    hash = "sha256-3NK9xp58w+Wrhs/i7eXLF/P9Dwadptrr4LlpV6MRbGM=";
+    hash = "sha256-+3UcnKgDIA9PPELnB70La+Lo03SMouVLzvLQ9zyFGsE=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 742b4bc893d8..49a89d8e3253 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.38.32"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.40.4"; # N.B: if you change this, change boto3 and awscli to a matching version
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "boto";
     repo = "botocore";
     tag = version;
-    hash = "sha256-KW9EAeunL3+pccGsrFitonc5EHdm2Cd+7dM3kdvdkvM=";
+    hash = "sha256-VJAd9aCJkwSyurAWF/YAVRcSTR+9ZbkH7H6LZGvcXYY=";
   };
 
   build-system = [

From 2a96d6f7fa19b5547283be8b26bb6f6edff5976b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 02:37:24 +0200
Subject: [PATCH 1443/3724] python3Packages.s3transfer: 0.13.0 -> 0.13.1

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

diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix
index cb6206734643..5ee2504ae640 100644
--- a/pkgs/development/python-modules/s3transfer/default.nix
+++ b/pkgs/development/python-modules/s3transfer/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "s3transfer";
-  version = "0.13.0";
+  version = "0.13.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "boto";
     repo = "s3transfer";
     tag = version;
-    hash = "sha256-Ou3U7IPGJdK9exOLMgPFoTbOQi9IA+ivoGVOygB4ACE=";
+    hash = "sha256-NDm1Lc0PXW1hbNftwdM2b87wFXSCBPCxZmwcRFmIyY8=";
   };
 
   build-system = [

From a55d4a1f6645d6a76598f8d7a99ab684e63eac6e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 02:38:59 +0200
Subject: [PATCH 1444/3724] awscli: 1.40.31 -> 1.42.4

https://github.com/aws/aws-cli/blob/1.42.4/CHANGELOG.rst
---
 pkgs/by-name/aw/awscli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/awscli/package.nix b/pkgs/by-name/aw/awscli/package.nix
index 39cc67df9f87..298f46a9773c 100644
--- a/pkgs/by-name/aw/awscli/package.nix
+++ b/pkgs/by-name/aw/awscli/package.nix
@@ -14,14 +14,14 @@ let
     pname = "awscli";
     # N.B: if you change this, change botocore and boto3 to a matching version too
     # check e.g. https://github.com/aws/aws-cli/blob/1.33.21/setup.py
-    version = "1.40.31";
+    version = "1.42.4";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "aws";
       repo = "aws-cli";
       tag = version;
-      hash = "sha256-BjQyA7uK9F/5myPXsMpD0HZK69Se3WveYMHNCzhVNKc=";
+      hash = "sha256-vkQFhSsK9MWhp+jvomkVdjxXuBOH4GnFgz/9jtPRNIs=";
     };
 
     pythonRelaxDeps = [

From b8a9e09ea93dab2ef50fd744b83c9526732da82a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 02:42:34 +0200
Subject: [PATCH 1445/3724] python3Packages.terminado: ignore unraisable
 exceptions during tests

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

diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix
index 7773844c2feb..6b266e62ee74 100644
--- a/pkgs/development/python-modules/terminado/default.nix
+++ b/pkgs/development/python-modules/terminado/default.nix
@@ -34,6 +34,7 @@ buildPythonPackage rec {
     pytest-timeout
     pytestCheckHook
   ];
+  pytestFlags = [ "-Wignore::pytest.PytestUnraisableExceptionWarning" ];
 
   meta = with lib; {
     description = "Terminals served by Tornado websockets";

From d12e433dded585a88d4e5f1890b6e3131f3db8f5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 02:52:54 +0200
Subject: [PATCH 1446/3724] python3Packages.pytest-describe: modernize, pin to
 pytest7

---
 .../pytest-describe/default.nix               | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix
index 6ce782c44200..6eb2b8390b2c 100644
--- a/pkgs/development/python-modules/pytest-describe/default.nix
+++ b/pkgs/development/python-modules/pytest-describe/default.nix
@@ -1,13 +1,16 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
 
-  # build
+  # build-system
+  setuptools,
+
+  # dependencies
   pytest,
 
   # tests
-  pytestCheckHook,
+  pytest7CheckHook,
 }:
 
 let
@@ -16,16 +19,21 @@ let
 in
 buildPythonPackage {
   inherit pname version;
-  format = "setuptools";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ObsF65DySX2co0Lvmgt/pbraflhQWuwz9m1mHWMZVbc=";
+  src = fetchFromGitHub {
+    owner = "pytest-dev";
+    repo = "pytest-describe";
+    tag = version;
+    hash = "sha256-ih0XkYOtB+gwUsgo1oSti2460P3gq3tR+UsyRlzMjLE=";
   };
 
+  build-system = [ setuptools ];
+
   buildInputs = [ pytest ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  # test_fixture breaks with pytest 8.4
+  nativeCheckInputs = [ pytest7CheckHook ];
 
   meta = with lib; {
     description = "Describe-style plugin for the pytest framework";

From 8ff4762a88525298a31a50ea21baa911672cba55 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 03:25:38 +0200
Subject: [PATCH 1447/3724] python3Packages.dj-rest-auth: disable failing tests

---
 pkgs/development/python-modules/dj-rest-auth/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix
index a00c31ab7aed..5191ff624b78 100644
--- a/pkgs/development/python-modules/dj-rest-auth/default.nix
+++ b/pkgs/development/python-modules/dj-rest-auth/default.nix
@@ -81,6 +81,9 @@ buildPythonPackage rec {
   disabledTests = [
     # Test connects to graph.facebook.com
     "TestSocialLoginSerializer"
+    # claim[user_id] is "1" (str) vs 1 (int)
+    "test_custom_jwt_claims"
+    "test_custom_jwt_claims_cookie_w_authentication"
   ];
 
   disabledTestPaths = [

From f961abb7a9cf1bf544b67627b797f6b6c19545e0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 03:38:52 +0200
Subject: [PATCH 1448/3724] pretalx: pin django-csp at 3.8

---
 pkgs/by-name/pr/pretalx/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix
index 0f684765681a..bd6aa3dec1f9 100644
--- a/pkgs/by-name/pr/pretalx/package.nix
+++ b/pkgs/by-name/pr/pretalx/package.nix
@@ -4,6 +4,7 @@
   gettext,
   python3,
   fetchFromGitHub,
+  fetchPypi,
   plugins ? [ ],
   nixosTests,
 }:
@@ -14,6 +15,15 @@ let
     packageOverrides = final: prev: {
       django = prev.django_5_1;
 
+      django-csp = prev.django-csp.overridePythonAttrs rec {
+        version = "3.8";
+        src = fetchPypi {
+          inherit version;
+          pname = "django_csp";
+          hash = "sha256-7w8an32Nporm4WnALprGYcDs8E23Dg0dhWQFEqaEccA=";
+        };
+      };
+
       django-extensions = prev.django-extensions.overridePythonAttrs {
         # Compat issues with Django 5.1
         # https://github.com/django-extensions/django-extensions/issues/1885

From 52fe5a3545fd4a19a8e8d0297b39cf7666d3a621 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 04:04:22 +0200
Subject: [PATCH 1449/3724] borgbackup: relax msgpack constraint

---
 pkgs/by-name/bo/borgbackup/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix
index a3a49005af9f..cdeb0d332a6b 100644
--- a/pkgs/by-name/bo/borgbackup/package.nix
+++ b/pkgs/by-name/bo/borgbackup/package.nix
@@ -4,6 +4,7 @@
   acl,
   e2fsprogs,
   fetchFromGitHub,
+  fetchpatch,
   libb2,
   lz4,
   openssh,
@@ -30,6 +31,14 @@ python.pkgs.buildPythonApplication rec {
     hash = "sha256-1RRizsHY6q1ruofTkRZ4sSN4k6Hoo+sG85w2zz+7yL8=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "allow-msgpack-1.1.1.patch";
+      url = "https://github.com/borgbackup/borg/commit/f6724bfef2515ed5bf66c9a0434655c60a82aae2.patch";
+      hash = "sha256-UfLaAFKEAHvbIR5WDYJY7bz3aiffdwAXJKfzZZU+NT8=";
+    })
+  ];
+
   postPatch = ''
     # sandbox does not support setuid/setgid/sticky bits
     substituteInPlace src/borg/testsuite/archiver.py \

From 1bf2f73c1b20cdc10bc6648cc5f02a61397719df Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 04:11:28 +0200
Subject: [PATCH 1450/3724] python3Packages.pyopenxl: update disabled tests

---
 .../python-modules/openpyxl/default.nix       | 27 +++----------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix
index e7c62ed57f02..f973232edbfd 100644
--- a/pkgs/development/python-modules/openpyxl/default.nix
+++ b/pkgs/development/python-modules/openpyxl/default.nix
@@ -6,8 +6,7 @@
   lxml,
   pandas,
   pillow,
-  pytest7CheckHook,
-  pythonAtLeast,
+  pytestCheckHook,
   pythonOlder,
   setuptools,
 }:
@@ -35,7 +34,7 @@ buildPythonPackage rec {
     lxml
     pandas
     pillow
-    pytest7CheckHook
+    pytestCheckHook
   ];
 
   pytestFlags = [
@@ -43,26 +42,8 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
-    # Tests broken since lxml 2.12; https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2116
-    "test_read"
-    "test_read_comments"
-    "test_ignore_external_blip"
-    "test_from_xml"
-    "test_filenames"
-    "test_exts"
-    "test_from_complex"
-    "test_merge_named_styles"
-    "test_unprotected_cell"
-    "test_none_values"
-    "test_rgb_colors"
-    "test_named_styles"
-    "test_read_ole_link"
-  ]
-  ++ lib.optionals (pythonAtLeast "3.11") [
-    "test_broken_sheet_ref"
-    "test_name_invalid_index"
-    "test_defined_names_print_area"
-    "test_no_styles"
+    # lxml 6.0
+    "test_iterparse"
   ];
 
   pythonImportsCheck = [ "openpyxl" ];

From d5142caf431459340d6c8aadb8e68f6ec26e6e27 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 04:16:25 +0200
Subject: [PATCH 1451/3724] Revert "python3Packages.pip-tools: 7.4.1 -> 7.5.0"

This reverts commit 8ae23cfe65db122a3360ee10995d5caa38b4b421.

Breaks home-assistant-chip-wheels.
---
 .../python-modules/pip-tools/default.nix      | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index a6d8c36cb48c..a5a04a886480 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   build,
   click,
-  fetchFromGitHub,
+  fetchPypi,
   pep517,
   pip,
   pytest-xdist,
@@ -19,16 +19,14 @@
 
 buildPythonPackage rec {
   pname = "pip-tools";
-  version = "7.5.0";
+  version = "7.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
-  src = fetchFromGitHub {
-    owner = "jazzband";
-    repo = "pip-tools";
-    tag = "v${version}";
-    hash = "sha256-F2SuuY2tN0HEbkWMBdGVuWBwu2onOdMDcWLal8jke2s=";
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-hkgm9Qc4ZEUOJNvuuFzjkgzfsJhIo9aev1N7Uh8UvMk=";
   };
 
   patches = [ ./fix-setup-py-bad-syntax-detection.patch ];
@@ -84,15 +82,6 @@ buildPythonPackage rec {
     "test_no_candidates"
     "test_no_candidates_pre"
     "test_failure_of_legacy_resolver_prompts_for_backtracking"
-
-    # ValueError: I/O operation on closed file.
-    "test_indentation"
-
-    # unexpected warnings due to legacy resolver deprecation
-    "test_show_warning_on_default_strip_extras_option"
-
-    # generator fails to yield
-    "test_compile_build_targets_setuptools_no_wheel_dep"
   ];
 
   pythonImportsCheck = [ "piptools" ];

From c6137ada4bb9492821c9ff54a3a7508a56f87a90 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 04:24:07 +0200
Subject: [PATCH 1452/3724] python3Packages.hijridate: rename from
 hijri-converter;  2.3.2.post1 -> 2.5.0

---
 .../python-modules/dateparser/default.nix     |  4 +-
 .../hijri-converter/default.nix               | 32 ----------------
 .../python-modules/hijridate/default.nix      | 38 +++++++++++++++++++
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 +-
 5 files changed, 42 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/development/python-modules/hijri-converter/default.nix
 create mode 100644 pkgs/development/python-modules/hijridate/default.nix

diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix
index 5fd9a6d5f6d3..a874c2575860 100644
--- a/pkgs/development/python-modules/dateparser/default.nix
+++ b/pkgs/development/python-modules/dateparser/default.nix
@@ -8,7 +8,7 @@
   pytz,
   regex,
   tzlocal,
-  hijri-converter,
+  hijridate,
   convertdate,
   fasttext,
   langdetect,
@@ -46,7 +46,7 @@ buildPythonPackage rec {
 
   optional-dependencies = {
     calendars = [
-      hijri-converter
+      hijridate
       convertdate
     ];
     fasttext = [ fasttext ];
diff --git a/pkgs/development/python-modules/hijri-converter/default.nix b/pkgs/development/python-modules/hijri-converter/default.nix
deleted file mode 100644
index ab4fa261ae1f..000000000000
--- a/pkgs/development/python-modules/hijri-converter/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  pytestCheckHook,
-  pythonOlder,
-}:
-
-buildPythonPackage rec {
-  pname = "hijri-converter";
-  version = "2.3.2.post1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-mGZXzNg6W+ryM85aIZZFdH6IXEXUgzvSqPobkn+jlXA=";
-  };
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  pythonImportsCheck = [ "hijri_converter" ];
-
-  meta = with lib; {
-    description = "Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar";
-    homepage = "https://github.com/dralshehri/hijri-converter";
-    changelog = "https://github.com/dralshehri/hijridate/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ hexa ];
-  };
-}
diff --git a/pkgs/development/python-modules/hijridate/default.nix b/pkgs/development/python-modules/hijridate/default.nix
new file mode 100644
index 000000000000..904159b7144a
--- /dev/null
+++ b/pkgs/development/python-modules/hijridate/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  hatch-fancy-pypi-readme,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "hijridate";
+  version = "2.5.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dralshehri";
+    repo = "hijridate";
+    tag = "v${version}";
+    hash = "sha256-IT5OnFDuNQ9tMfuZ5pFqnAPd7nspIfAmeN6Pqtn0OwA=";
+  };
+
+  build-system = [
+    hatchling
+    hatch-fancy-pypi-readme
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "hijridate" ];
+
+  meta = with lib; {
+    description = "Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar";
+    homepage = "https://github.com/dralshehri/hijridate";
+    changelog = "https://github.com/dralshehri/hijridate/blob/v${version}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 63fc54d115f8..788cfb18a309 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -326,6 +326,7 @@ mapAliases ({
   hcs_utils = hcs-utils; # added 2024-01-06
   hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
   hglib = python-hglib; # added 2023-10-13
+  hijri-converter = hijridate; # added 2025-08-07
   hkdf = throw "hkdf has been removed, as it is no longer maintained upstream."; # added 2024-10-04
   homeassistant-bring-api = bring-api; # added 2024-04-11
   homeassistant-pyozw = throw "homeassistant-pyozw has been removed, as it was packaged for home-assistant which has removed it as a dependency."; # added 2024-01-05
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5de0a66c0300..64439f17f7c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6546,7 +6546,7 @@ self: super: with self; {
 
   hightime = callPackage ../development/python-modules/hightime { };
 
-  hijri-converter = callPackage ../development/python-modules/hijri-converter { };
+  hijridate = callPackage ../development/python-modules/hijridate { };
 
   hikari = callPackage ../development/python-modules/hikari { };
 

From 556492854bf11bae486a97d9e1da092743460cb1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 04:38:10 +0200
Subject: [PATCH 1453/3724] esphome: relax wheel pin

---
 pkgs/by-name/es/esphome/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index ef77f7baaf53..2fcd40ed1bcc 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -61,7 +61,8 @@ python.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==80.9.0" "setuptools"
+      --replace-fail "setuptools==80.9.0" "setuptools" \
+      --replace-fail "wheel>=0.43,<0.46" "wheel"
   '';
 
   # Remove esptool and platformio from requirements

From 5aa98393315e6c763fd430cdfb7d205f8f34347b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 04:45:35 +0200
Subject: [PATCH 1454/3724] python3Packages.rapidfuzz: relax cython constraint

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

diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix
index d7ac4bcde75a..9803f449dc97 100644
--- a/pkgs/development/python-modules/rapidfuzz/default.nix
+++ b/pkgs/development/python-modules/rapidfuzz/default.nix
@@ -37,6 +37,11 @@ buildPythonPackage rec {
     })
   ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "Cython >=3.0.12, <3.1.0" Cython
+  '';
+
   build-system = [
     cmake
     cython

From 281b131d07f1c8c4f36837ee7e768be06b7f66ca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 04:55:41 +0200
Subject: [PATCH 1455/3724] python3Packages.peewee: 3.18.1 -> 3.18.2

https://github.com/coleifer/peewee/blob/3.18.2/CHANGELOG.md
---
 pkgs/development/python-modules/peewee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index 0d9e1f674072..ae485714ade8 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "peewee";
-  version = "3.18.1";
+  version = "3.18.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "coleifer";
     repo = "peewee";
     tag = version;
-    hash = "sha256-7MLDhMiW9LaedPMQ2QqSqos4SegzUmTX1joyV18MkEg=";
+    hash = "sha256-BIOY3vAHzSonxXYFmfFbVxbbUWnUVtcBRsTVMRo7peE=";
   };
 
   build-system = [ setuptools ];

From 998e8c4cbffc8c68dd9073130b4ce9b98d2499c4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 05:00:29 +0200
Subject: [PATCH 1456/3724] python3Packages.virtualenvwrapper: fix dist-info
 version

---
 .../python-modules/virtualenvwrapper/default.nix      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix
index 6466e08496f6..000e4c679220 100644
--- a/pkgs/development/python-modules/virtualenvwrapper/default.nix
+++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix
@@ -9,12 +9,14 @@
   virtualenv,
   virtualenv-clone,
   python,
+  setuptools,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "virtualenvwrapper";
   version = "6.1.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -24,6 +26,11 @@ buildPythonPackage rec {
   # pip depend on $HOME setting
   preConfigure = "export HOME=$TMPDIR";
 
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
   buildInputs = [
     pbr
     pip
@@ -78,7 +85,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Enhancements to virtualenv";
-    homepage = "https://pypi.python.org/pypi/virtualenvwrapper";
+    homepage = "https://github.com/python-virtualenvwrapper/virtualenvwrapper";
     license = licenses.mit;
   };
 }

From 832a7d00794682349fe27ec29b2a998d6d5116c4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 05:02:33 +0200
Subject: [PATCH 1457/3724] python3Packages.nettigo-air-monitor: fix dist-info
 version

---
 .../python-modules/nettigo-air-monitor/default.nix           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix
index ce41c43032bc..3a68b5330ef3 100644
--- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix
+++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix
@@ -29,6 +29,11 @@ buildPythonPackage rec {
     hash = "sha256-Lgtq+Jho2IkXnVLVlPRxL2hvhB8gW/9Et2yqXOkM8MI=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"'
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [

From a4064dc984a7969733c38d19278aaf23512be25a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 05:08:03 +0200
Subject: [PATCH 1458/3724] python3Packages.aiowebostv: fix dist-info version

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

diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix
index 2c8e20c3d8b4..e4f5283f5d93 100644
--- a/pkgs/development/python-modules/aiowebostv/default.nix
+++ b/pkgs/development/python-modules/aiowebostv/default.nix
@@ -21,6 +21,11 @@ buildPythonPackage rec {
     hash = "sha256-VBdHI6aGfhcgDdwspToHp3iNFQRT0Z+Fseq0eNdUwTo=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"'
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [ aiohttp ];

From e90f1cb151ac5ab8a928c2606f0cc448427abece Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 05:16:29 +0200
Subject: [PATCH 1459/3724] python3Packages.autobahn: pin to pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 18a6d7c98494..403bf76705e1 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -18,7 +18,7 @@
   pygobject3,
   pyopenssl,
   qrcode,
-  pytest-asyncio,
+  pytest-asyncio_0,
   python-snappy,
   pytestCheckHook,
   pythonOlder,
@@ -35,8 +35,6 @@ buildPythonPackage rec {
   version = "24.4.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "crossbario";
     repo = "autobahn-python";
@@ -63,7 +61,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     mock
-    pytest-asyncio
+    pytest-asyncio_0
     pytestCheckHook
   ]
   ++ optional-dependencies.scram

From a7fbed8c2cba5c1cc0ffe63459cc3ad93a1d0f72 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 05:17:50 +0200
Subject: [PATCH 1460/3724] python3Packages.yangson: relax elementpath
 constraint

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

diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix
index 2e82d5c33962..5705ef4dc312 100644
--- a/pkgs/development/python-modules/yangson/default.nix
+++ b/pkgs/development/python-modules/yangson/default.nix
@@ -27,6 +27,8 @@ buildPythonPackage rec {
     pyyaml
   ];
 
+  pythonRelaxDeps = [ "elementpath" ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "yangson" ];

From 1a92242aa5a7d01076f2b763e5599678697a79d9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 05:50:59 +0200
Subject: [PATCH 1461/3724] python3Packages.aiobotocore: disable failing test

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

diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix
index 3fc040672435..d9afb4a006cb 100644
--- a/pkgs/development/python-modules/aiobotocore/default.nix
+++ b/pkgs/development/python-modules/aiobotocore/default.nix
@@ -71,6 +71,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiobotocore" ];
 
+  disabledTests = [
+    # TypeError: sequence item 1: expected str instance, MagicMock found
+    "test_signers_generate_db_auth_token"
+  ];
+
   disabledTestPaths = [
     # Test requires network access
     "tests/test_version.py"

From d9a5b70e0a4bd9e6c503c496206119ce37f2254b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 06:04:23 +0200
Subject: [PATCH 1462/3724] python3Packages.django_5_2: 5.2.4 -> 5.2.5

https://docs.djangoproject.com/en/5.2/releases/5.2.5/
---
 pkgs/development/python-modules/django/5_2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5_2.nix
index 7d28672ec604..95ed0f2b0dfb 100644
--- a/pkgs/development/python-modules/django/5_2.nix
+++ b/pkgs/development/python-modules/django/5_2.nix
@@ -43,7 +43,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.2.4";
+  version = "5.2.5";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-0AtH3vyEeQUKep17j5koiUi/ACgLc9JLMxkwWovCkvE=";
+    hash = "sha256-1Lw0L+mPynf9CmioiTQhePgqCLniUkv9E0ZIoHhhBTs=";
   };
 
   patches = [

From 81a9641c7bd586ed4279d736786345e42ff63090 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 7 Aug 2025 14:41:43 +0200
Subject: [PATCH 1463/3724] python3Packages.openstep-plist: add patch for
 CPython >= 3.1 compat

---
 .../python-modules/openstep-plist/default.nix            | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix
index eca377b4b738..7bde570f3d48 100644
--- a/pkgs/development/python-modules/openstep-plist/default.nix
+++ b/pkgs/development/python-modules/openstep-plist/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  fetchpatch,
   cython,
   setuptools,
   setuptools-scm,
@@ -25,6 +26,14 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
+  patches = [
+    (fetchpatch {
+      name = "openstep-plist-cpython-3.1-compat.patch";
+      url = "https://github.com/fonttools/openstep-plist/commit/5467a2c3bed3004b79c70b5b288f33293c96742b.patch";
+      hash = "sha256-dKZgthvPgdnCKA0o70TBtvipwnBr4wcayvK8SFqwrbY=";
+    })
+  ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "openstep_plist" ];

From cd12b83a51afbbcd313d78351f11deb722b4ffbe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 14:23:39 +0200
Subject: [PATCH 1464/3724] python3Packages.sanic: disable failing tests

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

diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index 10fed42b4bda..94ce7ab55218 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -91,6 +91,8 @@ buildPythonPackage rec {
     "test_input_is_dir"
     # Racy, e.g. Address already in use
     "test_logger_vhosts"
+    # Event loop is closed
+    "test_create_server_trigger_events"
   ];
 
   disabledTestPaths = [
@@ -100,6 +102,8 @@ buildPythonPackage rec {
     "typing/test_typing.py"
     # occasionally hangs
     "test_multiprocessing.py"
+    # Failed: async def functions are not natively supported.
+    "test_touchup.py"
   ];
 
   # Avoid usage of nixpkgs-review in darwin since tests will compete usage

From aa1dc2cfa41319ab5628b5d1c74f3117b93680a2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 14:41:16 +0200
Subject: [PATCH 1465/3724] python3Packages.python-socketio: pin to older
 pytest

The test are very async heavy, but don't declare async markers, which
breaks with pytest 8.4.
---
 pkgs/development/python-modules/python-socketio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix
index bd85309718d6..cd621b30166d 100644
--- a/pkgs/development/python-modules/python-socketio/default.nix
+++ b/pkgs/development/python-modules/python-socketio/default.nix
@@ -18,7 +18,7 @@
 
   # tests
   msgpack,
-  pytestCheckHook,
+  pytest7CheckHook,
   simple-websocket,
   uvicorn,
 
@@ -53,7 +53,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     msgpack
-    pytestCheckHook
+    pytest7CheckHook
     uvicorn
     simple-websocket
   ]

From b4600de7946eed68a16b9f477693e0ebe0c9e8e0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 15:02:34 +0200
Subject: [PATCH 1466/3724] python3Packages.ansible-core: fix build

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

diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index 2b635f5160b0..12a897f95e98 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -47,9 +47,6 @@ buildPythonPackage rec {
   # the python interpreter again, as it would break execution of
   # connection plugins.
   postPatch = ''
-    substituteInPlace lib/ansible/executor/task_executor.py \
-      --replace "[python," "["
-
     patchShebangs --build packaging/cli-doc/build.py
 
     SETUPTOOLS_PATTERN='"setuptools[0-9 <>=.,]+"'
@@ -60,6 +57,9 @@ buildPythonPackage rec {
     else
       exit 2
     fi
+
+    substituteInPlace pyproject.toml \
+      --replace-fail "wheel == 0.45.1" wheel
   '';
 
   nativeBuildInputs = [

From a99a968638996975965553a1db3636d23ae34a85 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 15:10:07 +0200
Subject: [PATCH 1467/3724] python3Packages.zarr: 2.18.7 -> 3.1.1

https://zarr.readthedocs.io/en/stable/release-notes.html
---
 .../python-modules/zarr/default.nix           | 40 +++++++++++++------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix
index a203a9b2254c..755d64cc780d 100644
--- a/pkgs/development/python-modules/zarr/default.nix
+++ b/pkgs/development/python-modules/zarr/default.nix
@@ -2,47 +2,61 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
 
   # build-system
-  setuptools-scm,
+  hatchling,
+  hatch-vcs,
 
   # dependencies
-  asciitree,
+  donfig,
   numpy,
-  fasteners,
   numcodecs,
+  packaging,
+  typing-extensions,
 
   # tests
+  hypothesis,
+  pytest-asyncio,
+  pytest-xdist,
   pytestCheckHook,
+  tomlkit,
 }:
 
 buildPythonPackage rec {
   pname = "zarr";
-  version = "2.18.7";
+  version = "3.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-srj2bxTaxK9msYDSM4gZmBuYH3Dhlsmmbmv6qeWVcvU=";
+    hash = "sha256-F9ty838kiUUtITesiRxBM7j5dvkYnY79PnXzs63YTow=";
   };
 
   build-system = [
-    setuptools-scm
+    hatchling
+    hatch-vcs
   ];
 
   dependencies = [
-    asciitree
-    numpy
-    fasteners
+    donfig
     numcodecs
+    numpy
+    packaging
+    typing-extensions
   ]
-  ++ numcodecs.optional-dependencies.msgpack;
+  ++ numcodecs.optional-dependencies.crc32c;
 
   nativeCheckInputs = [
+    hypothesis
+    pytest-asyncio
+    pytest-xdist
     pytestCheckHook
+    tomlkit
+  ];
+
+  disabledTestPaths = [
+    # requires uv and then fails at setting up python envs
+    "tests/test_examples.py"
   ];
 
   pythonImportsCheck = [ "zarr" ];

From 9ddf5d682084481f4d08d5902a321c49b401dc1b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 15:26:54 +0200
Subject: [PATCH 1468/3724] python3Packages.icalendar: disable failing tests

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

diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix
index a7ed92051f65..c483932f3d4f 100644
--- a/pkgs/development/python-modules/icalendar/default.nix
+++ b/pkgs/development/python-modules/icalendar/default.nix
@@ -48,6 +48,8 @@ buildPythonPackage rec {
     # AssertionError: assert {'Atlantic/Jan_Mayen'} == {'Arctic/Longyearbyen'}
     "test_dateutil_timezone_is_matched_with_tzname"
     "test_docstring_of_python_file"
+    # AssertionError: assert $TZ not in set()
+    "test_add_missing_timezones_to_example"
   ];
 
   enabledTestPaths = [ "src/icalendar" ];

From 7ea9bcc533647a47fcc1ed8aa65a6bd59d7ea24c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 15:29:42 +0200
Subject: [PATCH 1469/3724] python3Packages.pyee: pin pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix
index a0942645a94b..34144038080b 100644
--- a/pkgs/development/python-modules/pyee/default.nix
+++ b/pkgs/development/python-modules/pyee/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   mock,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-trio,
   pytestCheckHook,
   pythonOlder,
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     mock
-    pytest-asyncio
+    pytest-asyncio_0
     pytest-trio
     pytestCheckHook
     twisted

From 9a151d96c38dc6b56c111c96dc07023a0d33b54c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 15:39:59 +0200
Subject: [PATCH 1470/3724] python3Packages.omegaconf: downgrade pytest, ignore
 userwarning

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

diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix
index c21ee73c3e05..c55f1b4ccd1e 100644
--- a/pkgs/development/python-modules/omegaconf/default.nix
+++ b/pkgs/development/python-modules/omegaconf/default.nix
@@ -9,7 +9,7 @@
   jre_minimal,
   pydevd,
   pytest-mock,
-  pytestCheckHook,
+  pytest7CheckHook,
   pythonAtLeast,
   pythonOlder,
   pyyaml,
@@ -60,13 +60,14 @@ buildPythonPackage rec {
     attrs
     pydevd
     pytest-mock
-    pytestCheckHook
+    pytest7CheckHook
   ];
 
   pythonImportsCheck = [ "omegaconf" ];
 
   pytestFlags = [
     "-Wignore::DeprecationWarning"
+    "-Wignore::UserWarning"
   ];
 
   disabledTests = [

From dba63d38149da498cd60937b78b25f29d5e6c4e4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 15:40:25 +0200
Subject: [PATCH 1471/3724] python3Packages.statsmodels: relax setuptools-scm
 constraint

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

diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix
index 0499b856422f..345bbe85f1e6 100644
--- a/pkgs/development/python-modules/statsmodels/default.nix
+++ b/pkgs/development/python-modules/statsmodels/default.nix
@@ -7,7 +7,6 @@
   packaging,
   pandas,
   patsy,
-  pythonOlder,
   scipy,
   setuptools,
   setuptools-scm,
@@ -19,13 +18,16 @@ buildPythonPackage rec {
   version = "0.14.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-3iYOWMzP0s7d+DW1WjVyM9bKhToapPkPdVOlLMccbd8=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'setuptools_scm[toml]>=8,<9' 'setuptools_scm[toml]'
+  '';
+
   build-system = [
     cython
     numpy

From 3ce231e9e333c9e4542c28751f74f1e1f4f588fe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 15:57:11 +0200
Subject: [PATCH 1472/3724] python3Packages.weconnect: relax oauthlib
 constraint

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

diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix
index c4d08efb46d7..ed1c14c863b5 100644
--- a/pkgs/development/python-modules/weconnect/default.nix
+++ b/pkgs/development/python-modules/weconnect/default.nix
@@ -43,6 +43,8 @@ buildPythonPackage rec {
     requests
   ];
 
+  pythonRelaxDeps = [ "oauthlib" ];
+
   optional-dependencies = {
     Images = [
       ascii-magic

From efa2eef77100b8a8d0207c79cd10b15d0ed231b7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 15:58:58 +0200
Subject: [PATCH 1473/3724] python3Packages.markdown: downgrade pytest

test/test_markdown2.py - Failed: 'yield' keyword is allowed in fixtures, but not in tests (test_cases)
---
 pkgs/development/python-modules/markdown2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix
index 832a20c670fd..01fa47856207 100644
--- a/pkgs/development/python-modules/markdown2/default.nix
+++ b/pkgs/development/python-modules/markdown2/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   latex2mathml,
   pygments,
-  pytestCheckHook,
+  pytest7CheckHook,
   pythonOlder,
   setuptools,
   wavedrom,
@@ -28,7 +28,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "markdown2" ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ pytest7CheckHook ];
 
   optional-dependencies = {
     code_syntax_highlighting = [ pygments ];

From 4f9d6bb50690b02204d2abb097b5100e3cfe5a59 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 15:59:10 +0200
Subject: [PATCH 1474/3724] python3Packages.levenshtein: relax cython
 constraint

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

diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix
index a218eec80568..9b1b1ca28f85 100644
--- a/pkgs/development/python-modules/levenshtein/default.nix
+++ b/pkgs/development/python-modules/levenshtein/default.nix
@@ -23,6 +23,11 @@ buildPythonPackage rec {
     hash = "sha256-EFEyP7eqB4sUQ2ksD67kCr0BEShTiKWbk1PxXOUOGc4=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "Cython>=3.0.12,<3.1.0" Cython
+  '';
+
   build-system = [
     cmake
     cython

From 928d75540aa6d7ec5bf01a7d439d857087b332aa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 16:05:11 +0200
Subject: [PATCH 1475/3724] python3Packages.dependency-groups: init at 1.3.1

---
 .../dependency-groups/default.nix             | 53 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/development/python-modules/dependency-groups/default.nix

diff --git a/pkgs/development/python-modules/dependency-groups/default.nix b/pkgs/development/python-modules/dependency-groups/default.nix
new file mode 100644
index 000000000000..6bfbe3e79977
--- /dev/null
+++ b/pkgs/development/python-modules/dependency-groups/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  flit-core,
+  packaging,
+  pytestCheckHook,
+  tomli,
+}:
+
+buildPythonPackage rec {
+  pname = "dependency-groups";
+  version = "1.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pypa";
+    repo = "dependency-groups";
+    tag = version;
+    hash = "sha256-suuSx3zf0Y45FJdH8Cb6N7hcvPnzleREpHhtdiG2CLg=";
+  };
+
+  build-system = [
+    flit-core
+  ];
+
+  dependencies = [
+    packaging
+    tomli
+  ];
+
+  optional-dependencies = {
+    cli = [
+      tomli
+    ];
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "dependency_groups"
+  ];
+
+  meta = {
+    description = "A standalone implementation of PEP 735 Dependency Groups";
+    homepage = "https://github.com/pypa/dependency-groups";
+    changelog = "https://github.com/pypa/dependency-groups/blob/${src.tag}/CHANGELOG.rst";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 64439f17f7c0..ec7e3649c1bf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3525,6 +3525,8 @@ self: super: with self; {
 
   dep-logic = callPackage ../development/python-modules/dep-logic { };
 
+  dependency-groups = callPackage ../development/python-modules/dependency-groups { };
+
   dependency-injector = callPackage ../development/python-modules/dependency-injector { };
 
   deploykit = callPackage ../development/python-modules/deploykit { };

From bf4d11289f910305bdcc8cf0025c7f441dd7992a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 16:05:47 +0200
Subject: [PATCH 1476/3724] python3Packages.geopy: downgrade pytest

Uses undeclared async test functions which break with pytest 8.4.
---
 pkgs/development/python-modules/geopy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix
index b9cf371ab744..6da0af5310e9 100644
--- a/pkgs/development/python-modules/geopy/default.nix
+++ b/pkgs/development/python-modules/geopy/default.nix
@@ -4,7 +4,7 @@
   docutils,
   fetchFromGitHub,
   geographiclib,
-  pytestCheckHook,
+  pytest7CheckHook,
   pythonAtLeast,
   pythonOlder,
   pytz,
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     docutils
-    pytestCheckHook
+    pytest7CheckHook
     pytz
   ];
 

From ec0b3a59c359ff496dfbee60228b1e398506881a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 16:08:04 +0200
Subject: [PATCH 1477/3724] python3Packages.webtest-aiohttp: fix tests with
 pytest8.4

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

diff --git a/pkgs/development/python-modules/webtest-aiohttp/default.nix b/pkgs/development/python-modules/webtest-aiohttp/default.nix
index 101a8040cef8..67c513601e53 100644
--- a/pkgs/development/python-modules/webtest-aiohttp/default.nix
+++ b/pkgs/development/python-modules/webtest-aiohttp/default.nix
@@ -5,6 +5,7 @@
   fetchFromGitHub,
   fetchpatch,
   pytest-aiohttp,
+  pytest-asyncio_0,
   pytestCheckHook,
   setuptools,
   webtest,
@@ -44,6 +45,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    pytest-asyncio_0
     pytest-aiohttp
     pytestCheckHook
   ];

From ccfa58263261f7ab9ae070e30316a62995ee1750 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 16:10:34 +0200
Subject: [PATCH 1478/3724] python3Packages.cherrypy: ignore unraisable
 exceptions during tests

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

diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index ee502767a117..31ee288bbc22 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -68,6 +68,7 @@ buildPythonPackage rec {
 
   pytestFlags = [
     "-Wignore::DeprecationWarning"
+    "-Wignore::pytest.PytestUnraisableExceptionWarning"
   ];
 
   disabledTests = [

From a0fb97d44ff6340bac497aaa97f5c38aa19a6790 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 16:11:24 +0200
Subject: [PATCH 1479/3724] python3Packages.makefun: downgrade pytest

Uses undeclared async functions, which breaks with pytest 8.4.
---
 pkgs/development/python-modules/makefun/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix
index 2a234b829c68..2929f361f5c2 100644
--- a/pkgs/development/python-modules/makefun/default.nix
+++ b/pkgs/development/python-modules/makefun/default.nix
@@ -8,7 +8,7 @@
   setuptools-scm,
 
   # tests
-  pytestCheckHook,
+  pytest7CheckHook,
 }:
 
 buildPythonPackage rec {
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ pytest7CheckHook ];
 
   pythonImportsCheck = [ "makefun" ];
 

From 3007e5fbc3bcc15d922265c0cdc9d7986bd232f3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 16:14:26 +0200
Subject: [PATCH 1480/3724] python3Packages.xmldiff: disable failing test

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

diff --git a/pkgs/development/python-modules/xmldiff/default.nix b/pkgs/development/python-modules/xmldiff/default.nix
index 868341a8cfac..fd0c85cffd26 100644
--- a/pkgs/development/python-modules/xmldiff/default.nix
+++ b/pkgs/development/python-modules/xmldiff/default.nix
@@ -29,6 +29,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  disabledTests = [
+    # lxml 6.0 compat issue
+    "test_api_diff_texts"
+  ];
+
   pythonImportsCheck = [ "xmldiff" ];
 
   meta = {

From 5437191e16032331489ef8b386434cae6950dbab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 16:52:41 +0200
Subject: [PATCH 1481/3724] python3Packages.gql: pin to pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix
index 42141609db83..93a380706c89 100644
--- a/pkgs/development/python-modules/gql/default.nix
+++ b/pkgs/development/python-modules/gql/default.nix
@@ -11,7 +11,7 @@
   httpx,
   mock,
   parse,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-console-scripts,
   pytestCheckHook,
   pythonOlder,
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     aiofiles
     mock
     parse
-    pytest-asyncio
+    pytest-asyncio_0
     pytest-console-scripts
     pytestCheckHook
     vcrpy

From 272da025067d42b8c85dbd43a94b379185638eef Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 17:22:44 +0200
Subject: [PATCH 1482/3724] python3Packages.anova-wifi: disable failing test

Fails with pytest 8.4.
---
 pkgs/development/python-modules/anova-wifi/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/anova-wifi/default.nix b/pkgs/development/python-modules/anova-wifi/default.nix
index 07f9bcf2dfe5..b7374b5caa86 100644
--- a/pkgs/development/python-modules/anova-wifi/default.nix
+++ b/pkgs/development/python-modules/anova-wifi/default.nix
@@ -41,6 +41,8 @@ buildPythonPackage rec {
   disabledTests = [
     # Makes network calls
     "test_async_data_1"
+    # async def functions are not natively supported.
+    "test_can_create"
   ];
 
   pythonImportsCheck = [ "anova_wifi" ];

From 3ebcd0bf218a1d7c66c38e8a01a89914017291f9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 17:27:07 +0200
Subject: [PATCH 1483/3724] python3Packages.pyatv: pin pytest-asyncio at 0.x

Otherwise it won't find the `event_loop` fixture.
---
 pkgs/development/python-modules/pyatv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix
index 767b8c5eb067..c3266fffe3a4 100644
--- a/pkgs/development/python-modules/pyatv/default.nix
+++ b/pkgs/development/python-modules/pyatv/default.nix
@@ -13,7 +13,7 @@
   pydantic,
   pyfakefs,
   pytest-aiohttp,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-httpserver,
   pytest-timeout,
   pytestCheckHook,
@@ -79,8 +79,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     deepdiff
     pyfakefs
-    pytest-aiohttp
-    pytest-asyncio
+    (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; })
+    pytest-asyncio_0
     pytest-httpserver
     pytest-timeout
     pytestCheckHook

From d6ab760a1c51a329f3edb3ca30acab6999cb0e6f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 17:29:21 +0200
Subject: [PATCH 1484/3724] python3Packages.pyaprilaire: pin pytest-asyncio at
 0.x

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

diff --git a/pkgs/development/python-modules/pyaprilaire/default.nix b/pkgs/development/python-modules/pyaprilaire/default.nix
index 40f41216094f..b28342011276 100644
--- a/pkgs/development/python-modules/pyaprilaire/default.nix
+++ b/pkgs/development/python-modules/pyaprilaire/default.nix
@@ -5,7 +5,7 @@
   pytestCheckHook,
   crc,
   setuptools,
-  pytest-asyncio,
+  pytest-asyncio_0,
 }:
 
 buildPythonPackage rec {
@@ -28,7 +28,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-    pytest-asyncio
+    pytest-asyncio_0
   ];
 
   meta = {

From 74fa880ad5104a2a4d8d0e7a4316ee7126528002 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 17:35:30 +0200
Subject: [PATCH 1485/3724] python3Package.pytest_8_3: init at 8.3.5

---
 .../development/python-modules/pytest/8_3.nix | 111 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   4 +
 2 files changed, 115 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest/8_3.nix

diff --git a/pkgs/development/python-modules/pytest/8_3.nix b/pkgs/development/python-modules/pytest/8_3.nix
new file mode 100644
index 000000000000..2b7cc734324f
--- /dev/null
+++ b/pkgs/development/python-modules/pytest/8_3.nix
@@ -0,0 +1,111 @@
+{
+  lib,
+  buildPythonPackage,
+  callPackage,
+  pythonOlder,
+  fetchPypi,
+  writeText,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # dependencies
+  attrs,
+  exceptiongroup,
+  iniconfig,
+  packaging,
+  pluggy,
+  tomli,
+
+  # optional-dependencies
+  argcomplete,
+  hypothesis,
+  mock,
+  pygments,
+  requests,
+  xmlschema,
+}:
+
+buildPythonPackage rec {
+  pname = "pytest";
+  version = "8.3.5";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-9O/nDMFOURVlrEdrV8J54SqFWxH0jyEq8QgO8iY9OEU=";
+  };
+
+  outputs = [
+    "out"
+    "testout"
+  ];
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    iniconfig
+    packaging
+    pluggy
+    pygments
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    exceptiongroup
+    tomli
+  ];
+
+  optional-dependencies = {
+    testing = [
+      argcomplete
+      attrs
+      hypothesis
+      mock
+      requests
+      setuptools
+      xmlschema
+    ];
+  };
+
+  postInstall = ''
+    mkdir $testout
+    cp -R testing $testout/testing
+  '';
+
+  doCheck = false;
+  passthru.tests.pytest = callPackage ./tests.nix { };
+
+  # Remove .pytest_cache when using py.test in a Nix build
+  setupHook = writeText "pytest-hook" ''
+    pytestcachePhase() {
+        find $out -name .pytest_cache -type d -exec rm -rf {} +
+    }
+    appendToVar preDistPhases pytestcachePhase
+
+    # pytest generates it's own bytecode files to improve assertion messages.
+    # These files similar to cpython's bytecode files but are never laoded
+    # by python interpreter directly. We remove them for a few reasons:
+    # - files are non-deterministic: https://github.com/NixOS/nixpkgs/issues/139292
+    #   (file headers are generatedt by pytest directly and contain timestamps)
+    # - files are not needed after tests are finished
+    pytestRemoveBytecodePhase () {
+        # suffix is defined at:
+        #    https://github.com/pytest-dev/pytest/blob/7.2.1/src/_pytest/assertion/rewrite.py#L51-L53
+        find $out -name "*-pytest-*.py[co]" -delete
+    }
+    appendToVar preDistPhases pytestRemoveBytecodePhase
+  '';
+
+  pythonImportsCheck = [ "pytest" ];
+
+  meta = with lib; {
+    description = "Framework for writing tests";
+    homepage = "https://docs.pytest.org";
+    changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}";
+    teams = [ teams.python ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec7e3649c1bf..1d7eaca368ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14423,8 +14423,12 @@ self: super: with self; {
 
   pytest7CheckHook = pytestCheckHook.override { pytest = pytest_7; };
 
+  pytest8_3CheckHook = pytestCheckHook.override { pytest = pytest_8_3; };
+
   pytest_7 = callPackage ../development/python-modules/pytest/7.nix { };
 
+  pytest_8_3 = callPackage ../development/python-modules/pytest/8_3.nix { };
+
   pytestcache = callPackage ../development/python-modules/pytestcache { };
 
   python-aodhclient = callPackage ../development/python-modules/python-aodhclient { };

From 43871700d0d5df71ce72182c20126dcb31efebae Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 17:35:44 +0200
Subject: [PATCH 1486/3724] python3Packages.apischema: pin to pytest 8.3.x

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

diff --git a/pkgs/development/python-modules/apischema/default.nix b/pkgs/development/python-modules/apischema/default.nix
index e30e9de5c916..b470b3454d8c 100644
--- a/pkgs/development/python-modules/apischema/default.nix
+++ b/pkgs/development/python-modules/apischema/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   graphql-core,
   pytest-asyncio,
-  pytestCheckHook,
+  pytest8_3CheckHook,
   pythonOlder,
   setuptools,
 }:
@@ -37,7 +37,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytest-asyncio
-    pytestCheckHook
+    pytest8_3CheckHook
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
 

From 9857d769b8f451f16dd03c1e6738a1a80ecfa873 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 22:06:45 +0200
Subject: [PATCH 1487/3724] python3Packages.inkex: relax lxml constraint

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

diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix
index 3195032e03e9..534aa8ae551d 100644
--- a/pkgs/development/python-modules/inkex/default.nix
+++ b/pkgs/development/python-modules/inkex/default.nix
@@ -27,7 +27,10 @@ buildPythonPackage {
 
   build-system = [ poetry-core ];
 
-  pythonRelaxDeps = [ "numpy" ];
+  pythonRelaxDeps = [
+    "lxml"
+    "numpy"
+  ];
 
   dependencies = [
     cssselect

From dc471edbde047cfafb872aa4c956483f035ab37f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 22:12:34 +0200
Subject: [PATCH 1488/3724] python3Packages.pytest-examples: disable failing
 tests

---
 pkgs/development/python-modules/pytest-examples/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/pytest-examples/default.nix b/pkgs/development/python-modules/pytest-examples/default.nix
index ec26ae5eea97..a1d090346543 100644
--- a/pkgs/development/python-modules/pytest-examples/default.nix
+++ b/pkgs/development/python-modules/pytest-examples/default.nix
@@ -43,6 +43,11 @@ buildPythonPackage rec {
     "test_black_error_multiline"
   ];
 
+  disabledTestPaths = [
+    # assert 1 + 2 == 4
+    "tests/test_run_examples.py::test_run_example_ok_fail"
+  ];
+
   meta = {
     description = "Pytest plugin for testing examples in docstrings and markdown files";
     homepage = "https://github.com/pydantic/pytest-examples";

From 03c2f57a90ed7ca5b899a04daeb16954b249b2b9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 7 Aug 2025 23:08:28 +0200
Subject: [PATCH 1489/3724] python3Packages.aioboto3: make compatible with
 boto3 1.40.4

---
 .../python-modules/aioboto3/boto3-compat.patch    | 15 +++++++++++++++
 .../python-modules/aioboto3/default.nix           |  3 +++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/python-modules/aioboto3/boto3-compat.patch

diff --git a/pkgs/development/python-modules/aioboto3/boto3-compat.patch b/pkgs/development/python-modules/aioboto3/boto3-compat.patch
new file mode 100644
index 000000000000..7f4b2272e509
--- /dev/null
+++ b/pkgs/development/python-modules/aioboto3/boto3-compat.patch
@@ -0,0 +1,15 @@
+diff --git a/aioboto3/session.py b/aioboto3/session.py
+index b6c2129..c97eaaf 100644
+--- a/aioboto3/session.py
++++ b/aioboto3/session.py
+@@ -79,7 +79,9 @@ class Session(boto3.session.Session):
+ 
+         if any(creds):
+             if self._account_id_set_without_credentials(
+-                aws_account_id, aws_access_key_id, aws_secret_access_key
++                aws_account_id=aws_account_id,
++                aws_access_key_id=aws_access_key_id,
++                aws_secret_access_key=aws_secret_access_key
+             ):
+                 raise NoCredentialsError()
+ 
diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix
index a915813c9e18..157aae9026e0 100644
--- a/pkgs/development/python-modules/aioboto3/default.nix
+++ b/pkgs/development/python-modules/aioboto3/default.nix
@@ -26,6 +26,9 @@ buildPythonPackage rec {
     hash = "sha256-Z4tUwTFaXC3BGUKc1FPY0xoaUViAEiZNeP5REWotw2M=";
   };
 
+  # https://github.com/terricain/aioboto3/pull/377
+  patches = [ ./boto3-compat.patch ];
+
   pythonRelaxDeps = [
     "aiobotocore"
   ];

From 37fdab859a61c29a79cd9a02a70ad31ce9e945c8 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Fri, 8 Aug 2025 06:47:28 +1000
Subject: [PATCH 1490/3724] python3Packages.fabric: disable failing tests

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

diff --git a/pkgs/development/python-modules/fabric/default.nix b/pkgs/development/python-modules/fabric/default.nix
index cc77add86616..ada40a9ba905 100644
--- a/pkgs/development/python-modules/fabric/default.nix
+++ b/pkgs/development/python-modules/fabric/default.nix
@@ -61,6 +61,11 @@ buildPythonPackage rec {
     # https://github.com/fabric/fabric/issues/2341
     "client_defaults_to_a_new_SSHClient"
     "defaults_to_auto_add"
+
+    # Fixture "fake_agent" called directly. Fixtures are not meant to be called directly
+    "no_stdin"
+    "fake_agent"
+    "fake"
   ];
 
   meta = {

From da58495fe33e987740c7d0bf8713b904ebf05a8f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 01:04:33 +0200
Subject: [PATCH 1491/3724] python3Packages.rencode: unstable-2021-08-10 ->
 1.0.8

https://github.com/aresch/rencode/releases/tag/v1.0.7
https://github.com/aresch/rencode/releases/tag/v1.0.8
---
 .../python-modules/rencode/default.nix        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix
index 4c1857e1b70b..0d8d495eb41c 100644
--- a/pkgs/development/python-modules/rencode/default.nix
+++ b/pkgs/development/python-modules/rencode/default.nix
@@ -3,23 +3,28 @@
   buildPythonPackage,
   fetchFromGitHub,
   cython,
+  poetry-core,
+  setuptools,
   pytestCheckHook,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "rencode";
-  version = "unstable-2021-08-10";
-
-  format = "setuptools";
+  version = "1.0.8";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aresch";
     repo = "rencode";
-    rev = "572ff74586d9b1daab904c6f7f7009ce0143bb75";
-    hash = "sha256-cL1hV3RMDuSdcjpPXXDYIEbzQrxiPeRs82PU8HTEQYk=";
+    tag = "v${version}";
+    hash = "sha256-k2b6DoKwNeQBkmqSRXqaRTjK7CVX6IKuXCLG9lBdLLY=";
   };
 
-  nativeBuildInputs = [ cython ];
+  nativeBuildInputs = [
+    poetry-core
+    setuptools
+    cython
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From aa1c75ddac51a2a717e7ef9b52c77c5a05fcf454 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 01:20:36 +0200
Subject: [PATCH 1492/3724] python3Packages.apscheduler: pin pytest 8.3

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

diff --git a/pkgs/development/python-modules/apscheduler/default.nix b/pkgs/development/python-modules/apscheduler/default.nix
index ade71286799d..028df647f83a 100644
--- a/pkgs/development/python-modules/apscheduler/default.nix
+++ b/pkgs/development/python-modules/apscheduler/default.nix
@@ -7,7 +7,7 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytest-tornado,
-  pytestCheckHook,
+  pytest8_3CheckHook,
   pythonOlder,
   pytz,
   setuptools,
@@ -31,6 +31,10 @@ buildPythonPackage rec {
     hash = "sha256-tFEm9yXf8CqcipSYtM7JM6WQ5Qm0YtgWhZvZOBAzy+w=";
   };
 
+  postPatch = ''
+    sed -i "/addopts/d" pyproject.toml
+  '';
+
   build-system = [
     setuptools
     setuptools-scm
@@ -45,7 +49,7 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-cov-stub
     pytest-tornado
-    pytestCheckHook
+    pytest8_3CheckHook
     pytz
     tornado
     twisted

From f359c1fd6fc6552f686b2aef1dd63c0323079a4d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 01:59:58 +0200
Subject: [PATCH 1493/3724] python3Packages.sshtunnel: mark broken

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

diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix
index 08d6bf114082..c119e971e965 100644
--- a/pkgs/development/python-modules/sshtunnel/default.nix
+++ b/pkgs/development/python-modules/sshtunnel/default.nix
@@ -35,6 +35,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    broken = true; # incompatible with paramiko 4.0 https://github.com/pahaz/sshtunnel/issues/299
     description = "Pure python SSH tunnels";
     mainProgram = "sshtunnel";
     homepage = "https://github.com/pahaz/sshtunnel";

From 76f9f4d79281c2452876da90962ff51dc0428cde Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 02:08:23 +0200
Subject: [PATCH 1494/3724] python3Packages.matrix-nio: pin pytest-asyncio to
 0.x

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

diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix
index 8c8e0b3828b5..fba252975c70 100644
--- a/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/pkgs/development/python-modules/matrix-nio/default.nix
@@ -29,6 +29,7 @@
   hyperframe,
   hypothesis,
   pytest-aiohttp,
+  pytest-asyncio_0,
   pytest-benchmark,
   pytestCheckHook,
 
@@ -93,7 +94,7 @@ buildPythonPackage rec {
     hpack
     hyperframe
     hypothesis
-    pytest-aiohttp
+    (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; })
     pytest-benchmark
     pytestCheckHook
   ];

From df0a487e0c3a08a4f96dbcb77ac1c527f425a5db Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 02:10:06 +0200
Subject: [PATCH 1495/3724] python3Packages.caio: pin pytest 8.3, pytest-asycio
 0.x

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

diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix
index ae4a10952868..be7dbc35ee8a 100644
--- a/pkgs/development/python-modules/caio/default.nix
+++ b/pkgs/development/python-modules/caio/default.nix
@@ -5,7 +5,8 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytest-aiohttp,
-  pytestCheckHook,
+  pytest-asyncio_0,
+  pytest8_3CheckHook,
   pythonOlder,
   setuptools,
 }:
@@ -28,8 +29,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     aiomisc
-    pytest-aiohttp
-    pytestCheckHook
+    (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; })
+    pytest8_3CheckHook
   ];
 
   env.NIX_CFLAGS_COMPILE = toString (

From e47cccff2fe6046be99ddbd5e395242be3287591 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 02:14:03 +0200
Subject: [PATCH 1496/3724] python3Packages.grpclib: pin pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix
index c9553e5c81b1..35494aa1d7ce 100644
--- a/pkgs/development/python-modules/grpclib/default.nix
+++ b/pkgs/development/python-modules/grpclib/default.nix
@@ -8,7 +8,7 @@
   googleapis-common-protos,
   h2,
   multidict,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -37,7 +37,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-    pytest-asyncio
+    pytest-asyncio_0
     async-timeout
     faker
     googleapis-common-protos

From e6097fcb560512b5710401fce43d1aa81e232f84 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 14:11:54 +0200
Subject: [PATCH 1497/3724] python3Packages.zigpy: pin tests to pytest-asyncio
 0.x

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

diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index 2dc40f5b3d7a..073565b0b0c3 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -14,7 +14,7 @@
   frozendict,
   jsonschema,
   pyserial-asyncio,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-timeout,
   pytestCheckHook,
   pythonOlder,
@@ -60,7 +60,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     aioresponses
     freezegun
-    pytest-asyncio
+    pytest-asyncio_0
     pytest-timeout
     pytestCheckHook
   ];

From 90ae615e0c63a9a46aa61b28b065ea796462ad20 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 14:17:32 +0200
Subject: [PATCH 1498/3724] pdm: 2.24.2 -> 2.25.5

https://github.com/pdm-project/pdm/releases/tag/2.25.0
https://github.com/pdm-project/pdm/releases/tag/2.25.1
https://github.com/pdm-project/pdm/releases/tag/2.25.2
https://github.com/pdm-project/pdm/releases/tag/2.25.3
https://github.com/pdm-project/pdm/releases/tag/2.25.4
https://github.com/pdm-project/pdm/releases/tag/2.25.5
---
 pkgs/by-name/pd/pdm/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix
index 7bddb9c35873..c561562a50d8 100644
--- a/pkgs/by-name/pd/pdm/package.nix
+++ b/pkgs/by-name/pd/pdm/package.nix
@@ -28,7 +28,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "pdm";
-  version = "2.24.2";
+  version = "2.25.5";
   pyproject = true;
 
   disabled = python.pkgs.pythonOlder "3.8";
@@ -37,7 +37,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "pdm-project";
     repo = "pdm";
     tag = version;
-    hash = "sha256-z2p7guCQrKpDSYRHaGcHuwoTDsprrvJo9SH3sGBILSQ=";
+    hash = "sha256-OXwtmcwRYRL9CZwAoJz9ID9oI3zz+5MkvU0vI5NjvEE=";
   };
 
   pythonRelaxDeps = [ "hishel" ];
@@ -126,6 +126,9 @@ python.pkgs.buildPythonApplication rec {
     "test_use_python_write_file_multiple_versions"
     "test_repository_get_token_from_oidc"
     "test_repository_get_token_misconfigured_github"
+
+    # https://github.com/pdm-project/pdm/issues/3590
+    "test_install_from_lock_with_higher_version"
   ];
 
   __darwinAllowLocalNetworking = true;

From ed929d4a7d3917737b97f781df483f6840d5bc4b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 15:21:43 +0200
Subject: [PATCH 1499/3724] python3Packages.django*: fix compat with python
 3.13.6 and newer

---
 .../django/3.13.6-html-parser.patch           | 58 +++++++++++++++++++
 pkgs/development/python-modules/django/4.nix  |  6 ++
 .../development/python-modules/django/5_1.nix |  6 ++
 .../development/python-modules/django/5_2.nix |  7 ++-
 4 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/django/3.13.6-html-parser.patch

diff --git a/pkgs/development/python-modules/django/3.13.6-html-parser.patch b/pkgs/development/python-modules/django/3.13.6-html-parser.patch
new file mode 100644
index 000000000000..6d986be38478
--- /dev/null
+++ b/pkgs/development/python-modules/django/3.13.6-html-parser.patch
@@ -0,0 +1,58 @@
+From e0a1e8d549e7be25960b8ad060c63def3dc35d1d Mon Sep 17 00:00:00 2001
+From: Natalia <124304+nessita@users.noreply.github.com>
+Date: Mon, 21 Jul 2025 15:23:32 -0300
+Subject: [PATCH 1/2] Fixed test_utils.tests.HTMLEqualTests.test_parsing_errors
+ following Python's HTMLParser fixed parsing.
+
+Further details about Python changes can be found in:
+https://github.com/python/cpython/commit/0243f97cbadec8d985e63b1daec5d1cbc850cae3.
+
+Thank you Clifford Gama for the thorough review!
+---
+ tests/test_utils/tests.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py
+index 37e87aa1022c..9c22b61b4ff2 100644
+--- a/tests/test_utils/tests.py
++++ b/tests/test_utils/tests.py
+@@ -962,7 +962,7 @@ def test_parsing_errors(self):
+             "('Unexpected end tag `div` (Line 1, Column 6)', (1, 6))"
+         )
+         with self.assertRaisesMessage(AssertionError, error_msg):
+-            self.assertHTMLEqual("< div></ div>", "<div></div>")
++            self.assertHTMLEqual("< div></div>", "<div></div>")
+         with self.assertRaises(HTMLParseError):
+             parse_html("</p>")
+ 
+
+From e8afcf0e644553bcba3e5f931266963bffc46748 Mon Sep 17 00:00:00 2001
+From: Natalia <124304+nessita@users.noreply.github.com>
+Date: Mon, 14 Jul 2025 14:45:03 -0300
+Subject: [PATCH 2/2] Fixed #36499 -- Adjusted
+ utils_tests.test_html.TestUtilsHtml.test_strip_tags following Python's
+ HTMLParser new behavior.
+
+Python fixed a quadratic complexity processing for HTMLParser in:
+https://github.com/python/cpython/commit/6eb6c5dbfb528bd07d77b60fd71fd05d81d45c41.
+---
+ tests/utils_tests/test_html.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py
+index 284f33aedcfb..51573b81eb9d 100644
+--- a/tests/utils_tests/test_html.py
++++ b/tests/utils_tests/test_html.py
+@@ -142,10 +142,10 @@ def test_strip_tags(self):
+             ("&gotcha&#;<>", "&gotcha&#;<>"),
+             ("<sc<!-- -->ript>test<<!-- -->/script>", "ript>test"),
+             ("<script>alert()</script>&h", "alert()h"),
+-            ("><!" + ("&" * 16000) + "D", "><!" + ("&" * 16000) + "D"),
++            ("><!" + ("&" * 16000) + "D", ">"),
+             ("X<<<<br>br>br>br>X", "XX"),
+             ("<" * 50 + "a>" * 50, ""),
+-            (">" + "<a" * 500 + "a", ">" + "<a" * 500 + "a"),
++            (">" + "<a" * 500 + "a", ">"),
+             ("<a" * 49 + "a" * 951, "<a" * 49 + "a" * 951),
+             ("<" + "a" * 1_002, "<" + "a" * 1_002),
+         )
diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index 2bd5b6ae34ce..04a73e71871a 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -79,6 +79,12 @@ buildPythonPackage rec {
       includes = [ "django/*" ]; # tests don't apply
       hash = "sha256-8YwdOBNJq6+GNoxzdLyN9HEEIWRXGQk9YbyfPwYVkwU=";
     })
+
+  ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # https://code.djangoproject.com/ticket/36499
+    # https://github.com/django/django/pull/19639
+    ./3.13.6-html-parser.patch
   ]
   ++ lib.optionals withGdal [
     (replaceVars ./django_4_set_geos_gdal_lib.patch {
diff --git a/pkgs/development/python-modules/django/5_1.nix b/pkgs/development/python-modules/django/5_1.nix
index 4b2b815d9d11..bf01cf87c85c 100644
--- a/pkgs/development/python-modules/django/5_1.nix
+++ b/pkgs/development/python-modules/django/5_1.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch,
+  pythonAtLeast,
   pythonOlder,
   replaceVars,
 
@@ -71,6 +72,11 @@ buildPythonPackage rec {
       hash = "sha256-+K20/V8sh036Ox9U7CSPgfxue7f28Sdhr3MsB7erVOk=";
     })
   ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # https://code.djangoproject.com/ticket/36499
+    # https://github.com/django/django/pull/19639
+    ./3.13.6-html-parser.patch
+  ]
   ++ lib.optionals withGdal [
     (replaceVars ./django_5_set_geos_gdal_lib.patch {
       geos = geos;
diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5_2.nix
index 95ed0f2b0dfb..c1db9106da63 100644
--- a/pkgs/development/python-modules/django/5_2.nix
+++ b/pkgs/development/python-modules/django/5_2.nix
@@ -3,7 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
+  pythonAtLeast,
   pythonOlder,
   replaceVars,
 
@@ -64,6 +64,11 @@ buildPythonPackage rec {
     # disable test that expects timezone issues
     ./django_5_disable_failing_tests.patch
   ]
+  ++ lib.optionals (pythonAtLeast "3.13") [
+    # https://code.djangoproject.com/ticket/36499
+    # https://github.com/django/django/pull/19639
+    ./3.13.6-html-parser.patch
+  ]
   ++ lib.optionals withGdal [
     (replaceVars ./django_5_set_geos_gdal_lib.patch {
       geos = geos;

From 74f87a6375c9fded81a6824c6d6317d08e6dd17d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 16:05:19 +0200
Subject: [PATCH 1500/3724] python313Packages.websockets: temporarily disable
 tests

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

diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 25ff8ada5b62..0a01b25a55c2 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -61,7 +61,8 @@ buildPythonPackage rec {
   '';
 
   # Tests fail on Darwin with `OSError: AF_UNIX path too long`
-  doCheck = !stdenv.hostPlatform.isDarwin;
+  # https://github.com/python-websockets/websockets/issues/1648
+  doCheck = pythonOlder "3.13" && !stdenv.hostPlatform.isDarwin;
 
   pythonImportsCheck = [ "websockets" ];
 

From d1dcc6aabd0cf333c0d034661490641a08e5b6b1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 16:37:17 +0200
Subject: [PATCH 1501/3724] thrift: wrap python environment and provide six

---
 pkgs/by-name/th/thrift/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/th/thrift/package.nix b/pkgs/by-name/th/thrift/package.nix
index 574c028e463d..7b32a64faad9 100644
--- a/pkgs/by-name/th/thrift/package.nix
+++ b/pkgs/by-name/th/thrift/package.nix
@@ -33,11 +33,17 @@ stdenv.mkDerivation rec {
     cmake
     flex
     pkg-config
-    python3
-    python3.pkgs.setuptools
-  ]
-  ++ lib.optionals (!static) [
-    python3.pkgs.twisted
+    (python3.withPackages (
+      ps:
+      with ps;
+      [
+        setuptools
+        six
+      ]
+      ++ lib.optionals (!static) [
+        twisted
+      ]
+    ))
   ];
 
   buildInputs = [

From 74811fa8ddbac790112e9e7354c1d1c5dc61fe25 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 16:59:51 +0200
Subject: [PATCH 1502/3724] python3Packages.django-allauth: 65.9.0 -> 65.10.0

https://codeberg.org/allauth/django-allauth/src/tag/65.10.0/ChangeLog.rst
---
 .../python-modules/django-allauth/default.nix          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index 3e1b6e31a42c..35a6b6029c55 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -7,6 +7,7 @@
 
   # build-system
   setuptools,
+  setuptools-scm,
 
   # build-time dependencies
   gettext,
@@ -41,7 +42,7 @@
 
 buildPythonPackage rec {
   pname = "django-allauth";
-  version = "65.9.0";
+  version = "65.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -51,12 +52,15 @@ buildPythonPackage rec {
     owner = "allauth";
     repo = "django-allauth";
     tag = version;
-    hash = "sha256-gusA9TnsgSSnWBPwHsNYeESD9nX5DWh4HqMgcsoJRw0=";
+    hash = "sha256-pwWrdWk3bARM4dKbEnUWXuyjw/rTcOjk3YXowDa+Hm8=";
   };
 
   nativeBuildInputs = [ gettext ];
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   dependencies = [
     asgiref

From 31d0e61210fba686646cf4563a8e5ef94e7b5a40 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 17:12:48 +0200
Subject: [PATCH 1503/3724] python3Packages.django-allauth: backport patch for
 dj-rest-auth compat

---
 pkgs/by-name/pa/paperless-ngx/package.nix                | 1 +
 .../python-modules/django-allauth/default.nix            | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 6e233aaa3d11..2b4e5d300fb9 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -170,6 +170,7 @@ python.pkgs.buildPythonApplication rec {
             tag = version;
             hash = "sha256-1HmEJ5E4Vp/CoyzUegqQXpzKUuz3dLx2EEv7dk8fq8w=";
           };
+          patches = [ ];
         }
       ))
       django-auditlog
diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index 35a6b6029c55..e710032e9006 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitea,
+  fetchpatch,
   pythonOlder,
   python,
 
@@ -55,6 +56,14 @@ buildPythonPackage rec {
     hash = "sha256-pwWrdWk3bARM4dKbEnUWXuyjw/rTcOjk3YXowDa+Hm8=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "dj-rest-auth-compat.patch";
+      url = "https://github.com/pennersr/django-allauth/commit/d50a9b09bada6753b52e52571d0830d837dc08ee.patch";
+      hash = "sha256-cFj9HEAlAITbRcR23ptzUYamoLmdtFEUVkDtv4+BBY0=";
+    })
+  ];
+
   nativeBuildInputs = [ gettext ];
 
   build-system = [

From dcf1d0bddebf420c8482ffb6a63ee5d0a1a3c5f1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 17:18:44 +0200
Subject: [PATCH 1504/3724] libplacebo: fix codegen with python 3.13.6

---
 pkgs/by-name/li/libplacebo/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/li/libplacebo/package.nix b/pkgs/by-name/li/libplacebo/package.nix
index 6960879bdc8a..9ec11a30a720 100644
--- a/pkgs/by-name/li/libplacebo/package.nix
+++ b/pkgs/by-name/li/libplacebo/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  fetchpatch,
   meson,
   ninja,
   pkg-config,
@@ -31,6 +32,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-ccoEFpp6tOFdrfMyE0JNKKMAdN4Q95tP7j7vzUj+lSQ=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "python-compat.patch";
+      url = "https://code.videolan.org/videolan/libplacebo/-/commit/12509c0f1ee8c22ae163017f0a5e7b8a9d983a17.patch";
+      hash = "sha256-RrlFu0xgLB05IVrzL2EViTPuATYXraM1KZMxnZCvgrk=";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja

From 67ea8a6f44f30b3d7394717643bdeab2526eb464 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 17:22:26 +0200
Subject: [PATCH 1505/3724] python3Packages.fido2_2: drop

The fido2 package is now on 2.0.
---
 .../python-modules/django-mfa3/default.nix    |  4 +-
 pkgs/development/python-modules/fido2/2.nix   | 50 -------------------
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/development/python-modules/fido2/2.nix

diff --git a/pkgs/development/python-modules/django-mfa3/default.nix b/pkgs/development/python-modules/django-mfa3/default.nix
index 5651335e8c2f..2f7cfff01122 100644
--- a/pkgs/development/python-modules/django-mfa3/default.nix
+++ b/pkgs/development/python-modules/django-mfa3/default.nix
@@ -5,7 +5,7 @@
   django,
   setuptools,
   pyotp,
-  fido2_2,
+  fido2,
   qrcode,
   python,
 }:
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   dependencies = [
     django
     pyotp
-    fido2_2
+    fido2
     qrcode
   ];
 
diff --git a/pkgs/development/python-modules/fido2/2.nix b/pkgs/development/python-modules/fido2/2.nix
deleted file mode 100644
index a9f8a826e43e..000000000000
--- a/pkgs/development/python-modules/fido2/2.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  cryptography,
-  fetchPypi,
-  poetry-core,
-  pyscard,
-  pythonOlder,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "fido2";
-  version = "2.0.0";
-  pyproject = true;
-
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-MGHNBec7Og72r8O4A9V8gmqi1qlzLRar1ydzYfWOeWQ=";
-  };
-
-  build-system = [ poetry-core ];
-
-  pythonRelaxDeps = [ "cryptography" ];
-
-  dependencies = [ cryptography ];
-
-  optional-dependencies = {
-    pcsc = [ pyscard ];
-  };
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  unittestFlagsArray = [ "-v" ];
-
-  # Disable tests which require physical device
-  pytestFlagsArray = [ "--no-device" ];
-
-  pythonImportsCheck = [ "fido2" ];
-
-  meta = {
-    description = "Provides library functionality for FIDO 2.0, including communication with a device over USB";
-    homepage = "https://github.com/Yubico/python-fido2";
-    changelog = "https://github.com/Yubico/python-fido2/releases/tag/${version}";
-    license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ prusnak ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1d7eaca368ad..1bd072e7fd30 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5069,8 +5069,6 @@ self: super: with self; {
 
   fido2 = callPackage ../development/python-modules/fido2 { };
 
-  fido2_2 = callPackage ../development/python-modules/fido2/2.nix { };
-
   fields = callPackage ../development/python-modules/fields { };
 
   file-read-backwards = callPackage ../development/python-modules/file-read-backwards { };

From 0027088e3df63899f255040563012e84cceeac90 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 17:27:59 +0200
Subject: [PATCH 1506/3724] paperless-ngx: pin fido2 at 1.2.0

---
 pkgs/by-name/pa/paperless-ngx/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 2b4e5d300fb9..12edfd5b1e7e 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchPypi,
   node-gyp,
   nodejs_20,
   nixosTests,
@@ -40,6 +41,18 @@ let
     packageOverrides = final: prev: {
       django = prev.django_5_1;
 
+      fido2 = prev.fido2.overridePythonAttrs {
+        version = "1.2.0";
+
+        src = fetchPypi {
+          pname = "fido2";
+          version = "1.2.0";
+          hash = "sha256-45+VkgEi1kKD/aXlWB2VogbnBPpChGv6RmL4aqDTMzs=";
+        };
+
+        pytestFlags = [ ];
+      };
+
       # tesseract5 may be overwritten in the paperless module and we need to propagate that to make the closure reduction effective
       ocrmypdf = prev.ocrmypdf.override { tesseract = tesseract5; };
     };

From e651d115d5f2a6d37661578370993d345d97c71c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Aug 2025 17:35:30 +0200
Subject: [PATCH 1507/3724] qemu: wrap python with distlib

```
mkvenv: Creating non-isolated virtual environment at 'pyvenv'

*** Ouch! ***

found no usable distlib, please install it
```
---
 pkgs/applications/virtualization/qemu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 75945ebf8302..98542ee3aabc 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
     perl
 
     # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation
-    python3Packages.python
+    (python3Packages.python.withPackages (ps: with ps; [ distlib ]))
   ]
   ++ lib.optionals gtkSupport [ wrapGAppsHook3 ]
   ++ lib.optionals enableDocs [

From 6a0b01e6081b351aa87562ea47204017356b9f8d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 01:59:44 +0200
Subject: [PATCH 1508/3724] python3Packages.curio: disable stuck threading test

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

diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix
index 1806677f2483..8e30e56018dd 100644
--- a/pkgs/development/python-modules/curio/default.nix
+++ b/pkgs/development/python-modules/curio/default.nix
@@ -38,6 +38,7 @@ buildPythonPackage rec {
     "test_ssl_outgoing" # touches network
     "test_unix_echo" # socket bind error on hydra when built with other packages
     "test_unix_ssl_server" # socket bind error on hydra when built with other packages
+    "test_task_group_thread" # stuck
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # connects to python.org:1, expects an OsError, hangs in the darwin sandbox

From e17e40f43a185e8111a9f83b1309c866c9328463 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 02:33:51 +0200
Subject: [PATCH 1509/3724] python3Packages.django-tasks: disable failing test

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

diff --git a/pkgs/development/python-modules/django-tasks/default.nix b/pkgs/development/python-modules/django-tasks/default.nix
index 03ad9c4065e1..e8d556f773b4 100644
--- a/pkgs/development/python-modules/django-tasks/default.nix
+++ b/pkgs/development/python-modules/django-tasks/default.nix
@@ -65,6 +65,8 @@ buildPythonPackage rec {
     "test_dry_run"
     # AssertionError: '' != 'Deleted 1 task result(s)'
     "test_prunes_tasks"
+    # AssertionError: 'Run maximum tasks (2)' not found in ''
+    "test_max_tasks"
   ];
 
   preCheck = ''

From 28da70c576d0124088219ee9537ddbd34c0fa162 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 03:46:41 +0200
Subject: [PATCH 1510/3724] python3Packages.python-box: disable failing test

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

diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix
index 80bfb3ef7e05..701c93f8f0c9 100644
--- a/pkgs/development/python-modules/python-box/default.nix
+++ b/pkgs/development/python-modules/python-box/default.nix
@@ -49,6 +49,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all;
 
+  disabledTests = [
+    # ruamel 8.18.13 update changed white space rules
+    "test_to_yaml_ruamel"
+  ];
+
   pythonImportsCheck = [ "box" ];
 
   meta = with lib; {

From 1febb225837e51afaf7cba021b62fb2c1fd4215b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 03:59:46 +0200
Subject: [PATCH 1511/3724] python3Packages.s3fs: test with pytest-asyncio

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

diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index 47ea05d11f2b..a8ac2afdb16c 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -15,6 +15,7 @@
   flask,
   flask-cors,
   moto,
+  pytest-asyncio,
   pytestCheckHook,
 }:
 
@@ -53,6 +54,7 @@ buildPythonPackage rec {
     flask
     flask-cors
     moto
+    pytest-asyncio
     pytestCheckHook
   ];
 

From 60972c3901d4271e0bc06c9d6c9b3e14aedeec53 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 04:05:58 +0200
Subject: [PATCH 1512/3724] python3Packages.tesserocr: relax cython constraint

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

diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix
index 40c5dbfb49af..8166f0b86626 100644
--- a/pkgs/development/python-modules/tesserocr/default.nix
+++ b/pkgs/development/python-modules/tesserocr/default.nix
@@ -44,6 +44,9 @@ buildPythonPackage rec {
   # https://github.com/sirfz/tesserocr/issues/314
   postPatch = ''
     sed -i '/allheaders.h/a\    pass\n\ncdef extern from "leptonica/pix_internal.h" nogil:' tesserocr/tesseract.pxd
+
+    substituteInPlace setup.py \
+      --replace-fail "Cython>=0.23,<3.1.0" Cython
   '';
 
   build-system = [

From 723937b1b216a98c55a925a75cff7766ab839f9e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 04:47:13 +0200
Subject: [PATCH 1513/3724] python3Packages.django-debug-toolbar: 5.0.1 ->
 6.0.0

https://django-debug-toolbar.readthedocs.io/en/latest/changes.html
---
 .../python-modules/django-debug-toolbar/default.nix   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix
index e7820589c481..a497e80beb69 100644
--- a/pkgs/development/python-modules/django-debug-toolbar/default.nix
+++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix
@@ -16,13 +16,11 @@
   html5lib,
   jinja2,
   pygments,
-  pytest-django,
-  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "django-debug-toolbar";
-  version = "5.0.1";
+  version = "6.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -31,9 +29,14 @@ buildPythonPackage rec {
     owner = "jazzband";
     repo = "django-debug-toolbar";
     tag = version;
-    hash = "sha256-Q0joSIFXhoVmNQ+AfESdEWUGY1xmJzr4iR6Ak54YM7c=";
+    hash = "sha256-ZNevSqEpTdk0cZeMzOpbtatEiV9SAsVUlRb9YddcAGY=";
   };
 
+  postPatch = ''
+    # not actually used and we don't have django-template-partials packaged
+    sed -i "/template_partials/d" tests/settings.py
+  '';
+
   build-system = [ hatchling ];
 
   dependencies = [

From c11f0a3b0d7d9ff44b0b86ce79c387e68981d682 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 05:02:44 +0200
Subject: [PATCH 1514/3724] python3Packages.django-graphiql-debug-toolbar:
 disable tests

Not sure if the package still works. Upstream looks dead.
---
 .../python-modules/django-graphiql-debug-toolbar/default.nix    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
index 8569e756d5ee..3355b6e4af84 100644
--- a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
+++ b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
@@ -61,6 +61,8 @@ buildPythonPackage rec {
     export DJANGO_SETTINGS_MODULE=tests.settings
   '';
 
+  doCheck = false; # tests broke with django-debug-toolbar 6.0
+
   meta = with lib; {
     changelog = "https://github.com/flavors/django-graphiql-debug-toolbar/releases/tag/${src.rev}";
     description = "Django Debug Toolbar for GraphiQL IDE";

From 7c5841b4110462ac59befce39a7dd76bb79ed5ef Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 05:30:45 +0200
Subject: [PATCH 1515/3724] weblate: relax lxml constraint

---
 pkgs/by-name/we/weblate/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index b0500def65f7..36bbdc21b1ea 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -150,7 +150,10 @@ python.pkgs.buildPythonApplication rec {
     ++ drf-spectacular.optional-dependencies.sidecar
     ++ drf-standardized-errors.optional-dependencies.openapi;
 
-  pythonRelaxDeps = [ "certifi" ];
+  pythonRelaxDeps = [
+    "certifi"
+    "lxml"
+  ];
 
   optional-dependencies = {
     postgres = with python.pkgs; [ psycopg ];

From 7970017b7b6e6f1f89f828eff9dc36dc4db4c4ee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 05:48:23 +0200
Subject: [PATCH 1516/3724] python3Packages.anywidget: disable failing tests

---
 pkgs/development/python-modules/anywidget/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix
index e79ac1a6e939..1420201e9707 100644
--- a/pkgs/development/python-modules/anywidget/default.nix
+++ b/pkgs/development/python-modules/anywidget/default.nix
@@ -59,6 +59,16 @@ buildPythonPackage rec {
   disabledTests = [
     # requires package.json
     "test_version"
+
+    # AssertionError: assert not {140737277121872: <MockComm id='140737277118512'>}
+    "test_descriptor_with_psygnal"
+    "test_descriptor_with_pydantic"
+    "test_descriptor_with_msgspec"
+    "test_descriptor_with_traitlets"
+    "test_infer_file_contents"
+
+    #  assert not {<function _connect_psygnal.<locals>._disconnect at 0x7ffff3617e...
+    "test_descriptor_with_psygnal"
   ];
 
   pythonImportsCheck = [ "anywidget" ];

From deb66945ebf72cfef044443e154aca3bb1ae8afa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 06:00:46 +0200
Subject: [PATCH 1517/3724] python313Packages.pychromecast: relax wheel
 constraint

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

diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
index 0a5f43eeb186..e9134566063a 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -25,7 +25,8 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-       --replace-fail "setuptools>=65.6,<78.0" setuptools
+       --replace-fail "setuptools>=65.6,<78.0" setuptools \
+       --replace-fail "wheel>=0.37.1,<0.46.0" wheel
   '';
 
   build-system = [ setuptools ];

From 2950dbbda9f4ceb72d597e7d9491c5ae9a27eb90 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 06:00:56 +0200
Subject: [PATCH 1518/3724] python3Packages.alive-progress: relax about-time
 constraint

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

diff --git a/pkgs/development/python-modules/alive-progress/default.nix b/pkgs/development/python-modules/alive-progress/default.nix
index f981c8d1ae92..c795aed0f14d 100644
--- a/pkgs/development/python-modules/alive-progress/default.nix
+++ b/pkgs/development/python-modules/alive-progress/default.nix
@@ -37,6 +37,8 @@ buildPythonPackage rec {
     grapheme
   ];
 
+  pythonRelaxDeps = [ "about_time" ];
+
   nativeCheckInputs = [
     click
     pytestCheckHook

From bc59344bcc06b8e7ccc7118d71256eb47f5e5a4e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 06:04:28 +0200
Subject: [PATCH 1519/3724] python3Packages.manimpango: relax cython constraint

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

diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix
index 3137d1e594bb..58cfef91d255 100644
--- a/pkgs/development/python-modules/manimpango/default.nix
+++ b/pkgs/development/python-modules/manimpango/default.nix
@@ -25,6 +25,11 @@ buildPythonPackage rec {
     hash = "sha256-nN+XOnki8fG7URMy2Fhs2X+yNi8Y7wDo53d61xaRa3w=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "Cython>=3.0.2,<3.1" Cython
+  '';
+
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ pango ];

From 40df122310dd68544a46f59a6da78849eb3498a9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 06:05:36 +0200
Subject: [PATCH 1520/3724] python3Packages.karton-core: relax aioboto3
 constraint

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

diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix
index 57b51af427f6..dd9293b0f273 100644
--- a/pkgs/development/python-modules/karton-core/default.nix
+++ b/pkgs/development/python-modules/karton-core/default.nix
@@ -26,7 +26,10 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  pythonRelaxDeps = [ "boto3" ];
+  pythonRelaxDeps = [
+    "aioboto3"
+    "boto3"
+  ];
 
   dependencies = [
     aioboto3

From 50deeea06573203c66d59eaff5bf252d533a2efd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 06:09:04 +0200
Subject: [PATCH 1521/3724] python3Packages.pyvisa: 1.14.1 -> 1.15.0

https://github.com/pyvisa/pyvisa/compare/refs/tags/1.14.1...refs/tags/1.15.0
---
 pkgs/development/python-modules/pyvisa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyvisa/default.nix b/pkgs/development/python-modules/pyvisa/default.nix
index 3a7fea7b051f..465057dde14e 100644
--- a/pkgs/development/python-modules/pyvisa/default.nix
+++ b/pkgs/development/python-modules/pyvisa/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyvisa";
-  version = "1.14.1";
+  version = "1.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "pyvisa";
     repo = "pyvisa";
     tag = version;
-    hash = "sha256-GKrgUK2nSZi+8oJoS45MjpU9+INEgcla9Kaw6ceNVp0=";
+    hash = "sha256-cjKOyBn5O7ThZI7pi6JXeLhe47xGbhQaSRcAqXb3lV8=";
   };
 
   nativeBuildInputs = [

From a0d38a6f9b1ca512af2cd17910bd5b98389e969c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 06:10:33 +0200
Subject: [PATCH 1522/3724] python3Packages.ha-silabs-firmware-client: test
 with pytest-asyncio

---
 .../python-modules/ha-silabs-firmware-client/default.nix        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix b/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix
index 2264a9a20d2f..dd983d98cdd4 100644
--- a/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix
+++ b/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   lib,
+  pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -41,6 +42,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     aioresponses
+    pytest-asyncio
     pytestCheckHook
   ];
 

From 09336855e9d2303332693b1bb4c04db8a1063c66 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 06:11:48 +0200
Subject: [PATCH 1523/3724] python3Packages.adlfs: relax azure-datalake-store
 constraint

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

diff --git a/pkgs/development/python-modules/adlfs/default.nix b/pkgs/development/python-modules/adlfs/default.nix
index 729323af99ff..d0f3e8b5a399 100644
--- a/pkgs/development/python-modules/adlfs/default.nix
+++ b/pkgs/development/python-modules/adlfs/default.nix
@@ -41,6 +41,8 @@ buildPythonPackage rec {
     fsspec
   ];
 
+  pythonRelaxDeps = [ "azure-datalake-store" ];
+
   # Tests require a running Docker instance
   doCheck = false;
 

From b2f4ebf45045fc35055a5f0e6daafe3471720bbe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 06:12:42 +0200
Subject: [PATCH 1524/3724] python3Packages.aiorpcx: pin pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix
index 9ed371bb9d86..c217cdfe6f3b 100644
--- a/pkgs/development/python-modules/aiorpcx/default.nix
+++ b/pkgs/development/python-modules/aiorpcx/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   setuptools,
   websockets,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytestCheckHook,
 }:
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   optional-dependencies.ws = [ websockets ];
 
   nativeCheckInputs = [
-    pytest-asyncio
+    pytest-asyncio_0
     pytestCheckHook
   ]
   ++ lib.flatten (lib.attrValues optional-dependencies);

From df72ed6e81c96008627b96f7dcbfbe008c9265c2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 06:27:19 +0200
Subject: [PATCH 1525/3724] python3Packages.pytest-factoryboy: 2.6.1 -> 2.8.1

https://github.com/pytest-dev/pytest-factoryboy/compare/2.6.1...2.8.1
---
 .../python-modules/pytest-factoryboy/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix
index b7e394233346..5f932e44d25f 100644
--- a/pkgs/development/python-modules/pytest-factoryboy/default.nix
+++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix
@@ -20,21 +20,21 @@
 
 buildPythonPackage rec {
   pname = "pytest-factoryboy";
-  version = "2.6.1";
-  format = "pyproject";
+  version = "2.8.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-factoryboy";
     rev = version;
-    sha256 = "sha256-GYqYwtbmMWVqImVPPBbZNRJJGcbksUPsIbi6QuPRMco=";
+    sha256 = "sha256-9dMsUujMCk89Ze4H9VJRS+ihjk0PAxKb8xqlw0+ROEI=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
   buildInputs = [ pytest ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     factory-boy
     inflection
     typing-extensions

From e753999a05d9007f33dbac9a0d94337b96ee3fcf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 06:32:26 +0200
Subject: [PATCH 1526/3724] python3Packags.hydra-core: pin pytest 8.3

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

diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix
index 132c8faba6a7..92ff70c9020b 100644
--- a/pkgs/development/python-modules/hydra-core/default.nix
+++ b/pkgs/development/python-modules/hydra-core/default.nix
@@ -20,7 +20,7 @@
   packaging,
 
   # tests
-  pytestCheckHook,
+  pytest8_3CheckHook,
   pythonAtLeast,
 }:
 
@@ -70,7 +70,7 @@ buildPythonPackage rec {
     packaging
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ pytest8_3CheckHook ];
 
   pytestFlags = [
     "-Wignore::UserWarning"

From 7802574fad2d51bf8ecf65a4ca3b4bd2b0292e76 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 06:33:26 +0200
Subject: [PATCH 1527/3724] python3Packages.llm-echo: test with pytest-asyncio

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

diff --git a/pkgs/development/python-modules/llm-echo/default.nix b/pkgs/development/python-modules/llm-echo/default.nix
index 588b6f64909d..d0ed2f5ab533 100644
--- a/pkgs/development/python-modules/llm-echo/default.nix
+++ b/pkgs/development/python-modules/llm-echo/default.nix
@@ -5,6 +5,7 @@
   setuptools,
   llm,
   llm-echo,
+  pytest-asyncio,
   pytestCheckHook,
   writableTmpDirAsHomeHook,
 }:
@@ -26,6 +27,7 @@ buildPythonPackage rec {
   dependencies = [ llm ];
 
   nativeCheckInputs = [
+    pytest-asyncio
     pytestCheckHook
     writableTmpDirAsHomeHook
   ];

From af0bf23fbccffd194e832271c965190f05e9257e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 06:35:44 +0200
Subject: [PATCH 1528/3724] python3Packages.flask-restful: pin pytest 8.3

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

diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix
index 5b25b9fc610e..cb3bdf117414 100644
--- a/pkgs/development/python-modules/flask-restful/default.nix
+++ b/pkgs/development/python-modules/flask-restful/default.nix
@@ -7,7 +7,7 @@
   flask,
   fetchpatch2,
   mock,
-  pytestCheckHook,
+  pytest8_3CheckHook,
   pythonOlder,
   pytz,
   six,
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     blinker
     mock
-    pytestCheckHook
+    pytest8_3CheckHook
   ];
 
   disabledTests = [

From 55e072780f2325b0fa9329c036efe0f09a092813 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 06:43:34 +0200
Subject: [PATCH 1529/3724] devpi-server: test with pytest-asyncio

---
 pkgs/development/tools/devpi-server/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix
index 9e52be186a3e..9cb67f2871c0 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -19,6 +19,7 @@
   py,
   httpx,
   pyramid,
+  pytest-asyncio,
   pytestCheckHook,
   repoze-lru,
   setuptools,
@@ -80,6 +81,7 @@ buildPythonApplication rec {
     beautifulsoup4
     nginx
     py
+    pytest-asyncio
     pytestCheckHook
     webtest
   ];

From 4b7835ff2cf6abb0440ecf855ab9d84c08848153 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 11:53:21 +0200
Subject: [PATCH 1530/3724] python3Packages.databricks-sql-connector: relax
 pandas constraint

---
 .../python-modules/databricks-sql-connector/default.nix          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix
index 4f1055f65296..f351e8d0b03b 100644
--- a/pkgs/development/python-modules/databricks-sql-connector/default.nix
+++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix
@@ -33,6 +33,7 @@ buildPythonPackage rec {
   };
 
   pythonRelaxDeps = [
+    "pandas"
     "pyarrow"
     "thrift"
   ];

From 50747e1cd227c054c7a0895bbcee3c7a35111a53 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 11:55:15 +0200
Subject: [PATCH 1531/3724] python3Packages.google-cloud-artifact-registry:
 test with pytest-asyncio

---
 .../google-cloud-artifact-registry/default.nix              | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix
index b5016ef74760..965c6bab7362 100644
--- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix
+++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix
@@ -7,6 +7,7 @@
   lib,
   proto-plus,
   protobuf,
+  pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -36,7 +37,10 @@ buildPythonPackage rec {
   ]
   ++ google-api-core.optional-dependencies.grpc;
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [
     "google.cloud.artifactregistry"

From 7eca9ef8d705cfb5680986e539be3af3b3579845 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 13:33:55 +0200
Subject: [PATCH 1532/3724] python3Packages.rasterio: relax cython constraint

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

diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index 47ef8ed31560..9fc55c214146 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -45,6 +45,11 @@ buildPythonPackage rec {
     hash = "sha256-InejYBRa4i0E2GxEWbtBpaErtcoYrhtypAlRtMlUoDk=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "cython~=3.0.2" cython
+  '';
+
   nativeBuildInputs = [
     cython
     gdal

From a364c9ce10e9acaea3d39298f6620fc6654c3002 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 14:07:20 +0200
Subject: [PATCH 1533/3724] python3Packages.django-q2: unpin hiredis, use
 redisTestHook

---
 .../python-modules/django-q2/default.nix      | 23 +++----------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/django-q2/default.nix b/pkgs/development/python-modules/django-q2/default.nix
index b520ea436776..53f3d46dfd90 100644
--- a/pkgs/development/python-modules/django-q2/default.nix
+++ b/pkgs/development/python-modules/django-q2/default.nix
@@ -10,10 +10,10 @@
   django-redis,
   fetchFromGitHub,
   hiredis,
-  pkgs,
   poetry-core,
   pytest-django,
   pytestCheckHook,
+  redisTestHook,
   stdenv,
 }:
 
@@ -49,31 +49,14 @@ buildPythonPackage rec {
     blessed
     croniter
     django-redis
-    # pyredis refuses to load with hiredis<3.0.0
-    (hiredis.overrideAttrs (
-      new: old: {
-        version = "3.1.0";
-        src = old.src.override {
-          tag = "v${new.version}";
-          hash = "sha256-ID5OJdARd2N2GYEpcYOpxenpZlhWnWr5fAClAgqEgGg=";
-        };
-      }
-    ))
+    hiredis
     pytest-django
     pytestCheckHook
+    redisTestHook
   ];
 
   pythonImportsCheck = [ "django_q" ];
 
-  preCheck = ''
-    ${pkgs.valkey}/bin/redis-server &
-    REDIS_PID=$!
-  '';
-
-  postCheck = ''
-    kill $REDIS_PID
-  '';
-
   env = {
     MONGO_HOST = "127.0.0.1";
     REDIS_HOST = "127.0.0.1";

From 0baff18099f0adcca85816279d7e18e3eadc4eeb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 14:07:37 +0200
Subject: [PATCH 1534/3724] mailman-web: drop patches on django-allauth, unpin
 hiredis

---
 pkgs/servers/mail/mailman/python.nix | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix
index 397362bd2e51..ffa3b18ea88b 100644
--- a/pkgs/servers/mail/mailman/python.nix
+++ b/pkgs/servers/mail/mailman/python.nix
@@ -36,19 +36,7 @@ lib.fix (
                 tag = new.version;
                 hash = "sha256-13/QbA//wyHE9yMB7Jy/sJEyqPKxiMN+CZwSc4U6okU=";
               };
-            }
-          );
-
-          # the redis python library only supports hiredis 3+ from version 5.1.0 onwards
-          hiredis = super.hiredis.overrideAttrs (
-            new:
-            { src, ... }:
-            {
-              version = "3.1.0";
-              src = src.override {
-                tag = new.version;
-                hash = "sha256-ID5OJdARd2N2GYEpcYOpxenpZlhWnWr5fAClAgqEgGg=";
-              };
+              patches = [ ];
             }
           );
         })

From 9eeb5917a15f10acfcaf65f4bc0c5ed879d24483 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 14:19:37 +0200
Subject: [PATCH 1535/3724] python3Packages.scooby: disable failing test

---
 pkgs/development/python-modules/scooby/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix
index 12bbb889ffd9..97a5eb288770 100644
--- a/pkgs/development/python-modules/scooby/default.nix
+++ b/pkgs/development/python-modules/scooby/default.nix
@@ -3,7 +3,9 @@
   beautifulsoup4,
   buildPythonPackage,
   fetchFromGitHub,
+  iniconfig,
   numpy,
+  psutil,
   pytest-console-scripts,
   pytestCheckHook,
   pythonOlder,
@@ -28,8 +30,16 @@ buildPythonPackage rec {
 
   build-system = [ setuptools-scm ];
 
+  optional-dependencies = {
+    cpu = [
+      psutil
+      # mkl
+    ];
+  };
+
   nativeCheckInputs = [
     beautifulsoup4
+    iniconfig
     numpy
     pytest-console-scripts
     pytestCheckHook
@@ -51,6 +61,8 @@ buildPythonPackage rec {
     "test_import_time"
     # TypeError: expected str, bytes or os.PathLike object, not list
     "test_cli"
+    # Fails to find iniconfig in environment
+    "test_auto_report"
   ];
 
   meta = with lib; {

From c11ef45024d82987a7a0ed81dbd9393e63489ec2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 14:20:46 +0200
Subject: [PATCH 1536/3724] python3Packages.esprima: pin to pytest 8.3

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

diff --git a/pkgs/development/python-modules/esprima/default.nix b/pkgs/development/python-modules/esprima/default.nix
index fde0d9260063..957b7bbb6f3c 100644
--- a/pkgs/development/python-modules/esprima/default.nix
+++ b/pkgs/development/python-modules/esprima/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
-  pytestCheckHook,
+  pytest8_3CheckHook,
 }:
 
 buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     sha256 = "WtkPCReXhxyr6pOzE9gsdIeBlLk+nSnbxkS3OowEaHo=";
   };
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ pytest8_3CheckHook ];
 
   enabledTestPaths = [ "test/__main__.py::TestEsprima" ];
 

From 97f4542664afc1018735aa01ac4a84ae244da2fe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 14:25:54 +0200
Subject: [PATCH 1537/3724] python3Packages.colormath: pin to pytest 8.3

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

diff --git a/pkgs/development/python-modules/colormath/default.nix b/pkgs/development/python-modules/colormath/default.nix
index d13d9a37efe1..b423ea754c56 100644
--- a/pkgs/development/python-modules/colormath/default.nix
+++ b/pkgs/development/python-modules/colormath/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   networkx,
   numpy,
-  pytestCheckHook,
+  pytest8_3CheckHook,
   pythonOlder,
   setuptools,
 }:
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     numpy
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ pytest8_3CheckHook ];
 
   pythonImportsCheck = [ "colormath" ];
 

From 5e25a7f6eefceeed14216a97cf2d713e2ebc335d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 14:38:29 +0200
Subject: [PATCH 1538/3724] python3Packages.comicon: relax ebooklib constraint

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

diff --git a/pkgs/development/python-modules/comicon/default.nix b/pkgs/development/python-modules/comicon/default.nix
index 068452ae4ef5..7177c27f8854 100644
--- a/pkgs/development/python-modules/comicon/default.nix
+++ b/pkgs/development/python-modules/comicon/default.nix
@@ -38,6 +38,7 @@ buildPythonPackage rec {
   ];
 
   pythonRelaxDeps = [
+    "ebooklib"
     "lxml"
     "pillow"
     "pypdf"

From caf7e71f074b95d27d0aff1dd323677361f6e342 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 14:39:34 +0200
Subject: [PATCH 1539/3724] python3Packages.cohere: relax httpx-sse constraint

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

diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix
index bcc2fb709123..484a4ab0a434 100644
--- a/pkgs/development/python-modules/cohere/default.nix
+++ b/pkgs/development/python-modules/cohere/default.nix
@@ -44,6 +44,8 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
+  pythonRelaxDeps = [ "httpx-sse" ];
+
   # tests require CO_API_KEY
   doCheck = false;
 

From 9f82a544cf6e5fc63f7c5ab715d5c578ca3a4137 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 14:43:28 +0200
Subject: [PATCH 1540/3724] python3Packages.rapidgzip: relax cython constraint

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

diff --git a/pkgs/development/python-modules/rapidgzip/default.nix b/pkgs/development/python-modules/rapidgzip/default.nix
index 4e1e2e7870a4..f3dc069b9fff 100644
--- a/pkgs/development/python-modules/rapidgzip/default.nix
+++ b/pkgs/development/python-modules/rapidgzip/default.nix
@@ -22,7 +22,9 @@ buildPythonPackage rec {
 
   prePatch = ''
     # pythonRelaxDeps doesn't work here
-    substituteInPlace pyproject.toml --replace-fail "setuptools >= 61.2, < 72" "setuptools"
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools >= 61.2, < 72" "setuptools" \
+      --replace-fail "cython >= 3, < 3.1" cython
   '';
 
   nativeBuildInputs = [

From d0c3178b71b272ddc711fbf104a5e9bf65689225 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 15:02:26 +0200
Subject: [PATCH 1541/3724] python3Packages.htmldate: relax lxml constraint

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

diff --git a/pkgs/development/python-modules/htmldate/default.nix b/pkgs/development/python-modules/htmldate/default.nix
index 9fa529db9c2d..c97199f97a3d 100644
--- a/pkgs/development/python-modules/htmldate/default.nix
+++ b/pkgs/development/python-modules/htmldate/default.nix
@@ -38,6 +38,8 @@ buildPythonPackage rec {
     urllib3
   ];
 
+  pythonRelaxDeps = [ "lxml" ];
+
   optional-dependencies = {
     speed = [
       faust-cchardet

From 18c8cae95f5e86efee342a71eef83f0756b64f19 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 15:04:03 +0200
Subject: [PATCH 1542/3724] python3Packages.preggy: pin to pytest 8.3,
 modernize

---
 .../python-modules/preggy/default.nix         | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix
index 4281e6de0edf..db95ae127885 100644
--- a/pkgs/development/python-modules/preggy/default.nix
+++ b/pkgs/development/python-modules/preggy/default.nix
@@ -2,27 +2,30 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   six,
   unidecode,
-  pytestCheckHook,
+  pytest8_3CheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "preggy";
   version = "1.4.4";
-  format = "setuptools";
-
-  propagatedBuildInputs = [
-    six
-    unidecode
-  ];
-  nativeCheckInputs = [ pytestCheckHook ];
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "25ba803afde4f35ef543a60915ced2e634926235064df717c3cb3e4e3eb4670c";
   };
 
+  build-system = [ setuptools ];
+
+  dependencies = [
+    six
+    unidecode
+  ];
+  nativeCheckInputs = [ pytest8_3CheckHook ];
+
   meta = with lib; {
     description = "Assertion library for Python";
     homepage = "http://heynemann.github.io/preggy/";

From 68af5d20df479c6350e9eeec50f8414ff353ee6b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 15:04:21 +0200
Subject: [PATCH 1543/3724] python3Packages.zha: test with pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix
index 4ce4ac77d040..196c5cc377fc 100644
--- a/pkgs/development/python-modules/zha/default.nix
+++ b/pkgs/development/python-modules/zha/default.nix
@@ -8,7 +8,7 @@
   pyserial,
   pyserial-asyncio,
   pyserial-asyncio-fast,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-timeout,
   pytest-xdist,
   pytestCheckHook,
@@ -68,7 +68,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     freezegun
-    pytest-asyncio
+    pytest-asyncio_0
     pytest-timeout
     pytest-xdist
     pytestCheckHook

From c8947cb5c2ee9328ab93d01f1dadf8b3943bf490 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 15:28:21 +0200
Subject: [PATCH 1544/3724] python3Packages.paste: ignore deprecation warning
 in tests

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

diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix
index ae7eb8b7a79e..5674b4ceb3f1 100644
--- a/pkgs/development/python-modules/paste/default.nix
+++ b/pkgs/development/python-modules/paste/default.nix
@@ -40,6 +40,11 @@ buildPythonPackage rec {
     touch tests/urlparser_data/secured.txt
   '';
 
+  disabledTests = [
+    # pkg_resources deprecation warning
+    "test_form"
+  ];
+
   pythonNamespaces = [ "paste" ];
 
   meta = with lib; {

From 49a57ffce93cb82db944419b1c4e7188683e4c3e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 15:59:59 +0200
Subject: [PATCH 1545/3724] python3Packages.blis: disable failing tests

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

diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix
index 0aabdaea5196..c77191f806f3 100644
--- a/pkgs/development/python-modules/blis/default.nix
+++ b/pkgs/development/python-modules/blis/default.nix
@@ -67,6 +67,11 @@ buildPythonPackage rec {
     rm -rf ./blis
   '';
 
+  disabledTestPaths = [
+    # ImportError: cannot import name 'NO_CONJUGATE' from 'blis.cy'
+    "tests/test_dotv.py"
+  ];
+
   passthru = {
     tests = {
       numpy_1 = blis.overridePythonAttrs (old: {

From 529c6b8df766b51e729e437827530c0dbdb0723c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 16:01:37 +0200
Subject: [PATCH 1546/3724] badsecret: relax viewstate constraint

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

diff --git a/pkgs/development/python-modules/badsecrets/default.nix b/pkgs/development/python-modules/badsecrets/default.nix
index e0c169e58b0e..08972bff8e4d 100644
--- a/pkgs/development/python-modules/badsecrets/default.nix
+++ b/pkgs/development/python-modules/badsecrets/default.nix
@@ -40,6 +40,8 @@ buildPythonPackage rec {
     viewstate
   ];
 
+  pythonRelaxDeps = [ "viewstate" ];
+
   pythonImportsCheck = [ "badsecrets" ];
 
   meta = {

From 232f9e1cd9799e1f4304781a02b95a029c46dde7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 16:12:48 +0200
Subject: [PATCH 1547/3724] python3Packages.fiona: relax cython constraint

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

diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index 5c3b15d96bef..6a7c8b51bee3 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -39,6 +39,11 @@ buildPythonPackage rec {
     hash = "sha256-5NN6PBh+6HS9OCc9eC2TcBvkcwtI4DV8qXnz4tlaMXc=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "cython~=3.0.2" cython
+  '';
+
   build-system = [
     cython
     gdal # for gdal-config

From b966b49bdd0952ce3bd2d98b0162132f70eb7485 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 16:11:36 +0200
Subject: [PATCH 1548/3724] python3Packages.dbt-protos: init at 1.0.351

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

diff --git a/pkgs/development/python-modules/dbt-protos/default.nix b/pkgs/development/python-modules/dbt-protos/default.nix
new file mode 100644
index 000000000000..c3601a48b7d6
--- /dev/null
+++ b/pkgs/development/python-modules/dbt-protos/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  protobuf,
+}:
+
+buildPythonPackage rec {
+  pname = "dbt-protos";
+  version = "1.0.351";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dbt-labs";
+    repo = "proto-python-public";
+    tag = "v${version}";
+    hash = "sha256-GZwSJAElE/aUS4cCqMlmUJVtm+OACjKakXUxkrpVUyE=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    protobuf
+  ];
+
+  pythonImportsCheck = [
+    "dbtlabs.proto.public.v1"
+  ];
+
+  meta = {
+    description = "dbt public protos";
+    homepage = "https://github.com/dbt-labs/proto-python-public";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1bd072e7fd30..9d17e9b00f43 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3389,6 +3389,8 @@ self: super: with self; {
 
   dbt-postgres = callPackage ../development/python-modules/dbt-postgres { };
 
+  dbt-protos = callPackage ../development/python-modules/dbt-protos { };
+
   dbt-redshift = callPackage ../development/python-modules/dbt-redshift { };
 
   dbt-semantic-interfaces = callPackage ../development/python-modules/dbt-semantic-interfaces { };

From e7e7c5256c802823b978b7178441fcfe5dbcc24b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 16:13:15 +0200
Subject: [PATCH 1549/3724] python3Packages.dbt-adapters: 1.14.8 -> 1.16.3

https://github.com/dbt-labs/dbt-adapters/blob/main/dbt-adapters/CHANGELOG.md
---
 pkgs/development/python-modules/dbt-adapters/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix
index a142a26f0026..ca491b9afbbe 100644
--- a/pkgs/development/python-modules/dbt-adapters/default.nix
+++ b/pkgs/development/python-modules/dbt-adapters/default.nix
@@ -3,6 +3,7 @@
   agate,
   buildPythonPackage,
   dbt-common,
+  dbt-protos,
   fetchPypi,
   hatchling,
   mashumaro,
@@ -14,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "dbt-adapters";
-  version = "1.14.8";
+  version = "1.16.3";
   pyproject = true;
 
   # missing tags on GitHub
   src = fetchPypi {
     pname = "dbt_adapters";
     inherit version;
-    hash = "sha256-lowoP5Ny5kObKMuscecSUuqQXG7GxEDlbp8HQkLifBc=";
+    hash = "sha256-1J0+V776ujbt8Anm/gAdld0MkC5apmeN8IEtzZBSWf8=";
   };
 
   build-system = [ hatchling ];
@@ -34,6 +35,7 @@ buildPythonPackage rec {
   dependencies = [
     agate
     dbt-common
+    dbt-protos
     mashumaro
     protobuf
     pytz

From 4e33b386252cd42db3a2f1ca56e028b8bfa2278c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 16:30:49 +0200
Subject: [PATCH 1550/3724] python3Packages.sqlglot: 26.16.2 -> 27.6.0

https://github.com/tobymao/sqlglot/blob/v27.6.0/CHANGELOG.md
---
 pkgs/development/python-modules/sqlglot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix
index 7b109e1f2590..5b6bb1ceec67 100644
--- a/pkgs/development/python-modules/sqlglot/default.nix
+++ b/pkgs/development/python-modules/sqlglot/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "sqlglot";
-  version = "26.16.2";
+  version = "27.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     repo = "sqlglot";
     owner = "tobymao";
     tag = "v${version}";
-    hash = "sha256-uX72AHr4IC+u5AYkW/3myruVPs5NZ1V3THVg+9GWxpg=";
+    hash = "sha256-/+hrbyAQJHbKzjaBr9ssuXuKpbCSWAarLa5oX5NqfOc=";
   };
 
   build-system = [

From dde0af01da6d2d808dc5b19239667c88de66753d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 16:37:47 +0200
Subject: [PATCH 1551/3724] python3Packages.aioasuswrt: test with
 pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/aioasuswrt/default.nix b/pkgs/development/python-modules/aioasuswrt/default.nix
index ff54fa553086..2544f86902ee 100644
--- a/pkgs/development/python-modules/aioasuswrt/default.nix
+++ b/pkgs/development/python-modules/aioasuswrt/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytest-cov-stub,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-mock,
   pytestCheckHook,
   pythonOlder,
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   dependencies = [ asyncssh ];
 
   nativeCheckInputs = [
-    pytest-asyncio
+    pytest-asyncio_0
     pytest-cov-stub
     pytest-mock
     pytestCheckHook

From 269737dcd734fa3e27eeea2c61ecbfe28c2cfb41 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 16:38:28 +0200
Subject: [PATCH 1552/3724] python3Packages.papermill: disable failing test

This is due to API compat issues with azure data lake.
---
 pkgs/development/python-modules/papermill/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix
index 9ece875296c3..5e6bb7b71327 100644
--- a/pkgs/development/python-modules/papermill/default.nix
+++ b/pkgs/development/python-modules/papermill/default.nix
@@ -95,6 +95,9 @@ buildPythonPackage rec {
   disabledTests = [
     # pytest 8 compat
     "test_read_with_valid_file_extension"
+
+    # azure datalake api compat issue
+    "test_create_adapter"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # might fail due to the sandbox

From 96d0791b0200ddde572f1b52bb4dc919870289fe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 16:45:18 +0200
Subject: [PATCH 1553/3724] python3Packages.sqlframe: 3.38.0 -> 3.38.2

https://github.com/eakmanrq/sqlframe/releases/tag/v3.38.1
https://github.com/eakmanrq/sqlframe/releases/tag/v3.38.2
---
 pkgs/development/python-modules/sqlframe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlframe/default.nix b/pkgs/development/python-modules/sqlframe/default.nix
index 8ec28de12a82..e5d4dca2f152 100644
--- a/pkgs/development/python-modules/sqlframe/default.nix
+++ b/pkgs/development/python-modules/sqlframe/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "sqlframe";
-  version = "3.38.0";
+  version = "3.38.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eakmanrq";
     repo = "sqlframe";
     tag = "v${version}";
-    hash = "sha256-zzYhKAteYKvm6p6LkuGEDHJcOz9Miaqv2zztLlfTY1A=";
+    hash = "sha256-ekDt9vsHdHhUNaQghG3EaM82FRZYdw+gaxENcurSayk=";
   };
 
   build-system = [

From 2da0963ea4749569905448d02d3ea36c03591b75 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 16:55:06 +0200
Subject: [PATCH 1554/3724] python3Packages.jsonrpc-websocekt: test with
 pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix
index 8047a7a7ebec..8fd8391120a6 100644
--- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix
@@ -5,7 +5,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   jsonrpc-base,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pytest-asyncio
+    pytest-asyncio_0
     pytestCheckHook
   ];
 

From 49106db86be83f2a9c9142e2caf9005758cbf87e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 17:01:58 +0200
Subject: [PATCH 1555/3724] python3Packages.aiolookin: disable tests

They're async, have previously been skipped and are now erroring out.
---
 pkgs/development/python-modules/aiolookin/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix
index 677d9ba7c72e..fa1d100cb914 100644
--- a/pkgs/development/python-modules/aiolookin/default.nix
+++ b/pkgs/development/python-modules/aiolookin/default.nix
@@ -26,6 +26,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ aiohttp ];
 
+  doCheck = false; # all tests are async and no async plugin is configured
+
   nativeCheckInputs = [
     faker
     pytest-aiohttp
@@ -33,11 +35,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # Not all tests are ready yet
-    "test_successful"
-  ];
-
   pythonImportsCheck = [ "aiolookin" ];
 
   meta = with lib; {

From 81ec1790fb5f512b48bcd71483a9ea1ee8aef671 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 17:10:17 +0200
Subject: [PATCH 1556/3724] python3Packages.aiohttp-sse: test with
 pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/aiohttp-sse/default.nix b/pkgs/development/python-modules/aiohttp-sse/default.nix
index 851f0fef08cb..ec7f64216c64 100644
--- a/pkgs/development/python-modules/aiohttp-sse/default.nix
+++ b/pkgs/development/python-modules/aiohttp-sse/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   lib,
   pytest-aiohttp,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-cov-stub,
   pytestCheckHook,
   setuptools,
@@ -31,8 +31,8 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "aiohttp_sse" ];
 
   nativeCheckInputs = [
-    pytest-aiohttp
-    pytest-asyncio
+    (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; })
+    pytest-asyncio_0
     pytest-cov-stub
     pytestCheckHook
   ];

From 90c6bf298698c027fb43e37e4adde9bc954847d5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 17:12:15 +0200
Subject: [PATCH 1557/3724] python3Packages.async-modbus: test with
 pytest-asyncio

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

diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix
index 83efbef9a9cb..dcc5a4247a6f 100644
--- a/pkgs/development/python-modules/async-modbus/default.nix
+++ b/pkgs/development/python-modules/async-modbus/default.nix
@@ -4,6 +4,7 @@
   connio,
   fetchFromGitHub,
   fetchpatch,
+  pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
@@ -46,6 +47,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    pytest-asyncio
     pytest-cov-stub
     pytestCheckHook
   ];

From 8904a86f24102b5e7dc308757e7fdbdc25d5fff1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 17:14:16 +0200
Subject: [PATCH 1558/3724] python3Packages.aionotion: relax various
 dependencies

---
 pkgs/development/python-modules/aionotion/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix
index 26fa8135038f..048ef8c0518f 100644
--- a/pkgs/development/python-modules/aionotion/default.nix
+++ b/pkgs/development/python-modules/aionotion/default.nix
@@ -32,6 +32,11 @@ buildPythonPackage rec {
     hash = "sha256-MqH3CPp+dAX5DXtnHio95KGQ+Ok2TXrX6rn/AMx5OsY=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "poetry-core==" "poetry-core>="
+  '';
+
   nativeBuildInputs = [ poetry-core ];
 
   propagatedBuildInputs = [
@@ -44,6 +49,12 @@ buildPythonPackage rec {
     yarl
   ];
 
+  pythonRelaxDeps = [
+    "ciso8601"
+    "frozenlist"
+    "mashumaro"
+  ];
+
   __darwinAllowLocalNetworking = true;
 
   nativeCheckInputs = [

From b4153e18370ffefea72e8c83cc698e15b219328d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 17:16:53 +0200
Subject: [PATCH 1559/3724] python3Packages.opower: fix tests

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

diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index c980deaaba50..270f3fcc91e0 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -41,6 +41,11 @@ buildPythonPackage rec {
     python-dotenv
   ];
 
+  disabledTestPaths = [
+    # network access
+    "tests/test_opower.py"
+  ];
+
   pythonImportsCheck = [ "opower" ];
 
   disabledTests = [

From a5fed110c4f204c2e40363a57bd2901434473e5b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 17:31:16 +0200
Subject: [PATCH 1560/3724] python3Packages.pyrainbird: test with
 pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix
index ba3bd8c2eee9..b145c5bd469e 100644
--- a/pkgs/development/python-modules/pyrainbird/default.nix
+++ b/pkgs/development/python-modules/pyrainbird/default.nix
@@ -9,7 +9,7 @@
   parameterized,
   pycryptodome,
   pytest-aiohttp,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-cov-stub,
   pytest-golden,
   pytest-mock,
@@ -54,8 +54,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     freezegun
     parameterized
-    pytest-aiohttp
-    pytest-asyncio
+    (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; })
+    pytest-asyncio_0
     pytest-cov-stub
     pytest-golden
     pytest-mock

From 303014c8ceb3fc7726c5457c602b0d1a3c1a4e1d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 17:55:15 +0200
Subject: [PATCH 1561/3724] python3Packages.pysiaalarm: fix tests

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

diff --git a/pkgs/development/python-modules/pysiaalarm/default.nix b/pkgs/development/python-modules/pysiaalarm/default.nix
index 2bb3e6611a82..1ec26947d356 100644
--- a/pkgs/development/python-modules/pysiaalarm/default.nix
+++ b/pkgs/development/python-modules/pysiaalarm/default.nix
@@ -6,7 +6,7 @@
   dataclasses-json,
   pycryptodome,
   setuptools-scm,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-cases,
   pytest-cov-stub,
   pytestCheckHook,
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pytest-asyncio
+    pytest-asyncio_0
     pytest-cases
     pytest-cov-stub
     pytestCheckHook

From 827bea50532dfc57dbcc91844d6d521b6ddf95a9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:02:49 +0200
Subject: [PATCH 1562/3724] python3Packages.pytest-mockservers: disable failing
 test

The event_loop fixutre was deprecated in pytest-asyncio 0.22 and removed
in 1.0. Since pytest-mockservers propagates pytest-asyncio we must not
propagate anything but the default pytest-asyncio package.
---
 pkgs/development/python-modules/pytest-mockservers/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/pytest-mockservers/default.nix b/pkgs/development/python-modules/pytest-mockservers/default.nix
index 4f521fc236bf..6f8ad594ab5f 100644
--- a/pkgs/development/python-modules/pytest-mockservers/default.nix
+++ b/pkgs/development/python-modules/pytest-mockservers/default.nix
@@ -46,6 +46,9 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  # relies on the removed event_loop fixture
+  disabledTests = [ "test_udp_server_factory" ];
+
   pythonImportsCheck = [ "pytest_mockservers" ];
 
   meta = with lib; {

From 6e4f0b2c9a20746edd1657844fb0035de33334b6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:16:43 +0200
Subject: [PATCH 1563/3724] python3Packages.thermopro-ble: fix tests

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

diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix
index 0da7947b12c6..8e6f8fa45df6 100644
--- a/pkgs/development/python-modules/thermopro-ble/default.nix
+++ b/pkgs/development/python-modules/thermopro-ble/default.nix
@@ -5,6 +5,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
+  pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
@@ -34,6 +35,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    pytest-asyncio
     pytest-cov-stub
     pytestCheckHook
   ];

From 230bfa29e66e854ddb04f41b85f6e67e7d14fb8f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:17:59 +0200
Subject: [PATCH 1564/3724] python3Packages.uasiren: fix tests

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

diff --git a/pkgs/development/python-modules/uasiren/default.nix b/pkgs/development/python-modules/uasiren/default.nix
index 7b26d889cedc..e82ee94bb7ae 100644
--- a/pkgs/development/python-modules/uasiren/default.nix
+++ b/pkgs/development/python-modules/uasiren/default.nix
@@ -10,6 +10,7 @@
   aiohttp,
 
   # tests
+  pytest-asyncio,
   pytestCheckHook,
 }:
 
@@ -33,7 +34,10 @@ buildPythonPackage {
 
   propagatedBuildInputs = [ aiohttp ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [
     "uasiren"

From 02adcf1e59bceb889d93a77fc93387a74e0f0001 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:18:29 +0200
Subject: [PATCH 1565/3724] python3Packages.xbox-webapi: fix tests, modernize

---
 .../development/python-modules/xbox-webapi/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/xbox-webapi/default.nix b/pkgs/development/python-modules/xbox-webapi/default.nix
index 07aabe725302..53932099f0dc 100644
--- a/pkgs/development/python-modules/xbox-webapi/default.nix
+++ b/pkgs/development/python-modules/xbox-webapi/default.nix
@@ -9,7 +9,7 @@
   httpx,
   ms-cv,
   pydantic,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytestCheckHook,
   respx,
 }:
@@ -19,8 +19,6 @@ buildPythonPackage rec {
   version = "2.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "OpenXbox";
     repo = "xbox-webapi-python";
@@ -28,9 +26,9 @@ buildPythonPackage rec {
     hash = "sha256-9A3gdSlRjBCx5fBW+jkaSWsFuGieXQKvbEbZzGzLf94=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     appdirs
     ecdsa
     httpx
@@ -39,7 +37,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pytest-asyncio
+    pytest-asyncio_0
     pytestCheckHook
     respx
   ];

From 51e2f19a6c6f1a1dfb3c3986155672da8fc13934 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:20:38 +0200
Subject: [PATCH 1566/3724] python3Packages.azure-kusto-ingest: relax deps

---
 .../python-modules/azure-kusto-ingest/default.nix            | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/azure-kusto-ingest/default.nix b/pkgs/development/python-modules/azure-kusto-ingest/default.nix
index d7665307e481..c59e9a57eb39 100644
--- a/pkgs/development/python-modules/azure-kusto-ingest/default.nix
+++ b/pkgs/development/python-modules/azure-kusto-ingest/default.nix
@@ -40,6 +40,11 @@ buildPythonPackage rec {
     tenacity
   ];
 
+  pythonRelaxDeps = [
+    "azure-storage-blob"
+    "azure-storage-queue"
+  ];
+
   optional-dependencies = {
     pandas = [ pandas ];
   };

From 515365c3b188f1d2fb93358a4cc45343a9e52063 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:24:35 +0200
Subject: [PATCH 1567/3724] python3Packages.python-awair: disable tests

Can't get these to run, likely requires a pytest-aiohttp update.
---
 pkgs/development/python-modules/python-awair/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/python-awair/default.nix b/pkgs/development/python-modules/python-awair/default.nix
index c814188477fa..21d946e89d62 100644
--- a/pkgs/development/python-modules/python-awair/default.nix
+++ b/pkgs/development/python-modules/python-awair/default.nix
@@ -31,6 +31,9 @@ buildPythonPackage rec {
     voluptuous
   ];
 
+  # Failed: async def functions are not natively supported.
+  doCheck = false;
+
   nativeCheckInputs = [
     pytest-aiohttp
     pytestCheckHook

From 7ffdd3634348e19978fbb3c9086c7c6fc7ff0979 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:28:10 +0200
Subject: [PATCH 1568/3724] python3Packages.pybalboa: fix tests

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

diff --git a/pkgs/development/python-modules/pybalboa/default.nix b/pkgs/development/python-modules/pybalboa/default.nix
index e00186809690..5ad085c44975 100644
--- a/pkgs/development/python-modules/pybalboa/default.nix
+++ b/pkgs/development/python-modules/pybalboa/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   poetry-core,
   poetry-dynamic-versioning,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytestCheckHook,
 }:
 
@@ -27,10 +27,15 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pytest-asyncio
+    pytest-asyncio_0
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # async def functions are not natively supported.
+    "test_cancel_task"
+  ];
+
   pythonImportsCheck = [ "pybalboa" ];
 
   meta = with lib; {

From a4afa02375eac602457ec0024a2c922a74a5720e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:31:59 +0200
Subject: [PATCH 1569/3724] python3Packages.pydaikin: disable failing async
 tests

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

diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix
index 877da83d4cba..66342b59f205 100644
--- a/pkgs/development/python-modules/pydaikin/default.nix
+++ b/pkgs/development/python-modules/pydaikin/default.nix
@@ -46,6 +46,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # Failed: async def functions are not natively supported.
+    "test_power_sensors"
+    "test_device_factory"
+  ];
+
   pythonImportsCheck = [ "pydaikin" ];
 
   meta = with lib; {

From 4604e330bac6daa881ef9722ee3cdb6b800929c3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:33:38 +0200
Subject: [PATCH 1570/3724] python3Packages.aioeafm: disable tests

All are async and not properly configured for pytest-asyncio.
---
 pkgs/development/python-modules/aioeafm/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix
index 056e9bd6b8eb..95b287786cdd 100644
--- a/pkgs/development/python-modules/aioeafm/default.nix
+++ b/pkgs/development/python-modules/aioeafm/default.nix
@@ -37,6 +37,8 @@ buildPythonPackage rec {
 
   dependencies = [ aiohttp ];
 
+  doCheck = false; # Failed: async def functions are not natively supported.
+
   nativeCheckInputs = [
     pytest-aiohttp
     pytestCheckHook

From 8f1e8bf7214c9552d6cb10742e5d21633639435f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:34:01 +0200
Subject: [PATCH 1571/3724] python3Packages.aioecowitt: fix tests with
 pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/aioecowitt/default.nix b/pkgs/development/python-modules/aioecowitt/default.nix
index 15be3f422192..88f0db5ac7b4 100644
--- a/pkgs/development/python-modules/aioecowitt/default.nix
+++ b/pkgs/development/python-modules/aioecowitt/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   meteocalc,
+  pytest-asyncio_0,
   pytest-aiohttp,
   pytestCheckHook,
   pythonOlder,
@@ -32,7 +33,8 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pytest-aiohttp
+    pytest-asyncio_0
+    (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; })
     pytestCheckHook
   ];
 

From 395db2261ce22eb66038eb161c4b99d3965933a8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:37:05 +0200
Subject: [PATCH 1572/3724] python3Packages.afsapi: disable tests

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

diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix
index d58391180025..40ce655ab559 100644
--- a/pkgs/development/python-modules/afsapi/default.nix
+++ b/pkgs/development/python-modules/afsapi/default.nix
@@ -31,6 +31,8 @@ buildPythonPackage rec {
     lxml
   ];
 
+  doCheck = false; # Failed: async def functions are not natively supported.
+
   nativeCheckInputs = [
     pytest-aiohttp
     pytestCheckHook

From db197bde56c80306356c837322f8ec36e0d5060b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:37:13 +0200
Subject: [PATCH 1573/3724] python3Packages.fyta-cli

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

diff --git a/pkgs/development/python-modules/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix
index c81ec0c160a6..4c92997a7fa8 100644
--- a/pkgs/development/python-modules/fyta-cli/default.nix
+++ b/pkgs/development/python-modules/fyta-cli/default.nix
@@ -33,6 +33,8 @@ buildPythonPackage rec {
     mashumaro
   ];
 
+  doCheck = false; # Failed: async def functions are not natively supported.
+
   nativeCheckInputs = [
     aioresponses
     pytest-asyncio

From 6a335009c23cd83e35ed4996aea218658fe86622 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:39:28 +0200
Subject: [PATCH 1574/3724] python3Packages.geocachingapi: relax
 reverse-geocode constraint

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

diff --git a/pkgs/development/python-modules/geocachingapi/default.nix b/pkgs/development/python-modules/geocachingapi/default.nix
index 47364ccbea16..554df72a7009 100644
--- a/pkgs/development/python-modules/geocachingapi/default.nix
+++ b/pkgs/development/python-modules/geocachingapi/default.nix
@@ -33,6 +33,8 @@ buildPythonPackage rec {
     yarl
   ];
 
+  pythonRelaxDeps = [ "reverse_geocode" ];
+
   # Tests require a token and network access
   doCheck = false;
 

From 2d0834007214046bb343e3fe331d97a7e94963a1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:39:42 +0200
Subject: [PATCH 1575/3724] python3Packages.aiohomekit: test with
 pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix
index 4bd67403b3ad..3498ee8f5a6b 100644
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@@ -13,6 +13,7 @@
   fetchFromGitHub,
   orjson,
   poetry-core,
+  pytest-asyncio_0,
   pytest-aiohttp,
   pytestCheckHook,
   pythonOlder,
@@ -50,7 +51,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pytest-aiohttp
+    (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; })
     pytestCheckHook
   ];
 

From 3d3eb1e4079edcb844aac5907b6ac35982d3c785 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:44:30 +0200
Subject: [PATCH 1576/3724] python3Packages.hyperion-py: test with
 pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix
index 5cb6a69ec2ac..a6803e8bc26e 100644
--- a/pkgs/development/python-modules/hyperion-py/default.nix
+++ b/pkgs/development/python-modules/hyperion-py/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   poetry-core,
   pytest-aiohttp,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-cov-stub,
   pytest-timeout,
   pytestCheckHook,
@@ -28,8 +28,8 @@ buildPythonPackage rec {
   dependencies = [ aiohttp ];
 
   nativeCheckInputs = [
-    pytest-asyncio
-    pytest-aiohttp
+    pytest-asyncio_0
+    (pytest-aiohttp.override { pytest-asyncio = pytest-asyncio_0; })
     pytest-cov-stub
     pytest-timeout
     pytestCheckHook

From 7e45eeb84da09615f37c10380164023cfd7f5dc6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:44:50 +0200
Subject: [PATCH 1577/3724] python3Packages.devolo-plc-api: test with
 pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix
index d9dcbbb73a3f..89f1bbb6853b 100644
--- a/pkgs/development/python-modules/devolo-plc-api/default.nix
+++ b/pkgs/development/python-modules/devolo-plc-api/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   httpx,
   protobuf,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-httpx,
   pytest-mock,
   pytestCheckHook,
@@ -48,7 +48,7 @@ buildPythonPackage rec {
   __darwinAllowLocalNetworking = true;
 
   nativeCheckInputs = [
-    pytest-asyncio
+    pytest-asyncio_0
     pytest-httpx
     pytest-mock
     pytestCheckHook

From db4f5b254fd9016e48e76ccf69d15c940f220b77 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:46:40 +0200
Subject: [PATCH 1578/3724] python3Packages.aioimaplib: test with
 pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix
index 2c9502ff289a..5d6205362fa5 100644
--- a/pkgs/development/python-modules/aioimaplib/default.nix
+++ b/pkgs/development/python-modules/aioimaplib/default.nix
@@ -7,7 +7,7 @@
   mock,
   poetry-core,
   pyopenssl,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytestCheckHook,
   pytz,
 }:
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     imaplib2
     mock
     pyopenssl
-    pytest-asyncio
+    pytest-asyncio_0
     pytestCheckHook
     pytz
   ];

From 292018ede4e2c80f6e42e42086b4f3e48edc9cf0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:48:01 +0200
Subject: [PATCH 1579/3724] python3Packages.inkbird-ble: run async tests

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

diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix
index b2a31ed4c13c..4d507af22ac1 100644
--- a/pkgs/development/python-modules/inkbird-ble/default.nix
+++ b/pkgs/development/python-modules/inkbird-ble/default.nix
@@ -6,6 +6,7 @@
   fetchFromGitHub,
   home-assistant-bluetooth,
   poetry-core,
+  pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
@@ -36,6 +37,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    pytest-asyncio
     pytest-cov-stub
     pytestCheckHook
   ];

From 01bacf82c3578cb8c90eb5c5e3bb66d7403140c0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:48:48 +0200
Subject: [PATCH 1580/3724] python3Packages.pykaleidescape: test with
 pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/pykaleidescape/default.nix b/pkgs/development/python-modules/pykaleidescape/default.nix
index e461e8e66167..64b495fe92f8 100644
--- a/pkgs/development/python-modules/pykaleidescape/default.nix
+++ b/pkgs/development/python-modules/pykaleidescape/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   dnspython,
   fetchFromGitHub,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytestCheckHook,
   pythonAtLeast,
   pythonOlder,
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pytest-asyncio
+    pytest-asyncio_0
     pytestCheckHook
   ];
 

From a656b9be6b22b67f1bb39cd5a495a4c4df7ce59b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:49:02 +0200
Subject: [PATCH 1581/3724] python3Packages.xknx: test with pytest-asyncio 0.x

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

diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix
index 6c8692ccf9b1..26947d8b5d6b 100644
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@@ -6,7 +6,7 @@
   cryptography,
   ifaddr,
   freezegun,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     freezegun
-    pytest-asyncio
+    pytest-asyncio_0
     pytestCheckHook
   ];
 

From 00bc155a5e0a172d779284fa5511dbaec6a1e706 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 9 Aug 2025 18:54:26 +0200
Subject: [PATCH 1582/3724] python3Packages.langchain-tests: pin pytest-asyncio
 0.x

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

diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix
index 4a46ed7c3142..42afbb15a0cc 100644
--- a/pkgs/development/python-modules/langchain-tests/default.nix
+++ b/pkgs/development/python-modules/langchain-tests/default.nix
@@ -20,7 +20,7 @@
 
   # tests
   numpy,
-  pytest-asyncio,
+  pytest-asyncio_0,
   pytest-socket,
   pytestCheckHook,
 
@@ -54,7 +54,7 @@ buildPythonPackage rec {
   dependencies = [
     httpx
     langchain-core
-    pytest-asyncio
+    pytest-asyncio_0
     pytest-benchmark
     pytest-codspeed
     pytest-recording

From 8e2040201c7c6d316dce4ba0ce892e64bd92b8eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Fri, 25 Apr 2025 21:47:45 +0200
Subject: [PATCH 1583/3724] python3Packages.sanic: re-enable darwin tests

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

diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index 10fed42b4bda..5c5bf2c460c7 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -69,8 +69,6 @@ buildPythonPackage rec {
   ]
   ++ optional-dependencies.http3;
 
-  doCheck = !stdenv.hostPlatform.isDarwin;
-
   preCheck = ''
     # Some tests depends on sanic on PATH
     PATH="$out/bin:$PATH"
@@ -78,6 +76,11 @@ buildPythonPackage rec {
 
     # needed for relative paths for some packages
     cd tests
+  ''
+  # Work around "OSError: AF_UNIX path too long"
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace worker/test_socket.py \
+      --replace-fail '"./test.sock"' '"/tmp/test.sock"'
   '';
 
   disabledTests = [

From 138f224dd1fffadf11115ba99e7be5260eb008e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 18:20:09 +0000
Subject: [PATCH 1584/3724] ente-web: 1.1.57 -> 1.2.0

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

diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix
index 1e717dae7ab1..13280d36642d 100644
--- a/pkgs/by-name/en/ente-web/package.nix
+++ b/pkgs/by-name/en/ente-web/package.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ente-web";
-  version = "1.1.57";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "ente-io";
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     sparseCheckout = [ "web" ];
     tag = "photos-v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-SCkxGm/w0kES7wDuLBsUTgwrFYNLvLD51NyioAVTLrg=";
+    hash = "sha256-SZSzPEA+/fEYbhjoulT4xnaTCqljsRJyqDVmY2QxGBM=";
   };
   sourceRoot = "${finalAttrs.src.name}/web";
 

From 8ecbb3985c30bd91dd26d21bcc152ab0502e20dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 21:49:47 +0000
Subject: [PATCH 1585/3724] kumactl: 2.11.1 -> 2.11.4

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

diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix
index 1d502bdd124d..240ff2e5333b 100644
--- a/pkgs/applications/networking/cluster/kuma/default.nix
+++ b/pkgs/applications/networking/cluster/kuma/default.nix
@@ -16,17 +16,17 @@
 
 buildGoModule rec {
   inherit pname;
-  version = "2.11.1";
+  version = "2.11.4";
   tags = lib.optionals enableGateway [ "gateway" ];
 
   src = fetchFromGitHub {
     owner = "kumahq";
     repo = "kuma";
     tag = version;
-    hash = "sha256-OOuGPVDuCwUhKr2K1sXs4hMWlOqGkXuBXj20ffwhCco=";
+    hash = "sha256-vYZLcY2z4gqf/DmYUEatTd2QJzb53rIXpX/w4hnRWps=";
   };
 
-  vendorHash = "sha256-hq+n9nTSf7LDMvlttTmk59pZQaJJIRlqwOSBtMJKPfc=";
+  vendorHash = "sha256-ycHaNTtoPeY+DJef1L+3WRtlBLbRedDaCb/49aaN1So=";
 
   # no test files
   doCheck = false;

From 5f974fa39f1ffb3e36f7b875ec52d2f64c2a8a99 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 10 Aug 2025 00:06:16 +0200
Subject: [PATCH 1586/3724] python313: revert commit that locks ssl sockets

This breaks among other things the websockets package and is due to be
reverted in 3.13.7.
---
 .../python/cpython/3.13/revert-gh134724.patch | 373 ++++++++++++++++++
 .../interpreters/python/cpython/default.nix   |   4 +
 2 files changed, 377 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/cpython/3.13/revert-gh134724.patch

diff --git a/pkgs/development/interpreters/python/cpython/3.13/revert-gh134724.patch b/pkgs/development/interpreters/python/cpython/3.13/revert-gh134724.patch
new file mode 100644
index 000000000000..f48dcf3b39da
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.13/revert-gh134724.patch
@@ -0,0 +1,373 @@
+commit 4a37dd6cef1556c64c2665061b5e01bbd2bb3a82
+Author: Gregory P. Smith <68491+gpshead@users.noreply.github.com>
+Date:   Sun Jul 27 08:30:25 2025 -0700
+
+    [3.13] gh-134698: Hold a lock when the thread state is detached in ssl (GH-134724) (#137126)
+    
+    Lock when the thread state is detached.
+    (cherry picked from commit e047a35b23c1aa69ab8d5da56f36319cec4d36b8) or really from the 3.14 backport fd565fdfc9c0001900d03d627e2fda83f1bcca90
+    
+    Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
+
+diff --git b/Modules/_ssl.c a/Modules/_ssl.c
+index 981c3d6a936..aa846f68641 100644
+--- b/Modules/_ssl.c
++++ a/Modules/_ssl.c
+@@ -42,14 +42,14 @@
+ /* Redefined below for Windows debug builds after important #includes */
+ #define _PySSL_FIX_ERRNO
+ 
+-#define PySSL_BEGIN_ALLOW_THREADS_S(save, mutex) \
+-    do { (save) = PyEval_SaveThread(); PyMutex_Lock(mutex); } while(0)
+-#define PySSL_END_ALLOW_THREADS_S(save, mutex) \
+-    do { PyMutex_Unlock(mutex); PyEval_RestoreThread(save); _PySSL_FIX_ERRNO; } while(0)
+-#define PySSL_BEGIN_ALLOW_THREADS(self) { \
++#define PySSL_BEGIN_ALLOW_THREADS_S(save) \
++    do { (save) = PyEval_SaveThread(); } while(0)
++#define PySSL_END_ALLOW_THREADS_S(save) \
++    do { PyEval_RestoreThread(save); _PySSL_FIX_ERRNO; } while(0)
++#define PySSL_BEGIN_ALLOW_THREADS { \
+             PyThreadState *_save = NULL;  \
+-            PySSL_BEGIN_ALLOW_THREADS_S(_save, &self->tstate_mutex);
+-#define PySSL_END_ALLOW_THREADS(self) PySSL_END_ALLOW_THREADS_S(_save, &self->tstate_mutex); }
++            PySSL_BEGIN_ALLOW_THREADS_S(_save);
++#define PySSL_END_ALLOW_THREADS PySSL_END_ALLOW_THREADS_S(_save); }
+ 
+ #if defined(HAVE_POLL_H)
+ #include <poll.h>
+@@ -304,9 +304,6 @@ typedef struct {
+     PyObject *psk_client_callback;
+     PyObject *psk_server_callback;
+ #endif
+-    /* Lock to synchronize calls when the thread state is detached.
+-       See also gh-134698. */
+-    PyMutex tstate_mutex;
+ } PySSLContext;
+ 
+ typedef struct {
+@@ -332,9 +329,6 @@ typedef struct {
+      * and shutdown methods check for chained exceptions.
+      */
+     PyObject *exc;
+-    /* Lock to synchronize calls when the thread state is detached.
+-       See also gh-134698. */
+-    PyMutex tstate_mutex;
+ } PySSLSocket;
+ 
+ typedef struct {
+@@ -846,14 +840,13 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
+     self->server_hostname = NULL;
+     self->err = err;
+     self->exc = NULL;
+-    self->tstate_mutex = (PyMutex){0};
+ 
+     /* Make sure the SSL error state is initialized */
+     ERR_clear_error();
+ 
+-    PySSL_BEGIN_ALLOW_THREADS(sslctx)
++    PySSL_BEGIN_ALLOW_THREADS
+     self->ssl = SSL_new(ctx);
+-    PySSL_END_ALLOW_THREADS(sslctx)
++    PySSL_END_ALLOW_THREADS
+     if (self->ssl == NULL) {
+         Py_DECREF(self);
+         _setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__);
+@@ -919,12 +912,12 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
+         BIO_set_nbio(SSL_get_wbio(self->ssl), 1);
+     }
+ 
+-    PySSL_BEGIN_ALLOW_THREADS(self)
++    PySSL_BEGIN_ALLOW_THREADS
+     if (socket_type == PY_SSL_CLIENT)
+         SSL_set_connect_state(self->ssl);
+     else
+         SSL_set_accept_state(self->ssl);
+-    PySSL_END_ALLOW_THREADS(self)
++    PySSL_END_ALLOW_THREADS
+ 
+     self->socket_type = socket_type;
+     if (sock != NULL) {
+@@ -993,10 +986,10 @@ _ssl__SSLSocket_do_handshake_impl(PySSLSocket *self)
+     /* Actually negotiate SSL connection */
+     /* XXX If SSL_do_handshake() returns 0, it's also a failure. */
+     do {
+-        PySSL_BEGIN_ALLOW_THREADS(self)
++        PySSL_BEGIN_ALLOW_THREADS
+         ret = SSL_do_handshake(self->ssl);
+         err = _PySSL_errno(ret < 1, self->ssl, ret);
+-        PySSL_END_ALLOW_THREADS(self)
++        PySSL_END_ALLOW_THREADS
+         self->err = err;
+ 
+         if (PyErr_CheckSignals())
+@@ -2369,10 +2362,9 @@ PySSL_select(PySocketSockObject *s, int writing, PyTime_t timeout)
+     ms = (int)_PyTime_AsMilliseconds(timeout, _PyTime_ROUND_CEILING);
+     assert(ms <= INT_MAX);
+ 
+-    Py_BEGIN_ALLOW_THREADS
++    PySSL_BEGIN_ALLOW_THREADS
+     rc = poll(&pollfd, 1, (int)ms);
+-    Py_END_ALLOW_THREADS
+-    _PySSL_FIX_ERRNO;
++    PySSL_END_ALLOW_THREADS
+ #else
+     /* Guard against socket too large for select*/
+     if (!_PyIsSelectable_fd(s->sock_fd))
+@@ -2384,14 +2376,13 @@ PySSL_select(PySocketSockObject *s, int writing, PyTime_t timeout)
+     FD_SET(s->sock_fd, &fds);
+ 
+     /* Wait until the socket becomes ready */
+-    Py_BEGIN_ALLOW_THREADS
++    PySSL_BEGIN_ALLOW_THREADS
+     nfds = Py_SAFE_DOWNCAST(s->sock_fd+1, SOCKET_T, int);
+     if (writing)
+         rc = select(nfds, NULL, &fds, NULL, &tv);
+     else
+         rc = select(nfds, &fds, NULL, NULL, &tv);
+-    Py_END_ALLOW_THREADS
+-    _PySSL_FIX_ERRNO;
++    PySSL_END_ALLOW_THREADS
+ #endif
+ 
+     /* Return SOCKET_TIMED_OUT on timeout, SOCKET_OPERATION_OK otherwise
+@@ -2462,10 +2453,10 @@ _ssl__SSLSocket_write_impl(PySSLSocket *self, Py_buffer *b)
+     }
+ 
+     do {
+-        PySSL_BEGIN_ALLOW_THREADS(self)
++        PySSL_BEGIN_ALLOW_THREADS
+         retval = SSL_write_ex(self->ssl, b->buf, (size_t)b->len, &count);
+         err = _PySSL_errno(retval == 0, self->ssl, retval);
+-        PySSL_END_ALLOW_THREADS(self)
++        PySSL_END_ALLOW_THREADS
+         self->err = err;
+ 
+         if (PyErr_CheckSignals())
+@@ -2523,10 +2514,10 @@ _ssl__SSLSocket_pending_impl(PySSLSocket *self)
+     int count = 0;
+     _PySSLError err;
+ 
+-    PySSL_BEGIN_ALLOW_THREADS(self)
++    PySSL_BEGIN_ALLOW_THREADS
+     count = SSL_pending(self->ssl);
+     err = _PySSL_errno(count < 0, self->ssl, count);
+-    PySSL_END_ALLOW_THREADS(self)
++    PySSL_END_ALLOW_THREADS
+     self->err = err;
+ 
+     if (count < 0)
+@@ -2617,10 +2608,10 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, Py_ssize_t len,
+         deadline = _PyDeadline_Init(timeout);
+ 
+     do {
+-        PySSL_BEGIN_ALLOW_THREADS(self)
++        PySSL_BEGIN_ALLOW_THREADS
+         retval = SSL_read_ex(self->ssl, mem, (size_t)len, &count);
+         err = _PySSL_errno(retval == 0, self->ssl, retval);
+-        PySSL_END_ALLOW_THREADS(self)
++        PySSL_END_ALLOW_THREADS
+         self->err = err;
+ 
+         if (PyErr_CheckSignals())
+@@ -2719,7 +2710,7 @@ _ssl__SSLSocket_shutdown_impl(PySSLSocket *self)
+     }
+ 
+     while (1) {
+-        PySSL_BEGIN_ALLOW_THREADS(self)
++        PySSL_BEGIN_ALLOW_THREADS
+         /* Disable read-ahead so that unwrap can work correctly.
+          * Otherwise OpenSSL might read in too much data,
+          * eating clear text data that happens to be
+@@ -2732,7 +2723,7 @@ _ssl__SSLSocket_shutdown_impl(PySSLSocket *self)
+             SSL_set_read_ahead(self->ssl, 0);
+         ret = SSL_shutdown(self->ssl);
+         err = _PySSL_errno(ret < 0, self->ssl, ret);
+-        PySSL_END_ALLOW_THREADS(self)
++        PySSL_END_ALLOW_THREADS
+         self->err = err;
+ 
+         /* If err == 1, a secure shutdown with SSL_shutdown() is complete */
+@@ -3124,10 +3115,9 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
+     // no other thread can be touching this object yet.
+     // (Technically, we can't even lock if we wanted to, as the
+     // lock hasn't been initialized yet.)
+-    Py_BEGIN_ALLOW_THREADS
++    PySSL_BEGIN_ALLOW_THREADS
+     ctx = SSL_CTX_new(method);
+-    Py_END_ALLOW_THREADS
+-    _PySSL_FIX_ERRNO;
++    PySSL_END_ALLOW_THREADS
+ 
+     if (ctx == NULL) {
+         _setSSLError(get_ssl_state(module), NULL, 0, __FILE__, __LINE__);
+@@ -3153,7 +3143,6 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
+     self->psk_client_callback = NULL;
+     self->psk_server_callback = NULL;
+ #endif
+-    self->tstate_mutex = (PyMutex){0};
+ 
+     /* Don't check host name by default */
+     if (proto_version == PY_SSL_VERSION_TLS_CLIENT) {
+@@ -3270,10 +3259,9 @@ context_clear(PySSLContext *self)
+     Py_CLEAR(self->psk_server_callback);
+ #endif
+     if (self->keylog_bio != NULL) {
+-        Py_BEGIN_ALLOW_THREADS
++        PySSL_BEGIN_ALLOW_THREADS
+         BIO_free_all(self->keylog_bio);
+-        Py_END_ALLOW_THREADS
+-        _PySSL_FIX_ERRNO;
++        PySSL_END_ALLOW_THREADS
+         self->keylog_bio = NULL;
+     }
+     return 0;
+@@ -3992,8 +3980,7 @@ _password_callback(char *buf, int size, int rwflag, void *userdata)
+     _PySSLPasswordInfo *pw_info = (_PySSLPasswordInfo*) userdata;
+     PyObject *fn_ret = NULL;
+ 
+-    pw_info->thread_state = PyThreadState_Swap(pw_info->thread_state);
+-    _PySSL_FIX_ERRNO;
++    PySSL_END_ALLOW_THREADS_S(pw_info->thread_state);
+ 
+     if (pw_info->error) {
+         /* already failed previously. OpenSSL 3.0.0-alpha14 invokes the
+@@ -4023,13 +4010,13 @@ _password_callback(char *buf, int size, int rwflag, void *userdata)
+         goto error;
+     }
+ 
+-    pw_info->thread_state = PyThreadState_Swap(pw_info->thread_state);
++    PySSL_BEGIN_ALLOW_THREADS_S(pw_info->thread_state);
+     memcpy(buf, pw_info->password, pw_info->size);
+     return pw_info->size;
+ 
+ error:
+     Py_XDECREF(fn_ret);
+-    pw_info->thread_state = PyThreadState_Swap(pw_info->thread_state);
++    PySSL_BEGIN_ALLOW_THREADS_S(pw_info->thread_state);
+     pw_info->error = 1;
+     return -1;
+ }
+@@ -4082,10 +4069,10 @@ _ssl__SSLContext_load_cert_chain_impl(PySSLContext *self, PyObject *certfile,
+         SSL_CTX_set_default_passwd_cb(self->ctx, _password_callback);
+         SSL_CTX_set_default_passwd_cb_userdata(self->ctx, &pw_info);
+     }
+-    PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex);
++    PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state);
+     r = SSL_CTX_use_certificate_chain_file(self->ctx,
+         PyBytes_AS_STRING(certfile_bytes));
+-    PySSL_END_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex);
++    PySSL_END_ALLOW_THREADS_S(pw_info.thread_state);
+     if (r != 1) {
+         if (pw_info.error) {
+             ERR_clear_error();
+@@ -4100,11 +4087,11 @@ _ssl__SSLContext_load_cert_chain_impl(PySSLContext *self, PyObject *certfile,
+         }
+         goto error;
+     }
+-    PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex);
++    PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state);
+     r = SSL_CTX_use_PrivateKey_file(self->ctx,
+         PyBytes_AS_STRING(keyfile ? keyfile_bytes : certfile_bytes),
+         SSL_FILETYPE_PEM);
+-    PySSL_END_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex);
++    PySSL_END_ALLOW_THREADS_S(pw_info.thread_state);
+     Py_CLEAR(keyfile_bytes);
+     Py_CLEAR(certfile_bytes);
+     if (r != 1) {
+@@ -4121,9 +4108,9 @@ _ssl__SSLContext_load_cert_chain_impl(PySSLContext *self, PyObject *certfile,
+         }
+         goto error;
+     }
+-    PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex);
++    PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state);
+     r = SSL_CTX_check_private_key(self->ctx);
+-    PySSL_END_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex);
++    PySSL_END_ALLOW_THREADS_S(pw_info.thread_state);
+     if (r != 1) {
+         _setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__);
+         goto error;
+@@ -4340,9 +4327,9 @@ _ssl__SSLContext_load_verify_locations_impl(PySSLContext *self,
+             cafile_buf = PyBytes_AS_STRING(cafile_bytes);
+         if (capath)
+             capath_buf = PyBytes_AS_STRING(capath_bytes);
+-        PySSL_BEGIN_ALLOW_THREADS(self)
++        PySSL_BEGIN_ALLOW_THREADS
+         r = SSL_CTX_load_verify_locations(self->ctx, cafile_buf, capath_buf);
+-        PySSL_END_ALLOW_THREADS(self)
++        PySSL_END_ALLOW_THREADS
+         if (r != 1) {
+             if (errno != 0) {
+                 PyErr_SetFromErrno(PyExc_OSError);
+@@ -4394,11 +4381,10 @@ _ssl__SSLContext_load_dh_params_impl(PySSLContext *self, PyObject *filepath)
+         return NULL;
+ 
+     errno = 0;
+-    Py_BEGIN_ALLOW_THREADS
++    PySSL_BEGIN_ALLOW_THREADS
+     dh = PEM_read_DHparams(f, NULL, NULL, NULL);
+     fclose(f);
+-    Py_END_ALLOW_THREADS
+-    _PySSL_FIX_ERRNO;
++    PySSL_END_ALLOW_THREADS
+     if (dh == NULL) {
+         if (errno != 0) {
+             PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, filepath);
+@@ -4550,7 +4536,6 @@ _ssl__SSLContext_set_default_verify_paths_impl(PySSLContext *self)
+     Py_BEGIN_ALLOW_THREADS
+     rc = SSL_CTX_set_default_verify_paths(self->ctx);
+     Py_END_ALLOW_THREADS
+-    _PySSL_FIX_ERRNO;
+     if (!rc) {
+         _setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__);
+         return NULL;
+diff --git b/Modules/_ssl/debughelpers.c a/Modules/_ssl/debughelpers.c
+index fb8ae7c4e0b..5fc69a07184 100644
+--- b/Modules/_ssl/debughelpers.c
++++ a/Modules/_ssl/debughelpers.c
+@@ -135,15 +135,13 @@ _PySSL_keylog_callback(const SSL *ssl, const char *line)
+      * critical debug helper.
+      */
+ 
+-    assert(PyMutex_IsLocked(&ssl_obj->tstate_mutex));
+-    Py_BEGIN_ALLOW_THREADS
++    PySSL_BEGIN_ALLOW_THREADS
+     PyThread_acquire_lock(lock, 1);
+     res = BIO_printf(ssl_obj->ctx->keylog_bio, "%s\n", line);
+     e = errno;
+     (void)BIO_flush(ssl_obj->ctx->keylog_bio);
+     PyThread_release_lock(lock);
+-    Py_END_ALLOW_THREADS
+-    _PySSL_FIX_ERRNO;
++    PySSL_END_ALLOW_THREADS
+ 
+     if (res == -1) {
+         errno = e;
+@@ -179,10 +177,9 @@ _PySSLContext_set_keylog_filename(PySSLContext *self, PyObject *arg, void *c) {
+     if (self->keylog_bio != NULL) {
+         BIO *bio = self->keylog_bio;
+         self->keylog_bio = NULL;
+-        Py_BEGIN_ALLOW_THREADS
++        PySSL_BEGIN_ALLOW_THREADS
+         BIO_free_all(bio);
+-        Py_END_ALLOW_THREADS
+-        _PySSL_FIX_ERRNO;
++        PySSL_END_ALLOW_THREADS
+     }
+ 
+     if (arg == Py_None) {
+@@ -204,13 +201,13 @@ _PySSLContext_set_keylog_filename(PySSLContext *self, PyObject *arg, void *c) {
+     self->keylog_filename = Py_NewRef(arg);
+ 
+     /* Write a header for seekable, empty files (this excludes pipes). */
+-    PySSL_BEGIN_ALLOW_THREADS(self)
++    PySSL_BEGIN_ALLOW_THREADS
+     if (BIO_tell(self->keylog_bio) == 0) {
+         BIO_puts(self->keylog_bio,
+                  "# TLS secrets log file, generated by OpenSSL / Python\n");
+         (void)BIO_flush(self->keylog_bio);
+     }
+-    PySSL_END_ALLOW_THREADS(self)
++    PySSL_END_ALLOW_THREADS
+     SSL_CTX_set_keylog_callback(self->ctx, _PySSL_keylog_callback);
+     return 0;
+ }
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index abdf0a1ceb22..3e1d6cc63ff1 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -365,6 +365,10 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals (pythonAtLeast "3.13") [
     ./3.13/virtualenv-permissions.patch
   ]
+  ++ optionals isPy313 [
+    # https://github.com/python/cpython/issues/137583
+    ./3.13/revert-gh134724.patch
+  ]
   ++ optionals mimetypesSupport [
     # Make the mimetypes module refer to the right file
     ./mimetypes.patch

From 9f8df5b2a696076b8e0e55baf8e955458f7569f5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 10 Aug 2025 00:07:00 +0200
Subject: [PATCH 1587/3724] Revert "python313Packages.websockets: temporarily
 disable tests"

This reverts commit 74f87a6375c9fded81a6824c6d6317d08e6dd17d.

The problematic commmit in Python 3.13.6 has been reverted, so we can now
reenable the test suite.
---
 pkgs/development/python-modules/websockets/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 0a01b25a55c2..25ff8ada5b62 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -61,8 +61,7 @@ buildPythonPackage rec {
   '';
 
   # Tests fail on Darwin with `OSError: AF_UNIX path too long`
-  # https://github.com/python-websockets/websockets/issues/1648
-  doCheck = pythonOlder "3.13" && !stdenv.hostPlatform.isDarwin;
+  doCheck = !stdenv.hostPlatform.isDarwin;
 
   pythonImportsCheck = [ "websockets" ];
 

From fbd9a88c36b4f2051eb2fe5af5869acd21ea50a2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 10 Aug 2025 02:07:13 +0200
Subject: [PATCH 1588/3724] python3Packages.sentence-stream: relax regex
 constraint

---
 pkgs/development/python-modules/sentence-stream/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/sentence-stream/default.nix b/pkgs/development/python-modules/sentence-stream/default.nix
index 3d7d2f8edba3..0c6907dba076 100644
--- a/pkgs/development/python-modules/sentence-stream/default.nix
+++ b/pkgs/development/python-modules/sentence-stream/default.nix
@@ -28,6 +28,10 @@ buildPythonPackage rec {
     regex
   ];
 
+  pythonRelaxDeps = [
+    "regex"
+  ];
+
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook

From c1a16c342713d70855e110b81217d679e73c7be0 Mon Sep 17 00:00:00 2001
From: Luchang Jin <ljin.luchang@gmail.com>
Date: Sun, 10 Aug 2025 01:45:01 -0400
Subject: [PATCH 1589/3724] typora: Update alternative src url

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

diff --git a/pkgs/by-name/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix
index fd8e2a6944dd..b09e6039f341 100644
--- a/pkgs/by-name/ty/typora/package.nix
+++ b/pkgs/by-name/ty/typora/package.nix
@@ -26,7 +26,7 @@ let
   src = fetchurl {
     urls = [
       "https://download.typora.io/linux/typora_${version}_amd64.deb"
-      "https://download2.typoraio.cn/linux/typora_${version}_amd64.deb"
+      "https://downloads.typoraio.cn/linux/typora_${version}_amd64.deb"
     ];
     hash = "sha256-7auxTtdVafvM2fIpQVvEey1Q6eLVG3mLdjdZXcqSE/Q=";
   };

From 59747ab9aa7b567d1b011bd1a1d0d23e409a1d6d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 30 Jul 2025 14:01:13 +0200
Subject: [PATCH 1590/3724] e2fsprogs: fix build for musl

Fixes: 1010b2606b6b ("e2fsprogs: 1.47.2 -> 1.47.3")
---
 pkgs/by-name/e2/e2fsprogs/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/e2/e2fsprogs/package.nix b/pkgs/by-name/e2/e2fsprogs/package.nix
index ab3649104b97..90955113c354 100644
--- a/pkgs/by-name/e2/e2fsprogs/package.nix
+++ b/pkgs/by-name/e2/e2fsprogs/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPackages,
   fetchurl,
+  fetchpatch,
   pkg-config,
   libuuid,
   gettext,
@@ -24,6 +25,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-hX5u+AD+qiu0V4+8gQIUvl08iLBy6lPFOEczqWVzcyk=";
   };
 
+  patches = [
+    # Upstream patch that fixes musl build (and probably others).
+    # Should be included in next release after 1.47.3.
+    (fetchpatch {
+      name = "stdio-portability.patch";
+      url = "https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/patch/?id=f79abd8554e600eacc2a7c864a8332b670c9e262";
+      hash = "sha256-zZ7zmSMTwGyS3X3b/D/mVG0bV2ul5xtY5DJx9YUvQO8=";
+    })
+  ];
+
   # fuse2fs adds 14mb of dependencies
   outputs = [
     "bin"

From f4e3bd482c354c693f0edc8c864361e13727a3d5 Mon Sep 17 00:00:00 2001
From: Noah Markert <RamReso@gmail.com>
Date: Fri, 8 Aug 2025 10:49:53 +0200
Subject: [PATCH 1591/3724] flyway: 11.7.0 -> 11.11.0

---
 pkgs/by-name/fl/flyway/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fl/flyway/package.nix b/pkgs/by-name/fl/flyway/package.nix
index e570f2745161..c338bdc76f2b 100644
--- a/pkgs/by-name/fl/flyway/package.nix
+++ b/pkgs/by-name/fl/flyway/package.nix
@@ -9,10 +9,10 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flyway";
-  version = "11.7.0";
+  version = "11.11.0";
   src = fetchurl {
-    url = "mirror://maven/org/flywaydb/flyway-commandline/${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-Ajm4V+AAaC3NXvdTkxJ9uhk0QayZzoPYyU5RRrWxz/g=";
+    url = "https://github.com/flyway/flyway/releases/download/flyway-${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz";
+    sha256 = "sha256-IIRJQjsCJAnmr2//daMJ0kInYJSbidHz5/YKRZD8v0M=";
   };
   nativeBuildInputs = [ makeWrapper ];
   dontBuild = true;
@@ -20,10 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     mkdir -p $out/bin $out/share/flyway
     cp -r drivers conf licenses README.txt $out/share/flyway
-    install -Dt $out/share/flyway/lib lib/*.jar lib/flyway/*.jar lib/oracle_wallet/*.jar lib/aad/msal4j-1.15.1.jar lib/aad/slf4j-api-1.7.30.jar
+    find lib -type f -name "*.jar" | while read -r file; do
+        dest="$out/share/flyway/lib/''${file#lib/}"
+        install -D "$file" "$dest"
+    done
     makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \
       --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \
-      --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \
+      --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/lib/flyway/*:$out/share/flyway/lib/aad/*:$out/share/flyway/lib/netty/*:$out/share/flyway/drivers/*'" \
       --add-flags "org.flywaydb.commandline.Main" \
   '';
   passthru.tests = {

From 7d9a26a0b45850e47f679dd515ac24feb4e3e986 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 28 Jul 2025 09:11:06 +0200
Subject: [PATCH 1592/3724] kbd: allow building without pam

---
 pkgs/by-name/kb/kbd/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index fcb747260f29..ff4a1c3403fd 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -15,6 +15,7 @@
   xz,
   zstd,
   gitUpdater,
+  withVlock ? true,
 }:
 
 stdenv.mkDerivation rec {
@@ -30,16 +31,19 @@ stdenv.mkDerivation rec {
   # reduces closure size for most use cases.
   outputs = [
     "out"
-    "vlock"
     "dev"
     "scripts"
     "man"
+  ]
+  ++ lib.optionals withVlock [
+    "vlock"
   ];
 
   configureFlags = [
     "--enable-optional-progs"
     "--enable-libkeymap"
     "--disable-nls"
+    (lib.enableFeature withVlock "vlock")
   ]
   ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
@@ -89,9 +93,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     check
-    pam
     bash
-  ];
+  ]
+  ++ lib.optionals withVlock [ pam ];
+
   NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isStatic "-laudit";
   nativeBuildInputs = [
     autoreconfHook

From 0ce91c70d8ac574e1be70d3d31da2607c293bd5f Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 28 Jul 2025 08:36:19 +0200
Subject: [PATCH 1593/3724] systemd: disable pam in transitive dependencies if
 pam is disabled

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index d533b228f883..56fc32b909f9 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -203,6 +203,8 @@ let
   #  $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \
   #     jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime'
   releaseTimestamp = "1734643670";
+
+  kbd' = if withPam then kbd else kbd.override { withVlock = false; };
 in
 stdenv.mkDerivation (finalAttrs: {
   inherit pname version;
@@ -396,7 +398,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcrypt
-    libcap
+    (if withPam then libcap else libcap.override { usePam = false; })
     libuuid
     linuxHeaders
     bashInteractive # for patch shebangs
@@ -485,8 +487,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "pkgconfigdatadir" "${placeholder "dev"}/share/pkgconfig")
 
     # Keyboard
-    (lib.mesonOption "loadkeys-path" "${kbd}/bin/loadkeys")
-    (lib.mesonOption "setfont-path" "${kbd}/bin/setfont")
+    (lib.mesonOption "loadkeys-path" "${kbd'}/bin/loadkeys")
+    (lib.mesonOption "setfont-path" "${kbd'}/bin/setfont")
 
     # SBAT
     (lib.mesonOption "sbat-distro" "nixos")
@@ -923,9 +925,10 @@ stdenv.mkDerivation (finalAttrs: {
       withUtmp
       util-linux
       kmod
-      kbd
       ;
 
+    kbd = kbd';
+
     # Many TPM2-related units are only installed if this trio of features are
     # enabled. See https://github.com/systemd/systemd/blob/876ee10e0eb4bbb0920bdab7817a9f06cc34910f/units/meson.build#L521
     withTpm2Units = withTpm2Tss && withBootloader && withOpenSSL;

From 0afdb39253be8ec0319bffa78b3e03961112b55a Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 28 Jul 2025 15:26:50 +0200
Subject: [PATCH 1594/3724] systemd: Don't build nspawn for systemdLibs

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 56fc32b909f9..79ebdb0c4415 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -138,6 +138,7 @@
   withLogind ? true,
   withMachined ? true,
   withNetworkd ? true,
+  withNspawn ? !buildLibsOnly,
   withNss ? !stdenv.hostPlatform.isMusl,
   withOomd ? true,
   withOpenSSL ? true,
@@ -255,6 +256,21 @@ stdenv.mkDerivation (finalAttrs: {
     ./0019-meson-Don-t-link-ssh-dropins.patch
 
     ./0020-install-unit_file_exists_full-follow-symlinks.patch
+
+    # add nspawn build option flag
+    # required to disable nspawn for systemdLibs to avoid dependency on getent
+    # https://github.com/systemd/systemd/pull/36876, remove for systemd 258
+    (fetchpatch {
+      # required for the actual patch to apply
+      url = "https://github.com/systemd/systemd/commit/b1fb2d971c810e0bdf9ff0ae567a1c6c230e4e5d.patch";
+      hash = "sha256-JBheazg1OFkx8vUl2l8+34BoEPVURBQJHxqntOBYB60=";
+      includes = [ "src/nspawn/meson.build" ];
+    })
+    (fetchpatch {
+      url = "https://github.com/systemd/systemd/commit/d95818f5221d9b9b19648cffa0cb2407f023b27e.patch";
+      hash = "sha256-FTpWGec5ivlkyEEDMCPaLE+BH91e7JI0kH8pS88bBDY=";
+      excludes = [ "test/fuzz/meson.build" ];
+    })
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
     ./0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
@@ -366,7 +382,6 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     meson
     glibcLocales
-    getent
     m4
     autoPatchelfHook
 
@@ -585,6 +600,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "gnutls" false)
     (lib.mesonEnable "xkbcommon" false)
     (lib.mesonEnable "man" true)
+    (lib.mesonEnable "nspawn" withNspawn)
 
     (lib.mesonBool "analyze" withAnalyze)
     (lib.mesonBool "logind" withLogind)
@@ -632,11 +648,6 @@ stdenv.mkDerivation (finalAttrs: {
       # exhaustive. If another (unhandled) case is found in the source code the
       # build fails with an error message.
       binaryReplacements = [
-        {
-          search = "/usr/bin/getent";
-          replacement = "${getent}/bin/getent";
-          where = [ "src/nspawn/nspawn-setuid.c" ];
-        }
         {
           search = "/sbin/mkswap";
           replacement = "${lib.getBin util-linux}/sbin/mkswap";
@@ -684,6 +695,13 @@ stdenv.mkDerivation (finalAttrs: {
           where = [ "man/systemd-fsck@.service.xml" ];
         }
       ]
+      ++ lib.optionals withNspawn [
+        {
+          search = "/usr/bin/getent";
+          replacement = "${getent}/bin/getent";
+          where = [ "src/nspawn/nspawn-setuid.c" ];
+        }
+      ]
       ++ lib.optionals withImportd [
         {
           search = "\"gpg\"";

From 26d61f3fdc690a767fec993e3929d7233bdd91ea Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 10 Aug 2025 11:06:25 +0200
Subject: [PATCH 1595/3724] linux-pam: 1.6.1 -> 1.7.1

PAM switched to meson build upstream, which requires some care:
- build with logind support
- reenable lastlog
- clean up autotools remnants
- disable debug as it slows down test making it fail
---
 pkgs/by-name/li/linux-pam/package.nix         | 118 +++++++++---------
 .../li/linux-pam/suid-wrapper-path.patch      |   6 -
 2 files changed, 60 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/by-name/li/linux-pam/suid-wrapper-path.patch

diff --git a/pkgs/by-name/li/linux-pam/package.nix b/pkgs/by-name/li/linux-pam/package.nix
index 97b67d2131bf..222953ec17c3 100644
--- a/pkgs/by-name/li/linux-pam/package.nix
+++ b/pkgs/by-name/li/linux-pam/package.nix
@@ -2,98 +2,100 @@
   lib,
   stdenv,
   buildPackages,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitHub,
   flex,
   db4,
   gettext,
+  ninja,
   audit,
   libxcrypt,
   nixosTests,
-  autoreconfHook269,
-  pkg-config-unwrapped,
+  meson,
+  pkg-config,
+  systemdLibs,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "linux-pam";
-  version = "1.6.1";
+  version = "1.7.1";
 
-  src = fetchurl {
-    url = "https://github.com/linux-pam/linux-pam/releases/download/v${version}/Linux-PAM-${version}.tar.xz";
-    hash = "sha256-+JI8dAFZBS1xnb/CovgZQtaN00/K9hxwagLJuA/u744=";
+  src = fetchFromGitHub {
+    owner = "linux-pam";
+    repo = "linux-pam";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-kANcwxifQz2tYPSrSBSFiYNTm51Gr10L/zroCqm8ZHQ=";
   };
 
-  patches = [
-    ./suid-wrapper-path.patch
-    # required for fixing CVE-2025-6020
-    (fetchpatch {
-      url = "https://github.com/linux-pam/linux-pam/commit/10b80543807e3fc5af5f8bcfd8bb6e219bb3cecc.patch";
-      hash = "sha256-VS3D3wUbDxDXRriIuEvvgeZixzDA58EfiLygfFeisGg=";
-    })
-    # Manually cherry-picked from 475bd60c552b98c7eddb3270b0b4196847c0072e
-    ./CVE-2025-6020.patch
-  ];
-
-  # Case-insensitivity workaround for https://github.com/linux-pam/linux-pam/issues/569
-  postPatch =
-    lib.optionalString (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform != stdenv.hostPlatform)
-      ''
-        rm CHANGELOG
-        touch ChangeLog
-      '';
+  # patching unix_chkpwd is required as the nix store entry does not have the necessary bits
+  postPatch = ''
+    substituteInPlace modules/module-meson.build \
+      --replace-fail "sbindir / 'unix_chkpwd'" "'/run/wrappers/bin/unix_chkpwd'"
+  '';
 
   outputs = [
     "out"
-    "doc"
-    "man" # "modules"
+    # "doc"
+    # "man"
+    # "modules"
   ];
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  # autoreconfHook269 is needed for `suid-wrapper-path.patch` above.
-  # pkg-config-unwrapped is needed for `AC_CHECK_LIB` and `AC_SEARCH_LIBS`
   nativeBuildInputs = [
     flex
-    autoreconfHook269
-    pkg-config-unwrapped
-  ]
-  ++ lib.optional stdenv.buildPlatform.isDarwin gettext;
+    meson
+    ninja
+    pkg-config
+    gettext
+  ];
 
   buildInputs = [
     db4
     libxcrypt
   ]
-  ++ lib.optional stdenv.buildPlatform.isLinux audit;
+  ++ lib.optionals stdenv.buildPlatform.isLinux [
+    audit
+    systemdLibs
+  ];
 
   enableParallelBuilding = true;
 
-  configureFlags = [
-    "--includedir=${placeholder "out"}/include/security"
-    "--enable-sconfigdir=/etc/security"
-    # The module is deprecated. We re-enable it explicitly until NixOS
-    # module stops using it.
-    "--enable-lastlog"
-  ];
-
-  installFlags = [
-    "SCONFIGDIR=${placeholder "out"}/etc/security"
+  mesonFlags = [
+    (lib.mesonEnable "logind" stdenv.buildPlatform.isLinux)
+    (lib.mesonEnable "audit" stdenv.buildPlatform.isLinux)
+    (lib.mesonEnable "pam_lastlog" (!stdenv.hostPlatform.isMusl)) # TODO: switch to pam_lastlog2, pam_lastlog is deprecated and broken on musl
+    (lib.mesonEnable "pam_unix" true)
+    # (lib.mesonBool "pam-debug" true) # warning: slower execution due to debug makes VM tests fail!
+    (lib.mesonOption "sysconfdir" "etc") # relative to meson prefix, which is $out
+    (lib.mesonEnable "elogind" false)
+    (lib.mesonEnable "econf" false)
+    (lib.mesonEnable "selinux" false)
+    (lib.mesonEnable "nis" false)
+    (lib.mesonEnable "docs" false)
+    (lib.mesonBool "xtests" false)
+    (lib.mesonBool "examples" false)
   ];
 
   doCheck = false; # fails
 
-  passthru.tests = {
-    inherit (nixosTests)
-      pam-oath-login
-      pam-u2f
-      pam-lastlog
-      shadow
-      sssd-ldap
-      ;
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        pam-oath-login
+        pam-u2f
+        pam-lastlog
+        shadow
+        sssd-ldap
+        ;
+    };
+    updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/linux-pam/linux-pam/releases/tag/${finalAttrs.src.tag}";
     homepage = "https://github.com/linux-pam/linux-pam";
     description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user";
-    platforms = platforms.linux;
-    license = licenses.bsd3;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.bsd3;
   };
-}
+})
diff --git a/pkgs/by-name/li/linux-pam/suid-wrapper-path.patch b/pkgs/by-name/li/linux-pam/suid-wrapper-path.patch
deleted file mode 100644
index a427ccf38816..000000000000
--- a/pkgs/by-name/li/linux-pam/suid-wrapper-path.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-It needs the SUID version during runtime, and that can't be in /nix/store/**
---- a/modules/pam_unix/Makefile.am
-+++ b/modules/pam_unix/Makefile.am
-@@ -21 +21 @@
--	-DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \
-+	-DCHKPWD_HELPER=\"/run/wrappers/bin/unix_chkpwd\" \

From 868e7c10b9b4cf2cdc8331d34085625fdea5c056 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 28 Jul 2025 12:07:48 +0200
Subject: [PATCH 1596/3724] linux-pam: re-enable doc/man outputs

Co-Authored-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/li/linux-pam/package.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/linux-pam/package.nix b/pkgs/by-name/li/linux-pam/package.nix
index 222953ec17c3..3d41329f2701 100644
--- a/pkgs/by-name/li/linux-pam/package.nix
+++ b/pkgs/by-name/li/linux-pam/package.nix
@@ -13,6 +13,12 @@
   meson,
   pkg-config,
   systemdLibs,
+  docbook5,
+  libxslt,
+  libxml2,
+  w3m-batch,
+  findXMLCatalogs,
+  docbook_xsl_ns,
   nix-update-script,
 }:
 
@@ -35,8 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [
     "out"
-    # "doc"
-    # "man"
+    "doc"
+    "man"
     # "modules"
   ];
 
@@ -47,6 +53,13 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     gettext
+
+    libxslt
+    libxml2
+    w3m-batch
+    findXMLCatalogs
+    docbook_xsl_ns
+    docbook5
   ];
 
   buildInputs = [
@@ -60,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
+  mesonAutoFeatures = "auto";
   mesonFlags = [
     (lib.mesonEnable "logind" stdenv.buildPlatform.isLinux)
     (lib.mesonEnable "audit" stdenv.buildPlatform.isLinux)
@@ -71,7 +85,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "econf" false)
     (lib.mesonEnable "selinux" false)
     (lib.mesonEnable "nis" false)
-    (lib.mesonEnable "docs" false)
     (lib.mesonBool "xtests" false)
     (lib.mesonBool "examples" false)
   ];

From 362a93bcc01660f9951f12d1a6d9198f2c0c7003 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 09:33:00 +0000
Subject: [PATCH 1597/3724] crc: 2.52.0 -> 2.53.0

---
 pkgs/by-name/cr/crc/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cr/crc/package.nix b/pkgs/by-name/cr/crc/package.nix
index d262c39d8adf..afa4ebeddf88 100644
--- a/pkgs/by-name/cr/crc/package.nix
+++ b/pkgs/by-name/cr/crc/package.nix
@@ -8,16 +8,16 @@
 }:
 
 let
-  openShiftVersion = "4.19.0";
+  openShiftVersion = "4.19.3";
   okdVersion = "4.19.0-okd-scos.1";
   microshiftVersion = "4.19.0";
   writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";
-  gitCommit = "47be8d03134694b9580c96dfd319594f8ce1e1c4";
-  gitHash = "sha256-KhUP4BHuQPv0vc5o5ujEK37gWYpnMMJ0DsMx1RwTtqI=";
+  gitCommit = "a6f712ab378699f42208db01a49a9ec96887bede";
+  gitHash = "sha256-Iw+pR7BUj3geNa6rWIPtTTFCLWcIsADTmlPBCgFcKa0=";
 in
 buildGoModule (finalAttrs: {
   pname = "crc";
-  version = "2.52.0";
+  version = "2.53.0";
 
   src = fetchFromGitHub {
     owner = "crc-org";

From 710c299895d6661dc265a1da085fc6eb4ebdd77a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 10:40:36 +0000
Subject: [PATCH 1598/3724] ddns-go: 6.12.1 -> 6.12.2

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

diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix
index f78d77ddfaeb..f0a9930bcf53 100644
--- a/pkgs/by-name/dd/ddns-go/package.nix
+++ b/pkgs/by-name/dd/ddns-go/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "ddns-go";
-  version = "6.12.1";
+  version = "6.12.2";
 
   src = fetchFromGitHub {
     owner = "jeessy2";
     repo = "ddns-go";
     rev = "v${version}";
-    hash = "sha256-7NDuC7MshPXEekEPo4DL2ww6HfWPdHhPa4a979a4NJY=";
+    hash = "sha256-xAwbpe3sqSTDOruUBTY3mqDRxyiwYqJ9PkT157OOyFg=";
   };
 
   vendorHash = "sha256-0HH5KkMVQzD/xyaue9Sh6CE5dI/aZJMwei7ynhzp9dc=";

From dc402c1fc646b5aeb6e50bdd06e1509981ce2af0 Mon Sep 17 00:00:00 2001
From: Valentine Briese <valentinegb@icloud.com>
Date: Thu, 7 Aug 2025 17:38:01 -0700
Subject: [PATCH 1599/3724] rust: 1.88.0 -> 1.89.0

---
 .../compilers/rust/{1_88.nix => 1_89.nix}     | 40 +++++++++----------
 pkgs/top-level/all-packages.nix               |  8 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)
 rename pkgs/development/compilers/rust/{1_88.nix => 1_89.nix} (67%)

diff --git a/pkgs/development/compilers/rust/1_88.nix b/pkgs/development/compilers/rust/1_89.nix
similarity index 67%
rename from pkgs/development/compilers/rust/1_88.nix
rename to pkgs/development/compilers/rust/1_89.nix
index fef90efe0927..d9acb3b17096 100644
--- a/pkgs/development/compilers/rust/1_88.nix
+++ b/pkgs/development/compilers/rust/1_89.nix
@@ -44,8 +44,8 @@ let
 in
 import ./default.nix
   {
-    rustcVersion = "1.88.0";
-    rustcSha256 = "sha256-OpdURDSEiuPRk9HWvIPW8ky4XCYa2V+VX95H7GTPz74=";
+    rustcVersion = "1.89.0";
+    rustcSha256 = "sha256-JXb59EDdmbAVG9KPWaoKxhAtXE8+1O+KgQyN0FBXJQ0=";
 
     llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
     llvmSharedForHost = llvmSharedFor pkgsBuildHost;
@@ -103,29 +103,29 @@ import ./default.nix
     # Note: the version MUST be the same version that we are building. Upstream
     # ensures that each released compiler can compile itself:
     # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363
-    bootstrapVersion = "1.88.0";
+    bootstrapVersion = "1.89.0";
 
     # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
     bootstrapHashes = {
-      i686-unknown-linux-gnu = "987738444da172dc2d8c9ab93c6178f0000ced44a3089013839e5916755c4844";
-      x86_64-unknown-linux-gnu = "ad6f0cc845e7fcca17fd451bafd2c04a7bbcb543f8f3ef5bc412fd1fef99ef7b";
-      x86_64-unknown-linux-musl = "8bea28e71582d1bb29031ea2783a6cf2be626fdbcec24b5bca75c85b9b3ca92d";
-      arm-unknown-linux-gnueabihf = "cd269f3d53c286c0d0b0014947a4023d86698eac96b456ce746260ef21eec6af";
-      armv7-unknown-linux-gnueabihf = "718b8110c8f8ea40282b4a0e2efa09c4a91472eec45739f3b37ecc03f2b53954";
-      aarch64-unknown-linux-gnu = "dbc75abc31d142eacf15e60d0e51c4f291539974221d217b80786756b0ce1d6b";
-      aarch64-unknown-linux-musl = "9ccb8f16656d2d4e412553ebaf13489198b915519873752dcebb886de50063c6";
-      x86_64-apple-darwin = "b36b0bfac17e0a1f6cc06b9fdc4e2131ad578b4122a67792236b58650ae4c5c8";
-      aarch64-apple-darwin = "dee921b9a41b1c3fbb088ad31dcca3b232de2cb89c268db75f40912eeaa474db";
-      powerpc64-unknown-linux-gnu = "b56e903c6e4d661b6025d45b2675c31d513db207dbd85929c1a25473129275e3";
-      powerpc64le-unknown-linux-gnu = "e1f16b2885237695f3cce7fc2f0128a938fc07462b076cb61bd2f06e5f8baf38";
-      riscv64gc-unknown-linux-gnu = "6a72741671555fad7ffaceeaa32510c877438087ae71901ccf4a2b03a76c8439";
-      s390x-unknown-linux-gnu = "498ec8be66b2c6d8bc77dd06e226d3cc7448bc508ebb9f6d7650db79350d0cb7";
-      loongarch64-unknown-linux-gnu = "d4cb16ce9e2f04a7c44efe0abe5fc6cf2b9084f349fac042070882300719cbde";
-      loongarch64-unknown-linux-musl = "b9c0c6ca12312dbf8ab80571816fc68b615628ae4fdd0f204c11b71264550b87";
-      x86_64-unknown-freebsd = "961de5d723b034c1308d2b4a4d710fe006fb87bdbf914d045c01a5df87a0b332";
+      i686-unknown-linux-gnu = "676ef74ce8ce3137ca66e3941b0221516e1713862053d8aa219e91b491417dd9";
+      x86_64-unknown-linux-gnu = "542f517d0624cbee516627221482b166bf0ffe5fd560ec32beb778c01f5c99b6";
+      x86_64-unknown-linux-musl = "35695721d53d7eb83ce0153be4c399babf5afd8597bed84f3386d9aac2b4b391";
+      arm-unknown-linux-gnueabihf = "e618d08b1547c143cfbfc040023914f4a33a4fcf7addff6778d7cfccbd444c5e";
+      armv7-unknown-linux-gnueabihf = "09a295d2d6821a404ca3bf5d1163b9642139105618d0583241b05b7dbf6e22dc";
+      aarch64-unknown-linux-gnu = "26d6de84ac59da702aa8c2f903e3c344e3259da02e02ce92ad1c735916b29a4a";
+      aarch64-unknown-linux-musl = "b5fdcad8289adf94c45727c33773a05acca994b01b333cf7a508f95fa6adc454";
+      x86_64-apple-darwin = "8590528cade978ecb5249184112887489c9d77ae846539e3ef4d04214a6d8663";
+      aarch64-apple-darwin = "87baeb57fb29339744ac5f99857f0077b12fa463217fc165dfd8f77412f38118";
+      powerpc64-unknown-linux-gnu = "30d97f8d757c6ff171815c8af36eed85e44401a58c5e04f25b721c7776ed8337";
+      powerpc64le-unknown-linux-gnu = "80db8e203357a050780fb8a2cdc027b81d5ae1634fa999c3be69cf8a2e10bbf6";
+      riscv64gc-unknown-linux-gnu = "3885629641fd670e50c9e6553bdc6505457ef2163757a27dbf33fbc6351b2161";
+      s390x-unknown-linux-gnu = "696dad74886467a5092ee8bd2265aaab85039fc563803166966c7cae389e2ef7";
+      loongarch64-unknown-linux-gnu = "171696c45e4a91ccf17a239f00d5a3a8bbd40125d7a274506e1630423d714bec";
+      loongarch64-unknown-linux-musl = "86e5d8b0f0c868559de3ec2a0902d0e516a710adb845c8904595c54807e821c2";
+      x86_64-unknown-freebsd = "4baf0d5a44e64eecc91dc7ab89d8b0a8f8607e1d39b6989767861b34459a0396";
     };
 
-    selectRustPackage = pkgs: pkgs.rust_1_88;
+    selectRustPackage = pkgs: pkgs.rust_1_89;
   }
 
   (
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88723cc1d1d8..47117587a8c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5850,10 +5850,10 @@ with pkgs;
   wrapRustcWith = { rustc-unwrapped, ... }@args: callPackage ../build-support/rust/rustc-wrapper args;
   wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; };
 
-  rust_1_88 = callPackage ../development/compilers/rust/1_88.nix {
+  rust_1_89 = callPackage ../development/compilers/rust/1_89.nix {
     llvm_20 = llvmPackages_20.libllvm;
   };
-  rust = rust_1_88;
+  rust = rust_1_89;
 
   mrustc = callPackage ../development/compilers/mrustc { };
   mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
@@ -5861,8 +5861,8 @@ with pkgs;
     openssl = openssl_1_1;
   };
 
-  rustPackages_1_88 = rust_1_88.packages.stable;
-  rustPackages = rustPackages_1_88;
+  rustPackages_1_89 = rust_1_89.packages.stable;
+  rustPackages = rustPackages_1_89;
 
   inherit (rustPackages)
     cargo

From 79748defd7b70924445ca08fdd8daee42d40c89c Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sun, 10 Aug 2025 13:35:15 +0200
Subject: [PATCH 1600/3724] modules/meta-maintainers: Refactor maintainer type
 merge function

Easily tested now.
Thank you Matt for this suggestion!

Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
---
 modules/generic/meta-maintainers.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/generic/meta-maintainers.nix b/modules/generic/meta-maintainers.nix
index e39d527764b2..fb66174cf621 100644
--- a/modules/generic/meta-maintainers.nix
+++ b/modules/generic/meta-maintainers.nix
@@ -11,9 +11,11 @@ let
   maintainer = mkOptionType {
     name = "maintainer";
     check = email: lib.elem email (lib.attrValues lib.maintainers);
-    merge =
-      loc: defs:
-      lib.listToAttrs (lib.singleton (lib.nameValuePair (lib.last defs).file (lib.last defs).value));
+    merge = loc: defs: {
+      # lib.last: Perhaps this could be merged instead, if "at most once per module"
+      # is a problem (see option description).
+      ${(lib.last defs).file} = (lib.last defs).value;
+    };
   };
 
   listOfMaintainers = types.listOf maintainer // {

From 1cafa1fd7ec8253c9490c2fa1edf51d6a70d47b9 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 10 Aug 2025 14:08:04 +0200
Subject: [PATCH 1601/3724] modules/README: init

Explain the purpose and usage of this new directory.
---
 modules/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 modules/README.md

diff --git a/modules/README.md b/modules/README.md
new file mode 100644
index 000000000000..777ab9839949
--- /dev/null
+++ b/modules/README.md
@@ -0,0 +1,9 @@
+# `<nixpkgs>/modules`
+
+This directory hosts subdirectories representing each module [class](https://nixos.org/manual/nixpkgs/stable/#module-system-lib-evalModules-param-class) for which the `nixpkgs` repository has user-importable modules.
+
+Exceptions:
+- `_class = "nixos";` modules go in the `<nixpkgs>/nixos/modules` tree
+- modules whose only purpose is to test code in this repository
+
+The emphasis is on _importable_ modules, i.e. ones that aren't inherent to and built into the Module System application.

From edb9d5d49d841bc9f8033d93de6c01a4799945f2 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sun, 10 Aug 2025 14:23:34 +0200
Subject: [PATCH 1602/3724] bibletime: 3.0.3 -> 3.1.1

---
 pkgs/by-name/bi/bibletime/package.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/bi/bibletime/package.nix b/pkgs/by-name/bi/bibletime/package.nix
index 3633f9915698..c429d45273ce 100644
--- a/pkgs/by-name/bi/bibletime/package.nix
+++ b/pkgs/by-name/bi/bibletime/package.nix
@@ -6,15 +6,17 @@
   docbook_xml_dtd_45,
   docbook_xsl_ns,
   fetchFromGitHub,
+  gettext,
+  libxslt,
   perlPackages,
   pkg-config,
-  qt5,
+  qt6,
   stdenv,
   sword,
 }:
 
 let
-  inherit (qt5)
+  inherit (qt6)
     qtbase
     qtsvg
     qttools
@@ -23,18 +25,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "bibletime";
-  version = "3.0.3";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "bibletime";
     repo = "bibletime";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-4O8F5/EyoJFJBEWOAs9lzN3TKuu/CEdKfPaOF8gNqps=";
+    hash = "sha256-kYQjkwfWsEijJ/umOylnfvHgv4u16xr3pkr3ALN4O8c=";
   };
 
   nativeBuildInputs = [
     cmake
     docbook_xml_dtd_45
+    gettext
+    libxslt
     pkg-config
     wrapQtAppsHook
     perlPackages.Po4a

From b4ff9b540c2fc348075a6b0b57030e02740e121b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Sun, 3 Aug 2025 10:37:26 +0200
Subject: [PATCH 1603/3724] agdaPackages.cubical: 0.8 -> 0.9

https://github.com/agda/cubical/releases/tag/v0.9
---
 pkgs/development/libraries/agda/cubical/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix
index 72bb3c3a501d..2e08044738ae 100644
--- a/pkgs/development/libraries/agda/cubical/default.nix
+++ b/pkgs/development/libraries/agda/cubical/default.nix
@@ -6,21 +6,15 @@
 
 mkDerivation rec {
   pname = "cubical";
-  version = "0.8";
+  version = "0.9";
 
   src = fetchFromGitHub {
     repo = pname;
     owner = "agda";
     rev = "v${version}";
-    hash = "sha256-KwwN2g2naEo4/rKTz2L/0Guh5LxymEYP53XQzJ6eMjM=";
+    hash = "sha256-Lmzofq2rKFmfsAoH3zIFB2QLeUhFmIO44JsF+dDrubw=";
   };
 
-  postPatch = ''
-    # This imports the Everything files, which we don't generate.
-    # TODO: remove for the next release
-    rm -rf Cubical/README.agda Cubical/Talks/EPA2020.agda
-  '';
-
   meta = with lib; {
     description = "A cubical type theory library for use with the Agda compiler";
     homepage = src.meta.homepage;

From 219ca69138e2641488b7aaf59492c1406e6f0f57 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 10 Aug 2025 17:10:30 +0200
Subject: [PATCH 1604/3724] systemdMinimal: fix build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove broken patches. The nspawn conditional can be omitted,
as it will not be installed on `systemdLibs` anyways.

Testing done:
```
    nix why-depends --precise .#systemdMinimal.out .#getent.out
    /nix/store/x2dhq7nb43xv2c3hh8y7g4bkdzndy7av-systemd-minimal-257.7
    └───bin/systemd-nspawn: …valid, ignoring....../nix/store/h5f0zw8gp3fsrzldsi9x2j29gqz6dv4h-getent-glibc-2.40-66/bin/getent…
        → /nix/store/h5f0zw8gp3fsrzldsi9x2j29gqz6dv4h-getent-glibc-2.40-66
```

```
    'git+file:///home/grimmauld/coding/nixpkgs#systemdLibs.out' does not depend on 'git+file:///home/grimmauld/coding/nixpkgs#getent.out'
```

`systemdMinimal`, `systemdLibs`, `pam` all builds.
`pkgsMusl.pam` evals successfully.
---
 pkgs/os-specific/linux/systemd/default.nix | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 79ebdb0c4415..1a29a6306c9a 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -256,21 +256,6 @@ stdenv.mkDerivation (finalAttrs: {
     ./0019-meson-Don-t-link-ssh-dropins.patch
 
     ./0020-install-unit_file_exists_full-follow-symlinks.patch
-
-    # add nspawn build option flag
-    # required to disable nspawn for systemdLibs to avoid dependency on getent
-    # https://github.com/systemd/systemd/pull/36876, remove for systemd 258
-    (fetchpatch {
-      # required for the actual patch to apply
-      url = "https://github.com/systemd/systemd/commit/b1fb2d971c810e0bdf9ff0ae567a1c6c230e4e5d.patch";
-      hash = "sha256-JBheazg1OFkx8vUl2l8+34BoEPVURBQJHxqntOBYB60=";
-      includes = [ "src/nspawn/meson.build" ];
-    })
-    (fetchpatch {
-      url = "https://github.com/systemd/systemd/commit/d95818f5221d9b9b19648cffa0cb2407f023b27e.patch";
-      hash = "sha256-FTpWGec5ivlkyEEDMCPaLE+BH91e7JI0kH8pS88bBDY=";
-      excludes = [ "test/fuzz/meson.build" ];
-    })
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
     ./0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
@@ -600,7 +585,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "gnutls" false)
     (lib.mesonEnable "xkbcommon" false)
     (lib.mesonEnable "man" true)
-    (lib.mesonEnable "nspawn" withNspawn)
+    # (lib.mesonEnable "nspawn" withNspawn) # nspawn build can be turned off on systemd 258, on 257.x it will just not be installed in systemdLibs but the build is unconditional
 
     (lib.mesonBool "analyze" withAnalyze)
     (lib.mesonBool "logind" withLogind)
@@ -697,6 +682,9 @@ stdenv.mkDerivation (finalAttrs: {
       ]
       ++ lib.optionals withNspawn [
         {
+          # we only need to patch getent when nspawn will actually be built/installed
+          # as of systemd 257.x, nspawn will not be installed on systemdLibs, so we don't need to patch it
+          # patching getent unconditionally here introduces infinite recursion on musl
           search = "/usr/bin/getent";
           replacement = "${getent}/bin/getent";
           where = [ "src/nspawn/nspawn-setuid.c" ];

From 6c4892dceac9675dc28e35ee3b97fdab3adbeb7a Mon Sep 17 00:00:00 2001
From: Mathias Zhang <me@zzzsy.top>
Date: Sun, 10 Aug 2025 23:49:07 +0800
Subject: [PATCH 1605/3724] flaca: 3.3.2 -> 3.4.2

---
 pkgs/by-name/fl/flaca/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fl/flaca/package.nix b/pkgs/by-name/fl/flaca/package.nix
index 0aeaac4ec3d9..2c0470caae24 100644
--- a/pkgs/by-name/fl/flaca/package.nix
+++ b/pkgs/by-name/fl/flaca/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "flaca";
-  version = "3.3.2";
+  version = "3.4.2";
 
   lockFile = fetchurl {
     url = "https://github.com/Blobfolio/flaca/releases/download/v${finalAttrs.version}/Cargo.lock";
-    hash = "sha256-AFEuJQAz+cXUuyLefqsV2VyytJ+sfLrJQSArITqQZZU=";
+    hash = "sha256-6SpIqz/iLGVvOkwfiTcvf2EdlbVafQ+aHVc7taYLPDc=";
   };
 
   src = fetchFromGitHub {
     owner = "Blobfolio";
     repo = "flaca";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sxBP3L9Abk3/NYkE1UeFFulGEhDe4wKqS71wrX6mA9c=";
+    hash = "sha256-9fD+nfSe0Rk06d+o3hnMH2lC6OAFa10gDNiDW57lSTg=";
   };
 
   postUnpack = ''
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
-  cargoHash = "sha256-i4eYyS3s7q/1PaqwawpWeDbUHUGEvIfN65xfvpLkOpY=";
+  cargoHash = "sha256-LVY1+Nvcy7WoJ7Bsf1rgrdTzLMRqpquDXD8X3X8jX20=";
 
   meta = with lib; {
     description = "CLI tool to losslessly compress JPEG and PNG images";

From b8f4e2b88a75b098efb5b664d26c177a929139de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 16:25:14 +0000
Subject: [PATCH 1606/3724] mattermostLatest: 10.10.1 -> 10.11.1

---
 pkgs/by-name/ma/mattermostLatest/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix
index 69d2dcf29a24..21467244b2a9 100644
--- a/pkgs/by-name/ma/mattermostLatest/package.nix
+++ b/pkgs/by-name/ma/mattermostLatest/package.nix
@@ -11,10 +11,10 @@ mattermost.override {
     # and make sure the version regex is up to date here.
     # Ensure you also check ../mattermost/package.nix for ESR releases.
     regex = "^v(10\\.[0-9]+\\.[0-9]+)$";
-    version = "10.10.1";
-    srcHash = "sha256-tPjwtbGzg1G9fWoo8UC82RLm2GOQhvtQiw4vXKxz2ww=";
-    vendorHash = "sha256-hsTmqwISOln2YlMXNBXKu4iPwWsLEyoe5IIth9lYjbM=";
-    npmDepsHash = "sha256-Uv2lqcz2AV/gJJFWSN5cSP7JYgnEJBXzexruKqNU7p4=";
+    version = "10.11.1";
+    srcHash = "sha256-iWznWqnsPDcq9hZqnPHCxqsOJESolVWDC6413hitFpk=";
+    vendorHash = "sha256-Lqa463LLy41aaRbrtJFclfOj55vLjK4pWFAFLzX3TJE=";
+    npmDepsHash = "sha256-p9dq31qw0EZDQIl2ysKE38JgDyLA6XvSv+VtHuRh+8A=";
     lockfileOverlay = ''
       unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
     '';

From f3cd67c5b79544706a5a4bc057758d208f950c35 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 10 Aug 2025 18:55:04 +0200
Subject: [PATCH 1607/3724] nixos/pam: enable lastlog2 import service if any
 pam service uses lastlog

---
 nixos/modules/security/pam.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index fb42bba9d01c..a02bf460a9eb 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -2311,11 +2311,14 @@ in
 
     environment.etc = lib.mapAttrs' makePAMService enabledServices;
 
-    systemd = lib.optionalAttrs config.security.pam.services.login.updateWtmp {
-      tmpfiles.packages = [ pkgs.util-linux.lastlog ]; # /lib/tmpfiles.d/lastlog2-tmpfiles.conf
-      services.lastlog2-import.enable = true;
-      packages = [ pkgs.util-linux.lastlog ]; # lib/systemd/system/lastlog2-import.service
-    };
+    systemd =
+      lib.optionalAttrs
+        (lib.any (service: service.updateWtmp) (lib.attrValues config.security.pam.services))
+        {
+          tmpfiles.packages = [ pkgs.util-linux.lastlog ]; # /lib/tmpfiles.d/lastlog2-tmpfiles.conf
+          services.lastlog2-import.enable = true;
+          packages = [ pkgs.util-linux.lastlog ]; # lib/systemd/system/lastlog2-import.service
+        };
 
     security.pam.services = {
       other.text = ''

From e8e668c587b3477aca23d210364aa15eb13ca034 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sun, 10 Aug 2025 17:45:07 -0400
Subject: [PATCH 1608/3724] doc: fix incorrect counter for MPI options

Instead of tracking the exact number, just remove the counter.
---
 doc/using/overlays.chapter.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/using/overlays.chapter.md b/doc/using/overlays.chapter.md
index a09c489667ff..b20b8528a435 100644
--- a/doc/using/overlays.chapter.md
+++ b/doc/using/overlays.chapter.md
@@ -140,7 +140,7 @@ stdenv.mkDerivation {
 
 ### Switching the MPI implementation {#sec-overlays-alternatives-mpi}
 
-All programs that are built with [MPI](https://en.wikipedia.org/wiki/Message_Passing_Interface) support use the generic attribute `mpi` as an input. At the moment Nixpkgs natively provides two different MPI implementations:
+All programs that are built with [MPI](https://en.wikipedia.org/wiki/Message_Passing_Interface) support use the generic attribute `mpi` as an input. At the moment Nixpkgs natively provides the following MPI implementations:
 
 -   [Open MPI](https://www.open-mpi.org/) (default), attribute name
     `openmpi`

From 09899697e4f7c85dd7e2b2646880155e66bad87f Mon Sep 17 00:00:00 2001
From: Victor Nascimento Bakke <gipphe@gmail.com>
Date: Mon, 11 Aug 2025 00:14:53 +0200
Subject: [PATCH 1609/3724] maintainers: add gipphe

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 92db70b37f4f..251310c20377 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9302,6 +9302,12 @@
     githubId = 471835;
     name = "Giorgio Gallo";
   };
+  gipphe = {
+    email = "gipphe@gmail.com";
+    github = "Gipphe";
+    githubId = 2266817;
+    name = "Victor Nascimento Bakke";
+  };
   GirardR1006 = {
     email = "julien.girard2@cea.fr";
     github = "GirardR1006";

From 7accd9f3ac777de567ea9e613b200ec2f64ed9da Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 11 Aug 2025 00:56:38 +0200
Subject: [PATCH 1610/3724] python3Packages.sshtunnel: make compatible with
 paramiko 4.0

---
 .../python-modules/sshtunnel/default.nix      |   4 +-
 .../sshtunnel/paramiko-4.0-compat.patch       | 117 ++++++++++++++++++
 2 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/sshtunnel/paramiko-4.0-compat.patch

diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix
index c119e971e965..59a2bbd6243c 100644
--- a/pkgs/development/python-modules/sshtunnel/default.nix
+++ b/pkgs/development/python-modules/sshtunnel/default.nix
@@ -18,6 +18,9 @@ buildPythonPackage rec {
     hash = "sha256-58sOp3Tbgb+RhE2yLecqQKro97D5u5ug9mbUdO9r+fw=";
   };
 
+  # https://github.com/pahaz/sshtunnel/pull/301
+  patches = [ ./paramiko-4.0-compat.patch ];
+
   build-system = [ setuptools ];
 
   dependencies = [ paramiko ];
@@ -35,7 +38,6 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    broken = true; # incompatible with paramiko 4.0 https://github.com/pahaz/sshtunnel/issues/299
     description = "Pure python SSH tunnels";
     mainProgram = "sshtunnel";
     homepage = "https://github.com/pahaz/sshtunnel";
diff --git a/pkgs/development/python-modules/sshtunnel/paramiko-4.0-compat.patch b/pkgs/development/python-modules/sshtunnel/paramiko-4.0-compat.patch
new file mode 100644
index 000000000000..f6118fa407f9
--- /dev/null
+++ b/pkgs/development/python-modules/sshtunnel/paramiko-4.0-compat.patch
@@ -0,0 +1,117 @@
+commit 46d08c8eefc18d22e9d893a627cc6d73b43cdb9a
+Author: Martin Weinelt <hexa@gaia.lossy.network>
+Date:   Mon Aug 11 00:48:21 2025 +0200
+
+    sshtunnel: remove DSA support
+    
+    The support for DSA keys was removed[1] in Paramiko 4.0.
+    
+    [1] https://www.paramiko.org/changelog.html#4.0.0
+
+diff --git a/README.rst b/README.rst
+index 7400816..ff27733 100644
+--- a/README.rst
++++ b/README.rst
+@@ -255,9 +255,9 @@ CLI usage
+       -k SSH_HOST_KEY, --ssh_host_key SSH_HOST_KEY
+                             Gateway's host key
+       -K KEY_FILE, --private_key_file KEY_FILE
+-                            RSA/DSS/ECDSA private key file
++                            RSA/ECDSA private key file
+       -S KEY_PASSWORD, --private_key_password KEY_PASSWORD
+-                            RSA/DSS/ECDSA private key password
++                            RSA/ECDSA private key password
+       -t, --threaded        Allow concurrent connections to each tunnel
+       -v, --verbose         Increase output verbosity (default: ERROR)
+       -V, --version         Show version number and quit
+diff --git a/sshtunnel.py b/sshtunnel.py
+index c48e330..e6442da 100644
+--- a/sshtunnel.py
++++ b/sshtunnel.py
+@@ -1090,7 +1090,6 @@ class SSHTunnelForwarder(object):
+             host_pkey_directories = [DEFAULT_SSH_DIRECTORY]
+ 
+         paramiko_key_types = {'rsa': paramiko.RSAKey,
+-                              'dsa': paramiko.DSSKey,
+                               'ecdsa': paramiko.ECDSAKey}
+         if hasattr(paramiko, 'Ed25519Key'):
+             # NOQA: new in paramiko>=2.2: http://docs.paramiko.org/en/stable/api/keys.html#module-paramiko.ed25519key
+@@ -1286,7 +1285,7 @@ class SSHTunnelForwarder(object):
+ 
+         Arguments:
+             pkey_file (str):
+-                File containing a private key (RSA, DSS or ECDSA)
++                File containing a private key (RSA or ECDSA)
+         Keyword Arguments:
+             pkey_password (Optional[str]):
+                 Password to decrypt the private key
+@@ -1295,7 +1294,7 @@ class SSHTunnelForwarder(object):
+             paramiko.Pkey
+         """
+         ssh_pkey = None
+-        key_types = (paramiko.RSAKey, paramiko.DSSKey, paramiko.ECDSAKey)
++        key_types = (paramiko.RSAKey, paramiko.ECDSAKey)
+         if hasattr(paramiko, 'Ed25519Key'):
+             # NOQA: new in paramiko>=2.2: http://docs.paramiko.org/en/stable/api/keys.html#module-paramiko.ed25519key
+             key_types += (paramiko.Ed25519Key, )
+@@ -1805,7 +1804,7 @@ def _parse_arguments(args=None):
+         dest='ssh_private_key',
+         metavar='KEY_FILE',
+         type=str,
+-        help='RSA/DSS/ECDSA private key file'
++        help='RSA/ECDSA private key file'
+     )
+ 
+     parser.add_argument(
+@@ -1813,7 +1812,7 @@ def _parse_arguments(args=None):
+         dest='ssh_private_key_password',
+         metavar='KEY_PASSWORD',
+         type=str,
+-        help='RSA/DSS/ECDSA private key password'
++        help='RSA/ECDSA private key password'
+     )
+ 
+     parser.add_argument(
+diff --git a/tests/test_forwarder.py b/tests/test_forwarder.py
+index 40662d0..02af175 100644
+--- a/tests/test_forwarder.py
++++ b/tests/test_forwarder.py
+@@ -81,11 +81,9 @@ open_tunnel = partial(
+ 
+ SSH_USERNAME = get_random_string()
+ SSH_PASSWORD = get_random_string()
+-SSH_DSS = b'\x44\x78\xf0\xb9\xa2\x3c\xc5\x18\x20\x09\xff\x75\x5b\xc1\xd2\x6c'
+ SSH_RSA = b'\x60\x73\x38\x44\xcb\x51\x86\x65\x7f\xde\xda\xa2\x2b\x5a\x57\xd5'
+ ECDSA = b'\x25\x19\xeb\x55\xe6\xa1\x47\xff\x4f\x38\xd2\x75\x6f\xa5\xd5\x60'
+ FINGERPRINTS = {
+-    'ssh-dss': SSH_DSS,
+     'ssh-rsa': SSH_RSA,
+     'ecdsa-sha2-nistp256': ECDSA,
+ }
+@@ -1202,7 +1200,7 @@ class AuxiliaryTest(unittest.TestCase):
+                 '-P={0}'.format(SSH_PASSWORD),  # GW password
+                 '-R', '10.0.0.1:8080', '10.0.0.2:8080',  # remote bind list
+                 '-L', ':8081', ':8082',  # local bind list
+-                '-k={0}'.format(SSH_DSS),  # hostkey
++                '-k={0}'.format(SSH_RSA),  # hostkey
+                 '-K={0}'.format(__file__),  # pkey file
+                 '-S={0}'.format(SSH_PASSWORD),  # pkey password
+                 '-t',  # concurrent connections (threaded)
+@@ -1232,7 +1230,7 @@ class AuxiliaryTest(unittest.TestCase):
+              '--password={0}'.format(SSH_PASSWORD),  # GW password
+              '--remote_bind_address', '10.0.0.1:8080', '10.0.0.2:8080',
+              '--local_bind_address', ':8081', ':8082',  # local bind list
+-             '--ssh_host_key={0}'.format(SSH_DSS),  # hostkey
++             '--ssh_host_key={0}'.format(SSH_RSA),  # hostkey
+              '--private_key_file={0}'.format(__file__),  # pkey file
+              '--private_key_password={0}'.format(SSH_PASSWORD),
+              '--threaded',  # concurrent connections (threaded)
+@@ -1254,7 +1252,7 @@ class AuxiliaryTest(unittest.TestCase):
+                              [('10.0.0.1', 8080), ('10.0.0.2', 8080)])
+         self.assertListEqual(parser['local_bind_addresses'],
+                              [('', 8081), ('', 8082)])
+-        self.assertEqual(parser['ssh_host_key'], str(SSH_DSS))
++        self.assertEqual(parser['ssh_host_key'], str(SSH_RSA))
+         self.assertEqual(parser['ssh_private_key'], __file__)
+         self.assertEqual(parser['ssh_private_key_password'], SSH_PASSWORD)
+         self.assertTrue(parser['threaded'])

From 87a43e91e6a5110c5cbe8c4649fdf258ea682384 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 11 Aug 2025 01:04:25 +0200
Subject: [PATCH 1611/3724] python3Packages.pycomposefile: fix build with
 flit-core

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

diff --git a/pkgs/development/python-modules/pycomposefile/default.nix b/pkgs/development/python-modules/pycomposefile/default.nix
index e8eb77a8ec00..f82c86315f93 100644
--- a/pkgs/development/python-modules/pycomposefile/default.nix
+++ b/pkgs/development/python-modules/pycomposefile/default.nix
@@ -2,9 +2,8 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  flit-core,
   pyyaml,
-  pythonOlder,
-  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -12,14 +11,12 @@ buildPythonPackage rec {
   version = "0.0.34";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-kzqTtDn4aSiCtNUP90ThKj2ZYEAGjpZlGjfdhCEmpQg=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ flit-core ];
 
   dependencies = [ pyyaml ];
 

From f6c13bea6355b2c74c4522b4218ffbb524b7ff40 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 11 Aug 2025 01:21:00 +0200
Subject: [PATCH 1612/3724] python3Packages.pgspecial: fix build, enable tests

---
 .../python-modules/pgspecial/default.nix      | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix
index 5876bab95168..10fe8a87c17c 100644
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@@ -4,10 +4,12 @@
   click,
   configobj,
   fetchPypi,
+  postgresql,
+  postgresqlTestHook,
   psycopg,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
+  setuptools-scm,
   sqlparse,
 }:
 
@@ -16,14 +18,15 @@ buildPythonPackage rec {
   version = "2.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-2mx/zHvve7ATLcIEb3TsZROx/m8MgOVSjWMNFLfEhJ0=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   dependencies = [
     click
@@ -34,11 +37,21 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     configobj
     pytestCheckHook
+    postgresqlTestHook
+    postgresql
   ];
 
+  pytestFlagsArray = [ "-vvv" ];
+
+  env = {
+    PGDATABASE = "_test_db";
+    PGUSER = "postgres";
+  };
+
   disabledTests = [
-    # Test requires a Postgresql server
-    "test_slash_dp_pattern_schema"
+    "test_slash_d_view_verbose"
+    "test_slash_ddp"
+    "test_slash_ddp_pattern"
   ];
 
   meta = with lib; {

From 069fd014f2e9fe87dda611c348fb650158e43066 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 11 Aug 2025 01:46:35 +0200
Subject: [PATCH 1613/3724] python3Packages.python-hosts: fix src

---
 pkgs/development/python-modules/python-hosts/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix
index 7eb9ce7dbad7..5c7f7418313f 100644
--- a/pkgs/development/python-modules/python-hosts/default.nix
+++ b/pkgs/development/python-modules/python-hosts/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   setuptools,
 }:
@@ -13,11 +12,8 @@ buildPythonPackage rec {
   version = "1.1.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
-    pname = "python_hosts";
-    inherit version;
+    inherit pname version;
     hash = "sha256-XiU6aO6EhFVgj1g7TYMdbgg7IvjkU2DFoiwYikrB13A=";
   };
 

From bdd343fb6b8e08cff819782912b714500bfce90a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 00:31:10 +0000
Subject: [PATCH 1614/3724] tabbed: 0.8 -> 0.9

---
 pkgs/applications/window-managers/tabbed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index d2c123ebc55c..d306f0bba2b7 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -11,12 +11,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tabbed";
-  version = "0.8";
+  version = "0.9";
 
   src = fetchgit {
     url = "https://git.suckless.org/tabbed";
     rev = finalAttrs.version;
-    hash = "sha256-KpMWBnnoF4AGRKrG30NQsVt0CFfJXVdlXLLag0Dq0sU=";
+    hash = "sha256-IpFbkyNNzMtESjpQNFOUdE6Tl+ezJN85T71Cm7bqljo=";
   };
 
   inherit patches;

From 46fec20f2ef39ee41228bcba1de9581116a81ce1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 00:51:50 +0000
Subject: [PATCH 1615/3724] logcheck: 1.4.5 -> 1.4.6

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

diff --git a/pkgs/by-name/lo/logcheck/package.nix b/pkgs/by-name/lo/logcheck/package.nix
index 26e6d87115a7..036eba73851a 100644
--- a/pkgs/by-name/lo/logcheck/package.nix
+++ b/pkgs/by-name/lo/logcheck/package.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation rec {
   pname = "logcheck";
-  version = "1.4.5";
+  version = "1.4.6";
   _name = "logcheck_${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz";
-    sha256 = "sha256-enUxHYVhdiDQLMAnQnRjx/mvIEHgL8k/W8Jda6PMrfE=";
+    sha256 = "sha256-HAOKyL/OVR6E175QIr/VZILy1w7mqMt6RJkifzGLYn0=";
   };
 
   prePatch = ''

From b1059ae3a827be8b0c93858abb05a1ed373ef8ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 01:33:14 +0000
Subject: [PATCH 1616/3724] whistle: 2.9.99 -> 2.9.100

---
 pkgs/by-name/wh/whistle/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix
index 0e54868edec6..c9c1d01fd65f 100644
--- a/pkgs/by-name/wh/whistle/package.nix
+++ b/pkgs/by-name/wh/whistle/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "whistle";
-  version = "2.9.99";
+  version = "2.9.100";
 
   src = fetchFromGitHub {
     owner = "avwo";
     repo = "whistle";
     rev = "v${version}";
-    hash = "sha256-9OHx2iVHiRxIOB/a/Za5bWDl4EVA+XpvHCzBq960U/c=";
+    hash = "sha256-yMyIsqIq5AG98b+ed4c0xjU6Jndi6qGc2aZwjr/28vk=";
   };
 
-  npmDepsHash = "sha256-rI7FQTyBQvMwvtUK5yzTNTmvUGmVYvZ/iXv6dx+FcWg=";
+  npmDepsHash = "sha256-RouX2xRyhiaORnJVDDHdheyRqKYsYXxfk0O/BzgI7lA=";
 
   dontNpmBuild = true;
 

From 786ac1ece3125fed77ebbd8f9b3e28a9e3f76857 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 01:59:45 +0000
Subject: [PATCH 1617/3724] plog: 1.1.10 -> 1.1.11

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

diff --git a/pkgs/by-name/pl/plog/package.nix b/pkgs/by-name/pl/plog/package.nix
index 7152799ef7c7..59d7b8456c16 100644
--- a/pkgs/by-name/pl/plog/package.nix
+++ b/pkgs/by-name/pl/plog/package.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "plog";
-  version = "1.1.10";
+  version = "1.1.11";
 
   outputs = [
     "out"
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     owner = "SergiusTheBest";
     repo = "plog";
     rev = version;
-    hash = "sha256-NZphrg9OB1FTY2ifu76AXeCyGwW2a2BkxMGjZPf4uM8=";
+    hash = "sha256-/H7qNL6aPjmFYk0X1sx4CCSZWrAMQgPo8I9X/P50ln0=";
   };
 
   strictDeps = true;

From 27eac9f0b8e5632dc55b1eee8f89b55b56c4075f Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Mon, 11 Aug 2025 04:56:44 +0200
Subject: [PATCH 1618/3724] python3Packages.home-assistant-chip-wheels: fix
 building with newer gn

This fixes the following error caused by https://gn-review.googlesource.com/c/gn/+/18820
and the gn bump in b59bfde89d116c180cc20962fdecbf40d92f8ce7 by
backporting https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/300272

~~~
Running phase: configurePhase
gn flags: chip_project_config_include_dirs=\[\"//..\"\] chip_crypto=\"openssl\" [...]
  generated_file("$target_name._includes") {
  ^-----------------------------------------
Two or more targets generate the same output:
  protocol_buffer/gen/third_party/pigweed/repo/pw_chrono/protos.proto_library/includes.txt

This is can often be fixed by changing one of the target names, or by
setting an output_name on one of them.

Collisions:
  //third_party/pigweed/repo/pw_chrono:protos._includes(//build/toolchain/custom:custom)
~~~
---
 .../home-assistant-chip-wheels/default.nix         | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
index f91196342039..5665f7eb2c9d 100644
--- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
+++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
@@ -12,6 +12,7 @@
   cryptography,
   diskcache,
   fetchFromGitHub,
+  fetchpatch,
   glib,
   gn,
   googleapis-common-protos,
@@ -128,6 +129,19 @@ stdenv.mkDerivation rec {
     libnl
   ];
 
+  patches = [
+    (fetchpatch {
+      # Fix building with newer gn version
+      name = "pw_protobuf_compiler-Create-a-new-includes.txt-for-each-toolchain.patch";
+      # https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/300272
+      url = "https://pigweed.googlesource.com/pigweed/pigweed/+/b66729b90fcb9df2ee4818f6d4fff59385cdbc80^!?format=TEXT";
+      decode = "base64 -d";
+      stripLen = 1;
+      extraPrefix = "connectedhomeip/third_party/pigweed/repo/";
+      hash = "sha256-6ss3j8j69w7EMio9mFP/EL2oPqQ2sLh67eWsJjHdDa8=";
+    })
+  ];
+
   postPatch = ''
     cd connectedhomeip
     export HOME=$(mktemp -d)

From a1d47a4ca33675e48868a6eb6dff57b0c448a22d Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 11 Aug 2025 10:32:11 +0200
Subject: [PATCH 1619/3724] nixos/pam: fix lastlog2 import service

---
 nixos/modules/security/pam.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index a02bf460a9eb..abc632c1c07d 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -2316,7 +2316,21 @@ in
         (lib.any (service: service.updateWtmp) (lib.attrValues config.security.pam.services))
         {
           tmpfiles.packages = [ pkgs.util-linux.lastlog ]; # /lib/tmpfiles.d/lastlog2-tmpfiles.conf
-          services.lastlog2-import.enable = true;
+          services.lastlog2-import = {
+            enable = true;
+            wantedBy = [ "default.target" ];
+            after = [
+              "local-fs.target"
+              "systemd-tmpfiles-setup.service"
+            ];
+            # TODO: ${pkgs.util-linux.lastlog}/lib/systemd/system/lastlog2-import.service
+            # uses unpatched /usr/bin/mv, needs to be fixed on staging
+            # in the meantime, use a service drop-in here
+            serviceConfig.ExecStartPost = [
+              ""
+              "${lib.getExe' pkgs.coreutils "mv"} /var/log/lastlog /var/log/lastlog.migrated"
+            ];
+          };
           packages = [ pkgs.util-linux.lastlog ]; # lib/systemd/system/lastlog2-import.service
         };
 

From 122c5aa7d98f912aadc2c6d1e7dd2db1dc5f5323 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 10 Aug 2025 19:30:28 +0200
Subject: [PATCH 1620/3724] nixos/tests/pam-lastlog: test legacy lastlog
 importer

---
 nixos/tests/pam/pam-lastlog.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/pam/pam-lastlog.nix b/nixos/tests/pam/pam-lastlog.nix
index 837c84e1e601..cefc8a3d4e45 100644
--- a/nixos/tests/pam/pam-lastlog.nix
+++ b/nixos/tests/pam/pam-lastlog.nix
@@ -13,9 +13,18 @@
     };
 
   testScript = ''
-    machine.wait_for_unit("multi-user.target")
-    machine.succeed("run0 --pty true") # perform full login
-    print(machine.succeed("lastlog2 --active --user root"))
-    machine.succeed("stat /var/lib/lastlog/lastlog2.db")
+    with subtest("Test legacy lastlog import"):
+      # create old lastlog file to test import
+      # empty = nothing will actually be imported, but the service will run
+      machine.succeed("touch /var/log/lastlog")
+      machine.wait_for_unit("lastlog2-import.service")
+      machine.succeed("journalctl -b --grep 'Starting Import lastlog data into lastlog2 database'")
+      machine.succeed("stat /var/log/lastlog.migrated")
+
+    with subtest("Test lastlog entries are created by logins"):
+      machine.wait_for_unit("multi-user.target")
+      machine.succeed("run0 --pty true") # perform full login
+      print(machine.succeed("lastlog2 --active --user root"))
+      machine.succeed("stat /var/lib/lastlog/lastlog2.db")
   '';
 }

From 3da91e9f0ae36393365f5aa9fb4a9f2eddb83299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= <n@monade.li>
Date: Sat, 2 Aug 2025 14:24:45 +0200
Subject: [PATCH 1621/3724] agdaPackages.standard-library:
 2.2-unstable-2025-07-03 -> 2.3

https://github.com/agda/agda-stdlib/blob/v2.3/CHANGELOG.md
---
 .../development/libraries/agda/standard-library/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix
index 976d84157836..811f5a63c765 100644
--- a/pkgs/development/libraries/agda/standard-library/default.nix
+++ b/pkgs/development/libraries/agda/standard-library/default.nix
@@ -7,13 +7,13 @@
 
 mkDerivation rec {
   pname = "standard-library";
-  version = "2.2-unstable-2025-07-03";
+  version = "2.3";
 
   src = fetchFromGitHub {
     repo = "agda-stdlib";
     owner = "agda";
-    rev = "6f8af9452e7fac27bc3b3ad068793b538f07668e";
-    hash = "sha256-LD6KasmQ9ZHRNQJ0N4wjyc6JiSkZpmyqQq9B0Wta1n0=";
+    rev = "v${version}";
+    hash = "sha256-JOeoek6OfyIk9vwTj5QUJU6LnRzwfiG0e0ysW6zbhZ8=";
   };
 
   passthru.tests = { inherit (nixosTests) agda; };

From 05e1ffa93dcdc11b3f0865013e42ccfa7c1a9a7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 10:04:09 +0000
Subject: [PATCH 1622/3724] sitespeed-io: 38.0.0 -> 38.1.2

---
 pkgs/by-name/si/sitespeed-io/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/sitespeed-io/package.nix b/pkgs/by-name/si/sitespeed-io/package.nix
index 0183e0380531..0da1a79be71e 100644
--- a/pkgs/by-name/si/sitespeed-io/package.nix
+++ b/pkgs/by-name/si/sitespeed-io/package.nix
@@ -26,13 +26,13 @@ assert
   (!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled.";
 buildNpmPackage rec {
   pname = "sitespeed-io";
-  version = "38.0.0";
+  version = "38.1.2";
 
   src = fetchFromGitHub {
     owner = "sitespeedio";
     repo = "sitespeed.io";
     tag = "v${version}";
-    hash = "sha256-PLzUpTvgyE9uxIxejU0qTChTM392+euhUtu3IND5kzw=";
+    hash = "sha256-S7XYDxKODK6R/O9kNVq04pponYfcwTwsyVQO8yh598w=";
   };
 
   postPatch = ''
@@ -50,7 +50,7 @@ buildNpmPackage rec {
 
   dontNpmBuild = true;
   npmInstallFlags = [ "--omit=dev" ];
-  npmDepsHash = "sha256-mjFTE6k0MaGsRagC0Zk7CKTpNn2ow8WXa6KGbLuSVzc=";
+  npmDepsHash = "sha256-rVxVD2c+xijup7XrtwwmECahL3S2S98+71d7H1Bwa+U=";
 
   postInstall = ''
     mv $out/bin/sitespeed{.,-}io

From a55e447f6c19e420c6de592dcc6c57af814c4a22 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 13:29:53 +0300
Subject: [PATCH 1623/3724] spandsp3: add missing libjpeg dependency

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

diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix
index eedc5c38b527..b41a9085e618 100644
--- a/pkgs/development/libraries/spandsp/3.nix
+++ b/pkgs/development/libraries/spandsp/3.nix
@@ -1,6 +1,7 @@
 {
   fetchFromGitHub,
   callPackage,
+  libjpeg,
 }:
 
 (callPackage ./common.nix { }).overrideAttrs (previousAttrs: {
@@ -11,4 +12,8 @@
     rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags
     sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
   };
+
+  propagatedBuildInputs = previousAttrs.propagatedBuildInputs or [] ++ [
+    libjpeg
+  ];
 })

From 2433ed3a944932fb64b02081eaf0c352ec107557 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 13:31:36 +0300
Subject: [PATCH 1624/3724] libplacebo_5: fix build with latest Python

Same change as libplacebo[_7].
---
 pkgs/by-name/li/libplacebo_5/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/li/libplacebo_5/package.nix b/pkgs/by-name/li/libplacebo_5/package.nix
index 9691db7ca0ef..57ea29690d5b 100644
--- a/pkgs/by-name/li/libplacebo_5/package.nix
+++ b/pkgs/by-name/li/libplacebo_5/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  fetchpatch,
   meson,
   ninja,
   pkg-config,
@@ -28,6 +29,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-YEefuEfJURi5/wswQKskA/J1UGzessQQkBpltJ0Spq8=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "python-compat.patch";
+      url = "https://code.videolan.org/videolan/libplacebo/-/commit/12509c0f1ee8c22ae163017f0a5e7b8a9d983a17.patch";
+      hash = "sha256-RrlFu0xgLB05IVrzL2EViTPuATYXraM1KZMxnZCvgrk=";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja

From 837a8169099d17c78f5da40061336634c45532be Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 13:33:36 +0300
Subject: [PATCH 1625/3724] python313Packages.ruff: fix build

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

diff --git a/pkgs/development/python-modules/ruff/default.nix b/pkgs/development/python-modules/ruff/default.nix
index edd44682d7f7..d32d951c4aec 100644
--- a/pkgs/development/python-modules/ruff/default.nix
+++ b/pkgs/development/python-modules/ruff/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage {
     # to avoid rebuilding the ruff binary for every active python package set.
     + ''
       substituteInPlace pyproject.toml \
-        --replace-fail 'requires = ["maturin>=1.0,<2.0"]' 'requires = ["hatchling"]' \
+        --replace-fail 'requires = ["maturin>=1.9,<2.0"]' 'requires = ["hatchling"]' \
         --replace-fail 'build-backend = "maturin"' 'build-backend = "hatchling.build"'
 
       cat >> pyproject.toml <<EOF

From 44ba17565f8e56f8742adcc560ac612d9da3ef7d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 14:32:43 +0300
Subject: [PATCH 1626/3724] spandsp3: nixfmt

Oops.
---
 pkgs/development/libraries/spandsp/3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix
index b41a9085e618..77126a7c4cee 100644
--- a/pkgs/development/libraries/spandsp/3.nix
+++ b/pkgs/development/libraries/spandsp/3.nix
@@ -13,7 +13,7 @@
     sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
   };
 
-  propagatedBuildInputs = previousAttrs.propagatedBuildInputs or [] ++ [
+  propagatedBuildInputs = previousAttrs.propagatedBuildInputs or [ ] ++ [
     libjpeg
   ];
 })

From e8455cf6a74702b3135edd68a8a2715cb3f1a5a0 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 11 Aug 2025 13:23:53 +0200
Subject: [PATCH 1627/3724] libmypaint: fix build by pre-loading autotools tool
 resolution

---
 pkgs/by-name/li/libmypaint/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libmypaint/package.nix b/pkgs/by-name/li/libmypaint/package.nix
index 6b20366a57d8..1ccc5c2087a8 100644
--- a/pkgs/by-name/li/libmypaint/package.nix
+++ b/pkgs/by-name/li/libmypaint/package.nix
@@ -56,7 +56,15 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  preConfigure = "./autogen.sh";
+  # don't rely on rigid autotools versions, instead preload whatever is in $PATH in the build environment.
+  # libmypaint 1.6.1 only officially supports autotools up to 1.16,
+  # 2.0.0 alphas support up to autotools 1.17.
+  # However, we are now on autotools 1.18, so this would otherwise break.
+  preConfigure = ''
+    export AUTOMAKE=automake
+    export ACLOCAL=aclocal
+    ./autogen.sh
+  '';
 
   meta = with lib; {
     homepage = "http://mypaint.org/";

From 2411f10a567f5c1a17b5b552804afab43c126010 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sun, 9 Mar 2025 13:36:18 -0400
Subject: [PATCH 1628/3724] podman-desktop: add podman to PATH

Otherwise, the basic app functionality - managing containers - requires
a manual configuration of the path to the podman binary.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 pkgs/by-name/po/podman-desktop/package.nix | 55 +++++++++++++---------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index c372014a9642..bed98f8c6049 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -15,10 +15,12 @@
   nix,
   jq,
   gnugrep,
+  podman,
 }:
 
 let
   electron = electron_37;
+  appName = "Podman Desktop";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "podman-desktop";
@@ -72,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
   ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
   nativeBuildInputs = [
+    makeWrapper
     nodejs
     pnpm_10.configHook
   ]
@@ -103,29 +106,39 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postBuild
   '';
 
-  installPhase = ''
-    runHook preInstall
+  installPhase =
+    let
+      commonWrapperArgs = "--prefix PATH : ${lib.makeBinPath [ podman ]}";
+    in
+    (
+      ''
+        runHook preInstall
 
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir -p $out/Applications
-    mv dist/mac*/Podman\ Desktop.app $out/Applications
-  ''
-  + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-    mkdir -p "$out/share/lib/podman-desktop"
-    cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/podman-desktop"
+      ''
+      + lib.optionalString stdenv.hostPlatform.isDarwin ''
+        mkdir -p "$out/Applications"
+        mv dist/mac*/"${appName}.app" "$out/Applications"
 
-    install -Dm644 buildResources/icon.svg "$out/share/icons/hicolor/scalable/apps/podman-desktop.svg"
+        wrapProgram "$out/Applications/${appName}.app/Contents/MacOS/${appName}" \
+          ${commonWrapperArgs}
+      ''
+      + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+        mkdir -p "$out/share/lib/podman-desktop"
+        cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/podman-desktop"
 
-    makeWrapper '${electron}/bin/electron' "$out/bin/podman-desktop" \
-      --add-flags "$out/share/lib/podman-desktop/resources/app.asar" \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-      --inherit-argv0
-  ''
-  + ''
+        install -Dm644 buildResources/icon.svg "$out/share/icons/hicolor/scalable/apps/podman-desktop.svg"
 
-    runHook postInstall
-  '';
+        makeWrapper '${electron}/bin/electron' "$out/bin/podman-desktop" \
+          --add-flags "$out/share/lib/podman-desktop/resources/app.asar" \
+          --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+          ${commonWrapperArgs} \
+          --inherit-argv0
+      ''
+      + ''
+
+        runHook postInstall
+      ''
+    );
 
   # see: https://github.com/containers/podman-desktop/blob/main/.flatpak.desktop
   desktopItems = [
@@ -133,11 +146,11 @@ stdenv.mkDerivation (finalAttrs: {
       name = "podman-desktop";
       exec = "podman-desktop %U";
       icon = "podman-desktop";
-      desktopName = "Podman Desktop";
+      desktopName = appName;
       genericName = "Desktop client for podman";
       comment = finalAttrs.meta.description;
       categories = [ "Utility" ];
-      startupWMClass = "Podman Desktop";
+      startupWMClass = appName;
     })
   ];
 

From 69e852f9d50860cab27866f0ba392c7a2514857e Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sun, 10 Aug 2025 19:02:05 -0400
Subject: [PATCH 1629/3724] podman-desktop: remove @panda2134 from maintainers

---
 pkgs/by-name/po/podman-desktop/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index bed98f8c6049..9ede1352de4c 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -161,7 +161,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       booxter
-      panda2134
     ];
     inherit (electron.meta) platforms;
     mainProgram = "podman-desktop";

From 6f50fdb8548937860aff2591e2ba67c0d63eea96 Mon Sep 17 00:00:00 2001
From: Vincent Fischer <fischervincent98@gmail.com>
Date: Mon, 11 Aug 2025 15:52:26 +0200
Subject: [PATCH 1630/3724] prism-model-checker: 4.8.1 -> 4.9

---
 pkgs/by-name/pr/prism-model-checker/package.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/pr/prism-model-checker/package.nix b/pkgs/by-name/pr/prism-model-checker/package.nix
index 80575f375bb2..9ed211957f33 100644
--- a/pkgs/by-name/pr/prism-model-checker/package.nix
+++ b/pkgs/by-name/pr/prism-model-checker/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
-  #  stdenv,
-  gcc13Stdenv,
+  stdenv,
+  gccStdenv,
   coreutils,
   fetchFromGitHub,
   openjdk,
@@ -13,22 +13,17 @@
 }:
 
 let
-  # The current version of prism does not build with gcc > 13
-  # it should be fixed in the upcoming version of prism.
-  # at that point revert stdenv' to :
-  #
-  # stdenv' = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv;
-  stdenv' = gcc13Stdenv;
+  stdenv' = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv;
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "prism-model-checker";
-  version = "4.8.1";
+  version = "4.9";
 
   src = fetchFromGitHub {
     owner = "prismmodelchecker";
     repo = "prism";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-igFRIjPfx0BFpQjaW/vgMEnH2HLC06aL3IMHh+ELB6U=";
+    hash = "sha256-eoyMGrXta49j2h/bStPuzrF6OZd/l2aQBngPbTZEvAo=";
   };
 
   nativeBuildInputs = [

From 59e129f5d1c5f1bc0dc58061db7be811474cd250 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 14:01:42 +0000
Subject: [PATCH 1631/3724] gphoto2: 2.5.28 -> 2.5.32

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

diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index 3822b1655b1b..7356267c5f59 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gphoto2";
-  version = "2.5.28";
+  version = "2.5.32";
 
   src = fetchFromGitHub {
     owner = "gphoto";
     repo = "gphoto2";
     rev = "v${version}";
-    sha256 = "sha256-t5EnM4WaDbOTPM+rJW+hQxBgNErnnZEN9lZvxTKoDhA=";
+    sha256 = "sha256-9Tn6CBxZpzPnlyiBYdpQGViT3NEcup6AXT7Z0DqI/vA=";
   };
 
   nativeBuildInputs = [

From 6b65094122e0fb6f4110d49f6af28b0d241bfa10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 14:08:12 +0000
Subject: [PATCH 1632/3724] benthos: 4.54.0 -> 4.55.0

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

diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix
index 17de945b0754..d8fe088eff66 100644
--- a/pkgs/by-name/be/benthos/package.nix
+++ b/pkgs/by-name/be/benthos/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "benthos";
-  version = "4.54.0";
+  version = "4.55.0";
 
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "benthos";
     tag = "v${version}";
-    hash = "sha256-+49Gb+5mPCbeNcnFHckNCyWRvdpOP+xy34bn0I97tWc=";
+    hash = "sha256-i6PDTgiDEZJAobNvDxRwggIfBMsZ7gZsn6ruthVn37w=";
   };
 
   proxyVendor = true;

From 3a115015cc8bb9aaa3d4e0f8b686289b87dc8a1b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 16:29:42 +0300
Subject: [PATCH 1633/3724] mbedtls: restore patch to fix build on aarch64

Still necessary on aarch64.
---
 pkgs/development/libraries/mbedtls/3.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix
index 1713280f2123..05793b55d070 100644
--- a/pkgs/development/libraries/mbedtls/3.nix
+++ b/pkgs/development/libraries/mbedtls/3.nix
@@ -3,4 +3,16 @@
 callPackage ./generic.nix {
   version = "3.6.4";
   hash = "sha256-y5YqKtjW4IXyIZkoJvwCGC4scx0qdeV40rynHza4NUE=";
+
+  patches = [
+    # Fixes the build with GCC 14 on aarch64.
+    #
+    # See:
+    # * <https://github.com/openwrt/openwrt/pull/15479>
+    # * <https://github.com/Mbed-TLS/mbedtls/issues/9003>
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/openwrt/openwrt/52b6c9247997e51a97f13bb9e94749bc34e2d52e/package/libs/mbedtls/patches/100-fix-gcc14-build.patch";
+      hash = "sha256-20bxGoUHkrOEungN3SamYKNgj95pM8IjbisNRh68Wlw=";
+    })
+  ];
 }

From 2063bba9bddf20a2e57f640eac9da69b3419bd22 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 16:29:54 +0300
Subject: [PATCH 1634/3724] grafana: cherry-pick patch to fix build

Not entirely sure why it broke now, but this fixes it.
---
 pkgs/servers/monitoring/grafana/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index a4cf06a4f8d5..b8ba563931b7 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildGoModule,
   fetchFromGitHub,
+  fetchpatch,
   removeReferencesTo,
   tzdata,
   wire,
@@ -56,6 +57,15 @@ buildGoModule rec {
     hash = "sha256-yraCuPLe68ryCgFzOZPL1H/JYynEvxijjgxMmQvcPZE=";
   };
 
+  # Fix build
+  # FIXME: remove in next update
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/grafana/grafana/commit/21f305c6a0e242463f5219cc6944fb880ea809f0.patch";
+      hash = "sha256-sXooRlnKY5ax0+1CPhy4zxDQtDGspbSdOoHHciqLTD8=";
+    })
+  ];
+
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
   env = {
     CYPRESS_INSTALL_BINARY = 0;

From d59d3cb88a7c7d10192160fb3dc10ff05ab3fccb Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 16:30:15 +0300
Subject: [PATCH 1635/3724] openvpn: fix build with linux-headers 6.16

---
 pkgs/tools/networking/openvpn/dco.patch   | 25 +++++++++++++++++++++++
 pkgs/tools/networking/openvpn/default.nix |  7 +++++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/networking/openvpn/dco.patch

diff --git a/pkgs/tools/networking/openvpn/dco.patch b/pkgs/tools/networking/openvpn/dco.patch
new file mode 100644
index 000000000000..22572e6bc48b
--- /dev/null
+++ b/pkgs/tools/networking/openvpn/dco.patch
@@ -0,0 +1,25 @@
+diff --git a/src/openvpn/ovpn_dco_linux.h b/src/openvpn/ovpn_dco_linux.h
+index 73e19b5..46c2786 100644
+--- a/src/openvpn/ovpn_dco_linux.h
++++ b/src/openvpn/ovpn_dco_linux.h
+@@ -237,20 +237,4 @@ enum ovpn_netlink_packet_attrs {
+ 	OVPN_PACKET_ATTR_MAX = __OVPN_PACKET_ATTR_AFTER_LAST - 1,
+ };
+ 
+-enum ovpn_ifla_attrs {
+-	IFLA_OVPN_UNSPEC = 0,
+-	IFLA_OVPN_MODE,
+-
+-	__IFLA_OVPN_AFTER_LAST,
+-	IFLA_OVPN_MAX = __IFLA_OVPN_AFTER_LAST - 1,
+-};
+-
+-enum ovpn_mode {
+-	__OVPN_MODE_FIRST = 0,
+-	OVPN_MODE_P2P = __OVPN_MODE_FIRST,
+-	OVPN_MODE_MP,
+-
+-	__OVPN_MODE_AFTER_LAST,
+-};
+-
+ #endif /* _UAPI_LINUX_OVPN_DCO_H_ */
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 61937d6200f5..0f5c809ffc8c 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -30,6 +30,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-nramYYNS+ee3canTiuFjG17f7tbUAjPiQ+YC3fIZXno=";
   };
 
+  # Effectively a backport of https://github.com/OpenVPN/openvpn/commit/1d3c2b67a73a0aa011c13e62f876d24e49d41df0
+  # to fix build on linux-headers 6.16.
+  # FIXME: remove in next update
+  patches = [
+    ./dco.patch
+  ];
+
   nativeBuildInputs = [
     pkg-config
   ]

From b0cab1384f9c2bbdc3d0c7cbc08eca2fad9f8d48 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 17:14:46 +0300
Subject: [PATCH 1636/3724] paperless-ngx: fix build with latest
 concurrent-log-handler

---
 .../concurrent-log-handler.patch              | 21 +++++++++++++++++++
 pkgs/by-name/pa/paperless-ngx/package.nix     |  8 +++++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/pa/paperless-ngx/concurrent-log-handler.patch

diff --git a/pkgs/by-name/pa/paperless-ngx/concurrent-log-handler.patch b/pkgs/by-name/pa/paperless-ngx/concurrent-log-handler.patch
new file mode 100644
index 000000000000..53c7d86b533e
--- /dev/null
+++ b/pkgs/by-name/pa/paperless-ngx/concurrent-log-handler.patch
@@ -0,0 +1,21 @@
+diff --git a/src/paperless/settings.py b/src/paperless/settings.py
+index 3b69b2fc2..8549b9396 100644
+--- a/src/paperless/settings.py
++++ b/src/paperless/settings.py
+@@ -11,7 +11,6 @@ from typing import Final
+ from urllib.parse import urlparse
+ 
+ from celery.schedules import crontab
+-from concurrent_log_handler.queue import setup_logging_queues
+ from django.utils.translation import gettext_lazy as _
+ from dotenv import load_dotenv
+ 
+@@ -803,8 +802,6 @@ USE_TZ = True
+ # Logging                                                                     #
+ ###############################################################################
+ 
+-setup_logging_queues()
+-
+ LOGGING_DIR.mkdir(parents=True, exist_ok=True)
+ 
+ LOGROTATE_MAX_SIZE = os.getenv("PAPERLESS_LOGROTATE_MAX_SIZE", 1024 * 1024)
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 12edfd5b1e7e..5bb684d837a2 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchPypi,
+  fetchpatch,
   node-gyp,
   nodejs_20,
   nixosTests,
@@ -144,6 +145,13 @@ python.pkgs.buildPythonApplication rec {
 
   inherit version src;
 
+  # Manual partial backport of https://github.com/paperless-ngx/paperless-ngx/commit/9889c59d3daa8f4ac8ec2400c00ddc36a7ca63c9
+  # Fixes build with latest concurrent-log-handler.
+  # FIXME: remove in next update
+  patches = [
+    ./concurrent-log-handler.patch
+  ];
+
   postPatch = ''
     # pytest-xdist with to many threads makes the tests flaky
     if (( $NIX_BUILD_CORES > 3)); then

From 3e8a5f7fa2180db0c86600a78a5def0907effefe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 14:54:23 +0000
Subject: [PATCH 1637/3724] squawk: 2.21.1 -> 2.22.0

---
 pkgs/by-name/sq/squawk/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix
index 7c90f3b241f8..a47feb174394 100644
--- a/pkgs/by-name/sq/squawk/package.nix
+++ b/pkgs/by-name/sq/squawk/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "squawk";
-  version = "2.21.1";
+  version = "2.22.0";
 
   src = fetchFromGitHub {
     owner = "sbdchd";
     repo = "squawk";
     tag = "v${version}";
-    hash = "sha256-Ox6UPy4EFN3WEpXYXx0SGVRcAY0zl0x7eCxKP/kS3qo=";
+    hash = "sha256-wAcoSnWbWhoT4FaGWH8zQRBwc0udJPCni4ZUecmRX4c=";
   };
 
-  cargoHash = "sha256-WRGz70lb1HwVOwi+un8h7PoDMlFrJbuFmw3q+JKkfZw=";
+  cargoHash = "sha256-ptUskdXoKLqqtFDUszJvEbvha01M6OgGJFV9mRLI2gw=";
 
   nativeBuildInputs = [
     pkg-config

From e4a8ed73aabf596037041fa95dec717e9b45fefb Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Aug 2025 18:31:05 +0300
Subject: [PATCH 1638/3724] paperless-ngx: actually fix for real

---
 .../concurrent-log-handler.patch              |  21 ----
 .../pa/paperless-ngx/dep-updates.patch        | 108 ++++++++++++++++++
 pkgs/by-name/pa/paperless-ngx/package.nix     |  15 ++-
 3 files changed, 120 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/by-name/pa/paperless-ngx/concurrent-log-handler.patch
 create mode 100644 pkgs/by-name/pa/paperless-ngx/dep-updates.patch

diff --git a/pkgs/by-name/pa/paperless-ngx/concurrent-log-handler.patch b/pkgs/by-name/pa/paperless-ngx/concurrent-log-handler.patch
deleted file mode 100644
index 53c7d86b533e..000000000000
--- a/pkgs/by-name/pa/paperless-ngx/concurrent-log-handler.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/paperless/settings.py b/src/paperless/settings.py
-index 3b69b2fc2..8549b9396 100644
---- a/src/paperless/settings.py
-+++ b/src/paperless/settings.py
-@@ -11,7 +11,6 @@ from typing import Final
- from urllib.parse import urlparse
- 
- from celery.schedules import crontab
--from concurrent_log_handler.queue import setup_logging_queues
- from django.utils.translation import gettext_lazy as _
- from dotenv import load_dotenv
- 
-@@ -803,8 +802,6 @@ USE_TZ = True
- # Logging                                                                     #
- ###############################################################################
- 
--setup_logging_queues()
--
- LOGGING_DIR.mkdir(parents=True, exist_ok=True)
- 
- LOGROTATE_MAX_SIZE = os.getenv("PAPERLESS_LOGROTATE_MAX_SIZE", 1024 * 1024)
diff --git a/pkgs/by-name/pa/paperless-ngx/dep-updates.patch b/pkgs/by-name/pa/paperless-ngx/dep-updates.patch
new file mode 100644
index 000000000000..3ce6dbd72dd1
--- /dev/null
+++ b/pkgs/by-name/pa/paperless-ngx/dep-updates.patch
@@ -0,0 +1,108 @@
+diff --git a/src/paperless/settings.py b/src/paperless/settings.py
+index 3b69b2fc2..8549b9396 100644
+--- a/src/paperless/settings.py
++++ b/src/paperless/settings.py
+@@ -11,7 +11,6 @@ from typing import Final
+ from urllib.parse import urlparse
+ 
+ from celery.schedules import crontab
+-from concurrent_log_handler.queue import setup_logging_queues
+ from django.utils.translation import gettext_lazy as _
+ from dotenv import load_dotenv
+ 
+@@ -803,8 +802,6 @@ USE_TZ = True
+ # Logging                                                                     #
+ ###############################################################################
+ 
+-setup_logging_queues()
+-
+ LOGGING_DIR.mkdir(parents=True, exist_ok=True)
+ 
+ LOGROTATE_MAX_SIZE = os.getenv("PAPERLESS_LOGROTATE_MAX_SIZE", 1024 * 1024)
+diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py
+index b62e37166..415a69163 100644
+--- a/src/paperless_mail/mail.py
++++ b/src/paperless_mail/mail.py
+@@ -29,7 +29,7 @@ from imap_tools import MailBoxUnencrypted
+ from imap_tools import MailMessage
+ from imap_tools import MailMessageFlags
+ from imap_tools import errors
+-from imap_tools.mailbox import MailBoxTls
++from imap_tools.mailbox import MailBoxStartTls
+ from imap_tools.query import LogicOperator
+ 
+ from documents.data_models import ConsumableDocument
+@@ -419,7 +419,7 @@ def get_mailbox(server, port, security) -> MailBox:
+     if security == MailAccount.ImapSecurity.NONE:
+         mailbox = MailBoxUnencrypted(server, port)
+     elif security == MailAccount.ImapSecurity.STARTTLS:
+-        mailbox = MailBoxTls(server, port, ssl_context=ssl_context)
++        mailbox = MailBoxStartTls(server, port, ssl_context=ssl_context)
+     elif security == MailAccount.ImapSecurity.SSL:
+         mailbox = MailBox(server, port, ssl_context=ssl_context)
+     else:
+diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
+index 5a1a6c6859a..95689b5124d 100644
+--- a/src/documents/serialisers.py
++++ b/src/documents/serialisers.py
+@@ -2038,6 +2038,24 @@ def validate(self, attrs):
+ 
+         return attrs
+ 
++    @staticmethod
++    def normalize_workflow_trigger_sources(trigger):
++        """
++        Convert sources to strings to handle django-multiselectfield v1.0 changes
++        """
++        if trigger and "sources" in trigger:
++            trigger["sources"] = [
++                str(s.value if hasattr(s, "value") else s) for s in trigger["sources"]
++            ]
++
++    def create(self, validated_data):
++        WorkflowTriggerSerializer.normalize_workflow_trigger_sources(validated_data)
++        return super().create(validated_data)
++
++    def update(self, instance, validated_data):
++        WorkflowTriggerSerializer.normalize_workflow_trigger_sources(validated_data)
++        return super().update(instance, validated_data)
++
+ 
+ class WorkflowActionEmailSerializer(serializers.ModelSerializer):
+     id = serializers.IntegerField(allow_null=True, required=False)
+@@ -2202,6 +2220,8 @@ def update_triggers_and_actions(self, instance: Workflow, triggers, actions):
+         if triggers is not None and triggers is not serializers.empty:
+             for trigger in triggers:
+                 filter_has_tags = trigger.pop("filter_has_tags", None)
++                # Convert sources to strings to handle django-multiselectfield v1.0 changes
++                WorkflowTriggerSerializer.normalize_workflow_trigger_sources(trigger)
+                 trigger_instance, _ = WorkflowTrigger.objects.update_or_create(
+                     id=trigger.get("id"),
+                     defaults=trigger,
+diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py
+index 68d20476593..7415467de79 100644
+--- a/src/documents/tests/test_management_exporter.py
++++ b/src/documents/tests/test_management_exporter.py
+@@ -123,7 +123,7 @@ def setUp(self) -> None:
+ 
+         self.trigger = WorkflowTrigger.objects.create(
+             type=WorkflowTrigger.WorkflowTriggerType.CONSUMPTION,
+-            sources=[1],
++            sources=[str(WorkflowTrigger.DocumentSourceChoices.CONSUME_FOLDER.value)],
+             filter_filename="*",
+         )
+         self.action = WorkflowAction.objects.create(assign_title="new title")
+diff --git a/src/documents/tests/test_migration_workflows.py b/src/documents/tests/test_migration_workflows.py
+index 9895188188a..60e429d68c2 100644
+--- a/src/documents/tests/test_migration_workflows.py
++++ b/src/documents/tests/test_migration_workflows.py
+@@ -104,7 +104,7 @@ def setUpBeforeMigration(self, apps):
+ 
+         trigger = WorkflowTrigger.objects.create(
+             type=0,
+-            sources=[DocumentSource.ConsumeFolder],
++            sources=[str(DocumentSource.ConsumeFolder)],
+             filter_path="*/path/*",
+             filter_filename="*file*",
+         )
+
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 5bb684d837a2..6773631561e8 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -145,11 +145,13 @@ python.pkgs.buildPythonApplication rec {
 
   inherit version src;
 
-  # Manual partial backport of https://github.com/paperless-ngx/paperless-ngx/commit/9889c59d3daa8f4ac8ec2400c00ddc36a7ca63c9
-  # Fixes build with latest concurrent-log-handler.
+  # Manual partial backport of:
+  # - https://github.com/paperless-ngx/paperless-ngx/commit/9889c59d3daa8f4ac8ec2400c00ddc36a7ca63c9
+  # - https://github.com/paperless-ngx/paperless-ngx/pull/10538
+  # Fixes build with latest dependency versions.
   # FIXME: remove in next update
   patches = [
-    ./concurrent-log-handler.patch
+    ./dep-updates.patch
   ];
 
   postPatch = ''
@@ -170,7 +172,14 @@ python.pkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = [
     "django-allauth"
+    "django-auditlog"
+    "django-guardian"
+    "django-multiselectfield"
+    "imap-tools"
+    "pathvalidate"
     "redis"
+    "scikit-learn"
+    "tika-client"
   ];
 
   dependencies =

From fb0028ed6c0b95bfcebe48fe4d8dccf40087ec96 Mon Sep 17 00:00:00 2001
From: xfnw <xfnw@riseup.net>
Date: Mon, 11 Aug 2025 11:56:28 -0400
Subject: [PATCH 1639/3724] catgirl: migrate to finalAttrs

---
 pkgs/by-name/ca/catgirl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/catgirl/package.nix b/pkgs/by-name/ca/catgirl/package.nix
index cd6ba40d1c4f..d0f9a4888bb3 100644
--- a/pkgs/by-name/ca/catgirl/package.nix
+++ b/pkgs/by-name/ca/catgirl/package.nix
@@ -8,12 +8,12 @@
   stdenv,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "catgirl";
   version = "2.2a";
 
   src = fetchurl {
-    url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz";
+    url = "https://git.causal.agency/catgirl/snapshot/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
     hash = "sha256-xtdgqu4TTgUlht73qRA1Q/coH95lMfvLQQhkcHlCl8I=";
   };
 
@@ -47,4 +47,4 @@ stdenv.mkDerivation rec {
     mainProgram = "catgirl";
     maintainers = with maintainers; [ xfnw ];
   };
-}
+})

From a2584f2a43381bee3a2e18a09a9cff05f159c1b8 Mon Sep 17 00:00:00 2001
From: xfnw <xfnw@riseup.net>
Date: Mon, 11 Aug 2025 12:14:53 -0400
Subject: [PATCH 1640/3724] catgirl: avoid with lib

---
 pkgs/by-name/ca/catgirl/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/catgirl/package.nix b/pkgs/by-name/ca/catgirl/package.nix
index d0f9a4888bb3..b921bdde8829 100644
--- a/pkgs/by-name/ca/catgirl/package.nix
+++ b/pkgs/by-name/ca/catgirl/package.nix
@@ -39,12 +39,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://git.causal.agency/catgirl/about/";
-    license = licenses.gpl3Plus;
     description = "TLS-only terminal IRC client";
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
     mainProgram = "catgirl";
-    maintainers = with maintainers; [ xfnw ];
+    maintainers = with lib.maintainers; [ xfnw ];
   };
 })

From 052f5f2f9b141abe551e57eab537ee9f3ef43726 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 16:35:59 +0000
Subject: [PATCH 1641/3724] libyang: 3.12.2 -> 3.13.5

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

diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix
index 90cad5b99f1f..5d474a6f919b 100644
--- a/pkgs/by-name/li/libyang/package.nix
+++ b/pkgs/by-name/li/libyang/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libyang";
-  version = "3.12.2";
+  version = "3.13.5";
 
   src = fetchFromGitHub {
     owner = "CESNET";
     repo = "libyang";
     rev = "v${version}";
-    hash = "sha256-iHIHXrGAGZ5vYA/pbFmHVVczRtH34lC5IIqyj0SF1r4=";
+    hash = "sha256-yO2gk8l+NY++PHsUBawItCtDXgBBd561xnyJcjtjd/g=";
   };
 
   outputs = [

From a7f7e8c38fbd9658f52e9a1d997017e55568c4ce Mon Sep 17 00:00:00 2001
From: Ben Brown <ben@demerara.io>
Date: Mon, 11 Aug 2025 18:26:30 +0100
Subject: [PATCH 1642/3724] xcp: install shell completions

---
 pkgs/by-name/xc/xcp/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix
index 16e699597aab..0ef12c99381d 100644
--- a/pkgs/by-name/xc/xcp/package.nix
+++ b/pkgs/by-name/xc/xcp/package.nix
@@ -4,6 +4,7 @@
   lib,
   acl,
   nix-update-script,
+  installShellFiles,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -19,6 +20,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-9cNu0cgoo0/41daJwy/uWIXa2wFhYkcPhJfA/69DVx0=";
 
+  nativeBuildInputs = [ installShellFiles ];
+
   checkInputs = [ acl ];
 
   # disable tests depending on special filesystem features
@@ -32,6 +35,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "test_no_perms"
   ];
 
+  postInstall = ''
+    installShellCompletion --cmd xcp \
+      --bash completions/xcp.bash \
+      --fish completions/xcp.fish \
+      --zsh completions/xcp.zsh
+  '';
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 1e300448d50c4ebfac373ae4a27be8c27ad74320 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 17:51:20 +0000
Subject: [PATCH 1643/3724] eslint: 9.32.0 -> 9.33.0

---
 pkgs/by-name/es/eslint/package-lock.json | 428 +++++++++++------------
 pkgs/by-name/es/eslint/package.nix       |   6 +-
 2 files changed, 217 insertions(+), 217 deletions(-)

diff --git a/pkgs/by-name/es/eslint/package-lock.json b/pkgs/by-name/es/eslint/package-lock.json
index ef6a945a1f44..b104c7445d20 100644
--- a/pkgs/by-name/es/eslint/package-lock.json
+++ b/pkgs/by-name/es/eslint/package-lock.json
@@ -1,22 +1,22 @@
 {
   "name": "eslint",
-  "version": "9.32.0",
+  "version": "9.33.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "eslint",
-      "version": "9.32.0",
+      "version": "9.33.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.21.0",
-        "@eslint/config-helpers": "^0.3.0",
-        "@eslint/core": "^0.15.0",
+        "@eslint/config-helpers": "^0.3.1",
+        "@eslint/core": "^0.15.2",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.32.0",
-        "@eslint/plugin-kit": "^0.3.4",
+        "@eslint/js": "9.33.0",
+        "@eslint/plugin-kit": "^0.3.5",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
@@ -1825,10 +1825,11 @@
       "license": "MIT"
     },
     "node_modules/@braidai/lang": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@braidai/lang/-/lang-1.1.1.tgz",
-      "integrity": "sha512-5uM+no3i3DafVgkoW7ayPhEGHNNBZCSj5TrGDQt0ayEKQda5f3lAXlmQg0MR5E0gKgmTzUUEtSWHsEC3h9jUcg==",
-      "dev": true
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@braidai/lang/-/lang-1.1.2.tgz",
+      "integrity": "sha512-qBcknbBufNHlui137Hft8xauQMTZDKdophmLFv05r2eNmdIv/MlPuP4TdUknHG68UdWLgVZwgxVe735HzJNIwA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/@colors/colors": {
       "version": "1.5.0",
@@ -2159,18 +2160,18 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
-      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
+      "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
       "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
-      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
+      "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/json-schema": "^7.0.15"
@@ -2215,9 +2216,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.32.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.32.0.tgz",
-      "integrity": "sha512-BBpRFZK3eX6uMLKz8WxFOBIFFcGFJ/g8XuwjTHCqHROSIsopI+ddn/d5Cfh36+7+e5edVS8dbSHnBNhrLEX0zg==",
+      "version": "9.33.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.33.0.tgz",
+      "integrity": "sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==",
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2252,12 +2253,12 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.4.tgz",
-      "integrity": "sha512-Ul5l+lHEcw3L5+k8POx6r74mxEYKG5kOb6Xpy2gCRW6zweT6TEhAf8vhxGgjhqrd/VO/Dirhsb+1hNpD1ue9hw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
+      "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.15.1",
+        "@eslint/core": "^0.15.2",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -2576,9 +2577,9 @@
       }
     },
     "node_modules/@napi-rs/wasm-runtime": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.0.1.tgz",
-      "integrity": "sha512-KVlQ/jgywZpixGCKMNwxStmmbYEMyokZpCf2YuIChhfJA2uqfAKNEM8INz7zzTo55iEXfBhIIs3VqYyqzDLj8g==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.0.3.tgz",
+      "integrity": "sha512-rZxtMsLwjdXkMUGC3WwsPwLNVqVqnTJT6MNIB6e+5fhMcSCPP0AOsNWuMQ5mdCq6HNjs/ZeWAEchpqeprqBD2Q==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -2664,9 +2665,9 @@
       }
     },
     "node_modules/@oxc-resolver/binding-android-arm-eabi": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm-eabi/-/binding-android-arm-eabi-11.6.0.tgz",
-      "integrity": "sha512-UJTf5uZs919qavt9Btvbzkr3eaUu4d+FXBri8AB2BtOezriaTTUvArab2K9fdACQ4yFggTD5ews1l19V/6SW2Q==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm-eabi/-/binding-android-arm-eabi-11.6.1.tgz",
+      "integrity": "sha512-Ma/kg29QJX1Jzelv0Q/j2iFuUad1WnjgPjpThvjqPjpOyLjCUaiFCCnshhmWjyS51Ki1Iol3fjf1qAzObf8GIA==",
       "cpu": [
         "arm"
       ],
@@ -2678,9 +2679,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-android-arm64": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm64/-/binding-android-arm64-11.6.0.tgz",
-      "integrity": "sha512-v17j1WLEAIlyc+6JOWPXcky7dkU3fN8nHTP8KSK05zkkBO0t28R3Q0udmNBiJtVSnw4EFB/fy/3Mu2ItpG6bVQ==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm64/-/binding-android-arm64-11.6.1.tgz",
+      "integrity": "sha512-xjL/FKKc5p8JkFWiH7pJWSzsewif3fRf1rw2qiRxRvq1uIa6l7Zoa14Zq2TNWEsqDjdeOrlJtfWiPNRnevK0oQ==",
       "cpu": [
         "arm64"
       ],
@@ -2692,9 +2693,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-darwin-arm64": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-11.6.0.tgz",
-      "integrity": "sha512-ZrU+qd5AKe8s7PZDLCHY23UpbGn1RAkcNd4JYjOTnX22XEjSqLvyC6pCMngTyfgGVJ4zXFubBkRzt/k3xOjNlQ==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-11.6.1.tgz",
+      "integrity": "sha512-u0yrJ3NHE0zyCjiYpIyz4Vmov21MA0yFKbhHgixDU/G6R6nvC8ZpuSFql3+7C8ttAK9p8WpqOGweepfcilH5Bw==",
       "cpu": [
         "arm64"
       ],
@@ -2706,9 +2707,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-darwin-x64": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-11.6.0.tgz",
-      "integrity": "sha512-qBIlX0X0RSxQHcXQnFpBGKxrDVtj7OdpWFGmrcR3NcndVjZ/wJRPST5uTTM83NfsHyuUeOi/vRZjmDrthvhnSQ==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-11.6.1.tgz",
+      "integrity": "sha512-2lox165h1EhzxcC8edUy0znXC/hnAbUPaMpYKVlzLpB2AoYmgU4/pmofFApj+axm2FXpNamjcppld8EoHo06rw==",
       "cpu": [
         "x64"
       ],
@@ -2720,9 +2721,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-freebsd-x64": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-11.6.0.tgz",
-      "integrity": "sha512-tTyMlHHNhbkq/oEP/fM8hPZ6lqntHIz6EfOt577/lslrwxC5a/ii0lOOHjPuQtkurpyUBWYPs7Z17EgrZulc4Q==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-11.6.1.tgz",
+      "integrity": "sha512-F45MhEQ7QbHfsvZtVNuA/9obu3il7QhpXYmCMfxn7Zt9nfAOw4pQ8hlS5DroHVp3rW35u9F7x0sixk/QEAi3qQ==",
       "cpu": [
         "x64"
       ],
@@ -2734,9 +2735,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-linux-arm-gnueabihf": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-11.6.0.tgz",
-      "integrity": "sha512-tYinHy5k9/rujo21mG2jZckJJD7fsceNDl5HOl/eh5NPjSt2vXQv181PVKeITw3+3i+gI1d666w5EtgpiCegRA==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-11.6.1.tgz",
+      "integrity": "sha512-r+3+MTTl0tD4NoWbfTIItAxJvuyIU7V0fwPDXrv7Uj64vZ3OYaiyV+lVaeU89Bk/FUUQxeUpWBwdKNKHjyRNQw==",
       "cpu": [
         "arm"
       ],
@@ -2748,9 +2749,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-linux-arm-musleabihf": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-11.6.0.tgz",
-      "integrity": "sha512-aOlGlSiT9fBgSyiIWvSxbyzaBx3XrgCy6UJRrqBkIvMO9D7W90JmV0RsiLua4w43zJSSrfuQQWqmFCwgIib3Iw==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-11.6.1.tgz",
+      "integrity": "sha512-TBTZ63otsWZ72Z8ZNK2JVS0HW1w9zgOixJTFDNrYPUUW1pXGa28KAjQ1yGawj242WLAdu3lwdNIWtkxeO2BLxQ==",
       "cpu": [
         "arm"
       ],
@@ -2762,9 +2763,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-linux-arm64-gnu": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-11.6.0.tgz",
-      "integrity": "sha512-EZ/OuxZA9qQoAANBDb9V4krfYXU3MC+LZ9qY+cE0yMYMIxm7NT5AdR0OaRQqfa3tWIbina1VF7FaMR6rpKvmlA==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-11.6.1.tgz",
+      "integrity": "sha512-SjwhNynjSG2yMdyA0f7wz7Yvo3ppejO+ET7n2oiI7ApCXrwxMzeRWjBzQt+oVWr2HzVOfaEcDS9rMtnR83ulig==",
       "cpu": [
         "arm64"
       ],
@@ -2776,9 +2777,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-linux-arm64-musl": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-11.6.0.tgz",
-      "integrity": "sha512-NpF7sID4NnPetpqDk2eOu6TPUt381Qlpos8nGDcSkAluqSsSGFOPfETEB5VbJeqNVQbepEQX9mOxZygFpW0+nA==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-11.6.1.tgz",
+      "integrity": "sha512-f4EMidK6rosInBzPMnJ0Ri4RttFCvvLNUNDFUBtELW/MFkBwPTDlvbsmW0u0Mk/ruBQ2WmRfOZ6tT62kWMcX2Q==",
       "cpu": [
         "arm64"
       ],
@@ -2790,9 +2791,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-linux-ppc64-gnu": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-11.6.0.tgz",
-      "integrity": "sha512-Sqn9Ha4rxCCpjpfkFi9f9y9phsaBnseaKw+JqHgBQoNMToe+/20A1jwIu9OX+484UuLpduM+wLydgngjnoi7Dg==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-11.6.1.tgz",
+      "integrity": "sha512-1umENVKeUsrWnf5IlF/6SM7DCv8G6CoKI2LnYR6qhZuLYDPS4PBZ0Jow3UDV9Rtbv5KRPcA3/uXjI88ntWIcOQ==",
       "cpu": [
         "ppc64"
       ],
@@ -2804,9 +2805,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-linux-riscv64-gnu": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-11.6.0.tgz",
-      "integrity": "sha512-eFoNcPhImp1FLAQf5U3Nlph4WNWEsdWohSThSTtKPrX+jhPZiVsj3iBC9gjaRwq2Ez4QhP1x7/PSL6mtKnS6rw==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-11.6.1.tgz",
+      "integrity": "sha512-Hjyp1FRdJhsEpIxsZq5VcDuFc8abC0Bgy8DWEa31trCKoTz7JqA7x3E2dkFbrAKsEFmZZ0NvuG5Ip3oIRARhow==",
       "cpu": [
         "riscv64"
       ],
@@ -2818,9 +2819,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-linux-riscv64-musl": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-11.6.0.tgz",
-      "integrity": "sha512-WQw3CT10aJg7SIc/X1QPrh6lTx2wOLg5IaCu/+Mqlxf1nZBEW3+tV/+y3PzXG0MCRhq7FDTiHaW8MBVAwBineQ==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-11.6.1.tgz",
+      "integrity": "sha512-ODJOJng6f3QxpAXhLel3kyWs8rPsJeo9XIZHzA7p//e+5kLMDU7bTVk4eZnUHuxsqsB8MEvPCicJkKCEuur5Ag==",
       "cpu": [
         "riscv64"
       ],
@@ -2832,9 +2833,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-linux-s390x-gnu": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-11.6.0.tgz",
-      "integrity": "sha512-p5qcPr/EtGJ2PpeeArL3ifZU/YljWLypeu38+e19z2dyPv8Aoby8tjM+D1VTI8+suMwTkseyove/uu6zIUiqRw==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-11.6.1.tgz",
+      "integrity": "sha512-hCzRiLhqe1ZOpHTsTGKp7gnMJRORlbCthawBueer2u22RVAka74pV/+4pP1tqM07mSlQn7VATuWaDw9gCl+cVg==",
       "cpu": [
         "s390x"
       ],
@@ -2846,9 +2847,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-linux-x64-gnu": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-11.6.0.tgz",
-      "integrity": "sha512-/9M/ieoY5v54k3UjtF9Vw43WQ4bBfed+qRL1uIpFbZcO2qi5aXwVMYnjSd/BoaRtDs5JFV9iOjzHwpw0zdOYZA==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-11.6.1.tgz",
+      "integrity": "sha512-JansPD8ftOzMYIC3NfXJ68tt63LEcIAx44Blx6BAd7eY880KX7A0KN3hluCrelCz5aQkPaD95g8HBiJmKaEi2w==",
       "cpu": [
         "x64"
       ],
@@ -2860,9 +2861,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-linux-x64-musl": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-11.6.0.tgz",
-      "integrity": "sha512-HMtWWHTU7zbwceTFZPAPMMhhWR1nNO2OR60r6i55VprCMvttTWPQl7uLP0AUtAPoU9B/2GqP48rzOuaaKhHnYw==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-11.6.1.tgz",
+      "integrity": "sha512-R78ES1rd4z2x5NrFPtSWb/ViR1B8wdl+QN2X8DdtoYcqZE/4tvWtn9ZTCXMEzUp23tchJ2wUB+p6hXoonkyLpA==",
       "cpu": [
         "x64"
       ],
@@ -2874,9 +2875,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-wasm32-wasi": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-11.6.0.tgz",
-      "integrity": "sha512-rDAwr2oqmnG/6LSZJwvO3Bmt/RC3/Q6myyaUmg3P7GhZDyFPrWJONB7NFhPwU2Q4JIpA73ST4LBdhzmGxMTmrw==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-11.6.1.tgz",
+      "integrity": "sha512-qAR3tYIf3afkij/XYunZtlz3OH2Y4ni10etmCFIJB5VRGsqJyI6Hl+2dXHHGJNwbwjXjSEH/KWJBpVroF3TxBw==",
       "cpu": [
         "wasm32"
       ],
@@ -2884,16 +2885,16 @@
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@napi-rs/wasm-runtime": "^1.0.0"
+        "@napi-rs/wasm-runtime": "^1.0.1"
       },
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/@oxc-resolver/binding-win32-arm64-msvc": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.6.0.tgz",
-      "integrity": "sha512-COzy8weljZo2lObWl6ZzW6ypDx1v1rtLdnt7JPjTUARikK1gMzlz9kouQhCtCegNFILx2L2oWw7714fnchqujw==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.6.1.tgz",
+      "integrity": "sha512-QqygWygIuemGkaBA48POOTeinbVvlamqh6ucm8arGDGz/mB5O00gXWxed12/uVrYEjeqbMkla/CuL3fjL3EKvw==",
       "cpu": [
         "arm64"
       ],
@@ -2905,9 +2906,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-win32-ia32-msvc": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-11.6.0.tgz",
-      "integrity": "sha512-p2tMRdi91CovjLBApDPD/uEy1/5r7U6iVkfagLYDytgvj6nJ1EAxLUdXbhoe6//50IvDC/5I51nGCdxmOUiXlQ==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-11.6.1.tgz",
+      "integrity": "sha512-N2+kkWwt/bk0JTCxhPuK8t8JMp3nd0n2OhwOkU8KO4a7roAJEa4K1SZVjMv5CqUIr5sx2CxtXRBoFDiORX5oBg==",
       "cpu": [
         "ia32"
       ],
@@ -2919,9 +2920,9 @@
       ]
     },
     "node_modules/@oxc-resolver/binding-win32-x64-msvc": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-11.6.0.tgz",
-      "integrity": "sha512-p6b9q5TACd/y39kDK2HENXqd4lThoVrTkxdvizqd5/VwyHcoSd0cDcIEhHpxvfjc83VsODCBgB/zcjp//TlaqA==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-11.6.1.tgz",
+      "integrity": "sha512-DfMg3cU9bJUbN62Prbp4fGCtLgexuwyEaQGtZAp8xmi1Ii26uflOGx0FJkFTF6lVMSFoIRFvIL8gsw5/ZdHrMw==",
       "cpu": [
         "x64"
       ],
@@ -3142,9 +3143,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "22.17.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.0.tgz",
-      "integrity": "sha512-bbAKTCqX5aNVryi7qXVMi+OkB3w/OyblodicMbvE38blyAz7GxXf6XYhklokijuPwwVg9sDLKRxt0ZHXQwZVfQ==",
+      "version": "22.17.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.1.tgz",
+      "integrity": "sha512-y3tBaz+rjspDTylNjAX37jEC3TETEFGNJL6uQDxwF9/8GLLIjW1rvVHlynyuUKMnMr1Roq8jOv3vkopBjC4/VA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3201,16 +3202,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.38.0.tgz",
-      "integrity": "sha512-Zhy8HCvBUEfBECzIl1PKqF4p11+d0aUJS1GeUiuqK9WmOug8YCmC4h4bjyBvMyAMI9sbRczmrYL5lKg/YMbrcQ==",
+      "version": "8.39.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.39.1.tgz",
+      "integrity": "sha512-pUXGCuHnnKw6PyYq93lLRiZm3vjuslIy7tus1lIQTYVK9bL8XBgJnCWm8a0KcTtHC84Yya1Q6rtll+duSMj0dg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.38.0",
-        "@typescript-eslint/types": "8.38.0",
-        "@typescript-eslint/typescript-estree": "8.38.0",
-        "@typescript-eslint/visitor-keys": "8.38.0",
+        "@typescript-eslint/scope-manager": "8.39.1",
+        "@typescript-eslint/types": "8.39.1",
+        "@typescript-eslint/typescript-estree": "8.39.1",
+        "@typescript-eslint/visitor-keys": "8.39.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3222,18 +3223,18 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.38.0.tgz",
-      "integrity": "sha512-dbK7Jvqcb8c9QfH01YB6pORpqX1mn5gDZc9n63Ak/+jD67oWXn3Gs0M6vddAN+eDXBCS5EmNWzbSxsn9SzFWWg==",
+      "version": "8.39.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.39.1.tgz",
+      "integrity": "sha512-8fZxek3ONTwBu9ptw5nCKqZOSkXshZB7uAxuFF0J/wTMkKydjXCzqqga7MlFMpHi9DoG4BadhmTkITBcg8Aybw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.38.0",
-        "@typescript-eslint/types": "^8.38.0",
+        "@typescript-eslint/tsconfig-utils": "^8.39.1",
+        "@typescript-eslint/types": "^8.39.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3244,18 +3245,18 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.38.0.tgz",
-      "integrity": "sha512-WJw3AVlFFcdT9Ri1xs/lg8LwDqgekWXWhH3iAF+1ZM+QPd7oxQ6jvtW/JPwzAScxitILUIFs0/AnQ/UWHzbATQ==",
+      "version": "8.39.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.39.1.tgz",
+      "integrity": "sha512-RkBKGBrjgskFGWuyUGz/EtD8AF/GW49S21J8dvMzpJitOF1slLEbbHnNEtAHtnDAnx8qDEdRrULRnWVx27wGBw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.38.0",
-        "@typescript-eslint/visitor-keys": "8.38.0"
+        "@typescript-eslint/types": "8.39.1",
+        "@typescript-eslint/visitor-keys": "8.39.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3266,9 +3267,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.38.0.tgz",
-      "integrity": "sha512-Lum9RtSE3EroKk/bYns+sPOodqb2Fv50XOl/gMviMKNvanETUuUcC9ObRbzrJ4VSd2JalPqgSAavwrPiPvnAiQ==",
+      "version": "8.39.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.39.1.tgz",
+      "integrity": "sha512-ePUPGVtTMR8XMU2Hee8kD0Pu4NDE1CN9Q1sxGSGd/mbOtGZDM7pnhXNJnzW63zk/q+Z54zVzj44HtwXln5CvHA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3279,13 +3280,13 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.38.0.tgz",
-      "integrity": "sha512-wzkUfX3plUqij4YwWaJyqhiPE5UCRVlFpKn1oCRn2O1bJ592XxWJj8ROQ3JD5MYXLORW84063z3tZTb/cs4Tyw==",
+      "version": "8.39.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.39.1.tgz",
+      "integrity": "sha512-7sPDKQQp+S11laqTrhHqeAbsCfMkwJMrV7oTDvtDds4mEofJYir414bYKUEb8YPUm9QL3U+8f6L6YExSoAGdQw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3297,16 +3298,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.38.0.tgz",
-      "integrity": "sha512-fooELKcAKzxux6fA6pxOflpNS0jc+nOQEEOipXFNjSlBS6fqrJOVY/whSn70SScHrcJ2LDsxWrneFoWYSVfqhQ==",
+      "version": "8.39.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.39.1.tgz",
+      "integrity": "sha512-EKkpcPuIux48dddVDXyQBlKdeTPMmALqBUbEk38McWv0qVEZwOpVJBi7ugK5qVNgeuYjGNQxrrnoM/5+TI/BPw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.38.0",
-        "@typescript-eslint/tsconfig-utils": "8.38.0",
-        "@typescript-eslint/types": "8.38.0",
-        "@typescript-eslint/visitor-keys": "8.38.0",
+        "@typescript-eslint/project-service": "8.39.1",
+        "@typescript-eslint/tsconfig-utils": "8.39.1",
+        "@typescript-eslint/types": "8.39.1",
+        "@typescript-eslint/visitor-keys": "8.39.1",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -3322,7 +3323,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
@@ -3352,16 +3353,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.38.0.tgz",
-      "integrity": "sha512-hHcMA86Hgt+ijJlrD8fX0j1j8w4C92zue/8LOPAFioIno+W0+L7KqE8QZKCcPGc/92Vs9x36w/4MPTJhqXdyvg==",
+      "version": "8.39.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.39.1.tgz",
+      "integrity": "sha512-VF5tZ2XnUSTuiqZFXCZfZs1cgkdd3O/sSYmdo2EpSyDlC86UM/8YytTmKnehOW3TGAlivqTDT6bS87B/GQ/jyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.38.0",
-        "@typescript-eslint/types": "8.38.0",
-        "@typescript-eslint/typescript-estree": "8.38.0"
+        "@typescript-eslint/scope-manager": "8.39.1",
+        "@typescript-eslint/types": "8.39.1",
+        "@typescript-eslint/typescript-estree": "8.39.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3372,17 +3373,17 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.38.0.tgz",
-      "integrity": "sha512-pWrTcoFNWuwHlA9CvlfSsGWs14JxfN1TH25zM5L7o0pRLhsoZkDnTsXfQRJBEWJoV5DL0jf+Z+sxiud+K0mq1g==",
+      "version": "8.39.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.39.1.tgz",
+      "integrity": "sha512-W8FQi6kEh2e8zVhQ0eeRnxdvIoOkAp/CPAahcNio6nO9dsIwb9b34z90KOlheoyuVf6LSOEdjlkxSkapNEc+4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.38.0",
+        "@typescript-eslint/types": "8.39.1",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -4340,9 +4341,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.25.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",
-      "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz",
+      "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==",
       "dev": true,
       "funding": [
         {
@@ -4360,8 +4361,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001726",
-        "electron-to-chromium": "^1.5.173",
+        "caniuse-lite": "^1.0.30001733",
+        "electron-to-chromium": "^1.5.199",
         "node-releases": "^2.0.19",
         "update-browserslist-db": "^1.1.3"
       },
@@ -4678,9 +4679,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001731",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001731.tgz",
-      "integrity": "sha512-lDdp2/wrOmTRWuoB5DpfNkC0rJDU8DqRa6nYL6HK6sytw70QMopt/NIc/9SM7ylItlBWfACXk0tEn37UWM/+mg==",
+      "version": "1.0.30001734",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001734.tgz",
+      "integrity": "sha512-uhE1Ye5vgqju6OI71HTQqcBCZrvHugk0MjLak7Q+HfoBgoq5Bi+5YnwjP4fjDgrtYr/l8MVRBvzz9dPD4KyK0A==",
       "dev": true,
       "funding": [
         {
@@ -5302,9 +5303,9 @@
       "license": "MIT"
     },
     "node_modules/core-js": {
-      "version": "3.44.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.44.0.tgz",
-      "integrity": "sha512-aFCtd4l6GvAXwVEh3XbbVqJGHDJt0OZRa+5ePGx3LLwi12WfexqQxcsohb2wgsa/92xtl19Hd66G/L+TaAxDMw==",
+      "version": "3.45.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.45.0.tgz",
+      "integrity": "sha512-c2KZL9lP4DjkN3hk/an4pWn5b5ZefhRJnAc42n6LJ19kSnbeRbdQZE5dSeE2LBol1OwJD3X1BQvFTAsa8ReeDA==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -5314,9 +5315,9 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.44.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.44.0.tgz",
-      "integrity": "sha512-JepmAj2zfl6ogy34qfWtcE7nHKAJnKsQFRn++scjVS2bZFllwptzw61BZcZFYBPpUznLfAvh0LGhxKppk04ClA==",
+      "version": "3.45.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.45.0.tgz",
+      "integrity": "sha512-gRoVMBawZg0OnxaVv3zpqLLxaHmsubEGyTnqdpI/CEBvX4JadI1dMSHxagThprYRtSVbuQxvi6iUatdPxohHpA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5487,9 +5488,9 @@
       }
     },
     "node_modules/cypress": {
-      "version": "14.5.3",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-14.5.3.tgz",
-      "integrity": "sha512-syLwKjDeMg77FRRx68bytLdlqHXDT4yBVh0/PPkcgesChYDjUZbwxLqMXuryYKzAyJsPsQHUDW1YU74/IYEUIA==",
+      "version": "14.5.4",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-14.5.4.tgz",
+      "integrity": "sha512-0Dhm4qc9VatOcI1GiFGVt8osgpPdqJLHzRwcAB5MSD/CAAts3oybvPUPawHyvJZUd8osADqZe/xzMsZ8sDTjXw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -6017,9 +6018,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.194",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.194.tgz",
-      "integrity": "sha512-SdnWJwSUot04UR51I2oPD8kuP2VI37/CADR1OHsFOUzZIvfWJBO6q11k5P/uKNyTT3cdOsnyjkrZ+DDShqYqJA==",
+      "version": "1.5.199",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.199.tgz",
+      "integrity": "sha512-3gl0S7zQd88kCAZRO/DnxtBKuhMO4h0EaQIN3YgZfV6+pW+5+bf2AdQeHNESCoaQqo/gjGVYEf2YM4O5HJQqpQ==",
       "dev": true,
       "license": "ISC"
     },
@@ -6106,9 +6107,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.18.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.2.tgz",
-      "integrity": "sha512-6Jw4sE1maoRJo3q8MsSIn2onJFbLTOjY9hlx4DZXmOKvLRd1Ok2kXmAGXaafL2+ijsJZ1ClYbl/pmqr9+k4iUQ==",
+      "version": "5.18.3",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz",
+      "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6427,9 +6428,9 @@
       }
     },
     "node_modules/eslint-plugin-expect-type/node_modules/fs-extra": {
-      "version": "11.3.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
-      "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
+      "version": "11.3.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz",
+      "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8820,16 +8821,15 @@
       }
     },
     "node_modules/jake": {
-      "version": "10.9.2",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
-      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
+      "version": "10.9.4",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.4.tgz",
+      "integrity": "sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "async": "^3.2.3",
-        "chalk": "^4.0.2",
+        "async": "^3.2.6",
         "filelist": "^1.0.4",
-        "minimatch": "^3.1.2"
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "jake": "bin/cli.js"
@@ -9792,9 +9792,9 @@
       }
     },
     "node_modules/marked-terminal/node_modules/chalk": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
-      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.5.0.tgz",
+      "integrity": "sha512-1tm8DTaJhPBG3bIkVeZt1iZM9GfSX2lzOeDVZH9R9ffRHpmHvxZ/QhgQH/aDTkswQVt+YHdXAdS/In/30OjCbg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10628,9 +10628,9 @@
       "license": "MIT"
     },
     "node_modules/napi-postinstall": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.2.tgz",
-      "integrity": "sha512-tWVJxJHmBWLy69PvO96TZMZDrzmw5KeiZBz3RHmiM2XZ9grBJ2WgMAFVVg25nqp3ZjTFUs2Ftw1JhscL3Teliw==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz",
+      "integrity": "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -11219,9 +11219,9 @@
       "license": "MIT"
     },
     "node_modules/oxc-resolver": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-11.6.0.tgz",
-      "integrity": "sha512-Yj3Wy+zLljtFL8ByKOljaPhiXjJWVe875p5MHaT5VAHoEmzeg1BuswM8s/E7ErpJ3s0fsXJfUYJE4v1bl7N65g==",
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-11.6.1.tgz",
+      "integrity": "sha512-WQgmxevT4cM5MZ9ioQnEwJiHpPzbvntV5nInGAKo9NQZzegcOonHvcVcnkYqld7bTG35UFHEKeF7VwwsmA3cZg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -11232,25 +11232,25 @@
         "url": "https://github.com/sponsors/Boshen"
       },
       "optionalDependencies": {
-        "@oxc-resolver/binding-android-arm-eabi": "11.6.0",
-        "@oxc-resolver/binding-android-arm64": "11.6.0",
-        "@oxc-resolver/binding-darwin-arm64": "11.6.0",
-        "@oxc-resolver/binding-darwin-x64": "11.6.0",
-        "@oxc-resolver/binding-freebsd-x64": "11.6.0",
-        "@oxc-resolver/binding-linux-arm-gnueabihf": "11.6.0",
-        "@oxc-resolver/binding-linux-arm-musleabihf": "11.6.0",
-        "@oxc-resolver/binding-linux-arm64-gnu": "11.6.0",
-        "@oxc-resolver/binding-linux-arm64-musl": "11.6.0",
-        "@oxc-resolver/binding-linux-ppc64-gnu": "11.6.0",
-        "@oxc-resolver/binding-linux-riscv64-gnu": "11.6.0",
-        "@oxc-resolver/binding-linux-riscv64-musl": "11.6.0",
-        "@oxc-resolver/binding-linux-s390x-gnu": "11.6.0",
-        "@oxc-resolver/binding-linux-x64-gnu": "11.6.0",
-        "@oxc-resolver/binding-linux-x64-musl": "11.6.0",
-        "@oxc-resolver/binding-wasm32-wasi": "11.6.0",
-        "@oxc-resolver/binding-win32-arm64-msvc": "11.6.0",
-        "@oxc-resolver/binding-win32-ia32-msvc": "11.6.0",
-        "@oxc-resolver/binding-win32-x64-msvc": "11.6.0"
+        "@oxc-resolver/binding-android-arm-eabi": "11.6.1",
+        "@oxc-resolver/binding-android-arm64": "11.6.1",
+        "@oxc-resolver/binding-darwin-arm64": "11.6.1",
+        "@oxc-resolver/binding-darwin-x64": "11.6.1",
+        "@oxc-resolver/binding-freebsd-x64": "11.6.1",
+        "@oxc-resolver/binding-linux-arm-gnueabihf": "11.6.1",
+        "@oxc-resolver/binding-linux-arm-musleabihf": "11.6.1",
+        "@oxc-resolver/binding-linux-arm64-gnu": "11.6.1",
+        "@oxc-resolver/binding-linux-arm64-musl": "11.6.1",
+        "@oxc-resolver/binding-linux-ppc64-gnu": "11.6.1",
+        "@oxc-resolver/binding-linux-riscv64-gnu": "11.6.1",
+        "@oxc-resolver/binding-linux-riscv64-musl": "11.6.1",
+        "@oxc-resolver/binding-linux-s390x-gnu": "11.6.1",
+        "@oxc-resolver/binding-linux-x64-gnu": "11.6.1",
+        "@oxc-resolver/binding-linux-x64-musl": "11.6.1",
+        "@oxc-resolver/binding-wasm32-wasi": "11.6.1",
+        "@oxc-resolver/binding-win32-arm64-msvc": "11.6.1",
+        "@oxc-resolver/binding-win32-ia32-msvc": "11.6.1",
+        "@oxc-resolver/binding-win32-x64-msvc": "11.6.1"
       }
     },
     "node_modules/p-cancelable": {
@@ -13238,9 +13238,9 @@
       }
     },
     "node_modules/smol-toml": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.4.1.tgz",
-      "integrity": "sha512-CxdwHXyYTONGHThDbq5XdwbFsuY4wlClRGejfE2NtwUtiHYsP1QtNsHb/hnj31jKYSchztJsaA8pSQoVzkfCFg==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.4.2.tgz",
+      "integrity": "sha512-rInDH6lCNiEyn3+hH8KVGFdbjc099j47+OSgbMrfDYX1CmXLfdKd7qi6IfcWj2wFxvSVkuI46M+wPGYfEOEj6g==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -13331,9 +13331,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.21",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
-      "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
+      "version": "3.0.22",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz",
+      "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==",
       "dev": true,
       "license": "CC0-1.0"
     },
@@ -13993,29 +13993,29 @@
       }
     },
     "node_modules/tldts": {
-      "version": "7.0.10",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.10.tgz",
-      "integrity": "sha512-n6xyIpjWEn6Ikpkir7zVdxNoRO3ZrL+x65ztg/JYoIMoPkpRQ87W4RxbNiso+axhF2zTAzwR+NJJE3NJazLb6Q==",
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.11.tgz",
+      "integrity": "sha512-7k7JV/LZpGhFUu2t+YDaMZ1wdPPRNpaCYNQ0NQbSLY3Rbgy+XbCdkXyqRiS9TLXiYAsrv0yiA0OvnxmgRFCdNA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tldts-core": "^7.0.10"
+        "tldts-core": "^7.0.11"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "7.0.10",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.10.tgz",
-      "integrity": "sha512-z7PilFbUHwd+IlQ72D0aHDpqykUUpe9yvwa5k/rFvFLmpvNmWqHEIHoSYwE5sA5LZU4bTTIjhDZEjURHc8f2ag==",
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.11.tgz",
+      "integrity": "sha512-65eeOpBwWBabh0XqT+zB0vEllq/V3XcrF2fhgMXWWFfNw1yxEjeYg9Vv/B/UNozd0CTR/TohO1ubfn6O6mBW3w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/tmp": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
-      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
+      "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -14240,9 +14240,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.8.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
-      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+      "version": "5.9.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
+      "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -15131,9 +15131,9 @@
       "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
-      "integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
+      "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
       "dev": true,
       "license": "ISC",
       "bin": {
diff --git a/pkgs/by-name/es/eslint/package.nix b/pkgs/by-name/es/eslint/package.nix
index a6ecde85c446..e4066a87d610 100644
--- a/pkgs/by-name/es/eslint/package.nix
+++ b/pkgs/by-name/es/eslint/package.nix
@@ -7,13 +7,13 @@
 }:
 buildNpmPackage rec {
   pname = "eslint";
-  version = "9.32.0";
+  version = "9.33.0";
 
   src = fetchFromGitHub {
     owner = "eslint";
     repo = "eslint";
     tag = "v${version}";
-    hash = "sha256-ORqkolpd5B2mZ5lpePHU3RCpUHnl2p9ugMe2+A8sauA=";
+    hash = "sha256-yMB1LuLKDiFi/ufIcYAsgVQGFoUIKVezxoEBUCC99/0=";
   };
 
   # NOTE: Generating lock-file
@@ -25,7 +25,7 @@ buildNpmPackage rec {
     cp ${./package-lock.json} package-lock.json
   '';
 
-  npmDepsHash = "sha256-9IWGjPwvZFPlbClQ5XRx0clN0HD6eyggX+v5mtU0exQ=";
+  npmDepsHash = "sha256-CCiAn0abYLIHBGQZKwqfnK5OA0S+SK4ick3QRCCa3gc=";
   npmInstallFlags = [ "--omit=dev" ];
 
   dontNpmBuild = true;

From eb44572163e3155a095907fbdb11ad5499d5ff1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 18:04:46 +0000
Subject: [PATCH 1644/3724] autobrr: 1.64.0 -> 1.65.0

---
 pkgs/by-name/au/autobrr/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix
index 800b349488c8..2aac3fa194a6 100644
--- a/pkgs/by-name/au/autobrr/package.nix
+++ b/pkgs/by-name/au/autobrr/package.nix
@@ -13,12 +13,12 @@
 
 let
   pname = "autobrr";
-  version = "1.64.0";
+  version = "1.65.0";
   src = fetchFromGitHub {
     owner = "autobrr";
     repo = "autobrr";
     tag = "v${version}";
-    hash = "sha256-1P6YvwmVDbtSAK5yEpHJM6XjROGtPHj1gC2vremb8PM=";
+    hash = "sha256-i6F0CMMT/Qn+IUjvJdTkNl+pjqdLwGp+LPbQkYpehuY=";
   };
 
   autobrr-web = stdenvNoCC.mkDerivation {
@@ -41,7 +41,7 @@ let
         sourceRoot
         ;
       fetcherVersion = 1;
-      hash = "sha256-KiM/G9W1C+VnMx1uaQFE2dOPHJYU53B8i+7BqUTzo0w=";
+      hash = "sha256-HH2+FHlDhxNKhYoO/m2nXV87fUqnoC/6L2s6hvkqnyM=";
     };
 
     postBuild = ''
@@ -61,7 +61,7 @@ buildGoModule rec {
     src
     ;
 
-  vendorHash = "sha256-JX4VkvFgNeq2QhgxgYloPF5XOQUQxM/cKAWp1L+kT/c=";
+  vendorHash = "sha256-dgBE80kZOvZdFJ4XP+E+d6IygtI6c1tL//IwhiBPmfY=";
 
   preBuild = ''
     cp -r ${autobrr-web}/* web/dist

From bcff49197e12abcc40b562a99d8627a5749a6bbe Mon Sep 17 00:00:00 2001
From: xfnw <xfnw@riseup.net>
Date: Mon, 11 Aug 2025 12:43:32 -0400
Subject: [PATCH 1645/3724] catgirl: replace libressl with libretls

catgirl cannot find the system ca store using latest libressl:

catgirl: tls_connect: failed to open CA file 'etc/ssl/cert.pem': No such file or directory
---
 pkgs/by-name/ca/catgirl/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ca/catgirl/package.nix b/pkgs/by-name/ca/catgirl/package.nix
index b921bdde8829..fbe42bbe5c8c 100644
--- a/pkgs/by-name/ca/catgirl/package.nix
+++ b/pkgs/by-name/ca/catgirl/package.nix
@@ -2,7 +2,8 @@
   ctags,
   fetchurl,
   lib,
-  libressl,
+  libretls,
+  openssl,
   ncurses,
   pkg-config,
   stdenv,
@@ -19,12 +20,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   # catgirl's configure script uses pkg-config --variable exec_prefix openssl
   # to discover the install location of the openssl(1) utility. exec_prefix
-  # is the "out" output of libressl in our case (where the libraries are
+  # is the "out" output of openssl in our case (where the libraries are
   # installed), so we need to fix this up.
   postConfigure = ''
-    substituteInPlace config.mk --replace \
+    substituteInPlace config.mk --replace-fail \
       "$($PKG_CONFIG --variable exec_prefix openssl)" \
-      "${lib.getBin libressl}"
+      "${lib.getBin openssl}"
   '';
 
   nativeBuildInputs = [
@@ -32,7 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
   buildInputs = [
-    libressl
+    libretls
+    openssl
     ncurses
   ];
   strictDeps = true;

From 460a8d67f63e38df55ba5cbcaa214e18b1c3b071 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 19:13:52 +0000
Subject: [PATCH 1646/3724] lla: 0.3.11 -> 0.4.0

---
 pkgs/by-name/ll/lla/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix
index 3c81764e1ada..7543c7704f36 100644
--- a/pkgs/by-name/ll/lla/package.nix
+++ b/pkgs/by-name/ll/lla/package.nix
@@ -8,7 +8,7 @@
   nix-update-script,
 }:
 let
-  version = "0.3.11";
+  version = "0.4.0";
 in
 rustPlatform.buildRustPackage {
   pname = "lla";
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
     owner = "chaqchase";
     repo = "lla";
     tag = "v${version}";
-    hash = "sha256-HxHUpFTAeK3/pE+ozHGmMUj0Jt7iKrbZ1xnFj7828Ng=";
+    hash = "sha256-ArkmjnMRTwnIMy2UNM+GsdZJIvWa4RRZ3n//Gm3k9s4=";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
     installShellFiles
   ];
 
-  cargoHash = "sha256-YvxzuOUowr5tcKZaZwgpeskfMJcOKJyHci43CfQWhOY=";
+  cargoHash = "sha256-vw5cckGZjN6B7X7Pm/mZzWnSjRVYkgl58txv6Asqoug=";
 
   cargoBuildFlags = [ "--workspace" ];
 

From 4149ade1cdab5bc97601416acd19ae55962524e0 Mon Sep 17 00:00:00 2001
From: gustavo panizzo <gfa@zumbi.com.ar>
Date: Sun, 10 Aug 2025 16:39:15 +0200
Subject: [PATCH 1647/3724] hiera-eyaml: 3.0.0 -> 4.3.0

Change upstream's URL, otherwise the tooling does not detect new versions
---
 pkgs/by-name/hi/hiera-eyaml/Gemfile.lock | 16 +++++++----
 pkgs/by-name/hi/hiera-eyaml/gemset.nix   | 36 ++++++++++++++++++++----
 pkgs/by-name/hi/hiera-eyaml/package.nix  |  2 +-
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/hi/hiera-eyaml/Gemfile.lock b/pkgs/by-name/hi/hiera-eyaml/Gemfile.lock
index 918df753a382..e1e54e6fc61b 100644
--- a/pkgs/by-name/hi/hiera-eyaml/Gemfile.lock
+++ b/pkgs/by-name/hi/hiera-eyaml/Gemfile.lock
@@ -1,11 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    hiera-eyaml (3.0.0)
-      highline (~> 1.6.19)
-      optimist
-    highline (1.6.21)
-    optimist (3.0.0)
+    hiera-eyaml (4.3.0)
+      highline (>= 2.1, < 4)
+      optimist (~> 3.1)
+    highline (3.1.2)
+      reline
+    io-console (0.8.1)
+    optimist (3.2.1)
+    reline (0.6.2)
+      io-console (~> 0.5)
 
 PLATFORMS
   ruby
@@ -14,4 +18,4 @@ DEPENDENCIES
   hiera-eyaml
 
 BUNDLED WITH
-   2.1.4
+   2.6.9
diff --git a/pkgs/by-name/hi/hiera-eyaml/gemset.nix b/pkgs/by-name/hi/hiera-eyaml/gemset.nix
index 605b14da800d..add0a9866f1f 100644
--- a/pkgs/by-name/hi/hiera-eyaml/gemset.nix
+++ b/pkgs/by-name/hi/hiera-eyaml/gemset.nix
@@ -8,27 +8,51 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "049rxnwyivqgyjl0sjg7cb2q44ic0wsml288caspd1ps8v31gl18";
+      sha256 = "02mb113yjzwb6jkckybzsiq803c688r9xpv4w1nxbckhkpma5sqr";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "4.3.0";
   };
   highline = {
+    dependencies = [ "reline" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
+      sha256 = "0jmvyhjp2v3iq47la7w6psrxbprnbnmzz0hxxski3vzn356x7jv7";
       type = "gem";
     };
-    version = "1.6.21";
+    version = "3.1.2";
+  };
+  io-console = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1jszj95hazqqpnrjjzr326nn1j32xmsc9xvd97mbcrrgdc54858y";
+      type = "gem";
+    };
+    version = "0.8.1";
   };
   optimist = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
+      sha256 = "0kp3f8g7g7cbw5vfkmpdv71pphhpcxk3lpc892mj9apkd7ys1y4c";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "3.2.1";
+  };
+  reline = {
+    dependencies = [ "io-console" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0ii8l0q5zkang3lxqlsamzfz5ja7jc8ln905isfdawl802k2db8x";
+      type = "gem";
+    };
+    version = "0.6.2";
   };
 }
diff --git a/pkgs/by-name/hi/hiera-eyaml/package.nix b/pkgs/by-name/hi/hiera-eyaml/package.nix
index 8c19af264fa9..da727b962dd8 100644
--- a/pkgs/by-name/hi/hiera-eyaml/package.nix
+++ b/pkgs/by-name/hi/hiera-eyaml/package.nix
@@ -14,7 +14,7 @@ bundlerEnv {
 
   meta = with lib; {
     description = "Per-value asymmetric encryption of sensitive data for Hiera";
-    homepage = "https://github.com/TomPoulton/hiera-eyaml";
+    homepage = "https://github.com/voxpupuli/hiera-eyaml";
     license = licenses.mit;
     maintainers = with maintainers; [
       benley

From d5057d32c3a4bb79a79f235b1fa69999dea29d6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 20:11:51 +0000
Subject: [PATCH 1648/3724] etherpad-lite: 2.4.1 -> 2.4.2

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

diff --git a/pkgs/by-name/et/etherpad-lite/package.nix b/pkgs/by-name/et/etherpad-lite/package.nix
index ef45c1dfa441..56ec20758624 100644
--- a/pkgs/by-name/et/etherpad-lite/package.nix
+++ b/pkgs/by-name/et/etherpad-lite/package.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "etherpad-lite";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "ether";
     repo = "etherpad-lite";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-D5YukbPnf2qN9NimALHfhCJAgNPsTZxoVV4KuPmnSdc=";
+    hash = "sha256-BUgWx6SVpQ6qIJnb6EoiogRXuKo9uDRrl7bPuXTGQy8=";
   };
 
   patches = [

From 599ca4f3382eaf4a94ccb3fdad27d4c932f33a50 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Sat, 28 Jun 2025 23:39:47 +0200
Subject: [PATCH 1649/3724] python3Packages.shtab: Pick a fix for nargs="?"
 from upstream

---
 pkgs/development/python-modules/shtab/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix
index f89577c49a5a..8958e9f4e112 100644
--- a/pkgs/development/python-modules/shtab/default.nix
+++ b/pkgs/development/python-modules/shtab/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   pytest-timeout,
   pytestCheckHook,
   pytest-cov-stub,
@@ -25,6 +26,14 @@ buildPythonPackage rec {
     hash = "sha256-8bAwLSdJCzFw5Vf9CKBrH5zOoojeXds7aIRncl+sLBI=";
   };
 
+  patches = [
+    # Fix bash error on optional nargs="?" (iterative/shtab#184)
+    (fetchpatch2 {
+      url = "https://github.com/iterative/shtab/commit/a04ddf92896f7e206c9b19d48dcc532765364c59.patch?full_index=1";
+      hash = "sha256-H4v81xQLI9Y9R5OyDPJevCLh4gIUaiJKHVEU/eWdNbA=";
+    })
+  ];
+
   nativeBuildInputs = [
     setuptools
     setuptools-scm

From 0de1b3edc492fd0f28ea2e96043023526583df13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 20:46:59 +0000
Subject: [PATCH 1650/3724] druid: 33.0.0 -> 34.0.0

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

diff --git a/pkgs/by-name/dr/druid/package.nix b/pkgs/by-name/dr/druid/package.nix
index 1a0455f63838..825ef47959ec 100644
--- a/pkgs/by-name/dr/druid/package.nix
+++ b/pkgs/by-name/dr/druid/package.nix
@@ -20,11 +20,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "apache-druid";
-  version = "33.0.0";
+  version = "34.0.0";
 
   src = fetchurl {
     url = "mirror://apache/druid/${finalAttrs.version}/apache-druid-${finalAttrs.version}-bin.tar.gz";
-    hash = "sha256-XuXdvMInODSvihjdFzsqBLmpEct85RYnnbYFeIq9fXk=";
+    hash = "sha256-y5Sx8mubb+XEqPxlhPL67od1kVck2M+IkvQP/CyrZpA=";
   };
 
   dontBuild = true;

From b249b55a8444e7c90cb82a1ecbda71c2adc828fb Mon Sep 17 00:00:00 2001
From: PassiveLemon <lemonl3mn@protonmail.com>
Date: Mon, 11 Aug 2025 09:25:19 -0400
Subject: [PATCH 1651/3724] nixos/wivrn: update to support wivrn 25.8

---
 nixos/modules/services/video/wivrn.nix | 173 ++++++++++++-------------
 1 file changed, 83 insertions(+), 90 deletions(-)

diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix
index 0623a4ed2cca..9c5e9ebb6486 100644
--- a/nixos/modules/services/video/wivrn.nix
+++ b/nixos/modules/services/video/wivrn.nix
@@ -10,12 +10,18 @@ let
     mkEnableOption
     mkPackageOption
     mkOption
+    literalExpression
+    hasAttr
+    toList
+    length
+    head
+    tail
+    concatStringsSep
     optionalString
     optionalAttrs
     isDerivation
     recursiveUpdate
     getExe
-    literalExpression
     types
     maintainers
     ;
@@ -28,38 +34,27 @@ let
   # Since the json config attribute type "configFormat.type" doesn't allow specifying types for
   # individual attributes, we have to type check manually.
 
-  # The application option must be either a package or a list with package as the first element.
+  # The application option should be a list with package as the first element, though a single package is also valid.
+  # Note that this module depends on the package containing the meta.mainProgram attribute.
 
-  # Checking if an application is provided
-  applicationAttrExists = builtins.hasAttr "application" cfg.config.json;
-  applicationListNotEmpty = (
-    if builtins.isList cfg.config.json.application then
-      (builtins.length cfg.config.json.application) != 0
-    else
-      true
-  );
+  # Check if an application is provided
+  applicationAttrExists = hasAttr "application" cfg.config.json;
+  applicationList = toList cfg.config.json.application;
+  applicationListNotEmpty = length applicationList != 0;
   applicationCheck = applicationAttrExists && applicationListNotEmpty;
 
   # Manage packages and their exe paths
-  applicationAttr = (
-    if builtins.isList cfg.config.json.application then
-      builtins.head cfg.config.json.application
-    else
-      cfg.config.json.application
-  );
+  applicationAttr = head applicationList;
   applicationPackage = mkIf applicationCheck applicationAttr;
   applicationPackageExe = getExe applicationAttr;
-  serverPackageExe = getExe cfg.package;
-
-  # Managing strings
-  applicationStrings = builtins.tail cfg.config.json.application;
-  applicationConcat = (
-    if builtins.isList cfg.config.json.application then
-      builtins.concatStringsSep " " ([ applicationPackageExe ] ++ applicationStrings)
-    else
-      applicationPackageExe
+  serverPackageExe = (
+    if cfg.highPriority then "${config.security.wrapperDir}/wivrn-server" else getExe cfg.package
   );
 
+  # Manage strings
+  applicationStrings = tail applicationList;
+  applicationConcat = concatStringsSep " " ([ applicationPackageExe ] ++ applicationStrings);
+
   # Manage config file
   applicationUpdate = recursiveUpdate cfg.config.json (
     optionalAttrs applicationCheck { application = applicationConcat; }
@@ -68,7 +63,7 @@ let
   enabledConfig = optionalString cfg.config.enable "-f ${configFile}";
 
   # Manage server executables and flags
-  serverExec = builtins.concatStringsSep " " (
+  serverExec = concatStringsSep " " (
     [
       serverPackageExe
       "--systemd"
@@ -76,14 +71,6 @@ let
     ]
     ++ cfg.extraServerFlags
   );
-  applicationExec = builtins.concatStringsSep " " (
-    [
-      serverPackageExe
-      "--application"
-      enabledConfig
-    ]
-    ++ cfg.extraApplicationFlags
-  );
 in
 {
   options = {
@@ -95,7 +82,7 @@ in
       openFirewall = mkEnableOption "the default ports in the firewall for the WiVRn server";
 
       defaultRuntime = mkEnableOption ''
-        WiVRn Monado as the default OpenXR runtime on the system.
+        WiVRn as the default OpenXR runtime on the system.
         The config can be found at `/etc/xdg/openxr/1/active_runtime.json`.
 
         Note that applications can bypass this option by setting an active
@@ -104,34 +91,29 @@ in
 
       autoStart = mkEnableOption "starting the service by default";
 
+      highPriority = mkEnableOption "high priority capability for asynchronous reprojection";
+
       monadoEnvironment = mkOption {
         type = types.attrs;
         description = "Environment variables to be passed to the Monado environment.";
-        default = {
-          XRT_COMPOSITOR_LOG = "debug";
-          XRT_PRINT_OPTIONS = "on";
-          IPC_EXIT_ON_DISCONNECT = "off";
-        };
+        default = { };
       };
 
       extraServerFlags = mkOption {
         type = types.listOf types.str;
         description = "Flags to add to the wivrn service.";
         default = [ ];
-        example = ''[ "--no-publish-service" ]'';
+        example = literalExpression ''[ "--no-publish-service" ]'';
       };
 
-      extraApplicationFlags = mkOption {
-        type = types.listOf types.str;
-        description = "Flags to add to the wivrn-application service. This is NOT the WiVRn startup application.";
-        default = [ ];
-      };
+      steam = {
+        importOXRRuntimes = mkEnableOption ''
+          Sets `PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES` system-wide to allow Steam to automatically discover the WiVRn server.
 
-      extraPackages = mkOption {
-        type = types.listOf types.package;
-        description = "Packages to add to the wivrn-application service $PATH.";
-        default = [ ];
-        example = literalExpression "[ pkgs.bash pkgs.procps ]";
+          Note that you may have to logout for this variable to be visible
+        '';
+
+        package = mkPackageOption pkgs "steam" { };
       };
 
       config = {
@@ -139,12 +121,12 @@ in
         json = mkOption {
           type = configFormat.type;
           description = ''
-            Configuration for WiVRn. The attributes are serialized to JSON in config.json. If a config or certain attributes are not provided, the server will default to stock values.
+            Configuration for WiVRn. The attributes are serialized to JSON in config.json. The server will fallback to default values for any missing attributes.
 
-            Note that the application option must be either a package or a
-            list with package as the first element.
+            Like upstream, the application option is a list including the application and it's flags. In the case of the NixOS module however, the first element of the list must be a package. The module will assert otherwise.
+            The application can be set to a single package because it gets passed to lib.toList, though this will not allow for flags to be passed.
 
-            See <https://github.com/WiVRn/WiVRn/blob/master/docs/configuration.md>
+            See https://github.com/WiVRn/WiVRn/blob/master/docs/configuration.md
           '';
           default = { };
           example = literalExpression ''
@@ -177,51 +159,59 @@ in
       }
     ];
 
+    security.wrappers."wivrn-server" = mkIf cfg.highPriority {
+      setuid = false;
+      owner = "root";
+      group = "root";
+      capabilities = "cap_sys_nice+eip";
+      source = getExe cfg.package;
+    };
+
     systemd.user = {
       services = {
-        # The WiVRn server runs in a hardened service and starts the application in a different service
         wivrn = {
           description = "WiVRn XR runtime service";
-          environment = {
+          environment = recursiveUpdate {
             # Default options
             # https://gitlab.freedesktop.org/monado/monado/-/blob/598080453545c6bf313829e5780ffb7dde9b79dc/src/xrt/targets/service/monado.in.service#L12
             XRT_COMPOSITOR_LOG = "debug";
             XRT_PRINT_OPTIONS = "on";
             IPC_EXIT_ON_DISCONNECT = "off";
-          }
-          // cfg.monadoEnvironment;
-          serviceConfig = {
-            ExecStart = serverExec;
-            # Hardening options
-            CapabilityBoundingSet = [ "CAP_SYS_NICE" ];
-            AmbientCapabilities = [ "CAP_SYS_NICE" ];
-            LockPersonality = true;
-            NoNewPrivileges = true;
-            PrivateTmp = true;
-            ProtectClock = true;
-            ProtectControlGroups = true;
-            ProtectKernelLogs = true;
-            ProtectKernelModules = true;
-            ProtectKernelTunables = true;
-            ProtectProc = "invisible";
-            ProtectSystem = "strict";
-            RemoveIPC = true;
-            RestrictNamespaces = true;
-            RestrictSUIDSGID = true;
-          };
+            PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES = mkIf cfg.steam.importOXRRuntimes "1";
+          } cfg.monadoEnvironment;
+          serviceConfig = (
+            if cfg.highPriority then
+              {
+                ExecStart = serverExec;
+              }
+            # Hardening options break high-priority
+            else
+              {
+                ExecStart = serverExec;
+                # Hardening options
+                CapabilityBoundingSet = [ "CAP_SYS_NICE" ];
+                AmbientCapabilities = [ "CAP_SYS_NICE" ];
+                LockPersonality = true;
+                NoNewPrivileges = true;
+                PrivateTmp = true;
+                ProtectClock = true;
+                ProtectControlGroups = true;
+                ProtectKernelLogs = true;
+                ProtectKernelModules = true;
+                ProtectKernelTunables = true;
+                ProtectProc = "invisible";
+                ProtectSystem = "strict";
+                RemoveIPC = true;
+                RestrictNamespaces = true;
+                RestrictSUIDSGID = true;
+              }
+          );
+          path = [ cfg.steam.package ];
           wantedBy = mkIf cfg.autoStart [ "default.target" ];
-          restartTriggers = [ cfg.package ];
-        };
-        wivrn-application = mkIf applicationCheck {
-          description = "WiVRn application service";
-          requires = [ "wivrn.service" ];
-          serviceConfig = {
-            ExecStart = applicationExec;
-            Restart = "on-failure";
-            RestartSec = 0;
-            PrivateTmp = true;
-          };
-          path = [ applicationPackage ] ++ cfg.extraPackages;
+          restartTriggers = [
+            cfg.package
+            cfg.steam.package
+          ];
         };
       };
     };
@@ -247,6 +237,9 @@ in
         cfg.package
         applicationPackage
       ];
+      sessionVariables = mkIf cfg.steam.importOXRRuntimes {
+        PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES = "1";
+      };
       pathsToLink = [ "/share/openxr" ];
       etc."xdg/openxr/1/active_runtime.json" = mkIf cfg.defaultRuntime {
         source = "${cfg.package}/share/openxr/1/openxr_wivrn.json";

From b3524407effb8045b82a25997359fafbb938d405 Mon Sep 17 00:00:00 2001
From: PassiveLemon <lemonl3mn@protonmail.com>
Date: Mon, 11 Aug 2025 09:24:15 -0400
Subject: [PATCH 1652/3724] wivrn: 25.6.1 -> 25.8

---
 pkgs/by-name/wi/wivrn/package.nix | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index ecb6c93686e0..b029233162a3 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -4,6 +4,7 @@
   stdenv,
   fetchFromGitHub,
   fetchFromGitLab,
+  fetchpatch,
   applyPatches,
   autoAddDriverRunpath,
   avahi,
@@ -21,6 +22,7 @@
   glslang,
   harfbuzz,
   kdePackages,
+  libarchive,
   libdrm,
   libGL,
   libnotify,
@@ -51,13 +53,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wivrn";
-  version = "25.6.1";
+  version = "25.8";
 
   src = fetchFromGitHub {
     owner = "wivrn";
     repo = "wivrn";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-DqgayLXI+RPIb8tLzJoHi+Z12px4pdzU50C0UBSa2u4=";
+    hash = "sha256-x9nZyLk0A9eiZ9V700lc4To1cVJ875ZYR0GeqQ7qNpg=";
   };
 
   monado = applyPatches {
@@ -65,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
       domain = "gitlab.freedesktop.org";
       owner = "monado";
       repo = "monado";
-      rev = "bb9bcee2a3be75592de819d9e3fb2c8ed27bb7dc";
-      hash = "sha256-+PiWxnvMXaSFc+67r17GBRXo7kbjikSElawNMJCydrk=";
+      rev = "5c137fe28b232fe460f9b03defa7749adc32ee48";
+      hash = "sha256-4P/ejRAitrYn8hXZPaDOcx27utfm+aVLjtqL6JxZYAg=";
     };
 
     postPatch = ''
@@ -88,6 +90,15 @@ stdenv.mkDerivation (finalAttrs: {
     fi
   '';
 
+  patches = [
+    # Needed to allow WiVRn in-stream GUI to launch Steam games
+    (fetchpatch {
+      name = "wivrn-allow-launching-steam-games.patch";
+      url = "https://github.com/WiVRn/WiVRn/commit/30ceab5b3082cbc545acf8bc8ca4a24279e6f738.diff";
+      hash = "sha256-BD6MhCET7hdjog8rkl7G2l7/zGfVATpNAhNie0efOlA=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     git
@@ -117,10 +128,12 @@ stdenv.mkDerivation (finalAttrs: {
     kdePackages.kirigami
     kdePackages.qcoro
     kdePackages.qqc2-desktop-style
+    libarchive
     libdrm
     libGL
     libnotify
     libpulseaudio
+    librsvg
     libva
     libX11
     libXrandr

From a77f01ab4db180289192125b6f85e8933f0c7b46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 Aug 2025 23:25:25 +0000
Subject: [PATCH 1653/3724] fanficfare: 4.47.0 -> 4.48.0

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

diff --git a/pkgs/by-name/fa/fanficfare/package.nix b/pkgs/by-name/fa/fanficfare/package.nix
index 52bfb50c852e..c87ea7454d37 100644
--- a/pkgs/by-name/fa/fanficfare/package.nix
+++ b/pkgs/by-name/fa/fanficfare/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "fanficfare";
-  version = "4.47.0";
+  version = "4.48.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Q2k2wNopBAiPikAU0/yY21OnQEHdclnjuoHqbbPAoL0=";
+    hash = "sha256-UBjiq2LRO2Y3MqKwbCMqVnrXXHtc4QeC15yce7DbgQw=";
   };
 
   nativeBuildInputs = with python3Packages; [

From feb9f8cd5b44b0fa0a0e24e4c8ef10e012feaeae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 00:41:42 +0000
Subject: [PATCH 1654/3724] bfs: 4.0.8 -> 4.1

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

diff --git a/pkgs/by-name/bf/bfs/package.nix b/pkgs/by-name/bf/bfs/package.nix
index cc7b30030b0c..b26f0de9c290 100644
--- a/pkgs/by-name/bf/bfs/package.nix
+++ b/pkgs/by-name/bf/bfs/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bfs";
-  version = "4.0.8";
+  version = "4.1";
 
   src = fetchFromGitHub {
     repo = "bfs";
     owner = "tavianator";
     rev = version;
-    hash = "sha256-yZoyDa8um3UA8K9Ty17xaGUvQmJA/agZPBsNo+/6weI=";
+    hash = "sha256-+hGxdsk9MU5MVvvx3C2cqomboNxD0UZ5y7t84fAwfqs=";
   };
 
   buildInputs = [

From b0bac1c75487d2f56202ea5371782efa1473d545 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 03:56:18 +0000
Subject: [PATCH 1655/3724] libsolv: 0.7.34 -> 0.7.35

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

diff --git a/pkgs/by-name/li/libsolv/package.nix b/pkgs/by-name/li/libsolv/package.nix
index a2347611dad4..d8ef8279a364 100644
--- a/pkgs/by-name/li/libsolv/package.nix
+++ b/pkgs/by-name/li/libsolv/package.nix
@@ -18,14 +18,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.34";
+  version = "0.7.35";
   pname = "libsolv";
 
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "libsolv";
     rev = version;
-    hash = "sha256-B/VFrtg/OnAyfgNTlUM9u4YCqsqLD/N3imxWVxZUe6A=";
+    hash = "sha256-DHECjda7s12hSysbaXK2+wM/nXpAOpTn+eSf9XGC3z0=";
   };
 
   cmakeFlags = [

From e00b15d9ef96289d609c63488c942aaffca93e26 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 08:18:58 +0000
Subject: [PATCH 1656/3724] sentencepiece: 0.2.0 -> 0.2.1

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

diff --git a/pkgs/by-name/se/sentencepiece/package.nix b/pkgs/by-name/se/sentencepiece/package.nix
index ec3af48b8b83..5963ae9582a9 100644
--- a/pkgs/by-name/se/sentencepiece/package.nix
+++ b/pkgs/by-name/se/sentencepiece/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sentencepiece";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "sentencepiece";
     tag = "v${version}";
-    sha256 = "sha256-tMt6UBDqpdjAhxAJlVOFFlE3RC36/t8K0gBAzbesnsg=";
+    sha256 = "sha256-q0JgMxoD9PLqr6zKmOdrK2A+9RXVDub6xy7NOapS+vs=";
   };
 
   nativeBuildInputs = [ cmake ];

From 4ad84b4999d1fa89a8373ed1ab51e8d8d8a7d0c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 11:06:53 +0000
Subject: [PATCH 1657/3724] narsil: 1.4.0-63-g4f6423d2f -> 1.4.0-76-g0d181469f

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

diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix
index 714a1a429acd..166b86974b9e 100644
--- a/pkgs/by-name/na/narsil/package.nix
+++ b/pkgs/by-name/na/narsil/package.nix
@@ -13,13 +13,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "narsil";
-  version = "1.4.0-63-g4f6423d2f";
+  version = "1.4.0-76-g0d181469f";
 
   src = fetchFromGitHub {
     owner = "NickMcConnell";
     repo = "NarSil";
     tag = version;
-    hash = "sha256-IxnXlWzPxBBLnxSFLRHojoEHr3dq2eO8RNmr/Oposew=";
+    hash = "sha256-3KvVH/fWBSmjhhmIOOuCZL3jMAu0ckoj/miA0zZUkAA=";
   };
 
   passthru.updateScript = nix-update-script { };

From 152c241d445a60ec57cd148ec09fdab4ac0c6c89 Mon Sep 17 00:00:00 2001
From: devhell <devhell@mailfresser.de>
Date: Tue, 12 Aug 2025 13:38:52 +0200
Subject: [PATCH 1658/3724] mediainfo{-gui}: 25.{04,03} -> 25.07

Let's get these back on track and in line with `libmediainfo`.
---
 pkgs/by-name/me/mediainfo-gui/package.nix | 4 ++--
 pkgs/by-name/me/mediainfo/package.nix     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix
index 4564d933b5c3..860d44195592 100644
--- a/pkgs/by-name/me/mediainfo-gui/package.nix
+++ b/pkgs/by-name/me/mediainfo-gui/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mediainfo-gui";
-  version = "25.03";
+  version = "25.07";
 
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${finalAttrs.version}/mediainfo_${finalAttrs.version}.tar.xz";
-    hash = "sha256-wpO7MPIx3FMQuYDv2E/n0za4MQto6DJlzxZtf3/Dhsk=";
+    hash = "sha256-UI6sHKCX9Byz/DliWs6wZS/KsArNDy68vR3GgAk26X0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/me/mediainfo/package.nix b/pkgs/by-name/me/mediainfo/package.nix
index c9219e047cf9..3276846bb06b 100644
--- a/pkgs/by-name/me/mediainfo/package.nix
+++ b/pkgs/by-name/me/mediainfo/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mediainfo";
-  version = "25.04";
+  version = "25.07";
 
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    hash = "sha256-SyVT/pEEMy07rKX+Yba4evTUkxCMW4Y4Ac2wpIJqM64=";
+    hash = "sha256-UI6sHKCX9Byz/DliWs6wZS/KsArNDy68vR3GgAk26X0=";
   };
 
   nativeBuildInputs = [

From af11cb39826d288518e8261aaab465e78a70ac23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 12:45:49 +0000
Subject: [PATCH 1659/3724] ocamlPackages.smtml: 0.8.0 -> 0.9.0

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

diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix
index dd3999f3f960..28fa178f2a30 100644
--- a/pkgs/development/ocaml-modules/smtml/default.nix
+++ b/pkgs/development/ocaml-modules/smtml/default.nix
@@ -25,13 +25,13 @@
 
 buildDunePackage rec {
   pname = "smtml";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "formalsec";
     repo = "smtml";
     tag = "v${version}";
-    hash = "sha256-gmYyVUkwXBqGKGhp6Pqdf2PJafUJ1hF96WxOLq1h2f8=";
+    hash = "sha256-hgpxOQZ7mhELcT71j1EZJNstnTSntEjKDEokUaj5kAs=";
   };
 
   nativeBuildInputs = [

From 74887adc4150b3394d50d6bb1197c329c5958073 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Tue, 12 Aug 2025 21:30:51 +0800
Subject: [PATCH 1660/3724] fdroidserver: 2.4.0 -> 2.4.2

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

diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix
index 43f628f4ee95..7d1642fa60b8 100644
--- a/pkgs/by-name/fd/fdroidserver/package.nix
+++ b/pkgs/by-name/fd/fdroidserver/package.nix
@@ -10,7 +10,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "fdroidserver";
-  version = "2.4.0";
+  version = "2.4.2";
 
   pyproject = true;
 
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
     owner = "fdroid";
     repo = "fdroidserver";
     tag = version;
-    hash = "sha256-PQZz3dyX6vCS0axHfSINMMX5ETdVs44K9XjR87gtd3s=";
+    hash = "sha256-26D+nnytLOsEAWNj2XvKM2O00epGtvJaJhUw+yoBl9Y=";
   };
 
   pythonRelaxDeps = [

From dd435697b31467d6b0f4112ed519aafc140bb6de Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 11 Aug 2025 20:27:02 +0200
Subject: [PATCH 1661/3724] lib.customisation: remove unsafeGetAttrPos
 workaround

This could have been done a while ago, minver has been > 2.3.4 for quite
some time already.
---
 lib/customisation.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 7c24dc242d06..802c9ef9a4b8 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -285,18 +285,9 @@ rec {
         arg:
         let
           loc = builtins.unsafeGetAttrPos arg fargs;
-          # loc' can be removed once lib/minver.nix is >2.3.4, since that includes
-          # https://github.com/NixOS/nix/pull/3468 which makes loc be non-null
-          loc' =
-            if loc != null then
-              loc.file + ":" + toString loc.line
-            else if !isFunction fn then
-              toString (lib.filesystem.resolveDefaultNix fn)
-            else
-              "<unknown location>";
         in
         "Function called without required argument \"${arg}\" at "
-        + "${loc'}${prettySuggestions (getSuggestions arg)}";
+        + "${loc.file}:${loc.line}${prettySuggestions (getSuggestions arg)}";
 
       # Only show the error for the first missing argument
       error = errorForArg (head (attrNames missingArgs));

From 9b9bef020a997ef5b7d8c03919a0647d186dbc62 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 11 Aug 2025 20:27:51 +0200
Subject: [PATCH 1662/3724] lib.fileset: remove conditionals for Nix 2.4

minver is now at 2.18, which means that `fetchGit` support shallow
clones and submodules for sure.
---
 lib/fileset/default.nix  | 13 ++----
 lib/fileset/internal.nix | 18 +--------
 lib/fileset/tests.sh     | 86 ++++++++++++++++------------------------
 3 files changed, 39 insertions(+), 78 deletions(-)

diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix
index 17393a81860f..3c51c6d4dab4 100644
--- a/lib/fileset/default.nix
+++ b/lib/fileset/default.nix
@@ -112,7 +112,6 @@ let
     _intersection
     _difference
     _fromFetchGit
-    _fetchGitSubmodulesMinver
     _emptyWithoutBase
     ;
 
@@ -1000,16 +999,10 @@ in
     path:
     if !isBool recurseSubmodules then
       throw "lib.fileset.gitTrackedWith: Expected the attribute `recurseSubmodules` of the first argument to be a boolean, but it's a ${typeOf recurseSubmodules} instead."
-    else if recurseSubmodules && versionOlder nixVersion _fetchGitSubmodulesMinver then
-      throw "lib.fileset.gitTrackedWith: Setting the attribute `recurseSubmodules` to `true` is only supported for Nix version ${_fetchGitSubmodulesMinver} and after, but Nix version ${nixVersion} is used."
     else
       _fromFetchGit "gitTrackedWith" "second argument" path
         # This is the only `fetchGit` parameter that makes sense in this context.
-        # We can't just pass `submodules = recurseSubmodules` here because
-        # this would fail for Nix versions that don't support `submodules`.
-        (
-          lib.optionalAttrs recurseSubmodules {
-            submodules = true;
-          }
-        );
+        {
+          submodules = recurseSubmodules;
+        };
 }
diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix
index 4674a321b3ae..59b8408ae8d6 100644
--- a/lib/fileset/internal.nix
+++ b/lib/fileset/internal.nix
@@ -899,14 +899,6 @@ rec {
         ${baseNameOf root} = fromFile (baseNameOf root) rootType;
       };
 
-  # Support for `builtins.fetchGit` with `submodules = true` was introduced in 2.4
-  # https://github.com/NixOS/nix/commit/55cefd41d63368d4286568e2956afd535cb44018
-  _fetchGitSubmodulesMinver = "2.4";
-
-  # Support for `builtins.fetchGit` with `shallow = true` was introduced in 2.4
-  # https://github.com/NixOS/nix/commit/d1165d8791f559352ff6aa7348e1293b2873db1c
-  _fetchGitShallowMinver = "2.4";
-
   # Mirrors the contents of a Nix store path relative to a local path as a file set.
   # Some notes:
   # - The store path is read at evaluation time.
@@ -961,16 +953,8 @@ rec {
           fetchResult = fetchGit (
             {
               url = path;
+              shallow = true;
             }
-            # In older Nix versions, repositories were always assumed to be deep clones, which made `fetchGit` fail for shallow clones
-            # For newer versions this was fixed, but the `shallow` flag is required.
-            # The only behavioral difference is that for shallow clones, `fetchGit` doesn't return a `revCount`,
-            # which we don't need here, so it's fine to always pass it.
-
-            # Unfortunately this means older Nix versions get a poor error message for shallow repositories, and there's no good way to improve that.
-            # Checking for `.git/shallow` doesn't seem worth it, especially since that's more of an implementation detail,
-            # and would also require more code to handle worktrees where `.git` is a file.
-            // optionalAttrs (versionAtLeast nixVersion _fetchGitShallowMinver) { shallow = true; }
             // extraFetchGitAttrs
           );
         in
diff --git a/lib/fileset/tests.sh b/lib/fileset/tests.sh
index 405fa04d8e06..043c1156a43f 100755
--- a/lib/fileset/tests.sh
+++ b/lib/fileset/tests.sh
@@ -1336,14 +1336,6 @@ expectFailure 'gitTrackedWith {} ./.' 'lib.fileset.gitTrackedWith: Expected the
 # recurseSubmodules has to be a boolean
 expectFailure 'gitTrackedWith { recurseSubmodules = null; } ./.' 'lib.fileset.gitTrackedWith: Expected the attribute `recurseSubmodules` of the first argument to be a boolean, but it'\''s a null instead.'
 
-# recurseSubmodules = true is not supported on all Nix versions
-if [[ "$(nix-instantiate --eval --expr "$prefixExpression (versionAtLeast builtins.nixVersion _fetchGitSubmodulesMinver)")" == true ]]; then
-    fetchGitSupportsSubmodules=1
-else
-    fetchGitSupportsSubmodules=
-    expectFailure 'gitTrackedWith { recurseSubmodules = true; } ./.' 'lib.fileset.gitTrackedWith: Setting the attribute `recurseSubmodules` to `true` is only supported for Nix version 2.4 and after, but Nix version [0-9.]+ is used.'
-fi
-
 # Checks that `gitTrackedWith` contains the same files as `git ls-files`
 # for the current working directory.
 # If --recurse-submodules is passed, the flag is passed through to `git ls-files`
@@ -1393,9 +1385,7 @@ checkGitTrackedWith() {
 # Allows testing both variants together
 checkGitTracked() {
     checkGitTrackedWith
-    if [[ -n "$fetchGitSupportsSubmodules" ]]; then
-        checkGitTrackedWith --recurse-submodules
-    fi
+    checkGitTrackedWith --recurse-submodules
 }
 
 createGitRepo() {
@@ -1430,51 +1420,45 @@ expectFailure 'import "${./.}" { fs = lib.fileset; }' 'lib.fileset.gitTracked: T
 [[:blank:]]*If you can'\''t avoid copying the repo to the store, see https://github.com/NixOS/nix/issues/9292.'
 
 ## Even with submodules
-if [[ -n "$fetchGitSupportsSubmodules" ]]; then
-    ## Both the main repo with the submodule
-    echo '{ fs }: fs.toSource { root = ./.; fileset = fs.gitTrackedWith { recurseSubmodules = true; } ./.; }' > default.nix
-    createGitRepo sub
-    git submodule add ./sub sub >/dev/null
-    ## But also the submodule itself
-    echo '{ fs }: fs.toSource { root = ./.; fileset = fs.gitTracked ./.; }' > sub/default.nix
-    git -C sub add .
+## Both the main repo with the submodule
+echo '{ fs }: fs.toSource { root = ./.; fileset = fs.gitTrackedWith { recurseSubmodules = true; } ./.; }' > default.nix
+createGitRepo sub
+git submodule add ./sub sub >/dev/null
+## But also the submodule itself
+echo '{ fs }: fs.toSource { root = ./.; fileset = fs.gitTracked ./.; }' > sub/default.nix
+git -C sub add .
 
-    ## We can evaluate it locally just fine, `fetchGit` is used underneath to filter git-tracked files
-    expectEqual '(import ./. { fs = lib.fileset; }).outPath' '(builtins.fetchGit { url = ./.; submodules = true; }).outPath'
-    expectEqual '(import ./sub { fs = lib.fileset; }).outPath' '(builtins.fetchGit ./sub).outPath'
+## We can evaluate it locally just fine, `fetchGit` is used underneath to filter git-tracked files
+expectEqual '(import ./. { fs = lib.fileset; }).outPath' '(builtins.fetchGit { url = ./.; submodules = true; }).outPath'
+expectEqual '(import ./sub { fs = lib.fileset; }).outPath' '(builtins.fetchGit ./sub).outPath'
 
-    ## We can also evaluate when importing from fetched store paths
-    storePathWithSub=$(expectStorePath 'builtins.fetchGit { url = ./.; submodules = true; }')
-    expectEqual '(import '"$storePathWithSub"' { fs = lib.fileset; }).outPath' \""$storePathWithSub"\"
-    storePathSub=$(expectStorePath 'builtins.fetchGit ./sub')
-    expectEqual '(import '"$storePathSub"' { fs = lib.fileset; }).outPath' \""$storePathSub"\"
+## We can also evaluate when importing from fetched store paths
+storePathWithSub=$(expectStorePath 'builtins.fetchGit { url = ./.; submodules = true; }')
+expectEqual '(import '"$storePathWithSub"' { fs = lib.fileset; }).outPath' \""$storePathWithSub"\"
+storePathSub=$(expectStorePath 'builtins.fetchGit ./sub')
+expectEqual '(import '"$storePathSub"' { fs = lib.fileset; }).outPath' \""$storePathSub"\"
 
-    ## But it fails if the path is imported with a fetcher that doesn't remove .git (like just using "${./.}")
-    expectFailure 'import "${./.}" { fs = lib.fileset; }' 'lib.fileset.gitTrackedWith: The second argument \(.*\) is a store path within a working tree of a Git repository.
-    [[:blank:]]*This indicates that a source directory was imported into the store using a method such as `import "\$\{./.\}"` or `path:.`.
-    [[:blank:]]*This function currently does not support such a use case, since it currently relies on `builtins.fetchGit`.
-    [[:blank:]]*You could make this work by using a fetcher such as `fetchGit` instead of copying the whole repository.
-    [[:blank:]]*If you can'\''t avoid copying the repo to the store, see https://github.com/NixOS/nix/issues/9292.'
-    expectFailure 'import "${./.}/sub" { fs = lib.fileset; }' 'lib.fileset.gitTracked: The argument \(.*/sub\) is a store path within a working tree of a Git repository.
-    [[:blank:]]*This indicates that a source directory was imported into the store using a method such as `import "\$\{./.\}"` or `path:.`.
-    [[:blank:]]*This function currently does not support such a use case, since it currently relies on `builtins.fetchGit`.
-    [[:blank:]]*You could make this work by using a fetcher such as `fetchGit` instead of copying the whole repository.
-    [[:blank:]]*If you can'\''t avoid copying the repo to the store, see https://github.com/NixOS/nix/issues/9292.'
-fi
+## But it fails if the path is imported with a fetcher that doesn't remove .git (like just using "${./.}")
+expectFailure 'import "${./.}" { fs = lib.fileset; }' 'lib.fileset.gitTrackedWith: The second argument \(.*\) is a store path within a working tree of a Git repository.
+[[:blank:]]*This indicates that a source directory was imported into the store using a method such as `import "\$\{./.\}"` or `path:.`.
+[[:blank:]]*This function currently does not support such a use case, since it currently relies on `builtins.fetchGit`.
+[[:blank:]]*You could make this work by using a fetcher such as `fetchGit` instead of copying the whole repository.
+[[:blank:]]*If you can'\''t avoid copying the repo to the store, see https://github.com/NixOS/nix/issues/9292.'
+expectFailure 'import "${./.}/sub" { fs = lib.fileset; }' 'lib.fileset.gitTracked: The argument \(.*/sub\) is a store path within a working tree of a Git repository.
+[[:blank:]]*This indicates that a source directory was imported into the store using a method such as `import "\$\{./.\}"` or `path:.`.
+[[:blank:]]*This function currently does not support such a use case, since it currently relies on `builtins.fetchGit`.
+[[:blank:]]*You could make this work by using a fetcher such as `fetchGit` instead of copying the whole repository.
+[[:blank:]]*If you can'\''t avoid copying the repo to the store, see https://github.com/NixOS/nix/issues/9292.'
 rm -rf -- *
 
-# shallow = true is not supported on all Nix versions
-# and older versions don't support shallow clones at all
-if [[ "$(nix-instantiate --eval --expr "$prefixExpression (versionAtLeast builtins.nixVersion _fetchGitShallowMinver)")" == true ]]; then
-    createGitRepo full
-    # Extra commit such that there's a commit that won't be in the shallow clone
-    git -C full commit --allow-empty -q -m extra
-    git clone -q --depth 1 "file://${PWD}/full" shallow
-    cd shallow
-    checkGitTracked
-    cd ..
-    rm -rf -- *
-fi
+createGitRepo full
+# Extra commit such that there's a commit that won't be in the shallow clone
+git -C full commit --allow-empty -q -m extra
+git clone -q --depth 1 "file://${PWD}/full" shallow
+cd shallow
+checkGitTracked
+cd ..
+rm -rf -- *
 
 # Go through all stages of Git files
 # See https://www.git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository

From 413ddf02606b984163a0fa7328a514bffef1bd61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 14:02:20 +0000
Subject: [PATCH 1663/3724] ijhttp: 243.24978.46 -> 252.23892.409

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

diff --git a/pkgs/by-name/ij/ijhttp/package.nix b/pkgs/by-name/ij/ijhttp/package.nix
index ba3fe2e90ce1..6462a57078fe 100644
--- a/pkgs/by-name/ij/ijhttp/package.nix
+++ b/pkgs/by-name/ij/ijhttp/package.nix
@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "ijhttp";
-  version = "243.24978.46";
+  version = "252.23892.409";
 
   src = fetchurl {
     url = "https://download.jetbrains.com/resources/intellij/http-client/${finalAttrs.version}/intellij-http-client.zip";
-    hash = "sha256-L9u/Y0pD/OD2I2WX6mgV5riP8y7Ik+6zVcM/WZJs7rE=";
+    hash = "sha256-yEEDG9NRYYj8K7+32FB3bJ+qPrVUL0/MMfPoBlol418=";
   };
 
   nativeBuildInputs = [

From 7586995f8f331eb3fa99008373c4fbac22190756 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 14:14:11 +0000
Subject: [PATCH 1664/3724] krill: 0.14.6 -> 0.15.0

---
 pkgs/by-name/kr/krill/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/kr/krill/package.nix b/pkgs/by-name/kr/krill/package.nix
index 3f2713137e59..a743be1f5f6a 100644
--- a/pkgs/by-name/kr/krill/package.nix
+++ b/pkgs/by-name/kr/krill/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "krill";
-  version = "0.14.6";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = "krill";
     rev = "v${version}";
-    hash = "sha256-U7uanUE/xdmXqtpvnG6b+oDKamNZkCH04OCy3Y5UIhQ=";
+    hash = "sha256-aYZZuEh9RpxGcZllc7usFrLXV8MD1SGrtnbZI7i1h8I=";
   };
 
-  cargoHash = "sha256-PR8HoHroHp5nBbRwR8TZ5NeBH4eDXGV46HkDLeydmAk=";
+  cargoHash = "sha256-WJqJkcAUJhPy0jbGit/nXmJPCU7dK8I8w3JCmTdzhhA=";
 
   buildInputs = [ openssl ];
   nativeBuildInputs = [ pkg-config ];

From 377d21bbd024a1beca2376d1f62386de03436f38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 14:15:04 +0000
Subject: [PATCH 1665/3724] gtk4-layer-shell: 1.1.1 -> 1.2.0

---
 pkgs/by-name/gt/gtk4-layer-shell/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gt/gtk4-layer-shell/package.nix b/pkgs/by-name/gt/gtk4-layer-shell/package.nix
index 1c7099c0caa8..d1fab364a287 100644
--- a/pkgs/by-name/gt/gtk4-layer-shell/package.nix
+++ b/pkgs/by-name/gt/gtk4-layer-shell/package.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk4-layer-shell";
-  version = "1.1.1";
+  version = "1.2.0";
 
   outputs = [
     "out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "wmww";
     repo = "gtk4-layer-shell";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-5TBQKy58o/BdAwfaY2Ss/xcn5kkVFedgiNKfGj7x5gM=";
+    hash = "sha256-1FRP75KDr0wvlByKwEK7d2wbEH52wnC0e7LIZ/GHsdQ=";
   };
 
   strictDeps = true;

From 1522cd7cacac0fcc00aadea07a82a7ab57fb9222 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 23 Jul 2025 19:53:12 -0400
Subject: [PATCH 1666/3724] nixos/tests/nyxt: init

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/nyxt.nix                          | 35 +++++++++++++++++++
 .../networking/browsers/nyxt/default.nix      |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 nixos/tests/nyxt.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9bf8c982c8a7..c2fc33f19301 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1077,6 +1077,7 @@ in
   ntpd-rs = runTest ./ntpd-rs.nix;
   nvidia-container-toolkit = runTest ./nvidia-container-toolkit.nix;
   nvmetcfg = runTest ./nvmetcfg.nix;
+  nyxt = runTest ./nyxt.nix;
   nzbget = runTest ./nzbget.nix;
   nzbhydra2 = runTest ./nzbhydra2.nix;
   ocis = runTest ./ocis.nix;
diff --git a/nixos/tests/nyxt.nix b/nixos/tests/nyxt.nix
new file mode 100644
index 000000000000..b0e89a491774
--- /dev/null
+++ b/nixos/tests/nyxt.nix
@@ -0,0 +1,35 @@
+{
+  pkgs,
+  lib,
+  ...
+}:
+{
+  name = "nyxt";
+
+  meta.maintainers = with lib.maintainers; [ ethancedwards8 ];
+
+  nodes.machine = {
+    imports = [
+      # sets up x11 with autologin
+      ./common/x11.nix
+    ];
+
+    environment.systemPackages = with pkgs; [ nyxt ];
+
+    # not enough memory for the allocation
+    virtualisation.memorySize = 2048;
+  };
+
+  enableOCR = true;
+
+  testScript =
+    { nodes, ... }:
+    ''
+      start_all()
+      machine.wait_for_x()
+
+      with subtest("Wait until Nyxt has finished loading the Valgrind docs page"):
+        machine.execute("xterm -e 'nyxt file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &");
+        machine.wait_for_window("nyxt")
+    '';
+}
diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix
index d8817dccddbf..82e6f0ff6469 100644
--- a/pkgs/applications/networking/browsers/nyxt/default.nix
+++ b/pkgs/applications/networking/browsers/nyxt/default.nix
@@ -28,6 +28,7 @@
   xclip,
   wl-clipboard,
   nix-update-script,
+  nixosTests,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -104,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
     updateScript = nix-update-script { };
+    tests = { inherit (nixosTests) nyxt; };
   };
 
   meta = with lib; {

From d7fdd5f9b1ca71c75c8979e70d15ca972eb6be9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 16:08:23 +0000
Subject: [PATCH 1667/3724] detox: 2.0.0 -> 3.0.1

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

diff --git a/pkgs/by-name/de/detox/package.nix b/pkgs/by-name/de/detox/package.nix
index aa4aa5db4ef2..03f135238759 100644
--- a/pkgs/by-name/de/detox/package.nix
+++ b/pkgs/by-name/de/detox/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "detox";
-  version = "2.0.0";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "dharple";
     repo = "detox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MMzkUh3xyyChOI1Y/mQKjnxL439mntKiMVYXuW8cPWI=";
+    hash = "sha256-/vcHN0FevouO3sWY69WJYuQK+V58C+vIejMdAWHgSAw=";
   };
 
   nativeBuildInputs = [

From b32f4f8996fce8f205e76b1b0ec7a8784b121778 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 11 Aug 2025 22:30:38 +0200
Subject: [PATCH 1668/3724] linux-pam: fix platform checks for audit/logind

---
 pkgs/by-name/li/linux-pam/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/linux-pam/package.nix b/pkgs/by-name/li/linux-pam/package.nix
index 3d41329f2701..ab8dbd8dacbc 100644
--- a/pkgs/by-name/li/linux-pam/package.nix
+++ b/pkgs/by-name/li/linux-pam/package.nix
@@ -20,6 +20,8 @@
   findXMLCatalogs,
   docbook_xsl_ns,
   nix-update-script,
+  withLogind ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
+  withAudit ? lib.meta.availableOn stdenv.hostPlatform audit,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -66,8 +68,10 @@ stdenv.mkDerivation (finalAttrs: {
     db4
     libxcrypt
   ]
-  ++ lib.optionals stdenv.buildPlatform.isLinux [
+  ++ lib.optionals withAudit [
     audit
+  ]
+  ++ lib.optionals withLogind [
     systemdLibs
   ];
 
@@ -75,8 +79,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonAutoFeatures = "auto";
   mesonFlags = [
-    (lib.mesonEnable "logind" stdenv.buildPlatform.isLinux)
-    (lib.mesonEnable "audit" stdenv.buildPlatform.isLinux)
+    (lib.mesonEnable "logind" withLogind)
+    (lib.mesonEnable "audit" withAudit)
     (lib.mesonEnable "pam_lastlog" (!stdenv.hostPlatform.isMusl)) # TODO: switch to pam_lastlog2, pam_lastlog is deprecated and broken on musl
     (lib.mesonEnable "pam_unix" true)
     # (lib.mesonBool "pam-debug" true) # warning: slower execution due to debug makes VM tests fail!

From 1fbd7a113aee9ca55337488a17b2c8f2bd1b0aeb Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 11 Aug 2025 22:35:37 +0200
Subject: [PATCH 1669/3724] linux-pam: mark bad on static

---
 pkgs/by-name/li/linux-pam/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/li/linux-pam/package.nix b/pkgs/by-name/li/linux-pam/package.nix
index ab8dbd8dacbc..b8cc88f6e71c 100644
--- a/pkgs/by-name/li/linux-pam/package.nix
+++ b/pkgs/by-name/li/linux-pam/package.nix
@@ -114,5 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user";
     platforms = lib.platforms.linux;
     license = lib.licenses.bsd3;
+    badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ];
   };
 })

From a65af78a5314d72a87ae4e2a49b46fddb7d71a5d Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 11 Aug 2025 22:45:32 +0200
Subject: [PATCH 1670/3724] shadow: don't build pam support on static

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

diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix
index 43577e3280ea..74cbbbe5b574 100644
--- a/pkgs/by-name/sh/shadow/package.nix
+++ b/pkgs/by-name/sh/shadow/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libxcrypt
   ]
-  ++ lib.optional (pam != null && stdenv.hostPlatform.isLinux) pam
+  ++ lib.optional (pam != null && (lib.meta.availableOn stdenv.hostPlatform pam)) pam
   ++ lib.optional withLibbsd libbsd
   ++ lib.optional withTcb tcb;
 

From 002e2897e6eeeaeee41735e3e3259eb74275126b Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 11 Aug 2025 22:45:43 +0200
Subject: [PATCH 1671/3724] util-linux: don't build pam support on static

---
 pkgs/by-name/ut/util-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index c7015881927e..1f2a43e18275 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -17,7 +17,7 @@
   cryptsetup,
   ncursesSupport ? true,
   ncurses,
-  pamSupport ? true,
+  pamSupport ? lib.meta.availableOn stdenv.hostPlatform pam,
   pam,
   systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,
   systemd,
@@ -28,8 +28,8 @@
   installShellFiles,
   writeSupport ? stdenv.hostPlatform.isLinux,
   shadowSupport ? stdenv.hostPlatform.isLinux,
-  # Doesn't build on Darwin, also doesn't really make sense on Darwin
-  withLastlog ? !stdenv.hostPlatform.isDarwin,
+  # Doesn't build on Darwin, only makes sense on systems which have pam
+  withLastlog ? !stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform pam,
   gitUpdater,
   nixosTests,
 }:

From d5a9d3a6a91aa980094724edf9d96a9381f7dc5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 Aug 2025 19:26:20 +0000
Subject: [PATCH 1672/3724] vscode-extensions.eamodio.gitlens: 17.3.3 -> 17.3.4

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 3131404911ac..bc2ec0f1fa90 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1501,8 +1501,8 @@ let
           # semver scheme, contrary to preview versions which are listed on
           # the VSCode Marketplace and use a calver scheme. We should avoid
           # using preview versions, because they expire after two weeks.
-          version = "17.3.3";
-          hash = "sha256-o16wFKcH/sYluRWXSTulZ9K7D/ECUXa3w6DeikVQe5w=";
+          version = "17.3.4";
+          hash = "sha256-HrIvJ0+E9lL6wa6lQSjvqdiQiVVCcKAJIPp+x8x/QMc=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";

From a1545a073cf5db69ab2ac0642fa57db8c96cfc9f Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 12 Aug 2025 22:48:04 +0200
Subject: [PATCH 1673/3724] nixos/systemd: drop kbrequest.target symlink

---
 nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++
 nixos/lib/systemd-lib.nix                         | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index cd6b9b10644b..6e9e9373e4b1 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -153,6 +153,8 @@
 
 - `command-not-found` package is now disabled by default; it works only for nix-channels based systems, and requires setup for it to work.
 
+- The systemd target `kbrequest.target` is now unset by default, instead of being forcibly symlinked to `rescue.target`. In case you were relying on this behavior (Alt + ArrowUp on the tty causing the current target to be changed to `rescue.target`), you can restore it by setting `systemd.targets.rescue.aliases = [ "kbrequest.target" ];` in your configuration.
+
 ## Other Notable Changes {#sec-release-25.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix
index 97a797b47b0f..03d0705b3e92 100644
--- a/nixos/lib/systemd-lib.nix
+++ b/nixos/lib/systemd-lib.nix
@@ -524,7 +524,6 @@ rec {
           # Stupid misc. symlinks.
           ln -s ${cfg.defaultUnit} $out/default.target
           ln -s ${cfg.ctrlAltDelUnit} $out/ctrl-alt-del.target
-          ln -s rescue.target $out/kbrequest.target
 
           ln -s ../remote-fs.target $out/multi-user.target.wants/
         ''}

From 1b605d262685f86659acbb57fe64dfd34c5fb7b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Jul 2025 12:02:48 -0700
Subject: [PATCH 1674/3724] python3Packages.pytest-shutil: update dependencies

---
 .../python-modules/pytest-shutil/default.nix          | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix
index 36b88d7ffea3..8636389eb12b 100644
--- a/pkgs/development/python-modules/pytest-shutil/default.nix
+++ b/pkgs/development/python-modules/pytest-shutil/default.nix
@@ -6,12 +6,9 @@
 
   # build-time
   setuptools,
-  setuptools-git,
 
   # runtime
   pytest,
-  mock,
-  path,
   execnet,
   termcolor,
   six,
@@ -31,14 +28,11 @@ buildPythonPackage {
 
   build-system = [
     setuptools
-    setuptools-git
   ];
 
   buildInputs = [ pytest ];
 
   dependencies = [
-    mock
-    path
     execnet
     termcolor
     six
@@ -46,10 +40,7 @@ buildPythonPackage {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests = [
-    "test_pretty_formatter"
-  ]
-  ++ lib.optionals isPyPy [
+  disabledTests = lib.optionals isPyPy [
     "test_run"
     "test_run_integration"
   ];

From 24da9d76be6d7c1c51b252ebf4b4882234cff676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Jul 2025 12:06:20 -0700
Subject: [PATCH 1675/3724] python3Packages.pytest-fixture-config: run tests

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

diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix
index b00643e7749a..c39764c6cfe2 100644
--- a/pkgs/development/python-modules/pytest-fixture-config/default.nix
+++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix
@@ -3,8 +3,9 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  setuptools-git,
   pytest,
+  pytestCheckHook,
+  six,
 }:
 
 buildPythonPackage rec {
@@ -23,14 +24,16 @@ buildPythonPackage rec {
     cd pytest-fixture-config
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
-    setuptools-git
   ];
 
   buildInputs = [ pytest ];
 
-  doCheck = false;
+  nativeCheckInputs = [
+    pytestCheckHook
+    six
+  ];
 
   meta = with lib; {
     changelog = "https://github.com/man-group/pytest-plugins/blob/${src.tag}/CHANGES.md";

From 6f79057e3acdb79e0cb76322a80a4e1c6572f0be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Jul 2025 12:15:42 -0700
Subject: [PATCH 1676/3724] python3Packages.setuptools-git: hardcode path to
 git executable

---
 .../python-modules/setuptools-git/default.nix | 31 +++++++++++++------
 .../setuptools-git/hardcode-git-path.patch    | 31 +++++++++++++++++++
 2 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/python-modules/setuptools-git/hardcode-git-path.patch

diff --git a/pkgs/development/python-modules/setuptools-git/default.nix b/pkgs/development/python-modules/setuptools-git/default.nix
index ae5b4224ad0f..4431e1d8c751 100644
--- a/pkgs/development/python-modules/setuptools-git/default.nix
+++ b/pkgs/development/python-modules/setuptools-git/default.nix
@@ -1,26 +1,37 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pkgs,
+  fetchFromGitHub,
+  gitMinimal,
+  replaceVars,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "setuptools-git";
   version = "1.2";
-  format = "setuptools";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9c40445";
+  src = fetchFromGitHub {
+    owner = "msabramo";
+    repo = "setuptools-git";
+    tag = version;
+    hash = "sha256-dbQ15y62nanuWgh2puLYSio391Ja3SF+HrafvTBVNbk=";
   };
 
-  propagatedBuildInputs = [ pkgs.git ];
+  patches = [
+    (replaceVars ./hardcode-git-path.patch {
+      git = lib.getExe gitMinimal;
+    })
+  ];
+
+  build-system = [ setuptools ];
+
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Setuptools revision control system plugin for Git";
-    homepage = "https://pypi.python.org/pypi/setuptools-git";
-    license = licenses.bsd3;
+    homepage = "https://github.com/msabramo/setuptools-git";
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/setuptools-git/hardcode-git-path.patch b/pkgs/development/python-modules/setuptools-git/hardcode-git-path.patch
new file mode 100644
index 000000000000..1cd8599c51b1
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools-git/hardcode-git-path.patch
@@ -0,0 +1,31 @@
+diff --git a/setuptools_git/__init__.py b/setuptools_git/__init__.py
+index 24c9b8c..a289aca 100644
+--- a/setuptools_git/__init__.py
++++ b/setuptools_git/__init__.py
+@@ -28,7 +28,7 @@ def version_calc(dist, attr, value):
+ 
+ 
+ def calculate_version():
+-    return check_output(['git', 'describe', '--tags', '--dirty']).strip()
++    return check_output(['@git@', 'describe', '--tags', '--dirty']).strip()
+ 
+ 
+ def ntfsdecode(path):
+@@ -64,7 +64,7 @@ def gitlsfiles(dirname=''):
+ 
+     try:
+         topdir = check_output(
+-            ['git', 'rev-parse', '--show-toplevel'], cwd=dirname or None,
++            ['@git@', 'rev-parse', '--show-toplevel'], cwd=dirname or None,
+             stderr=PIPE).strip()
+ 
+         if sys.platform == 'win32':
+@@ -73,7 +73,7 @@ def gitlsfiles(dirname=''):
+             cwd = topdir
+ 
+         filenames = check_output(
+-            ['git', 'ls-files', '-z'], cwd=cwd, stderr=PIPE)
++            ['@git@', 'ls-files', '-z'], cwd=cwd, stderr=PIPE)
+     except (CalledProcessError, OSError):
+         # Setuptools mandates we fail silently
+         return res

From 00e718567a9fd6436fb3f72296708dc9b26633f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Jul 2025 13:34:09 -0700
Subject: [PATCH 1677/3724] python3Packages.backtesting: drop superfluous
 setuptools-git dependency

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

diff --git a/pkgs/development/python-modules/backtesting/default.nix b/pkgs/development/python-modules/backtesting/default.nix
index 30465758ac29..3a14296d4fd2 100644
--- a/pkgs/development/python-modules/backtesting/default.nix
+++ b/pkgs/development/python-modules/backtesting/default.nix
@@ -4,7 +4,6 @@
   fetchPypi,
   setuptools,
   setuptools-scm,
-  setuptools-git,
   numpy,
   pandas,
   bokeh,
@@ -20,10 +19,14 @@ buildPythonPackage rec {
     hash = "sha256-c4od7ij8U98u2jXqLy0aHDfdugHfFCI/yeh9gKHvvC4=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "'setuptools_git'," ""
+  '';
+
   build-system = [
     setuptools
     setuptools-scm
-    setuptools-git
   ];
 
   dependencies = [

From fcac4e74de023e744810819bc80c82e3a1e8c700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Jul 2025 13:36:39 -0700
Subject: [PATCH 1678/3724] python3Packages.pypiserver: drop superfluous
 setuptools-git dependency

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

diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix
index d6bda6918515..ef39dbe21f80 100644
--- a/pkgs/development/python-modules/pypiserver/default.nix
+++ b/pkgs/development/python-modules/pypiserver/default.nix
@@ -7,12 +7,10 @@
   pip,
   pytestCheckHook,
   pythonOlder,
-  setuptools-git,
   setuptools,
   twine,
   watchdog,
   webtest,
-  wheel,
   build,
   importlib-resources,
 }:
@@ -31,10 +29,13 @@ buildPythonPackage rec {
     hash = "sha256-ODwDYAEAqel31+kR/BE1yBfgOZOtPz3iaCLg/d6jbb4=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail '"setuptools-git>=0.3",' ""
+  '';
+
   build-system = [
     setuptools
-    setuptools-git
-    wheel
   ];
 
   dependencies = [

From adf2fc259b5c326648546cfd9bbd61fe3b88450c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Jul 2025 13:40:56 -0700
Subject: [PATCH 1679/3724] python3Packages.daltonlens: drop superfluous
 setuptools-git dependency

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

diff --git a/pkgs/development/python-modules/daltonlens/default.nix b/pkgs/development/python-modules/daltonlens/default.nix
index c27c69f3f8da..6a91288eef4c 100644
--- a/pkgs/development/python-modules/daltonlens/default.nix
+++ b/pkgs/development/python-modules/daltonlens/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   setuptools,
-  setuptools-git,
   numpy,
   pillow,
   pytestCheckHook,
@@ -18,9 +17,13 @@ buildPythonPackage rec {
     hash = "sha256-T7fXlRdFtcVw5WURPqZhCmulUi1ZnCfCXgcLtTHeNas=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace-fail "setup_requires = setuptools_git" ""
+  '';
+
   build-system = [
     setuptools
-    setuptools-git
   ];
 
   dependencies = [

From 76b9f9bf6a233065f1e33ee3d799cb8181cea621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Jul 2025 13:51:14 -0700
Subject: [PATCH 1680/3724] python3Packages.pdoc3: 0.11.1 -> 0.11.6

Diff: https://github.com/pdoc3/pdoc/compare/refs/tags/0.11.1...refs/tags/0.11.6

Changelog: https://github.com/pdoc3/pdoc/blob/0.11.6/CHANGELOG
---
 pkgs/development/python-modules/pdoc3/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix
index 4aa77c4f2f1f..99e6a481e26e 100644
--- a/pkgs/development/python-modules/pdoc3/default.nix
+++ b/pkgs/development/python-modules/pdoc3/default.nix
@@ -2,29 +2,30 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   mako,
   markdown,
-  setuptools-git,
   setuptools-scm,
   unittestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pdoc3";
-  version = "0.11.1";
+  version = "0.11.6";
   pyproject = true;
-  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "pdoc3";
     repo = "pdoc";
     tag = version;
-    hash = "sha256-Opj1fU1eZvqsYJGCBliVwugxFV4H1hzOOTkjs4fOEWA=";
+    hash = "sha256-I8EPsjwA9dHOLvM2Oa4dbtB0N4dVczeGfzk+BVyfBcQ=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "'setuptools_git'," ""
+  '';
+
   build-system = [
-    setuptools-git
     setuptools-scm
   ];
 
@@ -38,7 +39,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [ unittestCheckHook ];
 
   meta = {
-    changelog = "https://github.com/pdoc3/pdoc/blob/${src.rev}/CHANGELOG";
+    changelog = "https://github.com/pdoc3/pdoc/blob/${src.tag}/CHANGELOG";
     description = "Auto-generate API documentation for Python projects";
     homepage = "https://pdoc3.github.io/pdoc/";
     license = lib.licenses.agpl3Plus;

From 9e65247b640c28e74683880989a5779cb4cd1a91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Aug 2025 00:14:29 +0000
Subject: [PATCH 1681/3724] jbang: 0.127.18 -> 0.129.0

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

diff --git a/pkgs/by-name/jb/jbang/package.nix b/pkgs/by-name/jb/jbang/package.nix
index e9e6de43f2c1..8ebd66aacee5 100644
--- a/pkgs/by-name/jb/jbang/package.nix
+++ b/pkgs/by-name/jb/jbang/package.nix
@@ -9,12 +9,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.127.18";
+  version = "0.129.0";
   pname = "jbang";
 
   src = fetchzip {
     url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
-    sha256 = "sha256-JH/IsQ2l2N6BG5svvGSdk4khMBAyM5tLL4l1uAY4nCY=";
+    sha256 = "sha256-l/C9L/RPfoGN/nEvCigtNj1q+QHxCiwE0FfJPJM6Kxo=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 01d301b7d4a380a43005041597258239a53239d8 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 13 Aug 2025 00:00:20 +0900
Subject: [PATCH 1682/3724] shaperglot-cli: 0-unstable-2025-08-11 -> 1.1.0

- Switch to a stable version now that the upstream git tag and CLI
  version are synchronized.
  ref: https://github.com/googlefonts/shaperglot/commit/69add91ca4c6306cae5497e93c8ad96d7c2f83be

- The current git revision is the same as 1.1.0, so the source hash
  is unchanged.
---
 pkgs/by-name/sh/shaperglot-cli/package.nix | 25 +++++++++-------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/sh/shaperglot-cli/package.nix b/pkgs/by-name/sh/shaperglot-cli/package.nix
index a7bf716f8e93..a7061dfef4a3 100644
--- a/pkgs/by-name/sh/shaperglot-cli/package.nix
+++ b/pkgs/by-name/sh/shaperglot-cli/package.nix
@@ -2,19 +2,18 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
-  _experimental-update-script-combinators,
-  unstableGitUpdater,
+  versionCheckHook,
   nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "shaperglot-cli";
-  version = "0-unstable-2025-08-11";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "shaperglot";
-    rev = "b7ba56e583e89a1c169f4ef7c3419e4e76e00974";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-XFzsUzHa4KsyDWlOKlWHBNimn1hzdrtCPe+lFrs0EDc=";
   };
 
@@ -29,6 +28,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
   installCheckPhase = ''
     runHook preInstallCheck
 
@@ -39,22 +42,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   passthru = {
-    updateScript = _experimental-update-script-combinators.sequence [
-      (unstableGitUpdater {
-        branch = "main";
-        # Git tag differs from CLI version: https://github.com/googlefonts/shaperglot/issues/138
-        hardcodeZeroVersion = true;
-      })
-      (nix-update-script {
-        # Updating `cargoHash`
-        extraArgs = [ "--version=skip" ];
-      })
-    ];
+    updateScript = nix-update-script { };
   };
 
   meta = {
     description = "Test font files for language support";
     homepage = "https://github.com/googlefonts/shaperglot";
+    # The CHANGELOG.md file exists in this repository but is not actually used.
+    changelog = "https://github.com/googlefonts/shaperglot/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       kachick

From 9662fc850b23601ddd1e6970417524291cbf45b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Aug 2025 04:42:46 +0000
Subject: [PATCH 1683/3724] hubstaff: 1.7.3-6c31e21a -> 1.7.4-d4458b13

---
 pkgs/by-name/hu/hubstaff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix
index faa2527c7e1c..6fa289874cbf 100644
--- a/pkgs/by-name/hu/hubstaff/package.nix
+++ b/pkgs/by-name/hu/hubstaff/package.nix
@@ -29,9 +29,9 @@
 }:
 
 let
-  url = "https://app.hubstaff.com/download/9979-standard-linux-1-7-3-release/sh";
-  version = "1.7.3-6c31e21a";
-  sha256 = "sha256:1gvdw4inz3vcbx5b0swi64b9i7sglvd6lx2jk40wf4r57rhsdkiw";
+  url = "https://app.hubstaff.com/download/10276-standard-linux-1-7-4-release/sh";
+  version = "1.7.4-d4458b13";
+  sha256 = "sha256:16ml8ykhrlis2fa3a01cqy5xs6l423ljfsal7gxdnqza7vphayhw";
 
   rpath = lib.makeLibraryPath [
     libX11

From 22e6928bd69c3e74f2a2f7ded88c56a26d264aa8 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Wed, 13 Aug 2025 15:12:09 +0400
Subject: [PATCH 1684/3724] texlive: allow to add custom mirrors

---
 .../tools/typesetting/tex/texlive/default.nix | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 36435d58ff42..e2e4be3a0acd 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -42,6 +42,7 @@
   biber-ms,
   makeFontsConf,
   useFixedHashes ? true,
+  extraMirrors ? [ ],
   recurseIntoAttrs,
   nixfmt,
 }:
@@ -115,25 +116,28 @@ let
   # should be switching to the tlnet-final versions
   # (https://tug.org/historic/).
   mirrors =
-    if version.final then
-      [
-        # tlnet-final snapshot; used when texlive.tlpdb is frozen
-        # the TeX Live yearly freeze typically happens in mid-March
-        "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${toString version.texliveYear}/tlnet-final"
-        "ftp://tug.org/texlive/historic/${toString version.texliveYear}/tlnet-final"
-      ]
-    else
-      [
-        # CTAN mirrors
-        "https://mirror.ctan.org/systems/texlive/tlnet"
-        # daily snapshots hosted by one of the texlive release managers;
-        # used for packages that in the meanwhile have been updated or removed from CTAN
-        # and for packages that have not reached yet the historic mirrors
-        # please note that this server is not meant for large scale deployment
-        # https://tug.org/pipermail/tex-live/2019-November/044456.html
-        # https://texlive.info/ MUST appear last (see tlpdbxz)
-        "https://texlive.info/tlnet-archive/${version.year}/${version.month}/${version.day}/tlnet"
-      ];
+    extraMirrors
+    ++ (
+      if version.final then
+        [
+          # tlnet-final snapshot; used when texlive.tlpdb is frozen
+          # the TeX Live yearly freeze typically happens in mid-March
+          "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${toString version.texliveYear}/tlnet-final"
+          "ftp://tug.org/texlive/historic/${toString version.texliveYear}/tlnet-final"
+        ]
+      else
+        [
+          # CTAN mirrors
+          "https://mirror.ctan.org/systems/texlive/tlnet"
+          # daily snapshots hosted by one of the texlive release managers;
+          # used for packages that in the meanwhile have been updated or removed from CTAN
+          # and for packages that have not reached yet the historic mirrors
+          # please note that this server is not meant for large scale deployment
+          # https://tug.org/pipermail/tex-live/2019-November/044456.html
+          # https://texlive.info/ MUST appear last (see tlpdbxz)
+          "https://texlive.info/tlnet-archive/${version.year}/${version.month}/${version.day}/tlnet"
+        ]
+    );
 
   tlpdbxz = fetchurl {
     urls =

From feaa895208b9dd15b5a9fec54a9223e48bec0066 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Aug 2025 11:58:21 +0000
Subject: [PATCH 1685/3724] steampipePackages.steampipe-plugin-azure: 1.4.0 ->
 1.6.0

---
 .../steampipe-packages/steampipe-plugin-azure/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
index 9bf158153a58..e6c91221972d 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "steampipe-plugin-azure";
-  version = "1.4.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe-plugin-azure";
     tag = "v${version}";
-    hash = "sha256-eCUFXgFlC6PJ2SlWJ7dmIq5Kf1+VJErGY258ZYH4HxI=";
+    hash = "sha256-Vtrec0g5UZGfeEGStRIr/ixgJViP/1XMOYyBmhmG2gM=";
   };
 
-  vendorHash = "sha256-CYz76ttMgwS9VfCO/2MQ59bBsOpzOzT39q4ma19x644=";
+  vendorHash = "sha256-Z4HcEqFDjWNNoevbnacx9z3j/0kz3Lm23c/ko08kUhc=";
 
   ldflags = [
     "-s"

From f2f653c9a2e56da65efba6a3aac4ff6aef2a9110 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Aug 2025 13:30:24 +0000
Subject: [PATCH 1686/3724] testkube: 2.1.164 -> 2.2.1

---
 pkgs/by-name/te/testkube/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix
index 64f677448fbb..11304f541812 100644
--- a/pkgs/by-name/te/testkube/package.nix
+++ b/pkgs/by-name/te/testkube/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "testkube";
-  version = "2.1.164";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "kubeshop";
     repo = "testkube";
     rev = "v${version}";
-    hash = "sha256-GBQDVzloAWROD7xM26gt0+cko8hbquHf5kvxVjjFeA0=";
+    hash = "sha256-ULMN5ITyMsvRvZXK14WglP3MWNiW49pB8dmUCM2Kqqo=";
   };
 
-  vendorHash = "sha256-i7GjhW9w6TEHg+PBVsQ8bOuToejiPpuOcSbXO5ffAMs=";
+  vendorHash = "sha256-6RcCkKXvHKdIKQBFAx7iFW2JZTz67zssx/gNRPttRq4=";
 
   ldflags = [
     "-X main.version=${version}"

From d16376f6ac61237619a7e4f78e385dc54b79fde6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Aug 2025 14:44:22 +0000
Subject: [PATCH 1687/3724] kokkos: 4.6.02 -> 4.7.00

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

diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix
index b892d1c9427a..4c3f199d7677 100644
--- a/pkgs/by-name/ko/kokkos/package.nix
+++ b/pkgs/by-name/ko/kokkos/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kokkos";
-  version = "4.6.02";
+  version = "4.7.00";
 
   src = fetchFromGitHub {
     owner = "kokkos";
     repo = "kokkos";
     rev = finalAttrs.version;
-    hash = "sha256-gpnaxQ3X+bqKiP9203I1DELDGXocRwMPN9nHFk5r6pM=";
+    hash = "sha256-KCGUv6SnTfKiWw0zzvKgiggANPCxSQY8bmqQT4xTMb8=";
   };
 
   nativeBuildInputs = [

From d7d8907aee150e8f57f497e628fc27ad2024bebc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Aug 2025 16:09:40 +0000
Subject: [PATCH 1688/3724] ocamlPackages.multipart_form: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/development/ocaml-modules/multipart_form/default.nix b/pkgs/development/ocaml-modules/multipart_form/default.nix
index b020eb21a376..98166d7d1577 100644
--- a/pkgs/development/ocaml-modules/multipart_form/default.nix
+++ b/pkgs/development/ocaml-modules/multipart_form/default.nix
@@ -16,11 +16,11 @@
 
 buildDunePackage rec {
   pname = "multipart_form";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "https://github.com/dinosaure/multipart_form/releases/download/v${version}/multipart_form-${version}.tbz";
-    hash = "sha256-oOMpwyPP+q1BZ81a+HpooeaglUZgDxdz2MDNLygGIRY=";
+    hash = "sha256-IqGGnDJtE0OKrtt+ah1Cy9zx4wavEl9eXXjZSh/M2JE=";
   };
 
   propagatedBuildInputs = [

From dbbc842090afba405866d076093d82fe405901cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Aug 2025 19:56:13 +0000
Subject: [PATCH 1689/3724] python3Packages.cf-xarray: 0.10.6 -> 0.10.7

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

diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix
index f6192a9e68fc..c8cc0d1fd416 100644
--- a/pkgs/development/python-modules/cf-xarray/default.nix
+++ b/pkgs/development/python-modules/cf-xarray/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "cf-xarray";
-  version = "0.10.6";
+  version = "0.10.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xarray-contrib";
     repo = "cf-xarray";
     tag = "v${version}";
-    hash = "sha256-zBjNOWDuO6yZNwD4Sv69X2i9ajUGIqvjlRA3gqmtgU8=";
+    hash = "sha256-hFM3xZzal+i4H8wF83LDEL4nAJE1d59LNQgkcrLSE80=";
   };
 
   build-system = [

From cd5d0b5b7b5912c69ff361ae0e1e86544a3d9421 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Aug 2025 21:23:52 +0000
Subject: [PATCH 1690/3724] source-meta-json-schema: 10.0.0 -> 11.1.1

---
 pkgs/by-name/so/source-meta-json-schema/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix
index c2e2216aadda..c8fb16197637 100644
--- a/pkgs/by-name/so/source-meta-json-schema/package.nix
+++ b/pkgs/by-name/so/source-meta-json-schema/package.nix
@@ -5,7 +5,7 @@
   cmake,
 }:
 let
-  version = "10.0.0";
+  version = "11.1.1";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "source-meta-json-schema";
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "sourcemeta";
     repo = "jsonschema";
     rev = "v${version}";
-    hash = "sha256-fYNbHU9DcSzMrMt+pDbbtPirTc+Wu4jq+vSqq+qzhtE=";
+    hash = "sha256-eXUiRpZko5ZHf2NVQu9HD+FgR3BxcTB9feNeI0kml+4=";
   };
 
   nativeBuildInputs = [

From c99a6b126cf2d00c3784283622283335a4ce3aec Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Wed, 13 Aug 2025 15:50:19 -0600
Subject: [PATCH 1691/3724] amazon-q-cli 1.13.1 -> 1.13.3

---
 pkgs/by-name/am/amazon-q-cli/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index 5162823dfb12..f6ea3094f629 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -7,20 +7,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "amazon-q-cli";
-  version = "1.13.1";
+  version = "1.13.3";
 
   src = fetchFromGitHub {
     owner = "aws";
-    repo = "amazon-q-developer-cli-autocomplete";
+    repo = "amazon-q-developer-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YQNBgOS94laEBhht8eeT8ZgtfXjjAMCeAI22z9SjpGs=";
+    hash = "sha256-1y7mQjZurT+JCh8Nl/nbfwMlyYKFmfc8Kwp46Dt9Lz4=";
   };
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
   ];
 
-  cargoHash = "sha256-VPJuuUzrtFpZjFog4WENI3eTw9IUNZw3mt5IYHW7MuE=";
+  cargoHash = "sha256-qepnwdkh0g/C40l8JMWVRRheSKbLWeu4AC+ib/DwfKE=";
 
   cargoBuildFlags = [
     "-p"

From 3bead502da9976852a76ccaa2e3dcd4c0fad7af2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Aug 2025 21:57:57 +0000
Subject: [PATCH 1692/3724] vscode-extensions.ms-toolsai.jupyter: 2025.6.0 ->
 2025.7.0

---
 .../editors/vscode/extensions/ms-toolsai.jupyter/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
index e0c2c4d6952e..176c8ef55a50 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
@@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "jupyter";
     publisher = "ms-toolsai";
-    version = "2025.6.0";
-    hash = "sha256-pJh+Iqgi6feFUPZ4/z7Ke6Hv76fmm6JvgU/e4iLvgmk=";
+    version = "2025.7.0";
+    hash = "sha256-wedMPo+mL3yvb9WqJComlyZWvSSaJXv/4LWcl0wwqdQ=";
   };
 
   nativeBuildInputs = [

From 4f76eccc52404cbd278a6136759a447dc893a62d Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 14 Aug 2025 01:26:38 +0200
Subject: [PATCH 1693/3724] perlPackages.Appcpanminus: shorten shebangs

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c198c0a327d6..f676bf7c9bc8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1188,6 +1188,10 @@ with self;
         --replace-fail http://cpanmetadb.plackperl.org https://cpanmetadb.plackperl.org
     '';
     propagatedBuildInputs = [ IOSocketSSL ];
+    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
+    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+      shortenPerlShebang $out/bin/cpanm
+    '';
     meta = {
       description = "Get, unpack, build and install modules from CPAN";
       homepage = "https://github.com/miyagawa/cpanminus";

From 024a1d9bd00f74dd7f7bce3253897d5a29d77fcc Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 14 Aug 2025 01:26:52 +0200
Subject: [PATCH 1694/3724] lanraragi: use cpanm directly

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

diff --git a/pkgs/by-name/la/lanraragi/package.nix b/pkgs/by-name/la/lanraragi/package.nix
index b80b9aebb6ef..ffd4aeea03ea 100644
--- a/pkgs/by-name/la/lanraragi/package.nix
+++ b/pkgs/by-name/la/lanraragi/package.nix
@@ -30,6 +30,7 @@ buildNpmPackage rec {
 
   nativeBuildInputs = [
     perl
+    perl.pkgs.Appcpanminus
     makeBinaryWrapper
   ];
 
@@ -74,8 +75,7 @@ buildNpmPackage rec {
     runHook preBuild
 
     # Check if every perl dependency was installed
-    # explicitly call cpanm with perl because the shebang is broken on darwin
-    perl ${perl.pkgs.Appcpanminus}/bin/cpanm --installdeps ./tools --notest
+    cpanm --installdeps ./tools --notest
 
     perl ./tools/install.pl install-full
     rm -r node_modules public/js/vendor/*.map public/css/vendor/*.map

From 6cfd122daeaf7ea118e15f00678a3cc5b440cb11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Thu, 14 Aug 2025 00:09:51 -0600
Subject: [PATCH 1695/3724] python3Packages.cohere: drop duplicated attribute
 `pythonRelaxDeps`

One was merged to the main branch and the other to staging-next via:

- https://github.com/NixOS/nixpkgs/commit/caf7e71f074b95d27d0aff1dd323677361f6e342 (2025-08-09)
- https://github.com/NixOS/nixpkgs/commit/01c4d563f15356264eaae33bfd21bbe6dd4fb120 (2025-08-13)
---
 pkgs/development/python-modules/cohere/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix
index f2fac259b798..c52d74cb73af 100644
--- a/pkgs/development/python-modules/cohere/default.nix
+++ b/pkgs/development/python-modules/cohere/default.nix
@@ -30,8 +30,6 @@ buildPythonPackage rec {
     hash = "sha256-spnkDzkPAjf/4vG7bB4d9RBc3tES+Va4wzmFJFA2/NI=";
   };
 
-  pythonRelaxDeps = [ "httpx-sse" ];
-
   build-system = [ poetry-core ];
 
   dependencies = [

From 58b49f80a929c627d1a50fc00e00db68464c3c87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 06:37:14 +0000
Subject: [PATCH 1696/3724] python3Packages.lib50: 3.1.1 -> 3.1.4

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

diff --git a/pkgs/development/python-modules/lib50/default.nix b/pkgs/development/python-modules/lib50/default.nix
index 37a8b51eb111..c3b4c55ef63e 100644
--- a/pkgs/development/python-modules/lib50/default.nix
+++ b/pkgs/development/python-modules/lib50/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "lib50";
-  version = "3.1.1";
+  version = "3.1.4";
   pyproject = true;
 
   # latest GitHub release is several years old. Pypi is up to date.
   src = fetchPypi {
     pname = "lib50";
     inherit version;
-    hash = "sha256-DSAYgtce9lU9dlfLejdIH9K8jVeNaPl0wSqStMgwUD4=";
+    hash = "sha256-/fuiizWAvM1L+shuEnYo0pXwWsLAjDEYUNfb56d/8Y0=";
   };
 
   build-system = [ setuptools ];

From 536d54517b81893e86bc78508c86ce35fc861c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Thu, 14 Aug 2025 07:36:04 +0200
Subject: [PATCH 1697/3724] deno: 2.4.3 -> 2.4.4

---
 pkgs/by-name/de/deno/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index ce9b8b8234c7..0674d148b2c5 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -29,17 +29,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deno";
-  version = "2.4.3";
+  version = "2.4.4";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true; # required for tests
-    hash = "sha256-zJGeVwuLY3fT/ShWvqKYnyCyVbRGoc/czXLmMNKRuyw=";
+    hash = "sha256-Zeml0hubyNK3wU29xNKwiOPHjLzbGryNhZ2/geoCpXs=";
   };
 
-  cargoHash = "sha256-SzKrkhxEIe+7oTL2lVb19wmTMEa395Fuq3xZB88ptLk=";
+  cargoHash = "sha256-oWbCv7uwqAeiDzCQ4fc3Yh+FxUJH/ar9A2y9qx95XjE=";
 
   patches = [
     # Patch out the remote upgrade (deno update) check.

From 5597a4f8f9f82e6a4829f3527728016c07838f4f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 11 Aug 2025 11:06:09 +0200
Subject: [PATCH 1698/3724] lasuite-docs: fix mail notifications

The build-process doesn't install the mjml-based mail templates which
results in the following log-lines when trying to invite somebody by
email to collaborate on a document:

    Aug 11 08:25:08 lasuite gunicorn[345]:   File "/nix/store/4h2z6psmq0nizy39psyf2lil0cqiwl42-python3.13-django-5.2.4/lib/python3.13/site-packages/django/template/loader.py", line 19, in get_template
    Aug 11 08:25:08 lasuite gunicorn[345]:     raise TemplateDoesNotExist(template_name, chain=chain)
    Aug 11 08:25:08 lasuite gunicorn[345]: django.template.exceptions.TemplateDoesNotExist: mail/html/template.html
---
 .../la/lasuite-docs/mjml-mail-dir.patch       | 26 +++++++++++
 pkgs/by-name/la/lasuite-docs/package.nix      | 44 ++++++++++++++++---
 2 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/la/lasuite-docs/mjml-mail-dir.patch

diff --git a/pkgs/by-name/la/lasuite-docs/mjml-mail-dir.patch b/pkgs/by-name/la/lasuite-docs/mjml-mail-dir.patch
new file mode 100644
index 000000000000..4d9f554648c8
--- /dev/null
+++ b/pkgs/by-name/la/lasuite-docs/mjml-mail-dir.patch
@@ -0,0 +1,26 @@
+diff --git a/src/mail/bin/html-to-plain-text b/src/mail/bin/html-to-plain-text
+index ced0c13d..bcdef288 100755
+--- a/src/mail/bin/html-to-plain-text
++++ b/src/mail/bin/html-to-plain-text
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env bash
+ set -eo pipefail
+ # Run html-to-text to convert all html files to text files
+-DIR_MAILS="../backend/core/templates/mail/"
++DIR_MAILS="${DIR_MAILS:-../backend/core/templates/mail}/"
+ 
+ if [ ! -d "${DIR_MAILS}" ]; then
+   mkdir -p "${DIR_MAILS}";
+diff --git a/src/mail/bin/mjml-to-html b/src/mail/bin/mjml-to-html
+index fb5710b0..15e2fc7d 100755
+--- a/src/mail/bin/mjml-to-html
++++ b/src/mail/bin/mjml-to-html
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env bash
+ 
+ # Run mjml command to convert all mjml templates to html files
+-DIR_MAILS="../backend/core/templates/mail/html/"
++DIR_MAILS="${DIR_MAILS:-../backend/core/templates/mail}/html/"
+ 
+ if [ ! -d "${DIR_MAILS}" ]; then
+   mkdir -p "${DIR_MAILS}";
diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix
index f25376f6080e..322f61ae8e95 100644
--- a/pkgs/by-name/la/lasuite-docs/package.nix
+++ b/pkgs/by-name/la/lasuite-docs/package.nix
@@ -1,9 +1,14 @@
 {
+  stdenv,
   lib,
   python3,
   fetchFromGitHub,
   nixosTests,
   fetchPypi,
+  fetchYarnDeps,
+  nodejs,
+  yarnBuildHook,
+  yarnConfigHook,
 }:
 let
   python = python3.override {
@@ -20,13 +25,8 @@ let
       };
     };
   };
-in
 
-python.pkgs.buildPythonApplication rec {
-  pname = "lasuite-docs";
   version = "3.4.2";
-  pyproject = true;
-
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "docs";
@@ -34,6 +34,37 @@ python.pkgs.buildPythonApplication rec {
     hash = "sha256-uo49y+tJXdc8gfFIHSIEk0DEowMsHWA64IxlHpFHUTU=";
   };
 
+  mail-templates = stdenv.mkDerivation {
+    name = "lasuite-docs-${version}-mjml";
+    inherit src;
+
+    sourceRoot = "source/src/mail";
+
+    patches = [ ./mjml-mail-dir.patch ];
+    patchFlags = [ "-p3" ];
+
+    env.DIR_MAILS = "${placeholder "out"}";
+
+    offlineCache = fetchYarnDeps {
+      yarnLock = "${src}/src/mail/yarn.lock";
+      hash = "sha256-oyLs7Df+KGzqCW8uF/7uzcL6ecMx8kHMzpuHSSywwfw=";
+    };
+
+    nativeBuildInputs = [
+      nodejs
+      yarnConfigHook
+      yarnBuildHook
+    ];
+
+    dontInstall = true;
+  };
+in
+
+python.pkgs.buildPythonApplication rec {
+  pname = "lasuite-docs";
+  pyproject = true;
+  inherit version src;
+
   sourceRoot = "source/src/backend";
 
   patches = [
@@ -108,6 +139,9 @@ python.pkgs.buildPythonApplication rec {
         --prefix PYTHONPATH : "${pythonPath}:$out/${python.sitePackages}"
       makeWrapper ${lib.getExe python.pkgs.gunicorn} $out/bin/gunicorn \
         --prefix PYTHONPATH : "${pythonPath}:$out/${python.sitePackages}"
+
+      mkdir -p $out/${python.sitePackages}/core/templates
+      ln -sv ${mail-templates}/ $out/${python.sitePackages}/core/templates/mail
     '';
 
   passthru.tests = {

From ca492e1e28ad7ae1198a113ae1a52e3d0137f935 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 10:31:52 +0000
Subject: [PATCH 1699/3724] rocksdb: 10.4.2 -> 10.5.1

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

diff --git a/pkgs/by-name/ro/rocksdb/package.nix b/pkgs/by-name/ro/rocksdb/package.nix
index ca2b21903415..76a2bec91d6f 100644
--- a/pkgs/by-name/ro/rocksdb/package.nix
+++ b/pkgs/by-name/ro/rocksdb/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocksdb";
-  version = "10.4.2";
+  version = "10.5.1";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "rocksdb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mKh6zsmxsiUix4LX+npiytmKvLbo6WNA9y4Ns/EY+bE=";
+    hash = "sha256-TDYXzYbOLhcIRi+qi0FW1OLVtfKOF+gUbj62Tgpp3/E=";
   };
 
   patches = lib.optional (

From 0577c37955196ad490f4c42b004d1a3e02535781 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 10:40:41 +0000
Subject: [PATCH 1700/3724] acpica-tools: R2025_04_04 -> 20250807

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

diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix
index 96a8a0d0a78a..102ffca288aa 100644
--- a/pkgs/by-name/ac/acpica-tools/package.nix
+++ b/pkgs/by-name/ac/acpica-tools/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "acpica-tools";
-  version = "R2025_04_04";
+  version = "20250807";
 
   src = fetchFromGitHub {
     owner = "acpica";
     repo = "acpica";
     tag = finalAttrs.version;
-    hash = "sha256-+dMuyp3tT0eSLPyzLseuHMY+nNfl6roBFrsnXiZSHkY=";
+    hash = "sha256-OY7jEirUDpzhgT9iCUYWeZmbCQl2R/agGIHXqJI/UBo=";
   };
 
   nativeBuildInputs = [

From f01566507827470e07aa100508bf258fd6dc116b Mon Sep 17 00:00:00 2001
From: evolve <elivanoa5@gmail.com>
Date: Thu, 14 Aug 2025 14:42:58 +0200
Subject: [PATCH 1701/3724] local-content-share: 32 -> 33

---
 pkgs/by-name/lo/local-content-share/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lo/local-content-share/package.nix b/pkgs/by-name/lo/local-content-share/package.nix
index 2bc7e31e98b1..612aa0fe6280 100644
--- a/pkgs/by-name/lo/local-content-share/package.nix
+++ b/pkgs/by-name/lo/local-content-share/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "local-content-share";
-  version = "32";
+  version = "33";
 
   src = fetchFromGitHub {
     owner = "Tanq16";
     repo = "local-content-share";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2TgamuHDASwSKshPkNLAnwnnCU23SvdXWv6sU++yBII=";
+    hash = "sha256-ov7FiqznBQbp0YIi0DNTpsFvP4ui1GNtxXGIPGyvs+k=";
   };
 
   vendorHash = null;

From 70116444439eb6e07b1db85f8e419a1bb3e1aa2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <jakub@okonski.org>
Date: Mon, 7 Jul 2025 16:23:17 +0200
Subject: [PATCH 1702/3724] graalvm-oracle_24: init at 24.0.2

---
 pkgs/development/compilers/graalvm/default.nix |  5 ++++-
 .../graalvm/graalvm-oracle/default.nix         |  2 +-
 .../graalvm/graalvm-oracle/hashes.nix          | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 409553f9b2e4..468c628f22a3 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -28,9 +28,12 @@ lib.makeScope pkgs.newScope (
         (prev: {
           autoPatchelfIgnoreMissingDeps = [ "libonnxruntime.so.1" ];
         });
+    graalvm-oracle_24 = (self.callPackage ./graalvm-oracle { version = "24"; }).overrideAttrs (prev: {
+      autoPatchelfIgnoreMissingDeps = [ "libonnxruntime.so.1.18.0" ];
+    });
     graalvm-oracle_23 = self.callPackage ./graalvm-oracle { version = "23"; };
     graalvm-oracle_17 = self.callPackage ./graalvm-oracle { version = "17"; };
-    graalvm-oracle = self.graalvm-oracle_23;
+    graalvm-oracle = self.graalvm-oracle_24;
   }
   // lib.optionalAttrs config.allowAliases {
     graalvm-oracle_22 = throw "GraalVM 22 is EOL, use a newer version instead";
diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix
index 2f362857a3c9..d700c8cb78e5 100644
--- a/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix
+++ b/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix
@@ -4,7 +4,7 @@
   fetchurl,
   graalvmPackages,
   useMusl ? false,
-  version ? "23",
+  version ? "24",
 }:
 
 graalvmPackages.buildGraalvm {
diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
index b593142b066b..63149f22b667 100644
--- a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
+++ b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
@@ -22,6 +22,24 @@
       url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.32/graalvm-jdk-25.0.0-ea.32_macos-aarch64_bin.tar.gz";
     };
   };
+  "24" = {
+    "aarch64-linux" = {
+      hash = "sha256-dvJVfzLoz75ti3u/Mx8PCS674cw2omeOCYMFiSB2KYs=";
+      url = "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_linux-aarch64_bin.tar.gz";
+    };
+    "x86_64-linux" = {
+      hash = "sha256-sBYaSbvB0PQGl1Mt36u4BSpaFeRjd15pRf4+SSAlm64=";
+      url = "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_linux-x64_bin.tar.gz";
+    };
+    "x86_64-darwin" = {
+      hash = "sha256-3w+eXRASAcUL+muqPGV6gaKIPFtQl6n1q5PauG9+O6I=";
+      url = "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_macos-x64_bin.tar.gz";
+    };
+    "aarch64-darwin" = {
+      hash = "sha256-LcdjTtk5xyXUGjU/c0Q/8y5w8vtXc2fxKmk2EH40lNw=";
+      url = "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_macos-aarch64_bin.tar.gz";
+    };
+  };
   "23" = {
     "aarch64-linux" = {
       hash = "sha256-VlB664/l7NWFQrPE3vEJvCXkEzKEJ0ck/HNU5pGGTwU=";

From 99df9a3dcceabc75f2f318bcaf23e44e441d4587 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 13:27:46 +0000
Subject: [PATCH 1703/3724] tidb: 8.5.2 -> 8.5.3

---
 pkgs/by-name/ti/tidb/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ti/tidb/package.nix b/pkgs/by-name/ti/tidb/package.nix
index bb9ca45ab130..1b813b52c6c6 100644
--- a/pkgs/by-name/ti/tidb/package.nix
+++ b/pkgs/by-name/ti/tidb/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "tidb";
-  version = "8.5.2";
+  version = "8.5.3";
 
   src = fetchFromGitHub {
     owner = "pingcap";
     repo = "tidb";
     rev = "v${version}";
-    sha256 = "sha256-6fXkNG+cQh4HCZj3ApmLUA+n5ViSVOyABoCwx0K8Ja4=";
+    sha256 = "sha256-2pg3UxzxzB4V4XhfmSxQCOn+NFqvp7DF+htIY3mtZ4s=";
   };
 
-  vendorHash = "sha256-TLNa4ykczRronsKITPwVFOls8ql7xWXJvOibqYulC/Q=";
+  vendorHash = "sha256-HXN2EkpN2ltBUB2HqSvUOgVTfs2zcTeHoxa5zpccc+A=";
 
   ldflags = [
     "-X github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=${version}"

From 25264280990933ad57c888eaa2b24d887a7c20d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Jul 2025 22:05:08 +0000
Subject: [PATCH 1704/3724] openseachest: 25.05.1 -> 25.05.2

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

diff --git a/pkgs/by-name/op/openseachest/package.nix b/pkgs/by-name/op/openseachest/package.nix
index 7129d314ccb8..abe898da86a0 100644
--- a/pkgs/by-name/op/openseachest/package.nix
+++ b/pkgs/by-name/op/openseachest/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openseachest";
-  version = "25.05.1";
+  version = "25.05.2";
 
   src = fetchFromGitHub {
     owner = "Seagate";
     repo = "openSeaChest";
     tag = "v${version}";
-    hash = "sha256-kd2JRtqnxfYRJcr1yKSB0LZAR96j2WW4tR1iRTvVANs=";
+    hash = "sha256-sZ668I38TClzTmzmRM0yQ/WG7o5AEIXFouWxmqVWyMs=";
     fetchSubmodules = true;
   };
 

From 2c55588b5c3cc2ebf7cba42c4c99aab087ff5b0b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 21:09:05 +0000
Subject: [PATCH 1705/3724] museum: 1.1.57 -> 1.2.0

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

diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix
index 7cf70b973d8b..5a5e84d16d6c 100644
--- a/pkgs/by-name/mu/museum/package.nix
+++ b/pkgs/by-name/mu/museum/package.nix
@@ -9,14 +9,14 @@
 
 buildGoModule rec {
   pname = "museum";
-  version = "1.1.57";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "server" ];
     tag = "photos-v${version}";
-    hash = "sha256-801wTTxruhZc18+TAPSYrBRtCPNZXwSKs2Hkvc/6BjM=";
+    hash = "sha256-/TxQKwQ604zsQ+31SZR/WWKBDiR3taGs2wi9oFOENVA=";
   };
 
   vendorHash = "sha256-px4pMqeH73Fe06va4+n6hklIUDMbPmAQNKKRIhwv6ec=";

From f088466f6212f19146a18938f0c45af9e00cad07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 15:32:51 +0000
Subject: [PATCH 1706/3724] checkstyle: 10.26.1 -> 11.0.0

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

diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix
index 2f16fcd5513c..488d49f436cf 100644
--- a/pkgs/by-name/ch/checkstyle/package.nix
+++ b/pkgs/by-name/ch/checkstyle/package.nix
@@ -7,12 +7,12 @@
 }:
 
 stdenvNoCC.mkDerivation rec {
-  version = "10.26.1";
+  version = "11.0.0";
   pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "sha256-5BwkQzcjujEKMOQdpPRJwQWtR8qyrp5r5eBmBqZH28o=";
+    sha256 = "sha256-WbmHE0A1OxqGsNqmyPh6QQwhhnUAw6QiQIuftcnsLHY=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

From 8ec12ac74d9b03244670fbd32728a4a0f6f8ed44 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 4 Aug 2025 17:16:10 +0200
Subject: [PATCH 1707/3724] stirling-pdf: 1.0.2 -> 1.2.0

---
 pkgs/by-name/st/stirling-pdf/deps.json        | 1214 +++++++++--------
 pkgs/by-name/st/stirling-pdf/package.nix      |   10 +-
 .../remove-props-file-timestamp.patch         |   14 +-
 3 files changed, 652 insertions(+), 586 deletions(-)

diff --git a/pkgs/by-name/st/stirling-pdf/deps.json b/pkgs/by-name/st/stirling-pdf/deps.json
index 25025b623764..27e920fae6c1 100644
--- a/pkgs/by-name/st/stirling-pdf/deps.json
+++ b/pkgs/by-name/st/stirling-pdf/deps.json
@@ -88,58 +88,58 @@
    "module": "sha256-IFNqlfL+sr9DBRKMaq7Lb9idxFeYqchfJgK4qAnXUNs=",
    "pom": "sha256-Q1z/VXiZht7arXF/aPuo1UgklHhWLc2EsirU1lZvRAs="
   },
-  "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/7.0.4": {
-   "pom": "sha256-Dvhm17saHilm2ACgjljKrrcM8gpHMH/ITi7dtFOXLFo="
+  "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/7.2.1": {
+   "pom": "sha256-r0KlKH8JY2fsdKz6zNzXhSIUanQ4EoxTfnABcFEykHw="
   },
-  "com/diffplug/spotless#spotless-lib-extra/3.1.2": {
-   "jar": "sha256-N8m73mPVzrspMyHBz9BG/HoFzQZqvanaUqpjqOpnb3Q=",
-   "module": "sha256-3F2e6yh8cqlPDlrRFc8YC976BROKnLTElMZ2oRvxGKs=",
-   "pom": "sha256-Aq6OOHRUkbUkWdJTIphqV1D16qs+WyYc+fj7+bzzM3s="
+  "com/diffplug/spotless#spotless-lib-extra/3.3.1": {
+   "jar": "sha256-ZMEhkjb+Vivaqao7qJUxw/q4HqIypP/9RkRN9jmb+Vo=",
+   "module": "sha256-Go/Yhes5xVNeS8+5a9Pheq2utfOR2Q9W/OicT2qrz4Q=",
+   "pom": "sha256-OiP6xrSairRgMHCzZ9pidzGVi1BuxQUNsxxIBbRG7UY="
   },
-  "com/diffplug/spotless#spotless-lib/3.1.2": {
-   "jar": "sha256-qA4xv2rLSBgCmIvuVVkIFbCYjWhge2pYb/x3XN+Kmz8=",
-   "module": "sha256-jFVmoeOpxnx1eCDU7g3aG6rj3CTeUtJKhKFuAd7FG3E=",
-   "pom": "sha256-7ksMx9n2w/cozgczgkS6nTns6MqUmkDlfzEWaTHgiag="
+  "com/diffplug/spotless#spotless-lib/3.3.1": {
+   "jar": "sha256-fHSqPYXl8FY/Bq8FgIzvYq+ON4eG8n3KQM/oF/QCJns=",
+   "module": "sha256-pNqsenu42CaoB85idydMpGGUWqKXh9dx5TkkFlk+J0E=",
+   "pom": "sha256-LoohCSNFX+hQEun6ep9ItdLEr5OUUa6wtoGZCSS9xao="
   },
-  "com/diffplug/spotless#spotless-plugin-gradle/7.0.4": {
-   "jar": "sha256-I1V83sEwtLssotMO2iOYMl4J3+a5kNLqzZ1fOaHe3nE=",
-   "module": "sha256-84xGBPDjvlbQ6KViHb4sPc8K5sEbRTd9YMO6EPUcdqs=",
-   "pom": "sha256-Dgkm/VyB7KlFU2R684APUrLbfBpQF6g5FStKxJZHui4="
+  "com/diffplug/spotless#spotless-plugin-gradle/7.2.1": {
+   "jar": "sha256-/1vZveHyG0htD4epai6Q+tHYiXGgS+9pQdlMqlLiev0=",
+   "module": "sha256-Gwij+KJQJMTVC8NwY4s5Ge15vYrXRnHBh3/A4NPCEtE=",
+   "pom": "sha256-BNp7IbLy2Xao44DgkOO92gLSzyaC4h8SM97fgUamX+E="
   },
-  "com/fasterxml#oss-parent/68": {
-   "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc="
+  "com/fasterxml#oss-parent/69": {
+   "pom": "sha256-OFbVhKqhyOM86UxnJE9x9vcFOKJZ/+jngXYbn6qth18="
   },
-  "com/fasterxml/jackson#jackson-base/2.19.1": {
-   "pom": "sha256-tzFwCGYicYqn1sGsCpSbZVD5vRSkRnLBo/K457doLhQ="
+  "com/fasterxml/jackson#jackson-base/2.19.2": {
+   "pom": "sha256-/779Z5U5lKd12QJsscFvkrqB0cHBMX7oorma4AnSYUM="
   },
-  "com/fasterxml/jackson#jackson-bom/2.19.1": {
-   "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4="
+  "com/fasterxml/jackson#jackson-bom/2.19.2": {
+   "pom": "sha256-IgBr5w/QGAmemcbCesCYIyDzoPPCzgU8VXA1eaXuowM="
   },
-  "com/fasterxml/jackson#jackson-parent/2.19.2": {
-   "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U="
+  "com/fasterxml/jackson#jackson-parent/2.19.3": {
+   "pom": "sha256-I9GGyNjNBgFdAixxDHFUI9Zg1J4pc7FYcLApzCYBhoI="
   },
-  "com/fasterxml/jackson/core#jackson-annotations/2.19.1": {
-   "jar": "sha256-WjzXIRqyazYhP0OiqUvAUqM4WveAxcE1MpdBstealzA=",
-   "module": "sha256-GpQP75txqcrROLbmRlagMsS82A2DieBXDbP478JMftA=",
-   "pom": "sha256-19pMaD48eSc1pvS2xxwEF0XisdcDWQNQq5rPSufzyy0="
+  "com/fasterxml/jackson/core#jackson-annotations/2.19.2": {
+   "jar": "sha256-5RZ0OjFtz4PFcv/Jy26MXowTSIDIxRVbAvezTpxdw88=",
+   "module": "sha256-MZtf0wd2wFk8yNxajX4ITkuQcJpDUGQYQqu9WfyByBU=",
+   "pom": "sha256-SVAWGuCtZsaze8Ku0S0hxleeF3ltv86Yixm40MIjpck="
   },
-  "com/fasterxml/jackson/core#jackson-core/2.19.1": {
-   "jar": "sha256-xGNp4aIYEBAK28klA7YvFanvFkBCeTL0/hWI73zn5IA=",
-   "module": "sha256-SZrw5ZPg0uFL2SnjRJnXIqbtT0KxsJ4inrzUgCzsF60=",
-   "pom": "sha256-Ciaizbd+H4G9km0juNWGw5XPPYiRkyrXA3D9RhtIfRo="
+  "com/fasterxml/jackson/core#jackson-core/2.19.2": {
+   "jar": "sha256-qnfq8pKTqGjEc3IZT3xSh9d9k3CwTqJdP//B5JBLWIA=",
+   "module": "sha256-Ua8uZ3g6XXJETeajB8jj7ZMAklbNJ+ghkVVZohZcCUI=",
+   "pom": "sha256-gfatIwlG88U9gYwZ/l7hEcH6MxuRXEvajQGC5rT/1lA="
   },
-  "com/fasterxml/jackson/core#jackson-databind/2.19.1": {
-   "jar": "sha256-C8U5QB1SxrFOZolHyFHcxJ94pK2j0fyOj3FEBhP8Js4=",
-   "module": "sha256-XvVBTiXAofGXClB66vPoH8vMELeV2/fz8sO74iL0STw=",
-   "pom": "sha256-0FgUkLOlW0piD5Dx88rShW5vLYEOTntMrvCANYU5qMA="
+  "com/fasterxml/jackson/core#jackson-databind/2.19.2": {
+   "jar": "sha256-ChvU6bDWcOYy1A7oxiWtN2IzUC8DwvWIm66pXQJbR6c=",
+   "module": "sha256-xgFVg0SRj0CDS7bVg4EepsiDvwaigXmkx04voYswbGg=",
+   "pom": "sha256-2KebdQK2m/JQaEwZCpiCOJImaG1dlikGdW2BzVskO4I="
   },
-  "com/fasterxml/jackson/module#jackson-module-parameter-names/2.19.1": {
-   "jar": "sha256-VerdSgCK3WhuJMWWP6w3pbSW7qMg908JKgWa62/uzW4=",
-   "module": "sha256-8dFVuOZTQyMSNPq5ey2HRQcKeJR+y+SB7wDYGrEQl9k=",
-   "pom": "sha256-QsJUJTElM3zY0qlDQ0p+b6cMNzMbC8ABYaZmmr64OQs="
+  "com/fasterxml/jackson/module#jackson-module-parameter-names/2.19.2": {
+   "jar": "sha256-XK/vmHWbQKQYYx6RJXkwpeMKvBYtmmkMHjZdu9rN/ss=",
+   "module": "sha256-OqrxKhsJMj016N4m7fuiqZb3UtLmR8aqNeQj8Ir8RaI=",
+   "pom": "sha256-aHbM5vRN6SArRmfQuSJhkKlmCct4Z2jLUhyQ+TjStEE="
   },
-  "com/fasterxml/jackson/module#jackson-modules-java8/2.19.1": {
-   "pom": "sha256-f8Z58ae3RvkFv2oMXH083ayiNnFadWqMwB6LilDxlU4="
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.19.2": {
+   "pom": "sha256-o8wywUW5Yr45UE+FNsrGISTry1rVAy2TC8ck/flOgqQ="
   },
   "com/github/jk1#gradle-license-report/2.9": {
    "jar": "sha256-6/1tqFFlTFMhbuqe2hSFwS4M1t5amRm/XalzWgIfMq8=",
@@ -210,12 +210,12 @@
    "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=",
    "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU="
   },
-  "com/thoughtworks/xstream#xstream-parent/1.4.20": {
-   "pom": "sha256-ERiJ4wIWWg9EpU3k23BSUNHeDckbp4oZih0ieDRL7uc="
+  "com/thoughtworks/xstream#xstream-parent/1.4.21": {
+   "pom": "sha256-ABV+MPwdz+XmVD6Iy4dj223KVm5SWJzthSu/eY2s3eY="
   },
-  "com/thoughtworks/xstream#xstream/1.4.20": {
-   "jar": "sha256-h98PC+V8kgN9ARD7siWjC2UXAtwnVlPSha/P7zG8LoE=",
-   "pom": "sha256-c9gezjnpSh0tf80BhGYqo9QQa/6XCbeTlkiS4+f0/cQ="
+  "com/thoughtworks/xstream#xstream/1.4.21": {
+   "jar": "sha256-9WWG895ZripJQwrLyfJ5QrjFzr7JJFyGn65xNnMzM+w=",
+   "pom": "sha256-2TFXvSlStMSp4Q2RXijyl8KiGSEQVLQ77N64IHJidns="
   },
   "commons-codec#commons-codec/1.17.1": {
    "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=",
@@ -230,13 +230,13 @@
    "module": "sha256-pnYDnqavCPJXtG4Hwr8VcaRqTUtbnMuGw/yY0H+v6hs=",
    "pom": "sha256-arSo7K4qu9NrkZ0Lm5+yTBdxSPE+U2TJegxu4Ro/xCY="
   },
-  "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.6": {
-   "pom": "sha256-YqT2dSGQuevzCGngkuQVTkGixc2WBIrpigGRbyaERlo="
+  "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.7": {
+   "pom": "sha256-l1WeY50P1RQXexwWk5/r+SekKRl4WV++ghVJt9qW4vo="
   },
-  "edu/sc/seis/launch4j#launch4j/3.0.6": {
-   "jar": "sha256-ao8ADG/aLrF0BrUW7AvijNrJAMu6AzGeV708Lxsa+gI=",
-   "module": "sha256-Cjjh2qt5oytWeQ20WAiBSMl74CF2Ti0tziWbmof+wEg=",
-   "pom": "sha256-MhJ0+5apc3nprkdy0A7DMlBOPS/dQxlLUpQBlSzxcZY="
+  "edu/sc/seis/launch4j#launch4j/3.0.7": {
+   "jar": "sha256-FindaUYEC647rBn3bALPm+6K6Gs03MS0tSRZvQC9bMU=",
+   "module": "sha256-6KP/ycQQZv0fQECCq44nOLWTd5zEWgs167+oNQR/1PQ=",
+   "pom": "sha256-m/5KiCQa7IpuWr2Yi8xThXbLKt+oZR+JCfjP9mK+6eE="
   },
   "io/github/hakky54#sslcontext-kickstart-bom/8.3.6": {
    "pom": "sha256-vRw5cU+BlPtQbphtvneTcWRGaHhs4pdUPcLkj64hJA4="
@@ -379,9 +379,9 @@
    "jar": "sha256-jwE1ykXQDE2o57oultROGt5FK/J515yk61SSHo8nlSw=",
    "pom": "sha256-zVAKQncnlazpys4jPeQGGUMRdJR+MNLCRUVGJgA1ztw="
   },
-  "org/eclipse/platform#org.eclipse.osgi/3.23.0": {
-   "jar": "sha256-GsETVBoZ8McsBCH7JAWN78p+PG8oLl7nPxTSdoqa5lM=",
-   "pom": "sha256-tbuXndaxJrjJ1cDVe3aQyhZ0Bz0oQQk7lsWxz0QHEyk="
+  "org/eclipse/platform#org.eclipse.osgi/3.23.100": {
+   "jar": "sha256-kWT0D9C0JMryHKZRgYbSr4JpHyqN5FL4p9KQuVUoCiE=",
+   "pom": "sha256-gph5O0PkohKzeJ6c/dpZEqEGTCkPTgr4pUrLSNB5TuQ="
   },
   "org/gradle/toolchains#foojay-resolver/1.0.0": {
    "jar": "sha256-eLhqR9/fdpfJvRXaeJg/2A2nJH1uAvwQa98H4DiLYKg=",
@@ -534,33 +534,33 @@
   "org/springdoc/openapi-gradle-plugin#org.springdoc.openapi-gradle-plugin.gradle.plugin/1.9.0": {
    "pom": "sha256-tl5WbBE1MB1a3ZBIt2+eSkYygpKKJ27CMFDL64QIWd0="
   },
-  "org/springframework#spring-core/6.2.8": {
-   "jar": "sha256-J/ZANAFk10oOkO4Xa3XVoYqT+C+pb0RKdXrPC/Ouclc=",
-   "module": "sha256-Z+dgUMUIsQvUPED1WTTR11i0XckMfS+cWf5kUM7GND4=",
-   "pom": "sha256-UKMGvTWoEmZwr6/DytG4DmiLP87k8dWqyRnFXmMFdng="
+  "org/springframework#spring-core/6.2.9": {
+   "jar": "sha256-n6BiK69zjJtG9ITN3jXEqXoqZbHaRCba0NcH0KiqPZA=",
+   "module": "sha256-+5lrq7iG52t+OMFnjX56l1zPFhEqNSOH4j/DUSEF9Ts=",
+   "pom": "sha256-ICqzW5xlBtoYDyhv5ekO89+5YaOeJ+zXh9czWjhcOEo="
   },
-  "org/springframework#spring-jcl/6.2.8": {
-   "jar": "sha256-vYtq3RLbVGArxZJrhEmkj9kio2d4MjIYrqiM+upZHnI=",
-   "module": "sha256-0R9u5H4sR3gilGtExQq7Z1GGVXq0ACIkTeqpWj3yLBI=",
-   "pom": "sha256-QGqKA4/LD+B1dwiSfvsxtKvsbN600QUDPKB9Fq26hFo="
+  "org/springframework#spring-jcl/6.2.9": {
+   "jar": "sha256-iMWPc0UZ3z19ngdzO5HYOcQ9RZVRkj2T9LfJJli0FJg=",
+   "module": "sha256-KLyW4h4ir9Su1X/zMyrHHeNyx+6cL9KMF83P7O9aBww=",
+   "pom": "sha256-S+vO9ZVoqiHLAECvC5OjpXhwRe+cp+yHVguBo32mA/8="
   },
-  "org/springframework/boot#org.springframework.boot.gradle.plugin/3.5.3": {
-   "pom": "sha256-WWg4p9bncZN1Nszbgtxl3oQFD1wEzmi95HZ2Rq75vDg="
+  "org/springframework/boot#org.springframework.boot.gradle.plugin/3.5.4": {
+   "pom": "sha256-MiUJLNwqsFHTQLFT/eIT4s9Qb6mkNhawOLi3kZHrA/8="
   },
-  "org/springframework/boot#spring-boot-buildpack-platform/3.5.3": {
-   "jar": "sha256-MCYltvNXTOZn6Yi15ycwMK/gM78DGpBC47/dgqWICcM=",
-   "module": "sha256-hW6AhgN49EhQmkCnyf7Ha+r0SZtUp/fm7GTyvatQx4g=",
-   "pom": "sha256-g7dHrpe7eEtsrF64BnvxXUkaZZTBU2t8N/sr5dhU9Pg="
+  "org/springframework/boot#spring-boot-buildpack-platform/3.5.4": {
+   "jar": "sha256-bupy3Tv1oplEfocIZOvNfOH5Z1M3+Kro8kx6NVksVr4=",
+   "module": "sha256-iY4X66lUosCBI1K5qumZXtGGcnQ+dfsbnES7U4Sy6r0=",
+   "pom": "sha256-hLv3ntINSlskjp52jLTx1LeX6tE8IkEDeFVv9aHIuR0="
   },
-  "org/springframework/boot#spring-boot-gradle-plugin/3.5.3": {
-   "jar": "sha256-w+fQqLj6/xoeyuF2/eLCoX/t4ni9AB3fkp4fBNiVU9A=",
-   "module": "sha256-Q7GsSk+Vt7BLnbu5I7ouF13fxAMIJ94PHMfPwdcrJmc=",
-   "pom": "sha256-5Ds6Qs6Pon5hpIec5D/Wo+WevD339gc082O/flGZEyI="
+  "org/springframework/boot#spring-boot-gradle-plugin/3.5.4": {
+   "jar": "sha256-yoB5TEAF+kw5UOZkjlvgA3oGFzOa4QCIe0+7+5O+Jr8=",
+   "module": "sha256-WO+gcv0oA1PG8KC4pvuKg+zXH8czzQjYZlzl2wohL+4=",
+   "pom": "sha256-wzSyfBKXbo+vWx8fA5YOCHg8dHZxnBW9poYXuHTAgFs="
   },
-  "org/springframework/boot#spring-boot-loader-tools/3.5.3": {
-   "jar": "sha256-n+7KgFYmbcu7s1K94VbDvkCK/6OOq6dL8j4bdO2A9lg=",
-   "module": "sha256-lUDmmC6XmgT/DsmMDIBz5MsWiFyHzV/1aeRlrIAlKXg=",
-   "pom": "sha256-nJh5c1S3gJzyGDn1CInt1u925gn12u026+3jDtQ2xgo="
+  "org/springframework/boot#spring-boot-loader-tools/3.5.4": {
+   "jar": "sha256-d0oBV3fXAMkG8eqopg6DyPY3XeT4H+thhSmOTtw3mOs=",
+   "module": "sha256-7XSRc5qRqywvmrjh7m/N6L7Dy7xirmYrkrHOSFPXvqY=",
+   "pom": "sha256-U5dq5pyE17y5Geg8CKVPnUKR+LyMYWn+rhzinPapGG0="
   },
   "org/tomlj#tomlj/1.0.0": {
    "jar": "sha256-Mml8dWeykhxHNnioILE/xkcAqoe7FFdu60jQ7VhHz9Q=",
@@ -619,11 +619,11 @@
   "com/fasterxml#oss-parent/65": {
    "pom": "sha256-2wuaUmqeMDxjuptYSWicYfs4kkf6cjEFS5DgvwC0MR4="
   },
-  "com/fasterxml#oss-parent/68": {
-   "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc="
+  "com/fasterxml#oss-parent/69": {
+   "pom": "sha256-OFbVhKqhyOM86UxnJE9x9vcFOKJZ/+jngXYbn6qth18="
   },
-  "com/fasterxml/jackson#jackson-base/2.19.1": {
-   "pom": "sha256-tzFwCGYicYqn1sGsCpSbZVD5vRSkRnLBo/K457doLhQ="
+  "com/fasterxml/jackson#jackson-base/2.19.2": {
+   "pom": "sha256-/779Z5U5lKd12QJsscFvkrqB0cHBMX7oorma4AnSYUM="
   },
   "com/fasterxml/jackson#jackson-bom/2.17.2": {
    "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
@@ -637,8 +637,8 @@
   "com/fasterxml/jackson#jackson-bom/2.19.0": {
    "pom": "sha256-sR/LPvM6wH5oDObYXxfELWoz2waG+6z68OQ0j8Y5cbI="
   },
-  "com/fasterxml/jackson#jackson-bom/2.19.1": {
-   "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4="
+  "com/fasterxml/jackson#jackson-bom/2.19.2": {
+   "pom": "sha256-IgBr5w/QGAmemcbCesCYIyDzoPPCzgU8VXA1eaXuowM="
   },
   "com/fasterxml/jackson#jackson-parent/2.17": {
    "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
@@ -649,70 +649,70 @@
   "com/fasterxml/jackson#jackson-parent/2.19": {
    "pom": "sha256-bNk0tNFdfz7hONl7I8y4Biqd5CJX7YelVs7k1NvvWxo="
   },
-  "com/fasterxml/jackson#jackson-parent/2.19.2": {
-   "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U="
+  "com/fasterxml/jackson#jackson-parent/2.19.3": {
+   "pom": "sha256-I9GGyNjNBgFdAixxDHFUI9Zg1J4pc7FYcLApzCYBhoI="
   },
-  "com/fasterxml/jackson/core#jackson-annotations/2.19.1": {
-   "jar": "sha256-WjzXIRqyazYhP0OiqUvAUqM4WveAxcE1MpdBstealzA=",
-   "module": "sha256-GpQP75txqcrROLbmRlagMsS82A2DieBXDbP478JMftA=",
-   "pom": "sha256-19pMaD48eSc1pvS2xxwEF0XisdcDWQNQq5rPSufzyy0="
+  "com/fasterxml/jackson/core#jackson-annotations/2.19.2": {
+   "jar": "sha256-5RZ0OjFtz4PFcv/Jy26MXowTSIDIxRVbAvezTpxdw88=",
+   "module": "sha256-MZtf0wd2wFk8yNxajX4ITkuQcJpDUGQYQqu9WfyByBU=",
+   "pom": "sha256-SVAWGuCtZsaze8Ku0S0hxleeF3ltv86Yixm40MIjpck="
   },
-  "com/fasterxml/jackson/core#jackson-core/2.19.1": {
-   "jar": "sha256-xGNp4aIYEBAK28klA7YvFanvFkBCeTL0/hWI73zn5IA=",
-   "module": "sha256-SZrw5ZPg0uFL2SnjRJnXIqbtT0KxsJ4inrzUgCzsF60=",
-   "pom": "sha256-Ciaizbd+H4G9km0juNWGw5XPPYiRkyrXA3D9RhtIfRo="
+  "com/fasterxml/jackson/core#jackson-core/2.19.2": {
+   "jar": "sha256-qnfq8pKTqGjEc3IZT3xSh9d9k3CwTqJdP//B5JBLWIA=",
+   "module": "sha256-Ua8uZ3g6XXJETeajB8jj7ZMAklbNJ+ghkVVZohZcCUI=",
+   "pom": "sha256-gfatIwlG88U9gYwZ/l7hEcH6MxuRXEvajQGC5rT/1lA="
   },
-  "com/fasterxml/jackson/core#jackson-databind/2.19.1": {
-   "jar": "sha256-C8U5QB1SxrFOZolHyFHcxJ94pK2j0fyOj3FEBhP8Js4=",
-   "module": "sha256-XvVBTiXAofGXClB66vPoH8vMELeV2/fz8sO74iL0STw=",
-   "pom": "sha256-0FgUkLOlW0piD5Dx88rShW5vLYEOTntMrvCANYU5qMA="
+  "com/fasterxml/jackson/core#jackson-databind/2.19.2": {
+   "jar": "sha256-ChvU6bDWcOYy1A7oxiWtN2IzUC8DwvWIm66pXQJbR6c=",
+   "module": "sha256-xgFVg0SRj0CDS7bVg4EepsiDvwaigXmkx04voYswbGg=",
+   "pom": "sha256-2KebdQK2m/JQaEwZCpiCOJImaG1dlikGdW2BzVskO4I="
   },
-  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.19.1": {
-   "jar": "sha256-0NU4xbojWsiMjDxS4UbT1eG7zIuQ49dXzw2+OSJejQA=",
-   "module": "sha256-N6M5zx5Ne/wNuXaXz1ykZQB94HUFYMaSMqKJEBPLxrE=",
-   "pom": "sha256-TwERdtdCZj9e9Uqs+cCXrc2LZwpqjUjCEH6G1TZ7ggc="
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.19.2": {
+   "jar": "sha256-gKIT59mYJEkiq3vPCTjqA+t4aOiOLQWoQHxiKMiFo34=",
+   "module": "sha256-bpyu0tDwqryZNnVPNzN+Dxc2MdahWxjE2QRpVtZ1U24=",
+   "pom": "sha256-1UeZ1Ba/pn91wvGU3IgKE1dPvVXmQCqH45NImPebgM4="
   },
-  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.19.1": {
-   "pom": "sha256-IavO+hNWN28K4gqzheqg0inSqlm9CdTwi95GK7oL8Wo="
+  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.19.2": {
+   "pom": "sha256-F5LLcfGWGg/nXi21/CckZovisBQX8LzHOee1AOIoFAE="
   },
-  "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.19.1": {
-   "jar": "sha256-WWbAICKggSuHYdmZ5VEMCiadhxeMte9n4TjVTq1pZsY=",
-   "module": "sha256-NfdRzSF0kNdXNzJ2FGHbgUhFYuT9Ffqi4ITi5D4VFlU=",
-   "pom": "sha256-JmrQX3yLG3pGlIuGMD3jJgkXbvHHzBQLsIRnl4GGhrU="
+  "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.19.2": {
+   "jar": "sha256-YFX+8QdW6L0bDogHqh2IEzjGPKldWSceHaSSK5oXWB4=",
+   "module": "sha256-cJMXXvltnjxoFL59n5uQeZzGsd/JDqi8ZUVP9byleEo=",
+   "pom": "sha256-u2kaYgtZPgNo7zrOifnc1dY3VtXlvAXdyay3ih/Ny+c="
   },
-  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.19.1": {
-   "jar": "sha256-Nm64kGXVaKfA7ec8JqND8pPwdtL479DcacvldMoBIg4=",
-   "module": "sha256-ecqU3/ewblL4kY82bNhF8SrC9URx6FoI+8VnfgLDXMY=",
-   "pom": "sha256-Bb56epD6Z0lfYao8T73ptm/ql9IjrFafodODh1Ms1Kc="
+  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.19.2": {
+   "jar": "sha256-lwn0Pg+lYlYz7mbbbAePsejHygIJJpa6lep4Xb8PpqE=",
+   "module": "sha256-HNFClAh9xmpIvf8+t1CZyHsK0paspR6AgMuc3yCRF6E=",
+   "pom": "sha256-sa5Nojzw/imhXWUC4XcpfAssYp3Nlpy2RFfVVLZacS8="
   },
-  "com/fasterxml/jackson/jaxrs#jackson-jaxrs-base/2.19.1": {
-   "jar": "sha256-Y2kQ7D9GiwC8kr5r76XppyvtA7OUCdjkz7aU8RkG8Iw=",
-   "module": "sha256-Zw33hf/ew+GcghmGIqlVG258ARkCPRorbTmbhxy+W9M=",
-   "pom": "sha256-5jGnPLvVw3QuotbPBdP22w2W1Q+YNsSYeOhsQ3/2qos="
+  "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-base/2.19.2": {
+   "jar": "sha256-F/5iz/a/euqvdBNgCa9cS0mVSIxTe7bpKPcO2s7I4LA=",
+   "module": "sha256-1+OmfyY5twuE4/7bwZqTZKfMClnh7rl5lihDoARyjKg=",
+   "pom": "sha256-cuutsSEGvT1wp4JQT6g1ZL/R7oZHn5ZWPYMrnWt96rs="
   },
-  "com/fasterxml/jackson/jaxrs#jackson-jaxrs-json-provider/2.19.1": {
-   "jar": "sha256-umMw0UMMNSKc5uYmxD7F/fJIH3ZoGnrkaLev3T6dNog=",
-   "module": "sha256-2bmzwltzN9acdDOCjtJpWiao44JYDX2MS3CpeJzHv6w=",
-   "pom": "sha256-6lrdrW8N/Ohj+XQv5wvmpYH0ulvfH9QuhYLztcE2sZ0="
+  "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-json-provider/2.19.2": {
+   "jar": "sha256-HijzhVX1mtRm4Kwfcu/Lu+PBDqlQyxkf/mEnEdkUAWU=",
+   "module": "sha256-M175BcDgqqDbjhhISA6Vmk1dFMhX7sHxfiKOVa6Vmj8=",
+   "pom": "sha256-1PoVgsnhpl3tFj3+T52xhaC/XcYGSmOidrToKg7CM6c="
   },
-  "com/fasterxml/jackson/jaxrs#jackson-jaxrs-providers/2.19.1": {
-   "pom": "sha256-S9IB9uCHfkq/N4vY6GKnub1ZAzrz1ct7hlNy9tXTHiY="
+  "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-providers/2.19.2": {
+   "pom": "sha256-B2S/Gps0yugUzz8hO2oCKSBV4P0dxXOuixNfE/xre2M="
   },
-  "com/fasterxml/jackson/module#jackson-module-jaxb-annotations/2.19.1": {
-   "jar": "sha256-I2SEzaTzTHakpWkcRPu/uRLVD/EvhPwAYm1f4LYYOIY=",
-   "module": "sha256-6KEd2QDmFlLW+rcmi3bLQz+9LiBahSCKQ7qKww1z4Gg=",
-   "pom": "sha256-TrJIxeeB/6N3ThweMOL+UmPxLWlKqZcPivI0xu5+Ksk="
+  "com/fasterxml/jackson/module#jackson-module-jakarta-xmlbind-annotations/2.19.2": {
+   "jar": "sha256-u69EflB7FOb/s/dVxLHmD1I5nHPzM4BfNK+6Z+8XWSs=",
+   "module": "sha256-HhkceCnIbeQvm7s6uph3Gdgcs49aDZdx5nQFHka3EDI=",
+   "pom": "sha256-mRKux2ADWIe3cb5/imHAWPOSt6WClRANzzqay8nAKec="
   },
-  "com/fasterxml/jackson/module#jackson-module-parameter-names/2.19.1": {
-   "jar": "sha256-VerdSgCK3WhuJMWWP6w3pbSW7qMg908JKgWa62/uzW4=",
-   "module": "sha256-8dFVuOZTQyMSNPq5ey2HRQcKeJR+y+SB7wDYGrEQl9k=",
-   "pom": "sha256-QsJUJTElM3zY0qlDQ0p+b6cMNzMbC8ABYaZmmr64OQs="
+  "com/fasterxml/jackson/module#jackson-module-parameter-names/2.19.2": {
+   "jar": "sha256-XK/vmHWbQKQYYx6RJXkwpeMKvBYtmmkMHjZdu9rN/ss=",
+   "module": "sha256-OqrxKhsJMj016N4m7fuiqZb3UtLmR8aqNeQj8Ir8RaI=",
+   "pom": "sha256-aHbM5vRN6SArRmfQuSJhkKlmCct4Z2jLUhyQ+TjStEE="
   },
-  "com/fasterxml/jackson/module#jackson-modules-base/2.19.1": {
-   "pom": "sha256-uyZ0KcR5L6jp8JcSsoxGbRtN5eIBrOXih8ET+KaWM0Y="
+  "com/fasterxml/jackson/module#jackson-modules-base/2.19.2": {
+   "pom": "sha256-V6S5QhVKz4VVeikvO4O3cnMAfjxwJak5UDScL9GoYVo="
   },
-  "com/fasterxml/jackson/module#jackson-modules-java8/2.19.1": {
-   "pom": "sha256-f8Z58ae3RvkFv2oMXH083ayiNnFadWqMwB6LilDxlU4="
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.19.2": {
+   "pom": "sha256-o8wywUW5Yr45UE+FNsrGISTry1rVAy2TC8ck/flOgqQ="
   },
   "com/fathzer#javaluator-parent-pom/1.0.1": {
    "pom": "sha256-YRV0qFwGU9vwoDS7iJ9LrCZr0oZz6EZ2w2o6TNqWLfg="
@@ -783,16 +783,6 @@
    "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=",
    "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU="
   },
-  "com/google/protobuf#protobuf-bom/4.31.0": {
-   "pom": "sha256-Y9iGmhie8C2+3XxnN+FsGYa0aYOufQyNG+8s92sz2Ac="
-  },
-  "com/google/protobuf#protobuf-java/4.31.0": {
-   "jar": "sha256-aHc9zNbMWDWvenSHWc7PXqIP8IMTbjhH++lFcrjg7Wo=",
-   "pom": "sha256-aElbKMVNzVwyTQxRb7igjQoaJWvNrIFIN+ciYfEqCdM="
-  },
-  "com/google/protobuf#protobuf-parent/4.31.0": {
-   "pom": "sha256-H1mhQuar05Jar9Fo25tU0QhP7MhPW4DU3jVPrJ4I/Lg="
-  },
   "com/google/zxing#core/3.5.3": {
    "jar": "sha256-jYBkwWNv2u9xid2QVcfVmVColAoS8ik5VkRuw8EJ/YI=",
    "pom": "sha256-2KEui/aQVOKt0j15U0FOrv3azskwFAqNFE0frJ5it98="
@@ -844,9 +834,9 @@
    "jar": "sha256-/ulOrlxDiOHef7qE462iuS0Xu7soxjDUJYpvBhXB8wM=",
    "pom": "sha256-lusqwKOmi0Q3mu+oa2yc+RSDQI7OAafKUbbUL0NTE2k="
   },
-  "com/opencsv#opencsv/5.11.2": {
-   "jar": "sha256-aQ2q2QFPI6/Tq28bDEWl4Lc4rDeo0ugQ4ZYZOqtSEkU=",
-   "pom": "sha256-7R1yJ8M/+FEcPcUdjhz2eSQWLbrj5SJXVUDDA0lk9P0="
+  "com/opencsv#opencsv/5.12.0": {
+   "jar": "sha256-8cVdgKksjs/j8V+3F4XVsVbzZ0y1ua1V3P03j/7tKWA=",
+   "pom": "sha256-jDRlqCORTWd4BEK/+OtBsTc7kbvH5dHmXD1aQYJYsqE="
   },
   "com/posthog/java#posthog/1.2.0": {
    "jar": "sha256-gnEBAD2F9li1yqwPI4IQ/ySEhjR+qVSd6kvBPHWfYao=",
@@ -855,8 +845,37 @@
   "com/querydsl#querydsl-bom/5.1.0": {
    "pom": "sha256-iFPc4TLJ7OTClcf01PPCgy7uDX1EkwhwwGZvpyBDylY="
   },
-  "com/sun/activation#all/1.2.0": {
-   "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ="
+  "com/squareup/okhttp3#mockwebserver/5.1.0": {
+   "jar": "sha256-G2borGTkZvmZEIc18LmJimnMcC72fkw4/kCbIMiFFZ0=",
+   "module": "sha256-ipcclyF1DeyXnSSki8HHRh8YDtlaLVtznf4Vi1nG19E=",
+   "pom": "sha256-yS6Pf5detLm1QxVvSvLBvOk+6E8WYEqd2gC/SoaKMKc="
+  },
+  "com/squareup/okhttp3#mockwebserver3/5.1.0": {
+   "jar": "sha256-Wnoe9KCQVGrYxHTgAgAsRCIDkXOX2H4iTO0IJs6BjBs=",
+   "module": "sha256-9bxywtyX2KN8ZYB2qcHeGszRz+2KH4DCbDaED5rUaWo=",
+   "pom": "sha256-QshrUsh8YTGnUZqsLR2fqKoJ9I0iqwXy4SbcODrxDkM="
+  },
+  "com/squareup/okhttp3#okhttp-bom/5.1.0": {
+   "module": "sha256-Q4ZC6S5XAws0WG7Sk7jRHaZ57+gAdFzka3bWE62TAjM=",
+   "pom": "sha256-8kla1GUhJpF5geGuSSIezJ3ctP47vCB75h1B69zqB4M="
+  },
+  "com/squareup/okhttp3#okhttp-jvm/5.1.0": {
+   "jar": "sha256-pqrH8V08LDy9Kvfs9W+XQHFkpgSy24eVKZUOMc6mmbI=",
+   "module": "sha256-sulz7WEYTDMNpU5+YuW6STQLZkh1x8PiLfjvSWB8TXA=",
+   "pom": "sha256-aNCp1oSYz/jQM+gJUKihDamZiE6Y07RMiNDpsAUd4nA="
+  },
+  "com/squareup/okhttp3#okhttp/5.1.0": {
+   "module": "sha256-9Lg+E7Rr8Q9cccDL82M54X4ttXZwDaNElfulX063g24=",
+   "pom": "sha256-hwO2W8qKgsj6H3DHt4FTtAx5FrKQUS/PmA5/IaZQpzc="
+  },
+  "com/squareup/okio#okio-jvm/3.15.0": {
+   "jar": "sha256-SD3Dg7EEnSIIkjIqDWpDCEJfCbsFtIxD1Oqp/4KxzRY=",
+   "module": "sha256-mJRUqUrvvClwMoiPE1rNoUqf+0aWDn2EYDkl0mkkHuc=",
+   "pom": "sha256-B45C9oykYT/yWX+8VUHFzleM3MSIOdqJ2nynYFGL+3k="
+  },
+  "com/squareup/okio#okio/3.15.0": {
+   "module": "sha256-EWgmBmzrTTM2p05xcqM3UWF+w0S8UKNPmbDSSVmko50=",
+   "pom": "sha256-LXN4VBFATurDLwRzouB6sVFrmFCpKAzGGgi0eXkMzPg="
   },
   "com/sun/istack#istack-commons-runtime/4.1.2": {
    "jar": "sha256-f9Z5I2H03QD4xWr0ogzswAZt7qSo897Dg0ivI/wilu4=",
@@ -915,6 +934,10 @@
    "jar": "sha256-eX0Ca2fQfm1esAoatTpVrKq2+Apxxe4yVXIJPrkMDKo=",
    "pom": "sha256-kIUqjzz4kZBqjShwC8/EQ/EZd1iEbm7lZR1pHBNCrpw="
   },
+  "com/twelvemonkeys/imageio#imageio-psd/3.12.0": {
+   "jar": "sha256-5JHRV29RfoJ7QF6kDixPCtgN3Z8Z8N1Ths7ujU44BrA=",
+   "pom": "sha256-qkA91Ia3q5x8CaQ4Ft3kRP/A2xjb10GqaxxtPkbFBuU="
+  },
   "com/twelvemonkeys/imageio#imageio-tiff/3.12.0": {
    "jar": "sha256-Aaxjgd4slWA8s8FcOxOW4o98PfEKn/VbAXw2ZjqdtFU=",
    "pom": "sha256-avhVDUjIV5T6hW0LxeFbLpB8l6h0YV+t8qIQ/yRFHeQ="
@@ -926,16 +949,16 @@
   "com/twelvemonkeys/imageio#imageio/3.12.0": {
    "pom": "sha256-ZI62q9rpluXh0kjqy1Gk3LYD4uwnHK6Mjh8PnLpK+Pk="
   },
-  "com/unboundid/product/scim2#scim2-parent/2.3.5": {
-   "pom": "sha256-/k3AAkw1gewN9XKK4XbmBjvEesC0r9kdIII9gszv4Ec="
+  "com/unboundid/product/scim2#scim2-parent/4.0.0": {
+   "pom": "sha256-o9YzwXQew9r99i1evD5ghBReUrO6MSUREddRSZYsL6A="
   },
-  "com/unboundid/product/scim2#scim2-sdk-client/2.3.5": {
-   "jar": "sha256-LydloQL7DSy0Zu6S7zAZjJdKTnLqSsRJabj1lZS0mAI=",
-   "pom": "sha256-YECc/qG77WF4rs0hGx+ab6X3dl8fesBbH7rVexTO3ss="
+  "com/unboundid/product/scim2#scim2-sdk-client/4.0.0": {
+   "jar": "sha256-sEFKJ70F8vPfpJBFJv/K/NVra+yEf4J13a/lCwTYeVI=",
+   "pom": "sha256-ldZaPxEMv5wIi4pzDfzKe1BBVW3SCNf+5whRWfekA8I="
   },
-  "com/unboundid/product/scim2#scim2-sdk-common/2.3.5": {
-   "jar": "sha256-yRO2R98bGeAz+dbJXCdZgVAwAoshR3xwIT0QRQn8T44=",
-   "pom": "sha256-sz540r/yDCSsQ4KrkJH9SxnW2U8ysZXymbpCqkmm7i8="
+  "com/unboundid/product/scim2#scim2-sdk-common/4.0.0": {
+   "jar": "sha256-E1UnLOm8lOhS6tweMUN+audxMNQx+DLpWABg9mJyY64=",
+   "pom": "sha256-1cOhULJJCJ1AVVuWVEWCHft0eW/ulQ9zyoNt5FPjmJE="
   },
   "com/vaadin/external/google#android-json/0.0.20131108.vaadin1": {
    "jar": "sha256-37e64vQEz+C3K00jlEaYy3FrdmUXGBKgpND1kmwPrHk=",
@@ -1028,9 +1051,9 @@
    "jar": "sha256-MTOHjRCPDhlk19Qn83mnQz4bcaRfnzwfq37QrAMB07A=",
    "pom": "sha256-wwO7cco5tSiAann47wLaSpTxklt11Bh3ojRNsbwiWpI="
   },
-  "com/zaxxer#HikariCP/6.3.0": {
-   "jar": "sha256-B8Y0QFmvMKE1FEIJx8i9ZmuIIxJEIuyFmGTSCdSrfKE=",
-   "pom": "sha256-F8+ZOdJTM0af1/Yok6f37tnqDIm5UWsEmfQO6xzATfQ="
+  "com/zaxxer#HikariCP/6.3.1": {
+   "jar": "sha256-D5KKM3drMX6ySNeV7l7/JgWQaWqfhJMKJcqVy06vSS4=",
+   "pom": "sha256-FmMuPVHzp8DHIwIxPeuzKN9Okrpsotmhl2s5+vblS0Y="
   },
   "commons-beanutils#commons-beanutils/1.11.0": {
    "jar": "sha256-nkS6aOyaPyEob6Kou7ADtzXA9pEBu0MUS3n0+KqnRwk=",
@@ -1052,6 +1075,10 @@
    "jar": "sha256-gkJokZtLYvn0DwjFQ4HeWZOwePWGZ+My0XNIrgGdcrk=",
    "pom": "sha256-VCt6UC7WGVDRuDEStRsWF9NAfjpN9atWqY12Dg+MWVA="
   },
+  "commons-io#commons-io/2.20.0": {
+   "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=",
+   "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio="
+  },
   "commons-logging#commons-logging/1.3.5": {
    "pom": "sha256-zPSjA0b1AnuUlqvVYpCsJtFZq/K+ZN8SZWEdyUALnWg="
   },
@@ -1079,40 +1106,40 @@
   "io/micrometer#micrometer-bom/1.15.0": {
    "pom": "sha256-H+qJzHE6YZj3tiIgvwnpgU5On5PkH+0+HFjs1L3BwYk="
   },
-  "io/micrometer#micrometer-bom/1.15.1": {
-   "pom": "sha256-zyAs2JX9e0E38JXA2iO98lJCyv+elOFP6Z9yTWk4+NQ="
+  "io/micrometer#micrometer-bom/1.15.2": {
+   "pom": "sha256-twLsZrQLHux0/j62hRyAEeBiXaz8GJGvMILc3lN/0Ik="
   },
-  "io/micrometer#micrometer-commons/1.15.1": {
-   "jar": "sha256-Z5k4HAgJp0uA/Uv6oQtCePatsDMaZBAT/4nf9MwfNIQ=",
-   "pom": "sha256-d3E+2hRFG62gnh0JlD9QkZgw8sOulPkPdFE1x8seNqI="
+  "io/micrometer#micrometer-commons/1.15.2": {
+   "jar": "sha256-wg6wKbPnT+JheVRntCDyCyBioCXazQPXYRVrnqbUogU=",
+   "pom": "sha256-Wy48iWx3MdeBRnZX5e8A+KuaaIkAS/rD0pySKRn7hLQ="
   },
-  "io/micrometer#micrometer-core/1.15.1": {
-   "jar": "sha256-XZ+8F2ZN6DnAYuLTuQmpNYqWv8jORu/YYRPq4dmKVIM=",
-   "pom": "sha256-PihGXK8e/9h8eReS4SC+MKEZ7VMf3ivz25p4HuAQPwg="
+  "io/micrometer#micrometer-core/1.15.2": {
+   "jar": "sha256-dURQO0Zj3B38IRts4j9RQQRL2vXjSIKjJj6EGBKQ1bo=",
+   "pom": "sha256-KAgTD0KOAKYJG4/RHNcVtp1Yo3v+QJzBxEE8ZAWlOEg="
   },
-  "io/micrometer#micrometer-jakarta9/1.15.1": {
-   "jar": "sha256-YsQLtBSthf0aZxLbPlIIutgwMSNXwDsKMCPPakKtPZg=",
-   "pom": "sha256-nIHGs3rUbnIk02lTqB/UTA7BiWsJ1SeSvYJBXa7StwY="
+  "io/micrometer#micrometer-jakarta9/1.15.2": {
+   "jar": "sha256-7QEZL2+WsWHUDxoxwK4uueKExM/JAFazBOp2ztCMKAg=",
+   "pom": "sha256-XOoYxJdRAjtXK0qarJ5HIPmGvDTBGhOM4O0wI39OLXs="
   },
-  "io/micrometer#micrometer-observation/1.15.1": {
-   "jar": "sha256-UAixPbmQzao/obb1GPb5U1p+qEQhQkoqJaqIhw/7sx0=",
-   "pom": "sha256-G8EWY/kTpkzKPigM38VsteZBrM4lY9sTQArtoLNRsOc="
+  "io/micrometer#micrometer-observation/1.15.2": {
+   "jar": "sha256-+OhHoQ5ZdLLJ/9cWnpZ/QUGMX9/q8wqXk3tdgqXSfqY=",
+   "pom": "sha256-nFgJTExUxv30KB01Y+pSOlP99kN6et+mYjIcNW51FdY="
   },
-  "io/micrometer#micrometer-registry-prometheus/1.15.1": {
-   "jar": "sha256-Ueo6qW2fMyOpei2f8LFBzOmgvPzMsECPzG55uz+TX10=",
-   "pom": "sha256-EdqwAogTeJBuk3dJ/KJZR43NwVBplmrM6/Ci8YW3Nvg="
+  "io/micrometer#micrometer-registry-prometheus/1.15.2": {
+   "jar": "sha256-6f0KbTZnCVnmZ7NZNcg68HwhI8h/7aNn5wo4MaeONo4=",
+   "pom": "sha256-TLrR5Psk9sjkBSE59YefoK447TgmCxSaJblF5rWxnx4="
   },
   "io/micrometer#micrometer-tracing-bom/1.5.0": {
    "pom": "sha256-k+Ys3TNXFWIy0k5eup6d98cPByuDzlWQ309wzDMTxRY="
   },
-  "io/micrometer#micrometer-tracing-bom/1.5.1": {
-   "pom": "sha256-uX2lk99Ek4KiziTjyxd9iUnp0X3fGoE15fR46F9Eims="
+  "io/micrometer#micrometer-tracing-bom/1.5.2": {
+   "pom": "sha256-tSr7aZ4uHapJr7B1RaXmP3tk3FchGZoxmkf/bY0+DQU="
   },
   "io/netty#netty-bom/4.1.121.Final": {
    "pom": "sha256-E24RjGngF0Wbor28weVaD9w2dD1X8oqOoWKpjR/LtjM="
   },
-  "io/netty#netty-bom/4.1.122.Final": {
-   "pom": "sha256-9dWgNLzihhYAV+5ip4SI0T8Rvu1s8sOkJ5C4yXTDOfM="
+  "io/netty#netty-bom/4.1.123.Final": {
+   "pom": "sha256-QSOrLmgHrP4/8MR2qSDvNJpRfW44Zw/ghMB4Q88CmoI="
   },
   "io/netty#netty-bom/4.2.0.Final": {
    "pom": "sha256-+q0GIXkS4qfLmTtFIAp5y9JRyXsEMzuLm5njcK8Vfbk="
@@ -1145,58 +1172,54 @@
    "module": "sha256-SmzH3USA/8rbi6nJJvpzDUSiStIfXO335N3GsVGFK+o=",
    "pom": "sha256-mXj/ik3ahXpRQu5TzNFcfKRcthBPDxk2hW7PDbKVTIY="
   },
-  "io/projectreactor#reactor-bom/2024.0.7": {
-   "module": "sha256-P2pER1DcqmSrs23UesbzyW6c1A9ioP38l95c4AEzrLw=",
-   "pom": "sha256-EjnKotXk2wuTByGlj8nLzRPlKKsz79IpkV8jvqHR0mY="
+  "io/projectreactor#reactor-bom/2024.0.8": {
+   "module": "sha256-onmpIDKNPIy17RaQjC2qUnSW7mXaps/KU/EgH5mT3W0=",
+   "pom": "sha256-iiHv9l7zUUGqBNnTZJQHsLl0rAga0ef//Uc7ua0vYYM="
+  },
+  "io/prometheus#client_java/1.3.10": {
+   "pom": "sha256-YFsiNUvY7QBXYpb2c3+NWRbeGgpW1PeXKjZhVNL2vL4="
   },
   "io/prometheus#client_java/1.3.6": {
    "pom": "sha256-n/AOSQfYUE9Rt6u2o9wns7fLZQmOWb7Nt14TjjPHR0I="
   },
-  "io/prometheus#client_java/1.3.8": {
-   "pom": "sha256-60owtJle0lT10JLQF+TQJ08RepqVy5FnHXlVmKuQOD8="
-  },
-  "io/prometheus#client_java_parent/1.3.8": {
-   "pom": "sha256-+q6XtUqTBosc3cL80aGDyosENCMSTah/uVJyBpPT1Hs="
+  "io/prometheus#client_java_parent/1.3.10": {
+   "pom": "sha256-4RZbobMV4GzPRpIvqwgXbQjlLh71KFDosQ73bWUmcxY="
   },
   "io/prometheus#parent/0.16.0": {
    "pom": "sha256-citVEZCXsE1xFHnftg3VSye1kgoa63cCAnxEohX/xZY="
   },
+  "io/prometheus#prometheus-metrics-bom/1.3.10": {
+   "pom": "sha256-fxdFY/rwQL6XbdH8XdyOIHdmFJ3F7FwdDxBqhKvKA1A="
+  },
   "io/prometheus#prometheus-metrics-bom/1.3.6": {
    "pom": "sha256-7F7SHKoBR1WFBiSTeY7gQUX7wUmkUNXFMWnASxUCg2A="
   },
-  "io/prometheus#prometheus-metrics-bom/1.3.8": {
-   "pom": "sha256-ov8f0cDGkY3h06VIUvMzxc5ewPD6yjTzV9CgFxFMddQ="
+  "io/prometheus#prometheus-metrics-config/1.3.10": {
+   "jar": "sha256-0g6nOfGvEw1n1qjmeg/QAWnNTmLcp/opxfKuZWt1h/k=",
+   "pom": "sha256-VO/sLQcCS2Xb6En74H9qVE7qbNtoGfCxuEGrA3cUYXM="
   },
-  "io/prometheus#prometheus-metrics-config/1.3.8": {
-   "jar": "sha256-x3FguIgdaQbFtBRCesG/8cZAGfXrBocYjRE4yGFI6P8=",
-   "pom": "sha256-rzgEM1T3GWFU0WVM83hCXFfhvqRsKYE+AkpBWBKaykg="
+  "io/prometheus#prometheus-metrics-core/1.3.10": {
+   "jar": "sha256-qFbbrZVCIqg1yQhavJoTZYbrYElfF++KyQPfuL47TxU=",
+   "pom": "sha256-eGr/4vOYRHtfZRJa3WnRPnPltUiSEcI/5QbNy81adO4="
   },
-  "io/prometheus#prometheus-metrics-core/1.3.8": {
-   "jar": "sha256-YEgaSBVhlaXJ8h2+7ItK/5C6JTJ+xmo9zQ+qW/aYIp0=",
-   "pom": "sha256-Y0oFLLJ+K5r+htElwu5Z6v0FheHpDroKGx7T8+8rWfM="
+  "io/prometheus#prometheus-metrics-exposition-formats/1.3.10": {
+   "jar": "sha256-qXDW3gCm+jybYuvsHkX3DUK4jRahnl7xYhwfnom6PJ8=",
+   "pom": "sha256-CZ+chtmNOUVyIORNjKc6t8V8ZkP8CTgPNBQBJNAamfU="
   },
-  "io/prometheus#prometheus-metrics-exposition-formats-no-protobuf/1.3.8": {
-   "jar": "sha256-d9274XIRaxciDsJS/dwW76BaC7zDMUoyGmvOfSokt5w=",
-   "pom": "sha256-0RnU3OEkJEAotm8RnuBtN0vyDsapoMID+EcA60Awnys="
+  "io/prometheus#prometheus-metrics-exposition-textformats/1.3.10": {
+   "jar": "sha256-jdEYrBWkFirFhvQv9p6Mo++osSkdhwyJpnj49y3mLkQ=",
+   "pom": "sha256-YUngXBd2mH3DDor5NcmzwG/8ho3dlX0BZlhQ6JK3N20="
   },
-  "io/prometheus#prometheus-metrics-exposition-formats/1.3.8": {
-   "jar": "sha256-XILAVB+m/BJnvhoEsgh/PaEZbaViSyEkrI+dLsviWJc=",
-   "pom": "sha256-4Uytrh4MAVRNuv79nCXQRzOnziQUXW1b0PIxYdj7oyg="
+  "io/prometheus#prometheus-metrics-model/1.3.10": {
+   "jar": "sha256-lFrOSMyNnQn4e6wNj7vBPnCynFx0sQPG/uC53wk0MUg=",
+   "pom": "sha256-c4iWGZHffX/eXgWKGmrNY/GlNBQt55V1OulJS2qCMPc="
   },
-  "io/prometheus#prometheus-metrics-exposition-textformats/1.3.8": {
-   "jar": "sha256-22Ku1LFGzW9AtRyfgKW0qSfNNXMo9WHW6bnhZFiot54=",
-   "pom": "sha256-hFGeJbaT5eOiRkGVpjdPRzYHFuKtPpGo7JONl2HJ7hs="
+  "io/prometheus#prometheus-metrics-tracer-common/1.3.10": {
+   "jar": "sha256-g1gmpXKNnahRIYa2dnbSumiChxPwwAUHU84rxxjdmss=",
+   "pom": "sha256-DW2qpg0nDJ3/ctK5LVDt2kJkMqzdgZMi3WMUB/ZJseE="
   },
-  "io/prometheus#prometheus-metrics-model/1.3.8": {
-   "jar": "sha256-poZ8sEKZ4+Ro4mWIVI6SFRYzc+CljxtzAd1Z/m82SPo=",
-   "pom": "sha256-cqktzkjOAhfng+WYEo651v5/qxPaqzqNh929IjvBwF4="
-  },
-  "io/prometheus#prometheus-metrics-tracer-common/1.3.8": {
-   "jar": "sha256-zqcUY/XxrQCe8D0atgaTqU3kmOYwbzr37YFCCT8JP6s=",
-   "pom": "sha256-gbwK058pcQpHF9lkUs03tIIxa3b5SBrUuH2NXnkHF3U="
-  },
-  "io/prometheus#prometheus-metrics-tracer/1.3.8": {
-   "pom": "sha256-jawNvVgxQ0HmyEB4Cryp4hj8mvhJz+lOZ2kzgjY/ZUk="
+  "io/prometheus#prometheus-metrics-tracer/1.3.10": {
+   "pom": "sha256-zLTQvWx+DakhqZ58n8cKpIHdVCPJpRvEgLqFa2PyJjI="
   },
   "io/prometheus#simpleclient_bom/0.16.0": {
    "pom": "sha256-r0QdMpXeEacONf6+s9kZui7RdVJ1MWMyW5VNU1lNVcM="
@@ -1224,31 +1247,31 @@
    "jar": "sha256-Kj8W8gxlZ+Pl6aFGrO+Naqccq2i66mIVVqwtN5eOBuI=",
    "pom": "sha256-zkarwk7RoI41icv+ZIoG6siRdcUSKr2KMAN1xMFGwqI="
   },
-  "io/swagger/core/v3#swagger-annotations-jakarta/2.2.34": {
-   "jar": "sha256-gwqYACzK1T+mOjfI1jHrMO6Fe5sUNijzxb3SC0VRSis=",
-   "pom": "sha256-vV1hXreqsK51njCnxD66EyEJgOTPFeFBczlEBBsOSjE="
+  "io/swagger/core/v3#swagger-annotations-jakarta/2.2.35": {
+   "jar": "sha256-bsUqoDuFykUiLyAcONYef67a1f8B8hlG2a3o8pLpEgM=",
+   "pom": "sha256-LtGQ3ongUea3/FM87okuzvKvC+WEMMJ5A5tVSMfWF5o="
   },
   "io/swagger/core/v3#swagger-core-jakarta/2.2.30": {
    "jar": "sha256-r25tXOLOhloCK6ucyGUr37yy3EV5Y4e8sfPFwq0/oS0=",
    "pom": "sha256-N2XJGY3xaAAipHZkBV/UhMJeEBj+lBhm9tlpdk36ri8="
   },
-  "io/swagger/core/v3#swagger-core-jakarta/2.2.34": {
-   "jar": "sha256-T8tn+V/j66iDgaAWJO5VSM6uD5gf9JvArPWB0Hs5Ymk=",
-   "pom": "sha256-nPjmVzVhjUW0Slj2DwjLUxKhq9/UOCz/9xPHluLh8DM="
+  "io/swagger/core/v3#swagger-core-jakarta/2.2.35": {
+   "jar": "sha256-Sgdrsb5nPwJaTo1o7uWNeGnDrqZDiPAgnulV8VQclnA=",
+   "pom": "sha256-V+BWLzItPbYKBg5kmJ/s66MsOQDDpjzGhD2W/RWL3e8="
   },
   "io/swagger/core/v3#swagger-models-jakarta/2.2.30": {
    "jar": "sha256-6W0DFIPL2iLe6qUVe8c9bUa/zKLS6VWrVqGYsq5VaT4=",
    "pom": "sha256-r1mbT8wHHfALCtSzZox964H8eq7Q9x4UtMC8eUo2uuI="
   },
-  "io/swagger/core/v3#swagger-models-jakarta/2.2.34": {
-   "jar": "sha256-47VLQ40K7Pt5y3OWpP6WYCxzoZGEBs75yDsQGvhLJ70=",
-   "pom": "sha256-fG/IOHbZMh6ibsd65UR0ni8IGwLA+1/8gdcgf0hkuoI="
+  "io/swagger/core/v3#swagger-models-jakarta/2.2.35": {
+   "jar": "sha256-NLI/JH+RIfYs0Vc57ph9wHXP0tAPZVEXqA/JY+3r7zo=",
+   "pom": "sha256-xsHLz+yBYjXqpU8XMtx5Wo0SLtcERzfiXA6siyMjvAg="
   },
   "io/swagger/core/v3#swagger-project-jakarta/2.2.30": {
    "pom": "sha256-kOQyeN56U2nxatUzv+fF9NK/tLUShQdsgZIlBWFN0eE="
   },
-  "io/swagger/core/v3#swagger-project-jakarta/2.2.34": {
-   "pom": "sha256-iJTzEzkozDxXNQE/KQqwhohQv+H8LgwCO3lQDZY+oz0="
+  "io/swagger/core/v3#swagger-project-jakarta/2.2.35": {
+   "pom": "sha256-U88sJYzWA/GxODbHCnq4s6kUrqTiQx4Fh8x/kzUPZIA="
   },
   "io/zipkin/brave#brave-bom/6.1.0": {
    "pom": "sha256-iUcmZppvAAqtW1/P97rsP42c9wAag9D0gFSxLxbhbpM="
@@ -1334,16 +1357,9 @@
    "jar": "sha256-DWvP5Hdj6FBHrPfDmDNtyE/4XrytCny287nT6YEkVAY=",
    "pom": "sha256-q3Jz4mpUgks7czPUlW5uzSbeE6XrPZDuYwIxk6ktcr4="
   },
-  "javax/activation#javax.activation-api/1.2.0": {
-   "jar": "sha256-Q/3vC1ts6zGwQksgi5MMdKtY+sLO63s/b9OuuLXKQ5M=",
-   "pom": "sha256-2ikm88i+iYZDzBCs3sbeCwNRpX+yc1dw+gF3sGrecbk="
-  },
-  "javax/xml/bind#jaxb-api-parent/2.3.1": {
-   "pom": "sha256-zRvqpFYNxN/bgmudgJ5GTbIlJt+1QmS654pv9++wjh8="
-  },
-  "javax/xml/bind#jaxb-api/2.3.1": {
-   "jar": "sha256-iLlVoN9XiAomp0cIvDT3Tcr46/TniEOii1Dq6UVzKwY=",
-   "pom": "sha256-ErIM+SJ3NEXDRFwog8v2cfqYIRHpv5+HUCD5MTs4FLE="
+  "junit#junit/4.13.2": {
+   "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
+   "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
   },
   "me/friwi#gluegen-rt/v2.4.0-rc-20210111": {
    "jar": "sha256-4UwfKiQ4Q0k11th8aBqCtWI9t8R8o84f9M1wIwqxqlE=",
@@ -1372,12 +1388,6 @@
    "jar": "sha256-0mOCqDnLJtXGKgsPBHFbzvVaUx+WrGzkDeRSocBTnnA=",
    "pom": "sha256-UExH3b8VsOc8ymO52woBwSp83n+LM6DF2dW1BtGUaz4="
   },
-  "net/java#jvnet-parent/1": {
-   "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78="
-  },
-  "net/java#jvnet-parent/5": {
-   "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
-  },
   "net/minidev#accessors-smart/2.5.2": {
    "jar": "sha256-m4p7xDhh1hVsAhFm2UH7fd2+RGPi+l7ogHfksBRSqDY=",
    "pom": "sha256-/SIDhF6kN2wTbSdgrqXyBp+W/2gIcaQwhl4CWjD9h5g="
@@ -1429,9 +1439,15 @@
   "org/apache#apache/34": {
    "pom": "sha256-NnGunU0GKuO7mFcxx2CIuy9vfXJU4tME7p9pC5dlEyg="
   },
+  "org/apache#apache/35": {
+   "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg="
+  },
   "org/apache/activemq#activemq-bom/6.1.6": {
    "pom": "sha256-FcLWnzVyE9bjsHEq+H31cfDY21mE0RSwoiD/LnSdxUQ="
   },
+  "org/apache/activemq#activemq-bom/6.1.7": {
+   "pom": "sha256-YnqWon/U8rqaU6ffSHhifVbP9At4mygzVBgMS40quWY="
+  },
   "org/apache/activemq#artemis-bom/2.40.0": {
    "pom": "sha256-FYsprPZ3D9dMshRg2A7bOn9lpEjunmFIS4e6hXXiZBg="
   },
@@ -1457,6 +1473,10 @@
    "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=",
    "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw="
   },
+  "org/apache/commons#commons-lang3/3.18.0": {
+   "jar": "sha256-Tu6ujSDAeKu2SwFewVit04OsWBVxzdxFxo8MmuAjByA=",
+   "pom": "sha256-qiVLNztvbUa8ncqGMxsHKoq4brJeqZIf1Dlhg5LpihY="
+  },
   "org/apache/commons#commons-parent/39": {
    "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac="
   },
@@ -1484,6 +1504,9 @@
   "org/apache/commons#commons-parent/84": {
    "pom": "sha256-kjn7lxAdsnBw5Jg9ENM6DpHPZ2ytkb9TgVQiw1Ye+bE="
   },
+  "org/apache/commons#commons-parent/85": {
+   "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U="
+  },
   "org/apache/commons#commons-text/1.10.0": {
    "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=",
    "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc="
@@ -1500,9 +1523,9 @@
    "module": "sha256-b3I9IpHN+uqPpoZ/frp77Klvt4SQXfvikjG0eW7I6RE=",
    "pom": "sha256-uJshtYixe2Q/ou7HxAbgoah541ctzuy9VU9aB+IfV4Y="
   },
-  "org/apache/groovy#groovy-bom/4.0.27": {
-   "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=",
-   "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs="
+  "org/apache/groovy#groovy-bom/4.0.28": {
+   "module": "sha256-gw04aMOee7MP9lNeilum3ufZuBujtEuq8Q8VBqcgdFo=",
+   "pom": "sha256-8wUszlm1mdU2nk/B2fsun6OVqo53K+3C3NeQfNGKPQY="
   },
   "org/apache/httpcomponents#httpclient/4.5.14": {
    "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=",
@@ -1588,15 +1611,15 @@
    "jar": "sha256-VRPnQX7cHrcYitxN4DEukxVr18ptbB5gctPgAG3v/yM=",
    "pom": "sha256-Ez/s/gIYho799ZY03YaS9/Ke5uLeQynWdwDJF6OE7kA="
   },
-  "org/apache/tomcat/embed#tomcat-embed-core/10.1.42": {
-   "pom": "sha256-4umaGAnrbW1RjRiHuFOdCXRoCPgUNfTtfaegi9wRXmo="
+  "org/apache/tomcat/embed#tomcat-embed-core/10.1.43": {
+   "pom": "sha256-FfWbk/bSl/DHA4VQhcodJDJU9tqAzu6EYCrfT/R7Z/Q="
   },
-  "org/apache/tomcat/embed#tomcat-embed-el/10.1.42": {
-   "jar": "sha256-RbOufOR+fxWt0Boly3zK83oH1M3ElC+dZiw052PQXfg=",
-   "pom": "sha256-NQ/vY2LmcwKF4yKCmDsxp7fRixq8NNGkowD8x9TCY2E="
+  "org/apache/tomcat/embed#tomcat-embed-el/10.1.43": {
+   "jar": "sha256-FQxy/BJtju8x4K7JmU7tKFAabk11v5dVSpfBZ1MJPJw=",
+   "pom": "sha256-hoDLJ0+2jPqI46UP+911FyKzwKasXB9tiF75aXXm4Ko="
   },
-  "org/apache/tomcat/embed#tomcat-embed-websocket/10.1.42": {
-   "pom": "sha256-aybH3+pLUONhAUaEr22WcpNAHmYfQUznbOlAuzYxuEU="
+  "org/apache/tomcat/embed#tomcat-embed-websocket/10.1.43": {
+   "pom": "sha256-lzSN+vxO8QZ93dVX1Nybd9e5HwptEGgSMfRru6cIMrk="
   },
   "org/apache/velocity#velocity-engine-core/2.3": {
    "jar": "sha256-sIbO6P2Bg+JAtK/PVP447DPdjrDaQUY25b96pNmFZik=",
@@ -1696,16 +1719,16 @@
    "module": "sha256-dv9CWNsfoaC8bOeur0coPfEGD9Q3oJvm7zxcMmnqWtM=",
    "pom": "sha256-i+QBdkYoXZFCx/sibPuARFwXfcfBNjsj2UH6bJuwXc8="
   },
-  "org/commonmark#commonmark-ext-gfm-tables/0.25.0": {
-   "jar": "sha256-WylmICcsSz7rxB4atwIDPJeUJYeEqKQNwP90FrqtlKM=",
-   "pom": "sha256-BR+9ZbynaMvuel0Q2XRKRX/9uFWa5KHe3KOVIXqRutc="
+  "org/commonmark#commonmark-ext-gfm-tables/0.25.1": {
+   "jar": "sha256-t6ofBMSsWzI65mbklDv2pEfcOJC+zuc5Chbb6mWDAJc=",
+   "pom": "sha256-uNEo5y+5FbyUIQAh6T0uegiXQPw1z7pPENCh7d7leiM="
   },
-  "org/commonmark#commonmark-parent/0.25.0": {
-   "pom": "sha256-GhJxBZgsR4UFdYK/VwahgRMnKN74cMFXeCdpTYxXs/o="
+  "org/commonmark#commonmark-parent/0.25.1": {
+   "pom": "sha256-u+e7KSkTa6DWzNID7lp4iHWwdGaBbXqrCu/pgOPUztI="
   },
-  "org/commonmark#commonmark/0.25.0": {
-   "jar": "sha256-CB6Jsjpz3DrzH455T0Fm5hBLJ7K5mbs6nOtFc/krjPk=",
-   "pom": "sha256-OQXRuldrIwZJb3P33+dfyaTlVfEBNZ0D9iV28bajpyU="
+  "org/commonmark#commonmark/0.25.1": {
+   "jar": "sha256-uGLjqL5979lhFQLH9jyUFwGMo5VgjCFqE+LeI9N9Uu4=",
+   "pom": "sha256-IuBPuRoy5ZYN/9bskJjUrb8Z4GsWec1RxuWaIUqwf/U="
   },
   "org/cryptacular#cryptacular/1.2.5": {
    "jar": "sha256-xgDRrmG1sP8TkeAOtvs5AgHkYSw6ry3BuUBQyHhIQL4=",
@@ -1714,6 +1737,9 @@
   "org/eclipse/angus#all/2.0.3": {
    "pom": "sha256-EoyjtvoISnQ8pRwgKxqfxHCjdzm5PI9OcoVM4m+gBnI="
   },
+  "org/eclipse/angus#all/2.0.4": {
+   "pom": "sha256-/M1yMQnFQB6VNOZYBCnxNj/1yEa0sWkThqbx9zdcoQw="
+  },
   "org/eclipse/angus#angus-activation-project/2.0.2": {
    "pom": "sha256-r5GIoQy4qk61/+bTkfHuIVnx6kp/2JDuaYYj5vN52PY="
   },
@@ -1725,6 +1751,10 @@
    "jar": "sha256-a1tvwrpjPFNzPYKcVsrlHTQ/sere4+F7juoBpJ7cctM=",
    "pom": "sha256-2/OjHKYSJaapGygy1cExoYegN+wHYa2xngg2LjanrYs="
   },
+  "org/eclipse/angus#angus-mail/2.0.4": {
+   "jar": "sha256-hzAYZVhLrZFwZis+7vA1Cqr+pFIkg+OOVK6H3D3z6Vg=",
+   "pom": "sha256-hQ9aU/bgvIyFxRwmuDzkvVGEsbmC3zTRMfYIRO2T6zg="
+  },
   "org/eclipse/angus#jakarta.mail/2.0.3": {
    "jar": "sha256-77lGQkkzgGvG+BNnUtIv2zuoh+oFJ/+EnEdOUfezcV4=",
    "pom": "sha256-Z5luZL2/8GcHrUq6eDp5do1iFRs2jFpbITnFuZE0vSg="
@@ -1741,139 +1771,139 @@
   "org/eclipse/ee4j#project/1.0.9": {
    "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc="
   },
-  "org/eclipse/jetty#jetty-alpn-client/12.0.22": {
-   "jar": "sha256-DGtAzHKCXjDik16jPAWLlHg6anzcNFwg0txVhdT4/Y0=",
-   "pom": "sha256-yZzqweWbA60k7YT8s1j5EavixWBfz6zCtjyaWptoQB8="
+  "org/eclipse/jetty#jetty-alpn-client/12.0.23": {
+   "jar": "sha256-eF/8AvRCn+yu3IkKAmHMIOeny/EVEYalpuKvaWddIJI=",
+   "pom": "sha256-G7g1IuvGOEGH0DeJ3L1UZg7okmJ+KQlIbPQjsDQxARY="
   },
-  "org/eclipse/jetty#jetty-alpn/12.0.22": {
-   "pom": "sha256-M9pvuKzpESDgX8vhs0Uvdv36NSFDlWXvyQrEmTCeMVM="
+  "org/eclipse/jetty#jetty-alpn/12.0.23": {
+   "pom": "sha256-XpkWD81aEa7LuT/FZXfuqH77DSoyXTpZxo2Z/fG4UhM="
   },
   "org/eclipse/jetty#jetty-bom/12.0.21": {
    "pom": "sha256-PxB+Po77Hkr504PmvAZn/jbPVSYAEMIoNDaOga6E0yk="
   },
-  "org/eclipse/jetty#jetty-bom/12.0.22": {
-   "pom": "sha256-qOIPYCzrt5VQ/NbypIT9u9gvweieN6GRQ+nt4aJXQ8s="
+  "org/eclipse/jetty#jetty-bom/12.0.23": {
+   "pom": "sha256-cNid7nnxRJpAXiqTHdcxhW+vZV0EnIHYa9wnfrrMoew="
   },
-  "org/eclipse/jetty#jetty-client/12.0.22": {
-   "jar": "sha256-bZdeLtRMrQYYzDTPBkXrZ4FILekLI/cN6GaPwnWvtaM=",
-   "pom": "sha256-inectiNfO9pV7YT6oUueLFlFsHNlB+ZM+KKsfUXuG3Q="
+  "org/eclipse/jetty#jetty-client/12.0.23": {
+   "jar": "sha256-nhvOmR2E8eB9L8pK11c44wYZKM/rjHqc0zaSB0DRcW0=",
+   "pom": "sha256-34Spk0glkelPw26doHZvO2ShVtg7xcaZb6ABJjNjngE="
   },
-  "org/eclipse/jetty#jetty-core/12.0.22": {
-   "pom": "sha256-GjhZiI3DAZsOoKfpdvgbe/PnNCXLgVdxUuEl26Elhjk="
+  "org/eclipse/jetty#jetty-core/12.0.23": {
+   "pom": "sha256-v+5KNlBlSFA0KgAsoDCVdvirINXGH68mBRDKhHa0w+s="
   },
-  "org/eclipse/jetty#jetty-ee/12.0.22": {
-   "jar": "sha256-LozqAq+ylYRH08bcnSCh1GdH8koks5+e0QVtDiZUicE=",
-   "pom": "sha256-rcQgzgY5qZ0pzKeE1nH6MXBQnEWNuh59IZZM7gflfks="
+  "org/eclipse/jetty#jetty-ee/12.0.23": {
+   "jar": "sha256-qZmRl3UxXcCZ39kA5FYv2N42A08870GE3bCxa+PDZZ4=",
+   "pom": "sha256-IEHJ56NYFGHnXAV8ANooGhv4fjq6aPp+m0QoLV1f8gU="
   },
-  "org/eclipse/jetty#jetty-http/12.0.22": {
-   "jar": "sha256-EksxxuVwqt1RmPo+32OZJ7H/65Wy+tn8cH5XLBHuHIM=",
-   "pom": "sha256-0kSSCgCOhJAtMAXCwuegD6qs5QqHhtZi1dkHoGFTJIU="
+  "org/eclipse/jetty#jetty-http/12.0.23": {
+   "jar": "sha256-KryqzmYg/DOuGFgAkHm6qAFwKZDuxmS4hHciIGlFWJ0=",
+   "pom": "sha256-Wq8ecP10ior3/9mS/6+zBoP5yiJUFV7F63qInzOl1xE="
   },
-  "org/eclipse/jetty#jetty-io/12.0.22": {
-   "jar": "sha256-q6ZWj8user1n1/iogHqK5sZFk3vrZma1F7EoZpzDfW8=",
-   "pom": "sha256-KST6SP6eNeYuntZYKAQxO8frc4ZsaN8p1XoKKdS470A="
+  "org/eclipse/jetty#jetty-io/12.0.23": {
+   "jar": "sha256-aXTY6b5p05ssAwjURpnO8NlhMru2Nqvw4SJhhLZrG14=",
+   "pom": "sha256-44jZea3xmUcOCgWsXgCnwxkCnTUi26NB59KujrAlYt4="
   },
-  "org/eclipse/jetty#jetty-plus/12.0.22": {
-   "jar": "sha256-/wPbko/6rjvhzMMQzOngzTnBjsiCjcQfT/FR7mksPb4=",
-   "pom": "sha256-bji6Foa3qyjaMJEBPmsQMm2UrwWxkfIimXJkH/Ouc6U="
+  "org/eclipse/jetty#jetty-plus/12.0.23": {
+   "jar": "sha256-O7AKWaJeCeRA6+ONkuyxMcznK5wb4A/BgyIp7PfCE0Y=",
+   "pom": "sha256-4KNqxs5zrc85D4AqT5jVaiqJXNDJ8H+TuFe7wxiGKVs="
   },
-  "org/eclipse/jetty#jetty-project/12.0.22": {
-   "pom": "sha256-FyqFNDIy+xJ9VFX6i5Rk4URwPNgW2bSrsauCYE7H5eQ="
+  "org/eclipse/jetty#jetty-project/12.0.23": {
+   "pom": "sha256-+hlR3IA1V20dnyaYBqhyzNZhrPpe7mGr3C92tVb9bHc="
   },
-  "org/eclipse/jetty#jetty-security/12.0.22": {
-   "jar": "sha256-1qd5qBGQR5xATM7NQnrSQlClMmXtJq0YELGCqbkj5N4=",
-   "pom": "sha256-iRmB9Sq71Nhg5/a4/YeCptiO3CnBf3X2a6mBhJPWjD4="
+  "org/eclipse/jetty#jetty-security/12.0.23": {
+   "jar": "sha256-tOTBT4wb/QpJOa2toz6nRJGZslI9ANIRSI/4F5m7PAw=",
+   "pom": "sha256-t7NUuEhbXEuzKUIC+JKO6TRUkJgN/ofnCob++iPZDiU="
   },
-  "org/eclipse/jetty#jetty-server/12.0.22": {
-   "jar": "sha256-26yMd8wAa7g/AmA65jHtgduZ9TcrOOGLH/xGTtzc66U=",
-   "pom": "sha256-t1d3w7MWFvhAYttAkH+d3K5pu3irucEtsHHVvRMu64g="
+  "org/eclipse/jetty#jetty-server/12.0.23": {
+   "jar": "sha256-w/AkFJahxxxwULzZ3gUx5m7AkIf/7Nm6lR/jPyRWz0I=",
+   "pom": "sha256-KIJq1c10aB1klrb33gBi0kJ16Henno+E/XWyMGtt0xw="
   },
-  "org/eclipse/jetty#jetty-session/12.0.22": {
-   "jar": "sha256-FWVaA+/rV/TU/L62x9G7NB3Bqb5eTLqjUBwKqxHfkHY=",
-   "pom": "sha256-rinAzQgidK8vIcSRENXkESrPnrOnkudE9pnBQsEHr3U="
+  "org/eclipse/jetty#jetty-session/12.0.23": {
+   "jar": "sha256-qzc2KTVhG4+FXIvN3ql81vzX5PRqqgW0JaU5JlA8XiA=",
+   "pom": "sha256-FVCZKihkpJ6edA0BUzRE7wPR+RsWw4qu/gUjTrepqIY="
   },
-  "org/eclipse/jetty#jetty-util/12.0.22": {
-   "jar": "sha256-h8wPAwNreVAjRlYT0zD1jXCU2iGze7RLyx9jKQMQdeY=",
-   "pom": "sha256-ZJip7jKZJEjAomChZi6GFzCxuH8fA7qE21JFO6lUnLU="
+  "org/eclipse/jetty#jetty-util/12.0.23": {
+   "jar": "sha256-dCUYy3znFR+itsVIGem2UgTA+doRk4EiYfpWVWGOLJc=",
+   "pom": "sha256-a+LvvbIwkprpf70F4vlCkcc4mHuq+uN+K4wQ0EeQu+s="
   },
-  "org/eclipse/jetty#jetty-xml/12.0.22": {
-   "jar": "sha256-m6xZ1xavOssjYBtzZNsdqS1AeneLAHhOJO/5gc7vwNM=",
-   "pom": "sha256-XNZjVHyrHKY2Ap9F366Ik6O61H4lRCR0NfgCZpRoWMo="
+  "org/eclipse/jetty#jetty-xml/12.0.23": {
+   "jar": "sha256-3kMBzOJ4eoq8vi2hxgADVA4sgNNhtVuEPphJvr5yD18=",
+   "pom": "sha256-Fu4uPjegqndVDQ5Yw1TWqBUnjYyPCIDG5/1lGbAHYt0="
   },
-  "org/eclipse/jetty/ee10#jetty-ee10-annotations/12.0.22": {
-   "jar": "sha256-9ZNmko8JetuCbbzvll9WmnKdrlzIJT3+M904KH1VG3o=",
-   "pom": "sha256-GNdxJk/i/emxJKy2Bv4uvRNFXQ7Qdi4iROtqFuwV4Kc="
+  "org/eclipse/jetty/ee10#jetty-ee10-annotations/12.0.23": {
+   "jar": "sha256-7oPA3rN/1DsJkPe0qOHp4POUiYYYVZnZld+WafQ0dbU=",
+   "pom": "sha256-6zr58NV+sZjIpEy2S37UGGjGM182UvBNX56ElRY08PA="
   },
   "org/eclipse/jetty/ee10#jetty-ee10-bom/12.0.21": {
    "pom": "sha256-OxLpvear+nRdW7LYj4qtHESaciWKGCCiNyXC6tAfYKk="
   },
-  "org/eclipse/jetty/ee10#jetty-ee10-bom/12.0.22": {
-   "pom": "sha256-bxRMKZqlm9otUskKcocQqOumaTTYDZt6PY71O3uBqbo="
+  "org/eclipse/jetty/ee10#jetty-ee10-bom/12.0.23": {
+   "pom": "sha256-cravtVFrM4JJjIEvxVTwzHmCWEQnl+caTuw/QB52Zig="
   },
-  "org/eclipse/jetty/ee10#jetty-ee10-plus/12.0.22": {
-   "jar": "sha256-eogF258sMkyBWKxwIBhShjoV0V3DK/wOspok+asVMdE=",
-   "pom": "sha256-zvSkzN64NhJeCA8eBtG2SVrlYbtNP7tTjdpaOLJC7tk="
+  "org/eclipse/jetty/ee10#jetty-ee10-plus/12.0.23": {
+   "jar": "sha256-amR0NqOFtj8eGtvaalevcTDnv8POJgdJxc4jkPsPDN0=",
+   "pom": "sha256-f+asmRWtVUdZrMsWunmwensnRgC0dQUjpsdZP0JBZxw="
   },
-  "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.22": {
-   "jar": "sha256-8IGTB/4xCNcDUV04iQyldsa5QOCJ6/Apk+Ij/SfdlFw=",
-   "pom": "sha256-q3ZBi2nUlz6FRF5pfYYQDVffu90Un/0qAs0HUPhuzB4="
+  "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.23": {
+   "jar": "sha256-SWl+ZZxytURjjn4iIMhc4AYEXaV2VTdSI7kjm8sXDx8=",
+   "pom": "sha256-dneAS9AUNwYILS3xc5f6/CofvUA96csG5/A9hHzHGKQ="
   },
-  "org/eclipse/jetty/ee10#jetty-ee10-servlets/12.0.22": {
-   "jar": "sha256-1V2puhK40G1GGObAng5bZOEEAUtToVK4E4fa0e3LT4o=",
-   "pom": "sha256-qNnnftO2eZNElvJ31mUskMoXKE6lUwLgrRtPOM/VuYQ="
+  "org/eclipse/jetty/ee10#jetty-ee10-servlets/12.0.23": {
+   "jar": "sha256-gn+JBDspduXjN5vKTHpEZUlxzywVZled5I2uNnl2+5k=",
+   "pom": "sha256-0Z3byOk9+xAKSHppdFDJoGhYijrVQxU/B8kiHqMQuiQ="
   },
-  "org/eclipse/jetty/ee10#jetty-ee10-webapp/12.0.22": {
-   "jar": "sha256-zyxtPTvn6SVoQrsO8gl2+kN67KJIa5IOi5bVuMeyc7A=",
-   "pom": "sha256-GC1i+SSR0twBWielAaGx3gmdmj8YVb2EEBLdZtTyMyA="
+  "org/eclipse/jetty/ee10#jetty-ee10-webapp/12.0.23": {
+   "jar": "sha256-0ZL7JY40chGeC3nG04tE0xWPAUvbm1zIhfcXqKRIyAw=",
+   "pom": "sha256-2/sgNLMEJt4n397EtVFBoOFyIyqdeqpansB/mRXMYMM="
   },
-  "org/eclipse/jetty/ee10#jetty-ee10/12.0.22": {
-   "pom": "sha256-8mOT9Nbre4X9kKClFTHgSq/1rSvmIMVkpL9oa4II9sc="
+  "org/eclipse/jetty/ee10#jetty-ee10/12.0.23": {
+   "pom": "sha256-/aeV3R5bPHTmiSmndQMQj7Gqgxf8J/yYCO0/J8yDvYA="
   },
-  "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-client/12.0.22": {
-   "jar": "sha256-yzDiPhPzLAEuOqB1HZkZxJLE/YayG45WeMDm6rOIEQ8=",
-   "pom": "sha256-y+MFR54wMhQHxAwmY0lrdJTMzls0e79UcGed30oRTmk="
+  "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-client/12.0.23": {
+   "jar": "sha256-vlmL6AQtpGqrS0kgY5zUmCLscVsnqYR1H+DiWwB3x8s=",
+   "pom": "sha256-27ZzjC4uqQjbeI4LGXa1gsN147omD3xrkQ72t6x4DCg="
   },
-  "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-common/12.0.22": {
-   "jar": "sha256-MDe9ooBU6bxBAhopaAwcvbPCNHxdXjrAmwcYSTWbkK8=",
-   "pom": "sha256-rYRLdocXWal+NcicFSw6+rGhGDVwFh24kxeIaOB6gYU="
+  "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-common/12.0.23": {
+   "jar": "sha256-L+axasCUSSAWf15P7RoJECq6taVwFPc6KXyrokmbCv4=",
+   "pom": "sha256-1QsnvoyIbs3VaKmSE4abEgDjy14QPupa0wTL1w5g50M="
   },
-  "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-server/12.0.22": {
-   "jar": "sha256-rl+x1R620J1Ewi6bqppDipfPP+dnQD4KxQwXbUFzS/I=",
-   "pom": "sha256-3g0sA1zJJR3RRLxo9cmDczihqH667zEdXkENeW9Awyo="
+  "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-server/12.0.23": {
+   "jar": "sha256-YmTU8eOk0nw5w9pGWvUFp+MLQGo8KYYjyr4NLB+R8Dc=",
+   "pom": "sha256-sbgQXoqrRKEYMxtCfUBJySz0I96yS94yazqyiqgcmIk="
   },
-  "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jetty-server/12.0.22": {
-   "jar": "sha256-+f/eDtsZ2ZAL0SImwvoMJe7Na3FgA3X7cuJHoZ8qb9I=",
-   "pom": "sha256-mQ4t7VDJZvuTvJZj/5ZpPm+KxDDaOu679q4cc6UX39s="
+  "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jetty-server/12.0.23": {
+   "jar": "sha256-7X3x3/GTCjqBaq0p7iwdIDcfjVGOh0eIurMVnhKqXgI=",
+   "pom": "sha256-Zu2yvrp3jyB5qGN2MNfZ2Kwvueyn/erRutUjO/xzwOQ="
   },
-  "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-servlet/12.0.22": {
-   "jar": "sha256-6bKAYjhm3NvPWVsSMvveCdoqx6Pes+kfYpTyJy0VS/c=",
-   "pom": "sha256-Lu6oq/SgNJPKfjAznHxaS2UnB/bbclLeztRc645fFMY="
+  "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-servlet/12.0.23": {
+   "jar": "sha256-IA1F7sadIOkeyv+xaxzxi22xqNHqKe9ryEsbL1+ThSM=",
+   "pom": "sha256-+xSF2jFyI8NGm1I0T5tpg3cVgRQ5p4cDavPZJCHm+xs="
   },
-  "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket/12.0.22": {
-   "pom": "sha256-z0ztSD0mQpmmnKBnkIoC7gK+YUX4/DOJUM5Jhff1TW8="
+  "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket/12.0.23": {
+   "pom": "sha256-mRAXbSvxeuVr5FM8dR2ixBqfdBApow+zxdMuK1A/6/I="
   },
-  "org/eclipse/jetty/websocket#jetty-websocket-core-client/12.0.22": {
-   "jar": "sha256-vKzwxbOXJrOGGxRVG+g9ugKRzxFKZJea8XBF66jqLpk=",
-   "pom": "sha256-PfUGdpmRjzDUMeYat8brlApyuKo+na+ssQ/OxgPUh6U="
+  "org/eclipse/jetty/websocket#jetty-websocket-core-client/12.0.23": {
+   "jar": "sha256-rz8U8r2a0gQJDWUbjoYXLzZRtBjXMWjwOZkKza+sZa4=",
+   "pom": "sha256-wcRP+o0PQcwuznjxf5+3GmYhSK4jwHYnvu+56PK4Cus="
   },
-  "org/eclipse/jetty/websocket#jetty-websocket-core-common/12.0.22": {
-   "jar": "sha256-dU1EZoUOVSnq4TEQmAD/Nzw4oyLMxMr0+SGbm44TZ6Y=",
-   "pom": "sha256-/k67ZenhV5iZiBEX3aPDZjwAvpAyklRajo9cqgZVV4Q="
+  "org/eclipse/jetty/websocket#jetty-websocket-core-common/12.0.23": {
+   "jar": "sha256-6ChhIRAcMemYa54F3LwE4mly1K9PVlDaqTCuueYauZ4=",
+   "pom": "sha256-yNZcB86kFd6zBH+qyojOPCOMKX42535QlK3UsT/RK/s="
   },
-  "org/eclipse/jetty/websocket#jetty-websocket-core-server/12.0.22": {
-   "jar": "sha256-MWOrm/TOZHHEdditF1Cv+qaMXNKGZce4jfps8+r5HYs=",
-   "pom": "sha256-p2h1UzCIwcINeggcePLIMhOSzPpU5nMpZgS9VBxN/pA="
+  "org/eclipse/jetty/websocket#jetty-websocket-core-server/12.0.23": {
+   "jar": "sha256-ivkeP9Q8O4TRm8Ljbbz8IrMjN45TWCg+R7jN9tPiXIc=",
+   "pom": "sha256-0WMuA1SygPIRXZ7+UUmMmkfGd5ySH603iy/g3TNnUts="
   },
-  "org/eclipse/jetty/websocket#jetty-websocket-jetty-api/12.0.22": {
-   "jar": "sha256-lfTrKFmDWYNBcqR0DwrYfxMFLq/rphDiESgfzUyygu8=",
-   "pom": "sha256-aBMTVyCSq5qfwV6gh20C9Yjwzk8RqLI5xIL2blnSWRM="
+  "org/eclipse/jetty/websocket#jetty-websocket-jetty-api/12.0.23": {
+   "jar": "sha256-JTdmbrmJrF/Y0+V3kfsGePSrVHicTCnd2UxsFRQOALk=",
+   "pom": "sha256-tqQBJYBIkmgkBPajKGTJ04t8l+Bzz7IZMpnrOblhrbI="
   },
-  "org/eclipse/jetty/websocket#jetty-websocket-jetty-common/12.0.22": {
-   "jar": "sha256-XGCZ2ITohvAn+4mw+q83oZryRKIb0CoGGnqeNR0PvKQ=",
-   "pom": "sha256-OcKzUHOqUqWziN3mM8V667BVAQaDDUb8W2TbZrrvOsI="
+  "org/eclipse/jetty/websocket#jetty-websocket-jetty-common/12.0.23": {
+   "jar": "sha256-Xi1d5V7CMly5LFlupkBshupISnqGw1PHdytZBG2uYxg=",
+   "pom": "sha256-yysP5QR6EY/NRAseGm7i6RoS7aaBl4noNTaIlBgG0Ws="
   },
-  "org/eclipse/jetty/websocket#jetty-websocket/12.0.22": {
-   "pom": "sha256-jcASlFkjavUM7ndlpoSp3KlfLl7BrNSqdaEjPM2W18E="
+  "org/eclipse/jetty/websocket#jetty-websocket/12.0.23": {
+   "pom": "sha256-H891exkZB5ouzOQS+LT27lJ7J2qXul7QXJisK0WpjNQ="
   },
   "org/glassfish/jaxb#jaxb-bom/4.0.5": {
    "pom": "sha256-7JfsQtk308iVGXl+RCRvgN4IUIGax6euZ1xEl7cHXDk="
@@ -1893,6 +1923,11 @@
   "org/glassfish/jersey#jersey-bom/3.1.10": {
    "pom": "sha256-KYl09Itfm23mIvJFApLexNuZs5vjJF9WVqbJpEtd67Q="
   },
+  "org/hamcrest#hamcrest-core/3.0": {
+   "jar": "sha256-t4o6gWkvQhzAH8F97ZpF6ftvOUnHEvjsTQHaa4wGvG4=",
+   "module": "sha256-gweKVn1bT3j27cznGvQfDnRjmIELze3N/QLiRVe8mmA=",
+   "pom": "sha256-1kyZW1baUn0+fhhmuRkNmL0QuYanfYET7EVQeZ44WqQ="
+  },
   "org/hamcrest#hamcrest/3.0": {
    "jar": "sha256-XWa2pKaAdVy27XyxBPp4Ne9kRmdYb/Bzet65d8Oezbw=",
    "module": "sha256-mhBVNzjTWME+a69Zeb8sGlSQ7uScLcas8xcPzKCSDd4=",
@@ -1907,9 +1942,9 @@
    "module": "sha256-sapyAvw/Z9IgZpA9Ph63BS7hD0cyKhy5JfovRJ8lruM=",
    "pom": "sha256-ZvbmB7MHQOORmJglpa4HamyHepm3jrBUqBRmUKr/cus="
   },
-  "org/hibernate/orm#hibernate-core/6.6.18.Final": {
-   "jar": "sha256-25U09ple0Nahbr5F/bSkgHFGFgqlG3My7rOS+02fAgo=",
-   "pom": "sha256-FbKMUbp6ubz+0ZLd5pNiQTwa7MBr+fFLJrPBmkbNlhU="
+  "org/hibernate/orm#hibernate-core/6.6.22.Final": {
+   "jar": "sha256-azIEXFmg9EVfbjnZ8rSPea1CvPWVoq/H0Y/8+dyUI0E=",
+   "pom": "sha256-fagA2F/BHnAI+Zd+hdc+womSh3JN2Ja8aKUYk6G1atU="
   },
   "org/hibernate/search#hibernate-search-bom/7.2.3.Final": {
    "pom": "sha256-WghCh8hrp8qS7rMrFFO6cyuYFe7UcoTYXAE+4VX3SW8="
@@ -1924,14 +1959,14 @@
   "org/infinispan#infinispan-bom/15.2.1.Final": {
    "pom": "sha256-FJF84qZzrk7Qe/504e6VCFOhwVQ3BHVjBmI2Pg4zW5E="
   },
-  "org/infinispan#infinispan-bom/15.2.4.Final": {
-   "pom": "sha256-44lgdyrM1Qk6h4Pqs1UbaXZ5C3ohFW4ioNpZbVYLptI="
+  "org/infinispan#infinispan-bom/15.2.5.Final": {
+   "pom": "sha256-pYWE4Uusd4EG4YI0XIZlGsRbLRqQFxTRwaztgc7crKA="
   },
   "org/infinispan#infinispan-build-configuration-parent/15.2.1.Final": {
    "pom": "sha256-m2u5xpNKfbt0YA2t8Yy6eqHBs0SaKqUHSEY/JpItiuE="
   },
-  "org/infinispan#infinispan-build-configuration-parent/15.2.4.Final": {
-   "pom": "sha256-6ev57jNm+l4N4HD7x4iMjHvukRbdPZ7niUgfXTL3lFM="
+  "org/infinispan#infinispan-build-configuration-parent/15.2.5.Final": {
+   "pom": "sha256-qCfDuEIoLhZAiXFWulWmDwrDOz+Z0FkNLFpCx64Tn88="
   },
   "org/jacoco#org.jacoco.agent/0.8.13": {
    "jar": "sha256-nbPJ1ddPqHCyYbZKMIJBLhvW4i6fqY9HN7G/+K+cxk0=",
@@ -1974,6 +2009,9 @@
   "org/jboss/shrinkwrap/resolver#shrinkwrap-resolver-bom/3.1.4": {
    "pom": "sha256-U9Rd91c4i2k6N0k7dODXqTjFc0wV+CYp1Aop3qnOt08="
   },
+  "org/jetbrains#annotations/13.0": {
+   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
+  },
   "org/jetbrains#annotations/24.0.1": {
    "jar": "sha256-YWZtvOfkLmyFtDwE/PuCk6Idy1WzyA6GknDOQsAaazU=",
    "pom": "sha256-mb7eKcAzHBlS7uBL+ZeN5TWpDJfi3v/6XgCTNRcZJbA="
@@ -1981,6 +2019,11 @@
   "org/jetbrains/kotlin#kotlin-bom/1.9.25": {
    "pom": "sha256-GZrnpYnroWgYRqlUmmlc87CkLB2SEZpQqDD/Erq7oCM="
   },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.9.25": {
+   "jar": "sha256-+c3Nv/H13oU4CuUml35oNybCqkLbHtbm5Qronklulf0=",
+   "module": "sha256-Q+BqZsO3XKPkxcswSWjqg1ImJHuj9WExK9Gepi3oRqc=",
+   "pom": "sha256-fcMxikdte5AtDSevm1b2Y+jMQmOi0zrQUMertlpbZ6E="
+  },
   "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.1": {
    "pom": "sha256-Vj5Kop+o/gmm4XRtCltRMI98fe3EaNxaDKgQpIWHcDA="
   },
@@ -2023,6 +2066,18 @@
    "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=",
    "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc="
   },
+  "org/junit#junit-bom/5.13.1": {
+   "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=",
+   "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM="
+  },
+  "org/junit#junit-bom/5.13.2": {
+   "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=",
+   "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k="
+  },
+  "org/junit#junit-bom/5.13.3": {
+   "module": "sha256-XchNdO+YHQI8Y56wy8Sx+e+JEDQofOGxAe/7vA8VNLQ=",
+   "pom": "sha256-47k+m7iHGWnPEcDo/xD1B4QdsYhcoQV44pCEb2YP1o4="
+  },
   "org/junit#junit-bom/5.9.0": {
    "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=",
    "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU="
@@ -2186,9 +2241,9 @@
   "org/slf4j#slf4j-parent/2.0.17": {
    "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
   },
-  "org/snakeyaml#snakeyaml-engine/2.9": {
-   "jar": "sha256-L3qVdGG21wwABeLDW3ihyXvvbERnBMDuk5POmOSVi6g=",
-   "pom": "sha256-9toG5chpkBVwSG0VOlKn/y1iHc93AIG5MkUxCEUl9to="
+  "org/snakeyaml#snakeyaml-engine/2.10": {
+   "jar": "sha256-yZ2f1mx8JR2IGpzZUIm3yARMKaGwKYPXA2mBvUNU7Dc=",
+   "pom": "sha256-VhQsopiYjPZNplrivcGYNJIdc411qyN2Go+sS19YMUk="
   },
   "org/sonatype/oss#oss-parent/7": {
    "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
@@ -2211,40 +2266,40 @@
   "org/springdoc#springdoc-openapi/2.8.9": {
    "pom": "sha256-pSJjR4H3B4yYji65V314jzD3CTGpmxQQyuwLx1C8T04="
   },
-  "org/springframework#spring-aop/6.2.8": {
-   "jar": "sha256-50v8HpW2DHN4UlhVkCCSmIVCTt6WZ6UWOpZR1RuJTjg=",
-   "module": "sha256-FtCltR1WcF2qB6tFSAA6is+5QNL4Bhb68MfZfvK60i0=",
-   "pom": "sha256-CXc1ZIkM7jJ8tpXNSym6raBylhVktWNbx572ifBv6Uw="
+  "org/springframework#spring-aop/6.2.9": {
+   "jar": "sha256-2ViCSv7p9s1Ir6gijqHEZMJMafAQQccO+JQK9fbN4WQ=",
+   "module": "sha256-tyE33sXLI4znpax8fwUzwA2+i9mMazLAtnQ80eEI6+4=",
+   "pom": "sha256-1alvtHpA6j84uWCDuqe8TQz6Mxc1qKq/sbR9hzNr9Uo="
   },
-  "org/springframework#spring-aspects/6.2.8": {
-   "jar": "sha256-7YI87Qxgu/b6ygSbwEjkWnOoyoQUNE0JoLEPsR/0sRo=",
-   "module": "sha256-9kmslsyZZLIr+qxzMI3l9JYUogbZah0djB/8lPm5TuA=",
-   "pom": "sha256-0TW/ci0+Dw+hn6lfj5hmolKrLRNxaZsL+qO19U/46KI="
+  "org/springframework#spring-aspects/6.2.9": {
+   "jar": "sha256-TsWt7J2A07w90yRF+nipTZN38/RHzdpc06QY+FPM7KQ=",
+   "module": "sha256-eKyEP0m3VoUL32NfmdsE2iG6nx0+fs+V6E+MOcq2b8o=",
+   "pom": "sha256-YRDo8DexmIEEK+wGUZhOtiYxKbwSrZy7aafnAncVFw4="
   },
-  "org/springframework#spring-beans/6.2.8": {
-   "jar": "sha256-pq4nDG6wbpUCqn5H7j/GbesYUyhbSk4CDz0idn8vq9M=",
-   "module": "sha256-neXDwKrC+y+AGYsYLmVpmrg1lDW7Kzkzebtvn4JlFCg=",
-   "pom": "sha256-n+wiy72TJ7AY8WzNDcYYKEiZMEwAfyZ9nfjFaESILus="
+  "org/springframework#spring-beans/6.2.9": {
+   "jar": "sha256-aT/fvXTtDK3c4uemRPF1VXq0uXoECohCUrwjxVBkhds=",
+   "module": "sha256-60RDj7t6JV8yKIqACj+fLWbgwEHv01oxNr28qrUVJjU=",
+   "pom": "sha256-ZG7/rty882A3zwJ5P+LxihbskUPRalJVu8pssD+iJPU="
   },
-  "org/springframework#spring-context-support/6.2.8": {
-   "jar": "sha256-zVsahwe2mxlViJ1a1WXB+nsh6vOSuK/VPhB68wNmQpo=",
-   "module": "sha256-G/WzrPN4JHTQdXwWeMtZ+Sp3+wdsMorJmVE5UmBAiRA=",
-   "pom": "sha256-e9KaXc+hZbBQ+X79ReGbUsBxkSOJ86Gii0BGjCVGJXg="
+  "org/springframework#spring-context-support/6.2.9": {
+   "jar": "sha256-lcTG9sCYpRZxAzDPKOrnYpHyvLM5AwvtYv6iFE7GpOs=",
+   "module": "sha256-jkxDiocvfzubUP9Jz3mTeAOMMOj+J6wWd9dj777fLks=",
+   "pom": "sha256-Fu14yVMJl3EZ0SJtPVHH0+j3z1BRKKrWVPjKgjsF6FY="
   },
-  "org/springframework#spring-context/6.2.8": {
-   "jar": "sha256-HPhXgDAbhvjYdqLfv73Z7hhxec2zYTN6K6TuVgJfZDI=",
-   "module": "sha256-hFIL9dO0ok+ceJaU1IO/SB0w1VeWj5FfTI7FpMyP4D8=",
-   "pom": "sha256-UyyM+mnEsVetDp4zttiD2OyDAWgTpjurxONX82sUV2k="
+  "org/springframework#spring-context/6.2.9": {
+   "jar": "sha256-XnOhFxCE2BQXpeHKFTTBUlYR9zJMtW47zqxjVkMUuFM=",
+   "module": "sha256-v6ck7Cj6i7gjowCJ6ZLRekv46Jofx7NjbN7VWY+/VBQ=",
+   "pom": "sha256-reiIAcweRjxoJ60VT6+Rz1W7F9iwzn9G+vTeYGnDEC8="
   },
-  "org/springframework#spring-core/6.2.8": {
-   "jar": "sha256-J/ZANAFk10oOkO4Xa3XVoYqT+C+pb0RKdXrPC/Ouclc=",
-   "module": "sha256-Z+dgUMUIsQvUPED1WTTR11i0XckMfS+cWf5kUM7GND4=",
-   "pom": "sha256-UKMGvTWoEmZwr6/DytG4DmiLP87k8dWqyRnFXmMFdng="
+  "org/springframework#spring-core/6.2.9": {
+   "jar": "sha256-n6BiK69zjJtG9ITN3jXEqXoqZbHaRCba0NcH0KiqPZA=",
+   "module": "sha256-+5lrq7iG52t+OMFnjX56l1zPFhEqNSOH4j/DUSEF9Ts=",
+   "pom": "sha256-ICqzW5xlBtoYDyhv5ekO89+5YaOeJ+zXh9czWjhcOEo="
   },
-  "org/springframework#spring-expression/6.2.8": {
-   "jar": "sha256-1GuSLrIgBxDsUQDwDTX9h4bV57xFnQnIu9oyQycmpbo=",
-   "module": "sha256-po4oJPDh4v7m039PA7lHS88Z25Mo/becpsuVQpGAKTU=",
-   "pom": "sha256-8oK8QJhGzppn9RF3/abrnNQfMfXicwfbk4ZRxQjzveA="
+  "org/springframework#spring-expression/6.2.9": {
+   "jar": "sha256-GGb/B0B/ohMSCBPQDqruchPQPu/ypQ59B1ragHtoWD8=",
+   "module": "sha256-EHxw3PRcGgq8G66EfkHJdYsaU+3AU9gfhZ1c5Yz3UBg=",
+   "pom": "sha256-6cNMYbbItzWw0s31lkcmQqsaYT+63pAjH6OV0BO3Yvk="
   },
   "org/springframework#spring-framework-bom/5.3.25": {
    "module": "sha256-bPPIDzsrxVO0LptyC/9x/bBxUmy4kMVwkz2deAd2JQ4=",
@@ -2266,174 +2321,178 @@
    "module": "sha256-8l9z4afwMkS1cSAM9hDq/QCHC2jpQtMUhFjcILhFCMA=",
    "pom": "sha256-WZpLV4sXjr3aSxBdUz5L3PGHRF1uL/AhnfqB+rMx+A8="
   },
-  "org/springframework#spring-framework-bom/6.2.8": {
-   "module": "sha256-egWtlVb487hBe6li/qSGrQw56xvFDpoi3PGpswUZO0E=",
-   "pom": "sha256-+68htKdnj1FsxVZ9eEy4qyG7JCbj9NfOx+JqtMqyG2Y="
+  "org/springframework#spring-framework-bom/6.2.9": {
+   "module": "sha256-pEYSsQZk/M/SDqBhKfCzJn0Dvmd5bROdyUinqQ3VQPQ=",
+   "pom": "sha256-+bp8pGVIW/zt757/yLVExoSg2xM/g8Yi9Tix5Crbu8M="
   },
-  "org/springframework#spring-jcl/6.2.8": {
-   "jar": "sha256-vYtq3RLbVGArxZJrhEmkj9kio2d4MjIYrqiM+upZHnI=",
-   "module": "sha256-0R9u5H4sR3gilGtExQq7Z1GGVXq0ACIkTeqpWj3yLBI=",
-   "pom": "sha256-QGqKA4/LD+B1dwiSfvsxtKvsbN600QUDPKB9Fq26hFo="
+  "org/springframework#spring-jcl/6.2.9": {
+   "jar": "sha256-iMWPc0UZ3z19ngdzO5HYOcQ9RZVRkj2T9LfJJli0FJg=",
+   "module": "sha256-KLyW4h4ir9Su1X/zMyrHHeNyx+6cL9KMF83P7O9aBww=",
+   "pom": "sha256-S+vO9ZVoqiHLAECvC5OjpXhwRe+cp+yHVguBo32mA/8="
   },
-  "org/springframework#spring-jdbc/6.2.8": {
-   "jar": "sha256-g9UoZjAc+6YlL96Ww/vFkSumDBjkiE6QDHACizYp0pE=",
-   "module": "sha256-TNSA3tirXXj7nTVtabj4iq8y/W2dSm2DXF7ame2pbVs=",
-   "pom": "sha256-rzWL/yFmDpIFQ+DburmB2V1QYfg40dn5qD6f3sbn4Es="
+  "org/springframework#spring-jdbc/6.2.9": {
+   "jar": "sha256-PCicR5/Rnkge+6JWCxTFu+nK7PbdfnmvXTaQ86DvoyY=",
+   "module": "sha256-0Uh7I52+JTxSBTLgDVl/eU/oxQ7/saTR4fLy6OKQcRQ=",
+   "pom": "sha256-/3BGksKegtTDD70YMliIK6SOgr2WUj1t+xuknul93OM="
   },
-  "org/springframework#spring-orm/6.2.8": {
-   "jar": "sha256-fWVwEyS/QcFBL3hNW9koPNjBv8kPm/V/7AGV0itS/jg=",
-   "module": "sha256-4IsAog/iQ5hrNijpK63f71BiXZUnLzCCilfn0jxBmdk=",
-   "pom": "sha256-10s75LugUYh28VSqoG9sR+YS9FouAH4jYwF/XqbwVvo="
+  "org/springframework#spring-orm/6.2.9": {
+   "jar": "sha256-7+7GUTMIYwcLwFAqJ/Mu9mGem1R5dSr+efCxOeFbFxw=",
+   "module": "sha256-+t4dI1B0HbjEw6mhhWsIZkJWHugnU4tmIRw9uHK+Pzs=",
+   "pom": "sha256-m5b0uWNi3V7Vww63rYmp4ijYrKE93p8n2dFuoOc9QzE="
   },
-  "org/springframework#spring-test/6.2.8": {
-   "jar": "sha256-6NlegnTG2zxq1pZmhHS4C0W2sRcv/8iU0GgOCNXZbnQ=",
-   "module": "sha256-lsCvQAS5VUhUNEdX3uuVNMmU7r0Oy9Sg84JKox0H19U=",
-   "pom": "sha256-aQ2zopgEZy8d/laWrnfZh/vFuAa0G0kQt/lbBTS2SWg="
+  "org/springframework#spring-test/6.2.9": {
+   "jar": "sha256-uGgiV+DdJB89qkb/ZUeKScFct5pffa6dWVxxY4LOFbA=",
+   "module": "sha256-Tfxn3xvdMgqZDoLSb8VaLiQgBvLTTnzpgdnSvoUZipk=",
+   "pom": "sha256-js+kxdegZpbay0aupHxvnxIFxA6Z881RP+9yCd6VYes="
   },
-  "org/springframework#spring-tx/6.2.8": {
-   "jar": "sha256-4qfSKfObeXKeT+8JN3XTKgPAeemOb2yP3fiGcA2dBb8=",
-   "module": "sha256-Vut40qEZWvbM+vKstATDRz/qET/XrbVL0N4f20YZURQ=",
-   "pom": "sha256-vvqP4djr6thrCKFrGG/cjwYlFxMrtghQKeCy2f2evdE="
+  "org/springframework#spring-tx/6.2.9": {
+   "jar": "sha256-JdiOyjRaqiCELr88ShPK9vWD2pI1+GOdKZ1u4g3ZQOA=",
+   "module": "sha256-xEfhQMoygU8Z+bV+BVy7jw8JevmBAGJNTa+ef6tHFBw=",
+   "pom": "sha256-H/Z73Ru33gWydMsHeljq9dmw/Vzg6X0yucKDtSSkRZo="
   },
-  "org/springframework#spring-web/6.2.8": {
-   "jar": "sha256-FSQFr6vAVtyAB9yo7xBVA8fLuxMvfRq3X+8+J+qr1GE=",
-   "module": "sha256-sSq8Kx7zaiH6JWj5kAc6wKXTOt1j8e4Pb/Hp4pOZDkY=",
-   "pom": "sha256-i9jflbXqbiJK9IkEtKTCaA6TBg6iRAkkYROtHP7G8mE="
+  "org/springframework#spring-web/6.2.9": {
+   "jar": "sha256-ASGiYj93QP0NIINCz28SB/JQGxkVZlo0SiwWG/Xy72s=",
+   "module": "sha256-HQn5Ole9Botlt+V0bfQG7vfBq8hJYLlLxl5CqyVQaYY=",
+   "pom": "sha256-A1ZLiyItYlolkupgeWw9oTWRMbsjUSX1Xk2FHaaWLFA="
   },
-  "org/springframework#spring-webmvc/6.2.8": {
-   "jar": "sha256-iX5tNHN9Gkdc3LnkFKv0LeUdXVRyMjRc+38000SZL10=",
-   "module": "sha256-BPtzVN5SMhCsDjjoWqt7oLdtFWA/QheAij5a2EqaNW8=",
-   "pom": "sha256-3eQDm5bNefnVaKSa65fC1os2lX0ZNrlxLUO81NL4UYg="
+  "org/springframework#spring-webmvc/6.2.9": {
+   "jar": "sha256-ik9bIUCS65KfNuBoaaQ2+fFqVfq0cN9qfzjEYWsb8Mw=",
+   "module": "sha256-n9/QCI5LwLM7mLTPn2pm7m9DGBlzAchPVZqNw9VXYPo=",
+   "pom": "sha256-BNWOkPl3LcTXVSuyW83gSN4e03tCrzwX5HDbIF4keck="
   },
   "org/springframework/amqp#spring-amqp-bom/3.2.5": {
    "module": "sha256-L+YuO5sm66R7/4yjIwTfwCf15Gtnn3mrXgu5HhnY8Yg=",
    "pom": "sha256-BGTRVbnvEgFUAEEC2/tuYXPfdf0md8db8NESNUU+Nqk="
   },
+  "org/springframework/amqp#spring-amqp-bom/3.2.6": {
+   "module": "sha256-xGWJNtXHpd3wIdfoIkUwP4P4Fwze5QLrVIfwpb5VW8A=",
+   "pom": "sha256-d/uyfjFp2vGY15bSQkMEOVdyCmc7/HUmUGUvTouvhVM="
+  },
   "org/springframework/batch#spring-batch-bom/5.2.2": {
    "pom": "sha256-SJs2UNjohLCPgk5pY7T9M/GIrgTewdAIIP4Ap939nsE="
   },
-  "org/springframework/boot#spring-boot-actuator-autoconfigure/3.5.3": {
-   "jar": "sha256-yz1zmM1BECs0UQcWmqzGY/SQeNKBYAVqxQq1+AXxjP0=",
-   "module": "sha256-pvtnmJ3eyeGJSb35ob+FJErtv0cjHDd7wwYP/izleRI=",
-   "pom": "sha256-N4MGOhkRbYcWN1Hi+LD0+zOBcH+6zFN/lrTxxdFuUKU="
+  "org/springframework/boot#spring-boot-actuator-autoconfigure/3.5.4": {
+   "jar": "sha256-6HxzkRXXtSXvhNttlU60s7hsbpKpB3VNqHmWS1lY0+M=",
+   "module": "sha256-hdX3X8iWGFPRYHQC3dK0fw/ztLu5JgI0bKi4jg0wZuc=",
+   "pom": "sha256-CkQKj7oRu7Kvdcd3mvt7M9i/N7tRZY7ByNiisJEqmH4="
   },
-  "org/springframework/boot#spring-boot-actuator/3.5.3": {
-   "jar": "sha256-zUTRuwvj8aJrDVg4xPai4xA8xxdEJ+bXX3MOusc14qY=",
-   "module": "sha256-e/qD01QCmAf36q90klokp9zW57T2gVCnRcCy4m/6pI8=",
-   "pom": "sha256-8NXoJ2QkSe1isKOvX+bOHVhJgLqO0uvEIe+xzOzep+c="
+  "org/springframework/boot#spring-boot-actuator/3.5.4": {
+   "jar": "sha256-kJPq2bSjicobErJrsV4km9MaKhP52LTwl+HbMEjvAC4=",
+   "module": "sha256-gtXcPQ44SFpHIaGKPokrpL8Xy0m9OjmgfF2e51OH2cc=",
+   "pom": "sha256-nvaIb+a8FtCLP8zZsmG4Gd38sethxmWFU5ULF07rZtE="
   },
-  "org/springframework/boot#spring-boot-autoconfigure/3.5.3": {
-   "jar": "sha256-vLxbN9kVMEE0r01lYDySuwzR31Iu29LXq+7LlfLFdTE=",
-   "module": "sha256-F4TyO668+mMyTwJUPW0/lFG8dCVe+YUpNM6UULzzuLA=",
-   "pom": "sha256-I7M4bvZwhqxYpz9Gix7gM24P9/BMQd6tfN0qDNYetTE="
+  "org/springframework/boot#spring-boot-autoconfigure/3.5.4": {
+   "jar": "sha256-jATZR7j+OiN7fgQsbzecSZE4Ei0NrE6FWroRKMI0r3I=",
+   "module": "sha256-0udwhyKzhXxBFvyUMa/4ddXXA35Kfkv/AyoCWoGYKpY=",
+   "pom": "sha256-aUPqFbqw6rJv78InkrEfEWAMLp1uIDxKquRefWLZYpE="
   },
   "org/springframework/boot#spring-boot-dependencies/3.5.0": {
    "pom": "sha256-c/dS3mB6DhCr1NxTerNiUciKRBJTB+LYhvb/ujoI8FY="
   },
-  "org/springframework/boot#spring-boot-dependencies/3.5.3": {
-   "pom": "sha256-Bay4usQjHQNz+9fWuF/j3vmC708CmNBnrTgtt9p3ndI="
+  "org/springframework/boot#spring-boot-dependencies/3.5.4": {
+   "pom": "sha256-/fSK1HdaTge/hTCplTOMz0Wh49fb3BMY4+vl7Iwdr5A="
   },
-  "org/springframework/boot#spring-boot-devtools/3.5.3": {
-   "jar": "sha256-HCi/cHwyoJ/zOavHDkSjODXiRShPUAsUtUodqZcAXbI=",
-   "module": "sha256-voS2w0HyNOxhHjAqjr1Bsy/rzpAYLvA+7eh04mIlQy8=",
-   "pom": "sha256-89V4CwetvRZseV7r/947JJ6uVpZMmisxL005yXGs4tg="
+  "org/springframework/boot#spring-boot-devtools/3.5.4": {
+   "jar": "sha256-f3s44PWh8DcX2VW3nMeLTG+TMidog0aAaE1zgW82AQk=",
+   "module": "sha256-1ZGcnwlTXx6OGzk7bpjkhBD+rqVNhvmVvdHmtfUe9iY=",
+   "pom": "sha256-/2Hm4WnxFNJI7HfNokKSygMhmnDmRLRB7nUS43AKMaY="
   },
-  "org/springframework/boot#spring-boot-starter-actuator/3.5.3": {
-   "jar": "sha256-lRW7FdSaV/eFgKKGVXDaHCBudofOeblymK/rSwkyYQA=",
-   "module": "sha256-ZTeVvwmfHOUBkoS3uQsTbEkSuz20NxYDeJKLxL+Nefs=",
-   "pom": "sha256-ZbRQdl2y908AvzYJDAkfpzhP3NzA1T1HDJyI1IwQdLA="
+  "org/springframework/boot#spring-boot-starter-actuator/3.5.4": {
+   "jar": "sha256-/ZmzFkWK1j7ElTRmhdpR3s+N2rK53HLzYj55fqO91Vo=",
+   "module": "sha256-16HUvGIde6ZgprTya/ufij4AWr1zD75pWoLNREXiZg4=",
+   "pom": "sha256-na/t9dMP0uFmErpJX5fpfjdXMdRHPywsU+loMwvtuhQ="
   },
-  "org/springframework/boot#spring-boot-starter-aop/3.5.3": {
-   "jar": "sha256-NXU4BCCL4VsPD2bvOrYeGIzTbT52xjNWURM3gSStks8=",
-   "module": "sha256-7KoVpTNK+N59tiQIsbx4JZwk+LMIspQWIH82W/KIf48=",
-   "pom": "sha256-fUTI+UQXBVinGWbXM5VLyD18HksUb3UetNsrDTzA6j0="
+  "org/springframework/boot#spring-boot-starter-aop/3.5.4": {
+   "jar": "sha256-DrYTH1eiqTH4bTRH613gemzDIHxc1wu7+r9SN3tQaPE=",
+   "module": "sha256-XpR1OoK/Fm6kwz/nHatCeoD2592kjbr8RuMRb37zN8k=",
+   "pom": "sha256-3ir8DmOu8UAxA1sXieJZpSKQp7nBEebJ/rBg6E7IZaw="
   },
-  "org/springframework/boot#spring-boot-starter-data-jpa/3.5.3": {
-   "jar": "sha256-R9xYzQ3DLX8Vz0ApbA5GUO9Vy+RwqR9EfLOiS38FPF0=",
-   "module": "sha256-zbtRjh5s10qfo4J1Scv5+vuCpjx/NrgNqdk+d+z/mFY=",
-   "pom": "sha256-/ABC6imBNNahuEuJQoICRmWY/eRVXKYDRYwp3KUV6EA="
+  "org/springframework/boot#spring-boot-starter-data-jpa/3.5.4": {
+   "jar": "sha256-O6kaRaZ6vjVXo7ITBXuNb6RhB/Fin2Y4Ras6FGqCNP8=",
+   "module": "sha256-flXQpstxNa11H+KZZoj6/gE+ygoQbIlnW2N7ZElvk7g=",
+   "pom": "sha256-3hIi0+e2d6gV636CmMSKnEgfNWeBNjk5zqa1C6KlEYo="
   },
-  "org/springframework/boot#spring-boot-starter-jdbc/3.5.3": {
-   "jar": "sha256-8mcFJLzzYyDYDVZ6Fwkv14Sf1iin9xkR0jtetQ2EqGA=",
-   "module": "sha256-hVuvC5BP8tqGcyePpXhRY/RFKUpX2IupaRMOPTV72MQ=",
-   "pom": "sha256-aBl6iU/4hL+Pt69Yrs6zwNFBXTcxwzTi9jUAI2XSItM="
+  "org/springframework/boot#spring-boot-starter-jdbc/3.5.4": {
+   "jar": "sha256-x+dy/6cnVKaSQgfTAlAGQTN1gVgkU9rsI01PKjUBq6U=",
+   "module": "sha256-6j5ajS8lAYk95jvol1y1vk9TF205heSAa9W5sBSxuMM=",
+   "pom": "sha256-KhQlPb+H854pQHLpsUQT13wiXUIb95QdEtqspmqhYQk="
   },
-  "org/springframework/boot#spring-boot-starter-jetty/3.5.3": {
-   "jar": "sha256-QxwJM0wA3Ds76MtHtGva/TqyxS1TBwUIW2ZOUvXp/AE=",
-   "module": "sha256-4Dh30m9X/Jnw8Rm4ct3YDEcTEA739F9bxljhNY7KvnA=",
-   "pom": "sha256-z+qfnvZx2TGpzB1Uq5J9j5+7SNKHc6nQDeZ8BjAQGTI="
+  "org/springframework/boot#spring-boot-starter-jetty/3.5.4": {
+   "jar": "sha256-5jFnbkvTT3ETWUbXplB5Sy2hvKANV2qvbEeErJTR+Q4=",
+   "module": "sha256-hjnjJ277ZokEp7wZR8lp49qeT7uIApTDzjTLeRRkRHM=",
+   "pom": "sha256-qar8jf493GGC+Xptd/qw1qh/21KjBg8eqQDbzN5Vi5M="
   },
-  "org/springframework/boot#spring-boot-starter-json/3.5.3": {
-   "jar": "sha256-orhJQYXG7LyK8wA6U52He/BiMNCprRKnR0fp2lbvKAg=",
-   "module": "sha256-SHckRGbtCTlvYRZlyYq+LTvAZEjOug/k9GYWi5tFnM8=",
-   "pom": "sha256-7i5kMrivlAtCUBHXR/6Lj2Im+957K0Nq7VHHzmOFnmM="
+  "org/springframework/boot#spring-boot-starter-json/3.5.4": {
+   "jar": "sha256-onJgSypgIqdH67T6pG0enwob16QzXQ33YuRrBdiehys=",
+   "module": "sha256-NKsoD+hoaG/yxcJGLeFoMk+/vqELaQucaZzlK/yPJO8=",
+   "pom": "sha256-y7XXTdlJmKax/sHBPAEV8pqlHgVwGAXjdtJc6YJi40M="
   },
-  "org/springframework/boot#spring-boot-starter-logging/3.5.3": {
-   "jar": "sha256-haHDxs8QYEz1aZ07+kqICJmDqLB3JcNzT0+9Gk5wv0M=",
-   "module": "sha256-sLuxW7pZcDBNwDpytLpPKdEJyvvZSfbBsZcLtKdoW7E=",
-   "pom": "sha256-u58noP3Zp9QtGeW/QYsSyL8lZAYBeOFQMR0vzDd54b8="
+  "org/springframework/boot#spring-boot-starter-logging/3.5.4": {
+   "jar": "sha256-JkbvwZdtxlsqhlxZ+nPquzjnxbc0f1jh9ybpHylXEdc=",
+   "module": "sha256-BWBrZ7c3pks2PqZ8AGRe0EZNlAEdcIQ4MLw/itV2f8U=",
+   "pom": "sha256-n5xPBe0HNerdD05MUFc8kDYEj+tgpXu5Mp6pVtOQ8Ek="
   },
-  "org/springframework/boot#spring-boot-starter-mail/3.5.3": {
-   "jar": "sha256-614Hpbk0nhCNFadldLyThB0fuN6mO1/d2N76F5K3lPU=",
-   "module": "sha256-2pJDY2cCAFmCbg8umaNvAcCKIhbhRWb/fFrjE3X7DPs=",
-   "pom": "sha256-8JDmNkaT6YUKVUFs6Ff0j2l+ESkrIApZFfNRcDugXF0="
+  "org/springframework/boot#spring-boot-starter-mail/3.5.4": {
+   "jar": "sha256-euZCkCitvB+tWQuNDMlGgbSrPuNkMGLGeurEhHFwCdY=",
+   "module": "sha256-TmwRc3VBflvwSpnCtVL6rZKQZ0jr3SKW+OEEn1DLgpA=",
+   "pom": "sha256-L2PQJWgGV/4OZqsMXb+HDZKL0+psBFmHFzw2jcMa2JU="
   },
-  "org/springframework/boot#spring-boot-starter-oauth2-client/3.5.3": {
-   "jar": "sha256-AbI4ZiPXF+c8rlBmNwkxdON8iYFv1flIJ3ReV/jG59E=",
-   "module": "sha256-SMrc1dCbr21Xgdcq3HzI9yrJzI1Rdp67vRdWPoRQldQ=",
-   "pom": "sha256-Ozn1AKw2wcjZPK6GY7dVNkWNUWwjF9jq/lSKZZYUYac="
+  "org/springframework/boot#spring-boot-starter-oauth2-client/3.5.4": {
+   "jar": "sha256-24OkNrBqo6HIt1WALG+S4lwFzCcp7tHbUQIDuuGuHlU=",
+   "module": "sha256-XM4u3JDs+Ip7nA7LwV/+dIqLKdsAP334EU4JpDqkxxc=",
+   "pom": "sha256-YKxBqjn3PD9skK71Cuibt8Y1uc4mAvF3gNNw6Uybk9s="
   },
   "org/springframework/boot#spring-boot-starter-parent/3.5.0": {
    "pom": "sha256-PeuCPpzS+D3rayA1Lgh46JcJt6O0Gcwozbilrz0YyRA="
   },
-  "org/springframework/boot#spring-boot-starter-security/3.5.3": {
-   "jar": "sha256-hNAH8gy7gLvM++zh72JivTSbafGJASKD35Ep+E9TqXM=",
-   "module": "sha256-avWY/cKZLGwM9x+JIOFvNdZD/mCk7qeO0klzHq9Mcbk=",
-   "pom": "sha256-dQuAcn074peN5L7jjAXW5eor2gnWlVv9pShcnrcRWMY="
+  "org/springframework/boot#spring-boot-starter-security/3.5.4": {
+   "jar": "sha256-fINQqKds3ySP4IPELevQu9y5kfMPbAtuPXzcYJ8ZNYo=",
+   "module": "sha256-Cpw4y0vCGajiPAnCztvf0BSyBj0A9Bn2FSiw1ighysY=",
+   "pom": "sha256-ZGdGjadsbk+SGrm2Su0E7T8E0jGZVVuZ3d0ztIIEYts="
   },
-  "org/springframework/boot#spring-boot-starter-test/3.5.3": {
-   "jar": "sha256-BdyEMLKdHxt7bHyviBvnm0buhTEPQ5xVHCy/nE3cglU=",
-   "module": "sha256-/dTA/MmfGXQWeGe9dc2IYLwBJ2fTnKvbroQkum8VfyI=",
-   "pom": "sha256-kqSPnfAsYuNPrT4xsw6t7fUqSunkfuLoNcC+5dGAONg="
+  "org/springframework/boot#spring-boot-starter-test/3.5.4": {
+   "jar": "sha256-4yqQuXiIXzFtxMINsOvK5tW8KDZ4PH4rf0uzpmr9AIw=",
+   "module": "sha256-GX0LXO32uOC2EViDBJawp49MEhUJ7gqdIhtEg5LHfVw=",
+   "pom": "sha256-z1RzsP7ygz4/e5BYTDZhj9OWn64ccaya01BPI+KUCG0="
   },
-  "org/springframework/boot#spring-boot-starter-thymeleaf/3.5.3": {
-   "jar": "sha256-TBg4KBd/ejX2uttvBHIyTMIdg0HDhfPMorEhH4BnvXA=",
-   "module": "sha256-gZ1jqmG05TeddDK4LapQpPA4pF5LaQmON0sxrwdWmDA=",
-   "pom": "sha256-i4l9FBw/qS3KPXb9sOJ1kS9CwWWZ6ZtgX/Cvzehq6Xg="
+  "org/springframework/boot#spring-boot-starter-thymeleaf/3.5.4": {
+   "jar": "sha256-UQy5/X6FMYpzR1MReQTaa5h4xRc9a1UhY+jPwJ8H9zI=",
+   "module": "sha256-L9rgYMRyilmpFgOh3/Nt9YrWH0zJLITNl+bOQDBpi90=",
+   "pom": "sha256-nN7quVtJ3mKNLBmQtbokhclHEBTHKrx31NI8anaFnvE="
   },
-  "org/springframework/boot#spring-boot-starter-tomcat/3.5.3": {
-   "module": "sha256-ZZV48qcddfxkZ3K+cQ2Po1Pyiojhuwha3zyYMfzBCWA=",
-   "pom": "sha256-dRM9Ull8l+D7Oi9eOXWxpRoy9bBrLVkRh/xMpGTGbuM="
+  "org/springframework/boot#spring-boot-starter-tomcat/3.5.4": {
+   "module": "sha256-S42KvgS2NqsvXyAwRuD+7RJwcPCohR9yTCbjYl39IhA=",
+   "pom": "sha256-2exedRSXmPCqLz7xYEOY8+7Qby9WYpRv7264CcUzfVI="
   },
-  "org/springframework/boot#spring-boot-starter-validation/3.5.3": {
-   "jar": "sha256-X3CMcdbUUFuvzU92RxfyKNbYPVuTGBFxWSE9xxj1ZpQ=",
-   "module": "sha256-1EEewZSC2fFSyheAsJWIOW/FJmrH5JnEjBk3wqjUNWE=",
-   "pom": "sha256-hFqMjt7tqtobdJFNThy7NQm+elsFe1vBAkBUqRP+ZvQ="
+  "org/springframework/boot#spring-boot-starter-validation/3.5.4": {
+   "jar": "sha256-ElLu3LPEPlq4FLxeCMhR5+LDLIkif/+/yuQBIPZC1H0=",
+   "module": "sha256-bav1B1GvM8fimEu0y+lhr5xPm+cMM0VUjgYpGnFWcrs=",
+   "pom": "sha256-dUYHXbZ8PrDEcgBGoljOKhEtV90/Dj/og9Q5CJbOPFQ="
   },
-  "org/springframework/boot#spring-boot-starter-web/3.5.3": {
-   "jar": "sha256-mqN5BnBNYMiHY2dQuB+TrMrivu0AK4GdErhGt95405A=",
-   "module": "sha256-47XClg8fyw+Wufcu6EdwV9XO0ApXFh1BNYD02bvzPLs=",
-   "pom": "sha256-ExcfDeNlFHyS9AxuhWJQkS2WY52LWbU17EIxKpY1R9A="
+  "org/springframework/boot#spring-boot-starter-web/3.5.4": {
+   "jar": "sha256-KxJKvsJtrzllTAnUBqW5EH1MUK8wg8D3hAXidgHoH7U=",
+   "module": "sha256-NgCWyJODQSkALJ2uVNvUGb71XrUi13BEuuecF+DEDaQ=",
+   "pom": "sha256-SXJxNzCSI+NhdkG83aXv3sYgKIUZpX/EqGMCi/cILBQ="
   },
-  "org/springframework/boot#spring-boot-starter/3.5.3": {
-   "jar": "sha256-0VGHHandNEbq2mM/80UEV71BlUQ/+M3EeXXGdeDmH1I=",
-   "module": "sha256-8B+98h6xG3PsE4B4Q1MXoR76TAGZDvXrSTJrGBHHRuE=",
-   "pom": "sha256-mPLJdQ4DgLMID1RgcSJAqQ1nENQmtiYG91WvHXIHyQs="
+  "org/springframework/boot#spring-boot-starter/3.5.4": {
+   "jar": "sha256-xUz1wxzFtgy+WWGpaJ2WTPklkSUErDMF8BdGruJLW3M=",
+   "module": "sha256-+jnO1/htbmCR/2sNyZCXj7SVnMpmPr1w1pbHWQSG9m0=",
+   "pom": "sha256-2meNIoJT90IFETIwUvvqOXmDx3JvQIqWB8iiV0Bz/mA="
   },
-  "org/springframework/boot#spring-boot-test-autoconfigure/3.5.3": {
-   "jar": "sha256-IJnYT75JoxTiQMEP4hP2TTXbmvLuQVJMmMuhagfDfco=",
-   "module": "sha256-n7TPI7Lbk++gny1rzkAHkwhWTVHWKo/BBXtbYd3s5+Q=",
-   "pom": "sha256-XNJjT7Lrh9h34vtJopFTeAJ5nvxILGc+JTSMdyLyj1A="
+  "org/springframework/boot#spring-boot-test-autoconfigure/3.5.4": {
+   "jar": "sha256-Fh0NSjZoGDES6BJDm3xCOo9zmjk5J7eqV4iJxfCknhA=",
+   "module": "sha256-ICA1FskNGD+QuKctCKWEGqERumeyRQSTauwRR4AXebQ=",
+   "pom": "sha256-owG/iyfAGTtQxu81AFklcy1hHcfqhfP3rBLNCuALjcQ="
   },
-  "org/springframework/boot#spring-boot-test/3.5.3": {
-   "jar": "sha256-SDBOU5SxrqhXM4sfieDRfbzzPAIOfhzKyD3fAdB1XWs=",
-   "module": "sha256-0Gpgn7qN8UTtdneB6/2GU3dM8rGjpGpDeDrUjAKhBnA=",
-   "pom": "sha256-2ezDeBIv6E4SHu+Bm86b/2od3iwZkPIOaYScaHW/pJs="
+  "org/springframework/boot#spring-boot-test/3.5.4": {
+   "jar": "sha256-yKzIQr8p/k78jpld/I3Ud8OvWDNJ3iJJpjRB1sVIiS8=",
+   "module": "sha256-nHjYp/y65mnTgp2f7KhUHPinHWpWW0fIFo/Hm6pLOiw=",
+   "pom": "sha256-/gGXCrUokkNEAa2fMZZFZJ9aqkH35rAH2QE8601SB9U="
   },
-  "org/springframework/boot#spring-boot/3.5.3": {
-   "jar": "sha256-JGwAj1oTG9EhlIgwMdgDnh+YAWQA2U+AOCgo4TYPiWU=",
-   "module": "sha256-WMg6YqtBoJXFLa7KxV3fEOMLd557T+kpWRtrDgqKVuc=",
-   "pom": "sha256-w+JR3x/0VL4uCurCecXvAk7QdL6HFqFhosnypmHtiGs="
+  "org/springframework/boot#spring-boot/3.5.4": {
+   "jar": "sha256-MwVepV+Pk3r/Gr/+F5hrmmujoDYcvKj7BCDBQV1xOtQ=",
+   "module": "sha256-ChRhKLH/PeGYeNIFprnpY6Uqv0nRu+5gAYYT2ixs/0Y=",
+   "pom": "sha256-kZPTrlYObkVJQ44IEn0SqroubT4R8Xl48QHXr3OE9CY="
   },
   "org/springframework/cloud#spring-cloud-dependencies-parent/4.2.1": {
    "pom": "sha256-ktuXOlcqL1nZIAYhy4EPPShvPfaG4nGCHzgAQgApjk0="
@@ -2444,37 +2503,41 @@
   "org/springframework/data#spring-data-bom/2025.0.0": {
    "pom": "sha256-HSgkDD0c0PeFjBUGIMBBPuryeAZIFoSPAm3weNWrzuA="
   },
-  "org/springframework/data#spring-data-bom/2025.0.1": {
-   "pom": "sha256-zz6aBUs8egfd4O6iRBvRypnHTkUf6hDjDOP2B7fN5s4="
+  "org/springframework/data#spring-data-bom/2025.0.2": {
+   "pom": "sha256-bMmwqaXV+P5/v3NcIBB2vRXFBmoeHe3gU0qKgIppu8w="
   },
-  "org/springframework/data#spring-data-commons/3.5.1": {
-   "jar": "sha256-E5/LaENLQYj6I2PgHooKFQ++afmUXBdeSZKCXLD8Idc=",
-   "pom": "sha256-hn+xDYGsLEHDwhdtUXOCB5hra1KXitDD6WfuTtg713A="
+  "org/springframework/data#spring-data-commons/3.5.2": {
+   "jar": "sha256-md3y8hnP9yR7HAdMbr0i3GhkCwXpE1M1idSIEWxMs20=",
+   "pom": "sha256-MNHjUTK8OSk3E27gpk9kk79VnUbxnzV/vqCp08QrkNg="
   },
-  "org/springframework/data#spring-data-jpa-parent/3.5.1": {
-   "pom": "sha256-liWse+AiKNl8MQhtCmiE6Osnzqh9ISp6SXucAnCYxs4="
+  "org/springframework/data#spring-data-jpa-parent/3.5.2": {
+   "pom": "sha256-RmPgbOjn3wW/1JIUov/dYcj+UqOz7Y3C7oVoSkPFsH0="
   },
-  "org/springframework/data#spring-data-jpa/3.5.1": {
-   "jar": "sha256-wYNTv6lB1f19OP1933v4VI6i3Grzl4R7Y4To0LsClGc=",
-   "pom": "sha256-nA+H3QkKCkXYx33GmiSsjsT6ilvJKHuDe8xa9u8Aaq0="
+  "org/springframework/data#spring-data-jpa/3.5.2": {
+   "jar": "sha256-LmFg6PvFItol3ZBlDWsrgJfKQfN+K7UlU918L+cHdTg=",
+   "pom": "sha256-OzDPXcO1M15cFuGMXllCsbJ5rCVVlwtFf2XosXZ0wf0="
   },
-  "org/springframework/data/build#spring-data-build/3.5.1": {
-   "pom": "sha256-AcatkPKLtqBb83dcro8B1ZceMVoUN0ztcBloxvwYqG0="
+  "org/springframework/data/build#spring-data-build/3.5.2": {
+   "pom": "sha256-AOrjCqPNZMws0w952ctAat5motDE8v0vDl+hHm2fnes="
   },
-  "org/springframework/data/build#spring-data-parent/3.5.1": {
-   "pom": "sha256-FOcH+2vA8hTVlcoeZ73KE/az+qJVDrBRQ3Gx/kuZpUw="
+  "org/springframework/data/build#spring-data-parent/3.5.2": {
+   "pom": "sha256-7NMJDhBwYrLRikltAlqsuYTJFcVEQHlUHbPCkSeTHfU="
   },
   "org/springframework/integration#spring-integration-bom/6.5.0": {
    "module": "sha256-sIDKqdzcYleLvBXAOKcGP3RHM9cYE0uL5eojrMTGhgo=",
    "pom": "sha256-n1tKuDG86ov66hik7KQXT/gTNBlQ8Fn1KEw2gvh4pNk="
   },
+  "org/springframework/integration#spring-integration-bom/6.5.1": {
+   "module": "sha256-XnyXPE08Y1fe4/EGXsw0NcH3jtpwHjb9KWElACxY3tk=",
+   "pom": "sha256-t1WmIh+KFElhjMs6Bhf/N0GDsHbpt+vjv08CX/rA590="
+  },
   "org/springframework/pulsar#spring-pulsar-bom/1.2.6": {
    "module": "sha256-AnY3pVoBecCTP3+fUvL5Ylnat5/YswkKGGIvACXMaUc=",
    "pom": "sha256-DmYnehfMhHBv2Gudke9AOwSwS2o95rbfASBD9efUtt0="
   },
-  "org/springframework/pulsar#spring-pulsar-bom/1.2.7": {
-   "module": "sha256-kdspID2WDFjwrVy76R4Cy4QOy+rbHh1gg3lXgv/OkLg=",
-   "pom": "sha256-b3SQr9C+eL4PZX+9cHEuEf8HO/sMuFRo0Jdwj771sDs="
+  "org/springframework/pulsar#spring-pulsar-bom/1.2.8": {
+   "module": "sha256-J2aS+86v8odYB9XyPBCyqckWikUlBonVOcZ6yAvQISQ=",
+   "pom": "sha256-piTc91oQy3pQ2t5siEosDk5myuC6uhlgT3vYZl5A3sU="
   },
   "org/springframework/restdocs#spring-restdocs-bom/3.0.3": {
    "pom": "sha256-BqUY6ZcWnX7d821cOtwAQOKThnvfofFo3al4QL0Pb3Y="
@@ -2490,49 +2553,49 @@
    "module": "sha256-a+5Aq/4syR3iHxOIJQHXhIIc9bnCR8rhKxy7orSVHi8=",
    "pom": "sha256-A3IGHIckh4W7kSq7yQIVgxxaAIvlRPpn3zpLFjaYHLQ="
   },
-  "org/springframework/security#spring-security-bom/6.5.1": {
-   "module": "sha256-0E2qBA6UCStDsb58aE6rrzowNxAJsEGmaG9VzvZm2j8=",
-   "pom": "sha256-BxaUK18DHJtLqEybd0VcBWMMN3Gj0Zwm80a8bRR1id8="
+  "org/springframework/security#spring-security-bom/6.5.2": {
+   "module": "sha256-cKCvr00aITH09ykZ+YEbz4ACSK52KHNoK14Y/Pmd5Us=",
+   "pom": "sha256-CjXf+jk6+OPsh8WuT8yBGjgNp5rTDKm7y/nVAl+9k6Q="
   },
-  "org/springframework/security#spring-security-config/6.5.1": {
-   "jar": "sha256-t0kNwlnvxWhuHn3NrLQkZC+PRHc5MP+REZnBIKl/HeE=",
-   "module": "sha256-iNOLBJNA/gEskRzyP1dKdBOYEXVch/uaj3GLkfpjLAw=",
-   "pom": "sha256-vppAE5JUsL1A2RsERzl42dk/6Lc+9JCzPncsAYA/VNc="
+  "org/springframework/security#spring-security-config/6.5.2": {
+   "jar": "sha256-R/9EJXeEOf28fwpv/G26QglzbOPylIlbQSalf+gUGzE=",
+   "module": "sha256-OIbAU2Rq4jOfXFfj5f9saTh2bUoGUaSkcZxX/yCcqsI=",
+   "pom": "sha256-gYj0ixEtRhNOguPzeRTXOKfNsIeYOZz0olJHlIrgS94="
   },
-  "org/springframework/security#spring-security-core/6.5.1": {
-   "jar": "sha256-LabOQU1EeoxBAwS1r6ovmX+Bx8vwmOjgdORO3YviQ5I=",
-   "module": "sha256-G8lw308llY3Rs1exzMIMfcbjsRhV4X4OyCTqSQYZLf8=",
-   "pom": "sha256-24SXSpZyoME+pLTUuqA6l/BX0S/618RFKTD5p3UKw+k="
+  "org/springframework/security#spring-security-core/6.5.2": {
+   "jar": "sha256-DWqQzXNzece/IPgSU3AyTuaBIEQr2FKTdI7oyJflcr8=",
+   "module": "sha256-V6lPW2hEkPemgpDz+zmFx+tgPBYXinbok3agzjQzlmw=",
+   "pom": "sha256-2kSuSWaZ8kdsr3uM+YAyN20rV9xCzdtezRTkbyhAiBQ="
   },
-  "org/springframework/security#spring-security-crypto/6.5.1": {
-   "jar": "sha256-SCqs81j2e3IxKrwkZcWUqv63LjeeT/qJAWUKTS1yNFY=",
-   "module": "sha256-Vzp3THro2rbTfEpjsW5qbk5uVqJAiH8aaT+WhNvG5P0=",
-   "pom": "sha256-33PSHI/jBllyQNjjAA03efgINDzVLjw69P1ie+KlW/Q="
+  "org/springframework/security#spring-security-crypto/6.5.2": {
+   "jar": "sha256-d6dAH38N/BbanDEISQsuhINXMy0+72D/BCYNZd69axs=",
+   "module": "sha256-F2zpUe6qPttgNEGQoqmv2ypfI7H2WZ9xkzaMLgrcKsQ=",
+   "pom": "sha256-wHBBew19Ou4NO+pFDoNZtbuQk+JtCqudwUN0sIomsqs="
   },
-  "org/springframework/security#spring-security-oauth2-client/6.5.1": {
-   "jar": "sha256-anT7hTAFRvPy0wIoIeNK+wsTYZQYgUJAL/4wfWKhpf4=",
-   "module": "sha256-B4Siw3nm9uu0YgxyDW8XJzTOHYt6W3WfOsL7TXoqow4=",
-   "pom": "sha256-T2+/0tQWFvS47+8FWm5vcLYu8J7xrzJOqrst8aOZQVI="
+  "org/springframework/security#spring-security-oauth2-client/6.5.2": {
+   "jar": "sha256-0PQt09mo2rtUS5xo9Zc8h4omZFOVXBaS6aQyv2Cmqn0=",
+   "module": "sha256-VE/yh3FJV9aZvTwzWB4pN4ggAqFd4NH5ovCQlL4sb88=",
+   "pom": "sha256-tJHCslydvaOFsGD2Br5QR6z257do+EBUlcET0qg8trw="
   },
-  "org/springframework/security#spring-security-oauth2-core/6.5.1": {
-   "jar": "sha256-PouMAqREViXA1xoj4Sw88nv8UyPJV10I2zmwj7RAIN8=",
-   "module": "sha256-6oFGjKTfiidxeqBuOM30Ca+XwVY/hLVQ4EPRpMzz/w8=",
-   "pom": "sha256-RzTdsaDQVFtgfWlV+Jyt8VqmjwpQRD1VM3+n1o5VhcM="
+  "org/springframework/security#spring-security-oauth2-core/6.5.2": {
+   "jar": "sha256-FY6rVElMNuzXjzMcgTmcbwVxZF+9153puVa911bxDLk=",
+   "module": "sha256-/V5bBeStjQUuBpX0P2/RN9LDRRqj5XxG7EITAGBtcMU=",
+   "pom": "sha256-s1+PI1OeddaMPrbGaUQvmH8NJvfUf0Nrmdn+2of7bwI="
   },
-  "org/springframework/security#spring-security-oauth2-jose/6.5.1": {
-   "jar": "sha256-zwYFLaKaqQyHeMSzq4V+wdr6OV6E4fpFpkUwrJ5JPxo=",
-   "module": "sha256-J1GYIN7jaukXsU0W858xpkqRN7A7AjZh6/TeN8UZRws=",
-   "pom": "sha256-COBfvpEfyACzU9jMjatWiSEqJjWtTo+8pjHxJ2XPcM4="
+  "org/springframework/security#spring-security-oauth2-jose/6.5.2": {
+   "jar": "sha256-iiIRFAycntGGH8LJ/2/4vKbjueauuPVjpo9EcVbI6nU=",
+   "module": "sha256-gXSlaz964spDAJnGLU6n7sVJc6XcLoSTLsDelOEc5NE=",
+   "pom": "sha256-avyaI3tOLwFSF/5CsbrJmqQA0PonZp1K4taV1fpmdmk="
   },
-  "org/springframework/security#spring-security-saml2-service-provider/6.5.1": {
-   "jar": "sha256-vIuRtlWvjU1R6UKD0nk5MZzH1wcH/OdlSOESE7jfo8I=",
-   "module": "sha256-KhAmBR0kt+UO2HwctVp2JgH8C8LNnjELONRDUdNi70A=",
-   "pom": "sha256-HL6Cs6rG5nDWBozqXArnAxjli5V0gmtWQ49UxsyBN9s="
+  "org/springframework/security#spring-security-saml2-service-provider/6.5.2": {
+   "jar": "sha256-dtXcPiU+sFN3Z6OTcmhuQaIJTbNuo0OE24683bqR6tc=",
+   "module": "sha256-zwJi/q45s6+8lnALkdxVdMdfmvdHxW4fM5lgZfmjByY=",
+   "pom": "sha256-fS0jRqpGhZCPtXh350ADj57pN5+x6NhNSAy5XZH1/5s="
   },
-  "org/springframework/security#spring-security-web/6.5.1": {
-   "jar": "sha256-5y+wXuwOApYBSZ5+sD/IqVNIZfwjaBsdSXJuyg3gktA=",
-   "module": "sha256-QIqFdI95TWimJ/EnaIfEomxzYmt1G29O/aHJiOOFxGY=",
-   "pom": "sha256-AHqOID8IcFD5jW7vUjtylPNJHxSF2wpqcXU+u8rwdxU="
+  "org/springframework/security#spring-security-web/6.5.2": {
+   "jar": "sha256-7tCBktfDENkSICjka+eoqSVHGdLQ+d23qb1slHbtj7Y=",
+   "module": "sha256-Ha9W0ol3fnErBw/ji/YOuOG92rD/N6xh8OG5E90QoKQ=",
+   "pom": "sha256-NLg8+B91S2/RE8LODWhx8znjU4HdU0QdJzXhMHWbDcE="
   },
   "org/springframework/session#spring-session-bom/3.5.0": {
    "module": "sha256-VEadBt68sGF5F4l5n5+W2JYFqN0x677k7cVF4gTVCHE=",
@@ -2550,14 +2613,17 @@
   "org/springframework/ws#spring-ws-bom/4.1.0": {
    "pom": "sha256-Ir4IB3DtzBIQBD/twTqykGbts6Zl98w4IgPFtLBFfVo="
   },
+  "org/springframework/ws#spring-ws-bom/4.1.1": {
+   "pom": "sha256-G7arwxEWNdrzesmXSEKCwxFyp/3qfZCCSWzIZn4sEWo="
+  },
   "org/testcontainers#testcontainers-bom/1.20.6": {
    "pom": "sha256-OKLdmRxz50sJmGQoOqiJ2MNk1pUcrgB4l6vLe+t0APE="
   },
   "org/testcontainers#testcontainers-bom/1.21.0": {
    "pom": "sha256-2NxVh3JJlq0p/HMtHIc/oSWXkNeTerxQna2zAyeuPeg="
   },
-  "org/testcontainers#testcontainers-bom/1.21.2": {
-   "pom": "sha256-1xbKVGkaTa7ttEGUI139aXRsJBOYCI7lD7mzHwuVW0Q="
+  "org/testcontainers#testcontainers-bom/1.21.3": {
+   "pom": "sha256-LOcXIm0dZ7Wx35cH7ZgCKjZqyJLZ5JbF8Bc/GreKCWU="
   },
   "org/thymeleaf#thymeleaf-lib/3.1.3.RELEASE": {
    "pom": "sha256-+UdIWb85tid8foaXGj9qfLtu8Jos9r6/D1XO8/GUgtw="
@@ -2593,12 +2659,12 @@
    "jar": "sha256-/Tbi0U/AgPeNFOHsaCDzskaY+IoGLMH1ksnrWbE5P80=",
    "pom": "sha256-yG/RQXp8lvK5zV6/hzHiqWNInSbJoSKeeBEStNAHElc="
   },
-  "org/xmlunit#xmlunit-core/2.10.2": {
-   "jar": "sha256-UeQZ/nq6fVCuxyfFv5AvjN8qrPQkh5gy5YES9z0/vCE=",
-   "pom": "sha256-zdDCCYG2VbFaaOG8FqXQ1EVhETY2qF58OiSsKlx9ABI="
+  "org/xmlunit#xmlunit-core/2.10.3": {
+   "jar": "sha256-VhGwyK51I3e1+WJEur2nQJf7g/C6OPQnqgsYNNCLAoY=",
+   "pom": "sha256-4lEOU/QoeYpiz/S5bUm4+YceuwAkFZLCoM7z7x8FPFA="
   },
-  "org/xmlunit#xmlunit-parent/2.10.2": {
-   "pom": "sha256-K9PJ4x5r0rPz459lnCJPZIcc1mtEGKePE0lJIHcadH8="
+  "org/xmlunit#xmlunit-parent/2.10.3": {
+   "pom": "sha256-ZsNDvIPhYEEVRpeEKqqCaBIcYTeoYySPDE5zaBS6dA8="
   },
   "org/yaml#snakeyaml/2.4": {
    "jar": "sha256-73ea9dKand6MxwzgNB9cb3c14j7f+Whc6qnTU1m3u38=",
diff --git a/pkgs/by-name/st/stirling-pdf/package.nix b/pkgs/by-name/st/stirling-pdf/package.nix
index 1ed29fca0573..7d2ed2dce625 100644
--- a/pkgs/by-name/st/stirling-pdf/package.nix
+++ b/pkgs/by-name/st/stirling-pdf/package.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "stirling-pdf";
-  version = "1.0.2";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "Stirling-Tools";
     repo = "Stirling-PDF";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mO1fOmkLDUFz46/d1+TF24pDBRNoteQ+hlrwgIRV8EQ=";
+    hash = "sha256-g5ugvnnFUXBfYFN1Z5+m9HTVSZ5KS9HGkIte3lKi/sA=";
   };
 
   patches = [
@@ -52,9 +52,9 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    install -Dm644 ./stirling-pdf/build/libs/stirling-pdf-*.jar $out/share/stirling-pdf/Stirling-PDF.jar
-    makeWrapper ${jre}/bin/java $out/bin/Stirling-PDF \
-        --add-flags "-jar $out/share/stirling-pdf/Stirling-PDF.jar"
+    install -Dm644 ./app/core/build/libs/stirling-pdf-*.jar $out/share/stirling-pdf/Stirling-PDF.jar
+    makeWrapper ${lib.getExe jre} $out/bin/Stirling-PDF \
+      --add-flags "-jar $out/share/stirling-pdf/Stirling-PDF.jar"
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/st/stirling-pdf/remove-props-file-timestamp.patch b/pkgs/by-name/st/stirling-pdf/remove-props-file-timestamp.patch
index 9f1b9541940e..4db2e5b2a196 100644
--- a/pkgs/by-name/st/stirling-pdf/remove-props-file-timestamp.patch
+++ b/pkgs/by-name/st/stirling-pdf/remove-props-file-timestamp.patch
@@ -1,12 +1,12 @@
 diff --git a/build.gradle b/build.gradle
-index 3dba68da..fde06f16 100644
+index 2c151d1..4c03638 100644
 --- a/build.gradle
 +++ b/build.gradle
-@@ -75,6 +75,7 @@ tasks.register('writeVersion') {
-         def props = new Properties()
-         props.setProperty("version", version)
-         props.store(propsFile.newWriter(), null)
-+        propsFile.text = propsFile.readLines().tail().join('\n')
-     }
+@@ -69,7 +69,6 @@ allprojects {
+ tasks.register('writeVersion', WriteProperties) {
+     outputFile = layout.projectDirectory.file('app/common/src/main/resources/version.properties')
+     println "Writing version.properties to ${outputFile.path}"
+-    comment = "${new Date()}"
+     property 'version', project.provider { project.version.toString() }
  }
  

From f3151796ccd1dc9eb3662611fc955f813c0d8ebe Mon Sep 17 00:00:00 2001
From: Sean Gilligan <sean@msgilligan.com>
Date: Thu, 14 Aug 2025 08:56:55 -0700
Subject: [PATCH 1708/3724] graalvm-oracle_25-ea: 25-ea-32 -> 25-ea-33

Update graalvm-oracle_25-ea to 25-ea-33, currently the latest version
available at: https://github.com/graalvm/oracle-graalvm-ea-builds/releases
---
 pkgs/development/compilers/graalvm/default.nix |  2 +-
 .../graalvm/graalvm-oracle/hashes.nix          | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 409553f9b2e4..beebfefbd0ab 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -24,7 +24,7 @@ lib.makeScope pkgs.newScope (
     truffleruby = self.callPackage ./community-edition/truffleruby { };
 
     graalvm-oracle_25-ea =
-      (self.callPackage ./graalvm-oracle { version = "25-ea-32"; }).overrideAttrs
+      (self.callPackage ./graalvm-oracle { version = "25-ea-33"; }).overrideAttrs
         (prev: {
           autoPatchelfIgnoreMissingDeps = [ "libonnxruntime.so.1" ];
         });
diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
index b593142b066b..34ab3e90724a 100644
--- a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
+++ b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
@@ -4,22 +4,22 @@
 # $ rg -No "(https://.+)\"" -r '$1' pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix | \
 #   parallel -k 'echo {}; nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(curl -s {}.sha256)'
 {
-  "25-ea-32" = {
+  "25-ea-33" = {
     "aarch64-linux" = {
-      hash = "sha256-JO/6VHxhd8Vetpv/iLKxNCL8wHa2VAfSIs0fiWdB4QA=";
-      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.32/graalvm-jdk-25.0.0-ea.32_linux-aarch64_bin.tar.gz";
+      hash = "sha256-VUwXu1zjjWY0K6aEpU0LhBvrz+y+H5lcspNON4Qaw6k=";
+      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.33/graalvm-jdk-25.0.0-ea.33_linux-aarch64_bin.tar.gz";
     };
     "x86_64-linux" = {
-      hash = "sha256-IevvXyhRnY/ujd3MriWULNcTYXOgt9h8bHhlJzkumjE=";
-      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.32/graalvm-jdk-25.0.0-ea.32_linux-x64_bin.tar.gz";
+      hash = "sha256-NU+tdKR9OlyE8RTVlS2w+a95ZUHBD2LDpXkqTnOL7No=";
+      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.33/graalvm-jdk-25.0.0-ea.33_linux-x64_bin.tar.gz";
     };
     "x86_64-darwin" = {
-      hash = "sha256-YhMGtXud6mer7UbSd6Eyl2d1rPKzEb6zF/NFtWLIG3E=";
-      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.32/graalvm-jdk-25.0.0-ea.32_macos-x64_bin.tar.gz";
+      hash = "sha256-TIKRKrYFjAG2BpQVp8mtbMkUlqYUpTy7R2pDH3D5Hag=";
+      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.33/graalvm-jdk-25.0.0-ea.33_macos-x64_bin.tar.gz";
     };
     "aarch64-darwin" = {
-      hash = "sha256-alNurm5ieedOi636Mnyq8BqFAyOV0dBaeTtDk4c4cPQ=";
-      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.32/graalvm-jdk-25.0.0-ea.32_macos-aarch64_bin.tar.gz";
+      hash = "sha256-hquwVXWFcGMOdmMbZHNtkYyojDKRosIi40jXOmkNlmE=";
+      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.33/graalvm-jdk-25.0.0-ea.33_macos-aarch64_bin.tar.gz";
     };
   };
   "23" = {

From 1e99a20850d9588ccd7f0f9138877a2f6f222719 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 04:20:10 +0000
Subject: [PATCH 1709/3724] pacemaker: 3.0.0 -> 3.0.1

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

diff --git a/pkgs/by-name/pa/pacemaker/package.nix b/pkgs/by-name/pa/pacemaker/package.nix
index 4de00b879af4..bbeee37f8d28 100644
--- a/pkgs/by-name/pa/pacemaker/package.nix
+++ b/pkgs/by-name/pa/pacemaker/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pacemaker";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "ClusterLabs";
     repo = "pacemaker";
     rev = "Pacemaker-${version}";
-    sha256 = "sha256-2Uj81hWNig30baS9a9Uc0+T1lZuADtcSDmn/TX5koL8=";
+    sha256 = "sha256-23YkNzqiimLy/KjO+hxVQQ4rUhSEhn5Oc2jUJO/VRo0=";
   };
 
   nativeBuildInputs = [

From 0ede95977b20c72cfb18a729f7d65835f3c81e84 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 14 Aug 2025 15:44:37 +0300
Subject: [PATCH 1710/3724] kdePackages: update licensing

---
 pkgs/kde/generated/licenses.json | 123 +++++++++++++++++++++----------
 1 file changed, 83 insertions(+), 40 deletions(-)

diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json
index 9a19e2020a8f..d474fff199eb 100644
--- a/pkgs/kde/generated/licenses.json
+++ b/pkgs/kde/generated/licenses.json
@@ -10,6 +10,7 @@
     "LicenseRef-KDE-Accepted-LGPL"
   ],
   "akonadi": [
+    "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
@@ -18,7 +19,9 @@
     "LGPL-2.0-only",
     "LGPL-2.0-or-later",
     "LGPL-2.1-or-later",
+    "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL",
+    "LicenseRef-KDE-Accepted-LGPL",
     "MIT"
   ],
   "akonadi-calendar": [
@@ -29,6 +32,7 @@
     "GPL-3.0-or-later",
     "LGPL-2.0-or-later",
     "LGPL-2.1-or-later",
+    "MIT",
     "Qt-Commercial-exception-1.0"
   ],
   "akonadi-calendar-tools": [
@@ -41,13 +45,15 @@
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-or-later",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "MIT"
   ],
   "akonadi-import-wizard": [
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-or-later",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "MIT"
   ],
   "akonadi-mime": [
     "BSD-3-Clause",
@@ -57,7 +63,8 @@
     "LGPL-2.0-or-later",
     "LGPL-2.1-or-later",
     "LGPL-3.0-only",
-    "LicenseRef-KDE-Accepted-LGPL"
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
   ],
   "akonadi-search": [
     "BSD-3-Clause",
@@ -70,7 +77,8 @@
     "LGPL-2.1-or-later",
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL",
-    "LicenseRef-KDE-Accepted-LGPL"
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
   ],
   "akonadiconsole": [
     "BSD-3-Clause",
@@ -80,7 +88,8 @@
     "GPL-3.0-only",
     "LGPL-2.0-or-later",
     "LGPL-2.1-or-later",
-    "LicenseRef-KDE-Accepted-GPL"
+    "LicenseRef-KDE-Accepted-GPL",
+    "MIT"
   ],
   "akregator": [
     "BSD-2-Clause",
@@ -88,6 +97,7 @@
     "CC0-1.0",
     "GPL-2.0-or-later",
     "LGPL-2.0-or-later",
+    "MIT",
     "Qt-Commercial-exception-1.0"
   ],
   "alligator": [
@@ -109,14 +119,11 @@
     "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
-    "GPL-2.0-only",
     "GPL-2.0-or-later",
-    "GPL-3.0-only",
     "LGPL-2.0-only",
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
     "LGPL-3.0-only",
-    "LicenseRef-KDE-Accepted-GPL",
     "LicenseRef-KDE-Accepted-LGPL",
     "MIT"
   ],
@@ -300,6 +307,7 @@
     "GPL-3.0-only",
     "LGPL-2.0-or-later",
     "LicenseRef-KDE-Accepted-GPL",
+    "MIT",
     "Qt-Commercial-exception-1.0"
   ],
   "calindori": [
@@ -334,9 +342,6 @@
     "GPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL"
   ],
-  "cervisia": [
-    "CC0-1.0"
-  ],
   "colord-kde": [
     "CC0-1.0",
     "LGPL-3.0-or-later"
@@ -376,9 +381,9 @@
     "GPL-2.0-or-later"
   ],
   "dragon": [
+    "BSD-2-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
-    "GPL-2.0-or-later",
     "GPL-3.0-only",
     "LGPL-3.0-or-later",
     "LicenseRef-KDE-Accepted-GPL"
@@ -412,6 +417,7 @@
     "CC0-1.0",
     "GPL-2.0-or-later",
     "LGPL-2.0-or-later",
+    "MIT",
     "Qt-Commercial-exception-1.0"
   ],
   "extra-cmake-modules": [
@@ -484,14 +490,16 @@
   "grantlee-editor": [
     "BSD-3-Clause",
     "CC0-1.0",
-    "GPL-2.0-or-later"
+    "GPL-2.0-or-later",
+    "MIT"
   ],
   "grantleetheme": [
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-or-later",
     "LGPL-2.0-or-later",
-    "LGPL-2.1-or-later"
+    "LGPL-2.1-or-later",
+    "MIT"
   ],
   "gwenview": [
     "BSD-3-Clause",
@@ -507,6 +515,7 @@
     "GPL-3.0-only",
     "LGPL-2.0-or-later",
     "LicenseRef-KDE-Accepted-GPL",
+    "MIT",
     "Qt-Commercial-exception-1.0"
   ],
   "isoimagewriter": [
@@ -558,6 +567,7 @@
     "GPL-2.0-only",
     "GPL-2.0-or-later",
     "LGPL-2.0-or-later",
+    "MIT",
     "Qt-Commercial-exception-1.0"
   ],
   "kajongg": [
@@ -603,7 +613,6 @@
   "kamoso": [
     "CC0-1.0",
     "GPL-2.0-or-later",
-    "LGPL-2.1-only",
     "LGPL-2.1-or-later"
   ],
   "kanagram": [
@@ -725,7 +734,8 @@
     "BSD-3-Clause",
     "CC0-1.0",
     "LGPL-2.0-or-later",
-    "LGPL-2.1-or-later"
+    "LGPL-2.1-or-later",
+    "MIT"
   ],
   "kcharselect": [
     "BSD-3-Clause",
@@ -882,7 +892,8 @@
   "kdebugsettings": [
     "BSD-3-Clause",
     "CC0-1.0",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "MIT"
   ],
   "kdeclarative": [
     "CC0-1.0",
@@ -922,10 +933,17 @@
     "CC0-1.0"
   ],
   "kdegraphics-mobipocket": [
-    "CC0-1.0"
+    "CC0-1.0",
+    "GPL-2.0-or-later",
+    "LGPL-2.1-or-later"
   ],
   "kdegraphics-thumbnailers": [
-    "CC0-1.0"
+    "CC0-1.0",
+    "GPL-2.0-or-later",
+    "LGPL-2.0-or-later",
+    "LGPL-2.1-only",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-LGPL"
   ],
   "kdenetwork-filesharing": [
     "BSD-3-Clause",
@@ -1244,7 +1262,8 @@
     "LGPL-2.1-only",
     "LGPL-2.1-or-later",
     "LGPL-3.0-only",
-    "LicenseRef-KDE-Accepted-LGPL"
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
   ],
   "kidletime": [
     "CC0-1.0",
@@ -1294,7 +1313,8 @@
     "CC0-1.0",
     "GPL-2.0-or-later",
     "LGPL-2.0-only",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "MIT"
   ],
   "kinfocenter": [
     "BSD-2-Clause",
@@ -1487,6 +1507,7 @@
     "LGPL-2.0-only",
     "LGPL-2.0-or-later",
     "LicenseRef-KDE-Accepted-GPL",
+    "MIT",
     "Qt-Commercial-exception-1.0"
   ],
   "kmail-account-wizard": [
@@ -1495,19 +1516,22 @@
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
     "LGPL-3.0-only",
-    "LicenseRef-KDE-Accepted-LGPL"
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
   ],
   "kmailtransport": [
     "BSD-3-Clause",
     "CC0-1.0",
     "LGPL-2.0-or-later",
-    "LGPL-2.1-or-later"
+    "LGPL-2.1-or-later",
+    "MIT"
   ],
   "kmbox": [
     "BSD-3-Clause",
     "CC0-1.0",
     "LGPL-2.0-only",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "MIT"
   ],
   "kmenuedit": [
     "CC0-1.0",
@@ -1591,10 +1615,13 @@
     "BSD-3-Clause",
     "CC-BY-4.0",
     "CC0-1.0",
+    "GPL-2.0-only",
+    "GPL-3.0-only",
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
     "LGPL-2.1-or-later",
     "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-GPL",
     "LicenseRef-KDE-Accepted-LGPL"
   ],
   "kolf": [
@@ -1667,6 +1694,7 @@
     "GPL-2.0-or-later",
     "LGPL-2.0-only",
     "LGPL-2.0-or-later",
+    "MIT",
     "Qt-Commercial-exception-1.0"
   ],
   "kontactinterface": [
@@ -1676,7 +1704,8 @@
     "LGPL-2.0-or-later",
     "LGPL-2.1-or-later",
     "LGPL-3.0-only",
-    "LicenseRef-KDE-Accepted-LGPL"
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
   ],
   "kontrast": [
     "BSD-2-Clause",
@@ -1702,13 +1731,13 @@
   "korganizer": [
     "BSD-3-Clause",
     "CC0-1.0",
-    "GPL-2.0-only",
     "GPL-2.0-or-later",
     "LGPL-2.0-only",
     "LGPL-2.0-or-later",
     "LGPL-2.1-or-later",
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-LGPL",
+    "MIT",
     "Qt-Commercial-exception-1.0"
   ],
   "kosmindoormap": [
@@ -1755,7 +1784,8 @@
     "LGPL-2.1-or-later",
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL",
-    "LicenseRef-KDE-Accepted-LGPL"
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
   ],
   "kpipewire": [
     "Apache-2.0",
@@ -1769,7 +1799,8 @@
   "kpkpass": [
     "BSD-3-Clause",
     "CC0-1.0",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "MIT"
   ],
   "kplotting": [
     "CC0-1.0",
@@ -1879,6 +1910,7 @@
     "LicenseRef-KDE-Accepted-GPL"
   ],
   "kscreenlocker": [
+    "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
@@ -1911,7 +1943,8 @@
     "BSD-3-Clause",
     "CC0-1.0",
     "LGPL-2.0-or-later",
-    "LGPL-2.1-or-later"
+    "LGPL-2.1-or-later",
+    "MIT"
   ],
   "ksnakeduel": [
     "BSD-3-Clause",
@@ -1996,7 +2029,8 @@
   "ktnef": [
     "BSD-3-Clause",
     "CC0-1.0",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "MIT"
   ],
   "ktorrent": [
     "BSD-3-Clause",
@@ -2198,7 +2232,8 @@
   "libgravatar": [
     "BSD-3-Clause",
     "CC0-1.0",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "MIT"
   ],
   "libkcddb": [
     "BSD-3-Clause",
@@ -2227,6 +2262,7 @@
     "CC0-1.0",
     "GPL-2.0-or-later",
     "LGPL-2.0-or-later",
+    "MIT",
     "Qt-Commercial-exception-1.0"
   ],
   "libkeduvocdocument": [
@@ -2250,10 +2286,8 @@
     "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
-    "GCC-exception-3.1",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
-    "GPL-3.0-or-later",
     "LGPL-2.0-or-later"
   ],
   "libkmahjongg": [
@@ -2286,7 +2320,8 @@
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "MIT"
   ],
   "libksysguard": [
     "BSD-2-Clause",
@@ -2347,7 +2382,8 @@
     "LGPL-2.0-or-later",
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL",
-    "LicenseRef-KDE-Accepted-LGPL"
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
   ],
   "mailimporter": [
     "BSD-3-Clause",
@@ -2356,7 +2392,8 @@
     "GPL-2.0-or-later",
     "GPL-3.0-only",
     "LGPL-2.0-or-later",
-    "LicenseRef-KDE-Accepted-GPL"
+    "LicenseRef-KDE-Accepted-GPL",
+    "MIT"
   ],
   "marble": [
     "Apache-2.0",
@@ -2384,7 +2421,8 @@
   "mbox-importer": [
     "BSD-3-Clause",
     "CC0-1.0",
-    "GPL-2.0-or-later"
+    "GPL-2.0-or-later",
+    "MIT"
   ],
   "merkuro": [
     "BSD-2-Clause",
@@ -2552,19 +2590,22 @@
     "CC0-1.0",
     "GFDL-1.2-or-later",
     "GPL-2.0-or-later",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "MIT"
   ],
   "pim-sieve-editor": [
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-or-later",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "MIT"
   ],
   "pimcommon": [
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-or-later",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "MIT"
   ],
   "plasma-activities": [
     "CC0-1.0",
@@ -3016,8 +3057,10 @@
     "LGPL-2.0-or-later"
   ],
   "tokodon": [
+    "AGPL-3.0-or-later",
     "BSD-2-Clause",
     "BSD-3-Clause",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",

From bf16cf283e316fb252df1238ef62157758feb22c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 14 Aug 2025 15:44:49 +0300
Subject: [PATCH 1711/3724] kdePackages: update dependencies

---
 pkgs/kde/frameworks/kguiaddons/default.nix    |   6 +-
 pkgs/kde/generated/dependencies.json          | 141 ++++++++++++++----
 .../kde/plasma/polkit-kde-agent-1/default.nix |   2 +
 3 files changed, 117 insertions(+), 32 deletions(-)

diff --git a/pkgs/kde/frameworks/kguiaddons/default.nix b/pkgs/kde/frameworks/kguiaddons/default.nix
index 4392d4ad5b44..10087e2f46d6 100644
--- a/pkgs/kde/frameworks/kguiaddons/default.nix
+++ b/pkgs/kde/frameworks/kguiaddons/default.nix
@@ -2,7 +2,6 @@
   mkKdeDerivation,
   qtwayland,
   pkg-config,
-  wayland-protocols,
 }:
 mkKdeDerivation {
   pname = "kguiaddons";
@@ -10,9 +9,6 @@ mkKdeDerivation {
   hasPythonBindings = true;
 
   extraNativeBuildInputs = [ pkg-config ];
-  extraBuildInputs = [
-    qtwayland
-    wayland-protocols
-  ];
+  extraBuildInputs = [ qtwayland ];
   meta.mainProgram = "kde-geo-uri-handler";
 }
diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json
index a2a8f6c02a6d..58f03bb030f1 100644
--- a/pkgs/kde/generated/dependencies.json
+++ b/pkgs/kde/generated/dependencies.json
@@ -20,6 +20,7 @@
       "kiconthemes",
       "kitemmodels",
       "kwidgetsaddons",
+      "kwindowsystem",
       "kxmlgui"
     ],
     "akonadi-calendar": [
@@ -154,6 +155,7 @@
       "kguiaddons",
       "ki18n",
       "kirigami",
+      "kirigami-addons",
       "kstatusnotifieritem",
       "kwidgetsaddons",
       "kwindowsystem",
@@ -184,8 +186,6 @@
       "ktexteditor",
       "kwidgetsaddons",
       "kwindowsystem",
-      "phonon",
-      "qca",
       "solid",
       "threadweaver"
     ],
@@ -340,8 +340,7 @@
       "ki18n",
       "knewstuff",
       "kpackage",
-      "ksvg",
-      "kwindowsystem"
+      "ksvg"
     ],
     "baloo": [
       "extra-cmake-modules",
@@ -618,13 +617,13 @@
       "kwidgetsaddons",
       "kwindowsystem"
     ],
-    "croutons": [
-      "extra-cmake-modules"
-    ],
     "crow-translate": [
       "extra-cmake-modules",
       "kwayland"
     ],
+    "cxx-rust-cssparser": [
+      "extra-cmake-modules"
+    ],
     "daykountdown": [
       "extra-cmake-modules",
       "kcoreaddons",
@@ -706,7 +705,6 @@
       "kuserfeedback",
       "kwindowsystem",
       "packagekit-qt",
-      "phonon",
       "selenium-webdriver-at-spi",
       "solid"
     ],
@@ -1130,6 +1128,7 @@
       "kio",
       "kservice",
       "kwidgetsaddons",
+      "kwindowsystem",
       "kxmlgui"
     ],
     "kaddressbook": [
@@ -1157,6 +1156,24 @@
       "kxmlgui",
       "solid"
     ],
+    "kaichat": [
+      "extra-cmake-modules",
+      "kcompletion",
+      "kconfig",
+      "kcoreaddons",
+      "kcrash",
+      "kdbusaddons",
+      "kdoctools",
+      "ki18n",
+      "kiconthemes",
+      "kio",
+      "kitemviews",
+      "kstatusnotifieritem",
+      "ktextaddons",
+      "kwidgetsaddons",
+      "kxmlgui",
+      "purpose"
+    ],
     "kaidan": [
       "extra-cmake-modules",
       "kcoreaddons",
@@ -2378,7 +2395,8 @@
     "kguiaddons": [
       "extra-cmake-modules",
       "plasma-wayland-protocols",
-      "wayland"
+      "wayland",
+      "wayland-protocols"
     ],
     "khangman": [
       "extra-cmake-modules",
@@ -2625,7 +2643,8 @@
     "kio-fuse": [
       "extra-cmake-modules",
       "kcoreaddons",
-      "kio"
+      "kio",
+      "kio-extras"
     ],
     "kio-gdrive": [
       "extra-cmake-modules",
@@ -2705,6 +2724,15 @@
       "kirigami",
       "kirigami-addons"
     ],
+    "kiss": [
+      "extra-cmake-modules",
+      "kconfig",
+      "kcoreaddons",
+      "ki18n",
+      "kpackage",
+      "libkscreen",
+      "plasma-desktop"
+    ],
     "kitemmodels": [
       "extra-cmake-modules"
     ],
@@ -3063,6 +3091,7 @@
       "kconfig",
       "kcontacts",
       "kcoreaddons",
+      "kcrash",
       "kdiagram",
       "kguiaddons",
       "kholidays",
@@ -3136,6 +3165,14 @@
       "libkdegames",
       "libplasma"
     ],
+    "knighttime": [
+      "extra-cmake-modules",
+      "kconfig",
+      "kcoreaddons",
+      "kdbusaddons",
+      "kholidays",
+      "ki18n"
+    ],
     "knotifications": [
       "extra-cmake-modules",
       "kconfig"
@@ -3234,6 +3271,20 @@
       "kxmlgui",
       "syntax-highlighting"
     ],
+    "komodo": [
+      "extra-cmake-modules",
+      "kcolorscheme",
+      "kconfig",
+      "kcoreaddons",
+      "kdbusaddons",
+      "kguiaddons",
+      "ki18n",
+      "kiconthemes",
+      "kirigami",
+      "kirigami-addons",
+      "kitemmodels",
+      "qqc2-desktop-style"
+    ],
     "kompare": [
       "extra-cmake-modules",
       "kcodecs",
@@ -3334,6 +3385,11 @@
       "kwindowsystem",
       "kxmlgui"
     ],
+    "kontainer": [
+      "extra-cmake-modules",
+      "ki18n",
+      "kio"
+    ],
     "kontrast": [
       "extra-cmake-modules",
       "futuresql",
@@ -3417,13 +3473,11 @@
       "kholidays",
       "ki18n",
       "kiconthemes",
-      "kidentitymanagement",
       "kitemviews",
       "kjobwidgets",
       "kldap",
       "kmailtransport",
       "kmime",
-      "knewstuff",
       "kontactinterface",
       "kparts",
       "kuserfeedback",
@@ -3633,6 +3687,16 @@
       "kproperty",
       "kwidgetsaddons"
     ],
+    "kretro": [
+      "extra-cmake-modules",
+      "kconfig",
+      "kcoreaddons",
+      "ki18n",
+      "kiconthemes",
+      "kirigami",
+      "kirigami-addons",
+      "qqc2-desktop-style"
+    ],
     "kreversi": [
       "extra-cmake-modules",
       "kcolorscheme",
@@ -3695,6 +3759,7 @@
       "kcoreaddons",
       "ki18n",
       "kitemmodels",
+      "kwindowsystem",
       "threadweaver"
     ],
     "krusader": [
@@ -3866,6 +3931,9 @@
       "kwallet",
       "kwidgetsaddons"
     ],
+    "kst-plot": [
+      "extra-cmake-modules"
+    ],
     "kstars": [
       "breeze-icons",
       "extra-cmake-modules",
@@ -4244,12 +4312,10 @@
       "extra-cmake-modules"
     ],
     "kwin": [
-      "aurorae",
       "breeze",
       "breeze-icons",
       "extra-cmake-modules",
       "kcmutils",
-      "kcolorscheme",
       "kconfig",
       "kconfigwidgets",
       "kcoreaddons",
@@ -4281,7 +4347,6 @@
       "wayland-protocols"
     ],
     "kwin-x11": [
-      "aurorae",
       "breeze",
       "breeze-icons",
       "extra-cmake-modules",
@@ -4301,6 +4366,7 @@
       "knewstuff",
       "knotifications",
       "kpackage",
+      "kpipewire",
       "kscreenlocker",
       "kservice",
       "ksvg",
@@ -4643,8 +4709,7 @@
       "ki18n",
       "kio",
       "knewstuff",
-      "kparts",
-      "kwallet"
+      "kparts"
     ],
     "mark": [
       "extra-cmake-modules",
@@ -5122,6 +5187,7 @@
       "plasma-activities"
     ],
     "plasma-bigscreen": [
+      "bluez-qt",
       "kauth",
       "kcmutils",
       "kcodecs",
@@ -5130,6 +5196,7 @@
       "kconfigwidgets",
       "kcoreaddons",
       "ki18n",
+      "kiconthemes",
       "kio",
       "kjobwidgets",
       "knotifications",
@@ -5139,6 +5206,7 @@
       "kwayland",
       "kwidgetsaddons",
       "kwindowsystem",
+      "libkscreen",
       "libplasma",
       "plasma-activities",
       "plasma-activities-stats",
@@ -5176,6 +5244,7 @@
       "baloo",
       "breeze",
       "extra-cmake-modules",
+      "kaccounts-integration",
       "kactivitymanagerd",
       "kauth",
       "kcmutils",
@@ -5287,9 +5356,25 @@
     ],
     "plasma-keyboard": [
       "extra-cmake-modules",
+      "kcmutils",
+      "kconfig",
       "kcoreaddons",
       "ki18n"
     ],
+    "plasma-login-manager": [
+      "extra-cmake-modules",
+      "kauth",
+      "kcmutils",
+      "kconfig",
+      "kdbusaddons",
+      "ki18n",
+      "kio",
+      "kpackage",
+      "kwindowsystem",
+      "layer-shell-qt",
+      "libplasma",
+      "plasma-workspace"
+    ],
     "plasma-mobile": [
       "bluedevil",
       "bluez-qt",
@@ -5418,7 +5503,6 @@
       "kcompletion",
       "kconfig",
       "kcoreaddons",
-      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kiconthemes",
@@ -5532,7 +5616,6 @@
       "kbookmarks",
       "kcmutils",
       "kcodecs",
-      "kcolorscheme",
       "kcompletion",
       "kconfig",
       "kconfigwidgets",
@@ -5541,6 +5624,7 @@
       "kdbusaddons",
       "kdeclarative",
       "kded",
+      "kdesu",
       "kfilemetadata",
       "kglobalaccel",
       "kglobalacceld",
@@ -5646,7 +5730,6 @@
       "kcrash",
       "kdbusaddons",
       "ki18n",
-      "knotifications",
       "kwindowsystem",
       "polkit-qt-1"
     ],
@@ -5839,7 +5922,6 @@
       "extra-cmake-modules",
       "kcolorscheme",
       "kconfig",
-      "kconfigwidgets",
       "kcoreaddons",
       "kcrash",
       "kdbusaddons",
@@ -6137,7 +6219,6 @@
     "systemsettings": [
       "extra-cmake-modules",
       "kcmutils",
-      "kcolorscheme",
       "kconfig",
       "kcrash",
       "kdbusaddons",
@@ -6160,7 +6241,6 @@
     ],
     "tellico": [
       "extra-cmake-modules",
-      "kcolorscheme",
       "kconfig",
       "kconfigwidgets",
       "kcrash",
@@ -6169,12 +6249,12 @@
       "ki18n",
       "kiconthemes",
       "kio",
-      "kio-extras",
       "kitemmodels",
       "knewstuff",
       "kwidgetsaddons",
       "libkcddb",
-      "libksane"
+      "libksane",
+      "solid"
     ],
     "telly-skout": [
       "extra-cmake-modules",
@@ -6220,6 +6300,7 @@
       "kwindowsystem",
       "prison",
       "purpose",
+      "qcoro",
       "qqc2-desktop-style",
       "qtkeychain",
       "selenium-webdriver-at-spi"
@@ -6236,6 +6317,9 @@
       "kconfig",
       "kcoreaddons",
       "kcrash",
+      "kdev-php",
+      "kdevelop",
+      "kdevelop-pg-qt",
       "kdoctools",
       "ki18n",
       "kiconthemes",
@@ -6246,7 +6330,10 @@
       "kxmlgui"
     ],
     "union": [
-      "extra-cmake-modules"
+      "cxx-rust-cssparser",
+      "extra-cmake-modules",
+      "kiconthemes",
+      "kirigami"
     ],
     "upnp-lib-qt": [
       "extra-cmake-modules",
@@ -6375,5 +6462,5 @@
       "kwindowsystem"
     ]
   },
-  "version": "53cdc203"
+  "version": "723afe12"
 }
\ No newline at end of file
diff --git a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix
index f87d21cd21b8..26e9f16d477c 100644
--- a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix
+++ b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix
@@ -2,6 +2,7 @@
   mkKdeDerivation,
   qtdeclarative,
   kirigami,
+  knotifications,
 }:
 mkKdeDerivation {
   pname = "polkit-kde-agent-1";
@@ -9,5 +10,6 @@ mkKdeDerivation {
   extraBuildInputs = [
     qtdeclarative
     kirigami
+    knotifications
   ];
 }

From 9c28cf65f7ffbff47e0e9c7acc2c2fb4639f549d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 14 Aug 2025 15:45:15 +0300
Subject: [PATCH 1712/3724] kdePackages: update projects

---
 pkgs/kde/generated/projects.json | 110 ++++++++++++++++++++++++++-----
 1 file changed, 94 insertions(+), 16 deletions(-)

diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json
index 85743e9111dc..2125ea7bc26c 100644
--- a/pkgs/kde/generated/projects.json
+++ b/pkgs/kde/generated/projects.json
@@ -206,7 +206,7 @@
   "amarok-history": {
     "description": "Amarok history",
     "name": "amarok-history",
-    "project_path": "multimedia/amarok/amarok-history",
+    "project_path": "historical/amarok-history",
     "repo_path": "historical/amarok-history"
   },
   "amor": {
@@ -638,7 +638,7 @@
   "calligra-history": {
     "description": "The home of inactive branches for Calligra Suite.",
     "name": "calligra-history",
-    "project_path": "calligra/calligra-history",
+    "project_path": "historical/calligra-history",
     "repo_path": "historical/calligra-history"
   },
   "calligraplan": {
@@ -797,6 +797,12 @@
     "project_path": "libs/cxx-kde-frameworks",
     "repo_path": "libraries/cxx-kde-frameworks"
   },
+  "cxx-rust-cssparser": {
+    "description": "Library for parsing CSS using the Rust cssparser crate",
+    "name": "cxx-rust-cssparser",
+    "project_path": "libraries/cxx-rust-cssparser",
+    "repo_path": "libraries/cxx-rust-cssparser"
+  },
   "cxx11-cmake-modules": {
     "description": "CMake modules for detecting C++11 features supported by the compiler",
     "name": "cxx11-cmake-modules",
@@ -836,7 +842,7 @@
   "digikam-doc": {
     "description": "Documentation for the digiKam photo management application",
     "name": "digikam-doc",
-    "project_path": "graphics/digikam/digikam-doc",
+    "project_path": "documentation/digikam-doc",
     "repo_path": "documentation/digikam-doc"
   },
   "digikam-software-compilation": {
@@ -1181,6 +1187,12 @@
     "project_path": "kdegraphics/gwenview",
     "repo_path": "graphics/gwenview"
   },
+  "hana": {
+    "description": "Application to capture thumbnails from video files",
+    "name": "hana",
+    "project_path": "multimedia/hana",
+    "repo_path": "multimedia/hana"
+  },
   "haruna": {
     "description": "Open source video player built with Qt/QML and libmpv.",
     "name": "haruna",
@@ -1991,11 +2003,11 @@
     "project_path": "unmaintained/kdeexamples",
     "repo_path": "unmaintained/kdeexamples"
   },
-  "kdegraphics": {
+  "kdegraphics-collection": {
     "description": "Super-repository which holds the history of the kdegraphics toplevel files",
-    "name": "kdegraphics",
-    "project_path": "unmaintained/kdegraphics",
-    "repo_path": "unmaintained/kdegraphics"
+    "name": "kdegraphics-collection",
+    "project_path": "unmaintained/kdegraphics-collection",
+    "repo_path": "unmaintained/kdegraphics-collection"
   },
   "kdegraphics-mobipocket": {
     "description": "A collection of plugins to handle mobipocket files",
@@ -2564,7 +2576,7 @@
   "kglobalacceld": {
     "description": "Daemon providing Global Keyboard Shortcut (Accelerator) functionality",
     "name": "kglobalacceld",
-    "project_path": "base/kglobalacceld",
+    "project_path": "workspace/kglobalacceld",
     "repo_path": "plasma/kglobalacceld"
   },
   "kgoldrunner": {
@@ -3119,6 +3131,12 @@
     "project_path": "kdegames/knights",
     "repo_path": "games/knights"
   },
+  "knighttime": {
+    "description": "Helpers for scheduling the dark-light cycle",
+    "name": "knighttime",
+    "project_path": "workspace/knighttime",
+    "repo_path": "plasma/knighttime"
+  },
   "knipptasch": {
     "description": "Personal accounting application that aims to be the simplest for basic use",
     "name": "knipptasch",
@@ -3257,6 +3275,12 @@
     "project_path": "sdk/kommit",
     "repo_path": "sdk/kommit"
   },
+  "komodo": {
+    "description": "todo.txt Kirigami GUI application",
+    "name": "komodo",
+    "project_path": "utilities/komodo",
+    "repo_path": "utilities/komodo"
+  },
   "kompare": {
     "description": "Graphical File Differences Tool",
     "name": "kompare",
@@ -3299,6 +3323,12 @@
     "project_path": "pim/kontactinterface",
     "repo_path": "pim/kontactinterface"
   },
+  "kontainer": {
+    "description": "Qt DistroBox GUI",
+    "name": "kontainer",
+    "project_path": "sysadmin/kontainer",
+    "repo_path": "system/kontainer"
+  },
   "kontaminuti": {
     "description": "Kontaminuti is a simple helper utility to time your activities according to the Pomodoro Technique.",
     "name": "kontaminuti",
@@ -3623,6 +3653,12 @@
     "project_path": "libs/kreport",
     "repo_path": "libraries/kreport"
   },
+  "kretro": {
+    "description": "Libretro Emulation Frontend for Plasma",
+    "name": "kretro",
+    "project_path": "games/kretro",
+    "repo_path": "games/kretro"
+  },
   "kreversi": {
     "description": "KReversi is is a simple one player strategy game played against the computer",
     "name": "kreversi",
@@ -4319,12 +4355,42 @@
     "project_path": "workspace/kwin",
     "repo_path": "plasma/kwin"
   },
+  "kwin-arhud-warping": {
+    "description": "KWin Effect to warp certain outputs for ArHUD",
+    "name": "kwin-arhud-warping",
+    "project_path": "automotive/kwin-arhud-warping",
+    "repo_path": "automotive/kwin-arhud-warping"
+  },
+  "kwin-blur-ng": {
+    "description": "Next generation Blur plugin for KWin",
+    "name": "kwin-blur-ng",
+    "project_path": "automotive/kwin-blur-ng",
+    "repo_path": "automotive/kwin-blur-ng"
+  },
+  "kwin-gamepad": {
+    "description": "KWin plugin to add support for gamepads",
+    "name": "kwin-gamepad",
+    "project_path": "automotive/kwin-gamepad",
+    "repo_path": "automotive/kwin-gamepad"
+  },
+  "kwin-sharedtextures": {
+    "description": "KWin support for Wayland shared textures",
+    "name": "kwin-sharedtextures",
+    "project_path": "automotive/kwin-sharedtextures",
+    "repo_path": "automotive/kwin-sharedtextures"
+  },
   "kwin-x11": {
     "description": "Easy to use, but flexible, X Window Manager",
     "name": "kwin-x11",
     "project_path": "workspace/kwin-x11",
     "repo_path": "plasma/kwin-x11"
   },
+  "kwin-zones": {
+    "description": "Wayland ext-zones for KWin",
+    "name": "kwin-zones",
+    "project_path": "automotive/kwin-zones",
+    "repo_path": "automotive/kwin-zones"
+  },
   "kwindowsaddons": {
     "description": "Runtime components for KDE software on Windows",
     "name": "kwindowsaddons",
@@ -4652,13 +4718,13 @@
   "libstreamanalyzer": {
     "description": "Strigi libstreamanalyzer",
     "name": "libstreamanalyzer",
-    "project_path": "kdesupport/strigi/libstreamanalyzer",
+    "project_path": "unmaintained/libstreamanalyzer",
     "repo_path": "unmaintained/libstreamanalyzer"
   },
   "libstreams": {
     "description": "Strigi libstreams",
     "name": "libstreams",
-    "project_path": "kdesupport/strigi/libstreams",
+    "project_path": "unmaintained/libstreams",
     "repo_path": "unmaintained/libstreams"
   },
   "libtagaro": {
@@ -4913,6 +4979,12 @@
     "project_path": "base/mauiman",
     "repo_path": "maui/mauiman"
   },
+  "mbition-wayland-protocols": {
+    "description": "Non-standard Wayland protocols authored by Mbition",
+    "name": "mbition-wayland-protocols",
+    "project_path": "automotive/mbition-wayland-protocols",
+    "repo_path": "automotive/mbition-wayland-protocols"
+  },
   "mbox-importer": {
     "description": "Wizard to assist with importing MBox email archives into Akonadi",
     "name": "mbox-importer",
@@ -6368,8 +6440,8 @@
   "spectacle": {
     "description": "Screenshot capture utility",
     "name": "spectacle",
-    "project_path": "kdegraphics/spectacle",
-    "repo_path": "graphics/spectacle"
+    "project_path": "kdeworkspace/spectacle",
+    "repo_path": "plasma/spectacle"
   },
   "sprinter": {
     "description": "Multi-agent query parser and result generator",
@@ -6416,7 +6488,7 @@
   "strigi": {
     "description": "Strigi",
     "name": "strigi",
-    "project_path": "kdesupport/strigi/strigi",
+    "project_path": "unmaintained/strigi",
     "repo_path": "unmaintained/strigi"
   },
   "strigi-multimedia": {
@@ -6428,19 +6500,19 @@
   "strigiclient": {
     "description": "Strigi client",
     "name": "strigiclient",
-    "project_path": "kdesupport/strigi/strigiclient",
+    "project_path": "unmaintained/strigiclient",
     "repo_path": "unmaintained/strigiclient"
   },
   "strigidaemon": {
     "description": "Strigi daemon",
     "name": "strigidaemon",
-    "project_path": "kdesupport/strigi/strigidaemon",
+    "project_path": "unmaintained/strigidaemon",
     "repo_path": "unmaintained/strigidaemon"
   },
   "strigiutils": {
     "description": "Strigi utilities",
     "name": "strigiutils",
-    "project_path": "kdesupport/strigi/strigiutils",
+    "project_path": "unmaintained/strigiutils",
     "repo_path": "unmaintained/strigiutils"
   },
   "subtitlecomposer": {
@@ -7685,6 +7757,12 @@
     "project_path": "websites/kube-kde-org",
     "repo_path": "websites/kube-kde-org"
   },
+  "websites-l10n-kde-org": {
+    "description": "Main localization and internalization portal - l10n.kde.org",
+    "name": "websites-l10n-kde-org",
+    "project_path": "websites/l10n-kde-org",
+    "repo_path": "websites/l10n-kde-org"
+  },
   "websites-lakademy-kde-org": {
     "description": "Website for LaKademy - lakademy.kde.org",
     "name": "websites-lakademy-kde-org",

From 5b768012c95cff6de84dad7e063d389299202895 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 14 Aug 2025 17:28:11 +0300
Subject: [PATCH 1713/3724] kdePackages: Gear 25.04.3 -> 25.08.0

---
 pkgs/kde/gear/angelfish/default.nix           |    2 +-
 pkgs/kde/gear/artikulate/default.nix          |    2 -
 pkgs/kde/gear/cervisia/default.nix            |    6 -
 pkgs/kde/gear/default.nix                     |    1 -
 pkgs/kde/gear/dolphin/default.nix             |    7 +-
 pkgs/kde/gear/dragon/default.nix              |    9 +-
 pkgs/kde/gear/gwenview/default.nix            |    8 +-
 pkgs/kde/gear/juk/default.nix                 |    4 +-
 pkgs/kde/gear/kamoso/default.nix              |   18 +-
 pkgs/kde/gear/kdenlive/default.nix            |    3 +-
 pkgs/kde/gear/kdenlive/dependency-paths.patch |   19 +-
 pkgs/kde/gear/kig/default.nix                 |    2 -
 .../add-nixos-man-db-config-path.patch        |   13 -
 pkgs/kde/gear/kio-extras/default.nix          |    4 -
 pkgs/kde/gear/kqtquickcharts/default.nix      |    9 +-
 pkgs/kde/gear/ktouch/default.nix              |    9 +-
 pkgs/kde/gear/neochat/default.nix             |    2 +
 pkgs/kde/generated/sources/gear.json          | 1499 ++++++++---------
 18 files changed, 804 insertions(+), 813 deletions(-)
 delete mode 100644 pkgs/kde/gear/cervisia/default.nix
 delete mode 100644 pkgs/kde/gear/kio-extras/add-nixos-man-db-config-path.patch

diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix
index 49c578b1c3d3..42fe1f1753c7 100644
--- a/pkgs/kde/gear/angelfish/default.nix
+++ b/pkgs/kde/gear/angelfish/default.nix
@@ -16,7 +16,7 @@ mkKdeDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version;
     src = sources.${pname};
-    hash = "sha256-FgzmWw8FZb+DNSf2n6H14Rq07+x1LzG9hX4hFetuqDw=";
+    hash = "sha256-aGpmkuw7Y0PRFp0+0ozv5/A80O2T9lMN9SJfKfExx/o=";
   };
 
   extraNativeBuildInputs = [
diff --git a/pkgs/kde/gear/artikulate/default.nix b/pkgs/kde/gear/artikulate/default.nix
index 60bd663852ee..fc8ba7d2fec9 100644
--- a/pkgs/kde/gear/artikulate/default.nix
+++ b/pkgs/kde/gear/artikulate/default.nix
@@ -6,6 +6,4 @@ mkKdeDerivation {
   pname = "artikulate";
 
   extraBuildInputs = [ qtmultimedia ];
-  # FIXME(qt5)
-  meta.broken = true;
 }
diff --git a/pkgs/kde/gear/cervisia/default.nix b/pkgs/kde/gear/cervisia/default.nix
deleted file mode 100644
index 804cd7bed758..000000000000
--- a/pkgs/kde/gear/cervisia/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ mkKdeDerivation }:
-mkKdeDerivation {
-  pname = "cervisia";
-  # FIXME(qt5)
-  meta.broken = true;
-}
diff --git a/pkgs/kde/gear/default.nix b/pkgs/kde/gear/default.nix
index d049e0d35398..b15d0b0ec644 100644
--- a/pkgs/kde/gear/default.nix
+++ b/pkgs/kde/gear/default.nix
@@ -27,7 +27,6 @@
   calindori = callPackage ./calindori { };
   calligra = callPackage ./calligra { };
   cantor = callPackage ./cantor { };
-  cervisia = callPackage ./cervisia { };
   colord-kde = callPackage ./colord-kde { };
   dolphin = callPackage ./dolphin { };
   dolphin-plugins = callPackage ./dolphin-plugins { };
diff --git a/pkgs/kde/gear/dolphin/default.nix b/pkgs/kde/gear/dolphin/default.nix
index df4c4c3bdaf3..1ed6a97e44b3 100644
--- a/pkgs/kde/gear/dolphin/default.nix
+++ b/pkgs/kde/gear/dolphin/default.nix
@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qtmultimedia,
+}:
 mkKdeDerivation {
   pname = "dolphin";
+
+  extraBuildInputs = [ qtmultimedia ];
 }
diff --git a/pkgs/kde/gear/dragon/default.nix b/pkgs/kde/gear/dragon/default.nix
index db28172a7dfe..e579ed5ecd30 100644
--- a/pkgs/kde/gear/dragon/default.nix
+++ b/pkgs/kde/gear/dragon/default.nix
@@ -1,18 +1,23 @@
 {
   mkKdeDerivation,
+  pkg-config,
+  qtmultimedia,
   kconfigwidgets,
   kparts,
   kxmlgui,
-  phonon,
+  ffmpeg,
 }:
 mkKdeDerivation {
   pname = "dragon";
 
+  extraNativeBuildInputs = [ pkg-config ];
+
   extraBuildInputs = [
+    qtmultimedia
     kconfigwidgets
     kparts
     kxmlgui
-    phonon
+    ffmpeg
   ];
 
   meta.mainProgram = "dragon";
diff --git a/pkgs/kde/gear/gwenview/default.nix b/pkgs/kde/gear/gwenview/default.nix
index 55d5a8b7d331..3af8870f0d17 100644
--- a/pkgs/kde/gear/gwenview/default.nix
+++ b/pkgs/kde/gear/gwenview/default.nix
@@ -1,10 +1,9 @@
 {
   mkKdeDerivation,
+  qtmultimedia,
   qtsvg,
   qtwayland,
   qtimageformats,
-  phonon,
-  phonon-vlc,
   pkg-config,
   cfitsio,
   exiv2,
@@ -18,14 +17,13 @@ mkKdeDerivation {
 
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
+    qtmultimedia
     qtsvg
     qtwayland
+
     # adds support for webp and other image formats
     qtimageformats
 
-    phonon
-    phonon-vlc
-
     cfitsio
     exiv2
     baloo
diff --git a/pkgs/kde/gear/juk/default.nix b/pkgs/kde/gear/juk/default.nix
index 4ef36a9a6b14..7223ee3a7966 100644
--- a/pkgs/kde/gear/juk/default.nix
+++ b/pkgs/kde/gear/juk/default.nix
@@ -1,15 +1,15 @@
 {
   mkKdeDerivation,
+  qtmultimedia,
   qtsvg,
-  phonon,
   taglib,
 }:
 mkKdeDerivation {
   pname = "juk";
 
   extraBuildInputs = [
+    qtmultimedia
     qtsvg
-    phonon
     taglib
   ];
 
diff --git a/pkgs/kde/gear/kamoso/default.nix b/pkgs/kde/gear/kamoso/default.nix
index fa86b87f2f8d..f6d841900521 100644
--- a/pkgs/kde/gear/kamoso/default.nix
+++ b/pkgs/kde/gear/kamoso/default.nix
@@ -1,6 +1,18 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  pkg-config,
+  gst_all_1,
+}:
 mkKdeDerivation {
   pname = "kamoso";
-  # FIXME(qt5)
-  meta.broken = true;
+
+  extraNativeBuildInputs = [ pkg-config ];
+  extraBuildInputs = [
+    gst_all_1.gst-plugins-base
+    (gst_all_1.gst-plugins-good.override { qt6Support = true; })
+  ];
+
+  preFixup = ''
+    qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+  '';
 }
diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix
index 442387782d45..2b6ce0de6fc5 100644
--- a/pkgs/kde/gear/kdenlive/default.nix
+++ b/pkgs/kde/gear/kdenlive/default.nix
@@ -1,7 +1,6 @@
 {
   mkKdeDerivation,
   replaceVars,
-  mediainfo,
   mlt,
   glaxnimate,
   ffmpeg-full,
@@ -20,7 +19,7 @@ mkKdeDerivation {
 
   patches = [
     (replaceVars ./dependency-paths.patch {
-      inherit mediainfo mlt glaxnimate;
+      inherit mlt glaxnimate;
       ffmpeg = ffmpeg-full;
     })
   ];
diff --git a/pkgs/kde/gear/kdenlive/dependency-paths.patch b/pkgs/kde/gear/kdenlive/dependency-paths.patch
index 4faaf6135617..acc9d1e33199 100644
--- a/pkgs/kde/gear/kdenlive/dependency-paths.patch
+++ b/pkgs/kde/gear/kdenlive/dependency-paths.patch
@@ -1,7 +1,8 @@
-diff -u b/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
---- b/src/kdenlivesettings.kcfg
+diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
+index d92555f0b5..a7b32b5183 100644
+--- a/src/kdenlivesettings.kcfg
 +++ b/src/kdenlivesettings.kcfg
-@@ -517,7 +517,7 @@
+@@ -628,7 +628,7 @@
    <group name="env">
      <entry name="mltpath" type="Path">
        <label>Mlt framework install path.</label>
@@ -10,7 +11,7 @@ diff -u b/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
      </entry>
  
      <entry name="kdenliverendererpath" type="Path">
-@@ -527,27 +527,27 @@
+@@ -638,22 +638,22 @@
  
      <entry name="meltpath" type="Path">
        <label>Mlt melt renderer install path.</label>
@@ -36,17 +37,13 @@ diff -u b/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
 +      <default>@ffmpeg@/bin/ffprobe</default>
      </entry>
  
-     <entry name="mediainfopath" type="Path">
-       <label>mediaInfo binary path.</label>
--      <default></default>
-+      <default>@mediainfo@/bin/mediainfo</default>
-     </entry>
- 
      <entry name="processingthreads" type="Int">
-@@ -657,5 +657,5 @@
+@@ -758,7 +758,7 @@
+ 
      <entry name="glaxnimatePath" type="String">
        <label>Path to the Glaxnimate application.</label>
 -      <default></default>
 +      <default>@glaxnimate@/bin/glaxnimate</default>
      </entry>
+ 
      <entry name="nice_tasks" type="Bool">
diff --git a/pkgs/kde/gear/kig/default.nix b/pkgs/kde/gear/kig/default.nix
index 8a1761644378..dd2f827e1afd 100644
--- a/pkgs/kde/gear/kig/default.nix
+++ b/pkgs/kde/gear/kig/default.nix
@@ -1,6 +1,4 @@
 { mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kig";
-  # FIXME(qt5)
-  meta.broken = true;
 }
diff --git a/pkgs/kde/gear/kio-extras/add-nixos-man-db-config-path.patch b/pkgs/kde/gear/kio-extras/add-nixos-man-db-config-path.patch
deleted file mode 100644
index 275e6121c17f..000000000000
--- a/pkgs/kde/gear/kio-extras/add-nixos-man-db-config-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/man/kio_man.cpp b/man/kio_man.cpp
-index a2fb6dbf5..cb6f373bc 100644
---- a/man/kio_man.cpp
-+++ b/man/kio_man.cpp
-@@ -868,6 +868,8 @@ void MANProtocol::constructPath(QStringList &constr_path, QStringList constr_cat
-         mc.setFileName("/etc/manpath.config"); // SuSE, Debian
-     if (!mc.exists())
-         mc.setFileName("/etc/man.config"); // Mandrake
-+    if (!mc.exists())
-+        mc.setFileName("/run/current-system/etc/man_db.conf"); // NixOS
- 
-     if (mc.open(QIODevice::ReadOnly)) {
-         QTextStream is(&mc);
diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix
index 5bcf4b605069..2260feeac62c 100644
--- a/pkgs/kde/gear/kio-extras/default.nix
+++ b/pkgs/kde/gear/kio-extras/default.nix
@@ -19,10 +19,6 @@
 mkKdeDerivation {
   pname = "kio-extras";
 
-  patches = [
-    # An upstream merge request is pending for this https://invent.kde.org/network/kio-extras/-/merge_requests/422
-    ./add-nixos-man-db-config-path.patch
-  ];
   extraNativeBuildInputs = [
     pkg-config
     gperf
diff --git a/pkgs/kde/gear/kqtquickcharts/default.nix b/pkgs/kde/gear/kqtquickcharts/default.nix
index 310b50170b15..018946b6b6b2 100644
--- a/pkgs/kde/gear/kqtquickcharts/default.nix
+++ b/pkgs/kde/gear/kqtquickcharts/default.nix
@@ -1,6 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qtdeclarative,
+}:
 mkKdeDerivation {
   pname = "kqtquickcharts";
-  # FIXME(qt5)
-  meta.broken = true;
+
+  extraBuildInputs = [ qtdeclarative ];
 }
diff --git a/pkgs/kde/gear/ktouch/default.nix b/pkgs/kde/gear/ktouch/default.nix
index 6955dc3f0402..b0ddfae9e07f 100644
--- a/pkgs/kde/gear/ktouch/default.nix
+++ b/pkgs/kde/gear/ktouch/default.nix
@@ -1,6 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  kqtquickcharts,
+}:
 mkKdeDerivation {
   pname = "ktouch";
-  # FIXME(qt5)
-  meta.broken = true;
+
+  extraBuildInputs = [ kqtquickcharts ];
 }
diff --git a/pkgs/kde/gear/neochat/default.nix b/pkgs/kde/gear/neochat/default.nix
index ed064857e5f9..100cd522c551 100644
--- a/pkgs/kde/gear/neochat/default.nix
+++ b/pkgs/kde/gear/neochat/default.nix
@@ -1,6 +1,7 @@
 {
   mkKdeDerivation,
   qtlocation,
+  qtspeech,
   qtwebview,
 }:
 mkKdeDerivation {
@@ -8,6 +9,7 @@ mkKdeDerivation {
 
   extraBuildInputs = [
     qtlocation
+    qtspeech
     qtwebview
   ];
   meta.mainProgram = "neochat";
diff --git a/pkgs/kde/generated/sources/gear.json b/pkgs/kde/generated/sources/gear.json
index 45e58b54154e..ff561cc90a32 100644
--- a/pkgs/kde/generated/sources/gear.json
+++ b/pkgs/kde/generated/sources/gear.json
@@ -1,1252 +1,1247 @@
 {
   "accessibility-inspector": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/accessibility-inspector-25.04.3.tar.xz",
-    "hash": "sha256-sVRpfMsMuhRWh8791Vk2M6aEeBXidXkOc373pfOW9M0="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/accessibility-inspector-25.08.0.tar.xz",
+    "hash": "sha256-J7aZRkoesjQIEAv+Xryj3qBUR4kDCQCba6E+4Pim8ak="
   },
   "akonadi": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/akonadi-25.04.3.tar.xz",
-    "hash": "sha256-BCzTMZ6t+4JUd3PlLOfUHTYdWMTpL+daUXnBV07U9d8="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/akonadi-25.08.0.tar.xz",
+    "hash": "sha256-17editAh87vhQQu9LBdV0/pUpyfHDrkAjcz5TmQqZk4="
   },
   "akonadi-calendar": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/akonadi-calendar-25.04.3.tar.xz",
-    "hash": "sha256-lDPOyPYp9d0arbevOdS2LWBHYksdG+UoLu9eRg9Iblw="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/akonadi-calendar-25.08.0.tar.xz",
+    "hash": "sha256-VR1woFKKHWUah7YewoiCWxNA1Sf51yHdlfjKiwP0lds="
   },
   "akonadi-calendar-tools": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/akonadi-calendar-tools-25.04.3.tar.xz",
-    "hash": "sha256-BSgd3kDmPwmv2AvQm2y1wHbXbJdpciKOJ4WX87nsUl8="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/akonadi-calendar-tools-25.08.0.tar.xz",
+    "hash": "sha256-J+bVrKcou9wVY4Ly54O17S+MRD3F47/DvS2JORwWbeg="
   },
   "akonadi-contacts": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/akonadi-contacts-25.04.3.tar.xz",
-    "hash": "sha256-ZEO7PIaZf0LX/NpVmnqIlz/wLrDxeXbWIvuxULTYXEY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/akonadi-contacts-25.08.0.tar.xz",
+    "hash": "sha256-TFkMct5WfgtrZ1X54Ft41fL/Dr3oJlQKzjhPnSU9i9M="
   },
   "akonadi-import-wizard": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/akonadi-import-wizard-25.04.3.tar.xz",
-    "hash": "sha256-o5f9s3Oa1MuTwNl/eWaJqnj0j7KWXw+tXYBBYqikTBw="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/akonadi-import-wizard-25.08.0.tar.xz",
+    "hash": "sha256-VzXGsZgZ1XONcKDVH+7jXaH+yF+DucnP9UeRKGNlW68="
   },
   "akonadi-mime": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/akonadi-mime-25.04.3.tar.xz",
-    "hash": "sha256-KViKYp5vlh7kiyglyYCEAxHxIH9+odYtRUrdrfGVxr4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/akonadi-mime-25.08.0.tar.xz",
+    "hash": "sha256-9oBsraxuajJpucMeXueqa4Yxrwue3UjyPWspCeXLJfE="
   },
   "akonadi-search": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/akonadi-search-25.04.3.tar.xz",
-    "hash": "sha256-XErwtqWJk5AGGMnp8SkbPNEqcJfHpwDgDleKUA/MYBo="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/akonadi-search-25.08.0.tar.xz",
+    "hash": "sha256-9j7hY2+RvO9tPINsK1zIfsDBg/XWmzc26A4saQuddcI="
   },
   "akonadiconsole": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/akonadiconsole-25.04.3.tar.xz",
-    "hash": "sha256-svU1yT2KVg2Parmsn7gRHuohbIwfBwlaUmGazntbFLU="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/akonadiconsole-25.08.0.tar.xz",
+    "hash": "sha256-/ZID4ppDjraG0zsO+JtWa9CjsuA2cFfJNqryAjeufRA="
   },
   "akregator": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/akregator-25.04.3.tar.xz",
-    "hash": "sha256-/RdtttGqdN4xyxDExWizaCfXKL63TcgBepu0dotOT7c="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/akregator-25.08.0.tar.xz",
+    "hash": "sha256-zKlqmZcd7AhuKmEP5WFxVRA4mzMWrmJLPEqjEmH6eN4="
   },
   "alligator": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/alligator-25.04.3.tar.xz",
-    "hash": "sha256-fTgvQHcyphxJgCE+JRL5l6tR4DgZuqsYJKPiD2+/PS4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/alligator-25.08.0.tar.xz",
+    "hash": "sha256-uznCRPfibQbTQlFajmmIj756XqO3wiT/HwoMJxijLYw="
   },
   "analitza": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/analitza-25.04.3.tar.xz",
-    "hash": "sha256-XNaV/IOvdO7dOXByXjWmOWEgYx5Ghm78kJS85oOtYmw="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/analitza-25.08.0.tar.xz",
+    "hash": "sha256-jUd/CvFLuffBUDOp14mHpwZxNa/8R/Ge3dqC52w200s="
   },
   "angelfish": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/angelfish-25.04.3.tar.xz",
-    "hash": "sha256-4iTcppe5fWwDcLEPEwW7YDNqThyOVkjJCvV2lmRsv8A="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/angelfish-25.08.0.tar.xz",
+    "hash": "sha256-CSYyWhnyzHLkpU/azsXrfLFQROYSnSjRqVmnBq0cLXw="
   },
   "arianna": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/arianna-25.04.3.tar.xz",
-    "hash": "sha256-VbNOYw/Xgz9WauOUmFClTmBVeBUjop2sbOFG0oFBW4c="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/arianna-25.08.0.tar.xz",
+    "hash": "sha256-0ytQkLvnKTxqHFHASr25aUgPW2v+vkHoaJzNHI5rug4="
   },
   "ark": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ark-25.04.3.tar.xz",
-    "hash": "sha256-+TpCjIgibWHlpjLgZgORGJcx+ArbV0glEIAVoHuxBRw="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ark-25.08.0.tar.xz",
+    "hash": "sha256-OR+uegh1fdXMKwCBJRxROFk0XknTDOfxDD2l9M5Lo6A="
   },
   "artikulate": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/artikulate-25.04.3.tar.xz",
-    "hash": "sha256-QozkmwToQDrpUnV92IOCGw4jUXC5z6Dnuli4Z7+qtAQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/artikulate-25.08.0.tar.xz",
+    "hash": "sha256-knA9p1bTgOL4y3PJGSdp/BjZKuo/jbjhxul7m0yLvak="
   },
   "audex": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/audex-25.04.3.tar.xz",
-    "hash": "sha256-ioXkcXit53sXciK+r1kg+BMHCymaoKl3nQG+VX7khTA="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/audex-25.08.0.tar.xz",
+    "hash": "sha256-J6xghQEyBtxGNkwFjXXTUeoJ7vjgv95WJF8odFfYXDI="
   },
   "audiocd-kio": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/audiocd-kio-25.04.3.tar.xz",
-    "hash": "sha256-RGvwclBvhHQJ++JxLu2JjxTZW+TKrUUBzQS+g8TachM="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/audiocd-kio-25.08.0.tar.xz",
+    "hash": "sha256-faXOXUvpy2bmDkcdYVo9YGd2q8SHEsW2ItEd3xaVU/s="
   },
   "audiotube": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/audiotube-25.04.3.tar.xz",
-    "hash": "sha256-r3PbT7VtU5q9Ug8A9lH9nCv4i7RjrP2jq/EMRTX3d9k="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/audiotube-25.08.0.tar.xz",
+    "hash": "sha256-kCibQDNSoeWBzjD3aJtWVXul4yIF7t19/BrGk5ImZqI="
   },
   "baloo-widgets": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/baloo-widgets-25.04.3.tar.xz",
-    "hash": "sha256-Yr8dFn0OF0dNi0fUkDYpaokQCfD7Wu/yEpPHl39ukWY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/baloo-widgets-25.08.0.tar.xz",
+    "hash": "sha256-x346dh2zz8E8lqFDa/bXM5ZRQrrTDokAHJeRGbuOuyQ="
   },
   "blinken": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/blinken-25.04.3.tar.xz",
-    "hash": "sha256-dq79wPqHSmK9plWlAmDVttTghzo0geSGJVjDF5k1vLM="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/blinken-25.08.0.tar.xz",
+    "hash": "sha256-ZZvGnoEcckfoAcBpYGa/uMyfcOIj9AGliwi7a9g9NaQ="
   },
   "bomber": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/bomber-25.04.3.tar.xz",
-    "hash": "sha256-Lwo3rCR9REd2bUYxO0L2QKBg4tNYlMf8mrJfrE0gJYc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/bomber-25.08.0.tar.xz",
+    "hash": "sha256-LyArNs4we6yVzTQgS69GXFmJeHoIG9sQ8ClFLcCPtR0="
   },
   "bovo": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/bovo-25.04.3.tar.xz",
-    "hash": "sha256-yOxq042+KSoExb12g5QWUFSnMqMngrsQqRldSCF46XY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/bovo-25.08.0.tar.xz",
+    "hash": "sha256-PRwUPK5uziiN6K5CiZqWLJo9TEVAVvdLySKDUdd6zCY="
   },
   "calendarsupport": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/calendarsupport-25.04.3.tar.xz",
-    "hash": "sha256-wyZUaO7NQnHR0CdpmaFtFZccitXeTr4vFqld4NJKWw0="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/calendarsupport-25.08.0.tar.xz",
+    "hash": "sha256-OGynFmP0HhMTnlOEfLr0fSKA/o0pkH6NmYnf7Cuqs5c="
   },
   "calindori": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/calindori-25.04.3.tar.xz",
-    "hash": "sha256-RjPCGA9tm/DWidr7SRzmz0N9P9N6s6k+hRcbLbHrYhE="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/calindori-25.08.0.tar.xz",
+    "hash": "sha256-RQDAPYHiRG76KwWhG7ghv5ZwdkreG+hz3xDrLizwJaY="
   },
   "calligra": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/calligra-25.04.3.tar.xz",
-    "hash": "sha256-JtdaZ+yooTeEm8kl2g9l9J8Rwp6fx1NGyy1mJwNubU8="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/calligra-25.08.0.tar.xz",
+    "hash": "sha256-M2b1KM4c+s2PBbJKofKZsnu9bxMyLO/j2KXJCeFvEaA="
   },
   "cantor": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/cantor-25.04.3.tar.xz",
-    "hash": "sha256-Gncyo0vHA/L+vs6wdPsoJ/hK35E7hsEVVT1zoutnrwU="
-  },
-  "cervisia": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/cervisia-25.04.3.tar.xz",
-    "hash": "sha256-DoxK5vsUer3/uCayX7aHAdQaKQHb7it0ARUFo+08eyg="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/cantor-25.08.0.tar.xz",
+    "hash": "sha256-XJj6NrrDUApX0HgToQG+cJxYqgq3VdTJyforP4g2I40="
   },
   "colord-kde": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/colord-kde-25.04.3.tar.xz",
-    "hash": "sha256-vOvkdzd1DQZunFVgp/k5i75jJ88mVxSzxwik0dbqGAM="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/colord-kde-25.08.0.tar.xz",
+    "hash": "sha256-c6YZ3lMcdghpc+/ODuGhUgvThc/y5XCOKSESM1TEVSo="
   },
   "dolphin": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/dolphin-25.04.3.tar.xz",
-    "hash": "sha256-6CL68C09cn+vFHierNMxKIy4p0u5uYgfHnzReJdSw/E="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/dolphin-25.08.0.tar.xz",
+    "hash": "sha256-3dXlYiWUeSSQaVmZGIxiFcOggheHxx37V9v90I4c6TU="
   },
   "dolphin-plugins": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/dolphin-plugins-25.04.3.tar.xz",
-    "hash": "sha256-SWbquJn/qRQ9Avu3rcSDnorW9q2X/RsIPKa0iKPfvT4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/dolphin-plugins-25.08.0.tar.xz",
+    "hash": "sha256-TnVSUl3Dow1uUhuc5dfjTesLrDR0xiGJSxFWenQ+zM8="
   },
   "dragon": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/dragon-25.04.3.tar.xz",
-    "hash": "sha256-QbS7dVBSFHxd6O2Ops1sd7IegEyV1r4hQ6k2nsyfd8I="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/dragon-25.08.0.tar.xz",
+    "hash": "sha256-tywG8c5GXdPXvkfWnsOjWI3dRkzA9dNRqNftR8hYRqk="
   },
   "elisa": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/elisa-25.04.3.tar.xz",
-    "hash": "sha256-FuTjip59z5tCRBxmcH1bu1Ku9clUItjuBKSiHn8Vc5I="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/elisa-25.08.0.tar.xz",
+    "hash": "sha256-dgKcVOknhzA5w8KCraeHp48dDW28j6m9LoGa7sXfLVw="
   },
   "eventviews": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/eventviews-25.04.3.tar.xz",
-    "hash": "sha256-kN07bJkVp4LBYmU+kCczXm45OxPFhM/bYbTdMe9BJrg="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/eventviews-25.08.0.tar.xz",
+    "hash": "sha256-ZoHdlnsni7SpMNafJqBC75egPc+Y3Ow3IvaIffWRb8E="
   },
   "falkon": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/falkon-25.04.3.tar.xz",
-    "hash": "sha256-k1BJBgxQs91e3oj4grSEv9gYP5Qy70euKtBZGxUwVFQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/falkon-25.08.0.tar.xz",
+    "hash": "sha256-XNgCOuS2Z/p3WxCalMTizqqfW/UxrZZWZzCI0caahmc="
   },
   "ffmpegthumbs": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ffmpegthumbs-25.04.3.tar.xz",
-    "hash": "sha256-eCBHUaeldxaXHtGUpmNtVZ+xFBE/JMGT/Rz3mN+yqZQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ffmpegthumbs-25.08.0.tar.xz",
+    "hash": "sha256-6TUPRZmwYBFcKUFrXHHiNiPk3O1USw+k/mV7YSGVYhs="
   },
   "filelight": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/filelight-25.04.3.tar.xz",
-    "hash": "sha256-D22WrdzcxqTtahlTlUeoqAvcCY//t2iIWjRk5EGpGs0="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/filelight-25.08.0.tar.xz",
+    "hash": "sha256-YIBkntdiEXinrv8dMHBinKo9kdpJeLzFtWjHW+31MYU="
   },
   "francis": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/francis-25.04.3.tar.xz",
-    "hash": "sha256-TfQdLJvAr8M+dExaGHbvMqqa0C3smFiRXryRFTy70Vg="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/francis-25.08.0.tar.xz",
+    "hash": "sha256-iyhQlVQITeNwNJYdHsJECFVsu4Yw5Vt0ryg5UhaH3Rs="
   },
   "ghostwriter": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ghostwriter-25.04.3.tar.xz",
-    "hash": "sha256-hwQ+6zvU8JblbOTfJtABqxWL+VzdvQH2mGbxwSI9c+g="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ghostwriter-25.08.0.tar.xz",
+    "hash": "sha256-4mOEDm5KXyTKRsYVz6/QxLeSNJu2Y1SkCsO+7wC12Lc="
   },
   "granatier": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/granatier-25.04.3.tar.xz",
-    "hash": "sha256-KO36XD0laTaQzmDdHaQ2i2qDbIvsm1sxpih+JW/2roI="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/granatier-25.08.0.tar.xz",
+    "hash": "sha256-tNY7JOeTK10CSSlqusxldIZeXgWGbY7otj3BHU/GwKM="
   },
   "grantlee-editor": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/grantlee-editor-25.04.3.tar.xz",
-    "hash": "sha256-s3o05BnZAbEd7Ulb/eJA27C31HqXjU52KJuj2bvjMhQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/grantlee-editor-25.08.0.tar.xz",
+    "hash": "sha256-sZUcK3hqLekJAn83xkRHTL2LTAyTUYqiV5nALY8Vuwc="
   },
   "grantleetheme": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/grantleetheme-25.04.3.tar.xz",
-    "hash": "sha256-4l55xxOD9TiBS4J9e/r2qz+0XE94xpqkEB3/YCX0oHM="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/grantleetheme-25.08.0.tar.xz",
+    "hash": "sha256-4rRXp9QIvj3Fan2w3JcJN9RQmswyNJKNw1UUKmurT9k="
   },
   "gwenview": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/gwenview-25.04.3.tar.xz",
-    "hash": "sha256-Wb+fxKS+hyYHgcy1hyISSEtpfKpT+g7n4Si9sI6vXoc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/gwenview-25.08.0.tar.xz",
+    "hash": "sha256-W/G/zO3vZZ9N+ROt3dZKLJZNObhM8UJxBLsV26qG8I4="
   },
   "incidenceeditor": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/incidenceeditor-25.04.3.tar.xz",
-    "hash": "sha256-eWJIJf4PztE20ap9J6NA+9VMrdpwBbAmhnjG4NrGwIw="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/incidenceeditor-25.08.0.tar.xz",
+    "hash": "sha256-sr1G+oE42inWGBD04oP/mkNslufoes9SSRESSG0yiyU="
   },
   "isoimagewriter": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/isoimagewriter-25.04.3.tar.xz",
-    "hash": "sha256-jbqd72ZZ6tgjsdyxrscIDZ+rhwD3lWvr7qeNG6TZSqY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/isoimagewriter-25.08.0.tar.xz",
+    "hash": "sha256-HNr+fUBLK6egCQH26GCiOnFyrJl3dMin0LaW7fzF5OA="
   },
   "itinerary": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/itinerary-25.04.3.tar.xz",
-    "hash": "sha256-ktxEhNlZtyAzkMo9a6RobesspYGNfFNB6CCYCGJ7gvI="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/itinerary-25.08.0.tar.xz",
+    "hash": "sha256-HywQwfR6WRn0R6zN9gmXA4pSima47hcvzBhN0r0vJxY="
   },
   "juk": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/juk-25.04.3.tar.xz",
-    "hash": "sha256-7CVJiPrt01JtseNHZiIIPwKsIQAP+B44Zy3XuZedGSE="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/juk-25.08.0.tar.xz",
+    "hash": "sha256-Gz7bXg5KX1CbJGDy031VM1OZP+946F7An4eHchX6EfA="
   },
   "k3b": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/k3b-25.04.3.tar.xz",
-    "hash": "sha256-oktypCveDrTwUB/uZgMP5yhjavrO61yKzbIku463o7U="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/k3b-25.08.0.tar.xz",
+    "hash": "sha256-6+lnVDqSVu8Hz97wN2axC6OctD/AvAXNU/wNjYuz+3s="
   },
   "kaccounts-integration": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kaccounts-integration-25.04.3.tar.xz",
-    "hash": "sha256-caBHWiJ0+k6fMy2JA1GLJrXQJWFPfnnHR6NboSbimIw="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kaccounts-integration-25.08.0.tar.xz",
+    "hash": "sha256-cUeUfkojZ2DO0uZfnkt9r/2tPk6GWhQvSRpp+6rVpuo="
   },
   "kaccounts-providers": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kaccounts-providers-25.04.3.tar.xz",
-    "hash": "sha256-qNgkUVf0uGcZBnFDKs8VoPP2WGVJkvaas7ng92Zhd7M="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kaccounts-providers-25.08.0.tar.xz",
+    "hash": "sha256-PxQ05zgWNfLQ4xt9gQmfzTJq67kPyeAeUTyGXAXtHEc="
   },
   "kaddressbook": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kaddressbook-25.04.3.tar.xz",
-    "hash": "sha256-ocJ4Hbg9fjN4DhcFypVl3l3Xkb1UgxKZ+Q6TM3akeCA="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kaddressbook-25.08.0.tar.xz",
+    "hash": "sha256-vQX/vsZ5twGyvcXaK5fIO9gUN6M5h3H8SwPvu3rBpkc="
   },
   "kajongg": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kajongg-25.04.3.tar.xz",
-    "hash": "sha256-1XiumAnsX5v+2UjeEhWO3LVFeT+xhZvRV1AWaAZJU6w="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kajongg-25.08.0.tar.xz",
+    "hash": "sha256-HLb5Va8LXoraspZ3dYg40CiytwKnz/Q9vUsidae8bO8="
   },
   "kalarm": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kalarm-25.04.3.tar.xz",
-    "hash": "sha256-3G+QvoZIw4z1fh4yyjy2LQk3H48Gqt2RiGKsa7VlCsc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kalarm-25.08.0.tar.xz",
+    "hash": "sha256-ZlUErl5rjOcKDdwPoclygn7da16GgGbUmQoUZtqo/g0="
   },
   "kalgebra": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kalgebra-25.04.3.tar.xz",
-    "hash": "sha256-u+JnX6HMcKDZCU/ImqjN2cecExW5fq1i2gZwTiq6gms="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kalgebra-25.08.0.tar.xz",
+    "hash": "sha256-ViYYWk7aUm/c+JTcmf9DeW1ZsPThzHpSh0lIltsNrSA="
   },
   "kalk": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kalk-25.04.3.tar.xz",
-    "hash": "sha256-M9MHnVo5cW5UToYiTv+Zfs552nf4JHu18IzmqIzwP/A="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kalk-25.08.0.tar.xz",
+    "hash": "sha256-IOyy1nYNCMM/tf0EHwIC9yCchxTBztEP9RiCBupBS04="
   },
   "kalm": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kalm-25.04.3.tar.xz",
-    "hash": "sha256-VUTxNcDvLVUNXptRCQJbnyfYjQ+r0gqw9BWU3LcnVeo="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kalm-25.08.0.tar.xz",
+    "hash": "sha256-wRBTYyygcgtS02cwHkgWL4cZ2GZnrSCfyCbEE4rO370="
   },
   "kalzium": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kalzium-25.04.3.tar.xz",
-    "hash": "sha256-2Ndq49Ej2T/g3fM5ktfIUpLsVWC3amNPm/LXMcL8yto="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kalzium-25.08.0.tar.xz",
+    "hash": "sha256-h2Vzfnuut/sNDBYRLOEWlN25ChAujms+cj2unVlbhSk="
   },
   "kamera": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kamera-25.04.3.tar.xz",
-    "hash": "sha256-RrnKpKnvIYNC9X7rD9rTBjX8UJDyL4ndHO1YVvBg3Uk="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kamera-25.08.0.tar.xz",
+    "hash": "sha256-JJrwbxNs5taRRpVFGPtMxwITXGc8TzRIXMkiQ/69GsU="
   },
   "kamoso": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kamoso-25.04.3.tar.xz",
-    "hash": "sha256-J8s2rIEENFFOT4cMZNjKhR6GjdSfyhOW3LW+l6lydHc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kamoso-25.08.0.tar.xz",
+    "hash": "sha256-MtwUhk+ktjTOBXvylkfK17/awVooK6LKmPQjCygUIWA="
   },
   "kanagram": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kanagram-25.04.3.tar.xz",
-    "hash": "sha256-pufvEDxAu1I3sKXT6AzDaAr+C6kB/HJpIz31wkTf8/g="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kanagram-25.08.0.tar.xz",
+    "hash": "sha256-qAhuP4qKj69Ah41DmqdUZBRE2TyLDQxSkEdTCr30ZAY="
   },
   "kapman": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kapman-25.04.3.tar.xz",
-    "hash": "sha256-k/G7Md9Mr+iDE+bO1vhuH0pykryVkIkzaZOc71L8iOc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kapman-25.08.0.tar.xz",
+    "hash": "sha256-RG1XLd6Zgwd4+2frjReKVOSJZkRrMM2krMyCNkKNspA="
   },
   "kapptemplate": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kapptemplate-25.04.3.tar.xz",
-    "hash": "sha256-t1ooeVjsEi2n8fq4EPmrYk+tbUqyxn7kY7I2vXvfsOI="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kapptemplate-25.08.0.tar.xz",
+    "hash": "sha256-9CMBZBTEhsCo97uHJjPrM5gLPfqSdliIfbaOr6u0ACs="
   },
   "kasts": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kasts-25.04.3.tar.xz",
-    "hash": "sha256-TEYQPgSQ7os4c1vmH1xJjEZRFQEYqckUU4GQ8CSfLy8="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kasts-25.08.0.tar.xz",
+    "hash": "sha256-x8tdPOSA2XuWQC2Pnc/EDARlpOHP41E/t8zveOXrJ1w="
   },
   "kate": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kate-25.04.3.tar.xz",
-    "hash": "sha256-HUVG+DguHjvIQQvhwa+I4G62bOEsgWDEyErCi/thjpc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kate-25.08.0.tar.xz",
+    "hash": "sha256-f+13m3bahvaHyVCcHCK0GbKpfVfEHmk9iAZktsIKLzc="
   },
   "katomic": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/katomic-25.04.3.tar.xz",
-    "hash": "sha256-dsk4K6uqoUkFzo44KAEhkrHNtoZXpLZGUlmH6REXu4s="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/katomic-25.08.0.tar.xz",
+    "hash": "sha256-1IlNY5foI1Ufh++tUKGWJElsYOPT4pvs76onrBSMCag="
   },
   "kbackup": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kbackup-25.04.3.tar.xz",
-    "hash": "sha256-YQlX8vQee/I9i4CtM2x1NSkZNbUZDTccf5SKGS1j788="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kbackup-25.08.0.tar.xz",
+    "hash": "sha256-f/pWS2LIYN2BJyMaxQqKumWadRXh1CcNU8qugXxX5O4="
   },
   "kblackbox": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kblackbox-25.04.3.tar.xz",
-    "hash": "sha256-pkwhQQ3z3svq8ehoapXX5KbtGUODpeT2cTaT3FMfJxY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kblackbox-25.08.0.tar.xz",
+    "hash": "sha256-S9dphJPm1bXw/iq1E16RKMqw6TvRMTL5CCbUa8yGE5w="
   },
   "kblocks": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kblocks-25.04.3.tar.xz",
-    "hash": "sha256-crD1TLCd2PfBsyYNeYanFfIGRISH0LtA+F2ekX86Ldo="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kblocks-25.08.0.tar.xz",
+    "hash": "sha256-G9OGW2xhL8MSppMMdidFQb9OCSv0QCNRPSFKFZ/ObJY="
   },
   "kbounce": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kbounce-25.04.3.tar.xz",
-    "hash": "sha256-f7vCwrl6EuDumh29UlmI5m1gVjJbVi/h5LTaN4T9l2U="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kbounce-25.08.0.tar.xz",
+    "hash": "sha256-BaPHjlnBzwXPWXIcl/TDdFv+wcI/qbWkdREyZNYIoXY="
   },
   "kbreakout": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kbreakout-25.04.3.tar.xz",
-    "hash": "sha256-ivQpaYhWUcIszshNEVzLQWQWCMjHuWUUzg/7ZD2pXNY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kbreakout-25.08.0.tar.xz",
+    "hash": "sha256-I/DPXRgUv7jzlqTQKXPBORoO1P5/Rb2RvL31cY27bKc="
   },
   "kbruch": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kbruch-25.04.3.tar.xz",
-    "hash": "sha256-/mHwaYguzGDryzwtSPZk4l24aBYvXknhCT6OKfyF31A="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kbruch-25.08.0.tar.xz",
+    "hash": "sha256-KLpV5Rzkm1bOMAYWZ66J9pZc+NkYaphYWGR6sxqQTj0="
   },
   "kcachegrind": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kcachegrind-25.04.3.tar.xz",
-    "hash": "sha256-I8fcu/FcXuAN2sBoAi8Ri13pOdCXGZsPkY35+U902eE="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kcachegrind-25.08.0.tar.xz",
+    "hash": "sha256-QlPYZDpeHJJhvkcKxhyPXrLOchA2EVriBKw6q2s4oKQ="
   },
   "kcalc": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kcalc-25.04.3.tar.xz",
-    "hash": "sha256-G29S/2lQpcf2dUu0H9A2r0oBaTkiey9DUfODa6cFNIs="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kcalc-25.08.0.tar.xz",
+    "hash": "sha256-RJoNiCfERzXzTN3b3KnD4Diz3rzIbGCle8o+1CUS1fk="
   },
   "kcalutils": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kcalutils-25.04.3.tar.xz",
-    "hash": "sha256-Og4po13bxotUaslP9a/JOBxK9MX2zIVYdq5KLFIZRU0="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kcalutils-25.08.0.tar.xz",
+    "hash": "sha256-bbL2bQ7VgXFSMwqh5hq6NQ29vLDvk1WXzrr8P2msFco="
   },
   "kcharselect": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kcharselect-25.04.3.tar.xz",
-    "hash": "sha256-osTaxcbxpuS+kUnSq1r90YHjlc3guqX/UeJYU6uHjgc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kcharselect-25.08.0.tar.xz",
+    "hash": "sha256-7J8r4OEZsce/8zY9TUBaP6WMnN3qto483+HQp5CNPuU="
   },
   "kclock": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kclock-25.04.3.tar.xz",
-    "hash": "sha256-FtSJwTlCyDwqryaK1HtHPeEyXmWxOi43SffnIC6/JYI="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kclock-25.08.0.tar.xz",
+    "hash": "sha256-sP6MOkxCPFykDZ2u8ofx2ESY6msqz2avVb29d+B3+JY="
   },
   "kcolorchooser": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kcolorchooser-25.04.3.tar.xz",
-    "hash": "sha256-CNsCeh3rngpCmr3oyHArR+FAGsAIWBL3isEKfGECcPU="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kcolorchooser-25.08.0.tar.xz",
+    "hash": "sha256-pWgxauvqiOKvQSWlcPQMTE0gi82lyfMlYUbt86J/Ub0="
   },
   "kcron": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kcron-25.04.3.tar.xz",
-    "hash": "sha256-v0Y6VhxFEvrmuvTRdG2WBFxxekastmrkSWmIXqC2zQM="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kcron-25.08.0.tar.xz",
+    "hash": "sha256-9w6tbuJRdZOVwfZBU3DVxw+FclIN8RnbhcpJS3Ubq/s="
   },
   "kde-dev-scripts": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kde-dev-scripts-25.04.3.tar.xz",
-    "hash": "sha256-UbHnN1WUGqUMxo0SYO8yYkof4bw5aKOn0Sbqn7dup/g="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kde-dev-scripts-25.08.0.tar.xz",
+    "hash": "sha256-0JUvJECz0fWUdUxqUUxLKaIDvhGHgXr00Q0c//kvQc0="
   },
   "kde-dev-utils": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kde-dev-utils-25.04.3.tar.xz",
-    "hash": "sha256-5ksknqEMO9hDFBAmYdgj8o9EDFzErm5wbiJYj20R/HA="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kde-dev-utils-25.08.0.tar.xz",
+    "hash": "sha256-bL1e55+3rZCayB3fLCkW/oYEeqvoyitgYDT3Z0SjE5M="
   },
   "kde-inotify-survey": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kde-inotify-survey-25.04.3.tar.xz",
-    "hash": "sha256-TEEsKuHIqLdE5AfT6weNm0zAApTBfWfdZHC85hEDuzQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kde-inotify-survey-25.08.0.tar.xz",
+    "hash": "sha256-2nVF3AUXWqduXCQyVBgtEhZ+oI1NNF5xfy7VMivvmF0="
   },
   "kdebugsettings": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdebugsettings-25.04.3.tar.xz",
-    "hash": "sha256-WGHbZYLe1KwRKwpDuu8hktUfOwYJJwRB4FqmxVDS6Mg="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdebugsettings-25.08.0.tar.xz",
+    "hash": "sha256-vt1jQlL/hWIcIkaybWGrGgXtmrGL67+NZY9GOK9faV4="
   },
   "kdeconnect-kde": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdeconnect-kde-25.04.3.tar.xz",
-    "hash": "sha256-xEmU6Jbhe+GfuTFzFDqMEZbm0GTTsNiX1Bcrm0i940I="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdeconnect-kde-25.08.0.tar.xz",
+    "hash": "sha256-7cbY1bs6q1MgiiKVKO82pbyVm/rsF1ErViFQLR030mA="
   },
   "kdeedu-data": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdeedu-data-25.04.3.tar.xz",
-    "hash": "sha256-YjNS6PYgsVEoLifSmk6JmSsqiMPaRME9Yhu4+N4Y0Hc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdeedu-data-25.08.0.tar.xz",
+    "hash": "sha256-Xvlu7u2UGlzr2XVsbMHd6IimPGd6HGJQtqIoYHC5IGY="
   },
   "kdegraphics-mobipocket": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdegraphics-mobipocket-25.04.3.tar.xz",
-    "hash": "sha256-EvZseNGQhnwcmU9lDxQJyHveD9WSkRrTpHW3UCBF89M="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdegraphics-mobipocket-25.08.0.tar.xz",
+    "hash": "sha256-1gxOtDh9YwNqjXNPd8XLt1rqTJ3I7N/s5GsifAB0Fv4="
   },
   "kdegraphics-thumbnailers": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdegraphics-thumbnailers-25.04.3.tar.xz",
-    "hash": "sha256-IhtYTJLBwVcHIMq6l3Bt422+PvT27jJLd0UT439EYxg="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdegraphics-thumbnailers-25.08.0.tar.xz",
+    "hash": "sha256-ufK2zhYqJF43EzBdjKE/K4/6IFlnBatvlLScQJcoWLk="
   },
   "kdenetwork-filesharing": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdenetwork-filesharing-25.04.3.tar.xz",
-    "hash": "sha256-nywF85bDzY9IpZbZqXMS6IoT12eaQf5x4KJ8ee/MGjA="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdenetwork-filesharing-25.08.0.tar.xz",
+    "hash": "sha256-hgnxqvlX2wHBNS5b+iiYdwwrCLClLXOTCHE7Cch0Pmg="
   },
   "kdenlive": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdenlive-25.04.3.tar.xz",
-    "hash": "sha256-NviSflntmXsflYS1cL2ltao03BMWsg5dSPExgXMavIk="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdenlive-25.08.0.tar.xz",
+    "hash": "sha256-+GIGufhv5WkxIXI9C7F1D5bClem2x+sf6itAj1bMMNY="
   },
   "kdepim-addons": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdepim-addons-25.04.3.tar.xz",
-    "hash": "sha256-NFBl8I5fPYmguyFiM16zfWNDPrLdmKL0EZlxrsPAIlc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdepim-addons-25.08.0.tar.xz",
+    "hash": "sha256-xqL8leGkPrXcumBTHxPK93TP4pxG3DMTdFuYjkznVDo="
   },
   "kdepim-runtime": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdepim-runtime-25.04.3.tar.xz",
-    "hash": "sha256-Ez3PjDFMNuzItHddnrbZKbu71TVd3fKUQauvAP6aGok="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdepim-runtime-25.08.0.tar.xz",
+    "hash": "sha256-QrqZw+yfS+GavmaywZM82kr7p+JkMkiy90FWXfe/VwY="
   },
   "kdesdk-kio": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdesdk-kio-25.04.3.tar.xz",
-    "hash": "sha256-O5NILqSVR+SLSFtm7BpqGjSZuwMaMVyzz9ucs8wQjIo="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdesdk-kio-25.08.0.tar.xz",
+    "hash": "sha256-tWbSp216rhcj63gJb/1BSnppGnbKy0R/Xb04SMcx7Kc="
   },
   "kdesdk-thumbnailers": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdesdk-thumbnailers-25.04.3.tar.xz",
-    "hash": "sha256-8BgBCsDcTP5NzfYa9zwrfX9o3fHBkmol97lCnGSiDeQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdesdk-thumbnailers-25.08.0.tar.xz",
+    "hash": "sha256-UzyTGQdan83cEn0eRkQsO1mHt9zCV0Yoi4Vy7HFLuLs="
   },
   "kdev-php": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdev-php-25.04.3.tar.xz",
-    "hash": "sha256-e8r4dbhicPa9tCnsRr6KAe0GeCTU6SNootGxmmg4gOM="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdev-php-25.08.0.tar.xz",
+    "hash": "sha256-JdBCD8QdsSrLUsAbYsvuEqSq4qcrz49t37zfZoh4x88="
   },
   "kdev-python": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdev-python-25.04.3.tar.xz",
-    "hash": "sha256-RsZWvG4Gmrj7KdPCidu76RUx+UuLa4ILNQGKM36wPAk="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdev-python-25.08.0.tar.xz",
+    "hash": "sha256-yK8jUo3L+3N9OL9U+ryz7eukSY1W5jjsItH6hVYosfw="
   },
   "kdevelop": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdevelop-25.04.3.tar.xz",
-    "hash": "sha256-crsI2RPEky6uUngcWmGdiqBMTHfQ8xYqYOwujQJ6/q4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdevelop-25.08.0.tar.xz",
+    "hash": "sha256-hoLBO62GVDPPk1dCdfPaj+b/cIDuYXhUHFxGy0VgoK0="
   },
   "kdf": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdf-25.04.3.tar.xz",
-    "hash": "sha256-s25RDOoDT9LOCPu/sm0gOh2OJF1EJtTrlk0clHlk0WU="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdf-25.08.0.tar.xz",
+    "hash": "sha256-d1/yprkp0L7p8otJ4DrAe2QL63j8ZLOSxyyl/6jPcws="
   },
   "kdialog": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdialog-25.04.3.tar.xz",
-    "hash": "sha256-35fRq3kwFhU27EEYTkPNAN5+RraGcp7wOiklJOFE+uM="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdialog-25.08.0.tar.xz",
+    "hash": "sha256-d3LN/irMz9pCDGJ6ix9M81rMGQb1FV/CFm7kguEHVaM="
   },
   "kdiamond": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kdiamond-25.04.3.tar.xz",
-    "hash": "sha256-/2+A+GhGcdJPJGTa2jxtIaNBTzQDzAlwDd5GrPrZqHA="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kdiamond-25.08.0.tar.xz",
+    "hash": "sha256-t04OkA2mBVZXYTPdqe+A8QpXK+IcDOXaF3KkRSBE4gQ="
   },
   "keditbookmarks": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/keditbookmarks-25.04.3.tar.xz",
-    "hash": "sha256-3/bn0Zb0au95losTuubsEAk837fkUm/ecxCRPKcvUTo="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/keditbookmarks-25.08.0.tar.xz",
+    "hash": "sha256-jwbEbljPAeYdhNnrLEaAJNRvIKzpwDGOo3ABwnj9VNs="
   },
   "keysmith": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/keysmith-25.04.3.tar.xz",
-    "hash": "sha256-fII6yKb31w37DSuKXEu8pcC/pDlZZxd20BeMTllprpA="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/keysmith-25.08.0.tar.xz",
+    "hash": "sha256-Dl8h6/+yGFbiLf0vqWH10UxcVlqIACoyzh9BF7rWCYc="
   },
   "kfind": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kfind-25.04.3.tar.xz",
-    "hash": "sha256-DH0AsG/e+7embyZlGWswcsF/aEZnnqmyk76b8xCIwWA="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kfind-25.08.0.tar.xz",
+    "hash": "sha256-jwmkSaqgv92/CSKolUv/KBp+FNU80kN00XHFKnIq6iQ="
   },
   "kfourinline": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kfourinline-25.04.3.tar.xz",
-    "hash": "sha256-rG+hzm+xy8TDVFTXwq7aksgenyYA9ka8c981w3ex9mk="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kfourinline-25.08.0.tar.xz",
+    "hash": "sha256-nGE9x7su2bM7qZa35+GKYMlEh3rh3JRyI3JIc1wBRSE="
   },
   "kgeography": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kgeography-25.04.3.tar.xz",
-    "hash": "sha256-aEp+YZNKcCVISj4ll1vw1Qq9kXs1GknRUqCaarK/7Tk="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kgeography-25.08.0.tar.xz",
+    "hash": "sha256-Su0Hocbmn6OYYDjx0hhq7UAreSzAJEF8DBlYcewCw+0="
   },
   "kget": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kget-25.04.3.tar.xz",
-    "hash": "sha256-S3Sq7P1zAghIj0gLx1+XfotInMH+VzdifybEhuKQlUQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kget-25.08.0.tar.xz",
+    "hash": "sha256-FT4vwhr2GI8vKwuXY0lhkpZtFpQ4L1NmJeHIIHeeSiw="
   },
   "kgoldrunner": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kgoldrunner-25.04.3.tar.xz",
-    "hash": "sha256-XWeEjrM4XVlIfuKAn4vETvn71S2ymXjLBIflqc2vHn0="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kgoldrunner-25.08.0.tar.xz",
+    "hash": "sha256-ldzYbperdo/Ozt1aotDCqGqdCweUMFOYeOEeFR+dMqQ="
   },
   "kgpg": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kgpg-25.04.3.tar.xz",
-    "hash": "sha256-Py7G3FsSIZCHMAZidL0NL27+XATCp5tyDLJdzlR+Dk4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kgpg-25.08.0.tar.xz",
+    "hash": "sha256-w0Pyex0CSpSX1t+BQ5/fxabRMBZyWiJdeh0ZX9sAJCc="
   },
   "kgraphviewer": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kgraphviewer-25.04.3.tar.xz",
-    "hash": "sha256-e3nbzMQ+E8JtdrJga37Gwth+hXoRbKLHFQ0xiN/fhw8="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kgraphviewer-25.08.0.tar.xz",
+    "hash": "sha256-9iIvPbDGbeiPURTh7NFYrl0z/T/Mzm4zgIX1/0tlANU="
   },
   "khangman": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/khangman-25.04.3.tar.xz",
-    "hash": "sha256-6RVZQyQvGL/t8Bzr/nu8B5jqBnd+pdogZy0vTyjujQ0="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/khangman-25.08.0.tar.xz",
+    "hash": "sha256-bgOVYCNwCDCCUlcXSF+hAwrntOMey5etIDWqPEeIqJA="
   },
   "khealthcertificate": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/khealthcertificate-25.04.3.tar.xz",
-    "hash": "sha256-DAWq118XljAnWy3pToXMO1cf2XbWBqwjOacBm8bNDJk="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/khealthcertificate-25.08.0.tar.xz",
+    "hash": "sha256-mpdDixnFZga0eGy5WeQnt0fK7EF6ySy0D+JsdeSraHI="
   },
   "khelpcenter": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/khelpcenter-25.04.3.tar.xz",
-    "hash": "sha256-SRQLPzH+gqsJk3JFAP8b75yAQccjSjuDHMmt63ERQRE="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/khelpcenter-25.08.0.tar.xz",
+    "hash": "sha256-2Eq4wdkySJQhRh1s1VYLKVWEE1sWiYFQRmBTNTARBpo="
   },
   "kidentitymanagement": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kidentitymanagement-25.04.3.tar.xz",
-    "hash": "sha256-E6Ai5eqEW0tlmCxTPXBYiCgoBeDORFF+zNbiS41ePn8="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kidentitymanagement-25.08.0.tar.xz",
+    "hash": "sha256-uMZV52h6iPVbnaCOekxa8TdHFDBmnS7Qa40ZcUX2n44="
   },
   "kig": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kig-25.04.3.tar.xz",
-    "hash": "sha256-It9UJwC6G+nMH9Lv6PbLqgJRywqs0acbRtDCG2cbxaM="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kig-25.08.0.tar.xz",
+    "hash": "sha256-EPXJMXI6NOpuB13wUnERSMKRK8qyzHDTB/YOQDEaPZc="
   },
   "kigo": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kigo-25.04.3.tar.xz",
-    "hash": "sha256-6I/8LSSp5qFL7YiyTaaZq8+ABz0xQp0pXVIv9Qhe+Hg="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kigo-25.08.0.tar.xz",
+    "hash": "sha256-oknZEIurpIEw+TZPdXS8d8YLjB1bbVpOF34Fkk8O5hs="
   },
   "killbots": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/killbots-25.04.3.tar.xz",
-    "hash": "sha256-tbWTc2T250TgSpB2qZRVH4oFQbj8nAnIUiA/JhxsNoY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/killbots-25.08.0.tar.xz",
+    "hash": "sha256-brENCa7KPdb/9N2q6+LIV6KzuRh+GtH3p7bYF9h8bUA="
   },
   "kimagemapeditor": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kimagemapeditor-25.04.3.tar.xz",
-    "hash": "sha256-GKARfo1VUw5qg6V4RbFCz6SVHxzjPIcBIgd+sikIlkA="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kimagemapeditor-25.08.0.tar.xz",
+    "hash": "sha256-L7BHcNrXC6+m0+1VY15fVlL77FtiVY1ZGW9gFwomzRc="
   },
   "kimap": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kimap-25.04.3.tar.xz",
-    "hash": "sha256-KtwaiSjQcF8xr9YFDcKEBpCuC2JQ9VsbyVJXn0QDMe4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kimap-25.08.0.tar.xz",
+    "hash": "sha256-SA6Kq/wR1lyjvoq9cUuEioR/mbeAXntqsh3Vai8KI3k="
   },
   "kio-admin": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kio-admin-25.04.3.tar.xz",
-    "hash": "sha256-y1gIZvSEBQ/QbLgaxVe/3gv+B0uxOU6zHNkiK+CLW1k="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kio-admin-25.08.0.tar.xz",
+    "hash": "sha256-IaV8D3ywxj9OhJe1ZUvmZGVSNLG2NogGVQQNM8IIFhM="
   },
   "kio-extras": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kio-extras-25.04.3.tar.xz",
-    "hash": "sha256-8LYwY55HZs6FufhES1uHf8O0DgnsL86w2WHv9JFNP8g="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kio-extras-25.08.0.tar.xz",
+    "hash": "sha256-Cl3IZcWBC3oM0oDTTUy/iGBDO3imV0F7JFzHHjNlJAU="
   },
   "kio-gdrive": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kio-gdrive-25.04.3.tar.xz",
-    "hash": "sha256-qSfI6YkH5ug+DWdhsmzdXCXOSGBfzDpcvCwaizv6GyI="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kio-gdrive-25.08.0.tar.xz",
+    "hash": "sha256-jdwy0595u7YHptE0rFqh4IYn/udSMznS3J7uK4Hlp9Q="
   },
   "kio-zeroconf": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kio-zeroconf-25.04.3.tar.xz",
-    "hash": "sha256-1lEEaFnIS8NZGi2I2vrQ5HrWSJ4lZVruI8HPQWZ/6sU="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kio-zeroconf-25.08.0.tar.xz",
+    "hash": "sha256-I1kNF3OoC/YVauux+WgKEi307awUh3wrlpe0w6rZE7A="
   },
   "kirigami-gallery": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kirigami-gallery-25.04.3.tar.xz",
-    "hash": "sha256-ipRgnhvPFPQijn7Y0AlFARqPNUTxPoupnzWikzJ+4G4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kirigami-gallery-25.08.0.tar.xz",
+    "hash": "sha256-uon7k03tRa+9Lte0pbev8tLIDsqTEWhBfW4ElRqDwao="
   },
   "kiriki": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kiriki-25.04.3.tar.xz",
-    "hash": "sha256-H08z+28qJpmLIi96ZwvZj3AtD3jUyBKBDCgNGLI1W9s="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kiriki-25.08.0.tar.xz",
+    "hash": "sha256-c71BQUSu2DmBw8ub5bxPq1GlpuK/JuHR5YiYv2pfOM0="
   },
   "kiten": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kiten-25.04.3.tar.xz",
-    "hash": "sha256-fH/LoXB7Or3qhiSSL1XhgSdKWYIT1Q8iLGKwO+r2wPQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kiten-25.08.0.tar.xz",
+    "hash": "sha256-p5YSaICOMD7cQSzxzW6FNRH9Hlck1xfD+S6GBfW537Q="
   },
   "kitinerary": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kitinerary-25.04.3.tar.xz",
-    "hash": "sha256-ypOghv7M8PNtTKVqn1zPUZQ9fhlFs5La8hHkLxKBOdQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kitinerary-25.08.0.tar.xz",
+    "hash": "sha256-Y1Uwwx1n/DX19bzfQ/BtiW5HtCPQLfZUbvPF/qHSEsY="
   },
   "kjournald": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kjournald-25.04.3.tar.xz",
-    "hash": "sha256-NkmpgJLX8dqJOeWaVd0j345cKXLPBbZEO9myovAZAhE="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kjournald-25.08.0.tar.xz",
+    "hash": "sha256-Uoezbv3HsSTIHBxqBSM1fWYLXWM7ftwTlIASOsdGFsY="
   },
   "kjumpingcube": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kjumpingcube-25.04.3.tar.xz",
-    "hash": "sha256-L6d3H3o45C5IAP65PZh9YzMFtYLV7ruyq1QD8PZ2F8U="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kjumpingcube-25.08.0.tar.xz",
+    "hash": "sha256-ZKZH1WQyMMGRFSGB7fr3HXdiYwXfXVV/BjLfwRQDk9s="
   },
   "kldap": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kldap-25.04.3.tar.xz",
-    "hash": "sha256-8I9Kcu/hvNGXs+YzI6pPp6CSctQIuKB9tLYcR5LiC38="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kldap-25.08.0.tar.xz",
+    "hash": "sha256-EPn0kcUBIZNrsFthb8HfEmKLBwPGUMbtfCxzGFpLVLQ="
   },
   "kleopatra": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kleopatra-25.04.3.tar.xz",
-    "hash": "sha256-fJrZ0QzTaNWM2t1B94uKQYU7jNKxXrVUcvO1znB60cI="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kleopatra-25.08.0.tar.xz",
+    "hash": "sha256-88uoFgQXMu2RXklB9yjwTvnLMSnzHYRb/o3z9ODws9s="
   },
   "klettres": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/klettres-25.04.3.tar.xz",
-    "hash": "sha256-5mazGcvomE8S5dC/DYgmHLUQioZ9VdtG3ib+r1l4/1Q="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/klettres-25.08.0.tar.xz",
+    "hash": "sha256-yuEb51Wz9uX9GzDYMOYeMD3a7tquzIiJgMYQQkv4Msc="
   },
   "klickety": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/klickety-25.04.3.tar.xz",
-    "hash": "sha256-AeaHzIPeXG6poxUsjYFfHWgANj4c5MWQJu2EU4h5RZs="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/klickety-25.08.0.tar.xz",
+    "hash": "sha256-gRg/svN+R/todDGUg5zC9vPkJBKWzI3eeG3HOiOYJWY="
   },
   "klines": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/klines-25.04.3.tar.xz",
-    "hash": "sha256-vRo/e1aBh+cXRewwbmZJgYPyerqb/zuHnzVsxptgCgQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/klines-25.08.0.tar.xz",
+    "hash": "sha256-t3skWaX0ZGQ50AQ+fTs9fM5Bru/9VnyGudjDJbqUdCA="
   },
   "kmag": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kmag-25.04.3.tar.xz",
-    "hash": "sha256-CKWfOAV0nJSIxto8yEeYSb5Yn6RoQ43IEf7A5tufBsM="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kmag-25.08.0.tar.xz",
+    "hash": "sha256-CW1SmriK1vtA50d7/DIjCtZPxxeM5vF78k3aON9wOh4="
   },
   "kmahjongg": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kmahjongg-25.04.3.tar.xz",
-    "hash": "sha256-bGe1awgj+srpewBh2yYT2NkBFR0m8ZXofggzBXtmt5U="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kmahjongg-25.08.0.tar.xz",
+    "hash": "sha256-Ul6Q1i/420mBMfx7HKTL+GEa3+AKFDPyZYvJQ6RaLlo="
   },
   "kmail": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kmail-25.04.3.tar.xz",
-    "hash": "sha256-Gepz3GF7OXcqizySoLhhMr7mFQykaS0/e3dr90xB9Qk="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kmail-25.08.0.tar.xz",
+    "hash": "sha256-2l0cEIomJnRuwgXRdfhA5R8jrJLz2lNdulbWRNQdnEY="
   },
   "kmail-account-wizard": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kmail-account-wizard-25.04.3.tar.xz",
-    "hash": "sha256-C0Yp7hv5GeeoSWxkQWJZGvx+v6NkOVVcH73rkibpBf0="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kmail-account-wizard-25.08.0.tar.xz",
+    "hash": "sha256-a3t4+8NwAkMIGTAksnYGa6wrWVfcylrFTCpfYP39nEQ="
   },
   "kmailtransport": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kmailtransport-25.04.3.tar.xz",
-    "hash": "sha256-Nk5OcGi+U++5lFOaJz3MDhekXWCmMWQwekXNs+LfWHk="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kmailtransport-25.08.0.tar.xz",
+    "hash": "sha256-IJOp52Sw1U1PwGRUM7qfxeOivzbInn0jK403C/tWzLY="
   },
   "kmbox": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kmbox-25.04.3.tar.xz",
-    "hash": "sha256-j2BL3IdYezvE2UStgsF1h8jbGTDWQ1/bxOX4+xf2cn4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kmbox-25.08.0.tar.xz",
+    "hash": "sha256-0pAUW8fNEUbrELjTlYSL/NpR57Xb2V8DN2gapqtsStA="
   },
   "kmime": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kmime-25.04.3.tar.xz",
-    "hash": "sha256-I+znHYOSYQJLhhykuVbqB4fuWduIPRe+qDI2qvi9oeo="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kmime-25.08.0.tar.xz",
+    "hash": "sha256-hG5uzVGdmaKC9QecnBU/u8PZ5vhpjlqbMfjcz+mI0fM="
   },
   "kmines": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kmines-25.04.3.tar.xz",
-    "hash": "sha256-/TfF1tGifkhB9c1g5nY/eTGCEA/AC1xQ88Kz4aqdl4M="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kmines-25.08.0.tar.xz",
+    "hash": "sha256-MZaKR3PaEATzNTR7aPAOuxMtyb0g+PlcDZDdlNt0gPk="
   },
   "kmix": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kmix-25.04.3.tar.xz",
-    "hash": "sha256-PY6wK7TBgLAF6VsspctqK2Mm549TnYP9OFBR++aC69I="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kmix-25.08.0.tar.xz",
+    "hash": "sha256-35EcfjkykP8IfdF7qiIzcmJup5hh01U+byMFixgL+4E="
   },
   "kmousetool": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kmousetool-25.04.3.tar.xz",
-    "hash": "sha256-rBtkyFdIIBJfLBpYiTPWRM2kCKCHe4rGbVB9kgTn6nw="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kmousetool-25.08.0.tar.xz",
+    "hash": "sha256-PxWZUYFHd5D86AZzrEu4m2GCJ1cjGywIcTNYWJ+Dba8="
   },
   "kmouth": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kmouth-25.04.3.tar.xz",
-    "hash": "sha256-K9wPSQhxdmFM2YMkEidSs2YofkAjI/8dda6sp/dI0GM="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kmouth-25.08.0.tar.xz",
+    "hash": "sha256-wP7P/+3uVx+ny1r1nTrBPuErvNR7pQAe0tGfRymeqbg="
   },
   "kmplot": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kmplot-25.04.3.tar.xz",
-    "hash": "sha256-h/skKibsKOM5INgH087IeA6AzlqmwWytf8dtWGN6M6I="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kmplot-25.08.0.tar.xz",
+    "hash": "sha256-tik2ar/8aR+NbCC68luMqzEa2//zNlUZyUfp8jSz8qY="
   },
   "knavalbattle": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/knavalbattle-25.04.3.tar.xz",
-    "hash": "sha256-l7LStWMtAAw9bt37GcnTzEQUMA3FyAUyLW6wuyQcUhU="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/knavalbattle-25.08.0.tar.xz",
+    "hash": "sha256-HqgvZDaPX5PKfMrXmGuz8REJa7sZS3JHLzpqAyrEg3I="
   },
   "knetwalk": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/knetwalk-25.04.3.tar.xz",
-    "hash": "sha256-F4f8RVa5jFCdq+aRih9SIcXpIroisXw1aswaO5JD5IA="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/knetwalk-25.08.0.tar.xz",
+    "hash": "sha256-TLKlEI7UqgaJdEx5D79z46aaWzH8Nkttbt1qOQrh1k4="
   },
   "knights": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/knights-25.04.3.tar.xz",
-    "hash": "sha256-3SYUM0BVg3uxWmtUgCWZi87qWq9CRIR/Kn905Opbb84="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/knights-25.08.0.tar.xz",
+    "hash": "sha256-5YfubpGkroAyh+K0xEPNY7BPWRKjwasU9DRcVDvXJW4="
   },
   "koko": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/koko-25.04.3.tar.xz",
-    "hash": "sha256-zuswvsChhGdYNJ4TtRnPmAUMRMT8Q3yxNzg8B/rZgSM="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/koko-25.08.0.tar.xz",
+    "hash": "sha256-T9sUsdA+dNZWNO70eSX9ISFrtAGdGJIyqYMfq7zfT+U="
   },
   "kolf": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kolf-25.04.3.tar.xz",
-    "hash": "sha256-IT+7Uc9kScMuF5rQFbJwTTRYJ0PBDgVYU/bK4RwHaZo="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kolf-25.08.0.tar.xz",
+    "hash": "sha256-BpMgkHfb8FL0Tw+yATzm+tcWK4cyRiNnrzT8hc9BIQo="
   },
   "kollision": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kollision-25.04.3.tar.xz",
-    "hash": "sha256-GHf+1B1RqNUmsM+nN6ZRT3OrhrvwlyGuY+k8lD1BWfg="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kollision-25.08.0.tar.xz",
+    "hash": "sha256-EdkLVR62vQOwuA3Ir2Fe/YwUlnL7cDSliYA1idJR0tk="
   },
   "kolourpaint": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kolourpaint-25.04.3.tar.xz",
-    "hash": "sha256-gZubrRXZJ7FQuVrHHTmPBN85J2K4SLtr5hnj/aM1fR8="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kolourpaint-25.08.0.tar.xz",
+    "hash": "sha256-bImydJD42ObPaRFNBW+dlrt716gXcIbHQFX6h1wSPfY="
   },
   "kompare": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kompare-25.04.3.tar.xz",
-    "hash": "sha256-47+cnoTbzuD8OfeCYRSfk7+M3WSUq+LGcIvOYt5RzJI="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kompare-25.08.0.tar.xz",
+    "hash": "sha256-Ky9n65oxCTsdHilXJPDwsM0TJ1ys37hkWQ1fzOi0yHI="
   },
   "kongress": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kongress-25.04.3.tar.xz",
-    "hash": "sha256-S70GwtqO3TQzwboO3WNNFhYazlCotLfIDNmR7obWAgE="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kongress-25.08.0.tar.xz",
+    "hash": "sha256-C3KpuLiF8nMLdPtOC8nOKBLQuS0ebqCJ10yC20SSJjc="
   },
   "konqueror": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/konqueror-25.04.3.tar.xz",
-    "hash": "sha256-J9quIA7LRBZp0M/SaTciVuGDsoQByptJhrboYtwqatA="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/konqueror-25.08.0.tar.xz",
+    "hash": "sha256-KQpr6KLr5TisMAXnbXlR6fuVvyJF+wy8AHqjzI7KIsA="
   },
   "konquest": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/konquest-25.04.3.tar.xz",
-    "hash": "sha256-LsNXYyCBE2/CpKdnce+enCEy28FsihP0ssUQRv0y4VM="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/konquest-25.08.0.tar.xz",
+    "hash": "sha256-rEtX1+D/orA8KmeUtPSves/ShMvzqLOFWc+PSMhocYQ="
   },
   "konsole": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/konsole-25.04.3.tar.xz",
-    "hash": "sha256-L2gz4ipx9BkefuRfPc434io7420PpZL9//ziB6ysOTk="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/konsole-25.08.0.tar.xz",
+    "hash": "sha256-yIC9LIKUN6FCq69Pl+vDhMnywZ8xzCORjEkQByeSdFA="
   },
   "kontact": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kontact-25.04.3.tar.xz",
-    "hash": "sha256-rntlcREXVo7xFJYo7WjqgeCK+kFLJz0GqGVNGm9TdIk="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kontact-25.08.0.tar.xz",
+    "hash": "sha256-683su90RHqwG7CljR8HS2EfX7wQLJnXb9cSLJTaPJX4="
   },
   "kontactinterface": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kontactinterface-25.04.3.tar.xz",
-    "hash": "sha256-Wnq0wY88dTeCtdO5rGMhNlH0Jo/7aYsMYgbP8yNhQTE="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kontactinterface-25.08.0.tar.xz",
+    "hash": "sha256-vuOm44o2GQ1JRYG93J//lEHkPDHjyZqbubm8rW/7ykc="
   },
   "kontrast": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kontrast-25.04.3.tar.xz",
-    "hash": "sha256-XME09K9Mbau659+DyJRcOYbLmuBFXQ0xVRf6lpBe7Pg="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kontrast-25.08.0.tar.xz",
+    "hash": "sha256-COKmi9b73AQcAaUjviOzYXXhcakCvYPDM7rG7oc7nRg="
   },
   "konversation": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/konversation-25.04.3.tar.xz",
-    "hash": "sha256-uwCoZNfX9ATxysbU0uQVvQOMi/6RNkXandoar3DQbDc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/konversation-25.08.0.tar.xz",
+    "hash": "sha256-f7gkJmI0w8y9X07XUbf4lojb/BvLpQoWTTPrOie5Bz8="
   },
   "kopeninghours": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kopeninghours-25.04.3.tar.xz",
-    "hash": "sha256-hLnng78PvesUFufjAIlMMmiwEiCzwVvlWS+0AJe4vNI="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kopeninghours-25.08.0.tar.xz",
+    "hash": "sha256-lLrkQlnXVmsqfCZBHzIA/EApi7H8ZdSAYKpqIQr8TVA="
   },
   "korganizer": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/korganizer-25.04.3.tar.xz",
-    "hash": "sha256-3Riywmuxr0zNTuZqSiA8jGq1n2ObxvWgmjtMjRv1XO4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/korganizer-25.08.0.tar.xz",
+    "hash": "sha256-dMfVe+Ls0AkgxcwbB50z6EnXs28C/kUlnK0zfaW094s="
   },
   "kosmindoormap": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kosmindoormap-25.04.3.tar.xz",
-    "hash": "sha256-msBAzkM5vF5xXeBxN+ebyuprpFnjBJpXzienUDgUIto="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kosmindoormap-25.08.0.tar.xz",
+    "hash": "sha256-RhURYL/OX4VeTfb+u9+eSIf0rd10V0ndCIiqmhLRIcs="
   },
   "kpat": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kpat-25.04.3.tar.xz",
-    "hash": "sha256-zcIXaH3o3rwi75fd09WZgLpvf4NrNMRCs8mR5uWhVI4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kpat-25.08.0.tar.xz",
+    "hash": "sha256-b0elLwR1MrdTlOhI0J0vaxHwcG3d3o7EvodtDlZ4uho="
   },
   "kpimtextedit": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kpimtextedit-25.04.3.tar.xz",
-    "hash": "sha256-ShB8oCpFNf3Aj3tliGzJnN+dpkKmc2O8urTLozi8bDI="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kpimtextedit-25.08.0.tar.xz",
+    "hash": "sha256-ncCOMlGzcctsG4mA0twMvA2rn8EV0IRIlL+NvQ9NFDc="
   },
   "kpkpass": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kpkpass-25.04.3.tar.xz",
-    "hash": "sha256-aKmgac0u18kRtsSlFf7sdaiFB6RFKU1aU5G7uAMAgd4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kpkpass-25.08.0.tar.xz",
+    "hash": "sha256-LuKiX/kPIwJt1ofitirBqQjBxV/faFpCWD1nRyobrbs="
   },
   "kpmcore": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kpmcore-25.04.3.tar.xz",
-    "hash": "sha256-bCLpBo+h56Skpk3vdja7NJi5d893dS0SbxtOEUP0jJU="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kpmcore-25.08.0.tar.xz",
+    "hash": "sha256-pA7Ok5GCdwZl6xqWPpYsHoltBjnX4E/neAtExE+QNWk="
   },
   "kpublictransport": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kpublictransport-25.04.3.tar.xz",
-    "hash": "sha256-Y3usX/I4uS0xxKZ36SpzGZgWEXlXVjSFUvAN1ShCXl4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kpublictransport-25.08.0.tar.xz",
+    "hash": "sha256-/QGQCB9L4XJxHsHg5XAoBbz5wAxzoIpCujeQFnyrqwo="
   },
   "kqtquickcharts": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kqtquickcharts-25.04.3.tar.xz",
-    "hash": "sha256-bflSPZBZRJV9InrsAJzfRfICsnkpYmnd6PY6ArVJwCg="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kqtquickcharts-25.08.0.tar.xz",
+    "hash": "sha256-rBlRe9gGdGs+1PnGPtIZuwg7z8YUQmQA0JWcakY4Zyw="
   },
   "krdc": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/krdc-25.04.3.tar.xz",
-    "hash": "sha256-T78jcTziX0ZdsT2uK5WtJGlFyyrlEm4XoQu1LGGDTso="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/krdc-25.08.0.tar.xz",
+    "hash": "sha256-J7UPqC9mXPjsXx81c9886xT+BgLjAojxtPipQH6y1uw="
   },
   "krecorder": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/krecorder-25.04.3.tar.xz",
-    "hash": "sha256-otBcxZU3ajwPqFioONiEExsFRSa1Xz/vEtXx0j5WIqY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/krecorder-25.08.0.tar.xz",
+    "hash": "sha256-fCg4oMthcfJz+Y8tC5uZCBY+Qm+Ve4r5R1Br6NjiEHo="
   },
   "kreversi": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kreversi-25.04.3.tar.xz",
-    "hash": "sha256-wSPoxxaq480NXxHkvcSeNsMvZs7QBj4HT9pzDqDiTCk="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kreversi-25.08.0.tar.xz",
+    "hash": "sha256-9dA2UqmEtMT++JNTMOGzAm9vgnnZTvmoyFj7rOCmgXE="
   },
   "krfb": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/krfb-25.04.3.tar.xz",
-    "hash": "sha256-9tuZz5RaIHMzbtbdjdAxAagVdCoM7MVgo1f+ObN2Bwc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/krfb-25.08.0.tar.xz",
+    "hash": "sha256-81PGYDBG/pf9CAhJfUej6xi714EeQ9CMllQUIUSWhFo="
   },
   "kruler": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kruler-25.04.3.tar.xz",
-    "hash": "sha256-cI2JfyE8s/2Iy6yGKZV7HWg6j8X4dtdPR7wzQ0g3dC8="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kruler-25.08.0.tar.xz",
+    "hash": "sha256-rMSdbnEklY1IyqMBZESwoMiD8k5jtcE/HeZF8Z8gk4s="
   },
   "ksanecore": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ksanecore-25.04.3.tar.xz",
-    "hash": "sha256-5aj92kTUon8MkMK4COSKc3mZ7CAP0LcPdfq7M6kBMwI="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ksanecore-25.08.0.tar.xz",
+    "hash": "sha256-kkJL2qKFnr5Tci6mY9SmeUhDYdygqxSJI2qXbv/y8ak="
   },
   "kshisen": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kshisen-25.04.3.tar.xz",
-    "hash": "sha256-IFpkR0Xxc3xtxjNGOxCAxJKKA783RJvrghX50upNZn0="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kshisen-25.08.0.tar.xz",
+    "hash": "sha256-rUN3bVkK9wvNAQOyji2U6OM/GTCkTZEyQRmv3pIZ5JE="
   },
   "ksirk": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ksirk-25.04.3.tar.xz",
-    "hash": "sha256-a9SLUrZGcTQXzMS7kS3kAKalhU6CmzsqEQrVwNqwqk0="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ksirk-25.08.0.tar.xz",
+    "hash": "sha256-kCEh0bxVeW6Z0ChABY3sKmEzrD9KRjOaRpNJRTYEO0s="
   },
   "ksmtp": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ksmtp-25.04.3.tar.xz",
-    "hash": "sha256-GJRPmAQyjAnMgrHDD518WBJVXEXEQZm7nKo329g/TIY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ksmtp-25.08.0.tar.xz",
+    "hash": "sha256-jyZaBZ4Neje/80GUdAIvCjypUrIYnrXzrPtF3K8zytI="
   },
   "ksnakeduel": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ksnakeduel-25.04.3.tar.xz",
-    "hash": "sha256-rPcUi6wf/3M6cDK6JrKKy4T0K5bVFy07oKHzR18RPLU="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ksnakeduel-25.08.0.tar.xz",
+    "hash": "sha256-eqJAnPaeKQBJEM8aNrxutkais04/ehtAaz+LBELkGhs="
   },
   "kspaceduel": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kspaceduel-25.04.3.tar.xz",
-    "hash": "sha256-1VDeNvcZOTq1PMLPvGWe6PipVzh36x06eAwyOBj9jYo="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kspaceduel-25.08.0.tar.xz",
+    "hash": "sha256-vCjf8JbKroPlsTIoVNqGS9/dAQifzVE01jIZTkwG7tc="
   },
   "ksquares": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ksquares-25.04.3.tar.xz",
-    "hash": "sha256-dCa2NCH40SGwhgz4sTb5oCdAcT+LHsksu0ceatu61I0="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ksquares-25.08.0.tar.xz",
+    "hash": "sha256-5NXJ2VbD/Ld+NoW5fX43ZrWzIyZLl9WyD8oqqv0mk94="
   },
   "ksudoku": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ksudoku-25.04.3.tar.xz",
-    "hash": "sha256-wU1hSID0m9nANrrSMWKYIeIuMT1W2gsowBgj89JygvY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ksudoku-25.08.0.tar.xz",
+    "hash": "sha256-cM2iRDlwg7VKnMsr2ibaySlgT9EbRTLsZG5j4O8Ho6w="
   },
   "ksystemlog": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ksystemlog-25.04.3.tar.xz",
-    "hash": "sha256-y6wpAHbuFtNYFgFajJn+KXqQk4mNC+rCnHNLyeAiav4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ksystemlog-25.08.0.tar.xz",
+    "hash": "sha256-MIOjLkPCV+Sw2RskZcCs30k20xtSFN4dIHsT3gY+2Gk="
   },
   "kteatime": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kteatime-25.04.3.tar.xz",
-    "hash": "sha256-YSnKsU4iSDYgF5xL0YvMV+/oGDNha2BFMmG1SVgrkWw="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kteatime-25.08.0.tar.xz",
+    "hash": "sha256-CBqJLXiyMORf9WBOyRoloWa/mCWWRO4K0VrwMW2l40o="
   },
   "ktimer": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ktimer-25.04.3.tar.xz",
-    "hash": "sha256-9YK0QqlWKEtW0VuBOdokjnZwHgyqcl5uZRdc2S3UXZQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ktimer-25.08.0.tar.xz",
+    "hash": "sha256-Iy74Orp0cGujT5azzVuwDdFc4YaQNl2iTqu+692z5Bs="
   },
   "ktnef": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ktnef-25.04.3.tar.xz",
-    "hash": "sha256-URnwPRfMH1Z8DUKa9lBjNaHowL1DtTmxtkROzDvWs2o="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ktnef-25.08.0.tar.xz",
+    "hash": "sha256-Erxnxhl5KnxN6PYlL4YUyjOsOklMIrv1Co93kJTU5y0="
   },
   "ktorrent": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ktorrent-25.04.3.tar.xz",
-    "hash": "sha256-AKAmKqMOtTZzmTKIsf+ufi+SS2kmD4e+p2JxWlzg9+c="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ktorrent-25.08.0.tar.xz",
+    "hash": "sha256-TWnrBeu8vupavqK0VhvaqpqzIyUigThq8IABPQ01414="
   },
   "ktouch": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ktouch-25.04.3.tar.xz",
-    "hash": "sha256-rMHPf0NSao+1afluY6yjnsPm4qxoB9JwBWUPhwr1npA="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ktouch-25.08.0.tar.xz",
+    "hash": "sha256-0cpb+HYNGb+gQSh1vNpc25tMDbm7s5xD8dekBCstkdM="
   },
   "ktrip": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ktrip-25.04.3.tar.xz",
-    "hash": "sha256-CVJ7C5DB1U2UGDQBR0YxR2e9dG9yzvoI3LPqJDaZafo="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ktrip-25.08.0.tar.xz",
+    "hash": "sha256-v8rdcQGAnArjceAFBIXGaa0WNkQN0i/DUtuJWpSUYLc="
   },
   "ktuberling": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/ktuberling-25.04.3.tar.xz",
-    "hash": "sha256-UfXFEzDoJep3F9C16JVmnrAuWnpXngpVkmyeTtVtjRY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/ktuberling-25.08.0.tar.xz",
+    "hash": "sha256-/DDWiptBaKdRCFsJJSzb1UfGMF3VBdYfGt9q+ts4+ZY="
   },
   "kturtle": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kturtle-25.04.3.tar.xz",
-    "hash": "sha256-flO667mSZJZK0EeySCdZb5uZjGmNtYnw77dP4WY37Ag="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kturtle-25.08.0.tar.xz",
+    "hash": "sha256-cDg92ckt24p1c7bo+G2rDd3gKhl//XLIkj/DoSITXVM="
   },
   "kubrick": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kubrick-25.04.3.tar.xz",
-    "hash": "sha256-QbFgN0SPTE2nWqILcDXg+q9rjCgLsF/B/HmobxziKVw="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kubrick-25.08.0.tar.xz",
+    "hash": "sha256-KGQaRkJts+q0p8jxwxnEEgalgVhuP27VRGOMS3+8fPk="
   },
   "kunifiedpush": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kunifiedpush-25.04.3.tar.xz",
-    "hash": "sha256-oW/+QRexS6oC87iufenlCaFzWcG2fc2FGu9PPDZhod8="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kunifiedpush-25.08.0.tar.xz",
+    "hash": "sha256-hG22/8fZP2r+p84NWp8QtSeSFXzrWThWVCJ59Bl/NRg="
   },
   "kwalletmanager": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kwalletmanager-25.04.3.tar.xz",
-    "hash": "sha256-JbZtjj2pVI7LAjb9DPxQ1umKOFyiCS1lZfdadT8yKeo="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kwalletmanager-25.08.0.tar.xz",
+    "hash": "sha256-ARC7xVczOS9J0t4zMILSnBkpoQc68neZ9sJ3KJyDWaM="
   },
   "kwave": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kwave-25.04.3.tar.xz",
-    "hash": "sha256-AeGM36opYAPWs64YU669Q3HhgWb2qZ+omSN/fMt1bkY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kwave-25.08.0.tar.xz",
+    "hash": "sha256-gMHy6wZBFIrEJWQYu1gahcFtXh0xRUoczXfCApUxX9c="
   },
   "kweather": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kweather-25.04.3.tar.xz",
-    "hash": "sha256-1SUIi4RiiqReShxQT1InrAtmcRoytUXC7vyCZJzzYrE="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kweather-25.08.0.tar.xz",
+    "hash": "sha256-rNjTg6vJcyOggoP1w0UR0FoGtwGTINAklooBzPb+IQY="
   },
   "kweathercore": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kweathercore-25.04.3.tar.xz",
-    "hash": "sha256-yZFDKed+TdRgoeC40HRHc3dcJJT1vj9PPvrKyNPgBqk="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kweathercore-25.08.0.tar.xz",
+    "hash": "sha256-G5fpWuyPGTAkSuXEAHEgVhCbPtIvpbaZSDTNcUu+Mko="
   },
   "kwordquiz": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/kwordquiz-25.04.3.tar.xz",
-    "hash": "sha256-VaqtbssKp6ipRS79545cc0h4bZ/xlns9gsfoh2rUcoY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/kwordquiz-25.08.0.tar.xz",
+    "hash": "sha256-Czxx/DNSbQYJdtsOHU2Itellpb7xRK0L6CjHg+j0Fn0="
   },
   "libgravatar": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libgravatar-25.04.3.tar.xz",
-    "hash": "sha256-JOi+B7tpquaCww4sb8BWZk+X10wO9bPG8uviXxbQBkc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libgravatar-25.08.0.tar.xz",
+    "hash": "sha256-0GECPIsyDW6CteYa7gbuesEP4SQ3pw694Fx1K3q5txA="
   },
   "libkcddb": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libkcddb-25.04.3.tar.xz",
-    "hash": "sha256-bd5iSZj/cCuFqm7FihYBNkafYlky4YPdsYReWttmmss="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libkcddb-25.08.0.tar.xz",
+    "hash": "sha256-5qhXP1VM2SDm+CgBDN6MSq6sWzKQKfdsov5L1UlWJ+w="
   },
   "libkcompactdisc": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libkcompactdisc-25.04.3.tar.xz",
-    "hash": "sha256-7gvoZrb5Qc32s8h6RYYbx2haW6mHXK+OX0aEHYMi038="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libkcompactdisc-25.08.0.tar.xz",
+    "hash": "sha256-pWNV9nbtzRycFD8Dspz5uXxJzCrpUvpcEAT6sr5QRy8="
   },
   "libkdcraw": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libkdcraw-25.04.3.tar.xz",
-    "hash": "sha256-T/0ifPCDjJpGvp9oLSQxko5GY61U3h92W9iuJY6xEOg="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libkdcraw-25.08.0.tar.xz",
+    "hash": "sha256-RkDRdA27hUh+V6XwemWsqQCT7BB83DJDD+qI++oHl74="
   },
   "libkdegames": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libkdegames-25.04.3.tar.xz",
-    "hash": "sha256-Y80rE36YmmNZlMSPk9yezztapjBtOb2lp6OMmqKkN6Q="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libkdegames-25.08.0.tar.xz",
+    "hash": "sha256-FVeTQ9WwZggRXo6VRzuAvJHeiEGxp5WE9WFakf5X4vc="
   },
   "libkdepim": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libkdepim-25.04.3.tar.xz",
-    "hash": "sha256-bZx4Bj21I0U55fP92+y8phlIt55gBz7CFaf/2tYkGPo="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libkdepim-25.08.0.tar.xz",
+    "hash": "sha256-Tarod7jRDEvR/nDQ3QLcEy/a/g/2Bicnoy3NiNTv9ho="
   },
   "libkeduvocdocument": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libkeduvocdocument-25.04.3.tar.xz",
-    "hash": "sha256-fsrNtPMT5pyieq0sAlIMdtXtXbMJX3dqcXUm4VwX+64="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libkeduvocdocument-25.08.0.tar.xz",
+    "hash": "sha256-tnOfc+QcXfnuMSARmF91vS50IA54p8uncZWLsfApUXo="
   },
   "libkexiv2": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libkexiv2-25.04.3.tar.xz",
-    "hash": "sha256-17jXkenbj6zxapVEfapZfvqqa0LTAPp8vp0f9bnntag="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libkexiv2-25.08.0.tar.xz",
+    "hash": "sha256-m7TlhY810NuoE63jwP9uf+dQsJMNYKf0YJtIyVY9Res="
   },
   "libkgapi": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libkgapi-25.04.3.tar.xz",
-    "hash": "sha256-z4lfAdGWfAKcFSOcU+OasRYTt3AO0a+o5hxieL2PvPg="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libkgapi-25.08.0.tar.xz",
+    "hash": "sha256-Ur8jIV6/y5LvqVYzzW442oxlOHdxtCfok7UXJyVgObE="
   },
   "libkleo": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libkleo-25.04.3.tar.xz",
-    "hash": "sha256-fJszSyJsmQ1Rk7Lmajzo3hxepsKvyRdSgOb0TQKnyqg="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libkleo-25.08.0.tar.xz",
+    "hash": "sha256-IMlVPHZS+LxZlJz0uScRx7DlpIb8SxDYUTRkOQVtK9Q="
   },
   "libkmahjongg": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libkmahjongg-25.04.3.tar.xz",
-    "hash": "sha256-ZXCwVNArEvfAs30o3YkwwXzGpGFkN2E0SKtpzEsIRGw="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libkmahjongg-25.08.0.tar.xz",
+    "hash": "sha256-nE590vbrseo95jwoSf0wWm2+ssubIpaSqexaq933aIA="
   },
   "libkomparediff2": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libkomparediff2-25.04.3.tar.xz",
-    "hash": "sha256-qxd5807apRN1xqSMkWcj8zLYep0jIY7GwERsYRKqVkw="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libkomparediff2-25.08.0.tar.xz",
+    "hash": "sha256-XHh83zO2D22k8pVCODSYJmB8AHP0+bMKas5lgAyaJcA="
   },
   "libksane": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libksane-25.04.3.tar.xz",
-    "hash": "sha256-6rl+MZzY4CDmPEnKPBgYiJjTJtNWjJOaVkC0LNwcJl8="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libksane-25.08.0.tar.xz",
+    "hash": "sha256-mUYbE1u1USXKmH1JEaMqTEusM/379xC2SDVRrJYftjs="
   },
   "libksieve": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libksieve-25.04.3.tar.xz",
-    "hash": "sha256-B/bZc2LkCNq8+xkbC/1yjt/VmW7jeoQHTpKMsunBOp0="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libksieve-25.08.0.tar.xz",
+    "hash": "sha256-p+bm9SN33Ad1C9zvg12fzGMIhXezD9/wf/cQYAyx/nY="
   },
   "libktorrent": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/libktorrent-25.04.3.tar.xz",
-    "hash": "sha256-E3prFLvdUSHHr8qOba0OUv997oCm5bVGOGV/E8Boc6g="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/libktorrent-25.08.0.tar.xz",
+    "hash": "sha256-5CK8h+PRToZDo5fztPfRuqPAudn22yCG70NIh1K6Flc="
   },
   "lokalize": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/lokalize-25.04.3.tar.xz",
-    "hash": "sha256-VnTDYXktr5tokvSiZ9kbzu8kX2Fh3P/XXR3VxLQ7IyE="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/lokalize-25.08.0.tar.xz",
+    "hash": "sha256-8O9+/ysRzakeQVRyP6spNsEH5GIhX1o93aHkGMXdFRQ="
   },
   "lskat": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/lskat-25.04.3.tar.xz",
-    "hash": "sha256-l6HCD4Ab4WX+fmByEyQDQe31TX/iblYz+WWJZsoNpQ0="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/lskat-25.08.0.tar.xz",
+    "hash": "sha256-M+ADGTSW56sX65hLllWhRlYmPKM/WRyeo9G/jxiK8uY="
   },
   "mailcommon": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/mailcommon-25.04.3.tar.xz",
-    "hash": "sha256-JSWqd4qSL2c19XGjKolv36+hqt/MSuvWYZMGqY8hNSE="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/mailcommon-25.08.0.tar.xz",
+    "hash": "sha256-adfwmaEhKzJTperWFA3PrEl1D3n8arTEc3r5h+Blup8="
   },
   "mailimporter": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/mailimporter-25.04.3.tar.xz",
-    "hash": "sha256-fgJvRrapdLWtgs10tE//YCYiiyjYuonkr56qCP4LNn4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/mailimporter-25.08.0.tar.xz",
+    "hash": "sha256-XF0vu+KULyp7G2YNtVvGzaxJ200d1+4AYuwLtZ/8JVI="
   },
   "marble": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/marble-25.04.3.tar.xz",
-    "hash": "sha256-HC/tI2fc6wexiYaZ97zs1a1n4k06jtVuF/ujeSxSqkQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/marble-25.08.0.tar.xz",
+    "hash": "sha256-b1vxzrwzEc4kOcQkP5CtJJci7fEqlvuSfKYLg+mMfJo="
   },
   "markdownpart": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/markdownpart-25.04.3.tar.xz",
-    "hash": "sha256-TXuZzuRe00BTXCRDePcUGsR9cNdbfCidk6UVFrZgw8E="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/markdownpart-25.08.0.tar.xz",
+    "hash": "sha256-sRDQaacbq15UAYsclRljmFYJuXlEX2j01IGP3Q9q9v0="
   },
   "massif-visualizer": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/massif-visualizer-25.04.3.tar.xz",
-    "hash": "sha256-dirD6Cr/V2xItRHzf8oEISHPqhD2TfMQGbGKe7AJiDQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/massif-visualizer-25.08.0.tar.xz",
+    "hash": "sha256-bygsvPWzw749DwYsjWn0WKQpTIBHIM3EVXb7FOS/E4A="
   },
   "mbox-importer": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/mbox-importer-25.04.3.tar.xz",
-    "hash": "sha256-EWmS/jknp08nL6m4qxuy9JTc26Bi0EXZ0eVtJIpS0/M="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/mbox-importer-25.08.0.tar.xz",
+    "hash": "sha256-mPyn1pQNQd4h172LOZWWoTaG2V/dRmst09269AVSSHs="
   },
   "merkuro": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/merkuro-25.04.3.tar.xz",
-    "hash": "sha256-whPn9L10bmmexWMVzSY5MSQoPpGQpenCw63yGBHN3ic="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/merkuro-25.08.0.tar.xz",
+    "hash": "sha256-Cmsqe1S2R2BJVbI9+Y2jL3eZxsWZ+P1/QD9cWC6Qkhg="
   },
   "messagelib": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/messagelib-25.04.3.tar.xz",
-    "hash": "sha256-hwSP68utmCe47B2JSqc5ltXEjXhAJzoE2vt94AmRwOs="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/messagelib-25.08.0.tar.xz",
+    "hash": "sha256-XfYLX6Rqe+Ino+VenjuaEvZgmUgY3CVM63Y9x+C1u0Q="
   },
   "mimetreeparser": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/mimetreeparser-25.04.3.tar.xz",
-    "hash": "sha256-JqREDVDKYtsfFUeUVX1aIWrMRK6WNH4HIgAlWiZ8SsQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/mimetreeparser-25.08.0.tar.xz",
+    "hash": "sha256-YGMz7M91Lm7kcmDkJ1lmSWlUJdhe1+XhLTMsdYgvlso="
   },
   "minuet": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/minuet-25.04.3.tar.xz",
-    "hash": "sha256-jYvX44kWIkMsUqm50L9Lwak6zp/dGf1DS7eHI54RcFc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/minuet-25.08.0.tar.xz",
+    "hash": "sha256-g4rZL1QFishLjLNBGSLzqEiRDjuH87D66+7iWRupd0Q="
   },
   "neochat": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/neochat-25.04.3.tar.xz",
-    "hash": "sha256-rUQ4X/3Xj4E0Q/rIcCAD7hbTav7e0L3wL9TJKMSHxTw="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/neochat-25.08.0.tar.xz",
+    "hash": "sha256-lg8FpnbL7ZoGO/nN9T9j9NgX8HoKz1Lt1AGFMg0ySOY="
   },
   "okular": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/okular-25.04.3.tar.xz",
-    "hash": "sha256-0LW7Cw7qtGqiNnyNgQlhhb0iYXEHAchPHG4jmOUFi/s="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/okular-25.08.0.tar.xz",
+    "hash": "sha256-jHDESOiqjFXDYjAk7h1wkwiIZypQPEDGCvLecC/+ZPw="
   },
   "palapeli": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/palapeli-25.04.3.tar.xz",
-    "hash": "sha256-seIlOsonyOaQsc0gT6KsH+OfGM8Qa+Sj75bek0Er2E8="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/palapeli-25.08.0.tar.xz",
+    "hash": "sha256-pdIlKpCWjfvSYuPlfL9cPkMu/PaQjd4UmwRCi+2YbmE="
   },
   "parley": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/parley-25.04.3.tar.xz",
-    "hash": "sha256-XkpWiAm6sMCxP0zHSiOLNqemd5fruh5VJ0UBWnLnEAY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/parley-25.08.0.tar.xz",
+    "hash": "sha256-zlAtpBkMRIhz4lue7yTQZwuPWz05o9IXnFPboJzKLLs="
   },
   "partitionmanager": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/partitionmanager-25.04.3.tar.xz",
-    "hash": "sha256-IWpFdNm2O1LHSrOGySz41cK2NK/svPvdc0to2fzl68o="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/partitionmanager-25.08.0.tar.xz",
+    "hash": "sha256-KqBP1PgcwshjJlYr8e/SKI0VtKSEgBvhqdUb1r/Jb8M="
   },
   "picmi": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/picmi-25.04.3.tar.xz",
-    "hash": "sha256-yU9aP+ikQBtAAeIf8+J0y0Ie5W8u99rq/4gdpwmmaqU="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/picmi-25.08.0.tar.xz",
+    "hash": "sha256-wO2+TaD7x4IjiTo/7By6dYQPCx63NaShC+Qi95u5WaM="
   },
   "pim-data-exporter": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/pim-data-exporter-25.04.3.tar.xz",
-    "hash": "sha256-hRiykrAp9kPITPW05Hn/JkIos+H+BSYzzBh2RQvVWNI="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/pim-data-exporter-25.08.0.tar.xz",
+    "hash": "sha256-21N+slDbz7hlNDupTsSqJVjrwUJaGIu0FRUFjM2FPfY="
   },
   "pim-sieve-editor": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/pim-sieve-editor-25.04.3.tar.xz",
-    "hash": "sha256-siSC18dOJXi8NH0IzHlY8hRmFIKCbxTI9elXyS9uwAY="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/pim-sieve-editor-25.08.0.tar.xz",
+    "hash": "sha256-t2N2GUes9YJsNY4sQ5tNqZH5ojt605r7gPNLysRxu70="
   },
   "pimcommon": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/pimcommon-25.04.3.tar.xz",
-    "hash": "sha256-fmy1VM4lRQ8tm5iAXWQE6NYQ/aQRAD60phcmxxBESFU="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/pimcommon-25.08.0.tar.xz",
+    "hash": "sha256-qVn732PsA13cAj/B3lubY8yQvwV0zYk2JCywTy6VPxQ="
   },
   "plasmatube": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/plasmatube-25.04.3.tar.xz",
-    "hash": "sha256-vQXjtMo76H0FwjLfkmg7+9WLtiOdGK1gGr5LTpz5sPs="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/plasmatube-25.08.0.tar.xz",
+    "hash": "sha256-5bjG4jntSD4OdJXjsxE4XhVV/6VTGoMdvtuNjpXbZfI="
   },
   "poxml": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/poxml-25.04.3.tar.xz",
-    "hash": "sha256-NeFY24XGwVJQ67F/YwYq1beOg+p/ocyWbtjKGYr4kRA="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/poxml-25.08.0.tar.xz",
+    "hash": "sha256-voEd4npyMw3sZAHo9zS51mCwlP+hxQXoDcgEA+A3Yi0="
   },
   "qmlkonsole": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/qmlkonsole-25.04.3.tar.xz",
-    "hash": "sha256-cFDfgoJjKlNPgd352vmGl24BYLCQj0Eqviccf2nm31U="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/qmlkonsole-25.08.0.tar.xz",
+    "hash": "sha256-BsuRVVNgedQKaM+OisUtyOaG37aOn7LweMhYwUZcpCQ="
   },
   "qrca": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/qrca-25.04.3.tar.xz",
-    "hash": "sha256-puEtUCAUNIzmSomT9iwCDDL55HsTjm2nCIvxGvZHvUc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/qrca-25.08.0.tar.xz",
+    "hash": "sha256-Dcjso8582FkDZU6aBzyH1EpTYuOgZs7GxA5Dv357O90="
   },
   "rocs": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/rocs-25.04.3.tar.xz",
-    "hash": "sha256-eqCVtmBdvZB1JQsHDTiLePwtc59IO0BKQRgse/twWpk="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/rocs-25.08.0.tar.xz",
+    "hash": "sha256-tOjnAjA3ZyaUY0c3B89LJKPZn1+UM8x8LOLl5A3zHIk="
   },
   "signon-kwallet-extension": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/signon-kwallet-extension-25.04.3.tar.xz",
-    "hash": "sha256-dZGItNxhPvd1AyxlOAqN/A81uJM+v1Nl6rynfbZ95dA="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/signon-kwallet-extension-25.08.0.tar.xz",
+    "hash": "sha256-mCiZqFZ+zb5HUwtT/TXBGabOyOrPdJtlmKHZa7ScjPw="
   },
   "skanlite": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/skanlite-25.04.3.tar.xz",
-    "hash": "sha256-psFsUwovkQUwJVjQajd6e8B2vnUXp2kHfJSmQxcn9Gg="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/skanlite-25.08.0.tar.xz",
+    "hash": "sha256-TXkLjLqg8vGTEYo73dyOzYnoUT7aT5rmGIYt+QNM4Pg="
   },
   "skanpage": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/skanpage-25.04.3.tar.xz",
-    "hash": "sha256-Zyf/2b1XbtvQtKCEFiXP9dc3DmyLZnxm1fU1XNsaLi0="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/skanpage-25.08.0.tar.xz",
+    "hash": "sha256-t3VgEMmNUHtiuKX6Q97lClhfK+eM80KZak6AWngxnQM="
   },
   "skladnik": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/skladnik-25.04.3.tar.xz",
-    "hash": "sha256-nce8LnFI2dBVGme9Vrao+sNPwXzPEbrwQHW4s5ryffw="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/skladnik-25.08.0.tar.xz",
+    "hash": "sha256-UwJW5ufE+mWiHxy7NnoqY42u803cwqURgN4iP7G6aU0="
   },
   "step": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/step-25.04.3.tar.xz",
-    "hash": "sha256-CqhuLdC+u9nai4t30No82STiW+cISsyvEYUNUYV/uj4="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/step-25.08.0.tar.xz",
+    "hash": "sha256-mUurTQdQz96zrx+S1kU+4XPNSD45KtFwv1JQsjtN3zo="
   },
   "svgpart": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/svgpart-25.04.3.tar.xz",
-    "hash": "sha256-GT+FLX0fuk7HrSXdWdVn1Yu2Uz5DalDYD1T+G5QgKyQ="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/svgpart-25.08.0.tar.xz",
+    "hash": "sha256-yDZSn1pAFMT5ra19VP2Ffkyznalc7XEOcE1PgNOvDzA="
   },
   "sweeper": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/sweeper-25.04.3.tar.xz",
-    "hash": "sha256-yinXHLoWSQDFNCgzvy/HdMkkOQMCzAjbkUaYwHDsB/M="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/sweeper-25.08.0.tar.xz",
+    "hash": "sha256-YoI8OMq9j7t8mkQBRk7dPDP4pPgHQDNGAb9aSEstTcw="
   },
   "telly-skout": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/telly-skout-25.04.3.tar.xz",
-    "hash": "sha256-l1ob5vZ2NwnAzi7ob4+B5d4vOHRKrhKoYNiaUFsROrU="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/telly-skout-25.08.0.tar.xz",
+    "hash": "sha256-Uvl7EP/1UWAV3QzyVPCJPfOSs5LCpCr5G1+VnX/k3jI="
   },
   "tokodon": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/tokodon-25.04.3.tar.xz",
-    "hash": "sha256-fv+8Z+zC9sATiYtOORkkZ09BGJLlE8fo9b3lalReMxc="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/tokodon-25.08.0.tar.xz",
+    "hash": "sha256-jPNFjwfe8cvN2z5CcHzsHaKANMrO8NvBead6LjXGrmo="
   },
   "umbrello": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/umbrello-25.04.3.tar.xz",
-    "hash": "sha256-6aBlu2Jsl6SLtD6ZJIm1jBUCYWYBRQXkKFLW6Wm+jsM="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/umbrello-25.08.0.tar.xz",
+    "hash": "sha256-dVz6eoraFRdhShdaQCk6mC3OTD60c5yjl6QSRxO0/G0="
   },
   "yakuake": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/yakuake-25.04.3.tar.xz",
-    "hash": "sha256-t6v1ftjmjRe+31HULco8tqJrMWuDBHb+3NtByzWdbAM="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/yakuake-25.08.0.tar.xz",
+    "hash": "sha256-Iru6bJeO4msbdDNQHHc/0cO2XEuVoK/Gw3mPCcw7Oxk="
   },
   "zanshin": {
-    "version": "25.04.3",
-    "url": "mirror://kde/stable/release-service/25.04.3/src/zanshin-25.04.3.tar.xz",
-    "hash": "sha256-92+VsMc6eY0fudzAU2dFas4yIpbz7Kpow089amZAQVg="
+    "version": "25.08.0",
+    "url": "mirror://kde/stable/release-service/25.08.0/src/zanshin-25.08.0.tar.xz",
+    "hash": "sha256-FswV8iZX5WkU0WN4MPi3y0ZQBO6KpzkwQ5+X76zHQ0U="
   }
 }
\ No newline at end of file

From 595f96a67555f39a35d4fbaf1e374b4bf738b8af Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 14 Aug 2025 17:29:32 +0300
Subject: [PATCH 1714/3724] kdePackages.kamoso: mark broken for now

---
 pkgs/kde/gear/kamoso/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/kde/gear/kamoso/default.nix b/pkgs/kde/gear/kamoso/default.nix
index f6d841900521..a760428ae134 100644
--- a/pkgs/kde/gear/kamoso/default.nix
+++ b/pkgs/kde/gear/kamoso/default.nix
@@ -15,4 +15,7 @@ mkKdeDerivation {
   preFixup = ''
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
   '';
+
+  # requires newer GStreamer
+  meta.broken = true;
 }

From 9b14ad21ab065f90c2c82aeca314a71776d6c5b7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 14 Aug 2025 19:34:20 +0300
Subject: [PATCH 1715/3724] Revert "kdePackages.kamoso: mark broken for now"

This reverts commit 2eb349d2f5c98bb4ce6bc628c6c985312b2bd640.

Reverting on staging-next since we have new enough gstreamer now.
---
 pkgs/kde/gear/kamoso/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/kde/gear/kamoso/default.nix b/pkgs/kde/gear/kamoso/default.nix
index a760428ae134..f6d841900521 100644
--- a/pkgs/kde/gear/kamoso/default.nix
+++ b/pkgs/kde/gear/kamoso/default.nix
@@ -15,7 +15,4 @@ mkKdeDerivation {
   preFixup = ''
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
   '';
-
-  # requires newer GStreamer
-  meta.broken = true;
 }

From a2d0e6edf7a1c5b11c37b4bbfc02bf87da967285 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 18:01:17 +0000
Subject: [PATCH 1716/3724] python3Packages.netbox-contract: 2.4.0 -> 2.4.1

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

diff --git a/pkgs/development/python-modules/netbox-contract/default.nix b/pkgs/development/python-modules/netbox-contract/default.nix
index 6bf331f5f595..b0b20ff31db2 100644
--- a/pkgs/development/python-modules/netbox-contract/default.nix
+++ b/pkgs/development/python-modules/netbox-contract/default.nix
@@ -11,7 +11,7 @@
 }:
 buildPythonPackage rec {
   pname = "netbox-contract";
-  version = "2.4.0";
+  version = "2.4.1";
   pyproject = true;
 
   disabled = python.pythonVersion != netbox.python.pythonVersion;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "mlebreuil";
     repo = "netbox-contract";
     tag = "v${version}";
-    hash = "sha256-duA53cuJ3q6CRp239xNMXQhGZHGn7IBIGNLoxt7hZh8=";
+    hash = "sha256-2pjApKMybZGzojRF3vH1Ti/Wkmg/tafhpzX+qDkLY8o=";
   };
 
   build-system = [ setuptools ];
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   meta = {
     description = "Contract plugin for netbox";
     homepage = "https://github.com/mlebreuil/netbox-contract";
-    changelog = "https://github.com/mlebreuil/netbox-contract/releases/tag/${src.rev}";
+    changelog = "https://github.com/mlebreuil/netbox-contract/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ felbinger ];

From ff43d515ae22302601724f7d329d01f809839557 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 14 Aug 2025 21:19:05 +0300
Subject: [PATCH 1717/3724] kdePackages.kamoso: actually fix

---
 pkgs/kde/gear/kamoso/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/kde/gear/kamoso/default.nix b/pkgs/kde/gear/kamoso/default.nix
index f6d841900521..262fa7eca7f3 100644
--- a/pkgs/kde/gear/kamoso/default.nix
+++ b/pkgs/kde/gear/kamoso/default.nix
@@ -2,6 +2,7 @@
   mkKdeDerivation,
   pkg-config,
   gst_all_1,
+  frei0r,
 }:
 mkKdeDerivation {
   pname = "kamoso";
@@ -10,8 +11,11 @@ mkKdeDerivation {
   extraBuildInputs = [
     gst_all_1.gst-plugins-base
     (gst_all_1.gst-plugins-good.override { qt6Support = true; })
+    gst_all_1.gst-plugins-bad
   ];
 
+  qtWrapperArgs = ["--set FREI0R_PATH ${frei0r}/lib/frei0r-1"];
+
   preFixup = ''
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
   '';

From 7033b847e8ef1e0cf7b49b6f26b99abb04d823cb Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 14 Aug 2025 21:33:36 +0300
Subject: [PATCH 1718/3724] kdePackages.kamoso: nixfmt

---
 pkgs/kde/gear/kamoso/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/kde/gear/kamoso/default.nix b/pkgs/kde/gear/kamoso/default.nix
index 262fa7eca7f3..11c8dff098b2 100644
--- a/pkgs/kde/gear/kamoso/default.nix
+++ b/pkgs/kde/gear/kamoso/default.nix
@@ -14,7 +14,7 @@ mkKdeDerivation {
     gst_all_1.gst-plugins-bad
   ];
 
-  qtWrapperArgs = ["--set FREI0R_PATH ${frei0r}/lib/frei0r-1"];
+  qtWrapperArgs = [ "--set FREI0R_PATH ${frei0r}/lib/frei0r-1" ];
 
   preFixup = ''
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")

From 24b883ebae1c3d7b50534cc01d911aa7b62d9a37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 19:54:38 +0000
Subject: [PATCH 1719/3724] zpaqfranz: 62.4 -> 63.1

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

diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix
index 459e7fb74e5e..a2cc07d567d1 100644
--- a/pkgs/by-name/zp/zpaqfranz/package.nix
+++ b/pkgs/by-name/zp/zpaqfranz/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zpaqfranz";
-  version = "62.4";
+  version = "63.1";
 
   src = fetchFromGitHub {
     owner = "fcorbelli";
     repo = "zpaqfranz";
     rev = finalAttrs.version;
-    hash = "sha256-bRYXQ+w4gLDsMeknmTMhbdzjf/PpD7qh5QHTRY8eqR0=";
+    hash = "sha256-j8UmKCiwlFPmrlBA7rr9qlejxYKkXrH1i3Qd0MhO3YU=";
   };
 
   nativeBuildInputs = [

From 198a30ffaa961bd5992ca9f77ab54f546a4a7ad7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 14 Aug 2025 22:25:21 +0200
Subject: [PATCH 1720/3724] protobuf_32: init at 32.0

---
 pkgs/development/libraries/protobuf/32.nix | 9 +++++++++
 pkgs/top-level/all-packages.nix            | 2 ++
 2 files changed, 11 insertions(+)
 create mode 100644 pkgs/development/libraries/protobuf/32.nix

diff --git a/pkgs/development/libraries/protobuf/32.nix b/pkgs/development/libraries/protobuf/32.nix
new file mode 100644
index 000000000000..6e01d419168e
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/32.nix
@@ -0,0 +1,9 @@
+{ callPackage, ... }@args:
+
+callPackage ./generic.nix (
+  {
+    version = "32.0";
+    hash = "sha256-kiA0P6ZU0i9vxpNjlusyMsFkvDb5DkoiH6FwE/q8FMI=";
+  }
+  // args
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82f13ae44c9a..5bedb82a6d4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9056,6 +9056,7 @@ with pkgs;
 
   inherit
     ({
+      protobuf_32 = callPackage ../development/libraries/protobuf/32.nix { };
       protobuf_31 = callPackage ../development/libraries/protobuf/31.nix { };
       protobuf_30 = callPackage ../development/libraries/protobuf/30.nix { };
       protobuf_29 = callPackage ../development/libraries/protobuf/29.nix {
@@ -9068,6 +9069,7 @@ with pkgs;
         abseil-cpp = abseil-cpp_202103;
       };
     })
+    protobuf_32
     protobuf_31
     protobuf_30
     protobuf_29

From 1587a343c9bb07ac94dd3d331b6a97422379a47e Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Thu, 14 Aug 2025 23:21:14 +0200
Subject: [PATCH 1721/3724] nodejs_24: 24.5.0 -> 24.6.0

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

diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index 5fd447dd5031..39db9d1328bf 100644
--- a/pkgs/development/web/nodejs/v24.nix
+++ b/pkgs/development/web/nodejs/v24.nix
@@ -17,8 +17,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "24.5.0";
-  sha256 = "f1ba96204724bd1c6de7758e08b3718ba0b45d87fb3bebd7e30097874ccc8130";
+  version = "24.6.0";
+  sha256 = "8ad5c387b5d55d8f3b783b0f1b21bae03a3b3b10ac89a25d266cffa7b795e842";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then

From 17e8d25d342ab534dae228886a7a2376358f17d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 26 Jul 2025 22:09:52 +0200
Subject: [PATCH 1722/3724] ciscoPacketTracer8: use libxml2_13

---
 pkgs/by-name/ci/ciscoPacketTracer8/package.nix | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
index 114eb60728f1..e80d58f9334f 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
@@ -7,7 +7,6 @@
   alsa-lib,
   dbus,
   expat,
-  fetchurl,
   fontconfig,
   glib,
   libdrm,
@@ -15,7 +14,7 @@
   libpulseaudio,
   libudev0-shim,
   libxkbcommon,
-  libxml2,
+  libxml2_13,
   libxslt,
   nspr,
   wayland,
@@ -41,19 +40,6 @@ let
     "8.2.2" = "CiscoPacketTracer822_amd64_signed.deb";
   };
 
-  libxml2' = libxml2.overrideAttrs (oldAttrs: rec {
-    version = "2.13.8";
-    src = fetchurl {
-      url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-      hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo=";
-    };
-    meta = oldAttrs.meta // {
-      knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [
-        "CVE-2025-6021"
-      ];
-    };
-  });
-
   unwrapped = stdenvNoCC.mkDerivation {
     name = "ciscoPacketTracer8-unwrapped";
     inherit version;
@@ -81,7 +67,7 @@ let
       libpulseaudio
       libudev0-shim
       libxkbcommon
-      libxml2'
+      libxml2_13
       libxslt
       nspr
       nss

From c9e991a704ce659d28618c425a613613e1c08aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 14 Aug 2025 12:30:04 +0200
Subject: [PATCH 1723/3724] ciscoPacketTracer8: refactor

---
 pkgs/by-name/ci/ciscoPacketTracer8/package.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
index e80d58f9334f..3a86c98ae9cf 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
@@ -3,6 +3,7 @@
   stdenvNoCC,
   requireFile,
   autoPatchelfHook,
+  dpkg,
   makeWrapper,
   alsa-lib,
   dbus,
@@ -17,10 +18,9 @@
   libxml2_13,
   libxslt,
   nspr,
-  wayland,
   nss,
+  wayland,
   xorg,
-  dpkg,
   buildFHSEnv,
   copyDesktopItems,
   makeDesktopItem,
@@ -54,9 +54,13 @@ let
           url = "https://www.netacad.com";
         };
 
-    buildInputs = [
+    nativeBuildInputs = [
       autoPatchelfHook
+      dpkg
       makeWrapper
+    ];
+
+    buildInputs = [
       alsa-lib
       dbus
       expat
@@ -97,7 +101,7 @@ let
     unpackPhase = ''
       runHook preUnpack
 
-      ${lib.getExe' dpkg "dpkg-deb"} -x $src $out
+      dpkg-deb -x $src $out
       chmod 755 "$out"
 
       runHook postUnpack
@@ -116,7 +120,7 @@ let
   fhs-env = buildFHSEnv {
     name = "ciscoPacketTracer8-fhs-env";
     runScript = lib.getExe' unwrapped "packettracer8";
-    targetPkgs = pkgs: [ libudev0-shim ];
+    targetPkgs = _: [ libudev0-shim ];
   };
 in
 
@@ -137,7 +141,7 @@ stdenvNoCC.mkDerivation {
     ln -s ${fhs-env}/bin/${fhs-env.name} $out/bin/packettracer8
 
     mkdir -p $out/share/icons/hicolor/48x48/apps
-    ln -s ${unwrapped}/opt/pt/art/app.png $out/share/icons/hicolor/48x48/apps/cisco-packet-tracer.png
+    ln -s ${unwrapped}/opt/pt/art/app.png $out/share/icons/hicolor/48x48/apps/cisco-packet-tracer-8.png
     ln -s ${unwrapped}/usr/share/icons/gnome/48x48/mimetypes $out/share/icons/hicolor/48x48/mimetypes
     ln -s ${unwrapped}/usr/share/mime $out/share/mime
 
@@ -148,7 +152,7 @@ stdenvNoCC.mkDerivation {
     (makeDesktopItem {
       name = "cisco-pt8.desktop";
       desktopName = "Cisco Packet Tracer 8";
-      icon = "cisco-packet-tracer";
+      icon = "cisco-packet-tracer-8";
       exec = "packettracer8 %f";
       mimeTypes = [
         "application/x-pkt"

From 9eaf74287700b0172863194d0e25e0dcd5022706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 20 Jul 2025 11:28:54 +0200
Subject: [PATCH 1724/3724] ciscoPacketTracer7: use libxml2_13

---
 pkgs/by-name/ci/ciscoPacketTracer7/package.nix | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
index bbdead8e26a8..bb86979e75e9 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
@@ -4,8 +4,7 @@
   buildFHSEnv,
   copyDesktopItems,
   dpkg,
-  fetchurl,
-  libxml2,
+  libxml2_13,
   lndir,
   makeDesktopItem,
   makeWrapper,
@@ -50,19 +49,6 @@ let
     ];
   };
 
-  libxml2' = libxml2.overrideAttrs (oldAttrs: rec {
-    version = "2.13.8";
-    src = fetchurl {
-      url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-      hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo=";
-    };
-    meta = oldAttrs.meta // {
-      knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [
-        "CVE-2025-6021"
-      ];
-    };
-  });
-
   fhs = buildFHSEnv {
     pname = "packettracer7";
     inherit version;
@@ -79,7 +65,7 @@ let
         libpulseaudio
         libudev0-shim
         libxkbcommon
-        libxml2'
+        libxml2_13
         libxslt
         nspr
         nss

From ddaee446ef0796527477abd9457fa4d9e5ed5db7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 20 Jul 2025 11:29:57 +0200
Subject: [PATCH 1725/3724] ciscoPacketTracer7: remove `with lib;`, reorder
 `meta` attrs

---
 pkgs/by-name/ci/ciscoPacketTracer7/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
index bb86979e75e9..ffe374d3fee4 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
@@ -91,12 +91,13 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ copyDesktopItems ];
 
-  meta = with lib; {
+  meta = {
     description = "Network simulation tool from Cisco";
     homepage = "https://www.netacad.com/courses/packet-tracer";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [ ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
+    ];
     platforms = [ "x86_64-linux" ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 }

From 6ceac84a51a2eb5dd177eadc5090e47a3adeb00f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 20 Jul 2025 11:30:21 +0200
Subject: [PATCH 1726/3724] ciscoPacketTracer7: add maintainer gepbird

---
 pkgs/by-name/ci/ciscoPacketTracer7/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
index ffe374d3fee4..630c4d184253 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
@@ -96,6 +96,7 @@ stdenv.mkDerivation {
     homepage = "https://www.netacad.com/courses/packet-tracer";
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [
+      gepbird
     ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

From d8d40ff15914810d9292f96e7b1c81d222ce63c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 14 Aug 2025 12:34:21 +0200
Subject: [PATCH 1727/3724] ciscoPacketTracer7: add `meta.mainProgram`

---
 pkgs/by-name/ci/ciscoPacketTracer7/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
index 630c4d184253..17939dcec49d 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
@@ -95,6 +95,7 @@ stdenv.mkDerivation {
     description = "Network simulation tool from Cisco";
     homepage = "https://www.netacad.com/courses/packet-tracer";
     license = lib.licenses.unfree;
+    mainProgram = "packettracer7";
     maintainers = with lib.maintainers; [
       gepbird
     ];

From 0088256fe3b0237bb3e2b8e4a0616f45d8f59d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 14 Aug 2025 12:59:01 +0200
Subject: [PATCH 1728/3724] ciscoPacketTracer7: refactor, fix desktop icons

Now it is almost the same as ciscoPacketTracer8, the major difference is
the installed dependencies.
---
 .../by-name/ci/ciscoPacketTracer7/package.nix | 162 +++++++++++-------
 1 file changed, 103 insertions(+), 59 deletions(-)

diff --git a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
index 17939dcec49d..2dc1b9a5d31c 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
@@ -1,95 +1,139 @@
 {
-  stdenv,
   lib,
+  stdenvNoCC,
+  requireFile,
+  autoPatchelfHook,
+  dpkg,
+  makeWrapper,
+  alsa-lib,
+  dbus,
+  expat,
+  fontconfig,
+  glib,
+  libdrm,
+  libglvnd,
+  libpulseaudio,
+  libudev0-shim,
+  libxkbcommon,
+  libxml2_13,
+  libxslt,
+  nspr,
+  nss,
+  xorg,
   buildFHSEnv,
   copyDesktopItems,
-  dpkg,
-  libxml2_13,
-  lndir,
   makeDesktopItem,
-  makeWrapper,
-  requireFile,
+  packetTracerSource ? null,
 }:
 
 let
   version = "7.3.1";
 
-  ptFiles = stdenv.mkDerivation {
-    pname = "PacketTracer7drv";
+  unwrapped = stdenvNoCC.mkDerivation {
+    pname = "ciscoPacketTracer7-unwrapped";
     inherit version;
 
-    dontUnpack = true;
-    src = requireFile {
-      name = "PacketTracer_${builtins.replaceStrings [ "." ] [ "" ] version}_amd64.deb";
-      hash = "sha256-w5gC0V3WHQC6J/uMEW2kX9hWKrS0mZZVWtZriN6s4n8=";
-      url = "https://www.netacad.com";
-    };
+    src =
+      if (packetTracerSource != null) then
+        packetTracerSource
+      else
+        requireFile {
+          name = "PacketTracer_731_amd64.deb";
+          hash = "sha256-w5gC0V3WHQC6J/uMEW2kX9hWKrS0mZZVWtZriN6s4n8=";
+          url = "https://www.netacad.com";
+        };
 
     nativeBuildInputs = [
+      autoPatchelfHook
       dpkg
       makeWrapper
     ];
 
-    installPhase = ''
+    buildInputs = [
+      alsa-lib
+      dbus
+      expat
+      fontconfig
+      glib
+      libdrm
+      libglvnd
+      libpulseaudio
+      libudev0-shim
+      libxkbcommon
+      libxml2_13
+      libxslt
+      nspr
+      nss
+    ]
+    ++ (with xorg; [
+      libICE
+      libSM
+      libX11
+      libXScrnSaver
+    ]);
+
+    unpackPhase = ''
+      runHook preUnpack
+
       dpkg-deb -x $src $out
+      chmod 755 "$out"
+
+      runHook postUnpack
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
       makeWrapper "$out/opt/pt/bin/PacketTracer7" "$out/bin/packettracer7" \
-          --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin"
+        --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin"
+
+      runHook postInstall
     '';
   };
 
-  desktopItem = makeDesktopItem {
-    name = "cisco-pt7.desktop";
-    desktopName = "Cisco Packet Tracer 7";
-    icon = "${ptFiles}/opt/pt/art/app.png";
-    exec = "packettracer7 %f";
-    mimeTypes = [
-      "application/x-pkt"
-      "application/x-pka"
-      "application/x-pkz"
-    ];
-  };
-
-  fhs = buildFHSEnv {
-    pname = "packettracer7";
-    inherit version;
-    runScript = "${ptFiles}/bin/packettracer7";
-
-    targetPkgs =
-      pkgs: with pkgs; [
-        alsa-lib
-        dbus
-        expat
-        fontconfig
-        glib
-        libglvnd
-        libpulseaudio
-        libudev0-shim
-        libxkbcommon
-        libxml2_13
-        libxslt
-        nspr
-        nss
-        xorg.libICE
-        xorg.libSM
-        xorg.libX11
-        xorg.libXScrnSaver
-      ];
+  fhs-env = buildFHSEnv {
+    name = "ciscoPacketTracer7-fhs-env";
+    runScript = lib.getExe' unwrapped "packettracer7";
+    targetPkgs = _: [ libudev0-shim ];
   };
 in
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "ciscoPacketTracer7";
   inherit version;
 
   dontUnpack = true;
 
+  nativeBuildInputs = [
+    copyDesktopItems
+  ];
+
   installPhase = ''
-    mkdir $out
-    ${lndir}/bin/lndir -silent ${fhs} $out
+    runHook preInstall
+
+    mkdir -p $out/bin
+    ln -s ${fhs-env}/bin/${fhs-env.name} $out/bin/packettracer7
+
+    mkdir -p $out/share/icons/hicolor/48x48/apps
+    ln -s ${unwrapped}/opt/pt/art/app.png $out/share/icons/hicolor/48x48/apps/cisco-packet-tracer-7.png
+    ln -s ${unwrapped}/usr/share/icons/gnome/48x48/mimetypes $out/share/icons/hicolor/48x48/mimetypes
+    ln -s ${unwrapped}/usr/share/mime $out/share/mime
+
+    runHook postInstall
   '';
 
-  desktopItems = [ desktopItem ];
-
-  nativeBuildInputs = [ copyDesktopItems ];
+  desktopItems = [
+    (makeDesktopItem {
+      name = "cisco-pt7.desktop";
+      desktopName = "Cisco Packet Tracer 7";
+      icon = "cisco-packet-tracer-7";
+      exec = "packettracer7 %f";
+      mimeTypes = [
+        "application/x-pkt"
+        "application/x-pka"
+        "application/x-pkz"
+      ];
+    })
+  ];
 
   meta = {
     description = "Network simulation tool from Cisco";

From 90bfc08628e3dfc7553c32fd0c11203661c63842 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 21:34:02 +0000
Subject: [PATCH 1729/3724] marp-cli: 4.2.2 -> 4.2.3

---
 pkgs/by-name/ma/marp-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/marp-cli/package.nix b/pkgs/by-name/ma/marp-cli/package.nix
index c0a83441d7fe..3d504c3432ef 100644
--- a/pkgs/by-name/ma/marp-cli/package.nix
+++ b/pkgs/by-name/ma/marp-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "marp-cli";
-  version = "4.2.2";
+  version = "4.2.3";
 
   src = fetchFromGitHub {
     owner = "marp-team";
     repo = "marp-cli";
     rev = "v${version}";
-    hash = "sha256-9ivc/LuadZLjxAfk9Q57uUVEEXGLbgwTjKdc/v8dDxo=";
+    hash = "sha256-CvQq9qndD9S/9t8UBpewQsW83CfV3BXftfFgFZ5Lttk=";
   };
 
-  npmDepsHash = "sha256-glIMWRHZV/5bt3LcWOQctZ4JoqKlmhWu85NyUr9aDLs=";
+  npmDepsHash = "sha256-VbpseSPH8uncCWiHtXBvCBARflXCCVTltmLO4uB8qmc=";
   npmPackFlags = [ "--ignore-scripts" ];
   makeCacheWritable = true;
 

From 928293691a5e764288673a2af23b3665d7a2b1d8 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 8 Aug 2025 22:59:42 -0300
Subject: [PATCH 1730/3724] dotnet-hook: fix incorrect use of --runtime in pack

---
 .../dotnet/build-dotnet-module/hook/dotnet-hook.sh       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
index 0b12e9fd4d50..7da8ca6d33f3 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
@@ -357,7 +357,7 @@ dotnetInstallPhase() {
     local -r projectFile="${1-}"
 
     for runtimeId in "${runtimeIds[@]}"; do
-      runtimeIdFlags=()
+      local runtimeIdFlags=()
       if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
         runtimeIdFlags+=("--runtime" "$runtimeId")
       fi
@@ -381,6 +381,11 @@ dotnetInstallPhase() {
     local -r projectFile="${1-}"
 
     for runtimeId in "${runtimeIds[@]}"; do
+      local runtimeIdFlags=()
+      if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
+        runtimeIdFlags+=("--runtime" "$runtimeId")
+      fi
+
       dotnet pack ${1+"$projectFile"} \
              -maxcpucount:"$maxCpuFlag" \
              -p:ContinuousIntegrationBuild=true \
@@ -390,7 +395,7 @@ dotnetInstallPhase() {
              --configuration "$dotnetBuildType" \
              --no-restore \
              --no-build \
-             --runtime "$runtimeId" \
+             "${runtimeIdFlags[@]}" \
              "${flags[@]}" \
              "${packFlags[@]}"
     done

From fe10ae4b0f5de47b39d040fe4f4ca528cf512fe4 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 25 Jun 2025 10:09:04 -0300
Subject: [PATCH 1731/3724] buildDotnet module: work around broken --runtime in
 dotnet pack

---
 .../dotnet/build-dotnet-module/hook/dotnet-hook.sh             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
index 7da8ca6d33f3..da277091feb3 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
@@ -384,6 +384,9 @@ dotnetInstallPhase() {
       local runtimeIdFlags=()
       if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
         runtimeIdFlags+=("--runtime" "$runtimeId")
+        # set RuntimeIdentifier because --runtime is broken:
+        # https://github.com/dotnet/sdk/issues/13983
+        runtimeIdFlags+=(-p:RuntimeIdentifier="$runtimeId")
       fi
 
       dotnet pack ${1+"$projectFile"} \

From 83117ab9302e9b94e9c6ca3afe194dd50d5bbed9 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Mon, 4 Aug 2025 19:13:23 -0300
Subject: [PATCH 1732/3724] ArchiSteamFarm: publish plugins with
 dotnetInstallPhase

---
 .../misc/ArchiSteamFarm/default.nix           | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix
index 435e793a1578..7609f3db64f5 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix
@@ -9,6 +9,14 @@
   callPackage,
 }:
 
+let
+  plugins = [
+    "ArchiSteamFarm.OfficialPlugins.ItemsMatcher"
+    "ArchiSteamFarm.OfficialPlugins.MobileAuthenticator"
+    "ArchiSteamFarm.OfficialPlugins.Monitoring"
+    "ArchiSteamFarm.OfficialPlugins.SteamTokenDumper"
+  ];
+in
 buildDotnetModule rec {
   pname = "ArchiSteamFarm";
   # nixpkgs-update: no auto update
@@ -26,7 +34,12 @@ buildDotnetModule rec {
 
   nugetDeps = ./deps.json;
 
-  projectFile = "ArchiSteamFarm.sln";
+  projectFile = [
+    "ArchiSteamFarm"
+  ]
+  ++ plugins;
+  testProjectFile = "ArchiSteamFarm.Tests";
+
   executable = "ArchiSteamFarm";
 
   enableParallelBuilding = false;
@@ -50,7 +63,7 @@ buildDotnetModule rec {
 
   doCheck = true;
 
-  preInstall = ''
+  installPhase = ''
     dotnetProjectFiles=(ArchiSteamFarm)
 
     # A mutable path, with this directory tree must be set. By default, this would point at the nix store causing errors.
@@ -58,20 +71,19 @@ buildDotnetModule rec {
       --run 'mkdir -p ~/.config/archisteamfarm/{config,logs,plugins}'
       --set "ASF_PATH" "~/.config/archisteamfarm"
     )
-  '';
 
-  postInstall = ''
+    dotnetInstallPhase
+
     buildPlugin() {
       echo "Publishing plugin $1"
-      dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \
-        --output $out/lib/ArchiSteamFarm/plugins/$1 --configuration Release \
-        $dotnetFlags $dotnetInstallFlags
+      dotnetProjectFiles=("$1")
+      dotnetInstallPath="$out/lib/ArchiSteamFarm/plugins/$1"
+      dotnetInstallPhase
     }
 
-    buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher
-    buildPlugin ArchiSteamFarm.OfficialPlugins.MobileAuthenticator
-    buildPlugin ArchiSteamFarm.OfficialPlugins.Monitoring
-    buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper
+  ''
+  + lib.concatMapStrings (p: "buildPlugin ${p}\n") plugins
+  + ''
 
     chmod +x $out/lib/ArchiSteamFarm/ArchiSteamFarm.dll
     wrapDotnetProgram $out/lib/ArchiSteamFarm/ArchiSteamFarm.dll $out/bin/ArchiSteamFarm

From 10e4009b918abb455a24397cb327b53be0e2eb99 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 22:08:09 +0000
Subject: [PATCH 1733/3724] nezha-theme-nazhua: 0.6.6 -> 0.7.0

---
 pkgs/by-name/ne/nezha-theme-nazhua/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix
index bdbeba1066d4..8439ab229cc1 100644
--- a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix
+++ b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "nezha-theme-nazhua";
-  version = "0.6.6";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "hi2shark";
     repo = "nazhua";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Flx0yHhYGDM9qPIsE1ZfjdmuWXbDTodnaiVK7Hee3Z4=";
+    hash = "sha256-zzdfttj6yURNgB0uS1DtwIREWbd88+oIkgiupjw/8oA=";
   };
 
   yarnOfflineCache = fetchYarnDeps {

From 82cb3f1c8a4ed8cf4e135424b4a9e39435e0bc8f Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Fri, 15 Aug 2025 00:11:19 +0200
Subject: [PATCH 1734/3724] scmpuff: switch to versionCheckHook

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/by-name/sc/scmpuff/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sc/scmpuff/package.nix b/pkgs/by-name/sc/scmpuff/package.nix
index 3a8045cb002c..cbc5be6638b8 100644
--- a/pkgs/by-name/sc/scmpuff/package.nix
+++ b/pkgs/by-name/sc/scmpuff/package.nix
@@ -2,8 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  testers,
-  scmpuff,
+  versionCheckHook,
 }:
 
 buildGoModule rec {
@@ -25,10 +24,9 @@ buildGoModule rec {
     "-X main.VERSION=${version}"
   ];
 
-  passthru.tests.version = testers.testVersion {
-    package = scmpuff;
-    command = "scmpuff version";
-  };
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
 
   meta = with lib; {
     description = "Add numbered shortcuts to common git commands";

From 1c775c9ccdf7f81c06501395c5f6b7c0941cad42 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Fri, 15 Aug 2025 00:13:58 +0200
Subject: [PATCH 1735/3724] scmpuff: 0.5.0 -> 0.6.0

Some quality-of-life changes to the module are also done:

- use `finalAttrs` pattern instead of `rec`
- update meta.description
- add meta.changelog

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/by-name/sc/scmpuff/package.nix | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/sc/scmpuff/package.nix b/pkgs/by-name/sc/scmpuff/package.nix
index cbc5be6638b8..b4ae7cc275f8 100644
--- a/pkgs/by-name/sc/scmpuff/package.nix
+++ b/pkgs/by-name/sc/scmpuff/package.nix
@@ -5,34 +5,42 @@
   versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "scmpuff";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "mroth";
     repo = "scmpuff";
-    rev = "v${version}";
-    sha256 = "sha256-+L0W+M8sZdUSCWj9Ftft1gkRRfWMHdxon2xNnotx8Xs=";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-c8F7BgjbR/w2JH8lE2t93s8gj6cWbTQGIkgYTQp9R3U=";
   };
 
-  vendorHash = "sha256-7WHVSEz3y1nxWfbxkzkfHhINLC8+snmWknHyUUpNy7c=";
+  vendorHash = "sha256-7xSMToc5rlxogS0N9H6siauu8i33zUA5/omqXAszDOg=";
 
   ldflags = [
     "-s"
     "-w"
-    "-X main.VERSION=${version}"
+    # see .goreleaser.yml in the repository
+    "-X main.version=${finalAttrs.version}"
+    "-X main.commit=${finalAttrs.src.rev}"
+    "-X main.date=1970-01-01T00:00:00Z"
+    "-X main.builtBy=nixpkgs"
+    "-X main.treeState=clean"
   ];
 
+  strictDeps = true;
+
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "version";
+  versionCheckProgramArg = "--version";
 
   meta = with lib; {
-    description = "Add numbered shortcuts to common git commands";
+    description = "Numeric file shortcuts for common git commands";
     homepage = "https://github.com/mroth/scmpuff";
+    changelog = "https://github.com/mroth/scmpuff/releases/tag/v${finalAttrs.version}";
     license = licenses.mit;
     maintainers = with maintainers; [ cpcloud ];
     mainProgram = "scmpuff";
   };
-}
+})

From e5c971ca68d461b8015ec5bbe44fde51c40eabc1 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Fri, 15 Aug 2025 00:14:03 +0200
Subject: [PATCH 1736/3724] scmpuff: add myself as maintainer

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/by-name/sc/scmpuff/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sc/scmpuff/package.nix b/pkgs/by-name/sc/scmpuff/package.nix
index b4ae7cc275f8..563b839475bf 100644
--- a/pkgs/by-name/sc/scmpuff/package.nix
+++ b/pkgs/by-name/sc/scmpuff/package.nix
@@ -40,7 +40,10 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/mroth/scmpuff";
     changelog = "https://github.com/mroth/scmpuff/releases/tag/v${finalAttrs.version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ cpcloud ];
+    maintainers = with maintainers; [
+      cpcloud
+      christoph-heiss
+    ];
     mainProgram = "scmpuff";
   };
 })

From 30943e4ecbc26e72ef62962f6e1355e3f327381e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 22:35:17 +0000
Subject: [PATCH 1737/3724] miller: 6.14.0 -> 6.15.0

---
 pkgs/by-name/mi/miller/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/miller/package.nix b/pkgs/by-name/mi/miller/package.nix
index afcd19a6398d..cae50e379a81 100644
--- a/pkgs/by-name/mi/miller/package.nix
+++ b/pkgs/by-name/mi/miller/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "miller";
-  version = "6.14.0";
+  version = "6.15.0";
 
   src = fetchFromGitHub {
     owner = "johnkerl";
     repo = "miller";
     rev = "v${version}";
-    sha256 = "sha256-tpM+Y65zYvnTd9VNJPDTWyj0RC+VmdmVCNzXyVGs/EI=";
+    sha256 = "sha256-r+eayyxI+qFypDHavv9fOAl3rjjKeQxy8tXetmh/ZAI=";
   };
 
   outputs = [
@@ -20,7 +20,7 @@ buildGoModule rec {
     "man"
   ];
 
-  vendorHash = "sha256-KgQZg8+6Vo4t0yx7AwuOyRWIMT7vwUO5nfDgBSVceIA=";
+  vendorHash = "sha256-siLrJOMvsv8MkDVVK8xPn4tpyYSqoYT2Iku7ZP0NCk0=";
 
   postInstall = ''
     mkdir -p $man/share/man/man1

From 456da2a0c9b635302f33deff435ec2343df0b333 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 14 Aug 2025 11:03:26 -0400
Subject: [PATCH 1738/3724] python313Packages.session-info2: init at 0.2

---
 .../python-modules/session-info2/default.nix  | 58 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/python-modules/session-info2/default.nix

diff --git a/pkgs/development/python-modules/session-info2/default.nix b/pkgs/development/python-modules/session-info2/default.nix
new file mode 100644
index 000000000000..25aaea957785
--- /dev/null
+++ b/pkgs/development/python-modules/session-info2/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatch-docstring-description,
+  hatch-vcs,
+  hatchling,
+  coverage,
+  ipykernel,
+  jupyter-client,
+  pytestCheckHook,
+  pytest-asyncio,
+  pytest-subprocess,
+  testing-common-database,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "session-info2";
+  version = "0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "scverse";
+    repo = "session-info2";
+    tag = "v${version}";
+    hash = "sha256-DsI2mFM7xZgSm24yVzF6B+2aruKsjkTKZAmJPg7mWgg=";
+  };
+
+  build-system = [
+    hatch-docstring-description
+    hatch-vcs
+    hatchling
+  ];
+
+  nativeCheckInputs = [
+    coverage
+    ipykernel
+    jupyter-client
+    pytestCheckHook
+    pytest-asyncio
+    pytest-subprocess
+    testing-common-database
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [
+    "session_info2"
+  ];
+
+  meta = {
+    description = "Report Python session information";
+    homepage = "https://session-info2.readthedocs.io";
+    changelog = "https://github.com/scverse/session-info2/releases/tag/${src.tag}";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8dc9e021d2e5..2d406a3df7c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16407,6 +16407,8 @@ self: super: with self; {
 
   service-identity = callPackage ../development/python-modules/service-identity { };
 
+  session-info2 = callPackage ../development/python-modules/session-info2 { };
+
   setproctitle = callPackage ../development/python-modules/setproctitle { };
 
   setupmeta = callPackage ../development/python-modules/setupmeta { };

From 4910a4d3948dcf9df88d8c24cf1a2513e59c1a14 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 25 Jun 2025 10:04:13 -0300
Subject: [PATCH 1739/3724] buildDotnetModule: always use --runtime when
 there's no solution file

---
 .../build-dotnet-module/hook/dotnet-hook.sh   | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
index da277091feb3..5491d5d54e7e 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
@@ -1,5 +1,9 @@
 # shellcheck shell=bash
 
+_dotnetIsSolution() {
+  dotnet sln ${1:+"$1"} list 2>/dev/null
+}
+
 dotnetConfigurePhase() {
   echo "Executing dotnetConfigureHook"
 
@@ -108,9 +112,12 @@ dotnetBuildPhase() {
   dotnetBuild() {
     local -r projectFile="${1-}"
 
+    local useRuntime=
+    _dotnetIsSolution "$projectFile" || useRuntime=1
+
     for runtimeId in "${runtimeIds[@]}"; do
       local runtimeIdFlags=()
-      if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
+      if [[ -n $useRuntime ]]; then
         runtimeIdFlags+=("--runtime" "$runtimeId")
       fi
 
@@ -188,9 +195,12 @@ dotnetCheckPhase() {
 
   local projectFile runtimeId
   for projectFile in "${testProjectFiles[@]-${projectFiles[@]}}"; do
+    local useRuntime=
+    _dotnetIsSolution "$projectFile" || useRuntime=1
+
     for runtimeId in "${runtimeIds[@]}"; do
       local runtimeIdFlags=()
-      if [[ $projectFile == *.csproj ]]; then
+      if [[ -n $useRuntime ]]; then
         runtimeIdFlags=("--runtime" "$runtimeId")
       fi
 
@@ -356,9 +366,12 @@ dotnetInstallPhase() {
   dotnetPublish() {
     local -r projectFile="${1-}"
 
+    local useRuntime=
+    _dotnetIsSolution "$projectFile" || useRuntime=1
+
     for runtimeId in "${runtimeIds[@]}"; do
       local runtimeIdFlags=()
-      if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
+      if [[ -n $useRuntime ]]; then
         runtimeIdFlags+=("--runtime" "$runtimeId")
       fi
 
@@ -380,9 +393,12 @@ dotnetInstallPhase() {
   dotnetPack() {
     local -r projectFile="${1-}"
 
+    local useRuntime=
+    _dotnetIsSolution "$projectFile" || useRuntime=1
+
     for runtimeId in "${runtimeIds[@]}"; do
       local runtimeIdFlags=()
-      if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
+      if [[ -n $useRuntime ]]; then
         runtimeIdFlags+=("--runtime" "$runtimeId")
         # set RuntimeIdentifier because --runtime is broken:
         # https://github.com/dotnet/sdk/issues/13983

From 355e2d1a505a1a6c589272c770da314ebb83bd8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 00:10:35 +0000
Subject: [PATCH 1740/3724] mavproxy: 1.8.71 -> 1.8.74

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

diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix
index fb5bd2314554..440312da1490 100644
--- a/pkgs/applications/science/robotics/mavproxy/default.nix
+++ b/pkgs/applications/science/robotics/mavproxy/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonApplication rec {
   pname = "MAVProxy";
-  version = "1.8.71";
+  version = "1.8.74";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "ArduPilot";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-A7tqV1kBCSuWHJUTdUZGcPY/r7X1edGZs6xDctpMbMI=";
+    hash = "sha256-1/bp3vlCXt4Hg36zwMKSzPSxW7xlxpfx2o+2uQixdos=";
   };
 
   propagatedBuildInputs = [

From 23412f1c6b7a338eef9cc156cfe3b76c5f40e236 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 01:00:17 +0000
Subject: [PATCH 1741/3724] python3Packages.guestfs: 1.56.1 -> 1.56.2

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

diff --git a/pkgs/by-name/li/libguestfs/package.nix b/pkgs/by-name/li/libguestfs/package.nix
index 306bdd38a48e..de1c64979b86 100644
--- a/pkgs/by-name/li/libguestfs/package.nix
+++ b/pkgs/by-name/li/libguestfs/package.nix
@@ -45,11 +45,11 @@ assert appliance == null || lib.isDerivation appliance;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libguestfs";
-  version = "1.56.1";
+  version = "1.56.2";
 
   src = fetchurl {
     url = "https://libguestfs.org/download/${lib.versions.majorMinor finalAttrs.version}-stable/libguestfs-${finalAttrs.version}.tar.gz";
-    hash = "sha256-nK3VUK4xLy/+JDt3N9P0bVa+71Ob7IODyoyw0/32LvU=";
+    hash = "sha256-u0SJGnleC3khPO4sSRSVpt1ksh9ydEVZFzDX94kBaJo=";
   };
 
   strictDeps = true;

From 555c262769519b4e18f175c4200a76d98d0af910 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 03:38:33 +0000
Subject: [PATCH 1742/3724] zashboard: 1.99.0 -> 1.101.1

---
 pkgs/by-name/za/zashboard/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
index 0fd870d7b19f..bf62c8369e08 100644
--- a/pkgs/by-name/za/zashboard/package.nix
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zashboard";
-  version = "1.99.0";
+  version = "1.101.1";
 
   src = fetchFromGitHub {
     owner = "Zephyruso";
     repo = "zashboard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xCyPKCfALCogmkXCFV79nKcFPp4SixmuZWIdKmXxHmY=";
+    hash = "sha256-yUmslvMjkvGvLBL8RtPHBc+kjBL6QGsO1W2vs4PVQ6Q=";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-aiSZS6FEs7kqGXxC9Tx6Rngv3qrPMi5gOuh5Z3/oZyc=";
+    hash = "sha256-coLpiOzG+vVwkyJAd+Q5S847ZE1rTbrT4AO0L1Ds0Iw=";
   };
 
   buildPhase = ''

From 358735dc70a45f267ee2f0bfd16abcfb36c9caf5 Mon Sep 17 00:00:00 2001
From: Frede Braendstrup <frederikbraendstrup@gmail.com>
Date: Sun, 10 Aug 2025 21:33:40 +0200
Subject: [PATCH 1743/3724] jan: 0.6.6 -> 0.6.8

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

diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index 0b42e3ef0163..5659b97d13e1 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -6,10 +6,10 @@
 
 let
   pname = "Jan";
-  version = "0.6.6";
+  version = "0.6.8";
   src = fetchurl {
-    url = "https://github.com/janhq/jan/releases/download/v${version}/Jan_${version}_amd64.AppImage";
-    hash = "sha256-KTU7jSouFCv4ER6cOzNYQJxRpgGTV5AnLs4i0Ne4GYQ=";
+    url = "https://github.com/menloresearch/jan/releases/download/v${version}/jan_${version}_amd64.AppImage";
+    hash = "sha256-JCG4ONJ4Ym/jMJnPJYYk0b+IYKtmWfrk8JxPy2k73hM=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
@@ -23,11 +23,11 @@ appimageTools.wrapType2 {
   '';
 
   meta = {
-    changelog = "https://github.com/janhq/jan/releases/tag/v${version}";
-    description = "Open source alternative to ChatGPT that runs 100% offline on your computer";
-    homepage = "https://github.com/janhq/jan";
+    changelog = "https://github.com/menloresearch/jan/releases/tag/v${version}";
+    description = "Jan is an open source alternative to ChatGPT that runs 100% offline on your computer";
+    homepage = "https://github.com/menloresearch/jan";
     license = lib.licenses.agpl3Plus;
-    mainProgram = "jan";
+    mainProgram = "Jan";
     maintainers = [ ];
     platforms = with lib.systems.inspect; patternLogicalAnd patterns.isLinux patterns.isx86_64;
   };

From a216b8c911d54428c5b63881f2452e6493c3ff41 Mon Sep 17 00:00:00 2001
From: Hans Joachim Kliemeck <h0nIg@users.noreply.github.com>
Date: Thu, 14 Aug 2025 21:20:13 +0200
Subject: [PATCH 1744/3724] postgresql: 17.5 -> 17.6

---
 pkgs/servers/sql/postgresql/17.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix
index e65dc8579ece..faacd3b72fc5 100644
--- a/pkgs/servers/sql/postgresql/17.nix
+++ b/pkgs/servers/sql/postgresql/17.nix
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  version = "17.5";
-  rev = "refs/tags/REL_17_5";
-  hash = "sha256-jWV7hglu7IPMZbqHrZVZHLbZYjVuDeut7nH50aSQIBc=";
+  version = "17.6";
+  rev = "refs/tags/REL_17_6";
+  hash = "sha256-/7C+bjmiJ0/CvoAc8vzTC50vP7OsrM6o0w+lmmHvKvU=";
   muslPatches = {
     dont-use-locale-a = {
       url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e";

From 6cfd1b6a854ad874bae67971a43c24dbc914babd Mon Sep 17 00:00:00 2001
From: Hans Joachim Kliemeck <h0nIg@users.noreply.github.com>
Date: Thu, 14 Aug 2025 21:21:04 +0200
Subject: [PATCH 1745/3724] postgresql: 16.9 -> 16.10

---
 pkgs/servers/sql/postgresql/16.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix
index aa53cd825498..c0b7498da49c 100644
--- a/pkgs/servers/sql/postgresql/16.nix
+++ b/pkgs/servers/sql/postgresql/16.nix
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  version = "16.9";
-  rev = "refs/tags/REL_16_9";
-  hash = "sha256-CLLCT4wiCWeLqMdtGdXM2/DtlENLWSey6nNtOcfNPRw=";
+  version = "16.10";
+  rev = "refs/tags/REL_16_10";
+  hash = "sha256-1zG8+G/lNA1xm0hxLVEilIaI+25d4gfpqA2aCb4+taY=";
   muslPatches = {
     dont-use-locale-a = {
       url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/dont-use-locale-a-on-musl.patch?id=08a24be262339fd093e641860680944c3590238e";

From ebb6f532ae20d79d6a41d4cd0639f165c6e4412a Mon Sep 17 00:00:00 2001
From: Hans Joachim Kliemeck <h0nIg@users.noreply.github.com>
Date: Thu, 14 Aug 2025 21:21:42 +0200
Subject: [PATCH 1746/3724] postgresql: 15.13 -> 15.14

---
 pkgs/servers/sql/postgresql/15.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix
index 7af553659b5e..6cb49891ad0d 100644
--- a/pkgs/servers/sql/postgresql/15.nix
+++ b/pkgs/servers/sql/postgresql/15.nix
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  version = "15.13";
-  rev = "refs/tags/REL_15_13";
-  hash = "sha256-6guX2ms54HhJJ0MoHfQb5MI9qrcA0niJ06oa1glsFuY=";
+  version = "15.14";
+  rev = "refs/tags/REL_15_14";
+  hash = "sha256-KzN0gsEY6wFLqNYMxbTj2NH+4IWO0pplWP4XO/fqRLM=";
   muslPatches = {
     dont-use-locale-a = {
       url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c";

From 9951da1dc8c0a4f49c72bc962890ebba0d14ffc3 Mon Sep 17 00:00:00 2001
From: Hans Joachim Kliemeck <h0nIg@users.noreply.github.com>
Date: Thu, 14 Aug 2025 21:22:14 +0200
Subject: [PATCH 1747/3724] postgresql: 14.18 -> 14.19

---
 pkgs/servers/sql/postgresql/14.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix
index c543e329dffc..e0b6deadab98 100644
--- a/pkgs/servers/sql/postgresql/14.nix
+++ b/pkgs/servers/sql/postgresql/14.nix
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  version = "14.18";
-  rev = "refs/tags/REL_14_18";
-  hash = "sha256-pGPTq4I8WQnysVh3hHi/1Fto5vqtIbdGBu7EyBonIoo=";
+  version = "14.19";
+  rev = "refs/tags/REL_14_19";
+  hash = "sha256-z8MEeLae4W4YqGBNcPtKnUENxnixugnv5Q6r+LW4uu8=";
   muslPatches = {
     disable-test-collate-icu-utf8 = {
       url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";

From 447e957dd060a0fee68fa0a1d968a421c1316c65 Mon Sep 17 00:00:00 2001
From: Hans Joachim Kliemeck <h0nIg@users.noreply.github.com>
Date: Thu, 14 Aug 2025 21:22:42 +0200
Subject: [PATCH 1748/3724] postgresql: 13.21 -> 13.22

---
 pkgs/servers/sql/postgresql/13.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix
index 45a38d9ff765..53aa3ea5e44e 100644
--- a/pkgs/servers/sql/postgresql/13.nix
+++ b/pkgs/servers/sql/postgresql/13.nix
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  version = "13.21";
-  rev = "refs/tags/REL_13_21";
-  hash = "sha256-je3nC8zymK9pIISWSv/hMNeloYuiB7ulLinWFzqAWFc=";
+  version = "13.22";
+  rev = "refs/tags/REL_13_22";
+  hash = "sha256-6zHA+WU1FroUbGJcTAeEbPKBVQY7SKpT5+Kxe9ZhtoM=";
   muslPatches = {
     disable-test-collate-icu-utf8 = {
       url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";

From f80791473ccc0698fa4864e5cd6f08a427d6fc1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 07:14:42 +0000
Subject: [PATCH 1749/3724] hamrs-pro: 2.42.1 -> 2.43.0

---
 pkgs/by-name/ha/hamrs-pro/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ha/hamrs-pro/package.nix b/pkgs/by-name/ha/hamrs-pro/package.nix
index 9de90e310c29..fdc251292e59 100644
--- a/pkgs/by-name/ha/hamrs-pro/package.nix
+++ b/pkgs/by-name/ha/hamrs-pro/package.nix
@@ -8,29 +8,29 @@
 
 let
   pname = "hamrs-pro";
-  version = "2.42.1";
+  version = "2.43.0";
 
   throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-x86_64.AppImage";
-      hash = "sha256-LPXrzS/OF+O4zYlk+Ubf46mZbjTaE8OEA9n7NkC/jxE=";
+      hash = "sha256-R+yUCqhnFq6ffU0sbearFJ+nsyfrzVnbw/vKV2li8sk=";
     };
 
     aarch64-linux = fetchurl {
       url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-arm64.AppImage";
-      hash = "sha256-WTmUscuz4mCnW19zoqxBkqBrb1VJBn/FBf2sDQQ3hF8=";
+      hash = "sha256-nsZbebiYqAd8By+o3+DgJ51mPAuPzQqRsjxXpWPTgW8=";
     };
 
     x86_64-darwin = fetchurl {
       url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-x64.dmg";
-      hash = "sha256-n1wDHbo8URIZEIzJx6O7zGnH/RtMj75ltXImM3Q1QvI=";
+      hash = "sha256-G2vCdgs8wGsZ5EHeO8CI/BtyxvbBAvHTzqbn7InxEAU=";
     };
 
     aarch64-darwin = fetchurl {
       url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-arm64.dmg";
-      hash = "sha256-x/hxKLCVme5l7lo7REy8EjEBstrWA9uyC2sA811eOPk=";
+      hash = "sha256-CnAbgGsgJCLcKH7HizOncI52G6kn8+FEMhWZR8FPMBc=";
     };
   };
 

From 8f5612dd64bb04eab2080479a291096bc2b433ff Mon Sep 17 00:00:00 2001
From: orzklv <sakhib@orzklv.uz>
Date: Fri, 15 Aug 2025 10:23:30 +0500
Subject: [PATCH 1750/3724] maintainers: add shakhzodkudratov and to uzinfocom
 team

---
 maintainers/maintainer-list.nix | 6 ++++++
 maintainers/team-list.nix       | 1 +
 2 files changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0f7d83033528..ceb588a6098b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23121,6 +23121,12 @@
     githubId = 1588288;
     name = "Shahrukh Khan";
   };
+  shakhzodkudratov = {
+    email = "shakhzodkudratov@gmail.com";
+    github = "shakhzodkudratov";
+    githubId = 37299109;
+    name = "Shakhzod Kudratov";
+  };
   shamilton = {
     email = "sgn.hamilton@protonmail.com";
     github = "SCOTT-HAMILTON";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 6cbbf8f719e1..62884bd1b246 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -1257,6 +1257,7 @@ with lib.maintainers;
       orzklv
       bahrom04
       bemeritus
+      shakhzodkudratov
     ];
     scope = "Maintain Uzbek Linux state & community packages and modules.";
     shortName = "Uzinfocom Open Source";

From 5ebd2a09758a93fa14a9c970503a9cc7e696f210 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 08:11:47 +0000
Subject: [PATCH 1751/3724] ark-pixel-font: 2025.07.21 -> 2025.08.11

---
 pkgs/by-name/ar/ark-pixel-font/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix
index 8f62e274427f..01dfa0e346ff 100644
--- a/pkgs/by-name/ar/ark-pixel-font/package.nix
+++ b/pkgs/by-name/ar/ark-pixel-font/package.nix
@@ -7,14 +7,14 @@
 
 python312Packages.buildPythonPackage rec {
   pname = "ark-pixel-font";
-  version = "2025.07.21";
+  version = "2025.08.11";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "TakWolf";
     repo = "ark-pixel-font";
     tag = version;
-    hash = "sha256-NnkXKe4qlWl4lDHNcO5aVJWwyeSrHoHxqlla+RMgtQw=";
+    hash = "sha256-Rcn2zlZyMoziYd1b3wjjh1tYpm6A0qYGiKEg+Wd+0m8=";
   };
 
   dependencies = with python312Packages; [

From 01ffd4ed69c1e7babdf6407261533663fbcd3bfe Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 25 Jul 2025 14:34:48 +0200
Subject: [PATCH 1752/3724] python3Packages.textual: 5.2.0 -> 5.3.0

Diff:
https://github.com/Textualize/textual/compare/refs/tags/v5.2.0...refs/tags/v5.3.0

Changelog:
https://github.com/Textualize/textual/blob/v5.3.0/CHANGELOG.md
---
 pkgs/development/python-modules/textual/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index de8a460ee8ae..a21583c5c4c2 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "5.2.0";
+  version = "5.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "textual";
     tag = "v${version}";
-    hash = "sha256-cv8pLEPmL4jtiMCohDPqBJwGnLcr3d1MXKdNvQHEQN8=";
+    hash = "sha256-J7Sb4nv9wOl1JnR6Ky4XS9HZHABKtNKPB3uYfC/UGO4=";
   };
 
   build-system = [ poetry-core ];

From 60bfdc0572e2f35e706027b390b44739b7fa78a1 Mon Sep 17 00:00:00 2001
From: Silvio Ankermann <silvio.ankermann@cloudandheat.com>
Date: Thu, 14 Aug 2025 16:14:23 +0200
Subject: [PATCH 1753/3724] python3Packages.environ-config: init at 24.1.0

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

diff --git a/pkgs/development/python-modules/environ-config/default.nix b/pkgs/development/python-modules/environ-config/default.nix
new file mode 100644
index 000000000000..06e82efea86c
--- /dev/null
+++ b/pkgs/development/python-modules/environ-config/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  hatch-vcs,
+  hatch-fancy-pypi-readme,
+  attrs,
+  importlib-metadata,
+  pytestCheckHook,
+  moto,
+}:
+buildPythonPackage rec {
+  pname = "environ-config";
+  version = "24.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    repo = "environ-config";
+    owner = "hynek";
+    tag = version;
+    hash = "sha256-XiJNLQgKhf9hXQfIMsfiEaHx7IHaExhphpYfOBgIT+s=";
+  };
+
+  build-system = [
+    hatchling
+    hatch-vcs
+    hatch-fancy-pypi-readme
+  ];
+
+  dependencies = [
+    attrs
+    importlib-metadata
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    moto
+  ];
+
+  pythonImportsCheck = [ "environ" ];
+
+  meta = {
+    description = "Python Application Configuration With Environment Variables";
+    homepage = "https://github.com/hynek/environ-config";
+    changelog = "https://github.com/hynek/environ-config/releases/tag/${version}";
+    license = lib.licenses.apsl20;
+    maintainers = with lib.maintainers; [ lykos153 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f07217d973d..cac1f55f9e80 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4683,6 +4683,8 @@ self: super: with self; {
 
   env-canada = callPackage ../development/python-modules/env-canada { };
 
+  environ-config = callPackage ../development/python-modules/environ-config { };
+
   environmental-override = callPackage ../development/python-modules/environmental-override { };
 
   environs = callPackage ../development/python-modules/environs { };

From 8cc4737e51f58239a676146840fcbe1c995b3f6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 09:26:00 +0000
Subject: [PATCH 1754/3724] organicmaps: 2025.07.13-9 -> 2025.08.10-20

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

diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix
index 93b377672240..58b92227c399 100644
--- a/pkgs/applications/misc/organicmaps/default.nix
+++ b/pkgs/applications/misc/organicmaps/default.nix
@@ -33,13 +33,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "organicmaps";
-  version = "2025.07.13-9";
+  version = "2025.08.10-20";
 
   src = fetchFromGitHub {
     owner = "organicmaps";
     repo = "organicmaps";
     tag = "${finalAttrs.version}-android";
-    hash = "sha256-cEQmghS5qg5HTyWfDIB4G/Arh9BpM3iz1tToRWY8KrE=";
+    hash = "sha256-W1lqmxV5rUC6yXdqr9NrRDXON32K3JsalXFDiB5OCg4=";
     fetchSubmodules = true;
   };
 

From debc379f30472a2c50a948730c8d6514b3aacd4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 10:20:57 +0000
Subject: [PATCH 1755/3724] mpvScripts.uosc: 5.10.0 -> 5.11.0

---
 pkgs/applications/video/mpv/scripts/uosc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix
index 8437d02a85ed..d3f0e4e8c2a2 100644
--- a/pkgs/applications/video/mpv/scripts/uosc.nix
+++ b/pkgs/applications/video/mpv/scripts/uosc.nix
@@ -9,14 +9,14 @@
 
 buildLua (finalAttrs: {
   pname = "uosc";
-  version = "5.10.0";
+  version = "5.11.0";
   scriptPath = "src/uosc";
 
   src = fetchFromGitHub {
     owner = "tomasklaen";
     repo = "uosc";
     rev = finalAttrs.version;
-    hash = "sha256-Jj88PkP7hpyUOHsz0w0TOTTdJoQ/ShgJfHg//GUuUvM=";
+    hash = "sha256-OlfiWIuW9pqgVv3AnhVui7SMJbxDC/wETmmw9qIg8Wc=";
   };
   passthru.updateScript = gitUpdater { };
 

From a53b08f7d903ed0ffd03c89a9c9403b78d7ee3dd Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Fri, 15 Aug 2025 09:48:55 +0000
Subject: [PATCH 1756/3724] appium-inspector: 2025.3.1 -> 2025.7.3

Changelogs:
- https://github.com/appium/appium-inspector/releases/tag/v2025.7.1
- https://github.com/appium/appium-inspector/releases/tag/v2025.7.2
- https://github.com/appium/appium-inspector/releases/tag/v2025.7.3
---
 pkgs/by-name/ap/appium-inspector/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix
index c8df903297b5..fbecc013731e 100644
--- a/pkgs/by-name/ap/appium-inspector/package.nix
+++ b/pkgs/by-name/ap/appium-inspector/package.nix
@@ -11,7 +11,7 @@
 
 let
   electron = electron_36;
-  version = "2025.3.1";
+  version = "2025.7.3";
 in
 
 buildNpmPackage {
@@ -22,10 +22,10 @@ buildNpmPackage {
     owner = "appium";
     repo = "appium-inspector";
     tag = "v${version}";
-    hash = "sha256-Qpk3IXoegPKLKdSSzY05cT2//45TIhyVLxESd2OeWPE=";
+    hash = "sha256-KOZD/KfEG9muNEIxqgedZe9ftvFbBsPjvtwt1yb1gWc=";
   };
 
-  npmDepsHash = "sha256-vUqX8yUZCflfkDYssQelFfJLNhDeU3K4UJPPgvvEeaI=";
+  npmDepsHash = "sha256-XJg0y4d1GgCvlq1YEQpPOIkwkpv6GbeAE32cxwj7gZ0=";
   npmFlags = [ "--ignore-scripts" ];
 
   nativeBuildInputs = [
@@ -33,6 +33,8 @@ buildNpmPackage {
     copyDesktopItems
   ];
 
+  makeCacheWritable = true;
+
   buildPhase = ''
     runHook preBuild
 
@@ -57,7 +59,7 @@ buildNpmPackage {
       --set NODE_ENV production
 
     install -m 444 -D 'app/common/renderer/assets/images/icon.png' \
-      $out/share/icons/hicolor/512x512/apps/appium-inspector.png
+      $out/share/icons/hicolor/256x256/apps/appium-inspector.png
 
     runHook postInstall
   '';

From 9d7734600984dda94dc17a949863bf3db73b94c8 Mon Sep 17 00:00:00 2001
From: ZHAO JinXiang <xiaoxiangmoe@gmail.com>
Date: Fri, 15 Aug 2025 10:56:04 +0000
Subject: [PATCH 1757/3724] bumpp: 10.1.0 -> 10.2.3

---
 pkgs/by-name/bu/bumpp/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix
index 4eda9b885e5d..29e00586b9d9 100644
--- a/pkgs/by-name/bu/bumpp/package.nix
+++ b/pkgs/by-name/bu/bumpp/package.nix
@@ -3,29 +3,29 @@
   stdenv,
   fetchFromGitHub,
   nodejs,
-  pnpm_9,
+  pnpm_10,
   npmHooks,
   versionCheckHook,
   nix-update-script,
 }:
 let
-  pnpm = pnpm_9;
+  pnpm = pnpm_10;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "bumpp";
-  version = "10.1.0";
+  version = "10.2.3";
 
   src = fetchFromGitHub {
     owner = "antfu-collective";
     repo = "bumpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-m4m4mZFge9S0zP0E6XWfeFitx0t+QOl+nXM0oFtlIgU=";
+    hash = "sha256-NVu8CpfW7YXTSOEZMhhF46tgh98lAL4LYVjzml4G3MQ=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-duxpym1DlJM4q5j0wmrubYiAHQ3cDEFfeD9Gyic6mbI=";
+    fetcherVersion = 2;
+    hash = "sha256-GJEnZDPU4MNWUHM8YFB87F+JozV0fIsJSjShudV79XE=";
   };
 
   nativeBuildInputs = [

From 8aaf5eb3f6063a2a65d2a5b1ab5727480bcc7bda Mon Sep 17 00:00:00 2001
From: ZHAO JinXiang <xiaoxiangmoe@gmail.com>
Date: Fri, 15 Aug 2025 10:57:28 +0000
Subject: [PATCH 1758/3724] ni: 23.3.1 -> 25.0.0

---
 pkgs/by-name/ni/ni/package.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix
index 7f2bf48eaa9f..a12f3c2b610b 100644
--- a/pkgs/by-name/ni/ni/package.nix
+++ b/pkgs/by-name/ni/ni/package.nix
@@ -3,29 +3,29 @@
   stdenv,
   fetchFromGitHub,
   nodejs,
-  pnpm_9,
+  pnpm_10,
   npmHooks,
   versionCheckHook,
   nix-update-script,
 }:
 let
-  pnpm = pnpm_9;
+  pnpm = pnpm_10;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ni";
-  version = "23.3.1";
+  version = "25.0.0";
 
   src = fetchFromGitHub {
     owner = "antfu-collective";
     repo = "ni";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jkynuN7w0YaIYQLX0KsEQWqrXkhvh3qKSLK63A/7mx8=";
+    hash = "sha256-kYV6pvxqpFAxlefUApmKODa+mqnio43YvjQvM4o1Wl0=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-gDBjAwut217mdbWyk/dSU4JOkoRbOk4Czlb/lXhWqRU=";
+    fetcherVersion = 2;
+    hash = "sha256-Xa515YJW6LNp0QAiAhL4Tt/PDdWWBKWDB357brzU478=";
   };
 
   nativeBuildInputs = [
@@ -44,9 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   dontNpmPrune = true;
-  postInstall = ''
-    rm -rf $out/lib/node_modules/@antfu/ni/node_modules
-  '';
 
   nativeInstallCheckInputs = [
     versionCheckHook

From a53e289054c2ca0cb1a13ae502fe1abe105334ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 11:07:47 +0000
Subject: [PATCH 1759/3724] maa-assistant-arknights: 5.21.1 -> 5.22.3

---
 pkgs/by-name/ma/maa-assistant-arknights/pin.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json
index 2b652a3e950e..b370bd008135 100644
--- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json
+++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json
@@ -1,10 +1,10 @@
 {
   "stable": {
-    "version": "5.21.1",
-    "hash": "sha256-i8d4PB8QVLgoaTIE/JCd0WrwVE2JzQqygMrNhRdFMFI="
+    "version": "5.22.3",
+    "hash": "sha256-op81+/+W14xpQxYk7oH2V9Ldsw5oAxiI09qp9LhYnCg="
   },
   "beta": {
-    "version": "5.21.1",
-    "hash": "sha256-i8d4PB8QVLgoaTIE/JCd0WrwVE2JzQqygMrNhRdFMFI="
+    "version": "5.23.0-beta.1",
+    "hash": "sha256-AY1ijgljSdwHHlz5FnIzyeGX1bCfyerCrhG/CTQNYG8="
   }
 }

From 106b1418bc30cbae35addcb643a883e22de9573b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 15 Aug 2025 13:58:54 +0200
Subject: [PATCH 1760/3724] Revert "Merge remote-tracking branch
 'origin/master' into staging-next"

This reverts commit 28cafe5795ca21bd902bba7ce83cd4909a26c7b7, reversing
changes made to 281c9189d4b015a8f0f405690463489d6bdd3f1b.

Broken merge due to mergiraf removing many newlines from
python-packages.nix.
---
 lib/default.nix                               |    1 -
 lib/lists.nix                                 |   43 +-
 lib/tests/misc.nix                            |   64 -
 .../blockchains/bitcoin-knots/default.nix     |   68 +-
 .../blockchains/bitcoin/default.nix           |   57 -
 pkgs/applications/editors/tiled/default.nix   |    5 +-
 .../non-generated/avante-nvim/default.nix     |    8 +-
 .../emulators/libretro/cores/flycast.nix      |    6 +-
 pkgs/by-name/ch/chameleon-cli/package.nix     |   91 -
 pkgs/by-name/ch/chameleon-cli/update.sh       |   18 -
 pkgs/by-name/ch/chatbox/package.nix           |    4 +-
 pkgs/by-name/ch/chhoto-url/package.nix        |    6 +-
 pkgs/by-name/cl/clouddrive2/package.nix       |   10 +-
 pkgs/by-name/cr/crush/package.nix             |    6 +-
 pkgs/by-name/dr/draupnir/hashes.json          |    2 +-
 pkgs/by-name/dr/draupnir/package.json         |    6 +-
 pkgs/by-name/dr/draupnir/package.nix          |    4 +-
 pkgs/by-name/gi/gitaly/package.nix            |    4 +-
 .../fix-broken-urlcache-tests.diff            |   22 -
 .../gi/gitlab-container-registry/package.nix  |   12 +-
 pkgs/by-name/gi/gitlab-pages/package.nix      |    4 +-
 pkgs/by-name/gi/gitlab/data.json              |   14 +-
 .../gi/gitlab/gitlab-workhorse/default.nix    |    2 +-
 pkgs/by-name/im/imaginer/package.nix          |   69 +
 pkgs/by-name/je/jellyfin-tui/package.nix      |    4 -
 pkgs/by-name/ku/kubectl-ai/package.nix        |    6 +-
 pkgs/by-name/re/release-plz/package.nix       |    6 +-
 pkgs/by-name/si/simplotask/package.nix        |    4 +-
 pkgs/by-name/ta/tageditor/package.nix         |    4 +-
 pkgs/by-name/tf/tfmigrate/package.nix         |    6 +-
 pkgs/by-name/ur/urlwatch/package.nix          |   11 +-
 pkgs/by-name/wa/waytrogen/package.nix         |   10 +-
 pkgs/by-name/zi/zizmor/package.nix            |    6 +-
 pkgs/development/compilers/llvm/default.nix   |    2 +-
 .../python-modules/boto3-stubs/default.nix    |    4 +-
 .../python-modules/click-shell/default.nix    |   13 +-
 .../python-modules/ecpy/default.nix           |   15 +-
 .../python-modules/jsonargparse/default.nix   |    4 +-
 .../python-modules/model-checker/default.nix  |    4 +-
 .../python-modules/mypy-boto3/default.nix     |   36 +-
 .../python-modules/netdisco/default.nix       |   12 +-
 .../python-modules/nox/default.nix            |   48 +-
 .../publicsuffixlist/default.nix              |    4 +-
 .../python-modules/pyftdi/default.nix         |    4 +-
 .../python-modules/pyhomematic/default.nix    |   15 +-
 .../python-modules/pynamecheap/default.nix    |   23 +-
 .../python-modules/pynanoleaf/default.nix     |   13 +-
 .../python-modules/sqlfmt/default.nix         |   11 +-
 .../python-modules/sunwatcher/default.nix     |   13 +-
 .../tencentcloud-sdk-python/default.nix       |    4 +-
 .../python-modules/timetagger/default.nix     |   26 +-
 .../python-modules/vultr/default.nix          |   14 +-
 pkgs/servers/http/nginx/mainline.nix          |    4 +-
 pkgs/servers/spicedb/default.nix              |    6 +-
 pkgs/tools/filesystems/kdiskmark/default.nix  |   10 +-
 pkgs/top-level/aliases.nix                    |    1 -
 pkgs/top-level/all-packages.nix               |    2 +-
 pkgs/top-level/python-packages.nix            | 8312 ++++++++++++++++-
 58 files changed, 8567 insertions(+), 616 deletions(-)
 delete mode 100644 pkgs/by-name/ch/chameleon-cli/package.nix
 delete mode 100755 pkgs/by-name/ch/chameleon-cli/update.sh
 delete mode 100644 pkgs/by-name/gi/gitlab-container-registry/fix-broken-urlcache-tests.diff
 create mode 100644 pkgs/by-name/im/imaginer/package.nix

diff --git a/lib/default.nix b/lib/default.nix
index 875a1b9bb3ef..d45e6de0c33f 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -287,7 +287,6 @@ let
         init
         crossLists
         unique
-        uniqueStrings
         allUnique
         intersectLists
         subtractLists
diff --git a/lib/lists.nix b/lib/lists.nix
index 226e264176a0..ec0fe22d2afa 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -11,7 +11,7 @@ let
     warn
     pipe
     ;
-  inherit (lib.attrsets) mapAttrs attrNames;
+  inherit (lib.attrsets) mapAttrs;
   inherit (lib) max;
 in
 rec {
@@ -1839,10 +1839,6 @@ rec {
   /**
     Remove duplicate elements from the `list`. O(n^2) complexity.
 
-    :::{.note}
-    If the list only contains strings and order is not important, the complexity can be reduced to O(n log n) by using [`lib.lists.uniqueStrings`](#function-library-lib.lists.uniqueStrings) instead.
-    :::
-
     # Inputs
 
     `list`
@@ -1868,43 +1864,6 @@ rec {
   */
   unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) [ ];
 
-  /**
-    Removes duplicate strings from the `list`. O(n log n) complexity.
-
-    :::{.note}
-    Order is not preserved.
-
-    All elements of the list must be strings without context.
-
-    This function fails when the list contains a non-string element or a [string with context](https://nix.dev/manual/nix/latest/language/string-context.html).
-    In that case use [`lib.lists.unique`](#function-library-lib.lists.unique) instead.
-    :::
-
-    # Inputs
-
-    `list`
-
-    : List of strings
-
-    # Type
-
-    ```
-    uniqueStrings :: [ String ] -> [ String ]
-    ```
-
-    # Examples
-    :::{.example}
-    ## `lib.lists.uniqueStrings` usage example
-
-    ```nix
-    uniqueStrings [ "foo" "bar" "foo" ]
-    => [ "bar" "foo" ] # order is not preserved
-    ```
-
-    :::
-  */
-  uniqueStrings = list: attrNames (groupBy id list);
-
   /**
     Check if list contains only unique elements. O(n^2) complexity.
 
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 2f9f8ae8d53f..b30ae32b2330 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -113,7 +113,6 @@ let
     toIntBase10
     toShellVars
     types
-    uniqueStrings
     updateManyAttrsByPath
     versions
     xor
@@ -1930,69 +1929,6 @@ runTests {
     expected = false;
   };
 
-  testUniqueStrings_empty = {
-    expr = uniqueStrings [ ];
-    expected = [ ];
-  };
-  testUniqueStrings_singles = {
-    expr = uniqueStrings [
-      "all"
-      "unique"
-      "already"
-    ];
-    expected = [
-      "all"
-      "already"
-      "unique"
-    ];
-  };
-  testUniqueStrings_allDuplicates = {
-    expr = uniqueStrings [
-      "dup"
-      "dup"
-      "dup"
-    ];
-    expected = [ "dup" ];
-  };
-  testUniqueStrings_some_duplicates = {
-    expr = uniqueStrings [
-      "foo"
-      "foo"
-      "bar"
-      "bar"
-      "baz"
-    ];
-    expected = [
-      "bar"
-      "baz"
-      "foo"
-    ];
-  };
-  testUniqueStrings_unicode = {
-    expr = uniqueStrings [
-      "café"
-      "@"
-      "#"
-      "@"
-      "#"
-      "$"
-      "😎"
-      "😎"
-      "🙃"
-      ""
-      ""
-    ];
-    expected = [
-      ""
-      "#"
-      "$"
-      "@"
-      "café"
-      "😎"
-      "🙃"
-    ];
-  };
-
   # ATTRSETS
 
   testConcatMapAttrs = {
diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix
index 49e97d731593..53f57d737d2e 100644
--- a/pkgs/applications/blockchains/bitcoin-knots/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchFromGitHub,
   autoreconfHook,
   pkg-config,
   util-linux,
@@ -22,30 +21,20 @@
   python3,
   withGui,
   withWallet ? true,
-  gnupg,
-  # Signatures from the following GPG public keys checked during verification of the source code.
-  # The list can be found at https://github.com/bitcoinknots/guix.sigs/tree/knots/builder-keys
-  builderKeys ? [
-    "1A3E761F19D2CC7785C5502EA291A2C45D0C504A" # luke-jr.gpg
-    "32FE1E61B1C711186CA378DEFD8981F1BC41ABB9" # oomahq.gpg
-    "CACC7CBB26B3D2EE8FC2F2BC0E37EBAB8574F005" # leo-haf.gpg
-  ],
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = if withGui then "bitcoin-knots" else "bitcoind-knots";
   version = "28.1.knots20250305";
 
   src = fetchurl {
-    url = "https://bitcoinknots.org/files/28.x/${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz";
-    # hash retrieved from signed SHA256SUMS
+    url = "https://bitcoinknots.org/files/28.x/${version}/bitcoin-${version}.tar.gz";
     hash = "sha256-DKO3+43Tn/BTKQVrLrCkeMtzm8SfbaJD8rPlb6lDA8A=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-    gnupg
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
@@ -69,58 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
     qttools
   ];
 
-  preUnpack =
-    let
-      majorVersion = lib.versions.major finalAttrs.version;
-
-      publicKeys = fetchFromGitHub {
-        owner = "bitcoinknots";
-        repo = "guix.sigs";
-        rev = "b998306d462f39b6077518521700d7156fec76b8";
-        sha256 = "sha256-q4tumAfTr828AZNOa9ia7Y0PYoe6W47V/7SEApTzl3w=";
-      };
-
-      checksums = fetchurl {
-        url = "https://bitcoinknots.org/files/${majorVersion}.x/${finalAttrs.version}/SHA256SUMS";
-        hash = "sha256-xWJKaZBLm9H6AuMBSC21FLy/5TRUI0AQVIUF/2PvDhs=";
-      };
-
-      signatures = fetchurl {
-        url = "https://bitcoinknots.org/files/${majorVersion}.x/${finalAttrs.version}/SHA256SUMS.asc";
-        hash = "sha256-SywdBEzZqsf2aDeOs7J9n513RTCm+TJA/QYP5+h7Ifo=";
-      };
-
-      verifyBuilderKeys =
-        let
-          script = publicKey: ''
-            echo "Checking if public key ${publicKey} signed the checksum file..."
-            grep "^\[GNUPG:\] VALIDSIG .* ${publicKey}$" verify.log > /dev/null
-            echo "OK"
-          '';
-        in
-        builtins.concatStringsSep "\n" (builtins.map script builderKeys);
-    in
-    ''
-      pushd $(mktemp -d)
-      export GNUPGHOME=$PWD/gnupg
-      mkdir -m 700 -p $GNUPGHOME
-      gpg --no-autostart --batch --import ${publicKeys}/builder-keys/*
-      ln -s ${checksums} ./SHA256SUMS
-      ln -s ${signatures} ./SHA256SUMS.asc
-      ln -s $src ./bitcoin-${finalAttrs.version}.tar.gz
-      gpg --no-autostart --batch --verify --status-fd 1 SHA256SUMS.asc SHA256SUMS > verify.log
-      ${verifyBuilderKeys}
-      grep bitcoin-${finalAttrs.version}.tar.gz SHA256SUMS > SHA256SUMS.filtered
-      echo "Verifying the checksum of bitcoin-${finalAttrs.version}.tar.gz..."
-      sha256sum -c SHA256SUMS.filtered
-      popd
-    '';
-
   configureFlags = [
     "--with-boost-libdir=${boost.out}/lib"
     "--disable-bench"
   ]
-  ++ lib.optionals (!finalAttrs.doCheck) [
+  ++ lib.optionals (!doCheck) [
     "--disable-tests"
     "--disable-gui-tests"
   ]
@@ -148,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Derivative of Bitcoin Core with a collection of improvements";
     homepage = "https://bitcoinknots.org/";
-    changelog = "https://github.com/bitcoinknots/bitcoin/blob/v${finalAttrs.version}/doc/release-notes.md";
+    changelog = "https://github.com/bitcoinknots/bitcoin/blob/v${version}/doc/release-notes.md";
     maintainers = with lib.maintainers; [
       prusnak
       mmahut
@@ -156,4 +98,4 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
   };
-})
+}
diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix
index 1c63e4293929..809f8665050f 100644
--- a/pkgs/applications/blockchains/bitcoin/default.nix
+++ b/pkgs/applications/blockchains/bitcoin/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchFromGitHub,
   cmake,
   pkg-config,
   installShellFiles,
@@ -24,16 +23,6 @@
   withGui,
   withWallet ? true,
   enableTracing ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic,
-  gnupg,
-  # Signatures from the following GPG public keys checked during verification of the source code.
-  # The list can be found at https://github.com/bitcoin-core/guix.sigs/tree/main/builder-keys
-  builderKeys ? [
-    "152812300785C96444D3334D17565732E08E5E41" # achow101.gpg
-    "9EDAFF80E080659604F4A76B2EBB056FD847F8A7" # Emzy.gpg
-    "71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg
-    "6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C" # glozow.gpg
-    "D1DBF2C4B96F2DEBF4C16654410108112E7EA81F" # hebasto.gpg
-  ],
 }:
 
 let
@@ -59,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     pkg-config
     installShellFiles
-    gnupg
   ]
   ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
     autoSignDarwinBinariesHook
@@ -82,51 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
     qttools
   ];
 
-  preUnpack =
-    let
-      publicKeys = fetchFromGitHub {
-        owner = "bitcoin-core";
-        repo = "guix.sigs";
-        rev = "a788388207bd244d5ab07b31ecd6c126f213a6c6";
-        sha256 = "sha256-gbenuEWP6pqY9ywPd/yZy6QfWI7jvSObwto27DRXjGI=";
-      };
-
-      checksums = fetchurl {
-        url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS";
-        hash = "sha256-lOwVH0UqIhOT0I9rAvswuqy+tZ8ZRhH0kGnn9VCbRv4=";
-      };
-
-      signatures = fetchurl {
-        url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS.asc";
-        hash = "sha256-s05cRmZ9aoPdSZTaz6D6qmVwX6OprqxynPn5vZQ7bbw=";
-      };
-
-      verifyBuilderKeys =
-        let
-          script = publicKey: ''
-            echo "Checking if public key ${publicKey} signed the checksum file..."
-            grep "^\[GNUPG:\] VALIDSIG .* ${publicKey}$" verify.log > /dev/null
-            echo "OK"
-          '';
-        in
-        builtins.concatStringsSep "\n" (builtins.map script builderKeys);
-    in
-    ''
-      pushd $(mktemp -d)
-      export GNUPGHOME=$PWD/gnupg
-      mkdir -m 700 -p $GNUPGHOME
-      gpg --no-autostart --batch --import ${publicKeys}/builder-keys/*
-      ln -s ${checksums} ./SHA256SUMS
-      ln -s ${signatures} ./SHA256SUMS.asc
-      ln -s $src ./bitcoin-${finalAttrs.version}.tar.gz
-      gpg --no-autostart --batch --verify --status-fd 1 SHA256SUMS.asc SHA256SUMS > verify.log
-      ${verifyBuilderKeys}
-      grep bitcoin-${finalAttrs.version}.tar.gz SHA256SUMS > SHA256SUMS.filtered
-      echo "Verifying the checksum of bitcoin-${finalAttrs.version}.tar.gz..."
-      sha256sum -c SHA256SUMS.filtered
-      popd
-    '';
-
   postInstall = ''
     cd ..
     installShellCompletion --bash contrib/completions/bash/bitcoin-cli.bash
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index e5e031b2b1f4..773b149a0b6f 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -28,14 +28,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "tiled";
-  # nixpkgs-update: no auto update
-  version = "1.11.2";
+  version = "1.11.90";
 
   src = fetchFromGitHub {
     owner = "mapeditor";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-9oUKn51MQcsStgIJrp9XW5YAIpAUcO0kzfGnYA3gz/E=";
+    sha256 = "sha256-gGsozdFEE5c315DF+EsIY9wGv50wwrOBycejTkVwEHA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index 3afecf4ffc90..ba0190c093d1 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -12,18 +12,18 @@
   pkgs,
 }:
 let
-  version = "0.0.27-unstable-2025-08-14";
+  version = "0.0.27-unstable-2025-08-06";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    rev = "be0937a459624ce1170f158f9d8660d0ade47eb4";
-    hash = "sha256-1NzzyWW2Tp91wa+Ujv2cDTv/Cb/HgA6LiDuwxVWdJwU=";
+    rev = "2fc63d4128d2dc2fef0913c7480b4586959ebe4e";
+    hash = "sha256-hHa300Ldszsnp6AuYVJwOFc5FfuRTd3phyM6/qBUIQo=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";
     inherit version src;
 
-    cargoHash = "sha256-pTWCT2s820mjnfTscFnoSKC37RE7DAPKxP71QuM+JXQ=";
+    cargoHash = "sha256-8mBpzndz34RrmhJYezd4hLrJyhVL4S4IHK3plaue1k8=";
 
     nativeBuildInputs = [
       pkg-config
diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix
index 3899f4f32820..2fbae3a49af2 100644
--- a/pkgs/applications/emulators/libretro/cores/flycast.nix
+++ b/pkgs/applications/emulators/libretro/cores/flycast.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "flycast";
-  version = "0-unstable-2025-08-12";
+  version = "0-unstable-2025-08-01";
 
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
-    rev = "33833cfd1ed2d94d907223442fdb8cdafd8d5d80";
-    hash = "sha256-6YXWJi3xbImfBMWILzsnwJGvj2XDoHcrWgLDPwaHfJs=";
+    rev = "40e400ab084175d3bd0f9e10cf8d6ac78c8b9544";
+    hash = "sha256-k/w1tmuGuRD98bR/kmc/9pLFGeobHMhKQapJOv8qVJo=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/ch/chameleon-cli/package.nix b/pkgs/by-name/ch/chameleon-cli/package.nix
deleted file mode 100644
index fec07c514110..000000000000
--- a/pkgs/by-name/ch/chameleon-cli/package.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  cmake,
-  makeWrapper,
-  xz,
-  python3,
-}:
-
-let
-  # https://github.com/RfidResearchGroup/ChameleonUltra/blob/main/software/script/requirements.txt
-  pythonPath =
-    with python3.pkgs;
-    makePythonPath [
-      colorama
-      prompt-toolkit
-      pyserial
-    ];
-in
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "chameleon-cli";
-  version = "2.0.0-unstable-2025-08-04";
-
-  src = fetchFromGitHub {
-    owner = "RfidResearchGroup";
-    repo = "ChameleonUltra";
-    rev = "098e0a914b206900f7ea7ae7265486c4349ab644";
-    sparseCheckout = [ "software" ];
-    hash = "sha256-WKxP4jLHkTqBO+nwxhr8DRb3TzDIMlwjA4v+6txQbDo=";
-  };
-
-  sourceRoot = "${finalAttrs.src.name}/software";
-
-  patches = [
-    # Use execute_tool to simplify running hardnested tool,
-    # also fix when the dir conatains hardnested is read only
-    # https://github.com/RfidResearchGroup/ChameleonUltra/pull/266
-    (fetchpatch {
-      url = "https://github.com/RfidResearchGroup/ChameleonUltra/commit/39270fd09ee61ef0659bf3b79ffa4d2b27f3ba63.patch";
-      hash = "sha256-OlHQ2cL+NFdTsSPFI9geg3dabATRjyKxGp5gGG+eDl8=";
-      stripLen = 1;
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace src/CMakeLists.txt \
-      --replace-fail "liblzma" "lzma" \
-      --replace-fail "FetchContent_MakeAvailable(xz)" ""
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    makeWrapper
-  ];
-
-  buildInputs = [
-    xz
-  ];
-
-  cmakeFlags = [
-    "-S"
-    "../src"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/libexec
-    cp -r ../script/* $out/libexec
-    rm -r $out/libexec/tests
-    rm $out/libexec/requirements.txt
-    makeWrapper ${lib.getExe python3} $out/bin/chameleon-cli \
-      --add-flags "$out/libexec/chameleon_cli_main.py" \
-      --prefix PYTHONPATH : ${pythonPath}
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = ./update.sh;
-
-  meta = {
-    description = "Command line interface for Chameleon Ultra";
-    homepage = "https://github.com/RfidResearchGroup/ChameleonUltra";
-    license = lib.licenses.gpl3Only;
-    mainProgram = "chameleon-cli";
-    maintainers = with lib.maintainers; [ azuwis ];
-  };
-})
diff --git a/pkgs/by-name/ch/chameleon-cli/update.sh b/pkgs/by-name/ch/chameleon-cli/update.sh
deleted file mode 100755
index 2875b72ffacd..000000000000
--- a/pkgs/by-name/ch/chameleon-cli/update.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p coreutils nix-update
-
-# This update script exists, because nix-update is unable to ignore `dev`
-# tags that exist on the upstream repo.
-#
-# Once https://github.com/Mic92/nix-update/issues/322 is resolved it can be
-# removed.
-
-set -exuo pipefail
-
-cd "$(git rev-parse --show-toplevel)"
-
-nix-update --version=branch chameleon-cli
-
-tag=$(git ls-remote --tags --refs --sort='-version:refname' https://github.com/RfidResearchGroup/ChameleonUltra.git 'v*' | head -n 1 | cut --delimiter=/ --field=3-)
-tag="${tag#v}"
-sed -i -e 's|version = "[^-]*-unstable-|version = "'"${tag}"'-unstable-|' pkgs/by-name/ch/chameleon-cli/package.nix
diff --git a/pkgs/by-name/ch/chatbox/package.nix b/pkgs/by-name/ch/chatbox/package.nix
index 75d9a8577dea..87cabe193265 100644
--- a/pkgs/by-name/ch/chatbox/package.nix
+++ b/pkgs/by-name/ch/chatbox/package.nix
@@ -6,11 +6,11 @@
 }:
 let
   pname = "chatbox";
-  version = "1.15.4";
+  version = "1.15.2";
 
   src = fetchurl {
     url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage";
-    hash = "sha256-plKibAg1tv0Togt+Jlwm8qrTp7UbBmuEM20xKLi7bb4=";
+    hash = "sha256-KxL073BIfZfjFndwtkDNXwlt1xny76BMV9CQF3x7ATQ=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };
diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index 2a9abd251ea6..2f73b19d3f68 100644
--- a/pkgs/by-name/ch/chhoto-url/package.nix
+++ b/pkgs/by-name/ch/chhoto-url/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chhoto-url";
-  version = "6.2.13";
+  version = "6.2.12";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-onGmDAVhT2lzq2pQ5runGuHgPdh1MjgFLU7DUvN7nt0=";
+    hash = "sha256-hV/YWxOPRTojVTFIXwzqImBKyQ1dCDq5+bgCdS7T1p0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-GbjbVr82Aj/CRdBl9gPGwHiyrc7l2F918DNnlEoPI58=";
+  cargoHash = "sha256-9wXbd56KOQ7suZqtg2cSFf2FGQJADFMHJbwAAxJ2V4g=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url
diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix
index 5c8bcfd3fa2b..8d5649807fc4 100644
--- a/pkgs/by-name/cl/clouddrive2/package.nix
+++ b/pkgs/by-name/cl/clouddrive2/package.nix
@@ -11,16 +11,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clouddrive2";
-  version = "0.9.5";
+  version = "0.9.4";
 
   src = fetchurl {
     url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
     hash =
       {
-        x86_64-linux = "sha256-Gsq5rvr0SeGxCRwAeeFRZBPOe32EIa7uO6SAIuinezA=";
-        aarch64-linux = "sha256-M+lCUzoiy/sImBZrOjjeP4eqG3F4wbkMQg9Ho3ELGFo=";
-        x86_64-darwin = "sha256-Uyz1wuHICSq5C+n3ZjPinZznhajd6QR36CZgQBm+QRE=";
-        aarch64-darwin = "sha256-ZQxRHTzLUAhnL1rRLR9l8Ix5XzxeTAds7XAmEgZ9Xmo=";
+        x86_64-linux = "sha256-i6+YoZfCFaVcF7XO7wPo8AEpU0LrD4bcsIqLNz/V3aM=";
+        aarch64-linux = "sha256-BV+47uJnvH/Gapz7dACnXIM49x7u/MTdbXiFRGq2DVc=";
+        x86_64-darwin = "sha256-Jjsdx203akCmlveGZD1x8fO6V0N5d3AzGAFIAzgOkHs=";
+        aarch64-darwin = "sha256-DuSZoXTQyfC3CIwNGTsGuQNP410rK9qMBei5T7TZN7A=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };
diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix
index 8ccf5e0f0454..d7578f1aaffc 100644
--- a/pkgs/by-name/cr/crush/package.nix
+++ b/pkgs/by-name/cr/crush/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "crush";
-  version = "0.6.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "crush";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QUYNJ2Ifny9Zj9YVQHcH80E2qa4clWVg2T075IEWujM=";
+    hash = "sha256-u2w19Xmcm3cx/B8QRNGaP2qeg+Cif/L92RNlJav6H3w=";
   };
 
-  vendorHash = "sha256-vdzAVVGr7uTW/A/I8TcYW189E3960SCIqatu7Kb60hg=";
+  vendorHash = "sha256-H92TgZoWdYQ863AAb2116zJtmgkKXh2hRoEBRcn5zeA=";
 
   # rename TestMain to prevent it from running, as it panics in the sandbox.
   postPatch = ''
diff --git a/pkgs/by-name/dr/draupnir/hashes.json b/pkgs/by-name/dr/draupnir/hashes.json
index a509437a3988..25bf893bf38c 100644
--- a/pkgs/by-name/dr/draupnir/hashes.json
+++ b/pkgs/by-name/dr/draupnir/hashes.json
@@ -1,3 +1,3 @@
 {
-  "yarn_offline_cache_hash": "sha256-SoCuCzrKUWWsD/oEh2W3/T1/hhd7ghfpeBojo84sEI8="
+  "yarn_offline_cache_hash": "sha256-xB9SKCM9m2LotwxIzGgT72mLgrDW2spqvR5VoyexIAA="
 }
diff --git a/pkgs/by-name/dr/draupnir/package.json b/pkgs/by-name/dr/draupnir/package.json
index bbd5e30084f3..5cbbdbf553c8 100644
--- a/pkgs/by-name/dr/draupnir/package.json
+++ b/pkgs/by-name/dr/draupnir/package.json
@@ -1,6 +1,6 @@
 {
   "name": "draupnir",
-  "version": "2.6.1",
+  "version": "2.6.0",
   "description": "A moderation tool for Matrix",
   "main": "lib/index.js",
   "repository": "https://github.com/the-draupnir-project/Draupnir.git",
@@ -63,8 +63,8 @@
     "jsdom": "^24.0.0",
     "matrix-appservice-bridge": "^10.3.1",
     "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6",
-    "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@3.11.0",
-    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@3.11.0",
+    "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@3.10.0",
+    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@3.8.0",
     "pg": "^8.8.0",
     "yaml": "^2.3.2"
   },
diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix
index c36d4823a41b..ef61dcf66e02 100644
--- a/pkgs/by-name/dr/draupnir/package.nix
+++ b/pkgs/by-name/dr/draupnir/package.nix
@@ -22,13 +22,13 @@ let
 in
 mkYarnPackage rec {
   pname = "draupnir";
-  version = "2.6.1";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "the-draupnir-project";
     repo = "Draupnir";
     tag = "v${version}";
-    hash = "sha256-KO2jm9yD/LnJSY1dAbPQ2fJZhmrxWJHU+TIaZzK97bg=";
+    hash = "sha256-v6dHexu9x60onBoHbdI+15p6r5m6mi7bRLgZ9jqF19s=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 884cb31f11cb..664edf9b73df 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.2.2";
+  version = "18.2.1";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -21,7 +21,7 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-+OmduG9neb15m3i57qPfE42HI4w/zgmA5T6bhlwzrT0=";
+      hash = "sha256-h4JklXImKwudJT3pb/UhHwQHKd87c5aSH1xYC0lRWKo=";
     };
 
     vendorHash = "sha256-RjDV4NGmmdT9STQBHiYf3UUYwPmuSg6970/W/ekxin0=";
diff --git a/pkgs/by-name/gi/gitlab-container-registry/fix-broken-urlcache-tests.diff b/pkgs/by-name/gi/gitlab-container-registry/fix-broken-urlcache-tests.diff
deleted file mode 100644
index 2da75604d95f..000000000000
--- a/pkgs/by-name/gi/gitlab-container-registry/fix-broken-urlcache-tests.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/registry/storage/driver/middleware/urlcache/urlcache_test.go b/registry/storage/driver/middleware/urlcache/urlcache_test.go
-index 67ef4abc0e..6644c80837 100644
---- a/registry/storage/driver/middleware/urlcache/urlcache_test.go
-+++ b/registry/storage/driver/middleware/urlcache/urlcache_test.go
-@@ -37,7 +37,7 @@
- 			name:        "missing redis cache",
- 			options:     make(map[string]any),
- 			wantErr:     true,
--			errContains: "urlcache middleware requires `cache` Redis configured",
-+			errContains: "`_redisCache` key has not been passed to urlcache middleware",
- 		},
- 		{
- 			name: "default configuration with redis",
-@@ -231,7 +231,7 @@
- 				"_redisCache": "not a redis cache",
- 			},
- 			wantErr:     true,
--			errContains: "unusable redis cache object",
-+			errContains: "redis cache passed to the middleware cannot be used as the type is wrong",
- 		},
- 	}
- 
diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix
index cbf8c0f80ede..217966c4b1eb 100644
--- a/pkgs/by-name/gi/gitlab-container-registry/package.nix
+++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule rec {
   pname = "gitlab-container-registry";
-  version = "4.26.0";
+  version = "4.25.0";
   rev = "v${version}-gitlab";
 
   # nixpkgs-update: no auto update
@@ -14,16 +14,10 @@ buildGoModule rec {
     owner = "gitlab-org";
     repo = "container-registry";
     inherit rev;
-    hash = "sha256-XACKJW5sRXNM4Q24DXEVtjzhVfxoBd+JWHJr1s01ocA=";
+    hash = "sha256-7jzKFC29NAHi5iag6aA/5LzH6IyqMa3yAxtzV9OsBnQ=";
   };
 
-  patches = [
-    # https://gitlab.com/gitlab-org/container-registry/-/merge_requests/2447
-    # Can be removed with next released when merged
-    ./fix-broken-urlcache-tests.diff
-  ];
-
-  vendorHash = "sha256-J4p3vXLmDFYl/z6crqanlmG1FB4Dq04HLx9IhC3usQ4=";
+  vendorHash = "sha256-z9IlfyJ48FQzhbY38GbZaeQjg3cMDU8tLCXKhazP64A=";
 
   checkFlags =
     let
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index e5d5874ba7bb..452d624d23e2 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -6,14 +6,14 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "18.2.2";
+  version = "18.2.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-PPa9SYyE3G+peP2xSpNw7WDDO7WiWKSRpd5tBODkA0g=";
+    hash = "sha256-z1Pl3xeaoqeF/9qOVcuCpuciu1r6NQ4UhlLe9gy9+nE=";
   };
 
   vendorHash = "sha256-OubXCpvGtGqegQmdb6R1zw/0DfQ4FdbJGt7qYYRnWnA=";
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index e14fe7e4fd69..c170a0a5d80b 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "18.2.2",
-  "repo_hash": "0fqpfprxmgxaz5g0d5z4gsir1zj9fkhli7iq1ahx413ymsiqrxd0",
-  "yarn_hash": "0c6njrciqcjaswh784yxly4qza6k2ghq1ljbdkcn65cna4f4hwgk",
+  "version": "18.2.1",
+  "repo_hash": "1i0y46w18476gn98fmkixdjiyrwajz2347p57dg2ijch4ivzpmlv",
+  "yarn_hash": "04mqinnbhr6zgab2p1bq6y6b20bf4c4cynkgfc67mzm9xhybr3fk",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.2.2-ee",
+  "rev": "v18.2.1-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.2.2",
-    "GITLAB_PAGES_VERSION": "18.2.2",
+    "GITALY_SERVER_VERSION": "18.2.1",
+    "GITLAB_PAGES_VERSION": "18.2.1",
     "GITLAB_SHELL_VERSION": "14.43.0",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0",
-    "GITLAB_WORKHORSE_VERSION": "18.2.2"
+    "GITLAB_WORKHORSE_VERSION": "18.2.1"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index 2bec55c36570..739a24476dec 100644
--- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
@@ -10,7 +10,7 @@ in
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "18.2.2";
+  version = "18.2.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
diff --git a/pkgs/by-name/im/imaginer/package.nix b/pkgs/by-name/im/imaginer/package.nix
new file mode 100644
index 000000000000..a73faf7fad89
--- /dev/null
+++ b/pkgs/by-name/im/imaginer/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  appstream-glib,
+  blueprint-compiler,
+  desktop-file-utils,
+  fetchFromGitHub,
+  gettext,
+  glib,
+  gobject-introspection,
+  libadwaita,
+  libsoup_3,
+  meson,
+  ninja,
+  pkg-config,
+  python3Packages,
+  wrapGAppsHook4,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "imaginer";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "ImaginerApp";
+    repo = "Imaginer";
+    rev = "v${version}";
+    hash = "sha256-x1ZnmfaMfxnITiuFDlMPfTU8KZbd1ME9jDevnlsrbJs=";
+  };
+
+  format = "other";
+  dontWrapGApps = true;
+
+  nativeBuildInputs = [
+    appstream-glib
+    blueprint-compiler
+    desktop-file-utils
+    gettext
+    glib
+    gobject-introspection
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    libadwaita
+    libsoup_3
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
+    openai
+    pillow
+    pygobject3
+    requests
+  ];
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/ImaginerApp/Imaginer";
+    description = "AI image generator for GNOME";
+    mainProgram = "imaginer";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ _0xMRTT ];
+  };
+}
diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix
index 5b7840e4b4a6..0c6b659a011e 100644
--- a/pkgs/by-name/je/jellyfin-tui/package.nix
+++ b/pkgs/by-name/je/jellyfin-tui/package.nix
@@ -43,10 +43,6 @@ rustPlatform.buildRustPackage rec {
   '';
   doInstallCheck = true;
 
-  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
-    install -Dm644 src/extra/jellyfin-tui.desktop $out/share/applications/jellyfin-tui.desktop
-  '';
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/ku/kubectl-ai/package.nix b/pkgs/by-name/ku/kubectl-ai/package.nix
index 6a35ec8699e9..ac29224c97a7 100644
--- a/pkgs/by-name/ku/kubectl-ai/package.nix
+++ b/pkgs/by-name/ku/kubectl-ai/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-ai";
-  version = "0.0.22";
+  version = "0.0.20";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "kubectl-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sU8CATzhp0seUJNYjvxFkRoA/Xqb57kZqGpEOCxypUA=";
+    hash = "sha256-iyyaQBulncPNJXm7ir/aOjJxJvd0Q178weneiwQbGcU=";
   };
 
-  vendorHash = "sha256-OJnpd8z4e6ytoUi5ydFHYPMA77ryU7Tp8wriuab7yuk=";
+  vendorHash = "sha256-a84HesnInU7JZZTx0Rm1Qgsmo7SJC0kMnckgmUk0Vow=";
 
   # Build the main command
   subPackages = [ "cmd" ];
diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix
index 535fdaea13a8..84ffbab32ec6 100644
--- a/pkgs/by-name/re/release-plz/package.nix
+++ b/pkgs/by-name/re/release-plz/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "release-plz";
-  version = "0.3.140";
+  version = "0.3.139";
 
   src = fetchFromGitHub {
     owner = "MarcoIeni";
     repo = "release-plz";
     rev = "release-plz-v${version}";
-    hash = "sha256-pJHyf1aSn4YqzFYW6otuRY+gJ6TBCKFGQuH2Py5uWlE=";
+    hash = "sha256-s2PvMJu0RLO2AOMMonq4xdZlQXHrvKoqh4v9tp72Ud0=";
   };
 
-  cargoHash = "sha256-LfadgdrGD9g/PNeFs/XNUk2x0h1i3znzMhIV+w1DjMk=";
+  cargoHash = "sha256-S5YhAcEhTbiM0VCAy3IiObc1uCPbsIi0QqeFxocVqw4=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix
index d98b732ee128..66c0d21ebe0d 100644
--- a/pkgs/by-name/si/simplotask/package.nix
+++ b/pkgs/by-name/si/simplotask/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "simplotask";
-  version = "1.18.0";
+  version = "1.17.2";
 
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "spot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0XAxjh9TWMqMkeSEhdgXX9DflHnT40f7VkHgp1QjQUg=";
+    hash = "sha256-7EavT4IHEAe3nq6tkhX7qHpDzy7UTdBMZ7x/bquv4Z8=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ta/tageditor/package.nix b/pkgs/by-name/ta/tageditor/package.nix
index de03722f3c4e..f0babd818ed2 100644
--- a/pkgs/by-name/ta/tageditor/package.nix
+++ b/pkgs/by-name/ta/tageditor/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tageditor";
-  version = "3.9.6";
+  version = "3.9.5";
 
   src = fetchFromGitHub {
     owner = "martchus";
     repo = "tageditor";
     tag = "v${version}";
-    hash = "sha256-weGLC8TPSA9XQ/TuLj4DBswmlEbpxPplsxI4sqygHfU=";
+    hash = "sha256-Sia6Y/V81WQj4oWjZAAR4o3TngfWq7sWxxiKEuFjQ2M=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tf/tfmigrate/package.nix b/pkgs/by-name/tf/tfmigrate/package.nix
index 54460e85527c..0b8ba744f031 100644
--- a/pkgs/by-name/tf/tfmigrate/package.nix
+++ b/pkgs/by-name/tf/tfmigrate/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tfmigrate";
-  version = "0.4.3";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "minamijoyo";
     repo = "tfmigrate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tuLbcxJj8TsG3I/o3cHO2DtQm9ql3wlhYBtYiMbRW7o=";
+    hash = "sha256-+5nw+EgFTor8XL4cibxkpJL4fdEQ6UuEj5wyOjpaANA=";
   };
 
-  vendorHash = "sha256-TqZi5NZ+4eSzq98/ZM4Gab7Sud7bz1DNHrp5nGaGHDE=";
+  vendorHash = "sha256-mm34U4nLow4lCz/AgfqYZJRb71GpQjR14+tm0hfmdDc=";
 
   checkFlags = [
     "-skip TestExecutorDir" # assumes /usr/bin to be present
diff --git a/pkgs/by-name/ur/urlwatch/package.nix b/pkgs/by-name/ur/urlwatch/package.nix
index 73429bad880c..972cd24c1cfd 100644
--- a/pkgs/by-name/ur/urlwatch/package.nix
+++ b/pkgs/by-name/ur/urlwatch/package.nix
@@ -12,26 +12,22 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "thp";
     repo = "urlwatch";
-    tag = version;
+    rev = version;
     hash = "sha256-X1UR9JrQuujOIUg87W0YqfXsM3A5nttWjjJMIe3hgk8=";
   };
 
   build-system = with python3Packages; [ setuptools ];
 
   dependencies = with python3Packages; [
-    aioxmpp
-    beautifulsoup4
-    cssbeautifier
     cssselect
     jq
-    jsbeautifier
     keyring
     lxml
     markdown2
     matrix-client
     minidb
-    platformdirs
     playwright
+    platformdirs
     pushbullet-py
     pycodestyle
     pyyaml
@@ -45,13 +41,12 @@ python3Packages.buildPythonApplication rec {
 
   meta = with lib; {
     description = "Tool for monitoring webpages for updates";
+    mainProgram = "urlwatch";
     homepage = "https://thp.io/2008/urlwatch/";
-    changelog = "https://github.com/thp/urlwatch/blob/${src.tag}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [
       kmein
       tv
     ];
-    mainProgram = "urlwatch";
   };
 }
diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix
index 922b7e0e19e4..27aec72ba5b3 100644
--- a/pkgs/by-name/wa/waytrogen/package.nix
+++ b/pkgs/by-name/wa/waytrogen/package.nix
@@ -16,19 +16,19 @@
   desktop-file-utils,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = "waytrogen";
   version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "nikolaizombie1";
     repo = "waytrogen";
-    tag = finalAttrs.version;
+    tag = version;
     hash = "sha256-vFzOGadWR5xwhIKrKPHoAHstoeyFw4GrS5aYlpvEF5E=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) pname version src;
+    inherit pname version src;
     hash = "sha256-k6n6aWEJ/8Dkbd68CJfJ7kbRTltCuQ4AtZ5dALFD3lU=";
   };
 
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
       in the Rust 🦀 programming language. Supports hyprpaper, swaybg, mpvpaper and swww wallpaper changers.
     '';
     homepage = "https://github.com/nikolaizombie1/waytrogen";
-    changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${version}";
     license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [
       genga898
@@ -76,4 +76,4 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "waytrogen";
     platforms = lib.platforms.linux;
   };
-})
+}
diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
index 0ce9a1fd6dad..cde6a3164478 100644
--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zizmor";
-  version = "1.12.1";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "zizmorcore";
     repo = "zizmor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GnKSbcsVYzbhsrwIUAEArltzQe0IE2tiIr2CqsMQyzk=";
+    hash = "sha256-zxEF76zpqwLroC5GjSkwIC3+XdXmErvabIEqhVe0zCA=";
   };
 
-  cargoHash = "sha256-wLJlaV59sAo97KI6Ekw42aaG6hVkul1wFvcC+71+Zp4=";
+  cargoHash = "sha256-vxDyao9pX/CfS08vFmq3vXtgDIg5NXlEwpzroGW48dA=";
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     installShellFiles
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 6ec2b81493a1..25342d10ed37 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -94,4 +94,4 @@ let
 
   llvmPackages = lib.mapAttrs' (version: args: mkPackage (args // { inherit version; })) versions;
 in
-llvmPackages // { inherit mkPackage versions; }
+llvmPackages // { inherit mkPackage; }
diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index debd4dd0e90a..5980155417d0 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.10";
+  version = "1.40.9";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-XBWJ7fk+0DN8jfO6f52akkdwvGwJ6axrDfDALs82csM=";
+    hash = "sha256-nRaC/EpTUgtB3zc5iP3n7xYR8rPoTzPuxUKjzCOaemw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/click-shell/default.nix b/pkgs/development/python-modules/click-shell/default.nix
index 5f4536439d3e..fa95216a3267 100644
--- a/pkgs/development/python-modules/click-shell/default.nix
+++ b/pkgs/development/python-modules/click-shell/default.nix
@@ -5,15 +5,14 @@
   click,
   pytestCheckHook,
   pytest-click,
-  setuptools,
-  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "click-shell";
   version = "2.1";
-  pyproject = true;
+  format = "setuptools";
 
+  # PyPi release is missing tests
   src = fetchFromGitHub {
     owner = "clarkperkins";
     repo = "click-shell";
@@ -21,18 +20,17 @@ buildPythonPackage rec {
     hash = "sha256-4QpQzg0yFuOFymGiTI+A8o6LyX78iTJMqr0ernYbilI=";
   };
 
-  build-system = [ setuptools ];
-
-  dependencies = [ click ];
+  propagatedBuildInputs = [ click ];
 
   nativeCheckInputs = [
     pytest-click
     pytestCheckHook
-    writableTmpDirAsHomeHook
   ];
 
   pythonImportsCheck = [ "click_shell" ];
 
+  preCheck = "export HOME=$(mktemp -d)";
+
   meta = with lib; {
     description = "Extension to click that easily turns your click app into a shell utility";
     longDescription = ''
@@ -42,7 +40,6 @@ buildPythonPackage rec {
       with command completion to any click app.
     '';
     homepage = "https://github.com/clarkperkins/click-shell";
-    changelog = "https://github.com/clarkperkins/click-shell/releases/tag/${src.tag}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ binsky ];
   };
diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix
index 4303f4806d44..da36c1c3c865 100644
--- a/pkgs/development/python-modules/ecpy/default.nix
+++ b/pkgs/development/python-modules/ecpy/default.nix
@@ -2,21 +2,26 @@
   lib,
   fetchPypi,
   buildPythonPackage,
-  setuptools,
+  isPy3k,
+  future,
 }:
 
 buildPythonPackage rec {
   pname = "ecpy";
   version = "1.2.5";
-  pyproject = true;
+  format = "setuptools";
 
   src = fetchPypi {
     pname = "ECPy";
     inherit version;
-    hash = "sha256-ljXP+5tuz3/X9yrqFmWCmsdKHScgBtAFfUWmIariAig=";
+    sha256 = "9635cffb9b6ecf7fd7f72aea1665829ac74a1d272006d0057d45a621aae20228";
   };
 
-  build-system = [ setuptools ];
+  prePatch = ''
+    sed -i "s|reqs.append('future')|pass|" setup.py
+  '';
+
+  propagatedBuildInputs = lib.optional (!isPy3k) future;
 
   # No tests implemented
   doCheck = false;
@@ -26,8 +31,6 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Pure Pyhton Elliptic Curve Library";
     homepage = "https://github.com/ubinity/ECPy";
-    changelog = "https://github.com/cslashm/ECPy/releases/tag/${version}";
     license = licenses.asl20;
-    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix
index f1c6e76b41a3..90588f7b6864 100644
--- a/pkgs/development/python-modules/jsonargparse/default.nix
+++ b/pkgs/development/python-modules/jsonargparse/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "jsonargparse";
-  version = "4.40.2";
+  version = "4.40.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "omni-us";
     repo = "jsonargparse";
     tag = "v${version}";
-    hash = "sha256-3Zs2F46tGcvIF9UOGI/P079BZLJJyEyP9LDPRfvSk4E=";
+    hash = "sha256-GxltSN1o7vAZQXrejpBp5YMqOQaln8pqKxmGNa0vA/Q=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix
index 2b31a647eba8..0ae4dad44401 100644
--- a/pkgs/development/python-modules/model-checker/default.nix
+++ b/pkgs/development/python-modules/model-checker/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "model-checker";
-  version = "0.9.40";
+  version = "0.9.36";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "model_checker";
     inherit version;
-    hash = "sha256-8DdH9/lMPmYDQ1jLDbA0jAaAbNyUOU1q7AfCWz6LYAI=";
+    hash = "sha256-FYn8sncKHZqZvI71RUmYOChC/fXzGdaN7GsomZl7AA8=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b008de3c1a9b..15192b85519a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -402,8 +402,8 @@ rec {
       "sha256-aQR1CrCbisf0vApIjFXa5/oKC4Q1eT0AsLTg0EBojAs=";
 
   mypy-boto3-directconnect =
-    buildMypyBoto3Package "directconnect" "1.40.10"
-      "sha256-ZM9nCSSzMmRjyxnypQcaORwYXiXMXz25Gw2dJlOVcc0=";
+    buildMypyBoto3Package "directconnect" "1.40.0"
+      "sha256-UmrcCxy3zK/cEkM/KCGnr4JEMOOjhNwBNRC6IiMm+NM=";
 
   mypy-boto3-discovery =
     buildMypyBoto3Package "discovery" "1.40.0"
@@ -434,8 +434,8 @@ rec {
       "sha256-MjtEiMiKguv1RAeY4Cjk/apJlgi5jH/6avgMtdcp+2Q=";
 
   mypy-boto3-dynamodb =
-    buildMypyBoto3Package "dynamodb" "1.40.10"
-      "sha256-6mAMWQ5aEyi+TeJ9noEG4Sx5KKNmIuiBGK9QYv/xI8s=";
+    buildMypyBoto3Package "dynamodb" "1.40.0"
+      "sha256-l/ZQBqFwb3y99TrRw6mRThC1N1QZTbStEgBOynw3a04=";
 
   mypy-boto3-dynamodbstreams =
     buildMypyBoto3Package "dynamodbstreams" "1.40.0"
@@ -446,8 +446,8 @@ rec {
       "sha256-p+NFAi4x4J6S4v0f2u0awDG+lb2V7r3XwgYwl5CvhHo=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.40.10"
-      "sha256-mBpXSkz3eVzYlMqhzjVcCz+rVT21TvipBFaFAX4juHs=";
+    buildMypyBoto3Package "ec2" "1.40.8"
+      "sha256-4qoBA1iajEhB0ove45iUUEdllcGds6Y08NhgPUS9TmQ=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.40.0"
@@ -558,8 +558,8 @@ rec {
       "sha256-i76hozLLcN4Y5Jpg/92+6FSgStpw2SfF0HeRhQiRPqE=";
 
   mypy-boto3-fsx =
-    buildMypyBoto3Package "fsx" "1.40.10"
-      "sha256-E9s3Mh66bXUsy/BUPorYaOp58hkY0HpkyX3dX0OsXz4=";
+    buildMypyBoto3Package "fsx" "1.40.9"
+      "sha256-mNs8PA3GpvonrX6vwErh1muD4K2+zdr0ZWvOJP8PRjY=";
 
   mypy-boto3-gamelift =
     buildMypyBoto3Package "gamelift" "1.40.0"
@@ -574,8 +574,8 @@ rec {
       "sha256-So/NDL0KF5iypLYitnJ/38C5RovqBGXcUhHtlEMnjMM=";
 
   mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.40.10"
-      "sha256-fSPTI/S04QFRgZIK5a7gBMaewT7AqaEwuIDf2tGdGHA=";
+    buildMypyBoto3Package "glue" "1.40.5"
+      "sha256-ux3mdI2uZoWqEN7p8yvmWM8F3x8WzQUJaJK1j4fYvXE=";
 
   mypy-boto3-grafana =
     buildMypyBoto3Package "grafana" "1.40.0"
@@ -594,8 +594,8 @@ rec {
       "sha256-/LlMFYC7cJWb9C5JIt0dTEPtl2sPsalSq7mYaFSf3c4=";
 
   mypy-boto3-guardduty =
-    buildMypyBoto3Package "guardduty" "1.40.10"
-      "sha256-N1zgIPqI1eeE7ET0VDvMlqj7CQzq/gg2q2uCChZ6Q3c=";
+    buildMypyBoto3Package "guardduty" "1.40.5"
+      "sha256-yIFysk4ru4Us4azUpGVYim1j8FTQfxw/s0xmZWwSneQ=";
 
   mypy-boto3-health =
     buildMypyBoto3Package "health" "1.40.0"
@@ -866,8 +866,8 @@ rec {
       "sha256-DJEU4Ha8jpV/J8UP6emYMjcv9RfZt1njsBPD11q0BUI=";
 
   mypy-boto3-medialive =
-    buildMypyBoto3Package "medialive" "1.40.10"
-      "sha256-hGbdgOvsb+gd7640D1WeXj4tOkzuGwi8Ib/RmmQd4tY=";
+    buildMypyBoto3Package "medialive" "1.40.0"
+      "sha256-+2qM6+qeDJnvkvVI+z1EzMfGps7ejjVq4FOxOfEzJdg=";
 
   mypy-boto3-mediapackage =
     buildMypyBoto3Package "mediapackage" "1.40.0"
@@ -1246,8 +1246,8 @@ rec {
       "sha256-ET2prHzHi0EBkWB9MlmdudaaJhay5in5+rdUF0T6veE=";
 
   mypy-boto3-servicediscovery =
-    buildMypyBoto3Package "servicediscovery" "1.40.10"
-      "sha256-/Gyq9dgCjeIrNTxUqE/mvfPr+4c+Ann5+ep3/NJhrW8=";
+    buildMypyBoto3Package "servicediscovery" "1.40.0"
+      "sha256-hg/KQ7V0ej2jmLLYLmBChuxZ4IvKypMWAOs6j5zRoYY=";
 
   mypy-boto3-ses =
     buildMypyBoto3Package "ses" "1.40.0"
@@ -1426,8 +1426,8 @@ rec {
       "sha256-zApXRQ+MpzmwpQcghnoC34FaKlLQ/g8kZZUwbU0G8p8=";
 
   mypy-boto3-workspaces =
-    buildMypyBoto3Package "workspaces" "1.40.10"
-      "sha256-6PTGF3akduOS0VRS43ykcKzK25iyQb+bqvpCe+BM9Qw=";
+    buildMypyBoto3Package "workspaces" "1.40.0"
+      "sha256-LRf2JH9+Z+a1yX1TodO6ASUFY7+Ct9RLu2BS0CF3X0U=";
 
   mypy-boto3-workspaces-web =
     buildMypyBoto3Package "workspaces-web" "1.40.0"
diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix
index 3b90aaed74b4..db1d17de07ca 100644
--- a/pkgs/development/python-modules/netdisco/default.nix
+++ b/pkgs/development/python-modules/netdisco/default.nix
@@ -1,26 +1,26 @@
 {
   lib,
   buildPythonPackage,
+  isPy3k,
   fetchPypi,
-  pytestCheckHook,
   requests,
-  setuptools,
   zeroconf,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "netdisco";
   version = "3.0.0";
-  pyproject = true;
+  format = "setuptools";
+
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-TbtZBILzd8zEYeAXQnB8y+jx0tGyhXivkdybf+vNy9I=";
   };
 
-  build-system = [ setuptools ];
-
-  dependencies = [
+  propagatedBuildInputs = [
     requests
     zeroconf
   ];
diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix
index 159c0feee12b..f419359780c6 100644
--- a/pkgs/development/python-modules/nox/default.nix
+++ b/pkgs/development/python-modules/nox/default.nix
@@ -1,26 +1,17 @@
 {
   lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-
-  # build-system
-  hatchling,
-
-  # dependencies
-  attrs,
   argcomplete,
+  attrs,
+  buildPythonPackage,
   colorlog,
   dependency-groups,
+  fetchFromGitHub,
+  hatchling,
   jinja2,
   packaging,
-  tomli,
-
-  # tests
   pytestCheckHook,
-  writableTmpDirAsHomeHook,
-
-  # passthru
+  pythonOlder,
+  tomli,
   tox,
   uv,
   virtualenv,
@@ -31,7 +22,7 @@ buildPythonPackage rec {
   version = "2025.05.01";
   pyproject = true;
 
-  disabled = pythonOlder "3.12";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "wntrblm";
@@ -49,7 +40,8 @@ buildPythonPackage rec {
     dependency-groups
     packaging
     virtualenv
-  ] ++ lib.optionals (pythonOlder "3.11") [
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
     tomli
   ];
 
@@ -61,20 +53,22 @@ buildPythonPackage rec {
     uv = [ uv ];
   };
 
-  nativeCheckInputs = [
-    pytestCheckHook
-    writableTmpDirAsHomeHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
 
   pythonImportsCheck = [ "nox" ];
 
   disabledTests = [
+    # our conda is not available on 3.11
+    "test__create_venv_options"
     # Assertion errors
     "test_uv"
-    # Test requires network access
-    "test_noxfile_script_mode_url_req"
-    # Don't test CLi mode
+    # calls to naked python
     "test_noxfile_script_mode"
+    "test_noxfile_script_mode_url_req"
   ];
 
   disabledTestPaths = [
@@ -82,12 +76,12 @@ buildPythonPackage rec {
     "tests/test_tox_to_nox.py"
   ];
 
-  meta = {
+  meta = with lib; {
     description = "Flexible test automation for Python";
     homepage = "https://nox.thea.codes/";
     changelog = "https://github.com/wntrblm/nox/blob/${src.tag}/CHANGELOG.md";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
+    license = licenses.asl20;
+    maintainers = with maintainers; [
       doronbehar
       fab
     ];
diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 49edd6d8161a..a80b67cc4848 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250814";
+  version = "1.0.2.20250812";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pYOjopZlGfe28FzZmGP485l/AzqNzoW8ecft94p7q+c=";
+    hash = "sha256-y8C5Lg50epkcGR3wnSHhircKwGeY53fcommtEuLfUUM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix
index c95c9fea7ffb..b775d1b21ead 100644
--- a/pkgs/development/python-modules/pyftdi/default.nix
+++ b/pkgs/development/python-modules/pyftdi/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyftdi";
-  version = "0.57.1";
+  version = "0.56.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "eblot";
     repo = "pyftdi";
     tag = "v${version}";
-    hash = "sha256-RkZXcGvCZXmFrLvj7YqHc6FeZskEqMSQcYgizBSuwIk=";
+    hash = "sha256-/MwgBqwN7xmZepdJzyRhZflbCUpGdWEbEGGKkBnKTFI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index a6cd5f14e724..8b6b6e68627c 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -1,31 +1,32 @@
 {
   lib,
   buildPythonPackage,
-  setuptools,
+  isPy3k,
   fetchPypi,
-  unittestCheckHook,
+  python,
 }:
 
 buildPythonPackage rec {
   pname = "pyhomematic";
   version = "0.1.78";
-  pyproject = true;
+  format = "setuptools";
+
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-uB9aDa1urIwL2DBdBwPi0sHWPW7SUZ3EaAjuMLSOudc=";
   };
 
-  build-system = [ setuptools ];
-
-  nativeCheckInputs = [ unittestCheckHook ];
+  checkPhase = ''
+    ${python.interpreter} -m unittest
+  '';
 
   pythonImportsCheck = [ "pyhomematic" ];
 
   meta = with lib; {
     description = "Python 3 Interface to interact with Homematic devices";
     homepage = "https://github.com/danielperna84/pyhomematic";
-    changelog = "https://github.com/danielperna84/pyhomematic/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };
diff --git a/pkgs/development/python-modules/pynamecheap/default.nix b/pkgs/development/python-modules/pynamecheap/default.nix
index 4ab6da4a25a9..658ff62a5d26 100644
--- a/pkgs/development/python-modules/pynamecheap/default.nix
+++ b/pkgs/development/python-modules/pynamecheap/default.nix
@@ -3,35 +3,28 @@
   buildPythonPackage,
   fetchFromGitHub,
   requests,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pynamecheap";
   version = "0.0.3";
-  pyproject = true;
+  format = "setuptools";
 
-  src = fetchFromGitHub {
-    owner = "Bemmu";
-    repo = "PyNamecheap";
-    tag = "v${version}";
-    hash = "sha256-J2WYWtZGtZiox4q9tdkLyU1nix9Jn64K0+1mw7xoLLw=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [ requests ];
+  propagatedBuildInputs = [ requests ];
 
   # Tests require access to api.sandbox.namecheap.com
   doCheck = false;
 
-  pythonImportsCheck = [ "namecheap" ];
+  src = fetchFromGitHub {
+    owner = "Bemmu";
+    repo = "PyNamecheap";
+    rev = "v${version}";
+    sha256 = "1g1cd2yc6rpdsc5ax7s93y5nfkf91gcvbgcaqyl9ida6srd9hr97";
+  };
 
   meta = with lib; {
     description = "Namecheap API client in Python";
     homepage = "https://github.com/Bemmu/PyNamecheap";
-    changelog = "https://github.com/Bemmu/PyNamecheap/releases/tag/${src.tag}";
     license = licenses.mit;
-    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pynanoleaf/default.nix b/pkgs/development/python-modules/pynanoleaf/default.nix
index 113818784680..892900c118ba 100644
--- a/pkgs/development/python-modules/pynanoleaf/default.nix
+++ b/pkgs/development/python-modules/pynanoleaf/default.nix
@@ -2,23 +2,23 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  isPy3k,
   requests,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pynanoleaf";
   version = "0.1.1";
-  pyproject = true;
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MqCDdZxPmeAZ4AE2cEh4Qfjt+AfHoHdCqXH6GHBwcqc=";
+    sha256 = "32a083759c4f99e019e0013670487841f8edf807c7a07742a971fa18707072a7";
   };
 
-  build-system = [ setuptools ];
+  disabled = !isPy3k;
 
-  dependencies = [ requests ];
+  propagatedBuildInputs = [ requests ];
 
   # pynanoleaf does not contain tests
   doCheck = false;
@@ -26,9 +26,8 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "pynanoleaf" ];
 
   meta = with lib; {
-    description = "Python3 wrapper for the Nanoleaf API, capable of controlling both Nanoleaf Aurora and Nanoleaf Canvas";
     homepage = "https://github.com/Oro/pynanoleaf";
-    changelog = "https://github.com/Oro/pynanoleaf/releases/tag/${version}";
+    description = "Python3 wrapper for the Nanoleaf API, capable of controlling both Nanoleaf Aurora and Nanoleaf Canvas";
     license = licenses.mit;
     maintainers = with maintainers; [ oro ];
   };
diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix
index 2f1dff47901a..709a4746c8c9 100644
--- a/pkgs/development/python-modules/sqlfmt/default.nix
+++ b/pkgs/development/python-modules/sqlfmt/default.nix
@@ -5,14 +5,15 @@
   click,
   fetchFromGitHub,
   gitpython,
+  importlib-metadata,
   jinja2,
   platformdirs,
   poetry-core,
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
+  tomli,
   tqdm,
-  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
@@ -20,7 +21,7 @@ buildPythonPackage rec {
   version = "0.27.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.12";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "tconbeer";
@@ -29,12 +30,16 @@ buildPythonPackage rec {
     hash = "sha256-Yel9SB7KrDqtuZxNx4omz6u4AID8Fk5kFYKBEZD1fuU=";
   };
 
+  pythonRelaxDeps = [ "platformdirs" ];
+
   build-system = [ poetry-core ];
 
   dependencies = [
     click
+    importlib-metadata
     jinja2
     platformdirs
+    tomli
     tqdm
   ];
 
@@ -46,11 +51,11 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
-    writableTmpDirAsHomeHook
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
+    export HOME=$(mktemp -d)
     export PATH="$PATH:$out/bin";
   '';
 
diff --git a/pkgs/development/python-modules/sunwatcher/default.nix b/pkgs/development/python-modules/sunwatcher/default.nix
index 9729093eec66..0fcac2bfb205 100644
--- a/pkgs/development/python-modules/sunwatcher/default.nix
+++ b/pkgs/development/python-modules/sunwatcher/default.nix
@@ -4,22 +4,21 @@
   fetchPypi,
   pythonOlder,
   requests,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "sunwatcher";
   version = "0.2.1";
-  pyproject = true;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-u0vHCw0h0h6pgadBLPBSwv/4CXNj+3HIJCEtt2rdlWs=";
+    sha256 = "0swmvmmbfb914k473yv3fc4zizy2abq2qhd7h6lixli11l5wfjxv";
   };
 
-  build-system = [ setuptools ];
-
-  dependencies = [ requests ];
+  propagatedBuildInputs = [ requests ];
 
   # Project has no tests
   doCheck = false;
@@ -29,7 +28,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module for the SolarLog HTTP API";
     homepage = "https://bitbucket.org/Lavode/sunwatcher/src/master/";
-    license = licenses.asl20;
+    license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index c41b632b38db..c093af2656fe 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1444";
+  version = "3.0.1443";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-nuB6OYFDHfqhKFti96YAt6BYrdIqm357YPHm0mT90uY=";
+    hash = "sha256-2M5lLjKd60xiSoxoJ9W34DkwCDKrSTbuif7ZP3NxjRI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix
index af3444f39a1d..ae02585f8ba0 100644
--- a/pkgs/development/python-modules/timetagger/default.nix
+++ b/pkgs/development/python-modules/timetagger/default.nix
@@ -12,16 +12,17 @@
   pscript,
   pyjwt,
   pytestCheckHook,
+  pythonOlder,
   requests,
-  setuptools,
   uvicorn,
-  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "timetagger";
   version = "25.06.1";
-  pyproject = true;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "almarklein";
@@ -30,9 +31,7 @@ buildPythonPackage rec {
     hash = "sha256-fuZj4DoqtgIcRd/u7l0GsWqmuLEgF3BW5gN5wY8FdK0=";
   };
 
-  build-system = [ setuptools ];
-
-  dependencies = [
+  propagatedBuildInputs = [
     asgineer
     bcrypt
     iptools
@@ -44,21 +43,22 @@ buildPythonPackage rec {
     uvicorn
   ];
 
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
   nativeCheckInputs = [
     nodejs
     pytestCheckHook
     requests
-    writableTmpDirAsHomeHook
   ];
 
-  pythonImportsCheck = [ "timetagger" ];
-
-  meta = {
+  meta = with lib; {
     description = "Library to interact with TimeTagger";
+    mainProgram = "timetagger";
     homepage = "https://github.com/almarklein/timetagger";
     changelog = "https://github.com/almarklein/timetagger/releases/tag/${src.tag}";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ matthiasbeyer ];
-    mainProgram = "timetagger";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ matthiasbeyer ];
   };
 }
diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix
index 79c4f1060722..4e10e0144243 100644
--- a/pkgs/development/python-modules/vultr/default.nix
+++ b/pkgs/development/python-modules/vultr/default.nix
@@ -3,24 +3,21 @@
   buildPythonPackage,
   fetchFromGitHub,
   requests,
-  setuptools,
 }:
 
 buildPythonPackage rec {
-  pname = "vultr";
   version = "1.0.1";
-  pyproject = true;
+  format = "setuptools";
+  pname = "vultr";
 
   src = fetchFromGitHub {
     owner = "spry-group";
     repo = "python-vultr";
-    tag = "v${version}";
-    hash = "sha256-ByPtIU6Yro28nH2cIzxqgZR0VwpggCsOAXVDBhssjAI=";
+    rev = "v${version}";
+    sha256 = "00lc5hdhchvm0472p03019bp9541d8y2773xkjy8vblq9qhys8q7";
   };
 
-  build-system = [ setuptools ];
-
-  dependencies = [ requests ];
+  propagatedBuildInputs = [ requests ];
 
   # Tests disabled. They fail because they try to access the network
   doCheck = false;
@@ -30,7 +27,6 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Vultr.com API Client";
     homepage = "https://github.com/spry-group/python-vultr";
-    changelog = "https://github.com/spry-group/python-vultr/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ lihop ];
   };
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index dece0210839e..e4ece30ec374 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix args {
-  version = "1.29.1";
-  hash = "sha256-xYn35+2AHdvZBK+/PeJq4k6wzOJ8dxei6U33+xLWrSc=";
+  version = "1.27.5";
+  hash = "sha256-6WrOu5wqbbigAMPdGzLsuhuBDwzVhiMtTZIeN2Z03Q4=";
 }
diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix
index 57584d390e71..5cbd2033445e 100644
--- a/pkgs/servers/spicedb/default.nix
+++ b/pkgs/servers/spicedb/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "spicedb";
-  version = "1.45.2";
+  version = "1.45.1";
 
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "spicedb";
     rev = "v${version}";
-    hash = "sha256-LDAZdcUfrCWtld6V4GDpAbK+BeT/aeVOQ7G++sMoXU4=";
+    hash = "sha256-cKCAA9C0vsCa0BszspvPfrKbdWyaccrMtiO6UWhLIh4=";
   };
 
-  vendorHash = "sha256-hr+xIfPjlrH9igRsYeqNOPgx/jWhDfu73gA+/NoWWxI=";
+  vendorHash = "sha256-R4lOmHIBgnlvOukMjXdVx5e9Oneo1EizhsrDXiTbwTc=";
 
   ldflags = [
     "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'"
diff --git a/pkgs/tools/filesystems/kdiskmark/default.nix b/pkgs/tools/filesystems/kdiskmark/default.nix
index c401567ed9b4..2f9f09fdc9d3 100644
--- a/pkgs/tools/filesystems/kdiskmark/default.nix
+++ b/pkgs/tools/filesystems/kdiskmark/default.nix
@@ -6,19 +6,19 @@
   qttools,
   fio,
   cmake,
-  polkit-qt-1,
+  polkit-qt,
   extra-cmake-modules,
   fetchFromGitHub,
 }:
 stdenv.mkDerivation rec {
   pname = "kdiskmark";
-  version = "3.2.0";
+  version = "3.1.4";
 
   src = fetchFromGitHub {
     owner = "jonmagon";
     repo = "kdiskmark";
     rev = version;
-    hash = "sha256-b42PNUrG10RyGct6dPtdT89oO222tEovkSPoRcROfaQ=";
+    hash = "sha256-JueY7zw9PIo9ETi7pQLpw8FGRhNXYXeXEvTzZGz9lbw=";
     fetchSubmodules = true;
   };
 
@@ -31,12 +31,12 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qtbase
     qttools
-    polkit-qt-1
+    polkit-qt
   ];
 
   preConfigure = ''
     substituteInPlace CMakeLists.txt \
-      --replace-fail \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions
+      --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions
   '';
 
   qtWrapperArgs = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0a3149dc8e58..6c16ca998d68 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -944,7 +944,6 @@ mapAliases {
   imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17
   imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17
   imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17
-  imaginer = throw "'imaginer' has been removed due to lack of upstream maintenance"; # Added 2025-08-15
   immersed-vr = lib.warnOnInstantiate "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11
   inconsolata-nerdfont = lib.warnOnInstantiate "inconsolata-nerdfont is redundant. Use nerd-fonts.inconsolata instead." nerd-fonts.inconsolata; # Added 2024-11-10
   incrtcl = tclPackages.incrtcl; # Added 2024-10-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68b02054a5b1..c811127b372a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3354,7 +3354,7 @@ with pkgs;
 
   kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { };
 
-  kdiskmark = kdePackages.callPackage ../tools/filesystems/kdiskmark { };
+  kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { };
 
   keepkey-agent = with python3Packages; toPythonApplication keepkey-agent;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 956fa827aa21..2527a039b70f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30,573 +30,1106 @@ self: super: with self; {
   # by_regex ensures inherit statements are sorted after the (first) attribute name that is inherited.
   # keep-sorted start block=yes newline_separated=yes by_regex=["(?:inherit\\s+\\([^)]+\\)\\n?\\s*)?(.+)"]
   a2wsgi = callPackage ../development/python-modules/a2wsgi { };
+
   aafigure = callPackage ../development/python-modules/aafigure { };
+
   aardwolf = callPackage ../development/python-modules/aardwolf { };
+
   abjad = callPackage ../development/python-modules/abjad { };
+
   about-time = callPackage ../development/python-modules/about-time { };
+
   absl-py = callPackage ../development/python-modules/absl-py { };
+
   accelerate = callPackage ../development/python-modules/accelerate { };
+
   accessible-pygments = callPackage ../development/python-modules/accessible-pygments { };
+
   accupy = callPackage ../development/python-modules/accupy { };
+
   accuweather = callPackage ../development/python-modules/accuweather { };
+
   acme = callPackage ../development/python-modules/acme { };
+
   acme-tiny = callPackage ../development/python-modules/acme-tiny { };
+
   acquire = callPackage ../development/python-modules/acquire { };
+
   acres = callPackage ../development/python-modules/acres { };
+
   actdiag = callPackage ../development/python-modules/actdiag { };
+
   acunetix = callPackage ../development/python-modules/acunetix { };
+
   adafruit-board-toolkit = callPackage ../development/python-modules/adafruit-board-toolkit { };
+
   adafruit-io = callPackage ../development/python-modules/adafruit-io { };
+
   adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { };
+
   adafruit-pureio = callPackage ../development/python-modules/adafruit-pureio { };
+
   adal = callPackage ../development/python-modules/adal { };
+
   adax = callPackage ../development/python-modules/adax { };
+
   adax-local = callPackage ../development/python-modules/adax-local { };
+
   adb-enhanced = callPackage ../development/python-modules/adb-enhanced { };
+
   adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { };
+
   adb-shell = callPackage ../development/python-modules/adb-shell { };
+
   adblock = callPackage ../development/python-modules/adblock { };
+
   add-trailing-comma = callPackage ../development/python-modules/add-trailing-comma { };
+
   addict = callPackage ../development/python-modules/addict { };
+
   adext = callPackage ../development/python-modules/adext { };
+
   adguardhome = callPackage ../development/python-modules/adguardhome { };
+
   adios2 = toPythonModule (
     pkgs.adios2.override {
       python3Packages = self;
       pythonSupport = true;
     }
   );
+
   adjusttext = callPackage ../development/python-modules/adjusttext { };
+
   adlfs = callPackage ../development/python-modules/adlfs { };
+
   advantage-air = callPackage ../development/python-modules/advantage-air { };
+
   advocate = callPackage ../development/python-modules/advocate { };
+
   aeidon = callPackage ../development/python-modules/aeidon { };
+
   aemet-opendata = callPackage ../development/python-modules/aemet-opendata { };
+
   aenum = callPackage ../development/python-modules/aenum { };
+
   aerosandbox = callPackage ../development/python-modules/aerosandbox { };
+
   aesedb = callPackage ../development/python-modules/aesedb { };
+
   aetcd = callPackage ../development/python-modules/aetcd { };
+
   afdko = callPackage ../development/python-modules/afdko { };
+
   affine = callPackage ../development/python-modules/affine { };
+
   afsapi = callPackage ../development/python-modules/afsapi { };
+
   agate = callPackage ../development/python-modules/agate { };
+
   agate-dbf = callPackage ../development/python-modules/agate-dbf { };
+
   agate-excel = callPackage ../development/python-modules/agate-excel { };
+
   agate-sql = callPackage ../development/python-modules/agate-sql { };
+
   agent-py = callPackage ../development/python-modules/agent-py { };
+
   aggdraw = callPackage ../development/python-modules/aggdraw { };
+
   aggregate6 = callPackage ../development/python-modules/aggregate6 { };
+
   ago = callPackage ../development/python-modules/ago { };
+
   ahocorapy = callPackage ../development/python-modules/ahocorapy { };
+
   ahocorasick-rs = callPackage ../development/python-modules/ahocorasick-rs { };
+
   aigpy = callPackage ../development/python-modules/aigpy { };
+
   ailment = callPackage ../development/python-modules/ailment { };
+
   aio-geojson-client = callPackage ../development/python-modules/aio-geojson-client { };
+
   aio-geojson-generic-client =
     callPackage ../development/python-modules/aio-geojson-generic-client
       { };
+
   aio-geojson-geonetnz-quakes =
     callPackage ../development/python-modules/aio-geojson-geonetnz-quakes
       { };
+
   aio-geojson-geonetnz-volcano =
     callPackage ../development/python-modules/aio-geojson-geonetnz-volcano
       { };
+
   aio-geojson-nsw-rfs-incidents =
     callPackage ../development/python-modules/aio-geojson-nsw-rfs-incidents
       { };
+
   aio-geojson-usgs-earthquakes =
     callPackage ../development/python-modules/aio-geojson-usgs-earthquakes
       { };
+
   aio-georss-client = callPackage ../development/python-modules/aio-georss-client { };
+
   aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { };
+
   aio-pika = callPackage ../development/python-modules/aio-pika { };
+
   aioacaia = callPackage ../development/python-modules/aioacaia { };
+
   aioairctrl = callPackage ../development/python-modules/aioairctrl { };
+
   aioairq = callPackage ../development/python-modules/aioairq { };
+
   aioairzone = callPackage ../development/python-modules/aioairzone { };
+
   aioairzone-cloud = callPackage ../development/python-modules/aioairzone-cloud { };
+
   aioamazondevices = callPackage ../development/python-modules/aioamazondevices { };
+
   aioambient = callPackage ../development/python-modules/aioambient { };
+
   aioamqp = callPackage ../development/python-modules/aioamqp { };
+
   aioapcaccess = callPackage ../development/python-modules/aioapcaccess { };
+
   aioapns = callPackage ../development/python-modules/aioapns { };
+
   aioaquacell = callPackage ../development/python-modules/aioaquacell { };
+
   aioaseko = callPackage ../development/python-modules/aioaseko { };
+
   aioasuswrt = callPackage ../development/python-modules/aioasuswrt { };
+
   aioaudiobookshelf = callPackage ../development/python-modules/aioaudiobookshelf { };
+
   aioautomower = callPackage ../development/python-modules/aioautomower { };
+
   aioazuredevops = callPackage ../development/python-modules/aioazuredevops { };
+
   aiobafi6 = callPackage ../development/python-modules/aiobafi6 { };
+
   aiobiketrax = callPackage ../development/python-modules/aiobiketrax { };
+
   aioblescan = callPackage ../development/python-modules/aioblescan { };
+
   aioboto3 = callPackage ../development/python-modules/aioboto3 { };
+
   aiobotocore = callPackage ../development/python-modules/aiobotocore { };
+
   aiobroadlink = callPackage ../development/python-modules/aiobroadlink { };
+
   aiobtclientapi = callPackage ../development/python-modules/aiobtclientapi { };
+
   aiobtclientrpc = callPackage ../development/python-modules/aiobtclientrpc { };
+
   aiocache = callPackage ../development/python-modules/aiocache { };
+
   aiocmd = callPackage ../development/python-modules/aiocmd { };
+
   aiocoap = callPackage ../development/python-modules/aiocoap { };
+
   aiocomelit = callPackage ../development/python-modules/aiocomelit { };
+
   aioconsole = callPackage ../development/python-modules/aioconsole { };
+
   aiocontextvars = callPackage ../development/python-modules/aiocontextvars { };
+
   aiocron = callPackage ../development/python-modules/aiocron { };
+
   aiocsv = callPackage ../development/python-modules/aiocsv { };
+
   aiocurrencylayer = callPackage ../development/python-modules/aiocurrencylayer { };
+
   aiodhcpwatcher = callPackage ../development/python-modules/aiodhcpwatcher { };
+
   aiodiscover = callPackage ../development/python-modules/aiodiscover { };
+
   aiodns = callPackage ../development/python-modules/aiodns { };
+
   aiodocker = callPackage ../development/python-modules/aiodocker { };
+
   aiodukeenergy = callPackage ../development/python-modules/aiodukeenergy { };
+
   aioeafm = callPackage ../development/python-modules/aioeafm { };
+
   aioeagle = callPackage ../development/python-modules/aioeagle { };
+
   aioecowitt = callPackage ../development/python-modules/aioecowitt { };
+
   aioelectricitymaps = callPackage ../development/python-modules/aioelectricitymaps { };
+
   aioemonitor = callPackage ../development/python-modules/aioemonitor { };
+
   aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { };
+
   aioextensions = callPackage ../development/python-modules/aioextensions { };
+
   aiofile = callPackage ../development/python-modules/aiofile { };
+
   aiofiles = callPackage ../development/python-modules/aiofiles { };
+
   aioflo = callPackage ../development/python-modules/aioflo { };
+
   aioftp = callPackage ../development/python-modules/aioftp { };
+
   aiogithubapi = callPackage ../development/python-modules/aiogithubapi { };
+
   aiogram = callPackage ../development/python-modules/aiogram { };
+
   aioguardian = callPackage ../development/python-modules/aioguardian { };
+
   aiohappyeyeballs = callPackage ../development/python-modules/aiohappyeyeballs { };
+
   aioharmony = callPackage ../development/python-modules/aioharmony { };
+
   aiohasupervisor = callPackage ../development/python-modules/aiohasupervisor { };
+
   aiohomeconnect = callPackage ../development/python-modules/aiohomeconnect { };
+
   aiohomekit = callPackage ../development/python-modules/aiohomekit { };
+
   aiohttp = callPackage ../development/python-modules/aiohttp { };
+
   aiohttp-apispec = callPackage ../development/python-modules/aiohttp-apispec { };
+
   aiohttp-asyncmdnsresolver = callPackage ../development/python-modules/aiohttp-asyncmdnsresolver { };
+
   aiohttp-basicauth = callPackage ../development/python-modules/aiohttp-basicauth { };
+
   aiohttp-client-cache = callPackage ../development/python-modules/aiohttp-client-cache { };
+
   aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { };
+
   aiohttp-fast-zlib = callPackage ../development/python-modules/aiohttp-fast-zlib { };
+
   aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };
+
   aiohttp-middlewares = callPackage ../development/python-modules/aiohttp-middlewares { };
+
   aiohttp-oauthlib = callPackage ../development/python-modules/aiohttp-oauthlib { };
+
   aiohttp-openmetrics = callPackage ../development/python-modules/aiohttp-openmetrics { };
+
   aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { };
+
   aiohttp-retry = callPackage ../development/python-modules/aiohttp-retry { };
+
   aiohttp-session = callPackage ../development/python-modules/aiohttp-session { };
+
   aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { };
+
   aiohttp-sse = callPackage ../development/python-modules/aiohttp-sse { };
+
   aiohttp-sse-client = callPackage ../development/python-modules/aiohttp-sse-client { };
+
   aiohttp-sse-client2 = callPackage ../development/python-modules/aiohttp-sse-client2 { };
+
   aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { };
+
   aiohttp-utils = callPackage ../development/python-modules/aiohttp-utils { };
+
   aiohttp-wsgi = callPackage ../development/python-modules/aiohttp-wsgi { };
+
   aiohue = callPackage ../development/python-modules/aiohue { };
+
   aiohwenergy = callPackage ../development/python-modules/aiohwenergy { };
+
   aioimaplib = callPackage ../development/python-modules/aioimaplib { };
+
   aioimmich = callPackage ../development/python-modules/aioimmich { };
+
   aioinflux = callPackage ../development/python-modules/aioinflux { };
+
   aioitertools = callPackage ../development/python-modules/aioitertools { };
+
   aiojellyfin = callPackage ../development/python-modules/aiojellyfin { };
+
   aiojobs = callPackage ../development/python-modules/aiojobs { };
+
   aiokafka = callPackage ../development/python-modules/aiokafka { };
+
   aiokef = callPackage ../development/python-modules/aiokef { };
+
   aiokem = callPackage ../development/python-modules/aiokem { };
+
   aiolifx = callPackage ../development/python-modules/aiolifx { };
+
   aiolifx-connection = callPackage ../development/python-modules/aiolifx-connection { };
+
   aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { };
+
   aiolifx-themes = callPackage ../development/python-modules/aiolifx-themes { };
+
   aiolimiter = callPackage ../development/python-modules/aiolimiter { };
+
   aiolookin = callPackage ../development/python-modules/aiolookin { };
+
   aiolyric = callPackage ../development/python-modules/aiolyric { };
+
   aiomcache = callPackage ../development/python-modules/aiomcache { };
+
   aiomealie = callPackage ../development/python-modules/aiomealie { };
+
   aiomisc = callPackage ../development/python-modules/aiomisc { };
+
   aiomisc-pytest = callPackage ../development/python-modules/aiomisc-pytest { };
+
   aiomodernforms = callPackage ../development/python-modules/aiomodernforms { };
+
   aiomqtt = callPackage ../development/python-modules/aiomqtt { };
+
   aiomultiprocess = callPackage ../development/python-modules/aiomultiprocess { };
+
   aiomusiccast = callPackage ../development/python-modules/aiomusiccast { };
+
   aiomysql = callPackage ../development/python-modules/aiomysql { };
+
   aionanoleaf = callPackage ../development/python-modules/aionanoleaf { };
+
   aionotion = callPackage ../development/python-modules/aionotion { };
+
   aiontfy = callPackage ../development/python-modules/aiontfy { };
+
   aionut = callPackage ../development/python-modules/aionut { };
+
   aiooncue = callPackage ../development/python-modules/aiooncue { };
+
   aioonkyo = callPackage ../development/python-modules/aioonkyo { };
+
   aioopenexchangerates = callPackage ../development/python-modules/aioopenexchangerates { };
+
   aioopenssl = callPackage ../development/python-modules/aioopenssl { };
+
   aiooss2 = callPackage ../development/python-modules/aiooss2 { };
+
   aiooui = callPackage ../development/python-modules/aiooui { };
+
   aiopegelonline = callPackage ../development/python-modules/aiopegelonline { };
+
   aiopg = callPackage ../development/python-modules/aiopg { };
+
   aiopinboard = callPackage ../development/python-modules/aiopinboard { };
+
   aioprocessing = callPackage ../development/python-modules/aioprocessing { };
+
   aioprometheus = callPackage ../development/python-modules/aioprometheus { };
+
   aiopulse = callPackage ../development/python-modules/aiopulse { };
+
   aiopurpleair = callPackage ../development/python-modules/aiopurpleair { };
+
   aiopvapi = callPackage ../development/python-modules/aiopvapi { };
+
   aiopvpc = callPackage ../development/python-modules/aiopvpc { };
+
   aiopyarr = callPackage ../development/python-modules/aiopyarr { };
+
   aiopylgtv = callPackage ../development/python-modules/aiopylgtv { };
+
   aioqsw = callPackage ../development/python-modules/aioqsw { };
+
   aioquic = callPackage ../development/python-modules/aioquic { };
+
   aioraven = callPackage ../development/python-modules/aioraven { };
+
   aiorecollect = callPackage ../development/python-modules/aiorecollect { };
+
   aioredis = callPackage ../development/python-modules/aioredis { };
+
   aioresponses = callPackage ../development/python-modules/aioresponses { };
+
   aioridwell = callPackage ../development/python-modules/aioridwell { };
+
   aiormq = callPackage ../development/python-modules/aiormq { };
+
   aiorpcx = callPackage ../development/python-modules/aiorpcx { };
+
   aiortm = callPackage ../development/python-modules/aiortm { };
+
   aiortsp = callPackage ../development/python-modules/aiortsp { };
+
   aioruckus = callPackage ../development/python-modules/aioruckus { };
+
   aiorun = callPackage ../development/python-modules/aiorun { };
+
   aiorussound = callPackage ../development/python-modules/aiorussound { };
+
   aioruuvigateway = callPackage ../development/python-modules/aioruuvigateway { };
+
   aiorwlock = callPackage ../development/python-modules/aiorwlock { };
+
   aiosasl = callPackage ../development/python-modules/aiosasl { };
+
   aiosenz = callPackage ../development/python-modules/aiosenz { };
+
   aioserial = callPackage ../development/python-modules/aioserial { };
+
   aioshelly = callPackage ../development/python-modules/aioshelly { };
+
   aioshutil = callPackage ../development/python-modules/aioshutil { };
+
   aiosignal = callPackage ../development/python-modules/aiosignal { };
+
   aioskybell = callPackage ../development/python-modules/aioskybell { };
+
   aioslimproto = callPackage ../development/python-modules/aioslimproto { };
+
   aiosmb = callPackage ../development/python-modules/aiosmb { };
+
   aiosmtpd = callPackage ../development/python-modules/aiosmtpd { };
+
   aiosmtplib = callPackage ../development/python-modules/aiosmtplib { };
+
   aiosolaredge = callPackage ../development/python-modules/aiosolaredge { };
+
   aiosomecomfort = callPackage ../development/python-modules/aiosomecomfort { };
+
   aiosonic = callPackage ../development/python-modules/aiosonic { };
+
   aiosonos = callPackage ../development/python-modules/aiosonos { };
+
   aiosql = callPackage ../development/python-modules/aiosql { };
+
   aiosqlite = callPackage ../development/python-modules/aiosqlite { };
+
   aiosseclient = callPackage ../development/python-modules/aiosseclient { };
+
   aiosteamist = callPackage ../development/python-modules/aiosteamist { };
+
   aiostream = callPackage ../development/python-modules/aiostream { };
+
   aiostreammagic = callPackage ../development/python-modules/aiostreammagic { };
+
   aioswitcher = callPackage ../development/python-modules/aioswitcher { };
+
   aiosyncthing = callPackage ../development/python-modules/aiosyncthing { };
+
   aiotankerkoenig = callPackage ../development/python-modules/aiotankerkoenig { };
+
   aiotarfile = callPackage ../development/python-modules/aiotarfile { };
+
   aiotedee = callPackage ../development/python-modules/aiotedee { };
+
   aiotractive = callPackage ../development/python-modules/aiotractive { };
+
   aiounifi = callPackage ../development/python-modules/aiounifi { };
+
   aiounittest = callPackage ../development/python-modules/aiounittest { };
+
   aiousbwatcher = callPackage ../development/python-modules/aiousbwatcher { };
+
   aiovlc = callPackage ../development/python-modules/aiovlc { };
+
   aiovodafone = callPackage ../development/python-modules/aiovodafone { };
+
   aiowaqi = callPackage ../development/python-modules/aiowaqi { };
+
   aiowatttime = callPackage ../development/python-modules/aiowatttime { };
+
   aiowebdav2 = callPackage ../development/python-modules/aiowebdav2 { };
+
   aiowebostv = callPackage ../development/python-modules/aiowebostv { };
+
   aioweenect = callPackage ../development/python-modules/aioweenect { };
+
   aiowinreg = callPackage ../development/python-modules/aiowinreg { };
+
   aiowithings = callPackage ../development/python-modules/aiowithings { };
+
   aiowmi = callPackage ../development/python-modules/aiowmi { };
+
   aioxmpp = callPackage ../development/python-modules/aioxmpp { };
+
   aioymaps = callPackage ../development/python-modules/aioymaps { };
+
   aiozeroconf = callPackage ../development/python-modules/aiozeroconf { };
+
   aiozoneinfo = callPackage ../development/python-modules/aiozoneinfo { };
+
   airgradient = callPackage ../development/python-modules/airgradient { };
+
   airium = callPackage ../development/python-modules/airium { };
+
   airly = callPackage ../development/python-modules/airly { };
+
   airos = callPackage ../development/python-modules/airos { };
+
   airportsdata = callPackage ../development/python-modules/airportsdata { };
+
   airthings-ble = callPackage ../development/python-modules/airthings-ble { };
+
   airthings-cloud = callPackage ../development/python-modules/airthings-cloud { };
+
   airtouch4pyapi = callPackage ../development/python-modules/airtouch4pyapi { };
+
   airtouch5py = callPackage ../development/python-modules/airtouch5py { };
+
   ajpy = callPackage ../development/python-modules/ajpy { };
+
   ajsonrpc = callPackage ../development/python-modules/ajsonrpc { };
+
   alabaster = callPackage ../development/python-modules/alabaster { };
+
   aladdin-connect = callPackage ../development/python-modules/aladdin-connect { };
+
   alarmdecoder = callPackage ../development/python-modules/alarmdecoder { };
+
   albucore = callPackage ../development/python-modules/albucore { };
+
   albumentations = callPackage ../development/python-modules/albumentations { };
+
   ale-py = callPackage ../development/python-modules/ale-py { };
+
   alectryon = callPackage ../development/python-modules/alectryon { };
+
   alembic = callPackage ../development/python-modules/alembic { };
+
   alexapy = callPackage ../development/python-modules/alexapy { };
+
   algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { };
+
   aligator = toPythonModule (
     pkgs.aligator.override {
       python3Packages = self;
       pythonSupport = true;
     }
   );
+
   alive-progress = callPackage ../development/python-modules/alive-progress { };
+
   aliyun-python-sdk-cdn = callPackage ../development/python-modules/aliyun-python-sdk-cdn { };
+
   aliyun-python-sdk-config = callPackage ../development/python-modules/aliyun-python-sdk-config { };
+
   aliyun-python-sdk-core = callPackage ../development/python-modules/aliyun-python-sdk-core { };
+
   aliyun-python-sdk-dbfs = callPackage ../development/python-modules/aliyun-python-sdk-dbfs { };
+
   aliyun-python-sdk-iot = callPackage ../development/python-modules/aliyun-python-sdk-iot { };
+
   aliyun-python-sdk-kms = callPackage ../development/python-modules/aliyun-python-sdk-kms { };
+
   aliyun-python-sdk-sts = callPackage ../development/python-modules/aliyun-python-sdk-sts { };
+
   allantools = callPackage ../development/python-modules/allantools { };
+
   allpairspy = callPackage ../development/python-modules/allpairspy { };
+
   allure-behave = callPackage ../development/python-modules/allure-behave { };
+
   allure-pytest = callPackage ../development/python-modules/allure-pytest { };
+
   allure-python-commons = callPackage ../development/python-modules/allure-python-commons { };
+
   allure-python-commons-test =
     callPackage ../development/python-modules/allure-python-commons-test
       { };
+
   alpha-vantage = callPackage ../development/python-modules/alpha-vantage { };
+
   altair = callPackage ../development/python-modules/altair { };
+
   altcha = callPackage ../development/python-modules/altcha { };
+
   altgraph = callPackage ../development/python-modules/altgraph { };
+
   altruistclient = callPackage ../development/python-modules/altruistclient { };
+
   amaranth = callPackage ../development/python-modules/amaranth { };
+
   amaranth-boards = callPackage ../development/python-modules/amaranth-boards { };
+
   amaranth-soc = callPackage ../development/python-modules/amaranth-soc { };
+
   amarna = callPackage ../development/python-modules/amarna { };
+
   amazon-ion = callPackage ../development/python-modules/amazon-ion { };
+
   amazon-kclpy = callPackage ../development/python-modules/amazon-kclpy { };
+
   amberelectric = callPackage ../development/python-modules/amberelectric { };
+
   amcrest = callPackage ../development/python-modules/amcrest { };
+
   ament-package = callPackage ../development/python-modules/ament-package { };
+
   amply = callPackage ../development/python-modules/amply { };
+
   amqp = callPackage ../development/python-modules/amqp { };
+
   amqplib = callPackage ../development/python-modules/amqplib { };
+
   amqtt = callPackage ../development/python-modules/amqtt { };
+
   amshan = callPackage ../development/python-modules/amshan { };
+
   anchor-kr = callPackage ../development/python-modules/anchor-kr { };
+
   ancp-bids = callPackage ../development/python-modules/ancp-bids { };
+
   androguard = callPackage ../development/python-modules/androguard { };
+
   android-backup = callPackage ../development/python-modules/android-backup { };
+
   androidtv = callPackage ../development/python-modules/androidtv { };
+
   androidtvremote2 = callPackage ../development/python-modules/androidtvremote2 { };
+
   anel-pwrctrl-homeassistant =
     callPackage ../development/python-modules/anel-pwrctrl-homeassistant
       { };
+
   angr = callPackage ../development/python-modules/angr { };
+
   angrcli = callPackage ../development/python-modules/angrcli { inherit (pkgs) coreutils; };
+
   angrop = callPackage ../development/python-modules/angrop { };
+
   aniso8601 = callPackage ../development/python-modules/aniso8601 { };
+
   anitopy = callPackage ../development/python-modules/anitopy { };
+
   anndata = callPackage ../development/python-modules/anndata { };
+
   annexremote = callPackage ../development/python-modules/annexremote { };
+
   annotated-types = callPackage ../development/python-modules/annotated-types { };
+
   annotatedyaml = callPackage ../development/python-modules/annotatedyaml { };
+
   annoy = callPackage ../development/python-modules/annoy { };
+
   anonip = callPackage ../development/python-modules/anonip { };
+
   anonymizeip = callPackage ../development/python-modules/anonymizeip { };
+
   anova-wifi = callPackage ../development/python-modules/anova-wifi { };
+
   ansi = callPackage ../development/python-modules/ansi { };
+
   ansi2html = callPackage ../development/python-modules/ansi2html { };
+
   ansi2image = callPackage ../development/python-modules/ansi2image { };
+
   ansible = callPackage ../development/python-modules/ansible { };
+
   ansible-builder = callPackage ../development/python-modules/ansible-builder {
     inherit (pkgs) podman;
   };
+
   ansible-compat = callPackage ../development/python-modules/ansible-compat { };
+
   ansible-core = callPackage ../development/python-modules/ansible/core.nix { };
+
   ansible-kernel = callPackage ../development/python-modules/ansible-kernel { };
+
   ansible-pylibssh = callPackage ../development/python-modules/ansible-pylibssh { };
+
   ansible-runner = callPackage ../development/python-modules/ansible-runner { };
+
   ansible-vault-rw = callPackage ../development/python-modules/ansible-vault-rw { };
+
   ansicolor = callPackage ../development/python-modules/ansicolor { };
+
   ansicolors = callPackage ../development/python-modules/ansicolors { };
+
   ansiconv = callPackage ../development/python-modules/ansiconv { };
+
   ansimarkup = callPackage ../development/python-modules/ansimarkup { };
+
   ansitable = callPackage ../development/python-modules/ansitable { };
+
   ansiwrap = callPackage ../development/python-modules/ansiwrap { };
+
   anthemav = callPackage ../development/python-modules/anthemav { };
+
   anthropic = callPackage ../development/python-modules/anthropic { };
+
   antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
     inherit (pkgs) antlr4;
   };
+
   anyascii = callPackage ../development/python-modules/anyascii { };
+
   anybadge = callPackage ../development/python-modules/anybadge { };
+
   anyconfig = callPackage ../development/python-modules/anyconfig { };
+
   anyio = callPackage ../development/python-modules/anyio { };
+
   anyqt = callPackage ../development/python-modules/anyqt { };
+
   anysqlite = callPackage ../development/python-modules/anysqlite { };
+
   anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; };
+
   anywidget = callPackage ../development/python-modules/anywidget { };
+
   aocd = callPackage ../development/python-modules/aocd { };
+
   aocd-example-parser = callPackage ../development/python-modules/aocd-example-parser { };
+
   apache-beam = callPackage ../development/python-modules/apache-beam { };
+
   apcaccess = callPackage ../development/python-modules/apcaccess { };
+
   apeye-core = callPackage ../development/python-modules/apeye-core { };
+
   apipkg = callPackage ../development/python-modules/apipkg { };
+
   apischema = callPackage ../development/python-modules/apischema { };
+
   apispec = callPackage ../development/python-modules/apispec { };
+
   apispec-webframeworks = callPackage ../development/python-modules/apispec-webframeworks { };
+
   apkinspector = callPackage ../development/python-modules/apkinspector { };
+
   apkit = callPackage ../development/python-modules/apkit { };
+
   aplpy = callPackage ../development/python-modules/aplpy { };
+
   apollo-fpga = callPackage ../development/python-modules/apollo-fpga { };
+
   app-model = callPackage ../development/python-modules/app-model { };
+
   appdirs = callPackage ../development/python-modules/appdirs { };
+
   appimage = callPackage ../development/python-modules/appimage { };
+
   apple-weatherkit = callPackage ../development/python-modules/apple-weatherkit { };
+
   applicationinsights = callPackage ../development/python-modules/applicationinsights { };
+
   appnope = callPackage ../development/python-modules/appnope { };
+
   apprise = callPackage ../development/python-modules/apprise { };
+
   approval-utilities = callPackage ../development/python-modules/approval-utilities { };
+
   approvaltests = callPackage ../development/python-modules/approvaltests { };
+
   appthreat-vulnerability-db =
     callPackage ../development/python-modules/appthreat-vulnerability-db
       { };
+
   apptools = callPackage ../development/python-modules/apptools { };
+
   apricot-select = callPackage ../development/python-modules/apricot-select { };
+
   aprslib = callPackage ../development/python-modules/aprslib { };
+
   apscheduler = callPackage ../development/python-modules/apscheduler { };
+
   apsw = callPackage ../development/python-modules/apsw { };
+
   apsystems-ez1 = callPackage ../development/python-modules/apsystems-ez1 { };
+
   apt-repo = callPackage ../development/python-modules/apt-repo { };
+
   apted = callPackage ../development/python-modules/apted { };
+
   apycula = callPackage ../development/python-modules/apycula { };
+
   apykuma = callPackage ../development/python-modules/apykuma { };
+
   aqipy-atmotech = callPackage ../development/python-modules/aqipy-atmotech { };
+
   aqualogic = callPackage ../development/python-modules/aqualogic { };
+
   ar = callPackage ../development/python-modules/ar { };
+
   arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { };
+
   aranet4 = callPackage ../development/python-modules/aranet4 { };
+
   arc4 = callPackage ../development/python-modules/arc4 { };
+
   arcam-fmj = callPackage ../development/python-modules/arcam-fmj { };
+
   arch = callPackage ../development/python-modules/arch { };
+
   archinfo = callPackage ../development/python-modules/archinfo { };
+
   archspec = callPackage ../development/python-modules/archspec { };
+
   area = callPackage ../development/python-modules/area { };
+
   arelle = callPackage ../development/python-modules/arelle { gui = true; };
+
   arelle-headless = callPackage ../development/python-modules/arelle { gui = false; };
+
   aresponses = callPackage ../development/python-modules/aresponses { };
+
   argcomplete = callPackage ../development/python-modules/argcomplete { };
+
   argh = callPackage ../development/python-modules/argh { };
+
   argilla = callPackage ../development/python-modules/argilla { };
+
   argon2-cffi = callPackage ../development/python-modules/argon2-cffi { };
+
   argon2-cffi-bindings = callPackage ../development/python-modules/argon2-cffi-bindings { };
+
   argos-translate-files = callPackage ../development/python-modules/argos-translate-files { };
+
   argostranslate = callPackage ../development/python-modules/argostranslate {
     ctranslate2-cpp = pkgs.ctranslate2;
   };
+
   argparse-addons = callPackage ../development/python-modules/argparse-addons { };
+
   argparse-dataclass = callPackage ../development/python-modules/argparse-dataclass { };
+
   argparse-manpage = callPackage ../development/python-modules/argparse-manpage { };
+
   args = callPackage ../development/python-modules/args { };
+
   aria2p = callPackage ../development/python-modules/aria2p { };
+
   ariadne = callPackage ../development/python-modules/ariadne { };
+
   arpeggio = callPackage ../development/python-modules/arpeggio { };
+
   arpy = callPackage ../development/python-modules/arpy { };
+
   array-api-compat = callPackage ../development/python-modules/array-api-compat { };
+
   array-api-strict = callPackage ../development/python-modules/array-api-strict { };
+
   array-record = callPackage ../development/python-modules/array-record { };
+
   arrayqueues = callPackage ../development/python-modules/arrayqueues { };
+
   arris-tg2492lg = callPackage ../development/python-modules/arris-tg2492lg { };
+
   arrow = callPackage ../development/python-modules/arrow { };
+
   arsenic = callPackage ../development/python-modules/arsenic { };
+
   art = callPackage ../development/python-modules/art { };
+
   arviz = callPackage ../development/python-modules/arviz { };
+
   arxiv = callPackage ../development/python-modules/arxiv { };
+
   arxiv2bib = callPackage ../development/python-modules/arxiv2bib { };
+
   asana = callPackage ../development/python-modules/asana { };
+
   ascii-magic = callPackage ../development/python-modules/ascii-magic { };
+
   asciimatics = callPackage ../development/python-modules/asciimatics { };
+
   asciitree = callPackage ../development/python-modules/asciitree { };
+
   asdf = callPackage ../development/python-modules/asdf { };
+
   asdf-astropy = callPackage ../development/python-modules/asdf-astropy { };
+
   asdf-coordinates-schemas = callPackage ../development/python-modules/asdf-coordinates-schemas { };
+
   asdf-standard = callPackage ../development/python-modules/asdf-standard { };
+
   asdf-transform-schemas = callPackage ../development/python-modules/asdf-transform-schemas { };
+
   asdf-wcs-schemas = callPackage ../development/python-modules/asdf-wcs-schemas { };
+
   ase = callPackage ../development/python-modules/ase { };
+
   asf-search = callPackage ../development/python-modules/asf-search { };
+
   asgi-csrf = callPackage ../development/python-modules/asgi-csrf { };
+
   asgi-lifespan = callPackage ../development/python-modules/asgi-lifespan { };
+
   asgi-logger = callPackage ../development/python-modules/asgi-logger { };
+
   asgineer = callPackage ../development/python-modules/asgineer { };
+
   asgiref = callPackage ../development/python-modules/asgiref { };
+
   asks = callPackage ../development/python-modules/asks { };
+
   asmog = callPackage ../development/python-modules/asmog { };
+
   asn1 = callPackage ../development/python-modules/asn1 { };
+
   asn1ate = callPackage ../development/python-modules/asn1ate { };
+
   asn1crypto = callPackage ../development/python-modules/asn1crypto { };
+
   asn1tools = callPackage ../development/python-modules/asn1tools { };
+
   aspectlib = callPackage ../development/python-modules/aspectlib { };
+
   aspell-python = callPackage ../development/python-modules/aspell-python { };
+
   aspy-refactor-imports = callPackage ../development/python-modules/aspy-refactor-imports { };
+
   aspy-yaml = callPackage ../development/python-modules/aspy-yaml { };
+
   assay = callPackage ../development/python-modules/assay { };
+
   assertpy = callPackage ../development/python-modules/assertpy { };
+
   asserts = callPackage ../development/python-modules/asserts { };
+
   ast-grep-py = callPackage ../development/python-modules/ast-grep-py { };
+
   asterisk-mbox = callPackage ../development/python-modules/asterisk-mbox { };
+
   asteroid-filterbanks = callPackage ../development/python-modules/asteroid-filterbanks { };
+
   asteval = callPackage ../development/python-modules/asteval { };
+
   astor = callPackage ../development/python-modules/astor { };
+
   astral = callPackage ../development/python-modules/astral { };
+
   astroid = callPackage ../development/python-modules/astroid { };
+
   astropy = callPackage ../development/python-modules/astropy { };
+
   astropy-extension-helpers = callPackage ../development/python-modules/astropy-extension-helpers { };
+
   astropy-healpix = callPackage ../development/python-modules/astropy-healpix { };
+
   astropy-helpers = callPackage ../development/python-modules/astropy-helpers { };
+
   astropy-iers-data = callPackage ../development/python-modules/astropy-iers-data { };
+
   astroquery = callPackage ../development/python-modules/astroquery { };
+
   asttokens = callPackage ../development/python-modules/asttokens { };
+
   astunparse = callPackage ../development/python-modules/astunparse { };
+
   asusrouter = callPackage ../development/python-modules/asusrouter { };
+
   asyauth = callPackage ../development/python-modules/asyauth { };
+
   asyauth-bad = callPackage ../development/python-modules/asyauth-bad { };
+
   async-cache = callPackage ../development/python-modules/async-cache { };
+
   async-dns = callPackage ../development/python-modules/async-dns { };
+
   async-generator = callPackage ../development/python-modules/async-generator { };
+
   async-interrupt = callPackage ../development/python-modules/async-interrupt { };
+
   async-lru = callPackage ../development/python-modules/async-lru { };
+
   async-modbus = callPackage ../development/python-modules/async-modbus { };
+
   async-stagger = callPackage ../development/python-modules/async-stagger { };
+
   async-timeout = callPackage ../development/python-modules/async-timeout { };
+
   async-tkinter-loop = callPackage ../development/python-modules/async-tkinter-loop { };
+
   async-upnp-client = callPackage ../development/python-modules/async-upnp-client { };
+
   asyncarve = callPackage ../development/python-modules/asyncarve { };
+
   asyncclick = callPackage ../development/python-modules/asyncclick { };
+
   asynccmd = callPackage ../development/python-modules/asynccmd { };
+
   asyncer = callPackage ../development/python-modules/asyncer { };
+
   asyncinotify = callPackage ../development/python-modules/asyncinotify { };
+
   asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { };
+
   asyncio-rlock = callPackage ../development/python-modules/asyncio-rlock { };
+
   asyncio-throttle = callPackage ../development/python-modules/asyncio-throttle { };
+
   asyncmy = callPackage ../development/python-modules/asyncmy { };
+
   asyncpg = callPackage ../development/python-modules/asyncpg { };
+
   asyncpraw = callPackage ../development/python-modules/asyncpraw { };
+
   asyncprawcore = callPackage ../development/python-modules/asyncprawcore { };
+
   asyncpysupla = callPackage ../development/python-modules/asyncpysupla { };
+
   asyncserial = callPackage ../development/python-modules/asyncserial { };
+
   asyncsleepiq = callPackage ../development/python-modules/asyncsleepiq { };
+
   asyncssh = callPackage ../development/python-modules/asyncssh { };
+
   asyncstdlib = callPackage ../development/python-modules/asyncstdlib { };
+
   asyncstdlib-fw = callPackage ../development/python-modules/asyncstdlib-fw { };
+
   asynctest = callPackage ../development/python-modules/asynctest { };
+
   asyncua = callPackage ../development/python-modules/asyncua { };
+
   asyncwhois = callPackage ../development/python-modules/asyncwhois { };
+
   asysocks = callPackage ../development/python-modules/asysocks { };
+
   atc-ble = callPackage ../development/python-modules/atc-ble { };
+
   atenpdu = callPackage ../development/python-modules/atenpdu { };
+
   atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { };
+
   atom = callPackage ../development/python-modules/atom { };
+
   atomiclong = callPackage ../development/python-modules/atomiclong { };
+
   atomicwrites = callPackage ../development/python-modules/atomicwrites { };
+
   atomicwrites-homeassistant =
     callPackage ../development/python-modules/atomicwrites-homeassistant
       { };
+
   atomman = callPackage ../development/python-modules/atomman { };
+
   atopile = callPackage ../development/python-modules/atopile { };
+
   atopile-easyeda2kicad = callPackage ../development/python-modules/atopile-easyeda2kicad { };
+
   atproto = callPackage ../development/python-modules/atproto { };
+
   atpublic = callPackage ../development/python-modules/atpublic { };
+
   atsim-potentials = callPackage ../development/python-modules/atsim-potentials { };
+
   attacut = callPackage ../development/python-modules/attacut { };
+
   attr = callPackage ../development/python-modules/attr { };
+
   attrdict = callPackage ../development/python-modules/attrdict { };
+
   attrs = callPackage ../development/python-modules/attrs { };
+
   attrs-strict = callPackage ../development/python-modules/attrs-strict { };
+
   aubio = callPackage ../development/python-modules/aubio { };
+
   audible = callPackage ../development/python-modules/audible { };
+
   audio-metadata = callPackage ../development/python-modules/audio-metadata { };
+
   audioop-lts =
     if pythonAtLeast "3.13" then callPackage ../development/python-modules/audioop-lts { } else null;
+
   audioread = callPackage ../development/python-modules/audioread { };
+
   audiotools = callPackage ../development/python-modules/audiotools { };
+
   auditok = callPackage ../development/python-modules/auditok { };
+
   auditwheel = callPackage ../development/python-modules/auditwheel {
     inherit (pkgs)
       bzip2
@@ -605,287 +1138,491 @@ self: super: with self; {
       unzip
       ;
   };
+
   augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; };
+
   augmax = callPackage ../development/python-modules/augmax { };
+
   auroranoaa = callPackage ../development/python-modules/auroranoaa { };
+
   aurorapy = callPackage ../development/python-modules/aurorapy { };
+
   autarco = callPackage ../development/python-modules/autarco { };
+
   auth0-python = callPackage ../development/python-modules/auth0-python { };
+
   authcaptureproxy = callPackage ../development/python-modules/authcaptureproxy { };
+
   authheaders = callPackage ../development/python-modules/authheaders { };
+
   authlib = callPackage ../development/python-modules/authlib { };
+
   authres = callPackage ../development/python-modules/authres { };
+
   auto-lazy-imports = callPackage ../development/python-modules/auto-lazy-imports { };
+
   autobahn = callPackage ../development/python-modules/autobahn { };
+
   autocommand = callPackage ../development/python-modules/autocommand { };
+
   autofaiss = callPackage ../development/python-modules/autofaiss { };
+
   autoflake = callPackage ../development/python-modules/autoflake { };
+
   autograd = callPackage ../development/python-modules/autograd { };
+
   autograd-gamma = callPackage ../development/python-modules/autograd-gamma { };
+
   autoit-ripper = callPackage ../development/python-modules/autoit-ripper { };
+
   autologging = callPackage ../development/python-modules/autologging { };
+
   automat = callPackage ../development/python-modules/automat { };
+
   automate-home = callPackage ../development/python-modules/automate-home { };
+
   automower-ble = callPackage ../development/python-modules/automower-ble { };
+
   automx2 = callPackage ../development/python-modules/automx2 { };
+
   autopage = callPackage ../development/python-modules/autopage { };
+
   autopep8 = callPackage ../development/python-modules/autopep8 { };
+
   autopxd2 = callPackage ../development/python-modules/autopxd2 { };
+
   autoslot = callPackage ../development/python-modules/autoslot { };
+
   av = callPackage ../development/python-modules/av { };
+
   avahi = toPythonModule (
     pkgs.avahi.override {
       inherit python;
       withPython = true;
     }
   );
+
   avea = callPackage ../development/python-modules/avea { };
+
   avidtools = callPackage ../development/python-modules/avidtools { };
+
   avion = callPackage ../development/python-modules/avion { };
+
   avro = callPackage ../development/python-modules/avro { };
+
   avro-python3 = callPackage ../development/python-modules/avro-python3 { };
+
   avro3k = callPackage ../development/python-modules/avro3k { };
+
   avwx-engine = callPackage ../development/python-modules/avwx-engine { };
+
   aw-client = callPackage ../development/python-modules/aw-client { };
+
   aw-core = callPackage ../development/python-modules/aw-core { };
+
   awacs = callPackage ../development/python-modules/awacs { };
+
   awesome-slugify = callPackage ../development/python-modules/awesome-slugify { };
+
   awesomeversion = callPackage ../development/python-modules/awesomeversion { };
+
   awkward = callPackage ../development/python-modules/awkward { };
+
   awkward-cpp = callPackage ../development/python-modules/awkward-cpp { inherit (pkgs) cmake ninja; };
+
   awkward-pandas = callPackage ../development/python-modules/awkward-pandas { };
+
   aws-adfs = callPackage ../development/python-modules/aws-adfs { };
+
   aws-encryption-sdk = callPackage ../development/python-modules/aws-encryption-sdk { };
+
   aws-error-utils = callPackage ../development/python-modules/aws-error-utils { };
+
   aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { };
+
   aws-request-signer = callPackage ../development/python-modules/aws-request-signer { };
+
   aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { };
+
   aws-secretsmanager-caching =
     callPackage ../development/python-modules/aws-secretsmanager-caching
       { };
+
   aws-sso-lib = callPackage ../development/python-modules/aws-sso-lib { };
+
   aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { };
+
   awscrt = callPackage ../development/python-modules/awscrt { };
+
   awsiotpythonsdk = callPackage ../development/python-modules/awsiotpythonsdk { };
+
   awsiotsdk = callPackage ../development/python-modules/awsiotsdk { };
+
   awsipranges = callPackage ../development/python-modules/awsipranges { };
+
   awslambdaric = callPackage ../development/python-modules/awslambdaric { };
+
   awswrangler = callPackage ../development/python-modules/awswrangler { };
+
   ax-platform = callPackage ../development/python-modules/ax-platform { };
+
   axis = callPackage ../development/python-modules/axis { };
+
   axisregistry = callPackage ../development/python-modules/axisregistry { };
+
   ayla-iot-unofficial = callPackage ../development/python-modules/ayla-iot-unofficial { };
+
   azure-ai-documentintelligence =
     callPackage ../development/python-modules/azure-ai-documentintelligence
       { };
+
   azure-ai-vision-imageanalysis =
     callPackage ../development/python-modules/azure-ai-vision-imageanalysis
       { };
+
   azure-appconfiguration = callPackage ../development/python-modules/azure-appconfiguration { };
+
   azure-applicationinsights = callPackage ../development/python-modules/azure-applicationinsights { };
+
   azure-batch = callPackage ../development/python-modules/azure-batch { };
+
   azure-common = callPackage ../development/python-modules/azure-common { };
+
   azure-containerregistry = callPackage ../development/python-modules/azure-containerregistry { };
+
   azure-core = callPackage ../development/python-modules/azure-core { };
+
   azure-cosmos = callPackage ../development/python-modules/azure-cosmos { };
+
   azure-cosmosdb-nspkg = callPackage ../development/python-modules/azure-cosmosdb-nspkg { };
+
   azure-cosmosdb-table = callPackage ../development/python-modules/azure-cosmosdb-table { };
+
   azure-data-tables = callPackage ../development/python-modules/azure-data-tables { };
+
   azure-datalake-store = callPackage ../development/python-modules/azure-datalake-store { };
+
   azure-eventgrid = callPackage ../development/python-modules/azure-eventgrid { };
+
   azure-eventhub = callPackage ../development/python-modules/azure-eventhub { };
+
   azure-graphrbac = callPackage ../development/python-modules/azure-graphrbac { };
+
   azure-identity = callPackage ../development/python-modules/azure-identity { };
+
   azure-iot-device = callPackage ../development/python-modules/azure-iot-device { };
+
   azure-keyvault = callPackage ../development/python-modules/azure-keyvault { };
+
   azure-keyvault-administration =
     callPackage ../development/python-modules/azure-keyvault-administration
       { };
+
   azure-keyvault-certificates =
     callPackage ../development/python-modules/azure-keyvault-certificates
       { };
+
   azure-keyvault-keys = callPackage ../development/python-modules/azure-keyvault-keys { };
+
   azure-keyvault-nspkg = callPackage ../development/python-modules/azure-keyvault-nspkg { };
+
   azure-keyvault-secrets = callPackage ../development/python-modules/azure-keyvault-secrets { };
+
   azure-keyvault-securitydomain =
     callPackage ../development/python-modules/azure-keyvault-securitydomain
       { };
+
   azure-kusto-data = callPackage ../development/python-modules/azure-kusto-data { };
+
   azure-kusto-ingest = callPackage ../development/python-modules/azure-kusto-ingest { };
+
   azure-loganalytics = callPackage ../development/python-modules/azure-loganalytics { };
+
   azure-mgmt-advisor = callPackage ../development/python-modules/azure-mgmt-advisor { };
+
   azure-mgmt-apimanagement = callPackage ../development/python-modules/azure-mgmt-apimanagement { };
+
   azure-mgmt-appconfiguration =
     callPackage ../development/python-modules/azure-mgmt-appconfiguration
       { };
+
   azure-mgmt-appcontainers = callPackage ../development/python-modules/azure-mgmt-appcontainers { };
+
   azure-mgmt-applicationinsights =
     callPackage ../development/python-modules/azure-mgmt-applicationinsights
       { };
+
   azure-mgmt-authorization = callPackage ../development/python-modules/azure-mgmt-authorization { };
+
   azure-mgmt-automation = callPackage ../development/python-modules/azure-mgmt-automation { };
+
   azure-mgmt-batch = callPackage ../development/python-modules/azure-mgmt-batch { };
+
   azure-mgmt-batchai = callPackage ../development/python-modules/azure-mgmt-batchai { };
+
   azure-mgmt-billing = callPackage ../development/python-modules/azure-mgmt-billing { };
+
   azure-mgmt-botservice = callPackage ../development/python-modules/azure-mgmt-botservice { };
+
   azure-mgmt-cdn = callPackage ../development/python-modules/azure-mgmt-cdn { };
+
   azure-mgmt-cognitiveservices =
     callPackage ../development/python-modules/azure-mgmt-cognitiveservices
       { };
+
   azure-mgmt-commerce = callPackage ../development/python-modules/azure-mgmt-commerce { };
+
   azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { };
+
   azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { };
+
   azure-mgmt-consumption = callPackage ../development/python-modules/azure-mgmt-consumption { };
+
   azure-mgmt-containerinstance =
     callPackage ../development/python-modules/azure-mgmt-containerinstance
       { };
+
   azure-mgmt-containerregistry =
     callPackage ../development/python-modules/azure-mgmt-containerregistry
       { };
+
   azure-mgmt-containerservice =
     callPackage ../development/python-modules/azure-mgmt-containerservice
       { };
+
   azure-mgmt-core = callPackage ../development/python-modules/azure-mgmt-core { };
+
   azure-mgmt-cosmosdb = callPackage ../development/python-modules/azure-mgmt-cosmosdb { };
+
   azure-mgmt-databoxedge = callPackage ../development/python-modules/azure-mgmt-databoxedge { };
+
   azure-mgmt-datafactory = callPackage ../development/python-modules/azure-mgmt-datafactory { };
+
   azure-mgmt-datalake-analytics =
     callPackage ../development/python-modules/azure-mgmt-datalake-analytics
       { };
+
   azure-mgmt-datalake-nspkg = callPackage ../development/python-modules/azure-mgmt-datalake-nspkg { };
+
   azure-mgmt-datalake-store = callPackage ../development/python-modules/azure-mgmt-datalake-store { };
+
   azure-mgmt-datamigration = callPackage ../development/python-modules/azure-mgmt-datamigration { };
+
   azure-mgmt-deploymentmanager =
     callPackage ../development/python-modules/azure-mgmt-deploymentmanager
       { };
+
   azure-mgmt-devspaces = callPackage ../development/python-modules/azure-mgmt-devspaces { };
+
   azure-mgmt-devtestlabs = callPackage ../development/python-modules/azure-mgmt-devtestlabs { };
+
   azure-mgmt-dns = callPackage ../development/python-modules/azure-mgmt-dns { };
+
   azure-mgmt-eventgrid = callPackage ../development/python-modules/azure-mgmt-eventgrid { };
+
   azure-mgmt-eventhub = callPackage ../development/python-modules/azure-mgmt-eventhub { };
+
   azure-mgmt-extendedlocation =
     callPackage ../development/python-modules/azure-mgmt-extendedlocation
       { };
+
   azure-mgmt-frontdoor = callPackage ../development/python-modules/azure-mgmt-frontdoor { };
+
   azure-mgmt-hanaonazure = callPackage ../development/python-modules/azure-mgmt-hanaonazure { };
+
   azure-mgmt-hdinsight = callPackage ../development/python-modules/azure-mgmt-hdinsight { };
+
   azure-mgmt-imagebuilder = callPackage ../development/python-modules/azure-mgmt-imagebuilder { };
+
   azure-mgmt-iotcentral = callPackage ../development/python-modules/azure-mgmt-iotcentral { };
+
   azure-mgmt-iothub = callPackage ../development/python-modules/azure-mgmt-iothub { };
+
   azure-mgmt-iothubprovisioningservices =
     callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices
       { };
+
   azure-mgmt-keyvault = callPackage ../development/python-modules/azure-mgmt-keyvault { };
+
   azure-mgmt-kusto = callPackage ../development/python-modules/azure-mgmt-kusto { };
+
   azure-mgmt-loganalytics = callPackage ../development/python-modules/azure-mgmt-loganalytics { };
+
   azure-mgmt-logic = callPackage ../development/python-modules/azure-mgmt-logic { };
+
   azure-mgmt-machinelearningcompute =
     callPackage ../development/python-modules/azure-mgmt-machinelearningcompute
       { };
+
   azure-mgmt-managedservices =
     callPackage ../development/python-modules/azure-mgmt-managedservices
       { };
+
   azure-mgmt-managementgroups =
     callPackage ../development/python-modules/azure-mgmt-managementgroups
       { };
+
   azure-mgmt-managementpartner =
     callPackage ../development/python-modules/azure-mgmt-managementpartner
       { };
+
   azure-mgmt-maps = callPackage ../development/python-modules/azure-mgmt-maps { };
+
   azure-mgmt-marketplaceordering =
     callPackage ../development/python-modules/azure-mgmt-marketplaceordering
       { };
+
   azure-mgmt-media = callPackage ../development/python-modules/azure-mgmt-media { };
+
   azure-mgmt-monitor = callPackage ../development/python-modules/azure-mgmt-monitor { };
+
   azure-mgmt-msi = callPackage ../development/python-modules/azure-mgmt-msi { };
+
   azure-mgmt-mysqlflexibleservers =
     callPackage ../development/python-modules/azure-mgmt-mysqlflexibleservers
       { };
+
   azure-mgmt-netapp = callPackage ../development/python-modules/azure-mgmt-netapp { };
+
   azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { };
+
   azure-mgmt-notificationhubs =
     callPackage ../development/python-modules/azure-mgmt-notificationhubs
       { };
+
   azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { };
+
   azure-mgmt-policyinsights = callPackage ../development/python-modules/azure-mgmt-policyinsights { };
+
   azure-mgmt-postgresqlflexibleservers =
     callPackage ../development/python-modules/azure-mgmt-postgresqlflexibleservers
       { };
+
   azure-mgmt-powerbiembedded =
     callPackage ../development/python-modules/azure-mgmt-powerbiembedded
       { };
+
   azure-mgmt-privatedns = callPackage ../development/python-modules/azure-mgmt-privatedns { };
+
   azure-mgmt-rdbms = callPackage ../development/python-modules/azure-mgmt-rdbms { };
+
   azure-mgmt-recoveryservices =
     callPackage ../development/python-modules/azure-mgmt-recoveryservices
       { };
+
   azure-mgmt-recoveryservicesbackup =
     callPackage ../development/python-modules/azure-mgmt-recoveryservicesbackup
       { };
+
   azure-mgmt-redhatopenshift =
     callPackage ../development/python-modules/azure-mgmt-redhatopenshift
       { };
+
   azure-mgmt-redis = callPackage ../development/python-modules/azure-mgmt-redis { };
+
   azure-mgmt-relay = callPackage ../development/python-modules/azure-mgmt-relay { };
+
   azure-mgmt-reservations = callPackage ../development/python-modules/azure-mgmt-reservations { };
+
   azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { };
+
   azure-mgmt-scheduler = callPackage ../development/python-modules/azure-mgmt-scheduler { };
+
   azure-mgmt-search = callPackage ../development/python-modules/azure-mgmt-search { };
+
   azure-mgmt-security = callPackage ../development/python-modules/azure-mgmt-security { };
+
   azure-mgmt-servicebus = callPackage ../development/python-modules/azure-mgmt-servicebus { };
+
   azure-mgmt-servicefabric = callPackage ../development/python-modules/azure-mgmt-servicefabric { };
+
   azure-mgmt-servicefabricmanagedclusters =
     callPackage ../development/python-modules/azure-mgmt-servicefabricmanagedclusters
       { };
+
   azure-mgmt-servicelinker = callPackage ../development/python-modules/azure-mgmt-servicelinker { };
+
   azure-mgmt-signalr = callPackage ../development/python-modules/azure-mgmt-signalr { };
+
   azure-mgmt-sql = callPackage ../development/python-modules/azure-mgmt-sql { };
+
   azure-mgmt-sqlvirtualmachine =
     callPackage ../development/python-modules/azure-mgmt-sqlvirtualmachine
       { };
+
   azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { };
+
   azure-mgmt-subscription = callPackage ../development/python-modules/azure-mgmt-subscription { };
+
   azure-mgmt-synapse = callPackage ../development/python-modules/azure-mgmt-synapse { };
+
   azure-mgmt-trafficmanager = callPackage ../development/python-modules/azure-mgmt-trafficmanager { };
+
   azure-mgmt-web = callPackage ../development/python-modules/azure-mgmt-web { };
+
   azure-monitor-ingestion = callPackage ../development/python-modules/azure-monitor-ingestion { };
+
   azure-monitor-query = callPackage ../development/python-modules/azure-monitor-query { };
+
   azure-multiapi-storage = callPackage ../development/python-modules/azure-multiapi-storage { };
+
   azure-nspkg = callPackage ../development/python-modules/azure-nspkg { };
+
   azure-search-documents = callPackage ../development/python-modules/azure-search-documents { };
+
   azure-servicebus = callPackage ../development/python-modules/azure-servicebus { };
+
   azure-servicefabric = callPackage ../development/python-modules/azure-servicefabric { };
+
   azure-servicemanagement-legacy =
     callPackage ../development/python-modules/azure-servicemanagement-legacy
       { };
+
   azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { };
+
   azure-storage-common = callPackage ../development/python-modules/azure-storage-common { };
+
   azure-storage-file = callPackage ../development/python-modules/azure-storage-file { };
+
   azure-storage-file-datalake =
     callPackage ../development/python-modules/azure-storage-file-datalake
       { };
+
   azure-storage-file-share = callPackage ../development/python-modules/azure-storage-file-share { };
+
   azure-storage-nspkg = callPackage ../development/python-modules/azure-storage-nspkg { };
+
   azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { };
+
   azure-synapse-accesscontrol =
     callPackage ../development/python-modules/azure-synapse-accesscontrol
       { };
+
   azure-synapse-artifacts = callPackage ../development/python-modules/azure-synapse-artifacts { };
+
   azure-synapse-managedprivateendpoints =
     callPackage ../development/python-modules/azure-synapse-managedprivateendpoints
       { };
+
   azure-synapse-spark = callPackage ../development/python-modules/azure-synapse-spark { };
+
   b2sdk = callPackage ../development/python-modules/b2sdk { };
+
   babel = callPackage ../development/python-modules/babel { };
+
   babelfish = callPackage ../development/python-modules/babelfish { };
+
   babelfont = callPackage ../development/python-modules/babelfont { };
+
   babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { };
+
   babeltrace = toPythonModule (
     pkgs.babeltrace.override {
       pythonPackages = self;
       enablePython = true;
     }
   );
+
   babeltrace2 = toPythonModule (
     pkgs.babeltrace2.override {
       inherit (self) python;
@@ -893,219 +1630,417 @@ self: super: with self; {
       enablePython = true;
     }
   );
+
   backcall = callPackage ../development/python-modules/backcall { };
+
   backoff = callPackage ../development/python-modules/backoff { };
+
   backports-datetime-fromisoformat =
     callPackage ../development/python-modules/backports-datetime-fromisoformat
       { };
+
   backports-entry-points-selectable =
     callPackage ../development/python-modules/backports-entry-points-selectable
       { };
+
   backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { };
+
   backports-strenum = callPackage ../development/python-modules/backports-strenum { };
+
   backports-tarfile = callPackage ../development/python-modules/backports-tarfile { };
+
   backrefs = callPackage ../development/python-modules/backrefs { };
+
   backtesting = callPackage ../development/python-modules/backtesting { };
+
   bacpypes = callPackage ../development/python-modules/bacpypes { };
+
   badsecrets = callPackage ../development/python-modules/badsecrets { };
+
   bagit = callPackage ../development/python-modules/bagit { };
+
   baidu-aip = callPackage ../development/python-modules/baidu-aip { };
+
   baize = callPackage ../development/python-modules/baize { };
+
   bambi = callPackage ../development/python-modules/bambi { };
+
   banal = callPackage ../development/python-modules/banal { };
+
   bandcamp-api = callPackage ../development/python-modules/bandcamp-api { };
+
   bandit = callPackage ../development/python-modules/bandit { };
+
   bangla = callPackage ../development/python-modules/bangla { };
+
   banks = callPackage ../development/python-modules/banks { };
+
   bap = callPackage ../development/python-modules/bap {
     inherit (pkgs.ocaml-ng.ocamlPackages_4_14) bap;
   };
+
   barectf = callPackage ../development/python-modules/barectf { };
+
   baron = callPackage ../development/python-modules/baron { };
+
   base2048 = callPackage ../development/python-modules/base2048 { };
+
   base36 = callPackage ../development/python-modules/base36 { };
+
   base58 = callPackage ../development/python-modules/base58 { };
+
   base58check = callPackage ../development/python-modules/base58check { };
+
   base64io = callPackage ../development/python-modules/base64io { };
+
   basedmypy = callPackage ../development/python-modules/basedmypy { };
+
   basedtyping = callPackage ../development/python-modules/basedtyping { };
+
   baseline = callPackage ../development/python-modules/baseline { };
+
   baselines = callPackage ../development/python-modules/baselines { };
+
   basemap = callPackage ../development/python-modules/basemap { };
+
   basemap-data = callPackage ../development/python-modules/basemap-data { };
+
   basemap-data-hires = callPackage ../development/python-modules/basemap-data-hires { };
+
   bases = callPackage ../development/python-modules/bases { };
+
   bash-kernel = callPackage ../development/python-modules/bash-kernel { };
+
   bashlex = callPackage ../development/python-modules/bashlex { };
+
   basiciw = callPackage ../development/python-modules/basiciw { };
+
   basswood-av = callPackage ../development/python-modules/basswood-av { };
+
   batchgenerators = callPackage ../development/python-modules/batchgenerators { };
+
   batchspawner = callPackage ../development/python-modules/batchspawner { };
+
   batinfo = callPackage ../development/python-modules/batinfo { };
+
   baycomp = callPackage ../development/python-modules/baycomp { };
+
   bayesian-optimization = callPackage ../development/python-modules/bayesian-optimization { };
+
   bayespy = callPackage ../development/python-modules/bayespy { };
+
   bbox = callPackage ../development/python-modules/bbox { };
+
   bc-detect-secrets = callPackage ../development/python-modules/bc-detect-secrets { };
+
   bc-jsonpath-ng = callPackage ../development/python-modules/bc-jsonpath-ng { };
+
   bc-python-hcl2 = callPackage ../development/python-modules/bc-python-hcl2 { };
+
   bcc = toPythonModule (pkgs.bcc.override { python3Packages = self; });
+
   bcdoc = callPackage ../development/python-modules/bcdoc { };
+
   bcf = callPackage ../development/python-modules/bcf { };
+
   bcg = callPackage ../development/python-modules/bcg { };
+
   bch = callPackage ../development/python-modules/bch { };
+
   bcrypt =
     if stdenv.hostPlatform.system == "i686-linux" then
       callPackage ../development/python-modules/bcrypt/3.nix { }
     else
       callPackage ../development/python-modules/bcrypt { };
+
   bdffont = callPackage ../development/python-modules/bdffont { };
+
   beacontools = callPackage ../development/python-modules/beacontools { };
+
   beaker = callPackage ../development/python-modules/beaker { };
+
   beancount = callPackage ../development/python-modules/beancount { };
+
   beancount-black = callPackage ../development/python-modules/beancount-black { };
+
   beancount-docverif = callPackage ../development/python-modules/beancount-docverif { };
+
   beancount-parser = callPackage ../development/python-modules/beancount-parser { };
+
   beancount-plugin-utils = callPackage ../development/python-modules/beancount-plugin-utils { };
+
   beancount_2 = callPackage ../development/python-modules/beancount/2.nix { };
+
   beangulp = callPackage ../development/python-modules/beangulp { };
+
   beanhub-cli = callPackage ../development/python-modules/beanhub-cli { };
+
   beanhub-extract = callPackage ../development/python-modules/beanhub-extract { };
+
   beanhub-forms = callPackage ../development/python-modules/beanhub-forms { };
+
   beanhub-import = callPackage ../development/python-modules/beanhub-import { };
+
   beanquery = callPackage ../development/python-modules/beanquery { };
+
   beanstalkc = callPackage ../development/python-modules/beanstalkc { };
+
   beartype = callPackage ../development/python-modules/beartype { };
+
   beaupy = callPackage ../development/python-modules/beaupy { };
+
   beautiful-date = callPackage ../development/python-modules/beautiful-date { };
+
   beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { };
+
   beautifultable = callPackage ../development/python-modules/beautifultable { };
+
   beautysh = callPackage ../development/python-modules/beautysh { };
+
   bech32 = callPackage ../development/python-modules/bech32 { };
+
   before-after = callPackage ../development/python-modules/before-after { };
+
   behave = callPackage ../development/python-modules/behave { };
+
   bellows = callPackage ../development/python-modules/bellows { };
+
   bencode-py = callPackage ../development/python-modules/bencode-py { };
+
   bencoder = callPackage ../development/python-modules/bencoder { };
+
   bencodetools = callPackage ../development/python-modules/bencodetools {
     bencodetools = pkgs.bencodetools;
   };
+
   beniget = callPackage ../development/python-modules/beniget { };
+
   benqprojector = callPackage ../development/python-modules/benqprojector { };
+
   bentoml = callPackage ../development/python-modules/bentoml { };
+
   berkeleydb = callPackage ../development/python-modules/berkeleydb { };
+
   bespon = callPackage ../development/python-modules/bespon { };
+
   betacode = callPackage ../development/python-modules/betacode { };
+
   betamax = callPackage ../development/python-modules/betamax { };
+
   betamax-matchers = callPackage ../development/python-modules/betamax-matchers { };
+
   betamax-serializers = callPackage ../development/python-modules/betamax-serializers { };
+
   better-exceptions = callPackage ../development/python-modules/better-exceptions { };
+
   betterproto = callPackage ../development/python-modules/betterproto { };
+
   betterproto-fw = callPackage ../development/python-modules/betterproto-fw { };
+
   betterproto-rust-codec = callPackage ../development/python-modules/betterproto-rust-codec { };
+
   bezier = callPackage ../development/python-modules/bezier { };
+
   beziers = callPackage ../development/python-modules/beziers { };
+
   bibtexparser = callPackage ../development/python-modules/bibtexparser { };
+
   bibtexparser_2 = callPackage ../development/python-modules/bibtexparser/2.nix { };
+
   bidict = callPackage ../development/python-modules/bidict { };
+
   bids-validator = callPackage ../development/python-modules/bids-validator { };
+
   bidsschematools = callPackage ../development/python-modules/bidsschematools { };
+
   biliass = callPackage ../development/python-modules/biliass { };
+
   bilibili-api-python = callPackage ../development/python-modules/bilibili-api-python { };
+
   billiard = callPackage ../development/python-modules/billiard { };
+
   bimmer-connected = callPackage ../development/python-modules/bimmer-connected { };
+
   binance-connector = callPackage ../development/python-modules/binance-connector { };
+
   binary = callPackage ../development/python-modules/binary { };
+
   binary2strings = callPackage ../development/python-modules/binary2strings { };
+
   binaryornot = callPackage ../development/python-modules/binaryornot { };
+
   bincopy = callPackage ../development/python-modules/bincopy { };
+
   bindep = callPackage ../development/python-modules/bindep { };
+
   binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { };
+
   binsync = callPackage ../development/python-modules/binsync { };
+
   biom-format = callPackage ../development/python-modules/biom-format { };
+
   biopandas = callPackage ../development/python-modules/biopandas { };
+
   biopython = callPackage ../development/python-modules/biopython { };
+
   biosppy = callPackage ../development/python-modules/biosppy { };
+
   biothings-client = callPackage ../development/python-modules/biothings-client { };
+
   bip-utils = callPackage ../development/python-modules/bip-utils { };
+
   bip32 = callPackage ../development/python-modules/bip32 { };
+
   biplist = callPackage ../development/python-modules/biplist { };
+
   birch = callPackage ../development/python-modules/birch { };
+
   bitarray = callPackage ../development/python-modules/bitarray { };
+
   bitbox02 = callPackage ../development/python-modules/bitbox02 { };
+
   bitcoin-utils-fork-minimal =
     callPackage ../development/python-modules/bitcoin-utils-fork-minimal
       { };
+
   bitcoinrpc = callPackage ../development/python-modules/bitcoinrpc { };
+
   bite-parser = callPackage ../development/python-modules/bite-parser { };
+
   bitlist = callPackage ../development/python-modules/bitlist { };
+
   bitmath = callPackage ../development/python-modules/bitmath { };
+
   bitsandbytes = callPackage ../development/python-modules/bitsandbytes { };
+
   bitstring = callPackage ../development/python-modules/bitstring { };
+
   bitstruct = callPackage ../development/python-modules/bitstruct { };
+
   bitvavo-aio = callPackage ../development/python-modules/bitvavo-aio { };
+
   bitvector-for-humans = callPackage ../development/python-modules/bitvector-for-humans { };
+
   bizkaibus = callPackage ../development/python-modules/bizkaibus { };
+
   bjoern = callPackage ../development/python-modules/bjoern { };
+
   bk7231tools = callPackage ../development/python-modules/bk7231tools { };
+
   bkcharts = callPackage ../development/python-modules/bkcharts { };
+
   black = callPackage ../development/python-modules/black { };
+
   black-macchiato = callPackage ../development/python-modules/black-macchiato { };
+
   blacken-docs = callPackage ../development/python-modules/blacken-docs { };
+
   blackjax = callPackage ../development/python-modules/blackjax { };
+
   blackrenderer = callPackage ../development/python-modules/blackrenderer { };
+
   blake3 = callPackage ../development/python-modules/blake3 { };
+
   bleach = callPackage ../development/python-modules/bleach { };
+
   bleach-allowlist = callPackage ../development/python-modules/bleach-allowlist { };
+
   bleak = callPackage ../development/python-modules/bleak { };
+
   bleak-esphome = callPackage ../development/python-modules/bleak-esphome { };
+
   bleak-retry-connector = callPackage ../development/python-modules/bleak-retry-connector { };
+
   blebox-uniapi = callPackage ../development/python-modules/blebox-uniapi { };
+
   bless = callPackage ../development/python-modules/bless { };
+
   blessed = callPackage ../development/python-modules/blessed { };
+
   blinker = callPackage ../development/python-modules/blinker { };
+
   blinkpy = callPackage ../development/python-modules/blinkpy { };
+
   blinkstick = callPackage ../development/python-modules/blinkstick { };
+
   blis = callPackage ../development/python-modules/blis { };
+
   blivet = callPackage ../development/python-modules/blivet { };
+
   blobfile = callPackage ../development/python-modules/blobfile { };
+
   block-io = callPackage ../development/python-modules/block-io { };
+
   blockbuster = callPackage ../development/python-modules/blockbuster { };
+
   blockchain = callPackage ../development/python-modules/blockchain { };
+
   blockdiag = callPackage ../development/python-modules/blockdiag { };
+
   blockfrost-python = callPackage ../development/python-modules/blockfrost-python { };
+
   blocksat-cli = callPackage ../development/python-modules/blocksat-cli { };
+
   bloodhound-py = callPackage ../development/python-modules/bloodhound-py { };
+
   bloodyad = callPackage ../development/python-modules/bloodyad { };
+
   blosc2 = callPackage ../development/python-modules/blosc2 { };
+
   bluecurrent-api = callPackage ../development/python-modules/bluecurrent-api { };
+
   bluemaestro-ble = callPackage ../development/python-modules/bluemaestro-ble { };
+
   bluepy = callPackage ../development/python-modules/bluepy { };
+
   bluepy-devices = callPackage ../development/python-modules/bluepy-devices { };
+
   bluetooth-adapters = callPackage ../development/python-modules/bluetooth-adapters { };
+
   bluetooth-auto-recovery = callPackage ../development/python-modules/bluetooth-auto-recovery { };
+
   bluetooth-data-tools = callPackage ../development/python-modules/bluetooth-data-tools { };
+
   bluetooth-sensor-state-data =
     callPackage ../development/python-modules/bluetooth-sensor-state-data
       { };
+
   blurhash = callPackage ../development/python-modules/blurhash { };
+
   blurhash-python = callPackage ../development/python-modules/blurhash-python { };
+
   bme280spi = callPackage ../development/python-modules/bme280spi { };
+
   bme680 = callPackage ../development/python-modules/bme680 { };
+
   bnnumerizer = callPackage ../development/python-modules/bnnumerizer { };
+
   bnunicodenormalizer = callPackage ../development/python-modules/bnunicodenormalizer { };
+
   boa-api = callPackage ../development/python-modules/boa-api { };
+
   boiboite-opener-framework = callPackage ../development/python-modules/boiboite-opener-framework { };
+
   boilerpy3 = callPackage ../development/python-modules/boilerpy3 { };
+
   bokeh = callPackage ../development/python-modules/bokeh { };
+
   bokeh-sampledata = callPackage ../development/python-modules/bokeh-sampledata { };
+
   boltons = callPackage ../development/python-modules/boltons { };
+
   boltztrap2 = callPackage ../development/python-modules/boltztrap2 { };
+
   bond-api = callPackage ../development/python-modules/bond-api { };
+
   bond-async = callPackage ../development/python-modules/bond-async { };
+
   bonsai = callPackage ../development/python-modules/bonsai { };
+
   boolean-py = callPackage ../development/python-modules/boolean-py { };
+
   booleanoperations = callPackage ../development/python-modules/booleanoperations { };
+
   # Build boost for this specific Python version
   # TODO: use separate output for libboost_python.so
   boost = toPythonModule (
@@ -1114,576 +2049,1101 @@ self: super: with self; {
       enablePython = true;
     }
   );
+
   boost-histogram = callPackage ../development/python-modules/boost-histogram {
     inherit (pkgs) boost;
   };
+
   borb = callPackage ../development/python-modules/borb { };
+
   bork = callPackage ../development/python-modules/bork { };
+
   bosch-alarm-mode2 = callPackage ../development/python-modules/bosch-alarm-mode2 { };
+
   boschshcpy = callPackage ../development/python-modules/boschshcpy { };
+
   bot-safe-agents = callPackage ../development/python-modules/bot-safe-agents { };
+
   boto3 = callPackage ../development/python-modules/boto3 { };
+
   boto3-stubs = callPackage ../development/python-modules/boto3-stubs { };
+
   botocore = callPackage ../development/python-modules/botocore { };
+
   botocore-stubs = callPackage ../development/python-modules/botocore-stubs { };
+
   botorch = callPackage ../development/python-modules/botorch { };
+
   bottle = callPackage ../development/python-modules/bottle { };
+
   bottleneck = callPackage ../development/python-modules/bottleneck { };
+
   bottombar = callPackage ../development/python-modules/bottombar { };
+
   bpemb = callPackage ../development/python-modules/bpemb { };
+
   bpylist2 = callPackage ../development/python-modules/bpylist2 { };
+
   bpython = callPackage ../development/python-modules/bpython { };
+
   bqplot = callPackage ../development/python-modules/bqplot { };
+
   bqscales = callPackage ../development/python-modules/bqscales { };
+
   braceexpand = callPackage ../development/python-modules/braceexpand { };
+
   bracex = callPackage ../development/python-modules/bracex { };
+
   brainflow = callPackage ../development/python-modules/brainflow { inherit (pkgs) brainflow; };
+
   braintree = callPackage ../development/python-modules/braintree { };
+
   branca = callPackage ../development/python-modules/branca { };
+
   bravado-core = callPackage ../development/python-modules/bravado-core { };
+
   bravia-tv = callPackage ../development/python-modules/bravia-tv { };
+
   brax = callPackage ../development/python-modules/brax { };
+
   breathe = callPackage ../development/python-modules/breathe { };
+
   breezy = callPackage ../development/python-modules/breezy { };
+
   brelpy = callPackage ../development/python-modules/brelpy { };
+
   brevo-python = callPackage ../development/python-modules/brevo-python { };
+
   brian2 = callPackage ../development/python-modules/brian2 { };
+
   bring-api = callPackage ../development/python-modules/bring-api { };
+
   broadbean = callPackage ../development/python-modules/broadbean { };
+
   broadlink = callPackage ../development/python-modules/broadlink { };
+
   brother = callPackage ../development/python-modules/brother { };
+
   brother-ql = callPackage ../development/python-modules/brother-ql { };
+
   brotli = callPackage ../development/python-modules/brotli { };
+
   brotli-asgi = callPackage ../development/python-modules/brotli-asgi { };
+
   brotlicffi = callPackage ../development/python-modules/brotlicffi { inherit (pkgs) brotli; };
+
   brotlipy = callPackage ../development/python-modules/brotlipy { };
+
   brottsplatskartan = callPackage ../development/python-modules/brottsplatskartan { };
+
   browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { };
+
   browserforge = callPackage ../development/python-modules/browserforge { };
+
   brunt = callPackage ../development/python-modules/brunt { };
+
   bsddb3 = callPackage ../development/python-modules/bsddb3 { };
+
   bsdiff4 = callPackage ../development/python-modules/bsdiff4 { };
+
   bson = callPackage ../development/python-modules/bson { };
+
   bsuite = callPackage ../development/python-modules/bsuite { };
+
   bt-proximity = callPackage ../development/python-modules/bt-proximity { };
+
   btchip-python = callPackage ../development/python-modules/btchip-python { };
+
   btest = callPackage ../development/python-modules/btest { };
+
   bthome-ble = callPackage ../development/python-modules/bthome-ble { };
+
   bthomehub5-devicelist = callPackage ../development/python-modules/bthomehub5-devicelist { };
+
   btrees = callPackage ../development/python-modules/btrees { };
+
   btrfs = callPackage ../development/python-modules/btrfs { };
+
   btrfsutil = callPackage ../development/python-modules/btrfsutil { };
+
   btsmarthub-devicelist = callPackage ../development/python-modules/btsmarthub-devicelist { };
+
   btsocket = callPackage ../development/python-modules/btsocket { };
+
   bubop = callPackage ../development/python-modules/bubop { };
+
   bucketstore = callPackage ../development/python-modules/bucketstore { };
+
   bugsnag = callPackage ../development/python-modules/bugsnag { };
+
   bugwarrior = callPackage ../development/python-modules/bugwarrior { };
+
   buienradar = callPackage ../development/python-modules/buienradar { };
+
   build = callPackage ../development/python-modules/build { };
+
   buildcatrust = callPackage ../development/python-modules/buildcatrust { };
+
   buildstream-plugins = callPackage ../development/python-modules/buildstream-plugins { };
+
   bump-my-version = callPackage ../development/python-modules/bump-my-version { };
+
   bump2version = callPackage ../development/python-modules/bump2version { };
+
   bumpfontversion = callPackage ../development/python-modules/bumpfontversion { };
+
   bumps = callPackage ../development/python-modules/bumps { };
+
   bunch = callPackage ../development/python-modules/bunch { };
+
   bundlewrap = callPackage ../development/python-modules/bundlewrap { };
+
   bundlewrap-keepass = callPackage ../development/python-modules/bundlewrap-keepass { };
+
   bundlewrap-pass = callPackage ../development/python-modules/bundlewrap-pass { };
+
   bundlewrap-teamvault = callPackage ../development/python-modules/bundlewrap-teamvault { };
+
   busylight-for-humans = callPackage ../development/python-modules/busylight-for-humans { };
+
   busypie = callPackage ../development/python-modules/busypie { };
+
   bwapy = callPackage ../development/python-modules/bwapy { };
+
   bx-py-utils = callPackage ../development/python-modules/bx-py-utils { };
+
   bx-python = callPackage ../development/python-modules/bx-python { };
+
   bytecode = callPackage ../development/python-modules/bytecode { };
+
   bytesize = toPythonModule (pkgs.libbytesize.override { python3Packages = self; });
+
   bytewax = callPackage ../development/python-modules/bytewax { };
+
   bz2file = callPackage ../development/python-modules/bz2file { };
+
   cache = callPackage ../development/python-modules/cache { };
+
   cachecontrol = callPackage ../development/python-modules/cachecontrol { };
+
   cached-ipaddress = callPackage ../development/python-modules/cached-ipaddress { };
+
   cached-property = callPackage ../development/python-modules/cached-property { };
+
   cachelib = callPackage ../development/python-modules/cachelib { };
+
   cachetools = callPackage ../development/python-modules/cachetools { };
+
   cachey = callPackage ../development/python-modules/cachey { };
+
   cachier = callPackage ../development/python-modules/cachier { };
+
   cachy = callPackage ../development/python-modules/cachy { };
+
   caffe = toPythonModule (
     pkgs.caffe.override {
       pythonSupport = true;
       inherit (self) python numpy boost;
     }
   );
+
   caio = callPackage ../development/python-modules/caio { };
+
   cairocffi = callPackage ../development/python-modules/cairocffi { };
+
   cairosvg = callPackage ../development/python-modules/cairosvg { };
+
   caldav = callPackage ../development/python-modules/caldav { };
+
   callee = callPackage ../development/python-modules/callee { };
+
   calmjs = callPackage ../development/python-modules/calmjs { };
+
   calmjs-parse = callPackage ../development/python-modules/calmjs-parse { };
+
   calmjs-types = callPackage ../development/python-modules/calmjs-types { };
+
   calmsize = callPackage ../development/python-modules/calmsize { };
+
   calver = callPackage ../development/python-modules/calver { };
+
   calysto = callPackage ../development/python-modules/calysto { };
+
   calysto-scheme = callPackage ../development/python-modules/calysto-scheme { };
+
   camel-converter = callPackage ../development/python-modules/camel-converter { };
+
   camelot = callPackage ../development/python-modules/camelot { };
+
   can-isotp = callPackage ../development/python-modules/can-isotp { };
+
   canals = callPackage ../development/python-modules/canals { };
+
   canmatrix = callPackage ../development/python-modules/canmatrix { };
+
   canonical-sphinx-extensions =
     callPackage ../development/python-modules/canonical-sphinx-extensions
       { };
+
   canonicaljson = callPackage ../development/python-modules/canonicaljson { };
+
   canopen = callPackage ../development/python-modules/canopen { };
+
   cantools = callPackage ../development/python-modules/cantools { };
+
   capstone = callPackage ../development/python-modules/capstone { inherit (pkgs) capstone; };
+
   capstone_4 = callPackage ../development/python-modules/capstone/4.nix {
     inherit (pkgs) capstone_4;
   };
+
   captcha = callPackage ../development/python-modules/captcha { };
+
   captum = callPackage ../development/python-modules/captum { };
+
   capturer = callPackage ../development/python-modules/capturer { };
+
   carbon = callPackage ../development/python-modules/carbon { };
+
   cardano-tools = callPackage ../development/python-modules/cardano-tools { };
+
   cardimpose = callPackage ../development/python-modules/cardimpose { };
+
   cart = callPackage ../development/python-modules/cart { };
+
   cartopy = callPackage ../development/python-modules/cartopy { };
+
   casa-formats-io = callPackage ../development/python-modules/casa-formats-io { };
+
   casadi = toPythonModule (
     pkgs.casadi.override {
       pythonSupport = true;
       python3Packages = self;
     }
   );
+
   case-converter = callPackage ../development/python-modules/case-converter { };
+
   cashaddress = callPackage ../development/python-modules/cashaddress { };
+
   cashews = callPackage ../development/python-modules/cashews { };
+
   cassandra-driver = callPackage ../development/python-modules/cassandra-driver { };
+
   castepxbin = callPackage ../development/python-modules/castepxbin { };
+
   casttube = callPackage ../development/python-modules/casttube { };
+
   catalogue = callPackage ../development/python-modules/catalogue { };
+
   catalyst = toPythonModule (
     pkgs.catalyst.override {
       python3Packages = self;
       pythonSupport = true;
     }
   );
+
   catboost = callPackage ../development/python-modules/catboost {
     catboost = pkgs.catboost.override {
       pythonSupport = true;
       python3Packages = self;
     };
   };
+
   catkin-pkg = callPackage ../development/python-modules/catkin-pkg { };
+
   catppuccin = callPackage ../development/python-modules/catppuccin { };
+
   cattrs = callPackage ../development/python-modules/cattrs { };
+
   causal-conv1d = callPackage ../development/python-modules/causal-conv1d { };
+
   cbor = callPackage ../development/python-modules/cbor { };
+
   cbor2 = callPackage ../development/python-modules/cbor2 { };
+
   cbor2WithoutCExtensions = callPackage ../development/python-modules/cbor2 {
     withCExtensions = false;
   };
+
   cccolutils = callPackage ../development/python-modules/cccolutils { krb5-c = pkgs.krb5; };
+
   cdcs = callPackage ../development/python-modules/cdcs { };
+
   cddlparser = callPackage ../development/python-modules/cddlparser { };
+
   cdxj-indexer = callPackage ../development/python-modules/cdxj-indexer { };
+
   celery = callPackage ../development/python-modules/celery { };
+
   celery-batches = callPackage ../development/python-modules/celery-batches { };
+
   celery-redbeat = callPackage ../development/python-modules/celery-redbeat { };
+
   celery-singleton = callPackage ../development/python-modules/celery-singleton { };
+
   celery-types = callPackage ../development/python-modules/celery-types { };
+
   cement = callPackage ../development/python-modules/cement { };
+
   cemm = callPackage ../development/python-modules/cemm { };
+
   censys = callPackage ../development/python-modules/censys { };
+
   cerberus = callPackage ../development/python-modules/cerberus { };
+
   cert-chain-resolver = callPackage ../development/python-modules/cert-chain-resolver { };
+
   certauth = callPackage ../development/python-modules/certauth { };
+
   certbot = callPackage ../development/python-modules/certbot { };
+
   certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { };
+
   certbot-dns-google = callPackage ../development/python-modules/certbot-dns-google { };
+
   certbot-dns-inwx = callPackage ../development/python-modules/certbot-dns-inwx { };
+
   certbot-dns-ovh = callPackage ../development/python-modules/certbot-dns-ovh { };
+
   certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { };
+
   certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { };
+
   certbot-nginx = callPackage ../development/python-modules/certbot-nginx { };
+
   certifi = callPackage ../development/python-modules/certifi { };
+
   certipy = callPackage ../development/python-modules/certipy { };
+
   certipy-ad = callPackage ../development/python-modules/certipy-ad { };
+
   certomancer = callPackage ../development/python-modules/certomancer { };
+
   certvalidator = callPackage ../development/python-modules/certvalidator { };
+
   cexprtk = callPackage ../development/python-modules/cexprtk { };
+
   cf-xarray = callPackage ../development/python-modules/cf-xarray { };
+
   cffconvert = callPackage ../development/python-modules/cffconvert { };
+
   cffi = callPackage ../development/python-modules/cffi { };
+
   cffsubr = callPackage ../development/python-modules/cffsubr { };
+
   cfgv = callPackage ../development/python-modules/cfgv { };
+
   cflib = callPackage ../development/python-modules/cflib { };
+
   cfn-flip = callPackage ../development/python-modules/cfn-flip { };
+
   cfn-lint = callPackage ../development/python-modules/cfn-lint { };
+
   cfscrape = callPackage ../development/python-modules/cfscrape { };
+
   cftime = callPackage ../development/python-modules/cftime { };
+
   cgal = callPackage ../development/python-modules/cgal { inherit (pkgs) cgal; };
+
   cgen = callPackage ../development/python-modules/cgen { };
+
   cgroup-utils = callPackage ../development/python-modules/cgroup-utils { };
+
   chacha20poly1305 = callPackage ../development/python-modules/chacha20poly1305 { };
+
   chacha20poly1305-reuseable =
     callPackage ../development/python-modules/chacha20poly1305-reuseable
       { };
+
   chai = callPackage ../development/python-modules/chai { };
+
   chainmap = callPackage ../development/python-modules/chainmap { };
+
   chainstream = callPackage ../development/python-modules/chainstream { };
+
   chalice = callPackage ../development/python-modules/chalice { };
+
   chameleon = callPackage ../development/python-modules/chameleon { };
+
   changefinder = callPackage ../development/python-modules/changefinder { };
+
   changelog-chug = callPackage ../development/python-modules/changelog-chug { };
+
   channels = callPackage ../development/python-modules/channels { };
+
   channels-redis = callPackage ../development/python-modules/channels-redis { };
+
   character-encoding-utils = callPackage ../development/python-modules/character-encoding-utils { };
+
   characteristic = callPackage ../development/python-modules/characteristic { };
+
   chardet = callPackage ../development/python-modules/chardet { };
+
   charset-normalizer = callPackage ../development/python-modules/charset-normalizer { };
+
   chart-studio = callPackage ../development/python-modules/chart-studio { };
+
   chat-downloader = callPackage ../development/python-modules/chat-downloader { };
+
   check-manifest = callPackage ../development/python-modules/check-manifest { };
+
   checkdmarc = callPackage ../development/python-modules/checkdmarc { };
+
   checkpoint-schedules = callPackage ../development/python-modules/checkpoint-schedules { };
+
   checksumdir = callPackage ../development/python-modules/checksumdir { };
+
   cheetah3 = callPackage ../development/python-modules/cheetah3 { };
+
   cheroot = callPackage ../development/python-modules/cheroot { };
+
   cherrypy = callPackage ../development/python-modules/cherrypy { };
+
   cherrypy-cors = callPackage ../development/python-modules/cherrypy-cors { };
+
   chess = callPackage ../development/python-modules/chess { };
+
   chevron = callPackage ../development/python-modules/chevron { };
+
   chex = callPackage ../development/python-modules/chex { };
+
   chirpstack-api = callPackage ../development/python-modules/chirpstack-api { };
+
   chispa = callPackage ../development/python-modules/chispa { };
+
   chroma-hnswlib = callPackage ../development/python-modules/chroma-hnswlib { };
+
   chromadb = callPackage ../development/python-modules/chromadb { };
+
   chromaprint = callPackage ../development/python-modules/chromaprint { };
+
   ci-info = callPackage ../development/python-modules/ci-info { };
+
   ci-py = callPackage ../development/python-modules/ci-py { };
+
   cinemagoer = callPackage ../development/python-modules/cinemagoer { };
+
   circuit-webhook = callPackage ../development/python-modules/circuit-webhook { };
+
   circuitbreaker = callPackage ../development/python-modules/circuitbreaker { };
+
   circus = callPackage ../development/python-modules/circus { };
+
   cirq = callPackage ../development/python-modules/cirq { };
+
   cirq-aqt = callPackage ../development/python-modules/cirq-aqt { };
+
   cirq-core = callPackage ../development/python-modules/cirq-core { };
+
   cirq-google = callPackage ../development/python-modules/cirq-google { };
+
   cirq-ionq = callPackage ../development/python-modules/cirq-ionq { };
+
   cirq-pasqal = callPackage ../development/python-modules/cirq-pasqal { };
+
   cirq-rigetti = callPackage ../development/python-modules/cirq-rigetti { };
+
   cirq-web = callPackage ../development/python-modules/cirq-web { };
+
   ciscoconfparse2 = callPackage ../development/python-modules/ciscoconfparse2 { };
+
   ciscomobilityexpress = callPackage ../development/python-modules/ciscomobilityexpress { };
+
   ciso8601 = callPackage ../development/python-modules/ciso8601 { };
+
   citeproc-py = callPackage ../development/python-modules/citeproc-py { };
+
   cjkwrap = callPackage ../development/python-modules/cjkwrap { };
+
   ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { };
+
   ckzg = callPackage ../development/python-modules/ckzg { };
+
   clarabel = callPackage ../development/python-modules/clarabel { };
+
   clarifai = callPackage ../development/python-modules/clarifai { };
+
   clarifai-grpc = callPackage ../development/python-modules/clarifai-grpc { };
+
   clarifai-protocol = callPackage ../development/python-modules/clarifai-protocol { };
+
   claripy = callPackage ../development/python-modules/claripy { };
+
   class-doc = callPackage ../development/python-modules/class-doc { };
+
   classify-imports = callPackage ../development/python-modules/classify-imports { };
+
   cle = callPackage ../development/python-modules/cle { };
+
   clean-fid = callPackage ../development/python-modules/clean-fid { };
+
   cleanit = callPackage ../development/python-modules/cleanit { };
+
   cleanlab = callPackage ../development/python-modules/cleanlab { };
+
   cleanvision = callPackage ../development/python-modules/cleanvision { };
+
   cleo = callPackage ../development/python-modules/cleo { };
+
   clevercsv = callPackage ../development/python-modules/clevercsv { };
+
   clf = callPackage ../development/python-modules/clf { };
+
   cli-helpers = callPackage ../development/python-modules/cli-helpers { };
+
   cli-ui = callPackage ../development/python-modules/cli-ui { };
+
   cliche = callPackage ../development/python-modules/cliche { };
+
   click = callPackage ../development/python-modules/click { };
+
   click-aliases = callPackage ../development/python-modules/click-aliases { };
+
   click-command-tree = callPackage ../development/python-modules/click-command-tree { };
+
   click-completion = callPackage ../development/python-modules/click-completion { };
+
   click-configfile = callPackage ../development/python-modules/click-configfile { };
+
   click-datetime = callPackage ../development/python-modules/click-datetime { };
+
   click-default-group = callPackage ../development/python-modules/click-default-group { };
+
   click-didyoumean = callPackage ../development/python-modules/click-didyoumean { };
+
   click-help-colors = callPackage ../development/python-modules/click-help-colors { };
+
   click-log = callPackage ../development/python-modules/click-log { };
+
   click-odoo = callPackage ../development/python-modules/click-odoo { };
+
   click-odoo-contrib = callPackage ../development/python-modules/click-odoo-contrib { };
+
   click-option-group = callPackage ../development/python-modules/click-option-group { };
+
   click-plugins = callPackage ../development/python-modules/click-plugins { };
+
   click-repl = callPackage ../development/python-modules/click-repl { };
+
   click-shell = callPackage ../development/python-modules/click-shell { };
+
   click-spinner = callPackage ../development/python-modules/click-spinner { };
+
   click-threading = callPackage ../development/python-modules/click-threading { };
+
   clickclick = callPackage ../development/python-modules/clickclick { };
+
   clickgen = callPackage ../development/python-modules/clickgen { };
+
   clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash { };
+
   clickhouse-cli = callPackage ../development/python-modules/clickhouse-cli { };
+
   clickhouse-connect = callPackage ../development/python-modules/clickhouse-connect { };
+
   clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver { };
+
   cliff = callPackage ../development/python-modules/cliff { };
+
   clifford = callPackage ../development/python-modules/clifford { };
+
   cligj = callPackage ../development/python-modules/cligj { };
+
   clikit = callPackage ../development/python-modules/clikit { };
+
   clint = callPackage ../development/python-modules/clint { };
+
   clintermission = callPackage ../development/python-modules/clintermission { };
+
   clip = callPackage ../development/python-modules/clip { };
+
   clip-anytorch = callPackage ../development/python-modules/clip-anytorch { };
+
   clize = callPackage ../development/python-modules/clize { };
+
   clldutils = callPackage ../development/python-modules/clldutils { };
+
   cloudcheck = callPackage ../development/python-modules/cloudcheck { };
+
   cloudevents = callPackage ../development/python-modules/cloudevents { };
+
   cloudflare = callPackage ../development/python-modules/cloudflare { };
+
   cloudpathlib = callPackage ../development/python-modules/cloudpathlib { };
+
   cloudpickle = callPackage ../development/python-modules/cloudpickle { };
+
   cloudscraper = callPackage ../development/python-modules/cloudscraper { };
+
   cloudsmith-api = callPackage ../development/python-modules/cloudsmith-api { };
+
   cloudsplaining = callPackage ../development/python-modules/cloudsplaining { };
+
   cloup = callPackage ../development/python-modules/cloup { };
+
   clr-loader = callPackage ../development/python-modules/clr-loader { };
+
   cltk = callPackage ../development/python-modules/cltk { };
+
   clustershell = callPackage ../development/python-modules/clustershell { };
+
   cma = callPackage ../development/python-modules/cma { };
+
   cmaes = callPackage ../development/python-modules/cmaes { };
+
   cmake = callPackage ../development/python-modules/cmake { inherit (pkgs) cmake; };
+
   cmake-build-extension = callPackage ../development/python-modules/cmake-build-extension { };
+
   cmarkgfm = callPackage ../development/python-modules/cmarkgfm { };
+
   cmd2 = callPackage ../development/python-modules/cmd2 { };
+
   cmd2-ext-test = callPackage ../development/python-modules/cmd2-ext-test { };
+
   cmdline = callPackage ../development/python-modules/cmdline { };
+
   cmdstanpy = callPackage ../development/python-modules/cmdstanpy { };
+
   cmigemo = callPackage ../development/python-modules/cmigemo { inherit (pkgs) cmigemo; };
+
   cmsdials = callPackage ../development/python-modules/cmsdials { };
+
   cmsis-pack-manager = callPackage ../development/python-modules/cmsis-pack-manager { };
+
   cmsis-svd = callPackage ../development/python-modules/cmsis-svd { };
+
   cnvkit = callPackage ../development/python-modules/cnvkit { };
+
   co2signal = callPackage ../development/python-modules/co2signal { };
+
   coal = toPythonModule (
     pkgs.coal.override {
       pythonSupport = true;
       python3Packages = self;
     }
   );
+
   coapthon3 = callPackage ../development/python-modules/coapthon3 { };
+
   cobble = callPackage ../development/python-modules/cobble { };
+
   cobs = callPackage ../development/python-modules/cobs { };
+
   cock = callPackage ../development/python-modules/cock { };
+
   coconut = callPackage ../development/python-modules/coconut { };
+
   cocotb = callPackage ../development/python-modules/cocotb { };
+
   cocotb-bus = callPackage ../development/python-modules/cocotb-bus { };
+
   codepy = callPackage ../development/python-modules/codepy { };
+
   coffea = callPackage ../development/python-modules/coffea { };
+
   cogapp = callPackage ../development/python-modules/cogapp { };
+
   cohere = callPackage ../development/python-modules/cohere { };
+
   coiled = callPackage ../development/python-modules/coiled { };
+
   coinbase-advanced-py = callPackage ../development/python-modules/coinbase-advanced-py { };
+
   coincurve = callPackage ../development/python-modules/coincurve { inherit (pkgs) secp256k1; };
+
   coinmetrics-api-client = callPackage ../development/python-modules/coinmetrics-api-client { };
+
   colander = callPackage ../development/python-modules/colander { };
+
   colanderalchemy = callPackage ../development/python-modules/colanderalchemy { };
+
   colbert-ai = callPackage ../development/python-modules/colbert-ai { };
+
   colcon = callPackage ../development/python-modules/colcon { };
+
   colcon-argcomplete = callPackage ../development/python-modules/colcon-argcomplete { };
+
   colcon-cargo = callPackage ../development/python-modules/colcon-cargo { };
+
   colcon-defaults = callPackage ../development/python-modules/colcon-defaults { };
+
   colcon-library-path = callPackage ../development/python-modules/colcon-library-path { };
+
   colcon-mixin = callPackage ../development/python-modules/colcon-mixin { };
+
   colcon-notification = callPackage ../development/python-modules/colcon-notification { };
+
   colcon-output = callPackage ../development/python-modules/colcon-output { };
+
   colcon-package-information =
     callPackage ../development/python-modules/colcon-package-information
       { };
+
   colcon-parallel-executor = callPackage ../development/python-modules/colcon-parallel-executor { };
+
   colcon-ros-domain-id-coordinator =
     callPackage ../development/python-modules/colcon-ros-domain-id-coordinator
       { };
+
   collections-extended = callPackage ../development/python-modules/collections-extended { };
+
   collidoscope = callPackage ../development/python-modules/collidoscope { };
+
   color-operations = callPackage ../development/python-modules/color-operations { };
+
   color-parser-py = callPackage ../development/python-modules/color-parser-py { };
+
   colorama = callPackage ../development/python-modules/colorama { };
+
   colorcet = callPackage ../development/python-modules/colorcet { };
+
   colorclass = callPackage ../development/python-modules/colorclass { };
+
   colored = callPackage ../development/python-modules/colored { };
+
   colored-traceback = callPackage ../development/python-modules/colored-traceback { };
+
   coloredlogs = callPackage ../development/python-modules/coloredlogs { };
+
   colorful = callPackage ../development/python-modules/colorful { };
+
   colorlog = callPackage ../development/python-modules/colorlog { };
+
   colorlover = callPackage ../development/python-modules/colorlover { };
+
   colormath = callPackage ../development/python-modules/colormath { };
+
   colormath2 = callPackage ../development/python-modules/colormath2 { };
+
   colorspacious = callPackage ../development/python-modules/colorspacious { };
+
   colorthief = callPackage ../development/python-modules/colorthief { };
+
   colorzero = callPackage ../development/python-modules/colorzero { };
+
   colour = callPackage ../development/python-modules/colour { };
+
   colout = callPackage ../development/python-modules/colout { };
+
   cometblue-lite = callPackage ../development/python-modules/cometblue-lite { };
+
   comicapi = callPackage ../development/python-modules/comicapi { };
+
   comicon = callPackage ../development/python-modules/comicon { };
+
   comm = callPackage ../development/python-modules/comm { };
+
   command-runner = callPackage ../development/python-modules/command-runner { };
+
   commandlines = callPackage ../development/python-modules/commandlines { };
+
   commandparse = callPackage ../development/python-modules/commandparse { };
+
   commentjson = callPackage ../development/python-modules/commentjson { };
+
   commitizen = callPackage ../development/python-modules/commitizen { };
+
   commoncode = callPackage ../development/python-modules/commoncode { };
+
   commonmark = callPackage ../development/python-modules/commonmark { };
+
   commonregex = callPackage ../development/python-modules/commonregex { };
+
   compliance-trestle = callPackage ../development/python-modules/compliance-trestle { };
+
   complycube = callPackage ../development/python-modules/complycube { };
+
   compreffor = callPackage ../development/python-modules/compreffor { };
+
   compressai = callPackage ../development/python-modules/compressai { };
+
   compressed-rtf = callPackage ../development/python-modules/compressed-rtf { };
+
   compressed-tensors = callPackage ../development/python-modules/compressed-tensors { };
+
   concurrent-log-handler = callPackage ../development/python-modules/concurrent-log-handler { };
+
   conda = callPackage ../development/python-modules/conda { };
+
   conda-inject = callPackage ../development/python-modules/conda-inject { };
+
   conda-libmamba-solver = callPackage ../development/python-modules/conda-libmamba-solver { };
+
   conda-package-handling = callPackage ../development/python-modules/conda-package-handling { };
+
   conda-package-streaming = callPackage ../development/python-modules/conda-package-streaming { };
+
   condense-json = callPackage ../development/python-modules/condense-json { };
+
   conduit = callPackage ../development/python-modules/conduit { };
+
   conduit-mpi = callPackage ../development/python-modules/conduit { mpiSupport = true; };
+
   confection = callPackage ../development/python-modules/confection { };
+
   configargparse = callPackage ../development/python-modules/configargparse { };
+
   configclass = callPackage ../development/python-modules/configclass { };
+
   confight = callPackage ../development/python-modules/confight { };
+
   configobj = callPackage ../development/python-modules/configobj { };
+
   configparser = callPackage ../development/python-modules/configparser { };
+
   configshell-fb = callPackage ../development/python-modules/configshell-fb { };
+
   configupdater = callPackage ../development/python-modules/configupdater { };
+
   confluent-kafka = callPackage ../development/python-modules/confluent-kafka { };
+
   confusable-homoglyphs = callPackage ../development/python-modules/confusable-homoglyphs { };
+
   confuse = callPackage ../development/python-modules/confuse { };
+
   conjure-python-client = callPackage ../development/python-modules/conjure-python-client { };
+
   connect-box = callPackage ../development/python-modules/connect-box { };
+
   connected-components-3d = callPackage ../development/python-modules/connected-components-3d { };
+
   connection-pool = callPackage ../development/python-modules/connection-pool { };
+
   connexion = callPackage ../development/python-modules/connexion { };
+
   connio = callPackage ../development/python-modules/connio { };
+
   cons = callPackage ../development/python-modules/cons { };
+
   consolekit = callPackage ../development/python-modules/consolekit { };
+
   consonance = callPackage ../development/python-modules/consonance { };
+
   constantdict = callPackage ../development/python-modules/constantdict { };
+
   constantly = callPackage ../development/python-modules/constantly { };
+
   construct = callPackage ../development/python-modules/construct { };
+
   construct-classes = callPackage ../development/python-modules/construct-classes { };
+
   construct-typing = callPackage ../development/python-modules/construct-typing { };
+
   consul = callPackage ../development/python-modules/consul { };
+
   container-inspector = callPackage ../development/python-modules/container-inspector { };
+
   contexter = callPackage ../development/python-modules/contexter { };
+
   contextlib2 = callPackage ../development/python-modules/contextlib2 { };
+
   contexttimer = callPackage ../development/python-modules/contexttimer { };
+
   contourpy = callPackage ../development/python-modules/contourpy { };
+
   controku = callPackage ../development/python-modules/controku { };
+
   control = callPackage ../development/python-modules/control { };
+
   convertdate = callPackage ../development/python-modules/convertdate { };
+
   convertertools = callPackage ../development/python-modules/convertertools { };
+
   conway-polynomials = callPackage ../development/python-modules/conway-polynomials { };
+
   cookidoo-api = callPackage ../development/python-modules/cookidoo-api { };
+
   cookiecutter = callPackage ../development/python-modules/cookiecutter { };
+
   cookies = callPackage ../development/python-modules/cookies { };
+
   coolname = callPackage ../development/python-modules/coolname { };
+
   coordinates = callPackage ../development/python-modules/coordinates { };
+
   copier = callPackage ../development/python-modules/copier { };
+
   copier-template-tester = callPackage ../development/python-modules/copier-template-tester { };
+
   copykitten = callPackage ../development/python-modules/copykitten { };
+
   coqpit = callPackage ../development/python-modules/coqpit { };
+
   corallium = callPackage ../development/python-modules/corallium { };
+
   coreapi = callPackage ../development/python-modules/coreapi { };
+
   coredis = callPackage ../development/python-modules/coredis { };
+
   coreschema = callPackage ../development/python-modules/coreschema { };
+
   corner = callPackage ../development/python-modules/corner { };
+
   cornice = callPackage ../development/python-modules/cornice { };
+
   correctionlib = callPackage ../development/python-modules/correctionlib { };
+
   corsair-scan = callPackage ../development/python-modules/corsair-scan { };
+
   cose = callPackage ../development/python-modules/cose { };
+
   cot = callPackage ../development/python-modules/cot { inherit (pkgs) qemu; };
+
   countryguess = callPackage ../development/python-modules/countryguess { };
+
   courlan = callPackage ../development/python-modules/courlan { };
+
   coverage = callPackage ../development/python-modules/coverage { };
+
   coveralls = callPackage ../development/python-modules/coveralls { };
+
   cpe = callPackage ../development/python-modules/cpe { };
+
   cppe = callPackage ../development/python-modules/cppe { inherit (pkgs) cppe; };
+
   cppheaderparser = callPackage ../development/python-modules/cppheaderparser { };
+
   cppy = callPackage ../development/python-modules/cppy { };
+
   cpufeature = callPackage ../development/python-modules/cpufeature { };
+
   cpyparsing = callPackage ../development/python-modules/cpyparsing { };
+
   craft-application = callPackage ../development/python-modules/craft-application { };
+
   craft-archives = callPackage ../development/python-modules/craft-archives { };
+
   craft-cli = callPackage ../development/python-modules/craft-cli { };
+
   craft-grammar = callPackage ../development/python-modules/craft-grammar { };
+
   craft-parts = callPackage ../development/python-modules/craft-parts { };
+
   craft-platforms = callPackage ../development/python-modules/craft-platforms { };
+
   craft-providers = callPackage ../development/python-modules/craft-providers { };
+
   craft-store = callPackage ../development/python-modules/craft-store { };
+
   cram = callPackage ../development/python-modules/cram { };
+
   cramjam = callPackage ../development/python-modules/cramjam { };
+
   crashtest = callPackage ../development/python-modules/crashtest { };
+
   crate = callPackage ../development/python-modules/crate { };
+
   crayons = callPackage ../development/python-modules/crayons { };
+
   crc = callPackage ../development/python-modules/crc { };
+
   crc16 = callPackage ../development/python-modules/crc16 { };
+
   crc32c = callPackage ../development/python-modules/crc32c { };
+
   crccheck = callPackage ../development/python-modules/crccheck { };
+
   crcelk = callPackage ../development/python-modules/crcelk { };
+
   crcmod = callPackage ../development/python-modules/crcmod { };
+
   credstash = callPackage ../development/python-modules/credstash { };
+
   crispy-bootstrap3 = callPackage ../development/python-modules/crispy-bootstrap3 { };
+
   crispy-bootstrap4 = callPackage ../development/python-modules/crispy-bootstrap4 { };
+
   crispy-bootstrap5 = callPackage ../development/python-modules/crispy-bootstrap5 { };
+
   crochet = callPackage ../development/python-modules/crochet { };
+
   crocoddyl = toPythonModule (
     pkgs.crocoddyl.override {
       pythonSupport = true;
       python3Packages = self;
     }
   );
+
   cron-descriptor = callPackage ../development/python-modules/cron-descriptor { };
+
   croniter = callPackage ../development/python-modules/croniter { };
+
   cronsim = callPackage ../development/python-modules/cronsim { };
+
   crontab = callPackage ../development/python-modules/crontab { };
+
   crossandra = callPackage ../development/python-modules/crossandra { };
+
   crossplane = callPackage ../development/python-modules/crossplane { };
+
   crownstone-cloud = callPackage ../development/python-modules/crownstone-cloud { };
+
   crownstone-core = callPackage ../development/python-modules/crownstone-core { };
+
   crownstone-sse = callPackage ../development/python-modules/crownstone-sse { };
+
   crownstone-uart = callPackage ../development/python-modules/crownstone-uart { };
+
   cryptg = callPackage ../development/python-modules/cryptg { };
+
   cryptodatahub = callPackage ../development/python-modules/cryptodatahub { };
+
   cryptography = callPackage ../development/python-modules/cryptography { };
+
   cryptolyzer = callPackage ../development/python-modules/cryptolyzer { };
+
   cryptoparser = callPackage ../development/python-modules/cryptoparser { };
+
   crysp = callPackage ../development/python-modules/crysp { };
+
   crytic-compile = callPackage ../development/python-modules/crytic-compile { };
+
   csaf-tool = callPackage ../development/python-modules/csaf-tool { };
+
   csaps = callPackage ../development/python-modules/csaps { };
+
   cson = callPackage ../development/python-modules/cson { };
+
   csrmesh = callPackage ../development/python-modules/csrmesh { };
+
   css-html-js-minify = callPackage ../development/python-modules/css-html-js-minify { };
+
   css-inline = callPackage ../development/python-modules/css-inline { };
+
   css-parser = callPackage ../development/python-modules/css-parser { };
+
   cssbeautifier = callPackage ../development/python-modules/cssbeautifier { };
+
   csscompressor = callPackage ../development/python-modules/csscompressor { };
+
   cssmin = callPackage ../development/python-modules/cssmin { };
+
   cssselect = callPackage ../development/python-modules/cssselect { };
+
   cssselect2 = callPackage ../development/python-modules/cssselect2 { };
+
   cssutils = callPackage ../development/python-modules/cssutils { };
+
   cstruct = callPackage ../development/python-modules/cstruct { };
+
   csv2md = callPackage ../development/python-modules/csv2md { };
+
   csvw = callPackage ../development/python-modules/csvw { };
+
   ctap-keyring-device = callPackage ../development/python-modules/ctap-keyring-device { };
+
   ctranslate2 = callPackage ../development/python-modules/ctranslate2 {
     ctranslate2-cpp = pkgs.ctranslate2;
   };
+
   ctypesgen = callPackage ../development/python-modules/ctypesgen { };
+
   cu2qu = callPackage ../development/python-modules/cu2qu { };
+
   cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { };
+
   cupy = callPackage ../development/python-modules/cupy {
     cudaPackages = pkgs.cudaPackages.overrideScope (
       cu-fi: _: {
@@ -1693,895 +3153,1717 @@ self: super: with self; {
       }
     );
   };
+
   curated-tokenizers = callPackage ../development/python-modules/curated-tokenizers { };
+
   curated-transformers = callPackage ../development/python-modules/curated-transformers { };
+
   curio = callPackage ../development/python-modules/curio { };
+
   curio-compat = callPackage ../development/python-modules/curio-compat { };
+
   curl-cffi = callPackage ../development/python-modules/curl-cffi { };
+
   curlify = callPackage ../development/python-modules/curlify { };
+
   curtsies = callPackage ../development/python-modules/curtsies { };
+
   curvefitgui = callPackage ../development/python-modules/curvefitgui { };
+
   custom-json-diff = callPackage ../development/python-modules/custom-json-diff { };
+
   customtkinter = callPackage ../development/python-modules/customtkinter { };
+
   cut-cross-entropy = callPackage ../development/python-modules/cut-cross-entropy { };
+
   cvelib = callPackage ../development/python-modules/cvelib { };
+
   cvss = callPackage ../development/python-modules/cvss { };
+
   cvxopt = callPackage ../development/python-modules/cvxopt { };
+
   cvxpy = callPackage ../development/python-modules/cvxpy { };
+
   cwcwidth = callPackage ../development/python-modules/cwcwidth { };
+
   cwl-upgrader = callPackage ../development/python-modules/cwl-upgrader { };
+
   cwl-utils = callPackage ../development/python-modules/cwl-utils { };
+
   cwlformat = callPackage ../development/python-modules/cwlformat { };
+
   cx-freeze = callPackage ../development/python-modules/cx-freeze { };
+
   cx-oracle = callPackage ../development/python-modules/cx-oracle { };
+
   cxxfilt = callPackage ../development/python-modules/cxxfilt { };
+
   cxxheaderparser = callPackage ../development/python-modules/cxxheaderparser { };
+
   cybox = callPackage ../development/python-modules/cybox { };
+
   cycler = callPackage ../development/python-modules/cycler { };
+
   cyclonedds-python = callPackage ../development/python-modules/cyclonedds-python { };
+
   cyclonedx-python-lib = callPackage ../development/python-modules/cyclonedx-python-lib { };
+
   cyclopts = callPackage ../development/python-modules/cyclopts { };
+
   cyipopt = callPackage ../development/python-modules/cyipopt { };
+
   cymem = callPackage ../development/python-modules/cymem { };
+
   cymruwhois = callPackage ../development/python-modules/cymruwhois { };
+
   cynthion = callPackage ../development/python-modules/cynthion { };
+
   cypari = callPackage ../development/python-modules/cypari { };
+
   cypari2 = callPackage ../development/python-modules/cypari2 { };
+
   cypherpunkpay = callPackage ../development/python-modules/cypherpunkpay { };
+
   cyrtranslit = callPackage ../development/python-modules/cyrtranslit { };
+
   cysignals = callPackage ../development/python-modules/cysignals { };
+
   cython = callPackage ../development/python-modules/cython { };
+
   cython-test-exception-raiser =
     callPackage ../development/python-modules/cython-test-exception-raiser
       { };
+
   cython_0 = callPackage ../development/python-modules/cython/0.nix { };
+
   cytoolz = callPackage ../development/python-modules/cytoolz { };
+
   dacite = callPackage ../development/python-modules/dacite { };
+
   daemonize = callPackage ../development/python-modules/daemonize { };
+
   daemonocle = callPackage ../development/python-modules/daemonocle { };
+
   daff = callPackage ../development/python-modules/daff { };
+
   dahlia = callPackage ../development/python-modules/dahlia { };
+
   daiquiri = callPackage ../development/python-modules/daiquiri { };
+
   dalle-mini = callPackage ../development/python-modules/dalle-mini { };
+
   daltonlens = callPackage ../development/python-modules/daltonlens { };
+
   daphne = callPackage ../development/python-modules/daphne { };
+
   daqp = callPackage ../development/python-modules/daqp { };
+
   darkdetect = callPackage ../development/python-modules/darkdetect { };
+
   dartsim = toPythonModule (
     pkgs.dartsim.override {
       pythonSupport = true;
       python3Packages = self;
     }
   );
+
   dasbus = callPackage ../development/python-modules/dasbus { };
+
   dash = callPackage ../development/python-modules/dash { };
+
   dash-bootstrap-components = callPackage ../development/python-modules/dash-bootstrap-components { };
+
   dash-bootstrap-templates = callPackage ../development/python-modules/dash-bootstrap-templates { };
+
   dash-core-components = callPackage ../development/python-modules/dash-core-components { };
+
   dash-html-components = callPackage ../development/python-modules/dash-html-components { };
+
   dash-table = callPackage ../development/python-modules/dash-table { };
+
   dashing = callPackage ../development/python-modules/dashing { };
+
   dask = callPackage ../development/python-modules/dask { };
+
   dask-awkward = callPackage ../development/python-modules/dask-awkward { };
+
   dask-gateway = callPackage ../development/python-modules/dask-gateway { };
+
   dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { };
+
   dask-glm = callPackage ../development/python-modules/dask-glm { };
+
   dask-histogram = callPackage ../development/python-modules/dask-histogram { };
+
   dask-image = callPackage ../development/python-modules/dask-image { };
+
   dask-jobqueue = callPackage ../development/python-modules/dask-jobqueue { };
+
   dask-ml = callPackage ../development/python-modules/dask-ml { };
+
   dask-mpi = callPackage ../development/python-modules/dask-mpi { };
+
   dask-yarn = callPackage ../development/python-modules/dask-yarn { };
+
   databases = callPackage ../development/python-modules/databases { };
+
   databricks-cli = callPackage ../development/python-modules/databricks-cli { };
+
   databricks-connect = callPackage ../development/python-modules/databricks-connect { };
+
   databricks-sdk = callPackage ../development/python-modules/databricks-sdk { };
+
   databricks-sql-connector = callPackage ../development/python-modules/databricks-sql-connector { };
+
   dataclass-csv = callPackage ../development/python-modules/dataclass-csv { };
+
   dataclass-factory = callPackage ../development/python-modules/dataclass-factory { };
+
   dataclass-wizard = callPackage ../development/python-modules/dataclass-wizard { };
+
   dataclasses-json = callPackage ../development/python-modules/dataclasses-json { };
+
   dataclasses-serialization = callPackage ../development/python-modules/dataclasses-serialization { };
+
   datadiff = callPackage ../development/python-modules/datadiff { };
+
   datadog = callPackage ../development/python-modules/datadog { };
+
   datafusion = callPackage ../development/python-modules/datafusion {
     protoc = pkgs.protobuf;
   };
+
   datalad = callPackage ../development/python-modules/datalad { };
+
   datalad-gooey = callPackage ../development/python-modules/datalad-gooey { };
+
   datalad-next = callPackage ../development/python-modules/datalad-next { };
+
   datamodel-code-generator = callPackage ../development/python-modules/datamodel-code-generator { };
+
   datamodeldict = callPackage ../development/python-modules/datamodeldict { };
+
   datapoint = callPackage ../development/python-modules/datapoint { };
+
   dataprep-ml = callPackage ../development/python-modules/dataprep-ml { };
+
   dataproperty = callPackage ../development/python-modules/dataproperty { };
+
   datasalad = callPackage ../development/python-modules/datasalad { };
+
   dataset = callPackage ../development/python-modules/dataset { };
+
   datasets = callPackage ../development/python-modules/datasets { };
+
   datasette = callPackage ../development/python-modules/datasette { };
+
   datasette-publish-fly = callPackage ../development/python-modules/datasette-publish-fly { };
+
   datasette-template-sql = callPackage ../development/python-modules/datasette-template-sql { };
+
   datashader = callPackage ../development/python-modules/datashader { };
+
   datashape = callPackage ../development/python-modules/datashape { };
+
   datashaper = callPackage ../development/python-modules/datashaper { };
+
   datatable = callPackage ../development/python-modules/datatable { };
+
   datauri = callPackage ../development/python-modules/datauri { };
+
   datefinder = callPackage ../development/python-modules/datefinder { };
+
   dateparser = callPackage ../development/python-modules/dateparser { };
+
   datetime = callPackage ../development/python-modules/datetime { };
+
   dateutils = callPackage ../development/python-modules/dateutils { };
+
   datrie = callPackage ../development/python-modules/datrie { };
+
   dawg-python = callPackage ../development/python-modules/dawg-python { };
+
   dazl = callPackage ../development/python-modules/dazl { };
+
   db-dtypes = callPackage ../development/python-modules/db-dtypes { };
+
   dbf = callPackage ../development/python-modules/dbf { };
+
   dbfread = callPackage ../development/python-modules/dbfread { };
+
   dbglib = callPackage ../development/python-modules/dbglib { };
+
   dbt-adapters = callPackage ../development/python-modules/dbt-adapters { };
+
   dbt-bigquery = callPackage ../development/python-modules/dbt-bigquery { };
+
   dbt-common = callPackage ../development/python-modules/dbt-common { };
+
   dbt-core = callPackage ../development/python-modules/dbt-core { };
+
   dbt-extractor = callPackage ../development/python-modules/dbt-extractor { };
+
   dbt-postgres = callPackage ../development/python-modules/dbt-postgres { };
+
   dbt-protos = callPackage ../development/python-modules/dbt-protos { };
+
   dbt-redshift = callPackage ../development/python-modules/dbt-redshift { };
+
   dbt-semantic-interfaces = callPackage ../development/python-modules/dbt-semantic-interfaces { };
+
   dbt-snowflake = callPackage ../development/python-modules/dbt-snowflake { };
+
   dbus-client-gen = callPackage ../development/python-modules/dbus-client-gen { };
+
   dbus-deviation = callPackage ../development/python-modules/dbus-deviation { };
+
   dbus-fast = callPackage ../development/python-modules/dbus-fast { };
+
   dbus-next = callPackage ../development/python-modules/dbus-next { };
+
   dbus-python = callPackage ../development/python-modules/dbus-python { inherit (pkgs) dbus; };
+
   dbus-python-client-gen = callPackage ../development/python-modules/dbus-python-client-gen { };
+
   dbus-signature-pyparsing = callPackage ../development/python-modules/dbus-signature-pyparsing { };
+
   dbutils = callPackage ../development/python-modules/dbutils { };
+
   dcmstack = callPackage ../development/python-modules/dcmstack { };
+
   dctorch = callPackage ../development/python-modules/dctorch { };
+
   ddgs = callPackage ../development/python-modules/ddgs { };
+
   ddt = callPackage ../development/python-modules/ddt { };
+
   deal = callPackage ../development/python-modules/deal { };
+
   deal-solver = callPackage ../development/python-modules/deal-solver { };
+
   deap = callPackage ../development/python-modules/deap { };
+
   debian-inspector = callPackage ../development/python-modules/debian-inspector { };
+
   debianbts = callPackage ../development/python-modules/debianbts { };
+
   debtcollector = callPackage ../development/python-modules/debtcollector { };
+
   debts = callPackage ../development/python-modules/debts { };
+
   debuglater = callPackage ../development/python-modules/debuglater { };
+
   debugpy = callPackage ../development/python-modules/debugpy { };
+
   decli = callPackage ../development/python-modules/decli { };
+
   declinate = callPackage ../development/python-modules/declinate { };
+
   decopatch = callPackage ../development/python-modules/decopatch { };
+
   decora-wifi = callPackage ../development/python-modules/decora-wifi { };
+
   decorator = callPackage ../development/python-modules/decorator { };
+
   deebot-client = callPackage ../development/python-modules/deebot-client { };
+
   deemix = callPackage ../development/python-modules/deemix { };
+
   deep-chainmap = callPackage ../development/python-modules/deep-chainmap { };
+
   deep-translator = callPackage ../development/python-modules/deep-translator { };
+
   deepdiff = callPackage ../development/python-modules/deepdiff { };
+
   deepdish = callPackage ../development/python-modules/deepdish { };
+
   deepface = callPackage ../development/python-modules/deepface { };
+
   deepl = callPackage ../development/python-modules/deepl { };
+
   deepmerge = callPackage ../development/python-modules/deepmerge { };
+
   deepsearch-glm = callPackage ../development/python-modules/deepsearch-glm {
     inherit (pkgs) loguru sentencepiece fasttext;
   };
+
   deepsearch-toolkit = callPackage ../development/python-modules/deepsearch-toolkit { };
+
   deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { };
+
   deepwave = callPackage ../development/python-modules/deepwave { };
+
   deezer-py = callPackage ../development/python-modules/deezer-py { };
+
   deezer-python = callPackage ../development/python-modules/deezer-python { };
+
   deezer-python-async = callPackage ../development/python-modules/deezer-python-async { };
+
   defang = callPackage ../development/python-modules/defang { };
+
   defcon = callPackage ../development/python-modules/defcon { };
+
   deform = callPackage ../development/python-modules/deform { };
+
   defusedcsv = callPackage ../development/python-modules/defusedcsv { };
+
   defusedxml = callPackage ../development/python-modules/defusedxml { };
+
   dehinter = callPackage ../development/python-modules/dehinter { };
+
   deid = callPackage ../development/python-modules/deid { };
+
   dek = callPackage ../development/python-modules/dek { };
+
   delegator-py = callPackage ../development/python-modules/delegator-py { };
+
   delorean = callPackage ../development/python-modules/delorean { };
+
   deltachat = callPackage ../development/python-modules/deltachat { };
+
   deltachat-rpc-client = callPackage ../development/python-modules/deltachat-rpc-client { };
+
   deltachat2 = callPackage ../development/python-modules/deltachat2 { };
+
   deltalake = callPackage ../development/python-modules/deltalake { };
+
   deluge-client = callPackage ../development/python-modules/deluge-client { };
+
   demes = callPackage ../development/python-modules/demes { };
+
   demesdraw = callPackage ../development/python-modules/demesdraw { };
+
   demetriek = callPackage ../development/python-modules/demetriek { };
+
   demjson3 = callPackage ../development/python-modules/demjson3 { };
+
   demoji = callPackage ../development/python-modules/demoji { };
+
   dendropy = callPackage ../development/python-modules/dendropy { };
+
   denonavr = callPackage ../development/python-modules/denonavr { };
+
   dep-logic = callPackage ../development/python-modules/dep-logic { };
+
   dependency-groups = callPackage ../development/python-modules/dependency-groups { };
+
   dependency-injector = callPackage ../development/python-modules/dependency-injector { };
+
   deploykit = callPackage ../development/python-modules/deploykit { };
+
   deprecated = callPackage ../development/python-modules/deprecated { };
+
   deprecation = callPackage ../development/python-modules/deprecation { };
+
   deprecation-alias = callPackage ../development/python-modules/deprecation-alias { };
+
   depyf = callPackage ../development/python-modules/depyf { };
+
   derpconf = callPackage ../development/python-modules/derpconf { };
+
   desktop-entry-lib = callPackage ../development/python-modules/desktop-entry-lib { };
+
   desktop-notifier = callPackage ../development/python-modules/desktop-notifier { };
+
   detect-secrets = callPackage ../development/python-modules/detect-secrets { };
+
   detectron2 = callPackage ../development/python-modules/detectron2 { };
+
   devgoldyutils = callPackage ../development/python-modules/devgoldyutils { };
+
   devialet = callPackage ../development/python-modules/devialet { };
+
   devito = callPackage ../development/python-modules/devito { };
+
   devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { };
+
   devolo-plc-api = callPackage ../development/python-modules/devolo-plc-api { };
+
   devpi-common = callPackage ../development/python-modules/devpi-common { };
+
   devpi-ldap = callPackage ../development/python-modules/devpi-ldap { };
+
   devtools = callPackage ../development/python-modules/devtools { };
+
   dfdiskcache = callPackage ../development/python-modules/dfdiskcache { };
+
   diagrams = callPackage ../development/python-modules/diagrams { };
+
   diceware = callPackage ../development/python-modules/diceware { };
+
   dicom-numpy = callPackage ../development/python-modules/dicom-numpy { };
+
   dicom2nifti = callPackage ../development/python-modules/dicom2nifti { };
+
   dicomweb-client = callPackage ../development/python-modules/dicomweb-client { };
+
   dict2xml = callPackage ../development/python-modules/dict2xml { };
+
   dictdiffer = callPackage ../development/python-modules/dictdiffer { };
+
   dictionaries = callPackage ../development/python-modules/dictionaries { };
+
   dicttoxml = callPackage ../development/python-modules/dicttoxml { };
+
   dicttoxml2 = callPackage ../development/python-modules/dicttoxml2 { };
+
   diff-cover = callPackage ../development/python-modules/diff-cover { };
+
   diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
+
   diffenator2 = callPackage ../development/python-modules/diffenator2 { };
+
   diffimg = callPackage ../development/python-modules/diffimg { };
+
   diffsync = callPackage ../development/python-modules/diffsync { };
+
   diffusers = callPackage ../development/python-modules/diffusers { };
+
   digi-xbee = callPackage ../development/python-modules/digi-xbee { };
+
   dill = callPackage ../development/python-modules/dill { };
+
   dinghy = callPackage ../development/python-modules/dinghy { };
+
   dingz = callPackage ../development/python-modules/dingz { };
+
   dio-chacon-wifi-api = callPackage ../development/python-modules/dio-chacon-wifi-api { };
+
   diofant = callPackage ../development/python-modules/diofant { };
+
   dipy = callPackage ../development/python-modules/dipy { };
+
   directv = callPackage ../development/python-modules/directv { };
+
   dirigera = callPackage ../development/python-modules/dirigera { };
+
   dirsearch = callPackage ../development/python-modules/dirsearch { };
+
   dirty-equals = callPackage ../development/python-modules/dirty-equals { };
+
   dirtyjson = callPackage ../development/python-modules/dirtyjson { };
+
   discid = callPackage ../development/python-modules/discid { };
+
   discogs-client = callPackage ../development/python-modules/discogs-client { };
+
   discord-webhook = callPackage ../development/python-modules/discord-webhook { };
+
   discordpy = callPackage ../development/python-modules/discordpy { };
+
   discovery30303 = callPackage ../development/python-modules/discovery30303 { };
+
   discum = callPackage ../development/python-modules/discum { };
+
   diskcache = callPackage ../development/python-modules/diskcache { };
+
   disnake = callPackage ../development/python-modules/disnake { };
+
   disposable-email-domains = callPackage ../development/python-modules/disposable-email-domains { };
+
   dissect = callPackage ../development/python-modules/dissect { };
+
   dissect-archive = callPackage ../development/python-modules/dissect-archive { };
+
   dissect-btrfs = callPackage ../development/python-modules/dissect-btrfs { };
+
   dissect-cim = callPackage ../development/python-modules/dissect-cim { };
+
   dissect-clfs = callPackage ../development/python-modules/dissect-clfs { };
+
   dissect-cobaltstrike = callPackage ../development/python-modules/dissect-cobaltstrike { };
+
   dissect-cstruct = callPackage ../development/python-modules/dissect-cstruct { };
+
   dissect-esedb = callPackage ../development/python-modules/dissect-esedb { };
+
   dissect-etl = callPackage ../development/python-modules/dissect-etl { };
+
   dissect-eventlog = callPackage ../development/python-modules/dissect-eventlog { };
+
   dissect-evidence = callPackage ../development/python-modules/dissect-evidence { };
+
   dissect-executable = callPackage ../development/python-modules/dissect-executable { };
+
   dissect-extfs = callPackage ../development/python-modules/dissect-extfs { };
+
   dissect-fat = callPackage ../development/python-modules/dissect-fat { };
+
   dissect-ffs = callPackage ../development/python-modules/dissect-ffs { };
+
   dissect-fve = callPackage ../development/python-modules/dissect-fve { };
+
   dissect-hypervisor = callPackage ../development/python-modules/dissect-hypervisor { };
+
   dissect-jffs = callPackage ../development/python-modules/dissect-jffs { };
+
   dissect-ntfs = callPackage ../development/python-modules/dissect-ntfs { };
+
   dissect-ole = callPackage ../development/python-modules/dissect-ole { };
+
   dissect-qnxfs = callPackage ../development/python-modules/dissect-qnxfs { };
+
   dissect-regf = callPackage ../development/python-modules/dissect-regf { };
+
   dissect-shellitem = callPackage ../development/python-modules/dissect-shellitem { };
+
   dissect-sql = callPackage ../development/python-modules/dissect-sql { };
+
   dissect-squashfs = callPackage ../development/python-modules/dissect-squashfs { };
+
   dissect-target = callPackage ../development/python-modules/dissect-target { };
+
   dissect-thumbcache = callPackage ../development/python-modules/dissect-thumbcache { };
+
   dissect-util = callPackage ../development/python-modules/dissect-util { };
+
   dissect-vmfs = callPackage ../development/python-modules/dissect-vmfs { };
+
   dissect-volume = callPackage ../development/python-modules/dissect-volume { };
+
   dissect-xfs = callPackage ../development/python-modules/dissect-xfs { };
+
   dissononce = callPackage ../development/python-modules/dissononce { };
+
   dist-meta = callPackage ../development/python-modules/dist-meta { };
+
   distlib = callPackage ../development/python-modules/distlib { };
+
   distorm3 = callPackage ../development/python-modules/distorm3 { };
+
   distrax = callPackage ../development/python-modules/distrax { };
+
   distributed = callPackage ../development/python-modules/distributed { };
+
   distro = callPackage ../development/python-modules/distro { };
+
   distutils =
     if pythonOlder "3.12" then null else callPackage ../development/python-modules/distutils { };
+
   distutils-extra = callPackage ../development/python-modules/distutils-extra { };
+
   dj-database-url = callPackage ../development/python-modules/dj-database-url { };
+
   dj-email-url = callPackage ../development/python-modules/dj-email-url { };
+
   dj-rest-auth = callPackage ../development/python-modules/dj-rest-auth { };
+
   dj-search-url = callPackage ../development/python-modules/dj-search-url { };
+
   dj-static = callPackage ../development/python-modules/dj-static { };
+
   # LTS with mainsteam support
   django = self.django_4;
+
   django-admin-datta = callPackage ../development/python-modules/django-admin-datta { };
+
   django-admin-sortable2 = callPackage ../development/python-modules/django-admin-sortable2 { };
+
   django-allauth = callPackage ../development/python-modules/django-allauth { };
+
   django-annoying = callPackage ../development/python-modules/django-annoying { };
+
   django-anymail = callPackage ../development/python-modules/django-anymail { };
+
   django-app-helper = callPackage ../development/python-modules/django-app-helper { };
+
   django-appconf = callPackage ../development/python-modules/django-appconf { };
+
   django-apscheduler = callPackage ../development/python-modules/django-apscheduler { };
+
   django-auditlog = callPackage ../development/python-modules/django-auditlog { };
+
   django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap {
     inherit (pkgs) openldap;
   };
+
   django-autocomplete-light = callPackage ../development/python-modules/django-autocomplete-light { };
+
   django-autoslug = callPackage ../development/python-modules/django-autoslug { };
+
   django-axes = callPackage ../development/python-modules/django-axes { };
+
   django-bootstrap3 = callPackage ../development/python-modules/django-bootstrap3 { };
+
   django-bootstrap4 = callPackage ../development/python-modules/django-bootstrap4 { };
+
   django-bootstrap5 = callPackage ../development/python-modules/django-bootstrap5 { };
+
   django-cachalot = callPackage ../development/python-modules/django-cachalot { };
+
   django-cache-url = callPackage ../development/python-modules/django-cache-url { };
+
   django-cacheops = callPackage ../development/python-modules/django-cacheops { };
+
   django-celery-beat = callPackage ../development/python-modules/django-celery-beat { };
+
   django-celery-email = callPackage ../development/python-modules/django-celery-email { };
+
   django-celery-results = callPackage ../development/python-modules/django-celery-results { };
+
   django-choices-field = callPackage ../development/python-modules/django-choices-field { };
+
   django-ckeditor = callPackage ../development/python-modules/django-ckeditor { };
+
   django-classy-tags = callPackage ../development/python-modules/django-classy-tags { };
+
   django-cleanup = callPackage ../development/python-modules/django-cleanup { };
+
   django-cms = callPackage ../development/python-modules/django-cms { };
+
   django-colorful = callPackage ../development/python-modules/django-colorful { };
+
   django-compression-middleware =
     callPackage ../development/python-modules/django-compression-middleware
       { };
+
   django-compressor = callPackage ../development/python-modules/django-compressor { };
+
   django-configurations = callPackage ../development/python-modules/django-configurations { };
+
   django-context-decorator = callPackage ../development/python-modules/django-context-decorator { };
+
   django-contrib-comments = callPackage ../development/python-modules/django-contrib-comments { };
+
   django-cors-headers = callPackage ../development/python-modules/django-cors-headers { };
+
   django-countries = callPackage ../development/python-modules/django-countries { };
+
   django-crispy-forms = callPackage ../development/python-modules/django-crispy-forms { };
+
   django-crossdomainmedia = callPackage ../development/python-modules/django-crossdomainmedia { };
+
   django-cryptography = callPackage ../development/python-modules/django-cryptography { };
+
   django-csp = callPackage ../development/python-modules/django-csp { };
+
   django-cte = callPackage ../development/python-modules/django-cte { };
+
   django-currentuser = callPackage ../development/python-modules/django-currentuser { };
+
   django-debug-toolbar = callPackage ../development/python-modules/django-debug-toolbar { };
+
   django-dynamic-preferences =
     callPackage ../development/python-modules/django-dynamic-preferences
       { };
+
   django-elasticsearch-dsl = callPackage ../development/python-modules/django-elasticsearch-dsl { };
+
   django-encrypted-model-fields =
     callPackage ../development/python-modules/django-encrypted-model-fields
       { };
+
   django-environ = callPackage ../development/python-modules/django-environ { };
+
   django-extensions = callPackage ../development/python-modules/django-extensions { };
+
   django-filer = callPackage ../development/python-modules/django-filer { };
+
   django-filingcabinet = callPackage ../development/python-modules/django-filingcabinet { };
+
   django-filter = callPackage ../development/python-modules/django-filter { };
+
   django-formset-js-improved =
     callPackage ../development/python-modules/django-formset-js-improved
       { };
+
   django-formtools = callPackage ../development/python-modules/django-formtools { };
+
   django-fsm = callPackage ../development/python-modules/django-fsm { };
+
   django-google-analytics-app =
     callPackage ../development/python-modules/django-google-analytics-app
       { };
+
   django-graphiql-debug-toolbar =
     callPackage ../development/python-modules/django-graphiql-debug-toolbar
       { };
+
   django-gravatar2 = callPackage ../development/python-modules/django-gravatar2 { };
+
   django-guardian = callPackage ../development/python-modules/django-guardian { };
+
   django-haystack = callPackage ../development/python-modules/django-haystack { };
+
   django-hcaptcha = callPackage ../development/python-modules/django-hcaptcha { };
+
   django-health-check = callPackage ../development/python-modules/django-health-check { };
+
   django-hierarkey = callPackage ../development/python-modules/django-hierarkey { };
+
   django-hijack = callPackage ../development/python-modules/django-hijack { };
+
   django-htmx = callPackage ../development/python-modules/django-htmx { };
+
   django-i18nfield = callPackage ../development/python-modules/django-i18nfield { };
+
   django-import-export = callPackage ../development/python-modules/django-import-export { };
+
   django-ipware = callPackage ../development/python-modules/django-ipware { };
+
   django-jinja = callPackage ../development/python-modules/django-jinja2 { };
+
   django-jquery-js = callPackage ../development/python-modules/django-jquery-js { };
+
   django-js-asset = callPackage ../development/python-modules/django-js-asset { };
+
   django-js-reverse = callPackage ../development/python-modules/django-js-reverse { };
+
   django-json-widget = callPackage ../development/python-modules/django-json-widget { };
+
   django-lasuite = callPackage ../development/python-modules/django-lasuite { };
+
   django-leaflet = callPackage ../development/python-modules/django-leaflet { };
+
   django-libsass = callPackage ../development/python-modules/django-libsass { };
+
   django-localflavor = callPackage ../development/python-modules/django-localflavor { };
+
   django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { };
+
   django-login-required-middleware =
     callPackage ../development/python-modules/django-login-required-middleware
       { };
+
   django-mailman3 = callPackage ../development/python-modules/django-mailman3 { };
+
   django-maintenance-mode = callPackage ../development/python-modules/django-maintenance-mode { };
+
   django-markdownx = callPackage ../development/python-modules/django-markdownx { };
+
   django-markup = callPackage ../development/python-modules/django-markup { };
+
   django-mcp-server = callPackage ../development/python-modules/django-mcp-server { };
+
   django-mdeditor = callPackage ../development/python-modules/django-mdeditor { };
+
   django-mfa3 = callPackage ../development/python-modules/django-mfa3 { };
+
   django-model-utils = callPackage ../development/python-modules/django-model-utils { };
+
   django-modelcluster = callPackage ../development/python-modules/django-modelcluster { };
+
   django-modeltranslation = callPackage ../development/python-modules/django-modeltranslation { };
+
   django-mptt = callPackage ../development/python-modules/django-mptt { };
+
   django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { };
+
   django-ninja = callPackage ../development/python-modules/django-ninja { };
+
   django-ninja-cursor-pagination =
     callPackage ../development/python-modules/django-ninja-cursor-pagination
       { };
+
   django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { };
+
   django-organizations = callPackage ../development/python-modules/django-organizations { };
+
   django-otp = callPackage ../development/python-modules/django-otp { };
+
   django-otp-webauthn = callPackage ../development/python-modules/django-otp-webauthn { };
+
   django-paintstore = callPackage ../development/python-modules/django-paintstore { };
+
   django-parler = callPackage ../development/python-modules/django-parler { };
+
   django-pattern-library = callPackage ../development/python-modules/django-pattern-library { };
+
   django-payments = callPackage ../development/python-modules/django-payments { };
+
   django-pgactivity = callPackage ../development/python-modules/django-pgactivity { };
+
   django-pghistory = callPackage ../development/python-modules/django-pghistory { };
+
   django-pglock = callPackage ../development/python-modules/django-pglock { };
+
   django-pglocks = callPackage ../development/python-modules/django-pglocks { };
+
   django-pgpubsub = callPackage ../development/python-modules/django-pgpubsub { };
+
   django-pgtrigger = callPackage ../development/python-modules/django-pgtrigger { };
+
   django-phonenumber-field = callPackage ../development/python-modules/django-phonenumber-field { };
+
   django-picklefield = callPackage ../development/python-modules/django-picklefield { };
+
   django-polymorphic = callPackage ../development/python-modules/django-polymorphic { };
+
   django-postgres-partition = callPackage ../development/python-modules/django-postgres-partition { };
+
   django-postgresql-netfields =
     callPackage ../development/python-modules/django-postgresql-netfields
       { };
+
   django-prometheus = callPackage ../development/python-modules/django-prometheus { };
+
   django-pwa = callPackage ../development/python-modules/django-pwa { };
+
   django-pydantic-field = callPackage ../development/python-modules/django-pydantic-field { };
+
   django-q2 = callPackage ../development/python-modules/django-q2 { };
+
   django-ranged-response = callPackage ../development/python-modules/django-ranged-response { };
+
   django-raster = callPackage ../development/python-modules/django-raster { };
+
   django-ratelimit = callPackage ../development/python-modules/django-ratelimit { };
+
   django-redis = callPackage ../development/python-modules/django-redis { };
+
   django-registration = callPackage ../development/python-modules/django-registration { };
+
   django-rest-auth = callPackage ../development/python-modules/django-rest-auth { };
+
   django-rest-polymorphic = callPackage ../development/python-modules/django-rest-polymorphic { };
+
   django-rest-registration = callPackage ../development/python-modules/django-rest-registration { };
+
   django-reversion = callPackage ../development/python-modules/django-reversion { };
+
   django-rosetta = callPackage ../development/python-modules/django-rosetta { };
+
   django-rq = callPackage ../development/python-modules/django-rq { };
+
   django-scheduler = callPackage ../development/python-modules/django-scheduler { };
+
   django-scim2 = callPackage ../development/python-modules/django-scim2 { };
+
   django-scopes = callPackage ../development/python-modules/django-scopes { };
+
   django-sekizai = callPackage ../development/python-modules/django-sekizai { };
+
   django-sesame = callPackage ../development/python-modules/django-sesame { };
+
   django-shortuuidfield = callPackage ../development/python-modules/django-shortuuidfield { };
+
   django-silk = callPackage ../development/python-modules/django-silk { };
+
   django-simple-captcha = callPackage ../development/python-modules/django-simple-captcha { };
+
   django-simple-history = callPackage ../development/python-modules/django-simple-history { };
+
   django-sites = callPackage ../development/python-modules/django-sites { };
+
   django-soft-delete = callPackage ../development/python-modules/django-soft-delete { };
+
   django-split-settings = callPackage ../development/python-modules/django-split-settings { };
+
   django-sql-utils = callPackage ../development/python-modules/django-sql-utils { };
+
   django-statici18n = callPackage ../development/python-modules/django-statici18n { };
+
   django-storages = callPackage ../development/python-modules/django-storages { };
+
   django-stubs = callPackage ../development/python-modules/django-stubs { };
+
   django-stubs-ext = callPackage ../development/python-modules/django-stubs-ext { };
+
   django-tables2 = callPackage ../development/python-modules/django-tables2 { };
+
   django-tagging = callPackage ../development/python-modules/django-tagging { };
+
   django-taggit = callPackage ../development/python-modules/django-taggit { };
+
   django-tasks = callPackage ../development/python-modules/django-tasks { };
+
   django-tastypie = callPackage ../development/python-modules/django-tastypie { };
+
   django-tenants = callPackage ../development/python-modules/django-tenants { };
+
   django-timezone-field = callPackage ../development/python-modules/django-timezone-field { };
+
   django-tinymce = callPackage ../development/python-modules/django-tinymce { };
+
   django-tree-queries = callPackage ../development/python-modules/django-tree-queries { };
+
   django-treebeard = callPackage ../development/python-modules/django-treebeard { };
+
   django-two-factor-auth = callPackage ../development/python-modules/django-two-factor-auth { };
+
   django-types = callPackage ../development/python-modules/django-types { };
+
   django-versatileimagefield =
     callPackage ../development/python-modules/django-versatileimagefield
       { };
+
   django-vite = callPackage ../development/python-modules/django-vite { };
+
   django-weasyprint = callPackage ../development/python-modules/django-weasyprint { };
+
   django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { };
+
   django-webpush = callPackage ../development/python-modules/django-webpush { };
+
   django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { };
+
   # LTS in extended support phase
   django_4 = callPackage ../development/python-modules/django/4.nix { };
+
   django_5 = self.django_5_2;
+
   django_5_1 = callPackage ../development/python-modules/django/5_1.nix { };
+
   django_5_2 = callPackage ../development/python-modules/django/5_2.nix { };
+
   djangocms-admin-style = callPackage ../development/python-modules/djangocms-admin-style { };
+
   djangocms-alias = callPackage ../development/python-modules/djangocms-alias { };
+
   djangocms-text-ckeditor = callPackage ../development/python-modules/djangocms-text-ckeditor { };
+
   djangoql = callPackage ../development/python-modules/djangoql { };
+
   djangorestframework = callPackage ../development/python-modules/djangorestframework { };
+
   djangorestframework-camel-case =
     callPackage ../development/python-modules/djangorestframework-camel-case
       { };
+
   djangorestframework-csv = callPackage ../development/python-modules/djangorestframework-csv { };
+
   djangorestframework-dataclasses =
     callPackage ../development/python-modules/djangorestframework-dataclasses
       { };
+
   djangorestframework-guardian =
     callPackage ../development/python-modules/djangorestframework-guardian
       { };
+
   djangorestframework-guardian2 =
     callPackage ../development/python-modules/djangorestframework-guardian2
       { };
+
   djangorestframework-jsonp = callPackage ../development/python-modules/djangorestframework-jsonp { };
+
   djangorestframework-recursive =
     callPackage ../development/python-modules/djangorestframework-recursive
       { };
+
   djangorestframework-simplejwt =
     callPackage ../development/python-modules/djangorestframework-simplejwt
       { };
+
   djangorestframework-stubs = callPackage ../development/python-modules/djangorestframework-stubs { };
+
   djangosaml2 = callPackage ../development/python-modules/djangosaml2 { };
+
   djmail = callPackage ../development/python-modules/djmail { };
+
   djoser = callPackage ../development/python-modules/djoser { };
+
   dkimpy = callPackage ../development/python-modules/dkimpy { };
+
   dlib = callPackage ../development/python-modules/dlib { inherit (pkgs) dlib; };
+
   dlinfo = callPackage ../development/python-modules/dlinfo { };
+
   dllogger = callPackage ../development/python-modules/dllogger { };
+
   dlms-cosem = callPackage ../development/python-modules/dlms-cosem { };
+
   dlx = callPackage ../development/python-modules/dlx { };
+
   dm-control = callPackage ../development/python-modules/dm-control { };
+
   dm-env = callPackage ../development/python-modules/dm-env { };
+
   dm-haiku = callPackage ../development/python-modules/dm-haiku { };
+
   dm-sonnet = callPackage ../development/python-modules/dm-sonnet { };
+
   dm-tree = callPackage ../development/python-modules/dm-tree {
     inherit (pkgs) abseil-cpp;
   };
+
   dmenu-python = callPackage ../development/python-modules/dmenu { };
+
   dmgbuild = callPackage ../development/python-modules/dmgbuild { };
+
   dmsuite = callPackage ../development/python-modules/dmsuite { };
+
   dmt-core = callPackage ../development/python-modules/dmt-core { };
+
   dnachisel = callPackage ../development/python-modules/dnachisel { };
+
   dncil = callPackage ../development/python-modules/dncil { };
+
   dnf-plugins-core = callPackage ../development/python-modules/dnf-plugins-core { };
+
   dnf4 = callPackage ../development/python-modules/dnf4 { };
+
   dnfile = callPackage ../development/python-modules/dnfile { };
+
   dns-lexicon = callPackage ../development/python-modules/dns-lexicon { };
+
   dnslib = callPackage ../development/python-modules/dnslib { };
+
   dnspython = callPackage ../development/python-modules/dnspython { };
+
   doc8 = callPackage ../development/python-modules/doc8 { };
+
   docformatter = callPackage ../development/python-modules/docformatter { };
+
   docker = callPackage ../development/python-modules/docker { };
+
   docker-pycreds = callPackage ../development/python-modules/docker-pycreds { };
+
   dockerfile-parse = callPackage ../development/python-modules/dockerfile-parse { };
+
   dockerflow = callPackage ../development/python-modules/dockerflow { };
+
   dockerpty = callPackage ../development/python-modules/dockerpty { };
+
   dockerspawner = callPackage ../development/python-modules/dockerspawner { };
+
   docling = callPackage ../development/python-modules/docling { };
+
   docling-core = callPackage ../development/python-modules/docling-core { };
+
   docling-ibm-models = callPackage ../development/python-modules/docling-ibm-models { };
+
   docling-jobkit = callPackage ../development/python-modules/docling-jobkit { };
+
   docling-parse = callPackage ../development/python-modules/docling-parse {
     loguru-cpp = pkgs.loguru;
   };
+
   docling-serve = callPackage ../development/python-modules/docling-serve { };
+
   docloud = callPackage ../development/python-modules/docloud { };
+
   docopt = callPackage ../development/python-modules/docopt { };
+
   docopt-ng = callPackage ../development/python-modules/docopt-ng { };
+
   docopt-subcommands = callPackage ../development/python-modules/docopt-subcommands { };
+
   docplex = callPackage ../development/python-modules/docplex { };
+
   docrep = callPackage ../development/python-modules/docrep { };
+
   docstr-coverage = callPackage ../development/python-modules/docstr-coverage { };
+
   docstring-parser = callPackage ../development/python-modules/docstring-parser { };
+
   docstring-to-markdown = callPackage ../development/python-modules/docstring-to-markdown { };
+
   docutils = callPackage ../development/python-modules/docutils { };
+
   docx2python = callPackage ../development/python-modules/docx2python { };
+
   docx2txt = callPackage ../development/python-modules/docx2txt { };
+
   dodgy = callPackage ../development/python-modules/dodgy { };
+
   dogpile-cache = callPackage ../development/python-modules/dogpile-cache { };
+
   dogtag-pki = callPackage ../development/python-modules/dogtag-pki { };
+
   dogtail = callPackage ../development/python-modules/dogtail { };
+
   dohq-artifactory = callPackage ../development/python-modules/dohq-artifactory { };
+
   doit = callPackage ../development/python-modules/doit { };
+
   doit-py = callPackage ../development/python-modules/doit-py { };
+
   dokuwiki = callPackage ../development/python-modules/dokuwiki { };
+
   dom-toml = callPackage ../development/python-modules/dom-toml { };
+
   domdf-python-tools = callPackage ../development/python-modules/domdf-python-tools { };
+
   domeneshop = callPackage ../development/python-modules/domeneshop { };
+
   dominate = callPackage ../development/python-modules/dominate { };
+
   donfig = callPackage ../development/python-modules/donfig { };
+
   donut-shellcode = callPackage ../development/python-modules/donut-shellcode { };
+
   doorbirdpy = callPackage ../development/python-modules/doorbirdpy { };
+
   dopy = callPackage ../development/python-modules/dopy { };
+
   dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; };
+
   dotmap = callPackage ../development/python-modules/dotmap { };
+
   dotty-dict = callPackage ../development/python-modules/dotty-dict { };
+
   dotwiz = callPackage ../development/python-modules/dotwiz { };
+
   doubleratchet = callPackage ../development/python-modules/doubleratchet { };
+
   dowhen = callPackage ../development/python-modules/dowhen { };
+
   downloader-cli = callPackage ../development/python-modules/downloader-cli { };
+
   doxmlparser = callPackage ../development/tools/documentation/doxygen/doxmlparser.nix { };
+
   dparse = callPackage ../development/python-modules/dparse { };
+
   dparse2 = callPackage ../development/python-modules/dparse2 { };
+
   dpath = callPackage ../development/python-modules/dpath { };
+
   dpcontracts = callPackage ../development/python-modules/dpcontracts { };
+
   dpkt = callPackage ../development/python-modules/dpkt { };
+
   dploot = callPackage ../development/python-modules/dploot { };
+
   drafthorse = callPackage ../development/python-modules/drafthorse { };
+
   draftjs-exporter = callPackage ../development/python-modules/draftjs-exporter { };
+
   dragonfly = callPackage ../development/python-modules/dragonfly { };
+
   dragonmapper = callPackage ../development/python-modules/dragonmapper { };
+
   dramatiq = callPackage ../development/python-modules/dramatiq { };
+
   dramatiq-abort = callPackage ../development/python-modules/dramatiq-abort { };
+
   drawille = callPackage ../development/python-modules/drawille { };
+
   drawilleplot = callPackage ../development/python-modules/drawilleplot { };
+
   drawsvg = callPackage ../development/python-modules/drawsvg { };
+
   dremel3dpy = callPackage ../development/python-modules/dremel3dpy { };
+
   drf-extra-fields = callPackage ../development/python-modules/drf-extra-fields { };
+
   drf-flex-fields = callPackage ../development/python-modules/drf-flex-fields { };
+
   drf-jwt = callPackage ../development/python-modules/drf-jwt { };
+
   drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { };
+
   drf-orjson-renderer = callPackage ../development/python-modules/drf-orjson-renderer { };
+
   drf-pydantic = callPackage ../development/python-modules/drf-pydantic { };
+
   drf-spectacular = callPackage ../development/python-modules/drf-spectacular { };
+
   drf-spectacular-sidecar = callPackage ../development/python-modules/drf-spectacular-sidecar { };
+
   drf-standardized-errors = callPackage ../development/python-modules/drf-standardized-errors { };
+
   drf-ujson2 = callPackage ../development/python-modules/drf-ujson2 { };
+
   drf-writable-nested = callPackage ../development/python-modules/drf-writable-nested { };
+
   drf-yasg = callPackage ../development/python-modules/drf-yasg { };
+
   drivelib = callPackage ../development/python-modules/drivelib { };
+
   drms = callPackage ../development/python-modules/drms { };
+
   dronecan = callPackage ../development/python-modules/dronecan { };
+
   dropbox = callPackage ../development/python-modules/dropbox { };
+
   dropmqttapi = callPackage ../development/python-modules/dropmqttapi { };
+
   ds-analysis-lib = callPackage ../development/python-modules/ds-analysis-lib { };
+
   ds-reporting-lib = callPackage ../development/python-modules/ds-reporting-lib { };
+
   ds-store = callPackage ../development/python-modules/ds-store { };
+
   ds-xbom-lib = callPackage ../development/python-modules/ds-xbom-lib { };
+
   ds4drv = callPackage ../development/python-modules/ds4drv { };
+
   dscribe = callPackage ../development/python-modules/dscribe { };
+
   dsinternals = callPackage ../development/python-modules/dsinternals { };
+
   dsl2html = callPackage ../development/python-modules/dsl2html { };
+
   dsmr-parser = callPackage ../development/python-modules/dsmr-parser { };
+
   dsnap = callPackage ../development/python-modules/dsnap { };
+
   dtfabric = callPackage ../development/python-modules/dtfabric { };
+
   dtlssocket = callPackage ../development/python-modules/dtlssocket { };
+
   dtschema = callPackage ../development/python-modules/dtschema { };
+
   dtw-python = callPackage ../development/python-modules/dtw-python { };
+
   ducc0 = callPackage ../development/python-modules/ducc0 { };
+
   duckdb = callPackage ../development/python-modules/duckdb { inherit (pkgs) duckdb; };
+
   duckdb-engine = callPackage ../development/python-modules/duckdb-engine { };
+
   duckduckgo-search = callPackage ../development/python-modules/duckduckgo-search { };
+
   duct-py = callPackage ../development/python-modules/duct-py { };
+
   duden = callPackage ../development/python-modules/duden { };
+
   duecredit = callPackage ../development/python-modules/duecredit { };
+
   duet = callPackage ../development/python-modules/duet { };
+
   dufte = callPackage ../development/python-modules/dufte { };
+
   dukpy = callPackage ../development/python-modules/dukpy { };
+
   dulwich = callPackage ../development/python-modules/dulwich { inherit (pkgs) gnupg; };
+
   dunamai = callPackage ../development/python-modules/dunamai { };
+
   dungeon-eos = callPackage ../development/python-modules/dungeon-eos { };
+
   duo-client = callPackage ../development/python-modules/duo-client { };
+
   duration-parser = callPackage ../development/python-modules/duration-parser { };
+
   durationpy = callPackage ../development/python-modules/durationpy { };
+
   durus = callPackage ../development/python-modules/durus { };
+
   dvc = callPackage ../development/python-modules/dvc { };
+
   dvc-azure = callPackage ../development/python-modules/dvc-azure { };
+
   dvc-data = callPackage ../development/python-modules/dvc-data { };
+
   dvc-gdrive = callPackage ../development/python-modules/dvc-gdrive { };
+
   dvc-gs = callPackage ../development/python-modules/dvc-gs { };
+
   dvc-hdfs = callPackage ../development/python-modules/dvc-hdfs { };
+
   dvc-http = callPackage ../development/python-modules/dvc-http { };
+
   dvc-objects = callPackage ../development/python-modules/dvc-objects { };
+
   dvc-oss = callPackage ../development/python-modules/dvc-oss { };
+
   dvc-render = callPackage ../development/python-modules/dvc-render { };
+
   dvc-s3 = callPackage ../development/python-modules/dvc-s3 { };
+
   dvc-ssh = callPackage ../development/python-modules/dvc-ssh { };
+
   dvc-studio-client = callPackage ../development/python-modules/dvc-studio-client { };
+
   dvc-task = callPackage ../development/python-modules/dvc-task { };
+
   dvc-webdav = callPackage ../development/python-modules/dvc-webdav { };
+
   dvc-webhdfs = callPackage ../development/python-modules/dvc-webhdfs { };
+
   dvclive = callPackage ../development/python-modules/dvclive { };
+
   dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };
+
   dyn = callPackage ../development/python-modules/dyn { };
+
   dynaconf = callPackage ../development/python-modules/dynaconf { };
+
   dynalite-devices = callPackage ../development/python-modules/dynalite-devices { };
+
   dynalite-panel = callPackage ../development/python-modules/dynalite-panel { };
+
   dynd = callPackage ../development/python-modules/dynd { };
+
   e2b = callPackage ../development/python-modules/e2b { };
+
   e2b-code-interpreter = callPackage ../development/python-modules/e2b-code-interpreter { };
+
   e3-core = callPackage ../development/python-modules/e3-core { };
+
   e3-testsuite = callPackage ../development/python-modules/e3-testsuite { };
+
   eagle100 = callPackage ../development/python-modules/eagle100 { };
+
   easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { };
+
   easydict = callPackage ../development/python-modules/easydict { };
+
   easyenergy = callPackage ../development/python-modules/easyenergy { };
+
   easygui = callPackage ../development/python-modules/easygui { };
+
   easyocr = callPackage ../development/python-modules/easyocr { };
+
   easyprocess = callPackage ../development/python-modules/easyprocess { };
+
   easywatch = callPackage ../development/python-modules/easywatch { };
+
   ebaysdk = callPackage ../development/python-modules/ebaysdk { };
+
   ebcdic = callPackage ../development/python-modules/ebcdic { };
+
   ebooklib = callPackage ../development/python-modules/ebooklib { };
+
   ebusdpy = callPackage ../development/python-modules/ebusdpy { };
+
   ec2-metadata = callPackage ../development/python-modules/ec2-metadata { };
+
   ec2instanceconnectcli = callPackage ../tools/virtualization/ec2instanceconnectcli { };
+
   eccodes = toPythonModule (
     pkgs.eccodes.override {
       enablePython = true;
       pythonPackages = self;
     }
   );
+
   ecdsa = callPackage ../development/python-modules/ecdsa { };
+
   echo = callPackage ../development/python-modules/echo { };
+
   ecoaliface = callPackage ../development/python-modules/ecoaliface { };
+
   ecos = callPackage ../development/python-modules/ecos { };
+
   ecpy = callPackage ../development/python-modules/ecpy { };
+
   ecs-logging = callPackage ../development/python-modules/ecs-logging { };
+
   ed25519 = callPackage ../development/python-modules/ed25519 { };
+
   ed25519-blake2b = callPackage ../development/python-modules/ed25519-blake2b { };
+
   edalize = callPackage ../development/python-modules/edalize { };
+
   editables = callPackage ../development/python-modules/editables { };
+
   editdistance = callPackage ../development/python-modules/editdistance { };
+
   editdistpy = callPackage ../development/python-modules/editdistpy { };
+
   editor = callPackage ../development/python-modules/editor { };
+
   editorconfig = callPackage ../development/python-modules/editorconfig { };
+
   edk2-pytool-library = callPackage ../development/python-modules/edk2-pytool-library { };
+
   edlib = callPackage ../development/python-modules/edlib { inherit (pkgs) edlib; };
+
   eduvpn-common = callPackage ../development/python-modules/eduvpn-common { };
+
   edward = callPackage ../development/python-modules/edward { };
+
   effdet = callPackage ../development/python-modules/effdet { };
+
   effect = callPackage ../development/python-modules/effect { };
+
   eggdeps = callPackage ../development/python-modules/eggdeps { };
+
   eheimdigital = callPackage ../development/python-modules/eheimdigital { };
+
   eigenpy = callPackage ../development/python-modules/eigenpy {
     inherit (pkgs) graphviz; # need the `dot` program, not the python module
   };
+
   einops = callPackage ../development/python-modules/einops { };
+
   einx = callPackage ../development/python-modules/einx { };
+
   eiswarnung = callPackage ../development/python-modules/eiswarnung { };
+
   elastic-apm = callPackage ../development/python-modules/elastic-apm { };
+
   elastic-transport = callPackage ../development/python-modules/elastic-transport { };
+
   elasticsearch = callPackage ../development/python-modules/elasticsearch { };
+
   elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { };
+
   elasticsearch8 = callPackage ../development/python-modules/elasticsearch8 { };
+
   elasticsearchdsl = self.elasticsearch-dsl;
+
   electrickiwi-api = callPackage ../development/python-modules/electrickiwi-api { };
+
   electrum-aionostr = callPackage ../development/python-modules/electrum-aionostr { };
+
   electrum-ecc = callPackage ../development/python-modules/electrum-ecc { };
+
   elegy = callPackage ../development/python-modules/elegy { };
+
   elementpath = callPackage ../development/python-modules/elementpath { };
+
   elevate = callPackage ../development/python-modules/elevate { };
+
   elevenlabs = callPackage ../development/python-modules/elevenlabs { };
+
   elfdeps = toPythonModule (pkgs.elfdeps.override { python3Packages = self; });
+
   elgato = callPackage ../development/python-modules/elgato { };
+
   eliot = callPackage ../development/python-modules/eliot { };
+
   eliqonline = callPackage ../development/python-modules/eliqonline { };
+
   elkm1-lib = callPackage ../development/python-modules/elkm1-lib { };
+
   elmax = callPackage ../development/python-modules/elmax { };
+
   elmax-api = callPackage ../development/python-modules/elmax-api { };
+
   elvia = callPackage ../development/python-modules/elvia { };
+
   email-validator = callPackage ../development/python-modules/email-validator { };
+
   emailthreads = callPackage ../development/python-modules/emailthreads { };
+
   embedding-reader = callPackage ../development/python-modules/embedding-reader { };
+
   emborg = callPackage ../development/python-modules/emborg { };
+
   embrace = callPackage ../development/python-modules/embrace { };
+
   embreex = callPackage ../development/python-modules/embreex { };
+
   emcee = callPackage ../development/python-modules/emcee { };
+
   emoji = callPackage ../development/python-modules/emoji { };
+
   emojis = callPackage ../development/python-modules/emojis { };
+
   empty-files = callPackage ../development/python-modules/empty-files { };
+
   empy = callPackage ../development/python-modules/empy { };
+
   emulated-roku = callPackage ../development/python-modules/emulated-roku { };
+
   emv = callPackage ../development/python-modules/emv { };
+
   enaml = callPackage ../development/python-modules/enaml { };
+
   enamlx = callPackage ../development/python-modules/enamlx { };
+
   encodec = callPackage ../development/python-modules/encodec { };
+
   energyflip-client = callPackage ../development/python-modules/energyflip-client { };
+
   energyflow = callPackage ../development/python-modules/energyflow { };
+
   energyzero = callPackage ../development/python-modules/energyzero { };
+
   enlighten = callPackage ../development/python-modules/enlighten { };
+
   enocean = callPackage ../development/python-modules/enocean { };
+
   enochecker-core = callPackage ../development/python-modules/enochecker-core { };
+
   enrich = callPackage ../development/python-modules/enrich { };
+
   enterpriseattack = callPackage ../development/python-modules/enterpriseattack { };
+
   entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; };
+
   entrance-with-router-features = callPackage ../development/python-modules/entrance {
     routerFeatures = true;
   };
+
   entry-points-txt = callPackage ../development/python-modules/entry-points-txt { };
+
   entrypoint2 = callPackage ../development/python-modules/entrypoint2 { };
+
   entrypoints = callPackage ../development/python-modules/entrypoints { };
+
   enturclient = callPackage ../development/python-modules/enturclient { };
+
   env-canada = callPackage ../development/python-modules/env-canada { };
+
   environmental-override = callPackage ../development/python-modules/environmental-override { };
+
   environs = callPackage ../development/python-modules/environs { };
+
   envisage = callPackage ../development/python-modules/envisage { };
+
   envoy-reader = callPackage ../development/python-modules/envoy-reader { };
+
   envoy-utils = callPackage ../development/python-modules/envoy-utils { };
+
   envs = callPackage ../development/python-modules/envs { };
+
   enzyme = callPackage ../development/python-modules/enzyme { };
+
   epc = callPackage ../development/python-modules/epc { };
+
   ephem = callPackage ../development/python-modules/ephem { };
+
   ephemeral-port-reserve = callPackage ../development/python-modules/ephemeral-port-reserve { };
+
   epicstore-api = callPackage ../development/python-modules/epicstore-api { };
+
   epion = callPackage ../development/python-modules/epion { };
+
   epitran = callPackage ../development/python-modules/epitran { };
+
   epson-projector = callPackage ../development/python-modules/epson-projector { };
+
   eq3btsmart = callPackage ../development/python-modules/eq3btsmart { };
+
   equinox = callPackage ../development/python-modules/equinox { };
+
   eradicate = callPackage ../development/python-modules/eradicate { };
+
   eris = callPackage ../development/python-modules/eris { };
+
   es-client = callPackage ../development/python-modules/es-client { };
+
   escapism = callPackage ../development/python-modules/escapism { };
+
   eseries = callPackage ../development/python-modules/eseries { };
+
   esig = callPackage ../development/python-modules/esig { };
+
   espeak-phonemizer = callPackage ../development/python-modules/espeak-phonemizer { };
+
   esper = callPackage ../development/python-modules/esper { };
+
   esphome-dashboard-api = callPackage ../development/python-modules/esphome-dashboard-api { };
+
   esphome-glyphsets = callPackage ../development/python-modules/esphome-glyphsets { };
+
   esprima = callPackage ../development/python-modules/esprima { };
+
   essentials = callPackage ../development/python-modules/essentials { };
+
   essentials-openapi = callPackage ../development/python-modules/essentials-openapi { };
+
   et-xmlfile = callPackage ../development/python-modules/et-xmlfile { };
+
   etcd = callPackage ../development/python-modules/etcd { };
+
   etcd3 = callPackage ../development/python-modules/etcd3 { inherit (pkgs) etcd; };
+
   ete3 = callPackage ../development/python-modules/ete3 { };
+
   etebase = callPackage ../development/python-modules/etebase { };
+
   etelemetry = callPackage ../development/python-modules/etelemetry { };
+
   eternalegypt = callPackage ../development/python-modules/eternalegypt { };
+
   etesync = callPackage ../development/python-modules/etesync { };
+
   eth-abi = callPackage ../development/python-modules/eth-abi { };
+
   eth-account = callPackage ../development/python-modules/eth-account { };
+
   eth-bloom = callPackage ../development/python-modules/eth-bloom { };
+
   eth-hash = callPackage ../development/python-modules/eth-hash { };
+
   eth-keyfile = callPackage ../development/python-modules/eth-keyfile { };
+
   eth-keys = callPackage ../development/python-modules/eth-keys { };
+
   eth-rlp = callPackage ../development/python-modules/eth-rlp { };
+
   eth-tester = callPackage ../development/python-modules/eth-tester { };
+
   eth-typing = callPackage ../development/python-modules/eth-typing { };
+
   eth-utils = callPackage ../development/python-modules/eth-utils { };
+
   ethtool = callPackage ../development/python-modules/ethtool { };
+
   etils = callPackage ../development/python-modules/etils { };
+
   etuples = callPackage ../development/python-modules/etuples { };
+
   euclid3 = callPackage ../development/python-modules/euclid3 { };
+
   eufylife-ble-client = callPackage ../development/python-modules/eufylife-ble-client { };
+
   eval-type-backport = callPackage ../development/python-modules/eval-type-backport { };
+
   evaluate = callPackage ../development/python-modules/evaluate { };
+
   evdev = callPackage ../development/python-modules/evdev { };
+
   eve = callPackage ../development/python-modules/eve { };
+
   eventkit = callPackage ../development/python-modules/eventkit { };
+
   eventlet = callPackage ../development/python-modules/eventlet { };
+
   events = callPackage ../development/python-modules/events { };
+
   evohome-async = callPackage ../development/python-modules/evohome-async { };
+
   evolutionhttp = callPackage ../development/python-modules/evolutionhttp { };
+
   evosax = callPackage ../development/python-modules/evosax { };
+
   evtx = callPackage ../development/python-modules/evtx { };
+
   ewmh = callPackage ../development/python-modules/ewmh { };
+
   ewmhlib = callPackage ../development/python-modules/ewmhlib { };
+
   example-robot-data = toPythonModule (
     pkgs.example-robot-data.override {
       pythonSupport = true;
       python3Packages = self;
     }
   );
+
   exceptiongroup = callPackage ../development/python-modules/exceptiongroup { };
+
   exchangelib = callPackage ../development/python-modules/exchangelib { };
+
   exdown = callPackage ../development/python-modules/exdown { };
+
   execnb = callPackage ../development/python-modules/execnb { };
+
   execnet = callPackage ../development/python-modules/execnet { };
+
   executing = callPackage ../development/python-modules/executing { };
+
   executor = callPackage ../development/python-modules/executor { };
+
   exif = callPackage ../development/python-modules/exif { };
+
   exifread = callPackage ../development/python-modules/exifread { };
+
   exitcode = callPackage ../development/python-modules/exitcode { };
+
   exiv2 = callPackage ../development/python-modules/exiv2 { inherit (pkgs) exiv2; };
+
   expandvars = callPackage ../development/python-modules/expandvars { };
+
   expects = callPackage ../development/python-modules/expects { };
+
   expecttest = callPackage ../development/python-modules/expecttest { };
+
   experiment-utilities = callPackage ../development/python-modules/experiment-utilities { };
+
   expiring-dict = callPackage ../development/python-modules/expiring-dict { };
+
   expiringdict = callPackage ../development/python-modules/expiringdict { };
+
   explorerscript = callPackage ../development/python-modules/explorerscript { };
+
   exrex = callPackage ../development/python-modules/exrex { };
+
   extension-helpers = callPackage ../development/python-modules/extension-helpers { };
+
   extract-msg = callPackage ../development/python-modules/extract-msg { };
+
   extractcode = callPackage ../development/python-modules/extractcode { };
+
   extractcode-7z = callPackage ../development/python-modules/extractcode/7z.nix {
     inherit (pkgs) p7zip;
   };
+
   extractcode-libarchive = callPackage ../development/python-modules/extractcode/libarchive.nix {
     inherit (pkgs)
       libarchive
@@ -2594,290 +4876,553 @@ self: super: with self; {
       zstd
       ;
   };
+
   extras = callPackage ../development/python-modules/extras { };
+
   extruct = callPackage ../development/python-modules/extruct { };
+
   eyed3 = callPackage ../development/python-modules/eyed3 { };
+
   ezdxf = callPackage ../development/python-modules/ezdxf { };
+
   ezodf = callPackage ../development/python-modules/ezodf { };
+
   ezyrb = callPackage ../development/python-modules/ezyrb { };
+
   f3d = toPythonModule (
     pkgs.f3d.override {
       withPythonBinding = true;
       python3Packages = self;
     }
   );
+
   f5-icontrol-rest = callPackage ../development/python-modules/f5-icontrol-rest { };
+
   f5-sdk = callPackage ../development/python-modules/f5-sdk { };
+
   f90nml = callPackage ../development/python-modules/f90nml { };
+
   faadelays = callPackage ../development/python-modules/faadelays { };
+
   fabio = callPackage ../development/python-modules/fabio { };
+
   fabric = callPackage ../development/python-modules/fabric { };
+
   fabulous = callPackage ../development/python-modules/fabulous { };
+
   face = callPackage ../development/python-modules/face { };
+
   face-recognition = callPackage ../development/python-modules/face-recognition { };
+
   face-recognition-models = callPackage ../development/python-modules/face-recognition/models.nix { };
+
   facebook-sdk = callPackage ../development/python-modules/facebook-sdk { };
+
   facedancer = callPackage ../development/python-modules/facedancer { };
+
   facenet-pytorch = callPackage ../development/python-modules/facenet-pytorch { };
+
   factory-boy = callPackage ../development/python-modules/factory-boy { };
+
   faicons = callPackage ../development/python-modules/faicons { };
+
   fairscale = callPackage ../development/python-modules/fairscale { };
+
   fairseq = callPackage ../development/python-modules/fairseq { };
+
   faiss = callPackage ../development/python-modules/faiss {
     faiss-build = pkgs.faiss.override {
       pythonSupport = true;
       python3Packages = self;
     };
   };
+
   fake-useragent = callPackage ../development/python-modules/fake-useragent { };
+
   faker = callPackage ../development/python-modules/faker { };
+
   fakeredis = callPackage ../development/python-modules/fakeredis { };
+
   falcon = callPackage ../development/python-modules/falcon { };
+
   falcon-cors = callPackage ../development/python-modules/falcon-cors { };
+
   falconpy = callPackage ../development/python-modules/falconpy { };
+
   faraday-agent-parameters-types =
     callPackage ../development/python-modules/faraday-agent-parameters-types
       { };
+
   faraday-plugins = callPackage ../development/python-modules/faraday-plugins { };
+
   farama-notifications = callPackage ../development/python-modules/farama-notifications { };
+
   fast-array-utils = callPackage ../development/python-modules/fast-array-utils { };
+
   fast-histogram = callPackage ../development/python-modules/fast-histogram { };
+
   fast-simplification = callPackage ../development/python-modules/fast-simplification { };
+
   fastai = callPackage ../development/python-modules/fastai { };
+
   fastapi = callPackage ../development/python-modules/fastapi { };
+
   fastapi-cli = callPackage ../development/python-modules/fastapi-cli { };
+
   fastapi-github-oidc = callPackage ../development/python-modules/fastapi-github-oidc { };
+
   fastapi-mail = callPackage ../development/python-modules/fastapi-mail { };
+
   fastapi-mcp = callPackage ../development/python-modules/fastapi-mcp { };
+
   fastapi-sso = callPackage ../development/python-modules/fastapi-sso { };
+
   fastavro = callPackage ../development/python-modules/fastavro { };
+
   fastbencode = callPackage ../development/python-modules/fastbencode { };
+
   fastcache = callPackage ../development/python-modules/fastcache { };
+
   fastcore = callPackage ../development/python-modules/fastcore { };
+
   fastcrc = callPackage ../development/python-modules/fastcrc { };
+
   fastdiff = callPackage ../development/python-modules/fastdiff { };
+
   fastdotcom = callPackage ../development/python-modules/fastdotcom { };
+
   fastdownload = callPackage ../development/python-modules/fastdownload { };
+
   fastdtw = callPackage ../development/python-modules/fastdtw { };
+
   fastecdsa = callPackage ../development/python-modules/fastecdsa { };
+
   fastembed = callPackage ../development/python-modules/fastembed { };
+
   fasteners = callPackage ../development/python-modules/fasteners { };
+
   fastentrypoints = callPackage ../development/python-modules/fastentrypoints { };
+
   faster-whisper = callPackage ../development/python-modules/faster-whisper { };
+
   fastexcel = callPackage ../development/python-modules/fastexcel { };
+
   fastimport = callPackage ../development/python-modules/fastimport { };
+
   fastjet = callPackage ../development/python-modules/fastjet { };
+
   fastjsonschema = callPackage ../development/python-modules/fastjsonschema { };
+
   fastmcp = callPackage ../development/python-modules/fastmcp { };
+
   fastmri = callPackage ../development/python-modules/fastmri { };
+
   fastnlo-toolkit = toPythonModule (
     pkgs.fastnlo-toolkit.override {
       withPython = true;
       inherit (self) python;
     }
   );
+
   fastnumbers = callPackage ../development/python-modules/fastnumbers { };
+
   fastparquet = callPackage ../development/python-modules/fastparquet { };
+
   fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { };
+
   fastprogress = callPackage ../development/python-modules/fastprogress { };
+
   fastremap = callPackage ../development/python-modules/fastremap { };
+
   fastrlock = callPackage ../development/python-modules/fastrlock { };
+
   fasttext = callPackage ../development/python-modules/fasttext { };
+
   fasttext-predict = callPackage ../development/python-modules/fasttext-predict { };
+
   fatrop = toPythonModule (
     pkgs.fatrop.override {
       pythonSupport = true;
       python3Packages = self;
     }
   );
+
   faust-cchardet = callPackage ../development/python-modules/faust-cchardet { };
+
   favicon = callPackage ../development/python-modules/favicon { };
+
   fb-re2 = callPackage ../development/python-modules/fb-re2 { };
+
   fe25519 = callPackage ../development/python-modules/fe25519 { };
+
   feather-format = callPackage ../development/python-modules/feather-format { };
+
   fedora-messaging = callPackage ../development/python-modules/fedora-messaging { };
+
   feedfinder2 = callPackage ../development/python-modules/feedfinder2 { };
+
   feedgen = callPackage ../development/python-modules/feedgen { };
+
   feedgenerator = callPackage ../development/python-modules/feedgenerator { };
+
   feedparser = callPackage ../development/python-modules/feedparser { };
+
   fenics-basix = callPackage ../development/python-modules/fenics-basix { };
+
   fenics-dolfinx = callPackage ../development/python-modules/fenics-dolfinx { };
+
   fenics-ffcx = callPackage ../development/python-modules/fenics-ffcx { };
+
   fenics-ufl = callPackage ../development/python-modules/fenics-ufl { };
+
   ffcv = callPackage ../development/python-modules/ffcv { };
+
   ffmpeg-progress-yield = callPackage ../development/python-modules/ffmpeg-progress-yield { };
+
   ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { };
+
   ffmpy = callPackage ../development/python-modules/ffmpy { };
+
   fhir-py = callPackage ../development/python-modules/fhir-py { };
+
   fiblary3-fork = callPackage ../development/python-modules/fiblary3-fork { };
+
   fickling = callPackage ../development/python-modules/fickling { };
+
   fido2 = callPackage ../development/python-modules/fido2 { };
+
   fields = callPackage ../development/python-modules/fields { };
+
   file-read-backwards = callPackage ../development/python-modules/file-read-backwards { };
+
   filebrowser-safe = callPackage ../development/python-modules/filebrowser-safe { };
+
   filebytes = callPackage ../development/python-modules/filebytes { };
+
   filecheck = callPackage ../development/python-modules/filecheck { };
+
   filedate = callPackage ../development/python-modules/filedate { };
+
   filedepot = callPackage ../development/python-modules/filedepot { };
+
   filelock = callPackage ../development/python-modules/filelock { };
+
   files-to-prompt = callPackage ../development/python-modules/files-to-prompt { };
+
   filesplit = callPackage ../development/python-modules/filesplit { };
+
   filetype = callPackage ../development/python-modules/filetype { };
+
   filterpy = callPackage ../development/python-modules/filterpy { };
+
   finalfusion = callPackage ../development/python-modules/finalfusion { };
+
   find-libpython = callPackage ../development/python-modules/find-libpython { };
+
   findimports = callPackage ../development/python-modules/findimports { };
+
   findpython = callPackage ../development/python-modules/findpython { };
+
   findspark = callPackage ../development/python-modules/findspark { };
+
   finetuning-scheduler = callPackage ../development/python-modules/finetuning-scheduler { };
+
   fingerprints = callPackage ../development/python-modules/fingerprints { };
+
   finitude = callPackage ../development/python-modules/finitude { };
+
   fints = callPackage ../development/python-modules/fints { };
+
   finvizfinance = callPackage ../development/python-modules/finvizfinance { };
+
   fiona = callPackage ../development/python-modules/fiona { };
+
   fipy = callPackage ../development/python-modules/fipy { };
+
   fire = callPackage ../development/python-modules/fire { };
+
   firebase-admin = callPackage ../development/python-modules/firebase-admin { };
+
   firebase-messaging = callPackage ../development/python-modules/firebase-messaging { };
+
   firecrawl-py = callPackage ../development/python-modules/firecrawl-py { };
+
   firedrake = callPackage ../development/python-modules/firedrake { };
+
   firedrake-fiat = callPackage ../development/python-modules/firedrake-fiat { };
+
   fireflyalgorithm = callPackage ../development/python-modules/fireflyalgorithm { };
+
   firetv = callPackage ../development/python-modules/firetv { };
+
   fireworks-ai = callPackage ../development/python-modules/fireworks-ai { };
+
   first = callPackage ../development/python-modules/first { };
+
   fissix = callPackage ../development/python-modules/fissix { };
+
   fitbit = callPackage ../development/python-modules/fitbit { };
+
   fitdecode = callPackage ../development/python-modules/fitdecode { };
+
   fitfile = callPackage ../development/python-modules/fitfile { };
+
   fivem-api = callPackage ../development/python-modules/fivem-api { };
+
   fixerio = callPackage ../development/python-modules/fixerio { };
+
   fixtures = callPackage ../development/python-modules/fixtures { };
+
   fjaraskupan = callPackage ../development/python-modules/fjaraskupan { };
+
   flake8 = callPackage ../development/python-modules/flake8 { };
+
   flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { };
+
   flake8-bugbear = callPackage ../development/python-modules/flake8-bugbear { };
+
   flake8-class-newline = callPackage ../development/python-modules/flake8-class-newline { };
+
   flake8-debugger = callPackage ../development/python-modules/flake8-debugger { };
+
   flake8-deprecated = callPackage ../development/python-modules/flake8-deprecated { };
+
   flake8-docstrings = callPackage ../development/python-modules/flake8-docstrings { };
+
   flake8-future-import = callPackage ../development/python-modules/flake8-future-import { };
+
   flake8-import-order = callPackage ../development/python-modules/flake8-import-order { };
+
   flake8-length = callPackage ../development/python-modules/flake8-length { };
+
   flake8-polyfill = callPackage ../development/python-modules/flake8-polyfill { };
+
   flake8-quotes = callPackage ../development/python-modules/flake8-quotes { };
+
   flaky = callPackage ../development/python-modules/flaky { };
+
   flametree = callPackage ../development/python-modules/flametree { };
+
   flammkuchen = callPackage ../development/python-modules/flammkuchen { };
+
   flasgger = callPackage ../development/python-modules/flasgger { };
+
   flashinfer = callPackage ../development/python-modules/flashinfer { };
+
   flashtext = callPackage ../development/python-modules/flashtext { };
+
   flask = callPackage ../development/python-modules/flask { };
+
   flask-admin = callPackage ../development/python-modules/flask-admin { };
+
   flask-alembic = callPackage ../development/python-modules/flask-alembic { };
+
   flask-allowed-hosts = callPackage ../development/python-modules/flask-allowed-hosts { };
+
   flask-api = callPackage ../development/python-modules/flask-api { };
+
   flask-appbuilder = callPackage ../development/python-modules/flask-appbuilder { };
+
   flask-assets = callPackage ../development/python-modules/flask-assets { };
+
   flask-babel = callPackage ../development/python-modules/flask-babel { };
+
   flask-bcrypt = callPackage ../development/python-modules/flask-bcrypt { };
+
   flask-bootstrap = callPackage ../development/python-modules/flask-bootstrap { };
+
   flask-caching = callPackage ../development/python-modules/flask-caching { };
+
   flask-compress = callPackage ../development/python-modules/flask-compress { };
+
   flask-cors = callPackage ../development/python-modules/flask-cors { };
+
   flask-dance = callPackage ../development/python-modules/flask-dance { };
+
   flask-dramatiq = callPackage ../development/python-modules/flask-dramatiq { };
+
   flask-elastic = callPackage ../development/python-modules/flask-elastic { };
+
   flask-expects-json = callPackage ../development/python-modules/flask-expects-json { };
+
   flask-gravatar = callPackage ../development/python-modules/flask-gravatar { };
+
   flask-httpauth = callPackage ../development/python-modules/flask-httpauth { };
+
   flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { };
+
   flask-limiter = callPackage ../development/python-modules/flask-limiter { };
+
   flask-login = callPackage ../development/python-modules/flask-login { };
+
   flask-mail = callPackage ../development/python-modules/flask-mail { };
+
   flask-mailman = callPackage ../development/python-modules/flask-mailman { };
+
   flask-marshmallow = callPackage ../development/python-modules/flask-marshmallow { };
+
   flask-migrate = callPackage ../development/python-modules/flask-migrate { };
+
   flask-mongoengine = callPackage ../development/python-modules/flask-mongoengine { };
+
   flask-mysqldb = callPackage ../development/python-modules/flask-mysqldb { };
+
   flask-openid = callPackage ../development/python-modules/flask-openid { };
+
   flask-paginate = callPackage ../development/python-modules/flask-paginate { };
+
   flask-paranoid = callPackage ../development/python-modules/flask-paranoid { };
+
   flask-principal = callPackage ../development/python-modules/flask-principal { };
+
   flask-pymongo = callPackage ../development/python-modules/flask-pymongo { };
+
   flask-restful = callPackage ../development/python-modules/flask-restful { };
+
   flask-restx = callPackage ../development/python-modules/flask-restx { };
+
   flask-reverse-proxy-fix = callPackage ../development/python-modules/flask-reverse-proxy-fix { };
+
   flask-script = callPackage ../development/python-modules/flask-script { };
+
   flask-seasurf = callPackage ../development/python-modules/flask-seasurf { };
+
   flask-security = callPackage ../development/python-modules/flask-security { };
+
   flask-session = callPackage ../development/python-modules/flask-session { };
+
   flask-session-captcha = callPackage ../development/python-modules/flask-session-captcha { };
+
   flask-session2 = callPackage ../development/python-modules/flask-session2 { };
+
   flask-simpleldap = callPackage ../development/python-modules/flask-simpleldap { };
+
   flask-sock = callPackage ../development/python-modules/flask-sock { };
+
   flask-socketio = callPackage ../development/python-modules/flask-socketio { };
+
   flask-sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { };
+
   flask-sqlalchemy-lite = callPackage ../development/python-modules/flask-sqlalchemy-lite { };
+
   flask-sslify = callPackage ../development/python-modules/flask-sslify { };
+
   flask-swagger = callPackage ../development/python-modules/flask-swagger { };
+
   flask-swagger-ui = callPackage ../development/python-modules/flask-swagger-ui { };
+
   flask-talisman = callPackage ../development/python-modules/flask-talisman { };
+
   flask-testing = callPackage ../development/python-modules/flask-testing { };
+
   flask-themer = callPackage ../development/python-modules/flask-themer { };
+
   flask-themes2 = callPackage ../development/python-modules/flask-themes2 { };
+
   flask-unsign = callPackage ../development/python-modules/flask-unsign { };
+
   flask-versioned = callPackage ../development/python-modules/flask-versioned { };
+
   flask-webtest = callPackage ../development/python-modules/flask-webtest { };
+
   flask-wtf = callPackage ../development/python-modules/flask-wtf { };
+
   flask-xml-rpc-re = callPackage ../development/python-modules/flask-xml-rpc-re { };
+
   flatbencode = callPackage ../development/python-modules/flatbencode { };
+
   flatbuffers = callPackage ../development/python-modules/flatbuffers { inherit (pkgs) flatbuffers; };
+
   flatdict = callPackage ../development/python-modules/flatdict { };
+
   flatten-dict = callPackage ../development/python-modules/flatten-dict { };
+
   flatten-json = callPackage ../development/python-modules/flatten-json { };
+
   flax = callPackage ../development/python-modules/flax { };
+
   flaxlib = callPackage ../development/python-modules/flaxlib { };
+
   fleep = callPackage ../development/python-modules/fleep { };
+
   flet = callPackage ../development/python-modules/flet { };
+
   flet-cli = callPackage ../development/python-modules/flet-cli { };
+
   flet-desktop = callPackage ../development/python-modules/flet-desktop { };
+
   flet-web = callPackage ../development/python-modules/flet-web { };
+
   flexcache = callPackage ../development/python-modules/flexcache { };
+
   flexit-bacnet = callPackage ../development/python-modules/flexit-bacnet { };
+
   flexmock = callPackage ../development/python-modules/flexmock { };
+
   flexparser = callPackage ../development/python-modules/flexparser { };
+
   flickrapi = callPackage ../development/python-modules/flickrapi { };
+
   flipr-api = callPackage ../development/python-modules/flipr-api { };
+
   flit = callPackage ../development/python-modules/flit { };
+
   flit-core = callPackage ../development/python-modules/flit-core { };
+
   flit-gettext = callPackage ../development/python-modules/flit-gettext { };
+
   flit-scm = callPackage ../development/python-modules/flit-scm { };
+
   floret = callPackage ../development/python-modules/floret { };
+
   flow-record = callPackage ../development/python-modules/flow-record { };
+
   flower = callPackage ../development/python-modules/flower { };
+
   flowjax = callPackage ../development/python-modules/flowjax { };
+
   flowlogs-reader = callPackage ../development/python-modules/flowlogs-reader { };
+
   flowmc = callPackage ../development/python-modules/flowmc { };
+
   fluent-logger = callPackage ../development/python-modules/fluent-logger { };
+
   fluent-pygments = callPackage ../development/python-modules/python-fluent/fluent-pygments.nix { };
+
   fluent-runtime = callPackage ../development/python-modules/python-fluent/fluent-runtime.nix { };
+
   fluent-syntax = callPackage ../development/python-modules/python-fluent/fluent-syntax.nix { };
+
   flufl-bounce = callPackage ../development/python-modules/flufl/bounce.nix { };
+
   flufl-i18n = callPackage ../development/python-modules/flufl/i18n.nix { };
+
   flufl-lock = callPackage ../development/python-modules/flufl/lock.nix { };
+
   flux-led = callPackage ../development/python-modules/flux-led { };
+
   flyingsquid = callPackage ../development/python-modules/flyingsquid { };
+
   flynt = callPackage ../development/python-modules/flynt { };
+
   fmpy = callPackage ../development/python-modules/fmpy { };
+
   fnllm = callPackage ../development/python-modules/fnllm { };
+
   fnv-hash-fast = callPackage ../development/python-modules/fnv-hash-fast { };
+
   fnvhash = callPackage ../development/python-modules/fnvhash { };
+
   folium = callPackage ../development/python-modules/folium { };
+
   font-v = callPackage ../development/python-modules/font-v { };
+
   fontawesomefree = callPackage ../development/python-modules/fontawesomefree { };
+
   fontbakery = callPackage ../development/python-modules/fontbakery { };
+
   fontfeatures = callPackage ../development/python-modules/fontfeatures { };
+
   fontforge = disabledIf (pythonOlder "3.10") (
     toPythonModule (
       pkgs.fontforge.override {
@@ -2886,826 +5431,1545 @@ self: super: with self; {
       }
     )
   );
+
   fontmake = callPackage ../development/python-modules/fontmake { };
+
   fontmath = callPackage ../development/python-modules/fontmath { };
+
   fontparts = callPackage ../development/python-modules/fontparts { };
+
   fontpens = callPackage ../development/python-modules/fontpens { };
+
   fonttools = callPackage ../development/python-modules/fonttools { };
+
   foobot-async = callPackage ../development/python-modules/foobot-async { };
+
   foolscap = callPackage ../development/python-modules/foolscap { };
+
   forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { };
+
   fordpass = callPackage ../development/python-modules/fordpass { };
+
   forecast-solar = callPackage ../development/python-modules/forecast-solar { };
+
   formbox = callPackage ../development/python-modules/formbox { };
+
   formencode = callPackage ../development/python-modules/formencode { };
+
   formulae = callPackage ../development/python-modules/formulae { };
+
   formulaic = callPackage ../development/python-modules/formulaic { };
+
   fortiosapi = callPackage ../development/python-modules/fortiosapi { };
+
   foundationdb = callPackage ../development/python-modules/foundationdb {
     inherit (pkgs) foundationdb;
   };
+
   fountains = callPackage ../development/python-modules/fountains { };
+
   foxdot = callPackage ../development/python-modules/foxdot { };
+
   fpdf = callPackage ../development/python-modules/fpdf { };
+
   fpdf2 = callPackage ../development/python-modules/fpdf2 { };
+
   fpylll = callPackage ../development/python-modules/fpylll { };
+
   fpyutils = callPackage ../development/python-modules/fpyutils { };
+
   fqdn = callPackage ../development/python-modules/fqdn { };
+
   free-proxy = callPackage ../development/python-modules/free-proxy { };
+
   freebox-api = callPackage ../development/python-modules/freebox-api { };
+
   freenub = callPackage ../development/python-modules/freenub { };
+
   freertos-gdb = callPackage ../development/python-modules/freertos-gdb { };
+
   freesasa = callPackage ../development/python-modules/freesasa { inherit (pkgs) freesasa; };
+
   freesms = callPackage ../development/python-modules/freesms { };
+
   freetype-py = callPackage ../development/python-modules/freetype-py { };
+
   freezegun = callPackage ../development/python-modules/freezegun { };
+
   frelatage = callPackage ../development/python-modules/frelatage { };
+
   freud = callPackage ../development/python-modules/freud { };
+
   frictionless = callPackage ../development/python-modules/frictionless { };
+
   frida-python = callPackage ../development/python-modules/frida-python { };
+
   frigidaire = callPackage ../development/python-modules/frigidaire { };
+
   frilouz = callPackage ../development/python-modules/frilouz { };
+
   fritzconnection = callPackage ../development/python-modules/fritzconnection { };
+
   froide = toPythonModule (pkgs.froide.override { python3Packages = self; });
+
   frozendict = callPackage ../development/python-modules/frozendict { };
+
   frozenlist = callPackage ../development/python-modules/frozenlist { };
+
   frozenlist2 = callPackage ../development/python-modules/frozenlist2 { };
+
   fs = callPackage ../development/python-modules/fs { };
+
   fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };
+
   fschat = callPackage ../development/python-modules/fschat { };
+
   fslpy = callPackage ../development/python-modules/fslpy { };
+
   fsspec = callPackage ../development/python-modules/fsspec { };
+
   fsspec-xrootd = callPackage ../development/python-modules/fsspec-xrootd { };
+
   fst-pso = callPackage ../development/python-modules/fst-pso { };
+
   ftfy = callPackage ../development/python-modules/ftfy { };
+
   ftputil = callPackage ../development/python-modules/ftputil { };
+
   fugashi = callPackage ../development/python-modules/fugashi { };
+
   fullmoon = callPackage ../development/python-modules/fullmoon { };
+
   func-timeout = callPackage ../development/python-modules/func-timeout { };
+
   funcparserlib = callPackage ../development/python-modules/funcparserlib { };
+
   funcsigs = callPackage ../development/python-modules/funcsigs { };
+
   functions-framework = callPackage ../development/python-modules/functions-framework { };
+
   functiontrace = callPackage ../development/python-modules/functiontrace { };
+
   funcy = callPackage ../development/python-modules/funcy { };
+
   funk = callPackage ../development/python-modules/funk { };
+
   funsor = callPackage ../development/python-modules/funsor { };
+
   furl = callPackage ../development/python-modules/furl { };
+
   furo = callPackage ../development/python-modules/furo { };
+
   fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse; };
+
   fusepy = callPackage ../development/python-modules/fusepy { };
+
   future = callPackage ../development/python-modules/future { };
+
   future-fstrings = callPackage ../development/python-modules/future-fstrings { };
+
   future-typing = callPackage ../development/python-modules/future-typing { };
+
   fuzzyfinder = callPackage ../development/python-modules/fuzzyfinder { };
+
   fuzzytm = callPackage ../development/python-modules/fuzzytm { };
+
   fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { };
+
   fvcore = callPackage ../development/python-modules/fvcore { };
+
   fvs = callPackage ../development/python-modules/fvs { };
+
   fx2 = callPackage ../development/python-modules/fx2 { };
+
   fxrays = callPackage ../development/python-modules/fxrays { };
+
   fyta-cli = callPackage ../development/python-modules/fyta-cli { };
+
   g2pkk = callPackage ../development/python-modules/g2pkk { };
+
   galario = toPythonModule (
     pkgs.galario.override {
       enablePython = true;
       pythonPackages = self;
     }
   );
+
   galois = callPackage ../development/python-modules/galois { };
+
   gamble = callPackage ../development/python-modules/gamble { };
+
   gaphas = callPackage ../development/python-modules/gaphas { };
+
   gardena-bluetooth = callPackage ../development/python-modules/gardena-bluetooth { };
+
   garminconnect = callPackage ../development/python-modules/garminconnect { };
+
   garminconnect-aio = callPackage ../development/python-modules/garminconnect-aio { };
+
   garth = callPackage ../development/python-modules/garth { };
+
   gassist-text = callPackage ../development/python-modules/gassist-text { };
+
   gast = callPackage ../development/python-modules/gast { };
+
   gatt = callPackage ../development/python-modules/gatt { };
+
   gattlib = callPackage ../development/python-modules/gattlib {
     inherit (pkgs) bluez glib pkg-config;
   };
+
   gawd = callPackage ../development/python-modules/gawd { };
+
   gb-io = callPackage ../development/python-modules/gb-io { };
+
   gbinder-python = callPackage ../development/python-modules/gbinder-python { };
+
   gcal-sync = callPackage ../development/python-modules/gcal-sync { };
+
   gcodepy = callPackage ../development/python-modules/gcodepy { };
+
   gcp-storage-emulator = callPackage ../development/python-modules/gcp-storage-emulator { };
+
   gcsa = callPackage ../development/python-modules/gcsa { };
+
   gcsfs = callPackage ../development/python-modules/gcsfs { };
+
   gdal = toPythonModule (pkgs.gdal.override { python3 = python; });
+
   gdata = callPackage ../development/python-modules/gdata { };
+
   gdb-pt-dump = callPackage ../development/python-modules/gdb-pt-dump { };
+
   gdcm = toPythonModule (
     pkgs.gdcm.override {
       inherit (self) python;
       enablePython = true;
     }
   );
+
   gdown = callPackage ../development/python-modules/gdown { };
+
   gdsfactory = callPackage ../development/python-modules/gdsfactory { };
+
   ge25519 = callPackage ../development/python-modules/ge25519 { };
+
   geant4 = toPythonModule (
     pkgs.geant4.override {
       enablePython = true;
       python3 = python;
     }
   );
+
   gehomesdk = callPackage ../development/python-modules/gehomesdk { };
+
   gekitchen = callPackage ../development/python-modules/gekitchen { };
+
   gekko = callPackage ../development/python-modules/gekko { };
+
   gemfileparser = callPackage ../development/python-modules/gemfileparser { };
+
   gemfileparser2 = callPackage ../development/python-modules/gemfileparser2 { };
+
   gemmi = toPythonModule (
     pkgs.gemmi.override {
       enablePython = true;
       python3Packages = self;
     }
   );
+
   genanki = callPackage ../development/python-modules/genanki { };
+
   generic = callPackage ../development/python-modules/generic { };
+
   genie-partner-sdk = callPackage ../development/python-modules/genie-partner-sdk { };
+
   geniushub-client = callPackage ../development/python-modules/geniushub-client { };
+
   genome-collector = callPackage ../development/python-modules/genome-collector { };
+
   genpy = callPackage ../development/python-modules/genpy { };
+
   genshi = callPackage ../development/python-modules/genshi { };
+
   gensim = callPackage ../development/python-modules/gensim { };
+
   genson = callPackage ../development/python-modules/genson { };
+
   gentools = callPackage ../development/python-modules/gentools { };
+
   genzshcomp = callPackage ../development/python-modules/genzshcomp { };
+
   geoalchemy2 = callPackage ../development/python-modules/geoalchemy2 { };
+
   geoarrow-c = callPackage ../development/python-modules/geoarrow-c { };
+
   geoarrow-pandas = callPackage ../development/python-modules/geoarrow-pandas { };
+
   geoarrow-pyarrow = callPackage ../development/python-modules/geoarrow-pyarrow { };
+
   geoarrow-types = callPackage ../development/python-modules/geoarrow-types { };
+
   geocachingapi = callPackage ../development/python-modules/geocachingapi { };
+
   geocoder = callPackage ../development/python-modules/geocoder { };
+
   geodatasets = callPackage ../development/python-modules/geodatasets { };
+
   geographiclib = callPackage ../development/python-modules/geographiclib { };
+
   geoip = callPackage ../development/python-modules/geoip { libgeoip = pkgs.geoip; };
+
   geoip2 = callPackage ../development/python-modules/geoip2 { };
+
   geojson = callPackage ../development/python-modules/geojson { };
+
   geojson-client = callPackage ../development/python-modules/geojson-client { };
+
   geomet = callPackage ../development/python-modules/geomet { };
+
   geometric = callPackage ../development/python-modules/geometric { };
+
   geopandas = callPackage ../development/python-modules/geopandas { };
+
   geoparquet = callPackage ../development/python-modules/geoparquet { };
+
   geopy = callPackage ../development/python-modules/geopy { };
+
   georss-client = callPackage ../development/python-modules/georss-client { };
+
   georss-generic-client = callPackage ../development/python-modules/georss-generic-client { };
+
   georss-ign-sismologia-client =
     callPackage ../development/python-modules/georss-ign-sismologia-client
       { };
+
   georss-ingv-centro-nazionale-terremoti-client =
     callPackage ../development/python-modules/georss-ingv-centro-nazionale-terremoti-client
       { };
+
   georss-nrcan-earthquakes-client =
     callPackage ../development/python-modules/georss-nrcan-earthquakes-client
       { };
+
   georss-qld-bushfire-alert-client =
     callPackage ../development/python-modules/georss-qld-bushfire-alert-client
       { };
+
   georss-tfs-incidents-client =
     callPackage ../development/python-modules/georss-tfs-incidents-client
       { };
+
   georss-wa-dfes-client = callPackage ../development/python-modules/georss-wa-dfes-client { };
+
   geotorch = callPackage ../development/python-modules/geotorch { };
+
   gepetto-gui = toPythonModule (gepetto-viewer.withPlugins [ gepetto-viewer-corba ]);
+
   gepetto-viewer = toPythonModule (pkgs.gepetto-viewer.override { python3Packages = self; });
+
   gepetto-viewer-corba = toPythonModule (
     pkgs.gepetto-viewer-corba.override { python3Packages = self; }
   );
+
   gerbonara = callPackage ../development/python-modules/gerbonara { };
+
   get-video-properties = callPackage ../development/python-modules/get-video-properties { };
+
   getjump = callPackage ../development/python-modules/getjump { };
+
   getkey = callPackage ../development/python-modules/getkey { };
+
   getmac = callPackage ../development/python-modules/getmac { };
+
   gevent = callPackage ../development/python-modules/gevent { };
+
   gevent-eventemitter = callPackage ../development/python-modules/gevent-eventemitter { };
+
   gevent-socketio = callPackage ../development/python-modules/gevent-socketio { };
+
   gevent-websocket = callPackage ../development/python-modules/gevent-websocket { };
+
   geventhttpclient = callPackage ../development/python-modules/geventhttpclient { };
+
   gfal2-python = callPackage ../development/python-modules/gfal2-python { };
+
   gfal2-util = callPackage ../development/python-modules/gfal2-util { inherit (pkgs) xrootd; };
+
   gflags = callPackage ../development/python-modules/gflags { };
+
   gflanguages = callPackage ../development/python-modules/gflanguages { };
+
   gfsubsets = callPackage ../development/python-modules/gfsubsets { };
+
   gftools = callPackage ../development/python-modules/gftools { };
+
   gguf = callPackage ../development/python-modules/gguf { };
+
   ghapi = callPackage ../development/python-modules/ghapi { };
+
   ghdiff = callPackage ../development/python-modules/ghdiff { };
+
   ghidra-bridge = callPackage ../development/python-modules/ghidra-bridge { };
+
   ghome-foyer-api = callPackage ../development/python-modules/ghome-foyer-api { };
+
   ghostscript = callPackage ../development/python-modules/ghostscript { };
+
   ghp-import = callPackage ../development/python-modules/ghp-import { };
+
   ghrepo-stats = callPackage ../development/python-modules/ghrepo-stats { };
+
   gibberish-detector = callPackage ../development/python-modules/gibberish-detector { };
+
   gidgethub = callPackage ../development/python-modules/gidgethub { };
+
   gilknocker = callPackage ../development/python-modules/gilknocker { };
+
   gin-config = callPackage ../development/python-modules/gin-config { };
+
   gios = callPackage ../development/python-modules/gios { };
+
   gipc = callPackage ../development/python-modules/gipc { };
+
   gistyc = callPackage ../development/python-modules/gistyc { };
+
   git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter { };
+
   git-dummy = callPackage ../development/python-modules/git-dummy { };
+
   git-filter-repo = callPackage ../development/python-modules/git-filter-repo { };
+
   git-find-repos = callPackage ../development/python-modules/git-find-repos { };
+
   git-revise = callPackage ../development/python-modules/git-revise { };
+
   git-sweep = callPackage ../development/python-modules/git-sweep { };
+
   git-url-parse = callPackage ../development/python-modules/git-url-parse { };
+
   git-versioner = callPackage ../development/python-modules/git-versioner { };
+
   gitdb = callPackage ../development/python-modules/gitdb { };
+
   github-to-sqlite = callPackage ../development/python-modules/github-to-sqlite { };
+
   github-webhook = callPackage ../development/python-modules/github-webhook { };
+
   github3-py = callPackage ../development/python-modules/github3-py { };
+
   githubkit = callPackage ../development/python-modules/githubkit { };
+
   gitignore-parser = callPackage ../development/python-modules/gitignore-parser { };
+
   gitingest = callPackage ../development/python-modules/gitingest { };
+
   gitlike-commands = callPackage ../development/python-modules/gitlike-commands { };
+
   gitpython = callPackage ../development/python-modules/gitpython { };
+
   giturlparse = callPackage ../development/python-modules/giturlparse { };
+
   glad = callPackage ../development/python-modules/glad { };
+
   glad2 = callPackage ../development/python-modules/glad2 { };
+
   glances-api = callPackage ../development/python-modules/glances-api { };
+
   glcontext = callPackage ../development/python-modules/glcontext { };
+
   glean-parser = callPackage ../development/python-modules/glean-parser { };
+
   glean-sdk = callPackage ../development/python-modules/glean-sdk { };
+
   glfw = callPackage ../development/python-modules/glfw { };
+
   gliner = callPackage ../development/python-modules/gliner { };
+
   glob2 = callPackage ../development/python-modules/glob2 { };
+
   globus-sdk = callPackage ../development/python-modules/globus-sdk { };
+
   glocaltokens = callPackage ../development/python-modules/glocaltokens { };
+
   glom = callPackage ../development/python-modules/glom { };
+
   glueviz = callPackage ../development/python-modules/glueviz { };
+
   gluonts = callPackage ../development/python-modules/gluonts { };
+
   glymur = callPackage ../development/python-modules/glymur { };
+
   glyphsets = callPackage ../development/python-modules/glyphsets { };
+
   glyphslib = callPackage ../development/python-modules/glyphslib { };
+
   glyphtools = callPackage ../development/python-modules/glyphtools { };
+
   gmpy = callPackage ../development/python-modules/gmpy { };
+
   gmpy2 = callPackage ../development/python-modules/gmpy2 { };
+
   gmqtt = callPackage ../development/python-modules/gmqtt { };
+
   gmsh = toPythonModule (
     pkgs.gmsh.override {
       python3Packages = self;
       enablePython = true;
     }
   );
+
   gntp = callPackage ../development/python-modules/gntp { };
+
   gnucash = toPythonModule (
     pkgs.gnucash.override {
       python3 = python;
     }
   );
+
   gnureadline = callPackage ../development/python-modules/gnureadline { };
+
   go2rtc-client = callPackage ../development/python-modules/go2rtc-client { };
+
   goalzero = callPackage ../development/python-modules/goalzero { };
+
   gocardless-pro = callPackage ../development/python-modules/gocardless-pro { };
+
   goocalendar = callPackage ../development/python-modules/goocalendar { };
+
   goodwe = callPackage ../development/python-modules/goodwe { };
+
   google = callPackage ../development/python-modules/google { };
+
   google-ai-generativelanguage =
     callPackage ../development/python-modules/google-ai-generativelanguage
       { };
+
   google-api-core = callPackage ../development/python-modules/google-api-core { };
+
   google-api-python-client = callPackage ../development/python-modules/google-api-python-client { };
+
   google-auth = callPackage ../development/python-modules/google-auth { };
+
   google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { };
+
   google-auth-oauthlib = callPackage ../development/python-modules/google-auth-oauthlib { };
+
   google-cloud-access-context-manager =
     callPackage ../development/python-modules/google-cloud-access-context-manager
       { };
+
   google-cloud-appengine-logging =
     callPackage ../development/python-modules/google-cloud-appengine-logging
       { };
+
   google-cloud-artifact-registry =
     callPackage ../development/python-modules/google-cloud-artifact-registry
       { };
+
   google-cloud-asset = callPackage ../development/python-modules/google-cloud-asset { };
+
   google-cloud-audit-log = callPackage ../development/python-modules/google-cloud-audit-log { };
+
   google-cloud-automl = callPackage ../development/python-modules/google-cloud-automl { };
+
   google-cloud-bigquery = callPackage ../development/python-modules/google-cloud-bigquery { };
+
   google-cloud-bigquery-datatransfer =
     callPackage ../development/python-modules/google-cloud-bigquery-datatransfer
       { };
+
   google-cloud-bigquery-logging =
     callPackage ../development/python-modules/google-cloud-bigquery-logging
       { };
+
   google-cloud-bigquery-storage =
     callPackage ../development/python-modules/google-cloud-bigquery-storage
       { };
+
   google-cloud-bigtable = callPackage ../development/python-modules/google-cloud-bigtable { };
+
   google-cloud-compute = callPackage ../development/python-modules/google-cloud-compute { };
+
   google-cloud-container = callPackage ../development/python-modules/google-cloud-container { };
+
   google-cloud-core = callPackage ../development/python-modules/google-cloud-core { };
+
   google-cloud-datacatalog = callPackage ../development/python-modules/google-cloud-datacatalog { };
+
   google-cloud-dataproc = callPackage ../development/python-modules/google-cloud-dataproc { };
+
   google-cloud-datastore = callPackage ../development/python-modules/google-cloud-datastore { };
+
   google-cloud-dlp = callPackage ../development/python-modules/google-cloud-dlp { };
+
   google-cloud-dns = callPackage ../development/python-modules/google-cloud-dns { };
+
   google-cloud-error-reporting =
     callPackage ../development/python-modules/google-cloud-error-reporting
       { };
+
   google-cloud-firestore = callPackage ../development/python-modules/google-cloud-firestore { };
+
   google-cloud-iam = callPackage ../development/python-modules/google-cloud-iam { };
+
   google-cloud-iam-logging = callPackage ../development/python-modules/google-cloud-iam-logging { };
+
   google-cloud-iot = callPackage ../development/python-modules/google-cloud-iot { };
+
   google-cloud-kms = callPackage ../development/python-modules/google-cloud-kms { };
+
   google-cloud-language = callPackage ../development/python-modules/google-cloud-language { };
+
   google-cloud-logging = callPackage ../development/python-modules/google-cloud-logging { };
+
   google-cloud-monitoring = callPackage ../development/python-modules/google-cloud-monitoring { };
+
   google-cloud-netapp = callPackage ../development/python-modules/google-cloud-netapp { };
+
   google-cloud-network-connectivity =
     callPackage ../development/python-modules/google-cloud-network-connectivity
       { };
+
   google-cloud-org-policy = callPackage ../development/python-modules/google-cloud-org-policy { };
+
   google-cloud-os-config = callPackage ../development/python-modules/google-cloud-os-config { };
+
   google-cloud-pubsub = callPackage ../development/python-modules/google-cloud-pubsub { };
+
   google-cloud-redis = callPackage ../development/python-modules/google-cloud-redis { };
+
   google-cloud-resource-manager =
     callPackage ../development/python-modules/google-cloud-resource-manager
       { };
+
   google-cloud-runtimeconfig =
     callPackage ../development/python-modules/google-cloud-runtimeconfig
       { };
+
   google-cloud-secret-manager =
     callPackage ../development/python-modules/google-cloud-secret-manager
       { };
+
   google-cloud-securitycenter =
     callPackage ../development/python-modules/google-cloud-securitycenter
       { };
+
   google-cloud-shell = callPackage ../development/python-modules/google-cloud-shell { };
+
   google-cloud-spanner = callPackage ../development/python-modules/google-cloud-spanner { };
+
   google-cloud-speech = callPackage ../development/python-modules/google-cloud-speech { };
+
   google-cloud-storage = callPackage ../development/python-modules/google-cloud-storage { };
+
   google-cloud-tasks = callPackage ../development/python-modules/google-cloud-tasks { };
+
   google-cloud-testutils = callPackage ../development/python-modules/google-cloud-testutils { };
+
   google-cloud-texttospeech = callPackage ../development/python-modules/google-cloud-texttospeech { };
+
   google-cloud-trace = callPackage ../development/python-modules/google-cloud-trace { };
+
   google-cloud-translate = callPackage ../development/python-modules/google-cloud-translate { };
+
   google-cloud-videointelligence =
     callPackage ../development/python-modules/google-cloud-videointelligence
       { };
+
   google-cloud-vision = callPackage ../development/python-modules/google-cloud-vision { };
+
   google-cloud-vpc-access = callPackage ../development/python-modules/google-cloud-vpc-access { };
+
   google-cloud-webrisk = callPackage ../development/python-modules/google-cloud-webrisk { };
+
   google-cloud-websecurityscanner =
     callPackage ../development/python-modules/google-cloud-websecurityscanner
       { };
+
   google-cloud-workflows = callPackage ../development/python-modules/google-cloud-workflows { };
+
   google-cloud-workstations = callPackage ../development/python-modules/google-cloud-workstations { };
+
   google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { };
+
   google-crc32c = callPackage ../development/python-modules/google-crc32c { inherit (pkgs) crc32c; };
+
   google-genai = callPackage ../development/python-modules/google-genai { };
+
   google-generativeai = callPackage ../development/python-modules/google-generativeai { };
+
   google-geo-type = callPackage ../development/python-modules/google-geo-type { };
+
   google-i18n-address = callPackage ../development/python-modules/google-i18n-address { };
+
   google-maps-routing = callPackage ../development/python-modules/google-maps-routing { };
+
   google-nest-sdm = callPackage ../development/python-modules/google-nest-sdm { };
+
   google-pasta = callPackage ../development/python-modules/google-pasta { };
+
   google-photos-library-api = callPackage ../development/python-modules/google-photos-library-api { };
+
   google-re2 = callPackage ../development/python-modules/google-re2 { };
+
   google-resumable-media = callPackage ../development/python-modules/google-resumable-media { };
+
   google-search-results = callPackage ../development/python-modules/google-search-results { };
+
   googleapis-common-protos = callPackage ../development/python-modules/googleapis-common-protos { };
+
   googlemaps = callPackage ../development/python-modules/googlemaps { };
+
   googletrans = callPackage ../development/python-modules/googletrans { };
+
   gophish = callPackage ../development/python-modules/gophish { };
+
   gorilla = callPackage ../development/python-modules/gorilla { };
+
   goslide-api = callPackage ../development/python-modules/goslide-api { };
+
   gotailwind = callPackage ../development/python-modules/gotailwind { };
+
   gotenberg-client = callPackage ../development/python-modules/gotenberg-client { };
+
   gotify = callPackage ../development/python-modules/gotify { };
+
   gotrue = callPackage ../development/python-modules/gotrue { };
+
   govee-ble = callPackage ../development/python-modules/govee-ble { };
+
   govee-led-wez = callPackage ../development/python-modules/govee-led-wez { };
+
   govee-local-api = callPackage ../development/python-modules/govee-local-api { };
+
   goveelights = callPackage ../development/python-modules/goveelights { };
+
   gower = callPackage ../development/python-modules/gower { };
+
   gpapi = callPackage ../development/python-modules/gpapi { };
+
   gpaw = callPackage ../development/python-modules/gpaw { };
+
   gpgme = callPackage ../development/python-modules/gpgme { inherit (pkgs) gpgme; };
+
   gphoto2 = callPackage ../development/python-modules/gphoto2 { };
+
   gpib-ctypes = callPackage ../development/python-modules/gpib-ctypes { };
+
   gpiozero = callPackage ../development/python-modules/gpiozero { };
+
   gplaycli = callPackage ../development/python-modules/gplaycli { };
+
   gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; };
+
   gps3 = callPackage ../development/python-modules/gps3 { };
+
   gpsoauth = callPackage ../development/python-modules/gpsoauth { };
+
   gpt-2-simple = callPackage ../development/python-modules/gpt-2-simple { };
+
   gptcache = callPackage ../development/python-modules/gptcache { };
+
   gpu-rir = callPackage ../development/python-modules/gpu-rir { };
+
   gpuctypes = callPackage ../development/python-modules/gpuctypes { };
+
   gpustat = callPackage ../development/python-modules/gpustat { };
+
   gpxpy = callPackage ../development/python-modules/gpxpy { };
+
   gpy = callPackage ../development/python-modules/gpy { };
+
   gpytorch = callPackage ../development/python-modules/gpytorch { };
+
   gql = callPackage ../development/python-modules/gql { };
+
   grad-cam = callPackage ../development/python-modules/grad-cam { };
+
   gradient = callPackage ../development/python-modules/gradient { };
+
   gradient-statsd = callPackage ../development/python-modules/gradient-statsd { };
+
   gradient-utils = callPackage ../development/python-modules/gradient-utils { };
+
   gradio = callPackage ../development/python-modules/gradio { };
+
   gradio-client = callPackage ../development/python-modules/gradio/client.nix { };
+
   gradio-pdf = callPackage ../development/python-modules/gradio-pdf { };
+
   grafanalib = callPackage ../development/python-modules/grafanalib/default.nix { };
+
   grammalecte = callPackage ../development/python-modules/grammalecte { };
+
   grandalf = callPackage ../development/python-modules/grandalf { };
+
   granian = callPackage ../development/python-modules/granian { };
+
   graph-tool = callPackage ../development/python-modules/graph-tool { inherit (pkgs) cgal; };
+
   grapheme = callPackage ../development/python-modules/grapheme { };
+
   graphene = callPackage ../development/python-modules/graphene { };
+
   graphene-django = callPackage ../development/python-modules/graphene-django { };
+
   graphite-web = callPackage ../development/python-modules/graphite-web { };
+
   graphlib-backport = callPackage ../development/python-modules/graphlib-backport { };
+
   graphql-core = callPackage ../development/python-modules/graphql-core { };
+
   graphql-relay = callPackage ../development/python-modules/graphql-relay { };
+
   graphql-server-core = callPackage ../development/python-modules/graphql-server-core { };
+
   graphql-subscription-manager =
     callPackage ../development/python-modules/graphql-subscription-manager
       { };
+
   graphqlclient = callPackage ../development/python-modules/graphqlclient { };
+
   graphrag = callPackage ../development/python-modules/graphrag { };
+
   graphtage = callPackage ../development/python-modules/graphtage { };
+
   graphviz = callPackage ../development/python-modules/graphviz { };
+
   grappelli-safe = callPackage ../development/python-modules/grappelli-safe { };
+
   graspologic = callPackage ../development/python-modules/graspologic { };
+
   graspologic-native = callPackage ../development/python-modules/graspologic-native { };
+
   great-expectations = callPackage ../development/python-modules/great-expectations { };
+
   great-tables = callPackage ../development/python-modules/great-tables { };
+
   greatfet = callPackage ../development/python-modules/greatfet { };
+
   greeclimate = callPackage ../development/python-modules/greeclimate { };
+
   greek-accentuation = callPackage ../development/python-modules/greek-accentuation { };
+
   green = callPackage ../development/python-modules/green { };
+
   greeneye-monitor = callPackage ../development/python-modules/greeneye-monitor { };
+
   # built-in for pypi
   greenlet = if isPyPy then null else callPackage ../development/python-modules/greenlet { };
+
   gremlinpython = callPackage ../development/python-modules/gremlinpython { };
+
   grep-ast = callPackage ../development/python-modules/grep-ast { };
+
   grequests = callPackage ../development/python-modules/grequests { };
+
   greynoise = callPackage ../development/python-modules/greynoise { };
+
   gridnet = callPackage ../development/python-modules/gridnet { };
+
   griffe = callPackage ../development/python-modules/griffe { };
+
   grip = callPackage ../development/python-modules/grip { };
+
   groestlcoin-hash = callPackage ../development/python-modules/groestlcoin-hash { };
+
   groovy = callPackage ../development/python-modules/groovy { };
+
   groq = callPackage ../development/python-modules/groq { };
+
   growattserver = callPackage ../development/python-modules/growattserver { };
+
   grpc-google-iam-v1 = callPackage ../development/python-modules/grpc-google-iam-v1 { };
+
   grpc-interceptor = callPackage ../development/python-modules/grpc-interceptor { };
+
   grpcio = callPackage ../development/python-modules/grpcio { };
+
   grpcio-channelz = callPackage ../development/python-modules/grpcio-channelz { };
+
   grpcio-gcp = callPackage ../development/python-modules/grpcio-gcp { };
+
   grpcio-health-checking = callPackage ../development/python-modules/grpcio-health-checking { };
+
   grpcio-reflection = callPackage ../development/python-modules/grpcio-reflection { };
+
   grpcio-status = callPackage ../development/python-modules/grpcio-status { };
+
   grpcio-testing = callPackage ../development/python-modules/grpcio-testing { };
+
   grpcio-tools = callPackage ../development/python-modules/grpcio-tools { };
+
   grpclib = callPackage ../development/python-modules/grpclib { };
+
   gruut = callPackage ../development/python-modules/gruut { };
+
   gruut-ipa = callPackage ../development/python-modules/gruut-ipa { inherit (pkgs) espeak; };
+
   gsd = callPackage ../development/python-modules/gsd { };
+
   gsm0338 = callPackage ../development/python-modules/gsm0338 { };
+
   gspread = callPackage ../development/python-modules/gspread { };
+
   gssapi = callPackage ../development/python-modules/gssapi {
     krb5-c = pkgs.krb5;
   };
+
   gst-python = callPackage ../development/python-modules/gst-python {
     # inherit (pkgs) meson won't work because it won't be spliced
     inherit (pkgs.buildPackages) meson;
   };
+
   gstools = callPackage ../development/python-modules/gstools { };
+
   gstools-cython = callPackage ../development/python-modules/gstools-cython { };
+
   gtfs-realtime-bindings = callPackage ../development/python-modules/gtfs-realtime-bindings { };
+
   gto = callPackage ../development/python-modules/gto { };
+
   gtts = callPackage ../development/python-modules/gtts { };
+
   gtts-token = callPackage ../development/python-modules/gtts-token { };
+
   gudhi = callPackage ../development/python-modules/gudhi { inherit (pkgs) cgal; };
+
   guessit = callPackage ../development/python-modules/guessit { };
+
   guestfs = toPythonModule (
     pkgs.libguestfs.override {
       python3 = python;
     }
   );
+
   guidance = callPackage ../development/python-modules/guidance { };
+
   guidance-stitch = callPackage ../development/python-modules/guidance-stitch { };
+
   guidata = callPackage ../development/python-modules/guidata { };
+
   gumath = callPackage ../development/python-modules/gumath { };
+
   gunicorn = callPackage ../development/python-modules/gunicorn { };
+
   guppy3 = callPackage ../development/python-modules/guppy3 { };
+
   gurobipy = callPackage ../development/python-modules/gurobipy { };
+
   guzzle-sphinx-theme = callPackage ../development/python-modules/guzzle-sphinx-theme { };
+
   gviz-api = callPackage ../development/python-modules/gviz-api { };
+
   gvm-tools = callPackage ../development/python-modules/gvm-tools { };
+
   gwcs = callPackage ../development/python-modules/gwcs { };
+
   gym = callPackage ../development/python-modules/gym { };
+
   gym-notices = callPackage ../development/python-modules/gym-notices { };
+
   gymnasium = callPackage ../development/python-modules/gymnasium { };
+
   gyp = callPackage ../development/python-modules/gyp { };
+
   h11 = callPackage ../development/python-modules/h11 { };
+
   h2 = callPackage ../development/python-modules/h2 { };
+
   h3 = callPackage ../development/python-modules/h3 { h3 = pkgs.h3_4; };
+
   h5io = callPackage ../development/python-modules/h5io { };
+
   h5netcdf = callPackage ../development/python-modules/h5netcdf { };
+
   h5py = callPackage ../development/python-modules/h5py { };
+
   h5py-mpi = self.h5py.override { hdf5 = pkgs.hdf5-mpi; };
+
   ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { };
+
   ha-iotawattpy = callPackage ../development/python-modules/ha-iotawattpy { };
+
   ha-mqtt-discoverable = callPackage ../development/python-modules/ha-mqtt-discoverable { };
+
   ha-philipsjs = callPackage ../development/python-modules/ha-philipsjs { };
+
   ha-silabs-firmware-client = callPackage ../development/python-modules/ha-silabs-firmware-client { };
+
   habanero = callPackage ../development/python-modules/habanero { };
+
   habiticalib = callPackage ../development/python-modules/habiticalib { };
+
   habitipy = callPackage ../development/python-modules/habitipy { };
+
   habluetooth = callPackage ../development/python-modules/habluetooth { };
+
   hachoir = callPackage ../development/python-modules/hachoir { };
+
   hacking = callPackage ../development/python-modules/hacking { };
+
   hahomematic = callPackage ../development/python-modules/hahomematic { };
+
   hakuin = callPackage ../development/python-modules/hakuin { };
+
   halide =
     toPythonModule
       (pkgs.halide.override {
         pythonSupport = true;
         python3Packages = self;
       }).lib;
+
   halo = callPackage ../development/python-modules/halo { };
+
   halohome = callPackage ../development/python-modules/halohome { };
+
   handout = callPackage ../development/python-modules/handout { };
+
   handy-archives = callPackage ../development/python-modules/handy-archives { };
+
   hankel = callPackage ../development/python-modules/hankel { };
+
   hanzidentifier = callPackage ../development/python-modules/hanzidentifier { };
+
   hap-python = callPackage ../development/python-modules/hap-python { };
+
   harlequin-bigquery = callPackage ../development/python-modules/harlequin-bigquery { };
+
   harlequin-postgres = callPackage ../development/python-modules/harlequin-postgres { };
+
   hass-client = callPackage ../development/python-modules/hass-client { };
+
   hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { };
+
   hass-splunk = callPackage ../development/python-modules/hass-splunk { };
+
   hassil = callPackage ../development/python-modules/hassil { };
+
   hatasmota = callPackage ../development/python-modules/hatasmota { };
+
   hatch-autorun = callPackage ../development/python-modules/hatch-autorun { };
+
   hatch-babel = callPackage ../development/python-modules/hatch-babel { };
+
   hatch-docstring-description =
     callPackage ../development/python-modules/hatch-docstring-description
       { };
+
   hatch-fancy-pypi-readme = callPackage ../development/python-modules/hatch-fancy-pypi-readme { };
+
   hatch-jupyter-builder = callPackage ../development/python-modules/hatch-jupyter-builder { };
+
   hatch-min-requirements = callPackage ../development/python-modules/hatch-min-requirements { };
+
   hatch-nodejs-version = callPackage ../development/python-modules/hatch-nodejs-version { };
+
   hatch-odoo = callPackage ../development/python-modules/hatch-odoo { };
+
   hatch-regex-commit = callPackage ../development/python-modules/hatch-regex-commit { };
+
   hatch-requirements-txt = callPackage ../development/python-modules/hatch-requirements-txt { };
+
   hatch-vcs = callPackage ../development/python-modules/hatch-vcs { };
+
   hatchling = callPackage ../development/python-modules/hatchling { };
+
   haversine = callPackage ../development/python-modules/haversine { };
+
   hawkauthlib = callPackage ../development/python-modules/hawkauthlib { };
+
   hawkmoth = callPackage ../development/python-modules/hawkmoth { };
+
   haystack-ai = callPackage ../development/python-modules/haystack-ai { };
+
   hcloud = callPackage ../development/python-modules/hcloud { };
+
   hcs-utils = callPackage ../development/python-modules/hcs-utils { };
+
   hdate = callPackage ../development/python-modules/hdate { };
+
   hdbscan = callPackage ../development/python-modules/hdbscan { };
+
   hdf5plugin = callPackage ../development/python-modules/hdf5plugin {
     inherit (pkgs) zstd lz4;
   };
+
   hdfs = callPackage ../development/python-modules/hdfs { };
+
   hdmedians = callPackage ../development/python-modules/hdmedians { };
+
   headerparser = callPackage ../development/python-modules/headerparser { };
+
   heapdict = callPackage ../development/python-modules/heapdict { };
+
   heatmiserv3 = callPackage ../development/python-modules/heatmiserv3 { };
+
   heatshrink2 = callPackage ../development/python-modules/heatshrink2 { };
+
   heatzypy = callPackage ../development/python-modules/heatzypy { };
+
   hebg = callPackage ../development/python-modules/hebg { };
+
   heif-image-plugin = callPackage ../development/python-modules/heif-image-plugin { };
+
   help2man = callPackage ../development/python-modules/help2man { };
+
   helpdev = callPackage ../development/python-modules/helpdev { };
+
   helper = callPackage ../development/python-modules/helper { };
+
   hepmc3 = toPythonModule (pkgs.hepmc3.override { inherit python; });
+
   hepunits = callPackage ../development/python-modules/hepunits { };
+
   here-routing = callPackage ../development/python-modules/here-routing { };
+
   here-transit = callPackage ../development/python-modules/here-transit { };
+
   herepy = callPackage ../development/python-modules/herepy { };
+
   hetzner = callPackage ../development/python-modules/hetzner { };
+
   heudiconv = callPackage ../development/python-modules/heudiconv { };
+
   hexbytes = callPackage ../development/python-modules/hexbytes { };
+
   hexdump = callPackage ../development/python-modules/hexdump { };
+
   hf-transfer = callPackage ../development/python-modules/hf-transfer { };
+
   hf-xet = callPackage ../development/python-modules/hf-xet { };
+
   hfst = callPackage ../development/python-modules/hfst { };
+
   hg-commitsigs = callPackage ../development/python-modules/hg-commitsigs { };
+
   hg-evolve = callPackage ../development/python-modules/hg-evolve { };
+
   hg-git = callPackage ../development/python-modules/hg-git { };
+
   hickle = callPackage ../development/python-modules/hickle { };
+
   hid = callPackage ../development/python-modules/hid { inherit (pkgs) hidapi; };
+
   hid-parser = callPackage ../development/python-modules/hid-parser { };
+
   hidapi = callPackage ../development/python-modules/hidapi { inherit (pkgs) hidapi udev; };
+
   hier-config = callPackage ../development/python-modules/hier-config { };
+
   hieroglyph = callPackage ../development/python-modules/hieroglyph { };
+
   highctidh = callPackage ../development/python-modules/highctidh { };
+
   highdicom = callPackage ../development/python-modules/highdicom { };
+
   highspy = callPackage ../development/python-modules/highspy { };
+
   hightime = callPackage ../development/python-modules/hightime { };
+
   hijridate = callPackage ../development/python-modules/hijridate { };
+
   hikari = callPackage ../development/python-modules/hikari { };
+
   hikari-crescent = callPackage ../development/python-modules/hikari-crescent { };
+
   hikari-lightbulb = callPackage ../development/python-modules/hikari-lightbulb { };
+
   hikvision = callPackage ../development/python-modules/hikvision { };
+
   hiredis = callPackage ../development/python-modules/hiredis { };
+
   hiro = callPackage ../development/python-modules/hiro { };
+
   hishel = callPackage ../development/python-modules/hishel { };
+
   hist = callPackage ../development/python-modules/hist { };
+
   histoprint = callPackage ../development/python-modules/histoprint { };
+
   hiyapyco = callPackage ../development/python-modules/hiyapyco { };
+
   hjson = callPackage ../development/python-modules/hjson { };
+
   hkavr = callPackage ../development/python-modules/hkavr { };
+
   hko = callPackage ../development/python-modules/hko { };
+
   hledger-utils = callPackage ../development/python-modules/hledger-utils { };
+
   hlk-sw16 = callPackage ../development/python-modules/hlk-sw16 { };
+
   hmmlearn = callPackage ../development/python-modules/hmmlearn { };
+
   hnswlib = callPackage ../development/python-modules/hnswlib { inherit (pkgs) hnswlib; };
+
   hocr-tools = callPackage ../development/python-modules/hocr-tools { };
+
   hole = callPackage ../development/python-modules/hole { };
+
   holidays = callPackage ../development/python-modules/holidays { };
+
   hologram = callPackage ../development/python-modules/hologram { };
+
   holoviews = callPackage ../development/python-modules/holoviews { };
+
   home-assistant-bluetooth = callPackage ../development/python-modules/home-assistant-bluetooth { };
+
   home-assistant-chip-clusters =
     callPackage ../development/python-modules/home-assistant-chip-clusters
       { };
+
   home-assistant-chip-core = callPackage ../development/python-modules/home-assistant-chip-core { };
+
   home-assistant-chip-wheels = toPythonModule (
     callPackage ../development/python-modules/home-assistant-chip-wheels { }
   );
+
   home-connect-async = callPackage ../development/python-modules/home-connect-async { };
+
   homeassistant-stubs = callPackage ../servers/home-assistant/stubs.nix { };
+
   homeconnect = callPackage ../development/python-modules/homeconnect { };
+
   homematicip = callPackage ../development/python-modules/homematicip { };
+
   homepluscontrol = callPackage ../development/python-modules/homepluscontrol { };
+
   homf = callPackage ../development/python-modules/homf { };
+
   hoomd-blue = callPackage ../development/python-modules/hoomd-blue { };
+
   hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { };
+
   horizon-eda = callPackage ../development/python-modules/horizon-eda { inherit (pkgs) horizon-eda; };
+
   housekeeping = callPackage ../development/python-modules/housekeeping { };
+
   howdoi = callPackage ../development/python-modules/howdoi { };
+
   hpack = callPackage ../development/python-modules/hpack { };
+
   hpccm = callPackage ../development/python-modules/hpccm { };
+
   hs-dbus-signature = callPackage ../development/python-modules/hs-dbus-signature { };
+
   hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { };
+
   hsh = callPackage ../development/python-modules/hsh { };
+
   hsluv = callPackage ../development/python-modules/hsluv { };
+
   hstspreload = callPackage ../development/python-modules/hstspreload { };
+
   html-sanitizer = callPackage ../development/python-modules/html-sanitizer { };
+
   html-table-parser-python3 = callPackage ../development/python-modules/html-table-parser-python3 { };
+
   html-tag-names = callPackage ../development/python-modules/html-tag-names { };
+
   html-text = callPackage ../development/python-modules/html-text { };
+
   html-void-elements = callPackage ../development/python-modules/html-void-elements { };
+
   html2image = callPackage ../development/python-modules/html2image { };
+
   html2pdf4doc = callPackage ../development/python-modules/html2pdf4doc { };
+
   html2text = callPackage ../development/python-modules/html2text { };
+
   html5-parser = callPackage ../development/python-modules/html5-parser { };
+
   html5lib = callPackage ../development/python-modules/html5lib { };
+
   html5tagger = callPackage ../development/python-modules/html5tagger { };
+
   htmldate = callPackage ../development/python-modules/htmldate { };
+
   htmlgen = callPackage ../development/python-modules/htmlgen { };
+
   htmllistparse = callPackage ../development/python-modules/htmllistparse { };
+
   htmlmin = callPackage ../development/python-modules/htmlmin { };
+
   htmltools = callPackage ../development/python-modules/htmltools { };
+
   htseq = callPackage ../development/python-modules/htseq { };
+
   httmock = callPackage ../development/python-modules/httmock { };
+
   http-ece = callPackage ../development/python-modules/http-ece { };
+
   http-message-signatures = callPackage ../development/python-modules/http-message-signatures { };
+
   http-parser = callPackage ../development/python-modules/http-parser { };
+
   http-sf = callPackage ../development/python-modules/http-sf { };
+
   http-sfv = callPackage ../development/python-modules/http-sfv { };
+
   httpagentparser = callPackage ../development/python-modules/httpagentparser { };
+
   httpauth = callPackage ../development/python-modules/httpauth { };
+
   httpbin = callPackage ../development/python-modules/httpbin { };
+
   httpcore = callPackage ../development/python-modules/httpcore { };
+
   httpie = callPackage ../development/python-modules/httpie { };
+
   httpie-ntlm = callPackage ../development/python-modules/httpie-ntlm { };
+
   httplib2 = callPackage ../development/python-modules/httplib2 { };
+
   httpretty = callPackage ../development/python-modules/httpretty { };
+
   httpserver = callPackage ../development/python-modules/httpserver { };
+
   httpsig = callPackage ../development/python-modules/httpsig { };
+
   httptools = callPackage ../development/python-modules/httptools { };
+
   httpx = callPackage ../development/python-modules/httpx { };
+
   httpx-aiohttp = callPackage ../development/python-modules/httpx-aiohttp { };
+
   httpx-auth = callPackage ../development/python-modules/httpx-auth { };
+
   httpx-ntlm = callPackage ../development/python-modules/httpx-ntlm { };
+
   httpx-oauth = callPackage ../development/python-modules/httpx-oauth { };
+
   httpx-socks = callPackage ../development/python-modules/httpx-socks { };
+
   httpx-sse = callPackage ../development/python-modules/httpx-sse { };
+
   httpx-ws = callPackage ../development/python-modules/httpx-ws { };
+
   huawei-lte-api = callPackage ../development/python-modules/huawei-lte-api { };
+
   huepy = callPackage ../development/python-modules/huepy { };
+
   huey = callPackage ../development/python-modules/huey { };
+
   huggingface-hub = callPackage ../development/python-modules/huggingface-hub { };
+
   human-readable = callPackage ../development/python-modules/human-readable { };
+
   humanfriendly = callPackage ../development/python-modules/humanfriendly { };
+
   humanize = callPackage ../development/python-modules/humanize { };
+
   humblewx = callPackage ../development/python-modules/humblewx { };
+
   hupper = callPackage ../development/python-modules/hupper { };
+
   hurry-filesize = callPackage ../development/python-modules/hurry-filesize { };
+
   huum = callPackage ../development/python-modules/huum { };
+
   hvac = callPackage ../development/python-modules/hvac { };
+
   hvplot = callPackage ../development/python-modules/hvplot { };
+
   hwdata = callPackage ../development/python-modules/hwdata { };
+
   hwi = callPackage ../development/python-modules/hwi { };
+
   hy = callPackage ../development/python-modules/hy { };
+
   hydra-core = callPackage ../development/python-modules/hydra-core { };
+
   hydrawiser = callPackage ../development/python-modules/hydrawiser { };
+
   hydrogram = callPackage ../development/python-modules/hydrogram { };
+
   hydrus-api = callPackage ../development/python-modules/hydrus-api { };
+
   hypchat = callPackage ../development/python-modules/hypchat { };
+
   hyper-connections = callPackage ../development/python-modules/hyper-connections { };
+
   hypercorn = callPackage ../development/python-modules/hypercorn { };
+
   hyperframe = callPackage ../development/python-modules/hyperframe { };
+
   hyperion-py = callPackage ../development/python-modules/hyperion-py { };
+
   hyperlink = callPackage ../development/python-modules/hyperlink { };
+
   hyperopt = callPackage ../development/python-modules/hyperopt { };
+
   hyperpyyaml = callPackage ../development/python-modules/hyperpyyaml { };
+
   hyperscan = callPackage ../development/python-modules/hyperscan { };
+
   hypothesis = callPackage ../development/python-modules/hypothesis { };
+
   hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { };
+
   hypothesmith = callPackage ../development/python-modules/hypothesmith { };
+
   hyppo = callPackage ../development/python-modules/hyppo { };
+
   hyrule = callPackage ../development/python-modules/hyrule { };
+
   i-pi = callPackage ../development/python-modules/i-pi { };
+
   i2c-tools = callPackage ../development/python-modules/i2c-tools { inherit (pkgs) i2c-tools; };
+
   i2csense = callPackage ../development/python-modules/i2csense { };
+
   i3-py = callPackage ../development/python-modules/i3-py { };
+
   i3ipc = callPackage ../development/python-modules/i3ipc { };
+
   iammeter = callPackage ../development/python-modules/iammeter { };
+
   iapws = callPackage ../development/python-modules/iapws { };
+
   iaqualink = callPackage ../development/python-modules/iaqualink { };
+
   ibeacon-ble = callPackage ../development/python-modules/ibeacon-ble { };
+
   ibis = callPackage ../development/python-modules/ibis { };
+
   ibis-framework = callPackage ../development/python-modules/ibis-framework { };
+
   ibm-cloud-sdk-core = callPackage ../development/python-modules/ibm-cloud-sdk-core { };
+
   ibm-watson = callPackage ../development/python-modules/ibm-watson { };
+
   ical = callPackage ../development/python-modules/ical { };
+
   icalendar = callPackage ../development/python-modules/icalendar { };
+
   icalendar-compatibility = callPackage ../development/python-modules/icalendar-compatibility { };
+
   icalevents = callPackage ../development/python-modules/icalevents { };
+
   icdiff = callPackage ../development/python-modules/icdiff { };
+
   icecream = callPackage ../development/python-modules/icecream { };
+
   iceportal = callPackage ../development/python-modules/iceportal { };
+
   icmplib = callPackage ../development/python-modules/icmplib { };
+
   icnsutil = callPackage ../development/python-modules/icnsutil { };
+
   icoextract = toPythonModule (pkgs.icoextract.override { python3Packages = self; });
+
   icontract = callPackage ../development/python-modules/icontract { };
+
   ics = callPackage ../development/python-modules/ics { };
+
   id = callPackage ../development/python-modules/id { };
+
   idasen = callPackage ../development/python-modules/idasen { };
+
   idasen-ha = callPackage ../development/python-modules/idasen-ha { };
+
   idbutils = callPackage ../development/python-modules/idbutils { };
+
   identify = callPackage ../development/python-modules/identify { };
+
   idna = callPackage ../development/python-modules/idna { };
+
   idna-ssl = callPackage ../development/python-modules/idna-ssl { };
+
   idstools = callPackage ../development/python-modules/idstools { };
+
   ifaddr = callPackage ../development/python-modules/ifaddr { };
+
   ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { };
+
   ifcopenshell = callPackage ../development/python-modules/ifcopenshell {
     inherit (pkgs) cgal libxml2;
   };
+
   igloohome-api = callPackage ../development/python-modules/igloohome-api { };
+
   ignite = callPackage ../development/python-modules/ignite { };
+
   igraph = callPackage ../development/python-modules/igraph { inherit (pkgs) igraph; };
+
   ihcsdk = callPackage ../development/python-modules/ihcsdk { };
+
   ihm = callPackage ../development/python-modules/ihm { };
+
   iisignature = callPackage ../development/python-modules/iisignature { };
+
   ijson = callPackage ../development/python-modules/ijson { };
+
   ilcli = callPackage ../development/python-modules/ilcli { };
+
   ilua = callPackage ../development/python-modules/ilua { };
+
   image-diff = callPackage ../development/python-modules/image-diff { };
+
   image-go-nord = callPackage ../development/python-modules/image-go-nord { };
+
   imagecodecs = callPackage ../development/python-modules/imagecodecs { };
+
   imagecodecs-lite = callPackage ../development/python-modules/imagecodecs-lite { };
+
   imagecorruptions = callPackage ../development/python-modules/imagecorruptions { };
+
   imagededup = callPackage ../development/python-modules/imagededup { };
+
   imagehash = callPackage ../development/python-modules/imagehash { };
+
   imageio = callPackage ../development/python-modules/imageio { };
+
   imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { };
+
   imagesize = callPackage ../development/python-modules/imagesize { };
+
   imantics = callPackage ../development/python-modules/imantics { };
+
   imap-tools = callPackage ../development/python-modules/imap-tools { };
+
   imapclient = callPackage ../development/python-modules/imapclient { };
+
   imaplib2 = callPackage ../development/python-modules/imaplib2 { };
+
   imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { };
+
   imeon-inverter-api = callPackage ../development/python-modules/imeon-inverter-api { };
+
   img2pdf = callPackage ../development/python-modules/img2pdf { };
+
   imgcat = callPackage ../development/python-modules/imgcat { };
+
   imgdiff = callPackage ../development/python-modules/imgdiff { };
+
   imgsize = callPackage ../development/python-modules/imgsize { };
+
   imgw-pib = callPackage ../development/python-modules/imgw-pib { };
+
   imia = callPackage ../development/python-modules/imia { };
+
   iminuit = callPackage ../development/python-modules/iminuit { };
+
   immutabledict = callPackage ../development/python-modules/immutabledict { };
+
   immutables = callPackage ../development/python-modules/immutables { };
+
   impacket = callPackage ../development/python-modules/impacket { };
+
   import-expression = callPackage ../development/python-modules/import-expression { };
+
   importlab = callPackage ../development/python-modules/importlab { };
+
   importlib-metadata = callPackage ../development/python-modules/importlib-metadata { };
+
   importlib-resources = callPackage ../development/python-modules/importlib-resources { };
+
   importmagic = callPackage ../development/python-modules/importmagic { };
+
   imread = callPackage ../development/python-modules/imread {
     inherit (pkgs)
       libjpeg
@@ -3714,134 +6978,261 @@ self: super: with self; {
       libwebp
       ;
   };
+
   imutils = callPackage ../development/python-modules/imutils { };
+
   in-n-out = callPackage ../development/python-modules/in-n-out { };
+
   in-place = callPackage ../development/python-modules/in-place { };
+
   incomfort-client = callPackage ../development/python-modules/incomfort-client { };
+
   incremental = callPackage ../development/python-modules/incremental { };
+
   indexed-bzip2 = callPackage ../development/python-modules/indexed-bzip2 { };
+
   indexed-gzip = callPackage ../development/python-modules/indexed-gzip { inherit (pkgs) zlib; };
+
   indexed-zstd = callPackage ../development/python-modules/indexed-zstd { inherit (pkgs) zstd; };
+
   inequality = callPackage ../development/python-modules/inequality { };
+
   inference-gym = callPackage ../development/python-modules/inference-gym { };
+
   infinity = callPackage ../development/python-modules/infinity { };
+
   inflate64 = callPackage ../development/python-modules/inflate64 { };
+
   inflect = callPackage ../development/python-modules/inflect { };
+
   inflection = callPackage ../development/python-modules/inflection { };
+
   influxdb = callPackage ../development/python-modules/influxdb { };
+
   influxdb-client = callPackage ../development/python-modules/influxdb-client { };
+
   influxdb3-python = callPackage ../development/python-modules/influxdb3-python { };
+
   inform = callPackage ../development/python-modules/inform { };
+
   ingredient-parser-nlp = callPackage ../development/python-modules/ingredient-parser-nlp { };
+
   iniconfig = callPackage ../development/python-modules/iniconfig { };
+
   inifile = callPackage ../development/python-modules/inifile { };
+
   iniparse = callPackage ../development/python-modules/iniparse { };
+
   inject = callPackage ../development/python-modules/inject { };
+
   injector = callPackage ../development/python-modules/injector { };
+
   inkbird-ble = callPackage ../development/python-modules/inkbird-ble { };
+
   inkex = callPackage ../development/python-modules/inkex { };
+
   inline-snapshot = callPackage ../development/python-modules/inline-snapshot { };
+
   inotify = callPackage ../development/python-modules/inotify { };
+
   inotify-simple = callPackage ../development/python-modules/inotify-simple { };
+
   inotifyrecursive = callPackage ../development/python-modules/inotifyrecursive { };
+
   inquirer = callPackage ../development/python-modules/inquirer { };
+
   inquirerpy = callPackage ../development/python-modules/inquirerpy { };
+
   inscriptis = callPackage ../development/python-modules/inscriptis { };
+
   insegel = callPackage ../development/python-modules/insegel { };
+
   insightface = callPackage ../development/python-modules/insightface { };
+
   installer = callPackage ../development/python-modules/installer { };
+
   insteon-frontend-home-assistant =
     callPackage ../development/python-modules/insteon-frontend-home-assistant
       { };
+
   instructor = callPackage ../development/python-modules/instructor { };
+
   intake = callPackage ../development/python-modules/intake { };
+
   intake-parquet = callPackage ../development/python-modules/intake-parquet { };
+
   intbitset = callPackage ../development/python-modules/intbitset { };
+
   intelhex = callPackage ../development/python-modules/intelhex { };
+
   intellifire4py = callPackage ../development/python-modules/intellifire4py { };
+
   intensity-normalization = callPackage ../development/python-modules/intensity-normalization { };
+
   interegular = callPackage ../development/python-modules/interegular { };
+
   interface-meta = callPackage ../development/python-modules/interface-meta { };
+
   internetarchive = callPackage ../development/python-modules/internetarchive { };
+
   interruptingcow = callPackage ../development/python-modules/interruptingcow { };
+
   intervals = callPackage ../development/python-modules/intervals { };
+
   intervaltree = callPackage ../development/python-modules/intervaltree { };
+
   into-dbus-python = callPackage ../development/python-modules/into-dbus-python { };
+
   invisible-watermark = callPackage ../development/python-modules/invisible-watermark { };
+
   invocations = callPackage ../development/python-modules/invocations { };
+
   invoke = callPackage ../development/python-modules/invoke { };
+
   inwx-domrobot = callPackage ../development/python-modules/inwx-domrobot { };
+
   iocapture = callPackage ../development/python-modules/iocapture { };
+
   iocextract = callPackage ../development/python-modules/iocextract { };
+
   iocsearcher = callPackage ../development/python-modules/iocsearcher { };
+
   ioctl-opt = callPackage ../development/python-modules/ioctl-opt { };
+
   iodata = callPackage ../development/python-modules/iodata { };
+
   iometer = callPackage ../development/python-modules/iometer { };
+
   ionoscloud = callPackage ../development/python-modules/ionoscloud { };
+
   iopath = callPackage ../development/python-modules/iopath { };
+
   iosbackup = callPackage ../development/python-modules/iosbackup { };
+
   iottycloud = callPackage ../development/python-modules/iottycloud { };
+
   iowait = callPackage ../development/python-modules/iowait { };
+
   ipaddr = callPackage ../development/python-modules/ipaddr { };
+
   ipadic = callPackage ../development/python-modules/ipadic { };
+
   ipdb = callPackage ../development/python-modules/ipdb { };
+
   iperf3 = callPackage ../development/python-modules/iperf3 { };
+
   ipfshttpclient = callPackage ../development/python-modules/ipfshttpclient { };
+
   iplotx = callPackage ../development/python-modules/iplotx { };
+
   iptools = callPackage ../development/python-modules/iptools { };
+
   ipwhl = callPackage ../development/python-modules/ipwhl { };
+
   ipwhois = callPackage ../development/python-modules/ipwhois { };
+
   ipy = callPackage ../development/python-modules/ipy { };
+
   ipycanvas = callPackage ../development/python-modules/ipycanvas { };
+
   ipydatagrid = callPackage ../development/python-modules/ipydatagrid { };
+
   ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { };
+
   ipykernel = callPackage ../development/python-modules/ipykernel { };
+
   ipylab = callPackage ../development/python-modules/ipylab { };
+
   ipymarkup = callPackage ../development/python-modules/ipymarkup { };
+
   ipympl = callPackage ../development/python-modules/ipympl { };
+
   ipynbname = callPackage ../development/python-modules/ipynbname { };
+
   ipyniivue = callPackage ../development/python-modules/ipyniivue { };
+
   ipyparallel = callPackage ../development/python-modules/ipyparallel { };
+
   ipytablewidgets = callPackage ../development/python-modules/ipytablewidgets { };
+
   ipython = callPackage ../development/python-modules/ipython { };
+
   ipython-genutils = callPackage ../development/python-modules/ipython-genutils { };
+
   ipython-pygments-lexers = callPackage ../development/python-modules/ipython-pygments-lexers { };
+
   ipython-sql = callPackage ../development/python-modules/ipython-sql { };
+
   ipyvue = callPackage ../development/python-modules/ipyvue { };
+
   ipyvuetify = callPackage ../development/python-modules/ipyvuetify { };
+
   ipywidgets = callPackage ../development/python-modules/ipywidgets { };
+
   ipyxact = callPackage ../development/python-modules/ipyxact { };
+
   irc = callPackage ../development/python-modules/irc { };
+
   ircrobots = callPackage ../development/python-modules/ircrobots { };
+
   ircstates = callPackage ../development/python-modules/ircstates { };
+
   irctokens = callPackage ../development/python-modules/irctokens { };
+
   irisclient = callPackage ../development/python-modules/irisclient { };
+
   isal = callPackage ../development/python-modules/isal { };
+
   isbnlib = callPackage ../development/python-modules/isbnlib { };
+
   islpy = callPackage ../development/python-modules/islpy { isl = pkgs.isl_0_24; };
+
   ismartgate = callPackage ../development/python-modules/ismartgate { };
+
   iso-639 = callPackage ../development/python-modules/iso-639 { };
+
   iso3166 = callPackage ../development/python-modules/iso3166 { };
+
   iso4217 = callPackage ../development/python-modules/iso4217 { };
+
   iso8601 = callPackage ../development/python-modules/iso8601 { };
+
   isodate = callPackage ../development/python-modules/isodate { };
+
   isoduration = callPackage ../development/python-modules/isoduration { };
+
   isort = callPackage ../development/python-modules/isort { };
+
   isosurfaces = callPackage ../development/python-modules/isosurfaces { };
+
   isounidecode = callPackage ../development/python-modules/isounidecode { };
+
   isoweek = callPackage ../development/python-modules/isoweek { };
+
   israel-rail-api = callPackage ../development/python-modules/israel-rail-api { };
+
   itables = callPackage ../development/python-modules/itables { };
+
   itanium-demangler = callPackage ../development/python-modules/itanium-demangler { };
+
   item-synchronizer = callPackage ../development/python-modules/item-synchronizer { };
+
   itemadapter = callPackage ../development/python-modules/itemadapter { };
+
   itemdb = callPackage ../development/python-modules/itemdb { };
+
   itemloaders = callPackage ../development/python-modules/itemloaders { };
+
   iterable-io = callPackage ../development/python-modules/iterable-io { };
+
   iteration-utilities = callPackage ../development/python-modules/iteration-utilities { };
+
   iterative-telemetry = callPackage ../development/python-modules/iterative-telemetry { };
+
   iterfzf = callPackage ../development/python-modules/iterfzf { };
+
   iterm2 = callPackage ../development/python-modules/iterm2 { };
+
   itk = toPythonModule (
     pkgs.itk.override {
       inherit python numpy;
@@ -3851,406 +7242,771 @@ self: super: with self; {
         if stdenv.cc.isGNU then pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv else stdenv;
     }
   );
+
   itsdangerous = callPackage ../development/python-modules/itsdangerous { };
+
   itunespy = callPackage ../development/python-modules/itunespy { };
+
   itypes = callPackage ../development/python-modules/itypes { };
+
   iwlib = callPackage ../development/python-modules/iwlib { };
+
   ixia = callPackage ../development/python-modules/ixia { };
+
   j2cli = callPackage ../development/python-modules/j2cli { };
+
   jaconv = callPackage ../development/python-modules/jaconv { };
+
   jalali-core = callPackage ../development/python-modules/jalali-core { };
+
   jamo = callPackage ../development/python-modules/jamo { };
+
   janus = callPackage ../development/python-modules/janus { };
+
   jaraco-abode = callPackage ../development/python-modules/jaraco-abode { };
+
   jaraco-classes = callPackage ../development/python-modules/jaraco-classes { };
+
   jaraco-collections = callPackage ../development/python-modules/jaraco-collections { };
+
   jaraco-context = callPackage ../development/python-modules/jaraco-context { };
+
   jaraco-email = callPackage ../development/python-modules/jaraco-email { };
+
   jaraco-envs = callPackage ../development/python-modules/jaraco-envs { };
+
   jaraco-functools = callPackage ../development/python-modules/jaraco-functools { };
+
   jaraco-itertools = callPackage ../development/python-modules/jaraco-itertools { };
+
   jaraco-logging = callPackage ../development/python-modules/jaraco-logging { };
+
   jaraco-net = callPackage ../development/python-modules/jaraco-net { };
+
   jaraco-path = callPackage ../development/python-modules/jaraco-path { };
+
   jaraco-stream = callPackage ../development/python-modules/jaraco-stream { };
+
   jaraco-test = callPackage ../development/python-modules/jaraco-test { };
+
   jaraco-text = callPackage ../development/python-modules/jaraco-text { };
+
   jarowinkler = callPackage ../development/python-modules/jarowinkler { };
+
   javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { };
+
   javaproperties = callPackage ../development/python-modules/javaproperties { };
+
   jax = callPackage ../development/python-modules/jax { };
+
   jax-cuda12-pjrt = callPackage ../development/python-modules/jax-cuda12-pjrt { };
+
   jax-cuda12-plugin = callPackage ../development/python-modules/jax-cuda12-plugin { };
+
   jax-jumpy = callPackage ../development/python-modules/jax-jumpy { };
+
   jaxlib = jaxlib-bin;
+
   jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { };
+
   jaxlib-build = callPackage ../development/python-modules/jaxlib {
     snappy-cpp = pkgs.snappy;
   };
+
   jaxopt = callPackage ../development/python-modules/jaxopt { };
+
   jaxtyping = callPackage ../development/python-modules/jaxtyping { };
+
   jaydebeapi = callPackage ../development/python-modules/jaydebeapi { };
+
   jc = callPackage ../development/python-modules/jc { };
+
   jdatetime = callPackage ../development/python-modules/jdatetime { };
+
   jdcal = callPackage ../development/python-modules/jdcal { };
+
   jedi = callPackage ../development/python-modules/jedi { };
+
   jedi-language-server = callPackage ../development/python-modules/jedi-language-server { };
+
   jeepney = callPackage ../development/python-modules/jeepney { };
+
   jello = callPackage ../development/python-modules/jello { };
+
   jellyfin-apiclient-python = callPackage ../development/python-modules/jellyfin-apiclient-python { };
+
   jellyfish = callPackage ../development/python-modules/jellyfish { };
+
   jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { };
+
   jenkinsapi = callPackage ../development/python-modules/jenkinsapi { };
+
   jfx-bridge = callPackage ../development/python-modules/jfx-bridge { };
+
   jh2 = callPackage ../development/python-modules/jh2 { };
+
   jianpu-ly = callPackage ../development/python-modules/jianpu-ly { };
+
   jieba = callPackage ../development/python-modules/jieba { };
+
   jinja2 = callPackage ../development/python-modules/jinja2 { };
+
   jinja2-ansible-filters = callPackage ../development/python-modules/jinja2-ansible-filters { };
+
   jinja2-git = callPackage ../development/python-modules/jinja2-git { };
+
   jinja2-humanize-extension = callPackage ../development/python-modules/jinja2-humanize-extension { };
+
   jinja2-pluralize = callPackage ../development/python-modules/jinja2-pluralize { };
+
   jinja2-strcase = callPackage ../development/python-modules/jinja2-strcase { };
+
   jinja2-time = callPackage ../development/python-modules/jinja2-time { };
+
   jira = callPackage ../development/python-modules/jira { };
+
   jishaku = callPackage ../development/python-modules/jishaku { };
+
   jiter = callPackage ../development/python-modules/jiter { };
+
   jiwer = callPackage ../development/python-modules/jiwer { };
+
   jmespath = callPackage ../development/python-modules/jmespath { };
+
   jmp = callPackage ../development/python-modules/jmp { };
+
   joblib = callPackage ../development/python-modules/joblib { };
+
   jobspy = callPackage ../development/python-modules/jobspy { };
+
   johnnycanencrypt = callPackage ../development/python-modules/johnnycanencrypt { };
+
   josepy = callPackage ../development/python-modules/josepy { };
+
   joserfc = callPackage ../development/python-modules/joserfc { };
+
   jplephem = callPackage ../development/python-modules/jplephem { };
+
   jproperties = callPackage ../development/python-modules/jproperties { };
+
   jpylyzer = callPackage ../development/python-modules/jpylyzer { };
+
   jpype1 = callPackage ../development/python-modules/jpype1 { };
+
   jq = callPackage ../development/python-modules/jq { inherit (pkgs) jq; };
+
   jsbeautifier = callPackage ../development/python-modules/jsbeautifier { };
+
   jschema-to-python = callPackage ../development/python-modules/jschema-to-python { };
+
   jschon = callPackage ../development/python-modules/jschon { };
+
   jsmin = callPackage ../development/python-modules/jsmin { };
+
   json-api-doc = callPackage ../development/python-modules/json-api-doc { };
+
   json-flatten = callPackage ../development/python-modules/json-flatten { };
+
   json-home-client = callPackage ../development/python-modules/json-home-client { };
+
   json-logging = callPackage ../development/python-modules/json-logging { };
+
   json-merge-patch = callPackage ../development/python-modules/json-merge-patch { };
+
   json-repair = callPackage ../development/python-modules/json-repair { };
+
   json-rpc = callPackage ../development/python-modules/json-rpc { };
+
   json-schema-for-humans = callPackage ../development/python-modules/json-schema-for-humans { };
+
   json-stream = callPackage ../development/python-modules/json-stream { };
+
   json-stream-rs-tokenizer = callPackage ../development/python-modules/json-stream-rs-tokenizer { };
+
   json-tricks = callPackage ../development/python-modules/json-tricks { };
+
   json2html = callPackage ../development/python-modules/json2html { };
+
   json5 = callPackage ../development/python-modules/json5 { };
+
   jsonable = callPackage ../development/python-modules/jsonable { };
+
   jsonargparse = callPackage ../development/python-modules/jsonargparse { };
+
   jsonconversion = callPackage ../development/python-modules/jsonconversion { };
+
   jsondate = callPackage ../development/python-modules/jsondate { };
+
   jsondiff = callPackage ../development/python-modules/jsondiff { };
+
   jsonfeed = callPackage ../development/python-modules/jsonfeed { };
+
   jsonfield = callPackage ../development/python-modules/jsonfield { };
+
   jsonformatter = callPackage ../development/python-modules/jsonformatter { };
+
   jsonlines = callPackage ../development/python-modules/jsonlines { };
+
   jsonmerge = callPackage ../development/python-modules/jsonmerge { };
+
   jsonnet = callPackage ../development/python-modules/jsonnet { };
+
   jsonpatch = callPackage ../development/python-modules/jsonpatch { };
+
   jsonpath = callPackage ../development/python-modules/jsonpath { };
+
   jsonpath-ng = callPackage ../development/python-modules/jsonpath-ng { };
+
   jsonpath-python = callPackage ../development/python-modules/jsonpath-python { };
+
   jsonpath-rw = callPackage ../development/python-modules/jsonpath-rw { };
+
   jsonpickle = callPackage ../development/python-modules/jsonpickle { };
+
   jsonpointer = callPackage ../development/python-modules/jsonpointer { };
+
   jsonref = callPackage ../development/python-modules/jsonref { };
+
   jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { };
+
   jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { };
+
   jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { };
+
   jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix { };
+
   jsons = callPackage ../development/python-modules/jsons { };
+
   jsonschema = callPackage ../development/python-modules/jsonschema { };
+
   jsonschema-path = callPackage ../development/python-modules/jsonschema-path { };
+
   jsonschema-rs = callPackage ../development/python-modules/jsonschema-rs { };
+
   jsonschema-spec = callPackage ../development/python-modules/jsonschema-spec { };
+
   jsonschema-specifications = callPackage ../development/python-modules/jsonschema-specifications { };
+
   jsonslicer = callPackage ../development/python-modules/jsonslicer { };
+
   jsonstreams = callPackage ../development/python-modules/jsonstreams { };
+
   jsonxs = callPackage ../development/python-modules/jsonxs { };
+
   jstyleson = callPackage ../development/python-modules/jstyleson { };
+
   jug = callPackage ../development/python-modules/jug { };
+
   juliandate = callPackage ../development/python-modules/juliandate { };
+
   julius = callPackage ../development/python-modules/julius { };
+
   july = callPackage ../development/python-modules/july { };
+
   june-analytics-python = callPackage ../development/python-modules/june-analytics-python { };
+
   junit-xml = callPackage ../development/python-modules/junit-xml { };
+
   junit2html = callPackage ../development/python-modules/junit2html { };
+
   junitparser = callPackage ../development/python-modules/junitparser { };
+
   junos-eznc = callPackage ../development/python-modules/junos-eznc { };
+
   jupysql = callPackage ../development/python-modules/jupysql { };
+
   jupysql-plugin = callPackage ../development/python-modules/jupysql-plugin { };
+
   jupyter = callPackage ../development/python-modules/jupyter { };
+
   jupyter-book = callPackage ../development/python-modules/jupyter-book { };
+
   jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { };
+
   jupyter-cache = callPackage ../development/python-modules/jupyter-cache { };
+
   jupyter-client = callPackage ../development/python-modules/jupyter-client { };
+
   jupyter-collaboration = callPackage ../development/python-modules/jupyter-collaboration { };
+
   jupyter-collaboration-ui = callPackage ../development/python-modules/jupyter-collaboration-ui { };
+
   jupyter-console = callPackage ../development/python-modules/jupyter-console { };
+
   jupyter-contrib-core = callPackage ../development/python-modules/jupyter-contrib-core { };
+
   jupyter-core = callPackage ../development/python-modules/jupyter-core { };
+
   jupyter-docprovider = callPackage ../development/python-modules/jupyter-docprovider { };
+
   jupyter-events = callPackage ../development/python-modules/jupyter-events { };
+
   jupyter-highlight-selected-word =
     callPackage ../development/python-modules/jupyter-highlight-selected-word
       { };
+
   jupyter-lsp = callPackage ../development/python-modules/jupyter-lsp { };
+
   jupyter-nbextensions-configurator =
     callPackage ../development/python-modules/jupyter-nbextensions-configurator
       { };
+
   jupyter-packaging = callPackage ../development/python-modules/jupyter-packaging { };
+
   jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker {
     pkgs-docker = pkgs.docker;
   };
+
   jupyter-server = callPackage ../development/python-modules/jupyter-server { };
+
   jupyter-server-fileid = callPackage ../development/python-modules/jupyter-server-fileid { };
+
   jupyter-server-mathjax = callPackage ../development/python-modules/jupyter-server-mathjax { };
+
   jupyter-server-terminals = callPackage ../development/python-modules/jupyter-server-terminals { };
+
   jupyter-server-ydoc = callPackage ../development/python-modules/jupyter-server-ydoc { };
+
   jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { };
+
   jupyter-telemetry = callPackage ../development/python-modules/jupyter-telemetry { };
+
   jupyter-ui-poll = callPackage ../development/python-modules/jupyter-ui-poll { };
+
   jupyter-ydoc = callPackage ../development/python-modules/jupyter-ydoc { };
+
   jupyterhub = callPackage ../development/python-modules/jupyterhub { };
+
   jupyterhub-ldapauthenticator =
     callPackage ../development/python-modules/jupyterhub-ldapauthenticator
       { };
+
   jupyterhub-systemdspawner = callPackage ../development/python-modules/jupyterhub-systemdspawner { };
+
   jupyterhub-tmpauthenticator =
     callPackage ../development/python-modules/jupyterhub-tmpauthenticator
       { };
+
   jupyterlab = callPackage ../development/python-modules/jupyterlab { };
+
   jupyterlab-execute-time = callPackage ../development/python-modules/jupyterlab-execute-time { };
+
   jupyterlab-git = callPackage ../development/python-modules/jupyterlab-git { };
+
   jupyterlab-lsp = callPackage ../development/python-modules/jupyterlab-lsp { };
+
   jupyterlab-pygments = callPackage ../development/python-modules/jupyterlab-pygments { };
+
   jupyterlab-server = callPackage ../development/python-modules/jupyterlab-server { };
+
   jupyterlab-widgets = callPackage ../development/python-modules/jupyterlab-widgets { };
+
   jupytext = callPackage ../development/python-modules/jupytext { };
+
   justbackoff = callPackage ../development/python-modules/justbackoff { };
+
   justbases = callPackage ../development/python-modules/justbases { };
+
   justbytes = callPackage ../development/python-modules/justbytes { };
+
   justext = callPackage ../development/python-modules/justext { };
+
   justnimbus = callPackage ../development/python-modules/justnimbus { };
+
   jwcrypto = callPackage ../development/python-modules/jwcrypto { };
+
   jwt = callPackage ../development/python-modules/jwt { };
+
   jxlpy = callPackage ../development/python-modules/jxlpy { };
+
   jxmlease = callPackage ../development/python-modules/jxmlease { };
+
   k-diffusion = callPackage ../development/python-modules/k-diffusion { };
+
   k5test = callPackage ../development/python-modules/k5test {
     inherit (pkgs) findutils;
     krb5-c = pkgs.krb5;
   };
+
   kaa-base = callPackage ../development/python-modules/kaa-base { };
+
   kaa-metadata = callPackage ../development/python-modules/kaa-metadata { };
+
   kafka-python-ng = callPackage ../development/python-modules/kafka-python-ng { };
+
   kaggle = callPackage ../development/python-modules/kaggle { };
+
   kahip = toPythonModule (
     pkgs.kahip.override {
       pythonSupport = true;
       python3Packages = self;
     }
   );
+
   kaitaistruct = callPackage ../development/python-modules/kaitaistruct { };
+
   kaiterra-async-client = callPackage ../development/python-modules/kaiterra-async-client { };
+
   kajiki = callPackage ../development/python-modules/kajiki { };
+
   kaldi-active-grammar = callPackage ../development/python-modules/kaldi-active-grammar { };
+
   kaleido = callPackage ../development/python-modules/kaleido { };
+
   kalshi-python = callPackage ../development/python-modules/kalshi-python { };
+
   kanalizer = callPackage ../development/python-modules/kanalizer { };
+
   kanidm = callPackage ../development/python-modules/kanidm { };
+
   kaptan = callPackage ../development/python-modules/kaptan { };
+
   karton-asciimagic = callPackage ../development/python-modules/karton-asciimagic { };
+
   karton-autoit-ripper = callPackage ../development/python-modules/karton-autoit-ripper { };
+
   karton-classifier = callPackage ../development/python-modules/karton-classifier { };
+
   karton-config-extractor = callPackage ../development/python-modules/karton-config-extractor { };
+
   karton-core = callPackage ../development/python-modules/karton-core { };
+
   karton-dashboard = callPackage ../development/python-modules/karton-dashboard { };
+
   karton-mwdb-reporter = callPackage ../development/python-modules/karton-mwdb-reporter { };
+
   karton-yaramatcher = callPackage ../development/python-modules/karton-yaramatcher { };
+
   kasa-crypt = callPackage ../development/python-modules/kasa-crypt { };
+
   kazoo = callPackage ../development/python-modules/kazoo { };
+
   kbcstorage = callPackage ../development/python-modules/kbcstorage { };
+
   kconfiglib = callPackage ../development/python-modules/kconfiglib { };
+
   kde-material-you-colors = callPackage ../development/python-modules/kde-material-you-colors { };
+
   kdl-py = callPackage ../development/python-modules/kdl-py { };
+
   keba-kecontact = callPackage ../development/python-modules/keba-kecontact { };
+
   keep = callPackage ../development/python-modules/keep { };
+
   keepalive = callPackage ../development/python-modules/keepalive { };
+
   keepkey = callPackage ../development/python-modules/keepkey { };
+
   keepkey-agent = callPackage ../development/python-modules/keepkey-agent { };
+
   kegtron-ble = callPackage ../development/python-modules/kegtron-ble { };
+
   keke = callPackage ../development/python-modules/keke { };
+
   keras = callPackage ../development/python-modules/keras { };
+
   kerberos = callPackage ../development/python-modules/kerberos { };
+
   kernels = callPackage ../development/python-modules/kernels { };
+
   kestra = callPackage ../development/python-modules/kestra { };
+
   keyboard = callPackage ../development/python-modules/keyboard { };
+
   keymap-drawer = callPackage ../development/python-modules/keymap-drawer { };
+
   keyring = callPackage ../development/python-modules/keyring { };
+
   keyring-pass = callPackage ../development/python-modules/keyring-pass { };
+
   keyrings-alt = callPackage ../development/python-modules/keyrings-alt { };
+
   keyrings-cryptfile = callPackage ../development/python-modules/keyrings-cryptfile { };
+
   keyrings-google-artifactregistry-auth =
     callPackage ../development/python-modules/keyrings-google-artifactregistry-auth
       { };
+
   keyrings-passwordstore = callPackage ../development/python-modules/keyrings-passwordstore { };
+
   keystone-engine = callPackage ../development/python-modules/keystone-engine { };
+
   keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 { };
+
   keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; };
+
   kfactory = callPackage ../development/python-modules/kfactory { };
+
   kgb = callPackage ../development/python-modules/kgb { };
+
   khanaa = callPackage ../development/python-modules/khanaa { };
+
   kicad = toPythonModule (pkgs.kicad.override { python3 = python; }).src;
+
   kicad-python = callPackage ../development/python-modules/kicad-python { };
+
   kicadcliwrapper = callPackage ../development/python-modules/kicadcliwrapper { };
+
   kinparse = callPackage ../development/python-modules/kinparse { };
+
   kiss-headers = callPackage ../development/python-modules/kiss-headers { };
+
   kitchen = callPackage ../development/python-modules/kitchen { };
+
   kivy = callPackage ../development/python-modules/kivy { };
+
   kivy-garden = callPackage ../development/python-modules/kivy-garden { };
+
   kiwiki-client = callPackage ../development/python-modules/kiwiki-client { };
+
   kiwisolver = callPackage ../development/python-modules/kiwisolver { };
+
   klaus = callPackage ../development/python-modules/klaus { };
+
   klayout = callPackage ../development/python-modules/klayout { };
+
   klein = callPackage ../development/python-modules/klein { };
+
   kmapper = callPackage ../development/python-modules/kmapper { };
+
   kml2geojson = callPackage ../development/python-modules/kml2geojson { };
+
   kmsxx = toPythonModule (
     pkgs.kmsxx.override {
       withPython = true;
       python3Packages = self;
     }
   );
+
   knack = callPackage ../development/python-modules/knack { };
+
   kneaddata = callPackage ../development/python-modules/kneaddata { };
+
   kneed = callPackage ../development/python-modules/kneed { };
+
   knocki = callPackage ../development/python-modules/knocki { };
+
   knot-floer-homology = callPackage ../development/python-modules/knot-floer-homology { };
+
   knx-frontend = callPackage ../development/python-modules/knx-frontend { };
+
   kokoro = callPackage ../development/python-modules/kokoro { };
+
   kombu = callPackage ../development/python-modules/kombu { };
+
   konnected = callPackage ../development/python-modules/konnected { };
+
   kopf = callPackage ../development/python-modules/kopf { };
+
   korean-lunar-calendar = callPackage ../development/python-modules/korean-lunar-calendar { };
+
   kornia = callPackage ../development/python-modules/kornia { };
+
   kornia-rs = callPackage ../development/python-modules/kornia-rs { };
+
   kotsu = callPackage ../development/python-modules/kotsu { };
+
   krakenex = callPackage ../development/python-modules/krakenex { };
+
   krb5 = callPackage ../development/python-modules/krb5 { krb5-c = pkgs.krb5; };
+
   krfzf-py = callPackage ../development/python-modules/krfzf-py { };
+
   kserve = callPackage ../development/python-modules/kserve { };
+
   kubernetes = callPackage ../development/python-modules/kubernetes { };
+
   kubernetes-asyncio = callPackage ../development/python-modules/kubernetes-asyncio { };
+
   kubernetes-validate = callPackage ../by-name/ku/kubernetes-validate/unwrapped.nix { };
+
   kurbopy = callPackage ../development/python-modules/kurbopy { };
+
   kuzu = callPackage ../development/python-modules/kuzu { };
+
   l18n = callPackage ../development/python-modules/l18n { };
+
   labelbox = callPackage ../development/python-modules/labelbox { };
+
   labgrid = callPackage ../development/python-modules/labgrid { };
+
   labmath = callPackage ../development/python-modules/labmath { };
+
   laces = callPackage ../development/python-modules/laces { };
+
   lacrosse-view = callPackage ../development/python-modules/lacrosse-view { };
+
   lacuscore = callPackage ../development/python-modules/lacuscore { };
+
   lakeside = callPackage ../development/python-modules/lakeside { };
+
   lammps = callPackage ../development/python-modules/lammps { inherit (pkgs) lammps; };
+
   lancedb = callPackage ../development/python-modules/lancedb { inherit (pkgs) protobuf; };
+
   langchain = callPackage ../development/python-modules/langchain { };
+
   langchain-anthropic = callPackage ../development/python-modules/langchain-anthropic { };
+
   langchain-aws = callPackage ../development/python-modules/langchain-aws { };
+
   langchain-azure-dynamic-sessions =
     callPackage ../development/python-modules/langchain-azure-dynamic-sessions
       { };
+
   langchain-chroma = callPackage ../development/python-modules/langchain-chroma { };
+
   langchain-community = callPackage ../development/python-modules/langchain-community { };
+
   langchain-core = callPackage ../development/python-modules/langchain-core { };
+
   langchain-deepseek = callPackage ../development/python-modules/langchain-deepseek { };
+
   langchain-experimental = callPackage ../development/python-modules/langchain-experimental { };
+
   langchain-fireworks = callPackage ../development/python-modules/langchain-fireworks { };
+
   langchain-google-genai = callPackage ../development/python-modules/langchain-google-genai { };
+
   langchain-groq = callPackage ../development/python-modules/langchain-groq { };
+
   langchain-huggingface = callPackage ../development/python-modules/langchain-huggingface { };
+
   langchain-mistralai = callPackage ../development/python-modules/langchain-mistralai { };
+
   langchain-mongodb = callPackage ../development/python-modules/langchain-mongodb { };
+
   langchain-ollama = callPackage ../development/python-modules/langchain-ollama { };
+
   langchain-openai = callPackage ../development/python-modules/langchain-openai { };
+
   langchain-perplexity = callPackage ../development/python-modules/langchain-perplexity { };
+
   langchain-tests = callPackage ../development/python-modules/langchain-tests { };
+
   langchain-text-splitters = callPackage ../development/python-modules/langchain-text-splitters { };
+
   langchain-xai = callPackage ../development/python-modules/langchain-xai { };
+
   langcodes = callPackage ../development/python-modules/langcodes { };
+
   langdetect = callPackage ../development/python-modules/langdetect { };
+
   langfuse = callPackage ../development/python-modules/langfuse { };
+
   langgraph = callPackage ../development/python-modules/langgraph { };
+
   langgraph-checkpoint = callPackage ../development/python-modules/langgraph-checkpoint { };
+
   langgraph-checkpoint-postgres =
     callPackage ../development/python-modules/langgraph-checkpoint-postgres
       { };
+
   langgraph-checkpoint-sqlite =
     callPackage ../development/python-modules/langgraph-checkpoint-sqlite
       { };
+
   langgraph-cli = callPackage ../development/python-modules/langgraph-cli { };
+
   langgraph-prebuilt = callPackage ../development/python-modules/langgraph-prebuilt { };
+
   langgraph-runtime-inmem = callPackage ../development/python-modules/langgraph-runtime-inmem { };
+
   langgraph-sdk = callPackage ../development/python-modules/langgraph-sdk { };
+
   langid = callPackage ../development/python-modules/langid { };
+
   langsmith = callPackage ../development/python-modules/langsmith { };
+
   language-data = callPackage ../development/python-modules/language-data { };
+
   language-tags = callPackage ../development/python-modules/language-tags { };
+
   language-tool-python = callPackage ../development/python-modules/language-tool-python { };
+
   lanms-neo = callPackage ../development/python-modules/lanms-neo { };
+
   lap = callPackage ../development/python-modules/lap { };
+
   lark = callPackage ../development/python-modules/lark { };
+
   laspy = callPackage ../development/python-modules/laspy { };
+
   lastversion = callPackage ../development/python-modules/lastversion { };
+
   laszip = callPackage ../development/python-modules/laszip {
     inherit (pkgs) cmake ninja;
     inherit (pkgs.__splicedPackages) laszip;
   };
+
   latex2mathml = callPackage ../development/python-modules/latex2mathml { };
+
   latex2pydata = callPackage ../development/python-modules/latex2pydata { };
+
   latexcodec = callPackage ../development/python-modules/latexcodec { };
+
   latexify-py = callPackage ../development/python-modules/latexify-py { };
+
   latexrestricted = callPackage ../development/python-modules/latexrestricted { };
+
   launchpadlib = callPackage ../development/python-modules/launchpadlib { };
+
   laundrify-aio = callPackage ../development/python-modules/laundrify-aio { };
+
   layoutparser = callPackage ../development/python-modules/layoutparser { };
+
   lazr-config = callPackage ../development/python-modules/lazr-config { };
+
   lazr-delegates = callPackage ../development/python-modules/lazr-delegates { };
+
   lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { };
+
   lazr-uri = callPackage ../development/python-modules/lazr-uri { };
+
   lazrs = callPackage ../development/python-modules/lazrs { };
+
   lazy = callPackage ../development/python-modules/lazy { };
+
   lazy-imports = callPackage ../development/python-modules/lazy-imports { };
+
   lazy-loader = callPackage ../development/python-modules/lazy-loader { };
+
   lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { };
+
   lc7001 = callPackage ../development/python-modules/lc7001 { };
+
   lcd-i2c = callPackage ../development/python-modules/lcd-i2c { };
+
   lcgit = callPackage ../development/python-modules/lcgit { };
+
   lcn-frontend = callPackage ../development/python-modules/lcn-frontend { };
+
   lcov-cobertura = callPackage ../development/python-modules/lcov-cobertura { };
+
   ld2410-ble = callPackage ../development/python-modules/ld2410-ble { };
+
   ldap3 = callPackage ../development/python-modules/ldap3 { };
+
   ldap3-bleeding-edge = callPackage ../development/python-modules/ldap3-bleeding-edge { };
+
   ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { };
+
   ldappool = callPackage ../development/python-modules/ldappool { };
+
   ldaptor = callPackage ../development/python-modules/ldaptor { };
+
   ldfparser = callPackage ../development/python-modules/ldfparser { };
+
   leanblueprint = callPackage ../development/python-modules/leanblueprint { };
+
   leaone-ble = callPackage ../development/python-modules/leaone-ble { };
+
   leather = callPackage ../development/python-modules/leather { };
+
   leb128 = callPackage ../development/python-modules/leb128 { };
+
   led-ble = callPackage ../development/python-modules/led-ble { };
+
   ledger =
     (toPythonModule (
       pkgs.ledger.override {
@@ -4258,20 +8014,35 @@ self: super: with self; {
         python3 = python;
       }
     )).py;
+
   ledger-agent = callPackage ../development/python-modules/ledger-agent { };
+
   ledger-bitcoin = callPackage ../development/python-modules/ledger-bitcoin { };
+
   ledgerblue = callPackage ../development/python-modules/ledgerblue { };
+
   ledgercomm = callPackage ../development/python-modules/ledgercomm { };
+
   ledgerwallet = callPackage ../development/python-modules/ledgerwallet { };
+
   legacy-api-wrap = callPackage ../development/python-modules/legacy-api-wrap { };
+
   legacy-cgi = callPackage ../development/python-modules/legacy-cgi { };
+
   leidenalg = callPackage ../development/python-modules/leidenalg { igraph-c = pkgs.igraph; };
+
   lektricowifi = callPackage ../development/python-modules/lektricowifi { };
+
   letpot = callPackage ../development/python-modules/letpot { };
+
   leveldb = callPackage ../development/python-modules/leveldb { };
+
   levenshtein = callPackage ../development/python-modules/levenshtein { };
+
   lexid = callPackage ../development/python-modules/lexid { };
+
   lexilang = callPackage ../development/python-modules/lexilang { };
+
   lgpio = toPythonModule (
     pkgs.lgpio.override {
       inherit buildPythonPackage;
@@ -4279,21 +8050,35 @@ self: super: with self; {
       lgpioWithoutPython = pkgs.lgpio;
     }
   );
+
   lhapdf = toPythonModule (pkgs.lhapdf.override { python3 = python; });
+
   lib4package = callPackage ../development/python-modules/lib4package { };
+
   lib4sbom = callPackage ../development/python-modules/lib4sbom { };
+
   lib4vex = callPackage ../development/python-modules/lib4vex { };
+
   lib50 = callPackage ../development/python-modules/lib50 { };
+
   libagent = callPackage ../development/python-modules/libagent { };
+
   libais = callPackage ../development/python-modules/libais { };
+
   libarchive-c = callPackage ../development/python-modules/libarchive-c {
     inherit (pkgs) libarchive;
   };
+
   libarcus = callPackage ../development/python-modules/libarcus { protobuf = pkgs.protobuf_21; };
+
   libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns; };
+
   libbs = callPackage ../development/python-modules/libbs { };
+
   libclang = callPackage ../development/python-modules/libclang { };
+
   libcloud = callPackage ../development/python-modules/libcloud { };
+
   libcomps = lib.pipe pkgs.libcomps [
     toPythonModule
     (
@@ -4307,7 +8092,9 @@ self: super: with self; {
     (p: p.override { python3 = python; })
     (p: p.py)
   ];
+
   libcst = callPackage ../development/python-modules/libcst { };
+
   libdnf = lib.pipe pkgs.libdnf [
     toPythonModule
     (
@@ -4321,17 +8108,24 @@ self: super: with self; {
     (p: p.override { python3 = python; })
     (p: p.py)
   ];
+
   libear = callPackage ../development/python-modules/libear { };
+
   libevdev = callPackage ../development/python-modules/libevdev { };
+
   libfdt = toPythonModule (
     pkgs.dtc.override {
       inherit python;
       pythonSupport = true;
     }
   );
+
   libfive = toPythonModule (pkgs.libfive.override { python3 = python; });
+
   libgpiod = callPackage ../development/python-modules/libgpiod { inherit (pkgs) libgpiod; };
+
   libgravatar = callPackage ../development/python-modules/libgravatar { };
+
   libiio =
     (toPythonModule (
       pkgs.libiio.override {
@@ -4339,13 +8133,21 @@ self: super: with self; {
         python3 = python;
       }
     )).python;
+
   libipld = callPackage ../development/python-modules/libipld { };
+
   libkeepass = callPackage ../development/python-modules/libkeepass { };
+
   libknot = callPackage ../development/python-modules/libknot { };
+
   liblarch = callPackage ../development/python-modules/liblarch { };
+
   liblp = callPackage ../development/python-modules/liblp { };
+
   liblzfse = callPackage ../development/python-modules/liblzfse { inherit (pkgs) lzfse; };
+
   libmambapy = callPackage ../development/python-modules/libmambapy { };
+
   libmodulemd = lib.pipe pkgs.libmodulemd [
     toPythonModule
     (
@@ -4360,19 +8162,26 @@ self: super: with self; {
     (p: p.override { python3 = python; })
     (p: p.py)
   ];
+
   libmr = callPackage ../development/python-modules/libmr { };
+
   libnacl = callPackage ../development/python-modules/libnacl { inherit (pkgs) libsodium; };
+
   libnbd = toPythonModule (
     pkgs.libnbd.override {
       buildPythonBindings = true;
       python3 = python;
     }
   );
+
   libpass = callPackage ../development/python-modules/libpass { };
+
   libpcap = callPackage ../development/python-modules/libpcap {
     pkgsLibpcap = pkgs.libpcap; # Needs the C library
   };
+
   libpurecool = callPackage ../development/python-modules/libpurecool { };
+
   libpwquality = lib.pipe pkgs.libpwquality [
     toPythonModule
     (
@@ -4392,15 +8201,20 @@ self: super: with self; {
     )
     (p: p.py)
   ];
+
   libpyfoscamcgi = callPackage ../development/python-modules/libpyfoscamcgi { };
+
   libpysal = callPackage ../development/python-modules/libpysal { };
+
   libpyvivotek = callPackage ../development/python-modules/libpyvivotek { };
+
   libredwg = toPythonModule (
     pkgs.libredwg.override {
       enablePython = true;
       inherit (self) python libxml2;
     }
   );
+
   librepo = lib.pipe pkgs.librepo [
     toPythonModule
     (
@@ -4414,19 +8228,28 @@ self: super: with self; {
     (p: p.override { python3 = python; })
     (p: p.py)
   ];
+
   librespot = callPackage ../development/python-modules/librespot { };
+
   libretranslate = callPackage ../development/python-modules/libretranslate { };
+
   librosa = callPackage ../development/python-modules/librosa { };
+
   librouteros = callPackage ../development/python-modules/librouteros { };
+
   libsass = callPackage ../development/python-modules/libsass { inherit (pkgs) libsass; };
+
   libsavitar = callPackage ../development/python-modules/libsavitar { };
+
   libsbml = toPythonModule (
     pkgs.libsbml.override {
       withPython = true;
       inherit (self) python;
     }
   );
+
   libscanbuild = callPackage ../development/python-modules/libscanbuild { };
+
   libselinux = lib.pipe pkgs.libselinux [
     toPythonModule
     (
@@ -4448,22 +8271,36 @@ self: super: with self; {
     )
     (p: p.py)
   ];
+
   libsixel = callPackage ../development/python-modules/libsixel { inherit (pkgs) libsixel; };
+
   libsoundtouch = callPackage ../development/python-modules/libsoundtouch { };
+
   libsupermesh = callPackage ../development/python-modules/libsupermesh { };
+
   libtfr = callPackage ../development/python-modules/libtfr { };
+
   libthumbor = callPackage ../development/python-modules/libthumbor { };
+
   libtmux = callPackage ../development/python-modules/libtmux { };
+
   libtorrent-rasterbar =
     (toPythonModule (pkgs.libtorrent-rasterbar.override { python3 = python; })).python;
+
   libusb-package = callPackage ../development/python-modules/libusb-package {
     inherit (pkgs) libusb1;
   };
+
   libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; };
+
   libusbsio = callPackage ../development/python-modules/libusbsio { inherit (pkgs) libusbsio; };
+
   libuuu = callPackage ../development/python-modules/libuuu { };
+
   libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion; };
+
   libvirt = callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt; };
+
   libxml2 =
     (toPythonModule (
       pkgs.libxml2.override {
@@ -4471,6 +8308,7 @@ self: super: with self; {
         python3 = python;
       }
     )).py;
+
   libxslt =
     (toPythonModule (
       pkgs.libxslt.override {
@@ -4479,366 +8317,664 @@ self: super: with self; {
         inherit (self) libxml2;
       }
     )).py;
+
   liccheck = callPackage ../development/python-modules/liccheck { };
+
   license-expression = callPackage ../development/python-modules/license-expression { };
+
   lida = callPackage ../development/python-modules/lida { };
+
   lief = (toPythonModule (pkgs.lief.override { python3 = python; })).py;
+
   life360 = callPackage ../development/python-modules/life360 { };
+
   lifelines = callPackage ../development/python-modules/lifelines { };
+
   lightgbm = callPackage ../development/python-modules/lightgbm { };
+
   lightify = callPackage ../development/python-modules/lightify { };
+
   lightning = callPackage ../development/python-modules/lightning { };
+
   lightning-utilities = callPackage ../development/python-modules/lightning-utilities { };
+
   lightparam = callPackage ../development/python-modules/lightparam { };
+
   lightwave = callPackage ../development/python-modules/lightwave { };
+
   lightwave2 = callPackage ../development/python-modules/lightwave2 { };
+
   lima = callPackage ../development/python-modules/lima { };
+
   lime = callPackage ../development/python-modules/lime { };
+
   limiter = callPackage ../development/python-modules/limiter { };
+
   limitlessled = callPackage ../development/python-modules/limitlessled { };
+
   limits = callPackage ../development/python-modules/limits { };
+
   limnoria = callPackage ../development/python-modules/limnoria { };
+
   line-profiler = callPackage ../development/python-modules/line-profiler { };
+
   linear-garage-door = callPackage ../development/python-modules/linear-garage-door { };
+
   linear-operator = callPackage ../development/python-modules/linear-operator { };
+
   lineax = callPackage ../development/python-modules/lineax { };
+
   linecache2 = callPackage ../development/python-modules/linecache2 { };
+
   lineedit = callPackage ../development/python-modules/lineedit { };
+
   linetable = callPackage ../development/python-modules/linetable { };
+
   lingua = callPackage ../development/python-modules/lingua { };
+
   lingva = callPackage ../development/python-modules/lingva { };
+
   linien-client = callPackage ../development/python-modules/linien-client { };
+
   linien-common = callPackage ../development/python-modules/linien-common { };
+
   linkify-it-py = callPackage ../development/python-modules/linkify-it-py { };
+
   linknlink = callPackage ../development/python-modules/linknlink { };
+
   linode = callPackage ../development/python-modules/linode { };
+
   linode-api = callPackage ../development/python-modules/linode-api { };
+
   linode-metadata = callPackage ../development/python-modules/linode-metadata { };
+
   linuxfd = callPackage ../development/python-modules/linuxfd { };
+
   linuxpy = callPackage ../development/python-modules/linuxpy { };
+
   lion-pytorch = callPackage ../development/python-modules/lion-pytorch { };
+
   liquidctl = callPackage ../development/python-modules/liquidctl { };
+
   lirc = toPythonModule (pkgs.lirc.override { python3 = python; });
+
   lit = callPackage ../development/python-modules/lit { };
+
   litellm = callPackage ../development/python-modules/litellm { };
+
   litemapy = callPackage ../development/python-modules/litemapy { };
+
   litestar = callPackage ../development/python-modules/litestar { };
+
   litestar-htmx = callPackage ../development/python-modules/litestar-htmx { };
+
   littleutils = callPackage ../development/python-modules/littleutils { };
+
   livekit-api = callPackage ../development/python-modules/livekit-api { };
+
   livekit-protocol = callPackage ../development/python-modules/livekit-protocol { };
+
   livelossplot = callPackage ../development/python-modules/livelossplot { };
+
   livereload = callPackage ../development/python-modules/livereload { };
+
   livisi = callPackage ../development/python-modules/livisi { };
+
   lizard = callPackage ../development/python-modules/lizard { };
+
   llama-cloud = callPackage ../development/python-modules/llama-cloud { };
+
   llama-cloud-services = callPackage ../development/python-modules/llama-cloud-services { };
+
   llama-cpp-python = callPackage ../development/python-modules/llama-cpp-python { };
+
   llama-index = callPackage ../development/python-modules/llama-index { };
+
   llama-index-agent-openai = callPackage ../development/python-modules/llama-index-agent-openai { };
+
   llama-index-cli = callPackage ../development/python-modules/llama-index-cli { };
+
   llama-index-core = callPackage ../development/python-modules/llama-index-core { };
+
   llama-index-embeddings-gemini =
     callPackage ../development/python-modules/llama-index-embeddings-gemini
       { };
+
   llama-index-embeddings-google =
     callPackage ../development/python-modules/llama-index-embeddings-google
       { };
+
   llama-index-embeddings-huggingface =
     callPackage ../development/python-modules/llama-index-embeddings-huggingface
       { };
+
   llama-index-embeddings-ollama =
     callPackage ../development/python-modules/llama-index-embeddings-ollama
       { };
+
   llama-index-embeddings-openai =
     callPackage ../development/python-modules/llama-index-embeddings-openai
       { };
+
   llama-index-graph-stores-nebula =
     callPackage ../development/python-modules/llama-index-graph-stores-nebula
       { };
+
   llama-index-graph-stores-neo4j =
     callPackage ../development/python-modules/llama-index-graph-stores-neo4j
       { };
+
   llama-index-graph-stores-neptune =
     callPackage ../development/python-modules/llama-index-graph-stores-neptune
       { };
+
   llama-index-indices-managed-llama-cloud =
     callPackage ../development/python-modules/llama-index-indices-managed-llama-cloud
       { };
+
   llama-index-instrumentation =
     callPackage ../development/python-modules/llama-index-instrumentation
       { };
+
   llama-index-legacy = callPackage ../development/python-modules/llama-index-legacy { };
+
   llama-index-llms-ollama = callPackage ../development/python-modules/llama-index-llms-ollama { };
+
   llama-index-llms-openai = callPackage ../development/python-modules/llama-index-llms-openai { };
+
   llama-index-llms-openai-like =
     callPackage ../development/python-modules/llama-index-llms-openai-like
       { };
+
   llama-index-multi-modal-llms-openai =
     callPackage ../development/python-modules/llama-index-multi-modal-llms-openai
       { };
+
   llama-index-program-openai =
     callPackage ../development/python-modules/llama-index-program-openai
       { };
+
   llama-index-question-gen-openai =
     callPackage ../development/python-modules/llama-index-question-gen-openai
       { };
+
   llama-index-readers-database =
     callPackage ../development/python-modules/llama-index-readers-database
       { };
+
   llama-index-readers-file = callPackage ../development/python-modules/llama-index-readers-file { };
+
   llama-index-readers-json = callPackage ../development/python-modules/llama-index-readers-json { };
+
   llama-index-readers-llama-parse =
     callPackage ../development/python-modules/llama-index-readers-llama-parse
       { };
+
   llama-index-readers-s3 = callPackage ../development/python-modules/llama-index-readers-s3 { };
+
   llama-index-readers-twitter =
     callPackage ../development/python-modules/llama-index-readers-twitter
       { };
+
   llama-index-readers-txtai = callPackage ../development/python-modules/llama-index-readers-txtai { };
+
   llama-index-readers-weather =
     callPackage ../development/python-modules/llama-index-readers-weather
       { };
+
   llama-index-vector-stores-chroma =
     callPackage ../development/python-modules/llama-index-vector-stores-chroma
       { };
+
   llama-index-vector-stores-google =
     callPackage ../development/python-modules/llama-index-vector-stores-google
       { };
+
   llama-index-vector-stores-postgres =
     callPackage ../development/python-modules/llama-index-vector-stores-postgres
       { };
+
   llama-index-vector-stores-qdrant =
     callPackage ../development/python-modules/llama-index-vector-stores-qdrant
       { };
+
   llama-index-workflows = callPackage ../development/python-modules/llama-index-workflows { };
+
   llama-parse = callPackage ../development/python-modules/llama-parse { };
+
   llamaindex-py-client = callPackage ../development/python-modules/llamaindex-py-client { };
+
   llfuse = callPackage ../development/python-modules/llfuse { inherit (pkgs) fuse; };
+
   llguidance = callPackage ../development/python-modules/llguidance { };
+
   llm = callPackage ../development/python-modules/llm { };
+
   llm-anthropic = callPackage ../development/python-modules/llm-anthropic { };
+
   llm-cmd = callPackage ../development/python-modules/llm-cmd { };
+
   llm-command-r = callPackage ../development/python-modules/llm-command-r { };
+
   llm-deepseek = callPackage ../development/python-modules/llm-deepseek { };
+
   llm-docs = callPackage ../development/python-modules/llm-docs { };
+
   llm-echo = callPackage ../development/python-modules/llm-echo { };
+
   llm-fragments-github = callPackage ../development/python-modules/llm-fragments-github { };
+
   llm-fragments-pypi = callPackage ../development/python-modules/llm-fragments-pypi { };
+
   llm-fragments-reader = callPackage ../development/python-modules/llm-fragments-reader { };
+
   llm-fragments-symbex = callPackage ../development/python-modules/llm-fragments-symbex { };
+
   llm-gemini = callPackage ../development/python-modules/llm-gemini { };
+
   llm-gguf = callPackage ../development/python-modules/llm-gguf { };
+
   llm-git = callPackage ../development/python-modules/llm-git { };
+
   llm-github-copilot = callPackage ../development/python-modules/llm-github-copilot { };
+
   llm-grok = callPackage ../development/python-modules/llm-grok { };
+
   llm-groq = callPackage ../development/python-modules/llm-groq { };
+
   llm-hacker-news = callPackage ../development/python-modules/llm-hacker-news { };
+
   llm-jq = callPackage ../development/python-modules/llm-jq { };
+
   llm-llama-server = callPackage ../development/python-modules/llm-llama-server { };
+
   llm-mistral = callPackage ../development/python-modules/llm-mistral { };
+
   llm-ollama = callPackage ../development/python-modules/llm-ollama { };
+
   llm-openai-plugin = callPackage ../development/python-modules/llm-openai-plugin { };
+
   llm-openrouter = callPackage ../development/python-modules/llm-openrouter { };
+
   llm-pdf-to-images = callPackage ../development/python-modules/llm-pdf-to-images { };
+
   llm-perplexity = callPackage ../development/python-modules/llm-perplexity { };
+
   llm-sentence-transformers = callPackage ../development/python-modules/llm-sentence-transformers { };
+
   llm-templates-fabric = callPackage ../development/python-modules/llm-templates-fabric { };
+
   llm-templates-github = callPackage ../development/python-modules/llm-templates-github { };
+
   llm-tools-datasette = callPackage ../development/python-modules/llm-tools-datasette { };
+
   llm-tools-quickjs = callPackage ../development/python-modules/llm-tools-quickjs { };
+
   llm-tools-simpleeval = callPackage ../development/python-modules/llm-tools-simpleeval { };
+
   llm-tools-sqlite = callPackage ../development/python-modules/llm-tools-sqlite { };
+
   llm-venice = callPackage ../development/python-modules/llm-venice { };
+
   llm-video-frames = callPackage ../development/python-modules/llm-video-frames { };
+
   llmx = callPackage ../development/python-modules/llmx { };
+
   llvmlite = callPackage ../development/python-modules/llvmlite {
     # llvmlite always requires a specific version of llvm.
     llvm = pkgs.llvm_16;
   };
+
   lm-eval = callPackage ../development/python-modules/lm-eval { };
+
   lm-format-enforcer = callPackage ../development/python-modules/lm-format-enforcer { };
+
   lmdb = callPackage ../development/python-modules/lmdb { inherit (pkgs) lmdb; };
+
   lmfit = callPackage ../development/python-modules/lmfit { };
+
   lml = callPackage ../development/python-modules/lml { };
+
   lmnotify = callPackage ../development/python-modules/lmnotify { };
+
   lmtpd = callPackage ../development/python-modules/lmtpd { };
+
   lnkparse3 = callPackage ../development/python-modules/lnkparse3 { };
+
   loca = callPackage ../development/python-modules/loca { };
+
   local-attention = callPackage ../development/python-modules/local-attention { };
+
   localimport = callPackage ../development/python-modules/localimport { };
+
   localstack-client = callPackage ../development/python-modules/localstack-client { };
+
   localstack-ext = callPackage ../development/python-modules/localstack-ext { };
+
   localzone = callPackage ../development/python-modules/localzone { };
+
   locationsharinglib = callPackage ../development/python-modules/locationsharinglib { };
+
   locket = callPackage ../development/python-modules/locket { };
+
   lockfile = callPackage ../development/python-modules/lockfile { };
+
   locust = callPackage ../development/python-modules/locust { };
+
   log-symbols = callPackage ../development/python-modules/log-symbols { };
+
   logassert = callPackage ../development/python-modules/logassert { };
+
   logbook = callPackage ../development/python-modules/logbook { };
+
   logfury = callPackage ../development/python-modules/logfury { };
+
   logging-journald = callPackage ../development/python-modules/logging-journald { };
+
   logging-tree = callPackage ../development/python-modules/logging-tree { };
+
   logical-unification = callPackage ../development/python-modules/logical-unification { };
+
   logilab-common = callPackage ../development/python-modules/logilab/common.nix {
     pytestCheckHook = pytest7CheckHook;
   };
+
   logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix { };
+
   logmatic-python = callPackage ../development/python-modules/logmatic-python { };
+
   logster = callPackage ../development/python-modules/logster { };
+
   loguru = callPackage ../development/python-modules/loguru { };
+
   loguru-logging-intercept = callPackage ../development/python-modules/loguru-logging-intercept { };
+
   logutils = callPackage ../development/python-modules/logutils { };
+
   logzero = callPackage ../development/python-modules/logzero { };
+
   lomond = callPackage ../development/python-modules/lomond { };
+
   london-tube-status = callPackage ../development/python-modules/london-tube-status { };
+
   loompy = callPackage ../development/python-modules/loompy { };
+
   loopy = callPackage ../development/python-modules/loopy { };
+
   looseversion = callPackage ../development/python-modules/looseversion { };
+
   loqedapi = callPackage ../development/python-modules/loqedapi { };
+
   losant-rest = callPackage ../development/python-modules/losant-rest { };
+
   lottie = callPackage ../development/python-modules/lottie { };
+
   low-index = callPackage ../development/python-modules/low-index { };
+
   lox = callPackage ../development/python-modules/lox { };
+
   lpc-checksum = callPackage ../development/python-modules/lpc-checksum { };
+
   lrcalc-python = callPackage ../development/python-modules/lrcalc-python { };
+
   lrclibapi = callPackage ../development/python-modules/lrclibapi { };
+
   lru-dict = callPackage ../development/python-modules/lru-dict { };
+
   lsassy = callPackage ../development/python-modules/lsassy { };
+
   lsp-tree-sitter = callPackage ../development/python-modules/lsp-tree-sitter { };
+
   lsprotocol = callPackage ../development/python-modules/lsprotocol { };
+
   ltpycld2 = callPackage ../development/python-modules/ltpycld2 { };
+
   lttng = callPackage ../development/python-modules/lttng { };
+
   luddite = callPackage ../development/python-modules/luddite { };
+
   luftdaten = callPackage ../development/python-modules/luftdaten { };
+
   luhn = callPackage ../development/python-modules/luhn { };
+
   luna-soc = callPackage ../development/python-modules/luna-soc { };
+
   luna-usb = callPackage ../development/python-modules/luna-usb { };
+
   lunarcalendar = callPackage ../development/python-modules/lunarcalendar { };
+
   lupa = callPackage ../development/python-modules/lupa { };
+
   lupupy = callPackage ../development/python-modules/lupupy { };
+
   luqum = callPackage ../development/python-modules/luqum { };
+
   luxtronik = callPackage ../development/python-modules/luxtronik { };
+
   lxmf = callPackage ../development/python-modules/lxmf { };
+
   lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; };
+
   lxml-html-clean = callPackage ../development/python-modules/lxml-html-clean { };
+
   lxml-stubs = callPackage ../development/python-modules/lxml-stubs { };
+
   lyricwikia = callPackage ../development/python-modules/lyricwikia { };
+
   lz4 = callPackage ../development/python-modules/lz4 { };
+
   lzallright = callPackage ../development/python-modules/lzallright { };
+
   lzstring = callPackage ../development/python-modules/lzstring { };
+
   m2crypto = callPackage ../development/python-modules/m2crypto { };
+
   m2r = callPackage ../development/python-modules/m2r { };
+
   m3u8 = callPackage ../development/python-modules/m3u8 { };
+
   mac-alias = callPackage ../development/python-modules/mac-alias { };
+
   mac-vendor-lookup = callPackage ../development/python-modules/mac-vendor-lookup { };
+
   macaddress = callPackage ../development/python-modules/macaddress { };
+
   macaroonbakery = callPackage ../development/python-modules/macaroonbakery { };
+
   macfsevents = callPackage ../development/python-modules/macfsevents { };
+
   macholib = callPackage ../development/python-modules/macholib { };
+
   macropy = callPackage ../development/python-modules/macropy { };
+
   maec = callPackage ../development/python-modules/maec { };
+
   maestral = callPackage ../development/python-modules/maestral { };
+
   magic = callPackage ../development/python-modules/magic { };
+
   magic-filter = callPackage ../development/python-modules/magic-filter { };
+
   magic-wormhole = callPackage ../development/python-modules/magic-wormhole { };
+
   magic-wormhole-mailbox-server =
     callPackage ../development/python-modules/magic-wormhole-mailbox-server
       { };
+
   magic-wormhole-transit-relay =
     callPackage ../development/python-modules/magic-wormhole-transit-relay
       { };
+
   magicgui = callPackage ../development/python-modules/magicgui { };
+
   magika = callPackage ../development/python-modules/magika { };
+
   mahotas = callPackage ../development/python-modules/mahotas { };
+
   mail-parser = callPackage ../development/python-modules/mail-parser { };
+
   mailcap-fix = callPackage ../development/python-modules/mailcap-fix { };
+
   mailchecker = callPackage ../development/python-modules/mailchecker { };
+
   mailchimp = callPackage ../development/python-modules/mailchimp { };
+
   mailmanclient = callPackage ../development/python-modules/mailmanclient { };
+
   mailsuite = callPackage ../development/python-modules/mailsuite { };
+
   maison = callPackage ../development/python-modules/maison { };
+
   makefun = callPackage ../development/python-modules/makefun { };
+
   mako = callPackage ../development/python-modules/mako { };
+
   malduck = callPackage ../development/python-modules/malduck { };
+
   mallard-ducktype = callPackage ../development/python-modules/mallard-ducktype { };
+
   mamba-ssm = callPackage ../development/python-modules/mamba-ssm { };
+
   mammoth = callPackage ../development/python-modules/mammoth { };
+
   managesieve = callPackage ../development/python-modules/managesieve { };
+
   mando = callPackage ../development/python-modules/mando { };
+
   mandown = callPackage ../development/python-modules/mandown { };
+
   manga-ocr = callPackage ../development/python-modules/manga-ocr { };
+
   manhole = callPackage ../development/python-modules/manhole { };
+
   manifest-ml = callPackage ../development/python-modules/manifest-ml { };
+
   manifestoo = callPackage ../development/python-modules/manifestoo { };
+
   manifestoo-core = callPackage ../development/python-modules/manifestoo-core { };
+
   manifestparser =
     callPackage ../development/python-modules/marionette-harness/manifestparser.nix
       { };
+
   manifold3d = callPackage ../development/python-modules/manifold3d {
     inherit (pkgs.manifold.passthru) tbb;
   };
+
   manim = callPackage ../development/python-modules/manim { };
+
   manim-slides = callPackage ../development/python-modules/manim-slides { };
+
   manimgl = callPackage ../development/python-modules/manimgl { };
+
   manimpango = callPackage ../development/python-modules/manimpango { };
+
   manuel = callPackage ../development/python-modules/manuel { };
+
   manuf = callPackage ../development/python-modules/manuf { };
+
   mapbox-earcut = callPackage ../development/python-modules/mapbox-earcut { };
+
   mapclassify = callPackage ../development/python-modules/mapclassify { };
+
   mariadb = callPackage ../development/python-modules/mariadb { };
+
   marimo = callPackage ../development/python-modules/marimo { };
+
   marisa = callPackage ../development/python-modules/marisa { inherit (pkgs) marisa; };
+
   marisa-trie = callPackage ../development/python-modules/marisa-trie {
     marisa-cpp = pkgs.marisa;
   };
+
   markdown = callPackage ../development/python-modules/markdown { };
+
   markdown-include = callPackage ../development/python-modules/markdown-include { };
+
   markdown-inline-graphviz = callPackage ../development/python-modules/markdown-inline-graphviz { };
+
   markdown-it-py = callPackage ../development/python-modules/markdown-it-py { };
+
   markdown-macros = callPackage ../development/python-modules/markdown-macros { };
+
   markdown2 = callPackage ../development/python-modules/markdown2 { };
+
   markdownify = callPackage ../development/python-modules/markdownify { };
+
   markitdown = callPackage ../development/python-modules/markitdown { };
+
   marko = callPackage ../development/python-modules/marko { };
+
   markuppy = callPackage ../development/python-modules/markuppy { };
+
   markups = callPackage ../development/python-modules/markups { };
+
   markupsafe = callPackage ../development/python-modules/markupsafe { };
+
   marqo = callPackage ../development/python-modules/marqo { };
+
   marshmallow = callPackage ../development/python-modules/marshmallow { };
+
   marshmallow-dataclass = callPackage ../development/python-modules/marshmallow-dataclass { };
+
   marshmallow-oneofschema = callPackage ../development/python-modules/marshmallow-oneofschema { };
+
   marshmallow-polyfield = callPackage ../development/python-modules/marshmallow-polyfield { };
+
   marshmallow-sqlalchemy = callPackage ../development/python-modules/marshmallow-sqlalchemy { };
+
   mashumaro = callPackage ../development/python-modules/mashumaro { };
+
   masky = callPackage ../development/python-modules/masky { };
+
   mastodon-py = callPackage ../development/python-modules/mastodon-py { };
+
   mat2 = callPackage ../development/python-modules/mat2 { };
+
   matchpy = callPackage ../development/python-modules/matchpy { };
+
   material-color-utilities = callPackage ../development/python-modules/material-color-utilities { };
+
   materialx = callPackage ../development/python-modules/materialx { };
+
   materialyoucolor = callPackage ../development/python-modules/materialyoucolor { };
+
   mathutils = callPackage ../development/python-modules/mathutils { };
+
   matlink-gpapi = callPackage ../development/python-modules/matlink-gpapi { };
+
   matplotlib = callPackage ../development/python-modules/matplotlib {
     stdenv = if stdenv.hostPlatform.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
   };
+
   matplotlib-inline = callPackage ../development/python-modules/matplotlib-inline { };
+
   matplotlib-sixel = callPackage ../development/python-modules/matplotlib-sixel { };
+
   matplotlib-venn = callPackage ../development/python-modules/matplotlib-venn { };
+
   matplotx = callPackage ../development/python-modules/matplotx { };
+
   matrix-client = callPackage ../development/python-modules/matrix-client { };
+
   matrix-common = callPackage ../development/python-modules/matrix-common { };
+
   matrix-nio = callPackage ../development/python-modules/matrix-nio { };
+
   mattermostdriver = callPackage ../development/python-modules/mattermostdriver { };
+
   maubot = callPackage ../tools/networking/maubot { };
+
   mautrix = callPackage ../development/python-modules/mautrix { };
-  mautrix-appservice = self.mautrix;
-  # alias 2019-12-28
+
+  mautrix-appservice = self.mautrix; # alias 2019-12-28
+
   maxcube-api = callPackage ../development/python-modules/maxcube-api { };
+
   maxminddb = callPackage ../development/python-modules/maxminddb { };
+
   maya = callPackage ../development/python-modules/maya { };
+
   mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi {
     inherit buildPythonPackage pythonOlder pythonAtLeast;
     inherit (self)
@@ -4853,405 +8989,761 @@ self: super: with self; {
       pyqt5
       ;
   };
+
   mayim = callPackage ../development/python-modules/mayim { };
+
   mbddns = callPackage ../development/python-modules/mbddns { };
+
   mbstrdecoder = callPackage ../development/python-modules/mbstrdecoder { };
+
   mccabe = callPackage ../development/python-modules/mccabe { };
+
   mcdreforged = callPackage ../development/python-modules/mcdreforged { };
+
   mcp = callPackage ../development/python-modules/mcp { };
+
   mcpadapt = callPackage ../development/python-modules/mcpadapt { };
+
   mcstatus = callPackage ../development/python-modules/mcstatus { };
+
   mcuuid = callPackage ../development/python-modules/mcuuid { };
+
   md-toc = callPackage ../development/python-modules/md-toc { };
+
   md2gemini = callPackage ../development/python-modules/md2gemini { };
+
   md2pdf = callPackage ../development/python-modules/md2pdf { };
+
   mdformat = callPackage ../development/python-modules/mdformat { };
+
   mdformat-admon = callPackage ../development/python-modules/mdformat-admon { };
+
   mdformat-beautysh = callPackage ../development/python-modules/mdformat-beautysh { };
+
   mdformat-footnote = callPackage ../development/python-modules/mdformat-footnote { };
+
   mdformat-frontmatter = callPackage ../development/python-modules/mdformat-frontmatter { };
+
   mdformat-gfm = callPackage ../development/python-modules/mdformat-gfm { };
+
   mdformat-gfm-alerts = callPackage ../development/python-modules/mdformat-gfm-alerts { };
+
   mdformat-mkdocs = callPackage ../development/python-modules/mdformat-mkdocs { };
+
   mdformat-myst = callPackage ../development/python-modules/mdformat-myst { };
+
   mdformat-nix-alejandra = callPackage ../development/python-modules/mdformat-nix-alejandra { };
+
   mdformat-simple-breaks = callPackage ../development/python-modules/mdformat-simple-breaks { };
+
   mdformat-tables = callPackage ../development/python-modules/mdformat-tables { };
+
   mdformat-toc = callPackage ../development/python-modules/mdformat-toc { };
+
   mdformat-wikilink = callPackage ../development/python-modules/mdformat-wikilink { };
+
   mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { };
+
   mdtraj = callPackage ../development/python-modules/mdtraj { };
+
   mdurl = callPackage ../development/python-modules/mdurl { };
+
   mdutils = callPackage ../development/python-modules/mdutils { };
+
   mdx-truly-sane-lists = callPackage ../development/python-modules/mdx-truly-sane-lists { };
+
   mean-average-precision = callPackage ../development/python-modules/mean-average-precision { };
+
   measurement = callPackage ../development/python-modules/measurement { };
+
   meater-python = callPackage ../development/python-modules/meater-python { };
+
   mecab-python3 = callPackage ../development/python-modules/mecab-python3 { };
+
   mechanicalsoup = callPackage ../development/python-modules/mechanicalsoup { };
+
   mechanize = callPackage ../development/python-modules/mechanize { };
+
   medallion = callPackage ../development/python-modules/medallion { };
+
   mediafile = callPackage ../development/python-modules/mediafile { };
+
   mediafire-dl = callPackage ../development/python-modules/mediafire-dl { };
+
   mediapy = callPackage ../development/python-modules/mediapy { };
+
   medpy = callPackage ../development/python-modules/medpy { };
+
   medvol = callPackage ../development/python-modules/medvol { };
+
   meeko = callPackage ../development/python-modules/meeko { };
+
   meep = callPackage ../development/python-modules/meep { };
+
   meilisearch = callPackage ../development/python-modules/meilisearch { };
+
   meinheld = callPackage ../development/python-modules/meinheld { };
+
   meld3 = callPackage ../development/python-modules/meld3 { };
+
   melnor-bluetooth = callPackage ../development/python-modules/melnor-bluetooth { };
+
   memestra = callPackage ../development/python-modules/memestra { };
+
   memory-allocator = callPackage ../development/python-modules/memory-allocator { };
+
   memory-profiler = callPackage ../development/python-modules/memory-profiler { };
+
   memory-tempfile = callPackage ../development/python-modules/memory-tempfile { };
+
   meraki = callPackage ../development/python-modules/meraki { };
+
   mercadopago = callPackage ../development/python-modules/mercadopago { };
+
   mercantile = callPackage ../development/python-modules/mercantile { };
+
   mercurial = toPythonModule (pkgs.mercurial.override { python3Packages = self; });
+
   merge3 = callPackage ../development/python-modules/merge3 { };
+
   mergecal = callPackage ../development/python-modules/mergecal { };
+
   mergedb = callPackage ../development/python-modules/mergedb { };
+
   mergedeep = callPackage ../development/python-modules/mergedeep { };
+
   mergedict = callPackage ../development/python-modules/mergedict { };
+
   merkletools = callPackage ../development/python-modules/merkletools { };
+
   meross-iot = callPackage ../development/python-modules/meross-iot { };
+
   mesa = callPackage ../development/python-modules/mesa { };
+
   meshcat = callPackage ../development/python-modules/meshcat { };
+
   meshio = callPackage ../development/python-modules/meshio { };
+
   meshlabxml = callPackage ../development/python-modules/meshlabxml { };
+
   meshtastic = callPackage ../development/python-modules/meshtastic { };
+
   meson = toPythonModule (
     (pkgs.meson.override { python3 = python; }).overridePythonAttrs (oldAttrs: {
       # We do not want the setup hook in Python packages because the build is performed differently.
       setupHook = null;
     })
   );
+
   meson-python = callPackage ../development/python-modules/meson-python { inherit (pkgs) ninja; };
+
   mesonpep517 = callPackage ../development/python-modules/mesonpep517 { };
+
   messagebird = callPackage ../development/python-modules/messagebird { };
+
   metaflow = callPackage ../development/python-modules/metaflow { };
+
   metakernel = callPackage ../development/python-modules/metakernel { };
+
   metar = callPackage ../development/python-modules/metar { };
+
   metawear = callPackage ../development/python-modules/metawear { };
+
   meteoalertapi = callPackage ../development/python-modules/meteoalertapi { };
+
   meteocalc = callPackage ../development/python-modules/meteocalc { };
+
   meteofrance-api = callPackage ../development/python-modules/meteofrance-api { };
+
   meteoswiss-async = callPackage ../development/python-modules/meteoswiss-async { };
+
   methodtools = callPackage ../development/python-modules/methodtools { };
+
   mezzanine = callPackage ../development/python-modules/mezzanine { };
+
   mf2py = callPackage ../development/python-modules/mf2py { };
+
   mficlient = callPackage ../development/python-modules/mficlient { };
+
   mhcflurry = callPackage ../development/python-modules/mhcflurry { };
+
   mhcgnomes = callPackage ../development/python-modules/mhcgnomes { };
+
   miasm = callPackage ../development/python-modules/miasm { };
+
   miauth = callPackage ../development/python-modules/miauth { };
+
   micawber = callPackage ../development/python-modules/micawber { };
+
   micloud = callPackage ../development/python-modules/micloud { };
+
   microdata = callPackage ../development/python-modules/microdata { };
+
   microsoft-kiota-abstractions =
     callPackage ../development/python-modules/microsoft-kiota-abstractions
       { };
+
   microsoft-kiota-authentication-azure =
     callPackage ../development/python-modules/microsoft-kiota-authentication-azure
       { };
+
   microsoft-kiota-http = callPackage ../development/python-modules/microsoft-kiota-http { };
+
   microsoft-kiota-serialization-form =
     callPackage ../development/python-modules/microsoft-kiota-serialization-form
       { };
+
   microsoft-kiota-serialization-json =
     callPackage ../development/python-modules/microsoft-kiota-serialization-json
       { };
+
   microsoft-kiota-serialization-multipart =
     callPackage ../development/python-modules/microsoft-kiota-serialization-multipart
       { };
+
   microsoft-kiota-serialization-text =
     callPackage ../development/python-modules/microsoft-kiota-serialization-text
       { };
+
   microsoft-security-utilities-secret-masker =
     callPackage ../development/python-modules/microsoft-security-utilities-secret-masker
       { };
+
   midea-beautiful-air = callPackage ../development/python-modules/midea-beautiful-air { };
+
   midea-local = callPackage ../development/python-modules/midea-local { };
+
   midiutil = callPackage ../development/python-modules/midiutil { };
+
   mido = callPackage ../development/python-modules/mido { };
+
   migen = callPackage ../development/python-modules/migen { };
+
   mike = callPackage ../development/python-modules/mike { };
+
   milc = callPackage ../development/python-modules/milc { };
+
   milksnake = callPackage ../development/python-modules/milksnake { };
+
   mill-local = callPackage ../development/python-modules/mill-local { };
+
   millheater = callPackage ../development/python-modules/millheater { };
+
   mim-solvers = toPythonModule (
     pkgs.mim-solvers.override {
       python3Packages = self;
       pythonSupport = true;
     }
   );
+
   minari = callPackage ../development/python-modules/minari { };
+
   mindsdb-evaluator = callPackage ../development/python-modules/mindsdb-evaluator { };
+
   minexr = callPackage ../development/python-modules/minexr { };
+
   miniaudio = callPackage ../development/python-modules/miniaudio {
     inherit (pkgs) miniaudio;
   };
+
   minichain = callPackage ../development/python-modules/minichain { };
+
   minidb = callPackage ../development/python-modules/minidb { };
+
   minidump = callPackage ../development/python-modules/minidump { };
+
   miniful = callPackage ../development/python-modules/miniful { };
+
   minify-html = callPackage ../development/python-modules/minify-html { };
+
   minikanren = callPackage ../development/python-modules/minikanren { };
+
   minikerberos = callPackage ../development/python-modules/minikerberos { };
+
   minikerberos-bad = callPackage ../development/python-modules/minikerberos-bad { };
+
   minimal-snowplow-tracker = callPackage ../development/python-modules/minimal-snowplow-tracker { };
+
   minimock = callPackage ../development/python-modules/minimock { };
+
   mininet-python = (toPythonModule (pkgs.mininet.override { python3 = python; })).py;
+
   minio = callPackage ../development/python-modules/minio { };
+
   miniupnpc = callPackage ../development/python-modules/miniupnpc { };
+
   mip = callPackage ../development/python-modules/mip { };
+
   mir-eval = callPackage ../development/python-modules/mir-eval { };
+
   mirakuru = callPackage ../development/python-modules/mirakuru { };
+
   misaka = callPackage ../development/python-modules/misaka { };
+
   misaki = callPackage ../development/python-modules/misaki { };
+
   misoc = callPackage ../development/python-modules/misoc { };
+
   miss-hit = callPackage ../development/python-modules/miss-hit { };
+
   miss-hit-core = callPackage ../development/python-modules/miss-hit-core { };
+
   mistletoe = callPackage ../development/python-modules/mistletoe { };
+
   mistral-common = callPackage ../development/python-modules/mistral-common { };
+
   mistune = callPackage ../development/python-modules/mistune { };
+
   mitmproxy = callPackage ../development/python-modules/mitmproxy { };
+
   mitmproxy-linux = callPackage ../development/python-modules/mitmproxy-linux { };
+
   mitmproxy-macos = callPackage ../development/python-modules/mitmproxy-macos { };
+
   mitmproxy-rs = callPackage ../development/python-modules/mitmproxy-rs { };
+
   mitogen = callPackage ../development/python-modules/mitogen { };
+
   mixbox = callPackage ../development/python-modules/mixbox { };
+
   mixins = callPackage ../development/python-modules/mixins { };
+
   mixpanel = callPackage ../development/python-modules/mixpanel { };
+
   mizani = callPackage ../development/python-modules/mizani { };
+
   mkdocs = callPackage ../development/python-modules/mkdocs { };
+
   mkdocs-autolinks-plugin = callPackage ../development/python-modules/mkdocs-autolinks-plugin { };
+
   mkdocs-autorefs = callPackage ../development/python-modules/mkdocs-autorefs { };
+
   mkdocs-awesome-nav = callPackage ../development/python-modules/mkdocs-awesome-nav { };
+
   mkdocs-backlinks = callPackage ../development/python-modules/mkdocs-backlinks { };
+
   mkdocs-build-plantuml = callPackage ../development/python-modules/mkdocs-build-plantuml { };
+
   mkdocs-drawio-exporter = callPackage ../development/python-modules/mkdocs-drawio-exporter { };
+
   mkdocs-drawio-file = callPackage ../development/python-modules/mkdocs-drawio-file { };
+
   mkdocs-exclude = callPackage ../development/python-modules/mkdocs-exclude { };
+
   mkdocs-get-deps = callPackage ../development/python-modules/mkdocs-get-deps { };
+
   mkdocs-git-authors-plugin = callPackage ../development/python-modules/mkdocs-git-authors-plugin { };
+
   mkdocs-git-committers-plugin-2 =
     callPackage ../development/python-modules/mkdocs-git-committers-plugin-2
       { };
+
   mkdocs-git-revision-date-localized-plugin =
     callPackage ../development/python-modules/mkdocs-git-revision-date-localized-plugin
       { };
+
   mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { };
+
   mkdocs-glightbox = callPackage ../development/python-modules/mkdocs-glightbox { };
+
   mkdocs-graphviz = callPackage ../development/python-modules/mkdocs-graphviz { };
+
   mkdocs-jupyter = callPackage ../development/python-modules/mkdocs-jupyter { };
+
   mkdocs-linkcheck = callPackage ../development/python-modules/mkdocs-linkcheck { };
+
   mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { };
+
   mkdocs-markmap = callPackage ../development/python-modules/mkdocs-markmap { };
+
   mkdocs-material = callPackage ../development/python-modules/mkdocs-material { };
+
   mkdocs-material-extensions =
     callPackage ../development/python-modules/mkdocs-material/mkdocs-material-extensions.nix
       { };
+
   mkdocs-mermaid2-plugin = callPackage ../development/python-modules/mkdocs-mermaid2-plugin { };
+
   mkdocs-minify-plugin = callPackage ../development/python-modules/mkdocs-minify-plugin { };
+
   mkdocs-puml = callPackage ../development/python-modules/mkdocs-puml { };
+
   mkdocs-redirects = callPackage ../development/python-modules/mkdocs-redirects { };
+
   mkdocs-redoc-tag = callPackage ../development/python-modules/mkdocs-redoc-tag { };
+
   mkdocs-rss-plugin = callPackage ../development/python-modules/mkdocs-rss-plugin { };
+
   mkdocs-simple-blog = callPackage ../development/python-modules/mkdocs-simple-blog { };
+
   mkdocs-swagger-ui-tag = callPackage ../development/python-modules/mkdocs-swagger-ui-tag { };
+
   mkdocstrings = callPackage ../development/python-modules/mkdocstrings { };
+
   mkdocstrings-python = callPackage ../development/python-modules/mkdocstrings-python { };
+
   mkl-service = callPackage ../development/python-modules/mkl-service { };
+
   mktestdocs = callPackage ../development/python-modules/mktestdocs { };
+
   ml-collections = callPackage ../development/python-modules/ml-collections { };
+
   ml-dtypes = callPackage ../development/python-modules/ml-dtypes { };
+
   mlcroissant = callPackage ../development/python-modules/mlcroissant { };
+
   mlflow = callPackage ../development/python-modules/mlflow { };
+
   mlrose = callPackage ../development/python-modules/mlrose { };
+
   mlt = toPythonModule (
     pkgs.mlt.override {
       python3 = python;
       enablePython = true;
     }
   );
+
   mlx = callPackage ../development/python-modules/mlx { };
+
   mlx-lm = callPackage ../development/python-modules/mlx-lm { };
+
   mlxtend = callPackage ../development/python-modules/mlxtend { };
+
   mmcif-pdbx = callPackage ../development/python-modules/mmcif-pdbx { };
+
   mmcv = callPackage ../development/python-modules/mmcv { };
+
   mmengine = callPackage ../development/python-modules/mmengine { };
+
   mmh3 = callPackage ../development/python-modules/mmh3 { };
+
   mmpython = callPackage ../development/python-modules/mmpython { };
+
   mmtf-python = callPackage ../development/python-modules/mmtf-python { };
+
   mne = callPackage ../development/python-modules/mne { };
+
   mnemonic = callPackage ../development/python-modules/mnemonic { };
+
   mnist = callPackage ../development/python-modules/mnist { };
+
   moat-ble = callPackage ../development/python-modules/moat-ble { };
+
   mobi = callPackage ../development/python-modules/mobi { };
+
   mobly = callPackage ../development/python-modules/mobly { };
+
   mock = callPackage ../development/python-modules/mock { };
+
   mock-django = callPackage ../development/python-modules/mock-django { };
+
   mock-open = callPackage ../development/python-modules/mock-open { };
+
   mock-services = callPackage ../development/python-modules/mock-services { };
+
   mock-ssh-server = callPackage ../development/python-modules/mock-ssh-server { };
+
   mocket = callPackage ../development/python-modules/mocket { };
+
   mockfs = callPackage ../development/python-modules/mockfs { };
+
   mockito = callPackage ../development/python-modules/mockito { };
+
   mockupdb = callPackage ../development/python-modules/mockupdb { };
+
   modbus-tk = callPackage ../development/python-modules/modbus-tk { };
+
   moddb = callPackage ../development/python-modules/moddb { };
+
   model-bakery = callPackage ../development/python-modules/model-bakery { };
+
   model-checker = callPackage ../development/python-modules/model-checker { };
+
   modelcif = callPackage ../development/python-modules/modelcif { };
+
   modeled = callPackage ../development/python-modules/modeled { };
+
   modern-colorthief = callPackage ../development/python-modules/modern-colorthief { };
+
   moderngl = callPackage ../development/python-modules/moderngl { };
+
   moderngl-window = callPackage ../development/python-modules/moderngl-window { };
+
   moehlenhoff-alpha2 = callPackage ../development/python-modules/moehlenhoff-alpha2 { };
+
   mohawk = callPackage ../development/python-modules/mohawk { };
+
   molbar = callPackage ../development/python-modules/molbar { };
+
   molecule = callPackage ../development/python-modules/molecule { };
+
   molecule-plugins = callPackage ../development/python-modules/molecule/plugins.nix { };
+
   momepy = callPackage ../development/python-modules/momepy { };
+
   monai = callPackage ../development/python-modules/monai { };
+
   monai-deploy = callPackage ../development/python-modules/monai-deploy { };
+
   monarchmoney = callPackage ../development/python-modules/monarchmoney { };
+
   monero = callPackage ../development/python-modules/monero { };
+
   mongodict = callPackage ../development/python-modules/mongodict { };
+
   mongoengine = callPackage ../development/python-modules/mongoengine { };
+
   mongomock = callPackage ../development/python-modules/mongomock { };
+
   mongoquery = callPackage ../development/python-modules/mongoquery { };
+
   monitorcontrol = callPackage ../development/python-modules/monitorcontrol { };
+
   monkeyhex = callPackage ../development/python-modules/monkeyhex { };
+
   monkeytype = callPackage ../development/python-modules/monkeytype { };
+
   monosat = pkgs.monosat.python {
     inherit buildPythonPackage;
     inherit (self) cython pytestCheckHook;
   };
+
   monotonic = callPackage ../development/python-modules/monotonic { };
+
   monotonic-alignment-search =
     callPackage ../development/python-modules/monotonic-alignment-search
       { };
+
   monty = callPackage ../development/python-modules/monty { };
+
   monzopy = callPackage ../development/python-modules/monzopy { };
+
   moonraker-api = callPackage ../development/python-modules/moonraker-api { };
+
   mopeka-iot-ble = callPackage ../development/python-modules/mopeka-iot-ble { };
+
   mopidyapi = callPackage ../development/python-modules/mopidyapi { };
+
   more-itertools = callPackage ../development/python-modules/more-itertools { };
+
   more-properties = callPackage ../development/python-modules/more-properties { };
+
   morecantile = callPackage ../development/python-modules/morecantile { };
+
   moreorless = callPackage ../development/python-modules/moreorless { };
+
   moretools = callPackage ../development/python-modules/moretools { };
+
   morfessor = callPackage ../development/python-modules/morfessor { };
+
   morphys = callPackage ../development/python-modules/morphys { };
+
   mortgage = callPackage ../development/python-modules/mortgage { };
+
   motionblinds = callPackage ../development/python-modules/motionblinds { };
+
   motionblindsble = callPackage ../development/python-modules/motionblindsble { };
+
   motioneye-client = callPackage ../development/python-modules/motioneye-client { };
+
   motmetrics = callPackage ../development/python-modules/motmetrics { };
+
   moto = callPackage ../development/python-modules/moto { };
+
   motor = callPackage ../development/python-modules/motor { };
+
   mouseinfo = callPackage ../development/python-modules/mouseinfo { };
+
   moviepy = callPackage ../development/python-modules/moviepy { };
+
   mozart-api = callPackage ../development/python-modules/mozart-api { };
+
   mozilla-django-oidc = callPackage ../development/python-modules/mozilla-django-oidc { };
+
   mozjpeg_lossless_optimization =
     callPackage ../development/python-modules/mozjpeg_lossless_optimization
       { };
+
   mpd2 = callPackage ../development/python-modules/mpd2 { };
+
   mpegdash = callPackage ../development/python-modules/mpegdash { };
+
   mpi-pytest = callPackage ../development/python-modules/mpi-pytest { };
+
   mpi4py = callPackage ../development/python-modules/mpi4py { };
+
   mpire = callPackage ../development/python-modules/mpire { };
+
   mpl-scatter-density = callPackage ../development/python-modules/mpl-scatter-density { };
+
   mpl-typst = callPackage ../development/python-modules/mpl-typst { };
+
   mplcursors = callPackage ../development/python-modules/mplcursors { };
+
   mpldatacursor = callPackage ../development/python-modules/mpldatacursor { };
+
   mplfinance = callPackage ../development/python-modules/mplfinance { };
+
   mplhep = callPackage ../development/python-modules/mplhep { };
+
   mplhep-data = callPackage ../development/python-modules/mplhep-data { };
+
   mplleaflet = callPackage ../development/python-modules/mplleaflet { };
+
   mpltoolbox = callPackage ../development/python-modules/mpltoolbox { };
+
   mpmath = callPackage ../development/python-modules/mpmath { };
+
   mpris-server = callPackage ../development/python-modules/mpris-server { };
+
   mpv = callPackage ../development/python-modules/mpv { inherit (pkgs) mpv; };
+
   mpyq = callPackage ../development/python-modules/mpyq { };
+
   mqtt2influxdb = callPackage ../development/python-modules/mqtt2influxdb { };
+
   mrjob = callPackage ../development/python-modules/mrjob { };
+
   mrsqm = callPackage ../development/python-modules/mrsqm { };
+
   ms-active-directory = callPackage ../development/python-modules/ms-active-directory { };
+
   ms-cv = callPackage ../development/python-modules/ms-cv { };
+
   msal = callPackage ../development/python-modules/msal { };
+
   msal-extensions = callPackage ../development/python-modules/msal-extensions { };
+
   mscerts = callPackage ../development/python-modules/mscerts { };
+
   msg-parser = callPackage ../development/python-modules/msg-parser { };
+
   msgpack = callPackage ../development/python-modules/msgpack { };
+
   msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy { };
+
   msgraph-core = callPackage ../development/python-modules/msgraph-core { };
+
   msgraph-sdk = callPackage ../development/python-modules/msgraph-sdk { };
+
   msgspec = callPackage ../development/python-modules/msgspec { };
+
   msldap = callPackage ../development/python-modules/msldap { };
+
   msldap-bad = callPackage ../development/python-modules/msldap-bad { };
+
   mslex = callPackage ../development/python-modules/mslex { };
+
   msmart-ng = callPackage ../development/python-modules/msmart-ng { };
+
   msoffcrypto-tool = callPackage ../development/python-modules/msoffcrypto-tool { };
+
   msprime = callPackage ../development/python-modules/msprime { };
+
   msrest = callPackage ../development/python-modules/msrest { };
+
   msrestazure = callPackage ../development/python-modules/msrestazure { };
+
   msrplib = callPackage ../development/python-modules/msrplib { };
+
   mss = callPackage ../development/python-modules/mss { };
+
   msticpy = callPackage ../development/python-modules/msticpy { };
+
   mt-940 = callPackage ../development/python-modules/mt-940 { };
+
   mtcnn = callPackage ../development/python-modules/mtcnn { };
+
   mujoco = callPackage ../development/python-modules/mujoco { inherit (pkgs) mujoco; };
+
   mujoco-mjx = callPackage ../development/python-modules/mujoco-mjx { mujoco-main = pkgs.mujoco; };
+
   mujson = callPackage ../development/python-modules/mujson { };
+
   mullvad-api = callPackage ../development/python-modules/mullvad-api { };
+
   mullvad-closest = callPackage ../development/python-modules/mullvad-closest { };
+
   mulpyplexer = callPackage ../development/python-modules/mulpyplexer { };
+
   multi-key-dict = callPackage ../development/python-modules/multi-key-dict { };
+
   multidict = callPackage ../development/python-modules/multidict { };
+
   multimethod = callPackage ../development/python-modules/multimethod { };
+
   multipart = callPackage ../development/python-modules/multipart { };
+
   multipledispatch = callPackage ../development/python-modules/multipledispatch { };
+
   multiprocess = callPackage ../development/python-modules/multiprocess { };
+
   multiscale-spatial-image = callPackage ../development/python-modules/multiscale-spatial-image { };
+
   multiset = callPackage ../development/python-modules/multiset { };
+
   multitasking = callPackage ../development/python-modules/multitasking { };
+
   multivolumefile = callPackage ../development/python-modules/multivolumefile { };
+
   munch = callPackage ../development/python-modules/munch { };
+
   mung = callPackage ../development/python-modules/mung { };
+
   munkres = callPackage ../development/python-modules/munkres { };
+
   murmurhash = callPackage ../development/python-modules/murmurhash { };
+
   muscima = callPackage ../development/python-modules/muscima { };
+
   music-assistant-client = callPackage ../development/python-modules/music-assistant-client { };
+
   music-assistant-models = callPackage ../development/python-modules/music-assistant-models { };
+
   music-tag = callPackage ../development/python-modules/music-tag { };
+
   musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { };
+
   mutagen = callPackage ../development/python-modules/mutagen { };
+
   mutatormath = callPackage ../development/python-modules/mutatormath { };
+
   mutesync = callPackage ../development/python-modules/mutesync { };
+
   mutf8 = callPackage ../development/python-modules/mutf8 { };
+
   mwcli = callPackage ../development/python-modules/mwcli { };
+
   mwclient = callPackage ../development/python-modules/mwclient { };
+
   mwdblib = callPackage ../development/python-modules/mwdblib { };
+
   mwoauth = callPackage ../development/python-modules/mwoauth { };
+
   mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { };
+
   mwtypes = callPackage ../development/python-modules/mwtypes { };
+
   mwxml = callPackage ../development/python-modules/mwxml { };
+
   mxnet = callPackage ../development/python-modules/mxnet { };
+
   myfitnesspal = callPackage ../development/python-modules/myfitnesspal { };
+
   mygene = callPackage ../development/python-modules/mygene { };
+
   mygpoclient = callPackage ../development/python-modules/mygpoclient { };
+
   myhdl = callPackage ../development/python-modules/myhdl { inherit (pkgs) ghdl iverilog; };
+
   myhome = callPackage ../development/python-modules/myhome { };
+
   myjwt = callPackage ../development/python-modules/myjwt { };
+
   mypermobil = callPackage ../development/python-modules/mypermobil { };
+
   mypy = callPackage ../development/python-modules/mypy { };
+
   inherit (callPackage ../development/python-modules/mypy-boto3 { })
     mypy-boto3-accessanalyzer
     mypy-boto3-account
@@ -5602,761 +10094,1416 @@ self: super: with self; {
     mypy-boto3-workspaces-web
     mypy-boto3-xray
     ;
+
   mypy-boto3-builder = callPackage ../development/python-modules/mypy-boto3-builder { };
+
   mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { };
+
   mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { };
+
   mysql-connector = callPackage ../development/python-modules/mysql-connector { };
+
   mysqlclient = callPackage ../development/python-modules/mysqlclient { };
+
   myst-docutils = callPackage ../development/python-modules/myst-docutils { };
+
   myst-nb = callPackage ../development/python-modules/myst-nb { };
+
   myst-parser = callPackage ../development/python-modules/myst-parser { };
+
   myuplink = callPackage ../development/python-modules/myuplink { };
+
   nad-receiver = callPackage ../development/python-modules/nad-receiver { };
+
   nagiosplugin = callPackage ../development/python-modules/nagiosplugin { };
+
   naked = callPackage ../development/python-modules/naked { };
+
   name-that-hash = callPackage ../development/python-modules/name-that-hash { };
+
   namedlist = callPackage ../development/python-modules/namedlist { };
+
   nameko = callPackage ../development/python-modules/nameko { };
+
   nameparser = callPackage ../development/python-modules/nameparser { };
+
   names = callPackage ../development/python-modules/names { };
+
   namex = callPackage ../development/python-modules/namex { };
+
   nampa = callPackage ../development/python-modules/nampa { };
+
   nanobind = callPackage ../development/python-modules/nanobind { };
+
   nanoeigenpy = callPackage ../development/python-modules/nanoeigenpy { };
+
   nanoemoji = callPackage ../development/python-modules/nanoemoji { };
+
   nanoid = callPackage ../development/python-modules/nanoid { };
+
   nanoleaf = callPackage ../development/python-modules/nanoleaf { };
+
   nanomsg-python = callPackage ../development/python-modules/nanomsg-python {
     inherit (pkgs) nanomsg;
   };
+
   nanotime = callPackage ../development/python-modules/nanotime { };
+
   napalm = callPackage ../development/python-modules/napalm { };
+
   napalm-hp-procurve = callPackage ../development/python-modules/napalm/hp-procurve.nix { };
+
   napalm-ros = callPackage ../development/python-modules/napalm/ros.nix { };
+
   napari = callPackage ../development/python-modules/napari {
     inherit (pkgs.libsForQt5) mkDerivationWith wrapQtAppsHook;
   };
+
   napari-console = callPackage ../development/python-modules/napari-console { };
+
   napari-nifti = callPackage ../development/python-modules/napari-nifti { };
+
   napari-npe2 = callPackage ../development/python-modules/napari-npe2 { };
+
   napari-plugin-engine = callPackage ../development/python-modules/napari-plugin-engine { };
+
   napari-svg = callPackage ../development/python-modules/napari-svg { };
+
   narwhals = callPackage ../development/python-modules/narwhals { };
+
   nasdaq-data-link = callPackage ../development/python-modules/nasdaq-data-link { };
+
   natasha = callPackage ../development/python-modules/natasha { };
+
   nats-py = callPackage ../development/python-modules/nats-py { };
+
   nats-python = callPackage ../development/python-modules/nats-python { };
+
   natsort = callPackage ../development/python-modules/natsort { };
+
   natural = callPackage ../development/python-modules/natural { };
+
   naturalsort = callPackage ../development/python-modules/naturalsort { };
+
   navec = callPackage ../development/python-modules/navec { };
+
   nbclassic = callPackage ../development/python-modules/nbclassic { };
+
   nbclient = callPackage ../development/python-modules/nbclient { };
+
   nbconflux = callPackage ../development/python-modules/nbconflux { };
+
   nbconvert = callPackage ../development/python-modules/nbconvert { };
+
   nbdev = callPackage ../development/python-modules/nbdev { };
+
   nbdime = callPackage ../development/python-modules/nbdime { };
+
   nbexec = callPackage ../development/python-modules/nbexec { };
+
   nbformat = callPackage ../development/python-modules/nbformat { };
+
   nbmake = callPackage ../development/python-modules/nbmake { };
+
   nbsmoke = callPackage ../development/python-modules/nbsmoke { };
+
   nbsphinx = callPackage ../development/python-modules/nbsphinx { };
+
   nbtlib = callPackage ../development/python-modules/nbtlib { };
+
   nbval = callPackage ../development/python-modules/nbval { };
+
   nbxmpp = callPackage ../development/python-modules/nbxmpp { };
+
   nc-dnsapi = callPackage ../development/python-modules/nc-dnsapi { };
+
   ncclient = callPackage ../development/python-modules/ncclient { };
+
   nclib = callPackage ../development/python-modules/nclib { };
+
   ndcurves = toPythonModule (
     pkgs.ndcurves.override {
       python3Packages = self;
       pythonSupport = true;
     }
   );
+
   ndeflib = callPackage ../development/python-modules/ndeflib { };
+
   ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { };
+
   ndindex = callPackage ../development/python-modules/ndindex { };
+
   ndjson = callPackage ../development/python-modules/ndjson { };
+
   ndms2-client = callPackage ../development/python-modules/ndms2-client { };
+
   ndspy = callPackage ../development/python-modules/ndspy { };
+
   ndtypes = callPackage ../development/python-modules/ndtypes { };
+
   nebula3-python = callPackage ../development/python-modules/nebula3-python { };
+
   nemosis = callPackage ../development/python-modules/nemosis { };
+
   nengo = callPackage ../development/python-modules/nengo { };
+
   neo = callPackage ../development/python-modules/neo { };
+
   neo4j = callPackage ../development/python-modules/neo4j { };
+
   neoteroi-mkdocs = callPackage ../development/python-modules/neoteroi-mkdocs { };
+
   nessclient = callPackage ../development/python-modules/nessclient { };
+
   nest = toPythonModule (
     pkgs.nest-mpi.override {
       withPython = true;
       python3 = python;
     }
   );
+
   nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
+
   nested-lookup = callPackage ../development/python-modules/nested-lookup { };
+
   nested-multipart-parser = callPackage ../development/python-modules/nested-multipart-parser { };
+
   nestedtext = callPackage ../development/python-modules/nestedtext { };
+
   netaddr = callPackage ../development/python-modules/netaddr { };
+
   netapp-lib = callPackage ../development/python-modules/netapp-lib { };
+
   netapp-ontap = callPackage ../development/python-modules/netapp-ontap { };
+
   netbox-attachments = callPackage ../development/python-modules/netbox-attachments { };
+
   netbox-bgp = callPackage ../development/python-modules/netbox-bgp { };
+
   netbox-contract = callPackage ../development/python-modules/netbox-contract { };
+
   netbox-dns = callPackage ../development/python-modules/netbox-dns { };
+
   netbox-documents = callPackage ../development/python-modules/netbox-documents { };
+
   netbox-floorplan-plugin = callPackage ../development/python-modules/netbox-floorplan-plugin { };
+
   netbox-interface-synchronization =
     callPackage ../development/python-modules/netbox-interface-synchronization
       { };
+
   netbox-napalm-plugin = callPackage ../development/python-modules/netbox-napalm-plugin { };
+
   netbox-plugin-prometheus-sd =
     callPackage ../development/python-modules/netbox-plugin-prometheus-sd
       { };
+
   netbox-qrcode = callPackage ../development/python-modules/netbox-qrcode { };
+
   netbox-reorder-rack = callPackage ../development/python-modules/netbox-reorder-rack { };
+
   netbox-routing = callPackage ../development/python-modules/netbox-routing { };
+
   netbox-topology-views = callPackage ../development/python-modules/netbox-topology-views { };
+
   netcdf4 = callPackage ../development/python-modules/netcdf4 { };
+
   netdata = callPackage ../development/python-modules/netdata { };
+
   netdata-pandas = callPackage ../development/python-modules/netdata-pandas { };
+
   netdisco = callPackage ../development/python-modules/netdisco { };
+
   netgen-mesher = toPythonModule (pkgs.netgen.override { python3Packages = self; });
+
   nethsm = callPackage ../development/python-modules/nethsm { };
+
   netifaces = callPackage ../development/python-modules/netifaces { };
+
   netifaces-plus = callPackage ../development/python-modules/netifaces-plus { };
+
   netifaces2 = callPackage ../development/python-modules/netifaces2 { };
+
   netio = callPackage ../development/python-modules/netio { };
+
   netmap = callPackage ../development/python-modules/netmap { };
+
   netmiko = callPackage ../development/python-modules/netmiko { };
+
   nettigo-air-monitor = callPackage ../development/python-modules/nettigo-air-monitor { };
+
   netutils = callPackage ../development/python-modules/netutils { };
+
   networkx = callPackage ../development/python-modules/networkx { };
+
   neuralfoil = callPackage ../development/python-modules/neuralfoil { };
+
   neurokit2 = callPackage ../development/python-modules/neurokit2 { };
+
   neuron-full = pkgs.neuron-full.override { python3 = python; };
+
   neuronpy = toPythonModule neuron-full;
+
   nevow = callPackage ../development/python-modules/nevow { };
+
   newick = callPackage ../development/python-modules/newick { };
+
   newspaper3k = callPackage ../development/python-modules/newspaper3k { };
+
   newversion = callPackage ../development/python-modules/newversion { };
+
   nexia = callPackage ../development/python-modules/nexia { };
+
   nextcloudmonitor = callPackage ../development/python-modules/nextcloudmonitor { };
+
   nextcord = callPackage ../development/python-modules/nextcord { };
+
   nextdns = callPackage ../development/python-modules/nextdns { };
+
   nexusformat = callPackage ../development/python-modules/nexusformat { };
+
   nexusrpc = callPackage ../development/python-modules/nexusrpc { };
+
   nfcpy = callPackage ../development/python-modules/nfcpy { };
+
   nftables = callPackage ../os-specific/linux/nftables/python.nix { inherit (pkgs) nftables; };
+
   nglview = callPackage ../development/python-modules/nglview { };
+
   nh3 = callPackage ../development/python-modules/nh3 { };
+
   nhc = callPackage ../development/python-modules/nhc { };
+
   niaaml = callPackage ../development/python-modules/niaaml { };
+
   niaarm = callPackage ../development/python-modules/niaarm { };
+
   niaclass = callPackage ../development/python-modules/niaclass { };
+
   nianet = callPackage ../development/python-modules/nianet { };
+
   niapy = callPackage ../development/python-modules/niapy { };
+
   nibabel = callPackage ../development/python-modules/nibabel { };
+
   nibe = callPackage ../development/python-modules/nibe { };
+
   nice-go = callPackage ../development/python-modules/nice-go { };
+
   nicegui = callPackage ../development/python-modules/nicegui { };
+
   nicegui-highcharts = callPackage ../development/python-modules/nicegui-highcharts { };
+
   nidaqmx = callPackage ../development/python-modules/nidaqmx { };
+
   nifty8 = callPackage ../development/python-modules/nifty8 { };
+
   nikola = callPackage ../development/python-modules/nikola { };
+
   nilearn = callPackage ../development/python-modules/nilearn { };
+
   niluclient = callPackage ../development/python-modules/niluclient { };
+
   nimfa = callPackage ../development/python-modules/nimfa { };
+
   nine = callPackage ../development/python-modules/nine { };
+
   ninebot-ble = callPackage ../development/python-modules/ninebot-ble { };
+
   ninja = callPackage ../development/python-modules/ninja { inherit (pkgs) ninja; };
+
   nipap = callPackage ../development/python-modules/nipap { };
+
   nipreps-versions = callPackage ../development/python-modules/nipreps-versions { };
+
   nipy = callPackage ../development/python-modules/nipy { };
+
   nipype = callPackage ../development/python-modules/nipype { inherit (pkgs) which; };
+
   nitime = callPackage ../development/python-modules/nitime { };
+
   nitpick = callPackage ../applications/version-management/nitpick { };
+
   nitransforms = callPackage ../development/python-modules/nitransforms { };
+
   nitrokey = callPackage ../development/python-modules/nitrokey { };
+
   niworkflows = callPackage ../development/python-modules/niworkflows { };
+
   nix-kernel = callPackage ../development/python-modules/nix-kernel { inherit (pkgs) nix; };
+
   nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { };
+
   nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { };
+
   nixpkgs-updaters-library = callPackage ../development/python-modules/nixpkgs-updaters-library { };
+
   nkdfu = callPackage ../development/python-modules/nkdfu { };
+
   nlopt = callPackage ../development/python-modules/nlopt { };
+
   nlpcloud = callPackage ../development/python-modules/nlpcloud { };
+
   nlpo3 = callPackage ../development/python-modules/nlpo3 { };
+
   nltk = callPackage ../development/python-modules/nltk { };
+
   nmapthon2 = callPackage ../development/python-modules/nmapthon2 { };
+
   nnpdf = toPythonModule (pkgs.nnpdf.override { python3 = python; });
+
   noaa-coops = callPackage ../development/python-modules/noaa-coops { };
+
   nocasedict = callPackage ../development/python-modules/nocasedict { };
+
   nocaselist = callPackage ../development/python-modules/nocaselist { };
+
   nocturne = callPackage ../development/python-modules/nocturne { };
+
   node-semver = callPackage ../development/python-modules/node-semver { };
+
   nodeenv = callPackage ../development/python-modules/nodeenv { };
+
   nodepy-runtime = callPackage ../development/python-modules/nodepy-runtime { };
+
   nodriver = callPackage ../development/python-modules/nodriver { };
+
   noise = callPackage ../development/python-modules/noise { };
+
   noiseprotocol = callPackage ../development/python-modules/noiseprotocol { };
+
   noisereduce = callPackage ../development/python-modules/noisereduce { };
+
   nomadnet = callPackage ../development/python-modules/nomadnet { };
+
   nominal = callPackage ../development/python-modules/nominal { };
+
   nominal-api = callPackage ../development/python-modules/nominal-api { };
+
   nominal-api-protos = callPackage ../development/python-modules/nominal-api-protos { };
+
   nominatim-api = callPackage ../by-name/no/nominatim/nominatim-api.nix { };
+
   nonbloat-db = callPackage ../development/python-modules/nonbloat-db { };
+
   noneprompt = callPackage ../development/python-modules/noneprompt { };
+
   norfair = callPackage ../development/python-modules/norfair { };
+
   normality = callPackage ../development/python-modules/normality { };
+
   nose2 = callPackage ../development/python-modules/nose2 { };
+
   nose2pytest = callPackage ../development/python-modules/nose2pytest { };
+
   notebook = callPackage ../development/python-modules/notebook { };
+
   notebook-shim = callPackage ../development/python-modules/notebook-shim { };
+
   notedown = callPackage ../development/python-modules/notedown { };
+
   notifications-android-tv = callPackage ../development/python-modules/notifications-android-tv { };
+
   notifications-python-client =
     callPackage ../development/python-modules/notifications-python-client
       { };
+
   notify-events = callPackage ../development/python-modules/notify-events { };
+
   notify-py = callPackage ../development/python-modules/notify-py { };
+
   notify2 = callPackage ../development/python-modules/notify2 { };
+
   notion-client = callPackage ../development/python-modules/notion-client { };
+
   notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; };
+
   notmuch2 = callPackage ../development/python-modules/notmuch2 { inherit (pkgs) notmuch; };
+
   notobuilder = callPackage ../development/python-modules/notobuilder { };
+
   notus-scanner = callPackage ../development/python-modules/notus-scanner { };
+
   nox = callPackage ../development/python-modules/nox { };
+
   nplusone = callPackage ../development/python-modules/nplusone { };
+
   nptyping = callPackage ../development/python-modules/nptyping { };
+
   npyscreen = callPackage ../development/python-modules/npyscreen { };
+
   nsapi = callPackage ../development/python-modules/nsapi { };
+
   nskeyedunarchiver = callPackage ../development/python-modules/nskeyedunarchiver { };
+
   nsw-fuel-api-client = callPackage ../development/python-modules/nsw-fuel-api-client { };
+
   nsz = callPackage ../development/python-modules/nsz { };
+
   ntc-templates = callPackage ../development/python-modules/ntc-templates { };
+
   ntplib = callPackage ../development/python-modules/ntplib { };
+
   nuclear = callPackage ../development/python-modules/nuclear { };
+
   nuheat = callPackage ../development/python-modules/nuheat { };
+
   nuitka = callPackage ../development/python-modules/nuitka { };
+
   nulltype = callPackage ../development/python-modules/nulltype { };
+
   num2words = callPackage ../development/python-modules/num2words { };
+
   numba = callPackage ../development/python-modules/numba { inherit (pkgs.config) cudaSupport; };
+
   numba-scipy = callPackage ../development/python-modules/numba-scipy { };
+
   numbaWithCuda = self.numba.override { cudaSupport = true; };
+
   numbagg = callPackage ../development/python-modules/numbagg { };
+
   numcodecs = callPackage ../development/python-modules/numcodecs { };
+
   numdifftools = callPackage ../development/python-modules/numdifftools { };
+
   numericalunits = callPackage ../development/python-modules/numericalunits { };
+
   numexpr = callPackage ../development/python-modules/numexpr { };
+
   numpy = numpy_2;
+
   numpy-financial = callPackage ../development/python-modules/numpy-financial { };
+
   numpy-groupies = callPackage ../development/python-modules/numpy-groupies { };
+
   numpy-stl = callPackage ../development/python-modules/numpy-stl { };
+
   numpy_1 = callPackage ../development/python-modules/numpy/1.nix { };
+
   numpy_2 = callPackage ../development/python-modules/numpy/2.nix { };
+
   numpydoc = callPackage ../development/python-modules/numpydoc { };
+
   numpyro = callPackage ../development/python-modules/numpyro { };
+
   nunavut = callPackage ../development/python-modules/nunavut { };
+
   nutils = callPackage ../development/python-modules/nutils { };
+
   nutils-poly = callPackage ../development/python-modules/nutils-poly { };
+
   nutpie = callPackage ../development/python-modules/nutpie { };
+
   nvchecker = callPackage ../development/python-modules/nvchecker { };
+
   nvdlib = callPackage ../development/python-modules/nvdlib { };
+
   nvidia-ml-py = callPackage ../development/python-modules/nvidia-ml-py { };
+
   nwdiag = callPackage ../development/python-modules/nwdiag { };
+
   nxt-python = callPackage ../development/python-modules/nxt-python { };
+
   nyt-games = callPackage ../development/python-modules/nyt-games { };
+
   oasatelematics = callPackage ../development/python-modules/oasatelematics { };
+
   oath = callPackage ../development/python-modules/oath { };
+
   oathtool = callPackage ../development/python-modules/oathtool { };
+
   oauth2-client = callPackage ../development/python-modules/oauth2-client { };
+
   oauth2client = callPackage ../development/python-modules/oauth2client { };
+
   oauthenticator = callPackage ../development/python-modules/oauthenticator { };
+
   oauthlib = callPackage ../development/python-modules/oauthlib { };
+
   obfsproxy = callPackage ../development/python-modules/obfsproxy { };
+
   objax = callPackage ../development/python-modules/objax { };
+
   objexplore = callPackage ../development/python-modules/objexplore { };
+
   objgraph = callPackage ../development/python-modules/objgraph {
     # requires both the graphviz package and python package
     graphvizPkgs = pkgs.graphviz;
   };
+
   objprint = callPackage ../development/python-modules/objprint { };
+
   objsize = callPackage ../development/python-modules/objsize { };
+
   obspy = callPackage ../development/python-modules/obspy { };
+
   oca-port = callPackage ../development/python-modules/oca-port { };
+
   ochre = callPackage ../development/python-modules/ochre { };
+
   oci = callPackage ../development/python-modules/oci { };
+
   ocifs = callPackage ../development/python-modules/ocifs { };
+
   ocrmypdf = callPackage ../development/python-modules/ocrmypdf { tesseract = pkgs.tesseract5; };
+
   od = callPackage ../development/python-modules/od { };
+
   odc-geo = callPackage ../development/python-modules/odc-geo { };
+
   odc-loader = callPackage ../development/python-modules/odc-loader { };
+
   odc-stac = callPackage ../development/python-modules/odc-stac { };
+
   oddsprout = callPackage ../development/python-modules/oddsprout { };
+
   odfpy = callPackage ../development/python-modules/odfpy { };
+
   odp-amsterdam = callPackage ../development/python-modules/odp-amsterdam { };
+
   oelint-data = callPackage ../development/python-modules/oelint-data { };
+
   oelint-parser = callPackage ../development/python-modules/oelint-parser { };
+
   oemthermostat = callPackage ../development/python-modules/oemthermostat { };
+
   offtrac = callPackage ../development/python-modules/offtrac { };
+
   ofxclient = callPackage ../development/python-modules/ofxclient { };
+
   ofxhome = callPackage ../development/python-modules/ofxhome { };
+
   ofxparse = callPackage ../development/python-modules/ofxparse { };
+
   ofxtools = callPackage ../development/python-modules/ofxtools { };
+
   ogmios = callPackage ../development/python-modules/ogmios { };
+
   ohme = callPackage ../development/python-modules/ohme { };
+
   oic = callPackage ../development/python-modules/oic { };
+
   okonomiyaki = callPackage ../development/python-modules/okonomiyaki { };
+
   okta = callPackage ../development/python-modules/okta { };
+
   oldest-supported-numpy = callPackage ../development/python-modules/oldest-supported-numpy { };
+
   oldmemo = callPackage ../development/python-modules/oldmemo { };
+
   olefile = callPackage ../development/python-modules/olefile { };
+
   oletools = callPackage ../development/python-modules/oletools { };
+
   ollama = callPackage ../development/python-modules/ollama { };
+
   ome-zarr = callPackage ../development/python-modules/ome-zarr { };
+
   omegaconf = callPackage ../development/python-modules/omegaconf { };
+
   omemo = callPackage ../development/python-modules/omemo { };
+
   omemo-dr = callPackage ../development/python-modules/omemo-dr { };
+
   omnikinverter = callPackage ../development/python-modules/omnikinverter { };
+
   omnilogic = callPackage ../development/python-modules/omnilogic { };
+
   omniorb = toPythonModule (pkgs.omniorb.override { python3 = self.python; });
+
   omniorbpy = callPackage ../development/python-modules/omniorbpy { };
+
   omorfi = callPackage ../development/python-modules/omorfi { };
+
   omrdatasettools = callPackage ../development/python-modules/omrdatasettools { };
+
   oncalendar = callPackage ../development/python-modules/oncalendar { };
+
   ondilo = callPackage ../development/python-modules/ondilo { };
+
   onecache = callPackage ../development/python-modules/onecache { };
+
   onedrive-personal-sdk = callPackage ../development/python-modules/onedrive-personal-sdk { };
+
   onetimepad = callPackage ../development/python-modules/onetimepad { };
+
   onetimepass = callPackage ../development/python-modules/onetimepass { };
+
   onigurumacffi = callPackage ../development/python-modules/onigurumacffi { };
+
   onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { };
+
   online-judge-api-client = callPackage ../development/python-modules/online-judge-api-client { };
+
   online-judge-tools = callPackage ../development/python-modules/online-judge-tools { };
+
   online-judge-verify-helper =
     callPackage ../development/python-modules/online-judge-verify-helper
       { };
+
   onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { };
+
   onnx = callPackage ../development/python-modules/onnx { };
+
   onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { };
+
   onnxmltools = callPackage ../development/python-modules/onnxmltools { };
+
   onnxruntime = callPackage ../development/python-modules/onnxruntime {
     onnxruntime = pkgs.onnxruntime.override {
       python3Packages = self;
       pythonSupport = true;
     };
   };
+
   onnxruntime-tools = callPackage ../development/python-modules/onnxruntime-tools { };
+
   onnxslim = callPackage ../development/python-modules/onnxslim { };
+
   onvif-zeep = callPackage ../development/python-modules/onvif-zeep { };
+
   onvif-zeep-async = callPackage ../development/python-modules/onvif-zeep-async { };
+
   oocsi = callPackage ../development/python-modules/oocsi { };
+
   opcua-widgets = callPackage ../development/python-modules/opcua-widgets { };
+
   open-clip-torch = callPackage ../development/python-modules/open-clip-torch { };
+
   open-garage = callPackage ../development/python-modules/open-garage { };
+
   open-hypergraphs = callPackage ../development/python-modules/open-hypergraphs { };
+
   open-interpreter = callPackage ../development/python-modules/open-interpreter { };
+
   open-meteo = callPackage ../development/python-modules/open-meteo { };
+
   openai = callPackage ../development/python-modules/openai { };
+
   openai-agents = callPackage ../development/python-modules/openai-agents { };
+
   openai-whisper = callPackage ../development/python-modules/openai-whisper { };
+
   openaiauth = callPackage ../development/python-modules/openaiauth { };
+
   openant = callPackage ../development/python-modules/openant { };
+
   openapi-core = callPackage ../development/python-modules/openapi-core { };
+
   openapi-pydantic = callPackage ../development/python-modules/openapi-pydantic { };
+
   openapi-schema-validator = callPackage ../development/python-modules/openapi-schema-validator { };
+
   openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { };
+
   openapi3 = callPackage ../development/python-modules/openapi3 { };
+
   openbabel-bindings = callPackage ../development/python-modules/openbabel-bindings {
     openbabel = pkgs.openbabel.override { python3 = python; };
   };
+
   opencamlib = callPackage ../development/python-modules/opencamlib { };
+
   opencensus = callPackage ../development/python-modules/opencensus { };
+
   opencensus-context = callPackage ../development/python-modules/opencensus-context { };
+
   opencensus-ext-azure = callPackage ../development/python-modules/opencensus-ext-azure { };
+
   opencontainers = callPackage ../development/python-modules/opencontainers { };
+
   opencv-python = callPackage ../development/python-modules/opencv-python { };
+
   opencv-python-headless = callPackage ../development/python-modules/opencv-python-headless { };
+
   opencv4 = toPythonModule (
     pkgs.opencv4.override {
       enablePython = true;
       pythonPackages = self;
     }
   );
+
   openerz-api = callPackage ../development/python-modules/openerz-api { };
+
   openevsewifi = callPackage ../development/python-modules/openevsewifi { };
+
   openfga-sdk = callPackage ../development/python-modules/openfga-sdk { };
+
   openhomedevice = callPackage ../development/python-modules/openhomedevice { };
+
   openidc-client = callPackage ../development/python-modules/openidc-client { };
+
   openmm = toPythonModule (
     pkgs.openmm.override {
       python3Packages = self;
       enablePython = true;
     }
   );
+
   openpaperwork-core = callPackage ../applications/office/paperwork/openpaperwork-core.nix { };
+
   openpaperwork-gtk = callPackage ../applications/office/paperwork/openpaperwork-gtk.nix { };
+
   openpyxl = callPackage ../development/python-modules/openpyxl { };
+
   openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { };
+
   openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { };
+
   openrgb-python = callPackage ../development/python-modules/openrgb-python { };
+
   openrouteservice = callPackage ../development/python-modules/openrouteservice { };
+
   opensearch-py = callPackage ../development/python-modules/opensearch-py { };
+
   opensensemap-api = callPackage ../development/python-modules/opensensemap-api { };
+
   opensfm = callPackage ../development/python-modules/opensfm { };
+
   openshift = callPackage ../development/python-modules/openshift { };
+
   opensimplex = callPackage ../development/python-modules/opensimplex { };
+
   openslide = callPackage ../development/python-modules/openslide { inherit (pkgs) openslide; };
+
   openstackdocstheme = callPackage ../development/python-modules/openstackdocstheme { };
+
   openstacksdk = callPackage ../development/python-modules/openstacksdk { };
+
   openstep-parser = callPackage ../development/python-modules/openstep-parser { };
+
   openstep-plist = callPackage ../development/python-modules/openstep-plist { };
+
   opentelemetry-api = callPackage ../development/python-modules/opentelemetry-api { };
+
   opentelemetry-exporter-otlp =
     callPackage ../development/python-modules/opentelemetry-exporter-otlp
       { };
+
   opentelemetry-exporter-otlp-proto-common =
     callPackage ../development/python-modules/opentelemetry-exporter-otlp-proto-common
       { };
+
   opentelemetry-exporter-otlp-proto-grpc =
     callPackage ../development/python-modules/opentelemetry-exporter-otlp-proto-grpc
       { };
+
   opentelemetry-exporter-otlp-proto-http =
     callPackage ../development/python-modules/opentelemetry-exporter-otlp-proto-http
       { };
+
   opentelemetry-exporter-prometheus =
     callPackage ../development/python-modules/opentelemetry-exporter-prometheus
       { };
+
   opentelemetry-instrumentation =
     callPackage ../development/python-modules/opentelemetry-instrumentation
       { };
+
   opentelemetry-instrumentation-aiohttp-client =
     callPackage ../development/python-modules/opentelemetry-instrumentation-aiohttp-client
       { };
+
   opentelemetry-instrumentation-asgi =
     callPackage ../development/python-modules/opentelemetry-instrumentation-asgi
       { };
+
   opentelemetry-instrumentation-botocore =
     callPackage ../development/python-modules/opentelemetry-instrumentation-botocore
       { };
+
   opentelemetry-instrumentation-celery =
     callPackage ../development/python-modules/opentelemetry-instrumentation-celery
       { };
+
   opentelemetry-instrumentation-dbapi =
     callPackage ../development/python-modules/opentelemetry-instrumentation-dbapi
       { };
+
   opentelemetry-instrumentation-django =
     callPackage ../development/python-modules/opentelemetry-instrumentation-django
       { };
+
   opentelemetry-instrumentation-fastapi =
     callPackage ../development/python-modules/opentelemetry-instrumentation-fastapi
       { };
+
   opentelemetry-instrumentation-flask =
     callPackage ../development/python-modules/opentelemetry-instrumentation-flask
       { };
+
   opentelemetry-instrumentation-grpc =
     callPackage ../development/python-modules/opentelemetry-instrumentation-grpc
       { };
+
   opentelemetry-instrumentation-httpx =
     callPackage ../development/python-modules/opentelemetry-instrumentation-httpx
       { };
+
   opentelemetry-instrumentation-logging =
     callPackage ../development/python-modules/opentelemetry-instrumentation-logging
       { };
+
   opentelemetry-instrumentation-psycopg2 =
     callPackage ../development/python-modules/opentelemetry-instrumentation-psycopg2
       { };
+
   opentelemetry-instrumentation-redis =
     callPackage ../development/python-modules/opentelemetry-instrumentation-redis
       { };
+
   opentelemetry-instrumentation-requests =
     callPackage ../development/python-modules/opentelemetry-instrumentation-requests
       { };
+
   opentelemetry-instrumentation-sqlalchemy =
     callPackage ../development/python-modules/opentelemetry-instrumentation-sqlalchemy
       { };
+
   opentelemetry-instrumentation-wsgi =
     callPackage ../development/python-modules/opentelemetry-instrumentation-wsgi
       { };
+
   opentelemetry-propagator-aws-xray =
     callPackage ../development/python-modules/opentelemetry-propagator-aws-xray
       { };
+
   opentelemetry-proto = callPackage ../development/python-modules/opentelemetry-proto { };
+
   opentelemetry-sdk = callPackage ../development/python-modules/opentelemetry-sdk { };
+
   opentelemetry-semantic-conventions =
     callPackage ../development/python-modules/opentelemetry-semantic-conventions
       { };
+
   opentelemetry-test-utils = callPackage ../development/python-modules/opentelemetry-test-utils { };
+
   opentelemetry-util-http = callPackage ../development/python-modules/opentelemetry-util-http { };
+
   opentimestamps = callPackage ../development/python-modules/opentimestamps { };
+
   opentsne = callPackage ../development/python-modules/opentsne { };
+
   openturns = toPythonModule (
     pkgs.openturns.override {
       python3Packages = self;
       enablePython = true;
     }
   );
+
   opentype-feature-freezer = callPackage ../development/python-modules/opentype-feature-freezer { };
+
   opentypespec = callPackage ../development/python-modules/opentypespec { };
+
   openusd = callPackage ../development/python-modules/openusd { alembic = pkgs.alembic; };
+
   openvino = callPackage ../development/python-modules/openvino {
     openvino-native = pkgs.openvino.override { python3Packages = self; };
   };
+
   openwebifpy = callPackage ../development/python-modules/openwebifpy { };
+
   openwrt-luci-rpc = callPackage ../development/python-modules/openwrt-luci-rpc { };
+
   openwrt-ubus-rpc = callPackage ../development/python-modules/openwrt-ubus-rpc { };
+
   opower = callPackage ../development/python-modules/opower { };
+
   opsdroid-get-image-size = callPackage ../development/python-modules/opsdroid-get-image-size { };
+
   opt-einsum = callPackage ../development/python-modules/opt-einsum { };
+
   optax = callPackage ../development/python-modules/optax { };
+
   optimistix = callPackage ../development/python-modules/optimistix { };
+
   optimum = callPackage ../development/python-modules/optimum { };
+
   optree = callPackage ../development/python-modules/optree { };
+
   optuna = callPackage ../development/python-modules/optuna { };
+
   optuna-dashboard = callPackage ../development/python-modules/optuna-dashboard { };
+
   optype = callPackage ../development/python-modules/optype { };
+
   opuslib = callPackage ../development/python-modules/opuslib { };
+
   opytimark = callPackage ../development/python-modules/opytimark { };
+
   oracledb = callPackage ../development/python-modules/oracledb { };
+
   oralb-ble = callPackage ../development/python-modules/oralb-ble { };
+
   orange-canvas-core = callPackage ../development/python-modules/orange-canvas-core { };
+
   orange-widget-base = callPackage ../development/python-modules/orange-widget-base { };
+
   orange3 = callPackage ../development/python-modules/orange3 { };
+
   oras = callPackage ../development/python-modules/oras { };
+
   orbax-checkpoint = callPackage ../development/python-modules/orbax-checkpoint { };
+
   ordered-set = callPackage ../development/python-modules/ordered-set { };
+
   orderedmultidict = callPackage ../development/python-modules/orderedmultidict { };
+
   orderedset = callPackage ../development/python-modules/orderedset { };
+
   orderly-set = callPackage ../development/python-modules/orderly-set { };
+
   orgformat = callPackage ../development/python-modules/orgformat { };
+
   orgparse = callPackage ../development/python-modules/orgparse { };
+
   orjson = callPackage ../development/python-modules/orjson { };
+
   orm = callPackage ../development/python-modules/orm { };
+
   ormar = callPackage ../development/python-modules/ormar { };
+
   ormsgpack = callPackage ../development/python-modules/ormsgpack { };
+
   ortools = (toPythonModule (pkgs.or-tools.override { python3 = self.python; })).python;
+
   orvibo = callPackage ../development/python-modules/orvibo { };
+
   oryx = callPackage ../development/python-modules/oryx { };
+
   os-client-config = callPackage ../development/python-modules/os-client-config { };
+
   os-service-types = callPackage ../development/python-modules/os-service-types { };
+
   osc = callPackage ../development/python-modules/osc { };
+
   osc-diagram = callPackage ../development/python-modules/osc-diagram { };
+
   osc-lib = callPackage ../development/python-modules/osc-lib { };
+
   osc-placement = callPackage ../development/python-modules/osc-placement { };
+
   osc-sdk-python = callPackage ../development/python-modules/osc-sdk-python { };
+
   oschmod = callPackage ../development/python-modules/oschmod { };
+
   oscpy = callPackage ../development/python-modules/oscpy { };
+
   oscrypto = callPackage ../development/python-modules/oscrypto { };
+
   oscscreen = callPackage ../development/python-modules/oscscreen { };
+
   oset = callPackage ../development/python-modules/oset { };
+
   oslex = callPackage ../development/python-modules/oslex { };
+
   oslo-concurrency = callPackage ../development/python-modules/oslo-concurrency { };
+
   oslo-config = callPackage ../development/python-modules/oslo-config { };
+
   oslo-context = callPackage ../development/python-modules/oslo-context { };
+
   oslo-db = callPackage ../development/python-modules/oslo-db { };
+
   oslo-i18n = callPackage ../development/python-modules/oslo-i18n { };
+
   oslo-log = callPackage ../development/python-modules/oslo-log { };
+
   oslo-metrics = callPackage ../development/python-modules/oslo-metrics { };
+
   oslo-serialization = callPackage ../development/python-modules/oslo-serialization { };
+
   oslo-utils = callPackage ../development/python-modules/oslo-utils { };
+
   oslotest = callPackage ../development/python-modules/oslotest { };
+
   osmapi = callPackage ../development/python-modules/osmapi { };
+
   osmnx = callPackage ../development/python-modules/osmnx { };
+
   osmpythontools = callPackage ../development/python-modules/osmpythontools { };
+
   ospd = callPackage ../development/python-modules/ospd { };
+
   osprofiler = callPackage ../development/python-modules/osprofiler { };
+
   osqp = callPackage ../development/python-modules/osqp { };
+
   osrparse = callPackage ../development/python-modules/osrparse { };
+
   oss2 = callPackage ../development/python-modules/oss2 { };
+
   ossapi = callPackage ../development/python-modules/ossapi { };
+
   ossfs = callPackage ../development/python-modules/ossfs { };
+
   osxphotos = callPackage ../development/python-modules/osxphotos { };
+
   otpauth = callPackage ../development/python-modules/otpauth { };
+
   otr = callPackage ../development/python-modules/otr { };
+
   ots-python = callPackage ../development/python-modules/ots-python { };
+
   ourgroceries = callPackage ../development/python-modules/ourgroceries { };
+
   outcome = callPackage ../development/python-modules/outcome { };
+
   outdated = callPackage ../development/python-modules/outdated { };
+
   outlines = callPackage ../development/python-modules/outlines { };
+
   outlines-core = callPackage ../development/python-modules/outlines-core { };
+
   outspin = callPackage ../development/python-modules/outspin { };
+
   overly = callPackage ../development/python-modules/overly { };
+
   overpy = callPackage ../development/python-modules/overpy { };
+
   overrides = callPackage ../development/python-modules/overrides { };
+
   ovh = callPackage ../development/python-modules/ovh { };
+
   ovmfvartool = callPackage ../development/python-modules/ovmfvartool { };
+
   ovoenergy = callPackage ../development/python-modules/ovoenergy { };
+
   owslib = callPackage ../development/python-modules/owslib { };
+
   oyaml = callPackage ../development/python-modules/oyaml { };
+
   p1monitor = callPackage ../development/python-modules/p1monitor { };
+
   pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { };
+
   packageurl-python = callPackage ../development/python-modules/packageurl-python { };
+
   packaging = callPackage ../development/python-modules/packaging { };
+
   packaging-legacy = callPackage ../development/python-modules/packaging-legacy { };
+
   packbits = callPackage ../development/python-modules/packbits { };
+
   packet-python = callPackage ../development/python-modules/packet-python { };
+
   packvers = callPackage ../development/python-modules/packvers { };
+
   pad4pi = callPackage ../development/python-modules/pad4pi { };
+
   paddle-bfloat = callPackage ../development/python-modules/paddle-bfloat { };
+
   paddle2onnx = callPackage ../development/python-modules/paddle2onnx { };
+
   paddleocr = callPackage ../development/python-modules/paddleocr { };
+
   paddlepaddle = callPackage ../development/python-modules/paddlepaddle { };
+
   paddlex = callPackage ../development/python-modules/paddlex { };
+
   pagelabels = callPackage ../development/python-modules/pagelabels { };
+
   paginate = callPackage ../development/python-modules/paginate { };
+
   paho-mqtt = callPackage ../development/python-modules/paho-mqtt/default.nix { };
+
   paintcompiler = callPackage ../development/python-modules/paintcompiler { };
+
   palace = callPackage ../development/python-modules/palace { };
+
   palettable = callPackage ../development/python-modules/palettable { };
+
   pallets-sphinx-themes = callPackage ../development/python-modules/pallets-sphinx-themes { };
+
   pamela = callPackage ../development/python-modules/pamela { };
+
   pamqp = callPackage ../development/python-modules/pamqp { };
+
   panacotta = callPackage ../development/python-modules/panacotta { };
+
   panasonic-viera = callPackage ../development/python-modules/panasonic-viera { };
+
   pandantic = callPackage ../development/python-modules/pandantic { };
+
   pandas = callPackage ../development/python-modules/pandas { inherit (pkgs.darwin) adv_cmds; };
+
   pandas-datareader = callPackage ../development/python-modules/pandas-datareader { };
+
   pandas-stubs = callPackage ../development/python-modules/pandas-stubs { };
+
   pandas-ta = callPackage ../development/python-modules/pandas-ta { };
+
   pandera = callPackage ../development/python-modules/pandera { };
+
   pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { };
+
   pandoc-latex-environment = callPackage ../development/python-modules/pandoc-latex-environment { };
+
   pandoc-xnos = callPackage ../development/python-modules/pandoc-xnos { };
+
   pandocfilters = callPackage ../development/python-modules/pandocfilters { };
+
   panel = callPackage ../development/python-modules/panel { };
+
   panflute = callPackage ../development/python-modules/panflute { };
+
   panphon = callPackage ../development/python-modules/panphon { };
+
   paperbush = callPackage ../development/python-modules/paperbush { };
+
   papermill = callPackage ../development/python-modules/papermill { };
+
   paperwork-backend = callPackage ../applications/office/paperwork/paperwork-backend.nix { };
+
   paperwork-shell = callPackage ../applications/office/paperwork/paperwork-shell.nix { };
+
   papis = callPackage ../development/python-modules/papis { };
+
   papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { };
+
   para = callPackage ../development/python-modules/para { };
+
   paragraphs = callPackage ../development/python-modules/paragraphs { };
+
   parallel-ssh = callPackage ../development/python-modules/parallel-ssh { };
+
   param = callPackage ../development/python-modules/param { };
+
   paramax = callPackage ../development/python-modules/paramax { };
+
   parameter-expansion-patched =
     callPackage ../development/python-modules/parameter-expansion-patched
       { };
+
   parameterized = callPackage ../development/python-modules/parameterized { };
+
   parametrize-from-file = callPackage ../development/python-modules/parametrize-from-file { };
+
   paramiko = callPackage ../development/python-modules/paramiko { };
+
   paramz = callPackage ../development/python-modules/paramz { };
+
   paranoid-crypto = callPackage ../development/python-modules/paranoid-crypto { };
+
   parfive = callPackage ../development/python-modules/parfive { };
+
   parquet = callPackage ../development/python-modules/parquet { };
+
   parse = callPackage ../development/python-modules/parse { };
+
   parse-type = callPackage ../development/python-modules/parse-type { };
+
   parsedatetime = callPackage ../development/python-modules/parsedatetime { };
+
   parsedmarc = callPackage ../development/python-modules/parsedmarc { };
+
   parsel = callPackage ../development/python-modules/parsel { };
+
   parselmouth = callPackage ../development/python-modules/parselmouth { };
+
   parsimonious = callPackage ../development/python-modules/parsimonious { };
+
   parsley = callPackage ../development/python-modules/parsley { };
+
   parso = callPackage ../development/python-modules/parso { };
+
   parsy = callPackage ../development/python-modules/parsy { };
+
   partd = callPackage ../development/python-modules/partd { };
+
   partial-json-parser = callPackage ../development/python-modules/partial-json-parser { };
+
   particle = callPackage ../development/python-modules/particle { };
+
   parts = callPackage ../development/python-modules/parts { };
+
   parver = callPackage ../development/python-modules/parver { };
+
   pasimple = callPackage ../development/python-modules/pasimple { };
+
   passlib = callPackage ../development/python-modules/passlib { };
+
   password-entropy = callPackage ../development/python-modules/password-entropy { };
+
   paste = callPackage ../development/python-modules/paste { };
+
   pastedeploy = callPackage ../development/python-modules/pastedeploy { };
+
   pastel = callPackage ../development/python-modules/pastel { };
+
   pastescript = callPackage ../development/python-modules/pastescript { };
+
   patator = callPackage ../development/python-modules/patator { };
+
   patch = callPackage ../development/python-modules/patch { };
+
   patch-ng = callPackage ../development/python-modules/patch-ng { };
+
   patchpy = callPackage ../development/python-modules/patchpy { };
+
   path = callPackage ../development/python-modules/path { };
+
   path-and-address = callPackage ../development/python-modules/path-and-address { };
+
   pathable = callPackage ../development/python-modules/pathable { };
+
   pathlib-abc = callPackage ../development/python-modules/pathlib-abc { };
+
   pathlib2 = callPackage ../development/python-modules/pathlib2 { };
+
   pathos = callPackage ../development/python-modules/pathos { };
+
   pathspec = callPackage ../development/python-modules/pathspec { };
+
   pathtools = callPackage ../development/python-modules/pathtools { };
+
   pathvalidate = callPackage ../development/python-modules/pathvalidate { };
+
   pathy = callPackage ../development/python-modules/pathy { };
+
   patiencediff = callPackage ../development/python-modules/patiencediff { };
+
   patool = callPackage ../development/python-modules/patool { };
+
   patrowl4py = callPackage ../development/python-modules/patrowl4py { };
+
   patsy = callPackage ../development/python-modules/patsy { };
+
   paver = callPackage ../development/python-modules/paver { };
+
   paypal-checkout-serversdk = callPackage ../development/python-modules/paypal-checkout-serversdk { };
+
   paypalhttp = callPackage ../development/python-modules/paypalhttp { };
+
   paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { };
+
   pbar = callPackage ../development/python-modules/pbar { };
+
   pbkdf2 = callPackage ../development/python-modules/pbkdf2 { };
+
   pbr = callPackage ../development/python-modules/pbr { };
+
   pbs-installer = callPackage ../development/python-modules/pbs-installer { };
+
   pbxproj = callPackage ../development/python-modules/pbxproj { };
+
   pcapy-ng = callPackage ../development/python-modules/pcapy-ng {
     inherit (pkgs) libpcap; # Avoid confusion with python package of the same name
   };
+
   pcbnewtransition = callPackage ../development/python-modules/pcbnewtransition { };
+
   pcffont = callPackage ../development/python-modules/pcffont { };
+
   pcodec = callPackage ../development/python-modules/pcodec { };
+
   pcodedmp = callPackage ../development/python-modules/pcodedmp { };
+
   pcpp = callPackage ../development/python-modules/pcpp { };
+
   pcre2-py = callPackage ../development/python-modules/pcre2-py { };
+
   pdb2pqr = callPackage ../development/python-modules/pdb2pqr { };
+
   pdbfixer = callPackage ../development/python-modules/pdbfixer { };
+
   pdf2docx = callPackage ../development/python-modules/pdf2docx { };
+
   pdf2image = callPackage ../development/python-modules/pdf2image { };
+
   pdfkit = callPackage ../development/python-modules/pdfkit { };
+
   pdfminer-six = callPackage ../development/python-modules/pdfminer-six { };
+
   pdfplumber = callPackage ../development/python-modules/pdfplumber { };
+
   pdfquery = callPackage ../development/python-modules/pdfquery { };
+
   pdfrw = callPackage ../development/python-modules/pdfrw { };
+
   pdfrw2 = callPackage ../development/python-modules/pdfrw2 { };
+
   pdftotext = callPackage ../development/python-modules/pdftotext { };
+
   pdm-backend = callPackage ../development/python-modules/pdm-backend { };
+
   pdm-build-locked = callPackage ../development/python-modules/pdm-build-locked { };
+
   pdm-pep517 = callPackage ../development/python-modules/pdm-pep517 { };
+
   pdoc = callPackage ../development/python-modules/pdoc { };
+
   pdoc-pyo3-sample-library = callPackage ../development/python-modules/pdoc-pyo3-sample-library { };
+
   pdoc3 = callPackage ../development/python-modules/pdoc3 { };
+
   pdunehd = callPackage ../development/python-modules/pdunehd { };
+
   peacasso = callPackage ../development/python-modules/peacasso { };
+
   peaqevcore = callPackage ../development/python-modules/peaqevcore { };
+
   pebble = callPackage ../development/python-modules/pebble { };
+
   peblar = callPackage ../development/python-modules/peblar { };
+
   pecan = callPackage ../development/python-modules/pecan { };
+
   peco = callPackage ../development/python-modules/peco { };
+
   peewee = callPackage ../development/python-modules/peewee { };
+
   peewee-migrate = callPackage ../development/python-modules/peewee-migrate { };
+
   pefile = callPackage ../development/python-modules/pefile { };
+
   peft = callPackage ../development/python-modules/peft { };
+
   pegen = callPackage ../development/python-modules/pegen { };
+
   pelican = callPackage ../development/python-modules/pelican { inherit (pkgs) glibcLocales git; };
+
   pem = callPackage ../development/python-modules/pem { };
+
   pencompy = callPackage ../development/python-modules/pencompy { };
+
   pendulum = callPackage ../development/python-modules/pendulum { };
+
   pep440 = callPackage ../development/python-modules/pep440 { };
+
   pep517 = callPackage ../development/python-modules/pep517 { };
+
   pep8 = callPackage ../development/python-modules/pep8 { };
+
   pep8-naming = callPackage ../development/python-modules/pep8-naming { };
+
   pepit = callPackage ../development/python-modules/pepit { };
+
   peppercorn = callPackage ../development/python-modules/peppercorn { };
+
   perfplot = callPackage ../development/python-modules/perfplot { };
+
   periodictable = callPackage ../development/python-modules/periodictable { };
+
   periodiq = callPackage ../development/python-modules/periodiq { };
+
   permissionedforms = callPackage ../development/python-modules/permissionedforms { };
+
   persim = callPackage ../development/python-modules/persim { };
+
   persist-queue = callPackage ../development/python-modules/persist-queue { };
+
   persistent = callPackage ../development/python-modules/persistent { };
+
   persisting-theory = callPackage ../development/python-modules/persisting-theory { };
+
   pescea = callPackage ../development/python-modules/pescea { };
+
   pesq = callPackage ../development/python-modules/pesq { };
+
   petl = callPackage ../development/python-modules/petl { };
+
   petsc4py = toPythonModule (
     pkgs.petsc.override {
       python3 = python;
@@ -6364,61 +11511,111 @@ self: super: with self; {
       pythonSupport = true;
     }
   );
+
   pettingzoo = callPackage ../development/python-modules/pettingzoo { };
+
   pex = callPackage ../development/python-modules/pex { };
+
   pexif = callPackage ../development/python-modules/pexif { };
+
   pexpect = callPackage ../development/python-modules/pexpect { };
+
   pfzy = callPackage ../development/python-modules/pfzy { };
+
   pg8000 = callPackage ../development/python-modules/pg8000 { };
+
   pgcli = callPackage ../development/python-modules/pgcli { };
+
   pglast = callPackage ../development/python-modules/pglast { };
+
   pglive = callPackage ../development/python-modules/pglive { };
+
   pgmpy = callPackage ../development/python-modules/pgmpy { };
+
   pgpdump = callPackage ../development/python-modules/pgpdump { };
+
   pgpy = callPackage ../development/python-modules/pgpy { };
+
   pgpy-dtc = callPackage ../development/python-modules/pgpy-dtc { };
+
   pgsanity = callPackage ../development/python-modules/pgsanity { };
+
   pgspecial = callPackage ../development/python-modules/pgspecial { };
+
   pgvector = callPackage ../development/python-modules/pgvector { };
+
   phe = callPackage ../development/python-modules/phe { };
+
   phik = callPackage ../development/python-modules/phik { };
+
   philipstv = callPackage ../development/python-modules/philipstv { };
+
   phone-modem = callPackage ../development/python-modules/phone-modem { };
+
   phonemizer = callPackage ../development/python-modules/phonemizer { };
+
   phonenumbers = callPackage ../development/python-modules/phonenumbers { };
+
   phonenumberslite = callPackage ../development/python-modules/phonenumberslite { };
+
   phonopy = callPackage ../development/python-modules/phonopy { };
+
   photutils = callPackage ../development/python-modules/photutils { };
+
   phply = callPackage ../development/python-modules/phply { };
+
   phpserialize = callPackage ../development/python-modules/phpserialize { };
+
   phunspell = callPackage ../development/python-modules/phunspell { };
+
   phx-class-registry = callPackage ../development/python-modules/phx-class-registry { };
+
   pi1wire = callPackage ../development/python-modules/pi1wire { };
+
   piano-transcription-inference =
     callPackage ../development/python-modules/piano-transcription-inference
       { };
+
   piccata = callPackage ../development/python-modules/piccata { };
+
   piccolo-theme = callPackage ../development/python-modules/piccolo-theme { };
+
   pick = callPackage ../development/python-modules/pick { };
+
   pickleshare = callPackage ../development/python-modules/pickleshare { };
+
   pickpack = callPackage ../development/python-modules/pickpack { };
+
   picobox = callPackage ../development/python-modules/picobox { };
+
   picologging = callPackage ../development/python-modules/picologging { };
+
   picos = callPackage ../development/python-modules/picos { };
+
   picosvg = callPackage ../development/python-modules/picosvg { };
+
   pid = callPackage ../development/python-modules/pid { };
+
   piep = callPackage ../development/python-modules/piep { };
+
   piexif = callPackage ../development/python-modules/piexif { };
+
   pigpio = toPythonModule (
     pkgs.pigpio.override {
       inherit buildPythonPackage;
     }
   );
+
   pijuice = callPackage ../development/python-modules/pijuice { };
+
   pika = callPackage ../development/python-modules/pika { };
+
   pika-pool = callPackage ../development/python-modules/pika-pool { };
+
   pikepdf = callPackage ../development/python-modules/pikepdf { };
+
   pilkit = callPackage ../development/python-modules/pilkit { };
+
   pillow = callPackage ../development/python-modules/pillow {
     inherit (pkgs)
       freetype
@@ -6434,51 +11631,86 @@ self: super: with self; {
       ;
     inherit (pkgs.xorg) libxcb;
   };
+
   pillow-avif-plugin = callPackage ../development/python-modules/pillow-avif-plugin { };
+
   pillow-heif = callPackage ../development/python-modules/pillow-heif { };
+
   pillow-jpls = callPackage ../development/python-modules/pillow-jpls { };
+
   pillowfight = callPackage ../development/python-modules/pillowfight { };
+
   pims = callPackage ../development/python-modules/pims { };
+
   pinboard = callPackage ../development/python-modules/pinboard { };
+
   pinecone-client = callPackage ../development/python-modules/pinecone-client { };
+
   pinecone-plugin-inference = callPackage ../development/python-modules/pinecone-plugin-inference { };
+
   pinecone-plugin-interface = callPackage ../development/python-modules/pinecone-plugin-interface { };
+
   ping3 = callPackage ../development/python-modules/ping3 { };
+
   pinocchio = toPythonModule (
     pkgs.pinocchio.override {
       pythonSupport = true;
       python3Packages = self;
     }
   );
+
   pins = callPackage ../development/python-modules/pins { };
+
   pint = callPackage ../development/python-modules/pint { };
+
   pint-pandas = callPackage ../development/python-modules/pint-pandas { };
+
   pint-xarray = callPackage ../development/python-modules/pint-xarray { };
+
   pip = callPackage ../development/python-modules/pip { };
+
   pip-api = callPackage ../development/python-modules/pip-api { };
+
   pip-chill = callPackage ../development/python-modules/pip-chill { };
+
   pip-install-test = callPackage ../development/python-modules/pip-install-test { };
+
   pip-requirements-parser = callPackage ../development/python-modules/pip-requirements-parser { };
+
   pip-system-certs = callPackage ../development/python-modules/pip-system-certs { };
+
   pip-tools = callPackage ../development/python-modules/pip-tools { };
+
   pipdate = callPackage ../development/python-modules/pipdate { };
+
   pipdeptree = callPackage ../development/python-modules/pipdeptree { };
+
   pipe = callPackage ../development/python-modules/pipe { };
+
   piper-phonemize = callPackage ../development/python-modules/piper-phonemize {
     onnxruntime-native = pkgs.onnxruntime;
     piper-phonemize-native = pkgs.piper-phonemize;
   };
+
   pipetools = callPackage ../development/python-modules/pipetools { };
+
   pipx = callPackage ../development/python-modules/pipx { };
+
   piqp = callPackage ../development/python-modules/piqp { };
+
   pivy = callPackage ../development/python-modules/pivy {
     inherit (pkgs.qt5) qtbase qmake;
     inherit (pkgs.libsForQt5) soqt;
   };
+
   pixcat = callPackage ../development/python-modules/pixcat { };
+
   pixel-font-builder = callPackage ../development/python-modules/pixel-font-builder { };
+
   pixel-font-knife = callPackage ../development/python-modules/pixel-font-knife { };
+
   pixel-ring = callPackage ../development/python-modules/pixel-ring { };
+
   pjsua2 =
     (toPythonModule (
       pkgs.pjsip.override {
@@ -6486,1014 +11718,1961 @@ self: super: with self; {
         python3 = self.python;
       }
     )).py;
+
   pkce = callPackage ../development/python-modules/pkce { };
+
   pkg-about = callPackage ../development/python-modules/pkg-about { };
+
   pkgconfig = callPackage ../development/python-modules/pkgconfig { };
+
   pkginfo = callPackage ../development/python-modules/pkginfo { };
+
   pkginfo2 = callPackage ../development/python-modules/pkginfo2 { };
+
   pkgutil-resolve-name = callPackage ../development/python-modules/pkgutil-resolve-name { };
+
   pkuseg = callPackage ../development/python-modules/pkuseg { };
+
   plac = callPackage ../development/python-modules/plac { };
+
   plaid-python = callPackage ../development/python-modules/plaid-python { };
+
   planetary-computer = callPackage ../development/python-modules/planetary-computer { };
+
   plantuml = callPackage ../development/python-modules/plantuml { };
+
   plantuml-markdown = callPackage ../development/python-modules/plantuml-markdown {
     inherit (pkgs) plantuml;
   };
+
   plasTeX = callPackage ../development/python-modules/plasTeX { };
+
   plaster = callPackage ../development/python-modules/plaster { };
+
   plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy { };
+
   plastexdepgraph = callPackage ../development/python-modules/plastexdepgraph { };
+
   plastexshowmore = callPackage ../development/python-modules/plastexshowmore { };
+
   platformdirs = callPackage ../development/python-modules/platformdirs { };
+
   playsound = callPackage ../development/python-modules/playsound { };
+
   playwright = callPackage ../development/python-modules/playwright { };
+
   playwright-stealth = callPackage ../development/python-modules/playwright-stealth { };
+
   playwrightcapture = callPackage ../development/python-modules/playwrightcapture { };
+
   plexapi = callPackage ../development/python-modules/plexapi { };
+
   plexauth = callPackage ../development/python-modules/plexauth { };
+
   plexwebsocket = callPackage ../development/python-modules/plexwebsocket { };
+
   plfit = toPythonModule (pkgs.plfit.override { inherit (self) python; });
+
   plink = callPackage ../development/python-modules/plink { };
+
   plone-testing = callPackage ../development/python-modules/plone-testing { };
+
   ploomber-core = callPackage ../development/python-modules/ploomber-core { };
+
   ploomber-extension = callPackage ../development/python-modules/ploomber-extension { };
+
   plopp = callPackage ../development/python-modules/plopp { };
+
   plotext = callPackage ../development/python-modules/plotext { };
+
   plotille = callPackage ../development/python-modules/plotille { };
+
   plotly = callPackage ../development/python-modules/plotly { };
+
   plotnine = callPackage ../development/python-modules/plotnine { };
+
   plotpy = callPackage ../development/python-modules/plotpy { };
+
   pluggy = callPackage ../development/python-modules/pluggy { };
+
   pluginbase = callPackage ../development/python-modules/pluginbase { };
+
   plugincode = callPackage ../development/python-modules/plugincode { };
+
   plugnplay = callPackage ../development/python-modules/plugnplay { };
+
   plugp100 = callPackage ../development/python-modules/plugp100 { };
+
   plugwise = callPackage ../development/python-modules/plugwise { };
+
   plum-py = callPackage ../development/python-modules/plum-py { };
+
   plumbum = callPackage ../development/python-modules/plumbum { };
+
   pluthon = callPackage ../development/python-modules/pluthon { };
+
   plux = callPackage ../development/python-modules/plux { };
+
   ply = callPackage ../development/python-modules/ply { };
+
   plyara = callPackage ../development/python-modules/plyara { };
+
   plyer = callPackage ../development/python-modules/plyer { };
+
   plyfile = callPackage ../development/python-modules/plyfile { };
+
   plyplus = callPackage ../development/python-modules/plyplus { };
+
   plyvel = callPackage ../development/python-modules/plyvel { };
+
   pmdarima = callPackage ../development/python-modules/pmdarima { };
+
   pmdsky-debug-py = callPackage ../development/python-modules/pmdsky-debug-py { };
+
   pmsensor = callPackage ../development/python-modules/pmsensor { };
+
   pmw = callPackage ../development/python-modules/pmw { };
+
   pnglatex = callPackage ../development/python-modules/pnglatex { };
+
   pocket = callPackage ../development/python-modules/pocket { };
+
   pocketsphinx = callPackage ../development/python-modules/pocketsphinx {
     inherit (pkgs) pocketsphinx;
   };
+
   podcastparser = callPackage ../development/python-modules/podcastparser { };
+
   podcats = callPackage ../development/python-modules/podcats { };
+
   podgen = callPackage ../development/python-modules/podgen { };
+
   podman = callPackage ../development/python-modules/podman { };
+
   poetry-core = callPackage ../development/python-modules/poetry-core { };
+
   poetry-dynamic-versioning = callPackage ../development/python-modules/poetry-dynamic-versioning { };
+
   poetry-semver = callPackage ../development/python-modules/poetry-semver { };
+
   polarizationsolver = callPackage ../development/python-modules/polarizationsolver { };
+
   polars = callPackage ../development/python-modules/polars { };
+
   polib = callPackage ../development/python-modules/polib { };
+
   policy-sentry = callPackage ../development/python-modules/policy-sentry { };
+
   policyuniverse = callPackage ../development/python-modules/policyuniverse { };
+
   polling = callPackage ../development/python-modules/polling { };
+
   polyfactory = callPackage ../development/python-modules/polyfactory { };
+
   polygon3 = callPackage ../development/python-modules/polygon3 { };
+
   polyline = callPackage ../development/python-modules/polyline { };
+
   polyswarm-api = callPackage ../development/python-modules/polyswarm-api { };
+
   pomegranate = callPackage ../development/python-modules/pomegranate { };
+
   pontos = callPackage ../development/python-modules/pontos { };
+
   pony = callPackage ../development/python-modules/pony { };
+
   ponywhoosh = callPackage ../development/python-modules/ponywhoosh { };
+
   pooch = callPackage ../development/python-modules/pooch { };
+
   pook = callPackage ../development/python-modules/pook { };
+
   poolsense = callPackage ../development/python-modules/poolsense { };
+
   poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 {
     inherit (pkgs.qt5) qtbase qmake;
     inherit (pkgs.libsForQt5) poppler;
   };
+
   port-for = callPackage ../development/python-modules/port-for { };
+
   portalocker = callPackage ../development/python-modules/portalocker { };
+
   portend = callPackage ../development/python-modules/portend { };
+
   portion = callPackage ../development/python-modules/portion { };
+
   portpicker = callPackage ../development/python-modules/portpicker { };
+
   posix-ipc = callPackage ../development/python-modules/posix-ipc { };
+
   postgrest-py = callPackage ../development/python-modules/postgrest-py { };
+
   posthog = callPackage ../development/python-modules/posthog { };
+
   pot = callPackage ../development/python-modules/pot { };
+
   potentials = callPackage ../development/python-modules/potentials { };
+
   potr = callPackage ../development/python-modules/potr { };
+
   power = callPackage ../development/python-modules/power { };
+
   powerapi = callPackage ../development/python-modules/powerapi { };
+
   powerfox = callPackage ../development/python-modules/powerfox { };
+
   powerline = callPackage ../development/python-modules/powerline { };
+
   powerline-mem-segment = callPackage ../development/python-modules/powerline-mem-segment { };
+
   pox = callPackage ../development/python-modules/pox { };
+
   poyo = callPackage ../development/python-modules/poyo { };
+
   ppdeep = callPackage ../development/python-modules/ppdeep { };
+
   ppft = callPackage ../development/python-modules/ppft { };
+
   ppk2-api = callPackage ../development/python-modules/ppk2-api { };
+
   pplpy = callPackage ../development/python-modules/pplpy { };
+
   pprintpp = callPackage ../development/python-modules/pprintpp { };
+
   pproxy = callPackage ../development/python-modules/pproxy { };
+
   ppscore = callPackage ../development/python-modules/ppscore { };
+
   pq = callPackage ../development/python-modules/pq { };
+
   prance = callPackage ../development/python-modules/prance { };
+
   praw = callPackage ../development/python-modules/praw { };
+
   prawcore = callPackage ../development/python-modules/prawcore { };
+
   prayer-times-calculator-offline =
     callPackage ../development/python-modules/prayer-times-calculator-offline
       { };
+
   pre-commit-hooks = callPackage ../development/python-modules/pre-commit-hooks { };
+
   pre-commit-po-hooks = callPackage ../development/python-modules/pre-commit-po-hooks { };
+
   precis-i18n = callPackage ../development/python-modules/precis-i18n { };
+
   precisely = callPackage ../development/python-modules/precisely { };
+
   prefixed = callPackage ../development/python-modules/prefixed { };
+
   preggy = callPackage ../development/python-modules/preggy { };
+
   preprocess-cancellation = callPackage ../development/python-modules/preprocess-cancellation { };
+
   presenterm-export = callPackage ../development/python-modules/presenterm-export { };
+
   preshed = callPackage ../development/python-modules/preshed { };
+
   presto-python-client = callPackage ../development/python-modules/presto-python-client { };
+
   pretend = callPackage ../development/python-modules/pretend { };
+
   pretty-errors = callPackage ../development/python-modules/pretty-errors { };
+
   prettytable = callPackage ../development/python-modules/prettytable { };
+
   primecountpy = callPackage ../development/python-modules/primecountpy { };
+
   primepy = callPackage ../development/python-modules/primepy { };
+
   primer3 = callPackage ../development/python-modules/primer3 { };
+
   primp = callPackage ../development/python-modules/primp { };
+
   print-color = callPackage ../development/python-modules/print-color { };
+
   priority = callPackage ../development/python-modules/priority { };
+
   prisma = callPackage ../development/python-modules/prisma { };
+
   prison = callPackage ../development/python-modules/prison { };
+
   process-tests = callPackage ../development/python-modules/process-tests { };
+
   procmon-parser = callPackage ../development/python-modules/procmon-parser { };
+
   prodict = callPackage ../development/python-modules/prodict { };
+
   proglog = callPackage ../development/python-modules/proglog { };
+
   progress = callPackage ../development/python-modules/progress { };
+
   progressbar = callPackage ../development/python-modules/progressbar { };
+
   progressbar2 = callPackage ../development/python-modules/progressbar2 { };
+
   progressbar33 = callPackage ../development/python-modules/progressbar33 { };
+
   prometheus-api-client = callPackage ../development/python-modules/prometheus-api-client { };
+
   prometheus-async = callPackage ../development/python-modules/prometheus-async { };
+
   prometheus-client = callPackage ../development/python-modules/prometheus-client { };
+
   prometheus-fastapi-instrumentator =
     callPackage ../development/python-modules/prometheus-fastapi-instrumentator
       { };
+
   prometheus-flask-exporter = callPackage ../development/python-modules/prometheus-flask-exporter { };
+
   prometheus-pandas = callPackage ../development/python-modules/prometheus-pandas { };
+
   prometrix = callPackage ../development/python-modules/prometrix { };
+
   promise = callPackage ../development/python-modules/promise { };
+
   prompt-toolkit = callPackage ../development/python-modules/prompt-toolkit { };
+
   prompthub-py = callPackage ../development/python-modules/prompthub-py { };
+
   propcache = callPackage ../development/python-modules/propcache { };
+
   property-cached = callPackage ../development/python-modules/property-cached { };
+
   property-manager = callPackage ../development/python-modules/property-manager { };
+
   prophet = callPackage ../development/python-modules/prophet { };
+
   propka = callPackage ../development/python-modules/propka { };
+
   prosemirror = callPackage ../development/python-modules/prosemirror { };
+
   protego = callPackage ../development/python-modules/protego { };
+
   proto-plus = callPackage ../development/python-modules/proto-plus { };
+
   # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version.
   protobuf = protobuf6;
+
   protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { };
+
   # Protobuf 4.x
   protobuf4 = callPackage ../development/python-modules/protobuf/4.nix {
     protobuf = pkgs.protobuf_25;
   };
+
   # Protobuf 5.x
   protobuf5 = callPackage ../development/python-modules/protobuf/5.nix {
     protobuf = pkgs.__splicedPackages.protobuf_29;
   };
+
   # Protobuf 6.x
   protobuf6 = callPackage ../development/python-modules/protobuf/6.nix {
     inherit (pkgs.__splicedPackages) protobuf;
   };
+
   protoletariat = callPackage ../development/python-modules/protoletariat { };
+
   proton-client = callPackage ../development/python-modules/proton-client { };
+
   proton-core = callPackage ../development/python-modules/proton-core { };
+
   proton-keyring-linux = callPackage ../development/python-modules/proton-keyring-linux { };
+
   proton-vpn-api-core = callPackage ../development/python-modules/proton-vpn-api-core { };
+
   proton-vpn-local-agent = callPackage ../development/python-modules/proton-vpn-local-agent { };
+
   proton-vpn-network-manager =
     callPackage ../development/python-modules/proton-vpn-network-manager
       { };
+
   protonup-ng = callPackage ../development/python-modules/protonup-ng { };
+
   protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib {
     pkgs-systemd = pkgs.systemd;
   };
+
   prov = callPackage ../development/python-modules/prov { };
+
   prox-tv = callPackage ../development/python-modules/prox-tv { };
+
   proxmoxer = callPackage ../development/python-modules/proxmoxer { };
+
   proxsuite = toPythonModule (
     pkgs.proxsuite.override {
       pythonSupport = true;
       python3Packages = self;
     }
   );
+
   proxsuite-nlp = toPythonModule (
     pkgs.proxsuite-nlp.override {
       pythonSupport = true;
       python3Packages = self;
     }
   );
+
   proxy-db = callPackage ../development/python-modules/proxy-db { };
+
   proxy-py = callPackage ../development/python-modules/proxy-py { };
+
   proxy-tools = callPackage ../development/python-modules/proxy-tools { };
+
   psautohint = callPackage ../development/python-modules/psautohint { };
+
   pscript = callPackage ../development/python-modules/pscript { };
+
   psd-tools = callPackage ../development/python-modules/psd-tools { };
+
   psnawp = callPackage ../development/python-modules/psnawp { };
+
   psrpcore = callPackage ../development/python-modules/psrpcore { };
+
   psutil = callPackage ../development/python-modules/psutil { };
+
   psutil-home-assistant = callPackage ../development/python-modules/psutil-home-assistant { };
+
   psychrolib = callPackage ../development/python-modules/psychrolib { };
+
   psycopg = callPackage ../development/python-modules/psycopg { };
+
   psycopg-c = psycopg.c;
+
   psycopg-pool = psycopg.pool;
+
   psycopg2 = callPackage ../development/python-modules/psycopg2 { };
+
   psycopg2-binary = callPackage ../development/python-modules/psycopg2-binary { };
+
   psycopg2cffi = callPackage ../development/python-modules/psycopg2cffi { };
+
   psygnal = callPackage ../development/python-modules/psygnal { };
+
   ptest = callPackage ../development/python-modules/ptest { };
+
   ptpython = callPackage ../development/python-modules/ptpython { };
+
   ptyprocess = callPackage ../development/python-modules/ptyprocess { };
+
   publicsuffix = callPackage ../development/python-modules/publicsuffix { };
+
   publicsuffix2 = callPackage ../development/python-modules/publicsuffix2 { };
+
   publicsuffixlist = callPackage ../development/python-modules/publicsuffixlist { };
+
   pubnub = callPackage ../development/python-modules/pubnub { };
+
   pubnubsub-handler = callPackage ../development/python-modules/pubnubsub-handler { };
+
   pudb = callPackage ../development/python-modules/pudb { };
+
   pueblo = callPackage ../development/python-modules/pueblo { };
+
   pulp = callPackage ../development/python-modules/pulp { };
+
   pulsar-client = callPackage ../development/python-modules/pulsar-client { };
+
   pulsectl = callPackage ../development/python-modules/pulsectl { };
+
   pulsectl-asyncio = callPackage ../development/python-modules/pulsectl-asyncio { };
+
   pulumi = callPackage ../development/python-modules/pulumi { };
+
   pulumi-aws = callPackage ../development/python-modules/pulumi-aws { };
+
   pulumi-aws-native = pkgs.pulumiPackages.pulumi-aws-native.sdks.python;
+
   pulumi-azure-native = pkgs.pulumiPackages.pulumi-azure-native.sdks.python;
+
   pulumi-command = pkgs.pulumiPackages.pulumi-command.sdks.python;
+
   pulumi-hcloud = pkgs.pulumiPackages.pulumi-hcloud.sdks.python;
+
   pulumi-random = pkgs.pulumiPackages.pulumi-random.sdks.python;
+
   pure-cdb = callPackage ../development/python-modules/pure-cdb { };
+
   pure-eval = callPackage ../development/python-modules/pure-eval { };
+
   pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { };
+
   pure-protobuf = callPackage ../development/python-modules/pure-protobuf { };
+
   pure-python-adb = callPackage ../development/python-modules/pure-python-adb { };
+
   pure-python-adb-homeassistant =
     callPackage ../development/python-modules/pure-python-adb-homeassistant
       { };
+
   pure-sasl = callPackage ../development/python-modules/pure-sasl { };
+
   puremagic = callPackage ../development/python-modules/puremagic { };
+
   purepng = callPackage ../development/python-modules/purepng { };
+
   purl = callPackage ../development/python-modules/purl { };
+
   pushbullet-py = callPackage ../development/python-modules/pushbullet-py { };
+
   pushover-complete = callPackage ../development/python-modules/pushover-complete { };
+
   pvextractor = callPackage ../development/python-modules/pvextractor { };
+
   pvlib = callPackage ../development/python-modules/pvlib { };
+
   pvo = callPackage ../development/python-modules/pvo { };
+
   pwdlib = callPackage ../development/python-modules/pwdlib { };
+
   pweave = callPackage ../development/python-modules/pweave { };
+
   pwinput = callPackage ../development/python-modules/pwinput { };
+
   pwkit = callPackage ../development/python-modules/pwkit { };
+
   pwlf = callPackage ../development/python-modules/pwlf { };
+
   pwntools = callPackage ../development/python-modules/pwntools { debugger = pkgs.gdb; };
+
   py = callPackage ../development/python-modules/py { };
+
   py-air-control = callPackage ../development/python-modules/py-air-control { };
+
   py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { };
+
   py-aosmith = callPackage ../development/python-modules/py-aosmith { };
+
   py-bip39-bindings = callPackage ../development/python-modules/py-bip39-bindings { };
+
   py-canary = callPackage ../development/python-modules/py-canary { };
+
   py-ccm15 = callPackage ../development/python-modules/py-ccm15 { };
+
   py-cid = callPackage ../development/python-modules/py-cid { };
+
   py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { };
+
   py-dactyl = callPackage ../development/python-modules/py-dactyl { };
+
   py-datastruct = callPackage ../development/python-modules/py-datastruct { };
+
   py-deprecate = callPackage ../development/python-modules/py-deprecate { };
+
   py-desmume = callPackage ../development/python-modules/py-desmume {
     inherit (pkgs) libpcap; # Avoid confusion with python package of the same name
   };
+
   py-deviceid = callPackage ../development/python-modules/py-deviceid { };
+
   py-dmidecode = callPackage ../development/python-modules/py-dmidecode { };
+
   py-dormakaba-dkey = callPackage ../development/python-modules/py-dormakaba-dkey { };
+
   py-ecc = callPackage ../development/python-modules/py-ecc { };
+
   py-eth-sig-utils = callPackage ../development/python-modules/py-eth-sig-utils { };
+
   py-evm = callPackage ../development/python-modules/py-evm { };
+
   py-expression-eval = callPackage ../development/python-modules/py-expression-eval { };
+
   py-improv-ble-client = callPackage ../development/python-modules/py-improv-ble-client { };
+
   py-libnuma = callPackage ../development/python-modules/py-libnuma { };
+
   py-libzfs = callPackage ../development/python-modules/py-libzfs { };
+
   py-lru-cache = callPackage ../development/python-modules/py-lru-cache { };
+
   py-machineid = callPackage ../development/python-modules/py-machineid { };
+
   py-madvr2 = callPackage ../development/python-modules/py-madvr2 { };
+
   py-melissa-climate = callPackage ../development/python-modules/py-melissa-climate { };
+
   py-multiaddr = callPackage ../development/python-modules/py-multiaddr { };
+
   py-multibase = callPackage ../development/python-modules/py-multibase { };
+
   py-multicodec = callPackage ../development/python-modules/py-multicodec { };
+
   py-multihash = callPackage ../development/python-modules/py-multihash { };
+
   py-nextbusnext = callPackage ../development/python-modules/py-nextbusnext { };
+
   py-nightscout = callPackage ../development/python-modules/py-nightscout { };
+
   py-ocsf-models = callPackage ../development/python-modules/py-ocsf-models { };
+
   py-opensonic = callPackage ../development/python-modules/py-opensonic { };
+
   py-partiql-parser = callPackage ../development/python-modules/py-partiql-parser { };
+
   py-pdf-parser = callPackage ../development/python-modules/py-pdf-parser { };
+
   py-radix-sr = callPackage ../development/python-modules/py-radix-sr { };
+
   py-rust-stemmers = callPackage ../development/python-modules/py-rust-stemmers { };
+
   py-schluter = callPackage ../development/python-modules/py-schluter { };
+
   py-serializable = callPackage ../development/python-modules/py-serializable { };
+
   py-slvs = callPackage ../development/python-modules/py-slvs { };
+
   py-sneakers = callPackage ../development/python-modules/py-sneakers { };
+
   py-sonic = callPackage ../development/python-modules/py-sonic { };
+
   py-sr25519-bindings = callPackage ../development/python-modules/py-sr25519-bindings { };
+
   py-stringmatching = callPackage ../development/python-modules/py-stringmatching { };
+
   py-sucks = callPackage ../development/python-modules/py-sucks { };
+
   py-synologydsm-api = callPackage ../development/python-modules/py-synologydsm-api { };
+
   py-tes = callPackage ../development/python-modules/py-tes { };
+
   py-ubjson = callPackage ../development/python-modules/py-ubjson { };
+
   py-vapid = callPackage ../development/python-modules/py-vapid { };
+
   py-zabbix = callPackage ../development/python-modules/py-zabbix { };
+
   py2bit = callPackage ../development/python-modules/py2bit { };
+
   py2vega = callPackage ../development/python-modules/py2vega { };
+
   py3amf = callPackage ../development/python-modules/py3amf { };
+
   py3buddy = callPackage ../development/python-modules/py3buddy { };
+
   py3dns = callPackage ../development/python-modules/py3dns { };
+
   py3exiv2 = callPackage ../development/python-modules/py3exiv2 { inherit (pkgs) exiv2; };
+
   py3langid = callPackage ../development/python-modules/py3langid { };
+
   py3nvml = callPackage ../development/python-modules/py3nvml { };
+
   py3rijndael = callPackage ../development/python-modules/py3rijndael { };
+
   py3status = callPackage ../development/python-modules/py3status { };
+
   py4j = callPackage ../development/python-modules/py4j { };
+
   py65 = callPackage ../development/python-modules/py65 { };
+
   py7zr = callPackage ../development/python-modules/py7zr { };
+
   pyabpoa = toPythonModule (
     pkgs.abpoa.override {
       enablePython = true;
       python3Packages = self;
     }
   );
+
   pyacaia-async = callPackage ../development/python-modules/pyacaia-async { };
+
   pyacoustid = callPackage ../development/python-modules/pyacoustid { };
+
   pyadjoint-ad = callPackage ../development/python-modules/pyadjoint-ad { };
+
   pyads = callPackage ../development/python-modules/pyads { };
+
   pyaehw4a1 = callPackage ../development/python-modules/pyaehw4a1 { };
+
   pyaes = callPackage ../development/python-modules/pyaes { };
+
   pyaftership = callPackage ../development/python-modules/pyaftership { };
+
   pyahocorasick = callPackage ../development/python-modules/pyahocorasick { };
+
   pyairnow = callPackage ../development/python-modules/pyairnow { };
+
   pyairports = callPackage ../development/python-modules/pyairports { };
+
   pyairvisual = callPackage ../development/python-modules/pyairvisual { };
+
   pyais = callPackage ../development/python-modules/pyais { };
+
   pyalgotrade = callPackage ../development/python-modules/pyalgotrade { };
+
   pyalsaaudio = callPackage ../development/python-modules/pyalsaaudio { };
+
   pyamg = callPackage ../development/python-modules/pyamg { };
+
   pyaml = callPackage ../development/python-modules/pyaml { };
+
   pyaml-env = callPackage ../development/python-modules/pyaml-env { };
+
   pyannotate = callPackage ../development/python-modules/pyannotate { };
+
   pyannote-audio = callPackage ../development/python-modules/pyannote-audio { };
+
   pyannote-core = callPackage ../development/python-modules/pyannote-core { };
+
   pyannote-database = callPackage ../development/python-modules/pyannote-database { };
+
   pyannote-metrics = callPackage ../development/python-modules/pyannote-metrics { };
+
   pyannote-pipeline = callPackage ../development/python-modules/pyannote-pipeline { };
+
   pyaprilaire = callPackage ../development/python-modules/pyaprilaire { };
+
   pyarlo = callPackage ../development/python-modules/pyarlo { };
+
   pyarr = callPackage ../development/python-modules/pyarr { };
+
   pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake; };
+
   pyarrow-hotfix = callPackage ../development/python-modules/pyarrow-hotfix { };
+
   pyasn = callPackage ../development/python-modules/pyasn { };
+
   pyasn1 = callPackage ../development/python-modules/pyasn1 { };
+
   pyasn1-modules = callPackage ../development/python-modules/pyasn1-modules { };
+
   pyasuswrt = callPackage ../development/python-modules/pyasuswrt { };
+
   pyasynchat = callPackage ../development/python-modules/pyasynchat { };
+
   pyasyncore = callPackage ../development/python-modules/pyasyncore { };
+
   pyatag = callPackage ../development/python-modules/pyatag { };
+
   pyatem = callPackage ../development/python-modules/pyatem { };
+
   pyathena = callPackage ../development/python-modules/pyathena { };
+
   pyatmo = callPackage ../development/python-modules/pyatmo { };
+
   pyatome = callPackage ../development/python-modules/pyatome { };
+
   pyatspi = callPackage ../development/python-modules/pyatspi { };
+
   pyatv = callPackage ../development/python-modules/pyatv { };
+
   pyaudio = callPackage ../development/python-modules/pyaudio { };
+
   pyaussiebb = callPackage ../development/python-modules/pyaussiebb { };
+
   pyautogui = callPackage ../development/python-modules/pyautogui { };
+
   pyavm = callPackage ../development/python-modules/pyavm { };
+
   pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { };
+
   pybalboa = callPackage ../development/python-modules/pybalboa { };
+
   pybars3 = callPackage ../development/python-modules/pybars3 { };
+
   pybase64 = callPackage ../development/python-modules/pybase64 { };
+
   pybbox = callPackage ../development/python-modules/pybbox { };
+
   pybcj = callPackage ../development/python-modules/pybcj { };
+
   pybids = callPackage ../development/python-modules/pybids { };
+
   pybigwig = callPackage ../development/python-modules/pybigwig { };
+
   pybind11 = callPackage ../development/python-modules/pybind11 { };
+
   pybind11-abseil = callPackage ../development/python-modules/pybind11-abseil { };
+
   pybind11-protobuf = callPackage ../development/python-modules/pybind11-protobuf { };
+
   pybind11-stubgen = callPackage ../development/python-modules/pybind11-stubgen { };
+
   pybindgen = callPackage ../development/python-modules/pybindgen { };
+
   pyblackbird = callPackage ../development/python-modules/pyblackbird { };
+
   pybloom-live = callPackage ../development/python-modules/pybloom-live { };
+
   pyblu = callPackage ../development/python-modules/pyblu { };
+
   pybluez = callPackage ../development/python-modules/pybluez { inherit (pkgs) bluez; };
+
   pybotvac = callPackage ../development/python-modules/pybotvac { };
+
   pybox2d = callPackage ../development/python-modules/pybox2d { };
+
   pybravia = callPackage ../development/python-modules/pybravia { };
+
   pybrowserid = callPackage ../development/python-modules/pybrowserid { };
+
   pybrowsers = callPackage ../development/python-modules/pybrowsers { };
+
   pybtex = callPackage ../development/python-modules/pybtex { };
+
   pybtex-docutils = callPackage ../development/python-modules/pybtex-docutils { };
+
   pybullet = callPackage ../development/python-modules/pybullet { };
+
   pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs.buildPackages) meson; };
+
   pycangjie = callPackage ../development/python-modules/pycangjie {
     inherit (pkgs.buildPackages) meson;
   };
+
   pycapnp = callPackage ../development/python-modules/pycapnp { };
+
   pycaption = callPackage ../development/python-modules/pycaption { };
+
   pycardano = callPackage ../development/python-modules/pycardano { };
+
   pycares = callPackage ../development/python-modules/pycares { };
+
   pycarwings2 = callPackage ../development/python-modules/pycarwings2 { };
+
   pycasbin = callPackage ../development/python-modules/pycasbin { };
+
   pycatch22 = callPackage ../development/python-modules/pycatch22 { };
+
   pycategories = callPackage ../development/python-modules/pycategories { };
+
   pycayennelpp = callPackage ../development/python-modules/pycayennelpp { };
+
   pycddl = callPackage ../development/python-modules/pycddl { };
+
   pycdio = callPackage ../development/python-modules/pycdio { };
+
   pycec = callPackage ../development/python-modules/pycec { };
+
   pycep-parser = callPackage ../development/python-modules/pycep-parser { };
+
   pycfdns = callPackage ../development/python-modules/pycfdns { };
+
   pycflow2dot = callPackage ../development/python-modules/pycflow2dot { inherit (pkgs) graphviz; };
+
   pycfmodel = callPackage ../development/python-modules/pycfmodel { };
+
   pychannels = callPackage ../development/python-modules/pychannels { };
+
   pychm = callPackage ../development/python-modules/pychm { };
+
   pychromecast = callPackage ../development/python-modules/pychromecast { };
+
   pycketcasts = callPackage ../development/python-modules/pycketcasts { };
+
   pyclimacell = callPackage ../development/python-modules/pyclimacell { };
+
   pyclip = callPackage ../development/python-modules/pyclip { };
+
   pyclipper = callPackage ../development/python-modules/pyclipper { };
+
   pycm = callPackage ../development/python-modules/pycm { };
+
   pycmarkgfm = callPackage ../development/python-modules/pycmarkgfm { };
+
   pycocotools = callPackage ../development/python-modules/pycocotools { };
+
   pycodestyle = callPackage ../development/python-modules/pycodestyle { };
+
   pycognito = callPackage ../development/python-modules/pycognito { };
+
   pycoin = callPackage ../development/python-modules/pycoin { };
+
   pycollada = callPackage ../development/python-modules/pycollada { };
+
   pycolorecho = callPackage ../development/python-modules/pycolorecho { };
+
   pycomfoconnect = callPackage ../development/python-modules/pycomfoconnect { };
+
   pycomm3 = callPackage ../development/python-modules/pycomm3 { };
+
   pycompliance = callPackage ../development/python-modules/pycompliance { };
+
   pycomposefile = callPackage ../development/python-modules/pycomposefile { };
+
   pycontrol4 = callPackage ../development/python-modules/pycontrol4 { };
+
   pycookiecheat = callPackage ../development/python-modules/pycookiecheat { };
+
   pycoolmasternet-async = callPackage ../development/python-modules/pycoolmasternet-async { };
+
   pycosat = callPackage ../development/python-modules/pycosat { };
+
   pycotap = callPackage ../development/python-modules/pycotap { };
+
   pycountry = callPackage ../development/python-modules/pycountry { };
+
   pycountry-convert = callPackage ../development/python-modules/pycountry-convert { };
+
   pycparser = callPackage ../development/python-modules/pycparser { };
+
   pycrc = callPackage ../development/python-modules/pycrc { };
+
   pycrdt = callPackage ../development/python-modules/pycrdt { };
+
   pycrdt-websocket = callPackage ../development/python-modules/pycrdt-websocket { };
+
   pycritty = callPackage ../development/python-modules/pycritty { };
+
   pycron = callPackage ../development/python-modules/pycron { };
+
   pycrypto = callPackage ../development/python-modules/pycrypto { };
+
   pycryptodome = callPackage ../development/python-modules/pycryptodome { };
+
   pycryptodomex = callPackage ../development/python-modules/pycryptodomex { };
+
   pycsdr = callPackage ../development/python-modules/pycsdr { };
+
   pycsspeechtts = callPackage ../development/python-modules/pycsspeechtts { };
+
   pyct = callPackage ../development/python-modules/pyct { };
+
   pyctr = callPackage ../development/python-modules/pyctr { };
+
   pycuda = callPackage ../development/python-modules/pycuda { inherit (pkgs.stdenv) mkDerivation; };
+
   pycups = callPackage ../development/python-modules/pycups { };
+
   pycurl = callPackage ../development/python-modules/pycurl { };
+
   pycxx = callPackage ../development/python-modules/pycxx { };
+
   pycycling = callPackage ../development/python-modules/pycycling { };
+
   pycyphal = callPackage ../development/python-modules/pycyphal { };
+
   pydaikin = callPackage ../development/python-modules/pydaikin { };
+
   pydal = callPackage ../development/python-modules/pydal { };
+
   pydanfossair = callPackage ../development/python-modules/pydanfossair { };
+
   pydantic = callPackage ../development/python-modules/pydantic { };
+
   pydantic-argparse-extensible =
     callPackage ../development/python-modules/pydantic-argparse-extensible
       { };
+
   pydantic-compat = callPackage ../development/python-modules/pydantic-compat { };
+
   pydantic-core = callPackage ../development/python-modules/pydantic-core { };
+
   pydantic-extra-types = callPackage ../development/python-modules/pydantic-extra-types { };
+
   pydantic-scim = callPackage ../development/python-modules/pydantic-scim { };
+
   pydantic-settings = callPackage ../development/python-modules/pydantic-settings { };
+
   pydantic-yaml = callPackage ../development/python-modules/pydantic-yaml { };
+
   pydantic_1 = callPackage ../development/python-modules/pydantic/1.nix { };
+
   pydash = callPackage ../development/python-modules/pydash { };
+
   pydata-google-auth = callPackage ../development/python-modules/pydata-google-auth { };
+
   pydata-sphinx-theme = callPackage ../development/python-modules/pydata-sphinx-theme { };
+
   pydateinfer = callPackage ../development/python-modules/pydateinfer { };
+
   pydbus = callPackage ../development/python-modules/pydbus { };
+
   pydeako = callPackage ../development/python-modules/pydeako { };
+
   pydeck = callPackage ../development/python-modules/pydeck { };
+
   pydeconz = callPackage ../development/python-modules/pydeconz { };
+
   pydelijn = callPackage ../development/python-modules/pydelijn { };
+
   pydemumble = callPackage ../development/python-modules/pydemumble { };
+
   pydenticon = callPackage ../development/python-modules/pydenticon { };
+
   pydeps = callPackage ../development/python-modules/pydeps { inherit (pkgs) graphviz; };
+
   pydes = callPackage ../development/python-modules/pydes { };
+
   pydevccu = callPackage ../development/python-modules/pydevccu { };
+
   pydevd = callPackage ../development/python-modules/pydevd { };
+
   pydevtool = callPackage ../development/python-modules/pydevtool { };
+
   pydexcom = callPackage ../development/python-modules/pydexcom { };
+
   pydicom = callPackage ../development/python-modules/pydicom { };
+
   pydicom-seg = callPackage ../development/python-modules/pydicom-seg { };
+
   pydiffx = callPackage ../development/python-modules/pydiffx { };
+
   pydigiham = callPackage ../development/python-modules/pydigiham { };
+
   pydiscourse = callPackage ../development/python-modules/pydiscourse { };
+
   pydiscovergy = callPackage ../development/python-modules/pydiscovergy { };
+
   pydispatcher = callPackage ../development/python-modules/pydispatcher { };
+
   pydmd = callPackage ../development/python-modules/pydmd { };
+
   pydocstyle = callPackage ../development/python-modules/pydocstyle { };
+
   pydocumentdb = callPackage ../development/python-modules/pydocumentdb { };
+
   pydoe = callPackage ../development/python-modules/pydoe { };
+
   pydoods = callPackage ../development/python-modules/pydoods { };
+
   pydot = callPackage ../development/python-modules/pydot { inherit (pkgs) graphviz; };
+
   pydrawise = callPackage ../development/python-modules/pydrawise { };
+
   pydrive2 = callPackage ../development/python-modules/pydrive2 { };
+
   pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { };
+
   pydruid = callPackage ../development/python-modules/pydruid { };
+
   pydsdl = callPackage ../development/python-modules/pydsdl { };
+
   pydub = callPackage ../development/python-modules/pydub { };
+
   pyduke-energy = callPackage ../development/python-modules/pyduke-energy { };
+
   pyduotecno = callPackage ../development/python-modules/pyduotecno { };
+
   pydy = callPackage ../development/python-modules/pydy { };
+
   pydyf = callPackage ../development/python-modules/pydyf { };
+
   pyeapi = callPackage ../development/python-modules/pyeapi { };
+
   pyebus = callPackage ../development/python-modules/pyebus { };
+
   pyecharts = callPackage ../development/python-modules/pyecharts { };
+
   pyechonest = callPackage ../development/python-modules/pyechonest { };
+
   pyeclib = callPackage ../development/python-modules/pyeclib { };
+
   pyecoforest = callPackage ../development/python-modules/pyecoforest { };
+
   pyeconet = callPackage ../development/python-modules/pyeconet { };
+
   pyecotrend-ista = callPackage ../development/python-modules/pyecotrend-ista { };
+
   pyecowitt = callPackage ../development/python-modules/pyecowitt { };
+
   pyedflib = callPackage ../development/python-modules/pyedflib { };
+
   pyedimax = callPackage ../development/python-modules/pyedimax { };
+
   pyee = callPackage ../development/python-modules/pyee { };
+
   pyefergy = callPackage ../development/python-modules/pyefergy { };
+
   pyegps = callPackage ../development/python-modules/pyegps { };
+
   pyeight = callPackage ../development/python-modules/pyeight { };
+
   pyeiscp = callPackage ../development/python-modules/pyeiscp { };
+
   pyelectra = callPackage ../development/python-modules/pyelectra { };
+
   pyelftools = callPackage ../development/python-modules/pyelftools { };
+
   pyembroidery = callPackage ../development/python-modules/pyembroidery { };
+
   pyemby = callPackage ../development/python-modules/pyemby { };
+
   pyemd = callPackage ../development/python-modules/pyemd { };
+
   pyemoncms = callPackage ../development/python-modules/pyemoncms { };
+
   pyemvue = callPackage ../development/python-modules/pyemvue { };
+
   pyenchant = callPackage ../development/python-modules/pyenchant { inherit (pkgs) enchant2; };
+
   pyenphase = callPackage ../development/python-modules/pyenphase { };
+
   pyenvisalink = callPackage ../development/python-modules/pyenvisalink { };
+
   pyephember2 = callPackage ../development/python-modules/pyephember2 { };
+
   pyepsg = callPackage ../development/python-modules/pyepsg { };
+
   pyerfa = callPackage ../development/python-modules/pyerfa { };
+
   pyeverlights = callPackage ../development/python-modules/pyeverlights { };
+
   pyevilgenius = callPackage ../development/python-modules/pyevilgenius { };
+
   pyevmasm = callPackage ../development/python-modules/pyevmasm { };
+
   pyevtk = callPackage ../development/python-modules/pyevtk { };
+
   pyexcel = callPackage ../development/python-modules/pyexcel { };
+
   pyexcel-io = callPackage ../development/python-modules/pyexcel-io { };
+
   pyexcel-ods = callPackage ../development/python-modules/pyexcel-ods { };
+
   pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { };
+
   pyexiftool = callPackage ../development/python-modules/pyexiftool { };
+
   pyexpect = callPackage ../development/python-modules/pyexpect { };
+
   pyexploitdb = callPackage ../development/python-modules/pyexploitdb { };
+
   pyezvizapi = callPackage ../development/python-modules/pyezvizapi { };
+
   pyface = callPackage ../development/python-modules/pyface { };
+
   pyfaidx = callPackage ../development/python-modules/pyfaidx { };
+
   pyfakefs = callPackage ../development/python-modules/pyfakefs { };
+
   pyfakewebcam = callPackage ../development/python-modules/pyfakewebcam { };
+
   pyfatfs = callPackage ../development/python-modules/pyfatfs { };
+
   pyfcm = callPackage ../development/python-modules/pyfcm { };
+
   pyfdt = callPackage ../development/python-modules/pyfdt { };
+
   pyfibaro = callPackage ../development/python-modules/pyfibaro { };
+
   pyfido = callPackage ../development/python-modules/pyfido { };
+
   pyfiglet = callPackage ../development/python-modules/pyfiglet { };
+
   pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { };
+
   pyflakes = callPackage ../development/python-modules/pyflakes { };
+
   pyflexit = callPackage ../development/python-modules/pyflexit { };
+
   pyflic = callPackage ../development/python-modules/pyflic { };
+
   pyflick = callPackage ../development/python-modules/pyflick { };
+
   pyflipper = callPackage ../development/python-modules/pyflipper { };
+
   pyfluidsynth = callPackage ../development/python-modules/pyfluidsynth { };
+
   pyflume = callPackage ../development/python-modules/pyflume { };
+
   pyfma = callPackage ../development/python-modules/pyfma { };
+
   pyfnip = callPackage ../development/python-modules/pyfnip { };
+
   pyforked-daapd = callPackage ../development/python-modules/pyforked-daapd { };
+
   pyformlang = callPackage ../development/python-modules/pyformlang { };
+
   pyfreedompro = callPackage ../development/python-modules/pyfreedompro { };
+
   pyfribidi = callPackage ../development/python-modules/pyfribidi { };
+
   pyfritzhome = callPackage ../development/python-modules/pyfritzhome { };
+
   pyfronius = callPackage ../development/python-modules/pyfronius { };
+
   pyftdi = callPackage ../development/python-modules/pyftdi { };
+
   pyftgl = callPackage ../development/python-modules/pyftgl { };
+
   pyftpdlib = callPackage ../development/python-modules/pyftpdlib { };
+
   pyfttt = callPackage ../development/python-modules/pyfttt { };
+
   pyfume = callPackage ../development/python-modules/pyfume { };
+
   pyfunctional = callPackage ../development/python-modules/pyfunctional { };
+
   pyfuse3 = callPackage ../development/python-modules/pyfuse3 { };
+
   pyfwup = callPackage ../development/python-modules/pyfwup { inherit (pkgs) libusb1; };
+
   pyfxa = callPackage ../development/python-modules/pyfxa { };
+
   pyfzf = callPackage ../development/python-modules/pyfzf { inherit (pkgs) fzf; };
+
   pygal = callPackage ../development/python-modules/pygal { };
+
   pygame = callPackage ../development/python-modules/pygame { };
+
   pygame-ce = callPackage ../development/python-modules/pygame-ce { };
+
   pygame-gui = callPackage ../development/python-modules/pygame-gui { };
+
   pygame-sdl2 = callPackage ../development/python-modules/pygame-sdl2 { };
+
   pygatt = callPackage ../development/python-modules/pygatt { };
+
   pygccxml = callPackage ../development/python-modules/pygccxml { };
+
   pygdbmi = callPackage ../development/python-modules/pygdbmi { };
+
   pygelf = callPackage ../development/python-modules/pygelf { };
+
   pygeocodio = callPackage ../development/python-modules/pygeocodio { };
+
   pygerber = callPackage ../development/python-modules/pygerber { };
+
   pygetwindow = callPackage ../development/python-modules/pygetwindow { };
+
   pyghmi = callPackage ../development/python-modules/pyghmi { };
+
   pygit2 = callPackage ../development/python-modules/pygit2 { };
+
   pygitguardian = callPackage ../development/python-modules/pygitguardian { };
+
   pygithub = callPackage ../development/python-modules/pygithub { };
+
   pyglet = callPackage ../development/python-modules/pyglet { };
+
   pyglm = callPackage ../development/python-modules/pyglm { };
+
   pygls = callPackage ../development/python-modules/pygls { };
+
   pygltflib = callPackage ../development/python-modules/pygltflib { };
+
   pygmars = callPackage ../development/python-modules/pygmars { };
+
   pygments = callPackage ../development/python-modules/pygments { };
+
   pygments-better-html = callPackage ../development/python-modules/pygments-better-html { };
+
   pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { };
+
   pygments-style-github = callPackage ../development/python-modules/pygments-style-github { };
+
   pygmo = callPackage ../development/python-modules/pygmo { };
+
   pygmt = callPackage ../development/python-modules/pygmt { };
+
   pygnmi = callPackage ../development/python-modules/pygnmi { };
+
   pygobject-stubs = callPackage ../development/python-modules/pygobject-stubs { };
+
   pygobject3 = callPackage ../development/python-modules/pygobject/3.nix {
     # inherit (pkgs) meson won't work because it won't be spliced
     inherit (pkgs.buildPackages) meson;
   };
+
   pygount = callPackage ../development/python-modules/pygount { };
+
   pygpgme = callPackage ../development/python-modules/pygpgme { };
+
   pygraphviz = callPackage ../development/python-modules/pygraphviz { inherit (pkgs) graphviz; };
+
   pygreat = callPackage ../development/python-modules/pygreat { };
+
   pygrok = callPackage ../development/python-modules/pygrok { };
+
   pygsl = callPackage ../development/python-modules/pygsl { inherit (pkgs) gsl swig; };
+
   pygtail = callPackage ../development/python-modules/pygtail { };
+
   pygtfs = callPackage ../development/python-modules/pygtfs { };
+
   pygti = callPackage ../development/python-modules/pygti { };
+
   pygtkspellcheck = callPackage ../development/python-modules/pygtkspellcheck { };
+
   pygtrie = callPackage ../development/python-modules/pygtrie { };
+
   pyhamcrest = callPackage ../development/python-modules/pyhamcrest { };
+
   pyhanko = callPackage ../development/python-modules/pyhanko { };
+
   pyhanko-certvalidator = callPackage ../development/python-modules/pyhanko-certvalidator { };
+
   pyhaversion = callPackage ../development/python-modules/pyhaversion { };
+
   pyhcl = callPackage ../development/python-modules/pyhcl { };
+
   pyheck = callPackage ../development/python-modules/pyheck { };
+
   pyheif = callPackage ../development/python-modules/pyheif { };
+
   pyheos = callPackage ../development/python-modules/pyheos { };
+
   pyhepmc = callPackage ../development/python-modules/pyhepmc { };
+
   pyhidra = callPackage ../development/python-modules/pyhidra { };
+
   pyhik = callPackage ../development/python-modules/pyhik { };
+
   pyhive-integration = callPackage ../development/python-modules/pyhive-integration { };
+
   pyhocon = callPackage ../development/python-modules/pyhocon { };
+
   pyhomee = callPackage ../development/python-modules/pyhomee { };
+
   pyhomematic = callPackage ../development/python-modules/pyhomematic { };
+
   pyhomepilot = callPackage ../development/python-modules/pyhomepilot { };
+
   pyhomeworks = callPackage ../development/python-modules/pyhomeworks { };
+
   pyhumps = callPackage ../development/python-modules/pyhumps { };
+
   pyi2cflash = callPackage ../development/python-modules/pyi2cflash { };
+
   pyialarm = callPackage ../development/python-modules/pyialarm { };
+
   pyiceberg = callPackage ../development/python-modules/pyiceberg { };
+
   pyicloud = callPackage ../development/python-modules/pyicloud { };
+
   pyicu = callPackage ../development/python-modules/pyicu { };
+
   pyicumessageformat = callPackage ../development/python-modules/pyicumessageformat { };
+
   pyimgbox = callPackage ../development/python-modules/pyimgbox { };
+
   pyimpfuzzy = callPackage ../development/python-modules/pyimpfuzzy { inherit (pkgs) ssdeep; };
+
   pyindego = callPackage ../development/python-modules/pyindego { };
+
   pyinfra = callPackage ../development/python-modules/pyinfra { };
+
   pyinotify = callPackage ../development/python-modules/pyinotify { };
+
   pyinputevent = callPackage ../development/python-modules/pyinputevent { };
+
   pyinstaller = callPackage ../development/python-modules/pyinstaller { };
+
   pyinstaller-hooks-contrib = callPackage ../development/python-modules/pyinstaller-hooks-contrib { };
+
   pyinstaller-versionfile = callPackage ../development/python-modules/pyinstaller-versionfile { };
+
   pyinsteon = callPackage ../development/python-modules/pyinsteon { };
+
   pyinstrument = callPackage ../development/python-modules/pyinstrument { };
+
   pyintesishome = callPackage ../development/python-modules/pyintesishome { };
+
   pyipma = callPackage ../development/python-modules/pyipma { };
+
   pyipp = callPackage ../development/python-modules/pyipp { };
+
   pyipv8 = callPackage ../development/python-modules/pyipv8 { };
+
   pyiqvia = callPackage ../development/python-modules/pyiqvia { };
+
   pyisbn = callPackage ../development/python-modules/pyisbn { };
+
   pyisemail = callPackage ../development/python-modules/pyisemail { };
+
   pyiskra = callPackage ../development/python-modules/pyiskra { };
+
   pyiss = callPackage ../development/python-modules/pyiss { };
+
   pyisy = callPackage ../development/python-modules/pyisy { };
+
   pyitachip2ir = callPackage ../development/python-modules/pyitachip2ir { };
+
   pyituran = callPackage ../development/python-modules/pyituran { };
+
   pyixapi = callPackage ../development/python-modules/pyixapi { };
+
   pyjks = callPackage ../development/python-modules/pyjks { };
+
   pyjnius = callPackage ../development/python-modules/pyjnius { };
+
   pyjson5 = callPackage ../development/python-modules/pyjson5 { };
+
   pyjsparser = callPackage ../development/python-modules/pyjsparser { };
+
   pyjvcprojector = callPackage ../development/python-modules/pyjvcprojector { };
+
   pyjwkest = callPackage ../development/python-modules/pyjwkest { };
+
   pyjwt = callPackage ../development/python-modules/pyjwt { };
+
   pykakasi = callPackage ../development/python-modules/pykakasi { };
+
   pykaleidescape = callPackage ../development/python-modules/pykaleidescape { };
+
   pykalman = callPackage ../development/python-modules/pykalman { };
+
   pykcs11 = callPackage ../development/python-modules/pykcs11 { };
+
   pykdl = callPackage ../development/python-modules/pykdl { };
+
   pykdtree = callPackage ../development/python-modules/pykdtree {
     inherit (pkgs.llvmPackages) openmp;
   };
+
   pykeepass = callPackage ../development/python-modules/pykeepass { };
+
   pykerberos = callPackage ../development/python-modules/pykerberos { krb5-c = pkgs.krb5; };
+
   pykeyatome = callPackage ../development/python-modules/pykeyatome { };
+
   pykira = callPackage ../development/python-modules/pykira { };
+
   pykka = callPackage ../development/python-modules/pykka { };
+
   pykmtronic = callPackage ../development/python-modules/pykmtronic { };
+
   pykodi = callPackage ../development/python-modules/pykodi { };
+
   pykoplenti = callPackage ../development/python-modules/pykoplenti { };
+
   pykostalpiko = callPackage ../development/python-modules/pykostalpiko { };
+
   pykrakenapi = callPackage ../development/python-modules/pykrakenapi { };
+
   pykrige = callPackage ../development/python-modules/pykrige { };
+
   pykulersky = callPackage ../development/python-modules/pykulersky { };
+
   pykwalify = callPackage ../development/python-modules/pykwalify { };
+
   pykwb = callPackage ../development/python-modules/pykwb { };
+
   pylacrosse = callPackage ../development/python-modules/pylacrosse { };
+
   pylacus = callPackage ../development/python-modules/pylacus { };
+
   pylama = callPackage ../development/python-modules/pylama { };
+
   pylamarzocco = callPackage ../development/python-modules/pylamarzocco { };
+
   pylance = callPackage ../development/python-modules/pylance { };
+
   pylast = callPackage ../development/python-modules/pylast { };
+
   pylatex = callPackage ../development/python-modules/pylatex { };
+
   pylatexenc = callPackage ../development/python-modules/pylatexenc { };
+
   pylaunches = callPackage ../development/python-modules/pylaunches { };
+
   pyld = callPackage ../development/python-modules/pyld { };
+
   pyldavis = callPackage ../development/python-modules/pyldavis { };
+
   pylddwrap = callPackage ../development/python-modules/pylddwrap { };
+
   pyleri = callPackage ../development/python-modules/pyleri { };
+
   pylette = callPackage ../development/python-modules/pylette { };
+
   pylev = callPackage ../development/python-modules/pylev { };
+
   pylgnetcast = callPackage ../development/python-modules/pylgnetcast { };
+
   pylibacl = callPackage ../development/python-modules/pylibacl { };
+
   pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { };
+
   pylibdmtx = callPackage ../development/python-modules/pylibdmtx { };
+
   pylibftdi = callPackage ../development/python-modules/pylibftdi { inherit (pkgs) libusb1; };
+
   pylibjpeg = callPackage ../development/python-modules/pylibjpeg { };
+
   pylibjpeg-data = callPackage ../development/python-modules/pylibjpeg-data { };
+
   pylibjpeg-libjpeg = callPackage ../development/python-modules/pylibjpeg-libjpeg { };
+
   pylibjpeg-openjpeg = callPackage ../development/python-modules/pylibjpeg-openjpeg { };
+
   pyliblo3 = callPackage ../development/python-modules/pyliblo3 { };
+
   pylibmc = callPackage ../development/python-modules/pylibmc { };
+
   pylibrespot-java = callPackage ../development/python-modules/pylibrespot-java { };
+
   pylink-square = callPackage ../development/python-modules/pylink-square { };
+
   pylint = callPackage ../development/python-modules/pylint { };
+
   pylint-celery = callPackage ../development/python-modules/pylint-celery { };
+
   pylint-django = callPackage ../development/python-modules/pylint-django { };
+
   pylint-flask = callPackage ../development/python-modules/pylint-flask { };
+
   pylint-odoo = callPackage ../development/python-modules/pylint-odoo { };
+
   pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { };
+
   pylint-venv = callPackage ../development/python-modules/pylint-venv { };
+
   pylion = callPackage ../development/python-modules/pylion { };
+
   pylit = callPackage ../development/python-modules/pylit { };
+
   pylitejet = callPackage ../development/python-modules/pylitejet { };
+
   pylitterbot = callPackage ../development/python-modules/pylitterbot { };
+
   pylnk3 = callPackage ../development/python-modules/pylnk3 { };
+
   pyloadapi = callPackage ../development/python-modules/pyloadapi { };
+
   pyloggermanager = callPackage ../development/python-modules/pyloggermanager { };
+
   pylpsd = callPackage ../development/python-modules/pylpsd { };
+
   pylru = callPackage ../development/python-modules/pylru { };
+
   pyls-flake8 = callPackage ../development/python-modules/pyls-flake8 { };
+
   pyls-isort = callPackage ../development/python-modules/pyls-isort { };
+
   pyls-memestra = callPackage ../development/python-modules/pyls-memestra { };
+
   pyls-spyder = callPackage ../development/python-modules/pyls-spyder { };
+
   pylsl = callPackage ../development/python-modules/pylsl { };
+
   pylsp-mypy = callPackage ../development/python-modules/pylsp-mypy { };
+
   pylsp-rope = callPackage ../development/python-modules/pylsp-rope { };
+
   pylsqpack = callPackage ../development/python-modules/pylsqpack { };
+
   pylutron = callPackage ../development/python-modules/pylutron { };
+
   pylutron-caseta = callPackage ../development/python-modules/pylutron-caseta { };
+
   pylxd = callPackage ../development/python-modules/pylxd { };
+
   pylyrics = callPackage ../development/python-modules/pylyrics { };
+
   pylzma = callPackage ../development/python-modules/pylzma { };
+
   pym3u8downloader = callPackage ../development/python-modules/pym3u8downloader { };
+
   pymacaroons = callPackage ../development/python-modules/pymacaroons { };
+
   pymailgunner = callPackage ../development/python-modules/pymailgunner { };
+
   pymanopt = callPackage ../development/python-modules/pymanopt { };
+
   pymarshal = callPackage ../development/python-modules/pymarshal { };
+
   pymata-express = callPackage ../development/python-modules/pymata-express { };
+
   pymatgen = callPackage ../development/python-modules/pymatgen { };
+
   pymatreader = callPackage ../development/python-modules/pymatreader { };
+
   pymatting = callPackage ../development/python-modules/pymatting { };
+
   pymaven-patch = callPackage ../development/python-modules/pymaven-patch { };
+
   pymavlink = callPackage ../development/python-modules/pymavlink { };
+
   pymbolic = callPackage ../development/python-modules/pymbolic { };
+
   pymc = callPackage ../development/python-modules/pymc { };
+
   pymdown-extensions = callPackage ../development/python-modules/pymdown-extensions { };
+
   pymdstat = callPackage ../development/python-modules/pymdstat { };
+
   pymediainfo = callPackage ../development/python-modules/pymediainfo { };
+
   pymediaroom = callPackage ../development/python-modules/pymediaroom { };
+
   pymedio = callPackage ../development/python-modules/pymedio { };
+
   pymee = callPackage ../development/python-modules/pymee { };
+
   pymeeus = callPackage ../development/python-modules/pymeeus { };
+
   pymemcache = callPackage ../development/python-modules/pymemcache { };
+
   pymemoize = callPackage ../development/python-modules/pymemoize { };
+
   pyment = callPackage ../development/python-modules/pyment { };
+
   pymeshlab = toPythonModule (pkgs.libsForQt5.callPackage ../applications/graphics/pymeshlab { });
+
   pymeta3 = callPackage ../development/python-modules/pymeta3 { };
+
   pymetar = callPackage ../development/python-modules/pymetar { };
+
   pymetasploit3 = callPackage ../development/python-modules/pymetasploit3 { };
+
   pymeteireann = callPackage ../development/python-modules/pymeteireann { };
+
   pymeteoclimatic = callPackage ../development/python-modules/pymeteoclimatic { };
+
   pymetno = callPackage ../development/python-modules/pymetno { };
+
   pymfy = callPackage ../development/python-modules/pymfy { };
+
   pymicro-vad = callPackage ../development/python-modules/pymicro-vad { };
+
   pymicrobot = callPackage ../development/python-modules/pymicrobot { };
+
   pymiele = callPackage ../development/python-modules/pymiele { };
+
   pymilter = callPackage ../development/python-modules/pymilter { };
+
   pymilvus = callPackage ../development/python-modules/pymilvus { };
+
   pymitsubishi = callPackage ../development/python-modules/pymitsubishi { };
+
   pymitv = callPackage ../development/python-modules/pymitv { };
+
   pymochad = callPackage ../development/python-modules/pymochad { };
+
   pymodbus = callPackage ../development/python-modules/pymodbus { };
+
   pymodbus-repl = callPackage ../development/python-modules/pymodbus-repl { };
+
   pymodes = callPackage ../development/python-modules/pymodes { };
+
   pymonctl = callPackage ../development/python-modules/pymonctl { };
+
   pymongo = callPackage ../development/python-modules/pymongo { };
+
   pymongo-inmemory = callPackage ../development/python-modules/pymongo-inmemory { };
+
   pymonoprice = callPackage ../development/python-modules/pymonoprice { };
+
   pymoo = callPackage ../development/python-modules/pymoo { };
+
   pymorphy2 = callPackage ../development/python-modules/pymorphy2 { };
+
   pymorphy2-dicts-ru = callPackage ../development/python-modules/pymorphy2/dicts-ru.nix { };
+
   pymorphy3 = callPackage ../development/python-modules/pymorphy3 { };
+
   pymorphy3-dicts-ru = callPackage ../development/python-modules/pymorphy3/dicts-ru.nix { };
+
   pymorphy3-dicts-uk = callPackage ../development/python-modules/pymorphy3/dicts-uk.nix { };
+
   pympler = callPackage ../development/python-modules/pympler { };
+
   pymsgbox = callPackage ../development/python-modules/pymsgbox { };
+
   pymssql = callPackage ../development/python-modules/pymssql { krb5-c = pkgs.krb5; };
+
   pymsteams = callPackage ../development/python-modules/pymsteams { };
+
   pymumble = callPackage ../development/python-modules/pymumble { };
+
   pymunk = callPackage ../development/python-modules/pymunk { };
+
   pymupdf = callPackage ../development/python-modules/pymupdf { };
+
   pymupdf-fonts = callPackage ../development/python-modules/pymupdf-fonts { };
+
   pymupdf4llm = callPackage ../development/python-modules/pymupdf4llm { };
+
   pymvglive = callPackage ../development/python-modules/pymvglive { };
+
   pymysensors = callPackage ../development/python-modules/pymysensors { };
+
   pymysql = callPackage ../development/python-modules/pymysql { };
+
   pymysqlsa = callPackage ../development/python-modules/pymysqlsa { };
+
   pymystem3 = callPackage ../development/python-modules/pymystem3 { };
+
   pynac = callPackage ../development/python-modules/pynac { };
+
   pynacl = callPackage ../development/python-modules/pynacl { };
+
   pynamecheap = callPackage ../development/python-modules/pynamecheap { };
+
   pynamodb = callPackage ../development/python-modules/pynamodb { };
+
   pynanoleaf = callPackage ../development/python-modules/pynanoleaf { };
+
   pync = callPackage ../development/python-modules/pync { inherit (pkgs) which; };
+
   pynecil = callPackage ../development/python-modules/pynecil { };
+
   pynello = callPackage ../development/python-modules/pynello { };
+
   pynest2d = callPackage ../development/python-modules/pynest2d { };
+
   pynetbox = callPackage ../development/python-modules/pynetbox { };
+
   pynetdicom = callPackage ../development/python-modules/pynetdicom { };
+
   pynetgear = callPackage ../development/python-modules/pynetgear { };
+
   pynetio = callPackage ../development/python-modules/pynetio { };
+
   pynfsclient = callPackage ../development/python-modules/pynfsclient { };
+
   pyngo = callPackage ../development/python-modules/pyngo { };
+
   pyngrok = callPackage ../development/python-modules/pyngrok { };
+
   pynina = callPackage ../development/python-modules/pynina { };
+
   pynipap = callPackage ../development/python-modules/pynipap { };
+
   pynisher = callPackage ../development/python-modules/pynisher { };
+
   pynitrokey = callPackage ../development/python-modules/pynitrokey { };
+
   pynmea2 = callPackage ../development/python-modules/pynmea2 { };
+
   pynmeagps = callPackage ../development/python-modules/pynmeagps { };
+
   pynndescent = callPackage ../development/python-modules/pynndescent { };
+
   pynng = callPackage ../development/python-modules/pynng { };
+
   pynobo = callPackage ../development/python-modules/pynobo { };
+
   pynordpool = callPackage ../development/python-modules/pynordpool { };
+
   pynotifier = callPackage ../development/python-modules/pynotifier { };
+
   pynput = callPackage ../development/python-modules/pynput { };
+
   pynrrd = callPackage ../development/python-modules/pynrrd { };
+
   pynslookup = callPackage ../development/python-modules/pynslookup { };
+
   pynuki = callPackage ../development/python-modules/pynuki { };
+
   pynut2 = callPackage ../development/python-modules/pynut2 { };
+
   pynvim = callPackage ../development/python-modules/pynvim { };
+
   pynvim-pp = callPackage ../development/python-modules/pynvim-pp { };
+
   pynvml = callPackage ../development/python-modules/pynvml { };
+
   pynws = callPackage ../development/python-modules/pynws { };
+
   pynx584 = callPackage ../development/python-modules/pynx584 { };
+
   pynzb = callPackage ../development/python-modules/pynzb { };
+
   pynzbgetapi = callPackage ../development/python-modules/pynzbgetapi { };
+
   pyobihai = callPackage ../development/python-modules/pyobihai { };
+
   pyobjc-core = callPackage ../development/python-modules/pyobjc-core { };
+
   pyobjc-framework-Cocoa = callPackage ../development/python-modules/pyobjc-framework-Cocoa { };
+
   pyocd = callPackage ../development/python-modules/pyocd { };
+
   pyocd-pemicro = callPackage ../development/python-modules/pyocd-pemicro { };
+
   pyocr = callPackage ../development/python-modules/pyocr { tesseract = pkgs.tesseract4; };
+
   pyoctoprintapi = callPackage ../development/python-modules/pyoctoprintapi { };
+
   pyodbc = callPackage ../development/python-modules/pyodbc { };
+
   pyogg = callPackage ../development/python-modules/pyogg { };
+
   pyogrio = callPackage ../development/python-modules/pyogrio { };
+
   pyombi = callPackage ../development/python-modules/pyombi { };
+
   pyomo = callPackage ../development/python-modules/pyomo { };
+
   pyopencl = callPackage ../development/python-modules/pyopencl { };
+
   pyopengl = callPackage ../development/python-modules/pyopengl { };
+
   pyopengl-accelerate = callPackage ../development/python-modules/pyopengl-accelerate { };
+
   pyopengltk = callPackage ../development/python-modules/pyopengltk { };
+
   pyopensprinkler = callPackage ../development/python-modules/pyopensprinkler { };
+
   pyopenssl = callPackage ../development/python-modules/pyopenssl { };
+
   pyopenuv = callPackage ../development/python-modules/pyopenuv { };
+
   pyopenweathermap = callPackage ../development/python-modules/pyopenweathermap { };
+
   pyopnsense = callPackage ../development/python-modules/pyopnsense { };
+
   pyoppleio = callPackage ../development/python-modules/pyoppleio { };
+
   pyoppleio-legacy = callPackage ../development/python-modules/pyoppleio-legacy { };
+
   pyoprf = callPackage ../development/python-modules/pyoprf { };
+
   pyorc = callPackage ../development/python-modules/pyorc { };
+
   pyorthanc = callPackage ../development/python-modules/pyorthanc { };
+
   pyosf = callPackage ../development/python-modules/pyosf { };
+
   pyosmium = callPackage ../development/python-modules/pyosmium { inherit (pkgs) lz4; };
+
   pyosohotwaterapi = callPackage ../development/python-modules/pyosohotwaterapi { };
+
   pyotb = callPackage ../development/python-modules/pyotb { };
+
   pyotgw = callPackage ../development/python-modules/pyotgw { };
+
   pyotp = callPackage ../development/python-modules/pyotp { };
+
   pyoutbreaksnearme = callPackage ../development/python-modules/pyoutbreaksnearme { };
+
   pyoverkiz = callPackage ../development/python-modules/pyoverkiz { };
+
   pyowm = callPackage ../development/python-modules/pyowm { };
+
   pyownet = callPackage ../development/python-modules/pyownet { };
+
   pyoxigraph = callPackage ../development/python-modules/pyoxigraph { };
+
   pypager = callPackage ../development/python-modules/pypager { };
+
   pypalazzetti = callPackage ../development/python-modules/pypalazzetti { };
+
   pypamtest = toPythonModule (
     pkgs.libpam-wrapper.override {
       enablePython = true;
       inherit python;
     }
   );
+
   pypandoc = callPackage ../development/python-modules/pypandoc { };
+
   pypaperless = callPackage ../development/python-modules/pypaperless { };
+
   pyparsebluray = callPackage ../development/python-modules/pyparsebluray { };
+
   pyparser = callPackage ../development/python-modules/pyparser { };
+
   pyparsing = callPackage ../development/python-modules/pyparsing { };
+
   pyparted = callPackage ../development/python-modules/pyparted { };
+
   pypass = callPackage ../development/python-modules/pypass { };
+
   pypasser = callPackage ../development/python-modules/pypasser { };
+
   pypblib = callPackage ../development/python-modules/pypblib { };
+
   pypca = callPackage ../development/python-modules/pypca { };
+
   pypck = callPackage ../development/python-modules/pypck { };
+
   pypdf = callPackage ../development/python-modules/pypdf { };
+
   pypdf2 = callPackage ../development/python-modules/pypdf2 { };
+
   pypdf3 = callPackage ../development/python-modules/pypdf3 { };
+
   pypdfium2 = callPackage ../development/python-modules/pypdfium2 { };
+
   pypeg2 = callPackage ../development/python-modules/pypeg2 { };
+
   pypemicro = callPackage ../development/python-modules/pypemicro { };
+
   pyperclip = callPackage ../development/python-modules/pyperclip { };
+
   pyperclipfix = callPackage ../development/python-modules/pyperclipfix { };
+
   pyperf = callPackage ../development/python-modules/pyperf { };
+
   pyperscan = callPackage ../development/python-modules/pyperscan { };
+
   pypglab = callPackage ../development/python-modules/pypglab { };
+
   pyphen = callPackage ../development/python-modules/pyphen { };
+
   pyphotonfile = callPackage ../development/python-modules/pyphotonfile { };
+
   pypika = callPackage ../development/python-modules/pypika { };
+
   pypillowfight = callPackage ../development/python-modules/pypillowfight { };
+
   pypinyin = callPackage ../development/python-modules/pypinyin { };
+
   pypiserver = callPackage ../development/python-modules/pypiserver { };
+
   pypitoken = callPackage ../development/python-modules/pypitoken { };
+
   pypjlink2 = callPackage ../development/python-modules/pypjlink2 { };
+
   pyplaato = callPackage ../development/python-modules/pyplaato { };
+
   pyplatec = callPackage ../development/python-modules/pyplatec { };
+
   pypng = callPackage ../development/python-modules/pypng { };
+
   pypoint = callPackage ../development/python-modules/pypoint { };
+
   pypoolstation = callPackage ../development/python-modules/pypoolstation { };
+
   pyporscheconnectapi = callPackage ../development/python-modules/pyporscheconnectapi { };
+
   pyppeteer = callPackage ../development/python-modules/pyppeteer { };
+
   pyppmd = callPackage ../development/python-modules/pyppmd { };
+
   pyprecice = callPackage ../development/python-modules/pyprecice {
     precice = pkgs.precice.override {
       python3Packages = self;
     };
   };
+
   pypresence = callPackage ../development/python-modules/pypresence { };
+
   pyprind = callPackage ../development/python-modules/pyprind { };
+
   pyprobables = callPackage ../development/python-modules/pyprobables { };
+
   pyprobeplus = callPackage ../development/python-modules/pyprobeplus { };
+
   pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { };
+
   pyproj = callPackage ../development/python-modules/pyproj { };
+
   pyproject-api = callPackage ../development/python-modules/pyproject-api { };
+
   pyproject-hooks = callPackage ../development/python-modules/pyproject-hooks { };
+
   pyproject-metadata = callPackage ../development/python-modules/pyproject-metadata { };
+
   pyproject-parser = callPackage ../development/python-modules/pyproject-parser { };
+
   pyprosegur = callPackage ../development/python-modules/pyprosegur { };
+
   pyprusalink = callPackage ../development/python-modules/pyprusalink { };
+
   pyps4-2ndscreen = callPackage ../development/python-modules/pyps4-2ndscreen { };
+
   pypsrp = callPackage ../development/python-modules/pypsrp { };
+
   pyptlib = callPackage ../development/python-modules/pyptlib { };
+
   pypubsub = callPackage ../development/python-modules/pypubsub { };
+
   pypugjs = callPackage ../development/python-modules/pypugjs { };
+
   pypykatz = callPackage ../development/python-modules/pypykatz { };
+
   pypytools = callPackage ../development/python-modules/pypytools { };
+
   pyqrcode = callPackage ../development/python-modules/pyqrcode { };
+
   pyqt-builder = callPackage ../development/python-modules/pyqt-builder { };
+
   pyqt3d = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt3d {
     inherit (self)
       buildPythonPackage
@@ -7505,18 +13684,28 @@ self: super: with self; {
       sip
       ;
   };
+
   pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { inherit (pkgs) mesa; };
+
   pyqt5-multimedia = self.pyqt5.override { withMultimedia = true; };
+
   pyqt5-sip = callPackage ../development/python-modules/pyqt/sip.nix { };
+
   pyqt5-stubs = callPackage ../development/python-modules/pyqt5-stubs { };
+
   # `pyqt5-webkit` should not be used by python libraries in
   # pkgs/development/python-modules/*. Putting this attribute in
   # `propagatedBuildInputs` may cause collisions.
   pyqt5-webkit = self.pyqt5.override { withWebKit = true; };
+
   pyqt6 = callPackage ../development/python-modules/pyqt/6.x.nix { };
+
   pyqt6-charts = callPackage ../development/python-modules/pyqt6-charts { };
+
   pyqt6-sip = callPackage ../development/python-modules/pyqt/pyqt6-sip.nix { };
+
   pyqt6-webengine = callPackage ../development/python-modules/pyqt6-webengine { };
+
   pyqtchart = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtchart {
     inherit (self)
       buildPythonPackage
@@ -7528,7 +13717,9 @@ self: super: with self; {
       sip
       ;
   };
+
   pyqtdarktheme = callPackage ../development/python-modules/pyqtdarktheme { };
+
   pyqtdatavisualization =
     pkgs.libsForQt5.callPackage ../development/python-modules/pyqtdatavisualization
       {
@@ -7542,38 +13733,66 @@ self: super: with self; {
           sip
           ;
       };
+
   pyqtgraph = callPackage ../development/python-modules/pyqtgraph { };
+
   pyqtwebengine = callPackage ../development/python-modules/pyqtwebengine { };
+
   pyquaternion = callPackage ../development/python-modules/pyquaternion { };
+
   pyquery = callPackage ../development/python-modules/pyquery { };
+
   pyquerylist = callPackage ../development/python-modules/pyquerylist { };
+
   pyquil = callPackage ../development/python-modules/pyquil { };
+
   pyqvrpro = callPackage ../development/python-modules/pyqvrpro { };
+
   pyqwikswitch = callPackage ../development/python-modules/pyqwikswitch { };
+
   pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { };
+
   pyrad = callPackage ../development/python-modules/pyrad { };
+
   pyradiomics = callPackage ../development/python-modules/pyradiomics { };
+
   pyradios = callPackage ../development/python-modules/pyradios { };
+
   pyrail = callPackage ../development/python-modules/pyrail { };
+
   pyrainbird = callPackage ../development/python-modules/pyrainbird { };
+
   pyramid = callPackage ../development/python-modules/pyramid { };
+
   pyramid-beaker = callPackage ../development/python-modules/pyramid-beaker { };
+
   pyramid-chameleon = callPackage ../development/python-modules/pyramid-chameleon { };
+
   pyramid-exclog = callPackage ../development/python-modules/pyramid-exclog { };
+
   pyramid-jinja2 = callPackage ../development/python-modules/pyramid-jinja2 { };
+
   pyramid-mako = callPackage ../development/python-modules/pyramid-mako { };
+
   pyramid-multiauth = callPackage ../development/python-modules/pyramid-multiauth { };
+
   pyrate-limiter = callPackage ../development/python-modules/pyrate-limiter { };
+
   pyrdfa3 = callPackage ../development/python-modules/pyrdfa3 { };
+
   pyre-extensions = callPackage ../development/python-modules/pyre-extensions { };
+
   pyreaderwriterlock = callPackage ../development/python-modules/pyreaderwriterlock { };
+
   pyreadstat = callPackage ../development/python-modules/pyreadstat { };
+
   pyrealsense2 = toPythonModule (
     pkgs.librealsense.override {
       enablePython = true;
       pythonPackages = self;
     }
   );
+
   pyrealsense2WithCuda = toPythonModule (
     pkgs.librealsenseWithCuda.override {
       cudaSupport = true;
@@ -7581,194 +13800,354 @@ self: super: with self; {
       pythonPackages = self;
     }
   );
+
   pyrealsense2WithoutCuda = toPythonModule (
     pkgs.librealsenseWithoutCuda.override {
       enablePython = true;
       pythonPackages = self;
     }
   );
+
   pyrecswitch = callPackage ../development/python-modules/pyrecswitch { };
+
   pyrect = callPackage ../development/python-modules/pyrect { };
+
   pyregion = callPackage ../development/python-modules/pyregion { };
+
   pyrender = callPackage ../development/python-modules/pyrender {
     inherit (pkgs) mesa;
   };
+
   pyrepetierng = callPackage ../development/python-modules/pyrepetierng { };
+
   pyrevolve = callPackage ../development/python-modules/pyrevolve { };
+
   pyrfc3339 = callPackage ../development/python-modules/pyrfc3339 { };
+
   pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { };
+
   pyric = callPackage ../development/python-modules/pyric { };
+
   pyring-buffer = callPackage ../development/python-modules/pyring-buffer { };
+
   pyrisco = callPackage ../development/python-modules/pyrisco { };
+
   pyrituals = callPackage ../development/python-modules/pyrituals { };
+
   pyrmvtransport = callPackage ../development/python-modules/pyrmvtransport { };
+
   pyro-api = callPackage ../development/python-modules/pyro-api { };
+
   pyro-ppl = callPackage ../development/python-modules/pyro-ppl { };
+
   pyro4 = callPackage ../development/python-modules/pyro4 { };
+
   pyro5 = callPackage ../development/python-modules/pyro5 { };
+
   pyroaring = callPackage ../development/python-modules/pyroaring { };
+
   pyrogram = callPackage ../development/python-modules/pyrogram { };
+
   pyroma = callPackage ../development/python-modules/pyroma { };
+
   pyroute2 = callPackage ../development/python-modules/pyroute2 { };
+
   pyrr = callPackage ../development/python-modules/pyrr { };
+
   pyrsistent = callPackage ../development/python-modules/pyrsistent { };
+
   pyrss2gen = callPackage ../development/python-modules/pyrss2gen { };
+
   pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { };
+
   pyrympro = callPackage ../development/python-modules/pyrympro { };
+
   pysabnzbd = callPackage ../development/python-modules/pysabnzbd { };
+
   pysaj = callPackage ../development/python-modules/pysaj { };
+
   pysam = callPackage ../development/python-modules/pysam { };
+
   pysaml2 = callPackage ../development/python-modules/pysaml2 { inherit (pkgs) xmlsec; };
+
   pysatochip = callPackage ../development/python-modules/pysatochip { };
+
   pysbd = callPackage ../development/python-modules/pysbd { };
+
   pysc2 = callPackage ../development/python-modules/pysc2 { };
+
   pyscaffold = callPackage ../development/python-modules/pyscaffold { };
+
   pyscaffoldext-cookiecutter =
     callPackage ../development/python-modules/pyscaffoldext-cookiecutter
       { };
+
   pyscaffoldext-custom-extension =
     callPackage ../development/python-modules/pyscaffoldext-custom-extension
       { };
+
   pyscaffoldext-django = callPackage ../development/python-modules/pyscaffoldext-django { };
+
   pyscaffoldext-dsproject = callPackage ../development/python-modules/pyscaffoldext-dsproject { };
+
   pyscaffoldext-markdown = callPackage ../development/python-modules/pyscaffoldext-markdown { };
+
   pyscaffoldext-travis = callPackage ../development/python-modules/pyscaffoldext-travis { };
+
   pyscard = callPackage ../development/python-modules/pyscard { };
+
   pyscf = callPackage ../development/python-modules/pyscf { };
+
   pyschedule = callPackage ../development/python-modules/pyschedule { };
+
   pyschemes = callPackage ../development/python-modules/pyschemes { };
+
   pyschlage = callPackage ../development/python-modules/pyschlage { };
+
   pyscreenshot = callPackage ../development/python-modules/pyscreenshot { };
+
   pyscreeze = callPackage ../development/python-modules/pyscreeze { };
+
   pyscrypt = callPackage ../development/python-modules/pyscrypt { };
+
   pyscss = callPackage ../development/python-modules/pyscss { };
+
   pysdcp = callPackage ../development/python-modules/pysdcp { };
+
   pysdl2 = callPackage ../development/python-modules/pysdl2 { };
+
   pysdl3 = callPackage ../development/python-modules/pysdl3 { };
+
   pysearpc = toPythonModule (pkgs.libsearpc.override { python3 = self.python; });
+
   pysecretsocks = callPackage ../development/python-modules/pysecretsocks { };
+
   pysecuritas = callPackage ../development/python-modules/pysecuritas { };
+
   pysendfile = callPackage ../development/python-modules/pysendfile { };
+
   pysensibo = callPackage ../development/python-modules/pysensibo { };
+
   pysensors = callPackage ../development/python-modules/pysensors { };
+
   pysequoia = callPackage ../development/python-modules/pysequoia { };
+
   pyserial = callPackage ../development/python-modules/pyserial { };
+
   pyserial-asyncio = callPackage ../development/python-modules/pyserial-asyncio { };
+
   pyserial-asyncio-fast = callPackage ../development/python-modules/pyserial-asyncio-fast { };
+
   pyseries = callPackage ../development/python-modules/pyseries { };
+
   pyseventeentrack = callPackage ../development/python-modules/pyseventeentrack { };
+
   pysftp = callPackage ../development/python-modules/pysftp { };
+
   pyshark = callPackage ../development/python-modules/pyshark { };
+
   pyshp = callPackage ../development/python-modules/pyshp { };
+
   pysiaalarm = callPackage ../development/python-modules/pysiaalarm { };
+
   pyside2 = toPythonModule (
     callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja qt5; }
   );
+
   pyside2-tools = toPythonModule (
     callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }
   );
+
   pyside6 = toPythonModule (
     callPackage ../development/python-modules/pyside6 { inherit (pkgs) cmake ninja; }
   );
+
   pyside6-fluent-widgets = callPackage ../development/python-modules/pyside6-fluent-widgets { };
+
   pyside6-qtads = callPackage ../development/python-modules/pyside6-qtads { };
+
   pysidesix-frameless-window =
     callPackage ../development/python-modules/pysidesix-frameless-window
       { };
+
   pysigma = callPackage ../development/python-modules/pysigma { };
+
   pysigma-backend-elasticsearch =
     callPackage ../development/python-modules/pysigma-backend-elasticsearch
       { };
+
   pysigma-backend-insightidr =
     callPackage ../development/python-modules/pysigma-backend-insightidr
       { };
+
   pysigma-backend-loki = callPackage ../development/python-modules/pysigma-backend-loki { };
+
   pysigma-backend-opensearch =
     callPackage ../development/python-modules/pysigma-backend-opensearch
       { };
+
   pysigma-backend-qradar = callPackage ../development/python-modules/pysigma-backend-qradar { };
+
   pysigma-backend-splunk = callPackage ../development/python-modules/pysigma-backend-splunk { };
+
   pysigma-backend-sqlite = callPackage ../development/python-modules/pysigma-backend-sqlite { };
+
   pysigma-pipeline-crowdstrike =
     callPackage ../development/python-modules/pysigma-pipeline-crowdstrike
       { };
+
   pysigma-pipeline-sysmon = callPackage ../development/python-modules/pysigma-pipeline-sysmon { };
+
   pysigma-pipeline-windows = callPackage ../development/python-modules/pysigma-pipeline-windows { };
+
   pysignalclirestapi = callPackage ../development/python-modules/pysignalclirestapi { };
+
   pysignalr = callPackage ../development/python-modules/pysignalr { };
+
   pysigset = callPackage ../development/python-modules/pysigset { };
+
   pysilero-vad = callPackage ../development/python-modules/pysilero-vad { };
+
   pysim = callPackage ../development/python-modules/pysim { };
+
   pysimplesoap = callPackage ../development/python-modules/pysimplesoap { };
+
   pysingleton = callPackage ../development/python-modules/pysingleton { };
+
   pyskyqhub = callPackage ../development/python-modules/pyskyqhub { };
+
   pyskyqremote = callPackage ../development/python-modules/pyskyqremote { };
+
   pyslim = callPackage ../development/python-modules/pyslim { };
+
   pyslurm = callPackage ../development/python-modules/pyslurm { inherit (pkgs) slurm; };
+
   pysma = callPackage ../development/python-modules/pysma { };
+
   pysmappee = callPackage ../development/python-modules/pysmappee { };
+
   pysmarlaapi = callPackage ../development/python-modules/pysmarlaapi { };
+
   pysmart = callPackage ../development/python-modules/pysmart { };
+
   pysmartapp = callPackage ../development/python-modules/pysmartapp { };
+
   pysmartdl = callPackage ../development/python-modules/pysmartdl { };
+
   pysmartthings = callPackage ../development/python-modules/pysmartthings { };
+
   pysmb = callPackage ../development/python-modules/pysmb { };
+
   pysmbc = callPackage ../development/python-modules/pysmbc { };
+
   pysmf = callPackage ../development/python-modules/pysmf { };
+
   pysmhi = callPackage ../development/python-modules/pysmhi { };
+
   pysmi = callPackage ../development/python-modules/pysmi { };
+
   pysml = callPackage ../development/python-modules/pysml { };
+
   pysmlight = callPackage ../development/python-modules/pysmlight { };
+
   pysmt = callPackage ../development/python-modules/pysmt { };
+
   pysnmp = callPackage ../development/python-modules/pysnmp { };
+
   pysnmp-pyasn1 = callPackage ../development/python-modules/pysnmp-pyasn1 { };
+
   pysnmp-pysmi = callPackage ../development/python-modules/pysnmp-pysmi { };
+
   pysnmpcrypto = callPackage ../development/python-modules/pysnmpcrypto { };
+
   pysnmplib = callPackage ../development/python-modules/pysnmplib { };
+
   pysnooper = callPackage ../development/python-modules/pysnooper { };
+
   pysnooz = callPackage ../development/python-modules/pysnooz { };
+
   pysnow = callPackage ../development/python-modules/pysnow { };
+
   pysocks = callPackage ../development/python-modules/pysocks { };
+
   pysodium = callPackage ../development/python-modules/pysodium { };
+
   pysol-cards = callPackage ../development/python-modules/pysol-cards { };
+
   pysolarmanv5 = callPackage ../development/python-modules/pysolarmanv5 { };
+
   pysolcast = callPackage ../development/python-modules/pysolcast { };
+
   pysolr = callPackage ../development/python-modules/pysolr { };
+
   pysoma = callPackage ../development/python-modules/pysoma { };
+
   pysonos = callPackage ../development/python-modules/pysonos { };
-  pysoundfile = self.soundfile;
-  # Alias added 23-06-2019
+
+  pysoundfile = self.soundfile; # Alias added 23-06-2019
+
   pyspark = callPackage ../development/python-modules/pyspark { };
+
   pyspcwebgw = callPackage ../development/python-modules/pyspcwebgw { };
+
   pyspeex-noise = callPackage ../development/python-modules/pyspeex-noise { };
+
   pyspellchecker = callPackage ../development/python-modules/pyspellchecker { };
+
   pyspelling = callPackage ../development/python-modules/pyspelling { };
+
   pyspf = callPackage ../development/python-modules/pyspf { };
+
   pyspice = callPackage ../development/python-modules/pyspice { };
+
   pyspiflash = callPackage ../development/python-modules/pyspiflash { };
+
   pyspinel = callPackage ../development/python-modules/pyspinel { };
+
   pyspnego = callPackage ../development/python-modules/pyspnego { };
+
   pysptk = callPackage ../development/python-modules/pysptk { };
+
   pyspx = callPackage ../development/python-modules/pyspx { };
+
   pysqlcipher3 = callPackage ../development/python-modules/pysqlcipher3 { inherit (pkgs) sqlcipher; };
+
   pysqlitecipher = callPackage ../development/python-modules/pysqlitecipher { };
+
   pysqueezebox = callPackage ../development/python-modules/pysqueezebox { };
+
   pysrim = callPackage ../development/python-modules/pysrim { };
+
   pysrt = callPackage ../development/python-modules/pysrt { };
+
   pyssim = callPackage ../development/python-modules/pyssim { };
+
   pystac = callPackage ../development/python-modules/pystac { };
+
   pystac-client = callPackage ../development/python-modules/pystac-client { };
+
   pystache = callPackage ../development/python-modules/pystache { };
+
   pystardict = callPackage ../development/python-modules/pystardict { };
+
   pystatgrab = callPackage ../development/python-modules/pystatgrab { };
+
   pystemd = callPackage ../development/python-modules/pystemd { inherit (pkgs) systemd; };
+
   pystemmer = callPackage ../development/python-modules/pystemmer { };
+
   pystiebeleltron = callPackage ../development/python-modules/pystiebeleltron { };
+
   pystray = callPackage ../development/python-modules/pystray { };
+
   pysubs2 = callPackage ../development/python-modules/pysubs2 { };
+
   pysuezv2 = callPackage ../development/python-modules/pysuezv2 { };
+
   pysunspec2 = callPackage ../development/python-modules/pysunspec2 { };
+
   pysvg-py3 = callPackage ../development/python-modules/pysvg-py3 { };
+
   pysvn = callPackage ../development/python-modules/pysvn {
     inherit (pkgs)
       bash
@@ -7777,39 +14156,71 @@ self: super: with self; {
       aprutil
       ;
   };
+
   pyswitchbee = callPackage ../development/python-modules/pyswitchbee { };
+
   pyswitchbot = callPackage ../development/python-modules/pyswitchbot { };
+
   pyswitchmate = callPackage ../development/python-modules/pyswitchmate { };
+
   pysychonaut = callPackage ../development/python-modules/pysychonaut { };
+
   pysyncobj = callPackage ../development/python-modules/pysyncobj { };
+
   pysyncthru = callPackage ../development/python-modules/pysyncthru { };
+
   pytabix = callPackage ../development/python-modules/pytabix { };
+
   pytablewriter = callPackage ../development/python-modules/pytablewriter { };
+
   pytaglib = callPackage ../development/python-modules/pytaglib { };
+
   pytankerkoenig = callPackage ../development/python-modules/pytankerkoenig { };
+
   pytap2 = callPackage ../development/python-modules/pytap2 { };
+
   pytapo = callPackage ../development/python-modules/pytapo { };
+
   pytask = callPackage ../development/python-modules/pytask { };
+
   pytautulli = callPackage ../development/python-modules/pytautulli { };
+
   pyte = callPackage ../development/python-modules/pyte { };
+
   pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { };
+
   pytenable = callPackage ../development/python-modules/pytenable { };
+
   pytensor = callPackage ../development/python-modules/pytensor { };
+
   pytesseract = callPackage ../development/python-modules/pytesseract { };
+
   pytest = callPackage ../development/python-modules/pytest { };
+
   pytest-aio = callPackage ../development/python-modules/pytest-aio { };
+
   pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { };
+
   pytest-annotate = callPackage ../development/python-modules/pytest-annotate { };
+
   pytest-ansible = callPackage ../development/python-modules/pytest-ansible { };
+
   pytest-archon = callPackage ../development/python-modules/pytest-archon { };
+
   pytest-arraydiff = callPackage ../development/python-modules/pytest-arraydiff { };
+
   pytest-astropy = callPackage ../development/python-modules/pytest-astropy { };
+
   pytest-astropy-header = callPackage ../development/python-modules/pytest-astropy-header { };
+
   pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { };
+
   pytest-asyncio-cooperative =
     callPackage ../development/python-modules/pytest-asyncio-cooperative
       { };
+
   pytest-asyncio_0 = callPackage ../development/python-modules/pytest-asyncio/0.nix { };
+
   pytest-asyncio_0_21 = pytest-asyncio.overridePythonAttrs (old: rec {
     version = "0.21.2";
     src = pkgs.fetchFromGitHub {
@@ -7819,265 +14230,517 @@ self: super: with self; {
       hash = "sha256-AVVvdo/CDF9IU6l779sLc7wKz5h3kzMttdDNTPLYxtQ=";
     };
   });
+
   pytest-base-url = callPackage ../development/python-modules/pytest-base-url { };
+
   pytest-bdd = callPackage ../development/python-modules/pytest-bdd { };
+
   pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { };
+
   pytest-black = callPackage ../development/python-modules/pytest-black { };
-  pytest-cache = self.pytestcache;
-  # added 2021-01-04
+
+  pytest-cache = self.pytestcache; # added 2021-01-04
+
   pytest-cases = callPackage ../development/python-modules/pytest-cases { };
+
   pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { };
+
   pytest-celery = callPackage ../development/python-modules/pytest-celery { };
+
   pytest-check = callPackage ../development/python-modules/pytest-check { };
+
   pytest-cid = callPackage ../development/python-modules/pytest-cid { };
+
   pytest-click = callPackage ../development/python-modules/pytest-click { };
+
   pytest-codspeed = callPackage ../development/python-modules/pytest-codspeed { };
+
   pytest-console-scripts = callPackage ../development/python-modules/pytest-console-scripts { };
+
   pytest-cov = callPackage ../development/python-modules/pytest-cov { };
+
   pytest-cov-stub = callPackage ../development/python-modules/pytest-cov-stub { };
+
   pytest-cram = callPackage ../development/python-modules/pytest-cram { };
+
   pytest-datadir = callPackage ../development/python-modules/pytest-datadir { };
+
   pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { };
+
   pytest-dependency = callPackage ../development/python-modules/pytest-dependency { };
+
   pytest-describe = callPackage ../development/python-modules/pytest-describe { };
+
   pytest-django = callPackage ../development/python-modules/pytest-django { };
+
   pytest-docker-tools = callPackage ../development/python-modules/pytest-docker-tools { };
+
   pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { };
+
   pytest-dotenv = callPackage ../development/python-modules/pytest-dotenv { };
+
   pytest-emoji = callPackage ../development/python-modules/pytest-emoji { };
+
   pytest-env = callPackage ../development/python-modules/pytest-env { };
+
   pytest-error-for-skips = callPackage ../development/python-modules/pytest-error-for-skips { };
+
   pytest-examples = callPackage ../development/python-modules/pytest-examples { };
+
   pytest-expect = callPackage ../development/python-modules/pytest-expect { };
+
   pytest-factoryboy = callPackage ../development/python-modules/pytest-factoryboy { };
+
   pytest-filter-subpackage = callPackage ../development/python-modules/pytest-filter-subpackage { };
+
   pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { };
+
   pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { };
+
   pytest-flakes = callPackage ../development/python-modules/pytest-flakes { };
+
   pytest-flask = callPackage ../development/python-modules/pytest-flask { };
+
   pytest-forked = callPackage ../development/python-modules/pytest-forked { };
+
   pytest-freezegun = callPackage ../development/python-modules/pytest-freezegun { };
+
   pytest-freezer = callPackage ../development/python-modules/pytest-freezer { };
+
   pytest-golden = callPackage ../development/python-modules/pytest-golden { };
+
   pytest-grpc = callPackage ../development/python-modules/pytest-grpc { };
+
   pytest-harvest = callPackage ../development/python-modules/pytest-harvest { };
+
   pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { };
+
   pytest-html = callPackage ../development/python-modules/pytest-html { };
+
   pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { };
+
   pytest-httpserver = callPackage ../development/python-modules/pytest-httpserver { };
+
   pytest-httpx = callPackage ../development/python-modules/pytest-httpx { };
+
   pytest-icdiff = callPackage ../development/python-modules/pytest-icdiff { };
+
   pytest-image-diff = callPackage ../development/python-modules/pytest-image-diff { };
+
   pytest-instafail = callPackage ../development/python-modules/pytest-instafail { };
+
   pytest-isort = callPackage ../development/python-modules/pytest-isort { };
+
   pytest-json-report = callPackage ../development/python-modules/pytest-json-report { };
+
   pytest-jupyter = callPackage ../development/python-modules/pytest-jupyter { };
+
   pytest-kafka = callPackage ../development/python-modules/pytest-kafka { };
+
   pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { };
+
   pytest-lazy-fixtures = callPackage ../development/python-modules/pytest-lazy-fixtures { };
+
   pytest-localserver = callPackage ../development/python-modules/pytest-localserver { };
+
   pytest-logdog = callPackage ../development/python-modules/pytest-logdog { };
+
   pytest-lsp = callPackage ../development/python-modules/pytest-lsp { };
+
   pytest-markdown-docs = callPackage ../development/python-modules/pytest-markdown-docs { };
+
   pytest-md-report = callPackage ../development/python-modules/pytest-md-report { };
+
   pytest-metadata = callPackage ../development/python-modules/pytest-metadata { };
+
   pytest-mock = callPackage ../development/python-modules/pytest-mock { };
+
   pytest-mockito = callPackage ../development/python-modules/pytest-mockito { };
+
   pytest-mockservers = callPackage ../development/python-modules/pytest-mockservers { };
+
   pytest-mpi = callPackage ../development/python-modules/pytest-mpi { };
+
   pytest-mpl = callPackage ../development/python-modules/pytest-mpl { };
+
   pytest-mypy = callPackage ../development/python-modules/pytest-mypy { };
+
   pytest-mypy-plugins = callPackage ../development/python-modules/pytest-mypy-plugins { };
+
   pytest-notebook = callPackage ../development/python-modules/pytest-notebook { };
+
   pytest-order = callPackage ../development/python-modules/pytest-order { };
+
   pytest-parallel = callPackage ../development/python-modules/pytest-parallel { };
+
   pytest-param-files = callPackage ../development/python-modules/pytest-param-files { };
+
   pytest-playwright = callPackage ../development/python-modules/pytest-playwright { };
+
   pytest-plt = callPackage ../development/python-modules/pytest-plt { };
+
   pytest-pook = callPackage ../development/python-modules/pytest-pook { };
+
   pytest-postgresql = callPackage ../development/python-modules/pytest-postgresql { };
+
   pytest-pudb = callPackage ../development/python-modules/pytest-pudb { };
+
   pytest-pylint = callPackage ../development/python-modules/pytest-pylint { };
+
   pytest-pytestrail = callPackage ../development/python-modules/pytest-pytestrail { };
+
   pytest-qt = callPackage ../development/python-modules/pytest-qt { };
+
   pytest-quickcheck = callPackage ../development/python-modules/pytest-quickcheck { };
+
   pytest-raises = callPackage ../development/python-modules/pytest-raises { };
+
   pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { };
+
   pytest-raisin = callPackage ../development/python-modules/pytest-raisin { };
+
   pytest-random-order = callPackage ../development/python-modules/pytest-random-order { };
+
   pytest-randomly = callPackage ../development/python-modules/pytest-randomly { };
+
   pytest-recording = callPackage ../development/python-modules/pytest-recording { };
+
   pytest-regressions = callPackage ../development/python-modules/pytest-regressions { };
+
   pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { };
+
   pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { };
+
   pytest-repeat = callPackage ../development/python-modules/pytest-repeat { };
+
   pytest-reraise = callPackage ../development/python-modules/pytest-reraise { };
+
   pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { };
+
   pytest-resource-path = callPackage ../development/python-modules/pytest-resource-path { };
+
   pytest-responses = callPackage ../development/python-modules/pytest-responses { };
+
   pytest-retry = callPackage ../development/python-modules/pytest-retry { };
+
   pytest-reverse = callPackage ../development/python-modules/pytest-reverse { };
+
   pytest-ruff = callPackage ../development/python-modules/pytest-ruff { };
+
   pytest-run-parallel = callPackage ../development/python-modules/pytest-run-parallel { };
+
   pytest-scim2-server = callPackage ../development/python-modules/pytest-scim2-server { };
+
   pytest-selenium = callPackage ../development/python-modules/pytest-selenium { };
+
   pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { };
+
   pytest-services = callPackage ../development/python-modules/pytest-services { };
+
   pytest-shared-session-scope =
     callPackage ../development/python-modules/pytest-shared-session-scope
       { };
+
   pytest-shutil = callPackage ../development/python-modules/pytest-shutil { };
+
   pytest-smtpd = callPackage ../development/python-modules/pytest-smtpd { };
+
   pytest-snapshot = callPackage ../development/python-modules/pytest-snapshot { };
+
   pytest-socket = callPackage ../development/python-modules/pytest-socket { };
+
   pytest-spec = callPackage ../development/python-modules/pytest-spec { };
+
   pytest-subprocess = callPackage ../development/python-modules/pytest-subprocess { };
+
   pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { };
+
   pytest-subtests = callPackage ../development/python-modules/pytest-subtests { };
+
   pytest-sugar = callPackage ../development/python-modules/pytest-sugar { };
+
   pytest-tap = callPackage ../development/python-modules/pytest-tap { };
+
   pytest-test-utils = callPackage ../development/python-modules/pytest-test-utils { };
+
   pytest-testinfra = callPackage ../development/python-modules/pytest-testinfra { };
+
   pytest-testmon = callPackage ../development/python-modules/pytest-testmon { };
+
   pytest-textual-snapshot = callPackage ../development/python-modules/pytest-textual-snapshot { };
+
   pytest-timeout = callPackage ../development/python-modules/pytest-timeout { };
+
   pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
+
   pytest-tornasync = callPackage ../development/python-modules/pytest-tornasync { };
+
   pytest-trio = callPackage ../development/python-modules/pytest-trio { };
+
   pytest-twisted = callPackage ../development/python-modules/pytest-twisted { };
+
   pytest-unmagic = callPackage ../development/python-modules/pytest-unmagic { };
+
   pytest-unordered = callPackage ../development/python-modules/pytest-unordered { };
+
   pytest-variables = callPackage ../development/python-modules/pytest-variables { };
+
   pytest-vcr = callPackage ../development/python-modules/pytest-vcr { };
+
   pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { };
+
   pytest-voluptuous = callPackage ../development/python-modules/pytest-voluptuous { };
+
   pytest-warnings = callPackage ../development/python-modules/pytest-warnings { };
+
   pytest-watch = callPackage ../development/python-modules/pytest-watch { };
+
   pytest-xdist = callPackage ../development/python-modules/pytest-xdist { };
+
   pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { };
+
   pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { };
+
   pytest7CheckHook = pytestCheckHook.override { pytest = pytest_7; };
+
   pytest8_3CheckHook = pytestCheckHook.override { pytest = pytest_8_3; };
+
   pytest_7 = callPackage ../development/python-modules/pytest/7.nix { };
+
   pytest_8_3 = callPackage ../development/python-modules/pytest/8_3.nix { };
+
   pytestcache = callPackage ../development/python-modules/pytestcache { };
+
   python-aodhclient = callPackage ../development/python-modules/python-aodhclient { };
+
   python-apt = callPackage ../development/python-modules/python-apt { };
+
   python-arango = callPackage ../development/python-modules/python-arango { };
+
   python-awair = callPackage ../development/python-modules/python-awair { };
+
   python-axolotl = callPackage ../development/python-modules/python-axolotl { };
+
   python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { };
+
   python-barbicanclient = callPackage ../development/python-modules/python-barbicanclient { };
+
   python-barcode = callPackage ../development/python-modules/python-barcode { };
+
   python-baseconv = callPackage ../development/python-modules/python-baseconv { };
+
   python-benedict = callPackage ../development/python-modules/python-benedict { };
+
   python-bidi = callPackage ../development/python-modules/python-bidi { };
+
   python-binance = callPackage ../development/python-modules/python-binance { };
+
   python-bitcoinlib = callPackage ../development/python-modules/python-bitcoinlib { };
+
   python-blockchain-api = callPackage ../development/python-modules/python-blockchain-api { };
+
   python-box = callPackage ../development/python-modules/python-box { };
+
   python-bring-api = callPackage ../development/python-modules/python-bring-api { };
+
   python-bsblan = callPackage ../development/python-modules/python-bsblan { };
+
   python-bugzilla = callPackage ../development/python-modules/python-bugzilla { };
+
   python-calamine = callPackage ../development/python-modules/python-calamine { };
+
   python-can = callPackage ../development/python-modules/python-can { };
+
   python-cinderclient = callPackage ../development/python-modules/python-cinderclient { };
+
   python-codon-tables = callPackage ../development/python-modules/python-codon-tables { };
+
   python-coinmarketcap = callPackage ../development/python-modules/python-coinmarketcap { };
+
   python-constraint = callPackage ../development/python-modules/python-constraint { };
+
   python-creole = callPackage ../development/python-modules/python-creole { };
+
   python-crfsuite = callPackage ../development/python-modules/python-crfsuite { };
+
   python-crontab = callPackage ../development/python-modules/python-crontab { };
+
   python-csxcad = callPackage ../development/python-modules/python-csxcad { };
+
   python-ctags3 = callPackage ../development/python-modules/python-ctags3 { };
+
   python-daemon = callPackage ../development/python-modules/python-daemon { };
+
   python-dali = callPackage ../development/python-modules/python-dali { };
+
   python-datemath = callPackage ../development/python-modules/python-datemath { };
+
   python-dateutil = callPackage ../development/python-modules/python-dateutil { };
+
   python-dbusmock = callPackage ../development/python-modules/python-dbusmock { };
+
   python-debian = callPackage ../development/python-modules/python-debian { };
+
   python-decouple = callPackage ../development/python-modules/python-decouple { };
+
   python-designateclient = callPackage ../development/python-modules/python-designateclient { };
+
   python-didl-lite = callPackage ../development/python-modules/python-didl-lite { };
+
   python-digitalocean = callPackage ../development/python-modules/python-digitalocean { };
+
   python-djvulibre = callPackage ../development/python-modules/python-djvulibre { };
+
   python-docs-theme = callPackage ../development/python-modules/python-docs-theme { };
+
   python-docx = callPackage ../development/python-modules/python-docx { };
+
   python-doi = callPackage ../development/python-modules/python-doi { };
+
   python-dotenv = callPackage ../development/python-modules/python-dotenv { };
+
   python-ecobee-api = callPackage ../development/python-modules/python-ecobee-api { };
+
   python-editor = callPackage ../development/python-modules/python-editor { };
+
   python-engineio = callPackage ../development/python-modules/python-engineio { };
+
   python-engineio-v3 = callPackage ../development/python-modules/python-engineio-v3 { };
+
   python-escpos = callPackage ../development/python-modules/python-escpos { };
+
   python-etcd = callPackage ../development/python-modules/python-etcd { };
+
   python-etherscan-api = callPackage ../development/python-modules/python-etherscan-api { };
+
   python-ev3dev2 = callPackage ../development/python-modules/python-ev3dev2 { };
+
   python-family-hub-local = callPackage ../development/python-modules/python-family-hub-local { };
+
   python-fedora = callPackage ../development/python-modules/python-fedora { };
+
   python-ffmpeg = callPackage ../development/python-modules/python-ffmpeg { };
+
   python-flirt = callPackage ../development/python-modules/python-flirt { };
+
   python-fontconfig = callPackage ../development/python-modules/python-fontconfig { };
+
   python-frontmatter = callPackage ../development/python-modules/python-frontmatter { };
+
   python-fsutil = callPackage ../development/python-modules/python-fsutil { };
+
   python-fullykiosk = callPackage ../development/python-modules/python-fullykiosk { };
+
   python-fx = callPackage ../development/python-modules/python-fx { };
+
   python-gammu = callPackage ../development/python-modules/python-gammu { };
+
   python-gitlab = callPackage ../development/python-modules/python-gitlab { };
+
   python-glanceclient = callPackage ../development/python-modules/python-glanceclient { };
+
   python-gnupg = callPackage ../development/python-modules/python-gnupg { };
+
   python-google-drive-api = callPackage ../development/python-modules/python-google-drive-api { };
+
   python-google-nest = callPackage ../development/python-modules/python-google-nest { };
+
   python-gvm = callPackage ../development/python-modules/python-gvm { };
+
   python-hcl2 = callPackage ../development/python-modules/python-hcl2 { };
+
   python-heatclient = callPackage ../development/python-modules/python-heatclient { };
+
   python-hglib = callPackage ../development/python-modules/python-hglib { };
+
   python-hl7 = callPackage ../development/python-modules/python-hl7 { };
+
   python-homeassistant-analytics =
     callPackage ../development/python-modules/python-homeassistant-analytics
       { };
+
   python-homewizard-energy = callPackage ../development/python-modules/python-homewizard-energy { };
+
   python-hosts = callPackage ../development/python-modules/python-hosts { };
+
   python-hpilo = callPackage ../development/python-modules/python-hpilo { };
+
   python-http-client = callPackage ../development/python-modules/python-http-client { };
+
   python-i18n = callPackage ../development/python-modules/python-i18n { };
+
   python-idzip = callPackage ../development/python-modules/python-idzip { };
+
   python-ipmi = callPackage ../development/python-modules/python-ipmi { };
+
   python-ipware = callPackage ../development/python-modules/python-ipware { };
+
   python-ironicclient = callPackage ../development/python-modules/python-ironicclient { };
+
   python-iso639 = callPackage ../development/python-modules/python-iso639 { };
+
   python-izone = callPackage ../development/python-modules/python-izone { };
+
   python-jenkins = callPackage ../development/python-modules/python-jenkins { };
+
   python-join-api = callPackage ../development/python-modules/python-join-api { };
+
   python-jose = callPackage ../development/python-modules/python-jose { };
+
   python-json-logger = callPackage ../development/python-modules/python-json-logger { };
+
   python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server { };
+
   python-juicenet = callPackage ../development/python-modules/python-juicenet { };
+
   python-kadmin-rs = callPackage ../development/python-modules/python-kadmin-rs { };
+
   python-kasa = callPackage ../development/python-modules/python-kasa { };
+
   python-keycloak = callPackage ../development/python-modules/python-keycloak { };
+
   python-keystoneclient = callPackage ../development/python-modules/python-keystoneclient { };
+
   python-ldap = callPackage ../development/python-modules/python-ldap {
     inherit (pkgs) openldap cyrus_sasl;
   };
+
   python-ldap-test = callPackage ../development/python-modules/python-ldap-test { };
+
   python-libnmap = callPackage ../development/python-modules/python-libnmap { };
+
   python-linkplay = callPackage ../development/python-modules/python-linkplay { };
+
   python-linux-procfs = callPackage ../development/python-modules/python-linux-procfs { };
+
   python-logging-loki = callPackage ../development/python-modules/python-logging-loki { };
+
   python-logstash = callPackage ../development/python-modules/python-logstash { };
+
   python-lorem = callPackage ../development/python-modules/python-lorem { };
+
   python-louvain = callPackage ../development/python-modules/python-louvain { };
+
   python-lsp-black = callPackage ../development/python-modules/python-lsp-black { };
+
   python-lsp-jsonrpc = callPackage ../development/python-modules/python-lsp-jsonrpc { };
+
   python-lsp-ruff = callPackage ../development/python-modules/python-lsp-ruff { };
+
   python-lsp-server = callPackage ../development/python-modules/python-lsp-server { };
+
   python-ly = callPackage ../development/python-modules/python-ly { };
+
   python-lzf = callPackage ../development/python-modules/python-lzf { };
+
   python-lzo = callPackage ../development/python-modules/python-lzo { inherit (pkgs) lzo; };
+
   python-magic = callPackage ../development/python-modules/python-magic { };
+
   python-magnumclient = callPackage ../development/python-modules/python-magnumclient { };
+
   python-manilaclient = callPackage ../development/python-modules/python-manilaclient { };
+
   python-mapnik = callPackage ../development/python-modules/python-mapnik rec {
     inherit (pkgs)
       pkg-config
@@ -8097,108 +14760,207 @@ self: super: with self; {
     harfbuzz = pkgs.harfbuzz.override { withIcu = true; };
     mapnik = pkgs.mapnik.override { inherit boost harfbuzz; };
   };
+
   python-markdown-math = callPackage ../development/python-modules/python-markdown-math { };
+
   python-matter-server = callPackage ../development/python-modules/python-matter-server { };
+
   python-mbedtls = callPackage ../development/python-modules/python-mbedtls { };
+
   python-melcloud = callPackage ../development/python-modules/python-melcloud { };
+
   python-memcached = callPackage ../development/python-modules/python-memcached {
     inherit (pkgs) memcached;
   };
+
   python-miio = callPackage ../development/python-modules/python-miio { };
+
   python-mimeparse = callPackage ../development/python-modules/python-mimeparse { };
+
   python-mistralclient = callPackage ../development/python-modules/python-mistralclient { };
+
   python-mnist = callPackage ../development/python-modules/python-mnist { };
+
   python-motionmount = callPackage ../development/python-modules/python-motionmount { };
+
   python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { };
+
   python-multipart = callPackage ../development/python-modules/python-multipart { };
+
   python-musicpd = callPackage ../development/python-modules/python-musicpd { };
+
   python-mystrom = callPackage ../development/python-modules/python-mystrom { };
+
   python-ndn = callPackage ../development/python-modules/python-ndn { };
+
   python-nest = callPackage ../development/python-modules/python-nest { };
+
   python-neutronclient = callPackage ../development/python-modules/python-neutronclient { };
+
   python-nmap = callPackage ../development/python-modules/python-nmap { };
+
   python-nomad = callPackage ../development/python-modules/python-nomad { };
+
   python-novaclient = callPackage ../development/python-modules/python-novaclient { };
+
   python-nvd3 = callPackage ../development/python-modules/python-nvd3 { };
+
   python-oauth2 = callPackage ../development/python-modules/python-oauth2 { };
+
   python-obfuscator = callPackage ../development/python-modules/python-obfuscator { };
+
   python-octaviaclient = callPackage ../development/python-modules/python-octaviaclient { };
+
   python-olm = callPackage ../development/python-modules/python-olm { };
+
   python-on-whales = callPackage ../development/python-modules/python-on-whales { };
+
   python-open-router = callPackage ../development/python-modules/python-open-router { };
+
   python-opendata-transport = callPackage ../development/python-modules/python-opendata-transport { };
+
   python-openems = callPackage ../development/python-modules/python-openems { };
+
   python-opensky = callPackage ../development/python-modules/python-opensky { };
+
   python-openstackclient = callPackage ../development/python-modules/python-openstackclient { };
+
   python-openzwave = callPackage ../development/python-modules/python-openzwave { };
+
   python-osc = callPackage ../development/python-modules/python-osc { };
+
   python-otbr-api = callPackage ../development/python-modules/python-otbr-api { };
+
   python-overseerr = callPackage ../development/python-modules/python-overseerr { };
+
   python-owasp-zap-v2-4 = callPackage ../development/python-modules/python-owasp-zap-v2-4 { };
+
   python-oxmsg = callPackage ../development/python-modules/python-oxmsg { };
+
   python-packer = callPackage ../development/python-modules/python-packer { };
+
   python-pae = callPackage ../development/python-modules/python-pae { };
+
   python-pam = callPackage ../development/python-modules/python-pam { inherit (pkgs) pam; };
+
   python-periphery = callPackage ../development/python-modules/python-periphery { };
+
   python-picnic-api2 = callPackage ../development/python-modules/python-picnic-api2 { };
+
   python-pidfile = callPackage ../development/python-modules/python-pidfile { };
+
   python-pipedrive = callPackage ../development/python-modules/python-pipedrive { };
+
   python-pkcs11 = callPackage ../development/python-modules/python-pkcs11 { };
+
   python-poppler = callPackage ../development/python-modules/python-poppler { };
+
   python-pptx = callPackage ../development/python-modules/python-pptx { };
+
   python-prctl = callPackage ../development/python-modules/python-prctl { };
+
   python-ptrace = callPackage ../development/python-modules/python-ptrace { };
+
   python-qt = toPythonModule (pkgs.python-qt.override { python3 = self.python; });
+
   python-rabbitair = callPackage ../development/python-modules/python-rabbitair { };
+
   python-rapidjson = callPackage ../development/python-modules/python-rapidjson { };
+
   python-redis-lock = callPackage ../development/python-modules/python-redis-lock { };
+
   python-registry = callPackage ../development/python-modules/python-registry { };
+
   python-roborock = callPackage ../development/python-modules/python-roborock { };
+
   python-rtmidi = callPackage ../development/python-modules/python-rtmidi { };
+
   python-sat = callPackage ../development/python-modules/python-sat { };
+
   python-secp256k1-cardano = callPackage ../development/python-modules/python-secp256k1-cardano { };
+
   python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat { };
+
   python-slugify = callPackage ../development/python-modules/python-slugify { };
+
   python-smarttub = callPackage ../development/python-modules/python-smarttub { };
+
   python-snap7 = callPackage ../development/python-modules/python-snap7 { inherit (pkgs) snap7; };
+
   python-snappy = callPackage ../development/python-modules/python-snappy {
     snappy-cpp = pkgs.snappy;
   };
+
   python-snoo = callPackage ../development/python-modules/python-snoo { };
+
   python-socketio = callPackage ../development/python-modules/python-socketio { };
+
   python-socketio-v4 = callPackage ../development/python-modules/python-socketio-v4 { };
+
   python-socks = callPackage ../development/python-modules/python-socks { };
+
   python-songpal = callPackage ../development/python-modules/python-songpal { };
+
   python-speech-features = callPackage ../development/python-modules/python-speech-features { };
+
   python-sql = callPackage ../development/python-modules/python-sql { };
+
   python-status = callPackage ../development/python-modules/python-status { };
+
   python-stdnum = callPackage ../development/python-modules/python-stdnum { };
+
   python-string-utils = callPackage ../development/python-modules/python-string-utils { };
+
   python-swiftclient = callPackage ../development/python-modules/python-swiftclient { };
+
   python-tado = callPackage ../development/python-modules/python-tado { };
+
   python-tds = callPackage ../development/python-modules/python-tds { };
+
   python-technove = callPackage ../development/python-modules/python-technove { };
+
   python-telegram = callPackage ../development/python-modules/python-telegram { };
+
   python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { };
+
   python-toolbox = callPackage ../development/python-modules/python-toolbox { };
+
   python-transip = callPackage ../development/python-modules/python-transip { };
+
   python-troveclient = callPackage ../development/python-modules/python-troveclient { };
+
   python-trovo = callPackage ../development/python-modules/python-trovo { };
+
   python-tsp = callPackage ../development/python-modules/python-tsp { };
+
   python-twitch-client = callPackage ../development/python-modules/python-twitch-client { };
+
   python-twitter = callPackage ../development/python-modules/python-twitter { };
+
   python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { };
+
   python-u2flib-server = callPackage ../development/python-modules/python-u2flib-server { };
+
   python-uinput = callPackage ../development/python-modules/python-uinput { };
+
   python-ulid = callPackage ../development/python-modules/python-ulid { };
+
   python-utils = callPackage ../development/python-modules/python-utils { };
+
   python-vagrant = callPackage ../development/python-modules/python-vagrant { };
+
   python-velbus = callPackage ../development/python-modules/python-velbus { };
+
   python-vipaccess = callPackage ../development/python-modules/python-vipaccess { };
+
   python-vlc = callPackage ../development/python-modules/python-vlc { };
+
   python-watcherclient = callPackage ../development/python-modules/python-watcherclient { };
+
   python-whois = callPackage ../development/python-modules/python-whois { };
+
   python-wink = callPackage ../development/python-modules/python-wink { };
+
   python-xapp = callPackage ../development/python-modules/python-xapp {
     inherit (pkgs.buildPackages) meson;
     inherit (pkgs)
@@ -8208,25 +14970,45 @@ self: super: with self; {
       xapp
       ;
   };
+
   python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { };
+
   python-xz = callPackage ../development/python-modules/python-xz { };
+
   python-yakh = callPackage ../development/python-modules/python-yakh { };
+
   python-yate = callPackage ../development/python-modules/python-yate { };
+
   python-youtube = callPackage ../development/python-modules/python-youtube { };
+
   python-zaqarclient = callPackage ../development/python-modules/python-zaqarclient { };
+
   python-zbar = callPackage ../development/python-modules/python-zbar { };
+
   python-zunclient = callPackage ../development/python-modules/python-zunclient { };
+
   python3-application = callPackage ../development/python-modules/python3-application { };
+
   python3-eventlib = callPackage ../development/python-modules/python3-eventlib { };
+
   python3-gnutls = callPackage ../development/python-modules/python3-gnutls { };
+
   python3-openid = callPackage ../development/python-modules/python3-openid { };
+
   python3-saml = callPackage ../development/python-modules/python3-saml { };
+
   pythondialog = callPackage ../development/python-modules/pythondialog { };
+
   pythonefl = callPackage ../development/python-modules/python-efl { };
+
   pythonegardia = callPackage ../development/python-modules/pythonegardia { };
+
   pythonfinder = callPackage ../development/python-modules/pythonfinder { };
+
   pythonkuma = callPackage ../development/python-modules/pythonkuma { };
+
   pythonnet = callPackage ../development/python-modules/pythonnet { };
+
   pythonocc-core = toPythonModule (
     callPackage ../development/python-modules/pythonocc-core {
       inherit (pkgs) fontconfig rapidjson;
@@ -8238,870 +15020,1674 @@ self: super: with self; {
         ;
     }
   );
+
   pythonqwt = callPackage ../development/python-modules/pythonqwt { };
+
   pythran = callPackage ../development/python-modules/pythran { inherit (pkgs.llvmPackages) openmp; };
+
   pythreejs = callPackage ../development/python-modules/pythreejs { };
+
   pytibber = callPackage ../development/python-modules/pytibber { };
+
   pytikz-allefeld = callPackage ../development/python-modules/pytikz-allefeld { };
+
   pytile = callPackage ../development/python-modules/pytile { };
+
   pytimeparse = callPackage ../development/python-modules/pytimeparse { };
+
   pytimeparse2 = callPackage ../development/python-modules/pytimeparse2 { };
+
   pytinyrenderer = callPackage ../development/python-modules/pytinyrenderer { };
+
   pytlv = callPackage ../development/python-modules/pytlv { };
+
   pytm = callPackage ../development/python-modules/pytm { };
+
   pytmx = callPackage ../development/python-modules/pytmx { };
+
   pytomlpp = callPackage ../development/python-modules/pytomlpp { };
+
   pytomorrowio = callPackage ../development/python-modules/pytomorrowio { };
+
   pytoolconfig = callPackage ../development/python-modules/pytoolconfig { };
+
   pytools = callPackage ../development/python-modules/pytools { };
+
   pytorch-bench = callPackage ../development/python-modules/pytorch-bench { };
+
   pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { };
+
   pytorch-memlab = callPackage ../development/python-modules/pytorch-memlab { };
+
   pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { };
+
   pytorch-msssim = callPackage ../development/python-modules/pytorch-msssim { };
+
   pytorch-pfn-extras = callPackage ../development/python-modules/pytorch-pfn-extras { };
+
   pytorch3d = callPackage ../development/python-modules/pytorch3d { };
+
   pytouchline-extended = callPackage ../development/python-modules/pytouchline-extended { };
+
   pytouchlinesl = callPackage ../development/python-modules/pytouchlinesl { };
+
   pytraccar = callPackage ../development/python-modules/pytraccar { };
+
   pytradfri = callPackage ../development/python-modules/pytradfri { };
+
   pytrafikverket = callPackage ../development/python-modules/pytrafikverket { };
+
   pytransportnsw = callPackage ../development/python-modules/pytransportnsw { };
+
   pytransportnswv2 = callPackage ../development/python-modules/pytransportnswv2 { };
+
   pytrydan = callPackage ../development/python-modules/pytrydan { };
+
   pyttsx3 = callPackage ../development/python-modules/pyttsx3 { };
+
   pytube = callPackage ../development/python-modules/pytube { };
+
   pytubefix = callPackage ../development/python-modules/pytubefix { };
+
   pytun = callPackage ../development/python-modules/pytun { };
+
   pyturbojpeg = callPackage ../development/python-modules/pyturbojpeg { };
+
   pytweening = callPackage ../development/python-modules/pytweening { };
+
   pytz = callPackage ../development/python-modules/pytz {
     inherit (pkgs) tzdata;
   };
+
   pytz-deprecation-shim = callPackage ../development/python-modules/pytz-deprecation-shim { };
+
   pyu2f = callPackage ../development/python-modules/pyu2f { };
+
   pyuca = callPackage ../development/python-modules/pyuca { };
+
   pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) udev; };
+
   pyunbound = callPackage ../development/python-modules/pyunbound { };
+
   pyunifi = callPackage ../development/python-modules/pyunifi { };
+
   pyunormalize = callPackage ../development/python-modules/pyunormalize { };
+
   pyunpack = callPackage ../development/python-modules/pyunpack { };
+
   pyupdate = callPackage ../development/python-modules/pyupdate { };
+
   pyupgrade = callPackage ../development/python-modules/pyupgrade { };
+
   pyuptimerobot = callPackage ../development/python-modules/pyuptimerobot { };
+
   pyusb = callPackage ../development/python-modules/pyusb { inherit (pkgs) libusb1; };
+
   pyuseragents = callPackage ../development/python-modules/pyuseragents { };
+
   pyutil = callPackage ../development/python-modules/pyutil { };
+
   pyuv = callPackage ../development/python-modules/pyuv { };
+
   pyvcd = callPackage ../development/python-modules/pyvcd { };
+
   pyvera = callPackage ../development/python-modules/pyvera { };
+
   pyverilog = callPackage ../development/python-modules/pyverilog { };
+
   pyvers = callPackage ../development/python-modules/pyvers { };
+
   pyversasense = callPackage ../development/python-modules/pyversasense { };
+
   pyvesync = callPackage ../development/python-modules/pyvesync { };
+
   pyvex = callPackage ../development/python-modules/pyvex { };
+
   pyvicare = callPackage ../development/python-modules/pyvicare { };
+
   pyvips = callPackage ../development/python-modules/pyvips { inherit (pkgs) vips glib; };
+
   pyvirtualdisplay = callPackage ../development/python-modules/pyvirtualdisplay { };
+
   pyvis = callPackage ../development/python-modules/pyvis { };
+
   pyvisa = callPackage ../development/python-modules/pyvisa { };
+
   pyvisa-py = callPackage ../development/python-modules/pyvisa-py { };
+
   pyvisa-sim = callPackage ../development/python-modules/pyvisa-sim { };
+
   pyvista = callPackage ../development/python-modules/pyvista { };
+
   pyviz-comms = callPackage ../development/python-modules/pyviz-comms { };
+
   pyvizio = callPackage ../development/python-modules/pyvizio { };
+
   pyvlx = callPackage ../development/python-modules/pyvlx { };
+
   pyvmomi = callPackage ../development/python-modules/pyvmomi { };
+
   pyvo = callPackage ../development/python-modules/pyvo { };
+
   pyvolumio = callPackage ../development/python-modules/pyvolumio { };
+
   pyvoro = callPackage ../development/python-modules/pyvoro { };
+
   pyvows = callPackage ../development/python-modules/pyvows { };
+
   pyw215 = callPackage ../development/python-modules/pyw215 { };
+
   pywal = callPackage ../development/python-modules/pywal { };
+
   pywatchman = callPackage ../development/python-modules/pywatchman { };
+
   pywaterkotte = callPackage ../development/python-modules/pywaterkotte { };
+
   pywavefront = callPackage ../development/python-modules/pywavefront { };
+
   pywavelets = callPackage ../development/python-modules/pywavelets { };
+
   pywayland = callPackage ../development/python-modules/pywayland { };
+
   pywaze = callPackage ../development/python-modules/pywaze { };
+
   pywbem = callPackage ../development/python-modules/pywbem { inherit (pkgs) libxml2; };
+
   pyweatherflowrest = callPackage ../development/python-modules/pyweatherflowrest { };
+
   pyweatherflowudp = callPackage ../development/python-modules/pyweatherflowudp { };
+
   pywebcopy = callPackage ../development/python-modules/pywebcopy { };
+
   pywebpush = callPackage ../development/python-modules/pywebpush { };
+
   pywebview = callPackage ../development/python-modules/pywebview { };
+
   pywemo = callPackage ../development/python-modules/pywemo { };
+
   pywerview = callPackage ../development/python-modules/pywerview { };
+
   pywfa = callPackage ../development/python-modules/pywfa { };
+
   pywikibot = callPackage ../development/python-modules/pywikibot { };
+
   pywilight = callPackage ../development/python-modules/pywilight { };
+
   pywinbox = callPackage ../development/python-modules/pywinbox { };
+
   pywinctl = callPackage ../development/python-modules/pywinctl { };
+
   pywinrm = callPackage ../development/python-modules/pywinrm { };
+
   pywizlight = callPackage ../development/python-modules/pywizlight { };
+
   pywlroots = callPackage ../development/python-modules/pywlroots { wlroots = pkgs.wlroots_0_17; };
+
   pywmspro = callPackage ../development/python-modules/pywmspro { };
+
   pyworld = callPackage ../development/python-modules/pyworld { };
+
   pyworxcloud = callPackage ../development/python-modules/pyworxcloud { };
+
   pyws66i = callPackage ../development/python-modules/pyws66i { };
+
   pyx = callPackage ../development/python-modules/pyx { };
+
   pyxattr = callPackage ../development/python-modules/pyxattr { };
+
   pyxbe = callPackage ../development/python-modules/pyxbe { };
+
   pyxdg = callPackage ../development/python-modules/pyxdg { };
+
   pyxeoma = callPackage ../development/python-modules/pyxeoma { };
+
   pyxiaomigateway = callPackage ../development/python-modules/pyxiaomigateway { };
+
   pyxl3 = callPackage ../development/python-modules/pyxl3 { };
+
   pyxlsb = callPackage ../development/python-modules/pyxlsb { };
+
   pyxnat = callPackage ../development/python-modules/pyxnat { };
+
   pyyaml = callPackage ../development/python-modules/pyyaml { };
+
   pyyaml-env-tag = callPackage ../development/python-modules/pyyaml-env-tag { };
+
   pyyaml-ft = callPackage ../development/python-modules/pyyaml-ft { };
+
   pyyaml-include = callPackage ../development/python-modules/pyyaml-include { };
+
   pyyardian = callPackage ../development/python-modules/pyyardian { };
+
   pyytlounge = callPackage ../development/python-modules/pyytlounge { };
+
   pyzabbix = callPackage ../development/python-modules/pyzabbix { };
+
   pyzbar = callPackage ../development/python-modules/pyzbar { };
+
   pyzerproc = callPackage ../development/python-modules/pyzerproc { };
+
   pyzipper = callPackage ../development/python-modules/pyzipper { };
+
   pyzmq = callPackage ../development/python-modules/pyzmq { };
+
   pyzstd = callPackage ../development/python-modules/pyzstd { zstd-c = pkgs.zstd; };
+
   pyzx = callPackage ../development/python-modules/pyzx { };
+
   qasync = callPackage ../development/python-modules/qasync { };
+
   qbittorrent-api = callPackage ../development/python-modules/qbittorrent-api { };
+
   qbusmqttapi = callPackage ../development/python-modules/qbusmqttapi { };
+
   qcelemental = callPackage ../development/python-modules/qcelemental { };
+
   qcengine = callPackage ../development/python-modules/qcengine { };
+
   qcodes = callPackage ../development/python-modules/qcodes { };
+
   qcodes-contrib-drivers = callPackage ../development/python-modules/qcodes-contrib-drivers { };
+
   qcs-api-client = callPackage ../development/python-modules/qcs-api-client { };
+
   qcs-api-client-common = callPackage ../development/python-modules/qcs-api-client-common { };
+
   qcs-sdk-python = callPackage ../development/python-modules/qcs-sdk-python { };
+
   qdarkstyle = callPackage ../development/python-modules/qdarkstyle { };
+
   qdldl = callPackage ../development/python-modules/qdldl { };
+
   qdrant-client = callPackage ../development/python-modules/qdrant-client { };
+
   qemu = callPackage ../development/python-modules/qemu { qemu = pkgs.qemu; };
+
   qgrid = callPackage ../development/python-modules/qgrid { };
+
   qiling = callPackage ../development/python-modules/qiling { };
+
   qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { };
+
   qingping-ble = callPackage ../development/python-modules/qingping-ble { };
+
   qiskit = callPackage ../development/python-modules/qiskit { };
+
   qiskit-aer = callPackage ../development/python-modules/qiskit-aer { };
+
   qiskit-finance = callPackage ../development/python-modules/qiskit-finance { };
+
   qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { };
+
   qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { };
+
   qiskit-machine-learning = callPackage ../development/python-modules/qiskit-machine-learning { };
+
   qiskit-nature = callPackage ../development/python-modules/qiskit-nature { };
+
   qiskit-optimization = callPackage ../development/python-modules/qiskit-optimization { };
+
   qiskit-terra = callPackage ../development/python-modules/qiskit-terra { };
+
   qnap-qsw = callPackage ../development/python-modules/qnap-qsw { };
+
   qnapstats = callPackage ../development/python-modules/qnapstats { };
+
   qpageview = callPackage ../development/python-modules/qpageview { };
+
   qpsolvers = callPackage ../development/python-modules/qpsolvers { };
+
   qrcode = callPackage ../development/python-modules/qrcode { };
+
   qrcode-terminal = callPackage ../development/python-modules/qrcode-terminal { };
+
   qreactor = callPackage ../development/python-modules/qreactor { };
+
   qscintilla = self.qscintilla-qt5;
+
   qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla {
     pythonPackages = self;
   };
+
   qscintilla-qt6 = pkgs.qt6Packages.callPackage ../development/python-modules/qscintilla {
     pythonPackages = self;
   };
+
   qstylizer = callPackage ../development/python-modules/qstylizer { };
+
   qt-material = callPackage ../development/python-modules/qt-material { };
+
   qt5reactor = callPackage ../development/python-modules/qt5reactor { };
+
   qt6 = pkgs.qt6.override { python3 = self.python; };
+
   qtawesome = callPackage ../development/python-modules/qtawesome { };
+
   qtconsole = callPackage ../development/python-modules/qtconsole { };
+
   qtile = callPackage ../development/python-modules/qtile { wlroots = pkgs.wlroots_0_17; };
+
   qtile-bonsai = callPackage ../development/python-modules/qtile-bonsai { };
+
   qtile-extras = callPackage ../development/python-modules/qtile-extras { };
+
   qtpy = callPackage ../development/python-modules/qtpy { };
+
   quadprog = callPackage ../development/python-modules/quadprog { };
+
   qualysclient = callPackage ../development/python-modules/qualysclient { };
+
   quandl = callPackage ../development/python-modules/quandl { };
+
   quantile-forest = callPackage ../development/python-modules/quantile-forest { };
+
   quantile-python = callPackage ../development/python-modules/quantile-python { };
+
   quantiphy = callPackage ../development/python-modules/quantiphy { };
+
   quantiphy-eval = callPackage ../development/python-modules/quantiphy-eval { };
+
   quantities = callPackage ../development/python-modules/quantities { };
+
   quantulum3 = callPackage ../development/python-modules/quantulum3 { };
+
   quantum-gateway = callPackage ../development/python-modules/quantum-gateway { };
+
   quart = callPackage ../development/python-modules/quart { };
+
   quart-cors = callPackage ../development/python-modules/quart-cors { };
+
   quart-schema = callPackage ../development/python-modules/quart-schema { };
+
   quaternion = callPackage ../development/python-modules/quaternion { };
+
   qudida = callPackage ../development/python-modules/qudida { };
+
   querystring-parser = callPackage ../development/python-modules/querystring-parser { };
+
   questionary = callPackage ../development/python-modules/questionary { };
+
   questo = callPackage ../development/python-modules/questo { };
+
   queuelib = callPackage ../development/python-modules/queuelib { };
+
   quickjs = callPackage ../development/python-modules/quickjs { };
+
   quil = callPackage ../development/python-modules/quil { };
+
   quixote = callPackage ../development/python-modules/quixote { };
+
   qutip = callPackage ../development/python-modules/qutip { };
+
   r2pipe = callPackage ../development/python-modules/r2pipe { };
+
   rachiopy = callPackage ../development/python-modules/rachiopy { };
+
   radicale-infcloud = callPackage ../development/python-modules/radicale-infcloud {
     radicale = pkgs.radicale.override { python3 = python; };
   };
+
   radio-beam = callPackage ../development/python-modules/radio-beam { };
+
   radios = callPackage ../development/python-modules/radios { };
+
   radiotherm = callPackage ../development/python-modules/radiotherm { };
+
   radish-bdd = callPackage ../development/python-modules/radish-bdd { };
+
   radixtarget = callPackage ../development/python-modules/radixtarget { };
+
   radon = callPackage ../development/python-modules/radon { };
+
   railroad-diagrams = callPackage ../development/python-modules/railroad-diagrams { };
+
   rainbowstream = callPackage ../development/python-modules/rainbowstream { };
+
   raincloudy = callPackage ../development/python-modules/raincloudy { };
+
   ramlfications = callPackage ../development/python-modules/ramlfications { };
+
   random-user-agent = callPackage ../development/python-modules/random-user-agent { };
+
   random2 = callPackage ../development/python-modules/random2 { };
+
   randomfiletree = callPackage ../development/python-modules/randomfiletree { };
+
   range-typed-integers = callPackage ../development/python-modules/range-typed-integers { };
+
   rangehttpserver = callPackage ../development/python-modules/rangehttpserver { };
+
   rangeparser = callPackage ../development/python-modules/rangeparser { };
+
   rank-bm25 = callPackage ../development/python-modules/rank-bm25 { };
+
   rapidfuzz = callPackage ../development/python-modules/rapidfuzz { };
+
   rapidfuzz-capi = callPackage ../development/python-modules/rapidfuzz-capi { };
+
   rapidgzip = callPackage ../development/python-modules/rapidgzip { inherit (pkgs) nasm; };
+
   rapidocr-onnxruntime = callPackage ../development/python-modules/rapidocr-onnxruntime { };
+
   rapt-ble = callPackage ../development/python-modules/rapt-ble { };
+
   rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; };
+
   rasterio = callPackage ../development/python-modules/rasterio { };
+
   ratarmount = callPackage ../development/python-modules/ratarmount { };
+
   ratarmountcore = callPackage ../development/python-modules/ratarmountcore { inherit (pkgs) zstd; };
+
   ratelim = callPackage ../development/python-modules/ratelim { };
+
   ratelimit = callPackage ../development/python-modules/ratelimit { };
+
   raven = callPackage ../development/python-modules/raven { };
+
   rawkit = callPackage ../development/python-modules/rawkit { };
+
   rawpy = callPackage ../development/python-modules/rawpy { };
+
   ray = callPackage ../development/python-modules/ray { };
+
   raylib-python-cffi = callPackage ../development/python-modules/raylib-python-cffi { };
+
   razdel = callPackage ../development/python-modules/razdel { };
+
   rbtools = callPackage ../development/python-modules/rbtools { };
+
   rchitect = callPackage ../development/python-modules/rchitect { };
+
   rclone-python = callPackage ../development/python-modules/rclone-python { };
+
   rcssmin = callPackage ../development/python-modules/rcssmin { };
+
   rctclient = callPackage ../development/python-modules/rctclient { };
+
   rdbtools = callPackage ../development/python-modules/rdbtools { };
+
   rdflib = callPackage ../development/python-modules/rdflib { };
+
   rdkit = callPackage ../development/python-modules/rdkit {
     boost = pkgs.boost.override {
       enablePython = true;
       inherit python;
     };
   };
+
   re-assert = callPackage ../development/python-modules/re-assert { };
+
   reactionmenu = callPackage ../development/python-modules/reactionmenu { };
+
   reactivex = callPackage ../development/python-modules/reactivex { };
+
   readabilipy = callPackage ../development/python-modules/readabilipy { };
+
   readability-lxml = callPackage ../development/python-modules/readability-lxml { };
+
   readchar = callPackage ../development/python-modules/readchar { };
+
   readlike = callPackage ../development/python-modules/readlike { };
+
   readmdict = callPackage ../development/python-modules/readmdict { };
+
   readme = callPackage ../development/python-modules/readme { };
+
   readme-renderer = callPackage ../development/python-modules/readme-renderer { };
+
   readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { };
+
   realtime = callPackage ../development/python-modules/realtime { };
+
   rebulk = callPackage ../development/python-modules/rebulk { };
+
   recipe-scrapers = callPackage ../development/python-modules/recipe-scrapers { };
+
   recline = callPackage ../development/python-modules/recline { };
+
   recoll = toPythonModule (pkgs.recoll.override { python3Packages = self; });
+
   recommonmark = callPackage ../development/python-modules/recommonmark { };
+
   reconplogger = callPackage ../development/python-modules/reconplogger { };
+
   recordlinkage = callPackage ../development/python-modules/recordlinkage { };
+
   rectangle-packer = callPackage ../development/python-modules/rectangle-packer { };
+
   rectpack = callPackage ../development/python-modules/rectpack { };
+
   recurring-ical-events = callPackage ../development/python-modules/recurring-ical-events { };
+
   recursive-pth-loader = toPythonModule (
     callPackage ../development/python-modules/recursive-pth-loader { }
   );
+
   recursivenodes = callPackage ../development/python-modules/recursivenodes { };
+
   red-black-tree-mod = callPackage ../development/python-modules/red-black-tree-mod { };
+
   redbaron = callPackage ../development/python-modules/redbaron { };
+
   redis = callPackage ../development/python-modules/redis { };
+
   redis-om = callPackage ../development/python-modules/redis-om { };
+
   redshift-connector = callPackage ../development/python-modules/redshift-connector { };
+
   reedsolo = callPackage ../development/python-modules/reedsolo { };
+
   referencing = callPackage ../development/python-modules/referencing { };
+
   refery = callPackage ../development/python-modules/refery { };
+
   reflex = callPackage ../development/python-modules/reflex { };
+
   reflex-chakra = callPackage ../development/python-modules/reflex-chakra { };
+
   reflex-hosting-cli = callPackage ../development/python-modules/reflex-hosting-cli { };
+
   reflink = callPackage ../development/python-modules/reflink { };
+
   refoss-ha = callPackage ../development/python-modules/refoss-ha { };
+
   regenmaschine = callPackage ../development/python-modules/regenmaschine { };
+
   regex = callPackage ../development/python-modules/regex { };
+
   regional = callPackage ../development/python-modules/regional { };
+
   regress = callPackage ../development/python-modules/regress { };
+
   reikna = callPackage ../development/python-modules/reikna { };
+
   related = callPackage ../development/python-modules/related { };
+
   relatorio = callPackage ../development/python-modules/relatorio { };
+
   releases = callPackage ../development/python-modules/releases { };
+
   remarshal = callPackage ../development/python-modules/remarshal { };
+
   rembg = callPackage ../development/python-modules/rembg { };
+
   remctl = callPackage ../development/python-modules/remctl { remctl-c = pkgs.remctl; };
+
   remi = callPackage ../development/python-modules/remi { };
+
   remote-pdb = callPackage ../development/python-modules/remote-pdb { };
+
   remotezip = callPackage ../development/python-modules/remotezip { };
+
   renault-api = callPackage ../development/python-modules/renault-api { };
+
   rencode = callPackage ../development/python-modules/rencode { };
+
   rendercv-fonts = callPackage ../development/python-modules/rendercv-fonts { };
+
   reno = callPackage ../development/python-modules/reno { };
+
   renson-endura-delta = callPackage ../development/python-modules/renson-endura-delta { };
+
   reolink = callPackage ../development/python-modules/reolink { };
+
   reolink-aio = callPackage ../development/python-modules/reolink-aio { };
+
   reorder-python-imports = callPackage ../development/python-modules/reorder-python-imports { };
+
   reparser = callPackage ../development/python-modules/reparser { };
+
   repath = callPackage ../development/python-modules/repath { };
+
   repeated-test = callPackage ../development/python-modules/repeated-test { };
+
   repl-python-wakatime = callPackage ../development/python-modules/repl-python-wakatime { };
+
   replicate = callPackage ../development/python-modules/replicate { };
+
   reportlab = callPackage ../development/python-modules/reportlab { };
+
   reportlab-qrcode = callPackage ../development/python-modules/reportlab-qrcode { };
+
   repoze-lru = callPackage ../development/python-modules/repoze-lru { };
+
   repoze-sphinx-autointerface =
     callPackage ../development/python-modules/repoze-sphinx-autointerface
       { };
+
   repoze-who = callPackage ../development/python-modules/repoze-who { };
+
   reprint = callPackage ../development/python-modules/reprint { };
+
   reproject = callPackage ../development/python-modules/reproject { };
+
   reprshed = callPackage ../development/python-modules/reprshed { };
+
   reptor = callPackage ../development/python-modules/reptor { };
+
   reqif = callPackage ../development/python-modules/reqif { };
+
   requests = callPackage ../development/python-modules/requests { };
+
   requests-aws4auth = callPackage ../development/python-modules/requests-aws4auth { };
+
   requests-cache = callPackage ../development/python-modules/requests-cache { };
+
   requests-credssp = callPackage ../development/python-modules/requests-credssp { };
+
   requests-download = callPackage ../development/python-modules/requests-download { };
+
   requests-file = callPackage ../development/python-modules/requests-file { };
+
   requests-futures = callPackage ../development/python-modules/requests-futures { };
+
   requests-gssapi = callPackage ../development/python-modules/requests-gssapi { };
+
   requests-hawk = callPackage ../development/python-modules/requests-hawk { };
+
   requests-http-signature = callPackage ../development/python-modules/requests-http-signature { };
+
   requests-kerberos = callPackage ../development/python-modules/requests-kerberos { };
+
   requests-mock = callPackage ../development/python-modules/requests-mock { };
+
   requests-ntlm = callPackage ../development/python-modules/requests-ntlm { };
+
   requests-oauthlib = callPackage ../development/python-modules/requests-oauthlib { };
+
   requests-pkcs12 = callPackage ../development/python-modules/requests-pkcs12 { };
+
   requests-ratelimiter = callPackage ../development/python-modules/requests-ratelimiter { };
+
   requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { };
+
   requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { };
+
   requests-unixsocket2 = callPackage ../development/python-modules/requests-unixsocket2 { };
+
   requests-wsgi-adapter = callPackage ../development/python-modules/requests-wsgi-adapter { };
+
   requestsexceptions = callPackage ../development/python-modules/requestsexceptions { };
+
   requirements-detector = callPackage ../development/python-modules/requirements-detector { };
+
   requirements-parser = callPackage ../development/python-modules/requirements-parser { };
+
   reretry = callPackage ../development/python-modules/reretry { };
+
   rerun-sdk = callPackage ../development/python-modules/rerun-sdk { };
+
   resampy = callPackage ../development/python-modules/resampy { };
+
   resend = callPackage ../development/python-modules/resend { };
+
   resize-right = callPackage ../development/python-modules/resize-right { };
+
   resolvelib = callPackage ../development/python-modules/resolvelib { };
+
   responses = callPackage ../development/python-modules/responses { };
+
   respx = callPackage ../development/python-modules/respx { };
+
   restfly = callPackage ../development/python-modules/restfly { };
+
   restrictedpython = callPackage ../development/python-modules/restrictedpython { };
+
   restructuredtext-lint = callPackage ../development/python-modules/restructuredtext-lint { };
+
   restview = callPackage ../development/python-modules/restview { };
+
   result = callPackage ../development/python-modules/result { };
+
   rethinkdb = callPackage ../development/python-modules/rethinkdb { };
+
   retinaface = callPackage ../development/python-modules/retinaface { };
+
   retry = callPackage ../development/python-modules/retry { };
+
   retry-decorator = callPackage ../development/python-modules/retry-decorator { };
+
   retry2 = callPackage ../development/python-modules/retry2 { };
+
   retrying = callPackage ../development/python-modules/retrying { };
+
   returns = callPackage ../development/python-modules/returns { };
+
   reuse = callPackage ../development/python-modules/reuse { };
+
   reverse-geocode = callPackage ../development/python-modules/reverse-geocode { };
+
   rfc3161-client = callPackage ../development/python-modules/rfc3161-client { };
+
   rfc3339 = callPackage ../development/python-modules/rfc3339 { };
+
   rfc3339-validator = callPackage ../development/python-modules/rfc3339-validator { };
+
   rfc3986 = callPackage ../development/python-modules/rfc3986 { };
+
   rfc3986-validator = callPackage ../development/python-modules/rfc3986-validator { };
+
   rfc3987 = callPackage ../development/python-modules/rfc3987 { };
+
   rfc3987-syntax = callPackage ../development/python-modules/rfc3987-syntax { };
+
   rfc6555 = callPackage ../development/python-modules/rfc6555 { };
+
   rfc7464 = callPackage ../development/python-modules/rfc7464 { };
+
   rfc8785 = callPackage ../development/python-modules/rfc8785 { };
+
   rfcat = callPackage ../development/python-modules/rfcat { };
+
   rflink = callPackage ../development/python-modules/rflink { };
+
   rgpio = toPythonModule (
     pkgs.lgpio.override {
       inherit buildPythonPackage;
       pyProject = "PY_RGPIO";
     }
   );
+
   rich = callPackage ../development/python-modules/rich { };
+
   rich-argparse = callPackage ../development/python-modules/rich-argparse { };
+
   rich-argparse-plus = callPackage ../development/python-modules/rich-argparse-plus { };
+
   rich-click = callPackage ../development/python-modules/rich-click { };
+
   rich-pixels = callPackage ../development/python-modules/rich-pixels { };
+
   rich-rst = callPackage ../development/python-modules/rich-rst { };
+
   rich-theme-manager = callPackage ../development/python-modules/rich-theme-manager { };
+
   rich-toolkit = callPackage ../development/python-modules/rich-toolkit { };
+
   riden = callPackage ../development/python-modules/riden { };
+
   rigour = callPackage ../development/python-modules/rigour { };
+
   ring-doorbell = callPackage ../development/python-modules/ring-doorbell { };
+
   rio-stac = callPackage ../development/python-modules/rio-stac { };
+
   rio-tiler = callPackage ../development/python-modules/rio-tiler { };
+
   rioxarray = callPackage ../development/python-modules/rioxarray { };
+
   ripe-atlas-cousteau = callPackage ../development/python-modules/ripe-atlas-cousteau { };
+
   ripe-atlas-sagan = callPackage ../development/python-modules/ripe-atlas-sagan { };
+
   riprova = callPackage ../development/python-modules/riprova { };
+
   ripser = callPackage ../development/python-modules/ripser { };
+
   riscof = callPackage ../development/python-modules/riscof { };
+
   riscv-config = callPackage ../development/python-modules/riscv-config { };
+
   riscv-isac = callPackage ../development/python-modules/riscv-isac { };
+
   ritassist = callPackage ../development/python-modules/ritassist { };
+
   rivet = toPythonModule (pkgs.rivet.override { python3 = python; });
+
   rjpl = callPackage ../development/python-modules/rjpl { };
+
   rjsmin = callPackage ../development/python-modules/rjsmin { };
+
   rki-covid-parser = callPackage ../development/python-modules/rki-covid-parser { };
+
   rkm-codes = callPackage ../development/python-modules/rkm-codes { };
+
   rlax = callPackage ../development/python-modules/rlax { };
+
   rlcard = callPackage ../development/python-modules/rlcard { };
+
   rlp = callPackage ../development/python-modules/rlp { };
+
   rmcl = callPackage ../development/python-modules/rmcl { };
+
   rmrl = callPackage ../development/python-modules/rmrl { };
+
   rmscene = callPackage ../development/python-modules/rmscene { };
+
   rmsd = callPackage ../development/python-modules/rmsd { };
+
   rnc2rng = callPackage ../development/python-modules/rnc2rng { };
+
   rnginline = callPackage ../development/python-modules/rnginline { };
+
   rns = callPackage ../development/python-modules/rns { };
+
   roadlib = callPackage ../development/python-modules/roadlib { };
+
   roadrecon = callPackage ../development/python-modules/roadrecon { };
+
   roadtools = callPackage ../development/python-modules/roadtools { };
+
   roadtx = callPackage ../development/python-modules/roadtx { };
+
   robomachine = callPackage ../development/python-modules/robomachine { };
+
   robot-descriptions = callPackage ../development/python-modules/robot-descriptions { };
+
   robot-detection = callPackage ../development/python-modules/robot-detection { };
+
   robotframework = callPackage ../development/python-modules/robotframework { };
+
   robotframework-assertion-engine =
     callPackage ../development/python-modules/robotframework-assertion-engine
       { };
+
   robotframework-databaselibrary =
     callPackage ../development/python-modules/robotframework-databaselibrary
       { };
+
   robotframework-excellib = callPackage ../development/python-modules/robotframework-excellib { };
+
   robotframework-pythonlibcore =
     callPackage ../development/python-modules/robotframework-pythonlibcore
       { };
+
   robotframework-requests = callPackage ../development/python-modules/robotframework-requests { };
+
   robotframework-selenium2library =
     callPackage ../development/python-modules/robotframework-selenium2library
       { };
+
   robotframework-seleniumlibrary =
     callPackage ../development/python-modules/robotframework-seleniumlibrary
       { };
+
   robotframework-sshlibrary = callPackage ../development/python-modules/robotframework-sshlibrary { };
+
   robotframework-tools = callPackage ../development/python-modules/robotframework-tools { };
+
   robotstatuschecker = callPackage ../development/python-modules/robotstatuschecker { };
+
   robotsuite = callPackage ../development/python-modules/robotsuite { };
+
   rocket-errbot = callPackage ../development/python-modules/rocket-errbot { };
+
   rocketchat-api = callPackage ../development/python-modules/rocketchat-api { };
+
   roku = callPackage ../development/python-modules/roku { };
+
   rokuecp = callPackage ../development/python-modules/rokuecp { };
+
   rollbar = callPackage ../development/python-modules/rollbar { };
+
   roma = callPackage ../development/python-modules/roma { };
+
   roman = callPackage ../development/python-modules/roman { };
+
   roman-numerals-py = callPackage ../development/python-modules/roman-numerals-py { };
+
   romy = callPackage ../development/python-modules/romy { };
+
   roombapy = callPackage ../development/python-modules/roombapy { };
+
   roonapi = callPackage ../development/python-modules/roonapi { };
+
   root = callPackage ../development/python-modules/root {
     inherit (pkgs) root;
   };
+
   rope = callPackage ../development/python-modules/rope { };
+
   ropgadget = callPackage ../development/python-modules/ropgadget { };
+
   ropper = callPackage ../development/python-modules/ropper { };
+
   rosbags = callPackage ../development/python-modules/rosbags { };
+
   rotary-embedding-torch = callPackage ../development/python-modules/rotary-embedding-torch { };
+
   rouge-score = callPackage ../development/python-modules/rouge-score { };
+
   routeros-api = callPackage ../development/python-modules/routeros-api { };
+
   routes = callPackage ../development/python-modules/routes { };
+
   rova = callPackage ../development/python-modules/rova { };
+
   rowan = callPackage ../development/python-modules/rowan { };
+
   rpcq = callPackage ../development/python-modules/rpcq { };
+
   rpdb = callPackage ../development/python-modules/rpdb { };
+
   rpds-py = callPackage ../development/python-modules/rpds-py { };
+
   rpi-bad-power = callPackage ../development/python-modules/rpi-bad-power { };
+
   rpi-gpio = callPackage ../development/python-modules/rpi-gpio { };
+
   rplcd = callPackage ../development/python-modules/rplcd { };
+
   rply = callPackage ../development/python-modules/rply { };
+
   rpm = toPythonModule (pkgs.rpm.override { python3 = self.python; });
+
   rpmfile = callPackage ../development/python-modules/rpmfile { };
+
   rpmfluff = callPackage ../development/python-modules/rpmfluff { };
+
   rpy2 = callPackage ../development/python-modules/rpy2 { inherit (pkgs) zstd; };
+
   rpyc = callPackage ../development/python-modules/rpyc { };
+
   rq = callPackage ../development/python-modules/rq { };
+
   rrdtool = callPackage ../development/python-modules/rrdtool { };
+
   rsa = callPackage ../development/python-modules/rsa { };
+
   rsskey = callPackage ../development/python-modules/rsskey { };
+
   rst2ansi = callPackage ../development/python-modules/rst2ansi { };
+
   rst2pdf = callPackage ../development/python-modules/rst2pdf { };
+
   rstcheck = callPackage ../development/python-modules/rstcheck { };
+
   rstcheck-core = callPackage ../development/python-modules/rstcheck-core { };
+
   rstr = callPackage ../development/python-modules/rstr { };
+
   rtb-data = callPackage ../development/python-modules/rtb-data { };
+
   rtfde = callPackage ../development/python-modules/rtfde { };
+
   rtfunicode = callPackage ../development/python-modules/rtfunicode { };
+
   rtmapi = callPackage ../development/python-modules/rtmapi { };
+
   rtmidi-python = callPackage ../development/python-modules/rtmidi-python { };
+
   rtmixer = callPackage ../development/python-modules/rtmixer { };
+
   rtoml = callPackage ../development/python-modules/rtoml { };
+
   rtp = callPackage ../development/python-modules/rtp { };
+
   rtree = callPackage ../development/python-modules/rtree { inherit (pkgs) libspatialindex; };
+
   rtslib-fb = callPackage ../development/python-modules/rtslib-fb { };
+
   rtsp-to-webrtc = callPackage ../development/python-modules/rtsp-to-webrtc { };
+
   ruamel-base = callPackage ../development/python-modules/ruamel-base { };
+
   ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml { };
+
   ruamel-yaml-clib = callPackage ../development/python-modules/ruamel-yaml-clib { };
+
   ruamel-yaml-string = callPackage ../development/python-modules/ruamel-yaml-string { };
+
   rubicon-objc = callPackage ../development/python-modules/rubicon-objc { };
+
   rubymarshal = callPackage ../development/python-modules/rubymarshal { };
+
   rucio = callPackage ../development/python-modules/rucio { };
+
   ruff = callPackage ../development/python-modules/ruff { inherit (pkgs) ruff; };
+
   ruff-api = callPackage ../development/python-modules/ruff-api { };
+
   ruffus = callPackage ../development/python-modules/ruffus { };
+
   rules = callPackage ../development/python-modules/rules { };
+
   rumps = callPackage ../development/python-modules/rumps { };
+
   runs = callPackage ../development/python-modules/runs { };
+
   runstats = callPackage ../development/python-modules/runstats { };
+
   rustworkx = callPackage ../development/python-modules/rustworkx { };
+
   ruuvitag-ble = callPackage ../development/python-modules/ruuvitag-ble { };
+
   ruyaml = callPackage ../development/python-modules/ruyaml { };
+
   rx = callPackage ../development/python-modules/rx { };
+
   rxv = callPackage ../development/python-modules/rxv { };
+
   ryd-client = callPackage ../development/python-modules/ryd-client { };
+
   rzpipe = callPackage ../development/python-modules/rzpipe { };
+
   s2clientprotocol = callPackage ../development/python-modules/s2clientprotocol { };
+
   s3-credentials = callPackage ../development/python-modules/s3-credentials { };
+
   s3fs = callPackage ../development/python-modules/s3fs { };
+
   s3transfer = callPackage ../development/python-modules/s3transfer { };
+
   sabctools = callPackage ../development/python-modules/sabctools { };
+
   sabyenc3 = callPackage ../development/python-modules/sabyenc3 { };
+
   sacn = callPackage ../development/python-modules/sacn { };
+
   sacrebleu = callPackage ../development/python-modules/sacrebleu { };
+
   sacremoses = callPackage ../development/python-modules/sacremoses { };
+
   safe-pysha3 = callPackage ../development/python-modules/safe-pysha3 { };
+
   safehttpx = callPackage ../development/python-modules/safehttpx { };
+
   safeio = callPackage ../development/python-modules/safeio { };
+
   safetensors = callPackage ../development/python-modules/safetensors { };
+
   safety = callPackage ../development/python-modules/safety { };
+
   safety-schemas = callPackage ../development/python-modules/safety-schemas { };
+
   sagemaker = callPackage ../development/python-modules/sagemaker { };
+
   sagemaker-core = callPackage ../development/python-modules/sagemaker-core { };
+
   sagemaker-mlflow = callPackage ../development/python-modules/sagemaker-mlflow { };
+
   salib = callPackage ../development/python-modules/salib { };
+
   salmon-mail = callPackage ../development/python-modules/salmon-mail { };
+
   samarium = callPackage ../development/python-modules/samarium { };
+
   samplerate = callPackage ../development/python-modules/samplerate { inherit (pkgs) libsamplerate; };
+
   samsungctl = callPackage ../development/python-modules/samsungctl { };
+
   samsungtvws = callPackage ../development/python-modules/samsungtvws { };
+
   sane = callPackage ../development/python-modules/sane { inherit (pkgs) sane-backends; };
+
   saneyaml = callPackage ../development/python-modules/saneyaml { };
+
   sanic = callPackage ../development/python-modules/sanic {
     # Don't pass any `sanic` to avoid dependency loops.  `sanic-testing`
     # has special logic to disable tests when this is the case.
     sanic-testing = self.sanic-testing.override { sanic = null; };
   };
+
   sanic-auth = callPackage ../development/python-modules/sanic-auth { };
+
   sanic-ext = callPackage ../development/python-modules/sanic-ext { };
+
   sanic-routing = callPackage ../development/python-modules/sanic-routing { };
+
   sanic-testing = callPackage ../development/python-modules/sanic-testing { };
+
   sanix = callPackage ../development/python-modules/sanix { };
+
   sansio-multipart = callPackage ../development/python-modules/sansio-multipart { };
+
   sarge = callPackage ../development/python-modules/sarge { };
+
   sarif-om = callPackage ../development/python-modules/sarif-om { };
+
   sarif-tools = callPackage ../development/python-modules/sarif-tools { };
+
   sasmodels = callPackage ../development/python-modules/sasmodels { };
+
   sat-tmp = callPackage ../development/python-modules/sat-tmp { };
+
   satel-integra = callPackage ../development/python-modules/satel-integra { };
+
   sbom2dot = callPackage ../development/python-modules/sbom2dot { };
+
   sbom4files = callPackage ../development/python-modules/sbom4files { };
+
   scalar-fastapi = callPackage ../development/python-modules/scalar-fastapi { };
+
   scalene = callPackage ../development/python-modules/scalene { };
+
   scales = callPackage ../development/python-modules/scales { };
+
   scancode-toolkit = callPackage ../development/python-modules/scancode-toolkit { };
+
   scapy = callPackage ../development/python-modules/scapy {
     inherit (pkgs) libpcap; # Avoid confusion with python package of the same name
   };
+
   scenedetect = callPackage ../development/python-modules/scenedetect { };
+
   schedula = callPackage ../development/python-modules/schedula { };
+
   schedule = callPackage ../development/python-modules/schedule { };
+
   scheduler = callPackage ../development/python-modules/scheduler { };
+
   schema = callPackage ../development/python-modules/schema { };
+
   schema-salad = callPackage ../development/python-modules/schema-salad { };
+
   schemainspect = callPackage ../development/python-modules/schemainspect { };
+
   schemdraw = callPackage ../development/python-modules/schemdraw { };
+
   schiene = callPackage ../development/python-modules/schiene { };
+
   scholarly = callPackage ../development/python-modules/scholarly { };
+
   schwifty = callPackage ../development/python-modules/schwifty { };
+
   scienceplots = callPackage ../development/python-modules/scienceplots { };
+
   sciform = callPackage ../development/python-modules/sciform { };
+
   scikit-base = callPackage ../development/python-modules/scikit-base { };
+
   scikit-bio = callPackage ../development/python-modules/scikit-bio { };
+
   scikit-build = callPackage ../development/python-modules/scikit-build { };
+
   scikit-build-core = callPackage ../development/python-modules/scikit-build-core { };
+
   scikit-fmm = callPackage ../development/python-modules/scikit-fmm { };
+
   scikit-fuzzy = callPackage ../development/python-modules/scikit-fuzzy { };
+
   scikit-hep-testdata = callPackage ../development/python-modules/scikit-hep-testdata { };
+
   scikit-image = callPackage ../development/python-modules/scikit-image { };
+
   scikit-learn = callPackage ../development/python-modules/scikit-learn { };
+
   scikit-learn-extra = callPackage ../development/python-modules/scikit-learn-extra { };
+
   scikit-misc = callPackage ../development/python-modules/scikit-misc { };
+
   scikit-posthocs = callPackage ../development/python-modules/scikit-posthocs { };
+
   scikit-rf = callPackage ../development/python-modules/scikit-rf { };
+
   scikit-survival = callPackage ../development/python-modules/scikit-survival { };
+
   scikit-tda = callPackage ../development/python-modules/scikit-tda { };
+
   scikits-odes = callPackage ../development/python-modules/scikits-odes { };
+
   scikits-odes-core = callPackage ../development/python-modules/scikits-odes-core { };
+
   scikits-odes-daepack = callPackage ../development/python-modules/scikits-odes-daepack { };
+
   scikits-odes-sundials = callPackage ../development/python-modules/scikits-odes-sundials { };
+
   scim2-client = callPackage ../development/python-modules/scim2-client { };
+
   scim2-filter-parser = callPackage ../development/python-modules/scim2-filter-parser { };
+
   scim2-models = callPackage ../development/python-modules/scim2-models { };
+
   scim2-server = callPackage ../development/python-modules/scim2-server { };
+
   scim2-tester = callPackage ../development/python-modules/scim2-tester { };
+
   scipp = callPackage ../development/python-modules/scipp { };
+
   scipy = callPackage ../development/python-modules/scipy { };
+
   scipy-stubs = callPackage ../development/python-modules/scipy-stubs { };
+
   scmrepo = callPackage ../development/python-modules/scmrepo { };
+
   scooby = callPackage ../development/python-modules/scooby { };
+
   scour = callPackage ../development/python-modules/scour { };
+
   scp = callPackage ../development/python-modules/scp { };
+
   scramp = callPackage ../development/python-modules/scramp { };
+
   scrap-engine = callPackage ../development/python-modules/scrap-engine { };
+
   scrapy = callPackage ../development/python-modules/scrapy { };
+
   scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { };
+
   scrapy-fake-useragent = callPackage ../development/python-modules/scrapy-fake-useragent { };
+
   scrapy-splash = callPackage ../development/python-modules/scrapy-splash { };
+
   screed = callPackage ../development/python-modules/screed { };
+
   screeninfo = callPackage ../development/python-modules/screeninfo { };
+
   screenlogicpy = callPackage ../development/python-modules/screenlogicpy { };
+
   scripttest = callPackage ../development/python-modules/scripttest { };
+
   scrypt = callPackage ../development/python-modules/scrypt { };
+
   scs = callPackage ../development/python-modules/scs { };
+
   scspell = callPackage ../development/python-modules/scspell { };
+
   sdbus = callPackage ../development/python-modules/sdbus { };
+
   sdbus-networkmanager = callPackage ../development/python-modules/sdbus-networkmanager { };
+
   sdds = callPackage ../development/python-modules/sdds { };
+
   sdflit = callPackage ../development/python-modules/sdflit { };
+
   sdjson = callPackage ../development/python-modules/sdjson { };
+
   sdkmanager = callPackage ../development/python-modules/sdkmanager { };
+
   sdnotify = callPackage ../development/python-modules/sdnotify { };
+
   seaborn = callPackage ../development/python-modules/seaborn { };
+
   seabreeze = callPackage ../development/python-modules/seabreeze { };
+
   seaserv = toPythonModule (pkgs.seafile-server.override { python3 = self.python; });
+
   seasonal = callPackage ../development/python-modules/seasonal { };
+
   seatconnect = callPackage ../development/python-modules/seatconnect { };
+
   seccomp = callPackage ../development/python-modules/seccomp { };
+
   secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1; };
+
   secretstorage = callPackage ../development/python-modules/secretstorage { };
+
   sectools = callPackage ../development/python-modules/sectools { };
+
   sectxt = callPackage ../development/python-modules/sectxt { };
+
   secure = callPackage ../development/python-modules/secure { };
+
   securestring = callPackage ../development/python-modules/securestring { };
+
   securesystemslib = callPackage ../development/python-modules/securesystemslib { };
+
   securetar = callPackage ../development/python-modules/securetar { };
+
   securityreporter = callPackage ../development/python-modules/securityreporter { };
+
   seedir = callPackage ../development/python-modules/seedir { };
+
   seekpath = callPackage ../development/python-modules/seekpath { };
+
   segments = callPackage ../development/python-modules/segments { };
+
   segno = callPackage ../development/python-modules/segno { };
+
   segyio = callPackage ../development/python-modules/segyio { inherit (pkgs) cmake ninja; };
+
   selenium = callPackage ../development/python-modules/selenium { };
+
   selenium-wire = callPackage ../development/python-modules/selenium-wire { };
+
   semantic-version = callPackage ../development/python-modules/semantic-version { };
+
   semaphore-bot = callPackage ../development/python-modules/semaphore-bot { };
+
   semchunk = callPackage ../development/python-modules/semchunk { };
+
   semgrep = callPackage ../development/python-modules/semgrep {
     semgrep-core = callPackage ../development/python-modules/semgrep/semgrep-core.nix { };
   };
+
   semver = callPackage ../development/python-modules/semver { };
+
   send2trash = callPackage ../development/python-modules/send2trash { };
+
   sendgrid = callPackage ../development/python-modules/sendgrid { };
+
   senf = callPackage ../development/python-modules/senf { };
+
   sensai-utils = callPackage ../development/python-modules/sensai-utils { };
+
   sense-energy = callPackage ../development/python-modules/sense-energy { };
+
   sensirion-ble = callPackage ../development/python-modules/sensirion-ble { };
+
   sensor-state-data = callPackage ../development/python-modules/sensor-state-data { };
+
   sensorpro-ble = callPackage ../development/python-modules/sensorpro-ble { };
+
   sensorpush-api = callPackage ../development/python-modules/sensorpush-api { };
+
   sensorpush-ble = callPackage ../development/python-modules/sensorpush-ble { };
+
   sensorpush-ha = callPackage ../development/python-modules/sensorpush-ha { };
+
   sensoterra = callPackage ../development/python-modules/sensoterra { };
+
   sentence-splitter = callPackage ../development/python-modules/sentence-splitter { };
+
   sentence-stream = callPackage ../development/python-modules/sentence-stream { };
+
   sentence-transformers = callPackage ../development/python-modules/sentence-transformers { };
+
   sentencepiece = callPackage ../development/python-modules/sentencepiece {
     inherit (pkgs) sentencepiece;
   };
+
   sentinel = callPackage ../development/python-modules/sentinel { };
+
   sentinels = callPackage ../development/python-modules/sentinels { };
+
   sentry-sdk = callPackage ../development/python-modules/sentry-sdk/default.nix { };
+
   sepaxml = callPackage ../development/python-modules/sepaxml { };
+
   seqdiag = callPackage ../development/python-modules/seqdiag { };
+
   seqeval = callPackage ../development/python-modules/seqeval { };
+
   serialio = callPackage ../development/python-modules/serialio { };
+
   serializable = callPackage ../development/python-modules/serializable { };
+
   serpent = callPackage ../development/python-modules/serpent { };
+
   serpy = callPackage ../development/python-modules/serpy { };
+
   servefile = callPackage ../development/python-modules/servefile { };
+
   serverfiles = callPackage ../development/python-modules/serverfiles { };
+
   serverlessrepo = callPackage ../development/python-modules/serverlessrepo { };
+
   service-identity = callPackage ../development/python-modules/service-identity { };
+
   setproctitle = callPackage ../development/python-modules/setproctitle { };
+
   setupmeta = callPackage ../development/python-modules/setupmeta { };
+
   setuptools-changelog-shortener =
     callPackage ../development/python-modules/setuptools-changelog-shortener
       { };
+
   setuptools-declarative-requirements =
     callPackage ../development/python-modules/setuptools-declarative-requirements
       { };
+
   setuptools-dso = callPackage ../development/python-modules/setuptools-dso { };
+
   setuptools-generate = callPackage ../development/python-modules/setuptools-generate { };
+
   setuptools-gettext = callPackage ../development/python-modules/setuptools-gettext { };
+
   setuptools-git = callPackage ../development/python-modules/setuptools-git { };
+
   setuptools-git-versioning = callPackage ../development/python-modules/setuptools-git-versioning { };
+
   setuptools-lint = callPackage ../development/python-modules/setuptools-lint { };
+
   setuptools-odoo = callPackage ../development/python-modules/setuptools-odoo { };
+
   setuptools-rust = callPackage ../development/python-modules/setuptools-rust { };
+
   setuptools-scm = callPackage ../development/python-modules/setuptools-scm { };
+
   setuptools-scm-git-archive =
     callPackage ../development/python-modules/setuptools-scm-git-archive
       { };
+
   setuptools-trial = callPackage ../development/python-modules/setuptools-trial { };
+
   sev-snp-measure = callPackage ../development/python-modules/sev-snp-measure { };
+
   seventeentrack = callPackage ../development/python-modules/seventeentrack { };
+
   sexpdata = callPackage ../development/python-modules/sexpdata { };
+
   sfepy = callPackage ../development/python-modules/sfepy { };
+
   sfrbox-api = callPackage ../development/python-modules/sfrbox-api { };
+
   sgmllib3k = callPackage ../development/python-modules/sgmllib3k { };
+
   sgp4 = callPackage ../development/python-modules/sgp4 { };
+
   sh = callPackage ../development/python-modules/sh { };
+
   shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { };
+
   shap = callPackage ../development/python-modules/shap { };
+
   shapely = callPackage ../development/python-modules/shapely { };
+
   shaperglot = callPackage ../development/python-modules/shaperglot { };
+
   sharedmem = callPackage ../development/python-modules/sharedmem { };
+
   sharkiq = callPackage ../development/python-modules/sharkiq { };
+
   sharp-aquos-rc = callPackage ../development/python-modules/sharp-aquos-rc { };
+
   shazamio = callPackage ../development/python-modules/shazamio { };
+
   shellescape = callPackage ../development/python-modules/shellescape { };
+
   shellingham = callPackage ../development/python-modules/shellingham { };
+
   shiboken2 = toPythonModule (
     callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages_15 qt5; }
   );
+
   shiboken6 = toPythonModule (
     callPackage ../development/python-modules/shiboken6 { inherit (pkgs) cmake llvmPackages; }
   );
+
   shimmy = callPackage ../development/python-modules/shimmy { };
+
   shiny = callPackage ../development/python-modules/shiny { };
+
   shippinglabel = callPackage ../development/python-modules/shippinglabel { };
+
   shiv = callPackage ../development/python-modules/shiv { };
+
   shlib = callPackage ../development/python-modules/shlib { };
+
   shodan = callPackage ../development/python-modules/shodan { };
+
   shortuuid = callPackage ../development/python-modules/shortuuid { };
+
   should-dsl = callPackage ../development/python-modules/should-dsl { };
+
   show-in-file-manager = callPackage ../development/python-modules/show-in-file-manager { };
+
   showit = callPackage ../development/python-modules/showit { };
+
   shtab = callPackage ../development/python-modules/shtab { };
+
   shutilwhich = callPackage ../development/python-modules/shutilwhich { };
+
   sievelib = callPackage ../development/python-modules/sievelib { };
+
   signalslot = callPackage ../development/python-modules/signalslot { };
+
   signedjson = callPackage ../development/python-modules/signedjson { };
+
   signify = callPackage ../development/python-modules/signify { };
+
   signxml = callPackage ../development/python-modules/signxml { };
+
   sigparse = callPackage ../development/python-modules/sigparse { };
+
   sigrok = callPackage ../development/python-modules/sigrok { };
+
   sigstore = callPackage ../development/python-modules/sigstore { };
+
   sigstore-protobuf-specs = callPackage ../development/python-modules/sigstore-protobuf-specs { };
+
   sigstore-rekor-types = callPackage ../development/python-modules/sigstore-rekor-types { };
+
   sigtools = callPackage ../development/python-modules/sigtools { };
+
   simanneal = callPackage ../development/python-modules/simanneal { };
+
   simber = callPackage ../development/python-modules/simber { };
+
   simpful = callPackage ../development/python-modules/simpful { };
+
   simple-dftd3 = callPackage ../development/libraries/science/chemistry/simple-dftd3/python.nix {
     inherit (pkgs) simple-dftd3;
   };
+
   simple-di = callPackage ../development/python-modules/simple-di { };
+
   simple-parsing = callPackage ../development/python-modules/simple-parsing { };
+
   simple-rest-client = callPackage ../development/python-modules/simple-rest-client { };
+
   simple-rlp = callPackage ../development/python-modules/simple-rlp { };
+
   simple-salesforce = callPackage ../development/python-modules/simple-salesforce { };
+
   simple-term-menu = callPackage ../development/python-modules/simple-term-menu { };
+
   simple-websocket = callPackage ../development/python-modules/simple-websocket { };
+
   simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server { };
+
   simpleaudio = callPackage ../development/python-modules/simpleaudio { };
+
   simplebayes = callPackage ../development/python-modules/simplebayes { };
+
   simpleeval = callPackage ../development/python-modules/simpleeval { };
+
   simplefin4py = callPackage ../development/python-modules/simplefin4py { };
+
   simplefix = callPackage ../development/python-modules/simplefix { };
+
   simplegeneric = callPackage ../development/python-modules/simplegeneric { };
+
   simplehound = callPackage ../development/python-modules/simplehound { };
+
   simpleitk = callPackage ../development/python-modules/simpleitk { inherit (pkgs) itk simpleitk; };
+
   simplejson = callPackage ../development/python-modules/simplejson { };
+
   simplekml = callPackage ../development/python-modules/simplekml { };
+
   simplekv = callPackage ../development/python-modules/simplekv { };
+
   simplemma = callPackage ../development/python-modules/simplemma { };
+
   simplenote = callPackage ../development/python-modules/simplenote { };
+
   simplepush = callPackage ../development/python-modules/simplepush { };
+
   simplesat = callPackage ../development/python-modules/simplesat { };
+
   simplesqlite = callPackage ../development/python-modules/simplesqlite { };
+
   simplisafe-python = callPackage ../development/python-modules/simplisafe-python { };
+
   simpy = callPackage ../development/python-modules/simpy { };
+
   simsimd = callPackage ../development/python-modules/simsimd { };
+
   single-source = callPackage ../development/python-modules/single-source { };
+
   single-version = callPackage ../development/python-modules/single-version { };
+
   siobrultech-protocols = callPackage ../development/python-modules/siobrultech-protocols { };
+
   siosocks = callPackage ../development/python-modules/siosocks { };
+
   sip = callPackage ../development/python-modules/sip { };
+
   sip4 = callPackage ../development/python-modules/sip/4.x.nix { };
+
   siphash24 = callPackage ../development/python-modules/siphash24 { };
+
   siphashc = callPackage ../development/python-modules/siphashc { };
+
   sipsimple = callPackage ../development/python-modules/sipsimple { };
+
   sipyco = callPackage ../development/python-modules/sipyco { };
+
   sirius = toPythonModule (
     pkgs.sirius.override {
       enablePython = true;
       pythonPackages = self;
     }
   );
+
   sismic = callPackage ../development/python-modules/sismic { };
+
   sisyphus-control = callPackage ../development/python-modules/sisyphus-control { };
+
   siuba = callPackage ../development/python-modules/siuba { };
+
   six = callPackage ../development/python-modules/six { };
+
   sixel = callPackage ../development/python-modules/sixel { };
+
   sjcl = callPackage ../development/python-modules/sjcl { };
+
   skein = callPackage ../development/python-modules/skein { };
+
   skia-pathops = callPackage ../development/python-modules/skia-pathops { };
+
   skidl = callPackage ../development/python-modules/skidl { };
+
   skl2onnx = callPackage ../development/python-modules/skl2onnx { };
+
   sklearn-compat = callPackage ../development/python-modules/sklearn-compat { };
+
   sklearn-deap = callPackage ../development/python-modules/sklearn-deap { };
+
   skodaconnect = callPackage ../development/python-modules/skodaconnect { };
+
   skops = callPackage ../development/python-modules/skops { };
+
   skorch = callPackage ../development/python-modules/skorch { };
+
   skrl = callPackage ../development/python-modules/skrl { };
+
   skybellpy = callPackage ../development/python-modules/skybellpy { };
+
   skyboxremote = callPackage ../development/python-modules/skyboxremote { };
+
   skyfield = callPackage ../development/python-modules/skyfield { };
+
   skytemple-dtef = callPackage ../development/python-modules/skytemple-dtef { };
+
   skytemple-eventserver = callPackage ../development/python-modules/skytemple-eventserver { };
+
   skytemple-files = callPackage ../development/python-modules/skytemple-files { };
+
   skytemple-icons = callPackage ../development/python-modules/skytemple-icons { };
+
   skytemple-rust = callPackage ../development/python-modules/skytemple-rust { };
+
   skytemple-ssb-debugger = callPackage ../development/python-modules/skytemple-ssb-debugger { };
+
   skytemple-ssb-emulator = callPackage ../development/python-modules/skytemple-ssb-emulator { };
+
   slack-bolt = callPackage ../development/python-modules/slack-bolt { };
+
   slack-sdk = callPackage ../development/python-modules/slack-sdk { };
+
   slapd = callPackage ../development/python-modules/slapd { };
+
   sleekxmpp = callPackage ../development/python-modules/sleekxmpp { };
+
   sleekxmppfs = callPackage ../development/python-modules/sleekxmppfs { };
+
   sleepyq = callPackage ../development/python-modules/sleepyq { };
+
   slepc4py = toPythonModule (
     pkgs.slepc.override {
       pythonSupport = true;
@@ -9110,634 +16696,1165 @@ self: super: with self; {
       petsc = petsc4py;
     }
   );
+
   sleqp = toPythonModule (
     pkgs.sleqp.override {
       pythonSupport = true;
       python3Packages = self;
     }
   );
+
   slicedimage = callPackage ../development/python-modules/slicedimage { };
+
   slicer = callPackage ../development/python-modules/slicer { };
+
   slicerator = callPackage ../development/python-modules/slicerator { };
+
   slip10 = callPackage ../development/python-modules/slip10 { };
+
   slither-analyzer = callPackage ../development/python-modules/slither-analyzer { };
+
   slixmpp = callPackage ../development/python-modules/slixmpp { inherit (pkgs) gnupg; };
+
   slob = callPackage ../development/python-modules/slob { };
+
   slovnet = callPackage ../development/python-modules/slovnet { };
+
   slowapi = callPackage ../development/python-modules/slowapi { };
+
   slpp = callPackage ../development/python-modules/slpp { };
+
   slugid = callPackage ../development/python-modules/slugid { };
+
   sly = callPackage ../development/python-modules/sly { };
+
   smart-meter-texas = callPackage ../development/python-modules/smart-meter-texas { };
+
   smart-open = callPackage ../development/python-modules/smart-open { };
+
   smarthab = callPackage ../development/python-modules/smarthab { };
+
   smartypants = callPackage ../development/python-modules/smartypants { };
+
   smbprotocol = callPackage ../development/python-modules/smbprotocol { };
+
   smbus-cffi = callPackage ../development/python-modules/smbus-cffi { };
+
   smbus2 = callPackage ../development/python-modules/smbus2 { };
+
   smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { };
+
   smhi-pkg = callPackage ../development/python-modules/smhi-pkg { };
+
   smmap = callPackage ../development/python-modules/smmap { };
+
   smoke-zephyr = callPackage ../development/python-modules/smoke-zephyr { };
+
   smolagents = callPackage ../development/python-modules/smolagents { };
+
   smp = callPackage ../development/python-modules/smp { };
+
   smpclient = callPackage ../development/python-modules/smpclient { };
+
   smpp-pdu = callPackage ../development/python-modules/smpp-pdu { };
+
   smpplib = callPackage ../development/python-modules/smpplib { };
+
   smtpdfix = callPackage ../development/python-modules/smtpdfix { };
+
   snack = toPythonModule (pkgs.newt.override { python3 = self.python; });
+
   snakebite = callPackage ../development/python-modules/snakebite { };
+
   snakemake = toPythonModule (pkgs.snakemake.override { python3Packages = self; });
+
   snakemake-executor-plugin-cluster-generic =
     callPackage ../development/python-modules/snakemake-executor-plugin-cluster-generic
       { };
+
   snakemake-interface-common =
     callPackage ../development/python-modules/snakemake-interface-common
       { };
+
   snakemake-interface-executor-plugins =
     callPackage ../development/python-modules/snakemake-interface-executor-plugins
       { };
+
   snakemake-interface-logger-plugins =
     callPackage ../development/python-modules/snakemake-interface-logger-plugins
       { };
+
   snakemake-interface-report-plugins =
     callPackage ../development/python-modules/snakemake-interface-report-plugins
       { };
+
   snakemake-interface-storage-plugins =
     callPackage ../development/python-modules/snakemake-interface-storage-plugins
       { };
+
   snakemake-storage-plugin-fs =
     callPackage ../development/python-modules/snakemake-storage-plugin-fs
       { };
+
   snakemake-storage-plugin-s3 =
     callPackage ../development/python-modules/snakemake-storage-plugin-s3
       { };
+
   snakemake-storage-plugin-xrootd =
     callPackage ../development/python-modules/snakemake-storage-plugin-xrootd
       { };
+
   snakeviz = callPackage ../development/python-modules/snakeviz { };
+
   snap-helpers = callPackage ../development/python-modules/snap-helpers { };
+
   snapcast = callPackage ../development/python-modules/snapcast { };
+
   snappy-15-knots = callPackage ../development/python-modules/snappy-15-knots { };
+
   snappy-manifolds = callPackage ../development/python-modules/snappy-manifolds { };
+
   snapshot-restore-py = callPackage ../development/python-modules/snapshot-restore-py { };
+
   snapshottest = callPackage ../development/python-modules/snapshottest { };
+
   snaptime = callPackage ../development/python-modules/snaptime { };
+
   sniffio = callPackage ../development/python-modules/sniffio { };
+
   snitun = callPackage ../development/python-modules/snitun { };
+
   snorkel = callPackage ../development/python-modules/snorkel { };
+
   snowballstemmer = callPackage ../development/python-modules/snowballstemmer { };
+
   snowflake-connector-python =
     callPackage ../development/python-modules/snowflake-connector-python
       { };
+
   snowflake-core = callPackage ../development/python-modules/snowflake-core { };
+
   snowflake-sqlalchemy = callPackage ../development/python-modules/snowflake-sqlalchemy { };
+
   snowplow-tracker = callPackage ../development/python-modules/snowplow-tracker { };
+
   snscrape = callPackage ../development/python-modules/snscrape { };
+
   snuggs = callPackage ../development/python-modules/snuggs { };
+
   soapysdr = toPythonModule (
     pkgs.soapysdr.override {
       inherit (self) python;
       usePython = true;
     }
   );
+
   soapysdr-with-plugins = toPythonModule (
     pkgs.soapysdr-with-plugins.override {
       inherit (self) python;
       usePython = true;
     }
   );
+
   social-auth-app-django = callPackage ../development/python-modules/social-auth-app-django { };
+
   social-auth-core = callPackage ../development/python-modules/social-auth-core { };
+
   socialscan = callPackage ../development/python-modules/socialscan { };
+
   socid-extractor = callPackage ../development/python-modules/socid-extractor { };
+
   socketio-client = callPackage ../development/python-modules/socketio-client { };
+
   sockio = callPackage ../development/python-modules/sockio { };
+
   sockjs = callPackage ../development/python-modules/sockjs { };
+
   sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { };
+
   socksio = callPackage ../development/python-modules/socksio { };
+
   socksipy-branch = callPackage ../development/python-modules/socksipy-branch { };
+
   soco = callPackage ../development/python-modules/soco { };
+
   softlayer = callPackage ../development/python-modules/softlayer { };
+
   solarlog-cli = callPackage ../development/python-modules/solarlog-cli { };
+
   solax = callPackage ../development/python-modules/solax { };
+
   solc-select = callPackage ../development/python-modules/solc-select { };
+
   solidpython2 = callPackage ../development/python-modules/solidpython2 { };
+
   solo-python = disabledIf (!pythonAtLeast "3.6") (
     callPackage ../development/python-modules/solo-python { }
   );
+
   somajo = callPackage ../development/python-modules/somajo { };
+
   somfy-mylink-synergy = callPackage ../development/python-modules/somfy-mylink-synergy { };
+
   somweb = callPackage ../development/python-modules/somweb { };
+
   sonos-websocket = callPackage ../development/python-modules/sonos-websocket { };
+
   sopel = callPackage ../development/python-modules/sopel { };
+
   sorl-thumbnail = callPackage ../development/python-modules/sorl-thumbnail { };
+
   sortedcollections = callPackage ../development/python-modules/sortedcollections { };
+
   sortedcontainers = callPackage ../development/python-modules/sortedcontainers { };
+
   sotabenchapi = callPackage ../development/python-modules/sotabenchapi { };
+
   soundcard = callPackage ../development/python-modules/soundcard { };
+
   soundcloud-v2 = callPackage ../development/python-modules/soundcloud-v2 { };
+
   sounddevice = callPackage ../development/python-modules/sounddevice { };
+
   soundfile = callPackage ../development/python-modules/soundfile { };
+
   soupsieve = callPackage ../development/python-modules/soupsieve { };
+
   sourmash = callPackage ../development/python-modules/sourmash { };
+
   soxr = callPackage ../development/python-modules/soxr { libsoxr = pkgs.soxr; };
+
   spacy = callPackage ../development/python-modules/spacy { };
+
   spacy-alignments = callPackage ../development/python-modules/spacy-alignments { };
+
   spacy-curated-transformers =
     callPackage ../development/python-modules/spacy-curated-transformers
       { };
+
   spacy-legacy = callPackage ../development/python-modules/spacy/legacy.nix { };
+
   spacy-loggers = callPackage ../development/python-modules/spacy-loggers { };
+
   spacy-lookups-data = callPackage ../development/python-modules/spacy/lookups-data.nix { };
+
   spacy-models = callPackage ../development/python-modules/spacy/models.nix { inherit (pkgs) jq; };
+
   spacy-pkuseg = callPackage ../development/python-modules/spacy-pkuseg { };
+
   spacy-transformers = callPackage ../development/python-modules/spacy-transformers { };
+
   spake2 = callPackage ../development/python-modules/spake2 { };
+
   spark-parser = callPackage ../development/python-modules/spark-parser { };
+
   sparklines = callPackage ../development/python-modules/sparklines { };
+
   sparqlwrapper = callPackage ../development/python-modules/sparqlwrapper { };
+
   sparse = callPackage ../development/python-modules/sparse { };
+
   sparsezoo = callPackage ../development/python-modules/sparsezoo { };
+
   spatial-image = callPackage ../development/python-modules/spatial-image { };
+
   spatialmath-python = callPackage ../development/python-modules/spatialmath-python { };
+
   spdx = callPackage ../development/python-modules/spdx { };
+
   spdx-lookup = callPackage ../development/python-modules/spdx-lookup { };
+
   spdx-tools = callPackage ../development/python-modules/spdx-tools { };
+
   speak2mary = callPackage ../development/python-modules/speak2mary { };
+
   speaklater = callPackage ../development/python-modules/speaklater { };
+
   speaklater3 = callPackage ../development/python-modules/speaklater3 { };
+
   specfile = callPackage ../development/python-modules/specfile { };
+
   spectra = callPackage ../development/python-modules/spectra { };
+
   spectral-cube = callPackage ../development/python-modules/spectral-cube { };
+
   speechbrain = callPackage ../development/python-modules/speechbrain { };
+
   speechrecognition = callPackage ../development/python-modules/speechrecognition { };
+
   speedtest-cli = callPackage ../development/python-modules/speedtest-cli { };
+
   speg = callPackage ../development/python-modules/speg { };
+
   spglib = callPackage ../development/python-modules/spglib { };
+
   spherogram = callPackage ../development/python-modules/spherogram { };
+
   sphfile = callPackage ../development/python-modules/sphfile { };
+
   sphinx = callPackage ../development/python-modules/sphinx { };
+
   sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { };
+
   sphinx-autoapi = callPackage ../development/python-modules/sphinx-autoapi { };
+
   sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { };
+
   sphinx-autodoc-typehints = callPackage ../development/python-modules/sphinx-autodoc-typehints { };
+
   sphinx-autodoc2 = callPackage ../development/python-modules/sphinx-autodoc2 { };
+
   sphinx-automodapi = callPackage ../development/python-modules/sphinx-automodapi {
     graphviz = pkgs.graphviz;
   };
+
   sphinx-basic-ng = callPackage ../development/python-modules/sphinx-basic-ng { };
+
   sphinx-better-theme = callPackage ../development/python-modules/sphinx-better-theme { };
+
   sphinx-book-theme = callPackage ../development/python-modules/sphinx-book-theme { };
+
   sphinx-click = callPackage ../development/python-modules/sphinx-click { };
+
   sphinx-codeautolink = callPackage ../development/python-modules/sphinx-codeautolink { };
+
   sphinx-comments = callPackage ../development/python-modules/sphinx-comments { };
+
   sphinx-copybutton = callPackage ../development/python-modules/sphinx-copybutton { };
+
   sphinx-design = callPackage ../development/python-modules/sphinx-design { };
+
   sphinx-external-toc = callPackage ../development/python-modules/sphinx-external-toc { };
+
   sphinx-favicon = callPackage ../development/python-modules/sphinx-favicon { };
+
   sphinx-fortran = callPackage ../development/python-modules/sphinx-fortran { };
+
   sphinx-hoverxref = callPackage ../development/python-modules/sphinx-hoverxref { };
+
   sphinx-inline-tabs = callPackage ../development/python-modules/sphinx-inline-tabs { };
+
   sphinx-intl = callPackage ../development/python-modules/sphinx-intl { };
+
   sphinx-issues = callPackage ../development/python-modules/sphinx-issues { };
+
   sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { };
+
   sphinx-jupyterbook-latex = callPackage ../development/python-modules/sphinx-jupyterbook-latex { };
+
   sphinx-lv2-theme = callPackage ../development/python-modules/sphinx-lv2-theme { };
+
   sphinx-markdown-builder = callPackage ../development/python-modules/sphinx-markdown-builder { };
+
   sphinx-markdown-parser = callPackage ../development/python-modules/sphinx-markdown-parser { };
+
   sphinx-markdown-tables = callPackage ../development/python-modules/sphinx-markdown-tables { };
+
   sphinx-material = callPackage ../development/python-modules/sphinx-material { };
+
   sphinx-mdinclude = callPackage ../development/python-modules/sphinx-mdinclude { };
+
   sphinx-multitoc-numbering = callPackage ../development/python-modules/sphinx-multitoc-numbering { };
+
   sphinx-multiversion = callPackage ../development/python-modules/sphinx-multiversion { };
+
   sphinx-notfound-page = callPackage ../development/python-modules/sphinx-notfound-page { };
+
   sphinx-prompt = callPackage ../development/python-modules/sphinx-prompt { };
+
   sphinx-pytest = callPackage ../development/python-modules/sphinx-pytest { };
+
   sphinx-remove-toctrees = callPackage ../development/python-modules/sphinx-remove-toctrees { };
+
   sphinx-reredirects = callPackage ../development/python-modules/sphinx-reredirects { };
+
   sphinx-rtd-dark-mode = callPackage ../development/python-modules/sphinx-rtd-dark-mode { };
+
   sphinx-rtd-theme = callPackage ../development/python-modules/sphinx-rtd-theme { };
+
   sphinx-serve = callPackage ../development/python-modules/sphinx-serve { };
+
   sphinx-sitemap = callPackage ../development/python-modules/sphinx-sitemap { };
+
   sphinx-tabs = callPackage ../development/python-modules/sphinx-tabs { };
+
   sphinx-testing = callPackage ../development/python-modules/sphinx-testing { };
+
   sphinx-thebe = callPackage ../development/python-modules/sphinx-thebe { };
+
   sphinx-togglebutton = callPackage ../development/python-modules/sphinx-togglebutton { };
+
   sphinx-version-warning = callPackage ../development/python-modules/sphinx-version-warning { };
+
   sphinx-versions = callPackage ../development/python-modules/sphinx-versions { };
+
   sphinxawesome-theme = callPackage ../development/python-modules/sphinxawesome-theme { };
+
   sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { };
+
   sphinxcontrib-apidoc = callPackage ../development/python-modules/sphinxcontrib-apidoc { };
+
   sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { };
+
   sphinxcontrib-asyncio = callPackage ../development/python-modules/sphinxcontrib-asyncio { };
+
   sphinxcontrib-bayesnet = callPackage ../development/python-modules/sphinxcontrib-bayesnet { };
+
   sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex { };
+
   sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { };
+
   sphinxcontrib-confluencebuilder =
     callPackage ../development/python-modules/sphinxcontrib-confluencebuilder
       { };
+
   sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp { };
+
   sphinxcontrib-ditaa = callPackage ../development/python-modules/sphinxcontrib-ditaa { };
+
   sphinxcontrib-excel-table = callPackage ../development/python-modules/sphinxcontrib-excel-table { };
+
   sphinxcontrib-fulltoc = callPackage ../development/python-modules/sphinxcontrib-fulltoc { };
+
   sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp { };
+
   sphinxcontrib-httpdomain = callPackage ../development/python-modules/sphinxcontrib-httpdomain { };
+
   sphinxcontrib-images = callPackage ../development/python-modules/sphinxcontrib-images { };
+
   sphinxcontrib-jinjadomain = callPackage ../development/python-modules/sphinxcontrib-jinjadomain { };
+
   sphinxcontrib-jquery = callPackage ../development/python-modules/sphinxcontrib-jquery { };
+
   sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath { };
+
   sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { };
+
   sphinxcontrib-log-cabinet = callPackage ../development/python-modules/sphinxcontrib-log-cabinet { };
+
   sphinxcontrib-moderncmakedomain =
     callPackage ../development/python-modules/sphinxcontrib-moderncmakedomain
       { };
+
   sphinxcontrib-mscgen = callPackage ../development/python-modules/sphinxcontrib-mscgen {
     inherit (pkgs) mscgen;
   };
+
   sphinxcontrib-newsfeed = callPackage ../development/python-modules/sphinxcontrib-newsfeed { };
+
   sphinxcontrib-nwdiag = callPackage ../development/python-modules/sphinxcontrib-nwdiag { };
+
   sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { };
+
   sphinxcontrib-plantuml = callPackage ../development/python-modules/sphinxcontrib-plantuml {
     inherit (pkgs) plantuml;
   };
+
   sphinxcontrib-programoutput =
     callPackage ../development/python-modules/sphinxcontrib-programoutput
       { };
+
   sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp { };
+
   sphinxcontrib-seqdiag = callPackage ../development/python-modules/sphinxcontrib-seqdiag { };
+
   sphinxcontrib-serializinghtml =
     callPackage ../development/python-modules/sphinxcontrib-serializinghtml
       { };
+
   sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { };
+
   sphinxcontrib-svg2pdfconverter =
     callPackage ../development/python-modules/sphinxcontrib-svg2pdfconverter
       { };
+
   sphinxcontrib-tikz = callPackage ../development/python-modules/sphinxcontrib-tikz { };
+
   sphinxcontrib-wavedrom = callPackage ../development/python-modules/sphinxcontrib-wavedrom { };
+
   sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { };
+
   sphinxcontrib-youtube = callPackage ../development/python-modules/sphinxcontrib-youtube { };
+
   sphinxemoji = callPackage ../development/python-modules/sphinxemoji { };
+
   sphinxext-opengraph = callPackage ../development/python-modules/sphinxext-opengraph { };
+
   sphinxext-rediraffe = callPackage ../development/python-modules/sphinxext-rediraffe { };
+
   spiderpy = callPackage ../development/python-modules/spiderpy { };
+
   spidev = callPackage ../development/python-modules/spidev { };
+
   spinners = callPackage ../development/python-modules/spinners { };
+
   splinter = callPackage ../development/python-modules/splinter { };
+
   splunk-sdk = callPackage ../development/python-modules/splunk-sdk { };
+
   spotifyaio = callPackage ../development/python-modules/spotifyaio { };
+
   spotipy = callPackage ../development/python-modules/spotipy { };
+
   spsdk = callPackage ../development/python-modules/spsdk { };
+
   spsdk-mcu-link = callPackage ../development/python-modules/spsdk-mcu-link { };
+
   spsdk-pyocd = callPackage ../development/python-modules/spsdk-pyocd { };
+
   spur = callPackage ../development/python-modules/spur { };
+
   spyder = callPackage ../development/python-modules/spyder { };
+
   spyder-kernels = callPackage ../development/python-modules/spyder-kernels { };
+
   spylls = callPackage ../development/python-modules/spylls { };
+
   spyse-python = callPackage ../development/python-modules/spyse-python { };
+
   spython = callPackage ../development/python-modules/spython { };
+
   sqids = callPackage ../development/python-modules/sqids { };
+
   sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };
+
   sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { };
+
   sqlalchemy-cockroachdb = callPackage ../development/python-modules/sqlalchemy-cockroachdb { };
+
   sqlalchemy-continuum = callPackage ../development/python-modules/sqlalchemy-continuum { };
+
   sqlalchemy-file = callPackage ../development/python-modules/sqlalchemy-file { };
+
   sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { };
+
   sqlalchemy-json = callPackage ../development/python-modules/sqlalchemy-json { };
+
   sqlalchemy-jsonfield = callPackage ../development/python-modules/sqlalchemy-jsonfield { };
+
   sqlalchemy-mixins = callPackage ../development/python-modules/sqlalchemy-mixins { };
+
   sqlalchemy-utc = callPackage ../development/python-modules/sqlalchemy-utc { };
+
   sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { };
+
   sqlalchemy-views = callPackage ../development/python-modules/sqlalchemy-views { };
+
   sqlalchemy_1_4 = callPackage ../development/python-modules/sqlalchemy/1_4.nix { };
+
   sqlbag = callPackage ../development/python-modules/sqlbag { };
+
   sqlcipher3 = callPackage ../development/python-modules/sqlcipher3 { };
+
   sqlcipher3-binary = callPackage ../development/python-modules/sqlcipher3-binary { };
+
   sqlcipher3-wheels = callPackage ../development/python-modules/sqlcipher3-wheels { };
+
   sqlfmt = callPackage ../development/python-modules/sqlfmt { };
+
   sqlframe = callPackage ../development/python-modules/sqlframe { };
+
   sqlglot = callPackage ../development/python-modules/sqlglot { };
+
   sqlite-anyio = callPackage ../development/python-modules/sqlite-anyio { };
+
   sqlite-fts4 = callPackage ../development/python-modules/sqlite-fts4 { };
+
   sqlite-migrate = callPackage ../development/python-modules/sqlite-migrate { };
+
   sqlite-utils = callPackage ../development/python-modules/sqlite-utils { };
+
   sqlite-vec = callPackage ../development/python-modules/sqlite-vec {
     sqlite-vec-c = pkgs.sqlite-vec;
   };
+
   sqlitedict = callPackage ../development/python-modules/sqlitedict { };
+
   sqliteschema = callPackage ../development/python-modules/sqliteschema { };
+
   sqlmap = callPackage ../development/python-modules/sqlmap { };
+
   sqlmodel = callPackage ../development/python-modules/sqlmodel { };
+
   sqlobject = callPackage ../development/python-modules/sqlobject { };
+
   sqlparse = callPackage ../development/python-modules/sqlparse { };
+
   sqltrie = callPackage ../development/python-modules/sqltrie { };
+
   squarify = callPackage ../development/python-modules/squarify { };
+
   srctools = callPackage ../development/python-modules/srctools { };
+
   sre-yield = callPackage ../development/python-modules/sre-yield { };
+
   srp = callPackage ../development/python-modules/srp { };
+
   srpenergy = callPackage ../development/python-modules/srpenergy { };
+
   srptools = callPackage ../development/python-modules/srptools { };
+
   srsly = callPackage ../development/python-modules/srsly { };
+
   srt = callPackage ../development/python-modules/srt { };
+
   srvlookup = callPackage ../development/python-modules/srvlookup { };
+
   ssdeep = callPackage ../development/python-modules/ssdeep { inherit (pkgs) ssdeep; };
+
   ssdp = callPackage ../development/python-modules/ssdp { };
+
   ssdpy = callPackage ../development/python-modules/ssdpy { };
+
   sse-starlette = callPackage ../development/python-modules/sse-starlette { };
+
   sseclient = callPackage ../development/python-modules/sseclient { };
+
   sseclient-py = callPackage ../development/python-modules/sseclient-py { };
+
   ssg = callPackage ../development/python-modules/ssg { };
+
   ssh-python = callPackage ../development/python-modules/ssh-python { };
+
   ssh2-python = callPackage ../development/python-modules/ssh2-python { };
+
   sshfs = callPackage ../development/python-modules/sshfs { };
+
   sshpubkeys = callPackage ../development/python-modules/sshpubkeys { };
+
   sshtunnel = callPackage ../development/python-modules/sshtunnel { };
+
   sslib = callPackage ../development/python-modules/sslib { };
+
   ssort = callPackage ../development/python-modules/ssort { };
+
   stable-baselines3 = callPackage ../development/python-modules/stable-baselines3 { };
+
   stack-data = callPackage ../development/python-modules/stack-data { };
+
   stackprinter = callPackage ../development/python-modules/stackprinter { };
+
   stamina = callPackage ../development/python-modules/stamina { };
+
   standard-aifc =
     if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-aifc { } else null;
+
   standard-cgi =
     if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-cgi { } else null;
+
   standard-chunk =
     if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-chunk { } else null;
+
   standard-imghdr =
     if pythonAtLeast "3.13" then
       callPackage ../development/python-modules/standard-imghdr { }
     else
       null;
+
   standard-mailcap =
     if pythonOlder "3.13" then null else callPackage ../development/python-modules/standard-mailcap { };
+
   standard-nntplib =
     if pythonOlder "3.13" then null else callPackage ../development/python-modules/standard-nntplib { };
+
   standard-pipes =
     if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-pipes { } else null;
+
   standard-sunau =
     if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-sunau { } else null;
+
   standard-telnetlib =
     if pythonAtLeast "3.13" then
       callPackage ../development/python-modules/standard-telnetlib { }
     else
       null;
+
   standardwebhooks = callPackage ../development/python-modules/standardwebhooks { };
+
   stanio = callPackage ../development/python-modules/stanio { };
+
   stanza = callPackage ../development/python-modules/stanza { };
+
   starkbank-ecdsa = callPackage ../development/python-modules/starkbank-ecdsa { };
+
   starlette = callPackage ../development/python-modules/starlette { };
+
   starlette-admin = callPackage ../development/python-modules/starlette-admin { };
+
   starlette-compress = callPackage ../development/python-modules/starlette-compress { };
+
   starlette-context = callPackage ../development/python-modules/starlette-context { };
+
   starlette-wtf = callPackage ../development/python-modules/starlette-wtf { };
+
   starline = callPackage ../development/python-modules/starline { };
+
   starlingbank = callPackage ../development/python-modules/starlingbank { };
+
   starlink-grpc-core = callPackage ../development/python-modules/starlink-grpc-core { };
+
   stashy = callPackage ../development/python-modules/stashy { };
+
   static3 = callPackage ../development/python-modules/static3 { };
+
   staticjinja = callPackage ../development/python-modules/staticjinja { };
+
   staticmap = callPackage ../development/python-modules/staticmap { };
+
   staticmap3 = callPackage ../development/python-modules/staticmap3 { };
+
   staticvectors = callPackage ../development/python-modules/staticvectors { };
+
   statistics = callPackage ../development/python-modules/statistics { };
+
   statmake = callPackage ../development/python-modules/statmake { };
+
   statsd = callPackage ../development/python-modules/statsd { };
+
   statsmodels = callPackage ../development/python-modules/statsmodels { };
+
   std-uritemplate = callPackage ../development/python-modules/std-uritemplate { };
+
   std2 = callPackage ../development/python-modules/std2 { };
+
   stdiomask = callPackage ../development/python-modules/stdiomask { };
+
   stdlib-list = callPackage ../development/python-modules/stdlib-list { };
+
   stdlibs = callPackage ../development/python-modules/stdlibs { };
+
   steam = callPackage ../development/python-modules/steam { };
+
   steamodd = callPackage ../development/python-modules/steamodd { };
+
   steamship = callPackage ../development/python-modules/steamship { };
+
   steamworkspy = callPackage ../development/python-modules/steamworkspy { };
+
   stem = callPackage ../development/python-modules/stem { };
+
   stemming = callPackage ../development/python-modules/stemming { };
+
   stestr = callPackage ../development/python-modules/stestr { };
+
   stevedore = callPackage ../development/python-modules/stevedore { };
+
   stickytape = callPackage ../development/python-modules/stickytape { };
+
   stim = callPackage ../development/python-modules/stim { };
+
   stix2 = callPackage ../development/python-modules/stix2 { };
+
   stix2-patterns = callPackage ../development/python-modules/stix2-patterns { };
+
   stix2-validator = callPackage ../development/python-modules/stix2-validator { };
+
   stm32loader = callPackage ../development/python-modules/stm32loader { };
+
   stomp-py = callPackage ../development/python-modules/stomp-py { };
+
   stone = callPackage ../development/python-modules/stone { };
+
   stookalert = callPackage ../development/python-modules/stookalert { };
+
   stookwijzer = callPackage ../development/python-modules/stookwijzer { };
+
   stop-words = callPackage ../development/python-modules/stop-words { };
+
   stopit = callPackage ../development/python-modules/stopit { };
+
   storage3 = callPackage ../development/python-modules/storage3 { };
+
   stp = toPythonModule (pkgs.stp.override { python3 = self.python; });
+
   stransi = callPackage ../development/python-modules/stransi { };
+
   strategies = callPackage ../development/python-modules/strategies { };
+
   stravalib = callPackage ../development/python-modules/stravalib { };
+
   stravaweblib = callPackage ../development/python-modules/stravaweblib { };
+
   strawberry-django = callPackage ../development/python-modules/strawberry-django { };
+
   strawberry-graphql = callPackage ../development/python-modules/strawberry-graphql { };
+
   strct = callPackage ../development/python-modules/strct { };
+
   streamcontroller-plugin-tools =
     callPackage ../development/python-modules/streamcontroller-plugin-tools
       { };
+
   streamdeck = callPackage ../development/python-modules/streamdeck { };
+
   streaming-form-data = callPackage ../development/python-modules/streaming-form-data { };
+
   streamlabswater = callPackage ../development/python-modules/streamlabswater { };
+
   streamlit = callPackage ../development/python-modules/streamlit { };
+
   streamz = callPackage ../development/python-modules/streamz { };
+
   strenum = callPackage ../development/python-modules/strenum { };
+
   strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { };
+
   strictyaml = callPackage ../development/python-modules/strictyaml { };
+
   stringbrewer = callPackage ../development/python-modules/stringbrewer { };
+
   stringcase = callPackage ../development/python-modules/stringcase { };
+
   stringly = callPackage ../development/python-modules/stringly { };
+
   stringparser = callPackage ../development/python-modules/stringparser { };
+
   stringzilla = callPackage ../development/python-modules/stringzilla { };
+
   strip-ansi = callPackage ../development/python-modules/strip-ansi { };
+
   stripe = callPackage ../development/python-modules/stripe { };
+
   striprtf = callPackage ../development/python-modules/striprtf { };
+
   strpdatetime = callPackage ../development/python-modules/strpdatetime { };
+
   structlog = callPackage ../development/python-modules/structlog { };
+
   stubserver = callPackage ../development/python-modules/stubserver { };
+
   stumpy = callPackage ../development/python-modules/stumpy { };
+
   stupidartnet = callPackage ../development/python-modules/stupidartnet { };
+
   stups-cli-support = callPackage ../development/python-modules/stups-cli-support { };
+
   stups-fullstop = callPackage ../development/python-modules/stups-fullstop { };
+
   stups-pierone = callPackage ../development/python-modules/stups-pierone { };
+
   stups-tokens = callPackage ../development/python-modules/stups-tokens { };
+
   stups-zign = callPackage ../development/python-modules/stups-zign { };
+
   stytra = callPackage ../development/python-modules/stytra { };
+
   subarulink = callPackage ../development/python-modules/subarulink { };
+
   subliminal = callPackage ../development/python-modules/subliminal { };
+
   submitit = callPackage ../development/python-modules/submitit { };
+
   subprocess-tee = callPackage ../development/python-modules/subprocess-tee { };
+
   subunit = callPackage ../development/python-modules/subunit {
     inherit (pkgs) subunit cppunit check;
   };
+
   subunit2sql = callPackage ../development/python-modules/subunit2sql { };
+
   subzerod = callPackage ../development/python-modules/subzerod { };
+
   succulent = callPackage ../development/python-modules/succulent { };
+
   sudachidict-core = callPackage ../development/python-modules/sudachidict { };
+
   sudachidict-full = callPackage ../development/python-modules/sudachidict {
     sudachidict = pkgs.sudachidict.override { dict-type = "full"; };
   };
+
   sudachidict-small = callPackage ../development/python-modules/sudachidict {
     sudachidict = pkgs.sudachidict.override { dict-type = "small"; };
   };
+
   sudachipy = callPackage ../development/python-modules/sudachipy { };
+
   suds = callPackage ../development/python-modules/suds { };
+
   suds-community = callPackage ../development/python-modules/suds-community { };
+
   summarytools = callPackage ../development/python-modules/summarytools { };
+
   sumo = callPackage ../development/python-modules/sumo { };
+
   sumtypes = callPackage ../development/python-modules/sumtypes { };
+
   sunpy = callPackage ../development/python-modules/sunpy { };
+
   sunwatcher = callPackage ../development/python-modules/sunwatcher { };
+
   sunweg = callPackage ../development/python-modules/sunweg { };
+
   supabase = callPackage ../development/python-modules/supabase { };
+
   supabase-functions = self.supafunc;
+
   supafunc = callPackage ../development/python-modules/supafunc { };
+
   superqt = callPackage ../development/python-modules/superqt { };
+
   supervise-api = callPackage ../development/python-modules/supervise-api { };
+
   supervisor = callPackage ../development/python-modules/supervisor { };
+
   sure = callPackage ../development/python-modules/sure { };
+
   surepy = callPackage ../development/python-modules/surepy { };
+
   surt = callPackage ../development/python-modules/surt { };
+
   survey = callPackage ../development/python-modules/survey { };
+
   sv-ttk = callPackage ../development/python-modules/sv-ttk { };
+
   svg-path = callPackage ../development/python-modules/svg-path { };
+
   svg-py = callPackage ../development/python-modules/svg-py { };
+
   svg2tikz = callPackage ../development/python-modules/svg2tikz { };
+
   svgdigitizer = callPackage ../development/python-modules/svgdigitizer { };
+
   svgelements = callPackage ../development/python-modules/svgelements { };
+
   svglib = callPackage ../development/python-modules/svglib { };
+
   svgpathtools = callPackage ../development/python-modules/svgpathtools { };
+
   svgutils = callPackage ../development/python-modules/svgutils { };
+
   svgwrite = callPackage ../development/python-modules/svgwrite { };
+
   swagger-spec-validator = callPackage ../development/python-modules/swagger-spec-validator { };
+
   swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { };
+
   swcgeom = callPackage ../development/python-modules/swcgeom { };
+
   swh-auth = callPackage ../development/python-modules/swh-auth { };
+
   swh-core = callPackage ../development/python-modules/swh-core { };
+
   swh-export = callPackage ../development/python-modules/swh-export { };
+
   swh-journal = callPackage ../development/python-modules/swh-journal { };
+
   swh-model = callPackage ../development/python-modules/swh-model { };
+
   swh-objstorage = callPackage ../development/python-modules/swh-objstorage { };
+
   swh-perfecthash = callPackage ../development/python-modules/swh-perfecthash { };
+
   swh-scanner = callPackage ../development/python-modules/swh-scanner { };
+
   swh-scheduler = callPackage ../development/python-modules/swh-scheduler { };
+
   swh-storage = callPackage ../development/python-modules/swh-storage { };
+
   swh-web-client = callPackage ../development/python-modules/swh-web-client { };
+
   swift = callPackage ../development/python-modules/swift { };
+
   swifter = callPackage ../development/python-modules/swifter { };
+
   swisshydrodata = callPackage ../development/python-modules/swisshydrodata { };
+
   switchbot-api = callPackage ../development/python-modules/switchbot-api { };
+
   swspotify = callPackage ../development/python-modules/swspotify { };
+
   sybil = callPackage ../development/python-modules/sybil { };
+
   symbex = callPackage ../development/python-modules/symbex { };
+
   symbolic = callPackage ../development/python-modules/symbolic { };
+
   symengine = callPackage ../development/python-modules/symengine { inherit (pkgs) symengine; };
+
   symfc = callPackage ../development/python-modules/symfc { };
+
   sympy = callPackage ../development/python-modules/sympy { };
+
   symspellpy = callPackage ../development/python-modules/symspellpy { };
+
   syncedlyrics = callPackage ../development/python-modules/syncedlyrics { };
+
   syncer = callPackage ../development/python-modules/syncer { };
+
   syndication-domination = toPythonModule (
     pkgs.syndication-domination.override {
       enablePython = true;
       python3Packages = self;
     }
   );
+
   synergy = callPackage ../development/python-modules/synergy { };
+
   synology-srm = callPackage ../development/python-modules/synology-srm { };
+
   syrupy = callPackage ../development/python-modules/syrupy { };
+
   syslog-rfc5424-formatter = callPackage ../development/python-modules/syslog-rfc5424-formatter { };
+
   sysrsync = callPackage ../development/python-modules/sysrsync { };
+
   systembridge = callPackage ../development/python-modules/systembridge { };
+
   systembridgeconnector = callPackage ../development/python-modules/systembridgeconnector { };
+
   systembridgemodels = callPackage ../development/python-modules/systembridgemodels { };
+
   systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) systemd; };
+
   systemdunitparser = callPackage ../development/python-modules/systemdunitparser { };
+
   sysv-ipc = callPackage ../development/python-modules/sysv-ipc { };
+
   t61codec = callPackage ../development/python-modules/t61codec { };
+
   tabcmd = callPackage ../development/python-modules/tabcmd { };
+
   tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { };
+
   tableauserverclient = callPackage ../development/python-modules/tableauserverclient { };
+
   tabledata = callPackage ../development/python-modules/tabledata { };
+
   tables = callPackage ../development/python-modules/tables { };
+
   tablib = callPackage ../development/python-modules/tablib { };
+
   tabula-py = callPackage ../development/python-modules/tabula-py { };
+
   tabulate = callPackage ../development/python-modules/tabulate { };
+
   tabview = callPackage ../development/python-modules/tabview { };
+
   taco = toPythonModule (
     pkgs.taco.override {
       inherit (self) python;
       enablePython = true;
     }
   );
+
   tadasets = callPackage ../development/python-modules/tadasets { };
+
   tag-expressions = callPackage ../development/python-modules/tag-expressions { };
+
   tago = callPackage ../development/python-modules/tago { };
+
   tagoio-sdk = callPackage ../development/python-modules/tagoio-sdk { };
+
   tahoma-api = callPackage ../development/python-modules/tahoma-api { };
+
   tailer = callPackage ../development/python-modules/tailer { };
+
   tailscale = callPackage ../development/python-modules/tailscale { };
+
   takethetime = callPackage ../development/python-modules/takethetime { };
+
   tami4edgeapi = callPackage ../development/python-modules/tami4edgeapi { };
+
   tank-utility = callPackage ../development/python-modules/tank-utility { };
+
   tappy = callPackage ../development/python-modules/tappy { };
+
   tasklib = callPackage ../development/python-modules/tasklib { };
+
   taskw = callPackage ../development/python-modules/taskw { };
+
   taskw-ng = callPackage ../development/python-modules/taskw-ng { };
+
   tatsu = callPackage ../development/python-modules/tatsu { };
+
   tatsu-lts = callPackage ../development/python-modules/tatsu-lts { };
+
   taxi = callPackage ../development/python-modules/taxi { };
+
   taxii2-client = callPackage ../development/python-modules/taxii2-client { };
+
   tbats = callPackage ../development/python-modules/tbats { };
+
   tblib = callPackage ../development/python-modules/tblib { };
+
   tblite = callPackage ../development/libraries/science/chemistry/tblite/python.nix {
     inherit (pkgs) tblite meson simple-dftd3;
   };
+
   tbm-utils = callPackage ../development/python-modules/tbm-utils { };
+
   tcolorpy = callPackage ../development/python-modules/tcolorpy { };
+
   tcxfile = callPackage ../development/python-modules/tcxfile { };
+
   tcxparser = callPackage ../development/python-modules/tcxparser { };
+
   tcxreader = callPackage ../development/python-modules/tcxreader { };
+
   tdir = callPackage ../development/python-modules/tdir { };
+
   teamcity-messages = callPackage ../development/python-modules/teamcity-messages { };
+
   telegram-text = callPackage ../development/python-modules/telegram-text { };
+
   telegraph = callPackage ../development/python-modules/telegraph { };
+
   telepath = callPackage ../development/python-modules/telepath { };
+
   telethon = callPackage ../development/python-modules/telethon { inherit (pkgs) openssl; };
+
   telethon-session-sqlalchemy =
     callPackage ../development/python-modules/telethon-session-sqlalchemy
       { };
+
   teletype = callPackage ../development/python-modules/teletype { };
+
   telfhash = callPackage ../development/python-modules/telfhash { };
+
   tellduslive = callPackage ../development/python-modules/tellduslive { };
+
   temescal = callPackage ../development/python-modules/temescal { };
+
   temperusb = callPackage ../development/python-modules/temperusb { };
+
   tempest = callPackage ../development/python-modules/tempest { };
+
   templateflow = callPackage ../development/python-modules/templateflow { };
+
   tempman = callPackage ../development/python-modules/tempman { };
+
   tempora = callPackage ../development/python-modules/tempora { };
+
   temporalio = callPackage ../development/python-modules/temporalio { };
+
   tenacity = callPackage ../development/python-modules/tenacity { };
+
   tenant-schemas-celery = callPackage ../development/python-modules/tenant-schemas-celery { };
+
   tencentcloud-sdk-python = callPackage ../development/python-modules/tencentcloud-sdk-python { };
+
   tendo = callPackage ../development/python-modules/tendo { };
+
   tensorboard = callPackage ../development/python-modules/tensorboard { };
+
   tensorboard-data-server = callPackage ../development/python-modules/tensorboard-data-server { };
+
   tensorboard-plugin-profile =
     callPackage ../development/python-modules/tensorboard-plugin-profile
       { };
+
   tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit { };
+
   tensorboardx = callPackage ../development/python-modules/tensorboardx { };
+
   tensordict = callPackage ../development/python-modules/tensordict { };
+
   tensorflow = self.tensorflow-bin;
+
   tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix {
     inherit (pkgs.config) cudaSupport;
   };
+
   tensorflow-build =
     let
       compat = rec {
@@ -9792,127 +17909,241 @@ self: super: with self; {
       # python modules
       stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv;
     };
+
   tensorflow-datasets = callPackage ../development/python-modules/tensorflow-datasets { };
+
   tensorflow-estimator-bin =
     callPackage ../development/python-modules/tensorflow-estimator/bin.nix
       { };
+
   tensorflow-metadata = callPackage ../development/python-modules/tensorflow-metadata { };
+
   tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { };
+
   tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; };
+
   tensorflowWithoutCuda = self.tensorflow.override { cudaSupport = false; };
+
   tensorly = callPackage ../development/python-modules/tensorly { };
+
   tensorrt = callPackage ../development/python-modules/tensorrt {
     cudaPackages = pkgs.cudaPackages_11;
   };
+
   tensorstore = callPackage ../development/python-modules/tensorstore { };
+
   term-image = callPackage ../development/python-modules/term-image { };
+
   termcolor = callPackage ../development/python-modules/termcolor { };
+
   termgraph = callPackage ../development/python-modules/termgraph { };
+
   terminado = callPackage ../development/python-modules/terminado { };
+
   terminaltables = callPackage ../development/python-modules/terminaltables { };
+
   terminaltables3 = callPackage ../development/python-modules/terminaltables3 { };
+
   terminaltexteffects = callPackage ../development/python-modules/terminaltexteffects { };
+
   termplotlib = callPackage ../development/python-modules/termplotlib { };
+
   termstyle = callPackage ../development/python-modules/termstyle { };
+
   tern = callPackage ../development/python-modules/tern { };
+
   tesla-fleet-api = callPackage ../development/python-modules/tesla-fleet-api { };
+
   tesla-powerwall = callPackage ../development/python-modules/tesla-powerwall { };
+
   tesla-wall-connector = callPackage ../development/python-modules/tesla-wall-connector { };
+
   teslajsonpy = callPackage ../development/python-modules/teslajsonpy { };
+
   teslemetry-stream = callPackage ../development/python-modules/teslemetry-stream { };
+
   tess = callPackage ../development/python-modules/tess { };
+
   tesserocr = callPackage ../development/python-modules/tesserocr { };
+
   tessie-api = callPackage ../development/python-modules/tessie-api { };
+
   test-results-parser = callPackage ../development/python-modules/test-results-parser { };
+
   test-tube = callPackage ../development/python-modules/test-tube { };
+
   test2ref = callPackage ../development/python-modules/test2ref { };
+
   testbook = callPackage ../development/python-modules/testbook { };
+
   testcontainers = callPackage ../development/python-modules/testcontainers { };
+
   testfixtures = callPackage ../development/python-modules/testfixtures { };
+
   testing-common-database = callPackage ../development/python-modules/testing-common-database { };
+
   testpath = callPackage ../development/python-modules/testpath { };
+
   testrail-api = callPackage ../development/python-modules/testrail-api { };
+
   testrepository = callPackage ../development/python-modules/testrepository { };
+
   testresources = callPackage ../development/python-modules/testresources { };
+
   testscenarios = callPackage ../development/python-modules/testscenarios { };
+
   testtools = callPackage ../development/python-modules/testtools { };
+
   texsoup = callPackage ../development/python-modules/texsoup { };
+
   text-unidecode = callPackage ../development/python-modules/text-unidecode { };
+
   text2digits = callPackage ../development/python-modules/text2digits { };
+
   textacy = callPackage ../development/python-modules/textacy { };
+
   textblob = callPackage ../development/python-modules/textblob { };
+
   textdistance = callPackage ../development/python-modules/textdistance { };
+
   textfsm = callPackage ../development/python-modules/textfsm { };
+
   textile = callPackage ../development/python-modules/textile { };
+
   textnets = callPackage ../development/python-modules/textnets {
     en_core_web_sm = spacy-models.en_core_web_sm;
   };
+
   textparser = callPackage ../development/python-modules/textparser { };
+
   textstat = callPackage ../development/python-modules/textstat { };
+
   texttable = callPackage ../development/python-modules/texttable { };
+
   textual = callPackage ../development/python-modules/textual { };
+
   textual-autocomplete = callPackage ../development/python-modules/textual-autocomplete { };
+
   textual-dev = callPackage ../development/python-modules/textual-dev { };
+
   textual-fastdatatable = callPackage ../development/python-modules/textual-fastdatatable { };
+
   textual-image = callPackage ../development/python-modules/textual-image { };
+
   textual-serve = callPackage ../development/python-modules/textual-serve { };
+
   textual-slider = callPackage ../development/python-modules/textual-slider { };
+
   textual-textarea = callPackage ../development/python-modules/textual-textarea { };
+
   textual-universal-directorytree =
     callPackage ../development/python-modules/textual-universal-directorytree
       { };
+
   textualeffects = callPackage ../development/python-modules/textualeffects { };
+
   textwrap3 = callPackage ../development/python-modules/textwrap3 { };
+
   textx = callPackage ../development/python-modules/textx { };
+
   tf-keras = callPackage ../development/python-modules/tf-keras { };
+
   tf2onnx = callPackage ../development/python-modules/tf2onnx { };
+
   tflearn = callPackage ../development/python-modules/tflearn { };
+
   tftpy = callPackage ../development/python-modules/tftpy { };
+
   tgcrypto = callPackage ../development/python-modules/tgcrypto { };
+
   thefuzz = callPackage ../development/python-modules/thefuzz { };
+
   thelogrus = callPackage ../development/python-modules/thelogrus { };
+
   thermobeacon-ble = callPackage ../development/python-modules/thermobeacon-ble { };
+
   thermopro-ble = callPackage ../development/python-modules/thermopro-ble { };
+
   thespian = callPackage ../development/python-modules/thespian { };
+
   thinc = callPackage ../development/python-modules/thinc { };
+
   thingspeak = callPackage ../development/python-modules/thingspeak { };
+
   thinqconnect = callPackage ../development/python-modules/thinqconnect { };
+
   thorlabspm100 = callPackage ../development/python-modules/thorlabspm100 { };
+
   threadloop = callPackage ../development/python-modules/threadloop { };
+
   threadpool = callPackage ../development/python-modules/threadpool { };
+
   threadpoolctl = callPackage ../development/python-modules/threadpoolctl { };
+
   threat9-test-bed = callPackage ../development/python-modules/threat9-test-bed { };
+
   three-merge = callPackage ../development/python-modules/three-merge { };
+
   thrift = callPackage ../development/python-modules/thrift { };
+
   thriftpy2 = callPackage ../development/python-modules/thriftpy2 { };
+
   throttler = callPackage ../development/python-modules/throttler { };
+
   thttp = callPackage ../development/python-modules/thttp { };
+
   tianshou = callPackage ../development/python-modules/tianshou { };
+
   tidalapi = callPackage ../development/python-modules/tidalapi { };
+
   tidyexc = callPackage ../development/python-modules/tidyexc { };
+
   tidylib = callPackage ../development/python-modules/pytidylib { };
+
   tiered-debug = callPackage ../development/python-modules/tiered-debug { };
+
   tifffile = callPackage ../development/python-modules/tifffile { };
+
   tika = callPackage ../development/python-modules/tika { };
+
   tika-client = callPackage ../development/python-modules/tika-client { };
+
   tiktoken = callPackage ../development/python-modules/tiktoken { };
+
   tikzplotlib = callPackage ../development/python-modules/tikzplotlib { };
+
   tiledb = callPackage ../development/python-modules/tiledb { inherit (pkgs) tiledb; };
+
   tilequant = callPackage ../development/python-modules/tilequant { };
+
   tiler = callPackage ../development/python-modules/tiler { };
+
   tilt-ble = callPackage ../development/python-modules/tilt-ble { };
+
   tilt-pi = callPackage ../development/python-modules/tilt-pi { };
+
   time-machine = callPackage ../development/python-modules/time-machine { };
+
   timeago = callPackage ../development/python-modules/timeago { };
+
   timecop = callPackage ../development/python-modules/timecop { };
+
   timelib = callPackage ../development/python-modules/timelib { };
+
   timeout-decorator = callPackage ../development/python-modules/timeout-decorator { };
+
   timeslot = callPackage ../development/python-modules/timeslot { };
+
   timetagger = callPackage ../development/python-modules/timetagger { };
+
   timezonefinder = callPackage ../development/python-modules/timezonefinder { };
+
   timing-asgi = callPackage ../development/python-modules/timing-asgi { };
+
   timm = callPackage ../development/python-modules/timm { };
+
   timy = callPackage ../development/python-modules/timy { };
+
   tiny-cuda-nn = toPythonModule (
     pkgs.tiny-cuda-nn.override {
       cudaPackages = self.torch.cudaPackages;
@@ -9920,76 +18151,109 @@ self: super: with self; {
       pythonSupport = true;
     }
   );
+
   tiny-proxy = callPackage ../development/python-modules/tiny-proxy { };
+
   tinycss = callPackage ../development/python-modules/tinycss { };
+
   tinycss2 = callPackage ../development/python-modules/tinycss2 { };
+
   tinydb = callPackage ../development/python-modules/tinydb { };
+
   tinygrad = callPackage ../development/python-modules/tinygrad { };
+
   tinyhtml5 = callPackage ../development/python-modules/tinyhtml5 { };
+
   tinyio = callPackage ../development/python-modules/tinyio { };
+
   tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { };
+
   tinyrecord = callPackage ../development/python-modules/tinyrecord { };
+
   tinysegmenter = callPackage ../development/python-modules/tinysegmenter { };
+
   tinytag = callPackage ../development/python-modules/tinytag { };
+
   tinytuya = callPackage ../development/python-modules/tinytuya { };
+
   tiptapy = callPackage ../development/python-modules/tiptapy { };
+
   titlecase = callPackage ../development/python-modules/titlecase { };
+
   tivars = callPackage ../development/python-modules/tivars { };
+
   tkinter = callPackage ../development/python-modules/tkinter {
     py = python.override (lib.optionalAttrs (!python.isPyPy) { x11Support = true; });
   };
+
   tkinter-gl = callPackage ../development/python-modules/tkinter-gl { };
+
   tld = callPackage ../development/python-modules/tld { };
+
   tldextract = callPackage ../development/python-modules/tldextract { };
+
   tlds = callPackage ../development/python-modules/tlds { };
+
   tls-client = callPackage ../development/python-modules/tls-client { };
+
   tls-parser = callPackage ../development/python-modules/tls-parser { };
+
   tlsh = callPackage ../development/python-modules/tlsh { };
+
   tlslite-ng = callPackage ../development/python-modules/tlslite-ng { };
+
   tlv8 = callPackage ../development/python-modules/tlv8 { };
+
   tmb = callPackage ../development/python-modules/tmb { };
+
   tmdbsimple = callPackage ../development/python-modules/tmdbsimple { };
+
   tnefparse = callPackage ../development/python-modules/tnefparse { };
+
   todoist = callPackage ../development/python-modules/todoist { };
+
   todoist-api-python = callPackage ../development/python-modules/todoist-api-python { };
+
   toggl-cli = callPackage ../development/python-modules/toggl-cli { };
+
   token-bucket = callPackage ../development/python-modules/token-bucket { };
+
   tokenize-rt = callPackage ../development/python-modules/tokenize-rt { };
+
   tokenizers = callPackage ../development/python-modules/tokenizers { };
+
   tokenlib = callPackage ../development/python-modules/tokenlib { };
+
   tokentrim = callPackage ../development/python-modules/tokentrim { };
+
   tololib = callPackage ../development/python-modules/tololib { };
+
   toml = callPackage ../development/python-modules/toml { };
+
   toml-adapt = callPackage ../development/python-modules/toml-adapt { };
+
   tomli = callPackage ../development/python-modules/tomli { };
+
   tomli-w = callPackage ../development/python-modules/tomli-w { };
+
   tomlkit = callPackage ../development/python-modules/tomlkit { };
+
   toolz = callPackage ../development/python-modules/toolz { };
+
   toonapi = callPackage ../development/python-modules/toonapi { };
+
   toposort = callPackage ../development/python-modules/toposort { };
+
   toptica-lasersdk = callPackage ../development/python-modules/toptica-lasersdk { };
+
   torch = callPackage ../development/python-modules/torch/source { };
+
   torch-audiomentations = callPackage ../development/python-modules/torch-audiomentations { };
+
   torch-bin = callPackage ../development/python-modules/torch/bin { triton = self.triton-bin; };
+
   torch-geometric = callPackage ../development/python-modules/torch-geometric { };
-  # Required to test triton
-  # by_regex ensures inherit statements are sorted after the (first) attribute name that is inherited.
-  # keep-sorted start block=yes newline_separated=yes by_regex=["(?:inherit\\s+\\([^)]+\\)\\n?\\s*)?(.+)"]
-  # Build boost for this specific Python version
-  # TODO: use separate output for libboost_python.so
-  # LTS with mainsteam support
-  # LTS in extended support phase
-  # built-in for pypi
-  # alias 2019-12-28
-  # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version.
-  # Protobuf 4.x
-  # Protobuf 5.x
-  # Protobuf 6.x
-  # `pyqt5-webkit` should not be used by python libraries in
-  # pkgs/development/python-modules/*. Putting this attribute in
-  # `propagatedBuildInputs` may cause collisions.
-  # Alias added 23-06-2019
-  # added 2021-01-04
+
   # Required to test triton
   torch-no-triton = self.torch.override { tritonSupport = false; };
 

From cdf17371de9e7c45be8a91ef9b64289537e2cd12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 13:29:01 +0000
Subject: [PATCH 1761/3724] mssql_jdbc: 12.10.1 -> 13.2.0

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

diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix
index f4f0b192da31..548630c1f9c0 100644
--- a/pkgs/servers/sql/mssql/jdbc/default.nix
+++ b/pkgs/servers/sql/mssql/jdbc/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mssql-jdbc";
-  version = "12.10.1";
+  version = "13.2.0";
 
   src = fetchurl {
     url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar";
-    sha256 = "sha256-MCBiOWI6vIod9/NhY5HPZzcetY38gsDdQPSGVQhdyBo=";
+    sha256 = "sha256-zC6aTII/79PMJvLY9wEw7EhaUwhZ4F6H2N7zcr7mzKc=";
   };
 
   dontUnpack = true;

From 53ff77e6546572980ebdee2c8d84b464ddb8befc Mon Sep 17 00:00:00 2001
From: Andrew Kvalheim <andrew@kvalhe.im>
Date: Fri, 15 Aug 2025 07:15:57 -0700
Subject: [PATCH 1762/3724] python3Packages.busylight-for-humans: add optional
 dependencies of busyserve

Before:

    $ nix-shell --packages 'python3Packages.busylight-for-humans' --run 'busyserve'
    The package `uvicorn` is missing, unable to serve the busylight API.

After:

    $ nix-shell --packages 'python3Packages.busylight-for-humans.overridePythonAttrs (p: { dependencies = p.dependencies ++ p.optional-dependencies.webapi; })' --run 'busyserve'
    INFO:     Started server process [47202]
    INFO:     Waiting for application startup.
    INFO:     Application startup complete.
    INFO:     Uvicorn running on http://0.0.0.0:8000 (Press CTRL+C to quit)

Upstream: https://github.com/JnyJny/busylight/blob/v0.35.2/pyproject.toml#L26
---
 .../python-modules/busylight-for-humans/default.nix      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/busylight-for-humans/default.nix b/pkgs/development/python-modules/busylight-for-humans/default.nix
index f60436f64846..ea27f5bcaef8 100644
--- a/pkgs/development/python-modules/busylight-for-humans/default.nix
+++ b/pkgs/development/python-modules/busylight-for-humans/default.nix
@@ -3,6 +3,7 @@
   bitvector-for-humans,
   buildPythonPackage,
   fetchFromGitHub,
+  fastapi,
   hidapi,
   loguru,
   poetry-core,
@@ -11,6 +12,7 @@
   pytestCheckHook,
   pythonOlder,
   typer,
+  uvicorn,
   webcolors,
   udevCheckHook,
 }:
@@ -40,6 +42,13 @@ buildPythonPackage rec {
     webcolors
   ];
 
+  optional-dependencies = {
+    webapi = [
+      fastapi
+      uvicorn
+    ];
+  };
+
   nativeCheckInputs = [
     pytestCheckHook
     pytest-mock

From bcc8f5a05c9aebb42f5bc12e16182ca3e9fa8557 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 14:33:57 +0000
Subject: [PATCH 1763/3724] distroshelf: 1.0.12 -> 1.0.13

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

diff --git a/pkgs/by-name/di/distroshelf/package.nix b/pkgs/by-name/di/distroshelf/package.nix
index 55996833ee50..5437f5c1b284 100644
--- a/pkgs/by-name/di/distroshelf/package.nix
+++ b/pkgs/by-name/di/distroshelf/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "distroshelf";
-  version = "1.0.12";
+  version = "1.0.13";
 
   src = fetchFromGitHub {
     owner = "ranfdev";
     repo = "DistroShelf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pNGIwmw75c7Q+lXZBSZnAnIqJqYOPIA9cpAlzv/HjJU=";
+    hash = "sha256-2R5jDstnzCTG6UfynsO2aeX6eST4cZIEHNdP9OLDKrw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From 3bd110ed33ebf5f62b5a8107e450382f4bf45ead Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 13 Aug 2025 15:18:56 -0400
Subject: [PATCH 1764/3724] python313Packages.scanpy: init at 1.11.4

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

diff --git a/pkgs/development/python-modules/scanpy/default.nix b/pkgs/development/python-modules/scanpy/default.nix
new file mode 100644
index 000000000000..44d3f8488279
--- /dev/null
+++ b/pkgs/development/python-modules/scanpy/default.nix
@@ -0,0 +1,182 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatch-vcs,
+  hatchling,
+  anndata,
+  h5py,
+  joblib,
+  legacy-api-wrap,
+  matplotlib,
+  natsort,
+  networkx,
+  numba,
+  numpy,
+  packaging,
+  pandas,
+  patsy,
+  pynndescent,
+  scikit-learn,
+  scipy,
+  seaborn,
+  session-info2,
+  statsmodels,
+  tqdm,
+  typing-extensions,
+  umap-learn,
+  dask,
+  dask-ml,
+
+  igraph,
+  leidenalg,
+  scikit-image,
+  scikit-misc,
+  zarr,
+  pytestCheckHook,
+  pytest-cov-stub,
+  pytest-mock,
+  pytest-randomly,
+  pytest-rerunfailures,
+  pytest-xdist,
+  tuna,
+}:
+
+buildPythonPackage rec {
+  pname = "scanpy";
+  version = "1.11.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "scverse";
+    repo = "scanpy";
+    tag = version;
+    hash = "sha256-EvNelorfLOpYLGGZ1RSq4+jk6emuCWCKBdUop24iLf4=";
+  };
+
+  build-system = [
+    hatch-vcs
+    hatchling
+  ];
+
+  dependencies = [
+    anndata
+    h5py
+    joblib
+    legacy-api-wrap
+    matplotlib
+    natsort
+    networkx
+    numba
+    numpy
+    packaging
+    pandas
+    patsy
+    pynndescent
+    scikit-learn
+    scipy
+    seaborn
+    session-info2
+    statsmodels
+    tqdm
+    typing-extensions
+    umap-learn
+  ];
+
+  optional-dependencies = {
+    # commented attributes are due to some dependencies not being in Nixpkgs
+    #bbknn = [
+    #  bbknn
+    #];
+    dask = [
+      anndata
+      dask
+    ];
+    dask-ml = [
+      dask-ml
+    ];
+    #harmony = [
+    #  harmonypy
+    #];
+    leiden = [
+      igraph
+      leidenalg
+    ];
+    #louvain = [
+    #  igraph
+    #  louvain
+    #];
+    #magic = [
+    #  magic-impute
+    #];
+    paga = [
+      igraph
+    ];
+    #rapids = [
+    #  cudf
+    #  cugraph
+    #  cuml
+    #];
+    #scanorama = [
+    #  scanorama
+    #];
+    scrublet = [
+      scikit-image
+    ];
+    skmisc = [
+      scikit-misc
+    ];
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+    pytest-mock
+    pytest-randomly
+    pytest-rerunfailures
+    pytest-xdist
+    tuna
+    zarr
+  ];
+
+  preCheck = ''
+    export NUMBA_CACHE_DIR=$(mktemp -d);
+  '';
+
+  disabledTestPaths = [
+    # try to download data:
+    "tests/test_aggregated.py"
+    "tests/test_highly_variable_genes.py"
+    "tests/test_normalization.py"
+    "tests/test_pca.py"
+    "tests/test_plotting.py"
+    "tests/test_plotting_embedded/"
+  ];
+
+  disabledTests = [
+    # try to download data:
+    "scanpy.get._aggregated.aggregate"
+    "scanpy.plotting._tools.scatterplots.spatial"
+    "test_clip"
+    "test_download_failure"
+    "test_mean_var"
+    "test_regress_out_int"
+    "test_score_with_reference"
+
+    # fails to find the trivial test script for some reason:
+    "test_external"
+  ];
+
+  pythonImportsCheck = [
+    "scanpy"
+  ];
+
+  meta = {
+    description = "Single-cell analysis in Python which scales to >100M cells";
+    homepage = "https://scanpy.readthedocs.io";
+    changelog = "https://github.com/scverse/scanpy/releases/tag/${src.tag}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+    mainProgram = "scanpy";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2d406a3df7c9..2f81bb0a56e1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16157,6 +16157,8 @@ self: super: with self; {
 
   scancode-toolkit = callPackage ../development/python-modules/scancode-toolkit { };
 
+  scanpy = callPackage ../development/python-modules/scanpy { };
+
   scapy = callPackage ../development/python-modules/scapy {
     inherit (pkgs) libpcap; # Avoid confusion with python package of the same name
   };

From cdedd540f1d9dad7cd0b41335179f7a2a4c8f91c Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 14 Aug 2025 15:31:38 -0400
Subject: [PATCH 1765/3724] python313Packages.anndata: move tests to passthru
 and enable tests using scanpy

---
 .../python-modules/anndata/default.nix        | 45 +++++--------------
 1 file changed, 12 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/python-modules/anndata/default.nix b/pkgs/development/python-modules/anndata/default.nix
index 294ca6b8aeef..f42cbc100c70 100644
--- a/pkgs/development/python-modules/anndata/default.nix
+++ b/pkgs/development/python-modules/anndata/default.nix
@@ -1,4 +1,5 @@
 {
+  anndata,
   array-api-compat,
   awkward,
   boltons,
@@ -17,17 +18,15 @@
   numba,
   numpy,
   openpyxl,
-  packaging,
   pandas,
   pyarrow,
   pytest-mock,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
+  scanpy,
   scikit-learn,
   scipy,
   stdenv,
-  typing-extensions,
   zarr,
 }:
 
@@ -56,6 +55,7 @@ buildPythonPackage rec {
     numpy
     pandas
     scipy
+    zarr
   ];
 
   nativeCheckInputs = [
@@ -72,7 +72,7 @@ buildPythonPackage rec {
     pytest-xdist
     pytestCheckHook
     scikit-learn
-    zarr
+    scanpy
   ];
 
   # Optionally disable pytest-xdist to make it easier to debug the test suite.
@@ -80,43 +80,22 @@ buildPythonPackage rec {
   # fail when running without pytest-xdist ("worker_id not found").
   # pytestFlags = [ "-oaddopts=" ];
 
-  disabledTestPaths = [
-    # Tests that require scanpy, creating a circular dependency chain
-    "src/anndata/_core/anndata.py"
-    "src/anndata/_core/merge.py"
-    "src/anndata/_core/sparse_dataset.py"
-    "src/anndata/_io/specs/registry.py"
-    "src/anndata/_io/utils.py"
-    "src/anndata/_warnings.py"
-    "src/anndata/experimental/merge.py"
-    "src/anndata/experimental/multi_files/_anncollection.py"
-    "src/anndata/utils.py"
-  ];
+  preCheck = ''
+    export NUMBA_CACHE_DIR=$(mktemp -d);
+  '';
+
+  doCheck = false; # use passthru.tests instead to prevent circularity with `scanpy`
+
+  passthru.tests = anndata.overridePythonAttrs { doCheck = true; };
 
   disabledTests = [
     # requires data from a previous test execution:
     "test_no_diff"
 
-    # doctests that require scanpy, creating a circular dependency chain. These
-    # do not work in disabledTestPaths for some reason.
-    "anndata._core.anndata.AnnData.concatenate"
-    "anndata._core.anndata.AnnData.obs_names_make_unique"
-    "anndata._core.anndata.AnnData.var_names_make_unique"
-    "anndata._core.extensions.register_anndata_namespac"
-    "anndata._core.merge.concat"
-    "anndata._core.merge.gen_reindexer"
-    "anndata._core.sparse_dataset.sparse_dataset"
-    "anndata._io.specs.registry.read_elem_as_dask"
+    # try to download data:
     "anndata._io.specs.registry.read_elem_lazy"
-    "anndata._io.utils.report_read_key_on_error"
-    "anndata._io.utils.report_write_key_on_error"
-    "anndata._warnings.ImplicitModificationWarning"
-    "anndata.experimental.backed._io.read_lazy"
     "anndata.experimental.merge.concat_on_disk"
     "anndata.experimental.multi_files._anncollection.AnnCollection"
-    "anndata.utils.make_index_unique"
-    "ci.scripts.min-deps.min_dep"
-    "concatenation.rst"
 
     # Tests that require cupy and GPU access. Introducing cupy as a dependency
     # would make this package unfree and GPU access is not possible within the

From a3b138079526de3a0d85c9d406506e22bbb0a221 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 16:30:09 +0000
Subject: [PATCH 1766/3724] tidy-viewer: 1.6.0 -> 1.8.93

---
 pkgs/by-name/ti/tidy-viewer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix
index a10f60404767..981f67f6ad16 100644
--- a/pkgs/by-name/ti/tidy-viewer/package.nix
+++ b/pkgs/by-name/ti/tidy-viewer/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tidy-viewer";
-  version = "1.6.0";
+  version = "1.8.93";
 
   src = fetchFromGitHub {
     owner = "alexhallam";
     repo = "tv";
     rev = version;
-    sha256 = "sha256-ZiwZS7fww1dphEhJsScFfu1sBs35CB9LsGnI3qsyvrk=";
+    sha256 = "sha256-wiVcdTnjEFh5kSyxmK+ab0LkEAbQaygmLdrFfM12DyM=";
   };
 
-  cargoHash = "sha256-Cd3yNqDZcvaO8H9IwSOvZ+HGQ85fubbBYztOCgy60ls=";
+  cargoHash = "sha256-HF7M4s2OHCAyVkbCIBxGButAxbxrhjmY3YE/do8et1s=";
 
   # this test parses command line arguments
   # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context

From 6e922e065e27cfa3978d210dbb5b4431c093f09e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 16:31:17 +0000
Subject: [PATCH 1767/3724] ibmcloud-cli: 2.35.0 -> 2.35.1

---
 pkgs/tools/admin/ibmcloud-cli/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/admin/ibmcloud-cli/default.nix b/pkgs/tools/admin/ibmcloud-cli/default.nix
index 2397b078887f..356be70896b6 100644
--- a/pkgs/tools/admin/ibmcloud-cli/default.nix
+++ b/pkgs/tools/admin/ibmcloud-cli/default.nix
@@ -30,19 +30,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ibmcloud-cli";
-  version = "2.35.0";
+  version = "2.35.1";
 
   src = fetchurl {
     url = "https://download.clis.cloud.ibm.com/ibm-cloud-cli/${finalAttrs.version}/binaries/IBM_Cloud_CLI_${finalAttrs.version}_${platform}.tgz";
     hash =
       {
-        "x86_64-darwin" = "sha256-YQEmeUi+I82NsI4tYRJG3C+iHBXB2pe4O5J5BGM8qck=";
-        "aarch64-darwin" = "sha256-tsaveUBBe2VvvIWLPKfOXICVBTh3XlpmVr/AV1wz2hs=";
-        "x86_64-linux" = "sha256-C2WaIxGSsaa2nJQn0TdjsX9jqppTuIZJxjHqf+P4/iQ=";
-        "aarch64-linux" = "sha256-yfWVLHGr4F0DwTwTKq7Ae/VqXbAyEGryXylwNbnmOSg=";
-        "i686-linux" = "sha256-M3Ec+JyAI06ifPfEoYxWPvtZ/iffFLSiVLuTOHm+WUo=";
-        "powerpc64le-linux" = "sha256-KYNrCaUJ1QBJwjZAgLlOkDuFO+llUkXF62zj8QbhBnE=";
-        "s390x-linux" = "sha256-9i+zdpVBfFCN9JUMgs7WekHTm+PZhwVDimO55BFHSLE=";
+        "x86_64-darwin" = "sha256-Vv2w0tnHflwwA9Ux5kLVi51RWXxQptUxNwbuPmOka/I=";
+        "aarch64-darwin" = "sha256-zFmhwIIgvczQS+66KRj4B1w7/ZIiTuShNuec6aCk6wE=";
+        "x86_64-linux" = "sha256-oOOjgS0wzbVrnAousO9Q9+AzM7oMM0w9iJYS4wDzJtI=";
+        "aarch64-linux" = "sha256-d6gf3sy+5MrX/59y2gOEQUmwUJhQTQ20uctUTN6lJTw=";
+        "i686-linux" = "sha256-b7l3JKBJ8ARD5/zLeWlE0cSPmtvvp3/q51Um8dPf6/I=";
+        "powerpc64le-linux" = "sha256-e1OoAksR9cc9NdzhMJT5KNO88iNGonN/2m9BDAhqQRQ=";
+        "s390x-linux" = "sha256-uBi/bnYMOioZmmXUEglBkam2ReGT282JGxmG3hndgjM=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From b9fde1f777accf63b1e76a30a15173c00c64a090 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 15 Aug 2025 13:43:10 -0400
Subject: [PATCH 1768/3724] xwin: Use nixpkgs openssl for tls

---
 pkgs/by-name/xw/xwin/package.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/by-name/xw/xwin/package.nix b/pkgs/by-name/xw/xwin/package.nix
index 4efcd3e155e8..26ab31a10aed 100644
--- a/pkgs/by-name/xw/xwin/package.nix
+++ b/pkgs/by-name/xw/xwin/package.nix
@@ -2,6 +2,8 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  openssl,
+  pkg-config,
   versionCheckHook,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -17,6 +19,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-77ArdZ9mOYEon4nzNUNSL0x0UlE1iVujFLwreAd9iMM=";
 
+  strictDeps = true;
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  buildNoDefaultFeatures = true;
+  buildFeatures = [
+    "native-tls"
+  ];
+
   doCheck = true;
   # Requires network access
   checkFlags = [

From 039aaabef68cb1505c48c411e1430f4d592c8ad4 Mon Sep 17 00:00:00 2001
From: Grimmauld <soeren@benjos.de>
Date: Fri, 15 Aug 2025 17:52:30 +0000
Subject: [PATCH 1769/3724] mypaint-brushes1: fix build with autotools 1.18
 (#434004)

Analogous fix to #432779
---
 pkgs/development/libraries/mypaint-brushes/1.0.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix
index 885dd5e5137d..3a2a41f1eb85 100644
--- a/pkgs/development/libraries/mypaint-brushes/1.0.nix
+++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix
@@ -24,7 +24,15 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  preConfigure = "./autogen.sh";
+  # don't rely on rigid autotools versions, instead preload whatever is in $PATH in the build environment.
+  # mypaint-brushes1 1.3.1 only officially supports autotools up to 1.16,
+  # unstable git versions support up to autotools 1.17.
+  # However, we are now on autotools 1.18, so this would break.
+  preConfigure = ''
+    export AUTOMAKE=automake
+    export ACLOCAL=aclocal
+    ./autogen.sh
+  '';
 
   meta = with lib; {
     homepage = "http://mypaint.org/";

From b740ed7d4753506552fa30654f796e13613e2132 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 18:36:57 +0000
Subject: [PATCH 1770/3724] weasis: 4.6.2 -> 4.6.3

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

diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix
index 9df26fccdeeb..0f513759f20c 100644
--- a/pkgs/by-name/we/weasis/package.nix
+++ b/pkgs/by-name/we/weasis/package.nix
@@ -18,12 +18,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "weasis";
-  version = "4.6.2";
+  version = "4.6.3";
 
   # Their build instructions indicate to use the packaging script
   src = fetchzip {
     url = "https://github.com/nroduit/Weasis/releases/download/v${finalAttrs.version}/weasis-native.zip";
-    hash = "sha256-7oYrUNj9BBcFh+1CQQ4PJW8ln+fd5Ed9y9tMoixc5Mc=";
+    hash = "sha256-1dvBKxInuk8FpZjo59+LkIuEBTr57wkLaHfvvvT6bOg=";
     stripRoot = false;
   };
 

From 4c2037d495f128e68d1c0f9f8f6e3ad106368b4b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 19:05:44 +0000
Subject: [PATCH 1771/3724] questdb: 9.0.1 -> 9.0.2

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

diff --git a/pkgs/by-name/qu/questdb/package.nix b/pkgs/by-name/qu/questdb/package.nix
index d7daf20ebfab..7b392c8e3c84 100644
--- a/pkgs/by-name/qu/questdb/package.nix
+++ b/pkgs/by-name/qu/questdb/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "questdb";
-  version = "9.0.1";
+  version = "9.0.2";
 
   src = fetchurl {
     url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz";
-    hash = "sha256-nnIQfK2H+jhEOXmvqBobkOu/RYcxrcXnLXtrTU5tsqc=";
+    hash = "sha256-uLkBjG6aBUaV273hX2Q/ZHWAroyzuK1mSxHzopa/Zgo=";
   };
 
   nativeBuildInputs = [

From de628424d8346c5e06d80cc2d84883832d45e46a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 20:46:07 +0000
Subject: [PATCH 1772/3724] age-plugin-fido2-hmac: 0.3.0 -> 0.3.1

---
 pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix
index 1c3a3d012818..98285b117d45 100644
--- a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix
+++ b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix
@@ -24,16 +24,16 @@ let
 in
 buildGoModule rec {
   pname = "age-plugin-fido2-hmac";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "olastor";
     repo = "age-plugin-fido2-hmac";
     tag = "v${version}";
-    hash = "sha256-DQVNUvKUyx1MUpWy5TeL1FYM5s8eeoNnNjKYozVgAxE=";
+    hash = "sha256-f/Ld4bc+AWLkuVbL0zKEJNVqA8qJeRP/zF3jyHs3CQg=";
   };
 
-  vendorHash = "sha256-/H4zHfaRw2EqV8p57Y1Lgb2N1VXBucetvl7mJ6Jdu/8=";
+  vendorHash = "sha256-pWa0PWBy32eIayKwB6Y6TeEBMt/GXpFzWJANUvvTie8=";
 
   ldflags = [
     "-s"

From 976973ddfbf72420b1682bdf981a09abb370cab2 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Fri, 15 Aug 2025 23:11:48 +0200
Subject: [PATCH 1773/3724] tauno-monitor: 0.2.14 -> 0.2.15

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

diff --git a/pkgs/by-name/ta/tauno-monitor/package.nix b/pkgs/by-name/ta/tauno-monitor/package.nix
index 23b13c1d6f82..123d0063ecec 100644
--- a/pkgs/by-name/ta/tauno-monitor/package.nix
+++ b/pkgs/by-name/ta/tauno-monitor/package.nix
@@ -13,14 +13,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "tauno-monitor";
-  version = "0.2.14";
+  version = "0.2.15";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "taunoe";
     repo = "tauno-monitor";
     tag = "v${version}";
-    hash = "sha256-1jXQZc2+Yufjo75KwHbAFPsGxdpxkdUP8LXyY2fj3Kw=";
+    hash = "sha256-x2RgjKI+GSrZYY2sZWFTB1OkBF3s3O+XOpj1Es03ZwE=";
   };
 
   nativeBuildInputs = [

From b1f870405177fecb98dcf168a722586e31aebbc4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 21:16:39 +0000
Subject: [PATCH 1774/3724] home-manager: 0-unstable-2025-08-06 ->
 0-unstable-2025-08-14

---
 pkgs/by-name/ho/home-manager/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix
index ed106f8ee958..5e04c59a59ef 100644
--- a/pkgs/by-name/ho/home-manager/package.nix
+++ b/pkgs/by-name/ho/home-manager/package.nix
@@ -19,14 +19,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2025-08-06";
+  version = "0-unstable-2025-08-14";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "13461dec40bf03d9196ff79d1abe48408268cc35";
-    hash = "sha256-V0iiDcYvNeMOP2FyfgC4H8Esx+JodXEl80lD4hFD4SI=";
+    rev = "11626a4383b458f8dc5ea3237eaa04e8ab1912f3";
+    hash = "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=";
   };
 
   nativeBuildInputs = [

From b61602657442ce474879dd94a4baf71efb5f7d65 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 15 Aug 2025 19:11:18 +0000
Subject: [PATCH 1775/3724] kanidm_1_7: 1.7.1 -> 1.7.2

https://github.com/kanidm/kanidm/releases/tag/v1.7.2
---
 pkgs/by-name/ka/kanidm/1_7.nix                              | 6 +++---
 .../ka/kanidm/provision-patches/1_7/recover-account.patch   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ka/kanidm/1_7.nix b/pkgs/by-name/ka/kanidm/1_7.nix
index 718975bfcc14..ac135ebcddf8 100644
--- a/pkgs/by-name/ka/kanidm/1_7.nix
+++ b/pkgs/by-name/ka/kanidm/1_7.nix
@@ -1,5 +1,5 @@
 import ./generic.nix {
-  version = "1.7.1";
-  hash = "sha256-CG4s6fYxTM2I/kFjD905g8/DSFkyB+0pnGVXgyRXtlE=";
-  cargoHash = "sha256-9bE3hSCFBJF8f3Lm5SzEuDtEpJBbCBijUDfqGiPnRsc=";
+  version = "1.7.2";
+  hash = "sha256-ETaggYPWxgEx9Vo/8Xehpi3UqkjQO/NAoOsbZxi/DeY=";
+  cargoHash = "sha256-BwrEvtujYlMWG1LNkaNvHlIbrqmEBgbr50xTz+V5KYQ=";
 }
diff --git a/pkgs/by-name/ka/kanidm/provision-patches/1_7/recover-account.patch b/pkgs/by-name/ka/kanidm/provision-patches/1_7/recover-account.patch
index 1892cdf63a19..d022d87d00aa 100644
--- a/pkgs/by-name/ka/kanidm/provision-patches/1_7/recover-account.patch
+++ b/pkgs/by-name/ka/kanidm/provision-patches/1_7/recover-account.patch
@@ -45,9 +45,9 @@ index 90ccb1927..85e31ddef 100644
  pub enum AdminTaskRequest {
 -    RecoverAccount { name: String },
 +    RecoverAccount { name: String, password: Option<String> },
+     DisableAccount { name: String },
      ShowReplicationCertificate,
      RenewReplicationCertificate,
-     RefreshReplicationConsumer,
 @@ -309,8 +309,8 @@ async fn handle_client(
  
          let resp = async {

From 57d0bd58917f42be544b72b2460b156c8a2ad46e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 22:46:07 +0000
Subject: [PATCH 1776/3724] 
 vscode-extensions.ms-ceintl.vscode-language-pack-fr: 1.101.2025061109 ->
 1.103.2025080609

---
 .../vscode/extensions/language-packs.nix      | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/language-packs.nix b/pkgs/applications/editors/vscode/extensions/language-packs.nix
index 04ab08d8dfac..caa74d39cdca 100644
--- a/pkgs/applications/editors/vscode/extensions/language-packs.nix
+++ b/pkgs/applications/editors/vscode/extensions/language-packs.nix
@@ -13,7 +13,7 @@ let
   buildVscodeLanguagePack =
     {
       language,
-      version ? "1.101.2025061109",
+      version ? "1.103.2025080609",
       hash,
     }:
     buildVscodeMarketplaceExtension {
@@ -41,71 +41,71 @@ in
   # French
   vscode-language-pack-fr = buildVscodeLanguagePack {
     language = "fr";
-    hash = "sha256-DeloielNVsZk+1/rGlyfT49Hst+Xh/jk7BYvqNwMQuU=";
+    hash = "sha256-EN562YK/mAUpvwuNXL+reLMuh5EdY6TcVJbt7clSK2Q=";
   };
   # Italian
   vscode-language-pack-it = buildVscodeLanguagePack {
     language = "it";
-    hash = "sha256-tc5G3O6KYP9+CI7t+B2jP9saKSbjoK7jceqrAT1lbZ8=";
+    hash = "sha256-gsYvAR3HvqzYzEQDUeJD7Wg4fpk+byUGz1IvQh6+oms=";
   };
   # German
   vscode-language-pack-de = buildVscodeLanguagePack {
     language = "de";
-    hash = "sha256-5fLQkZj3U175NUY2uMwrpUg3KWSb+FYV69XT995tgko=";
+    hash = "sha256-l0lBj1gGGrTqCsjLVamIejbhchIzb7SpZfKed+nT/nQ=";
   };
   # Spanish
   vscode-language-pack-es = buildVscodeLanguagePack {
     language = "es";
-    hash = "sha256-OSpFOZc33jfcHWYiskqj5TIHjicdSAotXLeM9YnVycs=";
+    hash = "sha256-I6IHTWorrK4QnN+RRHIi4cS/SlxerjbYLhJuJeWzJW4=";
   };
   # Russian
   vscode-language-pack-ru = buildVscodeLanguagePack {
     language = "ru";
-    hash = "sha256-aqpBo19NvDYFWP1a6HnNvwuS6iEUhkn4lTihqy2EQqc=";
+    hash = "sha256-Tba4zLqxFLdupIPah2059oA9ZQVzq7Z77pwFAH96CLY=";
   };
   # Chinese (Simplified)
   vscode-language-pack-zh-hans = buildVscodeLanguagePack {
     language = "zh-hans";
-    hash = "sha256-mykSRH3v7uW1iu4RmNf7SnL9q1ZPLkRZwY3sv5IfNt0=";
+    hash = "sha256-hSHHAh59Kwgm/fG21EMAEHgBuDnin4+3IrCUWSjbGJ8=";
   };
   # Chinese (Traditional)
   vscode-language-pack-zh-hant = buildVscodeLanguagePack {
     language = "zh-hant";
-    hash = "sha256-4AXpiJfFd4PpMR89IQWTnzeU+n3ROwmM1waI+h0odro=";
+    hash = "sha256-hKZzKPXExkw3FGjE33eHJy8CiIxkQdRreRDHonHdt9A=";
   };
   # Japanese
   vscode-language-pack-ja = buildVscodeLanguagePack {
     language = "ja";
-    hash = "sha256-TGDBrATWlIDiCyOqxuGL5IHRObLRkEpwX8yo1HnvEvE=";
+    hash = "sha256-UFhdArcnxzCXr4Ha9B5WGdJ8fV+jqitJYgS7bFdo7qU=";
   };
   # Korean
   vscode-language-pack-ko = buildVscodeLanguagePack {
     language = "ko";
-    hash = "sha256-QKnA/5/J8nwnc91BEwAxOCHHlSG8nYyDGdiwAf9A4kM=";
+    hash = "sha256-SOu9WXhSy2VOlCuhRlyU2vwrHKAqtacEHqv1jmfVOe0=";
   };
   # Czech
   vscode-language-pack-cs = buildVscodeLanguagePack {
     language = "cs";
-    hash = "sha256-XXQ5zXPZA9l/7QJVTtMZB7kLsM5/92anG+Mvpxq81RE=";
+    hash = "sha256-AR+88WY5AhN2VCzuiFPR60K4KyO31nxlyI8g8Ya+278=";
   };
   # Portuguese (Brazil)
   vscode-language-pack-pt-br = buildVscodeLanguagePack {
     language = "pt-BR";
-    hash = "sha256-KYRt6KXkVthDXOZ2TLNJJFjDPvpknxRSi3Fo/T37KoA=";
+    hash = "sha256-oIdLJqu07BmyDhROvHt0pbsdITkmI+bMlWybuU9kwpU=";
   };
   # Turkish
   vscode-language-pack-tr = buildVscodeLanguagePack {
     language = "tr";
-    hash = "sha256-4qCRDHTQD1jZ/pugAfSDdWeYU0GpM9PvRWXYNcncSUA=";
+    hash = "sha256-5G3f4mdT29R4ics/ukxgBDZJ8FT0iCe9r4LPfgKjRjc=";
   };
   # Polish
   vscode-language-pack-pl = buildVscodeLanguagePack {
     language = "pl";
-    hash = "sha256-Cg+VpwX78HmyOHB9OGPPjSmJFHAZ4HpQ+HceFJw/FgE=";
+    hash = "sha256-nhF2DDvPGjOLQid++XxvG3vSU5OSZ3gVrHdujGCsQjA=";
   };
   # Pseudo Language
   vscode-language-pack-qps-ploc = buildVscodeLanguagePack {
     language = "qps-ploc";
-    hash = "sha256-Z2qrwgziEupCEqHVGyY1WnZO3ZGM1LVDeSxmVgkEd3o=";
+    hash = "sha256-DpsMvjzXo56RYUPgsctwpdvd7gTiFQSGiZeqZcJZU4k=";
   };
 }

From 19c9f7583c5903842272da8800e23510b8b7a7aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 23:27:19 +0000
Subject: [PATCH 1777/3724] flow: 0.277.1 -> 0.279.0

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

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 5986c411840d..c2e42213d95f 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.277.1";
+  version = "0.279.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     tag = "v${version}";
-    hash = "sha256-wFOhxYEMN2mEzmCjCJhDcDM3b6CmW1kKheEjpVqUhLA=";
+    hash = "sha256-mzrCfBTnz9KlFRw1uKhQ3sIiNFbtFGVP2pEJH+D/2tk=";
   };
 
   makeFlags = [ "FLOW_RELEASE=1" ];

From c4452594180e3950675e5c6090f5fda61cdb0cc8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 16 Aug 2025 02:47:35 +0200
Subject: [PATCH 1778/3724] python3Packages.django-bootstrap3: 25.1 -> 25.2

https://github.com/zostera/django-bootstrap3/blob/v25.2/CHANGELOG.md
---
 .../python-modules/django-bootstrap3/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix
index 34ff3e849f1a..62abd28fde23 100644
--- a/pkgs/development/python-modules/django-bootstrap3/default.nix
+++ b/pkgs/development/python-modules/django-bootstrap3/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  hatchling,
+  uv-build,
 
   # dependencies
   django,
@@ -16,17 +16,17 @@
 
 buildPythonPackage rec {
   pname = "django-bootstrap3";
-  version = "25.1";
+  version = "25.2";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "zostera";
     repo = "django-bootstrap3";
     tag = "v${version}";
-    hash = "sha256-gRDU2IDE6cOVBJzdOs8Ww9mItMy/2DPMYusC0TCTqkI=";
+    hash = "sha256-TaB2PeBjmCNFuEZ+To2Q3C6zlFCaaTB70LxQWWb5AEo=";
   };
 
-  build-system = [ hatchling ];
+  build-system = [ uv-build ];
 
   dependencies = [ django ];
 

From 5143179df885f5a50aaec09ccef277dcaf80e661 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 01:31:35 +0000
Subject: [PATCH 1779/3724] pan: 0.163 -> 0.164

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

diff --git a/pkgs/by-name/pa/pan/package.nix b/pkgs/by-name/pa/pan/package.nix
index 509f3430a4db..2116056ac0f1 100644
--- a/pkgs/by-name/pa/pan/package.nix
+++ b/pkgs/by-name/pa/pan/package.nix
@@ -23,14 +23,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pan";
-  version = "0.163";
+  version = "0.164";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "pan";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zClHwIvrWqAn8l1hpcy3FgScRmVUUk8UPQkT0KD59hM=";
+    hash = "sha256-fVhjgnDvDf5rmhuW27UpEp3m7o8FFcpakVcGBhBic0Y=";
   };
 
   nativeBuildInputs = [

From 0cf096811b580bbac05777fec14f12f0f450acb2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 01:33:17 +0000
Subject: [PATCH 1780/3724] mendeley: 2.136.0 -> 2.137.0

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

diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 44be311190a3..4468d3faec64 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -8,13 +8,13 @@
 
 let
   pname = "mendeley";
-  version = "2.136.0";
+  version = "2.137.0";
 
   executableName = "${pname}-reference-manager";
 
   src = fetchurl {
     url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
-    hash = "sha256-NAH4BwWEdI1WFWgPJIPbWkpkN/qxR2+8NwGtdCeohbA=";
+    hash = "sha256-jjwOtcyA1dKWXWVtUsVaXMUgDyBoTKACoZ0UGKH4uL4=";
   };
 
   appimageContents = appimageTools.extractType2 {

From f4f0356baa6a169553737e2c5410011c0d8b7d6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 01:33:19 +0000
Subject: [PATCH 1781/3724] decker: 1.57 -> 1.58

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

diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix
index a222e307e220..daebdb06c7d6 100644
--- a/pkgs/by-name/de/decker/package.nix
+++ b/pkgs/by-name/de/decker/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "decker";
-  version = "1.57";
+  version = "1.58";
 
   src = fetchFromGitHub {
     owner = "JohnEarnest";
     repo = "Decker";
     rev = "v${version}";
-    hash = "sha256-2y/kr8kBMfHAiWO6s7rAyDYyv70NnmiKeYhYq9Zmz0Y=";
+    hash = "sha256-oPB+TT7mHJ6GNBnGIVmbAxNoD2oexPI2Sm8kxxsV6d4=";
   };
 
   buildInputs = [

From 81edf09ce5750d44fdc568c60806297af6bfa99d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 02:31:10 +0000
Subject: [PATCH 1782/3724] iosevka-bin: 33.2.7 -> 33.2.8

---
 pkgs/by-name/io/iosevka-bin/package.nix  |   2 +-
 pkgs/by-name/io/iosevka-bin/variants.nix | 180 +++++++++++------------
 2 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix
index 942b85e8ecef..cc4f54e63013 100644
--- a/pkgs/by-name/io/iosevka-bin/package.nix
+++ b/pkgs/by-name/io/iosevka-bin/package.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "33.2.7";
+  version = "33.2.8";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix
index 4115611b72a2..2bc01e5cae6c 100644
--- a/pkgs/by-name/io/iosevka-bin/variants.nix
+++ b/pkgs/by-name/io/iosevka-bin/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "0z7w7j7wwc36qzmwralkbyps60p8x5wb514bdnjk8s9023z2w0nz";
-  IosevkaAile = "0pbappmm45vma5d45l2a98zb6213hfb0k30hvwv5298ds3k95f89";
-  IosevkaCurly = "1zw9gas6yw6dxk5ahdbbc9374rzzanr9k38ka4jhydn8zmcnsq85";
-  IosevkaCurlySlab = "1yvlyg5c5lydc5ycn9i8pnch1jwm749sng17b3xc0x18ndrqsa2x";
-  IosevkaEtoile = "12q8bvl8ckkj8v6ngw68bn62mcdfl5w71l7hc3m9b3fr4gfvz2gm";
-  IosevkaSlab = "0fpj2phmmsfqzii39a3zvyjzrbhjnn914cdcgp6g1b6xk5qd1p5n";
-  IosevkaSS01 = "03fzxs4wba1qc5mhy9cr664gfh9zz9wg0qsw3gxnn1rd9xd2y5ri";
-  IosevkaSS02 = "08pi97qzjs4v7xgck8g68llm880bp23kfgp8sqxdv4n2d5cr4yib";
-  IosevkaSS03 = "1d75hzcjz55jb9xwgky1ns78lg776aw0a0a8gyfm8kxhmb8n1kpp";
-  IosevkaSS04 = "0snq7wd02j0xmcf6smqxv33f4z9wdr14dz7hla892hnbm0pymlws";
-  IosevkaSS05 = "0xp502q3zv506fbgjid51n7j5hcq3hjvq8rz417shd9f68mx0z9z";
-  IosevkaSS06 = "0w2rjmv1k13jhndv165xaamcscxbsgh38icnzj72hs3kw8mgijj7";
-  IosevkaSS07 = "17661r5bnwd3hphy52d1mjp9sxs4jfxc741x672jxwdwnj8w6ffh";
-  IosevkaSS08 = "15q1kskng4nsp60kv09zwvp24m9lql9wa3ahb94s57k1rqmf4jn6";
-  IosevkaSS09 = "1l6p0arvndkz36h3x1npb1yj910nvbj3v0a3j5lz6dbhv0imsx0q";
-  IosevkaSS10 = "1agwjpw1hh8wagacld61ld9gyh5vmirrabjvv5s7gzrfr8acgp18";
-  IosevkaSS11 = "1hz7ln5w083z17napnm8v1gw6nzh8dkzbiqw8zrv5bmbj3jzc21n";
-  IosevkaSS12 = "10kz86ypf9c41n8yk7yx2rrxmwr3c0gwznw9lrida15lppwfq6as";
-  IosevkaSS13 = "0wbprdjyilp18j8gxa1fa0iggy84mzy826ms3bq20i4q6xcsqli5";
-  IosevkaSS14 = "07a6xcxl4mksxfpfvwx5pr3vw6mpnz9bfpfbsy53jgn3yc6cfwl1";
-  IosevkaSS15 = "1ij9z4ngh7s7ld4bh0f6mz4zxlsfa2l1dpq3b429na9vachv1khj";
-  IosevkaSS16 = "1skg7aqnzd7nyc43glbgg4b10xzmmc0gn20v6qmkrdv1cyhxwm87";
-  IosevkaSS17 = "0xcdv8zygvmh218qk9lgjcgdflcr54s7p86x5br2aja658azdlzp";
-  IosevkaSS18 = "1nf6wajmjx2aqqmv6zbfa29jsvg4lw8jf1jk32xrd5953yx30y6z";
-  SGr-Iosevka = "1czz0cz9py8ldrp0h1la5dd1b558ss32f2vbmcv5j5c76fify71f";
-  SGr-IosevkaCurly = "0zfqx11alkbd2bj77rnzgb4jy91fa6ns596m82gfkmks7ggq3b4j";
-  SGr-IosevkaCurlySlab = "0l0vfbq5vya9igx6xd9hsnm96bp8j87qnhj553rhd56jy73ms5la";
-  SGr-IosevkaFixed = "100g3j0v8qfmkkhl0zwyy736i5a0ci33hfmh1dwnzkx993qwrv01";
-  SGr-IosevkaFixedCurly = "0nriagy3m1r8fn2r51k4xi69b7xj09dhg4bvl0gj2syrrqldnkyj";
-  SGr-IosevkaFixedCurlySlab = "1bpihhg5gxlbg152vdwbb6kq5k8dcrirzwhay4w5bq9fzfg62p6z";
-  SGr-IosevkaFixedSlab = "0v5mfni7y3h519xa2r70bqx5ragk6l68kghsr1k0wbnv03m3ha7w";
-  SGr-IosevkaFixedSS01 = "158l9b0cdaa7al88wg6bba9xxp6sn914gj58g201w5xsbd0srpql";
-  SGr-IosevkaFixedSS02 = "1082wffk762mdc855iz7zrqhb9dpmd3yj324jzzsvhwhhj66hmnl";
-  SGr-IosevkaFixedSS03 = "1kr194dpq365ickgrmhrrjpsy0mv5ixm5z7xbciw6pppmk8aaami";
-  SGr-IosevkaFixedSS04 = "0z31masbyxvmfagdpcs1iz3ibslvg54ix9w6ld0rzkdjvln8g6pr";
-  SGr-IosevkaFixedSS05 = "0rnda4lnjv0ya1911mbrsymada6qq7nzrnzikzm2140ck3lq8lcl";
-  SGr-IosevkaFixedSS06 = "11p8ks82drhvmm9qnlqqz1r77chg0ffdrx4m0s32k46s928kjkxs";
-  SGr-IosevkaFixedSS07 = "07xfkr1qdvvr5w26q6qgfqbij2d3iaxxwh0ibj0x9v9zwf6nn7w3";
-  SGr-IosevkaFixedSS08 = "0p0phcjakd0x9qph8wr43l4qg8v3kv05k1dzmvbx7v6dbj69b230";
-  SGr-IosevkaFixedSS09 = "1hghv10j5gdizr0yjxs0qdmqvqdi397bzwscdj0asislf2scji52";
-  SGr-IosevkaFixedSS10 = "0yjwyhdkxg2icxsql814a33zf0k4pzsxwnk5wydd535qld2jl188";
-  SGr-IosevkaFixedSS11 = "0jrnmr5aspc155ajn9cxbapvbl240njx2zha7x0r1q471r7kf42y";
-  SGr-IosevkaFixedSS12 = "1p463hmkvmkcr4602blzwafs0gzi83b781barwi862dah5mp3yq6";
-  SGr-IosevkaFixedSS13 = "1jr0rfr276870gdl3ljysw4zp2habyqa80wcbzsdsp2m2nqdwn53";
-  SGr-IosevkaFixedSS14 = "1zryh9bmiipn4zvkga39ksqfrrnsr04invmidhrd955g39yz1c4a";
-  SGr-IosevkaFixedSS15 = "1ly33fh8m3hwkmzm7fr870wys3xp49cknd9dmdm1v4calylfd88w";
-  SGr-IosevkaFixedSS16 = "0gq66d1x5hdfn2iwcl75rq0586l7k6in9vsfhxabfgw9gp6y852c";
-  SGr-IosevkaFixedSS17 = "0sj1jmipz8a2vwizg6p0ywa838w2m3x5lfj49ql1ybh1bjz1cj23";
-  SGr-IosevkaFixedSS18 = "1rkz18k0nrz6if3nmcjpvrcbc2pg5w8z6dsvld90yf1964qll7q3";
-  SGr-IosevkaSlab = "18kif4a83qs1nsv3pvnyf8labw89ix4x42ydji6l387lzzxn5919";
-  SGr-IosevkaSS01 = "1j74h95csjfdvgmbqmnvgavhm5kjvbkh1rsh4xgrf4rqjcnr82kw";
-  SGr-IosevkaSS02 = "1n63pwjm05mwxzy18zw4hd0547ycg1dl0ivykgw1f25yf968wfg9";
-  SGr-IosevkaSS03 = "0a8v523slxnja9vslfz4cxy5g6h0zcj30mky70wxmnf2gmfvc7zv";
-  SGr-IosevkaSS04 = "0ylvzphbhvixfq69zyaick56jpkff33vyc2z1pszqblz0dzdc8kn";
-  SGr-IosevkaSS05 = "1ij58iqs9bmibgg9pj38053phnydwcb2k9npgbs88f08s1pgjvh5";
-  SGr-IosevkaSS06 = "00yfsbhgcxd3dv888hw8r4n4ivwxcn0m3zz99djgzxn0nd8r10y2";
-  SGr-IosevkaSS07 = "0b5c29x479i04afdkjplbq135pzhfcwi144xs0k2ba6s85g0y10d";
-  SGr-IosevkaSS08 = "1by2vd7kjqiqj7f3zps4xiz0ydq3gnljkh7jly513dg0idg2agwv";
-  SGr-IosevkaSS09 = "0a9sgh2vwm57ay1pzlrmwd549aaidg7p8b76dhxvhmvf006ay92b";
-  SGr-IosevkaSS10 = "079vr05ilaijqyy1wkqgk42jg5i2s3sz5y3i19gr1yqgfdpq2b3j";
-  SGr-IosevkaSS11 = "11l0cf7ib9ibcckpjymrpwgsadz3glwdics3mzhhzv28fz91b95c";
-  SGr-IosevkaSS12 = "1sbwi3fbj421z8jaa224hy8vmk565brclxzg9dnsdg5x8kxlf6jg";
-  SGr-IosevkaSS13 = "1qsqa76wkz2adaabigw6d74k0s0jlswagsyknxcpynh6fmzqcrs4";
-  SGr-IosevkaSS14 = "002kzsjqsajz5q1wy0vfr836ljmlm417zb3c6yjlnqp2zpzz26d5";
-  SGr-IosevkaSS15 = "1h74gl7xm2qdy0v3xhj0nmwn6b6zwxnmrv0wwpqd2yn4jf57xa4v";
-  SGr-IosevkaSS16 = "0y58mggxv7bqymf45bcy2mjlngz3hp5mbisy1n65d7kmqcjfyj97";
-  SGr-IosevkaSS17 = "1b728h7qnyd9i3jp1j7d7n11vksw6518rhl7470h01qmqnmpw579";
-  SGr-IosevkaSS18 = "1hh64ys2bjh7qlkz30vnj38grkr4s6c5nm8c1zgf6yi02xcrnxjg";
-  SGr-IosevkaTerm = "1k85q6y3h0i8ivm0llif3k4llgaxin87gmvjxn4h8092yfi59kkh";
-  SGr-IosevkaTermCurly = "1xwif6qjada58mswqd0myr2p2h06dik55cj4bsk3kmva2avvn2d3";
-  SGr-IosevkaTermCurlySlab = "161583x6zphxxzpzkp889rhjihpxy2ahrdc8nbqldn7j2nijz56s";
-  SGr-IosevkaTermSlab = "1fsx3z12plbkgjjdppf9c2b0y40vsavqp5hkj5b1j336cxah97yr";
-  SGr-IosevkaTermSS01 = "1z2xyyb2ddlrarxqzrv9x7hajpifqi15simqnmd31d899kx1zqx3";
-  SGr-IosevkaTermSS02 = "1nrr55hh2kd57ri6ipcm2425g469xj1gxf7lzivi1w8dbgk6mi4j";
-  SGr-IosevkaTermSS03 = "1zp7p0b4y911lxf80bkhj7x68xpjc36a6x6lmq2msq886hyayq14";
-  SGr-IosevkaTermSS04 = "15bzbrch7f0c4sxi01sasavkbjvgja1h740hd2zaqlsshx8sk91z";
-  SGr-IosevkaTermSS05 = "1zl760ikgq7y0x03zjnild7dpx9ndc1g0rjk5drp84qg8saaayz3";
-  SGr-IosevkaTermSS06 = "0zy62b3njnz0ip666xx68lmc8b4yaa610fy5qf9d6c8yj0qfb1gd";
-  SGr-IosevkaTermSS07 = "0m9j0v4ijz6yprvvnbv7591vh81xr1yyr73fy4463v9za99ccpvn";
-  SGr-IosevkaTermSS08 = "1a5qgy3cbf166q2j3gg8h4a0rfz9cjb6c1kqrmkvabxxk6fmg3s5";
-  SGr-IosevkaTermSS09 = "1hz3pasx0zg7467cpdwrm9gnfdwslbp5llawfsr2qp5vzkqggxhj";
-  SGr-IosevkaTermSS10 = "1cgfsmf2arcpjn3wclhkfqajx4nkc24d8ww3k8156bjd7bn8hxa8";
-  SGr-IosevkaTermSS11 = "0z6rw2f8palzm2k00pacnaw27kipr4sd3l9rh3ahw88s4h0r3kgv";
-  SGr-IosevkaTermSS12 = "0qak5xq61wxzr3gcyhamf9sanzisx8n72l7acwd7nffk9c5c7iy9";
-  SGr-IosevkaTermSS13 = "13vi16nks0kbd0hyg1g4cxi3pxxqk3sj297h5nxv0i0khfrdyyys";
-  SGr-IosevkaTermSS14 = "1q004ws9aamdvkfm2as6281ypk0fvq5m9ccv11azs9jcfydx5s1n";
-  SGr-IosevkaTermSS15 = "0fdk1x6wpzsrg0r304nsk9hszpy9yndjkrq62q6a466sxsykj3ij";
-  SGr-IosevkaTermSS16 = "0yiwj0dz7lf1y6v7snmxl5zfqq66hg4dg82fb2axibh0f0k9x51y";
-  SGr-IosevkaTermSS17 = "1xih5lnxl4v3gw3vz93pv2djkibmb13y4a76ky7svyg2y3v5dzhm";
-  SGr-IosevkaTermSS18 = "1qlk7fcsp3sbq4q1zny5gvfbqmkgz7cqxz5pvgfcjd6i6s932lmb";
+  Iosevka = "08vbbk1k1cvg7i89y19j7dfvb5icdw9k17x9viy5in8c3zh8l86b";
+  IosevkaAile = "0d3h9zvmm2jq675ypri8gsnyr480f45a6qy3nxs3zlchdk8x8r6w";
+  IosevkaCurly = "024h777s3ya4rs37qcni694rxnhfz4c48spazy2kyhr1vz144f3p";
+  IosevkaCurlySlab = "1xia7kxfl600v1n0mrfxydl4b44k7qhlm7ziqj11mszfh0nyypjh";
+  IosevkaEtoile = "08ihdsbz04f96s2dh2d8yndc04n2xcx0k4f7ai757vkqvj4acl1s";
+  IosevkaSlab = "1rf2jbir0l09w7ndv4rdj4sj5qhhnq5pm85xz3r057rg21d5knxb";
+  IosevkaSS01 = "0rkwi4cnf03ayllfvmldfksriis6gcfzj9lqj79shqxk7j6lwznp";
+  IosevkaSS02 = "038n78mhbxayslr5p8iminrajh37sjihkc8jzxp16aq4xk0c7j1b";
+  IosevkaSS03 = "1ci08fsz3d35qjrq0jg9bw6vw86ckamlfqsk031ay8prnyycbdvk";
+  IosevkaSS04 = "0n128k5ihp2gjl704xfczdbxlzzahw9xsdl28fp15gyk9a2h8h2i";
+  IosevkaSS05 = "0mdn5f73r50zi4x5851s2rw7ya0l1lm9v2ljbv5rwx9qlcn1mv6l";
+  IosevkaSS06 = "0z0bdgywcp1b5y4j7lym3k3ryg0r576mpbsa3fq8z50h3f15i7y6";
+  IosevkaSS07 = "1rn0q1a44351fcihldvvq379np3a4c4q4msmdcgk2ijfrczr78s3";
+  IosevkaSS08 = "1zvjrvk2lp371k5ph7vpmmxw2hnk26qmyvbnm68vivs4x8vlwk3j";
+  IosevkaSS09 = "0ph2pn6q40z5f7blfig0wr4bl4qnqjsj5l67qjws3vjgzjn795yd";
+  IosevkaSS10 = "1vpk21idk0hczch29rq31rg3qw4yvvg8vyi8j1si42ki9lk3mg61";
+  IosevkaSS11 = "0s626n3a3ns877lv1k55bwasgkkbgsvcbgz3hkvghqj4ln90fv67";
+  IosevkaSS12 = "0blskpw05s9da5i9258ii2nvvrgnyixm9nb5ax5vgi94j290wzcj";
+  IosevkaSS13 = "0r1170rzwknfkf5lq2vqxdgmkdncmddgjbaq8dy7hsa3zjd591j7";
+  IosevkaSS14 = "0v9gs6av365x84c50r7k2yhiv1g19s48iwrlxzxi4yzr15v9z3kd";
+  IosevkaSS15 = "1cw013khszmaaxn4vx0clgkw3xidvlsxd85ykx0kr9np3cxlxn07";
+  IosevkaSS16 = "1qskhwplyp30mds9j06g6b8i9dvxsjdg3j65g0gj15mp027hi8mr";
+  IosevkaSS17 = "14zzcw2pk4w0y2r1aic513cmf961szqrpfkfnj577715ch7x02is";
+  IosevkaSS18 = "0la2ikwkazi9m61hm8i9x2w0ppqc7v1qqpvwvx03hhdx2swgp8x5";
+  SGr-Iosevka = "1k916yy505ww9pyxx0lvifa8p5r9zssfyc6fcrdp0bv8faqkkrvp";
+  SGr-IosevkaCurly = "0mw43birmr6d3ykajm046wx1xqyxfaw0fq4vrwihpaz8nqnlhfki";
+  SGr-IosevkaCurlySlab = "11gyyzd3sjk6w23861mzw7gvgd1qfg3la4ljq087jmh7c4gvi3in";
+  SGr-IosevkaFixed = "17lw03agm4jw8i4gymiwq124dm5zll28mcl2rzzmwsf1xl014v07";
+  SGr-IosevkaFixedCurly = "1jn7qm5mhw1jl1w6vxpbz53hpw2ph04i3kpn13nhsy8dvd4gff67";
+  SGr-IosevkaFixedCurlySlab = "0bdzd4dzg0nm2ffv341kp67vmmd5ykvdiil6igsdxkr5wazvn2pf";
+  SGr-IosevkaFixedSlab = "0djllnvsdhfqyhm5mfxh5rjqsw1kd41a0f7ff36a3cqphd63ac7m";
+  SGr-IosevkaFixedSS01 = "09lvpmkyxk3kylyxjliwmywy9v75azwdhwh51hdyzbr231c0mb3z";
+  SGr-IosevkaFixedSS02 = "0dadqys577f71a5d7rrrwa7wc18jls088s1ig4jgga7pw08r1fhx";
+  SGr-IosevkaFixedSS03 = "0k654b1j5sz896p694j7fh0axkdpdzpn0fr3w44mgry6812mx17s";
+  SGr-IosevkaFixedSS04 = "0n1g0kjx55517xlr42jb1r6gr3lgmnrpbrfwm28j5agzkqnjn3sw";
+  SGr-IosevkaFixedSS05 = "0gs174gfq0x05v2hjx7yxk94sldm9hprypm22mv4ksy4x8nmw372";
+  SGr-IosevkaFixedSS06 = "0sybk7ai6ls338yg01rz2r3xl2xa89s4fz7cy8i0a1cakcblapyq";
+  SGr-IosevkaFixedSS07 = "1sqsn3msld2y08ad1imkrxwqkd32frj63q794ynf0blfnkpsgvc6";
+  SGr-IosevkaFixedSS08 = "14j5w97zikhwn57632rxgmq6zfhfhsl4d9f8yiq7isq45nb7kcvn";
+  SGr-IosevkaFixedSS09 = "1pjv8pf8b4wjbxinqi1d2i452bl44jqi0lksdbwanasv7yy8i8l2";
+  SGr-IosevkaFixedSS10 = "0w9840jfxyms367676lyz7b57r3xn582micxgjh8qmdpbbv36xvn";
+  SGr-IosevkaFixedSS11 = "10fd5jbv3wcgy2r9lvwc1qhd2bzpxxym4z16w99wibadas02jjjf";
+  SGr-IosevkaFixedSS12 = "0dbk3l6yrnpdg9mbdixp201n709j0j9br2k3jvdw83q4mcikfcbs";
+  SGr-IosevkaFixedSS13 = "0rzpw8pna6fz99xi1k3cbjbfc5nbsj43k9k747i3yajy99f37ncp";
+  SGr-IosevkaFixedSS14 = "0qmrdzz94c4fjy771wbx81078zdcqb9vfw1rhmxggxykb7ak69ik";
+  SGr-IosevkaFixedSS15 = "1gswliwkh8bq978mjckpqb9ppk65msp6ljc9fvx6j0kk37kn6bn5";
+  SGr-IosevkaFixedSS16 = "046gpzan4d2r4yfk431dd3204ab6yk3jaxg0n9iqwdinsmlvh296";
+  SGr-IosevkaFixedSS17 = "1ykcb85n4iv8xr9db2dbk5iv42qw85lwr2bbl5ij2q19rj6vp73c";
+  SGr-IosevkaFixedSS18 = "19am4y3wbfdkqfk23cninsv7m6rwysa1ij5x0a4fhg8mrm0acwad";
+  SGr-IosevkaSlab = "1m0pqxdcj1638gc1avlb8z3imccl7aif3kkn78gsbjbax5dln0ic";
+  SGr-IosevkaSS01 = "10csf59fp8s0ygg6j8s2zfzd4740vb5rl4z0vhcvsmwllg6jf6av";
+  SGr-IosevkaSS02 = "1mcxb4p6fw56ncw7wkf6g9mhswpwn6mdbdmpcm0qmvgqw2czp4xw";
+  SGr-IosevkaSS03 = "0abkw56n8ihi6l73xmxjxwgqpgrvmxbf76i70xgmh3s50242ksil";
+  SGr-IosevkaSS04 = "0hm1m1s4mqgz9y1z5xbhi7pq4rzl3h8i951844iw3l0d5h2mcpki";
+  SGr-IosevkaSS05 = "0nf20bwnwrl1l6xy4hb3nap3vzgrmnc7cmkjaip0b2dc9i04rqq6";
+  SGr-IosevkaSS06 = "04ncjbrkfpbm3qms4kwgbgqpa2hzpjh6vd2jgwjzzq2hi00k1dzc";
+  SGr-IosevkaSS07 = "198jjf6mvivb499iazbds3yl2d9xggw6xdc3piij76jx196svppf";
+  SGr-IosevkaSS08 = "0qbn6cf51mgzn2f3z8zcq9j7vs5ihwdw8kxs6svpd88y1dlssmcv";
+  SGr-IosevkaSS09 = "1rh7kzfis3kg80lp3g8cbgr5r7372j98vgpc472n0s5rgsmxwr3z";
+  SGr-IosevkaSS10 = "0ajbgchdlld25f21pdz7rkppa1scly91yjl0nhmm10wc436baij1";
+  SGr-IosevkaSS11 = "009a7y4k9lk622mhv14h9nqflja7bm6p1a3l6qn9fw8gc6kclkjl";
+  SGr-IosevkaSS12 = "1mxckmw297xqyazpkriqgwnki07yxjzi8i7a4gvfhpkaq8vj03yl";
+  SGr-IosevkaSS13 = "18fchw618dwvqas18kmmi863gdp3rswimxykqyvdxyv06fwvlaah";
+  SGr-IosevkaSS14 = "1k1fmfjhg6azlylda1227wa6iy0p4bgn22xkhw162f32pjy28z2l";
+  SGr-IosevkaSS15 = "07c1hs8vfbf3wv0cl21sqhm2al4j0xdiav15xp6vqgldh4l5gjgq";
+  SGr-IosevkaSS16 = "0qwfcw95y63wl6qcggd8y5f56h4ighkz4df994nixlhkyvzfa8kr";
+  SGr-IosevkaSS17 = "1aa5c1fb8r3chnpb9b59s5l7rqi58s5g1n5y7pdcmwp9cl1d3sd4";
+  SGr-IosevkaSS18 = "1nkgw6sqyxmf5aw4sanfa3cb4gbrd5871ni4qqn649lgnsjq8bk7";
+  SGr-IosevkaTerm = "19d26zlapms8ppm4qll5l7rplirj1k6xn4y89v2j857li2i7va95";
+  SGr-IosevkaTermCurly = "11wjd0a4gdyhnl8914j084mlb8z4awkn3pd6a3c2fq8qynwkcvc9";
+  SGr-IosevkaTermCurlySlab = "0kajmdzg6iqzg7y51kl9zh0fvw3yz408j63i3lzlrjj4plqyd59f";
+  SGr-IosevkaTermSlab = "1hbgj4psgv5ci4f0mjxd4q3ydk37jp16b7h8kjlfinhldbsrsd7x";
+  SGr-IosevkaTermSS01 = "0kri3c22j7a6c5m26i5l975w6csbkbv2fb2plrwc8c8sdqh5qy8q";
+  SGr-IosevkaTermSS02 = "10mwqfy38rp6ygy5v6irb57dl0irkmnlv133zhdyqbpn9gaiwc19";
+  SGr-IosevkaTermSS03 = "0rn62yl26abi8p0hz5yzkd4nw4im7p84w957fbyr5g2dmwl377ac";
+  SGr-IosevkaTermSS04 = "1rb1ysqq6mkp7kd518py9lpp4k82v538rv6im464n82kgz0caz4l";
+  SGr-IosevkaTermSS05 = "0kc2b9p933l2q18v3an26l4q7fxc7bsm02zslz91y92rwzvjhxdr";
+  SGr-IosevkaTermSS06 = "1m6jcdaa7rca0310ggi9syzc8a2dxyr88q2h09a8v59zx8cfa0vd";
+  SGr-IosevkaTermSS07 = "16w437n33gbflb0bfh7i9rjr33wh5v98yzfm2g5l8f7wpgbc984i";
+  SGr-IosevkaTermSS08 = "1bppjyyqqjdkka2si6skyc9rqs87l325g2vf7vjfav61ddk804w2";
+  SGr-IosevkaTermSS09 = "0wmz1p0dibyzvqxdb9dwwjnsqly36h3hhz5pj0jamnwbjnynfrqj";
+  SGr-IosevkaTermSS10 = "1i7dvd9v4fq0m32d0gb70pw1ivmr47vrh852zh6drsj6852iqc8m";
+  SGr-IosevkaTermSS11 = "1v3fx9778pnfg3gmpnprhawh8863xjfxjfdb59hpd2g6jjakag3b";
+  SGr-IosevkaTermSS12 = "0laqvc1qgjafk573wx0zmapxdy12a3jpd903zvdnks4z46nspl3q";
+  SGr-IosevkaTermSS13 = "15xpvsay23wpp27j903c4v8zhykj742ydfi15lav7rmbd6k182b2";
+  SGr-IosevkaTermSS14 = "14by0l4a038jwv4n8b7iyyji5zzsd6iqqa9mla0rz1135k9qlvza";
+  SGr-IosevkaTermSS15 = "1bb08wpaxwcaj6i4ib40n3xgjn2ps9znfki222afmlvcd593p307";
+  SGr-IosevkaTermSS16 = "10cv77jncjpf29hba8g9s6ppwlkyk885ik4p1vrlaqa6scvy4i7p";
+  SGr-IosevkaTermSS17 = "1l48b3lb2mmrlbvpzsjd1x7i26mbaxy4idbgf1fsi8pkrz6x2cxr";
+  SGr-IosevkaTermSS18 = "080pyjphx7h4lxsrwxd71dxbv5z45ynkpw97k8x0jf6acmkjisc2";
 }

From a34ae51908737e7fb1cb8cf225005061e4b5ee40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 03:49:35 +0000
Subject: [PATCH 1783/3724] readsb: 3.14.1691 -> 3.14.1696

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

diff --git a/pkgs/by-name/re/readsb/package.nix b/pkgs/by-name/re/readsb/package.nix
index 5074e1afe289..c3acdec80a4b 100644
--- a/pkgs/by-name/re/readsb/package.nix
+++ b/pkgs/by-name/re/readsb/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "readsb";
-  version = "3.14.1691";
+  version = "3.14.1696";
 
   src = fetchFromGitHub {
     owner = "wiedehopf";
     repo = "readsb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+OZhXyx/eNaMiKdwOK0XtzSHmdaxpCQeEqVwWja9iws=";
+    hash = "sha256-NStX7GwYffXlvoj30ZReVlUHGUSnAZRXdasMYj6C0Dk=";
   };
 
   strictDeps = true;

From 6c6216093a81d7c4bf532d092afcb86dfdb8a440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 16 Aug 2025 09:14:18 +0200
Subject: [PATCH 1784/3724] libLAS: fixup build by providing zlib

I don't know what changed in this staging-next iteration:
https://hydra.nixos.org/build/304652236/nixlog/2/tail
---
 pkgs/by-name/li/libLAS/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/li/libLAS/package.nix b/pkgs/by-name/li/libLAS/package.nix
index 5409edbf5e35..138f56e8391e 100644
--- a/pkgs/by-name/li/libLAS/package.nix
+++ b/pkgs/by-name/li/libLAS/package.nix
@@ -8,6 +8,7 @@
   libgeotiff,
   libtiff,
   laszip_2,
+  zlib,
   fixDarwinDylibNames,
 }:
 
@@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
     libgeotiff
     libtiff
     laszip_2
+    zlib
   ];
 
   cmakeFlags = [

From a444f841496916fe249ff46a50187c8e655ba43d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 16 Aug 2025 09:40:14 +0200
Subject: [PATCH 1785/3724] python3Packages.multidict: fixup build on darwin

https://hydra.nixos.org/build/304989971/nixlog/4/tail
---
 pkgs/development/python-modules/multidict/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index 75f50f00d240..a3a2a1b2ed8e 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   fetchFromGitHub,
   buildPythonPackage,
@@ -35,6 +36,10 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
+  env = {} // lib.optionalAttrs stdenv.cc.isClang {
+    NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument";
+  };
+
   nativeCheckInputs = [
     objgraph
     pytestCheckHook

From e0fd83ef9233eab7f035c08d100749358b8dc0b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 07:41:31 +0000
Subject: [PATCH 1786/3724] python3Packages.parse-type: 0.6.4 -> 0.6.6

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

diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix
index 06a7cc1d6aba..b9af06723939 100644
--- a/pkgs/development/python-modules/parse-type/default.nix
+++ b/pkgs/development/python-modules/parse-type/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "parse-type";
-  version = "0.6.4";
+  version = "0.6.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jenisys";
     repo = "parse_type";
     tag = "v${version}";
-    hash = "sha256-R0HMrZaKjv0KITfHnQBjuXhs3RUgSJzkDXiehRICUUM=";
+    hash = "sha256-4ZQNxvYWqYXcMj3vEtaEdikuJ38llGpmuutIOtr3lz0=";
   };
 
   build-system = [

From 6f21e9a356f48eb9e44cac37c6ba45c33c41435f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 16 Aug 2025 09:40:14 +0200
Subject: [PATCH 1787/3724] python3Packages.multidict: nixfmt

I'm sorry.  I only remembered during the push.
---
 pkgs/development/python-modules/multidict/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index a3a2a1b2ed8e..c0c053d498bc 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -36,9 +36,11 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
-  env = {} // lib.optionalAttrs stdenv.cc.isClang {
-    NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument";
-  };
+  env =
+    { }
+    // lib.optionalAttrs stdenv.cc.isClang {
+      NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument";
+    };
 
   nativeCheckInputs = [
     objgraph

From ef62afd9e702634e2c41d6e723dfd62b1cd92705 Mon Sep 17 00:00:00 2001
From: DoctorDalek1963 <dyson.dyson@icloud.com>
Date: Thu, 7 Aug 2025 15:25:08 +0100
Subject: [PATCH 1788/3724] sunsetr: 0.6.1 -> 0.7.1

---
 pkgs/by-name/su/sunsetr/Cargo.lock  | 1818 ---------------------------
 pkgs/by-name/su/sunsetr/package.nix |   13 +-
 2 files changed, 6 insertions(+), 1825 deletions(-)
 delete mode 100644 pkgs/by-name/su/sunsetr/Cargo.lock

diff --git a/pkgs/by-name/su/sunsetr/Cargo.lock b/pkgs/by-name/su/sunsetr/Cargo.lock
deleted file mode 100644
index 8266aa015faa..000000000000
--- a/pkgs/by-name/su/sunsetr/Cargo.lock
+++ /dev/null
@@ -1,1818 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
-dependencies = [
- "anstyle",
- "once_cell_polyfill",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.98"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
-
-[[package]]
-name = "autocfg"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
-
-[[package]]
-name = "bit-set"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
-
-[[package]]
-name = "bitflags"
-version = "2.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
-
-[[package]]
-name = "bumpalo"
-version = "3.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
-
-[[package]]
-name = "bytes"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
-
-[[package]]
-name = "cc"
-version = "1.2.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
-dependencies = [
- "shlex",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
-
-[[package]]
-name = "cfg_aliases"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-
-[[package]]
-name = "chrono"
-version = "0.4.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "wasm-bindgen",
- "windows-link",
-]
-
-[[package]]
-name = "chrono-tz"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6139a8597ed92cf816dfb33f5dd6cf0bb93a6adc938f11039f371bc5bcd26c3"
-dependencies = [
- "chrono",
- "phf",
-]
-
-[[package]]
-name = "cities"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee8bec2115436fa4c2d3fb2e7286482c16e812fd781f2e40ffb8d1f66186e4c2"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
-
-[[package]]
-name = "convert_case"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
-[[package]]
-name = "crossterm"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
-dependencies = [
- "bitflags",
- "crossterm_winapi",
- "derive_more",
- "document-features",
- "mio",
- "parking_lot",
- "rustix 1.0.8",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "derive_more"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
-dependencies = [
- "derive_more-impl",
-]
-
-[[package]]
-name = "derive_more-impl"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "dirs"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.60.2",
-]
-
-[[package]]
-name = "document-features"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
-dependencies = [
- "litrs",
-]
-
-[[package]]
-name = "downcast"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
-
-[[package]]
-name = "downcast-rs"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
-
-[[package]]
-name = "either"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-
-[[package]]
-name = "env_filter"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.11.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "jiff",
- "log",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
-
-[[package]]
-name = "errno"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
-dependencies = [
- "libc",
- "windows-sys 0.60.2",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-
-[[package]]
-name = "fixedbitset"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
-
-[[package]]
-name = "float_next_after"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "fragile"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"
-
-[[package]]
-name = "fs2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
-
-[[package]]
-name = "futures-sink"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
-
-[[package]]
-name = "futures-task"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
-
-[[package]]
-name = "futures-util"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "geometry-rs"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fe577bea4aec9757361ef0ea2e38ff05aa65b887858229e998b2cdfe16ee65"
-dependencies = [
- "float_next_after",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
-dependencies = [
- "cfg-if",
- "libc",
- "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "log",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
-dependencies = [
- "equivalent",
- "hashbrown",
-]
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
-[[package]]
-name = "itertools"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "jiff"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
-dependencies = [
- "jiff-static",
- "log",
- "portable-atomic",
- "portable-atomic-util",
- "serde",
-]
-
-[[package]]
-name = "jiff-static"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
-dependencies = [
- "once_cell",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "libc"
-version = "0.2.174"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
-
-[[package]]
-name = "libredox"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4488594b9328dee448adb906d8b126d9b7deb7cf5c22161ee591610bb1be83c0"
-dependencies = [
- "bitflags",
- "libc",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
-
-[[package]]
-name = "litrs"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed"
-
-[[package]]
-name = "lock_api"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
-
-[[package]]
-name = "memchr"
-version = "2.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
-
-[[package]]
-name = "mio"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
-dependencies = [
- "libc",
- "log",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "mockall"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2"
-dependencies = [
- "cfg-if",
- "downcast",
- "fragile",
- "mockall_derive",
- "predicates",
- "predicates-tree",
-]
-
-[[package]]
-name = "mockall_derive"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898"
-dependencies = [
- "cfg-if",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "multimap"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
-
-[[package]]
-name = "nix"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
-dependencies = [
- "bitflags",
- "cfg-if",
- "cfg_aliases",
- "libc",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
-
-[[package]]
-name = "once_cell_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
-
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
-[[package]]
-name = "parking_lot"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "petgraph"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
-
-[[package]]
-name = "phf"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
-
-[[package]]
-name = "portable-atomic"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
-
-[[package]]
-name = "portable-atomic-util"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
-dependencies = [
- "portable-atomic",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy",
-]
-
-[[package]]
-name = "predicates"
-version = "3.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573"
-dependencies = [
- "anstyle",
- "predicates-core",
-]
-
-[[package]]
-name = "predicates-core"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa"
-
-[[package]]
-name = "predicates-tree"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c"
-dependencies = [
- "predicates-core",
- "termtree",
-]
-
-[[package]]
-name = "prettyplease"
-version = "0.2.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2"
-dependencies = [
- "proc-macro2",
- "syn",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "proptest"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f"
-dependencies = [
- "bit-set",
- "bit-vec",
- "bitflags",
- "lazy_static",
- "num-traits",
- "rand",
- "rand_chacha",
- "rand_xorshift",
- "regex-syntax",
- "rusty-fork",
- "tempfile",
- "unarray",
-]
-
-[[package]]
-name = "prost"
-version = "0.13.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
-dependencies = [
- "bytes",
- "prost-derive",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.13.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
-dependencies = [
- "heck",
- "itertools",
- "log",
- "multimap",
- "once_cell",
- "petgraph",
- "prettyplease",
- "prost",
- "prost-types",
- "regex",
- "syn",
- "tempfile",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.13.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
-dependencies = [
- "anyhow",
- "itertools",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.13.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
-dependencies = [
- "prost",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
-[[package]]
-name = "quick-xml"
-version = "0.37.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "r-efi"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
-
-[[package]]
-name = "rand"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
-dependencies = [
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
-dependencies = [
- "getrandom 0.3.3",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
-dependencies = [
- "getrandom 0.2.16",
- "libredox",
- "thiserror",
-]
-
-[[package]]
-name = "regex"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-
-[[package]]
-name = "rustix"
-version = "0.38.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-dependencies = [
- "bitflags",
- "errno",
- "libc",
- "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "rustix"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
-dependencies = [
- "bitflags",
- "errno",
- "libc",
- "linux-raw-sys 0.9.4",
- "windows-sys 0.60.2",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
-
-[[package]]
-name = "rusty-fork"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
-dependencies = [
- "fnv",
- "quick-error",
- "tempfile",
- "wait-timeout",
-]
-
-[[package]]
-name = "scc"
-version = "2.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22b2d775fb28f245817589471dd49c5edf64237f4a19d10ce9a92ff4651a27f4"
-dependencies = [
- "sdd",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "sdd"
-version = "3.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"
-
-[[package]]
-name = "serde"
-version = "1.0.219"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.219"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serial_test"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9"
-dependencies = [
- "futures",
- "log",
- "once_cell",
- "parking_lot",
- "scc",
- "serial_test_derive",
-]
-
-[[package]]
-name = "serial_test_derive"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "signal-hook"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-mio"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
-dependencies = [
- "libc",
- "mio",
- "signal-hook",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "siphasher"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
-
-[[package]]
-name = "slab"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
-
-[[package]]
-name = "smallvec"
-version = "1.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
-
-[[package]]
-name = "sunrise"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0733c9f1eaa06ed6d103d88e21f784449d08a6733c2ca2b39381cbcbcfe89272"
-dependencies = [
- "chrono",
-]
-
-[[package]]
-name = "sunsetr"
-version = "0.6.1"
-dependencies = [
- "anyhow",
- "chrono",
- "chrono-tz",
- "cities",
- "crossterm",
- "dirs",
- "env_logger",
- "fs2",
- "mockall",
- "nix",
- "proptest",
- "regex",
- "serde",
- "serial_test",
- "signal-hook",
- "sunrise",
- "sunsetr",
- "tempfile",
- "termios",
- "toml",
- "tzf-rs",
- "wayland-client",
- "wayland-protocols-wlr",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
-dependencies = [
- "fastrand",
- "getrandom 0.3.3",
- "once_cell",
- "rustix 1.0.8",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "termios"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "termtree"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
-
-[[package]]
-name = "thiserror"
-version = "2.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "2.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_write",
- "winnow",
-]
-
-[[package]]
-name = "toml_write"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
-
-[[package]]
-name = "tzf-rel"
-version = "0.0.2025-b"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb5c10d0e0d00ad6552ae5feab676ba03858ba9ccf4494743b7f242984419d4"
-
-[[package]]
-name = "tzf-rs"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb74389502c5223e56831ef510cd85b961659d1518deca5be257ce6f5301c4f"
-dependencies = [
- "anyhow",
- "bytes",
- "geometry-rs",
- "prost",
- "prost-build",
- "tzf-rel",
-]
-
-[[package]]
-name = "unarray"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "wait-timeout"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.1+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
-
-[[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
-dependencies = [
- "wit-bindgen-rt",
-]
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
-dependencies = [
- "cfg-if",
- "once_cell",
- "rustversion",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "wayland-backend"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121"
-dependencies = [
- "cc",
- "downcast-rs",
- "rustix 0.38.44",
- "smallvec",
- "wayland-sys",
-]
-
-[[package]]
-name = "wayland-client"
-version = "0.31.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61"
-dependencies = [
- "bitflags",
- "log",
- "rustix 0.38.44",
- "wayland-backend",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-protocols"
-version = "0.32.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a"
-dependencies = [
- "bitflags",
- "wayland-backend",
- "wayland-client",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-protocols-wlr"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf"
-dependencies = [
- "bitflags",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-scanner"
-version = "0.31.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484"
-dependencies = [
- "proc-macro2",
- "quick-xml",
- "quote",
-]
-
-[[package]]
-name = "wayland-sys"
-version = "0.31.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615"
-dependencies = [
- "pkg-config",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-core"
-version = "0.61.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
-dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-link",
- "windows-result",
- "windows-strings",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.60.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.59.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-link"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-
-[[package]]
-name = "windows-result"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.2",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.53.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
-dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
-
-[[package]]
-name = "winnow"
-version = "0.7.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
diff --git a/pkgs/by-name/su/sunsetr/package.nix b/pkgs/by-name/su/sunsetr/package.nix
index 22480bf81898..ae610ed0663b 100644
--- a/pkgs/by-name/su/sunsetr/package.nix
+++ b/pkgs/by-name/su/sunsetr/package.nix
@@ -2,28 +2,27 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sunsetr";
-  version = "0.6.1";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "psi4j";
     repo = "sunsetr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kFIfNVA1UJrle/5udi8+9uDgq9fArUdudM/v8QpGuaM=";
+    hash = "sha256-XDa6kjhdEur8YDfQQNg+RpLRtfOeTklB6LwXJaPcG7c=";
   };
 
-  cargoLock.lockFile = ./Cargo.lock;
-
-  postPatch = ''
-    ln -s ${./Cargo.lock} Cargo.lock
-  '';
+  cargoHash = "sha256-Jsii8PkRIZgQ4yrQHZpK8bLhaW5jg6EKYw65rPRCtGQ=";
 
   checkFlags = [
     "--skip=config::tests::test_geo_toml_exists_before_config_creation"
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     mainProgram = "sunsetr";
     description = "Automatic blue light filter for Hyprland, Niri, and everything Wayland";

From f7a5a81a1b236d2eda1fd985c138d7ac6fdd94ec Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Thu, 14 Aug 2025 22:08:58 +0200
Subject: [PATCH 1789/3724] azahar: add update script

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/az/azahar/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix
index 824845a0bc6f..98e2b8641f05 100644
--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -43,6 +43,7 @@
   enableSSE42 ? true, # Disable if your hardware doesn't support SSE 4.2 (mainly CPUs before 2011)
   gamemode,
   enableGamemode ? lib.meta.availableOn stdenv.hostPlatform gamemode,
+  nix-update-script,
 }:
 let
   inherit (lib)
@@ -149,6 +150,8 @@ stdenv.mkDerivation (finalAttrs: {
     (cmakeBool "ENABLE_SSE42" enableSSE42)
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Open-source 3DS emulator project based on Citra";
     homepage = "https://github.com/azahar-emu/azahar";

From 527553abf4972d5c18405a385f97fe29a3c042f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 08:47:19 +0000
Subject: [PATCH 1790/3724] stylelint: 16.23.0 -> 16.23.1

---
 pkgs/by-name/st/stylelint/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stylelint/package.nix b/pkgs/by-name/st/stylelint/package.nix
index 6b519ac4c79e..7dcc1152ee38 100644
--- a/pkgs/by-name/st/stylelint/package.nix
+++ b/pkgs/by-name/st/stylelint/package.nix
@@ -5,16 +5,16 @@
 }:
 buildNpmPackage rec {
   pname = "stylelint";
-  version = "16.23.0";
+  version = "16.23.1";
 
   src = fetchFromGitHub {
     owner = "stylelint";
     repo = "stylelint";
     tag = version;
-    hash = "sha256-kPqvrcIYxumy/SfW8sVqo2e72z32L4mgfAE79LS8BfE=";
+    hash = "sha256-OABtOdysDm0KpXWJ9fegi1XSZcKi5zohDtwxXvNDAf8=";
   };
 
-  npmDepsHash = "sha256-SJ1r2lINacrdFYUkjse4wx0EwFsFMVoeESzMKH2ijwU=";
+  npmDepsHash = "sha256-/chT/NTvfClFkCA+40BzTl2WNH9JrWzHWZshOCgCxcQ=";
 
   dontNpmBuild = true;
 

From 8a57bfa841e77a171161376986e224657a48eaeb Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 16 Aug 2025 11:36:33 +0200
Subject: [PATCH 1791/3724] freecad: 1.0.1 -> 1.0.2

Tag: https://github.com/FreeCAD/FreeCAD/releases/tag/1.0.2
---
 pkgs/by-name/fr/freecad/package.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 7b0ccda70fe5..11fa66be6a23 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -57,13 +57,13 @@ in
 freecad-utils.makeCustomizable (
   stdenv.mkDerivation (finalAttrs: {
     pname = "freecad";
-    version = "1.0.1";
+    version = "1.0.2";
 
     src = fetchFromGitHub {
       owner = "FreeCAD";
       repo = "FreeCAD";
       tag = finalAttrs.version;
-      hash = "sha256-VFTNawXxu2ofjj2Frg4OfVhiMKFywBhm7lZunP85ZEQ=";
+      hash = "sha256-J//O/ABMFa3TFYwR0wc8d1UTA5iSFnEP2thOjuCN+uE=";
       fetchSubmodules = true;
     };
 
@@ -113,11 +113,6 @@ freecad-utils.makeCustomizable (
         url = "https://github.com/FreeCAD/FreeCAD/commit/8e04c0a3dd9435df0c2dec813b17d02f7b723b19.patch?full_index=1";
         hash = "sha256-H6WbJFTY5/IqEdoi5N+7D4A6pVAmZR4D+SqDglwS18c=";
       })
-      # https://github.com/FreeCAD/FreeCAD/pull/22221
-      (fetchpatch {
-        url = "https://github.com/FreeCAD/FreeCAD/commit/3d2b7dc9c7ac898b30fe469b7cbd424ed1bca0a2.patch?full_index=1";
-        hash = "sha256-XCQdv/+dYdJ/ptA2VKrD63qYILyaP276ISMkmWLtT30=";
-      })
       # Inform Coin to use EGL when on Wayland
       # https://github.com/FreeCAD/FreeCAD/pull/21917
       (fetchpatch {

From 7138517a7375b593a317cdabf10bf09081e444ed Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Wed, 6 Aug 2025 15:10:14 +0200
Subject: [PATCH 1792/3724] freecad: remove mpi dependency

According to upstream, "Med Fichier can require MPI".
We do not have Med Fichier, so we can remove mpi.
If this causes issues, it should be reverted. However,
FEM still works, so this is probably fine.
---
 pkgs/by-name/fr/freecad/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 11fa66be6a23..c7985971f325 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -16,7 +16,6 @@
   libspnav,
   libXmu,
   medfile,
-  mpi,
   ninja,
   ode,
   opencascade-occt,
@@ -87,7 +86,6 @@ freecad-utils.makeCustomizable (
       libGLU
       libXmu
       medfile
-      mpi
       ode
       vtk
       xercesc

From c7e08edcf0761463a2d89a9688c96fc07cb30de4 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 12 Aug 2025 20:08:59 +0200
Subject: [PATCH 1793/3724] freecad: enable gmsh integration

---
 pkgs/by-name/fr/freecad/package.nix | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index c7985971f325..49fa3eb7c0d6 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -31,6 +31,8 @@
   zlib,
   qt6,
   nix-update-script,
+  gmsh,
+  which,
 }:
 let
   pythonDeps = with python3Packages; [
@@ -119,6 +121,11 @@ freecad-utils.makeCustomizable (
       })
     ];
 
+    postPatch = ''
+      substituteInPlace src/Mod/Fem/femmesh/gmshtools.py \
+        --replace-fail 'self.gmsh_bin = "gmsh"' 'self.gmsh_bin = "${lib.getExe gmsh}"'
+    '';
+
     cmakeFlags = [
       "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on
       "-DBUILD_DRAWING=ON"
@@ -145,12 +152,19 @@ freecad-utils.makeCustomizable (
 
     dontWrapGApps = true;
 
-    qtWrapperArgs = [
-      "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1"
-      "--prefix PATH : ${libredwg}/bin"
-      "--prefix PYTHONPATH : ${python3Packages.makePythonPath pythonDeps}"
-      "\${gappsWrapperArgs[@]}"
-    ];
+    qtWrapperArgs =
+      let
+        binPath = lib.makeBinPath [
+          libredwg
+          which # for locating tools
+        ];
+      in
+      [
+        "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1"
+        "--prefix PATH : ${binPath}"
+        "--prefix PYTHONPATH : ${python3Packages.makePythonPath pythonDeps}"
+        "\${gappsWrapperArgs[@]}"
+      ];
 
     postFixup = ''
       mv $out/share/doc $out

From b7b9a858327645cd58fd485b92a3af9c9a185c1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 10:30:44 +0000
Subject: [PATCH 1794/3724] level-zero: 1.22.4 -> 1.24.1

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

diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix
index e921448cddb3..2f6651fe5438 100644
--- a/pkgs/by-name/le/level-zero/package.nix
+++ b/pkgs/by-name/le/level-zero/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "level-zero";
-  version = "1.22.4";
+  version = "1.24.1";
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "level-zero";
     tag = "v${version}";
-    hash = "sha256-9MZcxpRyr0YMLHKTgxqJnm72rAYLkTdrn7Egky8mM48=";
+    hash = "sha256-mDVq8wUkCvXHTqW4niYB1JIZIQQNpHTmhPu3Ydy6IyQ=";
   };
 
   nativeBuildInputs = [

From 2c3b7083f0b2b3fc1018b4403644b4c095d57b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dimitrije=20Radojevi=C4=87?= <me@dimitrije.website>
Date: Sat, 16 Aug 2025 12:21:50 +0100
Subject: [PATCH 1795/3724] drbd-utils: 9.27.0 -> 9.32.0

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

diff --git a/pkgs/os-specific/linux/drbd/utils.nix b/pkgs/os-specific/linux/drbd/utils.nix
index ca1078e58322..9f382c785717 100644
--- a/pkgs/os-specific/linux/drbd/utils.nix
+++ b/pkgs/os-specific/linux/drbd/utils.nix
@@ -26,11 +26,11 @@
 
 stdenv.mkDerivation rec {
   pname = "drbd";
-  version = "9.27.0";
+  version = "9.32.0";
 
   src = fetchurl {
     url = "https://pkg.linbit.com/downloads/drbd/utils/${pname}-utils-${version}.tar.gz";
-    sha256 = "1qwdrjrgas8z8vc6c85xcrqaczjwyqd61yig01n44wa5z0j3v4aq";
+    hash = "sha256-szOM7jSbXEZZ4p1P73W6tK9Put0+wOZar+cUiUNC6M0=";
   };
 
   nativeBuildInputs = [

From 7fd23d75942dc3944767bd90f2289c6fde5edbc2 Mon Sep 17 00:00:00 2001
From: Hritwik <hritwiksinghal@protonmail.com>
Date: Sat, 16 Aug 2025 17:46:59 +0530
Subject: [PATCH 1796/3724] filebrowser: 2.40.1 -> 2.42.5, add update script

- switch from mkderivation to buildNpmPackage for update-script
- switch to buildGoModule as 'Newer toolchain versions should build projects developed against older toolchains without problems.'
- add update-script for ryantm updates as this project is now active and publishing new builds every week.

Signed-off-by: Hritwik <hritwiksinghal@protonmail.com>
---
 pkgs/by-name/fi/filebrowser/package.nix | 44 ++++++++++++-------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix
index 47524bc3b457..6322707f1ef9 100644
--- a/pkgs/by-name/fi/filebrowser/package.nix
+++ b/pkgs/by-name/fi/filebrowser/package.nix
@@ -1,64 +1,61 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
-  buildGo123Module,
-  nodejs_22,
+  buildGoModule,
+  buildNpmPackage,
   pnpm_9,
-
+  nix-update-script,
   nixosTests,
 }:
 
 let
-  version = "2.40.1";
+  version = "2.42.5";
 
   pnpm = pnpm_9;
-  nodejs = nodejs_22;
 
   src = fetchFromGitHub {
     owner = "filebrowser";
     repo = "filebrowser";
     rev = "v${version}";
-    hash = "sha256-UsY5pJU0eVeYQVi7Wqf4RrBfPLQv78zHi96mTLJJS1o=";
+    hash = "sha256-6AZwWdYQlaQ30Q5ohi9ovlUJZZ+u7Wqc5mfRW/3t7Zs=";
   };
 
-  frontend = stdenv.mkDerivation (finalAttrs: {
+  frontend = buildNpmPackage rec {
     pname = "filebrowser-frontend";
     inherit version src;
 
-    nativeBuildInputs = [
-      nodejs
-      pnpm.configHook
-    ];
+    sourceRoot = "${src.name}/frontend";
 
-    pnpmRoot = "frontend";
+    npmConfigHook = pnpm.configHook;
+    npmDeps = pnpmDeps;
 
     pnpmDeps = pnpm.fetchDeps {
-      inherit (finalAttrs) pname version src;
+      inherit
+        pname
+        version
+        src
+        sourceRoot
+        ;
       fetcherVersion = 2;
-      sourceRoot = "${src.name}/frontend";
-      hash = "sha256-AwjMQ9LDJ72x5JYdtLF4V3nxJTYiCb8e/RVyK3IwPY4=";
+      hash = "sha256-uGEw6Wt6hXEcYQzXYzfgo3fcCX7Hj39bLHsT1rsGy74=";
     };
 
     installPhase = ''
       runHook preInstall
 
-      pnpm install -C frontend --frozen-lockfile
-      pnpm run -C frontend build
-
       mkdir $out
-      mv frontend/dist $out
+      mv dist $out
 
       runHook postInstall
     '';
-  });
+  };
 
 in
-buildGo123Module {
+buildGoModule {
   pname = "filebrowser";
   inherit version src;
 
-  vendorHash = "sha256-FY5rPzWAzkrDaFktTM7VxO/hMk17/x21PL1sKq0zlxg=";
+  vendorHash = "sha256-aVtL64Cm+nqum/qHFvplpEawgMXM2S6l8QFrJBzLVtU=";
 
   excludedPackages = [ "tools" ];
 
@@ -71,6 +68,7 @@ buildGo123Module {
   ];
 
   passthru = {
+    updateScript = nix-update-script { };
     inherit frontend;
     tests = {
       inherit (nixosTests) filebrowser;

From 1f75f2f50e25aae3d3d5549da6d8161d7f804268 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 12:37:42 +0000
Subject: [PATCH 1797/3724] shpool: 0.8.0 -> 0.9.1

---
 pkgs/by-name/sh/shpool/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix
index dff35c483400..d8d60b2ced2d 100644
--- a/pkgs/by-name/sh/shpool/package.nix
+++ b/pkgs/by-name/sh/shpool/package.nix
@@ -9,13 +9,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "shpool";
-  version = "0.8.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "shell-pool";
     repo = "shpool";
     rev = "v${version}";
-    hash = "sha256-pSSMC4pUtB38c6UNOj+Ma/Y1jcSfm33QV1B4tA/MyKY=";
+    hash = "sha256-Dh2Law70RbGkD9dlbhes47CTgwPoEnN5WmxL10arCtk=";
   };
 
   postPatch = ''
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
       --replace-fail '/usr/bin/shpool' "$out/bin/shpool"
   '';
 
-  cargoHash = "sha256-JDMgYd9mKsLdqc8rpDg3ymgFj/ntpBBF5fSDb2cLOJs=";
+  cargoHash = "sha256-PCcRtpw+l7a9P2V7O4DGE6uatJ0TfGJyLUxbqiBY1Ro=";
 
   buildInputs = [
     linux-pam

From 2e2dd78d5d471b8b3f1c9499735e2e2c971927e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 12:44:50 +0000
Subject: [PATCH 1798/3724] z3: 4.15.2 -> 4.15.3

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

diff --git a/pkgs/by-name/z3/z3/package.nix b/pkgs/by-name/z3/z3/package.nix
index 8dca36473ace..a173b7b31d5d 100644
--- a/pkgs/by-name/z3/z3/package.nix
+++ b/pkgs/by-name/z3/z3/package.nix
@@ -29,13 +29,13 @@ assert
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "z3";
-  version = "4.15.2";
+  version = "4.15.3";
 
   src = fetchFromGitHub {
     owner = "Z3Prover";
     repo = "z3";
     rev = "z3-${finalAttrs.version}";
-    hash = "sha256-hUGZdr0VPxZ0mEUpcck1AC0MpyZMjiMw/kK8WX7t0xU=";
+    hash = "sha256-Lw037Z0t0ySxkgMXkbjNW5CB4QQLRrrSEBsLJqiomZ4=";
   };
 
   patches = lib.optionals useCmakeBuild [

From 708e923a3192fe170484fea7890d6755c0692442 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 16 Aug 2025 14:54:03 +0200
Subject: [PATCH 1799/3724] python314Packages.hypothesis: disable failing tests

---
 .../python-modules/hypothesis/default.nix     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index ea6abf7e8384..22b65220f4e4 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -115,6 +115,29 @@ buildPythonPackage rec {
     # AssertionError: assert [b'def      \...   f(): pass'] == [b'def\\', b'    f(): pass']
     # https://github.com/HypothesisWorks/hypothesis/issues/4355
     "test_clean_source"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.14") [
+    "test_attrs_inference_builds"
+    "test_bound_missing_dot_access_forward_ref"
+    "test_bound_missing_forward_ref"
+    "test_bound_type_checking_only_forward_ref_wrong_type"
+    "test_bound_type_cheking_only_forward_ref"
+    "test_builds_suggests_from_type"
+    "test_bytestring_not_treated_as_generic_sequence"
+    "test_evil_prng_registration_nonsense"
+    "test_issue_4194_regression"
+    "test_passing_referenced_instance_within_function_scope_warns"
+    "test_registering_a_Random_is_idempotent"
+    "test_register_random_within_nested_function_scope"
+    "test_resolve_fwd_refs"
+    "test_resolves_forwardrefs_to_builtin_types"
+    "test_resolving_standard_collection_as_generic"
+    "test_resolving_standard_container_as_generic"
+    "test_resolving_standard_contextmanager_as_generic"
+    "test_resolving_standard_iterable_as_generic"
+    "test_resolving_standard_reversible_as_generic"
+    "test_resolving_standard_sequence_as_generic"
+    "test_specialised_collection_types"
   ];
 
   pythonImportsCheck = [ "hypothesis" ];

From 586baa3d3b0ab2c3cc0dd8f4aac58c76726b6799 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 13:04:51 +0000
Subject: [PATCH 1800/3724] shaarli: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/by-name/sh/shaarli/package.nix b/pkgs/by-name/sh/shaarli/package.nix
index 034e048e77e1..5c07339d2761 100644
--- a/pkgs/by-name/sh/shaarli/package.nix
+++ b/pkgs/by-name/sh/shaarli/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "shaarli";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchurl {
     url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
-    sha256 = "sha256-vTSjYrde6ODQnIh77Um4McR9M8KKWnuIGRGE7SCMZC0=";
+    sha256 = "sha256-+UEtbEYHQrLtClk6VemMhSNx0OPh/JDVlDIfeIzdmRI=";
   };
 
   outputs = [

From e60c8b708884e015766fc74fd66025d6af9a5222 Mon Sep 17 00:00:00 2001
From: Valentin Bruch <software@vbruch.eu>
Date: Sat, 16 Aug 2025 15:06:25 +0200
Subject: [PATCH 1801/3724] beamerpresenter: change repository source to new
 location

The repository is transferred to a GitHub organization. Adjust the source accordingly
---
 pkgs/applications/office/beamerpresenter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix
index b9e5b3a0308a..e5fde0833bde 100644
--- a/pkgs/applications/office/beamerpresenter/default.nix
+++ b/pkgs/applications/office/beamerpresenter/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   version = "0.2.6";
 
   src = fetchFromGitHub {
-    owner = "stiglers-eponym";
+    owner = "beamerpresenter";
     repo = "BeamerPresenter";
     rev = "v${version}";
     hash = "sha256-sPeWlPkWOPfLAoAC/+T7nyhPqvoaZg6aMOIVLjMqd2k=";
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Modular multi screen pdf presentation viewer";
-    homepage = "https://github.com/stiglers-eponym/BeamerPresenter";
+    homepage = "https://github.com/beamerpresenter/BeamerPresenter";
     license = with licenses; [
       agpl3Only
       gpl3Plus

From 277ca5fa9f87c47ce8fd6889bcbcfcc8b74dd48f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 13:15:06 +0000
Subject: [PATCH 1802/3724] yourkit-java: 2025.3-b153 -> 2025.3-b154

---
 pkgs/by-name/yo/yourkit-java/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix
index 64a40c0e80a1..6b92b70900ca 100644
--- a/pkgs/by-name/yo/yourkit-java/package.nix
+++ b/pkgs/by-name/yo/yourkit-java/package.nix
@@ -10,7 +10,7 @@
 let
   vPath = v: lib.elemAt (lib.splitString "-" v) 0;
 
-  version = "2025.3-b153";
+  version = "2025.3-b154";
 
   arches = {
     aarch64-linux = "arm64";
@@ -20,8 +20,8 @@ let
   arch = arches.${stdenvNoCC.targetPlatform.system} or (throw "Unsupported system");
 
   hashes = {
-    arm64 = "sha256-DKpNFv5nuxdIUjgM/+LyVweV0B6SfCojcWfsAkoMH6w=";
-    x64 = "sha256-9CSCJaISxdc7lwZUxyO8gmkxuuvKMb3I9G0ftYfYY7c=";
+    arm64 = "sha256-X9YQy12rfTWOVKX2ufmS4GxLGp/I6jhZAZyRBfLuOuk=";
+    x64 = "sha256-BuEfpMEgkOcbUra6eT/sTiVhXpheMaCe55M/CuG0kHE=";
   };
 
   desktopItem = makeDesktopItem {

From e09bc73e667edbfd27dbedd05c1486556d717934 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 12 Aug 2025 18:13:52 -0300
Subject: [PATCH 1803/3724] dotnet/update.nix: read artifact RID from prep
 script

---
 pkgs/development/compilers/dotnet/update.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix
index 41df7569be19..fbbac2845c4b 100644
--- a/pkgs/development/compilers/dotnet/update.nix
+++ b/pkgs/development/compilers/dotnet/update.nix
@@ -124,13 +124,16 @@ writeScript "update-dotnet-vmr.sh" ''
           gpg --batch --verify release.sig "$tarball"
       )
 
-      tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json
+      tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json \*/prep\*.sh
       artifactsVersion=$(xq -r '.Project.PropertyGroup |
           map(select(.PrivateSourceBuiltArtifactsVersion))
           | .[] | .PrivateSourceBuiltArtifactsVersion' eng/Versions.props)
 
       if [[ "$artifactsVersion" != "" ]]; then
-          artifactsUrl=https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.$artifactsVersion.centos.9-x64.tar.gz
+          artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh)
+          eval "$artifactVar"
+
+          artifactsUrl=https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.$artifactsVersion.$defaultArtifactsRid.tar.gz
       else
           artifactsUrl=$(xq -r '.Project.PropertyGroup |
               map(select(.PrivateSourceBuiltArtifactsUrl))

From 91f0f77b1e4974c48e64449a0c92ce8c061257a7 Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Tue, 12 Aug 2025 09:48:21 -0500
Subject: [PATCH 1804/3724] recordbox: 0.10.3 -> 0.10.4

Diff: https://codeberg.org/edestcroix/Recordbox/compare/v0.10.3...v0.10.4

Changelog: https://codeberg.org/edestcroix/Recordbox/releases/tag/v0.10.4

Fixes crash on startup when album titles contain quotes: https://codeberg.org/edestcroix/Recordbox/issues/182
---
 pkgs/by-name/re/recordbox/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix
index d5be70da5d91..a704844310aa 100644
--- a/pkgs/by-name/re/recordbox/package.nix
+++ b/pkgs/by-name/re/recordbox/package.nix
@@ -27,19 +27,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "recordbox";
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "edestcroix";
     repo = "Recordbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-o2cKVRpuAwE+/TI5mwtSvkCFaXN349GP9dDlgdh3Luk=";
+    hash = "sha256-9rrVlD+ODl+U9bPzbXGLQBLkbnfAm4SmJHRcVife33A=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-0/tKL5UW1QuhsddivU/r8n3T3xyRaGLRVpKuXcc4fmU=";
+    hash = "sha256-W60X69/fEq/X6AK1sbT6rb+SsF/oPzfUvrar0fihr88=";
   };
 
   strictDeps = true;

From 8a9041308cccd3c9ee4ad29b43ff510bd7de4932 Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Sat, 16 Aug 2025 08:38:55 -0500
Subject: [PATCH 1805/3724] recordbox: add workaround for `glycin-loaders` to
 allow discovery by `glycin` Rust crate

Workaround taken from `loupe` here: https://github.com/NixOS/nixpkgs/blob/e39fe935fc7537bee0440935c12f5c847735a291/pkgs/by-name/lo/loupe/package.nix#L60-L74

May be related to: https://github.com/NixOS/nixpkgs/issues/364390 https://github.com/NixOS/nixpkgs/pull/364572
---
 pkgs/by-name/re/recordbox/package.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix
index a704844310aa..cc5f6b7c69b3 100644
--- a/pkgs/by-name/re/recordbox/package.nix
+++ b/pkgs/by-name/re/recordbox/package.nix
@@ -8,6 +8,7 @@
   desktop-file-utils,
   fetchFromGitea,
   glib,
+  glycin-loaders,
   gst_all_1,
   gtk4,
   hicolor-icon-theme,
@@ -84,6 +85,22 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
   cargoCheckType = if (finalAttrs.mesonBuildType != "debug") then "release" else "debug";
 
+  # Workaround copied from https://github.com/NixOS/nixpkgs/blob/e39fe935fc7537bee0440935c12f5c847735a291/pkgs/by-name/lo/loupe/package.nix#L60-L74
+  preConfigure = ''
+    # Dirty approach to add patches after cargoSetupPostUnpackHook
+    # We should eventually use a cargo vendor patch hook instead
+    pushd ../$(stripHash $cargoDeps)/glycin-2.*
+      patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch}
+    popd
+  '';
+  preFixup = ''
+    # Needed for the glycin crate to find loaders.
+    # https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44
+    gappsWrapperArgs+=(
+      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
+    )
+  '';
+
   checkPhase = ''
     runHook preCheck
 

From 933dd1f776722f1090f48ec6135525a2f942b3d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 15:09:00 +0000
Subject: [PATCH 1806/3724] libation: 12.4.9 -> 12.5.1

---
 pkgs/by-name/li/libation/deps.json   | 184 +++++++++++++--------------
 pkgs/by-name/li/libation/package.nix |   4 +-
 2 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/pkgs/by-name/li/libation/deps.json b/pkgs/by-name/li/libation/deps.json
index 427bb5cf9aba..059ec84dc68b 100644
--- a/pkgs/by-name/li/libation/deps.json
+++ b/pkgs/by-name/li/libation/deps.json
@@ -1,23 +1,23 @@
 [
   {
     "pname": "AAXClean",
-    "version": "2.0.1.3",
-    "hash": "sha256-a7H1BVqHU25wxkrLJm0ZkWtcxXTHX9s3lDuWVQv29Ak="
+    "version": "2.0.2.1",
+    "hash": "sha256-9tCux7qkyTjJqGdll499k1/S3CiTCsp6VvFuGyJXo/g="
   },
   {
     "pname": "AAXClean.Codecs",
-    "version": "2.0.1.3",
-    "hash": "sha256-3+kSgIMB0b6K8YiJE1olvyyiGcjPiW3eUntDuVn9q90="
+    "version": "2.0.2.2",
+    "hash": "sha256-CT/3DzEnRHoPVQs6gPu1N9z7M6u7txKCH1+fuwng320="
   },
   {
     "pname": "AudibleApi",
-    "version": "9.4.1.1",
-    "hash": "sha256-l0i0JB4ghxLbCAWd6ni7coVpYiGvLrKIMUNhaiA0aWU="
+    "version": "9.4.4.1",
+    "hash": "sha256-eH1gOfnZDNdIInwnH6Nct/uTl1UuP7VIQd2LHjnad0k="
   },
   {
     "pname": "Avalonia",
-    "version": "11.3.2",
-    "hash": "sha256-eDptsmrO7QxIvHm5kCs9ZE/N1tAuIBvaJMKiAcsu9yk="
+    "version": "11.3.3",
+    "hash": "sha256-UvENUQgoTUikjIMTL+oI93FNwr1gZfoGVtZdYzBzdts="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
@@ -31,68 +31,68 @@
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.3.2",
-    "hash": "sha256-Lr943SkpYMZz3+TPA7vc/mtbQH0r/eLewZFNGNf3i2M="
+    "version": "11.3.3",
+    "hash": "sha256-zg35D8NygrU8mCAsLLoPmrzXZcV31NuHNtTaiZZhOxc="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.3.2",
-    "hash": "sha256-PFz2fgrBzXQWPLj9X1wdDKDH2iy/54E4NBa+yO7DTfQ="
+    "version": "11.3.3",
+    "hash": "sha256-kDO6o2U2SRVMRE/60FOiLfWi90HxYhoUnAIcxX270ww="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.3.2",
-    "hash": "sha256-A3LV30ekjXWdo/pRldL4S68AAA6BTuLU8ZGCinkNrvk="
+    "version": "11.3.3",
+    "hash": "sha256-/jYjxA5vJqU5IpJkgnlathprzdHB/ihdL35ZZBRESeU="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.3.2",
-    "hash": "sha256-fMXY9p16o/wpUXFjRngf96gVwSlX/WCY0fn3nE/TmIY="
+    "version": "11.3.3",
+    "hash": "sha256-rHBFnhZ+gAqPqqDfZxBxUr3wXIpgOc9hInwzDOgdk5E="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.3.2",
-    "hash": "sha256-Mxvpd5JKmIpjQCZmuiSb6IkKfwQhA3o712Ubdx0gP28="
+    "version": "11.3.3",
+    "hash": "sha256-kUSE90HoJz9NsYCphLUQgNkxb3xHhFIlqXa6lzuGi4c="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.3.2",
-    "hash": "sha256-HLVKaAVIRnm77lk7LJfrbiEmGWVIim7XMMoZAyGVUFA="
+    "version": "11.3.3",
+    "hash": "sha256-QmvN5gUsgjk7ViacdXOwHULHid0TfAKJGW3cf9A8bwQ="
   },
   {
     "pname": "Avalonia.ReactiveUI",
-    "version": "11.3.2",
-    "hash": "sha256-lYKhqoKqEZB4tttXehK5KoBMkwVeTxAThh87dns4C/c="
+    "version": "11.3.3",
+    "hash": "sha256-Clq/13CZRTFEJmVw41Tw0tJEtm0AYvBKJah7OdFbBSo="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.2",
-    "hash": "sha256-NIkrj4pMvxVvznexzEXmNI8KXWLSXmVbHHWpwz9h3M8="
+    "version": "11.3.3",
+    "hash": "sha256-gHZA53IyRAdeIg7yRIN6Pzh0AbOGd5B9mckEWsPuK7A="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.3.2",
-    "hash": "sha256-cBJo/tTewA2/LSygJ5aAyPPr11KpLPwS1I6kQxDMy24="
+    "version": "11.3.3",
+    "hash": "sha256-pUMqXnupxztsAP/n4U2pSgTga89gy7CBLg39y2j0EjA="
   },
   {
     "pname": "Avalonia.Themes.Fluent",
-    "version": "11.3.2",
-    "hash": "sha256-wwMxvJCMdRqnNYmsvzE+122D02HszLsfazPyik1yrBI="
+    "version": "11.3.3",
+    "hash": "sha256-tWNl3jvESx96lTd6i0lxo6Y8/Y6cS5ZQrPovIolNfAE="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.3.2",
-    "hash": "sha256-c8QtpXv+B1CTkW9ovxOZwjRZAkD4KZzIvhIhI5WJXdo="
+    "version": "11.3.3",
+    "hash": "sha256-nUfIEeJZgiLuy681S16Qncri6fvCGF7tYk4dSf3JY4s="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.3.2",
-    "hash": "sha256-FNs+O2knXcmUpfDjd/9JcNmpzEi8g3UQ3pQHItnN2U8="
+    "version": "11.3.3",
+    "hash": "sha256-jlQXEdbZjfRsu2MjYzHGUAyn+uvdACXCvm63HjUKqfQ="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.3.2",
-    "hash": "sha256-OCH5bwJ7Zje0/L7qtDcFa+yje/uwm2pYNE169J866/I="
+    "version": "11.3.3",
+    "hash": "sha256-7A+uzB7g21P+RnKO4bKOJVY35qPz5Xna8n8VGG7RoMw="
   },
   {
     "pname": "BouncyCastle.Cryptography",
@@ -116,8 +116,8 @@
   },
   {
     "pname": "Dinah.Core",
-    "version": "9.0.1.1",
-    "hash": "sha256-54TDRMzCDNYzEeyFvaNULuucQ3PcVeI3FDLHHRfsJDI="
+    "version": "9.0.2.1",
+    "hash": "sha256-pm5wFnKjzh5f4c9wIqQcaWf4E26EHXfHBLK1N0oUybE="
   },
   {
     "pname": "Dinah.EntityFrameworkCore",
@@ -141,8 +141,8 @@
   },
   {
     "pname": "Google.Protobuf",
-    "version": "3.31.1",
-    "hash": "sha256-UEcn4H8F+zK0AjSmz1aTyyMksLxJOGNf2IROtF+DydA="
+    "version": "3.32.0",
+    "hash": "sha256-ljHGi+RkkujLV3RCE50nj9BkqdhVZjbrnBzcDhx80gA="
   },
   {
     "pname": "HarfBuzzSharp",
@@ -256,8 +256,8 @@
   },
   {
     "pname": "Microsoft.Data.Sqlite.Core",
-    "version": "9.0.7",
-    "hash": "sha256-cTD6Q27SIKDZ9FYN5FrrfJ7qwo4We7seLz7Ex3F6ENI="
+    "version": "9.0.8",
+    "hash": "sha256-y9HnRrftjgRRuFF/N75BHNhFcmb3Nj0+sDk3mwYmyxU="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore",
@@ -266,8 +266,8 @@
   },
   {
     "pname": "Microsoft.EntityFrameworkCore",
-    "version": "9.0.7",
-    "hash": "sha256-AUKHfIjr2whZ3hIz0oANmesJM/7pDBdywSXWkQ/Psio="
+    "version": "9.0.8",
+    "hash": "sha256-QJNiGeyZh2AHpm6CumccWYImYXHHoi3pSVBMk0Z0oto="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Abstractions",
@@ -276,8 +276,8 @@
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Abstractions",
-    "version": "9.0.7",
-    "hash": "sha256-SeCmWrkFFnvQSDcTyzSwb3yxe4Fix/OCxg0GomS7ZNA="
+    "version": "9.0.8",
+    "hash": "sha256-+0Mx7e3aadcwnj17NI1bqcv+Ik6jJwFZhPBO0vm9d0Q="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Analyzers",
@@ -286,13 +286,13 @@
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Analyzers",
-    "version": "9.0.7",
-    "hash": "sha256-sc5+4wh4FoMdtbg8mHI0pEQgEQl6tAKT1Usep5/j4xo="
+    "version": "9.0.8",
+    "hash": "sha256-Y3R32LoIqC0NIDvlHLpSfvcqmfDOmja03yYRLyRldSs="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Design",
-    "version": "9.0.7",
-    "hash": "sha256-pcASogSqabBEtqlBfRO//MJ7A9gx8ya4mbqyOA6NWf0="
+    "version": "9.0.8",
+    "hash": "sha256-ze9sA2ln90Cu83sYr5c7Mx/g7gt6wpQdGLf0u9bRh94="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Relational",
@@ -301,28 +301,28 @@
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Relational",
-    "version": "9.0.7",
-    "hash": "sha256-jgzudU4gzKnb/+v77+9PQ0bRN1IuJ48+gaZ4ykxkC7M="
+    "version": "9.0.8",
+    "hash": "sha256-7V4UChYCgp6mOwCbdScE19N+SOO43vqFP276RZSjnZ0="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite",
-    "version": "9.0.7",
-    "hash": "sha256-I2A/O3THFuIqygxzhE+xUySD1FNqu5SRv+/yaywuOd0="
+    "version": "9.0.8",
+    "hash": "sha256-S1+04gZRmysziMQy3jLXY2Kd6q4ZT5DXCWLh9wE1zE0="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core",
-    "version": "9.0.7",
-    "hash": "sha256-nZTEqAhpmsNNhWy+zWSqJWI19LWXornmf75abEd7Z3k="
+    "version": "9.0.8",
+    "hash": "sha256-2TN1U1oZzk99hghB+hsqoLFUUbfLkE1O8dIDVNKZPkI="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Tools",
-    "version": "9.0.7",
-    "hash": "sha256-PyTUZx0OoLB945Tiz1hYV5uvpKjl9TFxpvKEW4L5n40="
+    "version": "9.0.8",
+    "hash": "sha256-pyyQ+YT1WE/Dwab33RWK96hDG+Ds0mvWCynnHWt81h8="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
-    "version": "9.0.7",
-    "hash": "sha256-6k/RzXSpQEoLHXAlEpV3KJ/zXknkguWEZ5SWY7z/4SM="
+    "version": "9.0.8",
+    "hash": "sha256-Utc84ZN96qoVki9jTpkD0Ph6VhEfWCShWAQIhiCD9KQ="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
@@ -331,8 +331,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
-    "version": "9.0.7",
-    "hash": "sha256-Amw5+liq7vmRc3YMEvbFErUiUyMB+tEKgx0/g4nCepE="
+    "version": "9.0.8",
+    "hash": "sha256-nZu6Qmwzcd5NJhgwjDIT18A1KttaFXMZ3E+f09Iq5Ng="
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
@@ -341,8 +341,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "9.0.7",
-    "hash": "sha256-Su+YntNqtLuY0XEYo1vfQZ4sA0wrHu0ZrcM33blvHWI="
+    "version": "9.0.8",
+    "hash": "sha256-GnD1Ar/yZfCZQw2k/2jKteLG1lF/Dk7S3tgMvn+SFqc="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
@@ -351,8 +351,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "9.0.7",
-    "hash": "sha256-45ZR8liM/A6II+WPX9X6v9+g2auAKInPbVvY6a79VLk="
+    "version": "9.0.8",
+    "hash": "sha256-hes+QZM3DQ1R/8CDOdWObk6s1oGhzFqka8Qc7Baf9PY="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
@@ -371,8 +371,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.FileExtensions",
-    "version": "9.0.7",
-    "hash": "sha256-9+XLNylnsYd/IcLZfDyW/Q+nuYB51BQJeyA+ZMsKan0="
+    "version": "9.0.8",
+    "hash": "sha256-W7PnvqPcdJnJIPaEh1qRDh/WCVSz/KQy+GAMhMNhKE4="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Json",
@@ -381,18 +381,18 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Json",
-    "version": "9.0.7",
-    "hash": "sha256-4lWXlwwGPgv3nrL5V890LPVKxSDM8w4UJYYQlSA28/M="
+    "version": "9.0.8",
+    "hash": "sha256-/QFT/SksJcsZ2Cjw0WkJzLnp+mT2m+38avEOgttrAaM="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "9.0.7",
-    "hash": "sha256-/TCCT7WPZpEWP9E3M441y+SZsmdqQ/WMTgL+ce7p2hw="
+    "version": "9.0.8",
+    "hash": "sha256-fJOwbtlmP6mXGYqHRCqtb7e08h5mFza6Wmd1NbNq3ug="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "9.0.7",
-    "hash": "sha256-Ltlh01iGj6641DaZSFif/2/2y3y9iFk7GEd+HuRnxPs="
+    "version": "9.0.8",
+    "hash": "sha256-uFBeyx8WTgDX2z8paf6ZAQ45WexaWG8uzO5x+qGrPRU="
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
@@ -406,8 +406,8 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "9.0.7",
-    "hash": "sha256-yRnJOylILhZMOj3J7W0pR8h7igyUrz6SilQSMxDpj/w="
+    "version": "9.0.8",
+    "hash": "sha256-Y07YpP2Kgs5liww09aV/vJjuJx3pmOz8PREt3xrEeOI="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
@@ -416,8 +416,8 @@
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
-    "version": "9.0.7",
-    "hash": "sha256-e/oPQDche6WBSJlVwNIhSu4qknO2TmMMkhX+OqbYGFA="
+    "version": "9.0.8",
+    "hash": "sha256-9X3roHvoAFzlTwVSlkbksB9EosKjVHeXuR5Jm682Wvk="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Physical",
@@ -426,8 +426,8 @@
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Physical",
-    "version": "9.0.7",
-    "hash": "sha256-L7XMdKdZa4UT01TKEjunha3RAK5BBi2E020wRbrvUOU="
+    "version": "9.0.8",
+    "hash": "sha256-lVnOgpxjO5VaCgviGeQ0R8kAIiDN1nKqpbj8CrCDpic="
   },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
@@ -436,8 +436,8 @@
   },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
-    "version": "9.0.7",
-    "hash": "sha256-KjxkTcn1aNZUdoFb6v/xhdG92D5FmwdW2MFL1xAH1x8="
+    "version": "9.0.8",
+    "hash": "sha256-1dmTABLD1Zo2vdZFsASTx8T8MRI8emN//KuNP3OiWKw="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
@@ -446,18 +446,18 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "9.0.7",
-    "hash": "sha256-7n8guHFss8HPnJuAByfzn9ipguDz7dack/udL1uH3h0="
+    "version": "9.0.8",
+    "hash": "sha256-SEVCMpVwjcQtTSs4lirb89A36MxLQwwqdDFWbr1VvP8="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "9.0.7",
-    "hash": "sha256-G8x9e+2D2FzUsYNkXHd4HKQ71iEv5njFiGlvS+7OXLQ="
+    "version": "9.0.8",
+    "hash": "sha256-vaUApbwsqKt7+AItgusbCKKdTyOg/5KCdSZjDZarw20="
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "9.0.7",
-    "hash": "sha256-nfUnZxx1tKERUddNNyxhGTK7VDTNZIJGYkiOWSHCt/M="
+    "version": "9.0.8",
+    "hash": "sha256-AbwIL8sSZ/qDBKbvabHp1tbExBFr73fYjuXJiV6On1U="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
@@ -466,8 +466,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "9.0.7",
-    "hash": "sha256-Vv1EuoBSfjCJ7EKzxh10/nA/rpaFU8D8+bdZZQWzw2I="
+    "version": "9.0.8",
+    "hash": "sha256-K3T8krgXZmvQg87AQQrn9kiH2sDyKzRUMDyuB/ItmPc="
   },
   {
     "pname": "Microsoft.IO.RecyclableMemoryStream",
@@ -616,8 +616,8 @@
   },
   {
     "pname": "SixLabors.ImageSharp",
-    "version": "3.1.10",
-    "hash": "sha256-6bVTSCxLY8Dt+9lpo4F4xEtMv5oPve2vS76O/lcuIok="
+    "version": "3.1.11",
+    "hash": "sha256-MlRF+3SGfahbsB1pZGKMOrsfUCx//hCo7ECrXr03DpA="
   },
   {
     "pname": "SkiaSharp",
@@ -861,8 +861,8 @@
   },
   {
     "pname": "System.Text.Json",
-    "version": "9.0.7",
-    "hash": "sha256-f3leKX3r7JoUbKo6tnuIsPVYJHNbElHWffhyqk1+2C0="
+    "version": "9.0.8",
+    "hash": "sha256-CEoLOj0KeuctK2jXd6yZ+/5yx4apsEh7+xsJH95h/1c="
   },
   {
     "pname": "System.Threading",
diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix
index ba5a77382408..a2a65bf2cbc2 100644
--- a/pkgs/by-name/li/libation/package.nix
+++ b/pkgs/by-name/li/libation/package.nix
@@ -13,13 +13,13 @@
 
 buildDotnetModule rec {
   pname = "libation";
-  version = "12.4.9";
+  version = "12.5.1";
 
   src = fetchFromGitHub {
     owner = "rmcrackan";
     repo = "Libation";
     tag = "v${version}";
-    hash = "sha256-o5bmu5OU5Md85AucbNrm30dGCj+prWwmWDL3R6Dp8Mk=";
+    hash = "sha256-X+87r1ObQ1qrnPfhuUR4aZdCdnTOC8udbJ22tr3zKEQ=";
   };
 
   sourceRoot = "${src.name}/Source";

From 7740fb92f5963f2531b30ae48a1286f81af0adf0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 15:14:13 +0000
Subject: [PATCH 1807/3724] clojure: 1.12.1.1550 -> 1.12.1.1561

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

diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index e677d060df81..5607d67d93b0 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -12,12 +12,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clojure";
-  version = "1.12.1.1550";
+  version = "1.12.1.1561";
 
   src = fetchurl {
     # https://github.com/clojure/brew-install/releases
     url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz";
-    hash = "sha256-kGxiVnnHLnA1h1mIpGOSodg9Fu4d9ZmlYaL9M0JLDT8=";
+    hash = "sha256-+7hFf2S/M8yMqve+d8RjCoKBZ0R3d6gJqarlh9U1B18=";
   };
 
   nativeBuildInputs = [

From a48e7dbdf9b8b37b193caeb28fecfc6b134f56aa Mon Sep 17 00:00:00 2001
From: Patrick <patrick@failmail.dev>
Date: Sat, 16 Aug 2025 17:55:49 +0200
Subject: [PATCH 1808/3724] factoriolab: 3.16.4 -> 3.16.6

---
 pkgs/by-name/fa/factoriolab/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix
index 4cc18db6a52f..563fc290f064 100644
--- a/pkgs/by-name/fa/factoriolab/package.nix
+++ b/pkgs/by-name/fa/factoriolab/package.nix
@@ -10,13 +10,14 @@
 }:
 buildNpmPackage rec {
   pname = "factoriolab";
-  version = "3.16.4";
+  version = "3.16.6";
 
   src = fetchFromGitHub {
     owner = "factoriolab";
     repo = "factoriolab";
     tag = "v${version}";
-    hash = "sha256-wyv0N5jx169t6Er2OOS00Af5RSXblZ8BoAciw/TVxB4=";
+    hash = "sha256-feKva+TuqRZ66VCoHlUK695FMvsjgX5sJOwTBne8qX4=";
+    fetchLFS = true;
   };
   buildInputs = [ vips ];
   nativeBuildInputs = [

From 90227a2bcc63fa7f111a599e4c236fe6417ef8ab Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 13 Aug 2025 00:37:55 +0000
Subject: [PATCH 1809/3724] dotnetCorePackages.sdk_10_0-bin:
 10.0.100-preview.6.25358.103 -> 10.0.100-preview.7.25380.108

---
 pkgs/development/compilers/dotnet/update.sh   |   6 +
 .../compilers/dotnet/versions/10.0.nix        | 431 ++++++++++--------
 2 files changed, 249 insertions(+), 188 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh
index 46486f9e309a..132ea56874bc 100755
--- a/pkgs/development/compilers/dotnet/update.sh
+++ b/pkgs/development/compilers/dotnet/update.sh
@@ -220,6 +220,12 @@ netcore_target_packages () {
         esac
     fi
 
+    if versionAtLeast "$version" 10; then
+        pkgs+=(
+            "Microsoft.NETCore.App.Runtime.NativeAOT.$rid"
+        )
+    fi
+
     generate_package_list "$version" '      ' "${pkgs[@]}"
 }
 
diff --git a/pkgs/development/compilers/dotnet/versions/10.0.nix b/pkgs/development/compilers/dotnet/versions/10.0.nix
index 3b43dd48e172..694ec7c5fb0d 100644
--- a/pkgs/development/compilers/dotnet/versions/10.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/10.0.nix
@@ -11,28 +11,28 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "10.0.0-preview.6.25358.103";
-      hash = "sha512-DF9lEJjcAAcQtFB9hLXHbQaLW82nb4xlG9MKfbqpZzIQfidqcAuE2GOug/q6NNDcw+N88J0p0jKPz+k3qKmAKw==";
+      version = "10.0.0-preview.7.25380.108";
+      hash = "sha512-ZedqhbGvDx8Ajn1N9SRKq4q/m7rIQdPmcvQS7WOaijpqqjNa4P4zTd1kx+/kb6a5FJ6thD6yt/hEADTGpUpflg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "10.0.0-preview.6.25358.103";
-      hash = "sha512-SV9nyI2/sg7Rh3f01eDScmjKYuuzI6xPX+iknl2zsecspqYBlWcPN1SvMDlaD/sK3GG5jl3hrM/GcOIqMpoFJA==";
+      version = "10.0.0-preview.7.25380.108";
+      hash = "sha512-OcQqR5UG3AFa0aQNIRTB3acRpQ+OhuF8ZpLIQM3xp+egvzzKRP20jja/gWhngIVtEA012XxLiNxJrHhzWhtLhQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "10.0.0-preview.6.25358.103";
-      hash = "sha512-npMO7GioGKn0FigriTOCsi4HgSENnW9YRJYXhyFtCGLR7b71FDLVY8nHemM0XYm9lI0tH23N1EwcDFyzHTDuNA==";
+      version = "10.0.0-preview.7.25380.108";
+      hash = "sha512-1UT2fr9kFvdpRb3+h3dTmGTnhKTvGKpYFRQuZUD8ukmaQ9ABhnXp35E8GJoA6d6pOERiRnhimzrVg/X3B4znUA==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "10.0.0-preview.6.25358.103";
-      hash = "sha512-zDr+tWvnlB9iEwnAlfa3PW/S1/0nw1lhvXBWghgE6o9O5sxc35V3aobPAs+Cm6DTN+lvNMouhjPt6pn2t4PvQQ==";
+      version = "10.0.0-preview.7.25380.108";
+      hash = "sha512-Eekoq6ATo+jeIsK0GafnGK8XkdjKtdOVT7deD1TWo04/nt0KV7nOmBUOhwUKY1sBsjvTQvOoDthn505f74N3Vg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "10.0.0-preview.6.25358.103";
-      hash = "sha512-W1yNC4+7vV1XPSXJx7HFsvFCi1C1XZ7QVlfbu+xq4pt1/0cVJGZaRlbwBNUAv4PAdg2JGM4VYtcr3ZreOJ1hzA==";
+      version = "10.0.0-preview.7.25380.108";
+      hash = "sha512-pX4P7NG1jHIRJrbHrVP/MvDyA89o7HeuKucToiIH6flQ5ixTntZJupIW5qg2wsScJOltfP3A7j/w6MTRA9dHOQ==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-IKe0SROzAWJiFZyh2KVmTU5i8ddcEqvr5NIr+3RfzvBEYa3SNBbqy1W1x0TR2aEvYgSqxKSohhs9YVSDlrlx0Q==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-ekrR6F7cC48jWc0+Fyv3emOc5bkuv+yvKg2ZDjuv9gRf6e8zWGG6PkXKkPuo8sxHacPucgc1bIibVgVGJi20VA==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-5h33Uf2vFcjVkeNRD41YiERegQ7twv6sljYAMtz/kIHcIk90aB0ztZoKXXVi+vNxma7q/f5oPxhzUVidZ3vw8g==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-QUg7nZopW/0+Lnk4VeNHF3Ov3I6IuqsDSbvkeEDWjWyNXyOnJzDErKN3d5p6jWdmc3jjndyOw1137vaOKV5apA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-yImkb4fnUJIXR2Me5N8eOrX7w9+u8SAAIp8QtlWdZ6WptjG6PUByTs2hjTfX/aVKjO4p1dmKTaWJ0qYR6yuDEQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-k9W3fq0DjcbjxuveOQd1ou8fsHhNH/zHayPE9b1VRj2CijLx8krGGKkP3gUR7jLbOE+o9/Xln7cEsWzRBb9tdg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-1FIBZLtWKIxULrRjLrldz6kwVSoAIf72kXKE0WgXECVez98NbQXLEM90hfpHj0LcQfzqOoP9kY48yRSoXp+rXg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-+zsgGnlZS6MdL/uyvAQAN0KAc8Vk1qT8ylHCi+iwUXqwslSGtZQku+qGvkd7hjMMnEbnSa5j7xJY4PNGDbco4Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-eMokXhxbTVJUHwlAhM1dVZmjljs/s1nRfvrJ0AeJaTbetXnD63Fd6sQeMmw/EifYnpdtxr/gIJRHLPsuLNDcAA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-+LG/u+Jp6b3Oyud1QYP3nph1uqtx4rhPbeH65leIMSFQg6bB8Jd9g4hNwESllHd6iKpKP7Sp17VxLKynzxwHDw==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-qw5Xb2+l14q+2OSesjwGn3gHpdFj0wUeA3RLEUaljzW8FF5HD78B6t1YuhFJhcENuDNAv5d8Fcy4N1mG/RQZUw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-BE7hZwP4oZ5Xacmhjwc3Ciy0KJKOXwg9NJiBVzFv7xEJ7IqVceP7kAdMPsMNoojwz2KNs9gJdCOGOLtwyeTZyw==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-Etq6qbPIzEV8Z3+w0C1ibreDduKkAF1zZOGfvcBz3sjAC9sWs/qflxfKGZ7tBKhEV/A3vZWKNGyxYKnawCtC3g==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-oskWoBpDhGI4WBOJPFTBIirjUdSs7hvHKGuz8OQmrByyv8C3rY9jtt+sM45uqINoGNyYsgbUQkQlKFhIB+mT+Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-SINZNHzxrKbgD7VGAx9GDMIlMOmXSpqWIeLpmNpPTm2D7F+NfXv2lVLxLl0nLUAJ70ipI51HdHGyrKXTOaFO8g==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-+/apDtwjBvmEn40DJ4yPOYqCsgIfhrD/zPYY15A6ny5kN1n6uV8LgUce9vv2HatRsD4uOuepD2z22/TbB8GjLA==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-t2YTlMAHq+V8K8TnsFhUudCqiV5CElb/dk2tFmZ61Td4gyLY/iz+4q5lvpGAZOlCFddTtublSbIC3n4EH3liEQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-+uZHCjs+FlbFU2StjeANC3vvYjWd+6PlhIX0F8sHS60u3U9/HEi4JECQ0vhak5ODJCi+wktEKZQ53DwGAvPbJQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-lEaH55DO++s5EKEHfODZkF279HI5DROQgaTif93wcMg9mhL5kPHnLhi9S7qTMFKt+GQfmZWMlwZd+L6GVz+RVQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-mtm6VWoDGYg7qlqF6sFlf8LBEbGOL6ZCSoqzZ7hmDBy9UIe0AswL0d+AhsDOE5ewHifbK+vGqXeK83ZdL/1IRA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-zuh5p3Hq0ejcgbCe3IaVOj+mItbRve25QdIXaGirOfDuO2a5fGXSO8RtgFosw8ar2jBSG3qL6loMFqqgkiEuVA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-/X/ugPn9DMhWz26lDvuSlBqX/s56B7Sl/Qkd2/Jy5iYw64+9tOFo0Xh4kz0fF5nOj1H9RbKxIaNfPVc41rxvIQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-Ivl/uKKvVrgGxfbC8SSz5N1NZRi39PQ5ZXfsECiSsiNR2ls02Wy2Icy5mLRUGCFY4FMILAKsgfJRKejafqGxyA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-/SiUD5N7pwkJ4mK83CBkre6oOB76BTJ7lJUTDDw3t8F6HUJS+3i6Cx9sODd7BS7TXXA5ahql2gcfohVsaFsR9Q==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-zTiRlyK4ElT/MES3AX1bLRcuX3lY3NXlwL89YTyEjuHrqjCpxEbHfsoznqYd7zLAF1itzvNnxDkqDPoXat/zZA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-WKqXIohGOzMUpDOsAEpknxj93fSuTzSdP7X/Ud19dggmqwPKMIWN5NZpWlBLdyP8+NMwLyNM/aR4uCtNf7MT2A==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-sSi6F1x2UVJe5Jp8RbURsNGVxFFPyxq6P8ZlV6r9dimYM2KkDyEOtcZ0hHSOtmMU3rghzZYksvSKv7+9fAYUNA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-GQokK1ugeF0JQi0IfkyNDm5nIVCKpH6V8zSskBRSAH8O5U4iVImpDkqBg1icxUFIAaVyiMi6GJB0CkTD2cC+yQ==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-Qj4yn5t5k+lGY8dBPwh0jLQOXoilcVvwpmyxJp8LJHoOM8EmGjRoiCy68sRXGTQMt5d3iNIdV93rX+fXu20rlw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-X15A3yBhigC8T81Ut1Zqqay9HzfCjjwLh1QDbHL2XggIWiGzkDf4hSX7qnkbki12DdFZP5p0xDFiYsnEBTGNgg==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-b26YbRN+y0LrdVq32iV7gUmi8sY4vY+P8GvaqiPTcJBH20OSfrsvDhyM08qMs6hCDo17xL5hFdLt9BSBfqcrOw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-vNMheP+ysMxIiINElw4ebu7O8KHDz+l2dYTlP9zfBllo7eJW3XX0k7kOP0nYke78KFhheXu2JUHAAEZVhazOUA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-IoNNvrZ/pKBwn/XSvDp1saM2XHk1ZOKxrA4lDyrL10/s4IS8hRo/Yv3qs+ihWpwVStORW3lh0YIxQhMDHbMkzw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-478qsicUIxQcpq/UGGoNNLRbUldl34RRZqxDdRl1HqC2D4aUdCpR3MEU5vd0zcbHxkegfPfgQgsv6xfIt+k/Ww==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-/D+xqMtDuo8ji4FPJm5EsEORBGEsbcHHYIjZDiEHP7ltIexg/oOSwuyvepvV+mK46Q4uyQU9zuBVZaG5FdKU0Q==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-fDGfrQnqXasfMLIUs2xVvLNxWjN0w7HypZ22wYG0y8PkN8u3vpVIQz9tYgUgEXvxKpFLYq1L2EcxksY6reAWug==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-kEXLQCzNVAnwkQ58qiO7lUOuO6WJSMlNmnQxx5o1RTiMIoqrgfjMazn5bpL5DPeZjMhWcB4kary/3Vkj06xRtA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-WE52ljXg7k8/ry1wBJ7lqrKniEZgwpMtuf7m82tMtuc30k5X+1nAbOa2evezPgjsXrB3k78uertzT+GoSRX/fQ==";
       })
     ];
   };
@@ -160,361 +160,416 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-z0RiU5O+4aelPS7+JYakKFXrmczOzTYp5sptrRoz8H2zM0Tbvwc7sX3pT2F5ZosBEaub37XJKrwSdvpdHoe6/w==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-TY4LXwPBf9d0vOpzCkV8Ze9e/Tnn4V07FkSctLB6Vc6XreNkVqEQcB1TuUQZOFc7pXBvpImRAD5mAfuLVNohDA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-CRQl1RVkbfaLnYOEO4ApZ6Py1OG8zJjwU0UkAcIhg7MqsGgZcathISOzlDYayxqdbp+Gga21aaJJZbL0TSPkdw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-UBWg0zDyYiiy3wXtxmRqaoAvi2hpXGGJ4VxoKcqgD927ftcYXz80g5dFDtk8zof3CVnfXHgaDCm40jxOrYU3qw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-UjSZtTgg1EEmNJeI+Esg2pMNjSb+lCy0VjwkUIVUJA6vezRNsb66NjsO5h4rvSMS2VhoKWGc7jbNV1AKRj891g==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-ZHAexbNsU0DMvR9vVqYldw9m+wyqLM5AVZyx6E6Lgk5JzjgDI9rFfDI2h+UGi1WOJyKPDKrjyLWG5phtGC6ytg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-h8mVEj/5JRPzKcDpoHvnQ0wt7nn7+euuPKLDtWH4yiAWztH8CX6udfHqjIE103USfpfMKEEcEWRqOe877rgp2Q==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-HmKdrzhgbW4ikm6lKWgaBm5OokH7aPyGuaniMHvRKnHSeUxDYMj2PU/ZSIlIxTntxELeTBd+ZcJlknJqR7Duuw==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-3WlHMaSa60X/owt47VYhN/RYy/98jKjoQtzW/FoZUfc0E3aCN3pJeUGbEq9NrNLfu0XbEriwTuwVG6zyI0rr8A==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-rXmRirmXSlmvrc4lY76+eK6UoXIi78sUSDggleEYs6Mwip1PWWQ1bg2Bi3tpxcRgF1MBOgHhiz37lybWaS1y7A==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-bPfmwsqmA39Vfa+Uu9mH1eaCJZo/qd+/O0aOYRhjSrypYBQK2AIif8lq7zYxhOR2U5AhvkkeqLNnaEC3spTHiA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-sw5cXyvNbbXyDkmnPJqNgSnOeDFdl9VL7OfA4kA2GcPCujXhnElVmF48rwibVtoYmDUe940zKPjUAeuXmmOH+g==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-OSpFCcAHBwfDK4bY6zNDfbtY+fKY6koEgvfVyk6OtdUI+dOM/Jjw9Kyxiqe1S8JC5dm3366+AFdqF2ZWbMW4fw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-BYeSSlt4ck/kK7L9I+OYdI+aklnF9JDNaHyIQ+nea+E/e6qqENxlgDPzJKwTKAX4XdIF7Rc/Gk14PuYBpC7+Ew==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-gFoRuWxJUSjqz8meGfPQhK/xI8LXK0/z2mOiVWfwFBO1lMuPUWFrzlUvoPBHhZSYj7578iHtUog8r/tnnK6+Bw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-poxX0QwFAsVfHDfH85V0BVd5dEtlhr+/3rPhCe5qhkFscmUM31BcD1ABbzdxYt/PRJKnKMCCA/tOHhMU5rUieA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-BLvup3LOAkOw5G/xJ0j9pcTNNQuPLibW0u5bTVAmMYYZny8b39xNWWVqNQ8Rl5jewPko/8luoany0SbHZ+GUpQ==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm64";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-koC5WN2WuOaApo6XSGjcdWKUhR94/7vZUiQZ9XKemdGJ2rpjgAhGvdQr0PcNqyTUDd+vC6LOsWjwwqg2GSHYnw==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-kPsplrPdJ9VmThmB0kXTumkVG0WikMbkSRzGVyNU/Ploa9Cvv80PnCxF5VBAqRV1l/l3qBq9TZQV+7c6mIef9Q==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-2NeuUX5T7ZRuc76byZXf7cLXYTK5fGufEbrjEXRlBMXyI+vQ8x+6BR+hbqef9JGylT8pcLv+xL11Gx39vk2KmQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-LOoGtTUAg4/m9912v1s4yvh/wx64gRW6+052ZpHphizEbI/mvy5MGZpxS/WQHX34+RDXIG90CpdT7caL5iC1JA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-iZO21GJ4K+PjcH9Gn/OUVQrBkkfCVCifO+PsQItVuWuenEOwAShzCfz8E5icd/INLIosoriCyRV777jpjxHZXg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-t10QcEDpbrSvoe2BhUCtqOAqfXayzy9uujpiIeAdOyptGmBppA37G+F4cCRsIx6wzhCSrdPkYoh1KzD4rqqlyA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-SAKw8xQa/VBWOumG7JmId0UIKUs2RM8tnl3KPXJ85mjnrrP3wJLWynNf6v/hMxdxqjAOIb2Y6AIGwK4zFzA97g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-ykHn7VUDn711h67XQd+nx5Tn0L0vYWQY8kKWqqTXm/mBEM5CjoMd9qft6jirusGORVxC5RAnUENDt5n48B4xfg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-PTVNAmlIQRHnMCcw8Pm5+t8eLLtwyZ1J6lUjTcZ68dU9FGXIySRr750lekvMpBugMjmXIsNw0VQvg9AnL5SIDQ==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-x64";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-cMnylrJR3P9phPos6bJJDinj8YO7eSeYxUijvcDHhGPXXzpD2aTZh2anv7WOSB84I21xKCpyjjgdhcdPgTCyJQ==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-6G+05BJAEjErJMixdkEAndBjgaCe7WmasdRypKPtYRfzvPVExrq/nak0ZiaJ0Dd3WuYdbi69Qyeuhj7atnAImw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-VbIqcklAsQYAAV5CTXo/6NAa6lkirCeh1XF7Yo2D6xZmkwLbQsKfNF1jpiwYr6luiVwJCkIA6p/owsPAZT42gA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-xjepU2UUYCP30YJHPdX0PN6C0ZqP2RKAEsJWpnNSlYQ8fcDHgy+l5ZTQPBD4egfWKlPCEtgSZod3p9nTggSoDA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-H5a0wdzBU4tWXtTkYcgHsezWolqD59sDLSlDdOGE/OF7p3X1AijCo1BKCb/ub+Qn24dXoS7RGQf4TwmPP/fDdw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-NORvYn5NilmBCZzLwrWXEPI7WeEKKwIHzh5USjQHQLsSoiWcOSZVKQLkqK2baSFjGktLyHmHRUQ6VnTggDuPeg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-DpKE33FA9NYJXAY5SbKcIfAvU5RyH30YqhCXxHi/NYfEcR6e5hrzn4992S6TpUQzeYHeJHprfXEQGK+x8bWTqg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-tMM7GajJVqT1W1qOzxmrvYyFTsTiSNrXSl0ww5CYz/pKr05gvncBdK0kCD9lYHruYMPVdlYyBCAICFg1kvO7aA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-prERCrIwyGg735ahEDi15HwriaDnwZlQidlFkiDSOuh4EJTXLqbYvwJxSygCNIgKAivNEwt5HuqAR0WxIzxLJA==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-SvUcMwIUDjSW7wIrQEChlhqEmSWIhruBP6pfvPaWu6WI4n9X6PtPvqyJp5dza77GATyc5i9sjECy8HNxRro07w==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-wUU31YeB3hCc41XTTSXbhuYKKSbFv3rQb4aO0d93B1m8xPZfUpYA121ysuwaaiPgHvFK27wfYBHAAO82d1Tbsg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-gI8nk0A8LtN/NXufax5tgmoxnAFvG9SUA+yGfBz82HlAvwZkWeQsNjZav06LsIdBgY+34oJqPfhGFWki234b3A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-eQ28Igd0kDwNnBeaXvQul2U4Za4KTkBJ2hF5gi6/8xL8tJAIvpSiuHrcspBB7oqr9/uOU6R4eR7gDmOH0OVRaQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-6deTINJifUd+6BioAPScqa94hbH35wweO3UazZ0Dob4GFoSxD/z7jUjRIib/HmyhXz+F/QMOZapPNN+qNsmEPg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-zHJSkQl00ygE1BBWjjSZgQmT+rpX/ZoNvU3az2Vfk0D9tqM4+zQ0M0IdBw0Eu1Wr46LeifWIScp4pTvzBB0R/w==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-T93T3DT3SakSQcwaB9SFTT6R38hEh0/52bM+4IqvFAo1EAKx3eXiKezE3bMSjOGKHxKzb71Rp1d9Jflv6capLQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-RaDmfdtde+m27g31HXvBUJme7NUUT07bv5+Wp3mPH/FXE6tT8W1DvG9XNRcT2rIEDq24ktpfyBiNbN8fieBfqw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-dnHqxZvkLe4SubfrXiPhb08qkj2FOrdCBWLHo/Hd+pSop3C86rCTRJY454LrPwjnktjnQf/X0b4anadwOkckrg==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm64";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-ewu+rh/Kky08pqSvyC33WsqopzmUojhx4NZRn5bFF3pcO0xbdhOEBuZR8ZQspXA2tuKL/n9bAKWDIPsVdDMdyg==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-723qKUmFeBKN0yfsf9zhP3k5ZKqK4UYvdKbDL80oyhzm4gQZ6tsUU4fHeHjJVJfqyN+wKS+R0WthyxhA9m07/g==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-8r/yMsXff3vlFUaRzlHKnkd/qxmbo6FzATU4d065j8YTNZcduF/uKiOKijwXSd96nj216RjCUIJWrcH72c5H6Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-hPcjYztP9miyYl+mqvTqoEqaa+fp+kCFVrROIwUEDBMNs6Urk76qsWJWE/uI9kLBh1zTHiDsWlXDiOXcftVBxA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-D6qubx3bzbfdDMJw1CcUJdPR2w2oHmOt/ur4q4Pi8cdFueROux3u2bcuurKmx2eZvHhYVKnL1njTxWDVHUM1OA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-IG7yOIrrLUvA22aUGR7g9VtXK3WGCsID9TokGqET+LoO4QTLlFRYjbrsUkvttuGUHftOTgDh+4abzkcqaTfd6A==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-neXYzUGCn4zBhHa4+9NgG6c0ulwsfGczrrH2hqJcwf16fNtBgfe9L+JnwRctrVVe7iOci/qYh69c36OlCsREug==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-3PwE2oDr4+n93nPZbHz1kgJkpdus91UR5IXKnMWMMxcEq+VgNvNpU4+M+khwPOXSmxK9LY6dsd9beQVIFtrDVg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-D8SDjyznO8H+3w5eAuL1pl+JZ+4S8eXM8gIMuNaDXvBZv43lU2by27Gk+Ue4eH5zV+462fBtBvqZtaETgfPsgQ==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-x64";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-zPgYi5k0qLWv1+BGxMmZnNplAa6tAnTpibzsSQTCcSmLJfazFww4sRI4qFYZ+H8/Tc1jVyIPHu3whUL3UirX+w==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-QVYtaGiLQ0bWTiav/cc2Ps+PQ9co8EmTW8NAzlf835camz7gdjZHKo5/z4FOVUHVftCY9vn2yBuBcwceI6f+Bg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-vk6trHjpJkCveABOceuodbxeAefojPqaUCGwU6HXinNgu281I/iEF7Afj6mJBLHxaPcvlFQjAjbRhll1SwcSNw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-4ktCvzYslGK2G2CLPy4As8rbHGPtQw0RA5VC9WxRmRpDH/3cyicFbRaBRVc2y19p0tV9nMC9KdaFyptm80lQZg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-r1LB1Ilq1/Pf71SubpoHU53s5bjfHY/TLQUhG2R3AGFMe1S2J6H35pkXuCdwBH+x99AX4khX1zw00BCYP5liVQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-MPUbFdcUXGrfUpdNmcPvq+EdaBLcl+4+nsbUwftOT1041DpIUkFfDzgWNWVMjPG3Prf3K0iKPtvdKx9bdUlq6A==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-ovDMqhvYv4o6P/AjvAh26EcSs6auYHe4YBgWF7SBLgB/r1xOvjlRZRuVL7znu/js0CwTH7h8w/YvW+q1+Tzw/A==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-CtxI7P/Il0bLfPXN6ofeL4Vm4ISp3TjvRBZt8MkACaTErFseNiwIIAKNqZ+d9lIxj1MDGA5fCfVn/0PsGIksRg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-K7jCpNm0lYr/dHheLoaPadsd9q8oQ0X+iK/rJkeKrZ76FLzAvcC1FqX9yXICwAW44m63bXcmg0ggra1+yXx0/Q==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-arm64";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-HAloa6WZYn4LvTyANZMWs9l5q8NR0Bqvs7pGKKarpE2JnmlH7R371+nMg20Ejxw9UYp0SNNZ775dw83G/WX/oA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-p18BC5bG9/0ktSBUvxZOqPpr9qkS0Z6G71GViCAzjtV+fBllt6OE7T0rSvOZ14FjZFcSqMA2HZ60I3H93cK6TA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-R7g8lya69aqDY/iAIIoX8TnbxEJxBIxvuqD0zrcEuJgRh33b2xys9OAT2NmyZH3GWdTZ5UPiolJ2SifKNE1ztQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-T9Rhlb0Ivsaev2JNEKRLRoc5pyowBy+meS7GzijwfHOEviRw2rMpPNK+8DoygI8HRetSnjLghMlzdcfURF10LA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-tPbKNB5TVRIAHyts6RMV2AP7pnmO/1MRtfTByCqTkTjH945dJ8+2r4ytMIoQ3ooVLi00yll9w2tDL+XnuNT3xw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-7SI6G+CVFjxrcgJny64fmvOp4Pz02EXrhlKJdEKoht+enh8c/1pY55cgR5jq9GWJ9iJNtV9/sDUiADK74NWWKQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-W18K405wGThiTnn12Mi0K6KXznjPZX87mX9APiq+nbKIsMmGC+r7cyIPgy9hmggnTb3qqv1p/0PACRD6NXm0CQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-ui1NVLgK7tEN1Xv+MO8FRovfg1OR4sKGf5GXHz2CN88GLkzznp5m9sSAETN2IPueRV+aaQ8JFaLEEw1QOdlh2Q==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-K7fKG8YuufAgq6VcvotJH/D4uHmcjg/X9TwWq8EmbyysqyNCuMkg6a1torpyaomdooKSZ0LSOodqbo57B6jERg==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-x64";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-AAcenMQyUXqNewaFwVv74m4OyOy4DH/seZDjjmMtE6BcYchYlWjJjU7Dh7lR3qk1KFuRBdeIvLHpGUZS0+GcqQ==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-kTwrqjATCL5woNksB+G2B39lOIUkxLnouFruipzLnsDKSxG50pKIhxWUkrwTfwatL/zQasE+aVlwEfSQAxQteQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-alvGXGuLfWb35dOybu83zGbH9VyIJRf17FEhF6yrNGvg8gJ3SwpU/N2uGnuxI1TIb8dFlKq3FoE2hqfxWAERKA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-86sGYDN7tFGBhAUacYgosah0TTIMT1czQtKHb6vKXOGo1wWAYa+MsGXrdUA6o3rpvybL8rbRANQ1tarIfui4Bw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-8345qvf7b3Q8hoqXErpJTWQeLmBV3GFUNa/hp8eCglnY5WWbnfd/muQAdA5zUoOX/8fMA4TILhZx2K0M8k1/mw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-VkXVbi8EbajQYu5pge5VCXxWGhHJtLivHM+rqHt78b8w2IpYfRACV7lqEU1COg9D3sZEG5oLOzKLCCN7lSiekA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-um95x3i3Jdyat4T6HTXP9I0STmsqJyuTWmZwCg/5EPNWMX1fm/OIFIoUQ9lX2kplPyq6Ys0hmiBaVcHOHGThgw==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-CUdm0Uw4kGSk6oVm8QZLSwxngMFmbNoiFXve2hT0/Csu4mJe6ttV8C/Y0VLPBJr3GmoovOzMeH3coQfEf2YvBA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-LneCr0cNCIEYVfDI2Ab++j+baaKut+pqTsCb3R9FAp9pqYVXveSEXn8V4xx+N0i//SQx4i9Dkd+oYGERun9k2A==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-arm64";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-xgYN99ynL4a37SaZebTPpeiui+2OVxCHFfPrW5vBoqoHLvAxhM67ZpqAY3zQELjS4Kb0ZxsLfOS4OPFKbcweSA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-kV1DnmxJrCauIvUfNe4wC4Yi888dzxxf7sYT4W/apnCSHvcjueYEZOGtoLSirsJJrn5aj9OeFVz+bAbd9nurxg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-xr4GBhH7aIMfPXjv+CuGZI3h1PZc+yETwn3/9UMOXXNxgM1zrkCR1p4I8rQNpwVPd440P8pReq2AWrdbLX7kTQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-XsP6i0SHVuDjS0IWBC+/3QXDJO+3ARuFbPSu9fRjR5NkK5/A4lQpBWJRymTzqWHzmD0DLYMEfwR+3mdG2A/StQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-slvRNr3ZPyyGLrOFEPVF91TD6BJcC7/UKrowVg0XGq37IxTeicrNLhs7PE8qmVGBgUTiKcqxEU7DXI2/qBh9nA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-UsW6m9/wuBUWM8SU/PHsn+9GQMRp4i00KfWDzE/s6rnCs40WRvy5Zcj923XMy05Bt04dhSrOOmDR1/vkydaysg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-1JBZRsQMZ4mCN0rS+F6wwP7s7+es+uwx6hG9ubUuccJYjCEAWwDg3vBVAbQqwMOF9rdbqOLFbkbvawOT7BHAaw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-Btz15yrqllW8cQ82bDOMB+fo1ONv4j+BvpZGQTt4zwqgyxq3qznnxVHrMxiG+UUwhDlD4ajCGYuZCjHECODTHg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-8fiTrOmlVMojv2oFxSO4zKP0Mz+3HazxfqBFBbgioN+/dMNiCa6ql3Sm0kp88Qmfcb68PwhWCJLy3x3XHLEUuA==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x64";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-m4+5c4eH8FsloMih4Pl/Fuf5dVljpTasP7wzRjn5UAt2M7RdQC5DbC3ZZDTuDSIwuDVKXoLzUbDV6ui5SBJ0mA==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-bVGv/VP4T598HMR97vrcF8NxOv43rTn4RtH5JSm/Z/I2l6Jf4OsEmrP7ciCJho65xgG2NN7E80dAfv6Waan/DQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-t0G1lpmSy3Bb/0k4riHo+oT2h53IbHHC92oy3Mnxg2Nm/ZBoGDW55/maB5lF+IbEoNsScpAhsFNf7gAv5KPOhw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-OvOg+DllupzQyo2AiWJOWhd3G7sXoROVbGIbaO48l3cXJf+EkT3mwK0WyKNJo1SYDBSHP4PL3CELLyl7KeuBTA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-Xgu9wAHojyPC6/9OhNk4Bpmhmb4FAcJMMb3S7xwwPFuEx7pKSCPOA/3Gv/8xR3w3lYoMhvs94Jn4zzLPw/d46A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-di/eQOCbK7Gckc/GaFEJbeHA8xc1sjPYb4ZgSDQG8s/lSc5EocnPG6YSiPu5noCS/kl4caLJzu8mcNEbHo9fQg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-FDFqh+DYEYnPZjLzODbygevvyrQH15WVg/pcDbiFlE0dsoL7LQ3ST3G6Vz5GfpAZyO0A8O7ekGOH81+wskmeiw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-e4ZDOtOGLbKnCy90C+6+pAtkX/CJlAI3dPV3zF8Dtk4kCG6m+4TnbohG8z+CBaY4Tyh7HRXfCwA0sMhkZIhJ/A==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-npZ0pXzs+1mOb/G8asxE4QYUrrQlvuVjO24sgaqgQ/o8Ir3m1jTxXhETRj7IXKiPiVMIaLPV+c3XtpdDKouH9A==";
+      })
+      (fetchNupkg {
+        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x86";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-7mbJh2PmKeWmniK6eOPGC1RZ5MGgLzf4czbisbCrCvw/wS/TXlq3kfkmT8sU+jjQQvutRbNXCES8HYK4vuVaog==";
       })
     ];
   };
 
 in
 rec {
-  release_10_0 = "10.0.0-preview.6";
+  release_10_0 = "10.0.0-preview.7";
 
   aspnetcore_10_0 = buildAspNetCore {
-    version = "10.0.0-preview.6.25358.103";
+    version = "10.0.0-preview.7.25380.108";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-arm.tar.gz";
-        hash = "sha512-/mrP2TIr27NliznmIGDFdjriPeeSpDDbRyaM++1gNgJk55NQArHO3KgTMog2d5XlnTgkp03lH5lk3FQKgU2RiQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-arm.tar.gz";
+        hash = "sha512-lXwjay3tSsk2fperQsxjo28PeydYBQA552QN/aOCTlpl6/LTB2L8diIqgdGUpJ593riZcUo3vCjbZwjY1bGC7Q==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-arm64.tar.gz";
-        hash = "sha512-iGZ9ZtkKq6MGSfhNENBX2nwNtHnNs2t2gk3I4PAqRKa/XSaddNqg1reDdvLcZrYCOFWCZ1VeLO1Ay9BqrHRdag==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-arm64.tar.gz";
+        hash = "sha512-gTWO1Grf/RpOLglePSPWfR0ommxMUKsg4ecRYbKCPIxE3VpsJBrJs/zUoq9Rjb/7zNt7Os0HpCr5/yTF/WLGow==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-x64.tar.gz";
-        hash = "sha512-FczqQ09eM7SvhyvaANMNP+5ElBE6Hl17HoziBqsKLgk4T6WiI6/d5LlOo7fhK3lsGkUTi+gzKIvWh0GuhD+2yA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-x64.tar.gz";
+        hash = "sha512-9onzhvf6Vrm1O9fVEKvs8rnCI1j7KTZ4RsI/u6ewphpH2G287vlrc6corwduVcNGg4SXQC4M2AuGldncHqPCuQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-arm.tar.gz";
-        hash = "sha512-HArq8wBlBcK/tkjyViWT9iu3pVsAULbMgecK6cwaNcrbv9VGEXBaGwv4SYqqNV0DeEfJ6nqa2j9YVWiLpqYTSQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-arm.tar.gz";
+        hash = "sha512-uJ0bnKWphyzzZ3dKLKUVKkLtht7MGMWTsQSINGPOXPrKamn5F0SaArTSXqQVj4IqNqwNZVxTjBhOR611EYbs2w==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-arm64.tar.gz";
-        hash = "sha512-CH7Qk+rFkx3YjOnIF1Q/rEp/sAcF/+cet1U6/QoVtQfrWmO46FDhT+SI3t17OaCshkmaFU5oSBWpnBIjr1NJ0A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-arm64.tar.gz";
+        hash = "sha512-cAY0HJWlGRCm7gLVgemkHXZGSn777QrXedDmT8DXfEK70jNTf1fXb28P2zh/biVZK6UzYmcKXm7+1ho3TkIc7A==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-x64.tar.gz";
-        hash = "sha512-bU2Jk/BySlwwy7XDR9ovxoct3HUdvGykOI5/umDVFiZhk5g6mErGv+h5tEh4j3e6+1C5mWfe+6QD9E7j/ycx7Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-x64.tar.gz";
+        hash = "sha512-wRf0SCHNbFWna7nr/HRlYG04rInIEO4iSys6D/T1q/Ld27sZVoOeZyrrpPlR3wtax/GTXSqQttTc3cEep8M7UQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-osx-arm64.tar.gz";
-        hash = "sha512-VlWHBJhm7w4JIR0SLJUOPYfzvCL/dA5NVQYY1ppidjuN12bBNcC95Px8zLqmTzMhQrSQ0P1ClOTFjimCB49yBA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-osx-arm64.tar.gz";
+        hash = "sha512-D5iye4E6etLrWkCOe9sf/97fheARsEmF6QCV3ikW2qTDQhSsPPmgZvSbPn7gnVbXP56aGFjHHv+JAMxBRf0yVQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-osx-x64.tar.gz";
-        hash = "sha512-c2tCqqrbhlRIvM/bOO2KlmCELsmPS4Trexq/E6imjPsWbx8dHZt6viROKAC0BwPUsxpQO+o2NZc5oEHjMsZSXQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-osx-x64.tar.gz";
+        hash = "sha512-FQLipaTYahQwhA2TGknRX/07ZEZeV9IdcURItxlpz7zmU4LvgoJg8Wlt1GxAnzwD9riuenLlFWe0RMoQuoreoA==";
       };
     };
   };
 
   runtime_10_0 = buildNetRuntime {
-    version = "10.0.0-preview.6.25358.103";
+    version = "10.0.0-preview.7.25380.108";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-arm.tar.gz";
-        hash = "sha512-dkFn08ZTnl3/nj8Qh+pAs3urJy9+bB3gyGLXak0MNEUnmbRY6fpwMprijsbQfWtiSz9b0KooEubn7I+PavI7hw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-arm.tar.gz";
+        hash = "sha512-oyaRhovGFTGjL6O78RNBZGrFFBasUvaACTxXfTO2ODBqJqCjJ5poaoZUPg8v3MoOegfzYIF5UpRdybRt4pyXCQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-arm64.tar.gz";
-        hash = "sha512-cbydt+UH85l1JsTzkzkUYA+Q8AAxxhc1nzuAtyuBiljcgEpe2zTGt8qx4WVx6FVVRZUNGgcgv/WzGsY3RP204w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-arm64.tar.gz";
+        hash = "sha512-tTAequEUCb2/MZg7xpk39w3RezVe84D0yrMX6SHl1mFiZCzVfRmhT7ug78CadjNcbl8u6ZimDErHYssXJR04QA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-x64.tar.gz";
-        hash = "sha512-f+rKqGVeFFIdtrqaeGByN38GOGTkGMXk9ep5kjop9HJO9u0WB0VFnuAo8ZJ5r6HA/t6atpM3IgiQnu+HM8oDZA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-x64.tar.gz";
+        hash = "sha512-EnSHIJyzxKOUhHzO1aFduMW2bJOGboi0pweJ6iyQtB4pk+ANkZLUupiPM928iaXKL+TxmmEdftitjD4KRpLFAQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-arm.tar.gz";
-        hash = "sha512-XXF9htD5Vt8lgTAnA9TYSNyBQjHnEpOgkOr1axgUYIRUOj1GcOQxDrkPOS4YKtAHycx8wfRRTQ76nfO2XRCD8Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-arm.tar.gz";
+        hash = "sha512-aCCXjXxzep/7Pj9IGsDDAm3FRsH0JzlqgwkCdTiwhu+QEHHiKiCJt3ivXlG8aJpEFCAs79lgkc0zAVtQ9+GtHA==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-arm64.tar.gz";
-        hash = "sha512-4mP7M8JBvsvY8vemP5tfQSPBpmfFVEfwOiSc/1SRs4pt+mKEURwPxidFxp8wK0ytnICIwnAJNYLX28p6LsZdCg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-arm64.tar.gz";
+        hash = "sha512-xJAlZHKLkx0jIHojHNSUZCKvqtFQjpGMISfcgjbc/yqVNXQQ4vC61bLYcZxkFMIJLQk4DDrnAVG1kgoyuzOHzw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-x64.tar.gz";
-        hash = "sha512-zf3Ek3pbRF4rjuks2odZedJWiUjdX+fQH4QwW2Mh3KZNZ+1hqYweccbaHu2CLwddC7BBBVGuyw+PPhMThDZ2qA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-x64.tar.gz";
+        hash = "sha512-wCfUh5zikKE4NaJWtYraqu2hdvCYgsej42+w4ik7Qo7/U+YhpHj+xF2SjxeL3VLn9KK03p4C0gSUxLmSXMtkBg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-osx-arm64.tar.gz";
-        hash = "sha512-zXzElKrtYs2r8Sh6CMvDoPKPMRLoluA37YLYRdZThzJ+I0UlvxwESbA+8hhSM9RWL7Wfv9GdXyjaPgpnE3RTdw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-osx-arm64.tar.gz";
+        hash = "sha512-72B+c82XraPNoxoMvqVWzWBAmiYSqUEnJxub+SXhLfhM97MmsLXt3s07rON/1vpwENSHzdxcIyR0Xe2W+LymAA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-osx-x64.tar.gz";
-        hash = "sha512-lm3Eezqhx6qSOzVI2IdkiCNpKwU/CT5PJrhmu/WAmx3W7zi9LC5RpOgPBsXb5K7Q21uuVSrZgmRi+sMOpormFg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-osx-x64.tar.gz";
+        hash = "sha512-4kBn/dR8b/jTCNNnNwK6FD/a3VC0pRca8qq36AYz7uGeZqC2lAvqSq6Yik05EVWjW6eOV3YM3d2lr169M1s9EA==";
       };
     };
   };
 
   sdk_10_0_1xx = buildNetSdk {
-    version = "10.0.100-preview.6.25358.103";
+    version = "10.0.100-preview.7.25380.108";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-arm.tar.gz";
-        hash = "sha512-lYjjTcixBEvdjpzqH9DWtWf+3w3br0iXsVOrmz6TrElXRXgQ+p7NfaTVo22KBbxItnCv0PUtTVbRQPdCoEOCCg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-arm.tar.gz";
+        hash = "sha512-knm/wwbPU/3AJnPGjrwGgYsm+wXukE/zFej/UoqNWLU0KoZkIjOkpnIi9Qe2ARC4IYSSx7l5cb7nj7EKFfiu6A==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-arm64.tar.gz";
-        hash = "sha512-cwFkPqL72yWCUmxtRpnTy2V/bJDjzn8nRq1RwyCoSDwoDToV/C4HJgWyvf52NpBjo4T/Ydef+WRBg+SyHBundA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-arm64.tar.gz";
+        hash = "sha512-qBiJz0LOz2FqdoXKsXUIaUzug+dqlhnGTomvr/TTgmaOpMft/etEU6DBPfzurIZuo9D+BfPfEkY4pMpYtP2nJQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-x64.tar.gz";
-        hash = "sha512-ZivWGncnWokxhq7VsKbmamE9M2V/cQJqJ/dl8RlreOPzoq2ljhs34Prqw5qDd7Pps7zqK3LFsG3V2YSK2Yc/Pw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-x64.tar.gz";
+        hash = "sha512-KNA8LaQR6BYb+jcUjzX/Yi6qI0GtzXKae1I/dKoh6Pf2UBnaENKG1nhY0Z/2AII4C4dDbfm8zicUe0/bIShvsg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-arm.tar.gz";
-        hash = "sha512-9E/Akg2mqGl07lLa7ODP/oyJEZPOmp1ob9k+gXiB7CSLkT5xdF7ldqZb9P3BZQZxivkERM7g9wFPuJZ6k6bMyA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-arm.tar.gz";
+        hash = "sha512-D65/QdZ5g5I0GWMqoc+JW9K+0oaBLcysWLUkrgxrgBuxhVUJ1t9L+EfkxAx5ll31z2BrwH8iV49JzAo+/1dEjQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-arm64.tar.gz";
-        hash = "sha512-xK/vp5j5cN3jplkjwCZItn87VU5Rp94TstKSRoQ3EtCGRcj8IjpAi9N+Df17+HWA0EaM+nQAlexbNbknQG+Lnw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-arm64.tar.gz";
+        hash = "sha512-zIjcxU2QbdIS9MOD3gfTSUfMS2RZJAtfwTqei25dfUgrymc1cXixQZUFfviDx+YOT/2ArvSEyYqXOYf+SZPBow==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-x64.tar.gz";
-        hash = "sha512-LCj610mZoxlInz08MT41eSP+UaQCG+01OZeA8trqlZzehNkYNdHjEMk71LfLaV+xT29lAa0LFmF0L/xYAVNiaQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-x64.tar.gz";
+        hash = "sha512-hcpucoRlWBlxrzWL7dJkDADJ11xJysH6mz3plrQKE+lfNbdXPe+u/r38Z0xHjotXn4GhAwvj8WC2cgsx/f1ooQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-osx-arm64.tar.gz";
-        hash = "sha512-xDIGEqUUEXVSocsTu6RBc72L25UGwTtLmmeumrCziq1+zU5d0dTDIwukn7luzRSyrzQWkp52UcXJkMv3ber7mg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-osx-arm64.tar.gz";
+        hash = "sha512-eI/e7V31AEm8/hNwBZzfp0M5CkLZv1LHRVY+qsRL9UqVSqyjVjZLq2tbEIsbbZ4NbPJ8JT0uYrBkQARmn4GXxw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-osx-x64.tar.gz";
-        hash = "sha512-rWlkOrW5A00BlxcOx+TusNgSzeXwKKHq8X+w8gnOKyUZMrJBKNsMVfBXs+mv9n14vLBFmAiT+B2WlQMjYRpnlQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-osx-x64.tar.gz";
+        hash = "sha512-/Dk0clsJJHMl7hDlaBlhZyKmMPSBS7k8Q7YLLtvTLuI83esARdZACAi4QNBQ7Q3Etbz5WpDeG5MpNrYjVuHqVQ==";
       };
     };
     inherit commonPackages hostPackages targetPackages;

From 4583d44a2f4e0ee81710ac358913313cf2a905a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 16:56:33 +0000
Subject: [PATCH 1810/3724] dolt: 1.57.0 -> 1.58.3

---
 pkgs/by-name/do/dolt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index bd41d5bc198d..18becf6036d0 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "dolt";
-  version = "1.57.0";
+  version = "1.58.3";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     rev = "v${version}";
-    sha256 = "sha256-9N5QPqwO9mzWuNwfRH+prYlq6dKD2NdcHbOE8WJ04r8=";
+    sha256 = "sha256-JQD/qYcVOvjkVPpE7oUxGwCJR5dkVuJpU9fMYT0W7fI=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-4lV2IAL/pBC3xyxa6uVslCJY+XwjKviZb9Gp7QyKZR0=";
+  vendorHash = "sha256-MaqRgGCzWMjoNGPTDQg8xukeYwxnPzds6qd9lIEdi0U=";
   proxyVendor = true;
   doCheck = false;
 

From e241b26ecfbe5ec6541ee6ee5f6bb28e0ad771d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 17:35:58 +0000
Subject: [PATCH 1811/3724] atmos: 1.183.1 -> 1.186.0

---
 pkgs/by-name/at/atmos/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/at/atmos/package.nix b/pkgs/by-name/at/atmos/package.nix
index a6c0a8e707b4..336bdb5eb6cf 100644
--- a/pkgs/by-name/at/atmos/package.nix
+++ b/pkgs/by-name/at/atmos/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "atmos";
-  version = "1.183.1";
+  version = "1.186.0";
 
   src = fetchFromGitHub {
     owner = "cloudposse";
     repo = "atmos";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fQdUS7JE17r2ecw8285b05qMQTx1lLv/YrxtV82O6Cg=";
+    hash = "sha256-Mi18XmKXT27fMONfRqQqfi1TIGQ3sLTW9aeUJvPjTac=";
   };
 
-  vendorHash = "sha256-HZU35KyG3pllQdOta8BrzopASWmCl/HD988zs9RGuFE=";
+  vendorHash = "sha256-qYKHfLsz0rno2JGIyG4aTcNW51waaeXJK7V5tkypueA=";
 
   ldflags = [
     "-s"

From 605562d4403bea08ce8cf75a710dfb88a048a516 Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sat, 16 Aug 2025 16:56:30 +0000
Subject: [PATCH 1812/3724] python3Packages.langsmith: 0.4.9 -> 0.4.14

https://github.com/langchain-ai/langsmith-sdk/releases/tag/v0.4.14

Includes build system change to hatchling.
---
 pkgs/development/python-modules/langsmith/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix
index dfa95995f5be..a4458016d74e 100644
--- a/pkgs/development/python-modules/langsmith/default.nix
+++ b/pkgs/development/python-modules/langsmith/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
 
   # build-system
-  poetry-core,
+  hatchling,
 
   # dependencies
   httpx,
@@ -31,21 +31,21 @@
 
 buildPythonPackage rec {
   pname = "langsmith";
-  version = "0.4.9";
+  version = "0.4.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langsmith-sdk";
     tag = "v${version}";
-    hash = "sha256-7XV85/IN1hG9hYBSg73pymIwIWYAay/18NAsV6Jz4Ik=";
+    hash = "sha256-9CBEVe3FCpqUMtoTQKikgDmSvqqppTPWYrhElPh6UcA=";
   };
 
   sourceRoot = "${src.name}/python";
 
   pythonRelaxDeps = [ "orjson" ];
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     httpx

From 87403f8d19ec2a855f6df2fc977921fecfdf673a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 18:08:19 +0000
Subject: [PATCH 1813/3724] strawberry: 1.2.11 -> 1.2.12

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

diff --git a/pkgs/by-name/st/strawberry/package.nix b/pkgs/by-name/st/strawberry/package.nix
index 853213f4e720..8380a0f4d67c 100644
--- a/pkgs/by-name/st/strawberry/package.nix
+++ b/pkgs/by-name/st/strawberry/package.nix
@@ -38,13 +38,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "strawberry";
-  version = "1.2.11";
+  version = "1.2.12";
 
   src = fetchFromGitHub {
     owner = "jonaski";
     repo = "strawberry";
     rev = finalAttrs.finalPackage.version;
-    hash = "sha256-AhNx2CdfE7ff3+L47X6lYPD8GA7imkDIJD5ESndn/cc=";
+    hash = "sha256-09aUhouuE9SFHwtNeB4QtrAhKrP8m3ZbO+t4EKvxhMo=";
   };
 
   # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead

From 682478eee084ea1c8927572260fe5c61f4926b30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 18:36:11 +0000
Subject: [PATCH 1814/3724] goresym: 3.1.1 -> 3.1.2

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

diff --git a/pkgs/by-name/go/goresym/package.nix b/pkgs/by-name/go/goresym/package.nix
index fe5ff6119cd0..37c812ea53d3 100644
--- a/pkgs/by-name/go/goresym/package.nix
+++ b/pkgs/by-name/go/goresym/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "goresym";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "mandiant";
     repo = "goresym";
     rev = "v${version}";
-    hash = "sha256-OvdARJwz/ijduil3JIpoR15+F3QNQyqQKeOmiAV7h2A=";
+    hash = "sha256-BgnT0qYPH8kMI837hnUK5zGhboGgRU7VeU5dKNcrj8g=";
   };
 
   subPackages = [ "." ];

From 4f2f8faa7f7d3cba5c4eccf6077cef2235f0071a Mon Sep 17 00:00:00 2001
From: Kamil Zaripov <kamil@zaripov.net>
Date: Sat, 16 Aug 2025 22:10:30 +0300
Subject: [PATCH 1815/3724] check-meta: Clarify error message about unsupported
 platform
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Right now if you are specifying supported platforms using meta.platforms
you can get a bit misleading error message:

    $ nix-build default.nix
    error:
          … in the condition of the assert statement
            at /nix/store/53pzmaza73pl8q2yl1q62h7ncx21nxc1-source/lib/customisation.nix:419:9:
              418|       drvPath =
              419|         assert condition;
                |         ^
              420|         drv.drvPath;

          … while evaluating the attribute 'handled'
            at /nix/store/53pzmaza73pl8q2yl1q62h7ncx21nxc1-source/pkgs/stdenv/generic/check-meta.nix:643:9:
              642|         # or, alternatively, just output a warning message.
              643|         handled = (
                |         ^
              644|           if valid == "yes" then

          (stack trace truncated; use '--show-trace' to show the full, detailed trace)

          error: Package ‘test’ in /home/kamil/code/test/default.nix:3 is not available on the requested hostPlatform:
            hostPlatform.config = "aarch64-none-elf"
            package.meta.platforms = [
              "aarch64-none-elf"
            ]
            package.meta.badPlatforms = [ ]
          , refusing to evaluate.

          a) To temporarily allow packages that are unsupported for this system, you can use an environment variable
              for a single invocation of the nix tools.

                $ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1

              Note: When using `nix shell`, `nix build`, `nix develop`, etc with a flake,
                    then pass `--impure` in order to allow use of environment variables.

          b) For `nixos-rebuild` you can set
            { nixpkgs.config.allowUnsupportedSystem = true; }
          in configuration.nix to override this.

          c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
            { allowUnsupportedSystem = true; }
          to ~/.config/nixpkgs/config.nix.

It is not clear why this derivation cannot be built for
"aarch64-none-elf" target since error message list this triplet in
package.meta.platforms right below hostPlatform.config. The issue is that
package.meta.platforms is checked against hostPlatform.system field, not
hostPlatform.config field:
https://github.com/NixOS/nixpkgs/blob/b134951a4c9f3c995fd7be05f3243f8ecd65d798/lib/meta.nix#L103
And in this case hostPlatform.system is "aarch64-none" while
hostPlatform.config is "aarch64-none-efi".

I think that it would be better to print hostPlatform.system in error
message.
---
 pkgs/stdenv/generic/check-meta.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index c3e9469649ff..d2c7d0b2f168 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -534,7 +534,7 @@ let
         reason = "unsupported";
         errormsg = ''
           is not available on the requested hostPlatform:
-            hostPlatform.config = "${hostPlatform.config}"
+            hostPlatform.system = "${hostPlatform.system}"
             package.meta.platforms = ${toPretty' (attrs.meta.platforms or [ ])}
             package.meta.badPlatforms = ${toPretty' (attrs.meta.badPlatforms or [ ])}
         '';

From b1b15e7260789ce6538eb9bbd17e501ae21d6ddc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 21:08:30 +0000
Subject: [PATCH 1816/3724] python3Packages.bidsschematools: 1.0.13 -> 1.0.14

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

diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix
index 27de1694bfb4..015bf64f8832 100644
--- a/pkgs/development/python-modules/bidsschematools/default.nix
+++ b/pkgs/development/python-modules/bidsschematools/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "bidsschematools";
-  version = "1.0.13";
+  version = "1.0.14";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "bidsschematools";
     inherit version;
-    hash = "sha256-l9DN68kf1HwE0Th6XBuLxlikAyaARIEK/jwE6/mC0Vo=";
+    hash = "sha256-Kj3vxue6dGdFV2gzYr6SBa3D1s/X+KV/izWR6kMKOKE=";
   };
 
   build-system = [

From fad64d2ef6c52d0a34e0f1f328b1e5750dd6eb82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 21:19:06 +0000
Subject: [PATCH 1817/3724] python3Packages.types-html5lib: 1.1.11.20250708 ->
 1.1.11.20250809

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

diff --git a/pkgs/development/python-modules/types-html5lib/default.nix b/pkgs/development/python-modules/types-html5lib/default.nix
index 992b8e7496ac..d6da09620f5b 100644
--- a/pkgs/development/python-modules/types-html5lib/default.nix
+++ b/pkgs/development/python-modules/types-html5lib/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-html5lib";
-  version = "1.1.11.20250708";
+  version = "1.1.11.20250809";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_html5lib";
     inherit version;
-    hash = "sha256-JDIXIP26xxzuUNWkvsm3RISVtyF5dM/+P88e3k7vev4=";
+    hash = "sha256-eXbsdCa7AJmX3F4HK8o+2YjddH0Mv+CTx9+9PV7Iv1c=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 0ab3524135f0dabb087e36d898efeb29feb3689b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 22:02:19 +0000
Subject: [PATCH 1818/3724] python3Packages.mkdocs-material: 9.6.16 -> 9.6.17

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

diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix
index 15096b38df84..2a8d5318af06 100644
--- a/pkgs/development/python-modules/mkdocs-material/default.nix
+++ b/pkgs/development/python-modules/mkdocs-material/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-material";
-  version = "9.6.16";
+  version = "9.6.17";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "squidfunk";
     repo = "mkdocs-material";
     tag = version;
-    hash = "sha256-wGzrlDf6bJFIfJXlCMlOQvRlpOcDXeMVY2/GRjOG1H4=";
+    hash = "sha256-yl5bc037gr3oAUH01uNvNj7fIe8ca2jH+yfWlgMImZE=";
   };
 
   nativeBuildInputs = [

From 29b6e7097f50955f49a81d2665fb21c94c43df19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 17 Aug 2025 00:09:14 +0200
Subject: [PATCH 1819/3724] citrix_workspace: switch to libxml2_13

---
 .../remote/citrix-workspace/generic.nix         | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index bbfd19e15745..46ed77495f2e 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -40,7 +40,7 @@
   libsecret,
   libsoup_2_4,
   libvorbis,
-  libxml2,
+  libxml2_13,
   llvmPackages,
   more,
   nspr,
@@ -90,19 +90,6 @@ let
     '';
   };
 
-  libxml2' = libxml2.overrideAttrs (oldAttrs: rec {
-    version = "2.13.8";
-    src = fetchurl {
-      url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-      hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo=";
-    };
-    meta = oldAttrs.meta // {
-      knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [
-        "CVE-2025-6021"
-      ];
-    };
-  });
-
 in
 
 stdenv.mkDerivation rec {
@@ -174,7 +161,7 @@ stdenv.mkDerivation rec {
     libsecret
     libsoup_2_4
     libvorbis
-    libxml2'
+    libxml2_13
     llvmPackages.libunwind
     nspr
     nss

From a9c27790539be4b1aff95b41c2036856c4d8cdff Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Sat, 16 Aug 2025 22:09:20 +0000
Subject: [PATCH 1820/3724] weechat-unwrapped: 4.7.0 -> 4.7.1

Changes: https://github.com/weechat/weechat/releases/tag/v4.7.1
---
 pkgs/applications/networking/irc/weechat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index d87c8b6b7f4d..d4fb001d7887 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -104,11 +104,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins;
 
 stdenv.mkDerivation rec {
   pname = "weechat";
-  version = "4.7.0";
+  version = "4.7.1";
 
   src = fetchurl {
     url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
-    hash = "sha256-RdwDlgYMhjFphoNJ7CgK8cb0rFJKpJJYDhoGXhQsLNg=";
+    hash = "sha256-6D+3HKJRxd10vZxaa9P4XcLrjs7AlV9DwH8+CRHtt9M=";
   };
 
   # Why is this needed? https://github.com/weechat/weechat/issues/2031

From b7999153a9d906523b3d42ca9af32112c6a56d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 17 Aug 2025 00:29:44 +0200
Subject: [PATCH 1821/3724] cudaPackages_12_9: switch to libxml2_13 that has
 patches for 5 CVEs

---
 pkgs/development/cuda-modules/cudatoolkit/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix
index 9201f7755d4a..baa41e61613e 100644
--- a/pkgs/development/cuda-modules/cudatoolkit/default.nix
+++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix
@@ -21,7 +21,7 @@
   libxcrypt-legacy,
   libxkbcommon,
   libkrb5,
-  libxml2,
+  libxml2_13,
   krb5,
   makeWrapper,
   markForCudatoolkitRootHook,
@@ -157,14 +157,7 @@ backendStdenv.mkDerivation {
     python311
   ]
   ++ lib.optionals (cudaAtLeast "12.9") [
-    # Replace once https://github.com/NixOS/nixpkgs/pull/421740 is merged.
-    (libxml2.overrideAttrs rec {
-      version = "2.13.8";
-      src = fetchurl {
-        url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-        hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo=";
-      };
-    })
+    libxml2_13
     python312
   ];
 

From 1008fd6236dcac69859d7f4eb0d990efdca21054 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 00:00:32 +0000
Subject: [PATCH 1822/3724] opshin: 0.24.2 -> 0.24.3

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

diff --git a/pkgs/by-name/op/opshin/package.nix b/pkgs/by-name/op/opshin/package.nix
index 2ec2ab1add1d..932d2c00317c 100644
--- a/pkgs/by-name/op/opshin/package.nix
+++ b/pkgs/by-name/op/opshin/package.nix
@@ -17,7 +17,7 @@ in
 
 python3'.pkgs.buildPythonApplication rec {
   pname = "opshin";
-  version = "0.24.2";
+  version = "0.24.3";
 
   format = "pyproject";
 
@@ -25,7 +25,7 @@ python3'.pkgs.buildPythonApplication rec {
     owner = "OpShin";
     repo = "opshin";
     tag = version;
-    hash = "sha256-L0vWEXlghXssT9oUw5AYG3/4ALoB/NH90JV8Kdl2n30=";
+    hash = "sha256-2HfX4yNCVILGuztxwA1L+In+ZiSXLDaO+K9ccgHn3zw=";
   };
 
   propagatedBuildInputs = with python3'.pkgs; [

From b93eeb740d0ae38bee00d4161f9f4d85bdc401e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 00:08:44 +0000
Subject: [PATCH 1823/3724] mattermost: 10.5.9 -> 10.5.10

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

diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index 6da951b8ea72..374af784b297 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -19,8 +19,8 @@
     #
     # Ensure you also check ../mattermostLatest/package.nix.
     regex = "^v(10\\.5\\.[0-9]+)$";
-    version = "10.5.9";
-    srcHash = "sha256-Jnm6M9d5vkYGX357QiOvCRDPGFpvRrsWqk8+SV0PtBs=";
+    version = "10.5.10";
+    srcHash = "sha256-fQqUoSo8saERRfgx4OT26VQktejzYPPqBIL2OA0PQy0=";
     vendorHash = "sha256-uryErnXPVd/gmiAk0F2DVaqz368H6j97nBn0eNW7DFk=";
     npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0=";
     lockfileOverlay = ''

From 919412e24e563015985928683e389a6ff2575def Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 17 Aug 2025 02:37:34 +0200
Subject: [PATCH 1824/3724] matrix-synapse-unwrapped: clean up

---
 .../ma/matrix-synapse-unwrapped/package.nix   | 52 ++++++-------------
 1 file changed, 17 insertions(+), 35 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index 94689e2570e0..cfd8522dc67d 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -2,8 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
-  python3,
+  python3Packages,
   openssl,
   libiconv,
   cargo,
@@ -13,10 +12,7 @@
   nix-update-script,
 }:
 
-let
-  plugins = python3.pkgs.callPackage ./plugins { };
-in
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "matrix-synapse";
   version = "1.136.0";
   format = "pyproject";
@@ -33,29 +29,13 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-GX4lVg6aPVlqFgSSGsUg3wi7bne9jVWPTVx8rO5SjL8=";
   };
 
-  postPatch = ''
-    # Remove setuptools_rust from runtime dependencies
-    # https://github.com/element-hq/synapse/blob/v1.69.0/pyproject.toml#L177-L185
-    sed -i '/^setuptools_rust =/d' pyproject.toml
-
-    # Remove version pin on build dependencies. Upstream does this on purpose to
-    # be extra defensive, but we don't want to deal with updating this
-    sed -i 's/"poetry-core>=\([0-9.]*\),<=[0-9.]*"/"poetry-core>=\1"/' pyproject.toml
-    sed -i 's/"setuptools_rust>=\([0-9.]*\),<=[0-9.]*"/"setuptools_rust>=\1"/' pyproject.toml
-
-    # Don't force pillow to be 10.0.1 because we already have patched it, and
-    # we don't use the pillow wheels.
-    sed -i 's/Pillow = ".*"/Pillow = ">=5.4.0"/' pyproject.toml
-
-    # https://github.com/element-hq/synapse/pull/17878#issuecomment-2575412821
-    substituteInPlace tests/storage/databases/main/test_events_worker.py \
-      --replace-fail "def test_recovery" "def no_test_recovery"
-  '';
-
-  nativeBuildInputs = with python3.pkgs; [
+  build-system = with python3Packages; [
     poetry-core
-    rustPlatform.cargoSetupHook
     setuptools-rust
+  ];
+
+  nativeBuildInputs = [
+    rustPlatform.cargoSetupHook
     cargo
     rustc
   ];
@@ -67,8 +47,10 @@ python3.pkgs.buildPythonApplication rec {
     libiconv
   ];
 
-  propagatedBuildInputs =
-    with python3.pkgs;
+  pythonRemoveDeps = [ "setuptools_rust" ];
+
+  dependencies =
+    with python3Packages;
     [
       attrs
       bcrypt
@@ -103,7 +85,7 @@ python3.pkgs.buildPythonApplication rec {
     ]
     ++ twisted.optional-dependencies.tls;
 
-  optional-dependencies = with python3.pkgs; {
+  optional-dependencies = with python3Packages; {
     postgres =
       if isPyPy then
         [
@@ -143,11 +125,11 @@ python3.pkgs.buildPythonApplication rec {
   nativeCheckInputs = [
     openssl
   ]
-  ++ (with python3.pkgs; [
+  ++ (with python3Packages; [
     mock
     parameterized
   ])
-  ++ builtins.filter (p: !p.meta.broken) (lib.flatten (lib.attrValues optional-dependencies));
+  ++ lib.filter (pkg: !pkg.meta.broken) (lib.flatten (lib.attrValues optional-dependencies));
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
@@ -164,15 +146,15 @@ python3.pkgs.buildPythonApplication rec {
       NIX_BUILD_CORES=4
     fi
 
-    PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests
+    PYTHONPATH=".:$PYTHONPATH" ${python3Packages.python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests
 
     runHook postCheck
   '';
 
   passthru = {
     tests = { inherit (nixosTests) matrix-synapse matrix-synapse-workers; };
-    inherit plugins;
-    python = python3;
+    plugins = python3Packages.callPackage ./plugins { };
+    inherit (python3Packages) python;
     updateScript = nix-update-script { };
   };
 

From 8d97843ae2c7d7b318ff701259b916e21ca589fd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 17 Aug 2025 02:58:22 +0200
Subject: [PATCH 1825/3724] nixos/tests/matrix-synapse: resolve deprecation
 warning

---
 nixos/tests/matrix/synapse.nix | 60 ++++++++++++++++------------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/nixos/tests/matrix/synapse.nix b/nixos/tests/matrix/synapse.nix
index 1f67f158fd56..7827705ffe21 100644
--- a/nixos/tests/matrix/synapse.nix
+++ b/nixos/tests/matrix/synapse.nix
@@ -67,7 +67,7 @@ in
         ...
       }:
       let
-        mailserverIP = nodes.mailserver.config.networking.primaryIPAddress;
+        mailserverIP = nodes.mailserver.networking.primaryIPAddress;
       in
       {
         services.matrix-synapse = {
@@ -169,44 +169,40 @@ in
       };
 
     # test mail delivery
-    mailserver =
-      args:
-      let
-      in
-      {
-        security.pki.certificateFiles = [
-          mailerCerts.ca.cert
-        ];
+    mailserver = args: {
+      security.pki.certificateFiles = [
+        mailerCerts.ca.cert
+      ];
 
-        networking.firewall.enable = false;
+      networking.firewall.enable = false;
 
-        services.postfix = {
-          enable = true;
-          enableSubmission = true;
+      services.postfix = {
+        enable = true;
+        enableSubmission = true;
 
-          # blackhole transport
-          transport = "example.com discard:silently";
+        # blackhole transport
+        transport = "example.com discard:silently";
 
-          settings.main = {
-            myhostname = "${mailerDomain}";
-            # open relay for subnet
-            mynetworks_style = "subnet";
-            debug_peer_level = "10";
-            smtpd_relay_restrictions = [
-              "permit_mynetworks"
-              "reject_unauth_destination"
-            ];
+        settings.main = {
+          myhostname = "${mailerDomain}";
+          # open relay for subnet
+          mynetworks_style = "subnet";
+          debug_peer_level = "10";
+          smtpd_relay_restrictions = [
+            "permit_mynetworks"
+            "reject_unauth_destination"
+          ];
 
-            # disable obsolete protocols, something old versions of twisted are still using
-            smtpd_tls_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3";
-            smtpd_tls_mandatory_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3";
-            smtpd_tls_chain_files = [
-              "${mailerCerts.${mailerDomain}.key}"
-              "${mailerCerts.${mailerDomain}.cert}"
-            ];
-          };
+          # disable obsolete protocols, something old versions of twisted are still using
+          smtpd_tls_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3";
+          smtpd_tls_mandatory_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3";
+          smtpd_tls_chain_files = [
+            "${mailerCerts.${mailerDomain}.key}"
+            "${mailerCerts.${mailerDomain}.cert}"
+          ];
         };
       };
+    };
 
     serversqlite = args: {
       services.matrix-synapse = {

From 96d39939f362e0b91d14e1944a58a188032cec95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 01:43:31 +0000
Subject: [PATCH 1826/3724] 
 matrix-synapse-plugins.matrix-synapse-mjolnir-antispam: 1.10.0 -> 1.11.0

---
 .../ma/matrix-synapse-unwrapped/plugins/mjolnir-antispam.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/mjolnir-antispam.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/mjolnir-antispam.nix
index 8309c9971b72..8d9f5f89dfe4 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/mjolnir-antispam.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/mjolnir-antispam.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "matrix-synapse-mjolnir-antispam";
-  version = "1.10.0";
+  version = "1.11.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "mjolnir";
     tag = "v${version}";
-    sha256 = "sha256-xc/vrBL1rqgB69NqkEmUg7YMX4EZRFrRNPrWA7euaXU=";
+    sha256 = "sha256-+MdPJz9QEiohWZZXvGdfR6NeLS5jyHUifD6LSZbFfvs=";
   };
 
   sourceRoot = "${src.name}/synapse_antispam";

From 4d346e022fbbd9174fabab94d34c65abd9f998fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 02:01:06 +0000
Subject: [PATCH 1827/3724] repomix: 1.2.1 -> 1.3.0

---
 pkgs/by-name/re/repomix/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix
index d1ab6d7c24c9..9c55a719d602 100644
--- a/pkgs/by-name/re/repomix/package.nix
+++ b/pkgs/by-name/re/repomix/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "repomix";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "yamadashy";
     repo = "repomix";
     tag = "v${version}";
-    hash = "sha256-K7VPxjBsf8BxI4/1owU2c0gj1oaG9+UOLzzuN8hCmO4=";
+    hash = "sha256-09neN7sh4TRM+rQBqCQHqW165i6+RY9IF67ft6OgyhI=";
   };
 
-  npmDepsHash = "sha256-YQj4m0rJTkkZAKplmTBhwc5oxrbeP7SeFdVF1atHnWs=";
+  npmDepsHash = "sha256-nLxIPwx+zvYCMZ6y9ntbWvrJvO4g5J7Tf9rYk26gyAs=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From 210106efce9ad52aeb1228a9f2ca6ff6d4d3683f Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Mon, 21 Jul 2025 18:12:42 -0400
Subject: [PATCH 1828/3724] spaghettikart: init at 0-unstable-2025-08-07

---
 .../sp/spaghettikart/dont-fetch-stb.patch     |  16 ++
 pkgs/by-name/sp/spaghettikart/git-deps.patch  |  44 +++
 pkgs/by-name/sp/spaghettikart/package.nix     | 263 ++++++++++++++++++
 3 files changed, 323 insertions(+)
 create mode 100644 pkgs/by-name/sp/spaghettikart/dont-fetch-stb.patch
 create mode 100644 pkgs/by-name/sp/spaghettikart/git-deps.patch
 create mode 100644 pkgs/by-name/sp/spaghettikart/package.nix

diff --git a/pkgs/by-name/sp/spaghettikart/dont-fetch-stb.patch b/pkgs/by-name/sp/spaghettikart/dont-fetch-stb.patch
new file mode 100644
index 000000000000..eade8db90a7b
--- /dev/null
+++ b/pkgs/by-name/sp/spaghettikart/dont-fetch-stb.patch
@@ -0,0 +1,16 @@
+Submodule libultraship contains modified content
+diff --git a/libultraship/cmake/dependencies/common.cmake b/libultraship/cmake/dependencies/common.cmake
+index 596158c..c62d7b2 100644
+--- a/libultraship/cmake/dependencies/common.cmake
++++ b/libultraship/cmake/dependencies/common.cmake
+@@ -47,10 +47,6 @@ set(stormlib_optimizations_patch git apply ${CMAKE_CURRENT_SOURCE_DIR}/cmake/dep
+ endif()
+ 
+ #=================== STB ===================
+-set(STB_DIR ${CMAKE_BINARY_DIR}/_deps/stb)
+-file(DOWNLOAD "https://github.com/nothings/stb/raw/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h" "${STB_DIR}/stb_image.h")
+-file(WRITE "${STB_DIR}/stb_impl.c" "#define STB_IMAGE_IMPLEMENTATION\n#include \"stb_image.h\"")
+-
+ add_library(stb STATIC)
+ 
+ target_sources(stb PRIVATE
diff --git a/pkgs/by-name/sp/spaghettikart/git-deps.patch b/pkgs/by-name/sp/spaghettikart/git-deps.patch
new file mode 100644
index 000000000000..4cf9d14e6e95
--- /dev/null
+++ b/pkgs/by-name/sp/spaghettikart/git-deps.patch
@@ -0,0 +1,44 @@
+diff --git a/torch/CMakeLists.txt b/torch/CMakeLists.txt
+index ba3859a..cf3da99 100644
+--- a/torch/CMakeLists.txt
++++ b/torch/CMakeLists.txt
+@@ -36,8 +36,7 @@ if(USE_STANDALONE)
+     # Because libgfxd is not a CMake project, we have to manually fetch it and add it to the build
+     FetchContent_Declare(
+         libgfxd
+-        GIT_REPOSITORY https://github.com/glankk/libgfxd.git
+-        GIT_TAG 96fd3b849f38b3a7c7b7f3ff03c5921d328e6cdf
++        URL @libgfxd_src@
+     )
+ 
+     FetchContent_GetProperties(libgfxd)
+@@ -205,8 +204,7 @@ set(YAML_CPP_BUILD_TESTS OFF)
+ set(YAML_CPP_DISABLE_UNINSTALL ON)
+ FetchContent_Declare(
+     yaml-cpp
+-    GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
+-    GIT_TAG 2f86d13775d119edbb69af52e5f566fd65c6953b
++    URL @yaml-cpp_src@
+ )
+ set(YAML_CPP_BUILD_TESTS OFF)
+ FetchContent_MakeAvailable(yaml-cpp)
+@@ -219,8 +217,7 @@ endif()
+ if(USE_STANDALONE)
+ 	FetchContent_Declare(
+ 		spdlog
+-		GIT_REPOSITORY https://github.com/gabime/spdlog.git
+-		GIT_TAG 7e635fca68d014934b4af8a1cf874f63989352b7
++        URL @spdlog_src@
+ 	)
+ 
+ 	FetchContent_MakeAvailable(spdlog)
+@@ -234,8 +231,7 @@ endif()
+ set(tinyxml2_BUILD_TESTING OFF)
+ FetchContent_Declare(
+     tinyxml2
+-    GIT_REPOSITORY https://github.com/leethomason/tinyxml2.git
+-    GIT_TAG 10.0.0
++    URL @tinyxml2_src@
+     OVERRIDE_FIND_PACKAGE
+ )
+ FetchContent_MakeAvailable(tinyxml2)
diff --git a/pkgs/by-name/sp/spaghettikart/package.nix b/pkgs/by-name/sp/spaghettikart/package.nix
new file mode 100644
index 000000000000..cf08606d5daf
--- /dev/null
+++ b/pkgs/by-name/sp/spaghettikart/package.nix
@@ -0,0 +1,263 @@
+{
+  lib,
+  fetchFromGitHub,
+  applyPatches,
+  writeTextFile,
+  fetchurl,
+  stdenv,
+  replaceVars,
+  yaml-cpp,
+  srcOnly,
+  cmake,
+  copyDesktopItems,
+  installShellFiles,
+  lsb-release,
+  makeWrapper,
+  ninja,
+  pkg-config,
+  libGL,
+  libvorbis,
+  libX11,
+  libzip,
+  nlohmann_json,
+  SDL2,
+  SDL2_net,
+  spdlog,
+  tinyxml-2,
+  zenity,
+  sdl_gamecontrollerdb,
+  spaghettikart,
+  makeDesktopItem,
+}:
+
+let
+
+  # The following are either normally fetched during build time or a specific version is required
+
+  dr_libs = fetchFromGitHub {
+    owner = "mackron";
+    repo = "dr_libs";
+    rev = "da35f9d6c7374a95353fd1df1d394d44ab66cf01";
+    hash = "sha256-ydFhQ8LTYDBnRTuETtfWwIHZpRciWfqGsZC6SuViEn0=";
+  };
+
+  imgui' = applyPatches {
+    src = fetchFromGitHub {
+      owner = "ocornut";
+      repo = "imgui";
+      tag = "v1.91.9b-docking";
+      hash = "sha256-mQOJ6jCN+7VopgZ61yzaCnt4R1QLrW7+47xxMhFRHLQ=";
+    };
+    patches = [
+      "${spaghettikart.src}/libultraship/cmake/dependencies/patches/imgui-fixes-and-config.patch"
+    ];
+  };
+
+  libgfxd = fetchFromGitHub {
+    owner = "glankk";
+    repo = "libgfxd";
+    rev = "008f73dca8ebc9151b205959b17773a19c5bd0da";
+    hash = "sha256-AmHAa3/cQdh7KAMFOtz5TQpcM6FqO9SppmDpKPTjTt8=";
+  };
+
+  prism = fetchFromGitHub {
+    owner = "KiritoDv";
+    repo = "prism-processor";
+    rev = "7ae724a6fb7df8cbf547445214a1a848aefef747";
+    hash = "sha256-G7koDUxD6PgZWmoJtKTNubDHg6Eoq8I+AxIJR0h3i+A=";
+  };
+
+  stb_impl = writeTextFile {
+    name = "stb_impl.c";
+    text = ''
+      #define STB_IMAGE_IMPLEMENTATION
+      #include "stb_image.h"
+    '';
+  };
+
+  stb' = fetchurl {
+    name = "stb_image.h";
+    url = "https://raw.githubusercontent.com/nothings/stb/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h";
+    hash = "sha256-xUsVponmofMsdeLsI6+kQuPg436JS3PBl00IZ5sg3Vw=";
+  };
+
+  stormlib' = applyPatches {
+    src = fetchFromGitHub {
+      owner = "ladislav-zezula";
+      repo = "StormLib";
+      tag = "v9.25";
+      hash = "sha256-HTi2FKzKCbRaP13XERUmHkJgw8IfKaRJvsK3+YxFFdc=";
+    };
+    patches = [
+      "${spaghettikart.src}/libultraship/cmake/dependencies/patches/stormlib-optimizations.patch"
+    ];
+  };
+
+  thread_pool = fetchFromGitHub {
+    owner = "bshoshany";
+    repo = "thread-pool";
+    tag = "v4.1.0";
+    hash = "sha256-zhRFEmPYNFLqQCfvdAaG5VBNle9Qm8FepIIIrT9sh88=";
+  };
+
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "spaghettikart";
+  version = "0-unstable-2025-08-07";
+
+  src = fetchFromGitHub {
+    owner = "HarbourMasters";
+    repo = "SpaghettiKart";
+    rev = "334fdeafd26c15e03b4f198002ad86b8422c0e2f";
+    hash = "sha256-0nDaX34C7stg7S2mzPChz0fRz/t7yyevKEAPmIR+lak=";
+    fetchSubmodules = true;
+    deepClone = true;
+    postFetch = ''
+      cd $out
+      (git describe --tags HEAD 2>/dev/null || echo "") > PROJECT_VERSION
+      git log --pretty=format:%h -1 > PROJECT_VERSION_PATCH
+      rm -rf .git
+    '';
+  };
+
+  patches = [
+    # Don't fetch stb as we will patch our own
+    ./dont-fetch-stb.patch
+
+    # Can't fetch these torch deps in the sandbox
+    (replaceVars ./git-deps.patch {
+      libgfxd_src = fetchFromGitHub {
+        owner = "glankk";
+        repo = "libgfxd";
+        rev = "96fd3b849f38b3a7c7b7f3ff03c5921d328e6cdf";
+        hash = "sha256-dedZuV0BxU6goT+rPvrofYqTz9pTA/f6eQcsvpDWdvQ=";
+      };
+      spdlog_src = fetchFromGitHub {
+        owner = "gabime";
+        repo = "spdlog";
+        rev = "7e635fca68d014934b4af8a1cf874f63989352b7";
+        hash = "sha256-cxTaOuLXHRU8xMz9gluYz0a93O0ez2xOxbloyc1m1ns=";
+      };
+      yaml-cpp_src = fetchFromGitHub {
+        owner = "jbeder";
+        repo = "yaml-cpp";
+        rev = "28f93bdec6387d42332220afa9558060c8016795";
+        hash = "sha256-59/s4Rqiiw7LKQw0UwH3vOaT/YsNVcoq3vblK0FiO5c=";
+      };
+      tinyxml2_src = srcOnly tinyxml-2;
+    })
+  ];
+
+  # Recent builds enabled LTO which won't build with nix
+  NIX_CFLAGS_COMPILE = "-fno-lto";
+
+  nativeBuildInputs = [
+    cmake
+    copyDesktopItems
+    installShellFiles
+    lsb-release
+    makeWrapper
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    libGL
+    libvorbis
+    libX11
+    libzip
+    nlohmann_json
+    SDL2
+    SDL2_net
+    spdlog
+    tinyxml-2
+    zenity
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DR_LIBS" "${dr_libs}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PRISM" "${prism}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TINYXML2" "${tinyxml-2}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-cpp.src}")
+  ];
+
+  strictDeps = true;
+
+  # Linking fails without this
+  hardeningDisable = [ "format" ];
+
+  preConfigure = ''
+    mkdir stb
+    cp ${stb'} ./stb/${stb'.name}
+    cp ${stb_impl} ./stb/${stb_impl.name}
+    substituteInPlace libultraship/cmake/dependencies/common.cmake \
+      --replace-fail "\''${STB_DIR}" "$(readlink -f ./stb)"
+  '';
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+    --replace-fail "COMMAND git describe --tags" "COMMAND echo $(cat PROJECT_VERSION)" \
+    --replace-fail "COMMAND git log --pretty=format:%h -1" "COMMAND echo $(cat PROJECT_VERSION_PATCH)"
+  '';
+
+  postBuild = ''
+    cp ${sdl_gamecontrollerdb}/share/gamecontrollerdb.txt gamecontrollerdb.txt
+    ./TorchExternal/src/TorchExternal-build/torch pack ../assets spaghetti.o2r o2r
+  '';
+
+  postInstall = ''
+    installBin Spaghettify
+    mkdir -p $out/share/spaghettikart
+    cp -r ../yamls $out/share/spaghettikart/
+    install -Dm644 -t $out/share/spaghettikart {spaghetti.o2r,config.yml,gamecontrollerdb.txt}
+    install -Dm644 ../icon.png $out/share/pixmaps/spaghettikart.png
+    install -Dm644 -t $out/share/licenses/spaghettikart/libgfxd ${libgfxd}/LICENSE
+    install -Dm644 -t $out/share/licenses/spaghettikart/libultraship ../libultraship/LICENSE
+    install -Dm644 -t $out/share/licenses/spaghettikart/thread_pool ${thread_pool}/LICENSE.txt
+  '';
+
+  # Unfortunately, spaghettikart really wants a writable working directory
+  # Create $HOME/.local/share/spaghettikart and symlink required files
+
+  postFixup = ''
+    wrapProgram $out/bin/Spaghettify \
+      --prefix PATH ":" ${lib.makeBinPath [ zenity ]} \
+      --run 'mkdir -p ~/.local/share/spaghettikart' \
+      --run "ln -sf $out/share/spaghettikart/spaghetti.o2r ~/.local/share/spaghettikart/spaghetti.o2r" \
+      --run "ln -sf $out/share/spaghettikart/config.yml ~/.local/share/spaghettikart/config.yml" \
+      --run "ln -sfT $out/share/spaghettikart/yamls ~/.local/share/spaghettikart/yamls" \
+      --run "ln -sf $out/share/spaghettikart/gamecontrollerdb.txt ~/.local/share/spaghettikart/gamecontrollerdb.txt" \
+      --run 'cd ~/.local/share/spaghettikart'
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "spaghettikart";
+      icon = "spaghettikart";
+      exec = "Spaghettify";
+      comment = finalAttrs.meta.description;
+      genericName = "spaghettikart";
+      desktopName = "spaghettikart";
+      categories = [ "Game" ];
+    })
+  ];
+
+  meta = {
+    homepage = "https://github.com/HarbourMasters/SpaghettiKart";
+    description = "Mario Kart 64 PC Port";
+    mainProgram = "Spaghettify";
+    platforms = [ "x86_64-linux" ];
+    maintainers = with lib.maintainers; [ qubitnano ];
+    license = with lib.licenses; [
+      # libultraship, libgfxd, thread_pool, dr_libs, prism-processor
+      mit
+      # Reverse engineering
+      unfree
+    ];
+  };
+})

From 92c3564ea58e35b3cbae8436c94fb3d419e519f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 04:07:56 +0000
Subject: [PATCH 1829/3724] whisparr: 2.0.0.1171 -> 2.0.0.1250

---
 pkgs/by-name/wh/whisparr/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix
index 6c5abdbbc58c..16d30470493d 100644
--- a/pkgs/by-name/wh/whisparr/package.nix
+++ b/pkgs/by-name/wh/whisparr/package.nix
@@ -29,16 +29,16 @@ let
     ."${system}" or (throw "Unsupported system: ${system}");
   hash =
     {
-      arm64-linux-hash = "sha256-by6IRfdcbqwSdL/xddGQssn3Si7kN48W4COjifEBmIs=";
-      arm64-osx-hash = "sha256-HD2D9bb0sv9fYOcTChLLehX3d45vc2qy122IMkuU3Tk=";
-      x64-linux-hash = "sha256-Z4+qUC/MzDdinGEgVy5fodVEOgt49wCC89RYWY/kZHs=";
-      x64-osx-hash = "sha256-8mW/7NQcobAavEaQPeRPXRXKaFdCSLVTjORBhNj+DCo=";
+      arm64-linux-hash = "sha256-UxdqLIaMXSLEMeNKoDBgOIRt72Lmjdl1YCY2U4qNXys=";
+      arm64-osx-hash = "sha256-qufwdptO7WKkAmLi3EO/09XQUX7RLlRPwssq6OovTxY=";
+      x64-linux-hash = "sha256-a1UadZq1UWSFh1VVf3bZVK2wY1hqh59jxgu06Ib6kSc=";
+      x64-osx-hash = "sha256-z9Oo/0Gda4QKiPMxXXE14Be/PhBR8yEvqKY011Et+Yo=";
     }
     ."${arch}-${os}-hash";
 in
 stdenv.mkDerivation rec {
   pname = "whisparr";
-  version = "2.0.0.1171";
+  version = "2.0.0.1250";
 
   src = fetchurl {
     name = "${pname}-${arch}-${os}-${version}.tar.gz";

From 4f0859cb42537ea7ea76fa3c548c53919dcb345f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 04:53:43 +0000
Subject: [PATCH 1830/3724] oh-my-zsh: 2025-08-08 -> 2025-08-16

---
 pkgs/by-name/oh/oh-my-zsh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix
index 287515ced0e9..83b2a8c3474c 100644
--- a/pkgs/by-name/oh/oh-my-zsh/package.nix
+++ b/pkgs/by-name/oh/oh-my-zsh/package.nix
@@ -19,14 +19,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2025-08-08";
+  version = "2025-08-16";
   pname = "oh-my-zsh";
 
   src = fetchFromGitHub {
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    rev = "9d8d4cf41482a95127ca41faecc0a7ee0781ca2e";
-    sha256 = "sha256-u98vvBhGYfvfYmo/J8hBc6bDui5HVlgM3hY32LwJGio=";
+    rev = "736632228a5f39573a15f4533b7672851f30bbe6";
+    sha256 = "sha256-NylC656n3cokbacg0YM8xjKtibBK8vvXG/7G3WXiIQw=";
   };
 
   strictDeps = true;

From 1632dd63ca98aba5eaf5bb1aeec5d78a1d1bfea1 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Sun, 17 Aug 2025 06:57:33 +0200
Subject: [PATCH 1831/3724] markdown-oxide: 0.25.6 -> 0.25.8

Changelog:
https://github.com/Feel-ix-343/markdown-oxide/releases/tag/v0.25.8
Diff:
https://github.com/Feel-ix-343/markdown-oxide/compare/v0.25.6...v0.25.8
---
 pkgs/by-name/ma/markdown-oxide/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/markdown-oxide/package.nix b/pkgs/by-name/ma/markdown-oxide/package.nix
index 16df2f0083e5..c65626c9e0bf 100644
--- a/pkgs/by-name/ma/markdown-oxide/package.nix
+++ b/pkgs/by-name/ma/markdown-oxide/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "markdown-oxide";
-  version = "0.25.6";
+  version = "0.25.8";
 
   src = fetchFromGitHub {
     owner = "Feel-ix-343";
     repo = "markdown-oxide";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GIwvypvfHwOmT5Y01Xho9ClD9PcY+K2PJAd5VPEIr/8=";
+    hash = "sha256-Y3xMiWnLHDVeRn1KbmsC/5yJWhukKFB6X9VHnuEkFU8=";
   };
 
-  cargoHash = "sha256-c6m/sbCbXIYQ5FMm7cdiuMJrX2iz64ZHFiiRuvSGu+Y=";
+  cargoHash = "sha256-M4LwkF031bv7aIC9aEh5bF6Vk/DJt3DH1Rh3dUNopX4=";
 
   meta = {
     description = "Markdown LSP server inspired by Obsidian";

From 21c319142ef82c59c64b3a91a145f6924dbf66f5 Mon Sep 17 00:00:00 2001
From: Shogo Takata <peshogo@gmail.com>
Date: Tue, 1 Jul 2025 09:22:23 +0900
Subject: [PATCH 1832/3724] super-productivity: 14.1.0 -> 14.3.3

---
 pkgs/by-name/su/super-productivity/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix
index 4b4cd3bf46cf..93eb4afb8fe4 100644
--- a/pkgs/by-name/su/super-productivity/package.nix
+++ b/pkgs/by-name/su/super-productivity/package.nix
@@ -14,13 +14,13 @@
 
 buildNpmPackage rec {
   pname = "super-productivity";
-  version = "14.1.0";
+  version = "14.3.3";
 
   src = fetchFromGitHub {
     owner = "johannesjo";
     repo = "super-productivity";
     tag = "v${version}";
-    hash = "sha256-wZQhSQBJPyJPAMZU927Xq9bOxAohSaEg+ylk7DoTJJE=";
+    hash = "sha256-gJ6hG5nAzT708GFMjArN/F1Mz/K4gg1R0QeHmM6jc0c=";
 
     postFetch = ''
       find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \;
@@ -63,7 +63,7 @@ buildNpmPackage rec {
       dontInstall = true;
 
       outputHashMode = "recursive";
-      hash = "sha256-SmA2qTi7tXxUcAlFOI61AW8pimB7YEYe749h5hjtLN8=";
+      hash = "sha256-+e53npbip3BGdw4S6mpkxc9g6AVc+QbJxfPYK6IglSA=";
     }
   );
 
@@ -85,6 +85,14 @@ buildNpmPackage rec {
   buildPhase = ''
     runHook preBuild
 
+    # Npm hooks do not install packages for the plugins. The build
+    # script does install the packages, but it does not handle patching
+    # the shebangs.
+    find packages -name package-lock.json | while read -r p; do
+      npm --prefix "$(dirname $p)" ci --ignore-scripts
+    done
+    patchShebangs packages
+
     # electronDist needs to be modifiable on Darwin
     cp -r ${electron.dist} electron-dist
     chmod -R u+w electron-dist

From 512f5d86de9a0dc12cea628fa66b7964cf820392 Mon Sep 17 00:00:00 2001
From: Cryolitia PukNgae <cryolitia@gmail.com>
Date: Sun, 17 Aug 2025 13:33:34 +0800
Subject: [PATCH 1833/3724] gridtracker2: 2.250809.0 -> 2.250815.0

---
 .../by-name/gr/gridtracker2/package-lock.json | 109 +-----------------
 pkgs/by-name/gr/gridtracker2/package.nix      |   6 +-
 2 files changed, 5 insertions(+), 110 deletions(-)

diff --git a/pkgs/by-name/gr/gridtracker2/package-lock.json b/pkgs/by-name/gr/gridtracker2/package-lock.json
index 0a5da9290b8e..e4cb369d718c 100644
--- a/pkgs/by-name/gr/gridtracker2/package-lock.json
+++ b/pkgs/by-name/gr/gridtracker2/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "GridTracker2",
-  "version": "2.250809.0",
+  "version": "2.250815.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "GridTracker2",
-      "version": "2.250809.0",
+      "version": "2.250815.0",
       "hasInstallScript": true,
       "dependencies": {
         "@electron-toolkit/preload": "3.0.1",
@@ -583,72 +583,6 @@
         "node": ">= 10.0.0"
       }
     },
-    "node_modules/@electron/windows-sign": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.2.tgz",
-      "integrity": "sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "cross-dirname": "^0.1.0",
-        "debug": "^4.3.4",
-        "fs-extra": "^11.1.1",
-        "minimist": "^1.2.8",
-        "postject": "^1.0.0-alpha.6"
-      },
-      "bin": {
-        "electron-windows-sign": "bin/electron-windows-sign.js"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/@electron/windows-sign/node_modules/fs-extra": {
-      "version": "11.3.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz",
-      "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/@electron/windows-sign/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@electron/windows-sign/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
@@ -2369,15 +2303,6 @@
         "buffer": "^5.1.0"
       }
     },
-    "node_modules/cross-dirname": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz",
-      "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -5422,36 +5347,6 @@
         "node": ">=10.4.0"
       }
     },
-    "node_modules/postject": {
-      "version": "1.0.0-alpha.6",
-      "resolved": "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz",
-      "integrity": "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "commander": "^9.4.0"
-      },
-      "bin": {
-        "postject": "dist/cli.js"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/postject/node_modules/commander": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
-      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": "^12.20.0 || >=14"
-      }
-    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
diff --git a/pkgs/by-name/gr/gridtracker2/package.nix b/pkgs/by-name/gr/gridtracker2/package.nix
index 7de7199e73c3..ee345e3fe650 100644
--- a/pkgs/by-name/gr/gridtracker2/package.nix
+++ b/pkgs/by-name/gr/gridtracker2/package.nix
@@ -18,7 +18,7 @@
   xorg,
 }:
 let
-  version = "2.250809.0";
+  version = "2.250815.0";
   electron = electron_35;
 in
 buildNpmPackage (finalAttrs: {
@@ -29,10 +29,10 @@ buildNpmPackage (finalAttrs: {
     owner = "gridtracker.org";
     repo = "gridtracker2";
     tag = "v${version}";
-    hash = "sha256-JvV0APwbANjPX/IN3ZV8ccsKBLixntQ2ZAzjWtN7/L4=";
+    hash = "sha256-GBMnBL+8HGMusO2D0qy0TXWvIFw1fD1Bd0PXhkJ5O1o=";
   };
 
-  npmDepsHash = "sha256-on3v+kBOUEVsEX/HwJhtzPn8AlXNa+EcbolMl0F7ZXI=";
+  npmDepsHash = "sha256-8eJAjf/McFTgLA1gAANX8L93h1SDnf0XdAeqmcLiPF0=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

From 76a2fc6e37a70ca002d4baac6b7aeaf1e8de62fd Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 17 Aug 2025 13:44:37 +0800
Subject: [PATCH 1834/3724] ruri: 3.8 -> 3.9.1

---
 pkgs/by-name/ru/ruri/cmake-install.patch | 20 ++++++++++++++++++++
 pkgs/by-name/ru/ruri/package.nix         | 24 +++++++++++++-----------
 2 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/by-name/ru/ruri/cmake-install.patch

diff --git a/pkgs/by-name/ru/ruri/cmake-install.patch b/pkgs/by-name/ru/ruri/cmake-install.patch
new file mode 100644
index 000000000000..668a594d7be5
--- /dev/null
+++ b/pkgs/by-name/ru/ruri/cmake-install.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -201,7 +201,7 @@
+     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+     add_library(ruri SHARED ${SOURCES})
+-    install (TARGETS ruri DESTINATION /usr/lib/)
++    install (TARGETS ruri)
+ else ()
+ # add the executable
+     set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
+@@ -215,7 +215,7 @@
+             VERBATIM
+         )
+     endif()
+-    install (TARGETS ruri DESTINATION /usr/bin/)
++    install (TARGETS ruri)
+ endif()
+ 
+ add_custom_target(
diff --git a/pkgs/by-name/ru/ruri/package.nix b/pkgs/by-name/ru/ruri/package.nix
index ed39092e3688..c7a5a63cbf1e 100644
--- a/pkgs/by-name/ru/ruri/package.nix
+++ b/pkgs/by-name/ru/ruri/package.nix
@@ -4,36 +4,38 @@
   fetchFromGitHub,
   libcap,
   libseccomp,
+  cmake,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ruri";
-  version = "3.8";
+  version = "3.9.1";
 
   src = fetchFromGitHub {
-    owner = "Moe-hacker";
+    owner = "RuriOSS";
     repo = "ruri";
-    rev = "v${finalAttrs.version}";
-    fetchSubmodules = false;
-    sha256 = "sha256-gf+WJPGeLbMntBk8ryTSsV9L4J3N4Goh9eWBIBj5FA4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-stM4hSLdSqmYUZ/XBD3Y1GylrrGRISlcy8LN07HREpQ=";
   };
 
+  patches = [
+    ./cmake-install.patch
+  ];
+
   buildInputs = [
     libcap
     libseccomp
   ];
 
-  installPhase = ''
-    runHook preInstall
-    install -Dm755 ruri $out/bin/ruri
-    runHook postInstall
-  '';
+  nativeBuildInputs = [
+    cmake
+  ];
 
   meta = {
     description = "Self-contained Linux container implementation";
     homepage = "https://wiki.crack.moe/ruri";
     downloadPage = "https://github.com/Moe-hacker/ruri";
-    changelog = "https://github.com/Moe-hacker/ruri/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/Moe-hacker/ruri/releases/tag/${finalAttrs.src.tag}";
     mainProgram = "ruri";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;

From 114ac464b2c951c2e11a9e8ef29fc6b8570b6a8d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 05:57:02 +0000
Subject: [PATCH 1835/3724] plasticity: 25.2.2 -> 25.2.4

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

diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix
index d04a9b4f264f..efe87b24fe22 100644
--- a/pkgs/by-name/pl/plasticity/package.nix
+++ b/pkgs/by-name/pl/plasticity/package.nix
@@ -34,11 +34,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "plasticity";
-  version = "25.2.2";
+  version = "25.2.4";
 
   src = fetchurl {
     url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm";
-    hash = "sha256-qzkzW2ekYFF6aE6mH6jZ9Ta5BLvqVb3ZRA5Q5SBttpk=";
+    hash = "sha256-XBjKVAwdCJdfhKw8LigBEUp3UiAF/wgvcSlc+vh00P0=";
   };
 
   passthru.updateScript = ./update.sh;

From bb15f0f06fb60b0d0cddab32e6d1793d4398a665 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 06:48:35 +0000
Subject: [PATCH 1836/3724] syncstorage-rs: 0.19.1 -> 0.20.0

---
 pkgs/by-name/sy/syncstorage-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix
index 4eb3bc70888b..7e361abeb4de 100644
--- a/pkgs/by-name/sy/syncstorage-rs/package.nix
+++ b/pkgs/by-name/sy/syncstorage-rs/package.nix
@@ -22,13 +22,13 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "syncstorage-rs";
-  version = "0.19.1";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "mozilla-services";
     repo = "syncstorage-rs";
     tag = version;
-    hash = "sha256-UEBF0z2gn9Jpj6IefvB5XMwt21uuD5PlpHj7Ow7yf/Y=";
+    hash = "sha256-K4oVobACVLc99WNageaXrkJDeNAn8JQNykhcLZdNYck=";
   };
 
   nativeBuildInputs = [
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
       --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]}
   '';
 
-  cargoHash = "sha256-fkVqyA296BmK+jK9yJ0gj0V7CThv021AxNMCMFdr8fg=";
+  cargoHash = "sha256-xKLSsTI7Uo1MdTMxp04PW31Fai4tmPLMR3IgiGZD45U=";
 
   # almost all tests need a DB to test against
   doCheck = false;

From 394cd67229c4858afc1b0d2f156e65cf7d63d148 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 07:11:23 +0000
Subject: [PATCH 1837/3724] python3Packages.mcp: 1.12.4 -> 1.13.0

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

diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix
index 97ab3ceefe0c..b1d0db042282 100644
--- a/pkgs/development/python-modules/mcp/default.nix
+++ b/pkgs/development/python-modules/mcp/default.nix
@@ -40,14 +40,14 @@
 
 buildPythonPackage rec {
   pname = "mcp";
-  version = "1.12.4";
+  version = "1.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "modelcontextprotocol";
     repo = "python-sdk";
     tag = "v${version}";
-    hash = "sha256-FHVhufv4O7vM/9fNHyDU4L15dNLFMmoVaYd98Iw6l2o=";
+    hash = "sha256-CxrUGgQfU1R87D3ZzZCHbQBMIOJRneH6CLbHS62sCaY=";
   };
 
   postPatch = ''

From b1ff0e555ee2151ac242829bfc0b62e50ba5d055 Mon Sep 17 00:00:00 2001
From: sparks <sparky3387@github.com>
Date: Sun, 17 Aug 2025 17:32:08 +1000
Subject: [PATCH 1838/3724] haruna: add kdePackages.kdeclarative to buildInputs

---
 pkgs/by-name/ha/haruna/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ha/haruna/package.nix b/pkgs/by-name/ha/haruna/package.nix
index 220d54c80a8c..467a6427dbeb 100644
--- a/pkgs/by-name/ha/haruna/package.nix
+++ b/pkgs/by-name/ha/haruna/package.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
     ffmpeg-headless
     kdePackages.kconfig
     kdePackages.kcoreaddons
+    kdePackages.kdeclarative
     kdePackages.kfilemetadata
     kdePackages.ki18n
     kdePackages.kiconthemes

From d0a4a13e9852bc8118d304b37a12027ba11e95f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 07:56:23 +0000
Subject: [PATCH 1839/3724] vscode-extensions.coder.coder-remote: 1.10.0 ->
 1.10.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 8b439517c520..a31190f01e51 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1020,8 +1020,8 @@ let
         mktplcRef = {
           name = "coder-remote";
           publisher = "coder";
-          version = "1.10.0";
-          hash = "sha256-DMlWWJQNHJDBio71DkSl10/8KvuQxUQDIm0FJS1iEWQ=";
+          version = "1.10.1";
+          hash = "sha256-TD2lWGZCKTj9qbwV9elue+jyoQLEOmPBuePpOXH8wEg=";
         };
         meta = {
           description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click";

From d42b40365815c89ec8128cef193c541c464fe4c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 08:00:02 +0000
Subject: [PATCH 1840/3724] vscode-extensions.xdebug.php-debug: 1.36.1 ->
 1.37.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 8b439517c520..d349d814e12a 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5411,8 +5411,8 @@ let
         mktplcRef = {
           name = "php-debug";
           publisher = "xdebug";
-          version = "1.36.1";
-          hash = "sha256-4r3mf7q6n1b/cVYIGZyRNK5nEAJYzTz4cJrKNH+R01s=";
+          version = "1.37.0";
+          hash = "sha256-7Dz8i66tWPStk2fgFdZPY2Jz3j4IquJVyQbSnV+SVpk=";
         };
         meta = {
           description = "PHP Debug Adapter";

From 82d3012d20008f73311c9c69d179baf35fad5e77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 08:15:29 +0000
Subject: [PATCH 1841/3724] vscode-extensions.unifiedjs.vscode-mdx: 1.8.15 ->
 1.8.16

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 8b439517c520..eb66b89d7c47 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4947,8 +4947,8 @@ let
         mktplcRef = {
           name = "vscode-mdx";
           publisher = "unifiedjs";
-          version = "1.8.15";
-          hash = "sha256-n2aWgvhSaU7TU45yeIUU8OmIMOAVYYB500jxrChPeA4=";
+          version = "1.8.16";
+          hash = "sha256-OTlWvbym109IG6Fqkte5jbFMDVbQMn0CXVI3bnnFa+o=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/unifiedjs.vscode-mdx/changelog";

From bb24041a1c09fc77ba869c08c0142ca94e33b6e1 Mon Sep 17 00:00:00 2001
From: Bryan Lai <bryanlais@gmail.com>
Date: Sun, 17 Aug 2025 13:57:47 +0800
Subject: [PATCH 1842/3724] grpc: drop patch to fix build for 1.74 on darwin

---
 pkgs/by-name/gr/grpc/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix
index f863c0b3f77b..34c33d2b8f52 100644
--- a/pkgs/by-name/gr/grpc/package.nix
+++ b/pkgs/by-name/gr/grpc/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  fetchurl,
   buildPackages,
   cmake,
   zlib,
@@ -54,11 +53,6 @@ stdenv.mkDerivation rec {
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # fix build of 1.63.0 and newer on darwin: https://github.com/grpc/grpc/issues/36654
     ./dynamic-lookup-darwin.patch
-    # https://github.com/grpc/grpc/issues/39170
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/rdhafidh/vcpkg/0ae97b7b81562bd66ab99d022551db1449c079f9/ports/grpc/00017-add-src-upb.patch";
-      hash = "sha256-0zaJqeCM90DTtUR6xCUorahUpiJF3D/KODYkUXQh2ok=";
-    })
   ];
 
   nativeBuildInputs = [

From e28460ba46b0c85d67e8cd8afae08fb5b2bc0793 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 08:21:18 +0000
Subject: [PATCH 1843/3724] vscode-extensions.fstarlang.fstar-vscode-assistant:
 0.19.1 -> 0.19.2

---
 .../extensions/fstarlang.fstar-vscode-assistant/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix
index d604dd014e56..e1c5cc20ea35 100644
--- a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "fstar-vscode-assistant";
     publisher = "FStarLang";
-    version = "0.19.1";
-    hash = "sha256-bC9Kzhp4H9wykuitEKQUthYVhmVI/m8H0PloBqoFbvU=";
+    version = "0.19.2";
+    hash = "sha256-4EerlsxIBjKIpeSS388Nw40eD5tBL+cN5uNAsfu+gio=";
   };
   meta = {
     description = "Interactive editing mode VS Code extension for F*";

From 20c15f522771ecdde95be5cb62e4d1cbaf7d1c8d Mon Sep 17 00:00:00 2001
From: Shogo Takata <peshogo@gmail.com>
Date: Tue, 12 Aug 2025 17:37:42 -0700
Subject: [PATCH 1844/3724] circt: 1.125.0 -> 1.128.0

Updates circt.
The previous PR broke tests for x86_64-darwin.
https://github.com/NixOS/nixpkgs/pull/429956
This commit should fix the issue.
---
 pkgs/by-name/ci/circt/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix
index 282079be6889..be310ab7754b 100644
--- a/pkgs/by-name/ci/circt/package.nix
+++ b/pkgs/by-name/ci/circt/package.nix
@@ -19,12 +19,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "circt";
-  version = "1.125.0";
+  version = "1.128.0";
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "circt";
     rev = "firtool-${version}";
-    hash = "sha256-bpQvBUSYpmv6bmgXSCz9pfGgFxlGVFFDfaSkvk7481E=";
+    hash = "sha256-pIuBIl1iZRuqjy7CPfsTnR82Fq7iH22TtpbSk4oBshQ=";
     fetchSubmodules = true;
   };
 
@@ -75,6 +75,7 @@ stdenv.mkDerivation rec {
           "CIRCT :: circt-as-dis/.*\\.mlir"
           "CIRCT :: circt-reduce/.*\\.mlir"
           "CIRCT :: circt-test/basic.mlir"
+          "CIRCT :: firld/.*\\.mlir"
         ]
         ++ [
           # Temporarily disable for bump: https://github.com/llvm/circt/issues/8000

From a55403d20fbf82a4887063e5f58b5533c9f2e331 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 7 Aug 2025 12:43:12 +0200
Subject: [PATCH 1845/3724] invoiceplane: 1.6.2 -> 1.6.3

---
 .../in/invoiceplane/fix-yarn-lock.patch       |  651 ++++
 .../fix_composer_validation.patch             |   34 +
 .../in/invoiceplane/node_switch_to_sass.patch | 3022 -----------------
 pkgs/by-name/in/invoiceplane/package.nix      |   22 +-
 4 files changed, 696 insertions(+), 3033 deletions(-)
 create mode 100644 pkgs/by-name/in/invoiceplane/fix-yarn-lock.patch
 create mode 100644 pkgs/by-name/in/invoiceplane/fix_composer_validation.patch
 delete mode 100644 pkgs/by-name/in/invoiceplane/node_switch_to_sass.patch

diff --git a/pkgs/by-name/in/invoiceplane/fix-yarn-lock.patch b/pkgs/by-name/in/invoiceplane/fix-yarn-lock.patch
new file mode 100644
index 000000000000..8398ad956450
--- /dev/null
+++ b/pkgs/by-name/in/invoiceplane/fix-yarn-lock.patch
@@ -0,0 +1,651 @@
+diff --git a/yarn.lock b/yarn.lock
+index 691942c1..6d3bd8ce 100644
+--- a/yarn.lock
++++ b/yarn.lock
+@@ -2,11 +2,71 @@
+ # yarn lockfile v1
+ 
+ 
++"@parcel/watcher-android-arm64@2.5.1":
++  version "2.5.1"
++  resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz#507f836d7e2042f798c7d07ad19c3546f9848ac1"
++  integrity sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==
++
++"@parcel/watcher-darwin-arm64@2.5.1":
++  version "2.5.1"
++  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz#3d26dce38de6590ef79c47ec2c55793c06ad4f67"
++  integrity sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==
++
++"@parcel/watcher-darwin-x64@2.5.1":
++  version "2.5.1"
++  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz#99f3af3869069ccf774e4ddfccf7e64fd2311ef8"
++  integrity sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==
++
++"@parcel/watcher-freebsd-x64@2.5.1":
++  version "2.5.1"
++  resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz#14d6857741a9f51dfe51d5b08b7c8afdbc73ad9b"
++  integrity sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==
++
++"@parcel/watcher-linux-arm-glibc@2.5.1":
++  version "2.5.1"
++  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz#43c3246d6892381db473bb4f663229ad20b609a1"
++  integrity sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==
++
++"@parcel/watcher-linux-arm-musl@2.5.1":
++  version "2.5.1"
++  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz#663750f7090bb6278d2210de643eb8a3f780d08e"
++  integrity sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==
++
++"@parcel/watcher-linux-arm64-glibc@2.5.1":
++  version "2.5.1"
++  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz#ba60e1f56977f7e47cd7e31ad65d15fdcbd07e30"
++  integrity sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==
++
++"@parcel/watcher-linux-arm64-musl@2.5.1":
++  version "2.5.1"
++  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz#f7fbcdff2f04c526f96eac01f97419a6a99855d2"
++  integrity sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==
++
+ "@parcel/watcher-linux-x64-glibc@2.5.1":
+   version "2.5.1"
+   resolved "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz"
+   integrity sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==
+ 
++"@parcel/watcher-linux-x64-musl@2.5.1":
++  version "2.5.1"
++  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz#277b346b05db54f55657301dd77bdf99d63606ee"
++  integrity sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==
++
++"@parcel/watcher-win32-arm64@2.5.1":
++  version "2.5.1"
++  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz#7e9e02a26784d47503de1d10e8eab6cceb524243"
++  integrity sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==
++
++"@parcel/watcher-win32-ia32@2.5.1":
++  version "2.5.1"
++  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz#2d0f94fa59a873cdc584bf7f6b1dc628ddf976e6"
++  integrity sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==
++
++"@parcel/watcher-win32-x64@2.5.1":
++  version "2.5.1"
++  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz#ae52693259664ba6f2228fa61d7ee44b64ea0947"
++  integrity sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==
++
+ "@parcel/watcher@^2.4.1":
+   version "2.5.1"
+   resolved "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz"
+@@ -105,7 +165,9 @@ async@^2.6.0:
+     lodash "^4.17.14"
+ 
+ async@^3.2.3, async@~3.2.0:
+-  version "3.2.5"
++  version "3.2.6"
++  resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
++  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
+ 
+ autoprefixer@9.8:
+   version "9.8.8"
+@@ -155,33 +217,48 @@ brace-expansion@^1.1.7:
+     balanced-match "^1.0.0"
+     concat-map "0.0.1"
+ 
+-braces@^3.0.2:
+-  version "3.0.2"
++braces@^3.0.3:
++  version "3.0.3"
++  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
++  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+   dependencies:
+-    fill-range "^7.0.1"
++    fill-range "^7.1.1"
+ 
+-browserslist@^4.12.0, "browserslist@>= 4.21.0":
+-  version "4.22.1"
++browserslist@^4.12.0:
++  version "4.25.1"
++  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.25.1.tgz#ba9e8e6f298a1d86f829c9b975e07948967bb111"
++  integrity sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==
+   dependencies:
+-    caniuse-lite "^1.0.30001541"
+-    electron-to-chromium "^1.4.535"
+-    node-releases "^2.0.13"
+-    update-browserslist-db "^1.0.13"
++    caniuse-lite "^1.0.30001726"
++    electron-to-chromium "^1.5.173"
++    node-releases "^2.0.19"
++    update-browserslist-db "^1.1.3"
+ 
+ bytes@1:
+   version "1.0.0"
+   resolved "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"
+   integrity sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==
+ 
+-call-bind@^1.0.0:
+-  version "1.0.5"
++call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
++  version "1.0.2"
++  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
++  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
+   dependencies:
++    es-errors "^1.3.0"
+     function-bind "^1.1.2"
+-    get-intrinsic "^1.2.1"
+-    set-function-length "^1.1.1"
+ 
+-caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001541:
+-  version "1.0.30001561"
++call-bound@^1.0.2:
++  version "1.0.4"
++  resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
++  integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
++  dependencies:
++    call-bind-apply-helpers "^1.0.2"
++    get-intrinsic "^1.3.0"
++
++caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001726:
++  version "1.0.30001731"
++  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001731.tgz#277c07416ea4613ec564e5b0ffb47e7b60f32e2f"
++  integrity sha512-lDdp2/wrOmTRWuoB5DpfNkC0rJDU8DqRa6nYL6HK6sytw70QMopt/NIc/9SM7ylItlBWfACXk0tEn37UWM/+mg==
+ 
+ chalk@^1.1.1:
+   version "1.1.3"
+@@ -241,16 +318,16 @@ color-convert@^2.0.1:
+   dependencies:
+     color-name "~1.1.4"
+ 
+-color-name@~1.1.4:
+-  version "1.1.4"
+-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+-
+ color-name@1.1.3:
+   version "1.1.3"
+   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
+   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
+ 
++color-name@~1.1.4:
++  version "1.1.4"
++  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
++  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
++
+ colors@~1.1.2:
+   version "1.1.2"
+   resolved "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"
+@@ -278,13 +355,6 @@ debug@^3.1.0:
+   dependencies:
+     ms "^2.1.1"
+ 
+-define-data-property@^1.1.1:
+-  version "1.1.1"
+-  dependencies:
+-    get-intrinsic "^1.2.1"
+-    gopd "^1.0.1"
+-    has-property-descriptors "^1.0.0"
+-
+ delegate@^3.1.2:
+   version "3.2.0"
+   resolved "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz"
+@@ -310,13 +380,24 @@ dropzone@5.9:
+   resolved "https://registry.npmjs.org/dropzone/-/dropzone-5.9.3.tgz"
+   integrity sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA==
+ 
++dunder-proto@^1.0.1:
++  version "1.0.1"
++  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
++  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
++  dependencies:
++    call-bind-apply-helpers "^1.0.1"
++    es-errors "^1.3.0"
++    gopd "^1.2.0"
++
+ duplexer@^0.1.1:
+   version "0.1.2"
+   resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
+   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
+ 
+-electron-to-chromium@^1.4.535:
+-  version "1.4.576"
++electron-to-chromium@^1.5.173:
++  version "1.5.198"
++  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.198.tgz#ac12b539ac1bb3dece1a4cd2d8882d0349c71c55"
++  integrity sha512-G5COfnp3w+ydVu80yprgWSfmfQaYRh9DOxfhAxstLyetKaLyl55QrNjx8C38Pc/C+RaDmb1M0Lk8wPEMQ+bGgQ==
+ 
+ error@^7.0.0:
+   version "7.2.1"
+@@ -325,8 +406,27 @@ error@^7.0.0:
+   dependencies:
+     string-template "~0.2.1"
+ 
+-escalade@^3.1.1:
+-  version "3.1.1"
++es-define-property@^1.0.1:
++  version "1.0.1"
++  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
++  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
++
++es-errors@^1.3.0:
++  version "1.3.0"
++  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
++  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
++
++es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
++  version "1.1.1"
++  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
++  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
++  dependencies:
++    es-errors "^1.3.0"
++
++escalade@^3.2.0:
++  version "3.2.0"
++  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
++  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
+ 
+ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+   version "1.0.5"
+@@ -379,8 +479,10 @@ file-sync-cmp@^0.1.0:
+   resolved "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz"
+   integrity sha512-0k45oWBokCqh2MOexeYKpyqmGKG+8mQ2Wd8iawx+uWd/weWJQAZ6SoPybagdCI4xFisag8iAR77WPm4h3pTfxA==
+ 
+-fill-range@^7.0.1:
+-  version "7.0.1"
++fill-range@^7.1.1:
++  version "7.1.1"
++  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
++  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
+   dependencies:
+     to-regex-range "^5.0.1"
+ 
+@@ -461,13 +563,29 @@ gaze@^1.1.0:
+   dependencies:
+     globule "^1.0.0"
+ 
+-get-intrinsic@^1.0.2, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2:
+-  version "1.2.2"
++get-intrinsic@^1.2.5, get-intrinsic@^1.3.0:
++  version "1.3.0"
++  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
++  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
+   dependencies:
++    call-bind-apply-helpers "^1.0.2"
++    es-define-property "^1.0.1"
++    es-errors "^1.3.0"
++    es-object-atoms "^1.1.1"
+     function-bind "^1.1.2"
+-    has-proto "^1.0.1"
+-    has-symbols "^1.0.3"
+-    hasown "^2.0.0"
++    get-proto "^1.0.1"
++    gopd "^1.2.0"
++    has-symbols "^1.1.0"
++    hasown "^2.0.2"
++    math-intrinsics "^1.1.0"
++
++get-proto@^1.0.1:
++  version "1.0.1"
++  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
++  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
++  dependencies:
++    dunder-proto "^1.0.1"
++    es-object-atoms "^1.0.0"
+ 
+ getobject@~1.0.0:
+   version "1.0.2"
+@@ -486,19 +604,7 @@ glob@^7.1.3:
+     once "^1.3.0"
+     path-is-absolute "^1.0.0"
+ 
+-glob@~7.1.1:
+-  version "7.1.7"
+-  resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
+-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+-  dependencies:
+-    fs.realpath "^1.0.0"
+-    inflight "^1.0.4"
+-    inherits "2"
+-    minimatch "^3.0.4"
+-    once "^1.3.0"
+-    path-is-absolute "^1.0.0"
+-
+-glob@~7.1.6:
++glob@~7.1.1, glob@~7.1.6:
+   version "7.1.7"
+   resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
+   integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+@@ -546,10 +652,10 @@ good-listener@^1.2.2:
+   dependencies:
+     delegate "^3.1.2"
+ 
+-gopd@^1.0.1:
+-  version "1.0.1"
+-  dependencies:
+-    get-intrinsic "^1.1.3"
++gopd@^1.2.0:
++  version "1.2.0"
++  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
++  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
+ 
+ grunt-cli@~1.4.3:
+   version "1.4.3"
+@@ -656,7 +762,7 @@ grunt-sass@3.1:
+   resolved "https://registry.npmjs.org/grunt-sass/-/grunt-sass-3.1.0.tgz"
+   integrity sha512-90s27H7FoCDcA8C8+R0GwC+ntYD3lG6S/jqcavWm3bn9RiJTmSfOvfbFa1PXx4NbBWuiGQMLfQTj/JvvqT5w6A==
+ 
+-grunt@>=0.4.5, grunt@>=1, grunt@>=1.4.1, grunt@1.6:
++grunt@1.6:
+   version "1.6.1"
+   resolved "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz"
+   integrity sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==
+@@ -700,21 +806,15 @@ has-flag@^4.0.0:
+   resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
+   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+ 
+-has-property-descriptors@^1.0.0:
+-  version "1.0.1"
+-  dependencies:
+-    get-intrinsic "^1.2.2"
+-
+-has-proto@^1.0.1:
+-  version "1.0.1"
+-
+-has-symbols@^1.0.3:
+-  version "1.0.3"
+-  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
+-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
++has-symbols@^1.1.0:
++  version "1.1.0"
++  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
++  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
+ 
+-hasown@^2.0.0:
+-  version "2.0.0"
++hasown@^2.0.2:
++  version "2.0.2"
++  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
++  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+   dependencies:
+     function-bind "^1.1.2"
+ 
+@@ -784,9 +884,11 @@ is-absolute@^1.0.0:
+     is-windows "^1.0.1"
+ 
+ is-core-module@^2.13.0:
+-  version "2.13.1"
++  version "2.16.1"
++  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
++  integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
+   dependencies:
+-    hasown "^2.0.0"
++    hasown "^2.0.2"
+ 
+ is-extglob@^2.1.1:
+   version "2.1.1"
+@@ -848,7 +950,7 @@ jquery-ui@1.14:
+   dependencies:
+     jquery ">=1.12.0 <5.0.0"
+ 
+-"jquery@>=1.12.0 <5.0.0", "jquery@>=3.4.0 <4.0.0", jquery@3.7:
++jquery@3.7, "jquery@>=1.12.0 <5.0.0", "jquery@>=3.4.0 <4.0.0":
+   version "3.7.1"
+   resolved "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz"
+   integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
+@@ -925,6 +1027,11 @@ map-cache@^0.2.0:
+   resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"
+   integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
+ 
++math-intrinsics@^1.1.0:
++  version "1.1.0"
++  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
++  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
++
+ maxmin@^3.0.0:
+   version "3.0.0"
+   resolved "https://registry.npmjs.org/maxmin/-/maxmin-3.0.0.tgz"
+@@ -936,9 +1043,11 @@ maxmin@^3.0.0:
+     pretty-bytes "^5.3.0"
+ 
+ micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
+-  version "4.0.5"
++  version "4.0.8"
++  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
++  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
+   dependencies:
+-    braces "^3.0.2"
++    braces "^3.0.3"
+     picomatch "^2.3.1"
+ 
+ minimatch@^3.0.4, minimatch@^3.1.1:
+@@ -948,14 +1057,7 @@ minimatch@^3.0.4, minimatch@^3.1.1:
+   dependencies:
+     brace-expansion "^1.1.7"
+ 
+-minimatch@~3.0.2:
+-  version "3.0.8"
+-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz"
+-  integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==
+-  dependencies:
+-    brace-expansion "^1.1.7"
+-
+-minimatch@~3.0.4:
++minimatch@~3.0.2, minimatch@~3.0.4:
+   version "3.0.8"
+   resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz"
+   integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==
+@@ -979,15 +1081,19 @@ multimatch@^4.0.0:
+     minimatch "^3.0.4"
+ 
+ nanoid@^3.3.7:
+-  version "3.3.7"
++  version "3.3.11"
++  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
++  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
+ 
+ node-addon-api@^7.0.0:
+   version "7.1.1"
+   resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz"
+   integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
+ 
+-node-releases@^2.0.13:
+-  version "2.0.13"
++node-releases@^2.0.19:
++  version "2.0.19"
++  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314"
++  integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==
+ 
+ nopt@~3.0.6:
+   version "3.0.6"
+@@ -1019,8 +1125,10 @@ object-assign@^4.1.0:
+   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
+   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
+ 
+-object-inspect@^1.9.0:
+-  version "1.13.1"
++object-inspect@^1.13.3:
++  version "1.13.4"
++  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
++  integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
+ 
+ object.defaults@^1.1.0:
+   version "1.1.0"
+@@ -1137,12 +1245,9 @@ picocolors@^0.2.1:
+   resolved "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"
+   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
+ 
+-picocolors@^1.0.0:
+-  version "1.0.0"
+-
+-picocolors@^1.1.0:
++picocolors@^1.1.1:
+   version "1.1.1"
+-  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz"
++  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
+ 
+ picomatch@^2.3.1:
+@@ -1167,6 +1272,15 @@ postcss-value-parser@^4.1.0:
+   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
+   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
+ 
++postcss@8.4:
++  version "8.4.49"
++  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
++  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
++  dependencies:
++    nanoid "^3.3.7"
++    picocolors "^1.1.1"
++    source-map-js "^1.2.1"
++
+ postcss@^6.0.11:
+   version "6.0.23"
+   resolved "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz"
+@@ -1184,22 +1298,17 @@ postcss@^7.0.32:
+     picocolors "^0.2.1"
+     source-map "^0.6.1"
+ 
+-postcss@8.4:
+-  version "8.4.47"
+-  dependencies:
+-    nanoid "^3.3.7"
+-    picocolors "^1.1.0"
+-    source-map-js "^1.2.1"
+-
+ pretty-bytes@^5.3.0:
+   version "5.6.0"
+   resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"
+   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
+ 
+ qs@^6.4.0:
+-  version "6.11.2"
++  version "6.14.0"
++  resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930"
++  integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==
+   dependencies:
+-    side-channel "^1.0.4"
++    side-channel "^1.1.0"
+ 
+ raw-body@~1.1.0:
+   version "1.1.7"
+@@ -1283,32 +1392,57 @@ sass@^1.89.2:
+   optionalDependencies:
+     "@parcel/watcher" "^2.4.1"
+ 
++select2@4.1.0-rc.0:
++  version "4.1.0-rc.0"
++  resolved "https://registry.npmjs.org/select2/-/select2-4.1.0-rc.0.tgz"
++  integrity sha512-Hr9TdhyHCZUtwznEH2CBf7967mEM0idtJ5nMtjvk3Up5tPukOLXbHUNmh10oRfeNIhj+3GD3niu+g6sVK+gK0A==
++
+ select@^1.1.2:
+   version "1.1.2"
+   resolved "https://registry.npmjs.org/select/-/select-1.1.2.tgz"
+   integrity sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==
+ 
+-select2@4.1.0-rc.0:
+-  version "4.1.0-rc.0"
+-  resolved "https://registry.npmjs.org/select2/-/select2-4.1.0-rc.0.tgz"
+-  integrity sha512-Hr9TdhyHCZUtwznEH2CBf7967mEM0idtJ5nMtjvk3Up5tPukOLXbHUNmh10oRfeNIhj+3GD3niu+g6sVK+gK0A==
++side-channel-list@^1.0.0:
++  version "1.0.0"
++  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
++  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
++  dependencies:
++    es-errors "^1.3.0"
++    object-inspect "^1.13.3"
+ 
+-set-function-length@^1.1.1:
+-  version "1.1.1"
++side-channel-map@^1.0.1:
++  version "1.0.1"
++  resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
++  integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
+   dependencies:
+-    define-data-property "^1.1.1"
+-    get-intrinsic "^1.2.1"
+-    gopd "^1.0.1"
+-    has-property-descriptors "^1.0.0"
++    call-bound "^1.0.2"
++    es-errors "^1.3.0"
++    get-intrinsic "^1.2.5"
++    object-inspect "^1.13.3"
+ 
+-side-channel@^1.0.4:
+-  version "1.0.4"
++side-channel-weakmap@^1.0.2:
++  version "1.0.2"
++  resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"
++  integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
++  dependencies:
++    call-bound "^1.0.2"
++    es-errors "^1.3.0"
++    get-intrinsic "^1.2.5"
++    object-inspect "^1.13.3"
++    side-channel-map "^1.0.1"
++
++side-channel@^1.1.0:
++  version "1.1.0"
++  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
++  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
+   dependencies:
+-    call-bind "^1.0.0"
+-    get-intrinsic "^1.0.2"
+-    object-inspect "^1.9.0"
++    es-errors "^1.3.0"
++    object-inspect "^1.13.3"
++    side-channel-list "^1.0.0"
++    side-channel-map "^1.0.1"
++    side-channel-weakmap "^1.0.2"
+ 
+-source-map-js@^1.2.1, "source-map-js@>=0.6.2 <2.0.0":
++"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.2.1:
+   version "1.2.1"
+   resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz"
+   integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
+@@ -1333,16 +1467,16 @@ sprintf-js@~1.0.2:
+   resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
+   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
+ 
+-string_decoder@0.10:
+-  version "0.10.31"
+-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+-  integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
+-
+ string-template@~0.2.1:
+   version "0.2.1"
+   resolved "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz"
+   integrity sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==
+ 
++string_decoder@0.10:
++  version "0.10.31"
++  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
++  integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
++
+ strip-ansi@^3.0.0:
+   version "3.0.1"
+   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+@@ -1399,7 +1533,9 @@ to-regex-range@^5.0.1:
+     is-number "^7.0.0"
+ 
+ uglify-js@^3.16.1:
+-  version "3.17.4"
++  version "3.19.3"
++  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.3.tgz#82315e9bbc6f2b25888858acd1fff8441035b77f"
++  integrity sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==
+ 
+ unc-path-regex@^0.1.2:
+   version "0.1.2"
+@@ -1414,11 +1550,13 @@ underscore.string@~3.3.5:
+     sprintf-js "^1.1.1"
+     util-deprecate "^1.0.2"
+ 
+-update-browserslist-db@^1.0.13:
+-  version "1.0.13"
++update-browserslist-db@^1.1.3:
++  version "1.1.3"
++  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz#348377dd245216f9e7060ff50b15a1b740b75420"
++  integrity sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==
+   dependencies:
+-    escalade "^3.1.1"
+-    picocolors "^1.0.0"
++    escalade "^3.2.0"
++    picocolors "^1.1.1"
+ 
+ uri-path@^1.0.0:
+   version "1.0.0"
diff --git a/pkgs/by-name/in/invoiceplane/fix_composer_validation.patch b/pkgs/by-name/in/invoiceplane/fix_composer_validation.patch
new file mode 100644
index 000000000000..0a610bead28d
--- /dev/null
+++ b/pkgs/by-name/in/invoiceplane/fix_composer_validation.patch
@@ -0,0 +1,34 @@
+From e404c835ae6681287f0d0ba005e43732becf8e9e Mon Sep 17 00:00:00 2001
+From: Jonas Heinrich <onny@project-insanity.org>
+Date: Sun, 17 Aug 2025 09:54:41 +0200
+Subject: [PATCH] composer.json omit version string
+
+---
+ composer.json | 1 -
+ composer.lock | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/composer.json b/composer.json
+index 4ae0b32b7..241d59be9 100644
+--- a/composer.json
++++ b/composer.json
+@@ -1,6 +1,5 @@
+ {
+     "name": "invoiceplane/invoiceplane",
+-    "version": "1.6.3-rc1",
+     "description": "InvoicePlane is a self-hosted open source application for managing your invoices, clients and payments",
+     "homepage": "https://invoiceplane.com",
+     "license": "MIT",
+diff --git a/composer.lock b/composer.lock
+index 46fae450e..cf4aa24c1 100644
+--- a/composer.lock
++++ b/composer.lock
+@@ -4,7 +4,7 @@
+         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+         "This file is @generated automatically"
+     ],
+-    "content-hash": "6920f42f5773c5e01f9f107ebcedb891",
++    "content-hash": "16ec29d674456761958ca1c78513c3c5",
+     "packages": [
+         {
+             "name": "bacon/bacon-qr-code",
diff --git a/pkgs/by-name/in/invoiceplane/node_switch_to_sass.patch b/pkgs/by-name/in/invoiceplane/node_switch_to_sass.patch
deleted file mode 100644
index 55b2f2dd90ac..000000000000
--- a/pkgs/by-name/in/invoiceplane/node_switch_to_sass.patch
+++ /dev/null
@@ -1,3022 +0,0 @@
-diff --git a/Gruntfile.js b/Gruntfile.js
-index a201bafe..f11bf5bf 100644
---- a/Gruntfile.js
-+++ b/Gruntfile.js
-@@ -1,6 +1,6 @@
- "use strict";
- module.exports = function(grunt) {
--  const sass = require("node-sass");
-+  const sass = require("sass");
- 
-   // Load grunt tasks automatically
-   require("load-grunt-tasks")(grunt);
-diff --git a/package.json b/package.json
-index 878e4233..1a16507b 100644
---- a/package.json
-+++ b/package.json
-@@ -31,8 +31,8 @@
-         "jquery-ui": "1.14.1",
-         "js-cookie": "2.2",
-         "load-grunt-tasks": "5.1",
--        "node-sass": "9.0",
-         "postcss": "8.4",
-+        "sass": "^1.89.2",
-         "select2": "4.1.0-rc.0",
-         "zxcvbn": "4.4"
-     },
-diff --git a/yarn.lock b/yarn.lock
-index ee7067d7..d2585e0d 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -2,196 +2,164 @@
- # yarn lockfile v1
- 
- 
--"@babel/code-frame@^7.0.0":
--  version "7.26.2"
--  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
--  integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
--  dependencies:
--    "@babel/helper-validator-identifier" "^7.25.9"
--    js-tokens "^4.0.0"
--    picocolors "^1.0.0"
--
--"@babel/helper-validator-identifier@^7.25.9":
--  version "7.25.9"
--  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"
--  integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
--
--"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
--  version "1.1.3"
--  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
--  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
--
--"@npmcli/fs@^1.0.0":
--  version "1.1.1"
--  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
--  integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
--  dependencies:
--    "@gar/promisify" "^1.0.1"
--    semver "^7.3.5"
--
--"@npmcli/fs@^2.1.0":
--  version "2.1.2"
--  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
--  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
--  dependencies:
--    "@gar/promisify" "^1.1.3"
--    semver "^7.3.5"
--
--"@npmcli/move-file@^1.0.1":
--  version "1.1.2"
--  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
--  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
--  dependencies:
--    mkdirp "^1.0.4"
--    rimraf "^3.0.2"
--
--"@npmcli/move-file@^2.0.0":
--  version "2.0.1"
--  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
--  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
--  dependencies:
--    mkdirp "^1.0.4"
--    rimraf "^3.0.2"
--
--"@tootallnate/once@1":
--  version "1.1.2"
--  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
--  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
--
--"@tootallnate/once@2":
--  version "2.0.0"
--  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
--  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-+"@parcel/watcher-android-arm64@2.5.1":
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz#507f836d7e2042f798c7d07ad19c3546f9848ac1"
-+  integrity sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==
-+
-+"@parcel/watcher-darwin-arm64@2.5.1":
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz#3d26dce38de6590ef79c47ec2c55793c06ad4f67"
-+  integrity sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==
-+
-+"@parcel/watcher-darwin-x64@2.5.1":
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz#99f3af3869069ccf774e4ddfccf7e64fd2311ef8"
-+  integrity sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==
-+
-+"@parcel/watcher-freebsd-x64@2.5.1":
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz#14d6857741a9f51dfe51d5b08b7c8afdbc73ad9b"
-+  integrity sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==
-+
-+"@parcel/watcher-linux-arm-glibc@2.5.1":
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz#43c3246d6892381db473bb4f663229ad20b609a1"
-+  integrity sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==
-+
-+"@parcel/watcher-linux-arm-musl@2.5.1":
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz#663750f7090bb6278d2210de643eb8a3f780d08e"
-+  integrity sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==
-+
-+"@parcel/watcher-linux-arm64-glibc@2.5.1":
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz#ba60e1f56977f7e47cd7e31ad65d15fdcbd07e30"
-+  integrity sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==
-+
-+"@parcel/watcher-linux-arm64-musl@2.5.1":
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz#f7fbcdff2f04c526f96eac01f97419a6a99855d2"
-+  integrity sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==
-+
-+"@parcel/watcher-linux-x64-glibc@2.5.1":
-+  version "2.5.1"
-+  resolved "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz"
-+  integrity sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==
-+
-+"@parcel/watcher-linux-x64-musl@2.5.1":
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz#277b346b05db54f55657301dd77bdf99d63606ee"
-+  integrity sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==
-+
-+"@parcel/watcher-win32-arm64@2.5.1":
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz#7e9e02a26784d47503de1d10e8eab6cceb524243"
-+  integrity sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==
-+
-+"@parcel/watcher-win32-ia32@2.5.1":
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz#2d0f94fa59a873cdc584bf7f6b1dc628ddf976e6"
-+  integrity sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==
-+
-+"@parcel/watcher-win32-x64@2.5.1":
-+  version "2.5.1"
-+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz#ae52693259664ba6f2228fa61d7ee44b64ea0947"
-+  integrity sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==
-+
-+"@parcel/watcher@^2.4.1":
-+  version "2.5.1"
-+  resolved "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz"
-+  integrity sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==
-+  dependencies:
-+    detect-libc "^1.0.3"
-+    is-glob "^4.0.3"
-+    micromatch "^4.0.5"
-+    node-addon-api "^7.0.0"
-+  optionalDependencies:
-+    "@parcel/watcher-android-arm64" "2.5.1"
-+    "@parcel/watcher-darwin-arm64" "2.5.1"
-+    "@parcel/watcher-darwin-x64" "2.5.1"
-+    "@parcel/watcher-freebsd-x64" "2.5.1"
-+    "@parcel/watcher-linux-arm-glibc" "2.5.1"
-+    "@parcel/watcher-linux-arm-musl" "2.5.1"
-+    "@parcel/watcher-linux-arm64-glibc" "2.5.1"
-+    "@parcel/watcher-linux-arm64-musl" "2.5.1"
-+    "@parcel/watcher-linux-x64-glibc" "2.5.1"
-+    "@parcel/watcher-linux-x64-musl" "2.5.1"
-+    "@parcel/watcher-win32-arm64" "2.5.1"
-+    "@parcel/watcher-win32-ia32" "2.5.1"
-+    "@parcel/watcher-win32-x64" "2.5.1"
- 
- "@types/minimatch@^3.0.3":
-   version "3.0.5"
--  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
-+  resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz"
-   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
- 
--"@types/minimist@^1.2.0":
--  version "1.2.5"
--  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
--  integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
--
--"@types/normalize-package-data@^2.4.0":
--  version "2.4.4"
--  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
--  integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
--
- abbrev@1:
-   version "1.1.1"
--  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-+  resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"
-   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
- 
--agent-base@6, agent-base@^6.0.2:
--  version "6.0.2"
--  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
--  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
--  dependencies:
--    debug "4"
--
--agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
--  version "4.5.0"
--  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
--  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
--  dependencies:
--    humanize-ms "^1.2.1"
--
--aggregate-error@^3.0.0:
--  version "3.1.0"
--  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
--  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
--  dependencies:
--    clean-stack "^2.0.0"
--    indent-string "^4.0.0"
--
- ansi-regex@^2.0.0:
-   version "2.1.1"
--  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
-   integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
- 
--ansi-regex@^5.0.1:
--  version "5.0.1"
--  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
--  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
--
- ansi-styles@^2.2.1:
-   version "2.2.1"
--  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
-   integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
- 
- ansi-styles@^3.2.1:
-   version "3.2.1"
--  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
-   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-   dependencies:
-     color-convert "^1.9.0"
- 
--ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-+ansi-styles@^4.1.0:
-   version "4.3.0"
--  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
-   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-   dependencies:
-     color-convert "^2.0.1"
- 
--"aproba@^1.0.3 || ^2.0.0":
--  version "2.0.0"
--  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
--  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
--
--are-we-there-yet@^3.0.0:
--  version "3.0.1"
--  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
--  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
--  dependencies:
--    delegates "^1.0.0"
--    readable-stream "^3.6.0"
--
- argparse@^1.0.7:
-   version "1.0.10"
--  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-+  resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"
-   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-   dependencies:
-     sprintf-js "~1.0.2"
- 
- array-differ@^3.0.0:
-   version "3.0.0"
--  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b"
-+  resolved "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz"
-   integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==
- 
- array-each@^1.0.1:
-   version "1.0.1"
--  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
-+  resolved "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"
-   integrity sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==
- 
- array-slice@^1.0.0:
-   version "1.1.0"
--  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
-+  resolved "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"
-   integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
- 
- array-union@^2.1.0:
-   version "2.1.0"
--  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-+  resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
-   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
- 
--arrify@^1.0.1:
--  version "1.0.1"
--  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
--  integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
--
- arrify@^2.0.1:
-   version "2.0.1"
--  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
-+  resolved "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"
-   integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
- 
--async-foreach@^0.1.3:
--  version "0.1.3"
--  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
--  integrity sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==
--
- async@^2.6.0:
-   version "2.6.4"
--  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
-+  resolved "https://registry.npmjs.org/async/-/async-2.6.4.tgz"
-   integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
-   dependencies:
-     lodash "^4.17.14"
-@@ -203,7 +171,7 @@ async@^3.2.3, async@~3.2.0:
- 
- autoprefixer@9.8.8:
-   version "9.8.8"
--  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.8.tgz#fd4bd4595385fa6f06599de749a4d5f7a474957a"
-+  resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz"
-   integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==
-   dependencies:
-     browserslist "^4.12.0"
-@@ -216,12 +184,12 @@ autoprefixer@9.8.8:
- 
- balanced-match@^1.0.0:
-   version "1.0.2"
--  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-+  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
-   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
- 
- body@^5.1.0:
-   version "5.1.0"
--  resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
-+  resolved "https://registry.npmjs.org/body/-/body-5.1.0.tgz"
-   integrity sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ==
-   dependencies:
-     continuable-cache "^0.3.1"
-@@ -231,31 +199,24 @@ body@^5.1.0:
- 
- bootstrap-datepicker@1.10:
-   version "1.10.0"
--  resolved "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.10.0.tgz#61612bbe8bf0a69a5bce32bbcdda93ebb6ccf24a"
-+  resolved "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.10.0.tgz"
-   integrity sha512-lWxtSYddAQOpbAO8UhYhHLcK6425eWoSjb5JDvZU3ePHEPF6A3eUr51WKaFy4PccU19JRxUG6wEU3KdhtKfvpg==
-   dependencies:
-     jquery ">=3.4.0 <4.0.0"
- 
- bootstrap-sass@3.4.1:
-   version "3.4.1"
--  resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.4.1.tgz#6843c73b1c258a0ac5cb2cc6f6f5285b664a8e9a"
-+  resolved "https://registry.npmjs.org/bootstrap-sass/-/bootstrap-sass-3.4.1.tgz"
-   integrity sha512-p5rxsK/IyEDQm2CwiHxxUi0MZZtvVFbhWmyMOt4lLkA4bujDA1TGoKT0i1FKIWiugAdP+kK8T5KMDFIKQCLYIA==
- 
- brace-expansion@^1.1.7:
-   version "1.1.11"
--  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-+  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
-   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-   dependencies:
-     balanced-match "^1.0.0"
-     concat-map "0.0.1"
- 
--brace-expansion@^2.0.1:
--  version "2.0.1"
--  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
--  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
--  dependencies:
--    balanced-match "^1.0.0"
--
- braces@^3.0.3:
-   version "3.0.3"
-   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-@@ -264,101 +225,44 @@ braces@^3.0.3:
-     fill-range "^7.1.1"
- 
- browserslist@^4.12.0:
--  version "4.24.2"
--  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580"
--  integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==
-+  version "4.25.1"
-+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.25.1.tgz#ba9e8e6f298a1d86f829c9b975e07948967bb111"
-+  integrity sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==
-   dependencies:
--    caniuse-lite "^1.0.30001669"
--    electron-to-chromium "^1.5.41"
--    node-releases "^2.0.18"
--    update-browserslist-db "^1.1.1"
-+    caniuse-lite "^1.0.30001726"
-+    electron-to-chromium "^1.5.173"
-+    node-releases "^2.0.19"
-+    update-browserslist-db "^1.1.3"
- 
- bytes@1:
-   version "1.0.0"
--  resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
-+  resolved "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"
-   integrity sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==
- 
--cacache@^15.2.0:
--  version "15.3.0"
--  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
--  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
--  dependencies:
--    "@npmcli/fs" "^1.0.0"
--    "@npmcli/move-file" "^1.0.1"
--    chownr "^2.0.0"
--    fs-minipass "^2.0.0"
--    glob "^7.1.4"
--    infer-owner "^1.0.4"
--    lru-cache "^6.0.0"
--    minipass "^3.1.1"
--    minipass-collect "^1.0.2"
--    minipass-flush "^1.0.5"
--    minipass-pipeline "^1.2.2"
--    mkdirp "^1.0.3"
--    p-map "^4.0.0"
--    promise-inflight "^1.0.1"
--    rimraf "^3.0.2"
--    ssri "^8.0.1"
--    tar "^6.0.2"
--    unique-filename "^1.1.1"
--
--cacache@^16.1.0:
--  version "16.1.3"
--  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
--  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
--  dependencies:
--    "@npmcli/fs" "^2.1.0"
--    "@npmcli/move-file" "^2.0.0"
--    chownr "^2.0.0"
--    fs-minipass "^2.1.0"
--    glob "^8.0.1"
--    infer-owner "^1.0.4"
--    lru-cache "^7.7.1"
--    minipass "^3.1.6"
--    minipass-collect "^1.0.2"
--    minipass-flush "^1.0.5"
--    minipass-pipeline "^1.2.4"
--    mkdirp "^1.0.4"
--    p-map "^4.0.0"
--    promise-inflight "^1.0.1"
--    rimraf "^3.0.2"
--    ssri "^9.0.0"
--    tar "^6.1.11"
--    unique-filename "^2.0.0"
--
--call-bind@^1.0.7:
--  version "1.0.7"
--  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
--  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
-+call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
-+  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
-   dependencies:
--    es-define-property "^1.0.0"
-     es-errors "^1.3.0"
-     function-bind "^1.1.2"
--    get-intrinsic "^1.2.4"
--    set-function-length "^1.2.1"
- 
--camelcase-keys@^6.2.2:
--  version "6.2.2"
--  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
--  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
-+call-bound@^1.0.2:
-+  version "1.0.4"
-+  resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
-+  integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
-   dependencies:
--    camelcase "^5.3.1"
--    map-obj "^4.0.0"
--    quick-lru "^4.0.1"
--
--camelcase@^5.3.1:
--  version "5.3.1"
--  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
--  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-+    call-bind-apply-helpers "^1.0.2"
-+    get-intrinsic "^1.3.0"
- 
--caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001669:
--  version "1.0.30001684"
--  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz#0eca437bab7d5f03452ff0ef9de8299be6b08e16"
--  integrity sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==
-+caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001726:
-+  version "1.0.30001727"
-+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz#22e9706422ad37aa50556af8c10e40e2d93a8b85"
-+  integrity sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==
- 
- chalk@^1.1.1:
-   version "1.1.3"
--  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-+  resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
-   integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
-   dependencies:
-     ansi-styles "^2.2.1"
-@@ -369,7 +273,7 @@ chalk@^1.1.1:
- 
- chalk@^2.1.0, chalk@^2.4.1:
-   version "2.4.2"
--  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-+  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
-   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-   dependencies:
-     ansi-styles "^3.2.1"
-@@ -378,281 +282,201 @@ chalk@^2.1.0, chalk@^2.4.1:
- 
- chalk@^4.1.0, chalk@^4.1.2, chalk@~4.1.0:
-   version "4.1.2"
--  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-+  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
-   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-   dependencies:
-     ansi-styles "^4.1.0"
-     supports-color "^7.1.0"
- 
--chownr@^2.0.0:
--  version "2.0.0"
--  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
--  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
--
--clean-stack@^2.0.0:
--  version "2.2.0"
--  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
--  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-+chokidar@^4.0.0:
-+  version "4.0.3"
-+  resolved "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz"
-+  integrity sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==
-+  dependencies:
-+    readdirp "^4.0.1"
- 
- clipboard@2.0.11:
-   version "2.0.11"
--  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.11.tgz#62180360b97dd668b6b3a84ec226975762a70be5"
-+  resolved "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz"
-   integrity sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==
-   dependencies:
-     good-listener "^1.2.2"
-     select "^1.1.2"
-     tiny-emitter "^2.0.0"
- 
--cliui@^8.0.1:
--  version "8.0.1"
--  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
--  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
--  dependencies:
--    string-width "^4.2.0"
--    strip-ansi "^6.0.1"
--    wrap-ansi "^7.0.0"
--
- color-convert@^1.9.0:
-   version "1.9.3"
--  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
-   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-   dependencies:
-     color-name "1.1.3"
- 
- color-convert@^2.0.1:
-   version "2.0.1"
--  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
-   integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-   dependencies:
-     color-name "~1.1.4"
- 
- color-name@1.1.3:
-   version "1.1.3"
--  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
-   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
- 
- color-name@~1.1.4:
-   version "1.1.4"
--  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
-   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
- 
--color-support@^1.1.3:
--  version "1.1.3"
--  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
--  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
--
- colors@~1.1.2:
-   version "1.1.2"
--  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-+  resolved "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"
-   integrity sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w==
- 
- concat-map@0.0.1:
-   version "0.0.1"
--  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-+  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
- 
--console-control-strings@^1.1.0:
--  version "1.1.0"
--  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
--  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
--
- continuable-cache@^0.3.1:
-   version "0.3.1"
--  resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
-+  resolved "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz"
-   integrity sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA==
- 
--core-util-is@~1.0.0:
--  version "1.0.3"
--  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
--  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
--
--cross-spawn@^7.0.3:
--  version "7.0.6"
--  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
--  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
--  dependencies:
--    path-key "^3.1.0"
--    shebang-command "^2.0.0"
--    which "^2.0.1"
--
- dateformat@~4.6.2:
-   version "4.6.3"
--  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5"
-+  resolved "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz"
-   integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==
- 
--debug@4, debug@^4.3.3:
--  version "4.3.7"
--  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
--  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
--  dependencies:
--    ms "^2.1.3"
--
- debug@^3.1.0:
-   version "3.2.7"
--  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-+  resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
-   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-   dependencies:
-     ms "^2.1.1"
- 
--decamelize-keys@^1.1.0:
--  version "1.1.1"
--  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
--  integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==
--  dependencies:
--    decamelize "^1.1.0"
--    map-obj "^1.0.0"
--
--decamelize@^1.1.0, decamelize@^1.2.0:
--  version "1.2.0"
--  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
--  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
--
--define-data-property@^1.1.4:
--  version "1.1.4"
--  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
--  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
--  dependencies:
--    es-define-property "^1.0.0"
--    es-errors "^1.3.0"
--    gopd "^1.0.1"
--
- delegate@^3.1.2:
-   version "3.2.0"
--  resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
-+  resolved "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz"
-   integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
- 
--delegates@^1.0.0:
--  version "1.0.0"
--  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
--  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
--
- detect-file@^1.0.0:
-   version "1.0.0"
--  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-+  resolved "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"
-   integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==
- 
-+detect-libc@^1.0.3:
-+  version "1.0.3"
-+  resolved "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"
-+  integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
-+
- diff@^3.0.0:
-   version "3.5.0"
--  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-+  resolved "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"
-   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
- 
- dropzone@5.9.3:
-   version "5.9.3"
--  resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-5.9.3.tgz#b3070ae090fa48cbc04c17535635537ca72d70d6"
-+  resolved "https://registry.npmjs.org/dropzone/-/dropzone-5.9.3.tgz"
-   integrity sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA==
- 
-+dunder-proto@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
-+  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
-+  dependencies:
-+    call-bind-apply-helpers "^1.0.1"
-+    es-errors "^1.3.0"
-+    gopd "^1.2.0"
-+
- duplexer@^0.1.1:
-   version "0.1.2"
--  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-+  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
-   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
- 
--electron-to-chromium@^1.5.41:
--  version "1.5.67"
--  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.67.tgz#66ebd2be4a77469ac2760ef5e9e460ba9a43a845"
--  integrity sha512-nz88NNBsD7kQSAGGJyp8hS6xSPtWwqNogA0mjtc2nUYeEf3nURK9qpV18TuBdDmEDgVWotS8Wkzf+V52dSQ/LQ==
--
--emoji-regex@^8.0.0:
--  version "8.0.0"
--  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
--  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
--
--encoding@^0.1.12, encoding@^0.1.13:
--  version "0.1.13"
--  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
--  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
--  dependencies:
--    iconv-lite "^0.6.2"
--
--env-paths@^2.2.0:
--  version "2.2.1"
--  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
--  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
--
--err-code@^2.0.2:
--  version "2.0.3"
--  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
--  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
--
--error-ex@^1.3.1:
--  version "1.3.2"
--  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
--  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
--  dependencies:
--    is-arrayish "^0.2.1"
-+electron-to-chromium@^1.5.173:
-+  version "1.5.182"
-+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.182.tgz#4ab73104f893938acb3ab9c28d7bec170c116b3e"
-+  integrity sha512-Lv65Btwv9W4J9pyODI6EWpdnhfvrve/us5h1WspW8B2Fb0366REPtY3hX7ounk1CkV/TBjWCEvCBBbYbmV0qCA==
- 
- error@^7.0.0:
-   version "7.2.1"
--  resolved "https://registry.yarnpkg.com/error/-/error-7.2.1.tgz#eab21a4689b5f684fc83da84a0e390de82d94894"
-+  resolved "https://registry.npmjs.org/error/-/error-7.2.1.tgz"
-   integrity sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==
-   dependencies:
-     string-template "~0.2.1"
- 
--es-define-property@^1.0.0:
--  version "1.0.0"
--  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
--  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
--  dependencies:
--    get-intrinsic "^1.2.4"
-+es-define-property@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
-+  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
- 
- es-errors@^1.3.0:
-   version "1.3.0"
-   resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
-   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
- 
--escalade@^3.1.1, escalade@^3.2.0:
-+es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
-+  version "1.1.1"
-+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
-+  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
-+  dependencies:
-+    es-errors "^1.3.0"
-+
-+escalade@^3.2.0:
-   version "3.2.0"
-   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
-   integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
- 
- escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-   version "1.0.5"
--  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
- 
- esprima@^4.0.0:
-   version "4.0.1"
--  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-+  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
-   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
- 
- eventemitter2@~0.4.13:
-   version "0.4.14"
--  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab"
-+  resolved "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
-   integrity sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==
- 
- exit@~0.1.2:
-   version "0.1.2"
--  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-+  resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
-   integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
- 
- expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-   version "2.0.2"
--  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-+  resolved "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"
-   integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==
-   dependencies:
-     homedir-polyfill "^1.0.1"
- 
- extend@^3.0.2:
-   version "3.0.2"
--  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-+  resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
-   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
- 
- faye-websocket@~0.10.0:
-   version "0.10.0"
--  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-+  resolved "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"
-   integrity sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ==
-   dependencies:
-     websocket-driver ">=0.5.1"
- 
- figures@^3.2.0:
-   version "3.2.0"
--  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-+  resolved "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"
-   integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-   dependencies:
-     escape-string-regexp "^1.0.5"
- 
- file-sync-cmp@^0.1.0:
-   version "0.1.1"
--  resolved "https://registry.yarnpkg.com/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz#a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b"
-+  resolved "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz"
-   integrity sha512-0k45oWBokCqh2MOexeYKpyqmGKG+8mQ2Wd8iawx+uWd/weWJQAZ6SoPybagdCI4xFisag8iAR77WPm4h3pTfxA==
- 
- fill-range@^7.1.1:
-@@ -664,22 +488,14 @@ fill-range@^7.1.1:
- 
- find-up@^3.0.0:
-   version "3.0.0"
--  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-+  resolved "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"
-   integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-   dependencies:
-     locate-path "^3.0.0"
- 
--find-up@^4.1.0:
--  version "4.1.0"
--  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
--  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
--  dependencies:
--    locate-path "^5.0.0"
--    path-exists "^4.0.0"
--
- findup-sync@^4.0.0:
-   version "4.0.0"
--  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0"
-+  resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz"
-   integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==
-   dependencies:
-     detect-file "^1.0.0"
-@@ -689,7 +505,7 @@ findup-sync@^4.0.0:
- 
- findup-sync@~5.0.0:
-   version "5.0.0"
--  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-5.0.0.tgz#54380ad965a7edca00cc8f63113559aadc541bd2"
-+  resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz"
-   integrity sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==
-   dependencies:
-     detect-file "^1.0.0"
-@@ -699,7 +515,7 @@ findup-sync@~5.0.0:
- 
- fined@^1.2.0:
-   version "1.2.0"
--  resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
-+  resolved "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz"
-   integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
-   dependencies:
-     expand-tilde "^2.0.2"
-@@ -710,93 +526,75 @@ fined@^1.2.0:
- 
- flagged-respawn@^1.0.1:
-   version "1.0.1"
--  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
-+  resolved "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz"
-   integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
- 
- font-awesome@4.7:
-   version "4.7.0"
--  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-+  resolved "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz"
-   integrity sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg==
- 
- for-in@^1.0.1:
-   version "1.0.2"
--  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-+  resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"
-   integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
- 
- for-own@^1.0.0:
-   version "1.0.0"
--  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-+  resolved "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"
-   integrity sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==
-   dependencies:
-     for-in "^1.0.1"
- 
--fs-minipass@^2.0.0, fs-minipass@^2.1.0:
--  version "2.1.0"
--  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
--  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
--  dependencies:
--    minipass "^3.0.0"
--
- fs.realpath@^1.0.0:
-   version "1.0.0"
--  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-+  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
-   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
- 
- function-bind@^1.1.2:
-   version "1.1.2"
--  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
-+  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"
-   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
- 
--gauge@^4.0.3:
--  version "4.0.4"
--  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
--  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
--  dependencies:
--    aproba "^1.0.3 || ^2.0.0"
--    color-support "^1.1.3"
--    console-control-strings "^1.1.0"
--    has-unicode "^2.0.1"
--    signal-exit "^3.0.7"
--    string-width "^4.2.3"
--    strip-ansi "^6.0.1"
--    wide-align "^1.1.5"
--
--gaze@^1.0.0, gaze@^1.1.0:
-+gaze@^1.1.0:
-   version "1.1.3"
--  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
-+  resolved "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz"
-   integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
-   dependencies:
-     globule "^1.0.0"
- 
--get-caller-file@^2.0.5:
--  version "2.0.5"
--  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
--  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
--
--get-intrinsic@^1.2.4:
--  version "1.2.4"
--  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
--  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
-+get-intrinsic@^1.2.5, get-intrinsic@^1.3.0:
-+  version "1.3.0"
-+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
-+  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
-   dependencies:
-+    call-bind-apply-helpers "^1.0.2"
-+    es-define-property "^1.0.1"
-     es-errors "^1.3.0"
-+    es-object-atoms "^1.1.1"
-     function-bind "^1.1.2"
--    has-proto "^1.0.1"
--    has-symbols "^1.0.3"
--    hasown "^2.0.0"
-+    get-proto "^1.0.1"
-+    gopd "^1.2.0"
-+    has-symbols "^1.1.0"
-+    hasown "^2.0.2"
-+    math-intrinsics "^1.1.0"
- 
--get-stdin@^4.0.1:
--  version "4.0.1"
--  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
--  integrity sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==
-+get-proto@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
-+  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
-+  dependencies:
-+    dunder-proto "^1.0.1"
-+    es-object-atoms "^1.0.0"
- 
- getobject@~1.0.0:
-   version "1.0.2"
--  resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.0.2.tgz#25ec87a50370f6dcc3c6ba7ef43c4c16215c4c89"
-+  resolved "https://registry.npmjs.org/getobject/-/getobject-1.0.2.tgz"
-   integrity sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg==
- 
--glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
-+glob@^7.1.3:
-   version "7.2.3"
--  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-+  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
-   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-   dependencies:
-     fs.realpath "^1.0.0"
-@@ -806,20 +604,9 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
-     once "^1.3.0"
-     path-is-absolute "^1.0.0"
- 
--glob@^8.0.1:
--  version "8.1.0"
--  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
--  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
--  dependencies:
--    fs.realpath "^1.0.0"
--    inflight "^1.0.4"
--    inherits "2"
--    minimatch "^5.0.1"
--    once "^1.3.0"
--
- glob@~7.1.1, glob@~7.1.6:
-   version "7.1.7"
--  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
-+  resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
-   integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
-   dependencies:
-     fs.realpath "^1.0.0"
-@@ -831,7 +618,7 @@ glob@~7.1.1, glob@~7.1.6:
- 
- global-modules@^1.0.0:
-   version "1.0.0"
--  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-+  resolved "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"
-   integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
-   dependencies:
-     global-prefix "^1.0.1"
-@@ -840,7 +627,7 @@ global-modules@^1.0.0:
- 
- global-prefix@^1.0.1:
-   version "1.0.2"
--  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-+  resolved "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"
-   integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==
-   dependencies:
-     expand-tilde "^2.0.2"
-@@ -851,7 +638,7 @@ global-prefix@^1.0.1:
- 
- globule@^1.0.0:
-   version "1.3.4"
--  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.4.tgz#7c11c43056055a75a6e68294453c17f2796170fb"
-+  resolved "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz"
-   integrity sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==
-   dependencies:
-     glob "~7.1.1"
-@@ -860,26 +647,19 @@ globule@^1.0.0:
- 
- good-listener@^1.2.2:
-   version "1.2.2"
--  resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
-+  resolved "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz"
-   integrity sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==
-   dependencies:
-     delegate "^3.1.2"
- 
--gopd@^1.0.1:
--  version "1.1.0"
--  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.1.0.tgz#df8f0839c2d48caefc32a025a49294d39606c912"
--  integrity sha512-FQoVQnqcdk4hVM4JN1eromaun4iuS34oStkdlLENLdpULsuQcTyXj8w7ayhuUfPwEYZ1ZOooOTT6fdA9Vmx/RA==
--  dependencies:
--    get-intrinsic "^1.2.4"
--
--graceful-fs@^4.2.6:
--  version "4.2.11"
--  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
--  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-+gopd@^1.2.0:
-+  version "1.2.0"
-+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
-+  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
- 
- grunt-cli@~1.4.3:
-   version "1.4.3"
--  resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.4.3.tgz#22c9f1a3d2780bf9b0d206e832e40f8f499175ff"
-+  resolved "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz"
-   integrity sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==
-   dependencies:
-     grunt-known-options "~2.0.0"
-@@ -890,7 +670,7 @@ grunt-cli@~1.4.3:
- 
- grunt-contrib-clean@2.0:
-   version "2.0.1"
--  resolved "https://registry.yarnpkg.com/grunt-contrib-clean/-/grunt-contrib-clean-2.0.1.tgz#062e8019d31bfca35af8929a2ee1063c6c46dd2d"
-+  resolved "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.1.tgz"
-   integrity sha512-uRvnXfhiZt8akb/ZRDHJpQQtkkVkqc/opWO4Po/9ehC2hPxgptB9S6JHDC/Nxswo4CJSM0iFPT/Iym3cEMWzKA==
-   dependencies:
-     async "^3.2.3"
-@@ -898,7 +678,7 @@ grunt-contrib-clean@2.0:
- 
- grunt-contrib-concat@2.1:
-   version "2.1.0"
--  resolved "https://registry.yarnpkg.com/grunt-contrib-concat/-/grunt-contrib-concat-2.1.0.tgz#9ac62117a18b48d1bfccb3eef46c960bbd163d75"
-+  resolved "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-2.1.0.tgz"
-   integrity sha512-Vnl95JIOxfhEN7bnYIlCgQz41kkbi7tsZ/9a4usZmxNxi1S2YAIOy8ysFmO8u4MN26Apal1O106BwARdaNxXQw==
-   dependencies:
-     chalk "^4.1.2"
-@@ -906,7 +686,7 @@ grunt-contrib-concat@2.1:
- 
- grunt-contrib-copy@1.0:
-   version "1.0.0"
--  resolved "https://registry.yarnpkg.com/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz#7060c6581e904b8ab0d00f076e0a8f6e3e7c3573"
-+  resolved "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz"
-   integrity sha512-gFRFUB0ZbLcjKb67Magz1yOHGBkyU6uL29hiEW1tdQ9gQt72NuMKIy/kS6dsCbV0cZ0maNCb0s6y+uT1FKU7jA==
-   dependencies:
-     chalk "^1.1.1"
-@@ -914,7 +694,7 @@ grunt-contrib-copy@1.0:
- 
- grunt-contrib-uglify@5.2:
-   version "5.2.2"
--  resolved "https://registry.yarnpkg.com/grunt-contrib-uglify/-/grunt-contrib-uglify-5.2.2.tgz#447c0b58451a1fca20768371e07e723a870dfe98"
-+  resolved "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-5.2.2.tgz"
-   integrity sha512-ITxiWxrjjP+RZu/aJ5GLvdele+sxlznh+6fK9Qckio5ma8f7Iv8woZjRkGfafvpuygxNefOJNc+hfjjBayRn2Q==
-   dependencies:
-     chalk "^4.1.2"
-@@ -924,7 +704,7 @@ grunt-contrib-uglify@5.2:
- 
- grunt-contrib-watch@1.1:
-   version "1.1.0"
--  resolved "https://registry.yarnpkg.com/grunt-contrib-watch/-/grunt-contrib-watch-1.1.0.tgz#c143ca5b824b288a024b856639a5345aedb78ed4"
-+  resolved "https://registry.npmjs.org/grunt-contrib-watch/-/grunt-contrib-watch-1.1.0.tgz"
-   integrity sha512-yGweN+0DW5yM+oo58fRu/XIRrPcn3r4tQx+nL7eMRwjpvk+rQY6R8o94BPK0i2UhTg9FN21hS+m8vR8v9vXfeg==
-   dependencies:
-     async "^2.6.0"
-@@ -934,12 +714,12 @@ grunt-contrib-watch@1.1:
- 
- grunt-known-options@~2.0.0:
-   version "2.0.0"
--  resolved "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-2.0.0.tgz#cac641e897f9a0a680b8c9839803d35f3325103c"
-+  resolved "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz"
-   integrity sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==
- 
- grunt-legacy-log-utils@~2.1.0:
-   version "2.1.0"
--  resolved "https://registry.yarnpkg.com/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz#49a8c7dc74051476dcc116c32faf9db8646856ef"
-+  resolved "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz"
-   integrity sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==
-   dependencies:
-     chalk "~4.1.0"
-@@ -947,7 +727,7 @@ grunt-legacy-log-utils@~2.1.0:
- 
- grunt-legacy-log@~3.0.0:
-   version "3.0.0"
--  resolved "https://registry.yarnpkg.com/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz#1c6eaf92371ea415af31ea84ce50d434ef6d39c4"
-+  resolved "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz"
-   integrity sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==
-   dependencies:
-     colors "~1.1.2"
-@@ -957,7 +737,7 @@ grunt-legacy-log@~3.0.0:
- 
- grunt-legacy-util@~2.0.1:
-   version "2.0.1"
--  resolved "https://registry.yarnpkg.com/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz#0f929d13a2faf9988c9917c82bff609e2d9ba255"
-+  resolved "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz"
-   integrity sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==
-   dependencies:
-     async "~3.2.0"
-@@ -970,7 +750,7 @@ grunt-legacy-util@~2.0.1:
- 
- grunt-postcss@0.9:
-   version "0.9.0"
--  resolved "https://registry.yarnpkg.com/grunt-postcss/-/grunt-postcss-0.9.0.tgz#fbe5934a6be9eac893af6d057e2318c97fae9da3"
-+  resolved "https://registry.npmjs.org/grunt-postcss/-/grunt-postcss-0.9.0.tgz"
-   integrity sha512-lglLcVaoOIqH0sFv7RqwUKkEFGQwnlqyAKbatxZderwZGV1nDyKHN7gZS9LUiTx1t5GOvRBx0BEalHMyVwFAIA==
-   dependencies:
-     chalk "^2.1.0"
-@@ -979,12 +759,12 @@ grunt-postcss@0.9:
- 
- grunt-sass@3.1:
-   version "3.1.0"
--  resolved "https://registry.yarnpkg.com/grunt-sass/-/grunt-sass-3.1.0.tgz#a5936cc2a80ec08092d9f31c101dc307d1e4f71c"
-+  resolved "https://registry.npmjs.org/grunt-sass/-/grunt-sass-3.1.0.tgz"
-   integrity sha512-90s27H7FoCDcA8C8+R0GwC+ntYD3lG6S/jqcavWm3bn9RiJTmSfOvfbFa1PXx4NbBWuiGQMLfQTj/JvvqT5w6A==
- 
- grunt@1.6:
-   version "1.6.1"
--  resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.6.1.tgz#0b4dd1524f26676dcf45d8f636b8d9061a8ede16"
-+  resolved "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz"
-   integrity sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==
-   dependencies:
-     dateformat "~4.6.2"
-@@ -1003,57 +783,35 @@ grunt@1.6:
- 
- gzip-size@^5.1.1:
-   version "5.1.1"
--  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
-+  resolved "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz"
-   integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==
-   dependencies:
-     duplexer "^0.1.1"
-     pify "^4.0.1"
- 
--hard-rejection@^2.1.0:
--  version "2.1.0"
--  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
--  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
--
- has-ansi@^2.0.0:
-   version "2.0.0"
--  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-+  resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-   integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
-   dependencies:
-     ansi-regex "^2.0.0"
- 
- has-flag@^3.0.0:
-   version "3.0.0"
--  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-+  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
-   integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
- 
- has-flag@^4.0.0:
-   version "4.0.0"
--  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-+  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
-   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
- 
--has-property-descriptors@^1.0.2:
--  version "1.0.2"
--  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
--  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
--  dependencies:
--    es-define-property "^1.0.0"
--
--has-proto@^1.0.1:
--  version "1.0.3"
--  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
--  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
--
--has-symbols@^1.0.3:
--  version "1.0.3"
--  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
--  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
--
--has-unicode@^2.0.1:
--  version "2.0.1"
--  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
--  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
-+has-symbols@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
-+  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
- 
--hasown@^2.0.0, hasown@^2.0.2:
-+hasown@^2.0.2:
-   version "2.0.2"
-   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
-   integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
-@@ -1062,275 +820,162 @@ hasown@^2.0.0, hasown@^2.0.2:
- 
- homedir-polyfill@^1.0.1:
-   version "1.0.3"
--  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
-+  resolved "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"
-   integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
-   dependencies:
-     parse-passwd "^1.0.0"
- 
- hooker@~0.2.3:
-   version "0.2.3"
--  resolved "https://registry.yarnpkg.com/hooker/-/hooker-0.2.3.tgz#b834f723cc4a242aa65963459df6d984c5d3d959"
-+  resolved "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
-   integrity sha512-t+UerCsQviSymAInD01Pw+Dn/usmz1sRO+3Zk1+lx8eg+WKpD2ulcwWqHHL0+aseRBr+3+vIhiG1K1JTwaIcTA==
- 
--hosted-git-info@^2.1.4:
--  version "2.8.9"
--  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
--  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
--
--hosted-git-info@^4.0.1:
--  version "4.1.0"
--  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
--  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
--  dependencies:
--    lru-cache "^6.0.0"
--
- html5shiv@3.7:
-   version "3.7.3"
--  resolved "https://registry.yarnpkg.com/html5shiv/-/html5shiv-3.7.3.tgz#d78a84a367bcb9a710100d57802c387b084631d2"
-+  resolved "https://registry.npmjs.org/html5shiv/-/html5shiv-3.7.3.tgz"
-   integrity sha512-SZwGvLGNtgp8GbgFX7oXEp8OR1aBt5LliX6dG0kdD1kl3KhMonN0QcSa/A3TsTgFewaGCbIryQunjayWDXzxmw==
- 
--http-cache-semantics@^4.1.0:
--  version "4.1.1"
--  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
--  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
--
- http-parser-js@>=0.5.1:
-   version "0.5.8"
--  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
-+  resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz"
-   integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
- 
--http-proxy-agent@^4.0.1:
--  version "4.0.1"
--  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
--  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
--  dependencies:
--    "@tootallnate/once" "1"
--    agent-base "6"
--    debug "4"
--
--http-proxy-agent@^5.0.0:
--  version "5.0.0"
--  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
--  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
--  dependencies:
--    "@tootallnate/once" "2"
--    agent-base "6"
--    debug "4"
--
--https-proxy-agent@^5.0.0:
--  version "5.0.1"
--  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
--  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
--  dependencies:
--    agent-base "6"
--    debug "4"
--
--humanize-ms@^1.2.1:
--  version "1.2.1"
--  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
--  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
--  dependencies:
--    ms "^2.0.0"
--
--iconv-lite@^0.6.2, iconv-lite@~0.6.3:
-+iconv-lite@~0.6.3:
-   version "0.6.3"
--  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
-+  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"
-   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
-   dependencies:
-     safer-buffer ">= 2.1.2 < 3.0.0"
- 
--imurmurhash@^0.1.4:
--  version "0.1.4"
--  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
--  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
--
--indent-string@^4.0.0:
--  version "4.0.0"
--  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
--  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
--
--infer-owner@^1.0.4:
--  version "1.0.4"
--  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
--  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-+immutable@^5.0.2:
-+  version "5.1.3"
-+  resolved "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz"
-+  integrity sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==
- 
- inflight@^1.0.4:
-   version "1.0.6"
--  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-+  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
-   integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-   dependencies:
-     once "^1.3.0"
-     wrappy "1"
- 
--inherits@2, inherits@^2.0.3, inherits@~2.0.3:
-+inherits@2:
-   version "2.0.4"
--  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
-   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
- 
- ini@^1.3.4:
-   version "1.3.8"
--  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-+  resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"
-   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
- 
- interpret@~1.1.0:
-   version "1.1.0"
--  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-+  resolved "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"
-   integrity sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA==
- 
--ip-address@^9.0.5:
--  version "9.0.5"
--  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
--  integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==
--  dependencies:
--    jsbn "1.1.0"
--    sprintf-js "^1.1.3"
--
- is-absolute@^1.0.0:
-   version "1.0.0"
--  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
-+  resolved "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"
-   integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
-   dependencies:
-     is-relative "^1.0.0"
-     is-windows "^1.0.1"
- 
--is-arrayish@^0.2.1:
--  version "0.2.1"
--  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
--  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
--
--is-core-module@^2.13.0, is-core-module@^2.5.0:
--  version "2.15.1"
--  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
--  integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==
-+is-core-module@^2.13.0:
-+  version "2.16.1"
-+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
-+  integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
-   dependencies:
-     hasown "^2.0.2"
- 
- is-extglob@^2.1.1:
-   version "2.1.1"
--  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-+  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
-   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
- 
--is-fullwidth-code-point@^3.0.0:
--  version "3.0.0"
--  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
--  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
--
- is-glob@^4.0.0, is-glob@^4.0.3:
-   version "4.0.3"
--  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
-   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-   dependencies:
-     is-extglob "^2.1.1"
- 
--is-lambda@^1.0.1:
--  version "1.0.1"
--  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
--  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
--
- is-number@^7.0.0:
-   version "7.0.0"
--  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-+  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
-   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
- 
--is-plain-obj@^1.1.0:
--  version "1.1.0"
--  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
--  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
--
- is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-   version "2.0.4"
--  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-+  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
-   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-   dependencies:
-     isobject "^3.0.1"
- 
- is-relative@^1.0.0:
-   version "1.0.0"
--  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
-+  resolved "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"
-   integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
-   dependencies:
-     is-unc-path "^1.0.0"
- 
- is-unc-path@^1.0.0:
-   version "1.0.0"
--  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
-+  resolved "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"
-   integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
-   dependencies:
-     unc-path-regex "^0.1.2"
- 
- is-windows@^1.0.1:
-   version "1.0.2"
--  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-+  resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"
-   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
- 
--isarray@~1.0.0:
--  version "1.0.0"
--  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
--  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
--
- isexe@^2.0.0:
-   version "2.0.0"
--  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-+  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
-   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
- 
- isobject@^3.0.0, isobject@^3.0.1:
-   version "3.0.1"
--  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-+  resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
-   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
- 
- jquery-ui@1.14.1:
-   version "1.14.1"
--  resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.14.1.tgz#ba342ea3ffff662b787595391f607d923313e040"
-+  resolved "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.14.1.tgz"
-   integrity sha512-DhzsYH8VeIvOaxwi+B/2BCsFFT5EGjShdzOcm5DssWjtcpGWIMsn66rJciDA6jBruzNiLf1q0KvwMoX1uGNvnQ==
-   dependencies:
-     jquery ">=1.12.0 <5.0.0"
- 
- jquery@3.7.1, "jquery@>=1.12.0 <5.0.0", "jquery@>=3.4.0 <4.0.0":
-   version "3.7.1"
--  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
-+  resolved "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz"
-   integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
- 
--js-base64@^2.4.9:
--  version "2.6.4"
--  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
--  integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
--
- js-cookie@2.2:
-   version "2.2.1"
--  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
-+  resolved "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz"
-   integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
- 
--js-tokens@^4.0.0:
--  version "4.0.0"
--  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
--  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
--
- js-yaml@~3.14.0:
-   version "3.14.1"
--  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"
-   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-   dependencies:
-     argparse "^1.0.7"
-     esprima "^4.0.0"
- 
--jsbn@1.1.0:
--  version "1.1.0"
--  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
--  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
--
--json-parse-even-better-errors@^2.3.0:
--  version "2.3.1"
--  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
--  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
--
--kind-of@^6.0.2, kind-of@^6.0.3:
-+kind-of@^6.0.2:
-   version "6.0.3"
--  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-+  resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
-   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
- 
- liftup@~3.0.1:
-   version "3.0.1"
--  resolved "https://registry.yarnpkg.com/liftup/-/liftup-3.0.1.tgz#1cb81aff0f368464ed3a5f1a7286372d6b1a60ce"
-+  resolved "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz"
-   integrity sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==
-   dependencies:
-     extend "^3.0.2"
-@@ -1342,19 +987,14 @@ liftup@~3.0.1:
-     rechoir "^0.7.0"
-     resolve "^1.19.0"
- 
--lines-and-columns@^1.1.6:
--  version "1.2.4"
--  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
--  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
--
- livereload-js@^2.3.0:
-   version "2.4.0"
--  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
-+  resolved "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz"
-   integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==
- 
- load-grunt-tasks@5.1:
-   version "5.1.0"
--  resolved "https://registry.yarnpkg.com/load-grunt-tasks/-/load-grunt-tasks-5.1.0.tgz#14894c27a7e34ebbef9937c39cc35c573cd04c1c"
-+  resolved "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-5.1.0.tgz"
-   integrity sha512-oNj0Jlka1TsfDe+9He0kcA1cRln+TMoTsEByW7ij6kyktNLxBKJtslCFEvFrLC2Dj0S19IWJh3fOCIjLby2Xrg==
-   dependencies:
-     arrify "^2.0.1"
-@@ -1364,105 +1004,37 @@ load-grunt-tasks@5.1:
- 
- locate-path@^3.0.0:
-   version "3.0.0"
--  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"
-   integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-   dependencies:
-     p-locate "^3.0.0"
-     path-exists "^3.0.0"
- 
--locate-path@^5.0.0:
--  version "5.0.0"
--  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
--  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
--  dependencies:
--    p-locate "^4.1.0"
--
--lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.21, lodash@~4.17.19, lodash@~4.17.21:
-+lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.21, lodash@~4.17.19, lodash@~4.17.21:
-   version "4.17.21"
--  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-+  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
-   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
- 
--lru-cache@^6.0.0:
--  version "6.0.0"
--  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
--  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
--  dependencies:
--    yallist "^4.0.0"
--
--lru-cache@^7.7.1:
--  version "7.18.3"
--  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
--  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
--
--make-fetch-happen@^10.0.4:
--  version "10.2.1"
--  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
--  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
--  dependencies:
--    agentkeepalive "^4.2.1"
--    cacache "^16.1.0"
--    http-cache-semantics "^4.1.0"
--    http-proxy-agent "^5.0.0"
--    https-proxy-agent "^5.0.0"
--    is-lambda "^1.0.1"
--    lru-cache "^7.7.1"
--    minipass "^3.1.6"
--    minipass-collect "^1.0.2"
--    minipass-fetch "^2.0.3"
--    minipass-flush "^1.0.5"
--    minipass-pipeline "^1.2.4"
--    negotiator "^0.6.3"
--    promise-retry "^2.0.1"
--    socks-proxy-agent "^7.0.0"
--    ssri "^9.0.0"
--
--make-fetch-happen@^9.1.0:
--  version "9.1.0"
--  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
--  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
--  dependencies:
--    agentkeepalive "^4.1.3"
--    cacache "^15.2.0"
--    http-cache-semantics "^4.1.0"
--    http-proxy-agent "^4.0.1"
--    https-proxy-agent "^5.0.0"
--    is-lambda "^1.0.1"
--    lru-cache "^6.0.0"
--    minipass "^3.1.3"
--    minipass-collect "^1.0.2"
--    minipass-fetch "^1.3.2"
--    minipass-flush "^1.0.5"
--    minipass-pipeline "^1.2.4"
--    negotiator "^0.6.2"
--    promise-retry "^2.0.1"
--    socks-proxy-agent "^6.0.0"
--    ssri "^8.0.0"
--
- make-iterator@^1.0.0:
-   version "1.0.1"
--  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
-+  resolved "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz"
-   integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
-   dependencies:
-     kind-of "^6.0.2"
- 
- map-cache@^0.2.0:
-   version "0.2.2"
--  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-+  resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"
-   integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
- 
--map-obj@^1.0.0:
--  version "1.0.1"
--  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
--  integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
--
--map-obj@^4.0.0:
--  version "4.3.0"
--  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
--  integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
-+math-intrinsics@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
-+  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
- 
- maxmin@^3.0.0:
-   version "3.0.0"
--  resolved "https://registry.yarnpkg.com/maxmin/-/maxmin-3.0.0.tgz#3ee9acc8a2b9f2b5416e94f5705319df8a9c71e6"
-+  resolved "https://registry.npmjs.org/maxmin/-/maxmin-3.0.0.tgz"
-   integrity sha512-wcahMInmGtg/7c6a75fr21Ch/Ks1Tb+Jtoan5Ft4bAI0ZvJqyOw8kkM7e7p8hDSzY805vmxwHT50KcjGwKyJ0g==
-   dependencies:
-     chalk "^4.1.0"
-@@ -1470,25 +1042,7 @@ maxmin@^3.0.0:
-     gzip-size "^5.1.1"
-     pretty-bytes "^5.3.0"
- 
--meow@^9.0.0:
--  version "9.0.0"
--  resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
--  integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
--  dependencies:
--    "@types/minimist" "^1.2.0"
--    camelcase-keys "^6.2.2"
--    decamelize "^1.2.0"
--    decamelize-keys "^1.1.0"
--    hard-rejection "^2.1.0"
--    minimist-options "4.1.0"
--    normalize-package-data "^3.0.0"
--    read-pkg-up "^7.0.1"
--    redent "^3.0.0"
--    trim-newlines "^3.0.0"
--    type-fest "^0.18.0"
--    yargs-parser "^20.2.3"
--
--micromatch@^4.0.2, micromatch@^4.0.4:
-+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
-   version "4.0.8"
-   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
-   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
-@@ -1496,124 +1050,28 @@ micromatch@^4.0.2, micromatch@^4.0.4:
-     braces "^3.0.3"
-     picomatch "^2.3.1"
- 
--min-indent@^1.0.0:
--  version "1.0.1"
--  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
--  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
--
- minimatch@^3.0.4, minimatch@^3.1.1:
-   version "3.1.2"
--  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
-   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-   dependencies:
-     brace-expansion "^1.1.7"
- 
--minimatch@^5.0.1:
--  version "5.1.6"
--  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
--  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
--  dependencies:
--    brace-expansion "^2.0.1"
--
- minimatch@~3.0.2, minimatch@~3.0.4:
-   version "3.0.8"
--  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1"
-+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz"
-   integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==
-   dependencies:
-     brace-expansion "^1.1.7"
- 
--minimist-options@4.1.0:
--  version "4.1.0"
--  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
--  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
--  dependencies:
--    arrify "^1.0.1"
--    is-plain-obj "^1.1.0"
--    kind-of "^6.0.3"
--
--minipass-collect@^1.0.2:
--  version "1.0.2"
--  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
--  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
--  dependencies:
--    minipass "^3.0.0"
--
--minipass-fetch@^1.3.2:
--  version "1.4.1"
--  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
--  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
--  dependencies:
--    minipass "^3.1.0"
--    minipass-sized "^1.0.3"
--    minizlib "^2.0.0"
--  optionalDependencies:
--    encoding "^0.1.12"
--
--minipass-fetch@^2.0.3:
--  version "2.1.2"
--  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
--  integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
--  dependencies:
--    minipass "^3.1.6"
--    minipass-sized "^1.0.3"
--    minizlib "^2.1.2"
--  optionalDependencies:
--    encoding "^0.1.13"
--
--minipass-flush@^1.0.5:
--  version "1.0.5"
--  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
--  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
--  dependencies:
--    minipass "^3.0.0"
--
--minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
--  version "1.2.4"
--  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
--  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
--  dependencies:
--    minipass "^3.0.0"
--
--minipass-sized@^1.0.3:
--  version "1.0.3"
--  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
--  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
--  dependencies:
--    minipass "^3.0.0"
--
--minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6:
--  version "3.3.6"
--  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
--  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
--  dependencies:
--    yallist "^4.0.0"
--
--minipass@^5.0.0:
--  version "5.0.0"
--  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
--  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
--
--minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
--  version "2.1.2"
--  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
--  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
--  dependencies:
--    minipass "^3.0.0"
--    yallist "^4.0.0"
--
--mkdirp@^1.0.3, mkdirp@^1.0.4:
--  version "1.0.4"
--  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
--  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
--
--ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
-+ms@^2.1.1:
-   version "2.1.3"
--  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
-   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
- 
- multimatch@^4.0.0:
-   version "4.0.0"
--  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3"
-+  resolved "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz"
-   integrity sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==
-   dependencies:
-     "@types/minimatch" "^3.0.3"
-@@ -1622,137 +1080,59 @@ multimatch@^4.0.0:
-     arrify "^2.0.1"
-     minimatch "^3.0.4"
- 
--nan@^2.17.0:
--  version "2.22.0"
--  resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.0.tgz#31bc433fc33213c97bad36404bb68063de604de3"
--  integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==
--
- nanoid@^3.3.7:
--  version "3.3.8"
--  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
--  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
--
--negotiator@^0.6.2, negotiator@^0.6.3:
--  version "0.6.4"
--  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7"
--  integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==
--
--node-gyp@^8.4.1:
--  version "8.4.1"
--  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
--  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
--  dependencies:
--    env-paths "^2.2.0"
--    glob "^7.1.4"
--    graceful-fs "^4.2.6"
--    make-fetch-happen "^9.1.0"
--    nopt "^5.0.0"
--    npmlog "^6.0.0"
--    rimraf "^3.0.2"
--    semver "^7.3.5"
--    tar "^6.1.2"
--    which "^2.0.2"
--
--node-releases@^2.0.18:
--  version "2.0.18"
--  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
--  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
--
--node-sass@9.0:
--  version "9.0.0"
--  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-9.0.0.tgz#c21cd17bd9379c2d09362b3baf2cbf089bce08ed"
--  integrity sha512-yltEuuLrfH6M7Pq2gAj5B6Zm7m+gdZoG66wTqG6mIZV/zijq3M2OO2HswtT6oBspPyFhHDcaxWpsBm0fRNDHPg==
--  dependencies:
--    async-foreach "^0.1.3"
--    chalk "^4.1.2"
--    cross-spawn "^7.0.3"
--    gaze "^1.0.0"
--    get-stdin "^4.0.1"
--    glob "^7.0.3"
--    lodash "^4.17.15"
--    make-fetch-happen "^10.0.4"
--    meow "^9.0.0"
--    nan "^2.17.0"
--    node-gyp "^8.4.1"
--    sass-graph "^4.0.1"
--    stdout-stream "^1.4.0"
--    "true-case-path" "^2.2.1"
--
--nopt@^5.0.0:
--  version "5.0.0"
--  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
--  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
--  dependencies:
--    abbrev "1"
-+  version "3.3.11"
-+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
-+  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
-+
-+node-addon-api@^7.0.0:
-+  version "7.1.1"
-+  resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz"
-+  integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
-+
-+node-releases@^2.0.19:
-+  version "2.0.19"
-+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314"
-+  integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==
- 
- nopt@~3.0.6:
-   version "3.0.6"
--  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-+  resolved "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
-   integrity sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==
-   dependencies:
-     abbrev "1"
- 
- nopt@~4.0.1:
-   version "4.0.3"
--  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
-+  resolved "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz"
-   integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
-   dependencies:
-     abbrev "1"
-     osenv "^0.1.4"
- 
--normalize-package-data@^2.5.0:
--  version "2.5.0"
--  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
--  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
--  dependencies:
--    hosted-git-info "^2.1.4"
--    resolve "^1.10.0"
--    semver "2 || 3 || 4 || 5"
--    validate-npm-package-license "^3.0.1"
--
--normalize-package-data@^3.0.0:
--  version "3.0.3"
--  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
--  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
--  dependencies:
--    hosted-git-info "^4.0.1"
--    is-core-module "^2.5.0"
--    semver "^7.3.4"
--    validate-npm-package-license "^3.0.1"
--
- normalize-range@^0.1.2:
-   version "0.1.2"
--  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-+  resolved "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
-   integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
- 
--npmlog@^6.0.0:
--  version "6.0.2"
--  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
--  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
--  dependencies:
--    are-we-there-yet "^3.0.0"
--    console-control-strings "^1.1.0"
--    gauge "^4.0.3"
--    set-blocking "^2.0.0"
--
- num2fraction@^1.2.2:
-   version "1.2.2"
--  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-+  resolved "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"
-   integrity sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==
- 
- object-assign@^4.1.0:
-   version "4.1.1"
--  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-+  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
-   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
- 
--object-inspect@^1.13.1:
--  version "1.13.3"
--  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a"
--  integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==
-+object-inspect@^1.13.3:
-+  version "1.13.4"
-+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
-+  integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
- 
- object.defaults@^1.1.0:
-   version "1.1.0"
--  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
-+  resolved "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"
-   integrity sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==
-   dependencies:
-     array-each "^1.0.1"
-@@ -1762,7 +1142,7 @@ object.defaults@^1.1.0:
- 
- object.map@^1.0.1:
-   version "1.0.1"
--  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
-+  resolved "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"
-   integrity sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==
-   dependencies:
-     for-own "^1.0.0"
-@@ -1770,160 +1150,126 @@ object.map@^1.0.1:
- 
- object.pick@^1.2.0:
-   version "1.3.0"
--  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-+  resolved "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"
-   integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
-   dependencies:
-     isobject "^3.0.1"
- 
- once@^1.3.0:
-   version "1.4.0"
--  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-+  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
-   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-   dependencies:
-     wrappy "1"
- 
- os-homedir@^1.0.0:
-   version "1.0.2"
--  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-+  resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"
-   integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==
- 
- os-tmpdir@^1.0.0:
-   version "1.0.2"
--  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-+  resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
-   integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
- 
- osenv@^0.1.4:
-   version "0.1.5"
--  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-+  resolved "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"
-   integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-   dependencies:
-     os-homedir "^1.0.0"
-     os-tmpdir "^1.0.0"
- 
--p-limit@^2.0.0, p-limit@^2.2.0:
-+p-limit@^2.0.0:
-   version "2.3.0"
--  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
-   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-   dependencies:
-     p-try "^2.0.0"
- 
- p-locate@^3.0.0:
-   version "3.0.0"
--  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"
-   integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-   dependencies:
-     p-limit "^2.0.0"
- 
--p-locate@^4.1.0:
--  version "4.1.0"
--  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
--  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
--  dependencies:
--    p-limit "^2.2.0"
--
--p-map@^4.0.0:
--  version "4.0.0"
--  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
--  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
--  dependencies:
--    aggregate-error "^3.0.0"
--
- p-try@^2.0.0:
-   version "2.2.0"
--  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-+  resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
-   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
- 
- parse-filepath@^1.0.1:
-   version "1.0.2"
--  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
-+  resolved "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"
-   integrity sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==
-   dependencies:
-     is-absolute "^1.0.0"
-     map-cache "^0.2.0"
-     path-root "^0.1.1"
- 
--parse-json@^5.0.0:
--  version "5.2.0"
--  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
--  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
--  dependencies:
--    "@babel/code-frame" "^7.0.0"
--    error-ex "^1.3.1"
--    json-parse-even-better-errors "^2.3.0"
--    lines-and-columns "^1.1.6"
--
- parse-passwd@^1.0.0:
-   version "1.0.0"
--  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-+  resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"
-   integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
- 
- path-exists@^3.0.0:
-   version "3.0.0"
--  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-+  resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"
-   integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
- 
--path-exists@^4.0.0:
--  version "4.0.0"
--  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
--  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
--
- path-is-absolute@^1.0.0:
-   version "1.0.1"
--  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-+  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
- 
--path-key@^3.1.0:
--  version "3.1.1"
--  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
--  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
--
- path-parse@^1.0.7:
-   version "1.0.7"
--  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-+  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
-   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
- 
- path-root-regex@^0.1.0:
-   version "0.1.2"
--  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-+  resolved "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz"
-   integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==
- 
- path-root@^0.1.1:
-   version "0.1.1"
--  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-+  resolved "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz"
-   integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==
-   dependencies:
-     path-root-regex "^0.1.0"
- 
- picocolors@^0.2.1:
-   version "0.2.1"
--  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
-+  resolved "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"
-   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
- 
--picocolors@^1.0.0, picocolors@^1.1.0, picocolors@^1.1.1:
-+picocolors@^1.1.1:
-   version "1.1.1"
-   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
-   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
- 
- picomatch@^2.3.1:
-   version "2.3.1"
--  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-+  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
-   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
- 
- pify@^4.0.1:
-   version "4.0.1"
--  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-+  resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"
-   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
- 
- pkg-up@^3.1.0:
-   version "3.1.0"
--  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
-+  resolved "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz"
-   integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
-   dependencies:
-     find-up "^3.0.0"
- 
- postcss-value-parser@^4.1.0:
-   version "4.2.0"
--  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
-+  resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
-   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
- 
- postcss@8.4:
-@@ -1937,7 +1283,7 @@ postcss@8.4:
- 
- postcss@^6.0.11:
-   version "6.0.23"
--  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
-+  resolved "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz"
-   integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
-   dependencies:
-     chalk "^2.4.1"
-@@ -1946,7 +1292,7 @@ postcss@^6.0.11:
- 
- postcss@^7.0.32:
-   version "7.0.39"
--  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
-+  resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"
-   integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
-   dependencies:
-     picocolors "^0.2.1"
-@@ -1954,111 +1300,39 @@ postcss@^7.0.32:
- 
- pretty-bytes@^5.3.0:
-   version "5.6.0"
--  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
-+  resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"
-   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
- 
--process-nextick-args@~2.0.0:
--  version "2.0.1"
--  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
--  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
--
--promise-inflight@^1.0.1:
--  version "1.0.1"
--  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
--  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
--
--promise-retry@^2.0.1:
--  version "2.0.1"
--  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
--  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
--  dependencies:
--    err-code "^2.0.2"
--    retry "^0.12.0"
--
- qs@^6.4.0:
--  version "6.13.1"
--  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.1.tgz#3ce5fc72bd3a8171b85c99b93c65dd20b7d1b16e"
--  integrity sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==
-+  version "6.14.0"
-+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930"
-+  integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==
-   dependencies:
--    side-channel "^1.0.6"
--
--quick-lru@^4.0.1:
--  version "4.0.1"
--  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
--  integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
-+    side-channel "^1.1.0"
- 
- raw-body@~1.1.0:
-   version "1.1.7"
--  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
-+  resolved "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz"
-   integrity sha512-WmJJU2e9Y6M5UzTOkHaM7xJGAPQD8PNzx3bAd2+uhZAim6wDk6dAZxPVYLF67XhbR4hmKGh33Lpmh4XWrCH5Mg==
-   dependencies:
-     bytes "1"
-     string_decoder "0.10"
- 
--read-pkg-up@^7.0.1:
--  version "7.0.1"
--  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
--  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
--  dependencies:
--    find-up "^4.1.0"
--    read-pkg "^5.2.0"
--    type-fest "^0.8.1"
--
--read-pkg@^5.2.0:
--  version "5.2.0"
--  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
--  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
--  dependencies:
--    "@types/normalize-package-data" "^2.4.0"
--    normalize-package-data "^2.5.0"
--    parse-json "^5.0.0"
--    type-fest "^0.6.0"
--
--readable-stream@^2.0.1:
--  version "2.3.8"
--  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
--  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
--  dependencies:
--    core-util-is "~1.0.0"
--    inherits "~2.0.3"
--    isarray "~1.0.0"
--    process-nextick-args "~2.0.0"
--    safe-buffer "~5.1.1"
--    string_decoder "~1.1.1"
--    util-deprecate "~1.0.1"
--
--readable-stream@^3.6.0:
--  version "3.6.2"
--  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
--  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
--  dependencies:
--    inherits "^2.0.3"
--    string_decoder "^1.1.1"
--    util-deprecate "^1.0.1"
-+readdirp@^4.0.1:
-+  version "4.1.2"
-+  resolved "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz"
-+  integrity sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==
- 
- rechoir@^0.7.0:
-   version "0.7.1"
--  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
-+  resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz"
-   integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
-   dependencies:
-     resolve "^1.9.0"
- 
--redent@^3.0.0:
--  version "3.0.0"
--  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
--  integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
--  dependencies:
--    indent-string "^4.0.0"
--    strip-indent "^3.0.0"
--
--require-directory@^2.1.1:
--  version "2.1.1"
--  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
--  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
--
- resolve-dir@^1.0.0, resolve-dir@^1.0.1:
-   version "1.0.1"
--  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-+  resolved "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"
-   integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==
-   dependencies:
-     expand-tilde "^2.0.0"
-@@ -2066,352 +1340,182 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
- 
- resolve-from@^5.0.0:
-   version "5.0.0"
--  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
-+  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"
-   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
- 
- resolve-pkg@^2.0.0:
-   version "2.0.0"
--  resolved "https://registry.yarnpkg.com/resolve-pkg/-/resolve-pkg-2.0.0.tgz#ac06991418a7623edc119084edc98b0e6bf05a41"
-+  resolved "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-2.0.0.tgz"
-   integrity sha512-+1lzwXehGCXSeryaISr6WujZzowloigEofRB+dj75y9RRa/obVcYgbHJd53tdYw8pvZj8GojXaaENws8Ktw/hQ==
-   dependencies:
-     resolve-from "^5.0.0"
- 
--resolve@^1.10.0, resolve@^1.19.0, resolve@^1.9.0:
-+resolve@^1.19.0, resolve@^1.9.0:
-   version "1.22.8"
--  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
-+  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz"
-   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
-   dependencies:
-     is-core-module "^2.13.0"
-     path-parse "^1.0.7"
-     supports-preserve-symlinks-flag "^1.0.0"
- 
--retry@^0.12.0:
--  version "0.12.0"
--  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
--  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
--
- rimraf@^2.6.2:
-   version "2.7.1"
--  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"
-   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-   dependencies:
-     glob "^7.1.3"
- 
--rimraf@^3.0.2:
--  version "3.0.2"
--  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
--  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
--  dependencies:
--    glob "^7.1.3"
--
--safe-buffer@>=5.1.0, safe-buffer@~5.2.0:
-+safe-buffer@>=5.1.0:
-   version "5.2.1"
--  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
-   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
- 
--safe-buffer@~5.1.0, safe-buffer@~5.1.1:
--  version "5.1.2"
--  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
--  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
--
- safe-json-parse@~1.0.1:
-   version "1.0.1"
--  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
-+  resolved "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz"
-   integrity sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A==
- 
- "safer-buffer@>= 2.1.2 < 3.0.0":
-   version "2.1.2"
--  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-+  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
-   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
- 
--sass-graph@^4.0.1:
--  version "4.0.1"
--  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-4.0.1.tgz#2ff8ca477224d694055bf4093f414cf6cfad1d2e"
--  integrity sha512-5YCfmGBmxoIRYHnKK2AKzrAkCoQ8ozO+iumT8K4tXJXRVCPf+7s1/9KxTSW3Rbvf+7Y7b4FR3mWyLnQr3PHocA==
--  dependencies:
--    glob "^7.0.0"
--    lodash "^4.17.11"
--    scss-tokenizer "^0.4.3"
--    yargs "^17.2.1"
--
--scss-tokenizer@^0.4.3:
--  version "0.4.3"
--  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz#1058400ee7d814d71049c29923d2b25e61dc026c"
--  integrity sha512-raKLgf1LI5QMQnG+RxHz6oK0sL3x3I4FN2UDLqgLOGO8hodECNnNh5BXn7fAyBxrA8zVzdQizQ6XjNJQ+uBwMw==
-+sass@^1.89.2:
-+  version "1.89.2"
-+  resolved "https://registry.npmjs.org/sass/-/sass-1.89.2.tgz"
-+  integrity sha512-xCmtksBKd/jdJ9Bt9p7nPKiuqrlBMBuuGkQlkhZjjQk3Ty48lv93k5Dq6OPkKt4XwxDJ7tvlfrTa1MPA9bf+QA==
-   dependencies:
--    js-base64 "^2.4.9"
--    source-map "^0.7.3"
-+    chokidar "^4.0.0"
-+    immutable "^5.0.2"
-+    source-map-js ">=0.6.2 <2.0.0"
-+  optionalDependencies:
-+    "@parcel/watcher" "^2.4.1"
- 
- select2@4.1.0-rc.0:
-   version "4.1.0-rc.0"
--  resolved "https://registry.yarnpkg.com/select2/-/select2-4.1.0-rc.0.tgz#ba3cd3901dda0155e1c0219ab41b74ba51ea22d8"
-+  resolved "https://registry.npmjs.org/select2/-/select2-4.1.0-rc.0.tgz"
-   integrity sha512-Hr9TdhyHCZUtwznEH2CBf7967mEM0idtJ5nMtjvk3Up5tPukOLXbHUNmh10oRfeNIhj+3GD3niu+g6sVK+gK0A==
- 
- select@^1.1.2:
-   version "1.1.2"
--  resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
-+  resolved "https://registry.npmjs.org/select/-/select-1.1.2.tgz"
-   integrity sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==
- 
--"semver@2 || 3 || 4 || 5":
--  version "5.7.2"
--  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
--  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
--
--semver@^7.3.4, semver@^7.3.5:
--  version "7.6.3"
--  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
--  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
--
--set-blocking@^2.0.0:
--  version "2.0.0"
--  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
--  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
--
--set-function-length@^1.2.1:
--  version "1.2.2"
--  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
--  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
-+side-channel-list@^1.0.0:
-+  version "1.0.0"
-+  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
-+  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
-   dependencies:
--    define-data-property "^1.1.4"
-     es-errors "^1.3.0"
--    function-bind "^1.1.2"
--    get-intrinsic "^1.2.4"
--    gopd "^1.0.1"
--    has-property-descriptors "^1.0.2"
--
--shebang-command@^2.0.0:
--  version "2.0.0"
--  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
--  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
--  dependencies:
--    shebang-regex "^3.0.0"
-+    object-inspect "^1.13.3"
- 
--shebang-regex@^3.0.0:
--  version "3.0.0"
--  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
--  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
--
--side-channel@^1.0.6:
--  version "1.0.6"
--  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
--  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
-+side-channel-map@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
-+  integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
-   dependencies:
--    call-bind "^1.0.7"
-+    call-bound "^1.0.2"
-     es-errors "^1.3.0"
--    get-intrinsic "^1.2.4"
--    object-inspect "^1.13.1"
--
--signal-exit@^3.0.7:
--  version "3.0.7"
--  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
--  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-+    get-intrinsic "^1.2.5"
-+    object-inspect "^1.13.3"
- 
--smart-buffer@^4.2.0:
--  version "4.2.0"
--  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
--  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
--
--socks-proxy-agent@^6.0.0:
--  version "6.2.1"
--  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
--  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
--  dependencies:
--    agent-base "^6.0.2"
--    debug "^4.3.3"
--    socks "^2.6.2"
--
--socks-proxy-agent@^7.0.0:
--  version "7.0.0"
--  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
--  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
-+side-channel-weakmap@^1.0.2:
-+  version "1.0.2"
-+  resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"
-+  integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
-   dependencies:
--    agent-base "^6.0.2"
--    debug "^4.3.3"
--    socks "^2.6.2"
-+    call-bound "^1.0.2"
-+    es-errors "^1.3.0"
-+    get-intrinsic "^1.2.5"
-+    object-inspect "^1.13.3"
-+    side-channel-map "^1.0.1"
- 
--socks@^2.6.2:
--  version "2.8.3"
--  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.3.tgz#1ebd0f09c52ba95a09750afe3f3f9f724a800cb5"
--  integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==
-+side-channel@^1.1.0:
-+  version "1.1.0"
-+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
-+  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
-   dependencies:
--    ip-address "^9.0.5"
--    smart-buffer "^4.2.0"
-+    es-errors "^1.3.0"
-+    object-inspect "^1.13.3"
-+    side-channel-list "^1.0.0"
-+    side-channel-map "^1.0.1"
-+    side-channel-weakmap "^1.0.2"
- 
--source-map-js@^1.2.1:
-+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.2.1:
-   version "1.2.1"
--  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
-+  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz"
-   integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
- 
- source-map@^0.5.3:
-   version "0.5.7"
--  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
-   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
- 
- source-map@^0.6.1:
-   version "0.6.1"
--  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
-   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
- 
--source-map@^0.7.3:
--  version "0.7.4"
--  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
--  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
--
--spdx-correct@^3.0.0:
--  version "3.2.0"
--  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
--  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
--  dependencies:
--    spdx-expression-parse "^3.0.0"
--    spdx-license-ids "^3.0.0"
--
--spdx-exceptions@^2.1.0:
--  version "2.5.0"
--  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66"
--  integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==
--
--spdx-expression-parse@^3.0.0:
--  version "3.0.1"
--  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
--  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
--  dependencies:
--    spdx-exceptions "^2.1.0"
--    spdx-license-ids "^3.0.0"
--
--spdx-license-ids@^3.0.0:
--  version "3.0.20"
--  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz#e44ed19ed318dd1e5888f93325cee800f0f51b89"
--  integrity sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==
--
--sprintf-js@^1.1.1, sprintf-js@^1.1.3:
-+sprintf-js@^1.1.1:
-   version "1.1.3"
--  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
-+  resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz"
-   integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
- 
- sprintf-js@~1.0.2:
-   version "1.0.3"
--  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-+  resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
-   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
- 
--ssri@^8.0.0, ssri@^8.0.1:
--  version "8.0.1"
--  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
--  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
--  dependencies:
--    minipass "^3.1.1"
--
--ssri@^9.0.0:
--  version "9.0.1"
--  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
--  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
--  dependencies:
--    minipass "^3.1.1"
--
--stdout-stream@^1.4.0:
--  version "1.4.1"
--  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
--  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
--  dependencies:
--    readable-stream "^2.0.1"
--
- string-template@~0.2.1:
-   version "0.2.1"
--  resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
-+  resolved "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz"
-   integrity sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==
- 
--"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
--  version "4.2.3"
--  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
--  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
--  dependencies:
--    emoji-regex "^8.0.0"
--    is-fullwidth-code-point "^3.0.0"
--    strip-ansi "^6.0.1"
--
- string_decoder@0.10:
-   version "0.10.31"
--  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-   integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
- 
--string_decoder@^1.1.1:
--  version "1.3.0"
--  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
--  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
--  dependencies:
--    safe-buffer "~5.2.0"
--
--string_decoder@~1.1.1:
--  version "1.1.1"
--  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
--  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
--  dependencies:
--    safe-buffer "~5.1.0"
--
- strip-ansi@^3.0.0:
-   version "3.0.1"
--  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
-   integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
-   dependencies:
-     ansi-regex "^2.0.0"
- 
--strip-ansi@^6.0.0, strip-ansi@^6.0.1:
--  version "6.0.1"
--  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
--  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
--  dependencies:
--    ansi-regex "^5.0.1"
--
--strip-indent@^3.0.0:
--  version "3.0.0"
--  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
--  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
--  dependencies:
--    min-indent "^1.0.0"
--
- supports-color@^2.0.0:
-   version "2.0.0"
--  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-   integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
- 
- supports-color@^5.3.0, supports-color@^5.4.0:
-   version "5.5.0"
--  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
-   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-   dependencies:
-     has-flag "^3.0.0"
- 
- supports-color@^7.1.0:
-   version "7.2.0"
--  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
-   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-   dependencies:
-     has-flag "^4.0.0"
- 
- supports-preserve-symlinks-flag@^1.0.0:
-   version "1.0.0"
--  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
-+  resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
-   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
- 
--tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
--  version "6.2.1"
--  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
--  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
--  dependencies:
--    chownr "^2.0.0"
--    fs-minipass "^2.0.0"
--    minipass "^5.0.0"
--    minizlib "^2.1.1"
--    mkdirp "^1.0.3"
--    yallist "^4.0.0"
--
- tiny-emitter@^2.0.0:
-   version "2.1.0"
--  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
-+  resolved "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz"
-   integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
- 
- tiny-lr@^1.1.1:
-   version "1.1.1"
--  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"
-+  resolved "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz"
-   integrity sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==
-   dependencies:
-     body "^5.1.0"
-@@ -2423,36 +1527,11 @@ tiny-lr@^1.1.1:
- 
- to-regex-range@^5.0.1:
-   version "5.0.1"
--  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-+  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
-   integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-   dependencies:
-     is-number "^7.0.0"
- 
--trim-newlines@^3.0.0:
--  version "3.0.1"
--  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
--  integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
--
--"true-case-path@^2.2.1":
--  version "2.2.1"
--  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-2.2.1.tgz#c5bf04a5bbec3fd118be4084461b3a27c4d796bf"
--  integrity sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q==
--
--type-fest@^0.18.0:
--  version "0.18.1"
--  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
--  integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
--
--type-fest@^0.6.0:
--  version "0.6.0"
--  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
--  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
--
--type-fest@^0.8.1:
--  version "0.8.1"
--  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
--  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
--
- uglify-js@^3.16.1:
-   version "3.19.3"
-   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.3.tgz#82315e9bbc6f2b25888858acd1fff8441035b77f"
-@@ -2460,81 +1539,45 @@ uglify-js@^3.16.1:
- 
- unc-path-regex@^0.1.2:
-   version "0.1.2"
--  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-+  resolved "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"
-   integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
- 
- underscore.string@~3.3.5:
-   version "3.3.6"
--  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.6.tgz#ad8cf23d7423cb3b53b898476117588f4e2f9159"
-+  resolved "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz"
-   integrity sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==
-   dependencies:
-     sprintf-js "^1.1.1"
-     util-deprecate "^1.0.2"
- 
--unique-filename@^1.1.1:
--  version "1.1.1"
--  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
--  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
--  dependencies:
--    unique-slug "^2.0.0"
--
--unique-filename@^2.0.0:
--  version "2.0.1"
--  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
--  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
--  dependencies:
--    unique-slug "^3.0.0"
--
--unique-slug@^2.0.0:
--  version "2.0.2"
--  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
--  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
--  dependencies:
--    imurmurhash "^0.1.4"
--
--unique-slug@^3.0.0:
--  version "3.0.0"
--  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
--  integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
--  dependencies:
--    imurmurhash "^0.1.4"
--
--update-browserslist-db@^1.1.1:
--  version "1.1.1"
--  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5"
--  integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==
-+update-browserslist-db@^1.1.3:
-+  version "1.1.3"
-+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz#348377dd245216f9e7060ff50b15a1b740b75420"
-+  integrity sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==
-   dependencies:
-     escalade "^3.2.0"
--    picocolors "^1.1.0"
-+    picocolors "^1.1.1"
- 
- uri-path@^1.0.0:
-   version "1.0.0"
--  resolved "https://registry.yarnpkg.com/uri-path/-/uri-path-1.0.0.tgz#9747f018358933c31de0fccfd82d138e67262e32"
-+  resolved "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz"
-   integrity sha512-8pMuAn4KacYdGMkFaoQARicp4HSw24/DHOVKWqVRJ8LhhAwPPFpdGvdL9184JVmUwe7vz7Z9n6IqI6t5n2ELdg==
- 
--util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
-+util-deprecate@^1.0.2:
-   version "1.0.2"
--  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-+  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
- 
- v8flags@~3.2.0:
-   version "3.2.0"
--  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
-+  resolved "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz"
-   integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
-   dependencies:
-     homedir-polyfill "^1.0.1"
- 
--validate-npm-package-license@^3.0.1:
--  version "3.0.4"
--  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
--  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
--  dependencies:
--    spdx-correct "^3.0.0"
--    spdx-expression-parse "^3.0.0"
--
- websocket-driver@>=0.5.1:
-   version "0.7.4"
--  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
-+  resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"
-   integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
-   dependencies:
-     http-parser-js ">=0.5.1"
-@@ -2543,78 +1586,29 @@ websocket-driver@>=0.5.1:
- 
- websocket-extensions@>=0.1.1:
-   version "0.1.4"
--  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
-+  resolved "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"
-   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
- 
- which@^1.2.14:
-   version "1.3.1"
--  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-+  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
-   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-   dependencies:
-     isexe "^2.0.0"
- 
--which@^2.0.1, which@^2.0.2, which@~2.0.2:
-+which@~2.0.2:
-   version "2.0.2"
--  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-+  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
-   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-   dependencies:
-     isexe "^2.0.0"
- 
--wide-align@^1.1.5:
--  version "1.1.5"
--  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
--  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
--  dependencies:
--    string-width "^1.0.2 || 2 || 3 || 4"
--
--wrap-ansi@^7.0.0:
--  version "7.0.0"
--  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
--  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
--  dependencies:
--    ansi-styles "^4.0.0"
--    string-width "^4.1.0"
--    strip-ansi "^6.0.0"
--
- wrappy@1:
-   version "1.0.2"
--  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-+  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
- 
--y18n@^5.0.5:
--  version "5.0.8"
--  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
--  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
--
--yallist@^4.0.0:
--  version "4.0.0"
--  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
--  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
--
--yargs-parser@^20.2.3:
--  version "20.2.9"
--  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
--  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
--
--yargs-parser@^21.1.1:
--  version "21.1.1"
--  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
--  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
--
--yargs@^17.2.1:
--  version "17.7.2"
--  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
--  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
--  dependencies:
--    cliui "^8.0.1"
--    escalade "^3.1.1"
--    get-caller-file "^2.0.5"
--    require-directory "^2.1.1"
--    string-width "^4.2.3"
--    y18n "^5.0.5"
--    yargs-parser "^21.1.1"
--
- zxcvbn@4.4:
-   version "4.4.2"
--  resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.2.tgz#28ec17cf09743edcab056ddd8b1b06262cc73c30"
-+  resolved "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz"
-   integrity sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ==
diff --git a/pkgs/by-name/in/invoiceplane/package.nix b/pkgs/by-name/in/invoiceplane/package.nix
index 18031d2d9a04..4fa9b79c69d2 100644
--- a/pkgs/by-name/in/invoiceplane/package.nix
+++ b/pkgs/by-name/in/invoiceplane/package.nix
@@ -12,12 +12,12 @@
   fetchzip,
 }:
 let
-  version = "1.6.2";
+  version = "1.6.3";
   # Fetch release tarball which contains language files
   # https://github.com/InvoicePlane/InvoicePlane/issues/1170
   languages = fetchzip {
     url = "https://github.com/InvoicePlane/InvoicePlane/releases/download/v${version}/v${version}.zip";
-    hash = "sha256-ME8ornP2uevvH8DzuI25Z8OV0EP98CBgbunvb2Hbr9M=";
+    hash = "sha256-MuqxbkayW3GeiaorxfZSJtlwCWvnIF2ED/UUqahyoIQ=";
   };
 in
 php.buildComposerProject2 (finalAttrs: {
@@ -28,16 +28,19 @@ php.buildComposerProject2 (finalAttrs: {
     owner = "InvoicePlane";
     repo = "InvoicePlane";
     tag = "v${version}";
-    hash = "sha256-E2TZ/FhlVKZpGuczXb/QLn27gGiO7YYlAkPSolTEoeQ=";
+    hash = "sha256-XNjdFWP5AEulbPZcMDXYSdDhaLWlgu3nnCSFnjUjGpk=";
   };
 
   patches = [
-    # Node-sass is deprecated and fails to cross-compile
-    # See: https://github.com/InvoicePlane/InvoicePlane/issues/1275
-    ./node_switch_to_sass.patch
+    # yarn.lock missing some resolved attributes and fails
+    ./fix-yarn-lock.patch
+
+    # Fix composer.json validation
+    # See https://github.com/InvoicePlane/InvoicePlane/pull/1306
+    ./fix_composer_validation.patch
   ];
 
-  vendorHash = "sha256-eq3YKIZZzZihDYgFH3YTETHvNG6hAE/oJ5Ul2XRMn4U=";
+  vendorHash = "sha256-qnWLcEabQpu0Yp4Q2NWQm4XFV4YW679cvXo6p/dDECI=";
 
   nativeBuildInputs = [
     yarnConfigHook
@@ -49,12 +52,9 @@ php.buildComposerProject2 (finalAttrs: {
 
   offlineCache = fetchYarnDeps {
     inherit (finalAttrs) src patches;
-    hash = "sha256-qAm4HnZwfwfjv7LqG+skmFLTHCSJKWH8iRDWFFebXEs=";
+    hash = "sha256-0fPdxOIeQBTulPUxHtaQylm4jevQTONSN1bChqbGbGs=";
   };
 
-  # Upstream composer.json file is missing the name, description and license fields
-  composerStrictValidation = false;
-
   postBuild = ''
     grunt build
   '';

From aa06ffc4c32b2dd117da5d591cb2e9620fc0c4a5 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 7 Aug 2025 12:54:16 +0200
Subject: [PATCH 1846/3724] nixos/invoiceplane: Update patch

---
 nixos/modules/services/web-apps/invoiceplane.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/invoiceplane.nix b/nixos/modules/services/web-apps/invoiceplane.nix
index 10bac784e5f0..4501f1154517 100644
--- a/nixos/modules/services/web-apps/invoiceplane.nix
+++ b/nixos/modules/services/web-apps/invoiceplane.nix
@@ -70,7 +70,7 @@ let
       postPatch = ''
         # Patch index.php file to load additional config file
         substituteInPlace index.php \
-          --replace-fail "require('vendor/autoload.php');" "require('vendor/autoload.php'); \$dotenv = Dotenv\Dotenv::createImmutable(__DIR__, 'extraConfig.php'); \$dotenv->load();";
+          --replace-fail "require __DIR__ . '/vendor/autoload.php';" "require('vendor/autoload.php'); \$dotenv = Dotenv\Dotenv::createImmutable(__DIR__, 'extraConfig.php'); \$dotenv->load();";
       '';
 
       installPhase = ''

From a67f86746f24bba8585f8da52bcc7c5257400260 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 08:34:04 +0000
Subject: [PATCH 1847/3724] vscode-extensions.grapecity.gc-excelviewer: 4.2.63
 -> 4.2.64

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 8b439517c520..5be14cea1ca2 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2093,8 +2093,8 @@ let
         mktplcRef = {
           name = "gc-excelviewer";
           publisher = "grapecity";
-          version = "4.2.63";
-          hash = "sha256-oEsRnkwuickSyLy3nEqSlAQ8JNemORtu2jijCFGgGWY=";
+          version = "4.2.64";
+          hash = "sha256-bHxU/u6T6r4rSfl9olBZZVI8NTttJFzJw3dgYlvavxw=";
         };
         meta = {
           description = "Edit Excel spreadsheets and CSV files in Visual Studio Code and VS Code for the Web";

From 1be12fc9d249aba9c0741bb283a71c80a5041327 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 08:45:45 +0000
Subject: [PATCH 1848/3724] vscode-extensions.danielsanmedium.dscodegpt: 3.14.3
 -> 3.14.19

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 8b439517c520..391cdf3f2cc7 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1212,8 +1212,8 @@ let
         mktplcRef = {
           publisher = "DanielSanMedium";
           name = "dscodegpt";
-          version = "3.14.3";
-          hash = "sha256-B0FYMM7usSkQgq7jZfo3uEvERRQ6PrinO36KJGke/Yo=";
+          version = "3.14.19";
+          hash = "sha256-58D9ZzNIMrVa0nQjev0dGNth29iWL7U/X0NkVLSB7hg=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";

From cc2daea9a3237dcdf0877925a49e65ad3698c92e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 17 Aug 2025 10:51:53 +0200
Subject: [PATCH 1849/3724] googleearth-pro: switch to libxml2_13 that has
 patches for 5 CVEs

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

diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix
index 078fb5c79689..f8f8dba0321b 100644
--- a/pkgs/applications/misc/googleearth-pro/default.nix
+++ b/pkgs/applications/misc/googleearth-pro/default.nix
@@ -20,7 +20,7 @@
   fontconfig,
   dpkg,
   libproxy,
-  libxml2,
+  libxml2_13,
   gst_all_1,
   dbus,
   makeWrapper,
@@ -37,14 +37,6 @@ let
       "amd64"
     else
       throw "Unsupported system ${stdenv.hostPlatform.system} ";
-
-  libxml2' = libxml2.overrideAttrs rec {
-    version = "2.13.8";
-    src = fetchurl {
-      url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-      hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo=";
-    };
-  };
 in
 mkDerivation rec {
   pname = "googleearth-pro";
@@ -78,7 +70,7 @@ mkDerivation rec {
     libXrender
     libproxy
     libxcb
-    libxml2'
+    libxml2_13
     sqlite
     zlib
     alsa-lib

From 19bc4a4ad0e0a198119f0765cb7821e5a9638fa2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 09:03:54 +0000
Subject: [PATCH 1850/3724] vscode-extensions.ms-vsliveshare.vsliveshare:
 1.0.5948 -> 1.0.5959

---
 .../vscode/extensions/ms-vsliveshare.vsliveshare/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix
index 9fa2297a6f13..41fcfb4e7c24 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "vsliveshare";
     publisher = "ms-vsliveshare";
-    version = "1.0.5948";
-    hash = "sha256-KOu9zF5l6MTLU8z/l4xBwRl2X3uIE15YgHEZJrKSHGY=";
+    version = "1.0.5959";
+    hash = "sha256-MibP2zqTwlXXVsXQOSuoi5SO8BskJC/AihrhJFg8tac=";
   };
 
   postPatch = ''

From 1a18663bf45ed72b93778bc47f866e179e75f577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 17 Aug 2025 11:20:40 +0200
Subject: [PATCH 1851/3724] unityhub: switch to libxml2_13 that has patches for
 5 CVEs

---
 pkgs/by-name/un/unityhub/package.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix
index ab7dd5b92db9..f6462328da7c 100644
--- a/pkgs/by-name/un/unityhub/package.nix
+++ b/pkgs/by-name/un/unityhub/package.nix
@@ -96,18 +96,7 @@ stdenv.mkDerivation rec {
         xorg.libXcursor
         glib
         gdk-pixbuf
-        (libxml2.overrideAttrs (oldAttrs: rec {
-          version = "2.13.8";
-          src = fetchurl {
-            url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-            hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo=";
-          };
-          meta = oldAttrs.meta // {
-            knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [
-              "CVE-2025-6021"
-            ];
-          };
-        }))
+        libxml2_13
         zlib
         clang
         git # for git-based packages in unity package manager

From d306a6025e228e4112f40f002826cf3109f6df14 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 17 Aug 2025 05:22:35 -0400
Subject: [PATCH 1852/3724] slipshow: init nixos test

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 nixos/tests/all-tests.nix            |  1 +
 nixos/tests/slipshow.nix             | 35 ++++++++++++++++++++++++++++
 pkgs/by-name/sl/slipshow/package.nix |  6 ++++-
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/slipshow.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 948c86833ae6..772af034f8f8 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1348,6 +1348,7 @@ in
   simple = runTest ./simple.nix;
   sing-box = runTest ./sing-box.nix;
   slimserver = runTest ./slimserver.nix;
+  slipshow = runTest ./slipshow.nix;
   slurm = runTest ./slurm.nix;
   snmpd = runTest ./snmpd.nix;
   smokeping = runTest ./smokeping.nix;
diff --git a/nixos/tests/slipshow.nix b/nixos/tests/slipshow.nix
new file mode 100644
index 000000000000..40e0f0be620e
--- /dev/null
+++ b/nixos/tests/slipshow.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+{
+  name = "slipshow presentation test";
+
+  meta.maintainers = with lib.maintainers; [ ethancedwards8 ];
+
+  nodes.machine = {
+    environment.systemPackages = with pkgs; [ slipshow ];
+
+    environment.etc."slipshow".source = pkgs.fetchFromGitHub {
+      owner = "meithecatte";
+      repo = "bbslides";
+      rev = "ce1c08cafa71ae36dda8cc581956548b8386ae16";
+      hash = "sha256-sOydmvtDeMhNejDkwlsXdrbwtqN6lcNnzTnGzBVRFxA=";
+    };
+  };
+
+  testScript =
+    { nodes, ... }:
+    ''
+      start_all()
+
+      # it may take around a minute to compile the file and serve it
+      machine.succeed("slipshow serve /etc/slipshow/bbslides.md &>/dev/null &")
+
+      # slipshow serves defaultly on :8080 and unfortunately cannot
+      # be changed currently
+      machine.wait_for_open_port(8080)
+      machine.succeed("curl -i 0.0.0.0:8080")
+    '';
+}
diff --git a/pkgs/by-name/sl/slipshow/package.nix b/pkgs/by-name/sl/slipshow/package.nix
index 1dafb04b9b84..15b1f52bd8aa 100644
--- a/pkgs/by-name/sl/slipshow/package.nix
+++ b/pkgs/by-name/sl/slipshow/package.nix
@@ -3,6 +3,7 @@
   ocamlPackages,
   fetchFromGitHub,
   versionCheckHook,
+  nixosTests,
   nix-update-script,
 }:
 
@@ -49,7 +50,10 @@ ocamlPackages.buildDunePackage rec {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    tests = { inherit (nixosTests) slipshow; };
+    updateScript = nix-update-script { };
+  };
 
   meta = {
     description = "Engine for displaying slips, the next-gen version of slides";

From 948d12e6ca1fefc5ea64962fea458b96238d229b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 17 Aug 2025 11:35:08 +0200
Subject: [PATCH 1853/3724] omnissa-horizon-client: switch to libxml2_13 that
 has patches for 5 CVEs

---
 .../om/omnissa-horizon-client/package.nix       | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/pkgs/by-name/om/omnissa-horizon-client/package.nix b/pkgs/by-name/om/omnissa-horizon-client/package.nix
index f33afecb0e96..5521d5bebcec 100644
--- a/pkgs/by-name/om/omnissa-horizon-client/package.nix
+++ b/pkgs/by-name/om/omnissa-horizon-client/package.nix
@@ -114,22 +114,7 @@ let
           xorg.libXScrnSaver
           xorg.libXtst
           zlib
-
-          # c.f. https://github.com/NixOS/nixpkgs/pull/418543
-          (libxml2.overrideAttrs (oldAttrs: rec {
-            version = "2.13.8";
-            src = fetchurl {
-              url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-              hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo=";
-            };
-            meta = oldAttrs.meta // {
-              knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [
-                "CVE-2025-49794"
-                "CVE-2025-49796"
-                "CVE-2025-6021"
-              ];
-            };
-          }))
+          libxml2_13
 
           (writeTextDir "etc/omnissa/config" configText)
         ];

From fafb2bdc0cace7f3fbaec6bb1976ad61edc5897a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 09:35:42 +0000
Subject: [PATCH 1854/3724] vscode-extensions.danielgavin.ols: 0.1.38 -> 0.1.43

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 8b439517c520..44dc63b2b246 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1197,8 +1197,8 @@ let
         mktplcRef = {
           publisher = "DanielGavin";
           name = "ols";
-          version = "0.1.38";
-          hash = "sha256-LmCGTyV/oHKq502Hp1UvJ/6q90MC6D5l5/7cd38EGm8=";
+          version = "0.1.43";
+          hash = "sha256-b5jBEj4Kw5Nmm1L1RSNIZsqbpdo3EkOGaSH/7QK8y84=";
         };
         meta = {
           description = "Visual Studio Code extension for Odin language";

From 78d5fc170ab891111ced24c4222eb014269c0ab7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 09:37:30 +0000
Subject: [PATCH 1855/3724] 
 vscode-extensions.amazonwebservices.amazon-q-vscode: 1.88.0 -> 1.90.0

---
 .../extensions/amazonwebservices.amazon-q-vscode/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
index 4a908685ec8d..b69e9022d6f0 100644
--- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
   mktplcRef = {
     name = "amazon-q-vscode";
     publisher = "AmazonWebServices";
-    version = "1.88.0";
-    hash = "sha256-4utsGujCTUcfHbdHo7FOIT/MPo+bZ1GxyZxaRkt+/xk=";
+    version = "1.90.0";
+    hash = "sha256-9z8EB5jMtpmQadbX0usWUlbs/n87wX9dJcyrveKqyJ8=";
   };
 
   meta = {

From b2c3786c5d8743124ec2a9304e5051aeed0a47aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 17 Aug 2025 11:42:25 +0200
Subject: [PATCH 1856/3724] nxwitness-client: switch to libxml2_13 that has
 patches for 5 CVEs

---
 pkgs/by-name/nx/nxwitness-client/package.nix | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/pkgs/by-name/nx/nxwitness-client/package.nix b/pkgs/by-name/nx/nxwitness-client/package.nix
index e8fbdf169cab..741eb0f8dc7b 100644
--- a/pkgs/by-name/nx/nxwitness-client/package.nix
+++ b/pkgs/by-name/nx/nxwitness-client/package.nix
@@ -12,7 +12,7 @@
   libudev-zero,
   libxcb,
   libxkbfile,
-  libxml2,
+  libxml2_13,
   libxslt,
   openal,
   qt6Packages,
@@ -26,19 +26,6 @@ let
   version = "6.0.3";
   build = "40736";
 
-  libxml2_13 = libxml2.overrideAttrs (oldAttrs: rec {
-    version = "2.13.8";
-    src = fetchurl {
-      url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-      hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo=";
-    };
-    meta = oldAttrs.meta // {
-      knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [
-        "CVE-2025-6021"
-      ];
-    };
-  });
-
   buildInputs = [
     glib
     gst_all_1.gst-plugins-base

From e018cc553e4667d3c7a9430e731878cd8b6bfc3f Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Sun, 17 Aug 2025 12:50:44 +0200
Subject: [PATCH 1857/3724] influxdb2.libflux: fix build with rust 1.89

---
 pkgs/servers/nosql/influxdb2/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix
index 6628e1130ce2..4311ecf84a93 100644
--- a/pkgs/servers/nosql/influxdb2/default.nix
+++ b/pkgs/servers/nosql/influxdb2/default.nix
@@ -43,10 +43,12 @@ let
       # https://github.com/influxdata/flux/pull/5542
       ./fix-unsigned-char.patch
     ];
-    # Don't fail on missing code documentation
+    # Don't fail on warnings
     postPatch = ''
-      substituteInPlace flux-core/src/lib.rs \
-        --replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]"
+      substituteInPlace flux/Cargo.toml \
+        --replace-fail 'default = ["strict", ' 'default = ['
+      substituteInPlace flux-core/Cargo.toml \
+        --replace-fail 'default = ["strict"]' 'default = []'
     '';
     sourceRoot = "${src.name}/libflux";
 

From 8eb79fad9893097fa6f6a58f1b13c067eed49867 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 11:15:14 +0000
Subject: [PATCH 1858/3724] intel-compute-runtime: 25.27.34303.6 ->
 25.31.34666.3

---
 pkgs/by-name/in/intel-compute-runtime/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix
index 3abc8d94ec31..d2522b3fc585 100644
--- a/pkgs/by-name/in/intel-compute-runtime/package.nix
+++ b/pkgs/by-name/in/intel-compute-runtime/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-compute-runtime";
-  version = "25.27.34303.6";
+  version = "25.31.34666.3";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "compute-runtime";
     tag = version;
-    hash = "sha256-AgdPhEAg9N15lNfcX/zQLxBUDTzEEvph+y0FYbB6iCs=";
+    hash = "sha256-eijW4VYKUbiC7izaocadIxFvdZ3neaM3dewPnQDCLYc=";
   };
 
   nativeBuildInputs = [

From 114abf2c40aef6835af604309d60489db12afd43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 17 Aug 2025 14:01:11 +0200
Subject: [PATCH 1859/3724] plex-desktop: switch to libxml2_13 that has patches
 for 5 CVEs

---
 pkgs/by-name/pl/plex-desktop/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pl/plex-desktop/package.nix b/pkgs/by-name/pl/plex-desktop/package.nix
index 13b35878c96d..25b8c50fbe13 100644
--- a/pkgs/by-name/pl/plex-desktop/package.nix
+++ b/pkgs/by-name/pl/plex-desktop/package.nix
@@ -12,6 +12,7 @@
   libpulseaudio,
   libva,
   libxkbcommon,
+  libxml2_13,
   makeShellWrapper,
   minizip,
   nss,
@@ -59,6 +60,7 @@ let
       libpulseaudio
       libva
       libxkbcommon
+      libxml2_13
       minizip
       nss
       stdenv.cc.cc
@@ -116,7 +118,6 @@ let
       cp usr/lib/x86_64-linux-gnu/libtiff.so.5 $out/lib/libtiff.so.5
       cp usr/lib/x86_64-linux-gnu/libwebp.so.6 $out/lib/libwebp.so.6
       cp usr/lib/x86_64-linux-gnu/libxkbfile.so.1.0.2 $out/lib/libxkbfile.so.1
-      cp usr/lib/x86_64-linux-gnu/libxml2.so.2 $out/lib/libxml2.so.2
       cp usr/lib/x86_64-linux-gnu/libxslt.so.1.1.34 $out/lib/libxslt.so.1
 
       runHook postInstall

From db6926cd484d6017191623e149ae71df4cd99a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 17 Aug 2025 14:04:20 +0200
Subject: [PATCH 1860/3724] plex-desktop: move libedit to buildInputs

---
 pkgs/by-name/pl/plex-desktop/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/plex-desktop/package.nix b/pkgs/by-name/pl/plex-desktop/package.nix
index 25b8c50fbe13..6dae4b0a9212 100644
--- a/pkgs/by-name/pl/plex-desktop/package.nix
+++ b/pkgs/by-name/pl/plex-desktop/package.nix
@@ -57,6 +57,7 @@ let
     buildInputs = [
       elfutils
       ffmpeg_6-headless
+      libedit
       libpulseaudio
       libva
       libxkbcommon
@@ -106,8 +107,6 @@ let
       rm $out/lib/libdrm.so*
       rm $out/lib/libdrm*
 
-      ln -s ${libedit}/lib/libedit.so.0 $out/lib/libedit.so.2
-
       # Keep dependencies where the version from nixpkgs is higher.
       cp usr/lib/x86_64-linux-gnu/libasound.so.2 $out/lib/libasound.so.2
       cp usr/lib/x86_64-linux-gnu/libjbig.so.0 $out/lib/libjbig.so.0

From bd54791411dad5962e3a72c85aff9806bc206f16 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Aug 2025 14:15:28 +0200
Subject: [PATCH 1861/3724] maintainers: drop pradeepchhetri

Inactive since 2017, not a member of the NixOS org, can't be pinged for
review.
---
 maintainers/maintainer-list.nix                        | 6 ------
 pkgs/applications/networking/cluster/nomad/default.nix | 1 -
 pkgs/by-name/co/consul-template/package.nix            | 1 -
 pkgs/by-name/co/consul/package.nix                     | 1 -
 pkgs/by-name/en/envconsul/package.nix                  | 1 -
 pkgs/by-name/ht/httplab/package.nix                    | 1 -
 pkgs/by-name/ri/riemann_c_client/package.nix           | 1 -
 pkgs/by-name/se/serfdom/package.nix                    | 1 -
 pkgs/by-name/va/vault/package.nix                      | 1 -
 pkgs/by-name/wu/wuzz/package.nix                       | 1 -
 pkgs/by-name/zo/zookeeper/package.nix                  | 1 -
 pkgs/tools/networking/openconnect/common.nix           | 1 -
 12 files changed, 17 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7ffe17b6388f..abd9416bf40c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -20403,12 +20403,6 @@
     github = "ppom0";
     githubId = 38916722;
   };
-  pradeepchhetri = {
-    email = "pradeep.chhetri89@gmail.com";
-    github = "pradeepchhetri";
-    githubId = 2232667;
-    name = "Pradeep Chhetri";
-  };
   pradyuman = {
     email = "me@pradyuman.co";
     github = "pradyuman";
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index 9f34af0fa64c..ab212efb4898 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -71,7 +71,6 @@ let
           inherit license;
           maintainers = with maintainers; [
             rushmorem
-            pradeepchhetri
             techknowlogick
             cottand
           ];
diff --git a/pkgs/by-name/co/consul-template/package.nix b/pkgs/by-name/co/consul-template/package.nix
index 82a845135961..0b8423a0002e 100644
--- a/pkgs/by-name/co/consul-template/package.nix
+++ b/pkgs/by-name/co/consul-template/package.nix
@@ -33,7 +33,6 @@ buildGoModule rec {
     license = licenses.mpl20;
     maintainers = with maintainers; [
       cpcloud
-      pradeepchhetri
     ];
     mainProgram = "consul-template";
   };
diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix
index e467356f844b..d9a1b03c2d46 100644
--- a/pkgs/by-name/co/consul/package.nix
+++ b/pkgs/by-name/co/consul/package.nix
@@ -58,7 +58,6 @@ buildGoModule rec {
     license = lib.licenses.bsl11;
     maintainers = with lib.maintainers; [
       adamcstephens
-      pradeepchhetri
       vdemeester
       nh2
       techknowlogick
diff --git a/pkgs/by-name/en/envconsul/package.nix b/pkgs/by-name/en/envconsul/package.nix
index a7144c07e7a1..35e06980b15e 100644
--- a/pkgs/by-name/en/envconsul/package.nix
+++ b/pkgs/by-name/en/envconsul/package.nix
@@ -34,7 +34,6 @@ buildGoModule rec {
     homepage = "https://github.com/hashicorp/envconsul/";
     description = "Read and set environmental variables for processes from Consul";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ pradeepchhetri ];
     mainProgram = "envconsul";
   };
 }
diff --git a/pkgs/by-name/ht/httplab/package.nix b/pkgs/by-name/ht/httplab/package.nix
index fd2257ef8f90..3b7034fc9c9a 100644
--- a/pkgs/by-name/ht/httplab/package.nix
+++ b/pkgs/by-name/ht/httplab/package.nix
@@ -26,7 +26,6 @@ buildGoModule rec {
     homepage = "https://github.com/qustavo/httplab";
     description = "Interactive WebServer";
     license = licenses.mit;
-    maintainers = with maintainers; [ pradeepchhetri ];
     mainProgram = "httplab";
   };
 }
diff --git a/pkgs/by-name/ri/riemann_c_client/package.nix b/pkgs/by-name/ri/riemann_c_client/package.nix
index 6c11b99326d3..5a691d0fd29e 100644
--- a/pkgs/by-name/ri/riemann_c_client/package.nix
+++ b/pkgs/by-name/ri/riemann_c_client/package.nix
@@ -57,7 +57,6 @@ stdenv.mkDerivation rec {
     description = "C client library for the Riemann monitoring system";
     mainProgram = "riemann-client";
     license = licenses.eupl12;
-    maintainers = with maintainers; [ pradeepchhetri ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/se/serfdom/package.nix b/pkgs/by-name/se/serfdom/package.nix
index 274e79664648..d587a397362d 100644
--- a/pkgs/by-name/se/serfdom/package.nix
+++ b/pkgs/by-name/se/serfdom/package.nix
@@ -40,6 +40,5 @@ buildGoModule rec {
     '';
     homepage = "https://www.serf.io";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ pradeepchhetri ];
   };
 }
diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix
index b393fff93c77..b1d2740deb1b 100644
--- a/pkgs/by-name/va/vault/package.nix
+++ b/pkgs/by-name/va/vault/package.nix
@@ -75,7 +75,6 @@ buildGoModule rec {
       rushmorem
       lnl7
       offline
-      pradeepchhetri
       Chili-Man
       techknowlogick
     ];
diff --git a/pkgs/by-name/wu/wuzz/package.nix b/pkgs/by-name/wu/wuzz/package.nix
index caf1249bdaf4..8993e4975182 100644
--- a/pkgs/by-name/wu/wuzz/package.nix
+++ b/pkgs/by-name/wu/wuzz/package.nix
@@ -31,7 +31,6 @@ buildGoModule rec {
     homepage = "https://github.com/asciimoo/wuzz";
     description = "Interactive cli tool for HTTP inspection";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ pradeepchhetri ];
     mainProgram = "wuzz";
   };
 }
diff --git a/pkgs/by-name/zo/zookeeper/package.nix b/pkgs/by-name/zo/zookeeper/package.nix
index 7e0cad01d7e3..f2f20529a3a5 100644
--- a/pkgs/by-name/zo/zookeeper/package.nix
+++ b/pkgs/by-name/zo/zookeeper/package.nix
@@ -57,7 +57,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       nathan-gs
-      pradeepchhetri
       ztzg
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/tools/networking/openconnect/common.nix
index b46438481254..a3b76f017c17 100644
--- a/pkgs/tools/networking/openconnect/common.nix
+++ b/pkgs/tools/networking/openconnect/common.nix
@@ -60,7 +60,6 @@ stdenv.mkDerivation {
     homepage = "https://www.infradead.org/openconnect/";
     license = licenses.lgpl21Only;
     maintainers = with maintainers; [
-      pradeepchhetri
       tricktron
       pentane
     ];

From 8c1ee82815f2f658bbf1f2b0ed32aeb2a756bbea Mon Sep 17 00:00:00 2001
From: Alexander Nabokikh <alexander.nabokikh@olx.pl>
Date: Sun, 17 Aug 2025 15:02:07 +0200
Subject: [PATCH 1862/3724] albert: 0.31.1 -> 0.32.0

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

diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix
index 584e49468f16..c49e42cdce80 100644
--- a/pkgs/by-name/al/albert/package.nix
+++ b/pkgs/by-name/al/albert/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "albert";
-  version = "0.31.1";
+  version = "0.32.0";
 
   src = fetchFromGitHub {
     owner = "albertlauncher";
     repo = "albert";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7YtDC0Xkv2y7vF58j78GsOPAMSvuwTmEobHULDBt9BI=";
+    hash = "sha256-qxJ73aI8EgHgv5xWedGXkynMtZ9vLV8azBSmJGd0v7g=";
     fetchSubmodules = true;
   };
 

From 260fae4daa432b96359b9d6794786278f89de478 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 17 Aug 2025 15:09:13 +0200
Subject: [PATCH 1863/3724] matrix-synapse-unwrapped: restrict to linux

This is the only platform we and upstream test for.
---
 pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index cfd8522dc67d..7b29a8490732 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -165,5 +165,6 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ sumnerevans ];
     teams = [ lib.teams.matrix ];
+    platforms = lib.platforms.linux;
   };
 }

From 90e0d85fcbaa3fa66d662426ca801b18d8cf731b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 14:14:05 +0000
Subject: [PATCH 1864/3724] cargo-ndk: 3.5.7 -> 4.1.2

---
 pkgs/by-name/ca/cargo-ndk/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-ndk/package.nix b/pkgs/by-name/ca/cargo-ndk/package.nix
index 0ac2105853c8..3586de5b19f7 100644
--- a/pkgs/by-name/ca/cargo-ndk/package.nix
+++ b/pkgs/by-name/ca/cargo-ndk/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-ndk";
-  version = "3.5.7";
+  version = "4.1.2";
 
   src = fetchFromGitHub {
     owner = "bbqsrc";
     repo = "cargo-ndk";
     rev = "v${version}";
-    sha256 = "sha256-tzjiq1jjluWqTl+8MhzFs47VRp3jIRJ7EOLhUP8ydbM=";
+    sha256 = "sha256-1LtjBbfrHKgfqcwz40l7d4+d9C4vY/BKI2P2Oshk+a0=";
   };
 
-  cargoHash = "sha256-Kt4GLvbGK42RjivLpL5W5z5YBfDP5B83mCulWz6Bisw=";
+  cargoHash = "sha256-QB4s6g3QmHFPtR7utGmfhQ8iUFyw6DXGii4XTj2V874=";
 
   meta = with lib; {
     description = "Cargo extension for building Android NDK projects";

From 692f672e0092ab5d27c9238952f1c0bc25f83a3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 14:39:35 +0000
Subject: [PATCH 1865/3724] amazon-cloudwatch-agent: 1.300058.1 -> 1.300059.0

---
 pkgs/by-name/am/amazon-cloudwatch-agent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
index a2b3e1e1eefc..95ff87707a68 100644
--- a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
+++ b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "amazon-cloudwatch-agent";
-  version = "1.300058.1";
+  version = "1.300059.0";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-cloudwatch-agent";
     tag = "v${version}";
-    hash = "sha256-WamwlJNx7zEHlvFiJghUEvojni6TvdmHnXSz6h3Ifvo=";
+    hash = "sha256-xon1M3xusoFngeZ2CJprS1z4fcrWeKCKaAtAfv4SBWw=";
   };
 
-  vendorHash = "sha256-kUQ0pAtIWPI3/iKUNWW7MQ8vUNQOEgysTTlgPTjynac=";
+  vendorHash = "sha256-79BaMjl1bzQcl3FUvpwRsPneQRyfabU481eLgWA1U6Y=";
 
   # See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77.
   subPackages = [

From 24de5b78e5d099169865156794e6d433c64f5193 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 14:55:30 +0000
Subject: [PATCH 1866/3724] uxn: 1.0-unstable-2025-07-12 ->
 1.0-unstable-2025-08-09

---
 pkgs/by-name/ux/uxn/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix
index 9b72375cedc3..4438bbbe03e0 100644
--- a/pkgs/by-name/ux/uxn/package.nix
+++ b/pkgs/by-name/ux/uxn/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uxn";
-  version = "1.0-unstable-2025-07-12";
+  version = "1.0-unstable-2025-08-09";
 
   src = fetchFromSourcehut {
     owner = "~rabbits";
     repo = "uxn";
-    rev = "0bf6fc74c42f2bdfe3c7dfcdcb5290ee72efe99c";
-    hash = "sha256-FSxU6a8+G1iGIj1PCJi7zPLYIfos8Xk7KA4NxTW6+DI=";
+    rev = "b56cb3501b741410188b00ffcac9010cfbe1783c";
+    hash = "sha256-chw6+67JSlzelVhoQ7K1w7i61OnbmnEDyqDyaGAbflE=";
   };
 
   outputs = [

From 70cd625083b5840633231435f068a335bcaf7218 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 15:02:53 +0000
Subject: [PATCH 1867/3724] vscode-extensions.rooveterinaryinc.roo-cline:
 3.25.13 -> 3.25.16

---
 .../vscode/extensions/rooveterinaryinc.roo-cline/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
index 1af8c7126f64..3bbf2067f6ce 100644
--- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "RooVeterinaryInc";
     name = "roo-cline";
-    version = "3.25.13";
-    hash = "sha256-n9QJjcRd1958uJdf7X7rV/6nBdFX6VPiA8N03t8rzHQ=";
+    version = "3.25.16";
+    hash = "sha256-ybyv3bbMrCSHJN6oH82LpJQFZLJ0QWCsBV7F6Qz/DEI=";
   };
 
   passthru.updateScript = vscode-extension-update-script { };

From 3a426e8144bacf18db36268e4caeff2642c8b5cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 15:46:23 +0000
Subject: [PATCH 1868/3724] g3proxy: 1.11.9 -> 1.12.1

---
 pkgs/by-name/g3/g3proxy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/g3/g3proxy/package.nix b/pkgs/by-name/g3/g3proxy/package.nix
index 2b465a5cacab..4e786869874e 100644
--- a/pkgs/by-name/g3/g3proxy/package.nix
+++ b/pkgs/by-name/g3/g3proxy/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "g3proxy";
-  version = "1.11.9";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "bytedance";
     repo = "g3";
     tag = "g3proxy-v${finalAttrs.version}";
-    hash = "sha256-N6Fvdc+Vj7S9CgBby9unKBVBoM9pPlmfyJPxY3KdSXg=";
+    hash = "sha256-nEvkzWbjbnhFC4HqYgw89FIKx2HlvX+fYR05bgzKdMg=";
   };
 
-  cargoHash = "sha256-bLzkA50XiIUrGyKZ3upo2psjFnjUNups0aIEou+J5IA=";
+  cargoHash = "sha256-Ey0STb6VeExYIYx/k5o5d2oMDwmxS7gvH31+3WPea/M=";
 
   cargoBuildFlags = [
     "-p"

From 92e97f952a7acf5842944a9a334012f34eb451f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 15:50:50 +0000
Subject: [PATCH 1869/3724] patchelfUnstable: 0.18.0-unstable-2025-02-15 ->
 0.18.0-unstable-2025-08-13

---
 pkgs/development/tools/misc/patchelf/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index 5fa4f0474285..5e7e7d34f86e 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation {
   pname = "patchelf";
-  version = "0.18.0-unstable-2025-02-15";
+  version = "0.18.0-unstable-2025-08-13";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "patchelf";
-    rev = "523f401584d9584e76c9c77004e7abeb9e6c4551";
-    sha256 = "sha256-KYFHARMXv4cXJezf41enxmU8MX1RWP4L2E7Ueq6mtRM=";
+    rev = "b49de1b3384e7928bf0df9a889fe5a4e7b3fbddf";
+    sha256 = "sha256-0AGK+ZPZDc7zTVAmG6jAAynQhh4nP8skVwOEV5hZKh0=";
   };
 
   # Drop test that fails on musl (?)

From fce4791b3bcca4c798e934d686cfd1f793616602 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 16:28:03 +0000
Subject: [PATCH 1870/3724] python3Packages.streamlit: 1.47.1 -> 1.48.1

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

diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix
index cf0128aa7f32..f31bfe6e060c 100644
--- a/pkgs/development/python-modules/streamlit/default.nix
+++ b/pkgs/development/python-modules/streamlit/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "streamlit";
-  version = "1.47.1";
+  version = "1.48.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2u15dj0cr+sDzdgAuRqpx63DaIxrLL9OzCyomaq4Kio=";
+    hash = "sha256-xuKp8kRxdGu+qlSiiPX9/G4rzzupqXU/3l1J7UJDkfE=";
   };
 
   build-system = [

From 5e95a7fdb4f74603b93fcea63316531dd511fbbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 16:53:34 +0000
Subject: [PATCH 1871/3724] ansible-lint: 25.7.0 -> 25.8.1

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

diff --git a/pkgs/by-name/an/ansible-lint/package.nix b/pkgs/by-name/an/ansible-lint/package.nix
index e0c8bedd0de3..2512ae5bb914 100644
--- a/pkgs/by-name/an/ansible-lint/package.nix
+++ b/pkgs/by-name/an/ansible-lint/package.nix
@@ -8,13 +8,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ansible-lint";
-  version = "25.7.0";
+  version = "25.8.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "ansible_lint";
-    hash = "sha256-mvz0GZl84f/FesqjpW83e86M7rnbEOarhP1WXQm+QIs=";
+    hash = "sha256-BAWePPW2ROeW4h1EUARiHR4kVOOuto0e6gpJ9lDvMhk=";
   };
 
   postPatch = ''

From b222b8cf96b91eeaf6c43c2d9f0dd35eca481201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sun, 17 Aug 2025 11:07:05 -0600
Subject: [PATCH 1872/3724] enblend-enfuse: add libjpeg dependency

---
 pkgs/by-name/en/enblend-enfuse/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/en/enblend-enfuse/package.nix b/pkgs/by-name/en/enblend-enfuse/package.nix
index 931359afb433..a7d013ea5c74 100644
--- a/pkgs/by-name/en/enblend-enfuse/package.nix
+++ b/pkgs/by-name/en/enblend-enfuse/package.nix
@@ -8,6 +8,7 @@
   glew,
   gsl,
   lcms2,
+  libjpeg,
   libpng,
   libtiff,
   libGLU,
@@ -35,6 +36,7 @@ stdenv.mkDerivation {
     glew
     gsl
     lcms2
+    libjpeg
     libpng
     libtiff
     libGLU

From fa73d759265c26512d35e64177b0e17356e03788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sun, 17 Aug 2025 11:11:26 -0600
Subject: [PATCH 1873/3724] gnome-disk-utility: lexicographically sort
 dependencies

---
 .../by-name/gn/gnome-disk-utility/package.nix | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix
index 6a61d64e49f6..34a73d1d48bd 100644
--- a/pkgs/by-name/gn/gnome-disk-utility/package.nix
+++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix
@@ -1,31 +1,31 @@
 {
   lib,
   stdenv,
-  gettext,
   fetchurl,
-  pkg-config,
-  udisks2,
-  libhandy,
-  libsecret,
-  libdvdread,
-  meson,
-  ninja,
-  gtk3,
+  adwaita-icon-theme,
+  desktop-file-utils,
+  docbook-xsl-nons,
+  gettext,
   glib,
-  wrapGAppsHook3,
-  libnotify,
-  itstool,
   gnome,
   gnome-settings-daemon,
-  adwaita-icon-theme,
-  libxml2,
   gsettings-desktop-schemas,
+  gtk3,
+  itstool,
   libcanberra-gtk3,
-  libxslt,
-  docbook-xsl-nons,
-  desktop-file-utils,
+  libdvdread,
+  libhandy,
+  libnotify,
   libpwquality,
+  libsecret,
+  libxml2,
+  libxslt,
+  meson,
+  ninja,
+  pkg-config,
   systemd,
+  udisks2,
+  wrapGAppsHook3,
 }:
 
 stdenv.mkDerivation rec {
@@ -38,32 +38,32 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
+    desktop-file-utils
+    docbook-xsl-nons
+    gettext
+    itstool
+    libxml2
+    libxslt
     meson
     ninja
     pkg-config
-    gettext
-    itstool
-    libxslt
-    docbook-xsl-nons
-    desktop-file-utils
     wrapGAppsHook3
-    libxml2
   ];
 
   buildInputs = [
-    gtk3
-    glib
-    libhandy
-    libsecret
-    libpwquality
-    libnotify
-    libdvdread
-    libcanberra-gtk3
-    udisks2
     adwaita-icon-theme
-    systemd
+    glib
     gnome-settings-daemon
     gsettings-desktop-schemas
+    gtk3
+    libcanberra-gtk3
+    libdvdread
+    libhandy
+    libnotify
+    libpwquality
+    libsecret
+    systemd
+    udisks2
   ];
 
   passthru = {

From 82f10c1b336672616fe29dd4b71fcef10b3abd3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sun, 17 Aug 2025 11:12:39 -0600
Subject: [PATCH 1874/3724] gnome-disk-utility: add xz dependency

---
 pkgs/by-name/gn/gnome-disk-utility/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix
index 34a73d1d48bd..5231521e2431 100644
--- a/pkgs/by-name/gn/gnome-disk-utility/package.nix
+++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix
@@ -26,6 +26,7 @@
   systemd,
   udisks2,
   wrapGAppsHook3,
+  xz,
 }:
 
 stdenv.mkDerivation rec {
@@ -64,6 +65,7 @@ stdenv.mkDerivation rec {
     libsecret
     systemd
     udisks2
+    xz
   ];
 
   passthru = {

From 56a175c344fa9afcd4785ad907defd79f7976571 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 17:21:40 +0000
Subject: [PATCH 1875/3724] klipper: 0.13.0-unstable-2025-08-03 ->
 0.13.0-unstable-2025-08-15

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

diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index bfab5d5477ad..598714cc3c8e 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "klipper";
-  version = "0.13.0-unstable-2025-08-03";
+  version = "0.13.0-unstable-2025-08-15";
 
   src = fetchFromGitHub {
     owner = "KevinOConnor";
     repo = "klipper";
-    rev = "5eb07966b5d7e1534aa40df3b0ea305f5c6d9ae2";
-    sha256 = "sha256-AUK0vGhz1ZvVtEpVto/Qlp4+3PGsjOTBzj8Ik8sfmRQ=";
+    rev = "d34d3b05b89b3bb3d56b61b0029a42af9704b2f2";
+    sha256 = "sha256-HYE6CX2VOOVxfa791dXX1dthKgXG1ezltDlSqebgmuM=";
   };
 
   sourceRoot = "${src.name}/klippy";

From 00118160b9b574ac5db380a36e56d8c1ac3266d2 Mon Sep 17 00:00:00 2001
From: MaxHearnden <maxoscarhearnden@gmail.com>
Date: Sun, 17 Aug 2025 18:57:51 +0100
Subject: [PATCH 1876/3724] linux: Reenable Logitech force feedback drivers

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

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 999841637624..6bef8062363a 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -1091,7 +1091,9 @@ let
         HOLTEK_FF = yes;
         INPUT_JOYSTICK = yes;
         JOYSTICK_PSXPAD_SPI_FF = yes;
+        LOGITECH_FF = yes;
         LOGIG940_FF = yes;
+        LOGIWHEELS_FF = yes;
         NINTENDO_FF = whenAtLeast "5.16" yes;
         NVIDIA_SHIELD_FF = whenAtLeast "6.5" yes;
         PLAYSTATION_FF = whenAtLeast "5.12" yes;

From e9f9e2dab1274664683887df3f1c1405c64de58f Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 17 Aug 2025 20:42:40 +0200
Subject: [PATCH 1877/3724] doc: Add Modules, modules.generic.meta-maintainers

---
 doc/doc-support/package.nix    | 32 ++++++++++++++++++++++++++++++++
 doc/manual.md.in               |  1 +
 doc/modules/generic.chapter.md | 16 ++++++++++++++++
 doc/modules/index.md           | 12 ++++++++++++
 doc/redirects.json             |  9 +++++++++
 5 files changed, 70 insertions(+)
 create mode 100644 doc/modules/generic.chapter.md
 create mode 100644 doc/modules/index.md

diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix
index 8ed6865a1c90..8e5651864d48 100644
--- a/doc/doc-support/package.nix
+++ b/doc/doc-support/package.nix
@@ -15,12 +15,43 @@
   markdown-code-runner,
   roboto,
   treefmt,
+  nixosOptionsDoc,
 }:
 stdenvNoCC.mkDerivation (
   finalAttrs:
   let
     inherit (finalAttrs.finalPackage.optionsDoc) optionsJSON;
     inherit (finalAttrs.finalPackage) epub lib-docs pythonInterpreterTable;
+
+    # Make anything from lib (the module system internals) invisible
+    hide-lib =
+      opt:
+      opt
+      // {
+        visible = if lib.all (decl: decl == "lib/modules.nix") opt.declarations then false else opt.visible;
+      };
+
+    toURL =
+      decl:
+      let
+        declStr = toString decl;
+        root = toString (../..);
+        subpath = lib.removePrefix "/" (lib.removePrefix root declStr);
+      in
+      if lib.hasPrefix root declStr then
+        {
+          url = "https://github.com/NixOS/nixpkgs/blob/master/${subpath}";
+          name = "nixpkgs/${subpath}";
+        }
+      else
+        decl;
+
+    mapURLs = opt: opt // { declarations = map toURL opt.declarations; };
+
+    docs.generic.meta-maintainers = nixosOptionsDoc {
+      inherit (lib.evalModules { modules = [ ../../modules/generic/meta-maintainers.nix ]; }) options;
+      transformOptions = opt: hide-lib (mapURLs opt);
+    };
   in
   {
     name = "nixpkgs-manual";
@@ -49,6 +80,7 @@ stdenvNoCC.mkDerivation (
       ln -s ${optionsJSON}/share/doc/nixos/options.json ./config-options.json
       ln -s ${treefmt.functionsDoc.markdown} ./packages/treefmt-functions.section.md
       ln -s ${treefmt.optionsDoc.optionsJSON}/share/doc/nixos/options.json ./treefmt-options.json
+      ln -s ${docs.generic.meta-maintainers.optionsJSON}/share/doc/nixos/options.json ./options-modules-generic-meta-maintainers.json
     '';
 
     buildPhase = ''
diff --git a/doc/manual.md.in b/doc/manual.md.in
index 160c6eaead3c..8d75d0fe459e 100644
--- a/doc/manual.md.in
+++ b/doc/manual.md.in
@@ -11,6 +11,7 @@ lib.md
 stdenv.md
 toolchains.md
 build-helpers.md
+modules/index.md
 development.md
 contributing.md
 interoperability.md
diff --git a/doc/modules/generic.chapter.md b/doc/modules/generic.chapter.md
new file mode 100644
index 000000000000..2a14812160e0
--- /dev/null
+++ b/doc/modules/generic.chapter.md
@@ -0,0 +1,16 @@
+
+# Generic {#modules-generic}
+
+Generic modules can be imported to extend configurations of any [class].
+
+## `meta-maintainers.nix` {#modules-generic-meta-maintainers}
+
+The options below become available when using `imports = [ (nixpkgs + "/modules/generic/meta-maintainers.nix") ];`.
+
+```{=include=} options
+id-prefix: opt-modules-generic-meta-maintainers-
+list-id: configuration-variable-list
+source: ../options-modules-generic-meta-maintainers.json
+```
+
+[class]: https://nixos.org/manual/nixpkgs/unstable/#module-system-lib-evalModules-param-class
diff --git a/doc/modules/index.md b/doc/modules/index.md
new file mode 100644
index 000000000000..af4897f11d6d
--- /dev/null
+++ b/doc/modules/index.md
@@ -0,0 +1,12 @@
+# Modules {#modules}
+
+The Nixpkgs repository provides [Module System] modules for various purposes.
+
+The following sections are organized by [module class].
+
+```{=include=} chapters
+generic.chapter.md
+```
+
+[Module System]: https://nixos.org/manual/nixpkgs/unstable/#module-system
+[module class]: https://nixos.org/manual/nixpkgs/unstable/#module-system-lib-evalModules-param-class
diff --git a/doc/redirects.json b/doc/redirects.json
index 8f7810698bbc..215f10bfc640 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -130,6 +130,15 @@
   "minor-ghc-deprecation": [
     "index.html#minor-ghc-deprecation"
   ],
+  "modules": [
+    "index.html#modules"
+  ],
+  "modules-generic": [
+    "index.html#modules-generic"
+  ],
+  "modules-generic-meta-maintainers": [
+    "index.html#modules-generic-meta-maintainers"
+  ],
   "neovim": [
     "index.html#neovim"
   ],

From 6506489a53d8615e0d81516a5ec223e5dd3721f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 18:58:30 +0000
Subject: [PATCH 1878/3724] slumber: 3.3.0 -> 3.4.0

---
 pkgs/by-name/sl/slumber/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix
index 7e78efe17b9b..92eca43bc0e1 100644
--- a/pkgs/by-name/sl/slumber/package.nix
+++ b/pkgs/by-name/sl/slumber/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "slumber";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "LucasPickering";
     repo = "slumber";
     tag = "v${version}";
-    hash = "sha256-3VsnK0CxcSYOnHTXPGdtwUn/0m5Uj9DThm3Mc4bMYoY=";
+    hash = "sha256-RI5+SbVPtIEaudNV+S/HiKDATRy93CIQX/RvNJmBoos=";
   };
 
-  cargoHash = "sha256-ZDB7YiqesCAnXkSyMQzV6LHRjUdv00SSG6aS8JKArfY=";
+  cargoHash = "sha256-i6ovc8aWgB9mABuSetdFNPKjOIRKFig2mbowY2djxWA=";
 
   meta = {
     description = "Terminal-based HTTP/REST client";

From b0bcb84960bce73456f55055c7250db3ce928799 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 19:27:28 +0000
Subject: [PATCH 1879/3724] wiki-js: 2.5.307 -> 2.5.308

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

diff --git a/pkgs/by-name/wi/wiki-js/package.nix b/pkgs/by-name/wi/wiki-js/package.nix
index b4acf3dae4d2..81b66b23839b 100644
--- a/pkgs/by-name/wi/wiki-js/package.nix
+++ b/pkgs/by-name/wi/wiki-js/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wiki-js";
-  version = "2.5.307";
+  version = "2.5.308";
 
   src = fetchurl {
     url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";
-    sha256 = "sha256-wElXBEVLqrK+WtsCUw1IefWBqG6d6LP0eVylPb4qXY0=";
+    sha256 = "sha256-DvMkzGET5UcnmWcBmhiFk4MictkE3LYa621QWxBu190=";
   };
 
   # Unpack the tarball into a subdir. All the contents are copied into `$out`.

From f1b047adb3956a553e7c5020544e3d08d2d32d93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 19:40:43 +0000
Subject: [PATCH 1880/3724] libcint: 6.1.2 -> 6.1.3

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

diff --git a/pkgs/by-name/li/libcint/package.nix b/pkgs/by-name/li/libcint/package.nix
index a8460668b908..0e6fa2408c0a 100644
--- a/pkgs/by-name/li/libcint/package.nix
+++ b/pkgs/by-name/li/libcint/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libcint";
-  version = "6.1.2";
+  version = "6.1.3";
 
   src = fetchFromGitHub {
     owner = "sunqm";
     repo = "libcint";
     rev = "v${version}";
-    hash = "sha256-URJcC0ib87ejrTCglCjhC2tQHNc5TRvo4CQ52N58n+4=";
+    hash = "sha256-k9luTarszZAqh33SzPMM3BYj01HT7cfTipt44nSC+2A=";
   };
 
   postPatch = ''

From ea479e7733580b60aa1d122f8c89c42365c4ef6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sun, 17 Aug 2025 13:42:17 -0600
Subject: [PATCH 1881/3724] =?UTF-8?q?gst=5Fall=5F1.gst-plugins-rs:=200.13.?=
 =?UTF-8?q?5=20=E2=86=92=200.14.1,=20change=20cargo-c=20rlib=20test=20patc?=
 =?UTF-8?q?h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/gstreamer/rs/default.nix        | 17 ++--
 .../gstreamer/rs/reqwest-init-tls.patch       | 85 -------------------
 2 files changed, 5 insertions(+), 97 deletions(-)
 delete mode 100644 pkgs/development/libraries/gstreamer/rs/reqwest-init-tls.patch

diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index 11903735d124..d1f33e7951d8 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -133,9 +133,8 @@ let
     patches = (oldAttrs.patches or [ ]) ++ [
       (fetchpatch {
         name = "cargo-c-test-rlib-fix.patch";
-        url = "https://github.com/lu-zero/cargo-c/commit/8421f2da07cd066d2ae8afbb027760f76dc9ee6c.diff";
-        hash = "sha256-eZSR4DKSbS5HPpb9Kw8mM2ZWg7Y92gZQcaXUEu1WNj0=";
-        revert = true;
+        url = "https://github.com/lu-zero/cargo-c/commit/dd02009d965cbd664785149a90d702251de747b3.diff";
+        hash = "sha256-Az0WFF9fc5+igcV8C/QFhq5GE4PAyGEO84D9ECxx3v0=";
       })
     ];
   });
@@ -147,7 +146,7 @@ assert lib.assertMsg (invalidPlugins == [ ])
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-rs";
-  version = "0.13.5";
+  version = "0.14.1";
 
   outputs = [
     "out"
@@ -159,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "gstreamer";
     repo = "gst-plugins-rs";
     rev = finalAttrs.version;
-    hash = "sha256-5jR/YLCBeFnB0+O2OOCLBEKwikiQ5e+SbOeQCijnd8Q=";
+    hash = "sha256-gCT/ZcXR9VePXYtEENXxgBNvA84KT1OYUR8kSyLBzrI=";
     # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
     postFetch = ''
       sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g'
@@ -184,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
     name = "gst-plugins-rs-${finalAttrs.version}";
-    hash = "sha256-ErQ5Um0e7bWhzDErEN9vmSsKTpTAm4MA5PZ7lworVKU=";
+    hash = "sha256-sX3P5qrG0M/vJkvzvJGzv4fcMn6FvrLPOUh++vKJ/gY=";
   };
 
   patches = [
@@ -193,12 +192,6 @@ stdenv.mkDerivation (finalAttrs: {
     # TODO: Remove in 0.14, it has been replaced by a different fix:
     # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2140
     ./ignore-network-tests.patch
-
-    # Fix reqwest tests failing due to broken TLS lookup in native-tls dependency.
-    # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/675
-    # Cannot be upstreamed due to MSRV bump in native-tls:
-    # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2142
-    ./reqwest-init-tls.patch
   ];
 
   strictDeps = true;
diff --git a/pkgs/development/libraries/gstreamer/rs/reqwest-init-tls.patch b/pkgs/development/libraries/gstreamer/rs/reqwest-init-tls.patch
deleted file mode 100644
index 24764673bec0..000000000000
--- a/pkgs/development/libraries/gstreamer/rs/reqwest-init-tls.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-The reqwest tests fail due to reqwest Client initialization.
-Bisected the issue to https://github.com/sfackler/rust-native-tls/compare/v0.2.12...v0.2.13 bump
-in https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/commit/6d5d9753f4a28be350dc657c08a9ecc7f13b922a
-the upcoming version of native-tls fixes that so let’s bump to that.
-https://github.com/sfackler/rust-native-tls/compare/v0.2.13...v0.2.14
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 244256cd..24f0c607 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1700,7 +1700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
- dependencies = [
-  "libc",
-- "windows-sys 0.59.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -2149,7 +2149,7 @@ dependencies = [
-  "gobject-sys",
-  "libc",
-  "system-deps 7.0.3",
-- "windows-sys 0.59.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -4407,7 +4407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
- dependencies = [
-  "cfg-if",
-- "windows-targets 0.52.6",
-+ "windows-targets 0.48.5",
- ]
- 
- [[package]]
-@@ -4791,9 +4791,9 @@ dependencies = [
- 
- [[package]]
- name = "native-tls"
--version = "0.2.13"
-+version = "0.2.14"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c"
-+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
- dependencies = [
-  "libc",
-  "log",
-@@ -5572,7 +5572,7 @@ dependencies = [
-  "once_cell",
-  "socket2",
-  "tracing",
-- "windows-sys 0.59.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -6017,7 +6017,7 @@ dependencies = [
-  "errno",
-  "libc",
-  "linux-raw-sys",
-- "windows-sys 0.59.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -6702,7 +6702,7 @@ dependencies = [
-  "getrandom 0.3.1",
-  "once_cell",
-  "rustix",
-- "windows-sys 0.59.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -7523,7 +7523,7 @@ version = "0.1.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
- dependencies = [
-- "windows-sys 0.59.0",
-+ "windows-sys 0.48.0",
- ]
- 
- [[package]]

From 88e8a4036877dc2d328fd3e7cb4e732eb037e49c Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sun, 17 Aug 2025 23:19:03 +0200
Subject: [PATCH 1882/3724] mautrix-whatsapp: 0.12.3 -> 0.12.4

---
 pkgs/by-name/ma/mautrix-whatsapp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mautrix-whatsapp/package.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix
index 1e98a9564da7..f2c1a8ce8a57 100644
--- a/pkgs/by-name/ma/mautrix-whatsapp/package.nix
+++ b/pkgs/by-name/ma/mautrix-whatsapp/package.nix
@@ -14,19 +14,19 @@
 
 buildGoModule rec {
   pname = "mautrix-whatsapp";
-  version = "0.12.3";
+  version = "0.12.4";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "whatsapp";
     rev = "v${version}";
-    hash = "sha256-gbKphWFBT5+7kIptIS/GquFBPVaZzJolbEkZ6bj3Fiw=";
+    hash = "sha256-FduZKeWApGR/SmjiZsVDC0KJZq8XRtfCFQUZhxlVswM=";
   };
 
   buildInputs = lib.optional (!withGoolm) olm;
   tags = lib.optional withGoolm "goolm";
 
-  vendorHash = "sha256-LGHW1n36fdDtIPNENA2qqLcho+7FVna/zUPEYcxd9LQ=";
+  vendorHash = "sha256-Ujk/bJWo4tU7wQxyF7VP1JLqNh+VuNy5n31x9AWyEZA=";
 
   doCheck = false;
 

From df06b2acd8092bbfb0ff54e4675de582ad0849cf Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sun, 17 Aug 2025 23:25:44 +0200
Subject: [PATCH 1883/3724] libsignal-ffi: 0.76.1 -> 0.78.2

---
 pkgs/by-name/li/libsignal-ffi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix
index 72ae4fab3fdb..a1e54ba745ec 100644
--- a/pkgs/by-name/li/libsignal-ffi/package.nix
+++ b/pkgs/by-name/li/libsignal-ffi/package.nix
@@ -21,14 +21,14 @@ rustPlatform.buildRustPackage rec {
   pname = "libsignal-ffi";
   # must match the version used in mautrix-signal
   # see https://github.com/mautrix/signal/issues/401
-  version = "0.76.1";
+  version = "0.78.2";
 
   src = fetchFromGitHub {
     fetchSubmodules = true;
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${version}";
-    hash = "sha256-411+ANwyqqUX11rxCzFvPhjMWviJ0CcQlkAiqNWs32w=";
+    hash = "sha256-4buK92sJZj5yEwFyi55WonF+1LZ5PERZ9wJZdlFjPcg=";
   };
 
   nativeBuildInputs = [
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
   env.BORING_BSSL_PATH = "${boringssl-wrapper}";
   env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
 
-  cargoHash = "sha256-9W7u0fZgU0J03hT6D4BJPpIKn3dwf9yckJiwwNkyqUA=";
+  cargoHash = "sha256-eDerNFw8jtM7qIVh3Y837Iu11yeEpAcxgFVqZJTylEc=";
 
   cargoBuildFlags = [
     "-p"

From aba64f33661e81753d722a802b06b5804255727e Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sun, 17 Aug 2025 23:25:58 +0200
Subject: [PATCH 1884/3724] mautrix-signal: 0.8.5 -> 0.8.6

---
 pkgs/by-name/ma/mautrix-signal/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix
index a85cd20a2364..37c4610806ac 100644
--- a/pkgs/by-name/ma/mautrix-signal/package.nix
+++ b/pkgs/by-name/ma/mautrix-signal/package.nix
@@ -19,13 +19,13 @@ let
 in
 buildGoModule rec {
   pname = "mautrix-signal";
-  version = "0.8.5";
+  version = "0.8.6";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "signal";
     tag = "v${version}";
-    hash = "sha256-koO1eeMZ8wmty6z2zyJlA7zoM6gYmFlxdF8GB2hOxb8=";
+    hash = "sha256-62Z7Lasx0bzCAWLvHN7uCUqkMk6W80PR24mwfJU/n3Q=";
   };
 
   buildInputs =
@@ -41,7 +41,7 @@ buildGoModule rec {
 
   CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ];
 
-  vendorHash = "sha256-NmIWxc+6Leaqm1W+g2XdbMv4iU7Z7k8/g88U0iw/+98=";
+  vendorHash = "sha256-srvqflqleK2KIgesEZPNhSQh/IFmyTElJ7iUjBEmNq0=";
 
   doCheck = true;
   preCheck = ''

From e3f96eb478d7c2de9d7aedcf59e39b4796e9f9e4 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sun, 17 Aug 2025 23:27:33 +0200
Subject: [PATCH 1885/3724] mautrix-signal: add SchweGELBin as maintainer

---
 pkgs/by-name/ma/mautrix-signal/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix
index 37c4610806ac..f9a10e41c272 100644
--- a/pkgs/by-name/ma/mautrix-signal/package.nix
+++ b/pkgs/by-name/ma/mautrix-signal/package.nix
@@ -68,6 +68,7 @@ buildGoModule rec {
     maintainers = with maintainers; [
       pentane
       ma27
+      SchweGELBin
     ];
     mainProgram = "mautrix-signal";
   };

From 206a284ebe4e3e6ba5d87470c97931d7df5389ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 22:15:07 +0000
Subject: [PATCH 1886/3724] parsedmarc: 8.18.5 -> 8.18.6

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

diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix
index ef9d12302e07..3a9252f15d06 100644
--- a/pkgs/development/python-modules/parsedmarc/default.nix
+++ b/pkgs/development/python-modules/parsedmarc/default.nix
@@ -48,14 +48,14 @@ let
 in
 buildPythonPackage rec {
   pname = "parsedmarc";
-  version = "8.18.5";
+  version = "8.18.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "domainaware";
     repo = "parsedmarc";
     tag = version;
-    hash = "sha256-y8wFR9UN1u/IDYiKB+8PrN8c0YCgagxUr7CeAbQWdtg=";
+    hash = "sha256-wwncnkZnd8GsjvwsuJEgFYCtapzGYYcVBRYoJ1cwVEw=";
   };
 
   build-system = [

From 1a9dd6becb1f2dbda2565ce226f16a211e16b73b Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Mon, 18 Aug 2025 00:22:19 +0200
Subject: [PATCH 1887/3724] libsignal-ffi: add SchweGELBin as maintainer

---
 pkgs/by-name/li/libsignal-ffi/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix
index a1e54ba745ec..8bc733f32051 100644
--- a/pkgs/by-name/li/libsignal-ffi/package.nix
+++ b/pkgs/by-name/li/libsignal-ffi/package.nix
@@ -51,6 +51,9 @@ rustPlatform.buildRustPackage rec {
     description = "C ABI library which exposes Signal protocol logic";
     homepage = "https://github.com/signalapp/libsignal";
     license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ pentane ];
+    maintainers = with maintainers; [
+      pentane
+      SchweGELBin
+    ];
   };
 }

From f6187b425f27a5af53668c927b24c614685cc975 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 17 Aug 2025 06:33:01 -0600
Subject: [PATCH 1888/3724] jansson: fix cmake import prefix

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

diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix
index bb0035b97669..c949486def69 100644
--- a/pkgs/by-name/ja/jansson/package.nix
+++ b/pkgs/by-name/ja/jansson/package.nix
@@ -35,6 +35,12 @@ stdenv.mkDerivation (finalAttrs: {
     "-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
   ];
 
+  postFixup = ''
+    # Incorrectly references the dev output, libjansson.so is in out
+    substituteInPlace $dev/lib/cmake/jansson/janssonTargets-release.cmake \
+      --replace-fail "\''${_IMPORT_PREFIX}" "$out"
+  '';
+
   passthru = {
     tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
     updateScript = nix-update-script { };

From afafa9100cb04d8cf68fe3bbf7f7e968d33b0a6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 00:34:38 +0000
Subject: [PATCH 1889/3724] fuzzel: 1.12.0 -> 1.13.0

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

diff --git a/pkgs/by-name/fu/fuzzel/package.nix b/pkgs/by-name/fu/fuzzel/package.nix
index 8e3e76bdf7d0..01f90399875a 100644
--- a/pkgs/by-name/fu/fuzzel/package.nix
+++ b/pkgs/by-name/fu/fuzzel/package.nix
@@ -27,14 +27,14 @@ assert (svgSupport && svgBackend == "nanosvg") -> enableCairo;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fuzzel";
-  version = "1.12.0";
+  version = "1.13.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "fuzzel";
     rev = finalAttrs.version;
-    hash = "sha256-42a8VF4EUTbyEKcfVSIbTXmPC55+cLq7FX+lRDZKXEM=";
+    hash = "sha256-sZycvHoKn9i+360XxDOEhieLEeicSiAqWVUJFb/VK4Y=";
   };
 
   depsBuildBuild = [

From d8ce469edc262a9673347e793c21714439db01ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 00:41:39 +0000
Subject: [PATCH 1890/3724] hatari: 2.6.0 -> 2.6.1

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

diff --git a/pkgs/by-name/ha/hatari/package.nix b/pkgs/by-name/ha/hatari/package.nix
index a3cdb73db740..6826d7b56e0c 100644
--- a/pkgs/by-name/ha/hatari/package.nix
+++ b/pkgs/by-name/ha/hatari/package.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hatari";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "hatari";
     repo = "hatari";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0KXnLsDmvLPzXsRE1QSymzcx/aX7kNxXSWYcZ2qZ0pw=";
+    hash = "sha256-hfSlpYwS6PcA4pqpYeFnOptN4hX7ZjLB8cu9cZ8pr7Y=";
   };
 
   # For pthread_cancel

From f3bb3be6a9a4b55c4d5164492347e85987766a78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 02:10:45 +0000
Subject: [PATCH 1891/3724] msbuild-structured-log-viewer: 2.3.34 -> 2.3.42

---
 pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
index 5695fbb9137b..6d9651656416 100644
--- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
+++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
@@ -14,13 +14,13 @@
 }:
 buildDotnetModule (finalAttrs: {
   pname = "msbuild-structured-log-viewer";
-  version = "2.3.34";
+  version = "2.3.42";
 
   src = fetchFromGitHub {
     owner = "KirillOsenkov";
     repo = "MSBuildStructuredLog";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZjfkHiSDbWRHZWiHyehV+nJMp86v5Z6HCYYf+LNTSJg=";
+    hash = "sha256-C6fArtGQd6XugbzI2TjTKQj0O6JGFz+kjsBF5pVJpPY=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;

From c6635caae345409b93bcf7e683a8418986a51290 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 02:55:03 +0000
Subject: [PATCH 1892/3724] sentry-cli: 2.50.2 -> 2.52.0

---
 pkgs/by-name/se/sentry-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix
index cd2721401a0d..350aa25bd8de 100644
--- a/pkgs/by-name/se/sentry-cli/package.nix
+++ b/pkgs/by-name/se/sentry-cli/package.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sentry-cli";
-  version = "2.50.2";
+  version = "2.52.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-cli";
     rev = version;
-    hash = "sha256-hYJVfKoUZHfqKHqmF1lZyx5MDkILVsibYLLcb9TZ8yw=";
+    hash = "sha256-iu1WbtgNxrS5JgsEZo1xGtTfnkZcYQUm3sY1NquCFpI=";
   };
   doCheck = false;
 
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  cargoHash = "sha256-yAZrjFGSeEA4A0tJZlvyHakbhlZT3gaE6HpKhJzHIFQ=";
+  cargoHash = "sha256-/V2Q8QPDDQkE5oJMGx51CtoZ1zoE/iVPegmMi1PLgYw=";
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd sentry-cli \

From 7770e21e3f27273f19b5d946e0b61142a8898af2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 04:36:12 +0000
Subject: [PATCH 1893/3724] playwright-mcp: 0.0.31 -> 0.0.34

---
 pkgs/by-name/pl/playwright-mcp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pl/playwright-mcp/package.nix b/pkgs/by-name/pl/playwright-mcp/package.nix
index b2e74c842769..b9c6db1573cc 100644
--- a/pkgs/by-name/pl/playwright-mcp/package.nix
+++ b/pkgs/by-name/pl/playwright-mcp/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "playwright-mcp";
-  version = "0.0.31";
+  version = "0.0.34";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "playwright-mcp";
     tag = "v${version}";
-    hash = "sha256-Hw4OUZCHoquX6Ixv7GlsHcKxqOdJEQYfuDPzqYkVNAk=";
+    hash = "sha256-SGSzX41D9nOTsGiU16tRFXgarWgePRsNWIcEnNGH0lQ=";
   };
 
-  npmDepsHash = "sha256-70/t/mgSBwMv9C3VusbjIMMyy3e3npxQLXqKbdL9xa4=";
+  npmDepsHash = "sha256-+6HmuR1Z5cJkoZq/vsFq6wNsYpZeDS42wwmh3hEgJhM=";
 
   postInstall = ''
     rm -r $out/lib/node_modules/@playwright/mcp/node_modules/playwright

From a293415328a7e5aa9ecc124c4ed6abd2a9c04667 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 05:11:32 +0000
Subject: [PATCH 1894/3724] aws-lambda-rie: 1.25 -> 1.27

---
 pkgs/by-name/aw/aws-lambda-rie/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/aw/aws-lambda-rie/package.nix b/pkgs/by-name/aw/aws-lambda-rie/package.nix
index a5fe80fb2b7e..a4c4b639a9f6 100644
--- a/pkgs/by-name/aw/aws-lambda-rie/package.nix
+++ b/pkgs/by-name/aw/aws-lambda-rie/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "aws-lambda-runtime-interface-emulator";
-  version = "1.25";
+  version = "1.27";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-lambda-runtime-interface-emulator";
     rev = "v${version}";
-    sha256 = "sha256-GHoEyTM3vDVmozcKoi5ETG4V10o82HcigmmhIMV0UJg=";
+    sha256 = "sha256-moOCuAq6eliNutP5oZGC33VJZXkuGCEKLdMqIwC+Bo4=";
   };
 
-  vendorHash = "sha256-fGoqKDBg+O4uzGmhEIROsBvDS+6zWCzsXe8U6t98bqk=";
+  vendorHash = "sha256-+tgB9Z39Oq43PZoF85DG1Z/CGeoXXTKAML7Z6DZ1XvM=";
 
   # disabled because I lack the skill
   doCheck = false;

From 6169eeed6ee6e07f1b64c58c82e0657d51197eee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 05:16:27 +0000
Subject: [PATCH 1895/3724] komodo: 1.18.4 -> 1.19.0

---
 pkgs/by-name/ko/komodo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ko/komodo/package.nix b/pkgs/by-name/ko/komodo/package.nix
index b648e57a0776..bae83422e8bc 100644
--- a/pkgs/by-name/ko/komodo/package.nix
+++ b/pkgs/by-name/ko/komodo/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "komodo";
-  version = "1.18.4";
+  version = "1.19.0";
 
   src = fetchFromGitHub {
     owner = "moghtech";
     repo = "komodo";
     tag = "v${version}";
-    hash = "sha256-allGKoeI3mlMWbF9WsDbX/4eGdBT/eoF71uAk5iK0e4=";
+    hash = "sha256-KwxR5LKd82KAOxM8YTWbovTXR4eA/O49BmWemsNF1Yw=";
   };
 
-  cargoHash = "sha256-nlCGrPlH+AZNz7BYDcoU0WBHBft4DnO4WfqGD5wVLmQ=";
+  cargoHash = "sha256-NkAkGM2FqYdSMmRZVJ4ryJR3vabLSj3OEyuL+8mopIY=";
 
   # disable for check. document generation is fail
   # > error: doctest failed, to rerun pass `-p komodo_client --doc`

From d920478572b9051ab521a358464b0fd97b712aa1 Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Mon, 18 Aug 2025 11:30:20 +0530
Subject: [PATCH 1896/3724] gping: 1.19.0 -> 1.20.1

Diff: https://github.com/orf/gping/compare/gping-v1.19.0...gping-v1.20.1
Changelog: https://github.com/orf/gping/releases/tag/gping-v1.20.1
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
 pkgs/by-name/gp/gping/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gp/gping/package.nix b/pkgs/by-name/gp/gping/package.nix
index 81a2c7e64dfb..dbad6a8f032b 100644
--- a/pkgs/by-name/gp/gping/package.nix
+++ b/pkgs/by-name/gp/gping/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gping";
-  version = "1.19.0";
+  version = "1.20.1";
 
   src = fetchFromGitHub {
     owner = "orf";
     repo = "gping";
     tag = "gping-v${version}";
-    hash = "sha256-RTjYgsi3PmmPufdTcxZr+Laipa32Kkq1M1eHSAJVWZQ=";
+    hash = "sha256-whHbGZnxOQ/ISyWMl6miuogppZahgXxO3XmhcP6ymIo=";
   };
 
-  cargoHash = "sha256-b7GsaAaCYz3ohE4BUHlvexJ41L0OhbcWkBo61X4FKzQ=";
+  cargoHash = "sha256-F0QBL7tCCdjnavClqrw8yYxFrY8y4f8h/gcHSpEqBiM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 68c558e90a0dccff1001117804b72c3e9fa83218 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 06:44:44 +0000
Subject: [PATCH 1897/3724] reindeer: 2025.07.14.00 -> 2025.08.11.00

---
 pkgs/by-name/re/reindeer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index f0fd2b3bf536..8715685bcf06 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2025.07.14.00";
+  version = "2025.08.11.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     tag = "v${version}";
-    hash = "sha256-gr5J2qqpn2kaFdM9Q+UvIugg435XTzyWvfRJwresQyE=";
+    hash = "sha256-rtR90ZQlfb/6iKI4s2JYtssjoUjtKjDUfgzUBsF9glk=";
   };
 
-  cargoHash = "sha256-QdGqvY0uUdxkDRgowSc35Bk5P2YOM5+MmUUMEt/pmCk=";
+  cargoHash = "sha256-RmG+6lC5uVCj00FDmpZiez3wRpgi5Hk0tqLzAMbg6H4=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 8b7e21778f11abb0b4debc3fbe7440f7d82df92a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 06:50:36 +0000
Subject: [PATCH 1898/3724] charmcraft: 3.5.2 -> 3.5.3

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

diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix
index 6989a3864a42..52e640edfbf7 100644
--- a/pkgs/by-name/ch/charmcraft/package.nix
+++ b/pkgs/by-name/ch/charmcraft/package.nix
@@ -44,7 +44,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "charmcraft";
-  version = "3.5.2";
+  version = "3.5.3";
 
   pyproject = true;
 
@@ -52,7 +52,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "canonical";
     repo = "charmcraft";
     tag = version;
-    hash = "sha256-WpiLi8raY1f6+Jjlamp+eDh429gjSwSufNfoPOcGIgU=";
+    hash = "sha256-SPWbHyHp1SIwDmcpBftUJ7SXggkGsxPvZyfRVm67KFM=";
   };
 
   postPatch = ''

From b5bd89906b29056b93ea93ef01e76197a953e62f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 18 Aug 2025 09:25:33 +0200
Subject: [PATCH 1899/3724] thunderbird-latest: pull a patch to fix build with
 rustc 1.89

Upstream hasn't fully resolved this, and I'm not sure
how thunderbird-esr 140 will be around this,
so let's go simple for now.

No firefox version seems affected.
---
 .../networking/mailreaders/thunderbird/packages.nix        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 466cb3f2e694..0193bbd99af8 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -48,6 +48,13 @@ let
         # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
         (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch)
       ]
+      ++ lib.optional (lib.versionAtLeast version "140") (fetchpatch2 {
+        # https://bugzilla.mozilla.org/show_bug.cgi?id=1982003
+        name = "rustc-1.89.patch";
+        url = "https://raw.githubusercontent.com/openbsd/ports/3ef8a2538893109bea8211ef13a870822264e096/mail/mozilla-thunderbird/patches/patch-third_party_rust_allocator-api2_src_stable_vec_mod_rs";
+        extraPrefix = "";
+        hash = "sha256-eL+RNVLMkj8x/8qQJVUFHDdDpS0ahV1XEN1L0reaYG4=";
+      })
       ++ lib.optionals (lib.versionOlder version "139") [
         # clang-19 fixes for char_traits build issue
         # https://github.com/rnpgp/rnp/pull/2242/commits/e0790a2c4ff8e09d52522785cec1c9db23d304ac

From 91fe78651bb3a957dc40432259bef15bc0628f69 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 07:28:39 +0000
Subject: [PATCH 1900/3724] pipeline: 2.6.1 -> 3.0.1

---
 pkgs/by-name/pi/pipeline/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pipeline/package.nix b/pkgs/by-name/pi/pipeline/package.nix
index 8323ad9145de..81589daea35a 100644
--- a/pkgs/by-name/pi/pipeline/package.nix
+++ b/pkgs/by-name/pi/pipeline/package.nix
@@ -30,18 +30,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pipeline";
-  version = "2.6.1";
+  version = "3.0.1";
 
   src = fetchFromGitLab {
     owner = "schmiddi-on-mobile";
     repo = "pipeline";
     rev = finalAttrs.version;
-    hash = "sha256-0g8J65dQoxOmdDdZHn7O1FB8fL2EdfuhbFO1VG0UCtE=";
+    hash = "sha256-AF34En1MKlwyOd4zKQjGAeb/c6ElJipreBTCJhbbJuI=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
-    hash = "sha256-c9bjAc6ozCJ1l+SeR9LoQmk/wKQEXAZy0+c1+vGoE9U=";
+    hash = "sha256-oO0c6DMmEmeP7Q2LoTDTNeEHUgRT0c3cJnZBVo2cX1U=";
   };
 
   nativeBuildInputs = [

From 406c8ebe1e914c46cce35497e4d13aeebd773861 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sun, 10 Aug 2025 12:35:59 +0200
Subject: [PATCH 1901/3724] dartsim: clean

---
 pkgs/by-name/da/dartsim/package.nix | 87 ++++++++++++++++-------------
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/da/dartsim/package.nix b/pkgs/by-name/da/dartsim/package.nix
index e0a1b0627708..c4b3d4495261 100644
--- a/pkgs/by-name/da/dartsim/package.nix
+++ b/pkgs/by-name/da/dartsim/package.nix
@@ -2,12 +2,14 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
 
   pythonSupport ? false,
   python3Packages,
 
   # nativeBuildInputs
   cmake,
+  doxygen,
   pkg-config,
 
   # propagatedBuildInputs
@@ -17,19 +19,22 @@
   bullet,
   eigen,
   fcl,
+  flann,
   fmt,
   libglut,
-  nlopt,
   imgui,
   ipopt,
   lapack,
   libGL,
   libGLU,
+  libccd,
+  nlopt,
   ode,
   openscenegraph,
   pagmo2,
   tinyxml-2,
   urdfdom,
+  urdfdom-headers,
 
   # checkInputs
   gbenchmark,
@@ -47,46 +52,43 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ik6FwrN5Ta1LinrXpZZc7AmzdFPoLjG07/zo1IZdmgI=";
   };
 
-  # disable failing tests. CMAKE_CTEST_ARGUMENTS does not work.
-  patches = [ ./disable-failing-tests.patch ];
+  patches = [
+    # disable failing tests. CMAKE_CTEST_ARGUMENTS does not work.
+    ./disable-failing-tests.patch
+    # Fix use of system gbenchmark, merged upstream
+    (fetchpatch {
+      url = "https://github.com/dartsim/dart/pull/1904.patch";
+      hash = "sha256-i8Ga0FGVQ3OMprEoGEwVy0j139wjnmR6ABxr/3syhzw=";
+    })
+    # Fix use of system pybind11, merged upstream
+    (fetchpatch {
+      url = "https://github.com/dartsim/dart/pull/1907.patch";
+      hash = "sha256-T3992uD0Z36tTxlcFaikVaLt08N9EP4gOHP0Y2AFBzQ=";
+    })
+    # fix use of absolute CMake paths in .pc, merged upstream
+    (fetchpatch {
+      url = "https://github.com/dartsim/dart/pull/2006.patch";
+      hash = "sha256-csWh0261nbnLWRPqq6QHlG54ANABFmOOrJqOtpGr5dQ=";
+    })
+  ];
 
+  # Install python bindings
   postPatch = ''
-    # https://github.com/dartsim/dart/pull/1904, merged upstream
-    substituteInPlace tests/benchmark/CMakeLists.txt \
-      --replace-fail \
-        "FetchContent_MakeAvailable(benchmark)" \
-        "find_package(benchmark REQUIRED)"
-
-    # https://github.com/dartsim/dart/pull/1907, merged upstream
-    substituteInPlace python/CMakeLists.txt \
-      --replace-fail \
-        "FetchContent_MakeAvailable(pybind11)" \
-        "find_package(pybind11 CONFIG REQUIRED)"
-
-    # fix use of absolute CMake paths in .pc
-    substituteInPlace CMakeLists.txt \
-      --replace-fail \
-        "$""{CMAKE_INSTALL_PREFIX}/$""{CMAKE_INSTALL_LIBDIR}" \
-        "$""{CMAKE_INSTALL_LIBDIR}"
-    substituteInPlace cmake/dart.pc.in \
-      --replace-fail \
-        "libdir=$""{prefix}/" \
-        "libdir=" \
-      --replace-fail \
-        "includedir=$""{prefix}/" \
-        "includedir="
-
-    # install python bindings
-    substituteInPlace python/dartpy/CMakeLists.txt \
-      --replace-fail \
-        "EXCLUDE_FROM_ALL" \
-        ""
     echo "install(TARGETS $""{pybind_module} DESTINATION ${python3Packages.python.sitePackages})" \
       >> python/dartpy/CMakeLists.txt
   '';
 
+  buildFlags = [
+    # build unit tests
+    "tests"
+  ]
+  ++ lib.optionals pythonSupport [
+    "dartpy"
+  ];
+
   nativeBuildInputs = [
     cmake
+    doxygen
     pkg-config
   ]
   ++ lib.optionals pythonSupport [
@@ -95,27 +97,29 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   propagatedBuildInputs = [
+    assimp
     blas
     boost
-    assimp
     bullet
     eigen
     fcl
+    flann
     fmt
     libglut
-    gbenchmark
-    nlopt
     # requires imgui_impl_opengl2.h
     (imgui.override { IMGUI_BUILD_OPENGL2_BINDING = true; })
     ipopt
     lapack
     libGL
     libGLU
+    libccd
+    nlopt
     ode
     openscenegraph
     pagmo2
     tinyxml-2
     urdfdom
+    urdfdom-headers
   ]
   ++ lib.optionals pythonSupport [
     python3Packages.numpy
@@ -125,26 +129,29 @@ stdenv.mkDerivation (finalAttrs: {
     gbenchmark
     gtest
   ];
+
   nativeCheckInputs = lib.optionals pythonSupport [
     python3Packages.pytest
     python3Packages.pythonImportsCheckHook
   ];
+
   doCheck = true;
-  # build unit tests
-  preCheck = "make tests";
+
   pythonImportsCheck = [ "dartpy" ];
 
   cmakeFlags = [
+    (lib.cmakeBool "DART_VERBOSE" true)
     (lib.cmakeBool "DART_BUILD_DARTPY" pythonSupport)
-    (lib.cmakeBool "DART_USE_SYSTEM_IMGUI" true)
     (lib.cmakeBool "DART_USE_SYSTEM_GOOGLEBENCHMARK" true)
     (lib.cmakeBool "DART_USE_SYSTEM_GOOGLETEST" true)
+    (lib.cmakeBool "DART_USE_SYSTEM_IMGUI" true)
+    (lib.cmakeBool "DART_USE_SYSTEM_PYBIND11" true)
   ];
 
   meta = {
     description = "DART: Dynamic Animation and Robotics Toolkit";
     homepage = "https://github.com/dartsim/dart";
-    changelog = "https://github.com/dartsim/dart/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/dartsim/dart/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ nim65s ];
     platforms = lib.platforms.unix ++ lib.platforms.windows;

From c3b61547cad63b8af6c7a9e811aede8679ab66ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 08:28:03 +0000
Subject: [PATCH 1902/3724] ssh-to-age: 1.1.11 -> 1.2.0

---
 pkgs/by-name/ss/ssh-to-age/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ss/ssh-to-age/package.nix b/pkgs/by-name/ss/ssh-to-age/package.nix
index db0e49155c7d..c687ed3e3cbd 100644
--- a/pkgs/by-name/ss/ssh-to-age/package.nix
+++ b/pkgs/by-name/ss/ssh-to-age/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "ssh-to-age";
-  version = "1.1.11";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "ssh-to-age";
     rev = version;
-    sha256 = "sha256-Y+GC8Zkznjr0pTvYED+uE1v6zIg+tq44F++ZrBytS1E=";
+    sha256 = "sha256-0i3h46lVyCbA4zJdjHM9GyRxZR6IsavpdDG3pdFEGjk=";
   };
 
-  vendorHash = "sha256-bAawCPfMR4B+mXBHzaTlKs0UYh07F30/epy4qkf2QhM=";
+  vendorHash = "sha256-4R+44AM0zS6WyKWfg0TH5OxmrC1c4xN0MSBgaZrWPX4=";
 
   checkPhase = ''
     runHook preCheck

From b90a8d5d1d2f73d29100a5f95a9e8b100ee7db72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 18 Aug 2025 10:39:10 +0200
Subject: [PATCH 1903/3724] jansson: nit - more precision when replacing in
 .cmake

---
 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 c949486def69..1478f46feae7 100644
--- a/pkgs/by-name/ja/jansson/package.nix
+++ b/pkgs/by-name/ja/jansson/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     # Incorrectly references the dev output, libjansson.so is in out
     substituteInPlace $dev/lib/cmake/jansson/janssonTargets-release.cmake \
-      --replace-fail "\''${_IMPORT_PREFIX}" "$out"
+      --replace-fail "\''${_IMPORT_PREFIX}/lib" "$out/lib"
   '';
 
   passthru = {

From 0c3aa1f691a6cbc6b76a6036dfea72d87ea7e619 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 09:02:09 +0000
Subject: [PATCH 1904/3724] eduke32: 0-unstable-2025-07-04 ->
 0-unstable-2025-08-13

---
 pkgs/by-name/ed/eduke32/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix
index 6f8644c2d827..b9d06b2bc209 100644
--- a/pkgs/by-name/ed/eduke32/package.nix
+++ b/pkgs/by-name/ed/eduke32/package.nix
@@ -27,14 +27,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "eduke32";
-  version = "0-unstable-2025-07-04";
+  version = "0-unstable-2025-08-13";
 
   src = fetchFromGitLab {
     domain = "voidpoint.io";
     owner = "terminx";
     repo = "eduke32";
-    rev = "388752735c68456b89d8acffcb836e6802308007";
-    hash = "sha256-QQ0qKY/ZK0SwxMkZ76792w7iCO+ZpGWGJutHJW1e5+Q=";
+    rev = "126f35ca8c24368f101996523935d08b269f45be";
+    hash = "sha256-TuCb2LLeg/MZ3fG1fqGNNeJb8qLjom0nXger8cMgk1c=";
     deepClone = true;
     leaveDotGit = true;
     postFetch = ''

From 56e3d07f51b07d943a208acf3f8eb2847cfae2a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 09:15:52 +0000
Subject: [PATCH 1905/3724] grafanaPlugins.victoriametrics-logs-datasource:
 0.19.2 -> 0.19.3

---
 .../plugins/victoriametrics-logs-datasource/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
index d1e24220f487..effc9a903e9e 100644
--- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "victoriametrics-logs-datasource";
-  version = "0.19.2";
-  zipHash = "sha256-+mGW9A39GioPKW5j2vT2aNKrBc/A6qsaeIjo4EUrXs4=";
+  version = "0.19.3";
+  zipHash = "sha256-UMHcH4o6/Wr7Wct977HdOiXgvXo0j9LfZxPcRCqG2+U=";
   meta = {
     description = "Grafana datasource for VictoriaLogs";
     license = lib.licenses.asl20;

From 64e049f33d5487212bcbaf7a73b3e7abceb1c891 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 09:35:30 +0000
Subject: [PATCH 1906/3724] vscode-extensions.scalameta.metals: 1.53.0 ->
 1.55.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index db0cf1915b69..760f56ab7e55 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4190,8 +4190,8 @@ let
         mktplcRef = {
           name = "metals";
           publisher = "scalameta";
-          version = "1.53.0";
-          hash = "sha256-5/YnHyhC83pDEaEN4H/QHIjw/oiAGPWZphzAzhMBPkk=";
+          version = "1.55.0";
+          hash = "sha256-HdD8D8oy/VtIhDj+BQNIDx2YhZXX7VsR2+U1WrKIOoc=";
         };
         meta = {
           license = lib.licenses.asl20;

From b12b3679c0b4540694ab9b265f6846178ca7dd8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phan=20Kochen?= <git@stephank.nl>
Date: Sat, 16 Aug 2025 14:08:57 +0200
Subject: [PATCH 1907/3724] angle: darwin support

---
 pkgs/by-name/an/angle/package.nix | 66 +++++++++++++++++++++++--------
 1 file changed, 49 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/an/angle/package.nix b/pkgs/by-name/an/angle/package.nix
index 29d0e49bad9b..aa26d67bd2e9 100644
--- a/pkgs/by-name/an/angle/package.nix
+++ b/pkgs/by-name/an/angle/package.nix
@@ -13,6 +13,8 @@
   wayland,
   pciutils,
   libGL,
+  apple-sdk_15,
+  xcbuild,
 }:
 let
   llvmPackages = llvmPackages_21;
@@ -29,11 +31,21 @@ let
       llvmPackages.llvm
       llvmPackages.clang
     ];
-    postBuild = ''
-      mkdir -p $out/lib/clang/${llvmMajorVersion}/lib/
-      ln -s $out/resource-root/lib/linux \
-        $out/lib/clang/${llvmMajorVersion}/lib/${triplet}
-    '';
+    postBuild =
+      if stdenv.isDarwin then
+        ''
+          mkdir -p $out/lib/clang/${llvmMajorVersion}/lib/darwin
+          ln -s $out/resource-root/lib/darwin/libclang_rt.osx.a \
+            $out/lib/clang/${llvmMajorVersion}/lib/darwin/libclang_rt.osx.a
+          ln -s $out/resource-root/lib/darwin/libclang_rt.osx.a \
+            $out/lib/clang/${llvmMajorVersion}/lib/darwin/libclang_rt.osx-${arch}.a
+        ''
+      else
+        ''
+          mkdir -p $out/lib/clang/${llvmMajorVersion}/lib/
+          ln -s $out/resource-root/lib/linux \
+            $out/lib/clang/${llvmMajorVersion}/lib/${triplet}
+        '';
   };
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -51,18 +63,25 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     python3
     llvmPackages.bintools
+  ]
+  ++ lib.optionals stdenv.isDarwin [
+    xcbuild
   ];
 
-  buildInputs = [
-    glib
-    xorg.libxcb.dev
-    xorg.libX11.dev
-    xorg.libXext.dev
-    xorg.libXi
-    wayland.dev
-    pciutils
-    libGL
-  ];
+  buildInputs =
+    lib.optionals stdenv.isLinux [
+      glib
+      xorg.libxcb.dev
+      xorg.libX11.dev
+      xorg.libXext.dev
+      xorg.libXi
+      wayland.dev
+      pciutils
+      libGL
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      apple-sdk_15
+    ];
 
   gnFlags = [
     "is_debug=false"
@@ -73,6 +92,9 @@ stdenv.mkDerivation (finalAttrs: {
     "use_custom_libcxx=true"
     "angle_enable_swiftshader=false"
     "angle_enable_wgpu=false"
+    # On darwin during linking:
+    # clang++: error: argument unused during compilation: '-stdlib=libc++'
+    "treat_warnings_as_errors=false"
   ];
 
   patches = [
@@ -88,6 +110,12 @@ stdenv.mkDerivation (finalAttrs: {
         "_dir = \"${triplet}\"
          _suffix = \"-${arch}\""
 
+    # Don't precompile Metal shaders, because the compiler is non-free.
+    substituteInPlace src/libANGLE/renderer/metal/metal_backend.gni \
+      --replace-fail \
+        "metal_internal_shader_compilation_supported =" \
+        "metal_internal_shader_compilation_supported = false &&"
+
     cat > build/config/gclient_args.gni <<EOF
     # Generated from 'DEPS'
     checkout_angle_internal = false
@@ -95,12 +123,17 @@ stdenv.mkDerivation (finalAttrs: {
     checkout_angle_restricted_traces = false
     generate_location_tags = false
     EOF
+
+    # For sandboxed build on darwin.
+    patchShebangs build/toolchain/apple
   '';
 
   installPhase = ''
     runHook preInstallPhase
 
-    install -v -m755 -D *.so *.so.1 -t "$out/lib"
+    install -v -m755 -D \
+      *${stdenv.hostPlatform.extensions.sharedLibrary}* \
+      -t "$out/lib"
     install -v -m755 -D \
       angle_shader_translator \
       gaussian_distribution_gentables \
@@ -154,6 +187,5 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     license = lib.licenses.bsd3;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    broken = stdenv.hostPlatform.isDarwin;
   };
 })

From a04bd81e706addca7ed3711f5910922852203291 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Mon, 18 Aug 2025 11:40:48 +0200
Subject: [PATCH 1908/3724] electron: fix update script (#434548)

---
 pkgs/development/tools/electron/update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py
index 6baf1135a796..94ba8eca4fa7 100755
--- a/pkgs/development/tools/electron/update.py
+++ b/pkgs/development/tools/electron/update.py
@@ -100,7 +100,7 @@ def get_chromium_gn_source(chromium_tag: str) -> dict:
         .split(")]}'\n")[1]
     )
 
-    gn_commit_date = datetime.strptime(gn_commit_info["commiter"]["time"], "%a %b %d %H:%M:%S %Y %z")
+    gn_commit_date = datetime.strptime(gn_commit_info["committer"]["time"], "%a %b %d %H:%M:%S %Y %z")
     gn_date = gn_commit_date.astimezone(UTC).date().isoformat()
     gn_version = f"0-unstable-{gn_date}"
 

From f8bd9e6dd6268501372d8a37b0ebc6b195c9d346 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 09:45:12 +0000
Subject: [PATCH 1909/3724] grafanaPlugins.victoriametrics-metrics-datasource:
 0.18.2 -> 0.18.3

---
 .../plugins/victoriametrics-metrics-datasource/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
index 0717734b95ca..c72e208877eb 100644
--- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "victoriametrics-metrics-datasource";
-  version = "0.18.2";
-  zipHash = "sha256-OcAs5rlXb+zJaGMLgCenCaMvrZmcy4MRSR0M2hzAuJc=";
+  version = "0.18.3";
+  zipHash = "sha256-OKrOC53NxbFhiYflw6gUQOo0TyxWarznnFg9Wr57704=";
   meta = {
     description = "VictoriaMetrics metrics datasource for Grafana";
     license = lib.licenses.agpl3Only;

From a7a8965df28349d4e43151d6717713cd2aa004f3 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 18 Aug 2025 11:45:37 +0200
Subject: [PATCH 1910/3724] urserver: 3.13.0.2505 -> 3.14.0.2574

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

diff --git a/pkgs/by-name/ur/urserver/package.nix b/pkgs/by-name/ur/urserver/package.nix
index dc80ea77942d..2e6c8a229603 100644
--- a/pkgs/by-name/ur/urserver/package.nix
+++ b/pkgs/by-name/ur/urserver/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "urserver";
-  version = "3.13.0.2505";
+  version = "3.14.0.2574";
 
   src = fetchurl {
     url = "https://www.unifiedremote.com/static/builds/server/linux-x64/${builtins.elemAt (builtins.splitVersion finalAttrs.version) 3}/urserver-${finalAttrs.version}.tar.gz";
-    hash = "sha256-rklv6Ppha1HhEPunbL8ELYdQ9Z1FN4FrVsNwny3/gA4=";
+    hash = "sha256-4wA2VPb5QN30TWa72pUVTYfvsxlGTO8Vngh7wDHXhDE=";
   };
 
   nativeBuildInputs = [

From 53c11eb78313f277934f4cf9a74d960467500077 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 18 Aug 2025 11:46:06 +0200
Subject: [PATCH 1911/3724] urserver: split buildInputs and wrapProgram
 arguments

---
 pkgs/by-name/ur/urserver/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ur/urserver/package.nix b/pkgs/by-name/ur/urserver/package.nix
index 2e6c8a229603..2788afed5cef 100644
--- a/pkgs/by-name/ur/urserver/package.nix
+++ b/pkgs/by-name/ur/urserver/package.nix
@@ -23,16 +23,17 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs = [
-    (lib.getLib stdenv.cc.cc)
-    bluez
-    libX11
-    libXtst
-  ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   installPhase = ''
     install -m755 -D urserver $out/bin/urserver
-    wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
+    wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${
+      lib.makeLibraryPath [
+        libX11
+        libXtst
+        bluez
+      ]
+    }"
     cp -r remotes $out/bin/remotes
     cp -r manager $out/bin/manager
   '';

From 5a33968645f9502dd02490aad3397b9d34154ded Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 18 Aug 2025 11:46:18 +0200
Subject: [PATCH 1912/3724] urserver: remove 'with lib'

---
 pkgs/by-name/ur/urserver/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ur/urserver/package.nix b/pkgs/by-name/ur/urserver/package.nix
index 2788afed5cef..b3f9261060be 100644
--- a/pkgs/by-name/ur/urserver/package.nix
+++ b/pkgs/by-name/ur/urserver/package.nix
@@ -38,12 +38,12 @@ stdenv.mkDerivation (finalAttrs: {
     cp -r manager $out/bin/manager
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.unifiedremote.com/";
     description = "One-and-only remote for your computer";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [ sfrijters ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ sfrijters ];
     platforms = [ "x86_64-linux" ];
   };
 })

From bc4d6199ca8c6073ec977ef19aee2cc63de98b7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 09:54:16 +0000
Subject: [PATCH 1913/3724] grafanaPlugins.grafana-exploretraces-app: 1.1.2 ->
 1.1.3

---
 .../grafana/plugins/grafana-exploretraces-app/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
index 550373fb8805..f4719d630acb 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-exploretraces-app";
-  version = "1.1.2";
-  zipHash = "sha256-eLSC+K1+JqSOo0HgFCTZ8pYevtO3s/ZhkJBlr29GGdY=";
+  version = "1.1.3";
+  zipHash = "sha256-0i9ndLOUXisJJk2sV0Xt0NC8KNn2k5/cIRS/G0jS8Ks=";
   meta = with lib; {
     description = "Opinionated traces app";
     license = licenses.agpl3Only;

From ffb190df0e0cc8323cd8c996f9d245c77ea3a56b Mon Sep 17 00:00:00 2001
From: orzklv <sakhib@orzklv.uz>
Date: Fri, 15 Aug 2025 10:02:37 +0500
Subject: [PATCH 1914/3724] e-imzo-manager: init at 0.1.1

Went through (@yzhou216, @qzylinra)'s feedbacks and fixed all issues.

Co-Authored-By: Yiyu Zhou <yiyu@yiyuzhou.io>
Co-Authored-By: qzylinra <225773816+qzylinra@users.noreply.github.com>
---
 pkgs/by-name/e-/e-imzo-manager/package.nix | 85 ++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 pkgs/by-name/e-/e-imzo-manager/package.nix

diff --git a/pkgs/by-name/e-/e-imzo-manager/package.nix b/pkgs/by-name/e-/e-imzo-manager/package.nix
new file mode 100644
index 000000000000..8b1497ae8d24
--- /dev/null
+++ b/pkgs/by-name/e-/e-imzo-manager/package.nix
@@ -0,0 +1,85 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cargo,
+  desktop-file-utils,
+  gnome-desktop,
+  meson,
+  ninja,
+  pkg-config,
+  polkit,
+  rustc,
+  rustPlatform,
+  wrapGAppsHook4,
+  gdk-pixbuf,
+  glib,
+  adwaita-icon-theme,
+  gtk4,
+  libadwaita,
+  openssl,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "e-imzo-manager";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "xinux-org";
+    repo = "e-imzo";
+    tag = finalAttrs.version;
+    hash = "sha256-uDaqkz2VDvqTgi+k8EGGKjLkjoH93xXHQcgUc1NVo30=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-rulWG4L/uN6+JBk+SzC0y57Pdw5N0Q1dJlpXGVo+vbQ=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    cargo
+    rustPlatform.cargoSetupHook
+    rustc
+    desktop-file-utils
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    gdk-pixbuf
+    glib
+    gnome-desktop
+    adwaita-icon-theme
+    gtk4
+    libadwaita
+    openssl
+    rustPlatform.bindgenHook
+    polkit
+  ];
+
+  propagatedUserEnvPkgs = [ polkit ];
+
+  postInstall = ''
+    gappsWrapperArgs+=(
+      --suffix PATH : ${lib.makeBinPath finalAttrs.propagatedUserEnvPkgs}
+    )
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/xinux-org/e-imzo";
+    mainProgram = "E-IMZO-Manager";
+    description = "GTK application for managing E-IMZO keys";
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.uzinfocom ];
+  };
+})

From 9baab05a550733c4686a4c08b9b505eb83b907c9 Mon Sep 17 00:00:00 2001
From: DarkOnion0 <darkonion0@clapot.org>
Date: Mon, 18 Aug 2025 12:04:03 +0200
Subject: [PATCH 1915/3724] appflowy: 0.9.5 -> 0.9.7

https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.9.7
---
 pkgs/by-name/ap/appflowy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix
index 2ef2fcb12707..3cabfdf16a5a 100644
--- a/pkgs/by-name/ap/appflowy/package.nix
+++ b/pkgs/by-name/ap/appflowy/package.nix
@@ -17,11 +17,11 @@ let
     rec {
       x86_64-linux = {
         urlSuffix = "linux-x86_64.tar.gz";
-        hash = "sha256-GhQaT6vby0VD8dPr88JcDLcBX+r0apdOyip3tk30was=";
+        hash = "sha256-GzG1IpI3azJP9uWHUm90+MJjeU+3QZuDtekkpB9/R7c=";
       };
       x86_64-darwin = {
         urlSuffix = "macos-universal.zip";
-        hash = "sha256-/hj+8okWufI2ow54xCD+XMZiEsPh0jjG8VN/phx+zgs=";
+        hash = "sha256-E1V/F+ZM6r/R8r/AhifS2rQwZHrL2J67FbCvVMhm89Q=";
       };
       aarch64-darwin = x86_64-darwin;
     }
@@ -30,7 +30,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "appflowy";
-  version = "0.9.5";
+  version = "0.9.7";
 
   src = fetchzip {
     url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";

From db168f1f1bb05c655f93828a72417f31ea504bca Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 18 Aug 2025 11:56:13 +0200
Subject: [PATCH 1916/3724] qt-material: modernize, fix

- pypi as source failed to fetch, so use github fetcher
- pypi links to https://github.com/dunderlab/qt-material as the package homepage
- qt-material switched to a pyproject build
- adjust dependencies/build-system to accomodate
---
 .../python-modules/qt-material/default.nix    | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/qt-material/default.nix b/pkgs/development/python-modules/qt-material/default.nix
index 24c279dc3e89..3f3bb9e07284 100644
--- a/pkgs/development/python-modules/qt-material/default.nix
+++ b/pkgs/development/python-modules/qt-material/default.nix
@@ -1,28 +1,34 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   jinja2,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "qt-material";
   version = "2.17";
-  format = "setuptools";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-tQCgwfXvj0aozwN9GqW9+epOthgYC2MyU5373QZHrQ0=";
+  src = fetchFromGitHub {
+    owner = "dunderlab";
+    repo = "qt-material";
+    tag = "v${version}";
+    hash = "sha256-ilrPA8SoVCo6FgwxWQ4sOjqURCFDQJLlTTkCZzTZQKI=";
   };
 
-  propagatedBuildInputs = [ jinja2 ];
+  build-system = [ setuptools ];
+
+  dependencies = [ jinja2 ];
 
   pythonImportsCheck = [ "qt_material" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/dunderlab/qt-material/releases/tag/${src.tag}";
     description = "Material inspired stylesheet for PySide2, PySide6, PyQt5 and PyQt6";
-    homepage = "https://github.com/UN-GCPDS/qt-material";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ _999eagle ];
+    homepage = "https://github.com/dunderlab/qt-material";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ _999eagle ];
   };
 }

From 1142f675aa04dfc1d4f6d5a5262a0df4d935ec8e Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 18 Aug 2025 13:05:48 +0200
Subject: [PATCH 1917/3724] urserver: add versionCheckHook

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

diff --git a/pkgs/by-name/ur/urserver/package.nix b/pkgs/by-name/ur/urserver/package.nix
index b3f9261060be..98f1ca2e2cf7 100644
--- a/pkgs/by-name/ur/urserver/package.nix
+++ b/pkgs/by-name/ur/urserver/package.nix
@@ -7,6 +7,7 @@
   libX11,
   libXtst,
   makeWrapper,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -38,6 +39,9 @@ stdenv.mkDerivation (finalAttrs: {
     cp -r manager $out/bin/manager
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   meta = {
     homepage = "https://www.unifiedremote.com/";
     description = "One-and-only remote for your computer";
@@ -45,5 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ sfrijters ];
     platforms = [ "x86_64-linux" ];
+    mainProgram = "urserver";
   };
 })

From d68f0be90c0baa159efc8a25f3068b1b27413507 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Mon, 18 Aug 2025 13:51:57 +0200
Subject: [PATCH 1918/3724] floorp: 11.29.0 -> 11.30.0

Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.29.0...v11.30.0
Release notes: https://blog.floorp.app/en/release/11.30.0.html

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/applications/networking/browsers/floorp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix
index 141699f7f7dd..8587583633e8 100644
--- a/pkgs/applications/networking/browsers/floorp/default.nix
+++ b/pkgs/applications/networking/browsers/floorp/default.nix
@@ -9,7 +9,7 @@
 (
   (buildMozillaMach rec {
     pname = "floorp";
-    packageVersion = "11.29.0";
+    packageVersion = "11.30.0";
     applicationName = "Floorp";
     binaryName = "floorp";
     branding = "browser/branding/official";
@@ -17,14 +17,14 @@
     allowAddonSideload = true;
 
     # Must match the contents of `browser/config/version.txt` in the source tree
-    version = "128.13.0";
+    version = "128.14.0";
 
     src = fetchFromGitHub {
       owner = "Floorp-Projects";
       repo = "Floorp";
       fetchSubmodules = true;
       rev = "v${packageVersion}";
-      hash = "sha256-uTTI9n99P4hHDf849lR7oiNGLbCa03ivjE1xF0gyT4Y=";
+      hash = "sha256-4IAN0S9JWjaGXtnRUJz3HqUm+ZWL7KmryLu8ojSXiqg=";
     };
 
     extraConfigureFlags = [

From 1f685465b7a0f78e1f61832d4fd74c173961abfd Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 18 Aug 2025 12:16:20 +0200
Subject: [PATCH 1919/3724] opensnitch-ui: migrate to python-slugify to fix
 build

---
 pkgs/by-name/op/opensnitch-ui/package.nix             |  9 ++++++++-
 .../by-name/op/opensnitch-ui/use_python_slugify.patch | 11 +++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/op/opensnitch-ui/use_python_slugify.patch

diff --git a/pkgs/by-name/op/opensnitch-ui/package.nix b/pkgs/by-name/op/opensnitch-ui/package.nix
index 0c9bdbdb1ca8..2c7a17b2266f 100644
--- a/pkgs/by-name/op/opensnitch-ui/package.nix
+++ b/pkgs/by-name/op/opensnitch-ui/package.nix
@@ -12,6 +12,13 @@ python3Packages.buildPythonApplication {
   inherit (opensnitch) src version;
   sourceRoot = "${opensnitch.src.name}/ui";
 
+  patches = [
+    # https://github.com/evilsocket/opensnitch/pull/1413
+    # unicode-slugify has failing tests and is overall unmaintained and broken.
+    # python-slugify is a preferrable replacement
+    ./use_python_slugify.patch
+  ];
+
   postPatch = ''
     substituteInPlace opensnitch/utils/__init__.py \
       --replace-fail /usr/lib/python3/dist-packages/data ${python3Packages.pyasn}/${python3Packages.python.sitePackages}/pyasn/data
@@ -38,7 +45,7 @@ python3Packages.buildPythonApplication {
     pyinotify
     pyqt5
     qt-material
-    unicode-slugify
+    python-slugify
     unidecode
   ];
 
diff --git a/pkgs/by-name/op/opensnitch-ui/use_python_slugify.patch b/pkgs/by-name/op/opensnitch-ui/use_python_slugify.patch
new file mode 100644
index 000000000000..877b5006251a
--- /dev/null
+++ b/pkgs/by-name/op/opensnitch-ui/use_python_slugify.patch
@@ -0,0 +1,11 @@
+diff --git a/requirements.txt b/requirements.txt
+index 66e0de13..68d651b1 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,5 +1,5 @@
+ grpcio-tools>=1.10.1
+ pyinotify==0.9.6
+-unicode_slugify==0.1.5
++python-slugify>=7.0.0
+ pyqt5>=5.6
+ protobuf

From bf6217a43fe3d69ddc279e48e206f3f62b438f5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 12:26:25 +0000
Subject: [PATCH 1920/3724] pulumi: 3.185.0 -> 3.190.0

---
 pkgs/by-name/pu/pulumi/package.nix                       | 6 +++---
 pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix     | 2 +-
 pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix | 2 +-
 pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pu/pulumi/package.nix b/pkgs/by-name/pu/pulumi/package.nix
index 4091b8d99567..088bb4e1a1f4 100644
--- a/pkgs/by-name/pu/pulumi/package.nix
+++ b/pkgs/by-name/pu/pulumi/package.nix
@@ -17,18 +17,18 @@
 }:
 buildGoModule rec {
   pname = "pulumi";
-  version = "3.185.0";
+  version = "3.190.0";
 
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "pulumi";
     tag = "v${version}";
-    hash = "sha256-/7VaFeEQXVqF7g+CR2oTSmOWgWjw/LS9s0+VZcSlFvU=";
+    hash = "sha256-n4YjJJZNPRjvR5WuDO3+bCvKxDrmK7VBbS6E6RP0C84=";
     # Some tests rely on checkout directory name
     name = "pulumi";
   };
 
-  vendorHash = "sha256-aAxBVMLL7JRSJSVIR9/gNTNj8sZHg39ftv+ZAO8PS54=";
+  vendorHash = "sha256-ewVZNgnW7JbX0VOU14Ipo7EBkj8evOoXWjf9yLOmJF8=";
 
   sourceRoot = "${src.name}/pkg";
 
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix
index 687e0f23eb1d..4632c8353e82 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/sdk/go/pulumi-language-go";
 
-  vendorHash = "sha256-FSkFZhuwbTxCQgES+rFoVeSJHtepZiHEtnfShZ+eSMU=";
+  vendorHash = "sha256-SfnGZyHuhgj277DrRqr8TkKE+ZwnPKBFu/7EcPS4OhE=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix
index 219653344594..862436c760dc 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/sdk/nodejs/cmd/pulumi-language-nodejs";
 
-  vendorHash = "sha256-q/NKPB5U7z3gPXIV2wCZXBN6QfJ4nMVdLUMcwXJ800Q=";
+  vendorHash = "sha256-Mf/SsRRDlm/TuSOksLV8f7H7xiT6fkHWyH6fJFo5fCc=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix
index cfa68ca5d945..4672f754ed1e 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/sdk/python/cmd/pulumi-language-python";
 
-  vendorHash = "sha256-oWEl/IeoMya40D62QaYoGiyKcKQZZ008RxR9m/pJ7VU=";
+  vendorHash = "sha256-cpmB1Vmi8JAh+OKzoZ/x/AxB4uxH95laSo0uBGrj3FQ=";
 
   ldflags = [
     "-s"

From 7e672a94ca89a000c4692e76239a44992a2c029f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 12:41:36 +0000
Subject: [PATCH 1921/3724] storj-uplink: 1.134.2 -> 1.135.3

---
 pkgs/by-name/st/storj-uplink/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/storj-uplink/package.nix b/pkgs/by-name/st/storj-uplink/package.nix
index 9a408203b846..4a89f9927053 100644
--- a/pkgs/by-name/st/storj-uplink/package.nix
+++ b/pkgs/by-name/st/storj-uplink/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "storj-uplink";
-  version = "1.134.2";
+  version = "1.135.3";
 
   src = fetchFromGitHub {
     owner = "storj";
     repo = "storj";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DNxbJ+vw6a2yxbc6y/h+o4C7yhh5laCr2XIdBmjvAyc=";
+    hash = "sha256-9KcJ0Ol+oV2SWpTUOJxNcKnd+l80ysh8A02of0pccjs=";
   };
 
   subPackages = [ "cmd/uplink" ];
 
-  vendorHash = "sha256-ZteKOH6t2C96pm1u3J5GLXgWVdM77FjRqg6bYqIh1wQ=";
+  vendorHash = "sha256-XOsOCBIC9krvEn7MxRhXpLA2UAjv4Sfdnim/wf3HBPU=";
 
   ldflags = [ "-s" ];
 

From a90bfcc0a8716256a6e9e47b8f13e2a4812b29e8 Mon Sep 17 00:00:00 2001
From: Marcus Ramberg <marcus@means.no>
Date: Mon, 18 Aug 2025 15:26:41 +0200
Subject: [PATCH 1922/3724] cloudflare-warp: use PartOf instead of BindsTo for
 taskbar service to prevent logout problems

---
 pkgs/by-name/cl/cloudflare-warp/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix
index e31cb4c5a24e..3a6c759ad1ad 100644
--- a/pkgs/by-name/cl/cloudflare-warp/package.nix
+++ b/pkgs/by-name/cl/cloudflare-warp/package.nix
@@ -92,9 +92,10 @@ stdenv.mkDerivation rec {
     patchelf --replace-needed libpcap.so.0.8 ${libpcap}/lib/libpcap.so $out/bin/warp-dex
     mv lib/systemd/system $out/lib/systemd/
     substituteInPlace $out/lib/systemd/system/warp-svc.service \
-      --replace "ExecStart=" "ExecStart=$out"
+      --replace-fail "ExecStart=" "ExecStart=$out"
     substituteInPlace $out/lib/systemd/user/warp-taskbar.service \
-      --replace "ExecStart=" "ExecStart=$out"
+      --replace-fail "ExecStart=" "ExecStart=$out" \
+      --replace-fail "BindsTo=" "PartOf="
 
     cat >>$out/lib/systemd/user/warp-taskbar.service <<EOF
 

From 965481f8832d1fc9071417bf26932872006a5a39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 13:30:23 +0000
Subject: [PATCH 1923/3724] nextcloud-whiteboard-server: 1.1.2 -> 1.1.3

---
 pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix b/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix
index 857752585a09..a94f01778c3d 100644
--- a/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix
+++ b/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix
@@ -8,16 +8,16 @@
 }:
 buildNpmPackage rec {
   pname = "nextcloud-whiteboard-server";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "nextcloud";
     repo = "whiteboard";
     tag = "v${version}";
-    hash = "sha256-nDZnO1aqOP78xqcQKBJd7B8idG3Jbjqj5ifWqMslB6M=";
+    hash = "sha256-4qk6mAFz7bYWtrlqiVPiyWF4ub4Ks9RhS5oODlOYRvA=";
   };
 
-  npmDepsHash = "sha256-EiD1fAT6i8V1arXBNaqHk8GvAgetL3VZT9d2/3zPIj8=";
+  npmDepsHash = "sha256-WHSMK7s6vohphHoNh96yejdwXHBxdkQSpMMNiFS15E4=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 5b8f93040cb611b7284252cec5609327b4cce237 Mon Sep 17 00:00:00 2001
From: wrvsrx <wrvsrx@outlook.com>
Date: Mon, 18 Aug 2025 21:54:35 +0800
Subject: [PATCH 1924/3724] xwayland-satellite: 0.6 -> 0.7

---
 pkgs/by-name/xw/xwayland-satellite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix
index 072ec5bce96e..76deb44de602 100644
--- a/pkgs/by-name/xw/xwayland-satellite/package.nix
+++ b/pkgs/by-name/xw/xwayland-satellite/package.nix
@@ -13,13 +13,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "xwayland-satellite";
-  version = "0.6";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "Supreeeme";
     repo = "xwayland-satellite";
     tag = "v${version}";
-    hash = "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=";
+    hash = "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=";
   };
 
   postPatch = ''
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
       --replace-fail '/usr/local/bin' "$out/bin"
   '';
 
-  cargoHash = "sha256-R3xXyXpHQw/Vh5Y4vFUl7n7jwBEEqwUCIZGAf9+SY1M=";
+  cargoHash = "sha256-2+qQSCyWOtOJ4fTVCHbvHYO+k4vxC2nbEOJMdjQZOgY=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

From 87314178e0dc53517b3bd41109cc183ae344a2f1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 18 Aug 2025 09:14:39 +0200
Subject: [PATCH 1925/3724] python313Packages.env-canada: test with
 pytest-asyncio

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

diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix
index a6122b3c86d7..f35b840a63b1 100644
--- a/pkgs/development/python-modules/env-canada/default.nix
+++ b/pkgs/development/python-modules/env-canada/default.nix
@@ -10,6 +10,7 @@
   numpy,
   pandas,
   pillow,
+  pytest-asyncio,
   pytestCheckHook,
   python-dateutil,
   pythonOlder,
@@ -47,6 +48,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    pytest-asyncio
     freezegun
     pytestCheckHook
     syrupy

From 5fa748a28a730b1e8aeadb11a3e2d62a1dbcbecd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 18 Aug 2025 09:11:24 +0200
Subject: [PATCH 1926/3724] python313Packages.swisshydrodata: test with
 pytest-asyncio

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

diff --git a/pkgs/development/python-modules/swisshydrodata/default.nix b/pkgs/development/python-modules/swisshydrodata/default.nix
index 4d7d159401bd..e9581c48ea5b 100644
--- a/pkgs/development/python-modules/swisshydrodata/default.nix
+++ b/pkgs/development/python-modules/swisshydrodata/default.nix
@@ -1,13 +1,14 @@
 {
   lib,
+  aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
+  pytest-asyncio,
   pytest-cov-stub,
+  pytestCheckHook,
   pythonOlder,
   requests-mock,
   requests,
-  aiohttp,
   setuptools,
 }:
 
@@ -33,8 +34,9 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pytestCheckHook
+    pytest-asyncio
     pytest-cov-stub
+    pytestCheckHook
     requests-mock
   ];
 

From 378df0d5811fd827f37a864d9aff9e6bf58ef31b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 14:21:15 +0000
Subject: [PATCH 1927/3724] vscode-extensions.betterthantomorrow.calva: 2.0.523
 -> 2.0.524

---
 .../vscode/extensions/betterthantomorrow.calva/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
index 4093ba5db0b5..9cbd494730ae 100644
--- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "calva";
     publisher = "betterthantomorrow";
-    version = "2.0.523";
-    hash = "sha256-gEAOocMSOmiPjEyayI8RjwMYDPGuZxPKB6S6R9fmGM4=";
+    version = "2.0.524";
+    hash = "sha256-gt6+juIwTKES0CDBxv4uVSPsp0v1RUKRQoWneDfyVJQ=";
   };
 
   nativeBuildInputs = [

From e82cf7e115a7979aa82c018902822f351a328d80 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 14:41:53 +0000
Subject: [PATCH 1928/3724] coreth: 0.15.2 -> 0.15.3

---
 pkgs/by-name/co/coreth/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/coreth/package.nix b/pkgs/by-name/co/coreth/package.nix
index 8d83b2a0933d..dee08d48c295 100644
--- a/pkgs/by-name/co/coreth/package.nix
+++ b/pkgs/by-name/co/coreth/package.nix
@@ -6,19 +6,19 @@
 
 buildGoModule rec {
   pname = "coreth";
-  version = "0.15.2";
+  version = "0.15.3";
 
   src = fetchFromGitHub {
     owner = "ava-labs";
     repo = "coreth";
     rev = "v${version}";
-    hash = "sha256-YPL/CJIAB/hkUrvyY0jcHWNKry6ddeO2mpxBiutNNMU=";
+    hash = "sha256-c2Z0rstaOTVsMmOJbHeYJ1rxFHOA/kUzj8k8z56APZ8=";
   };
 
   # go mod vendor has a bug, see: golang/go#57529
   proxyVendor = true;
 
-  vendorHash = "sha256-SGOg2xHWcwJc4j6RcR2KaicXrBkwY2PtknVEvQtatGs=";
+  vendorHash = "sha256-V0IzZbJ1KfSSF/NL4a14mL+hwXF213HM5WJS3mmT4mQ=";
 
   ldflags = [
     "-s"

From 507cf3de9f7a3ad0829f9638a55c5e5d4ac01251 Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Mon, 18 Aug 2025 16:24:28 +0200
Subject: [PATCH 1929/3724] vagrant: 2.4.3 -> 2.4.8

---
 ...l-request-12225-from-chrisroberts-re.patch | 64 +++++++++----------
 pkgs/by-name/va/vagrant/gemset.nix            | 18 ++++--
 pkgs/by-name/va/vagrant/package.nix           |  5 +-
 .../unofficial-installation-nowarn.patch      | 16 -----
 4 files changed, 48 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/by-name/va/vagrant/unofficial-installation-nowarn.patch

diff --git a/pkgs/by-name/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch b/pkgs/by-name/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
index ae0b3f37d505..d1662530f751 100644
--- a/pkgs/by-name/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
+++ b/pkgs/by-name/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
@@ -66,8 +66,8 @@ index c019f30ff..ba7e40076 100755
 -
  env = nil
  begin
-   require 'log4r'
-@@ -114,9 +91,6 @@ begin
+   require 'vagrant'
+@@ -113,9 +90,6 @@ begin
    require 'vagrant/util/platform'
    require 'vagrant/util/experimental'
  
@@ -81,7 +81,7 @@ diff --git a/lib/vagrant.rb b/lib/vagrant.rb
 index f790039d3..97e67e3b8 100644
 --- a/lib/vagrant.rb
 +++ b/lib/vagrant.rb
-@@ -59,7 +59,7 @@ require "vagrant/plugin/manager"
+@@ -64,7 +64,7 @@ require "vagrant/plugin/manager"
  # See https://github.com/rest-client/rest-client/issues/34#issuecomment-290858
  # for more information
  class VagrantLogger < Log4r::Logger
@@ -94,7 +94,7 @@ diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
 index eb2caabb0..d75f54362 100644
 --- a/lib/vagrant/bundler.rb
 +++ b/lib/vagrant/bundler.rb
-@@ -189,11 +189,8 @@ module Vagrant
+@@ -192,11 +192,8 @@
      attr_reader :env_plugin_gem_path
      # @return [Pathname] Vagrant environment data path
      attr_reader :environment_data_path
@@ -106,7 +106,7 @@ index eb2caabb0..d75f54362 100644
        @plugin_gem_path = Vagrant.user_data_path.join("gems", RUBY_VERSION).freeze
        @logger = Log4r::Logger.new("vagrant::bundler")
      end
-@@ -290,6 +287,7 @@ module Vagrant
+@@ -298,6 +295,7 @@
          # Never allow dependencies to be remotely satisfied during init
          request_set.remote = false
  
@@ -114,7 +114,7 @@ index eb2caabb0..d75f54362 100644
          begin
            @logger.debug("resolving solution from available specification set")
            # Resolve the request set to ensure proper activation order
-@@ -652,6 +650,7 @@ module Vagrant
+@@ -672,6 +670,7 @@
          self_spec.activate
          @logger.info("Activated vagrant specification version - #{self_spec.version}")
        end
@@ -122,20 +122,20 @@ index eb2caabb0..d75f54362 100644
        # discover all the gems we have available
        list = {}
        if Gem.respond_to?(:default_specifications_dir)
-@@ -660,16 +659,10 @@ module Vagrant
+@@ -680,16 +679,10 @@
          spec_dir = Gem::Specification.default_specifications_dir
        end
        directories = [spec_dir]
 -      if Vagrant.in_bundler?
 -        Gem::Specification.find_all{true}.each do |spec|
--          list[spec.full_name] = spec
+-          list[spec.name] = spec
 -        end
 -      else
 -        builtin_specs.each do |spec|
--          list[spec.full_name] = spec
+-          list[spec.name] = spec
 -        end
 +      Gem::Specification.find_all{true}.each do |spec|
-+        list[spec.full_name] = spec
++        list[spec.name] = spec
        end
 -      if Vagrant.in_installer?
 +      if(!Object.const_defined?(:Bundler))
@@ -146,7 +146,7 @@ diff --git a/lib/vagrant/errors.rb b/lib/vagrant/errors.rb
 index 5cb861c06..782615bc4 100644
 --- a/lib/vagrant/errors.rb
 +++ b/lib/vagrant/errors.rb
-@@ -636,18 +636,6 @@ module Vagrant
+@@ -691,18 +691,6 @@ module Vagrant
        error_key(:provisioner_winrm_unsupported)
      end
  
@@ -169,7 +169,7 @@ diff --git a/lib/vagrant/plugin/manager.rb b/lib/vagrant/plugin/manager.rb
 index b73f07f9c..9058e68b3 100644
 --- a/lib/vagrant/plugin/manager.rb
 +++ b/lib/vagrant/plugin/manager.rb
-@@ -179,26 +179,8 @@ module Vagrant
+@@ -182,26 +182,8 @@ module Vagrant
          result
        rescue Gem::GemNotFoundException
          raise Errors::PluginGemNotFound, name: name
@@ -202,7 +202,7 @@ diff --git a/templates/locales/en.yml b/templates/locales/en.yml
 index edae9b477..782904f49 100644
 --- a/templates/locales/en.yml
 +++ b/templates/locales/en.yml
-@@ -794,9 +794,9 @@ en:
+@@ -875,9 +875,9 @@ en:
          matching this provider. For example, if you're using VirtualBox,
          the clone environment must also be using VirtualBox.
        cloud_init_not_found: |-
@@ -214,7 +214,7 @@ index edae9b477..782904f49 100644
          cloud init command '%{cmd}' failed on guest '%{guest_name}'.
        command_deprecated: |-
          The command 'vagrant %{name}' has been deprecated and is no longer functional
-@@ -1245,30 +1245,6 @@ en:
+@@ -1347,30 +1347,6 @@ en:
          following command:
  
            vagrant plugin install --local
@@ -245,7 +245,7 @@ index edae9b477..782904f49 100644
        powershell_not_found: |-
          Failed to locate the powershell executable on the available PATH. Please
          ensure powershell is installed and available on the local PATH, then
-@@ -3015,7 +2998,7 @@ en:
+@@ -3183,7 +3159,7 @@ en:
      pushes:
        file:
          no_destination: "File destination must be specified."
@@ -258,7 +258,7 @@ diff --git a/test/unit/bin/vagrant_test.rb b/test/unit/bin/vagrant_test.rb
 index dbbd52112..bc11309aa 100644
 --- a/test/unit/bin/vagrant_test.rb
 +++ b/test/unit/bin/vagrant_test.rb
-@@ -30,7 +30,6 @@ describe "vagrant bin" do
+@@ -33,7 +33,6 @@ describe "vagrant bin" do
      allow(Kernel).to receive(:exit)
      allow(Vagrant::Environment).to receive(:new).and_return(env)
      allow(Vagrant).to receive(:in_installer?).and_return(true)
@@ -270,50 +270,50 @@ diff --git a/test/unit/vagrant/bundler_test.rb b/test/unit/vagrant/bundler_test.
 index 69f425c66..00cedc021 100644
 --- a/test/unit/vagrant/bundler_test.rb
 +++ b/test/unit/vagrant/bundler_test.rb
-@@ -778,46 +778,42 @@ describe Vagrant::Bundler do
+@@ -809,46 +809,42 @@ describe Vagrant::Bundler do
        end
      end
  
 -    context "when bundler is not defined" do
 -      before { expect(Vagrant).to receive(:in_bundler?).and_return(false) }
+-
+-      context "when running inside the installer" do
+-        before { expect(Vagrant).to receive(:in_installer?).and_return(true) }
 +    context "when run time dependencies are defined" do
 +      let(:vagrant_dep_specs) { [double("spec", name: "vagrant-dep", requirement: double("spec-req", as_list: []))] }
  
--      context "when running inside the installer" do
--        before { expect(Vagrant).to receive(:in_installer?).and_return(true) }
+-        it "should load gem specification directories" do
+-          expect(Gem::Specification).to receive(:dirs).and_return(spec_dirs)
+-          subject.send(:vagrant_internal_specs)
+-        end
 +      it "should call #gem to activate the dependencies" do
 +        expect(subject).to receive(:gem).with("vagrant-dep", any_args)
 +        subject.send(:vagrant_internal_specs)
 +      end
 +    end
  
--        it "should load gem specification directories" do
--          expect(Gem::Specification).to receive(:dirs).and_return(spec_dirs)
--          subject.send(:vagrant_internal_specs)
--        end
-+    context "when bundler is not defined" do
-+      before { expect(Object).to receive(:const_defined?).with(:Bundler).and_return(false) }
- 
 -        context "when checking paths" do
 -          let(:spec_dirs) { [double("spec-dir", start_with?: in_user_dir)] }
 -          let(:in_user_dir) { true }
 -          let(:user_dir) { double("user-dir") }
++    context "when bundler is not defined" do
++      before { expect(Object).to receive(:const_defined?).with(:Bundler).and_return(false) }
+ 
+-          before { allow(Gem).to receive(:user_dir).and_return(user_dir) }
 +      it "should load gem specification directories" do
 +        expect(Gem::Specification).to receive(:dirs).and_return(spec_dirs)
 +        subject.send(:vagrant_internal_specs)
 +      end
  
--          before { allow(Gem).to receive(:user_dir).and_return(user_dir) }
+-          it "should check if path is within local user directory" do
+-            expect(spec_dirs.first).to receive(:start_with?).with(user_dir).and_return(false)
+-            subject.send(:vagrant_internal_specs)
+-          end
 +      context "when checking paths" do
 +        let(:spec_dirs) { [double("spec-dir", start_with?: in_user_dir)] }
 +        let(:in_user_dir) { true }
 +        let(:user_dir) { double("user-dir") }
  
--          it "should check if path is within local user directory" do
--            expect(spec_dirs.first).to receive(:start_with?).with(user_dir).and_return(false)
--            subject.send(:vagrant_internal_specs)
--          end
--
 -          context "when path is not within user directory" do
 -            let(:in_user_dir) { false }
 +        before { allow(Gem).to receive(:user_dir).and_return(user_dir) }
diff --git a/pkgs/by-name/va/vagrant/gemset.nix b/pkgs/by-name/va/vagrant/gemset.nix
index 9958730f0e5c..bef31fe3b087 100644
--- a/pkgs/by-name/va/vagrant/gemset.nix
+++ b/pkgs/by-name/va/vagrant/gemset.nix
@@ -44,10 +44,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in";
+      sha256 = "sha256-mo1IS+L9QJag6QoM0+RJoFvDqjP4rJ5Nbc72rBRVtuw=";
       type = "gem";
     };
-    version = "4.1.0";
+    version = "5.1.0";
   };
   concurrent-ruby = {
     groups = [ "default" ];
@@ -59,6 +59,16 @@
     };
     version = "1.3.4";
   };
+  csv = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "sha256-C70d79wxE0q+/tAnpjmzcjwnU4YhUPTD7mHKtxsg1n0=";
+      type = "gem";
+    };
+    version = "3.3.0";
+  };
   date = {
     groups = [ "default" ];
     platforms = [ ];
@@ -837,10 +847,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0x5l2pn4x92734k6i2wcjbn2klmwgkiqaajvxadh35k74dgnyh18";
+      sha256 = "sha256-xG2dy203UZnKB0ZbxnZp7o8EGuqlXdfa/m3k3Zeydkc=";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "0.2.0";
   };
   webrick = {
     groups = [ "development" ];
diff --git a/pkgs/by-name/va/vagrant/package.nix b/pkgs/by-name/va/vagrant/package.nix
index 7459bb1f2bbe..bdb91a248c0d 100644
--- a/pkgs/by-name/va/vagrant/package.nix
+++ b/pkgs/by-name/va/vagrant/package.nix
@@ -16,9 +16,9 @@
 let
   # NOTE: bumping the version and updating the hash is insufficient;
   # you must use bundix to generate a new gemset.nix in the Vagrant source.
-  version = "2.4.3";
+  version = "2.4.8";
   url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
-  hash = "sha256-ZQWdSCV5lBL8XUnOvCFwJAFk+tw30q2lRTHR93qeZ2I=";
+  hash = "sha256-AVagvZKbVT4RWrCJdskhABTunRM9tBb5+jovYM/VF+0=";
 
   deps = bundlerEnv rec {
     name = "${pname}-${version}";
@@ -72,7 +72,6 @@ buildRubyGem rec {
   buildInputs = [ openssl ];
 
   patches = [
-    ./unofficial-installation-nowarn.patch
     ./use-system-bundler-version.patch
     ./0004-Support-system-installed-plugins.patch
     ./0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
diff --git a/pkgs/by-name/va/vagrant/unofficial-installation-nowarn.patch b/pkgs/by-name/va/vagrant/unofficial-installation-nowarn.patch
deleted file mode 100644
index 0ea8b51ef527..000000000000
--- a/pkgs/by-name/va/vagrant/unofficial-installation-nowarn.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/bin/vagrant b/bin/vagrant
-index 7ca30b391..d3f4ea61a 100755
---- a/bin/vagrant
-+++ b/bin/vagrant
-@@ -221,11 +221,6 @@ begin
-       end
-     end
- 
--    if !Vagrant.in_installer? && !Vagrant.very_quiet?
--      # If we're not in the installer, warn.
--      env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false)
--    end
--
-     # Acceptable experimental flag values include:
-     #
-     # Unset  - Disables experimental features

From 4d7708a74a529f15533b7874f85c424d3829de83 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 18 Aug 2025 17:20:07 +0200
Subject: [PATCH 1930/3724] python3Packages.bgutil-ytdlp-pot-provider: init at
 1.2.2

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

diff --git a/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix b/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix
new file mode 100644
index 000000000000..2b067e2d7b40
--- /dev/null
+++ b/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  yt-dlp,
+}:
+
+buildPythonPackage rec {
+  pname = "bgutil-ytdlp-pot-provider";
+  version = "1.2.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Brainicism";
+    repo = "bgutil-ytdlp-pot-provider";
+    tag = version;
+    hash = "sha256-KKImGxFGjClM2wAk/L8nwauOkM/gEwRVMZhTP62ETqY=";
+  };
+
+  sourceRoot = "${src.name}/plugin";
+
+  build-system = [ hatchling ];
+
+  dependencies = [ yt-dlp ];
+
+  doCheck = false; # no tests
+
+  meta = {
+    description = "Proof-of-origin token provider plugin for yt-dlp";
+    homepage = "https://github.com/Brainicism/bgutil-ytdlp-pot-provider";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1cd74042a1f0..e13f85efb59a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1845,6 +1845,8 @@ self: super: with self; {
 
   beziers = callPackage ../development/python-modules/beziers { };
 
+  bgutil-ytdlp-pot-provider = callPackage ../development/python-modules/bgutil-ytdlp-pot-provider { };
+
   bibtexparser = callPackage ../development/python-modules/bibtexparser { };
 
   bibtexparser_2 = callPackage ../development/python-modules/bibtexparser/2.nix { };

From 91701f2b4fda9327d964a8535d50d95627720e8b Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Mon, 18 Aug 2025 11:31:38 -0400
Subject: [PATCH 1931/3724] wrkflw: 0.4.0 -> 0.7.0

changelog: https://github.com/bahdotsh/wrkflw/releases/tag/v0.7.0

changelog: https://github.com/bahdotsh/wrkflw/releases/tag/v0.6.0

changelog: https://github.com/bahdotsh/wrkflw/releases/tag/v0.5.0
---
 pkgs/by-name/wr/wrkflw/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wr/wrkflw/package.nix b/pkgs/by-name/wr/wrkflw/package.nix
index c9171d2137ae..b165a9057258 100644
--- a/pkgs/by-name/wr/wrkflw/package.nix
+++ b/pkgs/by-name/wr/wrkflw/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wrkflw";
-  version = "0.4.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "bahdotsh";
     repo = "wrkflw";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-b2g6sY+YBZfD5D+fmbpz+hKZvKKwjCCuygxk2pyYaR8=";
+    hash = "sha256-J0FlGuISBpyiZNQSwQF/9YJncu67BKSC2Bq2S6F/vKQ=";
   };
 
-  cargoHash = "sha256-iCagvOIc1Gsox6yQDfOrSTXaM30Q93CwHZdDZOi4kK0=";
+  cargoHash = "sha256-8iYsHVc7WI94IKMECYs4v+68rG3Mc8Kto9dmGwQrkCU=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From 982eae85c0654fa4611e9ddfb51b2ea47910e516 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 15:33:15 +0000
Subject: [PATCH 1932/3724] nwjs-ffmpeg-prebuilt: 0.102.0 -> 0.102.1

---
 pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
index 27bd71cbc925..5e4006dda7c2 100644
--- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
+++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
@@ -7,7 +7,7 @@
 
 let
   bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32";
-  version = "0.102.0";
+  version = "0.102.1";
 in
 stdenv.mkDerivation {
   pname = "nwjs-ffmpeg-prebuilt";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   src =
     let
       hashes = {
-        "x64" = "sha256-o9Xso1bRRfGJhf0cfWS1sS6FNugl1bbI27Jzn1YXqNw=";
-        "ia32" = "sha256-o9Xso1bRRfGJhf0cfWS1sS6FNugl1bbI27Jzn1YXqNw=";
+        "x64" = "sha256-n+HvcOg3QieUu/2Ezc+rk80XceionHjIE+xAH/MkoAc=";
+        "ia32" = "sha256-n+HvcOg3QieUu/2Ezc+rk80XceionHjIE+xAH/MkoAc=";
       };
     in
     fetchurl {

From db02b37b72500619d78e9970b0fcbffa6ebf0f2b Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Mon, 18 Aug 2025 12:32:58 -0400
Subject: [PATCH 1933/3724] python313Packages.highdicom: use test data via
 passthru from pydicom

This eliminates a spurious copy of pydicom-data.
---
 .../python-modules/highdicom/default.nix            | 13 +------------
 pkgs/development/python-modules/pydicom/default.nix |  2 ++
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix
index abfb7f2badd5..d2ac5b94ecda 100644
--- a/pkgs/development/python-modules/highdicom/default.nix
+++ b/pkgs/development/python-modules/highdicom/default.nix
@@ -14,14 +14,6 @@
   typing-extensions,
 }:
 
-let
-  test_data = fetchFromGitHub {
-    owner = "pydicom";
-    repo = "pydicom-data";
-    rev = "cbb9b2148bccf0f550e3758c07aca3d0e328e768";
-    hash = "sha256-nF/j7pfcEpWHjjsqqTtIkW8hCEbuQ3J4IxpRk0qc1CQ=";
-  };
-in
 buildPythonPackage rec {
   pname = "highdicom";
   version = "0.26.1";
@@ -63,7 +55,7 @@ buildPythonPackage rec {
   preCheck = ''
     export HOME=$TMP/test-home
     mkdir -p $HOME/.pydicom/
-    ln -s ${test_data}/data_store/data $HOME/.pydicom/data
+    ln -s ${pydicom.passthru.pydicom-data}/data_store/data $HOME/.pydicom/data
   '';
 
   disabledTests = [
@@ -94,9 +86,6 @@ buildPythonPackage rec {
     "highdicom.sc"
   ];
 
-  # updates the wrong fetcher
-  passthru.skipBulkUpdate = true;
-
   meta = {
     description = "High-level DICOM abstractions for Python";
     homepage = "https://highdicom.readthedocs.io";
diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix
index bfab7cb2f30f..ea11dbcf3a97 100644
--- a/pkgs/development/python-modules/pydicom/default.nix
+++ b/pkgs/development/python-modules/pydicom/default.nix
@@ -58,6 +58,8 @@ buildPythonPackage rec {
   ]
   ++ optional-dependencies.pixeldata;
 
+  passthru.pydicom-data = test_data;
+
   # Setting $HOME to prevent pytest to try to create a folder inside
   # /homeless-shelter which is read-only.
   # Linking pydicom-data dicom files to $HOME/.pydicom/data

From a8d21b3821a8363f078ad15d1d0efed0ce81e760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Mon, 18 Aug 2025 19:56:13 +0200
Subject: [PATCH 1934/3724] python3Packages.statmake: fix build

---
 pkgs/development/python-modules/statmake/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix
index 1dbb09f0d5f4..d75c9c3727b3 100644
--- a/pkgs/development/python-modules/statmake/default.nix
+++ b/pkgs/development/python-modules/statmake/default.nix
@@ -13,6 +13,8 @@
   pythonOlder,
   ufo2ft,
   ufolib2,
+  hatchling,
+  hatch-vcs,
 }:
 
 buildPythonPackage rec {
@@ -29,6 +31,11 @@ buildPythonPackage rec {
     hash = "sha256-UqL3l27Icu5DoVvFYctbOF7gvKvVV6hK1R5A1y9SYkU=";
   };
 
+  build-system = [
+    hatchling
+    hatch-vcs
+  ];
+
   nativeBuildInputs = [ poetry-core ];
 
   propagatedBuildInputs = [

From 383b7f36159e6768ba28acb7b66cbd0629863333 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 18 Aug 2025 16:15:26 +0200
Subject: [PATCH 1935/3724] python313Packages.nocaselist: add missing build
 requirement

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

diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix
index c76216939c54..891b78487ca2 100644
--- a/pkgs/development/python-modules/nocaselist/default.nix
+++ b/pkgs/development/python-modules/nocaselist/default.nix
@@ -5,6 +5,7 @@
   pytestCheckHook,
   pythonOlder,
   setuptools,
+  setuptools-scm,
   six,
 }:
 
@@ -20,7 +21,10 @@ buildPythonPackage rec {
     hash = "sha256-+3MG9aPgRVNOc3q37L7uA5ul6br7xbXyMfYW1+khG2U=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   dependencies = [ six ];
 

From e39d4e6c1619d8420f32ff6d3a4d963a2919cdd3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 18 Aug 2025 18:25:42 +0200
Subject: [PATCH 1936/3724] python313Packages.schema-salad: update postPatch

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

diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index 872f8073f0ca..66654564b824 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -36,8 +36,11 @@ buildPythonPackage rec {
   pythonRelaxDeps = [ "mistune" ];
 
   postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail 'pytest_runner + ["setuptools_scm>=8.0.4,<9"]' '["setuptools_scm"]'
     substituteInPlace pyproject.toml \
-      --replace-fail "mypy[mypyc]==1.15.0" "mypy"
+      --replace-fail '"setuptools_scm[toml]>=8.0.4,<9"' '"setuptools_scm[toml]"' \
+      --replace-fail "mypy[mypyc]==1.17.0" "mypy"
     sed -i "/black>=/d" pyproject.toml
   '';
 

From ecfbc827492d79192fad200f736d5d32988acdf6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 18 Aug 2025 18:31:55 +0200
Subject: [PATCH 1937/3724] python313Packages.cwlformat: modernize

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

diff --git a/pkgs/development/python-modules/cwlformat/default.nix b/pkgs/development/python-modules/cwlformat/default.nix
index f9a56ad49870..1144d815b03b 100644
--- a/pkgs/development/python-modules/cwlformat/default.nix
+++ b/pkgs/development/python-modules/cwlformat/default.nix
@@ -6,12 +6,13 @@
   pytestCheckHook,
   pythonOlder,
   ruamel-yaml,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "cwlformat";
   version = "2022.02.18";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -31,12 +32,19 @@ buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = [ ruamel-yaml ];
+  build-system = [ setuptools ];
+
+  dependencies = [ ruamel-yaml ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "cwlformat" ];
 
+  disabledTests = [
+    # Test compares output
+    "test_formatting_battery"
+  ];
+
   meta = with lib; {
     description = "Code formatter for CWL";
     homepage = "https://github.com/rabix/cwl-format";

From 9de8eb2c3d64a002771ab4d17efd55b765febd23 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 18 Aug 2025 19:53:30 +0200
Subject: [PATCH 1938/3724] python313Packages.cymruwhois: disable failing test

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

diff --git a/pkgs/development/python-modules/cymruwhois/default.nix b/pkgs/development/python-modules/cymruwhois/default.nix
index 070dc04cb0d4..5bca7d20f923 100644
--- a/pkgs/development/python-modules/cymruwhois/default.nix
+++ b/pkgs/development/python-modules/cymruwhois/default.nix
@@ -33,12 +33,15 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "cymruwhois" ];
 
   disabledTests = [
-    # Tests require network access
-    "test_asn"
     # AssertionError
     "test_doctest"
   ];
 
+  disabledTestPaths = [
+    # £Failed: 'yield' keyword is allowed in fixtures, but not in tests (test_common)
+    "tests/test_common_lookups.py"
+  ];
+
   meta = {
     description = "Python client for the whois.cymru.com service";
     homepage = "https://github.com/JustinAzoff/python-cymruwhois";

From b84809fbcaf0bbf2cb078c311a3eef75e6b21305 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 18 Aug 2025 19:57:16 +0200
Subject: [PATCH 1939/3724] python313Packages.html2image: update build-system

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

diff --git a/pkgs/development/python-modules/html2image/default.nix b/pkgs/development/python-modules/html2image/default.nix
index bca718a33311..b6990aa5ca9a 100644
--- a/pkgs/development/python-modules/html2image/default.nix
+++ b/pkgs/development/python-modules/html2image/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  poetry-core,
+  hatchling,
   requests,
   websocket-client,
 }:
@@ -19,13 +19,7 @@ buildPythonPackage rec {
     hash = "sha256-qGp6i4fNmduTZfdxNvYJTAQV/Ovm3XFNOJ8uSj6Ipic=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-    --replace-fail poetry.masonry.api poetry.core.masonry.api \
-    --replace-fail "poetry>=" "poetry-core>="
-  '';
-
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     requests

From a6c125f516dd0da0463f19daf0e003ec53663ec5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 18 Aug 2025 19:59:14 +0200
Subject: [PATCH 1940/3724] python313Packages.pytubefix: add missing input

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

diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix
index 45a8742b4e0b..0051f7669298 100644
--- a/pkgs/development/python-modules/pytubefix/default.nix
+++ b/pkgs/development/python-modules/pytubefix/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
@@ -20,6 +21,8 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  dependencies = [ aiohttp ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTestPaths = [

From 0a4986f35e35292d5a2351e4748eff8368fa6f0f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 18 Aug 2025 20:08:19 +0200
Subject: [PATCH 1941/3724] python313Packages.ueberzug: refactor

- update build-system
- update meta
- add missing input
---
 .../python-modules/ueberzug/default.nix       | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix
index d0169e0f6e39..e10e0b578597 100644
--- a/pkgs/development/python-modules/ueberzug/default.nix
+++ b/pkgs/development/python-modules/ueberzug/default.nix
@@ -1,13 +1,16 @@
 {
   lib,
+  attrs,
   buildPythonPackage,
+  docopt,
   fetchPypi,
-  isPy27,
   libX11,
   libXext,
-  attrs,
-  docopt,
+  libXres,
+  meson-python,
+  meson,
   pillow,
+  pkg-config,
   psutil,
   xlib,
 }:
@@ -15,21 +18,27 @@
 buildPythonPackage rec {
   pname = "ueberzug";
   version = "18.3.1";
-  format = "setuptools";
-
-  disabled = isPy27;
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1Lk4E5YwEq2mUnYbIWDhzz9/CCwfXMJ11/TtJ44ugOk=";
+    hash = "sha256-1Lk4E5YwEq2mUnYbIWDhzz9/CCwfXMJ11/TtJ44ugOk=";
   };
 
+  build-system = [
+    meson
+    meson-python
+  ];
+
+  nativeBuildInputs = [ pkg-config ];
+
   buildInputs = [
     libX11
+    libXres
     libXext
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     docopt
     pillow
@@ -42,10 +51,11 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "ueberzug" ];
 
   meta = with lib; {
-    homepage = "https://github.com/seebye/ueberzug";
     description = "Alternative for w3mimgdisplay";
+    homepage = "https://github.com/ueber-devel/ueberzug";
+    changelog = "https://github.com/ueber-devel/ueberzug/releases/tag/${version}";
+    license = licenses.gpl3Only;
     mainProgram = "ueberzug";
-    license = licenses.gpl3;
     maintainers = with maintainers; [ Br1ght0ne ];
   };
 }

From f2ca99055823b3c2ce762ea2d4a315086a530c3d Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 18 Aug 2025 13:32:31 +0200
Subject: [PATCH 1942/3724] nixos/systemd-boot-builder: use pathlib.Path where
 possible

`switch-to-configuration boot` was taking suspiciously long on a machine
of mine where the boot partition is on a slow SD card. Some tracing led
me to discover that it was in fact deleting all the kernels and initrds
every time, only to rewrite them.

This turned out to be because of the naive (non-path-normalising) string
concatenation used to construct paths in `known_paths`, so all the files
were recognised as obsolete and deleted:


known_paths=['/EFI/nixos/5jz3m9df1cbxn4hzjjs3aaz8lb9vvimc-linux-6.15.7-Image.efi', '/EFI/nixos/xri8qzfvzclf89x7nfwgq248miw7jbp0-initrd-linux-6.15.7-initrd.efi', '/EFI/nixos/b18llskzrcdgw2nbib58qqcaabiik6yc-linux-6.16-Image.efi', '/EFI/nixos/mdj53j746bii1vw227dfhkyd8ajwab2w-initrd-linux-6.16-initrd.efi', '/EFI/nixos/b18llskzrcdgw2nbib58qqcaabiik6yc-linux-6.16-Image.efi', '/EFI/nixos/mdj53j746bii1vw227dfhkyd8ajwab2w-initrd-linux-6.16-initrd.efi', '/EFI/nixos/b18llskzrcdgw2nbib58qqcaabiik6yc-linux-6.16-Image.efi', '/EFI/nixos/mdj53j746bii1vw227dfhkyd8ajwab2w-initrd-linux-6.16-initrd.efi', '/EFI/nixos/5jz3m9df1cbxn4hzjjs3aaz8lb9vvimc-linux-6.15.7-Image.efi', '/EFI/nixos/1ihk03c1i5518hlgm5mnhrig2hy3hq24-initrd-linux-6.15.7-initrd.efi', '/EFI/nixos/5jz3m9df1cbxn4hzjjs3aaz8lb9vvimc-linux-6.15.7-Image.efi', '/EFI/nixos/1ihk03c1i5518hlgm5mnhrig2hy3hq24-initrd-linux-6.15.7-initrd.efi', '/EFI/nixos/5jz3m9df1cbxn4hzjjs3aaz8lb9vvimc-linux-6.15.7-Image.efi', '/EFI/nixos/1ihk03c1i5518hlgm5mnhrig2hy3hq24-initrd-linux-6.15.7-initrd.efi']
path='/boot//EFI/nixos/5jz3m9df1cbxn4hzjjs3aaz8lb9vvimc-linux-6.15.7-Image.efi'
path='/boot//EFI/nixos/xri8qzfvzclf89x7nfwgq248miw7jbp0-initrd-linux-6.15.7-initrd.efi'
path='/boot//EFI/nixos/b18llskzrcdgw2nbib58qqcaabiik6yc-linux-6.16-Image.efi'
path='/boot//EFI/nixos/mdj53j746bii1vw227dfhkyd8ajwab2w-initrd-linux-6.16-initrd.efi'
path='/boot//EFI/nixos/1ihk03c1i5518hlgm5mnhrig2hy3hq24-initrd-linux-6.15.7-initrd.efi'


This can be avoided by using pathlib.Path, which normalises paths and
generally provides a more consistent and convenient API. I therefore
went ahead and replaced all use of `str` for path handling with `Path`
in the builder. This may fix some other, similar bugs, as well, but I
haven't checked in detail.
---
 .../systemd-boot/systemd-boot-builder.py      | 168 ++++++++++--------
 1 file changed, 89 insertions(+), 79 deletions(-)

diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index aeb833a546f3..bfae30eb3aa1 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@@ -3,23 +3,22 @@ import argparse
 import ctypes
 import datetime
 import errno
-import glob
 import os
-import os.path
 import re
 import shutil
 import subprocess
 import sys
 import warnings
 import json
-from typing import NamedTuple, Any
+from typing import NamedTuple, Any, Sequence
 from dataclasses import dataclass
+from pathlib import Path
 
 # These values will be replaced with actual values during the package build
-EFI_SYS_MOUNT_POINT = "@efiSysMountPoint@"
-BOOT_MOUNT_POINT = "@bootMountPoint@"
-LOADER_CONF = f"{EFI_SYS_MOUNT_POINT}/loader/loader.conf"  # Always stored on the ESP
-NIXOS_DIR = "@nixosDir@"
+EFI_SYS_MOUNT_POINT = Path("@efiSysMountPoint@")
+BOOT_MOUNT_POINT = Path("@bootMountPoint@")
+LOADER_CONF = EFI_SYS_MOUNT_POINT / "loader/loader.conf"  # Always stored on the ESP
+NIXOS_DIR = Path("@nixosDir@".strip("/")) # Path relative to the XBOOTLDR or ESP mount point
 TIMEOUT = "@timeout@"
 EDITOR = "@editor@" == "1" # noqa: PLR0133
 CONSOLE_MODE = "@consoleMode@"
@@ -37,16 +36,16 @@ STORE_DIR = "@storeDir@"
 
 @dataclass
 class BootSpec:
-    init: str
-    initrd: str
-    kernel: str
+    init: Path
+    initrd: Path
+    kernel: Path
     kernelParams: list[str]  # noqa: N815
     label: str
     system: str
-    toplevel: str
+    toplevel: Path
     specialisations: dict[str, "BootSpec"]
     sortKey: str  # noqa: N815
-    devicetree: str | None = None  # noqa: N815
+    devicetree: Path | None = None  # noqa: N815
     initrdSecrets: str | None = None  # noqa: N815
 
 
@@ -54,7 +53,7 @@ libc = ctypes.CDLL("libc.so.6")
 
 FILE = None | int
 
-def run(cmd: list[str], stdout: FILE = None) -> subprocess.CompletedProcess[str]:
+def run(cmd: Sequence[str | Path], stdout: FILE = None) -> subprocess.CompletedProcess[str]:
     return subprocess.run(cmd, check=True, text=True, stdout=stdout)
 
 class SystemIdentifier(NamedTuple):
@@ -63,21 +62,21 @@ class SystemIdentifier(NamedTuple):
     specialisation: str | None
 
 
-def copy_if_not_exists(source: str, dest: str) -> None:
-    if not os.path.exists(dest):
+def copy_if_not_exists(source: Path, dest: Path) -> None:
+    if not dest.exists():
         shutil.copyfile(source, dest)
 
 
-def generation_dir(profile: str | None, generation: int) -> str:
+def generation_dir(profile: str | None, generation: int) -> Path:
     if profile:
-        return "/nix/var/nix/profiles/system-profiles/%s-%d-link" % (profile, generation)
+        return Path(f"/nix/var/nix/profiles/system-profiles/{profile}-{generation}-link")
     else:
-        return "/nix/var/nix/profiles/system-%d-link" % (generation)
+        return Path(f"/nix/var/nix/profiles/system-{generation}-link")
 
-def system_dir(profile: str | None, generation: int, specialisation: str | None) -> str:
+def system_dir(profile: str | None, generation: int, specialisation: str | None) -> Path:
     d = generation_dir(profile, generation)
     if specialisation:
-        return os.path.join(d, "specialisation", specialisation)
+        return d / "specialisation" / specialisation
     else:
         return d
 
@@ -101,7 +100,8 @@ def generation_conf_filename(profile: str | None, generation: int, specialisatio
 
 
 def write_loader_conf(profile: str | None, generation: int, specialisation: str | None) -> None:
-    with open(f"{LOADER_CONF}.tmp", 'w') as f:
+    tmp = LOADER_CONF.with_suffix(".tmp")
+    with tmp.open('x') as f:
         f.write(f"timeout {TIMEOUT}\n")
         f.write("default %s\n" % generation_conf_filename(profile, generation, specialisation))
         if not EDITOR:
@@ -111,17 +111,17 @@ def write_loader_conf(profile: str | None, generation: int, specialisation: str
         f.write(f"console-mode {CONSOLE_MODE}\n")
         f.flush()
         os.fsync(f.fileno())
-    os.rename(f"{LOADER_CONF}.tmp", LOADER_CONF)
+    os.rename(tmp, LOADER_CONF)
 
 
 def get_bootspec(profile: str | None, generation: int) -> BootSpec:
     system_directory = system_dir(profile, generation, None)
-    boot_json_path = os.path.join(system_directory, "boot.json")
-    if os.path.isfile(boot_json_path):
-        with open(boot_json_path, 'r') as boot_json_f:
+    boot_json_path = (system_directory / "boot.json").resolve()
+    if boot_json_path.is_file():
+        with boot_json_path.open("r") as f:
             # check if json is well-formed, else throw error with filepath
             try:
-                bootspec_json = json.load(boot_json_f)
+                bootspec_json = json.load(f)
             except ValueError as e:
                 print(f"error: Malformed Json: {e}, in {boot_json_path}", file=sys.stderr)
                 sys.exit(1)
@@ -145,21 +145,32 @@ def bootspec_from_json(bootspec_json: dict[str, Any]) -> BootSpec:
     systemdBootExtension = bootspec_json.get('org.nixos.systemd-boot', {})
     sortKey = systemdBootExtension.get('sortKey', 'nixos')
     devicetree = systemdBootExtension.get('devicetree')
+
+    if devicetree:
+        devicetree = Path(devicetree)
+
+    main_json = bootspec_json['org.nixos.bootspec.v1']
+    for attr in ("kernel", "initrd", "toplevel"):
+        if attr in main_json:
+            main_json[attr] = Path(main_json[attr])
     return BootSpec(
-        **bootspec_json['org.nixos.bootspec.v1'],
+        **main_json,
         specialisations=specialisations,
         sortKey=sortKey,
         devicetree=devicetree,
     )
 
 
-def copy_from_file(file: str, dry_run: bool = False) -> str:
-    store_file_path = os.path.realpath(file)
-    suffix = os.path.basename(store_file_path)
-    store_subdir = os.path.relpath(store_file_path, start=STORE_DIR).split(os.path.sep)[0]
-    efi_file_path = f"{NIXOS_DIR}/{suffix}.efi" if suffix == store_subdir else f"{NIXOS_DIR}/{store_subdir}-{suffix}.efi"
+def copy_from_file(file: Path, dry_run: bool = False) -> Path:
+    """
+    Copy a file to the boot filesystem (XBOOTLDR if in use, otherwise ESP), basing the destination filename on the store path that's being copied from. Return the destination path, relative to the boot filesystem mountpoint.
+    """
+    store_file_path = file.resolve()
+    suffix = store_file_path.name
+    store_subdir = store_file_path.relative_to(STORE_DIR).parts[0]
+    efi_file_path = NIXOS_DIR / (f"{suffix}.efi" if suffix == store_subdir else f"{store_subdir}-{suffix}.efi")
     if not dry_run:
-        copy_if_not_exists(store_file_path, f"{BOOT_MOUNT_POINT}{efi_file_path}")
+        copy_if_not_exists(store_file_path, BOOT_MOUNT_POINT / efi_file_path)
     return efi_file_path
 
 
@@ -178,7 +189,7 @@ def write_entry(profile: str | None, generation: int, specialisation: str | None
 
     try:
         if bootspec.initrdSecrets is not None:
-            run([bootspec.initrdSecrets, f"{BOOT_MOUNT_POINT}%s" % (initrd)])
+            run([bootspec.initrdSecrets, BOOT_MOUNT_POINT / initrd])
     except subprocess.CalledProcessError:
         if current:
             print("failed to create initrd secrets!", file=sys.stderr)
@@ -188,21 +199,20 @@ def write_entry(profile: str | None, generation: int, specialisation: str | None
                   f'for "{title} - Configuration {generation}", an older generation', file=sys.stderr)
             print("note: this is normal after having removed "
                   "or renamed a file in `boot.initrd.secrets`", file=sys.stderr)
-    entry_file = f"{BOOT_MOUNT_POINT}/loader/entries/%s" % (
-        generation_conf_filename(profile, generation, specialisation))
-    tmp_path = "%s.tmp" % (entry_file)
+    entry_file = BOOT_MOUNT_POINT / "loader/entries" / generation_conf_filename(profile, generation, specialisation)
+    tmp_path = entry_file.with_suffix(".tmp")
     kernel_params = "init=%s " % bootspec.init
 
     kernel_params = kernel_params + " ".join(bootspec.kernelParams)
-    build_time = int(os.path.getctime(system_dir(profile, generation, specialisation)))
+    build_time = int(system_dir(profile, generation, specialisation).stat().st_ctime)
     build_date = datetime.datetime.fromtimestamp(build_time).strftime('%F')
 
-    with open(tmp_path, 'w') as f:
+    with tmp_path.open("w") as f:
         f.write(BOOT_ENTRY.format(title=title,
                     sort_key=bootspec.sortKey,
                     generation=generation,
-                    kernel=kernel,
-                    initrd=initrd,
+                    kernel=f"/{kernel}",
+                    initrd=f"/{initrd}",
                     kernel_params=kernel_params,
                     description=f"{bootspec.label}, built on {build_date}"))
         if machine_id is not None:
@@ -211,7 +221,7 @@ def write_entry(profile: str | None, generation: int, specialisation: str | None
             f.write("devicetree %s\n" % devicetree)
         f.flush()
         os.fsync(f.fileno())
-    os.rename(tmp_path, entry_file)
+    tmp_path.rename(entry_file)
 
 
 def get_generations(profile: str | None = None) -> list[SystemIdentifier]:
@@ -241,41 +251,43 @@ def get_generations(profile: str | None = None) -> list[SystemIdentifier]:
 
 
 def remove_old_entries(gens: list[SystemIdentifier]) -> None:
-    rex_profile = re.compile(r"^" + re.escape(BOOT_MOUNT_POINT) + r"/loader/entries/nixos-(.*)-generation-.*\.conf$")
-    rex_generation = re.compile(r"^" + re.escape(BOOT_MOUNT_POINT) + r"/loader/entries/nixos.*-generation-([0-9]+)(-specialisation-.*)?\.conf$")
+    rex_profile = re.compile(r"^nixos-(.*)-generation-.*\.conf$")
+    rex_generation = re.compile(r"^nixos.*-generation-([0-9]+)(-specialisation-.*)?\.conf$")
     known_paths = []
     for gen in gens:
         bootspec = get_bootspec(gen.profile, gen.generation)
-        known_paths.append(copy_from_file(bootspec.kernel, True))
-        known_paths.append(copy_from_file(bootspec.initrd, True))
-    for path in glob.iglob(f"{BOOT_MOUNT_POINT}/loader/entries/nixos*-generation-[1-9]*.conf"):
-        if rex_profile.match(path):
-            prof = rex_profile.sub(r"\1", path)
+        known_paths.append(copy_from_file(bootspec.kernel, True).name)
+        known_paths.append(copy_from_file(bootspec.initrd, True).name)
+    for path in (BOOT_MOUNT_POINT / "loader/entries").glob("nixos*-generation-[1-9]*.conf", case_sensitive=False):
+        if rex_profile.match(path.name):
+            prof = rex_profile.sub(r"\1", path.name)
         else:
             prof = None
         try:
-            gen_number = int(rex_generation.sub(r"\1", path))
+            gen_number = int(rex_generation.sub(r"\1", path.name))
         except ValueError:
             continue
         if (prof, gen_number, None) not in gens:
-            os.unlink(path)
-    for path in glob.iglob(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}/*"):
-        if path not in known_paths and not os.path.isdir(path):
-            os.unlink(path)
+            path.unlink()
+    for path in (BOOT_MOUNT_POINT / NIXOS_DIR).iterdir():
+        if path.name not in known_paths and not path.is_dir():
+            path.unlink()
 
 
 def cleanup_esp() -> None:
-    for path in glob.iglob(f"{EFI_SYS_MOUNT_POINT}/loader/entries/nixos*"):
-        os.unlink(path)
-    if os.path.isdir(f"{EFI_SYS_MOUNT_POINT}/{NIXOS_DIR}"):
-        shutil.rmtree(f"{EFI_SYS_MOUNT_POINT}/{NIXOS_DIR}")
+    for path in (EFI_SYS_MOUNT_POINT / "loader/entries").glob("nixos*"):
+        path.unlink()
+    nixos_dir = EFI_SYS_MOUNT_POINT / NIXOS_DIR
+    if nixos_dir.is_dir():
+        shutil.rmtree(nixos_dir)
 
 
 def get_profiles() -> list[str]:
-    if os.path.isdir("/nix/var/nix/profiles/system-profiles/"):
-        return [x
-            for x in os.listdir("/nix/var/nix/profiles/system-profiles/")
-            if not x.endswith("-link")]
+    system_profiles = Path("/nix/var/nix/profiles/system-profiles/")
+    if system_profiles.is_dir():
+        return [x.name
+            for x in system_profiles.iterdir()
+            if not x.name.endswith("-link")]
     else:
         return []
 
@@ -306,8 +318,7 @@ def install_bootloader(args: argparse.Namespace) -> None:
 
     if os.getenv("NIXOS_INSTALL_BOOTLOADER") == "1":
         # bootctl uses fopen() with modes "wxe" and fails if the file exists.
-        if os.path.exists(LOADER_CONF):
-            os.unlink(LOADER_CONF)
+        LOADER_CONF.unlink(missing_ok=True)
 
         run(
             [f"{SYSTEMD}/bin/bootctl", f"--esp-path={EFI_SYS_MOUNT_POINT}"]
@@ -356,8 +367,8 @@ def install_bootloader(args: argparse.Namespace) -> None:
                 + ["update"]
             )
 
-    os.makedirs(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}", exist_ok=True)
-    os.makedirs(f"{BOOT_MOUNT_POINT}/loader/entries", exist_ok=True)
+    (BOOT_MOUNT_POINT / NIXOS_DIR).mkdir(parents=True, exist_ok=True)
+    (BOOT_MOUNT_POINT / "loader/entries").mkdir(parents=True, exist_ok=True)
 
     gens = get_generations()
     for profile in get_profiles():
@@ -368,7 +379,7 @@ def install_bootloader(args: argparse.Namespace) -> None:
     for gen in gens:
         try:
             bootspec = get_bootspec(gen.profile, gen.generation)
-            is_default = os.path.dirname(bootspec.init) == args.default_config
+            is_default = Path(bootspec.init).parent == Path(args.default_config)
             write_entry(*gen, machine_id, bootspec, current=is_default)
             for specialisation in bootspec.specialisations.keys():
                 write_entry(gen.profile, gen.generation, specialisation, machine_id, bootspec, current=is_default)
@@ -388,22 +399,21 @@ def install_bootloader(args: argparse.Namespace) -> None:
         # automatically, as we don't have information about the mount point anymore.
         cleanup_esp()
 
-    for root, _, files in os.walk(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}/.extra-files", topdown=False):
-        relative_root = root.removeprefix(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}/.extra-files").removeprefix("/")
-        actual_root = os.path.join(f"{BOOT_MOUNT_POINT}", relative_root)
+    extra_files_dir = BOOT_MOUNT_POINT / NIXOS_DIR / ".extra-files"
+    for root, _, files in extra_files_dir.walk(top_down=False):
+        relative_root = root.relative_to(extra_files_dir)
+        actual_root = BOOT_MOUNT_POINT / relative_root
 
         for file in files:
-            actual_file = os.path.join(actual_root, file)
+            actual_file = actual_root / file
+            actual_file.unlink(missing_ok=True)
+            (root / file).unlink()
 
-            if os.path.exists(actual_file):
-                os.unlink(actual_file)
-            os.unlink(os.path.join(root, file))
+        if not list(actual_root.iterdir()):
+            actual_root.rmdir()
+        root.rmdir()
 
-        if not len(os.listdir(actual_root)):
-            os.rmdir(actual_root)
-        os.rmdir(root)
-
-    os.makedirs(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}/.extra-files", exist_ok=True)
+    extra_files_dir.mkdir(parents=True, exist_ok=True)
 
     run([COPY_EXTRA_FILES])
 

From 91c1fb0cd49fb662909676f6505fdf97c558ff3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 18:12:18 +0000
Subject: [PATCH 1943/3724] vue-language-server: 3.0.4 -> 3.0.5

---
 pkgs/by-name/vu/vue-language-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix
index e0225cb8dc6d..882de193bc37 100644
--- a/pkgs/by-name/vu/vue-language-server/package.nix
+++ b/pkgs/by-name/vu/vue-language-server/package.nix
@@ -9,19 +9,19 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vue-language-server";
-  version = "3.0.4";
+  version = "3.0.5";
 
   src = fetchFromGitHub {
     owner = "vuejs";
     repo = "language-tools";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-vWnJ3Qaa1dcXmQ+PTvbuK6lpgqR7J/Z0UrsPr2pD8Q4=";
+    hash = "sha256-NTMJYxnX0R41b/+RK+XFQJB/R5rjEF/BIury2hey770=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-UlIAW0m8Y3he8uDd73pXufk4r4PAXWFPDYFvRa2Fw4Y=";
+    hash = "sha256-5t4HpJlSqEt04AoPnfXNB9lS9BXfMa1l7Y56VhkShPY=";
   };
 
   nativeBuildInputs = [

From 53d1bc7ad81ab1df9cf2cf6497b24ba9ede7b732 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 18:13:53 +0000
Subject: [PATCH 1944/3724] yandex-cloud: 0.156.0 -> 0.159.0

---
 pkgs/by-name/ya/yandex-cloud/sources.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json
index a4203bd39239..e9af9be205c5 100644
--- a/pkgs/by-name/ya/yandex-cloud/sources.json
+++ b/pkgs/by-name/ya/yandex-cloud/sources.json
@@ -1,25 +1,25 @@
 {
-  "version": "0.156.0",
+  "version": "0.159.0",
   "binaries": {
     "aarch64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.156.0/darwin/arm64/yc",
-      "hash": "sha256-9jApY8rdHmiE4GmDqP0Px5gkug4WXWtq+gEzvnvdhlo="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.159.0/darwin/arm64/yc",
+      "hash": "sha256-T10+afMBPD9vqD/0sG39PVytLjqjO4peB4+ca8vV/i8="
     },
     "aarch64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.156.0/linux/arm64/yc",
-      "hash": "sha256-Fk0qtD6KkBB0jJlRjxvAm8FSlS/bVv5BywbmYrT/ZqY="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.159.0/linux/arm64/yc",
+      "hash": "sha256-m0+c7k/k0X5grmejuhomICYtFpeYyJJa6wgdZbdA7B0="
     },
     "i686-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.156.0/linux/386/yc",
-      "hash": "sha256-fxsbRwJoHrIBXArIRzBXD9HRmjeZOTQDnkhDqVEy8lc="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.159.0/linux/386/yc",
+      "hash": "sha256-7khhL28QEY2dfQNvVe0K0aG7MVD4ZCaAiOcq0+cot5I="
     },
     "x86_64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.156.0/darwin/amd64/yc",
-      "hash": "sha256-CRkop4UxhSgnRL9dgx509r2oYNPmsDSJ8AVSFSRwLfY="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.159.0/darwin/amd64/yc",
+      "hash": "sha256-1JFf/sAU3BNoeFc/NQunh0wplFMda4WbQ1TgpIap3Ts="
     },
     "x86_64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.156.0/linux/amd64/yc",
-      "hash": "sha256-QwkEoSXhx782rQWikkxRifLqJuwrrqr0s5/AO2O0W4U="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.159.0/linux/amd64/yc",
+      "hash": "sha256-zt8PhgoR/pjQmhIfg/L50/UwNpIAcLpUsqMNYHtZ1Mo="
     }
   }
 }

From 5b6153aa63716bacc6f5cc5c3e6bda057fbc894d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Mon, 18 Aug 2025 20:02:04 +0200
Subject: [PATCH 1945/3724] awscli2: fix urllib3 override

https://hydra.nixos.org/build/305091539
---
 pkgs/by-name/aw/awscli2/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix
index 3a0b12557d17..451bb46c7de1 100644
--- a/pkgs/by-name/aw/awscli2/package.nix
+++ b/pkgs/by-name/aw/awscli2/package.nix
@@ -53,6 +53,7 @@ let
           build-system = with final; [
             setuptools
           ];
+          postPatch = null;
           src = prev.src.override {
             inherit version;
             hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA=";

From f0f5597e0326b67098d86f10baedacae389b1383 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 18 Aug 2025 20:18:52 +0200
Subject: [PATCH 1946/3724] python313Packages.fugashi: relax cython

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

diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix
index d2d60b3e8143..9dbedb074378 100644
--- a/pkgs/development/python-modules/fugashi/default.nix
+++ b/pkgs/development/python-modules/fugashi/default.nix
@@ -25,6 +25,11 @@ buildPythonPackage rec {
     hash = "sha256-rkQskRz7lgVBrqBeyj9kWO2/7POrZ0TaM+Z7mhpZLvM=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "Cython~=3.0.11" "Cython"
+  '';
+
   nativeBuildInputs = [
     cython
     mecab

From 19a7b08ea77528bec37a418fa47cb5ad1a219fa9 Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Sat, 16 Aug 2025 23:32:27 -0500
Subject: [PATCH 1947/3724] github-runner: add support for node24

Fixes #434372
---
 .../github-runner/options.nix                 | 12 +++++++++--
 pkgs/by-name/gi/github-runner/package.nix     | 20 +++++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/github-runner/options.nix b/nixos/modules/services/continuous-integration/github-runner/options.nix
index e20e8c5931fb..b5c8d5d291d5 100644
--- a/nixos/modules/services/continuous-integration/github-runner/options.nix
+++ b/nixos/modules/services/continuous-integration/github-runner/options.nix
@@ -256,8 +256,16 @@
             };
 
             nodeRuntimes = lib.mkOption {
-              type = with lib.types; nonEmptyListOf (enum [ "node20" ]);
-              default = [ "node20" ];
+              type =
+                with lib.types;
+                nonEmptyListOf (enum [
+                  "node20"
+                  "node24"
+                ]);
+              default = [
+                "node20"
+                "node24"
+              ];
               description = ''
                 List of Node.js runtimes the runner should support.
               '';
diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index 2f41b1ce826d..adced8f422db 100644
--- a/pkgs/by-name/gi/github-runner/package.nix
+++ b/pkgs/by-name/gi/github-runner/package.nix
@@ -16,12 +16,22 @@
   buildPackages,
   runtimeShell,
   # List of Node.js runtimes the package should support
-  nodeRuntimes ? [ "node20" ],
+  nodeRuntimes ? [
+    "node20"
+    "node24"
+  ],
   nodejs_20,
+  nodejs_24,
 }:
 
 # Node.js runtimes supported by upstream
-assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
+assert builtins.all (
+  x:
+  builtins.elem x [
+    "node20"
+    "node24"
+  ]
+) nodeRuntimes;
 
 buildDotnetModule (finalAttrs: {
   pname = "github-runner";
@@ -226,6 +236,9 @@ buildDotnetModule (finalAttrs: {
   ''
   + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
     ln -s ${nodejs_20} _layout/externals/node20
+  ''
+  + lib.optionalString (lib.elem "node24" nodeRuntimes) ''
+    ln -s ${nodejs_24} _layout/externals/node24
   '';
 
   postInstall = ''
@@ -268,6 +281,9 @@ buildDotnetModule (finalAttrs: {
   + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
     ln -s ${nodejs_20} $out/lib/externals/node20
   ''
+  + lib.optionalString (lib.elem "node24" nodeRuntimes) ''
+    ln -s ${nodejs_24} $out/lib/externals/node24
+  ''
   + ''
     # Install Nodejs scripts called from workflows
     install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js

From 670aba8ce0b66ab7d931b907d67cc3ddf7571749 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 18 Aug 2025 20:36:09 +0200
Subject: [PATCH 1948/3724] python313Packages.fugashi: refactor

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

diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix
index 9dbedb074378..b2e5997ace6b 100644
--- a/pkgs/development/python-modules/fugashi/default.nix
+++ b/pkgs/development/python-modules/fugashi/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitHub,
-  pythonOlder,
   pytestCheckHook,
   buildPythonPackage,
   cython,
@@ -15,8 +14,7 @@
 buildPythonPackage rec {
   pname = "fugashi";
   version = "1.5.1";
-  format = "pyproject";
-  disabled = pythonOlder "3.9";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "polm";
@@ -30,7 +28,7 @@ buildPythonPackage rec {
       --replace-fail "Cython~=3.0.11" "Cython"
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     cython
     mecab
     setuptools-scm
@@ -56,7 +54,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Cython MeCab wrapper for fast, pythonic Japanese tokenization and morphological analysis";
     homepage = "https://github.com/polm/fugashi";
-    changelog = "https://github.com/polm/fugashi/releases/tag/${version}";
+    changelog = "https://github.com/polm/fugashi/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ laurent-f1z1 ];
   };

From 33b0ee6a8ebefe7b33fa2da4077e1964427fd164 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 19:08:37 +0000
Subject: [PATCH 1949/3724] pure-maps: 3.4.0 -> 3.4.1

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

diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix
index f93c1e6cd853..8cfae9d12993 100644
--- a/pkgs/applications/misc/pure-maps/default.nix
+++ b/pkgs/applications/misc/pure-maps/default.nix
@@ -17,13 +17,13 @@
 
 mkDerivation rec {
   pname = "pure-maps";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "rinigus";
     repo = "pure-maps";
     rev = version;
-    hash = "sha256-3XghdDwzt0r8Qi8W3ZMwar2aaqTNGiGsM27BHVr5C2E=";
+    hash = "sha256-Xh4TRc4B/rm2+S8ej/instfkO3271f0HPuqVJYGtCSM=";
     fetchSubmodules = true;
   };
 

From 30db5ac53228dace25ce1a55ca179dc608eabbac Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Mon, 18 Aug 2025 21:31:44 +0200
Subject: [PATCH 1950/3724] victoriametrics: 1.123.0 -> 1.124.0

Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.124.0
Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.123.0...v1.124.0
---
 pkgs/by-name/vi/victoriametrics/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 1f44d8200909..a0b1ebafc8c0 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaMetrics";
-  version = "1.123.0";
+  version = "1.124.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GUVRMlF94BaZSVfz4Z+IBSpf6WuA5o1WQQmeZAqKZ1g=";
+    hash = "sha256-f0Mf/4cFnJ/3I8z/4UhhNJnSCau9Q7mFfR32lP9/yi0=";
   };
 
   vendorHash = null;
@@ -51,6 +51,10 @@ buildGoModule (finalAttrs: {
     # This appears to be some kind of test server for development purposes only.
     rm -f app/vmui/packages/vmui/web/{go.mod,main.go}
 
+    # Allow older go versions
+    substituteInPlace go.mod \
+      --replace-fail "go 1.24.6" "go ${finalAttrs.passthru.go.version}"
+
     # Increase timeouts in tests to prevent failure on heavily loaded builders
     substituteInPlace lib/storage/storage_test.go \
       --replace-fail "time.After(10 " "time.After(120 " \

From 8e4573ca7e6f4fd82600de7245003d4f1401a875 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 18 Aug 2025 21:38:24 +0200
Subject: [PATCH 1951/3724] chow-tape-model: fix build

It wasn't building anymore because of https://github.com/NixOS/nixpkgs/pull/427813
Remove webkit, as it seems to be unneeded: https://github.com/jatinchowdhury18/AnalogTapeModel/issues/327
---
 pkgs/by-name/ch/chow-tape-model/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix
index b9f5a5eb3a3a..b3a80202c92c 100644
--- a/pkgs/by-name/ch/chow-tape-model/package.nix
+++ b/pkgs/by-name/ch/chow-tape-model/package.nix
@@ -33,7 +33,6 @@
   python3,
   sqlite,
   stdenv,
-  webkitgtk_4_0,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "chow-tape-model";
@@ -87,7 +86,6 @@ stdenv.mkDerivation (finalAttrs: {
     pcre2
     python3
     sqlite
-    webkitgtk_4_0
   ];
 
   # Link-time-optimization fails without these

From 2b46d0d02a6a0edc24054ab5f57df22ef2cd162d Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 18 Aug 2025 21:46:08 +0200
Subject: [PATCH 1952/3724] chow-kick: fix build

It wasn't building anymore because of https://github.com/NixOS/nixpkgs/pull/427813
Remove webkit, as it seems to be unneeded: https://github.com/jatinchowdhury18/AnalogTapeModel/issues/327
---
 pkgs/by-name/ch/chow-kick/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix
index 97a5d818f0c1..a5fc34ebfda2 100644
--- a/pkgs/by-name/ch/chow-kick/package.nix
+++ b/pkgs/by-name/ch/chow-kick/package.nix
@@ -33,7 +33,6 @@
   sqlite,
   stdenv,
   util-linuxMinimal,
-  webkitgtk_4_0,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -82,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
     python3
     sqlite
     util-linuxMinimal
-    webkitgtk_4_0
   ];
 
   cmakeFlags = [

From c58f8542c19d7686fb24fb352c00e8c6f376a438 Mon Sep 17 00:00:00 2001
From: Tyler Hardin <th020394@gmail.com>
Date: Wed, 30 Jul 2025 17:29:27 -0400
Subject: [PATCH 1953/3724] goose-cli: 1.0.30 -> 1.4.0

---
 pkgs/by-name/go/goose-cli/package.nix | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix
index a141ede5fa8c..a34da7e22f16 100644
--- a/pkgs/by-name/go/goose-cli/package.nix
+++ b/pkgs/by-name/go/goose-cli/package.nix
@@ -27,16 +27,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "goose-cli";
-  version = "1.0.30";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "block";
     repo = "goose";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Mhscs7yv3/FmJ/v1W0xcHya82ztrYGVULrtMyq4W4BY=";
+    hash = "sha256-xXQFhGwI5aZfRzJ17WXcpOHnaE1MW2S6uje8qSC3NU4=";
   };
 
-  cargoHash = "sha256-TNmeu0nQHTFnbe7CY5b58ysN6+iMD6yFTktr4gjKNY0=";
+  cargoHash = "sha256-b8u226CSW/85HoVuDYGc0cbCA61ZOsrngenZKMgY4us=";
 
   nativeBuildInputs = [
     pkg-config
@@ -76,6 +76,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=providers::factory::tests::test_create_lead_worker_provider"
     "--skip=providers::factory::tests::test_create_regular_provider_without_lead_config"
     "--skip=providers::factory::tests::test_lead_model_env_vars_with_defaults"
+    # need network access
+    "--skip=test_concurrent_access"
+    "--skip=test_model_not_in_openrouter"
+    "--skip=test_pricing_cache_performance"
+    "--skip=test_pricing_refresh"
+    "--skip=transport::streamable_http::tests::test_handle_outgoing_message_http_error"
+    "--skip=transport::streamable_http::tests::test_handle_outgoing_message_invalid_json"
+    "--skip=transport::streamable_http::tests::test_handle_outgoing_message_notification"
+    "--skip=transport::streamable_http::tests::test_handle_outgoing_message_session_id_handling"
+    "--skip=transport::streamable_http::tests::test_handle_outgoing_message_session_not_found"
+    "--skip=transport::streamable_http::tests::test_handle_outgoing_message_successful_request"
+    "--skip=context_mgmt::auto_compact::tests::test_auto_compact_respects_config"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "--skip=providers::gcpauth::tests::test_load_from_metadata_server"
@@ -83,6 +95,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=tracing::langfuse_layer::tests::test_batch_manager_spawn_sender"
     "--skip=tracing::langfuse_layer::tests::test_batch_send_partial_failure"
     "--skip=tracing::langfuse_layer::tests::test_batch_send_success"
+    "--skip=logging::tests::test_log_file_name_session_without_error_capture"
+    "--skip=recipes::extract_from_cli::tests::test_extract_recipe_info_from_cli_basic"
+    "--skip=recipes::extract_from_cli::tests::test_extract_recipe_info_from_cli_with_additional_sub_recipes"
+    "--skip=recipes::recipe::tests::load_recipe::test_load_recipe_success"
   ];
 
   passthru.updateScript = nix-update-script { };

From 2fe4be31515a72c539c3be2b4f280a5ffabb465c Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 18 Aug 2025 13:38:04 -0700
Subject: [PATCH 1954/3724] python3Packages.holoviews: disable broken test on
 Darwin

test_categorical_axis_fontsize_both fails due to rendering differences.
---
 pkgs/development/python-modules/holoviews/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix
index 32ebe97d7a40..77886f1dcc36 100644
--- a/pkgs/development/python-modules/holoviews/default.nix
+++ b/pkgs/development/python-modules/holoviews/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -76,6 +77,10 @@ buildPythonPackage rec {
 
     # ModuleNotFoundError: No module named 'param'
     "test_no_blocklist_imports"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fails due to font rendering differences
+    "test_categorical_axis_fontsize_both"
   ];
 
   pythonImportsCheck = [ "holoviews" ];

From a3d919aac4e03a88139da0ff4f3895e34886a58e Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 18 Aug 2025 14:01:41 -0700
Subject: [PATCH 1955/3724] python3Packages.celery: build from github

---
 .../python-modules/celery/default.nix         | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 88cd2cc05ed6..3ba651113a74 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -9,14 +9,13 @@
   click-plugins,
   click-repl,
   click,
-  fetchPypi,
+  fetchFromGitHub,
   gevent,
   google-cloud-firestore,
   google-cloud-storage,
   kombu,
   moto,
   msgpack,
-  nixosTests,
   pymongo,
   redis,
   pydantic,
@@ -27,7 +26,6 @@
   pytest-xdist,
   pytestCheckHook,
   python-dateutil,
-  pythonOlder,
   pyyaml,
   setuptools,
   vine,
@@ -38,11 +36,11 @@ buildPythonPackage rec {
   version = "5.5.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-bJcq55aMK1KBIn8Bw6P5hAN9IcUSnQe/NVDMKvxrEKU=";
+  src = fetchFromGitHub {
+    owner = "celery";
+    repo = "celery";
+    tag = "v${version}";
+    hash = "sha256-+sickqRfSkBxhcO0W9na6Uov4kZ7S5oqpXXKX0iRQ0w=";
   };
 
   build-system = [ setuptools ];
@@ -118,12 +116,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "celery" ];
 
-  meta = with lib; {
+  meta = {
     description = "Distributed task queue";
     homepage = "https://github.com/celery/celery/";
     changelog = "https://github.com/celery/celery/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "celery";
   };
 }

From 7f3b1f53a30cb6ae1419b05fe3fb3c534566f9f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 21:08:55 +0000
Subject: [PATCH 1956/3724] opensoundmeter: 1.4.1 -> 1.5

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

diff --git a/pkgs/by-name/op/opensoundmeter/package.nix b/pkgs/by-name/op/opensoundmeter/package.nix
index 8adcbdf70fbe..0000048c11d3 100644
--- a/pkgs/by-name/op/opensoundmeter/package.nix
+++ b/pkgs/by-name/op/opensoundmeter/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "opensoundmeter";
-  version = "1.4.1";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "psmokotnin";
     repo = "osm";
     rev = "v${version}";
-    hash = "sha256-X/edRuYtZsvbs7Bl/JpJJPIGeQDEDH+FTQCX1Zy1osE=";
+    hash = "sha256-mwtAlQ+2NsmSDuih8LQpFy1b3WaFYtmS1yuUE9Iv/50=";
   };
 
   patches = [ ./build.patch ];

From f7b50de98b3fb7076214ad1b64004c2ff9e00c95 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 18 Aug 2025 14:14:24 -0700
Subject: [PATCH 1957/3724] python3Packages.celery: disable flaky test under
 load on Darwin

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

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 3ba651113a74..4629fa12d8c5 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -112,6 +112,9 @@ buildPythonPackage rec {
     "test_cleanup"
     "test_with_autoscaler_file_descriptor_safety"
     "test_with_file_descriptor_safety"
+
+    # Flaky: Unclosed temporary file handle under heavy load (as in nixpkgs-review)
+    "test_check_privileges_without_c_force_root_and_no_group_entry"
   ];
 
   pythonImportsCheck = [ "celery" ];

From c166899d8da523fb3de1efd69554ed61374b4f4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 21:25:41 +0000
Subject: [PATCH 1958/3724] vscode-extensions.cweijan.vscode-database-client2:
 8.3.7 -> 8.3.9

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index db0cf1915b69..aac2396f813f 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1183,8 +1183,8 @@ let
         mktplcRef = {
           name = "vscode-database-client2";
           publisher = "cweijan";
-          version = "8.3.7";
-          hash = "sha256-SqgCXR6LXy1lSc2fRhRsB7QSqKngRB4ypdPlXt3OOx4=";
+          version = "8.3.9";
+          hash = "sha256-HryTXKCBF7i9zV3JELAM+NF3JW97XWCoSqTRPNr8yjQ=";
         };
         meta = {
           description = "Database Client For Visual Studio Code";

From b8fcfad297ddd7b19d290c9cdb7e7881500068f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 21:31:04 +0000
Subject: [PATCH 1959/3724] sydbox: 3.37.6 -> 3.37.8

---
 pkgs/by-name/sy/sydbox/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix
index a0edff5679fb..70c1ac166a33 100644
--- a/pkgs/by-name/sy/sydbox/package.nix
+++ b/pkgs/by-name/sy/sydbox/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sydbox";
-  version = "3.37.6";
+  version = "3.37.8";
 
   outputs = [
     "out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dcUK6GQK/l6HCTh/k5yaC5VetQmY6J+YWu8VHU1037g=";
+    hash = "sha256-d3kGLVAGo6El0IQzdASR5kNmcLOPig1fHnrEtPFo6H4=";
   };
 
-  cargoHash = "sha256-Ca4h7B5Vukd21HCEDpA5I+hgyQh7IFDLKeRxlVL0Uzo=";
+  cargoHash = "sha256-wpu8jeptwWHgqdWKHD5Nbs9WtZm7PjbO0lBk5fTbYuM=";
 
   nativeBuildInputs = [
     mandoc

From ea6147bd1f51a0b2afc48cbb53e0c23a1f71d10a Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Mon, 18 Aug 2025 23:56:05 +0200
Subject: [PATCH 1960/3724] readest: 0.9.71 -> 0.9.72

Changelog: https://github.com/readest/readest/releases/tag/v0.9.72
Diff: https://github.com/readest/readest/compare/v0.9.71...v0.9.72
---
 pkgs/by-name/re/readest/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index c3fe10b152e2..7a21097d26d6 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -20,13 +20,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.71";
+  version = "0.9.72";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Pk2R4t0le+F8Q1km/eTFcwyyMxMVgcAI+19cT53xGFs=";
+    hash = "sha256-TaE/u6LmKRe0yHPjaMIXpDOx/QNlBEJv2aw6/ihlkwc=";
     fetchSubmodules = true;
   };
 

From b0a52e4820709972108f01daaeedaa886be1739a Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Tue, 19 Aug 2025 06:13:41 +0800
Subject: [PATCH 1961/3724] flutter: update extraPackageConfigSetup

---
 .../build-flutter-application.nix             | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
index 1cbec9d5ebec..4eb8f310f265 100644
--- a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
+++ b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
@@ -109,18 +109,20 @@ let
             '';
         };
 
-        extraPackageConfigSetup = ''
-          # https://github.com/flutter/flutter/blob/3.13.8/packages/flutter_tools/lib/src/dart/pub.dart#L755
-          if [ "$('${lib.getExe buildPackages.yq}' '.flutter.generate // false' pubspec.yaml)" = "true" ]; then
-            export TEMP_PACKAGES=$(mktemp)
-            '${lib.getExe buildPackages.jq}' '.packages |= . + [{
-              name: "flutter_gen",
-              rootUri: "flutter_gen",
-              languageVersion: "2.12",
-            }]' "$out" > "$TEMP_PACKAGES"
-            cp "$TEMP_PACKAGES" "$out"
-            rm "$TEMP_PACKAGES"
-            unset TEMP_PACKAGES
+        # https://github.com/flutter/flutter/blob/edada7c56edf4a183c1735310e123c7f923584f1/packages/flutter_tools/lib/src/dart/pub.dart#L804
+        extraPackageConfigSetup = lib.optionalString (lib.versionOlder flutter.version "3.34.0") ''
+          if [ "$("${lib.getExe buildPackages.yq}" '.flutter.generate // false' pubspec.yaml)" = "true" ]; then
+            if ! "${lib.getExe buildPackages.jq}" -e '.packages[] | select(.name == "flutter_gen")' "$out" >/dev/null 2>&1; then
+              export TEMP_PACKAGES=$(mktemp)
+              "${lib.getExe buildPackages.jq}" '.packages |= . + [{
+                name: "flutter_gen",
+                rootUri: "flutter_gen",
+                languageVersion: "2.12"
+              }]' "$out" > "$TEMP_PACKAGES"
+              cp "$TEMP_PACKAGES" "$out"
+              rm "$TEMP_PACKAGES"
+              unset TEMP_PACKAGES
+            fi
           fi
         '';
       };

From 60954f4b06e92d97707160bbc44e79276c2ac555 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 22:19:01 +0000
Subject: [PATCH 1962/3724] dool: 1.3.4 -> 1.3.6

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

diff --git a/pkgs/by-name/do/dool/package.nix b/pkgs/by-name/do/dool/package.nix
index 1be266859149..7cf0b423133c 100644
--- a/pkgs/by-name/do/dool/package.nix
+++ b/pkgs/by-name/do/dool/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dool";
-  version = "1.3.4";
+  version = "1.3.6";
 
   src = fetchFromGitHub {
     owner = "scottchiefbaker";
     repo = "dool";
     rev = "v${version}";
-    hash = "sha256-eyWt8gWPGiU8YavX8KT018upSB6xg8eAyRZ84snrvoY=";
+    hash = "sha256-4q57MIQBnXm1zfOXQyIec/T9HWDtX7nZWYMJa4YkSS8=";
   };
 
   buildInputs = [

From e472a19933e23b3886df1f977516d3f726a338a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Aug 2025 22:35:20 +0000
Subject: [PATCH 1963/3724] czkawka: 9.0.0 -> 10.0.0

---
 pkgs/by-name/cz/czkawka/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix
index 85cc9ee7c15f..592bbf2f1e71 100644
--- a/pkgs/by-name/cz/czkawka/package.nix
+++ b/pkgs/by-name/cz/czkawka/package.nix
@@ -21,16 +21,16 @@
 let
   self = rustPlatform.buildRustPackage {
     pname = "czkawka";
-    version = "9.0.0";
+    version = "10.0.0";
 
     src = fetchFromGitHub {
       owner = "qarmin";
       repo = "czkawka";
       tag = self.version;
-      hash = "sha256-ePiHDfQ1QC3nff8uWE0ggiTuulBomuoZ3ta0redUYXY=";
+      hash = "sha256-r6EdTv95R8+XhaoA9OeqnGGl09kz8kMJaDPDRV6wQe8=";
     };
 
-    cargoHash = "sha256-Djvb5Hen6XPm6aJuwa6cGPojz9+kXXidysr3URDwDFM=";
+    cargoHash = "sha256-o4XjHJ7eCckTXqjz1tS4OSCP8DZzjxfWoMMy5Gab2rI=";
 
     nativeBuildInputs = [
       gobject-introspection

From 93ebc4f66e23f81a67e34fee8b8354d59d7d3e9a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jul 2025 15:59:53 +0000
Subject: [PATCH 1964/3724] python3Packages.django-auditlog: 3.1.2 -> 3.2.0

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

diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix
index 4b488a328ae8..80af50656ca1 100644
--- a/pkgs/development/python-modules/django-auditlog/default.nix
+++ b/pkgs/development/python-modules/django-auditlog/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "django-auditlog";
-  version = "3.1.2";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-auditlog";
     tag = "v${version}";
-    hash = "sha256-xb6pTsXkB8HVpXvB9WzBUlRcjh5cn1CdmMYQQVCQ/GU=";
+    hash = "sha256-NOtpnYh6HUo7VRSyCUhbpNDv0V9KWST0OEzl7Pt6eR8=";
   };
 
   nativeBuildInputs = [

From a3b4ab063a1bccff8ae67f4b66c5706ee31b15bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 18 Aug 2025 19:02:18 +0200
Subject: [PATCH 1965/3724] python3Packages.django-auditlog: 3.2.0 -> 3.2.1

Diff: https://github.com/jazzband/django-auditlog/compare/v3.2.0...v3.2.1

Changelog: https://github.com/jazzband/django-auditlog/blob/v3.2.1/CHANGELOG.md
---
 pkgs/development/python-modules/django-auditlog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix
index 80af50656ca1..61b66c736806 100644
--- a/pkgs/development/python-modules/django-auditlog/default.nix
+++ b/pkgs/development/python-modules/django-auditlog/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "django-auditlog";
-  version = "3.2.0";
+  version = "3.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-auditlog";
     tag = "v${version}";
-    hash = "sha256-NOtpnYh6HUo7VRSyCUhbpNDv0V9KWST0OEzl7Pt6eR8=";
+    hash = "sha256-159p82PT3za3wp2XhekGxy+NYxLyQfAyUOyhDjyr2CI=";
   };
 
   nativeBuildInputs = [

From 2ebbcb51600daea5b1d2b09683b0d9b1403279af Mon Sep 17 00:00:00 2001
From: hackardoX <hackardo@gmail.com>
Date: Tue, 19 Aug 2025 12:44:36 +1200
Subject: [PATCH 1966/3724] kamal: 2.6.1 -> 2.7.0

Signed-off-by: hackardoX <hackardo@gmail.com>
---
 pkgs/by-name/ka/kamal/Gemfile.lock | 11 +++++------
 pkgs/by-name/ka/kamal/gemset.nix   | 16 ++++++++--------
 pkgs/by-name/ka/kamal/package.nix  |  1 -
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ka/kamal/Gemfile.lock b/pkgs/by-name/ka/kamal/Gemfile.lock
index 00f2d9fd0457..725fa45275ce 100644
--- a/pkgs/by-name/ka/kamal/Gemfile.lock
+++ b/pkgs/by-name/ka/kamal/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    activesupport (8.0.2.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -27,7 +27,7 @@ GEM
     ed25519 (1.4.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    kamal (2.6.1)
+    kamal (2.7.0)
       activesupport (>= 7.0)
       base64 (~> 0.2)
       bcrypt_pbkdf (~> 1.0)
@@ -45,7 +45,7 @@ GEM
     net-sftp (4.0.0)
       net-ssh (>= 5.0.0, < 8.0.0)
     net-ssh (7.3.0)
-    ostruct (0.6.1)
+    ostruct (0.6.3)
     securerandom (0.4.1)
     sshkit (1.24.0)
       base64
@@ -54,7 +54,7 @@ GEM
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
       ostruct
-    thor (1.3.2)
+    thor (1.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uri (1.0.3)
@@ -64,10 +64,9 @@ PLATFORMS
   arm64-darwin
   ruby
   x86_64-darwin
-  x86_64-linux
 
 DEPENDENCIES
   kamal
 
 BUNDLED WITH
-   2.5.22
+   2.6.9
diff --git a/pkgs/by-name/ka/kamal/gemset.nix b/pkgs/by-name/ka/kamal/gemset.nix
index 0e54671df57c..b728374518d5 100644
--- a/pkgs/by-name/ka/kamal/gemset.nix
+++ b/pkgs/by-name/ka/kamal/gemset.nix
@@ -18,10 +18,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5";
+      sha256 = "1ik1sm5sizrsnr3di0klh7rvsy9r9mmd805fv5srk66as5psf184";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "8.0.2.1";
   };
   base64 = {
     groups = [ "default" ];
@@ -141,10 +141,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ak5yn5i99prqhyr0qry90lhi30z3qpyai8pkjs4nfs8b9fski0z";
+      sha256 = "1y5l2f1q484wbmlxiwdxsky0s44whj0y3xqp31m8hh57czcn7f36";
       type = "gem";
     };
-    version = "2.6.1";
+    version = "2.7.0";
   };
   logger = {
     groups = [ "default" ];
@@ -203,10 +203,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";
+      sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm";
       type = "gem";
     };
-    version = "0.6.1";
+    version = "0.6.3";
   };
   securerandom = {
     groups = [ "default" ];
@@ -241,10 +241,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
+      sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
   };
   tzinfo = {
     dependencies = [ "concurrent-ruby" ];
diff --git a/pkgs/by-name/ka/kamal/package.nix b/pkgs/by-name/ka/kamal/package.nix
index 06fb650ba690..2bf89a9ca040 100644
--- a/pkgs/by-name/ka/kamal/package.nix
+++ b/pkgs/by-name/ka/kamal/package.nix
@@ -2,7 +2,6 @@
   lib,
   ruby,
   bundlerApp,
-  bundlerUpdateScript,
 }:
 
 bundlerApp {

From 4fc6b7b77a2ec00475816e39f7ad2782a39049b7 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 19 Aug 2025 03:56:18 +0300
Subject: [PATCH 1967/3724] glycin-loaders: Fix cross

The hook adds the necessary cargo config
---
 pkgs/by-name/gl/glycin-loaders/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix
index 06bc12716d63..a3588b6628a9 100644
--- a/pkgs/by-name/gl/glycin-loaders/package.nix
+++ b/pkgs/by-name/gl/glycin-loaders/package.nix
@@ -20,6 +20,7 @@
   ninja,
   pkg-config,
   rustc,
+  rustPlatform,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -39,6 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
     finalAttrs.passthru.glycinPathsPatch
   ];
 
+  cargoVendorDir = "vendor";
+
   nativeBuildInputs = [
     cargo
     gettext # for msgfmt
@@ -47,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     rustc
+    rustPlatform.cargoSetupHook
   ];
 
   buildInputs = [
@@ -68,6 +72,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
+  postPatch = ''
+    substituteInPlace loaders/meson.build \
+      --replace-fail "cargo_target_dir / rust_target / loader," "cargo_target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / loader,"
+  '';
+
+  env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
+
   passthru = {
     updateScript = gnome.updateScript {
       attrPath = "glycin-loaders";

From 1600a25badd64b093f5b3408a5a0cf93dbc05cb6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 01:03:44 +0000
Subject: [PATCH 1968/3724] mdq: 0.7.2 -> 0.9.0

---
 pkgs/by-name/md/mdq/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/md/mdq/package.nix b/pkgs/by-name/md/mdq/package.nix
index 55a7cb47ad53..046b1a37a8bb 100644
--- a/pkgs/by-name/md/mdq/package.nix
+++ b/pkgs/by-name/md/mdq/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdq";
-  version = "0.7.2";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "yshavit";
     repo = "mdq";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QGva+yuiNwez8z9j4SL8vpcHdUm8nxRFn+6WiZgdWjQ=";
+    hash = "sha256-Ys5Ol/j4IZ4SNp6TjryfHCIgWoEu3ToNp7ffiTZp5BE=";
   };
 
-  cargoHash = "sha256-k+St07jA+F+c4md9OzFiDp9idie6zoNI65HEQ2JqynM=";
+  cargoHash = "sha256-fwFi/OYlTqRuDDE2TKuvf9T7u0hLyrDejhOwjFDYHAk=";
 
   passthru.updateScript = nix-update-script { };
 

From 314d9b4fa7989682742bab60c8eab5a71cde088a Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sat, 16 Aug 2025 22:54:42 +0300
Subject: [PATCH 1969/3724] yaml-merge: Fix running the cross-compiled script

This package is used in the adguardhome nixos module which is often
cross-compiled, therefore this workaround is justified.
---
 pkgs/by-name/ya/yaml-merge/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ya/yaml-merge/package.nix b/pkgs/by-name/ya/yaml-merge/package.nix
index c7983acbd2ac..da7046b5d997 100644
--- a/pkgs/by-name/ya/yaml-merge/package.nix
+++ b/pkgs/by-name/ya/yaml-merge/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   python3Packages,
+  pkgsHostTarget,
 }:
 
 stdenv.mkDerivation {
@@ -17,7 +18,11 @@ stdenv.mkDerivation {
   };
 
   pythonPath = with python3Packages; [ pyyaml ];
-  nativeBuildInputs = with python3Packages; [ wrapPython ];
+  nativeBuildInputs = [
+    # Not `python3Packages.wrapPython` to workaround `python3Packages.wrapPython.__spliced.buildHost` having the wrong `pythonHost`
+    # See https://github.com/NixOS/nixpkgs/issues/434307
+    pkgsHostTarget.python3Packages.wrapPython
+  ];
 
   installPhase = ''
     install -Dm755 yaml-merge.py $out/bin/yaml-merge

From fe2cc9b785e3dc5c79f2573855e3b3000474f382 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 01:49:51 +0000
Subject: [PATCH 1970/3724] python3Packages.pyinstrument: 5.1.0 -> 5.1.1

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

diff --git a/pkgs/development/python-modules/pyinstrument/default.nix b/pkgs/development/python-modules/pyinstrument/default.nix
index 140e88d08c18..6fe81eaf35b5 100644
--- a/pkgs/development/python-modules/pyinstrument/default.nix
+++ b/pkgs/development/python-modules/pyinstrument/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pyinstrument";
-  version = "5.1.0";
+  version = "5.1.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "joerick";
     repo = "pyinstrument";
     tag = "v${version}";
-    hash = "sha256-t1kiHqzaJDnjdsHBLEcWHSxPM6jZ7rPctFCjDQpL8ks=";
+    hash = "sha256-omQLUVgHbyz6YzLQ/7zU0f1R5xFU7EVGnwXohcuuP+o=";
   };
 
   nativeBuildInputs = [

From 43a812f428131183d4856ec44045c6d2f4247e1e Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:18:57 +0800
Subject: [PATCH 1971/3724] dart.file_picker: update

---
 .../dart/package-source-builders/file_picker/default.nix   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/dart/package-source-builders/file_picker/default.nix b/pkgs/development/compilers/dart/package-source-builders/file_picker/default.nix
index 11b541507e04..ca15844f3c21 100644
--- a/pkgs/development/compilers/dart/package-source-builders/file_picker/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/file_picker/default.nix
@@ -1,18 +1,19 @@
 {
+  lib,
   stdenv,
   zenity,
 }:
 
 { version, src, ... }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "file_picker";
   inherit version src;
   inherit (src) passthru;
 
-  postPatch = ''
+  postPatch = lib.optionalString (lib.versionOlder version "10.3.0") ''
     substituteInPlace lib/src/linux/file_picker_linux.dart \
-        --replace-fail "isExecutableOnPath('zenity')" "'${zenity}/bin/zenity'"
+        --replace-fail "isExecutableOnPath('zenity')" "'${lib.getExe zenity}'"
   '';
 
   installPhase = ''

From 0d23bf3fa7ee886e20c54c822929ea7a345d7f17 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:45:35 +0800
Subject: [PATCH 1972/3724] proxypin: 1.1.9 -> 1.2.0

---
 pkgs/by-name/pr/proxypin/package.nix       |  10 +-
 pkgs/by-name/pr/proxypin/pubspec.lock.json | 154 ++++++++++++++-------
 2 files changed, 107 insertions(+), 57 deletions(-)

diff --git a/pkgs/by-name/pr/proxypin/package.nix b/pkgs/by-name/pr/proxypin/package.nix
index 6f36a8f01e98..fab5b486c151 100644
--- a/pkgs/by-name/pr/proxypin/package.nix
+++ b/pkgs/by-name/pr/proxypin/package.nix
@@ -1,26 +1,26 @@
 {
   lib,
-  flutter329,
+  flutter332,
   fetchFromGitHub,
   autoPatchelfHook,
 }:
 
-flutter329.buildFlutterApplication rec {
+flutter332.buildFlutterApplication rec {
   pname = "proxypin";
-  version = "1.1.9";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "wanghongenpin";
     repo = "proxypin";
     tag = "v${version}";
-    hash = "sha256-yYZUXgWM7e1+TUvOid1X3WXlAGbUzDHrMXptPXKhuA8=";
+    hash = "sha256-PRknUOCaaDE4Ri70EAROx1K3g2bLKI/HKIvo1W1D8ko=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
   gitHashes = {
     desktop_multi_window = "sha256-Tbl0DOxW1F8V2Kj34gcNRbBqr5t9Iq74qCT26deqFdQ=";
-    flutter_code_editor = "sha256-w8SbgvfpKbfCr0Y82r/k9pDsZjLOdVJ6D93dzKXct8c=";
+    flutter_code_editor = "sha256-B9aJh6e6iLBZAcacucsT9szWWBwWVBBPDhbKQfnxc6I=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/pr/proxypin/pubspec.lock.json b/pkgs/by-name/pr/proxypin/pubspec.lock.json
index 93f5bb12823d..ee8a469c2e3d 100644
--- a/pkgs/by-name/pr/proxypin/pubspec.lock.json
+++ b/pkgs/by-name/pr/proxypin/pubspec.lock.json
@@ -1,14 +1,24 @@
 {
   "packages": {
+    "args": {
+      "dependency": "transitive",
+      "description": {
+        "name": "args",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.7.0"
+    },
     "async": {
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.12.0"
+      "version": "2.13.0"
     },
     "autotrie": {
       "dependency": "transitive",
@@ -130,6 +140,16 @@
       "source": "hosted",
       "version": "2.0.9"
     },
+    "dbus": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dbus",
+        "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.11"
+    },
     "desktop_multi_window": {
       "dependency": "direct main",
       "description": {
@@ -145,21 +165,21 @@
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "0c6396126421b590089447154c5f98a5de423b70cfb15b1578fd018843ee6f53",
+        "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.4.0"
+      "version": "11.5.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus_platform_interface",
-        "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
+        "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.2"
+      "version": "7.0.3"
     },
     "equatable": {
       "dependency": "transitive",
@@ -175,11 +195,11 @@
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.3"
     },
     "ffi": {
       "dependency": "transitive",
@@ -205,11 +225,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "77f8e81d22d2a07d0dee2c62e1dda71dc1da73bf43bb2d45af09727406167964",
+        "sha256": "ef7d2a085c1b1d69d17b6842d0734aad90156de08df6bd3c12496d0bd6ddf8e2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.1.9"
+      "version": "10.3.1"
     },
     "fixnum": {
       "dependency": "transitive",
@@ -232,11 +252,11 @@
       "description": {
         "path": ".",
         "ref": "secure-keyboard",
-        "resolved-ref": "b07c518b7cea5df69e2f826de168b91f83508d06",
+        "resolved-ref": "cde91b9e8a63bccb50296903cf0b3ea0142f65c5",
         "url": "https://github.com/wanghongenpin/flutter-code-editor.git"
       },
       "source": "git",
-      "version": "0.3.2"
+      "version": "0.3.4"
     },
     "flutter_desktop_context_menu": {
       "dependency": "direct main",
@@ -262,21 +282,21 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_js",
-        "sha256": "6b777cd4e468546f046a2f114d078a4596143269f6fa6bad5c29611d5b896369",
+        "sha256": "a04966b102967891ee4947d6e52b450676f16204876ba936e394008ca26db04b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.2"
+      "version": "0.8.5"
     },
     "flutter_lints": {
       "dependency": "direct dev",
       "description": {
         "name": "flutter_lints",
-        "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
+        "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "6.0.0"
     },
     "flutter_localizations": {
       "dependency": "direct main",
@@ -288,11 +308,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
+        "sha256": "6382ce712ff69b0f719640ce957559dde459e55ecd433c767e06d139ddf16cab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.28"
+      "version": "2.0.29"
     },
     "flutter_qr_reader_plus": {
       "dependency": "direct main",
@@ -326,6 +346,16 @@
       "source": "sdk",
       "version": "0.0.0"
     },
+    "get": {
+      "dependency": "direct main",
+      "description": {
+        "name": "get",
+        "sha256": "c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.7.2"
+    },
     "highlight": {
       "dependency": "transitive",
       "description": {
@@ -350,11 +380,11 @@
       "dependency": "transitive",
       "description": {
         "name": "http",
-        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
+        "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.0"
     },
     "http_parser": {
       "dependency": "transitive",
@@ -370,11 +400,11 @@
       "dependency": "transitive",
       "description": {
         "name": "iconsax_flutter",
-        "sha256": "95b65699da8ea98f87c5d232f06b0debaaf1ec1332b697e4d90969ec9a93037d",
+        "sha256": "d14b4cec8586025ac15276bdd40f6eea308cb85748135965bb6255f14beb2564",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.0.1"
     },
     "image_pickers": {
       "dependency": "direct main",
@@ -390,11 +420,11 @@
       "dependency": "direct main",
       "description": {
         "name": "intl",
-        "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+        "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.19.0"
+      "version": "0.20.2"
     },
     "json_annotation": {
       "dependency": "transitive",
@@ -410,11 +440,11 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
+        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.8"
+      "version": "10.0.9"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
@@ -450,21 +480,21 @@
       "dependency": "transitive",
       "description": {
         "name": "lints",
-        "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
+        "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.1.1"
+      "version": "6.0.0"
     },
     "logger": {
       "dependency": "direct main",
       "description": {
         "name": "logger",
-        "sha256": "be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1",
+        "sha256": "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.0"
+      "version": "2.6.1"
     },
     "matcher": {
       "dependency": "transitive",
@@ -600,11 +630,11 @@
       "dependency": "direct main",
       "description": {
         "name": "permission_handler",
-        "sha256": "2d070d8684b68efb580a5997eb62f675e8a885ef0be6e754fb9ef489c177470f",
+        "sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.0+1"
+      "version": "12.0.1"
     },
     "permission_handler_android": {
       "dependency": "transitive",
@@ -656,6 +686,16 @@
       "source": "hosted",
       "version": "0.2.1"
     },
+    "petitparser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "petitparser",
+        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.1.0"
+    },
     "platform": {
       "dependency": "transitive",
       "description": {
@@ -780,21 +820,21 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da",
+        "sha256": "d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.1.4"
+      "version": "11.1.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "share_plus_platform_interface",
-        "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b",
+        "sha256": "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.2"
+      "version": "6.1.0"
     },
     "shared_preferences": {
       "dependency": "direct main",
@@ -810,11 +850,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
+        "sha256": "5bcf0772a761b04f8c6bf814721713de6f3e5d9d89caf8d3fe031b02a342379e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.10"
+      "version": "2.4.11"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -956,11 +996,11 @@
       "dependency": "direct main",
       "description": {
         "name": "toastification",
-        "sha256": "9713989549d60754fd0522425d1251501919cfb7bab4ffbbb36ef40de5ea72b9",
+        "sha256": "69db2bff425b484007409650d8bcd5ed1ce2e9666293ece74dcd917dacf23112",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.2"
+      "version": "3.0.3"
     },
     "tuple": {
       "dependency": "transitive",
@@ -986,21 +1026,21 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
+        "sha256": "0aedad096a85b49df2e4725fa32118f9fa580f3b14af7a2d2221896a02cd5656",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.16"
+      "version": "6.3.17"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
@@ -1096,11 +1136,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
+        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.1"
+      "version": "15.0.0"
     },
     "web": {
       "dependency": "transitive",
@@ -1116,11 +1156,11 @@
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
+        "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.13.0"
+      "version": "5.14.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -1146,11 +1186,11 @@
       "dependency": "direct main",
       "description": {
         "name": "window_manager",
-        "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.3"
+      "version": "0.5.1"
     },
     "windows_single_instance": {
       "dependency": "direct main",
@@ -1172,6 +1212,16 @@
       "source": "hosted",
       "version": "1.1.0"
     },
+    "xml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "xml",
+        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.5.0"
+    },
     "zstandard": {
       "dependency": "direct main",
       "description": {
@@ -1254,7 +1304,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.7.0 <4.0.0",
-    "flutter": ">=3.27.0"
+    "dart": ">=3.8.0 <4.0.0",
+    "flutter": ">=3.29.0"
   }
 }

From 1eff09f25de4149c1898ae577495f28151665b41 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 19 Aug 2025 06:18:29 +0200
Subject: [PATCH 1973/3724] =?UTF-8?q?fstar:=202025.03.25=20=E2=86=92=20202?=
 =?UTF-8?q?5.08.07?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/fs/fstar/package.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/fs/fstar/package.nix b/pkgs/by-name/fs/fstar/package.nix
index 03f9d1cbfa26..fc810157836f 100644
--- a/pkgs/by-name/fs/fstar/package.nix
+++ b/pkgs/by-name/fs/fstar/package.nix
@@ -1,7 +1,6 @@
 {
   callPackage,
   fetchFromGitHub,
-  fetchpatch,
   installShellFiles,
   lib,
   makeWrapper,
@@ -14,26 +13,19 @@
 
 let
   # The version of ocaml fstar uses.
-  ocamlPackages = ocaml-ng.ocamlPackages_4_14;
+  ocamlPackages = ocaml-ng.ocamlPackages_5_3;
 
   fstarZ3 = callPackage ./z3 { };
 in
 ocamlPackages.buildDunePackage rec {
   pname = "fstar";
-  version = "2025.03.25";
+  version = "2025.08.07";
 
   src = fetchFromGitHub {
     owner = "FStarLang";
     repo = "FStar";
     rev = "v${version}";
-    hash = "sha256-PhjfThXF6fJlFHtNEURG4igCnM6VegWODypmRvnZPdA=";
-  };
-
-  # Compatibility with sedlex ≥ 3.5
-  patches = fetchpatch {
-    url = "https://github.com/FStarLang/FStar/commit/11aff952b955d2c9582515ee2d64ca6993ce1b73.patch";
-    hash = "sha256-HlppygegUAYYPDVSzFJvMHXdDSoug636bFa19v3TGkc=";
-    excludes = [ "fstar.opam" ];
+    hash = "sha256-IfwMLMbyC1+iPIG48zm6bzhKCHKPOpVaHdlLhU5g3co=";
   };
 
   nativeBuildInputs = [

From 9d719a32ef9b1d7dc36a9097767e4e3d995ceeb1 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Tue, 19 Aug 2025 16:49:36 +1000
Subject: [PATCH 1974/3724] ruby_3_2: 3.2.8 -> 3.2.9

Release: https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-2-9-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 22d04a3499bc..87ab43d84af7 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -419,8 +419,8 @@ in
   };
 
   ruby_3_2 = generic {
-    version = rubyVersion "3" "2" "8" "";
-    hash = "sha256-d6zdjPu+H45XO15lNuA8UQPfmJ3AX6aMcPARgzw1YHU=";
+    version = rubyVersion "3" "2" "9" "";
+    hash = "sha256-q7rZjbmusVJ3Ow01ho5QADuMRn89BhUld8Tf7Z2I7So=";
     cargoHash = "sha256-CMVx5/+ugDNEuLAvyPN0nGHwQw6RXyfRsMO9I+kyZpk=";
   };
 

From 50e29c549466042f77df34feeb177b7f5a2ef30f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 07:18:44 +0000
Subject: [PATCH 1975/3724] bento: 1.9.1 -> 1.10.0

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

diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix
index 9a20a5bbc481..7de1fd2afc1f 100644
--- a/pkgs/by-name/be/bento/package.nix
+++ b/pkgs/by-name/be/bento/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "bento";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "warpstreamlabs";
     repo = "bento";
     tag = "v${version}";
-    hash = "sha256-EGRM9tt8tycFxfrDBE/kAa0nat+dv1VmiPkIXcvCpA4=";
+    hash = "sha256-HLUDZx8Uk40mVxS8g9xHZi6AwWu4JkxXPjsIXrMr9K4=";
   };
 
   proxyVendor = true;

From 103578fd9d226ab21e9913a49e0739780e48de75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 07:38:38 +0000
Subject: [PATCH 1976/3724] laravel: 5.16.0 -> 5.17.0

---
 pkgs/by-name/la/laravel/composer.lock | 314 +++++++++++++++++---------
 pkgs/by-name/la/laravel/package.nix   |   6 +-
 2 files changed, 213 insertions(+), 107 deletions(-)

diff --git a/pkgs/by-name/la/laravel/composer.lock b/pkgs/by-name/la/laravel/composer.lock
index 5efe1eecfe30..3c6d258ccb06 100644
--- a/pkgs/by-name/la/laravel/composer.lock
+++ b/pkgs/by-name/la/laravel/composer.lock
@@ -77,33 +77,32 @@
         },
         {
             "name": "doctrine/inflector",
-            "version": "2.0.10",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
+                "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
-                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/6d6c96277ea252fc1304627204c3d5e6e15faa3b",
+                "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^11.0",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpstan/phpstan-strict-rules": "^1.3",
-                "phpunit/phpunit": "^8.5 || ^9.5",
-                "vimeo/psalm": "^4.25 || ^5.4"
+                "doctrine/coding-standard": "^12.0 || ^13.0",
+                "phpstan/phpstan": "^1.12 || ^2.0",
+                "phpstan/phpstan-phpunit": "^1.4 || ^2.0",
+                "phpstan/phpstan-strict-rules": "^1.6 || ^2.0",
+                "phpunit/phpunit": "^8.5 || ^12.2"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
+                    "Doctrine\\Inflector\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -148,7 +147,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.10"
+                "source": "https://github.com/doctrine/inflector/tree/2.1.0"
             },
             "funding": [
                 {
@@ -164,27 +163,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-18T20:23:39+00:00"
+            "time": "2025-08-10T19:31:58+00:00"
         },
         {
             "name": "illuminate/collections",
-            "version": "v12.19.2",
+            "version": "v12.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/collections.git",
-                "reference": "21a206b2b2297e838c181b482b5f8bbe7ac48f61"
+                "reference": "d8bdd65850b99ac4f7ebee1a49ad678a6740bec9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/collections/zipball/21a206b2b2297e838c181b482b5f8bbe7ac48f61",
-                "reference": "21a206b2b2297e838c181b482b5f8bbe7ac48f61",
+                "url": "https://api.github.com/repos/illuminate/collections/zipball/d8bdd65850b99ac4f7ebee1a49ad678a6740bec9",
+                "reference": "d8bdd65850b99ac4f7ebee1a49ad678a6740bec9",
                 "shasum": ""
             },
             "require": {
                 "illuminate/conditionable": "^12.0",
                 "illuminate/contracts": "^12.0",
                 "illuminate/macroable": "^12.0",
-                "php": "^8.2"
+                "php": "^8.2",
+                "symfony/polyfill-php84": "^1.31"
             },
             "suggest": {
                 "illuminate/http": "Required to convert collections to API resources (^12.0).",
@@ -221,11 +221,11 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-06-12T14:21:37+00:00"
+            "time": "2025-08-13T02:18:00+00:00"
         },
         {
             "name": "illuminate/conditionable",
-            "version": "v12.19.2",
+            "version": "v12.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/conditionable.git",
@@ -271,16 +271,16 @@
         },
         {
             "name": "illuminate/contracts",
-            "version": "v12.19.2",
+            "version": "v12.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
-                "reference": "ad1d16d827927455d3b7e39fabac66b1afb82582"
+                "reference": "458573a554b927e9594bb35baf9a7897dea03303"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/ad1d16d827927455d3b7e39fabac66b1afb82582",
-                "reference": "ad1d16d827927455d3b7e39fabac66b1afb82582",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/458573a554b927e9594bb35baf9a7897dea03303",
+                "reference": "458573a554b927e9594bb35baf9a7897dea03303",
                 "shasum": ""
             },
             "require": {
@@ -315,20 +315,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-06-12T15:07:31+00:00"
+            "time": "2025-08-03T15:27:01+00:00"
         },
         {
             "name": "illuminate/filesystem",
-            "version": "v12.19.2",
+            "version": "v12.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/filesystem.git",
-                "reference": "a5ec0cc347d46ff4aa3615c7739f321df3183fb7"
+                "reference": "d1c5bbb3b84649599def8ddd814c1f9543930055"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/a5ec0cc347d46ff4aa3615c7739f321df3183fb7",
-                "reference": "a5ec0cc347d46ff4aa3615c7739f321df3183fb7",
+                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/d1c5bbb3b84649599def8ddd814c1f9543930055",
+                "reference": "d1c5bbb3b84649599def8ddd814c1f9543930055",
                 "shasum": ""
             },
             "require": {
@@ -382,11 +382,11 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-06-17T23:40:32+00:00"
+            "time": "2025-08-04T20:03:30+00:00"
         },
         {
             "name": "illuminate/macroable",
-            "version": "v12.19.2",
+            "version": "v12.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/macroable.git",
@@ -432,16 +432,16 @@
         },
         {
             "name": "illuminate/support",
-            "version": "v12.19.2",
+            "version": "v12.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "4e5d098d1cdbf5cabff09c1903a141bd9747ae75"
+                "reference": "dffee7182dc82a2b0b384e461059c9cad4272ed8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/4e5d098d1cdbf5cabff09c1903a141bd9747ae75",
-                "reference": "4e5d098d1cdbf5cabff09c1903a141bd9747ae75",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/dffee7182dc82a2b0b384e461059c9cad4272ed8",
+                "reference": "dffee7182dc82a2b0b384e461059c9cad4272ed8",
                 "shasum": ""
             },
             "require": {
@@ -455,6 +455,7 @@
                 "illuminate/macroable": "^12.0",
                 "nesbot/carbon": "^3.8.4",
                 "php": "^8.2",
+                "symfony/polyfill-php83": "^1.31",
                 "voku/portable-ascii": "^2.0.2"
             },
             "conflict": {
@@ -505,20 +506,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-06-12T15:07:56+00:00"
+            "time": "2025-08-13T21:42:15+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.3.5",
+            "version": "v0.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "57b8f7efe40333cdb925700891c7d7465325d3b1"
+                "reference": "86a8b692e8661d0fb308cec64f3d176821323077"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/57b8f7efe40333cdb925700891c7d7465325d3b1",
-                "reference": "57b8f7efe40333cdb925700891c7d7465325d3b1",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/86a8b692e8661d0fb308cec64f3d176821323077",
+                "reference": "86a8b692e8661d0fb308cec64f3d176821323077",
                 "shasum": ""
             },
             "require": {
@@ -562,22 +563,22 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.5"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.6"
             },
-            "time": "2025-02-11T13:34:40+00:00"
+            "time": "2025-07-07T14:17:42+00:00"
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.10.0",
+            "version": "3.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9"
+                "reference": "76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",
-                "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24",
+                "reference": "76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24",
                 "shasum": ""
             },
             "require": {
@@ -669,7 +670,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-12T10:24:28+00:00"
+            "time": "2025-08-02T09:36:06+00:00"
         },
         {
             "name": "psr/clock",
@@ -899,16 +900,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.3.0",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44"
+                "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/66c1440edf6f339fd82ed6c7caa76cb006211b44",
-                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44",
+                "url": "https://api.github.com/repos/symfony/console/zipball/5f360ebc65c55265a74d23d7fe27f957870158a1",
+                "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1",
                 "shasum": ""
             },
             "require": {
@@ -973,7 +974,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.0"
+                "source": "https://github.com/symfony/console/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -984,12 +985,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-24T10:34:04+00:00"
+            "time": "2025-07-30T17:13:41+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1060,16 +1065,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v7.3.0",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d"
+                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/ec2344cf77a48253bbca6939aa3d2477773ea63d",
-                "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/2a6614966ba1074fa93dae0bc804227422df4dfe",
+                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe",
                 "shasum": ""
             },
             "require": {
@@ -1104,7 +1109,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.3.0"
+                "source": "https://github.com/symfony/finder/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -1115,12 +1120,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-30T19:00:26+00:00"
+            "time": "2025-07-15T13:41:35+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -1517,6 +1526,82 @@
             ],
             "time": "2024-09-09T11:45:10+00:00"
         },
+        {
+            "name": "symfony/polyfill-php84",
+            "version": "v1.32.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php84.git",
+                "reference": "000df7860439609837bbe28670b0be15783b7fbf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/000df7860439609837bbe28670b0be15783b7fbf",
+                "reference": "000df7860439609837bbe28670b0be15783b7fbf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php84\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php84/tree/v1.32.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-02-20T12:04:08+00:00"
+        },
         {
             "name": "symfony/process",
             "version": "v7.3.0",
@@ -1663,16 +1748,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.3.0",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125"
+                "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/f3570b8c61ca887a9e2938e85cb6458515d2b125",
-                "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125",
+                "url": "https://api.github.com/repos/symfony/string/zipball/42f505aff654e62ac7ac2ce21033818297ca89ca",
+                "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca",
                 "shasum": ""
             },
             "require": {
@@ -1730,7 +1815,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.3.0"
+                "source": "https://github.com/symfony/string/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -1741,25 +1826,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-20T20:19:01+00:00"
+            "time": "2025-07-10T08:47:49+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v7.3.0",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "4aba29076a29a3aa667e09b791e5f868973a8667"
+                "reference": "81b48f4daa96272efcce9c7a6c4b58e629df3c90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/4aba29076a29a3aa667e09b791e5f868973a8667",
-                "reference": "4aba29076a29a3aa667e09b791e5f868973a8667",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/81b48f4daa96272efcce9c7a6c4b58e629df3c90",
+                "reference": "81b48f4daa96272efcce9c7a6c4b58e629df3c90",
                 "shasum": ""
             },
             "require": {
@@ -1826,7 +1915,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.3.0"
+                "source": "https://github.com/symfony/translation/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -1837,12 +1926,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-29T07:19:49+00:00"
+            "time": "2025-07-30T17:31:46+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -2000,16 +2093,16 @@
     "packages-dev": [
         {
             "name": "myclabs/deep-copy",
-            "version": "1.13.1",
+            "version": "1.13.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c"
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/1720ddd719e16cf0db4eb1c6eca108031636d46c",
-                "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
                 "shasum": ""
             },
             "require": {
@@ -2048,7 +2141,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
             },
             "funding": [
                 {
@@ -2056,20 +2149,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-29T12:36:36+00:00"
+            "time": "2025-08-01T08:46:24+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.5.0",
+            "version": "v5.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
+                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9",
-                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
+                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
                 "shasum": ""
             },
             "require": {
@@ -2088,7 +2181,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.x-dev"
                 }
             },
             "autoload": {
@@ -2112,9 +2205,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1"
             },
-            "time": "2025-05-31T08:24:38+00:00"
+            "time": "2025-08-13T20:13:15+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -2236,16 +2329,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.17",
+            "version": "2.1.22",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053"
+                "reference": "41600c8379eb5aee63e9413fe9e97273e25d57e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/89b5ef665716fa2a52ecd2633f21007a6a349053",
-                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/41600c8379eb5aee63e9413fe9e97273e25d57e4",
+                "reference": "41600c8379eb5aee63e9413fe9e97273e25d57e4",
                 "shasum": ""
             },
             "require": {
@@ -2290,7 +2383,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-05-21T20:55:28+00:00"
+            "time": "2025-08-04T19:17:37+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -2615,16 +2708,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.46",
+            "version": "10.5.52",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "8080be387a5be380dda48c6f41cee4a13aadab3d"
+                "reference": "5be558244941fba07788b6bb42dc5fc84429580c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8080be387a5be380dda48c6f41cee4a13aadab3d",
-                "reference": "8080be387a5be380dda48c6f41cee4a13aadab3d",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5be558244941fba07788b6bb42dc5fc84429580c",
+                "reference": "5be558244941fba07788b6bb42dc5fc84429580c",
                 "shasum": ""
             },
             "require": {
@@ -2634,7 +2727,7 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.13.1",
+                "myclabs/deep-copy": "^1.13.4",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.1",
@@ -2651,7 +2744,7 @@
                 "sebastian/exporter": "^5.1.2",
                 "sebastian/global-state": "^6.0.2",
                 "sebastian/object-enumerator": "^5.0.0",
-                "sebastian/recursion-context": "^5.0.0",
+                "sebastian/recursion-context": "^5.0.1",
                 "sebastian/type": "^4.0.0",
                 "sebastian/version": "^4.0.1"
             },
@@ -2696,7 +2789,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.46"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.52"
             },
             "funding": [
                 {
@@ -2720,7 +2813,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-02T06:46:24+00:00"
+            "time": "2025-08-16T05:17:33+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -3468,23 +3561,23 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "5.0.0",
+            "version": "5.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "05909fb5bc7df4c52992396d0116aed689f93712"
+                "reference": "47e34210757a2f37a97dcd207d032e1b01e64c7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712",
-                "reference": "05909fb5bc7df4c52992396d0116aed689f93712",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/47e34210757a2f37a97dcd207d032e1b01e64c7a",
+                "reference": "47e34210757a2f37a97dcd207d032e1b01e64c7a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^10.5"
             },
             "type": "library",
             "extra": {
@@ -3519,15 +3612,28 @@
             "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0"
+                "security": "https://github.com/sebastianbergmann/recursion-context/security/policy",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.1"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2023-02-03T07:05:40+00:00"
+            "time": "2025-08-10T07:50:56+00:00"
         },
         {
             "name": "sebastian/type",
diff --git a/pkgs/by-name/la/laravel/package.nix b/pkgs/by-name/la/laravel/package.nix
index c13b51eedc13..250cb5d603ae 100644
--- a/pkgs/by-name/la/laravel/package.nix
+++ b/pkgs/by-name/la/laravel/package.nix
@@ -7,19 +7,19 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
   pname = "laravel";
-  version = "5.16.0";
+  version = "5.17.0";
 
   src = fetchFromGitHub {
     owner = "laravel";
     repo = "installer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-A2DUa1TD9xeZ8zyIVOGgPEnY/UrDSzVpC32JNg5OpyU=";
+    hash = "sha256-SprGPKpXQoks1eB9XLO6ms7q09q/QFutukEk4VfhXOM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   composerLock = ./composer.lock;
-  vendorHash = "sha256-2mUC6uu9DS0FJaKiiNVCUSZoEW5+bpkUlrWHZV+pzL0=";
+  vendorHash = "sha256-R1+IUKkmThbTN21rxP6CGilTn9R3E7irGND2YDm3RjI=";
 
   # Adding npm (nodejs) and php composer to path
   postInstall = ''

From eb604420f4987e6f6df07767802996a5d32a75c5 Mon Sep 17 00:00:00 2001
From: MCSeekeri <mcseekeri@outlook.com>
Date: Tue, 19 Aug 2025 15:46:30 +0800
Subject: [PATCH 1977/3724] geph: 0.2.72 -> 0.2.77

---
 pkgs/by-name/ge/geph/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix
index e68b537313d5..c304623e7b94 100644
--- a/pkgs/by-name/ge/geph/package.nix
+++ b/pkgs/by-name/ge/geph/package.nix
@@ -14,6 +14,7 @@
   libglvnd,
   copyDesktopItems,
   makeDesktopItem,
+  nix-update-script,
 }:
 let
   binPath = lib.makeBinPath [
@@ -23,16 +24,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "geph5";
-  version = "0.2.72";
+  version = "0.2.77";
 
   src = fetchFromGitHub {
     owner = "geph-official";
     repo = "geph5";
     rev = "geph5-client-v${finalAttrs.version}";
-    hash = "sha256-+/oOQjebkn3iYi5UXFzFoe0ldu+p+nf5uEjGhk5nlNo=";
+    hash = "sha256-xm2eSCLIPYydR8iwMlZyc/M6bFrUZRqL5yZUXuYdk/k=";
   };
 
-  cargoHash = "sha256-OFSsMa/xErNB+1cvEOnGshJJEcG8ZDf9y/uYVnsVwhU=";
+  cargoHash = "sha256-DNk4BQoY8m3OmglXMZzGstl9aC+LhZq9EN0OLW7sBrw=";
 
   postPatch = ''
     substituteInPlace binaries/geph5-client/src/vpn/*.sh \
@@ -98,6 +99,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     }' "$out/bin/geph5-client-gui"
   '';
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "geph5-client-v(.*)"
+    ];
+  };
+
   meta = {
     description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
     homepage = "https://github.com/geph-official/geph5";

From f81a2dfa52e68530368b8eb1580376f49dc2ef2a Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Fri, 15 Aug 2025 14:17:02 +0200
Subject: [PATCH 1978/3724] fetchMavenArtifact: fix metadata support

Fix fetchMavenArtifact to forward the "meta" attribute to mkDerivation
rather than fetchurl.
---
 pkgs/build-support/fetchmavenartifact/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix
index eca360057a60..1da312f5d100 100644
--- a/pkgs/build-support/fetchmavenartifact/default.nix
+++ b/pkgs/build-support/fetchmavenartifact/default.nix
@@ -31,6 +31,8 @@ args@{
   # and `urls` can be specified, not both.
   url ? "",
   urls ? [ ],
+  # Metadata
+  meta ? { },
   # The rest of the arguments are just forwarded to `fetchurl`.
   ...
 }:
@@ -71,6 +73,7 @@ let
       "classifier"
       "repos"
       "url"
+      "meta"
     ]
     // {
       urls = urls_;
@@ -79,7 +82,7 @@ let
   );
 in
 stdenv.mkDerivation {
-  inherit pname version;
+  inherit pname version meta;
   dontUnpack = true;
   # By moving the jar to $out/share/java we make it discoverable by java
   # packages packages that mention this derivation in their buildInputs.

From 05d3593150b8f6d550d596470c3b4debfdfca45b Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:19:09 +0200
Subject: [PATCH 1979/3724] electron-source.electron_35: 35.7.4 -> 35.7.5

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.7.4...v35.7.5
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 13aa8d2762f8..739bfddfa752 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -57,10 +57,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-+YuOe+2em9eZA8uKAuVUl9YkLk7Axo2bSMdwZK9BCM0=",
+                    "hash": "sha256-uwPynVLl+BVB2eO479YLg1Gbo8lv5h5iHSxNz+M5Wyg=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v35.7.4"
+                    "tag": "v35.7.5"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1306,7 +1306,7 @@
         "electron_yarn_hash": "0kiknh04rr87yzd5k13ghvk36kb7a4pcfwwinpqcsdvgka62kf1c",
         "modules": "133",
         "node": "22.16.0",
-        "version": "35.7.4"
+        "version": "35.7.5"
     },
     "36": {
         "chrome": "136.0.7103.177",

From f70dae7523600a38b8ae6dc62dfe26bb4171122b Mon Sep 17 00:00:00 2001
From: Konstantin Alekseev <konstantin@kotify.com>
Date: Tue, 19 Aug 2025 12:21:30 +0300
Subject: [PATCH 1980/3724] django-upgrade: 1.22.2 -> 1.25.0

---
 pkgs/by-name/dj/django-upgrade/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dj/django-upgrade/package.nix b/pkgs/by-name/dj/django-upgrade/package.nix
index 01d6a65956b5..edf7b8d3d173 100644
--- a/pkgs/by-name/dj/django-upgrade/package.nix
+++ b/pkgs/by-name/dj/django-upgrade/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "django-upgrade";
-  version = "1.22.2";
+  version = "1.25.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "adamchainz";
     repo = "django-upgrade";
     tag = version;
-    hash = "sha256-QhowVqvN1kODKFLp2uA9CXLWqNJl1p5kC5z4rjRqKNk=";
+    hash = "sha256-Y49GNAc1RFGcjQbZhKzf71KxCcPJT4jPhpjq1HvIBWU=";
   };
 
   build-system = [ python3Packages.setuptools ];
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
   meta = {
     description = "Automatically upgrade your Django projects";
     homepage = "https://github.com/adamchainz/django-upgrade";
-    changelog = "https://github.com/adamchainz/django-upgrade/blob/${version}/CHANGELOG.rst";
+    changelog = "https://github.com/adamchainz/django-upgrade/blob/${version}/docs/changelog.rst";
     mainProgram = "django-upgrade";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.kalekseev ];

From 08bc668348bf3ef0a81da50d1a4f6a060cb61aa2 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:26:03 +0200
Subject: [PATCH 1981/3724] electron-source.electron_36: 36.7.3 -> 36.8.1

- Changelog: https://github.com/electron/electron/releases/tag/v36.8.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.7.3...v36.8.1
---
 pkgs/development/tools/electron/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 739bfddfa752..1b5e1444754f 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1366,10 +1366,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-XywLLfMxQEMkRW9yev9tz52GxW0Hkg8DkdcBg4hTmCw=",
+                    "hash": "sha256-2D+/tEwerVQt9wHp2ECirBbguftCXzAy5/zTJa1458A=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v36.7.3"
+                    "tag": "v36.8.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1695,10 +1695,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-Qog6QBWGikETuaGj1rWTMe8q9bMu1HSK8HBUrldVnpI=",
+                    "hash": "sha256-BspT1cIpjL7P5HlpqGlhmvLADae5XzVyyHAg/g9RISA=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v22.17.1"
+                    "tag": "v22.18.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2628,10 +2628,10 @@
                 "fetcher": "fetchFromGitiles"
             }
         },
-        "electron_yarn_hash": "1lzjbq2r81hlzrhr7rxdfjq6z4h3k1106azn7mraj00d91cyp0af",
+        "electron_yarn_hash": "1lqvsfr1w32n4as7g7ms49jjdfw7sl1fyvg2640cpdgjs4dd96ky",
         "modules": "135",
-        "node": "22.17.1",
-        "version": "36.7.3"
+        "node": "22.18.0",
+        "version": "36.8.1"
     },
     "37": {
         "chrome": "138.0.7204.185",

From 164d30327916566928194823d3a033ff86f7ae2b Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:40:15 +0200
Subject: [PATCH 1982/3724] electron-source.electron_37: 37.2.6 -> 37.3.1

- Changelog: https://github.com/electron/electron/releases/tag/v37.3.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.6...v37.3.1
---
 pkgs/development/tools/electron/info.json | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 1b5e1444754f..ba5feb04f48a 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2634,7 +2634,7 @@
         "version": "36.8.1"
     },
     "37": {
-        "chrome": "138.0.7204.185",
+        "chrome": "138.0.7204.235",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2644,15 +2644,15 @@
                     "version": "2025-05-21"
                 }
             },
-            "version": "138.0.7204.185"
+            "version": "138.0.7204.235"
         },
         "chromium_npm_hash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-ak77DywFKuMOKy+N73rTBFBMdv1wRJ8kSQCmB4lH+Nk=",
+                    "hash": "sha256-S3uarVWXVgo0xqWoLdbv/oe+iYdHUBZk1W4lhzQmI/I=",
                     "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
-                    "tag": "138.0.7204.185",
+                    "tag": "138.0.7204.235",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2691,10 +2691,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-goJ68k58a4XFoXuWAqFhSLoVooK/n3IGOzyVgGlyrfM=",
+                    "hash": "sha256-NkNq6jKC8NHi/PAV8zru5WCCZFO7XLMwishzURfP2mc=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v37.2.6"
+                    "tag": "v37.3.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2732,8 +2732,8 @@
             },
             "src/third_party/angle": {
                 "args": {
-                    "hash": "sha256-tkHvTkqbm4JtWnh41iu0aJ9Jo34hYc7aOKuuMQmST4c=",
-                    "rev": "e1dc0a7ab5d1f1f2edaa7e41447d873895e083bf",
+                    "hash": "sha256-SMjekUOo2ZXRhGRI11ZOsHp2F9jweTIdWiyqcBm6Ux8=",
+                    "rev": "4e2ac155b53f98f029303453dd8986ed1f16d7fc",
                     "url": "https://chromium.googlesource.com/angle/angle.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3028,10 +3028,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-Qog6QBWGikETuaGj1rWTMe8q9bMu1HSK8HBUrldVnpI=",
+                    "hash": "sha256-BspT1cIpjL7P5HlpqGlhmvLADae5XzVyyHAg/g9RISA=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v22.17.1"
+                    "tag": "v22.18.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3286,8 +3286,8 @@
             },
             "src/third_party/libaom/source/libaom": {
                 "args": {
-                    "hash": "sha256-pyLKjLG83Jlx6I+0M8Ah94ku4NIFcrHNYswfVHMvdrc=",
-                    "rev": "2cca4aba034f99842c2e6cdc173f83801d289764",
+                    "hash": "sha256-9MQJXOysMSmZsc1T5QEuUZoG9kbht9iSacGFATPkmPU=",
+                    "rev": "1a5d58271aa6133b6fa7da9fa365290cc4f2cc4d",
                     "url": "https://aomedia.googlesource.com/aom.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3954,16 +3954,16 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-/2cw/iZ9zbCMMiANUfsWpxYUzA3FDfUIrjoJh/jc0XI=",
-                    "rev": "54f355e9ad22c93162d7d9d94c849c729d64bee7",
+                    "hash": "sha256-PBD43Kfv81iewn60pfpIQBqHVd8j+tcR+VHn35YwdNc=",
+                    "rev": "82ea130494ea43ed0e1bba1ccf97e5db06668ba1",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
             }
         },
-        "electron_yarn_hash": "1lzjbq2r81hlzrhr7rxdfjq6z4h3k1106azn7mraj00d91cyp0af",
+        "electron_yarn_hash": "1lqvsfr1w32n4as7g7ms49jjdfw7sl1fyvg2640cpdgjs4dd96ky",
         "modules": "136",
-        "node": "22.17.1",
-        "version": "37.2.6"
+        "node": "22.18.0",
+        "version": "37.3.1"
     }
 }

From 45a152bb41f7638580586bf664ed73c290dc0682 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:40:38 +0200
Subject: [PATCH 1983/3724] electron_35-bin: 35.7.4 -> 35.7.5

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.7.4...v35.7.5
---
 pkgs/development/tools/electron/binary/info.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index fe0e785e4343..c1eac226ca18 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -1,14 +1,14 @@
 {
     "35": {
         "hashes": {
-            "aarch64-darwin": "61201a7d31d494a2357acea6343e8f7742903420c0f4931a2c7aad1599891931",
-            "aarch64-linux": "0aa484cb980781dabcb4c4213b6c3e609a58a42d4678ea824ad50ebdaa3c8bf6",
-            "armv7l-linux": "6f0aaab8c36e1448a02aea4a254ce70954d4da9422a867cd1d866f9db5e40754",
+            "aarch64-darwin": "2fe3a3cfad607a8c1627f6f2bb9834f959c665ef575b663206db11929634b92f",
+            "aarch64-linux": "35c4c30aed2639a38fafa6bd1a6a97b3af89a681afbd5c7a0f40673859040ea3",
+            "armv7l-linux": "350e80638b5ba8a1b56e2463fa55de25f8ee595c0496ef833b07fb4dc65e0c22",
             "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
-            "x86_64-darwin": "470c370522beab8a17b22a40efa851f70da3b6ad54b9821dea7067809b7b4a81",
-            "x86_64-linux": "5ca604b180f563d3c6a2c1a9307a1282ee04fd1fdf661122cda9ebe5f09dd1c2"
+            "x86_64-darwin": "48a426bb5df999dd46c0700261a1a7f572b17581c4c0d1c28afade5ae600cdc9",
+            "x86_64-linux": "368d155a2189e1056d111d334b712779e77066fce1f5ab935b22c4ef544eaa29"
         },
-        "version": "35.7.4"
+        "version": "35.7.5"
     },
     "36": {
         "hashes": {

From fc22a31a30d32c3e696c95b6d75a0a18f8c7ae09 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:40:42 +0200
Subject: [PATCH 1984/3724] electron-chromedriver_35: 35.7.4 -> 35.7.5

- Changelog: https://github.com/electron/electron/releases/tag/v35.7.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.7.4...v35.7.5
---
 .../tools/electron/chromedriver/info.json            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 4a3cfd1bbb32..f794bd0dc1c8 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -1,14 +1,14 @@
 {
     "35": {
         "hashes": {
-            "aarch64-darwin": "c50caedea8ad314009910835198a4956d377ab4452764d100c9bc9c523db4ea7",
-            "aarch64-linux": "40021f9f20b98af3a57b0176405de4e52059748303515adbbe91afec5423b66e",
-            "armv7l-linux": "99bc71ec4202f961e7369c57c856eb3610dbd80ae124525560714542f2c1eb5d",
+            "aarch64-darwin": "9559c7dd0f59b4f9949ce982d589079123b6a1f0677fd7c2260473120e73d487",
+            "aarch64-linux": "ab98b00e04b7f86e9f7ea8d79ab00cb317e4e3f75501e7257702510979443dbc",
+            "armv7l-linux": "0fe5eb017c99d8b7727797595957907a9050a773ff1dc6aa1a7184a603235bfc",
             "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
-            "x86_64-darwin": "a76478d64513909e85a854b05be111e814d2dcc7014b8668aadf375875eeaac0",
-            "x86_64-linux": "d580acc95ed0d125b950a0f053366b81b1a4fb941742e87021d1f837b83149a8"
+            "x86_64-darwin": "19911b618f920d21244d8ea3c5ea33aea94ac6155ba88952f2846fb366798997",
+            "x86_64-linux": "f6a0a3850fc1b63ded8d5bf1ec70308c6ee99f3bc8133d628167bb1ae6afe990"
         },
-        "version": "35.7.4"
+        "version": "35.7.5"
     },
     "36": {
         "hashes": {

From f7d292ea0fddc75e0f068d3f04922af63dc268ee Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:40:46 +0200
Subject: [PATCH 1985/3724] electron_36-bin: 36.7.3 -> 36.8.1

- Changelog: https://github.com/electron/electron/releases/tag/v36.8.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.7.3...v36.8.1
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index c1eac226ca18..4c97800ac1f2 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -12,14 +12,14 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "2b135786014ed8962ad4b4adfd334848929efd5fe5c2432f9054eb83ae67b1c6",
-            "aarch64-linux": "6ee195e05592fde3c5a2245203ac9a9e9c7118cbbf1d6c097db339ed5457732e",
-            "armv7l-linux": "72fd25c965a350abdf99f8e0a4bfca7ecf6eb154cb95912139665f37a76f6d54",
-            "headers": "0k8dqncwp338d17kfrcgam2i0z3zcbs22r36lslh08jfafr8n2mf",
-            "x86_64-darwin": "9f95547bc2d1b2eff6e8de0f00c844ecbf9ee118e1355d5791f900cdfebfb142",
-            "x86_64-linux": "3a9c36c64a38dd3ff959e9f1ba6ead43509d62c6f0948e71d3f575727b05ad96"
+            "aarch64-darwin": "d00c2cf31c36a917817dfa0860da6847d807d3b4fa72a691e4586f5f4a2dd664",
+            "aarch64-linux": "d272cdf391b4539df9960a2481d108fed6a37da5371b2b680a617035661f5c84",
+            "armv7l-linux": "3b0bfefdf493eebb189fd982998c5c3bb694135a4886f091f341f476d5187d46",
+            "headers": "1nmdbw0m2k06588wqgvv2mzlh3n6f9if7almckwhmndi9i9577j8",
+            "x86_64-darwin": "c974a37ac237cc12bb10be2acbdea8c4312dc6375c12c184978ba7089c435808",
+            "x86_64-linux": "fe70e65a8105057a686d55a62705650396cee98b2bf8baf5d497090dd96c57e1"
         },
-        "version": "36.7.3"
+        "version": "36.8.1"
     },
     "37": {
         "hashes": {

From fac81531d265a0245975a79083bd846874c6ee31 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:40:49 +0200
Subject: [PATCH 1986/3724] electron-chromedriver_36: 36.7.3 -> 36.8.1

- Changelog: https://github.com/electron/electron/releases/tag/v36.8.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.7.3...v36.8.1
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index f794bd0dc1c8..a2953edec9c9 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -12,14 +12,14 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "ab224e77272c6482cbe54ff0b368f0b696d1f2b5e28478ec3f641665251ec6ce",
-            "aarch64-linux": "cd9ada2f39c376e56f095d1c1f76505ce499e8a40a4127e508abca173bbf37e3",
-            "armv7l-linux": "90e9ac552f98b1cff1da096d747685e4abca4dd2cf610c5ab2f60a7f29f714b6",
-            "headers": "0k8dqncwp338d17kfrcgam2i0z3zcbs22r36lslh08jfafr8n2mf",
-            "x86_64-darwin": "0658109c34afe0bcffc3f795d9970bbe5fb4225faf4c0ae74e09a1877c27c1f4",
-            "x86_64-linux": "9f9956aeb6ab5650e7731eb4aa507cabd96eee0755ca7884bd18b89d50ed06a0"
+            "aarch64-darwin": "9fd2c5590efec6ceb758620eabc964942962dc70d32005431e31669e4704b3a7",
+            "aarch64-linux": "bf8089f041135d1e170b726b723881983815c1abffb635167b7cb3d0fbeaec3d",
+            "armv7l-linux": "fe738dc5ccc5e1154a6d9454fd95b06a08cf98ef0bb897464b7465635e7a2a38",
+            "headers": "1nmdbw0m2k06588wqgvv2mzlh3n6f9if7almckwhmndi9i9577j8",
+            "x86_64-darwin": "4b318e23a2e7358738fc1bc72ea49c1ed7efc184689c07c23e38d9a41a76af63",
+            "x86_64-linux": "921026912995299b633fa4797bab8c34b5ca3e0d496bcb23c3e734ca779d8e0f"
         },
-        "version": "36.7.3"
+        "version": "36.8.1"
     },
     "37": {
         "hashes": {

From 3645474a29020ce5ff230e2fcf7a1155eab1ce52 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:40:54 +0200
Subject: [PATCH 1987/3724] electron_37-bin: 37.2.6 -> 37.3.1

- Changelog: https://github.com/electron/electron/releases/tag/v37.3.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.6...v37.3.1
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 4c97800ac1f2..450d5559f523 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,13 +23,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "e3d391ba786d90a3a37182a28774b088769ee0c794d8bb8ff5a9f4cc447d23f8",
-            "aarch64-linux": "1912d1c114e2590fcae45ee8c20d79dc63bb535f46f16b8d596ccfe6e99fcd24",
-            "armv7l-linux": "276d1ce011993812afcb0018dce2a10e7b011e3a66578dec01bb2a72f3aa3b8e",
-            "headers": "1fnisy6zs2s7bmbvnvl05rg2rxcs0i50aivz8ipgr8lfhgqkg0pq",
-            "x86_64-darwin": "ffa6a3c2c56bf6cfa3339f09e90716708b9d6da5b8dfa235d6e7b0736d12dab9",
-            "x86_64-linux": "3bb2edaddcb55fb4984af319e4ded6d7a40b8da65b87935ae1348877c598ba23"
+            "aarch64-darwin": "7f390efeca2d2153e29c5ea13305915fb3f853b2a4e9a00be07183c6e09ac6de",
+            "aarch64-linux": "c5c8ec46d9e291cd9dddb40c635d947d0f17873739f93b069e75b4bdadd75f5d",
+            "armv7l-linux": "0871625623efb0edbb4d93ec9e036e01837f9d9ffaf4f1c05ae95f30ff823987",
+            "headers": "1a5wfjjf68mcbsq2lxxsrhgni5ia4dcv1pfzmgw3wm10gbyb0wzi",
+            "x86_64-darwin": "0a6a55de6c49d6eb929f01632701bd25f7e515d7b4042614dd5a1ec6c079f3f3",
+            "x86_64-linux": "9c379b91f7ff65311f2b040299ee95c137fcb8e7e1bef87f9225d608cf579548"
         },
-        "version": "37.2.6"
+        "version": "37.3.1"
     }
 }

From 3e9e7b23f1ea3242b0d4ee888ba0d717e01b329e Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:40:57 +0200
Subject: [PATCH 1988/3724] electron-chromedriver_37: 37.2.6 -> 37.3.1

- Changelog: https://github.com/electron/electron/releases/tag/v37.3.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.2.6...v37.3.1
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index a2953edec9c9..6d2ec9a38cf5 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,13 +23,13 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "184952f8898742f26f18e0735eb3fe2d3c48252d484f64d84cbc718f44065a5b",
-            "aarch64-linux": "62d15b12c2c1d8708370447a5c8ac411bc6693f081decf611628b26976a7a74f",
-            "armv7l-linux": "eaefa0e6330f2dce48ee64274bb58306ccb221175418da51fcca8cc932fb7369",
-            "headers": "1fnisy6zs2s7bmbvnvl05rg2rxcs0i50aivz8ipgr8lfhgqkg0pq",
-            "x86_64-darwin": "1c29e44ae4c67a9f9ba12b3fd761ac331ed7f295b9660134fd45032ae2e03ef9",
-            "x86_64-linux": "3b08b1cf455222f652114163c13efd3ee4092749e5a01be2faaac8a7b75cfaaa"
+            "aarch64-darwin": "f6e9c5bdf45d3e17ef90036265a190e55fb2c15c840c2f898f7b503882dcbdac",
+            "aarch64-linux": "db0b310b297cb3c38655ca2d91c892e463f6e73d45b1487aa5f7271dd5f54315",
+            "armv7l-linux": "e4cc211fc92da230acbf2139333051a105a97f7a6a52ace5b0f289bcffcf1ce4",
+            "headers": "1a5wfjjf68mcbsq2lxxsrhgni5ia4dcv1pfzmgw3wm10gbyb0wzi",
+            "x86_64-darwin": "473bae1c5226e2b1b7cebe71a2f983955e886d65683b00d302850071026e0bdb",
+            "x86_64-linux": "6f59f1b86c4538bdf7857fa90afd3f459a8f32bc600480774ae4dc50fc89208c"
         },
-        "version": "37.2.6"
+        "version": "37.3.1"
     }
 }

From 6421998f3226d5a07c707d0a108e19c3e5a2bba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 19 Aug 2025 11:45:59 +0200
Subject: [PATCH 1989/3724] gimp: fixup build, missing xz libs

https://hydra.nixos.org/build/305228462/nixlog/1/tail
---
 pkgs/applications/graphics/gimp/2.0/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/graphics/gimp/2.0/default.nix b/pkgs/applications/graphics/gimp/2.0/default.nix
index be4bed838edf..985ae05e71b1 100644
--- a/pkgs/applications/graphics/gimp/2.0/default.nix
+++ b/pkgs/applications/graphics/gimp/2.0/default.nix
@@ -28,6 +28,7 @@
   libwmf,
   zlib,
   libzip,
+  xz,
   ghostscript,
   aalib,
   shared-mime-info,
@@ -133,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
     libwmf
     zlib
     libzip
+    xz
     ghostscript
     aalib
     shared-mime-info

From e6843057afac9afe3a72ff50ea31a914f75e77c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Mon, 18 Aug 2025 20:02:04 +0200
Subject: [PATCH 1990/3724] python3Packages.fontmake: remove unnecessary patch

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

diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix
index 8fb3c30f6df4..9f651758e3b0 100644
--- a/pkgs/development/python-modules/fontmake/default.nix
+++ b/pkgs/development/python-modules/fontmake/default.nix
@@ -27,16 +27,6 @@ buildPythonPackage rec {
     hash = "sha256-cHFxb7lWUj/7ATynoMGQkhArKWCHHLYvQG5IoaXwVBs=";
   };
 
-  patches = [
-    # Update to FontTools 4.55 and glyphsLib 6.9.5
-    # https://github.com/googlefonts/fontmake/pull/1133
-    (fetchpatch2 {
-      url = "https://github.com/googlefonts/fontmake/commit/ca96d25faa67638930ddc7f9bd1ab218a76caf22.patch";
-      includes = [ "tests/test_main.py" ];
-      hash = "sha256-vz+KeWiGCpUdX5HaXDdyyUCbuMkIylB364j6cD7xR1E=";
-    })
-  ];
-
   build-system = [
     setuptools
     setuptools-scm

From 4f0917ea13ca9b33997d1dd791c2280c3e8c2be0 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Tue, 19 Aug 2025 12:18:27 +0200
Subject: [PATCH 1991/3724] electron: clean up unused patches

---
 pkgs/development/tools/electron/common.nix    | 20 -------------------
 .../tools/electron/use-rust-adler2.patch      | 13 ------------
 2 files changed, 33 deletions(-)
 delete mode 100644 pkgs/development/tools/electron/use-rust-adler2.patch

diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index 44c4ea2c62a0..f2a2c60da5a8 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -86,26 +86,6 @@ in
 
   patches =
     base.patches
-    # Fix building with Rust 1.86+
-    # electron_33 and electron_34 use older chromium versions which expect rust
-    # to provide the older `adler` library instead of the newer `adler2` library
-    # This patch makes those older versions also use the new adler2 library
-    ++ lib.optionals (lib.versionOlder info.version "35") [
-      ./use-rust-adler2.patch
-    ]
-    # Requirements for the next section
-    ++ lib.optionals (lib.versionOlder info.version "35") [
-      (fetchpatch {
-        name = "Avoid-build-rust-PartitionAlloc-dep-when-not-build_with_chromium.patch";
-        url = "https://github.com/chromium/chromium/commit/ee94f376a0dd642a93fbf4a5fa8e7aa8fb2a69b5.patch";
-        hash = "sha256-qGjy9VZ4d3T5AuqOrBKEajBswwBU/7j0n80rpvHZLmM=";
-      })
-      (fetchpatch {
-        name = "Suppress-unsafe_libc_call-warning-for-rust-remap_alloc-cc.patch";
-        url = "https://github.com/chromium/chromium/commit/d5d79d881e74c6c8630f7d2f3affd4f656fdeb4e.patch";
-        hash = "sha256-1oy5WRvNzKuUTJkt8kULUqE4JU+EKEV1PB9QN8HF4SE=";
-      })
-    ]
     # Fix building with Rust 1.87+
     # https://issues.chromium.org/issues/407024458
     ++ lib.optionals (lib.versionOlder info.version "37") [
diff --git a/pkgs/development/tools/electron/use-rust-adler2.patch b/pkgs/development/tools/electron/use-rust-adler2.patch
deleted file mode 100644
index 7a7bdacecd3d..000000000000
--- a/pkgs/development/tools/electron/use-rust-adler2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
-index 6b996aa1fe3865187d02c017e56c0918bcc9b8f4..68b085be200fa4f116aa709b9157c4d2efdf7d6a 100644
---- a/build/rust/std/BUILD.gn
-+++ b/build/rust/std/BUILD.gn
-@@ -89,7 +89,7 @@ if (toolchain_has_rust) {
-     # These are no longer present in the Windows toolchain.
-     stdlib_files += [
-       "addr2line",
--      "adler",
-+      "adler2",
-       "gimli",
-       "libc",
-       "memchr",

From fe6d429d05dac33632f48044f6c8cc4eceff7f4c Mon Sep 17 00:00:00 2001
From: Philipp Jungkamp <p.jungkamp@gmx.net>
Date: Tue, 19 Aug 2025 12:25:42 +0200
Subject: [PATCH 1992/3724] gir-rs: 0.19.0 -> 0.21.0

Diff: https://github.com/gtk-rs/gir/compare/0.19.0...0.21.0
---
 pkgs/by-name/gi/gir-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gir-rs/package.nix b/pkgs/by-name/gi/gir-rs/package.nix
index cb3a90c84cdf..d2f49f131d73 100644
--- a/pkgs/by-name/gi/gir-rs/package.nix
+++ b/pkgs/by-name/gi/gir-rs/package.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "0.19.0";
+  version = "0.21.0";
 in
 rustPlatform.buildRustPackage {
   pname = "gir";
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage {
     owner = "gtk-rs";
     repo = "gir";
     rev = version;
-    sha256 = "sha256-GAAK4ej16e5/sjnPOVWs4ul1H9sqa+tDE8ky9tbB9No=";
+    sha256 = "sha256-fjfTB621DwnCRXTsoGxISk+4XblMbjX5dzY+M8uDZ80=";
   };
 
-  cargoHash = "sha256-ObEXOaEdwJpaLJDkcSmAK86P7E6y0eUQQHFpX4hsuog=";
+  cargoHash = "sha256-wT09qXGx4+oJ9MhZqpG9jZ1yMYT/JJ2bJ6z1CT7wqUQ=";
 
   postPatch = ''
     rm build.rs

From 47729d6ab91f6eaba6242aef5812cbb556dbed22 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 18 Jun 2025 11:39:51 +0000
Subject: [PATCH 1993/3724] fcitx5: 5.1.12 -> 5.1.13

Diff: https://github.com/fcitx/fcitx5/compare/5.1.12...5.1.13
---
 pkgs/tools/inputmethods/fcitx5/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index aa1d4beea88d..eebce1a74d79 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -12,7 +12,6 @@
   pango,
   expat,
   fribidi,
-  fmt,
   wayland,
   systemd,
   wayland-protocols,
@@ -46,13 +45,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "fcitx5";
-  version = "5.1.12";
+  version = "5.1.13";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-Jk7YY6nrY1Yn9KeNlRJbMF/fCMIlUVg/Elt7SymlK84=";
+    hash = "sha256-nqJrdlHR9wyRAAxolzgTjbxFzKvceLy+bscEyvNsXhs=";
   };
 
   prePatch = ''
@@ -69,7 +68,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     expat
-    fmt
     isocodes
     cairo
     enchant

From fbdda4b27a35c4a6feb8d3984b19a224858c4276 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 18 Jun 2025 11:39:55 +0000
Subject: [PATCH 1994/3724] fcitx5-anthy: 5.1.6 -> 5.1.7

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix
index 2b73d1f179c8..40fca5e8278a 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-anthy";
-  version = "5.1.6";
+  version = "5.1.7";
 
   src = fetchurl {
     url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.zst";
-    hash = "sha256-XIgzYHiSE/PHNGUt68IZXKahPwYOZ3O0bq/KO1MrnCI=";
+    hash = "sha256-lY5GFbeIee7u1NsLbkYt6BvST9lidvZLpaylL0wE2+0=";
   };
 
   nativeBuildInputs = [

From 6aa960df73862a427326f574dc0204eb5522f730 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 18 Jun 2025 11:39:57 +0000
Subject: [PATCH 1995/3724] fcitx5-chewing: 5.1.7 -> 5.1.8

Diff: https://github.com/fcitx/fcitx5-chewing/compare/5.1.7...5.1.8
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
index 163c922359da..fec6db51d888 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-chewing";
-  version = "5.1.7";
+  version = "5.1.8";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-QL1rRMsaDP98as0zlmoDPoVnbqbKQFoUFSCX+j31JcM=";
+    hash = "sha256-On8lbZL7hyY399a/q6iCNkDvRljv3zirzEO1wIG+MNE=";
   };
 
   nativeBuildInputs = [

From 12e154eaeea810f82dc5b3c7d21f34dc8fe4946b Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 18 Jun 2025 11:40:00 +0000
Subject: [PATCH 1996/3724] fcitx5-chinese-addons: 5.1.8 -> 5.1.9

Diff: https://github.com/fcitx/fcitx5-chinese-addons/compare/5.1.8...5.1.9
---
 .../inputmethods/fcitx5/fcitx5-chinese-addons.nix   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
index 0229b679a69d..90919a8c05b6 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
@@ -20,10 +20,10 @@
 }:
 
 let
-  pyStrokeVer = "20121124";
+  pyStrokeVer = "20250329";
   pyStroke = fetchurl {
     url = "http://download.fcitx-im.org/data/py_stroke-${pyStrokeVer}.tar.gz";
-    hash = "sha256-jrEoqb+kOVLmfPL87h/RNMb0z9MXvC9sOKYV9etk4kg=";
+    hash = "sha256-wafKciXTYUq4M1P8gnUDAGqYBEd2IBj1N2BCXXtTA6Y=";
   };
   pyTableVer = "20121124";
   pyTable = fetchurl {
@@ -34,13 +34,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-chinese-addons";
-  version = "5.1.8";
+  version = "5.1.9";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-QO136EbUFxT7yA1Fs4DvV0CKpdCMw/s5s9sW3vRzGD8=";
+    hash = "sha256-xHLd7X9IdYTsVyqbghVzdC2i9AVipFHKRxP2Zqq7zGw=";
   };
 
   nativeBuildInputs = [
@@ -64,13 +64,10 @@ stdenv.mkDerivation rec {
     opencc
     qtwebengine
     fmt
+    qtbase
   ]
   ++ lib.optional luaSupport fcitx5-lua;
 
-  cmakeFlags = [
-    (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6"))
-  ];
-
   dontWrapQtApps = true;
 
   meta = with lib; {

From 1bea7d2965d44429715fb6e36eff345c775b0164 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 18 Jun 2025 11:40:03 +0000
Subject: [PATCH 1997/3724] fcitx5-configtool: 5.1.9 -> 5.1.10

Diff: https://github.com/fcitx/fcitx5-configtool/compare/5.1.9...5.1.10
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
index 7c424bad855f..f0e1482b8579 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
@@ -30,19 +30,18 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-configtool";
-  version = "5.1.9";
+  version = "5.1.10";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-x4DhPxiwPR16xQpBFnJ1DiU435BHOOs6pFj+zJQXFUI=";
+    hash = "sha256-Py2UDBQRqvT7kwZeQIXKrIjGAbOjjxEyEfO5tdtizW4=";
   };
 
   cmakeFlags = [
     (lib.cmakeBool "KDE_INSTALL_USE_QT_SYS_PATHS" true)
     (lib.cmakeBool "ENABLE_KCM" kcmSupport)
-    (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6"))
   ];
 
   nativeBuildInputs = [

From 21421ab5f4ca0637a7cc7c3cdc6eb6be72b29221 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 18 Jun 2025 11:40:08 +0000
Subject: [PATCH 1998/3724] fcitx5-hangul: 5.1.6 -> 5.1.7

Diff: https://github.com/fcitx/fcitx5-hangul/compare/5.1.6...5.1.7
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
index 61ac278d0239..71c46f893bc0 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-hangul";
-  version = "5.1.6";
+  version = "5.1.7";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-WTTMW86KsrncfDHttri2eSA0bp/Vm4QVyl9tWkJn00E=";
+    hash = "sha256-66VW/hzKMVwXd7ktPQHrVbsWazKedS+/giTLIh5fkwo=";
   };
 
   nativeBuildInputs = [

From 9786f37a36652a9ead9c809ade26256775aab098 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 18 Jun 2025 11:40:10 +0000
Subject: [PATCH 1999/3724] fcitx5-lua: 5.0.14 -> 5.0.15

Diff: https://github.com/fcitx/fcitx5-lua/compare/5.0.14...5.0.15
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
index 4a6b3dc7268b..ef6e52cba9cf 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "fcitx5-lua";
-  version = "5.0.14";
+  version = "5.0.15";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-7FBUOsaKr9cuEaqd4dqnAGL5sd3RF+qV6GEkOUQ1/k4=";
+    hash = "sha256-BhsckLi6FSrRw+QZ8pTEgjV4BaTKSKAJtmcRCFoOUwU=";
   };
 
   nativeBuildInputs = [

From 7ad806d6b25fb9f029c4bc1c38b33a82ba1cd987 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 18 Jun 2025 11:40:13 +0000
Subject: [PATCH 2000/3724] fcitx5-m17n: 5.1.3 -> 5.1.4

Diff: https://github.com/fcitx/fcitx5-m17n/compare/5.1.3...5.1.4
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
index 7eaaa0fc818d..5b67a02e4689 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
@@ -9,19 +9,18 @@
   m17n_lib,
   m17n_db,
   gettext,
-  fmt,
   nixosTests,
 }:
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-m17n";
-  version = "5.1.3";
+  version = "5.1.4";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-kHMCMsJ8+rI0AtS9zEE5knGvKALhgfmgS8lC/CTmYs0=";
+    hash = "sha256-TJMJGjO9V6EOzxt6Z7rwOfIQWK38XolDhUKbjbNUGhA=";
   };
 
   nativeBuildInputs = [
@@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
     fcitx5
     m17n_db
     m17n_lib
-    fmt
   ];
 
   passthru.tests = {

From cec68a0f528c1eb4cdb9fedaada9747000d9e944 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 18 Jun 2025 11:40:15 +0000
Subject: [PATCH 2001/3724] libsForQt5.fcitx5-qt: 5.1.9 -> 5.1.10

Diff: https://github.com/fcitx/fcitx5-qt/compare/5.1.9...5.1.10
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
index f8c7d6742d19..0a7564adfbfc 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "fcitx5-qt${majorVersion}";
-  version = "5.1.9";
+  version = "5.1.10";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-qt";
     rev = version;
-    hash = "sha256-cOCLPsWRcwukGCKAYHrZSRUYlmfYxdyspX5Y0rqbD2w=";
+    hash = "sha256-JhmaAAJ1fevCPItVnneUCAalnDDaCjjkAl9QRhSkBk4=";
   };
 
   postPatch = ''

From 92f39ace7f374e1e5d8dd74e451eb17ca484af7d Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 18 Jun 2025 11:40:19 +0000
Subject: [PATCH 2002/3724] fcitx5-rime: 5.1.10 -> 5.1.11

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
index 323cf54a0ff4..43872c8b4f67 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-rime";
-  version = "5.1.10";
+  version = "5.1.11";
 
   src = fetchurl {
     url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.zst";
-    hash = "sha256-ACW79fLgrS+Qv8YJjGr4WldTJsnnGhC0WWf8ia9khYk=";
+    hash = "sha256-cc/B99tdVVWnvdl7dYYQlIvk8F2xXUOr6sF36yxQZfY=";
   };
 
   cmakeFlags = [

From 647e6ec0ef7178f4f460fb042465942a1f4043a6 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 18 Jun 2025 11:40:21 +0000
Subject: [PATCH 2003/3724] fcitx5-skk: 5.1.6 -> 5.1.7

Diff: https://github.com/fcitx/fcitx5-skk/compare/5.1.6...5.1.7
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
index 66ba434f4090..e85712781d50 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-skk";
-  version = "5.1.6";
+  version = "5.1.7";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-1gfR0wXBXM6Gttwldg2vm8DUUW4OciqKMQkpFQHqLoE=";
+    hash = "sha256-WMkcZSocanhWMn9kiWyB07jEW4x84G07kAYvn5heenc=";
   };
 
   nativeBuildInputs = [
@@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_QT" enableQt)
-    (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6"))
     "-DSKK_DEFAULT_PATH=${skkDictionaries.l}/share/skk/SKK-JISYO.L"
   ];
 

From 0729c916a2f7f6ae44687d9731df1b2817aac66a Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 18 Jun 2025 11:40:32 +0000
Subject: [PATCH 2004/3724] fcitx5-unikey: 5.1.6 -> 5.1.7

Diff: https://github.com/fcitx/fcitx5-unikey/compare/5.1.6...5.1.7
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
index c6b43043956b..f1d4f6523e43 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-unikey";
-  version = "5.1.6";
+  version = "5.1.7";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-unikey";
     rev = version;
-    hash = "sha256-hx3GXoloO3eQP9yhLY8v1ahwvOTCe5XcBey+ZbReRjE=";
+    hash = "sha256-ve+vu/bK3GYgjn9KxuOsFZFi9eymi1TFlzUHu4fJAkk=";
   };
 
   nativeBuildInputs = [
@@ -33,10 +33,6 @@ stdenv.mkDerivation rec {
     fcitx5-qt
   ];
 
-  cmakeFlags = [
-    (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6"))
-  ];
-
   dontWrapQtApps = true;
 
   meta = with lib; {

From 7e14cfe4298145850cbd5b988eb06e490c2e8b4b Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Fri, 20 Jun 2025 11:34:17 +0000
Subject: [PATCH 2005/3724] fcitx5: 5.1.13 -> 5.1.14

Diff: https://github.com/fcitx/fcitx5/compare/5.1.13...5.1.14
---
 pkgs/tools/inputmethods/fcitx5/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index eebce1a74d79..2430a7eb7f68 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -45,13 +45,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "fcitx5";
-  version = "5.1.13";
+  version = "5.1.14";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-nqJrdlHR9wyRAAxolzgTjbxFzKvceLy+bscEyvNsXhs=";
+    hash = "sha256-wLJZyoWjf02+m8Kw+IcfbZY2NnjMGtCWur2+w141eS4=";
   };
 
   prePatch = ''

From 366abee4ca45c447b8350045e4b8b27e70128de4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 19 Aug 2025 08:41:38 -0300
Subject: [PATCH 2006/3724] qogir-theme: 2024-05-22 -> 2025-08-17

Diff: https://github.com/vinceliuice/qogir-theme/compare/2024-05-22...2025-08-17
---
 pkgs/by-name/qo/qogir-theme/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qo/qogir-theme/package.nix b/pkgs/by-name/qo/qogir-theme/package.nix
index 9375c20371cb..0e0c2c471735 100644
--- a/pkgs/by-name/qo/qogir-theme/package.nix
+++ b/pkgs/by-name/qo/qogir-theme/package.nix
@@ -32,13 +32,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "a
   stdenv.mkDerivation
   rec {
     inherit pname;
-    version = "2024-05-22";
+    version = "2025-08-17";
 
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = "qogir-theme";
       rev = version;
-      sha256 = "Q9DWBzaLZjwXsYRa/oDIrccypO3TCbSRXTkbXWRmm70=";
+      hash = "sha256-LS1BE2jR08/JW2+rixYhTmctAfK2yZVWIE4QnAX9PDQ=";
     };
 
     nativeBuildInputs = [

From 9efa8b08e9bc16d64fc1be62c00e09eb481fd20b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 12:07:46 +0000
Subject: [PATCH 2007/3724] gambit-project: 16.3.0 -> 16.3.1

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

diff --git a/pkgs/by-name/ga/gambit-project/package.nix b/pkgs/by-name/ga/gambit-project/package.nix
index 72e5d77136c3..2cd0a7b0ffdd 100644
--- a/pkgs/by-name/ga/gambit-project/package.nix
+++ b/pkgs/by-name/ga/gambit-project/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gambit-project";
-  version = "16.3.0";
+  version = "16.3.1";
 
   src = fetchFromGitHub {
     owner = "gambitproject";
     repo = "gambit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-waRGnkykkKqOs7G1nlkL+eO4QRmerhGrZ7wjRgBsZc0=";
+    hash = "sha256-yGA8w7Mz8D96Cci+LO1KUvTZDVc9V5b/0t7Q+UndHXI=";
   };
 
   nativeBuildInputs = [ autoreconfHook ] ++ lib.optional withGui wxGTK31;

From 249a0472250b52bb15a69b22077c147a9c69a584 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 12:10:59 +0000
Subject: [PATCH 2008/3724] python3Packages.ansible: 11.8.0 -> 11.9.0

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

diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index a9a252287268..55d6ef113a9b 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -25,7 +25,7 @@
 
 let
   pname = "ansible";
-  version = "11.8.0";
+  version = "11.9.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -35,7 +35,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KOoDLHfzRLuOpNfTn5pdTpNebItgg2yMiii5z2ya2xo=";
+    hash = "sha256-UoylpAjxHPH+oA2up1cOaNQOFnvji5DBGafLRXKeSSE=";
   };
 
   # we make ansible-core depend on ansible, not the other way around,

From 2a4ab64fe137117b8c755ae6d3d6e1921dc8d363 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 12:35:28 +0000
Subject: [PATCH 2009/3724] sirikali: 1.8.2 -> 1.8.3

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

diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix
index 0028fa166a03..1cbe6c719db9 100644
--- a/pkgs/by-name/si/sirikali/package.nix
+++ b/pkgs/by-name/si/sirikali/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sirikali";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "mhogomchungu";
     repo = "sirikali";
     rev = version;
-    hash = "sha256-rfmWtbPYtkaGemeStMWwA6JllOkDiHMftSfmirtAOEQ=";
+    hash = "sha256-phZvytma4PsH4RZxWDORyall2qjS9rdLzUQId5IU6qY=";
   };
 
   buildInputs = [

From ce750b1f34190be596a1ac91234aeee498a73fa8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 8 Aug 2025 18:57:06 +0200
Subject: [PATCH 2010/3724] triton-llvm: 21.0-git -> 21.0.0-unstable-2025-06-10

---
 pkgs/by-name/tr/triton-llvm/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix
index f04d00f6dcd8..b9f1a112e820 100644
--- a/pkgs/by-name/tr/triton-llvm/package.nix
+++ b/pkgs/by-name/tr/triton-llvm/package.nix
@@ -65,7 +65,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "triton-llvm";
-  version = "21.0.0-git"; # See https://github.com/llvm/llvm-project/blob/main/cmake/Modules/LLVMVersion.cmake
+  version = "21.0.0-unstable-2025-06-10"; # See https://github.com/llvm/llvm-project/blob/main/cmake/Modules/LLVMVersion.cmake
 
   outputs = [
     "out"
@@ -81,8 +81,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "llvm-project";
-    rev = "a66376b0dc3b2ea8a84fda26faca287980986f78";
-    hash = "sha256-7xUPozRerxt38UeJxA8kYYxOQ4+WzDREndD2+K0BYkU=";
+    rev = "8957e64a20fc7f4277565c6cfe3e555c119783ce";
+    hash = "sha256-ljdwHPLGZv72RBPBg5rs7pZczsB+WJhdCeHJxoi4gJQ=";
   };
 
   nativeBuildInputs = [

From 657a0becc4ebb3d4648dff8e916def7b240301a2 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Tue, 19 Aug 2025 05:55:55 -0700
Subject: [PATCH 2011/3724] gogh: fix dependencies

Ensure `gogh` works in `nix-shell --pure`
---
 pkgs/by-name/go/gogh/package.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/go/gogh/package.nix b/pkgs/by-name/go/gogh/package.nix
index e33a87955f32..be3588332e8d 100644
--- a/pkgs/by-name/go/gogh/package.nix
+++ b/pkgs/by-name/go/gogh/package.nix
@@ -2,11 +2,12 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
-  makeWrapper,
+  makeBinaryWrapper,
   ncurses,
   bashNonInteractive,
   python3,
   rustpython,
+  ps,
   nix-update-script,
 }:
 
@@ -49,14 +50,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  propagatedUserEnvPkgs = [
+    bashNonInteractive
+    rustpython
+    ncurses
+    ps
+  ];
 
   installPhase = ''
     runHook preInstall
 
     mkdir --parents $out/lib
     cp --recursive {*.py,apply-colors.sh,installs,themes} $out/lib
-    install -Dm755 gogh.sh $out/bin/${finalAttrs.meta.mainProgram}
+    install -D gogh.sh $out/bin/${finalAttrs.meta.mainProgram}
 
     runHook postInstall
   '';
@@ -64,9 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   postInstall = ''
     wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \
       --set SCRIPT_PATH "$out/lib" \
-      --prefix PATH : "${lib.getBin bashNonInteractive}/bin" \
-      --prefix PATH : "${lib.getBin rustpython}/bin" \
-      --prefix PATH : "${lib.getBin ncurses}/bin" \
+      --suffix PATH : "${lib.makeBinPath finalAttrs.propagatedUserEnvPkgs}" \
       --prefix PATH : "${pythonEnv}/bin" \
       --prefix PYTHONPATH : "${pythonEnv}/${pythonEnv.sitePackages}"
   '';

From 78a46c0051144802961ac5bbbb4804a19fa513ee Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 8 Aug 2025 18:51:59 +0200
Subject: [PATCH 2012/3724] python3Packages.triton: 3.3.1 -> 3.4.0

Diff: https://github.com/triton-lang/triton/compare/v3.3.1...v3.4.0
---
 .../0003-nvidia-cudart-a-systempath.patch     | 29 +++-------
 .../0004-nvidia-allow-static-ptxas-path.patch | 27 +++++----
 .../python-modules/triton/default.nix         | 56 ++++++++++---------
 3 files changed, 51 insertions(+), 61 deletions(-)

diff --git a/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch b/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch
index 144d84e151fe..66a757c77466 100644
--- a/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch
+++ b/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch
@@ -1,15 +1,5 @@
-From 6f92d54e5a544bc34bb07f2808d554a71cc0e4c3 Mon Sep 17 00:00:00 2001
-From: SomeoneSerge <else+aalto@someonex.net>
-Date: Sun, 13 Oct 2024 14:30:19 +0000
-Subject: [PATCH 3/3] nvidia: cudart a systempath
-
----
- third_party/nvidia/backend/driver.c  | 2 +-
- third_party/nvidia/backend/driver.py | 5 +++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
 diff --git a/third_party/nvidia/backend/driver.c b/third_party/nvidia/backend/driver.c
-index 44524da27..fbdf0d156 100644
+index ab24f7657..46dbaceb0 100644
 --- a/third_party/nvidia/backend/driver.c
 +++ b/third_party/nvidia/backend/driver.c
 @@ -1,4 +1,4 @@
@@ -19,28 +9,25 @@ index 44524da27..fbdf0d156 100644
  #include <stdbool.h>
  #define PY_SSIZE_T_CLEAN
 diff --git a/third_party/nvidia/backend/driver.py b/third_party/nvidia/backend/driver.py
-index 30fbadb2a..65c0562ed 100644
+index 47544bd8e..d57c6a70f 100644
 --- a/third_party/nvidia/backend/driver.py
 +++ b/third_party/nvidia/backend/driver.py
-@@ -10,7 +10,8 @@ from triton.backends.compiler import GPUTarget
+@@ -12,7 +12,8 @@ from triton.backends.compiler import GPUTarget
  from triton.backends.driver import GPUDriver
  
  dirname = os.path.dirname(os.path.realpath(__file__))
--include_dir = [os.path.join(dirname, "include")]
+-include_dirs = [os.path.join(dirname, "include")]
 +import shlex
-+include_dir = [*shlex.split("@cudaToolkitIncludeDirs@"), os.path.join(dirname, "include")]
++include_dirs = [*shlex.split("@cudaToolkitIncludeDirs@"), os.path.join(dirname, "include")]
  libdevice_dir = os.path.join(dirname, "lib")
  libraries = ['cuda']
  
-@@ -149,7 +150,7 @@ def make_launcher(constants, signature, ids):
-     # generate glue code
-     params = [i for i in signature.keys() if i not in constants]
+@@ -256,7 +257,7 @@ def make_launcher(constants, signature, tensordesc_meta):
+     params = [f"&arg{i}" for i, ty in signature.items() if ty != "constexpr"]
+     params.append("&global_scratch")
      src = f"""
 -#include \"cuda.h\"
 +#include <cuda.h>
  #include <stdbool.h>
  #include <Python.h>
  #include <dlfcn.h>
--- 
-2.46.0
-
diff --git a/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch b/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch
index 188133fe1408..47c1380af85a 100644
--- a/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch
+++ b/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch
@@ -1,14 +1,13 @@
-diff --git a/third_party/nvidia/backend/compiler.py b/third_party/nvidia/backend/compiler.py
-index 960334744..269e22e6e 100644
---- a/third_party/nvidia/backend/compiler.py
-+++ b/third_party/nvidia/backend/compiler.py
-@@ -38,6 +38,9 @@ def _path_to_binary(binary: str):
-         os.path.join(os.path.dirname(__file__), "bin", binary),
-     ]
- 
-+    import shlex
-+    paths.extend(shlex.split("@nixpkgsExtraBinaryPaths@"))
-+
-     for path in paths:
-         if os.path.exists(path) and os.path.isfile(path):
-             result = subprocess.check_output([path, "--version"], stderr=subprocess.STDOUT)
+diff --git a/python/triton/knobs.py b/python/triton/knobs.py
+index 30804b170..c6a3a737d 100644
+--- a/python/triton/knobs.py
++++ b/python/triton/knobs.py
+@@ -203,6 +203,8 @@ class env_nvidia_tool(env_base[str, NvidiaTool]):
+             # accessible.
+             self.default(),
+         ]
++        import shlex
++        paths.extend(shlex.split("@nixpkgsExtraBinaryPaths@"))
+         for path in paths:
+             if not path or not os.access(path, os.X_OK):
+                 continue
diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix
index 680e8321af79..ab0db19f9bca 100644
--- a/pkgs/development/python-modules/triton/default.nix
+++ b/pkgs/development/python-modules/triton/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "triton";
-  version = "3.3.1";
+  version = "3.4.0";
   pyproject = true;
 
   # Remember to bump triton-llvm as well!
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "triton-lang";
     repo = "triton";
     tag = "v${version}";
-    hash = "sha256-XLw7s5K0j4mfIvNMumlHkUpklSzVSTRyfGazZ4lLpn0=";
+    hash = "sha256-78s9ke6UV7Tnx3yCr0QZcVDqQELR4XoGgJY7olNJmjk=";
   };
 
   patches = [
@@ -60,20 +60,28 @@ buildPythonPackage rec {
     })
   ];
 
-  postPatch = ''
+  postPatch =
+    # Avoid downloading dependencies remove any downloads
+    ''
+      substituteInPlace setup.py \
+        --replace-fail "[get_json_package_info()]" "[]" \
+        --replace-fail "[get_llvm_package_info()]" "[]" \
+        --replace-fail 'yield ("triton.profiler", "third_party/proton/proton")' 'pass' \
+        --replace-fail "curr_version.group(1) != version" "False"
+    ''
     # Use our `cmakeFlags` instead and avoid downloading dependencies
-    # remove any downloads
-    substituteInPlace python/setup.py \
-      --replace-fail "[get_json_package_info()]" "[]"\
-      --replace-fail "[get_llvm_package_info()]" "[]"\
-      --replace-fail 'packages += ["triton/profiler"]' "pass"\
-      --replace-fail "curr_version.group(1) != version" "False"
-
+    + ''
+      substituteInPlace setup.py \
+        --replace-fail \
+          "cmake_args.extend(thirdparty_cmake_args)" \
+          "cmake_args.extend(thirdparty_cmake_args + os.environ.get('cmakeFlags', \"\").split())"
+    ''
     # Don't fetch googletest
-    substituteInPlace cmake/AddTritonUnitTest.cmake \
-      --replace-fail "include(\''${PROJECT_SOURCE_DIR}/unittest/googletest.cmake)" ""\
-      --replace-fail "include(GoogleTest)" "find_package(GTest REQUIRED)"
-  '';
+    + ''
+      substituteInPlace cmake/AddTritonUnitTest.cmake \
+        --replace-fail "include(\''${PROJECT_SOURCE_DIR}/unittest/googletest.cmake)" ""\
+        --replace-fail "include(GoogleTest)" "find_package(GTest REQUIRED)"
+    '';
 
   build-system = [ setuptools ];
 
@@ -92,6 +100,10 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ];
 
+  cmakeFlags = [
+    (lib.cmakeFeature "LLVM_SYSPATH" "${llvm}")
+  ];
+
   buildInputs = [
     gtest
     libxml2.dev
@@ -113,19 +125,11 @@ buildPythonPackage rec {
     "-Wno-stringop-overread"
   ];
 
-  # Avoid GLIBCXX mismatch with other cuda-enabled python packages
-  preConfigure = ''
+  preConfigure =
     # Ensure that the build process uses the requested number of cores
-    export MAX_JOBS="$NIX_BUILD_CORES"
-
-    # Upstream's github actions patch setup.cfg to write base-dir. May be redundant
-    echo "
-    [build_ext]
-    base-dir=$PWD" >> python/setup.cfg
-
-    # The rest (including buildPhase) is relative to ./python/
-    cd python
-  '';
+    ''
+      export MAX_JOBS="$NIX_BUILD_CORES"
+    '';
 
   env = {
     TRITON_BUILD_PROTON = "OFF";

From 11c71fe8a18a46f206003d5c42d5156241e7fcc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 13:18:50 +0000
Subject: [PATCH 2013/3724] python3Packages.litellm: 1.74.9 -> 1.75.5

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

diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix
index 24f2bc2d042c..96917d8b1742 100644
--- a/pkgs/development/python-modules/litellm/default.nix
+++ b/pkgs/development/python-modules/litellm/default.nix
@@ -46,7 +46,7 @@
 
 buildPythonPackage rec {
   pname = "litellm";
-  version = "1.74.9";
+  version = "1.75.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     owner = "BerriAI";
     repo = "litellm";
     tag = "v${version}-stable";
-    hash = "sha256-SGZwt2jzAQbOMlvudqPWat281su6OwT7JG2CNSMjL3A=";
+    hash = "sha256-VedQ0cNOf9vUFF7wjT7WOsCfTesIvzhudDfGnBTXO3E=";
   };
 
   build-system = [ poetry-core ];

From 976ca8e76238b5681eb7acd9223ee8a44af5b706 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Tue, 19 Aug 2025 22:34:39 +0900
Subject: [PATCH 2014/3724] pixi: 0.52.0 -> 0.53.0

https://github.com/prefix-dev/pixi/releases/tag/v0.53.0

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/pi/pixi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix
index 98224216e377..0211bdc9c551 100644
--- a/pkgs/by-name/pi/pixi/package.nix
+++ b/pkgs/by-name/pi/pixi/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pixi";
-  version = "0.52.0";
+  version = "0.53.0";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "pixi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zmFoIoyTYq/xqPNBuy90aK/Ao1DGx+3Jb1zzatNY7+Q=";
+    hash = "sha256-cWoepvnolVyUyDlYakxQLNkOOP9ZbBwe5EaWbYTz+Gs=";
   };
 
-  cargoHash = "sha256-FWjZiBMSUFBIi+Sx5FTp2UZa12b+pmtx1eqVETHQWEQ=";
+  cargoHash = "sha256-3Sd+EjpSYbexmnUAwLps/Hrj7anpyurbzZlVs2hZk4E=";
 
   nativeBuildInputs = [
     pkg-config

From 7f9721effff0f4d24a91166fb5fc5dd5182f559b Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Tue, 19 Aug 2025 22:38:23 +0900
Subject: [PATCH 2015/3724] snyk: 1.1298.2 -> 1.1298.3

https://github.com/snyk/cli/releases/tag/v1.1298.3

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/sn/snyk/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/snyk/package.nix b/pkgs/by-name/sn/snyk/package.nix
index 3a545293f702..35ba833fca7c 100644
--- a/pkgs/by-name/sn/snyk/package.nix
+++ b/pkgs/by-name/sn/snyk/package.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "1.1298.2";
+  version = "1.1298.3";
 in
 buildNpmPackage {
   pname = "snyk";
@@ -18,10 +18,10 @@ buildNpmPackage {
     owner = "snyk";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-8VnbXxvz5mWWMq6sjffshMbHBf2H6s/xmPbQZsZC/4A=";
+    hash = "sha256-hn9SheBMFmtcIIo9oKMQ8dFTuFGeUby9sLZBIkaTzBM=";
   };
 
-  npmDepsHash = "sha256-7fHehEKjNNRdRk9+kARzn75G0r1pse7ULn/Oz6mQRKM=";
+  npmDepsHash = "sha256-jJ72jIg04iRBxppji9iRGBBmkzP6fjAUj0W2m+hwRSI=";
 
   postPatch = ''
     substituteInPlace package.json \

From 838bc2ccdc90ba07beece576a9c18a33486df3f5 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 19 Aug 2025 15:56:14 +0200
Subject: [PATCH 2016/3724] ipscan: 3.9.1 -> 3.9.2

---
 pkgs/by-name/ip/ipscan/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ip/ipscan/package.nix b/pkgs/by-name/ip/ipscan/package.nix
index d53918f86823..9180269a4e4c 100644
--- a/pkgs/by-name/ip/ipscan/package.nix
+++ b/pkgs/by-name/ip/ipscan/package.nix
@@ -12,13 +12,13 @@
   glib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ipscan";
-  version = "3.9.1";
+  version = "3.9.2";
 
   src = fetchurl {
-    url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_amd64.deb";
-    hash = "sha256-UPkUwZV3NIeVfL3yYvqOhm4X5xW+40GOlZGy8WGhYmk=";
+    url = "https://github.com/angryip/ipscan/releases/download/${finalAttrs.version}/ipscan_${finalAttrs.version}_amd64.deb";
+    hash = "sha256-5H6QCT7Z3EOJks/jLBluTCgJbqpRMW5iheds9nl4ktU=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/share
-    cp usr/lib/ipscan/ipscan-linux64-${version}.jar $out/share/${pname}-${version}.jar
+    cp usr/lib/ipscan/ipscan-linux64-${finalAttrs.version}.jar $out/share/${finalAttrs.pname}-${finalAttrs.version}.jar
 
     makeWrapper ${jre}/bin/java $out/bin/ipscan \
       --prefix LD_LIBRARY_PATH : "$out/lib/:${
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
           glib
         ]
       }" \
-      --add-flags "-Xmx256m -cp $out/share/${pname}-${version}.jar:${swt}/jars/swt.jar net.azib.ipscan.Main"
+      --add-flags "-Xmx256m -cp $out/share/${finalAttrs.pname}-${finalAttrs.version}.jar:${swt}/jars/swt.jar net.azib.ipscan.Main"
 
     mkdir -p $out/share/applications
     cp usr/share/applications/ipscan.desktop $out/share/applications/ipscan.desktop
@@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
     description = "Angry IP Scanner - fast and friendly network scanner";
     mainProgram = "ipscan";
     homepage = "https://angryip.org";
-    downloadPage = "https://github.com/angryip/ipscan/releases/tag/${version}";
-    changelog = "https://github.com/angryip/ipscan/blob/${version}/CHANGELOG";
+    downloadPage = "https://github.com/angryip/ipscan/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/angryip/ipscan/blob/${finalAttrs.version}/CHANGELOG";
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.gpl2Only;
     platforms = [ "x86_64-linux" ];
@@ -65,4 +65,4 @@ stdenv.mkDerivation rec {
       totoroot
     ];
   };
-}
+})

From 954b774bb5eba412f1e930f9501721b866fab58b Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 12 Aug 2025 22:26:42 +0000
Subject: [PATCH 2017/3724] dotnetCorePackages.dotnet_10.vmr: 10.0.0-preview.6
 -> 10.0.0-preview.7

---
 .../compilers/dotnet/10/bootstrap-sdk.nix     | 376 +++++++++---------
 .../development/compilers/dotnet/10/deps.json |  48 +--
 .../compilers/dotnet/10/release-info.json     |   6 +-
 .../compilers/dotnet/10/release.json          |  14 +-
 ...-size-estimation-when-bundling-symli.patch |  47 +++
 ...x-missing-libunwind-symbols-on-linux.patch |  42 ++
 ...ernals-overwrite-rather-than-append-.patch |  26 --
 pkgs/development/compilers/dotnet/vmr.nix     |  27 +-
 8 files changed, 328 insertions(+), 258 deletions(-)
 create mode 100644 pkgs/development/compilers/dotnet/bundler-fix-file-size-estimation-when-bundling-symli.patch
 create mode 100644 pkgs/development/compilers/dotnet/mscordac-fix-missing-libunwind-symbols-on-linux.patch
 delete mode 100644 pkgs/development/compilers/dotnet/source-build-externals-overwrite-rather-than-append-.patch

diff --git a/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix
index f9f308809983..2c89bde437d9 100644
--- a/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix
@@ -11,28 +11,28 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "10.0.0-preview.6.25358.103";
-      hash = "sha512-DF9lEJjcAAcQtFB9hLXHbQaLW82nb4xlG9MKfbqpZzIQfidqcAuE2GOug/q6NNDcw+N88J0p0jKPz+k3qKmAKw==";
+      version = "10.0.0-preview.7.25380.108";
+      hash = "sha512-ZedqhbGvDx8Ajn1N9SRKq4q/m7rIQdPmcvQS7WOaijpqqjNa4P4zTd1kx+/kb6a5FJ6thD6yt/hEADTGpUpflg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "10.0.0-preview.6.25358.103";
-      hash = "sha512-SV9nyI2/sg7Rh3f01eDScmjKYuuzI6xPX+iknl2zsecspqYBlWcPN1SvMDlaD/sK3GG5jl3hrM/GcOIqMpoFJA==";
+      version = "10.0.0-preview.7.25380.108";
+      hash = "sha512-OcQqR5UG3AFa0aQNIRTB3acRpQ+OhuF8ZpLIQM3xp+egvzzKRP20jja/gWhngIVtEA012XxLiNxJrHhzWhtLhQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "10.0.0-preview.6.25358.103";
-      hash = "sha512-npMO7GioGKn0FigriTOCsi4HgSENnW9YRJYXhyFtCGLR7b71FDLVY8nHemM0XYm9lI0tH23N1EwcDFyzHTDuNA==";
+      version = "10.0.0-preview.7.25380.108";
+      hash = "sha512-1UT2fr9kFvdpRb3+h3dTmGTnhKTvGKpYFRQuZUD8ukmaQ9ABhnXp35E8GJoA6d6pOERiRnhimzrVg/X3B4znUA==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "10.0.0-preview.6.25358.103";
-      hash = "sha512-zDr+tWvnlB9iEwnAlfa3PW/S1/0nw1lhvXBWghgE6o9O5sxc35V3aobPAs+Cm6DTN+lvNMouhjPt6pn2t4PvQQ==";
+      version = "10.0.0-preview.7.25380.108";
+      hash = "sha512-Eekoq6ATo+jeIsK0GafnGK8XkdjKtdOVT7deD1TWo04/nt0KV7nOmBUOhwUKY1sBsjvTQvOoDthn505f74N3Vg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "10.0.0-preview.6.25358.103";
-      hash = "sha512-W1yNC4+7vV1XPSXJx7HFsvFCi1C1XZ7QVlfbu+xq4pt1/0cVJGZaRlbwBNUAv4PAdg2JGM4VYtcr3ZreOJ1hzA==";
+      version = "10.0.0-preview.7.25380.108";
+      hash = "sha512-pX4P7NG1jHIRJrbHrVP/MvDyA89o7HeuKucToiIH6flQ5ixTntZJupIW5qg2wsScJOltfP3A7j/w6MTRA9dHOQ==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-IKe0SROzAWJiFZyh2KVmTU5i8ddcEqvr5NIr+3RfzvBEYa3SNBbqy1W1x0TR2aEvYgSqxKSohhs9YVSDlrlx0Q==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-ekrR6F7cC48jWc0+Fyv3emOc5bkuv+yvKg2ZDjuv9gRf6e8zWGG6PkXKkPuo8sxHacPucgc1bIibVgVGJi20VA==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-5h33Uf2vFcjVkeNRD41YiERegQ7twv6sljYAMtz/kIHcIk90aB0ztZoKXXVi+vNxma7q/f5oPxhzUVidZ3vw8g==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-QUg7nZopW/0+Lnk4VeNHF3Ov3I6IuqsDSbvkeEDWjWyNXyOnJzDErKN3d5p6jWdmc3jjndyOw1137vaOKV5apA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-yImkb4fnUJIXR2Me5N8eOrX7w9+u8SAAIp8QtlWdZ6WptjG6PUByTs2hjTfX/aVKjO4p1dmKTaWJ0qYR6yuDEQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-k9W3fq0DjcbjxuveOQd1ou8fsHhNH/zHayPE9b1VRj2CijLx8krGGKkP3gUR7jLbOE+o9/Xln7cEsWzRBb9tdg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-1FIBZLtWKIxULrRjLrldz6kwVSoAIf72kXKE0WgXECVez98NbQXLEM90hfpHj0LcQfzqOoP9kY48yRSoXp+rXg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-+zsgGnlZS6MdL/uyvAQAN0KAc8Vk1qT8ylHCi+iwUXqwslSGtZQku+qGvkd7hjMMnEbnSa5j7xJY4PNGDbco4Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-eMokXhxbTVJUHwlAhM1dVZmjljs/s1nRfvrJ0AeJaTbetXnD63Fd6sQeMmw/EifYnpdtxr/gIJRHLPsuLNDcAA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-+LG/u+Jp6b3Oyud1QYP3nph1uqtx4rhPbeH65leIMSFQg6bB8Jd9g4hNwESllHd6iKpKP7Sp17VxLKynzxwHDw==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-qw5Xb2+l14q+2OSesjwGn3gHpdFj0wUeA3RLEUaljzW8FF5HD78B6t1YuhFJhcENuDNAv5d8Fcy4N1mG/RQZUw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-BE7hZwP4oZ5Xacmhjwc3Ciy0KJKOXwg9NJiBVzFv7xEJ7IqVceP7kAdMPsMNoojwz2KNs9gJdCOGOLtwyeTZyw==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-Etq6qbPIzEV8Z3+w0C1ibreDduKkAF1zZOGfvcBz3sjAC9sWs/qflxfKGZ7tBKhEV/A3vZWKNGyxYKnawCtC3g==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-oskWoBpDhGI4WBOJPFTBIirjUdSs7hvHKGuz8OQmrByyv8C3rY9jtt+sM45uqINoGNyYsgbUQkQlKFhIB+mT+Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-SINZNHzxrKbgD7VGAx9GDMIlMOmXSpqWIeLpmNpPTm2D7F+NfXv2lVLxLl0nLUAJ70ipI51HdHGyrKXTOaFO8g==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-+/apDtwjBvmEn40DJ4yPOYqCsgIfhrD/zPYY15A6ny5kN1n6uV8LgUce9vv2HatRsD4uOuepD2z22/TbB8GjLA==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-t2YTlMAHq+V8K8TnsFhUudCqiV5CElb/dk2tFmZ61Td4gyLY/iz+4q5lvpGAZOlCFddTtublSbIC3n4EH3liEQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-+uZHCjs+FlbFU2StjeANC3vvYjWd+6PlhIX0F8sHS60u3U9/HEi4JECQ0vhak5ODJCi+wktEKZQ53DwGAvPbJQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-lEaH55DO++s5EKEHfODZkF279HI5DROQgaTif93wcMg9mhL5kPHnLhi9S7qTMFKt+GQfmZWMlwZd+L6GVz+RVQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-mtm6VWoDGYg7qlqF6sFlf8LBEbGOL6ZCSoqzZ7hmDBy9UIe0AswL0d+AhsDOE5ewHifbK+vGqXeK83ZdL/1IRA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-zuh5p3Hq0ejcgbCe3IaVOj+mItbRve25QdIXaGirOfDuO2a5fGXSO8RtgFosw8ar2jBSG3qL6loMFqqgkiEuVA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-/X/ugPn9DMhWz26lDvuSlBqX/s56B7Sl/Qkd2/Jy5iYw64+9tOFo0Xh4kz0fF5nOj1H9RbKxIaNfPVc41rxvIQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-Ivl/uKKvVrgGxfbC8SSz5N1NZRi39PQ5ZXfsECiSsiNR2ls02Wy2Icy5mLRUGCFY4FMILAKsgfJRKejafqGxyA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-/SiUD5N7pwkJ4mK83CBkre6oOB76BTJ7lJUTDDw3t8F6HUJS+3i6Cx9sODd7BS7TXXA5ahql2gcfohVsaFsR9Q==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-zTiRlyK4ElT/MES3AX1bLRcuX3lY3NXlwL89YTyEjuHrqjCpxEbHfsoznqYd7zLAF1itzvNnxDkqDPoXat/zZA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-WKqXIohGOzMUpDOsAEpknxj93fSuTzSdP7X/Ud19dggmqwPKMIWN5NZpWlBLdyP8+NMwLyNM/aR4uCtNf7MT2A==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-sSi6F1x2UVJe5Jp8RbURsNGVxFFPyxq6P8ZlV6r9dimYM2KkDyEOtcZ0hHSOtmMU3rghzZYksvSKv7+9fAYUNA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-GQokK1ugeF0JQi0IfkyNDm5nIVCKpH6V8zSskBRSAH8O5U4iVImpDkqBg1icxUFIAaVyiMi6GJB0CkTD2cC+yQ==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-Qj4yn5t5k+lGY8dBPwh0jLQOXoilcVvwpmyxJp8LJHoOM8EmGjRoiCy68sRXGTQMt5d3iNIdV93rX+fXu20rlw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-X15A3yBhigC8T81Ut1Zqqay9HzfCjjwLh1QDbHL2XggIWiGzkDf4hSX7qnkbki12DdFZP5p0xDFiYsnEBTGNgg==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-b26YbRN+y0LrdVq32iV7gUmi8sY4vY+P8GvaqiPTcJBH20OSfrsvDhyM08qMs6hCDo17xL5hFdLt9BSBfqcrOw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-vNMheP+ysMxIiINElw4ebu7O8KHDz+l2dYTlP9zfBllo7eJW3XX0k7kOP0nYke78KFhheXu2JUHAAEZVhazOUA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-IoNNvrZ/pKBwn/XSvDp1saM2XHk1ZOKxrA4lDyrL10/s4IS8hRo/Yv3qs+ihWpwVStORW3lh0YIxQhMDHbMkzw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-478qsicUIxQcpq/UGGoNNLRbUldl34RRZqxDdRl1HqC2D4aUdCpR3MEU5vd0zcbHxkegfPfgQgsv6xfIt+k/Ww==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-/D+xqMtDuo8ji4FPJm5EsEORBGEsbcHHYIjZDiEHP7ltIexg/oOSwuyvepvV+mK46Q4uyQU9zuBVZaG5FdKU0Q==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-fDGfrQnqXasfMLIUs2xVvLNxWjN0w7HypZ22wYG0y8PkN8u3vpVIQz9tYgUgEXvxKpFLYq1L2EcxksY6reAWug==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-kEXLQCzNVAnwkQ58qiO7lUOuO6WJSMlNmnQxx5o1RTiMIoqrgfjMazn5bpL5DPeZjMhWcB4kary/3Vkj06xRtA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-WE52ljXg7k8/ry1wBJ7lqrKniEZgwpMtuf7m82tMtuc30k5X+1nAbOa2evezPgjsXrB3k78uertzT+GoSRX/fQ==";
       })
     ];
   };
@@ -160,361 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-z0RiU5O+4aelPS7+JYakKFXrmczOzTYp5sptrRoz8H2zM0Tbvwc7sX3pT2F5ZosBEaub37XJKrwSdvpdHoe6/w==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-TY4LXwPBf9d0vOpzCkV8Ze9e/Tnn4V07FkSctLB6Vc6XreNkVqEQcB1TuUQZOFc7pXBvpImRAD5mAfuLVNohDA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-CRQl1RVkbfaLnYOEO4ApZ6Py1OG8zJjwU0UkAcIhg7MqsGgZcathISOzlDYayxqdbp+Gga21aaJJZbL0TSPkdw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-UBWg0zDyYiiy3wXtxmRqaoAvi2hpXGGJ4VxoKcqgD927ftcYXz80g5dFDtk8zof3CVnfXHgaDCm40jxOrYU3qw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-UjSZtTgg1EEmNJeI+Esg2pMNjSb+lCy0VjwkUIVUJA6vezRNsb66NjsO5h4rvSMS2VhoKWGc7jbNV1AKRj891g==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-ZHAexbNsU0DMvR9vVqYldw9m+wyqLM5AVZyx6E6Lgk5JzjgDI9rFfDI2h+UGi1WOJyKPDKrjyLWG5phtGC6ytg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-h8mVEj/5JRPzKcDpoHvnQ0wt7nn7+euuPKLDtWH4yiAWztH8CX6udfHqjIE103USfpfMKEEcEWRqOe877rgp2Q==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-HmKdrzhgbW4ikm6lKWgaBm5OokH7aPyGuaniMHvRKnHSeUxDYMj2PU/ZSIlIxTntxELeTBd+ZcJlknJqR7Duuw==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-rXmRirmXSlmvrc4lY76+eK6UoXIi78sUSDggleEYs6Mwip1PWWQ1bg2Bi3tpxcRgF1MBOgHhiz37lybWaS1y7A==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-bPfmwsqmA39Vfa+Uu9mH1eaCJZo/qd+/O0aOYRhjSrypYBQK2AIif8lq7zYxhOR2U5AhvkkeqLNnaEC3spTHiA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-sw5cXyvNbbXyDkmnPJqNgSnOeDFdl9VL7OfA4kA2GcPCujXhnElVmF48rwibVtoYmDUe940zKPjUAeuXmmOH+g==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-OSpFCcAHBwfDK4bY6zNDfbtY+fKY6koEgvfVyk6OtdUI+dOM/Jjw9Kyxiqe1S8JC5dm3366+AFdqF2ZWbMW4fw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-BYeSSlt4ck/kK7L9I+OYdI+aklnF9JDNaHyIQ+nea+E/e6qqENxlgDPzJKwTKAX4XdIF7Rc/Gk14PuYBpC7+Ew==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-gFoRuWxJUSjqz8meGfPQhK/xI8LXK0/z2mOiVWfwFBO1lMuPUWFrzlUvoPBHhZSYj7578iHtUog8r/tnnK6+Bw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-poxX0QwFAsVfHDfH85V0BVd5dEtlhr+/3rPhCe5qhkFscmUM31BcD1ABbzdxYt/PRJKnKMCCA/tOHhMU5rUieA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-BLvup3LOAkOw5G/xJ0j9pcTNNQuPLibW0u5bTVAmMYYZny8b39xNWWVqNQ8Rl5jewPko/8luoany0SbHZ+GUpQ==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-kPsplrPdJ9VmThmB0kXTumkVG0WikMbkSRzGVyNU/Ploa9Cvv80PnCxF5VBAqRV1l/l3qBq9TZQV+7c6mIef9Q==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-2NeuUX5T7ZRuc76byZXf7cLXYTK5fGufEbrjEXRlBMXyI+vQ8x+6BR+hbqef9JGylT8pcLv+xL11Gx39vk2KmQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-LOoGtTUAg4/m9912v1s4yvh/wx64gRW6+052ZpHphizEbI/mvy5MGZpxS/WQHX34+RDXIG90CpdT7caL5iC1JA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-iZO21GJ4K+PjcH9Gn/OUVQrBkkfCVCifO+PsQItVuWuenEOwAShzCfz8E5icd/INLIosoriCyRV777jpjxHZXg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-t10QcEDpbrSvoe2BhUCtqOAqfXayzy9uujpiIeAdOyptGmBppA37G+F4cCRsIx6wzhCSrdPkYoh1KzD4rqqlyA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-SAKw8xQa/VBWOumG7JmId0UIKUs2RM8tnl3KPXJ85mjnrrP3wJLWynNf6v/hMxdxqjAOIb2Y6AIGwK4zFzA97g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-ykHn7VUDn711h67XQd+nx5Tn0L0vYWQY8kKWqqTXm/mBEM5CjoMd9qft6jirusGORVxC5RAnUENDt5n48B4xfg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-PTVNAmlIQRHnMCcw8Pm5+t8eLLtwyZ1J6lUjTcZ68dU9FGXIySRr750lekvMpBugMjmXIsNw0VQvg9AnL5SIDQ==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-6G+05BJAEjErJMixdkEAndBjgaCe7WmasdRypKPtYRfzvPVExrq/nak0ZiaJ0Dd3WuYdbi69Qyeuhj7atnAImw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-VbIqcklAsQYAAV5CTXo/6NAa6lkirCeh1XF7Yo2D6xZmkwLbQsKfNF1jpiwYr6luiVwJCkIA6p/owsPAZT42gA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-xjepU2UUYCP30YJHPdX0PN6C0ZqP2RKAEsJWpnNSlYQ8fcDHgy+l5ZTQPBD4egfWKlPCEtgSZod3p9nTggSoDA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-H5a0wdzBU4tWXtTkYcgHsezWolqD59sDLSlDdOGE/OF7p3X1AijCo1BKCb/ub+Qn24dXoS7RGQf4TwmPP/fDdw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-NORvYn5NilmBCZzLwrWXEPI7WeEKKwIHzh5USjQHQLsSoiWcOSZVKQLkqK2baSFjGktLyHmHRUQ6VnTggDuPeg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-DpKE33FA9NYJXAY5SbKcIfAvU5RyH30YqhCXxHi/NYfEcR6e5hrzn4992S6TpUQzeYHeJHprfXEQGK+x8bWTqg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-tMM7GajJVqT1W1qOzxmrvYyFTsTiSNrXSl0ww5CYz/pKr05gvncBdK0kCD9lYHruYMPVdlYyBCAICFg1kvO7aA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-prERCrIwyGg735ahEDi15HwriaDnwZlQidlFkiDSOuh4EJTXLqbYvwJxSygCNIgKAivNEwt5HuqAR0WxIzxLJA==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-wUU31YeB3hCc41XTTSXbhuYKKSbFv3rQb4aO0d93B1m8xPZfUpYA121ysuwaaiPgHvFK27wfYBHAAO82d1Tbsg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-gI8nk0A8LtN/NXufax5tgmoxnAFvG9SUA+yGfBz82HlAvwZkWeQsNjZav06LsIdBgY+34oJqPfhGFWki234b3A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-eQ28Igd0kDwNnBeaXvQul2U4Za4KTkBJ2hF5gi6/8xL8tJAIvpSiuHrcspBB7oqr9/uOU6R4eR7gDmOH0OVRaQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-6deTINJifUd+6BioAPScqa94hbH35wweO3UazZ0Dob4GFoSxD/z7jUjRIib/HmyhXz+F/QMOZapPNN+qNsmEPg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-zHJSkQl00ygE1BBWjjSZgQmT+rpX/ZoNvU3az2Vfk0D9tqM4+zQ0M0IdBw0Eu1Wr46LeifWIScp4pTvzBB0R/w==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-T93T3DT3SakSQcwaB9SFTT6R38hEh0/52bM+4IqvFAo1EAKx3eXiKezE3bMSjOGKHxKzb71Rp1d9Jflv6capLQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-RaDmfdtde+m27g31HXvBUJme7NUUT07bv5+Wp3mPH/FXE6tT8W1DvG9XNRcT2rIEDq24ktpfyBiNbN8fieBfqw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-dnHqxZvkLe4SubfrXiPhb08qkj2FOrdCBWLHo/Hd+pSop3C86rCTRJY454LrPwjnktjnQf/X0b4anadwOkckrg==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-723qKUmFeBKN0yfsf9zhP3k5ZKqK4UYvdKbDL80oyhzm4gQZ6tsUU4fHeHjJVJfqyN+wKS+R0WthyxhA9m07/g==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-8r/yMsXff3vlFUaRzlHKnkd/qxmbo6FzATU4d065j8YTNZcduF/uKiOKijwXSd96nj216RjCUIJWrcH72c5H6Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-hPcjYztP9miyYl+mqvTqoEqaa+fp+kCFVrROIwUEDBMNs6Urk76qsWJWE/uI9kLBh1zTHiDsWlXDiOXcftVBxA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-D6qubx3bzbfdDMJw1CcUJdPR2w2oHmOt/ur4q4Pi8cdFueROux3u2bcuurKmx2eZvHhYVKnL1njTxWDVHUM1OA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-IG7yOIrrLUvA22aUGR7g9VtXK3WGCsID9TokGqET+LoO4QTLlFRYjbrsUkvttuGUHftOTgDh+4abzkcqaTfd6A==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-neXYzUGCn4zBhHa4+9NgG6c0ulwsfGczrrH2hqJcwf16fNtBgfe9L+JnwRctrVVe7iOci/qYh69c36OlCsREug==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-3PwE2oDr4+n93nPZbHz1kgJkpdus91UR5IXKnMWMMxcEq+VgNvNpU4+M+khwPOXSmxK9LY6dsd9beQVIFtrDVg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-D8SDjyznO8H+3w5eAuL1pl+JZ+4S8eXM8gIMuNaDXvBZv43lU2by27Gk+Ue4eH5zV+462fBtBvqZtaETgfPsgQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-QVYtaGiLQ0bWTiav/cc2Ps+PQ9co8EmTW8NAzlf835camz7gdjZHKo5/z4FOVUHVftCY9vn2yBuBcwceI6f+Bg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-vk6trHjpJkCveABOceuodbxeAefojPqaUCGwU6HXinNgu281I/iEF7Afj6mJBLHxaPcvlFQjAjbRhll1SwcSNw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-4ktCvzYslGK2G2CLPy4As8rbHGPtQw0RA5VC9WxRmRpDH/3cyicFbRaBRVc2y19p0tV9nMC9KdaFyptm80lQZg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-r1LB1Ilq1/Pf71SubpoHU53s5bjfHY/TLQUhG2R3AGFMe1S2J6H35pkXuCdwBH+x99AX4khX1zw00BCYP5liVQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-MPUbFdcUXGrfUpdNmcPvq+EdaBLcl+4+nsbUwftOT1041DpIUkFfDzgWNWVMjPG3Prf3K0iKPtvdKx9bdUlq6A==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-ovDMqhvYv4o6P/AjvAh26EcSs6auYHe4YBgWF7SBLgB/r1xOvjlRZRuVL7znu/js0CwTH7h8w/YvW+q1+Tzw/A==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-CtxI7P/Il0bLfPXN6ofeL4Vm4ISp3TjvRBZt8MkACaTErFseNiwIIAKNqZ+d9lIxj1MDGA5fCfVn/0PsGIksRg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-K7jCpNm0lYr/dHheLoaPadsd9q8oQ0X+iK/rJkeKrZ76FLzAvcC1FqX9yXICwAW44m63bXcmg0ggra1+yXx0/Q==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-p18BC5bG9/0ktSBUvxZOqPpr9qkS0Z6G71GViCAzjtV+fBllt6OE7T0rSvOZ14FjZFcSqMA2HZ60I3H93cK6TA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-R7g8lya69aqDY/iAIIoX8TnbxEJxBIxvuqD0zrcEuJgRh33b2xys9OAT2NmyZH3GWdTZ5UPiolJ2SifKNE1ztQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-T9Rhlb0Ivsaev2JNEKRLRoc5pyowBy+meS7GzijwfHOEviRw2rMpPNK+8DoygI8HRetSnjLghMlzdcfURF10LA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-tPbKNB5TVRIAHyts6RMV2AP7pnmO/1MRtfTByCqTkTjH945dJ8+2r4ytMIoQ3ooVLi00yll9w2tDL+XnuNT3xw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-7SI6G+CVFjxrcgJny64fmvOp4Pz02EXrhlKJdEKoht+enh8c/1pY55cgR5jq9GWJ9iJNtV9/sDUiADK74NWWKQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-W18K405wGThiTnn12Mi0K6KXznjPZX87mX9APiq+nbKIsMmGC+r7cyIPgy9hmggnTb3qqv1p/0PACRD6NXm0CQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-ui1NVLgK7tEN1Xv+MO8FRovfg1OR4sKGf5GXHz2CN88GLkzznp5m9sSAETN2IPueRV+aaQ8JFaLEEw1QOdlh2Q==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-K7fKG8YuufAgq6VcvotJH/D4uHmcjg/X9TwWq8EmbyysqyNCuMkg6a1torpyaomdooKSZ0LSOodqbo57B6jERg==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-kTwrqjATCL5woNksB+G2B39lOIUkxLnouFruipzLnsDKSxG50pKIhxWUkrwTfwatL/zQasE+aVlwEfSQAxQteQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-alvGXGuLfWb35dOybu83zGbH9VyIJRf17FEhF6yrNGvg8gJ3SwpU/N2uGnuxI1TIb8dFlKq3FoE2hqfxWAERKA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-86sGYDN7tFGBhAUacYgosah0TTIMT1czQtKHb6vKXOGo1wWAYa+MsGXrdUA6o3rpvybL8rbRANQ1tarIfui4Bw==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-8345qvf7b3Q8hoqXErpJTWQeLmBV3GFUNa/hp8eCglnY5WWbnfd/muQAdA5zUoOX/8fMA4TILhZx2K0M8k1/mw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-VkXVbi8EbajQYu5pge5VCXxWGhHJtLivHM+rqHt78b8w2IpYfRACV7lqEU1COg9D3sZEG5oLOzKLCCN7lSiekA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-um95x3i3Jdyat4T6HTXP9I0STmsqJyuTWmZwCg/5EPNWMX1fm/OIFIoUQ9lX2kplPyq6Ys0hmiBaVcHOHGThgw==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-CUdm0Uw4kGSk6oVm8QZLSwxngMFmbNoiFXve2hT0/Csu4mJe6ttV8C/Y0VLPBJr3GmoovOzMeH3coQfEf2YvBA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-LneCr0cNCIEYVfDI2Ab++j+baaKut+pqTsCb3R9FAp9pqYVXveSEXn8V4xx+N0i//SQx4i9Dkd+oYGERun9k2A==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-kV1DnmxJrCauIvUfNe4wC4Yi888dzxxf7sYT4W/apnCSHvcjueYEZOGtoLSirsJJrn5aj9OeFVz+bAbd9nurxg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-xr4GBhH7aIMfPXjv+CuGZI3h1PZc+yETwn3/9UMOXXNxgM1zrkCR1p4I8rQNpwVPd440P8pReq2AWrdbLX7kTQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-XsP6i0SHVuDjS0IWBC+/3QXDJO+3ARuFbPSu9fRjR5NkK5/A4lQpBWJRymTzqWHzmD0DLYMEfwR+3mdG2A/StQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-slvRNr3ZPyyGLrOFEPVF91TD6BJcC7/UKrowVg0XGq37IxTeicrNLhs7PE8qmVGBgUTiKcqxEU7DXI2/qBh9nA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-UsW6m9/wuBUWM8SU/PHsn+9GQMRp4i00KfWDzE/s6rnCs40WRvy5Zcj923XMy05Bt04dhSrOOmDR1/vkydaysg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-1JBZRsQMZ4mCN0rS+F6wwP7s7+es+uwx6hG9ubUuccJYjCEAWwDg3vBVAbQqwMOF9rdbqOLFbkbvawOT7BHAaw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-Btz15yrqllW8cQ82bDOMB+fo1ONv4j+BvpZGQTt4zwqgyxq3qznnxVHrMxiG+UUwhDlD4ajCGYuZCjHECODTHg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-8fiTrOmlVMojv2oFxSO4zKP0Mz+3HazxfqBFBbgioN+/dMNiCa6ql3Sm0kp88Qmfcb68PwhWCJLy3x3XHLEUuA==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-bVGv/VP4T598HMR97vrcF8NxOv43rTn4RtH5JSm/Z/I2l6Jf4OsEmrP7ciCJho65xgG2NN7E80dAfv6Waan/DQ==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-t0G1lpmSy3Bb/0k4riHo+oT2h53IbHHC92oy3Mnxg2Nm/ZBoGDW55/maB5lF+IbEoNsScpAhsFNf7gAv5KPOhw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-OvOg+DllupzQyo2AiWJOWhd3G7sXoROVbGIbaO48l3cXJf+EkT3mwK0WyKNJo1SYDBSHP4PL3CELLyl7KeuBTA==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-Xgu9wAHojyPC6/9OhNk4Bpmhmb4FAcJMMb3S7xwwPFuEx7pKSCPOA/3Gv/8xR3w3lYoMhvs94Jn4zzLPw/d46A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-di/eQOCbK7Gckc/GaFEJbeHA8xc1sjPYb4ZgSDQG8s/lSc5EocnPG6YSiPu5noCS/kl4caLJzu8mcNEbHo9fQg==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-FDFqh+DYEYnPZjLzODbygevvyrQH15WVg/pcDbiFlE0dsoL7LQ3ST3G6Vz5GfpAZyO0A8O7ekGOH81+wskmeiw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-preview.6.25358.103";
-        hash = "sha512-e4ZDOtOGLbKnCy90C+6+pAtkX/CJlAI3dPV3zF8Dtk4kCG6m+4TnbohG8z+CBaY4Tyh7HRXfCwA0sMhkZIhJ/A==";
+        version = "10.0.0-preview.7.25380.108";
+        hash = "sha512-npZ0pXzs+1mOb/G8asxE4QYUrrQlvuVjO24sgaqgQ/o8Ir3m1jTxXhETRj7IXKiPiVMIaLPV+c3XtpdDKouH9A==";
       })
     ];
   };
 
 in
 rec {
-  release_10_0 = "10.0.0-preview.6";
+  release_10_0 = "10.0.0-preview.7";
 
   aspnetcore_10_0 = buildAspNetCore {
-    version = "10.0.0-preview.6.25358.103";
+    version = "10.0.0-preview.7.25380.108";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-arm.tar.gz";
-        hash = "sha512-/mrP2TIr27NliznmIGDFdjriPeeSpDDbRyaM++1gNgJk55NQArHO3KgTMog2d5XlnTgkp03lH5lk3FQKgU2RiQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-arm.tar.gz";
+        hash = "sha512-lXwjay3tSsk2fperQsxjo28PeydYBQA552QN/aOCTlpl6/LTB2L8diIqgdGUpJ593riZcUo3vCjbZwjY1bGC7Q==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-arm64.tar.gz";
-        hash = "sha512-iGZ9ZtkKq6MGSfhNENBX2nwNtHnNs2t2gk3I4PAqRKa/XSaddNqg1reDdvLcZrYCOFWCZ1VeLO1Ay9BqrHRdag==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-arm64.tar.gz";
+        hash = "sha512-gTWO1Grf/RpOLglePSPWfR0ommxMUKsg4ecRYbKCPIxE3VpsJBrJs/zUoq9Rjb/7zNt7Os0HpCr5/yTF/WLGow==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-x64.tar.gz";
-        hash = "sha512-FczqQ09eM7SvhyvaANMNP+5ElBE6Hl17HoziBqsKLgk4T6WiI6/d5LlOo7fhK3lsGkUTi+gzKIvWh0GuhD+2yA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-x64.tar.gz";
+        hash = "sha512-9onzhvf6Vrm1O9fVEKvs8rnCI1j7KTZ4RsI/u6ewphpH2G287vlrc6corwduVcNGg4SXQC4M2AuGldncHqPCuQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-arm.tar.gz";
-        hash = "sha512-HArq8wBlBcK/tkjyViWT9iu3pVsAULbMgecK6cwaNcrbv9VGEXBaGwv4SYqqNV0DeEfJ6nqa2j9YVWiLpqYTSQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-arm.tar.gz";
+        hash = "sha512-uJ0bnKWphyzzZ3dKLKUVKkLtht7MGMWTsQSINGPOXPrKamn5F0SaArTSXqQVj4IqNqwNZVxTjBhOR611EYbs2w==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-arm64.tar.gz";
-        hash = "sha512-CH7Qk+rFkx3YjOnIF1Q/rEp/sAcF/+cet1U6/QoVtQfrWmO46FDhT+SI3t17OaCshkmaFU5oSBWpnBIjr1NJ0A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-arm64.tar.gz";
+        hash = "sha512-cAY0HJWlGRCm7gLVgemkHXZGSn777QrXedDmT8DXfEK70jNTf1fXb28P2zh/biVZK6UzYmcKXm7+1ho3TkIc7A==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-x64.tar.gz";
-        hash = "sha512-bU2Jk/BySlwwy7XDR9ovxoct3HUdvGykOI5/umDVFiZhk5g6mErGv+h5tEh4j3e6+1C5mWfe+6QD9E7j/ycx7Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-x64.tar.gz";
+        hash = "sha512-wRf0SCHNbFWna7nr/HRlYG04rInIEO4iSys6D/T1q/Ld27sZVoOeZyrrpPlR3wtax/GTXSqQttTc3cEep8M7UQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-osx-arm64.tar.gz";
-        hash = "sha512-VlWHBJhm7w4JIR0SLJUOPYfzvCL/dA5NVQYY1ppidjuN12bBNcC95Px8zLqmTzMhQrSQ0P1ClOTFjimCB49yBA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-osx-arm64.tar.gz";
+        hash = "sha512-D5iye4E6etLrWkCOe9sf/97fheARsEmF6QCV3ikW2qTDQhSsPPmgZvSbPn7gnVbXP56aGFjHHv+JAMxBRf0yVQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-osx-x64.tar.gz";
-        hash = "sha512-c2tCqqrbhlRIvM/bOO2KlmCELsmPS4Trexq/E6imjPsWbx8dHZt6viROKAC0BwPUsxpQO+o2NZc5oEHjMsZSXQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-osx-x64.tar.gz";
+        hash = "sha512-FQLipaTYahQwhA2TGknRX/07ZEZeV9IdcURItxlpz7zmU4LvgoJg8Wlt1GxAnzwD9riuenLlFWe0RMoQuoreoA==";
       };
     };
   };
 
   runtime_10_0 = buildNetRuntime {
-    version = "10.0.0-preview.6.25358.103";
+    version = "10.0.0-preview.7.25380.108";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-arm.tar.gz";
-        hash = "sha512-dkFn08ZTnl3/nj8Qh+pAs3urJy9+bB3gyGLXak0MNEUnmbRY6fpwMprijsbQfWtiSz9b0KooEubn7I+PavI7hw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-arm.tar.gz";
+        hash = "sha512-oyaRhovGFTGjL6O78RNBZGrFFBasUvaACTxXfTO2ODBqJqCjJ5poaoZUPg8v3MoOegfzYIF5UpRdybRt4pyXCQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-arm64.tar.gz";
-        hash = "sha512-cbydt+UH85l1JsTzkzkUYA+Q8AAxxhc1nzuAtyuBiljcgEpe2zTGt8qx4WVx6FVVRZUNGgcgv/WzGsY3RP204w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-arm64.tar.gz";
+        hash = "sha512-tTAequEUCb2/MZg7xpk39w3RezVe84D0yrMX6SHl1mFiZCzVfRmhT7ug78CadjNcbl8u6ZimDErHYssXJR04QA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-x64.tar.gz";
-        hash = "sha512-f+rKqGVeFFIdtrqaeGByN38GOGTkGMXk9ep5kjop9HJO9u0WB0VFnuAo8ZJ5r6HA/t6atpM3IgiQnu+HM8oDZA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-x64.tar.gz";
+        hash = "sha512-EnSHIJyzxKOUhHzO1aFduMW2bJOGboi0pweJ6iyQtB4pk+ANkZLUupiPM928iaXKL+TxmmEdftitjD4KRpLFAQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-arm.tar.gz";
-        hash = "sha512-XXF9htD5Vt8lgTAnA9TYSNyBQjHnEpOgkOr1axgUYIRUOj1GcOQxDrkPOS4YKtAHycx8wfRRTQ76nfO2XRCD8Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-arm.tar.gz";
+        hash = "sha512-aCCXjXxzep/7Pj9IGsDDAm3FRsH0JzlqgwkCdTiwhu+QEHHiKiCJt3ivXlG8aJpEFCAs79lgkc0zAVtQ9+GtHA==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-arm64.tar.gz";
-        hash = "sha512-4mP7M8JBvsvY8vemP5tfQSPBpmfFVEfwOiSc/1SRs4pt+mKEURwPxidFxp8wK0ytnICIwnAJNYLX28p6LsZdCg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-arm64.tar.gz";
+        hash = "sha512-xJAlZHKLkx0jIHojHNSUZCKvqtFQjpGMISfcgjbc/yqVNXQQ4vC61bLYcZxkFMIJLQk4DDrnAVG1kgoyuzOHzw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-x64.tar.gz";
-        hash = "sha512-zf3Ek3pbRF4rjuks2odZedJWiUjdX+fQH4QwW2Mh3KZNZ+1hqYweccbaHu2CLwddC7BBBVGuyw+PPhMThDZ2qA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-x64.tar.gz";
+        hash = "sha512-wCfUh5zikKE4NaJWtYraqu2hdvCYgsej42+w4ik7Qo7/U+YhpHj+xF2SjxeL3VLn9KK03p4C0gSUxLmSXMtkBg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-osx-arm64.tar.gz";
-        hash = "sha512-zXzElKrtYs2r8Sh6CMvDoPKPMRLoluA37YLYRdZThzJ+I0UlvxwESbA+8hhSM9RWL7Wfv9GdXyjaPgpnE3RTdw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-osx-arm64.tar.gz";
+        hash = "sha512-72B+c82XraPNoxoMvqVWzWBAmiYSqUEnJxub+SXhLfhM97MmsLXt3s07rON/1vpwENSHzdxcIyR0Xe2W+LymAA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-osx-x64.tar.gz";
-        hash = "sha512-lm3Eezqhx6qSOzVI2IdkiCNpKwU/CT5PJrhmu/WAmx3W7zi9LC5RpOgPBsXb5K7Q21uuVSrZgmRi+sMOpormFg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-osx-x64.tar.gz";
+        hash = "sha512-4kBn/dR8b/jTCNNnNwK6FD/a3VC0pRca8qq36AYz7uGeZqC2lAvqSq6Yik05EVWjW6eOV3YM3d2lr169M1s9EA==";
       };
     };
   };
 
   sdk_10_0_1xx = buildNetSdk {
-    version = "10.0.100-preview.6.25358.103";
+    version = "10.0.100-preview.7.25380.108";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-arm.tar.gz";
-        hash = "sha512-lYjjTcixBEvdjpzqH9DWtWf+3w3br0iXsVOrmz6TrElXRXgQ+p7NfaTVo22KBbxItnCv0PUtTVbRQPdCoEOCCg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-arm.tar.gz";
+        hash = "sha512-knm/wwbPU/3AJnPGjrwGgYsm+wXukE/zFej/UoqNWLU0KoZkIjOkpnIi9Qe2ARC4IYSSx7l5cb7nj7EKFfiu6A==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-arm64.tar.gz";
-        hash = "sha512-cwFkPqL72yWCUmxtRpnTy2V/bJDjzn8nRq1RwyCoSDwoDToV/C4HJgWyvf52NpBjo4T/Ydef+WRBg+SyHBundA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-arm64.tar.gz";
+        hash = "sha512-qBiJz0LOz2FqdoXKsXUIaUzug+dqlhnGTomvr/TTgmaOpMft/etEU6DBPfzurIZuo9D+BfPfEkY4pMpYtP2nJQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-x64.tar.gz";
-        hash = "sha512-ZivWGncnWokxhq7VsKbmamE9M2V/cQJqJ/dl8RlreOPzoq2ljhs34Prqw5qDd7Pps7zqK3LFsG3V2YSK2Yc/Pw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-x64.tar.gz";
+        hash = "sha512-KNA8LaQR6BYb+jcUjzX/Yi6qI0GtzXKae1I/dKoh6Pf2UBnaENKG1nhY0Z/2AII4C4dDbfm8zicUe0/bIShvsg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-arm.tar.gz";
-        hash = "sha512-9E/Akg2mqGl07lLa7ODP/oyJEZPOmp1ob9k+gXiB7CSLkT5xdF7ldqZb9P3BZQZxivkERM7g9wFPuJZ6k6bMyA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-arm.tar.gz";
+        hash = "sha512-D65/QdZ5g5I0GWMqoc+JW9K+0oaBLcysWLUkrgxrgBuxhVUJ1t9L+EfkxAx5ll31z2BrwH8iV49JzAo+/1dEjQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-arm64.tar.gz";
-        hash = "sha512-xK/vp5j5cN3jplkjwCZItn87VU5Rp94TstKSRoQ3EtCGRcj8IjpAi9N+Df17+HWA0EaM+nQAlexbNbknQG+Lnw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-arm64.tar.gz";
+        hash = "sha512-zIjcxU2QbdIS9MOD3gfTSUfMS2RZJAtfwTqei25dfUgrymc1cXixQZUFfviDx+YOT/2ArvSEyYqXOYf+SZPBow==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-x64.tar.gz";
-        hash = "sha512-LCj610mZoxlInz08MT41eSP+UaQCG+01OZeA8trqlZzehNkYNdHjEMk71LfLaV+xT29lAa0LFmF0L/xYAVNiaQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-x64.tar.gz";
+        hash = "sha512-hcpucoRlWBlxrzWL7dJkDADJ11xJysH6mz3plrQKE+lfNbdXPe+u/r38Z0xHjotXn4GhAwvj8WC2cgsx/f1ooQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-osx-arm64.tar.gz";
-        hash = "sha512-xDIGEqUUEXVSocsTu6RBc72L25UGwTtLmmeumrCziq1+zU5d0dTDIwukn7luzRSyrzQWkp52UcXJkMv3ber7mg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-osx-arm64.tar.gz";
+        hash = "sha512-eI/e7V31AEm8/hNwBZzfp0M5CkLZv1LHRVY+qsRL9UqVSqyjVjZLq2tbEIsbbZ4NbPJ8JT0uYrBkQARmn4GXxw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-osx-x64.tar.gz";
-        hash = "sha512-rWlkOrW5A00BlxcOx+TusNgSzeXwKKHq8X+w8gnOKyUZMrJBKNsMVfBXs+mv9n14vLBFmAiT+B2WlQMjYRpnlQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-osx-x64.tar.gz";
+        hash = "sha512-/Dk0clsJJHMl7hDlaBlhZyKmMPSBS7k8Q7YLLtvTLuI83esARdZACAi4QNBQ7Q3Etbz5WpDeG5MpNrYjVuHqVQ==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/10/deps.json b/pkgs/development/compilers/dotnet/10/deps.json
index 6a0248680962..7e94efd6ed1b 100644
--- a/pkgs/development/compilers/dotnet/10/deps.json
+++ b/pkgs/development/compilers/dotnet/10/deps.json
@@ -1,50 +1,50 @@
 [
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "ac90a9d11e9397e6e3dff022f99459d0666e2d29e899ac06471e860ae5173980",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg",
-    "version": "10.0.0-preview.6.25302.104"
+    "sha256": "aa14afd80807b2b9f4956b8600d20f7d3516aecf05f55d1ca7d905a329cfe83b",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg",
+    "version": "10.0.0-preview.7.25322.101"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "c5a904d430cbe6014fea6ace35a339838f598ac2560ab741ecc085a00f37ae49",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg",
-    "version": "10.0.0-preview.6.25302.104"
+    "sha256": "53c920333f4762f1f79b108726129c1d8c1416ccd76526fe3a9a7ab7a1f93597",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg",
+    "version": "10.0.0-preview.7.25322.101"
   },
   {
-    "hash": "sha256-Nupnw/U9dxLxWNqETTtxyvJhuuGDPyU+ksmZ+qwSkxk=",
+    "hash": "sha256-KhdfkhtQFehIcwo3koGdmmqSTXZD3jbZUMxj61cX0LA=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg",
-    "version": "10.0.0-preview.6.25302.104"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg",
+    "version": "10.0.0-preview.7.25322.101"
   },
   {
-    "hash": "sha256-QHSni2ad7MQEQoCMRPWTtwmMOTZaDWn/CZbUanLAc2Y=",
+    "hash": "sha256-/R26o0IJCYf6Fa/uxTNpRh4E9Sm5JrUlC6yr7V/sMiw=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg",
-    "version": "10.0.0-preview.6.25302.104"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg",
+    "version": "10.0.0-preview.7.25322.101"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "06130621565ec2be89c86e322af5abc095c4efe0334f8dfc3ea43695c1ed9893",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg",
-    "version": "10.0.0-preview.6.25302.104"
+    "sha256": "7a685b61f9aa514104e2d43698696a035b701879262bfd9795ef282a506a572e",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg",
+    "version": "10.0.0-preview.7.25322.101"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "43da2ec6d8351784865e8a18113f2c90211c13966d352765316b5d5c9f4b3cbd",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg",
-    "version": "10.0.0-preview.6.25302.104"
+    "sha256": "ff8889ae28490cfe2906cf1fb9ea1a299dbe7300e5645d36e1b144ec79ae7374",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg",
+    "version": "10.0.0-preview.7.25322.101"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "0234d829a2e019b4b3f87b93c068c14cc3d71be6d489a3c8e4c358f9a1609d36",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg",
-    "version": "10.0.0-preview.6.25302.104"
+    "sha256": "3a512f5afee951500f328f2c166eb11d877cc0ce8a176358ecc5bbabe8a14f7a",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg",
+    "version": "10.0.0-preview.7.25322.101"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "ce1b95a1611a442ead51a5a6f33939311a94c20dee287d1aa903b0e1425a5e28",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg",
-    "version": "10.0.0-preview.6.25302.104"
+    "sha256": "7c0cf48f6a48ab0b7b4cd339aed9c1626873674e614fea33e15ee7c938514e8d",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg",
+    "version": "10.0.0-preview.7.25322.101"
   }
 ]
diff --git a/pkgs/development/compilers/dotnet/10/release-info.json b/pkgs/development/compilers/dotnet/10/release-info.json
index 49f114107afb..535b6de70133 100644
--- a/pkgs/development/compilers/dotnet/10/release-info.json
+++ b/pkgs/development/compilers/dotnet/10/release-info.json
@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-ffQAL6kerSjdOcd4YsC1374zH2gBDsdWJeBTwEsTUbo=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.6.25302.104.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-CEmna8eEx6+8nxThVGnqWkz6DSJOnJWuFrCWzDRoAYo="
+  "tarballHash": "sha256-sE7HIeZfg3Q4/izN7ZNg+KHCQAkp7NwJXoe2BA+E4Ww=",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.7.25322.101-1.centos.10-x64.tar.gz",
+  "artifactsHash": "sha256-jwyPybGkBPrmwDBkesqEauTEFNTgBv/sUW3jaUnWbt4="
 }
diff --git a/pkgs/development/compilers/dotnet/10/release.json b/pkgs/development/compilers/dotnet/10/release.json
index 7e368bbb2a0d..98a497ec5bc7 100644
--- a/pkgs/development/compilers/dotnet/10/release.json
+++ b/pkgs/development/compilers/dotnet/10/release.json
@@ -1,11 +1,11 @@
 {
-  "release": "10.0.0-preview.6",
+  "release": "10.0.0-preview.7",
   "channel": "10.0",
-  "tag": "v10.0.0-preview.6.25358.103",
-  "sdkVersion": "10.0.100-preview.6.25358.103",
-  "runtimeVersion": "10.0.0-preview.6.25358.103",
-  "aspNetCoreVersion": "10.0.0-preview.6.25358.103",
+  "tag": "v10.0.100-preview.7.25380.108",
+  "sdkVersion": "10.0.100-preview.7.25380.108",
+  "runtimeVersion": "10.0.0-preview.7.25380.108",
+  "aspNetCoreVersion": "10.0.0-preview.7.25380.108",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "75972a5ba730bdaf7cf3a34f528ab0f5c7f05183",
-  "officialBuildId": "20250708.3"
+  "sourceVersion": "30000d883e06c122311a66894579bc12329a09d4",
+  "officialBuildId": "20250730.8"
 }
diff --git a/pkgs/development/compilers/dotnet/bundler-fix-file-size-estimation-when-bundling-symli.patch b/pkgs/development/compilers/dotnet/bundler-fix-file-size-estimation-when-bundling-symli.patch
new file mode 100644
index 000000000000..deb7f49211cb
--- /dev/null
+++ b/pkgs/development/compilers/dotnet/bundler-fix-file-size-estimation-when-bundling-symli.patch
@@ -0,0 +1,47 @@
+From 8fa3570bf75c48bf68f42b74790bf8ba0f032a3f Mon Sep 17 00:00:00 2001
+From: David McFarland <corngood@gmail.com>
+Date: Thu, 14 Aug 2025 10:49:40 -0300
+Subject: [PATCH] bundler: fix file size estimation when bundling symlinks
+
+---
+ .../managed/Microsoft.NET.HostModel/Bundle/Bundler.cs  | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs b/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs
+index a5e8b593484..39f39334251 100644
+--- a/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs
++++ b/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs
+@@ -284,6 +284,12 @@ public string GenerateBundle(IReadOnlyList<FileSpec> fileSpecs)
+                 throw new ArgumentException("Invalid input specification: Must specify the host binary");
+             }
+ 
++            static long GetFileLength(string path)
++            {
++                var info = new FileInfo(path);
++                return ((FileInfo?)info.ResolveLinkTarget(true) ?? info).Length;
++            }
++
+             (FileSpec Spec, FileType Type)[] relativePathToSpec = GetFilteredFileSpecs(fileSpecs);
+             long bundledFilesSize = 0;
+             // Conservatively estimate the size of bundled files.
+@@ -293,7 +299,7 @@ public string GenerateBundle(IReadOnlyList<FileSpec> fileSpecs)
+             // We will memory map a larger file than needed, but we'll take that trade-off.
+             foreach (var (spec, type) in relativePathToSpec)
+             {
+-                bundledFilesSize += new FileInfo(spec.SourcePath).Length;
++                bundledFilesSize += GetFileLength(spec.SourcePath);
+                 if (type == FileType.Assembly)
+                 {
+                     // Alignment could be as much as AssemblyAlignment - 1 bytes.
+@@ -314,7 +320,7 @@ public string GenerateBundle(IReadOnlyList<FileSpec> fileSpecs)
+             {
+                 Directory.CreateDirectory(destinationDirectory);
+             }
+-            var hostLength = new FileInfo(hostSource).Length;
++            var hostLength = GetFileLength(hostSource);
+             var bundleManifestLength = Manifest.GetManifestLength(BundleManifest.BundleMajorVersion, relativePathToSpec.Select(x => x.Spec.BundleRelativePath));
+             long bundleTotalSize = hostLength + bundledFilesSize + bundleManifestLength;
+             if (_target.IsOSX && _macosCodesign)
+-- 
+2.50.1
+
diff --git a/pkgs/development/compilers/dotnet/mscordac-fix-missing-libunwind-symbols-on-linux.patch b/pkgs/development/compilers/dotnet/mscordac-fix-missing-libunwind-symbols-on-linux.patch
new file mode 100644
index 000000000000..a6e95daf1841
--- /dev/null
+++ b/pkgs/development/compilers/dotnet/mscordac-fix-missing-libunwind-symbols-on-linux.patch
@@ -0,0 +1,42 @@
+From 9ec09da8755f2888a2ae15c52e223953785bc146 Mon Sep 17 00:00:00 2001
+From: David McFarland <corngood@gmail.com>
+Date: Wed, 13 Aug 2025 16:03:41 -0300
+Subject: [PATCH] mscordac: fix missing libunwind symbols on linux
+
+---
+ src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt b/src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt
+index 71b69336e2e..dc3b79d6933 100644
+--- a/src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt
++++ b/src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt
+@@ -157,6 +157,12 @@ set(COREDAC_LIBRARIES
+     ${END_LIBRARY_GROUP} # End group of libraries that have circular references
+ )
+ 
++if(CLR_CMAKE_HOST_UNIX)
++    list(APPEND COREDAC_LIBRARIES
++        coreclrpal_dac
++    )
++endif(CLR_CMAKE_HOST_UNIX)
++
+ if(CLR_CMAKE_HOST_WIN32)
+     # mscordac.def should be generated before mscordaccore.dll is built
+     add_dependencies(mscordaccore mscordaccore_def)
+@@ -205,12 +211,6 @@ if(CLR_CMAKE_HOST_WIN32 AND CLR_CMAKE_TARGET_UNIX)
+     )
+ endif(CLR_CMAKE_HOST_WIN32 AND CLR_CMAKE_TARGET_UNIX)
+ 
+-if(CLR_CMAKE_HOST_UNIX)
+-    list(APPEND COREDAC_LIBRARIES
+-        coreclrpal_dac
+-    )
+-endif(CLR_CMAKE_HOST_UNIX)
+-
+ target_link_libraries(mscordaccore PRIVATE ${COREDAC_LIBRARIES})
+ 
+ esrp_sign(mscordaccore)
+-- 
+2.50.0
+
diff --git a/pkgs/development/compilers/dotnet/source-build-externals-overwrite-rather-than-append-.patch b/pkgs/development/compilers/dotnet/source-build-externals-overwrite-rather-than-append-.patch
deleted file mode 100644
index a52fb2d9244a..000000000000
--- a/pkgs/development/compilers/dotnet/source-build-externals-overwrite-rather-than-append-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 393d224e7b05c73baf9f5d5130d7c9d15c5fc526 Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Fri, 13 Jun 2025 15:32:52 -0300
-Subject: [PATCH] source-build-externals: overwrite rather than append
- NuGet.config
-
----
- .../src/repos/projects/Directory.Build.targets                  | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/source-build-externals/src/repos/projects/Directory.Build.targets b/src/source-build-externals/src/repos/projects/Directory.Build.targets
-index 5b374f4fc42..9ed8cff895c 100644
---- a/src/source-build-externals/src/repos/projects/Directory.Build.targets
-+++ b/src/source-build-externals/src/repos/projects/Directory.Build.targets
-@@ -101,7 +101,7 @@
- ]]>
-       </NewNuGetConfigContent>
-     </PropertyGroup>
--    <WriteLinesToFile Lines="$(NewNuGetConfigContent)" File="$(NewNuGetConfigFile)" />
-+    <WriteLinesToFile Lines="$(NewNuGetConfigContent)" File="$(NewNuGetConfigFile)" Overwrite="True" />
- 
-     <AddSourceToNuGetConfig NuGetConfigFile="$(NewNuGetConfigFile)"
-                             SourceName="%(_DependencyProjectsPackagesOutput.RepositoryName)"
--- 
-2.49.0
-
diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix
index d4715d5fa0dc..6e2baefd413e 100644
--- a/pkgs/development/compilers/dotnet/vmr.nix
+++ b/pkgs/development/compilers/dotnet/vmr.nix
@@ -18,6 +18,7 @@
   darwin,
   xcbuild,
   swiftPackages,
+  apple-sdk_13,
   openssl,
   getconf,
   python3,
@@ -109,12 +110,15 @@ stdenv.mkDerivation rec {
     krb5
     lttng-ust_2_12
   ]
-  ++ lib.optionals isDarwin [
-    xcbuild
-    swift
-    krb5
-    sigtool
-  ];
+  ++ lib.optionals isDarwin (
+    [
+      xcbuild
+      swift
+      krb5
+      sigtool
+    ]
+    ++ lib.optional (lib.versionAtLeast version "10") apple-sdk_13
+  );
 
   # This is required to fix the error:
   # > CSSM_ModuleLoad(): One or more parameters passed to a function were not valid.
@@ -141,9 +145,8 @@ stdenv.mkDerivation rec {
       ./vmr-compiler-opt-v8.patch
     ]
     ++ lib.optionals (lib.versionAtLeast version "10") [
-      # src/repos/projects/Directory.Build.targets(106,5): error MSB4018: The "AddSourceToNuGetConfig" task failed unexpectedly.
-      # src/repos/projects/Directory.Build.targets(106,5): error MSB4018: System.Xml.XmlException->Microsoft.Build.Framework.BuildException.GenericBuildTransferredException: There are multiple root elements. Line 9, position 2.
-      ./source-build-externals-overwrite-rather-than-append-.patch
+      ./mscordac-fix-missing-libunwind-symbols-on-linux.patch
+      ./bundler-fix-file-size-estimation-when-bundling-symli.patch
     ];
 
   postPatch = ''
@@ -178,11 +181,15 @@ stdenv.mkDerivation rec {
       -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \
       src/source-build-reference-packages/src/referencePackages/Directory.Build.props
 
+  ''
+  + lib.optionalString (lib.versionOlder version "10") ''
     # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848
     xmlstarlet ed \
       --inplace \
       -u //_:Project/_:PropertyGroup/_:BuildNumber -v 0 \
-      src/source-build-externals/src/${lib.optionalString (lib.versionAtLeast version "10") "repos/src/"}application-insights/.props/_GlobalStaticVersion.props
+      src/source-build-externals/src/application-insights/.props/_GlobalStaticVersion.props
+  ''
+  + ''
 
     # this fixes compile errors with clang 15 (e.g. darwin)
     substituteInPlace \

From 5e2cc452717a454ca3517caf85eba3ede38d71f3 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 17 Aug 2025 03:50:28 +0200
Subject: [PATCH 2018/3724] radicle-explorer: fix src hash

---
 pkgs/by-name/ra/radicle-explorer/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix
index 6c467f96b1e1..30eb045a1bff 100644
--- a/pkgs/by-name/ra/radicle-explorer/package.nix
+++ b/pkgs/by-name/ra/radicle-explorer/package.nix
@@ -77,7 +77,7 @@ lib.fix (
       # separate hash.
       src = fetchgit {
         inherit (radicle-httpd.src) url rev;
-        hash = "sha256-HRSrLdiDETTWNF+Rzvlg1XQerXcCE2xaY+6Xbq5pItI=";
+        hash = "sha256-1OhZ0x21NlZIiTPCRpvdUsx5UmeLecTjVzH8DWllPr8=";
       };
 
       postPatch = ''

From 28555291142cfb7f19e3fcf086f2ef0e54a167c6 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 19 Aug 2025 17:20:12 +0300
Subject: [PATCH 2019/3724] nixos/i18n/input-method: Fix cross

If the gtk2 and gtk3 are moved to `nativeBuildInputs` then this happens

```
Cannot load module /nix/store/sn268l2xkdvkvagq1r35xy9071zns4hx-ibus-with-plugins-1.5.32/lib/gtk-3.0/3.0.0/immodules/im-ibus.so: /nix/store/sn268l2xkdvkvagq1r35xy9071zns4hx-ibus-with-plugins-1.5.32/lib/gtk-3.0/3.0.0/immodules/im-ibus.so: cannot open shared object file: No such file or directory
> /nix/store/sn268l2xkdvkvagq1r35xy9071zns4hx-ibus-with-plugins-1.5.32/lib/gtk-3.0/3.0.0/immodules/im-ibus.so does not export GTK+ IM module API: /nix/store/sn268l2xkdvkvagq1r35xy9071zns4hx-ibus-with-plugins-1.5.32/lib/gtk-3.0/3.0.0/immodules/im-ibus.so: cannot open shared object file: No such file or directory
```
---
 nixos/modules/i18n/input-method/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix
index 55441dd83490..a7f1b0b01d80 100644
--- a/nixos/modules/i18n/input-method/default.nix
+++ b/nixos/modules/i18n/input-method/default.nix
@@ -22,13 +22,12 @@ let
         preferLocalBuild = true;
         allowSubstitutes = false;
         buildInputs = [
-          pkgs.gtk2
           cfg.package
         ];
       }
       ''
         mkdir -p $out/etc/gtk-2.0/
-        GTK_PATH=${cfg.package}/lib/gtk-2.0/ gtk-query-immodules-2.0 > $out/etc/gtk-2.0/immodules.cache
+        GTK_PATH=${cfg.package}/lib/gtk-2.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${lib.getExe' pkgs.gtk2.dev "gtk-query-immodules-2.0"} > $out/etc/gtk-2.0/immodules.cache
       '';
 
   gtk3_cache =
@@ -37,13 +36,12 @@ let
         preferLocalBuild = true;
         allowSubstitutes = false;
         buildInputs = [
-          pkgs.gtk3
           cfg.package
         ];
       }
       ''
         mkdir -p $out/etc/gtk-3.0/
-        GTK_PATH=${cfg.package}/lib/gtk-3.0/ gtk-query-immodules-3.0 > $out/etc/gtk-3.0/immodules.cache
+        GTK_PATH=${cfg.package}/lib/gtk-3.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${lib.getExe' pkgs.gtk3.dev "gtk-query-immodules-3.0"} > $out/etc/gtk-3.0/immodules.cache
       '';
 
 in
@@ -107,8 +105,12 @@ in
     environment.systemPackages = [
       cfg.package
     ]
-    ++ lib.optional cfg.enableGtk2 gtk2_cache
-    ++ lib.optional cfg.enableGtk3 gtk3_cache;
+    ++ lib.optional (
+      cfg.enableGtk2 && (pkgs.stdenv.hostPlatform.emulatorAvailable pkgs.buildPackages)
+    ) gtk2_cache
+    ++ lib.optional (
+      cfg.enableGtk3 && (pkgs.stdenv.hostPlatform.emulatorAvailable pkgs.buildPackages)
+    ) gtk3_cache;
   };
 
   meta = {

From 0439bc4c7705493a6e055d7b2fc5d918e4c479bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 18 Aug 2025 20:58:56 +0000
Subject: [PATCH 2020/3724] immich: 1.138.0 -> 1.138.1

https://github.com/immich-app/immich/releases/tag/v1.138.1
---
 pkgs/by-name/im/immich/sources.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json
index 432bc9ff0cf2..70e02e44a510 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -1,26 +1,26 @@
 {
-  "version": "1.138.0",
-  "hash": "sha256-yOGqQMy2PdGlHAtfuLB74UokGIwzi3yCiaBOZ/Orsf0=",
+  "version": "1.138.1",
+  "hash": "sha256-oaZN0kF82mS25bDSTXRjYnWG9RAMSbCUhXn9t0am96U=",
   "components": {
     "cli": {
-      "npmDepsHash": "sha256-NFEAsy1SabGvQMX+k7jIuBLdfjhb3v9x1O2T9EbTPEM=",
-      "version": "2.2.78"
+      "npmDepsHash": "sha256-6k83QOdKh+FlVnYvA9j60115oohUMDc2YvGaj/GMukE=",
+      "version": "2.2.79"
     },
     "server": {
-      "npmDepsHash": "sha256-B/j4b0ETfM+K9v757egm1DUTynfnFHb8PVRFhxq1H5Y=",
-      "version": "1.138.0"
+      "npmDepsHash": "sha256-4sqWIIGQ8ZW7TvJoNjNNliriuV6Su0askAN6pAq9VFc=",
+      "version": "1.138.1"
     },
     "web": {
-      "npmDepsHash": "sha256-LkGeZPyfJ6wo1O5I13OL9Iz6mjRNXjTNOi5BVoQWQs4=",
-      "version": "1.138.0"
+      "npmDepsHash": "sha256-+W8cDgy3qe6RDen8SEdHPNADkKb4zZH8C/Am/bdU42c=",
+      "version": "1.138.1"
     },
     "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-n1OTaqwfVy3RB6hi2rRGGjSNXsrFRwZMSyKfEuYy57U=",
-      "version": "1.138.0"
+      "npmDepsHash": "sha256-GfmFPsnFu7l4EsnPDv4nj5KLkOz8nEJvMT1BE7zIQ3k=",
+      "version": "1.138.1"
     },
     "geonames": {
-      "timestamp": "20250815003647",
-      "hash": "sha256-GYO+fbdXC2z0scne9kh+JLpp7h9k2w0tkIcyYDbNusA="
+      "timestamp": "20250818205425",
+      "hash": "sha256-zZHAomW1C4qReFbhme5dkVnTiLw+jmhZhzuYvoBVBCY="
     }
   }
 }

From 6f4ba5358bd4ac06c8844dee554d7431aaf31df1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 16:18:49 +0000
Subject: [PATCH 2021/3724] vscode-extensions.saoudrizwan.claude-dev: 3.23.0 ->
 3.25.3

---
 .../vscode/extensions/saoudrizwan.claude-dev/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
index c4f7a92f5d4c..747397fefaa2 100644
--- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-dev";
     publisher = "saoudrizwan";
-    version = "3.23.0";
-    hash = "sha256-WIohL7kd6AGgSmstTkLjF0QL1WShQqBnUDyU5reiB/8=";
+    version = "3.25.3";
+    hash = "sha256-9a4QvVZ0vWR0zWgYAZN0zv95J2VNBbFQHc8mAH6H680=";
   };
 
   meta = {

From 4d5c5540740120810ae4b10eee1eb314b530be21 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Aug 2025 17:38:21 +0100
Subject: [PATCH 2022/3724] qpdf: get more useful test output

---
 pkgs/by-name/qp/qpdf/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/qp/qpdf/package.nix b/pkgs/by-name/qp/qpdf/package.nix
index 857ea50290a1..5531aff39c17 100644
--- a/pkgs/by-name/qp/qpdf/package.nix
+++ b/pkgs/by-name/qp/qpdf/package.nix
@@ -6,6 +6,7 @@
   libjpeg,
   perl,
   zlib,
+  ctestCheckHook,
 
   # for passthru.tests
   cups-filters,
@@ -45,9 +46,15 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
   ];
 
+  nativeCheckInputs = [ ctestCheckHook ];
+
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
+  cmakeFlags = [
+    (lib.cmakeBool "SHOW_FAILED_TEST_OUTPUT" true)
+  ];
+
   preConfigure = ''
     patchShebangs qtest/bin/qtest-driver
     patchShebangs run-qtest

From 9cdf92b91bc8564333d433ce1736648edf0148d8 Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sat, 16 Aug 2025 16:56:21 +0000
Subject: [PATCH 2023/3724] python312Packages.langgraph: 0.6.1 -> 0.6.5

---
 .../python-modules/langgraph/default.nix        | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index fa5efe2b2ba3..4bf3b7ab9bd9 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -18,6 +18,7 @@
   # tests
   aiosqlite,
   dataclasses-json,
+  fakeredis,
   grandalf,
   httpx,
   langgraph-checkpoint-postgres,
@@ -32,20 +33,21 @@
   syrupy,
   postgresql,
   postgresqlTestHook,
+  redisTestHook,
 
   # passthru
   nix-update-script,
 }:
 buildPythonPackage rec {
   pname = "langgraph";
-  version = "0.6.1";
+  version = "0.6.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = version;
-    hash = "sha256-8mubZSV1CDgYzykKaaWqn04yJldAgdGmgZDm54towWc=";
+    hash = "sha256-9jl16cKp3E7j79PXrr/3splrcJtfQQN7yFJ5sfa6c+I=";
   };
 
   postgresqlTestSetupPost = ''
@@ -78,6 +80,9 @@ buildPythonPackage rec {
     pytestCheckHook
     postgresql
     postgresqlTestHook
+    redisTestHook
+    fakeredis
+    langgraph-checkpoint
   ];
 
   checkInputs = [
@@ -99,6 +104,10 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
+    # Requires `langgraph dev` to be running
+    "test_remote_graph_basic_invoke"
+    "test_remote_graph_stream_messages_tuple"
+
     # Disabling tests that requires to create new random databases
     "test_cancel_graph_astream"
     "test_cancel_graph_astream_events_v2"
@@ -112,10 +121,6 @@ buildPythonPackage rec {
     "test_no_modifier"
     "test_pending_writes_resume"
     "test_remove_message_via_state_update"
-
-    # Requires `langgraph dev` to be running
-    "test_remote_graph_basic_invoke"
-    "test_remote_graph_stream_messages_tuple"
   ];
 
   disabledTestPaths = [

From 436ea5074297021641f69040cdaa5a51aca636d8 Mon Sep 17 00:00:00 2001
From: melvyn <melvyn2@dnsense.pub>
Date: Tue, 19 Aug 2025 09:50:58 -0700
Subject: [PATCH 2024/3724] appimageTools.defaultFhsEnvArgs: move libsecret to
 targetPkgs The bitwarden appimage is x86_64 only and does not need i686
 libsecret, which currently also fails to build

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

diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 1235c039377d..de2b46050b72 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -128,6 +128,10 @@ rec {
         krb5
         gsettings-desktop-schemas
         hicolor-icon-theme # dont show a gtk warning about hicolor not being installed
+
+        # libraries not on the upstream include list, but nevertheless expected
+        # by at least one appimage
+        libsecret # For bitwarden, appimage is x86_64 only
       ];
 
     # list of libraries expected in an appimage environment:
@@ -244,8 +248,6 @@ rec {
         at-spi2-core
         pciutils # for FreeCAD
         pipewire # immersed-vr wayland support
-
-        libsecret # For bitwarden
         libmpg123 # Slippi launcher
         brotli # TwitchDropsMiner
       ];

From 5d339eed536ef2398afabbe7e05033a8c9cb6ed7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 17:07:34 +0000
Subject: [PATCH 2025/3724] python3Packages.pytest-shared-session-scope: 0.4.0
 -> 0.5.0

---
 .../python-modules/pytest-shared-session-scope/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-shared-session-scope/default.nix b/pkgs/development/python-modules/pytest-shared-session-scope/default.nix
index 96571b31d88a..3b698793a5e6 100644
--- a/pkgs/development/python-modules/pytest-shared-session-scope/default.nix
+++ b/pkgs/development/python-modules/pytest-shared-session-scope/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-shared-session-scope";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "StefanBRas";
     repo = "pytest-shared-session-scope";
     tag = "v${version}";
-    hash = "sha256-cG4RUwQwo7RyOQDCP54gGTLhnJtHTo5iQh8MjNRZ4HI=";
+    hash = "sha256-/26iwaV6E15TWrObIvXE4AipEboe1gv6WYu4BndPtUs=";
   };
 
   build-system = [ hatchling ];
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "pytest_shared_session_scope" ];
 
   meta = {
-    changelog = "https://github.com/StefanBRas/pytest-shared-session-scope/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/StefanBRas/pytest-shared-session-scope/blob/${src.tag}/CHANGELOG.md";
     description = "Pytest session-scoped fixture that works with xdist";
     homepage = "https://pypi.org/project/pytest-shared-session-scope/";
     license = lib.licenses.mit;

From 703084e738c72ddb9525ad8b2c9413e8b9747a78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 17:36:19 +0000
Subject: [PATCH 2026/3724] 
 vscode-extensions.github.vscode-pull-request-github: 0.116.0 -> 0.116.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index d645a1afa484..35b02a10a6f4 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2033,8 +2033,8 @@ let
         mktplcRef = {
           publisher = "github";
           name = "vscode-pull-request-github";
-          version = "0.116.0";
-          hash = "sha256-nkK5Mli1dz/zsSkE1YtLyOeokgUYrGqbwuniy3vPlWU=";
+          version = "0.116.1";
+          hash = "sha256-qJGCY1NBCv11xzeryELG0OVZy4wQZqdcYPFadZ1tlIU=";
         };
         meta = {
           license = lib.licenses.mit;

From 6a7b45f0f78fa7dbb96cd2978050f62e04b0ba4e Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Tue, 19 Aug 2025 12:51:58 +0200
Subject: [PATCH 2027/3724] chromium: fix build with rust 1.89.0

Co-authored-by: Emily <git@emilylange.de>
---
 .../networking/browsers/chromium/common.nix    | 18 ++++++++++++++++++
 ...ust-1.86-mismatched_lifetime_syntaxes.patch | 14 ++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index f0be1d3a5c99..e7e05416dfa8 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -526,6 +526,24 @@ let
       # preventing compilations of chromium with versions below their intended version, not about running the very
       # exact version or even running a newer version.
       ./patches/chromium-136-nodejs-assert-minimal-version-instead-of-exact-match.patch
+    ]
+    ++ lib.optionals (chromiumVersionAtLeast "138") [
+      (fetchpatch {
+        # Unbreak building with Rust 1.89+ which introduced
+        # a new mismatched_lifetime_syntaxes lint.
+        # https://issues.chromium.org/issues/424424323
+        name = "chromium-138-rust-1.86-mismatched_lifetime_syntaxes.patch";
+        # https://chromium-review.googlesource.com/c/chromium/src/+/6658267
+        url = "https://chromium.googlesource.com/chromium/src/+/94a87ff38c51fd1a71980a5051d3553978391608^!?format=TEXT";
+        decode = "base64 -d";
+        includes = [ "build/rust/cargo_crate.gni" ];
+        hash = "sha256-xf1Jq5v3InXkiVH0uT7+h1HPwZse5MDcHKuJNjSLR6k=";
+      })
+    ]
+    ++ lib.optionals (!chromiumVersionAtLeast "138") [
+      # Rebased variant of the patch above for
+      # electron 35 (M134) and 36 (M136)
+      ./patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch
     ];
 
     postPatch =
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch
new file mode 100644
index 000000000000..51e60a711a7a
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch
@@ -0,0 +1,14 @@
+diff --git a/build/rust/cargo_crate.gni b/build/rust/cargo_crate.gni
+index 8266c44cbd1dfb8a53797dbe911ea74c32ce070e..ec7d751f2d068151dfeb71aa1f6510483bebd95c 100644
+--- a/build/rust/cargo_crate.gni
++++ b/build/rust/cargo_crate.gni
+@@ -285,6 +285,9 @@ template("cargo_crate") {
+     }
+     rustenv = _rustenv
+
++    # TODO(crbug.com/424424323): Clean up and enable.
++    rustflags += [ "-Amismatched_lifetime_syntaxes" ]
++
+     if (!defined(build_native_rust_unit_tests)) {
+       build_native_rust_unit_tests = _crate_type != "proc-macro"
+     }

From 283050e8c7ee88b1bc3d2614449ade12b01c63cd Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Tue, 19 Aug 2025 13:23:34 +0200
Subject: [PATCH 2028/3724] electron: fix build with rust 1.89.0

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

diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index f2a2c60da5a8..3bc8a00dcae6 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -131,6 +131,15 @@ in
         url = "https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch";
         hash = "sha256-z/aQ1oQjFZnkUeRnrD6P/WDZiYAI1ncGhOUM+HmjMZA=";
       })
+    ]
+    # Fix build with Rust 1.89.0
+    ++ lib.optionals (lib.versionOlder info.version "38") [
+      # https://chromium-review.googlesource.com/c/chromium/src/+/6624733
+      (fetchpatch {
+        name = "Define-rust-no-alloc-shim-is-unstable-v2.patch";
+        url = "https://github.com/chromium/chromium/commit/6aae0e2353c857d98980ff677bf304288d7c58de.patch";
+        hash = "sha256-Dd38c/0hiH+PbGPJhhEFuW6kUR45A36XZqOVExoxlhM=";
+      })
     ];
 
   npmRoot = "third_party/node";

From 5ebd24de1aabe9f8fd530186227cf612a39771d9 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 19 Aug 2025 20:33:48 +0200
Subject: [PATCH 2029/3724] subsurface: fix build, remove vulnerable
 qtwebengine

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

diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 6387913ac373..af04df0d2ece 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -23,7 +23,7 @@
   qtlocation,
   qtsvg,
   qttools,
-  qtwebengine,
+  qtpositioning,
   libXcomposite,
   bluez,
   writeScript,
@@ -142,7 +142,7 @@ stdenv.mkDerivation {
     qtconnectivity
     qtsvg
     qttools
-    qtwebengine
+    qtpositioning
   ];
 
   nativeBuildInputs = [

From 45ed32fbc612f7c70305bc0872fcdfa5eb84745f Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 19 Aug 2025 20:34:24 +0200
Subject: [PATCH 2030/3724] supercollider: disable vulnerable qtwebengine by
 default

---
 pkgs/development/interpreters/supercollider/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 45e00a910d6d..7012f621380c 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -26,6 +26,7 @@
   supercolliderPlugins,
   writeText,
   runCommand,
+  withWebengine ? false, # vulnerable, so disabled by default
 }:
 
 mkDerivation rec {
@@ -64,10 +65,10 @@ mkDerivation rec {
     curl
     libXt
     qtbase
-    qtwebengine
     qtwebsockets
     readline
   ]
+  ++ lib.optional withWebengine qtwebengine
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
 
   hardeningDisable = [ "stackprotector" ];
@@ -75,6 +76,7 @@ mkDerivation rec {
   cmakeFlags = [
     "-DSC_WII=OFF"
     "-DSC_EL=${if useSCEL then "ON" else "OFF"}"
+    (lib.cmakeBool "SC_USE_QTWEBENGINE" withWebengine)
   ];
 
   passthru = {

From fdaf9ac0214d7dea1b3e573434cd96c0d10c9d76 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 19 Aug 2025 20:34:54 +0200
Subject: [PATCH 2031/3724] python312Packages.pyside2: disable vulnerable
 qtwebengine by default

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

diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix
index 29c1eae0a9cd..bae24f891b33 100644
--- a/pkgs/development/python-modules/pyside2/default.nix
+++ b/pkgs/development/python-modules/pyside2/default.nix
@@ -8,6 +8,7 @@
   ninja,
   qt5,
   shiboken2,
+  withWebengine ? false, # vulnerable, so omit by default
 }:
 stdenv.mkDerivation rec {
   pname = "pyside2";
@@ -67,13 +68,15 @@ stdenv.mkDerivation rec {
       qtlocation
       qtscript
       qtwebsockets
-      qtwebengine
       qtwebchannel
       qtcharts
       qtsensors
       qtsvg
       qt3d
     ])
+    ++ lib.optionals withWebengine [
+      qt5.qtwebengine
+    ]
     ++ (with python.pkgs; [ setuptools ])
     ++ (lib.optionals (python.pythonOlder "3.9") [
       # see similar issue: 202262

From 5e000f2c8fa3de57c12ea4f1baa7379eec64e86b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 9 Aug 2025 22:48:54 +0100
Subject: [PATCH 2032/3724] creduce: 2.10.0 -> 2.10.0-unstable-2024-06-01
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We were already applying a ton of commits on top of the latest stable
release, including fixes for newer LLVM versions. Let’s bump to
the latest commit and pick up support for LLVM 18.

There are in‐flight PRs for LLVM 19 and 20:

* <https://github.com/csmith-project/creduce/pull/285>
* <https://github.com/csmith-project/creduce/pull/287>
---
 .../tools/misc/creduce/default.nix            | 49 ++++++-------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix
index 3efde95d5851..1984e22780c6 100644
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -1,8 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitHub,
   cmake,
   makeWrapper,
   llvm,
@@ -15,41 +14,23 @@
 
 stdenv.mkDerivation rec {
   pname = "creduce";
-  version = "2.10.0";
+  version = "2.10.0-unstable-2024-06-01";
 
-  src = fetchurl {
-    url = "https://embed.cs.utah.edu/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "2xwPEjln8k1iCwQM69UwAb89zwPkAPeFVqL/LhH+oGM=";
+  src = fetchFromGitHub {
+    owner = "csmith-project";
+    repo = "creduce";
+    rev = "31e855e290970cba0286e5032971509c0e7c0a80";
+    hash = "sha256-RbxFqZegsCxnUaIIA5OfTzx1wflCPeF+enQt90VwMgA=";
   };
 
-  patches = [
-    # Port to LLVM 15
-    (fetchpatch {
-      url = "https://github.com/csmith-project/creduce/commit/e507cca4ccb32585c5692d49b8d907c1051c826c.patch";
-      hash = "sha256-jO5E85AvHcjlErbUhzuQDXwQkhQsXklcTMQfWBd09OU=";
-    })
-    (fetchpatch {
-      url = "https://github.com/csmith-project/creduce/commit/8d56bee3e1d2577fc8afd2ecc03b1323d6873404.patch";
-      hash = "sha256-dRaBaJAYkvMyxKvfriOcg4D+4i6+6orZ85zws1AFx/s=";
-    })
-    # Port to LLVM 16
-    (fetchpatch {
-      url = "https://github.com/csmith-project/creduce/commit/8ab9a69caf13ce24172737e8bfd09de51a1ecb6a.patch";
-      hash = "sha256-gPNXxYHnsyUvXmC0CGtsulH2Fu/EMnDE4GdOYc0UbiQ=";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace "-std=c++11" "-std=c++17"
-  ''
-  # On Linux, c-reduce's preferred way to reason about
-  # the cpu architecture/topology is to use 'lscpu',
-  # so let's make sure it knows where to find it:
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
-    substituteInPlace creduce/creduce_utils.pm --replace \
-      lscpu ${util-linux}/bin/lscpu
-  '';
+  postPatch =
+    # On Linux, c-reduce's preferred way to reason about
+    # the cpu architecture/topology is to use 'lscpu',
+    # so let's make sure it knows where to find it:
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      substituteInPlace creduce/creduce_utils.pm --replace \
+        lscpu ${util-linux}/bin/lscpu
+    '';
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a08d4f67c496..17fd4bc08fc0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7011,7 +7011,7 @@ with pkgs;
   credstash = with python3Packages; toPythonApplication credstash;
 
   creduce = callPackage ../development/tools/misc/creduce {
-    inherit (llvmPackages_16) llvm libclang;
+    inherit (llvmPackages_18) llvm libclang;
   };
 
   inherit (nodePackages) csslint;

From a7c62515f4b143ae11f18d2739ade7e37804afce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 18:50:38 +0000
Subject: [PATCH 2033/3724] traccar: 6.8.1 -> 6.9.0

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

diff --git a/pkgs/by-name/tr/traccar/package.nix b/pkgs/by-name/tr/traccar/package.nix
index b0464ba61b15..e58b134fdb8b 100644
--- a/pkgs/by-name/tr/traccar/package.nix
+++ b/pkgs/by-name/tr/traccar/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "traccar";
-  version = "6.8.1";
+  version = "6.9.0";
   nativeBuildInputs = [ pkgs.makeWrapper ];
 
   src = fetchzip {
     stripRoot = false;
     url = "https://github.com/traccar/traccar/releases/download/v${version}/traccar-other-${version}.zip";
-    hash = "sha256-bc4IJCEMM5qd1gOvNKcmX1dcyB4DTS4bpKkHTL+qtEQ=";
+    hash = "sha256-UILLCRzefPY6AWzy1AOLFu1L+h22VylMAR/25pE9RGE=";
   };
 
   installPhase = ''

From d89ab7ff0799e518a351ece97a4c784677dc2979 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 19 Aug 2025 20:55:27 +0200
Subject: [PATCH 2034/3724] qt5.qtwebengine: mark vulnerable

---
 .../libraries/qt-5/modules/qtwebengine.nix    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 75c8eb7d19b9..a4a2ece44ce7 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -464,6 +464,43 @@ qtModule (
 
       # This build takes a long time; particularly on slow architectures
       timeout = 24 * 3600;
+
+      knownVulnerabilities = [
+        ''
+          qt5 qtwebengine is unmaintained upstream since april 2025.
+          It is based on chromium 87.0.4280.144, and supposedly patched up to 135.0.7049.95 which is outdated.
+
+          Security issues are frequently discovered in chromium.
+          The following list of CVEs was fixed in the life cycle of chromium 138 and likely also affects qtwebengine:
+          - CVE-2025-8879
+          - CVE-2025-8880
+          - CVE-2025-8901
+          - CVE-2025-8881
+          - CVE-2025-8882
+          - CVE-2025-8576
+          - CVE-2025-8577
+          - CVE-2025-8578
+          - CVE-2025-8579
+          - CVE-2025-8580
+          - CVE-2025-8581
+          - CVE-2025-8582
+          - CVE-2025-8583
+          - CVE-2025-8292
+          - CVE-2025-8010
+          - CVE-2025-8011
+          - CVE-2025-7656
+          - CVE-2025-6558 (known to be exploited in the wild)
+          - CVE-2025-7657
+          - CVE-2025-6554
+          - CVE-2025-6555
+          - CVE-2025-6556
+          - CVE-2025-6557
+
+          The actual list of CVEs affecting qtwebengine is likely much longer,
+          as this list is missing issues fixed in chromium 136/137 and even more
+          issues are continuously discovered and lack upstream fixes in qtwebengine.
+        ''
+      ];
     };
 
   }

From 1c8b9723063f1a9ac372bfc25ffb9a9aacbe8309 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 19 Aug 2025 21:20:04 +0200
Subject: [PATCH 2035/3724] tests.stdenv-inputs: deprecate phases

---
 pkgs/test/stdenv-inputs/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/test/stdenv-inputs/default.nix b/pkgs/test/stdenv-inputs/default.nix
index e52dd0a68c54..9ffe2e6479ce 100644
--- a/pkgs/test/stdenv-inputs/default.nix
+++ b/pkgs/test/stdenv-inputs/default.nix
@@ -42,14 +42,13 @@ in
 
 stdenv.mkDerivation {
   name = "stdenv-inputs-test";
-  phases = [ "buildPhase" ];
 
   buildInputs = [
     foo
     bar
   ];
 
-  buildPhase = ''
+  buildCommand = ''
     env
 
     printf "checking whether binaries are available... " >&2

From 095e8bf81b44267f74977414a4aedb777b646e5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 19:20:36 +0000
Subject: [PATCH 2036/3724] orchard: 0.37.0 -> 0.38.0

---
 pkgs/by-name/or/orchard/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix
index 2f85633231a3..76dd0012c267 100644
--- a/pkgs/by-name/or/orchard/package.nix
+++ b/pkgs/by-name/or/orchard/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "orchard";
-  version = "0.37.0";
+  version = "0.38.0";
 
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = "orchard";
     rev = version;
-    hash = "sha256-V5pBiF1IIfyyZIAoHnAccZ6YNddA4MosEJROJVEpwoo=";
+    hash = "sha256-FKawq1GN7Uz3NGmqw3za8+X4bZiFyFPMxM5PPtpKDrs=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -24,7 +24,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-VHEj4y7XSfdbSeBo9+ZwBZXUj/ur0w6gPrxCt2xNQMM=";
+  vendorHash = "sha256-GYAcRC9OMhlOax1s33SrgtbbAlyE9w8Zn4AL7bQrcNk=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b2c520ff179defd2ab71c651b0880d7ffded32cd Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Tue, 19 Aug 2025 12:46:06 -0700
Subject: [PATCH 2037/3724] pigment: fix changelog

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

diff --git a/pkgs/by-name/pi/pigment/package.nix b/pkgs/by-name/pi/pigment/package.nix
index 95135595e94b..4ff5383133c6 100644
--- a/pkgs/by-name/pi/pigment/package.nix
+++ b/pkgs/by-name/pi/pigment/package.nix
@@ -60,7 +60,7 @@ python3Packages.buildPythonApplication {
     description = "Extract color palettes from your images";
     homepage = "https://jeffser.com/pigment/";
     downloadPage = "https://github.com/Jeffser/Pigment";
-    changelog = "https://github.com/Jeffser/Pigment/releases/tag/v${version}";
+    changelog = "https://github.com/Jeffser/Pigment/releases/tag/${version}";
     license = lib.licenses.gpl3Plus;
     mainProgram = "pigment";
     platforms = lib.platforms.linux;

From 6425d8cc3c54758ac6366487c33a106a5ab33913 Mon Sep 17 00:00:00 2001
From: cupcakearmy <hi@nicco.io>
Date: Tue, 19 Aug 2025 22:44:42 +0200
Subject: [PATCH 2038/3724] add auto update

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

diff --git a/pkgs/by-name/nv/nvs/package.nix b/pkgs/by-name/nv/nvs/package.nix
index a445c397b79c..e73c3a5e2f76 100644
--- a/pkgs/by-name/nv/nvs/package.nix
+++ b/pkgs/by-name/nv/nvs/package.nix
@@ -4,6 +4,7 @@
   installShellFiles,
   writableTmpDirAsHomeHook,
   lib,
+  nix-update-script,
 }:
 buildGoModule (finalAttrs: {
   pname = "nvs";
@@ -37,6 +38,10 @@ buildGoModule (finalAttrs: {
 
   __darwinAllowLocalNetworking = true;
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     mainProgram = "nvs";
     description = "Lightweight Neovim Version & Config Manager CLI tool to install, switch, list, uninstall, and reset Neovim versions";

From f0d5c58561ab6bab0a4e9a9ea1804f8c5bcc05f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 20:57:27 +0000
Subject: [PATCH 2039/3724] circleci-cli: 0.1.32638 -> 0.1.33128

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

diff --git a/pkgs/by-name/ci/circleci-cli/package.nix b/pkgs/by-name/ci/circleci-cli/package.nix
index 7d2f47a4b023..3d9a594fe2fe 100644
--- a/pkgs/by-name/ci/circleci-cli/package.nix
+++ b/pkgs/by-name/ci/circleci-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "circleci-cli";
-  version = "0.1.32638";
+  version = "0.1.33128";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = "circleci-cli";
     rev = "v${version}";
-    sha256 = "sha256-cKW8jJdKiFkCR5RRMMlmzq8G+SvIXzzkNIbQXh77wro=";
+    sha256 = "sha256-8rh/cG0ottG65ogACjA5sdf9M3satR4S0iZctZwzqkE=";
   };
 
   vendorHash = "sha256-RQK51VSag1AkJMa/rmWpSuuzhRqSG2a3+sNisp0q7lU=";

From ecdafc32922087480ad7d6f64fc86f3223f1fa00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 21:00:11 +0000
Subject: [PATCH 2040/3724] bpftop: 0.6.0 -> 0.7.0

---
 pkgs/by-name/bp/bpftop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bp/bpftop/package.nix b/pkgs/by-name/bp/bpftop/package.nix
index cc34a773f68f..4421eb8e9dac 100644
--- a/pkgs/by-name/bp/bpftop/package.nix
+++ b/pkgs/by-name/bp/bpftop/package.nix
@@ -10,7 +10,7 @@
 }:
 let
   pname = "bpftop";
-  version = "0.6.0";
+  version = "0.7.0";
 in
 rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } {
   inherit pname version;
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } {
     owner = "Netflix";
     repo = "bpftop";
     tag = "v${version}";
-    hash = "sha256-oilSWF3dCbJIPtkxwj76qReh5Rp8ZRiH2nVriK6d3fk=";
+    hash = "sha256-h6iNc2z5UF+Z4FTaZXfhbz7gIIGlT8pbJ7OcP6uZENc=";
   };
 
-  cargoHash = "sha256-k5cRj66OSXsCXUPWrBYrOFq8aohaB/afd8IGj0QqvuE=";
+  cargoHash = "sha256-Z7E61XiEKM6zKm7LFIXPYCFoSwSHfq6QCfbRMmiBW+o=";
 
   buildInputs = [
     elfutils

From 62c8276ad3d44404e07ea927135ce2c5b9471197 Mon Sep 17 00:00:00 2001
From: Uriel <imurx@proton.me>
Date: Tue, 19 Aug 2025 01:09:04 -0400
Subject: [PATCH 2041/3724] slimevr: 0.16.0 -> 0.16.2

---
 pkgs/by-name/sl/slimevr-server/deps.json | 16 +++++---------
 pkgs/by-name/sl/slimevr/package.nix      | 27 +++++++++---------------
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/sl/slimevr-server/deps.json b/pkgs/by-name/sl/slimevr-server/deps.json
index 0a9f2605b5b9..4358958894be 100644
--- a/pkgs/by-name/sl/slimevr-server/deps.json
+++ b/pkgs/by-name/sl/slimevr-server/deps.json
@@ -27,17 +27,6 @@
   }
  },
  "https://oss.sonatype.org/content/repositories/snapshots": {
-  "com/fazecast#jSerialComm/2.11.1-20240515.234541-3/SNAPSHOT": {
-   "jar": "sha256-n4A3U5elHQhq9b0YVgvWCuXAHqt0RzxL5e4Fe4iGTkM=",
-   "module": "sha256-xeVUO5f2Imx43EgYUI5vbLXyyEmJh/jT106eLUWtUYg=",
-   "pom": "sha256-y+ZXr7k89vlAHOMZmlTNYl8D0Nki+6CDame/QNX/e2M="
-  },
-  "com/fazecast/jSerialComm/2.11.1-SNAPSHOT/maven-metadata": {
-   "xml": {
-    "groupId": "com.fazecast",
-    "lastUpdated": "20241221185706"
-   }
-  },
   "net/java/dev/jna#jna-platform/5.1.1-20181118.214522-1/SNAPSHOT": {
    "pom": "sha256-STVISbMwC8BymYDxq6UJhC3ZWqO+p7iA7lRW34ZcX6g="
   },
@@ -560,6 +549,11 @@
   "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.1": {
    "pom": "sha256-xLCopnocY3IgeJlhd5bYafE/UerrGsN/wHqcpxPaQjU="
   },
+  "com/fazecast#jSerialComm/2.11.2": {
+   "jar": "sha256-IG2ScOZI3wMyR+deuECTpek9ePB8U+X+H6n8SmAaxXY=",
+   "module": "sha256-9ogHv84GSzOaAwFlbzbffC8GORkp7GKOyGyOMK7bufw=",
+   "pom": "sha256-jc/TZu3kSH1ZOSy+OvUaN3cUT09dRPinstTcvwBB38I="
+  },
   "com/github/jonpeterson#jackson-module-model-versioning/1.2.2": {
    "jar": "sha256-FcepndfH5cTcOLXkhn1TZw1YDYqAXvQ4A7qT8IN2Uc0=",
    "pom": "sha256-eN9L1tMAM6b3JUkuBewt0shfbc7EYm6wWT6KpO9f0ic="
diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix
index 039e001de7ac..6ff93fb9c034 100644
--- a/pkgs/by-name/sl/slimevr/package.nix
+++ b/pkgs/by-name/sl/slimevr/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitHub,
-  fetchpatch,
   stdenv,
   replaceVars,
   makeWrapper,
@@ -17,30 +16,31 @@
   webkitgtk_4_1,
   gst_all_1,
   libayatana-appindicator,
+  udevCheckHook,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "slimevr";
-  version = "0.16.0";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     owner = "SlimeVR";
     repo = "SlimeVR-Server";
-    rev = "v${version}";
-    hash = "sha256-ZYL+aBrADbzSXnhFzxNk8xRrY0WHmHCtVaC6VfXfLJw=";
+    tag = "v${version}";
+    hash = "sha256-g0SDienJX7ZUbypeIAWSwjxgu40AFd3jVALuMhHj6mQ=";
     # solarxr
     fetchSubmodules = true;
   };
 
   buildAndTestSubdir = "gui/src-tauri";
 
-  cargoHash = "sha256-+WrBVL4/XslJSOwuxs4IzqXG9l1/lMSbKil/8OHc9Xw=";
+  cargoHash = "sha256-w2z+EQqkVGLmXQS+AzeJwkGG4ovpz9+ovmLOcUks734=";
 
   pnpmDeps = pnpm_9.fetchDeps {
     pname = "${pname}-pnpm-deps";
     inherit version src;
     fetcherVersion = 1;
-    hash = "sha256-lh5IKdBXuH9GZFUTrzaQFDWCEYj0UJhKwCdPmsiwfCs=";
+    hash = "sha256-b0oCOjxrUQqWmUR6IzTEO75pvJZB7MQD14DNbQm95sA=";
   };
 
   nativeBuildInputs = [
@@ -50,6 +50,7 @@ rustPlatform.buildRustPackage rec {
     pkg-config
     wrapGAppsHook3
     makeWrapper
+    udevCheckHook
   ];
 
   buildInputs = [
@@ -85,17 +86,6 @@ rustPlatform.buildRustPackage rec {
       --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
     substituteInPlace gui/src-tauri/src/tray.rs \
       --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
-
-    # tao < version 0.31 has a GTK crash. Manually apply the fix.
-    pushd $cargoDepsCopy/tao-0.30.*
-    patch -p1 < ${
-      fetchpatch {
-        name = "fix-gtk-crash.patch";
-        url = "https://github.com/tauri-apps/tao/commit/83e35e961f4893790b913ee2efc15ae33fd16fb2.diff";
-        hash = "sha256-FNXWzsg4lO6VbLsqS6NevX8kVj26YtcYdKbbFejq9hM=";
-      }
-    }
-    popd
   '';
 
   # solarxr needs to be installed after compiling its Typescript files. This isn't
@@ -105,11 +95,14 @@ rustPlatform.buildRustPackage rec {
   '';
 
   doCheck = false; # No tests
+  doInstallCheck = true; # Check udev
 
   # Get rid of placeholder slimevr.jar
   postInstall = ''
     rm $out/share/slimevr/slimevr.jar
     rm -d $out/share/slimevr
+
+    install -Dm644 -t $out/lib/udev/rules.d/ gui/src-tauri/69-slimevr-devices.rules
   '';
 
   # `JAVA_HOME`, `JAVA_TOOL_OPTIONS`, and `--launch-from-path` are so the GUI can

From bbbd0b95cb1b11afd48e8a24ed63d1760c11654a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Aug 2025 21:25:33 +0000
Subject: [PATCH 2042/3724] sqldef: 2.0.8 -> 2.0.9

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

diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix
index c2d1f8488902..121109223a1c 100644
--- a/pkgs/by-name/sq/sqldef/package.nix
+++ b/pkgs/by-name/sq/sqldef/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "sqldef";
-  version = "2.0.8";
+  version = "2.0.9";
 
   src = fetchFromGitHub {
     owner = "sqldef";
     repo = "sqldef";
     rev = "v${version}";
-    hash = "sha256-woPRBrZvTSlNnzhGHqYFO4MJRlIuqXzcSBUzkF88aJw=";
+    hash = "sha256-9RTmOBFLJIUEpLSqQ7X8ju/+j3ggD7p7KR5EvUvNp5c=";
   };
 
   proxyVendor = true;

From 1c07e33376cb75b1c5af04afa1293a106668c32f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 19 Aug 2025 23:12:32 +0200
Subject: [PATCH 2043/3724] python3Packages.tinygrad: 0.10.3 -> 0.11.0

Diff: https://github.com/tinygrad/tinygrad/compare/v0.10.3...v0.11.0

Changelog: https://github.com/tinygrad/tinygrad/releases/tag/v0.11.0
---
 .../python-modules/tinygrad/default.nix       | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix
index 1cbfb24fd643..e59579ea8b33 100644
--- a/pkgs/development/python-modules/tinygrad/default.nix
+++ b/pkgs/development/python-modules/tinygrad/default.nix
@@ -56,14 +56,14 @@
 
 buildPythonPackage rec {
   pname = "tinygrad";
-  version = "0.10.3";
+  version = "0.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tinygrad";
     repo = "tinygrad";
     tag = "v${version}";
-    hash = "sha256-IQ0EAjj8kYUwzvMsAiNnvRm/twC40r9JWXUocaETjC8=";
+    hash = "sha256-VG2rhkiwPFN3JYSBbqrwCdqhdGE8GY6oEatMSCydhw8=";
   };
 
   patches = [
@@ -177,12 +177,8 @@ buildPythonPackage rec {
     # AssertionError: 2.1376906810000946 not less than 2.0
     "test_recursive_pad"
 
-    # Since updated onnx to 1.18.0:
-    # onnxruntime.capi.onnxruntime_pybind11_state.Fail: [ONNXRuntimeError] : 1 : FAIL : Load model from ...
-    # Unsupported model IR version: 11, max supported IR version: 10
-    "test_quant_128"
-
     # Require internet access
+    "testCopySHMtoDefault"
     "test_benchmark_openpilot_model"
     "test_bn_alone"
     "test_bn_linear"
@@ -191,13 +187,21 @@ buildPythonPackage rec {
     "test_chicken"
     "test_chicken_bigbatch"
     "test_conv_mnist"
-    "testCopySHMtoDefault"
     "test_data_parallel_resnet"
+    "test_dataset_is_realized"
     "test_e2e_big"
     "test_fetch_small"
     "test_huggingface_enet_safetensors"
     "test_index_mnist"
     "test_linear_mnist"
+    "test_llama_basic"
+    "test_llama_bytes"
+    "test_llama_control_char"
+    "test_llama_early_tokenize"
+    "test_llama_pat"
+    "test_llama_repeat"
+    "test_llama_special1"
+    "test_llama_special2"
     "test_load_convnext"
     "test_load_enet"
     "test_load_enet_alt"

From 686b3253f579a12278394b58e8a55bae4d1138e2 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Tue, 19 Aug 2025 22:41:08 +0900
Subject: [PATCH 2044/3724] hashcat: 7.0.0 -> 7.1.1

https://github.com/hashcat/hashcat/releases/tag/v7.1.0
https://github.com/hashcat/hashcat/releases/tag/v7.1.1

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 .../ha/hashcat/0001-python-shebangs.patch     | 42 -------------------
 pkgs/by-name/ha/hashcat/package.nix           |  8 +---
 2 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/by-name/ha/hashcat/0001-python-shebangs.patch

diff --git a/pkgs/by-name/ha/hashcat/0001-python-shebangs.patch b/pkgs/by-name/ha/hashcat/0001-python-shebangs.patch
deleted file mode 100644
index d9715b864036..000000000000
--- a/pkgs/by-name/ha/hashcat/0001-python-shebangs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/tools/bitlocker2hashcat.py b/tools/bitlocker2hashcat.py
-index f7501a37b..a72fb8c78 100755
---- a/tools/bitlocker2hashcat.py
-+++ b/tools/bitlocker2hashcat.py
-@@ -1,3 +1,5 @@
-+#!/usr/bin/env python3
-+
- # Construct a hash for use with hashcat mode 22100
- # Usage: python3 bitlocker2hashcat.py <bitlocker_image> -o <bitlocker_partition_offset>
- # Hashcat supports modes $bitlocker$0$ and $bitlocker$1$ and therefore this script will output hashes that relate to a VMK protected by a user password only.
-diff --git a/tools/keybag2hashcat.py b/tools/keybag2hashcat.py
-index 83da25c5e..6a30384ac 100755
---- a/tools/keybag2hashcat.py
-+++ b/tools/keybag2hashcat.py
-@@ -1,3 +1,5 @@
-+#!/usr/bin/env python3
-+
- import argparse
- import logging
- import sys
-diff --git a/tools/shiro1-to-hashcat.py b/tools/shiro1-to-hashcat.py
-old mode 100755
-new mode 100644
-index 9619530ef..86ee8e502
---- a/tools/shiro1-to-hashcat.py
-+++ b/tools/shiro1-to-hashcat.py
-@@ -1,3 +1,5 @@
-+#!/usr/bin/env python3
-+
- import os
- import re
- import glob
-diff --git a/tools/veeamvbk2hashcat.py b/tools/veeamvbk2hashcat.py
-index e8d6ac05c..5f6d1977a 100755
---- a/tools/veeamvbk2hashcat.py
-+++ b/tools/veeamvbk2hashcat.py
-@@ -1,3 +1,5 @@
-+#!/usr/bin/env python3
-+
- import argparse
- import binascii
- 
diff --git a/pkgs/by-name/ha/hashcat/package.nix b/pkgs/by-name/ha/hashcat/package.nix
index c4f8f9f6b295..bbc17b29453a 100644
--- a/pkgs/by-name/ha/hashcat/package.nix
+++ b/pkgs/by-name/ha/hashcat/package.nix
@@ -19,17 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hashcat";
-  version = "7.0.0";
+  version = "7.1.1";
 
   src = fetchurl {
     url = "https://hashcat.net/files/hashcat-${version}.tar.gz";
-    sha256 = "sha256-hCtx0NNLAgAFiCR6rp/smg/BMnfyzTpqSSWw8Jszv3U=";
+    sha256 = "sha256-HN9tswWAiNfjiD9jUZtdNF29oBhOyOHhy5hOElXil/A=";
   };
 
-  patches = [
-    ./0001-python-shebangs.patch
-  ];
-
   postPatch = ''
      # MACOSX_DEPLOYMENT_TARGET is defined by the enviroment
      # Remove hardcoded paths on darwin

From c4d9e6d21924564b148d5901415bb24fb66b45a7 Mon Sep 17 00:00:00 2001
From: Anna Aurora <anna@annaaurora.eu>
Date: Wed, 20 Aug 2025 02:08:43 +0200
Subject: [PATCH 2045/3724] filius,ipfetch,starfetch: fix use of deprecated
 command options

Replace the substitute command's deprecated "--replace" option with appropriate
non-deprecated options.
---
 pkgs/by-name/fi/filius/package.nix    | 2 +-
 pkgs/by-name/ip/ipfetch/package.nix   | 2 +-
 pkgs/by-name/st/starfetch/package.nix | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/filius/package.nix b/pkgs/by-name/fi/filius/package.nix
index 9353cacba7ee..0affead69df3 100644
--- a/pkgs/by-name/fi/filius/package.nix
+++ b/pkgs/by-name/fi/filius/package.nix
@@ -28,7 +28,7 @@ maven.buildMavenPackage rec {
 
   postPatch = ''
     substituteInPlace src/deb/filius.desktop \
-      --replace 'Exec=/usr/share/filius/filius.sh' 'Exec=filius'
+      --replace-fail 'Exec=/usr/share/filius/filius.sh' 'Exec=filius'
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ip/ipfetch/package.nix b/pkgs/by-name/ip/ipfetch/package.nix
index ed4bf9b41b85..bc7f93e89a36 100644
--- a/pkgs/by-name/ip/ipfetch/package.nix
+++ b/pkgs/by-name/ip/ipfetch/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   postPatch = ''
     patchShebangs --host ipfetch
     # Not only does `/usr` have to be replaced but also `/flags` needs to be added because with Nix the script is broken without this. The `/flags` is somehow not needed if you install via the install script in the source repository.
-    substituteInPlace ./ipfetch --replace /usr/share/ipfetch $out/usr/share/ipfetch/flags
+    substituteInPlace ./ipfetch --replace-fail /usr/share/ipfetch $out/usr/share/ipfetch/flags
   '';
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/by-name/st/starfetch/package.nix b/pkgs/by-name/st/starfetch/package.nix
index 3abcb42bc0d2..bbdd6db4aad8 100644
--- a/pkgs/by-name/st/starfetch/package.nix
+++ b/pkgs/by-name/st/starfetch/package.nix
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
   };
 
   postPatch = ''
-    substituteInPlace src/starfetch.cpp --replace /usr/local/ $out/
+    substituteInPlace src/starfetch.cpp --replace-fail /usr/local/ $out/
   ''
   + lib.optionalString stdenv.cc.isClang ''
-    substituteInPlace makefile --replace g++ clang++
+    substituteInPlace makefile --replace-warn g++ clang++
   '';
 
   installPhase = ''

From dd0725d19e80db8f8c708c71144a4a03bd8fab1b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 01:36:59 +0200
Subject: [PATCH 2046/3724] python3Packages.aws-encryption-sdk: fix src and
 tests

---
 .../python-modules/aws-encryption-sdk/default.nix    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/aws-encryption-sdk/default.nix b/pkgs/development/python-modules/aws-encryption-sdk/default.nix
index bdfe21d15840..022132fb579c 100644
--- a/pkgs/development/python-modules/aws-encryption-sdk/default.nix
+++ b/pkgs/development/python-modules/aws-encryption-sdk/default.nix
@@ -4,7 +4,7 @@
   boto3,
   buildPythonPackage,
   cryptography,
-  fetchPypi,
+  fetchFromGitHub,
   mock,
   pytest-mock,
   pytestCheckHook,
@@ -20,9 +20,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-kRqQCYBzLlCbhuBEP+O9zuSAdgpGDg9wLzYFZaIPOIg=";
+  src = fetchFromGitHub {
+    owner = "aws";
+    repo = "aws-encryption-sdk-python";
+    tag = "v${version}";
+    hash = "sha256-yuehAxVEqnlNMMIqA0imAJaIjV5nzYbQk84l8STtBVo=";
   };
 
   build-system = [ setuptools ];
@@ -40,6 +42,8 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  enabledTestPaths = [ "test" ];
+
   disabledTestPaths = [
     # Tests require networking
     "examples"

From ed570932346afd3993da47b67d70023ff49b1083 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 01:39:53 +0200
Subject: [PATCH 2047/3724] python3Packages.allure-behave: fix src, refactor

---
 .../python-modules/allure-behave/default.nix  | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix
index 8dcc076cab59..a4a8069039c4 100644
--- a/pkgs/development/python-modules/allure-behave/default.nix
+++ b/pkgs/development/python-modules/allure-behave/default.nix
@@ -1,8 +1,7 @@
 {
   lib,
-  fetchPypi,
+  fetchFromGitHub,
   buildPythonPackage,
-  pythonOlder,
   behave,
   allure-python-commons,
   setuptools-scm,
@@ -11,24 +10,28 @@
 buildPythonPackage rec {
   pname = "allure-behave";
   version = "2.15.0";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-puJuaeA6uFJRF1ZS7jWY55Mmk2Y4SQiuhZGEGi7yexs=";
+  src = fetchFromGitHub {
+    owner = "allure-framework";
+    repo = "allure-python";
+    tag = version;
+    hash = "sha256-I3Zh9frOplcPqLd8b4peNM9WtbNmQjHX6ocVJJwPzyc=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  sourceRoot = "${src.name}/allure-behave";
 
-  pythonImportsCheck = [ "allure_behave" ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     allure-python-commons
     behave
   ];
 
+  doCheck = false; # no tests
+
+  pythonImportsCheck = [ "allure_behave" ];
+
   meta = with lib; {
     description = "Allure behave integration";
     homepage = "https://github.com/allure-framework/allure-python";

From 49b066a3658533e9d94278d6d12b64ea37a00e7f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 01:42:14 +0200
Subject: [PATCH 2048/3724] python3Packages.dbutils: fix src

---
 .../python-modules/dbutils/default.nix           | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix
index e287ecb5caad..55b5aa1f9362 100644
--- a/pkgs/development/python-modules/dbutils/default.nix
+++ b/pkgs/development/python-modules/dbutils/default.nix
@@ -1,10 +1,9 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -12,15 +11,14 @@ buildPythonPackage rec {
   version = "3.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
-  src = fetchPypi {
-    inherit version;
-    pname = "DBUtils";
-    hash = "sha256-reefvFeG10ltQThyL7yiQ0DPfHO11m3wUpb2Vv8Ia78=";
+  src = fetchFromGitHub {
+    owner = "WebwareForPython";
+    repo = "DBUtils";
+    tag = "Release-${lib.replaceStrings [ "." ] [ "_" ] version}";
+    hash = "sha256-YyZKGN7oNuCR4lU7pxkY+vLOWGQzQjqvAIOZc7LlvUM=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 884a05f67fbe754d1d5fe5eaaae75d28a273238f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 01:46:23 +0200
Subject: [PATCH 2049/3724] python3Packages.bc-python-hcl2: fix src and
 homepage

---
 .../python-modules/bc-python-hcl2/default.nix      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix
index e253b4a1911e..51e9aa3d8da4 100644
--- a/pkgs/development/python-modules/bc-python-hcl2/default.nix
+++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   lark,
   pythonOlder,
   setuptools,
@@ -14,9 +14,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-+uYrKkGmda0zDRNNgldlJtt1X3K70OWoUN49hfwkxA4=";
+  src = fetchFromGitHub {
+    owner = "bridgecrewio";
+    repo = "python-hcl2";
+    tag = version;
+    hash = "sha256-Auk5xDLw2UhMzWa7YMKzwUSjhD9s6xHt8RcXMzzL8M0=";
   };
 
   build-system = [ setuptools ];
@@ -34,9 +36,7 @@ buildPythonPackage rec {
       This parser only supports HCL2 and isn't backwards compatible with HCL v1.
       It can be used to parse any HCL2 config file such as Terraform.
     '';
-    # Although this is the main homepage from PyPi but it is also a homepage
-    # of another PyPi package (python-hcl2). But these two are different.
-    homepage = "https://github.com/amplify-education/python-hcl2";
+    homepage = "https://github.com/bridgecrewio/python-hcl2";
     license = licenses.mit;
     maintainers = with maintainers; [ anhdle14 ];
     mainProgram = "hcl2tojson";

From 029e721d9ca0dba53d56493474589a1d725b025a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 01:49:34 +0200
Subject: [PATCH 2050/3724] python3Packages.jug: fix src, refactor

---
 .../python-modules/jug/default.nix            | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix
index 311ace4bcdc8..b8e921969b60 100644
--- a/pkgs/development/python-modules/jug/default.nix
+++ b/pkgs/development/python-modules/jug/default.nix
@@ -2,28 +2,29 @@
   lib,
   bottle,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   numpy,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   redis,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "jug";
   version = "2.4.0";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    pname = "Jug";
-    inherit version;
-    hash = "sha256-B6We+9bW0dfT5DUsxU212e7ueyRc8GgBVPVnIek8ckU=";
+  src = fetchFromGitHub {
+    owner = "luispedro";
+    repo = "jug";
+    tag = "v${version}";
+    hash = "sha256-zERCY9JxceBmhJbytfsm/6rDwipqQ1XjzY/2QFsEEEg=";
   };
 
-  propagatedBuildInputs = [ bottle ];
+  build-system = [ setuptools ];
+
+  dependenciesk = [ bottle ];
 
   nativeCheckInputs = [
     numpy

From 1334ac6b10c3b4f1dc663821dee9404821bd63af Mon Sep 17 00:00:00 2001
From: MultisampledNight <contact@multisamplednight.com>
Date: Wed, 20 Aug 2025 02:42:17 +0200
Subject: [PATCH 2051/3724] =?UTF-8?q?otree:=200.3.0=20=E2=86=92=200.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ot/otree/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ot/otree/package.nix b/pkgs/by-name/ot/otree/package.nix
index 2176bd9ed16c..78dfee42229b 100644
--- a/pkgs/by-name/ot/otree/package.nix
+++ b/pkgs/by-name/ot/otree/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "otree";
-  version = "v0.3.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "fioncat";
     repo = "otree";
-    rev = version;
-    hash = "sha256-WvoiTu6erNI5Cb9PSoHgL6+coIGWLe46pJVXBZHOLTE=";
+    tag = "v${version}";
+    hash = "sha256-zsBHra8X1nM8QINaxi3Vcs82T8S5WtfNRN5vb/ppuLU=";
   };
 
-  cargoHash = "sha256-tgw1R1UmXAHcrQFsY4i4efGCXQW3m0PVYdFSK2q+NUk=";
+  cargoHash = "sha256-Ncyj5s4EfbKsFGV29FDViK35nKOAZM+DODzIVRCpbuQ=";
 
   meta = {
     description = "Command line tool to view objects (json/yaml/toml) in TUI tree widget";

From cd50b563d965ce80e034c60d9e70dd0bced9574b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 00:53:42 +0000
Subject: [PATCH 2052/3724] kn: 1.19.0 -> 1.19.1

---
 pkgs/by-name/kn/kn/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/kn/kn/package.nix b/pkgs/by-name/kn/kn/package.nix
index f7e1b9b324cf..8f129118b75f 100644
--- a/pkgs/by-name/kn/kn/package.nix
+++ b/pkgs/by-name/kn/kn/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kn";
-  version = "1.19.0";
+  version = "1.19.1";
 
   src = fetchFromGitHub {
     owner = "knative";
     repo = "client";
     tag = "knative-v${finalAttrs.version}";
-    hash = "sha256-VfVqNzU/FLnFqDBwU4gM4RlJO1IkJZX53hQnw+mwQJA=";
+    hash = "sha256-nTWY6R8t14Z1xLvarAUqEWiQoBnQLCBQwglEX+hJpIE=";
   };
 
-  vendorHash = "sha256-jQjG13nYwTbDp5SXgjsNtQeuqhiqyvn3pUzsbdIazsw=";
+  vendorHash = "sha256-ep9BkF2+pqFjDwY7mXuRVcPJyVyBv489zBhSp2MQxU4=";
 
   env.GOWORK = "off";
 

From 3bb0972aedf9714323fbdbc0fc3d7c2f2d831e75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 00:59:05 +0000
Subject: [PATCH 2053/3724] alfaview: 9.22.11 -> 9.22.12

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

diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix
index 17369b6b3b67..37bfb74560c1 100644
--- a/pkgs/by-name/al/alfaview/package.nix
+++ b/pkgs/by-name/al/alfaview/package.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation rec {
   pname = "alfaview";
-  version = "9.22.11";
+  version = "9.22.12";
 
   src = fetchurl {
     url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
-    hash = "sha256-b0aLGdncMwbVnPku6d8xYvX6ahJMoy9d6r9Y+RKtv2A=";
+    hash = "sha256-WMy05L4z1j1izQthFX5gZGO0Vg3gPHnwXblP8E7psnk=";
   };
 
   nativeBuildInputs = [

From 843bcb70a802d10232591a180c72949696a59080 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 01:12:02 +0000
Subject: [PATCH 2054/3724] thin-provisioning-tools: 1.2.0 -> 1.2.1

---
 pkgs/by-name/th/thin-provisioning-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/th/thin-provisioning-tools/package.nix b/pkgs/by-name/th/thin-provisioning-tools/package.nix
index 947d05a75e06..f16278740884 100644
--- a/pkgs/by-name/th/thin-provisioning-tools/package.nix
+++ b/pkgs/by-name/th/thin-provisioning-tools/package.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "thin-provisioning-tools";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "jthornber";
     repo = "thin-provisioning-tools";
     rev = "v${version}";
-    hash = "sha256-gjsURDzA4LRTTgKZPzzTcvTdi1mXx4FkWmyoPcpdPfU=";
+    hash = "sha256-cDXjJpYCcOUtEftMBUTg4fbr4E7SxpDatZunba4JpH8=";
   };
 
   strictDeps = true;
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     udev
   ];
 
-  cargoHash = "sha256-H5GRAZpFl2t/bH8THyPkZq5ptS70XkhSCxQ6ko+0RC8=";
+  cargoHash = "sha256-6KY+p2IhBzy4yrhVDswdah815oSsTeCcWmZH8wUQIf4=";
 
   passthru.tests = {
     inherit (nixosTests.lvm2) lvm-thinpool-linux-latest;

From e41e1aea02539bb2d87c101ef5d4bd354702e6d3 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Tue, 19 Aug 2025 20:22:59 -0500
Subject: [PATCH 2055/3724] tor-browser: 14.5.5 -> 14.5.6

---
 pkgs/by-name/to/tor-browser/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index aed15b05cb18..3d340f45687b 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null)
         ++ lib.optionals mediaSupport [ ffmpeg ]
       );
 
-      version = "14.5.5";
+      version = "14.5.6";
 
       sources = {
         x86_64-linux = fetchurl {
@@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null)
             "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
             "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
           ];
-          hash = "sha256-rJGhgSSktaeH7KSOtf1KjJbrl/m4sdz+9UdjUN9ovz0=";
+          hash = "sha256-GRLCWCCPixclqdk4UijfHqyDAJjx4eiMM7IwePSCZMI=";
         };
 
         i686-linux = fetchurl {
@@ -131,7 +131,7 @@ lib.warnIf (useHardenedMalloc != null)
             "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
             "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
           ];
-          hash = "sha256-mvlx817/vLi4QyA0aSPyAuWSBfMLjfkFG9Zse9rmSzw=";
+          hash = "sha256-dhRPuMwtxzgA8DJdwct9oNjEOftFSS9Z9wP908wcwIw=";
         };
       };
 

From 92ac3cdaa7875d624ab7a86b2805c446bace66b6 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Mon, 18 Aug 2025 22:47:34 -0400
Subject: [PATCH 2056/3724] newsflash: 4.1.3 -> 4.1.4

---
 pkgs/by-name/ne/newsflash/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix
index 1029670813c0..ff6f21e03ab9 100644
--- a/pkgs/by-name/ne/newsflash/package.nix
+++ b/pkgs/by-name/ne/newsflash/package.nix
@@ -27,18 +27,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "newsflash";
-  version = "4.1.3";
+  version = "4.1.4";
 
   src = fetchFromGitLab {
     owner = "news-flash";
     repo = "news_flash_gtk";
     tag = "v.${finalAttrs.version}";
-    hash = "sha256-Ll1w6gWwlGq7pG/S/PZYujG6SqhThg4gLkdBdu/8czI=";
+    hash = "sha256-3RGa1f+V7dIgTxQKOceVSr7RwajUgwq05ypBhg6RjMA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-GJzBdJIa1KNZax4FSns/IfNLnAdpOfkEi/lFLuNmHVs=";
+    hash = "sha256-CRQH22EP/G6osjsuZJmTWwjq4C06DxiIXlz6zxgbDv4=";
   };
 
   postPatch = ''

From 187240e2841d80329ed292322651d4c1a45773a9 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Tue, 19 Aug 2025 20:38:11 -0500
Subject: [PATCH 2057/3724] tor-browser: added maintainer @c4patino

---
 pkgs/by-name/to/tor-browser/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index 3d340f45687b..80a0b6197d71 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -364,10 +364,11 @@ lib.warnIf (useHardenedMalloc != null)
         changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
         platforms = lib.attrNames sources;
         maintainers = with lib.maintainers; [
+          c4patino
           felschr
-          panicgh
-          joachifm
           hax404
+          joachifm
+          panicgh
         ];
         # MPL2.0+, GPL+, &c.  While it's not entirely clear whether
         # the compound is "libre" in a strict sense (some components place certain

From 59cbad7c072939d8993f476d721f91525898efaf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 03:39:59 +0200
Subject: [PATCH 2058/3724] Revert "python3Packages.ipyniivue: 2.1.0 -> 2.4.0"

This reverts commit 5207ab8d1ebc8c953939c52d56cd54c1609eb772.

Upstream dropped the package-lock.json post 2.1.0.
---
 pkgs/development/python-modules/ipyniivue/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/ipyniivue/default.nix b/pkgs/development/python-modules/ipyniivue/default.nix
index 6668878703a0..cdc0a1d2308d 100644
--- a/pkgs/development/python-modules/ipyniivue/default.nix
+++ b/pkgs/development/python-modules/ipyniivue/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "ipyniivue";
-  version = "2.4.0";
+  version = "2.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,8 +22,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "niivue";
     repo = "ipyniivue";
-    tag = "v${version}";
-    hash = "sha256-APxxYflEYcjQGloLvdOGMlOnOL/0ttGVvTCLEMqp1W0=";
+    rev = "v${version}";
+    hash = "sha256-rgScBBJ0Jqr5REZ+YFJcKwWcV33RzJ/sn6RqTL/limo=";
   };
 
   npmDeps = fetchNpmDeps {
@@ -58,7 +58,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Show a nifti image in a webgl 2.0 canvas within a jupyter notebook cell";
     homepage = "https://github.com/niivue/ipyniivue";
-    changelog = "https://github.com/niivue/ipyniivue/releases/tag/${src.tag}";
+    changelog = "https://github.com/niivue/ipyniivue/releases/tag/${version}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ bcdarwin ];
   };

From c9bd75441d7ea1399b3aabb05a8949e73ae54c39 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 03:51:20 +0200
Subject: [PATCH 2059/3724] python3Packages.mezzanine: fix src, enable tests,
 refactor

---
 .../python-modules/mezzanine/default.nix      | 45 ++++++++++---------
 .../mezzanine/tests-no-git.patch              | 17 +++++++
 2 files changed, 40 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/mezzanine/tests-no-git.patch

diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix
index c28ab57e67f8..e96d65184f84 100644
--- a/pkgs/development/python-modules/mezzanine/default.nix
+++ b/pkgs/development/python-modules/mezzanine/default.nix
@@ -6,18 +6,20 @@
   chardet,
   django,
   django-contrib-comments,
-  fetchPypi,
+  fetchFromGitHub,
   filebrowser-safe,
-  future,
   grappelli-safe,
   isPyPy,
-  pep8,
   pillow,
-  pyflakes,
+  pytestCheckHook,
+  pytest-cov-stub,
+  pytest-django,
   pythonOlder,
   pytz,
   requests,
   requests-oauthlib,
+  requirements-parser,
+  setuptools,
   tzlocal,
 }:
 
@@ -28,25 +30,27 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.7" || isPyPy;
 
-  src = fetchPypi {
-    pname = "Mezzanine";
-    inherit version;
-    hash = "sha256-RZ/9ltvZUz1eXxeaVqS9ZE69+a9XWt6fxMcss+yTVP4=";
+  src = fetchFromGitHub {
+    owner = "stephenmcd";
+    repo = "mezzanine";
+    tag = "v${version}";
+    hash = "sha256-TdGWlquS4hsnxIM0bhbWR7C0X4wyUcqC+YrBDSShRhg=";
   };
 
-  buildInputs = [
-    pyflakes
-    pep8
+  patches = [
+    # drop git requirement from tests and fake stable branch
+    ./tests-no-git.patch
   ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     beautifulsoup4
     bleach
     chardet
     django
     django-contrib-comments
     filebrowser-safe
-    future
     grappelli-safe
     pillow
     pytz
@@ -56,15 +60,12 @@ buildPythonPackage rec {
   ]
   ++ bleach.optional-dependencies.css;
 
-  # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+
-  doCheck = false;
-
-  # sed calls will be unnecessary in v3.1.11+
-  preConfigure = ''
-    sed -i 's/==/>=/' setup.py
-  '';
-
-  LC_ALL = "en_US.UTF-8";
+  nativeCheckInputs = [
+    pytest-django
+    pytest-cov-stub
+    pytestCheckHook
+    requirements-parser
+  ];
 
   meta = with lib; {
     description = "Content management platform built using the Django framework";
diff --git a/pkgs/development/python-modules/mezzanine/tests-no-git.patch b/pkgs/development/python-modules/mezzanine/tests-no-git.patch
new file mode 100644
index 000000000000..8d2292edf322
--- /dev/null
+++ b/pkgs/development/python-modules/mezzanine/tests-no-git.patch
@@ -0,0 +1,17 @@
+diff --git a/tests/test_core.py b/tests/test_core.py
+index 40cd39fe..57abbec0 100644
+--- a/tests/test_core.py
++++ b/tests/test_core.py
+@@ -47,11 +47,7 @@ from mezzanine.utils.sites import current_site_id, override_current_site_id
+ from mezzanine.utils.tests import TestCase
+ from mezzanine.utils.urls import admin_url
+ 
+-BRANCH_NAME = (
+-    subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])
+-    .decode()
+-    .strip()
+-)
++BRANCH_NAME = "stable"
+ VERSION_WARN = (
+     "Unpinned or pre-release dependencies detected in Mezzanine's requirements: {}"
+ )

From c0ec3170c17d9e42a6e9ab1a467a900ef1a1a0f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 02:12:24 +0000
Subject: [PATCH 2060/3724] hypercore: 11.12.1 -> 11.13.0

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

diff --git a/pkgs/by-name/hy/hypercore/package.nix b/pkgs/by-name/hy/hypercore/package.nix
index d82f77b601ed..ad845b3360cf 100644
--- a/pkgs/by-name/hy/hypercore/package.nix
+++ b/pkgs/by-name/hy/hypercore/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "hypercore";
-  version = "11.12.1";
+  version = "11.13.0";
 
   src = fetchFromGitHub {
     owner = "holepunchto";
     repo = "hypercore";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AhmOT+ehyfut8QkwbcdHITOrWKfLPsjDx9zjBv9xeB4=";
+    hash = "sha256-YaSmKjJKWkA4UUK/1LF9wqS4PvdFHrrc+yzvz+QmL0A=";
   };
 
   npmDepsHash = "sha256-ZJxVmQWKgHyKkuYfGIlANXFcROjI7fibg6mxIhDZowM=";

From 0411c53da86edb6469349dc487da2d1550a62bef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 02:12:53 +0000
Subject: [PATCH 2061/3724] gh-s: 0.0.8 -> 0.0.11

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

diff --git a/pkgs/by-name/gh/gh-s/package.nix b/pkgs/by-name/gh/gh-s/package.nix
index 93ca5454b29b..fb5d0cc431d8 100644
--- a/pkgs/by-name/gh/gh-s/package.nix
+++ b/pkgs/by-name/gh/gh-s/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "gh-s";
-  version = "0.0.8";
+  version = "0.0.11";
 
   src = fetchFromGitHub {
     owner = "gennaro-tedesco";
     repo = "gh-s";
     rev = "v${version}";
-    hash = "sha256-hLfaAtWiJHCJ7MFz8dg4SJJB2cNY1gKUEwMAdRB4lr8=";
+    hash = "sha256-I1r3FW+qWKRFukeXot009CbH/JbYeCjvoRKrvsyjDJE=";
   };
 
   vendorHash = "sha256-5UJAgsPND6WrOZZ5PUZNdwd7/0NPdhD1SaZJzZ+2VvM=";

From b67c56a8858bfd814867f056ea5b3ba901a7358f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 02:22:03 +0000
Subject: [PATCH 2062/3724] jotdown: 0.8.0 -> 0.8.1

---
 pkgs/by-name/jo/jotdown/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/jo/jotdown/package.nix b/pkgs/by-name/jo/jotdown/package.nix
index 44181fc08932..8bfde8ead76c 100644
--- a/pkgs/by-name/jo/jotdown/package.nix
+++ b/pkgs/by-name/jo/jotdown/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jotdown";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "hellux";
     repo = "jotdown";
     rev = version;
-    hash = "sha256-StlF+KjQ+UrKnZMuexwDhMI0ztFLsbexubx5s8Qtzho=";
+    hash = "sha256-9gvTMcoKGdc6xYhGz1SQzTELUWeIK2VFbEwIVn/IjGs=";
   };
 
-  cargoHash = "sha256-UroMKPDh0RbUu6oqjfbRkX6ZlKi5rJRVBu1apcJENyU=";
+  cargoHash = "sha256-x61oImdXsLD/lU4hNcrQ2rjH5hAvTMEDJn4H3cVG6X4=";
 
   meta = with lib; {
     description = "Minimal Djot CLI";

From 5bf001f262ee6a0262c8486d18d6ac204ca1f7a8 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 19 Aug 2025 21:52:57 -0500
Subject: [PATCH 2063/3724] yaziPlugins: update on 2025-08-19
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- lazygit: 0-unstable-2025-03-31 → 0-unstable-2025-08-06
- mediainfo: 25.5.31-unstable-2025-07-19 → 25.5.31-unstable-2025-08-06
- mount: 25.5.31-unstable-2025-07-02 → 25.5.31-unstable-2025-08-11
- restore: 25.5.31-unstable-2025-07-11 → 25.5.31-unstable-2025-08-12

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/ya/yazi/plugins/lazygit/default.nix   | 6 +++---
 pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix | 6 +++---
 pkgs/by-name/ya/yazi/plugins/mount/default.nix     | 6 +++---
 pkgs/by-name/ya/yazi/plugins/restore/default.nix   | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix b/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix
index 69dab6a2bab7..c9e5c8ab2e99 100644
--- a/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "lazygit.yazi";
-  version = "0-unstable-2025-03-31";
+  version = "0-unstable-2025-08-06";
 
   src = fetchFromGitHub {
     owner = "Lil-Dank";
     repo = "lazygit.yazi";
-    rev = "7a08a0988c2b7481d3f267f3bdc58080e6047e7d";
-    hash = "sha256-OJJPgpSaUHYz8a9opVLCds+VZsK1B6T+pSRJyVgYNy8=";
+    rev = "8f37dc5795f165021098b17d797c7b8f510aeca9";
+    hash = "sha256-rR7SMTtQYrvQjhkzulDaNH/LAA77UnXkcZ50WwBX2Uw=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
index c18f8748f624..3cbdeeb4b1b4 100644
--- a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mediainfo.yazi";
-  version = "25.5.31-unstable-2025-07-19";
+  version = "25.5.31-unstable-2025-08-06";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "mediainfo.yazi";
-    rev = "f89605ce7ca33181ee6770e641d80ec4673093e0";
-    hash = "sha256-NloChkZWKo9JL636d+G7vgEY/HX24udngYftw/Ydzk4=";
+    rev = "0e2ae47cfb2b7c7a32d714c753b1cebbaa75d127";
+    hash = "sha256-CHigaujMHd1BuYyyxzI5B4ZYQhuH2YZptVVJToq39sY=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/mount/default.nix b/pkgs/by-name/ya/yazi/plugins/mount/default.nix
index 981696ffc335..4da00adcaff1 100644
--- a/pkgs/by-name/ya/yazi/plugins/mount/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mount/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mount.yazi";
-  version = "25.5.31-unstable-2025-07-02";
+  version = "25.5.31-unstable-2025-08-11";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "e5f00e2716fd177b0ca0d313f1a6e64f01c12760";
-    hash = "sha256-DLcmzCmITybWrYuBpTyswtoGUimpagkyeVUWmbKjarY=";
+    rev = "e95c7b384e7b0a9793fe1471f0f8f7810ef2a7ed";
+    hash = "sha256-TUS+yXxBOt6tL/zz10k4ezot8IgVg0/2BbS8wPs9KcE=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/restore/default.nix b/pkgs/by-name/ya/yazi/plugins/restore/default.nix
index 8174d3a505be..139dab6fffa0 100644
--- a/pkgs/by-name/ya/yazi/plugins/restore/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/restore/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "restore.yazi";
-  version = "25.5.31-unstable-2025-07-11";
+  version = "25.5.31-unstable-2025-08-12";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "restore.yazi";
-    rev = "84f1921806c49b7b20af26cbe57cb4fd286142e2";
-    hash = "sha256-pEQZ/2Z4XVYlfzqtCz51bIgE9KzkDF/qyX8vThhlWGI=";
+    rev = "2a2ba2fbaee72f88054a43723becf66c3cfb892e";
+    hash = "sha256-FqvQuKNH3jjXQ/7N7MsUsOoh9DTreZTjpdQ4lrr2iLk=";
   };
 
   meta = {

From dfda31fa1ec8384207936bfb9e3077353848c919 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 03:08:34 +0000
Subject: [PATCH 2064/3724] git-town: 21.4.1 -> 21.4.3

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

diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix
index 81c4d0ed6d50..58c8b9dafaf1 100644
--- a/pkgs/by-name/gi/git-town/package.nix
+++ b/pkgs/by-name/gi/git-town/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule rec {
   pname = "git-town";
-  version = "21.4.1";
+  version = "21.4.3";
 
   src = fetchFromGitHub {
     owner = "git-town";
     repo = "git-town";
     tag = "v${version}";
-    hash = "sha256-IBBnqwXx7q6QBk0Z5cHugXVeJHq85lCX7Y5U1tCXZmA=";
+    hash = "sha256-E3j1lWQycB6aIj8xXaRUJdtrrvc92kxJjXhSHq3TBy0=";
   };
 
   vendorHash = null;

From 357809f2eb41b284dd04d2802a7518721951a345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 19 Aug 2025 20:22:57 -0700
Subject: [PATCH 2065/3724] postfix: 3.10.3 -> 3.10.4

Changelog: https://www.postfix.org/announcements/postfix-3.10.4.html
---
 pkgs/by-name/po/postfix/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix
index 1bba06a5ba1b..c3b4bb53ecee 100644
--- a/pkgs/by-name/po/postfix/package.nix
+++ b/pkgs/by-name/po/postfix/package.nix
@@ -71,11 +71,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "postfix";
-  version = "3.10.3";
+  version = "3.10.4";
 
   src = fetchurl {
     url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz";
-    hash = "sha256-487AXZG20pWOzW6pBF+qNfecWw4ii5dazkatKv6BIFM=";
+    hash = "sha256-z7ZoYf6PlkeH3a6rFfPKPn7z3nMPlxca/EpeyjOMpEQ=";
   };
 
   nativeBuildInputs = [

From 9fdc0a77b2ebe03ed028fa09eecafc4adc4ad1d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 03:33:21 +0000
Subject: [PATCH 2066/3724] flyctl: 0.3.169 -> 0.3.171

---
 pkgs/by-name/fl/flyctl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index 0b4acad8a12e..c1c6a35329a6 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.3.169";
+  version = "0.3.171";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-F2QMQ24+wSKH8zmTFSWsSl9O9+Hc4e7Rmn2K9YXJi4k=";
+    hash = "sha256-9FJ/n2LoTrQmcO+J3eXxexggFhvP22yYFbrryd0rGtM=";
   };
 
-  vendorHash = "sha256-boaz0fR97NtU/wzIE2uPbDmP89ovkzNy8bpe0nrItMw=";
+  vendorHash = "sha256-uXCy/8HkwqGnQEoNtyOErLw9byG8SWc5YdzYZXwjhW4=";
 
   subPackages = [ "." ];
 

From 26c3ae6637f87a135ca4cd95af68906d17a51b6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 03:39:10 +0000
Subject: [PATCH 2067/3724] yt-dlp-light: 2025.08.11 -> 2025.08.20

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

diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index 41b44b21706c..6b0bccef28c5 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -19,14 +19,14 @@ python3Packages.buildPythonApplication rec {
   # The websites yt-dlp deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2025.08.11";
+  version = "2025.08.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yt-dlp";
     repo = "yt-dlp";
     tag = version;
-    hash = "sha256-j7x844MPPFdXYTJiiMnru3CE79A/6JdfJDdh8it9KsU=";
+    hash = "sha256-FeIoV7Ya+tGCMvUUXmPrs4MN52zwqrcpzJ6Arh4V450=";
   };
 
   postPatch = ''

From aa6feb7c6e37609ff51f2aa0b9d0ab5d4e8bb3e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 03:51:53 +0000
Subject: [PATCH 2068/3724] mieru: 3.16.2 -> 3.19.0

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

diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index a5577037c0f6..4fe19a5d8103 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "mieru";
-  version = "3.16.2";
+  version = "3.19.0";
 
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
     rev = "v${version}";
-    hash = "sha256-zpnAGYiJpVvjEFfxWT4lbDJn5W0wGRK0CDjpRNedjuk=";
+    hash = "sha256-0kOYAtPFIXHg/CNoPxdRot9zTfEQ2uD0wBFFBW5h2ZA=";
   };
 
   vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";

From fba28231b35a04aead556c064544643bf378455e Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Tue, 19 Aug 2025 21:14:04 -0700
Subject: [PATCH 2069/3724] python3Packages.python-ripple-api: init at 0.0.3

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

diff --git a/pkgs/development/python-modules/python-ripple-api/default.nix b/pkgs/development/python-modules/python-ripple-api/default.nix
new file mode 100644
index 000000000000..c62b009b870b
--- /dev/null
+++ b/pkgs/development/python-modules/python-ripple-api/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  requests,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "python-ripple-api";
+  version = "0.0.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-hlgc7swcCimpQueyxuy/zvr6WdBHWnjnqHTS/cUghss=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
+
+  # No tests in the package
+  doCheck = false;
+
+  pythonImportsCheck = [ "pyripple" ];
+
+  meta = {
+    description = "Python API for interacting with ripple.com";
+    homepage = "https://github.com/nkgilley/python-ripple-api";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c2df3ddcf44b..565d03893443 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14899,6 +14899,8 @@ self: super: with self; {
 
   python-registry = callPackage ../development/python-modules/python-registry { };
 
+  python-ripple-api = callPackage ../development/python-modules/python-ripple-api { };
+
   python-roborock = callPackage ../development/python-modules/python-roborock { };
 
   python-rtmidi = callPackage ../development/python-modules/python-rtmidi { };

From c8c6cbb0c459b5cfa186ff03e646679976f59cc9 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Tue, 19 Aug 2025 21:14:56 -0700
Subject: [PATCH 2070/3724] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 913c646f41f0..ea424970be48 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -4983,7 +4983,8 @@
       ];
     "ripple" =
       ps: with ps; [
-      ]; # missing inputs: python-ripple-api
+        python-ripple-api
+      ];
     "risco" =
       ps: with ps; [
         pyrisco

From 8ad253274cd485e49391efe8319b6cf6af0a613d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 04:59:10 +0000
Subject: [PATCH 2071/3724] jhentai: 8.0.9 -> 8.0.10+297

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

diff --git a/pkgs/by-name/jh/jhentai/package.nix b/pkgs/by-name/jh/jhentai/package.nix
index b430a92a6727..754711de2579 100644
--- a/pkgs/by-name/jh/jhentai/package.nix
+++ b/pkgs/by-name/jh/jhentai/package.nix
@@ -14,13 +14,13 @@
 
 flutter329.buildFlutterApplication rec {
   pname = "jhentai";
-  version = "8.0.9";
+  version = "8.0.10+297";
 
   src = fetchFromGitHub {
     owner = "jiangtian616";
     repo = "JHenTai";
     tag = "v${version}";
-    hash = "sha256-Yclj0oJ35iuqopRgJRgmi5r/WSNfT4080WW99nvnO/0=";
+    hash = "sha256-/wmovLEjRzKU5mSM6yqWnPcT/Gt3kyLDHa/ssDx2xrc=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;

From c372b7f2f53ca847a607dd11467271c784fa39e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 19 Aug 2025 22:01:49 -0700
Subject: [PATCH 2072/3724] python312Packages.numpy_1: unpin Cython

---
 pkgs/development/python-modules/numpy/1.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix
index 0d040582c883..9e3b3a60d2e8 100644
--- a/pkgs/development/python-modules/numpy/1.nix
+++ b/pkgs/development/python-modules/numpy/1.nix
@@ -94,6 +94,7 @@ buildPythonPackage rec {
       --replace 'py.full_path()' "'python'"
 
     substituteInPlace pyproject.toml \
+      --replace-fail "Cython>=0.29.34,<3.1" Cython \
       --replace-fail "meson-python>=0.15.0,<0.16.0" "meson-python"
   '';
 

From e9647db1cef6c0baa54716ee746fbfdbced352cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 05:20:45 +0000
Subject: [PATCH 2073/3724] garnet: 1.0.81 -> 1.0.82

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

diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix
index 4fce3bced6fb..7168325d3d49 100644
--- a/pkgs/by-name/ga/garnet/package.nix
+++ b/pkgs/by-name/ga/garnet/package.nix
@@ -8,13 +8,13 @@
 
 buildDotnetModule rec {
   pname = "garnet";
-  version = "1.0.81";
+  version = "1.0.82";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-CEpxV6BoTfkC3Lka1Xuci3uyUYoWxoyYKTQTco5NVY4=";
+    hash = "sha256-ju39u5GvlxKxTn47MAicNFM9Delk6n/ht74p2XxmM44=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";

From ba7cd35d6dba092dcb246c7ae3657469b174cb10 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Tue, 19 Aug 2025 23:47:12 +0200
Subject: [PATCH 2074/3724] jocalsend: init at 1.6.1803

---
 pkgs/by-name/jo/jocalsend/package.nix | 39 +++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/jo/jocalsend/package.nix

diff --git a/pkgs/by-name/jo/jocalsend/package.nix b/pkgs/by-name/jo/jocalsend/package.nix
new file mode 100644
index 000000000000..5ab082ac736e
--- /dev/null
+++ b/pkgs/by-name/jo/jocalsend/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitea,
+  rustPlatform,
+  pkg-config,
+  openssl,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "jocalsend";
+  version = "1.6.1803";
+
+  src = fetchFromGitea {
+    domain = "git.kittencollective.com";
+    owner = "nebkor";
+    repo = "joecalsend";
+    tag = finalAttrs.version;
+    hash = "sha256-nrXUZb4Yi1ttEltzqKUnMLLr5cvhqCxW1iJyo1ErG0w=";
+  };
+
+  cargoHash = "sha256-0yFKJtwQikP6WRDVWgv7b9e0iUS9AdKpx6VTeNAQ4zs=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  meta = {
+    homepage = "https://git.kittencollective.com/nebkor/joecalsend";
+    description = "Rust terminal client for Localsend";
+    changelog = "https://git.kittencollective.com/nebkor/joecalsend/releases/tag/${finalAttrs.src.tag}";
+    license = with lib.licenses; [ unfreeRedistributable ];
+    maintainers = with lib.maintainers; [ Cameo007 ];
+    mainProgram = "jocalsend";
+  };
+})

From b8872270578fb14250db2d41aa92e699232eb2ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 19 Aug 2025 22:35:46 -0700
Subject: [PATCH 2075/3724] Revert "python3Packages.openusd: 25.05.01 -> 25.08"

This reverts commit c31236e82336d078ca37f2ec9c00e161b571e224 because the
patches now fail to apply.
---
 pkgs/development/python-modules/openusd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index 5864feb8fef2..32937c89d3ed 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -51,14 +51,14 @@ in
 
 buildPythonPackage rec {
   pname = "openusd";
-  version = "25.08";
+  version = "25.05.01";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenUSD";
     tag = "v${version}";
-    hash = "sha256-k+rmC/e8fJexZ++AAinuDJFOK/oqC90B4NriJvaX71w=";
+    hash = "sha256-gxikEC4MqTkhgYaRsCVYtS/VmXClSaCMdzpQ0LmiR7Q=";
   };
 
   stdenv = python.stdenv;

From d4360ba54f131d4d441210183f6f4d954274dbda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 05:43:22 +0000
Subject: [PATCH 2076/3724] python3Packages.polyfactory: 2.22.1 -> 2.22.2

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

diff --git a/pkgs/development/python-modules/polyfactory/default.nix b/pkgs/development/python-modules/polyfactory/default.nix
index 79d6f98c9bca..2b7d81d99777 100644
--- a/pkgs/development/python-modules/polyfactory/default.nix
+++ b/pkgs/development/python-modules/polyfactory/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "polyfactory";
-  version = "2.22.1";
+  version = "2.22.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "litestar-org";
     repo = "polyfactory";
     tag = "v${version}";
-    hash = "sha256-PzMl0LHBs3cmV4OEj/aTDq0peN/ALXNp5rijuTwU31A=";
+    hash = "sha256-Mm9Yj8yBaH1KQJxQJY/sbrkfL/eDpMyWd/9ThQfmzx8=";
   };
 
   build-system = [ hatchling ];

From 64ac4e7990d697f4d5119f53c419829bdad14c25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 05:53:03 +0000
Subject: [PATCH 2077/3724] rio: 0.2.28 -> 0.2.29

---
 pkgs/by-name/ri/rio/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
index f5be849fd298..df9e47810a15 100644
--- a/pkgs/by-name/ri/rio/package.nix
+++ b/pkgs/by-name/ri/rio/package.nix
@@ -48,16 +48,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rio";
-  version = "0.2.28";
+  version = "0.2.29";
 
   src = fetchFromGitHub {
     owner = "raphamorim";
     repo = "rio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bQ6Kj8kKDdcvRX5084KRjsuctp22Zi7375GWjOBznhw=";
+    hash = "sha256-hM5WFZMZRq5iA/kGpbOncmHTyG//xt/B+Jmi7Y/gGwk=";
   };
 
-  cargoHash = "sha256-LJLexxczsqtIZuLil7sB3aAt1S2RBOmuvOQTBeuSUP4";
+  cargoHash = "sha256-pD3s446lrXtJp67fZfjbm7Eej0FyLYf9op8AF/GkeJ8=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook

From d14900755d04d6c314c2e1d8e9115f1d09daceda Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 7 Aug 2025 22:54:43 +0200
Subject: [PATCH 2078/3724] rerun: 0.24.0 -> 0.24.1

Diff: https://github.com/rerun-io/rerun/compare/refs/tags/0.24.0...refs/tags/0.24.1

Changelog: https://github.com/rerun-io/rerun/blob/0.24.1/CHANGELOG.md
---
 pkgs/by-name/re/rerun/package.nix                     | 6 +++---
 pkgs/development/python-modules/rerun-sdk/default.nix | 9 ---------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index 8bbebaa4fcd9..d5ffb129de56 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -34,13 +34,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rerun";
-  version = "0.24.0";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "rerun-io";
     repo = "rerun";
     tag = finalAttrs.version;
-    hash = "sha256-OMSLCS1j55MYsC3pv4qPQjqO9nRgGj+AUOlcyESFXek=";
+    hash = "sha256-unPgvQcYhshdx5NGCl/pLh8UdJ9T6B8Fd0s8G1NSBmE=";
   };
 
   # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
   '';
 
-  cargoHash = "sha256-8XmOtB1U2SAOBchrpKMAv5I8mFvJniVVcmFPugtD4RI=";
+  cargoHash = "sha256-zdq8djnmH8srSd9sml7t6wsbxpTaT3x5/7hkDRgelbg=";
 
   cargoBuildFlags = [ "--package rerun-cli" ];
   cargoTestFlags = [ "--package rerun-cli" ];
diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix
index 7d93eb9cb1ae..c42d58374018 100644
--- a/pkgs/development/python-modules/rerun-sdk/default.nix
+++ b/pkgs/development/python-modules/rerun-sdk/default.nix
@@ -71,15 +71,6 @@ buildPythonPackage {
   inherit (rerun) addDlopenRunpaths addDlopenRunpathsPhase;
   postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ];
 
-  disabledTests = [
-    # numpy 2 incompatibility: AssertionError / IndexError
-    # Issue: https://github.com/rerun-io/rerun/issues/9105
-    # PR: https://github.com/rerun-io/rerun/pull/9109
-    "test_any_value"
-    "test_bad_any_value"
-    "test_none_any_value"
-  ];
-
   disabledTestPaths = [
     # "fixture 'benchmark' not found"
     "tests/python/log_benchmark/test_log_benchmark.py"

From c72e6cd664a5eed872caf6caaff0a5fc424eb210 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 20 Aug 2025 08:00:47 +0200
Subject: [PATCH 2079/3724] claude-code: 1.0.84 -> 1.0.85

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

- Status line input now includes session cost info
---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index fdef0f99a316..6baa91162a87 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -6,13 +6,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.84"
+        "@anthropic-ai/claude-code": "^1.0.85"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.84",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.84.tgz",
-      "integrity": "sha512-+Qu+z1jTdZPu0UL4dalntkofDGL0BgWqs6XmRlq+RuxurHJy58zKae4PL8naevrkbgazauIPYDDGmHF3u+B0uQ==",
+      "version": "1.0.85",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.85.tgz",
+      "integrity": "sha512-rvLGGSnHQLJI3dP7C/d3Or5LQvgDEae5wurMG4Fs9ourzt+k8YA6WAHeuJmSUq7o7Z2fZTaojcM3VOLzUBEl7w==",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 66a91cf74352..14eba606feab 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.84";
+  version = "1.0.85";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-Uu6K2Fq4MT0jb4GsAaHo0UbjnK2bXxjQEjND3ftcFMo=";
+    hash = "sha256-CLqvcolG94JBC5VFlsfybZ9OXe81gJBzKU6Xgr7CGWo=";
   };
 
-  npmDepsHash = "sha256-G1Jrjds7Il+gmQ5SYRgbW3faB2gJd3x0r576IGwFNys=";
+  npmDepsHash = "sha256-V0rjoKdXGRNNKRJqPvVIqCQpqgNCklPTVRExCCxbe8g=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From aa4dd450b368975e09e5d8fdb71e0436b781f4e7 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Wed, 20 Aug 2025 14:01:30 +0800
Subject: [PATCH 2080/3724] python312Packages.filesplit,
 python312Packages.pysidesix-frameless-window,
 python312Packages.pyside6-fluent-widgets: drop

This was originally added for video-subtitle-extractor, but the PR related to video-subtitle-extractor has been closed, and it is very difficult to continue maintaining these packages.
---
 .../python-modules/filesplit/default.nix      | 30 -------------
 .../pyside6-fluent-widgets/default.nix        | 42 -------------------
 .../pysidesix-frameless-window/default.nix    | 36 ----------------
 pkgs/top-level/python-aliases.nix             |  3 ++
 pkgs/top-level/python-packages.nix            |  8 ----
 5 files changed, 3 insertions(+), 116 deletions(-)
 delete mode 100644 pkgs/development/python-modules/filesplit/default.nix
 delete mode 100644 pkgs/development/python-modules/pyside6-fluent-widgets/default.nix
 delete mode 100644 pkgs/development/python-modules/pysidesix-frameless-window/default.nix

diff --git a/pkgs/development/python-modules/filesplit/default.nix b/pkgs/development/python-modules/filesplit/default.nix
deleted file mode 100644
index 6c5f1bc14c93..000000000000
--- a/pkgs/development/python-modules/filesplit/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "filesplit";
-  version = "4.1.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "ram-jayapalan";
-    repo = "filesplit";
-    tag = "v${version}";
-    hash = "sha256-QttXCK/IalnOVilWQaE0FYhFglQ1nXDLUX3nOFI5Vrc=";
-  };
-
-  build-system = [ setuptools ];
-
-  pythonImportsCheck = [ "filesplit" ];
-
-  meta = {
-    description = "Split file into multiple chunks based on the given size";
-    homepage = "https://github.com/ram-jayapalan/filesplit";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/pyside6-fluent-widgets/default.nix b/pkgs/development/python-modules/pyside6-fluent-widgets/default.nix
deleted file mode 100644
index 0424137ed345..000000000000
--- a/pkgs/development/python-modules/pyside6-fluent-widgets/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  setuptools,
-  pyside6,
-  pysidesix-frameless-window,
-  darkdetect,
-}:
-
-buildPythonPackage rec {
-  pname = "pyside6-fluent-widgets";
-  version = "1.8.4";
-  pyproject = true;
-
-  src = fetchPypi {
-    pname = "pyside6_fluent_widgets";
-    inherit version;
-    hash = "sha256-DtyldvNqdjca0Os2au1WSqyH9gLkQt8ryNrunZuUEus=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    pyside6
-    pysidesix-frameless-window
-    darkdetect
-  ];
-
-  # no tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "qfluentwidgets" ];
-
-  meta = {
-    description = "Fluent design widgets library based on PySide6";
-    homepage = "https://github.com/zhiyiYo/PyQt-Fluent-Widgets";
-    platforms = lib.platforms.linux;
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/pysidesix-frameless-window/default.nix b/pkgs/development/python-modules/pysidesix-frameless-window/default.nix
deleted file mode 100644
index 4180793dee5d..000000000000
--- a/pkgs/development/python-modules/pysidesix-frameless-window/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  setuptools,
-  pyside6,
-}:
-
-buildPythonPackage rec {
-  pname = "pysidesix-frameless-window";
-  version = "0.7.3";
-  pyproject = true;
-
-  src = fetchPypi {
-    pname = "pysidesix_frameless_window";
-    inherit version;
-    hash = "sha256-6a9xyTQOYIo0WWuLXVrOvYGAdoFXJNbR21q4FLyDKEQ=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [ pyside6 ];
-
-  # no tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "qframelesswindow" ];
-
-  meta = {
-    description = "Frameless window based on PySide6";
-    homepage = "https://github.com/zhiyiYo/PyQt-Frameless-Window";
-    platforms = lib.platforms.linux;
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index ca53096917a3..a505836ad7dd 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -258,6 +258,7 @@ mapAliases ({
   fenics = throw "fenics has been removed, use fenics-dolfinx instead"; # added 2025-08-07
   filebrowser_safe = filebrowser-safe; # added 2024-01-03
   filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19
+  filesplit = throw "filesplit has been removed, since it is unmaintained"; # added 2025-08-20
   flaskbabel = flask-babel; # added 2023-01-19
   flask-babelex = throw "flask-babelex package has been removed, use flask-babel instead"; # added 2024-10-07
   flask_assets = flask-assets; # added 2023-08-23
@@ -626,6 +627,8 @@ mapAliases ({
   py-scrypt = scrypt; # added 2025-08-07
   pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20
   pysimplegui = throw "pysimplegui update to v5 broke the package, it now needs a license key to decrypt the source code"; # added 2024-09-16
+  pyside6-fluent-widgets = throw "pyside6-fluent-widgets has been removed, since it is unmaintained"; # added 2025-08-20
+  pysidesix-frameless-window = throw "pysidesix-frameless-window has been removed, since it is unmaintained"; # added 2025-08-20
   pysmart-smartx = pysmart; # added 2021-10-22
   pySmartDL = pysmartdl; # added 2023-10-11
   pysmi-lextudio = pysmi; # added 2024-07-18
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf11b8374764..646dc6ef4228 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5125,8 +5125,6 @@ self: super: with self; {
 
   files-to-prompt = callPackage ../development/python-modules/files-to-prompt { };
 
-  filesplit = callPackage ../development/python-modules/filesplit { };
-
   filetype = callPackage ../development/python-modules/filetype { };
 
   filterpy = callPackage ../development/python-modules/filterpy { };
@@ -13982,14 +13980,8 @@ self: super: with self; {
     callPackage ../development/python-modules/pyside6 { inherit (pkgs) cmake ninja; }
   );
 
-  pyside6-fluent-widgets = callPackage ../development/python-modules/pyside6-fluent-widgets { };
-
   pyside6-qtads = callPackage ../development/python-modules/pyside6-qtads { };
 
-  pysidesix-frameless-window =
-    callPackage ../development/python-modules/pysidesix-frameless-window
-      { };
-
   pysigma = callPackage ../development/python-modules/pysigma { };
 
   pysigma-backend-elasticsearch =

From cdacf6782047c85eb46c7cdd3bb1b831728840af Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Wed, 20 Aug 2025 14:21:44 +0800
Subject: [PATCH 2081/3724] hiddify-app: drop

This software has a problematic license, which is discussed at https://github.com/NixOS/nixpkgs/issues/369727. The software and its upstream have significant conflicts. It is not well-maintained, and multiple users have complained about its poor user experience.
---
 pkgs/by-name/hi/hiddify-app/package.nix       |  152 -
 pkgs/by-name/hi/hiddify-app/pubspec.lock.json | 2531 -----------------
 pkgs/top-level/aliases.nix                    |    1 +
 3 files changed, 1 insertion(+), 2683 deletions(-)
 delete mode 100644 pkgs/by-name/hi/hiddify-app/package.nix
 delete mode 100644 pkgs/by-name/hi/hiddify-app/pubspec.lock.json

diff --git a/pkgs/by-name/hi/hiddify-app/package.nix b/pkgs/by-name/hi/hiddify-app/package.nix
deleted file mode 100644
index 5c6c10660455..000000000000
--- a/pkgs/by-name/hi/hiddify-app/package.nix
+++ /dev/null
@@ -1,152 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  flutter324,
-  buildGoModule,
-  libayatana-appindicator,
-  makeDesktopItem,
-  copyDesktopItems,
-  autoPatchelfHook,
-}:
-
-let
-  metaCommon = {
-    description = "Multi-platform auto-proxy client, supporting Sing-box, X-ray, TUIC, Hysteria, Reality, Trojan, SSH etc";
-    license = with lib.licenses; [
-      unfree # upstream adds non-free additional conditions. https://github.com/hiddify/hiddify-app/blob/0f6b15057f626016fcd7a0c075f1c8c2f606110a/LICENSE.md#additional-conditions-to-gpl-v3
-      gpl3Only
-    ];
-    maintainers = with lib.maintainers; [ ];
-  };
-
-  libcore = buildGoModule rec {
-    pname = "hiddify-core";
-    version = "3.1.8";
-
-    src = fetchFromGitHub {
-      owner = "hiddify";
-      repo = "hiddify-core";
-      tag = "v${version}";
-      hash = "sha256-NRzzkC3xbRVP20Pm29bHf8YpxmnjISgF46c8l9qU4rA=";
-    };
-
-    vendorHash = "sha256-a7NFZt4/w2+oaZG3ncaOrrhASxUptcWS/TeaIQrgLe4=";
-
-    GO_BUILD_FLAGS = ''
-      -tags "with_gvisor,with_quic,with_wireguard,with_ech,with_utls,with_clash_api,with_grpc" \
-      -trimpath \
-      -ldflags "-s -w" \
-    '';
-
-    buildPhase = ''
-      runHook preBuild
-
-      go build ${GO_BUILD_FLAGS} -buildmode=c-shared -o bin/lib/libcore.so ./custom
-      mkdir lib
-      cp bin/lib/libcore.so ./lib/libcore.so
-      CGO_LDFLAGS="./lib/libcore.so" go build ${GO_BUILD_FLAGS} -o bin/HiddifyCli ./cli/bydll
-
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      install -Dm0755 bin/HiddifyCli $out/bin/HiddifyCli
-      install -Dm0755 lib/libcore.so $out/lib/libcore.so
-
-      runHook postInstall
-    '';
-
-    meta = metaCommon // {
-      homepage = "https://github.com/hiddify/hiddify-core";
-      mainProgram = "HiddifyCli";
-    };
-  };
-in
-flutter324.buildFlutterApplication {
-  pname = "hiddify-app";
-  version = "2.5.7-unstable-2025-01-06";
-
-  src = fetchFromGitHub {
-    owner = "hiddify";
-    repo = "hiddify-app";
-    rev = "a7547d298a5f8058446b6a470e56fe4efa3c1ccd";
-    hash = "sha256-5I/k2KxdWiNsgwJY+bqMVqtC2eGshKbpLYzsPrmvhmY=";
-  };
-
-  pubspecLock = lib.importJSON ./pubspec.lock.json;
-
-  gitHashes = {
-    circle_flags = "sha256-dqORH4yj0jU8r9hP9NTjrlEO0ReHt4wds7BhgRPq57g=";
-    flutter_easy_permission = "sha256-fs2dIwFLmeDrlFIIocGw6emOW1whGi9W7nQ7mHqp8R0=";
-    humanizer = "sha256-zsDeol5l6maT8L8R6RRtHyd7CJn5908nvRXIytxiPqc=";
-  };
-
-  postPatch = ''
-    substituteInPlace linux/my_application.cc \
-      --replace-fail "./hiddify.png" "${placeholder "out"}/share/pixmaps/hiddify.png"
-  '';
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    copyDesktopItems
-  ];
-
-  buildInputs = [
-    libayatana-appindicator
-  ];
-
-  preBuild = ''
-    mkdir -p libcore/bin
-    cp -r ${libcore}/lib libcore/bin/lib
-    cp ${libcore}/bin/HiddifyCli libcore/bin/HiddifyCli
-    packageRun build_runner build --delete-conflicting-outputs
-    packageRun slang
-  '';
-
-  flutterBuildFlags = [
-    "--target lib/main_prod.dart"
-  ];
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "hiddify";
-      exec = "hiddify";
-      icon = "hiddify";
-      genericName = "Hiddify";
-      desktopName = "Hiddify";
-      categories = [
-        "Network"
-      ];
-      keywords = [
-        "Hiddify"
-        "Proxy"
-        "VPN"
-        "V2ray"
-        "Nekoray"
-        "Xray"
-        "Psiphon"
-        "OpenVPN"
-      ];
-    })
-  ];
-
-  postInstall = ''
-    install -Dm0644 assets/images/source/ic_launcher_border.png $out/share/pixmaps/hiddify.png
-  '';
-
-  preFixup = ''
-    patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" $out/app/hiddify-app/lib/lib*.so
-  '';
-
-  extraWrapProgramArgs = ''
-    --prefix LD_LIBRARY_PATH : $out/app/hiddify-app/lib
-  '';
-
-  meta = metaCommon // {
-    homepage = "https://hiddify.com";
-    mainProgram = "hiddify";
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/hi/hiddify-app/pubspec.lock.json b/pkgs/by-name/hi/hiddify-app/pubspec.lock.json
deleted file mode 100644
index c6093503f3f9..000000000000
--- a/pkgs/by-name/hi/hiddify-app/pubspec.lock.json
+++ /dev/null
@@ -1,2531 +0,0 @@
-{
-  "packages": {
-    "_fe_analyzer_shared": {
-      "dependency": "transitive",
-      "description": {
-        "name": "_fe_analyzer_shared",
-        "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "67.0.0"
-    },
-    "accessibility_tools": {
-      "dependency": "direct main",
-      "description": {
-        "name": "accessibility_tools",
-        "sha256": "deca88d9f181ad6fdd12df9c5fa952c763264da14336ca1c0e4124525725b174",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.1"
-    },
-    "analyzer": {
-      "dependency": "transitive",
-      "description": {
-        "name": "analyzer",
-        "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.4.1"
-    },
-    "analyzer_plugin": {
-      "dependency": "transitive",
-      "description": {
-        "name": "analyzer_plugin",
-        "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.11.3"
-    },
-    "ansicolor": {
-      "dependency": "transitive",
-      "description": {
-        "name": "ansicolor",
-        "sha256": "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.2"
-    },
-    "archive": {
-      "dependency": "transitive",
-      "description": {
-        "name": "archive",
-        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.6.1"
-    },
-    "args": {
-      "dependency": "transitive",
-      "description": {
-        "name": "args",
-        "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.5.0"
-    },
-    "async": {
-      "dependency": "transitive",
-      "description": {
-        "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.11.0"
-    },
-    "boolean_selector": {
-      "dependency": "transitive",
-      "description": {
-        "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "build": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build",
-        "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "build_config": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_config",
-        "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.1"
-    },
-    "build_daemon": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_daemon",
-        "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.2"
-    },
-    "build_resolvers": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_resolvers",
-        "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.2"
-    },
-    "build_runner": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "build_runner",
-        "sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.11"
-    },
-    "build_runner_core": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_runner_core",
-        "sha256": "e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.3.1"
-    },
-    "built_collection": {
-      "dependency": "transitive",
-      "description": {
-        "name": "built_collection",
-        "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.1.1"
-    },
-    "built_value": {
-      "dependency": "transitive",
-      "description": {
-        "name": "built_value",
-        "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "8.9.2"
-    },
-    "characters": {
-      "dependency": "transitive",
-      "description": {
-        "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.0"
-    },
-    "charcode": {
-      "dependency": "transitive",
-      "description": {
-        "name": "charcode",
-        "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.1"
-    },
-    "checked_yaml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "checked_yaml",
-        "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.3"
-    },
-    "circle_flags": {
-      "dependency": "direct main",
-      "description": {
-        "path": ".",
-        "ref": "HEAD",
-        "resolved-ref": "19d83cba60de91143491a441b5076583bf1681a8",
-        "url": "https://github.com/hiddify-com/flutter_circle_flags.git"
-      },
-      "source": "git",
-      "version": "4.1.0"
-    },
-    "cli_util": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cli_util",
-        "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.1"
-    },
-    "clock": {
-      "dependency": "transitive",
-      "description": {
-        "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.1"
-    },
-    "code_builder": {
-      "dependency": "transitive",
-      "description": {
-        "name": "code_builder",
-        "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.10.0"
-    },
-    "collection": {
-      "dependency": "transitive",
-      "description": {
-        "name": "collection",
-        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.18.0"
-    },
-    "color": {
-      "dependency": "transitive",
-      "description": {
-        "name": "color",
-        "sha256": "ddcdf1b3badd7008233f5acffaf20ca9f5dc2cd0172b75f68f24526a5f5725cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.0"
-    },
-    "combine": {
-      "dependency": "direct main",
-      "description": {
-        "name": "combine",
-        "sha256": "c16464b55d140871fbab5b37909e1808c2f020e46f9ba7deca59d40faabb6008",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.5.7"
-    },
-    "convert": {
-      "dependency": "transitive",
-      "description": {
-        "name": "convert",
-        "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.1"
-    },
-    "cross_file": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cross_file",
-        "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.4+2"
-    },
-    "crypto": {
-      "dependency": "transitive",
-      "description": {
-        "name": "crypto",
-        "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.3"
-    },
-    "csslib": {
-      "dependency": "transitive",
-      "description": {
-        "name": "csslib",
-        "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "csv": {
-      "dependency": "transitive",
-      "description": {
-        "name": "csv",
-        "sha256": "c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.0"
-    },
-    "cupertino_http": {
-      "dependency": "direct main",
-      "description": {
-        "name": "cupertino_http",
-        "sha256": "7e75c45a27cc13a886ab0a1e4d8570078397057bd612de9d24fe5df0d9387717",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.5.1"
-    },
-    "cupertino_icons": {
-      "dependency": "direct main",
-      "description": {
-        "name": "cupertino_icons",
-        "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.8"
-    },
-    "custom_lint_core": {
-      "dependency": "transitive",
-      "description": {
-        "name": "custom_lint_core",
-        "sha256": "a85e8f78f4c52f6c63cdaf8c872eb573db0231dcdf3c3a5906d493c1f8bc20e6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.6.3"
-    },
-    "dart_mappable": {
-      "dependency": "direct main",
-      "description": {
-        "name": "dart_mappable",
-        "sha256": "47269caf2060533c29b823ff7fa9706502355ffcb61e7f2a374e3a0fb2f2c3f0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.2.2"
-    },
-    "dart_mappable_builder": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "dart_mappable_builder",
-        "sha256": "ab5cf9086862d3fceb9773e945b5f95cc5471a28c782a4fc451bd400a4e0c64e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.2.3"
-    },
-    "dart_style": {
-      "dependency": "transitive",
-      "description": {
-        "name": "dart_style",
-        "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.6"
-    },
-    "dartx": {
-      "dependency": "direct main",
-      "description": {
-        "name": "dartx",
-        "sha256": "8b25435617027257d43e6508b5fe061012880ddfdaa75a71d607c3de2a13d244",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
-    "decimal": {
-      "dependency": "transitive",
-      "description": {
-        "name": "decimal",
-        "sha256": "24a261d5d5c87e86c7651c417a5dbdf8bcd7080dd592533910e8d0505a279f21",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.3"
-    },
-    "dependency_validator": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "dependency_validator",
-        "sha256": "f727a5627aa405965fab4aef4f468e50a9b632ba0737fd2f98c932fec6d712b9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.3"
-    },
-    "device_info_plus": {
-      "dependency": "transitive",
-      "description": {
-        "name": "device_info_plus",
-        "sha256": "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "9.1.2"
-    },
-    "device_info_plus_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "device_info_plus_platform_interface",
-        "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.0.1"
-    },
-    "dio": {
-      "dependency": "direct main",
-      "description": {
-        "name": "dio",
-        "sha256": "e17f6b3097b8c51b72c74c9f071a605c47bcc8893839bd66732457a5ebe73714",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.5.0+1"
-    },
-    "dio_smart_retry": {
-      "dependency": "direct main",
-      "description": {
-        "name": "dio_smart_retry",
-        "sha256": "3d71450c19b4d91ef4c7d726a55a284bfc11eb3634f1f25006cdfab3f8595653",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.0"
-    },
-    "dio_web_adapter": {
-      "dependency": "transitive",
-      "description": {
-        "name": "dio_web_adapter",
-        "sha256": "36c5b2d79eb17cdae41e974b7a8284fec631651d2a6f39a8a2ff22327e90aeac",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.1"
-    },
-    "drift": {
-      "dependency": "direct main",
-      "description": {
-        "name": "drift",
-        "sha256": "4e0ffee40d23f0b809e6cff1ad202886f51d629649073ed42d9cd1d194ea943e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.19.1+1"
-    },
-    "drift_dev": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "drift_dev",
-        "sha256": "ac7647c6cedca99724ca300cff9181f6dd799428f8ed71f94159ed0528eaec26",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.19.1"
-    },
-    "dynamic_color": {
-      "dependency": "direct main",
-      "description": {
-        "name": "dynamic_color",
-        "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.7.0"
-    },
-    "equatable": {
-      "dependency": "transitive",
-      "description": {
-        "name": "equatable",
-        "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.5"
-    },
-    "fake_async": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.1"
-    },
-    "ffi": {
-      "dependency": "direct main",
-      "description": {
-        "name": "ffi",
-        "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
-    "ffigen": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "ffigen",
-        "sha256": "d3e76c2ad48a4e7f93a29a162006f00eba46ce7c08194a77bb5c5e97d1b5ff0a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "8.0.2"
-    },
-    "file": {
-      "dependency": "transitive",
-      "description": {
-        "name": "file",
-        "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.1.4"
-    },
-    "fixnum": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fixnum",
-        "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
-    "fluentui_system_icons": {
-      "dependency": "direct main",
-      "description": {
-        "name": "fluentui_system_icons",
-        "sha256": "af92e0abc8a4060ffdcae2ad31a050cd242bf9eff121769b9cfb11fe05d08d6c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.252"
-    },
-    "flutter": {
-      "dependency": "direct main",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_adaptive_scaffold": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_adaptive_scaffold",
-        "sha256": "a464b74540401cade07af0ae84d19f210534cac67651a150fb413507040b74f6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.12"
-    },
-    "flutter_animate": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_animate",
-        "sha256": "7c8a6594a9252dad30cc2ef16e33270b6248c4dedc3b3d06c86c4f3f4dc05ae5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.5.0"
-    },
-    "flutter_displaymode": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_displaymode",
-        "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.6.0"
-    },
-    "flutter_easy_permission": {
-      "dependency": "direct main",
-      "description": {
-        "path": ".",
-        "ref": "HEAD",
-        "resolved-ref": "3f6611f2a88f7ed640207c3accab9178f76da2c6",
-        "url": "https://github.com/unger1984/flutter_easy_permission.git"
-      },
-      "source": "git",
-      "version": "1.1.3"
-    },
-    "flutter_gen_core": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_gen_core",
-        "sha256": "d8e828ad015a8511624491b78ad8e3f86edb7993528b1613aefbb4ad95947795",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.6.0"
-    },
-    "flutter_gen_runner": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "flutter_gen_runner",
-        "sha256": "931b03f77c164df0a4815aac0efc619a6ac8ec4cada55025119fca4894dada90",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.6.0"
-    },
-    "flutter_hooks": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_hooks",
-        "sha256": "cde36b12f7188c85286fba9b38cc5a902e7279f36dd676967106c041dc9dde70",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.20.5"
-    },
-    "flutter_keyboard_visibility": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility",
-        "sha256": "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.0"
-    },
-    "flutter_keyboard_visibility_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_linux",
-        "sha256": "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "flutter_keyboard_visibility_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_macos",
-        "sha256": "c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "flutter_keyboard_visibility_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_platform_interface",
-        "sha256": "e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
-    "flutter_keyboard_visibility_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_web",
-        "sha256": "d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
-    "flutter_keyboard_visibility_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_windows",
-        "sha256": "fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "flutter_localizations": {
-      "dependency": "direct main",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_loggy": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_loggy",
-        "sha256": "c758629403e19115af198993ff7bd3af2c5a337de16ee23acda2e6f29df1db48",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.3"
-    },
-    "flutter_loggy_dio": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_loggy_dio",
-        "sha256": "d17d26bb85667c14aefa6dce9b12bd2c1ae13cd75e89d25b0c799b063be55e3c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.0"
-    },
-    "flutter_native_splash": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_native_splash",
-        "sha256": "aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "flutter_riverpod": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_riverpod",
-        "sha256": "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.5.1"
-    },
-    "flutter_shaders": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_shaders",
-        "sha256": "02750b545c01ff4d8e9bbe8f27a7731aa3778402506c67daa1de7f5fc3f4befe",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.2"
-    },
-    "flutter_svg": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_svg",
-        "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.10+1"
-    },
-    "flutter_test": {
-      "dependency": "direct dev",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_timezone": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_timezone",
-        "sha256": "06b35132c98fa188db3c4b654b7e1af7ccd01dfe12a004d58be423357605fb24",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.8"
-    },
-    "flutter_typeahead": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_typeahead",
-        "sha256": "d64712c65db240b1057559b952398ebb6e498077baeebf9b0731dade62438a6d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.2.0"
-    },
-    "flutter_web_plugins": {
-      "dependency": "transitive",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "fpdart": {
-      "dependency": "direct main",
-      "description": {
-        "name": "fpdart",
-        "sha256": "7413acc5a6569a3fe8277928fc7487f3198530f0c4e635d0baef199ea36e8ee9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
-    "freezed": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "freezed",
-        "sha256": "a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.5.2"
-    },
-    "freezed_annotation": {
-      "dependency": "direct main",
-      "description": {
-        "name": "freezed_annotation",
-        "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.4"
-    },
-    "frontend_server_client": {
-      "dependency": "transitive",
-      "description": {
-        "name": "frontend_server_client",
-        "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.0"
-    },
-    "gap": {
-      "dependency": "direct main",
-      "description": {
-        "name": "gap",
-        "sha256": "f19387d4e32f849394758b91377f9153a1b41d79513ef7668c088c77dbc6955d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.1"
-    },
-    "glob": {
-      "dependency": "transitive",
-      "description": {
-        "name": "glob",
-        "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
-    "globbing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "globbing",
-        "sha256": "4f89cfaf6fa74c9c1740a96259da06bd45411ede56744e28017cc534a12b6e2d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "go_router": {
-      "dependency": "direct main",
-      "description": {
-        "name": "go_router",
-        "sha256": "b465e99ce64ba75e61c8c0ce3d87b66d8ac07f0b35d0a7e0263fcfc10f99e836",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "13.2.5"
-    },
-    "go_router_builder": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "go_router_builder",
-        "sha256": "3425b72dea69209754ac6b71b4da34165dcd4d4a2934713029945709a246427a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.7.1"
-    },
-    "google_identity_services_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "google_identity_services_web",
-        "sha256": "5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.1+4"
-    },
-    "googleapis_auth": {
-      "dependency": "transitive",
-      "description": {
-        "name": "googleapis_auth",
-        "sha256": "befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.6.0"
-    },
-    "graphs": {
-      "dependency": "transitive",
-      "description": {
-        "name": "graphs",
-        "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.2"
-    },
-    "grpc": {
-      "dependency": "direct main",
-      "description": {
-        "name": "grpc",
-        "sha256": "e93ee3bce45c134bf44e9728119102358c7cd69de7832d9a874e2e74eb8cab40",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.4"
-    },
-    "hashcodes": {
-      "dependency": "transitive",
-      "description": {
-        "name": "hashcodes",
-        "sha256": "80f9410a5b3c8e110c4b7604546034749259f5d6dcca63e0d3c17c9258f1a651",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
-    "hooks_riverpod": {
-      "dependency": "direct main",
-      "description": {
-        "name": "hooks_riverpod",
-        "sha256": "45b2030a18bcd6dbd680c2c91bc3b33e3fe7c323e3acb5ecec93a613e2fbaa8a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.5.1"
-    },
-    "html": {
-      "dependency": "transitive",
-      "description": {
-        "name": "html",
-        "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.15.4"
-    },
-    "http": {
-      "dependency": "direct main",
-      "description": {
-        "name": "http",
-        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.2"
-    },
-    "http2": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http2",
-        "sha256": "9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.0"
-    },
-    "http_multi_server": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http_multi_server",
-        "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.1"
-    },
-    "http_parser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.2"
-    },
-    "http_profile": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http_profile",
-        "sha256": "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.0"
-    },
-    "humanizer": {
-      "dependency": "direct main",
-      "description": {
-        "path": ".",
-        "ref": "up-version",
-        "resolved-ref": "8ae61d68357fae197be7ee71d67ccb9498b9d5c7",
-        "url": "https://github.com/alex-relov/humanizer"
-      },
-      "source": "git",
-      "version": "2.3.0"
-    },
-    "iconsax_flutter": {
-      "dependency": "transitive",
-      "description": {
-        "name": "iconsax_flutter",
-        "sha256": "95b65699da8ea98f87c5d232f06b0debaaf1ec1332b697e4d90969ec9a93037d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "image": {
-      "dependency": "transitive",
-      "description": {
-        "name": "image",
-        "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.2.0"
-    },
-    "image_size_getter": {
-      "dependency": "transitive",
-      "description": {
-        "name": "image_size_getter",
-        "sha256": "f98c4246144e9b968899d2dfde69091e22a539bb64bc9b0bea51505fbb490e57",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.3"
-    },
-    "in_app_review": {
-      "dependency": "direct main",
-      "description": {
-        "name": "in_app_review",
-        "sha256": "99869244d09adc76af16bf8fd731dd13cef58ecafd5917847589c49f378cbb30",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.9"
-    },
-    "in_app_review_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "in_app_review_platform_interface",
-        "sha256": "fed2c755f2125caa9ae10495a3c163aa7fab5af3585a9c62ef4a6920c5b45f10",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.5"
-    },
-    "injector": {
-      "dependency": "transitive",
-      "description": {
-        "name": "injector",
-        "sha256": "ed389bed5b48a699d5b9561c985023d0d5cc88dd5ff2237aadcce5a5ab433e4e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.0"
-    },
-    "intl": {
-      "dependency": "direct main",
-      "description": {
-        "name": "intl",
-        "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.19.0"
-    },
-    "io": {
-      "dependency": "transitive",
-      "description": {
-        "name": "io",
-        "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.4"
-    },
-    "iregexp": {
-      "dependency": "transitive",
-      "description": {
-        "name": "iregexp",
-        "sha256": "143859dcaeecf6f683102786762d70a47ef8441a0d2287a158172d32d38799cf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.2"
-    },
-    "js": {
-      "dependency": "transitive",
-      "description": {
-        "name": "js",
-        "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.1"
-    },
-    "json2yaml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "json2yaml",
-        "sha256": "da94630fbc56079426fdd167ae58373286f603371075b69bf46d848d63ba3e51",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.1"
-    },
-    "json_annotation": {
-      "dependency": "direct main",
-      "description": {
-        "name": "json_annotation",
-        "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.9.0"
-    },
-    "json_path": {
-      "dependency": "direct main",
-      "description": {
-        "name": "json_path",
-        "sha256": "7a06bbb1cfad390b20fb7a2ca5e67d9ba59633879c6d71142b80fbf61c3b66f6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.4"
-    },
-    "json_serializable": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "json_serializable",
-        "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.8.0"
-    },
-    "launch_at_startup": {
-      "dependency": "direct main",
-      "description": {
-        "name": "launch_at_startup",
-        "sha256": "93fc5638e088290004fae358bae691486673d469957d461d9dae5b12248593eb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.2"
-    },
-    "leak_tracker": {
-      "dependency": "transitive",
-      "description": {
-        "name": "leak_tracker",
-        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "10.0.5"
-    },
-    "leak_tracker_flutter_testing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "leak_tracker_flutter_testing",
-        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.5"
-    },
-    "leak_tracker_testing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.1"
-    },
-    "lint": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "lint",
-        "sha256": "d758a5211fce7fd3f5e316f804daefecdc34c7e53559716125e6da7388ae8565",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.0"
-    },
-    "logging": {
-      "dependency": "transitive",
-      "description": {
-        "name": "logging",
-        "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
-    "loggy": {
-      "dependency": "direct main",
-      "description": {
-        "name": "loggy",
-        "sha256": "981e03162bbd3a5a843026f75f73d26e4a0d8aa035ae060456ca7b30dfd1e339",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.3"
-    },
-    "matcher": {
-      "dependency": "transitive",
-      "description": {
-        "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.12.16+1"
-    },
-    "material_color_utilities": {
-      "dependency": "transitive",
-      "description": {
-        "name": "material_color_utilities",
-        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.11.1"
-    },
-    "maybe_just_nothing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "maybe_just_nothing",
-        "sha256": "0c06326e26d08f6ed43247404376366dc4d756cef23a4f1db765f546224c35e0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.5.3"
-    },
-    "menu_base": {
-      "dependency": "transitive",
-      "description": {
-        "name": "menu_base",
-        "sha256": "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.1"
-    },
-    "meta": {
-      "dependency": "direct main",
-      "description": {
-        "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.15.0"
-    },
-    "mime": {
-      "dependency": "transitive",
-      "description": {
-        "name": "mime",
-        "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.5"
-    },
-    "mobile_scanner": {
-      "dependency": "direct main",
-      "description": {
-        "name": "mobile_scanner",
-        "sha256": "b8c0e9afcfd52534f85ec666f3d52156f560b5e6c25b1e3d4fe2087763607926",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.1.1"
-    },
-    "neat_periodic_task": {
-      "dependency": "direct main",
-      "description": {
-        "name": "neat_periodic_task",
-        "sha256": "e0dda74c996781e154f6145028dbacbcd9dbef242f5a140fa774e39381c2bf97",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.1"
-    },
-    "os_detect": {
-      "dependency": "transitive",
-      "description": {
-        "name": "os_detect",
-        "sha256": "faf3bcf39515e64da8ff76b2f2805b20a6ff47ae515393e535f8579ff91d6b7f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.1"
-    },
-    "package_config": {
-      "dependency": "transitive",
-      "description": {
-        "name": "package_config",
-        "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "package_info_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "package_info_plus",
-        "sha256": "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.0.1"
-    },
-    "package_info_plus_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "package_info_plus_platform_interface",
-        "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.1"
-    },
-    "path": {
-      "dependency": "direct main",
-      "description": {
-        "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.9.0"
-    },
-    "path_parsing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_parsing",
-        "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.1"
-    },
-    "path_provider": {
-      "dependency": "direct main",
-      "description": {
-        "name": "path_provider",
-        "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.4"
-    },
-    "path_provider_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_android",
-        "sha256": "490539678396d4c3c0b06efdaab75ae60675c3e0c66f72bc04c2e2c1e0e2abeb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.9"
-    },
-    "path_provider_foundation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_foundation",
-        "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.0"
-    },
-    "path_provider_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_linux",
-        "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.1"
-    },
-    "path_provider_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_platform_interface",
-        "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
-    "path_provider_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_windows",
-        "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.0"
-    },
-    "pausable_timer": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pausable_timer",
-        "sha256": "6ef1a95441ec3439de6fb63f39a011b67e693198e7dae14e20675c3c00e86074",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.0+3"
-    },
-    "percent_indicator": {
-      "dependency": "direct main",
-      "description": {
-        "name": "percent_indicator",
-        "sha256": "c37099ad833a883c9d71782321cb65c3a848c21b6939b6185f0ff6640d05814c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.2.3"
-    },
-    "petitparser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.2"
-    },
-    "platform": {
-      "dependency": "transitive",
-      "description": {
-        "name": "platform",
-        "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.5"
-    },
-    "plugin_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "plugin_platform_interface",
-        "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.8"
-    },
-    "pointer_interceptor": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pointer_interceptor",
-        "sha256": "57210410680379aea8b1b7ed6ae0c3ad349bfd56fe845b8ea934a53344b9d523",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.10.1+2"
-    },
-    "pointer_interceptor_ios": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pointer_interceptor_ios",
-        "sha256": "a6906772b3205b42c44614fcea28f818b1e5fdad73a4ca742a7bd49818d9c917",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.10.1"
-    },
-    "pointer_interceptor_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pointer_interceptor_platform_interface",
-        "sha256": "0597b0560e14354baeb23f8375cd612e8bd4841bf8306ecb71fcd0bb78552506",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.10.0+1"
-    },
-    "pointer_interceptor_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pointer_interceptor_web",
-        "sha256": "7a7087782110f8c1827170660b09f8aa893e0e9a61431dbbe2ac3fc482e8c044",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.10.2+1"
-    },
-    "pool": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.5.1"
-    },
-    "posix": {
-      "dependency": "direct main",
-      "description": {
-        "name": "posix",
-        "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.1"
-    },
-    "process": {
-      "dependency": "transitive",
-      "description": {
-        "name": "process",
-        "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.0.2"
-    },
-    "properties": {
-      "dependency": "transitive",
-      "description": {
-        "name": "properties",
-        "sha256": "333f427dd4ed07bdbe8c75b9ff864a1e70b5d7a8426a2e8bdd457b65ae5ac598",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "protobuf": {
-      "dependency": "direct main",
-      "description": {
-        "name": "protobuf",
-        "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.0"
-    },
-    "protocol_handler": {
-      "dependency": "direct main",
-      "description": {
-        "name": "protocol_handler",
-        "sha256": "dc2e2dcb1e0e313c3f43827ec3fa6d98adee6e17edc0c3923ac67efee87479a9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "protocol_handler_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "protocol_handler_android",
-        "sha256": "82eb860ca42149e400328f54b85140329a1766d982e94705b68271f6ca73895c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "protocol_handler_ios": {
-      "dependency": "transitive",
-      "description": {
-        "name": "protocol_handler_ios",
-        "sha256": "0d3a56b8c1926002cb1e32b46b56874759f4dcc8183d389b670864ac041b6ec2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "protocol_handler_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "protocol_handler_macos",
-        "sha256": "6eb8687a84e7da3afbc5660ce046f29d7ecf7976db45a9dadeae6c87147dd710",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "protocol_handler_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "protocol_handler_platform_interface",
-        "sha256": "53776b10526fdc25efdf1abcf68baf57fdfdb75342f4101051db521c9e3f3e5b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "protocol_handler_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "protocol_handler_windows",
-        "sha256": "d8f3a58938386aca2c76292757392f4d059d09f11439d6d896d876ebe997f2c4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "pub_semver": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pub_semver",
-        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.4"
-    },
-    "pubspec_parse": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pubspec_parse",
-        "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.0"
-    },
-    "qr": {
-      "dependency": "transitive",
-      "description": {
-        "name": "qr",
-        "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.2"
-    },
-    "qr_flutter": {
-      "dependency": "direct main",
-      "description": {
-        "name": "qr_flutter",
-        "sha256": "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.1.0"
-    },
-    "quiver": {
-      "dependency": "transitive",
-      "description": {
-        "name": "quiver",
-        "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.1"
-    },
-    "rational": {
-      "dependency": "transitive",
-      "description": {
-        "name": "rational",
-        "sha256": "cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.3"
-    },
-    "recase": {
-      "dependency": "transitive",
-      "description": {
-        "name": "recase",
-        "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.1.0"
-    },
-    "retry": {
-      "dependency": "transitive",
-      "description": {
-        "name": "retry",
-        "sha256": "822e118d5b3aafed083109c72d5f484c6dc66707885e07c0fbcb8b986bba7efc",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    },
-    "rfc_6901": {
-      "dependency": "transitive",
-      "description": {
-        "name": "rfc_6901",
-        "sha256": "df1bbfa3d023009598f19636d6114c6ac1e0b7bb7bf6a260f0e6e6ce91416820",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "riverpod": {
-      "dependency": "transitive",
-      "description": {
-        "name": "riverpod",
-        "sha256": "f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.5.1"
-    },
-    "riverpod_analyzer_utils": {
-      "dependency": "transitive",
-      "description": {
-        "name": "riverpod_analyzer_utils",
-        "sha256": "8b71f03fc47ae27d13769496a1746332df4cec43918aeba9aff1e232783a780f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.5.1"
-    },
-    "riverpod_annotation": {
-      "dependency": "direct main",
-      "description": {
-        "name": "riverpod_annotation",
-        "sha256": "e5e796c0eba4030c704e9dae1b834a6541814963292839dcf9638d53eba84f5c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.5"
-    },
-    "riverpod_generator": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "riverpod_generator",
-        "sha256": "d451608bf17a372025fc36058863737636625dfdb7e3cbf6142e0dfeb366ab22",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.0"
-    },
-    "rxdart": {
-      "dependency": "direct main",
-      "description": {
-        "name": "rxdart",
-        "sha256": "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.27.7"
-    },
-    "screen_retriever": {
-      "dependency": "transitive",
-      "description": {
-        "name": "screen_retriever",
-        "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.9"
-    },
-    "sentry": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sentry",
-        "sha256": "57514bc72d441ffdc463f498d6886aa586a2494fa467a1eb9d649c28010d7ee3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.20.2"
-    },
-    "sentry_dart_plugin": {
-      "dependency": "direct main",
-      "description": {
-        "name": "sentry_dart_plugin",
-        "sha256": "e81fa3e0ffabd04fdcfbfecd6468d4a342f02ab33edca09708c61bcd2be42b7d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.7.1"
-    },
-    "sentry_flutter": {
-      "dependency": "direct main",
-      "description": {
-        "name": "sentry_flutter",
-        "sha256": "9723d58470ca43a360681ddd26abb71ca7b815f706bc8d3747afd054cf639ded",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.20.2"
-    },
-    "share_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "share_plus",
-        "sha256": "3ef39599b00059db0990ca2e30fca0a29d8b37aae924d60063f8e0184cf20900",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.2.2"
-    },
-    "share_plus_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "share_plus_platform_interface",
-        "sha256": "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.4.0"
-    },
-    "shared_preferences": {
-      "dependency": "direct main",
-      "description": {
-        "name": "shared_preferences",
-        "sha256": "c272f9cabca5a81adc9b0894381e9c1def363e980f960fa903c604c471b22f68",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.1"
-    },
-    "shared_preferences_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_android",
-        "sha256": "a7e8467e9181cef109f601e3f65765685786c1a738a83d7fbbde377589c0d974",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.1"
-    },
-    "shared_preferences_foundation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_foundation",
-        "sha256": "776786cff96324851b656777648f36ac772d88bc4c669acff97b7fce5de3c849",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.5.1"
-    },
-    "shared_preferences_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_linux",
-        "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "shared_preferences_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_platform_interface",
-        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "shared_preferences_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_web",
-        "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.2"
-    },
-    "shared_preferences_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_windows",
-        "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "shelf": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shelf",
-        "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.4.1"
-    },
-    "shelf_web_socket": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shelf_web_socket",
-        "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
-    "shortid": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shortid",
-        "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.2"
-    },
-    "sky_engine": {
-      "dependency": "transitive",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.99"
-    },
-    "slang": {
-      "dependency": "direct main",
-      "description": {
-        "name": "slang",
-        "sha256": "f68f6d6709890f85efabfb0318e9d694be2ebdd333e57fe5cb50eee449e4e3ab",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.31.1"
-    },
-    "slang_build_runner": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "slang_build_runner",
-        "sha256": "6e60160e8000b91824c47221b20d9642e7408287a5a21837ecefc75270197586",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.31.0"
-    },
-    "slang_flutter": {
-      "dependency": "direct main",
-      "description": {
-        "name": "slang_flutter",
-        "sha256": "f8400292be49c11697d94af58d7f7d054c91af759f41ffe71e4e5413871ffc62",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.31.0"
-    },
-    "sliver_tools": {
-      "dependency": "direct main",
-      "description": {
-        "name": "sliver_tools",
-        "sha256": "eae28220badfb9d0559207badcbbc9ad5331aac829a88cb0964d330d2a4636a6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.12"
-    },
-    "slugid": {
-      "dependency": "transitive",
-      "description": {
-        "name": "slugid",
-        "sha256": "e0cc54637b666c9c590f0d76df76e5e2bbf6234ae398a182aac82fd70ddd60ab",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.2"
-    },
-    "source_gen": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_gen",
-        "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.5.0"
-    },
-    "source_helper": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_helper",
-        "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.4"
-    },
-    "source_span": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.10.0"
-    },
-    "sprintf": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sprintf",
-        "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.0.0"
-    },
-    "sqlite3": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sqlite3",
-        "sha256": "fde692580bee3379374af1f624eb3e113ab2865ecb161dbe2d8ac2de9735dbdb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.5"
-    },
-    "sqlite3_flutter_libs": {
-      "dependency": "direct main",
-      "description": {
-        "name": "sqlite3_flutter_libs",
-        "sha256": "62bbb4073edbcdf53f40c80775f33eea01d301b7b81417e5b3fb7395416258c1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.5.24"
-    },
-    "sqlparser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sqlparser",
-        "sha256": "3be52b4968fc2f098ba735863404756d2fe3ea0729cf006a5b5612618f74ca04",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.37.1"
-    },
-    "stack_trace": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stack_trace",
-        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.11.1"
-    },
-    "state_notifier": {
-      "dependency": "transitive",
-      "description": {
-        "name": "state_notifier",
-        "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "stream_channel": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
-    "stream_transform": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stream_transform",
-        "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "string_scanner": {
-      "dependency": "transitive",
-      "description": {
-        "name": "string_scanner",
-        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
-    "system_info2": {
-      "dependency": "transitive",
-      "description": {
-        "name": "system_info2",
-        "sha256": "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.0"
-    },
-    "term_glyph": {
-      "dependency": "transitive",
-      "description": {
-        "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.1"
-    },
-    "test_api": {
-      "dependency": "transitive",
-      "description": {
-        "name": "test_api",
-        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.2"
-    },
-    "time": {
-      "dependency": "transitive",
-      "description": {
-        "name": "time",
-        "sha256": "ad8e018a6c9db36cb917a031853a1aae49467a93e0d464683e029537d848c221",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.4"
-    },
-    "timezone": {
-      "dependency": "transitive",
-      "description": {
-        "name": "timezone",
-        "sha256": "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.9.4"
-    },
-    "timezone_to_country": {
-      "dependency": "direct main",
-      "description": {
-        "name": "timezone_to_country",
-        "sha256": "3dc8480ff450910d97555a26a19cb278fb68b69d24246fffadbc5390165457a1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.0"
-    },
-    "timing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "timing",
-        "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.1"
-    },
-    "tint": {
-      "dependency": "direct main",
-      "description": {
-        "name": "tint",
-        "sha256": "9652d9a589f4536d5e392cf790263d120474f15da3cf1bee7f1fdb31b4de5f46",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.1"
-    },
-    "toastification": {
-      "dependency": "direct main",
-      "description": {
-        "name": "toastification",
-        "sha256": "1e01495fe00b8fddce8a7f1da5e4775cd003763698e8363d7122bea4168a395e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.1"
-    },
-    "tray_manager": {
-      "dependency": "direct main",
-      "description": {
-        "name": "tray_manager",
-        "sha256": "c9a63fd88bd3546287a7eb8ccc978d707eef82c775397af17dda3a4f4c039e64",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.3"
-    },
-    "type_plus": {
-      "dependency": "transitive",
-      "description": {
-        "name": "type_plus",
-        "sha256": "d5d1019471f0d38b91603adb9b5fd4ce7ab903c879d2fbf1a3f80a630a03fcc9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "typed_data": {
-      "dependency": "transitive",
-      "description": {
-        "name": "typed_data",
-        "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.2"
-    },
-    "universal_io": {
-      "dependency": "transitive",
-      "description": {
-        "name": "universal_io",
-        "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.2"
-    },
-    "upgrader": {
-      "dependency": "direct main",
-      "description": {
-        "name": "upgrader",
-        "sha256": "0c5fe8101b9d3017aebcb5175b49c382699725ffcf477afbe93fc3351491f6e8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "9.0.0"
-    },
-    "url_launcher": {
-      "dependency": "direct main",
-      "description": {
-        "name": "url_launcher",
-        "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.3.0"
-    },
-    "url_launcher_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_android",
-        "sha256": "94d8ad05f44c6d4e2ffe5567ab4d741b82d62e3c8e288cc1fcea45965edf47c9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.3.8"
-    },
-    "url_launcher_ios": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_ios",
-        "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.3.1"
-    },
-    "url_launcher_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_linux",
-        "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.0"
-    },
-    "url_launcher_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_macos",
-        "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.0"
-    },
-    "url_launcher_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_platform_interface",
-        "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.2"
-    },
-    "url_launcher_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.3"
-    },
-    "url_launcher_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_windows",
-        "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    },
-    "uuid": {
-      "dependency": "direct main",
-      "description": {
-        "name": "uuid",
-        "sha256": "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.4.2"
-    },
-    "vclibs": {
-      "dependency": "direct main",
-      "description": {
-        "name": "vclibs",
-        "sha256": "5dc5de54fabe27ad276898b7c04a56a4a3dd9834e479b9db5e04a9f3eb36790e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3"
-    },
-    "vector_graphics": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vector_graphics",
-        "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.11+1"
-    },
-    "vector_graphics_codec": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vector_graphics_codec",
-        "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.11+1"
-    },
-    "vector_graphics_compiler": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vector_graphics_compiler",
-        "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.11+1"
-    },
-    "vector_math": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.4"
-    },
-    "version": {
-      "dependency": "direct main",
-      "description": {
-        "name": "version",
-        "sha256": "3d4140128e6ea10d83da32fef2fa4003fccbf6852217bb854845802f04191f94",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.2"
-    },
-    "vm_service": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vm_service",
-        "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "14.2.5"
-    },
-    "watcher": {
-      "dependency": "direct main",
-      "description": {
-        "name": "watcher",
-        "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
-    "web": {
-      "dependency": "direct overridden",
-      "description": {
-        "name": "web",
-        "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "web_socket": {
-      "dependency": "transitive",
-      "description": {
-        "name": "web_socket",
-        "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.6"
-    },
-    "web_socket_channel": {
-      "dependency": "transitive",
-      "description": {
-        "name": "web_socket_channel",
-        "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.1"
-    },
-    "win32": {
-      "dependency": "direct main",
-      "description": {
-        "name": "win32",
-        "sha256": "015002c060f1ae9f41a818f2d5640389cc05283e368be19dc8d77cecb43c40c9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.5.3"
-    },
-    "win32_registry": {
-      "dependency": "transitive",
-      "description": {
-        "name": "win32_registry",
-        "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.4"
-    },
-    "window_manager": {
-      "dependency": "direct main",
-      "description": {
-        "name": "window_manager",
-        "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.9"
-    },
-    "wolt_modal_sheet": {
-      "dependency": "direct main",
-      "description": {
-        "name": "wolt_modal_sheet",
-        "sha256": "0a04f1a11bbeeb4847bdea17707ab68fffaaa656a5ce75323939647952d696c4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.1"
-    },
-    "xdg_directories": {
-      "dependency": "transitive",
-      "description": {
-        "name": "xdg_directories",
-        "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.4"
-    },
-    "xml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.5.0"
-    },
-    "yaml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "yaml",
-        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    },
-    "yaml_edit": {
-      "dependency": "transitive",
-      "description": {
-        "name": "yaml_edit",
-        "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.1"
-    }
-  },
-  "sdks": {
-    "dart": ">=3.4.0 <4.0.0",
-    "flutter": ">=3.24.0"
-  }
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eb9c5f9ddad4..719c9f192b32 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -926,6 +926,7 @@ mapAliases {
   haven-cli = throw "'haven-cli' has been removed due to the official announcement of the project closure. Read more at https://havenprotocol.org/2024/12/12/project-closure-announcement"; # Added 2025-02-25
   hawknl = throw "'hawknl' has been removed as it was unmaintained and the upstream unavailable"; # Added 2025-05-07
   HentaiAtHome = hentai-at-home; # Added 2024-06-12
+  hiddify-app = throw "hiddify-app has been removed, since it is unmaintained"; # added 2025-08-20
   hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21
   hoarder = throw "'hoarder' has been renamed to 'karakeep'"; # Added 2025-04-21
   hmetis = throw "'hmetis' has been removed as it was unmaintained and the upstream was unavailable"; # Added 2025-05-05

From b9b5563e11d1a1c40735eb6d02e4039425f8f2b8 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 20 Aug 2025 08:28:38 +0200
Subject: [PATCH 2082/3724] magnetico: 0.12.1 -> 0.13.0

---
 pkgs/by-name/ma/magnetico/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/magnetico/package.nix b/pkgs/by-name/ma/magnetico/package.nix
index a002f229c57a..f3106dd91a3d 100644
--- a/pkgs/by-name/ma/magnetico/package.nix
+++ b/pkgs/by-name/ma/magnetico/package.nix
@@ -9,17 +9,17 @@
 
 buildGoModule rec {
   pname = "magnetico";
-  version = "0.12.1";
+  version = "0.13.0";
 
   src = fetchFromGitea {
     domain = "maxwell.eurofusion.eu/git";
     owner = "rnhmjoj";
     repo = "magnetico";
     rev = "v${version}";
-    hash = "sha256-cO5TVtQ1jdW1YkFtj35kmRfJG46/lXjXyz870NCPT0g=";
+    hash = "sha256-TqzsgUSPIBQT+k+ZrJPkF7uIt8o018ZN5p8nHom8cXM=";
   };
 
-  vendorHash = "sha256-jIVMQtPCq9RYaYsH4LSZJFspH6TpCbgzHN0GX8cM/CI=";
+  vendorHash = "sha256-ZUtmQib6BD7P07ALYXKp/JAQodYnQCuvWZnWl9888Mg=";
 
   buildInputs = [ sqlite ];
 

From fa02f28f9e3ddc8472ccd83bbead1878617faa2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 06:33:53 +0000
Subject: [PATCH 2083/3724] icloudpd: 1.29.3 -> 1.30.0

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

diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix
index 118caa293582..1c5d33ca86a4 100644
--- a/pkgs/by-name/ic/icloudpd/package.nix
+++ b/pkgs/by-name/ic/icloudpd/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "icloudpd";
-  version = "1.29.3";
+  version = "1.30.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "icloud-photos-downloader";
     repo = "icloud_photos_downloader";
     tag = "v${version}";
-    hash = "sha256-ySo+qAeNhMwOdCe5jrKtMsEWofYQ8mqTMEl9059vpns=";
+    hash = "sha256-FuN2+ukQ9Kf/Eu7M63wrBIh31O64HZVqtC78vzKioNE=";
   };
 
   pythonRelaxDeps = true;

From 5d8ac1c5678948e3035a03168f3a6c08d711acfb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 06:38:21 +0000
Subject: [PATCH 2084/3724] cherry-studio: 1.5.5 -> 1.5.6

---
 pkgs/by-name/ch/cherry-studio/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index 54106861680b..913b151781bd 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cherry-studio";
-  version = "1.5.5";
+  version = "1.5.6";
 
   src = fetchFromGitHub {
     owner = "CherryHQ";
     repo = "cherry-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/ndmQYQrnYDbVmUnLo18vhrf6Ba91q+hnHfijra0NAk=";
+    hash = "sha256-OstKirf8rOlGodoMkjQHcSPOWuZx/n2EApHdN+4NpUE=";
   };
 
   postPatch = ''
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-O9S57VryApHDqBi/uD4gukZtZmzsZOfBG+WROnoFiH8=";
+    hash = "sha256-w1EfJ9N0V2aresLLGcpM2l3L/wajn3rNgljzcGHkIFs=";
   };
 
   nativeBuildInputs = [

From 4b8dec3b532546150a7b9e992d44335b3f0bb390 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 06:46:45 +0000
Subject: [PATCH 2085/3724] llama-cpp: 6134 -> 6210

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 9a76c27bbadf..70b335d1fe24 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -72,13 +72,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "6134";
+  version = "6210";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-J/Z6xrCfdSkf504AGiOmgRqgrOUXXTpqq5BpXwgOI4g=";
+    hash = "sha256-yPlFw3fuXvf4+IhOv0nVI9hnuZq73Br6INn8wdOmCOs=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From b1f7d15e1c96fb0c34f69db7651ad2fc3fa322e5 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Wed, 20 Aug 2025 00:12:42 -0700
Subject: [PATCH 2086/3724] zig_0_15: 0.15.0 -> 0.15.1

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

diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index e1a322d7d583..5ebcde79031c 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -16,9 +16,9 @@ let
       llvmPackages = llvmPackages_19;
       hash = "sha256-DhVJIY/z12PJZdb5j4dnCRb7k1CmeQVOnayYRP8azDI=";
     };
-    "0.15.0" = {
+    "0.15.1" = {
       llvmPackages = llvmPackages_20;
-      hash = "sha256-gsWK7RUfkXTT/JHN1f5zk0NjBYErs4rhgzA5J5lKnPI=";
+      hash = "sha256-RFbJYeTHj/aNjWSsG+HHtmOL1VY4dpvJjbx04OhF4bI=";
     };
   }
   // zigVersions;

From 971d45d94a80b36c5ef8a8d9d60130a779ce4f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=BCller?= <neikos@neikos.email>
Date: Wed, 20 Aug 2025 09:50:42 +0200
Subject: [PATCH 2087/3724] vmtools: Add Debian 13 "Trixie" (amd64 and i386)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcel Müller <neikos@neikos.email>
---
 pkgs/build-support/vm/default.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index ec63d4335d24..55647b404ea8 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1093,6 +1093,28 @@ rec {
       urlPrefix = "https://snapshot.debian.org/archive/debian/20231124T031419Z";
       packages = commonDebianPackages;
     };
+
+    debian13i386 = {
+      name = "debian-13.0-trixie-i386";
+      fullName = "Debian 13.0 Trixie (i386)";
+      packagesList = fetchurl {
+        url = "https://snapshot.debian.org/archive/debian/20250819T202603Z/dists/trixie/main/binary-i386/Packages.xz";
+        hash = "sha256-fXjhaG1Y+kn6iMEtqVZLwYN7lZ0cEQKVfMS3hSHJipY=";
+      };
+      urlPrefix = "https://snapshot.debian.org/archive/debian/20250819T202603Z";
+      packages = commonDebianPackages;
+    };
+
+    debian13x86_64 = {
+      name = "debian-13.0-trixie-amd64";
+      fullName = "Debian 13.0 Trixie (amd64)";
+      packagesList = fetchurl {
+        url = "https://snapshot.debian.org/archive/debian/20250819T202603Z/dists/trixie/main/binary-amd64/Packages.xz";
+        hash = "sha256-15cDoCcTv3m5fiZqP1hqWWnSG1BVUZSrm5YszTSKQs4=";
+      };
+      urlPrefix = "https://snapshot.debian.org/archive/debian/20250819T202603Z";
+      packages = commonDebianPackages;
+    };
   };
 
   # Common packages for Fedora images.

From 61861396c54dd1e2811bfb3bcd4347dae1c23671 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 08:05:57 +0000
Subject: [PATCH 2088/3724] openfga: 1.9.2 -> 1.9.5

---
 pkgs/by-name/op/openfga/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix
index 1c19901db8f1..17841ab4679c 100644
--- a/pkgs/by-name/op/openfga/package.nix
+++ b/pkgs/by-name/op/openfga/package.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "openfga";
-  version = "1.9.2";
+  version = "1.9.5";
 in
 
 buildGoModule {
@@ -17,10 +17,10 @@ buildGoModule {
     owner = "openfga";
     repo = "openfga";
     rev = "v${version}";
-    hash = "sha256-jddtLyAvvY+I/vpXA7e40efxUfL4AjcEGwUiq1jccDg=";
+    hash = "sha256-cFzBugvHcwhpcTJTk0SU7ZAk1sdlZCpfoOeS2l0Smk0=";
   };
 
-  vendorHash = "sha256-pDMf792e4U9s/ugQ2jto4HbtFEh3nXHTK71Hb5XnHB4=";
+  vendorHash = "sha256-f1z2E8a1moVzivpQW03t7+iObsLbVQ7pMMgQFAXKFw8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 0f6134aeb3e73fff277efc2b55035042a3e17124 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:21:17 +0800
Subject: [PATCH 2089/3724] animeko: drop

The upstream of this software does not want the application to be released on app stores.
---
 pkgs/by-name/an/animeko/deps.json   | 3700 ---------------------------
 pkgs/by-name/an/animeko/package.nix |  259 --
 pkgs/top-level/aliases.nix          |    1 +
 3 files changed, 1 insertion(+), 3959 deletions(-)
 delete mode 100644 pkgs/by-name/an/animeko/deps.json
 delete mode 100644 pkgs/by-name/an/animeko/package.nix

diff --git a/pkgs/by-name/an/animeko/deps.json b/pkgs/by-name/an/animeko/deps.json
deleted file mode 100644
index 1b0b7a189c81..000000000000
--- a/pkgs/by-name/an/animeko/deps.json
+++ /dev/null
@@ -1,3700 +0,0 @@
-{
- "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
- "!version": 1,
- "https://dl.google.com/dl/android/maven2": {
-  "androidx/annotation#annotation-jvm/1.7.0": {
-   "jar": "sha256-42uOS4OTpK3HTj1KsirVo2OW8M6i5AtXNOrhSTff0iQ=",
-   "module": "sha256-B85gw3erlOR8jJAlibl3YDAGT9Gn5NWgGjjXAONeXbQ=",
-   "pom": "sha256-LT/MEucHiGmSA5JmI39FEUDKqPlMHmLn/E1gLeNFsNc="
-  },
-  "androidx/annotation#annotation-jvm/1.8.0": {
-   "jar": "sha256-mqsybZSSgAmRhUNgrCSPSTzn98MYNRkwm3is6eJA9vY=",
-   "module": "sha256-48tFJVOdDtdLsjjvksae7yKoDkIsDSrLxR5hh/67ChM=",
-   "pom": "sha256-2fkI7m1IgSSs7VVv2Ka6nf5kf+AUuFrXIhRhEQ0DI2E="
-  },
-  "androidx/annotation#annotation-jvm/1.8.1": {
-   "module": "sha256-yVnjsM3HXBXv4BYF+laqefAz45I44VBji4+r3mqhIaA=",
-   "pom": "sha256-1JIDczqm+uBGw6PeTnlu7TR1lXVUhqZCc5iYRHWXULQ="
-  },
-  "androidx/annotation#annotation-jvm/1.9.0": {
-   "jar": "sha256-Mjbh5ExB2jeMGsm1Fb7gUB2NxRKZFGUQCstN/mQFmk4=",
-   "module": "sha256-S1hpnRTWadIj2lC7hf/md3UH0x9JDVMFA4ODZ0l15Tg=",
-   "pom": "sha256-PEA0l9/stnxrIZqvVYVD8wnJSOIoxAB7ADMBEYDw6+U="
-  },
-  "androidx/annotation#annotation-jvm/1.9.1": {
-   "jar": "sha256-HjQ5F+vye6lv5NxSscrX/TK3OPvGNVu2zVs7MF1yEtA=",
-   "module": "sha256-A/tlkXfIYY5HQlklwRvJHzhHA+omwmW+myXNeSkrURw=",
-   "pom": "sha256-ibmcIY1gAZMWtQqreYFnB7whaWyJagMOGxrgOJYby44="
-  },
-  "androidx/annotation#annotation/1.7.0": {
-   "module": "sha256-UwcIZW04BgUHfqi8qa4TcvvRrzjjdfQR1OQyY71RDDw=",
-   "pom": "sha256-IcYYrIxwkt2VGT8FwLGWGDp86PE2anqRLIAOvuNoqFg="
-  },
-  "androidx/annotation#annotation/1.8.0": {
-   "module": "sha256-1ZCg2OAvQF3nSejcgLdB3FA8bj5MnAFtYU12tl8LWe8=",
-   "pom": "sha256-fDjBim6KzHvYjvrNfhR6iXqUW5nbci5U4LnOJEYQLVs="
-  },
-  "androidx/annotation#annotation/1.8.1": {
-   "module": "sha256-5jhuha/dhlBE4hZXXkk+05pjpjJb2SU3miFCnDlByLU=",
-   "pom": "sha256-txIll07Ah+uWwl72gZ9VscIvUw6FykRrpzX7Zu0E/1w="
-  },
-  "androidx/annotation#annotation/1.9.0": {
-   "module": "sha256-dHz857uARn6ipotGGHOPdjoUHND1Yvw1p8IVBCf1oxo=",
-   "pom": "sha256-73DxHmNYnrfKKI079t8q0gNPFR6F8gux9F0MyeQwhRk="
-  },
-  "androidx/annotation#annotation/1.9.1": {
-   "module": "sha256-8gSwW3KKl1YXGLxxYkLkfGKcAIWoDudPylPU1ji8vj8=",
-   "pom": "sha256-xzOIHC4X1ffIZhzAKpFZyxYLeyCUon1ZORbIfT4lBjY="
-  },
-  "androidx/arch/core#core-common/2.2.0": {
-   "jar": "sha256-ZTCKBrHADuGGy54ZMhOD8EO5k4E/FSLEf0o+MwO9ukE=",
-   "module": "sha256-7fQgDP3C2UYjIlLJnl3LnGG7kJ61RQsmE9HU/cl0uYE=",
-   "pom": "sha256-HhfUr41kJb4qafivTWVKh+BFYlmp7vFUKGm8sCNUfig="
-  },
-  "androidx/collection#collection-jvm/1.4.5": {
-   "jar": "sha256-U5pDQo34ozdiL7eBQB9fDNzVLYs2FfAIWvUckAAv8zM=",
-   "module": "sha256-0kq0tJY72cP4nhwA15eqeV6wK6/HGNzf0mYhH5k/KyM=",
-   "pom": "sha256-0eYk/dD1wygCSsORVHJkScQzfZ5WoFR/sLsW1Dn6FlY="
-  },
-  "androidx/collection#collection-jvm/1.5.0": {
-   "jar": "sha256-cLNZJOS6vN/6N9Dlde4DnFai2XEjNCYkxItgMjNwQ0E=",
-   "module": "sha256-3eheKSUJIxtUcbsJG1dQmdT0MWHrKB6HOFA4oBYQcuY=",
-   "pom": "sha256-EcQVhk00AvYdQm5nIQFY3OGwRoBBJSaplPGCPs08s4g="
-  },
-  "androidx/collection#collection-jvm/1.5.0-beta01": {
-   "module": "sha256-m9Z90440sDcxxzEBAPpp2VYEY7WO82jiTplq39WylHk=",
-   "pom": "sha256-/TNZM8LOdQe4YcQsRrKMlLKMFVxsFh69V8vgrcZjE+Q="
-  },
-  "androidx/collection#collection/1.4.5": {
-   "module": "sha256-I34e/Faj4lqOpM7sJlWMKZhEv8U6rQb/P1PKHINeKMg=",
-   "pom": "sha256-DA39zlfaULfpyifTsZv/vjuY8x3cfgPNWEz3eAmns0k="
-  },
-  "androidx/collection#collection/1.5.0": {
-   "module": "sha256-v+t72E8/fdp71ztnCdSh9h9aN/hDcouuCKBn49+aCu8=",
-   "pom": "sha256-LWXI0LNtS0+q3ESv+breI9hx1xWe7fKz8C2AKzS3elc="
-  },
-  "androidx/collection#collection/1.5.0-beta01": {
-   "module": "sha256-zTV6fk5naCWsI4CaFLSw0HOExeNoUc58UVC3JnqLbxs=",
-   "pom": "sha256-ZpkVL++tCxICWB6bwx1hXuVwby1ukelKc84D/MZuNHw="
-  },
-  "androidx/databinding#databinding-common/8.9.2": {
-   "jar": "sha256-Zsq4JjnawPbCQzRkwJOwdNYIxLuIfsOKm4vErJgSZzI=",
-   "pom": "sha256-73R0N4INYwD/f7BCNPJ9/EOkkxt28cYect0GvXsPrW8="
-  },
-  "androidx/databinding#databinding-compiler-common/8.9.2": {
-   "jar": "sha256-Gg5WpebKaOJSXYmtDJB84nhjJR5ttLmcwqIlz5WFDAU=",
-   "pom": "sha256-SiuhKeVFJWnubBpIh2qjnLiohRqbbQ5lyC8NPI0EoBo="
-  },
-  "androidx/datastore#datastore-core-jvm/1.1.3": {
-   "jar": "sha256-Niy60fE4dKIsc2ChjrmVylKjYDeboOpa8bHPDfAxmi8=",
-   "module": "sha256-UmGZehK21geoJRfnYSIzci3SVeQVrOanr1IzItT1nzk=",
-   "pom": "sha256-PjzxV7ZBhO8a829Fvu/J4NSxQXboljpDobvM6mUIUxI="
-  },
-  "androidx/datastore#datastore-core-okio-jvm/1.1.3": {
-   "jar": "sha256-KRUGtPzjmCSXk+MnIHY1vU3yUYHZU5gI1xgaSr0IdfU=",
-   "module": "sha256-zVmKuJgBFPskrdXyfKxVldwxG2gi7jUnVC3FwFcWc1s=",
-   "pom": "sha256-A6bYrsZtSOpv1VS/p0vx77pOBIkA1WipNAoU8qVy3Rw="
-  },
-  "androidx/datastore#datastore-core-okio/1.1.3": {
-   "module": "sha256-SWvvC38Y/ZPd0+j/mrdvWq4YdDNrSpwe7n7YgjBdY+w=",
-   "pom": "sha256-qNiO7HMQohfDyzlAjArdOuyd+iuKJaia8av+HRMUegk="
-  },
-  "androidx/datastore#datastore-core/1.1.3": {
-   "module": "sha256-8lm5afpDZrxe0WT0Alngj23e25rLD+1E3BClSnZ0p9Y=",
-   "pom": "sha256-R0vKoLsIzJYBd+VxG5sKaHqMo/EZdLMSDOLAU9CmDlI="
-  },
-  "androidx/datastore#datastore-preferences-core-jvm/1.1.3": {
-   "jar": "sha256-yznhIjtDJNcwxXOivOo6NTCevZNY++YwiZcFo/vKyvY=",
-   "module": "sha256-jUuuxy3XADVcSt/3NT91dMlHKa0ooV/Z4VCPYllsSLo=",
-   "pom": "sha256-QPd7mcpDHTWea5G1Fgb8EilaqOJmsQgu0ZpUCiEovAg="
-  },
-  "androidx/datastore#datastore-preferences-core/1.1.3": {
-   "module": "sha256-/1gXB5+CMCjyAVpNkP9lmYuGAN9e6mIv1DHHxUy+818=",
-   "pom": "sha256-4JQxqWCBKD841vntXUIwGhHRtxPmuDAAA1Bl+hB2Z7g="
-  },
-  "androidx/datastore#datastore-preferences-external-protobuf/1.1.3": {
-   "jar": "sha256-/LPzc890NCbIXrsNPMZErvrybzm3+lW7kCONQbaJ7Kc=",
-   "module": "sha256-BN/dYC2DAcG/IiN+nxIO+SJvvAKi/OUSGfsxmGrjAIA=",
-   "pom": "sha256-DMlR5kOJ0MeRDCa32XgweqPIjMDLtj5r3d8puNH6MeE="
-  },
-  "androidx/datastore#datastore-preferences-proto/1.1.3": {
-   "jar": "sha256-Y2hqYS85uMpgO+vjN21V+2ye4opKUXPvpJyJy8yooSc=",
-   "module": "sha256-lOdNtE+L1YmQpJEE+suE7qeOQ/xdYG3OWFJ4EDO0J4s=",
-   "pom": "sha256-/4WW0Y9dfYVv9AtvG5hCRNzIYdc28gydatF4RyI6waI="
-  },
-  "androidx/graphics#graphics-shapes-desktop/1.0.1": {
-   "jar": "sha256-8wXB4aw+t9IOVFUPSOB7VqlpUUc90/57uJE+0M06XpE=",
-   "module": "sha256-0lI9c6u+Lx54cQatTh96zuMKfGI3D4W7TXgnAPD9BwE=",
-   "pom": "sha256-8cK2TcpMcwYnX0QhdnEnQOsCG3ivD4oxbFd75j3rxuc="
-  },
-  "androidx/graphics#graphics-shapes/1.0.1": {
-   "module": "sha256-LX9tVQQimfnE+EeKoJS8QJmjRpAnef8wkf7R38K2L1M=",
-   "pom": "sha256-drUM5mT6RKSxZUIIHgiJkc8xaubnI6pM0BpicZ8aiic="
-  },
-  "androidx/lifecycle#lifecycle-common-jvm/2.8.5": {
-   "jar": "sha256-YchzpzJ8lG7AM8MQu5jz+S7qvO3g4aUgCrihiWSDx78=",
-   "module": "sha256-BWg9kQ3FQdBsTJekmSs+KXGueMK1zDX2vx2OB94Olw4=",
-   "pom": "sha256-q5cbvWNFWm6QTCC8Ub19oVOMDAglIx5SvDA94KsenuA="
-  },
-  "androidx/lifecycle#lifecycle-common-jvm/2.9.0-beta01": {
-   "jar": "sha256-N9ibIQHwdKxsJgkX2rsYVgdkXuIAqjAYx8W95w7c8YQ=",
-   "module": "sha256-kirziYbvAsOhMw91T/ZSvgJm1DQI5TvUOWtp9xuknyA=",
-   "pom": "sha256-YCk+UL9I6rsOpBjfzu8CQBJtJR0EARD2FHs+UP1Gpbw="
-  },
-  "androidx/lifecycle#lifecycle-common/2.8.5": {
-   "module": "sha256-AwuN8Z5JeKwb6WnCopoBv8LMVihPUSY5oK00wi2mxPE=",
-   "pom": "sha256-KCYLDQ/KghpeL0Ug1DKLt94SYCGz3c1Hgt1WQRLsn2E="
-  },
-  "androidx/lifecycle#lifecycle-common/2.9.0-beta01": {
-   "module": "sha256-qga0PKCIqzWdZ5Gk1JGQlGyOSic2WyT7NA0/8YGRsLg=",
-   "pom": "sha256-RPmLIhBroE0Rk5VcIsnUL5xUj53JN6ako0feStjkt0c="
-  },
-  "androidx/lifecycle#lifecycle-runtime-desktop/2.9.0-beta01": {
-   "jar": "sha256-zdh7lJZK950FTH6iti2JGGVAfTMV2Z+oOoXQm6k4XOs=",
-   "module": "sha256-AWDUDY2iOTkAGknrwZTyt+Ao7KR+5wkKqfwJMUGYp/U=",
-   "pom": "sha256-0JT1QYT6YyqFioyicSlPxqbaF4+ICpSk51zPVUx1mh8="
-  },
-  "androidx/lifecycle#lifecycle-runtime/2.9.0-beta01": {
-   "module": "sha256-O2BoUD9hEgLJXxx1nV+wbUaVxmcnLZpffTeU7q8RBkE=",
-   "pom": "sha256-BjbpF3E7BXG5NmO9Ju0+9SYv0X6uJP/SMBGbt/U0q5Y="
-  },
-  "androidx/lifecycle#lifecycle-viewmodel-desktop/2.9.0-beta01": {
-   "jar": "sha256-PnnbKgO/W0qQ2O0kHxXp4jEdkQ55oVF8XDFCAiKCHmI=",
-   "module": "sha256-3TV5B8sJeZNkfmQBWojivFLkkMtR5IJmFjtyVF+yhAY=",
-   "pom": "sha256-yb8bvSW+Ou7xB2KO76QrWjl6k13Fnn+XXC/3oxM8jng="
-  },
-  "androidx/lifecycle#lifecycle-viewmodel-savedstate-desktop/2.9.0-beta01": {
-   "jar": "sha256-H5fTzXwqsci5VcD631kpVMatL3rnZnox/j7hF2mXagY=",
-   "module": "sha256-LlU5G6xEJ9ZiKb5Y+/maP5bvKS4xXXPiQoJjHPGkg+o=",
-   "pom": "sha256-vuCLJmcQWN5gFwAX3/XgswxUOnZfqwhwjSLlwS+8BMo="
-  },
-  "androidx/lifecycle#lifecycle-viewmodel-savedstate/2.9.0-beta01": {
-   "module": "sha256-hJXtyNsN75ECpGeymNFuvdI5uT3MDE2mCR7qNW29brU=",
-   "pom": "sha256-PAVrjm1zIJqR1Vx3QcRnj/33CvitbGkogUCUjrIib8o="
-  },
-  "androidx/lifecycle#lifecycle-viewmodel/2.9.0-beta01": {
-   "module": "sha256-Q8vXSiVzDlkAL2njOJPxF6y93bVDKAml6QHo4kwFc5A=",
-   "pom": "sha256-UldouzIXu78J0hXqprnFo6sKgWZjAEnhJ3TxYh6+1QQ="
-  },
-  "androidx/paging#paging-common-jvm/3.3.6": {
-   "jar": "sha256-m6OQ1JxJCDe+xyT+9mBGVJWnMY3oG2kdRjNOvk2Dqio=",
-   "module": "sha256-qyJqL/6Vbk7NPrvGJpWo44YTDeJ2ShAPaZMnvX1KJZ4=",
-   "pom": "sha256-Xm1r7BhBdGnccg6//qQsMgsdYEO9uNS9Os5UP3pWnIg="
-  },
-  "androidx/paging#paging-common/3.3.6": {
-   "module": "sha256-laMPLlShL85R6fLzDMER+rayFuBB29jCbYZinBi1fHY=",
-   "pom": "sha256-QqEut6WreMa24QK2w0SLzhmCfeFj3fwvT6PT9sCjd0A="
-  },
-  "androidx/room#androidx.room.gradle.plugin/2.7.1": {
-   "pom": "sha256-VQn08ZPaGZgSM1HuAUHq85m0iIgcFefRauWMZKUo6l8="
-  },
-  "androidx/room#room-common-jvm/2.7.1": {
-   "jar": "sha256-sqALiMi42BDQfsvfkv3/R9t/DqiE7+XDHNp6UmybGuU=",
-   "module": "sha256-jM7UOynWvF0IWZxT1/R9hK3HV3oRc0m4/epGID2IhHk=",
-   "pom": "sha256-u8cvVVmRlceXcXKp3fGZ/d5OwxslhQITrCnutUMm4dw="
-  },
-  "androidx/room#room-common/2.7.1": {
-   "module": "sha256-VYuFMAMujgA+oIldJ5ISHmdrGp46DDOu5GDQD5J1eNk=",
-   "pom": "sha256-Fv46v9l2e++3L1HU28+xWAMYpu1z8OMYQCoCP26KFQI="
-  },
-  "androidx/room#room-compiler-processing/2.7.1": {
-   "jar": "sha256-uWCePhQVdZWKAhfe54YQqx5xVwm3XvOD6Fn7lu+wDfA=",
-   "module": "sha256-z8zl8HUBhDKr5WCdT/b0B1c+iSdgwnToVpUqVvPy2Ok=",
-   "pom": "sha256-IPQQ8ZNy2BVuzo7k8hdyEPw1dMTA1wkbXlBGY6uH6zk="
-  },
-  "androidx/room#room-compiler/2.7.1": {
-   "jar": "sha256-2QjokrEGOdKTIOpNZL6hxAPgVYKhY1mFVtXqI+sEsM0=",
-   "module": "sha256-Q0Sz/PIKLq41DDfhDzHybhQodcbhZLT28NIHkPTo88M=",
-   "pom": "sha256-RM4J0BIcbgHYt0txvFuv4xT93SZzmBKeapCbby3P3ec="
-  },
-  "androidx/room#room-external-antlr/2.7.1": {
-   "jar": "sha256-a/eUv/6N4mOCZQJRG0x98FcDErbMmTEsp/xr2wiAyh4=",
-   "module": "sha256-t4QQjwQnT3Xuxx+dfcOKDEHxC1sX74/JfMgcFEeFB4M=",
-   "pom": "sha256-rl3F23kBLamXUURQJ1bU3f3qAm8umTQk9JT6kickIfw="
-  },
-  "androidx/room#room-gradle-plugin/2.7.1": {
-   "jar": "sha256-WGQDSy8Jp8aqbeKTYYpbO89705g9eSwWZRTeR6hKGo0=",
-   "module": "sha256-leIK2JvhtWRv3fLW4V61lJ0AzMoxOvH2Nt/mh68xoj4=",
-   "pom": "sha256-PGqFy/xKroEXHosM8L4ynEMnXUV5aka5P1Tt6BKLBRc="
-  },
-  "androidx/room#room-migration-jvm/2.7.1": {
-   "jar": "sha256-jFzsjy1docuf3pYP3SJTu/xr50+aSgPs24LaF2YiMaw=",
-   "module": "sha256-HFixuNcIlfhh/ZExlI25r3T7ia22gpQFEjxLC/CWjyQ=",
-   "pom": "sha256-xvpy82Dlfp3a5HdNs3QcZoazY/21DjXyY8c8ZVAgKdc="
-  },
-  "androidx/room#room-migration/2.7.1": {
-   "module": "sha256-mZtTP3SbkiCaIsyUMkR8IKPPJj/VAfyzoxoCAWohSwA=",
-   "pom": "sha256-mGi65DJz9Y/GgzxrhmvkTt7VpSGRFFqiGIxABeV0F80="
-  },
-  "androidx/room#room-paging-jvm/2.7.1": {
-   "jar": "sha256-sk4d9SMJ87PYtjte4pRxJKSBwNeRneu9A04eH+2PoTg=",
-   "module": "sha256-HSMuv2r2H+FV6Yo+fdbkTXgmRwiYB0GGOHvrlsaY/hE=",
-   "pom": "sha256-u28aknn8NEaXKJL6/rV+i11nw9hsFbhCfEGd6l8t5ZQ="
-  },
-  "androidx/room#room-paging/2.7.1": {
-   "module": "sha256-dwHhMiNJjty0jIZ9SksJ0MzVARbv4g8OIapIxLRQn20=",
-   "pom": "sha256-18mRHcU5+4Ot0Z/u7EaPs4F8qtvnwnxSbnHItGY/xb4="
-  },
-  "androidx/room#room-runtime-jvm/2.7.1": {
-   "jar": "sha256-y9E2e9/UC8Gauq5kjIoAu2pK/d4GMFa0uoK6F4g3r88=",
-   "module": "sha256-qh6r3l9Y25ZFggqcPXWhSV+B1XaEJfm9L3upeV3+BBI=",
-   "pom": "sha256-7lg8DP2n9J7QGed4pcViPUGRfra5tTZaCTIqPkkTlo0="
-  },
-  "androidx/room#room-runtime/2.7.1": {
-   "module": "sha256-t22KSPR2jqefWMhPLgIFjGzsgYFTjujHcswd7zpwWzA=",
-   "pom": "sha256-O/BknKjAsoPd3Z4glG8Cr8IZWoUkW31AdCC3ADhztrE="
-  },
-  "androidx/savedstate#savedstate-desktop/1.3.0-beta01": {
-   "jar": "sha256-5420fy2C4PnfkNyagjo3Y2hKS4dpsw18U2Wtz1w36I8=",
-   "module": "sha256-XLg7G6NxNU+NSGiSNRsYbbDcQ1DoEVnMmT0OO3YrfMI=",
-   "pom": "sha256-c9NNJVYsYyHaYBcVizfLwQGM3KQi/cT4SrnfwWt5OeU="
-  },
-  "androidx/savedstate#savedstate/1.3.0-beta01": {
-   "module": "sha256-cSXarKYzWh7ecm8TpMkpqTdKar88PLgUMk3/kBomPuM=",
-   "pom": "sha256-Ef9nMkmCADvCHHui44422EwMWI1R2wF3VjQvOL5G3gk="
-  },
-  "androidx/sqlite#sqlite-bundled-jvm/2.5.0": {
-   "jar": "sha256-vXvOYFl1Dj/2KpKNi7z3y2Jwqu8eI5V6reZXcH4a22M=",
-   "module": "sha256-qUqhqRd/wWYOK8t5ITN9U1wTnvDPkvwKzb40pdehXVc=",
-   "pom": "sha256-lcBAf1FDBVMvq24ZjT1ZvEg3O4X4U7nJsgX/xs1hhqs="
-  },
-  "androidx/sqlite#sqlite-bundled/2.5.0": {
-   "module": "sha256-nOptix4yytKlCdma3LnVjI6ejW9BNWyjR80ZZlKp7cA=",
-   "pom": "sha256-QBok46XmeqpSCMY3wQdt4mHi6QATUNdOn8cijtWFSqg="
-  },
-  "androidx/sqlite#sqlite-jvm/2.5.0": {
-   "jar": "sha256-v8KIIfcqgyxHp1bH0JFJvbARcdyw1bcD54Wh0HIu/is=",
-   "module": "sha256-5F90ErgzCNd4k9vb3EM+eU4kJOLOEtX7H/66UEVyTBo=",
-   "pom": "sha256-Tzgy5s4TGAjOulzCcurjzPbF2vFODoY8pvN91PvKkhU="
-  },
-  "androidx/sqlite#sqlite/2.5.0": {
-   "module": "sha256-NplIHJ/Fh59CvG9fIv/8tuXSP3WGLmbwB+/2MdcWl3k=",
-   "pom": "sha256-rT9uj0qsJCjS/sbcmYdgBKmLeI0EEKj0sWmrV4JtVj8="
-  },
-  "com/android#signflinger/8.9.2": {
-   "jar": "sha256-wdyixoNjTuGilCmPnHF5V4r2qG4IC9xA+WGRW8XIFC8=",
-   "pom": "sha256-YDBz00i1K7CgQ9HI9pStLNP6xryJJlciTJ534ZYK3ck="
-  },
-  "com/android#zipflinger/8.9.2": {
-   "jar": "sha256-uh8yqiVavk2rZlcd2RlTBdMCfyYfn09GWJizDN/9CbM=",
-   "pom": "sha256-PPYmubFe7pb+fqzI9ZsEFqwKZHzRT2uaC9bAHRH643I="
-  },
-  "com/android/application#com.android.application.gradle.plugin/8.9.2": {
-   "pom": "sha256-0If9g+lc06ETaKo39Me3+Liw/EjNxRyErjZlcWRjAQw="
-  },
-  "com/android/databinding#baseLibrary/8.9.2": {
-   "jar": "sha256-eUETcJ2rIbBsJis3lec8twj7rK5hcV80Nh4a9iN6GHA=",
-   "pom": "sha256-UaC2oKbIY06J9g11nEhTmIQPGP0fh5Jz3MGgUr/AsQo="
-  },
-  "com/android/library#com.android.library.gradle.plugin/8.9.2": {
-   "pom": "sha256-Po1T0r5IrxZq4zoD2JUHZqiagK13cHzHNDMUT2M5AdY="
-  },
-  "com/android/tools#annotations/31.9.2": {
-   "jar": "sha256-slmV+nsiDTX7uOMl3wcfgpFpG/uv+XNMmOOPRewqc+4=",
-   "pom": "sha256-onUUfoStHjVjh0Qrt5pp8z6YuyTx2o0y+P5sYb3is0c="
-  },
-  "com/android/tools#common/31.9.2": {
-   "jar": "sha256-Krr2/FWQVA3lmHGcRwe/GuBM5/7wsYDEpOc3jOXugyQ=",
-   "pom": "sha256-pYPoeaqmTv06BsYG+a7/RJcEfby67krwbGTvL+13msg="
-  },
-  "com/android/tools#dvlib/31.9.2": {
-   "jar": "sha256-488/3JR3iN7o1bqnbLcqZlcRdLxHQe3w47q5enypDhs=",
-   "pom": "sha256-JMVv4BDhcjGTX8gbnp94PahptlXUh4wQhyZ8/C5jHBU="
-  },
-  "com/android/tools#repository/31.9.2": {
-   "jar": "sha256-7nMxExttgNyD6n14+2YAhHMAcz8pZNGIYXCcTSMHXgg=",
-   "pom": "sha256-sIKbRfpt3NhN33+AKlXCPuLfvSfeOEkF2q7WABn0+Ww="
-  },
-  "com/android/tools#sdk-common/31.9.2": {
-   "jar": "sha256-iUOli2esf7GgMh56Uqh8+q7CSNORJTbD1yio3Acf/yQ=",
-   "pom": "sha256-rF33kRmIa8ypyJOxB01tfS40q79eJ/lLSmRpjsM24Y4="
-  },
-  "com/android/tools#sdklib/31.9.2": {
-   "jar": "sha256-7p2BGH2rl5AGQMQeKuMMDrr0Vy3Van1+NER8k9eUwv0=",
-   "pom": "sha256-thqvhTgkAS5UphseDLVdNpSl94gyPLj0xu2gLAINo3A="
-  },
-  "com/android/tools/analytics-library#crash/31.9.2": {
-   "jar": "sha256-zKl6wpoTKb0xCj6DK25X9GIn5QGqUpwApj3yF8XX30E=",
-   "pom": "sha256-y9YGOtZEHJ+tkwRxs1sMONvx6Q4/6s14r5ssoMep2VY="
-  },
-  "com/android/tools/analytics-library#protos/31.9.2": {
-   "jar": "sha256-3SDU5HyokLfDUvb3PIfCLxTCGAg/Hl662cAT6Lp+SvA=",
-   "pom": "sha256-lX+kPaYmjfl+W0pfe20R9VWi8cYp4f1fu28YKq7+430="
-  },
-  "com/android/tools/analytics-library#shared/31.9.2": {
-   "jar": "sha256-ONP9oaxMsPiXSkho2hNhoDz6uTDlLlcp2Zut5AOCRZw=",
-   "pom": "sha256-RMCeR+YqYU0h3rLdzbVUzck07LR0zi9mwhfu4eo6pSg="
-  },
-  "com/android/tools/analytics-library#tracker/31.9.2": {
-   "jar": "sha256-D8VeTSFfSwIdiBFyrO+CRkBh2WLf67EToFQNxwRZKOU=",
-   "pom": "sha256-ataFwxA9RS72RDWL5tuN7Rxo6XOAf1Q27nVbqnrFyI0="
-  },
-  "com/android/tools/build#aapt2-proto/8.9.2-12782657": {
-   "jar": "sha256-z7r7m17Us65mbPCFldT8tXhP9bLzEtmCyjeLfw5Hva8=",
-   "module": "sha256-CWtyT8l42WZnqecMu6+VS3+w1UZJ4MmujBbDqE5ZRaI=",
-   "pom": "sha256-+MizTLAiuLMMs161PV7d8dOLhNQqNWKEy3hTy+zYIZ4="
-  },
-  "com/android/tools/build#aaptcompiler/8.9.2": {
-   "jar": "sha256-ILh6uQSK6T/V7rhRVjMzvGEt/JqBm4HGsRaL1gDV4WA=",
-   "module": "sha256-EOk1LZ5TvpiHfkYLt0jY9i2OXa6dGzPqbYuwp9qw5a0=",
-   "pom": "sha256-UOP2bTQp0q4aHyKnXPW2vZVCmPFgHHXEtDvS6u1iZqY="
-  },
-  "com/android/tools/build#apksig/8.9.2": {
-   "jar": "sha256-wHDtE5RinXRkGqCQb2Cy/6Hud+Y2ah+TQ39ZcXsa64k=",
-   "pom": "sha256-vtJW6u3CA6srY0zwpIxMnc/x/br5n6hfUfgYrEqN+/M="
-  },
-  "com/android/tools/build#apkzlib/8.9.2": {
-   "jar": "sha256-HBpn1vTxhkJ6wWbrqg3YZ/WV1RRPySUlKwX/udGhVrc=",
-   "pom": "sha256-FesZP5vGCf2/co4u81Sgo0wKBEOSwy6YMNcpA/s5xdw="
-  },
-  "com/android/tools/build#builder-model/8.9.2": {
-   "jar": "sha256-TJ0UyS4ltee/Ikhb+86zD/Fdhf4x/um3727TmhcieZ0=",
-   "module": "sha256-Q4lzbHT5LI8gt2MdP2ufxrB/4PhkzhXrFNnTS6plftU=",
-   "pom": "sha256-vXDdwEm3RxsMtfhXf7LdZEi5xuM/zeOdKqF2W/erZRw="
-  },
-  "com/android/tools/build#builder-test-api/8.9.2": {
-   "jar": "sha256-zIsDponVnA3MmYxRauZicM86V3f0QdcbjFJyxyCQc2M=",
-   "module": "sha256-Fi6Q4O3VBMMozoCNOV1S2ClmEsxNvmqP2kaYoul7JFI=",
-   "pom": "sha256-chAmm1dmJm9eCxwdPFrszeddDT/vZGki4feYnusfjvM="
-  },
-  "com/android/tools/build#builder/8.9.2": {
-   "jar": "sha256-fcHTbRLugTAMWxZyqq4zbRw8/pCnsmsrVROJYEFQ5Ts=",
-   "module": "sha256-scTasNhSK8A0SjE+s1xq8WTjGsjDyP1H8AvezL/8Lq4=",
-   "pom": "sha256-fGit2zzfoN0kcpa1sM29GvD9PqtXdahpl3aEXUk9Ssg="
-  },
-  "com/android/tools/build#bundletool/1.17.2": {
-   "jar": "sha256-FmhVy4HhDyMoopMQBvSAH0Itj03l1xfsD38W/CBJoIk=",
-   "pom": "sha256-80LQa1GA5uq6B2oqGKjn/Waum18EiWSvtu9CoCP6N1I="
-  },
-  "com/android/tools/build#gradle-api/8.9.2": {
-   "jar": "sha256-tjYiEQ8jmwLJFVoyxnqnv3x6/lSVfvLJYeOjJ3xNso8=",
-   "module": "sha256-im+ZKdf1J1f8KP89GXNZ8zn5F8wY0rFehzCzc0C3M54=",
-   "pom": "sha256-ZPReltmRGhJLeaUYErLVS0L8PYTS4+JikmVBpxjygTI="
-  },
-  "com/android/tools/build#gradle-settings-api/8.9.2": {
-   "jar": "sha256-qUVLXR2xngBJB6FtJsCCt39XfK3Dyof9PkP2g0tngqU=",
-   "module": "sha256-0OHNJ4mu+7ee3amVXnrm3bMcBHEIdPlidGpRbk5kv2s=",
-   "pom": "sha256-a4JTPPiCxXGWT53cN4b9Lid3ZDF13zTeayOvPwhMzlM="
-  },
-  "com/android/tools/build#gradle/8.9.2": {
-   "jar": "sha256-bDE9JNB6w5PPx9tdY8UCnn0gsnh4HEKy0irfm8x9ujA=",
-   "module": "sha256-BI8yjPHVbx5S1xvn0BFcXJqQCt1QyTkCnIYnXgvKOLk=",
-   "pom": "sha256-l3GRhK76k9PF6ClsOYYFMiJ7iAGjTHM3bA2dDbeqVYA="
-  },
-  "com/android/tools/build#manifest-merger/31.9.2": {
-   "jar": "sha256-ZmN0mzQYIyfBX6XYiPhotGd2XRlzBil4n+3T/4xARJI=",
-   "module": "sha256-Cd90HLOZJYfhT/DPqU29/XIYneLO9747iYlhj04TUgo=",
-   "pom": "sha256-kzqfKUVx5T8XTgVqHfO458CthwZIIHKRDwHhebl48yY="
-  },
-  "com/android/tools/build/jetifier#jetifier-core/1.0.0-beta10": {
-   "jar": "sha256-Jqu0oTkn2QYhacUEyelP6A6a46T3tauIdasAdTapH14=",
-   "module": "sha256-8JF1iaQtJ2Fj8QBAq1hC6RiD3L2x1Iv9Hx/Kpywcp7c=",
-   "pom": "sha256-XJ1C5rfjXU2NAuCjIs8maTs+w2QrEHyPC+WnIdRaDG0="
-  },
-  "com/android/tools/build/jetifier#jetifier-processor/1.0.0-beta10": {
-   "jar": "sha256-xQZ6e5KCN6EnGl6ctXEOn4C0lzKTlFvFHjpMhk6kv+0=",
-   "module": "sha256-NsJVdrGZk982AXBSjMYrckbDd3bWFYFUpnzfj8LVjhM=",
-   "pom": "sha256-M7F/OWmJQEpJF0dIVpvI7fTjmmKkKjXOk9ylwOS6CEI="
-  },
-  "com/android/tools/ddms#ddmlib/31.9.2": {
-   "jar": "sha256-nNyiBuCPvB8B2qGg1k6tKmK4zMWUFWn1GB4n5Kb1+6A=",
-   "pom": "sha256-ehSXY9SGGg8ZQJxxS54S6xv52CiKtkIMghTs8WAnNzk="
-  },
-  "com/android/tools/layoutlib#layoutlib-api/31.9.2": {
-   "jar": "sha256-KSMuYAdiW1aegnmNLY9VnYlB7OYw/iduhCzYGOv5Sxc=",
-   "pom": "sha256-atABzvfVis+rA851PdRal8KGwwdcCf1D39RCXh5m/uQ="
-  },
-  "com/android/tools/lint#lint-model/31.9.2": {
-   "jar": "sha256-/Vx9Zgnqot9h3uIN/tRkByg44G0vsugvQ0qOC5eGM3Q=",
-   "pom": "sha256-iVi1l72YliYSm40EHp3DXtRI5EnIjAbQXzOjsEhJVH8="
-  },
-  "com/android/tools/lint#lint-typedef-remover/31.9.2": {
-   "jar": "sha256-Sjujur/Xnm/Ge872R/tOz+r1m0gbEI98LrpNHFxt6o4=",
-   "pom": "sha256-cIoYgUcGxofG2pG4g5n4uwF1fT456+3onsAbcLjJOCM="
-  },
-  "com/android/tools/utp#android-device-provider-ddmlib-proto/31.9.2": {
-   "jar": "sha256-BHrs3WbhBhN/d6UsRC8bg9t9boSWiZgAJR8gbH853mU=",
-   "pom": "sha256-YjaKOSTVNIuMTMsPcWPRJKxNz31PpCJeTlFRi/ziYG0="
-  },
-  "com/android/tools/utp#android-device-provider-gradle-proto/31.9.2": {
-   "jar": "sha256-ZagpFgS/3h9vdcqFMqOBQ57IH9lY8yeCqwBH+2HZp6E=",
-   "pom": "sha256-5yyONF6PV/scLXhH8O29O0aLUsaGE9Ullb7XyWyjoEI="
-  },
-  "com/android/tools/utp#android-device-provider-profile-proto/31.9.2": {
-   "jar": "sha256-PnsJj24+yuMbb3kJw0O07AmqGNion0G/kgd7pLBW9FM=",
-   "pom": "sha256-Brw2CcYYGzLOmC0HU7Oe25ziGxZZVAspJ5Z842Vadho="
-  },
-  "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.9.2": {
-   "jar": "sha256-a6fmrCII10wbtfHRRkq6/GpF2HELIEVaLcAq34cmvIM=",
-   "pom": "sha256-NgKKzEuuabgX/PsJTYQUL8IRWgTK+ZUroUKs5Kx03OI="
-  },
-  "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.9.2": {
-   "jar": "sha256-RXBdYbIQBuhTPmz4q3lYp95t7KzmjtbAnbit4SFthZw=",
-   "pom": "sha256-AkcBSZOYuYAd6UznOdyr6bwoRVWGmCnsPYyj9zdl35M="
-  },
-  "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.9.2": {
-   "jar": "sha256-+oZxmj3F3kZffgwCMYRBTCf4/VOjT9VXKJwL9t80AkQ=",
-   "pom": "sha256-TM43f6I9hQgO9mSaATpgjYVKU5Psj5C2CzGQ0vY0XbA="
-  },
-  "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.9.2": {
-   "jar": "sha256-pPNKrg+f+gJtv3FRQ23XrlO+y3JiK0DyxHnKyJQ9kxk=",
-   "pom": "sha256-SikflqCvaRCs1vt3LJLZffVnk3+qW8pNmJSSofS1uUw="
-  },
-  "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.9.2": {
-   "jar": "sha256-wfbrus2tVZtu/k6qKVYVUrMxVjlfBpzZcD/aCcRi3qY=",
-   "pom": "sha256-mxv94aFi9Ni9/RWLVUPHDAGp9V8GakPWtaiutlsn0As="
-  },
-  "com/android/tools/utp#android-test-plugin-host-retention-proto/31.9.2": {
-   "jar": "sha256-CPGvlhFbK9As1LaE4ZT1xcJ2PwHI9Z4BHZrsyz/vGGM=",
-   "pom": "sha256-vG8p1Uz5KQGatASJx1yygpyNkVgp/uRlgrMpyaE1IsQ="
-  },
-  "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.9.2": {
-   "jar": "sha256-1Cm5MS3/oFAzgdHuGxipmb2QHnRWYSsvtIxqXVosr4g=",
-   "pom": "sha256-YJFSnIGoI/3PHZ8PwWMQxdf37wYGQNdaYHBGduWJN5U="
-  },
-  "com/google/testing/platform#core-proto/0.0.9-alpha03": {
-   "jar": "sha256-0AHrDMu/yMueqhk6NY5jcSl0Y5d1ZHvpSasjLCsptAc=",
-   "pom": "sha256-O7RSgN8d0clrmgFySmFFZrfWDTNFP81SwsdB+ZmcOk4="
-  }
- },
- "https://plugins.gradle.org/m2": {
-  "com/fasterxml#oss-parent/56": {
-   "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA="
-  },
-  "com/fasterxml#oss-parent/61": {
-   "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ="
-  },
-  "com/fasterxml/jackson#jackson-base/2.16.2": {
-   "pom": "sha256-2+E1aBujNdhSI0UNczbqmrJnBPbXHWY2aVcOPXvkDrY="
-  },
-  "com/fasterxml/jackson#jackson-base/2.18.2": {
-   "pom": "sha256-71dLcvW0iUgET2g3a4dMiK4JoCncjgX2Shwwvftt4Uo="
-  },
-  "com/fasterxml/jackson#jackson-bom/2.16.2": {
-   "pom": "sha256-CZW2YqaOsTyz6Qj7biN58Mo+7rxmVnd8xVhLDCcRHS8="
-  },
-  "com/fasterxml/jackson#jackson-bom/2.18.2": {
-   "pom": "sha256-UkfNwwFyXT9n9+8EkDconVr3CdaXK89LFwluRUjSlWs="
-  },
-  "com/fasterxml/jackson#jackson-parent/2.16": {
-   "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs="
-  },
-  "com/fasterxml/jackson#jackson-parent/2.18.1": {
-   "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw="
-  },
-  "com/fasterxml/jackson/core#jackson-annotations/2.18.2": {
-   "jar": "sha256-WBvWEADvdkiUP3gcoFaJ5W0D9gUnSDZajis6m10/oy8=",
-   "module": "sha256-4Ruvm1NubflNqmNaEBPsPgabhmuOES3cKqBEahVQUNw=",
-   "pom": "sha256-CyvWlOqJJn7qSBJqilskplI0xkM4dULSRGnRlb+6HPg="
-  },
-  "com/fasterxml/jackson/core#jackson-core/2.18.2": {
-   "jar": "sha256-2AVK58DRwtL1XSjkYCbr5YkogfP6tfQ5IzGEOBw7Sh8=",
-   "module": "sha256-ynjGBDZ2f8w2zhRrd05PUKnLn2MtExcsRLrojgwDz6I=",
-   "pom": "sha256-4GWwA50h9N/ORr1DEEx9dtWFa9cy4qqGDMWkonDtct4="
-  },
-  "com/fasterxml/jackson/core#jackson-databind/2.18.2": {
-   "jar": "sha256-SzZOaFDciRcvzx1N0muP9UiO2kT/RlfiLdJlID3Vqzw=",
-   "module": "sha256-jH2sL3J4GNiEeoKqTqxrAXTXnPBN+Q3iJGBy5t005wA=",
-   "pom": "sha256-STo9tkR7eo7Ls3JCNMbOZ31y20sE9roAjw6+rqe+Wp0="
-  },
-  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.16.2": {
-   "module": "sha256-dJwa2Kf8wceyqxu28cVdj0aO7N52dj8XOnBqhbYDu9I=",
-   "pom": "sha256-PX/SUZIuX9QxAM3Q2LYv8XqhGcbwfkziEa+hRCWLCbk="
-  },
-  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.18.2": {
-   "jar": "sha256-OBocBxHku4hWGmwACLWpRUZWKMoHdkzNZqDZfuB61hI=",
-   "module": "sha256-evxmQXLDpubGw1hHZaAyncb+q7/mu6ibrq2L0un77Hs=",
-   "pom": "sha256-9W9UNh5DSV7TuiShoG8OO3QZA+Q+0TLxpq086QErhBU="
-  },
-  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.16.2": {
-   "pom": "sha256-0pd0eUdcVynnGNdKFrH0sDOlhPNKqINfgOy/MHJKnUA="
-  },
-  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.18.2": {
-   "pom": "sha256-4h1diLBHShG3H+lBAMT1KVv6F08u5q5LCtArdhZHhkg="
-  },
-  "com/fasterxml/jackson/datatype#jackson-datatype-guava/2.18.2": {
-   "jar": "sha256-cb8hy/lU9EZcPgGHpiwwueDi7WEvpk3cuomoeTGyoIo=",
-   "module": "sha256-GvbeQyGW2+HaV18d3FiWKF3DS/pg6o3/+5/RN8rPnG8=",
-   "pom": "sha256-7i25uOpx1O5KQrwGqqcT0jbh69iM2JJ/ajKEcCMcPNM="
-  },
-  "com/fasterxml/jackson/datatype#jackson-datatype-joda/2.18.2": {
-   "jar": "sha256-Hd3EfKqnKAeD1ylsd/anBbepK8lapGkJP84EsTZ4c1c=",
-   "module": "sha256-l7/z2hhe3gfky7GdnuLX7aQbYeQlaRfLA9EF7fhxaNs=",
-   "pom": "sha256-fhIcCK11w60LpYCsK1K1Rz3DSIYw1QfituIuTjeeJjU="
-  },
-  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.2": {
-   "jar": "sha256-4tIC1GBuI66vilqWMtsG9f79W2PSUcP1A/n6qnhTDlw=",
-   "module": "sha256-Jd8o9WC1kI6hAYUATV/Bkyk0hHBj5mcpJID2dbOx7eQ=",
-   "pom": "sha256-FivnrZea9eDHOc1+0BiJ+Br0ggDJ+RJ5lqElrFGzSkc="
-  },
-  "com/fasterxml/jackson/datatype#jackson-datatypes-collections/2.18.2": {
-   "pom": "sha256-VB0YzwMSgDw1e8lKVSkC4P5MdlieH4+dVtJOuwThRLc="
-  },
-  "com/fasterxml/jackson/module#jackson-modules-java8/2.18.2": {
-   "pom": "sha256-s6z7kQ0CPpOkGZr8zeH/nsX6sMVQ3E+WilBXEXrLCzY="
-  },
-  "com/github/ben-manes/caffeine#caffeine/2.9.3": {
-   "jar": "sha256-Hgp7vvHdeRZTFD8/BdDkiZNL9UgeWKh8nmGc1Gtocps=",
-   "module": "sha256-J9/TStZlaZDTxzF2NEsJkfLIJwn6swcJs93qj6MAMHA=",
-   "pom": "sha256-b6TxwQGSgG+O8FtdS+e9n1zli4dvZDZNTpDD/AkjI9w="
-  },
-  "com/github/curious-odd-man#rgxgen/1.4": {
-   "jar": "sha256-sTsHS/BFeKORAEFwh0RmSKB54tYmzYQfl5TjTmim6Ow=",
-   "pom": "sha256-rwIHmlYZmNS7r7ypKLxD5qSjfa6svs0ziBypPNW6TnQ="
-  },
-  "com/github/java-json-tools#btf/1.3": {
-   "jar": "sha256-Z8PkYutQgH9OCl9N7jBLvxfNmGpC7l6wsvTJv2TRMNk=",
-   "pom": "sha256-qb8bOVbm1Gy99zeRKOsXMs3hrGVAl5RNxlobbcQlcPA="
-  },
-  "com/github/java-json-tools#jackson-coreutils-equivalence/1.0": {
-   "jar": "sha256-60qa19gD+whL/895PIqB9R10W21DjChHDvnVql+4oYI=",
-   "pom": "sha256-0Vd8uaSY6Et0+ADXdRiQb/ErXT4vKJ2SqTauCU6sxeE="
-  },
-  "com/github/java-json-tools#jackson-coreutils/2.0": {
-   "jar": "sha256-FrOqvTqeslZV3aQz41+b2cfBqnmRQncC9fEfAAgT27A=",
-   "pom": "sha256-jZ7pOk/dXSvYDrqUonoTDWBo8/heSI61vxSUOHEc6eo="
-  },
-  "com/github/java-json-tools#json-patch/1.13": {
-   "jar": "sha256-H3lNJWlltT7zfnC1VQXi7QDdwBhNROLo4f3OWjysx94=",
-   "pom": "sha256-59lec35Uwo1EuFv2Qw8VNvZEZU1pQr2ogzM4r5aWSw8="
-  },
-  "com/github/java-json-tools#json-schema-core/1.2.14": {
-   "jar": "sha256-yFmUL92inCbMsr6DqEU6Ew3jX95viK4Yl4VRa10U+Bw=",
-   "pom": "sha256-pR/BAI6VN7vFJbpywl4Lz4LzXxscwwfC53jS7fO9V18="
-  },
-  "com/github/java-json-tools#json-schema-validator/2.2.14": {
-   "jar": "sha256-zZ48WZuzIpZRf9OsOL7qxwnwpquBstQolJXQNhulmJk=",
-   "pom": "sha256-W8HTDGddkv+DV3ldOvN172JqvffrMjS2TahmKqEeqZs="
-  },
-  "com/github/java-json-tools#msg-simple/1.2": {
-   "jar": "sha256-vvQRG5k6Wz5hSNj1hWIczqwqGInNvDREixFjLg2Kmo8=",
-   "pom": "sha256-bvPzUgcukUz6FzkzRoXyotAAJRL8Ul+kEtSQ1FCUMKM="
-  },
-  "com/github/java-json-tools#uri-template/0.10": {
-   "jar": "sha256-OTb2fY59+j7t7+RQ/1iHF0kwiYLGuLcGU1qIQ5HfT7A=",
-   "pom": "sha256-MXithX0gGmwpZy4rFGrAuj7MUlNquZaUpGuxJfoBxrk="
-  },
-  "com/github/jknack#handlebars-jackson2/4.3.1": {
-   "jar": "sha256-UjLit9Od6+U8/YQ54FLF4i2rnUPROkrm+QziV2D8iRY=",
-   "pom": "sha256-GLG2aavIFa3VZFQXH3O77lXF8EKe+3P74Wk8E+rWL3A="
-  },
-  "com/github/jknack#handlebars.java/4.3.1": {
-   "pom": "sha256-UECkDYFTRzveednE1O+4cSChaQ+uWFtYKAcH1DdCCZk="
-  },
-  "com/github/jknack#handlebars/4.3.1": {
-   "jar": "sha256-VCT9EukRzxW+/RY0G0bg4bxoGqYePLHAcMV+aNzNW70=",
-   "pom": "sha256-/DAp8kYk6YvWC1pGmSEPP1YKOUiTQpzQbMrYROj41BU="
-  },
-  "com/github/joschi/jackson#jackson-datatype-threetenbp/2.18.2": {
-   "jar": "sha256-WhH8ZX6ZfW2tJsOilRNaWDRHqkoPoB9CSj2Y4TcZHTA=",
-   "pom": "sha256-0PmnYltkM3ZwhFZ7X310MqvuZHwX/b/WxFyx4zYvRcU="
-  },
-  "com/github/mifmif#generex/1.0.2": {
-   "jar": "sha256-j4ziM8M14I4ROj+Ved4QRvsZkn6CRosbvrzWy6h2C4E=",
-   "pom": "sha256-R2QJlPzU46EZStsn0s/kEQII7qlCwgSDTZailCVt5hQ="
-  },
-  "com/github/zafarkhaja#java-semver/0.10.2": {
-   "jar": "sha256-qOMuF1ddAYjB8+Lle7ldsJeTiDyIU/3oKLY+yx+Zpjo=",
-   "pom": "sha256-fwBf8/kA6GlV9aU0tamqjqVLtdYLtgrCN1lVCjZnaDU="
-  },
-  "com/google/code/findbugs#jsr305/3.0.2": {
-   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
-   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
-  },
-  "com/google/code/gson#gson-parent/2.10.1": {
-   "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
-  },
-  "com/google/code/gson#gson-parent/2.8.9": {
-   "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s="
-  },
-  "com/google/code/gson#gson/2.10.1": {
-   "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=",
-   "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
-  },
-  "com/google/code/gson#gson/2.8.9": {
-   "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=",
-   "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4="
-  },
-  "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.1.21-2.0.1": {
-   "pom": "sha256-uhlRo9qxiovCyTnXojCw2VO8auNi3VIKR3zfXLFHGOE="
-  },
-  "com/google/devtools/ksp#symbol-processing-api/2.1.21-2.0.1": {
-   "jar": "sha256-ayE0FIw7yenPnPI51FAxohzXiZVqIVktGjIx/orjCa8=",
-   "module": "sha256-FOy0d2qAcehhKYMzGUMTmbKmnm6b/tyymSU4vaymz8A=",
-   "pom": "sha256-ITlIj5MwvlkbT6pX4bgdH7qDaWi1HwBx8JRJ4+0J8sE="
-  },
-  "com/google/devtools/ksp#symbol-processing-common-deps/2.1.21-2.0.1": {
-   "jar": "sha256-Ac31K1nT4gaqT6YngdFQWly9mHQ8BbBy+cjLnmqi4AM=",
-   "module": "sha256-m2jwFBX8A9ZB+C4uSzfemenf30pYX7gltGAbtyyqWUw=",
-   "pom": "sha256-342+OK5yUR4F6fUuqhYaBU/Q01S1SfVI4AiPL8cp1j0="
-  },
-  "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.1.21-2.0.1": {
-   "jar": "sha256-nkVMuS/UrcL/6tWaCaiDH+Bmpk3Z5IPaVdjRrzAHGCE=",
-   "module": "sha256-Ilxdo/6zKViDaPfOQs89ZeXfInXx79tucXTQNv/lZyk=",
-   "pom": "sha256-werAp7M/MlLNFpH01DQo2PFDUVsisahkBqTFaJOSFjg="
-  },
-  "com/google/errorprone#error_prone_annotations/2.21.1": {
-   "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=",
-   "pom": "sha256-9ZiID+766p1nTcQdsTqzcAS/A3drW7IcBN7ejpIMHxI="
-  },
-  "com/google/errorprone#error_prone_parent/2.21.1": {
-   "pom": "sha256-MrsLX/JB/Wuh/upEiuu5zt7xaZvnPLbzGTZTh7gr+Sw="
-  },
-  "com/google/guava#failureaccess/1.0.1": {
-   "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
-   "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk="
-  },
-  "com/google/guava#guava-parent/26.0-android": {
-   "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
-  },
-  "com/google/guava#guava-parent/32.1.3-jre": {
-   "pom": "sha256-8oPB8EiXqaiKP6T/RoBOZeghFICaCc0ECUv33gGxhXs="
-  },
-  "com/google/guava#guava/32.1.3-jre": {
-   "jar": "sha256-bU4rWhGKq2Lm5eKdGFoCJO7YLIXECsPTPPBKJww7N0Q=",
-   "module": "sha256-9f/3ZCwS52J7wUKJ/SZ+JgLBf5WQ4jUiw+YxB/YcKUI=",
-   "pom": "sha256-cA5tRudbWTmiKkHCXsK7Ei88vvTv7UXjMS/dy+mT2zM="
-  },
-  "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
-   "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
-   "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
-  },
-  "com/googlecode/libphonenumber#libphonenumber-parent/8.11.1": {
-   "pom": "sha256-X12sUXT4TGCi6Z56g8eCb3NJgfvCDqHUN/em/Piq2hY="
-  },
-  "com/googlecode/libphonenumber#libphonenumber/8.11.1": {
-   "jar": "sha256-9DDJI5TCBT8WhxWFPaltmZlulONOWikbl8XIalrWKpg=",
-   "pom": "sha256-irUVuq10qC2rsC6+nm8XLUj0r+0KyAxn7aKIRqbN7dA="
-  },
-  "com/ibm/icu#icu4j/72.1": {
-   "jar": "sha256-PfVyskCmjRO1zXeK0jk+iF0mQRQ0zY8JisWYfqLmTOM=",
-   "pom": "sha256-Pe8rKa9KGa2AXLFTBWklqJqQP5L77hre4S7S/BTETug="
-  },
-  "com/samskivert#jmustache/1.15": {
-   "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=",
-   "pom": "sha256-Z77EYiZJjJBFuqct8cnH9mG4XOObYni2TWign0Xry1k="
-  },
-  "com/strumenta#antlr-kotlin-gradle-plugin/1.0.3": {
-   "jar": "sha256-5VI7i8hPUYGRUEHSNsdTuaemtxM22yon7eQcRAYe81U=",
-   "module": "sha256-4AgFnvxtTXyXhNBV7cL8+I0FalWxjLeP1n+hN52K6Mc=",
-   "pom": "sha256-6aXHG2HPFEq+C0vhR9kFy9XibQe5xL3ocPk5aqj4tAU="
-  },
-  "com/strumenta#antlr-kotlin-target/1.0.3": {
-   "jar": "sha256-lqRnHwdcq2Cs3wfpebaekNprmlbgT9gtCgJwK71A5fU=",
-   "module": "sha256-bIyr2lyJg151FjpUGn4oXUqjFa1uic7pRFmd9DqHn0A=",
-   "pom": "sha256-LYVuemGj8sPqq2la0+VIgZmMhZ2VvibtMM3mdIjQA7M="
-  },
-  "com/strumenta/antlr-kotlin#com.strumenta.antlr-kotlin.gradle.plugin/1.0.3": {
-   "pom": "sha256-QexbCkIylibd1Tm6buHXXt6NhjhmGswhCt4ks7uH7IU="
-  },
-  "com/sun/activation#all/1.2.2": {
-   "pom": "sha256-GXPUmcwsEmSv8tbQUqHHFq5hPQGK4cL2EN1qTRwkV44="
-  },
-  "commons-cli#commons-cli/1.5.0": {
-   "jar": "sha256-vIuwH8D60lA4VwbiD5J93P9hc/Yzmzh9yHkjd1JWesY=",
-   "pom": "sha256-TuxDxPwoBMvrQ2mcq/qC+gYocfzB3P0QkCpdglIGdMA="
-  },
-  "commons-codec#commons-codec/1.11": {
-   "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=",
-   "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA="
-  },
-  "commons-io#commons-io/2.16.1": {
-   "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=",
-   "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8="
-  },
-  "commons-logging#commons-logging/1.2": {
-   "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
-   "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
-  },
-  "de/mannodermaus/android-junit5#de.mannodermaus.android-junit5.gradle.plugin/1.11.2.0": {
-   "pom": "sha256-t/WMW61Or7HykDeck2obA02h7vt/4A0usFyRxSXbehE="
-  },
-  "de/mannodermaus/gradle/plugins#android-junit5/1.11.2.0": {
-   "jar": "sha256-GAKPIqrV1Zx4DhD5Rlg55HpudC8eieZ7iFJSv5BRkAE=",
-   "module": "sha256-C2TlYxgPaaZloRD36F1C/M3F5Nc2o443uPGUhkmqYBw=",
-   "pom": "sha256-JUDnyFj7pBcEusJ6/+oBZ+ldhhfxyBwJ3iEjhKr4wbA="
-  },
-  "dk/brics/automaton#automaton/1.11-8": {
-   "jar": "sha256-okR19sz+HMek/p404Fzmh7DODG6Mt4Hg7O07GGSCxh4=",
-   "pom": "sha256-N1e360Vz2a4E37ViqPa9WqtKZbiD31RKTzYJTXz+I78="
-  },
-  "io/sentry#sentry-kotlin-multiplatform-gradle-plugin/0.12.0": {
-   "jar": "sha256-fNWyQ/wl4q5Yu2Z5949zRNSKFn2bwkPY62K6/gohNfc=",
-   "module": "sha256-2SanANsKdiFM/8djX4XR4cKignE1dYiR61vaHTRCNLc=",
-   "pom": "sha256-hMx9AcxMCi+9wW3PuhojMcosp5tvk01+G8FYTR95fCo="
-  },
-  "io/sentry/kotlin/multiplatform/gradle#io.sentry.kotlin.multiplatform.gradle.gradle.plugin/0.12.0": {
-   "pom": "sha256-dWlEf6xFV/F5LqZfMmDGp/HXhYB66H+rGHOLYjr+nkA="
-  },
-  "io/swagger#swagger-annotations/1.6.14": {
-   "jar": "sha256-J22F3CEgy8MLCL40t7rlQYRnymmDgUsNHgcYKeu1xQA=",
-   "pom": "sha256-XG0N2eUofKfwGeaH5i3HsGdnbwSJGV9fW+fmBTlVzLs="
-  },
-  "io/swagger#swagger-compat-spec-parser/1.0.70": {
-   "jar": "sha256-QG1OJJTrvLfBPUhPYEuBQEe34mgsw7cg0ixmXXaYjEg=",
-   "pom": "sha256-ypicQ+g5ALJ/rxXlx5zK+/mzpFs8UDoSgjrvf50BJjk="
-  },
-  "io/swagger#swagger-core/1.6.14": {
-   "jar": "sha256-2Xj1GhtYw8rtvflugONH7SndoNr4lEEw54WukqTdnyc=",
-   "pom": "sha256-zW3kbGB6HDQQElKqyX2EPQnpCxZAfZY2OcDqlQteTaI="
-  },
-  "io/swagger#swagger-models/1.6.14": {
-   "jar": "sha256-GMZMZwzhhe7VMZEqXQkj3RpbclxxRyGNcDsoNGyvlMM=",
-   "pom": "sha256-UXFllcHcdBALjQwb02lzqQ9W0PXI0aPgfk4J/IA3K6s="
-  },
-  "io/swagger#swagger-parser-project/1.0.70": {
-   "pom": "sha256-naIUULAVDE+U1YmsSIEtQh3mmNtIPDZ6PXiXbz3X9YU="
-  },
-  "io/swagger#swagger-parser-safe-url-resolver/1.0.70": {
-   "jar": "sha256-Ln6L9oFHtNvSS+JcEhd/Tig+krfDxvoD8EZjNkLzVcg=",
-   "pom": "sha256-pnrulNravyrPHrLB98dCdiweijfcRqflq95yDsNh7LU="
-  },
-  "io/swagger#swagger-parser/1.0.70": {
-   "jar": "sha256-lX6gThFPIQq8h6VDkm1mTB/ubvFePd1bhGtPrIPpEYE=",
-   "pom": "sha256-t1ioajcZscT68y1v4XxTalKGXxYjr1YXidKasKw0r6c="
-  },
-  "io/swagger#swagger-project/1.6.14": {
-   "pom": "sha256-9F5u6XAwQIotCRByYaFCqb8e9Y2WXZWYcBDfWZBqmL0="
-  },
-  "io/swagger/core/v3#swagger-annotations/2.2.21": {
-   "jar": "sha256-ZEUU+9oJzwvYwql2bsqaQofWxsOzRktc97Qx51sW0W8=",
-   "pom": "sha256-f+e4Efwks28d4ZBh3M2NNu8TxzAClbrDUq/ODZXhS5Q="
-  },
-  "io/swagger/core/v3#swagger-core/2.2.21": {
-   "jar": "sha256-wkL+SD0YHvsxYcjO8jLS8U03T2Cl/3xhrM59YeZBFJ0=",
-   "pom": "sha256-dfPAX969TtOmiCL93OV4dbFYMeLkfeSPWoWS83nrkNo="
-  },
-  "io/swagger/core/v3#swagger-models/2.2.21": {
-   "jar": "sha256-kQ9VvG+elOuM9mB0G8ghVnSkbdtmG1uKdSWyW2VStTg=",
-   "pom": "sha256-fxD+bKOG8XLV2U71emtTC1WJpP88pxJ6DFy9S4pv8yg="
-  },
-  "io/swagger/core/v3#swagger-project/2.2.21": {
-   "pom": "sha256-oiRjNjBIh36joj69WOGddbieayxhGJnmxjZ11e2kopQ="
-  },
-  "io/swagger/parser/v3#swagger-parser-core/2.1.22": {
-   "jar": "sha256-Vrr9/sIPaeCstC8QZ/yJdUwO/5MKjmUYdS+1EFnpPro=",
-   "pom": "sha256-VXT1Zc9Z+wntNm6Aw1PFu6tnEMP+hdMtrsV0RcEUUpM="
-  },
-  "io/swagger/parser/v3#swagger-parser-project/2.1.22": {
-   "pom": "sha256-m9KOOxqc4ku4hYtZMikKU/uWTFzTLwuiYIHSiRaGU8U="
-  },
-  "io/swagger/parser/v3#swagger-parser-safe-url-resolver/2.1.22": {
-   "jar": "sha256-TLSrNBq3mzOnl3YUVYmG0Spl99F+s5jUZYcxDJhAZkQ=",
-   "pom": "sha256-pTqKn9Mt9uyasjgEdLq02XOVTkKoEk3PJjg/gW5V0nQ="
-  },
-  "io/swagger/parser/v3#swagger-parser-v2-converter/2.1.22": {
-   "jar": "sha256-ZdYDOEa7MOP77YKQKHUh1+4+qciFv4wRKLyAbCGuX5c=",
-   "pom": "sha256-ro9VZVRvOHC/5RFdggAUVkKw7Y9aDqHS13LtVfLcohI="
-  },
-  "io/swagger/parser/v3#swagger-parser-v3/2.1.22": {
-   "jar": "sha256-BG/B+afec2a/unwbF5Dh77DnIN3JR1rVX8Wz00rOkXU=",
-   "pom": "sha256-28v9n4aXUQZyxQg2+vyMfAs5CbOa8UI3rANkAJsL2AA="
-  },
-  "io/swagger/parser/v3#swagger-parser/2.1.22": {
-   "jar": "sha256-F2yeSuhlXHy2sOilbA+kBLFasK6wy3LkopTurQhK6yM=",
-   "pom": "sha256-jCk5Kv5uPnYrDDmEgP7oSkymWNWr5G7DeTtsvuQkIa0="
-  },
-  "jakarta/activation#jakarta.activation-api/1.2.2": {
-   "jar": "sha256-oYepORA671hJp6+EvX4nvi0SDEEK8pFDc3X/4GH08J0=",
-   "pom": "sha256-XlD+k4BoRx9QSn78QHGCNCW1IOq8b4DHLZNevVRoMJE="
-  },
-  "jakarta/validation#jakarta.validation-api/2.0.2": {
-   "jar": "sha256-tC1CQo89kiyJKpCfoEMofVd8DFsWWtm31WjOv4f8nqQ=",
-   "pom": "sha256-Oy5Oh3+3C6+h2tdcDemZxFYTEoLUcbpR3z25bDt02pI="
-  },
-  "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.3": {
-   "pom": "sha256-KA2lMXYBZtRBI2jQ3Yme9K6/0KfYK/IzUC4phWgGrak="
-  },
-  "jakarta/xml/bind#jakarta.xml.bind-api/2.3.3": {
-   "jar": "sha256-wEU59HLppt0MdoXqgtZ3KCJpq457rKLhRQDjgeDGzsU=",
-   "pom": "sha256-f+LKXc5LFKZGu/kh0TykLK8qLAZU2hVcdWOGXJiTlv0="
-  },
-  "javax/validation#validation-api/1.1.0.Final": {
-   "jar": "sha256-8517pyU+NfWsSAgewbwoxd+bMqxLfbIIU+Wo52v3sO0=",
-   "pom": "sha256-uGNJEebL5sFLML0G44N9fmko/H4clieN7GFwi2qu4hw="
-  },
-  "joda-time#joda-time/2.12.7": {
-   "jar": "sha256-OFKCsAWBjPrM2+i9JCmBHn5kF4LyuIkyprj/UdZo9hY=",
-   "pom": "sha256-hf3b+kfCmf2OzhyT//1H2cLTyQNaM7XbAXswTGd+hCg="
-  },
-  "net/java/dev/jna#jna/5.12.1": {
-   "jar": "sha256-kagUrE9A1g3ukdhC4aith0xiGXmEQD0OPDDTnlXPU7M=",
-   "pom": "sha256-Zf8lhJuthZVUtQMXeS9Wia20UprkAx6aUkYxnLK4U1Y="
-  },
-  "net/sf/jopt-simple#jopt-simple/5.0.4": {
-   "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=",
-   "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU="
-  },
-  "org/abego/treelayout#org.abego.treelayout.core/1.0.3": {
-   "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=",
-   "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw="
-  },
-  "org/antlr#ST4/4.3.4": {
-   "jar": "sha256-+SesOExG10n4texolypTrtIeADE1CSmWFu23O/oV/zM=",
-   "pom": "sha256-nnwfPkiZGUQOjBMInlljcp1bf4D3AjO/uuMJxkmryj4="
-  },
-  "org/antlr#antlr-master/3.5.3": {
-   "pom": "sha256-6p43JQ9cTC52tlOL6XtX8zSb2lhe31PzypfiB7OFuJU="
-  },
-  "org/antlr#antlr-runtime/3.5.3": {
-   "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=",
-   "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU="
-  },
-  "org/antlr#antlr4-master/4.13.1": {
-   "pom": "sha256-28/JebgFKPwMtFP8to28nSsGA6e+LNzpmrL8aHFGnRg="
-  },
-  "org/antlr#antlr4-runtime/4.13.1": {
-   "jar": "sha256-VGZdKDjMZkWDQ0aO/FOeRU/JW0aooEsTxqxD/JvmNQU=",
-   "pom": "sha256-GSJrF7+jj5nqImsi6XQg4qjt4JqXQg+xrPGG2a2kZXE="
-  },
-  "org/antlr#antlr4/4.13.1": {
-   "jar": "sha256-ziYdzmlSWDmqn8W9IyzhuBOnpAp1AwcTzEqA74Fw89U=",
-   "pom": "sha256-ahWaEs/WYoqnNuw//ZM/qUEuXLy3zn7FIXo/9CDGapk="
-  },
-  "org/apache#apache/13": {
-   "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
-  },
-  "org/apache#apache/18": {
-   "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc="
-  },
-  "org/apache#apache/21": {
-   "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
-  },
-  "org/apache#apache/23": {
-   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
-  },
-  "org/apache#apache/27": {
-   "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
-  },
-  "org/apache#apache/30": {
-   "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg="
-  },
-  "org/apache#apache/31": {
-   "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
-  },
-  "org/apache/commons#commons-lang3/3.12.0": {
-   "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo="
-  },
-  "org/apache/commons#commons-lang3/3.14.0": {
-   "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=",
-   "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554="
-  },
-  "org/apache/commons#commons-parent/34": {
-   "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
-  },
-  "org/apache/commons#commons-parent/42": {
-   "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw="
-  },
-  "org/apache/commons#commons-parent/52": {
-   "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
-  },
-  "org/apache/commons#commons-parent/54": {
-   "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M="
-  },
-  "org/apache/commons#commons-parent/64": {
-   "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds="
-  },
-  "org/apache/commons#commons-parent/69": {
-   "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
-  },
-  "org/apache/commons#commons-text/1.10.0": {
-   "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=",
-   "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc="
-  },
-  "org/apache/httpcomponents#httpclient/4.5.14": {
-   "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=",
-   "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c="
-  },
-  "org/apache/httpcomponents#httpcomponents-client/4.5.14": {
-   "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE="
-  },
-  "org/apache/httpcomponents#httpcomponents-core/4.4.16": {
-   "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c="
-  },
-  "org/apache/httpcomponents#httpcomponents-parent/11": {
-   "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o="
-  },
-  "org/apache/httpcomponents#httpcore/4.4.16": {
-   "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=",
-   "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o="
-  },
-  "org/apache/maven#maven-parent/41": {
-   "pom": "sha256-di/N1M6GIcX6Ciz2SVrSaXKoCT60Mqo+QCvC1OJQDFM="
-  },
-  "org/apache/maven/resolver#maven-resolver-api/1.9.18": {
-   "jar": "sha256-6/ueHf7qPCAXkFGEWB4AeHS06qydKL//z+UTPXCsYzk=",
-   "pom": "sha256-gpDaoM1/u6B2ewc2hmkig4fKuumaE8NDP71FcGKa44Q="
-  },
-  "org/apache/maven/resolver#maven-resolver-util/1.9.18": {
-   "jar": "sha256-LrDqZnvEiThEeCMd2nUWQH1LWyKhOAdyKYcd6TYqeuI=",
-   "pom": "sha256-qY5q9c3xskVkhq4LuBKOUv7o1plmKa9gYGu8nBqt+Ow="
-  },
-  "org/apache/maven/resolver#maven-resolver/1.9.18": {
-   "pom": "sha256-+x3U5VTNLbzt6WFSlJIecLGDUz9GeROs2aN4f/3WlDs="
-  },
-  "org/checkerframework#checker-qual/3.37.0": {
-   "jar": "sha256-5M4TdswnNeHd4iC2KtCRP1EpdwTarRVaM/OGvF2w2fc=",
-   "module": "sha256-clinadyqJrmBVNIp2FzHLls2ZrC8tjfS2vFuxJiVZjg=",
-   "pom": "sha256-AjkvvUziGQH5RWFUcrHU1NNZGzqr3wExBfXJLsMstPA="
-  },
-  "org/commonmark#commonmark-parent/0.21.0": {
-   "pom": "sha256-qeGddPQOEj3jbHAaUlIg2r5eMjVDZUfbek/TwJi31Qs="
-  },
-  "org/commonmark#commonmark/0.21.0": {
-   "jar": "sha256-gQhKcDUEb+MG8NvxbvV6aNCO5clwBOqGfmK120bpivs=",
-   "pom": "sha256-RhGg7TfAGTzGANRRrUxFfT0NVBxaxlbI2ANL0s0NB1g="
-  },
-  "org/eclipse/ee4j#project/1.0.5": {
-   "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY="
-  },
-  "org/eclipse/ee4j#project/1.0.6": {
-   "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0="
-  },
-  "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.2.0": {
-   "jar": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=",
-   "module": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=",
-   "pom": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8="
-  },
-  "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0": {
-   "pom": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc="
-  },
-  "org/gradle/toolchains#foojay-resolver/0.9.0": {
-   "jar": "sha256-woQImj+HVX92Ai2Z8t8oNlaKpIs/5OKSI5LVZrqBQXY=",
-   "module": "sha256-huXl1QMWJYbAlW/QKippt22nwHIPSuAj82bRkaqXtLg=",
-   "pom": "sha256-wdtMSmUHZ5Y7dl/Q3d7P4eqLjp9kQo+H3iB/V48DeOc="
-  },
-  "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.9.0": {
-   "pom": "sha256-23zxG+5ohO+yiQQTn2LAD4tFhT5gwPQXFc9pV2tr/fA="
-  },
-  "org/jetbrains#annotations/13.0": {
-   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
-   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
-  },
-  "org/jetbrains/compose/hot-reload#core/1.0.0-alpha05": {
-   "jar": "sha256-sxLfmlRSkDi4835keehBs5dF9iZbSYE2d9BlliJ/O94=",
-   "module": "sha256-rqsb+JwLN0x2rnXYEd4HQSXZh2oREH8ZnUwreznCZrI=",
-   "pom": "sha256-C5YOLk1d1uqJ0Jl96xqer/QulPf6QNpOYc9mKTaBiWo="
-  },
-  "org/jetbrains/compose/hot-reload#gradle-core/1.0.0-alpha05": {
-   "jar": "sha256-7kWrwVHX4AywZfkDccecD7DuVRxnlshjIRIpJR7Ri5o=",
-   "module": "sha256-7/zPQpnAW+lcRthgfOAxMPOVlVDugysS8Ehte+Yi6ZM=",
-   "pom": "sha256-CAukVwfeQWzNqVJ8E4D2clG7d0KK2J/8RIy2iVtBR40="
-  },
-  "org/jetbrains/compose/hot-reload#gradle-plugin/1.0.0-alpha05": {
-   "jar": "sha256-oTw5Byo4IyBOHZ9CXWjZbMUT6+9cYjyKbsc8bhdXgqw=",
-   "module": "sha256-weJpoNnKRyKDQa8UHzm93CJ06qQcn8q79Cf8j3EBf5k=",
-   "pom": "sha256-KBm/7ol3Qev1iRsgkoqwiAyXwzGeuyQYhrrnDDQBVDM="
-  },
-  "org/jetbrains/compose/hot-reload#orchestration/1.0.0-alpha05": {
-   "jar": "sha256-g5JIQknG2u2ux4aSIz0tquo3mRuF6zhCbzifKaH3zhg=",
-   "module": "sha256-HF7Cr+l1CoQ3Utktjmqcz8IWRtBxtfU5N0jGNiNZl5w=",
-   "pom": "sha256-46cK348/uX/OabYXAUUiGcMGj0MbGJnkr7QWPRjNeQY="
-  },
-  "org/jetbrains/compose/hot-reload#org.jetbrains.compose.hot-reload.gradle.plugin/1.0.0-alpha05": {
-   "pom": "sha256-0LBsmU0E8W1HkDDuJ4uIBvVYPLn4zEvAGUhSWH/p0dY="
-  },
-  "org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
-   "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",
-   "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k="
-  },
-  "org/jetbrains/kotlin#kotlin-assignment/2.0.21": {
-   "module": "sha256-8638yrZURNtqqzwNfSVoZG7AyS8kWCh/KLKu5POXNtw=",
-   "pom": "sha256-QBfCQqfb3Oca6ApXB7S/OyOoIr8jpodahFp7UTYhzQ8="
-  },
-  "org/jetbrains/kotlin#kotlin-assignment/2.0.21/gradle85": {
-   "jar": "sha256-USUeNCELiNTJCAXKZS6Xe93IR4OkVAY5ydIQkJhbrOY="
-  },
-  "org/jetbrains/kotlin#kotlin-build-statistics/2.0.21": {
-   "jar": "sha256-gBILdN8DYz1veeCIZBMe7jt6dIb2wF0vLtyGg3U8VNo=",
-   "pom": "sha256-/iTcYG/sg+yY3Qi8i7HPmeVAXejpF8URnVoMt++sVZ0="
-  },
-  "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": {
-   "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=",
-   "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ="
-  },
-  "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.21": {
-   "jar": "sha256-BrtrNnHUvDunTA4O+rvc1VXMwtTMLvZ80wnFc4yNHlQ=",
-   "pom": "sha256-U5ag0mBsMOA66ZSnl8b5FoTG47LZ6aRf1pLl6T7sDJM="
-  },
-  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": {
-   "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=",
-   "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY="
-  },
-  "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": {
-   "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=",
-   "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0="
-  },
-  "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": {
-   "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=",
-   "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA="
-  },
-  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": {
-   "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=",
-   "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.21": {
-   "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=",
-   "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.21": {
-   "jar": "sha256-eEu/b4g00ez2XsUf57RLQW8zBS6CGWKlm55/dOCU9pY=",
-   "pom": "sha256-QxApK3Qc26Bu6iaC8YU5U4i+OvPLATzIo+gei5NokQA="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": {
-   "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=",
-   "module": "sha256-z29dNExVVVS/rGQFHq0AhcvUM4Z2uqP8h7UD6eSrvjQ=",
-   "pom": "sha256-gV5yqZ4ZFD1mLSTkYlKlnOdWMC18W9/FlIF9fMexI3g="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": {
-   "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.21": {
-   "module": "sha256-q9fHAOmpTF3zzNlek9LuqwwZJkXXB+rZXFzqR+gcwns=",
-   "pom": "sha256-QG8P2ImjHfVX+txkaouXADreDCRrX7N6YTYZFWMgUfc="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.21/gradle85": {
-   "jar": "sha256-VY+KMrr1qH6WlMi7OVVwqeduCuqrqmg/msH83oujqsw="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": {
-   "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=",
-   "pom": "sha256-OMyaLLf55K/UOcMQdvgzFThIsfftITMgCDXRtCDfbqs="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.21": {
-   "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=",
-   "module": "sha256-YqcNAg27B4BkexFVGIBHE+Z2BkBa6XoQ2P2jgpOI0Uk=",
-   "pom": "sha256-1GjmNf3dsw9EQEuFixCyfcVm6Z1bVIusEMIjOp7OF74="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.21": {
-   "jar": "sha256-lR13mJs1cAljH/HvsSsBYczzKcUpxUalKfih0x+bwDw=",
-   "module": "sha256-6qn9n4b71E/2BwoZfce90ZgPDUHo20myUoA9A6pMVaw=",
-   "pom": "sha256-5RVeYOyr2v1kUmVKaYALyyp37n0fxucH+tOo5p8HTCw="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": {
-   "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=",
-   "pom": "sha256-RenM7OM+TY36mUHMkS81RYIBqdPwQ3IMMket3lf0f/Y="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21/gradle85": {
-   "jar": "sha256-nfXH/xOx/GislFDKY8UxEYkdb2R73ewPQ5iz5yJb9tk="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.21": {
-   "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=",
-   "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.21": {
-   "module": "sha256-avSUrGVuckg0HOukOePWJhFtARfJ+9+Xq+5lcOEaCHc=",
-   "pom": "sha256-eTmPhH1rfKipak5GOf+iLhaRJIr+tOgQGeEdG9C7IFI="
-  },
-  "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": {
-   "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=",
-   "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ="
-  },
-  "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": {
-   "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=",
-   "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0="
-  },
-  "org/jetbrains/kotlin#kotlin-native-utils/2.1.21": {
-   "jar": "sha256-3ECUhclc04pfMNWHjr6ai/Lm5vJUtv6eRcygmZkF4HA=",
-   "pom": "sha256-2RW7ZEMRhfvbhlxNKxLmuniqaME0fFnfrieaMqIyhPk="
-  },
-  "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21": {
-   "module": "sha256-kJCVCx7oa4b+KWmV2AKG6opPN5+yshjoVvzt0ErS1Hk=",
-   "pom": "sha256-7lYZBmzLB5zDMy4kcnQ1n9dQXeLVQPuRtyd5ICW2Siw="
-  },
-  "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21/gradle85": {
-   "jar": "sha256-HSNuNiIzuaJx5QsiOlDI2+rdA1C2OiRkYIJWhS2jaKM="
-  },
-  "org/jetbrains/kotlin#kotlin-serialization/2.1.21": {
-   "module": "sha256-slOwL1BlFSW4AeKUXZr9RVUrRCC/FPzhxQDKX4lHyc8=",
-   "pom": "sha256-+oVjLbzKF7IlJM0ldKyFsgzE+u5oLIGeWDe+0Sncy4w="
-  },
-  "org/jetbrains/kotlin#kotlin-serialization/2.1.21/gradle85": {
-   "jar": "sha256-G6Oulwq5Idk694SifQQ4wPjeXTIxqKX8lo7V+INk5d4="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.25": {
-   "jar": "sha256-+1Nz3XYbTpPj9TjF6FO7o4pxFDoYFTbo8ZPtbk7ds7g=",
-   "pom": "sha256-ckCZBrgP9PZNYa6k78tXnSAVKEJm36nXnL2R56IzPzU="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.25": {
-   "jar": "sha256-+U/feDkM6b4wODvwOcWpNcrqM7EfA3/H+Gu87hkoflo=",
-   "pom": "sha256-iFJunaBb6fYOQo2CJojL5PW7mpJAxaz5W7fHJH4F0lc="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": {
-   "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=",
-   "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=",
-   "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o="
-  },
-  "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": {
-   "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=",
-   "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo="
-  },
-  "org/jetbrains/kotlin#kotlin-tooling-core/2.1.21": {
-   "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=",
-   "pom": "sha256-RdzNNvsgz0B28XOMmbzt98rdd3Xti8cWopgr0VzpaDA="
-  },
-  "org/jetbrains/kotlin#kotlin-util-io/2.0.21": {
-   "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=",
-   "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA="
-  },
-  "org/jetbrains/kotlin#kotlin-util-io/2.1.21": {
-   "jar": "sha256-43JJKisFVtYv0Djj7fxFMbVQZUhs4o0E9HBj0rwDDBw=",
-   "pom": "sha256-XzfSWuJDprEFAHoH18j0Wd4zep84fMiz63VPmNZCoA4="
-  },
-  "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": {
-   "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=",
-   "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU="
-  },
-  "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.1.21": {
-   "pom": "sha256-X5lVwimv4qtP70Bnu1qdZdRHStTwBcqDk481HfSPCTY="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": {
-   "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": {
-   "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=",
-   "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=",
-   "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ="
-  },
-  "org/junit#junit-bom/5.10.0": {
-   "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=",
-   "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM="
-  },
-  "org/junit#junit-bom/5.10.2": {
-   "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
-   "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
-  },
-  "org/junit#junit-bom/5.11.2": {
-   "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=",
-   "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI="
-  },
-  "org/junit#junit-bom/5.7.1": {
-   "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=",
-   "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q="
-  },
-  "org/junit#junit-bom/5.9.0": {
-   "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=",
-   "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU="
-  },
-  "org/junit#junit-bom/5.9.1": {
-   "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
-   "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
-  },
-  "org/junit/platform#junit-platform-commons/1.11.2": {
-   "jar": "sha256-A848YFTAEaJpU6Bl2mpISJ0fvBmV5Mo8bXACk+cbWAA=",
-   "module": "sha256-JDUwwaksy3kIxfplM+srI8HhSb64v/Kx6w3jIbnM35U=",
-   "pom": "sha256-AsIlCWXiPhdtqNtEtxYTPNZcOFIzwdMf7DF9zxZCpKA="
-  },
-  "org/mozilla#rhino/1.7.7.2": {
-   "jar": "sha256-XG2uBQzrcXdKX8gs5uPwOS2vD/qew1lvcNTQfuULiXA=",
-   "pom": "sha256-B2kGiYfBiVPlHUGeBi9AlW8egvOioUD+qITXxeb6lH8="
-  },
-  "org/openapi/generator#org.openapi.generator.gradle.plugin/7.12.0": {
-   "pom": "sha256-cy0Bb5mz68spMTiBTLZzrileVwJ7eszW3rI4i36trvc="
-  },
-  "org/openapitools#openapi-generator-core/7.12.0": {
-   "jar": "sha256-1i7L+r769XJwuQlPhT22OSLBurjRvZeySSsU+dXh3cc=",
-   "pom": "sha256-pM5XOAPpXM/kpE6SfjNl8OjhjXuLyOhuWip4LcIPp/Q="
-  },
-  "org/openapitools#openapi-generator-gradle-plugin/7.12.0": {
-   "jar": "sha256-7ebZvRqfYpJphbGh2zs7bL6hpdmA6AriShY8YtKgL+w=",
-   "module": "sha256-/36BV6Z93iRmMO4NCKQoSmvq+7BGOwUhx82o38uJwO0=",
-   "pom": "sha256-mpt94GZYvi5qWOspjwNtQVI0KDhhWaoBG04fUezQxFI="
-  },
-  "org/openapitools#openapi-generator-project/7.12.0": {
-   "pom": "sha256-A0Cv8o4MgwW361VK1RFPIpHDgmn10mTSxwsjfYs6qL8="
-  },
-  "org/openapitools#openapi-generator/7.12.0": {
-   "jar": "sha256-iCgK585kGwsTh5c+b0SB/mzUXLa0DDjpKlABC0vNxf0=",
-   "pom": "sha256-dy1bhJjSzsifgrn8wlQuCEwknqVNY3JAyQdQF6Qt25A="
-  },
-  "org/projectlombok#lombok/1.18.30": {
-   "jar": "sha256-FBUbR1gtVwtN4WoUfs4729GazkruW946VXjIfbnsuZg=",
-   "pom": "sha256-ZQAfOC9dHORWkjEbsbp8JDyFYZXUkkc9cv+afRzHdpk="
-  },
-  "org/slf4j#slf4j-api/1.7.36": {
-   "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ="
-  },
-  "org/slf4j#slf4j-api/2.0.16": {
-   "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=",
-   "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c="
-  },
-  "org/slf4j#slf4j-api/2.0.9": {
-   "jar": "sha256-CBiTDcjX3rtAMgRhFpHaWOSdQsULb/z9zgLa23w8K2w=",
-   "pom": "sha256-nDplT50KoaNLMXjr5TqJx2eS4dgfwelznL6bFhBSM4U="
-  },
-  "org/slf4j#slf4j-bom/2.0.16": {
-   "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk="
-  },
-  "org/slf4j#slf4j-bom/2.0.9": {
-   "pom": "sha256-6u9FhIB9gSxqC2z4OdXkf1DHVDJ3GbnOCB4nHRXaYkM="
-  },
-  "org/slf4j#slf4j-ext/1.7.36": {
-   "jar": "sha256-mlXkRTG1xiOgxTqqn0yr2RG7AFx1EqBMXTTlZNv7N6s=",
-   "pom": "sha256-VTdBQZqrqQ3JxJgXs2fFQjihNXzVFXZzDVF2e3fKUzE="
-  },
-  "org/slf4j#slf4j-parent/1.7.36": {
-   "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI="
-  },
-  "org/slf4j#slf4j-parent/2.0.16": {
-   "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU="
-  },
-  "org/slf4j#slf4j-parent/2.0.9": {
-   "pom": "sha256-wwfwQkFB8cUArlzw04aOSGbLIZ7V45m2bFoHxh6iH9U="
-  },
-  "org/slf4j#slf4j-simple/1.7.36": {
-   "jar": "sha256-Lzm+2UPWJN+o9BAtBXEoOhCHC2qjbxl6ilBvFHAQwQ8=",
-   "pom": "sha256-xWuAoKa+oqBGPnDQiSrjOKnlB+SGdnpSBFNAmBIFjRs="
-  },
-  "org/sonatype/oss#oss-parent/5": {
-   "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0="
-  },
-  "org/sonatype/oss#oss-parent/7": {
-   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
-  },
-  "org/sonatype/oss#oss-parent/9": {
-   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
-  },
-  "org/threeten#threetenbp/1.7.0": {
-   "jar": "sha256-hXkX0jGaTpLcHF4663Wg2shERe0xXnrD2Cu40rKYl38=",
-   "pom": "sha256-nLthSu/sbVcp7MrdZMmhnpshg/w6Dgk8APN2rPptC0Q="
-  },
-  "org/yaml#snakeyaml/2.3": {
-   "jar": "sha256-Y6dv5mtlI2C9TCwQfm8CWNqn1LtJIAi6jCb80jD/kUY=",
-   "pom": "sha256-D1omWgYzGwBJ41K+MsoyLeGLF/PU27cGNdQNppLjWC8="
-  }
- },
- "https://repo.maven.apache.org/maven2": {
-  "co/touchlab#stately-concurrency-jvm/2.0.6": {
-   "jar": "sha256-xXzbbhXYgkYbZMLTW+5HStX2u2n292NYsAMbjpdifMU=",
-   "module": "sha256-n0VLzay0uQBBPuzIjvnxynJaJf5WgxZ195hTywqesxc=",
-   "pom": "sha256-Sn16ELtB2tpniuJG9su7Zq+TkEEA4VA+L+ejydzS4Zw="
-  },
-  "co/touchlab#stately-concurrency/2.0.6": {
-   "module": "sha256-IlN5jSsDf4/hgTUWU7fNF1k4fs1pF5rMUNn0B4A/64s=",
-   "pom": "sha256-L5e3PLF1pEI0TLUmCdQ75sPOwnzOpyekuBs49H+kbDg="
-  },
-  "co/touchlab#stately-concurrent-collections-jvm/2.0.6": {
-   "jar": "sha256-eiZz5zS76bg3OXVlw+lvAZM1VrZIpBvy5/LHiM0KJt4=",
-   "module": "sha256-QP8Kqzsjmb7vobUCrAqy1a1wfRcLYqftfLSVu2QQnZk=",
-   "pom": "sha256-CRJBRhJXMyyjdGw4Sy/lj7Q/n/ep6ZjZVEqmddCAdqs="
-  },
-  "co/touchlab#stately-concurrent-collections/2.0.6": {
-   "module": "sha256-/Pqut7oYe99qycvB0HNJiWSbCn/8bfteU5TBcJYfaLI=",
-   "pom": "sha256-sid4YljDlKaO0ntiFyaB+JdOQoJHeTBU0XxAxlDEEfI="
-  },
-  "co/touchlab#stately-strict-jvm/2.0.6": {
-   "jar": "sha256-cM/Ua0UA8Z6fF7hakUCrQC9c8S1RAtLVbBNPp2vtpHw=",
-   "module": "sha256-3dQ2UrC12fnIuNPe+e1XZ9OaNKWvQ74o4MQ46Ohsrvk=",
-   "pom": "sha256-poFWwpzfT/g8rvcucNWk0oSDVxYdNwbJnz3OceVgEbQ="
-  },
-  "co/touchlab#stately-strict/2.0.6": {
-   "module": "sha256-TyxtwTMLI7F5yQS56cxGPAip+d0LOXKawSy9I8at6f8=",
-   "pom": "sha256-A9TEJqxQFp4ofkJnI97GkZOI2npXJF605qNVeWsvswE="
-  },
-  "com/android/tools/build#transform-api/2.0.0-deprecated-use-gradle-api": {
-   "jar": "sha256-6LQVGuFnnxq+ehTuNxrJs8ZRrntjKQ0fWGvdD3j6zpo=",
-   "pom": "sha256-1J0Xn3B9PzoAsqfTYTa1SqjUT6IncHA82C/lL7OeIus="
-  },
-  "com/eygraber#jsonpathkt-core-jvm/3.0.2": {
-   "jar": "sha256-p5YDAMnGB+mrTGfGsfI1Q31i1XlsAKM8qNLSTEsAlRc=",
-   "module": "sha256-xoNNMOycXFQLQunNVozBdhA1vAac71PlgGanCaCAGps=",
-   "pom": "sha256-xsHLkcRuA4Y0aCpEoOO/k6UEwyigwTuZfh/CS/jWUvo="
-  },
-  "com/eygraber#jsonpathkt-core/3.0.2": {
-   "module": "sha256-t/rlfihk0gBJtP5H37obpKZ7nZs4QnPTdrth+fOzHMA=",
-   "pom": "sha256-nBE2rnSk5zRu3Dw67dLZIjzi4auz/NhLHJu6BSf3Bm4="
-  },
-  "com/eygraber#jsonpathkt-kotlinx-jvm/3.0.2": {
-   "jar": "sha256-tyo9Ns009XB66Jr679syLsRojca6knCx79BXqGJDOSQ=",
-   "module": "sha256-mt9oMtVSnT9dFCYgiR1Dlo9Svl9+b2P/fgyJ2P01Sxk=",
-   "pom": "sha256-DbV9LdB2fAqSwcRZjt7l42eq0WiA1UMPAwWhHpzgvUw="
-  },
-  "com/eygraber#jsonpathkt-kotlinx/3.0.2": {
-   "module": "sha256-D6X/2rSnMu5nKkWKtijyx4sAAAwvI/EE8ovfpUwUuC8=",
-   "pom": "sha256-1Tqg0V7psdzgrm2Vh3UjYYFR2koOK4k8uh5aCdGWSFo="
-  },
-  "com/fasterxml#oss-parent/48": {
-   "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8="
-  },
-  "com/fasterxml#oss-parent/58": {
-   "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
-  },
-  "com/fasterxml/jackson#jackson-bom/2.14.1": {
-   "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw="
-  },
-  "com/fasterxml/jackson#jackson-bom/2.17.2": {
-   "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
-  },
-  "com/fasterxml/jackson#jackson-parent/2.14": {
-   "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk="
-  },
-  "com/fasterxml/jackson#jackson-parent/2.17": {
-   "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
-  },
-  "com/github/ajalt/colormath#colormath-jvm/3.6.1": {
-   "jar": "sha256-oYU+5KX+xjbbu4xElVt6MBXwLOj5z6HCNQeRwsLTY5w=",
-   "module": "sha256-fHKvGnzj4EFMhBqBgWvDwVpy6X9lKMwHqp+lSFCHpYc=",
-   "pom": "sha256-PeaemJMjZ5OF480HME/v08BfRFa7MsoyJ8s7y/RNHAo="
-  },
-  "com/github/ajalt/colormath#colormath/3.6.1": {
-   "module": "sha256-xA0F1dTNksc2qxDVkR6HjjsIqBRa76mjy20/VUPM8Bc=",
-   "pom": "sha256-uBYdwuDrGNPXm8koHtFxA3IcwcEvFYo1QydbqSlw/jg="
-  },
-  "com/github/hypfvieh#dbus-java-core/5.1.0": {
-   "jar": "sha256-zwHLfTNa9q4l/NWL0vGsmoRlrNUpZwZoo6OQL9jByc8=",
-   "pom": "sha256-wzg1ufJbGqFilYhA+bHFuK1spezi9s1tQaFNrXn/w2o="
-  },
-  "com/github/hypfvieh#dbus-java-parent/5.1.0": {
-   "pom": "sha256-W076MXQHBiM+KijdiegYah39xbo/GMrNPyfjvA/hp8o="
-  },
-  "com/github/hypfvieh#dbus-java-transport-native-unixsocket/5.1.0": {
-   "jar": "sha256-J2y5zyB1tipKDgAXVrjG+KtBJfFVQSi3WLG4C4Scou4=",
-   "pom": "sha256-/NNmULVPly2uVrpHy6DCGZk0SIWLuAPRGil5eqC2B2M="
-  },
-  "com/github/oshi#oshi-core/5.8.6": {
-   "jar": "sha256-avZFtrMZxaH+alrAPB+0seypajtifK6JU1L5ibcgkBc=",
-   "pom": "sha256-iNcNOxnby2YuXDxFceX8mavCZldu+Cv6u7RGkm9MISo="
-  },
-  "com/github/oshi#oshi-parent/5.8.6": {
-   "pom": "sha256-Fe+B2OTv+TYQPJ+HYGMM7LNXs5OGTFuvnKWHQTOzkMc="
-  },
-  "com/github/seancfoley#ipaddress/5.5.1": {
-   "jar": "sha256-XqReV9sMLWJBkqUEbO6kGwrK95t2ilShTIZ5G7ZFknA=",
-   "pom": "sha256-SgNmB8ql/IEESw4z3aBYEuXIwwk8rZwtAYkF+up2Klo="
-  },
-  "com/github/zafarkhaja#java-semver/0.10.2": {
-   "jar": "sha256-qOMuF1ddAYjB8+Lle7ldsJeTiDyIU/3oKLY+yx+Zpjo=",
-   "pom": "sha256-fwBf8/kA6GlV9aU0tamqjqVLtdYLtgrCN1lVCjZnaDU="
-  },
-  "com/google/android#annotations/4.1.1.4": {
-   "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=",
-   "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng="
-  },
-  "com/google/api/grpc#proto-google-common-protos/2.17.0": {
-   "jar": "sha256-TvH+DDJ/wVIdHXU7CxxKh1pUvRTr3tOv/wyjlTILbqk=",
-   "pom": "sha256-PwKBU6WFxZ9Viz5Dp8mAmmAai7XpEGHWxlj/+iTLjiY="
-  },
-  "com/google/auto#auto-common/1.2.1": {
-   "jar": "sha256-9D8p/ipuuvBLJZjN7sMqTjRtSalATpkPX8GcGfOijQ4=",
-   "pom": "sha256-E7S1AGKUn4sTQ5J8WBU207sFG4r+pQmqb5AvTeKLwbI="
-  },
-  "com/google/auto#auto-parent/6": {
-   "pom": "sha256-BfdAxmSBZdsAz2GN1WwgDEcl41jm1U9YU+C+wVc06go="
-  },
-  "com/google/auto#auto-parent/7": {
-   "pom": "sha256-pGQm/MtdMnBa2cu8mW94a9BIzIy90h2wRlABafFaQ1Y="
-  },
-  "com/google/auto/value#auto-value-annotations/1.6.2": {
-   "jar": "sha256-tIsE3bpA6KwzvwNvBvxDmV/FCEvZS9qs6AfOJ9O+o/s=",
-   "pom": "sha256-HHbNRi/JbnqpbccM6C8NVAY9bfFts1ycfZzA0amdP/8="
-  },
-  "com/google/auto/value#auto-value-annotations/1.6.3": {
-   "jar": "sha256-DpUf7owx9gJwvEZVOoWGABt7k9uxKuwGNzqpmhUDksA=",
-   "pom": "sha256-4fx4D37gJeZis9pycj2+KsjawKL4kg8mUxXE4b49dlw="
-  },
-  "com/google/auto/value#auto-value-parent/1.6.2": {
-   "pom": "sha256-J7ZAyCF59c/2IAnAtyAz2bxg9g6ZAqZoAidLf+N/yBw="
-  },
-  "com/google/auto/value#auto-value-parent/1.6.3": {
-   "pom": "sha256-5Z31cytMs01XJxgURvne2c5EJRMaChBiUZ7qGW3k2KE="
-  },
-  "com/google/code/findbugs#jsr305/3.0.2": {
-   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
-   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
-  },
-  "com/google/code/gson#gson-parent/2.10.1": {
-   "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
-  },
-  "com/google/code/gson#gson-parent/2.11.0": {
-   "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o="
-  },
-  "com/google/code/gson#gson/2.10.1": {
-   "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
-  },
-  "com/google/code/gson#gson/2.11.0": {
-   "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=",
-   "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A="
-  },
-  "com/google/crypto/tink#tink/1.7.0": {
-   "jar": "sha256-iJcKRWoIukxmsBsj5YRsoQlcwU5Uy0g2Pl0uFaEwcwg=",
-   "pom": "sha256-Ku41I3FfjyzRCyYDyNGeVhrHWDELfiyYU5RtLF57S/c="
-  },
-  "com/google/dagger#dagger/2.28.3": {
-   "jar": "sha256-8d0j+K40qOkTZnI5kerQ1kmdGj6RY85VDCALAtdqhys=",
-   "pom": "sha256-JlupWajhPDoGEz8EtTkWnBAY2v/U0z9TxFOrTLOG9XA="
-  },
-  "com/google/devtools/ksp#symbol-processing-aa-embeddable/2.1.21-2.0.1": {
-   "jar": "sha256-SpNovAbJIUydH8EqHYQre1d9usBKuvFN53j7V1Gv/CM=",
-   "pom": "sha256-OtZIlhwvEESzL19qR/Jt8NSucbykDwD1zG12aJU8F8M="
-  },
-  "com/google/devtools/ksp#symbol-processing-api/2.0.10-1.0.24": {
-   "jar": "sha256-3X3eBwvlTeZse91N4ExD+0KeDGK7EypkSM+jNlOvsik=",
-   "module": "sha256-v8OiFHE2oHw5IP2mGeugc8uTgcVlf++xYc/ViZSPmVI=",
-   "pom": "sha256-RSj+eY/v7sCVpz6GHBIG+oJUlqDntlInL0D/yWCBTmI="
-  },
-  "com/google/devtools/ksp#symbol-processing-api/2.1.21-2.0.1": {
-   "jar": "sha256-ayE0FIw7yenPnPI51FAxohzXiZVqIVktGjIx/orjCa8=",
-   "module": "sha256-FOy0d2qAcehhKYMzGUMTmbKmnm6b/tyymSU4vaymz8A=",
-   "pom": "sha256-ITlIj5MwvlkbT6pX4bgdH7qDaWi1HwBx8JRJ4+0J8sE="
-  },
-  "com/google/devtools/ksp#symbol-processing-common-deps/2.1.21-2.0.1": {
-   "jar": "sha256-Ac31K1nT4gaqT6YngdFQWly9mHQ8BbBy+cjLnmqi4AM=",
-   "module": "sha256-m2jwFBX8A9ZB+C4uSzfemenf30pYX7gltGAbtyyqWUw=",
-   "pom": "sha256-342+OK5yUR4F6fUuqhYaBU/Q01S1SfVI4AiPL8cp1j0="
-  },
-  "com/google/devtools/ksp#symbol-processing/2.1.21-2.0.1": {
-   "jar": "sha256-nCAksg9sUsk+NoUfHHcKMg0EEsrqzu83wo1A5uP8KZA=",
-   "pom": "sha256-Xj39efqTlcfwIhJfrW4QJM7Nqsq/p65ecgAn3+hpHZ0="
-  },
-  "com/google/errorprone#error_prone_annotations/2.11.0": {
-   "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg="
-  },
-  "com/google/errorprone#error_prone_annotations/2.26.1": {
-   "jar": "sha256-3iXy2aIVZSm9dl9R2O/fwN+nMB4E77nMdbfxDPXQ4Ps=",
-   "pom": "sha256-rqfpkeLf3LR/X71QhYdTX3gCvLni/C1Ou1C+QbaE2p8="
-  },
-  "com/google/errorprone#error_prone_annotations/2.27.0": {
-   "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=",
-   "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do="
-  },
-  "com/google/errorprone#error_prone_annotations/2.3.1": {
-   "pom": "sha256-PtzmtxG6No7+Frm3qssCFPvWSEFMublllTouftiagZo="
-  },
-  "com/google/errorprone#error_prone_annotations/2.3.3": {
-   "jar": "sha256-7FnxtwLZr8CejDkp9cQnd97GI6bqJzGsaUMyx9doD1o=",
-   "pom": "sha256-v9aSVaDAETr+5NoBNruAsSaMuw1h3wBp2NIrO+8laNU="
-  },
-  "com/google/errorprone#error_prone_parent/2.11.0": {
-   "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE="
-  },
-  "com/google/errorprone#error_prone_parent/2.26.1": {
-   "pom": "sha256-SmrQDTGwpa3Nmk9gUGXVtEX65KBMv4J+XRrBB34vgU0="
-  },
-  "com/google/errorprone#error_prone_parent/2.27.0": {
-   "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
-  },
-  "com/google/errorprone#error_prone_parent/2.3.1": {
-   "pom": "sha256-dnUl2agRKc0IGWg4KYAzYye+QWKx4iUaGCkR2qczwSM="
-  },
-  "com/google/errorprone#error_prone_parent/2.3.3": {
-   "pom": "sha256-awWm9S4rZbTvzjy7pTNbCBsdykuX3mkCNM1TZHmkDzI="
-  },
-  "com/google/flatbuffers#flatbuffers-java/1.12.0": {
-   "jar": "sha256-P4wIi03QSphYch8uFiUIyU2w3Yb5YeMG7mPvLtqHG/c=",
-   "pom": "sha256-yyJrr1RiYHcPIegVKmqoi6FSMNc591DfSA8qZo1D4Os="
-  },
-  "com/google/guava#failureaccess/1.0.1": {
-   "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
-   "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk="
-  },
-  "com/google/guava#failureaccess/1.0.2": {
-   "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=",
-   "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I="
-  },
-  "com/google/guava#guava-parent/26.0-android": {
-   "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
-  },
-  "com/google/guava#guava-parent/28.1-android": {
-   "pom": "sha256-+K/LQ/0kw7YibkCL25zsVpFzcVpMLIAXPMrt2E4VGJE="
-  },
-  "com/google/guava#guava-parent/32.0.1-jre": {
-   "pom": "sha256-Q+0ONrNT9B5et1zXVmZ8ni35fO8G6xYGaWcVih0DTSo="
-  },
-  "com/google/guava#guava-parent/33.2.1-jre": {
-   "pom": "sha256-kJX22O43ZZUCB1EHhYMMwigOeBBnkV+pnP4XQNSGXBQ="
-  },
-  "com/google/guava#guava/28.1-android": {
-   "jar": "sha256-4RLOksDwczll7t5z2UWJxZpyEosGsIu6Xr4vnqZy72A=",
-   "pom": "sha256-AZa+urqiZWDxCO6xBNYph62L6mB9mxPto/Aoa3ZdbqY="
-  },
-  "com/google/guava#guava/32.0.1-jre": {
-   "jar": "sha256-vX+iJ1kfuFCWd9DREiz5UVjzuKn0VlP1goHYefbcSMU=",
-   "pom": "sha256-QsJX9/c203ezGv7u6XirJtcwzXCvYN3nZi4YI1LiSCo="
-  },
-  "com/google/guava#guava/33.2.1-jre": {
-   "jar": "sha256-RSstl4e302b6jPXtmhxAQEVC0F7/p6WY2gO7u7dtnzE=",
-   "module": "sha256-0j7aahwsC9JfijNGzd7sQ7Ufdb+Bm5MeqpgybqZEdCI=",
-   "pom": "sha256-QoF73BwMjHN9a0Ec+vSoR2nn0nHoebAW/QhQJIoG2rU="
-  },
-  "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
-   "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
-   "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
-  },
-  "com/google/j2objc#j2objc-annotations/1.3": {
-   "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=",
-   "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU="
-  },
-  "com/google/j2objc#j2objc-annotations/2.8": {
-   "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=",
-   "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg="
-  },
-  "com/google/jimfs#jimfs-parent/1.1": {
-   "pom": "sha256-xxVVdR5X4O+RKHDorJYlrnglAqalucGcz4OyqX2LJr0="
-  },
-  "com/google/jimfs#jimfs/1.1": {
-   "jar": "sha256-xIKOKNfAqTCvk4dRCzutp9qlwE18Jadce4sIHxwlfd0=",
-   "pom": "sha256-76huXNki8XtHL9/K5XI02NSsPhSLYlBzffzkVK96ekQ="
-  },
-  "com/google/protobuf#protobuf-bom/3.22.3": {
-   "pom": "sha256-E6Mt+53m/Bw8P3r1Pk1cd/130rR2uuOLdLdYHN7i5lU="
-  },
-  "com/google/protobuf#protobuf-bom/3.24.4": {
-   "pom": "sha256-BOz9UsUN8Hp1VR+bCeDvMGMO5CN9CRyg7KceW/t4zOU="
-  },
-  "com/google/protobuf#protobuf-java-util/3.22.3": {
-   "jar": "sha256-xhX3aHncXDA+TfW5Smr6OVNAWMdUXbLUg/2V2fY8i/4=",
-   "pom": "sha256-tEcBsGoGSGXsm1YUqT6eKPrdfU38S0YPIcgZ71Pb4tY="
-  },
-  "com/google/protobuf#protobuf-java/3.22.3": {
-   "pom": "sha256-GG6nlBUPW0Kup+xgQd83PR2KioMWJPWKVd67YEPscxI="
-  },
-  "com/google/protobuf#protobuf-java/3.24.4": {
-   "jar": "sha256-5WVVIr4apcwfLwkqoDawRFFX8pSSju3xMyrJOMe2loY=",
-   "pom": "sha256-OUEiHKZXgZ3evZX+i3QPRwr3q/MEYLE+ocmrefEPq5E="
-  },
-  "com/google/protobuf#protobuf-parent/3.22.3": {
-   "pom": "sha256-OZEz1/b1eTTddsSxjoY0j0JFMhCNr0oByPgguGZfCSk="
-  },
-  "com/google/protobuf#protobuf-parent/3.24.4": {
-   "pom": "sha256-+37AUFh2/bnseVEKztLR6wTDuM/GkLWJBJdXypgcrbM="
-  },
-  "com/google/truth#truth-parent/1.0.1": {
-   "pom": "sha256-HH/IY4Mu2YCOQ9jBdpH/Fn0xPxETTvx1Yf9R0UIZbX4="
-  },
-  "com/google/truth#truth/1.0.1": {
-   "jar": "sha256-HM9DNOepTPAKIKYZtUYrU6zzJ04AtwSYv1soo7wb6bE=",
-   "pom": "sha256-BGhsbq3NYNi3sKTT9Vk4phaHYObiwkETOQNra/BGow8="
-  },
-  "com/googlecode/java-diff-utils#diffutils/1.3.0": {
-   "jar": "sha256-YbpNxJrcqVJDvqoFaa3CojrttSkq54qgEYb6eC69xcI=",
-   "pom": "sha256-L+Md1jCbD18ZW73EdJz8CvBl1h8Gz+GD39LyCSq4R7Y="
-  },
-  "com/googlecode/juniversalchardet#juniversalchardet/1.0.3": {
-   "jar": "sha256-dXv+kGGTuLZR553CbNZ9a1XQdwos37A4FZFQT3edSnY=",
-   "pom": "sha256-eEY5mzXHzWQqmzoADD4tYtBOs3pFR7aTPMixi8wvCGs="
-  },
-  "com/guardsquare#proguard-base/7.7.0": {
-   "jar": "sha256-Qt/52lNIJaXmlHUjWOAre41dqTm+m50H+Zh0SEkubnk=",
-   "module": "sha256-mfDPLg56BcGCyaRwa4WU/Xp60uP7EvIs0ScMyphKspM=",
-   "pom": "sha256-fRxMbEcM4UY59Ls3tn+l+EeffxVn85pETtBHhLS4544="
-  },
-  "com/guardsquare#proguard-core/9.1.10": {
-   "jar": "sha256-5v9XISTgrysj0kM8W3JVfx+QXmgMthl5NCy5Fe6TgZg=",
-   "module": "sha256-ejuRDXtS4yOBDnAaJrxJ/nycq3jxOtW1i43GAeJ84oE=",
-   "pom": "sha256-m3dB6tjNAZt47jNV6D9ECJy56Xt6EhBdXLWMzgTUoM0="
-  },
-  "com/guardsquare#proguard-gradle/7.7.0": {
-   "jar": "sha256-DM48bBo11BqFqyWZXB7PUELuwUibNjwM/cjgvNhebUA=",
-   "module": "sha256-yzzOVMh0LhKMfokR8CU4cnxUtI2QqvxIMPTlyeBMdss=",
-   "pom": "sha256-TFcJ7uYXjL1kpw5T0Lpp55qim7wB+r7hkHQ8v2qkjgM="
-  },
-  "com/intellij#annotations/12.0": {
-   "jar": "sha256-+KsTsUvggP4vYX+Q5VWZdg5KG03u6lxZXfY9DWN17W0=",
-   "pom": "sha256-+vgt4NwC4MCuMnzWU/NyVUlrLlP84oCzq0yzRVOokIY="
-  },
-  "com/materialkolor#material-color-utilities-jvm/2.0.2": {
-   "jar": "sha256-ehw5WMVYOvirrpQhsrFd9NwzwNTdBre8MPt5lVBOUvU=",
-   "module": "sha256-kPEIT/8zQ6SXWgx4tVu3ihklHZ+5xQ2nWxq4I60HxJg=",
-   "pom": "sha256-X2qIr8xO02UgBwGJfn81ofQc+oKhq4UwsJGWw99ll8M="
-  },
-  "com/materialkolor#material-color-utilities/2.0.2": {
-   "module": "sha256-u3ChedRjiAQYquydGdokwnMI1v97Y6njUeODeqAmOgs=",
-   "pom": "sha256-hI1hgNrDQj9o+61ebYVQ5CvhnSEw4ZKpi2kIi3N97FU="
-  },
-  "com/materialkolor#material-kolor-jvm/2.0.2": {
-   "jar": "sha256-3xSWEBi6K+/P5wTLqUXhjWV5e5Cjv3kH2n+LwMEqcdE=",
-   "module": "sha256-FGKbUUptRNpHaUEIPdemeJayYZg5PKtvEuVju3zkDqE=",
-   "pom": "sha256-8/9psHfIIKrR9URczybPUmUfMbcZNvo3t9L6aZOdFls="
-  },
-  "com/materialkolor#material-kolor/2.0.2": {
-   "module": "sha256-2rR3ErARsdPdnh0oVnlcwm1+eqd1cHr8YxFhex6PUEc=",
-   "pom": "sha256-YTrDfhrG8ubIcdEdmZD0G7K8rHytPn1S0RdHHL+SCVA="
-  },
-  "com/posthog/java#posthog/1.2.0": {
-   "jar": "sha256-gnEBAD2F9li1yqwPI4IQ/ySEhjR+qVSd6kvBPHWfYao=",
-   "pom": "sha256-YIqAJ1xuFdnIJ7i/5RZw0LCqjy6jsgd5xT2vokFoTLo="
-  },
-  "com/squareup#javapoet/1.10.0": {
-   "jar": "sha256-IO9LguQ/98ZSKBohMTzzuUEJJGet0/pzUJwm9pae/as=",
-   "pom": "sha256-FpA0CiIiefLLrfNz6Igm+iD388w+wCUvNoGP7TJwGrE="
-  },
-  "com/squareup#javapoet/1.13.0": {
-   "jar": "sha256-THUX6EinGzbQadErs79Gpw/UzaMQXYIrDtLhnAC2kpE=",
-   "pom": "sha256-VKNPqFAqRryQ79tJJiYAWR+oC/mjT1pMeYMRrsFsqXc="
-  },
-  "com/squareup#javawriter/2.5.0": {
-   "jar": "sha256-/PsJ+w6gqpfTz+fqeSOYCBNI5GjxJrNgPLOAPyQBl/A=",
-   "pom": "sha256-4avX8RFs9eDFmUdpPiGJII7JQpayozlMlZ41EdOZp7A="
-  },
-  "com/squareup#kotlinpoet-javapoet/1.17.0": {
-   "jar": "sha256-DuzCjrnihTDyUJXqizGJXn02usHQLOWx7EPG9FiudSo=",
-   "module": "sha256-941d40pspfy5lEpVgLfTp/An0NPHUnQbVPB9c1YrvBI=",
-   "pom": "sha256-UYdDQZQMIUZXB4KHOYtP80A+UEF1H1AspNeXPnsEB/o="
-  },
-  "com/squareup#kotlinpoet-jvm/1.17.0": {
-   "jar": "sha256-MTPU9Iznd2amqMwuVV2JFk387703L0/0P4mn/tNYaRA=",
-   "module": "sha256-pDRbgzxsew6i8tyeAc9qmc/nL2chZajAA/FIKFYaeWY=",
-   "pom": "sha256-HEEbqzdRQX0ziGMe9tptORWlBdqReP7kh8bokmy/L10="
-  },
-  "com/squareup#kotlinpoet/1.17.0": {
-   "module": "sha256-ZyhcxKgLPMedn4Gj41fQDEr3EpwEkNJCSKgs1aGBKOA=",
-   "pom": "sha256-V5cDmMARYvZ3D8Ax77UJe5s29kuHpiN0jYjzfCB34pw="
-  },
-  "com/squareup/okhttp3#okhttp-sse/4.12.0": {
-   "jar": "sha256-v/T7yu96rC2RDU/0ba+qTm0V2hJ99rrJchbaRpQ6fUw=",
-   "module": "sha256-c+RIzK9gfU9gO4tuZmGHKk/6PCZBGTyLvE1r2h5Ww0I=",
-   "pom": "sha256-lKunzO96e5DcolIFhb8LEjNtyO+U1ZGWPu2sV3lnkzw="
-  },
-  "com/squareup/okhttp3#okhttp/4.12.0": {
-   "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=",
-   "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=",
-   "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg="
-  },
-  "com/squareup/okio#okio-jvm/3.10.2": {
-   "jar": "sha256-/Qp+dsZzHwDpILe8EcBdgjqTIEVDGt1Ujgld4CCmnt4=",
-   "module": "sha256-p4CkJMVx4odVASiuADMjVibf/iFsuNs7ICRkmWrZaPA=",
-   "pom": "sha256-AP000Iv0YxNiofVSLKpXyuKMosfpOS76My72Vs/anUM="
-  },
-  "com/squareup/okio#okio-jvm/3.4.0": {
-   "module": "sha256-b+wTzzNhYANkv8xoAEr3x2DOrx/Bu8yVh0KuTWHbFRI=",
-   "pom": "sha256-ZqiFeYHqbD7IuGE6QJvxLxR5Ze+UmMt6jzcXKMTi2k0="
-  },
-  "com/squareup/okio#okio/3.10.2": {
-   "module": "sha256-P94fn79yxsMm1eiktTL0/Z/aLdDLFEK8pODHl9FBI4c=",
-   "pom": "sha256-7lbAIUoPqfER2nExxVDo3ICvDL9WCVbBzNosZtdQa0E="
-  },
-  "com/squareup/okio#okio/3.4.0": {
-   "module": "sha256-aRc2CEF6IRPm+mr+t7RUCyDfcM/aP6Fsc6qk+nAv+tM=",
-   "pom": "sha256-QOr9s+epasxcFR3pzL7BKFDy37XL53Ph90zrU2JVggM="
-  },
-  "com/strumenta#antlr-kotlin-runtime-jvm/1.0.3": {
-   "jar": "sha256-Hy+1MJxqlAq1K0GMHWN055qy79+mqcYbPd16f5VgROQ=",
-   "module": "sha256-Q3Q+dXyRTUnqniw40PdBVjum8IGTNXuoK5VXi9wS+OU=",
-   "pom": "sha256-1ASIHsVa6sEEiWDIm8iKxJtk9IaGa5/k2Heo5vMsiGI="
-  },
-  "com/strumenta#antlr-kotlin-runtime/1.0.3": {
-   "module": "sha256-Sw9znKgtPCPKsNUbt1FZMMu15geYvGmkda6stdgtdfM=",
-   "pom": "sha256-z1Sha4i+Muw+HXsuHfqNl60Sif/MdmtzLMW6sOu4q7k="
-  },
-  "com/sun/activation#all/1.2.0": {
-   "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ="
-  },
-  "com/sun/activation#all/1.2.1": {
-   "pom": "sha256-NgiDv2RIbs7xYbjygvZQNTbdGmcNU6Coccj7IBcOZ5U="
-  },
-  "com/sun/activation#javax.activation/1.2.0": {
-   "jar": "sha256-mTMCsWzXBW8h53nMV30XWoELtJAO9zzY+/K1D5KLqc4=",
-   "pom": "sha256-+Hm26UWFTGkAsNvuHIOE16s95+FX/XrISTdAXEFtKl4="
-  },
-  "com/sun/istack#istack-commons-runtime/3.0.8": {
-   "jar": "sha256-T/q7Br5FSgXkOY4gx3+itjCNS4jfvvfKMKdrW31VBe8=",
-   "pom": "sha256-wuAU00y4TtKH0GSYbEXDBaQSQiinM37M9sQh0U1wjxw="
-  },
-  "com/sun/istack#istack-commons/3.0.8": {
-   "pom": "sha256-oPBRfoUS8PvMe4KVwS9lZqPQwthtZVY53GYu+MDH6+U="
-  },
-  "com/sun/xml/bind#jaxb-bom-ext/2.3.2": {
-   "pom": "sha256-Gn3sKyfn4FV0TNuM8bkN70/Uc6zRuATv8JgTk1iVm9c="
-  },
-  "com/sun/xml/bind/mvn#jaxb-parent/2.3.2": {
-   "pom": "sha256-IN1tw0q3VJrEDaHYLpIiLsQ0etDsDLEY72xXA77VOhg="
-  },
-  "com/sun/xml/bind/mvn#jaxb-runtime-parent/2.3.2": {
-   "pom": "sha256-sk+NUfGEpovBuG1IwOPP7+shpE7eHF9zA8WK4EiFM+w="
-  },
-  "com/sun/xml/bind/mvn#jaxb-txw-parent/2.3.2": {
-   "pom": "sha256-tV0++psVj0g6MOkseMy2APkzFHM9CJ66m3RDbwGzFKQ="
-  },
-  "com/sun/xml/fastinfoset#FastInfoset/1.2.16": {
-   "jar": "sha256-BW86HhRECfIe0Wr8JoBfWOmiHz/OFUPELUAHGdJQxRE=",
-   "pom": "sha256-4UfSWKtuZpH3BZmpUkAObmx1WPjJwCjb4b4jF4MI6DA="
-  },
-  "com/sun/xml/fastinfoset#fastinfoset-project/1.2.16": {
-   "pom": "sha256-kFgkJa3B9AtBNi2vuVFzkxIlrKpeeWINXmvVL2Rikro="
-  },
-  "commons-codec#commons-codec/1.11": {
-   "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=",
-   "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA="
-  },
-  "commons-codec#commons-codec/1.15": {
-   "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=",
-   "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g="
-  },
-  "commons-io#commons-io/2.16.1": {
-   "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=",
-   "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8="
-  },
-  "commons-logging#commons-logging/1.2": {
-   "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
-   "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
-  },
-  "de/jangassen#jfa/1.2.0": {
-   "jar": "sha256-8cwY8VldRBroOc2hRlwIsefbRrcsHX87NzIK4WQexys=",
-   "pom": "sha256-tNgod+BwsV0dTmdrQV9qVCnw4i3U75gX2F5MWcU7yr8="
-  },
-  "dev/dirs#directories/26": {
-   "jar": "sha256-bRj+Jaowt+CLkIzSEVHY+W4illxkCs13Ua3Zu/5hN9Q=",
-   "pom": "sha256-/I3n/GawcvT21bNv67uZx1DG75JxViX1o9hJlAWpRoI="
-  },
-  "dev/drewhamilton/poko#poko-annotations-jvm/0.18.2": {
-   "jar": "sha256-5U2qgc0DiSljOuxZYGAi4eqjQyo8pnNJS78a5V5CI00=",
-   "module": "sha256-oGDXCDj/aGYX9DElgx0QV7KBCBr0bZlC8MCuOM1ge6c=",
-   "pom": "sha256-BVtbvG8ajpBWbCaYSrVLS4HMmA1QzKilZlIkFmFilN0="
-  },
-  "dev/drewhamilton/poko#poko-annotations/0.18.2": {
-   "module": "sha256-SGjNwVoyGxGrPIxbbqrE092oUghR/NLbI0/Deq7r5M4=",
-   "pom": "sha256-TdmQ/XvDu3R2lhMzoVAl/4Sc7XL5736bCmQankBb5FI="
-  },
-  "io/coil-kt/coil3#coil-compose-core-jvm/3.1.0": {
-   "jar": "sha256-iqHXrh0R+WnozcyP7kK37moDbiH3BWfjw0hu3Z19xZQ=",
-   "module": "sha256-6ucdZ4HM4ykKPjiM2fpZ0mctNIjahwbqiRFkcBrisQ4=",
-   "pom": "sha256-IkVryyLUfV3o4sKdbElAZNznVYtdGfMTBpw1f+r5B20="
-  },
-  "io/coil-kt/coil3#coil-compose-core/3.1.0": {
-   "module": "sha256-LCfu/rg6PgVENUharnPuHLz0w9SGQy0qqzfkxk7xE44=",
-   "pom": "sha256-CmIgsinPftmV0VSvssT3YXFBxcqY3S8LuF60CDDmGkQ="
-  },
-  "io/coil-kt/coil3#coil-core-jvm/3.1.0": {
-   "jar": "sha256-bUShEYjFP07qLofrrcaq2QBpEyybAp/Bs1rrCt3tXvc=",
-   "module": "sha256-maObXGZpxFXtE10hgduI0HIYJVehl1oT8DKKEmw8iDk=",
-   "pom": "sha256-dGE3HEWhgeyUR4vPDvALWuaGr8mmlmRUG2wbdmoSteU="
-  },
-  "io/coil-kt/coil3#coil-core/3.1.0": {
-   "module": "sha256-KvywLPZHytam/fsYywCHVoSfevdHpKAemBuIMPSIMKE=",
-   "pom": "sha256-NPm6Yg431Ruux7rY05bTJDzAbe7Kw1pil0/MUGlZCuo="
-  },
-  "io/coil-kt/coil3#coil-network-core-jvm/3.1.0": {
-   "jar": "sha256-gzLkXPeSzSTZgUdE24Sw5tM+xurwckvQfdwfznxVWR8=",
-   "module": "sha256-2GSNiy+ATWSIq79fIIe3XJRs/s5bGO1kCNvAV4Htobw=",
-   "pom": "sha256-3bv13KN1OnzvdpV8dm0JssLUGlImUCEWHMCCouklg0Y="
-  },
-  "io/coil-kt/coil3#coil-network-core/3.1.0": {
-   "module": "sha256-7KfwcYeJQrG/0cIZiwHKX9E+nCev5wEkXDe1OUOGxQY=",
-   "pom": "sha256-2pkj5T1iBNefNQHFuJ9eDIfpEesc/RgO9FuCRFdhuso="
-  },
-  "io/coil-kt/coil3#coil-network-ktor3-jvm/3.1.0": {
-   "jar": "sha256-zE+fjW1EfnVZy5cXw6Rd+9NR3dBqNHJAATIlEhYLAhU=",
-   "module": "sha256-NL4hHQNYOOVzu8BW1MTBE/0j9mDWQDE/sT49mtouPnI=",
-   "pom": "sha256-J9d+GTns0g4uh1xv+g1qFaOIRm2BLSxDHqf7Lj1LDSQ="
-  },
-  "io/coil-kt/coil3#coil-network-ktor3/3.1.0": {
-   "module": "sha256-RNdytNnbOOlTvpZSG2OLq4/5ytNrU0+FhydwhVLDr8M=",
-   "pom": "sha256-kS6c9+OHz0df40DvQy4r5spGydJG1mrfan0Mj3LnPoE="
-  },
-  "io/coil-kt/coil3#coil-svg-jvm/3.1.0": {
-   "jar": "sha256-QTpTtLbgpAuFHRqZoBpM2RrA3Gj6zv3det/bLVRWWI8=",
-   "module": "sha256-mau2YXPP/ryK24Fec4o/60Q3hykNUYBZaKfkmq/Cj18=",
-   "pom": "sha256-+ZVXTLorw3vi6CDxPjSm58ixTJJ41UohDoFJR6B84vE="
-  },
-  "io/coil-kt/coil3#coil-svg/3.1.0": {
-   "module": "sha256-EGfUH5lQDPAcbXABXm6leUBHiMNJBBxAhIfMYjofx9k=",
-   "pom": "sha256-kMjSxVq5L64ip85AistZYi0F2ytsLqpEoESIbMd3Y2o="
-  },
-  "io/fabric8#kubernetes-client-bom/5.12.2": {
-   "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs="
-  },
-  "io/github/g00fy2#versioncompare/1.4.1": {
-   "jar": "sha256-0mgnvHDjpuBw9bco4vhNvwopE5siGBr2Vm4MFvCNRGU=",
-   "module": "sha256-rHAoh4apAuF5CeYvf7dyrkIcRgqxDnIAtQIfWONIE2w=",
-   "pom": "sha256-6nUQLRXjrmYp7wResnYd5EAyW24RYSjC8P1MFj3Slj0="
-  },
-  "io/github/vinceglb#filekit-compose-jvm/0.8.1": {
-   "jar": "sha256-SKLBEibYuhb+uwS9Sc9hmRUIuPf1yySO+MfJF94jm70=",
-   "module": "sha256-/KXuix/ergSiAv7wQIC+cmmBvD2V5n3tNW0ZqaXoXA0=",
-   "pom": "sha256-O8Jr5JwGJ0Ol+7hfroeQdmOEfGS06TwkEIajeikWq1E="
-  },
-  "io/github/vinceglb#filekit-compose/0.8.1": {
-   "module": "sha256-BGWWzoEdlb1bai0cuoAAijQk5HUKyonDH+UGrD14PGs=",
-   "pom": "sha256-kgInUnnltl0A/vidBVSKiWxH1jDyDteiFgp9ekhPWx8="
-  },
-  "io/github/vinceglb#filekit-core-jvm/0.8.1": {
-   "jar": "sha256-iiV81/qR5r/kbeaBA5TME5PaYAlr4tS5PgBKaQftjwA=",
-   "module": "sha256-k8D9Wi2TIBqCViEbmuWnbrgh8d1SpS7M1bG/Rw/yWLk=",
-   "pom": "sha256-NJmcDTRavJj3mlBaO1o+OK5AxfG5gWMtacX0NsyBtFk="
-  },
-  "io/github/vinceglb#filekit-core/0.8.1": {
-   "module": "sha256-qopIGqRvCjIgtHbyjRoKHtsyoMtFmfmTeae1PI5nYfk=",
-   "pom": "sha256-m9MD9XiEXZB17a+NhYhDXjkeNmT/IVefaYUJ2unnElY="
-  },
-  "io/grpc#grpc-api/1.57.2": {
-   "jar": "sha256-QrcuZXLAhAVaw84D5u/kM+sF72ILPa9RNqQ1n8csw+E=",
-   "pom": "sha256-x99FUaZPAoKnZugJUU1COEUKdCkFX5x3GIgdFqMQoCY="
-  },
-  "io/grpc#grpc-context/1.57.2": {
-   "jar": "sha256-m4rIjZzvKBna/+1729LyJoAjfUgsbGcf4C022j8IzwA=",
-   "pom": "sha256-iSf3fWOB4kSHaCcIGWpspyg2i4/XzrsQT9kyS2sSSRc="
-  },
-  "io/grpc#grpc-core/1.57.0": {
-   "pom": "sha256-gYQEX1eR4Azyzbz16IRq/Uj1z35aTzj7W4MDx7Lv5Vs="
-  },
-  "io/grpc#grpc-core/1.57.2": {
-   "jar": "sha256-WhAHCr/rSWbsTVgJYdzE5/afqDqyUkL5LBdl77B7hgY=",
-   "pom": "sha256-CpcgGv4Xh08DX4ol/7lwZ45Jqt8pksfZfG/5+x1dohE="
-  },
-  "io/grpc#grpc-netty/1.57.0": {
-   "pom": "sha256-7Z3917HtQ1avs8XRQH3ttjTIYC+0EEebSArYwROe4Xs="
-  },
-  "io/grpc#grpc-netty/1.57.2": {
-   "jar": "sha256-mAnUwQyU0R57KUbN61sohL4goJUQKJVE83Vp8CyHeiE=",
-   "pom": "sha256-ixIWHPKqz785j7Wvw7DXOiGvIGulDD2Pe/T2xLN16/g="
-  },
-  "io/grpc#grpc-protobuf-lite/1.57.2": {
-   "jar": "sha256-/EkX3F1BmsgQ+z8nUjwU514f5QNyFU+rKTJCFe5qlVo=",
-   "pom": "sha256-YHeMHqQHo7oKfw8J3wmegnInjoq8KYIsnPUOGgUvG3U="
-  },
-  "io/grpc#grpc-protobuf/1.57.0": {
-   "pom": "sha256-wNy4xn/QHapjJW8Pi2jTcHzrfKhc2qt6PGw/9GDhPdE="
-  },
-  "io/grpc#grpc-protobuf/1.57.2": {
-   "jar": "sha256-MWMNip6fCKlZhiAV4wpIY5CL42gMOmhvTB8I0v/q9wY=",
-   "pom": "sha256-xeIpKAIFOXfwRhCxcEhKmh6mrxVBwUSyfRiECsVE+p0="
-  },
-  "io/grpc#grpc-stub/1.57.0": {
-   "pom": "sha256-bURZSHxiHf8xUQqIgpBjYx6RXS3Md01xkoQYEW5ZqI0="
-  },
-  "io/grpc#grpc-stub/1.57.2": {
-   "jar": "sha256-hNKvEnGRaPdjdfKv39brUTOoZe26kkTUDmuWjjrd4dM=",
-   "pom": "sha256-IVnmFKh5R3XrmOLhyFg0q05ZEb4cSnXHFjqZPpyJK6w="
-  },
-  "io/insert-koin#koin-core-jvm/3.5.6": {
-   "jar": "sha256-gjubMViP+QIVwfzq4w36FB0lKOPU5CwoQ+pAyDUr32k=",
-   "module": "sha256-IiurmbCubv5NKYHgt8fLYFRc6AGHTBVZkVBlZgYm6yE=",
-   "pom": "sha256-yxpqM0oiFH6G7kBL5IZ5NsBo2bEjuG4p9/Muj5gigok="
-  },
-  "io/insert-koin#koin-core/3.5.6": {
-   "module": "sha256-WnEdfzLKDSCiFism3KeuouftaTuHAhG2JSbDNRLJOVk=",
-   "pom": "sha256-q6P4ZLcET4XYNsJX/+7xpw2qfzR+wrLru0B7lNurny4="
-  },
-  "io/ktor#ktor-client-auth-jvm/3.1.1": {
-   "jar": "sha256-329l/zrE5Z84mcVbIUNozKBO7wA+J52/DJLcH3fR3ls=",
-   "module": "sha256-sZqQXc/2jXqOAYCozlbZvQhTMg1y42nHFO/xaGW8/Eg=",
-   "pom": "sha256-ChKNLmW/7F6SfniGwera1NAyllUZaOd7JiSLl8fFmqM="
-  },
-  "io/ktor#ktor-client-auth/3.1.1": {
-   "module": "sha256-DWnrM+1rLvNXs5QDEElR5y0U+B1t5KhGGsnnYRBz7HY=",
-   "pom": "sha256-3q0S+EmOKsqGyFJc6YDq7yYwYDejlOImpH3d2SvJxxw="
-  },
-  "io/ktor#ktor-client-content-negotiation-jvm/3.1.1": {
-   "jar": "sha256-9fYVfyPmDpqiCpLSsbSW1A6gxQJeB8lveBKmBarupAM=",
-   "module": "sha256-SCZUx0znKxyZZCV1RpL2GwyxM4BLizYtuH26ka6y1xY=",
-   "pom": "sha256-ia79EEhHe0Pym1iWYkc26LQj+PRTk2bMkLaMSn8nA2M="
-  },
-  "io/ktor#ktor-client-content-negotiation/3.1.1": {
-   "module": "sha256-dnr9WD7WI8oU7iTsSbhAO1bUNWoeQQpyYFr02bfFj2U=",
-   "pom": "sha256-Di1JFt/rE+LSRzCiv+v1W69RlRjX8hnBUqbmrW6qLbU="
-  },
-  "io/ktor#ktor-client-core-jvm/3.1.1": {
-   "jar": "sha256-3HNSBoFanfp2nJZNhjsX852CcVWpWVMs5xesy6EuzZg=",
-   "module": "sha256-CENjXDvN3YfWsKfm958QwlH4rTUGzBkrp+MtmPqdVmA=",
-   "pom": "sha256-FmsvLevYylLL8MQrpe3a5QS7Ebbcpupj8vDhkRJNjcY="
-  },
-  "io/ktor#ktor-client-core/3.0.3": {
-   "module": "sha256-xct1TTMOkdHNf3fMCCBeeT57xmmpyuGHqiEPs+dc2as=",
-   "pom": "sha256-6f576kgFKdQhOWzkAMDGhPHLZDpd2O9w40xrOSPU0WA="
-  },
-  "io/ktor#ktor-client-core/3.1.1": {
-   "module": "sha256-HENLQIV+SHTQkQeY2WWDys7TW7VcdZN+SqrXXXSZVKg=",
-   "pom": "sha256-pwvXeScZY9OUOsWxO4t8fDJMYB8n/E5eVUe4cs0Hbzg="
-  },
-  "io/ktor#ktor-client-logging-jvm/3.1.1": {
-   "jar": "sha256-scU9pJ/ECVY/TG+5oPfOsz7SoUYpNMmTkuWxzKDmqcE=",
-   "module": "sha256-f7fPWljnLO1KkqMpaj+2GEJ6sLksLArpQMacO9Jc/DU=",
-   "pom": "sha256-xBM/E1VdDRDkmrg0W1PtbsSIuer6z/klJC1jHHF/JJw="
-  },
-  "io/ktor#ktor-client-logging/3.1.1": {
-   "module": "sha256-5+ChGRMReioaTYFqFmrXAX4SNuP2A1sI7wiCB61wJLs=",
-   "pom": "sha256-HNgSST22zmdv05YtF8nvkxlUuJAIG1kFUn9Jk1aTZE0="
-  },
-  "io/ktor#ktor-client-okhttp-jvm/3.1.1": {
-   "jar": "sha256-T+9oV25+/zsrNG8AbTFhdX3/CuBEItSd8msBwPhdPsk=",
-   "module": "sha256-q5hd6r5DVjOOBS/BxArKsoYyEZh8TzGS7cUGBpi3tRE=",
-   "pom": "sha256-VM5iQXFRshxgKoGGb/MHk9VNUYb+Vk+dSWKPUIBDvzY="
-  },
-  "io/ktor#ktor-client-okhttp/3.1.1": {
-   "module": "sha256-lHmI2EdO0QQw8tOXS5byK0a9McDNOhio18BQOlTfx60=",
-   "pom": "sha256-bigHx/DYkJLQgIC3Seq2A4/Syoq91pHrFmxmeK5kgVw="
-  },
-  "io/ktor#ktor-client-websockets-jvm/3.1.1": {
-   "jar": "sha256-x+SdwwC+Z/PsxAt/w1643p32hcM6pbSqaYMsRzoNGmM=",
-   "module": "sha256-K9DsnywbSE/xkIHD/2mjNwuTrKsMACav66KPpIu0JxQ=",
-   "pom": "sha256-77mNIPrzcCEmODMnUmFJtSaKovcisJSX0/kDljVV1KY="
-  },
-  "io/ktor#ktor-client-websockets/3.1.1": {
-   "module": "sha256-ODpIQKD4NNlTGOV4MEiGZ2kwcpm6ZoVuGp9ZbMpGEBM=",
-   "pom": "sha256-hbNOfoLxMoHliwVRIMaLyP9GhTSRfjvzMZ92vJP2Hjs="
-  },
-  "io/ktor#ktor-events-jvm/3.1.1": {
-   "jar": "sha256-edJ+rfJ6J433kMSQ9XyZG+2TYLVaBbyfH3RLIjMLUFs=",
-   "module": "sha256-WJLv/yddO0Mise6kS906BoD3z/iXiO8WyAl3cKjF+eQ=",
-   "pom": "sha256-RUqm3g/VPlJIOZnKSd6VjwNBKx1GlF14lqJBsQbBjqg="
-  },
-  "io/ktor#ktor-events/3.1.1": {
-   "module": "sha256-wzRhIZmbL3rNh0doWOTY9aZkInpcOyQcc52dQoJb250=",
-   "pom": "sha256-mgwRaawFQZcZe8CPF8yCeXgjqcJWZHQd04GnazL9QDs="
-  },
-  "io/ktor#ktor-http-cio-jvm/3.1.1": {
-   "jar": "sha256-ZZVfvsiA9mb/MOXN7MM+Of/XwLZYwJ2niUlOhSjJTGA=",
-   "module": "sha256-peUjznqqEclSfeB7wxRak6lzc4Jl/TyB959reYeS5gQ=",
-   "pom": "sha256-/qMR8z1NKfV6m/wkrecn6vtFullv9JZ5qkVSpewTpo0="
-  },
-  "io/ktor#ktor-http-cio/3.1.1": {
-   "module": "sha256-zpUnEGKYRlbN9wmx3vIwThGij+tQpQM07Xnk+F8E7A8=",
-   "pom": "sha256-sCIN4cXz3pHqhu7SxkHXu0lSfD1iqeivo97xFkeLbaA="
-  },
-  "io/ktor#ktor-http-jvm/3.1.1": {
-   "jar": "sha256-wQ4iEltDk+ZhJN35ediJmc/7C/vo1boZIkD7oQTRX7o=",
-   "module": "sha256-mzpLiic6QZ7i2L5SIsgbJvKRdrakojuBX/RKvDmrDeM=",
-   "pom": "sha256-8j+CYetHYjfH2lXKZ8awMFS+kGpCF1+/iIvOtIAhKGk="
-  },
-  "io/ktor#ktor-http/3.1.1": {
-   "module": "sha256-Bj/oGNpM0JsqAR/mb8lAX/fiuetFaPVekpbQoG8sPA0=",
-   "pom": "sha256-scSnlJ/nls6z8YMjWYqDxfk9J7U2VFFg4o+WIGGPn7s="
-  },
-  "io/ktor#ktor-io-jvm/3.1.1": {
-   "jar": "sha256-MYuRb0fIUXCvS+6fD0VQsODt7Ky14dwsKCl3bI17yas=",
-   "module": "sha256-J2rXuOWEtkb7XV76b+hFYvhC9Dzwvj/UlkVd/z51ydE=",
-   "pom": "sha256-YRjAOam6H6htK4CxoZ7Iy/xKIvUZ6vA/VFdXzTqxd8w="
-  },
-  "io/ktor#ktor-io/3.1.1": {
-   "module": "sha256-4u15APMHK4VkiSseR1fzRWyJ5HV+nnfcqf8W3DmIiFA=",
-   "pom": "sha256-mna6AnP0Vy1oTURo784BtATSSsWzokuK4ceWQhx5D+c="
-  },
-  "io/ktor#ktor-network-jvm/3.1.1": {
-   "jar": "sha256-CJy7uU8kt14+TEQBuu/ZWG9bFcnYAKbpPzCmSxlZsjk=",
-   "module": "sha256-AiZQk2xYwEEStePfJD4zaQDmtyKbCkUl8cn1nIPeeis=",
-   "pom": "sha256-GUk3Y9TxFQvCKfqdD8yERJOQw+q8txxc+yRVupmmkWU="
-  },
-  "io/ktor#ktor-network/3.1.1": {
-   "module": "sha256-gP7XcFwFdzTMk8+cf55cD0lo+nWMqlDjvpH+YrpoL5g=",
-   "pom": "sha256-QLSG36c91ynR99yevJNL5z3pJSKFnbKWqE/28gyGw2Y="
-  },
-  "io/ktor#ktor-serialization-jvm/3.1.1": {
-   "jar": "sha256-nJldXoF13kgYMCplAbuZqOEZ1GI8dVUt32DuPWbF594=",
-   "module": "sha256-TvQH316/TX58e5s19DVmPe10KsUeJcoelb6dOWJtv6c=",
-   "pom": "sha256-N7BrHSbkoMBbuMk+puGnHZ54zf+XndPAmkwaFFPS4aM="
-  },
-  "io/ktor#ktor-serialization-kotlinx-json-jvm/3.1.1": {
-   "jar": "sha256-gdtumyFpbgVyaerBobZE6HHOnnWj2o5oBTq3c5fvwBs=",
-   "module": "sha256-CEkEG0MWhxZhDsR+ZEv8QOVnvIJhIZsbMQg6ZEjfh3g=",
-   "pom": "sha256-TpiA/27FDdaawiouv423bdGB43ROw/rLCF+DdPJwfSw="
-  },
-  "io/ktor#ktor-serialization-kotlinx-json/3.1.1": {
-   "module": "sha256-zmVZ1QiGCaXMpCVrSXZUnyjQXio8jPjeY+vGE8DVvwI=",
-   "pom": "sha256-J+jZHK6F3ud002BmizCLErAsuaRt7EI9L4C/+izqYXI="
-  },
-  "io/ktor#ktor-serialization-kotlinx-jvm/3.1.1": {
-   "jar": "sha256-UGynsB5FAvvYlIZP5A1KhGwLR6WVTU01+8TI+ABI16A=",
-   "module": "sha256-R3hXpALaI/FAd8cdDC3qsL9YfRkonR2JIjBQLK5nGbI=",
-   "pom": "sha256-+qg/wXYrGtneZ6sAj4apLQ0FibrTvA8KyEoKYNSGN0k="
-  },
-  "io/ktor#ktor-serialization-kotlinx/3.1.1": {
-   "module": "sha256-A/l5EFJLtQLF2/pkXc8PdIlRT25cynPWbPh85oX9PFk=",
-   "pom": "sha256-xTkjB+ik4dwgJZoqIre628d2DM8ICoyH0cFXAPuV9OA="
-  },
-  "io/ktor#ktor-serialization/3.1.1": {
-   "module": "sha256-Lnp0xtJFkGOeRvOt5X4D4hGL0l27Kn4FFP5PiMoCA2o=",
-   "pom": "sha256-e0xBuMWwvFPneI6U80sg2Tee1pkMkCuLna4CHKvBoUI="
-  },
-  "io/ktor#ktor-sse-jvm/3.1.1": {
-   "jar": "sha256-9MoU6LzJPLDfazwRhRyAzeDsTFMvOifdxPbhfN9QlfI=",
-   "module": "sha256-wnFsMZK+6WMzsz49jrTSdLuqZYKOdwAAJfzFky0xhcQ=",
-   "pom": "sha256-Ebf9pIb6xeXY0vs0ey8bLdpvGMIgozJ7FdwEDv7vxcI="
-  },
-  "io/ktor#ktor-sse/3.1.1": {
-   "module": "sha256-O/XgdWtXZX72kbUV/UekraLWexcmh2C9pJCe7KXs94U=",
-   "pom": "sha256-555aU506JSbasDuU/4PFFVe46G0dHBFveXLdb4qB9ZU="
-  },
-  "io/ktor#ktor-utils-jvm/3.1.1": {
-   "jar": "sha256-MXZ8uCHKB3KftclmDjjYgZ3Jo7jKm4u2q1D/a9BMuCk=",
-   "module": "sha256-YE7wk8++XQq2CD/73rAjNXZASXMZs/ipoN1a1SYRQh8=",
-   "pom": "sha256-LUGC3pBGlMdY+c9CxicYgMpM2EFWdBYB2t0zKyMZ7wQ="
-  },
-  "io/ktor#ktor-utils/3.1.1": {
-   "module": "sha256-vnVD0+g6f+TAgP1UWgXSXPsYfcAwg2IkCbv3Yg7HibU=",
-   "pom": "sha256-OWwgs5DCmMIdK4M24tPWSSfzmoj5zPOaew2h/xkcP40="
-  },
-  "io/ktor#ktor-websocket-serialization-jvm/3.1.1": {
-   "jar": "sha256-+zaNzbdiPHF4rKhjMiJknLFRBkaVS0m6NZxckm+Y/EE=",
-   "module": "sha256-SKFYB5qMwz5EBDrEkaVFtWNL5oMiY44INoclZIenLR0=",
-   "pom": "sha256-emkQogxJM7X00SJanW4uaE2RGvvxSVFiEO6YBbCyYXI="
-  },
-  "io/ktor#ktor-websocket-serialization/3.1.1": {
-   "module": "sha256-y6bmysD6XrDCG2n1ZfWaSSFPnEnc6Qrq8L/QWEyV7fQ=",
-   "pom": "sha256-GarQzpRZpleFsOJ5XY+87sf0o65DOfy9KrV8Y6zdQ6k="
-  },
-  "io/ktor#ktor-websockets-jvm/3.1.1": {
-   "jar": "sha256-INrwtfeSnXsLIH9WMN1SPUcYLSUdysUzqbGcqCQG69s=",
-   "module": "sha256-IIfo/BNzNDnJk6E0Cl7+ontaV2czRCONpcHr3uLMMAk=",
-   "pom": "sha256-grzt+ITD43sODDeuhHhiMxOpyTn3NTXoQuKqKwEE7Jw="
-  },
-  "io/ktor#ktor-websockets/3.1.1": {
-   "module": "sha256-NaXY4UALTUsTCqUHVhdEoG7u55c17bo/qrW+yVFUBPY=",
-   "pom": "sha256-UBJv8ak1FyiMAYseKTCfOozAfimsqU4WIpzV6LKjZNc="
-  },
-  "io/netty#netty-bom/4.1.86.Final": {
-   "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0="
-  },
-  "io/netty#netty-buffer/4.1.93.Final": {
-   "jar": "sha256-AHx9nDeN8C05BWfQ1931Qv/dsCG3MT2/UCOSET/6uwg=",
-   "pom": "sha256-g/vFTitzuG1Vsgj2GNGioVaRDsFG9+zldWUAe3UK3Xg="
-  },
-  "io/netty#netty-codec-http/4.1.93.Final": {
-   "jar": "sha256-2s94znirLSlXAyXbTNJFHqWJY5gH3pWIGg+nFVqea1U=",
-   "pom": "sha256-o9r/8HG20oToBj2WhD3iu4PPO4iergzJ4K22SlejG4I="
-  },
-  "io/netty#netty-codec-http2/4.1.93.Final": {
-   "jar": "sha256-2WzAkEWhNBxtR0lDUqomO4e3L7HS6p7KFhqnOCC/6Ls=",
-   "pom": "sha256-CEQztC1UH3rEtZKH3SUyhc/aOj1l3nLnNou37D02cnE="
-  },
-  "io/netty#netty-codec-socks/4.1.93.Final": {
-   "jar": "sha256-DqR7W6I8odqOuRRsj8dVwScUFGM7Hivizh33ZLoP/yo=",
-   "pom": "sha256-jNgW7ZkalGBBurTLJL2cjkHuBpJRJRHy2DzvU462Bdc="
-  },
-  "io/netty#netty-codec/4.1.93.Final": {
-   "jar": "sha256-mQw3gWjcY2TG/1aXAfTy8SL//omYs+GJ66TE2GjtEIQ=",
-   "pom": "sha256-Gc3tJnoHDf8avJ0Cm1UvrSYqzBq6XGxnsiePyhE6Jqs="
-  },
-  "io/netty#netty-common/4.1.93.Final": {
-   "jar": "sha256-RDuzFlmfsW47rrovtYiBgU1/8LevF2/nbjgHGm6G+MA=",
-   "pom": "sha256-QtiDsT6zjKv1SWFkYsXzMfUzO/DI/JIVdE+DwBgKT2s="
-  },
-  "io/netty#netty-handler-proxy/4.1.93.Final": {
-   "jar": "sha256-KsX3+++gtz73g4iQaTRNVRVQWhSyMDvmk8UALEht8rQ=",
-   "pom": "sha256-bcUNoOZ/WXgSh0+B6qRUBPfQdrgZnqkIiTKoXBthAkU="
-  },
-  "io/netty#netty-handler/4.1.93.Final": {
-   "jar": "sha256-Tl9WOuFO1xM4GBbVgvX8/QYVrvspIDSGzft4LYoAoCs=",
-   "pom": "sha256-hKFSXKwLR1nvrvKZekf+Gbm1ZC+Sc/oP1YoudsegWf4="
-  },
-  "io/netty#netty-parent/4.1.93.Final": {
-   "pom": "sha256-sQnLdvN1/tuKnvdaxYBjFw3rfqLd0CT0Zv723GXN/O4="
-  },
-  "io/netty#netty-resolver/4.1.93.Final": {
-   "jar": "sha256-5Zdwtm6Bgi5dERrE5UTX6wxUPgooX1JijlOUGs2O11k=",
-   "pom": "sha256-WzUMPJHp5V0py+aM/k7yEWzB8DKGd+v59hW6twgsefQ="
-  },
-  "io/netty#netty-transport-native-unix-common/4.1.93.Final": {
-   "jar": "sha256-d0FlocTbqssX+cGtZms1aaallxWugo58PUdwP0eaU+c=",
-   "pom": "sha256-Fbwltn/wpJJysnDvK4z/1iAFfKFssp3/etVmGtyirhI="
-  },
-  "io/netty#netty-transport/4.1.93.Final": {
-   "jar": "sha256-paeAGbwc1D28PHt83TgBkSyibR9Jj7VgUU/uSXhkupY=",
-   "pom": "sha256-DdYqDrPLHqABpNBCbk9cCN8ccNkmVnW/+lxYNhNCLUM="
-  },
-  "io/perfmark#perfmark-api/0.26.0": {
-   "jar": "sha256-t9I+k6NFN84zJwgmmg0UBHiKW14ZSegvVTX85Rs+qVs=",
-   "module": "sha256-MdgyMyR0zkgVD1uuADNDMZE28zav0QdqKJApMZ4+qXo=",
-   "pom": "sha256-ft7khhbhe2Epfq46gutIOoXlbSVnkpN4qkbzCpUDIto="
-  },
-  "io/sentry#sentry-kotlin-multiplatform-jvm/0.12.0": {
-   "jar": "sha256-O/z/1CG6XIIYrvjz/x+KBMBa3kaTt+8Yc7zWp8wOl8Y=",
-   "module": "sha256-uqQCJ82hcAuab1EtwgrXBDB7lVnptXtvu24CWL2W1jg=",
-   "pom": "sha256-/hEp7FMvE2lCHQnAWQtgdU8cUy3ycmFEfyfmxYNmSas="
-  },
-  "io/sentry#sentry-kotlin-multiplatform/0.12.0": {
-   "module": "sha256-N+fdfmhXBDIGLklwjxmDvWN8TOiyW1Gga8V6Tfwguss=",
-   "pom": "sha256-wkjtJf07NMXNPuk1ELsVVhgCcD+rjBZ+Chn0NBmttko="
-  },
-  "io/sentry#sentry/8.8.0": {
-   "jar": "sha256-FP6T2JRlBMFXy+haPC5QY77c7Jvq04TJP3mlFxTC0TI=",
-   "module": "sha256-upAHAYOH8B8RjPHCy0xgN+FKx1FR2sb7nSfG0akrwZw=",
-   "pom": "sha256-n5H3T5E9NMhWuml/lZ5cerZa2W7AjW1TY0688Irn4pc="
-  },
-  "jakarta/activation#jakarta.activation-api/1.2.1": {
-   "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=",
-   "pom": "sha256-QlhcsH3afyOqBOteCUAGGUSiRqZ609FpQvvlaf8DzTE="
-  },
-  "jakarta/platform#jakarta.jakartaee-bom/9.0.0": {
-   "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4="
-  },
-  "jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
-   "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
-  },
-  "jakarta/platform#jakartaee-api-parent/9.0.0": {
-   "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs="
-  },
-  "jakarta/platform#jakartaee-api-parent/9.1.0": {
-   "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
-  },
-  "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.2": {
-   "pom": "sha256-FaVbfVN8n5lwrq0o0q+XwFn2X/YQL3a70p8SR92Kbfs="
-  },
-  "jakarta/xml/bind#jakarta.xml.bind-api/2.3.2": {
-   "jar": "sha256-aRVjBAeb3u2fwK47OTifGbPMS6REO8gFCJlTlOrXQuo=",
-   "pom": "sha256-tTeziNurTMBpC50vsMdBJNZyUxc0VnrPblMTDqsTGtY="
-  },
-  "javax/annotation#javax.annotation-api/1.3.2": {
-   "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=",
-   "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c="
-  },
-  "javax/inject#javax.inject/1": {
-   "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=",
-   "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o="
-  },
-  "junit#junit/4.13.2": {
-   "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
-   "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
-  },
-  "net/bytebuddy#byte-buddy-agent/1.17.4": {
-   "jar": "sha256-4drn78VWLCmtO2JbkOaGQgjeabrVYyw/k6VH8XYirFE=",
-   "pom": "sha256-1ghCjJXnT6aXreYmDmCUE8O+oL+Wh72hvoe3BAPi/8k="
-  },
-  "net/bytebuddy#byte-buddy-parent/1.17.4": {
-   "pom": "sha256-4FQGL6bGDfvTnqmX8zgQZWTR7w3f5vu+qGeD+toDvak="
-  },
-  "net/bytebuddy#byte-buddy/1.17.4": {
-   "jar": "sha256-dHaHMSGaWy4MydKxyeIJLgYiJC5BsZJaa6c0bhYHMbw=",
-   "pom": "sha256-7sHUc2OcrqtenXbx+KSGRrCQZ7DFyYS3oL5TAoghg10="
-  },
-  "net/java#jvnet-parent/1": {
-   "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78="
-  },
-  "net/java#jvnet-parent/3": {
-   "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
-  },
-  "net/java/dev/jna#jna-jpms/5.12.1": {
-   "jar": "sha256-Az6Kx6dCYkdIvyUWSPFQls9uFavgxMFfSnfKEIFqEyQ=",
-   "pom": "sha256-/oIEsE54gTuRM65GObdiwZauazmdQ9Z/olFXz7FSXS0="
-  },
-  "net/java/dev/jna#jna-platform-jpms/5.12.1": {
-   "jar": "sha256-1zvIB9SAk+9FzjVcZEb9/fO8DucEOysV+wM66hdhEQY=",
-   "pom": "sha256-CgHHSMhZdtcu2DfW/tp7Rk1DtjlV4JsYhH2FOPMmJc0="
-  },
-  "net/java/dev/jna#jna-platform/5.13.0": {
-   "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=",
-   "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY="
-  },
-  "net/java/dev/jna#jna-platform/5.15.0": {
-   "jar": "sha256-GLf259NM6JMJptkFKuGph+jmQFfi9oPgHlDy8rWc0VM=",
-   "pom": "sha256-oNnHuB/tH6i+iLAv16dWDeGxrFlYOh4sWiGopdxs32c="
-  },
-  "net/java/dev/jna#jna-platform/5.6.0": {
-   "jar": "sha256-ns6ovysbOZY5OdGLcEZO72DFCP7Ygg+dyroMNVGOq/c=",
-   "pom": "sha256-G+s1y0GE5skGp+Murr2FLdPaCiY5YumRNKuUWDI5Tig="
-  },
-  "net/java/dev/jna#jna/5.13.0": {
-   "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=",
-   "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q="
-  },
-  "net/java/dev/jna#jna/5.15.0": {
-   "jar": "sha256-pWQVjSirUSf8apWAKO1UJ5/gmZZixGQltqOwmipSCU0=",
-   "pom": "sha256-J2YC/zZ6TDkVXa7MHoy1T0eJ5dgN+Qo6i2YD8d61ngU="
-  },
-  "net/java/dev/jna#jna/5.6.0": {
-   "jar": "sha256-VVfiNaiqL5dm1dxgnWeUjyqIMsLXls6p7x1svgs7fq8=",
-   "pom": "sha256-X+gbAlWXjyRhbTexBgi3lJil8wc+HZsgONhzaoMfJgg="
-  },
-  "net/sf/jopt-simple#jopt-simple/4.9": {
-   "jar": "sha256-JsWFbpVLX4ZNt28TuGkZtZxu7Pn9kwuWuqiIRia68vU=",
-   "pom": "sha256-evfi2LJLR5jwTCt9okyfvRt1V7TgF8IFRIFWWRYHkJI="
-  },
-  "net/sf/kxml#kxml2/2.3.0": {
-   "jar": "sha256-8mTdn3mh/eEM5ezFMiHv8kvkyTMcgwt9UvLwintjPeI=",
-   "pom": "sha256-Mc5gb06VGJNimbsNJ8l4+mHhhf0d58mHT+lZpT40poU="
-  },
-  "org/apache#apache/13": {
-   "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
-  },
-  "org/apache#apache/18": {
-   "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc="
-  },
-  "org/apache#apache/21": {
-   "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
-  },
-  "org/apache#apache/23": {
-   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
-  },
-  "org/apache#apache/27": {
-   "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
-  },
-  "org/apache#apache/31": {
-   "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
-  },
-  "org/apache#apache/33": {
-   "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
-  },
-  "org/apache/commons#commons-compress/1.21": {
-   "jar": "sha256-auz9VFlyillWAc+gcljRMZcv/Dm0kutIvdWWV3ovJEo=",
-   "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0="
-  },
-  "org/apache/commons#commons-parent/34": {
-   "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
-  },
-  "org/apache/commons#commons-parent/42": {
-   "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw="
-  },
-  "org/apache/commons#commons-parent/52": {
-   "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
-  },
-  "org/apache/commons#commons-parent/69": {
-   "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
-  },
-  "org/apache/groovy#groovy-bom/4.0.22": {
-   "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=",
-   "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U="
-  },
-  "org/apache/httpcomponents#httpclient/4.5.14": {
-   "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=",
-   "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c="
-  },
-  "org/apache/httpcomponents#httpcomponents-client/4.5.14": {
-   "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE="
-  },
-  "org/apache/httpcomponents#httpcomponents-client/4.5.6": {
-   "pom": "sha256-sEK0HyOR7bANNff05Qmu0hI2SMHSRs5Y0Pe5Bcn+H3M="
-  },
-  "org/apache/httpcomponents#httpcomponents-core/4.4.16": {
-   "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c="
-  },
-  "org/apache/httpcomponents#httpcomponents-parent/10": {
-   "pom": "sha256-yq+WfZSvshdT82CCxghiBr0fSIJf9ZaTLM66crZdOfo="
-  },
-  "org/apache/httpcomponents#httpcomponents-parent/11": {
-   "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o="
-  },
-  "org/apache/httpcomponents#httpcore/4.4.16": {
-   "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=",
-   "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o="
-  },
-  "org/apache/httpcomponents#httpmime/4.5.6": {
-   "jar": "sha256-CysRAsGNPH4Fp3IUubdQGm9gVhdK5WBODiVndu2nVT4=",
-   "pom": "sha256-37/W/+KnhMqYF8RjZap/ileDILgFveOdb1WgsJ2KqMo="
-  },
-  "org/apache/logging#logging-parent/11.3.0": {
-   "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A="
-  },
-  "org/apache/logging#logging-parent/7": {
-   "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys="
-  },
-  "org/apache/logging/log4j#log4j-api/2.20.0": {
-   "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=",
-   "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc="
-  },
-  "org/apache/logging/log4j#log4j-api/2.24.2": {
-   "jar": "sha256-DKPsvUwxW91fLvavEncS33GMeDNMzlv2+3tKoX/asSY=",
-   "pom": "sha256-PvzSYUu/xZCVlJDx3FgXwUGRmYHZ6daaZSZKFzHhWKc="
-  },
-  "org/apache/logging/log4j#log4j-bom/2.20.0": {
-   "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE="
-  },
-  "org/apache/logging/log4j#log4j-bom/2.24.2": {
-   "pom": "sha256-NQKIlCeybxfvStgWgCxJtJQ/DJOXJoYdEmPlenKiMEY="
-  },
-  "org/apache/logging/log4j#log4j-core/2.20.0": {
-   "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=",
-   "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4="
-  },
-  "org/apache/logging/log4j#log4j-core/2.24.2": {
-   "jar": "sha256-enuQ24ZshqEJOz/edYyig5jrsqUz2g15owzAp4UGud8=",
-   "pom": "sha256-XA2/WcPDVRdm+NdukpIOd0gLFWuTR6L3Uuz+tN1kSxc="
-  },
-  "org/apache/logging/log4j#log4j-slf4j2-impl/2.20.0": {
-   "jar": "sha256-uN0+TqnP+hjbXzAc2MU5FYZi5pHv1HAaqHtNCZYb2LA=",
-   "pom": "sha256-twx2AextJIylCOojNyjIYqBi2lg0doIWdAcvq7OLkU4="
-  },
-  "org/apache/logging/log4j#log4j/2.20.0": {
-   "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk="
-  },
-  "org/apache/logging/log4j#log4j/2.24.2": {
-   "pom": "sha256-TY1YM2j0eTVGPhpnFQLVkBnHSvSki7sjoiOptI8B9Hk="
-  },
-  "org/bitbucket/b_c#jose4j/0.9.5": {
-   "jar": "sha256-gI+zFm8+Z9rZgRwzECmrFoEkL9Urc1vD8z8oEWf8xy4=",
-   "pom": "sha256-utAkGAobRpy9lOXy2xKEG8rFRD2VRWB/Zzz95nfB2HI="
-  },
-  "org/bouncycastle#bcpkix-jdk18on/1.79": {
-   "jar": "sha256-NjmiTd+bpLfroGWbRHcOkeuoFkIYiOVx8oWq3v5TLNY=",
-   "pom": "sha256-NeSfQTTeKsMmw6UKJXYsu021bzgC+j9zDMhbZTrQmHs="
-  },
-  "org/bouncycastle#bcprov-jdk18on/1.79": {
-   "jar": "sha256-DYHswxJFNrU5vOmqP+liG3+Eyc7jcbY1pbMceLeasdo=",
-   "pom": "sha256-2PGgaxSddG6dmN5U4veqmy62E/s1ymfYrjls6qxmHuQ="
-  },
-  "org/bouncycastle#bcutil-jdk18on/1.79": {
-   "jar": "sha256-xwuIraWJOMvC8AXUAykFQHi8+hFJ5v/APpJC62qyGDY=",
-   "pom": "sha256-4kwftM8WBUBaaYjp5NbksuH0OT/HOompRSrmJe4xHQI="
-  },
-  "org/checkerframework#checker-compat-qual/2.5.5": {
-   "jar": "sha256-EdE0skXpysxHRRTS1mtbhhj4A5oUZc3FW7wLNOAAi3o=",
-   "pom": "sha256-QvIevZGDvgSe5a/IIrNFQDpdp2QDeHVzSgObDW4DU74="
-  },
-  "org/checkerframework#checker-qual/2.5.8": {
-   "pom": "sha256-M6xqDxNBrpZkfH1EZfSqPST+l9Jpe87izq5vyLXvLDw="
-  },
-  "org/checkerframework#checker-qual/3.33.0": {
-   "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=",
-   "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=",
-   "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM="
-  },
-  "org/checkerframework#checker-qual/3.42.0": {
-   "jar": "sha256-zK7dM68LeJTZ8vO2RPTRnkOSjjKQLmGsTRB3eDD1qsc=",
-   "module": "sha256-4PpiK33mPq4RBH726RtMKtDx8OE8uQP/UggKR/V6V0Y=",
-   "pom": "sha256-v1/KqycvVMvPG753w72WPIIcmrrSBYcIvwvtPIdUlMo="
-  },
-  "org/codehaus/groovy#groovy-bom/3.0.14": {
-   "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric="
-  },
-  "org/codehaus/mojo#animal-sniffer-annotations/1.18": {
-   "jar": "sha256-R/BYUrSO6brv74D6PYzqYO+kdTwAExId1/5e7y5ccp0=",
-   "pom": "sha256-rfUi9IOcNfUynql8QHrr6/qIB7ZEhS3E1c18l7em0uA="
-  },
-  "org/codehaus/mojo#animal-sniffer-annotations/1.23": {
-   "jar": "sha256-n/5Sa/Q6Y0jp2LM7nNb1gKf17tDPBVkTAH7aJj3pdNA=",
-   "pom": "sha256-VhDbBrczZBrLx6DEioDEAGnbYnutBD+MfI16+09qPSc="
-  },
-  "org/codehaus/mojo#animal-sniffer-parent/1.18": {
-   "pom": "sha256-Tp31RqR89jBKExfEaHAQCocm++oRsN0YMi+VfkBwlzw="
-  },
-  "org/codehaus/mojo#animal-sniffer-parent/1.23": {
-   "pom": "sha256-a38FSrhqh/jiWZ81gIsJiZIuhrbKsTmIAhzRJkCktAQ="
-  },
-  "org/codehaus/mojo#mojo-parent/50": {
-   "pom": "sha256-+BnK0bFbaneRyLYB6WveM3ZeRoE5WAfbRTfS8N7dSTs="
-  },
-  "org/codehaus/mojo#mojo-parent/74": {
-   "pom": "sha256-FHIyWhbwsb2r7SH6SDk3KWSURhApTOJoGyBZ7cZU8rM="
-  },
-  "org/eclipse/ee4j#project/1.0.2": {
-   "pom": "sha256-dJWgenl+iOQ8O8GodCG9ix/FXjIpH6GOTjLYAx3chz8="
-  },
-  "org/eclipse/ee4j#project/1.0.5": {
-   "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY="
-  },
-  "org/eclipse/ee4j#project/1.0.6": {
-   "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0="
-  },
-  "org/eclipse/ee4j#project/1.0.7": {
-   "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
-  },
-  "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": {
-   "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM="
-  },
-  "org/glassfish/jaxb#jaxb-bom/2.3.2": {
-   "pom": "sha256-oQGLtUZ47Z9ayy96QITjhf9RAgH06dv1913GpnX2a+c="
-  },
-  "org/glassfish/jaxb#jaxb-runtime/2.3.2": {
-   "jar": "sha256-5uCh6J+2/3hieeagCC1c71LcLr5nBT0EGABzdlK0/Rs=",
-   "pom": "sha256-lEilrX+mimCD375PQsjIPggrkgKhBUAfxo6UTCZUizQ="
-  },
-  "org/glassfish/jaxb#txw2/2.3.2": {
-   "jar": "sha256-SmqfSDOI1GG4GqmijGhbi3TAWXmTvxiEsE7dvKlfSP4=",
-   "pom": "sha256-p53QAvsDgYP/KGomNb4uaMEDuH4OZHF9jUS/0Bf9M+o="
-  },
-  "org/hamcrest#hamcrest-core/1.3": {
-   "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
-   "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
-  },
-  "org/hamcrest#hamcrest-parent/1.3": {
-   "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
-  },
-  "org/jdom#jdom2/2.0.6": {
-   "jar": "sha256-E0XxG6YG0VYD1nQFUajCGUfAIVZAdw7GcnH+eL6pfPU=",
-   "pom": "sha256-R7I6ef4za3QbgkNMbgSdaBZSVuQF51wQkh/XL6imXY0="
-  },
-  "org/jetbrains#annotations/13.0": {
-   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
-   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
-  },
-  "org/jetbrains#annotations/22.0.0": {
-   "pom": "sha256-pe8M4dxdO/1vYQD63AN3RVsc+wJRwsIX0yZqWkNYW7U="
-  },
-  "org/jetbrains#annotations/23.0.0": {
-   "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=",
-   "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw="
-  },
-  "org/jetbrains#annotations/26.0.1": {
-   "jar": "sha256-IDe+N4mA07qTM+l5VfOyzeOSqhJNBMpzzi7uZlcZkpc=",
-   "module": "sha256-x/njSbNN+LIRRw4imGJEnDzBPLweeMebKXo3Ryey5gU=",
-   "pom": "sha256-kEBuKDkHRCqz88ZftqO25RdILNb4Ywgep70sggENrFc="
-  },
-  "org/jetbrains/androidx/graphics#graphics-shapes/1.0.0-alpha03": {
-   "module": "sha256-6Q8fmUKy7j76WxfzVB5BKVZaQEmIAA2KM1fOYkXADQY=",
-   "pom": "sha256-IfsRREjUl71+KtFsG8xpYId4BzWlJTKW5b1sV1PQqLs="
-  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-common/2.8.4": {
-   "module": "sha256-o7yb3i/+/IFT1Sr8WAQms4rWV2yuE0a7jIPbzFBvAPQ=",
-   "pom": "sha256-BjXG8hQBtELWxoStOF6vEfzeJDv7dZbGk62+tZPwobM="
-  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-common/2.9.0-beta01": {
-   "module": "sha256-ZLmuzdwnt+qpRzolk2c1cBBXIl221XogCWuc/eAhlLU=",
-   "pom": "sha256-uBHnNujra8qzTsj56rfJ7y5OBRja+mYilPuwNXcciOs="
-  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.9.0-beta01": {
-   "jar": "sha256-Un+IWVJCklMxmsMPiwfrDB6xFhJxUB7hMz/9D63aSFE=",
-   "module": "sha256-GJbs9dXwXbm/8wBLirLq+eop3Qrq2mrs8068ocnWFtI=",
-   "pom": "sha256-ZmiocEG8g/WJusRxx80s4j8TL/lwv52WBAq6mQDzr4s="
-  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.9.0-beta01": {
-   "module": "sha256-jcpLfTCKtF4FOzjXWyuVHFXXnLrVy1Tnr4IFdJkonhU=",
-   "pom": "sha256-k8WMxAtltXEj6RRb8Us/qmxpUh6o4+GzWtXVKCvrPVk="
-  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.8.4": {
-   "module": "sha256-t/5oq5S4ncDF1wWltk3LDDyDpITimPNfA2x5cRZgHqQ=",
-   "pom": "sha256-DQ7wsV76yiXtdgT6FB0OjT+6iU0wl511DVBpZrZg0Dk="
-  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.9.0-beta01": {
-   "module": "sha256-cWwsA/MF++hhSDQ9JohKhimsBFyoIFN/0Z1YPCvzjQs=",
-   "pom": "sha256-fo5B0Yi/cBXNVb0JAe6dLsR/az7eAVivtzi9tqpdO2c="
-  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose-desktop/2.9.0-beta01": {
-   "jar": "sha256-vkeGqLdCblmyj1KvZPQ6diQpTVnLFYoM4t6DCxz5w2U=",
-   "module": "sha256-2bf33ULscIs0ipCZGIJiPPe/KtcdV1M9VD9Qy6z4Un4=",
-   "pom": "sha256-DAKhJosUOQC7IgGUe8TA+7IyhS0JWIibP85vNaiXLrA="
-  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose/2.9.0-beta01": {
-   "module": "sha256-yhsjvflcvr4hVzAqxK9OU82+C8GlBDrl4QDYKbBU4b4=",
-   "pom": "sha256-eBfT+NqhT4JXqMeIAvFVBjd0Cabo1NsnjQgXKvusjQ4="
-  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-savedstate/2.9.0-beta01": {
-   "module": "sha256-Ei5ZUR0skw5pCrgzu0jeiz91FuhtdXzpiWXOhzZQpos=",
-   "pom": "sha256-BTgUyvfv+6KNCy96AUXNUceYJunaXQt5vd+OQO7SG9I="
-  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.8.4": {
-   "module": "sha256-YdkxJsnivTyFp0+XrYFbxhi5A52bFIOz9OXp6Ayc+Bw=",
-   "pom": "sha256-7VnmgyoqJ4xsYcgDMqFxWJmewWE90Cvir6DZ/PMbvfY="
-  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.9.0-beta01": {
-   "module": "sha256-oM/i3heZ/iUMbO41knhWaBMeqoEuUGCsNhHnajXveSY=",
-   "pom": "sha256-lLcArsaFKLT/q+cNW1YprbF30z5jNz5GOnjYXLtxMK4="
-  },
-  "org/jetbrains/androidx/navigation#navigation-common-desktop/2.9.0-beta01": {
-   "jar": "sha256-M6NE+IJwz9Ytz+bRC5qJoANQZYbFMRPrYz1BjCTzw80=",
-   "module": "sha256-X+daTls+i55kOG0szFMtoI/J5FkL8P3JQdjKQ4URLQw=",
-   "pom": "sha256-iPweKXKC5wfVzv+1k7KA6rCojzoi2WZI+Dx+vunpJFE="
-  },
-  "org/jetbrains/androidx/navigation#navigation-common/2.9.0-beta01": {
-   "module": "sha256-JDoBviunsq1nl6VJkFcTz82ZNMCWbryalCA+giPGdz4=",
-   "pom": "sha256-WzOCSOVSKoWZhU5s6lXvz+TYjVQLTZJLEKpJSGJNj8E="
-  },
-  "org/jetbrains/androidx/navigation#navigation-compose-desktop/2.9.0-beta01": {
-   "jar": "sha256-5ZvQ507b/2dzjfBaL3kXVriiaQmnj1S4ZFtYzp5wJk8=",
-   "module": "sha256-+qRZvNZG42K7i46x5TU3Po2ITmHSP/BKkoO22YqmGPo=",
-   "pom": "sha256-eVmIq3RgJXNxZQmzZHe224A+qCBtcf/PyieLc39iwGI="
-  },
-  "org/jetbrains/androidx/navigation#navigation-compose/2.9.0-beta01": {
-   "module": "sha256-CkQSpwXQnd9xRDhKArbbkC+fci7Et9j/AH3UR1kfYbI=",
-   "pom": "sha256-RyQ9KSwd00rDTBrqeECqFiSRlOddqcr/7A59oTfv3zw="
-  },
-  "org/jetbrains/androidx/navigation#navigation-runtime-desktop/2.9.0-beta01": {
-   "jar": "sha256-GN5zqUv5TtVZjrvmJeB93vbOD9f71piowakS8hQGVDU=",
-   "module": "sha256-edcCcy0prYG8Zot21OSGBFuqGFkxFMfSw4FU2SImzoc=",
-   "pom": "sha256-BSpQlfGIeaiC+tUpphjqwEJEf5hyu/ZGfRQNZu+fiow="
-  },
-  "org/jetbrains/androidx/navigation#navigation-runtime/2.9.0-beta01": {
-   "module": "sha256-Z4Dp9626PvGI68qPOQptNVw9dXChFEm/X8QoX5JwCKc=",
-   "pom": "sha256-dupghtMADJIHyQjzNvNF24RXU3vFULTSLoAEGp7beg8="
-  },
-  "org/jetbrains/androidx/savedstate#savedstate-compose-desktop/1.3.0-beta01": {
-   "jar": "sha256-zd0rFznOPGXKigQft74f78XDnWvbNXy6Th4Jd7ZNHuE=",
-   "module": "sha256-kIPisn4nLZItcz1y0S8OMF5rOY4Rfet3xwV2NTUXfyE=",
-   "pom": "sha256-P5zq2UQ6VpFHvz/iLg3xBBk0kLCH/q3rymtr+OdG95g="
-  },
-  "org/jetbrains/androidx/savedstate#savedstate-compose/1.3.0-beta01": {
-   "module": "sha256-kZ23fpxTkmCqzRq4eOsOTfpxSjLsUInkzt9/IrG7TXg=",
-   "pom": "sha256-ypq0MP7e4nrSX1zhOv8UmAFpxeyTjqjPyE2ls8fU0m0="
-  },
-  "org/jetbrains/androidx/savedstate#savedstate/1.3.0-beta01": {
-   "module": "sha256-M9qSImBQ1pVYZUg9UskDPhkxqPe6NuUJBrOjLlT6cG8=",
-   "pom": "sha256-3Gkal5kYzQqtfztZhD5qDsZXHOG0CdvGkBxqs0gnQrI="
-  },
-  "org/jetbrains/androidx/window#window-core-desktop/1.4.0-alpha03": {
-   "jar": "sha256-TxK74lqFammMZ5aUQvQZcu3/qS0QfscnRSqs3FV1tg4=",
-   "module": "sha256-IN2SFn/GNnwrdFYj1igc/p2aGSXsHzstrN6TuCz+StY=",
-   "pom": "sha256-YwINNUMCxMPapZN9DQt35fOjuVTjkK72gnIpO7g0dic="
-  },
-  "org/jetbrains/androidx/window#window-core/1.4.0-alpha03": {
-   "module": "sha256-Uv5LQSghWM8m3ufAnN9Wd1i2IDoUk8gs6XTEM7VVdTQ=",
-   "pom": "sha256-KzAGtHCQliab2Q5wp683r5UmmqKs1YMeHG4mwsi+P8Y="
-  },
-  "org/jetbrains/compose#compose-gradle-plugin/1.8.0": {
-   "jar": "sha256-aSL7ZWSnNrgXACCREU6pe6qV1xt/cBySFn4ye7yKw80=",
-   "module": "sha256-LULcWegTIYH/ViDJeXjDz6gPSGnSWFbDwSOcHKZYKlI=",
-   "pom": "sha256-+N2AXpOZFg2IR76ZbTLqq/E3QHJH56C6BumhPnd9J8s="
-  },
-  "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.8.0": {
-   "jar": "sha256-rLxhCUpV2YYgKWT2/THl2BGAiy0hoQpg3Adklf7DHoY=",
-   "module": "sha256-4LIRGuHu7TDa8hjvh3JuAA5snMC8Pz5IOPOWplK0SwE=",
-   "pom": "sha256-dg/9F9wiphxCGeRGUN0ps8Fbs0CHb20XZJVhOaRHWbA="
-  },
-  "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.8.0": {
-   "pom": "sha256-x93pQCg2ArLRTHCEbLIVTQxyzwsHFWY/wzkqjM/h/BY="
-  },
-  "org/jetbrains/compose/animation#animation-core-desktop/1.7.1": {
-   "jar": "sha256-KzR6v2xIYmFToCtw7va74dPJUnUV1vn37OrqPDmFM7s=",
-   "module": "sha256-c7rYgJkZ/IbsKE5mCKv603DsBjPtbHWV9ptYNh9SAD8=",
-   "pom": "sha256-xqopawWzH+UZ3cIswgrd989vsdtV+anMYJ1TL/h/81w="
-  },
-  "org/jetbrains/compose/animation#animation-core-desktop/1.8.0": {
-   "jar": "sha256-2j8nJnMX+ofR1II8nBJXHsfkVDtPylQ+RTXgDQ159pY=",
-   "module": "sha256-hFifYJt6D2LfyxkTnDmBKEshWe0VAFP3LfM1lSDjVlY=",
-   "pom": "sha256-RchxHspESqUreP+bwhucfANFJlSMPQVlV5JxzfIF3JM="
-  },
-  "org/jetbrains/compose/animation#animation-core/1.7.1": {
-   "module": "sha256-v4u73LKXNY9tN9inJOif8+kLp+VkA26ZA5X3OwxEjMo=",
-   "pom": "sha256-VdE9LN1WVa+tasG8Ou5rMU2ILf6Nj/UVVmsHj4AuKbw="
-  },
-  "org/jetbrains/compose/animation#animation-core/1.8.0": {
-   "module": "sha256-wnbpIfCcOS/H5HKfAMsjkbWhHAikGqQyGjd+4HKfHGM=",
-   "pom": "sha256-cbxoH0utJETNmIRasmldO+0TossumHOz5dUkXxZpGWs="
-  },
-  "org/jetbrains/compose/animation#animation-desktop/1.7.1": {
-   "jar": "sha256-R05r0qasI2Ll2r14D5O4UnaGQKoWQDsPxQXaiBd/l7M=",
-   "module": "sha256-kw0qlickr+L6z9eYIQfYCmkGh4hHCl1VrcDZj3ijuwY=",
-   "pom": "sha256-j1SyEA/7lX0HPry7gxTwvEne5FWIH9eLvhKnBHnjFwU="
-  },
-  "org/jetbrains/compose/animation#animation-desktop/1.8.0": {
-   "jar": "sha256-d+pgLVlMokOK62MF5PMmZBBXHr2ATbw9ITD1kvVmLiQ=",
-   "module": "sha256-lxLKBCKOJdVu1mJViL2NC7BsOqwbl4kcZNZqrEMvq10=",
-   "pom": "sha256-IBL/4ngEVK5s++GbOhuhVUFtxQeQBxLrQl6C/QiQV/g="
-  },
-  "org/jetbrains/compose/animation#animation/1.7.1": {
-   "module": "sha256-leqNJuQAkoHcPo60WyBfj2ZrQmZmtRisSaapUwKiicM=",
-   "pom": "sha256-Q9zVYfPQZrMbAQsujbu8xvzr5dF61PBt1NR93+hF3SU="
-  },
-  "org/jetbrains/compose/animation#animation/1.8.0": {
-   "module": "sha256-nIi46Jjj4U/ezOhqAc++Yt+2kl4c9QfZS5gABy61ZhY=",
-   "pom": "sha256-bVTqkvkFLAPOI8hUuxgwQv2tGAfI9sfnPJaYpPXjs8E="
-  },
-  "org/jetbrains/compose/annotation-internal#annotation/1.7.1": {
-   "module": "sha256-OBY3qiWg10JF0HpLhxPDjcUBtU+yWvnWHdwzMR9AFhk=",
-   "pom": "sha256-exANVYBe1I3wrGACFGbx1YcGM0wXJ9DQhRrNt302Ptk="
-  },
-  "org/jetbrains/compose/annotation-internal#annotation/1.8.0": {
-   "module": "sha256-JVyVeH8E7aWagHjrCzbuD/vxTBOcqD9wLSfkV8tBp3Y=",
-   "pom": "sha256-gfC88mZWJitqfVKp9wf0iJICL88O489YW7XCx+HJ5Qs="
-  },
-  "org/jetbrains/compose/collection-internal#collection/1.8.0": {
-   "module": "sha256-ywOV+BE1yWpiJ7Tqvd3TZ1F+JXiu9F+7AOlRtFkToCs=",
-   "pom": "sha256-Cx4ZY/TpVLIx3/lNnvdpkUsDRcjPLZbQ3tOEMENlNWE="
-  },
-  "org/jetbrains/compose/components#components-resources-desktop/1.8.0": {
-   "jar": "sha256-yzw74W1057pEfF4MXve7piZKmkF47jw3L486T/cIbPo=",
-   "module": "sha256-HZLCYddlCxManhDnWdHvFKg0P9qaiO86I7TeuHHHHM0=",
-   "pom": "sha256-dhsFXT1M9jqDqB9+rswsjz3qJJzBJ5Khzi544XaAb+g="
-  },
-  "org/jetbrains/compose/components#components-resources/1.8.0": {
-   "module": "sha256-z2Znv/bNeF/ih9cNRhCFrP5GLDVbi3ght4NYOlnKIM8=",
-   "pom": "sha256-AjY8sK/YwwTYkbCYiWhIpGXjxu/JGSbdrU6gJ45Lgrk="
-  },
-  "org/jetbrains/compose/components#components-ui-tooling-preview-desktop/1.8.0": {
-   "jar": "sha256-AgAr0hEQXk6BQOfXeonP6SGBToYuj314vM/ej+Gyl9A=",
-   "module": "sha256-vksrZ9lzXKJFvB1F+0N/jgvvIaf5OlD5/RLn7xM88tc=",
-   "pom": "sha256-iMEszobdK8hdFv0zIMzMIUJ1xjSN72yFabOjHCrtnl4="
-  },
-  "org/jetbrains/compose/components#components-ui-tooling-preview/1.8.0": {
-   "module": "sha256-vl8m7Z2We4Iw/WkBUIIiUfWiEA4jDMnBIJTlyyEEZXI=",
-   "pom": "sha256-g0jJHAR0fsxpJXxAcqCjUJTDBW7oQ+nWOTG2spghkXw="
-  },
-  "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.8.0": {
-   "pom": "sha256-EMmZuRJK6U9YNfb3cygd0h2PCbywt2mMjX7dn1B5CLs="
-  },
-  "org/jetbrains/compose/desktop#desktop-jvm/1.8.0": {
-   "jar": "sha256-Wm8xHTJrwA6Tvgr79cp7lZCzSDeOc7whAzRlZPSAc48=",
-   "module": "sha256-CtP/+k+q2WVEHOCsUonmBq0FKbjfgJFic72NjgvaQUk=",
-   "pom": "sha256-jpo8rUlmfB4gGXKtjTSkTUV0LWIxTAVctQjsffpGiH8="
-  },
-  "org/jetbrains/compose/desktop#desktop/1.8.0": {
-   "module": "sha256-yzAkUD1V7sJb9YUnIRq9Cv4weMjOs+0ygDdr/3vjERk=",
-   "pom": "sha256-6y0XbrT2FJJjy85gfdj5W9Q0Td2eUElILcqzz3sUiJI="
-  },
-  "org/jetbrains/compose/foundation#foundation-desktop/1.7.1": {
-   "jar": "sha256-UN84WzKKCtekeeaQz+WT+84IrTntV5FnR5MpVt7gfws=",
-   "module": "sha256-e0RnxpVJc6cG2nTOLI7Te4RlXSxSGWWXHWgCb5iBTJI=",
-   "pom": "sha256-aAvQ++JHgzK+3kUTK1VmVNpsK063CPiqVp0bvV3AZ9A="
-  },
-  "org/jetbrains/compose/foundation#foundation-desktop/1.8.0": {
-   "jar": "sha256-+J3Onwy/VBxH3dYWzDIpNR4GNMYFUbZSv+m5I0xNfJw=",
-   "module": "sha256-bD/+rRaCdURwqxjq4sObxR1yTtS+QF5u6a4hz844Ds8=",
-   "pom": "sha256-eSZSXsbAjXxqgEFi0fwnSsUySVd8/3wrjjKs3EfCeUE="
-  },
-  "org/jetbrains/compose/foundation#foundation-layout-desktop/1.7.1": {
-   "jar": "sha256-0shnwT/2Yy+YgOZ9q6sukwAHsAi5silQ/CzAdQCOzrY=",
-   "module": "sha256-aeRUgNLR3M8Hdzyq5gwdkvTu9PxF3K7luOg2KFlzsBc=",
-   "pom": "sha256-G8KiSCB1lID95NL6BswigNBCOpXAohpoUdjOfoaxnN4="
-  },
-  "org/jetbrains/compose/foundation#foundation-layout-desktop/1.8.0": {
-   "jar": "sha256-Cb8kfmXy0+KuMJB6AdRtyRqKahQS0aXrYQlYE876Q9Q=",
-   "module": "sha256-e/WLBp5H0rT8HF5jQP+/B6xv49JpsfDMfZZgglgtAsk=",
-   "pom": "sha256-VbDLQsqY32XlYQw3NXM0Ril7rKaoURtsJzI4AD/t/xk="
-  },
-  "org/jetbrains/compose/foundation#foundation-layout/1.7.1": {
-   "module": "sha256-U7+p+nvaWJ4NsTtyjjpWFPKMLJ5fvw8I862PKxT1hNE=",
-   "pom": "sha256-9+spSlpczBUbO2H9ot/tBcOpmErsNK3xp1VUS/2BN6s="
-  },
-  "org/jetbrains/compose/foundation#foundation-layout/1.8.0": {
-   "module": "sha256-kZ2+V0N3+oPDT+EarskULhuFLkvKSKGUgo45RHSE+U4=",
-   "pom": "sha256-TIKvGCN5+0QxtdSGXwBGCAW2UKZ5mASgGWJxAWWME20="
-  },
-  "org/jetbrains/compose/foundation#foundation/1.7.1": {
-   "module": "sha256-TudcyFcJEkmZZlCgo+Ag0MOoaHZtnB5ZdqySFMioscI=",
-   "pom": "sha256-js5Yc65fY4YFqEdPVZITMFGSkOcohMk6yJXSIN7/34Y="
-  },
-  "org/jetbrains/compose/foundation#foundation/1.8.0": {
-   "module": "sha256-oB7rvq5HQlt2qf87ag6zygwXijA/BbnTQ0Vf3L0TWMs=",
-   "pom": "sha256-eUpLO7pJFPEzY+j0dJRoV3Va4PHJg7ctweuu5y0pyeo="
-  },
-  "org/jetbrains/compose/hot-reload#runtime-api-jvm/1.0.0-alpha05": {
-   "jar": "sha256-+2p7PMWZNC8rUApqQ17M8vue1B2pcsfUgCzbSn4DFGI=",
-   "module": "sha256-XphVM5YuX4vKHnPq7LRw2S0LyC08/H9RydVNB8foCmc=",
-   "pom": "sha256-6mjs2xBA1jFGN8MN7iTkMqMHcLoDNh9IAIw6AB+ytOs="
-  },
-  "org/jetbrains/compose/hot-reload#runtime-api/1.0.0-alpha05": {
-   "module": "sha256-VpDI/Ph2E+SAxgPr7QMKRGlUzS3K+9dk9zE1u+eP8DM=",
-   "pom": "sha256-7dli33dNo1SH/dpP7yi7G1gQj4eeQwpMFQ+oWA4xgqE="
-  },
-  "org/jetbrains/compose/hot-reload#runtime-jvm/1.0.0-alpha05": {
-   "jar": "sha256-238TALVeJgQ639D38TzROTpKqD3twn6kw6AJRiGUriw=",
-   "module": "sha256-LBG1MeaMgYj7+H0QTIumK3trdF5wPNaCvqLcdiG8YXg=",
-   "pom": "sha256-Qx1LGtWuX0mxy0TAYzZR6WmPpzDjcKR/iziowomZt1Q="
-  },
-  "org/jetbrains/compose/material#material-desktop/1.8.0": {
-   "jar": "sha256-ktEOLNLJUFGKUWVSWH0ri+cDBrP724Sa8ajhCppAhiA=",
-   "module": "sha256-vgNb8TfUbWNZ9WplSP/x0ILkpzEd5uuN0zKFkqi/Rqs=",
-   "pom": "sha256-wU1/lp3yeY5RGillUC1TwUI44EI6+womYfiAOheMCDk="
-  },
-  "org/jetbrains/compose/material#material-icons-core-desktop/1.7.1": {
-   "jar": "sha256-vPbIU7bbL/FI0tOq07en6lTZP8e0Lgr9hA622vGhxoE=",
-   "module": "sha256-dpqLgvJ7j5oIElPV7o/UittRBgrNnC6HsozvYMG28kQ=",
-   "pom": "sha256-AzQzIbHALCbkTVxBLTW1r1hIapEJ/YiUheHWf6+cdIc="
-  },
-  "org/jetbrains/compose/material#material-icons-core-desktop/1.7.3": {
-   "jar": "sha256-vPbIU7bbL/FI0tOq07en6lTZP8e0Lgr9hA622vGhxoE=",
-   "module": "sha256-e0EAWgTkVmrpU/c4diAmlt7sVBJ+ATzce8P7c0ZwNOM=",
-   "pom": "sha256-KPX/59+P3dmEwytjUP1xGPxkcPinV2ocaS8zZq72QKY="
-  },
-  "org/jetbrains/compose/material#material-icons-core/1.6.11": {
-   "module": "sha256-VcHqxOfrTOt14Cav0FTk+LgZBVPgJ2zuvR/HdXisYcE=",
-   "pom": "sha256-964wavWzWSCtqddmkygHpwQ7vFLBD8DBVp+BohfGoV0="
-  },
-  "org/jetbrains/compose/material#material-icons-core/1.7.1": {
-   "module": "sha256-B5vF4xG7NUubyRRi8TaEinU/3LQaox8NqNsYl657rOE=",
-   "pom": "sha256-4Y+gqZINr+qVp9YsZKGcgSLS1Bo9+JitPVSsMds9aqg="
-  },
-  "org/jetbrains/compose/material#material-icons-core/1.7.3": {
-   "module": "sha256-bzMObQpiopITWjDBxT6lGWrXrrBIZ5r2Hk/JKmYukHY=",
-   "pom": "sha256-wDviSkFlDR3YN/+tAA7Mf8y+y2EAoOj0gDmEcMQqhGo="
-  },
-  "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.1": {
-   "jar": "sha256-3FXTg9yoJ541ORflxak9GSqV58pPkm7lXuC0Yn+Z2GA=",
-   "module": "sha256-ysKEishpAGbgJfbrPNMsDWqjBVLL8KTedb6NFo7TGY0=",
-   "pom": "sha256-Oncw3anS5QyIDaNSeoXSu/UZTjl52gtZakxq4BUWxCY="
-  },
-  "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.3": {
-   "jar": "sha256-3FXTg9yoJ541ORflxak9GSqV58pPkm7lXuC0Yn+Z2GA=",
-   "module": "sha256-PYIoDQjwjMPjN58f/jiHBUovuDfknStj1JIumjf6ecU=",
-   "pom": "sha256-cD/QmE10zp88WXPXTsyyxD26VBml9VT91Ux0URHkfzY="
-  },
-  "org/jetbrains/compose/material#material-icons-extended/1.7.1": {
-   "module": "sha256-3kM5Kc+XUZJrJ72xEbkNs2X4ZWozURLx0Tn5+sU+vyg=",
-   "pom": "sha256-fBBibxuyLO7dQpV6fheDlD4uYEIfWUTOJrnNCq6wYBg="
-  },
-  "org/jetbrains/compose/material#material-icons-extended/1.7.3": {
-   "module": "sha256-sfqa12veAdmGn5uwxxKc0rByeU8jfgTRXj73yKZqSHI=",
-   "pom": "sha256-3NyiJy7t6vlAZmO5s4zMl8cXnoWqHKeJMuxhIuVZlYw="
-  },
-  "org/jetbrains/compose/material#material-ripple-desktop/1.7.1": {
-   "jar": "sha256-xfa9+yKaF5SoOO0fMfcpmjtRYAS+/+GovMp1OqJovgk=",
-   "module": "sha256-476a8k7pZ20fYnKKt4BhaTS0Rqe4Z9wVVKqBaGpQE8g=",
-   "pom": "sha256-J3joa5k5b8ZfhR1C/BJ5Ku0hWYw4i8PCFlAIpRlOpfU="
-  },
-  "org/jetbrains/compose/material#material-ripple-desktop/1.8.0": {
-   "jar": "sha256-VRZAECR5rIOkGqSp6X2aMtbS9G5xvXvBG9VdIZVNqv0=",
-   "module": "sha256-Q2Cggw5aZXar80BtGFiHL/lUAZOMKiCKuX5jXGYz5qs=",
-   "pom": "sha256-WMcEcfjk/p863JAHkHaT5ahQpjSZ/Df6Y1d/J5FurAE="
-  },
-  "org/jetbrains/compose/material#material-ripple-desktop/1.8.0-alpha03": {
-   "jar": "sha256-vW+Je+w5CQLiVd0+HXLXY5jV6C3r1PDAbDCltfCsSVU=",
-   "module": "sha256-EtHZWUpaT43b+JNnLr0UNH+46uVvUsDso09uxw205gM=",
-   "pom": "sha256-0bQRtiT+S+VGZx57wM/MON424kPVd6XK7jGg5DhVDp4="
-  },
-  "org/jetbrains/compose/material#material-ripple/1.7.1": {
-   "module": "sha256-0a8hV2+VfuVB6qCEckE116Sr0nNXTBJFUpWsXCFntBU=",
-   "pom": "sha256-8WQUEqPikyViaWeNGM41NQFS1fRNm4S0Dl64W/TvSdA="
-  },
-  "org/jetbrains/compose/material#material-ripple/1.8.0": {
-   "module": "sha256-93ghI7Ew1ukpYGyR9PQjJjCo37cAn8FKR0rv4msrllk=",
-   "pom": "sha256-9DNlRyFU6GzD6NwoPycABB1BFQdC1NS2euHTfvniC0Q="
-  },
-  "org/jetbrains/compose/material#material-ripple/1.8.0-alpha03": {
-   "module": "sha256-RsSmhJ+KpLqDYBhJAqEx9A6kNmzAa/7eHwLOozoq88I=",
-   "pom": "sha256-dfywyKynZatgupUyaZC2o3BaMTs7JMefGvPEGfsLAjg="
-  },
-  "org/jetbrains/compose/material#material/1.8.0": {
-   "module": "sha256-lnnDZXWONebllUyL0aHBmyjiHdOOWzkjdEFwyAGFVx8=",
-   "pom": "sha256-Ux86K/vY/Xr39bzXF+vLxaIT8XFPefcpm667fjg0d2M="
-  },
-  "org/jetbrains/compose/material3#material3-adaptive-navigation-suite-desktop/1.8.0": {
-   "jar": "sha256-E1debVxaFkCwB301AFZ5aB0BfypHFgaLCwMTjqWfWwI=",
-   "module": "sha256-L80XCd220VjiaqC0ggndmjeX0DYrQyrCj+oOV8HPTbM=",
-   "pom": "sha256-h+LOAWqiS/f6FP5Tyicy9PQnBmofe4LzLmrnDMUZOno="
-  },
-  "org/jetbrains/compose/material3#material3-adaptive-navigation-suite/1.8.0": {
-   "module": "sha256-mTzhPkO51y5NLorojIrnN4ZR1z105kvWSY6cPaR+hNM=",
-   "pom": "sha256-8MfR4F0vSIhNeMU5SLjy9dkmQq4ObBkSIpBosI2X5i4="
-  },
-  "org/jetbrains/compose/material3#material3-desktop/1.7.1": {
-   "jar": "sha256-dkJDTX15vxSIby8NFzngouRCjv+opp5XyCsVQMGazhI=",
-   "module": "sha256-D7pIndXI/3UzMZZyGeKsH4smH3OQSr2MbxPS8la0yR4=",
-   "pom": "sha256-arivxNupMK+rpxWYkiOWE6LFoXelWo4oWCEn6Nv1mGk="
-  },
-  "org/jetbrains/compose/material3#material3-desktop/1.8.0-alpha03": {
-   "jar": "sha256-JURxLAyB9oXJh91EBvN4VambiTVbXP2R+c9V15F94Vc=",
-   "module": "sha256-fLSR87OVtlX5bqGfSRT6nQJV4aeIE9xXmCUx0a8O0Is=",
-   "pom": "sha256-Gs17XElZ84eFPvucYiPDkD66znWSRH55vnwKqkNV9K0="
-  },
-  "org/jetbrains/compose/material3#material3/1.7.1": {
-   "module": "sha256-qvFQNGGrB7ehjYXFXdQEaSsRKu3l1XgOwYyDsPYNXUQ=",
-   "pom": "sha256-7I2Sz9gexvi8u5VGZiuphrZ5x1EwUjkCI4x1IVFfOBw="
-  },
-  "org/jetbrains/compose/material3#material3/1.8.0-alpha03": {
-   "module": "sha256-/AykMQ/v1zUjdyjas194djHfq2fW59SyJ5Ti5ngAb8o=",
-   "pom": "sha256-mkJqqoq807D8Ab0Gn5jBGs5Dzu5T3W6zmKaBmGccqIE="
-  },
-  "org/jetbrains/compose/material3/adaptive#adaptive-desktop/1.1.0": {
-   "jar": "sha256-w31A75QUyqau5AfIrhE19yd2Riy4Y/rbfH40I3TBhos=",
-   "module": "sha256-b4LGOwHi8DxcPlW+Xe3U2g+RlalRUgf3XxYAjJMcSrU=",
-   "pom": "sha256-Q/Vsgi+P9KzlfabIifsVs3Ng3RbIIDmAuYUNQaw/iZ4="
-  },
-  "org/jetbrains/compose/material3/adaptive#adaptive-layout-desktop/1.1.0": {
-   "jar": "sha256-2Jmnz9e72H6V1lFB4L9n379S3pyI4jvbUclfLB3biQE=",
-   "module": "sha256-vONgsyh5BqiR81rgp2xQtnnWjqIT0AnXeY89khLhix4=",
-   "pom": "sha256-PwnsftztMVa/DXluTMLV4yZfUoGwLq33wIi6M517rl4="
-  },
-  "org/jetbrains/compose/material3/adaptive#adaptive-layout/1.1.0": {
-   "module": "sha256-iFYuJcWE5Ep7aPuITuJqhrsS+6uFLYJlllHtCMxScCU=",
-   "pom": "sha256-8k0eRAFpo1g8lRA6wj5KgJDcgIAG54W9TK/RukHwoks="
-  },
-  "org/jetbrains/compose/material3/adaptive#adaptive-navigation-desktop/1.1.0": {
-   "jar": "sha256-dGQ1hMjmRRByar4g4eOI6cK7A5vKgZR049OOvtknOAc=",
-   "module": "sha256-AVQBfw7P+gpKjttiF6EMq8LxKgUULcHf+OvX0AfxbYo=",
-   "pom": "sha256-S5xXPuHSaln7nchmXGBrFZl8I4UUWvdm5EEYPfUDfsk="
-  },
-  "org/jetbrains/compose/material3/adaptive#adaptive-navigation/1.1.0": {
-   "module": "sha256-aGVHRihDaRF9EP2xVJFmQfLNHLFT2x8mqMt4yYFkcMQ=",
-   "pom": "sha256-AXEI1KstsiW6SkRRZqSEVn5Wx3J2DaBe3pNMnEuM+eU="
-  },
-  "org/jetbrains/compose/material3/adaptive#adaptive/1.1.0": {
-   "module": "sha256-p0sWSpGXOY3qeSeA8+pse06Q5ndNsToGsjVDCGRL+Bw=",
-   "pom": "sha256-oK00sMpKpxquGVgSUj0azKnJZ8geY7QLTdarvUAOU2s="
-  },
-  "org/jetbrains/compose/runtime#runtime-desktop/1.7.1": {
-   "jar": "sha256-duMlBUe5yjyxpJwnKTOyXLO8y8m6Endd1hYaY9mqfPE=",
-   "module": "sha256-My6v5fATPpwP8mn+rhAMeJX+IkYo0FUZRYgfzKBhFsE=",
-   "pom": "sha256-01d42i+5MOce1u1rym8//gdcZOF24fuB1mMH1HHEseU="
-  },
-  "org/jetbrains/compose/runtime#runtime-desktop/1.8.0": {
-   "jar": "sha256-koj4pOb5UWioNkj+cn8y266w74BtGDAm3KhTcljlZeg=",
-   "module": "sha256-RZddB+4Yr6W6JcbK8tAEL2i6DSoKUOKzpxSv72vI42A=",
-   "pom": "sha256-FFtNhLs7RXpNuAjHr/vwkP8m0ZPlXt0j4YCtUo49knQ="
-  },
-  "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.7.1": {
-   "jar": "sha256-QwY2O+kOqr50uQDbTDLtHxXHVI5bMKcJPE7kDENrm4w=",
-   "module": "sha256-lbODl+J/sf4du5MfHL5qCZZReoWTQzLNRLT7OQ+PXLk=",
-   "pom": "sha256-YPjvLYLG1V2/Pn4LqLb41II06TEMpm8d+b9voLHoyLw="
-  },
-  "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.8.0": {
-   "jar": "sha256-IR6bMX3jLuu70pPqhkjbEKVYafc74lj+WfX704u2X1o=",
-   "module": "sha256-JxvoF9OJol4mLqc3zFuZroKN8uf7bvrmZxEcF++lSxs=",
-   "pom": "sha256-Punve01+HfuOWQesPyhjbGjMhLfBX+bpK2jOeCgGIkI="
-  },
-  "org/jetbrains/compose/runtime#runtime-saveable/1.7.1": {
-   "module": "sha256-yDUM3lAXvSoW+gL6d/sNpV0RcUyDqhGGy6NWcmrjq20=",
-   "pom": "sha256-to73YWrUYT9AYAPPCia71isXBq6XZ3uhM60QN9YGiyM="
-  },
-  "org/jetbrains/compose/runtime#runtime-saveable/1.8.0": {
-   "module": "sha256-2bJV+Fu0qqWkqjhLznkN9XtOF+0vFDvPdUXN1icYajY=",
-   "pom": "sha256-FjOQ5pFgMv/ZLkGszznBvYIje+lc6e3SjYsrdoQVbrk="
-  },
-  "org/jetbrains/compose/runtime#runtime/1.7.1": {
-   "module": "sha256-xSKUczzpqMZYOfVWCw4APbgWK37T2MqN6b+mLPAzTk8=",
-   "pom": "sha256-SBR/02A24kzaP9JYsYNJVAMA8ipOHXTeA9hWpMEakm4="
-  },
-  "org/jetbrains/compose/runtime#runtime/1.8.0": {
-   "module": "sha256-OwaEIcIxC6e2I6AMXWwsn6jWVjmouhclvy6+BF4ugVE=",
-   "pom": "sha256-ty8WUzuta+9sJutSksxGTvuUPZPfQJpQU/EzFcwHvIA="
-  },
-  "org/jetbrains/compose/ui#ui-backhandler-desktop/1.8.0": {
-   "jar": "sha256-4rwc2e7jbHLYv+ko7TKWA+957AAKoTaIjvfNgAgWkqY=",
-   "module": "sha256-kJ8mS4FdZ8nm853dTOLcg5Ua+J8Dmu6Z3y1Iok8BjII=",
-   "pom": "sha256-3lSMlllWFP4ekOG1dbxRPnAk5y+6RCa/tgq8w3p/2qc="
-  },
-  "org/jetbrains/compose/ui#ui-backhandler/1.8.0": {
-   "module": "sha256-6i80cJJiHuklI1d3SVgcgErTHT6l3mv6w8+ox30y5uQ=",
-   "pom": "sha256-rlpGWdjbdTYdf2vNIDUd/KpMmFfETp9In86lfIHEKno="
-  },
-  "org/jetbrains/compose/ui#ui-desktop/1.7.1": {
-   "jar": "sha256-QHKbljfqyR/Zup0QxM0usyi7MRb4CXpbnT8HGXHOoCI=",
-   "module": "sha256-pCdx2/0i3G4BxGwkWo4ZU0YwV7/tm2xzefgmcdxE/FQ=",
-   "pom": "sha256-/ZOsNR7uXLtUTfcLf3D+y1RhR2CW1uJG1gNklcXRiWE="
-  },
-  "org/jetbrains/compose/ui#ui-desktop/1.8.0": {
-   "jar": "sha256-BFJFqgdPrz++lWPEVXHDiVaXT0yckhPSkBBSUcRUQwM=",
-   "module": "sha256-DbXEiqaZF1Z9XElTPwAjaQt3oF/fUC+DBUd2VS/ZJv8=",
-   "pom": "sha256-VjAlgYpJZ/2Lg7kkiF1MJndmBH8oz+Ev+LH7ymCiF0s="
-  },
-  "org/jetbrains/compose/ui#ui-geometry-desktop/1.7.1": {
-   "jar": "sha256-S4bJYcC0vOeZUyn9V9Qznt4Ry3XX7JC8G5kTOWrdsw8=",
-   "module": "sha256-rxTJcKcEtuCHAB9jnE1r7dvuad5+FXKlunNjGV5e2+I=",
-   "pom": "sha256-3iEzIvQwizn+X73RZMCg+ApylT0E/AozXNqjsygGS84="
-  },
-  "org/jetbrains/compose/ui#ui-geometry-desktop/1.8.0": {
-   "jar": "sha256-Wq+LeL7W5Wt07okxcszi4xaBO2HYoizdwFh6Unxcqic=",
-   "module": "sha256-R371HP2IozSYUcQiJx+WEP5kJJBs+GOe37OC5sTkgE4=",
-   "pom": "sha256-Oe5obv6MiqCGsK4HnThWaE+EUNnDO6YyCZhUgdNhYdw="
-  },
-  "org/jetbrains/compose/ui#ui-geometry/1.7.1": {
-   "module": "sha256-mkt+df1LWaMy2SRUTWUB9eDaVbIDwsxhs4fg14yTXJU=",
-   "pom": "sha256-93UQwBXgPlnocFWPdBdPZSRo9vhJOJaKxTjBKiGO3I8="
-  },
-  "org/jetbrains/compose/ui#ui-geometry/1.8.0": {
-   "module": "sha256-rR9Lou1GECrXXF94pe1Ku+oPXVI5Xb3dtkxaHGJ9EEI=",
-   "pom": "sha256-qhofotjSE0Y9Yr5tlomTV/N5ZPwYCIoZVtShaCc2VPY="
-  },
-  "org/jetbrains/compose/ui#ui-graphics-desktop/1.7.1": {
-   "jar": "sha256-kQnXfMJi+QQIFpscoLotFRNbYDTjd6gLvz7AI0lU6FI=",
-   "module": "sha256-DPP8FuwoupMp0UfnR54Rmyvbjr+lLyMn4yDlGQEUapE=",
-   "pom": "sha256-cIA44a4DMFFG1A/NcUNHlHGQ/yd8ZpysiH836iQ/M+Y="
-  },
-  "org/jetbrains/compose/ui#ui-graphics-desktop/1.8.0": {
-   "jar": "sha256-sxoU+OAbhlO/N3iKkwCM04/9bYcZIVBj6mGmWm/Zdr8=",
-   "module": "sha256-vjPfV/XWmU5uqTauUdC3ChQyC0MUKs4dW5BJnAWtNNM=",
-   "pom": "sha256-Vew5To2ooD7esv2QvNPp7MpFFHGo96vI73yooXVGStI="
-  },
-  "org/jetbrains/compose/ui#ui-graphics/1.7.1": {
-   "module": "sha256-Bpgc3L5OyqzDVxnptAOykEHl54Rps8L1zcfMUHX8DXs=",
-   "pom": "sha256-Sj2MCO2FYVWHeAGrzgWU3BxpiOVq7H0kSsfGwxpqX9I="
-  },
-  "org/jetbrains/compose/ui#ui-graphics/1.8.0": {
-   "module": "sha256-txgPMy3enTXaqmW+iY/B/YNvQ6lTRqaPGmJQsBOu778=",
-   "pom": "sha256-/DNzmQiWbbCBLQvUSP15u/b2mmGVQSyZ6RDVSArDPhI="
-  },
-  "org/jetbrains/compose/ui#ui-test-desktop/1.8.0": {
-   "jar": "sha256-CdthtR9ovXwtxZbdCe2+vfnxPoBRe+oANG+qJ5hkg+0=",
-   "module": "sha256-hMtcU01/ex171Jp8gFH+Tv0caBB5T2bI7uCRtz3AS40=",
-   "pom": "sha256-gaZC9Wi3tlhi78zSnROwCbd73/JE/QyeRc0NaP5XXfU="
-  },
-  "org/jetbrains/compose/ui#ui-test-junit4-desktop/1.8.0": {
-   "jar": "sha256-8n2pyADiUb+hnaqSCmim1ZUa/Hr7aSBKMG2WdYv17Lc=",
-   "module": "sha256-ka3xlCSSb82/+xwq5oL2Tpr4WYviLEJmNKuhzZXF3YU=",
-   "pom": "sha256-Y+vNJMaYGvzVh81zOv79gMGhbuiaN16Rz/y0r5nk5d0="
-  },
-  "org/jetbrains/compose/ui#ui-test-junit4/1.8.0": {
-   "module": "sha256-GZTUW/XSGzpwNKvHkCL6qoVS7I9VbEz4PQoYemo+PhU=",
-   "pom": "sha256-G5cVUGdWqK+IrBZHxBuDo2YeAPVzbylwjZqZO5aO/Gs="
-  },
-  "org/jetbrains/compose/ui#ui-test/1.8.0": {
-   "module": "sha256-7dc+BTZZj9I8Uv/iYVqwuJ91K3mnnMQi3HJf4ymnP2w=",
-   "pom": "sha256-JJEExV3asWlR8qj4W1Ja9RZrYyrgCdt438gU+Nr/g6U="
-  },
-  "org/jetbrains/compose/ui#ui-text-desktop/1.7.1": {
-   "jar": "sha256-gOB+TKc597YSL2PpoX5oU7lHIg7LEYD43K9BnQ5GiZY=",
-   "module": "sha256-PR7CKTU76v2v0awhS/VEkPv2nojwZ7/LgBaB07K2bqU=",
-   "pom": "sha256-UiwW5ZbJMrHloPPN+xqTRADodlj42JjBzery0Bgphoo="
-  },
-  "org/jetbrains/compose/ui#ui-text-desktop/1.8.0": {
-   "jar": "sha256-W2TgVApMqu6zwTXV0T9B/s0v9DxB6QN07UIv74q9kp0=",
-   "module": "sha256-2JZjyhzb2wsiONN6VPSYSe2owLPPWub2PkCzCKeX324=",
-   "pom": "sha256-RD7cJpDXb1YgkUzPFmJvoQIjPlRzUBWoiDG4ADfT7qc="
-  },
-  "org/jetbrains/compose/ui#ui-text/1.7.1": {
-   "module": "sha256-nYij0rkMF+a4Hs///a6dfEzsVMfWVXWYJbpJZ90vyGM=",
-   "pom": "sha256-huwdGGauW1x/4AUsJqB/8aphkz9Vf41PuePda2L8Jb4="
-  },
-  "org/jetbrains/compose/ui#ui-text/1.8.0": {
-   "module": "sha256-u6ko+CsxtaQ/HJr7/67JcHYLC8459K/YKKGgIsWuIC8=",
-   "pom": "sha256-A84HC7srEsZveTlCWXR20E9p97CxVAls46EA7NzUiMk="
-  },
-  "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.8.0": {
-   "jar": "sha256-eohirZEZhP91HQSZwyI+agxxqCG8t1qZ9mlk7tqmfXg=",
-   "module": "sha256-N/3cLF26/SPzQTUGICee0H8VNd6AGnm3D9geU3rpxMY=",
-   "pom": "sha256-Dms0B4lXGS+pNYcHbbpSTGu2Q2xgxKmg8iB/fM1PR30="
-  },
-  "org/jetbrains/compose/ui#ui-tooling-preview/1.8.0": {
-   "module": "sha256-QliJHsyIWeC8fSdh6lDAx5Ol2Vp1JskthlDsa0/cCZk=",
-   "pom": "sha256-I0sBM8CU3DoL9htZcy3igJ+0gyJEiQlROexuDpzhMZw="
-  },
-  "org/jetbrains/compose/ui#ui-unit-desktop/1.7.1": {
-   "jar": "sha256-WYtS4lftZ0FFaUuXkKc4OpD+0uxxVLoJrOSqmDxlsaI=",
-   "module": "sha256-BacNXRO5Fhrn9YUkbrk97ly6K1XD8Ilf1mRekKPCPaU=",
-   "pom": "sha256-9R34TA7eKtHgHgf6R+9tSLoSy3ShfoXK6Nblz/Kc0Fk="
-  },
-  "org/jetbrains/compose/ui#ui-unit-desktop/1.8.0": {
-   "jar": "sha256-KW0j3qp4tQjPldFM9b2lik861bQthfzIvs9uEv+9A34=",
-   "module": "sha256-qj02WHAtKOOYudU/JN1K9XD7JN4ZY9YTSaOC3Bo08vA=",
-   "pom": "sha256-3OLKuYaq6wf0VaTKVzPnP3UWntEuJwee+4x/IJyMyUo="
-  },
-  "org/jetbrains/compose/ui#ui-unit/1.7.1": {
-   "module": "sha256-kDxEm48iI7uggivMWUuZLiqCv6rlwE/FCNKNq4hxfaA=",
-   "pom": "sha256-tq8XC59ySXOr8jPPEJFoqJIGqbFF1whpFbxlQOpdaHI="
-  },
-  "org/jetbrains/compose/ui#ui-unit/1.8.0": {
-   "module": "sha256-cZYqeI5O/64E6eZjz5kgHps6sm1iUPdPB17qaE7ClgY=",
-   "pom": "sha256-qK28UifDne3Sphw2x/iMLJuWVpMV+J69TzxRvr9TLEE="
-  },
-  "org/jetbrains/compose/ui#ui-util-desktop/1.7.1": {
-   "jar": "sha256-Fh3Mc7kp2mHO5QBF6W+wLxYzw28You84tcLETDhga1I=",
-   "module": "sha256-35JU30uqHS7Q+ctR/BxgrUlqNqzEiYEUPF1PqHRpEXs=",
-   "pom": "sha256-AeJZ6hTRKWyvCAmzP5dAcXRDNJvrCJ7ketEOaEBYDvQ="
-  },
-  "org/jetbrains/compose/ui#ui-util-desktop/1.8.0": {
-   "jar": "sha256-47HEObTqgChb6Q6u2OcFZDf2cc+v5LGKOpy1OHyAvko=",
-   "module": "sha256-kUQZhBnePBaJUtO2bhxzGjA/E0Eo/8kmz2VkfVbDYaQ=",
-   "pom": "sha256-FsnlfquLuBCBR4vcwhar80saQF2+cPmhVHkX0SILkYU="
-  },
-  "org/jetbrains/compose/ui#ui-util/1.7.1": {
-   "module": "sha256-razSdpfzafjF00aNb8ZySDHTP95e+5tvg9hdw6AXCw8=",
-   "pom": "sha256-7bcYbOSnYd3l8xMC3BRdWLw7/j5OT7x4YiiCP4zVSMw="
-  },
-  "org/jetbrains/compose/ui#ui-util/1.8.0": {
-   "module": "sha256-tfE3oBS4Z0aULDoy56i5BdXsXwWXw8Bq69YrIoJ6U6w=",
-   "pom": "sha256-v9ly8eQXV6lfYS9lAxCvJAicu3Uz2X0RlGG/TTdhEhE="
-  },
-  "org/jetbrains/compose/ui#ui/1.7.1": {
-   "module": "sha256-LpKRDBxZrLBjrmhWz5VWwlH9qMCtRsg6Tka/flenza4=",
-   "pom": "sha256-RWT33DQr7tal9G+RaxkLMe0rEgcK/ZfXXmNjSkQt9lc="
-  },
-  "org/jetbrains/compose/ui#ui/1.8.0": {
-   "module": "sha256-FOM6PYxigEyzFHWZ7gpjSmTA9xsN7i4hRUm+j9eCk0U=",
-   "pom": "sha256-pkQCj9i//MRRv+3nDZDPZhTFVIVvaKjiQZu5UvM+fGM="
-  },
-  "org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
-   "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",
-   "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k="
-  },
-  "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.21": {
-   "module": "sha256-sYdQC4zfyNLBw6F7lhzEO3tOGFQS/NsEsDvrkPEz+70=",
-   "pom": "sha256-zBwgchGRVLwYQXGzQmk/99LF+dwhLR5aTMCZOGL81ec="
-  },
-  "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.21/gradle85": {
-   "jar": "sha256-uGEv2xhdzZiXGlG8H0K+k2e8vK7lE+NywkoU9O2xm4Y="
-  },
-  "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.21": {
-   "module": "sha256-dqMj2vtYjg+u6OMUi5EPtuw+tCL8EGQBBr5bfwapx/M=",
-   "pom": "sha256-v7ZAATVL2BgCx0mRTMLPWOWsXQWtnB9JrEZbdxbQUiU="
-  },
-  "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.21/gradle85": {
-   "jar": "sha256-/AkFgQMJpa0+oV37vhKaR+kNsRIVIyNkhBtyBEEk57A="
-  },
-  "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.0.21": {
-   "jar": "sha256-VNSBSyF3IXiP2GU5gSMImi/P91FQ17NdjnMKI34my9E=",
-   "pom": "sha256-rIU9chaJ+vEV8RiBCjU2/CcvE1to0CdFOqpW6eY79wc="
-  },
-  "org/jetbrains/kotlin#kotlin-build-common/2.0.21": {
-   "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=",
-   "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0="
-  },
-  "org/jetbrains/kotlin#kotlin-build-statistics/2.1.21": {
-   "jar": "sha256-OnYsHlWFWUR9r0IX/eK5grJQh1brECplcRlPEt1BrPo=",
-   "pom": "sha256-HSDrHKwGm5iFdxccNOBABfpcbmk1mR1ve6mGKl6uGng="
-  },
-  "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": {
-   "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=",
-   "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ="
-  },
-  "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.21": {
-   "jar": "sha256-BrtrNnHUvDunTA4O+rvc1VXMwtTMLvZ80wnFc4yNHlQ=",
-   "pom": "sha256-U5ag0mBsMOA66ZSnl8b5FoTG47LZ6aRf1pLl6T7sDJM="
-  },
-  "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": {
-   "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=",
-   "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE="
-  },
-  "org/jetbrains/kotlin#kotlin-build-tools-impl/2.1.21": {
-   "jar": "sha256-5sfxijIo9WypFAClTdrSHh14mp+aByY7VgyMlTR8Y80=",
-   "pom": "sha256-Wtkc/mCCSH5t8hdVjUcnCDB4vHVjy0zZBEt6e00sBY4="
-  },
-  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": {
-   "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=",
-   "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY="
-  },
-  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.1.21": {
-   "jar": "sha256-Z6LjZzdl8JdyVgjMfIQ7DY/dlL2a9BMnIRNhYUqlfUk=",
-   "pom": "sha256-27+KwlUNWxripifyBPKLFvknHjbETYmUqjsTnL9w5Fo="
-  },
-  "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": {
-   "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=",
-   "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0="
-  },
-  "org/jetbrains/kotlin#kotlin-compiler-runner/2.1.21": {
-   "jar": "sha256-cKiXK7e+GyuwmMml2nC+wd1EyxBNTaGqbjPcVRAo1Jo=",
-   "pom": "sha256-/BmETtKRd+x6tsN5jR0DnaRroncb+HEuKcLyRFncW44="
-  },
-  "org/jetbrains/kotlin#kotlin-compose-compiler-plugin-embeddable/2.1.21": {
-   "jar": "sha256-ZxnS3XYgroz9FRtW0tPAyuV+ZC0ucosnKg6G0YQjJ28=",
-   "pom": "sha256-qeKk6p5W0S7L/pXHZPq2q+hg/eEN7c/LvT5X9W2qNng="
-  },
-  "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": {
-   "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=",
-   "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA="
-  },
-  "org/jetbrains/kotlin#kotlin-daemon-client/2.1.21": {
-   "jar": "sha256-MHDdA1nv5KE0jAzpuVsDJHmXZVmLt7aHbxVJq1NH6U8=",
-   "pom": "sha256-TVeT9Xm3mUDoeCxYvWgbnxZL2yvvAbcq2b5pqR6uq+4="
-  },
-  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": {
-   "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=",
-   "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A="
-  },
-  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.1.21": {
-   "jar": "sha256-lAHv/YLehgbfMokwiidcwdNXN2hmXKXt0J3DGccXFfQ=",
-   "pom": "sha256-GbJjDusajsrIz3ClF2JBCiAXUvAxHrG2+RwB1B350dw="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.21": {
-   "jar": "sha256-eEu/b4g00ez2XsUf57RLQW8zBS6CGWKlm55/dOCU9pY=",
-   "pom": "sha256-QxApK3Qc26Bu6iaC8YU5U4i+OvPLATzIo+gei5NokQA="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.21": {
-   "jar": "sha256-VY+KMrr1qH6WlMi7OVVwqeduCuqrqmg/msH83oujqsw=",
-   "module": "sha256-q9fHAOmpTF3zzNlek9LuqwwZJkXXB+rZXFzqR+gcwns=",
-   "pom": "sha256-QG8P2ImjHfVX+txkaouXADreDCRrX7N6YTYZFWMgUfc="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.21/gradle85": {
-   "jar": "sha256-VY+KMrr1qH6WlMi7OVVwqeduCuqrqmg/msH83oujqsw="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.1.21": {
-   "jar": "sha256-BYO5l57dTI9f78CNWRGCHpw7Bakbg5+hqgcPkm7ny6A=",
-   "pom": "sha256-FLbl3/I/lNzTMmw9JXv2JeRVsVCVJiBcILNAtCw1f6M="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.1.21": {
-   "jar": "sha256-APb4Q6vJMNDGGrtOPjAsjRd2EpH5srwlhv4SsMuXXq0=",
-   "module": "sha256-gIWGw896zkzfCLEYX7yv0PVcUhNIUPNmUlr7rlC7xTo=",
-   "pom": "sha256-N0agkbc65RnLtbszwftDNKYyR8W/kOgidFL9wgZ9+k8="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.1.21": {
-   "jar": "sha256-aATNXwXXf6lUrHt6kw57V/rgjK8CTiKRiAo8KKSfwHU=",
-   "module": "sha256-Ifoqg7FTeAa7x+1lVrmVIqXhbziR6CiKG8/ozf0mQrg=",
-   "pom": "sha256-G8Rcq/W6A2rdAmkEVCOxH0pXv0tPylnjGzxCspFmAcI="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.21": {
-   "module": "sha256-fhIOTfygjt1IkK/gtou6WqifJ/uhHY/mj2ttoLISk1g=",
-   "pom": "sha256-wMnxGQvSSKV9G3U26ahPw/6d8YCwJMPlblGi7iwLz80="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.21/gradle85": {
-   "jar": "sha256-6sBIdsGrZgNvYBb9kIM/IEsCNsJ2R1nK0GknbgLLQ+Y="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.21": {
-   "module": "sha256-avSUrGVuckg0HOukOePWJhFtARfJ+9+Xq+5lcOEaCHc=",
-   "pom": "sha256-eTmPhH1rfKipak5GOf+iLhaRJIr+tOgQGeEdG9C7IFI="
-  },
-  "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.1.21": {
-   "jar": "sha256-Q+CkDB33nDOjBJkUvJ5mbkT7yyDwfUVo7qBZXpcqLHE=",
-   "pom": "sha256-3F+A6RGCz54qBN/XKdcOfTFOHt+NZGJLFm5o90lSw9Q="
-  },
-  "org/jetbrains/kotlin#kotlin-metadata-jvm/2.1.0": {
-   "jar": "sha256-uNOpJXS6HfxJvfIFJW0e3gZkFIyxUKti+qhyteG7RjI=",
-   "pom": "sha256-G8hTyAjj0o3D8Gf2Z/ZSSro0YWl6+VJu/et09Ulojdg="
-  },
-  "org/jetbrains/kotlin#kotlin-metadata-jvm/2.1.10": {
-   "jar": "sha256-2obtTzqMiIVZLWuKppH7hge0nzdzyLvQjDsUoxsU0v0=",
-   "pom": "sha256-OZxrMFNXrzLnNKHaSNydMR73ZhVSBR9IHHJPBeTNwBw="
-  },
-  "org/jetbrains/kotlin#kotlin-native-utils/2.1.21": {
-   "jar": "sha256-3ECUhclc04pfMNWHjr6ai/Lm5vJUtv6eRcygmZkF4HA=",
-   "pom": "sha256-2RW7ZEMRhfvbhlxNKxLmuniqaME0fFnfrieaMqIyhPk="
-  },
-  "org/jetbrains/kotlin#kotlin-reflect/1.6.10": {
-   "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=",
-   "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak="
-  },
-  "org/jetbrains/kotlin#kotlin-reflect/1.9.24": {
-   "jar": "sha256-plFmRFu4XvgWzeEnJ5/gAX0rfMQ5s7lyOQ4bc21k6Uw=",
-   "pom": "sha256-CghcMAUb1tSrdlrVoMUXnEE7NfdBjyiDFy+9m6GrzMk="
-  },
-  "org/jetbrains/kotlin#kotlin-reflect/2.0.21": {
-   "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=",
-   "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk="
-  },
-  "org/jetbrains/kotlin#kotlin-reflect/2.1.0": {
-   "jar": "sha256-tfYI7fqYqM+iNyzBLRitqXS+HFbBCT7/BswGH0/AiLI=",
-   "pom": "sha256-nNhLPU9xfJYjXkujtydolcz/1V3kEcfOCz97q1Yu/kI="
-  },
-  "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.0.21": {
-   "jar": "sha256-x88d6VXfIqFihyImvQZ3yaDItmMKLi1z0R0UfNDFO3M=",
-   "pom": "sha256-cWKsEOFFTpJ2c7FcrQMp2jgvt1jmVPWfy0AHRZ2eyEE="
-  },
-  "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": {
-   "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=",
-   "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ="
-  },
-  "org/jetbrains/kotlin#kotlin-script-runtime/2.1.21": {
-   "jar": "sha256-2CIfRFhU8wrJLCSNVDYJ4Oy12Fu1ujTAQ2hLATy1uJc=",
-   "pom": "sha256-/RCT8ncp9uYMG6xjkFYkDMXvP16zQUT/LqgahFeBFJQ="
-  },
-  "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": {
-   "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=",
-   "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU="
-  },
-  "org/jetbrains/kotlin#kotlin-scripting-common/2.1.21": {
-   "jar": "sha256-RYLip8B/lTOptKZAijKl9Xll37FF1kaGCthn1GMIQ/E=",
-   "pom": "sha256-O04w8DuW7euw0ThjDCIwSN5w6MQILJDQaUPsok1B7tU="
-  },
-  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": {
-   "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=",
-   "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug="
-  },
-  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.1.21": {
-   "jar": "sha256-tbHg9AYvkc/iFtcGF+ivl3S1KI/YGeDOX2BQ+Nhukvo=",
-   "pom": "sha256-SCLW9orULZzZRP1zUpClvbXN8Psd1dpszG6F/AjtXfk="
-  },
-  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": {
-   "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=",
-   "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE="
-  },
-  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.1.21": {
-   "jar": "sha256-oSlfKCsHDAzv25aGFPb2SqcfG9vnRvHt9jUnQH1dlrE=",
-   "pom": "sha256-WM84eKRG1G8/YECYa5wrU9f3pNneB+0mQzNdWAuDdgQ="
-  },
-  "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": {
-   "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=",
-   "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0="
-  },
-  "org/jetbrains/kotlin#kotlin-scripting-jvm/2.1.21": {
-   "jar": "sha256-s/4fcumtSC1yb4nhOfRcSv57P4Ct/kzckdzAoiY3l40=",
-   "pom": "sha256-ghqPEByspjga2jbyM7nJH8wIhrNYT16qXPMESEm6tqI="
-  },
-  "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.1.21": {
-   "jar": "sha256-0hSA7OwU4CLaICr7xAkWfFPGT/ZAv7IZAiMP7cYoXeE=",
-   "pom": "sha256-chwbOMaiiJdBO7rhel3WMPRMBPlGiXNgTP4fYy42Z4s="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": {
-   "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.0": {
-   "module": "sha256-K5pa54X4UTqT+M7D9uXgf4sXZvhJezpIfzRBolHWdWM=",
-   "pom": "sha256-Sp2nqeUpW9VC1YY8rgNfevnKEB8iXEoIkcPS343CqA0="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.10": {
-   "module": "sha256-fgul3UlZnOJ2woa+M0hY8lEoSiD3bbm8D12g+8mbtfU=",
-   "pom": "sha256-u8xfrT9+3ktGnUnbpsA+GZMTNlW16BcTteahvt0c60I="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.21": {
-   "module": "sha256-pNj8FM7bN3mEOkf7zlIv0XPph1CRlk26wbjdeIT2wfk=",
-   "pom": "sha256-kk6Exb2AM5n2nFspYmsTKpSwBAL1X53lugGNyBHfo5M="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": {
-   "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=",
-   "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": {
-   "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=",
-   "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.24": {
-   "jar": "sha256-tmmbhQugeJ8ukEJ5zYvce+qRMP/RV826AB/HQl2KR7c=",
-   "pom": "sha256-RYapN9W8vDqzBCwECaHHKWFLy6PHpylvJS1ibuNzh9Q="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.1.0": {
-   "jar": "sha256-/epsQgNyT0Lo5kvvLwv3kSnM0d8e3xzP/cIt599JjHY=",
-   "pom": "sha256-BvvBTssUoK9HtaP400dj9JM9XLpaPSRQRb/i8r25Gx4="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.1.10": {
-   "jar": "sha256-L4dvs1tz2YBuyFAHAyZavL1ap8PIH0GiylSoVahkmzQ=",
-   "pom": "sha256-6yvOL/52LUQE2Or+lYF3XLxbkLsfl/0xZLpyJRfTvsY="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": {
-   "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=",
-   "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": {
-   "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=",
-   "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.24": {
-   "jar": "sha256-W1u/s+EYS14TMXw9QiN/okrdRDsud4GWHuozTbE2rbE=",
-   "pom": "sha256-BuBt70n5aq9uXD7EKDauWdbi2mJUcAkUKBZ1Z53J8qU="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.1.0": {
-   "jar": "sha256-I408fkkvEZtQ2hwiVG3XYkYuVfIkCWEfXlPdd2Jc1UQ=",
-   "pom": "sha256-52K4xFaQropqNd9YT1S+nJ2mWIXmGpBUJq6vylk34c4="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.1.10": {
-   "jar": "sha256-sJJg6kgo3Gz8Z9JhJ9rOOK4ru+ilZdLQKXJegcLSWOw=",
-   "pom": "sha256-YGyBfFx/1hFnDVWVK1dz+lxo8OPNJyelXe07GzzKLYc="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": {
-   "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=",
-   "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=",
-   "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.1.0": {
-   "jar": "sha256-1vkbew8wbMopn+x0+3w05IdNb17FuSWgtN4hkB4RnD8=",
-   "module": "sha256-3PvI6L8yzWen763ZHTEVK86YcJEdbsUIePT9tuA+cOI=",
-   "pom": "sha256-E05IwXeWwcECfsvmyfHHXHkvU1mHq4nh4d2kP4w2b14="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.1.10": {
-   "jar": "sha256-XyrByo3Is3o/QxTnFtNpaevwInp1GB0yaZ0Kj2RbHCE=",
-   "module": "sha256-jSwdcXxzVG1WOC0TbIZQtZpxWZQBciY4GJNKzkTLBI0=",
-   "pom": "sha256-SSISHT8LxgzkB/Ny3kLQKgt+lOddDD0VCLaDVyHySe8="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.1.21": {
-   "jar": "sha256-JjvcZ54fYgEtt7CReWJ5ttcc829Hl6mP8azgWDXyAcg=",
-   "module": "sha256-DTc1BD1ot6WvtE0n3mX4Cp0rIIRicJwu27SP1bOVrYo=",
-   "pom": "sha256-xVJAhso+SaZ5ht+P3M1mA3uvXzxaNYt2+d1gm+57tjg="
-  },
-  "org/jetbrains/kotlin#kotlin-tooling-core/2.1.21": {
-   "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=",
-   "pom": "sha256-RdzNNvsgz0B28XOMmbzt98rdd3Xti8cWopgr0VzpaDA="
-  },
-  "org/jetbrains/kotlin#kotlin-util-io/2.1.21": {
-   "jar": "sha256-43JJKisFVtYv0Djj7fxFMbVQZUhs4o0E9HBj0rwDDBw=",
-   "pom": "sha256-XzfSWuJDprEFAHoH18j0Wd4zep84fMiz63VPmNZCoA4="
-  },
-  "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.1.21": {
-   "jar": "sha256-lMf8tAQF9WSCQAuqI1yW6BAQweBDv/YwC3CzTl6o2bs=",
-   "pom": "sha256-eoezrWbdJ6gKAzWv3R9Hij3SrldqmpQ7sfN2ORv435E="
-  },
-  "org/jetbrains/kotlin#kotlin-util-klib/2.1.21": {
-   "jar": "sha256-pSSDHpeV0+dW1N5Uy9WyEN6Al9rXxHiryVeuP2DgpxY=",
-   "pom": "sha256-CzeIoSSkcVMm+oZ3iFz7KYkf73jLKxbOBhP/JBCZ9Rg="
-  },
-  "org/jetbrains/kotlin/native/cocoapods#org.jetbrains.kotlin.native.cocoapods.gradle.plugin/2.1.21": {
-   "pom": "sha256-W3YfMyOOHJGrslM/z1sgHbSWwYmGNFs55wlJAvid+JA="
-  },
-  "org/jetbrains/kotlinx#atomicfu-gradle-plugin/0.27.0": {
-   "jar": "sha256-Ol911FKwg/txpx9fTjcvZH5kIguP1fXyk4pBDj4ESXc=",
-   "module": "sha256-HWkjLkplqQUDI3mHA4Gs0ns/IqI4dVPgK+vhpVMA5sA=",
-   "pom": "sha256-I1EtRWDRpL/Rm2h1wg9DE85ep20RhyUwI4yx58oxNDE="
-  },
-  "org/jetbrains/kotlinx#atomicfu-jvm/0.27.0": {
-   "jar": "sha256-K2hGQXAHCosIXYpyJMfAAtvWXqFOH4uXqWBRFaJS9/s=",
-   "module": "sha256-zi6Gt1JxP/5nAUvdHhLvKQxwLom/rLh6sn+/3X4Tusk=",
-   "pom": "sha256-WyUzVczAbyUcuFKuBHKkLV+9TQKZWebXgj6dE56gPZk="
-  },
-  "org/jetbrains/kotlinx#atomicfu-transformer/0.27.0": {
-   "jar": "sha256-Mun9/FpwR6fnVEc4/YmRFLUnp6RiTfhXAnsehwIAeOw=",
-   "module": "sha256-eKfmR1/c4aDr+A62Mk5w0km24a/CgrdQPcw8pCk+yMg=",
-   "pom": "sha256-CiaCvpkn5FD+21SnYt9RxyUXW8f7A8ckPWDy8ckBQrk="
-  },
-  "org/jetbrains/kotlinx#atomicfu/0.27.0": {
-   "module": "sha256-umecB1fjmeaKmfl9c4QosvtwB3F93/Dx3uuoYrr0RpA=",
-   "pom": "sha256-e3Fbn9t9MTr8hRjV/Kv0LrSfzNbNf/RHNqEF6AmUBdg="
-  },
-  "org/jetbrains/kotlinx#kotlinx-collections-immutable-jvm/0.3.8": {
-   "jar": "sha256-cumpsAA+xSVLY4GG98oWdbCABr3eTJxMWJlwNCzNLnc=",
-   "module": "sha256-ak06jrdCIbQ7CP4hv5Vcq9aROJd9z3j4b9DvYiC3Efc=",
-   "pom": "sha256-LE3NVjaKtStQKwiwLC8dOMBpV5BC9ZeanMEGzkA7u78="
-  },
-  "org/jetbrains/kotlinx#kotlinx-collections-immutable/0.3.8": {
-   "module": "sha256-mO+84WKQhF+zCN6UK5GjA4ZYuhUzoNL3eIO5bsqRQAI=",
-   "pom": "sha256-3IVbPjOh9u/AP72/DZlRG3Swh+lplfAEUfvyyJrgpHc="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.1": {
-   "pom": "sha256-nL0EumPnOZhWdFcT4xLS8hYaHUTtpQbe1HyNVtr4Rh8="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.2": {
-   "pom": "sha256-+vDGU45T3cBJmmNmTY52PCFlgLLhjnIsy98bQxpq/iY="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": {
-   "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": {
-   "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.10.1": {
-   "jar": "sha256-BpxZiGMyMOB07A05Mh7DzapFR8SekLqTbGPY/JHIwA0=",
-   "module": "sha256-GN1lRl7IDQ5uXXGBi/EZLvSBfPXSASgrW5sbcTrHlpo=",
-   "pom": "sha256-f5AURlw6uheoNXqJZcqcnKjJ4aBEfHrqEXxkB4CKUtY="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.10.2": {
-   "jar": "sha256-XKF1s43zMf1kFVs1zYyuElH6nuNpcJs21C4KKIzM4/0=",
-   "module": "sha256-6eSnS02/4PXr7tiNSfNUbD7DCJQZsg5SUEAxNcLGTFM=",
-   "pom": "sha256-ZY9Xa5bIMuc4JAatsZfWTY4ul94Q6W36NwDez6KmDe8="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": {
-   "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=",
-   "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=",
-   "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": {
-   "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=",
-   "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=",
-   "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.1": {
-   "module": "sha256-y/1tFz4KXCmGr5U/ixzPKYAqrQnqympOkRQQj4rKyLE=",
-   "pom": "sha256-Ip7SIxgcPK8nt6wwHIFp3KLYYxkbcQ5hNVGlh5XANlU="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.2": {
-   "module": "sha256-j+JUF35xGnzRijwG2CQvzpRfQcLMoT3BmzOuQqVDUBY=",
-   "pom": "sha256-UZ2lQACW80YqTa6AeDrQUEE9S8gex65T+udq7wzL7Uw="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.8.0": {
-   "module": "sha256-FE7s1TZd4+MNe0YibAWAUeOZVbXBieMfpMfP+5nWILo=",
-   "pom": "sha256-yglaS/iLR0+trOgzLBCXC3nLgBu/XfBHo5Ov4Ql28yE="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.10.1": {
-   "jar": "sha256-5fpnTj2mpw/hGI/A1l+GcFN5rto0xZy9ML0VwORlts8=",
-   "module": "sha256-Z53VZCkanbzH7lbmZCzzqdB7BXGWj9lN5BachzJ/i8U=",
-   "pom": "sha256-UqJfb2ZMxFkJQmTVEDOeVYOqyQJ/DqqqPXA1XHVQkkY="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.10.2": {
-   "jar": "sha256-1l3uPK+m97+u/ttJP8aLXGOr51BzT7ivkvrHoNMQFFc=",
-   "module": "sha256-B7xJACLGWAQpQfUrFxwPXOBkvWxjUikEMDmS5BegRbs=",
-   "pom": "sha256-xHdj+siNuwlDhJ0W4RucBdReYDhMfNExBe5xD7TdX7M="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-swing/1.10.2": {
-   "jar": "sha256-Ar24XyDsCABEKav2iH6NDkDzq2N9dGL4F/D4q759HrU=",
-   "module": "sha256-kFK7SUS5FqUGX2GNfUb+EqTAxonQIbyYQ1v4l3WIsWQ=",
-   "pom": "sha256-zt+0Miu5cVkXrmmCCeoS3ziKuliVy7rRxWcith6EQ8A="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-test-jvm/1.10.2": {
-   "jar": "sha256-WQpUn4wdtZDJ2YqKIEJKH1gaNBYqNp5qa9iEzn0209c=",
-   "module": "sha256-VrIIF8xRrYi9tZwBIWsJiXzU+mmNUXu0d9kqlyp6Gq8=",
-   "pom": "sha256-Y96yqGiry+JIjrzrqnXnMbLvIQQQO4FzjnY3/JolpfM="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-test-jvm/1.8.0": {
-   "jar": "sha256-FTXMH0MjXYVm+NW8bRwR8HBBF+TlY/Ls5+aqPmhpXyA=",
-   "module": "sha256-HS0Zc6L0GowMEmPmCyXneS9ji4xV18ocbQZztkvlfac=",
-   "pom": "sha256-BtHlPqNm5to7FxkwV1+RYnzxnkUqTnqfDeMNLwQdZFE="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.10.2": {
-   "module": "sha256-QiByzuO2n2jVsVA7tmUb54lGsEw5KEocwCbM6L3x+AY=",
-   "pom": "sha256-vyXI3w7J8+rHu+5Tm2AbYBm36Z9fPzAR4ugXixQHUNs="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.8.0": {
-   "module": "sha256-DsPHX/2ZpqLfto8wfy8vcxQckz5Yt3sQTxyMrDr9U5Q=",
-   "pom": "sha256-NV8/pvBjDl6ZuHxywcQ4YgKin0lpFeOHWaOK3gsGkAQ="
-  },
-  "org/jetbrains/kotlinx#kotlinx-datetime-jvm/0.6.2": {
-   "jar": "sha256-ECdkkhEp4eRKdPQIt6C42sbRiSxgQuDkj4vbu/eMbS4=",
-   "module": "sha256-NU2xXaMv4YfblMbCNe96hDNrLdx5PQw3JEOZ320Kx9M=",
-   "pom": "sha256-OnOPkC80uNtLRGTRs9kj0mVuLKzEY2woadrFIO/Rbik="
-  },
-  "org/jetbrains/kotlinx#kotlinx-datetime/0.6.2": {
-   "module": "sha256-F5UTkzbHp4fwwvvyHSFc/1mRxx+AIZyjyiYOA0eIzCg=",
-   "pom": "sha256-6LX1lHxGTDyHzUJEdZ1odW/Db3pvZGQAFHGmXEX0z6U="
-  },
-  "org/jetbrains/kotlinx#kotlinx-io-bytestring-jvm/0.6.0": {
-   "jar": "sha256-uqd6eD1wpmr4jWiYodSXHkqoTmKyZBgFc3m98J+1uto=",
-   "module": "sha256-Tw2oHhXO+zujubirjmHoaoLtZd2N3S46cF2Euybr/Oo=",
-   "pom": "sha256-dQpt9xYR1MMAN+mCfSOVSSkKRuDBQBBoi4FM2ZZyG8c="
-  },
-  "org/jetbrains/kotlinx#kotlinx-io-bytestring-jvm/0.7.0": {
-   "jar": "sha256-6jimaw/0btgt3tnoHS3OcOX74DvWzFK0/IhpOB3qe30=",
-   "module": "sha256-D852CxW6wLkL7xvZDJfi0V+sQ6ZtwSCbSq7Jadk0Nv8=",
-   "pom": "sha256-mhfWfOIxynIhqWkS1WVtjRZ1gJ5FI/LDmupvs+o6bV8="
-  },
-  "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.6.0": {
-   "module": "sha256-aO+bxmrpVPRzxZ9R679Ywdewb9b/9zNd0/s9JPipOQA=",
-   "pom": "sha256-I1NofPyzbJCaW8T08LUj0wv2WuXI34CsxW6enFJb528="
-  },
-  "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.7.0": {
-   "module": "sha256-3NfGKkJ9279ezgt5jcEqD41VcSN/UScFEKUHIotjM3k=",
-   "pom": "sha256-b+eWaxTo7fC/rO+FfIiUpr9EtmFsbwK/7UoJMU7+0Zw="
-  },
-  "org/jetbrains/kotlinx#kotlinx-io-core-jvm/0.6.0": {
-   "jar": "sha256-QlI8gII9Me9Z+uQsklLvHTsRicqdPMOt/UAqKdBj5v8=",
-   "module": "sha256-tZuXjCxEJJpnRkGmlONaKs7LqBLah9NlpRZzQqjKU0c=",
-   "pom": "sha256-3DNkYsj1BEkGHNRdXLHI9oC+VEGqgQ6UQR/4GQmdT2s="
-  },
-  "org/jetbrains/kotlinx#kotlinx-io-core-jvm/0.7.0": {
-   "jar": "sha256-bt7cm+TYeK6oDH3WCfkb/Ef809NsyR/Q8/Mo+9ZlbI8=",
-   "module": "sha256-dDDspoloWorXVm2MgIIUpylQsdbwNjQd+MTYKah3Bsg=",
-   "pom": "sha256-I4nhfLeFp854BZ7v7yv5fpGCbCe4PMzhkbTkLtlfiBo="
-  },
-  "org/jetbrains/kotlinx#kotlinx-io-core/0.6.0": {
-   "module": "sha256-FIX7aljyQWnRr3PEFDAiUKx4u0axpD4Csa4hILKhJPA=",
-   "pom": "sha256-QIZ+EY9KW7uz291WZ3DY8Yu07w02MtyE+WyZ+2vD6oE="
-  },
-  "org/jetbrains/kotlinx#kotlinx-io-core/0.7.0": {
-   "module": "sha256-gTKXY+sZquO3OGcb7DFrkESEkcO/Unj24Q6kxwKS4iQ=",
-   "pom": "sha256-fu4E9DS9OmrRjhQFT0SH9DvKyQwDabBFA7FltzG+3Mo="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.6.3": {
-   "pom": "sha256-KdaYQrt9RJviqkreakp85qpVgn0KsT0Wh0X+bZVzkzI="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.0": {
-   "pom": "sha256-xD5IdSnM/RIJ66hlOrjolZggNGSq+/5fBEje2ZKHFQk="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.1": {
-   "pom": "sha256-APNVWudiSFHGfbEsMIvJziauMnzw1yR2akAeW6AGCMc="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.6.3": {
-   "jar": "sha256-KcghqNTiXL/k8s6WzdRSb2H49OaaE1+WEqNKgdk7ZfE=",
-   "module": "sha256-MpEE29NOS96QVhHUJ8dYTlPD+MQRg2+59pmsnbpbqmw=",
-   "pom": "sha256-K0qolJn8AbMNHBB1lmmOCvQ0BBLVQBnFAdm6ayk7oro="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.8.0": {
-   "jar": "sha256-08lOnYKbum4MTNOuR4pAhG3UnVR11nB4d76FOXav5BY=",
-   "module": "sha256-NzH80jhWGpCpdSs0hfHWNeAbRF5Kd4F9ewd/S50vQi0=",
-   "pom": "sha256-QVKRtvWbeTemcau136BLJyl811jLUQLNzHWUFJj5wDw="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.8.1": {
-   "jar": "sha256-NWW21NeJv3BoPEVWaUQof8HY3HXCPZi9h9AQWcx28rM=",
-   "module": "sha256-++GdWIrX1fZGZmaCA0/0Tglo0iBx/mzPn5ngPHpe+lc=",
-   "pom": "sha256-RGZV6NQ4KL+7OHzp0VGpNxowkrSLkJ6AYGtT/FiXnig="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-core/1.6.3": {
-   "module": "sha256-Nh6eMetylhdLdAhaxJ7dhKTzkAupQxpOQM0cI952oyg=",
-   "pom": "sha256-0tv2/BU2TIlp1qq24+zMdROZU/LMBXtzDjUmdGWztX4="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-core/1.8.0": {
-   "module": "sha256-mE2aqabpvMONfoNuqNAAsThyCH/GZY0NjWIldjPzlfE=",
-   "pom": "sha256-nVbnQWLOQn4MSetsuXUSR0Mq3PwukTw4KWY+27qr7hM="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-core/1.8.1": {
-   "module": "sha256-eL3oMFSUrxs445ZrUleskINAFkk/i60hm4iGx/vbJdU=",
-   "pom": "sha256-Rz8Ko+Sheqt4YNykkNxC6rthJPHSlT5qmVoIcX5QxxQ="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json-io-jvm/1.8.0": {
-   "module": "sha256-/pQ5hti3/I7HoytonItHbDDM9KNbcKLEWxtffZ00BkM=",
-   "pom": "sha256-PbZlvwY1l3Inc9mKLQpqSps0FpeEFOnTYfICjTUc0yg="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json-io-jvm/1.8.1": {
-   "jar": "sha256-q17I6kiBUZfEan359BimJ5H+kc2lAjuUHOTehy2BDME=",
-   "module": "sha256-vz47hoSxN/py0pZVZ1/c4xRGewh5JikYMm2vedE+Afo=",
-   "pom": "sha256-27ETuPvVUEVZjiTmATIGrrzKkSr+Vjnr2VJjC579kjw="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json-io/1.8.0": {
-   "module": "sha256-+3LQaky980DBOnBPywfUsWJ66NnDCtZnEwb6x1UnB7Q=",
-   "pom": "sha256-xgC76woBPRA7cbGCa+t0Sbnv/5x4Knl0JKoOdV+Cw0Q="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json-io/1.8.1": {
-   "module": "sha256-WTtZ8otvvbjsNRD4+ZQksTTlv8Qe2GS82LAiDv4APnM=",
-   "pom": "sha256-2e2KSEKd687/Z05u1OdgPR1K5Ao3lWT9BlPQ3V9gJb8="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.6.3": {
-   "jar": "sha256-0yNBebz/GIbVPWfBHspH9/PPe2PDSdFpZfbbUbfz3Zo=",
-   "module": "sha256-InoqmtOMAQsQe8gFjNYVF32lqqhts399WNSdnJt/l9A=",
-   "pom": "sha256-eN9n0GTTuq8a9Ohi6YFGl3YpfGyHi7e/G0Ljky9vr48="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.8.1": {
-   "jar": "sha256-h2nlZHVX43AJGcMtUI9cXa1TxdgjTNEIRjVPvP8UqiQ=",
-   "module": "sha256-uZHLSTQAwdlgut+oYhcVjGN+XsqIgbIM0BJbtOz8+DE=",
-   "pom": "sha256-1mXWtB/gWPZmpvOGrS5JzBAe+P0u7+/vy8ER6R7oJDY="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json/1.6.3": {
-   "module": "sha256-gNHYf6CmO/+Dleo5EL2oDQnw9YNQTd6o7QB7x6hrTNQ=",
-   "pom": "sha256-KcIhdhjlMdfYMsyICupu0aj0B3PkN/WkHXC9FUaNPOM="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json/1.8.0": {
-   "module": "sha256-lK/eU8GRw+Hge5+AiqF3f4YryKlbxQtGYozQkhnVaFg=",
-   "pom": "sha256-WAgq+Zc0Ah1bjbKcQ1sR1FyhGxwP14bHhFIsnSxxeVg="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json/1.8.1": {
-   "module": "sha256-f33wBUM932BPUqq9avsh65YJMZfLS90Hk8SEydPEtnU=",
-   "pom": "sha256-x3AMmcg94CtGVBo9fktps4h0m3wPV9zrRU0UPyzYens="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-protobuf-jvm/1.8.1": {
-   "jar": "sha256-+9F09y6oI2S6oRIGny17NhdY9raL2B0qxRsCxmpI6SQ=",
-   "module": "sha256-klXX5uXZzp3bV2f6KNPGmShYhGZ+kaph4bE12YjuCJM=",
-   "pom": "sha256-pYV9XmD4gWHKeEQUai/jfyiV+B5SMJCbFRtKPY7AMpw="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-protobuf/1.8.1": {
-   "module": "sha256-LZ+TjZbK4twphqfvbyy9Fnan+HVLLVH8vk04Y92rfD0=",
-   "pom": "sha256-YTuFlIYGTe0T+YpQCtBJ284ZpY/DO/d3ajgSx9Cg/RA="
-  },
-  "org/jetbrains/skiko#skiko-awt-runtime-linux-x64/0.9.4": {
-   "jar": "sha256-K/JrgqV/rbUG6YHu97n9OESGzce5P8hBo+cvTD//q48=",
-   "pom": "sha256-x87oAckGYo48fc3MdHyDBENGgG4SkFuK3U0vwkIXpec="
-  },
-  "org/jetbrains/skiko#skiko-awt/0.8.18": {
-   "jar": "sha256-Y39d4aII8TaKxRtaKGpIJ87IKM1i3aMy3DQAuFQ+JD0=",
-   "module": "sha256-x9JON+j/js4Y7OdEg0Fxcnor1L7z6/hZBlN1in0Bbmo=",
-   "pom": "sha256-yrIp0lDLlzYK12MgQfCHFksKR+d75huz9VRaLWtAlJ8="
-  },
-  "org/jetbrains/skiko#skiko-awt/0.9.4": {
-   "jar": "sha256-jiarGudfZXhva5c6ZuiaKDbRmaVWHEwu28Hz9nrSGX8=",
-   "module": "sha256-6WvCmRgCYinm3hVXvLdC77ge6ocR/8thzINEmp6h/FY=",
-   "pom": "sha256-lQozgiK9sdX7ttlxbC2l9UtB05NgMwp3eJcaukCK/CE="
-  },
-  "org/jetbrains/skiko#skiko/0.8.18": {
-   "module": "sha256-qbGDSU+EVPtX7B//+UyyqL7u3aG3PSjbbrS4+NwKU8s=",
-   "pom": "sha256-ac1xXT+/dr0QV571/D69q1RfiwxFm6iWzcbeoMETzAw="
-  },
-  "org/jetbrains/skiko#skiko/0.9.4": {
-   "module": "sha256-XHG00ajc2rFNpgCC5BSxKvXw+y40aDkBn3+kG+eGW0c=",
-   "pom": "sha256-jGpkAr2GskEIWA/3Ho3wKSmhzCad6arvccqVNxfQC68="
-  },
-  "org/json#json/20231013": {
-   "jar": "sha256-DxgZLfKJEU4XqhoNCn+DcsyfXH5Pfjmtz4kG/nFPp9M=",
-   "pom": "sha256-xQBAI9OfVGNbNbvrQOIaKtVR/KDy41Cxzje9DnyypGY="
-  },
-  "org/jsoup#jsoup/1.18.1": {
-   "jar": "sha256-O7Ww7AKZir5FpR83185nwwaLTM1KtjyWWSnsUHTWTpE=",
-   "pom": "sha256-xN46hPu17vS9IpjW3pgcbNlyKHlQXINz4bZ/EdHK8n0="
-  },
-  "org/jspecify#jspecify/1.0.0": {
-   "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=",
-   "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=",
-   "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y="
-  },
-  "org/junit#junit-bom/5.10.2": {
-   "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
-   "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
-  },
-  "org/junit#junit-bom/5.10.3": {
-   "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
-   "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
-  },
-  "org/junit#junit-bom/5.9.1": {
-   "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
-   "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
-  },
-  "org/junit#junit-bom/5.9.2": {
-   "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=",
-   "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU="
-  },
-  "org/jvnet/staxex#stax-ex/1.8.1": {
-   "jar": "sha256-IFIlSQVunlCqNe8LRFouR6U9Br4LCpRn1wTiSD/7BJo=",
-   "pom": "sha256-j8hPNs5tps6MiTtlOBmaf2mmmgcG2bF6PuajoJRS7tY="
-  },
-  "org/mockito#mockito-bom/4.11.0": {
-   "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
-  },
-  "org/mozilla#rhino/1.7.10": {
-   "jar": "sha256-OOswAM9WuMdVnuVYhmp2juvL8lQXRSLWQEt/B491wtQ=",
-   "pom": "sha256-PHy6D12ldR1ipVZ2iXp64jaHx6Hi++HUdMW8Wka5+bM="
-  },
-  "org/openani/anitorrent#anitorrent-native-desktop-jni/0.2.0": {
-   "jar": "sha256-9LiZUNc3YshQre6bkCHh4zA9ZnTCaKBuNIK5Ju99qLI=",
-   "module": "sha256-c2G9Lw8t3ztqV1yTQmYOyymBpgy5Y9AAvoWJ+i6EVQA=",
-   "pom": "sha256-iGZteZ475N+d0tVVZ/iISHzIsXd8Tcc9ba93z5uW/Og="
-  },
-  "org/openani/anitorrent#anitorrent-native-desktop/0.2.0": {
-   "jar": "sha256-xt6tovrFO46mUj29p3WXsSgAZnRhbxQPBN8jJkxtGqM=",
-   "module": "sha256-RZc7W63m6YC4b+7n2clkdwBN5SRb5FEVZ88X+3OOUsM=",
-   "pom": "sha256-hPy+1uzaX5/YloQvdcb+X7Ir3vV/hJD6aBmpY1slvb4="
-  },
-  "org/openani/anitorrent#anitorrent-native-desktop/0.2.0/linux-x64": {
-   "jar": "sha256-fExfhUPLpfnTcaElh9C8d3KjuDDvqUDNv/PJF2wbLKw="
-  },
-  "org/openani/anitorrent#anitorrent-native/0.2.0": {
-   "module": "sha256-ZWpbvwWi7WTW4Ej8hyxELlSDKv1+wZTUPYPY8LlzI8k=",
-   "pom": "sha256-fDLSHOpLWBoaqZy56RcVS3vr0x8L3FKQO+larWZSmYQ="
-  },
-  "org/openani/anitorrent#catalog/0.2.0": {
-   "module": "sha256-Fp+/oA0z4BUbxPomV8rnAyZ6xF6aQ92b7N7cSh1qyq4=",
-   "pom": "sha256-biSyM8rPd6AVOIxolBm3JV+kjGfQA4km2WE8pJPY3kI="
-  },
-  "org/openani/anitorrent/catalog/0.2.0/catalog-0.2.0": {
-   "toml": "sha256-3yKg8yGXTxBzOV2CstWaymNc11DvlO4E6h9zXzQZ9Nw="
-  },
-  "org/openani/jsystemthemedetector#jSystemThemeDetector/3.8": {
-   "jar": "sha256-X/eFF2nvc9yE+f6sNFteBOzgDEaMgTl4HIhUEZxPB+E=",
-   "module": "sha256-tNPURyLcLU+zp0XR3bPrI2KkCTxbwyQFXPR2947iSbs=",
-   "pom": "sha256-A9Q+KKmVsrk+45mKFLodgLiJsyAbdvV5ZlKhNzhDIBk="
-  },
-  "org/openani/mediamp#catalog/0.0.29": {
-   "module": "sha256-s6r4l6CUxAxXNrk0x4papHn7CT9Agn+VGhA5gde45/8=",
-   "pom": "sha256-E5GiqnTrK4imwFM7QBmAAhhxDKijBAIi/mwyH3FUuk4="
-  },
-  "org/openani/mediamp#mediamp-api-desktop/0.0.29": {
-   "jar": "sha256-k4Qsb20oECKLw2ZQ+QH7rCuKl9W3kM9nfJRWF0cTAlE=",
-   "module": "sha256-InxhvamLA6cAcu7JPORsd+NoK+eeTjlmg+kXHgUL8J8=",
-   "pom": "sha256-4yVSYeA9sIcF7x0W9IOSNEtURY10iC9gvsC00JZ6GmU="
-  },
-  "org/openani/mediamp#mediamp-api/0.0.29": {
-   "module": "sha256-5BiLU2hqMh9twBjyMkZymeltSP5Lvhqm+Ebram4FJxk=",
-   "pom": "sha256-bxPAiiGEC3XucMnl+KwnQfP1Q96RlQBpHw459rTU9os="
-  },
-  "org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.29": {
-   "jar": "sha256-CmvsMdXJcrr1UcbNQVI8OyPqwxo9pLKYoa1ye5k0764=",
-   "module": "sha256-3ZMls4s+OGQgPoXLFBqB7WbyE1Qn2f84XoXw0pOdtUQ=",
-   "pom": "sha256-nN9HUn/RfKtPCOSNiD2URA+IBpkSwWWt0HZO8CZjtEE="
-  },
-  "org/openani/mediamp#mediamp-source-ktxio/0.0.29": {
-   "module": "sha256-As/GVZGSN4hAfby3KRxBzyMMUpuNmy24wVPlSQ4ABww=",
-   "pom": "sha256-Zd+xibJweb9/tUsvBKtkQm8REPIRs9JI/q6D4uGBDag="
-  },
-  "org/openani/mediamp#mediamp-vlc/0.0.29": {
-   "jar": "sha256-IipT5VaRSsRsF0+DOLb4ZEAVSVIVuSVMbydWzTgjN6I=",
-   "module": "sha256-3iXzV+GUgG26i6JGs+KuifxMAqw6n91hvFBnY4PhGH0=",
-   "pom": "sha256-hyzw9+4O0IBKsOBpmMYXFbYOFfhxlAXtvx5Zb2I2bU4="
-  },
-  "org/openani/mediamp/catalog/0.0.29/catalog-0.0.29": {
-   "toml": "sha256-wNPEmb14ugDo4NPEcf8lY0hRcCOGDFmsDGcHJqUSq5E="
-  },
-  "org/ow2#ow2/1.5.1": {
-   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
-  },
-  "org/ow2/asm#asm-analysis/9.7": {
-   "jar": "sha256-e8a8vCE3mUigyMRn+w+GQgbluBj2vAtUaHL1yflBVW8=",
-   "pom": "sha256-nDMIDry2Ma5Pd+ti7We/xAy4cujP0Fishj5EXB3Zc98="
-  },
-  "org/ow2/asm#asm-commons/9.7": {
-   "jar": "sha256-OJvCR5WOBJ/JoECNOYySxtNwwYA1EgOV1Muh2dkwS3o=",
-   "pom": "sha256-Ws7j7nJS7ZC4B0x1XQInh0malfr/+YrEpoUQfE2kCbQ="
-  },
-  "org/ow2/asm#asm-tree/9.7": {
-   "jar": "sha256-YvSzvENgRcGstcO6LY7FVuwzaQk9f10Gx0frBLVtUrE=",
-   "pom": "sha256-o06h4+QSjAEDjbQ8aXbojHec9a+EsFBdombf5pZWaOw="
-  },
-  "org/ow2/asm#asm-util/9.7": {
-   "jar": "sha256-N6ZBTTZkGXPxrxBJN8ldbZIbLdtNYSxmxanysT/BQhE=",
-   "pom": "sha256-XQFNjIcNSHGCW9LdtVZ7Ie9trI7Ei7uNu0ZbCzor9FI="
-  },
-  "org/ow2/asm#asm/9.7": {
-   "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=",
-   "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA="
-  },
-  "org/slf4j#slf4j-api/1.7.30": {
-   "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ="
-  },
-  "org/slf4j#slf4j-api/1.8.0-alpha2": {
-   "pom": "sha256-q7TTRvEsRpktok1TctybilWE2+hXbAlUkpId+iFpsEo="
-  },
-  "org/slf4j#slf4j-api/2.0.16": {
-   "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=",
-   "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c="
-  },
-  "org/slf4j#slf4j-bom/2.0.16": {
-   "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk="
-  },
-  "org/slf4j#slf4j-parent/1.7.30": {
-   "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U="
-  },
-  "org/slf4j#slf4j-parent/1.8.0-alpha2": {
-   "pom": "sha256-nWWHTIet1peG5j/+ncT025AuB86ODQmzlRqZ46ptLCg="
-  },
-  "org/slf4j#slf4j-parent/2.0.16": {
-   "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU="
-  },
-  "org/slf4j#slf4j-simple/1.8.0-alpha2": {
-   "jar": "sha256-ObJOKXTUdzen28wQKUiyzOcb0wNUEKnRb5gRhQhgtcI=",
-   "pom": "sha256-rqEymqts7JmjCCpSzd/IKFTxEyjspEEpGkhMHUCuNCQ="
-  },
-  "org/sonatype/oss#oss-parent/7": {
-   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
-  },
-  "org/sonatype/oss#oss-parent/9": {
-   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
-  },
-  "org/springframework#spring-framework-bom/5.3.24": {
-   "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=",
-   "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE="
-  },
-  "org/springframework#spring-framework-bom/5.3.39": {
-   "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
-   "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
-  },
-  "org/tensorflow#tensorflow-lite-metadata/0.2.0": {
-   "jar": "sha256-6fGLikHwF+kDPLDthciiuiMHKSzf4l6uNlkj56MdKnA=",
-   "pom": "sha256-D+MTJug7diLLzZx11GeykfAf/jzG4+dmUawFocHHo2A="
-  },
-  "org/xerial#sqlite-jdbc/3.41.2.2": {
-   "jar": "sha256-DNq0EJR+BLZ0Pfmc8VQyZ93RBzV9b3aUjRRb5ZD9SX0=",
-   "pom": "sha256-rhGjsR3LrBtkA2ieP9jYKyzupV6C2/xLsyrt7fjMrI4="
-  },
-  "org/yaml#snakeyaml/2.2": {
-   "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=",
-   "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y="
-  },
-  "tech/annexflow/compose#constraintlayout-compose-multiplatform-jvm/0.4.0": {
-   "jar": "sha256-xKVyQqdp1fCQB2UuS6gQcYmKZTInhQjD2TBn/0Ei6v0=",
-   "module": "sha256-TPx/6DMO+jmovVcqPHueF7WicqeBhBNKbvWbSnPRXgc=",
-   "pom": "sha256-nQULYmnCFV2QxFBxHWiJMIrPIvvW5yPnI4JZfoRfF9Y="
-  },
-  "tech/annexflow/compose#constraintlayout-compose-multiplatform/0.4.0": {
-   "module": "sha256-+Vs8lwmJ+y8cr2GN1AsbB4b1NC6hIESyTUH4TealwDY=",
-   "pom": "sha256-vb7fI+JUSZUrzLJYPx60FY9Dm9Zq2Wov9WJFoLdQvBE="
-  },
-  "uk/co/caprica#vlcj-natives/4.8.1": {
-   "jar": "sha256-9Hzvkd/fM1YRttEZRcnReU6FgRs4hMH9MfntdqsZ2lA=",
-   "pom": "sha256-pnZ3QHPk7j14LkcSlnmHf318CucundSwQCXVZnIpLtw="
-  },
-  "uk/co/caprica#vlcj/4.8.2": {
-   "jar": "sha256-ME1YXngL6HZbqk+oOzdsIZIHifnlcK7PiIkS1A7tq7U=",
-   "pom": "sha256-73L1ioRac36UiwFSE9tItp+cUTf3O1B8/ZeOVFxbIAk="
-  }
- }
-}
diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix
deleted file mode 100644
index d411aa0d7986..000000000000
--- a/pkgs/by-name/an/animeko/package.nix
+++ /dev/null
@@ -1,259 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  gradle,
-  jetbrains,
-  autoPatchelfHook,
-  fontconfig,
-  libXinerama,
-  libXrandr,
-  file,
-  gtk3,
-  glib,
-  cups,
-  lcms2,
-  alsa-lib,
-  libGL,
-  libvlc,
-  libidn,
-  pulseaudio,
-  ffmpeg,
-  libva,
-  libdvbpsi,
-  libogg,
-  chromaprint,
-  protobuf_21,
-  libgcrypt,
-  libdvdnav,
-  libsecret,
-  aribb24,
-  libavc1394,
-  libmpcdec,
-  libvorbis,
-  libebml,
-  faad2,
-  libjpeg8,
-  libkate,
-  librsvg,
-  xorg,
-  libsForQt5,
-  libupnp,
-  aalib,
-  libcaca,
-  libmatroska,
-  libopenmpt-modplug,
-  libsidplayfp,
-  shine,
-  libarchive,
-  gnupg,
-  srt,
-  libshout,
-  ffmpeg_6,
-  libmpeg2,
-  xcbutilkeysyms,
-  lirc,
-  lua5_2,
-  taglib,
-  libspatialaudio,
-  libmtp,
-  speexdsp,
-  libsamplerate,
-  sox,
-  libmad,
-  libnotify,
-  taglib_1,
-  zvbi,
-  libdc1394,
-  libcddb,
-  libbluray,
-  libdvdread,
-  libvncserver,
-  twolame,
-  samba,
-  libnfs,
-  flac,
-  writeShellScript,
-  nix-update,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "animeko";
-  version = "4.11.1";
-
-  src = fetchFromGitHub {
-    owner = "open-ani";
-    repo = "animeko";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-JLOwWJvBfwqvAfaFn5qr8lsHL7/u97qYjZsckBjAu6I=";
-    fetchSubmodules = true;
-  };
-
-  # copy currentAniBuildConfig from upstream release asset to local.properties
-  postPatch = ''
-    echo "jvm.toolchain.version=21" >> local.properties
-    echo "ani.dandanplay.app.id=2qkvdr35cy" >> local.properties
-    echo "ani.dandanplay.app.secret=WspqhGkCD4DQbIUiXTPprrGmpn3YHFeX" >> local.properties
-    echo "ani.sentry.dsn=https://e548a2f9a8d7dbf1785da0b1a90e1595@o4508788947615744.ingest.us.sentry.io/4508788953448448" >> local.properties
-    echo "ani.analytics.server=https://us.i.posthog.com" >> local.properties
-    echo "ani.analytics.key=phc_7uXkMsKVXfFP9ERNbTT5lAHjVLYAskiRiakjxLROrHw" >> local.properties
-    echo "kotlin.native.ignoreDisabledTargets=true" >> local.properties
-    sed -i "s/^version.name=.*/version.name=${finalAttrs.version}/" gradle.properties
-    sed -i "s/^package.version=.*/package.version=${finalAttrs.version}/" gradle.properties
-    substituteInPlace gradle/libs.versions.toml \
-      --replace-fail 'antlr-kotlin = "1.0.2"' 'antlr-kotlin = "1.0.3"'
-  '';
-
-  gradleBuildTask = "createReleaseDistributable";
-
-  gradleUpdateTask = finalAttrs.gradleBuildTask;
-
-  mitmCache = gradle.fetchDeps {
-    inherit (finalAttrs) pname;
-    data = ./deps.json;
-    silent = false;
-    useBwrap = false;
-  };
-
-  env.JAVA_HOME = jetbrains.jdk;
-
-  gradleFlags = [ "-Dorg.gradle.java.home=${jetbrains.jdk}" ];
-
-  nativeBuildInputs = [
-    gradle
-    autoPatchelfHook
-  ];
-
-  buildInputs = [
-    fontconfig
-    libXinerama
-    libXrandr
-    file
-    shine
-    libmpeg2
-    gtk3
-    glib
-    cups
-    lcms2
-    alsa-lib
-    libidn
-    pulseaudio
-    ffmpeg
-    faad2
-    libjpeg8
-    libkate
-    librsvg
-    xorg.libXpm
-    libsForQt5.qt5.qtsvg
-    libsForQt5.qt5.qtbase
-    libsForQt5.qt5.qtx11extras
-    libupnp
-    aalib
-    libcaca
-    libva
-    libdvbpsi
-    libogg
-    chromaprint
-    protobuf_21
-    libgcrypt
-    libsecret
-    aribb24
-    twolame
-    libmpcdec
-    libvorbis
-    libebml
-    libmatroska
-    libopenmpt-modplug
-    libavc1394
-    libmtp
-    libsidplayfp
-    libarchive
-    gnupg
-    srt
-    libshout
-    ffmpeg_6
-    xcbutilkeysyms
-    lirc
-    lua5_2
-    taglib
-    libspatialaudio
-    speexdsp
-    libsamplerate
-    sox
-    libmad
-    libnotify
-    zvbi
-    libdc1394
-    libcddb
-    libbluray
-    libdvdread
-    libvncserver
-    samba
-    libnfs
-    taglib_1
-    libdvdnav
-    flac
-  ];
-
-  autoPatchelfIgnoreMissingDeps = [
-    "libmpcdec.so.6"
-    "libsidplay2.so.1"
-    "libresid-builder.so.0"
-    "libsrt-gnutls.so.1.5"
-    "liblua5.2.so.0"
-    "libspatialaudio.so.0"
-    "libdc1394.so.25"
-    "libx265.so.199"
-    "libdca.so.0"
-    "liba52-0.7.4.so"
-    "libFLAC.so.12"
-    "libtheoradec.so.1"
-    "libtheoraenc.so.1"
-    "libxml2.so.2"
-  ];
-
-  dontWrapQtApps = true;
-
-  doCheck = false;
-
-  installPhase = ''
-    runHook preInstall
-
-    cp -r app/desktop/build/compose/binaries/main-release/app/Ani $out
-    chmod +x $out/lib/runtime/lib/jcef_helper
-    substituteInPlace app/desktop/appResources/linux-x64/animeko.desktop \
-      --replace-fail "icon" "animeko"
-    install -Dm644 app/desktop/appResources/linux-x64/animeko.desktop $out/share/applications/animeko.desktop
-    install -Dm644 app/desktop/appResources/linux-x64/icon.png $out/share/pixmaps/animeko.png
-
-    runHook postInstall
-  '';
-
-  preFixup = ''
-    patchelf --add-needed libGL.so.1 \
-      --add-rpath ${
-        lib.makeLibraryPath [
-          libGL
-          libvlc
-        ]
-      } $out/bin/Ani
-  '';
-
-  passthru.updateScript = writeShellScript "update-animeko" ''
-    ${lib.getExe nix-update} animeko
-    $(nix-build -A animeko.mitmCache.updateScript)
-  '';
-
-  meta = {
-    description = "One-stop platform for finding, following and watching anime";
-    homepage = "https://github.com/open-ani/animeko";
-    mainProgram = "Ani";
-    license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ ];
-    sourceProvenance = with lib.sourceTypes; [
-      fromSource
-      binaryBytecode
-    ];
-    platforms = [ "x86_64-linux" ];
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eb9c5f9ddad4..9f3926755dc3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -280,6 +280,7 @@ mapAliases {
   alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17
   amazon-qldb-shell = throw "'amazon-qldb-shell' has been removed due to being unmaintained upstream"; # Added 2025-07-30
   angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17
+  animeko = throw "'animeko' has been removed since it is unmaintained"; # Added 2025-08-20
   ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11
   ansible_2_15 = throw "Ansible 2.15 goes end of life in 2024/11 and can't be supported throughout the 24.11 release cycle"; # Added 2024-11-08
   antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21

From 8eade609a5a1cfd032a530c44e454245eee6a6c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 09:07:45 +0000
Subject: [PATCH 2090/3724] nchat: 5.8.4 -> 5.9.15

---
 pkgs/by-name/nc/nchat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix
index 6238fcd442c3..6683ee822646 100644
--- a/pkgs/by-name/nc/nchat/package.nix
+++ b/pkgs/by-name/nc/nchat/package.nix
@@ -15,13 +15,13 @@
 }:
 
 let
-  version = "5.8.4";
+  version = "5.9.15";
 
   src = fetchFromGitHub {
     owner = "d99kris";
     repo = "nchat";
     tag = "v${version}";
-    hash = "sha256-PfiTIq8xomqp4ewawbX56hFgA4x5z8SI2w9husMtZPc=";
+    hash = "sha256-I7A6+zhHXE+LSfqnWESsXF1U4Y0Bw1Vt7gZblRqWSMQ=";
   };
 
   libcgowm = buildGoModule {
@@ -29,7 +29,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}/lib/wmchat/go";
-    vendorHash = "sha256-HC7tJRk7Pqw3AUDEP2fGqYQLjIGf0CgB36K3PBYsBMM=";
+    vendorHash = "sha256-rovzblnXfDDyWyYR3G9irFaSopiZSeax+48R/vD/ktY=";
 
     buildPhase = ''
       runHook preBuild

From 47d3fcdc2dd2def58a12a8a79ae6e6a5fc473a8c Mon Sep 17 00:00:00 2001
From: Even Brenden <evenbrenden@users.noreply.github.com>
Date: Wed, 20 Aug 2025 11:19:57 +0200
Subject: [PATCH 2091/3724] alsa-utils: wrap all binaries with ALSA_PLUGIN_DIR

---
 pkgs/by-name/al/alsa-utils/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/al/alsa-utils/package.nix b/pkgs/by-name/al/alsa-utils/package.nix
index 343fce8dd957..d9d0c959583e 100644
--- a/pkgs/by-name/al/alsa-utils/package.nix
+++ b/pkgs/by-name/al/alsa-utils/package.nix
@@ -66,7 +66,9 @@ stdenv.mkDerivation (finalAttrs: {
         procps
       ]
     }"
-    wrapProgram $out/bin/aplay --set-default ALSA_PLUGIN_DIR ${plugin-dir}
+    for program in $out/bin/*; do
+        wrapProgram "$program" --set-default ALSA_PLUGIN_DIR "${plugin-dir}"
+    done
   '';
 
   postInstall = ''

From 2b4121844195bfd721093e94a084c5113d80e9e4 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Wed, 20 Aug 2025 17:36:12 +0800
Subject: [PATCH 2092/3724] mihomo-party: drop

This software has long violated the upstream license https://github.com/MetaCubeX/mihomo/tree/Alpha#license. Moreover, its former main developer sold it, and malicious code may have been added to the software afterward.
---
 pkgs/by-name/mi/mihomo-party/package.nix | 91 ------------------------
 pkgs/by-name/mi/mihomo-party/update.sh   | 23 ------
 pkgs/top-level/aliases.nix               |  1 +
 3 files changed, 1 insertion(+), 114 deletions(-)
 delete mode 100644 pkgs/by-name/mi/mihomo-party/package.nix
 delete mode 100755 pkgs/by-name/mi/mihomo-party/update.sh

diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix
deleted file mode 100644
index b5a8cbf3ad9a..000000000000
--- a/pkgs/by-name/mi/mihomo-party/package.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  dpkg,
-  autoPatchelfHook,
-  nss,
-  nspr,
-  alsa-lib,
-  openssl,
-  webkitgtk_4_1,
-  udev,
-  libayatana-appindicator,
-  libGL,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "mihomo-party";
-  version = "1.8.4";
-
-  src =
-    let
-      selectSystem =
-        attrs:
-        attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-      arch = selectSystem {
-        x86_64-linux = "amd64";
-        aarch64-linux = "arm64";
-      };
-    in
-    fetchurl {
-      url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${finalAttrs.version}/mihomo-party-linux-${finalAttrs.version}-${arch}.deb";
-      hash = selectSystem {
-        x86_64-linux = "sha256-bbKW4kz1v+yF0ZsH9Ew+c780LCdyJUi8tIiHV09An8s=";
-        aarch64-linux = "sha256-72NAoFCt+Uwbt1blwHNM7FePUX0D6AZoqW3XF0NkT28=";
-      };
-    };
-
-  nativeBuildInputs = [
-    dpkg
-    autoPatchelfHook
-  ];
-
-  buildInputs = [
-    nss
-    nspr
-    alsa-lib
-    openssl
-    webkitgtk_4_1
-    (lib.getLib stdenv.cc.cc)
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    cp -r opt $out/opt
-    cp -r usr/share $out/share
-    substituteInPlace $out/share/applications/mihomo-party.desktop \
-      --replace-fail "/opt/mihomo-party/mihomo-party" "mihomo-party"
-    ln -s $out/opt/mihomo-party/mihomo-party $out/bin/mihomo-party
-
-    runHook postInstall
-  '';
-
-  preFixup = ''
-    patchelf --add-needed libGL.so.1 \
-      --add-rpath ${
-        lib.makeLibraryPath [
-          libGL
-          udev
-          libayatana-appindicator
-        ]
-      } $out/opt/mihomo-party/mihomo-party
-  '';
-
-  passthru.updateScript = ./update.sh;
-
-  meta = {
-    description = "Another Mihomo GUI";
-    homepage = "https://github.com/mihomo-party-org/mihomo-party";
-    mainProgram = "mihomo-party";
-    platforms = [
-      "aarch64-linux"
-      "x86_64-linux"
-    ];
-    license = lib.licenses.gpl3Plus;
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with lib.maintainers; [ ];
-  };
-})
diff --git a/pkgs/by-name/mi/mihomo-party/update.sh b/pkgs/by-name/mi/mihomo-party/update.sh
deleted file mode 100755
index 9e12398c0068..000000000000
--- a/pkgs/by-name/mi/mihomo-party/update.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash nix curl coreutils jq common-updater-scripts
-
-latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/mihomo-party-org/mihomo-party/releases/latest | jq -r ".tag_name")
-latestVersion="$(expr "$latestTag" : 'v\(.*\)')"
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; mihomo-party.version" | tr -d '"')
-
-echo "latest  version: $latestVersion"
-echo "current version: $currentVersion"
-
-if [[ "$latestVersion" == "$currentVersion" ]]; then
-    echo "package is up-to-date"
-    exit 0
-fi
-
-for i in \
-    "x86_64-linux amd64" \
-    "aarch64-linux arm64"; do
-    set -- $i
-    prefetch=$(nix-prefetch-url "https://github.com/mihomo-party-org/mihomo-party/releases/download/v$latestVersion/mihomo-party-linux-$latestVersion-$2.deb")
-    hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $prefetch)
-    update-source-version mihomo-party $latestVersion $hash --system=$1 --ignore-same-version
-done
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eb9c5f9ddad4..2638723f92f9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1316,6 +1316,7 @@ mapAliases {
   midori = throw "'midori' original project has been abandonned upstream and the package was broken for a while in nixpkgs"; # Added 2025-05-19
   midori-unwrapped = midori; # Added 2025-05-19
   MIDIVisualizer = midivisualizer; # Added 2024-06-12
+  mihomo-party = throw "'mihomo-party' has been removed due to upstream license violation"; # Added 2025-08-20
   mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01
   mime-types = mailcap; # Added 2022-01-21
   minetest = luanti; # Added 2024-11-11

From 5d71a099caa8b886b68e4b97cd30d8bded984726 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 11:36:40 +0200
Subject: [PATCH 2093/3724] cnspec: 11.67.1 -> 11.68.0

Diff: https://github.com/mondoohq/cnspec/compare/v11.67.1...v11.68.0

Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.68.0
---
 pkgs/by-name/cn/cnspec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index 55f620547b71..89df8acf242d 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "11.67.1";
+  version = "11.68.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-COVhnyZYJSUN3AUcZoHD97wrAkWvHlIbZmoMvaZ46Gw=";
+    hash = "sha256-OFV6xk8JbdmW0hj6UsrK/KW96kVNSCtzQ75dGLeuJCk=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-wVltxYhh+VepkpvJrORCG3TxDBnpgV6weJH90RJwA1U=";
+  vendorHash = "sha256-vVCpA7ete2XPcwSZLmtcmdcc467g+KI5zXbZVjZsur4=";
 
   subPackages = [ "apps/cnspec" ];
 

From ac18438cb8077d7e0206c37f2d5d8d290562a07e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 12:09:44 +0200
Subject: [PATCH 2094/3724] python313Packages.publicsuffixlist: 1.0.2.20250815
 -> 1.0.2.20250820

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250820-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 8ab1057ca902..fdee10a3f410 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250815";
+  version = "1.0.2.20250820";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-N08LlCOmZvkBbIPUh80QY/NM5wxS4FefKnFF4XvlH0k=";
+    hash = "sha256-T2K3Zay1dHGPzMOAxnFymk6Hwwu7U7WTrVrvrcGLva4=";
   };
 
   build-system = [ setuptools ];

From fb29f5f44994aba79fbe468cd8791fe315f2c801 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 12:10:08 +0200
Subject: [PATCH 2095/3724] python312Packages.mypy-boto3-batch: 1.40.5 ->
 1.40.12

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 865ca0c129d8..066a4cb6ded5 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -166,8 +166,8 @@ rec {
       "sha256-7FIXPtt4FMjxXbHtiO4qbS4wUfi10rmVODshIORlfhs=";
 
   mypy-boto3-batch =
-    buildMypyBoto3Package "batch" "1.40.5"
-      "sha256-RV7StAIpxSmwv9a+3YNGHKqym+y9A09fM4Cv2Qwj8f8=";
+    buildMypyBoto3Package "batch" "1.40.12"
+      "sha256-gCUSP40ik0hcjkAgiNsVaY5ivXcTmiZWm8u9fnpQU6o=";
 
   mypy-boto3-billingconductor =
     buildMypyBoto3Package "billingconductor" "1.40.0"

From 3e322c625e89313f4b2eae6e8bb0821642a2ddf2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 12:10:11 +0200
Subject: [PATCH 2096/3724] python312Packages.mypy-boto3-cleanrooms: 1.40.0 ->
 1.40.13

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 066a4cb6ded5..b56ae4c9591c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -210,8 +210,8 @@ rec {
       "sha256-4gZRcx2z2PJcm/q1X7Ufe8RAAyHNhPEawRiLBWeWC+A=";
 
   mypy-boto3-cleanrooms =
-    buildMypyBoto3Package "cleanrooms" "1.40.0"
-      "sha256-pb1knX+zPd5xbTx8ilHmnD3WZUOzmBbiIzvORb3P6XQ=";
+    buildMypyBoto3Package "cleanrooms" "1.40.13"
+      "sha256-KY5ybw74lvBMSJvMqNzJvgw4vuGHN13zo/gLV0ggCAw=";
 
   mypy-boto3-cloud9 =
     buildMypyBoto3Package "cloud9" "1.40.0"

From 244f3428c7b7df6d166718d46f84a514247e3e27 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 12:10:22 +0200
Subject: [PATCH 2097/3724] python312Packages.mypy-boto3-connect: 1.40.7 ->
 1.40.12

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b56ae4c9591c..c73b96a2b0c8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -338,8 +338,8 @@ rec {
       "sha256-eukD7L3JzqvzK5mW9ESu9L62id1EHGhYdy+afYowtAc=";
 
   mypy-boto3-connect =
-    buildMypyBoto3Package "connect" "1.40.7"
-      "sha256-xhy39XaNffvBgpk9vlilQ9WG3yUFhCfN5EsIdSxUKrE=";
+    buildMypyBoto3Package "connect" "1.40.12"
+      "sha256-JiUFL7yLXCSfrWNN09avj5/jYz5cGBBgQjVMrFjsWIA=";
 
   mypy-boto3-connect-contact-lens =
     buildMypyBoto3Package "connect-contact-lens" "1.40.0"

From bf1dae745e30c92a6625c1a5f042dcaf8b8d953c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 12:10:23 +0200
Subject: [PATCH 2098/3724] python312Packages.mypy-boto3-connectparticipant:
 1.40.0 -> 1.40.12

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c73b96a2b0c8..c40abfeef0d0 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -354,8 +354,8 @@ rec {
       "sha256-dDHPNM+HVEIBXu9GFRtnnY+j5J31Z0gNfv/cd91QX4I=";
 
   mypy-boto3-connectparticipant =
-    buildMypyBoto3Package "connectparticipant" "1.40.0"
-      "sha256-+dXdtfYLf5LclRoNazidUwu9uClEFXi286bGgAVbWYU=";
+    buildMypyBoto3Package "connectparticipant" "1.40.12"
+      "sha256-b+0wJbc/LuPL7CmVy+E70eyfFepvhRN+ymAwECm/j7Q=";
 
   mypy-boto3-controltower =
     buildMypyBoto3Package "controltower" "1.40.0"

From 865d1c52bf5df52f8eaace0fd5cd9964cdcb4f32 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 12:10:30 +0200
Subject: [PATCH 2099/3724] python312Packages.mypy-boto3-ec2: 1.40.10 ->
 1.40.13

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c40abfeef0d0..0397ab07b67d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -446,8 +446,8 @@ rec {
       "sha256-p+NFAi4x4J6S4v0f2u0awDG+lb2V7r3XwgYwl5CvhHo=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.40.10"
-      "sha256-mBpXSkz3eVzYlMqhzjVcCz+rVT21TvipBFaFAX4juHs=";
+    buildMypyBoto3Package "ec2" "1.40.13"
+      "sha256-w9aG9S079qgjEZ5CJcOzROsYKEJVcPnZVMnvpYEag30=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.40.0"

From 7fbb29b96f71c6d4bdfab85eeab5e3ef0c54f5e3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 12:10:39 +0200
Subject: [PATCH 2100/3724] python312Packages.mypy-boto3-glue: 1.40.10 ->
 1.40.11

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0397ab07b67d..cfd5eba534b4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -574,8 +574,8 @@ rec {
       "sha256-So/NDL0KF5iypLYitnJ/38C5RovqBGXcUhHtlEMnjMM=";
 
   mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.40.10"
-      "sha256-fSPTI/S04QFRgZIK5a7gBMaewT7AqaEwuIDf2tGdGHA=";
+    buildMypyBoto3Package "glue" "1.40.11"
+      "sha256-+nNOFsBvWARDHTyOyckg0DTga068yNRP9k35wbXUc8E=";
 
   mypy-boto3-grafana =
     buildMypyBoto3Package "grafana" "1.40.0"

From ffad5f4458f52d23879cec00ab524d69767409e9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 12:11:10 +0200
Subject: [PATCH 2101/3724] python312Packages.mypy-boto3-polly: 1.40.0 ->
 1.40.13

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index cfd5eba534b4..d13ebd5d5a6d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1050,8 +1050,8 @@ rec {
       "sha256-AY8HH2OrOvscERskVLYOx8c8MQntEEseeVwpN6cJuaY=";
 
   mypy-boto3-polly =
-    buildMypyBoto3Package "polly" "1.40.0"
-      "sha256-EGjIAOiEnTMneH5SUPBOiwNwQC2KyNoVvPECmPQsOkk=";
+    buildMypyBoto3Package "polly" "1.40.13"
+      "sha256-uzrN1a/jHzdN479b3O43trgL1Qay3GQbWWdHTiwI1Rc=";
 
   mypy-boto3-pricing =
     buildMypyBoto3Package "pricing" "1.40.0"

From 4ca92febb25e2408c9b4d8617aee84ad00e3ccb6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 12:11:18 +0200
Subject: [PATCH 2102/3724] python312Packages.mypy-boto3-s3control: 1.40.0 ->
 1.40.12

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d13ebd5d5a6d..e2e6e8c7aea2 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1166,8 +1166,8 @@ rec {
       "sha256-maSifwTWL+CzEDLydPLhmIn6ZkJEE2F6lBaHPEhWfx0=";
 
   mypy-boto3-s3control =
-    buildMypyBoto3Package "s3control" "1.40.0"
-      "sha256-uxxfSEz5FqkZoDeXXGOpZE9BQYxMp9vku9MedXQv7F4=";
+    buildMypyBoto3Package "s3control" "1.40.12"
+      "sha256-lC5XVPtSUMab52QRqv6o9+2grzETdFjpscjDwvqGNvE=";
 
   mypy-boto3-s3outposts =
     buildMypyBoto3Package "s3outposts" "1.40.0"

From b738280a3fc58f923ef59b6fea71ed2147643f75 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 12:11:19 +0200
Subject: [PATCH 2103/3724] python312Packages.mypy-boto3-sagemaker: 1.40.9 ->
 1.40.12

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e2e6e8c7aea2..dafbdbf65caa 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1174,8 +1174,8 @@ rec {
       "sha256-WRLXguy8jlRl+jw472aPmJXdcZg1mPZ/dfhETIVNLiU=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.40.9"
-      "sha256-ajWj/0jOu1j7BCiHKRuS7cpaTXgWzTwAX8kJHpFPREA=";
+    buildMypyBoto3Package "sagemaker" "1.40.12"
+      "sha256-FJviPobCElEmfwHhttJsF2D/CmruODvljv8e2T0yjSs=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.0"

From 9f5dc6a6a5c1be221adfc5af6850fa535367cb75 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 12:11:40 +0200
Subject: [PATCH 2104/3724] python313Packages.boto3-stubs: 1.40.10 -> 1.40.13

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index debd4dd0e90a..49b881e377d1 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.10";
+  version = "1.40.13";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-XBWJ7fk+0DN8jfO6f52akkdwvGwJ6axrDfDALs82csM=";
+    hash = "sha256-SmZVienkvt+PShB7pvlkxv7zyrPMY6PEaiG4vsNpACo=";
   };
 
   build-system = [ setuptools ];

From bf5a48c1fb4c27d2ef3a93bef15be89e4d4a1295 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 10:19:32 +0000
Subject: [PATCH 2105/3724] kubeseal: 0.30.0 -> 0.31.0

---
 pkgs/by-name/ku/kubeseal/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ku/kubeseal/package.nix b/pkgs/by-name/ku/kubeseal/package.nix
index 6b2f051fd735..c7edf75114b5 100644
--- a/pkgs/by-name/ku/kubeseal/package.nix
+++ b/pkgs/by-name/ku/kubeseal/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubeseal";
-  version = "0.30.0";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "bitnami-labs";
     repo = "sealed-secrets";
     rev = "v${version}";
-    sha256 = "sha256-lcRrLzM+/F5PRcLbrUjAjoOp35TRlte00QuWjKk1PrY=";
+    sha256 = "sha256-hHCHAvBLsTb0316/I5N3lUBEJul7Uh7ViZVqNVCBtog=";
   };
 
-  vendorHash = "sha256-JpPfj8xZ1jmawazQ9LmkuxC5L2xIdLp4E43TpD+p71o=";
+  vendorHash = "sha256-KUSwNnMYn1XlKJdEEsHDeyTGi9gATVvCQoQDRHx+Z3A=";
 
   subPackages = [ "cmd/kubeseal" ];
 

From 6ce915f047f7faa8cc9154379b5101e4be910cfb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 12:27:19 +0200
Subject: [PATCH 2106/3724] python313Packages.python-mystrom: 2.4.0 -> 2.5.0

Diff: https://github.com/home-assistant-ecosystem/python-mystrom/compare/2.4.0...2.5.0

Changelog: https://github.com/home-assistant-ecosystem/python-mystrom/releases/tag/2.5.0
---
 pkgs/development/python-modules/python-mystrom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-mystrom/default.nix b/pkgs/development/python-modules/python-mystrom/default.nix
index dc6ed950278b..3c5becf1a2c2 100644
--- a/pkgs/development/python-modules/python-mystrom/default.nix
+++ b/pkgs/development/python-modules/python-mystrom/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "python-mystrom";
-  version = "2.4.0";
+  version = "2.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-mystrom";
     tag = version;
-    hash = "sha256-zG1T+wC0GznNwP3fi8GKtY9Csq9hyX0vw+h7ARVPQFQ=";
+    hash = "sha256-G3LbaEF7e61woa1Y3J1OmR0krIfjk2t6nX13lil+4G0=";
   };
 
   build-system = [ poetry-core ];

From 4758543c6eddc75878a70a8a28f950cb5205cbf8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 12:31:30 +0200
Subject: [PATCH 2107/3724] exploitdb: 2025-08-12 -> 2025-08-19

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/2025-08-12...2025-08-19
---
 pkgs/by-name/ex/exploitdb/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix
index fe286c4a24fe..bc197eeaceec 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "exploitdb";
-  version = "2025-08-12";
+  version = "2025-08-19";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     tag = finalAttrs.version;
-    hash = "sha256-5uHjvrYWMhcWKAt/Wda7Ud0uHw8oMv7acTlgZUC4r3Q=";
+    hash = "sha256-jCFFgfBbgledI/o7o69yUMhWoCzAzHaperMsn/gBh0M=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 0528509f0608d6081d86e00c9a98ea16503c1a08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 10:50:51 +0000
Subject: [PATCH 2108/3724] chatmcp: 0.0.71 -> 0.0.74

---
 pkgs/by-name/ch/chatmcp/package.nix       |  4 +-
 pkgs/by-name/ch/chatmcp/pubspec.lock.json | 92 +++++++++++------------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/pkgs/by-name/ch/chatmcp/package.nix b/pkgs/by-name/ch/chatmcp/package.nix
index 8787065520ed..bafeb9019dde 100644
--- a/pkgs/by-name/ch/chatmcp/package.nix
+++ b/pkgs/by-name/ch/chatmcp/package.nix
@@ -14,13 +14,13 @@
 
 flutter332.buildFlutterApplication rec {
   pname = "chatmcp";
-  version = "0.0.71";
+  version = "0.0.74";
 
   src = fetchFromGitHub {
     owner = "daodao97";
     repo = "chatmcp";
     tag = "v${version}";
-    hash = "sha256-Cg9ZBBsNIbvLBJS9akRuC4kQjYINA+UAbJdn2sY5c6U=";
+    hash = "sha256-ITqTPP1w4M/yXrtU/5Pcpx5xQxAZkCsAFL4s0vJiQ9U=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/ch/chatmcp/pubspec.lock.json b/pkgs/by-name/ch/chatmcp/pubspec.lock.json
index c4e5fe3036b0..ec08026cae59 100644
--- a/pkgs/by-name/ch/chatmcp/pubspec.lock.json
+++ b/pkgs/by-name/ch/chatmcp/pubspec.lock.json
@@ -14,11 +14,11 @@
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "01949bf52ad33f0e0f74f881fbaac4f348c556531951d92c8d16f1262aa19ff8",
+        "sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.5.4"
+      "version": "7.7.1"
     },
     "archive": {
       "dependency": "transitive",
@@ -74,11 +74,11 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7",
+        "sha256": "7d95cbbb1526ab5ae977df9b4cc660963b9b27f6d1075c0b34653868911385e4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "3.0.0"
     },
     "build_config": {
       "dependency": "transitive",
@@ -104,31 +104,31 @@
       "dependency": "transitive",
       "description": {
         "name": "build_resolvers",
-        "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62",
+        "sha256": "38c9c339333a09b090a638849a4c56e70a404c6bdd3b511493addfbc113b60c2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "3.0.0"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53",
+        "sha256": "b971d4a1c789eba7be3e6fe6ce5e5b50fd3719e3cb485b3fad6d04358304351d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.6.0"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792",
+        "sha256": "c04e612ca801cd0928ccdb891c263a2b1391cb27940a5ea5afcf9ba894de5d62",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.1.2"
+      "version": "9.2.0"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -144,11 +144,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27",
+        "sha256": "ba95c961bafcd8686d1cf63be864eb59447e795e124d98d6a27d91fcd13602fb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.10.1"
+      "version": "8.11.1"
     },
     "cached_network_image": {
       "dependency": "direct main",
@@ -264,11 +264,11 @@
       "dependency": "transitive",
       "description": {
         "name": "coverage",
-        "sha256": "aa07dbe5f2294c827b7edb9a87bba44a9c15a3cc81bc8da2ca19b37322d30080",
+        "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.14.1"
+      "version": "1.15.0"
     },
     "cross_file": {
       "dependency": "transitive",
@@ -314,11 +314,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af",
+        "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0"
+      "version": "3.1.1"
     },
     "dbus": {
       "dependency": "transitive",
@@ -344,11 +344,11 @@
       "dependency": "direct main",
       "description": {
         "name": "dio",
-        "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9",
+        "sha256": "d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.8.0+1"
+      "version": "5.9.0"
     },
     "dio_web_adapter": {
       "dependency": "transitive",
@@ -414,11 +414,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "ef9908739bdd9c476353d6adff72e88fd00c625f5b959ae23f7567bd5137db0a",
+        "sha256": "97a943524074a1e8e858aa154d09e38a4168a9ad765d6cac66606fd906b86875",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.2.0"
+      "version": "10.2.2"
     },
     "fixnum": {
       "dependency": "transitive",
@@ -656,11 +656,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
+        "sha256": "6382ce712ff69b0f719640ce957559dde459e55ecd433c767e06d139ddf16cab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.28"
+      "version": "2.0.29"
     },
     "flutter_popup": {
       "dependency": "direct main",
@@ -768,11 +768,11 @@
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
+        "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.0"
     },
     "http_methods": {
       "dependency": "transitive",
@@ -858,11 +858,11 @@
       "dependency": "direct main",
       "description": {
         "name": "json_serializable",
-        "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c",
+        "sha256": "ce2cf974ccdee13be2a510832d7fba0b94b364e0b0395dee42abaa51b855be27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.9.5"
+      "version": "6.10.0"
     },
     "keyboard_dismisser": {
       "dependency": "direct main",
@@ -998,11 +998,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "mockito",
-        "sha256": "4546eac99e8967ea91bae633d2ca7698181d008e95fa4627330cf903d573277a",
+        "sha256": "2314cbe9165bcd16106513df9cf3c3224713087f09723b128928dc11a4379f99",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.4.6"
+      "version": "5.5.0"
     },
     "nested": {
       "dependency": "transitive",
@@ -1398,11 +1398,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
+        "sha256": "5bcf0772a761b04f8c6bf814721713de6f3e5d9d89caf8d3fe031b02a342379e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.10"
+      "version": "2.4.11"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1524,21 +1524,21 @@
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b",
+        "sha256": "fc787b1f89ceac9580c3616f899c9a447413cbdac1df071302127764c023a134",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "3.0.0"
     },
     "source_helper": {
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c",
+        "sha256": "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.5"
+      "version": "1.3.6"
     },
     "source_map_stack_trace": {
       "dependency": "transitive",
@@ -1604,11 +1604,11 @@
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b",
+        "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.5"
+      "version": "2.5.6"
     },
     "sqflite_common_ffi": {
       "dependency": "direct main",
@@ -1624,11 +1624,11 @@
       "dependency": "direct main",
       "description": {
         "name": "sqflite_common_ffi_web",
-        "sha256": "983cf7b33b16e6bc086c8e09f6a1fae69d34cdb167d7acaf64cbd3515942d4e6",
+        "sha256": "33495e9172c958d907c48fd43fbea0b9c0a2ec2e36a548ebd07672fde61b6497",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.0.1+1"
     },
     "sqflite_darwin": {
       "dependency": "transitive",
@@ -1654,11 +1654,11 @@
       "dependency": "transitive",
       "description": {
         "name": "sqlite3",
-        "sha256": "c0503c69b44d5714e6abbf4c1f51a3c3cc42b75ce785f44404765e4635481d38",
+        "sha256": "f393d92c71bdcc118d6203d07c991b9be0f84b1a6f89dd4f7eed348131329924",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.7.6"
+      "version": "2.9.0"
     },
     "stack_trace": {
       "dependency": "transitive",
@@ -1784,21 +1784,21 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
+        "sha256": "0aedad096a85b49df2e4725fa32118f9fa580f3b14af7a2d2221896a02cd5656",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.16"
+      "version": "6.3.17"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
@@ -1994,11 +1994,11 @@
       "dependency": "direct main",
       "description": {
         "name": "window_manager",
-        "sha256": "51d50168ab267d344b975b15390426b1243600d436770d3f13de67e55b05ec16",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.0"
+      "version": "0.5.1"
     },
     "xdg_directories": {
       "dependency": "transitive",

From 486732f3171cec342485c01e2edf49d983dac7a8 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 20 Aug 2025 12:56:15 +0200
Subject: [PATCH 2109/3724] d2: 0.7.0 -> 0.7.1, modernize

---
 pkgs/by-name/d2/d2/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/d2/d2/package.nix b/pkgs/by-name/d2/d2/package.nix
index fc4e2bbb31c3..a082aea94973 100644
--- a/pkgs/by-name/d2/d2/package.nix
+++ b/pkgs/by-name/d2/d2/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGo123Module,
+  buildGoModule,
   fetchFromGitHub,
   installShellFiles,
   git,
@@ -8,25 +8,25 @@
   d2,
 }:
 
-buildGo123Module rec {
+buildGoModule (finalAttrs: {
   pname = "d2";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "terrastruct";
     repo = "d2";
-    tag = "v${version}";
-    hash = "sha256-RlQRf/ueYCbanXXA8tAftQ/9JKkH0QwT4+7Vlwtlnp8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZRAvMcJKQmvcBbT2foKDYS0gTeqOZqFu3V3iXIbfLsQ=";
   };
 
-  vendorHash = "sha256-STiIS0BRHypNujKNtNb77IXBDdeHVl/uGjVFubJrDc8=";
+  vendorHash = "sha256-UZDk2upJ0xTSAg/DpRHCzdAOLnaeI0WLMJ6jNt8elKI=";
 
   excludedPackages = [ "./e2etests" ];
 
   ldflags = [
     "-s"
     "-w"
-    "-X oss.terrastruct.com/d2/lib/version.Version=v${version}"
+    "-X oss.terrastruct.com/d2/lib/version.Version=v${finalAttrs.version}"
   ];
 
   nativeBuildInputs = [ installShellFiles ];
@@ -44,18 +44,18 @@ buildGo123Module rec {
 
   passthru.tests.version = testers.testVersion {
     package = d2;
-    version = "v${version}";
+    version = "v${finalAttrs.version}";
   };
 
   meta = {
     description = "Modern diagram scripting language that turns text to diagrams";
     mainProgram = "d2";
     homepage = "https://d2lang.com";
-    changelog = "https://github.com/terrastruct/d2/releases/tag/v${version}";
+    changelog = "https://github.com/terrastruct/d2/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       dit7ya
       kashw2
     ];
   };
-}
+})

From e50c883d982e8f6d4333880e900f6ed19215e8ea Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 20 Aug 2025 13:01:58 +0200
Subject: [PATCH 2110/3724] csharp-ls: 0.18.0 -> 0.19.0

Diff:
https://github.com/razzmatazz/csharp-language-server/compare/0.18.0...0.19.0

Changelog:
https://github.com/razzmatazz/csharp-language-server/releases/tag/0.19.0
---
 pkgs/by-name/cs/csharp-ls/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix
index 4167fc1516e7..80251922c383 100644
--- a/pkgs/by-name/cs/csharp-ls/package.nix
+++ b/pkgs/by-name/cs/csharp-ls/package.nix
@@ -11,9 +11,9 @@ in
 
 buildDotnetGlobalTool rec {
   pname = "csharp-ls";
-  version = "0.18.0";
+  version = "0.19.0";
 
-  nugetHash = "sha256-VSlyAt5c03Oiha21ZyQ4Xm/2iIse0h1eVrVpu+nWW3s=";
+  nugetHash = "sha256-Xd4DTSvhOyz+pqk4bpUCAz69WG5hby5yJsd/lO6Cs/Y=";
 
   inherit dotnet-sdk;
   dotnet-runtime = dotnet-sdk;

From 31b3def0b183739bee558cc80a7ab4c9b7bffb21 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 13:20:08 +0200
Subject: [PATCH 2111/3724] python313Packages.holidays: 0.78 -> 0.79

Diff: https://github.com/vacanza/python-holidays/compare/v0.78...v0.79

Changelog: https://github.com/vacanza/python-holidays/releases/tag/v0.79
---
 pkgs/development/python-modules/holidays/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 5ec47d5f6efc..54f580a6f594 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "holidays";
-  version = "0.78";
+  version = "0.79";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "vacanza";
     repo = "python-holidays";
     tag = "v${version}";
-    hash = "sha256-THZg1125rN5HLoiw7xMiKwSNcKzXZgXL8DkbnCMiJ/c=";
+    hash = "sha256-z1baUtD+GFPSRi8siT5X5QSSU2enC0cfnzNwYLHcWTQ=";
   };
 
   build-system = [

From 43d364787c56f78898a17eab38fff07771ba1842 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 18 Jun 2025 20:00:44 +0800
Subject: [PATCH 2112/3724] nixos/fcitx5: remove
 i18n.inputMethod.fcitx5.plasma6Support

---
 .../manual/release-notes/rl-2511.section.md    |  2 ++
 nixos/modules/i18n/input-method/fcitx5.nix     | 18 ++++--------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 01ad322de9c5..3df6414ec8d1 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -130,6 +130,8 @@
 
 - `renovate` was updated to v41. See the upstream release notes for [v40](https://github.com/renovatebot/renovate/releases/tag/40.0.0) and [v41](https://github.com/renovatebot/renovate/releases/tag/41.0.0) for breaking changes.
 
+- `i18n.inputMethod.fcitx5.plasma6Support` has been removed because qt6 is the only one used for fcitx5-configtool now.
+
 - The `boot.readOnlyNixStore` has been removed. Control over bind mount options on `/nix/store` is now offered by the `boot.nixStoreMountOpts` option.
 
 - The Postfix module has been updated and likely requires configuration changes:
diff --git a/nixos/modules/i18n/input-method/fcitx5.nix b/nixos/modules/i18n/input-method/fcitx5.nix
index 9f3517dd7771..81e65517f515 100644
--- a/nixos/modules/i18n/input-method/fcitx5.nix
+++ b/nixos/modules/i18n/input-method/fcitx5.nix
@@ -7,11 +7,7 @@
 let
   imcfg = config.i18n.inputMethod;
   cfg = imcfg.fcitx5;
-  fcitx5Package =
-    if cfg.plasma6Support then
-      pkgs.qt6Packages.fcitx5-with-addons.override { inherit (cfg) addons; }
-    else
-      pkgs.libsForQt5.fcitx5-with-addons.override { inherit (cfg) addons; };
+  fcitx5Package = pkgs.qt6Packages.fcitx5-with-addons.override { inherit (cfg) addons; };
   settingsFormat = pkgs.formats.ini { };
 in
 {
@@ -33,15 +29,6 @@ in
           See [Using Fcitx 5 on Wayland](https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland).
         '';
       };
-      plasma6Support = lib.mkOption {
-        type = lib.types.bool;
-        default = config.services.desktopManager.plasma6.enable;
-        defaultText = lib.literalExpression "config.services.desktopManager.plasma6.enable";
-        description = ''
-          Use qt6 versions of fcitx5 packages.
-          Required for configuring fcitx5 in KDE System Settings.
-        '';
-      };
       quickPhrase = lib.mkOption {
         type = with lib.types; attrsOf str;
         default = { };
@@ -109,6 +96,9 @@ in
     (lib.mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx5" "enableRimeData" ] ''
       RIME data is now included in `fcitx5-rime` by default, and can be customized using `fcitx5-rime.override { rimeDataPkgs = ...; }`
     '')
+    (lib.mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx5" "plasma6Support" ] ''
+      qt6 is the only one used for fcitx5-configtool now.
+    '')
   ];
 
   config = lib.mkIf (imcfg.enable && imcfg.type == "fcitx5") {

From 01fc72b3566368a219470f4ac0b456216cf5ba29 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 3 Aug 2025 09:15:13 +0800
Subject: [PATCH 2113/3724] fcitx5: remove from qt5 packages and use qt6 ones
 as top-level aliases

---
 pkgs/by-name/wp/wpsoffice-cn/package.nix |  1 -
 pkgs/tools/inputmethods/fcitx5/update.py |  2 +-
 pkgs/top-level/aliases.nix               | 10 +++++-----
 pkgs/top-level/qt5-packages.nix          | 10 ----------
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix
index 611f802f9b11..4120f0a0cda2 100644
--- a/pkgs/by-name/wp/wpsoffice-cn/package.nix
+++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix
@@ -102,7 +102,6 @@ stdenv.mkDerivation rec {
     libmysqlclient
     llvmPackages.openmp
     dbus
-    libsForQt5.fcitx5-qt
   ];
 
   dontWrapQtApps = true;
diff --git a/pkgs/tools/inputmethods/fcitx5/update.py b/pkgs/tools/inputmethods/fcitx5/update.py
index 8fa59d2926e2..08b8f6938678 100755
--- a/pkgs/tools/inputmethods/fcitx5/update.py
+++ b/pkgs/tools/inputmethods/fcitx5/update.py
@@ -35,7 +35,7 @@ def main():
     for repo in REPOS:
         rev = get_latest_tag(repo)
         if repo == "fcitx5-qt":
-            subprocess.run(["nix-update", "--commit", "--version", rev, "libsForQt5.{}".format(repo)])
+            subprocess.run(["nix-update", "--commit", "--version", rev, "qt6Packages.{}".format(repo)])
         else:
             subprocess.run(["nix-update", "--commit", "--version", rev, repo])
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2bcd0d4e169d..c7c85824f0c3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -737,11 +737,11 @@ mapAliases {
   futuresql = libsForQt5.futuresql; # added 2023-11-11
   fx_cast_bridge = fx-cast-bridge; # added 2023-07-26
 
-  fcitx5-chinese-addons = libsForQt5.fcitx5-chinese-addons; # Added 2024-03-01
-  fcitx5-configtool = libsForQt5.fcitx5-configtool; # Added 2024-03-01
-  fcitx5-skk-qt = libsForQt5.fcitx5-skk-qt; # Added 2024-03-01
-  fcitx5-unikey = libsForQt5.fcitx5-unikey; # Added 2024-03-01
-  fcitx5-with-addons = libsForQt5.fcitx5-with-addons; # Added 2024-03-01
+  fcitx5-chinese-addons = qt6Packages.fcitx5-chinese-addons; # Added 2024-03-01
+  fcitx5-configtool = qt6Packages.fcitx5-configtool; # Added 2024-03-01
+  fcitx5-skk-qt = qt6Packages.fcitx5-skk-qt; # Added 2024-03-01
+  fcitx5-unikey = qt6Packages.fcitx5-unikey; # Added 2024-03-01
+  fcitx5-with-addons = qt6Packages.fcitx5-with-addons; # Added 2024-03-01
 
   ### G ###
 
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 2453bc438f00..f3beeaf71b13 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -132,16 +132,6 @@ makeScopeWithSplicing' {
 
         fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { };
 
-        fcitx5-chinese-addons = callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { };
-
-        fcitx5-configtool = callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { };
-
-        fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; };
-
-        fcitx5-unikey = callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { };
-
-        fcitx5-with-addons = callPackage ../tools/inputmethods/fcitx5/with-addons.nix { };
-
         futuresql = callPackage ../development/libraries/futuresql { };
 
         qgpgme = callPackage ../development/libraries/gpgme { };

From c7cbb23678d66125afa471881140f1a05003c2b0 Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Wed, 20 Aug 2025 07:30:49 -0400
Subject: [PATCH 2114/3724] tdf: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/by-name/td/tdf/package.nix b/pkgs/by-name/td/tdf/package.nix
index e02e0f0ee762..e3a49e93ab94 100644
--- a/pkgs/by-name/td/tdf/package.nix
+++ b/pkgs/by-name/td/tdf/package.nix
@@ -8,14 +8,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tdf";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "itsjunetime";
     repo = "tdf";
     fetchSubmodules = true;
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yttuWWKIrh54eJSdKejDTswoDarNifD5DtfQHSlL3rE=";
+    hash = "sha256-le2xlSVnYbWMDV9+SbrTFHSFZn/H6N7CEaKr5Zzo/c4=";
   };
 
   cargoHash = "sha256-UB7G5tl90CNq/aYUaUOpgGJcEL9ND3pJ29/lpIkh2iU=";

From d85a1150097a32c230a180c4e4c20959e8f66e29 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 13:31:32 +0200
Subject: [PATCH 2115/3724] python313Packages.unicrypto: 0.0.10 -> 0.0.11

Diff: https://github.com/skelsec/unicrypto/compare/0.0.10...0.0.11

Changelog: https://github.com/skelsec/unicrypto/releases/tag/0.0.11
---
 pkgs/development/python-modules/unicrypto/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/unicrypto/default.nix b/pkgs/development/python-modules/unicrypto/default.nix
index b5d907ea3798..cfcc15be66cb 100644
--- a/pkgs/development/python-modules/unicrypto/default.nix
+++ b/pkgs/development/python-modules/unicrypto/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "unicrypto";
-  version = "0.0.10";
+  version = "0.0.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "skelsec";
     repo = "unicrypto";
     tag = version;
-    hash = "sha256-mZEnYVM5r4utiGwM7bp2SwaDjYsH8AR/Qm5UdPNke0w=";
+    hash = "sha256-quMh4yQSqbwZwWTJYxW/4F0k2c2nh82FEiNCSeQzhvo=";
   };
 
   propagatedBuildInputs = [

From a08d588df971e88febd07ffd2e5fd401fdb12ebe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 12:00:39 +0000
Subject: [PATCH 2116/3724] badsecrets: 0.11.118 -> 0.12.12

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

diff --git a/pkgs/development/python-modules/badsecrets/default.nix b/pkgs/development/python-modules/badsecrets/default.nix
index faa841bb7a21..ce8ce21b8b32 100644
--- a/pkgs/development/python-modules/badsecrets/default.nix
+++ b/pkgs/development/python-modules/badsecrets/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "badsecrets";
-  version = "0.11.118";
+  version = "0.12.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "blacklanternsecurity";
     repo = "badsecrets";
     tag = "v${version}";
-    hash = "sha256-7jKhXFrtZI+Xzs7R8E3zJNN3wTEkuTuhc3PGn6JOzTU=";
+    hash = "sha256-eZaTH47WYm89JgDrY0eTTrFC5OkbKqV+MY1bHWaiExU=";
   };
 
   build-system = [

From 3a96cf79a17d083e4800dd54f48c850a71327fa9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 12:01:44 +0000
Subject: [PATCH 2117/3724] python3Packages.libpyfoscamcgi: 0.0.6 -> 0.0.7

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

diff --git a/pkgs/development/python-modules/libpyfoscamcgi/default.nix b/pkgs/development/python-modules/libpyfoscamcgi/default.nix
index ebd3e294a6c4..d26b01670720 100644
--- a/pkgs/development/python-modules/libpyfoscamcgi/default.nix
+++ b/pkgs/development/python-modules/libpyfoscamcgi/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "libpyfoscamcgi";
-  version = "0.0.6";
+  version = "0.0.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Foscam-wangzhengyu";
     repo = "libfoscamcgi";
     tag = "v${version}";
-    hash = "sha256-L9QGXBEK1cehP/eJ2++Um4WCgQMG5Rv8UAnZg4Mfwu4=";
+    hash = "sha256-QthzyMdZ2iberDmbeqf6MaUv8lH5xhlZLL8ZAlapvIk=";
   };
 
   build-system = [ setuptools ];

From 6f47cec5b47c36a00d15846e549477f646cb4fcd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 12:05:06 +0000
Subject: [PATCH 2118/3724] owi: 0.2-unstable-2025-07-23 ->
 0.2-unstable-2025-08-18

---
 pkgs/by-name/ow/owi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix
index d1e52452ccac..968af0d915b8 100644
--- a/pkgs/by-name/ow/owi/package.nix
+++ b/pkgs/by-name/ow/owi/package.nix
@@ -15,14 +15,14 @@ let
 in
 ocamlPackages.buildDunePackage rec {
   pname = "owi";
-  version = "0.2-unstable-2025-07-23";
+  version = "0.2-unstable-2025-08-18";
 
   src = fetchFromGitHub {
     owner = "ocamlpro";
     repo = "owi";
-    rev = "bcebeb15de0a4968d1cb59970ee4a0c635e78bf4";
+    rev = "40c6434ecdb0cf7248b98670526e18dc007b425b";
     fetchSubmodules = true;
-    hash = "sha256-MOgh5Q5Ai1Nk8DllUswiOk+Qu+hMRp7Q6mYPNSUs/1A=";
+    hash = "sha256-N/DO3vml7vzOjPi81LPOL+ZuI8CewAhANM9j4nuRbyU=";
   };
 
   nativeBuildInputs = with ocamlPackages; [

From de0ae8765cdda04fc5b20bf7a999a6cc161e10ec Mon Sep 17 00:00:00 2001
From: Sergey Volkov <taranarmo@gmail.com>
Date: Wed, 20 Aug 2025 13:47:47 +0200
Subject: [PATCH 2119/3724] gemini-cli: 0.1.21 -> 0.1.22

---
 pkgs/by-name/ge/gemini-cli/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index 5526698a89ab..dd8434a0a5cc 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -2,18 +2,18 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
-  gitUpdater,
+  nix-update-script,
 }:
 
 buildNpmPackage (finalAttrs: {
   pname = "gemini-cli";
-  version = "0.1.21";
+  version = "0.1.22";
 
   src = fetchFromGitHub {
     owner = "google-gemini";
     repo = "gemini-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eS83Uwp6LzyQuIx2jirXnJ6Xb2XEaAKLnS9PMKTIvyI=";
+    hash = "sha256-taQyrthHrlHc6Zy8947bpxvbHeSq0+JbgxROtQOGq44=";
   };
 
   patches = [
@@ -21,7 +21,7 @@ buildNpmPackage (finalAttrs: {
     ./restore-missing-dependencies-fields.patch
   ];
 
-  npmDepsHash = "sha256-5pFnxZFhVNxYLPJClYq+pe4wAX5623Y3hFj8lIq00+E=";
+  npmDepsHash = "sha256-1AJ+EZfPKioeptms3uio4U20zeQ9+yKC69Gbm6HlFMY=";
 
   preConfigure = ''
     mkdir -p packages/generated
@@ -49,7 +49,7 @@ buildNpmPackage (finalAttrs: {
     chmod +x "$out/bin/gemini"
   '';
 
-  passthru.updateScript = gitUpdater { };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "AI agent that brings the power of Gemini directly into your terminal";

From fd95f0dbc8d2dc2e9ecd429452359080d2e805ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 12:32:35 +0000
Subject: [PATCH 2120/3724] worldpainter: 2.25.1 -> 2.26.0

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

diff --git a/pkgs/by-name/wo/worldpainter/package.nix b/pkgs/by-name/wo/worldpainter/package.nix
index 7d90139cbcaf..36ca74e99b48 100644
--- a/pkgs/by-name/wo/worldpainter/package.nix
+++ b/pkgs/by-name/wo/worldpainter/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "worldpainter";
-  version = "2.25.1";
+  version = "2.26.0";
 
   src = fetchurl {
     url = "https://www.worldpainter.net/files/${pname}_${version}.tar.gz";
-    hash = "sha256-AfqMerBvDfMw1WTeQVcPPt1nvBv7+66TolFCX4lFNVY=";
+    hash = "sha256-/ppESrYoNbtxSWaCaKgwvtrW8IGLwigYgQuHF5F/26A=";
   };
 
   nativeBuildInputs = [

From 2a257c865b539085e6809d05cfeda559c05942db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 12:33:34 +0000
Subject: [PATCH 2121/3724] dprint-plugins.dprint-plugin-typescript: 0.95.9 ->
 0.95.10

---
 pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
index 2bb161699272..c5967b2769e9 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "TypeScript/JavaScript code formatter";
-  hash = "sha256-hn2t1y09OGcCY2fUziogOqTmVWJmLvPUBAXOaU7hTj4=";
+  hash = "sha256-gzwhGs3udzxLeYW4/OHqZRaD6y9WBNS2QlSYne8QAao=";
   initConfig = {
     configExcludes = [ "**/node_modules" ];
     configKey = "typescript";
@@ -16,6 +16,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-typescript";
   updateUrl = "https://plugins.dprint.dev/dprint/typescript/latest.json";
-  url = "https://plugins.dprint.dev/typescript-0.95.9.wasm";
-  version = "0.95.9";
+  url = "https://plugins.dprint.dev/typescript-0.95.10.wasm";
+  version = "0.95.10";
 }

From 782a6308df87bb4961cbd4686ced2117fc736e02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 12:44:47 +0000
Subject: [PATCH 2122/3724] python3Packages.recoll: 1.43.2 -> 1.43.4

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

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 92aac25623f1..8e15a73a6757 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -75,11 +75,11 @@ in
 
 mkDerivation rec {
   pname = "recoll";
-  version = "1.43.2";
+  version = "1.43.4";
 
   src = fetchurl {
     url = "https://www.recoll.org/${pname}-${version}.tar.gz";
-    hash = "sha256-FbDXknumjktcikOfAe4FKtPmggJGGHasq8dpD+8mNzE=";
+    hash = "sha256-QsciFCPPThcOlMoAx24ykigfHSEopnUtViquHf1kNMs=";
   };
 
   mesonFlags = [

From f880cbae2fff26fb5bd6b3e9d3de3d3f0aa12ea5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 12:53:49 +0000
Subject: [PATCH 2123/3724] vacuum-go: 0.17.8 -> 0.17.9

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

diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index c872fe50579b..084b03483533 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -7,14 +7,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "vacuum-go";
-  version = "0.17.8";
+  version = "0.17.9";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Vrvb4xLY7vxTaAlaPScBKmLfOgOzxGHpt4GJu8DnwUg=";
+    hash = "sha256-4DexFrYDvJl1VvPKtA2VnRFq9F+JOwTozGE9tXL5kIo=";
   };
 
   vendorHash = "sha256-IOlJHVzmBR4Re3VxAwLjpws3DTJSzG8JBya6L3WTeoQ=";

From 2939202813385b7a0b9dcb4935f98656d5ae6fb5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 12:57:48 +0000
Subject: [PATCH 2124/3724] autobase: 7.17.3 -> 7.18.0

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

diff --git a/pkgs/by-name/au/autobase/package.nix b/pkgs/by-name/au/autobase/package.nix
index 8b3272781cf6..b5fee21e8bc6 100644
--- a/pkgs/by-name/au/autobase/package.nix
+++ b/pkgs/by-name/au/autobase/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "autobase";
-  version = "7.17.3";
+  version = "7.18.0";
 
   src = fetchFromGitHub {
     owner = "holepunchto";
     repo = "autobase";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RTbK1U63gNuUN81ceJVjFzqNtg0kfvfq8DiLEpDXJq0=";
+    hash = "sha256-EnRF0dRgLM0NPWhlXnIlpULx1NEbK4VRq+atGJYUNsU=";
   };
 
   npmDepsHash = "sha256-H9Xy1VD7WQvi0+86v6CMcmc0L3mB6KuSCtgQSF4AlkY=";

From 9e6381942e3de598580619d3c42269d3b751daff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 13:04:51 +0000
Subject: [PATCH 2125/3724] waydroid-helper: 0.2.3 -> 0.2.5

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

diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix
index 81fa878b05ab..7088824e26ba 100644
--- a/pkgs/by-name/wa/waydroid-helper/package.nix
+++ b/pkgs/by-name/wa/waydroid-helper/package.nix
@@ -25,13 +25,13 @@
 }:
 
 let
-  version = "0.2.3";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "ayasa520";
     repo = "waydroid-helper";
     tag = "v${version}";
-    hash = "sha256-QxtCxujf7S3YRx/4rRMecFBomP+9tqrIBdYhc3WQT20=";
+    hash = "sha256-O1QJzv1p+cBAxVB2YXC45EQMsbIC01StmiIXEGdzqGw=";
   };
 in
 python3Packages.buildPythonApplication {

From f9696ce33be44dfd70ec11293d0cdab439409ddd Mon Sep 17 00:00:00 2001
From: Evgeny Kurnevsky <kurnevsky@gmail.com>
Date: Wed, 20 Aug 2025 15:11:50 +0200
Subject: [PATCH 2126/3724] llama-cpp: allow to override ROCM GPU targets

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 9a76c27bbadf..2b32c2d49b1a 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -12,6 +12,7 @@
 
   rocmSupport ? config.rocmSupport,
   rocmPackages ? { },
+  rocmGpuTargets ? builtins.concatStringsSep ";" rocmPackages.clr.gpuTargets,
 
   openclSupport ? false,
   clblast,
@@ -146,8 +147,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   ]
   ++ optionals rocmSupport [
     (cmakeFeature "CMAKE_HIP_COMPILER" "${rocmPackages.clr.hipClangPath}/clang++")
-    # TODO: this should become `clr.gpuTargets` in the future.
-    (cmakeFeature "CMAKE_HIP_ARCHITECTURES" rocmPackages.rocblas.amdgpu_targets)
+    (cmakeFeature "CMAKE_HIP_ARCHITECTURES" rocmGpuTargets)
   ]
   ++ optionals metalSupport [
     (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1")

From 6ec037c83bf233e4212ca810638f25e4f1c1ee7c Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sun, 20 Jul 2025 13:55:03 +0200
Subject: [PATCH 2127/3724] img4tool: init at 217

---
 .../im/img4tool/configure-version.patch       | 27 ++++++++++
 pkgs/by-name/im/img4tool/package.nix          | 54 +++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 pkgs/by-name/im/img4tool/configure-version.patch
 create mode 100644 pkgs/by-name/im/img4tool/package.nix

diff --git a/pkgs/by-name/im/img4tool/configure-version.patch b/pkgs/by-name/im/img4tool/configure-version.patch
new file mode 100644
index 000000000000..267245b5ddab
--- /dev/null
+++ b/pkgs/by-name/im/img4tool/configure-version.patch
@@ -0,0 +1,27 @@
+diff --git a/configure.ac b/configure.ac
+index 66da2bd..86278ec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,5 @@
+ AC_PREREQ([2.69])
+-AC_INIT([img4tool], m4_esyscmd([git rev-list --count HEAD | tr -d '\n']), [tihmstar@gmail.com])
++AC_INIT([img4tool], [tihmstar@gmail.com])
+ 
+ AC_CANONICAL_SYSTEM
+ AC_CANONICAL_HOST
+@@ -9,11 +9,10 @@ AM_INIT_AUTOMAKE([subdir-objects])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIRS([m4])
+ 
+-
+-AC_DEFINE([VERSION_COMMIT_COUNT], "m4_esyscmd([git rev-list --count HEAD | tr -d '\n'])", [Git commit count])
+-AC_DEFINE([VERSION_COMMIT_SHA], "m4_esyscmd([git rev-parse HEAD | tr -d '\n'])", [Git commit sha])
+-AC_SUBST([VERSION_COMMIT_COUNT], ["m4_esyscmd([git rev-list --count HEAD | tr -d '\n'])"])
+-AC_SUBST([VERSION_COMMIT_SHA], ["m4_esyscmd([git rev-parse HEAD | tr -d '\n'])"])
++AC_ARG_WITH([version-commit-count], [],
++  [VERSION_COMMIT_COUNT="$withval"])
++AC_DEFINE([VERSION_COMMIT_COUNT], ["$VERSION_COMMIT_COUNT"], [Git commit count])
++AC_SUBST([VERSION_COMMIT_COUNT], ["$VERSION_COMMIT_COUNT"])
+ 
+ # Checks for programs.
+ AC_PROG_CXX
diff --git a/pkgs/by-name/im/img4tool/package.nix b/pkgs/by-name/im/img4tool/package.nix
new file mode 100644
index 000000000000..15769ba96fe8
--- /dev/null
+++ b/pkgs/by-name/im/img4tool/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  clangStdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  pkg-config,
+  libgeneral,
+  libplist,
+  openssl,
+  lzfse,
+  git,
+}:
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "img4tool";
+  version = "217";
+
+  src = fetchFromGitHub {
+    owner = "tihmstar";
+    repo = "img4tool";
+    tag = finalAttrs.version;
+    hash = "sha256-67Xfq4jEK9juyaSIgVdWygAePZuyb4Yp8mY+6V66+Aw=";
+  };
+
+  # Do not depend on git to calculate version, instead
+  # pass version via configureFlag
+  patches = [ ./configure-version.patch ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    libgeneral
+    libplist
+    lzfse
+    openssl
+  ];
+
+  configureFlags = [
+    "--with-version-commit-count=${finalAttrs.version}"
+  ];
+
+  strictDeps = true;
+
+  meta = {
+    description = "Socket daemon to multiplex connections from and to iOS devices";
+    homepage = "https://github.com/tihmstar/img4tool";
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ onny ];
+    mainProgram = "img4tool";
+  };
+})

From 42b7c0db9d42bca58aaf5e704966928338985a38 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sun, 20 Jul 2025 14:12:03 +0200
Subject: [PATCH 2128/3724] usbmuxd2: Move libgeneral into own derivation

---
 pkgs/by-name/us/usbmuxd2/package.nix | 36 ++++------------------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/pkgs/by-name/us/usbmuxd2/package.nix b/pkgs/by-name/us/usbmuxd2/package.nix
index 41d20b911938..be7fb1cc6fcf 100644
--- a/pkgs/by-name/us/usbmuxd2/package.nix
+++ b/pkgs/by-name/us/usbmuxd2/package.nix
@@ -9,34 +9,8 @@
   avahi,
   clang,
   git,
+  libgeneral,
 }:
-let
-
-  libgeneral = clangStdenv.mkDerivation rec {
-    pname = "libgeneral";
-    version = "74";
-    src = fetchFromGitHub {
-      owner = "tihmstar";
-      repo = "libgeneral";
-      rev = "refs/tags/${version}";
-      hash = "sha256-6aowcIYssc1xqH6kTi/cpH2F7rgc8+lGC8HgZWYH2w0=";
-      # Leave DotGit so that autoconfigure can read version from git tags
-      leaveDotGit = true;
-    };
-    nativeBuildInputs = [
-      autoreconfHook
-      git
-      pkg-config
-    ];
-    meta = with lib; {
-      description = "Helper library used by usbmuxd2";
-      homepage = "https://github.com/tihmstar/libgeneral";
-      license = licenses.lgpl21;
-      platforms = platforms.all;
-    };
-  };
-
-in
 clangStdenv.mkDerivation {
   pname = "usbmuxd2";
   version = "unstable-2023-12-12";
@@ -83,12 +57,12 @@ clangStdenv.mkDerivation {
     "sbindir=${placeholder "out"}/bin"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/tihmstar/usbmuxd2";
     description = "Socket daemon to multiplex connections from and to iOS devices";
-    license = licenses.lgpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ onny ];
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ onny ];
     mainProgram = "usbmuxd";
   };
 }

From be94d3f8bfb17c7906915c494940820cb8d32d17 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sun, 20 Jul 2025 14:19:01 +0200
Subject: [PATCH 2129/3724] libgeneral: init at 84

---
 .../li/libgeneral/configure-version.patch     | 26 +++++++++++
 pkgs/by-name/li/libgeneral/package.nix        | 44 +++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/by-name/li/libgeneral/configure-version.patch
 create mode 100644 pkgs/by-name/li/libgeneral/package.nix

diff --git a/pkgs/by-name/li/libgeneral/configure-version.patch b/pkgs/by-name/li/libgeneral/configure-version.patch
new file mode 100644
index 000000000000..7392dc586b8a
--- /dev/null
+++ b/pkgs/by-name/li/libgeneral/configure-version.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index c214ccd..ab0cdd7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,5 @@
+ AC_PREREQ([2.69])
+-AC_INIT([libgeneral], m4_esyscmd([git rev-list --count HEAD | tr -d '\n']), [tihmstar@gmail.com])
++AC_INIT([libgeneral], [tihmstar@gmail.com])
+ 
+ AC_CANONICAL_SYSTEM
+ AC_CANONICAL_HOST
+@@ -9,10 +9,10 @@ AM_INIT_AUTOMAKE([subdir-objects])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIRS([m4])
+ 
+-AC_DEFINE([VERSION_COMMIT_COUNT], "m4_esyscmd([git rev-list --count HEAD | tr -d '\n'])", [Git commit count])
+-AC_DEFINE([VERSION_COMMIT_SHA], "m4_esyscmd([git rev-parse HEAD | tr -d '\n'])", [Git commit sha])
+-AC_SUBST([VERSION_COMMIT_COUNT], ["m4_esyscmd([git rev-list --count HEAD | tr -d '\n'])"])
+-AC_SUBST([VERSION_COMMIT_SHA], ["m4_esyscmd([git rev-parse HEAD | tr -d '\n'])"])
++AC_ARG_WITH([version-commit-count], [],
++  [VERSION_COMMIT_COUNT="$withval"])
++AC_DEFINE([VERSION_COMMIT_COUNT], ["$VERSION_COMMIT_COUNT"], [Git commit count])
++AC_SUBST([VERSION_COMMIT_COUNT], ["$VERSION_COMMIT_COUNT"])
+ 
+ # Checks for programs.
+ AC_PROG_CXX([clang++])
diff --git a/pkgs/by-name/li/libgeneral/package.nix b/pkgs/by-name/li/libgeneral/package.nix
new file mode 100644
index 000000000000..5327da9849df
--- /dev/null
+++ b/pkgs/by-name/li/libgeneral/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  clangStdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  pkg-config,
+  libimobiledevice,
+  libusb1,
+  avahi,
+}:
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "libgeneral";
+  version = "84";
+
+  src = fetchFromGitHub {
+    owner = "tihmstar";
+    repo = "libgeneral";
+    tag = finalAttrs.version;
+    hash = "sha256-D6S7Ha7SQvWDGwiJuKh2Y9YOsw2ytxn70ia3llKC034=";
+  };
+
+  # Do not depend on git to calculate version, instead
+  # pass version via configureFlag
+  patches = [ ./configure-version.patch ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  configureFlags = [
+    "--with-version-commit-count=${finalAttrs.version}"
+  ];
+
+  strictDeps = true;
+
+  meta = {
+    description = "Helper library used by usbmuxd2";
+    homepage = "https://github.com/tihmstar/libgeneral";
+    license = lib.licenses.lgpl21;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ onny ];
+  };
+})

From 279dcc5a3e9faca51eb8945b5db15ec4223a312a Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:16:52 +0300
Subject: [PATCH 2130/3724] raycast: 1.102.4 -> 1.102.5

---
 pkgs/by-name/ra/raycast/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix
index 37d9ef4606eb..a0cc3e8b33c2 100644
--- a/pkgs/by-name/ra/raycast/package.nix
+++ b/pkgs/by-name/ra/raycast/package.nix
@@ -12,19 +12,19 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "raycast";
-  version = "1.102.4";
+  version = "1.102.5";
 
   src =
     {
       aarch64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
-        hash = "sha256-VYwvU9DWowE+34ZBAsqIjGJGnHVfdVWGl4baL5boN8M=";
+        hash = "sha256-Fh46CsAeE9TpqVlYCc6s5ytO5dm+xoDJ7NawML4D9R4=";
       };
       x86_64-darwin = fetchurl {
         name = "Raycast.dmg";
         url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-LMkHWs/H5ESdp+JaUG0rlI9UVx29WYcU44t0fBAWg8A=";
+        hash = "sha256-tBFnk5R9BqfL+MH1tBY76al7/jVzqpfI7yIGADQh6wQ=";
       };
     }
     .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");

From 0f4642c7961dfc1348b607f47ff8c9a8cf6b3656 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 17 Aug 2025 03:34:56 +0200
Subject: [PATCH 2131/3724] fetchFromRadicle: init

---
 doc/build-helpers/fetchers.chapter.md       | 18 +++++++++
 doc/redirects.json                          |  3 ++
 pkgs/build-support/fetchradicle/default.nix | 44 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 4 files changed, 67 insertions(+)
 create mode 100644 pkgs/build-support/fetchradicle/default.nix

diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md
index 6a6ebe9013c2..08b978e720dc 100644
--- a/doc/build-helpers/fetchers.chapter.md
+++ b/doc/build-helpers/fetchers.chapter.md
@@ -896,6 +896,24 @@ If `fetchSubmodules` is `true`, `fetchFromSourcehut` uses `fetchgit`
 or `fetchhg` with `fetchSubmodules` or `fetchSubrepos` set to `true`,
 respectively. Otherwise, the fetcher uses `fetchzip`.
 
+## `fetchFromRadicle` {#fetchfromradicle}
+
+This is used with Radicle repositories. The arguments expected are similar to `fetchgit`.
+
+Requires a `seed` argument (e.g. `seed.radicle.xyz` or `rosa.radicle.xyz`) and a `repo` argument
+(the repository id *without* the `rad:` prefix). Also accepts an optional `node` argument which
+contains the id of the node from which to fetch the specified ref. If `node` is `null` (the
+default), a canonical ref is fetched instead.
+
+```nix
+fetchFromRadicle {
+  seed = "seed.radicle.xyz";
+  repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5"; # heartwood
+  tag = "releases/1.3.0";
+  hash = "sha256-4o88BWKGGOjCIQy7anvzbA/kPOO+ZsLMzXJhE61odjw=";
+}
+```
+
 ## `requireFile` {#requirefile}
 
 `requireFile` allows requesting files that cannot be fetched automatically, but whose content is known.
diff --git a/doc/redirects.json b/doc/redirects.json
index 8210470b5bcb..cb43dbf9ff23 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -1657,6 +1657,9 @@
   "fetchfromsourcehut": [
     "index.html#fetchfromsourcehut"
   ],
+  "fetchfromradicle": [
+    "index.html#fetchfromradicle"
+  ],
   "requirefile": [
     "index.html#requirefile"
   ],
diff --git a/pkgs/build-support/fetchradicle/default.nix b/pkgs/build-support/fetchradicle/default.nix
new file mode 100644
index 000000000000..a8102c382c02
--- /dev/null
+++ b/pkgs/build-support/fetchradicle/default.nix
@@ -0,0 +1,44 @@
+{ lib, fetchgit }:
+
+lib.makeOverridable (
+  {
+    seed,
+    repo,
+    node ? null,
+    rev ? null,
+    tag ? null,
+    ...
+  }@args:
+
+  assert lib.assertMsg (lib.xor (tag != null) (
+    rev != null
+  )) "fetchFromRadicle requires one of either `rev` or `tag` to be provided (not both).";
+
+  let
+    namespacePrefix = lib.optionalString (node != null) "refs/namespaces/${node}/";
+    rev' = if tag != null then "refs/tags/${tag}" else rev;
+  in
+
+  fetchgit (
+    {
+      url = "https://${seed}/${repo}.git";
+      rev = "${namespacePrefix}${rev'}";
+    }
+    // removeAttrs args [
+      "seed"
+      "repo"
+      "node"
+      "rev"
+      "tag"
+    ]
+  )
+  // {
+    inherit
+      seed
+      repo
+      node
+      rev
+      tag
+      ;
+  }
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c60ad7b5884..0e51a150197f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -697,6 +697,8 @@ with pkgs;
 
   fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz { };
 
+  fetchFromRadicle = callPackage ../build-support/fetchradicle { };
+
   fetchgx = callPackage ../build-support/fetchgx { };
 
   fetchPypi = callPackage ../build-support/fetchpypi { };

From 036be6edbae5f37143def9dba764ceb8b387b5e5 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 17 Aug 2025 03:49:19 +0200
Subject: [PATCH 2132/3724] radicle-node: use fetchFromRadicle

---
 pkgs/by-name/ra/radicle-node/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 15da4c6ec221..347044035a06 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -1,6 +1,6 @@
 {
   asciidoctor,
-  fetchgit,
+  fetchFromRadicle,
   git,
   installShellFiles,
   jq,
@@ -22,9 +22,11 @@ rustPlatform.buildRustPackage rec {
   version = "1.3.0";
   env.RADICLE_VERSION = version;
 
-  src = fetchgit {
-    url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git";
-    rev = "refs/namespaces/z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM/refs/tags/v${version}";
+  src = fetchFromRadicle {
+    seed = "seed.radicle.xyz";
+    repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5";
+    node = "z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM";
+    tag = "v${version}";
     hash = "sha256-0gK+fM/YGGpxlcR1HQixbLK0/sv+HH29h6ajEP2w2pI=";
     leaveDotGit = true;
     postFetch = ''

From 1ddbbb16715d268ff003ab7b11821cd04bb0b4e2 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 17 Aug 2025 03:49:33 +0200
Subject: [PATCH 2133/3724] radicle-httpd: use fetchFromRadicle

---
 pkgs/by-name/ra/radicle-explorer/package.nix |  5 ++---
 pkgs/by-name/ra/radicle-httpd/package.nix    | 12 +++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix
index 30eb045a1bff..15686e7c5a94 100644
--- a/pkgs/by-name/ra/radicle-explorer/package.nix
+++ b/pkgs/by-name/ra/radicle-explorer/package.nix
@@ -1,7 +1,6 @@
 {
   radicle-httpd,
   fetchFromGitHub,
-  fetchgit,
   lib,
   buildNpmPackage,
   writeText,
@@ -75,9 +74,9 @@ lib.fix (
       # same repo. For this reason we pin the sources to each other, but due to
       # radicle-httpd using a more limited sparse checkout we need to carry a
       # separate hash.
-      src = fetchgit {
-        inherit (radicle-httpd.src) url rev;
+      src = radicle-httpd.src.override {
         hash = "sha256-1OhZ0x21NlZIiTPCRpvdUsx5UmeLecTjVzH8DWllPr8=";
+        sparseCheckout = [ ];
       };
 
       postPatch = ''
diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix
index d4067fff8029..7ff24edcab0d 100644
--- a/pkgs/by-name/ra/radicle-httpd/package.nix
+++ b/pkgs/by-name/ra/radicle-httpd/package.nix
@@ -1,6 +1,6 @@
 {
   asciidoctor,
-  fetchgit,
+  fetchFromRadicle,
   git,
   installShellFiles,
   lib,
@@ -16,11 +16,13 @@ rustPlatform.buildRustPackage rec {
   env.RADICLE_VERSION = version;
 
   # You must update the radicle-explorer source hash when changing this.
-  src = fetchgit {
-    url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git";
-    rev = "refs/namespaces/z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM/refs/tags/v${version}";
-    hash = "sha256-9rJH4ECqOJ9wnYxCbEFHXo3PlhbPdeOnF+Pf1MzX25c=";
+  src = fetchFromRadicle {
+    seed = "seed.radicle.xyz";
+    repo = "z4V1sjrXqjvFdnCUbxPFqd5p4DtH5";
+    node = "z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM";
+    tag = "v${version}";
     sparseCheckout = [ "radicle-httpd" ];
+    hash = "sha256-9rJH4ECqOJ9wnYxCbEFHXo3PlhbPdeOnF+Pf1MzX25c=";
   };
 
   sourceRoot = "${src.name}/radicle-httpd";

From 914c4f23461c546d580675742b0c5bd4f04b4796 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 17 Aug 2025 17:43:05 +0200
Subject: [PATCH 2134/3724] radicle-tui: use fetchFromRadicle

---
 pkgs/by-name/ra/radicle-tui/package.nix | 10 ++++++----
 pkgs/by-name/ra/radicle-tui/update.sh   |  9 +++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-tui/package.nix b/pkgs/by-name/ra/radicle-tui/package.nix
index 46f954274414..0135691e39dd 100644
--- a/pkgs/by-name/ra/radicle-tui/package.nix
+++ b/pkgs/by-name/ra/radicle-tui/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   rustPlatform,
-  fetchgit,
+  fetchFromRadicle,
   stdenv,
   libiconv,
   zlib,
@@ -13,9 +13,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radicle-tui";
   version = "0.6.0";
 
-  src = fetchgit {
-    url = "https://seed.radicle.xyz/z39mP9rQAaGmERfUMPULfPUi473tY.git";
-    rev = "refs/namespaces/z6MkswQE8gwZw924amKatxnNCXA55BMupMmRg7LvJuim2C1V/refs/tags/${finalAttrs.version}";
+  src = fetchFromRadicle {
+    seed = "seed.radicle.xyz";
+    repo = "z39mP9rQAaGmERfUMPULfPUi473tY";
+    node = "z6MkswQE8gwZw924amKatxnNCXA55BMupMmRg7LvJuim2C1V";
+    tag = finalAttrs.version;
     hash = "sha256-rz9l9GtycqZoROUI6Hn0Fv5Br0YCIrcHlEWLMP4hasQ=";
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/ra/radicle-tui/update.sh b/pkgs/by-name/ra/radicle-tui/update.sh
index 2f423909a9de..36a50daf217f 100755
--- a/pkgs/by-name/ra/radicle-tui/update.sh
+++ b/pkgs/by-name/ra/radicle-tui/update.sh
@@ -6,13 +6,10 @@ set -euo pipefail
 dirname="$(dirname "${BASH_SOURCE[0]}")"
 
 url=$(nix-instantiate --eval --raw -A radicle-tui.src.url)
-old_ref=$(nix-instantiate --eval --raw -A radicle-tui.src.rev)
-new_ref=$(git ls-remote "$url" 'refs/namespaces/*/refs/tags/*' | cut -f2 | tail -1)
+old_node=$(nix-instantiate --eval --raw -A radicle-tui.src.node)
 
-[[ "$old_ref" =~ ^refs/namespaces/([^/]+)/refs/tags/([^/]+)$ ]]
-old_node="${BASH_REMATCH[1]}"
-
-[[ "$new_ref" =~ ^refs/namespaces/([^/]+)/refs/tags/([^/]+)$ ]]
+ref=$(git ls-remote "$url" 'refs/namespaces/*/refs/tags/*' | cut -f2 | tail -1)
+[[ "$ref" =~ ^refs/namespaces/([^/]+)/refs/tags/([^/]+)$ ]]
 new_node="${BASH_REMATCH[1]}"
 version="${BASH_REMATCH[2]}"
 

From c9624615562f7227d4f4273aa2d506806e694c64 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Aug 2025 21:57:11 +0200
Subject: [PATCH 2135/3724] workflows/codeowners: move global env into jobs

Preparation to split the whole file.
---
 .github/workflows/codeowners-v2.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index b8efcd549aea..e8786805397f 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -39,11 +39,6 @@ defaults:
   run:
     shell: bash
 
-env:
-  OWNERS_FILE: ci/OWNERS
-  # Don't do anything on draft PRs
-  DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
-
 jobs:
   # Check that code owners is valid
   check:
@@ -91,7 +86,7 @@ jobs:
       - name: Validate codeowners
         if: steps.app-token.outputs.token
         env:
-          OWNERS_FILE: untrusted/${{ env.OWNERS_FILE }}
+          OWNERS_FILE: untrusted/ci/OWNERS
           GITHUB_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }}
           REPOSITORY_PATH: untrusted
           OWNER_CHECKER_REPOSITORY: ${{ github.repository }}
@@ -142,7 +137,9 @@ jobs:
         if: steps.app-token.outputs.token
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: result/bin/request-code-owner-reviews.sh ${{ github.repository }} ${{ github.event.number }} "$OWNERS_FILE"
+          # Don't do anything on draft PRs
+          DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
+        run: result/bin/request-code-owner-reviews.sh ${{ github.repository }} ${{ github.event.number }} ci/OWNERS
 
       - name: Log current API rate limits
         if: steps.app-token.outputs.token

From 368a2d6254b33fd0a583db479fbfeb17eda4459e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Aug 2025 22:06:11 +0200
Subject: [PATCH 2136/3724] workflows/codeowners: split comment for each job

Allows splitting the workflow file in the next step.
---
 .github/workflows/codeowners-v2.yml | 43 ++++++++++++++---------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index e8786805397f..a6a19c2e0b99 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -1,25 +1,3 @@
-# This workflow depends on two GitHub Apps with the following permissions:
-# - For checking code owners:
-#   - Permissions:
-#     - Repository > Administration: read-only
-#     - Organization > Members: read-only
-#   - Install App on this repository, setting these variables:
-#     - OWNER_RO_APP_ID (variable)
-#     - OWNER_RO_APP_PRIVATE_KEY (secret)
-# - For requesting code owners:
-#   - Permissions:
-#     - Repository > Administration: read-only
-#     - Organization > Members: read-only
-#     - Repository > Pull Requests: read-write
-#   - Install App on this repository, setting these variables:
-#     - OWNER_APP_ID (variable)
-#     - OWNER_APP_PRIVATE_KEY (secret)
-#
-# This split is done because checking code owners requires handling untrusted PR input,
-# while requesting code owners requires PR write access, and those shouldn't be mixed.
-#
-# Note that the latter is also used for ./eval.yml requesting reviewers.
-
 name: Codeowners v2
 
 on:
@@ -40,7 +18,16 @@ defaults:
     shell: bash
 
 jobs:
-  # Check that code owners is valid
+  # For checking code owners, this job depends on a GitHub App with the following permissions:
+  # - Permissions:
+  #   - Repository > Administration: read-only
+  #   - Organization > Members: read-only
+  # - Install App on this repository, setting these variables:
+  #   - OWNER_RO_APP_ID (variable)
+  #   - OWNER_RO_APP_PRIVATE_KEY (secret)
+  #
+  # This should not use the same app as the job to request reviewers, because this job requires
+  # handling untrusted PR input.
   check:
     name: Check
     runs-on: ubuntu-24.04-arm
@@ -101,6 +88,16 @@ jobs:
         run: gh api /rate_limit | jq
 
   # Request reviews from code owners
+  # For requesting code owners, this job depends on a GitHub App with the following permissions:
+  # - Permissions:
+  #   - Repository > Administration: read-only
+  #   - Organization > Members: read-only
+  #   - Repository > Pull Requests: read-write
+  # - Install App on this repository, setting these variables:
+  #   - OWNER_APP_ID (variable)
+  #   - OWNER_APP_PRIVATE_KEY (secret)
+  #
+  # Note that this app is also used for ./eval.yml requesting reviewers.
   request:
     name: Request
     runs-on: ubuntu-24.04-arm

From 15be04f7a2e228dae69ce364ae15a164a63c509c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Aug 2025 22:11:51 +0200
Subject: [PATCH 2137/3724] workflows/check: move owners check job from
 codeowners

This runs the "check owners" job as part of the main PR workflow, with
multiple advantages:
- The job doesn't run anymore when undrafting a PR, where it's not
required, because the OWNERS file's contents didn't change.
- A valid OWNERS file is now a requirement to merge a PR.
- The OWNERS file is always checked on the exact same test merge commit
that the remainder of the workflows are running on as well.
---
 .github/workflows/check.yml         | 80 +++++++++++++++++++++++++++++
 .github/workflows/codeowners-v2.yml | 69 -------------------------
 .github/workflows/pr.yml            |  5 ++
 3 files changed, 85 insertions(+), 69 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index ece7a287eaae..c06729fa7f5d 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -9,6 +9,17 @@ on:
       headBranch:
         required: true
         type: string
+      mergedSha:
+        required: true
+        type: string
+      targetSha:
+        required: true
+        type: string
+    secrets:
+      CACHIX_AUTH_TOKEN:
+        required: true
+      OWNER_RO_APP_PRIVATE_KEY:
+        required: true
 
 permissions: {}
 
@@ -70,3 +81,72 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: gh api /rate_limit | jq
+
+  # For checking code owners, this job depends on a GitHub App with the following permissions:
+  # - Permissions:
+  #   - Repository > Administration: read-only
+  #   - Organization > Members: read-only
+  # - Install App on this repository, setting these variables:
+  #   - OWNER_RO_APP_ID (variable)
+  #   - OWNER_RO_APP_PRIVATE_KEY (secret)
+  #
+  # This should not use the same app as the job to request reviewers, because this job requires
+  # handling untrusted PR input.
+  owners:
+    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          sparse-checkout: .github/actions
+      - name: Check if the PR can be merged and checkout the merge and target commits
+        uses: ./.github/actions/get-merge-commit
+        with:
+          mergedSha: ${{ inputs.mergedSha }}
+          merged-as-untrusted: true
+          pinnedFrom: trusted
+          targetSha: ${{ inputs.targetSha }}
+          target-as-trusted: true
+
+      - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
+
+      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+        with:
+          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
+          name: nixpkgs-ci
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+
+      - name: Build codeowners validator
+        run: nix-build trusted/ci --arg nixpkgs ./pinned -A codeownersValidator
+
+      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
+        if: github.event_name == 'pull_request_target' && vars.OWNER_RO_APP_ID
+        id: app-token
+        with:
+          app-id: ${{ vars.OWNER_RO_APP_ID }}
+          private-key: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }}
+          permission-administration: read
+          permission-members: read
+
+      - name: Log current API rate limits
+        if: steps.app-token.outputs.token
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: gh api /rate_limit | jq
+
+      - name: Validate codeowners
+        if: steps.app-token.outputs.token
+        env:
+          OWNERS_FILE: untrusted/ci/OWNERS
+          GITHUB_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }}
+          REPOSITORY_PATH: untrusted
+          OWNER_CHECKER_REPOSITORY: ${{ github.repository }}
+          # Set this to "notowned,avoid-shadowing" to check that all files are owned by somebody
+          EXPERIMENTAL_CHECKS: "avoid-shadowing"
+        run: result/bin/codeowners-validator
+
+      - name: Log current API rate limits
+        if: steps.app-token.outputs.token
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: gh api /rate_limit | jq
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index a6a19c2e0b99..71bf4da1ee7d 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -18,75 +18,6 @@ defaults:
     shell: bash
 
 jobs:
-  # For checking code owners, this job depends on a GitHub App with the following permissions:
-  # - Permissions:
-  #   - Repository > Administration: read-only
-  #   - Organization > Members: read-only
-  # - Install App on this repository, setting these variables:
-  #   - OWNER_RO_APP_ID (variable)
-  #   - OWNER_RO_APP_PRIVATE_KEY (secret)
-  #
-  # This should not use the same app as the job to request reviewers, because this job requires
-  # handling untrusted PR input.
-  check:
-    name: Check
-    runs-on: ubuntu-24.04-arm
-    timeout-minutes: 5
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          sparse-checkout: |
-            .github/actions
-            ci/github-script
-      - name: Check if the PR can be merged and checkout the merge and target commits
-        uses: ./.github/actions/get-merge-commit
-        with:
-          merged-as-untrusted: true
-          target-as-trusted: true
-
-      - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
-
-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
-        with:
-          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
-          name: nixpkgs-ci
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-
-      - name: Build codeowners validator
-        run: nix-build trusted/ci -A codeownersValidator
-
-      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
-        if: github.event_name == 'pull_request_target' && vars.OWNER_RO_APP_ID
-        id: app-token
-        with:
-          app-id: ${{ vars.OWNER_RO_APP_ID }}
-          private-key: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }}
-          permission-administration: read
-          permission-members: read
-
-      - name: Log current API rate limits
-        if: steps.app-token.outputs.token
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh api /rate_limit | jq
-
-      - name: Validate codeowners
-        if: steps.app-token.outputs.token
-        env:
-          OWNERS_FILE: untrusted/ci/OWNERS
-          GITHUB_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }}
-          REPOSITORY_PATH: untrusted
-          OWNER_CHECKER_REPOSITORY: ${{ github.repository }}
-          # Set this to "notowned,avoid-shadowing" to check that all files are owned by somebody
-          EXPERIMENTAL_CHECKS: "avoid-shadowing"
-        run: result/bin/codeowners-validator
-
-      - name: Log current API rate limits
-        if: steps.app-token.outputs.token
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh api /rate_limit | jq
-
   # Request reviews from code owners
   # For requesting code owners, this job depends on a GitHub App with the following permissions:
   # - Permissions:
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 6c7e37b9db22..1de7d6614c9c 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -87,9 +87,14 @@ jobs:
     permissions:
       # cherry-picks
       pull-requests: write
+    secrets:
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
+      OWNER_RO_APP_PRIVATE_KEY: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }}
     with:
       baseBranch: ${{ needs.prepare.outputs.baseBranch }}
       headBranch: ${{ needs.prepare.outputs.headBranch }}
+      mergedSha: ${{ needs.prepare.outputs.mergedSha }}
+      targetSha: ${{ needs.prepare.outputs.targetSha }}
 
   lint:
     name: Lint

From 7f4dd7e2ff0e4be10a549db6241b7fb253ff7b04 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Aug 2025 22:18:00 +0200
Subject: [PATCH 2138/3724] workflows/reviewers: remove pull_request trigger

Changes to this file already trigger a run of this workflow via the PR
workflow, we don't need to run this *another* time.
---
 .github/workflows/reviewers.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 58c201724273..2b1be250469d 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -4,9 +4,6 @@
 name: Reviewers
 
 on:
-  pull_request:
-    paths:
-      - .github/workflows/reviewers.yml
   pull_request_target:
     types: [ready_for_review]
   workflow_call:

From ddf81dead677725c7aea949d7c2abff619018f44 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Aug 2025 22:24:24 +0200
Subject: [PATCH 2139/3724] workflows/reviewers: integrate codeowner reviews

These two jobs mostly used the same code anyway, so they can easily run
in the same job. This uses fewer resources and avoids running (and
failing) the codeowners review job on Pull Requests from development
branches like staging-next or haskell-updates.

It also opens the door for more improvements later on, for example it
will be much easier to implement a shared reviewer limit for both owners
and maintainers now.
---
 .github/workflows/codeowners-v2.yml | 76 -----------------------------
 .github/workflows/reviewers.yml     | 34 ++++++++++++-
 2 files changed, 32 insertions(+), 78 deletions(-)
 delete mode 100644 .github/workflows/codeowners-v2.yml

diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
deleted file mode 100644
index 71bf4da1ee7d..000000000000
--- a/.github/workflows/codeowners-v2.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-name: Codeowners v2
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/codeowners-v2.yml
-  pull_request_target:
-    types: [opened, ready_for_review, synchronize, reopened]
-
-concurrency:
-  group: codeowners-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
-
-permissions: {}
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  # Request reviews from code owners
-  # For requesting code owners, this job depends on a GitHub App with the following permissions:
-  # - Permissions:
-  #   - Repository > Administration: read-only
-  #   - Organization > Members: read-only
-  #   - Repository > Pull Requests: read-write
-  # - Install App on this repository, setting these variables:
-  #   - OWNER_APP_ID (variable)
-  #   - OWNER_APP_PRIVATE_KEY (secret)
-  #
-  # Note that this app is also used for ./eval.yml requesting reviewers.
-  request:
-    name: Request
-    runs-on: ubuntu-24.04-arm
-    timeout-minutes: 5
-    steps:
-      - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
-
-      # Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR head.
-      # This is intentional, because we need to request the review of owners as declared in the base branch.
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          path: trusted
-
-      - name: Build review request package
-        run: nix-build trusted/ci -A requestReviews
-
-      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
-        if: github.event_name == 'pull_request_target' && vars.OWNER_APP_ID
-        id: app-token
-        with:
-          app-id: ${{ vars.OWNER_APP_ID }}
-          private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
-          permission-administration: read
-          permission-members: read
-          permission-pull-requests: write
-
-      - name: Log current API rate limits
-        if: steps.app-token.outputs.token
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh api /rate_limit | jq
-
-      - name: Request reviews
-        if: steps.app-token.outputs.token
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-          # Don't do anything on draft PRs
-          DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
-        run: result/bin/request-code-owner-reviews.sh ${{ github.repository }} ${{ github.event.number }} ci/OWNERS
-
-      - name: Log current API rate limits
-        if: steps.app-token.outputs.token
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh api /rate_limit | jq
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 2b1be250469d..5c2acb55a8de 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -38,8 +38,16 @@ jobs:
       - name: Build the requestReviews derivation
         run: nix-build trusted/ci -A requestReviews
 
-      # See ./codeowners-v2.yml, reuse the same App because we need the same permissions
-      # Can't use the token received from permissions above, because it can't get enough permissions
+      # For requesting reviewers, this job depends on a GitHub App with the following permissions:
+      # - Permissions:
+      #   - Repository > Administration: read-only
+      #   - Organization > Members: read-only
+      #   - Repository > Pull Requests: read-write
+      # - Install App on this repository, setting these variables:
+      #   - OWNER_APP_ID (variable)
+      #   - OWNER_APP_PRIVATE_KEY (secret)
+      #
+      # Can't use the token received from permissions above, because it can't get enough permissions.
       - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
         if: github.event_name == 'pull_request_target' && vars.OWNER_APP_ID
         id: app-token
@@ -50,6 +58,28 @@ jobs:
           permission-members: read
           permission-pull-requests: write
 
+      - name: Log current API rate limits (app-token)
+        if: ${{ steps.app-token.outputs.token }}
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: gh api /rate_limit | jq
+
+      - name: Requesting code owner reviews
+        if: steps.app-token.outputs.token
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          REPOSITORY: ${{ github.repository }}
+          NUMBER: ${{ github.event.number }}
+          # Don't do anything on draft PRs
+          DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
+        run: result/bin/request-code-owner-reviews.sh "$REPOSITORY" "$NUMBER" ci/OWNERS
+
+      - name: Log current API rate limits (app-token)
+        if: ${{ steps.app-token.outputs.token }}
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: gh api /rate_limit | jq
+
       - name: Log current API rate limits (github.token)
         env:
           GH_TOKEN: ${{ github.token }}

From 1fa55d3900e45cec4446c9da76f0f5d5c3ddf8c7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 14:53:19 +0200
Subject: [PATCH 2140/3724] ci: apply safe formatting with biome

---
 ci/github-script/commits.js       | 63 +++++++++++++++++++++++--------
 ci/github-script/labels.js        |  6 ++-
 ci/github-script/prepare.js       |  2 +-
 ci/github-script/withRateLimit.js |  2 +-
 ci/supportedBranches.js           |  8 +++-
 5 files changed, 59 insertions(+), 22 deletions(-)

diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index 82fedd608b06..5432d0239a11 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -1,4 +1,4 @@
-module.exports = async function ({ github, context, core, dry }) {
+module.exports = async ({ github, context, core, dry }) => {
   const { execFileSync } = require('node:child_process')
   const { readFile } = require('node:fs/promises')
   const { join } = require('node:path')
@@ -24,7 +24,7 @@ module.exports = async function ({ github, context, core, dry }) {
 
     async function extract({ sha, commit }) {
       const noCherryPick = Array.from(
-        commit.message.matchAll(/^Not-cherry-picked-because: (.*)$/g)
+        commit.message.matchAll(/^Not-cherry-picked-because: (.*)$/g),
       ).at(0)
 
       if (noCherryPick)
@@ -148,8 +148,7 @@ module.exports = async function ({ github, context, core, dry }) {
 
     const fetch = extracted
       .filter(({ severity }) => !severity)
-      .map(({ sha, original_sha }) => [ sha, original_sha ])
-      .flat()
+      .flatMap(({ sha, original_sha }) => [sha, original_sha])
 
     if (fetch.length > 0) {
       // Fetching all commits we need for diff at once is much faster than any other method.
@@ -163,7 +162,9 @@ module.exports = async function ({ github, context, core, dry }) {
       ])
     }
 
-    const results = extracted.map(result => result.severity ? result : diff(result))
+    const results = extracted.map((result) =>
+      result.severity ? result : diff(result),
+    )
 
     // Log all results without truncation, with better highlighting and all whitespace changes to the job log.
     results.forEach(({ sha, commit, severity, message, colored_diff }) => {
@@ -217,28 +218,58 @@ module.exports = async function ({ github, context, core, dry }) {
     if (results.some(({ severity }) => severity == 'error'))
       process.exitCode = 1
 
-    core.summary.addRaw('This report is automatically generated by the `PR / Check / cherry-pick` CI workflow.', true)
+    core.summary.addRaw(
+      'This report is automatically generated by the `PR / Check / cherry-pick` CI workflow.',
+      true,
+    )
     core.summary.addEOL()
-    core.summary.addRaw("Some of the commits in this PR require the author's and reviewer's attention.", true)
+    core.summary.addRaw(
+      "Some of the commits in this PR require the author's and reviewer's attention.",
+      true,
+    )
     core.summary.addEOL()
 
     if (results.some(({ type }) => type === 'no-commit-hash')) {
-      core.summary.addRaw('Please follow the [backporting guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#how-to-backport-pull-requests) and cherry-pick with the `-x` flag.', true)
-      core.summary.addRaw('This requires changes to the unstable `master` and `staging` branches first, before backporting them.', true)
+      core.summary.addRaw(
+        'Please follow the [backporting guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#how-to-backport-pull-requests) and cherry-pick with the `-x` flag.',
+        true,
+      )
+      core.summary.addRaw(
+        'This requires changes to the unstable `master` and `staging` branches first, before backporting them.',
+        true,
+      )
       core.summary.addEOL()
-      core.summary.addRaw('Occasionally, commits are not cherry-picked at all, for example when updating minor versions of packages which have already advanced to the next major on unstable.', true)
-      core.summary.addRaw('These commits can optionally be marked with a `Not-cherry-picked-because: <reason>` footer.', true)
+      core.summary.addRaw(
+        'Occasionally, commits are not cherry-picked at all, for example when updating minor versions of packages which have already advanced to the next major on unstable.',
+        true,
+      )
+      core.summary.addRaw(
+        'These commits can optionally be marked with a `Not-cherry-picked-because: <reason>` footer.',
+        true,
+      )
       core.summary.addEOL()
     }
 
     if (results.some(({ type }) => type === 'diff')) {
-      core.summary.addRaw('Sometimes it is not possible to cherry-pick exactly the same patch.', true)
-      core.summary.addRaw('This most frequently happens when resolving merge conflicts.', true)
-      core.summary.addRaw('The range-diff will help to review the resolution of conflicts.', true)
+      core.summary.addRaw(
+        'Sometimes it is not possible to cherry-pick exactly the same patch.',
+        true,
+      )
+      core.summary.addRaw(
+        'This most frequently happens when resolving merge conflicts.',
+        true,
+      )
+      core.summary.addRaw(
+        'The range-diff will help to review the resolution of conflicts.',
+        true,
+      )
       core.summary.addEOL()
     }
 
-    core.summary.addRaw('If you need to merge this PR despite the warnings, please [dismiss](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/dismissing-a-pull-request-review) this review shortly before merging.', true)
+    core.summary.addRaw(
+      'If you need to merge this PR despite the warnings, please [dismiss](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/dismissing-a-pull-request-review) this review shortly before merging.',
+      true,
+    )
 
     results.forEach(({ severity, message, diff }) => {
       if (severity == 'info') return
@@ -256,7 +287,7 @@ module.exports = async function ({ github, context, core, dry }) {
       // Whether this is intended or just an implementation detail is unclear.
       core.summary.addRaw('<blockquote>')
       core.summary.addRaw(
-        `\n\n[!${({ important: 'IMPORTANT', warning: 'WARNING', error: 'CAUTION' })[severity]}]`,
+        `\n\n[!${{ important: 'IMPORTANT', warning: 'WARNING', error: 'CAUTION' }[severity]}]`,
         true,
       )
       core.summary.addRaw(`${message}`, true)
diff --git a/ci/github-script/labels.js b/ci/github-script/labels.js
index d7dbc2b2375c..68b84f6d9dfb 100644
--- a/ci/github-script/labels.js
+++ b/ci/github-script/labels.js
@@ -1,4 +1,4 @@
-module.exports = async function ({ github, context, core, dry }) {
+module.exports = async ({ github, context, core, dry }) => {
   const path = require('node:path')
   const { DefaultArtifactClient } = require('@actions/artifact')
   const { readFile, writeFile } = require('node:fs/promises')
@@ -297,7 +297,9 @@ module.exports = async function ({ github, context, core, dry }) {
           // Go back as far as the last successful run of this workflow to make sure
           // we are not leaving anyone behind on GHA failures.
           // Defaults to go back 1 hour on the first run.
-          new Date(lastRun?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000).getTime(),
+          new Date(
+            lastRun?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000,
+          ).getTime(),
           // Go back max. 1 day to prevent hitting all API rate limits immediately,
           // when GH API returns a wrong workflow by accident.
           new Date().getTime() - 24 * 60 * 60 * 1000,
diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js
index 60225db0635e..96f433126785 100644
--- a/ci/github-script/prepare.js
+++ b/ci/github-script/prepare.js
@@ -1,4 +1,4 @@
-module.exports = async function ({ github, context, core }) {
+module.exports = async ({ github, context, core }) => {
   const pull_number = context.payload.pull_request.number
 
   for (const retryInterval of [5, 10, 20, 40, 80]) {
diff --git a/ci/github-script/withRateLimit.js b/ci/github-script/withRateLimit.js
index ff97c7173fcf..f430385fed3a 100644
--- a/ci/github-script/withRateLimit.js
+++ b/ci/github-script/withRateLimit.js
@@ -1,4 +1,4 @@
-module.exports = async function ({ github, core }, callback) {
+module.exports = async ({ github, core }, callback) => {
   const Bottleneck = require('bottleneck')
 
   const stats = {
diff --git a/ci/supportedBranches.js b/ci/supportedBranches.js
index a8579f96df99..d1a826e89147 100755
--- a/ci/supportedBranches.js
+++ b/ci/supportedBranches.js
@@ -15,14 +15,18 @@ const typeConfig = {
 }
 
 function split(branch) {
-  return { ...branch.match(/(?<prefix>.+?)(-(?<version>\d{2}\.\d{2}|unstable)(?:-(?<suffix>.*))?)?$/).groups }
+  return {
+    ...branch.match(
+      /(?<prefix>.+?)(-(?<version>\d{2}\.\d{2}|unstable)(?:-(?<suffix>.*))?)?$/,
+    ).groups,
+  }
 }
 
 function classify(branch) {
   const { prefix, version } = split(branch)
   return {
     stable: (version ?? 'unstable') !== 'unstable',
-    type: typeConfig[prefix] ?? [ 'wip' ]
+    type: typeConfig[prefix] ?? ['wip'],
   }
 }
 

From 23b82b322868e32e3b0fcd60c08e03bf0a0ac505 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 15:01:39 +0200
Subject: [PATCH 2141/3724] ci: apply unsafe fixes with biome

---
 ci/github-script/commits.js       | 22 ++++++++++------------
 ci/github-script/labels.js        | 31 +++++++++++++++----------------
 ci/github-script/withRateLimit.js |  2 +-
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index 5432d0239a11..41922c810a69 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -1,7 +1,5 @@
 module.exports = async ({ github, context, core, dry }) => {
   const { execFileSync } = require('node:child_process')
-  const { readFile } = require('node:fs/promises')
-  const { join } = require('node:path')
   const { classify } = require('../supportedBranches.js')
   const withRateLimit = require('./withRateLimit.js')
 
@@ -18,7 +16,7 @@ module.exports = async ({ github, context, core, dry }) => {
           run_id: context.runId,
           per_page: 100,
         })
-      ).find(({ name }) => name == 'Check / cherry-pick').html_url +
+      ).find(({ name }) => name === 'Check / cherry-pick').html_url +
         '?pr=' +
         pull_number
 
@@ -178,7 +176,7 @@ module.exports = async ({ github, context, core, dry }) => {
 
     // Only create step summary below in case of warnings or errors.
     // Also clean up older reviews, when all checks are good now.
-    if (results.every(({ severity }) => severity == 'info')) {
+    if (results.every(({ severity }) => severity === 'info')) {
       if (!dry) {
         await Promise.all(
           (
@@ -187,9 +185,9 @@ module.exports = async ({ github, context, core, dry }) => {
               pull_number,
             })
           )
-            .filter((review) => review.user.login == 'github-actions[bot]')
+            .filter((review) => review.user.login === 'github-actions[bot]')
             .map(async (review) => {
-              if (review.state == 'CHANGES_REQUESTED') {
+              if (review.state === 'CHANGES_REQUESTED') {
                 await github.rest.pulls.dismissReview({
                   ...context.repo,
                   pull_number,
@@ -215,7 +213,7 @@ module.exports = async ({ github, context, core, dry }) => {
 
     // In the case of "error" severity, we also fail the job.
     // Those should be considered blocking and not be dismissable via review.
-    if (results.some(({ severity }) => severity == 'error'))
+    if (results.some(({ severity }) => severity === 'error'))
       process.exitCode = 1
 
     core.summary.addRaw(
@@ -272,7 +270,7 @@ module.exports = async ({ github, context, core, dry }) => {
     )
 
     results.forEach(({ severity, message, diff }) => {
-      if (severity == 'info') return
+      if (severity === 'info') return
 
       // The docs for markdown alerts only show examples with markdown blockquote syntax, like this:
       //   > [!WARNING]
@@ -336,18 +334,18 @@ module.exports = async ({ github, context, core, dry }) => {
       })
     ).find(
       (review) =>
-        review.user.login == 'github-actions[bot]' &&
+        review.user.login === 'github-actions[bot]' &&
         // If a review is still pending, we can just update this instead
         // of posting a new one.
-        (review.state == 'CHANGES_REQUESTED' ||
+        (review.state === 'CHANGES_REQUESTED' ||
           // No need to post a new review, if an older one with the exact
           // same content had already been dismissed.
-          review.body == body),
+          review.body === body),
     )
 
     if (dry) {
       if (pendingReview)
-        core.info('pending review found: ' + pendingReview.html_url)
+        core.info(`pending review found: ${pendingReview.html_url}`)
       else core.info('no pending review found')
     } else {
       // Either of those two requests could fail for very long comments. This can only happen
diff --git a/ci/github-script/labels.js b/ci/github-script/labels.js
index 68b84f6d9dfb..3086cbaf3844 100644
--- a/ci/github-script/labels.js
+++ b/ci/github-script/labels.js
@@ -27,7 +27,7 @@ module.exports = async ({ github, context, core, dry }) => {
 
     const approvals = new Set(
       reviews
-        .filter((review) => review.state == 'APPROVED')
+        .filter((review) => review.state === 'APPROVED')
         .map((review) => review.user?.id),
     )
 
@@ -37,7 +37,7 @@ module.exports = async ({ github, context, core, dry }) => {
     // This is intentionally less than the time that Eval takes, so that the label job
     // running after Eval can indeed label the PR as conflicted if that is the case.
     const merge_commit_sha_valid =
-      new Date() - new Date(pull_request.created_at) > 3 * 60 * 1000
+      Date.now() - new Date(pull_request.created_at) > 3 * 60 * 1000
 
     const prLabels = {
       // We intentionally don't use the mergeable or mergeable_state attributes.
@@ -53,8 +53,8 @@ module.exports = async ({ github, context, core, dry }) => {
       // The second pass will then read the result from the first pass and set the label.
       '2.status: merge conflict':
         merge_commit_sha_valid && !pull_request.merge_commit_sha,
-      '12.approvals: 1': approvals.size == 1,
-      '12.approvals: 2': approvals.size == 2,
+      '12.approvals: 1': approvals.size === 1,
+      '12.approvals: 2': approvals.size === 2,
       '12.approvals: 3+': approvals.size >= 3,
       '12.first-time contribution': [
         'NONE',
@@ -104,8 +104,8 @@ module.exports = async ({ github, context, core, dry }) => {
         // existing reviews, too.
         '9.needs: reviewer':
           !pull_request.draft &&
-          pull_request.requested_reviewers.length == 0 &&
-          reviews.length == 0,
+          pull_request.requested_reviewers.length === 0 &&
+          reviews.length === 0,
       })
     }
 
@@ -125,8 +125,7 @@ module.exports = async ({ github, context, core, dry }) => {
     // called "comparison", yet, will skip the download.
     const expired =
       !artifact ||
-      new Date(artifact?.expires_at ?? 0) <
-        new Date(new Date().getTime() + 60 * 1000)
+      new Date(artifact?.expires_at ?? 0) < new Date(Date.now() + 60 * 1000)
     log('Artifact expires at', artifact?.expires_at ?? '<n/a>')
     if (!expired) {
       stats.artifacts++
@@ -175,7 +174,7 @@ module.exports = async ({ github, context, core, dry }) => {
   async function handle({ item, stats }) {
     try {
       const log = (k, v, skip) => {
-        core.info(`#${item.number} - ${k}: ${v}` + (skip ? ' (skipped)' : ''))
+        core.info(`#${item.number} - ${k}: ${v}${skip ? ' (skipped)' : ''}`)
         return skip
       }
 
@@ -257,7 +256,7 @@ module.exports = async ({ github, context, core, dry }) => {
 
       // No need for an API request, if all labels are the same.
       const hasChanges = Object.keys(after).some(
-        (name) => (before[name] ?? false) != after[name],
+        (name) => (before[name] ?? false) !== after[name],
       )
       if (log('Has changes', hasChanges, !hasChanges)) return
 
@@ -298,14 +297,14 @@ module.exports = async ({ github, context, core, dry }) => {
           // we are not leaving anyone behind on GHA failures.
           // Defaults to go back 1 hour on the first run.
           new Date(
-            lastRun?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000,
+            lastRun?.created_at ?? Date.now() - 1 * 60 * 60 * 1000,
           ).getTime(),
           // Go back max. 1 day to prevent hitting all API rate limits immediately,
           // when GH API returns a wrong workflow by accident.
-          new Date().getTime() - 24 * 60 * 60 * 1000,
+          Date.now() - 24 * 60 * 60 * 1000,
         ),
       )
-      core.info('cutoff timestamp: ' + cutoff.toISOString())
+      core.info(`cutoff timestamp: ${cutoff.toISOString()}`)
 
       const updatedItems = await github.paginate(
         github.rest.search.issuesAndPullRequests,
@@ -402,12 +401,12 @@ module.exports = async ({ github, context, core, dry }) => {
         .concat(updatedItems, allItems.data)
         .filter(
           (thisItem, idx, arr) =>
-            idx ==
-            arr.findIndex((firstItem) => firstItem.number == thisItem.number),
+            idx ===
+            arr.findIndex((firstItem) => firstItem.number === thisItem.number),
         )
 
       ;(await Promise.allSettled(items.map((item) => handle({ item, stats }))))
-        .filter(({ status }) => status == 'rejected')
+        .filter(({ status }) => status === 'rejected')
         .map(({ reason }) =>
           core.setFailed(`${reason.message}\n${reason.cause.stack}`),
         )
diff --git a/ci/github-script/withRateLimit.js b/ci/github-script/withRateLimit.js
index f430385fed3a..efc63057beb7 100644
--- a/ci/github-script/withRateLimit.js
+++ b/ci/github-script/withRateLimit.js
@@ -23,7 +23,7 @@ module.exports = async ({ github, core }, callback) => {
     // Requests to a different host do not count against the rate limit.
     if (options.url.startsWith('https://github.com')) return request(options)
     // Requests to the /rate_limit endpoint do not count against the rate limit.
-    if (options.url == '/rate_limit') return request(options)
+    if (options.url === '/rate_limit') return request(options)
     // Search requests are in a different resource group, which allows 30 requests / minute.
     // We do less than a handful each run, so not implementing throttling for now.
     if (options.url.startsWith('/search/')) return request(options)

From 9d5164bdb89b23103e8fb94d6f0bef75ac85f747 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 14:35:25 +0200
Subject: [PATCH 2142/3724] ci/treefmt: add biome for .js files

This excludes doc and pkgs folders, because there are way too many files
to fix at the moment.
---
 ci/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ci/default.nix b/ci/default.nix
index c75de0ff2b9a..0b24da8f170c 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -42,6 +42,22 @@ let
 
         programs.actionlint.enable = true;
 
+        programs.biome = {
+          enable = true;
+          settings.formatter = {
+            useEditorconfig = true;
+          };
+          settings.javascript.formatter = {
+            quoteStyle = "single";
+            semicolons = "asNeeded";
+          };
+          settings.json.formatter.enabled = false;
+        };
+        settings.formatter.biome.excludes = [
+          "doc/*"
+          "pkgs/*"
+        ];
+
         programs.keep-sorted.enable = true;
 
         # This uses nixfmt underneath,

From 08c315672d2c902bf50c53efc823c6257b852162 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 15:26:52 +0200
Subject: [PATCH 2143/3724] .editorconfig: indent css with spaces

We already do in doc/style.css, but we should tell our editors and
formatters, too.

The comment.. doesn't really make sense, it's purely repetitive with the
code itself. Thus, removed.
---
 .editorconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index de4715d5c902..2d877d20b825 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -23,8 +23,7 @@ insert_final_newline = false
 
 # see https://nixos.org/nixpkgs/manual/#chap-conventions
 
-# Match json/lockfiles/markdown/nix/perl/python/ruby/shell/docbook files, set indent to spaces
-[*.{bash,js,json,lock,md,nix,pl,pm,py,rb,sh,xml}]
+[*.{bash,css,js,json,lock,md,nix,pl,pm,py,rb,sh,xml}]
 indent_style = space
 
 # Match docbook files, set indent width of one

From 46df6abf87f0893fb8580750c6c17f9e2dd8f498 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 15:03:14 +0200
Subject: [PATCH 2144/3724] doc: apply safe formatting with biome

---
 doc/anchor-use.js |   8 +-
 doc/style.css     | 412 +++++++++++++++++++++++-----------------------
 2 files changed, 211 insertions(+), 209 deletions(-)

diff --git a/doc/anchor-use.js b/doc/anchor-use.js
index a45c4e2be68d..76177ee773cf 100644
--- a/doc/anchor-use.js
+++ b/doc/anchor-use.js
@@ -1,3 +1,5 @@
-document.addEventListener('DOMContentLoaded', function(event) {
-  anchors.add('h1[id]:not(div.note h1, div.warning h1, div.tip h1, div.caution h1, div.important h1), h2[id]:not(div.note h2, div.warning h2, div.tip h2, div.caution h2, div.important h2), h3[id]:not(div.note h3, div.warning h3, div.tip h3, div.caution h3, div.important h3), h4[id]:not(div.note h4, div.warning h4, div.tip h4, div.caution h4, div.important h4), h5[id]:not(div.note h5, div.warning h5, div.tip h5, div.caution h5, div.important h5), h6[id]:not(div.note h6, div.warning h6, div.tip h6, div.caution h6, div.important h6)');
-});
+document.addEventListener('DOMContentLoaded', (event) => {
+  anchors.add(
+    'h1[id]:not(div.note h1, div.warning h1, div.tip h1, div.caution h1, div.important h1), h2[id]:not(div.note h2, div.warning h2, div.tip h2, div.caution h2, div.important h2), h3[id]:not(div.note h3, div.warning h3, div.tip h3, div.caution h3, div.important h3), h4[id]:not(div.note h4, div.warning h4, div.tip h4, div.caution h4, div.important h4), h5[id]:not(div.note h5, div.warning h5, div.tip h5, div.caution h5, div.important h5), h6[id]:not(div.note h6, div.warning h6, div.tip h6, div.caution h6, div.important h6)',
+  )
+})
diff --git a/doc/style.css b/doc/style.css
index 4ba76cc39114..d2b31e84b66f 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -1,193 +1,193 @@
 html {
-    line-height: 1.15;
-    -webkit-text-size-adjust: 100%;
+  line-height: 1.15;
+  -webkit-text-size-adjust: 100%;
 }
 
 body {
-    margin: 0;
+  margin: 0;
 }
 
 .book,
 .appendix {
-    margin: auto;
-    width: 100%;
+  margin: auto;
+  width: 100%;
 }
 
 @media screen and (min-width: 768px) {
-    .book,
-    .appendix {
-        max-width: 46rem;
-    }
+  .book,
+  .appendix {
+    max-width: 46rem;
+  }
 }
 
 @media screen and (min-width: 992px) {
-    .book,
-    .appendix {
-        max-width: 60rem;
-    }
+  .book,
+  .appendix {
+    max-width: 60rem;
+  }
 }
 
 @media screen and (min-width: 1200px) {
-    .book,
-    .appendix {
-        max-width: 73rem;
-    }
+  .book,
+  .appendix {
+    max-width: 73rem;
+  }
 }
 
 .book .list-of-examples {
-    display: none;
+  display: none;
 }
 
 h1 {
-    font-size: 2em;
-    margin: 0.67em 0;
+  font-size: 2em;
+  margin: 0.67em 0;
 }
 
 hr {
-    box-sizing: content-box;
-    height: 0;
-    overflow: visible;
+  box-sizing: content-box;
+  height: 0;
+  overflow: visible;
 }
 
 pre {
-    font-family: monospace, monospace;
-    font-size: 1em;
+  font-family: monospace, monospace;
+  font-size: 1em;
 }
 
 a {
-    background-color: transparent;
+  background-color: transparent;
 }
 
 strong {
-    font-weight: bolder;
+  font-weight: bolder;
 }
 
 code {
-    font-family: monospace, monospace;
-    font-size: 1em;
+  font-family: monospace, monospace;
+  font-size: 1em;
 }
 
 sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline;
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
 }
 
 sup {
-    top: -0.5em;
+  top: -0.5em;
 }
 
 ::-webkit-file-upload-button {
-    -webkit-appearance: button;
-    font: inherit;
+  -webkit-appearance: button;
+  font: inherit;
 }
 
 pre {
-    overflow: auto;
+  overflow: auto;
 }
 
 *,
 *::before,
 *::after {
-    box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 html {
-    font-size: 100%;
-    line-height: 1.77777778;
+  font-size: 100%;
+  line-height: 1.77777778;
 }
 
 @media screen and (min-width: 4000px) {
-    html {
-        background: #000;
-    }
+  html {
+    background: #000;
+  }
 
-    html body {
-        margin: auto;
-        max-width: 250rem;
-    }
+  html body {
+    margin: auto;
+    max-width: 250rem;
+  }
 }
 
 @media screen and (max-width: 320px) {
-    html {
-        font-size: calc(16 / 320 * 100vw);
-    }
+  html {
+    font-size: calc(16 / 320 * 100vw);
+  }
 }
 
 body {
-    font-size: 1rem;
-    font-family: "Roboto", sans-serif;
-    font-weight: 300;
-    color: var(--main-text-color);
-    background-color: var(--background);
-    min-height: 100vh;
-    display: flex;
-    flex-direction: column;
+  font-size: 1rem;
+  font-family: "Roboto", sans-serif;
+  font-weight: 300;
+  color: var(--main-text-color);
+  background-color: var(--background);
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
 }
 
 @media screen and (max-width: 767.9px) {
-    body {
-        padding-left: 1rem;
-        padding-right: 1rem;
-    }
+  body {
+    padding-left: 1rem;
+    padding-right: 1rem;
+  }
 }
 
 a {
-    text-decoration: none;
-    border-bottom: 1px solid;
-    color: var(--link-color);
+  text-decoration: none;
+  border-bottom: 1px solid;
+  color: var(--link-color);
 }
 
 ul {
-    padding: 0;
-    margin-top: 0;
-    margin-right: 0;
-    margin-bottom: 1rem;
-    margin-left: 1rem;
+  padding: 0;
+  margin-top: 0;
+  margin-right: 0;
+  margin-bottom: 1rem;
+  margin-left: 1rem;
 }
 
 table {
-    border-collapse: collapse;
-    width: 100%;
-    margin-bottom: 1rem;
+  border-collapse: collapse;
+  width: 100%;
+  margin-bottom: 1rem;
 }
 
 thead th {
-    text-align: left;
+  text-align: left;
 }
 
 hr {
-    margin-top: 1rem;
-    margin-bottom: 1rem;
+  margin-top: 1rem;
+  margin-bottom: 1rem;
 }
 
 h1 {
-    font-weight: 800;
-    line-height: 110%;
-    font-size: 200%;
-    margin-bottom: 1rem;
-    color: var(--heading-color);
+  font-weight: 800;
+  line-height: 110%;
+  font-size: 200%;
+  margin-bottom: 1rem;
+  color: var(--heading-color);
 }
 
 h2 {
-    font-weight: 800;
-    line-height: 110%;
-    font-size: 170%;
-    margin-bottom: 0.625rem;
-    color: var(--heading-color);
+  font-weight: 800;
+  line-height: 110%;
+  font-size: 170%;
+  margin-bottom: 0.625rem;
+  color: var(--heading-color);
 }
 
 h2:not(:first-child) {
-    margin-top: 1rem;
+  margin-top: 1rem;
 }
 
 h3 {
-    font-weight: 800;
-    line-height: 110%;
-    margin-bottom: 1rem;
-    font-size: 150%;
-    color: var(--heading-color);
+  font-weight: 800;
+  line-height: 110%;
+  margin-bottom: 1rem;
+  font-size: 150%;
+  color: var(--heading-color);
 }
 
 .note h3,
@@ -195,73 +195,73 @@ h3 {
 .warning h3,
 .caution h3,
 .important h3 {
-    font-size: 120%;
+  font-size: 120%;
 }
 
 h4 {
-    font-weight: 800;
-    line-height: 110%;
-    margin-bottom: 1rem;
-    font-size: 140%;
-    color: var(--heading-color);
+  font-weight: 800;
+  line-height: 110%;
+  margin-bottom: 1rem;
+  font-size: 140%;
+  color: var(--heading-color);
 }
 
 h5 {
-    font-weight: 800;
-    line-height: 110%;
-    margin-bottom: 1rem;
-    font-size: 130%;
-    color: var(--small-heading-color);
+  font-weight: 800;
+  line-height: 110%;
+  margin-bottom: 1rem;
+  font-size: 130%;
+  color: var(--small-heading-color);
 }
 
 h6 {
-    font-weight: 800;
-    line-height: 110%;
-    margin-bottom: 1rem;
-    font-size: 120%;
+  font-weight: 800;
+  line-height: 110%;
+  margin-bottom: 1rem;
+  font-size: 120%;
 }
 
 strong {
-    font-weight: bold;
+  font-weight: bold;
 }
 
 p {
-    margin-top: 0;
-    margin-bottom: 1rem;
+  margin-top: 0;
+  margin-bottom: 1rem;
 }
 
 dt > *:first-child,
 dd > *:first-child {
-    margin-top: 0;
+  margin-top: 0;
 }
 
 dt > *:last-child,
 dd > *:last-child {
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 pre,
 code {
-    font-family: monospace;
+  font-family: monospace;
 }
 
 code {
-    color: #ff8657;
-    background: #f4f4f4;
-    display: inline-block;
-    padding: 0 0.5rem;
-    border: 1px solid #d8d8d8;
-    border-radius: 0.5rem;
-    line-height: 1.57777778;
+  color: #ff8657;
+  background: #f4f4f4;
+  display: inline-block;
+  padding: 0 0.5rem;
+  border: 1px solid #d8d8d8;
+  border-radius: 0.5rem;
+  line-height: 1.57777778;
 }
 
 div.book .programlisting,
 div.appendix .programlisting {
-    border-radius: 0.5rem;
-    padding: 1rem;
-    overflow: auto;
-    background: var(--codeblock-background);
-    color: var(--codeblock-text-color);
+  border-radius: 0.5rem;
+  padding: 1rem;
+  overflow: auto;
+  background: var(--codeblock-background);
+  color: var(--codeblock-text-color);
 }
 
 div.book .note,
@@ -274,11 +274,11 @@ div.appendix .tip,
 div.appendix .warning,
 div.appendix .caution,
 div.appendix .important {
-    margin-bottom: 1rem;
-    border-radius: 0.5rem;
-    padding: 1.5rem;
-    overflow: auto;
-    background: #f4f4f4;
+  margin-bottom: 1rem;
+  border-radius: 0.5rem;
+  padding: 1.5rem;
+  overflow: auto;
+  background: #f4f4f4;
 }
 
 div.book .note > .title,
@@ -291,11 +291,11 @@ div.appendix .tip > .title,
 div.appendix .warning > .title,
 div.appendix .caution > .title,
 div.appendix .important > .title {
-    font-weight: 800;
-    line-height: 110%;
-    margin-bottom: 1rem;
-    color: inherit;
-    margin-bottom: 0;
+  font-weight: 800;
+  line-height: 110%;
+  margin-bottom: 1rem;
+  color: inherit;
+  margin-bottom: 0;
 }
 
 div.book .note > :first-child,
@@ -308,7 +308,7 @@ div.appendix .tip > :first-child,
 div.appendix .warning > :first-child,
 div.appendix .caution > :first-child,
 div.appendix .important > :first-child {
-    margin-top: 0;
+  margin-top: 0;
 }
 
 div.book .note > :last-child,
@@ -321,122 +321,122 @@ div.appendix .tip > :last-child,
 div.appendix .warning > :last-child,
 div.appendix .caution > :last-child,
 div.appendix .important > :last-child {
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 div.book .note,
 div.book .tip,
 div.appendix .note,
 div.appendix .tip {
-    color: var(--note-text-color);
-    background: var(--note-background);
+  color: var(--note-text-color);
+  background: var(--note-background);
 }
 
 div.book .warning,
 div.book .caution,
 div.appendix .warning,
 div.appendix .caution {
-    color: var(--warning-text-color);
-    background-color: var(--warning-background);
+  color: var(--warning-text-color);
+  background-color: var(--warning-background);
 }
 
 div.book .section,
 div.appendix .section {
-    margin-top: 2em;
+  margin-top: 2em;
 }
 
 div.book div.example,
 div.appendix div.example {
-    margin-top: 1.5em;
+  margin-top: 1.5em;
 }
 
 div.book div.example details,
 div.appendix div.example details {
-    padding: 5px;
+  padding: 5px;
 }
 
 div.book div.example details[open],
 div.appendix div.example details[open] {
-    border: 1px solid #aaa;
-    border-radius: 4px;
+  border: 1px solid #aaa;
+  border-radius: 4px;
 }
 
 div.book div.example details > summary,
 div.appendix div.example details > summary {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 div.book br.example-break,
 div.appendix br.example-break {
-    display: none;
+  display: none;
 }
 
 div.book div.footnotes > hr,
 div.appendix div.footnotes > hr {
-    border-color: #d8d8d8;
+  border-color: #d8d8d8;
 }
 
 div.book div.footnotes > br,
 div.appendix div.footnotes > br {
-    display: none;
+  display: none;
 }
 
 div.book dt,
 div.appendix dt {
-    margin-top: 1em;
+  margin-top: 1em;
 }
 
 div.book .toc dt,
 div.appendix .toc dt {
-    margin-top: 0;
+  margin-top: 0;
 }
 
 div.book .list-of-examples dt,
 div.appendix .list-of-examples dt {
-    margin-top: 0;
+  margin-top: 0;
 }
 
 div.book code,
 div.appendix code {
-    padding: 0;
-    border: 0;
-    background-color: inherit;
-    color: inherit;
-    font-size: 100%;
-    -webkit-hyphens: none;
-    -moz-hyphens: none;
-    hyphens: none;
+  padding: 0;
+  border: 0;
+  background-color: inherit;
+  color: inherit;
+  font-size: 100%;
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  hyphens: none;
 }
 
 div.book div.toc,
 div.appendix div.toc {
-    margin-bottom: 3em;
-    border-bottom: 0.0625rem solid #d8d8d8;
+  margin-bottom: 3em;
+  border-bottom: 0.0625rem solid #d8d8d8;
 }
 
 div.book div.toc dd,
 div.appendix div.toc dd {
-    margin-left: 2em;
+  margin-left: 2em;
 }
 
 div.book span.command,
 div.appendix span.command {
-    font-family: monospace;
-    -webkit-hyphens: none;
-    -moz-hyphens: none;
-    hyphens: none;
+  font-family: monospace;
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  hyphens: none;
 }
 
 div.book .informaltable th,
 div.book .informaltable td,
 div.appendix .informaltable th,
 div.appendix .informaltable td {
-    padding: 0.5rem;
+  padding: 0.5rem;
 }
 
 div.book .variablelist .term,
 div.appendix .variablelist .term {
-    font-weight: 500;
+  font-weight: 500;
 }
 
 /*
@@ -444,50 +444,50 @@ div.appendix .variablelist .term {
   For more details, see https://highlightjs.readthedocs.io/en/latest/css-classes-reference.html#stylable-scopes
 */
 .hljs-meta.prompt_ {
-    user-select: none;
-    -webkit-user-select: none;
+  user-select: none;
+  -webkit-user-select: none;
 }
 
 :root {
-    --background: #fff;
-    --main-text-color: #000;
-    --link-color: #405d99;
-    --heading-color: #6586c8;
-    --small-heading-color: #6a6a6a;
-    --note-text-color: #5277c3;
-    --note-background: #f2f8fd;
-    --warning-text-color: #cc3900;
-    --warning-background: #fff5e1;
-    --codeblock-background: #f2f8fd;
-    --codeblock-text-color: #000;
+  --background: #fff;
+  --main-text-color: #000;
+  --link-color: #405d99;
+  --heading-color: #6586c8;
+  --small-heading-color: #6a6a6a;
+  --note-text-color: #5277c3;
+  --note-background: #f2f8fd;
+  --warning-text-color: #cc3900;
+  --warning-background: #fff5e1;
+  --codeblock-background: #f2f8fd;
+  --codeblock-text-color: #000;
 }
 
 @media (prefers-color-scheme: dark) {
-    :root {
-        --background: #242424;
-        --main-text-color: #fff;
-        --link-color: #6586c8;
-        --small-heading-color: #fff;
-        --note-background: none;
-        --warning-background: none;
-        --codeblock-background: #393939;
-        --codeblock-text-color: #fff;
-    }
+  :root {
+    --background: #242424;
+    --main-text-color: #fff;
+    --link-color: #6586c8;
+    --small-heading-color: #fff;
+    --note-background: none;
+    --warning-background: none;
+    --codeblock-background: #393939;
+    --codeblock-text-color: #fff;
+  }
 
-    div.book .note,
-    div.book .tip,
-    div.appendix .note,
-    div.appendix .tip,
-    div.book .warning,
-    div.book .caution,
-    div.appendix .warning,
-    div.appendix .caution {
-        border: 2px solid;
-        font-weight: 400;
-    }
+  div.book .note,
+  div.book .tip,
+  div.appendix .note,
+  div.appendix .tip,
+  div.book .warning,
+  div.book .caution,
+  div.appendix .warning,
+  div.appendix .caution {
+    border: 2px solid;
+    font-weight: 400;
+  }
 }
 
 @font-face {
-    font-family: Roboto;
-    src: url(Roboto.ttf);
+  font-family: Roboto;
+  src: url(Roboto.ttf);
 }

From 3c0eec623643bc543197a3a6997c096aaebfc396 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 15:04:58 +0200
Subject: [PATCH 2145/3724] doc: fix biome linting errors

---
 doc/anchor-use.js | 2 +-
 doc/style.css     | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/anchor-use.js b/doc/anchor-use.js
index 76177ee773cf..20693ba01c8a 100644
--- a/doc/anchor-use.js
+++ b/doc/anchor-use.js
@@ -1,4 +1,4 @@
-document.addEventListener('DOMContentLoaded', (event) => {
+document.addEventListener('DOMContentLoaded', () => {
   anchors.add(
     'h1[id]:not(div.note h1, div.warning h1, div.tip h1, div.caution h1, div.important h1), h2[id]:not(div.note h2, div.warning h2, div.tip h2, div.caution h2, div.important h2), h3[id]:not(div.note h3, div.warning h3, div.tip h3, div.caution h3, div.important h3), h4[id]:not(div.note h4, div.warning h4, div.tip h4, div.caution h4, div.important h4), h5[id]:not(div.note h5, div.warning h5, div.tip h5, div.caution h5, div.important h5), h6[id]:not(div.note h6, div.warning h6, div.tip h6, div.caution h6, div.important h6)',
   )
diff --git a/doc/style.css b/doc/style.css
index d2b31e84b66f..a4bb35d923b4 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -50,7 +50,7 @@ hr {
 }
 
 pre {
-  font-family: monospace, monospace;
+  font-family: monospace;
   font-size: 1em;
 }
 
@@ -63,7 +63,7 @@ strong {
 }
 
 code {
-  font-family: monospace, monospace;
+  font-family: monospace;
   font-size: 1em;
 }
 
@@ -293,7 +293,6 @@ div.appendix .caution > .title,
 div.appendix .important > .title {
   font-weight: 800;
   line-height: 110%;
-  margin-bottom: 1rem;
   color: inherit;
   margin-bottom: 0;
 }

From 54bcda1c432ecc86e897bee08a267ff65dde463b Mon Sep 17 00:00:00 2001
From: Andrew Greene <andrew@defenseunicorns.com>
Date: Wed, 20 Aug 2025 07:41:46 -0600
Subject: [PATCH 2146/3724] grype: 0.92.2 -> 0.98.0

---
 pkgs/by-name/gr/grype/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix
index 20f4942ad197..b8d838c04452 100644
--- a/pkgs/by-name/gr/grype/package.nix
+++ b/pkgs/by-name/gr/grype/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "grype";
-  version = "0.92.2";
+  version = "0.98.0";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "grype";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OySQO/ZJvaD4mrIRqymBJDXdPC8ZWCz+ELrMXvmQPvk=";
+    hash = "sha256-EJEQHi3N1O5rl0TWxRR/yUkZpbZv4++W7NbUbVEN8e8=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -30,7 +30,7 @@ buildGoModule (finalAttrs: {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-Dp+BVwlBqMbAZivOHQWALMrLVtAncGT/rvbbIk1BFFQ=";
+  vendorHash = "sha256-dSIArK9m7oFu497/wpiiwLDLNk8IxNfYC3RHCQcMviM=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -75,7 +75,8 @@ buildGoModule (finalAttrs: {
     substituteInPlace test/cli/db_providers_test.go \
       --replace-fail "TestDBProviders" "SkipDBProviders"
     substituteInPlace grype/presenter/cyclonedx/presenter_test.go \
-      --replace-fail "TestCycloneDxPresenterDir" "SkipCycloneDxPresenterDir"
+      --replace-fail "TestCycloneDxPresenterDir" "SkipCycloneDxPresenterDir" \
+      --replace-fail "Test_CycloneDX_Valid" "Skip_CycloneDX_Valid"
 
     # remove tests that depend on docker
     substituteInPlace test/cli/cmd_test.go \

From f668934bfdfa2a8069c7dc250c7d00daff44eef1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 15:05:23 +0200
Subject: [PATCH 2147/3724] ci/treefmt: enable biome for doc/

---
 ci/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/default.nix b/ci/default.nix
index 0b24da8f170c..0aeb2356e9ae 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -54,7 +54,7 @@ let
           settings.json.formatter.enabled = false;
         };
         settings.formatter.biome.excludes = [
-          "doc/*"
+          "*.min.js"
           "pkgs/*"
         ];
 

From 6677ab433d1427e821dd4f243b4ed7db3765c583 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 13:41:58 +0000
Subject: [PATCH 2148/3724] turbo-unwrapped: 2.5.5 -> 2.5.6

---
 pkgs/by-name/tu/turbo-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix
index a4f60ec76222..d2c0c1cbb016 100644
--- a/pkgs/by-name/tu/turbo-unwrapped/package.nix
+++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "turbo-unwrapped";
-  version = "2.5.5";
+  version = "2.5.6";
 
   src = fetchFromGitHub {
     owner = "vercel";
     repo = "turborepo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QQTHgSaVDCnhbxhETo2bSGdtEcbL9lrWed+EpH3Fydk=";
+    hash = "sha256-3J5uctVOfjzBkoTPlHdzzpso82Yulyr6RZwqVV8z1Qw=";
   };
 
-  cargoHash = "sha256-PQOUWcUlxATzfgf9QbZT+vLs20/tR4Xmv0lPadzQoZQ=";
+  cargoHash = "sha256-MINBqzs+MpHDqAMCNBzOBHfOTv6dKJA58dVEr7MxQBg=";
 
   nativeBuildInputs = [
     capnproto

From 8ff066dbecb94722e26af758677148c6f69c7e0f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 00:44:59 +0200
Subject: [PATCH 2149/3724] firefox-unwrapped: 141.0.3 -> 142.0

https://www.firefox.com/en-US/firefox/142.0/releasenotes/
https://www.mozilla.org/en-US/security/advisories/mfsa2025-64/

Fixes: CVE-2025-9179, CVE-2025-9180, CVE-2025-9181, CVE-2025-9182.
       CVE-2025-9183, CVE-2025-9187, CVE-2025-9184, CVE-2025-9185
---
 .../networking/browsers/firefox/packages/firefox.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
index e3d37c630ab2..154da384be9a 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -9,10 +9,10 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "141.0.3";
+  version = "142.0";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "b660b018840c41a254734b4847a791f1a9fd2f72dbea825ea5971fd0b3269a43f1f4be1ccf4a53f7809b6b98398f4e04a142e57f8882d6590bab636ef75002f6";
+    sha512 = "b0c1c766083a30a92b77dcf16a584d9fb341cd811d21c3a34da4cd0d714fd6adc73b608092d66058697bc4562faacc44859153e49ffdeb6e14e059e59f2ea246";
   };
 
   meta = {

From 6fcdefb8e3042bfe27056f54dbeeed2344dd330d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 00:46:20 +0200
Subject: [PATCH 2150/3724] firefox-bin-unwrapped: 141.0.3 -> 142.0

https://www.firefox.com/en-US/firefox/142.0/releasenotes/
https://www.mozilla.org/en-US/security/advisories/mfsa2025-64/

Fixes: CVE-2025-9179, CVE-2025-9180, CVE-2025-9181, CVE-2025-9182.
       CVE-2025-9183, CVE-2025-9187, CVE-2025-9184, CVE-2025-9185
---
 .../browsers/firefox-bin/release_sources.nix  | 1650 ++++++++---------
 1 file changed, 825 insertions(+), 825 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 5dd3c6974b0c..2c4c842f9a96 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,2477 +1,2477 @@
 {
-  version = "141.0.3";
+  version = "142.0";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ach/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ach/firefox-142.0.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "627a4d8be46f887db7391104717770a4c11249c37678bc484a2b2deb5007509b";
+      sha256 = "976f6cc23f5e2f424707fd42e30d9ce29086748ae7e817ff5ee3f69e628ad744";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/af/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/af/firefox-142.0.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "a3328847130d990f6b1cc79587988ff351895745d7901e11be49a8116d98b145";
+      sha256 = "ad0d46e8f2805bd1fe3fd3382db7c0c6d4e30a9ef2c9b3fb10ffedd05da9e173";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/an/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/an/firefox-142.0.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "b51fe97d0deaa9d2289d7bf0157f17693f4f698b5a73456f151561fdefff4035";
+      sha256 = "bb1e2662b6a1c1b78ead75953d680ca458a297200535d581f0efa78e9af98f6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ar/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ar/firefox-142.0.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "5b546a369af373c0540501c2130229b0193e0241e582a0118f04e7d8545239c8";
+      sha256 = "c918c6ee47806c78fb5e30ed3200521f6ceb32944e09c305779c11c0904dcf19";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ast/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ast/firefox-142.0.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "6ff16269395855e6bda0d3e247cc5b2dfb0380c5463c3998a75ab6118c9cfae9";
+      sha256 = "1796c0d0e1ec2611d3163771fd4a28e9d5338718d3f4b3d0b2b6708060a757d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/az/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/az/firefox-142.0.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "47dab2243a9976c8a342419fc2bd9e3018efdbf55073d6ef93047ab69961048f";
+      sha256 = "fd9c59ef7973e3f77328fb3c47a62f5615cc99119344f2131ab5a6e8da1123db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/be/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/be/firefox-142.0.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "c14d9c0487f19581bbe84fa143f9f44715954801145ca6faed1c360c8b1df3ae";
+      sha256 = "edd79a3228f633f0c14f782743b557ca9f3bf6640dc2abead7214dc654bae573";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/bg/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/bg/firefox-142.0.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "383245e15b900f1ca81f4a6d4b0f9ecc4fde8282178a990bb70934c61737fcef";
+      sha256 = "71a98e2e79b7eff784d7af92cbe5ec036e8377732252bd8e6a3e5fe972596702";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/bn/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/bn/firefox-142.0.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "4cc0f97e7b2ffecb317b17ca14548ae6d7165d63ef0b2d038f609175e8d08a45";
+      sha256 = "db927c2ddb58a6de6037137efa711cbe83f9de193e19adcc964045dceb846e53";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/br/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/br/firefox-142.0.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "a4dd23993d44aa9193d8241d6ac4beff9f8da61693487ff74bf4b9204a74e2c4";
+      sha256 = "ba126d77778c751dc5d200921cf0b73f2fa84298d19f1fd62a69e187aa3b7626";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/bs/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/bs/firefox-142.0.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "cfdd129fc1d4e8da8902d1f88c30561331e6a07ee22120b2594f020cf668fb47";
+      sha256 = "ed08e068f1f13e44d799ba9406fedecb32dd38d256097b238a9d7f302477f58a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ca-valencia/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ca-valencia/firefox-142.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "b52d0747340a94efc4b2761515fed56ba86432374aaf7a20ea6dd56fb8a3272f";
+      sha256 = "18ec8149098c8d0d78e043567e07fcf6e724ed09c6f7fd99f69e0330abee9df8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ca/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ca/firefox-142.0.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "b897391f406a34ec2f31295918ff62cff0cf2f7dfc84411864b38d5723169750";
+      sha256 = "1edcfb2adf59b4a00e7015a9e43e8351e08b0f6e0985fb925b401dd30487baed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/cak/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/cak/firefox-142.0.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "e1b3886e2f57754b960c3cbe7dbad8813d2514f24d77d7325372d0222c89c0de";
+      sha256 = "39c85d9d3518d21be8f45750deaa1aab39e74f178c77c07d6aba334f62e23b11";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/cs/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/cs/firefox-142.0.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "de8bc7aae84cf049ff05ce9031ffa1912e03c8ce5a59d6ad909e2bf76b7e8156";
+      sha256 = "ee022094dfd544c523e6942a86ca8066a69fa5222105f7bd699bfc36c05ac368";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/cy/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/cy/firefox-142.0.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "cfc2148edf9625131c675119d12b0add30bb462680a0714fbaa30dffd943d34b";
+      sha256 = "432e72cabe82d1cd92c957230c70c4032c90cfe073b5396c774dad7d5f450498";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/da/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/da/firefox-142.0.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "870fbedf5e68fced72212de2e3e31c69caa70998f9efa030ac0268f73a99e121";
+      sha256 = "406b5bd9ab26ef389b29c73d0256fbd30b4b7d175a7d80ce0c6574c077cb169e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/de/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/de/firefox-142.0.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "e49dc3615933515577496d92c91c39d03d01dce2d77542c84c8763c0f50f3733";
+      sha256 = "78bc260583ed88785c7f566606bc75cb406c14321de5ec00ad8c5d5e131447fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/dsb/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/dsb/firefox-142.0.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "5d4b54b412bbccf50da17040798a071a8c37c731651d0c7a9a6d6645fec6371f";
+      sha256 = "0fc986d0bc419f0dc88e844ab3e7079d4b3472b5c059473d1143345dffbc588d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/el/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/el/firefox-142.0.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "36ac776b807e433d9c001283c042bfe185db2b99ea81c4be6b4b06f81d5fed42";
+      sha256 = "a642b1852dc865911777dc21d30ed14b3f29d4320d02a94d00b62d484ae39e9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/en-CA/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/en-CA/firefox-142.0.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "ed4bc1a1b19efc5f3d994de75661d19aa0f3d283751e62072d9b99cf6a6b0573";
+      sha256 = "ba05b60920e0c8e3fdbed5a5b3f9b804d94c5efaaf0204eeb189dd85d2bccce7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/en-GB/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/en-GB/firefox-142.0.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "d538f26dfd3f81ca3d71a022a5f996826bf1bd42dea33c7171e6c737f85cc5a7";
+      sha256 = "325e635f2f60c2a09ccd1079f498addbb287c2f5bac5af956e40ce3b02462d81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/en-US/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/en-US/firefox-142.0.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "e935dc3b74cf2cb1086e1e0b4a51d18e4d307e71ce6a20db64fe49d09cc78716";
+      sha256 = "da8897a6a618e73878e6022a2bece76af509c304c73ae5c53dc523d35cb7bae6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/eo/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/eo/firefox-142.0.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "052530afd49c38ae1d9bf45a4a8580b7765463e0502a7800d8573c55098e20ae";
+      sha256 = "c9da2c7d09c40bc746a91820747a5f11b1a2a9893a5545d5d62a5d8e18bc37db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/es-AR/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/es-AR/firefox-142.0.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "c0bb261ed8bd997614b2cd67ed84ba46cb00d0a81cdbf36bac19a5994257bb50";
+      sha256 = "d5cb86ad0b547ae94175ae1a5701e423c55999ea12406daa4068415dbb9300ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/es-CL/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/es-CL/firefox-142.0.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "fd81aebbd847d8ac847c14b1bd0fecc7fe3939d8e30690f46472585875f23e6e";
+      sha256 = "0acf0f75cefdae8a4c9e2ecc316219926a737ed625d8907b816453aa662e0712";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/es-ES/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/es-ES/firefox-142.0.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "4a5bb347eb890e3b43e08a491d4875846e409fc0ebef2e63669f660ff9088559";
+      sha256 = "150d931d17242ddd3d795918dfa2feec0de721144e44c7509e3d5c0badb9471f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/es-MX/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/es-MX/firefox-142.0.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "02fdbe38a6ac621361f3a33cd00f7d48ab22797841e856d60fa2b069d4acc54b";
+      sha256 = "e4f02ef45ef112342b27c4064287dd6230ea807835dffc89484c7c78554fb926";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/et/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/et/firefox-142.0.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "70941c683adddcae1af5f5be91b89419cfaf8b43a4a7252c71c6f74119dd4391";
+      sha256 = "635f5596736bc0a19c42f7b30aacbf4800d4c844bedfc2d6b080db428fc63f98";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/eu/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/eu/firefox-142.0.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "972a4963d255e7de02e9d9efadbb1757efd2aaf557434b2086342b0a0de0224a";
+      sha256 = "456c72d05b30537ea7b25964e70034a98d76b4559805135bdff286017b63e238";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/fa/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/fa/firefox-142.0.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "c5dc7efab021fe09f279b831b8aa07fe0efb7daa7f3a079501cb5341afc5cd26";
+      sha256 = "8b14a40b42727c15f3fcb3255e71a9d74d712186ce82be034dd7045ade7ebdc3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ff/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ff/firefox-142.0.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "73dfd15598e6e7c58d259f08da9a4ce1e3bcb788e648bf46513c2c04cde0ec35";
+      sha256 = "5fec4d8fd012bea2a96c4c6e707f253a5d8d000c21b6ce27e478116e8953146f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/fi/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/fi/firefox-142.0.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "e16378f41f13f6f0618b381df48081d3f249210337c8c20b804abac0027f432e";
+      sha256 = "0b11eb23bcc283777ba30a114496aeb7a87817afd961a2db9669d724f5b7675d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/fr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/fr/firefox-142.0.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "02405cc92fce9ebc697e4680e26efbb5e2249b819dc019a7117ab7e15e611bb6";
+      sha256 = "587c9bb19db79eb2ebc4243dabb514144746884065588c0ede15df5283f4f5b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/fur/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/fur/firefox-142.0.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "abdb82d146239caa719bbdd0ea3c93557b228040c59b110268f530c94bcfa007";
+      sha256 = "5e96d08d90c378864f63ba07c4f1328f17f5b79c3b0d49469d77335c31b55c51";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/fy-NL/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/fy-NL/firefox-142.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "58b7a105cf0c653a6a6f603680fb6f532db7630721341d5bddfa90b435b40260";
+      sha256 = "b847fb56503ead73435ece318f3a0b95a39c58accccacd5d09345dfa8bde89f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ga-IE/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ga-IE/firefox-142.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "b5cda01f55ad36c7bb831867294daa33774aa6345ad1845935e607851a6a073c";
+      sha256 = "38aa9a55cfd3d41c47fe0a176bb6bbc5214a9801579045d9a62a35a3e64d75f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/gd/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/gd/firefox-142.0.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "abd1e83a1bd68e30029463ab4e06e16da81c118d884a460b65dbe8888c176b4c";
+      sha256 = "779c07699548e94142a84610ecc45b80d0f7d3e87ad83cdfeb1697cfe6fd9d44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/gl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/gl/firefox-142.0.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "193b1a552d54e64beeb53e33eb8d1be8d0d2e399f5921213bddfd277b7e4e99d";
+      sha256 = "2b610417fc4e835b973438367a6dc185ddbd2e855516b1381c1db1a2d735b64e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/gn/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/gn/firefox-142.0.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "e6b7d2d12404f0ecf6b893706df626fd03ecfbc941834c5243de70e28218178c";
+      sha256 = "80f24fc46d9740973ce64ed08f27f95de4589e61ef0ecb67425041acc346dcc6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/gu-IN/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/gu-IN/firefox-142.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "2b507c7ef9785ee01c5c6beb1e3333d6436b81b2028d366f171132a6707a585b";
+      sha256 = "fe251ca598869714166e78197b3e877ee62897dcbd77c96866006c4a596578de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/he/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/he/firefox-142.0.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "d0a00794bfe739ce3592bef7c04e1d4c023ed12053fde3e30777a639672bf6ad";
+      sha256 = "a7be1bf9bd8511f2a989e3d5efc6393d9345f1c5e2d32b9d2cfe1c437bcbfebb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/hi-IN/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/hi-IN/firefox-142.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "a726e5c526d431e1db48b1c7c2a7e165a5b4ada21525470767ede11b3ecfd491";
+      sha256 = "f898b3feda7d77cef6118275a952c22152510b59f4421654c845804ffe7b18a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/hr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/hr/firefox-142.0.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "1606ad305956ad319b0ed6be93fef16ae1444d4a9580283fc81126cdc42f7490";
+      sha256 = "f79a590a4ea20e3cf7ae409c2e57ffde17a115a190a1041a2ed6b31ef8751a1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/hsb/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/hsb/firefox-142.0.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "e8903b3e5deba70a9bea38fa76186bfe0127252b72d84e624b4575c523d293f1";
+      sha256 = "8024d111749d767df4f505083ab71e2262588b099401852486b01793801a6f52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/hu/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/hu/firefox-142.0.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "6b2289c4ebc6a9780ee0e1c45a765e036d5372408a4757b2bafce9a504a37b77";
+      sha256 = "b817751a906dce2fcbe603584519c3d9f5aaf165b42d7d76078cf6e427f7cc4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/hy-AM/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/hy-AM/firefox-142.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "0bb5f079ada3dadb0fc364d194a3272a7bf7fdb2e03cf408e0a16e2aac2e1c58";
+      sha256 = "fa3b3ba641cedb46e407951e54ad0974e42a0a064eda28a381d8d354d1077615";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ia/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ia/firefox-142.0.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "dfcc1f9cddf732589baa8422eea711ca236f36a5a743cf2e6050d7f7762c211a";
+      sha256 = "890ee1b281307a1bb18307d799179810ac8c0c4598cde13743f0071a72d8efd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/id/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/id/firefox-142.0.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "c0b5fb2ac764622cc3a10aeb60bc483e548d73d35113125fbe66f432bf36220e";
+      sha256 = "91e3559c31afc494e380312c253f2681ed0b0cb2ad6d78239de9d2e5302aa437";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/is/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/is/firefox-142.0.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "91ec6acc0d488eaa203cc76ffd7c7e9e0812761f281a3d3138c56db03a4d7263";
+      sha256 = "40a5d4b7484dac6574569be2516d79a372ba92b9ef02f3c56629bcd8b59772fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/it/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/it/firefox-142.0.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "c465319d249106d1250c82bf12452d3fa7c6720c34b467783a469491cab2a70a";
+      sha256 = "4ae36b25a62701dd67443ee9c97cffd60b9d05c2d2cefbf0594292929f0d2397";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ja/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ja/firefox-142.0.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "cc85b2392b2d127ee7135155de501d09e005201b8ccef57a70ca38067d7edf0c";
+      sha256 = "7523b6ed419578a9c3a5e5f96ed5d18e3e38f0fe688f4c61652e794d564a895b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ka/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ka/firefox-142.0.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "b1931ccdc07f128cae1aa04589b774b4cc65ac5decb4e34a83c059aace514d2a";
+      sha256 = "58a732e118e661dc6c85b1940e627d0a87e12107b7dae28d6e760672019e5174";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/kab/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/kab/firefox-142.0.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "30876d54903ea9761228ef52325097762a07f4c32e6788dcf1340f4c7a2fe0e7";
+      sha256 = "9b156db9489d37504a82429a0df7ab5932c364bc882c9d18a1ece58454fa6044";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/kk/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/kk/firefox-142.0.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "2e3f5b378e39205927a706a80c4c8bdcd7efa465b7c5183e013fd8943ae51218";
+      sha256 = "014805d500a11d057e01fb359ab14f729b2bc2760d976abfa498b9a737f4b633";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/km/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/km/firefox-142.0.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "a70779d314b66fd3d2c49acd3cac2c45ecbf87634f3b307dddfa23c2e04f14b7";
+      sha256 = "6a160215eb1f63737dbf12fd50329e6f9c32fb237e9fda2fe1ccf59391a02518";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/kn/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/kn/firefox-142.0.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "88fcee7e76eb29fd325f12251e025cd5191a50dba5b0b9144cf5950e71cfdebe";
+      sha256 = "ca4a3d58f03065ca5a41dbaaff94593275ea66c88bc86917aa0378c7ec9e5787";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ko/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ko/firefox-142.0.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "8ce7700492e0d560f6aa3d07d96ac86110418ab198dcb7844d80d45a9666bda9";
+      sha256 = "d15029751353b8b5443113f5ddedb2563a76ffd13486657027982aef27f9764b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/lij/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/lij/firefox-142.0.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "6d39d04672163d25ceedea83d1948bb12573861e76a40db7c4028fcb117bafe7";
+      sha256 = "72a2a6196b20637ac5707a8b008a066ccfe7cd5b5effd69004472daf15cd79ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/lt/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/lt/firefox-142.0.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "23f76ddb376d0f52b19ea4ddb32a88784f2aa8245c1098b3d7478622f8cefa20";
+      sha256 = "b4d1c58b93deb09ffc3247ca1e41896ec115c4b779d90fec1fc88707019c77a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/lv/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/lv/firefox-142.0.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "e49bf464dfd0b0c641247fc8d20a0fa9c827ca1038ea0186715616fa252d96c3";
+      sha256 = "333700baaeef92678591a5f475bcab96c56369c3c05ec29b189221351f5d5bc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/mk/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/mk/firefox-142.0.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "d8d649d47b2ed665bc282ee5a84859d5d8d9535fb5404bc9cb532b29dccc472c";
+      sha256 = "e964be73f05d573a73dfbc1ae7b91874045264a98268debea93c73c3257dd5ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/mr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/mr/firefox-142.0.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "b68caed75fd5ca5d2d6133c33cc962ec48f30e6f0a1eeade2238d80087f8c5f0";
+      sha256 = "0e835694db9b4dcf7a1bd1e660b9a9ae4674a68aba1ccabece9171200c2a48e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ms/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ms/firefox-142.0.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "234b1f31cf6e62cc2623d0c12b796103c3acc4062e6f34f80c5bbfe90c403023";
+      sha256 = "120ec06da676f32673028204d3b90d31a3cc1ed89a654b58a3aa79e0c638f38a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/my/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/my/firefox-142.0.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "967fbaf3be42b7b6eb4ba5835efa1e65a4d0125af0245aec9ab87f68c343e434";
+      sha256 = "711884e25a99c139d0e8ed06f16d581b2975fffb54e1e76026344f640bec6706";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/nb-NO/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/nb-NO/firefox-142.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "8337db76591abb2072024762d03fe28124caa1a9605e89c7b7a85e35353cbe61";
+      sha256 = "7c94754b50b523887ccd8931181d34f0a113390de40c090cb6d13b1e0dee2524";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ne-NP/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ne-NP/firefox-142.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "f4c9726d7ce21dd3b70936563efbc8bf783e3d84da2a2762cbe8e416877d3ed1";
+      sha256 = "41a2d302ec4a2c0cb30e36cf325e89f19bb1ff25a2f96e494b14f1578ccc78fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/nl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/nl/firefox-142.0.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "8a04a89d515278c2d5d3741dcee78cbb2680b7f2626035f686f4f4c4234b58e1";
+      sha256 = "247dec3c13da214027d5b48837c145d573891c6a1371ba8926a2bcc4be65b751";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/nn-NO/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/nn-NO/firefox-142.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "85cd04b5bd0c2ceebb59b4f445c4a0cfaedb4c4b4b9a9396c391f88829af2915";
+      sha256 = "b57a14eab995933d3d940dcbab2dc5240dd903578be6e4ddb145e16076ddeeeb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/oc/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/oc/firefox-142.0.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "0630f27847f064e3aa2c95e572d842e9de3ac33b4b3b2595ea4801ae0c0f4ddf";
+      sha256 = "009ed4a141a5786a057267e4e36defd2844a17282edc13265a838a1716ebfc36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/pa-IN/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/pa-IN/firefox-142.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "451c8936508fc4fe6d15c80ed8caeeb6c988ef714c8c0cde05db1247d3b805f3";
+      sha256 = "aa64c7d7c3cdd8de4a16da60b25f09494c47e4aa17add61d8ecc9e9926c92567";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/pl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/pl/firefox-142.0.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "4e9b8f2a222f661db29476e24dd6a2ad3d44048a5fb8989791f7ce2ed9ad0a00";
+      sha256 = "51c0acceeee93f3125d64eaf3626be297da3ebe7997cd850056b13f4c161ee3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/pt-BR/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/pt-BR/firefox-142.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "952a8006048609953750d844b946cceb64a3ce4d19c28a21c655573d686516f2";
+      sha256 = "46be026a9a453aa4d882652040a07f8fe0acacd8cf61e4967bb488c36e23b0e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/pt-PT/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/pt-PT/firefox-142.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "e0222e499f2aaaf1bbde67024548acb01a5a801a2fa9cf20e6ead985b57bf008";
+      sha256 = "54a827e362ba0903077cfd4d331d3a3387a2b5e0b7ee04b9141963b872e44672";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/rm/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/rm/firefox-142.0.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "cc5a1b6315bb7a4c5e0ff2d5f1d7c016e2a04166be5e403a1245c2e94e5773f4";
+      sha256 = "8e365d64a7a9fbd2954e9ae366ebfbd4cd94f82b77a0c4af184911481d89f456";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ro/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ro/firefox-142.0.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "6186daea4314e9598123c5089c21cf16bd3a0a06daf202eb74b1fb82cc63c6d4";
+      sha256 = "ca780d538f0f96a269e3eb41cf0de0740ddd1602534f0a08ac0e34bf8b0b3284";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ru/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ru/firefox-142.0.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "e132dedfc3162525b55264dbf44cb0cbed144bbffc1f809543b4a6fc97b8a3cb";
+      sha256 = "105cbd709553de005c3f7828dd7b1e2c1320d8398462447fe408878c72a9312a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sat/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sat/firefox-142.0.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "2ecdf78b2d37fcdaa446cd11e3b8dacf568636e53b21411d82a116435eec502c";
+      sha256 = "3850174c7b2f5ec333247c2694949e5eb554e0424a10ef2bdb21853f77d0d720";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sc/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sc/firefox-142.0.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "0d7c129a54df727e424985085aa9244db225b35834cc10db558a0777a78d3354";
+      sha256 = "b2090afa84c4449fb87e2f0c71720da55b209f43ebe4b4489d2e00724908de16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sco/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sco/firefox-142.0.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "cbca9d3ee3b188d0cfe8fe22047c0b4e1c2a60d54c56e8a33f5b6d56a6ec4933";
+      sha256 = "e5c13cf87aee1e06723fc3766a2ff96772fd7dffcedda80a2ee52a69ac7c45f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/si/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/si/firefox-142.0.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "65f2153b2e9d84aef26d32e5996549fe28352d5562f8e3b9c436f26267e71b3b";
+      sha256 = "6447693b7dca2ffb282073e6a0142be2eeb43b22c3ad70c23e1b77e137ddd153";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sk/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sk/firefox-142.0.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "31bdef610c0981dde69ff5fc6b52bc47c13959593732e43d9e9a023163dfdaac";
+      sha256 = "3bc2a3f3e5af935a48253ee3d318cd97a41fc0712ebfa9fc1d9790a868065da6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/skr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/skr/firefox-142.0.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "a2c8243c422bd59345c827bf21dbd547bc90d4a910d7a980b499ced6d1f7f4e8";
+      sha256 = "4b56fcc03f7101dd92f05021a9a0335ac4b6f3c800e4ccbec261b504243d1aec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sl/firefox-142.0.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "39a7c3a9c39ca27d1f74c91820eb99bbbb343606c701c3bac262aa7f36f8aa91";
+      sha256 = "4ff34389bd3c41aed9e7fbc7eacdfeedba1cb2dd47a6e7683fb19a5356786cd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/son/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/son/firefox-142.0.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "5d6e3a82abf8ab47a79d172346fcd2f0776eb03e241a48925249bbcb876ad95f";
+      sha256 = "74fb0405402e590c0d61b9c5088cb7cda1c2ef85463c3c971c17f189b5fbb8be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sq/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sq/firefox-142.0.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "ef0d73a552521da111a7e5d656431e6ea41c9b5ea6a2588daf70511f2c9d7ed0";
+      sha256 = "0f64d1b9a1a5c2b1943281737f52fec1243b1d4608628e5c5d7dcbfbd498f72d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sr/firefox-142.0.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "6b1b550a3264ac2a6f38a495483df69233da8b69359e95a994d69ec6fb34f207";
+      sha256 = "d9987ab490f232327d0aa43f02efa0912b66fff9b8c25171afcd7f4b50addc7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/sv-SE/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/sv-SE/firefox-142.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "fca7ee95852ae2e035501cc6bb9bc5209c50aec1b99e04594885731c541c9ef7";
+      sha256 = "2a332785288057d97da6e35683538102c89009e4a0f513fde375bee5534b7ff2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/szl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/szl/firefox-142.0.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "c3c4786dd3e67fa218bde85acd35da7080a675ea1620b3e843e7d0078473d83c";
+      sha256 = "3ce788078efac5a9e9e2d71032f0a66e75e15b7917bcd1a94d1317aa3c2affab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ta/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ta/firefox-142.0.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "a4ddd375e6eaea0dcbd780cdc3b3adffaa54c911cedcedd794f09b9f72dcb890";
+      sha256 = "3bee43ee483a17fb065b462fd913b5d5d805edacdbcb944954f4e99a093e43b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/te/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/te/firefox-142.0.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "07dbf1ede2211fb3e40ea5b0d385f9db4fc3db9f6731cfeb2ee6879cd0e9f8a0";
+      sha256 = "2ad61bc631e07ab5c7ef9b52596f0b18dc314ef8eef78568e14a01de08ffd4fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/tg/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/tg/firefox-142.0.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "bb525b288b4675fee1bd4ae8ef9ef257f67d2aed6b7f55bad521554950dcea4e";
+      sha256 = "782eaeef612c200c1301e6850f659925fb2b24ff8a00f1f79160a62eb25a855d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/th/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/th/firefox-142.0.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "460dc2824d799ba7fc7962215dfbb64728cdcc1c9c4dbf37aed4f711193adf73";
+      sha256 = "912c0f1c6d1819597da3cb08c7c668db12051708bdadbd4539a1cc4f8a685b23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/tl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/tl/firefox-142.0.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "f17e55bf0f527f25636997a2994ef5015dbe2efe652da21bf8de0c9082166b61";
+      sha256 = "971d7da5f1f42afa3511249e46d687bb71518c4538460f08c7b5c7069bee2d12";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/tr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/tr/firefox-142.0.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "b2cccbd810fbff42ef813eed3bf4fa0d79bc6fc5e7bd0be8d6f988b5ded2b04d";
+      sha256 = "a63e0c5667c45f039416e445bb289030aa349be7796d196d31d6900c19628559";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/trs/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/trs/firefox-142.0.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "7423e305071334bd4c3cdf0f042b282f69e69f77a251a27db788f6aa1143b87d";
+      sha256 = "ade9d7d1fabc7243e234e7569280b8aa31105a30cf029af889a73fbe990d236a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/uk/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/uk/firefox-142.0.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "08b7faa09dd02b3cc0e18638c1c49334a002f681e0d568b33a8e77fb7df8ecc3";
+      sha256 = "8b0996b524fd6c1a1340a40fae0b5191017a644e9dc2568fad27c776c26010b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/ur/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/ur/firefox-142.0.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "e8df2fd0571ea3cfa0a2a214fb0aecc2dc0501dbf34f697ec2405a0d34ad0856";
+      sha256 = "9c5182b9b50c628f013fed8c41c386604b94387f6ac1f15fa15aff9b9ddb7683";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/uz/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/uz/firefox-142.0.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "43b31557610d0b1906a765f7ae5b9b6e10acd1080f3be5624b2f655bad5cea85";
+      sha256 = "327575842eeb0dea826665fc48bc60e397b44a9178cd9e9eb86cd64fc5581fbf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/vi/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/vi/firefox-142.0.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "ec6b0ce219d1c8d484388bd4579c0cf38be2cf5384e02613412123e18f44f3cc";
+      sha256 = "31560864ac90a9c608add4e919a00d64a985a479a9064660003d22946eeb926b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/xh/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/xh/firefox-142.0.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "207a37f147b854c9a3ffd23df767b428a2f4ad1d9bb8de542ba56a0569293463";
+      sha256 = "78d7ef260cec395b672c65e71861df41935fa6c9184d8506e884b70a480a4e0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/zh-CN/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/zh-CN/firefox-142.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "c77dea8cec09985661c8b4270cffad80f315ac8fd31daf657a83485a48d9f48e";
+      sha256 = "8601948f17218d68119a858a5552cedf28b8fc3e65514f8ef944480c8b2e1798";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-x86_64/zh-TW/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-x86_64/zh-TW/firefox-142.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "e68a2e2440c11c1c432a0cd3fa39c4a1e35283d15939e48aed3537d740019760";
+      sha256 = "214c61f3bc9852d3715f16788a7b976dada4fcdbbd359b186baf1ab0dd29ea83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ach/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ach/firefox-142.0.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "430afe73bec379064f9991b94c7601ce1a215abe9e77d0d3d3693393e59411c2";
+      sha256 = "fc4a7fea82160141623769017acf7e82925bdf6191987b186cc60ad486eb94e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/af/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/af/firefox-142.0.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "b1e4a9da21efb4dc1209c6dc3bf02697c529b359d20d38a0df7c0273499d8c32";
+      sha256 = "7748555d74c20e192648ac775433c283ca46f904bef896aaf1ef93a34c95cd04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/an/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/an/firefox-142.0.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "3d89974b36c94100b286ae574b3009924ac6c2d5ded3785c1b1d777a01436641";
+      sha256 = "f1a9e9ec99ef78884d0b6b3a85f3485f425931286d26679a54f17010719d530c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ar/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ar/firefox-142.0.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "35d29bb4f36b5ea18478db7a3d1682c04258d660dc86681f81e5e54922395863";
+      sha256 = "7e837f06373faa7d4a39d434fd65e2e17d8f998b6e78fb4e7243898183c91c8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ast/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ast/firefox-142.0.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "54826a2feccbad02eb5ef4d6a7c9693fa808d7208eba65ba0ebc45044142d597";
+      sha256 = "106be6d64518e25efa5961d15c7c619f5418ef664cd2fe7c97ff6d5fe5bcfc75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/az/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/az/firefox-142.0.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "c5b2083cd46261cebfb95f25bf73c06372e82efa0ea311211d6bf5f0b07ee279";
+      sha256 = "54da322dd08e297a3497bdb8048e5ec6fe244da4857462ec5ee5eb302340b332";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/be/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/be/firefox-142.0.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "2d94ffa8fb7220859a320bd4032434e925fdd778184f52872f56526bcbdda6a1";
+      sha256 = "4bcdc953af64da3fb09654e4795e657232c38742d6200cf3d4f5fa77fd9fc59e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/bg/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/bg/firefox-142.0.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "cb61e1c0a88f92f11c4bd1b811a6b39a319ce95816ebe58c4e662ee50ff186cd";
+      sha256 = "eb78a42254ac0b191e8ddcf40d2dffd523f93c4706aaff94a8fd63dd6ebdd365";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/bn/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/bn/firefox-142.0.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "029258a2a00b56c556750b569e3884b860e8b038f38727472f4cea91a43863ff";
+      sha256 = "9ed4b5005902e01475a749e50c42d2afe0f21398287ba6d49c57959e4cb02ccb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/br/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/br/firefox-142.0.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "1281010d16e1834487155bea138ca826b7dbfcb541252306b1984f995e449060";
+      sha256 = "6117a291d5c55068112baeb44c4698a8f32f78bce304da56eb102abe5272fe36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/bs/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/bs/firefox-142.0.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "04b4ea9e36665de7fbb57652756703431d893e568a9e56a7482273cc436cec32";
+      sha256 = "dd9860fa8d705471e1000ff12924a9469702b4e1e0372f2a3ab0705ff36920d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ca-valencia/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ca-valencia/firefox-142.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "8c83bc9b8983529f9e623fef98003848ccb15844530c95cd5f852be3eb87e307";
+      sha256 = "8a7ecd6ff52a20c3432a78666ed44a1981791d344e63973f4d09adedefd3a40e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ca/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ca/firefox-142.0.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "41de6dca478d45cf7fbb192e5c86be1589cfd817ed0b59ac5e8225906f5cede5";
+      sha256 = "9b226ef2047ea2a8674534d54200027b5bf74bc3107625cd3378c2693b0cc7f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/cak/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/cak/firefox-142.0.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "0dd7eb6969df8388a1a5ef09eefd3fa38854a46bfdfa0c61a7e499a84f335af2";
+      sha256 = "d1161e746acb0ad0c89eb0670c52763601dd262e4f86f6200f7f051ac50e5bc7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/cs/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/cs/firefox-142.0.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "c50b643127c85aed97d9ba2336df8003d7b2a209986b76cbaa42a2caefbb9c8b";
+      sha256 = "6418275502ac82476a71f0f5912a4a24f7990831d8c148e0b40f4382b8780c3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/cy/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/cy/firefox-142.0.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "27b32566217af2553eff27d770fee2a7cffae0b9c1b482d1adba9874653572ad";
+      sha256 = "5de9311ad00230b6a22b1944202d59b7e68fdf133e9eef909bb59f19e4e965b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/da/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/da/firefox-142.0.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "ad9dcdb91517b93e8f14bdb4da9d716c5015fc7f7b3ba4fe89b28bd768907eea";
+      sha256 = "652f0a30f840e64b22f6e2d8e127a814cf4c18180480cb0060c01db3ad3782a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/de/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/de/firefox-142.0.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "d2c586a4beb4d36571bbb24956835257a94f6f7b817b5199b96e05bba4642bfa";
+      sha256 = "8adf8e26555e92f87f858e0678428c873de00dabdceff1036b2a07f6f26677db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/dsb/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/dsb/firefox-142.0.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "3dc3de3d15a0396b29d79221f7c657c511da50b1c52fbf5d0d395af68c219793";
+      sha256 = "3c9f1cb357b7f46781c56ef5958f449f2219aace47dfe506a432bebc97ed4725";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/el/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/el/firefox-142.0.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "fa100a3b13faea853813d9f932dd0d235c94d70bd3532354b0f51df6bcc63855";
+      sha256 = "2ff6550045c8afaddd9b37e67dd847dd02619f899018ff2a1419e38cd02107aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/en-CA/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/en-CA/firefox-142.0.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "6ac6abda7b0f89daa5cd995f2d8cc12ee4356030cab564f5edd900ae01b0235f";
+      sha256 = "2db9da4480f9aaf00fc85cea135416dc361667beeb31568d533e8bc54a4d90b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/en-GB/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/en-GB/firefox-142.0.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "519cdd6f0b84d50e0c76bce2529ffa482fede20198f5e20f7ec738322759c086";
+      sha256 = "be6171cf13c7bb6a7b25bd393b995edef97f1141ab272cff1f5d9c630c4815cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/en-US/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/en-US/firefox-142.0.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "c25a2bccaf4834fffc9373a56b4325adbd2de93a3e16be148714e98b060ffb47";
+      sha256 = "35802f3583480eb1712169ccfa2d5071fa3c5cfbd67c99c61be2bda30724d001";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/eo/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/eo/firefox-142.0.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "3563a0f51f26ca176f4768a8371f072f00d1e9d4541a05ad548cdc59020da081";
+      sha256 = "69769f26fcf1cac74a7895182d3a6df80304d7617a73d639822a8c4b44012674";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/es-AR/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/es-AR/firefox-142.0.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "b178b3c9b82918ef2a60e71034a5e2ebd8f02837e8644760398b13f5ad3ddce7";
+      sha256 = "647f3dca1c6471bdd2c6464ab0821e9e56e5576e728df6d27e081cbe82025a44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/es-CL/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/es-CL/firefox-142.0.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "a75d85a4ce1688db409ff5715fb7de3fd976599bef192ed9b4601a63d1eb1329";
+      sha256 = "ec92d03b9f12210e51fb25d414d28bcd397a9caa9f39db6108b5bf90bd263ac7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/es-ES/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/es-ES/firefox-142.0.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "b580f83418fb8938d6aee9f7513fb79e12570789deab418e43d6ad40bd43cee6";
+      sha256 = "a0c22bc77e897cead51543556324d0b0312c9761633febb93050e9f654b27247";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/es-MX/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/es-MX/firefox-142.0.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "eacf0db15e324426bc68ab12a3699c2a1f3bb354523fc7ae4975989786bb29dd";
+      sha256 = "821293fa7b3bd2c72dab6a0eb52362dec18be7e572be8116a634c4519afca071";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/et/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/et/firefox-142.0.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "0126372b0ca3d832130ea86749ec97996350539c0ab9121f0356b3290e71ee9f";
+      sha256 = "4f94f792135e22d9af305a3b38cd610e72cc94f53bb2a1ec95705b2a758574a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/eu/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/eu/firefox-142.0.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "e00604f526da6689248506b2e815c18a4867d08f944367d90d22ce82f2e3433f";
+      sha256 = "a8db4e2ea27b589779daa1638b647ec0f5e8414ff72cb36ec50ec026df2d6780";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/fa/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/fa/firefox-142.0.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "8537bd4650e8856a2b45f87cbd984a3d3612c9cc0863d7664a0d64121515929a";
+      sha256 = "0a5e806d9851a7b4495a038588d644d789c616d5435f58e48294aca62210de00";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ff/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ff/firefox-142.0.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "a923380c701d00297a667aeb9f050fb93c650fa5d855a73b98af141eb5ce7061";
+      sha256 = "261fe54cdb117c324e312aa3f55e5788b2eb879d1c23b7f6935652b2f9a5f039";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/fi/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/fi/firefox-142.0.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "4f457ec29c0e4fd17efa639688f2c07deb648e3a3cda70ad888b05791e5d24bf";
+      sha256 = "bdc0a6e82ae82c2299305438638146c315d9df02af9170acd4bd84c3020d5385";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/fr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/fr/firefox-142.0.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "88d55afcc9f798114aba4cd4dc704e30223253f057f1ffbdd13f4901818b2851";
+      sha256 = "bf9c258b2760f3e0b8b3ba83456ff3687a8e1bb82b9ecc47a652a80c45593221";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/fur/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/fur/firefox-142.0.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "f4d87d8d5a6200ba7edd3896f5b36e1eb51f97d155347cddd30c6438e5469655";
+      sha256 = "7f6265f93b325d3899104e8edd211ab4e51d83696576fed98edfae6accd73928";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/fy-NL/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/fy-NL/firefox-142.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "70a871dbe5dd29906d0d319f27612ae869329a878e281881026536c4f64718d4";
+      sha256 = "ce94c4ee325b5195fbc9a867bbd01900518d678af12933e32acbd4896fe022d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ga-IE/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ga-IE/firefox-142.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "4690f593af76a7c6be8c7ea146fdfbf64545aa2a4c641bde6e4dc45eece202da";
+      sha256 = "af635a399e0fef6fbb523926104f46a512b49d11e25dfbec6d0e92bb50f9a701";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/gd/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/gd/firefox-142.0.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "bc1e3e34ce83f4e71f49c0e33e85f2145dba4bc3f8210bc1ab839d6e7a377b56";
+      sha256 = "d6b292b7588403c0c636a2ff47b2e75dd5ad2a4bc9d93dd74c5ed4d8d21837a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/gl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/gl/firefox-142.0.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "b154b62ee61194f46585cda915853d47c12aee25645d50417d171fa2e9601a19";
+      sha256 = "7a59997b9ce011c63a6736123decd47e74da6a145fd141731b06063c56beabd6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/gn/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/gn/firefox-142.0.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "6ab50dc644867074e308710706bad29f824702da4ef1ecaf72a6e75ec4fcb7c7";
+      sha256 = "89213a797f9089e8da9d4ab33122e6c0ba3943f2a96bbb3d04e5f5a44cdbb5ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/gu-IN/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/gu-IN/firefox-142.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "68ee4b47d52a6412bfc5c0fbba871368fb6ea1d32020609e4fbb41c52f9d03c9";
+      sha256 = "71286d2324657e3525540d16b9f93be7da415a047ab6ea7aa28e7fb2cbcdf69c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/he/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/he/firefox-142.0.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "c2a8e6896a9a0255a554a80ce574846e3b52a100a718610e17b29b6a2173d104";
+      sha256 = "5c13f77fa08e5078bbac374f586fbe49618436aa640d4dc5b07d054b65dc7e04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/hi-IN/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/hi-IN/firefox-142.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "9d7dd9aa634163cdcd137639aa62ab4d8762d52f9de2fd767e53ae395bbeabc8";
+      sha256 = "c2b3fa2f57abf0054eb3adadb2d41c29d299b1ed65711f9e7899e52c4fd8ac2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/hr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/hr/firefox-142.0.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "1af3da92a14d37503be94b758663165f5581d9aedece04662bdc7dcc7bdd7ff6";
+      sha256 = "0fba59df56417aaf66d03a4c7ef0af8aec41a45d015799aaffafd81407d55299";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/hsb/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/hsb/firefox-142.0.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "64b6bb6f9a79cff6ac16a274245440d554867f8e147dbc9bd780af671e92774a";
+      sha256 = "9b95e9dd3cb71651721246a04ef6410755787f1ca43efae61719f9a0d0dc6465";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/hu/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/hu/firefox-142.0.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "332b5049a77a2fda85677df4c21c9d785fd09df53e2975c8d501fa401dd8fa6d";
+      sha256 = "942c3e6d5eb3f7a33a2ddb9af33a744de5d70f7afafe6cefa78f7a50c8cbc365";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/hy-AM/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/hy-AM/firefox-142.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "6510f66985d4ca96960a64dd56808a3f0b6d655c93cf9b7ca5d925ff3cf6c5ce";
+      sha256 = "c21f44ce2dc0da7b1484e665ad38b7c128ecbe1edacd68ffb66be46c437bee1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ia/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ia/firefox-142.0.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "616f6855964f20c760d5c88ae375641769fd9f3c1819499de0557285d05245f1";
+      sha256 = "1e40421df269eb65028eb86a114263d67d9479a7e0011b89771871c312d8f474";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/id/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/id/firefox-142.0.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "2148705494600dfb0a054b84a108294dadd80b792b4bc066ea6b9a6fdec85ed8";
+      sha256 = "8bc79f1a52c4dc376c1b48e1c209ace4568747c1ae7e02a6ea970d1d45f12d91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/is/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/is/firefox-142.0.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "f5b0bf1b5abde821bf2d351aea172fbd70d03ea8f0108c8b4848a9c72ff74f69";
+      sha256 = "cc07b35e75e0fd84a9eedde937ea4f1589429f1519dcd16036ef526d99aa4e94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/it/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/it/firefox-142.0.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "c68e6398ecf2340b9516089feb915a55401a23a1d4138895d44641aad1091ad5";
+      sha256 = "a7bcd566f3266e3d4f0d67b68ec781487edfb9816bf7d7a3f3957ff250d53792";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ja/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ja/firefox-142.0.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "279d36dc35f593b9c68c46340a20b97b70bae6d3494b7d5ee96a113a7722e27c";
+      sha256 = "9e757db38e70f46b3393e9f2a9d499def057e0a87ea94d2480e70ad887b8da57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ka/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ka/firefox-142.0.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "4486869af0c7f5914cebac5f2a74367d9f004a5e0fdc8e6873401c7c0ef4499f";
+      sha256 = "63505998a10b74c7e089e67e1250c5234f0434617604637f2be5c593b85a5ce0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/kab/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/kab/firefox-142.0.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "e1e3a336cfcd28c0f5c1397f30518c05faa32c0dbe0876a99e531a8bfa5b6aec";
+      sha256 = "64a59aa70cff48617dfb7acfe21ddb812f16a563beffe1af22dcf118ae58f6d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/kk/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/kk/firefox-142.0.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "27da62cc3e408b942c0927267777b7e2d1be0ca574cca7f17337e8c688e7026e";
+      sha256 = "5399b8052f93b456382a64cdbe93526e1d1de1971f58da7b29d2b40bc9f48afb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/km/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/km/firefox-142.0.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "8db765bb108f2038dacc7aee071903b1ffb910c4b10aad87bec6013db7ef4355";
+      sha256 = "0652ac26570ab69d0398e12764bdeb67053f199c88afd1c1c8cb7eb76ed2ce71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/kn/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/kn/firefox-142.0.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "cc44ac2dfad32c45d848323f5054870ca637cd909145716d32b58ca95a396d18";
+      sha256 = "48f5478cce2a00395e98400862b78b72f3bd8b6a58c14620b2c5e2b18e5d82dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ko/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ko/firefox-142.0.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "058c043c7414f3ec6fa71d2fc62a894b0261eb9b922b3a201e4bcfecb4614214";
+      sha256 = "e5291cdc1f708828add197c76f2c7d80e331bcb09d55822c2554264eb7545a79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/lij/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/lij/firefox-142.0.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "7534342ba4d7b8698c3a1b337dbaabf287fd6bb015ac3ca49e2710a1b9178f27";
+      sha256 = "1b52beca4930c15fc4807a808c5b65b6c13cc72128756e8b8bf97f50980d1c26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/lt/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/lt/firefox-142.0.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "8905db0bf688308e7ab00947a02fbd4d8e635819ffb47074e8f1ab88bd97a7cc";
+      sha256 = "beaf21a8b9d287a3ea8a4206d28ec9b4e02ddfc3ff2520948158386374687058";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/lv/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/lv/firefox-142.0.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "e30336009649d3b6245b902b3991de1a8c051ef8cbbf59c032e3870f55891e2a";
+      sha256 = "3db45120dd104017b53cf6cc6b2c271a3bc92a0029c365c23e5053c9a1c58302";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/mk/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/mk/firefox-142.0.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "e987c8a0a465bcd0a8a44c60b6099456ca33fa2bda45c91d5d7bd5ec89b0b5fb";
+      sha256 = "3cf2d3bbfe82b6cf710255b33c5fbaebae3c9580f6c9508ec3aa9285b5da0176";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/mr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/mr/firefox-142.0.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "deca7494d6d5be56c4d4552815ce6cfa2827ca36d71994eb41277bdc4e6d1da8";
+      sha256 = "a3ad66e409cdf21c091c96383480e4871973b7749e3c2e454d3f9680daca3921";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ms/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ms/firefox-142.0.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "ee8f4bc73f5f15a794e827b8eaed14d4d7b1d80572dcef1a1b34dd123495e8fe";
+      sha256 = "c60c8bc1638e2d57dd2554356a22a2b040a6c5e16433134f2c165a12a55396e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/my/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/my/firefox-142.0.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "3d22a28e3b532aca6003f308c16066c9f5c65a9ef1879139cc768b4aabfaa58a";
+      sha256 = "cd84aa70b2d837e16a941ac7ac6cf9c9c7c0308289e1fd028ad40e360dcf7a90";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/nb-NO/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/nb-NO/firefox-142.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "029fc76180e5fae9269823b9e1d1b4e93811a786d3e03234e916724e61c29758";
+      sha256 = "42d5bb3c134dae5e2f824557af1817af9c9dabbfef6c4ebf1eddacf94080cab0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ne-NP/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ne-NP/firefox-142.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "70ce7680d3ae733bc7126175051637171b95b213419ac77b946463f5808e7bbf";
+      sha256 = "2ce380f9a93ddd55e57245393dde616b38a7fd4e42165f577f0f83977db1fdf1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/nl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/nl/firefox-142.0.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "9f351f5accac0fa2f0d1629634a3637021e17e43077cd72cb934164d28ae4bba";
+      sha256 = "cf327dee63c04402691040005e4e8ae1fe2b90c5f60a281b92b215a37427a09b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/nn-NO/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/nn-NO/firefox-142.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "291eeed795bc674079b84603af989a80874903f25fe5fb4e3dbe662a60be7cbc";
+      sha256 = "73b165475870e1ad96fe35aaed7de089306d7c50fe5a5f9f14e5a48e253f30a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/oc/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/oc/firefox-142.0.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "4d5a5f4a284596c6e3f2a379edbae1ee13dee348765dbc4dcbac0ac4393855d5";
+      sha256 = "9d168ef2cd974d1432ce0e75ac6fe4a6b7dfe4a6bded8621228d4a8221adc1d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/pa-IN/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/pa-IN/firefox-142.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "f869cbf5be62cca880d7e399699b8118e11e852306f6c845238014affa439904";
+      sha256 = "0be936468c4dd6c818624b842de91de06422139dfb8c9449196fd16e80e154ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/pl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/pl/firefox-142.0.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "9a77a8d285f099ea48662fde12b1d1cc32c09b12db161d1834ae2a745251bd66";
+      sha256 = "8e6bb775643b1c7307ec2a79f8d6bfafc3aea92b39290d13af7cdcfde6cb971d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/pt-BR/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/pt-BR/firefox-142.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "e8897fb645e1586d39bd6f4f7a9000b81dd77c5226fdd803818f14ef36e6bfb0";
+      sha256 = "ce15b163fe8d71422914b09e0661b547144a41b6beffb2c29aec4e3638e42ee1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/pt-PT/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/pt-PT/firefox-142.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "47ba2f64adf0c87f27fc633195944e9036128dbf4125784ab799604a4808a65d";
+      sha256 = "9679d819adbda174978fe784976190e51a7eb55347fd7fd12edefcfea2a568c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/rm/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/rm/firefox-142.0.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "4e5bbdfddc36348ceb803b938df58d21c206a45f2164a27808478b3074838292";
+      sha256 = "3fd17d2f37958fd90212bcdd49537322cb1b407e99bbe897c60edb0b221fda2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ro/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ro/firefox-142.0.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "62961ce7baf70cf994288796c27e382dd54762d2a2912e9c06d65f987bd202cd";
+      sha256 = "15f201cddc8d8d4afdce5381a617a1a28b9873276f8386191adffd88601e5dbd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ru/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ru/firefox-142.0.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "2b3b6f8ec33ff4543e8385c34e845e83cc9db8ba8946bb6fc77294bb841879f9";
+      sha256 = "96a0eae63272fbf78e5ac2ce4b998247665df26aea801fe6644a8933dcafbafa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sat/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sat/firefox-142.0.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "f8b270f3e69117c49fc0275ccc40cb2aeb70fbca8e6994b977bf65f58ee7df61";
+      sha256 = "517762dc5dad2d87045db2614b840e41d5e899fcd6b875dd160f6e467227f9c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sc/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sc/firefox-142.0.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "989aa6fdff893f79834fa10463c229377e3f3dac4d404a328e429522e6b4c1a9";
+      sha256 = "95146d8cea65a491d42f9f90b3cdacc5796486318ba8cc1b035fdada15ad7883";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sco/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sco/firefox-142.0.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "ac619d732a4b622a12331304ae0855b06451ff34d106bc1536e8509ab4456df0";
+      sha256 = "7daf7c01e4a04a6ed500f1ca1316c4769b8fb39fdffaf97652167f68511fea32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/si/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/si/firefox-142.0.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "04b19be537c54c12c0af20155f46ed0ede22942e8df9dbe438f16a8ecbdfd17b";
+      sha256 = "5e15dead3ac799f3ddd83641efdcd2f1b4ee36ec73a5f47ec71d4c7804ff15c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sk/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sk/firefox-142.0.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "2eda6c4e259c23cdbf17ea0c8ae713d4b3da101ee61c80ca9216d6f01bf28e69";
+      sha256 = "713cf4bec037ea5bca1bbf297ff8c0b1fa245bcd7892253e15b76c52201daa62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/skr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/skr/firefox-142.0.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "e592b838c7b836e0f1fd275838f654e4749afb1e8aa419b88fc1a4a1fc381672";
+      sha256 = "1de8cda0a58961deee46dd8ff8f69f8f6b77138044a604060b5375e23065b69a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sl/firefox-142.0.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "5b80cb1645510697fd77b850728de50f40c36eec600107c3237cfd2f88f845c9";
+      sha256 = "237b6139152330b08cc0bf283e9b64e787eab66e9bb2d387f4883c491800dca5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/son/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/son/firefox-142.0.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "1f66b812c4119e7ac1bb76ce0efc1d944d3654908b623454472bcf4f271f35fe";
+      sha256 = "b4fbac5fc56f13cfb6864153710cf302011b0cd9eb0ab5dded4d764d23c38727";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sq/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sq/firefox-142.0.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "b1b2610364a96ccce01a52d4b07de1bdf5586f4694a8347a1d4fcb437083f1ac";
+      sha256 = "1833142469a59677ac14d77e117c9f48a131e2426f8479d965bdff10026157e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sr/firefox-142.0.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "c610dcabb04413eb39ba9f7d32651b5072c4ca587039046be6d454de8fbc65f9";
+      sha256 = "d3c1ee2af2e53d01e2473d9f2fac53619548f6842ea10446cd1546164a5298f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/sv-SE/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/sv-SE/firefox-142.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "ab1e185e8960cc392c4827d43f8a3e1d2756d52c6613e16ff91c755eca047906";
+      sha256 = "f1a351c693fd84e37ddf2b74d546651e19142e64bee7074b18533e9ea7657587";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/szl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/szl/firefox-142.0.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "88e42adc490a4a393c8ed32a9b7ba94702340ca17396126b8897dc05004f26b6";
+      sha256 = "158e24ec6ae8ce8535dc9bf591fa546b72fab11406dc3de53f9b28354ff2ae3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ta/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ta/firefox-142.0.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "77e8703de79f79a544820b7a6ed061e9d680a08f1e58d445d9e7c3d067c79a7e";
+      sha256 = "7ba266b5008a6153a2657f48f70e8d7950fcc720c27663399528343fffaae902";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/te/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/te/firefox-142.0.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "5f7aa9b2a274666ff097c76b87c81525faea74547540ea6604b3645ae60f927c";
+      sha256 = "9d3143b5456e8a1ba0efb76b231bdfe3354d642c7516aa5b95c83d5eca938b79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/tg/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/tg/firefox-142.0.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "92b73441177981f5de7a340fe90dd51a6d09e08acb8edc721f9d2eb510d7e37f";
+      sha256 = "e4e6f5b139afdaecbe3bea9ab62409c1455ca6debb966aaf44161ef82ed1a1c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/th/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/th/firefox-142.0.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "63159b3d68581dd41cdb04842097f44b2098091f800dd57ac6a7b09f3df0ea7d";
+      sha256 = "02cabee434e6b8ce7e7de8efcad6dd9afbd5ea2da3ded23917f94a4dd7402d8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/tl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/tl/firefox-142.0.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "d2df5ca58aeb5ed14acf6227aad446fedeb9cf0447c5470763c95d67dd56b4ce";
+      sha256 = "7a6dd3c7cc30d757bd110b45a73b9b7fbc83a444fff1a57a40dc8e792351cd3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/tr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/tr/firefox-142.0.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "3817ce3d37ab5492dd26639e95654e4cd63ea6cfa6725a957055845eee51ed2b";
+      sha256 = "8bb2a68d184bae484b81c930f551d409e1188d982b7b028c3555b6626b4be997";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/trs/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/trs/firefox-142.0.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "c567b97771610f00f87ee9e4373e0867bb8f4d97dc42164348055c2f53a9014f";
+      sha256 = "66d3bef4909ec3302a22a04fb5a2e18533e8333b1a9b4f852da1b6d4be0a6f3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/uk/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/uk/firefox-142.0.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "03537230463511135605a16498ad43eb4b7f86691d42faf0ff1f343b4c8b0d54";
+      sha256 = "d7c9caa3786fee3b030aa3d0863c4a6a249e2fbf1823939886d2e1ab805796bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/ur/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/ur/firefox-142.0.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "7dd1b6d54c44c028bb708289c303220c872d2f3e35941b617d5faffb24140228";
+      sha256 = "25eb662a592733b822e4ad36f8c92e30b49ade8b9eaba2565e37608b9a3a0768";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/uz/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/uz/firefox-142.0.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "664627334c89fb2fc533c2b15a45b2d793880182108438bce66e842530b42c0d";
+      sha256 = "718ae3e7d35d9b44423820598017fcda7cc47a5a8b41d97187d90543d078c5c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/vi/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/vi/firefox-142.0.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "a5359392718e892fa2cc430614915efcf7ce35fd1d9644f0d9795f9362f0dc82";
+      sha256 = "5416bfaa74c7922b0c70ccda9367f67a2b4ec073aa6957372decdb5ea7d8f1db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/xh/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/xh/firefox-142.0.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "f195c79de2f44b38342171546fab4b51a7e4dcc3d400e38621004a8605a80451";
+      sha256 = "dacb6de464e9cea8bea906ac8fb5d0227521b10bd37810d7d095c6ffd6db6cae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/zh-CN/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/zh-CN/firefox-142.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "978a688036228727b1362235de138e8c45d07bc6f5594ad1fccc23b5bbc03384";
+      sha256 = "8b1e2b1d1f405a6793a8c63f986139165c9127a6f2c195b2fbc253221ba2ed9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-i686/zh-TW/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-i686/zh-TW/firefox-142.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "0b57d860ddae56e11691142f2831d8c157c1261fc8850d3c49da5cce69320b9c";
+      sha256 = "d16edecfcaf3dd39c15e86d3acf065cbf279cb18dcefb235c7eec846580088c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ach/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ach/firefox-142.0.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "e805a97c7c70eb7dda81009a67e198c9d9be31f6ccf7960ef5d589026a79c534";
+      sha256 = "9c4503090dbee52438189b3817c6293d7faeebd820ee72ec85cbb80678c4a39d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/af/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/af/firefox-142.0.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "9f12d3e8adb170fd683ac8a1afdc129671e5626d9c959fc59c9ec92d7f54828b";
+      sha256 = "a0fbb4c547cdc1adcb62cf5dfb317abbd5a4b5a9bb2f2146a7ddb4806b64059a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/an/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/an/firefox-142.0.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "738e71a2bd71b402030be00760835b4d715dc099b476450ffce48517823f7368";
+      sha256 = "ce6c8725f4d98607e805d18fdb834d709fc92f773a778d501cf9f3372e08992d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ar/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ar/firefox-142.0.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "a081b992be71628058d74897787789b5bed97c60846a620eac8e27750f28fd4c";
+      sha256 = "ad1fddef76360bb99cb3420b281fd039f4d530714725f96372ac4179446fe115";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ast/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ast/firefox-142.0.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "4034795ba53c79badf32fc996ae2c82a31bf9bf1a8685a1a3c8cf867257fd659";
+      sha256 = "8fbf7441098dbf7fb4a92a61cd1ac36fec6d6c87de27a3b2523ac1346cc94b33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/az/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/az/firefox-142.0.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "f4f373697bcb3857efd0157c88bd86b6637785c111129dc1a4e7595d2410d768";
+      sha256 = "dd4642ab0d5e9f9ca6899ec4aef78f2745a2ac3c74ec064ce6bd5d060f3eda16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/be/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/be/firefox-142.0.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "f87377d1d9fbc9da5468747cf2292dec97df9c0c8d3faea4c829fc81c14a767f";
+      sha256 = "f95841fae81b471e85c1b503b8807a71402c491a4e53718245244c5cd8be30f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/bg/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/bg/firefox-142.0.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "d1210d16b7e43628a1b9721caa507e7897a463d2c6e2cae37f6c924905f7ce0c";
+      sha256 = "e0fa0a3da4022eb228e5b6ded0324a59938cec400de5461d1be5d5f2844fac8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/bn/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/bn/firefox-142.0.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "0f3592b56f68c06d8d6b4ebf45341a1c0945e55c81987524f165cd5bfeddc4a0";
+      sha256 = "c0f470687739dd099296b664e97b582c9b54f9d83cd99fbb64dcf114cb98adab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/br/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/br/firefox-142.0.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "93cac00cc172b45dd03151b9776f28e200c6e92bd08982a2f5eaa8e0a4cd8993";
+      sha256 = "a5afacdca244c2044695da260d359a647f091d474d8704545182feacadd697f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/bs/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/bs/firefox-142.0.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "d06332ab198ede6f464e2f7b99e6a7c8f65aa5e160e80b1e2e899f89b1bc717f";
+      sha256 = "eac78aa0b1f88a66c336b043c04c6fcdb14e09cdacb0bace8d48de3942ed1f81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ca-valencia/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ca-valencia/firefox-142.0.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "5573bbe4cfd9ed779c6b05278ddc04ca33cdbb5078e4960cbb14d97ca8c94388";
+      sha256 = "2c14efe0da3508e682c991f528807976adde36d3c56c9e9d814010303054bfba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ca/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ca/firefox-142.0.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "334140317e51df90cfa4240841976f8956d5297f7a0cc3e26c3ced83bba49e7b";
+      sha256 = "4a49d515e6231d51903a00069e0106c6f3d4d78c8f3b1b43b2a94975d837b0d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/cak/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/cak/firefox-142.0.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "82384a3d8bfa3ba7e6c8c0bad3161b0d877e6be46454347afe821d435d56105d";
+      sha256 = "39415622252bfd8b1b4f795d6b74e521a97a887c6211c19c0dbf477544675f16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/cs/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/cs/firefox-142.0.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "b76019fc1806796e66a56733723eedd85a6f421e5c238d9ced49db26e961e72b";
+      sha256 = "94eaf875ca330412ff223e6333b710f8c63950ef54d2140f67060d2f09363b95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/cy/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/cy/firefox-142.0.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "f0d42e136cde6e89af9e7115cbe47bef980db0125fd8287468d136aa4342b576";
+      sha256 = "4583973505b11b311e9e42eed0a1c144e3e64def4151ae9be63b06231c8d7ddb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/da/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/da/firefox-142.0.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "246b1504a4aff20e85f905563f04db4db698623eee3476e3c2463690bfc79fa5";
+      sha256 = "772da9d37468600612cc931ec57e1b0a27ee0793964f9e2fd277524a02a5be6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/de/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/de/firefox-142.0.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "26954e7967e8250dc671d35cd763ed93071f953af82cb47fd147f616f98af9a9";
+      sha256 = "c08668457c6067c54ef68b9965c427ea50121f28a5660ec17b2a037c4ee6ce4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/dsb/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/dsb/firefox-142.0.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "db91fe77c8bbbb1ffaee18019620f1ce1d95237d3b1a2bc97d18938b5ab0711c";
+      sha256 = "10cddf31b30e0481098e550a8ac3ea22320d49b8b57c35e7fc8220c07e5e1432";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/el/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/el/firefox-142.0.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "8127b968f34d1e38d67d5e9287927a1d494b1879f3d24f89712f1b0df02f106f";
+      sha256 = "d6cb9fefe36ee2631a33dd8a689fe071c582c2922aa18cb99b84179e7c17c906";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/en-CA/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/en-CA/firefox-142.0.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "3605917655d75096a80dcb9db271bf268d3327fe2ebda0235aea2d22537949eb";
+      sha256 = "c7215bb67c8fd0435de197343929feeb988b32dc5054961d427bed7cf18e7843";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/en-GB/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/en-GB/firefox-142.0.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "cdcf3d691840efb370a96bed1f1bf7a32174e413d1e16ac2ed55460f0143902c";
+      sha256 = "d8afd1cee7a075b2e3aba4130556b0ef745a101514772e4871a790126bef0fa3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/en-US/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/en-US/firefox-142.0.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "03ab7f03538b642693f91bc935f55d9eb6df089eac520a65e1e34dc4fdd7049a";
+      sha256 = "87e9fcaecaef101d7a0910ba8960d4b72b5b4ae91fd4e08069088d3c06f9a792";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/eo/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/eo/firefox-142.0.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "f2316fc6e0a1a747ddaa6b7d88ab335d2058cb4ea223f40533744658240057b3";
+      sha256 = "0f7eb84df2f80ebed50cfd35ca0b465533df91f4c009caabbb895ea45f0a5927";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/es-AR/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/es-AR/firefox-142.0.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "82305a617d919fe05bb24530fab0a4e059f410664791c160883f9806453fa9b9";
+      sha256 = "be2b1f74b1ec841c167ea62c732b2969bb2ceed7835485c66b70235e768ad38b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/es-CL/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/es-CL/firefox-142.0.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "7502b51099ae36c95cc0486b0f0722f4c4d2b02f4d54f13294ff59d05678324b";
+      sha256 = "438b35e8dbe285acf0208a113c919de2bac2a5a1556f770becfbe5ab62db3ac3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/es-ES/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/es-ES/firefox-142.0.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "8af4cec2229bb371c29e402e5765412b18b5b971a49960a8d7634cbf01aaa9ad";
+      sha256 = "8df9d6bf6834f9b0a1b168ccd4804f574c141845868a0f3d3ed93f244762236d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/es-MX/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/es-MX/firefox-142.0.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "65d1dc229e64e9fab6e1feedea5a6cf18a5322c6854d09ad4a5f7ae9ba751a59";
+      sha256 = "bbc54fa49c4c017c3efdbbf71bef0f2bd60fcb16ea41cb1661c975e47f8af613";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/et/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/et/firefox-142.0.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "c1f9fb45a269025505713179578de8d099a6f2297f3f4a3de28928ec2c04ebb8";
+      sha256 = "2a8f2f360892612346f8cd683578d304a181ca802806d4c93a90e74db2cf697a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/eu/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/eu/firefox-142.0.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "cbe476b6a6e28050e1b2a7fe6e0e5c804076ee23f298778541e75b748f715a2b";
+      sha256 = "530b8f2f515bd836bd81029f5bfd3f6ecf5efcece3b403b7e2ea164d1bcfc7c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/fa/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/fa/firefox-142.0.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "02a57b863cf369c783395e02453edef5d351c08d3f19a399eb1d056d769163c2";
+      sha256 = "9c13f47698960fd988e33cf73aac95ab53d19a0280dac046212098aab0f5993d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ff/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ff/firefox-142.0.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "c729d78512a7bef8328791f36077d8b991e6424a5dfe778aeccd1e0790e8b20f";
+      sha256 = "234c28101a09410237efec148403d98dbf8a7d50399884470d14d22fa72401ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/fi/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/fi/firefox-142.0.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "2cce8db24a3308396d50eaf9663950f222747ae34e639445bbae64c1cb94d6ac";
+      sha256 = "0574523f4c7881cb49ebcd5f3c403c49fc4fbe8babb89bac1385bf66fbea21d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/fr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/fr/firefox-142.0.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "cdf837780a11c3b0f2acb8382162ab10d67eece7962930497ae2cb30c2e7cd75";
+      sha256 = "47faa421fc46ce686199ab409f1a91702d814a54afb796cf953d9f038e13d84a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/fur/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/fur/firefox-142.0.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "0e9cb8fa64b6ca14260c8a0e0ad2906414bba9721366d832e4bce995b36e387f";
+      sha256 = "65ef962f924981c0c5b81d7cb61509a4c20743d326a6fdd3c2f714264982e9f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/fy-NL/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/fy-NL/firefox-142.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "29726f35cdb7bfbcf1777a5b56dcb61f0fe4f4afa958d096b9945119792bb9e0";
+      sha256 = "355921a6a67974579e7d0fdc541da2c62fc6a44abaccc7678205b42c30461fd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ga-IE/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ga-IE/firefox-142.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "87c73b2c2cbbb0a4185b18e2bec8ef9ef762e1cdb6bd68a1c55e24c7993fcf65";
+      sha256 = "08370294b653805b778305f5b4b2384dfd5aad8ee0d5043d986a310ef39e80cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/gd/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/gd/firefox-142.0.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "94572640d1c89b3e8e266f4e5c26644d83fbdfd7380995988427cdc173e2bd1c";
+      sha256 = "c7928d2efb173d6f46e05a1793293ab483e67a52cdadf781d7e64775b9cdf290";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/gl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/gl/firefox-142.0.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "dfd1b843908d7a17583e140883317609f9c86e9850388e6985b83b1515dc87c2";
+      sha256 = "217b6b4a910d7d33ed011d3d4d0adac74e3db69f7c3088ac268a808be5576df8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/gn/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/gn/firefox-142.0.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "50efc231c9607aa0baa091df45143ae4bfc645695684efbfc82cc68f135c3dea";
+      sha256 = "7144379cd5ebc4e19ab91a4e5a3b390e0cb7275e84aeb85522ba7644b5286d5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/gu-IN/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/gu-IN/firefox-142.0.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "709c3e0e38ae4261715cc7ca871342f5211fbcf71ab51d510b1aeaa953ffc01e";
+      sha256 = "8171ad64962c12ac04cb587e034ca4aa4f7a6f149fde4a550089d11e86feb02c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/he/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/he/firefox-142.0.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "b9dd29b4d4abb10005afc05a6700c8b333378ad7e6c68eb9d8a5d57d6b351404";
+      sha256 = "520c8c5d73446acff1be53b3074b8eaff36ef4ac86a2d9f8eca8896fba9e1adb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/hi-IN/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/hi-IN/firefox-142.0.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "44d8996aa7e92ca6e17ecc511a962d3572318c7e280386f4df464266e89bfe36";
+      sha256 = "fbac4dc5986683415376b40533718939cc422a311e96e6f2527c373fece43b70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/hr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/hr/firefox-142.0.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "2c90c13a0843950573365bbdaca112561faaa43f3061ff758df7dd36cbb111ef";
+      sha256 = "aff866ae27f3af64a14012804284dab259907a7aeef823472a8cb00491abb8ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/hsb/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/hsb/firefox-142.0.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "dc2bd48cb76bf95781ad99a2c522afd6374ba38efdb6da33305e15bd303dd0d2";
+      sha256 = "098951c958676a45c040f32b70c4fd74643590c71c64e91fb978e19c0969bbd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/hu/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/hu/firefox-142.0.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "71ff53f966cc51dbd9a535e59a9581430da1b3e322b7fe21c2236860a3002123";
+      sha256 = "a1208d82260716e1088038c049706de1a170bd38502192ce730a81dcd267a4af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/hy-AM/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/hy-AM/firefox-142.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "9bd57c68c4c3fbace372b3c7dee336fbe8105a929a43dc1f3a932cef0d15ec5d";
+      sha256 = "be24f9a17f4f40ac9138f370d73476d6e0d8415628ff97619ac8423439adc83b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ia/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ia/firefox-142.0.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "ef1528140dc1f5e9f4c4a3d094989d2d2bf1101410058c04a34b3342e67d7f89";
+      sha256 = "3c63bf9838f496103111b7782141146a2fa9b547339237bb4c360a3dce72cc51";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/id/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/id/firefox-142.0.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "e9754510da65f230f9cc7271eb65a2e963e5fdabbd52551c0e45ddba2601ac21";
+      sha256 = "71a2998d91311dce30d751c6ab4003b486cd2fb5a18afbeb5101bb331a80575c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/is/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/is/firefox-142.0.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "8a2ac7612025066af5b510c45174908891f9564ba929ce7d610cca2853cca383";
+      sha256 = "d628774dcb2a688c814b5392089dfe8fc64a571fd999ad20b16d7a85f074a824";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/it/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/it/firefox-142.0.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "85e6227dbc2fc677eb09f8342b2d7998e95eb7be31e0c1731b091470a9c95f1d";
+      sha256 = "6d8c5f736cf3cb6f8f6a2639046fdb239375018723a6a969797c4efd274fb8ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ja/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ja/firefox-142.0.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "1ef1caf9e57697552fa12bf34f55b0d16badc8f777bbecfb71595033f38f907d";
+      sha256 = "2eec4ae4b50140c0840ac64f488b6d773286f8eacc5a0b5de67bd61bb3bdf45e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ka/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ka/firefox-142.0.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "a15891832d9a4b3292ddea9af8f00f3236f8d86e449d25ca6304d9443562701d";
+      sha256 = "4234f52cea786501b4468866de61823d2a58c2e7b04044952162e355c37c2794";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/kab/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/kab/firefox-142.0.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "5666b4d761937363129e65e562a4add2544a15d9cc1bcfca9187e7c925fa3055";
+      sha256 = "a857604db9120c0c59197119412b56f22edab243e8f22149b68f8061c38c12f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/kk/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/kk/firefox-142.0.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "44aa7cf2dd4234ea2906cb13ac699049d24024f4ea8861a436ca262ac18474b5";
+      sha256 = "0bb4d7bf1ae1f19e9170bd1ab3ea8b2f1523cf18e321d09da732e4e810eaacd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/km/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/km/firefox-142.0.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "ae88cb2e0238b0202f70e69f67308ce8a690cd34fa9dd40d7f21b95060029a60";
+      sha256 = "89d718b75e60bc77a59d2ad9bf54ef344840d839458685d35c4198b2930edd35";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/kn/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/kn/firefox-142.0.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "9bcd17d43243bf9839ea796449191f964fe4c267d6567c86e478f366996922f6";
+      sha256 = "45a202d8bf61e84b18dc4a3ae1cdf44223c1cd20db818f67eeb85e37502ba994";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ko/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ko/firefox-142.0.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "ad75f49db29cbf6d0c6a1b0fcf5e7d4f477d5d82379d63d0dce1e76afabcc27b";
+      sha256 = "4b92105ca489eefdd704c064c2c5523cae1aa26f184ffc0d19f2906cee524763";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/lij/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/lij/firefox-142.0.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "a4ee74dd89f18f4758a5461526e56cfcf77e376d6b84ed98c9d275e803468226";
+      sha256 = "ffd65e7718936007a810f6a4c1e9e74e8e0adfa5ce4a26e178f63f6014c91d34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/lt/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/lt/firefox-142.0.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "c7df8dff34ea79431f0495c22700b770153b78477dee659257220b5f6a6bfc0c";
+      sha256 = "d4da8603b69d68f1038639e08c4a194bc5bfd76e8d0b32935756ff3ae0e00e0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/lv/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/lv/firefox-142.0.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "97f1f668140b6d6b16d0553181d0563759c2fe9f3678e81ddf5a23291efaef47";
+      sha256 = "d81de18d78a7248d12936677b1dfb5ed8a57747629473a970e770e9846857c41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/mk/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/mk/firefox-142.0.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "d1d56e22c94c19e5eee4641831a26662517b44ed73f67ad4cb19211fa6446fd5";
+      sha256 = "982d6323bc2e209676730915927bfe55b7566a5cc257ab4728f1ffd68e683234";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/mr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/mr/firefox-142.0.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "a1536650e550302cb646cf45e712248e9204b2c4ace47d601f52fc42b0713b26";
+      sha256 = "f4099bcc77d2b47a83ab8ab66877929c07d17bdf01b01c5d8a5b964999f57602";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ms/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ms/firefox-142.0.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "26621924fd72fd7a4356aa84584fb0fec9b039e45afab7ef0c0aa58f80957b7c";
+      sha256 = "80dd31200a7dd25c8605c7a277c8b6bba95b880e4cf8667cfae28db0676652c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/my/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/my/firefox-142.0.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "e9ea39c1adce409ce59e2d2d880713a0c1e1ddb0aaaaa19e65f7cf966b9f23f7";
+      sha256 = "d7f5a009caf96bdd36bedf32aa303d370bc242b258d13670550104493ec631cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/nb-NO/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/nb-NO/firefox-142.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "a41b45543fd81390aa795d3e153a0618e95586ea1a799906aeb501d36223deb0";
+      sha256 = "f36e746068f472c8d41201a85a32cb3cae088ba7c5a09b8b14d9b438a31d3f62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ne-NP/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ne-NP/firefox-142.0.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "79c1e414427fd4234f5939a9966d417780ad2a82729c6393dc8207664df557d1";
+      sha256 = "610a3b97b32376952838a9719b126e5e571d144865c2ad3b18cb51fd8c538418";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/nl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/nl/firefox-142.0.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "63d89fc08a4883f784b321f29753dd23de13f27d89825997ce3dabe28ea46b4e";
+      sha256 = "f6fac748ec84f35a53942d5c99ad66708d55507028c5eaa36be615f002ccda1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/nn-NO/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/nn-NO/firefox-142.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "2dccd295049e9b54e8c2d53028d59a31931f8e3009c4ea0ef813d6eab1ddc426";
+      sha256 = "a20a47b4e26e90944694e1d6eff683bd1d4b8ae784ad4ba091cd0c06f3bff4ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/oc/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/oc/firefox-142.0.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "2031f69771f713a9ff58be155cf4b2042441ca601c1af219c9d756c398ebe029";
+      sha256 = "732629aaca85c300d48c24f8a11226fcc7ab96274a7cca7d9c24dd6378517baa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/pa-IN/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/pa-IN/firefox-142.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "c50a6727ed9238bb5e4aa26df891e0cbc74812b6d1e67d8b1998fcce241dc354";
+      sha256 = "971fecbb0b58308b1c47d47ed6a56cfd919b77898dcf140aec69ce92ed94514b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/pl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/pl/firefox-142.0.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "86cc54c5fbd4a4d1118710d175de9ba04bab9c7a7908c6d3b62fecebea8fe0fe";
+      sha256 = "012bdb0d7185dacb9e56a3fa773cef0ee250e524b3c40d0c7f14b9e854848c00";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/pt-BR/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/pt-BR/firefox-142.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "b1a9417678c3adb378015d6e018077a0568d7a4fa57c76c5c6a9d1132fc3e033";
+      sha256 = "58c4cf11db472c71710e913236f02c862aa00d68dcab9d0959c9a4c3c7374eb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/pt-PT/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/pt-PT/firefox-142.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "f60204eb0e58bba0ce39d8ef14f2b025c98a64e28053b47d20c5388e0e17d7c6";
+      sha256 = "f36b64e965d71e8451ec5d053f3033ec019245c825457a28de68bc8dd9db0398";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/rm/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/rm/firefox-142.0.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "4cc94554dcb45455c054537f6e353280480bb4d0b1db66e101f1035d4318a6fa";
+      sha256 = "a12419dbbc76f3bd63f1a83f8107da7db45c7c02c33d8c146b3bef391f72b2a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ro/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ro/firefox-142.0.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "67743218f892a0782afe133b6e3c38c119184017f586ae189326a61ff8e97ae7";
+      sha256 = "cd27b440fd9d4038438f026b357dc8feb128b19ca8eb5d0f5aecd2ea3ad9526a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ru/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ru/firefox-142.0.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "e0efc5f04d2290fc22762da16264a77221dfbf27e69441bf6226145c12928412";
+      sha256 = "2256ba507bac112347853da97d0467049be4ad76372ad299991b7be67c403c13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sat/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sat/firefox-142.0.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "6222d863899d104c1a2d101cb0159a7849bc67be693ed87e971bbcca1a93e95e";
+      sha256 = "1f327a5a3769c275995935b7917840d75c3f641a256521852c2bf270af09d787";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sc/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sc/firefox-142.0.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "aded2382485893405e06c7a6edce9c2f8253775207948daf00a9269f2e61f428";
+      sha256 = "028fc1caff333f7dcf7cdc9b34a7dbc89f80dd51a34207eb55e2e017e4c0f2f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sco/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sco/firefox-142.0.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "e6502b6d91e2cf83cc47bdf62c4ae78226156d606b333749d13e112aa1d3c92a";
+      sha256 = "cdfaf057806f77abd4c21df7b74bb51c034df9be18bf96212613e58eeda029db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/si/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/si/firefox-142.0.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "54c846cb3486bd58a0ff3bb8e671812590be7fad256dbb840e69ec785ce86f51";
+      sha256 = "f857f9416dbf0e6b8b27eef8dce9f803c3f8ff3d5e7ce4c10740636782a57e33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sk/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sk/firefox-142.0.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "ff78517d82566c485f541fb15708e8e625257e02bc620619380b0b3b58d91617";
+      sha256 = "0526baa8b197ab5511739369d1914beddc91fcd45b01e2c3bef0d41a073e74a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/skr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/skr/firefox-142.0.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "3e5f1a1c932d4dd15212fd9448fe55e54d5a8287d45f22237dbda4554ffb9f12";
+      sha256 = "0b69b4c3fa1677f5d614dfe7eb9434bcfcf41f6bf6c04452121f5de4ffd9ea4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sl/firefox-142.0.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "b6d43db8f84e212bcc84e742802c1d29840dcf0e4f5c78601a3ecf3d7e672a76";
+      sha256 = "005514a0ecace67395aa497986d2896e10d029eac6665e80a353fe64760b5cfa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/son/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/son/firefox-142.0.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "f8e335ff2d1a531401637a50a38d84da3dc8779f835268f52238c1668ad2e8db";
+      sha256 = "0982c3c8286482ff4d58e74e34beb9c5507333102722d8d75b40ca1018b9d0c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sq/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sq/firefox-142.0.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "f51c81be5da3838fb0b6e23b4d55dde52c5e7a63f617e5a7a7658fd590d13a8d";
+      sha256 = "17d0a0fa71980b593f6fccf4e4685776aba7cc0fe12ebeabd4fb0ca8e8f34d8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sr/firefox-142.0.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "7a9e6000f2e7bba8e2f6fb77b6935eade017bbf3ed6c57365811173540871384";
+      sha256 = "86deb314cc5b2d4c74fa06a4fd04ad8a25a0d7a30ff17b064f3f621a7e9d13b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/sv-SE/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/sv-SE/firefox-142.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "99c71e04a99b098636d685d596110a68f51701692488679193c0f7fdd8b1c76c";
+      sha256 = "facdac4938ba2f3f3995e1a65556ba4eba027cd75b26991001c51eaa8bae1c73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/szl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/szl/firefox-142.0.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "0acfda6b3b7fe73a53c572ec423aba18b578d87149d883885ed799bfc8788193";
+      sha256 = "19eadc0fb28e5439b031dfc66341ccf3af30cf0231f9fa97695acfcec99cef31";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ta/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ta/firefox-142.0.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "0f229bd2c3b897494e498a1692b6b80f68577ed10d425f7d4e949fb7724a535e";
+      sha256 = "b19438f28cad92c2fbdd7ba9000c04deac9ab5d66b85ab2d1172a4b2f4c23468";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/te/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/te/firefox-142.0.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "b7dd94b4ede4a57552a93957629c47bc02fe19ea149c7f86a0b0cafd403652a2";
+      sha256 = "6cbc5f058c6c51daaa152374dbf0ef7a480b2a5b8379ee124ed54619ff659997";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/tg/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/tg/firefox-142.0.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "7eadc936e325cf2918586979197d530a84df3d973a2d278563ce08dfd500c243";
+      sha256 = "9e9552df9c45562e7a6d6ad8b3338268233d9d4876815426b7c83e15c89a15fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/th/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/th/firefox-142.0.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "20a0b7227ab6cb9084f8503062006d91a8fedfdaefa272dd3b6ce58028befb69";
+      sha256 = "66d924b81ad6d7c721396ebec7d01e56f340267f2f2cf8537c04e0a4e81ba38a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/tl/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/tl/firefox-142.0.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "184eba362e2b6598d64d69a976ca71a16ac4d5d11415488b60e1dfb59546f1b1";
+      sha256 = "f77af69387be92e855d261bdc0a312c411a537c9b084b4b99edcf92b78b9ea30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/tr/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/tr/firefox-142.0.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "994c183a385f3bbc526f0c7ddc769c554b3fcc58cfeea278349568a1355eada0";
+      sha256 = "f439a1e898458d0552d166a73377f41226094fec512747e79b44928c95c0f749";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/trs/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/trs/firefox-142.0.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "3f2242f30ebfbe16608b9c9b4ab30c2c0e761b8ea1ce3624af2b0fc19bd03afd";
+      sha256 = "5634c589f31965f0ee274eabf98b98cff0432f7164894cf78cc83787805cb793";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/uk/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/uk/firefox-142.0.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "a73a9944efcd02df6607d4591f5d48fedc0f49b1011402489c4100c8334f6ac1";
+      sha256 = "00c78e103130e596bf1b6a7902ead661b6e95bb09a3020e99fd7988701a52d26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/ur/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/ur/firefox-142.0.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "bbee6b3acf149d51b806d715fba6fc3d7638255731358b09e1d7084413b3d273";
+      sha256 = "c076d51edd7d0c5eafb82b84b3de8c7b6ec46f8949403b67bdf0873a7815c8f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/uz/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/uz/firefox-142.0.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "eb7788a8ff0eb8bcf6ac63d8cd3e012296ed15db7fd29db853c65f7173e3784b";
+      sha256 = "e060c94992b95b4b3489b042f26e5ab424cf853456db4d546cdbaee7783f4f27";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/vi/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/vi/firefox-142.0.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "b9c3d08683826064b99befd1d9a36c450a0a8292454b233ab25fcae2ddda3e9a";
+      sha256 = "94325fb4fc9bc3a37d3c7ce0e28c1caaf3cb053c9816eef204d27408642659ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/xh/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/xh/firefox-142.0.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "06dad8694ae5a2b277d3ea2bc9a69a38712c903661cc431c3d84f89659b4e488";
+      sha256 = "e95bd5ad4068b0cfed97dbb0a0cad69820424ba56e9343ac1a6afb9d8fe92b1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/zh-CN/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/zh-CN/firefox-142.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "df79ba8c1bdfcc3d73fc399bb39cc55ea22f90d37ea953a57b0396b19e75e30c";
+      sha256 = "ae33b4d6307a424367c128754caecf8c6ccde2cd51583bb27b06fd5827984fde";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/linux-aarch64/zh-TW/firefox-141.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/linux-aarch64/zh-TW/firefox-142.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "0e51d372cb39355eeb6ca49990f9c6bc3957035b6b400ad7ac332b8222c7c9b0";
+      sha256 = "f8d9d6147d361af3c691dbc8ea4bdc8776642dbcfb0eef52aa07faee918f2e2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ach/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ach/Firefox%20142.0.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "fe4ee5f513284a3445cee74c0c27ccc3de519a8cc9266f98028fc1024388ca3c";
+      sha256 = "4341ce0002c88250bf7767280ef7e376467f44e59403bbcbd3d44d402b78fa5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/af/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/af/Firefox%20142.0.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "1b262463cd00bc437415b59a8b99cdf389b84b3b58a9f44e9e09721a0d1e5a1a";
+      sha256 = "f70282fefa70894de40b30011a20737473121496f66b3366a778e3bb6e28b14a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/an/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/an/Firefox%20142.0.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "e497f070cd27e017620246a476d40b375d78b58f96b9c598b4628e60308b0721";
+      sha256 = "935e240f3145f413f55e9c236dd9bfbc43f6fa19b74a0920faee3a63023620a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ar/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ar/Firefox%20142.0.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "a0ec1696a4264fd5c02bc337987cc5c415dca3b0f1f73a0e6f0a5cad6eb3df7e";
+      sha256 = "d7d4aa7fdf7e167de93d6cf40d4c3a00a9a5ab2a57b7235c2f9062724e5bade2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ast/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ast/Firefox%20142.0.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "dd68b926e41ddac2badddafd1cc4609cb9b8107bde0f1cd844b359c025d87017";
+      sha256 = "27c410ca47ac3512725d68200bd494e22bc4134803055dd4ac9b86847ae271a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/az/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/az/Firefox%20142.0.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "23e82c76b02ebe131cd283ceda8301e8840e0c5e51948282803c303a3d0b84ea";
+      sha256 = "4a50ed3cb6792253e20fce8555024c97af71660af9cdcb23d55765f2a9b9e537";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/be/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/be/Firefox%20142.0.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "ae607bd09bb790432d4ba77d4914bffe7d8ccb39ffe23fa1dd60fcd70c05fd9d";
+      sha256 = "3d07b34c4a12a36b195ca55dcbdb65345178786673bd3a44bfd3ace750fd7e00";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/bg/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/bg/Firefox%20142.0.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "614f9e3c2a0c30a600e94c96f85ae53c2e9071aed2250a6b10d23093a5ef1a9f";
+      sha256 = "6fc20dde52b54f61bbfd6454982486fac5ee77565ab7a2edc35798d2edad9e72";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/bn/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/bn/Firefox%20142.0.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "5fe6b0b130f8e80ffa295fee98d38036a864bb465f3aee289fc2429e5a9358f2";
+      sha256 = "c90f7ba197f3c600002e2aeeaa8bed08ec82fca72097be7d42fb5bd582e5bab7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/br/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/br/Firefox%20142.0.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "10bc04de7b31281c58738f05a8795a04ced567e8debd6fbd7847d53420dcd0fa";
+      sha256 = "edd552f746924c087888ca5f35d043cbeeec1c4b2ef39d875f89d326176ce2b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/bs/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/bs/Firefox%20142.0.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "1045d566ea8ec40344febb89214fbab1bc46c6f28bd3a3e10293f37dfb4f5063";
+      sha256 = "45e4510ab4bc953d299800b07089ea4773610a59b65637d15cd21bfbfabf10d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ca-valencia/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ca-valencia/Firefox%20142.0.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "33668ba6982b9e4152674ff617b90e878c3d487cc471a113b63bcd4a062f4e6c";
+      sha256 = "c969ce8f59de04cbbb11efeb7265174f0a453ca751ba1407dc4239f9117df30e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ca/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ca/Firefox%20142.0.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "17a9543de81d34ade407aad7d1fe6cb0533adbf24b70d514cad1007b2a894c0d";
+      sha256 = "8b858ba62e2a3b911cb9cf367481971910a1ff3ed763e969e1ffbc978d8e74c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/cak/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/cak/Firefox%20142.0.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "1090cec0a21a4e1d9cf31910b3632d052cb6fb1811b18ab06ed27427e4b20940";
+      sha256 = "0857daed19bda28a4c05d13e8ad5074890027200305e971a1c648ecd2364dc17";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/cs/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/cs/Firefox%20142.0.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "6ac4afd1edc5a7cc0bff143d16c04f4cc9cc016282f664a06a1c873ee1b5d7fb";
+      sha256 = "8529af4a2972946a3c99249b561b34c9f3b83cc393c749ba01df33cc8bf50dac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/cy/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/cy/Firefox%20142.0.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "277215999fd59088a7ceda9e8918df27989920c16e326351dda6c75468f1a7a0";
+      sha256 = "bdb881bf47243839b73b55a2c12b8ee51541a129655eaea585155f02e93a5349";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/da/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/da/Firefox%20142.0.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "ade16d20e8647b3c37c8ca9f04e214abb33262c83d8a64edec468c224857ee27";
+      sha256 = "065d76480584713f94638ad5ce952c23d591711bd0b02b38951b3a366f894f9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/de/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/de/Firefox%20142.0.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "7724319830781b585946bdf5b74577fb63339513d1d8fc92829b7b310e2a98e6";
+      sha256 = "e8d658e2292fe88ac4bd623303bcc24bd87eadb43b6a5ea5d0e216c35c434737";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/dsb/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/dsb/Firefox%20142.0.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "fdf0dee85f200db133600c4d461b3750cf3e6849821d83dd949935bf5843ca16";
+      sha256 = "964525213b7c6bb4950b585598c2c5e0fde91919826378d2a41c6a1c9d0b323a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/el/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/el/Firefox%20142.0.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "2685246fdee90d48dbfe13c75e4f702d5e413ea1ab696639bf0e83e05b495a5e";
+      sha256 = "cf11c802fdb71294c85cab2e95db5cf5965d1f1fcbfb6119a1a8d02e05549de6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/en-CA/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/en-CA/Firefox%20142.0.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "c99d230960d93b3f6376b6e299593bcfaf80680b2333c2373a73ed9be6aaea54";
+      sha256 = "3a97157b0a0c12820506e42bd18470fb5bc8b77f6f4198f5cfa36f677fb53fb4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/en-GB/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/en-GB/Firefox%20142.0.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "46942a1dad7d20c46fdf3b7b2c3dda0bf7ec87eda34765600838f97a4f6ac1e7";
+      sha256 = "a94c7636941c72be838546e304f98f94cacdf95124ebf33de7bece24fae6f1b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/en-US/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/en-US/Firefox%20142.0.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "bb922cda690543bddaa1fbc3b3cba508c60774832643452bc266595331f42db1";
+      sha256 = "cc0ce6b3ec64d064c16187f92ca4a8df5a21a1d7aa2f79a9e82b44602f2b1a0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/eo/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/eo/Firefox%20142.0.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "826ab0d511294ae77c0c8d7ee50a5449b29c87138aa3ad35ca4cf1fa5d412da4";
+      sha256 = "0805049d7deec19cea01bf5947231442d37e486ee90d442deb647e2546481248";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/es-AR/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/es-AR/Firefox%20142.0.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "0a7e1ea2de529ffb1bc604638d5bf10797b7fa7b1c17e85f09d4ac9e3d0d3ad7";
+      sha256 = "c393d3298fe486f801033b75f46c0e98258d79507df469681f096a18b86068ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/es-CL/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/es-CL/Firefox%20142.0.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "840f73937407c1fd64c6b87ab2c37aa0ecf29d52a12e64e9c93cbeb2cdc9a80b";
+      sha256 = "c1a78c7d5914e96a1bf96399f208d3c53805bbff0994ea65c990656de6711332";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/es-ES/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/es-ES/Firefox%20142.0.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "f13dfb899c830e765bb4daf655c59932ce2a56de9a26b3472066324aa213698b";
+      sha256 = "bec5cf38486390dfbb7e95fa71bb23226debca760e15aa19d67fe9b0f1df264c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/es-MX/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/es-MX/Firefox%20142.0.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "09909157b6a3c443f699adca7d86d7426413b229235c60547668a1cf1d49a6f6";
+      sha256 = "07dd5830487c194b078ed4f2aba101ae559b89e11a4f69d5608969664489ee33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/et/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/et/Firefox%20142.0.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "ef7bede85a21ef30007a04e7952f4865ee78b593cadeb05b72a2e271a0549cc8";
+      sha256 = "adf3e037eeda72569dee39b3ad4aa3ee180f9e733f327ead0a03293c28c7efed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/eu/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/eu/Firefox%20142.0.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "1eb1c38d05bd0275002a3badd4a4e1b1140bd6630ac76634dde34dae17e1169e";
+      sha256 = "363fb6c488ee0d21ce2662c0b588d37721bfead9582521e938a3dd5eedb43382";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/fa/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/fa/Firefox%20142.0.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "0bd4b3819f8f6e463da0eb12dc41ca12d1dc6b65e597ff811c79065872229cf4";
+      sha256 = "92e12ec109ead629f1ee6fafd6dd1f45e6c98c272d2b333d97a9f0d823385c82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ff/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ff/Firefox%20142.0.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "97934e1c6396fe20fb8a02f07cd20eabee96d08c9de137dda3a81db2931bdfbc";
+      sha256 = "f8f8076cd197d8b33d615a6a72ef46fac6839c4d1c4380b7fe44fa6a962969bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/fi/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/fi/Firefox%20142.0.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "cdd665861133f2544faa94a0f35efa0c0ce70c3a53df9575b66fc5d34e32cd1e";
+      sha256 = "12a12df58ba57ae364a5cdc348d25091bf547f4079b3a2dee892cbd0212f641e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/fr/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/fr/Firefox%20142.0.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "de491c95711aa2fad263eb882d3df85d814999d77785321b3285b6da0322c955";
+      sha256 = "2c8ad051b60f24fe3002627e170231c155a8f009104f0324f69a81fb84e328a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/fur/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/fur/Firefox%20142.0.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "12c4fbc2222b77e4a7864f01989b13d2388025550fb31a8daa3670015753df87";
+      sha256 = "75f269d7b3ff0cec1c0756f68ff5f93734caec4af9292805501c85fe8a2edf8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/fy-NL/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/fy-NL/Firefox%20142.0.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "5e9b832f8d9dc946fa30a1dc92aeb0096ff81c13c14e990a2a2b5f9740a18d68";
+      sha256 = "bf962c183c63d8c31245b76d3aa969448055ed776f7eabb7f84d62dfe9435efd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ga-IE/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ga-IE/Firefox%20142.0.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "f40457fb8375a1d708aba9bb59e95fdae5fa375c77bca3a1ed2309627b979cb0";
+      sha256 = "89fb9c8845b97ba0e035ad6d5de77cfea15a90a7dfc8b3b4a1188f5d639950e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/gd/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/gd/Firefox%20142.0.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "a361ba1570456cc1973d7ac41ea70315a68dea38f2acc524aaa716d3e07401d8";
+      sha256 = "d0bc4c08e1b5adebaf0ff5f882468a5c6e2a91e44b9ed3ef3bff74874bf6adb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/gl/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/gl/Firefox%20142.0.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "7bfd06d194a071ea73c7104b252d8c485577f96d1248b7e45f885fcc16282bfc";
+      sha256 = "417de4bc466800813de91a0f9511fccfb7e2b3c487b3953a8bfb9474bf244372";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/gn/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/gn/Firefox%20142.0.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "10581e91db1520aae3dfe2f022d4a63a72bf35d3ed370fc9c7d2139ad18efc31";
+      sha256 = "2238c8517dfb6a19fcf74e2aaf9d3fb6b32c1500df39df09a807051c91628f4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/gu-IN/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/gu-IN/Firefox%20142.0.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "46a8bcb2fdf8beba7b6d1d2dd865a5d946eb9831cf2de829a9fa95ad52278a6c";
+      sha256 = "0a6b50c997b8b6dda0abb2f79d7e0b55f9b5fefc4c3d3fc54f485309c7a42f28";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/he/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/he/Firefox%20142.0.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "c6d9b59bfb3130b793b69adf7a82994d2cb37dcc48f12d0a26db85692e596f71";
+      sha256 = "0403bdf80e538c0e6393154dfa6395bf67ba846e22fb2e3d2226e77056767735";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/hi-IN/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/hi-IN/Firefox%20142.0.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "e13e83521bac0656a2fcf16d315d2cfb7b0012e9751e8d9bb60ff41b983f6ef5";
+      sha256 = "fa29a5c228b0a388105b0435ee8391ade40a64d989c7061538b08f3b8bdf033a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/hr/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/hr/Firefox%20142.0.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "d4f2a6217677d69961202c43789b0642abc11e6051480d621dd915d71afd0343";
+      sha256 = "a68ec11b400270e0c92b7909830a138d22c62e6d1c5a1c3e48ede46064c132a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/hsb/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/hsb/Firefox%20142.0.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "3a477450a0a4bb97a5cc6fc5dbe27c691c78476368fbeef1a1081301eb6e78b7";
+      sha256 = "975338659f06e26bc0ad861d4e3812f450d322213d3eae6adf1813dbdcd228b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/hu/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/hu/Firefox%20142.0.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "6cb7b635a32f588656016610b4df95cfb2287285c16cce9688600ce63b49b7f4";
+      sha256 = "2e23dcdeca7d097e7391f128fb1318b513f2a336b726982f26cdace967228bd2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/hy-AM/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/hy-AM/Firefox%20142.0.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "6095d30504f6796e620b62301cd9313d6edab557beacd466ce72dc25279b7ab6";
+      sha256 = "0fd453412aa479f31ea0a66fbaeeb384627cef88c84b9e2607703264fd1dafd8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ia/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ia/Firefox%20142.0.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "e8b2dcffbb552ff2cb43e8cc1a525c5648cefb917f39b212828213e4b10470e5";
+      sha256 = "3d750e9c0885502b57d97ff2bea8eaf00f1d205dba1cb5e64ded6fbed04ba53a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/id/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/id/Firefox%20142.0.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "3b2ae0efe9bbcd37c64c2965170975caf9ead3e4cc33f4be298cebf55a23b3fa";
+      sha256 = "52a7958c8202c6657c09560a51398fea3288dc363f0e76cb5c617ae9ae4b1d79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/is/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/is/Firefox%20142.0.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "7b1b115b29d476b69ba1e88cc9db5007e4c4b208969e221d3e80216b875d8503";
+      sha256 = "d6b1a5594f7c676add3eda5496112934620d28d3ba91bd998370b216391366b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/it/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/it/Firefox%20142.0.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "c93acbf4407d58b4573f6caa9b277cd12a08811e6057bc4629d726db8f6ed3b3";
+      sha256 = "2f101a09cffe3f9753b0013e2d2f75ec3b424fb2573461d70e3f8090ed33ac64";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ja-JP-mac/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ja-JP-mac/Firefox%20142.0.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "0a479b7510dd46e753b087ffddd177b3bdc6109189d3a4380fc02bbb22520d30";
+      sha256 = "57fe48a002ecf9ae4eb8dc61172b415b6d475c9a4056481fd0c7a00d6653726c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ka/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ka/Firefox%20142.0.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "8ab9148451d9872881d055dc415dbea8e86bf37a98e7823dacd7253dd3552c30";
+      sha256 = "ab7539e3c812221333fe0d91ea44e79007af509761c805770fe6151805f29ee5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/kab/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/kab/Firefox%20142.0.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "acef8bc598d82334be458ce69ef6f51e02ca19626c6410a87fb3a4bbe2e03d5d";
+      sha256 = "75c4be686995728b16b62c15b5b8f95de65424c53b70530c692e51024661a170";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/kk/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/kk/Firefox%20142.0.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "9c67da1022095444d85d12030bd188d6bb7c783543af9656ae572ef2ac23d1f5";
+      sha256 = "9b1f67591976b72203346391172c6e8e431e454a3dba14fe190eb74a8acfe8db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/km/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/km/Firefox%20142.0.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "bf20a6b3d30e8f102f699ec38c4d110f8d679b0a37cc4a8ba42cecdd668ea8e3";
+      sha256 = "4344634a43f5699763c4f1cdc46420fc7247882470a3365fd76baa5f12a76963";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/kn/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/kn/Firefox%20142.0.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "403c94d88679552b2eec61f947ed4321c7bb7ecdcd1af3447d3a62a80e8208b7";
+      sha256 = "1b30a75ef85f2b0ed5603d5f847874cf96ba450245453d5dc1431f1a00601970";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ko/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ko/Firefox%20142.0.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "b2524ae1e6e51231ef18bd401984d6d6849eeb0fec026673b982a7fccb811610";
+      sha256 = "5973c8b666a61845335bb2fb3299c78588f1a81a0edd9cfb668ca75e7a4288d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/lij/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/lij/Firefox%20142.0.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "67082cf180f09dff8d7abb6d134715c57e6bb5e69f4333d9cbf934d64b57ed21";
+      sha256 = "53a3c2965120ad8a27d15578eea9687747b05b2a908e5566cdf0fae34a39e98f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/lt/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/lt/Firefox%20142.0.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "73e78a66b83e8fc1d322d62da0e5a9867107aae4402e3e66300b094429cb6c08";
+      sha256 = "de50b2f81543a471c381041dfdbe8b41b5547c3dab0ba212939796e1b881adf9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/lv/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/lv/Firefox%20142.0.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "8118afb0a22a20b3f169c304eeb41a3440fc7b166840337bdf38bc622d47b1e2";
+      sha256 = "3fcdbbf864fd2d246e0ee3229b3ab0f1094af9cc64121fb5d1520f60bc0d44ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/mk/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/mk/Firefox%20142.0.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "fa955e41454ec3cb3a848b8aaf3b6f0aa2e415c4e357c4d561f103f65433fecb";
+      sha256 = "21f06d3daaee1bd5d6474ee87c64585b5c249e7e5ad342dbd59bf4447097d22d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/mr/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/mr/Firefox%20142.0.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "e7d3301568b49163d2887644e4fcbc0d24c6fae19086352d3fe36cfd4eb07e13";
+      sha256 = "ca6cea513caa1a5ec6658a27397f763fef29bc6875f9596ee0012e1a627c3a16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ms/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ms/Firefox%20142.0.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "ea87596de497e8c34fdd8066c20da7011963f89e364b99aba63ce6252e4e1c29";
+      sha256 = "2d55ca7bad3e5a3627c41fc7b38c13827dcc308615fe50dff6a84cda37034a14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/my/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/my/Firefox%20142.0.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "1f88103e6bf4539bb28b8b99fa9e176c85c416e55d0cf92dc8429eec0435c0ff";
+      sha256 = "696c5292317d76d6931b24d62bc9d187ef0df57f2d546ffc08e829b15f5f9338";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/nb-NO/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/nb-NO/Firefox%20142.0.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "4ac0e10d8cf5e01e521097a795a71b1099f4d2a29291432f2071df4154a8b8eb";
+      sha256 = "af9c6ddda9f9ec3536a30fdfc72405e6b6d03abd33c82d33a4f47898d11bbd6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ne-NP/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ne-NP/Firefox%20142.0.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "8b9374a47e77243acb1fa49a693ccf3fde19f070b413bf8ebd9056dee5f88a3a";
+      sha256 = "53ec6ef1f602f495ed2a037e78f46a5bb2d28dff8c647bfb49a61180062502a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/nl/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/nl/Firefox%20142.0.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "a9ec1c87d44478fdd1e16fc8d4d5df0f08394a6d99b6234083548a097dc9f714";
+      sha256 = "391683d047b3524f244a40633d74e9e295a959847b793a6f8ea5c83074441ae5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/nn-NO/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/nn-NO/Firefox%20142.0.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "44bbf70a73c514f16a284435a05b8437329200566ee17b4ac280b6b3bcc44bc7";
+      sha256 = "5b7d9599108975720d4d8ebd05db95d29da33749d1d6ca35d9794e6800f993dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/oc/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/oc/Firefox%20142.0.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "982ddc81f4800ecb3bede88e2f17eccc4288a8b8e93523677227ee5b830c8b47";
+      sha256 = "83de1844115941bd211f76fc064f36c359a418b9f07dc50afea7944731b15a0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/pa-IN/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/pa-IN/Firefox%20142.0.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "e570a2b996c3e7ffb01bfd0875f183c87a992f5c2cb246e9f68db4e864082653";
+      sha256 = "c5925a3595907e4f31cf4731f4778a0e3747a6e0aa24d8cef7ce2c8cbd95945a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/pl/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/pl/Firefox%20142.0.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "044fb31a83a627fb1d475c8683fb66bc4098d14ac47729cfe1a0bff1609bcda8";
+      sha256 = "44b373d5aff7a9b1b450a9d14a7f1a4ca2bb4a222a37aae421ad6a955efebe96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/pt-BR/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/pt-BR/Firefox%20142.0.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "1d4ac61aff3f7c14ba5867b7dfa5e098842bf0f25a24611abe303c1fb5536ba0";
+      sha256 = "252d327c4512a7fc3d0e685231f1d0b002af460427ffa095138da0ac2986349e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/pt-PT/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/pt-PT/Firefox%20142.0.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "ad848efcaf811e3ac8915baccce23e4520546f8923f27c1fe4b07cec4203546e";
+      sha256 = "6228dc5de24d9daaf2360767625f7f994d522defe8db57feba7a982034624b34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/rm/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/rm/Firefox%20142.0.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "019f188b80dfcb513af4e623cc4b7c4c983c0bf65ed888ee9f46f4d92b1c7048";
+      sha256 = "f9ed3ad0f8c332e7404e8b337c6ba70036bfa3ff2412d51dc608154d5c7112c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ro/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ro/Firefox%20142.0.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "6bc2b001cd606ec3eedc88cc5736f67d2aada18ebbd46bcc8761cf4918b99e6e";
+      sha256 = "ff8f09628ae4f221a8cf76092786623dfa478eb6be851ee5fae2f5683aa8f19d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ru/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ru/Firefox%20142.0.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "b82cf9e1960b92cddf95fbd3a8174c1a2bdc387be780893780433f2e518d84f9";
+      sha256 = "2ff2dcbfad1dbe88be2cf790fc16aeb69f4a92515b9f9daa628b672a8420e377";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sat/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sat/Firefox%20142.0.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "18f71579ad0078afaf5783a54b70463bc3b2e3e72f87e4ab9f01d22e60fee14c";
+      sha256 = "bb90cdeca2802e9e19ecf88d4744844aed39a2d20655749c43574bab536fee4c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sc/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sc/Firefox%20142.0.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "c586dcb0f8fa6734fd8a822c4a54b94b4a559ac6220d884bc69d9b50f7a32d3e";
+      sha256 = "35311be30a210d5fbfe3430db8617abb9c9d85214b1ade05318397d2b4fb133c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sco/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sco/Firefox%20142.0.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "aa5b9501fd5c553b5c9ac1110b91d11de0f262b16c4068c3459d22c35639c4b4";
+      sha256 = "af1b6f912dc48e11bb4f6afbda3c6a2412e784669e60f605d044584348b7d43a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/si/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/si/Firefox%20142.0.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "b6bd43406ad0175d45cd4990ea80b83e320459627038cc018ee01aaccb49ae7e";
+      sha256 = "5ed11670f2b077f99d38453c6e0c61efd2545ef93948e753c7562487a1122177";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sk/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sk/Firefox%20142.0.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "62649f448961ccdd37f322422eba89edc607ec48d64fa93a851ba1aff3b991a9";
+      sha256 = "2edcc356df44e3b9223177c6b6a89bf63b5a24e3785341ac209d3ec834768eec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/skr/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/skr/Firefox%20142.0.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "2c23f1cd8d302488406e96b06870aae37a7ee8cd8840733451832859953345ab";
+      sha256 = "b6fe08ab8dd99794106f5dfeff0f294926d6f54690e4b616505eb70195a0c048";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sl/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sl/Firefox%20142.0.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "da380f30342abb3904c2d43a7e3250454cfb4a9c79f72f10de57d342c7e86988";
+      sha256 = "ab3f930c019bf88b296b3861a8eed095ec80684ca51ad96ce805b4f26a4c452e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/son/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/son/Firefox%20142.0.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "c5e732b1d87149a64dad91de0f6ee90509bf13023c6be74706ada3a33399b5ac";
+      sha256 = "2911806bd0e20bc2bffe220b36c207e2df4376d101f730f0a74b8856b0ef62fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sq/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sq/Firefox%20142.0.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "c44df5f08f47882dd9bf57b7bf62141517e6d8384e6c1425e3bbd1cd629f9ccb";
+      sha256 = "7bf8d73482bf7999d1eb8079213771867415fd65ff03c96b82f22251c961dd84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sr/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sr/Firefox%20142.0.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "a865e597136910a69ce4441227b702b4ca8f676614847d712419551c38fd906a";
+      sha256 = "b9f9c929f696ed684a5faf6260547ce0bddeb3f5e5c5f11780fc1b69bc9e625a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/sv-SE/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/sv-SE/Firefox%20142.0.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "e1004e6ca315fda078df6da410f3fe004ab45931d48bec57d1d3d1b4e102035e";
+      sha256 = "a169a7415c5ba091b8c979cce851a534ac4dcbf21e90c370964831ac3861d76f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/szl/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/szl/Firefox%20142.0.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "6cadbb50355600d65f04f2f228ba9fc48d163386068e3025f3fa2e3d0d53c123";
+      sha256 = "6ad62161db21437be1df26f645757ffe548472dd18bf5168337c616044eb626f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ta/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ta/Firefox%20142.0.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "a22961ab58be3ea50b22db31931620b483433963fc4a76b708f080a83bf225ac";
+      sha256 = "5c3c85f12f5e323d4ef10d0ede3c54b6cf9fe59f22e3c6ebb8d2ce589fe41e74";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/te/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/te/Firefox%20142.0.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "685cc2e6c4bcd4af2badad0bfc9949138eee2b689ab33e77e0a7e49d8d71045a";
+      sha256 = "acc361fa1893a1470f0d6b688f0e3c1ec36384b7ee9e9b4c515a4f8fd01e3281";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/tg/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/tg/Firefox%20142.0.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "993516c8efb25aea0d0cf3754f27efb4b4ff18b1ddfba1c46c751f61f88839c3";
+      sha256 = "90f09a050429b35aac98e79999ff158b47c56fbb47f589a8dd6196d91621a543";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/th/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/th/Firefox%20142.0.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "78a3906a4830e8577c62fcbb45388a029f9883218fe4f6162e6b28f0408cdb50";
+      sha256 = "c1bfc1626cec042f55fb838a6f47cccaadd45a9410221938555a13fa4b946d35";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/tl/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/tl/Firefox%20142.0.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "248d25ff29d28a87092352fa49cd9c30db2908fd0675befda189deaa13d4b533";
+      sha256 = "d26e2244a1994023530f97e63678c79eb233a66b1d8f97f115e34aecf19566e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/tr/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/tr/Firefox%20142.0.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "70cd725698307aca4d4dbb7a6e02100166dfacd7669c5a300d35cecfcfa239c0";
+      sha256 = "9f08fcc8807bcaf68248cfd7c5eb1dfc91c8e94eedf159f80d063d08a6ed8cba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/trs/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/trs/Firefox%20142.0.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "ae8ba73465b2abc8d18d3c2e2daf68e2668cab1c1144d8d6a559014721afb9f4";
+      sha256 = "f1802cb5b7e61cfe68050b555cc01302c0821bda21398a6bd3862904030d5434";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/uk/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/uk/Firefox%20142.0.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "8781407f677a997e0a43a0dbcef48a21eb1e78b106e071426a68df4c9a74c2d2";
+      sha256 = "9fdbb3fd93d059ffde5e5306a1fc0b0f4e80e7b8b216d627cf69ad026cd8f3d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/ur/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/ur/Firefox%20142.0.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "18012bb20b9fa76394ffa9a7fd5bd9a4b26f8e977a254cde30d9c84d30ac5f74";
+      sha256 = "87c960a50f4faa5a2cc014ee0a606d81db02940e27e8bd5fbcc350c8307e95ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/uz/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/uz/Firefox%20142.0.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "5dedce611ba384512b289070794e92fa75be17766c5e313a0349144e67444cca";
+      sha256 = "eff4db1e7df4f9b01965d6426c4eaef00fce0590e9eddd2b2db051eb87070f3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/vi/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/vi/Firefox%20142.0.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "61770a27c25d3bef80c01f673341de713544b89fb182a0e7a7c7132bd6fbf44e";
+      sha256 = "0d6b49681350c606082d6e4048465052a19adb32820d3597639ef359a4179ccb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/xh/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/xh/Firefox%20142.0.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "75f0e9cc3a722680e91e254802204d5580683cb1b59c68f5b5afd7feb9bfef84";
+      sha256 = "246678a63fb7db4966f4d1102612b395b9e90a7d710e66258b82f2bff9217efe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/zh-CN/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/zh-CN/Firefox%20142.0.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "4ccfbb23b602a67f17a58d77dee5591549a5df95a6368b39fc5f6b087524f74f";
+      sha256 = "eb1d70e7a0bd4051de0ab075d9d92adaf5075e61a8643f76fb475eed3dab6cc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/141.0.3/mac/zh-TW/Firefox%20141.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/142.0/mac/zh-TW/Firefox%20142.0.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "71918ddaec0bd8fa651b8a6a8e5eb17e4b487c9d3e9ff1a5dbcbe9edb8186e1a";
+      sha256 = "667eab6bfd0de0bf2b77fa455547152b2fe21b4bb2b7c9ae91a98673b97b21f8";
     }
   ];
 }

From 9f458892534476a00d21c101f8c7e844c51eff29 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 00:46:53 +0200
Subject: [PATCH 2151/3724] firefox-esr-140-unwrapped: 140.1.0esr -> 140.2.0esr

https://www.firefox.com/en-US/firefox/140.2.0/releasenotes/
https://www.mozilla.org/en-US/security/advisories/mfsa2025-67/

Fixes: CVE-2025-9179, CVE-2025-9180, CVE-2025-9181, CVE-2025-9183
       CVE-2025-9184, CVE-2025-9185
---
 .../browsers/firefox/packages/firefox-esr-140.nix |  4 ++--
 .../build-mozilla-mach/139-relax-apple-sdk.patch  | 13 -------------
 pkgs/build-support/build-mozilla-mach/default.nix | 15 +++++++++------
 3 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/build-support/build-mozilla-mach/139-relax-apple-sdk.patch

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix
index 0364f6122a01..7cedf9d0f095 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix
@@ -9,11 +9,11 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "140.1.0esr";
+  version = "140.2.0esr";
   applicationName = "Firefox ESR";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "1b5caff9b381cd449c40d148542501f7a31a7151a3f2f888e789c9743af8ee1d1eddbd970f8c0054902d1e1d739221db0cfcf1dc6ab704bb83bbb7b7b6a20055";
+    sha512 = "e4597c4d83ae1a84fce9248fe6ca652af6c3615607fc8973bd917bfdbd2abbceca937fe4c629c0cdc89fa0a5c846b5e2d8a4b44dabf7feb201deb382de0ccc5b";
   };
 
   meta = {
diff --git a/pkgs/build-support/build-mozilla-mach/139-relax-apple-sdk.patch b/pkgs/build-support/build-mozilla-mach/139-relax-apple-sdk.patch
deleted file mode 100644
index 3c7e1271889a..000000000000
--- a/pkgs/build-support/build-mozilla-mach/139-relax-apple-sdk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
-index 769ac0379045..160734dd386d 100644
---- a/build/moz.configure/toolchain.configure
-+++ b/build/moz.configure/toolchain.configure
-@@ -233,7 +233,7 @@ with only_when(host_is_osx | target_is_osx):
-     )
- 
-     def mac_sdk_min_version():
--        return "15.4"
-+        return "15.2"
- 
-     @depends(
-         "--with-macos-sdk",
diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 43928cdccb2d..75e94c5ccfd8 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -316,12 +316,15 @@ buildStdenv.mkDerivation {
       # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9
       ./139-wayland-drag-animation.patch
     ]
-    ++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "141.0.2") [
-      ./139-relax-apple-sdk.patch
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "141.0.2") [
-      ./142-relax-apple-sdk.patch
-    ]
+    ++
+      lib.optionals
+        (
+          lib.versionAtLeast version "141.0.2"
+          || (lib.versionAtLeast version "140.2.0" && lib.versionOlder version "141.0")
+        )
+        [
+          ./142-relax-apple-sdk.patch
+        ]
     ++ lib.optionals (lib.versionOlder version "139") [
       # Fix for missing vector header on macOS
       # https://bugzilla.mozilla.org/show_bug.cgi?id=1959377

From 932fc0a72126ba6977689584d4b2bd33456f3de0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 13:43:07 +0000
Subject: [PATCH 2152/3724] qq: 3.2.18-2025-07-24 -> 3.2.19-2025-08-20

---
 pkgs/by-name/qq/qq/sources.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
index 63dfbf6ca5e6..91b907f615c0 100644
--- a/pkgs/by-name/qq/qq/sources.nix
+++ b/pkgs/by-name/qq/qq/sources.nix
@@ -1,12 +1,12 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-07-25
+# Last updated: 2025-08-20
 { fetchurl }:
 let
   any-darwin = {
-    version = "6.9.77-2025-07-24";
+    version = "6.9.79-2025-08-20";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.77_250724_01.dmg";
-      hash = "sha256-ZHpFH5PPDaVtbEZsb+1fyoscWuPYedTrIaoqhnsXRlc=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.79_250820_01.dmg";
+      hash = "sha256-m8COj+kn9ify4D4FUpNXL31uO4j4DKqCQhZnoo5umTE=";
     };
   };
 in
@@ -14,17 +14,17 @@ in
   aarch64-darwin = any-darwin;
   x86_64-darwin = any-darwin;
   aarch64-linux = {
-    version = "3.2.18-2025-07-24";
+    version = "3.2.19-2025-08-20";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250724_arm64_01.deb";
-      hash = "sha256-j+ouSBfryrRXQbyC4ZDyrKPLqJVw67tGjlHdKel5Br4=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250820_arm64_01.deb";
+      hash = "sha256-rHgN0T9lcoAucwR3B2U8so/dAUfB92dQYc0TncTHPaM=";
     };
   };
   x86_64-linux = {
-    version = "3.2.18-2025-07-24";
+    version = "3.2.19-2025-08-20";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.18_250724_amd64_01.deb";
-      hash = "sha256-HHFUXAv6oWsipBYECLNFJG8OMQ7fxjruA210w/oFFok=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250820_amd64_01.deb";
+      hash = "sha256-4Y0GSWwFkqYX5ezE2Jk/tZIwsBHg88ZxJghzB+kXTds=";
     };
   };
 }

From a53f8fed603b10d1475fa17ab959326bdefb625e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 13:43:19 +0000
Subject: [PATCH 2153/3724] dooit: 3.2.3 -> 3.3.3

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

diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix
index df0cfae3fc9d..56aa2a93281f 100644
--- a/pkgs/by-name/do/dooit/package.nix
+++ b/pkgs/by-name/do/dooit/package.nix
@@ -9,14 +9,14 @@
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "dooit";
-  version = "3.2.3";
+  version = "3.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dooit-org";
     repo = "dooit";
     tag = "v${version}";
-    hash = "sha256-bI9X+2tTLnQwxfsnBmy2vBI3lJ4UX418zOy3oniVKWc=";
+    hash = "sha256-MWdih+j7spUVEWXCBzF2J/FVXK0TQ8VhrJNDhNfxpQE=";
   };
 
   build-system = with python3.pkgs; [ poetry-core ];

From ce44e2e35afac13a779a5826685536200db3d58d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 13:54:42 +0000
Subject: [PATCH 2154/3724] wkg: 0.11.0 -> 0.12.0

---
 pkgs/by-name/wk/wkg/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wk/wkg/package.nix b/pkgs/by-name/wk/wkg/package.nix
index c86a691dc165..4ec0e91eb70a 100644
--- a/pkgs/by-name/wk/wkg/package.nix
+++ b/pkgs/by-name/wk/wkg/package.nix
@@ -8,15 +8,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wkg";
-  version = "0.11.0";
+  version = "0.12.0";
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasm-pkg-tools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-l8ArzujFirquSKMDkcoP8KukLFCRB7U8BejzMGUD59Y=";
+    hash = "sha256-9o0WvRSmld+VG27ysNGOklle250HdfBJQyob5nSb6vQ=";
   };
 
-  cargoHash = "sha256-ngVnF2eLZfa4ziliAaJOmu5YbnetEovH66kWXp2w1gY=";
+  cargoHash = "sha256-f+P/kxnxinWAfsk6fz6fsVeZcf7t4qUh8XP1Tev89LM=";
 
   # A large number of tests require Internet access in order to function.
   doCheck = false;

From 62602e66b7e090d4d74d1a46b759af9518edc670 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Wed, 20 Aug 2025 15:05:21 +0100
Subject: [PATCH 2155/3724] nexusmods-app: fix changelog URL

This was broken when switching from `fetchFromGitHub` to `fetchgit` in
cd8b3d654d3f1ee45fa5011c88c12cd8617fe328
---
 pkgs/by-name/ne/nexusmods-app/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index d30526f049f7..a392e1283e2e 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -194,7 +194,7 @@ buildDotnetModule (finalAttrs: {
   meta = {
     mainProgram = "NexusMods.App";
     homepage = "https://github.com/Nexus-Mods/NexusMods.App";
-    changelog = "https://github.com/Nexus-Mods/NexusMods.App/releases/tag/${finalAttrs.src.rev}";
+    changelog = "https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v${finalAttrs.version}";
     license = [ lib.licenses.gpl3Plus ];
     maintainers = with lib.maintainers; [
       l0b0

From 0f6de01c9b0b0f8342b5cb06eb6dab6e0fc8482f Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 14 Aug 2025 12:40:55 +0100
Subject: [PATCH 2156/3724] =?UTF-8?q?nexusmods-app:=200.14.3=20=E2=86=92?=
 =?UTF-8?q?=200.15.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.15.2

We now need to patch or remove dynamic build dependencies, including
`games.json` and `game_hashes_db.zip`.
---
 pkgs/by-name/ne/nexusmods-app/deps.json       |  5 ---
 pkgs/by-name/ne/nexusmods-app/package.nix     | 22 +++++++---
 .../patches/no-game-hashes-db.patch           | 41 ++++++++++++++++++
 .../nexusmods-app/patches/no-games-json.patch | 42 +++++++++++++++++++
 4 files changed, 100 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/by-name/ne/nexusmods-app/patches/no-game-hashes-db.patch
 create mode 100644 pkgs/by-name/ne/nexusmods-app/patches/no-games-json.patch

diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json
index 5f67beee978b..bce748ce6510 100644
--- a/pkgs/by-name/ne/nexusmods-app/deps.json
+++ b/pkgs/by-name/ne/nexusmods-app/deps.json
@@ -909,11 +909,6 @@
     "version": "7.0.0",
     "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="
   },
-  {
-    "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "8.0.0",
-    "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
-  },
   {
     "pname": "Microsoft.Build.Tasks.Git",
     "version": "8.0.0",
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index a392e1283e2e..78844433d9d4 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -9,6 +9,7 @@
   lib,
   xdg-utils,
   nix-update-script,
+  dos2unix,
   pname ? "nexusmods-app",
 }:
 let
@@ -23,12 +24,12 @@ let
 in
 buildDotnetModule (finalAttrs: {
   inherit pname;
-  version = "0.14.3";
+  version = "0.15.2";
 
   src = fetchgit {
     url = "https://github.com/Nexus-Mods/NexusMods.App.git";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-B2gIRVeaTwYEnESMovwEJgdmLwRNA7/nJs7opNhiyyA=";
+    hash = "sha256-WI6ulYDPOBGGt3snimCHswuIaII1aWNT/TZqvJxrQRQ=";
     fetchSubmodules = true;
   };
 
@@ -50,6 +51,7 @@ buildDotnetModule (finalAttrs: {
   nativeCheckInputs = [ _7zz ];
 
   nativeBuildInputs = [
+    dos2unix # for patching
     imagemagick # For resizing SVG icon in postInstall
   ];
 
@@ -59,13 +61,22 @@ buildDotnetModule (finalAttrs: {
   dotnet-sdk = dotnetCorePackages.sdk_9_0;
   dotnet-runtime = dotnetCorePackages.runtime_9_0;
 
+  patches = [
+    ./patches/no-game-hashes-db.patch
+    ./patches/no-games-json.patch
+  ];
+
+  prePatch = ''
+    dos2unix src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj
+    dos2unix src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj
+  '';
+
   postPatch = ''
     # for some reason these tests fail (intermittently?) with a zero timestamp
     touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png
 
-    # Assertion assumes version is set to 0.0.1
-    substituteInPlace tests/NexusMods.Telemetry.Tests/TrackingDataSenderTests.cs \
-      --replace-fail 'cra_ct=v0.0.1' 'cra_ct=v${finalAttrs.version}'
+    unix2dos src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj
+    unix2dos src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj
   '';
 
   makeWrapperArgs = [
@@ -127,6 +138,7 @@ buildDotnetModule (finalAttrs: {
 
   dotnetTestFlags = [
     "--environment=USER=nobody"
+    "--property:Version=${finalAttrs.version}"
     "--property:DefineConstants=${lib.strings.concatStringsSep "%3B" constants}"
   ];
 
diff --git a/pkgs/by-name/ne/nexusmods-app/patches/no-game-hashes-db.patch b/pkgs/by-name/ne/nexusmods-app/patches/no-game-hashes-db.patch
new file mode 100644
index 000000000000..5d06c783229b
--- /dev/null
+++ b/pkgs/by-name/ne/nexusmods-app/patches/no-game-hashes-db.patch
@@ -0,0 +1,41 @@
+From faf5a90109574a10bc857896fc57269ccf1b5f49 Mon Sep 17 00:00:00 2001
+From: Matt Sturgeon <matt@sturgeon.me.uk>
+Date: Fri, 15 Aug 2025 16:02:31 +0100
+Subject: [PATCH] Remove game_hashes_db build dependency
+
+---
+ .../NexusMods.Games.FileHashes.csproj         | 20 -------------------
+ 1 file changed, 20 deletions(-)
+
+diff --git a/src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj b/src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj
+index 033a46626..abd9e0a42 100644
+--- a/src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj
++++ b/src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj
+@@ -19,24 +19,4 @@
+       <ProjectReference Include="..\NexusMods.Networking.EpicGameStore\NexusMods.Networking.EpicGameStore.csproj" />
+     </ItemGroup>
+ 
+-    <PropertyGroup>
+-        <HashesDatabaseInput>https://github.com/Nexus-Mods/game-hashes/releases/latest/download/game_hashes_db.zip</HashesDatabaseInput>
+-        <HashesDatabaseOutput>$(BaseIntermediateOutputPath)games_hashes_db.zip</HashesDatabaseOutput>
+-    </PropertyGroup>
+-
+-    <!-- NOTE(erri120): Downloading the games hashes database at build time if it doesn't exist -->
+-    <Target Name="DownloadHashesDatabase" BeforeTargets="BeforeBuild" Condition="!Exists('$(HashesDatabaseOutput)')">
+-        <MakeDir Directories="$(BaseIntermediateOutputPath)" />
+-        <Exec Condition="'$(OS)' != 'Windows_NT'" Command="curl -sSL -o $(HashesDatabaseOutput) $(HashesDatabaseInput)"  />
+-        <Exec Condition="'$(OS)' == 'Windows_NT'" Command="powershell -NoProfile -ExecutionPolicy Bypass -Command &quot;Invoke-WebRequest -Uri '$(HashesDatabaseInput)' -OutFile '$(HashesDatabaseOutput)'&quot;" />
+-    </Target>
+-
+-    <Target Name="EmbedOutput" AfterTargets="DownloadHashesDatabase">
+-        <Error Condition="!Exists('$(HashesDatabaseOutput)')" Text="Failed to embed file $(HashesDatabaseOutput)" />
+-
+-        <ItemGroup>
+-            <EmbeddedResource Include="$(HashesDatabaseOutput)" LogicalName="games_hashes_db.zip" />
+-        </ItemGroup>
+-    </Target>
+-
+ </Project>
+-- 
+2.50.1
+
diff --git a/pkgs/by-name/ne/nexusmods-app/patches/no-games-json.patch b/pkgs/by-name/ne/nexusmods-app/patches/no-games-json.patch
new file mode 100644
index 000000000000..e3588a2a799b
--- /dev/null
+++ b/pkgs/by-name/ne/nexusmods-app/patches/no-games-json.patch
@@ -0,0 +1,42 @@
+From 019b2c78b4d768cd9c383943c1b3a29c6d8e4709 Mon Sep 17 00:00:00 2001
+From: Matt Sturgeon <matt@sturgeon.me.uk>
+Date: Thu, 14 Aug 2025 13:09:57 +0100
+Subject: [PATCH] Remove games.json build dependency
+
+---
+ .../NexusMods.Networking.NexusWebApi.csproj   | 20 -------------------
+ 1 file changed, 20 deletions(-)
+
+diff --git a/src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj b/src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj
+index 6f0369589..19a07fbea 100644
+--- a/src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj
++++ b/src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj
+@@ -24,26 +24,6 @@
+         <ProjectReference Include="..\NexusMods.Networking.ModUpdates\NexusMods.Networking.ModUpdates.csproj" />
+     </ItemGroup>
+ 
+-    <PropertyGroup>
+-        <GamesJsonInput>https://data.nexusmods.com/file/nexus-data/games.json</GamesJsonInput>
+-        <GamesJsonOutput>$(BaseIntermediateOutputPath)games.json</GamesJsonOutput>
+-    </PropertyGroup>
+-
+-    <!-- NOTE(erri120): Downloading the games.json file at build time if it doesn't exist -->
+-    <Target Name="DownloadGamesJson" BeforeTargets="BeforeBuild" Condition="!Exists('$(GamesJsonOutput)')">
+-        <MakeDir Directories="$(BaseIntermediateOutputPath)" />
+-        <Exec Condition="'$(OS)' != 'Windows_NT'" Command="curl -sSL -o $(GamesJsonOutput) $(GamesJsonInput)"  />
+-        <Exec Condition="'$(OS)' == 'Windows_NT'" Command="powershell -NoProfile -ExecutionPolicy Bypass -Command &quot;Invoke-WebRequest -Uri '$(GamesJsonInput)' -OutFile '$(GamesJsonOutput)'&quot;" />
+-    </Target>
+-
+-    <Target Name="EmbedOutput" AfterTargets="DownloadGamesJson">
+-        <Error Condition="!Exists('$(GamesJsonOutput)')" Text="Failed to embed file $(GamesJsonOutput)" />
+-
+-        <ItemGroup>
+-            <EmbeddedResource Include="$(GamesJsonOutput)" LogicalName="games.json" />
+-        </ItemGroup>
+-    </Target>
+-
+     <ItemGroup>
+       <Compile Update="V1Interop\GameMetadata.cs">
+         <DependentUpon>LocalMappingCache.cs</DependentUpon>
+-- 
+2.50.1

From a5e5bad4cfa8bd312df1478eb7904248ec6460e4 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 15 Aug 2025 21:02:32 +0100
Subject: [PATCH 2157/3724] nexusmods-app: use a fixed build date

Improve build reproducibility by specifying a fixed build date
(the unix epoch).
---
 pkgs/by-name/ne/nexusmods-app/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 78844433d9d4..be18d5713f93 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -75,6 +75,11 @@ buildDotnetModule (finalAttrs: {
     # for some reason these tests fail (intermittently?) with a zero timestamp
     touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png
 
+    # Specify a fixed date to improve build reproducibility
+    echo "1970-01-01T00:00:00Z" >buildDate.txt
+    substituteInPlace src/NexusMods.Sdk/NexusMods.Sdk.csproj \
+      --replace-fail '$(BaseIntermediateOutputPath)buildDate.txt' "$(realpath buildDate.txt)"
+
     unix2dos src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj
     unix2dos src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj
   '';

From 3dd829f3f4877517a3aebb6be6be3283956e0b02 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 1 Aug 2025 01:46:54 +0100
Subject: [PATCH 2158/3724] nexusmods-app: pin game hashes db

---
 .../ne/nexusmods-app/game-hashes/default.nix  | 21 ++++++++++
 pkgs/by-name/ne/nexusmods-app/package.nix     | 17 ++++----
 .../patches/no-game-hashes-db.patch           | 41 -------------------
 3 files changed, 28 insertions(+), 51 deletions(-)
 create mode 100644 pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix
 delete mode 100644 pkgs/by-name/ne/nexusmods-app/patches/no-game-hashes-db.patch

diff --git a/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix b/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix
new file mode 100644
index 000000000000..66de2411f459
--- /dev/null
+++ b/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix
@@ -0,0 +1,21 @@
+{ fetchurl }:
+let
+  release = "ved4b249e2c35952c";
+  owner = "Nexus-Mods";
+  repo = "game-hashes";
+  repoURL = "https://github.com/${owner}/${repo}";
+
+  src = fetchurl {
+    url = "${repoURL}/releases/download/${release}/game_hashes_db.zip";
+    hash = "sha256-9xJ8yfLRkIV0o++NHK2igd2l83/tsgWc5cuwZO2zseY=";
+    passthru = {
+      inherit
+        release
+        owner
+        repo
+        repoURL
+        ;
+    };
+  };
+in
+src
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index be18d5713f93..9f8587cee121 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -2,6 +2,7 @@
   _7zz,
   avalonia,
   buildDotnetModule,
+  callPackage,
   desktop-file-utils,
   dotnetCorePackages,
   fetchgit,
@@ -33,6 +34,8 @@ buildDotnetModule (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  gameHashes = callPackage ./game-hashes { };
+
   enableParallelBuilding = false;
 
   # If the whole solution is published, there seems to be a race condition where
@@ -62,12 +65,10 @@ buildDotnetModule (finalAttrs: {
   dotnet-runtime = dotnetCorePackages.runtime_9_0;
 
   patches = [
-    ./patches/no-game-hashes-db.patch
     ./patches/no-games-json.patch
   ];
 
   prePatch = ''
-    dos2unix src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj
     dos2unix src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj
   '';
 
@@ -80,7 +81,10 @@ buildDotnetModule (finalAttrs: {
     substituteInPlace src/NexusMods.Sdk/NexusMods.Sdk.csproj \
       --replace-fail '$(BaseIntermediateOutputPath)buildDate.txt' "$(realpath buildDate.txt)"
 
-    unix2dos src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj
+    # Use a pinned version of the game hashes db
+    substituteInPlace src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj \
+      --replace-fail '$(BaseIntermediateOutputPath)games_hashes_db.zip' "$gameHashes"
+
     unix2dos src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj
   '';
 
@@ -154,13 +158,6 @@ buildDotnetModule (finalAttrs: {
   ];
 
   disabledTests = [
-    # Fails attempting to download game hashes DB from github:
-    # HttpRequestException : Resource temporarily unavailable (github.com:443)
-    "NexusMods.DataModel.SchemaVersions.Tests.LegacyDatabaseSupportTests.TestDatabase"
-    "NexusMods.DataModel.SchemaVersions.Tests.MigrationSpecificTests.TestsFor_0001_ConvertTimestamps.OldTimestampsAreInRange"
-    "NexusMods.DataModel.SchemaVersions.Tests.MigrationSpecificTests.TestsFor_0003_FixDuplicates.No_Duplicates"
-    "NexusMods.DataModel.SchemaVersions.Tests.MigrationSpecificTests.TestsFor_0004_RemoveGameFiles.Test"
-
     # Fails attempting to fetch SMAPI version data from github:
     # https://github.com/erri120/smapi-versions/raw/main/data/game-smapi-versions.json
     "NexusMods.Games.StardewValley.Tests.SMAPIGameVersionDiagnosticEmitterTests.Test_TryGetLastSupportedSMAPIVersion"
diff --git a/pkgs/by-name/ne/nexusmods-app/patches/no-game-hashes-db.patch b/pkgs/by-name/ne/nexusmods-app/patches/no-game-hashes-db.patch
deleted file mode 100644
index 5d06c783229b..000000000000
--- a/pkgs/by-name/ne/nexusmods-app/patches/no-game-hashes-db.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From faf5a90109574a10bc857896fc57269ccf1b5f49 Mon Sep 17 00:00:00 2001
-From: Matt Sturgeon <matt@sturgeon.me.uk>
-Date: Fri, 15 Aug 2025 16:02:31 +0100
-Subject: [PATCH] Remove game_hashes_db build dependency
-
----
- .../NexusMods.Games.FileHashes.csproj         | 20 -------------------
- 1 file changed, 20 deletions(-)
-
-diff --git a/src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj b/src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj
-index 033a46626..abd9e0a42 100644
---- a/src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj
-+++ b/src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj
-@@ -19,24 +19,4 @@
-       <ProjectReference Include="..\NexusMods.Networking.EpicGameStore\NexusMods.Networking.EpicGameStore.csproj" />
-     </ItemGroup>
- 
--    <PropertyGroup>
--        <HashesDatabaseInput>https://github.com/Nexus-Mods/game-hashes/releases/latest/download/game_hashes_db.zip</HashesDatabaseInput>
--        <HashesDatabaseOutput>$(BaseIntermediateOutputPath)games_hashes_db.zip</HashesDatabaseOutput>
--    </PropertyGroup>
--
--    <!-- NOTE(erri120): Downloading the games hashes database at build time if it doesn't exist -->
--    <Target Name="DownloadHashesDatabase" BeforeTargets="BeforeBuild" Condition="!Exists('$(HashesDatabaseOutput)')">
--        <MakeDir Directories="$(BaseIntermediateOutputPath)" />
--        <Exec Condition="'$(OS)' != 'Windows_NT'" Command="curl -sSL -o $(HashesDatabaseOutput) $(HashesDatabaseInput)"  />
--        <Exec Condition="'$(OS)' == 'Windows_NT'" Command="powershell -NoProfile -ExecutionPolicy Bypass -Command &quot;Invoke-WebRequest -Uri '$(HashesDatabaseInput)' -OutFile '$(HashesDatabaseOutput)'&quot;" />
--    </Target>
--
--    <Target Name="EmbedOutput" AfterTargets="DownloadHashesDatabase">
--        <Error Condition="!Exists('$(HashesDatabaseOutput)')" Text="Failed to embed file $(HashesDatabaseOutput)" />
--
--        <ItemGroup>
--            <EmbeddedResource Include="$(HashesDatabaseOutput)" LogicalName="games_hashes_db.zip" />
--        </ItemGroup>
--    </Target>
--
- </Project>
--- 
-2.50.1
-

From 9f7f36ff4e5659f4301c5241244c15c9d612de71 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 15 Aug 2025 16:06:31 +0100
Subject: [PATCH 2159/3724] nexusmods-app: vendor games.json

Subset of https://data.nexusmods.com/file/nexus-data/games.json
---
 pkgs/by-name/ne/nexusmods-app/package.nix     | 17 +-----
 .../nexusmods-app/patches/no-games-json.patch | 42 --------------
 .../ne/nexusmods-app/vendored/README.md       | 15 +++++
 .../ne/nexusmods-app/vendored/games.json      | 58 +++++++++++++++++++
 4 files changed, 76 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/by-name/ne/nexusmods-app/patches/no-games-json.patch
 create mode 100644 pkgs/by-name/ne/nexusmods-app/vendored/README.md
 create mode 100644 pkgs/by-name/ne/nexusmods-app/vendored/games.json

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 9f8587cee121..e251dfe9e0e1 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -10,7 +10,6 @@
   lib,
   xdg-utils,
   nix-update-script,
-  dos2unix,
   pname ? "nexusmods-app",
 }:
 let
@@ -54,7 +53,6 @@ buildDotnetModule (finalAttrs: {
   nativeCheckInputs = [ _7zz ];
 
   nativeBuildInputs = [
-    dos2unix # for patching
     imagemagick # For resizing SVG icon in postInstall
   ];
 
@@ -64,14 +62,6 @@ buildDotnetModule (finalAttrs: {
   dotnet-sdk = dotnetCorePackages.sdk_9_0;
   dotnet-runtime = dotnetCorePackages.runtime_9_0;
 
-  patches = [
-    ./patches/no-games-json.patch
-  ];
-
-  prePatch = ''
-    dos2unix src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj
-  '';
-
   postPatch = ''
     # for some reason these tests fail (intermittently?) with a zero timestamp
     touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png
@@ -85,7 +75,9 @@ buildDotnetModule (finalAttrs: {
     substituteInPlace src/NexusMods.Games.FileHashes/NexusMods.Games.FileHashes.csproj \
       --replace-fail '$(BaseIntermediateOutputPath)games_hashes_db.zip' "$gameHashes"
 
-    unix2dos src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj
+    # Use a vendored version of the nexus API's games.json data
+    substituteInPlace src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj \
+      --replace-fail '$(BaseIntermediateOutputPath)games.json' ${./vendored/games.json}
   '';
 
   makeWrapperArgs = [
@@ -161,9 +153,6 @@ buildDotnetModule (finalAttrs: {
     # Fails attempting to fetch SMAPI version data from github:
     # https://github.com/erri120/smapi-versions/raw/main/data/game-smapi-versions.json
     "NexusMods.Games.StardewValley.Tests.SMAPIGameVersionDiagnosticEmitterTests.Test_TryGetLastSupportedSMAPIVersion"
-
-    # Fails attempting to fetch game info from NexusMods API
-    "NexusMods.Networking.NexusWebApi.Tests.LocalMappingCacheTests.Test_Parse"
   ]
   ++ lib.optionals (!_7zz.meta.unfree) [
     "NexusMods.Games.FOMOD.Tests.FomodXmlInstallerTests.InstallsFilesSimple_UsingRar"
diff --git a/pkgs/by-name/ne/nexusmods-app/patches/no-games-json.patch b/pkgs/by-name/ne/nexusmods-app/patches/no-games-json.patch
deleted file mode 100644
index e3588a2a799b..000000000000
--- a/pkgs/by-name/ne/nexusmods-app/patches/no-games-json.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 019b2c78b4d768cd9c383943c1b3a29c6d8e4709 Mon Sep 17 00:00:00 2001
-From: Matt Sturgeon <matt@sturgeon.me.uk>
-Date: Thu, 14 Aug 2025 13:09:57 +0100
-Subject: [PATCH] Remove games.json build dependency
-
----
- .../NexusMods.Networking.NexusWebApi.csproj   | 20 -------------------
- 1 file changed, 20 deletions(-)
-
-diff --git a/src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj b/src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj
-index 6f0369589..19a07fbea 100644
---- a/src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj
-+++ b/src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj
-@@ -24,26 +24,6 @@
-         <ProjectReference Include="..\NexusMods.Networking.ModUpdates\NexusMods.Networking.ModUpdates.csproj" />
-     </ItemGroup>
- 
--    <PropertyGroup>
--        <GamesJsonInput>https://data.nexusmods.com/file/nexus-data/games.json</GamesJsonInput>
--        <GamesJsonOutput>$(BaseIntermediateOutputPath)games.json</GamesJsonOutput>
--    </PropertyGroup>
--
--    <!-- NOTE(erri120): Downloading the games.json file at build time if it doesn't exist -->
--    <Target Name="DownloadGamesJson" BeforeTargets="BeforeBuild" Condition="!Exists('$(GamesJsonOutput)')">
--        <MakeDir Directories="$(BaseIntermediateOutputPath)" />
--        <Exec Condition="'$(OS)' != 'Windows_NT'" Command="curl -sSL -o $(GamesJsonOutput) $(GamesJsonInput)"  />
--        <Exec Condition="'$(OS)' == 'Windows_NT'" Command="powershell -NoProfile -ExecutionPolicy Bypass -Command &quot;Invoke-WebRequest -Uri '$(GamesJsonInput)' -OutFile '$(GamesJsonOutput)'&quot;" />
--    </Target>
--
--    <Target Name="EmbedOutput" AfterTargets="DownloadGamesJson">
--        <Error Condition="!Exists('$(GamesJsonOutput)')" Text="Failed to embed file $(GamesJsonOutput)" />
--
--        <ItemGroup>
--            <EmbeddedResource Include="$(GamesJsonOutput)" LogicalName="games.json" />
--        </ItemGroup>
--    </Target>
--
-     <ItemGroup>
-       <Compile Update="V1Interop\GameMetadata.cs">
-         <DependentUpon>LocalMappingCache.cs</DependentUpon>
--- 
-2.50.1
diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/README.md b/pkgs/by-name/ne/nexusmods-app/vendored/README.md
new file mode 100644
index 000000000000..edebba8a0bc0
--- /dev/null
+++ b/pkgs/by-name/ne/nexusmods-app/vendored/README.md
@@ -0,0 +1,15 @@
+This directory contains a vendored copy of `games.json`, along with tooling to generate it.
+
+## Purpose
+
+The games data is fetched at runtime by NexusMods.App, however it is also included at build time for two reasons:
+
+1. It allows tests to run against real data.
+2. It is used as cached data, speeding up the app's initial run.
+
+It is not vital for the file to contain all games, however ideally it should contain all games _supported_ by this version of NexusMods.App.
+That way the initial run's cached data is more useful.
+
+If this file grows too large, because we are including too many games, we can patch the `csproj` build spec so that `games.json` is not used at build time.
+We would also need to patch or disable any tests that rely on it.
+
diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/games.json b/pkgs/by-name/ne/nexusmods-app/vendored/games.json
new file mode 100644
index 000000000000..5735ba412cab
--- /dev/null
+++ b/pkgs/by-name/ne/nexusmods-app/vendored/games.json
@@ -0,0 +1,58 @@
+[
+  {
+    "id": 1303,
+    "name": "Stardew Valley",
+    "name_lower": "stardew valley",
+    "forum_url": "https://forums.nexusmods.com/games/19-stardew-valley/",
+    "nexusmods_url": "https://www.nexusmods.com/stardewvalley",
+    "genre": "Simulation",
+    "file_count": 137612,
+    "downloads": 592183501,
+    "domain_name": "stardewvalley",
+    "approved_date": 1457432329,
+    "mods": 24655,
+    "collections": 3570
+  },
+  {
+    "id": 3174,
+    "name": "Mount & Blade II: Bannerlord",
+    "name_lower": "mount & blade ii: bannerlord",
+    "forum_url": "https://forums.nexusmods.com/games/9-mount-blade-ii-bannerlord/",
+    "nexusmods_url": "https://www.nexusmods.com/mountandblade2bannerlord",
+    "genre": "Strategy",
+    "file_count": 49182,
+    "downloads": 111421397,
+    "domain_name": "mountandblade2bannerlord",
+    "approved_date": 1582898627,
+    "mods": 6136,
+    "collections": 321
+  },
+  {
+    "id": 3333,
+    "name": "Cyberpunk 2077",
+    "name_lower": "cyberpunk 2077",
+    "forum_url": "https://forums.nexusmods.com/games/1-cyberpunk-2077/",
+    "nexusmods_url": "https://www.nexusmods.com/cyberpunk2077",
+    "genre": "Action",
+    "file_count": 118327,
+    "downloads": 825382927,
+    "domain_name": "cyberpunk2077",
+    "approved_date": 1607433331,
+    "mods": 16707,
+    "collections": 1910
+  },
+  {
+    "id": 3474,
+    "name": "Baldur's Gate 3",
+    "name_lower": "baldur's gate 3",
+    "forum_url": "https://forums.nexusmods.com/games/2-baldurs-gate-3/",
+    "nexusmods_url": "https://www.nexusmods.com/baldursgate3",
+    "genre": "RPG",
+    "file_count": 100954,
+    "downloads": 325304689,
+    "domain_name": "baldursgate3",
+    "approved_date": 1602863114,
+    "mods": 14186,
+    "collections": 3703
+  }
+]

From f4ae5d49c7e259e3e75501455884c0d580a567a1 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 15 Aug 2025 16:07:26 +0100
Subject: [PATCH 2160/3724] nexusmods-app: init update script for vendored
 files

Currently, the only vendored file is games.json
---
 .../ne/nexusmods-app/vendored/README.md       | 16 ++++++
 .../ne/nexusmods-app/vendored/game-ids.nix    | 11 ++++
 .../ne/nexusmods-app/vendored/update.sh       | 53 +++++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 pkgs/by-name/ne/nexusmods-app/vendored/game-ids.nix
 create mode 100755 pkgs/by-name/ne/nexusmods-app/vendored/update.sh

diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/README.md b/pkgs/by-name/ne/nexusmods-app/vendored/README.md
index edebba8a0bc0..f92cbf87e634 100644
--- a/pkgs/by-name/ne/nexusmods-app/vendored/README.md
+++ b/pkgs/by-name/ne/nexusmods-app/vendored/README.md
@@ -13,3 +13,19 @@ That way the initial run's cached data is more useful.
 If this file grows too large, because we are including too many games, we can patch the `csproj` build spec so that `games.json` is not used at build time.
 We would also need to patch or disable any tests that rely on it.
 
+## Generating
+
+`games.json` is generated automatically by `update.sh`, using data from [nexusmods' API][url] and the games listed in `game-ids.nix`.
+
+To add a new game to `games.json`:
+- Inspect the [nexusmods endpoint][url] to find the game's name and ID
+- Add the name and ID to `game-ids.nix`
+- Run `update.sh`
+- Commit the result
+
+> [!Note]
+> Running `update.sh` may also update the existing games, so you may wish to create two separate commits using `git add --patch`.
+> One for updating the existing data and another for adding the new game.
+
+[url]: https://data.nexusmods.com/file/nexus-data/games.json
+
diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/game-ids.nix b/pkgs/by-name/ne/nexusmods-app/vendored/game-ids.nix
new file mode 100644
index 000000000000..5a1488b96047
--- /dev/null
+++ b/pkgs/by-name/ne/nexusmods-app/vendored/game-ids.nix
@@ -0,0 +1,11 @@
+# This file lists games to be included in the vendored games.json file.
+# It is not critical to include all games, other than those referenced by the test suite.
+# Ideally, all games supported by the app will be included, as this can improve first-run performance.
+{
+  # keep-sorted start case=no numeric=yes
+  "Baldur's Gate 3" = 3474;
+  "Cyberpunk 2077" = 3333;
+  "Mount & Blade II: Bannerlord" = 3174;
+  "Stardew Valley" = 1303;
+  # keep-sorted end
+}
diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/update.sh b/pkgs/by-name/ne/nexusmods-app/vendored/update.sh
new file mode 100755
index 000000000000..ac44e25fae48
--- /dev/null
+++ b/pkgs/by-name/ne/nexusmods-app/vendored/update.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p bash curl jq
+
+set -eu -o pipefail
+
+url='https://data.nexusmods.com/file/nexus-data/games.json'
+self=$(realpath "$0")
+dir=$(dirname "$self")
+tmp=$(mktemp)
+
+cd "$dir"/../../../../../
+
+ids=$(
+  nix-instantiate --eval --json \
+    --argstr file "$dir"/game-ids.nix \
+    --expr '{file}: builtins.attrValues (import file)'
+)
+
+echo "Fetching games data" >&2
+curl "$url" \
+  --silent \
+  --show-error \
+  --location |
+  jq --argjson ids "$ids" \
+    'map(select( .id | IN($ids[]) )) | sort_by(.id)' \
+    >"$tmp"
+
+echo "Validating result" >&2
+nix-instantiate --eval --strict \
+  --argstr idsNix "$dir"/game-ids.nix \
+  --argstr gamesJson "$tmp" \
+  --expr '
+    {
+      idsNix,
+      gamesJson,
+      lib ? import <nixpkgs/lib>,
+    }:
+    let
+      ids = import idsNix;
+      games = lib.importJSON gamesJson;
+    in
+    lib.forEach games (
+      { id, name, ... }:
+      lib.throwIfNot
+        (id == ids.${name})
+        "${name}: id ${toString id} does not match ${toString ids.${name}}"
+        null
+    )
+  ' \
+  >/dev/null
+
+echo "Installing games.json to $dir" >&2
+mv --force "$tmp" "$dir"/games.json

From ee180d457a969287dcc55729833a344b7d014383 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 15 Aug 2025 20:19:12 +0100
Subject: [PATCH 2161/3724] nexusmods-app: init update script for
 game_hashes_db

---
 .../ne/nexusmods-app/game-hashes/default.nix  |  2 +
 .../ne/nexusmods-app/game-hashes/update.sh    | 56 +++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100755 pkgs/by-name/ne/nexusmods-app/game-hashes/update.sh

diff --git a/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix b/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix
index 66de2411f459..6d1cf342d0c1 100644
--- a/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix
+++ b/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix
@@ -5,11 +5,13 @@ let
   repo = "game-hashes";
   repoURL = "https://github.com/${owner}/${repo}";
 
+  # Define a binding so that `update-source-version` can find it
   src = fetchurl {
     url = "${repoURL}/releases/download/${release}/game_hashes_db.zip";
     hash = "sha256-9xJ8yfLRkIV0o++NHK2igd2l83/tsgWc5cuwZO2zseY=";
     passthru = {
       inherit
+        src # Also for `update-source-version` support
         release
         owner
         repo
diff --git a/pkgs/by-name/ne/nexusmods-app/game-hashes/update.sh b/pkgs/by-name/ne/nexusmods-app/game-hashes/update.sh
new file mode 100755
index 000000000000..70b3a8456b35
--- /dev/null
+++ b/pkgs/by-name/ne/nexusmods-app/game-hashes/update.sh
@@ -0,0 +1,56 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p bash common-updater-scripts gh
+
+set -eu -o pipefail
+
+# Set a default attrpath to allow running this update script directly
+export UPDATE_NIX_ATTR_PATH="${UPDATE_NIX_ATTR_PATH:-"nexusmods-app.gameHashes"}"
+
+self=$(realpath "$0")
+dir=$(dirname "$self")
+cd "$dir"/../../../../../
+
+old_release=$(
+  nix-instantiate --eval --raw \
+    --attr "$UPDATE_NIX_ATTR_PATH.release"
+)
+
+echo "Looking up latest game_hashes_db" >&2
+new_release=$(
+  gh --repo Nexus-Mods/game-hashes \
+    release list \
+    --limit 1 \
+    --exclude-drafts \
+    --exclude-pre-releases \
+    --json tagName \
+    --jq .[].tagName
+)
+
+echo "Latest release is $new_release" >&2
+
+if [ "$old_release" = "$new_release" ]; then
+  echo "Already up to date"
+  exit
+fi
+
+old_release_escaped=$(echo "$old_release" | sed 's#[$^*\\.[|]#\\&#g')
+new_release_escaped=$(echo "$new_release" | sed 's#[$^*\\.[|]#\\&#g')
+url=$(
+  nix-instantiate --eval --raw --attr "$UPDATE_NIX_ATTR_PATH.url" |
+    sed "s|$old_release_escaped|$new_release_escaped|"
+)
+
+echo "Downloading and hashing game_hashes_db" >&2
+hash=$(
+  nix --extra-experimental-features nix-command \
+    hash convert --hash-algo sha256 --to sri \
+    "$(nix-prefetch-url "$url" --type sha256)"
+)
+
+echo "Updating source" >&2
+update-source-version \
+  "$UPDATE_NIX_ATTR_PATH" \
+  "$new_release" \
+  "$hash" \
+  --version-key=release \
+  --file="$dir"/default.nix

From ba60a124f4adbf527b61a6171c6850b488f6ea0c Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 14 Aug 2025 12:36:49 +0100
Subject: [PATCH 2162/3724] nexusmods-app: wrap the update scripts

---
 pkgs/by-name/ne/nexusmods-app/package.nix |  3 +--
 pkgs/by-name/ne/nexusmods-app/update.sh   | 24 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100755 pkgs/by-name/ne/nexusmods-app/update.sh

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index e251dfe9e0e1..fe535fac7774 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -9,7 +9,6 @@
   imagemagick,
   lib,
   xdg-utils,
-  nix-update-script,
   pname ? "nexusmods-app",
 }:
 let
@@ -192,7 +191,7 @@ buildDotnetModule (finalAttrs: {
     };
   };
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = ./update.sh;
 
   meta = {
     mainProgram = "NexusMods.App";
diff --git a/pkgs/by-name/ne/nexusmods-app/update.sh b/pkgs/by-name/ne/nexusmods-app/update.sh
new file mode 100755
index 000000000000..8f9e74304345
--- /dev/null
+++ b/pkgs/by-name/ne/nexusmods-app/update.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p bash nix-update
+
+set -eu -o pipefail
+
+# Set a default attrpath to allow running this update script directly
+export UPDATE_NIX_ATTR_PATH="${UPDATE_NIX_ATTR_PATH:-"nexusmods-app"}"
+
+self=$(realpath "$0")
+dir=$(dirname "$self")
+cd "$dir"/../../../../
+
+# Update vendored files
+"$dir"/vendored/update.sh
+
+# Update game_hashes_db
+UPDATE_NIX_ATTR_PATH="$UPDATE_NIX_ATTR_PATH.gameHashes" \
+  "$dir"/game-hashes/update.sh
+
+url=$(
+  nix-instantiate --eval --raw \
+    --attr "$UPDATE_NIX_ATTR_PATH.meta.homepage"
+)
+nix-update --url "$url"

From 526a6fed057c619f2e585e9706ac8956f07eda7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Lagerstr=C3=B6m?= <edika32@gmail.com>
Date: Wed, 20 Aug 2025 16:11:12 +0200
Subject: [PATCH 2163/3724] odafileconverter: 25.12.0.0 -> 26.7.0.0

---
 pkgs/by-name/od/odafileconverter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/od/odafileconverter/package.nix b/pkgs/by-name/od/odafileconverter/package.nix
index 78d18506c27f..60ba539566ae 100644
--- a/pkgs/by-name/od/odafileconverter/package.nix
+++ b/pkgs/by-name/od/odafileconverter/package.nix
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
   # To obtain the version you will need to run the following command:
   #
   # dpkg-deb -I ${odafileconverter.src} | grep Version
-  version = "25.12.0.0";
+  version = "26.7.0.0";
 
   src = fetchurl {
     # NB: this URL is not stable (i.e. the underlying file and the corresponding version will change over time)
-    url = "https://www.opendesign.com/guestfiles/get?filename=ODAFileConverter_QT6_lnxX64_8.3dll_25.12.deb";
-    hash = "sha256-bc5gFg7101GKqiKAx1w7DpoO24d3JpFccPKUUAfOrdw=";
+    url = "https://www.opendesign.com/guestfiles/get?filename=ODAFileConverter_QT6_lnxX64_8.3dll_26.7.deb";
+    hash = "sha256-MqST9Se66OJ+L0IKzuZkkFjCl3nb07gTO17j+lOWrHI=";
   };
 
   buildInputs = [

From 3a3d42e077987e7318e5abafa478b91aba234fa5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 14:11:50 +0000
Subject: [PATCH 2164/3724] overpush: 0.4.5 -> 0.4.6

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

diff --git a/pkgs/by-name/ov/overpush/package.nix b/pkgs/by-name/ov/overpush/package.nix
index d48f60c2242d..6030c1aa3e52 100644
--- a/pkgs/by-name/ov/overpush/package.nix
+++ b/pkgs/by-name/ov/overpush/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "overpush";
-  version = "0.4.5";
+  version = "0.4.6";
 
   src = fetchFromGitHub {
     owner = "mrusme";
     repo = "overpush";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6tSptrvlaljKMUawGD3Bk1LBwge/Awvvudpr+juuuQQ=";
+    hash = "sha256-2EIOCeW/PuZFDmLShexnPomvx3PtGzZ6jWNvoJSxO7Q=";
   };
 
   vendorHash = "sha256-KUfGc4vFfw59mwqR840cbL4ubBH1i+sIniHU0CDCKTg=";

From 935f232934b9453369d86203a30513c346ac7986 Mon Sep 17 00:00:00 2001
From: name_snrl <Demogorgon-74@ya.ru>
Date: Thu, 26 Jun 2025 22:06:27 +0900
Subject: [PATCH 2165/3724] pkgs-lib/hocon: separate includes from the
 following fields

---
 pkgs/pkgs-lib/formats/hocon/src/src/main.rs            | 10 ++++++++--
 .../formats/hocon/test/comprehensive/expected.txt      |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/pkgs-lib/formats/hocon/src/src/main.rs b/pkgs/pkgs-lib/formats/hocon/src/src/main.rs
index 2e53f3fd5659..3262be5d4428 100644
--- a/pkgs/pkgs-lib/formats/hocon/src/src/main.rs
+++ b/pkgs/pkgs-lib/formats/hocon/src/src/main.rs
@@ -210,10 +210,16 @@ impl ToString for HOCONValue {
                 let content = (if includes.is_empty() {
                     items
                 } else {
-                    format!("{}{}", includes, items)
+                    format!("{}\n{}", includes, items)
                 })
                 .split('\n')
-                .map(|s| format!("  {}", s))
+                .map(|s| {
+                    if s.is_empty() {
+                        "".to_string()
+                    } else {
+                        format!("  {}", s)
+                    }
+                })
                 .collect::<Vec<String>>()
                 .join("\n");
 
diff --git a/pkgs/pkgs-lib/formats/hocon/test/comprehensive/expected.txt b/pkgs/pkgs-lib/formats/hocon/test/comprehensive/expected.txt
index ec196be4f686..a9c477ea006c 100644
--- a/pkgs/pkgs-lib/formats/hocon/test/comprehensive/expected.txt
+++ b/pkgs/pkgs-lib/formats/hocon/test/comprehensive/expected.txt
@@ -42,6 +42,7 @@
     include required(file("/nix/store/ccnzr53dpipdacxgci3ii3bqacvb5hxm-hocon-test-include.conf"))
     include "/nix/store/ccnzr53dpipdacxgci3ii3bqacvb5hxm-hocon-test-include.conf"
     include url("https://example.com")
+
   }
 }
 

From 05a87535497e62092010d8c5a7ff6c27bb1af527 Mon Sep 17 00:00:00 2001
From: Rhys-T <108157737+Rhys-T@users.noreply.github.com>
Date: Wed, 20 Aug 2025 10:03:43 -0400
Subject: [PATCH 2166/3724] mame: remove coreaudio_sound patch (upstreamed)

This patch is no longer needed after the most recent update, and is
breaking macOS/Darwin builds.
---
 pkgs/applications/emulators/mame/default.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix
index 742988e13886..0f025c97987c 100644
--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@@ -7,7 +7,6 @@
   SDL2_ttf,
   copyDesktopItems,
   expat,
-  fetchpatch,
   fetchurl,
   flac,
   fontconfig,
@@ -117,16 +116,6 @@ stdenv.mkDerivation rec {
     # that you run MAME changing to install directory, so we add absolute paths
     # here
     ./001-use-absolute-paths.diff
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # coreaudio_sound.cpp compares __MAC_OS_X_VERSION_MIN_REQUIRED to 1200
-    # instead of 120000, causing it to try to use a constant that isn't
-    # actually defined yet when targeting macOS 11 like Nixpkgs does.
-    # Backport mamedev/mame#13890 until the next time we update MAME.
-    (fetchpatch {
-      url = "https://patch-diff.githubusercontent.com/raw/mamedev/mame/pull/13890.patch";
-      hash = "sha256-Fqpw4fHEMns4tSSIjc1p36ss+J9Tc/O0cnN3HI/ratM=";
-    })
   ];
 
   # Since the bug described in https://github.com/NixOS/nixpkgs/issues/135438,

From cdfebcd99ea3c87acc7d9c5bd07e3600301c5b75 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 20 Aug 2025 16:32:32 +0200
Subject: [PATCH 2167/3724] chromium,chromedriver: 139.0.7258.127 ->
 139.0.7258.138

https://chromereleases.googleblog.com/2025/08/stable-channel-update-for-desktop_19.html

This update includes 1 security fix.

CVEs:
CVE-2025-9132
---
 .../networking/browsers/chromium/info.json    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 5573dafed151..ade268080de3 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "139.0.7258.127",
+    "version": "139.0.7258.138",
     "chromedriver": {
-      "version": "139.0.7258.128",
-      "hash_darwin": "sha256-QHYwd9B47p3/Y3z/TYaUpNbCBenUrI7yXVsMUwtnifg=",
-      "hash_darwin_aarch64": "sha256-rwMRpEW+sQ6u/Y0rJWGw7UICfjZO8WQddOfzpqwcsnY="
+      "version": "139.0.7258.139",
+      "hash_darwin": "sha256-EqKEyT/iEJkVASSAEP0/dNptDw3yr3AwoM2yUYbn1to=",
+      "hash_darwin_aarch64": "sha256-3H9CUsMDvD+PJ+n/YwCv22uEIxa80y+cMvL1PWOWQg0="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "5dc2cf9cf870d324cd9fba708f26d2572cc6d4d8",
-        "hash": "sha256-YcOVErOKKruc3kPuXhmeibo3KL+Rrny1FEwF769+aEU=",
+        "rev": "884e54ea8d42947ed636779015c5b4815e069838",
+        "hash": "sha256-MCBHB1ms3H8AXqiIDHH7C+8/NDcgsn3pDx7mKtGdfbc=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -96,8 +96,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "5f3636345f1d8afd495e2fcc474fd81e91c4866b",
-        "hash": "sha256-fx+QD0T85Js9jPQx2aghJU8UOL6WbR0bOkGY2i87A3w="
+        "rev": "96492b317e27ba4106ed00f5faa4534cfeaa0b8f",
+        "hash": "sha256-TE8vYLNnAzVkGQZ2ZYuNHnu8fwp2Qv4ANP0btgrKYSQ="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -631,8 +631,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "2d6f1aa4be9c33b013c322b2bc9cd99a682243b6",
-        "hash": "sha256-VysJkpCRRYNdCStnXvo6wyMCv1gLHecMwefKiwypARc="
+        "rev": "4abe0638e35d34b6fdb70f1f5ce0f0e1879a021e",
+        "hash": "sha256-hy06/Sy+rEzNyFv9R2Kg9kX7XIpCbQwCr5VjEH9CtKM="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -796,8 +796,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "505ec917b67c535519bebec58c62a34f145dd49f",
-        "hash": "sha256-fsf8j2Spe++vSnuO8763eWWmMhYqcyybpILb7OkkXq4="
+        "rev": "4d36678284f92d381f411c7947588d7a09989ca4",
+        "hash": "sha256-X5k2R7/sS3/C2S5hC1ILSquWjnPol3Pk+xe1suzgnFs="
       }
     }
   },

From b890e55c2eecb88a6497cd392f911b20a6b37852 Mon Sep 17 00:00:00 2001
From: "J. T. Elscott" <78996170+99jte@users.noreply.github.com>
Date: Wed, 20 Aug 2025 07:31:15 -0700
Subject: [PATCH 2168/3724] hashcat: add rocm support

Just copy what's already done for CUDA.
---
 pkgs/by-name/ha/hashcat/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/hashcat/package.nix b/pkgs/by-name/ha/hashcat/package.nix
index c4f8f9f6b295..20764257ffc4 100644
--- a/pkgs/by-name/ha/hashcat/package.nix
+++ b/pkgs/by-name/ha/hashcat/package.nix
@@ -12,6 +12,8 @@
   ocl-icd,
   perl,
   python3,
+  rocmPackages ? { },
+  rocmSupport ? config.rocmSupport,
   xxHash,
   zlib,
   libiconv,
@@ -43,7 +45,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     makeWrapper
   ]
-  ++ lib.optionals cudaSupport [
+  ++ lib.optionals (cudaSupport || rocmSupport) [
     addDriverRunpath
   ];
 
@@ -102,13 +104,16 @@ stdenv.mkDerivation rec {
         ++ lib.optionals cudaSupport [
           "${cudaPackages_12_4.cudatoolkit}/lib"
         ]
+        ++ lib.optionals rocmSupport [
+          "${rocmPackages.clr}/lib"
+        ]
       );
     in
     ''
       wrapProgram $out/bin/hashcat \
         --prefix LD_LIBRARY_PATH : ${lib.escapeShellArg LD_LIBRARY_PATH}
     ''
-    + lib.optionalString cudaSupport ''
+    + lib.optionalString (cudaSupport || rocmSupport) ''
       for program in $out/bin/hashcat $out/bin/.hashcat-wrapped; do
         isELF "$program" || continue
         addDriverRunpath "$program"

From e4fb8fd9d7d4829211b63a1374494611c8d4b05b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 14:35:53 +0000
Subject: [PATCH 2169/3724] hifile: 0.9.12.0 -> 0.9.12.1

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

diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix
index 026c4657132b..4969188fd3b5 100644
--- a/pkgs/by-name/hi/hifile/package.nix
+++ b/pkgs/by-name/hi/hifile/package.nix
@@ -2,8 +2,8 @@
   lib,
   appimageTools,
   fetchurl,
-  version ? "0.9.12.0",
-  hash ? "sha256-nWt/DOzoQ05F+uk9sDSumb19vQib1Vh/8ywB/d87epc=",
+  version ? "0.9.12.1",
+  hash ? "sha256-6Lun0HyfAi7anivgGsGdUPPX9kZrWwh8fq+qvVL/CdU=",
 }:
 
 let

From a86058914c366151bbf03a87b477e449ae724e75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 14:36:42 +0000
Subject: [PATCH 2170/3724] e1s: 1.0.49 -> 1.0.50

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

diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix
index 0b6b98695f59..ede9a3c7840f 100644
--- a/pkgs/by-name/e1/e1s/package.nix
+++ b/pkgs/by-name/e1/e1s/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "e1s";
-  version = "1.0.49";
+  version = "1.0.50";
 in
 buildGoModule {
   inherit pname version;
@@ -14,7 +14,7 @@ buildGoModule {
     owner = "keidarcy";
     repo = "e1s";
     tag = "v${version}";
-    hash = "sha256-7GHNhX0hiRHQ0OH1DuHG9SPcTmm8W5CLU1Idx1pJnwE=";
+    hash = "sha256-ntuFMxuCrA0meE8tOnA9oPLLvYfXyhQgebBuKELeDgQ=";
   };
 
   vendorHash = "sha256-1lise/u40Q8W9STsuyrWIbhf2HY+SFCytUL1PTSWvfY=";

From 4798a0c6cee3f5930560de5c80525422c4858585 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 14:37:11 +0000
Subject: [PATCH 2171/3724] docker-buildx: 0.26.1 -> 0.27.0

---
 pkgs/applications/virtualization/docker/buildx.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
index 9e4ff2a7111d..135f44e30add 100644
--- a/pkgs/applications/virtualization/docker/buildx.nix
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "docker-buildx";
-  version = "0.26.1";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "buildx";
     rev = "v${version}";
-    hash = "sha256-+ubv/8UdejxY7u3RdgS7L18hZHohlqGu9E3L0bTAmLY=";
+    hash = "sha256-SY7pf6bHvX6tezTYpOu/pqda3IsIqaR5g7JZS+eEEZw=";
   };
 
   doCheck = false;

From 2103ba26886f3e2ac531cdea072d673f3e0ffed3 Mon Sep 17 00:00:00 2001
From: Willy <jemand771@gmx.net>
Date: Wed, 20 Aug 2025 16:40:32 +0200
Subject: [PATCH 2172/3724] nixosTests.prometheus-exporters.smokeping: fix test
 after 0.10.0

prometheus-smokeping-prober was updated to 0.10.0 in #396980
which introduced a new label `tos` in its metrics.
add it to the failing tests to make them match
the expected metric (and pass) again

you could argue that the tests are a bit too greedy with the way
they match metrics, but I actually like it that way
---
 nixos/tests/prometheus-exporters.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index cbfd5426af07..d406ee93506e 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -1603,12 +1603,12 @@ let
         wait_for_open_port(9374)
         wait_until_succeeds(
             "curl -sSf localhost:9374/metrics | grep '{}' | grep -v ' 0$'".format(
-                'smokeping_requests_total{host="127.0.0.1",ip="127.0.0.1",source=""} '
+                'smokeping_requests_total{host="127.0.0.1",ip="127.0.0.1",source="",tos="0"} '
             )
         )
         wait_until_succeeds(
             "curl -sSf localhost:9374/metrics | grep '{}'".format(
-                'smokeping_response_ttl{host="127.0.0.1",ip="127.0.0.1",source=""}'
+                'smokeping_response_ttl{host="127.0.0.1",ip="127.0.0.1",source="",tos="0"}'
             )
         )
       '';

From 2965fa9c9a4c489292f2c56c7af56443b8b6b552 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Wed, 20 Aug 2025 16:50:04 +0200
Subject: [PATCH 2173/3724] matrix-alertmanager-receiver: 2025.8.6 -> 2025.8.20

Release notes: https://github.com/metio/matrix-alertmanager-receiver/releases/tag/2025.8.20
Full changelog: https://github.com/metio/matrix-alertmanager-receiver/compare/2025.8.6...2025.8.20
---
 pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
index e7c424eb6b78..f2513130c129 100644
--- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
+++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "matrix-alertmanager-receiver";
-  version = "2025.8.6";
+  version = "2025.8.20";
 
   src = fetchFromGitHub {
     owner = "metio";
     repo = "matrix-alertmanager-receiver";
     tag = finalAttrs.version;
-    hash = "sha256-rnGKpJppR7NoOAx/jGt7vxr1EVok3tMzkr9ry/k57L8=";
+    hash = "sha256-7mKpS80Iw35F+YiQujh80wGIjsxwcCEs8lDGLdq1v3U=";
   };
 
-  vendorHash = "sha256-JMjfrSdaN2zXgACkPddQ9h7SLV6jhpUvFTk56UfPWJg=";
+  vendorHash = "sha256-Y43bmnY9E9Mq3yjJ5XO+Ox+jjUmD2IB+SYdyn4IeXE4=";
 
   env.CGO_ENABLED = "0";
 

From 424cfe1856e3907fc6ffed4e63ff7a14fd5c6aae Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 20 Aug 2025 23:00:23 +0800
Subject: [PATCH 2174/3724] pantheon.elementary-videos: 8.0.1 -> 8.0.2

https://github.com/elementary/videos/compare/8.0.1...8.0.2
---
 pkgs/desktops/pantheon/apps/elementary-videos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
index da3342656e73..34a3358dcff8 100644
--- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-videos";
-  version = "8.0.1";
+  version = "8.0.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "videos";
     rev = version;
-    hash = "sha256-3TpPgMd4dABhvnnmHHQCHDvuSdC5rWxGvaXPg20/Mrs=";
+    hash = "sha256-lvIsLjsb4HqwXDsH2krBlxmy7kJdadpjDcw+svaWV+Q=";
   };
 
   nativeBuildInputs = [

From 1e6103c9b15810549f1d39766530db8842ad27e1 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 20 Aug 2025 23:00:37 +0800
Subject: [PATCH 2175/3724] pantheon.elementary-camera: 8.0.1 -> 8.0.2

https://github.com/elementary/camera/compare/8.0.1...8.0.2
---
 pkgs/desktops/pantheon/apps/elementary-camera/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
index 6ba592b46a67..a03bdaf89b55 100644
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-camera";
-  version = "8.0.1";
+  version = "8.0.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "camera";
     rev = version;
-    sha256 = "sha256-PSUav16aU9TFX9Zb0TkqLxgn+yed86Qft0rQvbjbXtA=";
+    sha256 = "sha256-jJJhCFDo5Iw6zV6aE8JgG/sMFpUfra2j2zQ8+GjyQrk=";
   };
 
   nativeBuildInputs = [

From 1debc41fdcdc1a12157366a25c2773d9a4a0acf2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 15:07:07 +0000
Subject: [PATCH 2176/3724] python3Packages.python-gvm: 26.4.0 -> 26.5.0

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

diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix
index 858cd4069be7..43c241e1abbc 100644
--- a/pkgs/development/python-modules/python-gvm/default.nix
+++ b/pkgs/development/python-modules/python-gvm/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "python-gvm";
-  version = "26.4.0";
+  version = "26.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = "python-gvm";
     tag = "v${version}";
-    hash = "sha256-AIF5oq1eNkasgXV2v+9ofqjGwiivQv+rO12LuzN7PN8=";
+    hash = "sha256-9OSL7Li95p79P1+8yViI/pV/nLwuk580/6Be99+DTWU=";
   };
 
   build-system = [ poetry-core ];

From 679f5871cd635cdc9ad6482530183eaaa2d356a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 15:13:03 +0000
Subject: [PATCH 2177/3724] vscode-extensions.james-yu.latex-workshop: 10.10.1
 -> 10.10.2

---
 .../vscode/extensions/james-yu.latex-workshop/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix b/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix
index 8fb75921b6d7..85f420c67d99 100644
--- a/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "latex-workshop";
     publisher = "James-Yu";
-    version = "10.10.1";
-    hash = "sha256-TFaTpGfGk6RgFH/2gSGXCntBw6yWRg1lxHU+eEMBu3s=";
+    version = "10.10.2";
+    hash = "sha256-Ls02bUSh5O5mDT2SEnaibvpHw535yelv5NaQ/NRM13k=";
   };
   meta = {
     changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";

From 0b1ad0349b2a6936c3573638b0e676975b9e5937 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 15:15:02 +0000
Subject: [PATCH 2178/3724] python3Packages.pyathena: 3.17.0 -> 3.17.1

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

diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix
index ea251d718092..f15193dabdb3 100644
--- a/pkgs/development/python-modules/pyathena/default.nix
+++ b/pkgs/development/python-modules/pyathena/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pyathena";
-  version = "3.17.0";
+  version = "3.17.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jvlT/PSb3Xyhi/NloCQMvM+zewnyeOFynT3hSedyt7Y=";
+    hash = "sha256-jlS6qjOG2syTpsY/jNkplOULiDPXR3cmWSMa5O9EGPc=";
   };
 
   build-system = [ hatchling ];

From b51e104439587fabc53e3f644bcef0af43f10c23 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 18 Aug 2025 20:55:12 +0200
Subject: [PATCH 2179/3724] actions/checkout: rename from
 actions/get-merge-commit

This moves the logic to "check whether the PR can be merged and
determine the relevant commits" into the PR / prepare job directly -
since that's the only place where it is supposed to be used.

Because of the if condition in get-merge-commit, this logic was run
multiple times, for example in the lint workflow, where only one of
targetSha or mergedSha was provided as input. However, this input was
thrown away directly. This might not be a big problem, because this was
not expensive, so far. But with the next commit, this will become more
so.

This also separates the logic a bit cleaner - `prepare` figures out all
the parameters for the whole PR workflow, while `checkout` handles the
consistency around these checkouts.
---
 .github/actions/checkout/action.yml         | 54 ++++++++++++++
 .github/actions/get-merge-commit/action.yml | 80 ---------------------
 .github/workflows/README.md                 |  2 +-
 .github/workflows/build.yml                 |  7 +-
 .github/workflows/check.yml                 | 10 ++-
 .github/workflows/eval.yml                  | 17 ++---
 .github/workflows/lint.yml                  | 24 +++----
 .github/workflows/pr.yml                    | 21 +++---
 8 files changed, 91 insertions(+), 124 deletions(-)
 create mode 100644 .github/actions/checkout/action.yml
 delete mode 100644 .github/actions/get-merge-commit/action.yml

diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml
new file mode 100644
index 000000000000..e3c592f6e53a
--- /dev/null
+++ b/.github/actions/checkout/action.yml
@@ -0,0 +1,54 @@
+name: Checkout
+
+description: 'Checkout into trusted / untrusted / pinned folders consistently.'
+
+inputs:
+  merged-as-untrusted-at:
+    description: "Whether and which SHA to checkout for the merge commit in the ./untrusted folder."
+    type: boolean
+  pinnedFrom:
+    description: "Whether to checkout the pinned nixpkgs for CI and from where (trusted, untrusted)."
+    type: string
+  target-as-trusted-at:
+    description: "Whether and which SHA to checkout for the target commit in the ./trusted folder."
+    type: boolean
+
+runs:
+  using: composite
+  steps:
+    - if: inputs.merged-as-untrusted-at
+      # Would be great to do the checkouts in git worktrees of the existing spare checkout instead,
+      # but Nix is broken with them:
+      # https://github.com/NixOS/nix/issues/6073
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      with:
+        ref: ${{ inputs.merged-as-untrusted-at }}
+        path: untrusted
+
+    - if: inputs.target-as-trusted-at
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      with:
+        ref: ${{ inputs.target-as-trusted-at }}
+        path: trusted
+
+    - if: inputs.pinnedFrom
+      id: pinned
+      uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+      env:
+        PINNED_FROM: ${{ inputs.pinnedFrom }}
+      with:
+        script: |
+          const path = require('node:path')
+          const pinned = require(path.resolve(path.join(process.env.PINNED_FROM, 'ci', 'pinned.json')))
+          core.setOutput('pinnedSha', pinned.pins.nixpkgs.revision)
+
+    - if: steps.pinned.outputs.pinnedSha
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      with:
+        ref: ${{ steps.pinned.outputs.pinnedSha }}
+        path: pinned
+        sparse-checkout: |
+          lib
+          maintainers
+          nixos/lib
+          pkgs
diff --git a/.github/actions/get-merge-commit/action.yml b/.github/actions/get-merge-commit/action.yml
deleted file mode 100644
index 1d37ef6abd43..000000000000
--- a/.github/actions/get-merge-commit/action.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-name: Get merge commit
-
-description: 'Checks whether the Pull Request is mergeable and checks out the repo at up to two commits: The result of a temporary merge of the head branch into the target branch ("merged"), and the parent of that commit on the target branch ("target"). Handles push events and merge conflicts gracefully.'
-
-inputs:
-  mergedSha:
-    description: "The merge commit SHA, previously collected."
-    type: string
-  merged-as-untrusted:
-    description: "Whether to checkout the merge commit in the ./untrusted folder."
-    type: boolean
-  pinnedFrom:
-    description: "Whether to checkout the pinned nixpkgs for CI and from where (trusted, untrusted)."
-    type: string
-  targetSha:
-    description: "The target commit SHA, previously collected."
-    type: string
-  target-as-trusted:
-    description: "Whether to checkout the target commit in the ./trusted folder."
-    type: boolean
-
-outputs:
-  mergedSha:
-    description: "The merge commit SHA"
-    value: ${{ steps.commits.outputs.mergedSha }}
-  targetSha:
-    description: "The target commit SHA"
-    value: ${{ steps.commits.outputs.targetSha }}
-
-runs:
-  using: composite
-  steps:
-    - id: commits
-      if: ${{ !inputs.mergedSha && !inputs.targetSha }}
-      uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-      with:
-        script: |
-          require('./ci/github-script/prepare.js')({
-            github,
-            context,
-            core,
-          })
-
-    - if: inputs.merged-as-untrusted && (inputs.mergedSha || steps.commits.outputs.mergedSha)
-      # Would be great to do the checkouts in git worktrees of the existing spare checkout instead,
-      # but Nix is broken with them:
-      # https://github.com/NixOS/nix/issues/6073
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      with:
-        ref: ${{ inputs.mergedSha || steps.commits.outputs.mergedSha }}
-        path: untrusted
-
-    - if: inputs.target-as-trusted && (inputs.targetSha || steps.commits.outputs.targetSha)
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      with:
-        ref: ${{ inputs.targetSha || steps.commits.outputs.targetSha }}
-        path: trusted
-
-    - if: inputs.pinnedFrom
-      id: pinned
-      uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-      env:
-        PINNED_FROM: ${{ inputs.pinnedFrom }}
-      with:
-        script: |
-          const path = require('node:path')
-          const pinned = require(path.resolve(path.join(process.env.PINNED_FROM, 'ci', 'pinned.json')))
-          core.setOutput('pinnedSha', pinned.pins.nixpkgs.revision)
-
-    - if: steps.pinned.outputs.pinnedSha
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      with:
-        ref: ${{ steps.pinned.outputs.pinnedSha }}
-        path: pinned
-        sparse-checkout: |
-          lib
-          maintainers
-          nixos/lib
-          pkgs
-
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 10b0276be144..2c739bd56129 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -17,7 +17,7 @@ Some architectural notes about key decisions and concepts in our workflows:
   This is a temporary commit that GitHub creates automatically as "what would happen, if this PR was merged into the base branch now?".
   The checkout could be done via the virtual branch `refs/pull/<pr-number>/merge`, but doing so would cause failures when this virtual branch doesn't exist (anymore).
   This can happen when the PR has conflicts, in which case the virtual branch is not created, or when the PR is getting merged while workflows are still running, in which case the branch won't exist anymore at the time of checkout.
-  Thus, we use the `get-merge-commit.yml` workflow to check whether the PR is mergeable and the test merge commit exists and only then run the relevant jobs.
+  Thus, we use the `prepare` job to check whether the PR is mergeable and the test merge commit exists and only then run the relevant jobs.
 
 - Various workflows need to make comparisons against the base branch.
   In this case, we checkout the parent of the "test merge commit" for best results.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ef3c71ca4fbe..d8fe8272d625 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,11 +47,10 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and checkout the merge commit
-        uses: ./.github/actions/get-merge-commit
+      - name: Checkout the merge commit
+        uses: ./.github/actions/checkout
         with:
-          mergedSha: ${{ inputs.mergedSha }}
-          merged-as-untrusted: true
+          merged-as-untrusted-at: ${{ inputs.mergedSha }}
           pinnedFrom: untrusted
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index c06729fa7f5d..aca22eddff6b 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -99,14 +99,12 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and checkout the merge and target commits
-        uses: ./.github/actions/get-merge-commit
+      - name: Checkout merge and target commits
+        uses: ./.github/actions/checkout
         with:
-          mergedSha: ${{ inputs.mergedSha }}
-          merged-as-untrusted: true
+          merged-as-untrusted-at: ${{ inputs.mergedSha }}
           pinnedFrom: trusted
-          targetSha: ${{ inputs.targetSha }}
-          target-as-trusted: true
+          target-as-trusted-at: ${{ inputs.targetSha }}
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index a89f2e4d5f9b..a92e64de6715 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -88,10 +88,9 @@ jobs:
         with:
           sparse-checkout: .github/actions
       - name: Check out the PR at the test merge commit
-        uses: ./.github/actions/get-merge-commit
+        uses: ./.github/actions/checkout
         with:
-          mergedSha: ${{ inputs.mergedSha }}
-          merged-as-untrusted: true
+          merged-as-untrusted-at: ${{ inputs.mergedSha }}
           pinnedFrom: untrusted
 
       - name: Install Nix
@@ -206,10 +205,9 @@ jobs:
         with:
           sparse-checkout: .github/actions
       - name: Check out the PR at the target commit
-        uses: ./.github/actions/get-merge-commit
+        uses: ./.github/actions/checkout
         with:
-          targetSha: ${{ inputs.targetSha }}
-          target-as-trusted: true
+          target-as-trusted-at: ${{ inputs.targetSha }}
           pinnedFrom: trusted
 
       - name: Download output paths and eval stats for all systems
@@ -375,11 +373,10 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and checkout the merge commit
-        uses: ./.github/actions/get-merge-commit
+      - name: Checkout the merge commit
+        uses: ./.github/actions/checkout
         with:
-          mergedSha: ${{ inputs.mergedSha }}
-          merged-as-untrusted: true
+          merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
       - name: Install Nix
         uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 44cb7fe7bada..817f42d496ad 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -24,11 +24,10 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and checkout the merge commit
-        uses: ./.github/actions/get-merge-commit
+      - name: Checkout the merge commit
+        uses: ./.github/actions/checkout
         with:
-          mergedSha: ${{ inputs.mergedSha }}
-          merged-as-untrusted: true
+          merged-as-untrusted-at: ${{ inputs.mergedSha }}
           pinnedFrom: untrusted
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
@@ -56,11 +55,10 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and checkout the merge commit
-        uses: ./.github/actions/get-merge-commit
+      - name: Checkout the merge commit
+        uses: ./.github/actions/checkout
         with:
-          mergedSha: ${{ inputs.mergedSha }}
-          merged-as-untrusted: true
+          merged-as-untrusted-at: ${{ inputs.mergedSha }}
           pinnedFrom: untrusted
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
@@ -77,14 +75,12 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and checkout merged and target commits
-        uses: ./.github/actions/get-merge-commit
+      - name: Checkout merge and target commits
+        uses: ./.github/actions/checkout
         with:
-          mergedSha: ${{ inputs.mergedSha }}
-          merged-as-untrusted: true
+          merged-as-untrusted-at: ${{ inputs.mergedSha }}
           pinnedFrom: untrusted
-          targetSha: ${{ inputs.targetSha }}
-          target-as-trusted: true
+          target-as-trusted-at: ${{ inputs.targetSha }}
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 1de7d6614c9c..a2636d75022f 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -3,7 +3,7 @@ name: PR
 on:
   pull_request:
     paths:
-      - .github/actions/get-merge-commit/action.yml
+      - .github/actions/checkout/action.yml
       - .github/workflows/build.yml
       - .github/workflows/check.yml
       - .github/workflows/eval.yml
@@ -25,21 +25,24 @@ jobs:
     outputs:
       baseBranch: ${{ steps.branches.outputs.base }}
       headBranch: ${{ steps.branches.outputs.head }}
-      mergedSha: ${{ steps.get-merge-commit.outputs.mergedSha }}
-      targetSha: ${{ steps.get-merge-commit.outputs.targetSha }}
+      mergedSha: ${{ steps.prepare.outputs.mergedSha }}
+      targetSha: ${{ steps.prepare.outputs.targetSha }}
       systems: ${{ steps.systems.outputs.systems }}
       touched: ${{ steps.files.outputs.touched }}
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           sparse-checkout: |
-            .github/actions
             ci/github-script
-            ci/supportedBranches.js
-            ci/supportedSystems.json
-      - name: Check if the PR can be merged and get the test merge commit
-        uses: ./.github/actions/get-merge-commit
-        id: get-merge-commit
+      - id: prepare
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            require('./ci/github-script/prepare.js')({
+              github,
+              context,
+              core,
+            })
 
       - name: Load supported systems
         id: systems

From 7ab632b30f6d53ede5ed1fc6ac8318d2e656e972 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 18 Aug 2025 21:03:25 +0200
Subject: [PATCH 2180/3724] actions/checkout: rename inconsistent pinned-from
 input

---
 .github/actions/checkout/action.yml | 12 ++++++------
 .github/workflows/build.yml         |  2 +-
 .github/workflows/check.yml         |  2 +-
 .github/workflows/eval.yml          |  4 ++--
 .github/workflows/lint.yml          |  6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml
index e3c592f6e53a..751eef7600cd 100644
--- a/.github/actions/checkout/action.yml
+++ b/.github/actions/checkout/action.yml
@@ -6,7 +6,7 @@ inputs:
   merged-as-untrusted-at:
     description: "Whether and which SHA to checkout for the merge commit in the ./untrusted folder."
     type: boolean
-  pinnedFrom:
+  pinned-from:
     description: "Whether to checkout the pinned nixpkgs for CI and from where (trusted, untrusted)."
     type: string
   target-as-trusted-at:
@@ -31,21 +31,21 @@ runs:
         ref: ${{ inputs.target-as-trusted-at }}
         path: trusted
 
-    - if: inputs.pinnedFrom
+    - if: inputs.pinned-from
       id: pinned
       uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
       env:
-        PINNED_FROM: ${{ inputs.pinnedFrom }}
+        PINNED_FROM: ${{ inputs.pinned-from }}
       with:
         script: |
           const path = require('node:path')
           const pinned = require(path.resolve(path.join(process.env.PINNED_FROM, 'ci', 'pinned.json')))
-          core.setOutput('pinnedSha', pinned.pins.nixpkgs.revision)
+          core.setOutput('pinned-at', pinned.pins.nixpkgs.revision)
 
-    - if: steps.pinned.outputs.pinnedSha
+    - if: steps.pinned.outputs.pinned-at
       uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       with:
-        ref: ${{ steps.pinned.outputs.pinnedSha }}
+        ref: ${{ steps.pinned.outputs.pinned-at }}
         path: pinned
         sparse-checkout: |
           lib
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d8fe8272d625..9cfc329107ad 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -51,7 +51,7 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
-          pinnedFrom: untrusted
+          pinned-from: untrusted
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
         with:
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index aca22eddff6b..dcbc5af199b8 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -103,7 +103,7 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
-          pinnedFrom: trusted
+          pinned-from: trusted
           target-as-trusted-at: ${{ inputs.targetSha }}
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index a92e64de6715..c19549a4eb47 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -91,7 +91,7 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
-          pinnedFrom: untrusted
+          pinned-from: untrusted
 
       - name: Install Nix
         uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
@@ -208,7 +208,7 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           target-as-trusted-at: ${{ inputs.targetSha }}
-          pinnedFrom: trusted
+          pinned-from: trusted
 
       - name: Download output paths and eval stats for all systems
         uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 817f42d496ad..97387126eb57 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -28,7 +28,7 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
-          pinnedFrom: untrusted
+          pinned-from: untrusted
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
@@ -59,7 +59,7 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
-          pinnedFrom: untrusted
+          pinned-from: untrusted
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
@@ -79,7 +79,7 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
-          pinnedFrom: untrusted
+          pinned-from: untrusted
           target-as-trusted-at: ${{ inputs.targetSha }}
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31

From 9caf45544114ed16710374b9d107ed14767f7f51 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 18 Aug 2025 21:49:29 +0200
Subject: [PATCH 2181/3724] ci/github-script/prepare: load systems

---
 .github/workflows/pr.yml    | 7 +------
 ci/github-script/prepare.js | 3 +++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index a2636d75022f..d22641c085ad 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -27,7 +27,7 @@ jobs:
       headBranch: ${{ steps.branches.outputs.head }}
       mergedSha: ${{ steps.prepare.outputs.mergedSha }}
       targetSha: ${{ steps.prepare.outputs.targetSha }}
-      systems: ${{ steps.systems.outputs.systems }}
+      systems: ${{ steps.prepare.outputs.systems }}
       touched: ${{ steps.files.outputs.touched }}
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -44,11 +44,6 @@ jobs:
               core,
             })
 
-      - name: Load supported systems
-        id: systems
-        run: |
-          echo "systems=$(jq -c <ci/supportedSystems.json)" >> "$GITHUB_OUTPUT"
-
       - name: Determine branch type
         id: branches
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js
index 96f433126785..bd1457249a27 100644
--- a/ci/github-script/prepare.js
+++ b/ci/github-script/prepare.js
@@ -49,6 +49,9 @@ module.exports = async ({ github, context, core }) => {
     )
     core.setOutput('mergedSha', mergedSha)
     core.setOutput('targetSha', targetSha)
+
+    core.setOutput('systems', require('../supportedSystems.json'))
+
     return
   }
   throw new Error(

From 4220a03df8744ded7a6594a940a3316d4ff5e702 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 18 Aug 2025 21:53:55 +0200
Subject: [PATCH 2182/3724] ci/github-script/prepare: classify branches

---
 .github/workflows/pr.yml    | 24 ++----------------------
 ci/github-script/prepare.js | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index d22641c085ad..51b0d41ddf1d 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -23,8 +23,8 @@ jobs:
   prepare:
     runs-on: ubuntu-24.04-arm
     outputs:
-      baseBranch: ${{ steps.branches.outputs.base }}
-      headBranch: ${{ steps.branches.outputs.head }}
+      baseBranch: ${{ steps.prepare.outputs.base }}
+      headBranch: ${{ steps.prepare.outputs.head }}
       mergedSha: ${{ steps.prepare.outputs.mergedSha }}
       targetSha: ${{ steps.prepare.outputs.targetSha }}
       systems: ${{ steps.prepare.outputs.systems }}
@@ -44,26 +44,6 @@ jobs:
               core,
             })
 
-      - name: Determine branch type
-        id: branches
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const { classify } = require('./ci/supportedBranches.js')
-            const { base, head } = context.payload.pull_request
-
-            const baseClassification = classify(base.ref)
-            core.setOutput('base', baseClassification)
-            core.info('base classification:', baseClassification)
-
-            const headClassification =
-              (base.repo.full_name == head.repo.full_name) ?
-              classify(head.ref) :
-              // PRs from forks are always considered WIP.
-              { type: ['wip'] }
-            core.setOutput('head', headClassification)
-            core.info('head classification:', headClassification)
-
       - name: Determine changed files
         id: files
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js
index bd1457249a27..1f56a502ca8a 100644
--- a/ci/github-script/prepare.js
+++ b/ci/github-script/prepare.js
@@ -1,3 +1,5 @@
+const { classify } = require('../supportedBranches.js')
+
 module.exports = async ({ github, context, core }) => {
   const pull_number = context.payload.pull_request.number
 
@@ -20,6 +22,8 @@ module.exports = async ({ github, context, core }) => {
       continue
     }
 
+    const { base, head } = prInfo
+
     let mergedSha, targetSha
 
     if (prInfo.mergeable) {
@@ -39,7 +43,7 @@ module.exports = async ({ github, context, core }) => {
       targetSha = (
         await github.rest.repos.compareCommitsWithBasehead({
           ...context.repo,
-          basehead: `${prInfo.base.sha}...${prInfo.head.sha}`,
+          basehead: `${base.sha}...${head.sha}`,
         })
       ).data.merge_base_commit.sha
     }
@@ -52,6 +56,18 @@ module.exports = async ({ github, context, core }) => {
 
     core.setOutput('systems', require('../supportedSystems.json'))
 
+    const baseClassification = classify(base.ref)
+    core.setOutput('base', baseClassification)
+    core.info('base classification:', baseClassification)
+
+    const headClassification =
+      base.repo.full_name === head.repo.full_name
+        ? classify(head.ref)
+        : // PRs from forks are always considered WIP.
+          { type: ['wip'] }
+    core.setOutput('head', headClassification)
+    core.info('head classification:', headClassification)
+
     return
   }
   throw new Error(

From 46a1b0a7bc7a424a84f7660f31ab205ddee68368 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 18 Aug 2025 21:56:02 +0200
Subject: [PATCH 2183/3724] ci/github-script/prepare: determine changed files

---
 .github/workflows/pr.yml    | 16 +---------------
 ci/github-script/prepare.js | 11 +++++++++++
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 51b0d41ddf1d..a09c51eeae7e 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -28,7 +28,7 @@ jobs:
       mergedSha: ${{ steps.prepare.outputs.mergedSha }}
       targetSha: ${{ steps.prepare.outputs.targetSha }}
       systems: ${{ steps.prepare.outputs.systems }}
-      touched: ${{ steps.files.outputs.touched }}
+      touched: ${{ steps.prepare.outputs.touched }}
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
@@ -44,20 +44,6 @@ jobs:
               core,
             })
 
-      - name: Determine changed files
-        id: files
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const files = (await github.paginate(github.rest.pulls.listFiles, {
-              ...context.repo,
-              pull_number: context.payload.pull_request.number,
-              per_page: 100,
-            })).map(file => file.filename)
-
-            if (files.includes('ci/pinned.json')) core.setOutput('touched', ['pinned'])
-            else core.setOutput('touched', [])
-
   check:
     name: Check
     needs: [prepare]
diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js
index 1f56a502ca8a..d47dd86308dd 100644
--- a/ci/github-script/prepare.js
+++ b/ci/github-script/prepare.js
@@ -68,6 +68,17 @@ module.exports = async ({ github, context, core }) => {
     core.setOutput('head', headClassification)
     core.info('head classification:', headClassification)
 
+    const files = (
+      await github.paginate(github.rest.pulls.listFiles, {
+        ...context.repo,
+        pull_number: context.payload.pull_request.number,
+        per_page: 100,
+      })
+    ).map((file) => file.filename)
+
+    if (files.includes('ci/pinned.json')) core.setOutput('touched', ['pinned'])
+    else core.setOutput('touched', [])
+
     return
   }
   throw new Error(

From 3669e6efd71e8d765aa2a5ba39d851e5889a812e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 15:21:11 +0000
Subject: [PATCH 2184/3724] python3Packages.webexpythonsdk: 2.0.4 -> 2.0.5

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

diff --git a/pkgs/development/python-modules/webexpythonsdk/default.nix b/pkgs/development/python-modules/webexpythonsdk/default.nix
index 15fe08f89031..e6944d08e39a 100644
--- a/pkgs/development/python-modules/webexpythonsdk/default.nix
+++ b/pkgs/development/python-modules/webexpythonsdk/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "webexpythonsdk";
-  version = "2.0.4";
+  version = "2.0.5";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "WebexCommunity";
     repo = "WebexPythonSDK";
     tag = "v${version}";
-    hash = "sha256-8U3aAS+9dU5Zg4fS2t6zLvTEJ/6aIV/YEWte06GvKTo=";
+    hash = "sha256-iRhl/JCktS+6yJhvMZ6Vv7oOF5ZVrPQiI4Bstsub0bM=";
   };
 
   build-system = [
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module for Webex Teams APIs";
     homepage = "https://github.com/WebexCommunity/WebexPythonSDK";
-    changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}";
+    changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From 7c1179895554ed6840ee283a95dd8752cd013d53 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 20 Aug 2025 15:21:54 +0000
Subject: [PATCH 2185/3724] transito: 0.9.1 -> 0.10.0

https://git.sr.ht/~mil/transito/refs/v0.10.0
---
 pkgs/by-name/tr/transito/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/transito/package.nix b/pkgs/by-name/tr/transito/package.nix
index a87a00f33753..0b955f2f274b 100644
--- a/pkgs/by-name/tr/transito/package.nix
+++ b/pkgs/by-name/tr/transito/package.nix
@@ -13,15 +13,15 @@
 
 buildGoModule rec {
   pname = "transito";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchFromSourcehut {
     owner = "~mil";
     repo = "transito";
     rev = "v${version}";
-    hash = "sha256-5aG/hmpUAN2qYxpqMKLl2WnYgR/sPdtAwLGkFXVyrNs=";
+    hash = "sha256-87U9RdlP260ApkGJB3dLitxAdY3I9nWrukxzRnwuJ2E=";
   };
-  vendorHash = "sha256-7QMO+/f+yc5GfxvDLIXuf+QT2cAmbgI6iQqWmQIkMMA=";
+  vendorHash = "sha256-mgvfrNKvdjLa7O0oTSec8u3eHHU66ZDqpKzNeeyy2J0=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
@@ -66,6 +66,7 @@ buildGoModule rec {
       GTFS data, to name a few: Lisbon, NYC, Brussels, Krakow, and Bourges.
     '';
     homepage = "https://git.sr.ht/~mil/transito";
+    changelog = "https://git.sr.ht/~mil/transito/refs/v${version}";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.McSinyx ];
     mainProgram = "transito";

From a5b7dd58af019220748261f15639cb7d37d716de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 15:37:29 +0000
Subject: [PATCH 2186/3724] python3Packages.google-cloud-spanner: 3.56.0 ->
 3.57.0

---
 .../python-modules/google-cloud-spanner/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix
index 3b46d66997aa..3cc0c1430697 100644
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-spanner";
-  version = "3.56.0";
+  version = "3.57.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-spanner";
     tag = "v${version}";
-    hash = "sha256-yCEFVf/euu48j+0jK5QfjhdJMV4c4mEHFYE+Ukz7Rjo=";
+    hash = "sha256-XZfG3xk2DYcqzOkVKVRT+O81R+hL4CCfl+/E2WLThYA=";
   };
 
   build-system = [ setuptools ];

From aa6f03cf8de69507aee27efc04f7e25a3b1c2dd1 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 20 Aug 2025 18:44:10 +0300
Subject: [PATCH 2187/3724] mesa: 25.2.0 -> 25.2.1

Diff: https://gitlab.freedesktop.org/mesa/mesa/-/compare/mesa-25.2.0...mesa-25.2.1

Changelog: https://docs.mesa3d.org/relnotes/25.2.1.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 84e68f87fa4b..fc7f12a6bbef 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "25.2.0";
+  version = "25.2.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-is5CWcyC0O4Jn08makxowDAiloxYJmMrfuxecu12fyQ=";
+    hash = "sha256-BlOjNdQc7RtFk0EvqbPg3nccsiAAbGMKuwNLn+HcyEU=";
   };
 
   meta = {

From eda9bbb34bebf3dc2d5d98bd8395f185b7d205dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 15:45:53 +0000
Subject: [PATCH 2188/3724] metacubexd: 1.190.0 -> 1.190.1

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

diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix
index 0742b6e85366..e418b940a7de 100644
--- a/pkgs/by-name/me/metacubexd/package.nix
+++ b/pkgs/by-name/me/metacubexd/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "metacubexd";
-  version = "1.190.0";
+  version = "1.190.1";
 
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "metacubexd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ghhwTkdFLX+AxLps0NDdE5V0BF0fdLBNQA8JyWtBvFo=";
+    hash = "sha256-oXyPT47rq1hadaUmQPqtvOwemMOE0z19zjWQbfxIyLw=";
   };
 
   nativeBuildInputs = [

From 4b1b963a0f383be5772f41aa1c7febe7095097bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 00:46:47 +0000
Subject: [PATCH 2189/3724] ladybird: 0-unstable-2025-08-11 ->
 0-unstable-2025-08-19

---
 pkgs/by-name/la/ladybird/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index 3238928b585e..8a53b1a6b7fd 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -33,13 +33,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ladybird";
-  version = "0-unstable-2025-08-11";
+  version = "0-unstable-2025-08-19";
 
   src = fetchFromGitHub {
     owner = "LadybirdWebBrowser";
     repo = "ladybird";
-    rev = "a64cee528c5b387d45441da80f6c887399d4affb";
-    hash = "sha256-YtWh5Unny3IU0+81N8riGDJJAtethO1g04cxNap520s=";
+    rev = "658477620afe4c14b936227d1c8307b2dea56267";
+    hash = "sha256-WkEgZP5Ci0mlNDGq++93v4coz36dhp+kXtlKQu1xnVM=";
   };
 
   postPatch = ''

From b0b2036d2ce4d4b2398feca4f9226800a68d4ad7 Mon Sep 17 00:00:00 2001
From: Dominic <email@dwrege.de>
Date: Wed, 20 Aug 2025 00:33:36 +0200
Subject: [PATCH 2190/3724] librewolf-unwrapped: 141.0.3-1 -> 142.0.1

firefox upstream release notes: https://www.firefox.com/en-US/firefox/142.0/releasenotes/

Security advisory: https://www.mozilla.org/en-US/security/advisories/mfsa2025-64/

Fixes:

    CVE-2025-9179
    CVE-2025-9180
    CVE-2025-9181
    (CVE-2025-9186 Android-only)
    CVE-2025-9182
    CVE-2025-9183
    CVE-2025-9187
    CVE-2025-9184
    CVE-2025-9185
---
 .../networking/browsers/librewolf/src.json             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
index a9de719fdb7a..ac3afeac899e 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "141.0.3-1",
+  "packageVersion": "142.0-1",
   "source": {
-    "rev": "141.0.3-1",
-    "hash": "sha256-0SosHE51IkDyg37fHnlJKn7IbMwr1iSXHr5Wuv2WkPg="
+    "rev": "142.0-1",
+    "hash": "sha256-/bn9xeDxnJCQol/E8rhS8RVhpUj7UN+QScSIzLFnZ/o="
   },
   "firefox": {
-    "version": "141.0.3",
-    "hash": "sha512-tmCwGIQMQaJUc0tIR6eR8an9L3Lb6oJepZcf0LMmmkPx9L4cz0pT94Cba5g5j04EoULlf4iC1lkLq2Nu91AC9g=="
+    "version": "142.0",
+    "hash": "sha512-sMHHZgg6MKkrd9zxalhNn7NBzYEdIcOjTaTNDXFP1q3HO2CAktZgWGl7xFYvqsxEhZFT5J/9624U4Fnlny6iRg=="
   }
 }

From cabc16dc599da7ca2b320fafe80e256d0dfa5b94 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 20 Aug 2025 17:48:26 +0200
Subject: [PATCH 2191/3724] maintainers: drop `drupol` from the PHP team and
 packages

---
 ci/OWNERS                                           | 13 ++++++-------
 maintainers/team-list.nix                           |  1 -
 nixos/tests/drupal.nix                              |  1 -
 pkgs/build-support/php/pkgs/composer-phar.nix       |  2 +-
 .../by-name/co/composer-require-checker/package.nix |  2 +-
 pkgs/by-name/dr/drupal/package.nix                  |  1 -
 pkgs/by-name/ph/phel/package.nix                    |  2 +-
 pkgs/by-name/ph/phpdocumentor/package.nix           |  2 +-
 pkgs/by-name/sy/symfony-cli/package.nix             |  2 +-
 .../composer-local-repo-plugin/default.nix          |  2 +-
 .../php-packages/cyclonedx-php-composer/default.nix |  2 +-
 pkgs/development/php-packages/meminfo/default.nix   |  2 +-
 pkgs/development/php-packages/spx/default.nix       |  2 +-
 13 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index a5fdf4b4e8e5..d33224713c37 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -370,13 +370,12 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/applications/editors/vscode/extensions
 
 # PHP interpreter, packages, extensions, tests and documentation
-/doc/languages-frameworks/php.section.md          @aanderse @drupol @globin @ma27 @talyz
-/nixos/tests/php                                  @aanderse @drupol @globin @ma27 @talyz
-/pkgs/build-support/php/build-pecl.nix            @aanderse @drupol @globin @ma27 @talyz
-/pkgs/build-support/php                                     @drupol
-/pkgs/development/interpreters/php       @jtojnar @aanderse @drupol @globin @ma27 @talyz
-/pkgs/development/php-packages                    @aanderse @drupol @globin @ma27 @talyz
-/pkgs/top-level/php-packages.nix         @jtojnar @aanderse @drupol @globin @ma27 @talyz
+/doc/languages-frameworks/php.section.md          @aanderse @globin @ma27 @talyz
+/nixos/tests/php                                  @aanderse @globin @ma27 @talyz
+/pkgs/build-support/php/build-pecl.nix            @aanderse @globin @ma27 @talyz
+/pkgs/development/interpreters/php       @jtojnar @aanderse @globin @ma27 @talyz
+/pkgs/development/php-packages                    @aanderse @globin @ma27 @talyz
+/pkgs/top-level/php-packages.nix         @jtojnar @aanderse @globin @ma27 @talyz
 
 # Docker tools
 /pkgs/build-support/docker                   @roberth
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 6cbbf8f719e1..d954ae67ccd4 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -1023,7 +1023,6 @@ with lib.maintainers;
   php = {
     members = [
       aanderse
-      drupol
       ma27
       piotrkwiecinski
       talyz
diff --git a/nixos/tests/drupal.nix b/nixos/tests/drupal.nix
index 894cceb678d8..6c143e00de01 100644
--- a/nixos/tests/drupal.nix
+++ b/nixos/tests/drupal.nix
@@ -51,7 +51,6 @@ in
 {
   name = "drupal";
   meta.maintainers = [
-    lib.maintainers.drupol
     lib.maintainers.OulipianSummer
   ];
 
diff --git a/pkgs/build-support/php/pkgs/composer-phar.nix b/pkgs/build-support/php/pkgs/composer-phar.nix
index b07c25beec55..90884d9a5256 100644
--- a/pkgs/build-support/php/pkgs/composer-phar.nix
+++ b/pkgs/build-support/php/pkgs/composer-phar.nix
@@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://getcomposer.org/";
     license = lib.licenses.mit;
     mainProgram = "composer";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix
index a9e200dc1a5f..4e0d8460ad77 100644
--- a/pkgs/by-name/co/composer-require-checker/package.nix
+++ b/pkgs/by-name/co/composer-require-checker/package.nix
@@ -27,7 +27,7 @@ php.buildComposerProject2 (finalAttrs: {
     homepage = "https://github.com/maglnet/ComposerRequireChecker/";
     changelog = "https://github.com/maglnet/ComposerRequireChecker/releases/tag/${finalAttrs.version}";
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "composer-require-checker";
   };
 })
diff --git a/pkgs/by-name/dr/drupal/package.nix b/pkgs/by-name/dr/drupal/package.nix
index 035f56694a78..057b85fc6a79 100644
--- a/pkgs/by-name/dr/drupal/package.nix
+++ b/pkgs/by-name/dr/drupal/package.nix
@@ -39,7 +39,6 @@ php.buildComposerProject2 (finalAttrs: {
     license = lib.licenses.mit;
     homepage = "https://drupal.org/";
     maintainers = with lib.maintainers; [
-      drupol
       OulipianSummer
     ];
     platforms = php.meta.platforms;
diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix
index 6dc91e2276f4..d804ecd31740 100644
--- a/pkgs/by-name/ph/phel/package.nix
+++ b/pkgs/by-name/ph/phel/package.nix
@@ -28,6 +28,6 @@ php.buildComposerProject2 (finalAttrs: {
     homepage = "https://github.com/phel-lang/phel-lang";
     license = lib.licenses.mit;
     mainProgram = "phel";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix
index bc19bf28c7d1..5cc8ee5c88be 100644
--- a/pkgs/by-name/ph/phpdocumentor/package.nix
+++ b/pkgs/by-name/ph/phpdocumentor/package.nix
@@ -40,6 +40,6 @@ php.buildComposerProject2 (finalAttrs: {
     homepage = "https://phpdoc.org";
     license = lib.licenses.mit;
     mainProgram = "phpdoc";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix
index 521a2f8d3ec2..a50c69b2234f 100644
--- a/pkgs/by-name/sy/symfony-cli/package.nix
+++ b/pkgs/by-name/sy/symfony-cli/package.nix
@@ -65,6 +65,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/symfony-cli/symfony-cli";
     license = lib.licenses.agpl3Plus;
     mainProgram = "symfony";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/development/php-packages/composer-local-repo-plugin/default.nix b/pkgs/development/php-packages/composer-local-repo-plugin/default.nix
index d6199a568659..863937cb635c 100644
--- a/pkgs/development/php-packages/composer-local-repo-plugin/default.nix
+++ b/pkgs/development/php-packages/composer-local-repo-plugin/default.nix
@@ -27,7 +27,7 @@ php.buildComposerWithPlugin {
     homepage = "https://github.com/nix-community/composer-local-repo-plugin";
     license = lib.licenses.mit;
     mainProgram = "composer";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/php-packages/cyclonedx-php-composer/default.nix b/pkgs/development/php-packages/cyclonedx-php-composer/default.nix
index d3af20b63bc7..892cc6776231 100644
--- a/pkgs/development/php-packages/cyclonedx-php-composer/default.nix
+++ b/pkgs/development/php-packages/cyclonedx-php-composer/default.nix
@@ -27,7 +27,7 @@ php.buildComposerWithPlugin {
     homepage = "https://github.com/CycloneDX/cyclonedx-php-composer";
     license = lib.licenses.asl20;
     mainProgram = "composer";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/php-packages/meminfo/default.nix b/pkgs/development/php-packages/meminfo/default.nix
index bee2be6fd614..f6512b74a527 100644
--- a/pkgs/development/php-packages/meminfo/default.nix
+++ b/pkgs/development/php-packages/meminfo/default.nix
@@ -24,6 +24,6 @@ buildPecl rec {
     description = "PHP extension to get insight about memory usage";
     homepage = "https://github.com/BitOne/php-meminfo";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix
index b56996b944f7..bea2aad00759 100644
--- a/pkgs/development/php-packages/spx/default.nix
+++ b/pkgs/development/php-packages/spx/default.nix
@@ -29,6 +29,6 @@ buildPecl {
     description = "Simple & straight-to-the-point PHP profiling extension with its built-in web UI";
     homepage = "https://github.com/NoiseByNorthwest/php-spx";
     license = lib.licenses.php301;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }

From f9a47201ed5c4ed604cd66fa49e0840564f31191 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 16:15:58 +0000
Subject: [PATCH 2192/3724] nextcloud-notify_push: 1.1.0 -> 1.2.0

---
 pkgs/servers/nextcloud/notify_push.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix
index 20d597321ea4..bcd148dce727 100644
--- a/pkgs/servers/nextcloud/notify_push.nix
+++ b/pkgs/servers/nextcloud/notify_push.nix
@@ -13,22 +13,22 @@ rustPlatform.buildRustPackage rec {
   # in nixpkgs!
   # For that, check the `<dependencies>` section of `appinfo/info.xml`
   # in the app (https://github.com/nextcloud/notify_push/blob/main/appinfo/info.xml)
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "nextcloud";
     repo = "notify_push";
     tag = "v${version}";
-    hash = "sha256-mHoVNKvE4Hszi1wg9fIHjRMJp5+CIBCgUPzreJ6Jnew=";
+    hash = "sha256-zefoazreNUc3agbdeQRusYWwGNDZnC375ZlLlG+SPeg=";
   };
 
-  cargoHash = "sha256-PkRWyz4Gd2gGg9n4yChtR96QNOjEK5HNVhBwkkVjVPE=";
+  cargoHash = "sha256-+z9XaAzToLZg6/PoRigkvPVpZ/bX/t0VBR5bg3dCUVw=";
 
   passthru = rec {
     app = fetchNextcloudApp {
       appName = "notify_push";
       appVersion = version;
-      hash = "sha256-nxbmzRaW4FYmwTF27P9K7SebKYiL5KOMdyU5unif+NQ=";
+      hash = "sha256-KIgXruwYPTLmpO3bMbEcm9jlRYjqX8JgTJt5hd7QugM=";
       license = "agpl3Plus";
       homepage = "https://github.com/nextcloud/notify_push";
       url = "https://github.com/nextcloud-releases/notify_push/releases/download/v${version}/notify_push-v${version}.tar.gz";
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
 
       buildAndTestSubdir = "test_client";
 
-      cargoHash = "sha256-PkRWyz4Gd2gGg9n4yChtR96QNOjEK5HNVhBwkkVjVPE=";
+      cargoHash = "sha256-+z9XaAzToLZg6/PoRigkvPVpZ/bX/t0VBR5bg3dCUVw=";
 
       meta = meta // {
         mainProgram = "test_client";

From bc36d3ac4359eb0d5ead3957122cc7b3a789f0f5 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 20 Aug 2025 17:53:04 +0200
Subject: [PATCH 2193/3724] maintainers: drop `drupol`

---
 nixos/modules/programs/projecteur.nix              |  1 -
 nixos/modules/services/databases/chromadb.nix      |  2 +-
 nixos/modules/services/misc/docling-serve.nix      |  2 +-
 nixos/modules/services/misc/litellm.nix            |  2 +-
 nixos/modules/services/misc/orthanc.nix            |  2 +-
 nixos/modules/services/search/tika.nix             |  2 +-
 nixos/modules/services/web-apps/fider.nix          |  1 -
 nixos/modules/services/web-apps/glance.nix         |  2 +-
 nixos/modules/services/web-apps/honk.nix           |  2 +-
 .../services/web-apps/openvscode-server.nix        |  2 +-
 nixos/tests/chromadb.nix                           |  2 +-
 nixos/tests/code-server.nix                        |  2 +-
 nixos/tests/docling-serve.nix                      |  2 +-
 nixos/tests/fider.nix                              |  1 -
 nixos/tests/glance.nix                             |  2 +-
 nixos/tests/guacamole-server.nix                   |  2 +-
 nixos/tests/honk.nix                               |  2 +-
 nixos/tests/litellm.nix                            |  2 +-
 nixos/tests/openvscode-server.nix                  |  2 +-
 nixos/tests/orthanc.nix                            |  2 +-
 nixos/tests/rebuilderd.nix                         |  2 +-
 nixos/tests/tika.nix                               |  2 +-
 .../amazonwebservices.amazon-q-vscode/default.nix  |  2 +-
 .../extensions/anweber.vscode-httpyac/default.nix  |  2 +-
 .../editors/vscode/extensions/default.nix          | 14 +++++++-------
 .../extensions/mongodb.mongodb-vscode/default.nix  |  2 +-
 .../ms-python.mypy-type-checker/default.nix        |  2 +-
 .../default.nix                                    |  2 +-
 .../default.nix                                    |  2 +-
 .../extensions/myriad-dreamin.tinymist/default.nix |  2 +-
 .../vscode/extensions/pylyzer.pylyzer/default.nix  |  2 +-
 .../robocorp.robotframework-lsp/default.nix        |  2 +-
 .../extensions/saoudrizwan.claude-dev/default.nix  |  2 +-
 .../extensions/tekumara.typos-vscode/default.nix   |  2 +-
 .../extensions/visualjj.visualjj/default.nix       |  2 +-
 pkgs/by-name/ap/apache-orc/package.nix             |  2 +-
 pkgs/by-name/ap/aporetic-bin/package.nix           |  1 -
 pkgs/by-name/as/asciinema-automation/package.nix   |  2 +-
 pkgs/by-name/ba/bashly/package.nix                 |  2 +-
 pkgs/by-name/cm/cmph/package.nix                   |  2 +-
 pkgs/by-name/de/departure-mono/package.nix         |  2 +-
 pkgs/by-name/de/deskreen/package.nix               |  1 -
 pkgs/by-name/du/dura/package.nix                   |  2 +-
 pkgs/by-name/et/etlegacy-assets/package.nix        |  2 +-
 pkgs/by-name/et/etlegacy-unwrapped/package.nix     |  1 -
 pkgs/by-name/et/etlegacy/package.nix               |  1 -
 pkgs/by-name/ex/excalifont/package.nix             |  2 +-
 pkgs/by-name/fc/fcast-client/package.nix           |  2 +-
 pkgs/by-name/fg/fg-virgil/package.nix              |  2 +-
 pkgs/by-name/fi/fider/package.nix                  |  1 -
 pkgs/by-name/ga/garamond-libre/package.nix         |  2 +-
 pkgs/by-name/gh/ghmap/package.nix                  |  2 +-
 pkgs/by-name/gi/github-mcp-server/package.nix      |  2 +-
 pkgs/by-name/gu/guacamole-client/package.nix       |  2 +-
 pkgs/by-name/gu/guacamole-server/package.nix       |  2 +-
 pkgs/by-name/he/hedgedoc-cli/package.nix           |  2 +-
 pkgs/by-name/ht/httpyac/package.nix                |  2 +-
 pkgs/by-name/hu/hubot-sans/package.nix             |  2 +-
 pkgs/by-name/io/ioquake3/package.nix               |  1 -
 pkgs/by-name/is/issue2md/package.nix               |  2 +-
 pkgs/by-name/le/lexbor/package.nix                 |  2 +-
 pkgs/by-name/lo/loguru/package.nix                 |  2 +-
 pkgs/by-name/ma/mathemagix/package.nix             |  2 +-
 pkgs/by-name/mc/mcphost/package.nix                |  2 +-
 pkgs/by-name/mo/mona-sans/package.nix              |  2 +-
 pkgs/by-name/mo/mongodb-ce/package.nix             |  2 +-
 pkgs/by-name/ne/newcomputermodern/package.nix      |  2 +-
 pkgs/by-name/nh/nh/package.nix                     |  1 -
 pkgs/by-name/op/open-pdf-sign/package.nix          |  2 +-
 pkgs/by-name/op/open-webui/package.nix             |  1 -
 pkgs/by-name/op/openarena/package.nix              |  1 -
 pkgs/by-name/or/orthanc-framework/package.nix      |  2 +-
 .../by-name/or/orthanc-plugin-dicomweb/package.nix |  1 -
 pkgs/by-name/or/orthanc/package.nix                |  2 +-
 pkgs/by-name/pa/pack/package.nix                   |  2 +-
 pkgs/by-name/pr/prettypst/package.nix              |  2 +-
 pkgs/by-name/ra/rabbit/package.nix                 |  2 +-
 pkgs/by-name/re/rebuilderd/package.nix             |  2 +-
 pkgs/by-name/re/repro-env/package.nix              |  2 +-
 pkgs/by-name/ro/robo/package.nix                   |  2 +-
 pkgs/by-name/ru/runmd/package.nix                  |  2 +-
 pkgs/by-name/sb/sbom4python/package.nix            |  2 +-
 pkgs/by-name/ty/typst/package.nix                  |  1 -
 pkgs/by-name/ty/typstwriter/package.nix            |  2 +-
 pkgs/by-name/ty/typstyle/package.nix               |  1 -
 pkgs/by-name/ur/urbanterror/package.nix            |  4 +---
 pkgs/by-name/uu/uutils-diffutils/package.nix       |  2 +-
 pkgs/by-name/uu/uutils-findutils/package.nix       |  1 -
 .../python-modules/attrs-strict/default.nix        |  2 +-
 .../azure-ai-documentintelligence/default.nix      |  2 +-
 .../python-modules/backrefs/default.nix            |  2 +-
 pkgs/development/python-modules/captum/default.nix |  2 +-
 .../python-modules/cffconvert/default.nix          |  2 +-
 pkgs/development/python-modules/cobble/default.nix |  2 +-
 .../python-modules/deepsearch-toolkit/default.nix  |  2 +-
 .../python-modules/docling-core/default.nix        |  2 +-
 .../python-modules/docling-ibm-models/default.nix  |  2 +-
 .../python-modules/docling-parse/default.nix       |  2 +-
 .../python-modules/docling-serve/default.nix       |  2 +-
 .../python-modules/firecrawl-py/default.nix        |  2 +-
 pkgs/development/python-modules/funk/default.nix   |  2 +-
 pkgs/development/python-modules/gawd/default.nix   |  2 +-
 .../gcp-storage-emulator/default.nix               |  2 +-
 .../python-modules/gitingest/default.nix           |  2 +-
 .../python-modules/langchain-aws/default.nix       |  1 -
 .../langgraph-checkpoint-postgres/default.nix      |  1 -
 .../langgraph-checkpoint-sqlite/default.nix        |  1 -
 .../langgraph-checkpoint/default.nix               |  1 -
 .../python-modules/lib4package/default.nix         |  2 +-
 .../development/python-modules/mammoth/default.nix |  2 +-
 .../markdown-inline-graphviz/default.nix           |  2 +-
 .../python-modules/markitdown/default.nix          |  2 +-
 pkgs/development/python-modules/marko/default.nix  |  2 +-
 .../mean-average-precision/default.nix             |  2 +-
 .../python-modules/mkdocs-backlinks/default.nix    |  2 +-
 .../mkdocs-build-plantuml/default.nix              |  2 +-
 .../python-modules/mkdocs-drawio-file/default.nix  |  2 +-
 .../python-modules/mkdocs-graphviz/default.nix     |  2 +-
 .../python-modules/mkdocs-markmap/default.nix      |  2 +-
 .../python-modules/mkdocs-puml/default.nix         |  2 +-
 .../python-modules/monkeytype/default.nix          |  2 +-
 .../python-modules/objprint/default.nix            |  2 +-
 .../python-modules/plotille/default.nix            |  2 +-
 .../python-modules/precisely/default.nix           |  2 +-
 pkgs/development/python-modules/primp/default.nix  |  2 +-
 pkgs/development/python-modules/pygelf/default.nix |  2 +-
 .../pygments-style-github/default.nix              |  2 +-
 pkgs/development/python-modules/pyorc/default.nix  |  2 +-
 .../python-modules/pyroaring/default.nix           |  2 +-
 .../python-modules/pytest-kafka/default.nix        |  2 +-
 .../pytest-shared-session-scope/default.nix        |  2 +-
 .../python-modules/pytorch-bench/default.nix       |  2 +-
 .../python-modules/sbom2dot/default.nix            |  2 +-
 .../python-modules/sbom4files/default.nix          |  2 +-
 pkgs/development/python-modules/sismic/default.nix |  2 +-
 .../python-modules/sotabenchapi/default.nix        |  2 +-
 .../sphinxcontrib-mscgen/default.nix               |  2 +-
 .../python-modules/submitit/default.nix            |  2 +-
 .../python-modules/swh-auth/default.nix            |  2 +-
 .../python-modules/swh-core/default.nix            |  2 +-
 .../python-modules/swh-export/default.nix          |  2 +-
 .../python-modules/swh-journal/default.nix         |  2 +-
 .../python-modules/swh-model/default.nix           |  2 +-
 .../python-modules/swh-objstorage/default.nix      |  2 +-
 .../python-modules/swh-perfecthash/default.nix     |  2 +-
 .../python-modules/swh-scanner/default.nix         |  2 +-
 .../python-modules/swh-scheduler/default.nix       |  2 +-
 .../python-modules/swh-storage/default.nix         |  2 +-
 .../python-modules/swh-web-client/default.nix      |  2 +-
 .../development/python-modules/tempman/default.nix |  2 +-
 .../python-modules/torchbench/default.nix          |  2 +-
 .../python-modules/torchprofile/default.nix        |  2 +-
 .../python-modules/xhtml2pdf/default.nix           |  2 +-
 pkgs/os-specific/linux/evdi/default.nix            |  2 +-
 pkgs/os-specific/linux/projecteur/default.nix      |  1 -
 .../monitoring/prometheus/shelly-exporter.nix      |  2 +-
 156 files changed, 141 insertions(+), 164 deletions(-)

diff --git a/nixos/modules/programs/projecteur.nix b/nixos/modules/programs/projecteur.nix
index 7c96403a1f29..01e8d71dd124 100644
--- a/nixos/modules/programs/projecteur.nix
+++ b/nixos/modules/programs/projecteur.nix
@@ -22,7 +22,6 @@ in
   meta = {
     maintainers = with lib.maintainers; [
       benneti
-      drupol
     ];
   };
 }
diff --git a/nixos/modules/services/databases/chromadb.nix b/nixos/modules/services/databases/chromadb.nix
index d8d60078cf45..6610f58ec73e 100644
--- a/nixos/modules/services/databases/chromadb.nix
+++ b/nixos/modules/services/databases/chromadb.nix
@@ -17,7 +17,7 @@ let
 in
 {
 
-  meta.maintainers = with lib.maintainers; [ drupol ];
+  meta.maintainers = with lib.maintainers; [ ];
 
   options = {
     services.chromadb = {
diff --git a/nixos/modules/services/misc/docling-serve.nix b/nixos/modules/services/misc/docling-serve.nix
index 0a1ac874e04a..2d4fd4a6a1c0 100644
--- a/nixos/modules/services/misc/docling-serve.nix
+++ b/nixos/modules/services/misc/docling-serve.nix
@@ -127,5 +127,5 @@ in
     networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
   };
 
-  meta.maintainers = with lib.maintainers; [ drupol ];
+  meta.maintainers = with lib.maintainers; [ ];
 }
diff --git a/nixos/modules/services/misc/litellm.nix b/nixos/modules/services/misc/litellm.nix
index 621d7e9542cf..4b43768da61d 100644
--- a/nixos/modules/services/misc/litellm.nix
+++ b/nixos/modules/services/misc/litellm.nix
@@ -178,5 +178,5 @@ in
     networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
   };
 
-  meta.maintainers = with lib.maintainers; [ drupol ];
+  meta.maintainers = with lib.maintainers; [ ];
 }
diff --git a/nixos/modules/services/misc/orthanc.nix b/nixos/modules/services/misc/orthanc.nix
index d1a8f97ac006..69543c41ead8 100644
--- a/nixos/modules/services/misc/orthanc.nix
+++ b/nixos/modules/services/misc/orthanc.nix
@@ -130,5 +130,5 @@ in
     time.timeZone = lib.mkDefault "UTC";
   };
 
-  meta.maintainers = with lib.maintainers; [ drupol ];
+  meta.maintainers = with lib.maintainers; [ ];
 }
diff --git a/nixos/modules/services/search/tika.nix b/nixos/modules/services/search/tika.nix
index 5ddd1a551e49..f72c2b081f71 100644
--- a/nixos/modules/services/search/tika.nix
+++ b/nixos/modules/services/search/tika.nix
@@ -18,7 +18,7 @@ let
     ;
 in
 {
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 
   options = {
     services.tika = {
diff --git a/nixos/modules/services/web-apps/fider.nix b/nixos/modules/services/web-apps/fider.nix
index e81bba18d7b5..5274c3f2dce1 100644
--- a/nixos/modules/services/web-apps/fider.nix
+++ b/nixos/modules/services/web-apps/fider.nix
@@ -117,7 +117,6 @@ in
 
   meta = {
     maintainers = with lib.maintainers; [
-      drupol
       niklaskorz
     ];
     # doc = ./fider.md;
diff --git a/nixos/modules/services/web-apps/glance.nix b/nixos/modules/services/web-apps/glance.nix
index 4f96b550fb6e..bfa5670650dd 100644
--- a/nixos/modules/services/web-apps/glance.nix
+++ b/nixos/modules/services/web-apps/glance.nix
@@ -237,5 +237,5 @@ in
   };
 
   meta.doc = ./glance.md;
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/services/web-apps/honk.nix b/nixos/modules/services/web-apps/honk.nix
index 15d8b5acc3b2..7fc1f38240ec 100644
--- a/nixos/modules/services/web-apps/honk.nix
+++ b/nixos/modules/services/web-apps/honk.nix
@@ -152,7 +152,7 @@ in
   };
 
   meta = {
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     doc = ./honk.md;
   };
 }
diff --git a/nixos/modules/services/web-apps/openvscode-server.nix b/nixos/modules/services/web-apps/openvscode-server.nix
index e315729b8153..db9931d8247c 100644
--- a/nixos/modules/services/web-apps/openvscode-server.nix
+++ b/nixos/modules/services/web-apps/openvscode-server.nix
@@ -232,5 +232,5 @@ in
     users.groups."${defaultGroup}" = lib.mkIf (cfg.group == defaultGroup) { };
   };
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/chromadb.nix b/nixos/tests/chromadb.nix
index be04d10e74de..de8454d5d131 100644
--- a/nixos/tests/chromadb.nix
+++ b/nixos/tests/chromadb.nix
@@ -6,7 +6,7 @@ let
 in
 {
   name = "chromadb";
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 
   nodes = {
     machine =
diff --git a/nixos/tests/code-server.nix b/nixos/tests/code-server.nix
index e4c9c8397740..25a0f56b70ec 100644
--- a/nixos/tests/code-server.nix
+++ b/nixos/tests/code-server.nix
@@ -20,5 +20,5 @@
     machine.succeed("curl -k --fail http://localhost:4444", timeout=10)
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/docling-serve.nix b/nixos/tests/docling-serve.nix
index ff31e003283b..d1636c0210c5 100644
--- a/nixos/tests/docling-serve.nix
+++ b/nixos/tests/docling-serve.nix
@@ -5,7 +5,7 @@ in
 {
   name = "docling-serve";
   meta = with lib.maintainers; {
-    maintainers = [ drupol ];
+    maintainers = [ ];
   };
 
   nodes = {
diff --git a/nixos/tests/fider.nix b/nixos/tests/fider.nix
index 6db4777ce2bd..f27727750844 100644
--- a/nixos/tests/fider.nix
+++ b/nixos/tests/fider.nix
@@ -27,7 +27,6 @@
   '';
 
   meta.maintainers = with lib.maintainers; [
-    drupol
     niklaskorz
   ];
 }
diff --git a/nixos/tests/glance.nix b/nixos/tests/glance.nix
index 254173e1eb71..dce1c29a4f06 100644
--- a/nixos/tests/glance.nix
+++ b/nixos/tests/glance.nix
@@ -80,5 +80,5 @@
     assert location == "Nivelles, Belgium"
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/guacamole-server.nix b/nixos/tests/guacamole-server.nix
index 280742f5ad0b..5bd6a0bc7d33 100644
--- a/nixos/tests/guacamole-server.nix
+++ b/nixos/tests/guacamole-server.nix
@@ -19,5 +19,5 @@
     machine.wait_for_open_port(4822)
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/honk.nix b/nixos/tests/honk.nix
index bc552f6dff40..c455fff8ecfd 100644
--- a/nixos/tests/honk.nix
+++ b/nixos/tests/honk.nix
@@ -30,5 +30,5 @@
     machine.wait_for_open_port(8080)
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/litellm.nix b/nixos/tests/litellm.nix
index 96d67f9521a0..12fb24aba4cd 100644
--- a/nixos/tests/litellm.nix
+++ b/nixos/tests/litellm.nix
@@ -22,6 +22,6 @@ in
   '';
 
   meta = with lib.maintainers; {
-    maintainers = [ drupol ];
+    maintainers = [ ];
   };
 }
diff --git a/nixos/tests/openvscode-server.nix b/nixos/tests/openvscode-server.nix
index 89d3817b2cf3..a0693176943a 100644
--- a/nixos/tests/openvscode-server.nix
+++ b/nixos/tests/openvscode-server.nix
@@ -20,5 +20,5 @@
     machine.succeed("curl -k --fail http://localhost:3000", timeout=10)
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/orthanc.nix b/nixos/tests/orthanc.nix
index 127568942de9..c2583effb4de 100644
--- a/nixos/tests/orthanc.nix
+++ b/nixos/tests/orthanc.nix
@@ -23,5 +23,5 @@
     machine.wait_for_open_port(4242)
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/rebuilderd.nix b/nixos/tests/rebuilderd.nix
index 9f168e9d8974..9b0788f7d2a9 100644
--- a/nixos/tests/rebuilderd.nix
+++ b/nixos/tests/rebuilderd.nix
@@ -34,5 +34,5 @@
     machine_custom_config.wait_for_open_port(1234)
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/tika.nix b/nixos/tests/tika.nix
index 39cd3ec33c41..15fe65960299 100644
--- a/nixos/tests/tika.nix
+++ b/nixos/tests/tika.nix
@@ -19,5 +19,5 @@
     machine.wait_for_open_port(9998)
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
index 4a908685ec8d..419127692d0a 100644
--- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
@@ -17,6 +17,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode";
     homepage = "https://github.com/aws/aws-toolkit-vscode";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/applications/editors/vscode/extensions/anweber.vscode-httpyac/default.nix b/pkgs/applications/editors/vscode/extensions/anweber.vscode-httpyac/default.nix
index 7d897a5fd8d1..8403ac814a43 100644
--- a/pkgs/applications/editors/vscode/extensions/anweber.vscode-httpyac/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anweber.vscode-httpyac/default.nix
@@ -23,6 +23,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=anweber.vscode-httpyac";
     homepage = "https://github.com/AnWeber/vscode-httpyac/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 151db564e6dd..4c9692ebb5ef 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -749,7 +749,7 @@ let
           description = "PHP code intelligence for Visual Studio Code";
           license = lib.licenses.unfree;
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmewburn.vscode-intelephense-client";
-          maintainers = [ lib.maintainers.drupol ];
+          maintainers = [ ];
         };
       };
 
@@ -978,7 +978,7 @@ let
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=chris-hayes.chatgpt-reborn";
           homepage = "https://github.com/christopher-hayes/vscode-chatgpt-reborn";
           license = lib.licenses.isc;
-          maintainers = [ lib.maintainers.drupol ];
+          maintainers = [ ];
         };
         mktplcRef = {
           name = "chatgpt-reborn";
@@ -1028,7 +1028,7 @@ let
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=coder.coder-remote";
           homepage = "https://github.com/coder/vscode-coder";
           license = lib.licenses.mit;
-          maintainers = [ lib.maintainers.drupol ];
+          maintainers = [ ];
         };
       };
 
@@ -1966,7 +1966,7 @@ let
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=genieai.chatgpt-vscode";
           homepage = "https://github.com/ai-genie/chatgpt-vscode";
           license = lib.licenses.isc;
-          maintainers = [ lib.maintainers.drupol ];
+          maintainers = [ ];
         };
         mktplcRef = {
           name = "chatgpt-vscode";
@@ -2025,7 +2025,7 @@ let
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=github.vscode-github-actions";
           homepage = "https://github.com/github/vscode-github-actions";
           license = lib.licenses.mit;
-          maintainers = [ lib.maintainers.drupol ];
+          maintainers = [ ];
         };
       };
 
@@ -2149,7 +2149,7 @@ let
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=griimick.vhs";
           homepage = "https://github.com/griimick/vscode-vhs";
           license = lib.licenses.mit;
-          maintainers = [ lib.maintainers.drupol ];
+          maintainers = [ ];
         };
       };
 
@@ -4635,7 +4635,7 @@ let
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=Tailscale.vscode-tailscale";
           homepage = "https://github.com/tailscale-dev/vscode-tailscale";
           license = lib.licenses.mit;
-          maintainers = [ lib.maintainers.drupol ];
+          maintainers = [ ];
         };
       };
 
diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
index 7d00d71b9ab4..00686d1a12bb 100644
--- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
@@ -14,6 +14,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=mongodb.mongodb-vscode";
     homepage = "https://github.com/mongodb-js/vscode";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix
index 31ba7b47435b..2b64ededde1e 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix
@@ -17,6 +17,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.mypy-type-checker";
     homepage = "https://github.com/microsoft/vscode-mypy";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.vscode-remote-extensionpack/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.vscode-remote-extensionpack/default.nix
index 6543e905f64b..feac9ec1b2a1 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.vscode-remote-extensionpack/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.vscode-remote-extensionpack/default.nix
@@ -15,6 +15,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     description = "Visual Studio Code extension pack that lets you open any folder in a container, on a remote machine, or in WSL and take advantage of VS Code's full feature set";
     homepage = "https://github.com/Microsoft/vscode-remote-release";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
index 8fbf3af493e6..ed6563fb7421 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
@@ -15,6 +15,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     description = "Visual Studio Code extension to help developers and AI engineers build AI apps";
     homepage = "https://github.com/Microsoft/windows-ai-studio";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
index 4131ccb0c77c..11f1c14bf5b2 100644
--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@@ -32,6 +32,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist";
     homepage = "https://github.com/myriad-dreamin/tinymist";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix b/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix
index b360b5fbeb5f..707f7f4d8db8 100644
--- a/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix
@@ -13,6 +13,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=pylyzer.pylyzer";
     homepage = "https://github.com/mtshiba/pylyzer/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix b/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix
index 353b353d22ed..939a1de513c0 100644
--- a/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix
@@ -16,6 +16,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist";
     homepage = "https://github.com/myriad-dreamin/tinymist";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
index c4f7a92f5d4c..80de4a0bb7d3 100644
--- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@@ -16,6 +16,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://github.com/cline/cline";
     homepage = "https://github.com/cline/cline";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
index 9dd4cb4e3777..079afeaf0cc4 100644
--- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
@@ -68,6 +68,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
       "x86_64-linux"
       "x86_64-darwin"
     ];
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index b146f9026926..12956ebdfd30 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -48,6 +48,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
       "x86_64-linux"
       "x86_64-darwin"
     ];
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ap/apache-orc/package.nix b/pkgs/by-name/ap/apache-orc/package.nix
index 344a867dea46..b2c82e2872b5 100644
--- a/pkgs/by-name/ap/apache-orc/package.nix
+++ b/pkgs/by-name/ap/apache-orc/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Smallest, fastest columnar storage for Hadoop workloads";
     homepage = "https://github.com/apache/orc/";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ap/aporetic-bin/package.nix b/pkgs/by-name/ap/aporetic-bin/package.nix
index a0b62ae3f690..2186d38eb4b3 100644
--- a/pkgs/by-name/ap/aporetic-bin/package.nix
+++ b/pkgs/by-name/ap/aporetic-bin/package.nix
@@ -33,7 +33,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
       DamienCassou
-      drupol
     ];
   };
 })
diff --git a/pkgs/by-name/as/asciinema-automation/package.nix b/pkgs/by-name/as/asciinema-automation/package.nix
index abdaddde453d..de7dc64b042b 100644
--- a/pkgs/by-name/as/asciinema-automation/package.nix
+++ b/pkgs/by-name/as/asciinema-automation/package.nix
@@ -44,6 +44,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/PierreMarchand20/asciinema_automation";
     license = lib.licenses.mit;
     mainProgram = "asciinema-automation";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/ba/bashly/package.nix b/pkgs/by-name/ba/bashly/package.nix
index 8611d5938935..cf3041554ce3 100644
--- a/pkgs/by-name/ba/bashly/package.nix
+++ b/pkgs/by-name/ba/bashly/package.nix
@@ -17,7 +17,7 @@ bundlerApp {
     homepage = "https://github.com/DannyBen/bashly";
     license = lib.licenses.mit;
     mainProgram = "bashly";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/cm/cmph/package.nix b/pkgs/by-name/cm/cmph/package.nix
index 9b4b5ef8c0bc..42cda24f7625 100644
--- a/pkgs/by-name/cm/cmph/package.nix
+++ b/pkgs/by-name/cm/cmph/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
       mpl11
     ];
     mainProgram = "cmph";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })
diff --git a/pkgs/by-name/de/departure-mono/package.nix b/pkgs/by-name/de/departure-mono/package.nix
index e3aefa976abc..5516d0f5d098 100644
--- a/pkgs/by-name/de/departure-mono/package.nix
+++ b/pkgs/by-name/de/departure-mono/package.nix
@@ -32,6 +32,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://departuremono.com/";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/de/deskreen/package.nix b/pkgs/by-name/de/deskreen/package.nix
index 255d9b0a309c..b8f091919bee 100644
--- a/pkgs/by-name/de/deskreen/package.nix
+++ b/pkgs/by-name/de/deskreen/package.nix
@@ -41,7 +41,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     mainProgram = "deskreen";
     maintainers = with lib.maintainers; [
       leo248
-      drupol
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/du/dura/package.nix b/pkgs/by-name/du/dura/package.nix
index 7714681b696b..c6e27d0c0a97 100644
--- a/pkgs/by-name/du/dura/package.nix
+++ b/pkgs/by-name/du/dura/package.nix
@@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/tkellogg/dura";
     license = licenses.asl20;
-    maintainers = with maintainers; [ drupol ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/et/etlegacy-assets/package.nix b/pkgs/by-name/et/etlegacy-assets/package.nix
index 3fc776a80ee1..82a397798d94 100644
--- a/pkgs/by-name/et/etlegacy-assets/package.nix
+++ b/pkgs/by-name/et/etlegacy-assets/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
       for the popular online FPS game Wolfenstein: Enemy Territory - whose
       gameplay is still considered unmatched by many, despite its great age.
     '';
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
index c5d7ef2b9235..b9e18dee9b2c 100644
--- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix
+++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
@@ -117,7 +117,6 @@ stdenv.mkDerivation {
     '';
     maintainers = with lib.maintainers; [
       ashleyghooper
-      drupol
     ];
   };
 }
diff --git a/pkgs/by-name/et/etlegacy/package.nix b/pkgs/by-name/et/etlegacy/package.nix
index c2f225a73471..82831ad81481 100644
--- a/pkgs/by-name/et/etlegacy/package.nix
+++ b/pkgs/by-name/et/etlegacy/package.nix
@@ -42,7 +42,6 @@ symlinkJoin {
     mainProgram = "etl";
     maintainers = with lib.maintainers; [
       ashleyghooper
-      drupol
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ex/excalifont/package.nix b/pkgs/by-name/ex/excalifont/package.nix
index 01f0c7add920..83c2eef0647a 100644
--- a/pkgs/by-name/ex/excalifont/package.nix
+++ b/pkgs/by-name/ex/excalifont/package.nix
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://plus.excalidraw.com/excalifont";
     description = "Font based on the original handwritten Virgil font carefully curated to improve legibility while preserving its hand-drawn nature";
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     license = lib.licenses.ofl;
   };
 })
diff --git a/pkgs/by-name/fc/fcast-client/package.nix b/pkgs/by-name/fc/fcast-client/package.nix
index c04a16675092..d4750afa4cb4 100644
--- a/pkgs/by-name/fc/fcast-client/package.nix
+++ b/pkgs/by-name/fc/fcast-client/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
       receiver devices or integrate the FCast protocol into their own apps.
     '';
     mainProgram = "fcast";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/fg/fg-virgil/package.nix b/pkgs/by-name/fg/fg-virgil/package.nix
index 793ade9d99f6..698c81c547b3 100644
--- a/pkgs/by-name/fg/fg-virgil/package.nix
+++ b/pkgs/by-name/fg/fg-virgil/package.nix
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/excalidraw/virgil";
     description = "Font that powers Excalidraw";
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     license = lib.licenses.ofl;
   };
 })
diff --git a/pkgs/by-name/fi/fider/package.nix b/pkgs/by-name/fi/fider/package.nix
index 20c46a97d6ac..fb0b1fd9ede2 100644
--- a/pkgs/by-name/fi/fider/package.nix
+++ b/pkgs/by-name/fi/fider/package.nix
@@ -76,7 +76,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.agpl3Only;
     mainProgram = "fider";
     maintainers = with lib.maintainers; [
-      drupol
       niklaskorz
     ];
   };
diff --git a/pkgs/by-name/ga/garamond-libre/package.nix b/pkgs/by-name/ga/garamond-libre/package.nix
index 68b66f90fee2..4069de4d101a 100644
--- a/pkgs/by-name/ga/garamond-libre/package.nix
+++ b/pkgs/by-name/ga/garamond-libre/package.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/dbenjaminmiller/garamond-libre";
     description = "Garamond Libre font family";
-    maintainers = with maintainers; [ drupol ];
+    maintainers = with maintainers; [ ];
     license = licenses.x11;
     platforms = platforms.all;
   };
diff --git a/pkgs/by-name/gh/ghmap/package.nix b/pkgs/by-name/gh/ghmap/package.nix
index 5e55b3069696..407a1397c96b 100644
--- a/pkgs/by-name/gh/ghmap/package.nix
+++ b/pkgs/by-name/gh/ghmap/package.nix
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec {
     description = "Python tool for mapping GitHub events to contributor activities";
     homepage = "https://github.com/uhourri/ghmap";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "ghmap";
   };
 }
diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix
index 8472ab13e32b..5c710851b830 100644
--- a/pkgs/by-name/gi/github-mcp-server/package.nix
+++ b/pkgs/by-name/gi/github-mcp-server/package.nix
@@ -38,6 +38,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/github/github-mcp-server";
     license = lib.licenses.mit;
     mainProgram = "github-mcp-server";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/gu/guacamole-client/package.nix b/pkgs/by-name/gu/guacamole-client/package.nix
index e3d2ea9b51be..f021c16eb1e3 100644
--- a/pkgs/by-name/gu/guacamole-client/package.nix
+++ b/pkgs/by-name/gu/guacamole-client/package.nix
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Clientless remote desktop gateway";
     homepage = "https://guacamole.apache.org/";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
     platforms = [
       "x86_64-linux"
       "i686-linux"
diff --git a/pkgs/by-name/gu/guacamole-server/package.nix b/pkgs/by-name/gu/guacamole-server/package.nix
index 196924749629..c9c7fefe3ae0 100644
--- a/pkgs/by-name/gu/guacamole-server/package.nix
+++ b/pkgs/by-name/gu/guacamole-server/package.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://guacamole.apache.org/";
     license = lib.licenses.asl20;
     mainProgram = "guacd";
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
     platforms = [
       "x86_64-linux"
       "i686-linux"
diff --git a/pkgs/by-name/he/hedgedoc-cli/package.nix b/pkgs/by-name/he/hedgedoc-cli/package.nix
index 8585407a45d3..72fcaac474bf 100644
--- a/pkgs/by-name/he/hedgedoc-cli/package.nix
+++ b/pkgs/by-name/he/hedgedoc-cli/package.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/hedgedoc/cli";
     license = lib.licenses.agpl3Only;
     mainProgram = "hedgedoc-cli";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/ht/httpyac/package.nix b/pkgs/by-name/ht/httpyac/package.nix
index df8d7f93362d..ece9ca1cab3b 100644
--- a/pkgs/by-name/ht/httpyac/package.nix
+++ b/pkgs/by-name/ht/httpyac/package.nix
@@ -34,7 +34,7 @@ buildNpmPackage rec {
     homepage = "https://github.com/anweber/httpyac";
     license = lib.licenses.mit;
     mainProgram = "httpyac";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/hu/hubot-sans/package.nix b/pkgs/by-name/hu/hubot-sans/package.nix
index de93d39b075e..5fc0ba0f47ce 100644
--- a/pkgs/by-name/hu/hubot-sans/package.nix
+++ b/pkgs/by-name/hu/hubot-sans/package.nix
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       of a typeface to be incorporated into one single file, and are supported
       by all major browsers.
     '';
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/io/ioquake3/package.nix b/pkgs/by-name/io/ioquake3/package.nix
index 5e659b2e3404..7565199dc9e6 100644
--- a/pkgs/by-name/io/ioquake3/package.nix
+++ b/pkgs/by-name/io/ioquake3/package.nix
@@ -128,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "ioquake3";
     maintainers = with lib.maintainers; [
       abbradar
-      drupol
       rvolosatovs
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/is/issue2md/package.nix b/pkgs/by-name/is/issue2md/package.nix
index 1333d2d936e8..fa57938ea476 100644
--- a/pkgs/by-name/is/issue2md/package.nix
+++ b/pkgs/by-name/is/issue2md/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     description = "CLI tool to convert GitHub issue into Markdown file";
     homepage = "https://github.com/bigwhite/issue2md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "issue2md";
   };
 })
diff --git a/pkgs/by-name/le/lexbor/package.nix b/pkgs/by-name/le/lexbor/package.nix
index a10068899b83..f7a54bb353a0 100644
--- a/pkgs/by-name/le/lexbor/package.nix
+++ b/pkgs/by-name/le/lexbor/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/lexbor/lexbor";
     changelog = "https://github.com/lexbor/lexbor/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "lexbor";
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/lo/loguru/package.nix b/pkgs/by-name/lo/loguru/package.nix
index 84fe218859c7..0077135547d1 100644
--- a/pkgs/by-name/lo/loguru/package.nix
+++ b/pkgs/by-name/lo/loguru/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     description = "Lightweight C++ logging library";
     homepage = "https://github.com/emilk/loguru";
     license = lib.licenses.unlicense;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ma/mathemagix/package.nix b/pkgs/by-name/ma/mathemagix/package.nix
index 26165f55eb13..06165a100fee 100644
--- a/pkgs/by-name/ma/mathemagix/package.nix
+++ b/pkgs/by-name/ma/mathemagix/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Free computer algebra and analysis system consisting of a high level language with a compiler and a series of mathematical libraries";
     homepage = "https://www.mathemagix.org/";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/mc/mcphost/package.nix b/pkgs/by-name/mc/mcphost/package.nix
index f583d7888578..b8945c80e96c 100644
--- a/pkgs/by-name/mc/mcphost/package.nix
+++ b/pkgs/by-name/mc/mcphost/package.nix
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     description = "CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP)";
     homepage = "https://github.com/mark3labs/mcphost";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "mcphost";
   };
 })
diff --git a/pkgs/by-name/mo/mona-sans/package.nix b/pkgs/by-name/mo/mona-sans/package.nix
index c7942b3ef057..4c45eae71bd8 100644
--- a/pkgs/by-name/mo/mona-sans/package.nix
+++ b/pkgs/by-name/mo/mona-sans/package.nix
@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       by all major browsers, allowing for performance benefits and granular
       design control of the typeface's weight, width, and slant.
     '';
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix
index f3c0e0fd0339..a1d6f5c8b932 100644
--- a/pkgs/by-name/mo/mongodb-ce/package.nix
+++ b/pkgs/by-name/mo/mongodb-ce/package.nix
@@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
       This pre-compiled binary distribution package provides the MongoDB daemon (mongod) and the MongoDB Shard utility
       (mongos).
     '';
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.attrNames finalAttrs.passthru.sources;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/ne/newcomputermodern/package.nix b/pkgs/by-name/ne/newcomputermodern/package.nix
index 06ea40899539..eb7fcb7f0ebb 100644
--- a/pkgs/by-name/ne/newcomputermodern/package.nix
+++ b/pkgs/by-name/ne/newcomputermodern/package.nix
@@ -47,7 +47,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # equivalent to the LaTeX Project Public License (LPPL), version 1.3c or
     # later." - GUST website
     license = lib.licenses.lppl13c;
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix
index 358bb25f5556..5bf694b29995 100644
--- a/pkgs/by-name/nh/nh/package.nix
+++ b/pkgs/by-name/nh/nh/package.nix
@@ -67,7 +67,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.eupl12;
     mainProgram = "nh";
     maintainers = with lib.maintainers; [
-      drupol
       NotAShelf
       viperML
     ];
diff --git a/pkgs/by-name/op/open-pdf-sign/package.nix b/pkgs/by-name/op/open-pdf-sign/package.nix
index 3cbd501e7b15..923df6d2e0a6 100644
--- a/pkgs/by-name/op/open-pdf-sign/package.nix
+++ b/pkgs/by-name/op/open-pdf-sign/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Digitally sign PDF files from your commandline";
     homepage = "https://github.com/open-pdf-sign/open-pdf-sign";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.unix;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     mainProgram = "open-pdf-sign";
diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index 7b669979aa97..6fb4a2175a6b 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -246,7 +246,6 @@ python3Packages.buildPythonApplication rec {
     '';
     mainProgram = "open-webui";
     maintainers = with lib.maintainers; [
-      drupol
       shivaraj-bh
     ];
   };
diff --git a/pkgs/by-name/op/openarena/package.nix b/pkgs/by-name/op/openarena/package.nix
index 4e50dde79c47..36e90519bf0b 100644
--- a/pkgs/by-name/op/openarena/package.nix
+++ b/pkgs/by-name/op/openarena/package.nix
@@ -115,7 +115,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     mainProgram = "openarena";
     maintainers = with lib.maintainers; [
-      drupol
       wyvie
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/or/orthanc-framework/package.nix b/pkgs/by-name/or/orthanc-framework/package.nix
index e19bd8331e79..1767ce9181bd 100644
--- a/pkgs/by-name/or/orthanc-framework/package.nix
+++ b/pkgs/by-name/or/orthanc-framework/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "SDK for building Orthanc plugins and related applications";
     homepage = "https://www.orthanc-server.com/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
index e05ca1302a72..97f005210d66 100644
--- a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
+++ b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
@@ -93,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Plugin that extends Orthanc with support for the DICOMweb protocols";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
-      drupol
       dvcorreia
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/or/orthanc/package.nix b/pkgs/by-name/or/orthanc/package.nix
index 620f45361c8b..fa710876d1a9 100644
--- a/pkgs/by-name/or/orthanc/package.nix
+++ b/pkgs/by-name/or/orthanc/package.nix
@@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.orthanc-server.com/";
     license = lib.licenses.gpl3Plus;
     mainProgram = "Orthanc";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix
index 1ac1d813cbf5..2d57430ac5d5 100644
--- a/pkgs/by-name/pa/pack/package.nix
+++ b/pkgs/by-name/pa/pack/package.nix
@@ -45,6 +45,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/buildpacks/pack/";
     license = lib.licenses.asl20;
     mainProgram = "pack";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/pr/prettypst/package.nix b/pkgs/by-name/pr/prettypst/package.nix
index c02c74f503b5..aef965df3f4d 100644
--- a/pkgs/by-name/pr/prettypst/package.nix
+++ b/pkgs/by-name/pr/prettypst/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/antonWetzel/prettypst";
     license = lib.licenses.mit;
     mainProgram = "prettypst";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/ra/rabbit/package.nix b/pkgs/by-name/ra/rabbit/package.nix
index e05fc323ee84..b07920007695 100644
--- a/pkgs/by-name/ra/rabbit/package.nix
+++ b/pkgs/by-name/ra/rabbit/package.nix
@@ -80,6 +80,6 @@ python3'.pkgs.buildPythonApplication {
     homepage = "https://github.com/natarajan-chidambaram/RABBIT";
     license = lib.licenses.asl20;
     mainProgram = "rabbit";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix
index f70a08186153..04fc805c0649 100644
--- a/pkgs/by-name/re/rebuilderd/package.nix
+++ b/pkgs/by-name/re/rebuilderd/package.nix
@@ -113,7 +113,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Independent verification of binary packages - reproducible builds";
     homepage = "https://github.com/kpcyrd/rebuilderd";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "rebuilderd";
   };
 })
diff --git a/pkgs/by-name/re/repro-env/package.nix b/pkgs/by-name/re/repro-env/package.nix
index 56d319a77326..aea545054766 100644
--- a/pkgs/by-name/re/repro-env/package.nix
+++ b/pkgs/by-name/re/repro-env/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "repro-env";
   };
 })
diff --git a/pkgs/by-name/ro/robo/package.nix b/pkgs/by-name/ro/robo/package.nix
index 686150de5a62..5bb2a7c1c3b1 100644
--- a/pkgs/by-name/ro/robo/package.nix
+++ b/pkgs/by-name/ro/robo/package.nix
@@ -30,6 +30,6 @@ php82.buildComposerProject2 (finalAttrs: {
     homepage = "https://github.com/consolidation/robo";
     license = lib.licenses.mit;
     mainProgram = "robo";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/ru/runmd/package.nix b/pkgs/by-name/ru/runmd/package.nix
index 3e67dc4d0fb7..eedb5b1895c1 100644
--- a/pkgs/by-name/ru/runmd/package.nix
+++ b/pkgs/by-name/ru/runmd/package.nix
@@ -24,7 +24,7 @@ buildNpmPackage (finalAttrs: {
     homepage = "https://github.com/broofa/runmd";
     changelog = "https://github.com/broofa/runmd/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "runmd";
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/sb/sbom4python/package.nix b/pkgs/by-name/sb/sbom4python/package.nix
index 16efe8a59bca..46b2f98a9d46 100644
--- a/pkgs/by-name/sb/sbom4python/package.nix
+++ b/pkgs/by-name/sb/sbom4python/package.nix
@@ -48,6 +48,6 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/anthonyharrison/sbom4python";
     license = lib.licenses.asl20;
     mainProgram = "sbom4python";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix
index b12e685eafe6..dffa2109626d 100644
--- a/pkgs/by-name/ty/typst/package.nix
+++ b/pkgs/by-name/ty/typst/package.nix
@@ -71,7 +71,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.asl20;
     mainProgram = "typst";
     maintainers = with lib.maintainers; [
-      drupol
       figsoda
       kanashimia
       RossSmyth
diff --git a/pkgs/by-name/ty/typstwriter/package.nix b/pkgs/by-name/ty/typstwriter/package.nix
index 16ad4e47970e..31a46f054d73 100644
--- a/pkgs/by-name/ty/typstwriter/package.nix
+++ b/pkgs/by-name/ty/typstwriter/package.nix
@@ -41,6 +41,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/Bzero/typstwriter";
     license = lib.licenses.mit;
     mainProgram = "typstwriter";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix
index c46865f7bdf8..b0a4920344c4 100644
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.asl20;
     mainProgram = "typstyle";
     maintainers = with lib.maintainers; [
-      drupol
       prince213
     ];
   };
diff --git a/pkgs/by-name/ur/urbanterror/package.nix b/pkgs/by-name/ur/urbanterror/package.nix
index 9418695c9be8..c27a6a63fe40 100644
--- a/pkgs/by-name/ur/urbanterror/package.nix
+++ b/pkgs/by-name/ur/urbanterror/package.nix
@@ -115,9 +115,7 @@ stdenv.mkDerivation {
       realism". This results in a very unique, enjoyable and addictive game.
     '';
     mainProgram = "urbanterror";
-    maintainers = with lib.maintainers; [
-      drupol
-    ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/uu/uutils-diffutils/package.nix b/pkgs/by-name/uu/uutils-diffutils/package.nix
index 72e2c891ee3d..7ec5565d7ad9 100644
--- a/pkgs/by-name/uu/uutils-diffutils/package.nix
+++ b/pkgs/by-name/uu/uutils-diffutils/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/uutils/diffutils";
     license = lib.licenses.mit;
     mainProgram = "diffutils";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/uu/uutils-findutils/package.nix b/pkgs/by-name/uu/uutils-findutils/package.nix
index 3eb69c73b304..4ca34b96f303 100644
--- a/pkgs/by-name/uu/uutils-findutils/package.nix
+++ b/pkgs/by-name/uu/uutils-findutils/package.nix
@@ -45,7 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "find";
     maintainers = with lib.maintainers; [
       defelo
-      drupol
     ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/development/python-modules/attrs-strict/default.nix b/pkgs/development/python-modules/attrs-strict/default.nix
index 7657c8b72abb..cec021f15ab3 100644
--- a/pkgs/development/python-modules/attrs-strict/default.nix
+++ b/pkgs/development/python-modules/attrs-strict/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Python package which contains runtime validation for attrs data classes based on the types existing in the typing module";
     homepage = "https://github.com/bloomberg/attrs-strict";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-ai-documentintelligence/default.nix b/pkgs/development/python-modules/azure-ai-documentintelligence/default.nix
index c3547c8ad680..1742a01ddaa5 100644
--- a/pkgs/development/python-modules/azure-ai-documentintelligence/default.nix
+++ b/pkgs/development/python-modules/azure-ai-documentintelligence/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Azure AI Document Intelligence client library for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/documentintelligence/azure-ai-documentintelligence/azure/ai/documentintelligence";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/backrefs/default.nix b/pkgs/development/python-modules/backrefs/default.nix
index 2446f8379b04..ebdd250be81f 100644
--- a/pkgs/development/python-modules/backrefs/default.nix
+++ b/pkgs/development/python-modules/backrefs/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/facelessuser/backrefs";
     changelog = "https://github.com/facelessuser/backrefs/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/captum/default.nix b/pkgs/development/python-modules/captum/default.nix
index a39f00634ac4..c4db2ba36bb2 100644
--- a/pkgs/development/python-modules/captum/default.nix
+++ b/pkgs/development/python-modules/captum/default.nix
@@ -74,6 +74,6 @@ buildPythonPackage rec {
     description = "Model interpretability and understanding for PyTorch";
     homepage = "https://github.com/pytorch/captum";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cffconvert/default.nix b/pkgs/development/python-modules/cffconvert/default.nix
index c7dba79bb5cb..f7538f6827c4 100644
--- a/pkgs/development/python-modules/cffconvert/default.nix
+++ b/pkgs/development/python-modules/cffconvert/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/citation-file-format/cffconvert";
     license = lib.licenses.asl20;
     mainProgram = "cffconvert";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cobble/default.nix b/pkgs/development/python-modules/cobble/default.nix
index 8423a9f5e525..4d37d4fd8c86 100644
--- a/pkgs/development/python-modules/cobble/default.nix
+++ b/pkgs/development/python-modules/cobble/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     description = "Create Python data objects";
     homepage = "https://github.com/mwilliamson/python-cobble";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/deepsearch-toolkit/default.nix b/pkgs/development/python-modules/deepsearch-toolkit/default.nix
index 876837e372d0..06de3b98e473 100644
--- a/pkgs/development/python-modules/deepsearch-toolkit/default.nix
+++ b/pkgs/development/python-modules/deepsearch-toolkit/default.nix
@@ -89,6 +89,6 @@ buildPythonPackage rec {
     description = "Interact with the Deep Search platform for new knowledge explorations and discoveries";
     homepage = "https://github.com/DS4SD/deepsearch-toolkit";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix
index 86a9ed2a01e4..017638c9d268 100644
--- a/pkgs/development/python-modules/docling-core/default.nix
+++ b/pkgs/development/python-modules/docling-core/default.nix
@@ -83,6 +83,6 @@ buildPythonPackage rec {
     description = "Python library to define and validate data types in Docling";
     homepage = "https://github.com/DS4SD/docling-core";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix
index fb07db2fed49..a0279abb7c6d 100644
--- a/pkgs/development/python-modules/docling-ibm-models/default.nix
+++ b/pkgs/development/python-modules/docling-ibm-models/default.nix
@@ -91,6 +91,6 @@ buildPythonPackage rec {
     description = "Docling IBM models";
     homepage = "https://github.com/DS4SD/docling-ibm-models";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/docling-parse/default.nix b/pkgs/development/python-modules/docling-parse/default.nix
index 9257f95adfa8..990083f9d54d 100644
--- a/pkgs/development/python-modules/docling-parse/default.nix
+++ b/pkgs/development/python-modules/docling-parse/default.nix
@@ -96,6 +96,6 @@ buildPythonPackage rec {
     description = "Simple package to extract text with coordinates from programmatic PDFs";
     homepage = "https://github.com/DS4SD/docling-parse";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/docling-serve/default.nix b/pkgs/development/python-modules/docling-serve/default.nix
index af20571493ae..fae9c2803c19 100644
--- a/pkgs/development/python-modules/docling-serve/default.nix
+++ b/pkgs/development/python-modules/docling-serve/default.nix
@@ -103,6 +103,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/docling-project/docling-serve";
     license = lib.licenses.mit;
     mainProgram = "docling-serve";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/firecrawl-py/default.nix b/pkgs/development/python-modules/firecrawl-py/default.nix
index 73985ce40596..aa85a5384a3e 100644
--- a/pkgs/development/python-modules/firecrawl-py/default.nix
+++ b/pkgs/development/python-modules/firecrawl-py/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://firecrawl.dev";
     changelog = "https://github.com/mendableai/firecrawl/releases/tag/${src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/funk/default.nix b/pkgs/development/python-modules/funk/default.nix
index b8de6edd7912..110fb233b152 100644
--- a/pkgs/development/python-modules/funk/default.nix
+++ b/pkgs/development/python-modules/funk/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mwilliamson/funk";
     changelog = "https://github.com/mwilliamson/funk/blob/${src.tag}/NEWS";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gawd/default.nix b/pkgs/development/python-modules/gawd/default.nix
index 48bc3a3a8679..be3191ac6bb8 100644
--- a/pkgs/development/python-modules/gawd/default.nix
+++ b/pkgs/development/python-modules/gawd/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     mainProgram = "gawd";
     homepage = "https://github.com/pooya-rostami/gawd";
     license = lib.licenses.lgpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gcp-storage-emulator/default.nix b/pkgs/development/python-modules/gcp-storage-emulator/default.nix
index aa60e1faeb2a..9d0434fa1779 100644
--- a/pkgs/development/python-modules/gcp-storage-emulator/default.nix
+++ b/pkgs/development/python-modules/gcp-storage-emulator/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Local emulator for Google Cloud Storage";
     homepage = "https://github.com/oittaa/gcp-storage-emulator";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "gcp-storage-emulator";
   };
 }
diff --git a/pkgs/development/python-modules/gitingest/default.nix b/pkgs/development/python-modules/gitingest/default.nix
index cbd1942461cb..e1126aeef371 100644
--- a/pkgs/development/python-modules/gitingest/default.nix
+++ b/pkgs/development/python-modules/gitingest/default.nix
@@ -88,7 +88,7 @@ buildPythonPackage rec {
     description = "Replace 'hub' with 'ingest' in any github url to get a prompt-friendly extract of a codebase";
     homepage = "https://github.com/cyclotruc/gitingest";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "gitingest";
   };
 }
diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index b387a9fca61b..637117d0ef40 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -79,7 +79,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/langchain-ai/langchain-aws/";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      drupol
       natsukium
       sarahec
     ];
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
index 590d0ecefcdb..b94a9890090d 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
@@ -103,7 +103,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      drupol
       sarahec
     ];
   };
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
index 471a1ff06322..67184f2a8eaf 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
@@ -84,7 +84,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint-sqlite";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      drupol
       sarahec
     ];
   };
diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
index d6518940027a..bfcedb58e168 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
@@ -73,7 +73,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      drupol
       sarahec
     ];
   };
diff --git a/pkgs/development/python-modules/lib4package/default.nix b/pkgs/development/python-modules/lib4package/default.nix
index 80b75dc97440..15bb0faee9bd 100644
--- a/pkgs/development/python-modules/lib4package/default.nix
+++ b/pkgs/development/python-modules/lib4package/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Utility for handling package metadata to include in Software Bill of Materials (SBOMs)";
     homepage = "https://github.com/anthonyharrison/lib4package";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mammoth/default.nix b/pkgs/development/python-modules/mammoth/default.nix
index edb1a5299e50..b685c18d7c9e 100644
--- a/pkgs/development/python-modules/mammoth/default.nix
+++ b/pkgs/development/python-modules/mammoth/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mwilliamson/python-mammoth";
     changelog = "https://github.com/mwilliamson/python-mammoth/blob/${src.tag}/NEWS";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/markdown-inline-graphviz/default.nix b/pkgs/development/python-modules/markdown-inline-graphviz/default.nix
index 20a788e534d9..f6efdcd2581a 100644
--- a/pkgs/development/python-modules/markdown-inline-graphviz/default.nix
+++ b/pkgs/development/python-modules/markdown-inline-graphviz/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/cesaremorel/markdown-inline-graphviz/";
     changelog = "https://github.com/cesaremorel/markdown-inline-graphviz/releases/tag/${src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/markitdown/default.nix b/pkgs/development/python-modules/markitdown/default.nix
index 565602f2feff..fffe7059cbfc 100644
--- a/pkgs/development/python-modules/markitdown/default.nix
+++ b/pkgs/development/python-modules/markitdown/default.nix
@@ -86,6 +86,6 @@ buildPythonPackage rec {
     description = "Python tool for converting files and office documents to Markdown";
     homepage = "https://github.com/microsoft/markitdown";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/marko/default.nix b/pkgs/development/python-modules/marko/default.nix
index 7487b108564c..3f25358b2608 100644
--- a/pkgs/development/python-modules/marko/default.nix
+++ b/pkgs/development/python-modules/marko/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     description = "Markdown parser with high extensibility";
     homepage = "https://github.com/frostming/marko";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mean-average-precision/default.nix b/pkgs/development/python-modules/mean-average-precision/default.nix
index 7ab591ebd9e2..62df3a73b1aa 100644
--- a/pkgs/development/python-modules/mean-average-precision/default.nix
+++ b/pkgs/development/python-modules/mean-average-precision/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/bes-dev/mean_average_precision";
     changelog = "https://github.com/bes-dev/mean_average_precision/blob/${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-backlinks/default.nix b/pkgs/development/python-modules/mkdocs-backlinks/default.nix
index a89223ed94a0..7f022675e0a0 100644
--- a/pkgs/development/python-modules/mkdocs-backlinks/default.nix
+++ b/pkgs/development/python-modules/mkdocs-backlinks/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Plugin for adding backlinks to mkdocs";
     homepage = "https://github.com/danodic-dev/mkdocs-backlinks/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-build-plantuml/default.nix b/pkgs/development/python-modules/mkdocs-build-plantuml/default.nix
index 22d6ccb201f5..dab90f15c710 100644
--- a/pkgs/development/python-modules/mkdocs-build-plantuml/default.nix
+++ b/pkgs/development/python-modules/mkdocs-build-plantuml/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     description = "MkDocs plugin to help generate your plantuml images locally or remotely as files (NOT inline)";
     homepage = "https://github.com/christo-ph/mkdocs_build_plantuml";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-drawio-file/default.nix b/pkgs/development/python-modules/mkdocs-drawio-file/default.nix
index 5746e7601df3..44d6442ae200 100644
--- a/pkgs/development/python-modules/mkdocs-drawio-file/default.nix
+++ b/pkgs/development/python-modules/mkdocs-drawio-file/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Embedding files of Diagrams.net (Draw.io) into MkDocs";
     homepage = "https://github.com/onixpro/mkdocs-drawio-file/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-graphviz/default.nix b/pkgs/development/python-modules/mkdocs-graphviz/default.nix
index a0c402ec2c37..5455fc9821b2 100644
--- a/pkgs/development/python-modules/mkdocs-graphviz/default.nix
+++ b/pkgs/development/python-modules/mkdocs-graphviz/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     description = "Configurable Python markdown extension for graphviz and Mkdocs";
     homepage = "https://gitlab.com/rod2ik/mkdocs-graphviz";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-markmap/default.nix b/pkgs/development/python-modules/mkdocs-markmap/default.nix
index 115eb1767908..46f805805ebd 100644
--- a/pkgs/development/python-modules/mkdocs-markmap/default.nix
+++ b/pkgs/development/python-modules/mkdocs-markmap/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     description = "MkDocs plugin and extension to create mindmaps from markdown using markmap";
     homepage = "https://github.com/markmap/mkdocs_markmap";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-puml/default.nix b/pkgs/development/python-modules/mkdocs-puml/default.nix
index b6d9ccfda794..acefa6dcaa60 100644
--- a/pkgs/development/python-modules/mkdocs-puml/default.nix
+++ b/pkgs/development/python-modules/mkdocs-puml/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage rec {
     description = "Brings PlantUML to MkDocs";
     homepage = "https://github.com/MikhailKravets/mkdocs_puml";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/monkeytype/default.nix b/pkgs/development/python-modules/monkeytype/default.nix
index ce7e46d999e3..e06b53a38077 100644
--- a/pkgs/development/python-modules/monkeytype/default.nix
+++ b/pkgs/development/python-modules/monkeytype/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Instagram/MonkeyType/";
     changelog = "https://github.com/Instagram/MonkeyType/blob/${src.rev}/CHANGES.rst";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/objprint/default.nix b/pkgs/development/python-modules/objprint/default.nix
index 9dc78482d4cb..144c7f5113a2 100644
--- a/pkgs/development/python-modules/objprint/default.nix
+++ b/pkgs/development/python-modules/objprint/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/gaogaotiantian/objprint";
     changelog = "https://github.com/gaogaotiantian/objprint/releases/tag/${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/plotille/default.nix b/pkgs/development/python-modules/plotille/default.nix
index 48ffcf7156c5..d2f2255c2f29 100644
--- a/pkgs/development/python-modules/plotille/default.nix
+++ b/pkgs/development/python-modules/plotille/default.nix
@@ -61,6 +61,6 @@ buildPythonPackage rec {
     description = "Plot in the terminal using braille dots";
     homepage = "https://github.com/tammoippen/plotille";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/precisely/default.nix b/pkgs/development/python-modules/precisely/default.nix
index 76300d76ff67..7c306edb40c7 100644
--- a/pkgs/development/python-modules/precisely/default.nix
+++ b/pkgs/development/python-modules/precisely/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     description = "Matcher library for Python";
     homepage = "https://github.com/mwilliamson/python-precisely";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix
index 3a7f8da6f22e..4a38ff8c6951 100644
--- a/pkgs/development/python-modules/primp/default.nix
+++ b/pkgs/development/python-modules/primp/default.nix
@@ -112,6 +112,6 @@ buildPythonPackage rec {
     description = "Python Requests IMPersonate, the fastest Python HTTP client that can impersonate web browsers";
     homepage = "https://github.com/deedy5/primp";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pygelf/default.nix b/pkgs/development/python-modules/pygelf/default.nix
index bb5735771c74..d2e5f6f62f7a 100644
--- a/pkgs/development/python-modules/pygelf/default.nix
+++ b/pkgs/development/python-modules/pygelf/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Python logging handlers with GELF (Graylog Extended Log Format) support";
     homepage = "https://github.com/keeprocking/pygelf";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pygments-style-github/default.nix b/pkgs/development/python-modules/pygments-style-github/default.nix
index 3c6945e66dfe..ffacae132031 100644
--- a/pkgs/development/python-modules/pygments-style-github/default.nix
+++ b/pkgs/development/python-modules/pygments-style-github/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     description = "Port of the github color scheme for pygments";
     homepage = "https://github.com/hugomaiavieira/pygments-style-github";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ drupol ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyorc/default.nix b/pkgs/development/python-modules/pyorc/default.nix
index bd2935ef7853..eeb3f9917c90 100644
--- a/pkgs/development/python-modules/pyorc/default.nix
+++ b/pkgs/development/python-modules/pyorc/default.nix
@@ -68,6 +68,6 @@ buildPythonPackage rec {
     description = "Python module for Apache ORC file format";
     homepage = "https://github.com/noirello/pyorc";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyroaring/default.nix b/pkgs/development/python-modules/pyroaring/default.nix
index d4978803306f..cf7186e34ab9 100644
--- a/pkgs/development/python-modules/pyroaring/default.nix
+++ b/pkgs/development/python-modules/pyroaring/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Ezibenroc/PyRoaringBitMap";
     changelog = "https://github.com/Ezibenroc/PyRoaringBitMap/releases/tag/${src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-kafka/default.nix b/pkgs/development/python-modules/pytest-kafka/default.nix
index ee4c323e8cef..7f85938f00b6 100644
--- a/pkgs/development/python-modules/pytest-kafka/default.nix
+++ b/pkgs/development/python-modules/pytest-kafka/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Pytest fixture factories for Zookeeper, Kafka server and Kafka consumer";
     homepage = "https://gitlab.com/karolinepauls/pytest-kafka";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-shared-session-scope/default.nix b/pkgs/development/python-modules/pytest-shared-session-scope/default.nix
index 96571b31d88a..b0f595b85ea9 100644
--- a/pkgs/development/python-modules/pytest-shared-session-scope/default.nix
+++ b/pkgs/development/python-modules/pytest-shared-session-scope/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     description = "Pytest session-scoped fixture that works with xdist";
     homepage = "https://pypi.org/project/pytest-shared-session-scope/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytorch-bench/default.nix b/pkgs/development/python-modules/pytorch-bench/default.nix
index e705028b1db8..015bdde64e02 100644
--- a/pkgs/development/python-modules/pytorch-bench/default.nix
+++ b/pkgs/development/python-modules/pytorch-bench/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage {
     description = "Benchmarking tool for torch";
     homepage = "https://github.com/MaximeGloesener/torch-benchmark";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sbom2dot/default.nix b/pkgs/development/python-modules/sbom2dot/default.nix
index cdb9ee48e7df..b483d67e9e18 100644
--- a/pkgs/development/python-modules/sbom2dot/default.nix
+++ b/pkgs/development/python-modules/sbom2dot/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/anthonyharrison/sbom2dot";
     license = lib.licenses.asl20;
     mainProgram = "sbom2dot";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sbom4files/default.nix b/pkgs/development/python-modules/sbom4files/default.nix
index b6639fec5065..674b59934cd7 100644
--- a/pkgs/development/python-modules/sbom4files/default.nix
+++ b/pkgs/development/python-modules/sbom4files/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "SBOM generator for files within a directory";
     homepage = "https://github.com/anthonyharrison/sbom4files";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sismic/default.nix b/pkgs/development/python-modules/sismic/default.nix
index 1d61ad2689c9..f5996194a091 100644
--- a/pkgs/development/python-modules/sismic/default.nix
+++ b/pkgs/development/python-modules/sismic/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage {
     description = "Sismic Interactive Statechart Model Interpreter and Checker";
     homepage = "https://github.com/AlexandreDecan/sismic";
     license = lib.licenses.lgpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sotabenchapi/default.nix b/pkgs/development/python-modules/sotabenchapi/default.nix
index b8a1b0b918da..305cc88839e9 100644
--- a/pkgs/development/python-modules/sotabenchapi/default.nix
+++ b/pkgs/development/python-modules/sotabenchapi/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage {
     description = "Easily benchmark Machine Learning models on selected tasks and datasets";
     homepage = "https://pypi.org/project/sotabenchapi/";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix b/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix
index a95cd57dec85..bb601c10845a 100644
--- a/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Sphinx extension using mscgen to render diagrams";
     homepage = "https://github.com/sphinx-contrib/mscgen";
     license = licenses.bola11;
-    maintainers = with maintainers; [ drupol ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/submitit/default.nix b/pkgs/development/python-modules/submitit/default.nix
index 2b8578c5bf44..1b552e87ecf6 100644
--- a/pkgs/development/python-modules/submitit/default.nix
+++ b/pkgs/development/python-modules/submitit/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     description = "Python 3.8+ toolbox for submitting jobs to Slurm";
     homepage = "https://github.com/facebookincubator/submitit";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-auth/default.nix b/pkgs/development/python-modules/swh-auth/default.nix
index 5a5e7e4cc85b..c1ca7e78feb6 100644
--- a/pkgs/development/python-modules/swh-auth/default.nix
+++ b/pkgs/development/python-modules/swh-auth/default.nix
@@ -61,6 +61,6 @@ buildPythonPackage rec {
     description = "Set of utility libraries related to user authentication in applications and services based on the use of Keycloak and OpenID Connect";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-auth";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-core/default.nix b/pkgs/development/python-modules/swh-core/default.nix
index c56bbba926f7..19f994b86ffe 100644
--- a/pkgs/development/python-modules/swh-core/default.nix
+++ b/pkgs/development/python-modules/swh-core/default.nix
@@ -115,6 +115,6 @@ buildPythonPackage rec {
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-core";
     license = lib.licenses.gpl3Only;
     mainProgram = "swh";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-export/default.nix b/pkgs/development/python-modules/swh-export/default.nix
index 6429bd8b475e..6af37b4972f5 100644
--- a/pkgs/development/python-modules/swh-export/default.nix
+++ b/pkgs/development/python-modules/swh-export/default.nix
@@ -85,6 +85,6 @@ buildPythonPackage rec {
     description = "Software Heritage dataset tools";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-export";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-journal/default.nix b/pkgs/development/python-modules/swh-journal/default.nix
index c3a0e223e125..912bdf6b9d36 100644
--- a/pkgs/development/python-modules/swh-journal/default.nix
+++ b/pkgs/development/python-modules/swh-journal/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     description = "Persistent logger of changes to the archive, with publish-subscribe support";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-journal";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-model/default.nix b/pkgs/development/python-modules/swh-model/default.nix
index ffbeb1a0f98b..3ae5fe994213 100644
--- a/pkgs/development/python-modules/swh-model/default.nix
+++ b/pkgs/development/python-modules/swh-model/default.nix
@@ -79,6 +79,6 @@ buildPythonPackage rec {
     description = "Implementation of the Data model of the Software Heritage project, used to archive source code artifacts";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-model";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-objstorage/default.nix b/pkgs/development/python-modules/swh-objstorage/default.nix
index 984267eb9a1e..d851dccf67ab 100644
--- a/pkgs/development/python-modules/swh-objstorage/default.nix
+++ b/pkgs/development/python-modules/swh-objstorage/default.nix
@@ -113,6 +113,6 @@ buildPythonPackage rec {
     description = "Content-addressable object storage for the Software Heritage project";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-objstorage";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-perfecthash/default.nix b/pkgs/development/python-modules/swh-perfecthash/default.nix
index 821b1c6bf255..fd682f64810a 100644
--- a/pkgs/development/python-modules/swh-perfecthash/default.nix
+++ b/pkgs/development/python-modules/swh-perfecthash/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     description = "Perfect hash table for software heritage object storage";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-perfecthash";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-scanner/default.nix b/pkgs/development/python-modules/swh-scanner/default.nix
index 5f34c0c20cc5..4354fed2cb34 100644
--- a/pkgs/development/python-modules/swh-scanner/default.nix
+++ b/pkgs/development/python-modules/swh-scanner/default.nix
@@ -84,6 +84,6 @@ buildPythonPackage rec {
     description = "Implementation of the Data model of the Software Heritage project, used to archive source code artifacts";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-model";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-scheduler/default.nix b/pkgs/development/python-modules/swh-scheduler/default.nix
index 349383c72de4..58ea17672678 100644
--- a/pkgs/development/python-modules/swh-scheduler/default.nix
+++ b/pkgs/development/python-modules/swh-scheduler/default.nix
@@ -83,6 +83,6 @@ buildPythonPackage rec {
     description = "Job scheduler for the Software Heritage project";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-scheduler";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-storage/default.nix b/pkgs/development/python-modules/swh-storage/default.nix
index a3eacef9837b..74b326af1e21 100644
--- a/pkgs/development/python-modules/swh-storage/default.nix
+++ b/pkgs/development/python-modules/swh-storage/default.nix
@@ -96,6 +96,6 @@ buildPythonPackage rec {
     description = "Abstraction layer over the archive, allowing to access all stored source code artifacts as well as their metadata";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-storage";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-web-client/default.nix b/pkgs/development/python-modules/swh-web-client/default.nix
index 79b68cc1b926..4391f8eb8ddf 100644
--- a/pkgs/development/python-modules/swh-web-client/default.nix
+++ b/pkgs/development/python-modules/swh-web-client/default.nix
@@ -61,6 +61,6 @@ buildPythonPackage rec {
     description = "Client for Software Heritage Web applications, via their APIs";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-web-client";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tempman/default.nix b/pkgs/development/python-modules/tempman/default.nix
index 1b6780adff64..2d2ea55d00bb 100644
--- a/pkgs/development/python-modules/tempman/default.nix
+++ b/pkgs/development/python-modules/tempman/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Create and clean up temporary directories";
     homepage = "https://github.com/mwilliamson/python-tempman";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/torchbench/default.nix b/pkgs/development/python-modules/torchbench/default.nix
index 3593ae792130..85ffda667072 100644
--- a/pkgs/development/python-modules/torchbench/default.nix
+++ b/pkgs/development/python-modules/torchbench/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage {
     description = "Easily benchmark machine learning models in PyTorch";
     homepage = "https://github.com/paperswithcode/torchbench";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/torchprofile/default.nix b/pkgs/development/python-modules/torchprofile/default.nix
index c4cee730aec0..4f7e51374aef 100644
--- a/pkgs/development/python-modules/torchprofile/default.nix
+++ b/pkgs/development/python-modules/torchprofile/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     description = "General and accurate MACs / FLOPs profiler for PyTorch models";
     homepage = "https://github.com/zhijian-liu/torchprofile";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix
index 7a7d14b79d1c..a9b0787943bb 100644
--- a/pkgs/development/python-modules/xhtml2pdf/default.nix
+++ b/pkgs/development/python-modules/xhtml2pdf/default.nix
@@ -65,6 +65,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/xhtml2pdf/xhtml2pdf";
     license = lib.licenses.asl20;
     mainProgram = "xhtml2pdf";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index dbb40d3dd88c..efb6dd966ec1 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
       lgpl21Only
       gpl2Only
     ];
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix
index f90d77f5a207..1ee127f15b80 100644
--- a/pkgs/os-specific/linux/projecteur/default.nix
+++ b/pkgs/os-specific/linux/projecteur/default.nix
@@ -53,7 +53,6 @@ mkDerivation rec {
     mainProgram = "projecteur";
     maintainers = with lib.maintainers; [
       benneti
-      drupol
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
index e5917819b631..b568ce760fe5 100644
--- a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
@@ -25,6 +25,6 @@ buildGoModule rec {
     mainProgram = "shelly_exporter";
     homepage = "https://github.com/aexel90/shelly_exporter";
     license = licenses.asl20;
-    maintainers = with maintainers; [ drupol ];
+    maintainers = with maintainers; [ ];
   };
 }

From 5b5b2b9c7bb7a449f4a2780708fdf5c92b9b2727 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 15:59:18 +0000
Subject: [PATCH 2194/3724] nextcloud-client: 3.17.0 -> 3.17.1

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

diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
index c60b3bcfa1aa..b565c29ff149 100644
--- a/pkgs/by-name/ne/nextcloud-client/package.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation rec {
   pname = "nextcloud-client";
-  version = "3.17.0";
+  version = "3.17.1";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     owner = "nextcloud-releases";
     repo = "desktop";
     tag = "v${version}";
-    hash = "sha256-NbnC6rbpHJvPOufyNaf36JMpKE5IN4vXSLJWkrINtk8=";
+    hash = "sha256-HXi3DDjOFLY9G+aK+QrkmLvLwL6s9lAT+8jVpG87eNM=";
   };
 
   patches = [

From f94fd64d53b9b5ca371bbd908a70b719beec3d90 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 17:59:27 +0200
Subject: [PATCH 2195/3724] ci/github-script/prepare: fix logging of branch
 classification

Logging objects to stdout is not possible with `core.info`, so we
fallback to `console.log` instead. There's no functional difference for
these anyway.
---
 ci/github-script/prepare.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js
index d47dd86308dd..fb000cb6820a 100644
--- a/ci/github-script/prepare.js
+++ b/ci/github-script/prepare.js
@@ -58,7 +58,7 @@ module.exports = async ({ github, context, core }) => {
 
     const baseClassification = classify(base.ref)
     core.setOutput('base', baseClassification)
-    core.info('base classification:', baseClassification)
+    console.log('base classification:', baseClassification)
 
     const headClassification =
       base.repo.full_name === head.repo.full_name
@@ -66,7 +66,7 @@ module.exports = async ({ github, context, core }) => {
         : // PRs from forks are always considered WIP.
           { type: ['wip'] }
     core.setOutput('head', headClassification)
-    core.info('head classification:', headClassification)
+    console.log('head classification:', headClassification)
 
     const files = (
       await github.paginate(github.rest.pulls.listFiles, {

From f35d1cd2cc4e703530a003e2e6d4ea08d40cab8e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 18:03:41 +0200
Subject: [PATCH 2196/3724] workflows/pr.prepare: specify cone mode explicitly

This is the default, but who's supposed to know about that? Let's make
it explicit to be clear about the availability of files in `ci/`.
---
 .github/workflows/pr.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index a09c51eeae7e..80deea95624c 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -32,6 +32,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          sparse-checkout-cone-mode: true # default, for clarity
           sparse-checkout: |
             ci/github-script
       - id: prepare

From 26b98c05b4e48277488670645a9e22c41896c384 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 16:05:20 +0000
Subject: [PATCH 2197/3724] protoc-gen-go: 1.36.7 -> 1.36.8

---
 pkgs/by-name/pr/protoc-gen-go/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-go/package.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix
index 5e2615bb1309..d14b5cbd2c5d 100644
--- a/pkgs/by-name/pr/protoc-gen-go/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-go/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "protoc-gen-go";
-  version = "1.36.7";
+  version = "1.36.8";
 
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "protobuf-go";
     rev = "v${version}";
-    hash = "sha256-8ePIQ62ewJ1Bp+rG+R7o8Vx++zp8VK0MeEb8ASGZQ7E=";
+    hash = "sha256-uDgLBqeyTQavcCF+wcLsc/7VCaOvPPLVGt9isw4O0R8=";
   };
 
   vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E=";

From 025424913f19dfbee0c791c68619142b94a0e6f3 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 12:10:23 +0200
Subject: [PATCH 2198/3724] workflows: support cachix in forks

This allows setting up a custom cachix cache in a contributor's fork.
That's most valuable when working on CI itself, testing and interating
in a fork. It's required when working on cachix related features
directly.
---
 .github/workflows/build.yml | 7 ++++---
 .github/workflows/check.yml | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ef3c71ca4fbe..60aed67cea03 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,9 +61,10 @@ jobs:
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
-          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
-          name: nixpkgs-ci
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          # The nixpkgs-ci cache should not be trusted or used outside of Nixpkgs and its forks' CI.
+          name: ${{ vars.CACHIX_NAME || 'nixpkgs-ci' }}
+          extraPullNames: nixpkgs-ci
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
       - run: nix-env --install -f pinned -A nix-build-uncached
 
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index c06729fa7f5d..d58358e23aa7 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -112,9 +112,10 @@ jobs:
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
-          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
-          name: nixpkgs-ci
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+          # The nixpkgs-ci cache should not be trusted or used outside of Nixpkgs and its forks' CI.
+          name: ${{ vars.CACHIX_NAME || 'nixpkgs-ci' }}
+          extraPullNames: nixpkgs-ci
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
       - name: Build codeowners validator
         run: nix-build trusted/ci --arg nixpkgs ./pinned -A codeownersValidator

From 2400bdf0d4d4c408964525b4d5f12c33647aa708 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 12:11:59 +0200
Subject: [PATCH 2199/3724] workflows: never push source to cachix

Pushing the source path to cachix is pointless, because the only source
we're using is Nixpkgs - and that will always be available already via
checkout. No need to ever substitute it, so no need to push it either.
---
 .github/workflows/build.yml | 1 +
 .github/workflows/check.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 60aed67cea03..3b289413e6fb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,6 +65,7 @@ jobs:
           name: ${{ vars.CACHIX_NAME || 'nixpkgs-ci' }}
           extraPullNames: nixpkgs-ci
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+          pushFilter: -source$
 
       - run: nix-env --install -f pinned -A nix-build-uncached
 
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index d58358e23aa7..3dbbb9d2dff7 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -116,6 +116,7 @@ jobs:
           name: ${{ vars.CACHIX_NAME || 'nixpkgs-ci' }}
           extraPullNames: nixpkgs-ci
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+          pushFilter: -source$
 
       - name: Build codeowners validator
         run: nix-build trusted/ci --arg nixpkgs ./pinned -A codeownersValidator

From 6ee40e79314d07ffc58537fbe33ad27373748353 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 12:20:01 +0200
Subject: [PATCH 2200/3724] workflows/lint: add cachix

For PRs targeting a fast moving branch like master, it might not
actually help because the merge commit will still be different on each
run. But on slower moving branches or when testing in a fork, it can
speed things up.

Since each of these build results is only a few hundred bytes without
any dependencies, it has essentially no cost.

Not adding this to `treefmt`, because this looks at *all* the files in
the repo, so needs to re-run even when iterating on CI only.
---
 .github/workflows/lint.yml        | 23 +++++++++++++++++++++++
 .github/workflows/merge-group.yml |  2 ++
 .github/workflows/pr.yml          |  2 ++
 3 files changed, 27 insertions(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 44cb7fe7bada..d9168c4210d0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,6 +9,9 @@ on:
       targetSha:
         required: true
         type: string
+    secrets:
+      CACHIX_AUTH_TOKEN:
+        required: true
 
 permissions: {}
 
@@ -33,6 +36,10 @@ jobs:
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
+      # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
+      # because the cache would be invalidated on every commit - treefmt checks every file.
+      # Maybe we can cache treefmt's eval-cache somehow.
+
       - name: Check that files are formatted
         run: |
           # Note that it's fine to run this on untrusted code because:
@@ -65,6 +72,14 @@ jobs:
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
+      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+        with:
+          # The nixpkgs-ci cache should not be trusted or used outside of Nixpkgs and its forks' CI.
+          name: ${{ vars.CACHIX_NAME || 'nixpkgs-ci' }}
+          extraPullNames: nixpkgs-ci
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+          pushFilter: -source$
+
       - name: Parse all nix files
         run: |
           # Tests multiple versions at once, let's make sure all of them run, so keep-going.
@@ -88,6 +103,14 @@ jobs:
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
+      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+        with:
+          # The nixpkgs-ci cache should not be trusted or used outside of Nixpkgs and its forks' CI.
+          name: ${{ vars.CACHIX_NAME || 'nixpkgs-ci' }}
+          extraPullNames: nixpkgs-ci
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+          pushFilter: -source$
+
       - name: Running nixpkgs-vet
         env:
           # Force terminal colors to be enabled. The library that `nixpkgs-vet` uses respects https://bixense.com/clicolors/
diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml
index 72b8deeb2dbc..9ed7125c76d2 100644
--- a/.github/workflows/merge-group.yml
+++ b/.github/workflows/merge-group.yml
@@ -9,6 +9,8 @@ jobs:
   lint:
     name: Lint
     uses: ./.github/workflows/lint.yml
+    secrets:
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
       mergedSha: ${{ github.event.merge_group.head_sha }}
       targetSha: ${{ github.event.merge_group.base_sha }}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 1de7d6614c9c..e7535378b734 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -100,6 +100,8 @@ jobs:
     name: Lint
     needs: [prepare]
     uses: ./.github/workflows/lint.yml
+    secrets:
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
       targetSha: ${{ needs.prepare.outputs.targetSha }}

From c4fa63da496154e74c8fa790a7a9d42f1a4d94ca Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 12:49:57 +0200
Subject: [PATCH 2201/3724] ci/nixpkgs-vet: memoize filesets

Speeds up evaluation a bit, because `filtered head` doesn't need to be
evaluated 3x.
---
 ci/nixpkgs-vet.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ci/nixpkgs-vet.nix b/ci/nixpkgs-vet.nix
index 58b5024589bd..d3103579730d 100644
--- a/ci/nixpkgs-vet.nix
+++ b/ci/nixpkgs-vet.nix
@@ -16,6 +16,9 @@ let
       fileset = (gitTracked path);
       root = path;
     };
+
+  filteredBase = filtered base;
+  filteredHead = filtered head;
 in
 runCommand "nixpkgs-vet"
   {
@@ -27,11 +30,11 @@ runCommand "nixpkgs-vet"
   ''
     export NIX_STATE_DIR=$(mktemp -d)
 
-    nixpkgs-vet --base ${filtered base} ${filtered head}
+    nixpkgs-vet --base ${filteredBase} ${filteredHead}
 
     # TODO: Upstream into nixpkgs-vet, see:
     # https://github.com/NixOS/nixpkgs-vet/issues/164
-    badFiles=$(find ${filtered head}/pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs/' || true)
+    badFiles=$(find ${filteredHead}/pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs/' || true)
     if [[ -n $badFiles ]]; then
       echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself."
       echo "The offending files:"
@@ -41,7 +44,7 @@ runCommand "nixpkgs-vet"
 
     # TODO: Upstream into nixpkgs-vet, see:
     # https://github.com/NixOS/nixpkgs-vet/issues/166
-    conflictingPaths=$(find ${filtered head} | awk '{ print $1 " " tolower($1) }' | sort -k2 | uniq -D -f 1 | cut -d ' ' -f 1)
+    conflictingPaths=$(find ${filteredHead} | awk '{ print $1 " " tolower($1) }' | sort -k2 | uniq -D -f 1 | cut -d ' ' -f 1)
     if [[ -n $conflictingPaths ]]; then
       echo "Files in nixpkgs must not vary only by case."
       echo "The offending paths:"

From 4d996cfb2f823395c5fb469d9dee918f6a710cc3 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 12:51:09 +0200
Subject: [PATCH 2202/3724] ci/nixpkgs-vet: ignore .github/ and ci/ folders

nixpkgs-vet doesn't care about our CI infrastructure, so ignoring these
files will lead to more cache hits when iterating on CI related PRs.
---
 ci/nixpkgs-vet.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ci/nixpkgs-vet.nix b/ci/nixpkgs-vet.nix
index d3103579730d..7c11dffc4f9b 100644
--- a/ci/nixpkgs-vet.nix
+++ b/ci/nixpkgs-vet.nix
@@ -13,7 +13,10 @@ let
     with lib.fileset;
     path:
     toSource {
-      fileset = (gitTracked path);
+      fileset = difference (gitTracked path) (unions [
+        (path + /.github)
+        (path + /ci)
+      ]);
       root = path;
     };
 

From 795dd01e31791c3d2f1d78d3c2273243b240803f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 13:37:48 +0200
Subject: [PATCH 2203/3724] workflows/eval: add cachix

At this stage, this only allows faster iteration when working on CI in
forks.
---
 .github/workflows/eval.yml | 10 ++++++++++
 .github/workflows/pr.yml   |  1 +
 .github/workflows/push.yml |  2 ++
 3 files changed, 13 insertions(+)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index a89f2e4d5f9b..a1aaaafe6fbb 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -16,6 +16,8 @@ on:
         default: false
         type: boolean
     secrets:
+      CACHIX_AUTH_TOKEN:
+        required: true
       OWNER_APP_PRIVATE_KEY:
         required: false
 
@@ -97,6 +99,14 @@ jobs:
       - name: Install Nix
         uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
+      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+        with:
+          # The nixpkgs-ci cache should not be trusted or used outside of Nixpkgs and its forks' CI.
+          name: ${{ vars.CACHIX_NAME || 'nixpkgs-ci' }}
+          extraPullNames: nixpkgs-ci
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+          pushFilter: '(-source|-single-chunk)$'
+
       - name: Evaluate the ${{ matrix.system }} output paths for all derivation attributes
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index e7535378b734..b6c4fabafa12 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -114,6 +114,7 @@ jobs:
       # compare
       statuses: write
     secrets:
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
       OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
     with:
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index ae829ed0ff2b..265f0fba8927 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -43,6 +43,8 @@ jobs:
       issues: write
       pull-requests: write
       statuses: write
+    secrets:
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
       mergedSha: ${{ github.sha }}
       systems: ${{ needs.prepare.outputs.systems }}

From ac938656970ac980f19370788fca225db9faff2b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 17:09:54 +0200
Subject: [PATCH 2204/3724] workflows/build: prevent pushing tarball to cachix

By definition the tarball changes on every commit, so it makes no sense
to cache it - it will just waste disk space.
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3b289413e6fb..b00335dc5f27 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,7 +65,7 @@ jobs:
           name: ${{ vars.CACHIX_NAME || 'nixpkgs-ci' }}
           extraPullNames: nixpkgs-ci
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-          pushFilter: -source$
+          pushFilter: '(-source$|-nixpkgs-tarball-)'
 
       - run: nix-env --install -f pinned -A nix-build-uncached
 

From b4281678dbe6593f73f49028d644714b3141290d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 20 Aug 2025 13:25:12 -0300
Subject: [PATCH 2205/3724] runescape: 2.2.10 -> 2.2.11

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

diff --git a/pkgs/by-name/ru/runescape/package.nix b/pkgs/by-name/ru/runescape/package.nix
index 990466cb8232..f7231fd44cf4 100644
--- a/pkgs/by-name/ru/runescape/package.nix
+++ b/pkgs/by-name/ru/runescape/package.nix
@@ -28,13 +28,13 @@ let
 
   runescape = stdenv.mkDerivation rec {
     pname = "runescape-launcher";
-    version = "2.2.10";
+    version = "2.2.11";
 
     # Packages: https://content.runescape.com/downloads/ubuntu/dists/trusty/non-free/binary-amd64/Packages
     # upstream is https://content.runescape.com/downloads/ubuntu/pool/non-free/r/${pname}/${pname}_${version}_amd64.deb
     src = fetchurl {
       url = "https://archive.org/download/${pname}_${version}_amd64/${pname}_${version}_amd64.deb";
-      sha256 = "1v96vjiblphhbqhpp3m7wbvdvcnp76ncdlf4pdcr2z1dz8nh6shg";
+      sha256 = "0dyilgbsr28zqpf711wygg706vn7sqxklnsnbghwkxfzzjppz2xw";
     };
 
     nativeBuildInputs = [

From 60fd662d961f63082d6d3f6631b1e38f79631c27 Mon Sep 17 00:00:00 2001
From: Scott Prutton <scott@systeminit.com>
Date: Wed, 20 Aug 2025 12:17:36 -0400
Subject: [PATCH 2206/3724] buck2: unstable-2025-05-06 -> unstable-2025-08-15

---
 pkgs/by-name/bu/buck2/hashes.json | 18 +++++++++---------
 pkgs/by-name/bu/buck2/package.nix |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/bu/buck2/hashes.json b/pkgs/by-name/bu/buck2/hashes.json
index 01590ff23086..07cbb3ff70e9 100644
--- a/pkgs/by-name/bu/buck2/hashes.json
+++ b/pkgs/by-name/bu/buck2/hashes.json
@@ -1,11 +1,11 @@
 { "_comment": "@generated by pkgs/by-name/bu/buck2/update.sh"
-, "_prelude": "sha256-eU4EZ9OqJVUH/YPFctJZM+KZK70IEslr2qLUUvz3ctM="
-, "buck2-x86_64-linux": "sha256-r/5txsY7/i0fQaQsH40YdAhSD/bXtr5aGlAuxaOs8jg="
-, "rust-project-x86_64-linux": "sha256-XJFhaxJvOklMMO3emtdJS4zNu989HLCIU9qBP31XpCo="
-, "buck2-x86_64-darwin": "sha256-9SW0xn7w2dH81oHwze/ysnQyrIAgu8+1WJuXMmxslFo="
-, "rust-project-x86_64-darwin": "sha256-MvYv96OtOU7NEZKXf3gDvCjEcbegLI+1HFN7XBdPAXA="
-, "buck2-aarch64-linux": "sha256-wlmkgWdotvqxmflzoJG266weCsjxtM0mVO0xf7vKVr0="
-, "rust-project-aarch64-linux": "sha256-7zhO+s8LOuDj5ysyADkfqRIZiOG9ewBtfcB43sPfVc4="
-, "buck2-aarch64-darwin": "sha256-0bNtPX8TLTCxf7rEeiUYtJUbzRmgRdgHrv98mmmM/Rg="
-, "rust-project-aarch64-darwin": "sha256-a4OLLLYJjTBskXfB7OWqULPkV5amgDEHudJKRLGwuAU="
+, "_prelude": "sha256-cyuOMi8x8q9gd6p1obnYYDVPxyONZ+y41AFXvSbUjC0="
+, "buck2-x86_64-linux": "sha256-l/W6Bza01IyOFvHb2rlBY72Tl+JNgwmkO8EhUPWrxBY="
+, "rust-project-x86_64-linux": "sha256-3UGgvQKSm6Qohk/NDRU1fM+eFEpqM9XMLxL2AkXXrW0="
+, "buck2-x86_64-darwin": "sha256-wHk/tJJbupMsrcmXXNVXurfLY2TOSssMnuTZ7LNjASY="
+, "rust-project-x86_64-darwin": "sha256-ePawMIfltPRK3mJJxI1BvGs6b2vIcgWzW2XTJykUsdI="
+, "buck2-aarch64-linux": "sha256-dhqBYFQ6e5nWSrbUMUFoato1sb4bl95JcdqcgeC5mcs="
+, "rust-project-aarch64-linux": "sha256-Zduna35ieycN80K2wh5OkcSaOWiqhxLJkduBk7f2XqU="
+, "buck2-aarch64-darwin": "sha256-XtGs7g64s76AYhpFDbqSuSlblRauxJM0PaAk1MNNgxA="
+, "rust-project-aarch64-darwin": "sha256-CkyLLv41iJTKHVB0e355ZO2MV7NzQeiF1gtWEGF5oAY="
 }
diff --git a/pkgs/by-name/bu/buck2/package.nix b/pkgs/by-name/bu/buck2/package.nix
index 38e5a37c2d70..9c783d7a63f8 100644
--- a/pkgs/by-name/bu/buck2/package.nix
+++ b/pkgs/by-name/bu/buck2/package.nix
@@ -44,7 +44,7 @@ let
   buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);
 
   # our version of buck2; this should be a git tag
-  version = "2025-05-06";
+  version = "2025-08-15";
 
   # map our platform name to the rust toolchain suffix
   # NOTE (aseipp): must be synchronized with update.sh!
@@ -82,7 +82,7 @@ let
   # tooling
   prelude-src =
     let
-      prelude-hash = "48c249f8c7b99ff501d6e857754760315072b306";
+      prelude-hash = "892cb85f5fc3258c7e4f89a836821ec4b8c7ee44";
       name = "buck2-prelude-${version}.tar.gz";
       hash = buildHashes."_prelude";
       url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz";

From 19f5c489cba6a3a6f1bee83dacb69e424fd6d752 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 16:39:21 +0000
Subject: [PATCH 2207/3724] cppcheck: 2.18.0 -> 2.18.1

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

diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix
index 60c2a16a7920..e883e69ca0b8 100644
--- a/pkgs/by-name/cp/cppcheck/package.nix
+++ b/pkgs/by-name/cp/cppcheck/package.nix
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cppcheck";
-  version = "2.18.0";
+  version = "2.18.1";
 
   outputs = [
     "out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "danmar";
     repo = "cppcheck";
     tag = finalAttrs.version;
-    hash = "sha256-trbL2Me1VWmVMfL45H50xbR36izifFmoLHKQvte6oZQ=";
+    hash = "sha256-SWMjxMtdISAOxMWteouOzr8DeRpqn16OlPDhR0Yb3QQ=";
   };
 
   nativeBuildInputs = [

From f01b6b4754c46d89f40e5d4be5539ad066558dd7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 18:52:20 +0200
Subject: [PATCH 2208/3724] actions/checkout: remove unused input types

The two as-at inputs, were not boolean anymore, but GHA didn't complain.
Input types are actually not a thing for composite actions - they are
only documented for callable workflows.
---
 .github/actions/checkout/action.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml
index 751eef7600cd..a07edb097d7b 100644
--- a/.github/actions/checkout/action.yml
+++ b/.github/actions/checkout/action.yml
@@ -5,13 +5,10 @@ description: 'Checkout into trusted / untrusted / pinned folders consistently.'
 inputs:
   merged-as-untrusted-at:
     description: "Whether and which SHA to checkout for the merge commit in the ./untrusted folder."
-    type: boolean
   pinned-from:
     description: "Whether to checkout the pinned nixpkgs for CI and from where (trusted, untrusted)."
-    type: string
   target-as-trusted-at:
     description: "Whether and which SHA to checkout for the target commit in the ./trusted folder."
-    type: boolean
 
 runs:
   using: composite

From 7a07eec4eb734e1d589d402bfeb367be284a3071 Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:48:23 +0300
Subject: [PATCH 2209/3724] maintainers: `donteatoreo` -> `FlameFlag`

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b1cae7ea481a..0e117033a50f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6673,12 +6673,6 @@
     name = "Donovan Glover";
     keys = [ { fingerprint = "EE7D 158E F9E7 660E 0C33  86B2 8FC5 F7D9 0A5D 8F4D"; } ];
   };
-  donteatoreo = {
-    name = "DontEatOreo";
-    github = "DontEatOreo";
-    githubId = 57304299;
-    matrix = "@donteatoreo:matrix.org";
-  };
   dopplerian = {
     name = "Dopplerian";
     github = "Dopplerian";
@@ -8453,6 +8447,12 @@
     name = "Sebastian Neubauer";
     keys = [ { fingerprint = "2F93 661D AC17 EA98 A104  F780 ECC7 55EE 583C 1672"; } ];
   };
+  FlameFlag = {
+    name = "FlameFlag";
+    github = "FlameFlag";
+    githubId = 57304299;
+    matrix = "@donteatoreo:matrix.org";
+  };
   Flameopathic = {
     email = "flameopathic@gmail.com";
     github = "Flameopathic";

From 25c9b81ba81be9e3a2bf7fe6d0e69452fdfa8d4b Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 20 Aug 2025 13:41:49 -0300
Subject: [PATCH 2210/3724] runescape: add maintainer iedame

---
 pkgs/by-name/ru/runescape/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ru/runescape/package.nix b/pkgs/by-name/ru/runescape/package.nix
index f7231fd44cf4..f097ee43ca31 100644
--- a/pkgs/by-name/ru/runescape/package.nix
+++ b/pkgs/by-name/ru/runescape/package.nix
@@ -99,7 +99,10 @@ let
       homepage = "https://www.runescape.com/";
       sourceProvenance = with sourceTypes; [ binaryNativeCode ];
       license = licenses.unfree;
-      maintainers = with maintainers; [ grburst ];
+      maintainers = with maintainers; [
+        grburst
+        iedame
+      ];
       platforms = [ "x86_64-linux" ];
     };
   };
@@ -149,7 +152,10 @@ buildFHSEnv {
     description = "RuneScape Game Client (NXT) - Launcher for RuneScape 3";
     homepage = "https://www.runescape.com/";
     license = licenses.unfree;
-    maintainers = with maintainers; [ grburst ];
+    maintainers = with maintainers; [
+      grburst
+      iedame
+    ];
     platforms = [ "x86_64-linux" ];
   };
 }

From 31e7a5516eb031e476eeb6e721675016592e7070 Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Wed, 20 Aug 2025 17:11:51 +0300
Subject: [PATCH 2211/3724] treewide: `donteatoreo` -> `FlameFlag`

---
 ci/OWNERS                                                       | 2 +-
 .../networking/instant-messengers/discord/default.nix           | 2 +-
 pkgs/by-name/al/alt-tab-macos/package.nix                       | 2 +-
 pkgs/by-name/cs/csharprepl/package.nix                          | 2 +-
 pkgs/by-name/ga/gallery-dl/package.nix                          | 2 +-
 pkgs/by-name/ge/gemini-cli/package.nix                          | 2 +-
 pkgs/by-name/hi/hidden-bar/package.nix                          | 2 +-
 pkgs/by-name/ic/ice-bar/package.nix                             | 2 +-
 pkgs/by-name/ii/iina/package.nix                                | 2 +-
 pkgs/by-name/is/istat-menus/package.nix                         | 2 +-
 pkgs/by-name/it/itsycal/package.nix                             | 2 +-
 pkgs/by-name/ko/koboldcpp/package.nix                           | 2 +-
 pkgs/by-name/mo/moonlight/package.nix                           | 2 +-
 pkgs/by-name/mo/mousecape/package.nix                           | 2 +-
 pkgs/by-name/nu/numi/package.nix                                | 2 +-
 pkgs/by-name/ra/raycast/package.nix                             | 2 +-
 pkgs/by-name/sh/shottr/package.nix                              | 2 +-
 pkgs/by-name/so/soundsource/package.nix                         | 2 +-
 pkgs/by-name/st/stats/package.nix                               | 2 +-
 pkgs/by-name/ve/vencord/package.nix                             | 2 +-
 pkgs/by-name/wa/warp-terminal/package.nix                       | 2 +-
 pkgs/by-name/wi/win-disk-writer/package.nix                     | 2 +-
 pkgs/by-name/yt/yt-dlp/package.nix                              | 2 +-
 pkgs/development/python-modules/customtkinter/default.nix       | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index a5fdf4b4e8e5..8dcab7e6f2b8 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -499,4 +499,4 @@ pkgs/by-name/oc/octodns/ @anthonyroussel
 pkgs/by-name/te/teleport*   @arianvp @justinas @sigma @tomberek @freezeboy @techknowlogick @JuliusFreudenberger
 
 # Warp-terminal
-pkgs/by-name/wa/warp-terminal/  @emilytrau @imadnyc @donteatoreo @johnrtitor
+pkgs/by-name/wa/warp-terminal/  @emilytrau @imadnyc @FlameFlag @johnrtitor
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index b965c98db549..553ff0194be2 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -73,7 +73,7 @@ let
     mainProgram = "discord";
     maintainers = with lib.maintainers; [
       artturin
-      donteatoreo
+      FlameFlag
       infinidoge
       jopejoe1
       Scrumplex
diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix
index a6fd3439e797..e802523417af 100644
--- a/pkgs/by-name/al/alt-tab-macos/package.nix
+++ b/pkgs/by-name/al/alt-tab-macos/package.nix
@@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://alt-tab-macos.netlify.app";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
-      donteatoreo
+      FlameFlag
       emilytrau
     ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/cs/csharprepl/package.nix b/pkgs/by-name/cs/csharprepl/package.nix
index cdf3f59ea54b..fa0c82cf2fa5 100644
--- a/pkgs/by-name/cs/csharprepl/package.nix
+++ b/pkgs/by-name/cs/csharprepl/package.nix
@@ -21,7 +21,7 @@ buildDotnetGlobalTool {
     changelog = "https://github.com/waf/CSharpRepl/blob/main/CHANGELOG.md";
     license = lib.licenses.mpl20;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ donteatoreo ];
+    maintainers = with lib.maintainers; [ FlameFlag ];
     mainProgram = "csharprepl";
   };
 }
diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix
index a1625b6d7f5f..edb0df4b388c 100644
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@@ -57,7 +57,7 @@ python3Packages.buildPythonApplication {
     mainProgram = "gallery-dl";
     maintainers = with lib.maintainers; [
       dawidsowa
-      donteatoreo
+      FlameFlag
       lucasew
     ];
   };
diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index 5526698a89ab..223cdf7f478c 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -56,7 +56,7 @@ buildNpmPackage (finalAttrs: {
     homepage = "https://github.com/google-gemini/gemini-cli";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
-      donteatoreo
+      FlameFlag
       taranarmo
     ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/hi/hidden-bar/package.nix b/pkgs/by-name/hi/hidden-bar/package.nix
index aaccb68fdf92..d31f06643990 100644
--- a/pkgs/by-name/hi/hidden-bar/package.nix
+++ b/pkgs/by-name/hi/hidden-bar/package.nix
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Ultra-light MacOS utility that helps hide menu bar icons";
     homepage = "https://github.com/dwarvesf/hidden";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ donteatoreo ];
+    maintainers = with lib.maintainers; [ FlameFlag ];
     platforms = lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/ic/ice-bar/package.nix b/pkgs/by-name/ic/ice-bar/package.nix
index df204a7092d3..bd3e1ce55d2d 100644
--- a/pkgs/by-name/ic/ice-bar/package.nix
+++ b/pkgs/by-name/ic/ice-bar/package.nix
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Powerful menu bar manager for macOS";
     homepage = "https://icemenubar.app/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ donteatoreo ];
+    maintainers = with lib.maintainers; [ FlameFlag ];
     platforms = lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/ii/iina/package.nix b/pkgs/by-name/ii/iina/package.nix
index 1d3dea15fa19..982cd67746db 100644
--- a/pkgs/by-name/ii/iina/package.nix
+++ b/pkgs/by-name/ii/iina/package.nix
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [
       arkivm
-      donteatoreo
+      FlameFlag
       stepbrobd
     ];
     mainProgram = "iina";
diff --git a/pkgs/by-name/is/istat-menus/package.nix b/pkgs/by-name/is/istat-menus/package.nix
index 1a70a62e455d..4d6a33ee7195 100644
--- a/pkgs/by-name/is/istat-menus/package.nix
+++ b/pkgs/by-name/is/istat-menus/package.nix
@@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Set of nine separate and highly configurable menu items that let you know exactly what's going on inside your Mac";
     homepage = "https://bjango.com/mac/istatmenus/";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ donteatoreo ];
+    maintainers = with lib.maintainers; [ FlameFlag ];
     platforms = lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/it/itsycal/package.nix b/pkgs/by-name/it/itsycal/package.nix
index 77ba8fb620b3..97a2303ad262 100644
--- a/pkgs/by-name/it/itsycal/package.nix
+++ b/pkgs/by-name/it/itsycal/package.nix
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Tiny menu bar calendar";
     homepage = "https://www.mowglii.com/itsycal/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ donteatoreo ];
+    maintainers = with lib.maintainers; [ FlameFlag ];
     platforms = lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 5764c04814ee..b196b0bc550a 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -126,7 +126,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     mainProgram = "koboldcpp";
     maintainers = with lib.maintainers; [
       maxstrid
-      donteatoreo
+      FlameFlag
     ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index f21fcd84b5c9..d83846db5c5d 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.lgpl3;
     maintainers = with maintainers; [
       ilys
-      donteatoreo
+      FlameFlag
     ];
   };
 })
diff --git a/pkgs/by-name/mo/mousecape/package.nix b/pkgs/by-name/mo/mousecape/package.nix
index d7644cc6b58c..c1ba12f3557a 100644
--- a/pkgs/by-name/mo/mousecape/package.nix
+++ b/pkgs/by-name/mo/mousecape/package.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Cursor manager for macOS built using private, nonintrusive CoreGraphics APIs";
     homepage = "https://github.com/alexzielenski/Mousecape";
     license = lib.licenses.free;
-    maintainers = with lib.maintainers; [ donteatoreo ];
+    maintainers = with lib.maintainers; [ FlameFlag ];
     platforms = lib.platforms.darwin;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
diff --git a/pkgs/by-name/nu/numi/package.nix b/pkgs/by-name/nu/numi/package.nix
index 527ecd7c5d2c..d6047b16666d 100644
--- a/pkgs/by-name/nu/numi/package.nix
+++ b/pkgs/by-name/nu/numi/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Beautiful calculator app for macOS";
     homepage = "https://numi.app/";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ donteatoreo ];
+    maintainers = with lib.maintainers; [ FlameFlag ];
     platforms = lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix
index 37d9ef4606eb..b87771fe81cf 100644
--- a/pkgs/by-name/ra/raycast/package.nix
+++ b/pkgs/by-name/ra/raycast/package.nix
@@ -80,7 +80,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       lovesegfault
       stepbrobd
-      donteatoreo
+      FlameFlag
       jakecleary
     ];
     platforms = [
diff --git a/pkgs/by-name/sh/shottr/package.nix b/pkgs/by-name/sh/shottr/package.nix
index 4de63b3f11a3..4ddc1438fe31 100644
--- a/pkgs/by-name/sh/shottr/package.nix
+++ b/pkgs/by-name/sh/shottr/package.nix
@@ -58,7 +58,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://shottr.cc/";
     license = lib.licenses.unfree;
     mainProgram = "shottr";
-    maintainers = with lib.maintainers; [ donteatoreo ];
+    maintainers = with lib.maintainers; [ FlameFlag ];
     platforms = lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/so/soundsource/package.nix b/pkgs/by-name/so/soundsource/package.nix
index 621e51a8ab05..1435fa9db3df 100644
--- a/pkgs/by-name/so/soundsource/package.nix
+++ b/pkgs/by-name/so/soundsource/package.nix
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [
       emilytrau
-      donteatoreo
+      FlameFlag
     ];
     platforms = lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index f6d10bec54f3..2550c78cd3e9 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/exelban/stats";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      donteatoreo
+      FlameFlag
       emilytrau
     ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 4ae992b9c15d..fbf7f72a4a7a 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Vendicated/Vencord";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
-      donteatoreo
+      FlameFlag
       FlafyDev
       Gliczy
       NotAShelf
diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix
index eb285201edef..849fb26e59fa 100644
--- a/pkgs/by-name/wa/warp-terminal/package.nix
+++ b/pkgs/by-name/wa/warp-terminal/package.nix
@@ -113,7 +113,7 @@ let
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with maintainers; [
       imadnyc
-      donteatoreo
+      FlameFlag
       johnrtitor
     ];
     platforms = platforms.darwin ++ [
diff --git a/pkgs/by-name/wi/win-disk-writer/package.nix b/pkgs/by-name/wi/win-disk-writer/package.nix
index 667a91968a05..260ad8c7b783 100644
--- a/pkgs/by-name/wi/win-disk-writer/package.nix
+++ b/pkgs/by-name/wi/win-disk-writer/package.nix
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Windows Bootable USB creator for macOS";
     homepage = "https://github.com/TechUnRestricted/WinDiskWriter";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ donteatoreo ];
+    maintainers = with lib.maintainers; [ FlameFlag ];
     platforms = lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index 41b44b21706c..c483788084d0 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -129,7 +129,7 @@ python3Packages.buildPythonApplication rec {
     mainProgram = "yt-dlp";
     maintainers = with lib.maintainers; [
       SuperSandro2000
-      donteatoreo
+      FlameFlag
     ];
   };
 }
diff --git a/pkgs/development/python-modules/customtkinter/default.nix b/pkgs/development/python-modules/customtkinter/default.nix
index a29279816257..69b541e7ccf1 100644
--- a/pkgs/development/python-modules/customtkinter/default.nix
+++ b/pkgs/development/python-modules/customtkinter/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage {
       a consistent and modern look across all desktop platforms
       (Windows, macOS, Linux).
     '';
-    maintainers = with lib.maintainers; [ donteatoreo ];
+    maintainers = with lib.maintainers; [ FlameFlag ];
   };
 }

From 15aabfce6e82329d7664c6792ccf4f971cf0b412 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 17:20:11 +0000
Subject: [PATCH 2212/3724] terraform-providers.cloudflare: 5.8.2 -> 5.8.4

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a2d9ff5f716b..84b977357eef 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -270,13 +270,13 @@
     "vendorHash": "sha256-shRiTPn4A1rmwBnoSlRDfdYuHqSFvL4o6o8vAJutu3Q="
   },
   "cloudflare": {
-    "hash": "sha256-xTYaM5gVu8iZerTQFNRFXH3nG0Rgt+qtzL1eePTMaZQ=",
+    "hash": "sha256-Bv3M7GjroItGgnzqUQC4QMxJZ8I0WW+ukmXtQZstRoo=",
     "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
     "owner": "cloudflare",
     "repo": "terraform-provider-cloudflare",
-    "rev": "v5.8.2",
+    "rev": "v5.8.4",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-i7XUJhDvz35Uyc9K2DhjsABhror+hTBQ5iwukQTh4B4="
+    "vendorHash": "sha256-SM5bbYwuLTCRo7vu9SPRNpYO3m5yN8rzedgAqg/BbKw="
   },
   "cloudfoundry": {
     "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",

From 7267ca3413567c60fb7a5072a6eafa12a276b359 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Thu, 14 Aug 2025 22:08:58 +0200
Subject: [PATCH 2213/3724] azahar: 2122.1 -> 2123.1

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 .../az/azahar/fix-zstd-seekable-include.patch | 33 +++++++++++++
 pkgs/by-name/az/azahar/package.nix            | 47 ++++++++++---------
 .../az/azahar/update-cmake-lists.patch        | 43 -----------------
 3 files changed, 57 insertions(+), 66 deletions(-)
 create mode 100644 pkgs/by-name/az/azahar/fix-zstd-seekable-include.patch
 delete mode 100644 pkgs/by-name/az/azahar/update-cmake-lists.patch

diff --git a/pkgs/by-name/az/azahar/fix-zstd-seekable-include.patch b/pkgs/by-name/az/azahar/fix-zstd-seekable-include.patch
new file mode 100644
index 000000000000..9b0e352ebccf
--- /dev/null
+++ b/pkgs/by-name/az/azahar/fix-zstd-seekable-include.patch
@@ -0,0 +1,33 @@
+diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
+index 66cbbd52ed..a8b9d41e4e 100644
+--- a/externals/CMakeLists.txt
++++ b/externals/CMakeLists.txt
+@@ -230,13 +230,8 @@
+     )
+     target_link_libraries(zstd_seekable PUBLIC libzstd_static)
+ 
+-    target_link_libraries(libzstd_static INTERFACE zstd_seekable)
+-
+-    add_library(zstd ALIAS libzstd_static)
+-
+-    install(TARGETS zstd_seekable
+-        EXPORT zstdExports
+-    )
++    add_library(zstd INTERFACE)
++    target_link_libraries(zstd INTERFACE libzstd_static zstd_seekable)
+ endif()
+ 
+ # ENet
+diff --git a/src/common/zstd_compression.cpp b/src/common/zstd_compression.cpp
+index 1e38877a1c..ac85ea1978 100644
+--- a/src/common/zstd_compression.cpp
++++ b/src/common/zstd_compression.cpp
+@@ -13,7 +13,7 @@
+ #include <mutex>
+ #include <sstream>
+ #include <zstd.h>
+-#include <zstd/contrib/seekable_format/zstd_seekable.h>
++#include <zstd_seekable.h>
+ 
+ #include <boost/serialization/base_object.hpp>
+ #include <boost/serialization/unique_ptr.hpp>
diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix
index 98e2b8641f05..f8f3ede31a64 100644
--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -7,7 +7,6 @@
   doxygen,
   dynarmic,
   enet,
-  fetchpatch,
   fetchzip,
   fmt,
   ffmpeg_6-headless,
@@ -25,15 +24,15 @@
   pipewire,
   pkg-config,
   portaudio,
+  python3,
   robin-map,
   SDL2,
-  spirv-tools,
+  spirv-headers,
   soundtouch,
   stdenv,
   vulkan-headers,
   xbyak,
   xorg,
-  zstd,
   enableQtTranslations ? true,
   qt6,
   enableCubeb ? true,
@@ -44,6 +43,8 @@
   gamemode,
   enableGamemode ? lib.meta.availableOn stdenv.hostPlatform gamemode,
   nix-update-script,
+  darwinMinVersionHook,
+  apple-sdk_12,
 }:
 let
   inherit (lib)
@@ -55,16 +56,23 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "azahar";
-  version = "2122.1";
+  version = "2123.1";
 
   src = fetchzip {
     url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-${finalAttrs.version}.tar.xz";
-    hash = "sha256-RQ8dgD09cWyVWGSLzHz1oJOKia1OKr2jHqYwKaVGfxE=";
+    hash = "sha256-Rwq1fkRCzOna04d71w175iSQnH26z7gQfwfIZhFW/90=";
   };
 
+  patches = [
+    # https://github.com/azahar-emu/azahar/pull/1305
+    ./fix-zstd-seekable-include.patch
+  ];
+
+  strictDeps = true;
   nativeBuildInputs = [
     cmake
     doxygen
+    python3
     pkg-config
     qt6.wrapQtAppsHook
   ];
@@ -94,10 +102,15 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qttools
     soundtouch
     SDL2
-    spirv-tools
+    spirv-headers
     vulkan-headers
     xbyak
-    zstd
+
+    # https://github.com/azahar-emu/azahar/pull/1281
+    # spirv-tools
+
+    # Azahar uses zstd_seekable which is not currently packaged in nixpkgs
+    # zstd
   ]
   ++ optionals enableQtTranslations [ qt6.qttools ]
   ++ optionals enableCubeb [ cubeb ]
@@ -110,23 +123,10 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ optionals stdenv.hostPlatform.isDarwin [
     moltenvk
-  ];
 
-  patches = [
-    # Fix boost errors
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/Tatsh/tatsh-overlay/fa2f92b888f8c0aab70414ca560b823ffb33b122/games-emulation/lime3ds/files/lime3ds-0002-boost-fix.patch";
-      hash = "sha256-XJogqvQE7I5lVHtvQja0woVlO40blhFOqnoYftIQwJs=";
-    })
-
-    # Fix boost 1.87
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/Tatsh/tatsh-overlay/5c4497d9b67fa6f2fa327b2f2ce4cb5be8c9f2f7/games-emulation/lime3ds/files/lime3ds-0003-boost-1.87-fixes.patch";
-      hash = "sha256-mwfI7fTx9aWF/EjMW3bxoz++A+6ONbNA70tT5nkhDUU=";
-    })
-
-    # https://github.com/azahar-emu/azahar/pull/1165
-    ./update-cmake-lists.patch
+    # error: 'lowPowerModeEnabled' is unavailable: not available on macOS
+    apple-sdk_12
+    (darwinMinVersionHook "12.0")
   ];
 
   postPatch = ''
@@ -144,6 +144,7 @@ stdenv.mkDerivation (finalAttrs: {
     (cmakeBool "USE_SYSTEM_LIBS" true)
     (cmakeBool "DISABLE_SYSTEM_LODEPNG" true)
     (cmakeBool "DISABLE_SYSTEM_VMA" true)
+    (cmakeBool "DISABLE_SYSTEM_ZSTD" true)
     (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations)
     (cmakeBool "ENABLE_CUBEB" enableCubeb)
     (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence)
diff --git a/pkgs/by-name/az/azahar/update-cmake-lists.patch b/pkgs/by-name/az/azahar/update-cmake-lists.patch
deleted file mode 100644
index 4759d4c26d02..000000000000
--- a/pkgs/by-name/az/azahar/update-cmake-lists.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d9e7361a174f0f491c49fe78cd96a823c65e97dd Mon Sep 17 00:00:00 2001
-From: qr243vbi <uiguruigurovich@gmail.com>
-Date: Sat, 7 Jun 2025 01:18:03 +0300
-Subject: [PATCH 1/2] Update CMakeLists.txt
-
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 54051a4ef2..531c46abbe 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,6 +16,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
- include(DownloadExternals)
- include(CMakeDependentOption)
-+include(FindPkgConfig)
- 
- project(citra LANGUAGES C CXX ASM)
- 
-
-From 679a4036e2fbb96d1d6a803f3f59ae8f01f9e691 Mon Sep 17 00:00:00 2001
-From: qr243vbi <uiguruigurovich@gmail.com>
-Date: Sat, 7 Jun 2025 12:49:07 +0300
-Subject: [PATCH 2/2] Add missing find_package directive
-
----
- src/citra_qt/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
-index 1b78605a0a..de00dc4609 100644
---- a/src/citra_qt/CMakeLists.txt
-+++ b/src/citra_qt/CMakeLists.txt
-@@ -273,6 +273,7 @@ if (ENABLE_VULKAN)
- endif()
- 
- if (NOT WIN32)
-+    find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
-     target_include_directories(citra_qt PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS})
- endif()
- 

From 8a58674f5fb0a227cf3020d8538c6f2333716383 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 17:36:15 +0000
Subject: [PATCH 2214/3724] unpoller: 2.15.3 -> 2.15.4

---
 pkgs/by-name/un/unpoller/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix
index f8a1515b7c1f..0cb0cd855c30 100644
--- a/pkgs/by-name/un/unpoller/package.nix
+++ b/pkgs/by-name/un/unpoller/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "unpoller";
-  version = "2.15.3";
+  version = "2.15.4";
 
   src = fetchFromGitHub {
     owner = "unpoller";
     repo = "unpoller";
     rev = "v${version}";
-    hash = "sha256-MqL+V5NVRE/jzOnj1yFVlT1HPjeiUWsNkJyMetWIaj0=";
+    hash = "sha256-srAskagINMPWG+k6bbUD+8QZyD7C3PbsApQfeEF01NE=";
   };
 
-  vendorHash = "sha256-w6rU+BV7T8trCd6JBqyXkEgv3qkGTEQpBEq2WsTCo04=";
+  vendorHash = "sha256-kS+UUD6lexYAy7so7DGq6PiOYHSwLFcOw7+KC2jIlMg=";
 
   ldflags = [
     "-w"

From 9ae82ab59c02f8c862e34d9f40417eadbe104e2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 17:44:07 +0000
Subject: [PATCH 2215/3724] python3Packages.usb-protocol: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/development/python-modules/usb-protocol/default.nix b/pkgs/development/python-modules/usb-protocol/default.nix
index e75884ffa4b3..7d5be391a2dc 100644
--- a/pkgs/development/python-modules/usb-protocol/default.nix
+++ b/pkgs/development/python-modules/usb-protocol/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "usb-protocol";
-  version = "0.9.1";
+  version = "0.9.2";
   pyproject = true;
   disabled = pythonOlder "3.8";
 
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "greatscottgadgets";
     repo = "python-usb-protocol";
     tag = version;
-    hash = "sha256-CYbXs/SRC1FAVEzfw0gwf6U0qQ9Q34nyuj5yfjHfDn8=";
+    hash = "sha256-lLepd2ja/UBSOARHXVwuCxLCIp0vTpUQBMdR2ovfhq8=";
   };
 
   postPatch = ''
@@ -48,7 +48,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/greatscottgadgets/python-usb-protocol/releases/tag/${version}";
+    changelog = "https://github.com/greatscottgadgets/python-usb-protocol/releases/tag/${src.tag}";
     description = "Python library providing utilities, data structures, constants, parsers, and tools for working with the USB protocol";
     homepage = "https://github.com/greatscottgadgets/python-usb-protocol";
     license = lib.licenses.bsd3;

From 234b9983c7a8f31978e9c5c54153d090e4b11b00 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 20 Aug 2025 20:47:47 +0300
Subject: [PATCH 2216/3724] linux_testing: 6.17-rc1 -> 6.17-rc2

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

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 16b9b4fd8254..c8f342f222c7 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,7 +1,7 @@
 {
     "testing": {
-        "version": "6.17-rc1",
-        "hash": "sha256:0dilsyjyx06b5f9wln6i58xi6nja2g5pj9p2kclfqqhbrgzxkyfl"
+        "version": "6.17-rc2",
+        "hash": "sha256:1ax2gjbs4l8pgkwp3qwy3mxyfxdvbv02943yj4iw5df7h3x50wcz"
     },
     "6.1": {
         "version": "6.1.148",

From 104fae09a98af2f73ce165671c088b6f6c281596 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 20 Aug 2025 20:47:53 +0300
Subject: [PATCH 2217/3724] linux_6_16: 6.16.1 -> 6.16.2

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

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index c8f342f222c7..7c21f852ece8 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -32,7 +32,7 @@
         "hash": "sha256:01pxk3cnil1wbysp4s6ybh5djskxzf9llmk1qy7zfr2l4mwnbkd4"
     },
     "6.16": {
-        "version": "6.16.1",
-        "hash": "sha256:1fmcl66wzb4qwz60lgqjan8h9rwnrzw5gndjncaf9qdcqwdljhza"
+        "version": "6.16.2",
+        "hash": "sha256:0vghyk7ggmgnsldyz67v9llzbi6mxyivx83z7fylyxrxg7xacq5p"
     }
 }

From 5e374f9572715b6244942c7767717adba6c3b7b2 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 20 Aug 2025 20:47:57 +0300
Subject: [PATCH 2218/3724] linux_6_15: 6.15.10 -> 6.15.11

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

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 7c21f852ece8..673912cdc215 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -28,8 +28,8 @@
         "hash": "sha256:1yy17c06sn6l0skz8n1kxqhzldgwxxd0xhs11fd3086d56554128"
     },
     "6.15": {
-        "version": "6.15.10",
-        "hash": "sha256:01pxk3cnil1wbysp4s6ybh5djskxzf9llmk1qy7zfr2l4mwnbkd4"
+        "version": "6.15.11",
+        "hash": "sha256:14sxwrvw9p4ybizb8ky1rgahc62q0aw5qkmzqp3cpnavqfgldaw9"
     },
     "6.16": {
         "version": "6.16.2",

From 85d832189b216ee6db075f00b78d7e2d4f631ad5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 20 Aug 2025 20:48:00 +0300
Subject: [PATCH 2219/3724] linux_6_12: 6.12.42 -> 6.12.43

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

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 673912cdc215..71cf61687254 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -24,8 +24,8 @@
         "hash": "sha256:0p6yjifwyrqlppn40isgxb0b5vqmljggmnp7w75vlc2c6fvzxll0"
     },
     "6.12": {
-        "version": "6.12.42",
-        "hash": "sha256:1yy17c06sn6l0skz8n1kxqhzldgwxxd0xhs11fd3086d56554128"
+        "version": "6.12.43",
+        "hash": "sha256:1vmxywg11z946i806sg7rk7jr9px87spmwwbzjxpps2nsjybpjqg"
     },
     "6.15": {
         "version": "6.15.11",

From c0d7f1f4aebdc05c4a23efcc4dd5c7a43b1e2a0d Mon Sep 17 00:00:00 2001
From: Dom Rodriguez <shymega@shymega.org.uk>
Date: Wed, 2 Jul 2025 22:36:25 +0100
Subject: [PATCH 2220/3724] buildstream: 2.4.1 -> 2.5.0

Applied two patches from upstream repository for Buildstrream, to fix
the Protobuf runtime warnings, and dependency constraints.

These patches can be removed once Buildstream v2.6.0 is released.
---
 pkgs/by-name/bu/buildstream/package.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bu/buildstream/package.nix b/pkgs/by-name/bu/buildstream/package.nix
index 2ea655ec4a66..47c84a04cdc3 100644
--- a/pkgs/by-name/bu/buildstream/package.nix
+++ b/pkgs/by-name/bu/buildstream/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3Packages,
   fetchFromGitHub,
+  fetchpatch,
 
   # buildInputs
   buildbox,
@@ -20,16 +21,28 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "buildstream";
-  version = "2.4.1";
+  version = "2.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "buildstream";
     tag = version;
-    hash = "sha256-6a0VzYO5yj7EHvAb0xa4xZ0dgBKjFcwKv2F4o93oahY=";
+    hash = "sha256-/kGmAHx10//iVeqLXwcIWNI9FGIi0LlNJW+s6v0yU3Q=";
   };
 
+  # FIXME: To be removed in v2.6.0 of Buildstream.
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/apache/buildstream/commit/9c4378ab2ec71b6b79ef90ee4bd950dd709a0310.patch?full_index=1";
+      hash = "sha256-po3Dn7gCv7o7h3k8qhmoH/b6Vv6ikKO/pkA20RvdU1g=";
+    })
+    (fetchpatch {
+      url = "https://github.com/apache/buildstream/commit/456a464b2581c52cad2b0b48596f5c19ad1db23f.patch?full_index=1";
+      hash = "sha256-0oFENx4AUhd1uJxRzbKzO5acGDosCc4vFJaSJ6urvhk=";
+    })
+  ];
+
   build-system = with python3Packages; [
     cython
     pdm-pep517
@@ -104,6 +117,7 @@ python3Packages.buildPythonApplication rec {
     "test_source_pull_partial_fallback_fetch"
 
     # FAILED tests/sources/tar.py::test_out_of_basedir_hardlinks - AssertionError
+    # FIXME: To be removed in v2.6.0 of Buildstream.
     "test_out_of_basedir_hardlinks"
   ];
 

From 186d5d5881a1573f2f619ac46841ef3b0c76fc52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 17:56:00 +0000
Subject: [PATCH 2221/3724] python3Packages.disposable-email-domains: 0.0.130
 -> 0.0.131

---
 .../python-modules/disposable-email-domains/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix
index 9d98ed2d9d56..47a163f942e0 100644
--- a/pkgs/development/python-modules/disposable-email-domains/default.nix
+++ b/pkgs/development/python-modules/disposable-email-domains/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "disposable-email-domains";
-  version = "0.0.130";
+  version = "0.0.131";
   pyproject = true;
 
   # No tags on GitHub
   src = fetchPypi {
     pname = "disposable_email_domains";
     inherit version;
-    hash = "sha256-4387cKqxEQew+PLcCFkL2Y0FcPX7FrEfe+dfk+Pj/vw=";
+    hash = "sha256-9TlGamU5x3MhZhm4xdCO5a342duXodIu0J2LDH5uOrY=";
   };
 
   build-system = [

From 3ca5ae95601379faeead7a25888d1de520d2fcdb Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 20 Aug 2025 15:01:31 -0300
Subject: [PATCH 2222/3724] roslyn-ls: pin net8/9 versions

---
 pkgs/by-name/ro/roslyn-ls/deps.json           | 168 ------------------
 pkgs/by-name/ro/roslyn-ls/package.nix         |  26 ++-
 .../ro/roslyn-ls/runtimedownload.patch        |  15 --
 3 files changed, 24 insertions(+), 185 deletions(-)
 delete mode 100644 pkgs/by-name/ro/roslyn-ls/runtimedownload.patch

diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json
index c8b31d32d7d5..3a74e40f419e 100644
--- a/pkgs/by-name/ro/roslyn-ls/deps.json
+++ b/pkgs/by-name/ro/roslyn-ls/deps.json
@@ -29,66 +29,6 @@
     "hash": "sha256-WnXjX2pGroKn+KukCgPeUUZAkz2S6CdMrCc9P2VcBDQ=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.198/messagepack.annotations.2.5.198.nupkg"
   },
-  {
-    "pname": "Microsoft.AspNetCore.App.Ref",
-    "version": "8.0.17",
-    "hash": "sha256-NNGXfUV5RVt1VqLI99NlHoBkt2Vv/Hg3TAHzm8nGM8M=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/8.0.17/microsoft.aspnetcore.app.ref.8.0.17.nupkg"
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Ref",
-    "version": "9.0.6",
-    "hash": "sha256-5lyWeyUruj1azKGhUa09h7CrKQFKG/eeKFER2X4RxO8=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/9.0.6/microsoft.aspnetcore.app.ref.9.0.6.nupkg"
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
-    "version": "8.0.17",
-    "hash": "sha256-Eunz3nZF5r8a9nqwdeorQPgqd5G+Z4ddofMeAk6VmnA=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/8.0.17/microsoft.aspnetcore.app.runtime.linux-arm64.8.0.17.nupkg"
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
-    "version": "9.0.6",
-    "hash": "sha256-OYGCWHvZCYDdgJK2IL0pePsOOTgq6y0rQt5gDJedv2s=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/9.0.6/microsoft.aspnetcore.app.runtime.linux-arm64.9.0.6.nupkg"
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
-    "version": "8.0.17",
-    "hash": "sha256-SWdah72tC5i2CQL4mRUYfHC0Kh8+C2jiskIIeC74smY=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/8.0.17/microsoft.aspnetcore.app.runtime.linux-x64.8.0.17.nupkg"
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
-    "version": "9.0.6",
-    "hash": "sha256-q0dK5La8B+fxo2Qtz9TA+KFTDW3/6+Y1XtsGF3H9TJY=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/9.0.6/microsoft.aspnetcore.app.runtime.linux-x64.9.0.6.nupkg"
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
-    "version": "8.0.17",
-    "hash": "sha256-y55EGfQ2FzrY2X5+Ne5N3dqi5WNHkFTGVW1hEMrh6OI=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/8.0.17/microsoft.aspnetcore.app.runtime.osx-arm64.8.0.17.nupkg"
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
-    "version": "9.0.6",
-    "hash": "sha256-xZrp6yT2GYYazdzwXJ+54/j0jbrso94/bgBGeSgEA+I=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/9.0.6/microsoft.aspnetcore.app.runtime.osx-arm64.9.0.6.nupkg"
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
-    "version": "8.0.17",
-    "hash": "sha256-uRCCNPevPemvKIuUxy/VtQlgskChbiAauMWVK/xhoc0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/8.0.17/microsoft.aspnetcore.app.runtime.osx-x64.8.0.17.nupkg"
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
-    "version": "9.0.6",
-    "hash": "sha256-0L5HMCXRf7qkj0yuAGlt3ZWrXVAKzEfnRzi+cX+heEQ=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/9.0.6/microsoft.aspnetcore.app.runtime.osx-x64.9.0.6.nupkg"
-  },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
     "version": "9.0.0",
@@ -293,114 +233,6 @@
     "hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.6.3/microsoft.net.stringtools.17.6.3.nupkg"
   },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-arm64",
-    "version": "8.0.17",
-    "hash": "sha256-pzOqFCd+UrIXmWGDfds5GxkI+Asjx30yFtLIuHFu/h4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/8.0.17/microsoft.netcore.app.host.linux-arm64.8.0.17.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-arm64",
-    "version": "9.0.6",
-    "hash": "sha256-c03NdUDlM2oM0MBOTLsYhRfS64teVXfue3SNSza2gJI=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/9.0.6/microsoft.netcore.app.host.linux-arm64.9.0.6.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-x64",
-    "version": "8.0.17",
-    "hash": "sha256-AGnEGHcO2hfvChG3xEGOTA6dX4MiYPB7FoBkmWz3dc8=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/8.0.17/microsoft.netcore.app.host.linux-x64.8.0.17.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-x64",
-    "version": "9.0.6",
-    "hash": "sha256-OQwudVyZi+SeLpiNzxpkxVjNZSs0kq4GG10zF3TERS8=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/9.0.6/microsoft.netcore.app.host.linux-x64.9.0.6.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.osx-arm64",
-    "version": "8.0.17",
-    "hash": "sha256-fpMzkOWaA3OFNtHsqOk9s9xKVrcrqOyKHxE7jk8hebg=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/8.0.17/microsoft.netcore.app.host.osx-arm64.8.0.17.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.osx-arm64",
-    "version": "9.0.6",
-    "hash": "sha256-mkLxg2k2NH64SPJ87pgKdYMYXQa7nGbSVf/yfNX3s+g=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/9.0.6/microsoft.netcore.app.host.osx-arm64.9.0.6.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.osx-x64",
-    "version": "8.0.17",
-    "hash": "sha256-Hrn01x+S+gnGEEHhr6mN6bPyqVAhp5u3CqgWwQbh4To=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/8.0.17/microsoft.netcore.app.host.osx-x64.8.0.17.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.osx-x64",
-    "version": "9.0.6",
-    "hash": "sha256-NRrb7WQPpZqarH7OTsBZWroNrBCS6sMdiGm2wlqqXNw=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/9.0.6/microsoft.netcore.app.host.osx-x64.9.0.6.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Ref",
-    "version": "8.0.17",
-    "hash": "sha256-tKawpjkMjV0ysNIWWrgHTiLxncZJDRNiDkQBwl255l4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/8.0.17/microsoft.netcore.app.ref.8.0.17.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Ref",
-    "version": "9.0.6",
-    "hash": "sha256-pSDW5VBIA11bwuZv8klq4+P+X6jFwZqu9JR1M1aUT9k=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/9.0.6/microsoft.netcore.app.ref.9.0.6.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
-    "version": "8.0.17",
-    "hash": "sha256-FutphE4bEjd8s6ZqpFXrD1zuCDkNCJ7Vnl0pBm86HBA=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/8.0.17/microsoft.netcore.app.runtime.linux-arm64.8.0.17.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
-    "version": "9.0.6",
-    "hash": "sha256-+SEo4lrzGnLk1+jJQeJeYS7PJxDID/N1WH6snfsRGAI=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/9.0.6/microsoft.netcore.app.runtime.linux-arm64.9.0.6.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
-    "version": "8.0.17",
-    "hash": "sha256-6YVEXiJ3b2gZAYri8iSRBdi/J+0DEl7FcwBX6h1Unkg=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/8.0.17/microsoft.netcore.app.runtime.linux-x64.8.0.17.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
-    "version": "9.0.6",
-    "hash": "sha256-Y3VzFepVQghnvo6LWoeGnBAaWygy/eLJ8oLlnmRHjps=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/9.0.6/microsoft.netcore.app.runtime.linux-x64.9.0.6.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
-    "version": "8.0.17",
-    "hash": "sha256-J3dfDial8GHyKQMFuBNFtOMD/mOK58vjrK2ZtrYObZg=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/8.0.17/microsoft.netcore.app.runtime.osx-arm64.8.0.17.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
-    "version": "9.0.6",
-    "hash": "sha256-ZxAcTppjSDMaMaRXKX8C4BNg3d1Hy6xVt4AuPpPTxwI=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/9.0.6/microsoft.netcore.app.runtime.osx-arm64.9.0.6.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.osx-x64",
-    "version": "8.0.17",
-    "hash": "sha256-WnkJyhSBHMw/VtLHWy0AFwzzkbIC1YQugFuj3Adg+Ks=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/8.0.17/microsoft.netcore.app.runtime.osx-x64.8.0.17.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.osx-x64",
-    "version": "9.0.6",
-    "hash": "sha256-3wCLKoYt6LeJwV14M1DkZspmjxTUdqsiRSJ96y3qMvk=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/9.0.6/microsoft.netcore.app.runtime.osx-x64.9.0.6.nupkg"
-  },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "5.0.0",
diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
index 6f7c37ee7b66..bd5385c56cb9 100644
--- a/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -7,6 +7,7 @@
   testers,
   roslyn-ls,
   jq,
+  writeText,
 }:
 let
   pname = "roslyn-ls";
@@ -28,6 +29,24 @@ let
   rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system;
 
   project = "Microsoft.CodeAnalysis.LanguageServer";
+
+  targets = writeText "versions.targets" ''
+    <Project>
+      <ItemGroup>
+        <KnownFrameworkReference Update="@(KnownFrameworkReference)">
+          <LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'net8.0'">${dotnetCorePackages.sdk_8_0.runtime.version}</LatestRuntimeFrameworkVersion>
+          <LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'net9.0'">${dotnetCorePackages.sdk_9_0.runtime.version}</LatestRuntimeFrameworkVersion>
+          <TargetingPackVersion Condition="'%(TargetFramework)' == 'net8.0'">${dotnetCorePackages.sdk_8_0.runtime.version}</TargetingPackVersion>
+          <TargetingPackVersion Condition="'%(TargetFramework)' == 'net9.0'">${dotnetCorePackages.sdk_9_0.runtime.version}</TargetingPackVersion>
+        </KnownFrameworkReference>
+        <KnownAppHostPack Update="@(KnownAppHostPack)">
+          <AppHostPackVersion Condition="'%(TargetFramework)' == 'net8.0'">${dotnetCorePackages.sdk_8_0.runtime.version}</AppHostPackVersion>
+          <AppHostPackVersion Condition="'%(TargetFramework)' == 'net9.0'">${dotnetCorePackages.sdk_9_0.runtime.version}</AppHostPackVersion>
+        </KnownAppHostPack>
+      </ItemGroup>
+    </Project>
+  '';
+
 in
 buildDotnetModule rec {
   inherit pname dotnet-sdk dotnet-runtime;
@@ -57,20 +76,23 @@ buildDotnetModule rec {
     # until made configurable/and or different location
     # https://github.com/dotnet/roslyn/issues/76892
     ./cachedirectory.patch
-    # Force download of apphost
-    ./runtimedownload.patch
   ];
 
   postPatch = ''
     # Upstream uses rollForward = latestPatch, which pins to an *exact* .NET SDK version.
     jq '.sdk.rollForward = "latestMinor"' < global.json > global.json.tmp
     mv global.json.tmp global.json
+
+    substituteInPlace Directory.Build.targets \
+      --replace-fail '</Project>' '<Import Project="${targets}" /></Project>'
   '';
 
   dotnetFlags = [
     "-p:TargetRid=${rid}"
     # this removes the Microsoft.WindowsDesktop.App.Ref dependency
     "-p:EnableWindowsTargeting=false"
+    # this is needed for the KnownAppHostPack changes to work
+    "-p:EnableAppHostPackDownload=true"
   ];
 
   # two problems solved here:
diff --git a/pkgs/by-name/ro/roslyn-ls/runtimedownload.patch b/pkgs/by-name/ro/roslyn-ls/runtimedownload.patch
deleted file mode 100644
index a1fee909c1f0..000000000000
--- a/pkgs/by-name/ro/roslyn-ls/runtimedownload.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
-index c32f01a6695..b98bab44c4e 100644
---- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
-+++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
-@@ -54,8 +54,8 @@
-     <RuntimeIdentifiers Condition="'$(TargetRid)' == '' and '$(PortableTargetRid)' == ''">win-x64;win-arm64;linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
- 
-     <!-- These indicate that the runtime/apphost packages should not be downloaded as part of build/restore -->
--    <EnableRuntimePackDownload>false</EnableRuntimePackDownload>
--    <EnableAppHostPackDownload>false</EnableAppHostPackDownload>
-+    <EnableRuntimePackDownload>true</EnableRuntimePackDownload>
-+    <EnableAppHostPackDownload>true</EnableAppHostPackDownload>
- 
-     <!-- Publish ready to run executables when we're publishing platform specific executables. -->
-     <PublishReadyToRun Condition="'$(RuntimeIdentifier)' != '' AND '$(Configuration)' == 'Release' ">true</PublishReadyToRun>

From 7860dd8e0e8163dc459a241c1a2d11f91090a39b Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Wed, 20 Aug 2025 10:41:25 -0300
Subject: [PATCH 2223/3724] etcd_3_6: init 3.6.4

Release: https://github.com/etcd-io/etcd/releases/tag/v3.6.4

Changelog: https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.6.md

Migration notes: https://etcd.io/docs/v3.6/upgrades/upgrade_3_6/
---
 pkgs/by-name/et/etcd_3_6/package.nix | 148 +++++++++++++++++++++++++++
 pkgs/by-name/et/etcd_3_6/update.sh   |  74 ++++++++++++++
 2 files changed, 222 insertions(+)
 create mode 100644 pkgs/by-name/et/etcd_3_6/package.nix
 create mode 100755 pkgs/by-name/et/etcd_3_6/update.sh

diff --git a/pkgs/by-name/et/etcd_3_6/package.nix b/pkgs/by-name/et/etcd_3_6/package.nix
new file mode 100644
index 000000000000..c7f75ac9d091
--- /dev/null
+++ b/pkgs/by-name/et/etcd_3_6/package.nix
@@ -0,0 +1,148 @@
+{
+  applyPatches,
+  buildGoModule,
+  fetchFromGitHub,
+  fetchpatch,
+  installShellFiles,
+  k3s,
+  lib,
+  nixosTests,
+  stdenv,
+  symlinkJoin,
+}:
+
+let
+  version = "3.6.4";
+  etcdSrcHash = "sha256-otz+06cOD2MVnMZWKId1GN+MeZfnDbdudiYfVCKdzuo=";
+  etcdCtlVendorHash = "sha256-kTH+s/SY+xwo6kt6iPJ7XDhin0jPk0FBr0eOe/717bE=";
+  etcdUtlVendorHash = "sha256-P0yx9YMMD9vT7N6LOlo26EAOi+Dj33p3ZjAYEoaL19A=";
+  etcdServerVendorHash = "sha256-kgbCT1JxI98W89veCItB7ZfW4d9D3/Ip3tOuFKEX9v4=";
+
+  src = applyPatches {
+    src = fetchFromGitHub {
+      owner = "etcd-io";
+      repo = "etcd";
+      tag = "v${version}";
+      hash = etcdSrcHash;
+    };
+    patches = [
+      (fetchpatch {
+        url = "https://github.com/etcd-io/etcd/commit/31650ab0c8df43af05fc4c13b48ffee59271eec7.patch";
+        hash = "sha256-Q94HOLFx2fnb61wMQsAUT4sIBXfxXqW9YEayukQXX18=";
+      })
+    ];
+  };
+
+  env = {
+    CGO_ENABLED = 0;
+  };
+
+  meta = {
+    description = "Distributed reliable key-value store for the most critical data of a distributed system";
+    downloadPage = "https://github.com/etcd-io/etcd";
+    license = lib.licenses.asl20;
+    homepage = "https://etcd.io/";
+    maintainers = with lib.maintainers; [ dtomvan ];
+    platforms = lib.platforms.darwin ++ lib.platforms.linux;
+  };
+
+  etcdserver = buildGoModule {
+    pname = "etcdserver";
+
+    inherit
+      env
+      meta
+      src
+      version
+      ;
+
+    vendorHash = etcdServerVendorHash;
+
+    __darwinAllowLocalNetworking = true;
+
+    modRoot = "./server";
+
+    preInstall = ''
+      mv $GOPATH/bin/{server,etcd}
+    '';
+
+    # We set the GitSHA to `GitNotFound` to match official build scripts when
+    # git is unavailable. This is to avoid doing a full Git Checkout of etcd.
+    # User facing version numbers are still available in the binary, just not
+    # the sha it was built from.
+    ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ];
+  };
+
+  etcdutl = buildGoModule {
+    pname = "etcdutl";
+
+    inherit
+      env
+      meta
+      src
+      version
+      ;
+
+    vendorHash = etcdUtlVendorHash;
+
+    __darwinAllowLocalNetworking = true;
+
+    modRoot = "./etcdutl";
+
+    nativeBuildInputs = [ installShellFiles ];
+
+    postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      for shell in bash fish zsh; do
+        installShellCompletion --cmd etcdutl \
+          --$shell <($out/bin/etcdutl completion $shell)
+      done
+    '';
+  };
+
+  etcdctl = buildGoModule {
+    pname = "etcdctl";
+
+    inherit
+      env
+      meta
+      src
+      version
+      ;
+
+    vendorHash = etcdCtlVendorHash;
+
+    modRoot = "./etcdctl";
+
+    nativeBuildInputs = [ installShellFiles ];
+
+    postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      for shell in bash fish zsh; do
+        installShellCompletion --cmd etcdctl \
+          --$shell <($out/bin/etcdctl completion $shell)
+      done
+    '';
+  };
+in
+symlinkJoin {
+  name = "etcd-${version}";
+
+  inherit meta version;
+
+  passthru = {
+    deps = {
+      inherit etcdserver etcdutl etcdctl;
+    };
+    # Fix-Me: Tests for etcd 3.6 needs work.
+    # tests = {
+    #   inherit (nixosTests) etcd etcd-cluster;
+    #   k3s = k3s.passthru.tests.etcd;
+    # };
+    updateScript = ./update.sh;
+  };
+
+  paths = [
+    etcdserver
+    etcdutl
+    etcdctl
+  ];
+}
diff --git a/pkgs/by-name/et/etcd_3_6/update.sh b/pkgs/by-name/et/etcd_3_6/update.sh
new file mode 100755
index 000000000000..1330f88d9085
--- /dev/null
+++ b/pkgs/by-name/et/etcd_3_6/update.sh
@@ -0,0 +1,74 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnugrep gnused jq nurl
+
+set -x -eu -o pipefail
+
+MAJOR_VERSION=3
+MINOR_VERSION=6
+
+ETCD_PATH="$(dirname "$0")"
+ETCD_VERSION_MAJOR_MINOR=${MAJOR_VERSION}.${MINOR_VERSION}
+ETCD_PKG_NAME=etcd_${MAJOR_VERSION}_${MINOR_VERSION}
+NIXPKGS_PATH="$(git rev-parse --show-toplevel)"
+
+LATEST_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \
+    --silent https://api.github.com/repos/etcd-io/etcd/releases \
+    | jq -r 'map(select(.prerelease == false))' \
+    | jq -r 'map(.tag_name)' \
+    | grep "v${ETCD_VERSION_MAJOR_MINOR}." \
+    | sed 's|[", ]||g' \
+    | sort -rV | head -n1 )
+
+LATEST_VERSION=$(echo ${LATEST_TAG} | sed 's/^v//')
+
+OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_PATH {}; \
+    $ETCD_PKG_NAME.version or (builtins.parseDrvName $ETCD_PKG_NAME.name).version" | tr -d '"')"
+
+if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
+    echo "Attempting to update etcd from $OLD_VERSION to $LATEST_VERSION"
+    ETCD_SRC_HASH=$(nix-prefetch-url --quiet --unpack https://github.com/etcd-io/etcd/archive/refs/tags/${LATEST_TAG}.tar.gz)
+    ETCD_SRC_HASH=$(nix hash to-sri --type sha256 $ETCD_SRC_HASH)
+
+    setKV () {
+        sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "$ETCD_PATH/default.nix"
+    }
+
+    setKV version $LATEST_VERSION
+    setKV etcdSrcHash $ETCD_SRC_HASH
+
+    getAndSetVendorHash () {
+        local EMPTY_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" # Hash from lib.fakeHash
+        local VENDOR_HASH=$EMPTY_HASH
+        local PKG_KEY=$1
+        local INNER_PKG=$2
+
+        setKV $PKG_KEY $EMPTY_HASH
+
+        set +e
+        VENDOR_HASH=$(nurl -e "(import ${NIXPKGS_PATH}/. {}).$ETCD_PKG_NAME.passthru.deps.$INNER_PKG.goModules")
+        set -e
+
+        if [ -n "${VENDOR_HASH:-}" ]; then
+            setKV $PKG_KEY $VENDOR_HASH
+        else
+            echo "Update failed. $PKG_KEY is empty."
+            exit 1
+        fi
+    }
+
+    getAndSetVendorHash etcdServerVendorHash etcdserver
+    getAndSetVendorHash etcdUtlVendorHash etcdutl
+    getAndSetVendorHash etcdCtlVendorHash etcdctl
+
+    # `git` flag here is to be used by local maintainers to speed up the bump process
+    if [ $# -eq 1 ] && [ "$1" = "git" ]; then
+        git switch -c "package-$ETCD_PKG_NAME-$LATEST_VERSION"
+        git add "$ETCD_PATH"/default.nix
+        git commit -m "$ETCD_PKG_NAME: $OLD_VERSION -> $LATEST_VERSION
+
+Release: https://github.com/etcd-io/etcd/releases/tag/$LATEST_TAG"
+    fi
+
+else
+    echo "etcd is already up-to-date at $OLD_VERSION"
+fi

From 34174803217b4415512832ee7d1bcc0153d8bcc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 20 Aug 2025 11:16:42 -0700
Subject: [PATCH 2224/3724] python3Packages.pyproj: 3.7.1 -> 3.7.2

Diff: https://github.com/pyproj4/pyproj/compare/3.7.1...3.7.2

Changelog: https://github.com/pyproj4/pyproj/blob/refs/tags/3.7.2/docs/history.rst
---
 .../python-modules/pyproj/default.nix         | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix
index 577197aa371b..a991be205b01 100644
--- a/pkgs/development/python-modules/pyproj/default.nix
+++ b/pkgs/development/python-modules/pyproj/default.nix
@@ -8,25 +8,26 @@
 
   certifi,
   cython,
-  mock,
   numpy,
   pandas,
   proj,
+  setuptools,
   shapely,
   xarray,
 }:
 
 buildPythonPackage rec {
   pname = "pyproj";
-  version = "3.7.1";
-  format = "setuptools";
-  disabled = pythonOlder "3.9";
+  version = "3.7.2";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "pyproj4";
     repo = "pyproj";
     tag = version;
-    hash = "sha256-tVzifc+Y5u9Try5FHt67rj/+zaok0JNn3M8plMqX90g=";
+    hash = "sha256-WV344gxcmq08sIUVevn6uD50FSy4JvLt4aret5ZakYQ=";
   };
 
   # force pyproj to use ${proj}
@@ -37,13 +38,16 @@ buildPythonPackage rec {
     })
   ];
 
-  nativeBuildInputs = [ cython ];
+  build-system = [
+    cython
+    setuptools
+  ];
+
   buildInputs = [ proj ];
 
-  propagatedBuildInputs = [ certifi ];
+  dependencies = [ certifi ];
 
   nativeCheckInputs = [
-    mock
     numpy
     pandas
     pytestCheckHook
@@ -57,7 +61,6 @@ buildPythonPackage rec {
   '';
 
   disabledTestPaths = [
-    "test/test_doctest_wrapper.py"
     "test/test_datadir.py"
   ];
 
@@ -65,25 +68,13 @@ buildPythonPackage rec {
     # The following tests try to access network and end up with a URLError
     "test__load_grid_geojson_old_file"
     "test_get_transform_grid_list"
-    "test_get_transform_grid_list__area_of_use"
-    "test_get_transform_grid_list__bbox__antimeridian"
-    "test_get_transform_grid_list__bbox__out_of_bounds"
-    "test_get_transform_grid_list__contains"
-    "test_get_transform_grid_list__file"
-    "test_get_transform_grid_list__source_id"
     "test_sync__area_of_use__list"
     "test_sync__bbox__list"
-    "test_sync__bbox__list__exclude_world_coverage"
     "test_sync__download_grids"
     "test_sync__file__list"
     "test_sync__source_id__list"
     "test_sync_download"
-    "test_sync_download__directory"
-    "test_sync_download__system_directory"
     "test_transformer_group__download_grids"
-
-    # proj-data grid required
-    "test_azimuthal_equidistant"
   ];
 
   pythonImportsCheck = [

From bce4247fbe77a1920ead781d6a0a3c2cfbbf4a79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 18:38:19 +0000
Subject: [PATCH 2225/3724] kubefirst: 2.8.4 -> 2.9.0

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

diff --git a/pkgs/by-name/ku/kubefirst/package.nix b/pkgs/by-name/ku/kubefirst/package.nix
index 35d0ab6c2c07..121d022f26dc 100644
--- a/pkgs/by-name/ku/kubefirst/package.nix
+++ b/pkgs/by-name/ku/kubefirst/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kubefirst";
-  version = "2.8.4";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "konstructio";
     repo = "kubefirst";
     tag = "v${version}";
-    hash = "sha256-5A5luRvUr5qBua6Jw5/SJqIHLZfEpkXFoqxTnpUjlas=";
+    hash = "sha256-oPuvkFT3MUv5LY1qhfjFEfgxvZRGziLUyEZhHKVdGrQ=";
   };
 
   vendorHash = "sha256-1u34cuPUY/5fYd073UhRUu/5/1nhPadTI06+3o+uE7w=";

From 96490c0bda9cb85e8636d46a4299a4eb2cbcbee9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 18:45:51 +0000
Subject: [PATCH 2226/3724] zvm: 0.8.7 -> 0.8.8

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

diff --git a/pkgs/by-name/zv/zvm/package.nix b/pkgs/by-name/zv/zvm/package.nix
index c23a578a652d..88710b5a9cde 100644
--- a/pkgs/by-name/zv/zvm/package.nix
+++ b/pkgs/by-name/zv/zvm/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "zvm";
-  version = "0.8.7";
+  version = "0.8.8";
 
   src = fetchFromGitHub {
     owner = "tristanisham";
     repo = "zvm";
     tag = "v${version}";
-    hash = "sha256-yRdORWnWcVZGUhVnPVDhK4VO1eJHrbPkY00QQB1JwmI=";
+    hash = "sha256-M1xpE2Lq6XZgvH9J0c2Xj1BJNN+4TTGwp4iluVyVAJs=";
   };
 
   vendorHash = "sha256-wo+vA9AYXIjv6SGb7hNY6ZIVMyJ5enMd8gpQ6u3F7To=";

From 84486e60865d01bd220d7e94a12a192b48dab921 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 18:48:43 +0000
Subject: [PATCH 2227/3724] grpc-gateway: 2.27.1 -> 2.27.2

---
 pkgs/by-name/gr/grpc-gateway/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/grpc-gateway/package.nix b/pkgs/by-name/gr/grpc-gateway/package.nix
index 1f9dc8232834..6c6ea6a78097 100644
--- a/pkgs/by-name/gr/grpc-gateway/package.nix
+++ b/pkgs/by-name/gr/grpc-gateway/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "grpc-gateway";
-  version = "2.27.1";
+  version = "2.27.2";
 
   src = fetchFromGitHub {
     owner = "grpc-ecosystem";
     repo = "grpc-gateway";
     tag = "v${version}";
-    sha256 = "sha256-a7i3tONdSzKq0pWx3okIu65XFTFcXbJd21UItCFz7TA=";
+    sha256 = "sha256-NWMpCPtZZVa53SR8NqSaDpo6fauB3hHb1PeqNs0OO+M=";
   };
 
-  vendorHash = "sha256-Sa2AOwX0McSGQs1Y0evVhdhpjHNNcgyouOtu6H9/AYI=";
+  vendorHash = "sha256-NYiHnarNAndE3QIKPI51plWNNB9kP2DlpYgW43Uw/gw=";
 
   ldflags = [
     "-X=main.version=${version}"

From 2019f35fe6fc1dd36d072360686123f08ee34c52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 18:56:49 +0000
Subject: [PATCH 2228/3724] fastly: 11.4.0 -> 11.5.0

---
 pkgs/by-name/fa/fastly/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fa/fastly/package.nix b/pkgs/by-name/fa/fastly/package.nix
index a59b1aa960fc..58058b53ab66 100644
--- a/pkgs/by-name/fa/fastly/package.nix
+++ b/pkgs/by-name/fa/fastly/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "fastly";
-  version = "11.4.0";
+  version = "11.5.0";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-jfj37b3L3LcPODBYBAOTWq+mA0xrIr3r+6lu65gKyYI=";
+    hash = "sha256-o2/gwXODAS4eex6q91hxbNx2RHNt5z8eaT3ZXS7D634=";
     # The git commit is part of the `fastly version` original output;
     # leave that output the same in nixpkgs. Use the `.git` directory
     # to retrieve the commit SHA, and remove the directory afterwards,
@@ -34,7 +34,7 @@ buildGoModule rec {
     "cmd/fastly"
   ];
 
-  vendorHash = "sha256-souo+yksoZpUxWfY7flL4uLdRgAIrtZKRIlGK0p1hZs=";
+  vendorHash = "sha256-qoRlUCAnJHt9B1w9R4dBtkvqKhk3hum6OjzraPKAzk0=";
 
   nativeBuildInputs = [
     installShellFiles

From fc00e5192167ff8752fc47c5cab341c73b370ec5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 05:00:07 +1000
Subject: [PATCH 2229/3724] 
 home-assistant-custom-lovelace-modules.apexcharts-card: 2.1.2 -> 2.2.0
 (#435357)

https://github.com/RomRider/apexcharts-card/blob/v2.2.0/CHANGELOG.md
---
 .../custom-lovelace-modules/apexcharts-card/package.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix
index e7e5af9927b3..a9755df961a2 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "apexcharts-card";
-  version = "2.1.2";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "RomRider";
     repo = "apexcharts-card";
     rev = "v${version}";
-    hash = "sha256-bB/FCNVBK8vOfT3q9+qNssNJCtiN7ReqrsJoobf5dpU=";
+    hash = "sha256-wHQmbNX96X4YT0xvLp13scD0c7MAADP4Ax47fwYRgbM=";
   };
 
-  npmDepsHash = "sha256-vT5/9/cHkUidqxQdoJK4U7mzuk8w/ryEaqKPxy5MNcY=";
+  npmDepsHash = "sha256-5hCd/ksFSIOsNZfVr5aoun7qrtkIlAGvwQN1xr6AbMI=";
 
   installPhase = ''
     runHook preInstall

From 8f274b9536163cec964d320431c4c74d51c93be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 20 Aug 2025 12:06:47 -0700
Subject: [PATCH 2230/3724] bzip3: 1.5.2 -> 1.5.3

Diff: https://github.com/iczelia/bzip3/compare/1.5.2...1.5.3

Changelog: https://github.com/iczelia/bzip3/blob/1.5.3/NEWS
---
 pkgs/tools/compression/bzip3/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix
index 9447ee19fb5b..e70cb63a5a95 100644
--- a/pkgs/tools/compression/bzip3/default.nix
+++ b/pkgs/tools/compression/bzip3/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bzip3";
-  version = "1.5.2";
+  version = "1.5.3";
 
   outputs = [
     "bin"
@@ -18,10 +18,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   src = fetchFromGitHub {
-    owner = "kspalaiologos";
+    owner = "iczelia";
     repo = "bzip3";
-    rev = finalAttrs.version;
-    hash = "sha256-mu95ZYkD0isDuHdHcU4zhWxCTlaYXoM85j76IGwVAak=";
+    tag = finalAttrs.version;
+    hash = "sha256-SOouMUctxsAJdkt84rJBaCbK23GKmXRH9nVgGdDodsk=";
   };
 
   postPatch = ''
@@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Better and stronger spiritual successor to BZip2";
-    homepage = "https://github.com/kspalaiologos/bzip3";
-    changelog = "https://github.com/kspalaiologos/bzip3/blob/${finalAttrs.src.rev}/NEWS";
+    homepage = "https://github.com/iczelia/bzip3";
+    changelog = "https://github.com/iczelia/bzip3/blob/${finalAttrs.src.tag}/NEWS";
     license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ dotlambda ];
     pkgConfigModules = [ "bzip3" ];

From 11138fc8049662d6ccee0919a94957dd7a472cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 20 Aug 2025 12:10:59 -0700
Subject: [PATCH 2231/3724] bzip3: move to pkgs/by-name

Using clangStdenv doesn't seem necessary anymore.
---
 .../bzip3/default.nix => by-name/bz/bzip3/package.nix}        | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 4 deletions(-)
 rename pkgs/{tools/compression/bzip3/default.nix => by-name/bz/bzip3/package.nix} (100%)

diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/by-name/bz/bzip3/package.nix
similarity index 100%
rename from pkgs/tools/compression/bzip3/default.nix
rename to pkgs/by-name/bz/bzip3/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e53758606ad..bed1dbdbcbeb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2427,10 +2427,6 @@ with pkgs;
 
   bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { };
 
-  bzip3 = callPackage ../tools/compression/bzip3 {
-    stdenv = clangStdenv;
-  };
-
   davix-copy = davix.override { enableThirdPartyCopy = true; };
 
   cdist = python3Packages.callPackage ../tools/admin/cdist { };

From 0739a4a65b1875c00ea0210ee6616e71b7178f8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 19:14:03 +0000
Subject: [PATCH 2232/3724] pomerium: 0.30.3 -> 0.30.5

---
 pkgs/by-name/po/pomerium/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix
index f338a89ee088..29cdd4ffb67c 100644
--- a/pkgs/by-name/po/pomerium/package.nix
+++ b/pkgs/by-name/po/pomerium/package.nix
@@ -19,15 +19,15 @@ let
 in
 buildGoModule rec {
   pname = "pomerium";
-  version = "0.30.3";
+  version = "0.30.5";
   src = fetchFromGitHub {
     owner = "pomerium";
     repo = "pomerium";
     rev = "v${version}";
-    hash = "sha256-Rjv4GjyUs9sH+P5kYimxFnE2SBosEWbc7PbKIaVFxsI=";
+    hash = "sha256-3SmcuLEWqsw/B10jTIG2TKGa7tyMLa/lpkD6Iq/Fm4g=";
   };
 
-  vendorHash = "sha256-+SvKF54rkBY2wBZOYKuIV30BVqRqICuiPya+HApne1s=";
+  vendorHash = "sha256-mOTjBH8VqsMdyW5jTIZ76bf55WnHw9XuUSh6zsBktt0=";
 
   ui = mkYarnPackage {
     inherit version;

From e6821ba6f274338868465075f96c0d741c392e8e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 4 Aug 2025 11:01:21 +0200
Subject: [PATCH 2233/3724] tests.auto-patchelf-hook: limit to x86_64-linux

downloads x86_64-linux only binary
---
 pkgs/test/auto-patchelf-hook/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/test/auto-patchelf-hook/package.nix b/pkgs/test/auto-patchelf-hook/package.nix
index 7f5919a1ea3e..21d99e5d75b8 100644
--- a/pkgs/test/auto-patchelf-hook/package.nix
+++ b/pkgs/test/auto-patchelf-hook/package.nix
@@ -100,4 +100,8 @@ stdenv.mkDerivation {
 
   doInstallCheck = true;
   inherit __structuredAttrs;
+  meta = {
+    # Downloads an x86_64-linux only binary
+    platforms = [ "x86_64-linux" ];
+  };
 }

From 3326fcd696a0e90f4d2376ec46c7b62d5f153338 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 4 Aug 2025 11:02:26 +0200
Subject: [PATCH 2234/3724] tests.buildFHSEnv: limit to x86_64-linux

downloads x86_64-linux only binary
---
 pkgs/test/buildFHSEnv/default.nix | 37 ++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/pkgs/test/buildFHSEnv/default.nix b/pkgs/test/buildFHSEnv/default.nix
index ac0494fefb26..4637b8ea2a22 100644
--- a/pkgs/test/buildFHSEnv/default.nix
+++ b/pkgs/test/buildFHSEnv/default.nix
@@ -47,21 +47,28 @@ let
       };
       find_lib-in-FHS = "${find_libFHSEnv}/bin/${find_libFHSEnv.name}";
     in
-    runCommand "FHS-lib-test" { } ''
-      echo original ldd output is:
-      ${ldd} ${sharedObject}
-      lddOutput="$(${ldd-in-FHS} ${sharedObject})"
-      echo ldd output inside FHS is:
-      echo "$lddOutput"
-      if echo $lddOutput | grep -q "not found"; then
-        echo "shared object could not find all dependencies in the FHS!"
-        echo The libraries below where found in the FHS:
-        ${find_lib-in-FHS}
-        exit 1
-      else
-        echo $lddOutput > $out
-      fi
-    '';
+    runCommand "FHS-lib-test"
+      {
+        meta = {
+          # Downloads an x86_64-linux only binary
+          platforms = [ "x86_64-linux" ];
+        };
+      }
+      ''
+        echo original ldd output is:
+        ${ldd} ${sharedObject}
+        lddOutput="$(${ldd-in-FHS} ${sharedObject})"
+        echo ldd output inside FHS is:
+        echo "$lddOutput"
+        if echo $lddOutput | grep -q "not found"; then
+          echo "shared object could not find all dependencies in the FHS!"
+          echo The libraries below where found in the FHS:
+          ${find_lib-in-FHS}
+          exit 1
+        else
+          echo $lddOutput > $out
+        fi
+      '';
 
 in
 {

From 59f0f1e7ea8f2254fef2e9f0705c01b31f48e8f1 Mon Sep 17 00:00:00 2001
From: budimanjojo <budimanjojo@gmail.com>
Date: Thu, 21 Aug 2025 02:22:06 +0700
Subject: [PATCH 2235/3724] nixos/networkd: allow setting
 `ManageForeignNextHops` option

Signed-off-by: budimanjojo <budimanjojo@gmail.com>
---
 nixos/modules/system/boot/networkd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index bc6c9166b956..3b36acfde286 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -22,6 +22,7 @@ let
           "SpeedMeterIntervalSec"
           "ManageForeignRoutingPolicyRules"
           "ManageForeignRoutes"
+          "ManageForeignNextHops"
           "RouteTable"
           "IPv6PrivacyExtensions"
           "IPv4Forwarding"
@@ -32,6 +33,7 @@ let
         (assertInt "SpeedMeterIntervalSec")
         (assertValueOneOf "ManageForeignRoutingPolicyRules" boolValues)
         (assertValueOneOf "ManageForeignRoutes" boolValues)
+        (assertValueOneOf "ManageForeignNextHops" boolValues)
         (assertValueOneOf "IPv6PrivacyExtensions" (
           boolValues
           ++ [

From 75e6384be6fed93d60c0bbb05afb194f392ced8b Mon Sep 17 00:00:00 2001
From: Robert Sliwinski <r@sliwi.org>
Date: Wed, 20 Aug 2025 21:17:08 +0200
Subject: [PATCH 2236/3724] pythonPackages.pytest-ansible: add robsliwi as
 maintainer

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

diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix
index 85a9518ee499..81ea8ece1fa8 100644
--- a/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -97,6 +97,9 @@ buildPythonPackage rec {
     homepage = "https://github.com/jlaska/pytest-ansible";
     changelog = "https://github.com/ansible-community/pytest-ansible/releases/tag/${src.tag}";
     license = licenses.mit;
-    maintainers = with maintainers; [ tjni ];
+    maintainers = with maintainers; [
+      tjni
+      robsliwi
+    ];
   };
 }

From 9e0472d050ac982e54926fdb5be2707bfc4d4693 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 19:34:27 +0000
Subject: [PATCH 2237/3724] searxng: 0-unstable-2025-08-03 ->
 0-unstable-2025-08-20

---
 pkgs/by-name/se/searxng/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix
index 12b440445643..7ec3c8e430cf 100644
--- a/pkgs/by-name/se/searxng/package.nix
+++ b/pkgs/by-name/se/searxng/package.nix
@@ -13,14 +13,14 @@ in
 python.pkgs.toPythonModule (
   python.pkgs.buildPythonApplication rec {
     pname = "searxng";
-    version = "0-unstable-2025-08-03";
+    version = "0-unstable-2025-08-20";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "searxng";
       repo = "searxng";
-      rev = "2e62eb5d68d875c49e32229103a4fd75fe26c104";
-      hash = "sha256-UKGPkaG2agXZhEi2h8g2gXHHEDmDSzL/f9B+l5WZVvE=";
+      rev = "41a4a3e224f5fa90522253da4236dd9a6f4083cb";
+      hash = "sha256-NJ8B7P03pzkQYObLANOEUU+B9VLYXTLlZP2X3WoXpYM=";
     };
 
     nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];

From 498818496e45328f2badfc14c49697d894fc345b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 20 Aug 2025 12:29:20 -0700
Subject: [PATCH 2238/3724] python3Packages.qnapstats: 0.5.0 -> 0.6.0

Diff: https://github.com/colinodell/python-qnapstats/compare/0.5.0...0.6.0

Changelog: https://github.com/colinodell/python-qnapstats/releases/tag/0.6.0
---
 .../python-modules/qnapstats/default.nix         | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/qnapstats/default.nix b/pkgs/development/python-modules/qnapstats/default.nix
index 2cfa9edc6593..fec3e1968c26 100644
--- a/pkgs/development/python-modules/qnapstats/default.nix
+++ b/pkgs/development/python-modules/qnapstats/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   requests,
   xmltodict,
   responses,
@@ -10,18 +11,19 @@
 
 buildPythonPackage rec {
   pname = "qnapstats";
-  version = "0.5.0";
-
-  format = "setuptools";
+  version = "0.6.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "colinodell";
     repo = "python-qnapstats";
     tag = version;
-    hash = "sha256-dpxl6a61h8zB7eS/2lxG+2//bOTzV6s4T1W+DVj0fnI=";
+    hash = "sha256-4zGCMwuPL9QFVLgyZ6/aV9YBQJBomPkX34C7ULEd4Fw=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     requests
     xmltodict
   ];
@@ -36,9 +38,13 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
+  # https://github.com/colinodell/python-qnapstats/issues/104
+  doCheck = false;
+
   pythonImportsCheck = [ "qnapstats" ];
 
   meta = {
+    changelog = "https://github.com/colinodell/python-qnapstats/releases/tag/${src.tag}";
     description = "Python API for obtaining QNAP NAS system stats";
     homepage = "https://github.com/colinodell/python-qnapstats";
     license = lib.licenses.mit;

From d22cba3d01909a18d861bec5254857d8954edb9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 19:37:46 +0000
Subject: [PATCH 2239/3724] papermc: 1.21.8-11 -> 1.21.8-40

---
 pkgs/games/papermc/versions.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json
index 54b3bd98fbfe..efa82ecda03d 100644
--- a/pkgs/games/papermc/versions.json
+++ b/pkgs/games/papermc/versions.json
@@ -84,7 +84,7 @@
         "version": "1.21.7-32"
     },
     "1.21.8": {
-        "hash": "sha256-lFfRJ578wglOgYyssvF2cNlHnl9rTqJRfrk6aj+s5R8=",
-        "version": "1.21.8-11"
+        "hash": "sha256-t2t9DU2NiUY4WUepUj4BnVbhKEIGxxvHjCy1BoX0gjI=",
+        "version": "1.21.8-40"
     }
 }

From f0664d3e65f7160864ca1b4b8042b1776ed28e30 Mon Sep 17 00:00:00 2001
From: J0schu <Joschu@t-online.de>
Date: Wed, 20 Aug 2025 21:37:55 +0200
Subject: [PATCH 2240/3724] vimPlugins.typstwatch-nvim: init at 2025-08-20

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 08bad542161d..90196ace947f 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -15639,6 +15639,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  typstwatch-nvim = buildVimPlugin {
+    pname = "typstwatch.nvim";
+    version = "2025-08-20";
+    src = fetchFromGitHub {
+      owner = "J0schu";
+      repo = "typstwatch.nvim";
+      rev = "570c71b11c7d7ddd969df257290c10d82bbe2861";
+      sha256 = "1fd9lyisj46byxr9gdcyqkydmpfzqfz07nihmij2p935w0fm9ndb";
+    };
+    meta.homepage = "https://github.com/J0schu/typstwatch.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   ultimate-autopair-nvim = buildVimPlugin {
     pname = "ultimate-autopair.nvim";
     version = "2025-02-14";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 24cf47d261ef..e5f8e333882e 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1200,6 +1200,7 @@ https://github.com/jose-elias-alvarez/typescript.nvim/,,
 https://github.com/MrPicklePinosaur/typst-conceal.vim/,HEAD,
 https://github.com/chomosuke/typst-preview.nvim/,HEAD,
 https://github.com/kaarmu/typst.vim/,HEAD,
+https://github.com/J0schu/typstwatch.nvim/,HEAD,
 https://github.com/altermo/ultimate-autopair.nvim/,HEAD,
 https://github.com/SirVer/ultisnips/,,
 https://github.com/mbbill/undotree/,,

From 65be6a801d01b4bc6747dba5cb86e62c5c27e3b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 19:44:43 +0000
Subject: [PATCH 2241/3724] ramalama: 0.11.3 -> 0.12.0

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

diff --git a/pkgs/by-name/ra/ramalama/package.nix b/pkgs/by-name/ra/ramalama/package.nix
index e064d7824700..6b7f1b37f0e0 100644
--- a/pkgs/by-name/ra/ramalama/package.nix
+++ b/pkgs/by-name/ra/ramalama/package.nix
@@ -13,14 +13,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ramalama";
-  version = "0.11.3";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "ramalama";
     tag = "v${version}";
-    hash = "sha256-dvNFSPPdMnxgwGK2rVSsyaYwvz0wHutqjLFhsCps80A=";
+    hash = "sha256-Hozyf0yfB0XhxWeA3SS24BPfDDXYa2AXY8/gLh8ZFcU=";
   };
 
   build-system = with python3.pkgs; [

From 27edff7a462622a03108e392ab95ed33b817310c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 19:54:37 +0000
Subject: [PATCH 2242/3724] terraform-providers.vault: 5.1.0 -> 5.2.1

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a2d9ff5f716b..0da14bd1c175 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1427,13 +1427,13 @@
     "vendorHash": "sha256-giqZi1CmuyANNwzW+y9BUUUEfBhFZKkVGAvIPVvZnzE="
   },
   "vault": {
-    "hash": "sha256-tRKMu9mFyZkVjTMeXccUviWHiW9hPLj5heErRDK9eBw=",
+    "hash": "sha256-nY8NOE3VJCHkDeisWgxIHG6T1fQ8Jt6Nom2ELexuld0=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/vault",
     "owner": "hashicorp",
     "repo": "terraform-provider-vault",
-    "rev": "v5.1.0",
+    "rev": "v5.2.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-GRrU/ARa88EX9kp6UBBhkYrTeX3i94eEQalz5QBHwGc="
+    "vendorHash": "sha256-mfageWMx8YM4eipnf7u3CMgMYcY7l2e69vECD3o91rg="
   },
   "vcd": {
     "hash": "sha256-W+ffIT70IaePg3xfOaQgCjPTWTN3iSAYwkf+s+zkB84=",

From c323dfc72f65a3d918ba3fd6e5647921ae2ca076 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 19:59:50 +0000
Subject: [PATCH 2243/3724] terramate: 0.14.3 -> 0.14.4

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

diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix
index 9672fc9f4e6b..8223d5d96f92 100644
--- a/pkgs/by-name/te/terramate/package.nix
+++ b/pkgs/by-name/te/terramate/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "terramate";
-  version = "0.14.3";
+  version = "0.14.4";
 
   src = fetchFromGitHub {
     owner = "terramate-io";
     repo = "terramate";
     rev = "v${version}";
-    hash = "sha256-+L86oTpsPpi6RUgh4dPO0AZaTYZg7ue37PbHPSjm+vM=";
+    hash = "sha256-36AZBi4QYmYc+0e6LsWkGmanf13hyCJZU7kusP/zwlQ=";
   };
 
   vendorHash = "sha256-u9eXi7FjMsXm0H0y7Gs/Wu2I8tp4rRLxtjUxrrHJkEU=";

From af5dd576e0830b5a5cfc6e56f58e2af4356abf82 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 20 Aug 2025 21:57:14 +0200
Subject: [PATCH 2244/3724] zfs: pass kernel build flags correctly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ZFS's autoconf scripts recognize KERNEL_CC, KERNEL_CROSS_COMPILE,
KERNEL_ARCH, etc.  This avoids the need to separately give them as
Make flags, although I'm not sure what the original intention behind
giving the unprefixed flags to configure was — the commit adding that
doesn't say, except that it was to fix cross, which still works after
this change.

This fixes the ZFS kernel module build after the change to use
unwrapped compilers for building the kernel, which previously resulted
in CC etc. being clobbered for the ZFS build, even for non-kernel
parts like the "compiler works" Autoconf check.
---
 pkgs/os-specific/linux/zfs/generic.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index d27fe8511434..98d0236bcd90 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -221,11 +221,9 @@ let
           "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
           "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
         ]
-        ++ kernelModuleMakeFlags
+        ++ map (f: "KERNEL_${f}") kernelModuleMakeFlags
       );
 
-      makeFlags = optionals buildKernel kernelModuleMakeFlags;
-
       enableParallelBuilding = true;
 
       doInstallCheck = true;

From 50be7661a2ff8d259690b597948f89e08a29907b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 20:11:41 +0000
Subject: [PATCH 2245/3724] upbound-main: 0.41.0-0.rc.0.93.g469ed591 ->
 0.41.0-0.rc.0.152.g4da0ccab

---
 pkgs/by-name/up/upbound/sources-main.json | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/up/upbound/sources-main.json b/pkgs/by-name/up/upbound/sources-main.json
index ad087c54329f..e7ced7bbe649 100644
--- a/pkgs/by-name/up/upbound/sources-main.json
+++ b/pkgs/by-name/up/upbound/sources-main.json
@@ -8,38 +8,38 @@
   "fetchurlAttrSet": {
     "docker-credential-up": {
       "aarch64-darwin": {
-        "hash": "sha256-xrLwImWq2dWv9bC8s2Jqv3T3Zsdto53MgQXKcpZoujM=",
-        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.93.g469ed591/bundle/docker-credential-up/darwin_arm64.tar.gz"
+        "hash": "sha256-HVX0cbrUW9Fpjl5yhPOKqcW/2/pDGZnVGS0AdIb8Ub0=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/docker-credential-up/darwin_arm64.tar.gz"
       },
       "aarch64-linux": {
-        "hash": "sha256-XHiIh4Ng5uyfI0xjITcxXPgZo4WX1rRXbFUc334u6b0=",
-        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.93.g469ed591/bundle/docker-credential-up/linux_arm64.tar.gz"
+        "hash": "sha256-deoM4C92EVDdLiTFdFBHYgUQ3UDzn1Lls5z/qL8Gwjs=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/docker-credential-up/linux_arm64.tar.gz"
       },
       "x86_64-darwin": {
-        "hash": "sha256-WNU2M00Tlx4QEbWzdu+0JM3yn7hMncZPYuYGMSxirU8=",
-        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.93.g469ed591/bundle/docker-credential-up/darwin_amd64.tar.gz"
+        "hash": "sha256-j00COhV/TXMd285Me7je47qwRMLXTrH8wxaPrkRHy/s=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/docker-credential-up/darwin_amd64.tar.gz"
       },
       "x86_64-linux": {
-        "hash": "sha256-UIjV8lOZsshyjkiIcqtZpUWuZlBmhMmlEGx/uZdhi2Q=",
-        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.93.g469ed591/bundle/docker-credential-up/linux_amd64.tar.gz"
+        "hash": "sha256-3Cc34/LpcahZ8ADKVQOtAKvGNv5gC6mW9zFhHB9LqgA=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/docker-credential-up/linux_amd64.tar.gz"
       }
     },
     "up": {
       "aarch64-darwin": {
-        "hash": "sha256-YjhQJ6he5U/aXPTBhCFetq+BXLbQCKeTvDJWQV3Z9wU=",
-        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.93.g469ed591/bundle/up/darwin_arm64.tar.gz"
+        "hash": "sha256-PZJSpoENZWL3B6zeYA7oZuPdRz1WuMmPA3p2yf2q39g=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/up/darwin_arm64.tar.gz"
       },
       "aarch64-linux": {
-        "hash": "sha256-pT/LEHyrpnl7uTI4olPhfHS2HYemIhxo4UkRvBz5DQo=",
-        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.93.g469ed591/bundle/up/linux_arm64.tar.gz"
+        "hash": "sha256-wbWLMrDG5oBk4vmkEY9S7ruAib7d1kY0J2s/YT8hSZA=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/up/linux_arm64.tar.gz"
       },
       "x86_64-darwin": {
-        "hash": "sha256-kZCELQCbKrybXNV+cu0PvcVZ7ZyNOk5er4PxyMwr4Zg=",
-        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.93.g469ed591/bundle/up/darwin_amd64.tar.gz"
+        "hash": "sha256-2tl2itYBEA1hzAzrr0R6ArKLEkrL6MAvOdtAFNAhwbw=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/up/darwin_amd64.tar.gz"
       },
       "x86_64-linux": {
-        "hash": "sha256-LibchrW/+aJiKNCDQbgwhQGc/4drap831Xa0Zht0Yx4=",
-        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.93.g469ed591/bundle/up/linux_amd64.tar.gz"
+        "hash": "sha256-4vLU6etUqoH/bNZrAVfJyedMpmxdXz0XLQRlj4Ct/eE=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/up/linux_amd64.tar.gz"
       }
     }
   },
@@ -49,5 +49,5 @@
     "x86_64-darwin",
     "x86_64-linux"
   ],
-  "version": "0.41.0-0.rc.0.93.g469ed591"
+  "version": "0.41.0-0.rc.0.152.g4da0ccab"
 }

From 03f16593904f8a0811ed47143dd4f0f8d73db74b Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 20 Aug 2025 16:10:48 -0400
Subject: [PATCH 2246/3724] livebook: move under beam modules

---
 pkgs/by-name/li/livebook/package.nix          | 64 +------------------
 pkgs/development/beam-modules/default.nix     |  2 +
 .../beam-modules/livebook/default.nix         | 61 ++++++++++++++++++
 3 files changed, 64 insertions(+), 63 deletions(-)
 create mode 100644 pkgs/development/beam-modules/livebook/default.nix

diff --git a/pkgs/by-name/li/livebook/package.nix b/pkgs/by-name/li/livebook/package.nix
index 64dc8150c8d9..9c62889ae2df 100644
--- a/pkgs/by-name/li/livebook/package.nix
+++ b/pkgs/by-name/li/livebook/package.nix
@@ -1,63 +1 @@
-{
-  lib,
-  beamMinimal28Packages,
-  makeWrapper,
-  fetchFromGitHub,
-  nixosTests,
-  nix-update-script,
-}:
-let
-  beamPackages = beamMinimal28Packages;
-in
-beamPackages.mixRelease rec {
-  pname = "livebook";
-  version = "0.16.4";
-
-  inherit (beamPackages) elixir;
-
-  buildInputs = [ beamPackages.erlang ];
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  src = fetchFromGitHub {
-    owner = "livebook-dev";
-    repo = "livebook";
-    tag = "v${version}";
-    hash = "sha256-Cwzcoslqjaf7z9x2Sgnzrrl4zUcH2f7DEWaFPBIi3ms=";
-  };
-
-  mixFodDeps = beamPackages.fetchMixDeps {
-    pname = "mix-deps-${pname}";
-    inherit src version;
-    hash = "sha256-OEYkWh0hAl7ZXP2Cq+TgVGF4tnWlpF6W5uRSdyrswlA=";
-  };
-
-  postInstall = ''
-    wrapProgram $out/bin/livebook \
-      --prefix PATH : ${
-        lib.makeBinPath [
-          beamPackages.elixir
-          beamPackages.erlang
-        ]
-      } \
-      --set MIX_REBAR3 ${beamPackages.rebar3}/bin/rebar3
-  '';
-
-  passthru = {
-    updateScript = nix-update-script { };
-    tests = {
-      livebook-service = nixosTests.livebook-service;
-    };
-  };
-
-  meta = {
-    license = lib.licenses.asl20;
-    homepage = "https://livebook.dev/";
-    description = "Automate code & data workflows with interactive Elixir notebooks";
-    maintainers = with lib.maintainers; [
-      munksgaard
-      scvalex
-    ];
-    platforms = lib.platforms.unix;
-  };
-}
+{ beamMinimal28Packages }: beamMinimal28Packages.livebook
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 8b04fe8a07a7..c27feb625885 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -94,6 +94,8 @@ let
       lfe = lfe_2_1;
       lfe_2_1 = lib'.callLFE ../interpreters/lfe/2.1.nix { inherit erlang buildRebar3 buildHex; };
 
+      livebook = callPackage ./livebook { };
+
       # Non hex packages. Examples how to build Rebar/Mix packages with and
       # without helper functions buildRebar3 and buildMix.
       hex = callPackage ./hex { };
diff --git a/pkgs/development/beam-modules/livebook/default.nix b/pkgs/development/beam-modules/livebook/default.nix
new file mode 100644
index 000000000000..a4ccd6695bcc
--- /dev/null
+++ b/pkgs/development/beam-modules/livebook/default.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  beamPackages,
+  makeWrapper,
+  fetchFromGitHub,
+  nixosTests,
+  nix-update-script,
+}:
+
+beamPackages.mixRelease rec {
+  pname = "livebook";
+  version = "0.16.4";
+
+  inherit (beamPackages) elixir;
+
+  buildInputs = [ beamPackages.erlang ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  src = fetchFromGitHub {
+    owner = "livebook-dev";
+    repo = "livebook";
+    tag = "v${version}";
+    hash = "sha256-Cwzcoslqjaf7z9x2Sgnzrrl4zUcH2f7DEWaFPBIi3ms=";
+  };
+
+  mixFodDeps = beamPackages.fetchMixDeps {
+    pname = "mix-deps-${pname}";
+    inherit src version;
+    hash = "sha256-OEYkWh0hAl7ZXP2Cq+TgVGF4tnWlpF6W5uRSdyrswlA=";
+  };
+
+  postInstall = ''
+    wrapProgram $out/bin/livebook \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          beamPackages.elixir
+          beamPackages.erlang
+        ]
+      } \
+      --set MIX_REBAR3 ${beamPackages.rebar3}/bin/rebar3
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      livebook-service = nixosTests.livebook-service;
+    };
+  };
+
+  meta = {
+    license = lib.licenses.asl20;
+    homepage = "https://livebook.dev/";
+    description = "Automate code & data workflows with interactive Elixir notebooks";
+    maintainers = with lib.maintainers; [
+      munksgaard
+      scvalex
+    ];
+    platforms = lib.platforms.unix;
+  };
+}

From 87165cbd385f3b48a2157451e64a5b20e10ee31f Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 08:57:59 +0200
Subject: [PATCH 2247/3724] t4kcommon: use fetchpatch instead of fetchurl

---
 pkgs/by-name/t4/t4kcommon/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/t4/t4kcommon/package.nix b/pkgs/by-name/t4/t4kcommon/package.nix
index 17ee971bc351..2cfc91f0b4cf 100644
--- a/pkgs/by-name/t4/t4kcommon/package.nix
+++ b/pkgs/by-name/t4/t4kcommon/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchurl,
+  fetchpatch,
   cmake,
   pkg-config,
   SDL,
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
 
   patches = [
     # patch from debian to support libpng16 instead of libpng12
-    (fetchurl {
+    (fetchpatch {
       url = "https://salsa.debian.org/tux4kids-pkg-team/t4kcommon/raw/f7073fa384f5a725139f54844e59b57338b69dc7/debian/patches/libpng16.patch";
-      sha256 = "1lcpkdy5gvxgljg1vkrxych74amq0gramb1snj2831dam48is054";
+      hash = "sha256-auQ8VvOyvLE1PD2dfeHZJV+MzIt1OtUa7OcOqsXTAYI=";
     })
   ];
 

From 5e8718c39ba78e8baf0695bedefbd135a32e7b38 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 21:48:58 +0200
Subject: [PATCH 2248/3724] pretalx: pin django-hierarkey at 1.2.1

On production installs this update requires a migration.
---
 pkgs/by-name/pr/pretalx/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix
index 0f684765681a..7984f5da15f4 100644
--- a/pkgs/by-name/pr/pretalx/package.nix
+++ b/pkgs/by-name/pr/pretalx/package.nix
@@ -19,6 +19,16 @@ let
         # https://github.com/django-extensions/django-extensions/issues/1885
         doCheck = false;
       };
+
+      django-hierarkey = prev.django-hierarkey.overridePythonAttrs rec {
+        version = "1.2.1";
+        src = fetchFromGitHub {
+          owner = "raphaelm";
+          repo = "django-hierarkey";
+          tag = version;
+          hash = "sha256-GkCNVovo2bDCp6m2GBvusXsaBhcmJkPNu97OdtsYROY=";
+        };
+      };
     };
   };
 
@@ -89,7 +99,6 @@ python.pkgs.buildPythonApplication rec {
     "django-compressor"
     "django-csp"
     "django-filter"
-    "django-hierarkey"
     "django-i18nfield"
     "djangorestframework"
     "markdown"

From 407b282847ddfb26eb5aa80d9118e95e937b7a77 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 21:41:45 +0200
Subject: [PATCH 2249/3724] python3Packages.django-hierarkey: 1.2.1 -> 2.0.0

https://github.com/raphaelm/django-hierarkey/compare/1.2.1...2.0.0
---
 pkgs/development/python-modules/django-hierarkey/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-hierarkey/default.nix b/pkgs/development/python-modules/django-hierarkey/default.nix
index 9eff82130b88..bd9702b356b2 100644
--- a/pkgs/development/python-modules/django-hierarkey/default.nix
+++ b/pkgs/development/python-modules/django-hierarkey/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "django-hierarkey";
-  version = "1.2.1";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "raphaelm";
     repo = "django-hierarkey";
     tag = version;
-    hash = "sha256-GkCNVovo2bDCp6m2GBvusXsaBhcmJkPNu97OdtsYROY=";
+    hash = "sha256-vXc31tUQrukdXeiMHZYP12o0C3R28CsC5fHjhMgRdU0=";
   };
 
   build-system = [ setuptools ];

From a2024e07025b43186c36b6cc6156e12d16faf731 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 21:55:38 +0200
Subject: [PATCH 2250/3724] pretix: 2025.6.0 -> 2025.7.0

https://pretix.eu/about/en/blog/20250820-release-2025-7-0/
---
 pkgs/by-name/pr/pretix/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index 1e4e68027e61..263e796e95f5 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -42,13 +42,13 @@ let
   };
 
   pname = "pretix";
-  version = "2025.6.0";
+  version = "2025.7.0";
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix";
     rev = "refs/tags/v${version}";
-    hash = "sha256-bDE4ygTCX7hynWjoni9ZWMGujKvPk0TKaG42SQ6w9Rk=";
+    hash = "sha256-fKAHakrgvtkQR/dpXWL0prsq90TvEdYaS6FLyaI8MrM=";
   };
 
   npmDeps = buildNpmPackage {
@@ -56,7 +56,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}/src/pretix/static/npm_dir";
-    npmDepsHash = "sha256-LQPbOC9SaolD/fyiFoObndx7pcS7iaYVytz6y+bQZqQ=";
+    npmDepsHash = "sha256-cvyOpEw6z0cNUdHRmyEZUoeKPMOAtC+YHYXCltbHdm0=";
 
     dontBuild = true;
 

From 993131b75ac6ab3e16b060a29480de1a8d2f6add Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 22:27:10 +0200
Subject: [PATCH 2251/3724] pretix.plugins.mollie: 2.4.0 -> 2.4.1

https://github.com/pretix/pretix-mollie/compare/v2.4.0...v2.4.1
---
 pkgs/by-name/pr/pretix/plugins/mollie/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
index 80e63efe5b6f..1e5b148b0981 100644
--- a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pretix-mollie";
-  version = "2.4.0";
+  version = "2.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-mollie";
     tag = "v${version}";
-    hash = "sha256-P+50WRYB5QQWS54NMTJoEnLpizlovVq3PR/qwA2inME=";
+    hash = "sha256-YdBDYpxKqb0UOkSU6zEYoLAtlUbkfDHUTIA538ILbjk=";
   };
 
   build-system = [

From f85a02160af86d3d0ff04cd6bfcff0c6e80a3776 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 22:27:53 +0200
Subject: [PATCH 2252/3724] pretix.plugins.zugferd: 2.4.1 -> 2.4.2

https://github.com/pretix/pretix-zugferd/compare/v2.4.1...v2.4.2
---
 pkgs/by-name/pr/pretix/plugins/zugferd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
index cc9a6f33f82c..063c72d367c8 100644
--- a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pretix-zugferd";
-  version = "2.4.1";
+  version = "2.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-zugferd";
     rev = "v${version}";
-    hash = "sha256-GChHhtWYION84hmGZl92FKDvfLjlZ0QWHuTcc9ScWk8=";
+    hash = "sha256-ARTQjd78lkcs16cULAaudMtW1DmDKGf3gNBQZIHCQ1E=";
   };
 
   postPatch = ''

From 25e5386c5b10df64841c45a7bc7619ee7b5c04a5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 22:36:34 +0200
Subject: [PATCH 2253/3724] python313Packages.add-trailing-comma: 3.1.0 ->
 3.2.0

Diff: https://github.com/asottile/add-trailing-comma/compare/v3.1.0...v3.2.0
---
 .../development/python-modules/add-trailing-comma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix
index 02bdedcaf798..ef046cd26cbf 100644
--- a/pkgs/development/python-modules/add-trailing-comma/default.nix
+++ b/pkgs/development/python-modules/add-trailing-comma/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "add-trailing-comma";
-  version = "3.1.0";
+  version = "3.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "asottile";
     repo = "add-trailing-comma";
     rev = "v${version}";
-    hash = "sha256-B+wjBy42RwabVz/6qEMGpB0JmwJ9hqSskwcNj4x/B/k=";
+    hash = "sha256-b9EHlx149NUAo9UHDZLE3BwSJY5WpxsUYi1mqz7rnHA=";
   };
 
   propagatedBuildInputs = [ tokenize-rt ];

From 3d0d1d379049e47248fc68297a9cfbc97c4d35f8 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 09:17:54 +0200
Subject: [PATCH 2254/3724] hwloc: switch from fetchurl to fetchFromGitHub

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

diff --git a/pkgs/by-name/hw/hwloc/package.nix b/pkgs/by-name/hw/hwloc/package.nix
index 4bc0ed5a1bd2..7b0fcc06a2d0 100644
--- a/pkgs/by-name/hw/hwloc/package.nix
+++ b/pkgs/by-name/hw/hwloc/package.nix
@@ -1,7 +1,8 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoreconfHook,
   pkg-config,
   expat,
   ncurses,
@@ -15,13 +16,15 @@
   cudaPackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "hwloc";
   version = "2.12.1";
 
-  src = fetchurl {
-    url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2";
-    hash = "sha256-OKkDKLuGJZ+bsv4dxX/YQeER0eY1gBK+8j39ldIdxms=";
+  src = fetchFromGitHub {
+    owner = "open-mpi";
+    repo = "hwloc";
+    tag = "hwloc-${finalAttrs.version}";
+    hash = "sha256-MM0xDysXv4eayi+y2YIP9CMohPe7gfvhltYUxuApRow=";
   };
 
   configureFlags = [
@@ -30,7 +33,11 @@ stdenv.mkDerivation rec {
   ];
 
   # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
-  nativeBuildInputs = [ pkg-config ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ]
+  ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
 
   buildInputs = [
     expat
@@ -98,4 +105,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = lib.platforms.all;
   };
-}
+})

From e666f63738b5bae26206c7c58ee5020280303a96 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Aug 2025 22:40:16 +0200
Subject: [PATCH 2255/3724] python313Packages.add-trailing-comma: refactor

---
 .../add-trailing-comma/default.nix               | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix
index ef046cd26cbf..9b0875773dfb 100644
--- a/pkgs/development/python-modules/add-trailing-comma/default.nix
+++ b/pkgs/development/python-modules/add-trailing-comma/default.nix
@@ -4,34 +4,38 @@
   fetchFromGitHub,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
   tokenize-rt,
 }:
 
 buildPythonPackage rec {
   pname = "add-trailing-comma";
   version = "3.2.0";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "asottile";
     repo = "add-trailing-comma";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-b9EHlx149NUAo9UHDZLE3BwSJY5WpxsUYi1mqz7rnHA=";
   };
 
-  propagatedBuildInputs = [ tokenize-rt ];
+  build-system = [ setuptools ];
 
-  pythonImportsCheck = [ "add_trailing_comma" ];
+  dependencies = [ tokenize-rt ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  pythonImportsCheck = [ "add_trailing_comma" ];
+
   meta = with lib; {
     description = "Tool (and pre-commit hook) to automatically add trailing commas to calls and literals";
-    mainProgram = "add-trailing-comma";
     homepage = "https://github.com/asottile/add-trailing-comma";
+    changelog = "https://github.com/asottile/add-trailing-comma/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ gador ];
+    mainProgram = "add-trailing-comma";
   };
 }

From ecd64d0153bf2db6797a9ad057fe9e0ab7feda11 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 20 Aug 2025 16:25:50 -0400
Subject: [PATCH 2256/3724] beamPackages.livebook: add beam team

---
 pkgs/development/beam-modules/livebook/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/beam-modules/livebook/default.nix b/pkgs/development/beam-modules/livebook/default.nix
index a4ccd6695bcc..d23a3d9b09c3 100644
--- a/pkgs/development/beam-modules/livebook/default.nix
+++ b/pkgs/development/beam-modules/livebook/default.nix
@@ -57,5 +57,6 @@ beamPackages.mixRelease rec {
       scvalex
     ];
     platforms = lib.platforms.unix;
+    teams = [ lib.teams.beam ];
   };
 }

From 3c1ea317dce928d15610456d625ce9ffdd9417ec Mon Sep 17 00:00:00 2001
From: Dominic Wrege <dominic.wrege001@stud.fh-dortmund.de>
Date: Wed, 20 Aug 2025 22:59:44 +0200
Subject: [PATCH 2257/3724] librewolf-bin-unwrapped: 141.0.3-1 -> 142.0.1

firefox upstream release notes: https://www.firefox.com/en-US/firefox/142.0/releasenotes/

Security advisory: https://www.mozilla.org/en-US/security/advisories/mfsa2025-64/

Fixes:

    CVE-2025-9179
    CVE-2025-9180
    CVE-2025-9181
    (CVE-2025-9186 Android-only)
    CVE-2025-9182
    CVE-2025-9183
    CVE-2025-9187
    CVE-2025-9184
    CVE-2025-9185
---
 pkgs/by-name/li/librewolf-bin-unwrapped/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
index 1f9c238d409e..acd5fa5bfc48 100644
--- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
+++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
@@ -37,7 +37,7 @@ let
 
   pname = "librewolf-bin-unwrapped";
 
-  version = "141.0.3-1";
+  version = "142.0-1";
 in
 
 stdenv.mkDerivation {
@@ -47,9 +47,9 @@ stdenv.mkDerivation {
     url = "https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
     hash =
       {
-        i686-linux = "sha256-B3fTYNV6kHDo+Ae5r02oXIvcrzlnaZuOO/bAevjU3mk=";
-        x86_64-linux = "sha256-bIKqHQS4daqAQcbXHxLjWdK5MFrSg5ctzfhKe2OrO5c=";
-        aarch64-linux = "sha256-JPidpVXQ8DOwpmBUQn/aBJfydrUSfl6ekgnxCjL7Vgg=";
+        i686-linux = "sha256-2A5pSh2mKKhBiNgAoU4rvNxAm/XjhwZeeyCk6SSetdw=";
+        x86_64-linux = "sha256-dxGDR0Kb+InjCRCKdK6zBhn1qULdK1eQHf7/npPL58w=";
+        aarch64-linux = "sha256-u5eMu+o8Ne3Cvrc+HPv/hFunRpz1F/DOvxZDI65ux0A=";
       }
       .${stdenv.hostPlatform.system} or throwSystem;
   };

From 61accd1d09b6269bed42aaf792466152d60e4859 Mon Sep 17 00:00:00 2001
From: s0ssh <me@s0s.sh>
Date: Wed, 20 Aug 2025 16:00:59 -0500
Subject: [PATCH 2258/3724] tutanota-desktop: 299.250725.1 -> 301.250806.1

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

diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index 0999fbe351eb..c9c59c994f1b 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -8,11 +8,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "tutanota-desktop";
-  version = "299.250725.1";
+  version = "301.250806.1";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-nZ9LdXqGAEeCM/1tzfz0jnq6AyamobmP/vNgJoHjfhs=";
+    hash = "sha256-vnHw1cOvLuJZYxisVaF6sh5XBqlDiaCS3PLugbbNaKk=";
   };
 
   extraPkgs = pkgs: [ pkgs.libsecret ];

From 33000d2f47265bc8c96aa36197eab7c09244d128 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 21:05:31 +0000
Subject: [PATCH 2259/3724] cargo-deb: 3.4.1 -> 3.5.1

---
 pkgs/by-name/ca/cargo-deb/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix
index 8d1343c8ef23..31c440a254ac 100644
--- a/pkgs/by-name/ca/cargo-deb/package.nix
+++ b/pkgs/by-name/ca/cargo-deb/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-deb";
-  version = "3.4.1";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "kornelski";
     repo = "cargo-deb";
     rev = "v${version}";
-    hash = "sha256-aDTkH2V6VrrYLZMlQyd9YOfae92zO4gIb4sKtU66ENM=";
+    hash = "sha256-lTxMaYb7+cLQB+L8OJ8Q6HwD37Bw3kzRVLtovAJxpe0=";
   };
 
-  cargoHash = "sha256-FAtwTHHAu9CDUyeI2sv7EWW3Jhh1ZSHuKLyBatfVcP8=";
+  cargoHash = "sha256-QidnhKXGcR4I+FULRrt+jTQNp+DE9SVW8wlH5Ypknqg=";
 
   nativeBuildInputs = [
     makeWrapper

From feb7fb167804cb9378a1ac67d674c806e3636437 Mon Sep 17 00:00:00 2001
From: s0ssh <me@s0s.sh>
Date: Wed, 20 Aug 2025 16:06:01 -0500
Subject: [PATCH 2260/3724] maintainers: add s0ssh

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 250a4438ae66..6c33313c6eae 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -22466,6 +22466,13 @@
     github = "s0me1newithhand7s";
     githubId = 117505144;
   };
+  s0ssh = {
+	name = "s0ssh";
+	email = "me@s0s.sh";
+	github = "s0ssh";
+	githubId = 168315776;
+	keys = [ { fingerprint = "1D34 4976 77AD 462C CA9F  D5F1 FF16 29B1 3E89 9C1A"; } ];
+  };
   s1341 = {
     email = "s1341@shmarya.net";
     matrix = "@s1341:matrix.org";

From be047f382ec40942bd575c03eb3411688ed26a7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 21:08:41 +0000
Subject: [PATCH 2261/3724] harbor-cli: 0.0.9 -> 0.0.10

---
 pkgs/by-name/ha/harbor-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix
index 0c0829f6f5b5..a1f07b9a3ba5 100644
--- a/pkgs/by-name/ha/harbor-cli/package.nix
+++ b/pkgs/by-name/ha/harbor-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "harbor-cli";
-  version = "0.0.9";
+  version = "0.0.10";
 
   src = fetchFromGitHub {
     owner = "goharbor";
     repo = "harbor-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3LgFhSG/k4cnpxiYaXTPr52n1cntIG2qfLkYaOyaqGw=";
+    hash = "sha256-KIICM26SYmzySt5oqiFpsEGVw/ORJZ3K11VANWa81lw=";
   };
 
-  vendorHash = "sha256-QnKSzWa/XTrA83d/DXcS5PE59CL4wD2sISNDV5pBIfM=";
+  vendorHash = "sha256-Y2UIQWH78qsw1UE6NgeTm1Tdno78Bg6oxA9GyPLDjkQ=";
 
   excludedPackages = [
     "dagger"

From afa430f57319ef26fff82f1405b29e3a541703c1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 23:10:31 +0200
Subject: [PATCH 2262/3724] python3Packages.repl-python-wakatime: fix sqrc

---
 .../python-modules/repl-python-wakatime/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/repl-python-wakatime/default.nix b/pkgs/development/python-modules/repl-python-wakatime/default.nix
index 9ec6223f9296..3c9be8145a5e 100644
--- a/pkgs/development/python-modules/repl-python-wakatime/default.nix
+++ b/pkgs/development/python-modules/repl-python-wakatime/default.nix
@@ -1,12 +1,11 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   ipython,
   keyring,
   ptpython,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   setuptools-generate,
   setuptools-scm,
@@ -17,11 +16,11 @@ buildPythonPackage rec {
   version = "0.0.12";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-U5kg4GbfhyHno1DNbF1uOfHOjgCstYdyDgvwEXqnCZg=";
+  src = fetchFromGitHub {
+    owner = "wakatime";
+    repo = "repl-python-wakatime";
+    tag = version;
+    hash = "sha256-fp59usITk7gsUIhrnH5vj36kU1u2QWyu/bs46RDz+As=";
   };
 
   build-system = [

From 41e0112fdfa44371a75013fe59fd807a57fed309 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 11:05:16 +0200
Subject: [PATCH 2263/3724] font-alias: switch from fetchurl to fetchFromGitLab

---
 pkgs/by-name/fo/font-alias/package.nix | 36 +++++++++++++++-----------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/fo/font-alias/package.nix b/pkgs/by-name/fo/font-alias/package.nix
index 4a441d944c8f..7ce6cb893415 100644
--- a/pkgs/by-name/fo/font-alias/package.nix
+++ b/pkgs/by-name/fo/font-alias/package.nix
@@ -1,30 +1,36 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  writeScript,
+  fetchFromGitLab,
+  gitUpdater,
+  autoreconfHook,
+  font-util,
+  util-macros,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "font-alias";
   version = "1.0.5";
 
-  src = fetchurl {
-    url = "mirror://xorg/individual/font/font-alias-${finalAttrs.version}.tar.xz";
-    hash = "sha256-n4niF7tz4ONjagpJP7+LfJlRVuDFPZoEdtIBtnwta24=";
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "font";
+    repo = "alias";
+    tag = "font-alias-${finalAttrs.version}";
+    hash = "sha256-qglRNSt/PgFprpsvOVCeLMA+YagJw8DZMAfFdZ0m0/s=";
   };
 
+  nativeBuildInputs = [
+    autoreconfHook
+    font-util
+    util-macros
+  ];
+
   passthru = {
-    updateScript = writeScript "update-${finalAttrs.pname}" ''
-      #!/usr/bin/env nix-shell
-      #!nix-shell -i bash -p common-updater-scripts
-
-      version="$(list-directory-versions --pname ${finalAttrs.pname} \
-        --url https://xorg.freedesktop.org/releases/individual/font/ \
-        | sort -V | tail -n1)"
-
-      update-source-version ${finalAttrs.pname} "$version"
-    '';
+    updateScript = gitUpdater {
+      rev-prefix = "font-alias-";
+    };
   };
 
   meta = {

From 50b4e9ca44d103681a62624b25b23fd16c59334c Mon Sep 17 00:00:00 2001
From: linuxissuper <m+nix@linuxistcool.de>
Date: Sat, 16 Aug 2025 20:43:45 +0200
Subject: [PATCH 2264/3724] lxqt-panel-profiles: 1.2 -> 1.3

Co-authored-by: Masum Reza <50095635+JohnRTitor@users.noreply.github.com>
---
 pkgs/by-name/lx/lxqt-panel-profiles/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/lx/lxqt-panel-profiles/package.nix b/pkgs/by-name/lx/lxqt-panel-profiles/package.nix
index 6055982917c2..7a2293fc167a 100644
--- a/pkgs/by-name/lx/lxqt-panel-profiles/package.nix
+++ b/pkgs/by-name/lx/lxqt-panel-profiles/package.nix
@@ -13,14 +13,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "lxqt-panel-profiles";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "MrReplikant";
     repo = "lxqt-panel-profiles";
-    rev = version;
-    hash = "sha256-V76R3mWF/PgweMaDYTr6eJ3IDBsSJ8BSP5MYpKAWxM8=";
+    rev = "v${version}";
+    hash = "sha256-mI/Rg3YeK64R3cCn+xz4+CHZldGteZ4Id4h/YUcreW4=";
   };
 
   postPatch = ''
@@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
 
     substituteInPlace usr/bin/lxqt-panel-profiles \
     --replace-fail "/bin/bash" "${bash}/bin/bash" \
-    --replace-fail "/usr/share/" "$out/share/" \
+    --replace-fail "/usr/lib/" "$out/lib/" \
     --replace-fail "python3" "${pythonWithPyqt6}/bin/python"
 
-    substituteInPlace usr/share/lxqt-panel-profiles/lxqt-panel-profiles.py \
+    substituteInPlace usr/lib/lxqt-panel-profiles/lxqt-panel-profiles.py \
     --replace-fail "qdbus6" "${qt6.qttools}/bin/qdbus"
   '';
 

From 7c3bc602675de0a6ce9a6c6c2047c2f05945018a Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Wed, 20 Aug 2025 22:23:44 +0100
Subject: [PATCH 2265/3724] bluesky-pds: 0.4.158 -> 0.4.169

Diff: https://github.com/bluesky-social/pds/compare/v0.4.158...v0.4.169
---
 pkgs/by-name/bl/bluesky-pds/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bl/bluesky-pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix
index ece0d582c89f..ceac01fd96fb 100644
--- a/pkgs/by-name/bl/bluesky-pds/package.nix
+++ b/pkgs/by-name/bl/bluesky-pds/package.nix
@@ -20,13 +20,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pds";
-  version = "0.4.158";
+  version = "0.4.169";
 
   src = fetchFromGitHub {
     owner = "bluesky-social";
     repo = "pds";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TesrTKAP2wIQ+H6srvVbS6GF/7Be2xJa1dn/krScPOs=";
+    hash = "sha256-CInfhE9PeAbScVtMvvEyA5f6q0WIChTHf49/vh+Kqwc=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/service";
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
       sourceRoot
       ;
     fetcherVersion = 1;
-    hash = "sha256-+ESVGrgXNCQWOhqH4PM5lKQKcxE/5zxRmIboDZxgxcc=";
+    hash = "sha256-bBGumJBpTWaSPpo4WUNvdF2PCOS6w60Xn6kgS12y6PU=";
   };
 
   buildPhase = ''

From ac03d347d7ed069c5696c9b7c0a78e79f01f9c05 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Wed, 20 Aug 2025 22:24:08 +0100
Subject: [PATCH 2266/3724] bluesky-pds: add isabelroses to maintainers

---
 pkgs/by-name/bl/bluesky-pds/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bl/bluesky-pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix
index ceac01fd96fb..f63fa4f82850 100644
--- a/pkgs/by-name/bl/bluesky-pds/package.nix
+++ b/pkgs/by-name/bl/bluesky-pds/package.nix
@@ -91,7 +91,10 @@ stdenv.mkDerivation (finalAttrs: {
       mit
       asl20
     ];
-    maintainers = with lib.maintainers; [ t4ccer ];
+    maintainers = with lib.maintainers; [
+      t4ccer
+      isabelroses
+    ];
     platforms = lib.platforms.unix;
     mainProgram = "pds";
   };

From 92d3296cb603418f889523152a09f3925a6ca0b7 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 20 Aug 2025 14:37:44 -0700
Subject: [PATCH 2267/3724] tailscale: use finalAttrs style

---
 pkgs/by-name/ta/tailscale/package.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 91772517b429..6c932520f2f3 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -22,12 +22,9 @@
   tailscale-nginx-auth,
 }:
 
-let
-  version = "1.86.4";
-in
-buildGoModule {
+buildGoModule (finalAttrs: {
   pname = "tailscale";
-  inherit version;
+  version = "1.86.4";
 
   outputs = [
     "out"
@@ -37,7 +34,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "tailscale";
     repo = "tailscale";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-cYj04DtoYKejygz1Euir/6/Eq1M046nzzhqSfpTi0OE=";
   };
 
@@ -70,8 +67,8 @@ buildGoModule {
   ldflags = [
     "-w"
     "-s"
-    "-X tailscale.com/version.longStamp=${version}"
-    "-X tailscale.com/version.shortStamp=${version}"
+    "-X tailscale.com/version.longStamp=${finalAttrs.version}"
+    "-X tailscale.com/version.shortStamp=${finalAttrs.version}"
   ];
 
   tags = [
@@ -223,7 +220,7 @@ buildGoModule {
   meta = {
     homepage = "https://tailscale.com";
     description = "Node agent for Tailscale, a mesh VPN built on WireGuard";
-    changelog = "https://github.com/tailscale/tailscale/releases/tag/v${version}";
+    changelog = "https://tailscale.com/changelog#client";
     license = lib.licenses.bsd3;
     mainProgram = "tailscale";
     maintainers = with lib.maintainers; [
@@ -234,4 +231,4 @@ buildGoModule {
       ryan4yin
     ];
   };
-}
+})

From 45a869267bfa242b3439c840ca44f79543cc1912 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 20 Aug 2025 14:38:07 -0700
Subject: [PATCH 2268/3724] tailscale: add philiptaron as maintainer

I'm part of the [Tailscale Insiders](https://tailscale.com/blog/tailscale-insiders-update-seattle-meetup-news) team and am passionate about making Tailscale on Nix and NixOS the best it can be.
---
 pkgs/by-name/ta/tailscale/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 6c932520f2f3..e3533687a464 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -227,6 +227,7 @@ buildGoModule (finalAttrs: {
       mbaillie
       jk
       mfrw
+      philiptaron
       pyrox0
       ryan4yin
     ];

From a9ed23a61f9310370fab0142bd3109f567003df3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 23:38:46 +0200
Subject: [PATCH 2269/3724] python3Packages.pyatem: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/development/python-modules/pyatem/default.nix b/pkgs/development/python-modules/pyatem/default.nix
index a4f1e429f0f0..1c92a75febb7 100644
--- a/pkgs/development/python-modules/pyatem/default.nix
+++ b/pkgs/development/python-modules/pyatem/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "pyatem";
-  version = "0.12.0"; # check latest version in setup.py
+  version = "0.13.0"; # check latest version in setup.py
   pyproject = true;
 
   src = fetchFromSourcehut {
     owner = "~martijnbraam";
     repo = "pyatem";
     rev = version;
-    hash = "sha256-2NuqZn/WZzQXLc/hVm5/5gp9l0LMIHHPBW5h4j34/a4=";
+    hash = "sha256-eEn09e+ZED4DGEWTUou9CRgazngHIXZv51CLhX9YuBI=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 5c3890547a5418da1ad8de703fb2012253642caa Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Wed, 20 Aug 2025 22:25:40 +0100
Subject: [PATCH 2270/3724] bluesky-pds: fix passthru.tests

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

diff --git a/pkgs/by-name/bl/bluesky-pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix
index f63fa4f82850..6503fb8888f5 100644
--- a/pkgs/by-name/bl/bluesky-pds/package.nix
+++ b/pkgs/by-name/bl/bluesky-pds/package.nix
@@ -80,8 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.tests = {
-    inherit (nixosTests) pds;
+  passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
+    inherit (nixosTests) bluesky-pds;
   };
 
   meta = {

From e4ca8fe76da4755ea27500d781c78729ade3518f Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Wed, 20 Aug 2025 22:26:34 +0100
Subject: [PATCH 2271/3724] bluesky-pds: add update script

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

diff --git a/pkgs/by-name/bl/bluesky-pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix
index 6503fb8888f5..f287f60f9262 100644
--- a/pkgs/by-name/bl/bluesky-pds/package.nix
+++ b/pkgs/by-name/bl/bluesky-pds/package.nix
@@ -11,6 +11,7 @@
   pkg-config,
   nixosTests,
   lib,
+  nix-update-script,
 }:
 
 let
@@ -80,8 +81,9 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
-    inherit (nixosTests) bluesky-pds;
+  passthru = {
+    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) bluesky-pds; };
+    updateScript = nix-update-script { };
   };
 
   meta = {

From 778c7455a8d4a54179c9b2445337cd6aec8e5759 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 23:40:34 +0200
Subject: [PATCH 2272/3724] openswitcher: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/by-name/op/openswitcher/package.nix b/pkgs/by-name/op/openswitcher/package.nix
index ba978a2508f3..d744acbdbb98 100644
--- a/pkgs/by-name/op/openswitcher/package.nix
+++ b/pkgs/by-name/op/openswitcher/package.nix
@@ -16,14 +16,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "openswitcher";
-  version = "0.12.0";
+  version = "0.13.0";
   format = "other";
 
   src = fetchFromSourcehut {
     owner = "~martijnbraam";
     repo = "pyatem";
     rev = version;
-    hash = "sha256-2NuqZn/WZzQXLc/hVm5/5gp9l0LMIHHPBW5h4j34/a4=";
+    hash = "sha256-eEn09e+ZED4DGEWTUou9CRgazngHIXZv51CLhX9YuBI=";
   };
 
   outputs = [

From f1bd6cc5832761dc9cf93ff5ffb1aaf5331b9324 Mon Sep 17 00:00:00 2001
From: s0ssh <me@s0s.sh>
Date: Wed, 20 Aug 2025 16:10:45 -0500
Subject: [PATCH 2273/3724] tutanota-desktop: adopt

---
 maintainers/maintainer-list.nix              | 10 +++++-----
 pkgs/by-name/tu/tutanota-desktop/package.nix |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6c33313c6eae..ddfcf54f3485 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -22467,11 +22467,11 @@
     githubId = 117505144;
   };
   s0ssh = {
-	name = "s0ssh";
-	email = "me@s0s.sh";
-	github = "s0ssh";
-	githubId = 168315776;
-	keys = [ { fingerprint = "1D34 4976 77AD 462C CA9F  D5F1 FF16 29B1 3E89 9C1A"; } ];
+    name = "s0ssh";
+    email = "me@s0s.sh";
+    github = "s0ssh";
+    githubId = 168315776;
+    keys = [ { fingerprint = "1D34 4976 77AD 462C CA9F  D5F1 FF16 29B1 3E89 9C1A"; } ];
   };
   s1341 = {
     email = "s1341@shmarya.net";
diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index c9c59c994f1b..6daf0ed79700 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -46,7 +46,10 @@ appimageTools.wrapType2 rec {
     changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}";
     license = lib.licenses.gpl3Only;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = with lib.maintainers; [
+      awwpotato
+      s0ssh
+    ];
     mainProgram = "tutanota-desktop";
     platforms = [ "x86_64-linux" ];
   };

From 871f10c794ce326426cefba4f5d13481459a60f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 21:48:05 +0000
Subject: [PATCH 2274/3724] thunderbird-128-unwrapped: 128.13.0esr ->
 128.14.0esr

---
 .../networking/mailreaders/thunderbird/packages.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 466cb3f2e694..dd444cad4b25 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -108,8 +108,8 @@ rec {
   thunderbird-128 = common {
     applicationName = "Thunderbird ESR";
 
-    version = "128.13.0esr";
-    sha512 = "0439ff3bf8549c68778a2bf715da82b45a9e97c2ff4a8d06147d1b65c13031489a4126889a5a561484af385c428595f9d343fb6e266beeb923d4671665f2dbdc";
+    version = "128.14.0esr";
+    sha512 = "3ce2debe024ad8dafc319f86beff22feb9edecfabfad82513269e037a51210dfd84810fe35adcf76479273b8b2ceb8d4ecd2d0c6a3c5f6600b6b3df192bb798b";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-128";

From 76b1cd34de2f95f0306052166207e7f7cb595f13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 21 Aug 2025 00:12:52 +0200
Subject: [PATCH 2275/3724] viber: fix libxml2.so.2 not found

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

diff --git a/pkgs/by-name/vi/viber/package.nix b/pkgs/by-name/vi/viber/package.nix
index dc12285fcf3a..b470335816c0 100644
--- a/pkgs/by-name/vi/viber/package.nix
+++ b/pkgs/by-name/vi/viber/package.nix
@@ -124,7 +124,7 @@ stdenv.mkDerivation {
 
     for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
       patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
-      patchelf --set-rpath $libPath:$out/opt/viber/lib $file || true
+      patchelf --set-rpath $libPath:$out/opt/viber/lib:$out/lib $file || true
     done
 
     # qt.conf is not working, so override everything using environment variables
@@ -143,6 +143,10 @@ stdenv.mkDerivation {
     substituteInPlace $out/share/applications/viber.desktop \
       --replace /opt/viber/Viber $out/opt/viber/Viber \
       --replace /usr/share/ $out/share/
+
+    # Fix libxml2 breakage. See https://github.com/NixOS/nixpkgs/pull/396195#issuecomment-2881757108
+    mkdir -p "$out/lib"
+    ln -s "${lib.getLib libxml2}/lib/libxml2.so" "$out/opt/viber/lib/libxml2.so.2"
   '';
 
   dontStrip = true;

From 9e238cc4e64abe4d3de66f9acf65717404cdf37e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 22:15:01 +0000
Subject: [PATCH 2276/3724] phase-cli: 1.19.2 -> 1.19.3

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

diff --git a/pkgs/by-name/ph/phase-cli/package.nix b/pkgs/by-name/ph/phase-cli/package.nix
index 9e41fc909a56..7dfea80603d3 100644
--- a/pkgs/by-name/ph/phase-cli/package.nix
+++ b/pkgs/by-name/ph/phase-cli/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "phase-cli";
-  version = "1.19.2";
+  version = "1.19.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "phasehq";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-XicOP/V9j74kogu6KEUyk06D0kCq/oG5N635h6X1eng=";
+    hash = "sha256-bKbhSV7Xa5LYjHVBlsboQGY0nCtLmAJaFhGpe4ZCb0s=";
   };
 
   build-system = with python3Packages; [

From 6a262ea40e062b3798a15cae808b8e2cdfac9360 Mon Sep 17 00:00:00 2001
From: techknowlogick <git@tklk.dev>
Date: Wed, 20 Aug 2025 13:31:05 -0400
Subject: [PATCH 2277/3724] terraform: 1.12.2 -> 1.13.0

Diff: https://github.com/hashicorp/terraform/compare/v1.12.2...v1.13.0

Changelog: https://github.com/hashicorp/terraform/blob/v1.13.0/CHANGELOG.md
---
 pkgs/applications/networking/cluster/terraform/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index fb96aaca627a..ff20618056de 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -194,9 +194,9 @@ rec {
   mkTerraform = attrs: pluggable (generic attrs);
 
   terraform_1 = mkTerraform {
-    version = "1.12.2";
-    hash = "sha256-ilQ1rscGD66OT6lHsBgWELayC24B2D7l6iH6vtvqzFI=";
-    vendorHash = "sha256-zWNLIurNP5e/AWr84kQCb2+gZIn6EAsuvr0ZnfSq7Zw=";
+    version = "1.13.0";
+    hash = "sha256-ZZFwzGCB6IS/SJQJoApC7blDhTqT9aZkeMmPimdcj7Q=";
+    vendorHash = "sha256-UcsB5cTae55meJ945fvgowch4EBdaTET2+t5KWvpPQ8=";
     patches = [ ./provider-path-0_15.patch ];
     passthru = {
       inherit plugins;

From bbdeba7418b7a9d644507423f7abb6cb9d8fcace Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 13 May 2025 07:53:22 +1000
Subject: [PATCH 2278/3724] buildbot: 4.2.1 -> 4.3.0

Changelog: https://github.com/buildbot/buildbot/releases/tag/v4.3.0
---
 .../tools/continuous-integration/buildbot/master.nix |  4 ++--
 .../continuous-integration/buildbot/plugins.nix      | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix
index d3b35de6b63b..d6c541cf590b 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/master.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix
@@ -75,7 +75,7 @@ let
 in
 buildPythonApplication rec {
   pname = "buildbot";
-  version = "4.2.1";
+  version = "4.3.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -84,7 +84,7 @@ buildPythonApplication rec {
     owner = "buildbot";
     repo = "buildbot";
     rev = "v${version}";
-    hash = "sha256-Kf8sxZE2cQDQSVSMpRTokJU4f3/M6OJq6bXzGonrRLU=";
+    hash = "sha256-yUtOJRI04/clCMImh5sokpj6MeBIXjEAdf9xnToqJZs=";
   };
 
   build-system = [
diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix
index 01283b756e99..8cd88b44efa9 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix
@@ -19,7 +19,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-xwu260fcRfnUarEW3dnMcl8YheR0YmYCgNQGy7LaDGw=";
+      hash = "sha256-mn55+Fb2cU2rNB5Nwt41nWXjcZfgd07ijYAAnZnnnwI=";
     };
 
     # Remove unnecessary circular dependency on buildbot
@@ -50,7 +50,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-VtrgDVB+U4uM1SQ1h5IMFwU+nRcleYolDjQYJZ7iHbA=";
+      hash = "sha256-VA6xqJBjD4XmQabTN8M+PLvfrG7Hq2ooxChtz2jAT8A=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -73,7 +73,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-q4RDjn9i4wHtCctqcNIfilS9SNfS+LHohE0dSMHMOt8=";
+      hash = "sha256-c/Nmr0Uscalnndq72Y6jPM1JDs5OyOCERtuX/GXkxp8=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -96,7 +96,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-HrVoSXXo8P05JbJebKQ/bSPTIxQc9gTDT2RJLhJVhO8=";
+      hash = "sha256-AmY8RkFX0POmVpW71nNz4+dFbr0FHGhNR3RJymDNoaw=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -119,7 +119,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-x/a3iAb8vNkplAoS57IX+4BxIcH9roCixrBArUQN+04=";
+      hash = "sha256-vofKxpIfbAs7HR43Y7ojHLQEn6/WIdjZPgZieBMsz74=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -142,7 +142,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-kGH+Wuqn3vkATL8+aKjXbtuBEQro1tekut+7te8abQs=";
+      hash = "sha256-u7HF6X+ClT4rT3LJcTHXWi5oSxCKPXoUDH+QFRI2S0w=";
     };
 
     buildInputs = [ buildbot-pkg ];

From 4cf826e2e1060e0c6cc96df7165340482535178d Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Thu, 21 Aug 2025 06:38:36 +0800
Subject: [PATCH 2279/3724] flutterPackages-source: mark broken for old version

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

diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index fb7b3fa4a9cc..328be87053e8 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -190,6 +190,7 @@ let
     };
 
     meta = {
+      broken = (lib.versionOlder version "3.32") && useNixpkgsEngine;
       description = "Makes it easy and fast to build beautiful apps for mobile and beyond";
       longDescription = ''
         Flutter is Google's SDK for crafting beautiful,

From d2a2a2e079ac5db7c4cbfc92174508a62373a936 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Thu, 21 Aug 2025 06:41:05 +0800
Subject: [PATCH 2280/3724] expidus: mark broken

---
 pkgs/desktops/expidus/calculator/default.nix   | 1 +
 pkgs/desktops/expidus/file-manager/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/desktops/expidus/calculator/default.nix b/pkgs/desktops/expidus/calculator/default.nix
index 528d77648b5f..87465c7b6d7a 100644
--- a/pkgs/desktops/expidus/calculator/default.nix
+++ b/pkgs/desktops/expidus/calculator/default.nix
@@ -44,6 +44,7 @@ flutter.buildFlutterApplication rec {
   '';
 
   meta = with lib; {
+    broken = true;
     description = "ExpidusOS Calculator";
     homepage = "https://expidusos.com";
     license = licenses.gpl3Only;
diff --git a/pkgs/desktops/expidus/file-manager/default.nix b/pkgs/desktops/expidus/file-manager/default.nix
index b32b84d10999..a9eb0c05f7b6 100644
--- a/pkgs/desktops/expidus/file-manager/default.nix
+++ b/pkgs/desktops/expidus/file-manager/default.nix
@@ -44,6 +44,7 @@ flutter.buildFlutterApplication rec {
   '';
 
   meta = with lib; {
+    broken = true;
     description = "ExpidusOS File Manager";
     homepage = "https://expidusos.com";
     license = licenses.gpl3;

From 4baea46864423ed94901f8d31571f03b38c6aafe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 21 Aug 2025 00:42:17 +0200
Subject: [PATCH 2281/3724] thunderbird-unwrapped: 141.0 -> 142.0

https://www.thunderbird.net/en-US/thunderbird/142.0/releasenotes/
https://www.mozilla.org/en-US/security/advisories/mfsa2025-70/

Fixes: CVE-2025-9179, CVE-2025-9180, CVE-2025-9181, CVE-2025-9182,
       CVE-2025-9187, CVE-2025-9184, CVE-2025-9185
---
 .../networking/mailreaders/thunderbird/packages.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 466cb3f2e694..2744cc076875 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -94,8 +94,8 @@ rec {
   thunderbird = thunderbird-latest;
 
   thunderbird-latest = common {
-    version = "141.0";
-    sha512 = "cd747c0831532f90685975567102d1bdb90a780e21209fe4b7bddf2d84ac88576766706e95e22043a30a8a89b6d3daffb56a68c3ccc4a300b8236b20d4fca675";
+    version = "142.0";
+    sha512 = "9a871846fc395c69688310dbf4a4569b75d3b2952a34ba1f7dc9ef5a60a34bd740087b4abb2a1a4d522dfa9d6640f2f4fcc9972a2b72160d1ed3e0df71c2901c";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-latest";

From bfeebf7b5c669ff3a7998214f9f649fcd2e5b1e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 22:52:56 +0000
Subject: [PATCH 2282/3724] wine-staging: 10.12 -> 10.13

---
 pkgs/applications/emulators/wine/sources.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index 153923218c77..890f49f4cfd7 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -133,9 +133,9 @@ rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the hash for staging as well.
-    version = "10.12";
+    version = "10.13";
     url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";
-    hash = "sha256-zVcscaPXLof5hJCyKMfCaq6z/eON2eefw7VjkdWZ1r8=";
+    hash = "sha256-8fON8gVb2vpGtEwe34ZB5oMzDjoUbgn9UhnP6T4zxTE=";
 
     patches = [
       # Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -145,7 +145,7 @@ rec {
     # see https://gitlab.winehq.org/wine/wine-staging
     staging = fetchFromGitLab {
       inherit version;
-      hash = "sha256-a5Vw9UVawx/vvTeu6SGxf4C1GwvdmpPJDyuW0PCUob8=";
+      hash = "sha256-s2ceNBCBj2Zy1FLjjwEbbX3SQiqNwMPu49Ytq6X8R9U=";
       domain = "gitlab.winehq.org";
       owner = "wine";
       repo = "wine-staging";
@@ -168,9 +168,9 @@ rec {
 
     ## see http://wiki.winehq.org/Mono
     mono = fetchurl rec {
-      version = "10.1.0";
+      version = "10.2.0";
       url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
-      hash = "sha256-yIwkMYkLwyys7I1+pw5Tpa5LlcjFXKbnXvjbDkzPEHA=";
+      hash = "sha256-Th7T8C6S0FMTPQPd++/PbbSk3CMamu0zZ7FxF6iIR9g=";
     };
 
     updateScript = writeShellScript "update-wine-unstable" ''

From c4a261a0519d1353b86a02d3e0f67d9aad75ff3d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 21 Aug 2025 00:58:23 +0200
Subject: [PATCH 2283/3724] buildMozillaMach: use nss-esr for 140esr and older

---
 pkgs/build-support/build-mozilla-mach/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 75e94c5ccfd8..b7feccb768c0 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -577,7 +577,7 @@ buildStdenv.mkDerivation {
       xorg.xorgproto
       zlib
       (
-        if (lib.versionAtLeast version "129") then nss_latest else nss_esr # 3.90
+        if (lib.versionAtLeast version "141") then nss_latest else nss_esr # 3.90
       )
     ]
     ++ lib.optional alsaSupport alsa-lib

From 5cdd66b7df72e263b3e57974fb6bdd7e423c8588 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 21 Aug 2025 01:00:35 +0200
Subject: [PATCH 2284/3724] firefox-esr-128-unwrapped: drop

---
 nixos/tests/all-tests.nix                     |  4 --
 .../firefox/packages/firefox-esr-128.nix      | 40 -------------------
 pkgs/top-level/aliases.nix                    |  2 +
 pkgs/top-level/all-packages.nix               | 17 --------
 4 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a17e3694e827..ef183c57b3ac 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -541,10 +541,6 @@ in
     imports = [ ./firefox.nix ];
     _module.args.firefoxPackage = pkgs.firefox-esr;
   };
-  firefox-esr-128 = runTest {
-    imports = [ ./firefox.nix ];
-    _module.args.firefoxPackage = pkgs.firefox-esr-128;
-  };
   firefox-esr-140 = runTest {
     imports = [ ./firefox.nix ];
     _module.args.firefoxPackage = pkgs.firefox-esr-140;
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
deleted file mode 100644
index 96719a7734ed..000000000000
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  stdenv,
-  lib,
-  callPackage,
-  fetchurl,
-  nixosTests,
-  buildMozillaMach,
-}:
-
-buildMozillaMach rec {
-  pname = "firefox";
-  version = "128.13.0esr";
-  applicationName = "Firefox ESR";
-  src = fetchurl {
-    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "9e6f3af535e0904219bcac947d458789cc43cbfaf476ac287328323662391eaaadeff57b244599acf3626a2fadc0bc41b70d07e33ca6af4412006ad01ceff034";
-  };
-
-  meta = {
-    changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/";
-    description = "Web browser built from Firefox source tree";
-    homepage = "http://www.mozilla.com/en-US/firefox/";
-    maintainers = with lib.maintainers; [ hexa ];
-    platforms = lib.platforms.unix;
-    broken = stdenv.buildPlatform.is32bit;
-    # since Firefox 60, build on 32-bit platforms fails with "out of memory".
-    # not in `badPlatforms` because cross-compilation on 64-bit machine might work.
-    maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
-    license = lib.licenses.mpl20;
-    mainProgram = "firefox";
-  };
-  tests = {
-    inherit (nixosTests) firefox-esr-128;
-  };
-  updateScript = callPackage ../update.nix {
-    attrPath = "firefox-esr-128-unwrapped";
-    versionPrefix = "128";
-    versionSuffix = "esr";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 37bc5cc86a6b..420b5c033719 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -706,6 +706,8 @@ mapAliases {
   firefox-devedition-bin = lib.warnOnInstantiate "`firefox-devedition-bin` is removed.  Please use `firefox-devedition` or `firefox-bin` instead." firefox-devedition;
   firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead.";
   firefox-esr-115-unwrapped = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-128-unwrapped` instead.";
+  firefox-esr-128 = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-140` instead.";
+  firefox-esr-128-unwrapped = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-140-unwrapped` instead.";
   firefox-wayland = firefox; # Added 2022-11-15
   firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09
   fishfight = jumpy; # Added 2022-08-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cc0e80f46b4..0e6ce9df3229 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11891,18 +11891,6 @@ with pkgs;
           buildMozillaMach
           ;
       };
-  firefox-esr-128-unwrapped =
-    import ../applications/networking/browsers/firefox/packages/firefox-esr-128.nix
-      {
-        inherit
-          stdenv
-          lib
-          callPackage
-          fetchurl
-          nixosTests
-          buildMozillaMach
-          ;
-      };
   firefox-esr-140-unwrapped =
     import ../applications/networking/browsers/firefox/packages/firefox-esr-140.nix
       {
@@ -11923,11 +11911,6 @@ with pkgs;
 
   firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { };
 
-  firefox-esr-128 = wrapFirefox firefox-esr-128-unwrapped {
-    nameSuffix = "-esr";
-    wmClass = "firefox-esr";
-    icon = "firefox-esr";
-  };
   firefox-esr-140 = wrapFirefox firefox-esr-140-unwrapped {
     nameSuffix = "-esr";
     wmClass = "firefox-esr";

From 088e2329226cdaf798f31cc184c4f53bfb7002cf Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Tue, 19 Aug 2025 22:02:45 +0100
Subject: [PATCH 2285/3724] envoy: 1.34.2 -> 1.35.1

---
 .../0001-nixpkgs-use-system-Python.patch      |  8 +--
 .../en/envoy/0002-nixpkgs-use-system-Go.patch |  4 +-
 ...03-nixpkgs-use-system-C-C-toolchains.patch | 14 ++---
 ...04-nixpkgs-bump-rules_rust-to-0.60.0.patch |  6 +--
 pkgs/by-name/en/envoy/package.nix             | 44 +++++++++++-----
 pkgs/by-name/en/envoy/rules_rust.patch        | 51 -------------------
 6 files changed, 48 insertions(+), 79 deletions(-)

diff --git a/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch b/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch
index a241949a0c99..7d4812daecfb 100644
--- a/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch
+++ b/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch
@@ -45,12 +45,12 @@ index 9867dc3a46dbe780eb3c02bad8f6a22a2c7fd97e..ff8685e0e437aee447218e912f1cf3e4
          extra_pip_args = ["--require-hashes"],
      )
 diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl
-index 7a9d3bbb53b567a8f398abaefe5ff044056d4d21..a5b75718de667883824e4320e2d563830b02f5d2 100644
+index 84e2a69c092fa4c824401a52b2c39a49f83d0837..e5afd5743613ad5fdbf7b28a99b6d1b5902566ac 100644
 --- a/bazel/repositories_extra.bzl
 +++ b/bazel/repositories_extra.bzl
-@@ -3,19 +3,11 @@ load("@bazel_features//:deps.bzl", "bazel_features_deps")
- load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")
+@@ -4,19 +4,11 @@ load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_baze
  load("@emsdk//:deps.bzl", emsdk_deps = "deps")
+ load("@envoy_examples//bazel:env.bzl", "envoy_examples_env")
  load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:crates.bzl", "crate_repositories")
 -load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
 +load("@rules_python//python:repositories.bzl", "py_repositories")
@@ -69,7 +69,7 @@ index 7a9d3bbb53b567a8f398abaefe5ff044056d4d21..a5b75718de667883824e4320e2d56383
          ignore_root_user_error = False):
      bazel_features_deps()
      emsdk_deps()
-@@ -23,13 +15,6 @@ def envoy_dependencies_extra(
+@@ -24,13 +16,6 @@ def envoy_dependencies_extra(
      crate_repositories()
      py_repositories()
  
diff --git a/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch b/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch
index cb8c5d20b671..e4d7e0926092 100644
--- a/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch
+++ b/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch
@@ -10,10 +10,10 @@ Signed-off-by: Luke Granger-Brown <git@lukegb.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
-index aef33aa103dc1136e63e165fb9ee6a267f52ba54..c5aefca14b729b548c4e90857202eb82576b507d 100644
+index 4615eed5c9ade5279f8174cf1bd3987a8b2d52f1..10be4b0b3f65e486c1dc8419337a5cf823431774 100644
 --- a/bazel/dependency_imports.bzl
 +++ b/bazel/dependency_imports.bzl
-@@ -22,7 +22,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common")
+@@ -24,7 +24,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common")
  load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set")
  
  # go version for rules_go
diff --git a/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch b/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch
index 684e73b5c838..e8113b102ee7 100644
--- a/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch
+++ b/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch
@@ -10,18 +10,18 @@ Signed-off-by: Luke Granger-Brown <git@lukegb.com>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
-index c5aefca14b729b548c4e90857202eb82576b507d..6938ce63abb53661e8d1fb71eaaab03ba0cc37c6 100644
+index 10be4b0b3f65e486c1dc8419337a5cf823431774..b0badb3ccab3b112043bd8616770f8014238d396 100644
 --- a/bazel/dependency_imports.bzl
 +++ b/bazel/dependency_imports.bzl
-@@ -30,7 +30,11 @@ YQ_VERSION = "4.24.4"
- BUF_VERSION = "v1.50.0"
- 
- def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, yq_version = YQ_VERSION, buf_version = BUF_VERSION):
+@@ -38,7 +38,11 @@ def envoy_dependency_imports(
+         yq_version = YQ_VERSION,
+         buf_sha = BUF_SHA,
+         buf_version = BUF_VERSION):
 -    rules_foreign_cc_dependencies()
 +    rules_foreign_cc_dependencies(
 +        register_default_tools=False,  # no prebuilt toolchains
-+	    register_built_tools=False,  # nor from source
-+	    register_preinstalled_tools=True,  # use host tools (default)
++        register_built_tools=False,  # nor from source
++        register_preinstalled_tools=True,  # use host tools (default)
 +    )
      go_rules_dependencies()
      go_register_toolchains(go_version)
diff --git a/pkgs/by-name/en/envoy/0004-nixpkgs-bump-rules_rust-to-0.60.0.patch b/pkgs/by-name/en/envoy/0004-nixpkgs-bump-rules_rust-to-0.60.0.patch
index 40b808952e3d..b9aac1e2252f 100644
--- a/pkgs/by-name/en/envoy/0004-nixpkgs-bump-rules_rust-to-0.60.0.patch
+++ b/pkgs/by-name/en/envoy/0004-nixpkgs-bump-rules_rust-to-0.60.0.patch
@@ -9,10 +9,10 @@ Signed-off-by: Luke Granger-Brown <git@lukegb.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
-index 6904bc93bdda3ee2308f13d61e62295fa11d799b..e4574878a566cceb4dc2343f3cade0350ea5e5ff 100644
+index 1293e432c815071ed55721760e583ac0e9f40108..664f8c8e2bf4641e7862e9321fd6f91d162c3c17 100644
 --- a/bazel/repository_locations.bzl
 +++ b/bazel/repository_locations.bzl
-@@ -1465,8 +1465,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
+@@ -1528,8 +1528,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
          project_name = "Bazel rust rules",
          project_desc = "Bazel rust rules (used by Wasm)",
          project_url = "https://github.com/bazelbuild/rules_rust",
@@ -23,7 +23,7 @@ index 6904bc93bdda3ee2308f13d61e62295fa11d799b..e4574878a566cceb4dc2343f3cade035
          # Note: rules_rust should point to the releases, not archive to avoid the hassle of bootstrapping in crate_universe.
          # This is described in https://bazelbuild.github.io/rules_rust/crate_universe.html#setup, otherwise bootstrap
          # is required which in turn requires a system CC toolchains, not the bazel controlled ones.
-@@ -1477,7 +1477,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
+@@ -1540,7 +1540,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
              "dataplane_ext",
          ],
          extensions = ["envoy.wasm.runtime.wasmtime"],
diff --git a/pkgs/by-name/en/envoy/package.nix b/pkgs/by-name/en/envoy/package.nix
index e1ddae74bffe..37a5037e0c41 100644
--- a/pkgs/by-name/en/envoy/package.nix
+++ b/pkgs/by-name/en/envoy/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  bazel_6,
+  bazel_7,
   bazel-gazelle,
   buildBazelPackage,
   fetchFromGitHub,
@@ -16,7 +16,7 @@
   jdk,
   ninja,
   patchelf,
-  python3,
+  python312,
   linuxHeaders,
   nixosTests,
   runCommandLocal,
@@ -34,24 +34,26 @@ let
     # However, the version string is more useful for end-users.
     # These are contained in a attrset of their own to make it obvious that
     # people should update both.
-    version = "1.34.2";
-    rev = "c657e59fac461e406c8fdbe57ced833ddc236ee1";
-    hash = "sha256-f9JsgHEyOg1ZoEb7d3gy3+qoovpA3oOx6O8yL0U8mhI=";
+    version = "1.35.1";
+    rev = "6e9539d0366baf85baf9acb3e618cb3384765f13";
+    hash = "sha256-c1c8j/BCRrvAEqjt4EQ/d7zsM1zUe4Qr5EHzpuGblIk=";
   };
 
   # these need to be updated for any changes to fetchAttrs
   depsHash =
     {
-      x86_64-linux = "sha256-CczmVD/3tWR3LygXc3cTAyrMPZUTajqtRew85wBM5mY=";
-      aarch64-linux = "sha256-GemlfXHlaHPn1/aBxj2Ve9tuwsEdlQQCU1v57378Dgs=";
+      x86_64-linux = "sha256-E6yUSd00ngmjaMds+9UVZLtcYhzeS8F9eSIkC1mZSps=";
+      aarch64-linux = "sha256-ivboOrV/uORKVHRL3685aopcElGvzsxgVcUmYsBwzXY=";
     }
     .${stdenv.system} or (throw "unsupported system ${stdenv.system}");
 
+  python3 = python312;
+
 in
 buildBazelPackage rec {
   pname = "envoy";
   inherit (srcVer) version;
-  bazel = bazel_6;
+  bazel = bazel_7;
 
   src = applyPatches {
     src = fetchFromGitHub {
@@ -97,11 +99,11 @@ buildBazelPackage rec {
       --replace-fail 'crate_universe_dependencies()' 'crate_universe_dependencies(rust_toolchain_cargo_template="@@//bazel/nix:cargo", rust_toolchain_rustc_template="@@//bazel/nix:rustc")' \
       --replace-fail 'crates_repository(' 'crates_repository(rust_toolchain_cargo_template="@@//bazel/nix:cargo", rust_toolchain_rustc_template="@@//bazel/nix:rustc",'
 
-    # patch rules_rust for envoy specifics, but also to support old Bazel
-    # (Bazel 6 doesn't have ctx.watch, but ctx.path is sufficient for our use)
+    # patch rules_rust for envoy specifics
     cp ${./rules_rust.patch} bazel/rules_rust.patch
     substituteInPlace bazel/repositories.bzl \
-      --replace-fail ', "@envoy//bazel:rules_rust_ppc64le.patch"' ""
+      --replace-fail ', "@envoy//bazel:rules_rust_ppc64le.patch"' "" \
+      --replace-fail '"@envoy//bazel:emsdk.patch"' ""
 
     substitute ${./rules_rust_extra.patch} bazel/nix/rules_rust_extra.patch \
       --subst-var-by bash "$(type -p bash)"
@@ -130,11 +132,23 @@ buildBazelPackage rec {
     postPatch = ''
       ${postPatch}
 
+      echo "common --repository_cache=\"$bazelOut/external/repository_cache\"" >> .bazelrc
+
       substituteInPlace bazel/dependency_imports.bzl \
         --replace-fail 'crate_universe_dependencies(' 'crate_universe_dependencies(bootstrap=True, ' \
         --replace-fail 'crates_repository(' 'crates_repository(generator="@@cargo_bazel_bootstrap//:cargo-bazel", '
     '';
     preInstall = ''
+      mkdir $NIX_BUILD_TOP/empty
+      pushd $NIX_BUILD_TOP/empty
+      touch MODULE.bazel
+      # Unfortunately, we need to fetch a lot of irrelevant junk to make this work.
+      # This really bloats the size of the FOD.
+      # TODO: lukegb - figure out how to make this suck less.
+      bazel fetch --repository_cache="$bazelOut/external/repository_cache"
+      bazel sync --repository_cache="$bazelOut/external/repository_cache"
+      popd
+
       # Strip out the path to the build location (by deleting the comment line).
       find $bazelOut/external -name requirements.bzl | while read requirements; do
         sed -i '/# Generated from /d' "$requirements"
@@ -151,7 +165,6 @@ buildBazelPackage rec {
         $bazelOut/external/rules_rust/util/process_wrapper/private/process_wrapper.sh \
         $bazelOut/external/rules_rust/crate_universe/src/metadata/cargo_tree_rustc_wrapper.sh
 
-      rm -r $bazelOut/external/go_sdk
       rm -r $bazelOut/external/local_jdk
       rm -r $bazelOut/external/bazel_gazelle_go_repository_tools/bin
 
@@ -175,7 +188,11 @@ buildBazelPackage rec {
     dontUseCmakeConfigure = true;
     dontUseGnConfigure = true;
     dontUseNinjaInstall = true;
+    bazel = null;
     preConfigure = ''
+      echo "common --repository_cache=\"$bazelOut/external/repository_cache\"" >> .bazelrc
+      echo "common --repository_disable_download" >> .bazelrc
+
       # Make executables work, for the most part.
       find $bazelOut/external -type f -executable | while read execbin; do
         file "$execbin" | grep -q ': ELF .*, dynamically linked,' || continue
@@ -211,6 +228,9 @@ buildBazelPackage rec {
   removeLocalConfigCc = true;
   removeLocal = false;
   bazelTargets = [ "//source/exe:envoy-static" ];
+  bazelFlags = [
+    "--repo_env=BAZEL_HTTP_RULES_URLS_AS_DEFAULT_CANONICAL_ID=0"
+  ];
   bazelBuildFlags = [
     "-c opt"
     "--spawn_strategy=standalone"
diff --git a/pkgs/by-name/en/envoy/rules_rust.patch b/pkgs/by-name/en/envoy/rules_rust.patch
index 7261cb2fc760..7bb2353a8e61 100644
--- a/pkgs/by-name/en/envoy/rules_rust.patch
+++ b/pkgs/by-name/en/envoy/rules_rust.patch
@@ -5,61 +5,10 @@ Subject: [PATCH] rules_rust base
 
 Signed-off-by: Luke Granger-Brown <git@lukegb.com>
 ---
- cargo/private/cargo_bootstrap.bzl |  8 ++++----
- crate_universe/extensions.bzl     | 10 +++++-----
  crate_universe/src/lockfile.rs    |  4 ++--
  rust/private/rustc.bzl            |  4 ++--
  4 files changed, 13 insertions(+), 13 deletions(-)
 
-diff --git cargo/private/cargo_bootstrap.bzl cargo/private/cargo_bootstrap.bzl
-index a8021c49d62037ef32c7c64d5bb4a5efe3a8b4aa..f63d7c23ae0bddc9f3fece347a3a2b5b0afe6d8d 100644
---- cargo/private/cargo_bootstrap.bzl
-+++ cargo/private/cargo_bootstrap.bzl
-@@ -173,13 +173,13 @@ def _detect_changes(repository_ctx):
-     # 'consumed' which means changes to it will trigger rebuilds
- 
-     for src in repository_ctx.attr.srcs:
--        repository_ctx.watch(src)
-+        repository_ctx.path(src)
- 
--    repository_ctx.watch(repository_ctx.attr.cargo_lockfile)
--    repository_ctx.watch(repository_ctx.attr.cargo_toml)
-+    repository_ctx.path(repository_ctx.attr.cargo_lockfile)
-+    repository_ctx.path(repository_ctx.attr.cargo_toml)
- 
-     if repository_ctx.attr.cargo_config:
--        repository_ctx.watch(repository_ctx.attr.cargo_config)
-+        repository_ctx.path(repository_ctx.attr.cargo_config)
- 
- def _cargo_bootstrap_repository_impl(repository_ctx):
-     # Pretend to Bazel that this rule's input files have been used, so that it will re-run the rule if they change.
-diff --git crate_universe/extensions.bzl crate_universe/extensions.bzl
-index a749b10c8d469bd316d78034059c94b1fd98dbef..8f8c84dac1ec330d5e8e6abbd930387cb6c9f29e 100644
---- crate_universe/extensions.bzl
-+++ crate_universe/extensions.bzl
-@@ -957,17 +957,17 @@ def _crate_impl(module_ctx):
-                 fail("Spec specified for repo {}, but the module defined repositories {}".format(repo, local_repos))
- 
-         for cfg in mod.tags.from_cargo + mod.tags.from_specs:
--            # Preload all external repositories. Calling `module_ctx.watch` will cause restarts of the implementation
-+            # Preload all external repositories. Calling `module_ctx.path` will cause restarts of the implementation
-             # function of the module extension when the file has changed.
-             if cfg.cargo_lockfile:
--                module_ctx.watch(cfg.cargo_lockfile)
-+                module_ctx.path(cfg.cargo_lockfile)
-             if cfg.lockfile:
--                module_ctx.watch(cfg.lockfile)
-+                module_ctx.path(cfg.lockfile)
-             if cfg.cargo_config:
--                module_ctx.watch(cfg.cargo_config)
-+                module_ctx.path(cfg.cargo_config)
-             if hasattr(cfg, "manifests"):
-                 for m in cfg.manifests:
--                    module_ctx.watch(m)
-+                    module_ctx.path(m)
- 
-             cargo_path, rustc_path = _get_host_cargo_rustc(module_ctx, host_triple, cfg.host_tools_repo)
-             cargo_bazel_fn = new_cargo_bazel_fn(
 diff --git crate_universe/src/lockfile.rs crate_universe/src/lockfile.rs
 index 3e0ce6265fda6fbdd9e3e989e3e4e4443b615b8c..0fafcea8fbc7a590676d34d2c4ca8c413b953955 100644
 --- crate_universe/src/lockfile.rs

From f8281af2cfa85d1ab666185298ae792c7d786c02 Mon Sep 17 00:00:00 2001
From: Emilia <emilia@emilia.codes>
Date: Thu, 21 Aug 2025 01:09:36 +0200
Subject: [PATCH 2286/3724] finalmouse-udev-rules: 2025-05-05 -> 2025-08-15

---
 pkgs/by-name/fi/finalmouse-udev-rules/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/finalmouse-udev-rules/package.nix b/pkgs/by-name/fi/finalmouse-udev-rules/package.nix
index a2f1e176f87f..d21d8e4bfb53 100644
--- a/pkgs/by-name/fi/finalmouse-udev-rules/package.nix
+++ b/pkgs/by-name/fi/finalmouse-udev-rules/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation {
   pname = "finalmouse-udev-rules";
-  version = "0-unstable-2025-05-05";
+  version = "0-unstable-2025-08-15";
 
   src = fetchFromGitHub {
     owner = "teamfinalmouse";
     repo = "xpanel-linux-permissions";
-    rev = "60c4ed794bd946e467559cc572cf25bb99bf04b6";
-    hash = "sha256-E2xhm+8fFlxgIKjZlAvosLk/KgbmLk01BjK++y8laBc=";
+    rev = "6b200ec39f1fa31edf6648f5ec3d5738c3770530";
+    hash = "sha256-Bo8XBvrUlZe0eVQlNQGb0xuTb+wecipsHwLdZpK0dUQ=";
   };
 
   dontUnpack = true;

From d7f50bf6605a248f28ef94ac973ed19fdc1a6896 Mon Sep 17 00:00:00 2001
From: Nova Hahn <mail@novahahn.eu>
Date: Thu, 21 Aug 2025 01:25:39 +0200
Subject: [PATCH 2287/3724] lutris: Add adwaita-icon-theme to FHS environment

Resolves #435087
---
 pkgs/applications/misc/lutris/fhsenv.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix
index 0e3b8efc1b7a..af0a3989708a 100644
--- a/pkgs/applications/misc/lutris/fhsenv.nix
+++ b/pkgs/applications/misc/lutris/fhsenv.nix
@@ -22,6 +22,7 @@ let
       gnome-desktop
       libgnome-keyring
       webkitgtk_4_1
+      adwaita-icon-theme
     ];
   xorgDeps =
     pkgs: with pkgs.xorg; [

From ba3232ef1324422213f1635a08d2500a9c27d572 Mon Sep 17 00:00:00 2001
From: "[Assassin]" <ShyAssassin@assassin.dev>
Date: Thu, 21 Aug 2025 01:25:50 +0200
Subject: [PATCH 2288/3724] vrcx: 2025.06.30 -> 2025.08.17

---
 pkgs/by-name/vr/vrcx/deps.json   | 69 ++++++++++----------------------
 pkgs/by-name/vr/vrcx/package.nix | 16 ++++----
 2 files changed, 31 insertions(+), 54 deletions(-)

diff --git a/pkgs/by-name/vr/vrcx/deps.json b/pkgs/by-name/vr/vrcx/deps.json
index 50b31b992525..38b526ba576f 100644
--- a/pkgs/by-name/vr/vrcx/deps.json
+++ b/pkgs/by-name/vr/vrcx/deps.json
@@ -1,8 +1,8 @@
 [
   {
     "pname": "DiscordRichPresence",
-    "version": "1.3.0.28",
-    "hash": "sha256-KdwSl5ysunAbC21cXRrSROO2XN/ZscIVdq6+IH+5Fbs="
+    "version": "1.5.0.51",
+    "hash": "sha256-ZfyXXsJ7c8u0EAfKjquv/pAL3ZajKLnVIJWADQYJ6wI="
   },
   {
     "pname": "EntityFramework",
@@ -51,13 +51,13 @@
   },
   {
     "pname": "Microsoft.JavaScript.NodeApi",
-    "version": "0.9.11",
-    "hash": "sha256-1F2lG7ePVKy9QXMt76AWf64zj5o9upVik3//AqPaw7U="
+    "version": "0.9.13",
+    "hash": "sha256-zXNmEg6txPXXD3yLHMWlziPgbDsNCLQcmqxO0pU8OCY="
   },
   {
     "pname": "Microsoft.JavaScript.NodeApi.Generator",
-    "version": "0.9.11",
-    "hash": "sha256-WAunMB3ksE0trHmohr+fTxGXiYNd553PUJoDaOSmLxo="
+    "version": "0.9.13",
+    "hash": "sha256-tgWN7EHgXwHvV5f1xXOvaXBVjeM+LfRyhPv7N9625N0="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
@@ -69,11 +69,6 @@
     "version": "1.1.1",
     "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="
   },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "2.0.0",
-    "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
-  },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "2.1.2",
@@ -104,11 +99,6 @@
     "version": "4.3.0",
     "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
   },
-  {
-    "pname": "Microsoft.Win32.Registry",
-    "version": "4.5.0",
-    "hash": "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0="
-  },
   {
     "pname": "Microsoft.Win32.Registry",
     "version": "4.7.0",
@@ -116,8 +106,8 @@
   },
   {
     "pname": "Microsoft.Win32.SystemEvents",
-    "version": "9.0.6",
-    "hash": "sha256-iIS1YZ8X8Zfahg2jOW3ODCZwmSSsp96epu+kT+wieQg="
+    "version": "9.0.7",
+    "hash": "sha256-7o59Y4Wy9EsTlcNVCNuweR/7Y7QlbB6MwK/aHGax3F4="
   },
   {
     "pname": "NETStandard.Library",
@@ -136,8 +126,8 @@
   },
   {
     "pname": "NLog",
-    "version": "5.5.0",
-    "hash": "sha256-WkuKGo3iEqJruQuRZXMksqIbAQjZbFIANcm0zZr/fYE="
+    "version": "6.0.2",
+    "hash": "sha256-sToQRwukDjUo3ytSmHXT5p4j6fTv1utHkQKeF48EWnQ="
   },
   {
     "pname": "runtime.any.System.Collections",
@@ -431,18 +421,13 @@
   },
   {
     "pname": "SixLabors.ImageSharp",
-    "version": "3.1.10",
-    "hash": "sha256-6bVTSCxLY8Dt+9lpo4F4xEtMv5oPve2vS76O/lcuIok="
-  },
-  {
-    "pname": "SixLabors.ImageSharp",
-    "version": "3.1.8",
-    "hash": "sha256-cE9BQfbCvJ0Mf+fQiTD8elOZEPcfZHjDz2BHdiO+D08="
+    "version": "3.1.11",
+    "hash": "sha256-MlRF+3SGfahbsB1pZGKMOrsfUCx//hCo7ECrXr03DpA="
   },
   {
     "pname": "SixLabors.ImageSharp.Drawing",
-    "version": "2.1.6",
-    "hash": "sha256-2VYoBw8XidjqFUS03EgxOq9vw/WRZjhF3z1pwfaSzUc="
+    "version": "2.1.7",
+    "hash": "sha256-LkStbMTvIPIXvkda4Xn1simHaH0mJHHuCI0+AaAS4/4="
   },
   {
     "pname": "sqlite-net-pcl",
@@ -491,8 +476,8 @@
   },
   {
     "pname": "System.CodeDom",
-    "version": "9.0.6",
-    "hash": "sha256-vcKv5qTborX8E4Uy7T/hqWRii35Icw1siDWPJenk9K8="
+    "version": "9.0.7",
+    "hash": "sha256-L54rUZDfqPwXDhA0C1t0wtxcFhFrDYowjjyn67+kvLM="
   },
   {
     "pname": "System.Collections",
@@ -576,8 +561,8 @@
   },
   {
     "pname": "System.Drawing.Common",
-    "version": "9.0.6",
-    "hash": "sha256-uQDdDVOu3G39PPa1SbE7bHfTzQBAGzL705UklWl/y2I="
+    "version": "9.0.7",
+    "hash": "sha256-GRiTUzguCr8o3V9whhoKvW16NCA08mdYO1rViJiDvvo="
   },
   {
     "pname": "System.Globalization",
@@ -631,8 +616,8 @@
   },
   {
     "pname": "System.Management",
-    "version": "9.0.6",
-    "hash": "sha256-dZ46TTekJCMfgfRsz6qjJpa0IzPxlm8XXyYmP6msNZY="
+    "version": "9.0.7",
+    "hash": "sha256-CRa1zZHzw1kq8tpFnncV45prHCfYRg8lTYdv0E+E+qw="
   },
   {
     "pname": "System.Memory",
@@ -789,11 +774,6 @@
     "version": "4.3.0",
     "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
   },
-  {
-    "pname": "System.Security.AccessControl",
-    "version": "4.5.0",
-    "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="
-  },
   {
     "pname": "System.Security.AccessControl",
     "version": "4.7.0",
@@ -859,11 +839,6 @@
     "version": "4.3.0",
     "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="
   },
-  {
-    "pname": "System.Security.Principal.Windows",
-    "version": "4.5.0",
-    "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="
-  },
   {
     "pname": "System.Security.Principal.Windows",
     "version": "4.7.0",
@@ -886,8 +861,8 @@
   },
   {
     "pname": "System.Text.Json",
-    "version": "9.0.6",
-    "hash": "sha256-WC/QbZhTaoZ3PbDKcFvJwMIA4xLUdnMrAXGlOW87VNY="
+    "version": "9.0.7",
+    "hash": "sha256-f3leKX3r7JoUbKo6tnuIsPVYJHNbElHWffhyqk1+2C0="
   },
   {
     "pname": "System.Text.RegularExpressions",
diff --git a/pkgs/by-name/vr/vrcx/package.nix b/pkgs/by-name/vr/vrcx/package.nix
index a74442d1fd93..c968e75579e6 100644
--- a/pkgs/by-name/vr/vrcx/package.nix
+++ b/pkgs/by-name/vr/vrcx/package.nix
@@ -4,7 +4,7 @@
   buildDotnetModule,
   dotnetCorePackages,
   buildNpmPackage,
-  electron_36,
+  electron_37,
   makeWrapper,
   copyDesktopItems,
   makeDesktopItem,
@@ -12,16 +12,16 @@
 }:
 let
   pname = "vrcx";
-  version = "2025.06.30";
+  version = "2025.08.17";
   dotnet = dotnetCorePackages.dotnet_9;
-  electron = electron_36;
+  electron = electron_37;
 
   src = fetchFromGitHub {
     owner = "vrcx-team";
     repo = "VRCX";
-    # v2025.06.30 tag didn't bump the version
-    rev = "4a630079d778069293a39e5b7f7fdb3f543590da";
-    hash = "sha256-GBSkwfi9uvmBg3crnE9CYKDWzekrPjhSq9kDJzmf3bM=";
+    # v2025.08.17 tag didn't bump the version
+    rev = "fa10af8acaef6ca23866cee6fc80b1b0b0038ca5";
+    hash = "sha256-j/NGym4tGcazDcWtiPqxHbBCbHCkkuysd+cMUPAj6Rc=";
   };
 
   backend = buildDotnetModule {
@@ -46,7 +46,7 @@ in
 buildNpmPackage {
   inherit pname version src;
 
-  npmDepsHash = "sha256-x84l1+gRH2qADofYwyrEOeE4WJwqTqVB0L3JRxbscmM=";
+  npmDepsHash = "sha256-aFbdQhH8lQ/R+o4lCoqVc2nPJnxmNEFjR4MnqWKP32g=";
   npmFlags = [ "--ignore-scripts" ];
   makeCacheWritable = true;
 
@@ -58,6 +58,8 @@ buildNpmPackage {
   buildPhase = ''
     runHook preBuild
 
+    # need to run vue-demi postinstall for pinia
+    node ./node_modules/vue-demi/scripts/postinstall.js
     env PLATFORM=linux npm exec webpack -- --config webpack.config.js --mode production
     node src-electron/patch-package-version.js
     npm exec electron-builder -- --dir \

From f95f31ff2dfd2e83fb15bec6cd3bca60524f989c Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Thu, 31 Jul 2025 14:13:21 -0400
Subject: [PATCH 2289/3724] taskchampion-sync-server: 0.6.1 -> 0.7.0

changelog: https://github.com/GothenburgBitFactory/taskchampion-sync-server/releases/tag/v0.7.0

Co-authored-by: Masum Reza <50095635+JohnRTitor@users.noreply.github.com>
---
 .../ta/taskchampion-sync-server/package.nix   | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ta/taskchampion-sync-server/package.nix b/pkgs/by-name/ta/taskchampion-sync-server/package.nix
index fbe747b5f35d..76b32312b44d 100644
--- a/pkgs/by-name/ta/taskchampion-sync-server/package.nix
+++ b/pkgs/by-name/ta/taskchampion-sync-server/package.nix
@@ -1,19 +1,32 @@
 {
-  lib,
-  rustPlatform,
   fetchFromGitHub,
+  lib,
+  openssl,
+  rustPlatform,
+  stdenv,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "taskchampion-sync-server";
-  version = "0.6.1";
+  version = "0.7.0";
   src = fetchFromGitHub {
     owner = "GothenburgBitFactory";
     repo = "taskchampion-sync-server";
     tag = "v${version}";
-    hash = "sha256-spuTCRsF1uHTTWfOjkMRokZnBhqP53CPAi3WMJB3yq4=";
+    hash = "sha256-DNGugytc4dMjj8je4BpEjNjdrnTBnWc1MNeMqcdTr4s=";
   };
 
-  cargoHash = "sha256-bsB/dPqPmzviHsGA8gtSew2PQdySNzifZ6dhu7XQ8IU=";
+  cargoHash = "sha256-A0alSDqsqlAL0XW0rJ35rYcoyx2ndX/Xft9Qff/rr9I=";
+
+  env = {
+    # Use system openssl.
+    OPENSSL_DIR = lib.getDev openssl;
+    OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
+    OPENSSL_NO_VENDOR = 1;
+  };
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    openssl
+  ];
 
   meta = {
     description = "Sync server for Taskwarrior 3";

From 9cc767c060f7016e0c58660dbf390e5ea2e2b931 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 17 Aug 2025 17:56:22 +0200
Subject: [PATCH 2290/3724] music-assistant: 2.5.5 -> 2.5.8

https://github.com/music-assistant/server/releases/tag/2.5.8

- Pass librespot and snapserver dependency via PATH
- Add EXTRA_DEPS for runtime deps not mentioned in manifest
---
 .../services/audio/music-assistant.nix        | 12 ++++++++
 .../music-assistant/dont-install-deps.patch   | 26 ++++++++++++-----
 .../mu/music-assistant/librespot.patch        | 29 -------------------
 pkgs/by-name/mu/music-assistant/package.nix   | 16 ++++++----
 pkgs/by-name/mu/music-assistant/providers.nix |  5 ++--
 .../mu/music-assistant/update-providers.py    | 12 +++++++-
 6 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/nixos/modules/services/audio/music-assistant.nix b/nixos/modules/services/audio/music-assistant.nix
index d48bb7f99f84..b7233878ecae 100644
--- a/nixos/modules/services/audio/music-assistant.nix
+++ b/nixos/modules/services/audio/music-assistant.nix
@@ -79,6 +79,18 @@ in
         PYTHONPATH = finalPackage.pythonPath;
       };
 
+      path =
+        with pkgs;
+        [
+          lsof
+        ]
+        ++ lib.optionals (lib.elem "librespot" cfg.providers) [
+          librespot
+        ]
+        ++ lib.optionals (lib.elem "snapcast" cfg.providers) [
+          snapcast
+        ];
+
       serviceConfig = {
         ExecStart = utils.escapeSystemdExecArgs (
           [
diff --git a/pkgs/by-name/mu/music-assistant/dont-install-deps.patch b/pkgs/by-name/mu/music-assistant/dont-install-deps.patch
index 5281f578bedf..21e9522a9bfe 100644
--- a/pkgs/by-name/mu/music-assistant/dont-install-deps.patch
+++ b/pkgs/by-name/mu/music-assistant/dont-install-deps.patch
@@ -1,10 +1,10 @@
 diff --git a/music_assistant/helpers/util.py b/music_assistant/helpers/util.py
-index 8daf159d..af5a6f38 100644
+index 74540dd3..14f8f864 100644
 --- a/music_assistant/helpers/util.py
 +++ b/music_assistant/helpers/util.py
-@@ -429,30 +429,11 @@ async def load_provider_module(domain: str, requirements: list[str]) -> Provider
-     def _get_provider_module(domain: str) -> ProviderModuleType:
-         return importlib.import_module(f".{domain}", "music_assistant.providers")
+@@ -434,30 +434,11 @@ async def load_provider_module(domain: str, requirements: list[str]) -> Provider
+             "ProviderModuleType", importlib.import_module(f".{domain}", "music_assistant.providers")
+         )
  
 -    # ensure module requirements are met
 -    for requirement in requirements:
@@ -30,7 +30,19 @@ index 8daf159d..af5a6f38 100644
 -    # this will fail if something else is wrong (as it should)
 -    return await asyncio.to_thread(_get_provider_module, domain)
 -
-+        raise RuntimeError(f"Missing dependencies for provider {domain}.")
++        raise RuntimeError(f"Configure {domain} in `services.music-assistant.providers` to install the required dependencies.")
  
- def create_tempfile():
-     """Return a (named) temporary file."""
+ async def has_tmpfs_mount() -> bool:
+     """Check if we have a tmpfs mount."""
+diff --git a/music_assistant/providers/ytmusic/__init__.py b/music_assistant/providers/ytmusic/__init__.py
+index 52a7544a..816d0425 100644
+--- a/music_assistant/providers/ytmusic/__init__.py
++++ b/music_assistant/providers/ytmusic/__init__.py
+@@ -197,7 +197,6 @@ class YoutubeMusicProvider(MusicProvider):
+     async def handle_async_init(self) -> None:
+         """Set up the YTMusic provider."""
+         logging.getLogger("yt_dlp").setLevel(self.logger.level + 10)
+-        await self._install_packages()
+         self._cookie = self.config.get_value(CONF_COOKIE)
+         self._po_token_server_url = (
+             self.config.get_value(CONF_PO_TOKEN_SERVER_URL) or DEFAULT_PO_TOKEN_SERVER_URL
diff --git a/pkgs/by-name/mu/music-assistant/librespot.patch b/pkgs/by-name/mu/music-assistant/librespot.patch
index 95b135a46b15..e69de29bb2d1 100644
--- a/pkgs/by-name/mu/music-assistant/librespot.patch
+++ b/pkgs/by-name/mu/music-assistant/librespot.patch
@@ -1,29 +0,0 @@
-diff --git a/music_assistant/providers/spotify/helpers.py b/music_assistant/providers/spotify/helpers.py
-index 8b6c4e78..20c2a269 100644
---- a/music_assistant/providers/spotify/helpers.py
-+++ b/music_assistant/providers/spotify/helpers.py
-@@ -11,23 +11,4 @@ from music_assistant.helpers.process import check_output
- async def get_librespot_binary() -> str:
-     """Find the correct librespot binary belonging to the platform."""
- 
--    # ruff: noqa: SIM102
--    async def check_librespot(librespot_path: str) -> str | None:
--        try:
--            returncode, output = await check_output(librespot_path, "--version")
--            if returncode == 0 and b"librespot" in output:
--                return librespot_path
--        except OSError:
--            return None
--
--    base_path = os.path.join(os.path.dirname(__file__), "bin")
--    system = platform.system().lower().replace("darwin", "macos")
--    architecture = platform.machine().lower()
--
--    if bridge_binary := await check_librespot(
--        os.path.join(base_path, f"librespot-{system}-{architecture}")
--    ):
--        return bridge_binary
--
--    msg = f"Unable to locate Librespot for {system}/{architecture}"
--    raise RuntimeError(msg)
-+    return "@librespot@"
diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index ead07456c2cc..71fe4275b77a 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -3,7 +3,6 @@
   python3,
   fetchFromGitHub,
   ffmpeg-headless,
-  librespot,
   nixosTests,
   replaceVars,
   providers ? [ ],
@@ -48,14 +47,14 @@ assert
 
 python.pkgs.buildPythonApplication rec {
   pname = "music-assistant";
-  version = "2.5.5";
+  version = "2.5.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "server";
     tag = version;
-    hash = "sha256-v9xFUjjk7KHsUtuZjQWLtc1m3f6VOUPlQtSBtUR6Pcg=";
+    hash = "sha256-7Q+BYw7wnT7QdqrDjagaxupzD0iKTc26z4TfxNtugdA=";
   };
 
   patches = [
@@ -63,9 +62,9 @@ python.pkgs.buildPythonApplication rec {
       ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg";
       ffprobe = "${lib.getBin ffmpeg-headless}/bin/ffprobe";
     })
-    (replaceVars ./librespot.patch {
-      librespot = lib.getExe librespot;
-    })
+
+    # Look up librespot from PATH at runtime
+    ./librespot.patch
 
     # Disable interactive dependency resolution, which clashes with the immutable Python environment
     ./dont-install-deps.patch
@@ -95,6 +94,11 @@ python.pkgs.buildPythonApplication rec {
     "zeroconf"
   ];
 
+  pythonRemoveDeps = [
+    # no runtime dependency resolution
+    "uv"
+  ];
+
   dependencies =
     with python.pkgs;
     [
diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix
index b86f4de81aca..ef0d35c06fde 100644
--- a/pkgs/by-name/mu/music-assistant/providers.nix
+++ b/pkgs/by-name/mu/music-assistant/providers.nix
@@ -1,7 +1,7 @@
 # Do not edit manually, run ./update-providers.py
 
 {
-  version = "2.5.5";
+  version = "2.5.8";
   providers = {
     airplay = ps: [
     ];
@@ -131,9 +131,10 @@
     ];
     ytmusic =
       ps: with ps; [
+        bgutil-ytdlp-pot-provider
         duration-parser
         yt-dlp
         ytmusicapi
-      ]; # missing bgutil-ytdlp-pot-provider
+      ];
   };
 }
diff --git a/pkgs/by-name/mu/music-assistant/update-providers.py b/pkgs/by-name/mu/music-assistant/update-providers.py
index fb1825fdc233..981ca38cd40d 100755
--- a/pkgs/by-name/mu/music-assistant/update-providers.py
+++ b/pkgs/by-name/mu/music-assistant/update-providers.py
@@ -56,6 +56,15 @@ PACKAGE_MAP = {
 }
 
 
+EXTRA_DEPS = {
+    "ytmusic": [
+        # https://github.com/music-assistant/server/blob/2.5.8/music_assistant/providers/ytmusic/__init__.py#L120
+        "bgutil-ytdlp-pot-provider",
+        "yt-dlp",
+    ],
+}
+
+
 def run_sync(cmd: List[str]) -> None:
     print(f"$ {' '.join(cmd)}")
     process = run(cmd)
@@ -191,7 +200,8 @@ async def resolve_providers(manifests) -> Set:
     providers = set()
     for manifest in manifests:
         provider = Provider(manifest.domain)
-        for requirement in manifest.requirements:
+        requirements = manifest.requirements + EXTRA_DEPS.get(manifest.domain, [])
+        for requirement in requirements:
             # allow substituting requirement specifications that packaging cannot parse
             if requirement in PACKAGE_MAP:
                 requirement = PACKAGE_MAP[requirement]

From 6f6212464947b4da52b7bec24d2400d8cccf3681 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Fri, 15 Aug 2025 20:16:07 +0200
Subject: [PATCH 2291/3724] linux/common-config: NET_SCH_BPF needs eBPF

https://github.com/torvalds/linux/blob/ee94b00c1a648530333d9734200be7a45e6e00cd/net/sched/Kconfig#L408
---
 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 6bef8062363a..6570019838d9 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -322,7 +322,7 @@ let
       NET_CLS_BPF = module;
       NET_ACT_BPF = module;
       NET_SCHED = yes;
-      NET_SCH_BPF = whenAtLeast "6.16" yes;
+      NET_SCH_BPF = whenAtLeast "6.16" (whenPlatformHasEBPFJit yes);
       L2TP_V3 = yes;
       L2TP_IP = module;
       L2TP_ETH = module;

From 835558c6c587bb43b586737691ef046fec3fe34c Mon Sep 17 00:00:00 2001
From: oosquare <oosquare@outlook.com>
Date: Thu, 21 Aug 2025 08:07:03 +0800
Subject: [PATCH 2292/3724] maintainers: drop oosquare

---
 maintainers/maintainer-list.nix              | 6 ------
 pkgs/by-name/bi/biliup-rs/package.nix        | 2 +-
 pkgs/by-name/fc/fcitx5-fluent/package.nix    | 2 +-
 pkgs/by-name/lx/lx-music-desktop/package.nix | 2 +-
 pkgs/by-name/ug/ugm/package.nix              | 2 +-
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 250a4438ae66..4bf7c4fcc0fa 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19091,12 +19091,6 @@
     name = "Oops418";
     githubId = 93655215;
   };
-  oosquare = {
-    name = "Justin Chen";
-    email = "oosquare@outlook.com";
-    github = "oosquare";
-    githubId = 42143810;
-  };
   opeik = {
     email = "sandro@stikic.com";
     github = "opeik";
diff --git a/pkgs/by-name/bi/biliup-rs/package.nix b/pkgs/by-name/bi/biliup-rs/package.nix
index f761c1d3f2d1..4e99a97e6aee 100644
--- a/pkgs/by-name/bi/biliup-rs/package.nix
+++ b/pkgs/by-name/bi/biliup-rs/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
     description = "CLI tool for uploading videos to Bilibili";
     homepage = "https://biliup.github.io/biliup-rs";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ oosquare ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "biliup";
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/fc/fcitx5-fluent/package.nix b/pkgs/by-name/fc/fcitx5-fluent/package.nix
index 10d3cd7f11ca..e5972050f1c6 100644
--- a/pkgs/by-name/fc/fcitx5-fluent/package.nix
+++ b/pkgs/by-name/fc/fcitx5-fluent/package.nix
@@ -33,6 +33,6 @@ stdenvNoCC.mkDerivation {
     homepage = "https://github.com/Reverier-Xu/Fluent-fcitx5";
     license = licenses.mpl20;
     platforms = platforms.all;
-    maintainers = with maintainers; [ oosquare ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix
index ae39cd70fe3d..9e006dc702bc 100644
--- a/pkgs/by-name/lx/lx-music-desktop/package.nix
+++ b/pkgs/by-name/lx/lx-music-desktop/package.nix
@@ -94,6 +94,6 @@ buildNpmPackage rec {
     platforms = electron.meta.platforms;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     mainProgram = "lx-music-desktop";
-    maintainers = with lib.maintainers; [ oosquare ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/ug/ugm/package.nix b/pkgs/by-name/ug/ugm/package.nix
index 21a25baca9fa..c624fc68494d 100644
--- a/pkgs/by-name/ug/ugm/package.nix
+++ b/pkgs/by-name/ug/ugm/package.nix
@@ -36,6 +36,6 @@ buildGoModule rec {
     license = licenses.mit;
     mainProgram = "ugm";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ oosquare ];
+    maintainers = with maintainers; [ ];
   };
 }

From fcd38ab8272dfa16f549514241997f6a33cb047a Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Wed, 20 Aug 2025 20:10:36 -0400
Subject: [PATCH 2293/3724] brave: 1.81.135 -> 1.81.136

https://community.brave.app/t/release-channel-1-81-136/641121
---
 pkgs/by-name/br/brave/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index c6567c2ceead..3901dbedea94 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.81.135";
+  version = "1.81.136";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-JXPvGcc6dLPaLGfHtyMa3JpOs4OF1V8GCGzoSJdSjRg=";
+      hash = "sha256-IU05OLT0IyRAiT10tEOayXpPi7iZBmDnp4n4AI+hVr0=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-M99LF0Pc74xsQmnH97ATCUxrAyFfiQ0Rw8KYIvkJoPc=";
+      hash = "sha256-z6nMg8twkUv1CtboxzuOYwyfgUkgEV7XAKoBE26VKY4=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-GpXGuxH2fuLNGXvMhTn7vu1b03YDAY+13lkcsW6zPe8=";
+      hash = "sha256-5a0YLUokVoiUB9jf/osDfHH11KKUJJSbAqIEjoBNiEs=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-WzwarZxP/Gte+mVpY+Altaezcy6fTrPVwCkLJx4KjQA=";
+      hash = "sha256-apW6RXQ15cbUoGHY6ZTQDb1zTXoifcvTECcOFuVLbho=";
     };
   };
 

From 92da943d8ad37ad183416f5ba8f874f279dc2570 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 20 Aug 2025 22:04:13 +0000
Subject: [PATCH 2294/3724] python313Packages.mne: 1.10.0 -> 1.10.1

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

diff --git a/pkgs/development/python-modules/mne/default.nix b/pkgs/development/python-modules/mne/default.nix
index 5ceb159e2e77..1e762305baf5 100644
--- a/pkgs/development/python-modules/mne/default.nix
+++ b/pkgs/development/python-modules/mne/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "mne";
-  version = "1.10.0";
+  version = "1.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "mne-tools";
     repo = "mne-python";
     tag = "v${version}";
-    hash = "sha256-j0kPtw00gV50Nuh/b4+Jq6P7pQVRgr4/xMTwRSyzJcU=";
+    hash = "sha256-xxkv+8RAkpRyMWznUMpwc6E72mb9DUPW6O5hFHiNz98=";
   };
 
   postPatch = ''
@@ -112,7 +112,7 @@ buildPythonPackage rec {
     description = "Magnetoencephelography and electroencephalography in Python";
     mainProgram = "mne";
     homepage = "https://mne.tools";
-    changelog = "https://mne.tools/stable/changes/${version}.html";
+    changelog = "https://mne.tools/stable/changes/v${lib.versions.majorMinor version}.html";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       bcdarwin

From 30d1f7b177a6dbfdf110d2837c1303a87cf36306 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 01:05:04 +0000
Subject: [PATCH 2295/3724] audiowaveform: 1.10.2 -> 1.10.3

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

diff --git a/pkgs/by-name/au/audiowaveform/package.nix b/pkgs/by-name/au/audiowaveform/package.nix
index d133507c374e..4416dd8dd556 100644
--- a/pkgs/by-name/au/audiowaveform/package.nix
+++ b/pkgs/by-name/au/audiowaveform/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "audiowaveform";
-  version = "1.10.2";
+  version = "1.10.3";
 
   src = fetchFromGitHub {
     owner = "bbc";
     repo = "audiowaveform";
     rev = version;
-    sha256 = "sha256-GrYShlLUD2vZYN6sJy4FnAMPiV36rOAxZUrK0mxJCRk=";
+    sha256 = "sha256-7pcYxl6m7mkoXGawA3gr8NTfkJlkgl+DtK79CA8dRec=";
   };
 
   cmakeFlags = [

From 51219a58ad3d7d63089da0aae1eab4e39961a35a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 01:10:20 +0000
Subject: [PATCH 2296/3724] geographiclib: 2.5 -> 2.5.1

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

diff --git a/pkgs/by-name/ge/geographiclib/package.nix b/pkgs/by-name/ge/geographiclib/package.nix
index 0946a02be91a..b178db335ad2 100644
--- a/pkgs/by-name/ge/geographiclib/package.nix
+++ b/pkgs/by-name/ge/geographiclib/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "geographiclib";
-  version = "2.5";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "geographiclib";
     repo = "geographiclib";
     tag = "v${version}";
-    hash = "sha256-hFheJ6Q1GEfqPVq7t4SHN/n2JniqCQUzwl7GEVG0jgo=";
+    hash = "sha256-ZXIRLLvCsVp8RnChjLiAfD38CJFqV8sv/PAEORsF6oc=";
   };
 
   outputs = [

From 25a2995ae1e4d81cdc4e8cbb46fc91a3ab319608 Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Thu, 21 Aug 2025 01:40:53 +0000
Subject: [PATCH 2297/3724] ente-auth: 4.4.3 -> 4.4.4

Changelog: https://github.com/ente-io/ente/releases/tag/auth-v4.4.4
---
 pkgs/by-name/en/ente-auth/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index 8e42f2df491e..d76b94b09ac6 100644
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@@ -18,14 +18,14 @@ let
 in
 flutter324.buildFlutterApplication rec {
   pname = "ente-auth";
-  version = "4.4.3";
+  version = "4.4.4";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "mobile/apps/auth" ];
     tag = "auth-v${version}";
-    hash = "sha256-6LTGmSCMlLynYtYCsJiALsRMm9vLUD9HaGnfHu0r6Rw=";
+    hash = "sha256-VpxF6BMofCgMWcxsscbYC3uYse0QZyTBf84zN03leC4=";
   };
 
   sourceRoot = "${src.name}/mobile/apps/auth";

From f85a4867bb1c334efc373ed3bfcbe4eaa9e1e3d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 02:07:56 +0000
Subject: [PATCH 2298/3724] hddfancontrol: 2.0.4 -> 2.0.5

---
 pkgs/by-name/hd/hddfancontrol/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hd/hddfancontrol/package.nix b/pkgs/by-name/hd/hddfancontrol/package.nix
index 5729b418a48c..0ea029465a22 100644
--- a/pkgs/by-name/hd/hddfancontrol/package.nix
+++ b/pkgs/by-name/hd/hddfancontrol/package.nix
@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hddfancontrol";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "hddfancontrol";
     tag = finalAttrs.version;
-    hash = "sha256-RnqKqXyR3XN/UL70vG/+NtkxxbwvAoIQaFipUtRQOlE=";
+    hash = "sha256-kKzjg2D/7Thzu6JzmLyu2eJAr+N6Bi95WEBKrqB/vXo=";
   };
 
-  cargoHash = "sha256-2jwfdUBpzamsbvkpP+Fn5dz8jj9+Wnp2JpoAT6tHUac=";
+  cargoHash = "sha256-0TRNiRmxwV/p7nLOrU9GHjTzIaan4JV8C6e443nd2zY=";
 
   nativeBuildInputs = [
     makeWrapper

From 6d6f9afb7b8bbabfee0ecd56d0b711bf9b6f16a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 02:16:20 +0000
Subject: [PATCH 2299/3724] darklua: 0.17.0 -> 0.17.1

---
 pkgs/by-name/da/darklua/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/da/darklua/package.nix b/pkgs/by-name/da/darklua/package.nix
index dc0f661facd2..a8e9c9ccbcd2 100644
--- a/pkgs/by-name/da/darklua/package.nix
+++ b/pkgs/by-name/da/darklua/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "darklua";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "seaofvoices";
     repo = "darklua";
     rev = "v${version}";
-    hash = "sha256-Ql3BHItFvfc2C3+/M7gxFJwValxNaBVVftm6+T5N4S8=";
+    hash = "sha256-Jcq6zZ0KaDHXkIapPd38BR+ikVQAha3Bq5HuPEnKV0o=";
   };
 
-  cargoHash = "sha256-eJObrfhZMfgWUAqeTgOSic4u5fG5Eopqmvojiq+b54o=";
+  cargoHash = "sha256-yF+h7IiirvLw3WqqyCmcXbRa+fnsOpHrrmxkwl4lIG4=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
   postPatch = ''

From 815c4526370b9523037a5ccc911b3f152a439c18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 02:19:21 +0000
Subject: [PATCH 2300/3724] protolint: 0.55.6 -> 0.56.1

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

diff --git a/pkgs/by-name/pr/protolint/package.nix b/pkgs/by-name/pr/protolint/package.nix
index cc2eb70c91cb..85c9ec9fe51f 100644
--- a/pkgs/by-name/pr/protolint/package.nix
+++ b/pkgs/by-name/pr/protolint/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "protolint";
-  version = "0.55.6";
+  version = "0.56.1";
 
   src = fetchFromGitHub {
     owner = "yoheimuta";
     repo = "protolint";
     rev = "v${version}";
-    hash = "sha256-RTej9zVQz6GESAoAAChidiolGEoHabUYlEZSV2gc8KQ=";
+    hash = "sha256-fz7hypg07okEg0Z4XiA5NGh6I8oLFO4coJscTvxLWFw=";
   };
 
   vendorHash = "sha256-RS0t7n6pLYVKHluQtXsMjYL1SvN7IZFdKmkxOI8wFoE=";

From 80b46ac9efdf81c82c19a8f822ee58b166b256ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 02:30:07 +0000
Subject: [PATCH 2301/3724] src-cli: 6.6.0 -> 6.7.0

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

diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix
index 6dbf68b07e89..7d0215c57b3a 100644
--- a/pkgs/by-name/sr/src-cli/package.nix
+++ b/pkgs/by-name/sr/src-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "src-cli";
-  version = "6.6.0";
+  version = "6.7.0";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "src-cli";
     rev = version;
-    hash = "sha256-9jqlbqZ62wds+VOt5OT9XYu/v6ETaYGCqY7qJu3UsWg=";
+    hash = "sha256-uWbzHb0UIDly1r0f+AYNLCsduie7b0T6P1ZiUdrUBho=";
   };
 
   vendorHash = "sha256-bpfDnVqJoJi9WhlA6TDWAhBRkbbQn1BHfnLJ8BTmhGM=";

From 0156208e0db51f61567cc44d1cbc5fb07e1dc74c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 02:30:26 +0000
Subject: [PATCH 2302/3724] step-kms-plugin: 0.14.2 -> 0.15.1

---
 pkgs/by-name/st/step-kms-plugin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix
index 297f488a677e..8683bafe7c72 100644
--- a/pkgs/by-name/st/step-kms-plugin/package.nix
+++ b/pkgs/by-name/st/step-kms-plugin/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "step-kms-plugin";
-  version = "0.14.2";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "smallstep";
     repo = "step-kms-plugin";
     rev = "v${version}";
-    hash = "sha256-0RIAwZbk6DNlJHTmxUd/td94OlrjwcQ86ao7wt7PSdg=";
+    hash = "sha256-Evi5rXdb/2WDlIUXJcQjQ0d1Zrfg1x00tFonlNmLi6E=";
   };
 
-  vendorHash = "sha256-YvK3icanE8FoTeACfReVXmV143lcRTyXv8L6+hoFIaM=";
+  vendorHash = "sha256-CxX4tQRBPtza1PAVeidp+KNeYxIh5y1tJ+RgcBKdORs=";
 
   proxyVendor = true;
 

From e277d5d34ada1910270401af34a2aa66d4b3121c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 03:10:12 +0000
Subject: [PATCH 2303/3724] wasmi: 0.47.0 -> 0.51.0

---
 pkgs/by-name/wa/wasmi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/wasmi/package.nix b/pkgs/by-name/wa/wasmi/package.nix
index caf1e395c6e5..c02d3a5269cf 100644
--- a/pkgs/by-name/wa/wasmi/package.nix
+++ b/pkgs/by-name/wa/wasmi/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasmi";
-  version = "0.47.0";
+  version = "0.51.0";
 
   src = fetchFromGitHub {
     owner = "paritytech";
     repo = "wasmi";
     tag = "v${version}";
-    hash = "sha256-N2zEc+++286FBJl6cGh8ibOvHHwMnh4PcOLaRhB/rC0=";
+    hash = "sha256-mPArNkPrTW3RikLlQNkAjIUEfRot2nRaqceNopGmZDo=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-asl8saHlZ5A05QFs2pSs6jMM6AI29c4DTPu4zw+FMug=";
+  cargoHash = "sha256-7L2XQ4E+1wyNMu2IEgqvKuY84k7kQ07m/dXbyDYN/VU=";
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {

From 91a1621c0390edcf20fc48a5752c00980ad19bca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 03:19:25 +0000
Subject: [PATCH 2304/3724] pinact: 3.3.2 -> 3.4.2

---
 pkgs/by-name/pi/pinact/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix
index b65beae0d745..c6dda5fc0f3a 100644
--- a/pkgs/by-name/pi/pinact/package.nix
+++ b/pkgs/by-name/pi/pinact/package.nix
@@ -13,16 +13,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "pinact";
-  version = "3.3.2";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner = "suzuki-shunsuke";
     repo = "pinact";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-epDtKwebVFCDZFwpOd2GWuY27EkD/xtkNE79XqTI9S0=";
+    hash = "sha256-O+yLhvkF84uCrgb5MPvk8i/YJ4tLR7YQvBAYbpnxwEM=";
   };
 
-  vendorHash = "sha256-31XM13BwaIHfxS3mM3zRroAIku9wEM+ogR9qhG/OanY=";
+  vendorHash = "sha256-A9bMAGaNvCKfSozBwhrJLgQUrCLN78Og3eCmezsJ6c8=";
 
   env.CGO_ENABLED = 0;
 

From dd9fa15dbf873030f182699c2a34f6d27729fab1 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 21 Aug 2025 05:24:42 +0200
Subject: [PATCH 2305/3724] licenses.bsd3ClauseTso: rename and add spdxId

it got accepted and merged to spdx: https://github.com/spdx/license-list-XML/pull/2815
---
 lib/licenses.nix                      | 12 +++---------
 pkgs/by-name/xo/xorg-docs/package.nix |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 7204e5e539c6..67a2b4c2f040 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -232,15 +232,9 @@ lib.mapAttrs mkLicense (
       fullName = "Lawrence Berkeley National Labs BSD variant license";
     };
 
-    bsd3TheodoreTso = {
-      fullName = "BSD 3 Clause Theodore Tso Variant";
-      # TODO: if the license gets accepted to spdx then
-      #   add spdxId
-      # else
-      #   remove license
-      #   && replace all references with bsd3
-      # https://tools.spdx.org/app/license_requests/442/
-      # https://github.com/spdx/license-list-XML/issues/2702
+    bsd3ClauseTso = {
+      spdxId = "BSD-3-Clause-Tso";
+      fullName = "BSD 3-Clause Tso variant";
     };
 
     bsdAxisNoDisclaimerUnmodified = {
diff --git a/pkgs/by-name/xo/xorg-docs/package.nix b/pkgs/by-name/xo/xorg-docs/package.nix
index 8858cb6857cf..2d81c08103a5 100644
--- a/pkgs/by-name/xo/xorg-docs/package.nix
+++ b/pkgs/by-name/xo/xorg-docs/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
       hpnd
       bsd3
       bsdOriginalUC
-      bsd3TheodoreTso
+      bsd3ClauseTso
       bsd2
       isc
       sgi-b-20

From 444ab892b0b046c26c9edbc442ea5ffdd9e42cb6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 03:35:03 +0000
Subject: [PATCH 2306/3724] openfga-cli: 0.7.3 -> 0.7.4

---
 pkgs/by-name/op/openfga-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix
index 0f40b131de0a..7b6531e71de5 100644
--- a/pkgs/by-name/op/openfga-cli/package.nix
+++ b/pkgs/by-name/op/openfga-cli/package.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "openfga-cli";
-  version = "0.7.3";
+  version = "0.7.4";
 in
 
 buildGoModule {
@@ -17,10 +17,10 @@ buildGoModule {
     owner = "openfga";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-FaEjlZy/Kb9Mchv/6A318GAorxKGDHMy6hM5VWoXoCE=";
+    hash = "sha256-kskPQyMzFgCOIaHmN/iZbRDPR6wbYp8kBcf+51cniSk=";
   };
 
-  vendorHash = "sha256-bDEq0Xp/PMs7zLEfmZ62a1e050PmK2bCbwMrZXMEFwY=";
+  vendorHash = "sha256-e/w1KGVzrZPp8KTP0paCRcE9OYkZMmEmmIZmKmPtx5s=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From d01982a0c7df9cfbce578177565d15f4e250594c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 03:40:28 +0000
Subject: [PATCH 2307/3724] netbird-signal: 0.54.0 -> 0.55.1

---
 pkgs/by-name/ne/netbird/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 30978285cb91..5a2c90693b41 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -68,16 +68,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.54.0";
+  version = "0.55.1";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qKYJa7q7scEbbxLHaosaurrjXR5ABxCAnuUcy80yKEc=";
+    hash = "sha256-Bi5vHxKdl9eWWdTB7td+rHuvjt6Ic4kjytWzHJTpCtQ=";
   };
 
-  vendorHash = "sha256-uVVm+iDGP2eZ5GVXWJrWZQ7LpHdZccRIiHPIFs6oAPo=";
+  vendorHash = "sha256-C9qw6VDh+q1UD+Bc+cFAUjIzIXpQAy46cPdyfXwgBSA=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config;
 

From ef893a4249d660ef360a19ab38ec41fbc7bb8d26 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 03:45:26 +0000
Subject: [PATCH 2308/3724] fly: 7.14.0 -> 7.14.1

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

diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix
index fe22077812fa..087f3bc7e927 100644
--- a/pkgs/by-name/fl/fly/package.nix
+++ b/pkgs/by-name/fl/fly/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "fly";
-  version = "7.14.0";
+  version = "7.14.1";
 
   src = fetchFromGitHub {
     owner = "concourse";
     repo = "concourse";
     rev = "v${version}";
-    hash = "sha256-7CXxaqfwFfxq6v0IKxkK08WkICBTLGf7ME1WuZzrG8w=";
+    hash = "sha256-Q+j41QhhibyE+a7iOgMKm2SeXhNV8ek97P014Wje9NQ=";
   };
 
   vendorHash = "sha256-2busKAFaQYE82XKCAx8BGOMjjs8WzqIxdpz+J45maoc=";

From 475fa5d426ed41b5a9d34524b7ce9d4ab81ccbb3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 04:33:07 +0000
Subject: [PATCH 2309/3724] vscode-extensions.detachhead.basedpyright: 1.31.1
 -> 1.31.3

---
 .../vscode/extensions/detachhead.basedpyright/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
index 3d8d50e05638..27c1a68690c0 100644
--- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "basedpyright";
     publisher = "detachhead";
-    version = "1.31.1";
-    hash = "sha256-MlkLoM1415KYCKlwfV67HLLvmF7PRtdyQrPgeNm2nyM=";
+    version = "1.31.3";
+    hash = "sha256-xQ2XvGdQPmls+bkCtfmFYvbr1d4Q1Nhc8mQQyuWPZoQ=";
   };
   meta = {
     changelog = "https://github.com/detachhead/basedpyright/releases";

From 15953e4f2ebfa161b1a99d4d92e5408661cac71d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 04:47:04 +0000
Subject: [PATCH 2310/3724] bash-pinyin-completion-rs: 0.2.3 -> 0.3.0

---
 pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
index a664f9ead1ae..1b31c6d7d0e3 100644
--- a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
+++ b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bash-pinyin-completion-rs";
-  version = "0.2.3";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "AOSC-Dev";
     repo = "bash-pinyin-completion-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h4l4plGMn5WMhU60+m60Uf45UfPNDb0X+E2LK3U3jxw=";
+    hash = "sha256-tcgpPFB/BHVbGFYHfs8y0yOVK/KJmjNJ95I41TX+pu4=";
   };
 
   strictDeps = true;
 
-  cargoHash = "sha256-SAegFsmn91xrWg0o7lHgk+vRqTQhabev9dP+Lbk/h5s=";
+  cargoHash = "sha256-DmFsRoguommcBbeJrCcTRm815c7gLnUQ+7n0/Iz6Gvk=";
 
   postInstall = ''
     substituteInPlace scripts/bash_pinyin_completion \

From 11bbbda5cd3f80c50475acc827456d188578de0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 04:59:17 +0000
Subject: [PATCH 2311/3724] gallery-dl: 1.30.3 -> 1.30.4

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

diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix
index edb0df4b388c..94f75a7d304d 100644
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "gallery-dl";
-  version = "1.30.3";
+  version = "1.30.4";
 in
 python3Packages.buildPythonApplication {
   inherit pname version;
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
     owner = "mikf";
     repo = "gallery-dl";
     tag = "v${version}";
-    hash = "sha256-zkyPn18ER6Xlyo4ITC8TDk9vVHubbyfJHKxQF4JodHY=";
+    hash = "sha256-fDLtB3l682+APcOkvQCPAfxCqWhjEi2E7sEU617fzyg=";
   };
 
   build-system = [ python3Packages.setuptools ];

From ff09468d9d7540261ed8a140f1f42771cff1c5c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 05:18:19 +0000
Subject: [PATCH 2312/3724] terraform-providers.oci: 7.13.0 -> 7.14.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a2d9ff5f716b..f3ce511caeba 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -931,11 +931,11 @@
     "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
   },
   "oci": {
-    "hash": "sha256-Fh3GSSO+MBumdx5BxmINKhci8x0zHZ1jzMcGLyT0DIQ=",
+    "hash": "sha256-LoaFc5Ro7l2DOzWIUtcx+ycKwoRORkbBJtF8fu6kMBA=",
     "homepage": "https://registry.terraform.io/providers/oracle/oci",
     "owner": "oracle",
     "repo": "terraform-provider-oci",
-    "rev": "v7.13.0",
+    "rev": "v7.14.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From e782c634ac1e80d8fd2ef6fcda7834825055cbc8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 05:27:28 +0000
Subject: [PATCH 2313/3724] icestudio: 0.12-unstable-2025-08-03 ->
 0.12-unstable-2025-08-19

---
 pkgs/by-name/ic/icestudio/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ic/icestudio/package.nix b/pkgs/by-name/ic/icestudio/package.nix
index 2049a7e7c996..190dce1b53d7 100644
--- a/pkgs/by-name/ic/icestudio/package.nix
+++ b/pkgs/by-name/ic/icestudio/package.nix
@@ -13,13 +13,13 @@
 
 let
   # Use unstable because it has improvements for finding python
-  version = "0.12-unstable-2025-08-03";
+  version = "0.12-unstable-2025-08-19";
 
   src = fetchFromGitHub {
     owner = "FPGAwars";
     repo = "icestudio";
-    rev = "4497a9aa0ae02950c4396a8d7083b07d46271855";
-    hash = "sha256-QV/ulq/SIN6Ph7BXq0XGSivCg+Ej0VaPafZgEhOhtnI=";
+    rev = "8bc0391117bd3639881ed947e49e4cd37c199a95";
+    hash = "sha256-GWG6FvBiowgiW7MWKxCOivmDbb5YveZR6Nn3foLifwY=";
   };
 
   collection = fetchurl {

From d416416015943eb0b191fbe37b3e7e4046f5cc60 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 4 Aug 2025 13:58:23 +0800
Subject: [PATCH 2314/3724] sing-box: 1.11.15 -> 1.12.3

---
 pkgs/by-name/si/sing-box/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index 6f558689e0d5..465ec13501a4 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -10,27 +10,26 @@
 
 buildGoModule (finalAttrs: {
   pname = "sing-box";
-  version = "1.11.15";
+  version = "1.12.3";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = "sing-box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uqPV3PGk3hFpV1B8+htBG9x58RVWew0sBDUItpxyv8Q=";
+    hash = "sha256-OHhCC+tSDZRSDN9i3L6NtwgarBKHv+KGNyPhHttqo4g=";
   };
 
-  vendorHash = "sha256-qZlnY0MxB4/ttgjuAroTfqGWqGRea549EyIjSxPAlOI=";
+  vendorHash = "sha256-Y/UP2rbee4WSctelk9QddMXciucz5dNLOLDDWtEFfLU=";
 
   tags = [
     "with_quic"
     "with_dhcp"
     "with_wireguard"
-    "with_ech"
     "with_utls"
-    "with_reality_server"
     "with_acme"
     "with_clash_api"
     "with_gvisor"
+    "with_tailscale"
   ];
 
   subPackages = [
@@ -50,6 +49,9 @@ buildGoModule (finalAttrs: {
       --replace-fail "/usr/bin/sing-box" "$out/bin/sing-box" \
       --replace-fail "/bin/kill" "${coreutils}/bin/kill"
     install -Dm444 -t "$out/lib/systemd/system/" release/config/sing-box{,@}.service
+
+    install -Dm444 release/config/sing-box.rules $out/share/polkit-1/rules.d/sing-box.rules
+    install -Dm444 release/config/sing-box-split-dns.xml $out/share/dbus-1/system.d/sing-box-split-dns.conf
   '';
 
   passthru = {

From 40ba3d54ddad824865135b5e269fd1485d5459e1 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 4 Aug 2025 14:15:09 +0800
Subject: [PATCH 2315/3724] nixos/sing-box: add prince213 to maintainers

---
 nixos/modules/services/networking/sing-box.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/sing-box.nix b/nixos/modules/services/networking/sing-box.nix
index 104c75c8105c..3daffb4ca4ca 100644
--- a/nixos/modules/services/networking/sing-box.nix
+++ b/nixos/modules/services/networking/sing-box.nix
@@ -12,7 +12,10 @@ in
 {
 
   meta = {
-    maintainers = with lib.maintainers; [ nickcao ];
+    maintainers = with lib.maintainers; [
+      nickcao
+      prince213
+    ];
   };
 
   options = {

From b69da1bd4f60ffaf3a054626c3e6f5f0c3916731 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 4 Aug 2025 14:15:09 +0800
Subject: [PATCH 2316/3724] nixos/sing-box: add user and group

---
 .../modules/services/networking/sing-box.nix  | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/sing-box.nix b/nixos/modules/services/networking/sing-box.nix
index 3daffb4ca4ca..5910dadd5878 100644
--- a/nixos/modules/services/networking/sing-box.nix
+++ b/nixos/modules/services/networking/sing-box.nix
@@ -62,15 +62,27 @@ in
         }
       ];
 
+    # for polkit rules
+    environment.systemPackages = [ cfg.package ];
+    services.dbus.packages = [ cfg.package ];
     systemd.packages = [ cfg.package ];
 
     systemd.services.sing-box = {
-      preStart = utils.genJqSecretsReplacementSnippet cfg.settings "/run/sing-box/config.json";
       serviceConfig = {
+        User = "sing-box";
+        Group = "sing-box";
         StateDirectory = "sing-box";
         StateDirectoryMode = "0700";
         RuntimeDirectory = "sing-box";
         RuntimeDirectoryMode = "0700";
+        ExecStartPre =
+          let
+            script = pkgs.writeShellScript "sing-box-pre-start" ''
+              ${utils.genJqSecretsReplacementSnippet cfg.settings "/run/sing-box/config.json"}
+              chown --reference=/run/sing-box /run/sing-box/config.json
+            '';
+          in
+          "+${script}";
         ExecStart = [
           ""
           "${lib.getExe cfg.package} -D \${STATE_DIRECTORY} -C \${RUNTIME_DIRECTORY} run"
@@ -78,6 +90,13 @@ in
       };
       wantedBy = [ "multi-user.target" ];
     };
-  };
 
+    users = {
+      users.sing-box = {
+        isSystemUser = true;
+        group = "sing-box";
+      };
+      groups.sing-box = { };
+    };
+  };
 }

From cfea340786d003721290b680d8b6ac1d6bf8cb8c Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 4 Aug 2025 14:24:41 +0800
Subject: [PATCH 2317/3724] nixosTests.sing-box: add prince213 to maintainers

---
 nixos/tests/sing-box.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix
index 8e48031d1224..33720d08f673 100644
--- a/nixos/tests/sing-box.nix
+++ b/nixos/tests/sing-box.nix
@@ -111,7 +111,10 @@ in
   name = "sing-box";
 
   meta = {
-    maintainers = with lib.maintainers; [ nickcao ];
+    maintainers = with lib.maintainers; [
+      nickcao
+      prince213
+    ];
   };
 
   nodes = {

From 664e9fc074f89566725af1cc137e9d01f74d56b1 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 4 Aug 2025 14:35:19 +0800
Subject: [PATCH 2318/3724] nixosTests.sing-box: migrate config

---
 nixos/tests/sing-box.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix
index 33720d08f673..26ac949f270d 100644
--- a/nixos/tests/sing-box.nix
+++ b/nixos/tests/sing-box.nix
@@ -439,26 +439,19 @@ in
             dns = {
               final = "dns:default";
               independent_cache = true;
-              fakeip = {
-                enabled = true;
-                inet4_range = "198.18.0.0/16";
-              };
               servers = [
                 {
-                  detour = "outbound:direct";
+                  type = "udp";
                   tag = "dns:default";
-                  address = hosts."${target_host}";
+                  server = hosts."${target_host}";
                 }
                 {
+                  type = "fakeip";
                   tag = "dns:fakeip";
-                  address = "fakeip";
+                  inet4_range = "198.18.0.0/16";
                 }
               ];
               rules = [
-                {
-                  outbound = [ "any" ];
-                  server = "dns:default";
-                }
                 {
                   query_type = [
                     "A"
@@ -482,6 +475,7 @@ in
               }
             ];
             route = {
+              default_domain_resolver = "dns:default";
               default_interface = "eth1";
               final = "outbound:direct";
               rules = [

From 9cc0e0ee20b899e47d3b2628619df62fe7d4f753 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 14 Aug 2025 10:25:41 +0800
Subject: [PATCH 2319/3724] nixosTests.sing-box: add resolved

---
 nixos/tests/sing-box.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix
index 26ac949f270d..0825684e0bed 100644
--- a/nixos/tests/sing-box.nix
+++ b/nixos/tests/sing-box.nix
@@ -450,6 +450,12 @@ in
                   tag = "dns:fakeip";
                   inet4_range = "198.18.0.0/16";
                 }
+                {
+                  type = "resolved";
+                  tag = "dns:resolved";
+                  service = "service:resolved";
+                  accept_default_resolvers = true;
+                }
               ];
               rules = [
                 {
@@ -488,6 +494,12 @@ in
                 }
               ];
             };
+            services = [
+              {
+                type = "resolved";
+                tag = "service:resolved";
+              }
+            ];
           };
         };
       };

From 5bcb1aca6fbbbc18874f3f0291e06d57310e4889 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 4 Aug 2025 14:47:57 +0800
Subject: [PATCH 2320/3724] nixos/doc/manual/release-notes/rl-2511: add
 sing-box

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

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index e89953885137..8a1d6d65a661 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -103,6 +103,9 @@
 - The non-LTS Forgejo package (`forgejo`) has been updated to 12.0.0. This release contains breaking changes, see the [release blog post](https://forgejo.org/2025-07-release-v12-0/)
   for all the details and how to ensure smooth upgrades.
 
+- `sing-box` has been updated to 1.12.3, which includes a number of breaking changes, old configurations may need updating or they will cause the tool to fail to run.
+  See the [change log](https://sing-box.sagernet.org/changelog/#1123) for details and [migration](https://sing-box.sagernet.org/migration/#1120) for how to update old configurations.
+
 - The Pocket ID module ([`services.pocket-id`][#opt-services.pocket-id.enable]) and package (`pocket-id`) has been updated to 1.0.0. Some environment variables have been changed or removed, see the [migration guide](https://pocket-id.org/docs/setup/migrate-to-v1/).
 
 - The `zigbee2mqtt` package was updated to version 2.x, which contains breaking changes. See the [discussion](https://github.com/Koenkk/zigbee2mqtt/discussions/24198) for further information.

From d8de93738508080514565b09f698911f1e51cc96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 05:44:34 +0000
Subject: [PATCH 2321/3724] python3Packages.polyswarm-api: 3.13.2 -> 3.14.0

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

diff --git a/pkgs/development/python-modules/polyswarm-api/default.nix b/pkgs/development/python-modules/polyswarm-api/default.nix
index 176492757262..59a10938b29e 100644
--- a/pkgs/development/python-modules/polyswarm-api/default.nix
+++ b/pkgs/development/python-modules/polyswarm-api/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "polyswarm-api";
-  version = "3.13.2";
+  version = "3.14.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "polyswarm";
     repo = "polyswarm-api";
     tag = version;
-    hash = "sha256-yDnE32/6dzFCops5xQAvvg45R0coR0H/LdWIM0f+wME=";
+    hash = "sha256-hf3TKUYkCgKqJYAQLMamcwDBl4uJG/8Gtv/DNHePcZI=";
   };
 
   build-system = [ setuptools ];

From abe5f5f439308119555d64207fd03c290c34330d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 06:06:36 +0000
Subject: [PATCH 2322/3724] libretro.mame2003-plus: 0-unstable-2025-06-28 ->
 0-unstable-2025-08-20

---
 .../applications/emulators/libretro/cores/mame2003-plus.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
index bd72f0532a6d..aa9713c232e9 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mame2003-plus";
-  version = "0-unstable-2025-06-28";
+  version = "0-unstable-2025-08-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2003-plus-libretro";
-    rev = "04fb75e4f1291a490574168f3a04f9455e4a008d";
-    hash = "sha256-dMfLK47DojJwSvd7KMW0D0azgQalRW8mBJqYJHTA6ew=";
+    rev = "3f778c3a06172f01a9ac6c08812f46bd0173187a";
+    hash = "sha256-drSulDZxs6xei/XksMviVvqWjihBTdZTkrIsO2v+7wM=";
   };
 
   makefile = "Makefile";

From e6e9e48440136a7417c65f70fc61dbf887d77af1 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 08:25:58 +0200
Subject: [PATCH 2323/3724] gpio-utils: move to by-name

---
 .../kernel/gpio-utils.nix => by-name/gp/gpio-utils/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{os-specific/linux/kernel/gpio-utils.nix => by-name/gp/gpio-utils/package.nix} (100%)

diff --git a/pkgs/os-specific/linux/kernel/gpio-utils.nix b/pkgs/by-name/gp/gpio-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/kernel/gpio-utils.nix
rename to pkgs/by-name/gp/gpio-utils/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e6ce9df3229..48464b8d7a57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16020,8 +16020,6 @@ with pkgs;
 
   sieveshell = with python3.pkgs; toPythonApplication managesieve;
 
-  gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { };
-
   inherit (callPackage ../applications/misc/zettlr { }) zettlr;
 
   swift-corelibs-libdispatch = swiftPackages.Dispatch;

From 0e91f6b37b17add7c21b4a8630dcc09bfec93778 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 06:29:41 +0000
Subject: [PATCH 2324/3724] aaaaxy: 1.6.271 -> 1.6.283

---
 pkgs/by-name/aa/aaaaxy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix
index 331a6f1c98d6..524f79281fb7 100644
--- a/pkgs/by-name/aa/aaaaxy/package.nix
+++ b/pkgs/by-name/aa/aaaaxy/package.nix
@@ -22,17 +22,17 @@
 
 buildGoModule rec {
   pname = "aaaaxy";
-  version = "1.6.271";
+  version = "1.6.283";
 
   src = fetchFromGitHub {
     owner = "divVerent";
     repo = "aaaaxy";
     tag = "v${version}";
-    hash = "sha256-/nSJ1FT9FE856yrupbouRzqpRzZhKfYAq1fVBBvMVmY=";
+    hash = "sha256-OBF5oPWoctosL1uR6/I/uNM3F39d14dmz8TKOxp5FIs=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-DJvlyfCynz+M5BQ4XDYcdzb3QP5ycDPcF4B+fQ4FRRA=";
+  vendorHash = "sha256-g37+5IquBaRMGw48V/pCsJaeKlGR5a2Hj3NFcrolQ7g=";
 
   buildInputs = [
     alsa-lib

From 859f3347e3b16f4efd78336159b86854e356e3fc Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 08:32:07 +0200
Subject: [PATCH 2325/3724] zettlr: move to by-name

---
 pkgs/applications/misc/zettlr/default.nix                 | 8 --------
 .../zettlr/generic.nix => by-name/ze/zettlr/package.nix}  | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 2 --
 3 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 pkgs/applications/misc/zettlr/default.nix
 rename pkgs/{applications/misc/zettlr/generic.nix => by-name/ze/zettlr/package.nix} (92%)

diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix
deleted file mode 100644
index 1fdbe190ce82..000000000000
--- a/pkgs/applications/misc/zettlr/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage }:
-
-builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
-  zettlr = {
-    version = "3.4.4";
-    hash = "sha256-ApgmHl9WoAmWl03tqv01D0W8orja25f7KZUFLhlZloQ=";
-  };
-}
diff --git a/pkgs/applications/misc/zettlr/generic.nix b/pkgs/by-name/ze/zettlr/package.nix
similarity index 92%
rename from pkgs/applications/misc/zettlr/generic.nix
rename to pkgs/by-name/ze/zettlr/package.nix
index 76c4cf9c7463..fe3905ec75b3 100644
--- a/pkgs/applications/misc/zettlr/generic.nix
+++ b/pkgs/by-name/ze/zettlr/package.nix
@@ -1,7 +1,4 @@
 {
-  pname,
-  version,
-  hash,
   appimageTools,
   lib,
   fetchurl,
@@ -10,9 +7,12 @@
 
 # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
 let
+  pname = "zettlr";
+  version = "3.4.4";
+
   src = fetchurl {
     url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
-    inherit hash;
+    hash = "sha256-ApgmHl9WoAmWl03tqv01D0W8orja25f7KZUFLhlZloQ=";
   };
   appimageContents = appimageTools.extractType2 {
     inherit pname version src;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48464b8d7a57..0fcc3dcd6c43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16020,8 +16020,6 @@ with pkgs;
 
   sieveshell = with python3.pkgs; toPythonApplication managesieve;
 
-  inherit (callPackage ../applications/misc/zettlr { }) zettlr;
-
   swift-corelibs-libdispatch = swiftPackages.Dispatch;
 
   aitrack = libsForQt5.callPackage ../applications/misc/aitrack { };

From 425047ea15d1b231f03615f4dd7115262a713e77 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 21 Aug 2025 08:32:24 +0200
Subject: [PATCH 2326/3724] claude-code: 1.0.85 -> 1.0.86

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

- Routine package update
- No specific changelog entries available for 1.0.86
---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 6baa91162a87..08c2e439a644 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -6,13 +6,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.85"
+        "@anthropic-ai/claude-code": "^1.0.86"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.85",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.85.tgz",
-      "integrity": "sha512-rvLGGSnHQLJI3dP7C/d3Or5LQvgDEae5wurMG4Fs9ourzt+k8YA6WAHeuJmSUq7o7Z2fZTaojcM3VOLzUBEl7w==",
+      "version": "1.0.86",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.86.tgz",
+      "integrity": "sha512-js1h6JUnFJ1dHvFPBiCxwFChaWjh28XOFamrwebmhOIUBVhQZwMfDJYsNfRyv0qEwpxKxYedvK4nv4WqMCwu9Q==",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 14eba606feab..e36d28b5f9a9 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.85";
+  version = "1.0.86";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-CLqvcolG94JBC5VFlsfybZ9OXe81gJBzKU6Xgr7CGWo=";
+    hash = "sha256-mVXS75KgeKgD7EI5t9X6+TkwjBFyBLOo4/m50sS9XdA=";
   };
 
-  npmDepsHash = "sha256-V0rjoKdXGRNNKRJqPvVIqCQpqgNCklPTVRExCCxbe8g=";
+  npmDepsHash = "sha256-BXpySywlTI19xMaRbJkqBpzbfr8lzAYdpn4dSonmWWg=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From fc65db9a30de55a6d8defbde6e8d681900f41496 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 08:34:41 +0200
Subject: [PATCH 2327/3724] tubekit: move to by-name

---
 .../default.nix => by-name/tu/tubekit-unwrapped/package.nix}  | 0
 .../tubekit/wrapper.nix => by-name/tu/tubekit/package.nix}    | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 3 files changed, 4 deletions(-)
 rename pkgs/{applications/networking/cluster/tubekit/default.nix => by-name/tu/tubekit-unwrapped/package.nix} (100%)
 rename pkgs/{applications/networking/cluster/tubekit/wrapper.nix => by-name/tu/tubekit/package.nix} (100%)

diff --git a/pkgs/applications/networking/cluster/tubekit/default.nix b/pkgs/by-name/tu/tubekit-unwrapped/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tubekit/default.nix
rename to pkgs/by-name/tu/tubekit-unwrapped/package.nix
diff --git a/pkgs/applications/networking/cluster/tubekit/wrapper.nix b/pkgs/by-name/tu/tubekit/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tubekit/wrapper.nix
rename to pkgs/by-name/tu/tubekit/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0fcc3dcd6c43..787d49ac5feb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16026,10 +16026,6 @@ with pkgs;
 
   tidal-dl = python3Packages.callPackage ../tools/audio/tidal-dl { };
 
-  tubekit = callPackage ../applications/networking/cluster/tubekit/wrapper.nix { };
-
-  tubekit-unwrapped = callPackage ../applications/networking/cluster/tubekit { };
-
   duden = python3Packages.toPythonApplication python3Packages.duden;
 
   yaziPlugins = recurseIntoAttrs (callPackage ../by-name/ya/yazi/plugins { });

From 111d6fc4c7b332e549da39d25d95b21a6c829000 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 06:36:25 +0000
Subject: [PATCH 2328/3724] cargo-shear: 1.5.0 -> 1.5.1

---
 pkgs/by-name/ca/cargo-shear/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix
index b70867f1d155..142beb204997 100644
--- a/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/pkgs/by-name/ca/cargo-shear/package.nix
@@ -6,7 +6,7 @@
   cargo-shear,
 }:
 let
-  version = "1.5.0";
+  version = "1.5.1";
 in
 rustPlatform.buildRustPackage {
   pname = "cargo-shear";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
     owner = "Boshen";
     repo = "cargo-shear";
     rev = "v${version}";
-    hash = "sha256-UZOSdCErZ7dT1KiuyupD2KMf8JgPfBOZn1GFWNJFtFU=";
+    hash = "sha256-4qj+hSoByE5sfT9LTm7hsYsYpOJc5Yxak1V980L/F3c=";
   };
 
-  cargoHash = "sha256-qVkM2Zg2R3ZzCBEJFMXY7hfptiBvDaA+nVO1SVUuUNg=";
+  cargoHash = "sha256-btXeytQRZ74S55cbANRGHmLPSXssNPpE/yjA1cJTy7g=";
 
   # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
   SHEAR_VERSION = version;

From 321ec8426d2f273b1f728dbc557d5b4ab81aec4a Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 21 Aug 2025 08:37:48 +0200
Subject: [PATCH 2329/3724] dartsim: use merged commit patches instead of PR

---
 pkgs/by-name/da/dartsim/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/da/dartsim/package.nix b/pkgs/by-name/da/dartsim/package.nix
index c4b3d4495261..1eb85897e2a7 100644
--- a/pkgs/by-name/da/dartsim/package.nix
+++ b/pkgs/by-name/da/dartsim/package.nix
@@ -56,19 +56,22 @@ stdenv.mkDerivation (finalAttrs: {
     # disable failing tests. CMAKE_CTEST_ARGUMENTS does not work.
     ./disable-failing-tests.patch
     # Fix use of system gbenchmark, merged upstream
+    # ref. https://github.com/dartsim/dart/pull/1904
     (fetchpatch {
-      url = "https://github.com/dartsim/dart/pull/1904.patch";
+      url = "https://github.com/dartsim/dart/commit/c18c48a1b0beff6660b9923e8a6f8f09a86a6039.patch";
       hash = "sha256-i8Ga0FGVQ3OMprEoGEwVy0j139wjnmR6ABxr/3syhzw=";
     })
     # Fix use of system pybind11, merged upstream
+    # ref. https://github.com/dartsim/dart/pull/1907
     (fetchpatch {
-      url = "https://github.com/dartsim/dart/pull/1907.patch";
+      url = "https://github.com/dartsim/dart/commit/940c425c19e50a9ded2629422db54785802143af.patch";
       hash = "sha256-T3992uD0Z36tTxlcFaikVaLt08N9EP4gOHP0Y2AFBzQ=";
     })
     # fix use of absolute CMake paths in .pc, merged upstream
+    # ref. https://github.com/dartsim/dart/pull/2006
     (fetchpatch {
-      url = "https://github.com/dartsim/dart/pull/2006.patch";
-      hash = "sha256-csWh0261nbnLWRPqq6QHlG54ANABFmOOrJqOtpGr5dQ=";
+      url = "https://github.com/dartsim/dart/commit/6f3d6086780a311ef6e1928697f56a4d845ae028.patch";
+      hash = "sha256-sfbTm9C74fl7lVnGPZ1h3cvKXILHhkeNYxd/BpSQvg8=";
     })
   ];
 

From 8af8eba291ab1cc0742f0588905d13b737f87c2f Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 08:37:52 +0200
Subject: [PATCH 2330/3724] kodelife: move to by-name

---
 .../default.nix => by-name/ko/kodelife/package.nix}        | 7 +++----
 .../graphics => by-name/ko}/kodelife/update.sh             | 0
 pkgs/top-level/all-packages.nix                            | 4 ----
 3 files changed, 3 insertions(+), 8 deletions(-)
 rename pkgs/{applications/graphics/kodelife/default.nix => by-name/ko/kodelife/package.nix} (96%)
 rename pkgs/{applications/graphics => by-name/ko}/kodelife/update.sh (100%)

diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/by-name/ko/kodelife/package.nix
similarity index 96%
rename from pkgs/applications/graphics/kodelife/default.nix
rename to pkgs/by-name/ko/kodelife/package.nix
index 10acce631f6d..029f64b67365 100644
--- a/pkgs/applications/graphics/kodelife/default.nix
+++ b/pkgs/by-name/ko/kodelife/package.nix
@@ -8,8 +8,7 @@
   alsa-lib,
   curl,
   avahi,
-  gstreamer,
-  gst-plugins-base,
+  gst_all_1,
   libxcb,
   libX11,
   libXcursor,
@@ -78,8 +77,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     (lib.getLib stdenv.cc.cc)
     alsa-lib
-    gstreamer
-    gst-plugins-base
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
   ];
 
   installPhase = ''
diff --git a/pkgs/applications/graphics/kodelife/update.sh b/pkgs/by-name/ko/kodelife/update.sh
similarity index 100%
rename from pkgs/applications/graphics/kodelife/update.sh
rename to pkgs/by-name/ko/kodelife/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 787d49ac5feb..367831f79480 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16014,10 +16014,6 @@ with pkgs;
 
   wfuzz = with python3Packages; toPythonApplication wfuzz;
 
-  kodelife = callPackage ../applications/graphics/kodelife {
-    inherit (gst_all_1) gstreamer gst-plugins-base;
-  };
-
   sieveshell = with python3.pkgs; toPythonApplication managesieve;
 
   swift-corelibs-libdispatch = swiftPackages.Dispatch;

From 065ae9b9d36017900041af3d8ca72fde38a08e9e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 08:40:02 +0200
Subject: [PATCH 2331/3724] newlib: move to by-name

---
 .../misc/newlib/default.nix => by-name/ne/newlib/package.nix} | 0
 pkgs/top-level/all-packages.nix                               | 4 +---
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{development/misc/newlib/default.nix => by-name/ne/newlib/package.nix} (100%)

diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/by-name/ne/newlib/package.nix
similarity index 100%
rename from pkgs/development/misc/newlib/default.nix
rename to pkgs/by-name/ne/newlib/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 367831f79480..e768b65c83f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16006,9 +16006,7 @@ with pkgs;
 
   xp-pen-deco-01-v2-driver = libsForQt5.xp-pen-deco-01-v2-driver;
 
-  newlib = callPackage ../development/misc/newlib { };
-
-  newlib-nano = callPackage ../development/misc/newlib {
+  newlib-nano = newlib.override {
     nanoizeNewlib = true;
   };
 

From c76b5ccebd5377b7232e00f58cc0d9aeb299a4e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 04:53:08 +0000
Subject: [PATCH 2332/3724] androidStudioPackages.beta: 2025.1.2.10 ->
 2025.1.3.5

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index ae4227f412cf..b7413bfb101a 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -20,8 +20,8 @@ let
     sha256Hash = "sha256-jzh0xrEZU4zdlse8tlVV/uqBEz4lH2k2XSHd13d3vng=";
   };
   betaVersion = {
-    version = "2025.1.2.10"; # "Android Studio Narwhal Feature Drop | 2025.1.2 RC 1"
-    sha256Hash = "sha256-qA7iu4nK+29aHKsUmyQWuwV0SFnv5cYQvFq5CAMKyKw=";
+    version = "2025.1.3.5"; # "Android Studio Narwhal 3 Feature Drop | 2025.1.3 RC 1"
+    sha256Hash = "sha256-3LkcpvuoUhY/kRpoqYnwfx1cdPvvdBMEFXtRLYmqTk4=";
   };
   latestVersion = {
     version = "2025.1.4.1"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 Canary 1"

From f5afdf552d733e386dd952e0c25f3206fdafdb08 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 08:46:03 +0200
Subject: [PATCH 2333/3724] dnstracer: move to by-name

---
 .../default.nix => by-name/dn/dnstracer/package.nix}          | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{tools/networking/dnstracer/default.nix => by-name/dn/dnstracer/package.nix} (96%)

diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/by-name/dn/dnstracer/package.nix
similarity index 96%
rename from pkgs/tools/networking/dnstracer/default.nix
rename to pkgs/by-name/dn/dnstracer/package.nix
index e182a086771d..dcff3ee47780 100644
--- a/pkgs/tools/networking/dnstracer/default.nix
+++ b/pkgs/by-name/dn/dnstracer/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libresolv,
+  darwin,
   perl,
 }:
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     install -Dm755 -t $man/share/man/man8 dnstracer.8
   '';
 
-  buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libresolv ];
+  buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libresolv ];
 
   NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lresolv";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e768b65c83f3..a17d56e1c818 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15957,10 +15957,6 @@ with pkgs;
 
   compressDrvWeb = callPackage ../build-support/compress-drv/web.nix { };
 
-  dnstracer = callPackage ../tools/networking/dnstracer {
-    inherit (darwin) libresolv;
-  };
-
   diceware = with python3Packages; toPythonApplication diceware;
 
   xml2rfc = with python3Packages; toPythonApplication xml2rfc;

From 6a3e97bfb6a26112aa91932c8bc2ea5a44600570 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 08:50:27 +0200
Subject: [PATCH 2334/3724] httrack: move to by-name

---
 .../httrack/default.nix => by-name/ht/httrack/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/backup/httrack/default.nix => by-name/ht/httrack/package.nix} (100%)

diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/by-name/ht/httrack/package.nix
similarity index 100%
rename from pkgs/tools/backup/httrack/default.nix
rename to pkgs/by-name/ht/httrack/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a17d56e1c818..98ed236eb204 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15887,8 +15887,6 @@ with pkgs;
 
   dartHooks = callPackage ../build-support/dart/build-dart-application/hooks { };
 
-  httrack = callPackage ../tools/backup/httrack { };
-
   httraqt = libsForQt5.callPackage ../tools/backup/httrack/qt.nix { };
 
   # Overriding does not work when using callPackage on discord using import instead. (https://github.com/NixOS/nixpkgs/pull/179906)

From 65d1858dcfcba857f6dfbf06feaebfe8d303656b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 08:55:02 +0200
Subject: [PATCH 2335/3724] bullet-roboschool: move to by-name

---
 .../bu/bullet-roboschool}/gwen-narrowing.patch                  | 0
 .../bu/bullet-roboschool/package.nix}                           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/bullet => by-name/bu/bullet-roboschool}/gwen-narrowing.patch (100%)
 rename pkgs/{development/libraries/bullet/roboschool-fork.nix => by-name/bu/bullet-roboschool/package.nix} (100%)

diff --git a/pkgs/development/libraries/bullet/gwen-narrowing.patch b/pkgs/by-name/bu/bullet-roboschool/gwen-narrowing.patch
similarity index 100%
rename from pkgs/development/libraries/bullet/gwen-narrowing.patch
rename to pkgs/by-name/bu/bullet-roboschool/gwen-narrowing.patch
diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/by-name/bu/bullet-roboschool/package.nix
similarity index 100%
rename from pkgs/development/libraries/bullet/roboschool-fork.nix
rename to pkgs/by-name/bu/bullet-roboschool/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98ed236eb204..f5d97833101c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15877,8 +15877,6 @@ with pkgs;
 
   bullet = callPackage ../development/libraries/bullet { };
 
-  bullet-roboschool = callPackage ../development/libraries/bullet/roboschool-fork.nix { };
-
   dart = callPackage ../development/compilers/dart { };
 
   pub2nix = recurseIntoAttrs (callPackage ../build-support/dart/pub2nix { });

From 7e033de86bb77dae103c210abfeeaced97d83594 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 08:55:51 +0200
Subject: [PATCH 2336/3724] bullet: move to by-name

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

diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/by-name/bu/bullet/package.nix
similarity index 100%
rename from pkgs/development/libraries/bullet/default.nix
rename to pkgs/by-name/bu/bullet/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5d97833101c..423934a08c33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15875,8 +15875,6 @@ with pkgs;
 
   zncModules = recurseIntoAttrs (callPackage ../applications/networking/znc/modules.nix { });
 
-  bullet = callPackage ../development/libraries/bullet { };
-
   dart = callPackage ../development/compilers/dart { };
 
   pub2nix = recurseIntoAttrs (callPackage ../build-support/dart/pub2nix { });

From d64d3245d36e4f3e8c956d2d30ade962cfa77b13 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 08:59:23 +0200
Subject: [PATCH 2337/3724] xsane: move to by-name

---
 .../graphics/sane/xsane.nix => by-name/xs/xsane/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/graphics/sane/xsane.nix => by-name/xs/xsane/package.nix} (100%)

diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/by-name/xs/xsane/package.nix
similarity index 100%
rename from pkgs/applications/graphics/sane/xsane.nix
rename to pkgs/by-name/xs/xsane/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 423934a08c33..7a1b578e9317 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15851,8 +15851,6 @@ with pkgs;
     openssl = openssl_1_1;
   };
 
-  xsane = callPackage ../applications/graphics/sane/xsane.nix { };
-
   xsw = callPackage ../applications/misc/xsw {
     # Enable the next line to use this in terminal.
     # Note that it requires sixel capable terminals such as mlterm

From ade9139165e7ea46e164972b65455514cb27cc2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 07:00:29 +0000
Subject: [PATCH 2338/3724] lock: 1.7.1 -> 1.7.3

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

diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix
index 9bb3dda26a7f..82d4a4b955c5 100644
--- a/pkgs/by-name/lo/lock/package.nix
+++ b/pkgs/by-name/lo/lock/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lock";
-  version = "1.7.1";
+  version = "1.7.3";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RYsdULExsLLp0NDa3OAf52H+WIypYZT2AUci0ytwHNw=";
+    hash = "sha256-NxSw77GpcLoLfbD46QECORdJKWBfWS8zQE+SU3J9GK8=";
   };
 
   strictDeps = true;

From 6fe44ff4f2c9a739aa01d9e08280b08bc65602d2 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 21 Aug 2025 09:01:06 +0200
Subject: [PATCH 2339/3724] recastnavigation: fix for CMake v4

while here:
- update catch to catch2_3
- remove patches fixed upstream
- remove use of "with lib;"
---
 pkgs/by-name/re/recastnavigation/package.nix | 29 ++++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/re/recastnavigation/package.nix b/pkgs/by-name/re/recastnavigation/package.nix
index b93d17aecbb9..716c577b8b44 100644
--- a/pkgs/by-name/re/recastnavigation/package.nix
+++ b/pkgs/by-name/re/recastnavigation/package.nix
@@ -6,31 +6,23 @@
   libGL,
   SDL2,
   libGLU,
-  catch,
+  catch2_3,
 }:
 
 stdenv.mkDerivation {
   pname = "recastai";
-  # use latest revision for the CMake build process and OpenMW
+  # use latest revision for CMake v4
   # OpenMW use e75adf86f91eb3082220085e42dda62679f9a3ea
-  version = "unstable-2023-01-02";
+  version = "unstable-2025-08-12";
 
   src = fetchFromGitHub {
     owner = "recastnavigation";
     repo = "recastnavigation";
-    rev = "405cc095ab3a2df976a298421974a2af83843baf";
-    sha256 = "sha256-WVzDI7+UuAl10Tm1Zjkea/FMk0cIe7pWg0iyFLbwAdI=";
+    rev = "40ec6fcd6c0263a3d7798452aee531066072d15d";
+    hash = "sha256-4flJMJsuCecpHDtgAsnDU7WoAtUg/XJfRXx096Zw6bE=";
   };
 
-  postPatch = ''
-    cp ${catch}/include/catch/catch.hpp Tests/catch.hpp
-
-    # https://github.com/recastnavigation/recastnavigation/issues/524
-    substituteInPlace CMakeLists.txt \
-      --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \
-      --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR}
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     # Expects SDL2.framework in specific location, which we don't have
     # Change where SDL2 headers are searched for to match what we do have
     substituteInPlace RecastDemo/CMakeLists.txt \
@@ -40,6 +32,7 @@ stdenv.mkDerivation {
   doCheck = true;
 
   nativeBuildInputs = [ cmake ];
+  checkInputs = [ catch2_3 ];
 
   buildInputs = [
     libGL
@@ -47,12 +40,12 @@ stdenv.mkDerivation {
     libGLU
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/recastnavigation/recastnavigation";
     description = "Navigation-mesh Toolset for Games";
     mainProgram = "RecastDemo";
-    license = licenses.zlib;
-    maintainers = with maintainers; [ marius851000 ];
-    platforms = platforms.all;
+    license = lib.licenses.zlib;
+    maintainers = with lib.maintainers; [ marius851000 ];
+    platforms = lib.platforms.all;
   };
 }

From 067ca97d1de354ad6079892e90fc597cbfcc5614 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 21 Aug 2025 09:22:15 +0200
Subject: [PATCH 2340/3724] ci/nixpkgs-vet: use Nix 2.30+ inside sandbox

This should fix the random symlink creation errors.
---
 ci/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ci/default.nix b/ci/default.nix
index 0aeb2356e9ae..9be9aa93aea7 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -134,7 +134,9 @@ rec {
   manual-nixos = (import ../nixos/release.nix { }).manual.${system} or null;
   manual-nixpkgs = (import ../doc { inherit pkgs; });
   manual-nixpkgs-tests = (import ../doc { inherit pkgs; }).tests;
-  nixpkgs-vet = pkgs.callPackage ./nixpkgs-vet.nix { };
+  nixpkgs-vet = pkgs.callPackage ./nixpkgs-vet.nix {
+    nix = pkgs.nixVersions.latest;
+  };
   parse = pkgs.lib.recurseIntoAttrs {
     latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };
     lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };

From 073438fd216979eb72d5833f5f975c0ac4622602 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 07:34:02 +0000
Subject: [PATCH 2341/3724] kuzu: 0.11.1 -> 0.11.2

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

diff --git a/pkgs/by-name/ku/kuzu/package.nix b/pkgs/by-name/ku/kuzu/package.nix
index a49c0b73884b..cf49ef4cc6e0 100644
--- a/pkgs/by-name/ku/kuzu/package.nix
+++ b/pkgs/by-name/ku/kuzu/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kuzu";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "kuzudb";
     repo = "kuzu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rRnzAEQhmqO8w+dN0liLGoHympgU5Q/qbsrJqzKpuTw=";
+    hash = "sha256-tRDTDEK//Fy43x6JOTwBlpSwvw50nlY7qdJ30SHbgRM=";
   };
 
   outputs = [

From e55298c6898bfbb2f14fa212665a411a1ddf7c9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 07:38:51 +0000
Subject: [PATCH 2342/3724] python3Packages.pyghmi: 1.6.3 -> 1.6.5

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

diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix
index a6ebb4714283..4aa4c116c2c4 100644
--- a/pkgs/development/python-modules/pyghmi/default.nix
+++ b/pkgs/development/python-modules/pyghmi/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "pyghmi";
-  version = "1.6.3";
+  version = "1.6.5";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-nPVOdK2zAqQoG8nB5eXcWOPC7V4Wd/hRQcjA3EU0xyE=";
+    hash = "sha256-g7QJFreMmO5NWvFmSQWFrHjPHpP6Gy4o31JDHSF2ob8=";
   };
 
   build-system = [

From e61a31f1bbc8177c194d3cdfda17c3a93af4489c Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Thu, 21 Aug 2025 09:54:19 +0200
Subject: [PATCH 2343/3724] keycloak: 26.3.2 -> 26.3.3

Release notes: https://github.com/keycloak/keycloak/releases/tag/26.3.3
Full changelog: https://github.com/keycloak/keycloak/compare/26.3.2...26.3.3
---
 pkgs/by-name/ke/keycloak/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix
index e1eb318be548..29416d37277a 100644
--- a/pkgs/by-name/ke/keycloak/package.nix
+++ b/pkgs/by-name/ke/keycloak/package.nix
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "keycloak";
-  version = "26.3.2";
+  version = "26.3.3";
 
   src = fetchzip {
     url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
-    hash = "sha256-LC12W13plMu8byU0kuFkNipUMOK1TLOphr1MFK0Qzcc=";
+    hash = "sha256-5+KmaLz6pZjgOI3CoXk1wC/LXiYzRiV2s2l0Jkwb45M=";
   };
 
   nativeBuildInputs = [

From 67cbd7414c36709528b051a40ca199303dbeb268 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@redhat.com>
Date: Thu, 21 Aug 2025 10:15:32 +0200
Subject: [PATCH 2344/3724] cri-tools: 1.33.0 -> 1.34.0

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
---
 pkgs/by-name/cr/cri-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cr/cri-tools/package.nix b/pkgs/by-name/cr/cri-tools/package.nix
index 13a301626b67..3a35a2c682d1 100644
--- a/pkgs/by-name/cr/cri-tools/package.nix
+++ b/pkgs/by-name/cr/cri-tools/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "cri-tools";
-  version = "1.33.0";
+  version = "1.34.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "cri-tools";
     rev = "v${version}";
-    hash = "sha256-KxckDpZ3xfD+buCGrQ+udJF0X2D9sg/d3TLSQEcWyV4=";
+    hash = "sha256-nWbxPw8lz1FYLHXJ2G4kzOl5nBPXSl4nEJ9KgzS/wmA=";
   };
 
   vendorHash = null;

From 66697e1bd1705fa29d0890745d753e9e34d90f25 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 21 Aug 2025 10:18:34 +0200
Subject: [PATCH 2345/3724] portable/service: Reuse meta-maintainers.nix

Tested with:

    nix repl -f .
    nix-repl> :p nixosTests.php.fpm-modular.config.nodes.machine.system.services.php-fpm.meta.maintainers

    nix-build -A nixosTests.php.fpm-modular
---
 nixos/modules/system/service/portable/service.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/system/service/portable/service.nix b/nixos/modules/system/service/portable/service.nix
index 339a99d7a856..a2d86274ec29 100644
--- a/nixos/modules/system/service/portable/service.nix
+++ b/nixos/modules/system/service/portable/service.nix
@@ -10,6 +10,7 @@ in
   # https://nixos.org/manual/nixos/unstable/#modular-services
   _class = "service";
   imports = [
+    ../../../../../modules/generic/meta-maintainers.nix
     ../../../misc/assertions.nix
     ./config-data.nix
   ];
@@ -43,9 +44,5 @@ in
         '';
       };
     };
-    # TODO: use https://github.com/NixOS/nixpkgs/pull/431450
-    meta = lib.mkOption {
-      description = "The maintainers of this module. This is currently a placeholder option whose value may not evaluate to anything useful until https://github.com/NixOS/nixpkgs/pull/431450 is available and used here.";
-    };
   };
 }

From db393f2a5c31f7bc625d7fbd0d67502a6f25bb9a Mon Sep 17 00:00:00 2001
From: Maxwell Rupp <maxwell@giglab.dev>
Date: Thu, 21 Aug 2025 04:27:04 -0400
Subject: [PATCH 2346/3724] vimPlugins.commasemi-nvim: init at 2025-03-06

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 90196ace947f..f332559c4459 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -3130,6 +3130,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  commasemi-nvim = buildVimPlugin {
+    pname = "commasemi.nvim";
+    version = "2025-03-06";
+    src = fetchFromGitHub {
+      owner = "saifulapm";
+      repo = "commasemi.nvim";
+      rev = "cbfa3554e554f0534fcd79de273742a532c0068f";
+      sha256 = "13b334fx6yn1iyijvm7vb6il1zqpzx112rhw6ajp3lvgqanpz23d";
+    };
+    meta.homepage = "https://github.com/saifulapm/commasemi.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   comment-box-nvim = buildVimPlugin {
     pname = "comment-box.nvim";
     version = "2024-02-03";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index e5f8e333882e..530c56e0394f 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -239,6 +239,7 @@ https://github.com/lilydjwg/colorizer/,,
 https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD,
 https://github.com/mluders/comfy-line-numbers.nvim/,HEAD,
 https://github.com/wincent/command-t/,,
+https://github.com/saifulapm/commasemi.nvim/,HEAD,
 https://github.com/LudoPinelli/comment-box.nvim/,HEAD,
 https://github.com/numtostr/comment.nvim/,,
 https://github.com/rhysd/committia.vim/,,

From 545ef3d1570375db721ccb36861f64ae01a3f595 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 08:28:31 +0000
Subject: [PATCH 2347/3724] firebase-tools: 14.12.0 -> 14.13.0

---
 pkgs/by-name/fi/firebase-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index 51f00359fced..0da75c4d7efd 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "firebase-tools";
-  version = "14.12.0";
+  version = "14.13.0";
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     tag = "v${version}";
-    hash = "sha256-LShbjULFhwMOj3h+TFqZJSg1wPP69A222w51M0kFPCk=";
+    hash = "sha256-3nDile9gDnaCLWqUYiK3TdiPF2gXzurphHawVO3ZQE8=";
   };
 
-  npmDepsHash = "sha256-MN3kN2NKYak7/BgU9ZYsb/q42xEbFVeOSZxMowmXctU=";
+  npmDepsHash = "sha256-+T2zfUs8vvHnFtBimQtF4UUyLVwp+RpeklcZQxfHxHM=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

From ef7f010d24acdbffbd713d25e8bafd9e20025f93 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:00:52 +0200
Subject: [PATCH 2348/3724] wraith: move to by-name

---
 .../irc => by-name/wr}/wraith/configure.patch        |  0
 .../irc => by-name/wr}/wraith/dlopen.patch           |  0
 .../default.nix => by-name/wr/wraith/package.nix}    | 12 ++++++------
 pkgs/top-level/all-packages.nix                      |  4 ----
 4 files changed, 6 insertions(+), 10 deletions(-)
 rename pkgs/{applications/networking/irc => by-name/wr}/wraith/configure.patch (100%)
 rename pkgs/{applications/networking/irc => by-name/wr}/wraith/dlopen.patch (100%)
 rename pkgs/{applications/networking/irc/wraith/default.nix => by-name/wr/wraith/package.nix} (92%)

diff --git a/pkgs/applications/networking/irc/wraith/configure.patch b/pkgs/by-name/wr/wraith/configure.patch
similarity index 100%
rename from pkgs/applications/networking/irc/wraith/configure.patch
rename to pkgs/by-name/wr/wraith/configure.patch
diff --git a/pkgs/applications/networking/irc/wraith/dlopen.patch b/pkgs/by-name/wr/wraith/dlopen.patch
similarity index 100%
rename from pkgs/applications/networking/irc/wraith/dlopen.patch
rename to pkgs/by-name/wr/wraith/dlopen.patch
diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/by-name/wr/wraith/package.nix
similarity index 92%
rename from pkgs/applications/networking/irc/wraith/default.nix
rename to pkgs/by-name/wr/wraith/package.nix
index 1a6f26aa2699..774de51eee94 100644
--- a/pkgs/applications/networking/irc/wraith/default.nix
+++ b/pkgs/by-name/wr/wraith/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  openssl,
+  openssl_1_1,
 }:
 
 stdenv.mkDerivation rec {
@@ -13,16 +13,16 @@ stdenv.mkDerivation rec {
     sha256 = "1h8159g6wh1hi69cnhqkgwwwa95fa6z1zrzjl219mynbf6vjjzkw";
   };
   hardeningDisable = [ "format" ];
-  buildInputs = [ openssl ];
+  buildInputs = [ openssl_1_1 ];
   patches = [
     ./configure.patch
     ./dlopen.patch
   ];
   postPatch = ''
-    substituteInPlace configure        --subst-var-by openssl.dev ${openssl.dev} \
-                                       --subst-var-by openssl-lib ${lib.getLib openssl}
-    substituteInPlace src/libssl.cc    --subst-var-by openssl ${lib.getLib openssl}
-    substituteInPlace src/libcrypto.cc --subst-var-by openssl ${lib.getLib openssl}
+    substituteInPlace configure        --subst-var-by openssl.dev ${openssl_1_1.dev} \
+                                       --subst-var-by openssl-lib ${lib.getLib openssl_1_1}
+    substituteInPlace src/libssl.cc    --subst-var-by openssl ${lib.getLib openssl_1_1}
+    substituteInPlace src/libcrypto.cc --subst-var-by openssl ${lib.getLib openssl_1_1}
   '';
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a1b578e9317..bba4e77c80a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15847,10 +15847,6 @@ with pkgs;
     }
   );
 
-  wraith = callPackage ../applications/networking/irc/wraith {
-    openssl = openssl_1_1;
-  };
-
   xsw = callPackage ../applications/misc/xsw {
     # Enable the next line to use this in terminal.
     # Note that it requires sixel capable terminals such as mlterm

From db64e45c901b36149edc8883cc6723e2fe1c8678 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:02:32 +0200
Subject: [PATCH 2349/3724] wikicurses: move to by-name

---
 .../default.nix => by-name/wi/wikicurses/package.nix}       | 6 +++---
 pkgs/top-level/all-packages.nix                             | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{applications/misc/wikicurses/default.nix => by-name/wi/wikicurses/package.nix} (88%)

diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/by-name/wi/wikicurses/package.nix
similarity index 88%
rename from pkgs/applications/misc/wikicurses/default.nix
rename to pkgs/by-name/wi/wikicurses/package.nix
index 4d977477108d..20aaf72be207 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/by-name/wi/wikicurses/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
   fetchFromGitHub,
-  pythonPackages,
+  python3Packages,
   installShellFiles,
 }:
 
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   version = "1.4";
   format = "setuptools";
   pname = "wikicurses";
@@ -26,7 +26,7 @@ pythonPackages.buildPythonApplication rec {
     installShellFiles
   ];
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python3Packages; [
     urwid
     beautifulsoup4
     lxml
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bba4e77c80a5..6497914c98ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15783,10 +15783,6 @@ with pkgs;
 
   wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { };
 
-  wikicurses = callPackage ../applications/misc/wikicurses {
-    pythonPackages = python3Packages;
-  };
-
   winePackagesFor =
     wineBuild:
     lib.makeExtensible (

From c84f5de7b1fbb43f757a9d2af1cf6a9010a1e0b1 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:06:34 +0200
Subject: [PATCH 2350/3724] webkit2-sharp: move to by-name

---
 .../default.nix => by-name/we/webkit2-sharp/package.nix}    | 6 +++---
 pkgs/top-level/all-packages.nix                             | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{development/libraries/webkit2-sharp/default.nix => by-name/we/webkit2-sharp/package.nix} (95%)

diff --git a/pkgs/development/libraries/webkit2-sharp/default.nix b/pkgs/by-name/we/webkit2-sharp/package.nix
similarity index 95%
rename from pkgs/development/libraries/webkit2-sharp/default.nix
rename to pkgs/by-name/we/webkit2-sharp/package.nix
index 78b89397b76d..e50da66aa854 100644
--- a/pkgs/development/libraries/webkit2-sharp/default.nix
+++ b/pkgs/by-name/we/webkit2-sharp/package.nix
@@ -7,7 +7,7 @@
   libxslt,
   mono,
   pkg-config,
-  webkitgtk,
+  webkitgtk_4_0,
 }:
 
 stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk-sharp-3_0
-    webkitgtk
+    webkitgtk_4_0
   ];
 
   postPatch = ''
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "GAPIXMLDIR=/tmp/gapixml" ];
 
   passthru = {
-    inherit webkitgtk;
+    webkitgtk = webkitgtk_4_0;
   };
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6497914c98ef..6156084c5935 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15777,10 +15777,6 @@ with pkgs;
     llvmPackages = llvmPackages_12;
   };
 
-  webkit2-sharp = callPackage ../development/libraries/webkit2-sharp {
-    webkitgtk = webkitgtk_4_0;
-  };
-
   wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { };
 
   winePackagesFor =

From cc7d944ec69bb192565ce6858bbfa36f8cd52fad Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:07:58 +0200
Subject: [PATCH 2351/3724] wavm: move to by-name

---
 .../wavm/default.nix => by-name/wa/wavm/package.nix}        | 6 +++---
 pkgs/top-level/all-packages.nix                             | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{development/interpreters/wavm/default.nix => by-name/wa/wavm/package.nix} (85%)

diff --git a/pkgs/development/interpreters/wavm/default.nix b/pkgs/by-name/wa/wavm/package.nix
similarity index 85%
rename from pkgs/development/interpreters/wavm/default.nix
rename to pkgs/by-name/wa/wavm/package.nix
index 82ee3fee4eb6..d56fba46cb56 100644
--- a/pkgs/development/interpreters/wavm/default.nix
+++ b/pkgs/by-name/wa/wavm/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
-  llvmPackages,
+  llvmPackages_12,
   fetchFromGitHub,
   cmake,
 }:
 
-llvmPackages.stdenv.mkDerivation (finalAttrs: {
+llvmPackages_12.stdenv.mkDerivation (finalAttrs: {
   pname = "wavm";
   version = "2022-05-14";
 
@@ -18,7 +18,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    llvmPackages.llvm
+    llvmPackages_12.llvm
   ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6156084c5935..629cd6b8794b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15773,10 +15773,6 @@ with pkgs;
     llvmPackages = llvmPackages_18;
   };
 
-  wavm = callPackage ../development/interpreters/wavm {
-    llvmPackages = llvmPackages_12;
-  };
-
   wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { };
 
   winePackagesFor =

From 21b40568f1e32448d0989d287ffee28066670306 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:09:06 +0200
Subject: [PATCH 2352/3724] wasmer: move to by-name

---
 .../wasmer/default.nix => by-name/wa/wasmer/package.nix}    | 6 +++---
 pkgs/top-level/all-packages.nix                             | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{development/interpreters/wasmer/default.nix => by-name/wa/wasmer/package.nix} (96%)

diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/by-name/wa/wasmer/package.nix
similarity index 96%
rename from pkgs/development/interpreters/wasmer/default.nix
rename to pkgs/by-name/wa/wasmer/package.nix
index 7415fa2e2003..da8a9fe6ce71 100644
--- a/pkgs/development/interpreters/wasmer/default.nix
+++ b/pkgs/by-name/wa/wasmer/package.nix
@@ -2,7 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  llvmPackages,
+  llvmPackages_18,
   libffi,
   libxml2,
   withLLVM ? true,
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   buildInputs = lib.optionals withLLVM [
-    llvmPackages.llvm
+    llvmPackages_18.llvm
     libffi
     libxml2
   ];
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
     "wasmer"
   ];
 
-  env.LLVM_SYS_180_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev;
+  env.LLVM_SYS_180_PREFIX = lib.optionalString withLLVM llvmPackages_18.llvm.dev;
 
   # Tests are failing due to `Cannot allocate memory` and other reasons
   doCheck = false;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 629cd6b8794b..043fdf15e6d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15769,10 +15769,6 @@ with pkgs;
 
   wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { };
 
-  wasmer = callPackage ../development/interpreters/wasmer {
-    llvmPackages = llvmPackages_18;
-  };
-
   wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { };
 
   winePackagesFor =

From 9fe697e30c16e0c7ecb69c1441f307b8462dff81 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:11:29 +0200
Subject: [PATCH 2353/3724] terraform-landscape: move to by-name

---
 .../cluster => by-name/te}/terraform-landscape/Gemfile          | 0
 .../cluster => by-name/te}/terraform-landscape/Gemfile.lock     | 0
 .../cluster => by-name/te}/terraform-landscape/gemset.nix       | 0
 .../default.nix => by-name/te/terraform-landscape/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/cluster => by-name/te}/terraform-landscape/Gemfile (100%)
 rename pkgs/{applications/networking/cluster => by-name/te}/terraform-landscape/Gemfile.lock (100%)
 rename pkgs/{applications/networking/cluster => by-name/te}/terraform-landscape/gemset.nix (100%)
 rename pkgs/{applications/networking/cluster/terraform-landscape/default.nix => by-name/te/terraform-landscape/package.nix} (100%)

diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile b/pkgs/by-name/te/terraform-landscape/Gemfile
similarity index 100%
rename from pkgs/applications/networking/cluster/terraform-landscape/Gemfile
rename to pkgs/by-name/te/terraform-landscape/Gemfile
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/by-name/te/terraform-landscape/Gemfile.lock
similarity index 100%
rename from pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
rename to pkgs/by-name/te/terraform-landscape/Gemfile.lock
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/by-name/te/terraform-landscape/gemset.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
rename to pkgs/by-name/te/terraform-landscape/gemset.nix
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/default.nix b/pkgs/by-name/te/terraform-landscape/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terraform-landscape/default.nix
rename to pkgs/by-name/te/terraform-landscape/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 043fdf15e6d8..92c4f7c14be1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15745,8 +15745,6 @@ with pkgs;
 
   terraforming = callPackage ../applications/networking/cluster/terraforming { };
 
-  terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape { };
-
   vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv;
 
   vaultwarden-sqlite = vaultwarden;

From 21d2ba1809cdbcc1da75d745c01497acfaa52eb2 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:12:05 +0200
Subject: [PATCH 2354/3724] terraforming: move to by-name

---
 .../networking/cluster => by-name/te}/terraforming/Gemfile      | 0
 .../networking/cluster => by-name/te}/terraforming/Gemfile.lock | 0
 .../networking/cluster => by-name/te}/terraforming/gemset.nix   | 0
 .../default.nix => by-name/te/terraforming/package.nix}         | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/cluster => by-name/te}/terraforming/Gemfile (100%)
 rename pkgs/{applications/networking/cluster => by-name/te}/terraforming/Gemfile.lock (100%)
 rename pkgs/{applications/networking/cluster => by-name/te}/terraforming/gemset.nix (100%)
 rename pkgs/{applications/networking/cluster/terraforming/default.nix => by-name/te/terraforming/package.nix} (100%)

diff --git a/pkgs/applications/networking/cluster/terraforming/Gemfile b/pkgs/by-name/te/terraforming/Gemfile
similarity index 100%
rename from pkgs/applications/networking/cluster/terraforming/Gemfile
rename to pkgs/by-name/te/terraforming/Gemfile
diff --git a/pkgs/applications/networking/cluster/terraforming/Gemfile.lock b/pkgs/by-name/te/terraforming/Gemfile.lock
similarity index 100%
rename from pkgs/applications/networking/cluster/terraforming/Gemfile.lock
rename to pkgs/by-name/te/terraforming/Gemfile.lock
diff --git a/pkgs/applications/networking/cluster/terraforming/gemset.nix b/pkgs/by-name/te/terraforming/gemset.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terraforming/gemset.nix
rename to pkgs/by-name/te/terraforming/gemset.nix
diff --git a/pkgs/applications/networking/cluster/terraforming/default.nix b/pkgs/by-name/te/terraforming/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terraforming/default.nix
rename to pkgs/by-name/te/terraforming/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92c4f7c14be1..740443efc99b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15743,8 +15743,6 @@ with pkgs;
     callPackage ../applications/networking/cluster/terraform-providers { }
   );
 
-  terraforming = callPackage ../applications/networking/cluster/terraforming { };
-
   vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv;
 
   vaultwarden-sqlite = vaultwarden;

From c7a76b5e03a28a14e4b11722f3c7427c93670f32 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:14:40 +0200
Subject: [PATCH 2355/3724] romdirfs: move to by-name

---
 .../romdirfs/default.nix => by-name/ro/romdirfs/package.nix}  | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{tools/filesystems/romdirfs/default.nix => by-name/ro/romdirfs/package.nix} (93%)

diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/by-name/ro/romdirfs/package.nix
similarity index 93%
rename from pkgs/tools/filesystems/romdirfs/default.nix
rename to pkgs/by-name/ro/romdirfs/package.nix
index 387d17ce1861..00b6543cc1ac 100644
--- a/pkgs/tools/filesystems/romdirfs/default.nix
+++ b/pkgs/by-name/ro/romdirfs/package.nix
@@ -1,13 +1,13 @@
 {
   lib,
-  stdenv,
+  gccStdenv,
   fetchFromGitHub,
   cmake,
   pkg-config,
   fuse,
 }:
 
-stdenv.mkDerivation rec {
+gccStdenv.mkDerivation rec {
   pname = "romdirfs";
   version = "1.2";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 740443efc99b..24f9513fb205 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15691,10 +15691,6 @@ with pkgs;
 
   qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { };
 
-  romdirfs = callPackage ../tools/filesystems/romdirfs {
-    stdenv = gccStdenv;
-  };
-
   sail-riscv = callPackage ../applications/virtualization/sail-riscv {
     inherit (ocamlPackages) sail;
   };

From a85e9001f321f483be41ff55639582c4cb32a683 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:17:41 +0200
Subject: [PATCH 2356/3724] pgadmin4: move to by-name

---
 .../pg/pgadmin4}/check-system-config-dir.patch                | 0
 .../pgadmin => by-name/pg/pgadmin4}/expose-setup.py.patch     | 0
 .../admin/pgadmin => by-name/pg/pgadmin4}/missing-hashes.json | 0
 .../pgadmin/default.nix => by-name/pg/pgadmin4/package.nix}   | 0
 pkgs/{tools/admin/pgadmin => by-name/pg/pgadmin4}/update.sh   | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 +---
 6 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/{tools/admin/pgadmin => by-name/pg/pgadmin4}/check-system-config-dir.patch (100%)
 rename pkgs/{tools/admin/pgadmin => by-name/pg/pgadmin4}/expose-setup.py.patch (100%)
 rename pkgs/{tools/admin/pgadmin => by-name/pg/pgadmin4}/missing-hashes.json (100%)
 rename pkgs/{tools/admin/pgadmin/default.nix => by-name/pg/pgadmin4/package.nix} (100%)
 rename pkgs/{tools/admin/pgadmin => by-name/pg/pgadmin4}/update.sh (94%)

diff --git a/pkgs/tools/admin/pgadmin/check-system-config-dir.patch b/pkgs/by-name/pg/pgadmin4/check-system-config-dir.patch
similarity index 100%
rename from pkgs/tools/admin/pgadmin/check-system-config-dir.patch
rename to pkgs/by-name/pg/pgadmin4/check-system-config-dir.patch
diff --git a/pkgs/tools/admin/pgadmin/expose-setup.py.patch b/pkgs/by-name/pg/pgadmin4/expose-setup.py.patch
similarity index 100%
rename from pkgs/tools/admin/pgadmin/expose-setup.py.patch
rename to pkgs/by-name/pg/pgadmin4/expose-setup.py.patch
diff --git a/pkgs/tools/admin/pgadmin/missing-hashes.json b/pkgs/by-name/pg/pgadmin4/missing-hashes.json
similarity index 100%
rename from pkgs/tools/admin/pgadmin/missing-hashes.json
rename to pkgs/by-name/pg/pgadmin4/missing-hashes.json
diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/by-name/pg/pgadmin4/package.nix
similarity index 100%
rename from pkgs/tools/admin/pgadmin/default.nix
rename to pkgs/by-name/pg/pgadmin4/package.nix
diff --git a/pkgs/tools/admin/pgadmin/update.sh b/pkgs/by-name/pg/pgadmin4/update.sh
similarity index 94%
rename from pkgs/tools/admin/pgadmin/update.sh
rename to pkgs/by-name/pg/pgadmin4/update.sh
index 734853b4af1a..de6bfcf81988 100755
--- a/pkgs/tools/admin/pgadmin/update.sh
+++ b/pkgs/by-name/pg/pgadmin4/update.sh
@@ -52,12 +52,12 @@ fi
 printf "Done\n"
 
 if [[ -f missing-hashes.json ]]; then
-  if [[ ! -f "$nixpkgs/pkgs/tools/admin/pgadmin/missing-hashes.json" ]]; then
+  if [[ ! -f "$nixpkgs/pkgs/by-name/pg/pgadmin4/missing-hashes.json" ]]; then
     printf "PLEASE NOTE: FIRST TIME OF FINDING MISSING HASHES!"
     printf "Please add \"missingHashes = ./missing-hashes.json\" to pgadmin derivation"
   fi
   printf "Copy files to nixpkgs\n"
-  cp missing-hashes.json "$nixpkgs/pkgs/tools/admin/pgadmin/"
+  cp missing-hashes.json "$nixpkgs/pkgs/by-name/pg/pgadmin4"
 fi
 
 printf "Done\n"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24f9513fb205..1fe0bbffe8dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15666,9 +15666,7 @@ with pkgs;
 
   resp-app = libsForQt5.callPackage ../applications/misc/resp-app { };
 
-  pgadmin4 = callPackage ../tools/admin/pgadmin { };
-
-  pgadmin4-desktopmode = callPackage ../tools/admin/pgadmin { server-mode = false; };
+  pgadmin4-desktopmode = pgadmin4.override { server-mode = false; };
 
   philipstv = with python3Packages; toPythonApplication philipstv;
 

From 56fabd5a339a94c648a2d1e4a82caa1df6f6005e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:53:50 +0200
Subject: [PATCH 2357/3724] nixos-grub2-theme: move to by-name

---
 .../grub2-theme.nix => by-name/ni/nixos-grub2-theme/package.nix} | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{data/misc/nixos-artwork/grub2-theme.nix => by-name/ni/nixos-grub2-theme/package.nix} (100%)

diff --git a/pkgs/data/misc/nixos-artwork/grub2-theme.nix b/pkgs/by-name/ni/nixos-grub2-theme/package.nix
similarity index 100%
rename from pkgs/data/misc/nixos-artwork/grub2-theme.nix
rename to pkgs/by-name/ni/nixos-grub2-theme/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fe0bbffe8dd..6e4df9fee27b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15634,7 +15634,6 @@ with pkgs;
 
   nixos-artwork = callPackage ../data/misc/nixos-artwork { };
   nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { };
-  nixos-grub2-theme = callPackage ../data/misc/nixos-artwork/grub2-theme.nix { };
 
   nixos-rebuild = callPackage ../os-specific/linux/nixos-rebuild { };
 

From 047dd7b524da8dd2da3da887a4d6b50829a11cc8 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:55:30 +0200
Subject: [PATCH 2358/3724] nixos-icons: move to by-name

---
 .../icons.nix => by-name/ni/nixos-icons/package.nix}             | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{data/misc/nixos-artwork/icons.nix => by-name/ni/nixos-icons/package.nix} (100%)

diff --git a/pkgs/data/misc/nixos-artwork/icons.nix b/pkgs/by-name/ni/nixos-icons/package.nix
similarity index 100%
rename from pkgs/data/misc/nixos-artwork/icons.nix
rename to pkgs/by-name/ni/nixos-icons/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e4df9fee27b..9c446bee8cce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15633,7 +15633,6 @@ with pkgs;
   nixpkgs-manual = callPackage ../../doc/doc-support/package.nix { };
 
   nixos-artwork = callPackage ../data/misc/nixos-artwork { };
-  nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { };
 
   nixos-rebuild = callPackage ../os-specific/linux/nixos-rebuild { };
 

From 66beef4e3307ebfef972c7ff3740d45901f1a094 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:57:10 +0200
Subject: [PATCH 2359/3724] nix-update-source: move to by-name

---
 .../default.nix => by-name/ni/nix-update-source/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/package-management/nix-update-source/default.nix => by-name/ni/nix-update-source/package.nix} (100%)

diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/by-name/ni/nix-update-source/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nix-update-source/default.nix
rename to pkgs/by-name/ni/nix-update-source/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c446bee8cce..79dd5ea3f44f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15614,8 +15614,6 @@ with pkgs;
     nix-prefetch-scripts
     ;
 
-  nix-update-source = callPackage ../tools/package-management/nix-update-source { };
-
   nix-tree = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-tree);
 
   nix-serve-ng =

From 6b1428a02c31b5437454e7496fcf287cacc9c051 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:59:06 +0200
Subject: [PATCH 2360/3724] nix-index: move to by-name

---
 .../default.nix => by-name/ni/nix-index-unwrapped/package.nix} | 0
 .../nix-index/wrapper.nix => by-name/ni/nix-index/package.nix} | 0
 pkgs/top-level/all-packages.nix                                | 3 ---
 3 files changed, 3 deletions(-)
 rename pkgs/{tools/package-management/nix-index/default.nix => by-name/ni/nix-index-unwrapped/package.nix} (100%)
 rename pkgs/{tools/package-management/nix-index/wrapper.nix => by-name/ni/nix-index/package.nix} (100%)

diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nix-index/default.nix
rename to pkgs/by-name/ni/nix-index-unwrapped/package.nix
diff --git a/pkgs/tools/package-management/nix-index/wrapper.nix b/pkgs/by-name/ni/nix-index/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nix-index/wrapper.nix
rename to pkgs/by-name/ni/nix-index/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79dd5ea3f44f..52acd4dfae46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15598,9 +15598,6 @@ with pkgs;
   nix-info = callPackage ../tools/nix/info { };
   nix-info-tested = nix-info.override { doCheck = true; };
 
-  nix-index-unwrapped = callPackage ../tools/package-management/nix-index { };
-  nix-index = callPackage ../tools/package-management/nix-index/wrapper.nix { };
-
   nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter);
 
   nix-prefetch-github = with python3Packages; toPythonApplication nix-prefetch-github;

From c8af5328331da50c6c4ae09ab0868e535ff5e710 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 10:04:43 +0200
Subject: [PATCH 2361/3724] mongocxx: move to by-name

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

diff --git a/pkgs/development/libraries/mongocxx/default.nix b/pkgs/by-name/mo/mongocxx/package.nix
similarity index 100%
rename from pkgs/development/libraries/mongocxx/default.nix
rename to pkgs/by-name/mo/mongocxx/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52acd4dfae46..6a8a6d24204b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15444,8 +15444,6 @@ with pkgs;
 
   meilisearch_1_11 = callPackage ../by-name/me/meilisearch/package.nix { version = "1.11.3"; };
 
-  mongocxx = callPackage ../development/libraries/mongocxx/default.nix { };
-
   muse = libsForQt5.callPackage ../applications/audio/muse { };
 
   nixDependencies = recurseIntoAttrs (

From e917bd15d29fd544b33f8698b7ffbba53ea22a0e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 10:06:58 +0200
Subject: [PATCH 2362/3724] kompute: move to by-name

---
 .../kompute/default.nix => by-name/ko/kompute/package.nix}    | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{development/libraries/kompute/default.nix => by-name/ko/kompute/package.nix} (98%)

diff --git a/pkgs/development/libraries/kompute/default.nix b/pkgs/by-name/ko/kompute/package.nix
similarity index 98%
rename from pkgs/development/libraries/kompute/default.nix
rename to pkgs/by-name/ko/kompute/package.nix
index 61da508306c6..a0598a632626 100644
--- a/pkgs/development/libraries/kompute/default.nix
+++ b/pkgs/by-name/ko/kompute/package.nix
@@ -6,7 +6,7 @@
   cmake,
   vulkan-headers,
   vulkan-loader,
-  fmt,
+  fmt_10,
   spdlog,
   glslang,
   ninja,
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     ninja
   ];
   buildInputs = [
-    fmt
+    fmt_10
     spdlog
   ];
   propagatedBuildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a8a6d24204b..f1fdc283adb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15410,10 +15410,6 @@ with pkgs;
 
   kmonad = haskellPackages.kmonad.bin;
 
-  kompute = callPackage ../development/libraries/kompute {
-    fmt = fmt_10;
-  };
-
   # In general we only want keep the last three minor versions around that
   # correspond to the last three supported kubernetes versions:
   # https://kubernetes.io/docs/setup/release/version-skew-policy/#supported-versions

From 45f455bccdd64c5b7d8b4739bdadab875e7dd8e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 09:11:19 +0000
Subject: [PATCH 2363/3724] phpExtensions.zstd: 0.15.0 -> 0.15.1

---
 pkgs/development/php-packages/zstd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/zstd/default.nix b/pkgs/development/php-packages/zstd/default.nix
index 6924d8e1a974..9774808cf1be 100644
--- a/pkgs/development/php-packages/zstd/default.nix
+++ b/pkgs/development/php-packages/zstd/default.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "0.15.0";
+  version = "0.15.1";
 in
 buildPecl {
   inherit version;
@@ -17,7 +17,7 @@ buildPecl {
     owner = "kjdev";
     repo = "php-ext-zstd";
     rev = version;
-    hash = "sha256-7Ok0Ej5U7N77Y/vXpgIp1diVSFgB9wXXGDQsKmvGxY8=";
+    hash = "sha256-Gf9/A4SmeiPGtUcTXoIU1sOzVRqIIpLAbD1QdTmBaHQ=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 959816531b39b539c9ef3d2691fcfa15cf2bf6c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 09:15:09 +0000
Subject: [PATCH 2364/3724] terraform-providers.azurerm: 4.39.0 -> 4.40.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 84b977357eef..15983085b044 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -153,11 +153,11 @@
     "vendorHash": null
   },
   "azurerm": {
-    "hash": "sha256-YbnWigxznOZtY/lElLo/SEXnF3LPm6QKflnBoJ1B1Wo=",
+    "hash": "sha256-gwodjIFYg6BTIz3ORzWD6tUn2QXwXMN1KC5mMvxyjdE=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
     "owner": "hashicorp",
     "repo": "terraform-provider-azurerm",
-    "rev": "v4.39.0",
+    "rev": "v4.40.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 653226bb50b7d6e19832eb483c7f8efdef1f22cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 19:44:33 +0000
Subject: [PATCH 2365/3724] docstrfmt: 1.10.0 -> 1.11.0

---
 pkgs/by-name/do/docstrfmt/package.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/do/docstrfmt/package.nix b/pkgs/by-name/do/docstrfmt/package.nix
index 2fcfdbc28169..6079d3367db0 100644
--- a/pkgs/by-name/do/docstrfmt/package.nix
+++ b/pkgs/by-name/do/docstrfmt/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "docstrfmt";
-  version = "1.10.0";
+  version = "1.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "LilSpazJoekp";
     repo = "docstrfmt";
     tag = "v${version}";
-    hash = "sha256-L7zz9FJRSiBWthME0zsUWHxeA+zVuxQpkyEVbNSSEQs=";
+    hash = "sha256-5Yx+omXZSlpJSzA4dTY/JdfmHQshM7qI++OVvqYg1jc=";
   };
 
   build-system = [
@@ -31,11 +31,6 @@ python3.pkgs.buildPythonApplication rec {
     toml
   ];
 
-  pythonRelaxDeps = [
-    "black"
-    "docutils"
-  ];
-
   nativeCheckInputs = with python3.pkgs; [
     pytestCheckHook
     pytest-aiohttp

From 70714fb9b8741810090afe8366295d436a844c24 Mon Sep 17 00:00:00 2001
From: Anton Tetov <anton@tetov.se>
Date: Fri, 8 Aug 2025 11:22:22 +0200
Subject: [PATCH 2366/3724] openvdb: 12.0.1 -> 12.1.0

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

diff --git a/pkgs/by-name/op/openvdb/package.nix b/pkgs/by-name/op/openvdb/package.nix
index 9bb28c284df6..68e58f3d4990 100644
--- a/pkgs/by-name/op/openvdb/package.nix
+++ b/pkgs/by-name/op/openvdb/package.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   pname = "openvdb";
-  version = "12.0.1";
+  version = "12.1.0";
 
   outputs = [
     "out"
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     owner = "AcademySoftwareFoundation";
     repo = "openvdb";
     tag = "v${version}";
-    hash = "sha256-ofVhwULBDzjA+bfhkW12tgTMnFB/Mku2P2jDm74rutY=";
+    hash = "sha256-28vrIlruPl1tvw2JhjIAARtord45hqCqnA9UNnu4Z70=";
   };
 
   nativeBuildInputs = [ cmake ];

From 6c474a271b343851212ec371271118a135bdff33 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Thu, 21 Aug 2025 11:35:30 +0200
Subject: [PATCH 2367/3724] ungoogled-chromium: 139.0.7258.127-1 ->
 139.0.7258.138-1

https://chromereleases.googleblog.com/2025/08/stable-channel-update-for-desktop_19.html

This update includes 1 security fix.

CVEs:
CVE-2025-9132
---
 .../networking/browsers/chromium/info.json    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index ade268080de3..c7e26d4620ab 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -802,7 +802,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "139.0.7258.127",
+    "version": "139.0.7258.138",
     "deps": {
       "depot_tools": {
         "rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
@@ -813,16 +813,16 @@
         "hash": "sha256-m+z10s40Q/iYcoMw3o/+tmhIdqHMsYJjdGabHrK/aqo="
       },
       "ungoogled-patches": {
-        "rev": "139.0.7258.127-1",
-        "hash": "sha256-CdzvDG4ZGRHVnRsLUDD8gWLzcwJJAqEZdEraqVYgs2U="
+        "rev": "139.0.7258.138-1",
+        "hash": "sha256-dmkUQHG9E0owKBIZi/e0mC5lc07rmU1muzP63PLdtTs="
       },
       "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "5dc2cf9cf870d324cd9fba708f26d2572cc6d4d8",
-        "hash": "sha256-YcOVErOKKruc3kPuXhmeibo3KL+Rrny1FEwF769+aEU=",
+        "rev": "884e54ea8d42947ed636779015c5b4815e069838",
+        "hash": "sha256-MCBHB1ms3H8AXqiIDHH7C+8/NDcgsn3pDx7mKtGdfbc=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -897,8 +897,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "5f3636345f1d8afd495e2fcc474fd81e91c4866b",
-        "hash": "sha256-fx+QD0T85Js9jPQx2aghJU8UOL6WbR0bOkGY2i87A3w="
+        "rev": "96492b317e27ba4106ed00f5faa4534cfeaa0b8f",
+        "hash": "sha256-TE8vYLNnAzVkGQZ2ZYuNHnu8fwp2Qv4ANP0btgrKYSQ="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -1432,8 +1432,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "2d6f1aa4be9c33b013c322b2bc9cd99a682243b6",
-        "hash": "sha256-VysJkpCRRYNdCStnXvo6wyMCv1gLHecMwefKiwypARc="
+        "rev": "4abe0638e35d34b6fdb70f1f5ce0f0e1879a021e",
+        "hash": "sha256-hy06/Sy+rEzNyFv9R2Kg9kX7XIpCbQwCr5VjEH9CtKM="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1597,8 +1597,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "505ec917b67c535519bebec58c62a34f145dd49f",
-        "hash": "sha256-fsf8j2Spe++vSnuO8763eWWmMhYqcyybpILb7OkkXq4="
+        "rev": "4d36678284f92d381f411c7947588d7a09989ca4",
+        "hash": "sha256-X5k2R7/sS3/C2S5hC1ILSquWjnPol3Pk+xe1suzgnFs="
       }
     }
   }

From 9766aa10fbfadc545f79387ba4b2606a2822c93f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 10:23:26 +0000
Subject: [PATCH 2368/3724] feishu: 7.46.11 -> 7.46.12

---
 pkgs/by-name/fe/feishu/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix
index 5d572402d2e6..e8a862df4675 100644
--- a/pkgs/by-name/fe/feishu/package.nix
+++ b/pkgs/by-name/fe/feishu/package.nix
@@ -65,12 +65,12 @@
 let
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/fc10b1c0/Feishu-linux_x64-7.46.11.deb";
-      sha256 = "sha256-xcTSyRoRGlXn++KRmXtqNBI6diY00v0UUZe3RxCewFk=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/72e0cee3/Feishu-linux_x64-7.46.12.deb";
+      sha256 = "sha256-qdaWx4vQQWJtEX+3xo6oGp82sblsWb1jB96w8djc7wM=";
     };
     aarch64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/ccc36dfd/Feishu-linux_arm64-7.46.11.deb";
-      sha256 = "sha256-pOA1WAhkIFn4H9sZye6ges2U5DvDDmLAOllD5qAklmg=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/ea20b00e/Feishu-linux_arm64-7.46.12.deb";
+      sha256 = "sha256-zh65+v9JWRv631hQDSnKwH1C8I35ddRpq8kcnhRe4wo=";
     };
   };
 
@@ -133,7 +133,7 @@ let
   ];
 in
 stdenv.mkDerivation {
-  version = "7.46.11";
+  version = "7.46.12";
   pname = "feishu";
 
   src =

From 339c0bf1c6124177bf0b60fe238fc257271df855 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 10:30:56 +0000
Subject: [PATCH 2369/3724] parca-agent: 0.40.2 -> 0.41.0

---
 pkgs/by-name/pa/parca-agent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix
index c6446e3a09aa..87c313b2fb9b 100644
--- a/pkgs/by-name/pa/parca-agent/package.nix
+++ b/pkgs/by-name/pa/parca-agent/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "parca-agent";
-  version = "0.40.2";
+  version = "0.41.0";
 
   src = fetchFromGitHub {
     owner = "parca-dev";
     repo = "parca-agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xGqHnnaRViD2HcTjOJoq/GYyw702BCY5hTIkbJm6HjQ=";
+    hash = "sha256-lWAdi6bgXZ5w68fZpAEUmWvbKmAdz9n92q80gzj21s8=";
     fetchSubmodules = true;
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-prZzLsLbxCCBNQDy4NEwGMcXRM2MFy7D46Kd37dL5bQ=";
+  vendorHash = "sha256-//a6hjQ+pqhNsuj76gqsJ7QKkbyktfY780i5Rmax7Ls=";
 
   buildInputs = [
     stdenv.cc.libc.static

From 21eeadfdd966e66aba522267b3fd4ad88d23527b Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Thu, 21 Aug 2025 06:33:31 -0400
Subject: [PATCH 2370/3724] trezor-suite: 25.7.4 -> 25.8.2

---
 pkgs/by-name/tr/trezor-suite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix
index a74bcb96223e..de362986aa18 100644
--- a/pkgs/by-name/tr/trezor-suite/package.nix
+++ b/pkgs/by-name/tr/trezor-suite/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "trezor-suite";
-  version = "25.7.4";
+  version = "25.8.2";
 
   suffix =
     {
@@ -24,8 +24,8 @@ let
     hash =
       {
         # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
-        aarch64-linux = "sha512-7QkyyeCDEEvNbH5qU+oS7ACLgE3lbXLJfeFeyofnfUdNOg68PJKM7ptQms0G/NN4xM0ME6trzbUucQI8QUfo4Q==";
-        x86_64-linux = "sha512-MOi/lTxPnMajP06lyfNKBuUTFWzHE61kitowfYryXVhomO3ww7eC5mE5pYzHRIbH7TE+kZm5eUL1hGO2JElPRw==";
+        aarch64-linux = "sha512-bVLTYCT8jkjeJMHWPvzFVkGB69Z46nvebtEDh5HfqYgd3Xwov+s1BHlr82XjN4+0cdKJchXnyKVTShO32+at5A==";
+        x86_64-linux = "sha512-wtMTW2Wj6dPsgUupXsHuP2/RS3Yp10bcCjkBfVIDfLrlClKFDHRLt9mNGtSdFfZM791NyDWsjU4xdi082BduSw==";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From 393ea6294057bf7b78b31d1d7455f9338d2e3bba Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 21 Aug 2025 11:34:10 +0100
Subject: [PATCH 2371/3724] p2pool: 4.9 -> 4.9.1

Diff: https://github.com/SChernykh/p2pool/compare/v4.9...v4.9.1
---
 pkgs/by-name/p2/p2pool/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix
index 05101533cef1..2eb8266ac226 100644
--- a/pkgs/by-name/p2/p2pool/package.nix
+++ b/pkgs/by-name/p2/p2pool/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "p2pool";
-  version = "4.9";
+  version = "4.9.1";
 
   src = fetchFromGitHub {
     owner = "SChernykh";
     repo = "p2pool";
     rev = "v${version}";
-    hash = "sha256-nFoR5n6vm6Q1UBxX+3U6O6NExcrM1Mab+WjEOgRSKCE=";
+    hash = "sha256-jjY/+ZS7UYecHTQT93WAUZYYc+CZpG4Vbotmsq65un0=";
     fetchSubmodules = true;
   };
 

From 13ce39e2ab2ab5951671026fe9da61bb231e31b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 10:35:27 +0000
Subject: [PATCH 2372/3724] ssdfs-utils: 4.57 -> 4.58

---
 pkgs/by-name/ss/ssdfs-utils/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ss/ssdfs-utils/package.nix b/pkgs/by-name/ss/ssdfs-utils/package.nix
index 9558822ce516..72f21319bf04 100644
--- a/pkgs/by-name/ss/ssdfs-utils/package.nix
+++ b/pkgs/by-name/ss/ssdfs-utils/package.nix
@@ -13,13 +13,13 @@ stdenv.mkDerivation {
   # as ssdfs-utils, not ssdfs-tools.
   pname = "ssdfs-utils";
   # The version is taken from `configure.ac`, there are no tags.
-  version = "4.57";
+  version = "4.58";
 
   src = fetchFromGitHub {
     owner = "dubeyko";
     repo = "ssdfs-tools";
-    rev = "fab40f45663ecd03f32ccf891691798db245bd04";
-    hash = "sha256-9Eha2tqEBykhlF/GUX5nH1jYQlzEW7ou7mUbTL2A2r0=";
+    rev = "39d1ec5dc9f1a7ddc9d578d938a2f983191a93ac";
+    hash = "sha256-IImfXP3RWljTwc69ll+z8NIR7vIxhVE1FFRmuCxYn9E=";
   };
 
   strictDeps = true;

From 3cdf0139ca45397f98c54f960b0e2874b666ad9b Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 21 Aug 2025 11:44:39 +0100
Subject: [PATCH 2373/3724] p2pool: move to finalAttrs pattern

---
 pkgs/by-name/p2/p2pool/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix
index 2eb8266ac226..3c6c145586fa 100644
--- a/pkgs/by-name/p2/p2pool/package.nix
+++ b/pkgs/by-name/p2/p2pool/package.nix
@@ -14,14 +14,14 @@
   zeromq,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "p2pool";
   version = "4.9.1";
 
   src = fetchFromGitHub {
     owner = "SChernykh";
     repo = "p2pool";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-jjY/+ZS7UYecHTQT93WAUZYYc+CZpG4Vbotmsq65un0=";
     fetchSubmodules = true;
   };
@@ -66,4 +66,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})

From a2e17a2f14144acf65d45b47f2c1c37bbfa7a410 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 21 Aug 2025 11:48:37 +0100
Subject: [PATCH 2374/3724] p2pool: reduce usage of `with lib;`

---
 pkgs/by-name/p2/p2pool/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix
index 3c6c145586fa..54ce621c1a58 100644
--- a/pkgs/by-name/p2/p2pool/package.nix
+++ b/pkgs/by-name/p2/p2pool/package.nix
@@ -54,16 +54,16 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Decentralized pool for Monero mining";
     homepage = "https://github.com/SChernykh/p2pool";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       ratsclub
       JacoMalan1
     ];
     mainProgram = "p2pool";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     broken = stdenv.hostPlatform.isDarwin;
   };
 })

From 236708037769206fea8b6dbd32086fd6f539224a Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 21 Aug 2025 11:48:53 +0100
Subject: [PATCH 2375/3724] p2pool: add jk to maintainers

---
 pkgs/by-name/p2/p2pool/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix
index 54ce621c1a58..234466f9006b 100644
--- a/pkgs/by-name/p2/p2pool/package.nix
+++ b/pkgs/by-name/p2/p2pool/package.nix
@@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       ratsclub
       JacoMalan1
+      jk
     ];
     mainProgram = "p2pool";
     platforms = lib.platforms.all;

From aff776b07662ea3861a81cc5c741b4b9965a0bcb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 10:58:38 +0000
Subject: [PATCH 2376/3724] terraform-providers.baiducloud: 1.22.10 -> 1.22.11

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 84b977357eef..e9e1fe932f34 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -171,11 +171,11 @@
     "vendorHash": null
   },
   "baiducloud": {
-    "hash": "sha256-sF+S14e6o66iJj/X0jm8sVRmuEJv9UsmJvcLFTFTpVY=",
+    "hash": "sha256-zKkXfSIVVW0QxQB/fJNowy1mQPfXlv6HFcNaNlBSIvY=",
     "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
     "owner": "baidubce",
     "repo": "terraform-provider-baiducloud",
-    "rev": "v1.22.10",
+    "rev": "v1.22.11",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 369dc8ced2fd36b9321cc48be9d7caa7bbc8bf46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 11:32:36 +0000
Subject: [PATCH 2377/3724] flowblade: 2.22.1 -> 2.22.1.1

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

diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix
index cbb74ef1599f..f1feffd63bcc 100644
--- a/pkgs/by-name/fl/flowblade/package.nix
+++ b/pkgs/by-name/fl/flowblade/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flowblade";
-  version = "2.22.1";
+  version = "2.22.1.1";
 
   src = fetchFromGitHub {
     owner = "jliljebl";
     repo = "flowblade";
     rev = "v${version}";
-    sha256 = "sha256-wHZNzGUQ89aDel5DOGIFG+zjF2yrI/JoIumXcTc+APw=";
+    sha256 = "sha256-I9sh3FCN8zr5TF449rv/Xs8+Sb1xNWBmFcB7aKW3jVQ=";
   };
 
   buildInputs = [

From 82b0aed7bfdc93ef9fecefa9a2ec70cc4a3657ae Mon Sep 17 00:00:00 2001
From: thattemperature <2719023332@qq.com>
Date: Thu, 21 Aug 2025 16:59:36 +0800
Subject: [PATCH 2378/3724] emacsPackages.holo-layer: 0-unstable-2025-06-13 ->
 0-unstable-2025-08-13

---
 .../elisp-packages/manual-packages/holo-layer/package.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix
index 1a71df35daa9..082579c45068 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix
@@ -31,13 +31,13 @@ in
 melpaBuild {
 
   pname = "holo-layer";
-  version = "0-unstable-2025-06-13";
+  version = "0-unstable-2025-08-13";
 
   src = fetchFromGitHub {
     owner = "manateelazycat";
     repo = "holo-layer";
-    rev = "464b6996268a81fa3b524ced02a60fcc266f8965";
-    hash = "sha256-uTxfnhtDybWx+Na4fj5TJuZh+tKoNuSZ03IR9ErvI7s=";
+    rev = "6584d8057a264f199e0cf6e90095fa63d36e6049";
+    hash = "sha256-80uGyQltHBtrEtG/hkhHP5qbBfShw5BDyfR3GUHlhJk=";
   };
 
   packageRequires = [

From c4c33119067979895c9ce484dfe445d1a31aa1df Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Thu, 21 Aug 2025 13:28:51 +0200
Subject: [PATCH 2379/3724] symfony-cli: add completions and adopt

---
 pkgs/by-name/sy/symfony-cli/package.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix
index a50c69b2234f..5ba29eeccb4a 100644
--- a/pkgs/by-name/sy/symfony-cli/package.nix
+++ b/pkgs/by-name/sy/symfony-cli/package.nix
@@ -7,6 +7,7 @@
   symfony-cli,
   nssTools,
   makeBinaryWrapper,
+  installShellFiles,
 }:
 
 buildGoModule (finalAttrs: {
@@ -39,15 +40,22 @@ buildGoModule (finalAttrs: {
 
   buildInputs = [ makeBinaryWrapper ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
   postInstall = ''
     mkdir $out/libexec
     mv $out/bin/symfony-cli $out/libexec/symfony
 
     makeBinaryWrapper $out/libexec/symfony $out/bin/symfony \
       --prefix PATH : ${lib.makeBinPath [ nssTools ]}
+
+    installShellCompletion --cmd symfony \
+      --bash <($out/bin/symfony completion bash) \
+      --fish <($out/bin/symfony completion fish) \
+      --zsh <($out/bin/symfony completion zsh)
   '';
 
-  # Tests requires network access
+  # Tests require network access
   doCheck = false;
 
   passthru = {
@@ -65,6 +73,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/symfony-cli/symfony-cli";
     license = lib.licenses.agpl3Plus;
     mainProgram = "symfony";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ patka ];
   };
 })

From 299490745ebe369fbbd1a753cf0fd2a15869cedf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 11:54:10 +0000
Subject: [PATCH 2380/3724] heynote: 2.4.0 -> 2.5.0

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

diff --git a/pkgs/by-name/he/heynote/package.nix b/pkgs/by-name/he/heynote/package.nix
index e9567ad03a8e..4662e2647716 100644
--- a/pkgs/by-name/he/heynote/package.nix
+++ b/pkgs/by-name/he/heynote/package.nix
@@ -7,11 +7,11 @@
 }:
 let
   pname = "heynote";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchurl {
     url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage";
-    sha256 = "sha256-FWd2nKl722aqU1rtOKhCvtHxV0ahaIEQkfRO2NwtaVk=";
+    sha256 = "sha256-01GWQxauMKwqEp3kbegCwn2lpsobtRjO+6I90wiH9wU=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 4ca39ab5133ae62db8339d9aa688feb5c953d72f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 21 Aug 2025 13:55:20 +0200
Subject: [PATCH 2381/3724] woodpecker-server: 3.8.0 -> 3.9.0

Changelog: https://github.com/woodpecker-ci/woodpecker/releases/tag/v3.9.0
---
 .../tools/continuous-integration/woodpecker/common.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
index 9494ff61a362..036e7283cd1c 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 let
-  version = "3.8.0";
-  srcHash = "sha256-vU8lyWnXU2KnayZ863MMTMOc1/AkQ6p+uNiJOFqDNJk=";
+  version = "3.9.0";
+  srcHash = "sha256-Ymg6nJr83jt2EAv/p1B1wmZv3jvpx/3xRVRii3S1cNU=";
   # The tarball contains vendored dependencies
   vendorHash = null;
 in

From d6f6026438ac82ee4a700620d31ff1f37a745b28 Mon Sep 17 00:00:00 2001
From: qwqawawow <eihqnh@outlook.com>
Date: Thu, 21 Aug 2025 20:18:06 +0800
Subject: [PATCH 2382/3724] maintainers: qwqawawow -> eihqnh; treewide: rename
 qwqawawow to eihqnh

---
 maintainers/maintainer-list.nix                      | 12 ++++++------
 pkgs/by-name/ca/cabinpkg/package.nix                 |  2 +-
 pkgs/by-name/ca/cargo-seek/package.nix               |  2 +-
 pkgs/by-name/po/podlet/package.nix                   |  2 +-
 .../python-modules/terminaltexteffects/default.nix   |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b1cae7ea481a..8238623f19d9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7274,6 +7274,12 @@
     github = "eigengrau";
     githubId = 4939947;
   };
+  eihqnh = {
+    email = "eihqnh@outlook.com";
+    github = "eihqnh";
+    githubId = 40905037;
+    name = "eihqnh";
+  };
   eikek = {
     email = "eike.kettner@posteo.de";
     github = "eikek";
@@ -20957,12 +20963,6 @@
     githubId = 2141853;
     name = "Bang Lee";
   };
-  qwqawawow = {
-    email = "eihqnh@outlook.com";
-    github = "qwqawawow";
-    githubId = 40905037;
-    name = "qwqawawow";
-  };
   qxrein = {
     email = "mnv07@proton.me";
     github = "qxrein";
diff --git a/pkgs/by-name/ca/cabinpkg/package.nix b/pkgs/by-name/ca/cabinpkg/package.nix
index a4604868d6f5..31d35851dcf8 100644
--- a/pkgs/by-name/ca/cabinpkg/package.nix
+++ b/pkgs/by-name/ca/cabinpkg/package.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     homepage = "https://cabinpkg.com";
     description = "Package manager and build system for C++";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.qwqawawow ];
+    maintainers = [ lib.maintainers.eihqnh ];
     platforms = lib.platforms.unix;
     mainProgram = "cabin";
   };
diff --git a/pkgs/by-name/ca/cargo-seek/package.nix b/pkgs/by-name/ca/cargo-seek/package.nix
index 8d665635f2ea..cc44c9330682 100644
--- a/pkgs/by-name/ca/cargo-seek/package.nix
+++ b/pkgs/by-name/ca/cargo-seek/package.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/tareqimbasher/cargo-seek";
     changelog = "https://github.com/tareqimbasher/cargo-seek/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ qwqawawow ];
+    maintainers = with lib.maintainers; [ eihqnh ];
     mainProgram = "cargo-seek";
   };
 })
diff --git a/pkgs/by-name/po/podlet/package.nix b/pkgs/by-name/po/podlet/package.nix
index 5369aaf28c3d..c55a43ae0f60 100644
--- a/pkgs/by-name/po/podlet/package.nix
+++ b/pkgs/by-name/po/podlet/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/containers/podlet";
     changelog = "https://github.com/containers/podlet/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ qwqawawow ];
+    maintainers = with lib.maintainers; [ eihqnh ];
     mainProgram = "podlet";
   };
 }
diff --git a/pkgs/development/python-modules/terminaltexteffects/default.nix b/pkgs/development/python-modules/terminaltexteffects/default.nix
index e8eef5a72790..48700f6825e0 100644
--- a/pkgs/development/python-modules/terminaltexteffects/default.nix
+++ b/pkgs/development/python-modules/terminaltexteffects/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     changelog = "https://chrisbuilds.github.io/terminaltexteffects/changeblog/";
     license = licenses.mit;
     platforms = with platforms; unix;
-    maintainers = with maintainers; [ qwqawawow ];
+    maintainers = with maintainers; [ eihqnh ];
     mainProgram = "tte";
   };
 }

From 30ba49942104a8e9b791f6f7ede53e551c8d066b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 21 Aug 2025 12:26:49 +0200
Subject: [PATCH 2383/3724] jetty_12: 12.0.23 -> 12.0.25

Fixes CVE-2025-5115 / https://github.com/jetty/jetty.project/security/advisories/GHSA-mmxm-8w33-wc4h

Changes:
https://github.com/jetty/jetty.project/releases/tag/jetty-12.0.25
https://github.com/jetty/jetty.project/releases/tag/jetty-12.0.24
---
 pkgs/servers/http/jetty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 171fd6943e59..708a5f6c712d 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -57,7 +57,7 @@ in
   };
 
   jetty_12 = common {
-    version = "12.0.23";
-    hash = "sha256-oY6IU59ir52eM4qO2arOLErN4CEUCT0iRM4I9ip+m3I=";
+    version = "12.0.25";
+    hash = "sha256-rbLCP0EPPipaNMPtyelLIoK7RMHAZ9I6neV6BpGacWc=";
   };
 }

From 5fd390d2ffc779ca3e22b316234986a06ef474a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 12:29:46 +0000
Subject: [PATCH 2384/3724] vivaldi: 7.5.3735.58 -> 7.5.3735.64

---
 pkgs/by-name/vi/vivaldi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index 7574a27ce328..a1c942d6bda0 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -66,7 +66,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "7.5.3735.58";
+  version = "7.5.3735.64";
 
   suffix =
     {
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-/S1vN8JakjRuB8s9SrDfA8wTwKu1tSs/+g7IoYglSmg=";
-        x86_64-linux = "sha256-5dNdJuApccRQDiZOF2+a8sTqJJLIGLpUPevPVx7Fyfw=";
+        aarch64-linux = "sha256-qcgbzxJiyIWVTFbhJYd4SrlK6ybjXuTG09LowoDP0LE=";
+        x86_64-linux = "sha256-cIVQiow/m2EMok1COeyo9v/1HCKStTnDt/StldXk/oo=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From f8acee5a749f4884599bdc71587155c7155f429c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 12:30:30 +0000
Subject: [PATCH 2385/3724] python3Packages.oci: 2.158.0 -> 2.158.2

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

diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix
index 10b816f8ba7d..8a2975e72ebf 100644
--- a/pkgs/development/python-modules/oci/default.nix
+++ b/pkgs/development/python-modules/oci/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "oci";
-  version = "2.158.0";
+  version = "2.158.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "oci-python-sdk";
     tag = "v${version}";
-    hash = "sha256-Xl2LMhIxYoytnrGuGYveCIGGFFJ3Yy4B9YKzrfBKHc4=";
+    hash = "sha256-ofZAfPqT+hApELG4dcCJj246PT6XWy5W2C4u2gGazwY=";
   };
 
   pythonRelaxDeps = [

From 6fa9fc1e47de0f7f69198060dbcfbaf6affde118 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 21 Aug 2025 12:28:38 +0000
Subject: [PATCH 2386/3724] linuxPackages.rtl8821ce: 0-unstable-2025-05-31 ->
 0-unstable-2025-08-20

Diff: https://github.com/tomaspinho/rtl8821ce/compare/66c015af7738039a2045b6da755875e126d3fe73...5df613d114d1ca6072aeaf9f64666029896eed61
---
 pkgs/os-specific/linux/rtl8821ce/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix
index 77414c1a71ce..d3bd7772888a 100644
--- a/pkgs/os-specific/linux/rtl8821ce/default.nix
+++ b/pkgs/os-specific/linux/rtl8821ce/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rtl8821ce";
-  version = "0-unstable-2025-05-31";
+  version = "0-unstable-2025-08-20";
 
   src = fetchFromGitHub {
     owner = "tomaspinho";
     repo = "rtl8821ce";
-    rev = "66c015af7738039a2045b6da755875e126d3fe73";
-    hash = "sha256-JU8ge2QpoR6nJe5G93iTEP7WOU6tLb4NJ1QrkEYUXRA=";
+    rev = "5df613d114d1ca6072aeaf9f64666029896eed61";
+    hash = "sha256-JEaMfpu2F9Pcg7aLwKEUnRMMqC0Y0r1WRmHMCRba280=";
   };
 
   hardeningDisable = [ "pic" ];
@@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ defelo ];
     broken =
       stdenv.hostPlatform.isAarch64
-      || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened)
-      || kernel.kernelAtLeast "6.16";
+      || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened);
   };
 })

From 65190e251337b2cc02311a9ddbb2cd83d7b47777 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 22:34:37 +0200
Subject: [PATCH 2387/3724] uutils-diffutils: add defelo as maintainer

---
 pkgs/by-name/uu/uutils-diffutils/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/uu/uutils-diffutils/package.nix b/pkgs/by-name/uu/uutils-diffutils/package.nix
index 7ec5565d7ad9..f5dbfa5d0270 100644
--- a/pkgs/by-name/uu/uutils-diffutils/package.nix
+++ b/pkgs/by-name/uu/uutils-diffutils/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/uutils/diffutils";
     license = lib.licenses.mit;
     mainProgram = "diffutils";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ defelo ];
     platforms = lib.platforms.unix;
   };
 })

From c896cb75afa0c89c4c1f7f218d05c0db402584b7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 21 Aug 2025 15:36:46 +0300
Subject: [PATCH 2388/3724] kdePackages.kwin: backport patch recommended by
 upstream

---
 pkgs/kde/plasma/kwin/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix
index a7aef2545865..9bd9686130bb 100644
--- a/pkgs/kde/plasma/kwin/default.nix
+++ b/pkgs/kde/plasma/kwin/default.nix
@@ -1,4 +1,5 @@
 {
+  fetchpatch,
   mkKdeDerivation,
   pkg-config,
   qtquick3d,
@@ -25,6 +26,14 @@ mkKdeDerivation {
     ./0003-plugins-qpa-allow-using-nixos-wrapper.patch
     ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
     ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
+
+    # Backport fix for very annoying flickering on AMD GPUs
+    # when animating brightness changes.
+    # FIXME: remove in 6.4.5
+    (fetchpatch {
+      url = "https://invent.kde.org/plasma/kwin/-/commit/7d36003cb073ed2ad48b2743883db993106c347a.patch";
+      hash = "sha256-x+GVRU1CIne1TsGJsk2+JbWJi/wuDOFiABXuqgDD9bs=";
+    })
   ];
 
   postPatch = ''

From b3084c75ebb73dd5573ca01efd529a0fa0b9c637 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 12:38:16 +0000
Subject: [PATCH 2389/3724] gyroflow: 1.6.1 -> 1.6.2

---
 pkgs/by-name/gy/gyroflow/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gy/gyroflow/package.nix b/pkgs/by-name/gy/gyroflow/package.nix
index d7088b17f9e3..50a620a1993c 100644
--- a/pkgs/by-name/gy/gyroflow/package.nix
+++ b/pkgs/by-name/gy/gyroflow/package.nix
@@ -25,16 +25,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "gyroflow";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "gyroflow";
     repo = "gyroflow";
     tag = "v${version}";
-    hash = "sha256-RYTT62u39g4n9++xMlhJala6U0uIn+btGOxp9khEAnU=";
+    hash = "sha256-4RsK7VpMXaiLcwm5o/YAmLFuf8XGXkpSlogUhopJMZE=";
   };
 
-  cargoHash = "sha256-30XSltaw1jzXPpobh0WJ+aIRbdf24nYgnbt7yzuS2gs=";
+  cargoHash = "sha256-PiAT6AwC/P3AXKZkwvrEHpTJCQPie1tTE44OqSpgT5M=";
 
   nativeBuildInputs = [
     clang

From 6f13bd2310495338266f67d12ba35787c220ec04 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 21 Aug 2025 14:49:03 +0200
Subject: [PATCH 2390/3724] python3Packages.pysnooper: fix src, use pep517
 builder

---
 .../python-modules/pysnooper/default.nix      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix
index e9f9e7e86232..8f313fa16b81 100644
--- a/pkgs/development/python-modules/pysnooper/default.nix
+++ b/pkgs/development/python-modules/pysnooper/default.nix
@@ -1,24 +1,25 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pysnooper";
   version = "1.2.3";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit version;
-    pname = "PySnooper";
-    hash = "sha256-H6FCVESnr0UQiq7YYLXKi2KyW7olsLA3wFm6NT2PHnQ=";
+  src = fetchFromGitHub {
+    owner = "cool-RR";
+    repo = "PySnooper";
+    tag = version;
+    hash = "sha256-+Cjqi0xkWO4QVAZymmcper4dal9pNWbpPgPY4UzbXfA=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "pysnooper" ];

From 81d61e524fa1ad476975f530b9611d4d56c6bc37 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 21 Aug 2025 14:56:35 +0200
Subject: [PATCH 2391/3724] python3Packages.allure-pytest: fix src

---
 .../python-modules/allure-pytest/default.nix  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/allure-pytest/default.nix b/pkgs/development/python-modules/allure-pytest/default.nix
index 6eaec2b6e5ad..4d6173f56c2c 100644
--- a/pkgs/development/python-modules/allure-pytest/default.nix
+++ b/pkgs/development/python-modules/allure-pytest/default.nix
@@ -2,9 +2,8 @@
   lib,
   allure-python-commons,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytest,
-  pythonOlder,
   setuptools-scm,
 }:
 
@@ -13,18 +12,20 @@ buildPythonPackage rec {
   version = "2.15.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-uPRk07/rbLXmp35w6s0ao3YhM2d8q+zlegfJ87zUseg=";
+  src = fetchFromGitHub {
+    owner = "allure-framework";
+    repo = "allure-python";
+    tag = version;
+    hash = "sha256-I3Zh9frOplcPqLd8b4peNM9WtbNmQjHX6ocVJJwPzyc=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  sourceRoot = "${src.name}/allure-pytest";
+
+  build-system = [ setuptools-scm ];
 
   buildInputs = [ pytest ];
 
-  propagatedBuildInputs = [ allure-python-commons ];
+  dependencies = [ allure-python-commons ];
 
   # Tests were moved to the meta package
   doCheck = false;

From b0cc7ce96f7103858a8d436ed76a4649f35045a4 Mon Sep 17 00:00:00 2001
From: Thore Sommer <thore.sommer@tum.de>
Date: Thu, 21 Aug 2025 14:48:31 +0200
Subject: [PATCH 2392/3724] spdk: 24.09 -> 25.05

Diff: https://github.com/spdk/spdk/compare/v24.09...v25.05
---
 pkgs/by-name/sp/spdk/package.nix | 64 ++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/sp/spdk/package.nix b/pkgs/by-name/sp/spdk/package.nix
index 0e097563dd9c..83fc98dbe95d 100644
--- a/pkgs/by-name/sp/spdk/package.nix
+++ b/pkgs/by-name/sp/spdk/package.nix
@@ -18,27 +18,42 @@
   libpcap,
   libnl,
   elfutils,
+  fetchurl,
   jansson,
   ensureNewerSourcesForZipFilesHook,
+  runtimeShell,
 }:
 
+let
+
+  # downgrade dpdk because spdk refuses newer versions at runtime
+  # url: https://github.com/spdk/spdk/blob/3e3577a090ed9a084b5909aadcc8bc5fe93c0017/lib/env_dpdk/pci_dpdk.c#L77
+  dpdk' = dpdk.overrideAttrs (oldAttrs: rec {
+    version = "25.03";
+    src = fetchurl {
+      url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
+      sha256 = "sha256-akCnMTKChuvXloWxj/pZkua3cME4Q9Zf0NEVfPzP9j0=";
+    };
+  });
+
+in
 stdenv.mkDerivation rec {
   pname = "spdk";
 
-  version = "24.09";
+  version = "25.05";
 
   src = fetchFromGitHub {
     owner = "spdk";
     repo = "spdk";
     tag = "v${version}";
-    hash = "sha256-27mbIycenOk51PLQrAfU1cZcjiWddNtxoyC6Q9wxqFg=";
+    hash = "sha256-Js78FLkLN4GpJlgO+h4jIiEdThciBugbLTB6elFi2TI=";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
     python3
     python3.pkgs.pip
-    python3.pkgs.setuptools
+    python3.pkgs.hatchling
     python3.pkgs.wheel
     python3.pkgs.wrapPython
     pkg-config
@@ -47,7 +62,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     cunit
-    dpdk
+    dpdk'
     fuse3
     jansson
     libaio
@@ -69,17 +84,38 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs .
-
-    # can be removed again with next release, check is already in master
-    substituteInPlace module/scheduler/dpdk_governor/dpdk_governor.c \
-      --replace-fail "<rte_power.h>" " <rte_power_cpufreq.h>"
+    # Override pip install command to use hatchling directly without downloading dependencies
+    substituteInPlace python/Makefile \
+      --replace-fail "setup_cmd = pip install --prefix=\$(CONFIG_PREFIX)" \
+                     "setup_cmd = python3 -m pip install --no-deps --no-build-isolation --prefix=\$(CONFIG_PREFIX)"
   '';
 
   enableParallelBuilding = true;
 
   configureFlags = [
-    "--with-dpdk=${dpdk}"
-  ];
+    "--with-dpdk=${dpdk'}"
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isStatic) "--with-shared";
+
+  # spdk does shenanigans with patchelf, so we need to stop them from messing with rpath
+  preInstall = ''
+    patchelf() { true; }
+    export -f patchelf
+  '';
+
+  postInstall = ''
+    unset patchelf
+
+    # SPDK scripts assume that they can read the includes also relative to the scripts.
+    # Therefore we are not copying them into $out/share.
+    mkdir $out/scripts
+    cp  ./scripts/common.sh ./scripts/setup.sh $out/scripts
+    cat > $out/bin/spdk-setup << EOF
+    #!${runtimeShell}
+    exec $out/scripts/setup.sh "\$@"
+    EOF
+    chmod +x  $out/bin/spdk-setup
+  '';
 
   postCheck = ''
     python3 -m spdk
@@ -87,11 +123,15 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapPythonPrograms
+    ${lib.optionalString (!stdenv.hostPlatform.isStatic) ''
+      # .pc files are not working properly with static linking and might just confuse other build systems
+      rm $out/lib/*.a
+    ''}
   '';
 
   env.NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile.
-  # otherwise does not find strncpy when compiling
-  env.NIX_LDFLAGS = "-lbsd";
+
+  passthru.dpdk = dpdk';
 
   meta = with lib; {
     description = "Set of libraries for fast user-mode storage";

From 4f0be13f002f0a6ee90e20949d9f42d0b57fa73b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 21 Aug 2025 15:01:25 +0200
Subject: [PATCH 2393/3724] python3Packages.opencensus-ext-azure: fix src

---
 .../python-modules/opencensus-ext-azure/default.nix  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/opencensus-ext-azure/default.nix b/pkgs/development/python-modules/opencensus-ext-azure/default.nix
index 07dab62b2ec9..63d751a13194 100644
--- a/pkgs/development/python-modules/opencensus-ext-azure/default.nix
+++ b/pkgs/development/python-modules/opencensus-ext-azure/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   azure-core,
   azure-identity,
   opencensus,
@@ -15,11 +15,15 @@ buildPythonPackage rec {
   version = "1.1.15";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-jRCK8Vh16jxSI4ZG+6kkw7qfv6rx/Q01BwfcW3iArec=";
+  src = fetchFromGitHub {
+    owner = "census-instrumentation";
+    repo = "opencensus-python";
+    tag = "opencensus-ext-azure@${version}";
+    hash = "sha256-fnqflSyNnkEy9XYoirk4iDZI1zYTRMbrYMyQ/4ge3Rs=";
   };
 
+  sourceRoot = "${src.name}/contrib/opencensus-ext-azure";
+
   build-system = [ setuptools ];
 
   dependencies = [

From 3dbc5082d35e06a49407ac42c9f994d861d8ae12 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 21 Aug 2025 15:01:15 +0200
Subject: [PATCH 2394/3724] models-dev: 0-unstable-2025-08-15 ->
 0-unstable-2025-08-21

- Added `--production` flag to disable installing dev dependencies
---
 pkgs/by-name/mo/models-dev/package.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 78151af5cc2b..01ca64b30fcf 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -9,20 +9,20 @@
 
 let
   models-dev-node-modules-hash = {
-    "aarch64-darwin" = "sha256-VkqxZF2LkNBoIkbQGz98O+y7LgLqQ+FofV2WyMOOUEs=";
-    "aarch64-linux" = "sha256-P7Dik1bXWdipzs4orPff53bDwEXYFHSC05RV789mrTI=";
-    "x86_64-darwin" = "sha256-/VdwzrV+srDrexvXHLKtN2Od24XlXVDWu6pEk1zLtjM=";
-    "x86_64-linux" = "sha256-hMiCOMskK9kwGKaixsvodUVsOuuageiUAwxp/AvzR44=";
+    "aarch64-darwin" = "sha256-IM88XPfttZouN2DEtnWJmbdRxBs8wN7AZ1T28INJlBY=";
+    "aarch64-linux" = "sha256-brjdEEYBJ1R5pIkIHyOOmVieTJ0yUJEgxs7MtbzcKXo=";
+    "x86_64-darwin" = "sha256-aGUWZwySmo0ojOBF/PioZ2wp4NRwYyoaJuytzeGYjck=";
+    "x86_64-linux" = "sha256-Uajwvce9EO1UwmpkGrViOrxlm2R/VnnMK8WAiOiQOhY=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-08-15";
+  version = "0-unstable-2025-08-21";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "f42ddd35b77a47bf11078096871a25a13d46a596";
-    hash = "sha256-OomKQ61KvOMxQ2InwFLIZqoyQ8bMV0S0nx67gREt97g=";
+    rev = "7d417bd1b54bfff3c63f2bc2cc486e6b2700a18d";
+    hash = "sha256-9p+Fc21slH0R7YLJOAlVPS+ZPv+I9j745lGYz6+ln/c=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -49,7 +49,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
        bun install \
          --force \
          --frozen-lockfile \
-         --no-progress
+         --no-progress \
+         --production
 
       runHook postBuild
     '';

From 764af5bdd913669964a277db32dc26ea1ce13d49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 13:11:35 +0000
Subject: [PATCH 2395/3724] pipes-rs: 1.6.3 -> 1.6.4

---
 pkgs/by-name/pi/pipes-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pipes-rs/package.nix b/pkgs/by-name/pi/pipes-rs/package.nix
index 2486c143648a..544b4bc4fc6e 100644
--- a/pkgs/by-name/pi/pipes-rs/package.nix
+++ b/pkgs/by-name/pi/pipes-rs/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pipes-rs";
-  version = "1.6.3";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "lhvy";
     repo = "pipes-rs";
     rev = "v${version}";
-    sha256 = "sha256-NrBmkA7sV1RhfG9KEqQNMR5s0l2u66b7KK0toDjQIps=";
+    sha256 = "sha256-7FdC/VY1ZO4E/qDdeKzsIai8h5ZgMrSr1C+Ny4fYh38=";
   };
 
-  cargoHash = "sha256-0up9S3+NjBV8zsvsyVANvITisMSBXsab6jFwt19gnQk=";
+  cargoHash = "sha256-TIVWl/9xSFsSXD9XzOHBvc/1HvI/radas00p4fZ/AzM=";
 
   doInstallCheck = true;
 

From 56c38669fd4e8a6f0093486ab3617b5f1ec6b181 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 13:12:38 +0000
Subject: [PATCH 2396/3724] filecheck: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/development/python-modules/filecheck/default.nix b/pkgs/development/python-modules/filecheck/default.nix
index c815fc4e6243..f579cb0bf89f 100644
--- a/pkgs/development/python-modules/filecheck/default.nix
+++ b/pkgs/development/python-modules/filecheck/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "filecheck";
-  version = "1.0.2";
+  version = "1.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "AntonLydike";
     repo = "filecheck";
     tag = "v${version}";
-    hash = "sha256-73HQ8dGp52+SyuwacthCjSQsA5v3LU49sabI066wuwU=";
+    hash = "sha256-oOGQIEPIHL4xQRVKOw+8Z8QSowXlavVnck+IOWA9qd8=";
   };
 
   build-system = [ poetry-core ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "filecheck" ];
 
   meta = with lib; {
-    changelog = "https://github.com/antonlydike/filecheck/releases/tag/v${version}";
+    changelog = "https://github.com/antonlydike/filecheck/releases/tag/${src.tag}";
     homepage = "https://github.com/antonlydike/filecheck";
     license = licenses.asl20;
     description = "Python-native clone of LLVMs FileCheck tool";

From 83b245c82954c8aef6d4d58b29c6c1e650748c57 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 21 Aug 2025 15:13:28 +0200
Subject: [PATCH 2397/3724] python3Packages.codepy: fix build

---
 .../python-modules/codepy/default.nix         | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/codepy/default.nix b/pkgs/development/python-modules/codepy/default.nix
index 44121e8a81da..2214fbe4dca8 100644
--- a/pkgs/development/python-modules/codepy/default.nix
+++ b/pkgs/development/python-modules/codepy/default.nix
@@ -2,16 +2,21 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pytools,
-  appdirs,
-  six,
+  hatchling,
   cgen,
+  numpy,
+  platformdirs,
+  pytools,
+  typing-extensions,
+  boost,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "codepy";
   version = "2025.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "inducer";
@@ -20,17 +25,19 @@ buildPythonPackage rec {
     hash = "sha256-PHIC3q9jQlRRoUoemVtyrl5hcZXMX28gRkI5Xpk9yBY=";
   };
 
-  buildInputs = [
-    pytools
-    six
+  build-system = [ hatchling ];
+
+  dependencies = [
     cgen
+    numpy
+    platformdirs
+    pytools
+    typing-extensions
   ];
-  propagatedBuildInputs = [ appdirs ];
 
   pythonImportsCheck = [ "codepy" ];
 
-  # Tests are broken
-  doCheck = false;
+  doCheck = false; # tests require boost setup for ad hoc module compilation
 
   meta = with lib; {
     homepage = "https://github.com/inducer/codepy";

From d6a1de56939bd6bd1190049a6662be1e7fbeee99 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 21 Aug 2025 16:06:07 +0300
Subject: [PATCH 2398/3724] lpac: add meta.changelog attribute

---
 pkgs/by-name/lp/lpac/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/lp/lpac/package.nix b/pkgs/by-name/lp/lpac/package.nix
index 630ba90a31ab..904bb7941ed0 100644
--- a/pkgs/by-name/lp/lpac/package.nix
+++ b/pkgs/by-name/lp/lpac/package.nix
@@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "C-based eUICC LPA";
     homepage = "https://github.com/estkme-group/lpac";
     mainProgram = "lpac";
+    changelog = "https://github.com/estkme-group/lpac/releases/tag/v${finalAttrs.version}";
     license = [ lib.licenses.agpl3Plus ] ++ optional withLibeuicc lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [ sarcasticadmin ];
     platforms = lib.platforms.all;

From 321ef47789534a97cbe21b97fa7be01490cd9599 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 21 Aug 2025 16:03:04 +0300
Subject: [PATCH 2399/3724] lpac: use cmakeBool

---
 pkgs/by-name/lp/lpac/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lp/lpac/package.nix b/pkgs/by-name/lp/lpac/package.nix
index 904bb7941ed0..3b43a5b4c300 100644
--- a/pkgs/by-name/lp/lpac/package.nix
+++ b/pkgs/by-name/lp/lpac/package.nix
@@ -30,9 +30,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [ ./lpac-version.patch ];
 
-  cmakeFlags =
-    optional withDrivers "-DLPAC_DYNAMIC_DRIVERS=on"
-    ++ optional withLibeuicc "-DLPAC_DYNAMIC_LIBEUICC=on";
+  cmakeFlags = [
+    (lib.cmakeBool "LPAC_DYNAMIC_DRIVERS" withDrivers)
+    (lib.cmakeBool "LPAC_DYNAMIC_LIBEUICC" withLibeuicc)
+  ];
 
   nativeBuildInputs = [
     cmake

From d6eeba2a3e981d80824992ccd26eac9863b5f7e1 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 21 Aug 2025 16:04:29 +0300
Subject: [PATCH 2400/3724] lpac: 2.2.1 -> 2.3.0

See changelog at https://github.com/estkme-group/lpac/releases/tag/v2.3.0
---
 pkgs/by-name/lp/lpac/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lp/lpac/package.nix b/pkgs/by-name/lp/lpac/package.nix
index 3b43a5b4c300..4b57a53a441a 100644
--- a/pkgs/by-name/lp/lpac/package.nix
+++ b/pkgs/by-name/lp/lpac/package.nix
@@ -17,13 +17,13 @@ in
 stdenv.mkDerivation (finalAttrs: {
 
   pname = "lpac";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "estkme-group";
     repo = "lpac";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dxoYuX3dNj4piXQBqU4w1ICeyOGid35c+6ZITQiN6wA=";
+    hash = "sha256-ALne5sHB6ff7cHAWe0rFwpP/Yz4EhZBiOrgdM2B8+OE=";
   };
 
   env.LPAC_VERSION = finalAttrs.version;

From ac7a93fb4a4ed9cabb6012c59000bc5218b57c4d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 21 Aug 2025 16:10:10 +0300
Subject: [PATCH 2401/3724] lpac: install docs

Regrettably there's no manpages yet, but USAGE.md and ENVVARS.md are
super useful.
---
 pkgs/by-name/lp/lpac/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/lp/lpac/package.nix b/pkgs/by-name/lp/lpac/package.nix
index 4b57a53a441a..42eeb48f995e 100644
--- a/pkgs/by-name/lp/lpac/package.nix
+++ b/pkgs/by-name/lp/lpac/package.nix
@@ -45,6 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
     pcsclite
   ];
 
+  postInstall = ''
+    mkdir -p $out/share/doc/lpac
+    cp -vr $src/docs/* $out/share/doc/lpac
+  '';
+
   passthru = {
     updateScript = nix-update-script { attrPath = finalAttrs.pname; };
   };

From aba5e04b792772ef1d9ddf8d4b271565ea9baadc Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 21 Aug 2025 16:17:53 +0300
Subject: [PATCH 2402/3724] lpac: support qmi and mbim

With this, I can successfully talk to a 9esim card plugged into a
Quectel EC25 LTE modem, setting PAC_APDU_QMI_DEVICE=/dev/cdc-wdm0 and
LPAC_APDU=qmi.
---
 pkgs/by-name/lp/lpac/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/lp/lpac/package.nix b/pkgs/by-name/lp/lpac/package.nix
index 42eeb48f995e..dec353ca3f32 100644
--- a/pkgs/by-name/lp/lpac/package.nix
+++ b/pkgs/by-name/lp/lpac/package.nix
@@ -6,8 +6,12 @@
   pkg-config,
   pcsclite,
   curl,
+  libmbim,
+  libqmi,
   withDrivers ? true,
   withLibeuicc ? true,
+  withMbim ? true,
+  withQmi ? true,
   nix-update-script,
 }:
 
@@ -33,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "LPAC_DYNAMIC_DRIVERS" withDrivers)
     (lib.cmakeBool "LPAC_DYNAMIC_LIBEUICC" withLibeuicc)
+    (lib.cmakeBool "LPAC_WITH_APDU_MBIM" withMbim)
+    (lib.cmakeBool "LPAC_WITH_APDU_QMI" withQmi)
   ];
 
   nativeBuildInputs = [
@@ -43,7 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     curl
     pcsclite
-  ];
+  ]
+  ++ optional withMbim libmbim
+  ++ optional withQmi libqmi;
 
   postInstall = ''
     mkdir -p $out/share/doc/lpac

From 5e1aa12ff0a06dd40159339142b0034aff4fea68 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 21 Aug 2025 15:32:32 +0200
Subject: [PATCH 2403/3724] python3Packages.jsonrpc-async: fix tests with
 pytest 8.4

---
 .../python-modules/jsonrpc-async/default.nix  |  15 ++-
 .../jsonrpc-async/mark-tests-async.patch      | 104 ++++++++++++++++++
 2 files changed, 114 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/python-modules/jsonrpc-async/mark-tests-async.patch

diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix
index 47d2215b9bfe..cde9fcf1114e 100644
--- a/pkgs/development/python-modules/jsonrpc-async/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-async/default.nix
@@ -6,15 +6,13 @@
   jsonrpc-base,
   pytest-aiohttp,
   pytestCheckHook,
-  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "jsonrpc-async";
   version = "2.1.2";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "emlove";
@@ -23,7 +21,14 @@ buildPythonPackage rec {
     hash = "sha256-KOnycsOZFDEVj8CJDwGbdtbOpMPQMVdrXbHG0fzr9PI=";
   };
 
-  propagatedBuildInputs = [
+  patches = [
+    # https://github.com/emlove/jsonrpc-async/pull/11
+    ./mark-tests-async.patch
+  ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     aiohttp
     jsonrpc-base
   ];
diff --git a/pkgs/development/python-modules/jsonrpc-async/mark-tests-async.patch b/pkgs/development/python-modules/jsonrpc-async/mark-tests-async.patch
new file mode 100644
index 000000000000..c63a4f8a644f
--- /dev/null
+++ b/pkgs/development/python-modules/jsonrpc-async/mark-tests-async.patch
@@ -0,0 +1,104 @@
+From af9b471eba92f1f353fec57f60e48702e79bcb80 Mon Sep 17 00:00:00 2001
+From: Martin Weinelt <hexa@darmstadt.ccc.de>
+Date: Thu, 21 Aug 2025 15:24:37 +0200
+Subject: [PATCH] Fix tests with pytest 8.4
+
+Pytest 8.4 will fail on async functions, if they are not handled by a
+plugin. And since pytest-aiohttp relies on pytest-asyncio, the obvious
+fix is to mark them as asyncio.
+---
+ tests.py | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/tests.py b/tests.py
+index e11c4d5..547d636 100644
+--- a/tests.py
++++ b/tests.py
+@@ -11,6 +11,7 @@
+ from jsonrpc_async import Server, ProtocolError, TransportError
+ 
+ 
++@pytest.mark.asyncio
+ async def test_send_message_timeout(aiohttp_client):
+     """Test the catching of the timeout responses."""
+ 
+@@ -37,6 +38,7 @@ def create_app():
+     assert isinstance(transport_error.value.args[1], asyncio.TimeoutError)
+ 
+ 
++@pytest.mark.asyncio
+ async def test_send_message(aiohttp_client):
+     """Test the sending of messages."""
+     # catch non-json responses
+@@ -100,6 +102,7 @@ def create_app():
+         "Error calling method 'my_method': Transport Error")
+ 
+ 
++@pytest.mark.asyncio
+ async def test_exception_passthrough(aiohttp_client):
+     async def callback(*args, **kwargs):
+         raise aiohttp.ClientOSError('aiohttp exception')
+@@ -120,6 +123,7 @@ def create_app():
+     assert isinstance(transport_error.value.args[1], aiohttp.ClientOSError)
+ 
+ 
++@pytest.mark.asyncio
+ async def test_forbid_private_methods(aiohttp_client):
+     """Test that we can't call private methods (those starting with '_')."""
+     def create_app():
+@@ -137,6 +141,7 @@ def create_app():
+         await server.foo.bar._baz()
+ 
+ 
++@pytest.mark.asyncio
+ async def test_headers_passthrough(aiohttp_client):
+     """Test that we correctly send RFC headers and merge them with users."""
+     async def handler(request):
+@@ -170,6 +175,7 @@ async def callback(*args, **kwargs):
+     await server.foo()
+ 
+ 
++@pytest.mark.asyncio
+ async def test_method_call(aiohttp_client):
+     """Mixing *args and **kwargs is forbidden by the spec."""
+     def create_app():
+@@ -185,6 +191,7 @@ def create_app():
+         "JSON-RPC spec forbids mixing arguments and keyword arguments")
+ 
+ 
++@pytest.mark.asyncio
+ async def test_method_nesting(aiohttp_client):
+     """Test that we correctly nest namespaces."""
+     async def handler(request):
+@@ -211,6 +218,7 @@ def create_app():
+         "nest.testmethod.some.other.method") is True
+ 
+ 
++@pytest.mark.asyncio
+ async def test_calls(aiohttp_client):
+     """Test RPC call with positional parameters."""
+     async def handler1(request):
+@@ -265,6 +273,7 @@ def create_app():
+     await server.foobar({'foo': 'bar'})
+ 
+ 
++@pytest.mark.asyncio
+ async def test_notification(aiohttp_client):
+     """Verify that we ignore the server response."""
+     async def handler(request):
+@@ -283,6 +292,7 @@ def create_app():
+     assert await server.subtract(42, 23, _notification=True) is None
+ 
+ 
++@pytest.mark.asyncio
+ async def test_custom_loads(aiohttp_client):
+     """Test RPC call with custom load."""
+     loads_mock = mock.Mock(wraps=json.loads)
+@@ -306,6 +316,7 @@ def create_app():
+     assert loads_mock.call_count == 1
+ 
+ 
++@pytest.mark.asyncio
+ async def test_context_manager(aiohttp_client):
+     # catch non-json responses
+     async def handler1(request):

From defffa1a684cbad6db92211301ae7a4ca510764e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amy=20de=20Buitl=C3=A9ir?= <amy@nualeargais.ie>
Date: Thu, 21 Aug 2025 14:33:38 +0100
Subject: [PATCH 2404/3724] textadept: 12.4 -> 12.8

---
 pkgs/by-name/te/textadept/deps.nix    | 54 +++++++++++++--------------
 pkgs/by-name/te/textadept/package.nix |  5 +--
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/te/textadept/deps.nix b/pkgs/by-name/te/textadept/deps.nix
index 0018eb15849a..feec82e52dfe 100644
--- a/pkgs/by-name/te/textadept/deps.nix
+++ b/pkgs/by-name/te/textadept/deps.nix
@@ -1,53 +1,53 @@
 {
   # scintilla
-  "scintilla550.tgz" = {
-    url = "https://www.scintilla.org/scintilla550.tgz";
-    sha256 = "sha256-5VPpVQnwH5KqFX+gLQanEmQuE9aaEewaAqfd8ixAYjE=";
-  };
-  # lexilla
-  "lexilla510.tgz" = {
-    url = "https://www.scintilla.org/lexilla510.tgz";
-    sha256 = "sha256-azWVJ0AFSYZxuFTPV73uwiVJZvNxcS/POnFtl6p/P9g=";
+  "scintilla557.tgz" = {
+    url = "https://www.scintilla.org/scintilla557.tgz";
+    sha256 = "sha256-s34aI5/4x3zr1y22ziUmSzXL7Lv/rWD5zn6Dj1GVoh4=";
   };
   # scinterm
-  "scinterm_5.0.zip" = {
-    url = "https://github.com/orbitalquark/scinterm/archive/scinterm_5.0.zip";
-    sha256 = "sha256-l1qeLMCrhyoZA/GfmXFR20rY5EsUoO5e+1vZJtYdb24=";
+  "scinterm_5.5.zip" = {
+    url = "https://github.com/orbitalquark/scinterm/archive/scinterm_5.5.zip";
+    sha256 = "sha256-G/CEzNVkwJl8CIFmSjtVEOX1bDqnnnO9hJR3VjLQf3k=";
   };
   # scintillua
-  "scintillua_6.3.zip" = {
-    url = "https://github.com/orbitalquark/scintillua/archive/scintillua_6.3.zip";
-    sha256 = "sha256-SAFmu3q8T1UtVjdUcFy9NPu0DOLqewvU/Vb9b7XjgQM=";
+  "scintillua_6.5.zip" = {
+    url = "https://github.com/orbitalquark/scintillua/archive/scintillua_6.5.zip";
+    sha256 = "sha256-mXE4wcEenEf7vgUNyPBPzwu5vSiupbDub656+jlLP68=";
   };
   # lua
-  "lua-5.4.6.tar.gz" = {
-    url = "http://www.lua.org/ftp/lua-5.4.6.tar.gz";
-    sha256 = "sha256-fV6huctqoLWco93hxq3LV++DobqOVDLA7NBr9DmzrYg=";
+  "lua-5.4.8.tar.gz" = {
+    url = "http://www.lua.org/ftp/lua-5.4.8.tar.gz";
+    sha256 = "sha256-TxjdrhVOeT5G7qtyfFnvHAwMK3ROe5QhlxDXb1MGKa4=";
   };
   # lpeg
   "lpeg-1.1.0.tar.gz" = {
     url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz";
     sha256 = "sha256-SxVdZ9IkbB/6ete8RmweqJm7xA/vAlfMnAPOy67UNSo=";
   };
-  # luafilesystem
+  # lfs
   "v1_8_0.zip" = {
     url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip";
     sha256 = "sha256-46a+ynqKkFIu7THbbM3F7WWkM4JlAMaGJ4TidnG54Yo=";
   };
-  # cdk
-  "t20200923.tar.gz" = {
-    url = "http://github.com/ThomasDickey/cdk-snapshots/archive/refs/tags/t20200923.tar.gz";
-    sha256 = "sha256-rjL4oMSDJZWAZJ8pG8FApfpvrVNJvY+6D8ZV+gwvDnI=";
+  # regex
+  "1.0.zip" = {
+    url = "https://github.com/orbitalquark/lua-std-regex/archive/1.0.zip";
+    sha256 = "sha256-W2hKHOfqYyo3qk+YvPJlzZfZ1wxZmMVphSlcaql+dOE=";
   };
-  # libtermkey
+  # cdk
+  "t20240619.tar.gz" = {
+    url = "https://github.com/ThomasDickey/cdk-snapshots/archive/refs/tags/t20240619.tar.gz";
+    sha256 = "sha256-aaLJbOI7MTeSnswBHGewMFVMxTKrAKARy7zPAdrKphE=";
+  };
+  # termkey
   "libtermkey-0.22.tar.gz" = {
     url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz";
     sha256 = "sha256-aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA=";
   };
-  # lua-std-regex
-  "1.0.zip" = {
-    url = "https://github.com/orbitalquark/lua-std-regex/archive/1.0.zip";
-    sha256 = "sha256-W2hKHOfqYyo3qk+YvPJlzZfZ1wxZmMVphSlcaql+dOE=";
+  # reproc
+  "v14.2.5.zip" = {
+    url = "https://github.com/DaanDeMeyer/reproc/archive/refs/tags/v14.2.5.zip";
+    sha256 = "sha256-IbFow4rbIvS0g5HYGT28OSfx8uZ4wgWNaUSim2Ssxsk=";
   };
   # singleapp
   "v3.4.0.zip" = {
diff --git a/pkgs/by-name/te/textadept/package.nix b/pkgs/by-name/te/textadept/package.nix
index c9e63785dae5..92f2175245c9 100644
--- a/pkgs/by-name/te/textadept/package.nix
+++ b/pkgs/by-name/te/textadept/package.nix
@@ -10,15 +10,14 @@
   ncurses,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  version = "12.4";
+  version = "12.8";
   pname = "textadept";
 
   src = fetchFromGitHub {
-    name = "textadept11";
     owner = "orbitalquark";
     repo = "textadept";
     tag = "textadept_${finalAttrs.version}";
-    hash = "sha256-nPgpQeBq5Stv2o0Ke4W2Ltnx6qLe5TIC5a8HSYVkmfI=";
+    hash = "sha256-ba5YSZaWGGEFFAbHNNXv2/a4dWrG/o5mTySCmlPauWs=";
   };
 
   nativeBuildInputs = [ cmake ] ++ lib.optionals withQt [ libsForQt5.wrapQtAppsHook ];

From f5037e8321c05e63c9efb719d45c90d898dfa6e0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 Aug 2025 15:32:16 +0200
Subject: [PATCH 2405/3724] rerun: minor cleaning

---
 pkgs/by-name/re/rerun/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index d5ffb129de56..acf6d0799335 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -107,10 +107,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
   env =
     let
       inherit (llvmPackages) clang-unwrapped;
-      major-version = builtins.head (builtins.splitVersion clang-unwrapped.version);
+      majorVersion = lib.versions.major clang-unwrapped.version;
+
       # resource dir + builtins from the unwrapped clang
-      resourceDir = "${lib.getLib clang-unwrapped}/lib/clang/${major-version}";
-      includeDir = "${lib.getLib llvmPackages.libclang}/lib/clang/${major-version}/include";
+      resourceDir = "${lib.getLib clang-unwrapped}/lib/clang/${majorVersion}";
+      includeDir = "${lib.getLib llvmPackages.libclang}/lib/clang/${majorVersion}/include";
     in
     {
       CC_wasm32_unknown_unknown = lib.getExe clang-unwrapped;

From 9bd7a9d79a12036c5e0cc245e9ceea66f7fdd57e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 13:54:48 +0000
Subject: [PATCH 2406/3724] kodiPackages.jellyfin: 1.0.7 -> 1.0.8

---
 pkgs/applications/video/kodi/addons/jellyfin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix
index 6b6cdbcc1d2e..9b9a91032384 100644
--- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix
+++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix
@@ -17,13 +17,13 @@ in
 buildKodiAddon rec {
   pname = "jellyfin";
   namespace = "plugin.video.jellyfin";
-  version = "1.0.7";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-kodi";
     rev = "v${version}";
-    sha256 = "sha256-7PgE1KrKmSBWzzi6tZp1Pou/82P1mPX8iE/IQlBi1Cc=";
+    sha256 = "sha256-/kolXnYO+wo6z7ucCXvxwjsiflvusKJ3qTWxm1YZMfU=";
   };
 
   nativeBuildInputs = [ python ];

From c0f52d4f8c770bf715423962ead4e52cecaf1dfc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 14:00:59 +0000
Subject: [PATCH 2407/3724] kardolus-chatgpt-cli: 1.8.7 -> 1.8.8

---
 pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix b/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix
index a2f3995b0976..0444f9c523e4 100644
--- a/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix
+++ b/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix
@@ -9,18 +9,18 @@ buildGoModule (finalAttrs: {
   # "chatgpt-cli" is taken by another package with the same upsteam name.
   # To keep "pname" and "package attribute name" identical, the owners name (kardolus) gets prefixed as identifier.
   pname = "kardolus-chatgpt-cli";
-  version = "1.8.7";
+  version = "1.8.8";
 
   src = fetchFromGitHub {
     owner = "kardolus";
     repo = "chatgpt-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-NQoWUF5AcDejkricC7+aP30nGqh/xEwSdb8JWtbd1+w=";
+    hash = "sha256-KdE4TzCkqIzs8xPYflHFpWqpUKqMMxy1YwfNRvyLc08=";
   };
 
   vendorHash = null;
   # The tests of kardolus/chatgpt-cli require an OpenAI API Key to be present in the environment,
-  # (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.8.7/test/contract/contract_test.go#L35)
+  # (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.8.8/test/contract/contract_test.go#L35)
   # which will not be the case in the pipeline.
   # Therefore, tests must be skipped.
   doCheck = false;

From 197757abe880654f623df25c567468582a6d97ea Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Thu, 21 Aug 2025 10:16:30 -0400
Subject: [PATCH 2408/3724] jjui: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix
index 23e6da63b086..88b1ee75e373 100644
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "jjui";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "idursun";
     repo = "jjui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XWsHkfakSVQZtmN21exUc62is6qT3jw/1FF9RNaW0Uo=";
+    hash = "sha256-8jLQ9KLMMz4y7pXA9wlHbGN4cxRAYVPy6oRKLHCU4SM=";
   };
 
   vendorHash = "sha256-2rlfR5HLFJyLVSRiUGTCwQDFWRBt4jmL6sdZcq7blaE=";

From 21a14ae8ccade36d76d0ca61e565192c8e82b821 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 21 Aug 2025 16:50:09 +0200
Subject: [PATCH 2409/3724] esptool: fix esptool import for entrypoints

The .py entrypoints are deprecated anyway and they cause us trouble,
because the wrapper tries to import esptool and finds $out/bin/esptool.py
instead of the library in site-packages.
---
 pkgs/by-name/es/esptool/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/es/esptool/package.nix b/pkgs/by-name/es/esptool/package.nix
index 171d821d561b..26f6b800c399 100644
--- a/pkgs/by-name/es/esptool/package.nix
+++ b/pkgs/by-name/es/esptool/package.nix
@@ -43,6 +43,10 @@ python3Packages.buildPythonApplication rec {
     hsm = [ python-pkcs11 ];
   };
 
+  postInstall = ''
+    rm -v $out/bin/*.py
+  '';
+
   nativeCheckInputs =
     with python3Packages;
     [
@@ -62,6 +66,15 @@ python3Packages.buildPythonApplication rec {
     "host_test"
   ];
 
+  disabledTests = [
+    # remove the deprecated .py entrypoints, because our wrapper tries to
+    # import esptool and finds esptool.py in $out/bin, which breaks.
+    "test_esptool_py"
+    "test_espefuse_py"
+    "test_espsecure_py"
+    "test_esp_rfc2217_server_py"
+  ];
+
   postCheck = ''
     export SOFTHSM2_CONF=$(mktemp)
     echo "directories.tokendir = $(mktemp -d)" > "$SOFTHSM2_CONF"

From 4b4f9649d2b97b3c048d315bfc63c12f37269b37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 15:00:51 +0000
Subject: [PATCH 2410/3724] xee: 0.1.5 -> 0.1.6

---
 pkgs/by-name/xe/xee/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xe/xee/package.nix b/pkgs/by-name/xe/xee/package.nix
index feb6ab8d5572..932546c2c8f0 100644
--- a/pkgs/by-name/xe/xee/package.nix
+++ b/pkgs/by-name/xe/xee/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xee";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "Paligo";
     repo = "xee";
     tag = "xee-v${finalAttrs.version}";
-    hash = "sha256-l5g2YZ4lNu+CLyya0FavDEqbJayaTXGrB8fYCr3fj0s=";
+    hash = "sha256-AU1x2Y2oDaUi4XliOf3GxJCwPv/OMTTUE2p/SOJtM2k=";
   };
 
-  cargoHash = "sha256-Ora6VwYLDyFI4iA4FkygGsup8I4OvK0kkLvHs4F/YhY=";
+  cargoHash = "sha256-30OXowgIVSXMFEZVM74kwU8mdDuXVngsISyVQ0MB+VQ=";
 
   cargoBuildFlags = [
     "--package"

From ecaa14186f2d6a9f659b6951fc0825fc7df883ab Mon Sep 17 00:00:00 2001
From: Evgeny Kurnevsky <kurnevsky@gmail.com>
Date: Wed, 20 Aug 2025 15:21:03 -0400
Subject: [PATCH 2411/3724] vtk: add vtk-dicom module

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

diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix
index a0f4d42a5a13..ac9b3aabec17 100644
--- a/pkgs/development/libraries/vtk/generic.nix
+++ b/pkgs/development/libraries/vtk/generic.nix
@@ -8,6 +8,7 @@
   newScope,
   stdenv,
   fetchurl,
+  fetchFromGitHub,
   cmake,
   pkg-config,
 
@@ -46,6 +47,7 @@
   libgeotiff,
   laszip_2,
   gdal,
+  gdcm,
   pdal,
   alembic,
   imath,
@@ -136,6 +138,19 @@ stdenv.mkDerivation (finalAttrs: {
     hash = sourceSha256;
   };
 
+  postPatch =
+    let
+      vtk-dicom = fetchFromGitHub {
+        owner = "dgobbi";
+        repo = "vtk-dicom";
+        tag = "v0.8.17";
+        hash = "sha256-1lI2qsV4gymWqjeouEHZ5FRlmlh9vimH7J5rzA+eOds=";
+      };
+    in
+    ''
+      cp --no-preserve=mode -r ${vtk-dicom} ./Remote/vtkDICOM
+    '';
+
   nativeBuildInputs = [
     cmake
     pkg-config # required for finding MySQl
@@ -153,6 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
     libgeotiff
     laszip_2
     gdal
+    (gdcm.override { enableVTK = false; })
     pdal
     alembic
     imath
@@ -289,6 +305,9 @@ stdenv.mkDerivation (finalAttrs: {
     # mpiSupport
     (lib.cmakeBool "VTK_USE_MPI" mpiSupport)
     (vtkBool "VTK_GROUP_ENABLE_MPI" mpiSupport)
+
+    # Remote module options
+    (lib.cmakeBool "USE_GDCM" true) # for vtkDicom
   ];
 
   pythonImportsCheck = [ "vtk" ];

From 6e8882235cd5d1336f15dd793429a4e50efaf59f Mon Sep 17 00:00:00 2001
From: "Berk D. Demir" <bdd@mindcast.org>
Date: Thu, 21 Aug 2025 15:19:32 +0000
Subject: [PATCH 2412/3724] _1password-gui: 8.11.4 -> 8.11.6

---
 pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json
index f506b03a5beb..d992baa3ad2b 100644
--- a/pkgs/by-name/_1/_1password-gui/sources.json
+++ b/pkgs/by-name/_1/_1password-gui/sources.json
@@ -1,28 +1,28 @@
 {
   "stable": {
     "linux": {
-      "version": "8.11.4",
+      "version": "8.11.6",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.4.x64.tar.gz",
-          "hash": "sha256-s/CV1hA8j3ivWEmKfwMd6Hh74BY86C0MZLDwjm6ROd4="
+          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.6.x64.tar.gz",
+          "hash": "sha256-OjyJDesweUhLHuBeLCEvNOloDZO8/D6Z1FquLyapQ4Q="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.4.arm64.tar.gz",
-          "hash": "sha256-qljiVRVO0HlteI5oRQPLb6+JL282CwcbRydANUmNcRM="
+          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.6.arm64.tar.gz",
+          "hash": "sha256-sspmxX6xeVHvEww4D41PZTM2YftbILx06aMuDbAay74="
         }
       }
     },
     "darwin": {
-      "version": "8.11.4",
+      "version": "8.11.6",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.4-x86_64.zip",
-          "hash": "sha256-kv+TSoZcoCkL1Gr0dwgqtYK532wEnergVAwCMCv44/A="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.6-x86_64.zip",
+          "hash": "sha256-HMwb22/4Dw3M3B1nrdURSQzMGAZxsVG6t8E+MUmRmjg="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.4-aarch64.zip",
-          "hash": "sha256-AhWPz/cwhBwSozZx6WrDPvCj73OIvBxXlsimM+FDFlA="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.6-aarch64.zip",
+          "hash": "sha256-SrB4tUk2GroUOptdQlJsC9tFssYXduyLR1TqH7aU2N4="
         }
       }
     }

From b45f0f4e276d0f4446b478d53e6f37e2f7f6de05 Mon Sep 17 00:00:00 2001
From: "Berk D. Demir" <bdd@mindcast.org>
Date: Thu, 21 Aug 2025 15:22:27 +0000
Subject: [PATCH 2413/3724] _1password-gui-beta: 8.11.4-21.BETA ->
 8.11.8-32.BETA

---
 pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json
index d992baa3ad2b..1e77e1f21a86 100644
--- a/pkgs/by-name/_1/_1password-gui/sources.json
+++ b/pkgs/by-name/_1/_1password-gui/sources.json
@@ -29,28 +29,28 @@
   },
   "beta": {
     "linux": {
-      "version": "8.11.4-21.BETA",
+      "version": "8.11.8-32.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.4-21.BETA.x64.tar.gz",
-          "hash": "sha256-HWPeTCtjHH8vngDX0+tGbiDMj1FoW8a4RCu34RqJXmI="
+          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.8-32.BETA.x64.tar.gz",
+          "hash": "sha256-FlJ7uXtqavcOUs/DRGCMR0ImX9mlQBYGxFzM45DByBg="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.4-21.BETA.arm64.tar.gz",
-          "hash": "sha256-yPjzweuJPvvOkJcIElaAogzBpWPvYch6DQarRoaZojc="
+          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.8-32.BETA.arm64.tar.gz",
+          "hash": "sha256-Dqy9keq6aRrFp2zKGOpV9kmI4CZQFZpf8ey9n9OKy8A="
         }
       }
     },
     "darwin": {
-      "version": "8.11.4-21.BETA",
+      "version": "8.11.8-32.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.4-21.BETA-x86_64.zip",
-          "hash": "sha256-FozwWYQCrqWbfw9qaPRLbaUVWa5hTwG3NHjtZc4smdk="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.8-32.BETA-x86_64.zip",
+          "hash": "sha256-OEl6maJ5bDW9ySLYXWnHUNYY48dtrjxZppRMCUzHrq8="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.4-21.BETA-aarch64.zip",
-          "hash": "sha256-0eXtLqknEPG+G+mxa7QYWkUVPu13/KAdkOb9fklZIqg="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.8-32.BETA-aarch64.zip",
+          "hash": "sha256-cNKC+JIsPHMk9h5pBcuh6huLWd7aqt7AdB4ixQ99oeE="
         }
       }
     }

From 1974b7e30c98d1dc1279c3ef4a801d7eb5a86c43 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 21 Aug 2025 16:28:35 +0100
Subject: [PATCH 2414/3724] ci: reformat comment

Use one sentence per line.
---
 ci/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ci/default.nix b/ci/default.nix
index 9be9aa93aea7..a38d2dae539e 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -60,8 +60,7 @@ let
 
         programs.keep-sorted.enable = true;
 
-        # This uses nixfmt underneath,
-        # the default formatter for Nix code.
+        # This uses nixfmt underneath, the default formatter for Nix code.
         # See https://github.com/NixOS/nixfmt
         programs.nixfmt.enable = true;
 

From e981b17a9626bf52de0867a5c42067704e10ad5c Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 21 Aug 2025 16:29:32 +0100
Subject: [PATCH 2415/3724] ci: explicitly define `programs.nixfmt.package`

Currently treefmt-nix is still defaulting `programs.nixfmt.package` to
the `nixfmt-rfc-style` alias. This makes sense, as they do not know for
certain which revision of nixpkgs is in use.

We do know, however, so we can explicitly use the non-alias name.
---
 ci/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ci/default.nix b/ci/default.nix
index a38d2dae539e..6aa82cb716e5 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -62,7 +62,10 @@ let
 
         # This uses nixfmt underneath, the default formatter for Nix code.
         # See https://github.com/NixOS/nixfmt
-        programs.nixfmt.enable = true;
+        programs.nixfmt = {
+          enable = true;
+          package = pkgs.nixfmt;
+        };
 
         programs.yamlfmt = {
           enable = true;

From bc5fb55954158dfa5ea9b5741c6bb93f611bfcc1 Mon Sep 17 00:00:00 2001
From: Ameer Taweel <ameertaweel2002@gmail.com>
Date: Thu, 21 Aug 2025 18:31:56 +0300
Subject: [PATCH 2416/3724] miniflux: 2.2.11 -> 2.2.12

---
 pkgs/by-name/mi/miniflux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix
index 4a9ea40bd4cf..f9214e1561ee 100644
--- a/pkgs/by-name/mi/miniflux/package.nix
+++ b/pkgs/by-name/mi/miniflux/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "miniflux";
-  version = "2.2.11";
+  version = "2.2.12";
 
   src = fetchFromGitHub {
     owner = "miniflux";
     repo = "v2";
     tag = version;
-    hash = "sha256-0gheLIwokJWanCOU1gWFyY6KBLqX+02plSp+iLHxd/Y=";
+    hash = "sha256-DeSNI2GFqRF4jdfly44nohCPE4vOXKSaaCkHgKwS4Vs=";
   };
 
-  vendorHash = "sha256-hBvMAPmoGbxz3bV1NCA5nuNC7yv8v8h19pWCispLV3c=";
+  vendorHash = "sha256-bMm2U+4pzafMD2BoRVbwEkzixOgWqw5eGAmw+OCJ9kQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 1f3cf074dc54549ff031aab5fdd318dc05b2a127 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 21 Aug 2025 11:50:36 +0200
Subject: [PATCH 2417/3724] opencode: 0.5.6 -> 0.5.13

---
 pkgs/by-name/op/opencode/package.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index f0f00fdacb39..ec4250eab843 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -13,12 +13,6 @@
 }:
 
 let
-  opencode-node-modules-hash = {
-    "aarch64-darwin" = "sha256-hznCg/7c9uNV7NXTkb6wtn3EhJDkGI7yZmSIA2SqX7g=";
-    "aarch64-linux" = "sha256-hznCg/7c9uNV7NXTkb6wtn3EhJDkGI7yZmSIA2SqX7g=";
-    "x86_64-darwin" = "sha256-hznCg/7c9uNV7NXTkb6wtn3EhJDkGI7yZmSIA2SqX7g=";
-    "x86_64-linux" = "sha256-hznCg/7c9uNV7NXTkb6wtn3EhJDkGI7yZmSIA2SqX7g=";
-  };
   bun-target = {
     "aarch64-darwin" = "bun-darwin-arm64";
     "aarch64-linux" = "bun-linux-arm64";
@@ -28,12 +22,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.5.6";
+  version = "0.5.13";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dzhthgkAPjvPOxWBnf67OkTwbZ3Htdl68+UDlz45xwI=";
+    hash = "sha256-CzVzBvuK/RRYxFA4wOhkIXuXjoxWHHRnzUpGuvl9kQU=";
   };
 
   tui = buildGoModule {
@@ -107,7 +101,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = opencode-node-modules-hash.${stdenvNoCC.hostPlatform.system};
+    outputHash = "sha256-hznCg/7c9uNV7NXTkb6wtn3EhJDkGI7yZmSIA2SqX7g=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };

From 6c7ad09fd633982a5d9731fe38cc094bac63d452 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 10:09:40 +0200
Subject: [PATCH 2418/3724] jack-example-tools: move to by-name

---
 .../tools.nix => by-name/ja/jack-example-tools/package.nix} | 6 +++---
 pkgs/top-level/all-packages.nix                             | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)
 rename pkgs/{misc/jackaudio/tools.nix => by-name/ja/jack-example-tools/package.nix} (94%)

diff --git a/pkgs/misc/jackaudio/tools.nix b/pkgs/by-name/ja/jack-example-tools/package.nix
similarity index 94%
rename from pkgs/misc/jackaudio/tools.nix
rename to pkgs/by-name/ja/jack-example-tools/package.nix
index 976cab0e16c8..dc7faf4849fa 100644
--- a/pkgs/misc/jackaudio/tools.nix
+++ b/pkgs/by-name/ja/jack-example-tools/package.nix
@@ -8,7 +8,7 @@
   meson,
   ninja,
 
-  jack,
+  jack2,
   alsa-lib,
   libopus,
   libsamplerate,
@@ -41,8 +41,8 @@ stdenv.mkDerivation (final: {
     ninja
   ];
   buildInputs = [
-    jack
-    libopus
+    jack2
+    (libopus.override { withCustomModes = true; })
     libsamplerate
     libsndfile
     readline
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1fdc283adb9..25162d3d5113 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15398,11 +15398,6 @@ with pkgs;
 
   libjack2 = jack2.override { prefix = "lib"; };
 
-  jack-example-tools = callPackage ../misc/jackaudio/tools.nix {
-    libopus = libopus.override { withCustomModes = true; };
-    jack = jack2;
-  };
-
   jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { };
   jack_autoconnect = jack-autoconnect;
 

From d7e587b9285d8285d50b9c2de2094fc5ca2838b2 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 10:10:28 +0200
Subject: [PATCH 2419/3724] jack2: move to by-name

---
 .../jackaudio/default.nix => by-name/ja/jack2/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{misc/jackaudio/default.nix => by-name/ja/jack2/package.nix} (100%)

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/by-name/ja/jack2/package.nix
similarity index 100%
rename from pkgs/misc/jackaudio/default.nix
rename to pkgs/by-name/ja/jack2/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25162d3d5113..a9e295488e1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15394,8 +15394,6 @@ with pkgs;
   # using the new configuration style proposal which is unstable
   jack1 = callPackage ../misc/jackaudio/jack1.nix { };
 
-  jack2 = callPackage ../misc/jackaudio { };
-
   libjack2 = jack2.override { prefix = "lib"; };
 
   jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { };

From 92b63189be447b478784bac8fe4d8ec82e4ab415 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 10:11:26 +0200
Subject: [PATCH 2420/3724] jack1: move to by-name

---
 .../{misc/jackaudio/jack1.nix => by-name/ja/jack1/package.nix} | 0
 pkgs/top-level/all-packages.nix                                | 3 ---
 2 files changed, 3 deletions(-)
 rename pkgs/{misc/jackaudio/jack1.nix => by-name/ja/jack1/package.nix} (100%)

diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/by-name/ja/jack1/package.nix
similarity index 100%
rename from pkgs/misc/jackaudio/jack1.nix
rename to pkgs/by-name/ja/jack1/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9e295488e1b..9c1cbccb0e1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15391,9 +15391,6 @@ with pkgs;
 
   image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; };
 
-  # using the new configuration style proposal which is unstable
-  jack1 = callPackage ../misc/jackaudio/jack1.nix { };
-
   libjack2 = jack2.override { prefix = "lib"; };
 
   jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { };

From c48b39b1361a02a9f4d49cb82dae696ab748f926 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 10:13:28 +0200
Subject: [PATCH 2421/3724] utsushi-networkscan: move to by-name

---
 .../ut/utsushi-networkscan/package.nix}                         | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{misc/drivers/utsushi/networkscan.nix => by-name/ut/utsushi-networkscan/package.nix} (100%)

diff --git a/pkgs/misc/drivers/utsushi/networkscan.nix b/pkgs/by-name/ut/utsushi-networkscan/package.nix
similarity index 100%
rename from pkgs/misc/drivers/utsushi/networkscan.nix
rename to pkgs/by-name/ut/utsushi-networkscan/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c1cbccb0e1f..9826390c0387 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15387,8 +15387,6 @@ with pkgs;
 
   utsushi = callPackage ../misc/drivers/utsushi { };
 
-  utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { };
-
   image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; };
 
   libjack2 = jack2.override { prefix = "lib"; };

From 0606c8b1851d5bb22cf4c015054deb83dc34d1ab Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 10:14:33 +0200
Subject: [PATCH 2422/3724] utsushi: move to by-name

---
 .../utsushi/default.nix => by-name/ut/utsushi/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{misc/drivers/utsushi/default.nix => by-name/ut/utsushi/package.nix} (100%)

diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/by-name/ut/utsushi/package.nix
similarity index 100%
rename from pkgs/misc/drivers/utsushi/default.nix
rename to pkgs/by-name/ut/utsushi/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9826390c0387..30dd74ace2bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15385,8 +15385,6 @@ with pkgs;
 
   epkowa = callPackage ../misc/drivers/epkowa { };
 
-  utsushi = callPackage ../misc/drivers/utsushi { };
-
   image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; };
 
   libjack2 = jack2.override { prefix = "lib"; };

From 1535d4e5048a445ef3d8dc049125458ab37a0dbd Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 10:15:59 +0200
Subject: [PATCH 2423/3724] epkowa: move to by-name

---
 .../{misc/drivers => by-name/ep}/epkowa/firmware_location.patch | 0
 .../epkowa/default.nix => by-name/ep/epkowa/package.nix}        | 2 +-
 pkgs/{misc/drivers => by-name/ep}/epkowa/sscanf.patch           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 4 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{misc/drivers => by-name/ep}/epkowa/firmware_location.patch (100%)
 rename pkgs/{misc/drivers/epkowa/default.nix => by-name/ep/epkowa/package.nix} (99%)
 rename pkgs/{misc/drivers => by-name/ep}/epkowa/sscanf.patch (100%)

diff --git a/pkgs/misc/drivers/epkowa/firmware_location.patch b/pkgs/by-name/ep/epkowa/firmware_location.patch
similarity index 100%
rename from pkgs/misc/drivers/epkowa/firmware_location.patch
rename to pkgs/by-name/ep/epkowa/firmware_location.patch
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/by-name/ep/epkowa/package.nix
similarity index 99%
rename from pkgs/misc/drivers/epkowa/default.nix
rename to pkgs/by-name/ep/epkowa/package.nix
index d503490c6120..64fb690f8f86 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/by-name/ep/epkowa/package.nix
@@ -474,7 +474,7 @@ in
 let
   fwdir = symlinkJoin {
     name = "esci-firmware-dir";
-    paths = lib.mapAttrsToList (name: value: value + /share/esci) plugins;
+    paths = lib.mapAttrsToList (name: value: value + "/share/esci") plugins;
   };
 in
 let
diff --git a/pkgs/misc/drivers/epkowa/sscanf.patch b/pkgs/by-name/ep/epkowa/sscanf.patch
similarity index 100%
rename from pkgs/misc/drivers/epkowa/sscanf.patch
rename to pkgs/by-name/ep/epkowa/sscanf.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30dd74ace2bb..333cd294738a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15383,8 +15383,6 @@ with pkgs;
 
   hjson = with python3Packages; toPythonApplication hjson;
 
-  epkowa = callPackage ../misc/drivers/epkowa { };
-
   image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; };
 
   libjack2 = jack2.override { prefix = "lib"; };

From 3308b40f7f6327fc2cca049f4c3ed553953b4a92 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 Aug 2025 17:52:16 +0200
Subject: [PATCH 2424/3724] python3Packages.transformers: 4.55.2 -> 4.55.3

Diff: https://github.com/huggingface/transformers/compare/v4.55.2...v4.55.3

Changelog: https://github.com/huggingface/transformers/releases/tag/v4.55.3
---
 pkgs/development/python-modules/transformers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index 7afb8627a7af..5465d5437d5c 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -59,14 +59,14 @@
 
 buildPythonPackage rec {
   pname = "transformers";
-  version = "4.55.2";
+  version = "4.55.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "transformers";
     tag = "v${version}";
-    hash = "sha256-6cYZFFmwtPzResNB0q6yg/Lvclef4fAUqNxkSh+y+iU=";
+    hash = "sha256-wvcAKcEQ2dU/7IfCB0AH45ZdpiL5ib7kPPjFRhv4Z+0=";
   };
 
   build-system = [ setuptools ];

From c37faf49ce32a60ac21a4b10ba8536176aed9394 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 16:06:52 +0000
Subject: [PATCH 2425/3724] libgeneral: 84 -> 85

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

diff --git a/pkgs/by-name/li/libgeneral/package.nix b/pkgs/by-name/li/libgeneral/package.nix
index 5327da9849df..17b6faa6246f 100644
--- a/pkgs/by-name/li/libgeneral/package.nix
+++ b/pkgs/by-name/li/libgeneral/package.nix
@@ -10,13 +10,13 @@
 }:
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "libgeneral";
-  version = "84";
+  version = "85";
 
   src = fetchFromGitHub {
     owner = "tihmstar";
     repo = "libgeneral";
     tag = finalAttrs.version;
-    hash = "sha256-D6S7Ha7SQvWDGwiJuKh2Y9YOsw2ytxn70ia3llKC034=";
+    hash = "sha256-bCaAx1PVqT7Fl8IoefupIb6UuHD43clmdtnomF5Vycs=";
   };
 
   # Do not depend on git to calculate version, instead

From 7cc80440a32ca000d61c9a764f8791e4184c38b0 Mon Sep 17 00:00:00 2001
From: Icy-Thought <icy-thought@pm.me>
Date: Thu, 21 Aug 2025 18:07:47 +0200
Subject: [PATCH 2426/3724] fluent-icon-theme: 2025-02-26 -> 2025-08-21

---
 pkgs/by-name/fl/fluent-icon-theme/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/fluent-icon-theme/package.nix b/pkgs/by-name/fl/fluent-icon-theme/package.nix
index 132d87e848fb..41eea515611c 100644
--- a/pkgs/by-name/fl/fluent-icon-theme/package.nix
+++ b/pkgs/by-name/fl/fluent-icon-theme/package.nix
@@ -30,13 +30,13 @@ lib.checkListOfEnum "${pname}: available color variants"
   stdenvNoCC.mkDerivation
   rec {
     inherit pname;
-    version = "2025-02-26";
+    version = "2025-08-21";
 
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
       tag = version;
-      hash = "sha256-nL9hk+H2ees2grBvVULvJs54FlFTXrA7o1STbDDJGhQ=";
+      hash = "sha256-qAKNAbmSfVuzUGDJGVU0QF3LMc5tRzAy+l0ZwEXaJ28=";
     };
 
     nativeBuildInputs = [

From b5cdf4930702a7348474d7e093284a2dc6b65897 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 16:13:59 +0000
Subject: [PATCH 2427/3724] kubergrunt: 0.18.1 -> 0.18.2

---
 pkgs/by-name/ku/kubergrunt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ku/kubergrunt/package.nix b/pkgs/by-name/ku/kubergrunt/package.nix
index 174edf7187a8..40821ec15751 100644
--- a/pkgs/by-name/ku/kubergrunt/package.nix
+++ b/pkgs/by-name/ku/kubergrunt/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubergrunt";
-  version = "0.18.1";
+  version = "0.18.2";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "kubergrunt";
     rev = "v${version}";
-    sha256 = "sha256-w/7GioWDco2bbGNzPY7C9um8yyynD2T/+S0GNOiQoMU=";
+    sha256 = "sha256-S1IJRgUIuoFWOjVkgCFbEokbcRZgcBH/HlFHxKM14WY=";
   };
 
-  vendorHash = "sha256-4iw0wFfjSsqL72E4/VXlGQb947MVS62zwsmAR9sv0H8=";
+  vendorHash = "sha256-f+M/aiHS0dT0Cg1jVP0E+VtlKgMmkLAfZgEK34ZOB1M=";
 
   # Disable tests since it requires network access and relies on the
   # presence of certain AWS infrastructure

From 2237ea17e8a3538ea83051254b1563a812b8e4f7 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 11:41:25 +0200
Subject: [PATCH 2428/3724] helmfile: move to by-name

---
 .../helmfile/default.nix => by-name/he/helmfile/package.nix}  | 0
 pkgs/top-level/all-packages.nix                               | 4 +---
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{applications/networking/cluster/helmfile/default.nix => by-name/he/helmfile/package.nix} (100%)

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/by-name/he/helmfile/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/helmfile/default.nix
rename to pkgs/by-name/he/helmfile/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 556b25890efd..26999dd5ecb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15371,9 +15371,7 @@ with pkgs;
     buildGoModule = buildGo123Module;
   };
 
-  helmfile = callPackage ../applications/networking/cluster/helmfile { };
-
-  helmfile-wrapped = callPackage ../applications/networking/cluster/helmfile {
+  helmfile-wrapped = helmfile.override {
     inherit (kubernetes-helm-wrapped.passthru) pluginsDir;
   };
 

From af5e7a53c98d8c8d0f7ceb296c05458255c8dee5 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 11:42:46 +0200
Subject: [PATCH 2429/3724] gowitness: move to by-name

---
 .../default.nix => by-name/go/gowitness/package.nix}          | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{tools/security/gowitness/default.nix => by-name/go/gowitness/package.nix} (93%)

diff --git a/pkgs/tools/security/gowitness/default.nix b/pkgs/by-name/go/gowitness/package.nix
similarity index 93%
rename from pkgs/tools/security/gowitness/default.nix
rename to pkgs/by-name/go/gowitness/package.nix
index 58e369c78a25..98283599f457 100644
--- a/pkgs/tools/security/gowitness/default.nix
+++ b/pkgs/by-name/go/gowitness/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  buildGoModule,
+  buildGo123Module,
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGo123Module rec {
   pname = "gowitness";
   version = "3.0.5";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26999dd5ecb3..a5d53065ffd2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15367,10 +15367,6 @@ with pkgs;
 
   gotrue-supabase = callPackage ../tools/security/gotrue/supabase.nix { };
 
-  gowitness = callPackage ../tools/security/gowitness {
-    buildGoModule = buildGo123Module;
-  };
-
   helmfile-wrapped = helmfile.override {
     inherit (kubernetes-helm-wrapped.passthru) pluginsDir;
   };

From 58aa71747c70e63ba53c81dd949d6e2e1853297c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 11:44:03 +0200
Subject: [PATCH 2430/3724] gotrue-supabase: move to by-name

---
 .../supabase.nix => by-name/go/gotrue-supabase/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/security/gotrue/supabase.nix => by-name/go/gotrue-supabase/package.nix} (100%)

diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/by-name/go/gotrue-supabase/package.nix
similarity index 100%
rename from pkgs/tools/security/gotrue/supabase.nix
rename to pkgs/by-name/go/gotrue-supabase/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5d53065ffd2..1c2b27c1dea4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15365,8 +15365,6 @@ with pkgs;
 
   gotrue = callPackage ../tools/security/gotrue { };
 
-  gotrue-supabase = callPackage ../tools/security/gotrue/supabase.nix { };
-
   helmfile-wrapped = helmfile.override {
     inherit (kubernetes-helm-wrapped.passthru) pluginsDir;
   };

From 61b4cfbd6ee992d7c955e97d38ef564b6c4049dd Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 11:44:49 +0200
Subject: [PATCH 2431/3724] gotrue: move to by-name

---
 .../gotrue/default.nix => by-name/go/gotrue/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/security/gotrue/default.nix => by-name/go/gotrue/package.nix} (100%)

diff --git a/pkgs/tools/security/gotrue/default.nix b/pkgs/by-name/go/gotrue/package.nix
similarity index 100%
rename from pkgs/tools/security/gotrue/default.nix
rename to pkgs/by-name/go/gotrue/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c2b27c1dea4..dfc514d882da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15363,8 +15363,6 @@ with pkgs;
     binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
   };
 
-  gotrue = callPackage ../tools/security/gotrue { };
-
   helmfile-wrapped = helmfile.override {
     inherit (kubernetes-helm-wrapped.passthru) pluginsDir;
   };

From 3b5ed6c7888ac952a4d6fe275fa9a5f1e8d4f79d Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 11:46:28 +0200
Subject: [PATCH 2432/3724] fahclient: move to by-name

---
 .../client.nix => by-name/fa/fahclient/package.nix}             | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/misc/foldingathome/client.nix => by-name/fa/fahclient/package.nix} (100%)

diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/by-name/fa/fahclient/package.nix
similarity index 100%
rename from pkgs/applications/science/misc/foldingathome/client.nix
rename to pkgs/by-name/fa/fahclient/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfc514d882da..ae9960872814 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15351,8 +15351,6 @@ with pkgs;
 
   flashprint = libsForQt5.callPackage ../applications/misc/flashprint { };
 
-  fahclient = callPackage ../applications/science/misc/foldingathome/client.nix { };
-
   gajim = callPackage ../applications/networking/instant-messengers/gajim {
     inherit (gst_all_1) gstreamer gst-plugins-base gst-libav;
     gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };

From abf4e3a84661392ac37d84666754c88899529540 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 11:49:19 +0200
Subject: [PATCH 2433/3724] gutenprint-bin: move to by-name

---
 .../bin.nix => by-name/gu/gutenprint-bin/package.nix}  | 10 +++++-----
 pkgs/top-level/aliases.nix                             |  1 +
 pkgs/top-level/all-packages.nix                        |  2 --
 3 files changed, 6 insertions(+), 7 deletions(-)
 rename pkgs/{misc/drivers/gutenprint/bin.nix => by-name/gu/gutenprint-bin/package.nix} (80%)

diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/by-name/gu/gutenprint-bin/package.nix
similarity index 80%
rename from pkgs/misc/drivers/gutenprint/bin.nix
rename to pkgs/by-name/gu/gutenprint-bin/package.nix
index 66cf34baa2aa..bfd52df28b88 100644
--- a/pkgs/misc/drivers/gutenprint/bin.nix
+++ b/pkgs/by-name/gu/gutenprint-bin/package.nix
@@ -11,15 +11,15 @@
   usage: (sorry, its still impure but works!)
 
   impure directory:
-  mkdir /opt/gutenprint; sudo cp -r $(nix-build -A gutenprintBin -f $NIXPGS_ALL) /opt/gutenprint
+  mkdir /opt/gutenprint; sudo cp -r $(nix-build -A gutenprint-bin -f $NIXPGS_ALL) /opt/gutenprint
 
   add the following lines to bindirCmds property of  printing/cupsd.nix:
 
-    ln -s ${pkgs.gutenprintBin}/lib/cups/backend/* $out/lib/cups/backend/
-    ln -s ${pkgs.gutenprintBin}/lib/cups/filter/* $out/lib/cups/filter/
+    ln -s ${pkgs.gutenprint-bin}/lib/cups/backend/* $out/lib/cups/backend/
+    ln -s ${pkgs.gutenprint-bin}/lib/cups/filter/* $out/lib/cups/filter/
     mkdir -p $out/lib/cups/model
-    cat ${pkgs.gutenprintBin}/ppds/Canon/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd.gz |gunzip > $out/lib/cups/model/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd
-    sed -i 's@/opt/gutenprint/cups@${pkgs.gutenprintBin}/cups@' $out/lib/cups/model/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd
+    cat ${pkgs.gutenprint-bin}/ppds/Canon/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd.gz |gunzip > $out/lib/cups/model/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd
+    sed -i 's@/opt/gutenprint/cups@${pkgs.gutenprint-bin}/cups@' $out/lib/cups/model/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd
 
   Then rebuild your system and add your printer using the the localhost:603 cups web interface
   select the extracted .ppd file which can be found in the model directory of
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 420b5c033719..97dcb738c696 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -918,6 +918,7 @@ mapAliases {
   gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
   guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09
   guile-disarchive = disarchive; # Added 2023-10-27
+  gutenprintBin = gutenprint-bin; # Added 2025-08-21
 
   ### H ###
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae9960872814..4af2803115eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15322,8 +15322,6 @@ with pkgs;
 
   gutenprint = callPackage ../misc/drivers/gutenprint { };
 
-  gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { };
-
   dcp375cwlpr = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcp375cw { }).driver;
 
   dcp375cw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp375cw { }).cupswrapper;

From 634dd2f743756b6461f6f89dcb4b3ba880a27d49 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 11:51:35 +0200
Subject: [PATCH 2434/3724] gutenprint: move to by-name

---
 .../default.nix => by-name/gu/gutenprint/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{misc/drivers/gutenprint/default.nix => by-name/gu/gutenprint/package.nix} (100%)

diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/by-name/gu/gutenprint/package.nix
similarity index 100%
rename from pkgs/misc/drivers/gutenprint/default.nix
rename to pkgs/by-name/gu/gutenprint/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4af2803115eb..712827fb410f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15320,8 +15320,6 @@ with pkgs;
     withNonfreeDb = true;
   };
 
-  gutenprint = callPackage ../misc/drivers/gutenprint { };
-
   dcp375cwlpr = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcp375cw { }).driver;
 
   dcp375cw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp375cw { }).cupswrapper;

From f881edd2302b954fc745effb1f1783391bbcd2d3 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 11:52:56 +0200
Subject: [PATCH 2435/3724] cups-pk-helper: move to by-name

---
 .../cu/cups-pk-helper/package.nix}                              | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{misc/cups/cups-pk-helper.nix => by-name/cu/cups-pk-helper/package.nix} (100%)

diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/by-name/cu/cups-pk-helper/package.nix
similarity index 100%
rename from pkgs/misc/cups/cups-pk-helper.nix
rename to pkgs/by-name/cu/cups-pk-helper/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 712827fb410f..d91bd0710c74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15314,8 +15314,6 @@ with pkgs;
 
   cups-filters = callPackage ../misc/cups/filters.nix { };
 
-  cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { };
-
   foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix {
     withNonfreeDb = true;
   };

From d8cf97574277a3791804181580e0e91b8ef1b879 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 11:54:54 +0200
Subject: [PATCH 2436/3724] cups-filters: move to by-name

---
 .../cups/filters.nix => by-name/cu/cups-filters/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{misc/cups/filters.nix => by-name/cu/cups-filters/package.nix} (100%)

diff --git a/pkgs/misc/cups/filters.nix b/pkgs/by-name/cu/cups-filters/package.nix
similarity index 100%
rename from pkgs/misc/cups/filters.nix
rename to pkgs/by-name/cu/cups-filters/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d91bd0710c74..01f167d8db79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15312,8 +15312,6 @@ with pkgs;
 
   cups = callPackage ../misc/cups { };
 
-  cups-filters = callPackage ../misc/cups/filters.nix { };
-
   foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix {
     withNonfreeDb = true;
   };

From f6d28c8cc7ed09b710fdebe36b2c8ea0eb857481 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 11:55:56 +0200
Subject: [PATCH 2437/3724] cups: move to by-name

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

diff --git a/pkgs/misc/cups/default.nix b/pkgs/by-name/cu/cups/package.nix
similarity index 100%
rename from pkgs/misc/cups/default.nix
rename to pkgs/by-name/cu/cups/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01f167d8db79..dfa45aa510e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15310,8 +15310,6 @@ with pkgs;
 
   brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr { };
 
-  cups = callPackage ../misc/cups { };
-
   foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix {
     withNonfreeDb = true;
   };

From 5f7d2e6cc7bff2bb160183d084243bc8891e00d2 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 11:57:28 +0200
Subject: [PATCH 2438/3724] avell-unofficial-control-center: move to by-name

---
 .../av/avell-unofficial-control-center/package.nix}           | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 4 deletions(-)
 rename pkgs/{applications/misc/avell-unofficial-control-center/default.nix => by-name/av/avell-unofficial-control-center/package.nix} (100%)

diff --git a/pkgs/applications/misc/avell-unofficial-control-center/default.nix b/pkgs/by-name/av/avell-unofficial-control-center/package.nix
similarity index 100%
rename from pkgs/applications/misc/avell-unofficial-control-center/default.nix
rename to pkgs/by-name/av/avell-unofficial-control-center/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfa45aa510e5..843981ca7e6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15304,10 +15304,6 @@ with pkgs;
 
   autotiling = python3Packages.callPackage ../misc/autotiling { };
 
-  avell-unofficial-control-center =
-    callPackage ../applications/misc/avell-unofficial-control-center
-      { };
-
   brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr { };
 
   foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix {

From ccdc27d78cad18e5cd5fee8e65656d67b555c631 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 12:02:01 +0200
Subject: [PATCH 2439/3724] golly: move to by-name

---
 .../misc/golly/default.nix => by-name/go/golly/package.nix} | 6 +++---
 pkgs/top-level/all-packages.nix                             | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{applications/science/misc/golly/default.nix => by-name/go/golly/package.nix} (95%)

diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/by-name/go/golly/package.nix
similarity index 95%
rename from pkgs/applications/science/misc/golly/default.nix
rename to pkgs/by-name/go/golly/package.nix
index b45a945fec46..1388a41d10b8 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/by-name/go/golly/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   wrapGAppsHook3,
-  wxGTK,
+  wxGTK32,
   python3,
   zlib,
   libGLU,
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    wxGTK
+    wxGTK32
     python3
     zlib
     libGLU
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     "CXX=${stdenv.cc.targetPrefix}c++"
     "CXXC=${stdenv.cc.targetPrefix}c++"
     "LD=${stdenv.cc.targetPrefix}c++"
-    "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK) "wx-config"}"
+    "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}"
   ];
 
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 843981ca7e6b..a39f82402cec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15260,10 +15260,6 @@ with pkgs;
 
   gplates = libsForQt5.callPackage ../applications/science/misc/gplates { };
 
-  golly = callPackage ../applications/science/misc/golly {
-    wxGTK = wxGTK32;
-  };
-
   megam = callPackage ../applications/science/misc/megam {
     inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
   };

From aa1a6c5d2e007c2e5b0a2e647394ee428403cda3 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 12:03:34 +0200
Subject: [PATCH 2440/3724] cytoscape: move to by-name

---
 .../cy}/cytoscape/gen_vmoptions_to_homedir.patch          | 0
 .../default.nix => by-name/cy/cytoscape/package.nix}      | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/science/misc => by-name/cy}/cytoscape/gen_vmoptions_to_homedir.patch (100%)
 rename pkgs/{applications/science/misc/cytoscape/default.nix => by-name/cy/cytoscape/package.nix} (90%)

diff --git a/pkgs/applications/science/misc/cytoscape/gen_vmoptions_to_homedir.patch b/pkgs/by-name/cy/cytoscape/gen_vmoptions_to_homedir.patch
similarity index 100%
rename from pkgs/applications/science/misc/cytoscape/gen_vmoptions_to_homedir.patch
rename to pkgs/by-name/cy/cytoscape/gen_vmoptions_to_homedir.patch
diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/by-name/cy/cytoscape/package.nix
similarity index 90%
rename from pkgs/applications/science/misc/cytoscape/default.nix
rename to pkgs/by-name/cy/cytoscape/package.nix
index 9be37db1b6d0..42b13f74000f 100644
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/by-name/cy/cytoscape/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  jre,
+  openjdk17,
   makeWrapper,
   replaceVars,
   coreutils,
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ jre ];
+  buildInputs = [ openjdk17 ];
 
   installPhase = ''
     mkdir -pv $out/{share,bin}
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
     ln -s $out/share/cytoscape.sh $out/bin/cytoscape
 
     wrapProgram $out/share/cytoscape.sh \
-      --set JAVA_HOME "${jre}" \
-      --set JAVA  "${jre}/bin/java"
+      --set JAVA_HOME "${openjdk17}" \
+      --set JAVA  "${openjdk17}/bin/java"
 
     chmod +x $out/bin/cytoscape
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a39f82402cec..dacc4a7d7ffd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15250,10 +15250,6 @@ with pkgs;
 
   convertall = qt5.callPackage ../applications/science/misc/convertall { };
 
-  cytoscape = callPackage ../applications/science/misc/cytoscape {
-    jre = openjdk17;
-  };
-
   faissWithCuda = faiss.override {
     cudaSupport = true;
   };

From 9071245fdff905b64fe574ea36daad615615bd49 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 12:04:38 +0200
Subject: [PATCH 2441/3724] boinc: move to by-name

---
 .../misc/boinc/default.nix => by-name/bo/boinc/package.nix}   | 0
 pkgs/top-level/all-packages.nix                               | 4 +---
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{applications/science/misc/boinc/default.nix => by-name/bo/boinc/package.nix} (100%)

diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/by-name/bo/boinc/package.nix
similarity index 100%
rename from pkgs/applications/science/misc/boinc/default.nix
rename to pkgs/by-name/bo/boinc/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dacc4a7d7ffd..a9a825ed9ad1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15240,9 +15240,7 @@ with pkgs;
 
   ### SCIENCE / MISC
 
-  boinc = callPackage ../applications/science/misc/boinc { };
-
-  boinc-headless = callPackage ../applications/science/misc/boinc { headless = true; };
+  boinc-headless = boinc.override { headless = true; };
 
   celestia = callPackage ../applications/science/astronomy/celestia {
     inherit (gnome2) gtkglext;

From 36fa7b12c19d087ed03a270103a538ad781ed06c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 12:29:59 +0200
Subject: [PATCH 2442/3724] raspa-data: move to by-name

---
 .../raspa/data.nix => by-name/ra/raspa-data/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/molecular-dynamics/raspa/data.nix => by-name/ra/raspa-data/package.nix} (100%)

diff --git a/pkgs/applications/science/molecular-dynamics/raspa/data.nix b/pkgs/by-name/ra/raspa-data/package.nix
similarity index 100%
rename from pkgs/applications/science/molecular-dynamics/raspa/data.nix
rename to pkgs/by-name/ra/raspa-data/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9a825ed9ad1..85be01257a87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15227,8 +15227,6 @@ with pkgs;
 
   raspa = callPackage ../applications/science/molecular-dynamics/raspa { };
 
-  raspa-data = callPackage ../applications/science/molecular-dynamics/raspa/data.nix { };
-
   yacas = libsForQt5.callPackage ../applications/science/math/yacas { };
 
   yacas-gui = yacas.override {

From 6faab6e866db7bb2844113716c5a73c9f21f2307 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 12:30:22 +0200
Subject: [PATCH 2443/3724] raspa: move to by-name

---
 .../raspa/default.nix => by-name/ra/raspa/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/molecular-dynamics/raspa/default.nix => by-name/ra/raspa/package.nix} (100%)

diff --git a/pkgs/applications/science/molecular-dynamics/raspa/default.nix b/pkgs/by-name/ra/raspa/package.nix
similarity index 100%
rename from pkgs/applications/science/molecular-dynamics/raspa/default.nix
rename to pkgs/by-name/ra/raspa/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85be01257a87..7a4c2a655d83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15225,8 +15225,6 @@ with pkgs;
   pari = callPackage ../applications/science/math/pari { };
   gp2c = callPackage ../applications/science/math/pari/gp2c.nix { };
 
-  raspa = callPackage ../applications/science/molecular-dynamics/raspa { };
-
   yacas = libsForQt5.callPackage ../applications/science/math/yacas { };
 
   yacas-gui = yacas.override {

From 7848b51567e942391306484271ad193731266679 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 12:31:46 +0200
Subject: [PATCH 2444/3724] gp2c: move to by-name

---
 .../science/math/pari/gp2c.nix => by-name/gp/gp2c/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{applications/science/math/pari/gp2c.nix => by-name/gp/gp2c/package.nix} (100%)

diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/by-name/gp/gp2c/package.nix
similarity index 100%
rename from pkgs/applications/science/math/pari/gp2c.nix
rename to pkgs/by-name/gp/gp2c/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a4c2a655d83..9fa5ae7a5043 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15223,7 +15223,6 @@ with pkgs;
   };
 
   pari = callPackage ../applications/science/math/pari { };
-  gp2c = callPackage ../applications/science/math/pari/gp2c.nix { };
 
   yacas = libsForQt5.callPackage ../applications/science/math/yacas { };
 

From e63d260e7642c1f25fc4f1f8f342d09660730cad Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 12:32:30 +0200
Subject: [PATCH 2445/3724] pari: move to by-name

---
 .../math/pari/default.nix => by-name/pa/pari/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/math/pari/default.nix => by-name/pa/pari/package.nix} (100%)

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/by-name/pa/pari/package.nix
similarity index 100%
rename from pkgs/applications/science/math/pari/default.nix
rename to pkgs/by-name/pa/pari/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9fa5ae7a5043..e8fc02fac437 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15222,8 +15222,6 @@ with pkgs;
     };
   };
 
-  pari = callPackage ../applications/science/math/pari { };
-
   yacas = libsForQt5.callPackage ../applications/science/math/yacas { };
 
   yacas-gui = yacas.override {

From 826df19a28ca8a46416ebbfeafbe74748aec14e9 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 12:33:44 +0200
Subject: [PATCH 2446/3724] geogebra6: move to by-name

---
 .../geogebra/geogebra6.nix => by-name/ge/geogebra6/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{applications/science/math/geogebra/geogebra6.nix => by-name/ge/geogebra6/package.nix} (100%)

diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/by-name/ge/geogebra6/package.nix
similarity index 100%
rename from pkgs/applications/science/math/geogebra/geogebra6.nix
rename to pkgs/by-name/ge/geogebra6/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8fc02fac437..657de53fc7fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15207,7 +15207,6 @@ with pkgs;
   gap-full = lowPrio (gap.override { packageSet = "full"; });
 
   geogebra = callPackage ../applications/science/math/geogebra { };
-  geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { };
 
   maxima = callPackage ../applications/science/math/maxima {
     lisp-compiler = sbcl;

From 54109fef0218697d619a4a14a75c53f3aa15b359 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 12:34:22 +0200
Subject: [PATCH 2447/3724] geogebra: move to by-name

---
 .../geogebra/default.nix => by-name/ge/geogebra/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/math/geogebra/default.nix => by-name/ge/geogebra/package.nix} (100%)

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/by-name/ge/geogebra/package.nix
similarity index 100%
rename from pkgs/applications/science/math/geogebra/default.nix
rename to pkgs/by-name/ge/geogebra/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 657de53fc7fb..4cff8eb1308f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15206,8 +15206,6 @@ with pkgs;
 
   gap-full = lowPrio (gap.override { packageSet = "full"; });
 
-  geogebra = callPackage ../applications/science/math/geogebra { };
-
   maxima = callPackage ../applications/science/math/maxima {
     lisp-compiler = sbcl;
   };

From a511e49d4280f37523ccc925607e07c69390544a Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <ataraxiadev@ataraxiadev.com>
Date: Thu, 21 Aug 2025 19:48:54 +0300
Subject: [PATCH 2448/3724] nixos/ivpn: remove ataraxiasjel as maintainer

---
 nixos/modules/services/networking/ivpn.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ivpn.nix b/nixos/modules/services/networking/ivpn.nix
index 7bf96d38afbe..0fa46a7e7283 100644
--- a/nixos/modules/services/networking/ivpn.nix
+++ b/nixos/modules/services/networking/ivpn.nix
@@ -57,5 +57,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ ataraxiasjel ];
+  meta.maintainers = with lib.maintainers; [ ];
 }

From 4cba7aaa04c4698336c5f63677171bd7e61a2151 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 12:36:11 +0200
Subject: [PATCH 2449/3724] avy: move to by-name

---
 .../science/logic/satallax/default.nix        |  2 +-
 .../{avy => satallax}/minisat-fenv.patch      |  0
 .../science/logic/vampire/default.nix         |  2 +-
 .../science/logic/vampire/minisat-fenv.patch  | 57 +++++++++++++++++++
 .../av}/avy/glucose-fenv.patch                |  0
 pkgs/by-name/av/avy/minisat-fenv.patch        | 57 +++++++++++++++++++
 .../av/avy/package.nix}                       |  0
 pkgs/top-level/all-packages.nix               |  2 -
 8 files changed, 116 insertions(+), 4 deletions(-)
 rename pkgs/applications/science/logic/{avy => satallax}/minisat-fenv.patch (100%)
 create mode 100644 pkgs/applications/science/logic/vampire/minisat-fenv.patch
 rename pkgs/{applications/science/logic => by-name/av}/avy/glucose-fenv.patch (100%)
 create mode 100644 pkgs/by-name/av/avy/minisat-fenv.patch
 rename pkgs/{applications/science/logic/avy/default.nix => by-name/av/avy/package.nix} (100%)

diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix
index ff1bb99dac34..0c149fdb5be1 100644
--- a/pkgs/applications/science/logic/satallax/default.nix
+++ b/pkgs/applications/science/logic/satallax/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   ];
 
   prePatch = ''
-    patch -p1 -i ${../avy/minisat-fenv.patch} -d minisat
+    patch -p1 -i ${./minisat-fenv.patch} -d minisat
   '';
 
   preConfigure = ''
diff --git a/pkgs/applications/science/logic/avy/minisat-fenv.patch b/pkgs/applications/science/logic/satallax/minisat-fenv.patch
similarity index 100%
rename from pkgs/applications/science/logic/avy/minisat-fenv.patch
rename to pkgs/applications/science/logic/satallax/minisat-fenv.patch
diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix
index 7e8f209702f8..8f73a2cb210d 100644
--- a/pkgs/applications/science/logic/vampire/default.nix
+++ b/pkgs/applications/science/logic/vampire/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    patch -p1 -i ${../avy/minisat-fenv.patch} -d Minisat || true
+    patch -p1 -i ${./minisat-fenv.patch} -d Minisat || true
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/science/logic/vampire/minisat-fenv.patch b/pkgs/applications/science/logic/vampire/minisat-fenv.patch
new file mode 100644
index 000000000000..31e481bd6696
--- /dev/null
+++ b/pkgs/applications/science/logic/vampire/minisat-fenv.patch
@@ -0,0 +1,57 @@
+diff --git a/core/Main.cc b/core/Main.cc
+index 2b0d97b..9ba985d 100644
+--- a/core/Main.cc
++++ b/core/Main.cc
+@@ -77,9 +77,13 @@ int main(int argc, char** argv)
+         setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n  where input may be either in plain or gzipped DIMACS.\n");
+         // printf("This is MiniSat 2.0 beta\n");
+         
+-#if defined(__linux__)
+-        fpu_control_t oldcw, newcw;
+-        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
++#if defined(__linux__) && defined(__x86_64__)
++        fenv_t fenv;
++
++        fegetenv(&fenv);
++        fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
++        fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
++        fesetenv(&fenv);
+         printf("WARNING: for repeatability, setting FPU to use double precision\n");
+ #endif
+         // Extra options:
+diff --git a/simp/Main.cc b/simp/Main.cc
+index 2804d7f..7fbdb33 100644
+--- a/simp/Main.cc
++++ b/simp/Main.cc
+@@ -78,9 +78,13 @@ int main(int argc, char** argv)
+         setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n  where input may be either in plain or gzipped DIMACS.\n");
+         // printf("This is MiniSat 2.0 beta\n");
+         
+-#if defined(__linux__)
+-        fpu_control_t oldcw, newcw;
+-        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
++#if defined(__linux__) && defined(__x86_64__)
++        fenv_t fenv;
++
++        fegetenv(&fenv);
++        fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
++        fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
++        fesetenv(&fenv);
+         printf("WARNING: for repeatability, setting FPU to use double precision\n");
+ #endif
+         // Extra options:
+diff --git a/utils/System.h b/utils/System.h
+index 1758192..840bee5 100644
+--- a/utils/System.h
++++ b/utils/System.h
+@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
+ #ifndef Minisat_System_h
+ #define Minisat_System_h
+ 
+-#if defined(__linux__)
+-#include <fpu_control.h>
++#if defined(__linux__) && defined(__x86_64__)
++#include <fenv.h>
+ #endif
+ 
+ #include "mtl/IntTypes.h"
diff --git a/pkgs/applications/science/logic/avy/glucose-fenv.patch b/pkgs/by-name/av/avy/glucose-fenv.patch
similarity index 100%
rename from pkgs/applications/science/logic/avy/glucose-fenv.patch
rename to pkgs/by-name/av/avy/glucose-fenv.patch
diff --git a/pkgs/by-name/av/avy/minisat-fenv.patch b/pkgs/by-name/av/avy/minisat-fenv.patch
new file mode 100644
index 000000000000..31e481bd6696
--- /dev/null
+++ b/pkgs/by-name/av/avy/minisat-fenv.patch
@@ -0,0 +1,57 @@
+diff --git a/core/Main.cc b/core/Main.cc
+index 2b0d97b..9ba985d 100644
+--- a/core/Main.cc
++++ b/core/Main.cc
+@@ -77,9 +77,13 @@ int main(int argc, char** argv)
+         setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n  where input may be either in plain or gzipped DIMACS.\n");
+         // printf("This is MiniSat 2.0 beta\n");
+         
+-#if defined(__linux__)
+-        fpu_control_t oldcw, newcw;
+-        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
++#if defined(__linux__) && defined(__x86_64__)
++        fenv_t fenv;
++
++        fegetenv(&fenv);
++        fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
++        fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
++        fesetenv(&fenv);
+         printf("WARNING: for repeatability, setting FPU to use double precision\n");
+ #endif
+         // Extra options:
+diff --git a/simp/Main.cc b/simp/Main.cc
+index 2804d7f..7fbdb33 100644
+--- a/simp/Main.cc
++++ b/simp/Main.cc
+@@ -78,9 +78,13 @@ int main(int argc, char** argv)
+         setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n  where input may be either in plain or gzipped DIMACS.\n");
+         // printf("This is MiniSat 2.0 beta\n");
+         
+-#if defined(__linux__)
+-        fpu_control_t oldcw, newcw;
+-        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
++#if defined(__linux__) && defined(__x86_64__)
++        fenv_t fenv;
++
++        fegetenv(&fenv);
++        fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
++        fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
++        fesetenv(&fenv);
+         printf("WARNING: for repeatability, setting FPU to use double precision\n");
+ #endif
+         // Extra options:
+diff --git a/utils/System.h b/utils/System.h
+index 1758192..840bee5 100644
+--- a/utils/System.h
++++ b/utils/System.h
+@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
+ #ifndef Minisat_System_h
+ #define Minisat_System_h
+ 
+-#if defined(__linux__)
+-#include <fpu_control.h>
++#if defined(__linux__) && defined(__x86_64__)
++#include <fenv.h>
+ #endif
+ 
+ #include "mtl/IntTypes.h"
diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/by-name/av/avy/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/avy/default.nix
rename to pkgs/by-name/av/avy/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cff8eb1308f..aaf8a4673c77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15118,8 +15118,6 @@ with pkgs;
   };
   tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix { };
 
-  avy = callPackage ../applications/science/logic/avy { };
-
   ### SCIENCE / ENGINEERING
 
   ### SCIENCE / ELECTRONICS

From e036b87a3b743b69ecd282043e6d71e223c9489f Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 17:59:11 +0200
Subject: [PATCH 2450/3724] tlaplus18: move to by-name

---
 .../tlaplus/tlaplus18.nix => by-name/tl/tlaplus18/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{applications/science/logic/tlaplus/tlaplus18.nix => by-name/tl/tlaplus18/package.nix} (100%)

diff --git a/pkgs/applications/science/logic/tlaplus/tlaplus18.nix b/pkgs/by-name/tl/tlaplus18/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/tlaplus/tlaplus18.nix
rename to pkgs/by-name/tl/tlaplus18/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aaf8a4673c77..54fcd4bae61d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15112,7 +15112,6 @@ with pkgs;
   tlaplus = callPackage ../applications/science/logic/tlaplus {
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
-  tlaplus18 = callPackage ../applications/science/logic/tlaplus/tlaplus18.nix { };
   tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {
     inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml;
   };

From d3967f76ddb8eb9343884df540e4e3b19a5f3e63 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:01:37 +0200
Subject: [PATCH 2451/3724] tlaplus-toolbox: move to by-name

---
 .../toolbox.nix => by-name/tl/tlaplus-toolbox/package.nix}       | 0
 pkgs/top-level/aliases.nix                                       | 1 +
 pkgs/top-level/all-packages.nix                                  | 1 -
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{applications/science/logic/tlaplus/toolbox.nix => by-name/tl/tlaplus-toolbox/package.nix} (100%)

diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/by-name/tl/tlaplus-toolbox/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/tlaplus/toolbox.nix
rename to pkgs/by-name/tl/tlaplus-toolbox/package.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 97dcb738c696..3c386be4aed3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2032,6 +2032,7 @@ mapAliases {
   tkcvs = tkrev; # Added 2022-03-07
   tkgate = throw "'tkgate' has been removed as it is unmaintained"; # Added 2025-05-17
   tkimg = tclPackages.tkimg; # Added 2024-10-02
+  tlaplusToolbox = tlaplus-toolbox; # Added 2025-08-21
   todiff = throw "'todiff' was removed due to lack of known users"; # Added 2025-01-25
   toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22
   tokodon = plasma5Packages.tokodon;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54fcd4bae61d..7147770e9cf0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15115,7 +15115,6 @@ with pkgs;
   tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {
     inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml;
   };
-  tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix { };
 
   ### SCIENCE / ENGINEERING
 

From 675fbe3ab6a519d0b2e3030bbdd7c4aeafa50b99 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:03:52 +0200
Subject: [PATCH 2452/3724] tlaplus: move to by-name

---
 .../default.nix => by-name/tl/tlaplus/package.nix}    | 11 ++++++-----
 pkgs/top-level/all-packages.nix                       |  3 ---
 2 files changed, 6 insertions(+), 8 deletions(-)
 rename pkgs/{applications/science/logic/tlaplus/default.nix => by-name/tl/tlaplus/package.nix} (81%)

diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/by-name/tl/tlaplus/package.nix
similarity index 81%
rename from pkgs/applications/science/logic/tlaplus/default.nix
rename to pkgs/by-name/tl/tlaplus/package.nix
index 4798e1148fcf..36bf0203b746 100644
--- a/pkgs/applications/science/logic/tlaplus/default.nix
+++ b/pkgs/by-name/tl/tlaplus/package.nix
@@ -3,7 +3,8 @@
   stdenv,
   fetchurl,
   makeWrapper,
-  jre,
+  # TODO: switch to jre https://github.com/NixOS/nixpkgs/pull/89731
+  jre8,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,13 +23,13 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/java $out/bin
     cp $src $out/share/java/tla2tools.jar
 
-    makeWrapper ${jre}/bin/java $out/bin/tlc \
+    makeWrapper ${jre8}/bin/java $out/bin/tlc \
       --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tlc2.TLC"
-    makeWrapper ${jre}/bin/java $out/bin/tlasany \
+    makeWrapper ${jre8}/bin/java $out/bin/tlasany \
       --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2sany.SANY"
-    makeWrapper ${jre}/bin/java $out/bin/pcal \
+    makeWrapper ${jre8}/bin/java $out/bin/pcal \
       --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar pcal.trans"
-    makeWrapper ${jre}/bin/java $out/bin/tlatex \
+    makeWrapper ${jre8}/bin/java $out/bin/tlatex \
       --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2tex.TLA"
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7147770e9cf0..219c66990f05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15109,9 +15109,6 @@ with pkgs;
     gmp-static = gmp.override { withStatic = true; };
   };
 
-  tlaplus = callPackage ../applications/science/logic/tlaplus {
-    jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
-  };
   tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {
     inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml;
   };

From b738a8a90bb5a99cba58f09fb187f56f8ffec92c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:06:01 +0200
Subject: [PATCH 2453/3724] yices: move to by-name

---
 .../logic/yices/default.nix => by-name/yi/yices/package.nix} | 5 ++++-
 pkgs/top-level/all-packages.nix                              | 4 ----
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename pkgs/{applications/science/logic/yices/default.nix => by-name/yi/yices/package.nix} (93%)

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/by-name/yi/yices/package.nix
similarity index 93%
rename from pkgs/applications/science/logic/yices/default.nix
rename to pkgs/by-name/yi/yices/package.nix
index 937643c4abde..d47da8915619 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/by-name/yi/yices/package.nix
@@ -3,12 +3,15 @@
   stdenv,
   fetchFromGitHub,
   cudd,
-  gmp-static,
+  gmp,
   gperf,
   autoreconfHook,
   libpoly,
 }:
 
+let
+  gmp-static = gmp.override { withStatic = true; };
+in
 stdenv.mkDerivation rec {
   pname = "yices";
   version = "2.6.5";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 219c66990f05..f617a48a2f10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15105,10 +15105,6 @@ with pkgs;
 
   why3 = callPackage ../applications/science/logic/why3 { coqPackages = coqPackages_8_20; };
 
-  yices = callPackage ../applications/science/logic/yices {
-    gmp-static = gmp.override { withStatic = true; };
-  };
-
   tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {
     inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml;
   };

From 018cff749ccb5fe83e65a590b7b3f9882f69807d Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:10:15 +0200
Subject: [PATCH 2454/3724] verit: move to by-name

---
 pkgs/by-name/is/isabelle/package.nix                        | 6 +++---
 .../verit/default.nix => by-name/ve/verit/package.nix}      | 4 ++--
 pkgs/top-level/aliases.nix                                  | 1 +
 pkgs/top-level/all-packages.nix                             | 4 ----
 4 files changed, 6 insertions(+), 9 deletions(-)
 rename pkgs/{applications/science/logic/verit/default.nix => by-name/ve/verit/package.nix} (95%)

diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
index e9d3ec865eca..21edd614080b 100644
--- a/pkgs/by-name/is/isabelle/package.nix
+++ b/pkgs/by-name/is/isabelle/package.nix
@@ -8,7 +8,7 @@
   java,
   scala_3,
   polyml,
-  veriT,
+  verit,
   vampire,
   eprover-ho,
   rlwrap,
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     polyml
-    veriT
+    verit
     vampire'
     eprover-ho
     net-tools
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs lib/Tools/ bin/
 
     cat >contrib/verit-*/etc/settings <<EOF
-      ISABELLE_VERIT=${veriT}/bin/veriT
+      ISABELLE_VERIT=${verit}/bin/veriT
     EOF
 
     cat >contrib/e-*/etc/settings <<EOF
diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/by-name/ve/verit/package.nix
similarity index 95%
rename from pkgs/applications/science/logic/verit/default.nix
rename to pkgs/by-name/ve/verit/package.nix
index df1dc578fc78..66608bddbc10 100644
--- a/pkgs/applications/science/logic/verit/default.nix
+++ b/pkgs/by-name/ve/verit/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  gccStdenv,
   fetchurl,
   autoreconfHook,
   gmp,
@@ -8,7 +8,7 @@
   bison,
 }:
 
-stdenv.mkDerivation {
+gccStdenv.mkDerivation {
   pname = "veriT";
   version = "2021.06.2";
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3c386be4aed3..d966def3c8de 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2133,6 +2133,7 @@ mapAliases {
   ventoy-bin = ventoy; # Added 2023-04-12
   ventoy-bin-full = ventoy-full; # Added 2023-04-12
   verilog = iverilog; # Added 2024-07-12
+  veriT = verit; # Added 2025-08-21
   vieb = throw "'vieb' has been removed as it doesn't satisfy our security criteria for browsers."; # Added 2025-06-25
   ViennaRNA = viennarna; # Added 2023-08-23
   vimHugeX = vim-full; # Added 2022-12-04
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f617a48a2f10..aca6eea8ff3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15099,10 +15099,6 @@ with pkgs;
     ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
   };
 
-  veriT = callPackage ../applications/science/logic/verit {
-    stdenv = gccStdenv;
-  };
-
   why3 = callPackage ../applications/science/logic/why3 { coqPackages = coqPackages_8_20; };
 
   tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {

From 51c20b27d85ed7967ae13a48b5012406d0891b7c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:12:47 +0200
Subject: [PATCH 2455/3724] spass: move to by-name

---
 .../logic/spass/default.nix => by-name/sp/spass/package.nix}  | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/science/logic/spass/default.nix => by-name/sp/spass/package.nix} (96%)

diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/by-name/sp/spass/package.nix
similarity index 96%
rename from pkgs/applications/science/logic/spass/default.nix
rename to pkgs/by-name/sp/spass/package.nix
index fff6a6b0858b..2d98238a14ae 100644
--- a/pkgs/applications/science/logic/spass/default.nix
+++ b/pkgs/by-name/sp/spass/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  gccStdenv,
   fetchurl,
   bison,
   flex,
@@ -15,7 +15,7 @@ let
     + " dfg2ascii dfg2dfg tptp2dfg dimacs2dfg pgen rescmp";
 in
 
-stdenv.mkDerivation {
+gccStdenv.mkDerivation {
   pname = "spass";
   version = "${baseVersion}.${minorVersion}";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aca6eea8ff3f..c89af425f8dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15091,10 +15091,6 @@ with pkgs;
     inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
   };
 
-  spass = callPackage ../applications/science/logic/spass {
-    stdenv = gccStdenv;
-  };
-
   statverif = callPackage ../applications/science/logic/statverif {
     ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
   };

From 85693031b6f79fa44132f20700ed81c33e0e0f39 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:13:59 +0200
Subject: [PATCH 2456/3724] leo3-bin: move to by-name

---
 .../logic/leo3/binary.nix => by-name/le/leo3-bin/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/logic/leo3/binary.nix => by-name/le/leo3-bin/package.nix} (100%)

diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/by-name/le/leo3-bin/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/leo3/binary.nix
rename to pkgs/by-name/le/leo3-bin/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c89af425f8dc..1efd523c152a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15081,8 +15081,6 @@ with pkgs;
     inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml camlp4;
   };
 
-  leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix { };
-
   prooftree = callPackage ../applications/science/logic/prooftree {
     ocamlPackages = ocaml-ng.ocamlPackages_4_12;
   };

From b4eed221114b54cb7f81f75ee2bf51eca071a66e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:15:30 +0200
Subject: [PATCH 2457/3724] glucose: move to by-name

---
 .../glucose/default.nix => by-name/gl/glucose/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                | 3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{applications/science/logic/glucose/default.nix => by-name/gl/glucose/package.nix} (100%)

diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/by-name/gl/glucose/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/glucose/default.nix
rename to pkgs/by-name/gl/glucose/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1efd523c152a..520e813e9b0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15051,8 +15051,7 @@ with pkgs;
 
   giac-with-xcas = giac.override { enableGUI = true; };
 
-  glucose = callPackage ../applications/science/logic/glucose { };
-  glucose-syrup = callPackage ../applications/science/logic/glucose {
+  glucose-syrup = glucose.override {
     enableUnfree = true;
   };
 

From 713e620c1170677951c45635e480333fbc9d0342 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:16:46 +0200
Subject: [PATCH 2458/3724] eprover: move to by-name

---
 .../eprover/default.nix => by-name/ep/eprover/package.nix}    | 0
 pkgs/top-level/all-packages.nix                               | 4 +---
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{applications/science/logic/eprover/default.nix => by-name/ep/eprover/package.nix} (100%)

diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/by-name/ep/eprover/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/eprover/default.nix
rename to pkgs/by-name/ep/eprover/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 520e813e9b0b..4c0978e95229 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15045,9 +15045,7 @@ with pkgs;
     ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
   };
 
-  eprover = callPackage ../applications/science/logic/eprover { };
-
-  eprover-ho = callPackage ../applications/science/logic/eprover { enableHO = true; };
+  eprover-ho = eprover.override { enableHO = true; };
 
   giac-with-xcas = giac.override { enableGUI = true; };
 

From 8544538777dd8e698b2b8fc7e016db7cc748c0f9 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:20:13 +0200
Subject: [PATCH 2459/3724] wolfram-notebook: move to by-name

---
 .../notebook.nix => by-name/wo/wolfram-notebook/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/math/wolfram-engine/notebook.nix => by-name/wo/wolfram-notebook/package.nix} (100%)

diff --git a/pkgs/applications/science/math/wolfram-engine/notebook.nix b/pkgs/by-name/wo/wolfram-notebook/package.nix
similarity index 100%
rename from pkgs/applications/science/math/wolfram-engine/notebook.nix
rename to pkgs/by-name/wo/wolfram-notebook/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c0978e95229..738e71256dc3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14891,8 +14891,6 @@ with pkgs;
 
   wolfram-for-jupyter-kernel = callPackage ../applications/editors/jupyter-kernels/wolfram { };
 
-  wolfram-notebook = callPackage ../applications/science/math/wolfram-engine/notebook.nix { };
-
   ### SCIENCE/MOLECULAR-DYNAMICS
 
   gromacs = callPackage ../applications/science/molecular-dynamics/gromacs {

From 1815d5ab48cd06011277e806e5a2263d709c93de Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:23:23 +0200
Subject: [PATCH 2460/3724] trilinos: move to by-name

---
 .../trilinos/default.nix => by-name/tr/trilinos/package.nix}  | 0
 pkgs/top-level/all-packages.nix                               | 4 +---
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{development/libraries/science/math/trilinos/default.nix => by-name/tr/trilinos/package.nix} (100%)

diff --git a/pkgs/development/libraries/science/math/trilinos/default.nix b/pkgs/by-name/tr/trilinos/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/trilinos/default.nix
rename to pkgs/by-name/tr/trilinos/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 738e71256dc3..d5dc4bb0c473 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14883,9 +14883,7 @@ with pkgs;
   };
   suitesparse = suitesparse_5_3;
 
-  trilinos = callPackage ../development/libraries/science/math/trilinos { };
-
-  trilinos-mpi = callPackage ../development/libraries/science/math/trilinos { withMPI = true; };
+  trilinos-mpi = trilinos.override { withMPI = true; };
 
   wolfram-engine = libsForQt5.callPackage ../applications/science/math/wolfram-engine { };
 

From 26b4107088e0b0c6dff0bf09f8c264a937b62c14 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:26:04 +0200
Subject: [PATCH 2461/3724] mathematica: move to by-name

---
 .../science/math => by-name/ma}/mathematica/generic.nix   | 0
 .../default.nix => by-name/ma/mathematica/package.nix}    | 0
 .../science/math => by-name/ma}/mathematica/versions.nix  | 0
 pkgs/top-level/all-packages.nix                           | 8 +++-----
 4 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/{applications/science/math => by-name/ma}/mathematica/generic.nix (100%)
 rename pkgs/{applications/science/math/mathematica/default.nix => by-name/ma/mathematica/package.nix} (100%)
 rename pkgs/{applications/science/math => by-name/ma}/mathematica/versions.nix (100%)

diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/by-name/ma/mathematica/generic.nix
similarity index 100%
rename from pkgs/applications/science/math/mathematica/generic.nix
rename to pkgs/by-name/ma/mathematica/generic.nix
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/by-name/ma/mathematica/package.nix
similarity index 100%
rename from pkgs/applications/science/math/mathematica/default.nix
rename to pkgs/by-name/ma/mathematica/package.nix
diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/by-name/ma/mathematica/versions.nix
similarity index 100%
rename from pkgs/applications/science/math/mathematica/versions.nix
rename to pkgs/by-name/ma/mathematica/versions.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5dc4bb0c473..65fca7e14871 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14855,17 +14855,15 @@ with pkgs;
     rocmSupport = true;
   };
 
-  mathematica = callPackage ../applications/science/math/mathematica { };
-
-  mathematica-webdoc = callPackage ../applications/science/math/mathematica {
+  mathematica-webdoc = mathematica.override {
     webdoc = true;
   };
 
-  mathematica-cuda = callPackage ../applications/science/math/mathematica {
+  mathematica-cuda = mathematica.override {
     cudaSupport = true;
   };
 
-  mathematica-webdoc-cuda = callPackage ../applications/science/math/mathematica {
+  mathematica-webdoc-cuda = mathematica.override {
     webdoc = true;
     cudaSupport = true;
   };

From 19b88033f346845731cb447bb9faa7dd3161e566 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:27:37 +0200
Subject: [PATCH 2462/3724] sc2-headless: move to by-name

---
 .../machine-learning => by-name/sc}/sc2-headless/maps.nix       | 0
 .../default.nix => by-name/sc/sc2-headless/package.nix}         | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{applications/science/machine-learning => by-name/sc}/sc2-headless/maps.nix (100%)
 rename pkgs/{applications/science/machine-learning/sc2-headless/default.nix => by-name/sc/sc2-headless/package.nix} (100%)

diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/by-name/sc/sc2-headless/maps.nix
similarity index 100%
rename from pkgs/applications/science/machine-learning/sc2-headless/maps.nix
rename to pkgs/by-name/sc/sc2-headless/maps.nix
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/by-name/sc/sc2-headless/package.nix
similarity index 100%
rename from pkgs/applications/science/machine-learning/sc2-headless/default.nix
rename to pkgs/by-name/sc/sc2-headless/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65fca7e14871..41f0920c9bb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14813,8 +14813,6 @@ with pkgs;
 
   ### SCIENCE/MACHINE LEARNING
 
-  sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { };
-
   streamlit = with python3Packages; toPythonApplication streamlit;
 
   ### SCIENCE/MATH

From 42f42f268541c37f9a8e26c991cb4a4b81552d47 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:28:56 +0200
Subject: [PATCH 2463/3724] obitools3: move to by-name

---
 .../obitools/obitools3.nix => by-name/ob/obitools3/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/biology/obitools/obitools3.nix => by-name/ob/obitools3/package.nix} (100%)

diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/by-name/ob/obitools3/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/obitools/obitools3.nix
rename to pkgs/by-name/ob/obitools3/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41f0920c9bb3..d50c4a123674 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14795,8 +14795,6 @@ with pkgs;
     inherit (perlPackages) perl TextFormat;
   };
 
-  obitools3 = callPackage ../applications/science/biology/obitools/obitools3.nix { };
-
   raxml-mpi = raxml.override { useMpi = true; };
 
   trimmomatic = callPackage ../applications/science/biology/trimmomatic {

From 47a1c7e207ebb73c1928f330b60286ad925becf7 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:29:58 +0200
Subject: [PATCH 2464/3724] nest: move to by-name

---
 .../biology/nest/default.nix => by-name/ne/nest/package.nix}  | 0
 pkgs/top-level/all-packages.nix                               | 4 +---
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{applications/science/biology/nest/default.nix => by-name/ne/nest/package.nix} (100%)

diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/by-name/ne/nest/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/nest/default.nix
rename to pkgs/by-name/ne/nest/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d50c4a123674..b64cc9b1c3b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14780,9 +14780,7 @@ with pkgs;
     inherit (llvmPackages) openmp;
   };
 
-  nest = callPackage ../applications/science/biology/nest { };
-
-  nest-mpi = callPackage ../applications/science/biology/nest { withMpi = true; };
+  nest-mpi = nest.override { withMpi = true; };
 
   neuron-mpi = neuron.override { useMpi = true; };
 

From cbc026c36ed4c8c1bfca29209b04cab8414260bc Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:31:37 +0200
Subject: [PATCH 2465/3724] blast-bin: move to by-name

---
 .../biology/blast/bin.nix => by-name/bl/blast-bin/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/biology/blast/bin.nix => by-name/bl/blast-bin/package.nix} (100%)

diff --git a/pkgs/applications/science/biology/blast/bin.nix b/pkgs/by-name/bl/blast-bin/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/blast/bin.nix
rename to pkgs/by-name/bl/blast-bin/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b64cc9b1c3b9..1ceb6ef03937 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14766,8 +14766,6 @@ with pkgs;
 
   blast = callPackage ../applications/science/biology/blast { };
 
-  blast-bin = callPackage ../applications/science/biology/blast/bin.nix { };
-
   cd-hit = callPackage ../applications/science/biology/cd-hit {
     inherit (llvmPackages) openmp;
   };

From 33f763318aa1c95a714fdf22be95c0fe858bc6d8 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:32:28 +0200
Subject: [PATCH 2466/3724] blast: move to by-name

---
 .../science/biology => by-name/bl}/blast/no_slash_bin.patch     | 0
 .../biology/blast/default.nix => by-name/bl/blast/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{applications/science/biology => by-name/bl}/blast/no_slash_bin.patch (100%)
 rename pkgs/{applications/science/biology/blast/default.nix => by-name/bl/blast/package.nix} (100%)

diff --git a/pkgs/applications/science/biology/blast/no_slash_bin.patch b/pkgs/by-name/bl/blast/no_slash_bin.patch
similarity index 100%
rename from pkgs/applications/science/biology/blast/no_slash_bin.patch
rename to pkgs/by-name/bl/blast/no_slash_bin.patch
diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/by-name/bl/blast/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/blast/default.nix
rename to pkgs/by-name/bl/blast/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ceb6ef03937..51bc88c8e523 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14764,8 +14764,6 @@ with pkgs;
 
   ### SCIENCE/BIOLOGY
 
-  blast = callPackage ../applications/science/biology/blast { };
-
   cd-hit = callPackage ../applications/science/biology/cd-hit {
     inherit (llvmPackages) openmp;
   };

From f75522c6b9f06efe8da5d9fa896b94c923b70e94 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:34:06 +0200
Subject: [PATCH 2467/3724] tetgen_1_4: move to by-name

---
 .../tetgen/1.4.nix => by-name/te/tetgen_1_4/package.nix}         | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{applications/science/geometry/tetgen/1.4.nix => by-name/te/tetgen_1_4/package.nix} (100%)

diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/by-name/te/tetgen_1_4/package.nix
similarity index 100%
rename from pkgs/applications/science/geometry/tetgen/1.4.nix
rename to pkgs/by-name/te/tetgen_1_4/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51bc88c8e523..423e99246a36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14758,7 +14758,6 @@ with pkgs;
   ### SCIENCE/GEOMETRY
 
   tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+
-  tetgen_1_4 = callPackage ../applications/science/geometry/tetgen/1.4.nix { }; # MIT
 
   ### SCIENCE/BENCHMARK
 

From 5226c75abcbea4acd0567b72a64a58169f53c92e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:34:48 +0200
Subject: [PATCH 2468/3724] tetgen: move to by-name

---
 .../tetgen/default.nix => by-name/te/tetgen/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/geometry/tetgen/default.nix => by-name/te/tetgen/package.nix} (100%)

diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/by-name/te/tetgen/package.nix
similarity index 100%
rename from pkgs/applications/science/geometry/tetgen/default.nix
rename to pkgs/by-name/te/tetgen/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 423e99246a36..28e8636f4dbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14757,8 +14757,6 @@ with pkgs;
 
   ### SCIENCE/GEOMETRY
 
-  tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+
-
   ### SCIENCE/BENCHMARK
 
   ### SCIENCE/BIOLOGY

From fbe6781b6795c0c243d30d2abd232d1b8cf8b4ca Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <ataraxiadev@ataraxiadev.com>
Date: Thu, 21 Aug 2025 19:51:14 +0300
Subject: [PATCH 2469/3724] ivpn: remove ataraxiasjel as maintainer

---
 pkgs/tools/networking/ivpn/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/ivpn/default.nix b/pkgs/tools/networking/ivpn/default.nix
index 80c977d3d970..c90c674d6dca 100644
--- a/pkgs/tools/networking/ivpn/default.nix
+++ b/pkgs/tools/networking/ivpn/default.nix
@@ -52,10 +52,7 @@ builtins.mapAttrs
           homepage = "https://www.ivpn.net/apps";
           changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${version}";
           license = lib.licenses.gpl3Only;
-          maintainers = with lib.maintainers; [
-            urandom
-            ataraxiasjel
-          ];
+          maintainers = with lib.maintainers; [ urandom ];
           mainProgram = "ivpn";
         };
       }

From 009f4e936d5d0991245f0b6dec14f7804ee340b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 16:51:35 +0000
Subject: [PATCH 2470/3724] hyperrogue: 13.0y -> 13.1c

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

diff --git a/pkgs/by-name/hy/hyperrogue/package.nix b/pkgs/by-name/hy/hyperrogue/package.nix
index fcfc6de99e13..a77b73b832ea 100644
--- a/pkgs/by-name/hy/hyperrogue/package.nix
+++ b/pkgs/by-name/hy/hyperrogue/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyperrogue";
-  version = "13.0y";
+  version = "13.1c";
 
   src = fetchFromGitHub {
     owner = "zenorogue";
     repo = "hyperrogue";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-GSoVydydn56MlZhsY1GgddlqkjwM6GWuwuzVBu9usHY=";
+    sha256 = "sha256-OkLi1FCxlm+bdjF5YC0kgfbSSjdh5wN1LTOcp6vqCuw=";
   };
 
   env = {

From 239bef1ab721f5c015d56a377de67a46bab4aca8 Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <ataraxiadev@ataraxiadev.com>
Date: Thu, 21 Aug 2025 19:53:28 +0300
Subject: [PATCH 2471/3724] mullvad-vpn: remove ataraxiasjel as maintainer

---
 pkgs/by-name/mu/mullvad-vpn/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix
index 89fb8adb2e74..94000803e2f7 100644
--- a/pkgs/by-name/mu/mullvad-vpn/package.nix
+++ b/pkgs/by-name/mu/mullvad-vpn/package.nix
@@ -163,7 +163,6 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [
       Br1ght0ne
       ymarkus
-      ataraxiasjel
     ];
   };
 }

From 63a9da2879b5c8d5daf565a5cb614ee05353a4ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 16:59:25 +0000
Subject: [PATCH 2472/3724] bitrise: 2.33.0 -> 2.33.2

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

diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix
index 6f75e4e69fa1..3eb2e43690b3 100644
--- a/pkgs/by-name/bi/bitrise/package.nix
+++ b/pkgs/by-name/bi/bitrise/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "bitrise";
-  version = "2.33.0";
+  version = "2.33.2";
 
   src = fetchFromGitHub {
     owner = "bitrise-io";
     repo = "bitrise";
     rev = "v${version}";
-    hash = "sha256-MpXJQHmpE9s3GYpqyrWCTBIzMCdb+nBAw+2DXmnK3Lw=";
+    hash = "sha256-ckiozGSk8a0bzTzj8PuN55rrL2r95BylYRUHZdQF+Kc=";
   };
 
   # many tests rely on writable $HOME/.bitrise and require network access

From c76be00b8e3bb8004e8ad51d03d8bdd95b390013 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 21 Aug 2025 13:59:27 -0300
Subject: [PATCH 2473/3724] roslyn-ls: add initialisation tests

---
 pkgs/by-name/ro/roslyn-ls/package.nix | 44 +++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
index bd5385c56cb9..87ec6e89e5e5 100644
--- a/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -8,6 +8,8 @@
   roslyn-ls,
   jq,
   writeText,
+  runCommand,
+  expect,
 }:
 let
   pname = "roslyn-ls";
@@ -48,7 +50,7 @@ let
   '';
 
 in
-buildDotnetModule rec {
+buildDotnetModule (finalAttrs: rec {
   inherit pname dotnet-sdk dotnet-runtime;
 
   vsVersion = "2.87.26";
@@ -121,7 +123,43 @@ buildDotnetModule rec {
   '';
 
   passthru = {
-    tests.version = testers.testVersion { package = roslyn-ls; };
+    tests =
+      let
+        with-sdk =
+          sdk:
+          runCommand "with-${if sdk ? version then sdk.version else "no"}-sdk"
+            {
+              nativeBuildInputs = [
+                finalAttrs.finalPackage
+                sdk
+                expect
+              ];
+              meta.timeout = 60;
+            }
+            ''
+              HOME=$TMPDIR
+              expect <<"EOF"
+                spawn ${meta.mainProgram} --stdio --logLevel Information --extensionLogDirectory log
+                expect_before timeout {
+                  send_error "timeout!\n"
+                  exit 1
+                }
+                expect "Language server initialized"
+                send \x04
+                expect eof
+                catch wait result
+                exit [lindex $result 3]
+              EOF
+              touch $out
+            '';
+      in
+      {
+        # Make sure we can run with any supported SDK version, as well as without
+        with-net9-sdk = with-sdk dotnetCorePackages.sdk_9_0;
+        with-net10-sdk = with-sdk dotnetCorePackages.sdk_10_0;
+        no-sdk = with-sdk null;
+        version = testers.testVersion { package = finalAttrs.finalPackage; };
+      };
     updateScript = ./update.sh;
   };
 
@@ -133,4 +171,4 @@ buildDotnetModule rec {
     maintainers = with lib.maintainers; [ konradmalik ];
     mainProgram = "Microsoft.CodeAnalysis.LanguageServer";
   };
-}
+})

From 044c60a75e1ebce01e6ee0c95d0b7af670887155 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 17:12:48 +0000
Subject: [PATCH 2474/3724] gitify: 6.5.0 -> 6.6.0

---
 pkgs/by-name/gi/gitify/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix
index b74978eb712c..1fc3d39a0fbe 100644
--- a/pkgs/by-name/gi/gitify/package.nix
+++ b/pkgs/by-name/gi/gitify/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gitify";
-  version = "6.5.0";
+  version = "6.6.0";
 
   src = fetchFromGitHub {
     owner = "gitify-app";
     repo = "gitify";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nFOlzHrtkIYB2shaGnSboqI0HKycTBlu7IkmKwudP5w=";
+    hash = "sha256-cYbIXrvo8K63SusPMD4e2MmtHl4h84eiJb30SIHke/0=";
   };
 
   nativeBuildInputs = [
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-GEUI44QDi1ooq0qXP3lTFp7mVyVJY+TJKv3D1UCe8NI=";
+    hash = "sha256-oUjlLE7PzA4wfiQlVPnAYk3MF/lqD7hb+k++0RFGvw4=";
   };
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;

From f646e56d7af1aded3eea109b949a4acdd925f307 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 21 Aug 2025 16:31:30 +0100
Subject: [PATCH 2475/3724] ci: disable aliases in CI's pkgs instance
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This ensures we don't accidentally use aliases in the nixpkgs shell or
other places that depend on the CI-pinned pkgs instance.

Nixpkgs generally — and CI specifically — do not use aliases, because we
want to ensure they are not load-bearing and can be removed safely.

See: https://github.com/NixOS/nixpkgs/blob/ce9979ec1c/pkgs/top-level/release-outpaths.nix#L28
---
 ci/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ci/default.nix b/ci/default.nix
index 6aa82cb716e5..da6e3f877e3b 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -17,7 +17,12 @@ let
     else
       nixpkgs;
 
-  pkgs = import nixpkgs' { inherit system; };
+  pkgs = import nixpkgs' {
+    inherit system;
+    # Nixpkgs generally — and CI specifically — do not use aliases,
+    # because we want to ensure they are not load-bearing.
+    allowAliases = false;
+  };
 
   fmt =
     let

From 00c2bcdbdd8c94c4b3a4c46b1b3cdbecca4fbfe3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 17:21:56 +0000
Subject: [PATCH 2476/3724] python3Packages.pytorch-metric-learning: 2.8.1 ->
 2.9.0

---
 .../python-modules/pytorch-metric-learning/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix
index 946927c65e6e..f48157cae2a5 100644
--- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix
+++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "pytorch-metric-learning";
-  version = "2.8.1";
+  version = "2.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "KevinMusgrave";
     repo = "pytorch-metric-learning";
     tag = "v${version}";
-    hash = "sha256-WO/gv8rKkxY3pR627WrEPVyvZnvUZIKMzOierIW8bJA=";
+    hash = "sha256-JKWE2wVXVx8xp2kpiX6CxvCKkrwYRW80A20K/UTxIaQ=";
   };
 
   build-system = [
@@ -108,7 +108,7 @@ buildPythonPackage rec {
   meta = {
     description = "Metric learning library for PyTorch";
     homepage = "https://github.com/KevinMusgrave/pytorch-metric-learning";
-    changelog = "https://github.com/KevinMusgrave/pytorch-metric-learning/releases/tag/v${version}";
+    changelog = "https://github.com/KevinMusgrave/pytorch-metric-learning/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bcdarwin ];
   };

From 4d1bdbc2f203a811377d1a0e4612efa481f1e522 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Aug 2025 22:39:33 +0000
Subject: [PATCH 2477/3724] python3Packages.botorch: 0.14.0 -> 0.15.1

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

diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix
index 6bc5764d2fe9..4253117e7563 100644
--- a/pkgs/development/python-modules/botorch/default.nix
+++ b/pkgs/development/python-modules/botorch/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "botorch";
-  version = "0.14.0";
+  version = "0.15.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "botorch";
     tag = "v${version}";
-    hash = "sha256-IyRi5kXePnDv2q6SrXLtdltQ1/2/zQ3EBx5phtuX8sE=";
+    hash = "sha256-6hAsKIlwycZtLZn1vkcu4fR85uACA4FSkT5e/wos17A=";
   };
 
   build-system = [

From 5c60b33ecbad94eae9d221796ca28f340b843825 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 17:51:02 +0000
Subject: [PATCH 2478/3724] got: 0.116 -> 0.117

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

diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix
index 75a3c3cee44e..719a2c3f07bf 100644
--- a/pkgs/by-name/go/got/package.nix
+++ b/pkgs/by-name/go/got/package.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "got";
-  version = "0.116";
+  version = "0.117";
 
   src = fetchurl {
     url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz";
-    hash = "sha256-6KZK1zuCwbbfnfnaWj6Nqb5gUcNJc3mUCAaHjZWOTf8=";
+    hash = "sha256-jVP/1vX1dJukdHU+R+RejlPVfeVBvouzsM6Oj8IzwUE=";
   };
 
   nativeBuildInputs = [

From 95958adc52520b69ec64c61585d35ea2120c57c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 18:09:49 +0000
Subject: [PATCH 2479/3724] empire-compiler: 0.3.3 -> 0.3.4

---
 pkgs/by-name/em/empire-compiler/deps.json   | 45 +++------------------
 pkgs/by-name/em/empire-compiler/package.nix |  4 +-
 2 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/pkgs/by-name/em/empire-compiler/deps.json b/pkgs/by-name/em/empire-compiler/deps.json
index 08a7b778e4ab..0ed51e27a4d4 100644
--- a/pkgs/by-name/em/empire-compiler/deps.json
+++ b/pkgs/by-name/em/empire-compiler/deps.json
@@ -1,19 +1,4 @@
 [
-  {
-    "pname": "Microsoft.AspNetCore.App.Ref",
-    "version": "6.0.36",
-    "hash": "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
-    "version": "6.0.36",
-    "hash": "sha256-JQULJyF0ivLoUU1JaFfK/HHg+/qzpN7V2RR2Cc+WlQ4="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
-    "version": "6.0.36",
-    "hash": "sha256-zUsVIpV481vMLAXaLEEUpEMA9/f1HGOnvaQnaWdzlyY="
-  },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
     "version": "3.0.0-beta2.20059.3",
@@ -29,31 +14,6 @@
     "version": "3.5.0",
     "hash": "sha256-D/1EQqFrTiwACdknW0fpodraz9JaA+ebIrQVLMw8pc8="
   },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-arm64",
-    "version": "6.0.36",
-    "hash": "sha256-9lC/LYnthYhjkWWz2kkFCvlA5LJOv11jdt59SDnpdy0="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-x64",
-    "version": "6.0.36",
-    "hash": "sha256-VFRDzx7LJuvI5yzKdGmw/31NYVbwHWPKQvueQt5xc10="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Ref",
-    "version": "6.0.36",
-    "hash": "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
-    "version": "6.0.36",
-    "hash": "sha256-k3rxvUhCEU0pVH8KgEMtkPiSOibn+nBh+0zT2xIfId8="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
-    "version": "6.0.36",
-    "hash": "sha256-U8wJ2snSDFqeAgDVLXjnniidC7Cr5aJ1/h/BMSlyu0c="
-  },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "2.1.2",
@@ -84,6 +44,11 @@
     "version": "1.6.0",
     "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
   },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "4.5.2",
+    "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="
+  },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "4.6.0",
diff --git a/pkgs/by-name/em/empire-compiler/package.nix b/pkgs/by-name/em/empire-compiler/package.nix
index 4b720aeb0889..af9cec139d07 100644
--- a/pkgs/by-name/em/empire-compiler/package.nix
+++ b/pkgs/by-name/em/empire-compiler/package.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "empire-compiler";
-  version = "0.3.3";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "bc-security";
     repo = "empire-compiler";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1SzP3oopmYy2Xv0CFxID4lSVZ65/MARd1O0w2zpdeyc=";
+    hash = "sha256-HV61N76yNh16TL93L0LlBWBar1/AzHNX5/zsxl65AGM=";
   };
 
   postPatch = ''

From 659f94c5f7c41ac3f117a60b002d2d33a37862b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 18:14:08 +0000
Subject: [PATCH 2480/3724] azurehound: 2.6.0 -> 2.7.0

---
 pkgs/by-name/az/azurehound/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix
index 41dfb77cfc92..855f09289ed1 100644
--- a/pkgs/by-name/az/azurehound/package.nix
+++ b/pkgs/by-name/az/azurehound/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "azurehound";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "SpecterOps";
     repo = "AzureHound";
     tag = "v${version}";
-    hash = "sha256-gyXra6MIDVDNA9ls5KLctSkG42vE6FkE/ILOipOoBzw=";
+    hash = "sha256-UmEgrADPolWw1Ml1nHobH9xHjG9cIL6Rzup42Bw6GAU=";
   };
 
-  vendorHash = "sha256-Z8mF1etDiB8lavprf5Xpqk3cV41ezexWc/uZuu50DoA=";
+  vendorHash = "sha256-ScFHEIarDvxd9R6eUONdECmtK+5aZRdo71khljLz8c4=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 

From a3654dec49c4d0fe213e8856b6c6d890b452d73b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 18:36:56 +0000
Subject: [PATCH 2481/3724] isle-portable: 0-unstable-2025-08-12 ->
 0-unstable-2025-08-21

---
 pkgs/by-name/is/isle-portable/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/is/isle-portable/package.nix b/pkgs/by-name/is/isle-portable/package.nix
index e1a4e0624dcc..449bade34ce2 100644
--- a/pkgs/by-name/is/isle-portable/package.nix
+++ b/pkgs/by-name/is/isle-portable/package.nix
@@ -29,13 +29,13 @@
 stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
   name = "isle-portable";
-  version = "0-unstable-2025-08-12";
+  version = "0-unstable-2025-08-21";
 
   src = fetchFromGitHub {
     owner = "isledecomp";
     repo = "isle-portable";
-    rev = "f4a28f27f9d4b0e3511a86170d5b626c86720841";
-    hash = "sha256-IZoX6yu4edA8JR4Q2qsIHeQ4ygW/av2QdPScqJbHUi4=";
+    rev = "ef2eaf04bf09c8827139ad4c06cea24ea8ab6942";
+    hash = "sha256-rOF8DZck3TVvfP4Ho4hvlAZmhAhbGD+Q91yk/pvXv3o=";
     fetchSubmodules = true;
   };
 

From 792510f0c7ebb3a301c5bb138fde72341a3fa7ab Mon Sep 17 00:00:00 2001
From: Sean Gilligan <sean@msgilligan.com>
Date: Thu, 21 Aug 2025 11:39:54 -0700
Subject: [PATCH 2482/3724] graalvm-oracle_25-ea: 25-ea-33 -> 25-ea-34

---
 pkgs/development/compilers/graalvm/default.nix |  2 +-
 .../graalvm/graalvm-oracle/hashes.nix          | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index beebfefbd0ab..a8d1d91556d3 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -24,7 +24,7 @@ lib.makeScope pkgs.newScope (
     truffleruby = self.callPackage ./community-edition/truffleruby { };
 
     graalvm-oracle_25-ea =
-      (self.callPackage ./graalvm-oracle { version = "25-ea-33"; }).overrideAttrs
+      (self.callPackage ./graalvm-oracle { version = "25-ea-34"; }).overrideAttrs
         (prev: {
           autoPatchelfIgnoreMissingDeps = [ "libonnxruntime.so.1" ];
         });
diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
index 34ab3e90724a..6b3860592b6c 100644
--- a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
+++ b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
@@ -4,22 +4,22 @@
 # $ rg -No "(https://.+)\"" -r '$1' pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix | \
 #   parallel -k 'echo {}; nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(curl -s {}.sha256)'
 {
-  "25-ea-33" = {
+  "25-ea-34" = {
     "aarch64-linux" = {
-      hash = "sha256-VUwXu1zjjWY0K6aEpU0LhBvrz+y+H5lcspNON4Qaw6k=";
-      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.33/graalvm-jdk-25.0.0-ea.33_linux-aarch64_bin.tar.gz";
+      hash = "sha256-QS3AgGG0++k3B7ollL9X2AOcjeH468fJID+mTl+eVEo=";
+      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.34/graalvm-jdk-25.0.0-ea.34_linux-aarch64_bin.tar.gz";
     };
     "x86_64-linux" = {
-      hash = "sha256-NU+tdKR9OlyE8RTVlS2w+a95ZUHBD2LDpXkqTnOL7No=";
-      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.33/graalvm-jdk-25.0.0-ea.33_linux-x64_bin.tar.gz";
+      hash = "sha256-cBFyLiFaTX8MepRhfO/dvvqx8M6lto+JMdCdy8X6YBI=";
+      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.34/graalvm-jdk-25.0.0-ea.34_linux-x64_bin.tar.gz";
     };
     "x86_64-darwin" = {
-      hash = "sha256-TIKRKrYFjAG2BpQVp8mtbMkUlqYUpTy7R2pDH3D5Hag=";
-      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.33/graalvm-jdk-25.0.0-ea.33_macos-x64_bin.tar.gz";
+      hash = "sha256-E4N8UnE74oGzpsUGYINuSZjjgZCYn43uwv4/eDtdZ+s=";
+      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.34/graalvm-jdk-25.0.0-ea.34_macos-x64_bin.tar.gz";
     };
     "aarch64-darwin" = {
-      hash = "sha256-hquwVXWFcGMOdmMbZHNtkYyojDKRosIi40jXOmkNlmE=";
-      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.33/graalvm-jdk-25.0.0-ea.33_macos-aarch64_bin.tar.gz";
+      hash = "sha256-C0TnIFmhDLzI9QYqHJbZAQWvJNb1zX4PEOXp3JXV1hk=";
+      url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.34/graalvm-jdk-25.0.0-ea.34_macos-aarch64_bin.tar.gz";
     };
   };
   "23" = {

From 6434cf0b18befedbe99f006505c0fc07c4883da6 Mon Sep 17 00:00:00 2001
From: rowan amber-jones <roarch@proton.me>
Date: Sat, 9 Aug 2025 19:18:21 +0100
Subject: [PATCH 2483/3724] nixos/restic: add command option

Add module support for --stdin-from-command flag, which was added to
restic in https://github.com/restic/restic/pull/4410. I also made a few
very small changes here and there in the nix code to make it look a
little neater in my opinion.

I could potentially add support for the --stdin flag too, but this would
require prepending the restic command with an external command and a
pipe, which seems a bit messy - and the restic documentation says to
prefer --stdin-from-command over --stdin anyway.

I could add an option for --stdin-filename, but I feel that this would
be better for users to do in extraBackupArgs.
---
 nixos/modules/services/backup/restic.nix | 79 +++++++++++++++++++-----
 1 file changed, 65 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix
index 3df51858bce8..63ff7916ab10 100644
--- a/nixos/modules/services/backup/restic.nix
+++ b/nixos/modules/services/backup/restic.nix
@@ -146,6 +146,21 @@ in
               ];
             };
 
+            command = lib.mkOption {
+              type = lib.types.listOf lib.types.str;
+              default = [ ];
+              description = ''
+                Command to pass to --stdin-from-command. If null or an empty array, and `paths`/`dynamicFilesFrom`
+                are also null, no backup command will be run.
+              '';
+              example = [
+                "sudo"
+                "-u"
+                "postgres"
+                "pg_dumpall"
+              ];
+            };
+
             exclude = lib.mkOption {
               type = lib.types.listOf lib.types.str;
               default = [ ];
@@ -238,7 +253,7 @@ in
 
             runCheck = lib.mkOption {
               type = lib.types.bool;
-              default = (builtins.length config.services.restic.backups.${name}.checkOpts > 0);
+              default = builtins.length config.services.restic.backups.${name}.checkOpts > 0;
               defaultText = lib.literalExpression ''builtins.length config.services.backups.${name}.checkOpts > 0'';
               description = "Whether to run the `check` command with the provided `checkOpts` options.";
               example = true;
@@ -327,14 +342,44 @@ in
           RandomizedDelaySec = "5h";
         };
       };
+      commandbackup = {
+        command = [
+          "\${lib.getExe pkgs.sudo}"
+          "-u postgres"
+          "\${pkgs.postgresql}/bin/pg_dumpall"
+        ];
+        extraBackupArgs = [ "--tag database" ];
+        repository = "s3:example.com/mybucket";
+        passwordFile = "/etc/nixos/secrets/restic-password";
+        environmentFile = "/etc/nixos/secrets/restic-environment";
+        pruneOpts = [
+          "--keep-daily 14"
+          "--keep-weekly 4"
+          "--keep-monthly 2"
+          "--group-by tags"
+        ];
+      };
     };
   };
 
   config = {
-    assertions = lib.mapAttrsToList (n: v: {
-      assertion = (v.repository == null) != (v.repositoryFile == null);
-      message = "services.restic.backups.${n}: exactly one of repository or repositoryFile should be set";
-    }) config.services.restic.backups;
+    assertions = lib.flatten (
+      lib.mapAttrsToList (name: backup: [
+        {
+          assertion = (backup.repository == null) != (backup.repositoryFile == null);
+          message = "services.restic.backups.${name}: exactly one of repository or repositoryFile should be set";
+        }
+        {
+          assertion =
+            let
+              fileBackup = (backup.paths != null && backup.paths != [ ]) || backup.dynamicFilesFrom != null;
+              commandBackup = backup.command != [ ];
+            in
+            !(fileBackup && commandBackup);
+          message = "services.restic.backups.${name}: cannot do both a command backup and a file backup at the same time.";
+        }
+      ]) config.services.restic.backups
+    );
     systemd.services = lib.mapAttrs' (
       name: backup:
       let
@@ -351,7 +396,9 @@ in
           backup.exclude != [ ]
         ) "--exclude-file=${pkgs.writeText "exclude-patterns" (lib.concatStringsSep "\n" backup.exclude)}";
         filesFromTmpFile = "/run/restic-backups-${name}/includes";
-        doBackup = (backup.dynamicFilesFrom != null) || (backup.paths != null && backup.paths != [ ]);
+        fileBackup = (backup.dynamicFilesFrom != null) || (backup.paths != null && backup.paths != [ ]);
+        commandBackup = backup.command != [ ];
+        doBackup = fileBackup || commandBackup;
         pruneCmd = lib.optionals (builtins.length backup.pruneOpts > 0) [
           (resticCmd + " unlock")
           (resticCmd + " forget --prune " + (lib.concatStringsSep " " backup.pruneOpts))
@@ -397,11 +444,15 @@ in
           serviceConfig = {
             Type = "oneshot";
             ExecStart =
-              (lib.optionals doBackup [
+              lib.optionals doBackup [
                 "${resticCmd} backup ${
-                  lib.concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)
-                } --files-from=${filesFromTmpFile}"
-              ])
+                  lib.concatStringsSep " " (
+                    backup.extraBackupArgs
+                    ++ lib.optionals fileBackup (excludeFlags ++ [ "--files-from=${filesFromTmpFile}" ])
+                    ++ lib.optionals commandBackup ([ "--stdin-from-command=true --" ] ++ backup.command)
+                  )
+                }"
+              ]
               ++ pruneCmd
               ++ checkCmd;
             User = backup.user;
@@ -419,7 +470,7 @@ in
             ${lib.optionalString (backup.backupPrepareCommand != null) ''
               ${pkgs.writeScript "backupPrepareCommand" backup.backupPrepareCommand}
             ''}
-            ${lib.optionalString (backup.initialize) ''
+            ${lib.optionalString backup.initialize ''
               ${resticCmd} cat config > /dev/null || ${resticCmd} init
             ''}
             ${lib.optionalString (backup.paths != null && backup.paths != [ ]) ''
@@ -435,7 +486,7 @@ in
             ${lib.optionalString (backup.backupCleanupCommand != null) ''
               ${pkgs.writeScript "backupCleanupCommand" backup.backupCleanupCommand}
             ''}
-            ${lib.optionalString doBackup ''
+            ${lib.optionalString fileBackup ''
               rm ${filesFromTmpFile}
             ''}
           '';
@@ -446,7 +497,7 @@ in
       name: backup:
       lib.nameValuePair "restic-backups-${name}" {
         wantedBy = [ "timers.target" ];
-        timerConfig = backup.timerConfig;
+        inherit (backup) timerConfig;
       }
     ) (lib.filterAttrs (_: backup: backup.timerConfig != null) config.services.restic.backups);
 
@@ -464,7 +515,7 @@ in
         ${lib.pipe config.systemd.services."restic-backups-${name}".environment [
           (lib.filterAttrs (n: v: v != null && n != "PATH"))
           (lib.mapAttrs (_: v: "${v}"))
-          (lib.toShellVars)
+          lib.toShellVars
         ]}
         PATH=${config.systemd.services."restic-backups-${name}".environment.PATH}:$PATH
 

From 73f8c1e61ef9adca6aba6f13c892c027d3cf6547 Mon Sep 17 00:00:00 2001
From: rowan amber-jones <roarch@proton.me>
Date: Sat, 9 Aug 2025 19:20:23 +0100
Subject: [PATCH 2484/3724] nixos/restic: add test for command option, add
 release notes

Test checks that we are able to run a backup from a command, and that
the resulting backup has the contents that we passed into it.
---
 .../manual/release-notes/rl-2511.section.md   |  2 ++
 nixos/tests/restic.nix                        | 22 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index b13dac4e5e6e..08abce583e06 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -204,6 +204,8 @@
 
 - Immich now has support for [VectorChord](https://github.com/tensorchord/VectorChord) when using the PostgreSQL configuration provided by `services.immich.database.enable`, which replaces `pgvecto-rs`. VectorChord support can be toggled with the option `services.immich.database.enableVectorChord`. Additionally, `pgvecto-rs` support is now disabled from NixOS 25.11 onwards using the option `services.immich.database.enableVectors`. This option will be removed fully in the future once Immich drops support for `pgvecto-rs` fully. See [Immich migration instructions](#module-services-immich-vectorchord-migration)
 
+- `services.restic.backups` now includes a `command` option for passing a command to the [--stdin-from-command](https://github.com/restic/restic/pull/4410) flag.
+
 - `services.postsrsd` now automatically integrates with the local Postfix instance, when enabled. This behavior can disabled using the [services.postsrsd.configurePostfix](#opt-services.postsrsd.configurePostfix) option.
 
 - `services.pfix-srsd` now automatically integrates with the local Postfix instance, when enabled. This behavior can disabled using the [services.pfix-srsd.configurePostfix](#opt-services.pfix-srsd.configurePostfix) option.
diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix
index 343c75cb9948..68777215c035 100644
--- a/nixos/tests/restic.nix
+++ b/nixos/tests/restic.nix
@@ -1,5 +1,4 @@
 { pkgs, ... }:
-
 let
   inherit (import ./ssh-keys.nix pkgs)
     snakeOilEd25519PrivateKey
@@ -8,6 +7,7 @@ let
 
   remoteRepository = "/root/restic-backup";
   remoteFromFileRepository = "/root/restic-backup-from-file";
+  remoteFromCommandRepository = "/root/restic-backup-from-command";
   remoteInhibitTestRepository = "/root/restic-backup-inhibit-test";
   remoteNoInitRepository = "/root/restic-backup-no-init";
   rcloneRepository = "rclone:local:/root/restic-rclone-backup";
@@ -45,6 +45,12 @@ let
     "--keep-monthly 1"
     "--keep-yearly 99"
   ];
+  commandString = "testing";
+  command = [
+    "echo"
+    "-n"
+    commandString
+  ];
 in
 {
   name = "restic";
@@ -127,6 +133,15 @@ in
               find /opt -mindepth 1 -maxdepth 1 ! -name a_dir # all files in /opt except for a_dir
             '';
           };
+          remote-from-command-backup = {
+            inherit
+              passwordFile
+              pruneOpts
+              command
+              ;
+            initialize = true;
+            repository = remoteFromCommandRepository;
+          };
           inhibit-test = {
             inherit
               passwordFile
@@ -267,6 +282,11 @@ in
         "${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} restore latest -t /tmp/restore-3",
         "diff -ru ${testDir} /tmp/restore-3/opt",
 
+        # test that remote-from-command-backup produces a snapshot, with the expected contents
+        "systemctl start restic-backups-remote-from-command-backup.service",
+        'restic-remote-from-command-backup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
+        '[[ $(restic-remote-from-command-backup dump --path /stdin latest stdin) == ${commandString} ]]',
+
         # test that rclonebackup produces a snapshot
         "systemctl start restic-backups-rclonebackup.service",
         'restic-rclonebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',

From 9559d7162f166cccfdb2ee454ab7f70a88d1803e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 19:01:00 +0000
Subject: [PATCH 2485/3724] k6: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix
index 7d16b8fa3317..7fa3a6cf5139 100644
--- a/pkgs/by-name/k6/k6/package.nix
+++ b/pkgs/by-name/k6/k6/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "k6";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "k6";
     rev = "v${version}";
-    hash = "sha256-5KOJfGqZbh6+oVfuayg3s4ldSgC0oi9Qv3/bqDK2Zpc=";
+    hash = "sha256-RJZD8TwPE5FzIWgtgjEMc2ATxH17LCbaLDfIIDh1ruY=";
   };
 
   subPackages = [ "./" ];

From 8e443984b67096d548c2e080f652f1cbe08b3e40 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 19 Aug 2025 03:16:00 +0200
Subject: [PATCH 2486/3724] frigate: 0.15.2 -> 0.16.0

https://github.com/blakeblackshear/frigate/releases/tag/v0.16.0
---
 nixos/modules/services/video/frigate.nix |  32 +-
 pkgs/by-name/fr/frigate/constants.patch  | 372 +----------------------
 pkgs/by-name/fr/frigate/ffmpeg.patch     |  39 +++
 pkgs/by-name/fr/frigate/package.nix      |  63 ++--
 pkgs/by-name/fr/frigate/web.nix          |   2 +-
 5 files changed, 115 insertions(+), 393 deletions(-)
 create mode 100644 pkgs/by-name/fr/frigate/ffmpeg.patch

diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
index 08fc665cc2d7..486521577c20 100644
--- a/nixos/modules/services/video/frigate.nix
+++ b/nixos/modules/services/video/frigate.nix
@@ -103,14 +103,16 @@ let
     # Send a subrequest to verify if the user is authenticated and has permission to access the resource.
     auth_request /auth;
 
-    # Save the upstream metadata response headers from Authelia to variables.
+    # Save the upstream metadata response headers from the auth request to variables
     auth_request_set $user $upstream_http_remote_user;
+    auth_request_set $role $upstream_http_remote_role;
     auth_request_set $groups $upstream_http_remote_groups;
     auth_request_set $name $upstream_http_remote_name;
     auth_request_set $email $upstream_http_remote_email;
 
     # Inject the metadata response headers from the variables into the request made to the backend.
     proxy_set_header Remote-User $user;
+    proxy_set_header Remote-Role $role;
     proxy_set_header Remote-Groups $groups;
     proxy_set_header Remote-Email $email;
     proxy_set_header Remote-Name $name;
@@ -343,8 +345,15 @@ in
               expires off;
 
               keepalive_disable safari;
+
+              # vod module returns 502 for non-existent media
+              # https://github.com/kaltura/nginx-vod-module/issues/468
+              error_page 502 =404 /vod-not-found;
             '';
           };
+          "/vod-not-found" = {
+            return = 404;
+          };
           "/stream/" = {
             alias = "/var/cache/frigate/stream/";
             extraConfig = nginxAuthRequest + ''
@@ -549,6 +558,23 @@ in
               add_header Cache-Control "public";
             '';
           };
+          "/locales/" = {
+            root = cfg.package.web;
+            extraConfig = ''
+              access_log off;
+              add_header Cache-Control "public";
+            '';
+          };
+          "~ ^/.*-([A-Za-z0-9]+)\.webmanifest$" = {
+            root = cfg.package.web;
+            extraConfig = ''
+              access_log off;
+              expires 1y;
+              add_header Cache-Control "public";
+              default_type application/json;
+              proxy_set_header Accept-Encoding "";
+            '';
+          };
           "/" = {
             root = cfg.package.web;
             tryFiles = "$uri $uri.html $uri/ /index.html";
@@ -583,6 +609,9 @@ in
           open_file_cache_errors on;
           aio on;
 
+          # file upload size
+          client_max_body_size 20M;
+
           # https://github.com/kaltura/nginx-vod-module#vod_open_file_thread_pool
           vod_open_file_thread_pool default;
 
@@ -657,7 +686,6 @@ in
         [
           # unfree:
           # config.boot.kernelPackages.nvidiaPackages.latest.bin
-          ffmpeg-headless
           libva-utils
           procps
           radeontop
diff --git a/pkgs/by-name/fr/frigate/constants.patch b/pkgs/by-name/fr/frigate/constants.patch
index 59492a30593f..943e49353c01 100644
--- a/pkgs/by-name/fr/frigate/constants.patch
+++ b/pkgs/by-name/fr/frigate/constants.patch
@@ -1,380 +1,22 @@
-diff --git a/frigate/api/media.py b/frigate/api/media.py
-index b5f3ba70..09a09c13 100644
---- a/frigate/api/media.py
-+++ b/frigate/api/media.py
-@@ -31,6 +31,7 @@ from frigate.config import FrigateConfig
- from frigate.const import (
-     CACHE_DIR,
-     CLIPS_DIR,
-+    INSTALL_DIR,
-     MAX_SEGMENT_DURATION,
-     PREVIEW_FRAME_TYPE,
-     RECORD_DIR,
-@@ -154,7 +155,9 @@ def latest_frame(
-             frame_processor.get_current_frame_time(camera_name) + retry_interval
-         ):
-             if request.app.camera_error_image is None:
--                error_image = glob.glob("/opt/frigate/frigate/images/camera-error.jpg")
-+                error_image = glob.glob(
-+                    os.path.join(INSTALL_DIR, "frigate/images/camera-error.jpg")
-+                )
- 
-                 if len(error_image) > 0:
-                     request.app.camera_error_image = cv2.imread(
-@@ -497,7 +500,7 @@ def recording_clip(
-     )
- 
-     file_name = sanitize_filename(f"playlist_{camera_name}_{start_ts}-{end_ts}.txt")
--    file_path = f"/tmp/cache/{file_name}"
-+    file_path = os.path.join(CACHE_DIR, file_name)
-     with open(file_path, "w") as file:
-         clip: Recordings
-         for clip in recordings:
-diff --git a/frigate/api/preview.py b/frigate/api/preview.py
-index d14a15ff..2db2326a 100644
---- a/frigate/api/preview.py
-+++ b/frigate/api/preview.py
-@@ -9,7 +9,7 @@ from fastapi import APIRouter
- from fastapi.responses import JSONResponse
- 
- from frigate.api.defs.tags import Tags
--from frigate.const import CACHE_DIR, PREVIEW_FRAME_TYPE
-+from frigate.const import BASE_DIR, CACHE_DIR, PREVIEW_FRAME_TYPE
- from frigate.models import Previews
- 
- logger = logging.getLogger(__name__)
-@@ -52,7 +52,7 @@ def preview_ts(camera_name: str, start_ts: float, end_ts: float):
-         clips.append(
-             {
-                 "camera": preview["camera"],
--                "src": preview["path"].replace("/media/frigate", ""),
-+                "src": preview["path"].replace(BASE_DIR, ""),
-                 "type": "video/mp4",
-                 "start": preview["start_time"],
-                 "end": preview["end_time"],
 diff --git a/frigate/comms/webpush.py b/frigate/comms/webpush.py
-index abfd52d1..ab4cf3c5 100644
+index c5986d45..b767e19e 100644
 --- a/frigate/comms/webpush.py
 +++ b/frigate/comms/webpush.py
-@@ -12,7 +12,7 @@ from pywebpush import WebPusher
+@@ -17,7 +17,7 @@ from titlecase import titlecase
+ from frigate.comms.base_communicator import Communicator
  from frigate.comms.config_updater import ConfigSubscriber
- from frigate.comms.dispatcher import Communicator
  from frigate.config import FrigateConfig
 -from frigate.const import CONFIG_DIR
 +from frigate.const import BASE_DIR, CONFIG_DIR
  from frigate.models import User
  
  logger = logging.getLogger(__name__)
-@@ -151,7 +151,7 @@ class WebPushClient(Communicator):  # type: ignore[misc]
-         camera: str = payload["after"]["camera"]
-         title = f"{', '.join(sorted_objects).replace('_', ' ').title()}{' was' if state == 'end' else ''} detected in {', '.join(payload['after']['data']['zones']).replace('_', ' ').title()}"
-         message = f"Detected on {camera.replace('_', ' ').title()}"
+@@ -333,7 +333,7 @@ class WebPushClient(Communicator):  # type: ignore[misc]
+ 
+         title = f"{titlecase(', '.join(sorted_objects).replace('_', ' '))}{' was' if state == 'end' else ''} detected in {titlecase(', '.join(payload['after']['data']['zones']).replace('_', ' '))}"
+         message = f"Detected on {titlecase(camera.replace('_', ' '))}"
 -        image = f"{payload['after']['thumb_path'].replace('/media/frigate', '')}"
 +        image = f"{payload['after']['thumb_path'].replace(BASE_DIR, '')}"
  
          # if event is ongoing open to live view otherwise open to recordings view
          direct_url = f"/review?id={reviewId}" if state == "end" else f"/#{camera}"
-diff --git a/frigate/const.py b/frigate/const.py
-index 5976f47b..dc710467 100644
---- a/frigate/const.py
-+++ b/frigate/const.py
-@@ -1,5 +1,6 @@
- import re
- 
-+INSTALL_DIR = "/opt/frigate"
- CONFIG_DIR = "/config"
- DEFAULT_DB_PATH = f"{CONFIG_DIR}/frigate.db"
- MODEL_CACHE_DIR = f"{CONFIG_DIR}/model_cache"
-diff --git a/frigate/detectors/detector_config.py b/frigate/detectors/detector_config.py
-index 452f1fee..13535a62 100644
---- a/frigate/detectors/detector_config.py
-+++ b/frigate/detectors/detector_config.py
-@@ -9,7 +9,7 @@ import requests
- from pydantic import BaseModel, ConfigDict, Field
- from pydantic.fields import PrivateAttr
- 
--from frigate.const import DEFAULT_ATTRIBUTE_LABEL_MAP
-+from frigate.const import DEFAULT_ATTRIBUTE_LABEL_MAP, MODEL_CACHE_DIR
- from frigate.plus import PlusApi
- from frigate.util.builtin import generate_color_palette, load_labels
- 
-@@ -117,7 +117,7 @@ class ModelConfig(BaseModel):
-             return
- 
-         model_id = self.path[7:]
--        self.path = f"/config/model_cache/{model_id}"
-+        self.path = os.path.join(MODEL_CACHE_DIR, model_id)
-         model_info_path = f"{self.path}.json"
- 
-         # download the model if it doesn't exist
-diff --git a/frigate/detectors/plugins/hailo8l.py b/frigate/detectors/plugins/hailo8l.py
-index b66d78bd..69e86bc5 100644
---- a/frigate/detectors/plugins/hailo8l.py
-+++ b/frigate/detectors/plugins/hailo8l.py
-@@ -22,6 +22,7 @@ except ModuleNotFoundError:
- from pydantic import BaseModel, Field
- from typing_extensions import Literal
- 
-+from frigate.const import MODEL_CACHE_DIR
- from frigate.detectors.detection_api import DetectionApi
- from frigate.detectors.detector_config import BaseDetectorConfig
- 
-@@ -57,7 +58,7 @@ class HailoDetector(DetectionApi):
-         self.h8l_tensor_format = detector_config.model.input_tensor
-         self.h8l_pixel_format = detector_config.model.input_pixel_format
-         self.model_url = "https://hailo-model-zoo.s3.eu-west-2.amazonaws.com/ModelZoo/Compiled/v2.11.0/hailo8l/ssd_mobilenet_v1.hef"
--        self.cache_dir = "/config/model_cache/h8l_cache"
-+        self.cache_dir = os.path.join(MODEL_CACHE_DIR, "h8l_cache")
-         self.expected_model_filename = "ssd_mobilenet_v1.hef"
-         output_type = "FLOAT32"
- 
-diff --git a/frigate/detectors/plugins/openvino.py b/frigate/detectors/plugins/openvino.py
-index 51e48530..d199317b 100644
---- a/frigate/detectors/plugins/openvino.py
-+++ b/frigate/detectors/plugins/openvino.py
-@@ -7,6 +7,7 @@ import openvino.properties as props
- from pydantic import Field
- from typing_extensions import Literal
- 
-+from frigate.const import MODEL_CACHE_DIR
- from frigate.detectors.detection_api import DetectionApi
- from frigate.detectors.detector_config import BaseDetectorConfig, ModelTypeEnum
- 
-@@ -35,8 +36,10 @@ class OvDetector(DetectionApi):
-             logger.error(f"OpenVino model file {detector_config.model.path} not found.")
-             raise FileNotFoundError
- 
--        os.makedirs("/config/model_cache/openvino", exist_ok=True)
--        self.ov_core.set_property({props.cache_dir: "/config/model_cache/openvino"})
-+        os.makedirs(os.path.join(MODEL_CACHE_DIR, "openvino"), exist_ok=True)
-+        self.ov_core.set_property(
-+            {props.cache_dir: os.path.join(MODEL_CACHE_DIR, "openvino")}
-+        )
-         self.interpreter = self.ov_core.compile_model(
-             model=detector_config.model.path, device_name=detector_config.device
-         )
-diff --git a/frigate/detectors/plugins/rknn.py b/frigate/detectors/plugins/rknn.py
-index df94d7b6..bc3d9ae0 100644
---- a/frigate/detectors/plugins/rknn.py
-+++ b/frigate/detectors/plugins/rknn.py
-@@ -6,6 +6,7 @@ from typing import Literal
- 
- from pydantic import Field
- 
-+from frigate.const import MODEL_CACHE_DIR
- from frigate.detectors.detection_api import DetectionApi
- from frigate.detectors.detector_config import BaseDetectorConfig, ModelTypeEnum
- 
-@@ -17,7 +18,7 @@ supported_socs = ["rk3562", "rk3566", "rk3568", "rk3576", "rk3588"]
- 
- supported_models = {ModelTypeEnum.yolonas: "^deci-fp16-yolonas_[sml]$"}
- 
--model_cache_dir = "/config/model_cache/rknn_cache/"
-+model_cache_dir = os.path.join(MODEL_CACHE_DIR, "rknn_cache/")
- 
- 
- class RknnDetectorConfig(BaseDetectorConfig):
-diff --git a/frigate/detectors/plugins/rocm.py b/frigate/detectors/plugins/rocm.py
-index 60118d12..7c87edb5 100644
---- a/frigate/detectors/plugins/rocm.py
-+++ b/frigate/detectors/plugins/rocm.py
-@@ -9,6 +9,7 @@ import numpy as np
- from pydantic import Field
- from typing_extensions import Literal
- 
-+from frigate.const import MODEL_CACHE_DIR
- from frigate.detectors.detection_api import DetectionApi
- from frigate.detectors.detector_config import (
-     BaseDetectorConfig,
-@@ -116,7 +117,7 @@ class ROCmDetector(DetectionApi):
- 
-             logger.info(f"AMD/ROCm: saving parsed model into {mxr_path}")
- 
--            os.makedirs("/config/model_cache/rocm", exist_ok=True)
-+            os.makedirs(os.path.join(MODEL_CACHE_DIR, "rocm"), exist_ok=True)
-             migraphx.save(self.model, mxr_path)
- 
-         logger.info("AMD/ROCm: model loaded")
-diff --git a/frigate/output/birdseye.py b/frigate/output/birdseye.py
-index 00f17c8f..8331eb64 100644
---- a/frigate/output/birdseye.py
-+++ b/frigate/output/birdseye.py
-@@ -16,7 +16,7 @@ import numpy as np
- 
- from frigate.comms.config_updater import ConfigSubscriber
- from frigate.config import BirdseyeModeEnum, FfmpegConfig, FrigateConfig
--from frigate.const import BASE_DIR, BIRDSEYE_PIPE
-+from frigate.const import BASE_DIR, BIRDSEYE_PIPE, INSTALL_DIR
- from frigate.util.image import (
-     SharedMemoryFrameManager,
-     copy_yuv_to_position,
-@@ -297,7 +297,9 @@ class BirdsEyeFrameManager:
-             birdseye_logo = cv2.imread(custom_logo_files[0], cv2.IMREAD_UNCHANGED)
- 
-         if birdseye_logo is None:
--            logo_files = glob.glob("/opt/frigate/frigate/images/birdseye.png")
-+            logo_files = glob.glob(
-+                os.path.join(INSTALL_DIR, "frigate/images/birdseye.png")
-+            )
- 
-             if len(logo_files) > 0:
-                 birdseye_logo = cv2.imread(logo_files[0], cv2.IMREAD_UNCHANGED)
-diff --git a/frigate/test/http_api/base_http_test.py b/frigate/test/http_api/base_http_test.py
-index e7a1d03e..4fa4a5b5 100644
---- a/frigate/test/http_api/base_http_test.py
-+++ b/frigate/test/http_api/base_http_test.py
-@@ -9,6 +9,7 @@ from playhouse.sqliteq import SqliteQueueDatabase
- 
- from frigate.api.fastapi_app import create_fastapi_app
- from frigate.config import FrigateConfig
-+from frigate.const import BASE_DIR, CACHE_DIR
- from frigate.models import Event, Recordings, ReviewSegment
- from frigate.review.types import SeverityEnum
- from frigate.test.const import TEST_DB, TEST_DB_CLEANUPS
-@@ -72,19 +73,19 @@ class BaseTestHttp(unittest.TestCase):
-                         "total": 67.1,
-                         "used": 16.6,
-                     },
--                    "/media/frigate/clips": {
-+                    os.path.join(BASE_DIR, "clips"): {
-                         "free": 42429.9,
-                         "mount_type": "ext4",
-                         "total": 244529.7,
-                         "used": 189607.0,
-                     },
--                    "/media/frigate/recordings": {
-+                    os.path.join(BASE_DIR, "recordings"): {
-                         "free": 0.2,
-                         "mount_type": "ext4",
-                         "total": 8.0,
-                         "used": 7.8,
-                     },
--                    "/tmp/cache": {
-+                    CACHE_DIR: {
-                         "free": 976.8,
-                         "mount_type": "tmpfs",
-                         "total": 1000.0,
-diff --git a/frigate/test/test_config.py b/frigate/test/test_config.py
-index e6cb1274..5a3deefd 100644
---- a/frigate/test/test_config.py
-+++ b/frigate/test/test_config.py
-@@ -854,9 +854,9 @@ class TestConfig(unittest.TestCase):
-         assert frigate_config.model.merged_labelmap[0] == "person"
- 
-     def test_plus_labelmap(self):
--        with open("/config/model_cache/test", "w") as f:
-+        with open(os.path.join(MODEL_CACHE_DIR, "test"), "w") as f:
-             json.dump(self.plus_model_info, f)
--        with open("/config/model_cache/test.json", "w") as f:
-+        with open(os.path.join(MODEL_CACHE_DIR, "test.json"), "w") as f:
-             json.dump(self.plus_model_info, f)
- 
-         config = {
-diff --git a/frigate/test/test_http.py b/frigate/test/test_http.py
-index 21379425..66f9d22a 100644
---- a/frigate/test/test_http.py
-+++ b/frigate/test/test_http.py
-@@ -12,6 +12,7 @@ from playhouse.sqliteq import SqliteQueueDatabase
- 
- from frigate.api.fastapi_app import create_fastapi_app
- from frigate.config import FrigateConfig
-+from frigate.const import BASE_DIR, CACHE_DIR
- from frigate.models import Event, Recordings, Timeline
- from frigate.stats.emitter import StatsEmitter
- from frigate.test.const import TEST_DB, TEST_DB_CLEANUPS
-@@ -76,19 +77,19 @@ class TestHttp(unittest.TestCase):
-                         "total": 67.1,
-                         "used": 16.6,
-                     },
--                    "/media/frigate/clips": {
-+                    os.path.join(BASE_DIR, "clips"): {
-                         "free": 42429.9,
-                         "mount_type": "ext4",
-                         "total": 244529.7,
-                         "used": 189607.0,
-                     },
--                    "/media/frigate/recordings": {
-+                    os.path.join(BASE_DIR, "recordings"): {
-                         "free": 0.2,
-                         "mount_type": "ext4",
-                         "total": 8.0,
-                         "used": 7.8,
-                     },
--                    "/tmp/cache": {
-+                    CACHE_DIR: {
-                         "free": 976.8,
-                         "mount_type": "tmpfs",
-                         "total": 1000.0,
-diff --git a/frigate/util/config.py b/frigate/util/config.py
-index d456c755..b6b270c9 100644
---- a/frigate/util/config.py
-+++ b/frigate/util/config.py
-@@ -14,7 +14,7 @@ from frigate.util.services import get_video_properties
- logger = logging.getLogger(__name__)
- 
- CURRENT_CONFIG_VERSION = "0.15-1"
--DEFAULT_CONFIG_FILE = "/config/config.yml"
-+DEFAULT_CONFIG_FILE = os.path.join(CONFIG_DIR, "config.yml")
- 
- 
- def find_config_file() -> str:
-diff --git a/frigate/util/model.py b/frigate/util/model.py
-index ce2c9538..6e93cb38 100644
---- a/frigate/util/model.py
-+++ b/frigate/util/model.py
-@@ -12,6 +12,8 @@ except ImportError:
-     # openvino is not included
-     pass
- 
-+from frigate.const import MODEL_CACHE_DIR
-+
- logger = logging.getLogger(__name__)
- 
- 
-@@ -46,7 +48,8 @@ def get_ort_providers(
-             # so it is not enabled by default
-             if device == "Tensorrt":
-                 os.makedirs(
--                    "/config/model_cache/tensorrt/ort/trt-engines", exist_ok=True
-+                    os.path.join(MODEL_CACHE_DIR, "tensorrt/ort/trt-engines"),
-+                    exist_ok=True,
-                 )
-                 device_id = 0 if not device.isdigit() else int(device)
-                 providers.append(provider)
-@@ -57,19 +60,23 @@ def get_ort_providers(
-                         and os.environ.get("USE_FP_16", "True") != "False",
-                         "trt_timing_cache_enable": True,
-                         "trt_engine_cache_enable": True,
--                        "trt_timing_cache_path": "/config/model_cache/tensorrt/ort",
--                        "trt_engine_cache_path": "/config/model_cache/tensorrt/ort/trt-engines",
-+                        "trt_timing_cache_path": os.path.join(
-+                            MODEL_CACHE_DIR, "tensorrt/ort"
-+                        ),
-+                        "trt_engine_cache_path": os.path.join(
-+                            MODEL_CACHE_DIR, "tensorrt/ort/trt-engines"
-+                        ),
-                     }
-                 )
-             else:
-                 continue
-         elif provider == "OpenVINOExecutionProvider":
--            os.makedirs("/config/model_cache/openvino/ort", exist_ok=True)
-+            os.makedirs(os.path.join(MODEL_CACHE_DIR, "openvino/ort"), exist_ok=True)
-             providers.append(provider)
-             options.append(
-                 {
-                     "arena_extend_strategy": "kSameAsRequested",
--                    "cache_dir": "/config/model_cache/openvino/ort",
-+                    "cache_dir": os.path.join(MODEL_CACHE_DIR, "openvino/ort"),
-                     "device_type": device,
-                 }
-             )
-@@ -103,7 +110,7 @@ class ONNXModelRunner:
-                 self.type = "ov"
-                 self.ov = ov.Core()
-                 self.ov.set_property(
--                    {ov.properties.cache_dir: "/config/model_cache/openvino"}
-+                    {ov.properties.cache_dir: os.path.join(MODEL_CACHE_DIR, "openvino")}
-                 )
-                 self.interpreter = self.ov.compile_model(
-                     model=model_path, device_name=device
diff --git a/pkgs/by-name/fr/frigate/ffmpeg.patch b/pkgs/by-name/fr/frigate/ffmpeg.patch
new file mode 100644
index 000000000000..78721dd6d3a4
--- /dev/null
+++ b/pkgs/by-name/fr/frigate/ffmpeg.patch
@@ -0,0 +1,39 @@
+diff --git a/frigate/config/camera/ffmpeg.py b/frigate/config/camera/ffmpeg.py
+index 04bbfac7..4390a571 100644
+--- a/frigate/config/camera/ffmpeg.py
++++ b/frigate/config/camera/ffmpeg.py
+@@ -70,18 +70,14 @@ class FfmpegConfig(FrigateBaseModel):
+     @property
+     def ffmpeg_path(self) -> str:
+         if self.path == "default":
+-            return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg"
+-        elif self.path in INCLUDED_FFMPEG_VERSIONS:
+-            return f"/usr/lib/ffmpeg/{self.path}/bin/ffmpeg"
++            return "@ffmpeg@"
+         else:
+             return f"{self.path}/bin/ffmpeg"
+ 
+     @property
+     def ffprobe_path(self) -> str:
+         if self.path == "default":
+-            return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffprobe"
+-        elif self.path in INCLUDED_FFMPEG_VERSIONS:
+-            return f"/usr/lib/ffmpeg/{self.path}/bin/ffprobe"
++            return "@ffprobe@"
+         else:
+             return f"{self.path}/bin/ffprobe"
+ 
+diff --git a/frigate/record/export.py b/frigate/record/export.py
+index 0d3f96da..09cadbcd 100644
+--- a/frigate/record/export.py
++++ b/frigate/record/export.py
+@@ -126,7 +126,7 @@ class RecordingExporter(threading.Thread):
+             minutes = int(diff / 60)
+             seconds = int(diff % 60)
+             ffmpeg_cmd = [
+-                "/usr/lib/ffmpeg/7.0/bin/ffmpeg",  # hardcode path for exports thumbnail due to missing libwebp support
++                "@ffmpeg@",  # hardcode path for exports thumbnail due to missing libwebp support
+                 "-hide_banner",
+                 "-loglevel",
+                 "warning",
+~
diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix
index 1ba1470bdadf..3c6c9d9b3660 100644
--- a/pkgs/by-name/fr/frigate/package.nix
+++ b/pkgs/by-name/fr/frigate/package.nix
@@ -2,31 +2,32 @@
   lib,
   stdenv,
   callPackage,
-  python312,
+  replaceVars,
+  python312Packages,
   fetchFromGitHub,
   fetchurl,
-  rocmPackages,
+  ffmpeg-headless,
   sqlite-vec,
   frigate,
   nixosTests,
 }:
 
 let
-  version = "0.15.2";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     name = "frigate-${version}-source";
     owner = "blakeblackshear";
     repo = "frigate";
     tag = "v${version}";
-    hash = "sha256-YJFtMVCTtp8h9a9RmkcoZSQ+nIKb5o/4JVynVslkx78=";
+    hash = "sha256-O1rOFRrS3hDbf4fVgfz+KASo20R1aqbDoIf3JKQ1jhs=";
   };
 
   frigate-web = callPackage ./web.nix {
     inherit version src;
   };
 
-  python = python312;
+  python = python312Packages.python;
 
   # Tensorflow audio model
   # https://github.com/blakeblackshear/frigate/blob/v0.15.0/docker/main/Dockerfile#L125
@@ -55,14 +56,21 @@ let
     hash = "sha256-5Cj2vEiWR8Z9d2xBmVoLZuNRv4UOuxHSGZQWTJorXUQ=";
   };
 in
-python.pkgs.buildPythonApplication rec {
+python312Packages.buildPythonApplication rec {
   pname = "frigate";
   inherit version;
   format = "other";
 
   inherit src;
 
-  patches = [ ./constants.patch ];
+  patches = [
+    ./constants.patch
+
+    (replaceVars ./ffmpeg.patch {
+      ffmpeg = lib.getExe ffmpeg-headless;
+      ffprobe = lib.getExe' ffmpeg-headless "ffprobe";
+    })
+  ];
 
   postPatch = ''
     echo 'VERSION = "${version}"' > frigate/version.py
@@ -86,15 +94,6 @@ python.pkgs.buildPythonApplication rec {
     substituteInPlace frigate/db/sqlitevecq.py \
       --replace-fail "/usr/local/lib/vec0" "${lib.getLib sqlite-vec}/lib/vec0${stdenv.hostPlatform.extensions.sharedLibrary}"
 
-  ''
-  # clang-rocm, provided by `rocmPackages.clr`, only works on x86_64-linux specifically
-  + lib.optionalString (with stdenv.hostPlatform; isx86_64 && isLinux) ''
-    substituteInPlace frigate/detectors/plugins/rocm.py \
-      --replace-fail "/opt/rocm/bin/rocminfo" "rocminfo" \
-      --replace-fail "/opt/rocm/lib" "${rocmPackages.clr}/lib"
-
-  ''
-  + ''
     # provide default paths for models and maps that are shipped with frigate
     substituteInPlace frigate/config/config.py \
       --replace-fail "/cpu_model.tflite" "${tflite_cpu_model}" \
@@ -106,30 +105,37 @@ python.pkgs.buildPythonApplication rec {
     substituteInPlace frigate/events/audio.py \
       --replace-fail "/cpu_audio_model.tflite" "${placeholder "out"}/share/frigate/cpu_audio_model.tflite" \
       --replace-fail "/audio-labelmap.txt" "${placeholder "out"}/share/frigate/audio-labelmap.txt"
-
-    # work around onvif-zeep idiosyncrasy
-    substituteInPlace frigate/ptz/onvif.py \
-      --replace-fail dist-packages site-packages
   '';
 
   dontBuild = true;
 
-  dependencies = with python.pkgs; [
+  dependencies = with python312Packages; [
     # docker/main/requirements.txt
     scikit-build
     # docker/main/requirements-wheel.txt
+    aiofiles
     aiohttp
+    appdirs
+    argcomplete
+    contextlib2
     click
+    distlib
     fastapi
+    filelock
+    future
+    importlib-metadata
+    importlib-resources
     google-generativeai
-    imutils
     joserfc
+    levenshtein
     markupsafe
+    netaddr
+    netifaces
     norfair
     numpy
     ollama
     onnxruntime
-    onvif-zeep
+    onvif-zeep-async
     openai
     opencv4
     openvino
@@ -138,9 +144,12 @@ python.pkgs.buildPythonApplication rec {
     pathvalidate
     peewee
     peewee-migrate
+    prometheus-client
     psutil
     py3nvml
+    pyclipper
     pydantic
+    python-multipart
     pytz
     py-vapid
     pywebpush
@@ -149,14 +158,18 @@ python.pkgs.buildPythonApplication rec {
     ruamel-yaml
     scipy
     setproctitle
+    shapely
     slowapi
     starlette
     starlette-context
     tensorflow-bin
+    titlecase
     transformers
     tzlocal
     unidecode
     uvicorn
+    verboselogs
+    virtualenv
     ws4py
   ];
 
@@ -178,7 +191,7 @@ python.pkgs.buildPythonApplication rec {
     runHook postInstall
   '';
 
-  nativeCheckInputs = with python.pkgs; [
+  nativeCheckInputs = with python312Packages; [
     pytestCheckHook
   ];
 
@@ -200,7 +213,7 @@ python.pkgs.buildPythonApplication rec {
   passthru = {
     web = frigate-web;
     inherit python;
-    pythonPath = (python.pkgs.makePythonPath dependencies) + ":${frigate}/${python.sitePackages}";
+    pythonPath = (python312Packages.makePythonPath dependencies) + ":${frigate}/${python.sitePackages}";
     tests = {
       inherit (nixosTests) frigate;
     };
diff --git a/pkgs/by-name/fr/frigate/web.nix b/pkgs/by-name/fr/frigate/web.nix
index 45e6a3518519..4d355f864cb5 100644
--- a/pkgs/by-name/fr/frigate/web.nix
+++ b/pkgs/by-name/fr/frigate/web.nix
@@ -30,7 +30,7 @@ buildNpmPackage {
       --replace-fail "/tmp/cache" "/var/cache/frigate"
   '';
 
-  npmDepsHash = "sha256-tPwydUJtFDJs17q0haJaUVEkxua+nHfmwQ9Z9Y24ca8=";
+  npmDepsHash = "sha256-CrK/6BaKmKIxlohEZdGEEKJkioszBUupyKQx4nBeLqI=";
 
   installPhase = ''
     cp -rv dist/ $out

From 932a20ef923f26dd54118189e78ae9ae7cd735f0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 19 Aug 2025 03:32:16 +0200
Subject: [PATCH 2487/3724] nixos/frigate: disable config check on ARM

The onnxruntime library triggers a coredump when
/sys/devices/system/cpu/{possible,present} are
missing on aarch64-linux.
---
 nixos/modules/services/video/frigate.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
index 486521577c20..c63f3df3c063 100644
--- a/nixos/modules/services/video/frigate.nix
+++ b/nixos/modules/services/video/frigate.nix
@@ -197,9 +197,11 @@ in
 
     checkConfig = mkOption {
       type = bool;
-      default = pkgs.stdenv.buildPlatform.canExecute pkgs.stdenv.hostPlatform;
-      defaultText = literalExpression ''
+      default =
         pkgs.stdenv.buildPlatform.canExecute pkgs.stdenv.hostPlatform
+        && (!pkgs.stdenv.hostPlatform.isAarch64);
+      defaultText = literalExpression ''
+        pkgs.stdenv.buildPlatform.canExecute pkgs.stdenv.hostPlatform && !(pkgs.stdenv.hostPlaform.isAarch64)
       '';
       description = ''
         Whether to check the configuration at build time.

From b43e12072474cb390d62d1e1d8d9e602f09ed188 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 19:06:33 +0000
Subject: [PATCH 2488/3724] gh-f: 1.4.1 -> 1.6.0

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

diff --git a/pkgs/by-name/gh/gh-f/package.nix b/pkgs/by-name/gh/gh-f/package.nix
index 22ca4fa5a6de..f51c5ac88ede 100644
--- a/pkgs/by-name/gh/gh-f/package.nix
+++ b/pkgs/by-name/gh/gh-f/package.nix
@@ -15,13 +15,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gh-f";
-  version = "1.4.1";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "gennaro-tedesco";
     repo = "gh-f";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Jf7sDn/iRB/Lwz21fGLRduvt9/9cs5FFMhazULgj1ik=";
+    hash = "sha256-kldhK5ChwHRv7joD9uyCAk1Gdc8+2IyubAB04j8/LPA=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

From 2c5f6ca3da51bd4c2d9297382c7af59f77a20174 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 21 Aug 2025 19:15:19 +0200
Subject: [PATCH 2489/3724] hyfetch: 1.99.0 -> 2.0.1

Changelog: https://github.com/hykilpikonna/hyfetch/releases/tag/2.0.1
Diff: https://github.com/hykilpikonna/hyfetch/compare/1.99.0...2.0.1
---
 pkgs/by-name/hy/hyfetch/package.nix | 50 ++++++++++++-----------------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix
index 2999b9b7285c..064a20cad84c 100644
--- a/pkgs/by-name/hy/hyfetch/package.nix
+++ b/pkgs/by-name/hy/hyfetch/package.nix
@@ -1,44 +1,28 @@
 {
   lib,
+  rustPlatform,
   fetchFromGitHub,
-  python3Packages,
-  pciutils,
   installShellFiles,
+  makeBinaryWrapper,
+  pciutils,
 }:
-python3Packages.buildPythonApplication rec {
-  pname = "hyfetch";
-  version = "1.99.0";
-  pyproject = true;
 
-  outputs = [
-    "out"
-    "man"
-  ];
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "hyfetch";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "hykilpikonna";
     repo = "hyfetch";
-    tag = version;
-    hash = "sha256-GL1/V+LgSXJ4b28PfinScDrJhU9VDa4pVi24zWEzbAk=";
+    tag = finalAttrs.version;
+    hash = "sha256-OaMwUTBBpFrco2Wcodb7+3ywdD5bXDebBFEoJYsgAbE=";
   };
 
-  build-system = [
-    python3Packages.setuptools
-  ];
-
-  dependencies = [
-    python3Packages.typing-extensions
-  ];
+  cargoHash = "sha256-xm8q4EG7qfaz/Ru/FVRiWIQW2Tjh9Ar0MquVQVLDSRA=";
 
   nativeBuildInputs = [
     installShellFiles
-  ];
-
-  # No test available
-  doCheck = false;
-
-  pythonImportsCheck = [
-    "hyfetch"
+    makeBinaryWrapper
   ];
 
   # NOTE: The HyFetch project maintains an updated version of neofetch renamed
@@ -48,6 +32,8 @@ python3Packages.buildPythonApplication rec {
   postInstall = ''
     mv ./docs/neofetch.1 ./docs/neowofetch.1
     installManPage ./docs/hyfetch.1 ./docs/neowofetch.1
+
+    install -m 755 neofetch $out/bin/neowofetch
   '';
 
   postFixup = ''
@@ -55,8 +41,13 @@ python3Packages.buildPythonApplication rec {
       --prefix PATH : ${lib.makeBinPath [ pciutils ]}
   '';
 
+  outputs = [
+    "out"
+    "man"
+  ];
+
   meta = {
-    description = "Neofetch with pride flags <3";
+    description = "Neofetch with LGBTQ+ pride flags";
     longDescription = ''
       HyFetch is a command-line system information tool fork of neofetch.
       HyFetch displays information about your system next to your OS logo
@@ -66,7 +57,8 @@ python3Packages.buildPythonApplication rec {
       operating system or distribution you are running, what theme or
       icon set you are using, etc.
     '';
-    homepage = "https://github.com/hykilpikonna/HyFetch";
+    homepage = "https://github.com/hykilpikonna/hyfetch";
+    changelog = "https://github.com/hykilpikonna/hyfetch/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     mainProgram = "hyfetch";
     maintainers = with lib.maintainers; [
@@ -75,4 +67,4 @@ python3Packages.buildPythonApplication rec {
       nullcube
     ];
   };
-}
+})

From 8c006871445bb891737505c70e36fac7af2e9060 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 21 Aug 2025 20:06:04 +0200
Subject: [PATCH 2490/3724] hyfetch: add versionCheckHook

---
 pkgs/by-name/hy/hyfetch/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix
index 064a20cad84c..884e0915c70b 100644
--- a/pkgs/by-name/hy/hyfetch/package.nix
+++ b/pkgs/by-name/hy/hyfetch/package.nix
@@ -5,6 +5,7 @@
   installShellFiles,
   makeBinaryWrapper,
   pciutils,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -46,6 +47,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "man"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  versionCheckKeepEnvironment = [ "PATH" ];
+  doInstallCheck = true;
+
   meta = {
     description = "Neofetch with LGBTQ+ pride flags";
     longDescription = ''

From 0aa642c009b9f4d1c4f7bbae1a4dd4e9174f3a10 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 21 Aug 2025 20:07:19 +0200
Subject: [PATCH 2491/3724] hyfetch: add updateScript

---
 pkgs/by-name/hy/hyfetch/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix
index 884e0915c70b..2b3d46dbb8c3 100644
--- a/pkgs/by-name/hy/hyfetch/package.nix
+++ b/pkgs/by-name/hy/hyfetch/package.nix
@@ -6,6 +6,7 @@
   makeBinaryWrapper,
   pciutils,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -52,6 +53,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckKeepEnvironment = [ "PATH" ];
   doInstallCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Neofetch with LGBTQ+ pride flags";
     longDescription = ''

From c09501bc4d5d1a84b60359fd25a98615613bcaf3 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 21 Aug 2025 20:07:30 +0200
Subject: [PATCH 2492/3724] hyfetch: add defelo as maintainer

---
 pkgs/by-name/hy/hyfetch/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix
index 2b3d46dbb8c3..200449a34646 100644
--- a/pkgs/by-name/hy/hyfetch/package.nix
+++ b/pkgs/by-name/hy/hyfetch/package.nix
@@ -74,6 +74,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       yisuidenghua
       isabelroses
       nullcube
+      defelo
     ];
   };
 })

From 97f724bc0adc9c7ce7d1d282bb4a0ac8e6cea2cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 19:17:42 +0000
Subject: [PATCH 2493/3724] beam26Packages.ex_doc: 0.38.2 -> 0.38.3

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

diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix
index 9638843ed8b7..bd7a4cee09ee 100644
--- a/pkgs/development/beam-modules/ex_doc/default.nix
+++ b/pkgs/development/beam-modules/ex_doc/default.nix
@@ -14,12 +14,12 @@
 
 let
   pname = "ex_doc";
-  version = "0.38.2";
+  version = "0.38.3";
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "${pname}";
     rev = "v${version}";
-    hash = "sha256-Qv1vDfDGquWoem42IqA8lDiFWEtznT7ONIXSOCvn39g=";
+    hash = "sha256-mi8AE9LfmWtgiVvoaH7aZy0/KlUvneiyEqop6015b2E=";
   };
 in
 mixRelease {

From b59375a04d3d063889f75b158ac415b6be2df113 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 19:26:17 +0000
Subject: [PATCH 2494/3724] node-gyp: 11.3.0 -> 11.4.1

---
 pkgs/by-name/no/node-gyp/package-lock.json | 239 ++++++++++-----------
 pkgs/by-name/no/node-gyp/package.nix       |   6 +-
 2 files changed, 116 insertions(+), 129 deletions(-)

diff --git a/pkgs/by-name/no/node-gyp/package-lock.json b/pkgs/by-name/no/node-gyp/package-lock.json
index d9f28f693a00..e2a5b86201e8 100644
--- a/pkgs/by-name/no/node-gyp/package-lock.json
+++ b/pkgs/by-name/no/node-gyp/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "node-gyp",
-  "version": "11.3.0",
+  "version": "11.4.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "node-gyp",
-      "version": "11.3.0",
+      "version": "11.4.1",
       "license": "MIT",
       "dependencies": {
         "env-paths": "^2.2.0",
@@ -94,9 +94,9 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
-      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
+      "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -104,9 +104,9 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
-      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
+      "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -141,9 +141,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.32.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.32.0.tgz",
-      "integrity": "sha512-BBpRFZK3eX6uMLKz8WxFOBIFFcGFJ/g8XuwjTHCqHROSIsopI+ddn/d5Cfh36+7+e5edVS8dbSHnBNhrLEX0zg==",
+      "version": "9.33.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.33.0.tgz",
+      "integrity": "sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -164,13 +164,13 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.4.tgz",
-      "integrity": "sha512-Ul5l+lHEcw3L5+k8POx6r74mxEYKG5kOb6Xpy2gCRW6zweT6TEhAf8vhxGgjhqrd/VO/Dirhsb+1hNpD1ue9hw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
+      "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.15.1",
+        "@eslint/core": "^0.15.2",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -394,17 +394,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.38.0.tgz",
-      "integrity": "sha512-CPoznzpuAnIOl4nhj4tRr4gIPj5AfKgkiJmGQDaq+fQnRJTYlcBjbX3wbciGmpoPf8DREufuPRe1tNMZnGdanA==",
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.40.0.tgz",
+      "integrity": "sha512-w/EboPlBwnmOBtRbiOvzjD+wdiZdgFeo17lkltrtn7X37vagKKWJABvyfsJXTlHe6XBzugmYgd4A4nW+k8Mixw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.38.0",
-        "@typescript-eslint/type-utils": "8.38.0",
-        "@typescript-eslint/utils": "8.38.0",
-        "@typescript-eslint/visitor-keys": "8.38.0",
+        "@typescript-eslint/scope-manager": "8.40.0",
+        "@typescript-eslint/type-utils": "8.40.0",
+        "@typescript-eslint/utils": "8.40.0",
+        "@typescript-eslint/visitor-keys": "8.40.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -418,9 +418,9 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.38.0",
+        "@typescript-eslint/parser": "^8.40.0",
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
@@ -434,16 +434,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.38.0.tgz",
-      "integrity": "sha512-Zhy8HCvBUEfBECzIl1PKqF4p11+d0aUJS1GeUiuqK9WmOug8YCmC4h4bjyBvMyAMI9sbRczmrYL5lKg/YMbrcQ==",
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.40.0.tgz",
+      "integrity": "sha512-jCNyAuXx8dr5KJMkecGmZ8KI61KBUhkCob+SD+C+I5+Y1FWI2Y3QmY4/cxMCC5WAsZqoEtEETVhUiUMIGCf6Bw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.38.0",
-        "@typescript-eslint/types": "8.38.0",
-        "@typescript-eslint/typescript-estree": "8.38.0",
-        "@typescript-eslint/visitor-keys": "8.38.0",
+        "@typescript-eslint/scope-manager": "8.40.0",
+        "@typescript-eslint/types": "8.40.0",
+        "@typescript-eslint/typescript-estree": "8.40.0",
+        "@typescript-eslint/visitor-keys": "8.40.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -455,18 +455,18 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.38.0.tgz",
-      "integrity": "sha512-dbK7Jvqcb8c9QfH01YB6pORpqX1mn5gDZc9n63Ak/+jD67oWXn3Gs0M6vddAN+eDXBCS5EmNWzbSxsn9SzFWWg==",
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.40.0.tgz",
+      "integrity": "sha512-/A89vz7Wf5DEXsGVvcGdYKbVM9F7DyFXj52lNYUDS1L9yJfqjW/fIp5PgMuEJL/KeqVTe2QSbXAGUZljDUpArw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.38.0",
-        "@typescript-eslint/types": "^8.38.0",
+        "@typescript-eslint/tsconfig-utils": "^8.40.0",
+        "@typescript-eslint/types": "^8.40.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -477,18 +477,18 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.38.0.tgz",
-      "integrity": "sha512-WJw3AVlFFcdT9Ri1xs/lg8LwDqgekWXWhH3iAF+1ZM+QPd7oxQ6jvtW/JPwzAScxitILUIFs0/AnQ/UWHzbATQ==",
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.40.0.tgz",
+      "integrity": "sha512-y9ObStCcdCiZKzwqsE8CcpyuVMwRouJbbSrNuThDpv16dFAj429IkM6LNb1dZ2m7hK5fHyzNcErZf7CEeKXR4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.38.0",
-        "@typescript-eslint/visitor-keys": "8.38.0"
+        "@typescript-eslint/types": "8.40.0",
+        "@typescript-eslint/visitor-keys": "8.40.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -499,9 +499,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.38.0.tgz",
-      "integrity": "sha512-Lum9RtSE3EroKk/bYns+sPOodqb2Fv50XOl/gMviMKNvanETUuUcC9ObRbzrJ4VSd2JalPqgSAavwrPiPvnAiQ==",
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.40.0.tgz",
+      "integrity": "sha512-jtMytmUaG9d/9kqSl/W3E3xaWESo4hFDxAIHGVW/WKKtQhesnRIJSAJO6XckluuJ6KDB5woD1EiqknriCtAmcw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -512,19 +512,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.38.0.tgz",
-      "integrity": "sha512-c7jAvGEZVf0ao2z+nnz8BUaHZD09Agbh+DY7qvBQqLiz8uJzRgVPj5YvOh8I8uEiH8oIUGIfHzMwUcGVco/SJg==",
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.40.0.tgz",
+      "integrity": "sha512-eE60cK4KzAc6ZrzlJnflXdrMqOBaugeukWICO2rB0KNvwdIMaEaYiywwHMzA1qFpTxrLhN9Lp4E/00EgWcD3Ow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.38.0",
-        "@typescript-eslint/typescript-estree": "8.38.0",
-        "@typescript-eslint/utils": "8.38.0",
+        "@typescript-eslint/types": "8.40.0",
+        "@typescript-eslint/typescript-estree": "8.40.0",
+        "@typescript-eslint/utils": "8.40.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -537,13 +537,13 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.38.0.tgz",
-      "integrity": "sha512-wzkUfX3plUqij4YwWaJyqhiPE5UCRVlFpKn1oCRn2O1bJ592XxWJj8ROQ3JD5MYXLORW84063z3tZTb/cs4Tyw==",
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.40.0.tgz",
+      "integrity": "sha512-ETdbFlgbAmXHyFPwqUIYrfc12ArvpBhEVgGAxVYSwli26dn8Ko+lIo4Su9vI9ykTZdJn+vJprs/0eZU0YMAEQg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -555,16 +555,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.38.0.tgz",
-      "integrity": "sha512-fooELKcAKzxux6fA6pxOflpNS0jc+nOQEEOipXFNjSlBS6fqrJOVY/whSn70SScHrcJ2LDsxWrneFoWYSVfqhQ==",
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.40.0.tgz",
+      "integrity": "sha512-k1z9+GJReVVOkc1WfVKs1vBrR5MIKKbdAjDTPvIK3L8De6KbFfPFt6BKpdkdk7rZS2GtC/m6yI5MYX+UsuvVYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.38.0",
-        "@typescript-eslint/tsconfig-utils": "8.38.0",
-        "@typescript-eslint/types": "8.38.0",
-        "@typescript-eslint/visitor-keys": "8.38.0",
+        "@typescript-eslint/project-service": "8.40.0",
+        "@typescript-eslint/tsconfig-utils": "8.40.0",
+        "@typescript-eslint/types": "8.40.0",
+        "@typescript-eslint/visitor-keys": "8.40.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -580,7 +580,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
@@ -610,16 +610,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.38.0.tgz",
-      "integrity": "sha512-hHcMA86Hgt+ijJlrD8fX0j1j8w4C92zue/8LOPAFioIno+W0+L7KqE8QZKCcPGc/92Vs9x36w/4MPTJhqXdyvg==",
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.40.0.tgz",
+      "integrity": "sha512-Cgzi2MXSZyAUOY+BFwGs17s7ad/7L+gKt6Y8rAVVWS+7o6wrjeFN4nVfTpbE25MNcxyJ+iYUXflbs2xR9h4UBg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.38.0",
-        "@typescript-eslint/types": "8.38.0",
-        "@typescript-eslint/typescript-estree": "8.38.0"
+        "@typescript-eslint/scope-manager": "8.40.0",
+        "@typescript-eslint/types": "8.40.0",
+        "@typescript-eslint/typescript-estree": "8.40.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -630,17 +630,17 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.38.0.tgz",
-      "integrity": "sha512-pWrTcoFNWuwHlA9CvlfSsGWs14JxfN1TH25zM5L7o0pRLhsoZkDnTsXfQRJBEWJoV5DL0jf+Z+sxiud+K0mq1g==",
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.40.0.tgz",
+      "integrity": "sha512-8CZ47QwalyRjsypfwnbI3hKy5gJDPmrkLjkgMxhi0+DZZ2QNx2naS6/hWoVYUHU7LU2zleF68V9miaVZvhFfTA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.38.0",
+        "@typescript-eslint/types": "8.40.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -710,9 +710,9 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz",
+      "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -1444,9 +1444,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.18.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.2.tgz",
-      "integrity": "sha512-6Jw4sE1maoRJo3q8MsSIn2onJFbLTOjY9hlx4DZXmOKvLRd1Ok2kXmAGXaafL2+ijsJZ1ClYbl/pmqr9+k4iUQ==",
+      "version": "5.18.3",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz",
+      "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1673,20 +1673,20 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.32.0.tgz",
-      "integrity": "sha512-LSehfdpgMeWcTZkWZVIJl+tkZ2nuSkyyB9C27MZqFWXuph7DvaowgcTvKqxvpLW1JZIk8PN7hFY3Rj9LQ7m7lg==",
+      "version": "9.33.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.33.0.tgz",
+      "integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.21.0",
-        "@eslint/config-helpers": "^0.3.0",
-        "@eslint/core": "^0.15.0",
+        "@eslint/config-helpers": "^0.3.1",
+        "@eslint/core": "^0.15.2",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.32.0",
-        "@eslint/plugin-kit": "^0.3.4",
+        "@eslint/js": "9.33.0",
+        "@eslint/plugin-kit": "^0.3.5",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
@@ -2035,10 +2035,13 @@
       }
     },
     "node_modules/fdir": {
-      "version": "6.4.6",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
-      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
       "peerDependencies": {
         "picomatch": "^3 || ^4"
       },
@@ -2615,14 +2618,10 @@
       }
     },
     "node_modules/ip-address": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz",
+      "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==",
       "license": "MIT",
-      "dependencies": {
-        "jsbn": "1.1.0",
-        "sprintf-js": "^1.1.3"
-      },
       "engines": {
         "node": ">= 12"
       }
@@ -3119,12 +3118,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jsbn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
-      "license": "MIT"
-    },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -4458,12 +4451,12 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.8.6",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.6.tgz",
-      "integrity": "sha512-pe4Y2yzru68lXCb38aAqRf5gvN8YdjP1lok5o0J7BOHljkyCGKVz7H3vpVIXKD27rj2giOJ7DwVyk/GWrPHDWA==",
+      "version": "2.8.7",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
+      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
       "license": "MIT",
       "dependencies": {
-        "ip-address": "^9.0.5",
+        "ip-address": "^10.0.1",
         "smart-buffer": "^4.2.0"
       },
       "engines": {
@@ -4485,12 +4478,6 @@
         "node": ">= 14"
       }
     },
-    "node_modules/sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-      "license": "BSD-3-Clause"
-    },
     "node_modules/ssri": {
       "version": "12.0.0",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz",
@@ -4934,9 +4921,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.8.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
-      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+      "version": "5.9.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
+      "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
       "dev": true,
       "license": "Apache-2.0",
       "peer": true,
@@ -4949,16 +4936,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.38.0.tgz",
-      "integrity": "sha512-FsZlrYK6bPDGoLeZRuvx2v6qrM03I0U0SnfCLPs/XCCPCFD80xU9Pg09H/K+XFa68uJuZo7l/Xhs+eDRg2l3hg==",
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.40.0.tgz",
+      "integrity": "sha512-Xvd2l+ZmFDPEt4oj1QEXzA4A2uUK6opvKu3eGN9aGjB8au02lIVcLyi375w94hHyejTOmzIU77L8ol2sRg9n7Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.38.0",
-        "@typescript-eslint/parser": "8.38.0",
-        "@typescript-eslint/typescript-estree": "8.38.0",
-        "@typescript-eslint/utils": "8.38.0"
+        "@typescript-eslint/eslint-plugin": "8.40.0",
+        "@typescript-eslint/parser": "8.40.0",
+        "@typescript-eslint/typescript-estree": "8.40.0",
+        "@typescript-eslint/utils": "8.40.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4969,7 +4956,7 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/unbox-primitive": {
diff --git a/pkgs/by-name/no/node-gyp/package.nix b/pkgs/by-name/no/node-gyp/package.nix
index 658c0518e982..756fd1d21a7e 100644
--- a/pkgs/by-name/no/node-gyp/package.nix
+++ b/pkgs/by-name/no/node-gyp/package.nix
@@ -8,16 +8,16 @@
 
 (buildNpmPackage.override { inherit nodejs; }) rec {
   pname = "node-gyp";
-  version = "11.3.0";
+  version = "11.4.1";
 
   src = fetchFromGitHub {
     owner = "nodejs";
     repo = "node-gyp";
     tag = "v${version}";
-    hash = "sha256-gWLoicQKbuk8fDsXwXOcqqz46XBiQYV/t42PgNnN/ek=";
+    hash = "sha256-8vhnWFkr0kQFgvk3F7FYayyKZfIhaX9OIhvXvSW8sNc=";
   };
 
-  npmDepsHash = "sha256-nQOhjYzTY7wV9yR/Ej2aeixi4pEC2k94i7ANixO+KVk=";
+  npmDepsHash = "sha256-cT8ifS0PFg3J9m0aoDgzhGrW7F06amgho3QnTUYEPEs=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json

From 7c491d6739a748fcf7075cce0b4cfcabb333d70c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 2 Aug 2025 10:00:57 +0300
Subject: [PATCH 2495/3724] ci: drop codeowners/labeler config for Plasma 5

---
 .github/labeler.yml | 9 +++------
 ci/OWNERS           | 4 +---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 031fead8f534..17f43402f0ca 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -431,12 +431,9 @@
       - changed-files:
           - any-glob-to-any-file:
               - doc/languages-frameworks/qt.section.md
-              - nixos/modules/services/x11/desktop-managers/plasma5.nix
-              - nixos/tests/plasma5.nix
-              - pkgs/applications/kde/**/*
-              - pkgs/desktops/plasma-5/**/*
-              - pkgs/development/libraries/kde-frameworks/**/*
-              - pkgs/development/libraries/qt-5/**/*
+              - nixos/modules/services/desktop-managers/plasma6.nix
+              - nixos/tests/plasma6.nix
+              - pkgs/kde/**/*
 
 "6.topic: R":
   - any:
diff --git a/ci/OWNERS b/ci/OWNERS
index 5802a45de03c..856ca93675ca 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -264,9 +264,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel
 /pkgs/development/libraries/qt-6 @K900 @NickCao @SuperSandro2000 @ttuegel
 
-# KDE / Plasma 5
-/pkgs/applications/kde @K900 @NickCao @SuperSandro2000 @ttuegel
-/pkgs/desktops/plasma-5 @K900 @NickCao @SuperSandro2000 @ttuegel
+# KDE Frameworks 5
 /pkgs/development/libraries/kde-frameworks @K900 @NickCao @SuperSandro2000 @ttuegel
 
 # KDE / Plasma 6

From 68a3a079c3c84bced219d35eaaf870a1f6ba911b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2496/3724] aliases.nix: convert Plasma 5 aliases to hard
 throws

---
 pkgs/top-level/aliases.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 420b5c033719..d05e327fa750 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -195,12 +195,9 @@ let
   makePlasma5Throw =
     name:
     throw ''
-      The top-level ${name} alias has been removed.
+      The libsForQt5.${name} package and the corresponding top-level ${name} alias have been removed.
 
-      Please explicitly use kdePackages.${name} for the latest Qt 6-based version,
-      or libsForQt5.${name} for the deprecated Qt 5 version.
-
-      Note that Qt 5 versions of most KDE software will be removed in NixOS 25.11.
+      Please explicitly use kdePackages.${name} for the latest Qt 6-based version.
     '';
 
   plasma5Throws = lib.mapAttrs (k: _: makePlasma5Throw k) deprecatedPlasma5Packages;

From d4fbd4bd55040c69dafac31a1ec2d90419f42023 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2497/3724] aliases.nix: drop the rest of Maui

---
 pkgs/top-level/aliases.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d05e327fa750..ff863f74bc7e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -387,7 +387,6 @@ mapAliases {
   buildGoPackage = throw "`buildGoPackage` has been deprecated and removed, see the Go section in the nixpkgs manual for details"; # Added 2024-11-18
   buildXenPackage = throw "'buildXenPackage' has been removed as a custom Xen build can now be achieved by simply overriding 'xen'."; # Added 2025-05-12
 
-  inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17
   bwidget = tclPackages.bwidget; # Added 2024-10-02
   # Shorter names; keep the longer name for back-compat. Added 2023-04-11. Warning added on 2024-12-16. Removed on 2025-05-31
   buildFHSUserEnv = throw "'buildFHSUserEnv' has been renamed to 'buildFHSEnv' and was removed in 25.11";
@@ -460,7 +459,6 @@ mapAliases {
   clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05
   cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05
   clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
-  inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17
   cloudlogoffline = throw "cloudlogoffline has been removed"; # added 2025-05-18
   clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   CoinMP = coinmp; # Added 2024-06-12
@@ -488,7 +486,6 @@ mapAliases {
   clubhouse-cli = throw "'clubhouse-cli' has been removed due to lack of interest to maintain it in Nixpkgs and failing to build."; # added 2025-04-21
   cockroachdb-bin = cockroachdb; # 2024-03-15
   codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2024-10-17
-  inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17
   concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17
   conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08
   containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09
@@ -955,7 +952,6 @@ mapAliases {
   inconsolata-nerdfont = lib.warnOnInstantiate "inconsolata-nerdfont is redundant. Use nerd-fonts.inconsolata instead." nerd-fonts.inconsolata; # Added 2024-11-10
   incrtcl = tclPackages.incrtcl; # Added 2024-10-02
   input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21
-  index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17
   inotifyTools = inotify-tools;
   insync-emblem-icons = throw "'insync-emblem-icons' has been removed, use 'insync-nautilus' instead"; # Added 2025-05-14
   inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2024-10-17
@@ -1298,8 +1294,6 @@ mapAliases {
     rust-synapse-compress-state = lib.warnOnInstantiate "`matrix-synapse-tools.rust-synapse-compress-state` has been renamed to `rust-synapse-compress-state`" rust-synapse-compress-state;
     synadm = lib.warnOnInstantiate "`matrix-synapse-tools.synadm` has been renamed to `synadm`" synadm;
   }; # Added 2025-02-20
-  maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17
-  maui-shell = throw "maui-shell has been removed from nixpkgs, it was broken"; # Added 2024-07-15
   mcomix3 = mcomix; # Added 2022-06-05
   mdt = md-tui; # Added 2024-09-03
   meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17
@@ -1853,7 +1847,6 @@ mapAliases {
   sexp = sexpp; # Added 2023-07-03
   sgrep = throw "'sgrep' has been removed as it was unmaintained upstream since 1998 and broken with gcc 14"; # Added 2025-05-17
   shallot = throw "'shallot' has been removed as it is broken and the upstream repository was removed. Consider using 'mkp224o'"; # Added 2025-03-16
-  inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17
   shell-hist = throw "'shell-hist' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   shipyard = jumppad; # Added 2023-06-06
   siduck76-st = st-snazzy; # Added 2024-12-24
@@ -2153,7 +2146,6 @@ mapAliases {
   vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt5' instead." vtkWithQt5; # Added 2025-07-18
   vuze = throw "'vuze' was removed because it is unmaintained upstream and insecure (CVE-2018-13417). BiglyBT is a maintained fork."; # Added 2024-11-22
   vwm = throw "'vwm' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
-  inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17
 
   ### W ###
   wakatime = wakatime-cli; # 2024-05-30

From 801d52204f0bd5f411557e4a700242d63d65771d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2498/3724] aliases.nix: drop tokodon

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

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ff863f74bc7e..aa4d44746d08 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2023,7 +2023,6 @@ mapAliases {
   tkimg = tclPackages.tkimg; # Added 2024-10-02
   todiff = throw "'todiff' was removed due to lack of known users"; # Added 2025-01-25
   toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22
-  tokodon = plasma5Packages.tokodon;
   tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28
   tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07
   ton = throw "'ton' has been removed as there were insufficient maintainer resources to keep up with updates"; # Added 2025-04-27

From 0e1071b8be59cee036b811240d22aeca0ce38dfd Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2499/3724] all-packages.nix: drop Cantor alias

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 556b25890efd..6712de68e5c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14821,8 +14821,6 @@ with pkgs;
 
   blas-ilp64 = blas.override { isILP64 = true; };
 
-  cantor = libsForQt5.cantor;
-
   labplot = libsForQt5.callPackage ../applications/science/math/labplot { };
 
   lapack-ilp64 = lapack.override { isILP64 = true; };

From 35d0bafabfc7befb8fa9e490454c7c0b846f5ff0 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 2 Aug 2025 10:00:57 +0300
Subject: [PATCH 2500/3724] nixos/treewide: clean up Plasma 5 references

Preparing to drop.
---
 .../doc/manual/configuration/modularity.section.md |  2 +-
 .../configuration/profiles/graphical.section.md    |  4 ++--
 .../doc/manual/configuration/x-windows.chapter.md  |  2 +-
 nixos/modules/i18n/input-method/ibus.nix           |  2 +-
 nixos/modules/profiles/graphical.nix               |  4 ++--
 nixos/modules/programs/chromium.nix                |  2 +-
 nixos/modules/programs/gnupg.nix                   |  2 +-
 nixos/modules/programs/kdeconnect.nix              |  2 +-
 nixos/modules/programs/zoom-us.nix                 |  4 ----
 nixos/modules/security/pam.nix                     |  4 ++--
 .../modules/services/desktop-managers/plasma6.nix  |  7 -------
 nixos/modules/services/display-managers/sddm.nix   |  2 +-
 nixos/modules/system/boot/plymouth.nix             | 14 +-------------
 nixos/release-combined.nix                         |  2 +-
 nixos/release.nix                                  |  2 +-
 nixos/tests/maestral.nix                           |  7 ++-----
 nixos/tests/terminal-emulators.nix                 |  2 +-
 17 files changed, 19 insertions(+), 45 deletions(-)

diff --git a/nixos/doc/manual/configuration/modularity.section.md b/nixos/doc/manual/configuration/modularity.section.md
index 5ae4f5b56331..ee495bb4bc60 100644
--- a/nixos/doc/manual/configuration/modularity.section.md
+++ b/nixos/doc/manual/configuration/modularity.section.md
@@ -33,7 +33,7 @@ Here, we include two modules from the same directory, `vpn.nix` and
 {
   services.xserver.enable = true;
   services.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
+  services.desktopManager.plasma6.enable = true;
   environment.systemPackages = [ pkgs.vim ];
 }
 ```
diff --git a/nixos/doc/manual/configuration/profiles/graphical.section.md b/nixos/doc/manual/configuration/profiles/graphical.section.md
index 84fad5c0a612..f67763811df1 100644
--- a/nixos/doc/manual/configuration/profiles/graphical.section.md
+++ b/nixos/doc/manual/configuration/profiles/graphical.section.md
@@ -1,10 +1,10 @@
 # Graphical {#sec-profile-graphical}
 
-Defines a NixOS configuration with the Plasma 5 desktop. It's used by the
+Defines a NixOS configuration with the Plasma 6 desktop. It's used by the
 graphical installation CD.
 
 It sets [](#opt-services.xserver.enable),
 [](#opt-services.displayManager.sddm.enable),
-[](#opt-services.xserver.desktopManager.plasma5.enable),
+[](#opt-services.desktopManager.plasma6.enable),
 and [](#opt-services.libinput.enable) to true. It also
 includes glxinfo and firefox in the system packages list.
diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md
index 4d779b2ffa42..bf0f541e9688 100644
--- a/nixos/doc/manual/configuration/x-windows.chapter.md
+++ b/nixos/doc/manual/configuration/x-windows.chapter.md
@@ -23,7 +23,7 @@ Thus you should pick one or more of the following lines:
 
 ```nix
 {
-  services.xserver.desktopManager.plasma5.enable = true;
+  services.desktopManager.plasma6.enable = true;
   services.xserver.desktopManager.xfce.enable = true;
   services.desktopManager.gnome.enable = true;
   services.xserver.desktopManager.mate.enable = true;
diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix
index f8a9249b042a..aec11b2362fc 100644
--- a/nixos/modules/i18n/input-method/ibus.nix
+++ b/nixos/modules/i18n/input-method/ibus.nix
@@ -53,7 +53,7 @@ in
       panel = lib.mkOption {
         type = with lib.types; nullOr path;
         default = null;
-        example = lib.literalExpression ''"''${pkgs.plasma5Packages.plasma-desktop}/libexec/kimpanel-ibus-panel"'';
+        example = lib.literalExpression ''"''${pkgs.kdePackages.plasma-desktop}/libexec/kimpanel-ibus-panel"'';
         description = "Replace the IBus panel with another panel.";
       };
     };
diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index 82ddc50e423c..d9065d20fe51 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -1,4 +1,4 @@
-# This module defines a NixOS configuration with the Plasma 5 desktop.
+# This module defines a NixOS configuration with the Plasma 6 desktop.
 # It's used by the graphical installation CD.
 
 { pkgs, ... }:
@@ -6,7 +6,7 @@
 {
   services.xserver = {
     enable = true;
-    desktopManager.plasma5.enable = true;
+    desktopManager.plasma6.enable = true;
   };
 
   services = {
diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix
index 9b07c19ff8c0..9659a186f304 100644
--- a/nixos/modules/programs/chromium.nix
+++ b/nixos/modules/programs/chromium.nix
@@ -27,7 +27,7 @@ in
       enablePlasmaBrowserIntegration = lib.mkEnableOption "Native Messaging Host for Plasma Browser Integration";
 
       plasmaBrowserIntegrationPackage = lib.mkPackageOption pkgs [
-        "plasma5Packages"
+        "kdePackages"
         "plasma-browser-integration"
       ] { };
 
diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index a6fbd081f44a..b8e88aa64023 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -77,7 +77,7 @@ in
         Which pinentry package to use. The path to the mainProgram as defined in
         the package's meta attributes will be set in /etc/gnupg/gpg-agent.conf.
         If not set by the user, it'll pick an appropriate flavor depending on the
-        system configuration (qt flavor for lxqt and plasma5, gtk2 for xfce,
+        system configuration (qt flavor for lxqt and plasma, gtk2 for xfce,
         gnome3 on all other systems with X enabled, curses otherwise).
       '';
     };
diff --git a/nixos/modules/programs/kdeconnect.nix b/nixos/modules/programs/kdeconnect.nix
index 17bb384a9fea..f51eeb9c6ced 100644
--- a/nixos/modules/programs/kdeconnect.nix
+++ b/nixos/modules/programs/kdeconnect.nix
@@ -15,7 +15,7 @@
       `gnomeExtensions.gsconnect` as an alternative
       implementation if you use Gnome
     '';
-    package = lib.mkPackageOption pkgs [ "plasma5Packages" "kdeconnect-kde" ] {
+    package = lib.mkPackageOption pkgs [ "kdePackages" "kdeconnect-kde" ] {
       example = "gnomeExtensions.gsconnect";
     };
   };
diff --git a/nixos/modules/programs/zoom-us.nix b/nixos/modules/programs/zoom-us.nix
index b5b6c8acf7b6..9d31c8e3086a 100644
--- a/nixos/modules/programs/zoom-us.nix
+++ b/nixos/modules/programs/zoom-us.nix
@@ -23,10 +23,6 @@
         plasma6XdgDesktopPortalSupport =
           prev.plasma6XdgDesktopPortalSupport or config.services.desktopManager.plasma6.enable;
 
-        # Support Plasma 5 desktop environment if it's enabled on the system.
-        plasma5XdgDesktopPortalSupport =
-          prev.plasma5XdgDesktopPortalSupport or config.services.xserver.desktopManager.plasma5.enable;
-
         # Support LXQT desktop environment if it's enabled on the system.
         # There's also `config.services.xserver.desktopManager.lxqt.enable`
         lxqtXdgDesktopPortalSupport = prev.lxqtXdgDesktopPortalSupport or config.xdg.portal.lxqt.enable;
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 53e67873d200..198251bf34e3 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -549,8 +549,8 @@ let
             '';
           };
 
-          package = lib.mkPackageOption pkgs.plasma5Packages "kwallet-pam" {
-            pkgsText = "pkgs.plasma5Packages";
+          package = lib.mkPackageOption pkgs.kdePackages "kwallet-pam" {
+            pkgsText = "pkgs.kdePackages";
           };
 
           forceRun = lib.mkEnableOption null // {
diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index c553da347d79..12bdb2a6db69 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -68,13 +68,6 @@ in
   ];
 
   config = mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = cfg.enable -> !config.services.xserver.desktopManager.plasma5.enable;
-        message = "Cannot enable plasma5 and plasma6 at the same time!";
-      }
-    ];
-
     qt.enable = true;
     programs.xwayland.enable = true;
     environment.systemPackages =
diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix
index 06516fb76b7a..b9df863d12f9 100644
--- a/nixos/modules/services/display-managers/sddm.nix
+++ b/nixos/modules/services/display-managers/sddm.nix
@@ -228,7 +228,7 @@ in
         '';
       };
 
-      package = mkPackageOption pkgs [ "plasma5Packages" "sddm" ] { };
+      package = mkPackageOption pkgs [ "libsForQt5" "sddm" ] { };
 
       enableHidpi = mkOption {
         type = types.bool;
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 24861b678769..8636ec7957d2 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -17,13 +17,6 @@ let
   cfg = config.boot.plymouth;
   opt = options.boot.plymouth;
 
-  nixosBreezePlymouth = pkgs.plasma5Packages.breeze-plymouth.override {
-    logoFile = cfg.logo;
-    logoName = "nixos";
-    osName = "NixOS";
-    osVersion = config.system.nixos.release;
-  };
-
   plymouthLogos = pkgs.runCommand "plymouth-logos" { inherit (cfg) logo; } ''
     mkdir -p $out
 
@@ -87,12 +80,7 @@ in
       };
 
       themePackages = mkOption {
-        default = lib.optional (cfg.theme == "breeze") nixosBreezePlymouth;
-        defaultText = literalMD ''
-          A NixOS branded variant of the breeze theme when
-          `config.${opt.theme} == "breeze"`, otherwise
-          `[ ]`.
-        '';
+        default = [ ];
         type = types.listOf types.package;
         description = ''
           Extra theme packages for plymouth.
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 98519bcab4f7..b9b59e4ab37a 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -171,7 +171,7 @@ rec {
         (onFullSupported "nixos.tests.php.fpm")
         (onFullSupported "nixos.tests.php.httpd")
         (onFullSupported "nixos.tests.php.pcre")
-        (onFullSupported "nixos.tests.plasma5")
+        (onFullSupported "nixos.tests.plasma6")
         (onSystems [ "x86_64-linux" ] "nixos.tests.podman")
         (onFullSupported "nixos.tests.predictable-interface-names.predictableNetworkd")
         (onFullSupported "nixos.tests.predictable-interface-names.predictable")
diff --git a/nixos/release.nix b/nixos/release.nix
index 3bcacf1e471c..1000bf9c6bc7 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -594,7 +594,7 @@ rec {
       {
         services.xserver.enable = true;
         services.displayManager.sddm.enable = true;
-        services.xserver.desktopManager.plasma5.enable = true;
+        services.desktopManager.plasma6.enable = true;
       }
     );
 
diff --git a/nixos/tests/maestral.nix b/nixos/tests/maestral.nix
index 9b42b2d59e28..30491a496b93 100644
--- a/nixos/tests/maestral.nix
+++ b/nixos/tests/maestral.nix
@@ -31,11 +31,8 @@
       gui =
         { ... }:
         common {
-          services.xserver = {
-            enable = true;
-            desktopManager.plasma5.enable = true;
-            desktopManager.plasma5.runUsingSystemd = true;
-          };
+          services.xserver.enable = true;
+          services.desktopManager.plasma6.enable = true;
 
           services.displayManager = {
             sddm.enable = true;
diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix
index 6b209b8b3368..dfa5d9150ba5 100644
--- a/nixos/tests/terminal-emulators.nix
+++ b/nixos/tests/terminal-emulators.nix
@@ -63,7 +63,7 @@ let
     kitty.pkg = p: p.kitty;
     kitty.cmd = "kitty $command";
 
-    konsole.pkg = p: p.plasma5Packages.konsole;
+    konsole.pkg = p: p.kdePackages.konsole;
 
     lxterminal.pkg = p: p.lxterminal;
 

From 6607ff30e7a016462bf91402cc35a3278b359bf0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 19:34:56 +0000
Subject: [PATCH 2501/3724] python3Packages.universal-silabs-flasher: 0.0.31 ->
 0.0.32

---
 .../python-modules/universal-silabs-flasher/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
index 285db38955a9..000120a088fc 100644
--- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix
+++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "universal-silabs-flasher";
-  version = "0.0.31";
+  version = "0.0.32";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "NabuCasa";
     repo = "universal-silabs-flasher";
     tag = "v${version}";
-    hash = "sha256-yE6tY0hxslv0nZEX63miegQJHGKD/wp2W4aaj3y74i4=";
+    hash = "sha256-AnZhs9uR0lHY8CxYlbfblnftahnbC2LgwtyDVQCYizI=";
   };
 
   postPatch = ''

From 1edc24ddd3b1f889ddbf5f22add9d328fd9b1471 Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Thu, 21 Aug 2025 12:37:09 -0700
Subject: [PATCH 2502/3724] update jocalsend package to latest release

---
 pkgs/by-name/jo/jocalsend/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/jo/jocalsend/package.nix b/pkgs/by-name/jo/jocalsend/package.nix
index 5ab082ac736e..629995b2484a 100644
--- a/pkgs/by-name/jo/jocalsend/package.nix
+++ b/pkgs/by-name/jo/jocalsend/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jocalsend";
-  version = "1.6.1803";
+  version = "1.6.18033";
 
   src = fetchFromGitea {
     domain = "git.kittencollective.com";
     owner = "nebkor";
     repo = "joecalsend";
     tag = finalAttrs.version;
-    hash = "sha256-nrXUZb4Yi1ttEltzqKUnMLLr5cvhqCxW1iJyo1ErG0w=";
+    hash = "sha256-q2fzi0NKfkjCwV7FD0PqXSHtJWQtvdvKx4WmhnZpKvg=";
   };
 
-  cargoHash = "sha256-0yFKJtwQikP6WRDVWgv7b9e0iUS9AdKpx6VTeNAQ4zs=";
+  cargoHash = "sha256-u9Ev/Qr/WN6OOaMXPesA3nmV3efKJA3/2YWm8S60PjU=";
 
   nativeBuildInputs = [
     pkg-config

From 6cec4af21a4117c46776476b2ae74b49f01c5dbd Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 21 Aug 2025 20:42:52 +0100
Subject: [PATCH 2503/3724] ncdu: 2.9 -> 2.9.1

Changes: https://dev.yorhel.nl/ncdu/changes2
---
 pkgs/by-name/nc/ncdu/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index 90e3869f525c..630dca3a9331 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ncdu";
-  version = "2.9";
+  version = "2.9.1";
 
   src = fetchurl {
     url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
-    hash = "sha256-dfCsO85PwBLoGYtyUY21F56QMHmFjvzgi5EtXcxwlNM=";
+    hash = "sha256-v9EJThQA7onP1ZIA6rlA8CXM3AwjgGcQXJhKPEhXv34=";
   };
 
   nativeBuildInputs = [

From 09a15ac329943015b163adcf72e644d5c537d354 Mon Sep 17 00:00:00 2001
From: dot-file <Random145@tutamail.com>
Date: Wed, 20 Aug 2025 08:56:15 +0300
Subject: [PATCH 2504/3724] lixPackageSets.stable: 2.91 -> 2.93

The curl issue that made 2.92 and up unstable has been solved:
- https://git.lix.systems/lix-project/lix/issues/662#issuecomment-10236
- https://github.com/NixOS/nixpkgs/pull/396200

So there doesn't seem to be a reason not to make "stable" default to 2.93
---
 pkgs/tools/package-management/lix/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index efc0ef628b0a..eae83108141a 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -291,9 +291,7 @@ lib.makeExtensible (self: {
 
   latest = self.lix_2_93;
 
-  # Note: This is not yet 2.92 because of a non-deterministic `curl` error.
-  # See: https://git.lix.systems/lix-project/lix/issues/662
-  stable = self.lix_2_91;
+  stable = self.lix_2_93;
 
   # Previously, `nix-eval-jobs` was not packaged here, so we export an
   # attribute with the previously-expected structure for compatibility. This

From 4b4aa628da835c05d05ed9afe2304862123fd529 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 21:41:57 +0200
Subject: [PATCH 2505/3724] actions/checkout: parallelize checkout of multiple
 commits on tmpfs

Instead of fetching up to 3 times on each new checkout, we now fetch all
the commits we're going to need at once. Afterwards, we checkout the
different worktrees in parallel, which doesn't give us much, yet,
because it would still be IO-bound on its own. Inconsistent IO
performance on disk is also the biggest limitation for checkout right
now, where checkout times range everywhere from 20s to 40s.

By checking out the worktrees on a tmpfs, the actual checkout only takes
1s and benefits from parallelization. The overall checkout time is now
8-11s, depending on the number of commits.

That's a reduction of 10-30s and we get this speedup for almost every
job in the PR workflow, which is huge.

This potentially has a nice side-effect for Eval, too: Because the repo
is in RAM, Eval seems to run slightly faster, up to 10 seconds less.
---
 .github/actions/checkout/action.yml | 111 ++++++++++++++++++++--------
 .github/workflows/eval.yml          |   4 +-
 2 files changed, 82 insertions(+), 33 deletions(-)

diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml
index a07edb097d7b..1b61b9b0d08d 100644
--- a/.github/actions/checkout/action.yml
+++ b/.github/actions/checkout/action.yml
@@ -13,39 +13,88 @@ inputs:
 runs:
   using: composite
   steps:
-    - if: inputs.merged-as-untrusted-at
-      # Would be great to do the checkouts in git worktrees of the existing spare checkout instead,
-      # but Nix is broken with them:
-      # https://github.com/NixOS/nix/issues/6073
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      with:
-        ref: ${{ inputs.merged-as-untrusted-at }}
-        path: untrusted
-
-    - if: inputs.target-as-trusted-at
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      with:
-        ref: ${{ inputs.target-as-trusted-at }}
-        path: trusted
-
-    - if: inputs.pinned-from
-      id: pinned
-      uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+    - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
       env:
+        MERGED_SHA: ${{ inputs.merged-as-untrusted-at }}
         PINNED_FROM: ${{ inputs.pinned-from }}
+        TARGET_SHA: ${{ inputs.target-as-trusted-at }}
       with:
         script: |
-          const path = require('node:path')
-          const pinned = require(path.resolve(path.join(process.env.PINNED_FROM, 'ci', 'pinned.json')))
-          core.setOutput('pinned-at', pinned.pins.nixpkgs.revision)
+          const { spawn } = require('node:child_process')
+          const { join } = require('node:path')
 
-    - if: steps.pinned.outputs.pinned-at
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      with:
-        ref: ${{ steps.pinned.outputs.pinned-at }}
-        path: pinned
-        sparse-checkout: |
-          lib
-          maintainers
-          nixos/lib
-          pkgs
+          async function run(cmd, ...args) {
+            return new Promise((resolve, reject) => {
+              const proc = spawn(cmd, args, {
+                stdio: 'inherit'
+              })
+              proc.on('close', (code) => {
+                if (code === 0) resolve()
+                else reject(code)
+              })
+            })
+          }
+
+          // These are set automatically by the spare checkout for .github/actions.
+          // Undo them, otherwise git fetch below will not do anything.
+          await run('git', 'config', 'unset', 'remote.origin.promisor')
+          await run('git', 'config', 'unset', 'remote.origin.partialclonefilter')
+
+          // Getting the pinned SHA via API allows us to do one single fetch call for all commits.
+          // Otherwise we would have to fetch merged/target first, read pinned, fetch again.
+          // A single fetch call comes with a lot less overhead. The fetch takes essentially the
+          // same time no matter whether its 1, 2 or 3 commits at once.
+          async function getPinnedSha(ref) {
+            const { content, encoding } = (await github.rest.repos.getContent({
+              ...context.repo,
+              path: 'ci/pinned.json',
+              ref,
+            })).data
+            const pinned = JSON.parse(Buffer.from(content, encoding).toString())
+            return pinned.pins.nixpkgs.revision
+          }
+
+          const commits = [
+            {
+              sha: process.env.MERGED_SHA,
+              path: 'untrusted',
+            },
+            {
+              sha: process.env.PINNED_FROM === 'untrusted' && (await getPinnedSha(process.env.MERGED_SHA)),
+              path: 'pinned'
+            },
+            {
+              sha: process.env.TARGET_SHA,
+              path: 'trusted',
+            },
+            {
+              sha: process.env.PINNED_FROM === 'trusted' && (await getPinnedSha(process.env.TARGET_SHA)),
+              path: 'pinned'
+            }
+          ].filter(({ sha }) => Boolean(sha))
+
+          console.log('Checking out the following commits:', commits)
+
+          // Fetching all commits at once is much faster than doing multiple checkouts.
+          // This would fail without --refetch, because the we had a partial clone before, but changed it above.
+          await run('git', 'fetch', '--depth=1', '--refetch', 'origin', ...(commits.map(({ sha }) => sha)))
+
+          // Create all worktrees in parallel.
+          await Promise.all(commits.map(async ({ sha, path }) => {
+            // Checking out onto tmpfs takes 1s and is faster by at least factor 10x.
+            await run('mkdir', path)
+            switch (process.env.RUNNER_OS) {
+              case 'macOS':
+                await run('sudo', 'mount_tmpfs', path)
+                // macOS creates this hidden folder to log file system activity.
+                // This trips up git when adding a worktree below, because the target folder is not empty.
+                await run('sudo', 'rm', '-rf', join(path, '.fseventsd'))
+                break
+              case 'Linux':
+                await run('sudo', 'mount', '-t', 'tmpfs', 'tmpfs', path)
+                break
+            }
+            await run('git', 'worktree', 'add', path, sha, '--no-checkout', '--force')
+            await run('git', '-C', path, 'sparse-checkout', 'disable')
+            await run('git', '-C', path, 'checkout', '--progress')
+          }))
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 0b70521d62b3..805303ac679e 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -217,6 +217,7 @@ jobs:
       - name: Check out the PR at the target commit
         uses: ./.github/actions/checkout
         with:
+          merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
           pinned-from: trusted
 
@@ -240,7 +241,6 @@ jobs:
         env:
           AUTHOR_ID: ${{ github.event.pull_request.user.id }}
         run: |
-          git -C trusted fetch --depth 1 origin ${{ inputs.mergedSha }}
           git -C trusted diff --name-only ${{ inputs.mergedSha }} \
             | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
 
@@ -392,7 +392,7 @@ jobs:
         uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
       - name: Ensure flake outputs on all systems still evaluate
-        run: nix flake check --all-systems --no-build ./untrusted
+        run: nix flake check --all-systems --no-build './untrusted?shallow=1'
 
       - name: Query nixpkgs with aliases enabled to check for basic syntax errors
         run: |

From fbecc923cc5c93278cbb2dbd1b8761a55b153118 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 21 Aug 2025 15:44:10 -0400
Subject: [PATCH 2506/3724] nixos/orca: Be careful about setting the
 display-manager path

Without this `mkIf`, it was accidentally disabling
`getty@tty1.service` on non-display-manager systems.
---
 nixos/modules/services/accessibility/orca.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/accessibility/orca.nix b/nixos/modules/services/accessibility/orca.nix
index e624ffa23a33..3fe205498bfe 100644
--- a/nixos/modules/services/accessibility/orca.nix
+++ b/nixos/modules/services/accessibility/orca.nix
@@ -20,7 +20,9 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
-    systemd.services.display-manager.path = [ cfg.package ];
+    systemd.services.display-manager = lib.mkIf config.services.displayManager.enable {
+      path = [ cfg.package ];
+    };
     services.speechd.enable = true;
   };
 }

From 35acc490c5f1fab0898fb2c12201a37b87ad0461 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 21 Aug 2025 21:56:42 +0200
Subject: [PATCH 2507/3724] hyfetch: install shell completions

---
 pkgs/by-name/hy/hyfetch/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix
index 200449a34646..92ac46b0b59f 100644
--- a/pkgs/by-name/hy/hyfetch/package.nix
+++ b/pkgs/by-name/hy/hyfetch/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
+  stdenv,
   makeBinaryWrapper,
   pciutils,
   versionCheckHook,
@@ -36,6 +37,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     installManPage ./docs/hyfetch.1 ./docs/neowofetch.1
 
     install -m 755 neofetch $out/bin/neowofetch
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd hyfetch \
+      --bash <($out/bin/hyfetch --bpaf-complete-style-bash) \
+      --fish <($out/bin/hyfetch --bpaf-complete-style-fish) \
+      --zsh <($out/bin/hyfetch --bpaf-complete-style-zsh)
   '';
 
   postFixup = ''

From 33bdbd0579ac551ffa18d763e3993bc190336ca8 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 21 Aug 2025 21:06:04 +0100
Subject: [PATCH 2508/3724] nano: 8.5 -> 8.6

Changes: https://lists.gnu.org/archive/html/info-gnu/2025-08/msg00008.html
---
 pkgs/by-name/na/nano/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/na/nano/package.nix b/pkgs/by-name/na/nano/package.nix
index 692053ab7f5d..3d9c8e9c4bee 100644
--- a/pkgs/by-name/na/nano/package.nix
+++ b/pkgs/by-name/na/nano/package.nix
@@ -31,11 +31,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "nano";
-  version = "8.5";
+  version = "8.6";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
-    hash = "sha256-AAsBHTOcFBr5ZG1DKI9UMl/1xujTnW5IK3h7vGZUwmo=";
+    hash = "sha256-96v78O7V9XOrUb13pFjzLYL5hZxV6WifgZ2W/hQ3phk=";
   };
 
   nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext;

From 15a586f29d593dfd030dca1c0c6e7c257ca26d15 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:36:52 +0300
Subject: [PATCH 2509/3724] nixos: remove Plasma 5

---
 ...llation-cd-graphical-calamares-plasma5.nix |  53 --
 ...lation-cd-graphical-plasma5-new-kernel.nix |   7 -
 .../installation-cd-graphical-plasma5.nix     |  50 --
 nixos/modules/rename.nix                      |   6 +
 .../services/x11/desktop-managers/default.nix |   1 -
 .../services/x11/desktop-managers/plasma5.nix | 635 ------------------
 nixos/tests/all-tests.nix                     |   2 -
 nixos/tests/plasma-bigscreen.nix              |  41 --
 nixos/tests/plasma5-systemd-start.nix         |  46 --
 nixos/tests/plasma5.nix                       |  70 --
 10 files changed, 6 insertions(+), 905 deletions(-)
 delete mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix
 delete mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix
 delete mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
 delete mode 100644 nixos/modules/services/x11/desktop-managers/plasma5.nix
 delete mode 100644 nixos/tests/plasma-bigscreen.nix
 delete mode 100644 nixos/tests/plasma5-systemd-start.nix
 delete mode 100644 nixos/tests/plasma5.nix

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix
deleted file mode 100644
index 84d0ea44bb84..000000000000
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-# This module defines a NixOS installation CD that contains X11 and
-# Plasma 5.
-
-{ lib, pkgs, ... }:
-
-{
-  imports = [ ./installation-cd-graphical-calamares.nix ];
-
-  isoImage.edition = lib.mkDefault "plasma5";
-
-  services.xserver.desktopManager.plasma5 = {
-    enable = true;
-  };
-
-  # Automatically login as nixos.
-  services.displayManager = {
-    sddm.enable = true;
-    autoLogin = {
-      enable = true;
-      user = "nixos";
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    # Graphical text editor
-    plasma5Packages.kate
-  ];
-
-  system.activationScripts.installerDesktop =
-    let
-
-      # Comes from documentation.nix when xserver and nixos.enable are true.
-      manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop";
-
-      homeDir = "/home/nixos/";
-      desktopDir = homeDir + "Desktop/";
-
-    in
-    ''
-      mkdir -p ${desktopDir}
-      chown nixos ${homeDir} ${desktopDir}
-
-      ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"}
-      ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"}
-      ln -sfT ${pkgs.plasma5Packages.konsole}/share/applications/org.kde.konsole.desktop ${
-        desktopDir + "org.kde.konsole.desktop"
-      }
-      ln -sfT ${pkgs.calamares-nixos}/share/applications/calamares.desktop ${
-        desktopDir + "calamares.desktop"
-      }
-    '';
-
-}
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix
deleted file mode 100644
index d98325a99ac2..000000000000
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [ ./installation-cd-graphical-plasma5.nix ];
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-}
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
deleted file mode 100644
index f41d34c65e79..000000000000
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-# This module defines a NixOS installation CD that contains X11 and
-# Plasma 5.
-
-{ lib, pkgs, ... }:
-
-{
-  imports = [ ./installation-cd-graphical-base.nix ];
-
-  isoImage.edition = lib.mkDefault "plasma5";
-
-  services.xserver.desktopManager.plasma5 = {
-    enable = true;
-  };
-
-  # Automatically login as nixos.
-  services.displayManager = {
-    sddm.enable = true;
-    autoLogin = {
-      enable = true;
-      user = "nixos";
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    # Graphical text editor
-    plasma5Packages.kate
-  ];
-
-  system.activationScripts.installerDesktop =
-    let
-
-      # Comes from documentation.nix when xserver and nixos.enable are true.
-      manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop";
-
-      homeDir = "/home/nixos/";
-      desktopDir = homeDir + "Desktop/";
-
-    in
-    ''
-      mkdir -p ${desktopDir}
-      chown nixos ${homeDir} ${desktopDir}
-
-      ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"}
-      ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"}
-      ln -sfT ${pkgs.plasma5Packages.konsole}/share/applications/org.kde.konsole.desktop ${
-        desktopDir + "org.kde.konsole.desktop"
-      }
-    '';
-
-}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 8ab897ecba56..4934df421eeb 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -265,6 +265,12 @@ in
       LightDM. Please use the services.displayManager.autoLogin options
       instead, or any other display manager in NixOS as they all support auto-login.
     '')
+    (mkRemovedOptionModule [
+      "services"
+      "xserver"
+      "desktopManager"
+      "plasma5"
+    ] "the Plasma 5 desktop environment has been removed from nixpkgs, as it has reached EOL upstream.")
     (mkRemovedOptionModule [ "services" "xserver" "multitouch" ] ''
       services.xserver.multitouch (which uses xf86_input_mtrack) has been removed
       as the underlying package isn't being maintained. Working alternatives are
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 9dbb9a42d4fa..6219d11fda05 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -26,7 +26,6 @@ in
     ./xterm.nix
     ./phosh.nix
     ./xfce.nix
-    ./plasma5.nix
     ../../desktop-managers/plasma6.nix
     ./lumina.nix
     ./lxqt.nix
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
deleted file mode 100644
index db525adc8f7f..000000000000
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ /dev/null
@@ -1,635 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  utils,
-  ...
-}:
-
-let
-  xcfg = config.services.xserver;
-  cfg = xcfg.desktopManager.plasma5;
-
-  # Use only for **internal** options.
-  # This is not exactly user-friendly.
-  kdeConfigurationType =
-    with types;
-    let
-      valueTypes =
-        (oneOf [
-          bool
-          float
-          int
-          str
-        ])
-        // {
-          description = "KDE Configuration value";
-          emptyValue.value = "";
-        };
-      set = (nullOr (lazyAttrsOf valueTypes)) // {
-        description = "KDE Configuration set";
-        emptyValue.value = { };
-      };
-    in
-    (lazyAttrsOf set)
-    // {
-      description = "KDE Configuration file";
-      emptyValue.value = { };
-    };
-
-  inherit (lib)
-    getBin
-    optionalAttrs
-    literalExpression
-    mkRemovedOptionModule
-    mkRenamedOptionModule
-    mkDefault
-    mkIf
-    mkMerge
-    mkOption
-    mkPackageOption
-    types
-    ;
-
-  activationScript = ''
-    ${set_XDG_CONFIG_HOME}
-
-    # The KDE icon cache is supposed to update itself automatically, but it uses
-    # the timestamp on the icon theme directory as a trigger. This doesn't work
-    # on NixOS because the timestamp never changes. As a workaround, delete the
-    # icon cache at login and session activation.
-    # See also: http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
-    rm -fv "$HOME"/.cache/icon-cache.kcache
-
-    # xdg-desktop-settings generates this empty file but
-    # it makes kbuildsyscoca5 fail silently. To fix this
-    # remove that menu if it exists.
-    rm -fv "''${XDG_CONFIG_HOME}"/menus/applications-merged/xdg-desktop-menu-dummy.menu
-
-    # Qt writes a weird ‘libraryPath’ line to
-    # ~/.config/Trolltech.conf that causes the KDE plugin
-    # paths of previous KDE invocations to be searched.
-    # Obviously using mismatching KDE libraries is potentially
-    # disastrous, so here we nuke references to the Nix store
-    # in Trolltech.conf.  A better solution would be to stop
-    # Qt from doing this wackiness in the first place.
-    trolltech_conf="''${XDG_CONFIG_HOME}/Trolltech.conf"
-    if [ -e "$trolltech_conf" ]; then
-      ${getBin pkgs.gnused}/bin/sed -i "$trolltech_conf" -e '/nix\\store\|nix\/store/ d'
-    fi
-
-    # Remove the kbuildsyscoca5 cache. It will be regenerated
-    # immediately after. This is necessary for kbuildsyscoca5 to
-    # recognize that software that has been removed.
-    rm -fv "$HOME"/.cache/ksycoca*
-
-    ${pkgs.plasma5Packages.kservice}/bin/kbuildsycoca5
-  '';
-
-  set_XDG_CONFIG_HOME = ''
-    # Set the default XDG_CONFIG_HOME if it is unset.
-    # Per the XDG Base Directory Specification:
-    # https://specifications.freedesktop.org/basedir-spec/latest
-    # 1. Never export this variable! If it is unset, then child processes are
-    # expected to set the default themselves.
-    # 2. Contaminate / if $HOME is unset; do not check if $HOME is set.
-    XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-$HOME/.config}
-  '';
-
-in
-
-{
-  options = {
-    services.xserver.desktopManager.plasma5 = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable the Plasma 5 (KDE 5) desktop environment.";
-      };
-
-      phononBackend = mkOption {
-        type = types.enum [
-          "gstreamer"
-          "vlc"
-        ];
-        default = "vlc";
-        example = "gstreamer";
-        description = "Phonon audio backend to install.";
-      };
-
-      useQtScaling = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable HiDPI scaling in Qt.";
-      };
-
-      runUsingSystemd = mkOption {
-        description = "Use systemd to manage the Plasma session";
-        type = types.bool;
-        default = true;
-      };
-
-      notoPackage = mkPackageOption pkgs "Noto fonts" {
-        default = [ "noto-fonts" ];
-        example = "noto-fonts-lgc-plus";
-      };
-
-      # Internally allows configuring kdeglobals globally
-      kdeglobals = mkOption {
-        internal = true;
-        default = { };
-        type = kdeConfigurationType;
-      };
-
-      # Internally allows configuring kwin globally
-      kwinrc = mkOption {
-        internal = true;
-        default = { };
-        type = kdeConfigurationType;
-      };
-
-      mobile.enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enable support for running the Plasma Mobile shell.
-        '';
-      };
-
-      mobile.installRecommendedSoftware = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Installs software recommended for use with Plasma Mobile, but which
-          is not strictly required for Plasma Mobile to run.
-        '';
-      };
-
-      bigscreen.enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enable support for running the Plasma Bigscreen session.
-        '';
-      };
-    };
-    environment.plasma5.excludePackages = mkOption {
-      description = "List of default packages to exclude from the configuration";
-      type = types.listOf types.package;
-      default = [ ];
-      example = literalExpression "[ pkgs.plasma5Packages.oxygen ]";
-    };
-  };
-
-  imports = [
-    (mkRemovedOptionModule [
-      "services"
-      "xserver"
-      "desktopManager"
-      "plasma5"
-      "enableQt4Support"
-    ] "Phonon no longer supports Qt 4.")
-    (mkRemovedOptionModule [
-      "services"
-      "xserver"
-      "desktopManager"
-      "plasma5"
-      "supportDDC"
-    ] "DDC/CI is no longer supported upstream.")
-    (mkRenamedOptionModule
-      [ "services" "xserver" "desktopManager" "kde5" ]
-      [ "services" "xserver" "desktopManager" "plasma5" ]
-    )
-    (mkRenamedOptionModule
-      [ "services" "xserver" "desktopManager" "plasma5" "excludePackages" ]
-      [ "environment" "plasma5" "excludePackages" ]
-    )
-  ];
-
-  config = mkMerge [
-    # Common Plasma dependencies
-    (mkIf (cfg.enable || cfg.mobile.enable || cfg.bigscreen.enable) {
-      warnings = [
-        "Plasma 5 has been deprecated and will be removed in NixOS 25.11. Please migrate your configuration to Plasma 6."
-      ];
-
-      security.wrappers = {
-        kwin_wayland = {
-          owner = "root";
-          group = "root";
-          capabilities = "cap_sys_nice+ep";
-          source = "${getBin pkgs.plasma5Packages.kwin}/bin/kwin_wayland";
-        };
-      }
-      // optionalAttrs (!cfg.runUsingSystemd) {
-        start_kdeinit = {
-          setuid = true;
-          owner = "root";
-          group = "root";
-          source = "${getBin pkgs.plasma5Packages.kinit}/libexec/kf5/start_kdeinit";
-        };
-      };
-
-      qt.enable = true;
-
-      environment.systemPackages =
-        with pkgs.plasma5Packages;
-        let
-          requiredPackages = [
-            frameworkintegration
-            kactivities
-            kauth
-            kcmutils
-            kconfig
-            kconfigwidgets
-            kcoreaddons
-            kdoctools
-            kdbusaddons
-            kdeclarative
-            kded
-            kdesu
-            kdnssd
-            kemoticons
-            kfilemetadata
-            kglobalaccel
-            kguiaddons
-            kiconthemes
-            kidletime
-            kimageformats
-            kinit
-            kirigami2 # In system profile for SDDM theme. TODO: wrapper.
-            kio
-            kjobwidgets
-            knewstuff
-            knotifications
-            knotifyconfig
-            kpackage
-            kparts
-            kpeople
-            krunner
-            kservice
-            ktextwidgets
-            kwallet
-            kwallet-pam
-            kwalletmanager
-            kwayland
-            kwayland-integration
-            kwidgetsaddons
-            kxmlgui
-            kxmlrpcclient
-            plasma-framework
-            solid
-            sonnet
-            threadweaver
-
-            breeze-qt5
-            kactivitymanagerd
-            kde-cli-tools
-            kdecoration
-            kdeplasma-addons
-            kgamma5
-            khotkeys
-            kscreen
-            kscreenlocker
-            kwayland
-            kwin
-            kwrited
-            libkscreen
-            libksysguard
-            milou
-            plasma-integration
-            polkit-kde-agent
-
-            qqc2-breeze-style
-            qqc2-desktop-style
-
-            plasma-desktop
-            plasma-workspace
-            plasma-workspace-wallpapers
-
-            oxygen-sounds
-
-            breeze-icons
-            pkgs.hicolor-icon-theme
-
-            kde-gtk-config
-            breeze-gtk
-
-            qtvirtualkeyboard
-
-            pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
-          ];
-          optionalPackages = [
-            pkgs.aha # needed by kinfocenter for fwupd support
-            plasma-browser-integration
-            konsole
-            oxygen
-            (lib.getBin qttools) # Expose qdbus in PATH
-          ];
-        in
-        requiredPackages
-        ++ utils.removePackagesByName optionalPackages config.environment.plasma5.excludePackages
-
-        # Phonon audio backend
-        ++ lib.optional (cfg.phononBackend == "gstreamer") pkgs.plasma5Packages.phonon-backend-gstreamer
-        ++ lib.optional (cfg.phononBackend == "vlc") pkgs.plasma5Packages.phonon-backend-vlc
-
-        # Optional hardware support features
-        ++ lib.optionals config.hardware.bluetooth.enable [
-          bluedevil
-          bluez-qt
-          pkgs.openobex
-          pkgs.obexftp
-        ]
-        ++ lib.optional config.networking.networkmanager.enable plasma-nm
-        ++ lib.optional config.services.pulseaudio.enable plasma-pa
-        ++ lib.optional config.services.pipewire.pulse.enable plasma-pa
-        ++ lib.optional config.powerManagement.enable powerdevil
-        ++ lib.optional config.services.colord.enable pkgs.colord-kde
-        ++ lib.optional config.services.hardware.bolt.enable pkgs.plasma5Packages.plasma-thunderbolt
-        ++ lib.optional config.services.samba.enable kdenetwork-filesharing
-        ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet
-        ++ lib.optional config.services.flatpak.enable flatpak-kcm;
-
-      # Extra services for D-Bus activation
-      services.dbus.packages = [
-        pkgs.plasma5Packages.kactivitymanagerd
-      ];
-
-      environment.pathsToLink = [
-        # FIXME: modules should link subdirs of `/share` rather than relying on this
-        "/share"
-      ];
-
-      environment.etc."X11/xkb".source = xcfg.xkb.dir;
-
-      environment.sessionVariables = {
-        PLASMA_USE_QT_SCALING = mkIf cfg.useQtScaling "1";
-
-        # Needed for things that depend on other store.kde.org packages to install correctly,
-        # notably Plasma look-and-feel packages (a.k.a. Global Themes)
-        #
-        # FIXME: this is annoyingly impure and should really be fixed at source level somehow,
-        # but kpackage is a library so we can't just wrap the one thing invoking it and be done.
-        # This also means things won't work for people not on Plasma, but at least this way it
-        # works for SOME people.
-        KPACKAGE_DEP_RESOLVERS_PATH = "${pkgs.plasma5Packages.frameworkintegration.out}/libexec/kf5/kpackagehandlers";
-      };
-
-      # Enable GTK applications to load SVG icons
-      programs.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
-
-      fonts.packages = with pkgs; [
-        cfg.notoPackage
-        hack-font
-      ];
-      fonts.fontconfig.defaultFonts = {
-        monospace = [
-          "Hack"
-          "Noto Sans Mono"
-        ];
-        sansSerif = [ "Noto Sans" ];
-        serif = [ "Noto Serif" ];
-      };
-
-      programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
-      programs.ssh.askPassword = mkDefault "${pkgs.plasma5Packages.ksshaskpass.out}/bin/ksshaskpass";
-
-      # Enable helpful DBus services.
-      services.accounts-daemon.enable = true;
-      programs.dconf.enable = true;
-      # when changing an account picture the accounts-daemon reads a temporary file containing the image which systemsettings5 may place under /tmp
-      systemd.services.accounts-daemon.serviceConfig.PrivateTmp = false;
-      services.power-profiles-daemon.enable = mkDefault true;
-      services.system-config-printer.enable = mkIf config.services.printing.enable (mkDefault true);
-      services.udisks2.enable = true;
-      services.upower.enable = config.powerManagement.enable;
-      services.libinput.enable = mkDefault true;
-
-      # Extra UDEV rules used by Solid
-      services.udev.packages = [
-        # libmtp has "bin", "dev", "out" outputs. UDEV rules file is in "out".
-        pkgs.libmtp.out
-        pkgs.media-player-info
-      ];
-
-      # Enable screen reader by default
-      services.orca.enable = mkDefault true;
-
-      services.displayManager.sddm = {
-        theme = mkDefault "breeze";
-      };
-
-      security.pam.services.kde = {
-        allowNullPassword = true;
-      };
-
-      security.pam.services.login.kwallet.enable = true;
-
-      systemd.user.services = {
-        plasma-early-setup = mkIf cfg.runUsingSystemd {
-          description = "Early Plasma setup";
-          wantedBy = [ "graphical-session-pre.target" ];
-          serviceConfig.Type = "oneshot";
-          script = activationScript;
-        };
-      };
-
-      xdg.icons.enable = true;
-
-      xdg.portal.enable = true;
-      xdg.portal.extraPortals = [ pkgs.plasma5Packages.xdg-desktop-portal-kde ];
-      xdg.portal.configPackages = mkDefault [ pkgs.plasma5Packages.xdg-desktop-portal-kde ];
-      # xdg-desktop-portal-kde expects PipeWire to be running.
-      services.pipewire.enable = mkDefault true;
-
-      # Update the start menu for each user that is currently logged in
-      system.userActivationScripts.plasmaSetup = activationScript;
-
-      programs.firefox.nativeMessagingHosts.packages = [
-        pkgs.plasma5Packages.plasma-browser-integration
-      ];
-      programs.chromium.enablePlasmaBrowserIntegration = true;
-    })
-
-    (mkIf (cfg.kwinrc != { }) {
-      environment.etc."xdg/kwinrc".text = lib.generators.toINI { } cfg.kwinrc;
-    })
-
-    (mkIf (cfg.kdeglobals != { }) {
-      environment.etc."xdg/kdeglobals".text = lib.generators.toINI { } cfg.kdeglobals;
-    })
-
-    # Plasma Desktop
-    (mkIf cfg.enable {
-
-      # Seed our configuration into nixos-generate-config
-      system.nixos-generate-config.desktopConfiguration = [
-        ''
-          # Enable the Plasma 5 Desktop Environment.
-          services.displayManager.sddm.enable = true;
-          services.xserver.desktopManager.plasma5.enable = true;
-        ''
-      ];
-
-      services.displayManager.sessionPackages = [ pkgs.plasma5Packages.plasma-workspace ];
-      # Default to be `plasma` (X11) instead of `plasmawayland`, since plasma wayland currently has
-      # many tiny bugs.
-      # See: https://github.com/NixOS/nixpkgs/issues/143272
-      services.displayManager.defaultSession = mkDefault "plasma";
-
-      environment.systemPackages =
-        with pkgs.plasma5Packages;
-        let
-          requiredPackages = [
-            ksystemstats
-            kinfocenter
-            kmenuedit
-            plasma-systemmonitor
-            spectacle
-            systemsettings
-
-            dolphin
-            dolphin-plugins
-            ffmpegthumbs
-            kdegraphics-thumbnailers
-            kde-inotify-survey
-            kio-admin
-            kio-extras
-          ];
-          optionalPackages = [
-            ark
-            elisa
-            gwenview
-            okular
-            khelpcenter
-            print-manager
-          ];
-        in
-        requiredPackages
-        ++ utils.removePackagesByName optionalPackages config.environment.plasma5.excludePackages;
-
-      systemd.user.services = {
-        plasma-run-with-systemd = {
-          description = "Run KDE Plasma via systemd";
-          wantedBy = [ "basic.target" ];
-          serviceConfig.Type = "oneshot";
-          script = ''
-            ${set_XDG_CONFIG_HOME}
-
-            ${pkgs.plasma5Packages.kconfig}/bin/kwriteconfig5 \
-              --file startkderc --group General --key systemdBoot ${lib.boolToString cfg.runUsingSystemd}
-          '';
-        };
-      };
-    })
-
-    # Plasma Mobile
-    (mkIf cfg.mobile.enable {
-      assertions = [
-        {
-          # The user interface breaks without NetworkManager
-          assertion = config.networking.networkmanager.enable;
-          message = "Plasma Mobile requires NetworkManager.";
-        }
-        {
-          # The user interface breaks without bluetooth
-          assertion = config.hardware.bluetooth.enable;
-          message = "Plasma Mobile requires Bluetooth.";
-        }
-        {
-          # The user interface breaks without pulse
-          assertion =
-            config.services.pulseaudio.enable
-            || (config.services.pipewire.enable && config.services.pipewire.pulse.enable);
-          message = "Plasma Mobile requires a Pulseaudio compatible sound server.";
-        }
-      ];
-
-      environment.systemPackages =
-        with pkgs.plasma5Packages;
-        [
-          # Basic packages without which Plasma Mobile fails to work properly.
-          plasma-mobile
-          plasma-nano
-          pkgs.maliit-framework
-          pkgs.maliit-keyboard
-        ]
-        ++ lib.optionals (cfg.mobile.installRecommendedSoftware) (
-          with pkgs.plasma5Packages.plasmaMobileGear;
-          [
-            # Additional software made for Plasma Mobile.
-            alligator
-            angelfish
-            audiotube
-            calindori
-            kalk
-            kasts
-            kclock
-            keysmith
-            koko
-            krecorder
-            ktrip
-            kweather
-            plasma-dialer
-            plasma-phonebook
-            plasma-settings
-            spacebar
-          ]
-        );
-
-      # The following services are needed or the UI is broken.
-      hardware.bluetooth.enable = true;
-      networking.networkmanager.enable = true;
-      # Required for autorotate
-      hardware.sensor.iio.enable = lib.mkDefault true;
-
-      # Recommendations can be found here:
-      #  - https://invent.kde.org/plasma-mobile/plasma-phone-settings/-/tree/master/etc/xdg
-      # This configuration is the minimum required for Plasma Mobile to *work*.
-      services.xserver.desktopManager.plasma5 = {
-        kdeglobals = {
-          KDE = {
-            # This forces a numeric PIN for the lockscreen, which is the
-            # recommendation from upstream.
-            LookAndFeelPackage = lib.mkDefault "org.kde.plasma.phone";
-          };
-        };
-        kwinrc = {
-          "Wayland" = {
-            "InputMethod[$e]" = "/run/current-system/sw/share/applications/com.github.maliit.keyboard.desktop";
-            "VirtualKeyboardEnabled" = "true";
-          };
-          "org.kde.kdecoration2" = {
-            # No decorations (title bar)
-            NoPlugin = lib.mkDefault "true";
-          };
-        };
-      };
-
-      services.displayManager.sessionPackages = [ pkgs.plasma5Packages.plasma-mobile ];
-    })
-
-    # Plasma Bigscreen
-    (mkIf cfg.bigscreen.enable {
-      environment.systemPackages = with pkgs.plasma5Packages; [
-        plasma-nano
-        plasma-settings
-        plasma-bigscreen
-        plasma-remotecontrollers
-
-        aura-browser
-        plank-player
-
-        plasma-pa
-        plasma-nm
-        kdeconnect-kde
-      ];
-
-      services.displayManager.sessionPackages = [ pkgs.plasma5Packages.plasma-bigscreen ];
-
-      # required for plasma-remotecontrollers to work correctly
-      hardware.uinput.enable = true;
-    })
-  ];
-}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index ef183c57b3ac..30972cc6c516 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1189,9 +1189,7 @@ in
   pinnwand = runTest ./pinnwand.nix;
   plantuml-server = runTest ./plantuml-server.nix;
   plasma-bigscreen = runTest ./plasma-bigscreen.nix;
-  plasma5 = runTest ./plasma5.nix;
   plasma6 = runTest ./plasma6.nix;
-  plasma5-systemd-start = runTest ./plasma5-systemd-start.nix;
   plausible = runTest ./plausible.nix;
   playwright-python = runTest ./playwright-python.nix;
   please = runTest ./please.nix;
diff --git a/nixos/tests/plasma-bigscreen.nix b/nixos/tests/plasma-bigscreen.nix
deleted file mode 100644
index b429117b3a44..000000000000
--- a/nixos/tests/plasma-bigscreen.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ pkgs, ... }:
-
-{
-  name = "plasma-bigscreen";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [
-      ttuegel
-      k900
-    ];
-  };
-
-  nodes.machine =
-    { ... }:
-
-    {
-      imports = [ ./common/user-account.nix ];
-      services.xserver.enable = true;
-      services.displayManager.sddm.enable = true;
-      services.displayManager.defaultSession = "plasma-bigscreen-x11";
-      services.xserver.desktopManager.plasma5.bigscreen.enable = true;
-      services.displayManager.autoLogin = {
-        enable = true;
-        user = "alice";
-      };
-
-      users.users.alice.extraGroups = [ "uinput" ];
-    };
-
-  testScript =
-    { nodes, ... }:
-    ''
-      with subtest("Wait for login"):
-          start_all()
-          machine.wait_for_file("/tmp/xauth_*")
-          machine.succeed("xauth merge /tmp/xauth_*")
-
-      with subtest("Check plasmashell started"):
-          machine.wait_until_succeeds("pgrep plasmashell")
-          machine.wait_for_window("Plasma Big Screen")
-    '';
-}
diff --git a/nixos/tests/plasma5-systemd-start.nix b/nixos/tests/plasma5-systemd-start.nix
deleted file mode 100644
index 6a62f356f839..000000000000
--- a/nixos/tests/plasma5-systemd-start.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ pkgs, ... }:
-
-{
-  name = "plasma5-systemd-start";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ oxalica ];
-  };
-
-  nodes.machine =
-    { ... }:
-
-    {
-      imports = [ ./common/user-account.nix ];
-      services.xserver = {
-        enable = true;
-        desktopManager.plasma5.enable = true;
-        desktopManager.plasma5.runUsingSystemd = true;
-      };
-
-      services.displayManager = {
-        sddm.enable = true;
-        defaultSession = "plasma";
-        autoLogin = {
-          enable = true;
-          user = "alice";
-        };
-      };
-    };
-
-  testScript =
-    { nodes, ... }:
-    ''
-      with subtest("Wait for login"):
-          start_all()
-          machine.wait_for_file("/tmp/xauth_*")
-          machine.succeed("xauth merge /tmp/xauth_*")
-
-      with subtest("Check plasmashell started"):
-          machine.wait_until_succeeds("pgrep plasmashell")
-          machine.wait_for_window("^Desktop ")
-
-      status, result = machine.systemctl('--no-pager show plasma-plasmashell.service', user='alice')
-      assert status == 0, 'Service not found'
-      assert 'ActiveState=active' in result.split('\n'), 'Systemd service not active'
-    '';
-}
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
deleted file mode 100644
index 7fe677feae92..000000000000
--- a/nixos/tests/plasma5.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ pkgs, ... }:
-
-{
-  name = "plasma5";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ ttuegel ];
-  };
-
-  nodes.machine =
-    { ... }:
-
-    {
-      imports = [ ./common/user-account.nix ];
-      services.xserver.enable = true;
-      services.displayManager.sddm.enable = true;
-      services.displayManager.defaultSession = "plasma";
-      services.xserver.desktopManager.plasma5.enable = true;
-      environment.plasma5.excludePackages = [ pkgs.plasma5Packages.elisa ];
-      services.displayManager.autoLogin = {
-        enable = true;
-        user = "alice";
-      };
-    };
-
-  testScript =
-    { nodes, ... }:
-    let
-      user = nodes.machine.users.users.alice;
-      xdo = "${pkgs.xdotool}/bin/xdotool";
-    in
-    ''
-      with subtest("Wait for login"):
-          start_all()
-          machine.wait_for_file("/tmp/xauth_*")
-          machine.succeed("xauth merge /tmp/xauth_*")
-
-      with subtest("Check plasmashell started"):
-          machine.wait_until_succeeds("pgrep plasmashell")
-          machine.wait_for_window("^Desktop ")
-
-      with subtest("Check that KDED is running"):
-          machine.succeed("pgrep kded5")
-
-      with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
-
-      with subtest("Ensure Elisa is not installed"):
-          machine.fail("which elisa")
-
-      machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'")
-
-      with subtest("Run Dolphin"):
-          machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 dolphin >&2 &'")
-          machine.wait_for_window(" Dolphin")
-
-      with subtest("Run Konsole"):
-          machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 konsole >&2 &'")
-          machine.wait_for_window("Konsole")
-
-      with subtest("Run systemsettings"):
-          machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 systemsettings5 >&2 &'")
-          machine.wait_for_window("Settings")
-
-      with subtest("Wait to get a screenshot"):
-          machine.execute(
-              "${xdo} key Alt+F1 sleep 10"
-          )
-          machine.screenshot("screen")
-    '';
-}

From 314fe5f12f46e864ed9e41471680d8dba0c77acd Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:36:52 +0300
Subject: [PATCH 2510/3724] nixos: remove Deepin

---
 nixos/modules/module-list.nix                 |   4 -
 nixos/modules/rename.nix                      |  10 +
 .../services/desktops/deepin/app-services.nix |  46 ----
 .../services/desktops/deepin/dde-api.nix      |  51 ----
 .../services/desktops/deepin/dde-daemon.nix   |  41 ---
 .../desktops/deepin/deepin-anything.nix       |  43 ----
 .../services/x11/desktop-managers/deepin.nix  | 233 ------------------
 .../services/x11/desktop-managers/default.nix |   1 -
 nixos/release.nix                             |   9 -
 nixos/tests/all-tests.nix                     |   1 -
 nixos/tests/deepin.nix                        |  55 -----
 nixos/tests/terminal-emulators.nix            |   2 -
 .../src/config/modules/packagechooser.conf    |   8 -
 .../src/modules/nixos/main.py                 |  11 -
 14 files changed, 10 insertions(+), 505 deletions(-)
 delete mode 100644 nixos/modules/services/desktops/deepin/app-services.nix
 delete mode 100644 nixos/modules/services/desktops/deepin/dde-api.nix
 delete mode 100644 nixos/modules/services/desktops/deepin/dde-daemon.nix
 delete mode 100644 nixos/modules/services/desktops/deepin/deepin-anything.nix
 delete mode 100644 nixos/modules/services/x11/desktop-managers/deepin.nix
 delete mode 100644 nixos/tests/deepin.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8713082efb4c..9415089e180e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -543,10 +543,6 @@
   ./services/desktops/blueman.nix
   ./services/desktops/bonsaid.nix
   ./services/desktops/cpupower-gui.nix
-  ./services/desktops/deepin/app-services.nix
-  ./services/desktops/deepin/dde-api.nix
-  ./services/desktops/deepin/dde-daemon.nix
-  ./services/desktops/deepin/deepin-anything.nix
   ./services/desktops/dleyna.nix
   ./services/desktops/espanso.nix
   ./services/desktops/flatpak.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 4934df421eeb..d2c016861133 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -127,6 +127,10 @@ in
       "services"
       "dd-agent"
     ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.")
+    (mkRemovedOptionModule [
+      "services"
+      "deepin"
+    ] "the Deepin desktop environment has been removed from nixpkgs due to lack of maintenance.")
     (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
     (mkRemovedOptionModule [ "services" "dnscrypt-wrapper" ] ''
       The dnscrypt-wrapper module was removed since the project has been effectively unmaintained since 2018;
@@ -271,6 +275,12 @@ in
       "desktopManager"
       "plasma5"
     ] "the Plasma 5 desktop environment has been removed from nixpkgs, as it has reached EOL upstream.")
+    (mkRemovedOptionModule [
+      "services"
+      "xserver"
+      "desktopManager"
+      "deepin"
+    ] "the Deepin desktop environment has been removed from nixpkgs due to lack of maintenance.")
     (mkRemovedOptionModule [ "services" "xserver" "multitouch" ] ''
       services.xserver.multitouch (which uses xf86_input_mtrack) has been removed
       as the underlying package isn't being maintained. Working alternatives are
diff --git a/nixos/modules/services/desktops/deepin/app-services.nix b/nixos/modules/services/desktops/deepin/app-services.nix
deleted file mode 100644
index 270889b66f92..000000000000
--- a/nixos/modules/services/desktops/deepin/app-services.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  meta = {
-    maintainers = lib.teams.deepin.members;
-  };
-
-  ###### interface
-
-  options = {
-
-    services.deepin.app-services = {
-
-      enable = lib.mkEnableOption "service collection of DDE applications, including dconfig-center";
-
-    };
-
-  };
-
-  ###### implementation
-
-  config = lib.mkIf config.services.deepin.app-services.enable {
-
-    users.groups.dde-dconfig-daemon = { };
-    users.users.dde-dconfig-daemon = {
-      description = "Dconfig daemon user";
-      home = "/var/lib/dde-dconfig-daemon";
-      createHome = true;
-      group = "dde-dconfig-daemon";
-      isSystemUser = true;
-    };
-
-    environment.systemPackages = [ pkgs.deepin.dde-app-services ];
-    systemd.packages = [ pkgs.deepin.dde-app-services ];
-    services.dbus.packages = [ pkgs.deepin.dde-app-services ];
-
-    environment.pathsToLink = [ "/share/dsg" ];
-
-  };
-
-}
diff --git a/nixos/modules/services/desktops/deepin/dde-api.nix b/nixos/modules/services/desktops/deepin/dde-api.nix
deleted file mode 100644
index 9994c4359e9a..000000000000
--- a/nixos/modules/services/desktops/deepin/dde-api.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  meta = {
-    maintainers = lib.teams.deepin.members;
-  };
-
-  ###### interface
-
-  options = {
-
-    services.deepin.dde-api = {
-
-      enable = lib.mkEnableOption ''
-        the DDE API, which provides some dbus interfaces that is used for screen zone detecting,
-        thumbnail generating, and sound playing in Deepin Desktop Environment
-      '';
-
-    };
-
-  };
-
-  ###### implementation
-
-  config = lib.mkIf config.services.deepin.dde-api.enable {
-
-    environment.systemPackages = [ pkgs.deepin.dde-api ];
-
-    services.dbus.packages = [ pkgs.deepin.dde-api ];
-
-    systemd.packages = [ pkgs.deepin.dde-api ];
-
-    environment.pathsToLink = [ "/lib/deepin-api" ];
-
-    users.groups.deepin-sound-player = { };
-    users.users.deepin-sound-player = {
-      description = "Deepin sound player";
-      home = "/var/lib/deepin-sound-player";
-      createHome = true;
-      group = "deepin-sound-player";
-      isSystemUser = true;
-    };
-
-  };
-
-}
diff --git a/nixos/modules/services/desktops/deepin/dde-daemon.nix b/nixos/modules/services/desktops/deepin/dde-daemon.nix
deleted file mode 100644
index 809b2a3fec6d..000000000000
--- a/nixos/modules/services/desktops/deepin/dde-daemon.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  meta = {
-    maintainers = lib.teams.deepin.members;
-  };
-
-  ###### interface
-
-  options = {
-
-    services.deepin.dde-daemon = {
-
-      enable = lib.mkEnableOption "daemon for handling the deepin session settings";
-
-    };
-
-  };
-
-  ###### implementation
-
-  config = lib.mkIf config.services.deepin.dde-daemon.enable {
-
-    environment.systemPackages = [ pkgs.deepin.dde-daemon ];
-
-    services.dbus.packages = [ pkgs.deepin.dde-daemon ];
-
-    services.udev.packages = [ pkgs.deepin.dde-daemon ];
-
-    systemd.packages = [ pkgs.deepin.dde-daemon ];
-
-    environment.pathsToLink = [ "/lib/deepin-daemon" ];
-
-  };
-
-}
diff --git a/nixos/modules/services/desktops/deepin/deepin-anything.nix b/nixos/modules/services/desktops/deepin/deepin-anything.nix
deleted file mode 100644
index 9b69e6442edb..000000000000
--- a/nixos/modules/services/desktops/deepin/deepin-anything.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-{
-
-  meta = {
-    maintainers = lib.teams.deepin.members;
-  };
-
-  options = {
-
-    services.deepin.deepin-anything = {
-
-      enable = lib.mkEnableOption "deepin anything file search tool";
-
-    };
-
-  };
-
-  config = lib.mkIf config.services.deepin.dde-api.enable {
-    environment.systemPackages = [ pkgs.deepin.deepin-anything ];
-
-    services.dbus.packages = [ pkgs.deepin.deepin-anything ];
-
-    users.groups.deepin-anything = { };
-
-    users.users.deepin-anything = {
-      description = "Deepin Anything Server";
-      home = "/var/lib/deepin-anything";
-      createHome = true;
-      group = "deepin-anything";
-      isSystemUser = true;
-    };
-
-    boot.extraModulePackages = [ config.boot.kernelPackages.deepin-anything-module ];
-    boot.kernelModules = [ "vfs_monitor" ];
-  };
-
-}
diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix
deleted file mode 100644
index 2735ef19aa77..000000000000
--- a/nixos/modules/services/x11/desktop-managers/deepin.nix
+++ /dev/null
@@ -1,233 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  utils,
-  ...
-}:
-
-with lib;
-
-let
-  xcfg = config.services.xserver;
-  cfg = xcfg.desktopManager.deepin;
-
-  nixos-gsettings-overrides = pkgs.deepin.dde-gsettings-schemas.override {
-    extraGSettingsOverridePackages = cfg.extraGSettingsOverridePackages;
-    extraGSettingsOverrides = cfg.extraGSettingsOverrides;
-  };
-in
-{
-  options = {
-
-    services.xserver.desktopManager.deepin = {
-      enable = mkEnableOption "Deepin desktop manager";
-      extraGSettingsOverrides = mkOption {
-        default = "";
-        type = types.lines;
-        description = "Additional gsettings overrides.";
-      };
-      extraGSettingsOverridePackages = mkOption {
-        default = [ ];
-        type = types.listOf types.path;
-        description = "List of packages for which gsettings are overridden.";
-      };
-    };
-
-    environment.deepin.excludePackages = mkOption {
-      default = [ ];
-      type = types.listOf types.package;
-      description = "List of default packages to exclude from the configuration";
-    };
-
-  };
-
-  config = mkIf cfg.enable {
-    services.displayManager.sessionPackages = [ pkgs.deepin.dde-session ];
-    services.displayManager.defaultSession = mkDefault "dde-x11";
-
-    # Update the DBus activation environment after launching the desktop manager.
-    services.xserver.displayManager.sessionCommands = ''
-      ${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd --all
-    '';
-
-    hardware.bluetooth.enable = mkDefault true;
-    security.polkit.enable = true;
-
-    services.deepin.dde-daemon.enable = mkForce true;
-    services.deepin.dde-api.enable = mkForce true;
-    services.deepin.app-services.enable = mkForce true;
-
-    services.colord.enable = mkDefault true;
-    services.accounts-daemon.enable = mkDefault true;
-    services.gvfs.enable = mkDefault true;
-    services.gnome.glib-networking.enable = mkDefault true;
-    services.gnome.gnome-keyring.enable = mkDefault true;
-    services.gnome.gcr-ssh-agent.enable = mkDefault true;
-    services.bamf.enable = mkDefault true;
-
-    services.libinput.enable = mkDefault true;
-    services.udisks2.enable = true;
-    services.upower.enable = mkDefault config.powerManagement.enable;
-    networking.networkmanager.enable = mkDefault true;
-    programs.dconf.enable = mkDefault true;
-    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
-
-    fonts.packages = with pkgs; [ noto-fonts ];
-    xdg.mime.enable = true;
-    xdg.menus.enable = true;
-    xdg.icons.enable = true;
-    xdg.portal.enable = mkDefault true;
-    xdg.portal.extraPortals = mkDefault [
-      pkgs.xdg-desktop-portal-gtk
-    ];
-
-    # https://github.com/NixOS/nixpkgs/pull/247766#issuecomment-1722839259
-    xdg.portal.config.deepin.default = mkDefault [ "gtk" ];
-
-    environment.sessionVariables = {
-      NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
-      DDE_POLKIT_AGENT_PLUGINS_DIRS = [ "${pkgs.deepin.dpa-ext-gnomekeyring}/lib/polkit-1-dde/plugins" ];
-    };
-
-    environment.pathsToLink = [
-      "/lib/dde-dock/plugins"
-      "/lib/dde-control-center"
-      "/lib/dde-session-shell"
-      "/lib/dde-file-manager"
-      "/share/backgrounds"
-      "/share/wallpapers"
-      "/share/dde-daemon"
-      "/share/dsg"
-      "/share/deepin-themes"
-      "/share/deepin"
-      "/share/dde-shell"
-    ];
-
-    environment.etc = {
-      "deepin-installer.conf".text = ''
-        system_info_vendor_name="Copyright (c) 2003-2024 NixOS contributors"
-      '';
-    };
-
-    systemd.tmpfiles.rules = [
-      "d /var/lib/AccountsService 0775 root root - -"
-      "C /var/lib/AccountsService/icons 0775 root root - ${pkgs.deepin.dde-account-faces}/var/lib/AccountsService/icons"
-    ];
-
-    security.pam.services.dde-lock.text = ''
-      # original at {dde-session-shell}/etc/pam.d/dde-lock
-      auth      substack      login
-      account   include       login
-      password  substack      login
-      session   include       login
-    '';
-
-    environment.systemPackages =
-      with pkgs;
-      with deepin;
-      let
-        requiredPackages = [
-          pciutils # for dtkcore/startdde
-          xdotool # for dde-daemon
-          glib # for gsettings program / gdbus
-          gtk3 # for gtk-launch program
-          xdg-user-dirs # Update user dirs
-          util-linux # runuser
-          polkit_gnome
-          librsvg # dde-api use rsvg-convert
-          lshw # for dtkcore
-          libsForQt5.kde-gtk-config # deepin-api/gtk-thumbnailer need
-          libsForQt5.kglobalaccel
-          xsettingsd # lightdm-deepin-greeter
-          dtkcommon
-          dtkcore
-          dtkgui
-          dtkwidget
-          dtkdeclarative
-          qt5platform-plugins
-          qt6platform-plugins
-          qt5integration
-          qt6integration
-          deepin-pw-check
-
-          dde-account-faces
-          deepin-icon-theme
-          deepin-desktop-theme
-          deepin-sound-theme
-          deepin-gtk-theme
-          deepin-wallpapers
-          deepin-desktop-base
-
-          startdde
-          dde-shell
-          dde-launchpad
-          dde-session-ui
-          dde-session-shell
-          dde-file-manager
-          dde-control-center
-          dde-network-core
-          dde-clipboard
-          dde-polkit-agent
-          dpa-ext-gnomekeyring
-          deepin-desktop-schemas
-          deepin-kwin
-          dde-session
-          dde-widgets
-          dde-appearance
-          dde-application-manager
-          deepin-service-manager
-          dde-api-proxy
-          dde-tray-loader
-        ];
-        optionalPackages = [
-          dde-calendar
-          dde-grand-search
-          deepin-terminal
-          onboard # dde-dock plugin
-          deepin-calculator
-          deepin-compressor
-          deepin-editor
-          deepin-system-monitor
-          deepin-shortcut-viewer
-        ];
-      in
-      requiredPackages
-      ++ utils.removePackagesByName optionalPackages config.environment.deepin.excludePackages;
-
-    services.dbus.packages = with pkgs.deepin; [
-      dde-shell
-      dde-launchpad
-      dde-session-ui
-      dde-session-shell
-      dde-file-manager
-      dde-control-center
-      dde-calendar
-      dde-clipboard
-      deepin-kwin
-      deepin-pw-check
-      dde-widgets
-      dde-session
-      dde-appearance
-      dde-application-manager
-      deepin-service-manager
-      dde-grand-search
-      dde-api-proxy
-    ];
-
-    systemd.packages = with pkgs.deepin; [
-      dde-shell
-      dde-launchpad
-      dde-file-manager
-      dde-calendar
-      dde-clipboard
-      deepin-kwin
-      dde-appearance
-      dde-widgets
-      dde-session
-      dde-application-manager
-      deepin-service-manager
-      dde-api-proxy
-    ];
-  };
-}
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 6219d11fda05..25fc53285aa7 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -38,7 +38,6 @@ in
     ./cde.nix
     ./cinnamon.nix
     ./budgie.nix
-    ./deepin.nix
     ../../desktop-managers/lomiri.nix
     ../../desktop-managers/cosmic.nix
     ../../desktop-managers/gnome.nix
diff --git a/nixos/release.nix b/nixos/release.nix
index 1000bf9c6bc7..207d76704b5e 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -623,15 +623,6 @@ rec {
       }
     );
 
-    deepin = makeClosure (
-      { ... }:
-      {
-        services.xserver.enable = true;
-        services.xserver.displayManager.lightdm.enable = true;
-        services.xserver.desktopManager.deepin.enable = true;
-      }
-    );
-
     # Linux/Apache/PostgreSQL/PHP stack.
     lapp = makeClosure (
       { pkgs, ... }:
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 30972cc6c516..9631036f035c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -423,7 +423,6 @@ in
   dconf = runTest ./dconf.nix;
   ddns-updater = runTest ./ddns-updater.nix;
   deconz = runTest ./deconz.nix;
-  deepin = runTest ./deepin.nix;
   deluge = runTest ./deluge.nix;
   dendrite = runTest ./matrix/dendrite.nix;
   dependency-track = runTest ./dependency-track.nix;
diff --git a/nixos/tests/deepin.nix b/nixos/tests/deepin.nix
deleted file mode 100644
index 677e58942079..000000000000
--- a/nixos/tests/deepin.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  name = "deepin";
-
-  meta.maintainers = lib.teams.deepin.members;
-
-  nodes.machine =
-    { ... }:
-    {
-      imports = [
-        ./common/user-account.nix
-      ];
-
-      virtualisation.memorySize = 2048;
-
-      services.xserver.enable = true;
-
-      services.xserver.displayManager = {
-        lightdm.enable = true;
-        autoLogin = {
-          enable = true;
-          user = "alice";
-        };
-      };
-
-      services.xserver.desktopManager.deepin.enable = true;
-    };
-
-  testScript =
-    { nodes, ... }:
-    let
-      user = nodes.machine.users.users.alice;
-    in
-    ''
-      with subtest("Wait for login"):
-          machine.wait_for_x()
-          machine.wait_for_file("${user.home}/.Xauthority")
-          machine.succeed("xauth merge ${user.home}/.Xauthority")
-
-      with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
-
-      with subtest("Check if Deepin session components actually start"):
-          machine.wait_until_succeeds("pgrep -f dde-session-daemon")
-          machine.wait_for_window("dde-session-daemon")
-          machine.wait_until_succeeds("pgrep -f dde-desktop")
-          machine.wait_for_window("dde-desktop")
-
-      with subtest("Open deepin-terminal"):
-          machine.succeed("su - ${user.name} -c 'DISPLAY=:0 deepin-terminal >&2 &'")
-          machine.wait_for_window("deepin-terminal")
-          machine.sleep(20)
-          machine.screenshot("screen")
-    '';
-}
diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix
index dfa5d9150ba5..fa8ab05fd5ea 100644
--- a/nixos/tests/terminal-emulators.nix
+++ b/nixos/tests/terminal-emulators.nix
@@ -36,8 +36,6 @@ let
 
     darktile.pkg = p: p.darktile;
 
-    deepin-terminal.pkg = p: p.deepin.deepin-terminal;
-
     eterm.pkg = p: p.eterm;
     eterm.executable = "Eterm";
     eterm.pinkValue = "#D40055";
diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/src/config/modules/packagechooser.conf b/pkgs/by-name/ca/calamares-nixos-extensions/src/config/modules/packagechooser.conf
index de647152fb83..362084beda17 100644
--- a/pkgs/by-name/ca/calamares-nixos-extensions/src/config/modules/packagechooser.conf
+++ b/pkgs/by-name/ca/calamares-nixos-extensions/src/config/modules/packagechooser.conf
@@ -90,14 +90,6 @@ items:
                     Learn more at <a href=\"https://docs.buddiesofbudgie.org/\">buddiesofbudgie.org</a></html>"
       screenshot: "images/budgie.jpg"
 
-    - id: deepin
-      packages: [ deepin ]
-      name: Deepin
-      description: "<html>The Deepin Desktop Environment is an elegant, easy to use and reliable desktop environment.<br/>
-                    <br/>
-                    Learn more at <a href=\"https://www.deepin.org/\">deepin.org</a></html>"
-      screenshot: "images/deepin.jpg"
-
     - id: ""
       packages: []
       name: "No desktop"
diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py b/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py
index 017fb01b737d..d947fdf296b8 100644
--- a/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py
+++ b/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py
@@ -201,15 +201,6 @@ cfgbudgie = """  # Enable the X11 windowing system.
 
 """
 
-cfgdeepin = """  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the Deepin Desktop Environment.
-  services.xserver.displayManager.lightdm.enable = true;
-  services.xserver.desktopManager.deepin.enable = true;
-
-"""
-
 cfgkeymap = """  # Configure keymap in X11
   services.xserver.xkb = {
     layout = "@@kblayout@@";
@@ -589,8 +580,6 @@ def run():
         cfg += cfglumina
     elif gs.value("packagechooser_packagechooser") == "budgie":
         cfg += cfgbudgie
-    elif gs.value("packagechooser_packagechooser") == "deepin":
-        cfg += cfgdeepin
 
     if (
         gs.value("keyboardLayout") is not None

From 66dc5c81d4e5f7b81b388bf2e71eb2d9024a9641 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2511/3724] kgeotag: switch to Qt6

---
 pkgs/by-name/kg/kgeotag/package.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/kg/kgeotag/package.nix b/pkgs/by-name/kg/kgeotag/package.nix
index ab6174f8dd43..9e29ba873586 100644
--- a/pkgs/by-name/kg/kgeotag/package.nix
+++ b/pkgs/by-name/kg/kgeotag/package.nix
@@ -1,33 +1,34 @@
 {
   stdenv,
   cmake,
-  extra-cmake-modules,
   fetchFromGitLab,
   lib,
-  libsForQt5,
+  kdePackages,
+  qt6,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "kgeotag";
-  version = "1.7.0";
+  version = "1.8.0-unstable-2025-07-25";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     repo = "kgeotag";
     owner = "graphics";
-    rev = "v${version}";
-    hash = "sha256-/NYAR/18Dh+fphCBz/zFWj/xqEl28e77ZtV8LlcGyMI=";
+    rev = "b2b140e8f72ab37bad3729bea527203324d12131";
+    hash = "sha256-jUcKm4IPQt2JiZUmIjMJ9EG0kDjzoPGjzBPMHZ6j9lM=";
   };
 
   nativeBuildInputs = [
     cmake
-    extra-cmake-modules
-    libsForQt5.wrapQtAppsHook
+    kdePackages.extra-cmake-modules
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    libsForQt5.libkexiv2
-    libsForQt5.marble
+    kdePackages.libkexiv2
+    kdePackages.marble
+    qt6.qtwebengine
   ];
 
   meta = with lib; {

From bf4dc80af9bf6cfcf07fa91b9efdb72a7c588938 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2512/3724] kio-extras-kf5: disable libkexiv2

It will be dropped.
---
 pkgs/kde/misc/kio-extras-kf5/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/kde/misc/kio-extras-kf5/default.nix b/pkgs/kde/misc/kio-extras-kf5/default.nix
index 886ae1a62777..623eb89a127b 100644
--- a/pkgs/kde/misc/kio-extras-kf5/default.nix
+++ b/pkgs/kde/misc/kio-extras-kf5/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     kguiaddons
     ki18n
     kio
-    libkexiv2
+    # libkexiv2
     phonon
     solid
     syntax-highlighting

From 77e544e57a46073113eec7bd372fa5aa5440bd9d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2513/3724] kmymoney, alkimia: switch to Qt6

---
 pkgs/applications/office/kmymoney/default.nix | 29 +++++++------------
 .../development/libraries/alkimia/default.nix | 12 +++++---
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/qt5-packages.nix               |  1 -
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index f21c568c210c..fd5269818a53 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -2,10 +2,13 @@
   stdenv,
   lib,
   fetchurl,
+
+  cmake,
   doxygen,
   extra-cmake-modules,
   graphviz,
   kdoctools,
+  pkg-config,
   wrapQtAppsHook,
   autoPatchelfHook,
 
@@ -14,7 +17,6 @@
   aqbanking,
   gmp,
   gwenhywfar,
-  kactivities,
   karchive,
   kcmutils,
   kcontacts,
@@ -25,6 +27,7 @@
   kitemmodels,
   libical,
   libofx,
+  plasma-activities,
   qgpgme,
 
   sqlcipher,
@@ -37,27 +40,24 @@
 
 stdenv.mkDerivation rec {
   pname = "kmymoney";
-  version = "5.1.3";
+  version = "5.2.1";
 
   src = fetchurl {
-    url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz";
-    sha256 = "sha256-OTi4B4tzkboy4Su0I5di+uE0aDoMLsGnUQXDAso+Xj8=";
+    url = "mirror://kde/stable/kmymoney/${version}/${pname}-${version}.tar.xz";
+    hash = "sha256-/q30C21MkNd+MnFqhY3SN2kIGGMQTYzqYpELHsPkM2s=";
   };
 
   cmakeFlags = [
-    # Remove this when upgrading to a KMyMoney release that includes
-    # https://invent.kde.org/office/kmymoney/-/merge_requests/118
-    "-DENABLE_WEBENGINE=ON"
+    "-DBUILD_WITH_QT6=1"
   ];
 
-  # Hidden dependency that wasn't included in CMakeLists.txt:
-  env.NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5";
-
   nativeBuildInputs = [
+    cmake
     doxygen
     extra-cmake-modules
     graphviz
     kdoctools
+    pkg-config
     python3.pkgs.wrapPython
     wrapQtAppsHook
     autoPatchelfHook
@@ -69,7 +69,6 @@ stdenv.mkDerivation rec {
     aqbanking
     gmp
     gwenhywfar
-    kactivities
     karchive
     kcmutils
     kcontacts
@@ -80,6 +79,7 @@ stdenv.mkDerivation rec {
     kitemmodels
     libical
     libofx
+    plasma-activities
     qgpgme
     sqlcipher
 
@@ -99,13 +99,6 @@ stdenv.mkDerivation rec {
       "kmymoney/plugins/woob/interface/kmymoneywoob.py"
   '';
 
-  doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
-  nativeInstallCheckInputs = [ xvfb-run ];
-  installCheckPhase = lib.optionalString doInstallCheck ''
-    xvfb-run -s '-screen 0 1024x768x24' make test \
-      ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now.
-  '';
-
   # libpython is required by the python interpreter embedded in kmymoney, so we
   # need to explicitly tell autoPatchelf about it.
   postFixup = ''
diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix
index a0284ca378fc..abcca04ee5ce 100644
--- a/pkgs/development/libraries/alkimia/default.nix
+++ b/pkgs/development/libraries/alkimia/default.nix
@@ -2,14 +2,14 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  cmake,
   extra-cmake-modules,
   doxygen,
   graphviz,
   qtbase,
   qtwebengine,
   mpir,
-  kdelibs4support,
-  plasma-framework,
+  libplasma,
   knewstuff,
   kpackage,
   wrapQtAppsHook,
@@ -27,7 +27,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-v5DfnnzOMsoCXr074ydXxBIrSsnbex6G/OqF6psTvPs=";
   };
 
+  cmakeFlags = [
+    "-DBUILD_WITH_QT6=1"
+  ];
+
   nativeBuildInputs = [
+    cmake
     extra-cmake-modules
     doxygen
     graphviz
@@ -40,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     qtbase
     qtwebengine
-    kdelibs4support
-    plasma-framework
+    libplasma
     knewstuff
     kpackage
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6712de68e5c1..c716092f7629 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12408,7 +12408,8 @@ with pkgs;
 
   kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
 
-  kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { };
+  alkimia = kdePackages.callPackage ../development/libraries/alkimia { };
+  kmymoney = kdePackages.callPackage ../applications/office/kmymoney { };
 
   kotatogram-desktop =
     callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 2453bc438f00..83054318af0c 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -118,7 +118,6 @@ makeScopeWithSplicing' {
 
         accounts-qt = callPackage ../development/libraries/accounts-qt { };
 
-        alkimia = callPackage ../development/libraries/alkimia { };
 
         applet-window-appmenu = callPackage ../development/libraries/applet-window-appmenu { };
 

From 4c82b088d2b049e279ccbc48a356a72d9b12bb06 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2514/3724] krita: disable libkdcraw

Will be removed as part of Gear 5, we should build the Gear 6
version for Qt5 instead if people want to edit RAW images in Krita.
---
 pkgs/by-name/kr/krita/generic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/kr/krita/generic.nix b/pkgs/by-name/kr/krita/generic.nix
index 0d2ff279db41..cb34f8c16d24 100644
--- a/pkgs/by-name/kr/krita/generic.nix
+++ b/pkgs/by-name/kr/krita/generic.nix
@@ -27,7 +27,7 @@
   fribidi,
   libaom,
   libheif,
-  libkdcraw,
+  #libkdcraw,
   lcms2,
   gsl,
   openexr,
@@ -109,7 +109,7 @@ mkDerivation rec {
     lager
     libaom
     libheif
-    libkdcraw
+    #libkdcraw
     giflib
     libjxl
     mlt

From bfc8e3c99a9731289429cc12823fa0497816d259 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2515/3724] labplot: disable Cantor

This uses the old Qt5 version which will be deleted soon.
---
 pkgs/applications/science/math/labplot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/labplot/default.nix b/pkgs/applications/science/math/labplot/default.nix
index a998b1c26016..1866c4eeb78f 100644
--- a/pkgs/applications/science/math/labplot/default.nix
+++ b/pkgs/applications/science/math/labplot/default.nix
@@ -33,7 +33,7 @@
   netcdf,
   cfitsio,
   libcerf,
-  cantor,
+  # cantor,
   zlib,
   lz4,
   readstat,
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
     netcdf
     cfitsio
     libcerf
-    cantor
+    # cantor
     zlib
     lz4
     readstat

From aef268e8931ed196418588b99a53f9f8ebf5044c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2516/3724] libsForQt5.purpose: remove kaccounts-integration
 dependency

About to be dropped, not very useful.
---
 pkgs/development/libraries/kde-frameworks/purpose.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix
index da2990bff7a4..41de202c3eed 100644
--- a/pkgs/development/libraries/kde-frameworks/purpose.nix
+++ b/pkgs/development/libraries/kde-frameworks/purpose.nix
@@ -5,7 +5,6 @@
   qtbase,
   accounts-qt,
   qtdeclarative,
-  kaccounts-integration,
   kconfig,
   kcoreaddons,
   ki18n,
@@ -24,7 +23,6 @@ mkDerivation {
     qtbase
     accounts-qt
     qtdeclarative
-    kaccounts-integration
     kconfig
     kcoreaddons
     ki18n

From 5b6c0c02ef247af9d30d6d169eb04218b1579b46 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2517/3724] nordic: use Qt6 packages for SDDM theme

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

diff --git a/pkgs/by-name/no/nordic/package.nix b/pkgs/by-name/no/nordic/package.nix
index 0a4bd6ae1626..d27f7ff1a7e1 100644
--- a/pkgs/by-name/no/nordic/package.nix
+++ b/pkgs/by-name/no/nordic/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   gtk-engine-murrine,
   jdupes,
-  libsForQt5,
+  kdePackages,
 }:
 
 stdenvNoCC.mkDerivation rec {
@@ -154,7 +154,7 @@ stdenvNoCC.mkDerivation rec {
 
     mkdir -p $sddm/nix-support
 
-    printWords ${libsForQt5.breeze-icons} ${libsForQt5.plasma-framework} ${libsForQt5.plasma-workspace} \
+    printWords ${kdePackages.breeze-icons} ${kdePackages.libplasma} ${kdePackages.plasma-workspace} \
       >> $sddm/nix-support/propagated-user-env-packages
   '';
 

From 80bbc0fe04b8fa709c9159c93a5f85c58eda6c93 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2518/3724] sddm: allow building without layer-shell-qt

We're about to not have it on Qt5.
---
 pkgs/applications/display-managers/sddm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 23ba6006d737..902d0e38d62a 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -2,7 +2,7 @@
   lib,
   callPackage,
   runCommand,
-  layer-shell-qt,
+  layer-shell-qt ? null,
   qtwayland,
   wrapQtAppsHook,
   unwrapped ? callPackage ./unwrapped.nix { },

From 8d9a708f89189a73f7c3f194df03badb76251a34 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2519/3724] tellico: switch to Qt6

---
 pkgs/applications/misc/tellico/default.nix | 3 ---
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix
index 3c16eccbde7c..04f77acb293b 100644
--- a/pkgs/applications/misc/tellico/default.nix
+++ b/pkgs/applications/misc/tellico/default.nix
@@ -2,14 +2,12 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  mkDerivation,
   cmake,
   exempi,
   extra-cmake-modules,
   karchive,
   kdoctools,
   kfilemetadata,
-  khtml,
   kitemmodels,
   knewstuff,
   kxmlgui,
@@ -49,7 +47,6 @@ stdenv.mkDerivation rec {
     exempi
     karchive
     kfilemetadata
-    khtml
     kitemmodels
     knewstuff
     kxmlgui
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c716092f7629..2ee3e6f0b9e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15689,7 +15689,7 @@ with pkgs;
     hasktags = haskellPackages.hasktags;
   };
 
-  tellico = libsForQt5.callPackage ../applications/misc/tellico { };
+  tellico = kdePackages.callPackage ../applications/misc/tellico { };
 
   termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py { };
 

From 5dc2dbdcb31f0eda259c884c3328783710da3fa9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2520/3724] ludusavi: use Qt6 kdialog

Qt5 is about to be dropped.
---
 pkgs/by-name/lu/ludusavi/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix
index 137b8bfe2d18..acc6dc154f3e 100644
--- a/pkgs/by-name/lu/ludusavi/package.nix
+++ b/pkgs/by-name/lu/ludusavi/package.nix
@@ -20,7 +20,7 @@
   vulkan-loader,
   wayland,
   zenity,
-  libsForQt5,
+  kdePackages,
   cairo,
   pango,
   atkmm,
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
         lib.makeBinPath [
           rclone
           zenity
-          libsForQt5.kdialog
+          kdePackages.kdialog
         ]
       } \
         "''${gappsWrapperArgs[@]}"

From 6dd718b8ceea99e16617f5aa223e368d602fb246 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2521/3724] plasticity: remove unused dependency

Will be dropped with Qt5.
---
 pkgs/by-name/pl/plasticity/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix
index d04a9b4f264f..d0dacbdb3e4f 100644
--- a/pkgs/by-name/pl/plasticity/package.nix
+++ b/pkgs/by-name/pl/plasticity/package.nix
@@ -16,7 +16,6 @@
   libdrm,
   libglvnd,
   libnotify,
-  libsForQt5,
   libxkbcommon,
   libgbm,
   nspr,
@@ -64,7 +63,6 @@ stdenv.mkDerivation rec {
     hicolor-icon-theme
     libdrm
     libnotify
-    libsForQt5.kde-cli-tools
     libxkbcommon
     nspr
     nss

From c1d848732150e1960d440b34b3a6c1bd3bfbb082 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2522/3724] poptracker: use Qt6 kdialog

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

diff --git a/pkgs/by-name/po/poptracker/package.nix b/pkgs/by-name/po/poptracker/package.nix
index 01fd12f14290..45f5e211d3b1 100644
--- a/pkgs/by-name/po/poptracker/package.nix
+++ b/pkgs/by-name/po/poptracker/package.nix
@@ -10,7 +10,7 @@
   openssl,
   zlib,
   which,
-  libsForQt5,
+  kdePackages,
   makeWrapper,
   makeDesktopItem,
   copyDesktopItems,
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     wrapProgram $out/bin/poptracker --prefix PATH : ${
       lib.makeBinPath [
         which
-        libsForQt5.kdialog
+        kdePackages.kdialog
       ]
     }
     mkdir -p $out/share/icons/hicolor/{64x64,512x512}/apps

From 5e3ed2553b05bd6860b1449e8576eadc7a159c66 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2523/3724] stereotool: use Qt6 kdialog

---
 pkgs/by-name/st/stereotool/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stereotool/package.nix b/pkgs/by-name/st/stereotool/package.nix
index e76be7a5629c..ae514189b79b 100644
--- a/pkgs/by-name/st/stereotool/package.nix
+++ b/pkgs/by-name/st/stereotool/package.nix
@@ -8,7 +8,7 @@
   alsa-lib,
   bzip2,
   zlib,
-  libsForQt5,
+  kdePackages,
   libgcc,
   makeWrapper,
   copyDesktopItems,
@@ -162,9 +162,9 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
     install -Dm755 alsa $out/bin/stereo_tool_gui
-    wrapProgram $out/bin/stereo_tool_gui --prefix PATH : ${lib.makeBinPath [ libsForQt5.kdialog ]}
+    wrapProgram $out/bin/stereo_tool_gui --prefix PATH : ${lib.makeBinPath [ kdePackages.kdialog ]}
     install -Dm755 jack $out/bin/stereo_tool_gui_jack
-    wrapProgram $out/bin/stereo_tool_gui_jack --prefix PATH : ${lib.makeBinPath [ libsForQt5.kdialog ]}
+    wrapProgram $out/bin/stereo_tool_gui_jack --prefix PATH : ${lib.makeBinPath [ kdePackages.kdialog ]}
     install -Dm755 cmd $out/bin/stereo_tool_cmd
     mkdir -p $out/share/icons/hicolor/48x48/apps
     cp stereo-tool-icon.png $out/share/icons/hicolor/48x48/apps/stereo-tool-icon.png

From c32c678d612264f8844bf027be5bc70054f74e74 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2524/3724] wemeet: remove unused dependency

Will be dropped with Qt5.
---
 pkgs/by-name/we/wemeet/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/we/wemeet/package.nix b/pkgs/by-name/we/wemeet/package.nix
index 2afddc259ab2..53f9dcc3522b 100644
--- a/pkgs/by-name/we/wemeet/package.nix
+++ b/pkgs/by-name/we/wemeet/package.nix
@@ -66,7 +66,6 @@ let
       libportal
       xdg-desktop-portal
       libsForQt5.qtwayland
-      libsForQt5.xwaylandvideobridge
       opencv4WithoutCuda
       pipewire
       xorg.libXdamage

From 23850b966a2c46122c71ce60b607daab5a552e69 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2525/3724] zoom-us: remove Plasma 5 code paths

---
 pkgs/by-name/zo/zoom-us/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 544974f145e0..584e0e08c9e4 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -15,7 +15,6 @@
   # Whether to support XDG portals at all
   xdgDesktopPortalSupport ? (
     plasma6XdgDesktopPortalSupport
-    || plasma5XdgDesktopPortalSupport
     || lxqtXdgDesktopPortalSupport
     || gnomeXdgDesktopPortalSupport
     || hyprlandXdgDesktopPortalSupport
@@ -26,9 +25,6 @@
   # This is Plasma 6 (KDE) XDG portal support
   plasma6XdgDesktopPortalSupport ? false,
 
-  # This is Plasma 5 (KDE) XDG portal support
-  plasma5XdgDesktopPortalSupport ? false,
-
   # This is LXQT XDG portal support
   lxqtXdgDesktopPortalSupport ? false,
 
@@ -222,7 +218,6 @@ let
     ]
     ++ lib.optional xdgDesktopPortalSupport pkgs.xdg-desktop-portal
     ++ lib.optional plasma6XdgDesktopPortalSupport pkgs.kdePackages.xdg-desktop-portal-kde
-    ++ lib.optional plasma5XdgDesktopPortalSupport pkgs.plasma5Packages.xdg-desktop-portal-kde
     ++ lib.optional lxqtXdgDesktopPortalSupport pkgs.lxqt.xdg-desktop-portal-lxqt
     ++ lib.optionals gnomeXdgDesktopPortalSupport [
       pkgs.xdg-desktop-portal-gnome

From 97987134de940962a015258bd16ca6682e8df206 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2526/3724] applet-window-appmenu: drop

Not ported to Plasma 6.
---
 .../applet-window-appmenu/default.nix         | 55 -------------------
 pkgs/top-level/qt5-packages.nix               |  3 -
 2 files changed, 58 deletions(-)
 delete mode 100644 pkgs/development/libraries/applet-window-appmenu/default.nix

diff --git a/pkgs/development/libraries/applet-window-appmenu/default.nix b/pkgs/development/libraries/applet-window-appmenu/default.nix
deleted file mode 100644
index ea4507b52d0b..000000000000
--- a/pkgs/development/libraries/applet-window-appmenu/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  extra-cmake-modules,
-  kcoreaddons,
-  kdeclarative,
-  kdecoration,
-  plasma-framework,
-  plasma-workspace,
-  libSM,
-  qtx11extras,
-  kwindowsystem,
-  libdbusmenu,
-  wrapQtAppsHook,
-}:
-
-stdenv.mkDerivation {
-  pname = "applet-window-appmenu";
-  version = "unstable-2022-06-27";
-
-  src = fetchFromGitHub {
-    owner = "psifidotos";
-    repo = "applet-window-appmenu";
-    rev = "1de99c93b0004b80898081a1acfd1e0be807326a";
-    hash = "sha256-PLlZ2qgdge8o1mZOiPOXSmTQv1r34IUmWTmYFGEzNTI=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    kcoreaddons
-    kdeclarative
-    kdecoration
-    kwindowsystem
-    plasma-framework
-    plasma-workspace
-    libSM
-    qtx11extras
-    libdbusmenu
-  ];
-
-  meta = with lib; {
-    description = "Plasma 5 applet in order to show window menu in your panels";
-    homepage = "https://github.com/psifidotos/applet-window-appmenu";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ greydot ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 83054318af0c..1624ace0a2c0 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -118,9 +118,6 @@ makeScopeWithSplicing' {
 
         accounts-qt = callPackage ../development/libraries/accounts-qt { };
 
-
-        applet-window-appmenu = callPackage ../development/libraries/applet-window-appmenu { };
-
         applet-window-buttons = callPackage ../development/libraries/applet-window-buttons { };
 
         appstream-qt = callPackage ../development/libraries/appstream/qt.nix { };

From f1bdbd2b30f3c063636366d871ff0e41d6e977d9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2527/3724] breath-theme: drop

Not ported to Plasma 6.
---
 pkgs/data/themes/breath-theme/default.nix | 48 -----------------------
 pkgs/top-level/aliases.nix                |  1 +
 pkgs/top-level/all-packages.nix           |  2 -
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 pkgs/data/themes/breath-theme/default.nix

diff --git a/pkgs/data/themes/breath-theme/default.nix b/pkgs/data/themes/breath-theme/default.nix
deleted file mode 100644
index 1c3206515099..000000000000
--- a/pkgs/data/themes/breath-theme/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitLab,
-  cmake,
-  extra-cmake-modules,
-  kdecoration,
-  plasma-workspace,
-  qtbase,
-}:
-
-stdenv.mkDerivation {
-  pname = "breath-theme";
-  version = "unstable-2022-12-22";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.manjaro.org";
-    owner = "themes";
-    group = "artwork";
-    repo = "breath";
-    rev = "98822e7d903f16116bfb02ff9921824c139d7bbc";
-    sha256 = "sha256-gvzhHOuOhxV3TC3UZeVpxeSDLpCJV+SaapcJ5mbHskY=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-
-    kdecoration
-    plasma-workspace
-    qtbase
-  ];
-
-  dontWrapQtApps = true;
-
-  cmakeFlags = [
-    "-DBUILD_PLASMA_THEMES=ON"
-    "-DBUILD_SDDM_THEME=ON"
-  ];
-
-  meta = with lib; {
-    description = "Manjaro KDE default theme";
-    homepage = "https://gitlab.manjaro.org/artwork/themes/breath";
-    license = licenses.cc-by-sa-40;
-    maintainers = with maintainers; [ huantian ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index aa4d44746d08..aece44a19e8e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -376,6 +376,7 @@ mapAliases {
   bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30
   bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17
   brasero-original = lib.warnOnInstantiate "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29
+  breath-theme = throw "'breath-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   bridgand = throw "'brigand' has been removed due to being unmaintained"; # Added 2025-04-30
   bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29
   buf-language-server = throw "'buf-language-server' was removed as its development has moved to the 'buf' package"; # Added 2024-11-15
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ee3e6f0b9e2..eb6fd1131fef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11155,8 +11155,6 @@ with pkgs;
 
   bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { };
 
-  breath-theme = libsForQt5.callPackage ../data/themes/breath-theme { };
-
   colloid-kde = libsForQt5.callPackage ../data/themes/colloid-kde { };
 
   dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { });

From 659ab6b83a61bf8b713721cce7266865d7d56b82 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2528/3724] colloid-kde: drop

Not ported to Plasma 6.
---
 pkgs/data/themes/colloid-kde/default.nix | 77 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 pkgs/top-level/all-packages.nix          |  2 -
 3 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 pkgs/data/themes/colloid-kde/default.nix

diff --git a/pkgs/data/themes/colloid-kde/default.nix b/pkgs/data/themes/colloid-kde/default.nix
deleted file mode 100644
index ef620f4e3270..000000000000
--- a/pkgs/data/themes/colloid-kde/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchFromGitHub,
-  kdeclarative,
-  plasma-framework,
-  plasma-workspace,
-  gitUpdater,
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "colloid-kde";
-  version = "unstable-2023-07-04";
-
-  src = fetchFromGitHub {
-    owner = "vinceliuice";
-    repo = pname;
-    rev = "0b79befdad9b442b5a8287342c4b7e47ff87d555";
-    hash = "sha256-AYH9fW20/p+mq6lxR1lcCV1BQ/kgcsjHncpMvYWXnWA=";
-  };
-
-  outputs = [
-    "out"
-    "sddm"
-  ];
-
-  postPatch = ''
-    patchShebangs install.sh
-
-    substituteInPlace install.sh \
-      --replace '$HOME/.local' $out \
-      --replace '$HOME/.config' $out/share
-
-    substituteInPlace sddm/install.sh \
-      --replace /usr $sddm \
-      --replace '$(cd $(dirname $0) && pwd)' . \
-      --replace '"$UID" -eq "$ROOT_UID"' true
-
-    substituteInPlace sddm/Colloid/Main.qml \
-      --replace /usr $sddm
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/latte
-
-    name= HOME="$TMPDIR" \
-    ./install.sh --dest $out/share/themes
-
-    mkdir -p $sddm/share/sddm/themes
-    cd sddm
-    source install.sh
-
-    runHook postInstall
-  '';
-
-  postFixup = ''
-    # Propagate sddm theme dependencies to user env otherwise sddm
-    # does not find them. Putting them in buildInputs is not enough.
-
-    mkdir -p $sddm/nix-support
-
-    printWords ${kdeclarative.bin} ${plasma-framework} ${plasma-workspace} \
-      >> $sddm/nix-support/propagated-user-env-packages
-  '';
-
-  passthru.updateScript = gitUpdater { };
-
-  meta = with lib; {
-    description = "Clean and concise theme for KDE Plasma desktop";
-    homepage = "https://github.com/vinceliuice/Colloid-kde-theme";
-    license = licenses.gpl3Only;
-    platforms = platforms.all;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index aece44a19e8e..bb458d617b13 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -464,6 +464,7 @@ mapAliases {
   clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   CoinMP = coinmp; # Added 2024-06-12
   collada-dom = opencollada; # added 2024-02-21
+  colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19
   colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15
   connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb6fd1131fef..95ed0193511a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11155,8 +11155,6 @@ with pkgs;
 
   bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { };
 
-  colloid-kde = libsForQt5.callPackage ../data/themes/colloid-kde { };
-
   dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { });
 
   # solve collision for nix-env before https://github.com/NixOS/nix/pull/815

From 20b86355fd7d89f0daec230dc8f41d7906393ae1 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2529/3724] graphite-kde-theme: drop

Not ported to Plasma 6.
---
 .../themes/graphite-kde-theme/default.nix     | 61 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 pkgs/data/themes/graphite-kde-theme/default.nix

diff --git a/pkgs/data/themes/graphite-kde-theme/default.nix b/pkgs/data/themes/graphite-kde-theme/default.nix
deleted file mode 100644
index 7d1d548f9031..000000000000
--- a/pkgs/data/themes/graphite-kde-theme/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  kdeclarative,
-  plasma-framework,
-  plasma-workspace,
-  gitUpdater,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "graphite-kde-theme";
-  version = "unstable-2023-10-25";
-
-  src = fetchFromGitHub {
-    owner = "vinceliuice";
-    repo = pname;
-    rev = "33cc85c49c424dfcba73e6ee84b0dc7fb9e52566";
-    hash = "sha256-iQGT2x0wY2EIuYw/a1MB8rT9BxiqWrOyBo6EGIJwsFw=";
-  };
-
-  # Propagate sddm theme dependencies to user env otherwise sddm does
-  # not find them. Putting them in buildInputs is not enough.
-  propagatedUserEnvPkgs = [
-    kdeclarative.bin
-    plasma-framework
-    plasma-workspace
-  ];
-
-  postPatch = ''
-    patchShebangs install.sh
-
-    substituteInPlace install.sh \
-      --replace '$HOME/.local' $out \
-      --replace '$HOME/.config' $out/share
-
-    substituteInPlace sddm/*/Main.qml \
-      --replace /usr $out
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    name= ./install.sh
-
-    mkdir -p $out/share/sddm/themes
-    cp -a sddm/Graphite* $out/share/sddm/themes/
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = gitUpdater { };
-
-  meta = with lib; {
-    description = "Flat Design theme for KDE Plasma desktop";
-    homepage = "https://github.com/vinceliuice/Graphite-kde-theme";
-    license = licenses.gpl3Only;
-    platforms = platforms.all;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bb458d617b13..f262b3bfb2f7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -875,6 +875,7 @@ mapAliases {
   gradle_6 = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
   gradle_6-unwrapped = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
   grafana-agent = throw "'grafana-agent' has been removed, as it only works with an EOL compiler and will become EOL during the 25.05 release. Consider migrating to 'grafana-alloy' instead"; # Added 2025-04-02
+  graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
 
   #godot
   godot_4_3-export-templates = lib.warnOnInstantiate "godot_4_3-export-templates has been renamed to godot_4_3-export-templates-bin" godot_4_3-export-templates-bin;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95ed0193511a..7a6cb7b3e606 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11202,8 +11202,6 @@ with pkgs;
   font-awesome_6 = (callPackage ../data/fonts/font-awesome { }).v6;
   font-awesome = font-awesome_6;
 
-  graphite-kde-theme = libsForQt5.callPackage ../data/themes/graphite-kde-theme { };
-
   palenight-theme = callPackage ../data/themes/gtk-theme-framework { theme = "palenight"; };
 
   amarena-theme = callPackage ../data/themes/gtk-theme-framework { theme = "amarena"; };

From 12f2b218ffe9bef18ad6bccf3dfc2241ea053be2 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2530/3724] kde2-decoration: drop

Not ported to Plasma 6.
---
 pkgs/data/themes/kde2/default.nix | 46 -------------------------------
 pkgs/top-level/qt5-packages.nix   |  2 --
 2 files changed, 48 deletions(-)
 delete mode 100644 pkgs/data/themes/kde2/default.nix

diff --git a/pkgs/data/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix
deleted file mode 100644
index 4eab64997811..000000000000
--- a/pkgs/data/themes/kde2/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  qtbase,
-  kcoreaddons,
-  kdecoration,
-}:
-
-mkDerivation rec {
-  pname = "kde2-decoration";
-  version = "1.1";
-
-  src = fetchFromGitHub {
-    owner = "repos-holder";
-    repo = "kdecoration2-kde2";
-    rev = version;
-    sha256 = "y2q1j36EURJc7k1huqhEH1Z82PnVSKlfx20bpQWY28c=";
-  };
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    qtbase
-    kcoreaddons
-    kdecoration
-  ];
-
-  meta = with lib; {
-    description = "KDE 2 window decoration ported to Plasma 5";
-    homepage = "https://github.com/repos-holder/kdecoration2-kde2";
-    license = licenses.bsd2;
-    platforms = platforms.linux;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 1624ace0a2c0..f7364604ea29 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -150,8 +150,6 @@ makeScopeWithSplicing' {
 
         kdb = callPackage ../development/libraries/kdb { };
 
-        kde2-decoration = callPackage ../data/themes/kde2 { };
-
         kcolorpicker = callPackage ../development/libraries/kcolorpicker { };
 
         kdiagram = callPackage ../development/libraries/kdiagram { };

From 2a2fd793209f1ee6887b717bfa9981e55c689ccc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2531/3724] kexi: drop

Old Qt5 version.
---
 pkgs/applications/office/kexi/default.nix | 112 ----------------------
 pkgs/top-level/aliases.nix                |   1 +
 pkgs/top-level/all-packages.nix           |   2 -
 3 files changed, 1 insertion(+), 114 deletions(-)
 delete mode 100644 pkgs/applications/office/kexi/default.nix

diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
deleted file mode 100644
index 5b07dff5b925..000000000000
--- a/pkgs/applications/office/kexi/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  fetchurl,
-  fetchpatch,
-  extra-cmake-modules,
-  kdoctools,
-  boost,
-  qttools,
-  qtwebkit,
-  breeze-icons,
-  karchive,
-  kcodecs,
-  kcompletion,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  kcrash,
-  kguiaddons,
-  ki18n,
-  kiconthemes,
-  kitemviews,
-  kio,
-  ktexteditor,
-  ktextwidgets,
-  kwidgetsaddons,
-  kxmlgui,
-  kdb,
-  kproperty,
-  kreport,
-  lcms2,
-  libmysqlclient,
-  libpq,
-  marble,
-}:
-
-mkDerivation rec {
-  pname = "kexi";
-  version = "3.2.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
-    sha256 = "1zy1q7q9rfdaws3rwf3my22ywkn6g747s3ixfcg9r80mm2g3z0bs";
-  };
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  buildInputs = [
-    boost
-    qttools
-    qtwebkit
-    breeze-icons
-    karchive
-    kcodecs
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kcrash
-    kguiaddons
-    ki18n
-    kiconthemes
-    kitemviews
-    kio
-    ktexteditor
-    ktextwidgets
-    kwidgetsaddons
-    kxmlgui
-    kdb
-    kproperty
-    kreport
-    lcms2
-    libmysqlclient
-    libpq
-    marble
-  ];
-
-  propagatedUserEnvPkgs = [ kproperty ];
-
-  patches = [
-    # Changes in Qt 5.13 mean that QDate isn't exported from certain places,
-    # which the build was relying on. This patch explicitly imports QDate where
-    # needed.
-    # Should be unnecessary with kexi >= 3.3
-    (fetchpatch {
-      url = "https://cgit.kde.org/kexi.git/patch/src/plugins/forms/widgets/kexidbdatepicker.cpp?id=511d99b7745a6ce87a208bdbf69e631f1f136d53";
-      sha256 = "0m5cwq2v46gb1b12p7acck6dadvn7sw4xf8lkqikj9hvzq3r1dnj";
-    })
-  ];
-
-  meta = with lib; {
-    description = "Open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker";
-    longDescription = ''
-      Kexi is a visual database applications creator.
-      It can be used for creating database schemas,
-      inserting data, performing queries, and processing data.
-      Forms can be created to provide a custom interface to your data.
-      All database objects - tables, queries and forms - are stored in the database,
-      making it easy to share data and design.
-    '';
-    homepage = "https://kexi-project.org/";
-    maintainers = with maintainers; [ zraexy ];
-    platforms = platforms.linux;
-    license = with licenses; [
-      gpl2
-      lgpl2
-    ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f262b3bfb2f7..17d058342536 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1011,6 +1011,7 @@ mapAliases {
   keepkey_agent = keepkey-agent; # added 2024-01-06
   kerberos = throw "'kerberos' has been renamed to/replaced by 'krb5'"; # Converted to throw 2024-10-17
   kexectools = throw "'kexectools' has been renamed to/replaced by 'kexec-tools'"; # Converted to throw 2024-10-17
+  kexi = makePlasma5Throw "kexi";
   keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25
   keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17
   kgx = gnome-console; # Added 2022-02-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a6cb7b3e606..1518a659a41e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12388,8 +12388,6 @@ with pkgs;
 
   kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };
 
-  kexi = libsForQt5.callPackage ../applications/office/kexi { };
-
   kiwix = libsForQt5.callPackage ../applications/misc/kiwix { };
 
   kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { };

From 70628c4834ee05c2c631236e315e83e8d2cbbda5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2532/3724] kreport: drop

Uses old Qt5 things, unused otherwise.
---
 .../development/libraries/kreport/default.nix | 46 -------------------
 pkgs/top-level/qt5-packages.nix               |  2 -
 2 files changed, 48 deletions(-)
 delete mode 100644 pkgs/development/libraries/kreport/default.nix

diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix
deleted file mode 100644
index ec2d52647523..000000000000
--- a/pkgs/development/libraries/kreport/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  fetchurl,
-  extra-cmake-modules,
-  qtdeclarative,
-  qtwebkit,
-  kconfig,
-  kcoreaddons,
-  kwidgetsaddons,
-  kguiaddons,
-  kproperty,
-  marble,
-  python3,
-}:
-
-mkDerivation rec {
-  pname = "kreport";
-  version = "3.2.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
-    sha256 = "1mycsvkz5rphi9df2i4ch4ykvprd4m76acsdzs3zis2ljrqnsw92";
-  };
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-
-  buildInputs = [
-    qtdeclarative
-    qtwebkit
-    kconfig
-    kcoreaddons
-    kwidgetsaddons
-    kguiaddons
-    kproperty
-    marble
-    python3
-  ];
-
-  meta = with lib; {
-    description = "Framework for creation and generation of reports in multiple formats";
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ zraexy ];
-  };
-}
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index f7364604ea29..826a465dade5 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -166,8 +166,6 @@ makeScopeWithSplicing' {
 
         kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { };
 
-        kreport = callPackage ../development/libraries/kreport { };
-
         kquickimageedit = callPackage ../development/libraries/kquickimageedit/0.3.0.nix { };
 
         kuserfeedback = callPackage ../development/libraries/kuserfeedback { };

From 926cc0bb37289e75f03f6742f849469291c4d55a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2533/3724] latte-dock: drop

Not ported to Plasma 6.
---
 .../latte-dock/0001-Disable-autostart.patch   | 34 ---------
 pkgs/applications/misc/latte-dock/default.nix | 75 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 1 insertion(+), 111 deletions(-)
 delete mode 100644 pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch
 delete mode 100644 pkgs/applications/misc/latte-dock/default.nix

diff --git a/pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch b/pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch
deleted file mode 100644
index a639b465c92c..000000000000
--- a/pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ad3f083de2dca2b2c5189430d33a78acfbd9d694 Mon Sep 17 00:00:00 2001
-From: Lana Black <lanablack@amok.cc>
-Date: Wed, 8 Jun 2022 12:42:31 +0000
-Subject: [PATCH] Disable autostart.
-
----
- app/settings/universalsettings.cpp | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/app/settings/universalsettings.cpp b/app/settings/universalsettings.cpp
-index c95371db..4efd3ffe 100644
---- a/app/settings/universalsettings.cpp
-+++ b/app/settings/universalsettings.cpp
-@@ -74,17 +74,6 @@ UniversalSettings::~UniversalSettings()
- 
- void UniversalSettings::load()
- {
--    //! check if user has set the autostart option
--    bool autostartUserSet = m_universalGroup.readEntry("userConfiguredAutostart", false);
--
--    if (!autostartUserSet && !autostart()) {
--        //! the first time the application is running and autostart is not set, autostart is enabled
--        //! and from now own it will not be recreated in the beginning
--
--        setAutostart(true);
--        m_universalGroup.writeEntry("userConfiguredAutostart", true);
--    }
--
-     //! init screen scales
-     m_screenScalesGroup = m_universalGroup.group("ScreenScales");
- 
--- 
-2.36.1
-
diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
deleted file mode 100644
index c7f6946926c7..000000000000
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchFromGitLab,
-  cmake,
-  extra-cmake-modules,
-  karchive,
-  kwindowsystem,
-  qtx11extras,
-  kcrash,
-  knewstuff,
-  wayland-scanner,
-  plasma-framework,
-  plasma-wayland-protocols,
-  plasma-workspace,
-  plasma-desktop,
-  qtwayland,
-  wayland,
-  xorg,
-}:
-
-mkDerivation {
-  pname = "latte-dock";
-  version = "unstable-2024-01-31";
-
-  src = fetchFromGitLab {
-    domain = "invent.kde.org";
-    owner = "plasma";
-    repo = "latte-dock";
-    rev = "131ee4d39ce8913b2de8f9a673903225345c7a38";
-    sha256 = "sha256-C1FvgkdxCzny+F6igS2YjsHOpkK34wl6je2tHlGQwU0=";
-  };
-
-  buildInputs = [
-    plasma-framework
-    plasma-wayland-protocols
-    qtwayland
-    xorg.libpthreadstubs
-    xorg.libXdmcp
-    xorg.libSM
-    wayland
-    plasma-workspace
-    plasma-desktop
-  ];
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    cmake
-    karchive
-    kwindowsystem
-    qtx11extras
-    kcrash
-    knewstuff
-    wayland-scanner
-  ];
-
-  patches = [
-    ./0001-Disable-autostart.patch
-  ];
-
-  postInstall = ''
-    mkdir -p $out/etc/xdg/autostart
-    cp $out/share/applications/org.kde.latte-dock.desktop $out/etc/xdg/autostart
-  '';
-
-  meta = with lib; {
-    description = "Dock-style app launcher based on Plasma frameworks";
-    mainProgram = "latte-dock";
-    homepage = "https://invent.kde.org/plasma/latte-dock";
-    license = licenses.gpl2;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.ysndr ];
-  };
-
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 17d058342536..e2b3420761ff 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1040,6 +1040,7 @@ mapAliases {
   lanzaboote-tool = throw "lanzaboote-tool has been removed due to lack of integration maintenance with nixpkgs. Consider using the Nix expressions provided by https://github.com/nix-community/lanzaboote"; # Added 2025-07-23
   latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   latinmodern-math = lmmath;
+  latte-dock = throw "'latte-dock' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   lazarus-qt = lazarus-qt5; # Added 2024-12-25
   leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19
   ledger_agent = ledger-agent; # Added 2024-01-07
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1518a659a41e..386a6aaf61c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14719,8 +14719,6 @@ with pkgs;
 
   redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { };
 
-  latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { };
-
   ### SCIENCE/CHEMISTY
 
   avogadrolibs = libsForQt5.callPackage ../development/libraries/science/chemistry/avogadrolibs { };

From ac817e245b4a63362bc7fbef51741309546f5a8d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2534/3724] layan-kde: drop

Not ported to Plasma 6.
---
 pkgs/data/themes/layan-kde/default.nix | 61 --------------------------
 pkgs/top-level/aliases.nix             |  1 +
 pkgs/top-level/all-packages.nix        |  2 -
 3 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 pkgs/data/themes/layan-kde/default.nix

diff --git a/pkgs/data/themes/layan-kde/default.nix b/pkgs/data/themes/layan-kde/default.nix
deleted file mode 100644
index 2f08b5ccdcaa..000000000000
--- a/pkgs/data/themes/layan-kde/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  kdeclarative,
-  plasma-framework,
-  plasma-workspace,
-  gitUpdater,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "layan-kde";
-  version = "unstable-2023-09-30";
-
-  src = fetchFromGitHub {
-    owner = "vinceliuice";
-    repo = pname;
-    rev = "7ab7cd7461dae8d8d6228d3919efbceea5f4272c";
-    hash = "sha256-Wh8tZcQEdTTlgtBf4ovapojHcpPBZDDkWOclmxZv9zA=";
-  };
-
-  # Propagate sddm theme dependencies to user env otherwise sddm does
-  # not find them. Putting them in buildInputs is not enough.
-  propagatedUserEnvPkgs = [
-    kdeclarative.bin
-    plasma-framework
-    plasma-workspace
-  ];
-
-  postPatch = ''
-    patchShebangs install.sh
-
-    substituteInPlace install.sh \
-      --replace '$HOME/.local' $out \
-      --replace '$HOME/.config' $out/share
-
-    substituteInPlace sddm/*/Main.qml \
-      --replace /usr $out
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    name= ./install.sh --dest $out/share/themes
-
-    mkdir -p $out/share/sddm/themes
-    cp -a sddm/Layan* $out/share/sddm/themes/
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = gitUpdater { };
-
-  meta = with lib; {
-    description = "Flat Design theme for KDE Plasma desktop";
-    homepage = "https://github.com/vinceliuice/Layan-kde";
-    license = licenses.gpl3Only;
-    platforms = platforms.all;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e2b3420761ff..86be9646e305 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1041,6 +1041,7 @@ mapAliases {
   latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   latinmodern-math = lmmath;
   latte-dock = throw "'latte-dock' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
+  layan-kde = throw "'layan-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   lazarus-qt = lazarus-qt5; # Added 2024-12-25
   leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19
   ledger_agent = ledger-agent; # Added 2024-01-07
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 386a6aaf61c9..71760a537d25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11251,8 +11251,6 @@ with pkgs;
     inherit (pantheon) elementary-icon-theme;
   };
 
-  layan-kde = libsForQt5.callPackage ../data/themes/layan-kde { };
-
   inherit (callPackages ../data/fonts/liberation-fonts { })
     liberation_ttf_v1
     liberation_ttf_v2

From f164d0957817033e61638ab5822ec9bebf4ca878 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2535/3724] lightly-boehs: drop

Not ported to Plasma 6.
---
 pkgs/data/themes/lightly-boehs/default.nix | 44 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 pkgs/data/themes/lightly-boehs/default.nix

diff --git a/pkgs/data/themes/lightly-boehs/default.nix b/pkgs/data/themes/lightly-boehs/default.nix
deleted file mode 100644
index 145b7a22037d..000000000000
--- a/pkgs/data/themes/lightly-boehs/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdecoration,
-  fetchFromGitHub,
-  cmake,
-  extra-cmake-modules,
-  plasma-workspace,
-  qtbase,
-  qt5,
-}:
-
-mkDerivation {
-  pname = "lightly-boehs";
-  version = "0.4.1";
-
-  src = fetchFromGitHub {
-    owner = "boehs";
-    repo = "Lightly";
-    rev = "1a831f7ff19ce93c04489faec74e389a216fdf11";
-    sha256 = "Icw+xVmuCB59ltyZJKyIeHI/yGfM2SbPrVzTVLqHWd4=";
-  };
-
-  buildInputs = [
-    kdecoration
-    plasma-workspace
-    qtbase
-    qt5.qtx11extras
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  meta = with lib; {
-    description = "Fork of the Lightly breeze theme style that aims to be visually modern and minimalistic";
-    mainProgram = "lightly-settings5";
-    homepage = "https://github.com/boehs/Lightly";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.hikari ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 86be9646e305..55bee8a74ee4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1071,6 +1071,7 @@ mapAliases {
   libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17
   libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05
   libgda = lib.warnOnInstantiate "‘libgda’ has been renamed to ‘libgda5’" libgda5; # Added 2025-01-21
+  lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   libgme = game-music-emu; # Added 2022-07-20
   libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22
   libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71760a537d25..1056256dc7a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11259,8 +11259,6 @@ with pkgs;
 
   lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { };
 
-  lightly-boehs = libsForQt5.callPackage ../data/themes/lightly-boehs { };
-
   # ltunifi and solaar both provide udev rules but solaar's rules are more
   # up-to-date so we simply use that instead of having to maintain our own rules
   logitech-udev-rules = solaar.udev;

From d9cdfc5a8275750d0ade6df1c75d801b83a1533d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2536/3724] lightly-qt: drop

Not ported to Plasma 6.
---
 pkgs/data/themes/lightly-qt/default.nix | 44 -------------------------
 pkgs/top-level/aliases.nix              |  1 +
 pkgs/top-level/all-packages.nix         |  2 --
 3 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 pkgs/data/themes/lightly-qt/default.nix

diff --git a/pkgs/data/themes/lightly-qt/default.nix b/pkgs/data/themes/lightly-qt/default.nix
deleted file mode 100644
index 6b6729c9cbb7..000000000000
--- a/pkgs/data/themes/lightly-qt/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  extra-cmake-modules,
-  kdecoration,
-  plasma-workspace,
-  qtbase,
-  qt5,
-}:
-
-mkDerivation rec {
-  pname = "lightly-qt";
-  version = "0.4.1";
-
-  src = fetchFromGitHub {
-    owner = "Luwx";
-    repo = "Lightly";
-    rev = "v${version}";
-    sha256 = "0qkjzgjplgwczhk6959iah4ilvazpprv7yb809jy75kkp1jw8mwk";
-  };
-
-  buildInputs = [
-    kdecoration
-    plasma-workspace
-    qtbase
-    qt5.qtx11extras
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  meta = with lib; {
-    description = "Fork of breeze theme style that aims to be visually modern and minimalistic";
-    mainProgram = "lightly-settings5";
-    homepage = "https://github.com/Luwx/Lightly";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.pwoelfel ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 55bee8a74ee4..87c2f4fcd3ae 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1072,6 +1072,7 @@ mapAliases {
   libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05
   libgda = lib.warnOnInstantiate "‘libgda’ has been renamed to ‘libgda5’" libgda5; # Added 2025-01-21
   lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
+  lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   libgme = game-music-emu; # Added 2022-07-20
   libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22
   libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1056256dc7a9..adc750bec6ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11257,8 +11257,6 @@ with pkgs;
     ;
   liberation_ttf = liberation_ttf_v2;
 
-  lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { };
-
   # ltunifi and solaar both provide udev rules but solaar's rules are more
   # up-to-date so we simply use that instead of having to maintain our own rules
   logitech-udev-rules = solaar.udev;

From 94c0b938f0e594c2d5873a9380087f0eaee3b02a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2537/3724] littlenavmap: drop

Not ported to Qt6, depends on Marble which depends on most of Gear 5.
---
 pkgs/by-name/li/littlenavmap/atools.nix   |  46 --------
 pkgs/by-name/li/littlenavmap/deploy.patch | 108 ------------------
 pkgs/by-name/li/littlenavmap/package.nix  | 129 ----------------------
 pkgs/top-level/aliases.nix                |   1 +
 4 files changed, 1 insertion(+), 283 deletions(-)
 delete mode 100644 pkgs/by-name/li/littlenavmap/atools.nix
 delete mode 100644 pkgs/by-name/li/littlenavmap/deploy.patch
 delete mode 100644 pkgs/by-name/li/littlenavmap/package.nix

diff --git a/pkgs/by-name/li/littlenavmap/atools.nix b/pkgs/by-name/li/littlenavmap/atools.nix
deleted file mode 100644
index 96f92a39c369..000000000000
--- a/pkgs/by-name/li/littlenavmap/atools.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  libsForQt5,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "atools";
-  version = "4.0.17";
-
-  src = fetchFromGitHub {
-    owner = "albar965";
-    repo = "atools";
-    tag = "v${version}";
-    hash = "sha256-R5CbMdT8UsPiiIXFhmdAmNa1fKLPfUrWunlbwsHOVow=";
-  };
-
-  nativeBuildInputs = [
-    libsForQt5.qmake
-  ];
-
-  buildInputs = [
-    libsForQt5.qtsvg
-  ];
-
-  env.ATOOLS_NO_CRASHHANDLER = "true";
-
-  installTargets = "deploy";
-
-  postInstall = ''
-    rmdir $out
-    mv D/atools $out
-  '';
-
-  dontWrapQtApps = true;
-
-  meta = {
-    description = "Static library extending Qt for exception handling, a log4j like logging framework, Flight Simulator related utilities like BGL reader and more";
-    homepage = "https://github.com/albar965/atools";
-    changelog = "https://github.com/albar965/atools/blob/${src.rev}/CHANGELOG.txt";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ ck3d ];
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/by-name/li/littlenavmap/deploy.patch b/pkgs/by-name/li/littlenavmap/deploy.patch
deleted file mode 100644
index d35674f7c2e1..000000000000
--- a/pkgs/by-name/li/littlenavmap/deploy.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff --git a/littlenavmap.pro b/littlenavmap.pro
-index 7c8ed0c6..31590e2c 100644
---- a/littlenavmap.pro
-+++ b/littlenavmap.pro
-@@ -777,18 +777,6 @@ OTHER_FILES += \
- # Linux - Copy help and Marble plugins and data
- unix:!macx {
-   copydata.commands = mkdir -p $$OUT_PWD/plugins &&
--  copydata.commands += cp -avfu \
--    $$MARBLE_LIB_PATH/marble/plugins/libCachePlugin.so \
--    $$MARBLE_LIB_PATH/marble/plugins/libAtmospherePlugin.so \
--    $$MARBLE_LIB_PATH/marble/plugins/libCompassFloatItem.so \
--    $$MARBLE_LIB_PATH/marble/plugins/libGraticulePlugin.so \
--    $$MARBLE_LIB_PATH/marble/plugins/libKmlPlugin.so \
--    $$MARBLE_LIB_PATH/marble/plugins/libLatLonPlugin.so \
--    $$MARBLE_LIB_PATH/marble/plugins/libPn2Plugin.so \
--    $$MARBLE_LIB_PATH/marble/plugins/libMapScaleFloatItem.so \
--    $$MARBLE_LIB_PATH/marble/plugins/libNavigationFloatItem.so \
--    $$MARBLE_LIB_PATH/marble/plugins/libOverviewMap.so \
--    $$OUT_PWD/plugins &&
-   copydata.commands += mkdir -p $$OUT_PWD/translations &&
-   copydata.commands += cp -avfu $$PWD/*.qm $$OUT_PWD/translations &&
-   copydata.commands += cp -avfu $$ATOOLS_INC_PATH/../*.qm $$OUT_PWD/translations &&
-@@ -796,8 +784,7 @@ unix:!macx {
-   copydata.commands += cp -avfu $$PWD/web $$OUT_PWD &&
-   copydata.commands += cp -avfu $$PWD/customize $$OUT_PWD &&
-   copydata.commands += cp -avfu $$PWD/marble/data $$OUT_PWD &&
--  copydata.commands += cp -vf $$PWD/desktop/littlenavmap*.sh $$OUT_PWD &&
--  copydata.commands += chmod -v a+x $$OUT_PWD/littlenavmap*.sh
-+  copydata.commands += true
- }
- 
- # Mac OS X - Copy help and Marble plugins and data
-@@ -820,73 +807,20 @@ unix:!macx {
- 
-   deploy.commands += rm -Rfv $$DEPLOY_DIR &&
-   deploy.commands += mkdir -pv $$DEPLOY_DIR/translations &&
--  deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB &&
--  deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/iconengines &&
--  deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/imageformats &&
--  deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/platforms &&
--  deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/platformthemes &&
--  deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/printsupport &&
--  deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/sqldrivers &&
-   deploy.commands += echo $$VERSION_NUMBER > $$DEPLOY_DIR/version.txt &&
--  deploy.commands += echo $$GIT_REVISION_FULL > $$DEPLOY_DIR/revision.txt &&
--  deploy.commands += cp -Rvf $$MARBLE_LIB_PATH/*.so* $$DEPLOY_DIR_LIB &&
--  deploy.commands += patchelf --set-rpath \'\$\$ORIGIN/.\' $$DEPLOY_DIR_LIB/libmarblewidget-qt5.so* &&
--  deploy.commands += patchelf --set-rpath \'\$\$ORIGIN/.\' $$DEPLOY_DIR_LIB/libastro.so* &&
--  deploy.commands += cp -Rvf $$OUT_PWD/plugins $$DEPLOY_DIR &&
-   deploy.commands += cp -Rvf $$OUT_PWD/data $$DEPLOY_DIR &&
-   deploy.commands += cp -Rvf $$OUT_PWD/help $$DEPLOY_DIR &&
-   deploy.commands += cp -Rvf $$OUT_PWD/web $$DEPLOY_DIR &&
-   deploy.commands += cp -Rvf $$OUT_PWD/customize $$DEPLOY_DIR &&
-   deploy.commands += cp -Rvf $$OUT_PWD/littlenavmap $$DEPLOY_DIR &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qt_??.qm  $$DEPLOY_DIR/translations &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qt_??_??.qm  $$DEPLOY_DIR/translations &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qtbase*.qm  $$DEPLOY_DIR/translations &&
-   deploy.commands += cp -Rvf $$OUT_PWD/translations $$DEPLOY_DIR &&
-   exists($$DATABASE_BASE) : deploy.commands += cp -Rvf $$DATABASE_BASE $$DEPLOY_DIR &&
-   exists($$HELP_BASE) : deploy.commands += cp -Rvf $$HELP_BASE/* $$DEPLOY_DIR/help &&
--  deploy.commands += cp -vf $$PWD/desktop/\"Little Navmap Portable Linux.sh\" $$DEPLOY_DIR/\"Little Navmap Portable.sh\" &&
--  deploy.commands += cp -vf $$PWD/desktop/linux-qt.conf $$DEPLOY_DIR/qt.conf &&
-   deploy.commands += cp -vf $$PWD/CHANGELOG.txt $$DEPLOY_DIR &&
-   deploy.commands += cp -vf $$PWD/README.txt $$DEPLOY_DIR &&
-   deploy.commands += cp -vf $$PWD/LICENSE.txt $$DEPLOY_DIR &&
-   deploy.commands += cp -vf $$PWD/resources/icons/littlenavmap.svg $$DEPLOY_DIR &&
--  deploy.commands += cp -vf \"$$PWD/desktop/Little Navmap.desktop\" $$DEPLOY_DIR &&
--  exists(/usr/lib/x86_64-linux-gnu/libssl.so.1.1) : deploy.commands += cp -vfaL /usr/lib/x86_64-linux-gnu/libssl.so.1.1 $$DEPLOY_DIR_LIB &&
--  exists(/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1) : deploy.commands += cp -vfaL /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/iconengines/libqsvgicon.so*  $$DEPLOY_DIR_LIB/iconengines &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqgif.so*  $$DEPLOY_DIR_LIB/imageformats &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqjpeg.so*  $$DEPLOY_DIR_LIB/imageformats &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqsvg.so*  $$DEPLOY_DIR_LIB/imageformats &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqwbmp.so*  $$DEPLOY_DIR_LIB/imageformats &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqwebp.so*  $$DEPLOY_DIR_LIB/imageformats &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqeglfs.so*  $$DEPLOY_DIR_LIB/platforms &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqlinuxfb.so*  $$DEPLOY_DIR_LIB/platforms &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqminimal.so*  $$DEPLOY_DIR_LIB/platforms &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqminimalegl.so*  $$DEPLOY_DIR_LIB/platforms &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqoffscreen.so*  $$DEPLOY_DIR_LIB/platforms &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqxcb.so*  $$DEPLOY_DIR_LIB/platforms &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platformthemes/libqgtk*.so*  $$DEPLOY_DIR_LIB/platformthemes &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/printsupport/libcupsprintersupport.so*  $$DEPLOY_DIR_LIB/printsupport &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/sqldrivers/libqsqlite.so*  $$DEPLOY_DIR_LIB/sqldrivers &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicudata.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicui18n.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicuuc.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Concurrent.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Core.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5DBus.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Gui.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Network.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5PrintSupport.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Qml.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Quick.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Sql.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Svg.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Widgets.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5X11Extras.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5XcbQpa.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5QmlModels.so*  $$DEPLOY_DIR_LIB &&
--  deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Xml.so* $$DEPLOY_DIR_LIB &&
--  deploy.commands += rm -fv $$DEPLOY_DIR_LIB/lib*.so.*.debug $$DEPLOY_DIR_LIB/*/lib*.so.*.debug
-+  deploy.commands += true
- }
- 
- # Mac specific deploy target
diff --git a/pkgs/by-name/li/littlenavmap/package.nix b/pkgs/by-name/li/littlenavmap/package.nix
deleted file mode 100644
index f01cdeee5494..000000000000
--- a/pkgs/by-name/li/littlenavmap/package.nix
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-  lib,
-  stdenv,
-  callPackage,
-  fetchFromGitHub,
-  libsForQt5,
-  makeDesktopItem,
-}:
-let
-  atools = callPackage ./atools.nix { };
-  marble = libsForQt5.marble.overrideAttrs (self: {
-    version = "0.25.5";
-
-    src = fetchFromGitHub {
-      owner = "albar965";
-      repo = "marble";
-      rev = "722acf7f8d79023f6c6a761063645a1470bb3935"; # branch lnm/1.1
-      hash = "sha256-5GSa+xIQS9EgJXxMFUOA5jTtHJ6Dl4C9yAkFPIOrgo8=";
-    };
-
-    # https://github.com/albar965/littlenavmap/wiki/Compiling#compile-marble
-    cmakeFlags =
-      let
-        disable = n: lib.cmakeBool n false;
-        enable = n: lib.cmakeBool n true;
-      in
-      map enable [
-        "STATIC_BUILD"
-        "MARBLE_EMPTY_MAPTHEME"
-        "QTONLY"
-      ]
-      ++ map disable [
-        "BUILD_MARBLE_EXAMPLES"
-        "BUILD_INHIBIT_SCREENSAVER_PLUGIN"
-        "BUILD_MARBLE_APPS"
-        "BUILD_MARBLE_EXAMPLES"
-        "BUILD_MARBLE_TESTS"
-        "BUILD_MARBLE_TOOLS"
-        "BUILD_TESTING"
-        "BUILD_WITH_DBUS"
-        "MOBILE"
-        "WITH_DESIGNER_PLUGIN"
-        "WITH_Phonon"
-        "WITH_Qt5Location"
-        "WITH_Qt5Positioning"
-        "WITH_Qt5SerialPort"
-        "WITH_ZLIB"
-        "WITH_libgps"
-        "WITH_libshp"
-        "WITH_libwlocate"
-      ];
-  });
-
-  desktopItem = makeDesktopItem {
-    name = "Little Navmap";
-    desktopName = "Little Navmap";
-    icon = "littlenavmap";
-    terminal = false;
-    exec = "littlenavmap";
-    categories = [
-      "Qt"
-      "Utility"
-      "Geography"
-      "Maps"
-    ];
-  };
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "littlenavmap";
-  version = "3.0.17";
-
-  src = fetchFromGitHub {
-    owner = "albar965";
-    repo = "littlenavmap";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-/1YB2uEQzT0K6IylpWDqOaMSENDR9GuyJNty+2C8kXM=";
-  };
-
-  nativeBuildInputs = [
-    libsForQt5.qmake
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  # https://github.com/albar965/littlenavmap/wiki/Compiling#default-paths-and-environment-variables-2
-  env = {
-    ATOOLS_INC_PATH = "${atools}/include";
-    ATOOLS_LIB_PATH = "${atools}/lib";
-    MARBLE_INC_PATH = "${marble.dev}/include";
-    MARBLE_LIB_PATH = "${marble}/lib";
-    inherit (atools) ATOOLS_NO_CRASHHANDLER;
-  };
-
-  patches = [ ./deploy.patch ];
-
-  configurePhase = ''
-    runHook preConfigure
-
-    # we have to build out of source tree
-    cd build
-    qmake "''${flagsArray[@]}" ..
-
-    runHook postConfigure
-  '';
-
-  postInstall = ''
-    mkdir -p $out/bin $out/lib $out/share/icons/scaleable/apps
-    mv "../../deploy/Little Navmap" $out/lib/littlenavmap
-    ln -s $out/lib/littlenavmap/littlenavmap $out/bin
-    cp -ra ${desktopItem}/* $out
-    mv $out/lib/littlenavmap/littlenavmap.svg $out/share/icons/scaleable/apps
-  '';
-
-  enableParallelBuilding = true;
-  enableParallelInstalling = true;
-
-  installTargets = "deploy";
-
-  passthru.local-packages = { inherit atools marble; };
-
-  meta = {
-    description = "Free flight planner, navigation tool, moving map, airport search and airport information system for Flight Simulator X, Microsoft Flight Simulator 2020, Prepar3D and X-Plane";
-    homepage = "https://github.com/albar965/littlenavmap";
-    changelog = "https://github.com/albar965/littlenavmap/blob/${finalAttrs.src.tag}/CHANGELOG.txt";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ ck3d ];
-    mainProgram = "littlenavmap";
-    platforms = lib.platforms.linux;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 87c2f4fcd3ae..a17e755f1070 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1131,6 +1131,7 @@ mapAliases {
   litecoin = throw "litecoin has been removed as nobody was maintaining it and the packaged version had known vulnerabilities"; # Added 2024-11-24
   litecoind = throw "litecoind has been removed as nobody was maintaining it and the packaged version had known vulnerabilities"; # Added 2024-11-24
   Literate = literate; # Added 2024-06-12
+  littlenavmap = throw "littlenavmap has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   llama = walk; # Added 2023-01-23
 
   # Linux kernels

From 9344fa43259410109f1c8fcaf89d99e08bc43108 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2538/3724] material-kwin-decoration: drop

Not ported to Plasma 6.
---
 .../ma/material-kwin-decoration/package.nix   | 59 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 2 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 pkgs/by-name/ma/material-kwin-decoration/package.nix

diff --git a/pkgs/by-name/ma/material-kwin-decoration/package.nix b/pkgs/by-name/ma/material-kwin-decoration/package.nix
deleted file mode 100644
index 6d005b7a838d..000000000000
--- a/pkgs/by-name/ma/material-kwin-decoration/package.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  libsForQt5,
-  unstableGitUpdater,
-}:
-
-stdenv.mkDerivation {
-  pname = "material-kwin-decoration";
-  version = "7-unstable-2023-01-15";
-
-  src = fetchFromGitHub {
-    owner = "Zren";
-    repo = "material-decoration";
-    rev = "0e989e5b815b64ee5bca989f983da68fa5556644";
-    hash = "sha256-Ncn5jxkuN4ZBWihfycdQwpJ0j4sRpBGMCl6RNiH4mXg=";
-  };
-
-  # Remove -Werror since it uses deprecated methods
-  postPatch = ''
-    substituteInPlace ./CMakeLists.txt \
-      --replace "add_definitions (-Wall -Werror)" "add_definitions (-Wall)"
-  '';
-
-  nativeBuildInputs = [
-    cmake
-  ]
-  ++ (with libsForQt5; [
-    extra-cmake-modules
-    wrapQtAppsHook
-  ]);
-
-  buildInputs = with libsForQt5; [
-    qtx11extras
-    kcoreaddons
-    kguiaddons
-    kdecoration
-    kconfig
-    kconfigwidgets
-    kwindowsystem
-    kiconthemes
-    kwayland
-  ];
-
-  passthru = {
-    updateScript = unstableGitUpdater {
-      tagPrefix = "v";
-    };
-  };
-
-  meta = {
-    description = "Material-ish window decoration theme for KWin";
-    homepage = "https://github.com/Zren/material-decoration";
-    license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ nickcao ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a17e755f1070..a2b4cb1308a9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1291,6 +1291,7 @@ mapAliases {
   marwaita-ubuntu = lib.warnOnInstantiate "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08
   marwaita-pop_os = lib.warnOnInstantiate "marwaita-pop_os has been renamed to marwaita-yellow" marwaita-yellow; # Added 2024-10-29
   masari = throw "masari has been removed as it was abandoned upstream"; # Added 2024-07-11
+  material-kwin-decoration = throw "'material-kwin-decoration' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   mathematica9 = throw "mathematica9 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
   mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
   mathematica11 = throw "mathematica11 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20

From 92641e253958557d97c20ca63b26550d5d2bd894 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2539/3724] peruse: drop

Old, Qt5, unmaintained.
---
 pkgs/tools/misc/peruse/default.nix | 63 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 pkgs/top-level/all-packages.nix    |  2 -
 3 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 pkgs/tools/misc/peruse/default.nix

diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
deleted file mode 100644
index ece14a96056d..000000000000
--- a/pkgs/tools/misc/peruse/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  stdenv,
-  fetchurl,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  wrapQtAppsHook,
-  baloo,
-  karchive,
-  kconfig,
-  kcrash,
-  kfilemetadata,
-  kinit,
-  kirigami2,
-  knewstuff,
-  okular,
-  plasma-framework,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "peruse";
-  # while technically a beta, the latest release is from 2016 and doesn't build without a lot of
-  # patching
-  version = "1.80";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/peruse/peruse-${finalAttrs.version}.tar.xz";
-    hash = "sha256-xnSVnKF20jbxVoFW41A22NZWVZUry/F7G+Ts5NK6M1E=";
-  };
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    wrapQtAppsHook
-  ];
-
-  propagatedBuildInputs = [
-    baloo
-    karchive
-    kconfig
-    kcrash
-    kfilemetadata
-    kinit
-    kirigami2
-    knewstuff
-    okular
-    plasma-framework
-  ];
-
-  # the build is otherwise crazy loud
-  cmakeFlags = [ "-Wno-dev" ];
-
-  pathsToLink = [ "/etc/xdg/peruse.knsrc" ];
-
-  meta = with lib; {
-    description = "Comic book reader";
-    homepage = "https://peruse.kde.org";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ peterhoeg ];
-    mainProgram = "peruse";
-    inherit (kirigami2.meta) platforms;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a2b4cb1308a9..dd2a91d05ca8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1598,6 +1598,7 @@ mapAliases {
   pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23
   perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead";
   perldevelPackages = perldevel;
+  peruse = throw "'peruse' has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09
   pg-gvm = throw "pg-gvm has been moved to postgresql.pkgs.pg-gvm to make it work with all versions of PostgreSQL"; # added 2024-11-30
   pgadmin = pgadmin4;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index adc750bec6ef..1979d5de80a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3347,8 +3347,6 @@ with pkgs;
 
   kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };
 
-  peruse = libsForQt5.callPackage ../tools/misc/peruse { };
-
   ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { };
 
   libcoap = callPackage ../applications/networking/libcoap {

From 980598e8f6b93931d343ce45a0414b0233997173 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2540/3724] plasma-applet-volumewin7mixer: drop

Not ported to Plasma 6.
---
 .../plasma-applet-volumewin7mixer/cmake.patch | 20 ---------
 .../plasma-applet-volumewin7mixer/default.nix | 45 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 --
 4 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch
 delete mode 100644 pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix

diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch b/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch
deleted file mode 100644
index b33a3e174bc4..000000000000
--- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur org.kde.plasma.volumewin7mixer/CMakeLists.txt org.kde.plasma.volumewin7mixer.patch/CMakeLists.txt
---- org.kde.plasma.volumewin7mixer/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ org.kde.plasma.volumewin7mixer.patch/CMakeLists.txt	2016-04-19 11:23:35.137866949 +0200
-@@ -0,0 +1,15 @@
-+# Set minimum CMake version (required for CMake 3.0 or later)
-+cmake_minimum_required(VERSION 2.8.12)
-+
-+# Use Extra CMake Modules (ECM) for common functionality.
-+# See http://api.kde.org/ecm/manual/ecm.7.html
-+# and http://api.kde.org/ecm/manual/ecm-kde-modules.7.html
-+find_package(ECM REQUIRED NO_MODULE)
-+# Needed by find_package(KF5Plasma) below.
-+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PATH})
-+
-+# Locate plasma_install_package macro.
-+find_package(KF5Plasma REQUIRED)
-+
-+# Add installatation target ("make install").
-+plasma_install_package(package org.kde.plasma.volumewin7mixer)
-
diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
deleted file mode 100644
index cba463516a68..000000000000
--- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  extra-cmake-modules,
-  plasma-framework,
-  kwindowsystem,
-  plasma-pa,
-  fetchFromGitHub,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "plasma-applet-volumewin7mixer";
-  version = "26";
-
-  src = fetchFromGitHub {
-    owner = "Zren";
-    repo = "plasma-applet-volumewin7mixer";
-    rev = "v${version}";
-    sha256 = "sha256-VMOUNtAURTHDuJBOGz2N0+3VzxBmVNC1O8dVuyUZAa4=";
-  };
-
-  # Adds the CMakeLists.txt not provided by upstream
-  patches = [ ./cmake.patch ];
-  postPatch = "rm build";
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    plasma-framework
-    kwindowsystem
-    plasma-pa
-  ];
-
-  dontWrapQtApps = true;
-
-  meta = with lib; {
-    description = "Fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)";
-    homepage = "https://github.com/Zren/plasma-applet-volumewin7mixer";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ mdevlamynck ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dd2a91d05ca8..e4ef54826899 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1685,6 +1685,7 @@ mapAliases {
   pivx = throw "pivx has been removed as it was marked as broken"; # Added 2024-07-15
   pivxd = throw "pivxd has been removed as it was marked as broken"; # Added 2024-07-15
 
+  plasma-applet-volumewin7mixer = throw "'plasma-applet-volumewin7mixer' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   PlistCpp = plistcpp; # Added 2024-01-05
   pocket-updater-utility = pupdate; # Added 2024-01-25
   polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1979d5de80a8..7f1bdb5be245 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14687,10 +14687,6 @@ with pkgs;
 
   xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });
 
-  plasma-applet-volumewin7mixer =
-    libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer
-      { };
-
   plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher { };
 
   plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { };

From 1bcecd979433810a6eff8950dec0203f9d6ab3aa Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2541/3724] plasma-pass: drop

Not ported to Plasma 6.
---
 pkgs/tools/security/plasma-pass/default.nix | 49 ---------------------
 pkgs/top-level/aliases.nix                  |  1 +
 pkgs/top-level/all-packages.nix             |  2 -
 3 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 pkgs/tools/security/plasma-pass/default.nix

diff --git a/pkgs/tools/security/plasma-pass/default.nix b/pkgs/tools/security/plasma-pass/default.nix
deleted file mode 100644
index 5ab24a28b7ce..000000000000
--- a/pkgs/tools/security/plasma-pass/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  fetchFromGitLab,
-  cmake,
-  extra-cmake-modules,
-  ki18n,
-  kitemmodels,
-  oath-toolkit,
-  qgpgme,
-  plasma-framework,
-  qt5,
-}:
-
-mkDerivation rec {
-  pname = "plasma-pass";
-  version = "1.2.2";
-
-  src = fetchFromGitLab {
-    domain = "invent.kde.org";
-    owner = "plasma";
-    repo = "plasma-pass";
-    sha256 = "sha256-fEYH3cvDZzEKpYqkTVqxxh3rhV75af8dZUHxQq8fPNg=";
-    rev = "v${version}";
-  };
-
-  buildInputs = [
-    ki18n
-    kitemmodels
-    oath-toolkit
-    qgpgme
-    plasma-framework
-    qt5.qtbase
-    qt5.qtdeclarative
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  meta = with lib; {
-    description = "Plasma applet to access passwords from pass, the standard UNIX password manager";
-    homepage = "https://invent.kde.org/plasma/plasma-pass";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ matthiasbeyer ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e4ef54826899..2e442e625a5a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1686,6 +1686,7 @@ mapAliases {
   pivxd = throw "pivxd has been removed as it was marked as broken"; # Added 2024-07-15
 
   plasma-applet-volumewin7mixer = throw "'plasma-applet-volumewin7mixer' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
+  plasma-pass = throw "'plasma-pass' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   PlistCpp = plistcpp; # Added 2024-01-05
   pocket-updater-utility = pupdate; # Added 2024-01-25
   polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f1bdb5be245..cc400a75ea13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14689,8 +14689,6 @@ with pkgs;
 
   plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher { };
 
-  plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { };
-
   inherit
     (callPackages ../applications/misc/redshift {
       inherit (python3Packages)

From 97bcfc37758a4fdde42ffe5ce98ca62c377e843e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2542/3724] plasma-theme-switcher: drop

Not ported to Plasma 6.
---
 .../misc/plasma-theme-switcher/default.nix    | 49 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 pkgs/applications/misc/plasma-theme-switcher/default.nix

diff --git a/pkgs/applications/misc/plasma-theme-switcher/default.nix b/pkgs/applications/misc/plasma-theme-switcher/default.nix
deleted file mode 100644
index 324cca93099f..000000000000
--- a/pkgs/applications/misc/plasma-theme-switcher/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  stdenv,
-  lib,
-  cmake,
-  extra-cmake-modules,
-  fetchFromGitHub,
-  qtbase,
-  kdeFrameworks,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "plasma-theme-switcher";
-  version = "0.1";
-  dontWrapQtApps = true;
-
-  src = fetchFromGitHub {
-    owner = "maldoinc";
-    repo = "plasma-theme-switcher";
-    rev = "v${version}";
-    sha256 = "sdcJ6K5QmglJEDIEl4sd8x7DuCPCqMHRxdYbcToM46Q=";
-  };
-
-  buildInputs = [
-    qtbase
-    kdeFrameworks.plasma-framework
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    cp plasma-theme $out/bin
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/maldoinc/plasma-theme-switcher/";
-    description = "KDE Plasma theme switcher";
-    license = with licenses; [ gpl2Only ];
-    maintainers = with maintainers; [ kevink ];
-    mainProgram = "plasma-theme";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2e442e625a5a..ef67b6f9b243 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1687,6 +1687,7 @@ mapAliases {
 
   plasma-applet-volumewin7mixer = throw "'plasma-applet-volumewin7mixer' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   plasma-pass = throw "'plasma-pass' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
+  plasma-theme-switcher = throw "'plasma-theme-switcher' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   PlistCpp = plistcpp; # Added 2024-01-05
   pocket-updater-utility = pupdate; # Added 2024-01-25
   polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc400a75ea13..372f34fb8282 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14687,8 +14687,6 @@ with pkgs;
 
   xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });
 
-  plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher { };
-
   inherit
     (callPackages ../applications/misc/redshift {
       inherit (python3Packages)

From 051cea054811b987d5091d2e209662004a4c3750 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2543/3724] qcachegrind: drop

Builds on old Qt5 version of kcachegrind, which itself is getting dropped.
---
 .../tools/analysis/qcachegrind/default.nix    | 66 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 pkgs/development/tools/analysis/qcachegrind/default.nix

diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
deleted file mode 100644
index b8bda7488a40..000000000000
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  lib,
-  stdenv,
-  qmake,
-  qtbase,
-  perl,
-  php,
-  kcachegrind,
-  wrapQtAppsHook,
-}:
-
-stdenv.mkDerivation {
-  pname = "qcachegrind";
-  version = kcachegrind.version;
-
-  src = kcachegrind.src;
-
-  buildInputs = [
-    qtbase
-    perl
-    php
-  ];
-
-  nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
-  ];
-
-  dontWrapQtApps = true;
-
-  postInstall = ''
-    mkdir -p $out/bin
-    cp -p converters/dprof2calltree $out/bin/dprof2calltree
-    cp -p converters/memprof2calltree $out/bin/memprof2calltree
-    cp -p converters/op2calltree $out/bin/op2calltree
-    cp -p converters/pprof2calltree $out/bin/pprof2calltree
-    chmod -R +x $out/bin/
-  ''
-  + (
-    if stdenv.hostPlatform.isDarwin then
-      ''
-        mkdir -p $out/Applications
-        cp cgview/cgview.app/Contents/MacOS/cgview $out/bin
-        cp -a qcachegrind/qcachegrind.app $out/Applications
-      ''
-    else
-      ''
-        install qcachegrind/qcachegrind cgview/cgview -t "$out/bin"
-        install -Dm644 qcachegrind/qcachegrind.desktop -t "$out/share/applications"
-        install -Dm644 kcachegrind/32-apps-kcachegrind.png "$out/share/icons/hicolor/32x32/apps/kcachegrind.png"
-        install -Dm644 kcachegrind/48-apps-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png"
-      ''
-  );
-
-  preFixup = ''
-    wrapQtApp "$out/bin/qcachegrind"
-  '';
-
-  meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
-    description = "Qt GUI to visualize profiling data";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ periklis ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ef67b6f9b243..b25fd55b9371 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1739,6 +1739,7 @@ mapAliases {
   ### Q ###
 
   qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30
+  qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   qcsxcad = throw "'qcsxcad' has been renamed to/replaced by 'libsForQt5.qcsxcad'"; # Converted to throw 2024-10-17
   qflipper = qFlipper; # Added 2022-02-11
   qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 372f34fb8282..72458ea3807a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7455,8 +7455,6 @@ with pkgs;
     };
   });
 
-  qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind { };
-
   vcpkg-tool-unwrapped = vcpkg-tool.override { doWrap = false; };
 
   whatstyle = callPackage ../development/tools/misc/whatstyle {

From 9b307321989297cc0f5b64db3a5acdc3f8664edf Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2544/3724] qt-video-wlr: drop

Not ported to Qt6.
---
 .../misc/qt-video-wlr/default.nix             | 69 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 pkgs/applications/misc/qt-video-wlr/default.nix

diff --git a/pkgs/applications/misc/qt-video-wlr/default.nix b/pkgs/applications/misc/qt-video-wlr/default.nix
deleted file mode 100644
index 0c0b766ef817..000000000000
--- a/pkgs/applications/misc/qt-video-wlr/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  pkg-config,
-  meson,
-  cmake,
-  ninja,
-  gst_all_1,
-  wrapQtAppsHook,
-  qtbase,
-  qtmultimedia,
-  layer-shell-qt,
-  wayland-scanner,
-}:
-let
-  gstreamerPath =
-    with gst_all_1;
-    lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-bad
-      gst-plugins-ugly
-    ];
-in
-stdenv.mkDerivation {
-  pname = "qt-video-wlr";
-  version = "2023-07-22";
-
-  src = fetchFromGitHub {
-    owner = "xdavidwu";
-    repo = "qt-video-wlr";
-    rev = "1373c8eeb0a5d867927ba30a9a9bb2d5b0057a87";
-    hash = "sha256-mg0ROD9kV88I5uCm+niAI5tJuhkmYC7Z8dixxrNow4c=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    meson
-    cmake # only used for find layer-shell-qt
-    ninja
-    wrapQtAppsHook
-    wayland-scanner
-  ];
-
-  buildInputs = [
-    qtbase
-    qtmultimedia
-    layer-shell-qt
-  ];
-
-  qtWrapperArgs = [
-    "--prefix PATH : $out/bin/qt-video-wlr"
-    "--prefix GST_PLUGIN_PATH : ${gstreamerPath}"
-  ];
-
-  meta = with lib; {
-    description = "Qt pip-mode-like video player for wlroots-based wayland compositors";
-    mainProgram = "qt-video-wlr";
-    homepage = "https://github.com/xdavidwu/qt-video-wlr";
-    license = licenses.mit;
-    maintainers = with maintainers; [
-      fionera
-      rewine
-    ];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b25fd55b9371..8b109118aa07 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1745,6 +1745,7 @@ mapAliases {
   qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26
   qscintilla = libsForQt5.qscintilla; # Added 2023-09-20
   qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20
+  qt-video-wlr = throw "'qt-video-wlr' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   qt515 = qt5; # Added 2022-11-24
   qt5ct = throw "'qt5ct' has been renamed to/replaced by 'libsForQt5.qt5ct'"; # Converted to throw 2024-10-17
   qt6ct = qt6Packages.qt6ct; # Added 2023-03-07
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72458ea3807a..d60379d6d759 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2084,8 +2084,6 @@ with pkgs;
 
   futhark = haskell.lib.compose.justStaticExecutables haskellPackages.futhark;
 
-  qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { };
-
   g2o = libsForQt5.callPackage ../development/libraries/g2o { };
 
   inherit (go-containerregistry) crane gcrane;

From cc6479b738810d2a5b53e1b36de9a2dae2e6d069 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2545/3724] sierra-breeze-enhanced: drop Qt5 build

---
 .../sierra-breeze-enhanced/default.nix               | 12 ++----------
 pkgs/top-level/aliases.nix                           |  1 +
 pkgs/top-level/all-packages.nix                      |  4 ----
 pkgs/top-level/qt5-packages.nix                      |  4 ----
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix
index ea98b567fd0b..6b3331ccd613 100644
--- a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix
+++ b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix
@@ -6,24 +6,16 @@
   wrapQtAppsHook,
   kwin,
   lib,
-  useQt5 ? false,
 }:
-let
-  latestVersion = "2.1.1";
-  latestSha256 = "sha256-7mQnJCQr/zm9zEdg2JPr7jQn8uajyCXvyYRQZWxG+Q8=";
-
-  qt5Version = "1.3.3";
-  qt5Sha256 = "sha256-zTUTsSzy4p0Y7RPOidCtxTjjyvPRyWSQCxA5sUzXcLc=";
-in
 stdenv.mkDerivation rec {
   pname = "sierra-breeze-enhanced";
-  version = if useQt5 then qt5Version else latestVersion;
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "kupiqu";
     repo = "SierraBreezeEnhanced";
     rev = if version == "2.1.1" then "V.2.1.1" else "V${version}";
-    sha256 = if useQt5 then qt5Sha256 else latestSha256;
+    hash = "sha256-7mQnJCQr/zm9zEdg2JPr7jQn8uajyCXvyYRQZWxG+Q8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8b109118aa07..80f4186a94bc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1866,6 +1866,7 @@ mapAliases {
   shell-hist = throw "'shell-hist' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   shipyard = jumppad; # Added 2023-06-06
   siduck76-st = st-snazzy; # Added 2024-12-24
+  sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   signald = throw "'signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
   signaldctl = throw "'signaldctl' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
   signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d60379d6d759..3d003af18b1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11328,10 +11328,6 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  sierra-breeze-enhanced =
-    libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced
-      { useQt5 = true; };
-
   scheherazade-new = scheherazade.override {
     version = "4.300";
   };
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 826a465dade5..4abfa6f877c4 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -291,10 +291,6 @@ makeScopeWithSplicing' {
           callPackage ../development/libraries/sailfish-access-control-plugin
             { };
 
-        sierra-breeze-enhanced = callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced {
-          useQt5 = true;
-        };
-
         soqt = callPackage ../development/libraries/soqt { };
 
         telepathy = callPackage ../development/libraries/telepathy/qt { };

From c469aa12187d65c7e66bf8d2dbe90fc3b9400f4a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2546/3724] soundkonverter: drop

Upstream is dead, depends on very EOL KDE Gear libraries
---
 .../audio/soundkonverter/default.nix          | 174 ------------------
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 -
 pkgs/top-level/qt5-packages.nix               |   2 -
 4 files changed, 1 insertion(+), 178 deletions(-)
 delete mode 100644 pkgs/applications/audio/soundkonverter/default.nix

diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix
deleted file mode 100644
index 60e175984780..000000000000
--- a/pkgs/applications/audio/soundkonverter/default.nix
+++ /dev/null
@@ -1,174 +0,0 @@
-# currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery
-{
-  mkDerivation,
-  fetchFromGitHub,
-  fetchpatch,
-  lib,
-  makeWrapper,
-  cmake,
-  extra-cmake-modules,
-  pkg-config,
-  libkcddb,
-  kconfig,
-  kconfigwidgets,
-  ki18n,
-  kdelibs4support,
-  kio,
-  solid,
-  kwidgetsaddons,
-  kxmlgui,
-  qtbase,
-  phonon,
-  taglib_1,
-  # optional backends
-  withCD ? true,
-  cdparanoia,
-  withFlac ? true,
-  flac,
-  withMidi ? true,
-  fluidsynth,
-  timidity,
-  withSpeex ? false,
-  speex,
-  withVorbis ? true,
-  vorbis-tools,
-  vorbisgain,
-  withMp3 ? true,
-  lame,
-  mp3gain,
-  withAac ? true,
-  faad2,
-  aacgain,
-  withUnfreeAac ? false,
-  faac,
-  withFfmpeg ? true,
-  ffmpeg-full,
-  withMplayer ? false,
-  mplayer,
-  withSox ? true,
-  sox,
-  withOpus ? true,
-  opusTools,
-  withTwolame ? false,
-  twolame,
-  withApe ? false,
-  monkeysAudio,
-  withWavpack ? false,
-  wavpack,
-}:
-
-assert withAac -> withFfmpeg || withUnfreeAac;
-assert withUnfreeAac -> withAac;
-
-let
-  runtimeDeps =
-    [ ]
-    ++ lib.optional withCD cdparanoia
-    ++ lib.optional withFlac flac
-    ++ lib.optional withSpeex speex
-    ++ lib.optional withFfmpeg ffmpeg-full
-    ++ lib.optional withMplayer mplayer
-    ++ lib.optional withSox sox
-    ++ lib.optional withOpus opusTools
-    ++ lib.optional withTwolame twolame
-    ++ lib.optional withApe monkeysAudio
-    ++ lib.optional withWavpack wavpack
-    ++ lib.optional withUnfreeAac faac
-    ++ lib.optionals withMidi [
-      fluidsynth
-      timidity
-    ]
-    ++ lib.optionals withVorbis [
-      vorbis-tools
-      vorbisgain
-    ]
-    ++ lib.optionals withMp3 [
-      lame
-      mp3gain
-    ]
-    ++ lib.optionals withAac [
-      faad2
-      aacgain
-    ];
-
-in
-mkDerivation rec {
-  pname = "soundkonverter";
-  version = "3.0.1";
-  src = fetchFromGitHub {
-    owner = "dfaust";
-    repo = "soundkonverter";
-    rev = "v" + version;
-    sha256 = "1g2khdsjmsi4zzynkq8chd11cbdhjzmi37r9jhpal0b730nq9x7l";
-  };
-  patches = [
-    # already merged into master, so it can go during the next release
-    (fetchpatch {
-      url = "https://patch-diff.githubusercontent.com/raw/dfaust/soundkonverter/pull/87.patch";
-      sha256 = "sha256-XIpD4ZMTZVcu+F27OtpRy51H+uQgpd5l22IZ6XsD64w=";
-      name = "soundkonverter_taglib.patch";
-      stripLen = 1;
-    })
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    pkg-config
-    kdelibs4support
-    makeWrapper
-  ];
-  propagatedBuildInputs = [
-    libkcddb
-    kconfig
-    kconfigwidgets
-    ki18n
-    kdelibs4support
-    kio
-    solid
-    kwidgetsaddons
-    kxmlgui
-    qtbase
-    phonon
-  ];
-  buildInputs = [ taglib_1 ] ++ runtimeDeps;
-  # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5
-  cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ];
-  sourceRoot = "${src.name}/src";
-  # add runt-time deps to PATH
-  postInstall = ''
-    wrapProgram $out/bin/soundkonverter --prefix PATH : ${lib.makeBinPath runtimeDeps}
-  '';
-  meta = {
-    homepage = "https://github.com/dfaust/soundkonverter";
-    license = lib.licenses.gpl2;
-    maintainers = [ lib.maintainers.schmittlauch ];
-    description = "Audio file converter, CD ripper and Replay Gain tool";
-    mainProgram = "soundkonverter";
-    longDescription = ''
-      soundKonverter is a frontend to various audio converters.
-
-      The key features are:
-      - Audio file conversion
-      - Replay Gain calculation
-      - CD ripping
-
-      soundKonverter supports reading and writing tags and covers for many formats, so they are preserved when converting files.
-
-      It is extendable by plugins and supports many backends including:
-
-      - Audio file conversion
-        Backends: faac, faad, ffmpeg, flac, lame, mplayer, neroaac, timidity, fluidsynth, vorbistools, opustools, sox, twolame,
-        flake, mac, shorten, wavpack and speex
-        Formats: ogg vorbis, mp3, flac, wma, aac, ac3, opus, alac, mp2, als, amr nb, amr wb, ape, speex, m4a, mp1, musepack shorten,
-        tta, wavpack, ra, midi, mod, 3gp, rm, avi, mkv, ogv, mpeg, mov, mp4, flv, wmv and rv
-
-      - Replay Gain calculation
-        Backends: aacgain, metaflac, mp3gain, vorbisgain, wvgain, mpcgain
-        Formats: aac, mp3, flac, ogg vorbis, wavpack, musepack
-
-      - CD ripping
-        Backends: cdparanoia
-    '';
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 80f4186a94bc..5c27c1a617bb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1890,6 +1890,7 @@ mapAliases {
   snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
   soldat-unstable = opensoldat; # Added 2022-07-02
   soulseekqt = throw "'soulseekqt' has been removed due to lack of maintenance in Nixpkgs in a long time. Consider using 'nicotine-plus' or 'slskd' instead."; # Added 2025-06-07
+  soundkonverter = throw "'soundkonverter' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
   soundOfSorting = sound-of-sorting; # Added 2023-07-07
   SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12
   SPAdes = spades; # Added 2024-06-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d003af18b1a..4e1cd9c6dd66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4226,8 +4226,6 @@ with pkgs;
 
   spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { };
 
-  soundkonverter = libsForQt5.soundkonverter;
-
   stm32loader = with python3Packages; toPythonApplication stm32loader;
 
   solc-select = with python3Packages; toPythonApplication solc-select;
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 4abfa6f877c4..5ae8023b6b20 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -303,8 +303,6 @@ makeScopeWithSplicing' {
 
         signond = callPackage ../development/libraries/signond { };
 
-        soundkonverter = callPackage ../applications/audio/soundkonverter { };
-
         timed = callPackage ../applications/system/timed { };
 
         xp-pen-deco-01-v2-driver = callPackage ../os-specific/linux/xp-pen-drivers/deco-01-v2 { };

From 5e1e6488ee606009e0899eeabb96b4a27bbabb45 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2547/3724] trojita: drop

Upstream is dead, not ported to Qt6.
---
 .../mailreaders/trojita/default.nix           | 83 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 85 deletions(-)
 delete mode 100644 pkgs/applications/networking/mailreaders/trojita/default.nix

diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix
deleted file mode 100644
index 685d78b0f50b..000000000000
--- a/pkgs/applications/networking/mailreaders/trojita/default.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  akonadi-contacts,
-  cmake,
-  fetchFromGitLab,
-  fetchsvn,
-  gnupg,
-  gpgme,
-  kcontacts,
-  kf5gpgmepp,
-  lib,
-  libsecret,
-  mimetic,
-  mkDerivation,
-  pkg-config,
-  qgpgme,
-  qtbase,
-  qtkeychain,
-  qttools,
-  qtwebkit,
-  withI18n ? false,
-}:
-
-let
-  l10n = fetchsvn {
-    url = "svn://anonsvn.kde.org/home/kde/trunk/l10n-kf5";
-    rev = "1566642";
-    sha256 = "0y45fjib153za085la3hqpryycx33dkj3cz8kwzn2w31kvldfl1q";
-  };
-in
-mkDerivation rec {
-  pname = "trojita";
-  version = "unstable-2022-08-22";
-
-  src = fetchFromGitLab {
-    domain = "invent.kde.org";
-    owner = "pim";
-    repo = "trojita";
-    rev = "91087933c5e7a03a8097c0ffe5f7289abcfc123b";
-    sha256 = "sha256-15G9YjT3qBKbeOKfb/IgXOO+DaJaTULP9NJn/MFYZS8=";
-  };
-
-  buildInputs = [
-    akonadi-contacts
-    gpgme
-    kcontacts
-    libsecret
-    mimetic
-    qgpgme
-    qtbase
-    qtkeychain
-    qtwebkit
-    mimetic
-    kf5gpgmepp
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    qttools
-    gnupg
-  ];
-
-  postPatch =
-    "echo ${version} > src/trojita-version"
-    + lib.optionalString withI18n ''
-      mkdir -p po
-      for f in `find ${l10n} -name "trojita_common.po"`; do
-        cp $f po/trojita_common_$(echo $f | cut -d/ -f5).po
-      done
-    '';
-
-  meta = with lib; {
-    description = "Qt IMAP e-mail client";
-    homepage = "http://trojita.flaska.net/";
-    license = with licenses; [
-      gpl2
-      gpl3
-    ];
-    maintainers = with maintainers; [ ehmry ];
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5c27c1a617bb..6bf5cb4dfbc7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2070,6 +2070,7 @@ mapAliases {
   transifex-client = transifex-cli; # Added 2023-12-29
   trfl = throw "trfl has been removed, because it has not received an update for 3 years and was broken"; # Added 2024-07-25
   trezor_agent = trezor-agent; # Added 2024-01-07
+  trojita = throw "'trojita' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
   trust-dns = hickory-dns; # Added 2024-08-07
   ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2024-10-17
   tuic = throw "`tuic` has been removed due to lack of upstream maintenance, consider using other tuic implementations"; # Added 2025-02-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e1cd9c6dd66..314d778cb83a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13505,8 +13505,6 @@ with pkgs;
     wlroots = wlroots_0_19;
   };
 
-  trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
-
   tuxclocker = libsForQt5.callPackage ../applications/misc/tuxclocker {
     tuxclocker-plugins = tuxclocker-plugins-with-unfree;
   };

From 55f6142a563d590b7a31c0ae694bf6fa1c17e47f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2548/3724] virt-manager-qt: drop

Upstream is dead, not ported to Qt6.
---
 .../virtualization/virt-manager/qt.nix        | 75 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 -
 3 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/virt-manager/qt.nix

diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
deleted file mode 100644
index c05dbb1444c3..000000000000
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  qtbase,
-  qtmultimedia,
-  qtsvg,
-  qttools,
-  krdc,
-  libvncserver,
-  libvirt,
-  pcre,
-  pixman,
-  qtermwidget,
-  spice-gtk,
-  spice-protocol,
-  libselinux,
-  libsepol,
-  util-linux,
-}:
-
-mkDerivation rec {
-  pname = "virt-manager-qt";
-  version = "0.72.99";
-
-  src = fetchFromGitHub {
-    owner = "F1ash";
-    repo = "qt-virt-manager";
-    rev = version;
-    hash = "sha256-1aXlGlK+YPOe2X51xycWvSu8YC9uCywyL6ItiScFA04=";
-  };
-
-  cmakeFlags = [
-    "-DBUILD_QT_VERSION=5"
-    "-DQTERMWIDGET_INCLUDE_DIRS=${qtermwidget}/include/qtermwidget5"
-  ];
-
-  buildInputs = [
-    qtbase
-    qtmultimedia
-    qtsvg
-    krdc
-    libvirt
-    libvncserver
-    pcre
-    pixman
-    qtermwidget
-    spice-gtk
-    spice-protocol
-    libselinux
-    libsepol
-    util-linux
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    qttools
-  ];
-
-  meta = with lib; {
-    homepage = "https://f1ash.github.io/qt-virt-manager";
-    description = "Desktop user interface for managing virtual machines (QT)";
-    longDescription = ''
-      The virt-manager application is a desktop user interface for managing
-      virtual machines through libvirt. It primarily targets KVM VMs, but also
-      manages Xen and LXC (linux containers).
-    '';
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ peterhoeg ];
-    inherit (qtbase.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6bf5cb4dfbc7..3939c09cdc61 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2149,6 +2149,7 @@ mapAliases {
   vimix-cursor-theme = throw "'vimix-cursor-theme' has been superseded by 'vimix-cursors'"; # Added 2025-03-04
   viper4linux-gui = throw "'viper4linux-gui' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
   viper4linux = throw "'viper4linux' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
+  virt-manager-qt = throw "'virt-manager-qt' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
   virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17
   vistafonts = vista-fonts; # Added 2025-02-03
   vistafonts-chs = vista-fonts-chs; # Added 2025-02-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 314d778cb83a..a983549f0c02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13606,10 +13606,6 @@ with pkgs;
 
   virt-manager = callPackage ../applications/virtualization/virt-manager { };
 
-  virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix {
-    qtermwidget = lxqt.qtermwidget_1_4;
-  };
-
   virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox {
     stdenv = stdenv_32bit;
 

From 97b63ce4bb98722c27c2ee38d76ae6a65d6babf9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2549/3724] wacomtablet: drop

Old Qt5 version.
---
 pkgs/tools/misc/wacomtablet/default.nix | 47 -------------------------
 pkgs/top-level/all-packages.nix         |  2 --
 2 files changed, 49 deletions(-)
 delete mode 100644 pkgs/tools/misc/wacomtablet/default.nix

diff --git a/pkgs/tools/misc/wacomtablet/default.nix b/pkgs/tools/misc/wacomtablet/default.nix
deleted file mode 100644
index 6529ec029908..000000000000
--- a/pkgs/tools/misc/wacomtablet/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchurl,
-  fetchpatch,
-  extra-cmake-modules,
-  qtx11extras,
-  plasma-workspace,
-  libwacom,
-  xf86_input_wacom,
-}:
-
-mkDerivation rec {
-  pname = "wacomtablet";
-  version = "3.2.0";
-  src = fetchurl {
-    url = "mirror://kde/stable/wacomtablet/${version}/wacomtablet-${version}.tar.xz";
-    sha256 = "197pwpl87gqlnza36bp68jvw8ww25znk08acmi8bpz7n84xfc368";
-  };
-  patches = [
-    (fetchpatch {
-      url = "https://invent.kde.org/system/wacomtablet/commit/4f73ff02b3efd5e8728b18fcf1067eca166704ee.patch";
-      sha256 = "0185gbh1vywfz8a3wnvncmzdk0dd189my4bzimkbh85rlrqq2nf8";
-    })
-  ];
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    qtx11extras
-    plasma-workspace
-    libwacom
-    xf86_input_wacom
-  ];
-
-  meta = {
-    description = "KDE Configuration Module for Wacom Graphics Tablets";
-    mainProgram = "kde_wacom_tabletfinder";
-    longDescription = ''
-      This module implements a GUI for the Wacom Linux Drivers and extends it
-      with profile support to handle different button / pen layouts per profile.
-    '';
-    homepage = "https://invent.kde.org/system/wacomtablet";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.Thra11 ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a983549f0c02..10e0970bcbe2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15683,8 +15683,6 @@ with pkgs;
 
   py-wacz = with python3Packages; toPythonApplication wacz;
 
-  wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { };
-
   wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { };
 
   winePackagesFor =

From 270bd9c48108b6088bc426d4ffef319cfa9609bb Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2550/3724] libsForQt5.xwaylandvideobridge: drop

---
 pkgs/top-level/qt5-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 5ae8023b6b20..c9486eacd3eb 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -306,8 +306,6 @@ makeScopeWithSplicing' {
         timed = callPackage ../applications/system/timed { };
 
         xp-pen-deco-01-v2-driver = callPackage ../os-specific/linux/xp-pen-drivers/deco-01-v2 { };
-
-        xwaylandvideobridge = callPackage ../tools/wayland/xwaylandvideobridge { };
       }
     ))
   );

From 04da94cb38f40e240913738bd96eae01f92fb3ef Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2551/3724] zombietrackergps: drop

Upstream is dead, not ported to Qt6.
---
 pkgs/by-name/zo/zombietrackergps/package.nix | 56 --------------------
 pkgs/top-level/aliases.nix                   |  1 +
 2 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 pkgs/by-name/zo/zombietrackergps/package.nix

diff --git a/pkgs/by-name/zo/zombietrackergps/package.nix b/pkgs/by-name/zo/zombietrackergps/package.nix
deleted file mode 100644
index 46660eef0d97..000000000000
--- a/pkgs/by-name/zo/zombietrackergps/package.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitLab,
-  gitUpdater,
-  cmake,
-  libsForQt5,
-}:
-stdenv.mkDerivation {
-  pname = "zombietrackergps";
-  version = "1.15";
-
-  src = fetchFromGitLab {
-    owner = "ldutils-projects";
-    repo = "zombietrackergps";
-    # latest revision is not tagged upstream, use commit sha in the meantime
-    #rev = "v_${version}";
-    rev = "cc75d5744965cc6973323f5bb77f00b0b0153dce";
-    hash = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM=";
-  };
-
-  buildInputs = with libsForQt5; [
-    marble.dev
-    qtbase
-    qtcharts
-    qtsvg
-    qtwebengine
-    ldutils
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  preConfigure = ''
-    export LANG=en_US.UTF-8
-  '';
-
-  cmakeFlags = [
-    "-DLDUTILS_ROOT=${libsForQt5.ldutils}"
-  ];
-
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "v_";
-  };
-
-  meta = {
-    description = "GPS track manager for Qt using KDE Marble maps";
-    homepage = "https://www.zombietrackergps.net/ztgps/";
-    changelog = "https://www.zombietrackergps.net/ztgps/history.html";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ sohalt ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3939c09cdc61..8ddfc146e531 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2291,6 +2291,7 @@ mapAliases {
   zimlib = throw "'zimlib' has been removed because it was an outdated and unused version of 'libzim'"; # Added 2025-03-07
   zinc = zincsearch; # Added 2023-05-28
   zint = zint-qt; # Added 2025-05-15
+  zombietrackergps = throw "'zombietrackergps' has been dropped, as it depends on KDE Gear 5 and is unmaintained"; # Added 2025-08-20
   zplugin = throw "'zplugin' has been renamed to/replaced by 'zinit'"; # Converted to throw 2024-10-17
   zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10
   zkg = throw "'zkg' has been replaced by 'zeek'";

From ecc7580c6c90199439e92e47287bc30a2ec1d346 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 21 Aug 2025 22:58:07 +0300
Subject: [PATCH 2552/3724] aliases.nix: prepare for KDE 5 drops

---
 pkgs/top-level/aliases.nix | 172 ++++++++++++++++++++++++++++++++++---
 1 file changed, 162 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8ddfc146e531..eefd41f4d9a2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -44,132 +44,284 @@ let
   deprecatedPlasma5Packages = {
     inherit (plasma5Packages)
       akonadi
+      akonadi-calendar
+      akonadi-calendar-tools
+      akonadi-contacts
+      akonadi-import-wizard
+      akonadi-mime
+      akonadi-notes
+      akonadi-search
+      akonadiconsole
       akregator
+      alkimia
+      alligator
+      analitza
+      angelfish
+      applet-window-appmenu
+      applet-window-buttons
       arianna
       ark
+      audiotube
+      aura-browser
+      baloo-widgets
+      bismuth
       bluedevil
       bomber
+      booth
       bovo
       breeze-grub
       breeze-gtk
-      breeze-icons
       breeze-plymouth
       breeze-qt5
+      buho
+      calendarsupport
+      calindori
+      cantor
+      clip
       colord-kde
-      discover
+      communicator
       dolphin
+      dolphin-plugins
       dragon
       elisa
+      eventviews
       falkon
       ffmpegthumbs
       filelight
+      flatpak-kcm
+      ghostwriter
       granatier
+      grantleetheme
       gwenview
-      k3b
+      incidenceeditor
+      index
+      juk
+      kaccounts-integration
+      kaccounts-providers
       kactivitymanagerd
       kaddressbook
+      kalarm
+      kalgebra
+      kalk
       kalzium
+      kamoso
       kapman
       kapptemplate
+      kasts
       kate
       katomic
       kblackbox
       kblocks
       kbounce
+      kbreakout
       kcachegrind
       kcalc
+      kcalutils
       kcharselect
+      kclock
       kcolorchooser
       kde-cli-tools
       kde-gtk-config
+      kde-inotify-survey
+      kde2-decoration
+      kdebugsettings
+      kdeconnect-kde
+      kdecoration
+      kdegraphics-mobipocket
+      kdegraphics-thumbnailers
+      kdenetwork-filesharing
       kdenlive
+      kdepim-runtime
       kdeplasma-addons
-      kdevelop-pg-qt
-      kdevelop-unwrapped
       kdev-php
       kdev-python
       kdevelop
+      kdevelop-pg-qt
+      kdevelop-unwrapped
       kdf
       kdialog
       kdiamond
       keditbookmarks
+      keysmith
       kfind
       kgamma5
+      kgeography
       kget
       kgpg
       khelpcenter
+      khotkeys
+      kidentitymanagement
       kig
       kigo
       killbots
+      kimap
       kinfocenter
-      kitinerary
+      kio-admin
+      kio-extras
+      kio-gdrive
+      kipi-plugins
+      kirigami-gallery
+      kldap
       kleopatra
       klettres
       klines
       kmag
-      kmail
+      kmahjongg
+      kmail-account-wizard
+      kmailtransport
+      kmbox
       kmenuedit
+      kmime
       kmines
       kmix
+      kmousetool
       kmplot
       knavalbattle
       knetwalk
       knights
+      knotes
+      koko
+      kolf
       kollision
       kolourpaint
       kompare
+      kongress
+      konqueror
+      konquest
       konsole
-      kontact
+      kontactinterface
       konversation
+      kopeninghours
       korganizer
+      kosmindoormap
+      kpat
+      kpimtextedit
+      kpipewire
       kpkpass
+      kpmcore
+      kpublictransport
+      kqtquickcharts
       krdc
+      krecorder
+      kreport
       kreversi
       krfb
+      kruler
+      ksanecore
       kscreen
       kscreenlocker
       kshisen
+      ksmtp
+      kspaceduel
       ksquares
       ksshaskpass
+      ksudoku
       ksystemlog
+      ksystemstats
       kteatime
       ktimer
+      ktnef
       ktorrent
-      ktouch
+      ktrip
       kturtle
       kwallet-pam
       kwalletmanager
       kwave
       kwayland-integration
+      kweather
       kwin
       kwrited
+      kzones
+      layer-shell-qt
+      libgravatar
+      libkcddb
+      libkdcraw
+      libkdegames
+      libkdepim
+      libkexiv2
+      libkgapi
+      libkipi
+      libkleo
+      libkmahjongg
+      libkomparediff2
+      libksane
+      libkscreen
+      libksieve
+      libksysguard
+      libktorrent
+      lightly
+      mailcommon
+      mailimporter
       marble
+      mauikit
+      mauikit-accounts
+      mauikit-calendar
+      mauikit-documents
+      mauikit-filebrowsing
+      mauikit-imagetools
+      mauikit-terminal
+      mauikit-texteditor
+      mauiman
+      mbox-importer
       merkuro
+      messagelib
       milou
       minuet
+      nota
       okular
       oxygen
+      oxygen-sounds
+      palapeli
+      parachute
+      partitionmanager
       picmi
+      pim-data-exporter
+      pim-sieve-editor
+      pimcommon
+      plank-player
+      plasma-bigscreen
       plasma-browser-integration
       plasma-desktop
+      plasma-dialer
+      plasma-disks
+      plasma-firewall
       plasma-integration
+      plasma-mobile
       plasma-nano
       plasma-nm
       plasma-pa
-      plasma-mobile
+      plasma-phonebook
+      plasma-remotecontrollers
+      plasma-sdk
+      plasma-settings
       plasma-systemmonitor
       plasma-thunderbolt
       plasma-vault
+      plasma-welcome
       plasma-workspace
       plasma-workspace-wallpapers
+      plasmatube
+      polkit-kde-agent
       powerdevil
+      print-manager
+      qmlkonsole
       qqc2-breeze-style
+      rocs
       sddm-kcm
+      shelf
+      sierra-breeze-enhanced
       skanlite
       skanpage
+      soundkonverter
       spectacle
+      station
       systemsettings
+      telly-skout
+      tokodon
+      umbrello
+      vvave
       xdg-desktop-portal-kde
+      xwaylandvideobridge
       yakuake
       zanshin
       ;

From bb4ebb76c191e9c7c438f61a0eb23c000ab855ef Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:23 +0300
Subject: [PATCH 2553/3724] mauiPackages: drop

---
 pkgs/applications/maui/booth.nix              |  57 -----
 pkgs/applications/maui/buho.nix               |  50 -----
 pkgs/applications/maui/clip.nix               |  50 -----
 pkgs/applications/maui/communicator.nix       |  59 -----
 pkgs/applications/maui/default.nix            |  92 --------
 pkgs/applications/maui/fetch.sh               |   1 -
 pkgs/applications/maui/index.nix              |  49 -----
 pkgs/applications/maui/mauikit-accounts.nix   |  31 ---
 .../maui/mauikit-calendar/default.nix         |  39 ----
 pkgs/applications/maui/mauikit-documents.nix  |  48 ----
 .../maui/mauikit-filebrowsing.nix             |  31 ---
 pkgs/applications/maui/mauikit-imagetools.nix |  43 ----
 pkgs/applications/maui/mauikit-terminal.nix   |  33 ---
 pkgs/applications/maui/mauikit-texteditor.nix |  33 ---
 pkgs/applications/maui/mauikit.nix            |  39 ----
 pkgs/applications/maui/mauiman.nix            |  27 ---
 pkgs/applications/maui/nota.nix               |  48 ----
 pkgs/applications/maui/pix.nix                |  75 -------
 pkgs/applications/maui/shelf.nix              |  52 -----
 pkgs/applications/maui/srcs.nix               | 206 ------------------
 pkgs/applications/maui/station.nix            |  44 ----
 pkgs/applications/maui/vvave.nix              |  50 -----
 pkgs/top-level/qt5-packages.nix               |  12 -
 23 files changed, 1169 deletions(-)
 delete mode 100644 pkgs/applications/maui/booth.nix
 delete mode 100644 pkgs/applications/maui/buho.nix
 delete mode 100644 pkgs/applications/maui/clip.nix
 delete mode 100644 pkgs/applications/maui/communicator.nix
 delete mode 100644 pkgs/applications/maui/default.nix
 delete mode 100644 pkgs/applications/maui/fetch.sh
 delete mode 100644 pkgs/applications/maui/index.nix
 delete mode 100644 pkgs/applications/maui/mauikit-accounts.nix
 delete mode 100644 pkgs/applications/maui/mauikit-calendar/default.nix
 delete mode 100644 pkgs/applications/maui/mauikit-documents.nix
 delete mode 100644 pkgs/applications/maui/mauikit-filebrowsing.nix
 delete mode 100644 pkgs/applications/maui/mauikit-imagetools.nix
 delete mode 100644 pkgs/applications/maui/mauikit-terminal.nix
 delete mode 100644 pkgs/applications/maui/mauikit-texteditor.nix
 delete mode 100644 pkgs/applications/maui/mauikit.nix
 delete mode 100644 pkgs/applications/maui/mauiman.nix
 delete mode 100644 pkgs/applications/maui/nota.nix
 delete mode 100644 pkgs/applications/maui/pix.nix
 delete mode 100644 pkgs/applications/maui/shelf.nix
 delete mode 100644 pkgs/applications/maui/srcs.nix
 delete mode 100644 pkgs/applications/maui/station.nix
 delete mode 100644 pkgs/applications/maui/vvave.nix

diff --git a/pkgs/applications/maui/booth.nix b/pkgs/applications/maui/booth.nix
deleted file mode 100644
index d38f4b47dfbb..000000000000
--- a/pkgs/applications/maui/booth.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  kcoreaddons,
-  ki18n,
-  kirigami2,
-  mauikit,
-  mauikit-filebrowsing,
-  prison,
-  qtgraphicaleffects,
-  qtmultimedia,
-  qtquickcontrols2,
-  gst_all_1,
-}:
-
-mkDerivation {
-  pname = "booth";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kcoreaddons
-    ki18n
-    kirigami2
-    mauikit
-    mauikit-filebrowsing
-    prison
-    qtgraphicaleffects
-    qtmultimedia
-    qtquickcontrols2
-  ]
-  ++ (with gst_all_1; [
-    gst-plugins-bad
-    gst-plugins-base
-    gst-plugins-good
-    gstreamer
-  ]);
-
-  preFixup = ''
-    qtWrapperArgs+=(
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
-    )
-  '';
-
-  meta = with lib; {
-    description = "Camera application";
-    mainProgram = "booth";
-    homepage = "https://invent.kde.org/maui/booth";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
-  };
-}
diff --git a/pkgs/applications/maui/buho.nix b/pkgs/applications/maui/buho.nix
deleted file mode 100644
index d207955ad4b9..000000000000
--- a/pkgs/applications/maui/buho.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  applet-window-buttons,
-  karchive,
-  kcoreaddons,
-  ki18n,
-  kio,
-  kirigami2,
-  mauikit,
-  mauikit-filebrowsing,
-  mauikit-accounts,
-  mauikit-texteditor,
-  qtmultimedia,
-  qtquickcontrols2,
-}:
-
-mkDerivation {
-  pname = "buho";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    applet-window-buttons
-    karchive
-    kcoreaddons
-    ki18n
-    kio
-    kirigami2
-    mauikit
-    mauikit-filebrowsing
-    mauikit-accounts
-    mauikit-texteditor
-    qtmultimedia
-    qtquickcontrols2
-  ];
-
-  meta = with lib; {
-    description = "Task and Note Keeper";
-    mainProgram = "buho";
-    homepage = "https://invent.kde.org/maui/buho";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ onny ];
-  };
-}
diff --git a/pkgs/applications/maui/clip.nix b/pkgs/applications/maui/clip.nix
deleted file mode 100644
index 901a798252b7..000000000000
--- a/pkgs/applications/maui/clip.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  applet-window-buttons,
-  karchive,
-  kcoreaddons,
-  ki18n,
-  kio,
-  kirigami2,
-  mauikit,
-  mauikit-filebrowsing,
-  qtmultimedia,
-  qtquickcontrols2,
-  taglib,
-  ffmpeg,
-}:
-
-mkDerivation {
-  pname = "clip";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    applet-window-buttons
-    karchive
-    kcoreaddons
-    ki18n
-    kio
-    kirigami2
-    mauikit
-    mauikit-filebrowsing
-    qtmultimedia
-    qtquickcontrols2
-    taglib
-    ffmpeg
-  ];
-
-  meta = with lib; {
-    description = "Video player and video collection manager";
-    mainProgram = "clip";
-    homepage = "https://invent.kde.org/maui/clip";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ onny ];
-  };
-}
diff --git a/pkgs/applications/maui/communicator.nix b/pkgs/applications/maui/communicator.nix
deleted file mode 100644
index c239a1c84296..000000000000
--- a/pkgs/applications/maui/communicator.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  applet-window-buttons,
-  karchive,
-  kcoreaddons,
-  ki18n,
-  kio,
-  kirigami2,
-  mauikit,
-  mauikit-accounts,
-  mauikit-filebrowsing,
-  mauikit-texteditor,
-  qtmultimedia,
-  qtquickcontrols2,
-  kpeople,
-  kcontacts,
-}:
-
-mkDerivation {
-  pname = "communicator";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace "/usr/share/maui-accounts/manifests" "$out/usr/share/maui-accounts/manifests"
-  '';
-
-  buildInputs = [
-    applet-window-buttons
-    karchive
-    kcoreaddons
-    ki18n
-    kio
-    kirigami2
-    mauikit
-    mauikit-accounts
-    mauikit-filebrowsing
-    mauikit-texteditor
-    qtmultimedia
-    qtquickcontrols2
-    kpeople
-    kcontacts
-  ];
-
-  meta = with lib; {
-    description = "Contacts and dialer application";
-    mainProgram = "communicator";
-    homepage = "https://invent.kde.org/maui/communicator";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ onny ];
-  };
-}
diff --git a/pkgs/applications/maui/default.nix b/pkgs/applications/maui/default.nix
deleted file mode 100644
index 6a4e20bd02a1..000000000000
--- a/pkgs/applications/maui/default.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-  # New packages
-
-  READ THIS FIRST
-
-  This module is for the MauiKit framework and official Maui applications. All
-  available packages are listed in `callPackage ./srcs.nix`, although some are not yet
-  packaged in Nixpkgs.
-
-  IF YOUR PACKAGE IS NOT LISTED IN `callPackage ./srcs.nix`, IT DOES NOT GO HERE.
-
-  See also `pkgs/applications/kde` as this is what this is based on.
-
-  # Updates
-
-  1. Update the URL in `./fetch.sh`.
-  2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui`
-     from the top of the Nixpkgs tree.
-  3. Use `nixpkgs-review wip` to check that everything builds.
-  4. Commit the changes and open a pull request.
-*/
-
-{
-  lib,
-  libsForQt5,
-  fetchurl,
-}:
-
-let
-  mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit fetchurl mirror; };
-
-  mkDerivation =
-    args:
-    let
-      inherit (args) pname;
-      inherit (srcs.${pname}) src version;
-      mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) { };
-    in
-    mkDerivation (
-      args
-      // {
-        inherit pname version src;
-
-        outputs = args.outputs or [ "out" ];
-
-        meta =
-          let
-            meta = args.meta or { };
-          in
-          meta
-          // {
-            homepage = meta.homepage or "https://mauikit.org/";
-            platforms = meta.platforms or lib.platforms.linux;
-          };
-      }
-    );
-
-  packages =
-    self:
-    let
-      callPackage = self.newScope {
-        inherit mkDerivation;
-      };
-    in
-    {
-      # libraries
-      mauikit = callPackage ./mauikit.nix { };
-      mauikit-accounts = callPackage ./mauikit-accounts.nix { };
-      mauikit-calendar = callPackage ./mauikit-calendar { };
-      mauikit-documents = callPackage ./mauikit-documents.nix { };
-      mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { };
-      mauikit-imagetools = callPackage ./mauikit-imagetools.nix { };
-      mauikit-terminal = callPackage ./mauikit-terminal.nix { };
-      mauikit-texteditor = callPackage ./mauikit-texteditor.nix { };
-      mauiman = callPackage ./mauiman.nix { };
-
-      # applications
-      booth = callPackage ./booth.nix { };
-      buho = callPackage ./buho.nix { };
-      clip = callPackage ./clip.nix { };
-      communicator = callPackage ./communicator.nix { };
-      index = callPackage ./index.nix { };
-      nota = callPackage ./nota.nix { };
-      pix = callPackage ./pix.nix { };
-      shelf = callPackage ./shelf.nix { };
-      station = callPackage ./station.nix { };
-      vvave = callPackage ./vvave.nix { };
-    };
-
-in
-lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/maui/fetch.sh b/pkgs/applications/maui/fetch.sh
deleted file mode 100644
index f84a2dc2c231..000000000000
--- a/pkgs/applications/maui/fetch.sh
+++ /dev/null
@@ -1 +0,0 @@
-WGET_ARGS=( https://download.kde.org/stable/maui/ -A '*.tar.xz' )
diff --git a/pkgs/applications/maui/index.nix b/pkgs/applications/maui/index.nix
deleted file mode 100644
index c16603490d18..000000000000
--- a/pkgs/applications/maui/index.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  karchive,
-  kcoreaddons,
-  ki18n,
-  kio,
-  kirigami2,
-  mauikit,
-  mauikit-filebrowsing,
-  qtmultimedia,
-  qtquickcontrols2,
-}:
-
-mkDerivation {
-  pname = "index-fm";
-
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace "-Werror" ""
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    karchive
-    kcoreaddons
-    ki18n
-    kio
-    kirigami2
-    mauikit
-    mauikit-filebrowsing
-    qtmultimedia
-    qtquickcontrols2
-  ];
-
-  meta = with lib; {
-    description = "Multi-platform file manager";
-    mainProgram = "index";
-    homepage = "https://invent.kde.org/maui/index-fm";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/applications/maui/mauikit-accounts.nix b/pkgs/applications/maui/mauikit-accounts.nix
deleted file mode 100644
index e04ab551f087..000000000000
--- a/pkgs/applications/maui/mauikit-accounts.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  kconfig,
-  kio,
-  mauikit,
-}:
-
-mkDerivation {
-  pname = "mauikit-accounts";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kconfig
-    kio
-    mauikit
-  ];
-
-  meta = with lib; {
-    homepage = "https://invent.kde.org/maui/mauikit-accounts";
-    description = "MauiKit utilities to handle User Accounts";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ onny ];
-  };
-}
diff --git a/pkgs/applications/maui/mauikit-calendar/default.nix b/pkgs/applications/maui/mauikit-calendar/default.nix
deleted file mode 100644
index 42aaff0f386c..000000000000
--- a/pkgs/applications/maui/mauikit-calendar/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  mauikit,
-  qtquickcontrols2,
-  akonadi,
-  akonadi-contacts,
-  akonadi-calendar,
-  calendarsupport,
-  eventviews,
-}:
-
-mkDerivation {
-  pname = "mauikit-calendar";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    akonadi
-    akonadi-contacts
-    akonadi-calendar
-    calendarsupport
-    eventviews
-    mauikit
-    qtquickcontrols2
-  ];
-
-  meta = with lib; {
-    homepage = "https://invent.kde.org/maui/mauikit-calendar";
-    description = "Calendar support components for Maui applications";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ onny ];
-  };
-}
diff --git a/pkgs/applications/maui/mauikit-documents.nix b/pkgs/applications/maui/mauikit-documents.nix
deleted file mode 100644
index 4ec7e6892bfb..000000000000
--- a/pkgs/applications/maui/mauikit-documents.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  karchive,
-  kconfig,
-  kcoreaddons,
-  kfilemetadata,
-  kguiaddons,
-  ki18n,
-  kiconthemes,
-  kio,
-  mauikit,
-  poppler,
-}:
-
-mkDerivation {
-  pname = "mauikit-documents";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    karchive
-    kconfig
-    kcoreaddons
-    kfilemetadata
-    kguiaddons
-    ki18n
-    kiconthemes
-    kio
-    mauikit
-    poppler
-  ];
-
-  meta = {
-    homepage = "https://invent.kde.org/maui/mauikit-documents";
-    description = "MauiKit QtQuick plugins for text editing";
-    license = with lib.licenses; [
-      bsd2
-      lgpl21Plus
-    ];
-    maintainers = with lib.maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/applications/maui/mauikit-filebrowsing.nix b/pkgs/applications/maui/mauikit-filebrowsing.nix
deleted file mode 100644
index 13a98b37e03b..000000000000
--- a/pkgs/applications/maui/mauikit-filebrowsing.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  kconfig,
-  kio,
-  mauikit,
-}:
-
-mkDerivation {
-  pname = "mauikit-filebrowsing";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kconfig
-    kio
-    mauikit
-  ];
-
-  meta = with lib; {
-    homepage = "https://invent.kde.org/maui/mauikit-filebrowsing";
-    description = "MauiKit File Browsing utilities and controls";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/applications/maui/mauikit-imagetools.nix b/pkgs/applications/maui/mauikit-imagetools.nix
deleted file mode 100644
index 8b96c55002fc..000000000000
--- a/pkgs/applications/maui/mauikit-imagetools.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  kconfig,
-  kio,
-  leptonica,
-  mauikit,
-  opencv,
-  qtlocation,
-  exiv2,
-  kquickimageedit,
-  tesseract,
-}:
-
-mkDerivation {
-  pname = "mauikit-imagetools";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kconfig
-    kio
-    leptonica
-    mauikit
-    opencv
-    qtlocation
-    exiv2
-    kquickimageedit
-    tesseract
-  ];
-
-  meta = with lib; {
-    homepage = "https://invent.kde.org/maui/mauikit-imagetools";
-    description = "MauiKit Image Tools Components";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ onny ];
-  };
-}
diff --git a/pkgs/applications/maui/mauikit-terminal.nix b/pkgs/applications/maui/mauikit-terminal.nix
deleted file mode 100644
index 905132a9d7a5..000000000000
--- a/pkgs/applications/maui/mauikit-terminal.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  kconfig,
-  kcoreaddons,
-  ki18n,
-  mauikit,
-}:
-
-mkDerivation {
-  pname = "mauikit-terminal";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kconfig
-    kcoreaddons
-    ki18n
-    mauikit
-  ];
-
-  meta = with lib; {
-    homepage = "https://invent.kde.org/maui/mauikit-terminal";
-    description = "Terminal support components for Maui applications";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/applications/maui/mauikit-texteditor.nix b/pkgs/applications/maui/mauikit-texteditor.nix
deleted file mode 100644
index c38ba401d060..000000000000
--- a/pkgs/applications/maui/mauikit-texteditor.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  kconfig,
-  kio,
-  mauikit,
-  syntax-highlighting,
-}:
-
-mkDerivation {
-  pname = "mauikit-texteditor";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kconfig
-    kio
-    mauikit
-    syntax-highlighting
-  ];
-
-  meta = with lib; {
-    homepage = "https://invent.kde.org/maui/mauikit-texteditor";
-    description = "MauiKit Text Editor components";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ onny ];
-  };
-}
diff --git a/pkgs/applications/maui/mauikit.nix b/pkgs/applications/maui/mauikit.nix
deleted file mode 100644
index 60b795604c83..000000000000
--- a/pkgs/applications/maui/mauikit.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  kconfig,
-  kcoreaddons,
-  ki18n,
-  knotifications,
-  mauiman,
-  qtquickcontrols2,
-  qtx11extras,
-}:
-
-mkDerivation {
-  pname = "mauikit";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kconfig
-    kcoreaddons
-    ki18n
-    knotifications
-    mauiman
-    qtquickcontrols2
-    qtx11extras
-  ];
-
-  meta = with lib; {
-    homepage = "https://mauikit.org/";
-    description = "Free and modular front-end framework for developing fast and compelling user experiences";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/applications/maui/mauiman.nix b/pkgs/applications/maui/mauiman.nix
deleted file mode 100644
index c90a02055450..000000000000
--- a/pkgs/applications/maui/mauiman.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  qtsystems,
-}:
-
-mkDerivation {
-  pname = "mauiman";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    qtsystems
-  ];
-
-  meta = with lib; {
-    homepage = "https://invent.kde.org/maui/mauiman";
-    description = "Maui Manager Library. Server and public library API";
-    mainProgram = "MauiManServer3";
-    maintainers = with maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/applications/maui/nota.nix b/pkgs/applications/maui/nota.nix
deleted file mode 100644
index 0c72106795fe..000000000000
--- a/pkgs/applications/maui/nota.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  applet-window-buttons,
-  karchive,
-  kcoreaddons,
-  ki18n,
-  kio,
-  kirigami2,
-  mauikit,
-  mauikit-filebrowsing,
-  mauikit-texteditor,
-  qtmultimedia,
-  qtquickcontrols2,
-}:
-
-mkDerivation {
-  pname = "nota";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    applet-window-buttons
-    karchive
-    kcoreaddons
-    ki18n
-    kio
-    kirigami2
-    mauikit
-    mauikit-filebrowsing
-    mauikit-texteditor
-    qtmultimedia
-    qtquickcontrols2
-  ];
-
-  meta = with lib; {
-    description = "Multi-platform text editor";
-    mainProgram = "nota";
-    homepage = "https://invent.kde.org/maui/nota";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ onny ];
-  };
-}
diff --git a/pkgs/applications/maui/pix.nix b/pkgs/applications/maui/pix.nix
deleted file mode 100644
index de57aaedbccf..000000000000
--- a/pkgs/applications/maui/pix.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  applet-window-buttons,
-  karchive,
-  kcoreaddons,
-  ki18n,
-  kio,
-  kirigami2,
-  mauikit,
-  mauikit-filebrowsing,
-  mauikit-imagetools,
-  qtmultimedia,
-  qtquickcontrols2,
-  qtlocation,
-  exiv2,
-  kquickimageedit,
-  fetchFromGitHub,
-}:
-
-let
-  src-kdtree = fetchFromGitHub {
-    owner = "cdalitz";
-    repo = "kdtree-cpp";
-    rev = "refs/tags/v1.3";
-    hash = "sha256-h3cmndvjMlp/MTk/Ve3R183BLrE7VbL7GQx8YkOHEgU=";
-  };
-in
-mkDerivation {
-  pname = "pix";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  postPatch = ''
-    cp ${src-kdtree}/kdtree.cpp src/
-    substituteInPlace src/CMakeLists.txt \
-      --replace-fail "main.cpp" "main.cpp kdtree.cpp"
-  '';
-
-  env = {
-    NIX_CFLAGS_COMPILE = toString [
-      "-I${src-kdtree}"
-    ];
-  };
-
-  buildInputs = [
-    applet-window-buttons
-    karchive
-    kcoreaddons
-    ki18n
-    kio
-    kirigami2
-    mauikit
-    mauikit-filebrowsing
-    mauikit-imagetools
-    qtmultimedia
-    qtquickcontrols2
-    qtlocation
-    exiv2
-    kquickimageedit
-  ];
-
-  meta = {
-    description = "Image gallery application";
-    mainProgram = "pix";
-    homepage = "https://invent.kde.org/maui/pix";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ onny ];
-  };
-}
diff --git a/pkgs/applications/maui/shelf.nix b/pkgs/applications/maui/shelf.nix
deleted file mode 100644
index e82c8afb6fe0..000000000000
--- a/pkgs/applications/maui/shelf.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  applet-window-buttons,
-  karchive,
-  kcoreaddons,
-  ki18n,
-  kio,
-  kirigami2,
-  mauikit,
-  mauikit-documents,
-  mauikit-filebrowsing,
-  mauikit-texteditor,
-  qtmultimedia,
-  qtquickcontrols2,
-  poppler,
-}:
-
-mkDerivation {
-  pname = "shelf";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    applet-window-buttons
-    karchive
-    kcoreaddons
-    ki18n
-    kio
-    kirigami2
-    mauikit
-    mauikit-documents
-    mauikit-filebrowsing
-    mauikit-texteditor
-    qtmultimedia
-    qtquickcontrols2
-    poppler
-  ];
-
-  meta = with lib; {
-    description = "Document and EBook collection manager";
-    mainProgram = "shelf";
-    homepage = "https://invent.kde.org/maui/shelf";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ onny ];
-  };
-}
diff --git a/pkgs/applications/maui/srcs.nix b/pkgs/applications/maui/srcs.nix
deleted file mode 100644
index 63d89ec6941d..000000000000
--- a/pkgs/applications/maui/srcs.nix
+++ /dev/null
@@ -1,206 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui
-{ fetchurl, mirror }:
-
-{
-  agenda = {
-    version = "0.5.3";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/agenda/0.5.3/agenda-0.5.3.tar.xz";
-      sha256 = "0kx5adv8w0dm84hibaazik6y9bcxw7w7zikw546d4dlaq13pk97i";
-      name = "agenda-0.5.3.tar.xz";
-    };
-  };
-  arca = {
-    version = "0.5.3";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/arca/0.5.3/arca-0.5.3.tar.xz";
-      sha256 = "0mgn3y2jh9ifxg41fb6z14gp27f1pwfk9y8492qfp3wqfhhmycmk";
-      name = "arca-0.5.3.tar.xz";
-    };
-  };
-  bonsai = {
-    version = "1.1.3";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/bonsai/1.1.3/bonsai-1.1.3.tar.xz";
-      sha256 = "0xyfqaihzjdbgcd0mg81qpd12w304zlhdw8mmiyqfamxh33xksql";
-      name = "bonsai-1.1.3.tar.xz";
-    };
-  };
-  booth = {
-    version = "1.1.3";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/booth/1.1.3/booth-1.1.3.tar.xz";
-      sha256 = "0l7bjlpm3m2wc528c6y5s5yf9rlxrl5h0c1lk9s90zzkmyhzpxrl";
-      name = "booth-1.1.3.tar.xz";
-    };
-  };
-  buho = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/buho/3.1.0/buho-3.1.0.tar.xz";
-      sha256 = "0pw8ljnhb3xsbsls6ynihvb5vargk13bija02s963kkbyvcrka0a";
-      name = "buho-3.1.0.tar.xz";
-    };
-  };
-  clip = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/clip/3.1.0/clip-3.1.0.tar.xz";
-      sha256 = "1pcka3z5ik5s9hv0np83f6g1fp1pgzq14h83k4l38wfcvbmnjngb";
-      name = "clip-3.1.0.tar.xz";
-    };
-  };
-  communicator = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/communicator/3.1.0/communicator-3.1.0.tar.xz";
-      sha256 = "0207jz891d8hs36ma51jbm9af53423lvfir41xmbw5k8j1wi925p";
-      name = "communicator-3.1.0.tar.xz";
-    };
-  };
-  era = {
-    version = "0.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/era/0.1.0/era-0.1.0.tar.xz";
-      sha256 = "0qllnpibkhrr52gsngrkzrxcaj68hngsaavdwkds3rbaq4a5by9g";
-      name = "era-0.1.0.tar.xz";
-    };
-  };
-  fiery = {
-    version = "1.1.3";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/fiery/1.1.3/fiery-1.1.3.tar.xz";
-      sha256 = "1wkvrp1b0y0b7mppwymxmlfrbczxqgxaws10y2001mdxryjf160b";
-      name = "fiery-1.1.3.tar.xz";
-    };
-  };
-  index-fm = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/index/3.1.0/index-fm-3.1.0.tar.xz";
-      sha256 = "13pvx4rildnc0yqb3km9r9spd2wf6vwayfh0i6bai2vfklv405yg";
-      name = "index-fm-3.1.0.tar.xz";
-    };
-  };
-  mauikit = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit/3.1.0/mauikit-3.1.0.tar.xz";
-      sha256 = "1v7nas1mdkpfyz6580y1z1rk3ad0azh047y19bjy0rrpp75iclmz";
-      name = "mauikit-3.1.0.tar.xz";
-    };
-  };
-  mauikit-accounts = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit-accounts/3.1.0/mauikit-accounts-3.1.0.tar.xz";
-      sha256 = "0blzmjdv4cs2m4967mksj0pxpd1gvgjpkgwbwkhya36qc443yfya";
-      name = "mauikit-accounts-3.1.0.tar.xz";
-    };
-  };
-  mauikit-calendar = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit-calendar/3.1.0/mauikit-calendar-3.1.0.tar.xz";
-      sha256 = "13hf6z99ibly4cbaf4n4r54qc2vcbmf8i8qjndf35z6kxjc4iwpd";
-      name = "mauikit-calendar-3.1.0.tar.xz";
-    };
-  };
-  mauikit-documents = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit-documents/3.1.0/mauikit-documents-3.1.0.tar.xz";
-      sha256 = "1v1hbzb84rkva5icmynh87h979xgv8a8da6pfzlf1y7h6syw1wf4";
-      name = "mauikit-documents-3.1.0.tar.xz";
-    };
-  };
-  mauikit-filebrowsing = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit-filebrowsing/3.1.0/mauikit-filebrowsing-3.1.0.tar.xz";
-      sha256 = "146iflqb4kq25f1azajlbwlbphbk754vvf6w7fzl75pdwhqsbxvp";
-      name = "mauikit-filebrowsing-3.1.0.tar.xz";
-    };
-  };
-  mauikit-imagetools = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit-imagetools/3.1.0/mauikit-imagetools-3.1.0.tar.xz";
-      sha256 = "1r7j9lg19s63325xyz6i8hzfn751s14mlpxym533mpzpx6yg784q";
-      name = "mauikit-imagetools-3.1.0.tar.xz";
-    };
-  };
-  mauikit-terminal = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit-terminal/3.1.0/mauikit-terminal-3.1.0.tar.xz";
-      sha256 = "0q2d8lxzhmncassnl043vrgz9am25yk060v7l7bwm6fp9vv5ix5f";
-      name = "mauikit-terminal-3.1.0.tar.xz";
-    };
-  };
-  mauikit-texteditor = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit-texteditor/3.1.0/mauikit-texteditor-3.1.0.tar.xz";
-      sha256 = "0fsjqfvg2fnfmrsz9hfcw20l5yv0pi5jiww2aqyqqpy09q7jxphv";
-      name = "mauikit-texteditor-3.1.0.tar.xz";
-    };
-  };
-  mauiman = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/mauiman/3.1.0/mauiman-3.1.0.tar.xz";
-      sha256 = "1462j8xbla6jra3qpxgp5hi580lk53a6ry4fzmllqpzprwgiyx2w";
-      name = "mauiman-3.1.0.tar.xz";
-    };
-  };
-  nota = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/nota/3.1.0/nota-3.1.0.tar.xz";
-      sha256 = "0x9xaas86rhbqs7wsc7chxc4iijg73wnzj2125dgdwcridmdfxix";
-      name = "nota-3.1.0.tar.xz";
-    };
-  };
-  pix = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/pix/3.1.0/pix-3.1.0.tar.xz";
-      sha256 = "0j3xwdscjqyisv5zn8pb0mqarpfkknz3wxgzd7yl2g1gxdpl502h";
-      name = "pix-3.1.0.tar.xz";
-    };
-  };
-  shelf = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/shelf/3.1.0/shelf-3.1.0.tar.xz";
-      sha256 = "166l6f5ifv5yz3sgds50bi9swdr3zl7m499myy5x8ph2jw1i2dvq";
-      name = "shelf-3.1.0.tar.xz";
-    };
-  };
-  station = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/station/3.1.0/station-3.1.0.tar.xz";
-      sha256 = "0skwagzwd4v24ldrww727zs3chzfb1spbynzdjb0yc7pggzxn8nf";
-      name = "station-3.1.0.tar.xz";
-    };
-  };
-  strike = {
-    version = "1.1.3";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/strike/1.1.3/strike-1.1.3.tar.xz";
-      sha256 = "1b0n56mfchcf37j33i3kxp3pd9sc2f1fq5hjfhy1s34dk8gfv947";
-      name = "strike-1.1.3.tar.xz";
-    };
-  };
-  vvave = {
-    version = "3.1.0";
-    src = fetchurl {
-      url = "${mirror}/stable/maui/vvave/3.1.0/vvave-3.1.0.tar.xz";
-      sha256 = "1ig6vzrqrq4h8y69xm6hxppzspa4vrawpn4rk6rva26j5qm7dh1l";
-      name = "vvave-3.1.0.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/applications/maui/station.nix b/pkgs/applications/maui/station.nix
deleted file mode 100644
index 6389576a125c..000000000000
--- a/pkgs/applications/maui/station.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  kconfig,
-  kcoreaddons,
-  ki18n,
-  kirigami2,
-  mauikit,
-  mauikit-filebrowsing,
-  mauikit-terminal,
-  qmltermwidget,
-  qtmultimedia,
-}:
-
-mkDerivation {
-  pname = "station";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kconfig
-    kcoreaddons
-    ki18n
-    kirigami2
-    mauikit
-    mauikit-filebrowsing
-    mauikit-terminal
-    qmltermwidget
-    qtmultimedia
-  ];
-
-  meta = with lib; {
-    description = "Convergent terminal emulator";
-    mainProgram = "station";
-    homepage = "https://invent.kde.org/maui/station";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ onny ];
-  };
-}
diff --git a/pkgs/applications/maui/vvave.nix b/pkgs/applications/maui/vvave.nix
deleted file mode 100644
index d30a747a87e5..000000000000
--- a/pkgs/applications/maui/vvave.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  applet-window-buttons,
-  karchive,
-  kcoreaddons,
-  ki18n,
-  kio,
-  kirigami2,
-  mauikit,
-  mauikit-accounts,
-  mauikit-filebrowsing,
-  qtmultimedia,
-  qtquickcontrols2,
-  taglib,
-}:
-
-mkDerivation {
-  pname = "vvave";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    applet-window-buttons
-    karchive
-    kcoreaddons
-    ki18n
-    kio
-    kirigami2
-    mauikit
-    mauikit-accounts
-    mauikit-filebrowsing
-    qtmultimedia
-    qtquickcontrols2
-    taglib
-  ];
-
-  meta = with lib; {
-    description = "Multi-platform media player";
-    mainProgram = "vvave";
-    homepage = "https://invent.kde.org/maui/vvave";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ onny ];
-  };
-}
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index c9486eacd3eb..31659dc93ad8 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -70,16 +70,6 @@ makeScopeWithSplicing' {
         in
         (lib.makeOverridable mkPlamoGear attrs);
 
-      mauiPackages =
-        let
-          mkMaui = import ../applications/maui;
-          attrs = {
-            inherit libsForQt5;
-            inherit (pkgs) lib fetchurl;
-          };
-        in
-        (lib.makeOverridable mkMaui attrs);
-
       noExtraAttrs =
         set:
         lib.attrsets.removeAttrs set [
@@ -96,7 +86,6 @@ makeScopeWithSplicing' {
       // plasma5
       // plasma5.thirdParty
       // kdeGear
-      // mauiPackages
       // qt5
       // {
 
@@ -105,7 +94,6 @@ makeScopeWithSplicing' {
           plasmaMobileGear
           plasma5
           kdeGear
-          mauiPackages
           qt5
           ;
 

From dd94d15f938795853d60e442d7f695920d4c3842 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2554/3724] applet-window-buttons: drop

Not ported to Plasma 6.
---
 .../applet-window-buttons/default.nix         | 51 -------------------
 pkgs/top-level/qt5-packages.nix               |  2 -
 2 files changed, 53 deletions(-)
 delete mode 100644 pkgs/development/libraries/applet-window-buttons/default.nix

diff --git a/pkgs/development/libraries/applet-window-buttons/default.nix b/pkgs/development/libraries/applet-window-buttons/default.nix
deleted file mode 100644
index ed67ddd197af..000000000000
--- a/pkgs/development/libraries/applet-window-buttons/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchFromGitHub,
-  fetchpatch,
-  cmake,
-  extra-cmake-modules,
-  kcoreaddons,
-  kdeclarative,
-  kdecoration,
-  plasma-framework,
-}:
-
-mkDerivation rec {
-  pname = "applet-window-buttons";
-  version = "0.11.1";
-
-  src = fetchFromGitHub {
-    owner = "psifidotos";
-    repo = "applet-window-buttons";
-    rev = version;
-    hash = "sha256-Qww/22bEmjuq+R3o0UDcS6U+34qjaeSEy+g681/hcfE=";
-  };
-
-  patches = [
-    # FIXME: cherry-pick Plasma 5.27 build fix, remove for next release
-    (fetchpatch {
-      url = "https://github.com/psifidotos/applet-window-buttons/commit/924994e10402921bf22fefc099bca2914989081c.diff";
-      hash = "sha256-4ErqmkIbkvKwns50LhI8Et1EMyvrXYcNRL1rXCxau2w=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kcoreaddons
-    kdeclarative
-    kdecoration
-    plasma-framework
-  ];
-
-  meta = with lib; {
-    description = "Plasma 5 applet in order to show window buttons in your panels";
-    homepage = "https://github.com/psifidotos/applet-window-buttons";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 31659dc93ad8..39b52bc9257a 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -106,8 +106,6 @@ makeScopeWithSplicing' {
 
         accounts-qt = callPackage ../development/libraries/accounts-qt { };
 
-        applet-window-buttons = callPackage ../development/libraries/applet-window-buttons { };
-
         appstream-qt = callPackage ../development/libraries/appstream/qt.nix { };
 
         dxflib = callPackage ../development/libraries/dxflib { };

From 96e751adaf2f25ec90275a1b59942dc2bdc0e316 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:34 +0300
Subject: [PATCH 2555/3724] linuxPackages.deepin-anything-module: drop

The rest of Deepin will also be dropped.
---
 .../linux/deepin-anything-module/default.nix  | 29 -------------------
 pkgs/top-level/linux-kernels.nix              |  2 --
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/deepin-anything-module/default.nix

diff --git a/pkgs/os-specific/linux/deepin-anything-module/default.nix b/pkgs/os-specific/linux/deepin-anything-module/default.nix
deleted file mode 100644
index 416260f3a6e6..000000000000
--- a/pkgs/os-specific/linux/deepin-anything-module/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  stdenv,
-  deepin,
-  kernel,
-}:
-
-stdenv.mkDerivation {
-  pname = "deepin-anything-module";
-  inherit (deepin.deepin-anything) version src;
-  sourceRoot = "${deepin.deepin-anything.src.name}/src/kernelmod";
-
-  nativeBuildInputs = kernel.moduleBuildDependencies;
-
-  buildPhase = ''
-    runHook preBuild
-    make kdir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    install -D -t $out/lib/modules/${kernel.modDirVersion}/extra *.ko
-    runHook postInstall
-  '';
-
-  meta = deepin.deepin-anything.meta // {
-    description = "Deepin Anything file search tool (kernel modules)";
-  };
-}
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 05e6ff2ef64d..8e87e80b1a65 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -395,8 +395,6 @@ in
 
         cpupower = callPackage ../os-specific/linux/cpupower { };
 
-        deepin-anything-module = callPackage ../os-specific/linux/deepin-anything-module { };
-
         ddcci-driver = callPackage ../os-specific/linux/ddcci { };
 
         dddvb = callPackage ../os-specific/linux/dddvb { };

From 25303238b95d1eef8109aa76f8de084bf8eeb178 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:39:37 +0300
Subject: [PATCH 2556/3724] deepin: drop

---
 .../deepin/apps/deepin-calculator/default.nix |  54 ----
 .../deepin/apps/deepin-compressor/default.nix |  71 -----
 .../deepin/apps/deepin-draw/default.nix       |  56 ----
 .../deepin/apps/deepin-editor/default.nix     |  63 -----
 .../deepin/apps/deepin-music/default.nix      |  82 ------
 .../deepin/apps/deepin-picker/default.nix     |  57 ----
 .../0001-build-tests-with-cpp-14.patch        |  13 -
 .../deepin/apps/deepin-reader/default.nix     |  72 ------
 .../apps/deepin-screensaver/default.nix       |  65 -----
 .../apps/deepin-shortcut-viewer/default.nix   |  50 ----
 .../apps/deepin-system-monitor/default.nix    |  98 -------
 .../deepin/apps/deepin-terminal/default.nix   |  61 -----
 .../artwork/dde-account-faces/default.nix     |  30 ---
 .../artwork/deepin-desktop-theme/default.nix  |  61 -----
 .../artwork/deepin-gtk-theme/default.nix      |  30 ---
 .../artwork/deepin-icon-theme/default.nix     |  50 ----
 .../artwork/deepin-sound-theme/default.nix    |  27 --
 .../artwork/deepin-wallpapers/default.nix     |  47 ----
 .../deepin/core/dde-api-proxy/default.nix     |  51 ----
 .../deepin/core/dde-app-services/default.nix  |  70 -----
 .../deepin/core/dde-appearance/default.nix    |  76 ------
 .../core/dde-application-manager/default.nix  |  41 ---
 .../deepin/core/dde-calendar/default.nix      |  66 -----
 .../fix-wrapped-name-not-in-whitelist.diff    |  13 -
 .../deepin/core/dde-clipboard/default.nix     |  54 ----
 .../core/dde-control-center/default.nix       |  89 -------
 .../deepin/core/dde-file-manager/default.nix  | 155 -----------
 .../patch_check_v23_interface.diff            |  13 -
 .../deepin/core/dde-grand-search/default.nix  |  82 ------
 .../fix-dbus-path-for-daemon.diff             |   9 -
 .../core/dde-gsettings-schemas/default.nix    |  49 ----
 .../deepin/core/dde-launchpad/default.nix     |  55 ----
 .../deepin/core/dde-network-core/default.nix  |  55 ----
 .../deepin/core/dde-polkit-agent/default.nix  |  51 ----
 .../deepin/core/dde-session-shell/default.nix | 111 --------
 .../deepin/core/dde-session-ui/default.nix    |  72 ------
 .../deepin/core/dde-session/default.nix       |  72 ------
 .../deepin/core/dde-shell/default.nix         | 106 --------
 .../core/dde-shell/fix-path-for-nixos.diff    |  17 --
 .../deepin/core/dde-tray-loader/default.nix   |  69 -----
 .../deepin/core/dde-widgets/default.nix       |  48 ----
 .../0001-hardcode-fallback-background.diff    |  15 --
 .../deepin/core/deepin-kwin/default.nix       |  98 -------
 .../core/deepin-service-manager/default.nix   |  41 ---
 .../core/dpa-ext-gnomekeyring/default.nix     |  51 ----
 pkgs/desktops/deepin/default.nix              | 121 ---------
 .../deepin/go-package/dde-api/default.nix     | 100 -------
 .../dde-daemon/0001-dont-set-PATH.diff        |  15 --
 .../0002-fix-custom-wallpapers-path.diff      |  25 --
 .../0003-aviod-use-hardcode-path.diff         |  92 -------
 .../deepin/go-package/dde-daemon/default.nix  | 165 ------------
 .../deepin-desktop-schemas/default.nix        |  57 ----
 .../go-package/deepin-pw-check/default.nix    |  74 ------
 .../deepin/go-package/startdde/default.nix    |  82 ------
 .../library/dde-qt-dbus-factory/default.nix   |  51 ----
 .../deepin/library/deepin-pdfium/default.nix  |  49 ----
 .../deepin-wayland-protocols/default.nix      |  32 ---
 .../deepin/library/disomaster/default.nix     |  39 ---
 .../deepin/library/docparser/default.nix      |  51 ----
 .../deepin/library/dtk6core/default.nix       |  98 -------
 .../library/dtk6core/fix-pkgconfig-path.patch |  14 -
 .../library/dtk6core/fix-pri-path.patch       |  17 --
 .../library/dtk6declarative/default.nix       |  76 ------
 .../dtk6declarative/fix-pkgconfig-path.patch  |  14 -
 .../dtk6declarative/fix-pri-path.patch        |  15 --
 .../deepin/library/dtk6gui/default.nix        |  93 -------
 .../library/dtk6gui/fix-pkgconfig-path.patch  |  16 --
 .../deepin/library/dtk6gui/fix-pri-path.patch |  17 --
 .../deepin/library/dtk6log/default.nix        |  61 -----
 .../library/dtk6systemsettings/default.nix    |  67 -----
 .../deepin/library/dtk6widget/default.nix     |  94 -------
 .../dtk6widget/fix-pkgconfig-path.patch       |  14 -
 .../library/dtk6widget/fix-pri-path.patch     |  17 --
 .../deepin/library/dtkcommon/default.nix      |  30 ---
 .../deepin/library/dtkcore/default.nix        |  95 -------
 .../library/dtkcore/fix-pkgconfig-path.patch  |  14 -
 .../deepin/library/dtkcore/fix-pri-path.patch |  17 --
 .../deepin/library/dtkdeclarative/default.nix |  73 ------
 .../dtkdeclarative/fix-pkgconfig-path.patch   |  14 -
 .../library/dtkdeclarative/fix-pri-path.patch |  15 --
 .../deepin/library/dtkgui/default.nix         |  86 -------
 .../library/dtkgui/fix-pkgconfig-path.patch   |  16 --
 .../deepin/library/dtkgui/fix-pri-path.patch  |  17 --
 .../deepin/library/dtklog/default.nix         |  51 ----
 .../deepin/library/dtkwidget/default.nix      |  91 -------
 .../dtkwidget/fix-pkgconfig-path.patch        |  14 -
 .../library/dtkwidget/fix-pri-path.patch      |  17 --
 .../deepin/library/dwayland/default.nix       |  54 ----
 .../deepin/library/gio-qt/default.nix         |  62 -----
 .../deepin/library/qt5integration/default.nix |  55 ----
 .../library/qt5platform-plugins/default.nix   |  60 -----
 .../deepin/library/qt6integration/default.nix |  62 -----
 .../deepin/library/qt6mpris/default.nix       |  46 ----
 .../library/qt6platform-plugins/default.nix   |  55 ----
 .../library/treeland-protocols/default.nix    |  34 ---
 .../deepin/library/udisks2-qt5/default.nix    |  38 ---
 .../deepin/library/util-dfm/default.nix       |  54 ----
 .../misc/deepin-desktop-base/default.nix      |  50 ----
 .../distribution_logo_transparent.svg         | 243 ------------------
 .../tools/dde-device-formatter/default.nix    |  59 -----
 .../deepin/tools/deepin-anything/default.nix  |  56 ----
 .../tools/deepin-gettext-tools/default.nix    |  49 ----
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 -
 pkgs/top-level/linux-kernels.nix              |   1 +
 105 files changed, 2 insertions(+), 5711 deletions(-)
 delete mode 100644 pkgs/desktops/deepin/apps/deepin-calculator/default.nix
 delete mode 100644 pkgs/desktops/deepin/apps/deepin-compressor/default.nix
 delete mode 100644 pkgs/desktops/deepin/apps/deepin-draw/default.nix
 delete mode 100644 pkgs/desktops/deepin/apps/deepin-editor/default.nix
 delete mode 100644 pkgs/desktops/deepin/apps/deepin-music/default.nix
 delete mode 100644 pkgs/desktops/deepin/apps/deepin-picker/default.nix
 delete mode 100644 pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch
 delete mode 100644 pkgs/desktops/deepin/apps/deepin-reader/default.nix
 delete mode 100644 pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
 delete mode 100644 pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
 delete mode 100644 pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
 delete mode 100644 pkgs/desktops/deepin/apps/deepin-terminal/default.nix
 delete mode 100644 pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
 delete mode 100644 pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
 delete mode 100644 pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix
 delete mode 100644 pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
 delete mode 100644 pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix
 delete mode 100644 pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-api-proxy/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-app-services/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-appearance/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-application-manager/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-calendar/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff
 delete mode 100644 pkgs/desktops/deepin/core/dde-clipboard/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-control-center/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-file-manager/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff
 delete mode 100644 pkgs/desktops/deepin/core/dde-grand-search/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff
 delete mode 100644 pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-launchpad/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-network-core/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-session-shell/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-session-ui/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-session/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-shell/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff
 delete mode 100644 pkgs/desktops/deepin/core/dde-tray-loader/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dde-widgets/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff
 delete mode 100644 pkgs/desktops/deepin/core/deepin-kwin/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/deepin-service-manager/default.nix
 delete mode 100644 pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
 delete mode 100644 pkgs/desktops/deepin/default.nix
 delete mode 100644 pkgs/desktops/deepin/go-package/dde-api/default.nix
 delete mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/0001-dont-set-PATH.diff
 delete mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/0002-fix-custom-wallpapers-path.diff
 delete mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/0003-aviod-use-hardcode-path.diff
 delete mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/default.nix
 delete mode 100644 pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
 delete mode 100644 pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
 delete mode 100644 pkgs/desktops/deepin/go-package/startdde/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/deepin-pdfium/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/disomaster/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/docparser/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/dtk6core/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtk6declarative/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtk6gui/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtk6log/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/dtk6systemsettings/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/dtk6widget/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtkcommon/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/dtkcore/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/dtkcore/fix-pkgconfig-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtkcore/fix-pri-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtkdeclarative/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/dtkdeclarative/fix-pkgconfig-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtkdeclarative/fix-pri-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtkgui/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/dtkgui/fix-pkgconfig-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtkgui/fix-pri-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtklog/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/dtkwidget/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/dtkwidget/fix-pkgconfig-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dtkwidget/fix-pri-path.patch
 delete mode 100644 pkgs/desktops/deepin/library/dwayland/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/gio-qt/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/qt5integration/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/qt6integration/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/qt6mpris/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/treeland-protocols/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/udisks2-qt5/default.nix
 delete mode 100644 pkgs/desktops/deepin/library/util-dfm/default.nix
 delete mode 100644 pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
 delete mode 100644 pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg
 delete mode 100644 pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
 delete mode 100644 pkgs/desktops/deepin/tools/deepin-anything/default.nix
 delete mode 100644 pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix

diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
deleted file mode 100644
index b3df5e8e6837..000000000000
--- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  dtk6widget,
-  qt6integration,
-  qt6platform-plugins,
-  qt6Packages,
-  cmake,
-  pkg-config,
-  gtest,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-calculator";
-  version = "6.5.7";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-p3tEUIM7rxYUVLl7ZaEm20IZWRMNi12AIj9mQe6iB5I=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    qt6Packages.qttools
-    pkg-config
-    qt6Packages.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    dtk6widget
-    qt6integration
-    qt6platform-plugins
-    qt6Packages.qtbase
-    qt6Packages.qtsvg
-    gtest
-  ];
-
-  # qtsvg can't not be found with strictDeps
-  strictDeps = false;
-
-  cmakeFlags = [ "-DVERSION=${version}" ];
-
-  meta = {
-    description = "Easy to use calculator for ordinary users";
-    mainProgram = "deepin-calculator";
-    homepage = "https://github.com/linuxdeepin/deepin-calculator";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix
deleted file mode 100644
index 4fb62057f649..000000000000
--- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-  udisks2-qt5,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  minizip,
-  libzip,
-  libuuid,
-  libarchive,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-compressor";
-  version = "6.0.1";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-DUpYb1xNmWpBcKo9kajeVm/+z4yj2OBE+qOyEkCHbUI=";
-  };
-
-  postPatch = ''
-    substituteInPlace src/source/common/pluginmanager.cpp \
-      --replace-fail "/usr/lib" "$out/lib"
-    substituteInPlace src/desktop/deepin-compressor.desktop \
-      --replace-fail "/usr" "$out"
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    libsForQt5.qttools
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    dtkwidget
-    qt5integration
-    qt5platform-plugins
-    udisks2-qt5
-    libsForQt5.kcodecs
-    libsForQt5.karchive
-    minizip
-    libzip
-    libuuid
-    libarchive
-  ];
-
-  cmakeFlags = [
-    "-DVERSION=${version}"
-    "-DUSE_TEST=OFF"
-  ];
-
-  strictDeps = true;
-
-  meta = with lib; {
-    description = "Fast and lightweight application for creating and extracting archives";
-    mainProgram = "deepin-compressor";
-    homepage = "https://github.com/linuxdeepin/deepin-compressor";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
deleted file mode 100644
index 87e3e2221b2d..000000000000
--- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-draw";
-  version = "7.0.2";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-WeubXsshN4tUlIwEHTxHXv1L2dvJ2DZ6qtSPyiVtc98=";
-  };
-
-  postPatch = ''
-    substituteInPlace com.deepin.Draw.service \
-      --replace "/usr/bin/deepin-draw" "$out/bin/deepin-draw"
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    libsForQt5.qttools
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    libsForQt5.qtbase
-    qt5integration
-    libsForQt5.qtsvg
-    dtkwidget
-    qt5platform-plugins
-  ];
-
-  cmakeFlags = [ "-DVERSION=${version}" ];
-
-  strictDeps = true;
-
-  meta = {
-    description = "Lightweight drawing tool for users to freely draw and simply edit images";
-    mainProgram = "deepin-draw";
-    homepage = "https://github.com/linuxdeepin/deepin-draw";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix
deleted file mode 100644
index 6c8a108b60a8..000000000000
--- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-  dde-qt-dbus-factory,
-  libchardet,
-  libuchardet,
-  libiconv,
-  libsForQt5,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-editor";
-  version = "6.5.15";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-aMxEESZ/noGtEDpQZz1asR0M+wnAfQT1FXLaQB6B0Zs=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.qttools
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    dtkwidget
-    qt5integration
-    qt5platform-plugins
-    libsForQt5.qtbase
-    libsForQt5.qtsvg
-    dde-qt-dbus-factory
-    libsForQt5.kcodecs
-    libsForQt5.syntax-highlighting
-    libchardet
-    libuchardet
-    libiconv
-  ];
-
-  strictDeps = true;
-
-  cmakeFlags = [ "-DVERSION=${version}" ];
-
-  # Fix build with icu4c: "error: parameter declared 'auto'"
-  env.NIX_CFLAGS_COMPILE = toString [ "--std=c++17" ];
-
-  meta = {
-    description = "Desktop text editor that supports common text editing features";
-    homepage = "https://github.com/linuxdeepin/deepin-editor";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix
deleted file mode 100644
index 1eeb0eb03bed..000000000000
--- a/pkgs/desktops/deepin/apps/deepin-music/default.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  dtk6widget,
-  dtk6declarative,
-  qt6integration,
-  qt6platform-plugins,
-  qt6mpris,
-  ffmpeg_6,
-  libvlc,
-  qt6Packages,
-  taglib_1,
-  SDL2,
-  gst_all_1,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-music";
-  version = "7.0.9";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-tj0XICmp7sM2m6aSf/DgxS7JXO3Wy/83sZIPGV17gFo=";
-  };
-
-  patches = [ "${src}/patches/fix-library-path.patch" ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    qt6Packages.qttools
-    qt6Packages.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    dtk6widget
-    dtk6declarative
-    qt6integration
-    qt6platform-plugins
-    qt6mpris
-    qt6Packages.qtbase
-    qt6Packages.qt5compat
-    qt6Packages.qtmultimedia
-    ffmpeg_6
-    libvlc
-    taglib_1
-    SDL2
-  ]
-  ++ (with gst_all_1; [
-    gstreamer
-    gst-plugins-base
-    gst-plugins-good
-  ]);
-
-  cmakeFlags = [ "-DVERSION=${version}" ];
-
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-I${libvlc}/include/vlc/plugins"
-    "-I${libvlc}/include/vlc"
-  ];
-
-  # qtmultimedia can't not be found with strictDeps
-  strictDeps = false;
-
-  preFixup = ''
-    qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
-  '';
-
-  meta = {
-    description = "Awesome music player with brilliant and tweakful UI Deepin-UI based";
-    mainProgram = "deepin-music";
-    homepage = "https://github.com/linuxdeepin/deepin-music";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/apps/deepin-picker/default.nix b/pkgs/desktops/deepin/apps/deepin-picker/default.nix
deleted file mode 100644
index f69914782a1c..000000000000
--- a/pkgs/desktops/deepin/apps/deepin-picker/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  pkg-config,
-  qt6Packages,
-  dtk6widget,
-  xorg,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-picker";
-  version = "6.0.4";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-TeUhDEldte5PJJe1l0q4wUTnnaXY052YP1JAhpLz/sA=";
-  };
-
-  nativeBuildInputs = [
-    qt6Packages.qmake
-    qt6Packages.qttools
-    pkg-config
-    qt6Packages.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    qt6Packages.qtbase
-    dtk6widget
-    qt6Packages.qtsvg
-    xorg.libXtst
-  ];
-
-  postPatch = ''
-    substituteInPlace com.deepin.Picker.service \
-      --replace "/usr/bin/deepin-picker" "$out/bin/deepin-picker"
-  '';
-
-  qmakeFlags = [
-    "BINDIR=${placeholder "out"}/bin"
-    "ICONDIR=${placeholder "out"}/share/icons/hicolor/scalable/apps"
-    "APPDIR=${placeholder "out"}/share/applications"
-    "DSRDIR=${placeholder "out"}/share/deepin-picker"
-    "DOCDIR=${placeholder "out"}/share/dman/deepin-picker"
-  ];
-
-  meta = {
-    description = "Color picker application";
-    mainProgram = "deepin-picker";
-    homepage = "https://github.com/linuxdeepin/deepin-picker";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch b/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch
deleted file mode 100644
index cf88eb6db074..000000000000
--- a/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/tests.pro b/tests/tests2.pro
-index 314cad227646..48f1c66ee3f7 100644
---- a/tests/tests.pro
-+++ b/tests/tests.pro
-@@ -6,7 +6,7 @@ QT += core gui sql printsupport dbus testlib widgets
- #QMAKE_CXXFLAGS += -g -fsanitize=undefined,address -O2
- #QMAKE_LFLAGS += -g -fsanitize=undefined,address -O2
- 
--CONFIG += c++11 link_pkgconfig resources_big testcase no_testcase_installs
-+CONFIG += c++14 link_pkgconfig resources_big testcase no_testcase_installs
- 
- #访问私有方法 -fno-access-control
- QMAKE_CXXFLAGS += -g -Wall -fprofile-arcs -ftest-coverage -fno-access-control -O0 -fno-inline
diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix
deleted file mode 100644
index d9b50da42a19..000000000000
--- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  pkg-config,
-  libsForQt5,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-  dde-qt-dbus-factory,
-  poppler,
-  libchardet,
-  libspectre,
-  openjpeg,
-  djvulibre,
-  gtest,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-reader";
-  version = "6.0.5";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-G5UZ8lBrUo5G3jMae70p/zi9kOVqHWMNCedOy45L1PA=";
-  };
-
-  patches = [ ./0001-build-tests-with-cpp-14.patch ];
-
-  # don't use vendored htmltopdf
-  postPatch = ''
-    substituteInPlace deepin_reader.pro \
-      --replace "SUBDIRS += htmltopdf" " "
-    substituteInPlace reader/document/Model.cpp \
-      --replace "/usr/lib/deepin-reader/htmltopdf" "htmltopdf"
-  '';
-
-  nativeBuildInputs = [
-    libsForQt5.qmake
-    pkg-config
-    libsForQt5.qttools
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    dtkwidget
-    qt5integration
-    qt5platform-plugins
-    dde-qt-dbus-factory
-    libsForQt5.qtwebengine
-    libsForQt5.karchive
-    poppler
-    libchardet
-    libspectre
-    djvulibre
-    openjpeg
-    gtest
-  ];
-
-  qmakeFlags = [ "DEFINES+=VERSION=${version}" ];
-
-  meta = with lib; {
-    description = "Simple memo software with texts and voice recordings";
-    mainProgram = "deepin-reader";
-    homepage = "https://github.com/linuxdeepin/deepin-reader";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
deleted file mode 100644
index 8162fef12ae5..000000000000
--- a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  pkg-config,
-  libsForQt5,
-  dtkwidget,
-  dde-qt-dbus-factory,
-  xorg,
-  xscreensaver,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-screensaver";
-  version = "5.0.18";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-7lyHPE/x7rmwh7FtCPkuA8JgYpy90jRXhUWoaeZpVag=";
-  };
-
-  postPatch = ''
-    patchShebangs {src,customscreensaver/deepin-custom-screensaver}/{generate_translations.sh,update_translations.sh}
-
-    substituteInPlace src/{dbusscreensaver.cpp,com.deepin.ScreenSaver.service,src.pro} \
-      customscreensaver/deepin-custom-screensaver/deepin-custom-screensaver.pro \
-      --replace "/usr" "$out" \
-      --replace "/etc" "$out/etc"
-
-    substituteInPlace tools/preview/main.cpp \
-      --replace "/usr/lib/xscreensaver" "${xscreensaver}/libexec/xscreensaver"
-  '';
-
-  nativeBuildInputs = [
-    libsForQt5.qmake
-    libsForQt5.qttools
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qtx11extras
-    libsForQt5.qtdeclarative
-    dtkwidget
-    dde-qt-dbus-factory
-    xorg.libXScrnSaver
-  ];
-
-  qmakeFlags = [
-    "XSCREENSAVER_DATA_PATH=${xscreensaver}/libexec/xscreensaver"
-    "COMPILE_ON_V23=true"
-  ];
-
-  meta = with lib; {
-    description = "Screensaver service developed by deepin";
-    mainProgram = "deepin-screensaver";
-    homepage = "https://github.com/linuxdeepin/deepin-screensaver";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
deleted file mode 100644
index 5a1b6123352c..000000000000
--- a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-  pkg-config,
-  libsForQt5,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-shortcut-viewer";
-  version = "5.0.9";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-A4LFi0KcqChjgYrO90paMBAivv02TsRjYQ26I0k71x0=";
-  };
-
-  nativeBuildInputs = [
-    libsForQt5.qmake
-    libsForQt5.qttools
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    libsForQt5.qtbase
-    dtkwidget
-    qt5integration
-    qt5platform-plugins
-  ];
-
-  qmakeFlags = [
-    "VERSION=${version}"
-    "PREFIX=${placeholder "out"}"
-  ];
-
-  meta = with lib; {
-    description = "Deepin Shortcut Viewer";
-    mainProgram = "deepin-shortcut-viewer";
-    homepage = "https://github.com/linuxdeepin/deepin-shortcut-viewer";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
deleted file mode 100644
index 08ef482ed783..000000000000
--- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  deepin-gettext-tools,
-  libsForQt5,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-  dde-qt-dbus-factory,
-  dde-tray-loader,
-  gsettings-qt,
-  procps,
-  libpcap,
-  libnl,
-  util-linux,
-  systemd,
-  polkit,
-  wayland,
-  dwayland,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-system-monitor";
-  version = "6.5.4";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-xLlWQaoKC+/jgDD9sBikh5Z1QqDuCFcMulo0vqxJM7k=";
-  };
-
-  postPatch = ''
-    substituteInPlace deepin-system-monitor-main/process/process_controller.cpp \
-      deepin-system-monitor-main/process/priority_controller.cpp \
-      deepin-system-monitor-main/service/service_manager.cpp \
-      deepin-system-monitor-main/translations/policy/com.deepin.pkexec.deepin-system-monitor.policy \
-        --replace "/usr/bin/kill" "${lib.getBin util-linux}/bin/kill" \
-        --replace "/usr/bin/renice" "${lib.getBin util-linux}/bin/renice" \
-        --replace '/usr/bin/systemctl' '${lib.getBin systemd}/systemctl'
-
-    substituteInPlace deepin-system-monitor-main/{service/service_manager.cpp,process/{priority_controller.cpp,process_controller.cpp}} \
-      --replace "/usr/bin/pkexec" "${lib.getBin polkit}/bin/pkexec"
-
-    for file in $(grep -rl "/usr")
-    do
-      substituteInPlace $file \
-        --replace "/usr" "$out"
-    done
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.qttools
-    deepin-gettext-tools
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    dtkwidget
-    qt5integration
-    qt5platform-plugins
-    libsForQt5.qtbase
-    libsForQt5.qtsvg
-    libsForQt5.qtx11extras
-    dde-qt-dbus-factory
-    dde-tray-loader
-    gsettings-qt
-    libsForQt5.polkit-qt
-    procps
-    libpcap
-    libnl
-    wayland
-    dwayland
-  ];
-
-  cmakeFlags = [ "-DVERSION=${version}" ];
-
-  # To build with icu4c need at least c++17
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-Wno-error=incompatible-pointer-types"
-    "--std=c++17"
-  ];
-
-  strictDeps = true;
-
-  meta = with lib; {
-    description = "More user-friendly system monitor";
-    homepage = "https://github.com/linuxdeepin/deepin-system-monitor";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
deleted file mode 100644
index a17f588dea23..000000000000
--- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  nixosTests,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-  cmake,
-  libsForQt5,
-  pkg-config,
-  libsecret,
-  chrpath,
-  lxqt,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-terminal";
-  version = "6.0.17";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-T5tjjbNYUaiG9a5zMoKN6I0ec/WLftF2xwUPczlNwB8=";
-  };
-
-  cmakeFlags = [ "-DVERSION=${version}" ];
-
-  nativeBuildInputs = [
-    cmake
-    libsForQt5.qttools
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-    lxqt.lxqt-build-tools_0_13
-  ];
-
-  buildInputs = [
-    qt5integration
-    qt5platform-plugins
-    libsForQt5.qtbase
-    libsForQt5.qtsvg
-    dtkwidget
-    libsForQt5.qtx11extras
-    libsecret
-    chrpath
-  ];
-
-  strictDeps = true;
-
-  passthru.tests.test = nixosTests.terminal-emulators.deepin-terminal;
-
-  meta = {
-    description = "Terminal emulator with workspace, multiple windows, remote management, quake mode and other features";
-    mainProgram = "deepin-terminal";
-    homepage = "https://github.com/linuxdeepin/deepin-terminal";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
deleted file mode 100644
index f65580e40852..000000000000
--- a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  stdenvNoCC,
-  lib,
-  fetchFromGitHub,
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "dde-account-faces";
-  version = "1.0.16";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-PtbEsFQl6M5Ouadxy9CTVh1Bmmect83NODO4Ks+ckKU=";
-  };
-
-  makeFlags = [ "PREFIX=${placeholder "out"}/var" ];
-
-  meta = with lib; {
-    description = "Account faces of deepin desktop environment";
-    homepage = "https://github.com/linuxdeepin/dde-account-faces";
-    license = with licenses; [
-      gpl3Plus
-      cc0
-    ];
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
deleted file mode 100644
index d52b7cb3b2f6..000000000000
--- a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  gtk3,
-  xcursorgen,
-  papirus-icon-theme,
-  libsForQt5,
-  hicolor-icon-theme,
-  deepin-icon-theme,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-desktop-theme";
-  version = "1.0.13";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-uNeRAsPbgC7IHHBIlczPXhnwZI65Le70D9MsbH+6Fwk=";
-  };
-
-  makeFlags = [ "PREFIX=${placeholder "out"}" ];
-
-  nativeBuildInputs = [
-    cmake
-    gtk3
-    xcursorgen
-  ];
-
-  propagatedBuildInputs = [
-    libsForQt5.breeze-icons
-    papirus-icon-theme
-    hicolor-icon-theme
-    deepin-icon-theme
-  ];
-
-  # breeze-icons propagates qtbase
-  dontWrapQtApps = true;
-
-  dontDropIconThemeCache = true;
-
-  preFixup = ''
-    for theme in $out/share/icons/*; do
-      gtk-update-icon-cache $theme
-    done
-  '';
-
-  meta = with lib; {
-    description = "Provides a variety of well-designed theme resources";
-    homepage = "https://github.com/linuxdeepin/deepin-desktop-theme";
-    license = with licenses; [
-      gpl3Plus
-      cc-by-sa-40
-    ];
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix
deleted file mode 100644
index 29ada16a2af6..000000000000
--- a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  stdenvNoCC,
-  lib,
-  fetchFromGitHub,
-  gtk-engine-murrine,
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "deepin-gtk-theme";
-  version = "23.11.23";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = "deepin-gtk-theme";
-    rev = version;
-    hash = "sha256-2B2BtbPeg3cEbnEIgdGFzy8MjCMWlbP/Sq4jzG5cjmc=";
-  };
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
-  makeFlags = [ "PREFIX=${placeholder "out"}" ];
-
-  meta = with lib; {
-    description = "Deepin GTK Theme";
-    homepage = "https://github.com/linuxdeepin/deepin-gtk-theme";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
deleted file mode 100644
index 34e6cb0a7079..000000000000
--- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  stdenvNoCC,
-  lib,
-  fetchFromGitHub,
-  gtk3,
-  xcursorgen,
-  papirus-icon-theme,
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "deepin-icon-theme";
-  version = "2024.07.31";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-Vt2rYZthGelXVUp8/L57ZlDsVEjjZhCv+kSGeU6nC2s=";
-  };
-
-  makeFlags = [ "PREFIX=${placeholder "out"}" ];
-
-  nativeBuildInputs = [
-    gtk3
-    xcursorgen
-  ];
-
-  propagatedBuildInputs = [ papirus-icon-theme ];
-
-  # breeze-icons propagates qtbase
-  dontWrapQtApps = true;
-
-  dontDropIconThemeCache = true;
-
-  # Remove broken symbolic link(https://github.com/linuxdeepin/developer-center/issues/11245)
-  preFixup = ''
-    rm $out/share/icons/bloom/actions/24/{draw-triangle1.svg,draw-triangle2.svg,draw-triangle3.svg,draw-triangle4.svg}
-    for theme in $out/share/icons/*; do
-      gtk-update-icon-cache $theme
-    done
-  '';
-
-  meta = with lib; {
-    description = "Provides the base icon themes on deepin";
-    homepage = "https://github.com/linuxdeepin/deepin-icon-theme";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix
deleted file mode 100644
index 2256b8f1aba8..000000000000
--- a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  stdenvNoCC,
-  lib,
-  fetchFromGitHub,
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "deepin-sound-theme";
-  version = "15.10.6";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-BvG/ygZfM6sDuDSzAqwCzDXGT/bbA6Srlpg3br117OU=";
-  };
-
-  makeFlags = [ "PREFIX=${placeholder "out"}" ];
-
-  meta = with lib; {
-    description = "Freedesktop sound theme for Deepin";
-    homepage = "https://github.com/linuxdeepin/deepin-sound-theme";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix
deleted file mode 100644
index 10203fc02f07..000000000000
--- a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  dde-api,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-wallpapers";
-  version = "1.7.16";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-o5rg1l8N6Ch+BdBLp+HMbVBBvrTdRtn8NSgH/9AnB2Q=";
-  };
-
-  nativeBuildInputs = [ dde-api ];
-
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace /usr/lib/deepin-api/image-blur ${dde-api}/lib/deepin-api/image-blur
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/wallpapers/deepin
-    cp deepin/* $out/share/wallpapers/deepin
-    mkdir -p $out/share/wallpapers/image-blur
-    cp image-blur/* $out/share/wallpapers/image-blur
-    mkdir -p $out/share/backgrounds
-    ln -s $out/share/wallpapers/deepin/desktop.jpg  $out/share/backgrounds/default_background.jpg
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Deepin-wallpapers provides wallpapers of dde";
-    homepage = "https://github.com/linuxdeepin/deepin-wallpapers";
-    license = with licenses; [
-      gpl3Plus
-      cc-by-sa-30
-    ];
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix
deleted file mode 100644
index 80af772b00c4..000000000000
--- a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  dtkcore,
-  coreutils,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-api-proxy";
-  version = "1.0.20";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = "dde-api-proxy";
-    rev = version;
-    hash = "sha256-QE31BOh2LFlY6te+2+nSHGbhLsikSX8V7xSvcLzCWRA=";
-  };
-
-  postPatch = ''
-    for file in $(grep -rl "/usr/bin/false"); do
-      substituteInPlace $file --replace-fail "/usr/bin/false" "${coreutils}/bin/false"
-    done
-    for file in $(grep -rl "/usr/lib/dde-api-proxy"); do
-      substituteInPlace $file --replace-fail "/usr/lib/dde-api-proxy" "$out/lib/dde-api-proxy"
-    done
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-    libsForQt5.polkit-qt
-  ];
-
-  buildInputs = [
-    dtkcore
-    libsForQt5.qtbase
-  ];
-
-  meta = {
-    description = "Proxy service for dde";
-    homepage = "https://github.com/linuxdeepin/dde-api-proxy";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-app-services/default.nix b/pkgs/desktops/deepin/core/dde-app-services/default.nix
deleted file mode 100644
index 9d3187e653b0..000000000000
--- a/pkgs/desktops/deepin/core/dde-app-services/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-  cmake,
-  libsForQt5,
-  doxygen,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-app-services";
-  version = "1.0.25";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-/lHiSUOTD8nC0WDLAHAFzm1YC0WjSS5W5JNC0cjeVEo=";
-  };
-
-  postPatch = ''
-    substituteInPlace dconfig-center/dde-dconfig-daemon/services/org.desktopspec.ConfigManager.service \
-      --replace "/usr/bin/dde-dconfig-daemon" "$out/bin/dde-dconfig-daemon"
-    substituteInPlace dconfig-center/dde-dconfig/main.cpp \
-      --replace "/bin/dde-dconfig-editor" "dde-dconfig-editor"
-    substituteInPlace dconfig-center/CMakeLists.txt \
-      --replace 'add_subdirectory("example")' " " \
-      --replace 'add_subdirectory("tests")'   " "
-
-    substituteInPlace dconfig-center/dde-dconfig-daemon/services/dde-dconfig-daemon.service \
-      --replace "/usr/bin" "$out/bin" \
-      --replace "/usr/share" "/run/current-system/sw/share"
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    libsForQt5.qttools
-    doxygen
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    dtkwidget
-    qt5integration
-    qt5platform-plugins
-  ];
-
-  cmakeFlags = [
-    "-DDVERSION=${version}"
-    "-DDSG_DATA_DIR=/run/current-system/sw/share/dsg"
-    "-DQCH_INSTALL_DESTINATION=${placeholder "out"}/${libsForQt5.qtbase.qtDocPrefix}"
-  ];
-
-  preConfigure = ''
-    # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
-    # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
-  '';
-
-  meta = with lib; {
-    description = "Provids dbus service for reading and writing DSG configuration";
-    homepage = "https://github.com/linuxdeepin/dde-app-services";
-    license = licenses.lgpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-appearance/default.nix b/pkgs/desktops/deepin/core/dde-appearance/default.nix
deleted file mode 100644
index e40b9b287a31..000000000000
--- a/pkgs/desktops/deepin/core/dde-appearance/default.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  dtkgui,
-  gsettings-qt,
-  gtk3,
-  xorg,
-  iconv,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-appearance";
-  version = "1.1.29";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-M39EugV0uGCIaXK4isTQpHd6Rh2Vl6sg3Jp8JIEFEE4=";
-  };
-
-  postPatch = ''
-    substituteInPlace src/service/impl/appearancemanager.cpp \
-      src/service/modules/{api/compatibleengine.cpp,subthemes/customtheme.cpp,background/backgrounds.cpp} \
-      misc/dconfig/org.deepin.dde.appearance.json \
-      fakewm/dbus/deepinwmfaker.cpp \
-      --replace "/usr/share" "/run/current-system/sw/share"
-
-    for file in $(grep -rl "/usr/bin/dde-appearance"); do
-      substituteInPlace $file --replace "/usr/bin/dde-appearance" "$out/bin/dde-appearance"
-    done
-
-    substituteInPlace src/service/modules/api/themethumb.cpp \
-      --replace "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api"
-
-    substituteInPlace fakewm/dbus/deepinwmfaker.cpp \
-      --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
-
-    substituteInPlace src/service/modules/api/locale.cpp \
-      --replace "/usr/share/locale/locale.alias" "${iconv}/share/locale/locale.alias"
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    dtkgui
-    gsettings-qt
-    gtk3
-    libsForQt5.kconfig
-    libsForQt5.kwindowsystem
-    libsForQt5.kglobalaccel
-    xorg.libXcursor
-    xorg.xcbutilcursor
-  ];
-
-  cmakeFlags = [
-    "-DDSG_DATA_DIR=/run/current-system/sw/share/dsg"
-    "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user"
-  ];
-
-  meta = with lib; {
-    description = "Program used to set the theme and appearance of deepin desktop";
-    homepage = "https://github.com/linuxdeepin/dde-appearance";
-    license = licenses.lgpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix
deleted file mode 100644
index 70806aacaa3c..000000000000
--- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  qt6Packages,
-  dtk6core,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-application-manager";
-  version = "1.2.19";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-KUwX7oilV562WDxkBhTQhwz2lgcQIYwkmRRglWj0zh8=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    qt6Packages.wrapQtAppsNoGuiHook
-  ];
-
-  buildInputs = [
-    qt6Packages.qtbase
-    dtk6core
-  ];
-
-  meta = with lib; {
-    description = "Application manager for DDE";
-    mainProgram = "dde-application-manager";
-    homepage = "https://github.com/linuxdeepin/dde-application-manager";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix
deleted file mode 100644
index 7ff4a3ff4ebf..000000000000
--- a/pkgs/desktops/deepin/core/dde-calendar/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-  dde-qt-dbus-factory,
-  libical,
-  sqlite,
-  runtimeShell,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-calendar";
-  version = "5.14.4";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-bZxNOBtLjop0eYxpMeoomaWYvPcMyDfQfgGPK9m+ARo=";
-  };
-
-  patches = [ ./fix-wrapped-name-not-in-whitelist.diff ];
-
-  postPatch = ''
-    for file in $(grep -rl "/bin/bash"); do
-      substituteInPlace $file --replace "/bin/bash" "${runtimeShell}"
-    done
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    libsForQt5.qttools
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    qt5integration
-    qt5platform-plugins
-    dtkwidget
-    libsForQt5.qtbase
-    libsForQt5.qtsvg
-    dde-qt-dbus-factory
-    libical
-    sqlite
-  ];
-
-  cmakeFlags = [ "-DVERSION=${version}" ];
-
-  strictDeps = true;
-
-  meta = with lib; {
-    description = "Calendar for Deepin Desktop Environment";
-    mainProgram = "dde-calendar";
-    homepage = "https://github.com/linuxdeepin/dde-calendar";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff b/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff
deleted file mode 100644
index a139c4690a89..000000000000
--- a/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/calendar-service/src/dbusservice/dservicebase.cpp b/calendar-service/src/dbusservice/dservicebase.cpp
-index ac182881..93a9c2d8 100644
---- a/calendar-service/src/dbusservice/dservicebase.cpp
-+++ b/calendar-service/src/dbusservice/dservicebase.cpp
-@@ -52,6 +52,8 @@ bool DServiceBase::clientWhite(const int index)
-             return true;
-         }
-     }
-+    if (getClientName().contains("dde-calendar"))
-+    	return true;
-     return false;
- #else
-     Q_UNUSED(index)
diff --git a/pkgs/desktops/deepin/core/dde-clipboard/default.nix b/pkgs/desktops/deepin/core/dde-clipboard/default.nix
deleted file mode 100644
index e49d55388557..000000000000
--- a/pkgs/desktops/deepin/core/dde-clipboard/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  dtkwidget,
-  gio-qt,
-  cmake,
-  extra-cmake-modules,
-  libsForQt5,
-  wayland,
-  dwayland,
-  pkg-config,
-  glibmm,
-  gtest,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-clipboard";
-  version = "6.0.11";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-VSwip3WgpOYvqGw7/A8bqsYrVSACrVgoIp/pjXSAKcU=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    pkg-config
-    libsForQt5.qttools
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    dtkwidget
-    gio-qt
-    wayland
-    dwayland
-    glibmm
-    gtest
-  ];
-
-  cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ];
-
-  meta = with lib; {
-    description = "DDE optional clipboard manager componment";
-    homepage = "https://github.com/linuxdeepin/dde-clipboard";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-control-center/default.nix b/pkgs/desktops/deepin/core/dde-control-center/default.nix
deleted file mode 100644
index a3f6e7ea28c5..000000000000
--- a/pkgs/desktops/deepin/core/dde-control-center/default.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  doxygen,
-  wayland-scanner,
-  wayland,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-  libsForQt5,
-  deepin-pw-check,
-  libxcrypt,
-  gtest,
-  runtimeShell,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-control-center";
-  version = "6.0.65";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-9v2UtLjQQ3OX69UxMknLlrQhorahDI4Z4EEHItBs7G0=";
-  };
-
-  postPatch = ''
-    substituteInPlace src/plugin-accounts/operation/accountsworker.cpp \
-      --replace "/bin/bash" "${runtimeShell}"
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.qttools
-    doxygen
-    libsForQt5.wrapQtAppsHook
-    wayland-scanner
-  ];
-
-  buildInputs = [
-    wayland
-    dtkwidget
-    qt5platform-plugins
-    qt5integration
-    deepin-pw-check
-    libsForQt5.qtbase
-    libsForQt5.qtmultimedia
-    libsForQt5.polkit-qt
-    libxcrypt
-    gtest
-  ];
-
-  env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
-
-  cmakeFlags = [
-    "-DCVERSION=${version}"
-    "-DDISABLE_AUTHENTICATION=YES"
-    "-DDISABLE_UPDATE=YES"
-    "-DDISABLE_LANGUAGE=YES"
-    "-DBUILD_DOCS=OFF"
-    "-DMODULE_READ_DIR=/run/current-system/sw/lib/dde-control-center/modules"
-    "-DLOCALSTATE_READ_DIR=/var"
-  ];
-
-  preConfigure = ''
-    # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
-    # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
-  '';
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  meta = {
-    description = "Control panel of Deepin Desktop Environment";
-    mainProgram = "dde-control-center";
-    homepage = "https://github.com/linuxdeepin/dde-control-center";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
deleted file mode 100644
index 39ad39418075..000000000000
--- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  fetchpatch,
-  runtimeShell,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-  dde-qt-dbus-factory,
-  docparser,
-  dde-tray-loader,
-  cmake,
-  libsForQt5,
-  pkg-config,
-  ffmpegthumbnailer,
-  libsecret,
-  libmediainfo,
-  mediainfo,
-  libzen,
-  poppler,
-  polkit,
-  wrapGAppsHook3,
-  lucenepp,
-  boost,
-  taglib,
-  cryptsetup,
-  glib,
-  util-dfm,
-  deepin-pdfium,
-  libuuid,
-  libselinux,
-  glibmm,
-  pcre,
-  udisks2,
-  libisoburn,
-  gsettings-qt,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-file-manager";
-  version = "6.0.57";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-laM6PgNdUNbsqbzKFGWk7DPuAWR+XHo0eXKG0CDuc9c=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    libsForQt5.qttools
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-    wrapGAppsHook3
-  ];
-  dontWrapGApps = true;
-
-  patches = [
-    ./patch_check_v23_interface.diff
-    (fetchpatch {
-      name = "fix-permission-to-execute-dde-file-manager.patch";
-      url = "https://github.com/linuxdeepin/dde-file-manager/commit/b78cc4bd08dd487f67c5a332a2a2f4d20b3798c7.patch";
-      hash = "sha256-Tw3iu6sU0rrsM78WGMBpBgvA9YdRTM1ObjCxyM928F4=";
-    })
-  ];
-
-  postPatch = ''
-    patchShebangs tests/*.sh \
-                  assets/scripts \
-                  src/*.sh \
-                  src/plugins/daemon/daemonplugin-accesscontrol/help.sh \
-                  src/apps/dde-file-manager/dde-property-dialog \
-                  src/apps/dde-desktop/data/applications/dfm-open.sh
-
-    substituteInPlace assets/scripts/file-manager.sh \
-      --replace-fail "/usr/libexec/dde-file-manager" "$out/libexec/dde-file-manager"
-
-    substituteInPlace src/plugins/filemanager/dfmplugin-vault/utils/vaultdefine.h \
-      --replace-fail "/usr/bin/deepin-compressor" "deepin-compressor"
-
-    substituteInPlace src/plugins/filemanager/dfmplugin-avfsbrowser/utils/avfsutils.cpp \
-      --replace-fail "/usr/bin/mountavfs" "mountavfs" \
-      --replace-fail "/usr/bin/umountavfs" "umountavfs"
-
-    substituteInPlace src/plugins/common/core/dfmplugin-menu/{extendmenuscene/extendmenu/dcustomactionparser.cpp,oemmenuscene/oemmenu.cpp} \
-      --replace-fail "/usr" "$out"
-
-    substituteInPlace src/tools/upgrade/dialog/processdialog.cpp \
-      --replace-fail "/usr/bin/dde-file-manager" "dde-file-manager" \
-      --replace-fail "/usr/bin/dde-desktop" "dde-desktop"
-
-    substituteInPlace src/dfm-base/file/local/localfilehandler.cpp \
-      --replace-fail "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
-
-    substituteInPlace src/plugins/desktop/ddplugin-background/backgroundservice.cpp \
-      src/plugins/desktop/ddplugin-wallpapersetting/wallpapersettings.cpp \
-      --replace-fail "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds"
-
-    find . -type f -regex ".*\\.\\(service\\|policy\\|desktop\\)" -exec sed -i -e "s|/usr/|$out/|g" {} \;
-  '';
-
-  buildInputs = [
-    dtkwidget
-    qt5integration
-    qt5platform-plugins
-    deepin-pdfium
-    util-dfm
-    dde-qt-dbus-factory
-    glibmm
-    docparser
-    dde-tray-loader
-    libsForQt5.qtx11extras
-    libsForQt5.qtmultimedia
-    libsForQt5.kcodecs
-    ffmpegthumbnailer
-    libsecret
-    libmediainfo
-    mediainfo
-    poppler
-    libsForQt5.polkit-qt
-    polkit
-    lucenepp
-    boost
-    taglib
-    cryptsetup
-    libuuid
-    libselinux
-    pcre
-    udisks2
-    libisoburn
-    gsettings-qt
-  ];
-
-  cmakeFlags = [
-    "-DVERSION=${version}"
-    "-DNIX_DEEPIN_VERSION=23"
-    "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user"
-  ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
-  meta = with lib; {
-    description = "File manager for deepin desktop environment";
-    homepage = "https://github.com/linuxdeepin/dde-file-manager";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff b/pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff
deleted file mode 100644
index c41306f59031..000000000000
--- a/pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8a8cfb079..34092aa57 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,7 +31,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- endif()
- 
- #Indentify the version
--if (${DEEPIN_OS_VERSION} MATCHES "23")
-+if (${NIX_DEEPIN_VERSION} MATCHES "23")
-     add_definitions(-DCOMPILE_ON_V23)
-     set(COMPLIE_ON_V23 TRUE)
-     message("COMPILE ON v23")
diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
deleted file mode 100644
index 2acc258f6247..000000000000
--- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  libsForQt5,
-  pkg-config,
-  dtkwidget,
-  dde-qt-dbus-factory,
-  dde-tray-loader,
-  deepin-pdfium,
-  qt5integration,
-  qt5platform-plugins,
-  taglib_1,
-  ffmpeg,
-  ffmpegthumbnailer,
-  pcre,
-  lucenepp,
-  boost,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-grand-search";
-  version = "5.5.2";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-6s6M0cL8gjq1B5tuIRGPi8D69p4T8hPJv5QvBIvsO1w=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    libsForQt5.qttools
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    dtkwidget
-    dde-tray-loader
-    dde-qt-dbus-factory
-    deepin-pdfium
-    qt5integration
-    qt5platform-plugins
-    taglib_1
-    ffmpeg
-    ffmpegthumbnailer
-    pcre
-    lucenepp
-    boost
-  ];
-
-  patches = [
-    # This patch revert the commit e6735e7
-    # FIXME: why StartManager can't work, is dde-api-proxy still required?
-    ./fix-dbus-path-for-daemon.diff
-  ];
-
-  postPatch = ''
-    # fix access permit to daemon
-    substituteInPlace src/libgrand-search-daemon/dbusservice/grandsearchinterface.cpp \
-      --replace-fail "/usr/bin/dde-grand-search" "$out/bin/.dde-grand-search-wrapped"
-
-    for file in $(grep -rl "/usr/bin/dde-grand-search"); do
-      substituteInPlace $file --replace-fail "/usr/bin/dde-grand-search" "$out/bin/dde-grand-search"
-    done
-
-    substituteAllInPlace src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service
-  '';
-
-  cmakeFlags = [ "-DVERSION=${version}" ];
-
-  meta = {
-    description = "System-wide desktop search for DDE";
-    homepage = "https://github.com/linuxdeepin/dde-grand-search";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff b/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff
deleted file mode 100644
index dd036bf6ec5e..000000000000
--- a/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service b/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service
-index 14823cb..33dd51e 100644
---- a/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service
-+++ b/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service
-@@ -1,3 +1,3 @@
- [D-BUS Service]
- Name=com.deepin.dde.daemon.GrandSearch
--Exec=/usr/bin/dbus-send --print-reply --session --dest=com.deepin.SessionManager /com/deepin/StartManager com.deepin.StartManager.Launch string:/usr/share/applications/dde-grand-search-daemon.desktop
-+Exec=@out@/bin/dde-grand-search-daemon
diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
deleted file mode 100644
index 6b8f892ed39b..000000000000
--- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  runCommand,
-  glib,
-  dde-grand-search,
-  startdde,
-  dde-session-shell,
-  dde-file-manager,
-  dde-tray-loader,
-  deepin-desktop-schemas,
-  deepin-system-monitor,
-  gsettings-desktop-schemas,
-  extraGSettingsOverrides ? "",
-  extraGSettingsOverridePackages ? [ ],
-}:
-
-let
-  gsettingsOverridePackages = [
-    dde-grand-search
-    startdde
-    dde-session-shell
-    dde-file-manager
-    dde-tray-loader
-    deepin-desktop-schemas
-    deepin-system-monitor
-    gsettings-desktop-schemas # dde-appearance need org.gnome.desktop.background
-  ]
-  ++ extraGSettingsOverridePackages;
-
-in
-# TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this
-runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } ''
-  data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides"
-  schema_dir="$data_dir/glib-2.0/schemas"
-
-  mkdir -p $schema_dir
-
-  ${lib.concatMapStringsSep "\n" (
-    pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"$schema_dir\""
-  ) gsettingsOverridePackages}
-
-  chmod -R a+w "$data_dir"
-
-  cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF
-  ${extraGSettingsOverrides}
-  EOF
-
-  ${glib.dev}/bin/glib-compile-schemas $schema_dir
-''
diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
deleted file mode 100644
index a8d8cbbd5042..000000000000
--- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  qt6Packages,
-  qt6integration,
-  qt6platform-plugins,
-  dtk6declarative,
-  dde-shell,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-launchpad";
-  version = "1.0.8";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-2arO1WSILY5TVPBvdyhttssddwhMYIBcCGq/pW/DnB0=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    qt6Packages.qttools
-    qt6Packages.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    qt6integration
-    qt6platform-plugins
-    dtk6declarative
-    dde-shell
-  ]
-  ++ (with qt6Packages; [
-    qtbase
-    qtsvg
-    qtwayland
-    appstream-qt
-  ]);
-
-  cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ];
-
-  meta = {
-    description = "'launcher' or 'start menu' component for DDE";
-    mainProgram = "dde-launchpad";
-    homepage = "https://github.com/linuxdeepin/dde-launchpad";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix
deleted file mode 100644
index 03e3173e6325..000000000000
--- a/pkgs/desktops/deepin/core/dde-network-core/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  dtkwidget,
-  dde-control-center,
-  dde-session-shell,
-  libsForQt5,
-  glib,
-  gtest,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-network-core";
-  version = "2.0.34";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-bS/PkutP5BQtqZ6MzeImFyGKoztoTswXhXaEftEv0FI=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    libsForQt5.qttools
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qtsvg
-    dtkwidget
-    dde-control-center
-    dde-session-shell
-    libsForQt5.networkmanager-qt
-    glib
-    gtest
-  ];
-
-  cmakeFlags = [ "-DVERSION=${version}" ];
-
-  strictDeps = true;
-
-  meta = {
-    description = "DDE network library framework";
-    homepage = "https://github.com/linuxdeepin/dde-network-core";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
deleted file mode 100644
index 39bd5fa8ea42..000000000000
--- a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-  dde-qt-dbus-factory,
-  pkg-config,
-  cmake,
-  libsForQt5,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-polkit-agent";
-  version = "6.0.7";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-r2WVyy1lqcBJIQnRsPWlBFWQtSeZkq98J1S4dkipCys=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.qttools
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    dtkwidget
-    qt5integration
-    qt5platform-plugins
-    dde-qt-dbus-factory
-    libsForQt5.polkit-qt
-  ];
-
-  postFixup = ''
-    wrapQtApp $out/lib/polkit-1-dde/dde-polkit-agent
-  '';
-
-  meta = with lib; {
-    description = "PolicyKit agent for Deepin Desktop Environment";
-    homepage = "https://github.com/linuxdeepin/dde-polkit-agent";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/pkgs/desktops/deepin/core/dde-session-shell/default.nix
deleted file mode 100644
index e2ffff5407a5..000000000000
--- a/pkgs/desktops/deepin/core/dde-session-shell/default.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  linkFarm,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  wrapGAppsHook3,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-  deepin-pw-check,
-  gsettings-qt,
-  lightdm_qt,
-  linux-pam,
-  xorg,
-  gtest,
-  xkeyboard_config,
-  dbus,
-  dde-session-shell,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-session-shell";
-  version = "6.0.21";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    # DDE 23 releases has moved to `linuxdeepin/dde-session-shell-snipe`
-    repo = "dde-session-shell-snipe";
-    rev = version;
-    hash = "sha256-v0+Bz6J77Kgf4YV1iDhCqhmcNn493GFq1IEQbXBAVUU=";
-  };
-
-  postPatch = ''
-    substituteInPlace scripts/lightdm-deepin-greeter files/wayland/lightdm-deepin-greeter-wayland \
-      --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
-
-    substituteInPlace src/session-widgets/auth_module.h \
-      --replace "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center"
-
-    substituteInPlace src/global_util/modules_loader.cpp \
-      --replace "/usr/lib/dde-session-shell/modules" "/run/current-system/sw/lib/dde-session-shell/modules"
-
-    substituteInPlace src/{session-widgets/{lockcontent.cpp,userinfo.cpp},widgets/fullscreenbackground.cpp} \
-      --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds"
-
-    substituteInPlace src/global_util/xkbparser.h \
-      --replace "/usr/share/X11/xkb/rules/base.xml" "${xkeyboard_config}/share/X11/xkb/rules/base.xml"
-
-    substituteInPlace files/{org.deepin.dde.ShutdownFront1.service,org.deepin.dde.LockFront1.service} \
-      --replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" \
-      --replace "/usr/share" "$out/share"
-
-    substituteInPlace src/global_util/{public_func.cpp,constants.h} scripts/lightdm-deepin-greeter files/{dde-lock.desktop,lightdm-deepin-greeter.desktop,wayland/lightdm-deepin-greeter-wayland.desktop} \
-      --replace "/usr" "$out"
-
-    patchShebangs files/deepin-greeter
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.qttools
-    libsForQt5.wrapQtAppsHook
-    wrapGAppsHook3
-  ];
-  dontWrapGApps = true;
-
-  buildInputs = [
-    libsForQt5.qtbase
-    dtkwidget
-    qt5integration
-    qt5platform-plugins
-    deepin-pw-check
-    gsettings-qt
-    lightdm_qt
-    libsForQt5.qtx11extras
-    linux-pam
-    xorg.libXcursor
-    xorg.libXtst
-    xorg.libXrandr
-    xorg.libXdmcp
-    gtest
-  ];
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  preFixup = ''
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
-  passthru.xgreeters = linkFarm "deepin-greeter-xgreeters" [
-    {
-      path = "${dde-session-shell}/share/xgreeters/lightdm-deepin-greeter.desktop";
-      name = "lightdm-deepin-greeter.desktop";
-    }
-  ];
-
-  meta = with lib; {
-    description = "Deepin desktop-environment - session-shell module";
-    homepage = "https://github.com/linuxdeepin/dde-session-shell";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix
deleted file mode 100644
index 106e8fe80e52..000000000000
--- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-  dde-tray-loader,
-  gsettings-qt,
-  gtest,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-session-ui";
-  version = "6.0.20";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-3twtJ1KT7TqpyLopHqPY2Lo8oZsH9liir0SJUV/k3OU=";
-  };
-
-  postPatch = ''
-    substituteInPlace widgets/fullscreenbackground.cpp \
-      --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" \
-      --replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers"
-
-    substituteInPlace dde-warning-dialog/src/org.deepin.dde.WarningDialog1.service dde-welcome/src/org.deepin.dde.Welcome1.service \
-      --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
-
-    substituteInPlace dmemory-warning-dialog/src/org.deepin.dde.MemoryWarningDialog1.service \
-      --replace "/usr" "$out"
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.qttools
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    libsForQt5.qtbase
-    dtkwidget
-    qt5platform-plugins
-    qt5integration
-    dde-tray-loader
-    gsettings-qt
-    libsForQt5.qtx11extras
-    gtest
-  ];
-
-  cmakeFlags = [ "-DDISABLE_SYS_UPDATE=ON" ];
-
-  postFixup = ''
-    for binary in $out/lib/deepin-daemon/*; do
-      wrapProgram $binary "''${qtWrapperArgs[@]}"
-    done
-  '';
-
-  meta = with lib; {
-    description = "Deepin desktop-environment - Session UI module";
-    homepage = "https://github.com/linuxdeepin/dde-session-ui";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-session/default.nix b/pkgs/desktops/deepin/core/dde-session/default.nix
deleted file mode 100644
index 6a69822abbb5..000000000000
--- a/pkgs/desktops/deepin/core/dde-session/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  dtkcore,
-  gsettings-qt,
-  libsecret,
-  xorg,
-  systemd,
-  dde-polkit-agent,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-session";
-  version = "1.2.12";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-WiWG4f+vMgAYDBp/porjiV9a6ZqqdmxdXAqX1ISdlfU=";
-  };
-
-  postPatch = ''
-    substituteInPlace misc/CMakeLists.txt \
-      --replace "/etc" "$out/etc"
-
-    # Avoid using absolute path to distinguish applications
-    substituteInPlace src/dde-session/impl/sessionmanager.cpp \
-      --replace 'file.readAll().startsWith("/usr/bin/dde-lock")' 'file.readAll().contains("dde-lock")' \
-
-    substituteInPlace systemd/dde-session-initialized.target.wants/dde-polkit-agent.service \
-      --replace "/usr/lib/polkit-1-dde" "${dde-polkit-agent}/lib/polkit-1-dde"
-
-    for file in $(grep -rl "/usr/lib/deepin-daemon"); do
-      substituteInPlace $file --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
-    done
-
-    for file in $(grep -rl "/usr/bin"); do
-      substituteInPlace $file --replace "/usr/bin/" "/run/current-system/sw/bin/"
-    done
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    libsForQt5.qtbase
-    dtkcore
-    gsettings-qt
-    libsecret
-    xorg.libXcursor
-    systemd
-  ];
-
-  # FIXME: dde-wayland always exits abnormally
-  passthru.providedSessions = [ "dde-x11" ];
-
-  meta = with lib; {
-    description = "New deepin session based on systemd and existing projects";
-    homepage = "https://github.com/linuxdeepin/dde-session";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix
deleted file mode 100644
index 026e2da584bf..000000000000
--- a/pkgs/desktops/deepin/core/dde-shell/default.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  fetchpatch,
-  cmake,
-  extra-cmake-modules,
-  pkg-config,
-  wayland-scanner,
-  dtk6declarative,
-  dtk6widget,
-  dde-qt-dbus-factory,
-  qt6Packages,
-  qt6integration,
-  qt6platform-plugins,
-  dde-tray-loader,
-  dde-application-manager,
-  wayland,
-  wayland-protocols,
-  treeland-protocols,
-  yaml-cpp,
-  xorg,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dde-shell";
-  version = "1.0.10";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = "dde-shell";
-    rev = finalAttrs.version;
-    hash = "sha256-0nyTvSIJglx8raehPi6pYfQcxIjsCAaD1hVbuGvtfY8=";
-  };
-
-  patches = [
-    ./fix-path-for-nixos.diff
-    (fetchpatch {
-      name = "resolve-compilation-issues-on-Qt-6_9.patch";
-      url = "https://github.com/linuxdeepin/dde-shell/commit/936d62a2c20398b9ca6ae28f9101dd288c8b1678.patch";
-      hash = "sha256-u5TcPy2kZsOLGUgjTGZ5JX3mWnr/rOQ3SWBRyjWEiw4=";
-    })
-    (fetchpatch {
-      name = "adapt-import-change-of-QtQml-Models-in-Qt-6_9.patch";
-      url = "https://github.com/linuxdeepin/dde-shell/commit/ad92c160508a5eb53fd5af558ef1b1ba881b97ac.patch";
-      hash = "sha256-3GdkbFEt51EP04RQN54EDsGyXkeZoWhbnQAHkwjUeGY=";
-    })
-
-  ];
-
-  postPatch = ''
-    for file in $(grep -rl "/usr/lib/dde-dock"); do
-      substituteInPlace $file --replace-fail "/usr/lib/dde-dock" "/run/current-system/sw/lib/dde-dock"
-    done
-
-    for file in $(grep -rl "/usr/lib/deepin-daemon"); do
-      substituteInPlace $file --replace-fail "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
-    done
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    pkg-config
-    qt6Packages.wrapQtAppsHook
-    qt6Packages.qttools
-    wayland-scanner
-  ];
-
-  buildInputs = [
-    dde-tray-loader
-    dde-application-manager
-    dtk6declarative
-    dtk6widget
-    dde-qt-dbus-factory
-    qt6Packages.qtbase
-    qt6Packages.qtwayland
-    qt6Packages.qtsvg
-    qt6platform-plugins
-    qt6integration
-    wayland
-    wayland-protocols
-    treeland-protocols
-    yaml-cpp
-    xorg.libXcursor
-    xorg.libXres
-  ];
-
-  env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
-
-  cmakeFlags = [ "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" ];
-
-  qtWrapperArgs = [
-    "--prefix TRAY_LOADER_EXECUTE_PATH : ${dde-tray-loader}/libexec/trayplugin-loader"
-    "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell"
-    "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell"
-  ];
-
-  meta = {
-    description = "Plugin system that integrates plugins developed on DDE";
-    homepage = "https://github.com/linuxdeepin/dde-shell";
-    license = with lib.licenses; [ gpl3Plus ];
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ rewine ];
-  };
-})
diff --git a/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff b/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff
deleted file mode 100644
index cc334a3220a4..000000000000
--- a/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/misc/DDEShellConfig.cmake.in b/misc/DDEShellConfig.cmake.in
-index e28cc2f..3875769 100644
---- a/misc/DDEShellConfig.cmake.in
-+++ b/misc/DDEShellConfig.cmake.in
-@@ -5,9 +5,9 @@ find_dependency(Dtk@DTK_VERSION_MAJOR@Gui)
- find_package(Qt@QT_VERSION_MAJOR@ COMPONENTS Qml Quick REQUIRED)
- 
- include(${CMAKE_CURRENT_LIST_DIR}/DDEShellTargets.cmake)
--set(DDE_SHELL_PACKAGE_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_PACKAGE_INSTALL_DIR@)
--set(DDE_SHELL_PLUGIN_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_PLUGIN_INSTALL_DIR@)
--set(DDE_SHELL_TRANSLATION_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_TRANSLATION_INSTALL_DIR@)
-+set(DDE_SHELL_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/dde-shell)
-+set(DDE_SHELL_PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/dde-shell)
-+set(DDE_SHELL_TRANSLATION_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/dde-shell)
- check_required_components(Dtk@DTK_VERSION_MAJOR@Core)
- 
- include("${CMAKE_CURRENT_LIST_DIR}/DDEShellPackageMacros.cmake")
diff --git a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix
deleted file mode 100644
index 858924b5d140..000000000000
--- a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  fetchpatch,
-  cmake,
-  extra-cmake-modules,
-  pkg-config,
-  dtkwidget,
-  dde-qt-dbus-factory,
-  qt5integration,
-  qt5platform-plugins,
-  wayland,
-  wayland-scanner,
-  xorg,
-  libsForQt5,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dde-tray-loader";
-  version = "1.0.9";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = "dde-tray-loader";
-    rev = finalAttrs.version;
-    hash = "sha256-3rmLQRGtBLASr0VSsIfGP0R9HDxFlea+iNbVjkqKTVg=";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "remove-useless-function.patch";
-      url = "https://github.com/linuxdeepin/dde-tray-loader/commit/cf85f68db52472a0291bbbc3c298d7a2b701e4bc.patch";
-      hash = "sha256-ks7Rg5kLQvo03XKbfQaqu/heP2yoVEbNO6UhDv99JBY=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-    libsForQt5.qttools
-    wayland-scanner
-  ];
-
-  buildInputs = [
-    dtkwidget
-    dde-qt-dbus-factory
-    qt5integration
-    qt5platform-plugins
-    libsForQt5.qtbase
-    libsForQt5.qtsvg
-    libsForQt5.qtwayland
-    libsForQt5.networkmanager-qt
-    libsForQt5.libdbusmenu
-    wayland
-    xorg.libXcursor
-    xorg.libXtst
-  ];
-
-  meta = {
-    description = "Tray plugins that integrated into task bar";
-    homepage = "https://github.com/linuxdeepin/dde-tray-loader";
-    license = with lib.licenses; [ gpl3Plus ];
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ rewine ];
-  };
-})
diff --git a/pkgs/desktops/deepin/core/dde-widgets/default.nix b/pkgs/desktops/deepin/core/dde-widgets/default.nix
deleted file mode 100644
index c63886c43ab4..000000000000
--- a/pkgs/desktops/deepin/core/dde-widgets/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  dde-qt-dbus-factory,
-  dtkwidget,
-  libsForQt5,
-  qt5integration,
-  gtest,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-widgets";
-  version = "6.0.23";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-aeWQdWi1mMche7AJhAvchRXu89hiZ+CM/RR9HvvbXTw=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    dde-qt-dbus-factory
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qtx11extras
-    dtkwidget
-    qt5integration
-    gtest
-  ];
-
-  meta = with lib; {
-    description = "Desktop widgets service/implementation for DDE";
-    mainProgram = "dde-widgets";
-    homepage = "https://github.com/linuxdeepin/dde-widgets";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff b/pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff
deleted file mode 100644
index 872fa26c5e55..000000000000
--- a/pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/effects/multitaskview/multitaskview.cpp b/src/effects/multitaskview/multitaskview.cpp
-index 268bc42..d41f7bf 100644
---- a/src/effects/multitaskview/multitaskview.cpp
-+++ b/src/effects/multitaskview/multitaskview.cpp
-@@ -50,8 +50,8 @@
- #define SCISSOR_HOFFD 400
- 
- const char screen_recorder[] = "deepin-screen-recorder deepin-screen-recorder";
--const char fallback_background_name[] = "file:///usr/share/wallpapers/deepin/desktop.jpg";
--const char previous_default_background_name[] = "file:///usr/share/backgrounds/default_background.jpg";
-+const char fallback_background_name[] = "file:///run/current-system/sw/share/wallpapers/deepin/desktop.jpg";
-+const char previous_default_background_name[] = "file:///run/current-system/sw/share/backgrounds/default_background.jpg";
- const char add_workspace_png[] = ":/effects/multitaskview/buttons/add-light.png";//":/resources/themes/add-light.svg";
- const char delete_workspace_png[] = ":/effects/multitaskview/buttons/workspace_delete.png";
- 
diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
deleted file mode 100644
index 8cf6180f3652..000000000000
--- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  wayland,
-  dwayland,
-  libsForQt5,
-  extra-cmake-modules,
-  gsettings-qt,
-  libepoxy,
-  libinput,
-  libgbm,
-  lcms2,
-  xorg,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-kwin";
-  version = "5.25.27";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-EjPPjdxa+iL/nXhuccoM3NiLmGXh7Un2aGz8O3sP6xE=";
-  };
-
-  patches = [ ./0001-hardcode-fallback-background.diff ];
-
-  # Avoid using absolute path to distinguish applications
-  postPatch = ''
-    substituteInPlace src/effects/screenshot/screenshotdbusinterface1.cpp \
-      --replace 'file.readAll().startsWith(DEFINE_DDE_DOCK_PATH"dde-dock")' 'file.readAll().contains("dde-dock")'
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    extra-cmake-modules
-    libsForQt5.wrapQtAppsHook
-    libsForQt5.qttools
-  ];
-
-  buildInputs = [
-    wayland
-    dwayland
-    libepoxy
-    gsettings-qt
-
-    libinput
-    libgbm
-    lcms2
-
-    xorg.libxcb
-    xorg.libXdmcp
-    xorg.libXcursor
-    xorg.xcbutilcursor
-    xorg.libXtst
-    xorg.libXScrnSaver
-  ]
-  ++ (with libsForQt5; [
-    qtbase
-    qtx11extras
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kcrash
-    kdbusaddons
-    kiconthemes
-    kglobalaccel
-    kidletime
-    knotifications
-    kpackage
-    plasma-framework
-    kcmutils
-    knewstuff
-    kdecoration
-    kscreenlocker
-    breeze-qt5
-  ]);
-
-  cmakeFlags = [ "-DKWIN_BUILD_RUNNERS=OFF" ];
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  meta = {
-    description = "Fork of kwin, an easy to use, but flexible, composited Window Manager";
-    homepage = "https://github.com/linuxdeepin/deepin-kwin";
-    license = lib.licenses.lgpl21Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix
deleted file mode 100644
index 5e06cc3c6a70..000000000000
--- a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  libsForQt5,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-service-manager";
-  version = "1.0.3";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-gTzyQHFPyn2+A+o+4VYySDBCZftfG2WnTXuqzeF+QhA=";
-  };
-
-  postPatch = ''
-    for file in $(grep -rl "/usr/bin/deepin-service-manager"); do
-      substituteInPlace $file --replace "/usr/bin/deepin-service-manager" "$out/bin/deepin-service-manager"
-    done
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  meta = with lib; {
-    description = "Manage DBus service on Deepin";
-    mainProgram = "deepin-service-manager";
-    homepage = "https://github.com/linuxdeepin/deepin-service-manager";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
deleted file mode 100644
index 69a503b887ed..000000000000
--- a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  dtkwidget,
-  dde-polkit-agent,
-  qt5integration,
-  libsecret,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dpa-ext-gnomekeyring";
-  version = "6.0.1";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-SyoahSdGPkWitDek4RD5M2hTR78GFpuijryteKVAx6k=";
-  };
-
-  postPatch = ''
-    substituteInPlace gnomekeyringextention.cpp \
-      --replace "/usr/share/dpa-ext-gnomekeyring" "$out/share/dpa-ext-gnomekeyring"
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.qttools
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    dtkwidget
-    dde-polkit-agent
-    qt5integration
-    libsecret
-  ];
-
-  meta = with lib; {
-    description = "GNOME keyring extension for dde-polkit-agent";
-    homepage = "https://github.com/linuxdeepin/dpa-ext-gnomekeyring";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
deleted file mode 100644
index a7e01c215d11..000000000000
--- a/pkgs/desktops/deepin/default.nix
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-}:
-let
-  packages =
-    self:
-    let
-      inherit (self) callPackage;
-    in
-    {
-      #### LIBRARIES
-      dtkcommon = callPackage ./library/dtkcommon { };
-      dtkcore = callPackage ./library/dtkcore { };
-      dtkgui = callPackage ./library/dtkgui { };
-      dtkwidget = callPackage ./library/dtkwidget { };
-      dtkdeclarative = callPackage ./library/dtkdeclarative { };
-      dtklog = callPackage ./library/dtklog { };
-      deepin-pdfium = callPackage ./library/deepin-pdfium { };
-      qt5platform-plugins = callPackage ./library/qt5platform-plugins { };
-      qt5integration = callPackage ./library/qt5integration { };
-      deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { };
-      dwayland = callPackage ./library/dwayland { };
-      dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { };
-      disomaster = callPackage ./library/disomaster { };
-      docparser = callPackage ./library/docparser { };
-      gio-qt = callPackage ./library/gio-qt { };
-      udisks2-qt5 = callPackage ./library/udisks2-qt5 { };
-      util-dfm = callPackage ./library/util-dfm { };
-      dtk6core = callPackage ./library/dtk6core { };
-      dtk6gui = callPackage ./library/dtk6gui { };
-      dtk6widget = callPackage ./library/dtk6widget { };
-      dtk6declarative = callPackage ./library/dtk6declarative { };
-      dtk6systemsettings = callPackage ./library/dtk6systemsettings { };
-      dtk6log = callPackage ./library/dtk6log { };
-      qt6platform-plugins = callPackage ./library/qt6platform-plugins { };
-      qt6integration = callPackage ./library/qt6integration { };
-      qt6mpris = callPackage ./library/qt6mpris { };
-      treeland-protocols = callPackage ./library/treeland-protocols { };
-
-      #### CORE
-      deepin-kwin = callPackage ./core/deepin-kwin { };
-      dde-appearance = callPackage ./core/dde-appearance { };
-      dde-app-services = callPackage ./core/dde-app-services { };
-      dde-application-manager = callPackage ./core/dde-application-manager { };
-      dde-control-center = callPackage ./core/dde-control-center { };
-      dde-calendar = callPackage ./core/dde-calendar { };
-      dde-clipboard = callPackage ./core/dde-clipboard { };
-      dde-file-manager = callPackage ./core/dde-file-manager { };
-      dde-launchpad = callPackage ./core/dde-launchpad { };
-      dde-network-core = callPackage ./core/dde-network-core { };
-      dde-session = callPackage ./core/dde-session { };
-      dde-session-shell = callPackage ./core/dde-session-shell { };
-      dde-session-ui = callPackage ./core/dde-session-ui { };
-      deepin-service-manager = callPackage ./core/deepin-service-manager { };
-      dde-polkit-agent = callPackage ./core/dde-polkit-agent { };
-      dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { };
-      dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { };
-      dde-widgets = callPackage ./core/dde-widgets { };
-      dde-shell = callPackage ./core/dde-shell { };
-      dde-grand-search = callPackage ./core/dde-grand-search { };
-      dde-tray-loader = callPackage ./core/dde-tray-loader { };
-      dde-api-proxy = callPackage ./core/dde-api-proxy { };
-
-      #### Dtk Application
-      deepin-calculator = callPackage ./apps/deepin-calculator { };
-      deepin-compressor = callPackage ./apps/deepin-compressor { };
-      deepin-draw = callPackage ./apps/deepin-draw { };
-      deepin-editor = callPackage ./apps/deepin-editor { };
-      deepin-music = callPackage ./apps/deepin-music { };
-      deepin-picker = callPackage ./apps/deepin-picker { };
-      deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { };
-      deepin-system-monitor = callPackage ./apps/deepin-system-monitor { };
-      deepin-terminal = callPackage ./apps/deepin-terminal { };
-      deepin-reader = callPackage ./apps/deepin-reader { };
-      deepin-screensaver = callPackage ./apps/deepin-screensaver { };
-
-      #### Go Packages
-      dde-api = callPackage ./go-package/dde-api { };
-      dde-daemon = callPackage ./go-package/dde-daemon { };
-      deepin-pw-check = callPackage ./go-package/deepin-pw-check { };
-      deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { };
-      startdde = callPackage ./go-package/startdde { };
-
-      #### TOOLS
-      dde-device-formatter = callPackage ./tools/dde-device-formatter { };
-      deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { };
-      deepin-anything = callPackage ./tools/deepin-anything { };
-
-      #### ARTWORK
-      dde-account-faces = callPackage ./artwork/dde-account-faces { };
-      deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { };
-      deepin-wallpapers = callPackage ./artwork/deepin-wallpapers { };
-      deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { };
-      deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { };
-      deepin-desktop-theme = callPackage ./artwork/deepin-desktop-theme { };
-
-      #### MISC
-      deepin-desktop-base = callPackage ./misc/deepin-desktop-base { };
-    }
-    // lib.optionalAttrs config.allowAliases {
-      dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27
-      dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23
-      dde-dock = throw "The 'deepin.dde-dock' is no longer maintained. Please use 'deepin.dde-tray-loader' instead."; # added 2024-08-28
-      deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23
-      deepin-turbo = throw "The 'deepin.deepin-turbo' package was removed as it is outdated and no longer relevant."; # added 2024-12-06
-      go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31
-      go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31
-      go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31
-      deepin-movie-reborn = throw "'deepin.deepin-movie-reborn' has been removed as it was broken and unmaintained in nixpkgs, Please use 'vlc' instead"; # added 2025-01-16;
-      deepin-album = throw "'deepin.deepin-album' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16
-      deepin-voice-note = throw "'deepin.deepin-voice-note' has been removed as it depending on deepin-movie-reborn which was broken"; # added 2025-01-16
-      deepin-screen-recorder = throw "'deepin.deepin-screen-recorder' has been removed as it was broken and unmaintained in nixpkgs, Please use 'flameshot' or 'simplescreenrecorder' instead"; # added 2025-01-16
-      deepin-ocr-plugin-manager = throw "'deepin.deepin-ocr-plugin-manager' has been removed as it was outdated"; # added 2025-01-16
-      deepin-camera = throw "'deepin.deepin-camera' has been removed as it was unmaintained in nixpkgs, Please use 'snapshot' instead"; # added 2025-01-16
-      deepin-image-viewer = throw "'deepin.deepin-image-viewer' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16
-      image-editor = throw "'deepin.image-editor' has been removed as it was unmaintained in nixpkgs"; # added 2025-01-16
-    };
-in
-lib.makeScope pkgs.newScope packages
diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix
deleted file mode 100644
index e93b47bc9c1c..000000000000
--- a/pkgs/desktops/deepin/go-package/dde-api/default.nix
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  buildGoModule,
-  pkg-config,
-  deepin-gettext-tools,
-  wrapGAppsHook3,
-  alsa-lib,
-  gtk3,
-  libcanberra,
-  libgudev,
-  librsvg,
-  poppler,
-  pulseaudio,
-  gdk-pixbuf-xlib,
-  coreutils,
-  dbus,
-}:
-
-buildGoModule rec {
-  pname = "dde-api";
-  version = "6.0.11";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-VpZwVNXxdi8ODwxbksQpT0nnUuLOTJ9h0JYucEKdGYM=";
-  };
-
-  vendorHash = "sha256-zrtUsCF2+301DKwgWectw+UbOehOp8h8u/IMf09XQ8Q=";
-
-  postPatch = ''
-    substituteInPlace misc/systemd/system/deepin-shutdown-sound.service \
-      --replace-fail "/usr/bin/true" "${coreutils}/bin/true"
-
-    substituteInPlace sound-theme-player/main.go \
-      --replace-fail "/usr/sbin/alsactl" "alsactl"
-
-    substituteInPlace misc/{scripts/deepin-boot-sound.sh,systemd/system/deepin-login-sound.service} \
-      --replace-fail "/usr/bin/dbus-send" "${dbus}/bin/dbus-send"
-
-    substituteInPlace lunar-calendar/huangli.go adjust-grub-theme/main.go \
-      --replace-fail "/usr/share/dde-api" "$out/share/dde-api"
-
-    substituteInPlace themes/{theme.go,settings.go} \
-      --replace-fail "/usr/share" "/run/current-system/sw/share"
-
-    for file in $(grep "/usr/lib/deepin-api" * -nR |awk -F: '{print $1}')
-    do
-      sed -i 's|/usr/lib/deepin-api|/run/current-system/sw/lib/deepin-api|g' $file
-    done
-  '';
-
-  nativeBuildInputs = [
-    pkg-config
-    deepin-gettext-tools
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    alsa-lib
-    gtk3
-    libcanberra
-    libgudev
-    librsvg
-    poppler
-    pulseaudio
-    gdk-pixbuf-xlib
-  ];
-
-  buildPhase = ''
-    runHook preBuild
-    make GOBUILD_OPTIONS="$GOFLAGS"
-    runHook postBuild
-  '';
-
-  doCheck = false;
-
-  installPhase = ''
-    runHook preInstall
-    make install DESTDIR="$out" PREFIX="/"
-    runHook postInstall
-  '';
-
-  postFixup = ''
-    for binary in $out/lib/deepin-api/*; do
-      wrapProgram $binary "''${gappsWrapperArgs[@]}"
-    done
-  '';
-
-  meta = with lib; {
-    description = "Dbus interfaces used for screen zone detecting, thumbnail generating, sound playing, etc";
-    mainProgram = "dde-open";
-    homepage = "https://github.com/linuxdeepin/dde-api";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/0001-dont-set-PATH.diff b/pkgs/desktops/deepin/go-package/dde-daemon/0001-dont-set-PATH.diff
deleted file mode 100644
index f1d9f8017af6..000000000000
--- a/pkgs/desktops/deepin/go-package/dde-daemon/0001-dont-set-PATH.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/grub2/modify_manger.go b/grub2/modify_manger.go
-index a811770b..30e9561e 100644
---- a/grub2/modify_manger.go
-+++ b/grub2/modify_manger.go
-@@ -21,7 +21,6 @@ const (
- )
- 
- func init() {
--	_ = os.Setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin")
- }
- 
- type modifyManager struct {
--- 
-2.39.2
-
diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/0002-fix-custom-wallpapers-path.diff b/pkgs/desktops/deepin/go-package/dde-daemon/0002-fix-custom-wallpapers-path.diff
deleted file mode 100644
index 5d4bddd08009..000000000000
--- a/pkgs/desktops/deepin/go-package/dde-daemon/0002-fix-custom-wallpapers-path.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/bin/dde-system-daemon/wallpaper.go b/bin/dde-system-daemon/wallpaper.go
-index 6ee26e27..67dc77dc 100644
---- a/bin/dde-system-daemon/wallpaper.go
-+++ b/bin/dde-system-daemon/wallpaper.go
-@@ -24,7 +24,7 @@ import (
- 
- const maxCount = 5
- const maxSize = 32 * 1024 * 1024
--const wallPaperDir = "/usr/share/wallpapers/custom-wallpapers/"
-+const wallPaperDir = "/var/lib/dde-daemon/wallpapers/custom-wallpapers/"
- 
- func GetUserDir(username string) (string, error) {
- 	dir := filepath.Join(wallPaperDir, username)
-@@ -136,7 +136,7 @@ func (d *Daemon) SaveCustomWallPaper(sender dbus.Sender, username string, file s
- 		"-u",
- 		username,
- 		"--",
--		"head",
-+		"@coreutils@/bin/head",
- 		"-c",
- 		"0",
- 		file,
--- 
-2.40.1
-
diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/0003-aviod-use-hardcode-path.diff b/pkgs/desktops/deepin/go-package/dde-daemon/0003-aviod-use-hardcode-path.diff
deleted file mode 100644
index ca508e772556..000000000000
--- a/pkgs/desktops/deepin/go-package/dde-daemon/0003-aviod-use-hardcode-path.diff
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/accounts1/user.go b/accounts1/user.go
-index 8101d9c6..16c7f15f 100644
---- a/accounts1/user.go
-+++ b/accounts1/user.go
-@@ -482,7 +482,7 @@ func (u *User) checkIsControlCenter(sender dbus.Sender) bool {
- 		return false
- 	}
- 
--	if exe == controlCenterPath {
-+	if strings.Contains(exe, "dde-control-center") {
- 		return true
- 	}
- 
-diff --git a/accounts1/user_chpwd_union_id.go b/accounts1/user_chpwd_union_id.go
-index 61a691d9..47d2163e 100644
---- a/accounts1/user_chpwd_union_id.go
-+++ b/accounts1/user_chpwd_union_id.go
-@@ -89,14 +89,13 @@ func newCaller(service *dbusutil.Service, sender dbus.Sender) (ret *caller, err
- 
- 	// 只允许来自控制中心, 锁屏和 greetter 的调用
- 	var app string
--	switch exe {
--	case "/usr/bin/dde-control-center":
-+	if (strings.Contains(exe, "dde-control-center")) {
- 		app = "control-center"
--	case "/usr/bin/dde-lock":
-+	} else if (strings.Contains(exe, "dde-lock")) {
- 		app = "lock"
--	case "/usr/bin/lightdm-deepin-greeter":
-+	} else if (strings.Contains(exe, "lightdm-deepin-greeter")) {
- 		app = "greeter"
--	default:
-+	} else {
- 		err = fmt.Errorf("set password with Union ID called by %s, which is not allow", exe)
- 		return
- 	}
-diff --git a/bin/dde-authority/fprint_transaction.go b/bin/dde-authority/fprint_transaction.go
-index ca2951a0..3223ad25 100644
---- a/bin/dde-authority/fprint_transaction.go
-+++ b/bin/dde-authority/fprint_transaction.go
-@@ -461,7 +461,7 @@ func (tx *FPrintTransaction) End(sender dbus.Sender) *dbus.Error {
- 
- func killFPrintDaemon() {
- 	logger.Debug("kill fprintd")
--	err := exec.Command("pkill", "-f", "/usr/lib/fprintd/fprintd").Run()
-+	err := exec.Command("pkill", "fprintd").Run()
- 	if err != nil {
- 		logger.Warning("failed to kill fprintd:", err)
- 	}
-diff --git a/grub2/grub2.go b/grub2/grub2.go
-index 085b7157..10cb8256 100644
---- a/grub2/grub2.go
-+++ b/grub2/grub2.go
-@@ -603,7 +603,7 @@ func checkInvokePermission(service *dbusutil.Service, sender dbus.Sender) error
- 	if err != nil {
- 		return err
- 	}
--	if cmd == "/usr/bin/dde-control-center" {
-+	if strings.Contains(cmd, "dde-control-center") {
- 		return nil
- 	}
- 	uid, err := service.GetConnUID(string(sender))
-diff --git a/misc/etc/acpi/powerbtn.sh b/misc/etc/acpi/powerbtn.sh
-index 5c536b9e..39c28987 100755
---- a/misc/etc/acpi/powerbtn.sh
-+++ b/misc/etc/acpi/powerbtn.sh
-@@ -58,4 +58,4 @@ elif test "$XUSER" != "" && test -x /usr/bin/qdbus; then
- fi
- 
- # If all else failed, just initiate a plain shutdown.
--/sbin/shutdown -h now "Power button pressed"
-+shutdown -h now "Power button pressed"
-diff --git a/misc/udev-rules/80-deepin-fprintd.rules b/misc/udev-rules/80-deepin-fprintd.rules
-index 7063a40c..c4c6103a 100644
---- a/misc/udev-rules/80-deepin-fprintd.rules
-+++ b/misc/udev-rules/80-deepin-fprintd.rules
-@@ -1 +1 @@
--SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_interface", ACTION=="add|remove", ENV{LIBFPRINT_DRIVER}!="", RUN+="/usr/bin/dbus-send --system --dest=org.deepin.dde.Fprintd1 --print-reply /org/deepin/dde/Fprintd1 org.deepin.dde.Fprintd1.TriggerUDevEvent"
-+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_interface", ACTION=="add|remove", ENV{LIBFPRINT_DRIVER}!="", RUN+="@dbus@/bin/dbus-send --system --dest=org.deepin.dde.Fprintd1 --print-reply /org/deepin/dde/Fprintd1 org.deepin.dde.Fprintd1.TriggerUDevEvent"
-diff --git a/system/display/displaycfg.go b/system/display/displaycfg.go
-index cda69a77..e394ae07 100644
---- a/system/display/displaycfg.go
-+++ b/system/display/displaycfg.go
-@@ -255,7 +255,7 @@ func (d *Display) doDetectSupportWayland(sender dbus.Sender) (bool, error) {
- 			return false, err
- 		}
- 		var cmd *exec.Cmd
--		if execPath == "/usr/bin/lightdm-deepin-greeter" {
-+		if strings.Contains(execPath, "lightdm-deepin-greeter") {
- 			cmd = exec.Command("runuser", "-u", "lightdm", "glxinfo") // runuser -u lightdm glxinfo
- 		} else {
- 			cmd = exec.Command("glxinfo")
diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix
deleted file mode 100644
index 56c6b7a8eade..000000000000
--- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  replaceVars,
-  buildGoModule,
-  pkg-config,
-  deepin-gettext-tools,
-  gettext,
-  python3,
-  wrapGAppsHook3,
-  ddcutil,
-  alsa-lib,
-  glib,
-  gtk3,
-  libgudev,
-  libinput,
-  libnl,
-  librsvg,
-  linux-pam,
-  libxcrypt,
-  networkmanager,
-  pulseaudio,
-  gdk-pixbuf-xlib,
-  tzdata,
-  xkeyboard_config,
-  runtimeShell,
-  dbus,
-  util-linux,
-  dde-session-ui,
-  coreutils,
-  lshw,
-  dmidecode,
-  systemd,
-  udevCheckHook,
-}:
-
-buildGoModule rec {
-  pname = "dde-daemon";
-  version = "6.0.43";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-3BzFFlcNwNWNcysD3qRYfdyGaX7gW2XJZ4HzdGiK7jU=";
-  };
-
-  vendorHash = "sha256-3kUAaVXERqNZhBFytzVbWY6/a8M0jIkWrN+QHdWp1HU=";
-
-  patches = [
-    ./0001-dont-set-PATH.diff
-    (replaceVars ./0002-fix-custom-wallpapers-path.diff {
-      inherit coreutils;
-    })
-    (replaceVars ./0003-aviod-use-hardcode-path.diff {
-      inherit dbus;
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace session/eventlog/{app_event.go,login_event.go} \
-      --replace-fail "/bin/bash" "${runtimeShell}"
-
-    substituteInPlace inputdevices/layout_list.go \
-      --replace-fail "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb"
-
-    substituteInPlace accounts1/user.go \
-      --replace-fail "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers"
-
-    substituteInPlace timedate1/zoneinfo/zone.go \
-      --replace-fail "/usr/share/dde" "$out/share/dde" \
-      --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
-
-    substituteInPlace accounts1/image_blur.go grub2/modify_manger.go \
-      --replace-fail "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api"
-
-    substituteInPlace accounts1/user_chpwd_union_id.go \
-      --replace-fail "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center"
-
-    substituteInPlace system/uadp1/crypto.go \
-      --replace-fail "/usr/share/uadp" "/var/lib/dde-daemon/uadp"
-
-    for file in $(grep "/usr/lib/deepin-daemon" * -nR |awk -F: '{print $1}')
-    do
-      sed -i 's|/usr/lib/deepin-daemon|/run/current-system/sw/lib/deepin-daemon|g' $file
-    done
-
-    patchShebangs .
-  '';
-
-  nativeBuildInputs = [
-    pkg-config
-    deepin-gettext-tools
-    gettext
-    python3
-    wrapGAppsHook3
-    udevCheckHook
-  ];
-
-  buildInputs = [
-    ddcutil
-    linux-pam
-    libxcrypt
-    alsa-lib
-    glib
-    libgudev
-    gtk3
-    gdk-pixbuf-xlib
-    networkmanager
-    libinput
-    libnl
-    librsvg
-    pulseaudio
-    tzdata
-    xkeyboard_config
-  ];
-
-  buildPhase = ''
-    runHook preBuild
-    make GOBUILD_OPTIONS="$GOFLAGS"
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    make install DESTDIR="$out" PREFIX="/"
-    runHook postInstall
-  '';
-
-  doCheck = false;
-
-  doInstallCheck = true;
-
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix PATH : "${
-        lib.makeBinPath [
-          util-linux
-          dde-session-ui
-          glib
-          lshw
-          dmidecode
-          systemd
-        ]
-      }"
-    )
-  '';
-
-  postFixup = ''
-    for binary in $out/lib/deepin-daemon/*; do
-      if [ "$binary" == "$out/lib/deepin-daemon/service-trigger" ] ; then
-        continue;
-      fi
-      wrapGApp $binary
-    done
-  '';
-
-  meta = with lib; {
-    description = "Daemon for handling the deepin session settings";
-    homepage = "https://github.com/linuxdeepin/dde-daemon";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
deleted file mode 100644
index 8cbfc4d47e01..000000000000
--- a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  stdenv,
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  glib,
-}:
-
-buildGoModule rec {
-  pname = "deepin-desktop-schemas";
-  version = "6.0.7";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-Zp80Yz0qkFAwpQJPgs/gcfCG2DMtvpKdVKRlqOTmaCk=";
-  };
-
-  vendorHash = "sha256-q6ugetchJLv2JjZ9+nevUI0ptizh2V+6SByoY/eFJJQ=";
-
-  postPatch = ''
-    # Relocate files path for backgrounds and wallpapers
-    for file in $(grep -rl "/usr/share")
-    do
-      substituteInPlace $file \
-        --replace-fail "/usr/share" "/run/current-system/sw/share"
-    done
-  '';
-
-  buildPhase = ''
-    runHook preBuild
-    make ARCH=${stdenv.hostPlatform.linuxArch}
-    runHook postBuild
-  '';
-
-  nativeCheckInputs = [ glib ];
-  checkPhase = ''
-    runHook preCheck
-    make test
-    runHook postCheck
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    make install DESTDIR="$out" PREFIX="/"
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "GSettings deepin desktop-wide schemas";
-    homepage = "https://github.com/linuxdeepin/deepin-desktop-schemas";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
deleted file mode 100644
index 3ca39dba0d55..000000000000
--- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  buildGoModule,
-  pkg-config,
-  deepin-gettext-tools,
-  gtk3,
-  glib,
-  libxcrypt,
-  gettext,
-  iniparser,
-  cracklib,
-  linux-pam,
-}:
-
-buildGoModule rec {
-  pname = "deepin-pw-check";
-  version = "6.0.2";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-kBrkcB0IWGUV4ZrkFzwdPglRgDcnVvYDFhTXS20pKOk=";
-  };
-
-  patches = [ "${src}/rpm/0001-Mangle-Suit-Cracklib2.9.6.patch" ];
-
-  vendorHash = "sha256-L0vUEkUN70Hrx5roIvTfaZBHbbq7mf3WpQJeFAMU5HY=";
-
-  nativeBuildInputs = [
-    pkg-config
-    gettext
-    deepin-gettext-tools
-  ];
-
-  buildInputs = [
-    glib
-    libxcrypt
-    gtk3
-    iniparser
-    cracklib
-    linux-pam
-  ];
-
-  postPatch = ''
-    sed -i '1i#include <stdlib.h>\n#include <string.h>' tool/pwd_conf_update.c
-    substituteInPlace misc/{pkgconfig/libdeepin_pw_check.pc,system-services/org.deepin.dde.PasswdConf1.service} \
-      --replace-fail "/usr" "$out"
-  '';
-
-  buildPhase = ''
-    runHook preBuild
-    make
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    make install PREFIX="$out" PKG_FILE_DIR=$out/lib/pkgconfig PAM_MODULE_DIR=$out/etc/pam.d
-    # https://github.com/linuxdeepin/deepin-pw-check/blob/d5597482678a489077a506a87f06d2b6c4e7e4ed/debian/rules#L21
-    ln -s $out/lib/libdeepin_pw_check.so $out/lib/libdeepin_pw_check.so.1
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Tool to verify the validity of the password";
-    mainProgram = "pwd-conf-update";
-    homepage = "https://github.com/linuxdeepin/deepin-pw-check";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/go-package/startdde/default.nix b/pkgs/desktops/deepin/go-package/startdde/default.nix
deleted file mode 100644
index a85b50b4a3ce..000000000000
--- a/pkgs/desktops/deepin/go-package/startdde/default.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  gettext,
-  pkg-config,
-  jq,
-  wrapGAppsHook3,
-  glib,
-  libgnome-keyring,
-  gtk3,
-  alsa-lib,
-  pulseaudio,
-  libgudev,
-  libsecret,
-  runtimeShell,
-  dbus,
-}:
-
-buildGoModule rec {
-  pname = "startdde";
-  version = "6.0.15";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-RSfdlLT2v3fM4P8E0mIyZZ8A1MWVIS0N0MDczqq7Y64=";
-  };
-
-  vendorHash = "sha256-Y81p3yPQayXbvyUI7N6PvFDO3hSU3SL0AuUKxvZkZNE=";
-
-  postPatch = ''
-    substituteInPlace display/manager.go \
-      --replace "/bin/bash" "${runtimeShell}"
-
-    substituteInPlace misc/systemd_task/dde-display-task-refresh-brightness.service \
-       --replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send"
-
-    substituteInPlace display/manager.go \
-      --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
-
-    substituteInPlace misc/lightdm.conf --replace "/usr" "$out"
-  '';
-
-  nativeBuildInputs = [
-    gettext
-    pkg-config
-    jq
-    wrapGAppsHook3
-    glib
-  ];
-
-  buildInputs = [
-    libgnome-keyring
-    gtk3
-    alsa-lib
-    pulseaudio
-    libgudev
-    libsecret
-  ];
-
-  buildPhase = ''
-    runHook preBuild
-    make GO_BUILD_FLAGS="$GOFLAGS"
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    make install DESTDIR="$out" PREFIX="/"
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Starter of deepin desktop environment";
-    homepage = "https://github.com/linuxdeepin/startdde";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
deleted file mode 100644
index 1c3ba4fdea41..000000000000
--- a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  libsForQt5,
-  python3,
-  dtkcore,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-qt-dbus-factory";
-  version = "6.0.1";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-B9SrApvjTIW2g9VayrmCsWXS9Gkg55Voi1kPP+KYp3s=";
-  };
-
-  nativeBuildInputs = [
-    libsForQt5.qmake
-    libsForQt5.wrapQtAppsHook
-    python3
-  ];
-
-  buildInputs = [
-    libsForQt5.qtbase
-    dtkcore
-  ];
-
-  qmakeFlags = [
-    "INSTALL_ROOT=${placeholder "out"}"
-    "LIB_INSTALL_DIR=${placeholder "out"}/lib"
-  ];
-
-  postPatch = ''
-    substituteInPlace libdframeworkdbus/libdframeworkdbus.pro \
-      --replace-fail "/usr" ""
-    substituteInPlace libdframeworkdbus/DFrameworkdbusConfig.in \
-      --replace-fail "/usr/include" "$out/include"
-  '';
-
-  meta = {
-    description = "Repo of auto-generated D-Bus source code which DDE used";
-    homepage = "https://github.com/linuxdeepin/dde-qt-dbus-factory";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix
deleted file mode 100644
index c7342c3f6f43..000000000000
--- a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  freetype,
-  icu,
-  libsForQt5,
-  pkg-config,
-  libchardet,
-  libjpeg,
-  lcms2,
-  openjpeg,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-pdfium";
-  version = "1.0.2";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-ymJSTAccwRumXrh4VjwarKYgaqadMBrtXM1rjWNfe8o=";
-  };
-
-  nativeBuildInputs = [
-    libsForQt5.qmake
-    pkg-config
-  ];
-
-  dontWrapQtApps = true;
-
-  buildInputs = [
-    freetype
-    icu
-    libchardet
-    libjpeg
-    lcms2
-    openjpeg
-  ];
-
-  meta = with lib; {
-    description = "Development library for PDF on deepin";
-    homepage = "https://github.com/linuxdeepin/deepin-pdfium";
-    license = licenses.lgpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix
deleted file mode 100644
index c13f02c2c68c..000000000000
--- a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  extra-cmake-modules,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-wayland-protocols";
-  version = "1.6.0-deepin.1.2";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-8Im3CueC8sYA5mwRU/Z7z8HA4mPQvVSqcTD813QCYxo=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  meta = with lib; {
-    description = "XML files of the non-standard wayland protocols use in deepin";
-    homepage = "https://github.com/linuxdeepin/deepin-wayland-protocols";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/disomaster/default.nix b/pkgs/desktops/deepin/library/disomaster/default.nix
deleted file mode 100644
index ad462fc6c755..000000000000
--- a/pkgs/desktops/deepin/library/disomaster/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  pkg-config,
-  libsForQt5,
-  libisoburn,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "disomaster";
-  version = "5.0.8";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-wN8mhddqqzYXkT6rRWsHVCWzaG2uRcF2iiFHlZx2LfY=";
-  };
-
-  nativeBuildInputs = [
-    libsForQt5.qmake
-    libsForQt5.qttools
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [ libisoburn ];
-
-  qmakeFlags = [ "VERSION=${version}" ];
-
-  meta = with lib; {
-    description = "Libisoburn wrapper class for Qt";
-    homepage = "https://github.com/linuxdeepin/disomaster";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix
deleted file mode 100644
index f9fff425ac10..000000000000
--- a/pkgs/desktops/deepin/library/docparser/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  pkg-config,
-  libsForQt5,
-  poppler,
-  pugixml,
-  libzip,
-  libuuid,
-  libxml2,
-  tinyxml-2,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "docparser";
-  version = "1.0.11";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-shZXhs9ncgm6rECvCWrLi26RO1WAc1gRowoYmeKesfk=";
-  };
-
-  nativeBuildInputs = [
-    libsForQt5.qmake
-    libsForQt5.qttools
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    poppler
-    pugixml
-    libzip
-    libuuid
-    libxml2
-    tinyxml-2
-  ];
-
-  qmakeFlags = [ "VERSION=${version}" ];
-
-  meta = {
-    description = "Document parser library ported from document2html";
-    homepage = "https://github.com/linuxdeepin/docparser";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix
deleted file mode 100644
index ff753a81ecf2..000000000000
--- a/pkgs/desktops/deepin/library/dtk6core/default.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  fetchpatch,
-  cmake,
-  pkg-config,
-  doxygen,
-  qt6Packages,
-  lshw,
-  libuchardet,
-  dtkcommon,
-  dtk6log,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dtk6core";
-  version = "6.0.33";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = "dtk6core";
-    rev = finalAttrs.version;
-    hash = "sha256-AmGQoDt9qp0m0iV7WrR16DPTt80Y5leRUVXPOtHeugs=";
-  };
-
-  patches = [
-    ./fix-pkgconfig-path.patch
-    ./fix-pri-path.patch
-    (fetchpatch {
-      name = "resolve-compilation-issues-on-Qt-6_9.patch";
-      url = "https://github.com/linuxdeepin/dtkcore/commit/8f523a8b387a006b942268e2143d0d58c574f7c5.patch";
-      hash = "sha256-x8BfWCdsz8Bf/sAM7PymZWqlPyEabwP0e6ybfz/2oZ4=";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace misc/DtkCoreConfig.cmake.in \
-      --subst-var-by PACKAGE_TOOL_INSTALL_DIR ${placeholder "out"}/libexec/dtk6/DCore/bin
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    doxygen
-    qt6Packages.qttools
-    qt6Packages.wrapQtAppsHook
-  ];
-
-  dontWrapQtApps = true;
-
-  buildInputs = [
-    qt6Packages.qtbase
-    lshw
-    libuchardet
-  ];
-
-  propagatedBuildInputs = [
-    dtkcommon
-    dtk6log
-  ];
-
-  cmakeFlags = [
-    "-DDTK_VERSION=${finalAttrs.version}"
-    "-DBUILD_DOCS=ON"
-    "-DBUILD_EXAMPLES=OFF"
-    "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc"
-    "-DDSG_PREFIX_PATH='/run/current-system/sw'"
-    "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
-    "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata"
-  ];
-
-  preConfigure = ''
-    # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
-    # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
-  '';
-
-  outputs = [
-    "out"
-    "dev"
-    "doc"
-  ];
-
-  postFixup = ''
-    for binary in $out/libexec/dtk6/DCore/bin/*; do
-      wrapQtApp $binary
-    done
-  '';
-
-  meta = {
-    description = "Deepin tool kit core library";
-    homepage = "https://github.com/linuxdeepin/dtk6core";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-})
diff --git a/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch
deleted file mode 100644
index 570e34c06147..000000000000
--- a/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/misc/dtkcore.pc.in b/misc/dtkcore.pc.in
-index 83eecb7..da24ce8 100644
---- a/misc/dtkcore.pc.in
-+++ b/misc/dtkcore.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/@LIBRARY_INSTALL_DIR@
--includedir=${prefix}/@INCLUDE_INSTALL_DIR@
-+libdir=@LIBRARY_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_DIR@
- 
- Name: dtk@DTK_VERSION_MAJOR@core
- Description: Deepin Tool Kit dtkcore header files
diff --git a/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch
deleted file mode 100644
index 19953ed1733d..000000000000
--- a/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/misc/qt_lib_dtkcore.pri.in b/misc/qt_lib_dtkcore.pri.in
-index a331f52..ce01dc0 100644
---- a/misc/qt_lib_dtkcore.pri.in
-+++ b/misc/qt_lib_dtkcore.pri.in
-@@ -4,9 +4,9 @@ QT.dtkcore.MINOR_VERSION = @PROJECT_VERSION_MINOR@
- QT.dtkcore.PATCH_VERSION = @PROJECT_VERSION_PATCH@
- QT.dtkcore.name = dtkcore
- QT.dtkcore.module = dtk@DTK_VERSION_MAJOR@core
--QT.dtkcore.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@
--QT.dtkcore.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@
--QT.dtkcore.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
-+QT.dtkcore.tools = @TOOL_INSTALL_DIR@
-+QT.dtkcore.libs = @LIBRARY_INSTALL_DIR@
-+QT.dtkcore.includes = @INCLUDE_INSTALL_DIR@
- QT.dtkcore.frameworks =
- QT.dtkcore.depends = core dbus xml
- QT.dtkcore.module_config = v2 ltcg
diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix
deleted file mode 100644
index 57c58dceccb4..000000000000
--- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  doxygen,
-  qt6Packages,
-  dtk6gui,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dtk6declarative";
-  version = "6.0.33";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = "dtk6declarative";
-    rev = finalAttrs.version;
-    hash = "sha256-hFH5XCeNs31hslaPMyuXBLe0Du3s6STs9kltwL+/F1s=";
-  };
-
-  patches = [
-    ./fix-pkgconfig-path.patch
-    ./fix-pri-path.patch
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    doxygen
-    qt6Packages.qttools
-    qt6Packages.wrapQtAppsHook
-  ];
-
-  propagatedBuildInputs = [
-    dtk6gui
-  ]
-  ++ (with qt6Packages; [
-    qtbase
-    qtdeclarative
-    qtshadertools
-    qt5compat
-  ]);
-
-  cmakeFlags = [
-    "-DDTK_VERSION=${finalAttrs.version}"
-    "-DBUILD_DOCS=ON"
-    "-DBUILD_EXAMPLES=ON"
-    "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules"
-    "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc"
-    "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}"
-  ];
-
-  preConfigure = ''
-    # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
-    # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
-    export QML2_IMPORT_PATH=${lib.getBin qt6Packages.qtdeclarative}/${qt6Packages.qtbase.qtQmlPrefix}
-  '';
-
-  outputs = [
-    "out"
-    "dev"
-    "doc"
-  ];
-
-  meta = {
-    description = "Widget development toolkit based on QtQuick/QtQml";
-    mainProgram = "dtk-exhibition";
-    homepage = "https://github.com/linuxdeepin/dtk6declarative";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-})
diff --git a/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch
deleted file mode 100644
index e15ee2f7a0b8..000000000000
--- a/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/misc/dtkdeclarative.pc.in b/misc/dtkdeclarative.pc.in
-index dc3827f..fd0949e 100644
---- a/misc/dtkdeclarative.pc.in
-+++ b/misc/dtkdeclarative.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/@LIB_INSTALL_DIR@
--includedir=${prefix}/@INCLUDE_INSTALL_DIR@
-+libdir=@LIB_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_DIR@
- 
- Name: DtkDeclarative
- Description: Deepin Tool Kit DtkDeclarative header files
diff --git a/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch
deleted file mode 100644
index e622809c3936..000000000000
--- a/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/misc/qt_lib_dtkdeclarative.pri.in b/misc/qt_lib_dtkdeclarative.pri.in
-index 8797802..44e32a3 100644
---- a/misc/qt_lib_dtkdeclarative.pri.in
-+++ b/misc/qt_lib_dtkdeclarative.pri.in
-@@ -4,8 +4,8 @@ QT.dtkdeclarative.MINOR_VERSION = @PROJECT_VERSION_MINOR@
- QT.dtkdeclarative.PATCH_VERSION = @PROJECT_VERSION_PATCH@
- QT.dtkdeclarative.name = dtkdeclarative
- QT.dtkdeclarative.module = dtk@DTK_VERSION_MAJOR@declarative
--QT.dtkdeclarative.libs = @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@
--QT.dtkdeclarative.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
-+QT.dtkdeclarative.libs = @LIB_INSTALL_DIR@
-+QT.dtkdeclarative.includes = @INCLUDE_INSTALL_DIR@
- QT.dtkdeclarative.frameworks =
- QT.dtkdeclarative.depends = core dbus xml gui dtkcore dtkgui quick quick_private
- QT.dtkdeclarative.module_config = v2 ltcg
diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix
deleted file mode 100644
index e66063f416b5..000000000000
--- a/pkgs/desktops/deepin/library/dtk6gui/default.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  fetchpatch,
-  cmake,
-  pkg-config,
-  doxygen,
-  qt6Packages,
-  dtk6core,
-  librsvg,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dtk6gui";
-  version = "6.0.33";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = "dtk6gui";
-    rev = finalAttrs.version;
-    hash = "sha256-ZnRhrlgrQ7Vusod2diFwVEVnNGHYNq5Ij12GbW6LXWc=";
-  };
-
-  patches = [
-    ./fix-pkgconfig-path.patch
-    ./fix-pri-path.patch
-    (fetchpatch {
-      name = "resolve-compilation-issues-on-Qt-6_9.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6gui/-/raw/ae64c77a73cdea069579ecf6833be63635237180/qt-6.9.patch";
-      hash = "sha256-45L3ZQ9Hv7tLdDjtazLhVl8XgKBtcHL3CT2nw6GkqgM=";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace src/util/dsvgrenderer.cpp \
-      --replace-fail 'QLibrary("rsvg-2", "2")' 'QLibrary("${lib.getLib librsvg}/lib/librsvg-2.so")'
-    sed '1i#include <pwd.h>' \
-      -i 'src/kernel/dguiapplicationhelper.cpp'
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    doxygen
-    qt6Packages.qttools
-    qt6Packages.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    qt6Packages.qtbase
-    qt6Packages.qtwayland
-    librsvg
-  ];
-
-  propagatedBuildInputs = [
-    dtk6core
-    qt6Packages.qtimageformats
-  ];
-
-  cmakeFlags = [
-    "-DDTK_VERSION=${finalAttrs.version}"
-    "-DBUILD_DOCS=ON"
-    "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
-    "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc"
-  ];
-
-  preConfigure = ''
-    # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
-    # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
-  '';
-
-  outputs = [
-    "out"
-    "dev"
-    "doc"
-  ];
-
-  postFixup = ''
-    for binary in $out/libexec/dtk6/DGui/bin/*; do
-      wrapQtApp $binary
-    done
-  '';
-
-  meta = {
-    description = "Deepin Toolkit, gui module for DDE look and feel";
-    homepage = "https://github.com/linuxdeepin/dtk6gui";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-})
diff --git a/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch
deleted file mode 100644
index 1485baccc204..000000000000
--- a/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/misc/dtkgui.pc.in b/misc/dtkgui.pc.in
-index 89fdbbf..ad817c4 100644
---- a/misc/dtkgui.pc.in
-+++ b/misc/dtkgui.pc.in
-@@ -1,8 +1,8 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/@LIBRARY_INSTALL_DIR@
--includedir=${prefix}/@INCLUDE_INSTALL_DIR@
--tooldir=${prefix}/@PACKAGE_TOOL_INSTALL_DIR@
-+libdir=@LIBRARY_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_DIR@
-+tooldir=@PACKAGE_TOOL_INSTALL_DIR@
- 
- Name: dtk@DTK_VERSION_MAJOR@gui
- Description: Deepin Tool Kit dtkgui header files
diff --git a/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch
deleted file mode 100644
index b746d34b1c79..000000000000
--- a/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/misc/qt_lib_dtkgui.pri.in b/misc/qt_lib_dtkgui.pri.in
-index 28308ee..9fb25e6 100644
---- a/misc/qt_lib_dtkgui.pri.in
-+++ b/misc/qt_lib_dtkgui.pri.in
-@@ -4,9 +4,9 @@ QT.dtkgui.MINOR_VERSION = @PROJECT_VERSION_MINOR@
- QT.dtkgui.PATCH_VERSION = @PROJECT_VERSION_PATCH@
- QT.dtkgui.name = dtkgui
- QT.dtkgui.module = dtk@DTK_VERSION_MAJOR@gui
--QT.dtkgui.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@
--QT.dtkgui.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@
--QT.dtkgui.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
-+QT.dtkgui.tools = @TOOL_INSTALL_DIR@
-+QT.dtkgui.libs = @LIBRARY_INSTALL_DIR@
-+QT.dtkgui.includes = @INCLUDE_INSTALL_DIR@
- QT.dtkgui.frameworks =
- QT.dtkgui.depends = core gui dtkcore gui_private dbus network
- QT.dtkgui.module_config = v2 internal_module ltcg
diff --git a/pkgs/desktops/deepin/library/dtk6log/default.nix b/pkgs/desktops/deepin/library/dtk6log/default.nix
deleted file mode 100644
index 6e89449f7d0d..000000000000
--- a/pkgs/desktops/deepin/library/dtk6log/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  fetchpatch,
-  cmake,
-  pkg-config,
-  qt6Packages,
-  spdlog,
-  systemd,
-  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dtk6log";
-  version = "0.0.2";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = "dtk6log";
-    rev = finalAttrs.version;
-    hash = "sha256-uPuka+uVCcl2sBMr1SpgqLpcIqZm6BDZyGd7FOraHVM=";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "resolve-compilation-issues-on-Qt-6_9.patch";
-      url = "https://github.com/linuxdeepin/dtklog/commit/ab7ed5aa8433c726470f2aecc1d99f118eae8b63.patch";
-      hash = "sha256-QK4MOAzTZjjK5qfmzguXAgHO9guMCRN/5y+llBSY2vk=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    qt6Packages.wrapQtAppsHook
-  ];
-
-  dontWrapQtApps = true;
-
-  buildInputs = [
-    qt6Packages.qtbase
-    spdlog
-  ]
-  ++ lib.optional withSystemd systemd;
-
-  cmakeFlags = [
-    (lib.cmakeBool "BUILD_WITH_QT6" true)
-    (lib.cmakeBool "BUILD_WITH_SYSTEMD" withSystemd)
-    (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
-    (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
-  ];
-
-  meta = {
-    description = "Simple, convinient and thread safe logger for Qt-based C++ apps";
-    homepage = "https://github.com/linuxdeepin/dtk6log";
-    license = lib.licenses.lgpl21Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-})
diff --git a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix
deleted file mode 100644
index 1049dfe422f4..000000000000
--- a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  doxygen,
-  qt6Packages,
-  dtk6core,
-  libxcrypt,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dtk6systemsettings";
-  version = "6.0.2";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-b/iI2OKQQoFj3vWatfGdDP9z+SEsK5XBra9KqjlGzqs=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    doxygen
-    qt6Packages.qttools
-  ];
-
-  dontWrapQtApps = true;
-
-  buildInputs = [
-    qt6Packages.qtbase
-    dtk6core
-    libxcrypt
-  ];
-
-  cmakeFlags = [
-    "-DDTK_VERSION=${version}"
-    "-DBUILD_DOCS=ON"
-    "-DBUILD_EXAMPLES=OFF"
-    "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc"
-    "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
-    "-DDTK_INCLUDE_INSTALL_DIR=${placeholder "dev"}/include/dtk/DSystemSettings"
-  ];
-
-  preConfigure = ''
-    # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
-    # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
-  '';
-
-  outputs = [
-    "out"
-    "dev"
-    "doc"
-  ];
-
-  meta = {
-    description = "Qt-based development library for system settings";
-    homepage = "https://github.com/linuxdeepin/dtk6systemsettings";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix
deleted file mode 100644
index d44097fe6050..000000000000
--- a/pkgs/desktops/deepin/library/dtk6widget/default.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  fetchpatch,
-  cmake,
-  pkg-config,
-  doxygen,
-  qt6Packages,
-  dtk6gui,
-  cups,
-  libstartup_notification,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dtk6widget";
-  version = "6.0.33";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = "dtk6widget";
-    rev = finalAttrs.version;
-    hash = "sha256-CSsN/6Geban/l6Rp5NuxIUomgTlqXyvttafTbjZIwSc=";
-  };
-
-  patches = [
-    ./fix-pkgconfig-path.patch
-    ./fix-pri-path.patch
-    (fetchpatch {
-      name = "resolve-compilation-issues-on-Qt-6_9.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6widget/-/raw/ce8f89bbed6ebd4659c7f964f158857ebfdee01c/qt-6.9.patch";
-      hash = "sha256-LlFBXuoPxuszO9bkXK1Cy6zMTSnlh33UnmlKMJk3QH0=";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace src/widgets/dapplication.cpp \
-      --replace-fail "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \
-                "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";"
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    doxygen
-    pkg-config
-    qt6Packages.qttools
-    qt6Packages.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    cups
-    libstartup_notification
-  ]
-  ++ (with qt6Packages; [
-    qtbase
-    qtmultimedia
-    qtsvg
-  ]);
-
-  propagatedBuildInputs = [ dtk6gui ];
-
-  cmakeFlags = [
-    "-DDTK_VERSION=${finalAttrs.version}"
-    "-DBUILD_DOCS=ON"
-    "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules"
-    "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc"
-  ];
-
-  preConfigure = ''
-    # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
-    # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
-  '';
-
-  outputs = [
-    "out"
-    "dev"
-    "doc"
-  ];
-
-  postFixup = ''
-    for binary in $out/lib/dtk6/DWidget/bin/*; do
-      wrapQtApp $binary
-    done
-  '';
-
-  meta = {
-    description = "Deepin graphical user interface library";
-    homepage = "https://github.com/linuxdeepin/dtk6widget";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-})
diff --git a/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch
deleted file mode 100644
index df4452259580..000000000000
--- a/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/misc/DtkWidget.pc.in b/misc/DtkWidget.pc.in
-index 3c610669..b6ed04ca 100644
---- a/misc/DtkWidget.pc.in
-+++ b/misc/DtkWidget.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/@LIBRARY_INSTALL_DIR@
--includedir=${prefix}/@INCLUDE_INSTALL_DIR@
-+libdir=@LIBRARY_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_DIR@
- 
- Name: dtk@DTK_VERSION_MAJOR@widget
- Description: Deepin Tool Kit dtkwidget header files
diff --git a/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch
deleted file mode 100644
index cf2faac94855..000000000000
--- a/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/misc/qt_lib_DtkWidget.pri.in b/misc/qt_lib_DtkWidget.pri.in
-index 623878d3..561f5186 100644
---- a/misc/qt_lib_DtkWidget.pri.in
-+++ b/misc/qt_lib_DtkWidget.pri.in
-@@ -4,9 +4,9 @@ QT.dtkwidget.MINOR_VERSION = @PROJECT_VERSION_MINOR@
- QT.dtkwidget.PATCH_VERSION = @PROJECT_VERSION_PATCH@
- QT.dtkwidget.name = dtkwidget
- QT.dtkwidget.module = dtk@DTK_VERSION_MAJOR@widget
--QT.dtkwidget.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@
--QT.dtkwidget.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@
--QT.dtkwidget.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
-+QT.dtkwidget.tools = @TOOL_INSTALL_DIR@
-+QT.dtkwidget.libs = @LIBRARY_INSTALL_DIR@
-+QT.dtkwidget.includes = @INCLUDE_INSTALL_DIR@
- QT.dtkwidget.frameworks =
- QT.dtkwidget.depends = core gui dtkcore network concurrent dtkgui printsupport printsupport_private widgets widgets_private gui_private x11extras dbus
- QT.dtkwidget.module_config = v2 internal_module ltcg
diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix
deleted file mode 100644
index 552be6223f97..000000000000
--- a/pkgs/desktops/deepin/library/dtkcommon/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dtkcommon";
-  version = "5.7.13";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-yQKkqHL5W2mHPE3zchAwtWUH55zrCEJwcVWCheC0rW4=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  dontWrapQtApps = true;
-
-  meta = with lib; {
-    description = "Public project for building DTK Library";
-    homepage = "https://github.com/linuxdeepin/dtkcommon";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix
deleted file mode 100644
index 9e39ccb3d4f0..000000000000
--- a/pkgs/desktops/deepin/library/dtkcore/default.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  doxygen,
-  libsForQt5,
-  gsettings-qt,
-  lshw,
-  libuchardet,
-  dtkcommon,
-  dtklog,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dtkcore";
-  version = "5.6.32";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-APuBVgewr701wzfTRwaQIg/ERFIhabEs5Jd6+GvD04k=";
-  };
-
-  patches = [
-    ./fix-pkgconfig-path.patch
-    ./fix-pri-path.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace misc/DtkCoreConfig.cmake.in \
-      --subst-var-by PACKAGE_TOOL_INSTALL_DIR ${placeholder "out"}/libexec/dtk5/DCore/bin
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    doxygen
-    libsForQt5.qttools
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  dontWrapQtApps = true;
-
-  buildInputs = [
-    libsForQt5.qtbase
-    gsettings-qt
-    lshw
-    libuchardet
-  ];
-
-  propagatedBuildInputs = [
-    dtkcommon
-    dtklog
-  ];
-
-  cmakeFlags = [
-    "-DDTK_VERSION=${version}"
-    "-DBUILD_DOCS=ON"
-    "-DBUILD_EXAMPLES=OFF"
-    "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}"
-    "-DDSG_PREFIX_PATH='/run/current-system/sw'"
-    "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
-    "-DTOOL_INSTALL_DIR=${placeholder "out"}/libexec/dtk5/DCore/bin"
-    "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata"
-  ];
-
-  preConfigure = ''
-    # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
-    # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
-  '';
-
-  outputs = [
-    "out"
-    "dev"
-    "doc"
-  ];
-
-  postFixup = ''
-    for binary in $out/libexec/dtk5/DCore/bin/*; do
-      wrapQtApp $binary
-    done
-  '';
-
-  meta = with lib; {
-    description = "Deepin tool kit core library";
-    homepage = "https://github.com/linuxdeepin/dtkcore";
-    license = licenses.lgpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/dtkcore/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtkcore/fix-pkgconfig-path.patch
deleted file mode 100644
index 570e34c06147..000000000000
--- a/pkgs/desktops/deepin/library/dtkcore/fix-pkgconfig-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/misc/dtkcore.pc.in b/misc/dtkcore.pc.in
-index 83eecb7..da24ce8 100644
---- a/misc/dtkcore.pc.in
-+++ b/misc/dtkcore.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/@LIBRARY_INSTALL_DIR@
--includedir=${prefix}/@INCLUDE_INSTALL_DIR@
-+libdir=@LIBRARY_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_DIR@
- 
- Name: dtk@DTK_VERSION_MAJOR@core
- Description: Deepin Tool Kit dtkcore header files
diff --git a/pkgs/desktops/deepin/library/dtkcore/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtkcore/fix-pri-path.patch
deleted file mode 100644
index 19953ed1733d..000000000000
--- a/pkgs/desktops/deepin/library/dtkcore/fix-pri-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/misc/qt_lib_dtkcore.pri.in b/misc/qt_lib_dtkcore.pri.in
-index a331f52..ce01dc0 100644
---- a/misc/qt_lib_dtkcore.pri.in
-+++ b/misc/qt_lib_dtkcore.pri.in
-@@ -4,9 +4,9 @@ QT.dtkcore.MINOR_VERSION = @PROJECT_VERSION_MINOR@
- QT.dtkcore.PATCH_VERSION = @PROJECT_VERSION_PATCH@
- QT.dtkcore.name = dtkcore
- QT.dtkcore.module = dtk@DTK_VERSION_MAJOR@core
--QT.dtkcore.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@
--QT.dtkcore.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@
--QT.dtkcore.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
-+QT.dtkcore.tools = @TOOL_INSTALL_DIR@
-+QT.dtkcore.libs = @LIBRARY_INSTALL_DIR@
-+QT.dtkcore.includes = @INCLUDE_INSTALL_DIR@
- QT.dtkcore.frameworks =
- QT.dtkcore.depends = core dbus xml
- QT.dtkcore.module_config = v2 ltcg
diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix
deleted file mode 100644
index ff667f83b65e..000000000000
--- a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  doxygen,
-  libsForQt5,
-  dtkgui,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dtkdeclarative";
-  version = "5.6.32";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-MOiNpuvYwJi9rNKx6TuUuWnlGhmZrRbL48EFapy442M=";
-  };
-
-  patches = [
-    ./fix-pkgconfig-path.patch
-    ./fix-pri-path.patch
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    doxygen
-    libsForQt5.qttools
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  propagatedBuildInputs = [
-    dtkgui
-    libsForQt5.qtdeclarative
-    libsForQt5.qtquickcontrols2
-    libsForQt5.qtgraphicaleffects
-  ];
-
-  cmakeFlags = [
-    "-DDTK_VERSION=${version}"
-    "-DBUILD_DOCS=ON"
-    "-DBUILD_EXAMPLES=ON"
-    "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules"
-    "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}"
-    "-DQML_INSTALL_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtQmlPrefix}"
-  ];
-
-  preConfigure = ''
-    # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
-    # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
-    export QML2_IMPORT_PATH=${libsForQt5.qtdeclarative.bin}/${libsForQt5.qtbase.qtQmlPrefix}
-  '';
-
-  outputs = [
-    "out"
-    "dev"
-    "doc"
-  ];
-
-  meta = with lib; {
-    description = "Widget development toolkit based on QtQuick/QtQml";
-    mainProgram = "dtk-exhibition";
-    homepage = "https://github.com/linuxdeepin/dtkdeclarative";
-    license = licenses.lgpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtkdeclarative/fix-pkgconfig-path.patch
deleted file mode 100644
index e15ee2f7a0b8..000000000000
--- a/pkgs/desktops/deepin/library/dtkdeclarative/fix-pkgconfig-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/misc/dtkdeclarative.pc.in b/misc/dtkdeclarative.pc.in
-index dc3827f..fd0949e 100644
---- a/misc/dtkdeclarative.pc.in
-+++ b/misc/dtkdeclarative.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/@LIB_INSTALL_DIR@
--includedir=${prefix}/@INCLUDE_INSTALL_DIR@
-+libdir=@LIB_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_DIR@
- 
- Name: DtkDeclarative
- Description: Deepin Tool Kit DtkDeclarative header files
diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtkdeclarative/fix-pri-path.patch
deleted file mode 100644
index e622809c3936..000000000000
--- a/pkgs/desktops/deepin/library/dtkdeclarative/fix-pri-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/misc/qt_lib_dtkdeclarative.pri.in b/misc/qt_lib_dtkdeclarative.pri.in
-index 8797802..44e32a3 100644
---- a/misc/qt_lib_dtkdeclarative.pri.in
-+++ b/misc/qt_lib_dtkdeclarative.pri.in
-@@ -4,8 +4,8 @@ QT.dtkdeclarative.MINOR_VERSION = @PROJECT_VERSION_MINOR@
- QT.dtkdeclarative.PATCH_VERSION = @PROJECT_VERSION_PATCH@
- QT.dtkdeclarative.name = dtkdeclarative
- QT.dtkdeclarative.module = dtk@DTK_VERSION_MAJOR@declarative
--QT.dtkdeclarative.libs = @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@
--QT.dtkdeclarative.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
-+QT.dtkdeclarative.libs = @LIB_INSTALL_DIR@
-+QT.dtkdeclarative.includes = @INCLUDE_INSTALL_DIR@
- QT.dtkdeclarative.frameworks =
- QT.dtkdeclarative.depends = core dbus xml gui dtkcore dtkgui quick quick_private
- QT.dtkdeclarative.module_config = v2 ltcg
diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix
deleted file mode 100644
index 16d176b5ff59..000000000000
--- a/pkgs/desktops/deepin/library/dtkgui/default.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  pkg-config,
-  cmake,
-  doxygen,
-  libsForQt5,
-  dtkcore,
-  lxqt,
-  librsvg,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dtkgui";
-  version = "5.6.32";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-F3tuLV1hWoUZle0O66MQ+Ew9LRnP6N++HaqS88xBLRY=";
-  };
-
-  patches = [
-    ./fix-pkgconfig-path.patch
-    ./fix-pri-path.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace src/util/dsvgrenderer.cpp \
-      --replace-fail 'QLibrary("rsvg-2", "2")' 'QLibrary("${lib.getLib librsvg}/lib/librsvg-2.so")'
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    doxygen
-    pkg-config
-    libsForQt5.qttools
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    libsForQt5.qtbase
-    lxqt.libqtxdg
-    librsvg
-  ];
-
-  propagatedBuildInputs = [
-    dtkcore
-    libsForQt5.qtimageformats
-  ];
-
-  cmakeFlags = [
-    "-DDTK_VERSION=${version}"
-    "-DBUILD_DOCS=ON"
-    "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
-    "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}"
-  ];
-
-  preConfigure = ''
-    # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
-    # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
-  '';
-
-  outputs = [
-    "out"
-    "dev"
-    "doc"
-  ];
-
-  postFixup = ''
-    for binary in $out/libexec/dtk5/DGui/bin/*; do
-      wrapQtApp $binary
-    done
-  '';
-
-  meta = with lib; {
-    description = "Deepin Toolkit, gui module for DDE look and feel";
-    homepage = "https://github.com/linuxdeepin/dtkgui";
-    license = licenses.lgpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/dtkgui/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtkgui/fix-pkgconfig-path.patch
deleted file mode 100644
index 1485baccc204..000000000000
--- a/pkgs/desktops/deepin/library/dtkgui/fix-pkgconfig-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/misc/dtkgui.pc.in b/misc/dtkgui.pc.in
-index 89fdbbf..ad817c4 100644
---- a/misc/dtkgui.pc.in
-+++ b/misc/dtkgui.pc.in
-@@ -1,8 +1,8 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/@LIBRARY_INSTALL_DIR@
--includedir=${prefix}/@INCLUDE_INSTALL_DIR@
--tooldir=${prefix}/@PACKAGE_TOOL_INSTALL_DIR@
-+libdir=@LIBRARY_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_DIR@
-+tooldir=@PACKAGE_TOOL_INSTALL_DIR@
- 
- Name: dtk@DTK_VERSION_MAJOR@gui
- Description: Deepin Tool Kit dtkgui header files
diff --git a/pkgs/desktops/deepin/library/dtkgui/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtkgui/fix-pri-path.patch
deleted file mode 100644
index b746d34b1c79..000000000000
--- a/pkgs/desktops/deepin/library/dtkgui/fix-pri-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/misc/qt_lib_dtkgui.pri.in b/misc/qt_lib_dtkgui.pri.in
-index 28308ee..9fb25e6 100644
---- a/misc/qt_lib_dtkgui.pri.in
-+++ b/misc/qt_lib_dtkgui.pri.in
-@@ -4,9 +4,9 @@ QT.dtkgui.MINOR_VERSION = @PROJECT_VERSION_MINOR@
- QT.dtkgui.PATCH_VERSION = @PROJECT_VERSION_PATCH@
- QT.dtkgui.name = dtkgui
- QT.dtkgui.module = dtk@DTK_VERSION_MAJOR@gui
--QT.dtkgui.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@
--QT.dtkgui.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@
--QT.dtkgui.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
-+QT.dtkgui.tools = @TOOL_INSTALL_DIR@
-+QT.dtkgui.libs = @LIBRARY_INSTALL_DIR@
-+QT.dtkgui.includes = @INCLUDE_INSTALL_DIR@
- QT.dtkgui.frameworks =
- QT.dtkgui.depends = core gui dtkcore gui_private dbus network
- QT.dtkgui.module_config = v2 internal_module ltcg
diff --git a/pkgs/desktops/deepin/library/dtklog/default.nix b/pkgs/desktops/deepin/library/dtklog/default.nix
deleted file mode 100644
index 7c448ee8e8a8..000000000000
--- a/pkgs/desktops/deepin/library/dtklog/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  spdlog,
-  systemd,
-  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dtklog";
-  version = "0.0.1";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = "dtklog";
-    rev = finalAttrs.version;
-    hash = "sha256-8c3KL6pjAFPC4jRpOpPEbEDRBMWnDptwBSbEtcQcf5E=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  dontWrapQtApps = true;
-
-  buildInputs = [
-    libsForQt5.qtbase
-    spdlog
-  ]
-  ++ lib.optional withSystemd systemd;
-
-  cmakeFlags = [
-    (lib.cmakeBool "BUILD_WITH_SYSTEMD" withSystemd)
-    (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
-    (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
-  ];
-
-  meta = {
-    description = "Simple, convinient and thread safe logger for Qt-based C++ apps";
-    homepage = "https://github.com/linuxdeepin/dtklog";
-    license = lib.licenses.lgpl21Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-})
diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix
deleted file mode 100644
index cc81862d49dd..000000000000
--- a/pkgs/desktops/deepin/library/dtkwidget/default.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  doxygen,
-  libsForQt5,
-  dtkgui,
-  cups,
-  gsettings-qt,
-  libstartup_notification,
-  xorg,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dtkwidget";
-  version = "5.6.31";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-FAF66FsmUX0dhFlbT5wAUWkxY0TOU6dcKNwlY10Qou0=";
-  };
-
-  patches = [
-    ./fix-pkgconfig-path.patch
-    ./fix-pri-path.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace src/widgets/dapplication.cpp \
-      --replace "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \
-                "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";"
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    doxygen
-    pkg-config
-    libsForQt5.qttools
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qtmultimedia
-    libsForQt5.qtsvg
-    libsForQt5.qtx11extras
-    cups
-    gsettings-qt
-    libstartup_notification
-    xorg.libXdmcp
-  ];
-
-  propagatedBuildInputs = [ dtkgui ];
-
-  cmakeFlags = [
-    "-DDTK_VERSION=${version}"
-    "-DBUILD_DOCS=ON"
-    "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules"
-    "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}"
-  ];
-
-  preConfigure = ''
-    # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
-    # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
-  '';
-
-  outputs = [
-    "out"
-    "dev"
-    "doc"
-  ];
-
-  postFixup = ''
-    for binary in $out/lib/dtk5/DWidget/bin/*; do
-        wrapQtApp $binary
-    done
-  '';
-
-  meta = with lib; {
-    description = "Deepin graphical user interface library";
-    homepage = "https://github.com/linuxdeepin/dtkwidget";
-    license = licenses.lgpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/dtkwidget/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtkwidget/fix-pkgconfig-path.patch
deleted file mode 100644
index df4452259580..000000000000
--- a/pkgs/desktops/deepin/library/dtkwidget/fix-pkgconfig-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/misc/DtkWidget.pc.in b/misc/DtkWidget.pc.in
-index 3c610669..b6ed04ca 100644
---- a/misc/DtkWidget.pc.in
-+++ b/misc/DtkWidget.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/@LIBRARY_INSTALL_DIR@
--includedir=${prefix}/@INCLUDE_INSTALL_DIR@
-+libdir=@LIBRARY_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_DIR@
- 
- Name: dtk@DTK_VERSION_MAJOR@widget
- Description: Deepin Tool Kit dtkwidget header files
diff --git a/pkgs/desktops/deepin/library/dtkwidget/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtkwidget/fix-pri-path.patch
deleted file mode 100644
index cf2faac94855..000000000000
--- a/pkgs/desktops/deepin/library/dtkwidget/fix-pri-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/misc/qt_lib_DtkWidget.pri.in b/misc/qt_lib_DtkWidget.pri.in
-index 623878d3..561f5186 100644
---- a/misc/qt_lib_DtkWidget.pri.in
-+++ b/misc/qt_lib_DtkWidget.pri.in
-@@ -4,9 +4,9 @@ QT.dtkwidget.MINOR_VERSION = @PROJECT_VERSION_MINOR@
- QT.dtkwidget.PATCH_VERSION = @PROJECT_VERSION_PATCH@
- QT.dtkwidget.name = dtkwidget
- QT.dtkwidget.module = dtk@DTK_VERSION_MAJOR@widget
--QT.dtkwidget.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@
--QT.dtkwidget.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@
--QT.dtkwidget.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
-+QT.dtkwidget.tools = @TOOL_INSTALL_DIR@
-+QT.dtkwidget.libs = @LIBRARY_INSTALL_DIR@
-+QT.dtkwidget.includes = @INCLUDE_INSTALL_DIR@
- QT.dtkwidget.frameworks =
- QT.dtkwidget.depends = core gui dtkcore network concurrent dtkgui printsupport printsupport_private widgets widgets_private gui_private x11extras dbus
- QT.dtkwidget.module_config = v2 internal_module ltcg
diff --git a/pkgs/desktops/deepin/library/dwayland/default.nix b/pkgs/desktops/deepin/library/dwayland/default.nix
deleted file mode 100644
index 7ea30f488df9..000000000000
--- a/pkgs/desktops/deepin/library/dwayland/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  libsForQt5,
-  wayland,
-  wayland-protocols,
-  wayland-scanner,
-  extra-cmake-modules,
-  deepin-wayland-protocols,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dwayland";
-  version = "5.25.0";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-XZvL3lauVW5D3r3kybpS3SiitvwEScqgYe2h9c1DuCs=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    libsForQt5.qttools
-    wayland-scanner
-  ];
-
-  buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qtwayland
-    wayland
-    wayland-protocols
-    deepin-wayland-protocols
-  ];
-
-  dontWrapQtApps = true;
-
-  # cmake requires that the kf5 directory must not empty
-  postInstall = ''
-    mkdir $out/include/KF5
-  '';
-
-  meta = with lib; {
-    description = "Qt-style API to interact with the wayland-client and wayland-server";
-    homepage = "https://github.com/linuxdeepin/dwayland";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/gio-qt/default.nix b/pkgs/desktops/deepin/library/gio-qt/default.nix
deleted file mode 100644
index 2865174cd041..000000000000
--- a/pkgs/desktops/deepin/library/gio-qt/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  glibmm,
-  doxygen,
-  buildDocs ? true,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gio-qt";
-  version = "0.0.14";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-qDkkLqGsrw+otUy3/iZJJZ2RtpNYPGc/wktdVpw2weg=";
-  };
-
-  # Upstream compiles both qt5 and qt6 versions, which is not possible in nixpkgs
-  # because of the conflict between qt5 hooks and qt6 hooks
-  postPatch = ''
-    substituteInPlace {gio-qt,qgio-tools}/CMakeLists.txt \
-      --replace "include(qt6.cmake)" " "
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ]
-  ++ lib.optionals buildDocs [
-    doxygen
-    libsForQt5.qttools
-  ];
-
-  cmakeFlags = [
-    "-DCMAKE_INSTALL_LIBDIR=lib"
-    "-DPROJECT_VERSION=${version}"
-  ]
-  ++ lib.optionals (!buildDocs) [ "-DBUILD_DOCS=OFF" ];
-
-  propagatedBuildInputs = [ glibmm ];
-
-  preConfigure = ''
-    # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
-    # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
-  '';
-
-  meta = with lib; {
-    description = "Gio wrapper for Qt applications";
-    homepage = "https://github.com/linuxdeepin/gio-qt";
-    license = licenses.lgpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix
deleted file mode 100644
index cd1582acddc7..000000000000
--- a/pkgs/desktops/deepin/library/qt5integration/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  dtkwidget,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  lxqt,
-  mtdev,
-  xorg,
-  gtest,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "qt5integration";
-  version = "5.6.32";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-WRMeH66X21Z6TBKPEabnWqzC95+OR9M5azxvAp6K7T4=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    dtkwidget
-    libsForQt5.qtbase
-    libsForQt5.qtsvg
-    libsForQt5.qtx11extras
-    mtdev
-    lxqt.libqtxdg_3_12
-    xorg.xcbutilrenderutil
-    gtest
-  ];
-
-  cmakeFlags = [
-    "-DPLUGIN_INSTALL_BASE_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}"
-  ];
-
-  dontWrapQtApps = true;
-
-  meta = with lib; {
-    description = "Qt platform theme integration plugins for DDE";
-    homepage = "https://github.com/linuxdeepin/qt5integration";
-    license = licenses.lgpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
deleted file mode 100644
index 1f6b059b1c92..000000000000
--- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  extra-cmake-modules,
-  pkg-config,
-  dtkcommon,
-  libsForQt5,
-  mtdev,
-  cairo,
-  xorg,
-  wayland,
-  dwayland,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "qt5platform-plugins";
-  version = "5.6.32";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-jbt+ym6TQX3tecFCSlz8Z2ZnqOa69zYgaB5ohQM3lQg=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    pkg-config
-  ];
-
-  buildInputs = [
-    dtkcommon
-    mtdev
-    cairo
-    libsForQt5.qtbase
-    libsForQt5.qtx11extras
-    xorg.libSM
-    wayland
-    dwayland
-    libsForQt5.qtwayland
-  ];
-
-  cmakeFlags = [
-    "-DINSTALL_PATH=${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}/platforms"
-    "-DQT_XCB_PRIVATE_HEADERS=${libsForQt5.qtbase.src}/src/plugins/platforms/xcb"
-  ];
-
-  dontWrapQtApps = true;
-
-  meta = with lib; {
-    description = "Qt platform plugins for DDE";
-    homepage = "https://github.com/linuxdeepin/qt5platform-plugins";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix
deleted file mode 100644
index a4796ea96599..000000000000
--- a/pkgs/desktops/deepin/library/qt6integration/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  fetchpatch,
-  cmake,
-  pkg-config,
-  dtk6widget,
-  qt6Packages,
-  gtest,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "qt6integration";
-  version = "6.0.33";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-fxeXjUn1hJUE1Le24sqVEvKBX9Uo8qUVjr3sfz/5cQQ=";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "resolve-compilation-issues-on-Qt-6_9.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/deepin-qt6integration/-/raw/e85e6836919d8e8424e800d7d4c8681bb23c29f9/qt-6.9.patch";
-      hash = "sha256-GJH25cOEcA5Zep6FABwlRXU7HfpgMXNJzsbmWQdzx+Y=";
-    })
-    (fetchpatch {
-      name = "missing-include.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/deepin-qt6integration/-/raw/300e6ac2a166ce214d64c9b16acc57d31de0604a/missing-include.patch";
-      hash = "sha256-IFSfnIFcXAcmzfAOId2ew+YUHxHK6+JfJ/t96FR7rhk=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    dtk6widget
-    qt6Packages.qtbase
-    gtest
-  ];
-
-  cmakeFlags = [
-    "-DDTK_VERSION=${version}"
-    "-DPLUGIN_INSTALL_BASE_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtPluginPrefix}"
-  ];
-
-  dontWrapQtApps = true;
-
-  meta = {
-    description = "Qt platform theme integration plugins for DDE";
-    homepage = "https://github.com/linuxdeepin/qt6integration";
-    license = lib.licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/qt6mpris/default.nix b/pkgs/desktops/deepin/library/qt6mpris/default.nix
deleted file mode 100644
index a61bc797fa0b..000000000000
--- a/pkgs/desktops/deepin/library/qt6mpris/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  qt6Packages,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "qt6mpris";
-  version = "1.0.0.1-1deepin1";
-
-  src = fetchFromGitHub {
-    owner = "deepin-community";
-    repo = "qt6mpris";
-    rev = finalAttrs.version;
-    hash = "sha256-PCdA9q/txaL2Fbr2/4+Z7L4zxWeULl3bq8MVH3i1g3g=";
-  };
-
-  postPatch = ''
-    substituteInPlace src/src.pro \
-      --replace-fail '$$[QT_INSTALL_LIBS]'    "$out/lib" \
-      --replace-fail '$$[QT_INSTALL_HEADERS]' "$out/include" \
-      --replace-fail '$$[QMAKE_MKSPECS]'      "$out/mkspecs"
-    substituteInPlace declarative/declarative.pro \
-      --replace-fail '$$[QT_INSTALL_QML]'     "$out/${qt6Packages.qtbase.qtQmlPrefix}"
-  '';
-
-  nativeBuildInputs = [
-    qt6Packages.qmake
-  ];
-
-  dontWrapQtApps = true;
-
-  buildInputs = [
-    qt6Packages.qtbase
-    qt6Packages.qtdeclarative
-  ];
-
-  meta = {
-    description = "Qt and QML MPRIS interface and adaptor";
-    homepage = "https://github.com/deepin-community/qt6mpris";
-    license = lib.licenses.lgpl21Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-})
diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
deleted file mode 100644
index 47dcbb28139d..000000000000
--- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  mtdev,
-  cairo,
-  xorg,
-  qt6Packages,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "qt6platform-plugins";
-  version = "6.0.33";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-uQ/dfk/HEvngTjHDLQOg965Jy+fH2YNfhKwXB+1BoUM=";
-  };
-
-  postUnpack = ''
-    tar -xf ${qt6Packages.qtbase.src}
-    mv qtbase-everywhere-src-${qt6Packages.qtbase.version}/src/plugins/platforms/xcb ${src.name}/xcb/libqt6xcbqpa-dev/${qt6Packages.qtbase.version}
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    mtdev
-    cairo
-    xorg.libSM
-    qt6Packages.qtbase
-  ];
-
-  cmakeFlags = [
-    "-DDTK_VERSION=${version}"
-    "-DINSTALL_PATH=${placeholder "out"}/${qt6Packages.qtbase.qtPluginPrefix}/platforms"
-  ];
-
-  dontWrapQtApps = true;
-
-  meta = {
-    description = "Qt platform plugins for DDE";
-    homepage = "https://github.com/linuxdeepin/qt6platform-plugins";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/treeland-protocols/default.nix b/pkgs/desktops/deepin/library/treeland-protocols/default.nix
deleted file mode 100644
index d95ced544e04..000000000000
--- a/pkgs/desktops/deepin/library/treeland-protocols/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "treeland-protocols";
-  version = "0.4.5";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-SS4jnfr/9Ec3qpnHS4EjQViekBRMix5oz7b9qhNZpfY=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  meta = {
-    description = "Wayland protocol extensions for treeland";
-    homepage = "https://github.com/linuxdeepin/treeland-protocols";
-    license = with lib.licenses; [
-      gpl3Only
-      lgpl3Only
-      asl20
-    ];
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
deleted file mode 100644
index 4a39a16f6331..000000000000
--- a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  libsForQt5,
-  pkg-config,
-  udisks,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "udisks2-qt5";
-  version = "5.0.6";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4=";
-  };
-
-  nativeBuildInputs = [
-    libsForQt5.qmake
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [ udisks ];
-
-  qmakeFlags = [ "VERSION=${version}" ];
-
-  meta = with lib; {
-    description = "UDisks2 D-Bus interfaces binding for Qt5";
-    homepage = "https://github.com/linuxdeepin/udisks2-qt5";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix
deleted file mode 100644
index 977fe68edbc4..000000000000
--- a/pkgs/desktops/deepin/library/util-dfm/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  libmediainfo,
-  libsecret,
-  libisoburn,
-  libuuid,
-  udisks,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "util-dfm";
-  version = "1.3.2";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-ngDjjdwuYqvyhaUcMNV5PRmGKC3lmY/nJQGOQgRMIQE=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  dontWrapQtApps = true;
-
-  buildInputs = [
-    libsForQt5.qtbase
-    libmediainfo
-    libsecret
-    libuuid
-    libisoburn
-    udisks
-  ];
-
-  cmakeFlags = [
-    "-DCMAKE_INSTALL_LIBDIR=lib"
-    "-DPROJECT_VERSION=${version}"
-  ];
-
-  meta = with lib; {
-    description = "Toolkits of libdfm-io,libdfm-mount and libdfm-burn";
-    homepage = "https://github.com/linuxdeepin/util-dfm";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
deleted file mode 100644
index 12316288eaf8..000000000000
--- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  stdenvNoCC,
-  lib,
-  fetchFromGitHub,
-  nixos-icons,
-}:
-stdenvNoCC.mkDerivation rec {
-  pname = "deepin-desktop-base";
-  version = "2024.07.24";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-JOC8nQ/YgUpY93FcniO2uypAfsL/SNU+KfTrthoZfQo=";
-  };
-
-  makeFlags = [ "DESTDIR=${placeholder "out"}" ];
-
-  # distribution_logo_transparent.svg come form nixos-artwork(https://github.com/NixOS/nixos-artwork)/logo/nixos-white.svg under CC-BY license, used for dde-lock
-  postInstall = ''
-    rm -r $out/etc
-    rm -r $out/usr/share/python-apt
-    rm -r $out/usr/share/plymouth
-    rm -r $out/usr/share/distro-info
-    mv $out/usr/* $out/
-    rm -r $out/usr
-    install -D ${./distribution_logo_transparent.svg} $out/share/pixmaps/distribution_logo_transparent.svg
-    cat > $out/share/deepin/distribution.info <<EOF
-    [Distribution]
-    Name=NixOS
-    WebsiteName=www.nixos.org
-    Website=https://www.nixos.org
-    Logo=${nixos-icons}/share/icons/hicolor/96x96/apps/nix-snowflake.png
-    LogoLight=${nixos-icons}/share/icons/hicolor/32x32/apps/nix-snowflake.png
-    LogoTransparent=$out/share/pixmaps/distribution_logo_transparent.svg
-    EOF
-  '';
-
-  meta = with lib; {
-    description = "Base assets and definitions for Deepin Desktop Environment";
-    homepage = "https://github.com/linuxdeepin/deepin-desktop-base";
-    license = with licenses; [
-      gpl3Plus
-      cc-by-40
-    ];
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg b/pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg
deleted file mode 100644
index 18f8d4055c39..000000000000
--- a/pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="156px"
-   height="46px"
-   viewBox="0 0 156 46"
-   version="1.1"
-   id="SVGRoot"
-   sodipodi:docname="distribution_logo_transparent.svg"
-   inkscape:version="1.1 (c4e8f9e, 2021-05-24)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview12158"
-     pagecolor="#ffffff"
-     bordercolor="#ffffff"
-     borderopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="px"
-     showgrid="false"
-     inkscape:zoom="0.67972082"
-     inkscape:cx="397.22191"
-     inkscape:cy="90.478323"
-     inkscape:window-width="1920"
-     inkscape:window-height="960"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs12153" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g12416"
-       transform="matrix(0.10297744,0,0,0.10574712,-2.4660846,-2.6161481)">
-      <g
-         id="layer7"
-         inkscape:label="bg"
-         style="display:none">
-        <rect
-           transform="translate(-132.5822,958.04022)"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect5389"
-           width="1543.4287"
-           height="483.7439"
-           x="132.5822"
-           y="-957.77832" />
-        <rect
-           style="fill:#000000;fill-opacity:1;stroke-width:0.529749"
-           id="rect6896"
-           width="1543.4287"
-           height="483.74393"
-           x="-9.0332054e-07"
-           y="0.26189968" />
-      </g>
-      <g
-         id="layer5"
-         inkscape:label="guide"
-         style="display:none;opacity:0.516"
-         transform="translate(-132.5822,958.04022)">
-        <rect
-           y="-957.77832"
-           x="132.5822"
-           height="483.7439"
-           width="1543.4283"
-           id="rect5350"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#d4d4d4;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9b9b9b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect5346"
-           width="1496.443"
-           height="435.68069"
-           x="155.77646"
-           y="-933.38721"
-           inkscape:export-xdpi="17.971878"
-           inkscape:export-ydpi="17.971878" />
-        <rect
-           y="-851.65918"
-           x="159.02695"
-           height="272.58423"
-           width="1492.5731"
-           id="rect5348"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#848484;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-      </g>
-      <g
-         id="layer6"
-         inkscape:label="logo-guide"
-         style="display:none"
-         transform="translate(-132.5822,958.04022)">
-        <rect
-           y="-958.02759"
-           x="132.65129"
-           height="484.30399"
-           width="550.41602"
-           id="rect5379"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#5c201e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           inkscape:export-filename="/home/tim/dev/nix/homepage/logo/nix-wiki.png"
-           inkscape:export-xdpi="22.07"
-           inkscape:export-ydpi="22.07" />
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c24a46;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect5372"
-           width="501.94415"
-           height="434.30405"
-           x="156.12303"
-           y="-933.02759"
-           inkscape:export-filename="/home/tim/dev/nix/homepage/logo/nixos-logo-only-hires-print.png"
-           inkscape:export-xdpi="212.2"
-           inkscape:export-ydpi="212.2" />
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#d98d8a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect5381"
-           width="24.939611"
-           height="24.939611"
-           x="658.02826"
-           y="-958.04022" />
-      </g>
-      <g
-         style="display:inline"
-         inkscape:label="text-vegur"
-         id="g5329"
-         transform="translate(-132.5822,958.04022)">
-        <g
-           aria-label="Nix"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:395.097px;line-height:125%;font-family:Carlito;-inkscape-font-specification:Carlito;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="text5407">
-          <path
-             d="m 969.15319,-847.11833 h -30.81755 v 139.86428 c 0,19.75484 0.79019,50.96749 1.97548,85.73601 h -1.18529 c -15.40877,-28.84207 -32.79303,-56.49884 -45.04104,-75.46349 l -96.79872,-150.1368 h -42.27536 v 267.87565 h 30.81755 v -139.86427 c 0,-19.75485 -0.79019,-56.89395 -1.97548,-91.26737 h 1.18529 c 22.91561,39.90478 36.34891,62.0302 48.99201,80.99485 l 96.79872,150.13679 h 38.32439 z"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Vegur;-inkscape-font-specification:Vegur;fill:#ffffff"
-             id="path4683" />
-          <path
-             d="m 1027.8251,-579.24268 h 33.1881 v -191.22686 h -33.1881 z m 16.594,-219.27874 c 11.4578,0 20.5451,-9.08722 20.5451,-20.54503 0,-11.45781 -9.0873,-20.54504 -20.5451,-20.54504 -11.4578,0 -20.545,9.08723 -20.545,20.54504 0,11.45781 9.0872,20.54503 20.545,20.54503 z"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Vegur;-inkscape-font-specification:Vegur;fill:#ffffff"
-             id="path4685" />
-          <path
-             d="m 1267.7785,-770.46954 h -37.9293 l -46.6214,70.32723 h -1.1853 l -45.0411,-70.32723 h -41.09 l 68.3517,93.24285 v 1.18529 l -70.7223,96.79872 h 37.9293 l 49.7822,-75.85859 h 1.1853 l 49.7822,75.85859 h 41.09 l -72.3027,-98.37911 v -1.18529 z"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Vegur;-inkscape-font-specification:Vegur;fill:#ffffff"
-             id="path4687" />
-        </g>
-        <g
-           aria-label="O"
-           transform="scale(0.95067318,1.0518862)"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:367.487px;line-height:125%;font-family:Carlito;-inkscape-font-specification:Carlito;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="text5356">
-          <path
-             d="m 1468.5915,-800.79725 c -66.1477,0 -120.5358,48.14083 -120.5358,128.25306 0,80.11223 54.3881,128.25306 120.5358,128.25306 66.1477,0 120.5359,-48.14083 120.5359,-128.25306 0,-80.11223 -54.3882,-128.25306 -120.5359,-128.25306 z m 0,24.98914 c 49.2433,0 86.727,36.74872 86.727,103.26392 0,66.5152 -37.4837,103.26392 -86.727,103.26392 -49.2433,0 -86.727,-36.74872 -86.727,-103.26392 0,-66.5152 37.4837,-103.26392 86.727,-103.26392 z"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Vegur;-inkscape-font-specification:Vegur;fill:#ffffff"
-             id="path4680" />
-        </g>
-        <g
-           aria-label="S"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:386.555px;line-height:125%;font-family:Carlito;-inkscape-font-specification:Carlito;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="text5364">
-          <path
-             d="m 1523.761,-773.88643 c 0,37.10927 19.3277,57.21012 64.1681,75.37819 34.4034,13.91598 48.3193,26.28573 48.3193,51.79835 0,30.92438 -25.126,46.38657 -58.3697,46.38657 -17.395,0 -37.1093,-2.70588 -58.7564,-10.05042 l -3.479,26.67228 c 18.9412,6.95799 39.8152,9.66387 60.6891,9.66387 51.7984,0 95.0925,-26.28573 95.0925,-79.24374 0,-36.7227 -22.4202,-54.50422 -67.6471,-72.6723 -30.1512,-11.9832 -44.8403,-24.73951 -44.8403,-51.41179 0,-25.89917 22.4202,-40.2017 50.6387,-40.2017 16.6218,0 34.7899,4.2521 47.5462,9.27732 l 3.479,-26.28573 c -14.6891,-6.18488 -32.8572,-9.27732 -52.958,-9.27732 -47.5463,0 -83.8824,27.4454 -83.8824,69.96642 z"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Vegur;-inkscape-font-specification:Vegur;fill:#ffffff"
-             id="path4677" />
-        </g>
-      </g>
-      <g
-         id="layer4"
-         inkscape:label="white-logo"
-         style="display:inline">
-        <g
-           style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:11.0512"
-           transform="matrix(0.09048806,0,0,0.09048806,9.7879003,109.19458)"
-           id="g955">
-          <g
-             transform="matrix(11.047619,0,0,11.047619,-1572.2888,9377.7107)"
-             id="g869"
-             style="fill:#ffffff;fill-opacity:1">
-            <g
-               transform="rotate(-60,226.35754,-449.37199)"
-               id="g932"
-               style="fill:#ffffff;fill-opacity:1;stroke-width:11.0512">
-              <path
-                 sodipodi:nodetypes="cccccccccc"
-                 inkscape:connector-curvature="0"
-                 id="path3336-6-3"
-                 d="m 449.71876,-420.51322 122.19683,211.67512 -56.15706,0.5268 -32.6236,-56.8692 -32.85645,56.5653 -27.90237,-0.011 -14.29086,-24.6896 46.81047,-80.4901 -33.22946,-57.8257 z"
-                 style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:33.1535;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            </g>
-            <path
-               sodipodi:nodetypes="cccccccccc"
-               inkscape:connector-curvature="0"
-               id="path4260-0-6"
-               d="m 309.54892,-710.38827 122.19683,211.67512 -56.15706,0.5268 -32.6236,-56.8692 -32.85645,56.5653 -27.90237,-0.011 -14.29086,-24.6896 46.81047,-80.4901 -33.22946,-57.8256 z"
-               style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:33.1535;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <use
-               x="0"
-               y="0"
-               xlink:href="#path3336-6-3"
-               inkscape:transform-center-x="124.43045"
-               inkscape:transform-center-y="151.59082"
-               id="use3439-6-7"
-               transform="rotate(60,728.23563,-692.24036)"
-               width="100%"
-               height="100%"
-               style="fill:#ffffff;fill-opacity:1;stroke-width:11.0512" />
-            <use
-               x="0"
-               y="0"
-               xlink:href="#path3336-6-3"
-               inkscape:transform-center-x="59.669705"
-               inkscape:transform-center-y="-139.94592"
-               id="use3449-5-5"
-               transform="rotate(180,477.5036,-570.81898)"
-               width="100%"
-               height="100%"
-               style="fill:#ffffff;fill-opacity:1;stroke-width:11.0512" />
-            <use
-               style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:11.0512"
-               x="0"
-               y="0"
-               xlink:href="#path4260-0-6"
-               id="use4354-5-3"
-               transform="rotate(120,407.33916,-716.08356)"
-               width="100%"
-               height="100%" />
-            <use
-               style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:11.0512"
-               x="0"
-               y="0"
-               xlink:href="#path4260-0-6"
-               id="use4362-2-5"
-               transform="rotate(-120,407.28823,-715.86995)"
-               width="100%"
-               height="100%" />
-          </g>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
deleted file mode 100644
index 8781925b5805..000000000000
--- a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  pkg-config,
-  deepin-gettext-tools,
-  libsForQt5,
-  dtkwidget,
-  udisks2-qt5,
-  qt5platform-plugins,
-  qt5integration,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-device-formatter";
-  version = "0.0.1.16";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-l2D+j+u5Q6G45KTM7eg1QNEakEPtEJ0tzlDlQO5/08I=";
-  };
-
-  postPatch = ''
-    substituteInPlace translate_desktop2ts.sh translate_ts2desktop.sh \
-      --replace "/usr/bin/deepin-desktop-ts-convert" "deepin-desktop-ts-convert"
-    substituteInPlace dde-device-formatter.pro dde-device-formatter.desktop \
-      --replace "/usr" "$out"
-    patchShebangs *.sh
-  '';
-
-  nativeBuildInputs = [
-    libsForQt5.qmake
-    libsForQt5.qttools
-    libsForQt5.wrapQtAppsHook
-    pkg-config
-    deepin-gettext-tools
-  ];
-
-  buildInputs = [
-    dtkwidget
-    udisks2-qt5
-    qt5platform-plugins
-    qt5integration
-    libsForQt5.qtx11extras
-  ];
-
-  cmakeFlags = [ "-DVERSION=${version}" ];
-
-  meta = {
-    description = "Simple graphical interface for creating file system in a block device";
-    mainProgram = "dde-device-formatter";
-    homepage = "https://github.com/linuxdeepin/dde-device-formatter";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/tools/deepin-anything/default.nix b/pkgs/desktops/deepin/tools/deepin-anything/default.nix
deleted file mode 100644
index 0e0bdb7ffa4e..000000000000
--- a/pkgs/desktops/deepin/tools/deepin-anything/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  libsForQt5,
-  udisks2-qt5,
-  util-linux,
-  libnl,
-  glib,
-  pcre,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-anything";
-  version = "6.2.10";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = "deepin-anything";
-    rev = version;
-    hash = "sha256-eGel+pLAYHYkPXQxzTz+lMPSlgNiDFAev2bzGjj4ZFw=";
-  };
-
-  postPatch = ''
-    substituteInPlace src/CMakeLists.txt \
-      --replace-fail 'add_subdirectory("kernelmod")' " "
-    substituteInPlace src/server/backend/CMakeLists.txt \
-      --replace-fail "/usr" "$out" \
-      --replace-fail "/etc" "$out/etc"
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    udisks2-qt5
-    util-linux
-    libnl
-    libsForQt5.polkit-qt
-    glib
-    pcre
-  ];
-
-  meta = {
-    description = "Deepin Anything file search tool";
-    homepage = "https://github.com/linuxdeepin/deepin-anything";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    teams = [ lib.teams.deepin ];
-  };
-}
diff --git a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix
deleted file mode 100644
index b558c4e963e6..000000000000
--- a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  gettext,
-  python3Packages,
-  perlPackages,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "deepin-gettext-tools";
-  version = "1.0.11";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-V6X0E80352Vb6zwaBTRfZZnXEVCmBRbO2bca9A9OL6c=";
-  };
-
-  postPatch = ''
-    substituteInPlace src/generate_mo.py --replace "sudo cp" "cp"
-  '';
-
-  nativeBuildInputs = [ python3Packages.wrapPython ];
-
-  buildInputs = [
-    gettext
-    perlPackages.perl
-    perlPackages.ConfigTiny
-    perlPackages.XMLLibXML
-  ];
-
-  makeFlags = [ "PREFIX=${placeholder "out"}" ];
-
-  postFixup = ''
-    wrapPythonPrograms
-    wrapPythonProgramsIn "$out/lib/${pname}"
-    wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB
-  '';
-
-  meta = with lib; {
-    description = "Translation file processing utils for DDE development";
-    homepage = "https://github.com/linuxdeepin/deepin-gettext-tools";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    teams = [ teams.deepin ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eefd41f4d9a2..e3cc1f13656b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -700,6 +700,7 @@ mapAliases {
   deadpixi-sam = deadpixi-sam-unstable;
 
   debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17
+  deepin = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; # Added 2025-08-21
   degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11
   deltachat-cursed = arcanechat-tui; # added 2025-02-25
   deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10e0970bcbe2..c00a8540435e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14604,8 +14604,6 @@ with pkgs;
     appls = [ prio ];
   };
 
-  deepin = recurseIntoAttrs (callPackage ../desktops/deepin { });
-
   enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { });
 
   expidus = recurseIntoAttrs (
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 8e87e80b1a65..2c9d32830b84 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -715,6 +715,7 @@ in
         zfs = throw "linuxPackages.zfs has been removed, use zfs_* instead, or linuxPackages.\${pkgs.zfs.kernelModuleAttribute}"; # added 2025-01-23
         zfs_2_1 = throw "zfs_2_1 has been removed"; # added 2024-12-25;
         ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18;
+        deepin-anything-module = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance";
         hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30
         sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14
         rtl8723bs = throw "rtl8723bs was added in mainline kernel version 4.12"; # Added 2023-06-14

From efce08af166f021e3302bc4c7bb0a78f6f4a2060 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:40:13 +0300
Subject: [PATCH 2557/3724] plasmaMobileGear: drop

---
 pkgs/applications/plasma-mobile/default.nix   |  74 -------
 pkgs/applications/plasma-mobile/fetch.sh      |   1 -
 .../plasma-mobile/plasma-dialer.nix           |  88 ---------
 .../plasma-mobile/plasma-phonebook.nix        |  43 -----
 .../plasma-mobile/plasma-settings.nix         |  59 ------
 pkgs/applications/plasma-mobile/spacebar.nix  |  58 ------
 pkgs/applications/plasma-mobile/srcs.nix      | 182 ------------------
 pkgs/top-level/qt5-packages.nix               |  12 --
 8 files changed, 517 deletions(-)
 delete mode 100644 pkgs/applications/plasma-mobile/default.nix
 delete mode 100644 pkgs/applications/plasma-mobile/fetch.sh
 delete mode 100644 pkgs/applications/plasma-mobile/plasma-dialer.nix
 delete mode 100644 pkgs/applications/plasma-mobile/plasma-phonebook.nix
 delete mode 100644 pkgs/applications/plasma-mobile/plasma-settings.nix
 delete mode 100644 pkgs/applications/plasma-mobile/spacebar.nix
 delete mode 100644 pkgs/applications/plasma-mobile/srcs.nix

diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
deleted file mode 100644
index 7742b0a13f4b..000000000000
--- a/pkgs/applications/plasma-mobile/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-  # New packages
-
-  READ THIS FIRST
-
-  This module is for official packages in the Plasma Mobile Gear. All
-  available packages are listed in `./srcs.nix`, although some are not yet
-  packaged in Nixpkgs.
-
-  IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
-
-  See also `pkgs/applications/kde` as this is what this is based on.
-
-  # Updates
-
-  1. Update the URL in `./fetch.sh`.
-  2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/plasma-mobile`
-     from the top of the Nixpkgs tree.
-  3. Use `nox-review wip` to check that everything builds.
-  4. Commit the changes and open a pull request.
-*/
-
-{
-  lib,
-  libsForQt5,
-  fetchurl,
-}:
-
-let
-  mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit fetchurl mirror; };
-
-  mkDerivation =
-    args:
-    let
-      inherit (args) pname;
-      inherit (srcs.${pname}) src version;
-      mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) { };
-    in
-    mkDerivation (
-      args
-      // {
-        inherit pname version src;
-
-        outputs = args.outputs or [ "out" ];
-
-        meta =
-          let
-            meta = args.meta or { };
-          in
-          meta
-          // {
-            homepage = meta.homepage or "https://www.plasma-mobile.org/";
-            platforms = meta.platforms or lib.platforms.linux;
-          };
-      }
-    );
-
-  packages =
-    self:
-    let
-      callPackage = self.newScope {
-        inherit mkDerivation;
-      };
-    in
-    {
-      plasma-dialer = callPackage ./plasma-dialer.nix { };
-      plasma-phonebook = callPackage ./plasma-phonebook.nix { };
-      plasma-settings = callPackage ./plasma-settings.nix { };
-      spacebar = callPackage ./spacebar.nix { };
-    };
-
-in
-lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh
deleted file mode 100644
index ffcf74a5f715..000000000000
--- a/pkgs/applications/plasma-mobile/fetch.sh
+++ /dev/null
@@ -1 +0,0 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/23.01.0/ -A '*.tar.xz' )
diff --git a/pkgs/applications/plasma-mobile/plasma-dialer.nix b/pkgs/applications/plasma-mobile/plasma-dialer.nix
deleted file mode 100644
index 3c24ec7ea8d1..000000000000
--- a/pkgs/applications/plasma-mobile/plasma-dialer.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-
-  callaudiod,
-  kcontacts,
-  kcoreaddons,
-  kdbusaddons,
-  ki18n,
-  kio,
-  kirigami-addons,
-  kirigami2,
-  knotifications,
-  kpeople,
-  libphonenumber,
-  libselinux,
-  libsepol,
-  modemmanager-qt,
-  pcre,
-  plasma-wayland-protocols,
-  protobuf,
-  pulseaudio-qt,
-  qtfeedback,
-  qtmpris,
-  qtquickcontrols2,
-  util-linux,
-  wayland,
-  wayland-protocols,
-}:
-
-mkDerivation {
-  pname = "plasma-dialer";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    callaudiod
-    kcontacts
-    kcoreaddons
-    kdbusaddons
-    ki18n
-    kio
-    kirigami-addons
-    kirigami2
-    knotifications
-    kpeople
-    libphonenumber
-    libselinux
-    libsepol
-    modemmanager-qt
-    pcre
-    plasma-wayland-protocols
-    protobuf # Needed by libphonenumber
-    pulseaudio-qt
-    qtfeedback
-    qtmpris
-    qtquickcontrols2
-    util-linux
-    wayland
-    wayland-protocols
-  ];
-
-  postPatch = ''
-    substituteInPlace plasma-dialer/org.kde.phone.dialer.desktop \
-      --replace "/usr/bin/" "$out/bin/"
-  '';
-
-  # Plasma gear 22.09 shipped before KWin 5.26 was made available.
-  # This feature requires 5.26. Otherwise plasma-dialer segfaults.
-  # Note that we may need to keep it disabled until it stops segfaulting outside of KWin.
-  cmakeFlags = [
-    "-DDIALER_BUILD_SHELL_OVERLAY=OFF"
-  ];
-
-  meta = with lib; {
-    description = "Dialer for Plasma Mobile";
-    mainProgram = "plasmaphonedialer";
-    homepage = "https://invent.kde.org/plasma-mobile/plasma-dialer";
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/plasma-mobile/plasma-phonebook.nix b/pkgs/applications/plasma-mobile/plasma-phonebook.nix
deleted file mode 100644
index bf59be8fd1bf..000000000000
--- a/pkgs/applications/plasma-mobile/plasma-phonebook.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-
-  kcontacts,
-  kcoreaddons,
-  kirigami2,
-  kirigami-addons,
-  kpeople,
-  kpeoplevcard,
-  qtquickcontrols2,
-}:
-
-mkDerivation {
-  pname = "plasma-phonebook";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kcontacts
-    kcoreaddons
-    kirigami2
-    kirigami-addons
-    kpeople
-    kpeoplevcard
-    qtquickcontrols2
-  ];
-
-  meta = with lib; {
-    description = "Phone book for Plasma Mobile";
-    mainProgram = "plasma-phonebook";
-    homepage = "https://invent.kde.org/plasma-mobile/plasma-phonebook";
-    # https://invent.kde.org/plasma-mobile/plasma-phonebook/-/commit/3ac27760417e51c051c5dd44155c3f42dd000e4f
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/plasma-mobile/plasma-settings.nix b/pkgs/applications/plasma-mobile/plasma-settings.nix
deleted file mode 100644
index 05d98492c3a5..000000000000
--- a/pkgs/applications/plasma-mobile/plasma-settings.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-
-  kauth,
-  kconfig,
-  kcoreaddons,
-  kdbusaddons,
-  ki18n,
-  kirigami-addons,
-  kirigami2,
-  kitemmodels,
-  libselinux,
-  libsepol,
-  modemmanager-qt,
-  networkmanager-qt,
-  pcre,
-  plasma-framework,
-  util-linux,
-}:
-
-mkDerivation {
-  pname = "plasma-settings";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kauth
-    kconfig
-    kcoreaddons
-    kdbusaddons
-    ki18n
-    kirigami-addons
-    kirigami2
-    kitemmodels
-    libselinux
-    libsepol
-    modemmanager-qt
-    networkmanager-qt
-    pcre
-    plasma-framework
-    util-linux
-  ];
-
-  meta = with lib; {
-    description = "Settings application for Plasma Mobile";
-    mainProgram = "plasma-settings";
-    homepage = "https://invent.kde.org/plasma-mobile/plasma-settings";
-    # https://invent.kde.org/plasma-mobile/plasma-settings/-/commit/a59007f383308503e59498b3036e1483bca26e35
-    license = licenses.gpl2Plus;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix
deleted file mode 100644
index 2b8b065d63b3..000000000000
--- a/pkgs/applications/plasma-mobile/spacebar.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-  wrapQtAppsHook,
-
-  c-ares,
-  curl,
-  kcontacts,
-  ki18n,
-  kio,
-  kirigami-addons,
-  kirigami2,
-  knotifications,
-  kpeople,
-  libphonenumber,
-  modemmanager-qt,
-  protobuf,
-  qcoro,
-  qtquickcontrols2,
-}:
-
-mkDerivation {
-  pname = "spacebar";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    c-ares
-    curl
-    kcontacts
-    ki18n
-    kio
-    kirigami-addons
-    kirigami2
-    knotifications
-    kpeople
-    libphonenumber
-    modemmanager-qt
-    protobuf # Needed by libphonenumber
-    qcoro
-    qtquickcontrols2
-  ];
-
-  meta = with lib; {
-    description = "SMS application for Plasma Mobile";
-    mainProgram = "spacebar";
-    homepage = "https://invent.kde.org/plasma-mobile/spacebar";
-    license = licenses.gpl2Plus;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix
deleted file mode 100644
index 1167bc231a3f..000000000000
--- a/pkgs/applications/plasma-mobile/srcs.nix
+++ /dev/null
@@ -1,182 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/plasma-mobile
-{ fetchurl, mirror }:
-
-{
-  alligator = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/alligator-23.01.0.tar.xz";
-      sha256 = "00vcj8dvzqj9vhq60ygqj62vx26lnai1j7117q0klp8wc9vngbvc";
-      name = "alligator-23.01.0.tar.xz";
-    };
-  };
-  angelfish = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/angelfish-23.01.0.tar.xz";
-      sha256 = "1pzms8xj57r8cv400fbcj9f4v8bs8xlws0f8zgak57jw5yxs073p";
-      name = "angelfish-23.01.0.tar.xz";
-    };
-  };
-  audiotube = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/audiotube-23.01.0.tar.xz";
-      sha256 = "0cjyjqin8zmgav3wf96zv2kr0ifn4xk4il1l5ybwf4k73qg1387x";
-      name = "audiotube-23.01.0.tar.xz";
-    };
-  };
-  calindori = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/calindori-23.01.0.tar.xz";
-      sha256 = "0jhrxsh6gd20qpq68n2lspfkgq3bam46j6m10jnm3zckb190pfhl";
-      name = "calindori-23.01.0.tar.xz";
-    };
-  };
-  kalk = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/kalk-23.01.0.tar.xz";
-      sha256 = "1d5xlinrwjyxfr7ibxjjgbqmy69w6sgxxdpfn1x1wccnjfld4zqf";
-      name = "kalk-23.01.0.tar.xz";
-    };
-  };
-  kasts = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/kasts-23.01.0.tar.xz";
-      sha256 = "09xvgd5vdmniqlnaxrim9d0rpv2qkdz91jq168gzl1kczl26pivf";
-      name = "kasts-23.01.0.tar.xz";
-    };
-  };
-  kclock = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/kclock-23.01.0.tar.xz";
-      sha256 = "0fxda2cqi9qqj2lkzs08jr8i35jzzy5z76k2mbz2qyfmby7hsz1r";
-      name = "kclock-23.01.0.tar.xz";
-    };
-  };
-  keysmith = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/keysmith-23.01.0.tar.xz";
-      sha256 = "0m5gbf3rw1l6qx5aphr57726p6v5nl2g718ainxa689p075smfbf";
-      name = "keysmith-23.01.0.tar.xz";
-    };
-  };
-  khealthcertificate = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/khealthcertificate-23.01.0.tar.xz";
-      sha256 = "193agd3jg029vcq1h5hdg3gw6zgqcmszl6ffcrid0ajbbiic4pbm";
-      name = "khealthcertificate-23.01.0.tar.xz";
-    };
-  };
-  koko = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/koko-23.01.0.tar.xz";
-      sha256 = "1bfbfwavphj3bnf8icnakbdaa6a7i0fgyhs8xa73clwig54fk4np";
-      name = "koko-23.01.0.tar.xz";
-    };
-  };
-  kongress = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/kongress-23.01.0.tar.xz";
-      sha256 = "0yma1b44sjnvhsw31r5bndrpj2sjgwgchpzc8bf9380l6an9k4r5";
-      name = "kongress-23.01.0.tar.xz";
-    };
-  };
-  krecorder = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/krecorder-23.01.0.tar.xz";
-      sha256 = "0aja3w8qbp96h43igajs068s89gf6nn7zwf6c813rbyqzl350phn";
-      name = "krecorder-23.01.0.tar.xz";
-    };
-  };
-  ktrip = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/ktrip-23.01.0.tar.xz";
-      sha256 = "1l69fd1hhclm9212h6zm4nhkc0dg2wl47jw7wl9s6vy3xvmysihm";
-      name = "ktrip-23.01.0.tar.xz";
-    };
-  };
-  kweather = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/kweather-23.01.0.tar.xz";
-      sha256 = "1hcb8jzx2bwcyxphya7kx7q2yri1w0k2753xiibw1hlgmb3qzr7s";
-      name = "kweather-23.01.0.tar.xz";
-    };
-  };
-  plasma-dialer = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-dialer-23.01.0.tar.xz";
-      sha256 = "0n9g3jf71lpcwlwr1ia1i6kh0kiv2vizssni1df3cwskd7hivn7h";
-      name = "plasma-dialer-23.01.0.tar.xz";
-    };
-  };
-  plasma-phonebook = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-phonebook-23.01.0.tar.xz";
-      sha256 = "0pprfgims9h6g1xw48w66bqkmqp7qp7gkc7k4zbj3lgmmnwh6z9i";
-      name = "plasma-phonebook-23.01.0.tar.xz";
-    };
-  };
-  plasma-settings = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-settings-23.01.0.tar.xz";
-      sha256 = "0fz0zjyh15ma6kv79pm0gc92iz6gikxyr4afkyzabzk9559dv1p7";
-      name = "plasma-settings-23.01.0.tar.xz";
-    };
-  };
-  plasmatube = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/plasmatube-23.01.0.tar.xz";
-      sha256 = "06hwa1m6gaacjmcyssa63vw43cgx096x9aj87rv1z9k9qsv2qgfj";
-      name = "plasmatube-23.01.0.tar.xz";
-    };
-  };
-  qmlkonsole = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/qmlkonsole-23.01.0.tar.xz";
-      sha256 = "07h2pkz9h5lm232jasf6znf0i2p5c5qxnjac1d51qf8rfm0fp1q3";
-      name = "qmlkonsole-23.01.0.tar.xz";
-    };
-  };
-  spacebar = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/spacebar-23.01.0.tar.xz";
-      sha256 = "0srwvbnb80cgxkjjq2ch1lrbki7m169i86hig41h368wr9nmjnsl";
-      name = "spacebar-23.01.0.tar.xz";
-    };
-  };
-  telly-skout = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/telly-skout-23.01.0.tar.xz";
-      sha256 = "1wcabca1wlxjna4bd1blpwh7hi1wrcmn8bc06g8mpdzm8756d7sk";
-      name = "telly-skout-23.01.0.tar.xz";
-    };
-  };
-  vakzination = {
-    version = "23.01.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/23.01.0/vakzination-23.01.0.tar.xz";
-      sha256 = "1lx46r46xq18a1pxa6qhnwks43w022fkbrvylb84ycy59djq371n";
-      name = "vakzination-23.01.0.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 39b52bc9257a..df4ad2874a9f 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -60,16 +60,6 @@ makeScopeWithSplicing' {
         in
         (lib.makeOverridable mkGear attrs);
 
-      plasmaMobileGear =
-        let
-          mkPlamoGear = import ../applications/plasma-mobile;
-          attrs = {
-            inherit libsForQt5;
-            inherit (pkgs) lib fetchurl;
-          };
-        in
-        (lib.makeOverridable mkPlamoGear attrs);
-
       noExtraAttrs =
         set:
         lib.attrsets.removeAttrs set [
@@ -82,7 +72,6 @@ makeScopeWithSplicing' {
     in
     (noExtraAttrs (
       kdeFrameworks
-      // plasmaMobileGear
       // plasma5
       // plasma5.thirdParty
       // kdeGear
@@ -91,7 +80,6 @@ makeScopeWithSplicing' {
 
         inherit
           kdeFrameworks
-          plasmaMobileGear
           plasma5
           kdeGear
           qt5

From ee897e6fb5033eb7dc2fc675b15cc95717850295 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:39:28 +0300
Subject: [PATCH 2558/3724] plasma5: drop

---
 .../addons/bismuth/0001-esbuild-config.patch  |  13 -
 .../3rdparty/addons/bismuth/default.nix       |  54 --
 .../3rdparty/addons/caffeine-plus.nix         |  39 --
 .../plasma-5/3rdparty/addons/krunner-ssh.nix  |  53 --
 .../3rdparty/addons/krunner-symbols.nix       |  57 --
 .../3rdparty/addons/virtual-desktop-bar.nix   |  43 --
 .../kwin/scripts/dynamic-workspaces.nix       |  49 --
 .../3rdparty/kwin/scripts/krohnkite.nix       |  49 --
 .../plasma-5/3rdparty/kwin/scripts/kzones.nix |  54 --
 .../3rdparty/kwin/scripts/parachute.nix       |  47 --
 .../plasma-5/3rdparty/kwin/scripts/tiling.nix |  54 --
 .../plasma-5/3rdparty/lightly/default.nix     |  50 --
 pkgs/desktops/plasma-5/aura-browser.nix       |  18 -
 pkgs/desktops/plasma-5/bluedevil.nix          |  43 --
 pkgs/desktops/plasma-5/breeze-grub.nix        |  15 -
 pkgs/desktops/plasma-5/breeze-gtk.nix         |  24 -
 .../plasma-5/breeze-plymouth/default.nix      |  69 ---
 .../breeze-plymouth/install-paths.patch       |  19 -
 pkgs/desktops/plasma-5/breeze-qt5.nix         |  44 --
 pkgs/desktops/plasma-5/default.nix            | 218 --------
 pkgs/desktops/plasma-5/discover.nix           |  76 ---
 pkgs/desktops/plasma-5/fetch.sh               |   1 -
 pkgs/desktops/plasma-5/flatpak-kcm.nix        |  21 -
 pkgs/desktops/plasma-5/kactivitymanagerd.nix  |  32 --
 pkgs/desktops/plasma-5/kde-cli-tools.nix      |  54 --
 .../0001-gsettings-schemas-path.patch         |  21 -
 .../plasma-5/kde-gtk-config/default.nix       |  52 --
 pkgs/desktops/plasma-5/kdecoration.nix        |  21 -
 pkgs/desktops/plasma-5/kdeplasma-addons.nix   |  51 --
 pkgs/desktops/plasma-5/kgamma5.nix            |  25 -
 pkgs/desktops/plasma-5/khotkeys.nix           |  40 --
 .../kinfocenter/0001-tool-paths.patch         |  51 --
 .../desktops/plasma-5/kinfocenter/default.nix | 107 ----
 pkgs/desktops/plasma-5/kmenuedit.nix          |  29 --
 pkgs/desktops/plasma-5/kpipewire.nix          |  29 --
 pkgs/desktops/plasma-5/kscreen.nix            |  45 --
 pkgs/desktops/plasma-5/kscreenlocker.nix      |  49 --
 pkgs/desktops/plasma-5/ksshaskpass.nix        |  25 -
 pkgs/desktops/plasma-5/ksystemstats.nix       |  21 -
 pkgs/desktops/plasma-5/kwallet-pam.nix        |  36 --
 .../plasma-5/kwayland-integration.nix         |  34 --
 ...er-CAP_SYS_NICE-from-the-ambient-set.patch |  40 --
 ...-executable-name-for-.desktop-search.patch | 114 ----
 .../plasma-5/kwin/0001-follow-symlinks.patch  |  25 -
 .../plasma-5/kwin/0002-xwayland.patch         |  25 -
 ...lugins-qpa-allow-using-nixos-wrapper.patch |  26 -
 pkgs/desktops/plasma-5/kwin/default.nix       | 166 ------
 pkgs/desktops/plasma-5/kwrited.nix            |  23 -
 pkgs/desktops/plasma-5/layer-shell-qt.nix     |  27 -
 pkgs/desktops/plasma-5/libkscreen/default.nix |  41 --
 .../libkscreen/libkscreen-backends-path.patch |  28 -
 .../0001-qdiriterator-follow-symlinks.patch   |  24 -
 .../plasma-5/libksysguard/default.nix         |  57 --
 pkgs/desktops/plasma-5/milou.nix              |  29 --
 pkgs/desktops/plasma-5/oxygen-sounds.nix      |   9 -
 pkgs/desktops/plasma-5/oxygen.nix             |  44 --
 .../patches/0001-fix-add-executable-bit.patch |  25 -
 pkgs/desktops/plasma-5/plank-player.nix       |  18 -
 pkgs/desktops/plasma-5/plasma-bigscreen.nix   |  51 --
 .../plasma-5/plasma-browser-integration.nix   |  43 --
 .../plasma-5/plasma-desktop/default.nix       | 149 ------
 .../plasma-desktop/hwclock-path.patch         |  24 -
 .../plasma-5/plasma-desktop/kcm-access.patch  |  13 -
 .../plasma-desktop/no-discover-shortcut.patch |  13 -
 .../plasma-5/plasma-desktop/tzdir.patch       |  18 -
 pkgs/desktops/plasma-5/plasma-disks.nix       |  58 ---
 pkgs/desktops/plasma-5/plasma-firewall.nix    |  22 -
 .../plasma-5/plasma-integration/default.nix   |  46 --
 .../plasma-5/plasma-mobile/default.nix        |  80 ---
 .../desktops/plasma-5/plasma-nano/default.nix |  13 -
 .../plasma-nm/0002-openvpn-binary-path.patch  |  13 -
 pkgs/desktops/plasma-5/plasma-nm/default.nix  |  82 ---
 pkgs/desktops/plasma-5/plasma-pa.nix          |  45 --
 .../plasma-5/plasma-remotecontrollers.nix     |  51 --
 pkgs/desktops/plasma-5/plasma-sdk.nix         |  46 --
 .../plasma-5/plasma-systemmonitor.nix         |  40 --
 pkgs/desktops/plasma-5/plasma-thunderbolt.nix |  17 -
 .../plasma-vault/0001-encfs-path.patch        |  31 --
 .../plasma-vault/0002-cryfs-path.patch        |  25 -
 .../plasma-vault/0003-fusermount-path.patch   |  25 -
 .../plasma-vault/0004-gocryptfs-path.patch    |  13 -
 .../plasma-5/plasma-vault/default.nix         |  43 --
 pkgs/desktops/plasma-5/plasma-welcome.nix     |  45 --
 .../plasma-5/plasma-workspace-wallpapers.nix  |   6 -
 .../plasma-workspace/0001-startkde.patch      |  74 ---
 .../0002-absolute-wallpaper-install-dir.patch |   9 -
 .../plasma-5/plasma-workspace/default.nix     | 191 -------
 pkgs/desktops/plasma-5/polkit-kde-agent.nix   |  35 --
 pkgs/desktops/plasma-5/powerdevil.nix         |  49 --
 pkgs/desktops/plasma-5/qqc2-breeze-style.nix  |  29 --
 pkgs/desktops/plasma-5/sddm-kcm.nix           |  37 --
 pkgs/desktops/plasma-5/srcs.nix               | 486 ------------------
 pkgs/desktops/plasma-5/systemsettings.nix     |  59 ---
 .../plasma-5/xdg-desktop-portal-kde.nix       |  57 --
 pkgs/top-level/qt5-packages.nix               |  14 -
 95 files changed, 4605 deletions(-)
 delete mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch
 delete mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix
 delete mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix
 delete mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
 delete mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix
 delete mode 100644 pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
 delete mode 100644 pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix
 delete mode 100644 pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix
 delete mode 100644 pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
 delete mode 100644 pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix
 delete mode 100644 pkgs/desktops/plasma-5/3rdparty/lightly/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/aura-browser.nix
 delete mode 100644 pkgs/desktops/plasma-5/bluedevil.nix
 delete mode 100644 pkgs/desktops/plasma-5/breeze-grub.nix
 delete mode 100644 pkgs/desktops/plasma-5/breeze-gtk.nix
 delete mode 100644 pkgs/desktops/plasma-5/breeze-plymouth/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch
 delete mode 100644 pkgs/desktops/plasma-5/breeze-qt5.nix
 delete mode 100644 pkgs/desktops/plasma-5/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/discover.nix
 delete mode 100644 pkgs/desktops/plasma-5/fetch.sh
 delete mode 100644 pkgs/desktops/plasma-5/flatpak-kcm.nix
 delete mode 100644 pkgs/desktops/plasma-5/kactivitymanagerd.nix
 delete mode 100644 pkgs/desktops/plasma-5/kde-cli-tools.nix
 delete mode 100644 pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch
 delete mode 100644 pkgs/desktops/plasma-5/kde-gtk-config/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/kdecoration.nix
 delete mode 100644 pkgs/desktops/plasma-5/kdeplasma-addons.nix
 delete mode 100644 pkgs/desktops/plasma-5/kgamma5.nix
 delete mode 100644 pkgs/desktops/plasma-5/khotkeys.nix
 delete mode 100644 pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch
 delete mode 100644 pkgs/desktops/plasma-5/kinfocenter/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/kmenuedit.nix
 delete mode 100644 pkgs/desktops/plasma-5/kpipewire.nix
 delete mode 100644 pkgs/desktops/plasma-5/kscreen.nix
 delete mode 100644 pkgs/desktops/plasma-5/kscreenlocker.nix
 delete mode 100644 pkgs/desktops/plasma-5/ksshaskpass.nix
 delete mode 100644 pkgs/desktops/plasma-5/ksystemstats.nix
 delete mode 100644 pkgs/desktops/plasma-5/kwallet-pam.nix
 delete mode 100644 pkgs/desktops/plasma-5/kwayland-integration.nix
 delete mode 100644 pkgs/desktops/plasma-5/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
 delete mode 100644 pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
 delete mode 100644 pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch
 delete mode 100644 pkgs/desktops/plasma-5/kwin/0002-xwayland.patch
 delete mode 100644 pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
 delete mode 100644 pkgs/desktops/plasma-5/kwin/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/kwrited.nix
 delete mode 100644 pkgs/desktops/plasma-5/layer-shell-qt.nix
 delete mode 100644 pkgs/desktops/plasma-5/libkscreen/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
 delete mode 100644 pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/desktops/plasma-5/libksysguard/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/milou.nix
 delete mode 100644 pkgs/desktops/plasma-5/oxygen-sounds.nix
 delete mode 100644 pkgs/desktops/plasma-5/oxygen.nix
 delete mode 100644 pkgs/desktops/plasma-5/patches/0001-fix-add-executable-bit.patch
 delete mode 100644 pkgs/desktops/plasma-5/plank-player.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-bigscreen.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-browser-integration.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-desktop/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
 delete mode 100644 pkgs/desktops/plasma-5/plasma-desktop/kcm-access.patch
 delete mode 100644 pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch
 delete mode 100644 pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch
 delete mode 100644 pkgs/desktops/plasma-5/plasma-disks.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-firewall.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-integration/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-mobile/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-nano/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
 delete mode 100644 pkgs/desktops/plasma-5/plasma-nm/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-pa.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-remotecontrollers.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-sdk.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-systemmonitor.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-thunderbolt.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-vault/0001-encfs-path.patch
 delete mode 100644 pkgs/desktops/plasma-5/plasma-vault/0002-cryfs-path.patch
 delete mode 100644 pkgs/desktops/plasma-5/plasma-vault/0003-fusermount-path.patch
 delete mode 100644 pkgs/desktops/plasma-5/plasma-vault/0004-gocryptfs-path.patch
 delete mode 100644 pkgs/desktops/plasma-5/plasma-vault/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-welcome.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
 delete mode 100644 pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
 delete mode 100644 pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
 delete mode 100644 pkgs/desktops/plasma-5/plasma-workspace/default.nix
 delete mode 100644 pkgs/desktops/plasma-5/polkit-kde-agent.nix
 delete mode 100644 pkgs/desktops/plasma-5/powerdevil.nix
 delete mode 100644 pkgs/desktops/plasma-5/qqc2-breeze-style.nix
 delete mode 100644 pkgs/desktops/plasma-5/sddm-kcm.nix
 delete mode 100644 pkgs/desktops/plasma-5/srcs.nix
 delete mode 100644 pkgs/desktops/plasma-5/systemsettings.nix
 delete mode 100644 pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix

diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch
deleted file mode 100644
index 8ec7a34d9760..000000000000
--- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/kwinscript/CMakeLists.txt b/src/kwinscript/CMakeLists.txt
-index 9e2f7054..ed607027 100644
---- a/src/kwinscript/CMakeLists.txt
-+++ b/src/kwinscript/CMakeLists.txt
-@@ -39,7 +39,7 @@ endif()
- set(ESBUILD_COMMAND
-     "esbuild" "--bundle" "${CMAKE_CURRENT_SOURCE_DIR}/index.ts"
-     "--outfile=${CMAKE_CURRENT_BINARY_DIR}/bismuth/contents/code/index.mjs"
--    "--format=esm" "--platform=neutral")
-+    "--format=esm" "--platform=neutral" "--target=es6")
- if(USE_NPM)
-   list(PREPEND ESBUILD_COMMAND "npx")
- endif()
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix
deleted file mode 100644
index 56e684794817..000000000000
--- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchFromGitHub,
-  kcoreaddons,
-  kwindowsystem,
-  plasma-framework,
-  systemsettings,
-  cmake,
-  extra-cmake-modules,
-  esbuild,
-}:
-
-mkDerivation rec {
-  pname = "bismuth";
-  version = "3.1.4";
-
-  src = fetchFromGitHub {
-    owner = "Bismuth-Forge";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-c13OFEw6E/I8j/mqeLnuc9Chi6pc3+AgwAMPpCzh974=";
-  };
-
-  patches = [
-    ./0001-esbuild-config.patch
-  ];
-
-  cmakeFlags = [
-    "-DUSE_TSC=OFF"
-    "-DUSE_NPM=OFF"
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    esbuild
-  ];
-
-  buildInputs = [
-    kcoreaddons
-    kwindowsystem
-    plasma-framework
-    systemsettings
-  ];
-
-  meta = with lib; {
-    description = "Dynamic tiling extension for KWin";
-    license = licenses.mit;
-    maintainers = with maintainers; [ pasqui23 ];
-    homepage = "https://bismuth-forge.github.io/bismuth/";
-    inherit (kwindowsystem.meta) platforms;
-  };
-}
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix
deleted file mode 100644
index 7f85fa9f0fc7..000000000000
--- a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchFromGitHub,
-  extra-cmake-modules,
-  kwindowsystem,
-  plasma-framework,
-}:
-
-mkDerivation rec {
-  pname = "plasma-applet-caffeine-plus";
-  version = "1.4";
-
-  src = fetchFromGitHub {
-    owner = "qunxyz";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-/Nz0kSDGok7GjqSQtjH/8q/u6blVTFPO6kfjEyt/jEo=";
-  };
-
-  buildInputs = [
-    kwindowsystem
-    plasma-framework
-  ];
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-
-  cmakeFlags = [
-    "-Wno-dev"
-  ];
-
-  meta = with lib; {
-    description = "Disable screensaver and auto suspend";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ peterhoeg ];
-    inherit (src.meta) homepage;
-    inherit (kwindowsystem.meta) platforms;
-  };
-}
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix
deleted file mode 100644
index 17c4f36cd1b6..000000000000
--- a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitLab,
-  python3,
-}:
-let
-  pythonEnv = python3.withPackages (
-    p: with p; [
-      dbus-python
-      pygobject3
-    ]
-  );
-in
-stdenv.mkDerivation rec {
-  pname = "krunner-ssh";
-  version = "1.0";
-
-  src = fetchFromGitLab {
-    owner = "Programie";
-    repo = "krunner-ssh";
-    rev = version;
-    hash = "sha256-rFTTvmetDeN6t0axVc+8t1TRiuyPBpwqhvsq2IFxa/A=";
-  };
-
-  postPatch = ''
-    sed -e "s|Exec=.*|Exec=$out/libexec/runner.py|" -i ssh-runner.service
-  '';
-
-  nativeBuildInputs = [
-    pythonEnv
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    patchShebangs runner.py
-
-    install -m 0755 -D runner.py $out/libexec/runner.py
-    install -m 0755 -D ssh-runner.desktop $out/share/kservices5/ssh-runner.desktop
-    install -m 0755 -D ssh-runner.service $out/share/dbus-1/services/com.selfcoders.ssh-runner.service
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Simple backend for KRunner providing SSH hosts from your .ssh/known_hosts file as search results";
-    homepage = "https://selfcoders.com/projects/krunner-ssh";
-    license = licenses.mit;
-    maintainers = with maintainers; [ aanderse ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
deleted file mode 100644
index 6703944b01ff..000000000000
--- a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  fetchFromGitHub,
-  extra-cmake-modules,
-  qtbase,
-  wrapQtAppsHook,
-  ki18n,
-  kdelibs4support,
-  krunner,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "krunner-symbols";
-  version = "1.1.0";
-
-  src = fetchFromGitHub {
-    owner = "domschrei";
-    repo = "krunner-symbols";
-    rev = version;
-    sha256 = "sha256-YsoZdPTWpk3/YERwerrVEcaf2IfGVJwpq32onhP8Exo=";
-  };
-
-  buildInputs = [
-    qtbase
-    ki18n
-    kdelibs4support
-    krunner
-  ];
-  nativeBuildInputs = [
-    cmake
-    wrapQtAppsHook
-    extra-cmake-modules
-  ];
-
-  postPatch = ''
-    # symbols.cpp hardcodes the location of configuration files
-    substituteInPlace symbols.cpp \
-      --replace "/usr/share/config/krunner-symbol" "$out/share/config/krunner-symbol"
-
-    # change cmake flag names to output using the correct qt-plugin prefix and kservice location
-    substituteInPlace CMakeLists.txt \
-      --replace "LOCATION_PLUGIN" "KDE_INSTALL_PLUGINDIR" \
-      --replace "LOCATION_DESKTOP" "KDE_INSTALL_KSERVICES5DIR"
-  '';
-
-  cmakeFlags = [ "-DLOCATION_CONFIG=share/config" ];
-
-  meta = with lib; {
-    description = "Little krunner plugin (Plasma 5) to retrieve unicode symbols, or any other string, based on a corresponding keyword";
-    homepage = "https://github.com/domschrei/krunner-symbols";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ hqurve ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix
deleted file mode 100644
index f68df7b7b642..000000000000
--- a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchFromGitHub,
-  extra-cmake-modules,
-  kwindowsystem,
-  plasma-framework,
-  qtx11extras,
-}:
-
-mkDerivation {
-  pname = "plasma-applet-virtual-desktop-bar";
-  version = "unstable-2021-02-20";
-
-  src = fetchFromGitHub {
-    owner = "wsdfhjxc";
-    repo = "virtual-desktop-bar";
-    rev = "3e9bbddb8def8da65071a1c325eaa06598e8a473";
-    sha256 = "192ns6c2brzq46pg385n0v1ydbz52aaa8f5dgfw5251hrw9c7bxg";
-  };
-
-  buildInputs = [
-    kwindowsystem
-    plasma-framework
-    qtx11extras
-  ];
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-
-  cmakeFlags = [
-    "-Wno-dev"
-  ];
-
-  meta = with lib; {
-    description = "Manage virtual desktops dynamically in a convenient way";
-    homepage = "https://github.com/wsdfhjxc/virtual-desktop-bar";
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-}
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
deleted file mode 100644
index 676ea18d2e9f..000000000000
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchFromGitHub,
-  kcoreaddons,
-  kwindowsystem,
-  plasma-framework,
-  systemsettings,
-}:
-
-mkDerivation rec {
-  pname = "dynamic_workspaces";
-  version = "1.0.1";
-
-  src = fetchFromGitHub {
-    owner = "d86leader";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1mnwh489i6l8z9s5a1zl7zybkw76pp9fdmmis41mym7r4wz4iznm";
-  };
-
-  buildInputs = [
-    kcoreaddons
-    kwindowsystem
-    plasma-framework
-    systemsettings
-  ];
-
-  dontBuild = true;
-
-  # 1. --global still installs to $HOME/.local/share so we use --packageroot
-  # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually
-  installPhase = ''
-    runHook preInstall
-
-    plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts
-    install -Dm644 ${src}/metadata.desktop $out/share/kservices5/dynamic_workspaces.desktop
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "KWin script that automatically adds/removes virtual desktops";
-    license = licenses.bsd3;
-    maintainers = [ ];
-    inherit (src.meta) homepage;
-    inherit (kwindowsystem.meta) platforms;
-  };
-}
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix
deleted file mode 100644
index 0d62bdf32869..000000000000
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchFromGitHub,
-  kcoreaddons,
-  kwindowsystem,
-  plasma-framework,
-  systemsettings,
-}:
-
-mkDerivation rec {
-  pname = "krohnkite";
-  version = "0.8.2";
-
-  src = fetchFromGitHub {
-    owner = "esjeon";
-    repo = "krohnkite";
-    rev = "v${version}";
-    hash = "sha256-HZCD5884pHuHey+d+HRx/F/Sp1b6ZUy7MdqqZ08H0lU=";
-  };
-
-  buildInputs = [
-    kcoreaddons
-    kwindowsystem
-    plasma-framework
-    systemsettings
-  ];
-
-  dontBuild = true;
-
-  # 1. --global still installs to $HOME/.local/share so we use --packageroot
-  # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually
-  installPhase = ''
-    runHook preInstall
-
-    plasmapkg2 --type kwinscript --install ${src}/res/ --packageroot $out/share/kwin/scripts
-    install -Dm644 ${src}/res/metadata.desktop $out/share/kservices5/krohnkite.desktop
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Dynamic tiling extension for KWin";
-    license = licenses.mit;
-    maintainers = with maintainers; [ seqizz ];
-    inherit (src.meta) homepage;
-    inherit (kwindowsystem.meta) platforms;
-  };
-}
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix
deleted file mode 100644
index 813ff8d335a7..000000000000
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  kcoreaddons,
-  kwindowsystem,
-  plasma-framework,
-  systemsettings,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "kzones";
-  version = "0.6";
-
-  src = fetchFromGitHub {
-    owner = "gerritdevriese";
-    repo = "kzones";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-OAgzuX05dvotjRWiyPPeUieVJbQoy/opGYu6uVKQM60=";
-  };
-
-  nativeBuildInputs = [ plasma-framework ];
-
-  buildInputs = [
-    kcoreaddons
-    kwindowsystem
-    plasma-framework
-    systemsettings
-  ];
-
-  dontBuild = true;
-
-  # we don't have anything to wrap anyway
-  dontWrapQtApps = true;
-
-  # 1. --global still installs to $HOME/.local/share so we use --packageroot
-  # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually
-  installPhase = ''
-    runHook preInstall
-
-    plasmapkg2 --type kwinscript --install ${finalAttrs.src} --packageroot $out/share/kwin/scripts
-    install -Dm644 ${finalAttrs.src}/metadata.desktop $out/share/kservices5/kwin-script-kzones.desktop
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "KWin Script for snapping windows into zones";
-    maintainers = with maintainers; [ matthiasbeyer ];
-    license = licenses.gpl3Plus;
-    inherit (finalAttrs.src.meta) homepage;
-    inherit (kwindowsystem.meta) platforms;
-  };
-})
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
deleted file mode 100644
index 698af1cadd00..000000000000
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchFromGitHub,
-  kcoreaddons,
-  kwindowsystem,
-  plasma-framework,
-  systemsettings,
-}:
-
-mkDerivation rec {
-  pname = "parachute";
-  version = "0.9.1";
-
-  src = fetchFromGitHub {
-    owner = "tcorreabr";
-    repo = "parachute";
-    rev = "v${version}";
-    sha256 = "QIWb1zIGfkS+Bef7LK+JA6XpwGUW+79XZY47j75nlCE=";
-  };
-
-  buildInputs = [
-    kcoreaddons
-    kwindowsystem
-    plasma-framework
-    systemsettings
-  ];
-
-  dontBuild = true;
-
-  # 1. --global still installs to $HOME/.local/share so we use --packageroot
-  # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually
-  installPhase = ''
-    runHook preInstall
-    plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts
-    install -Dm644 ${src}/metadata.desktop $out/share/kservices5/Parachute.desktop
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Look at your windows and desktops from above";
-    license = licenses.gpl3Only;
-    maintainers = [ ];
-    inherit (src.meta) homepage;
-    inherit (kwindowsystem.meta) platforms;
-  };
-}
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix
deleted file mode 100644
index 384635ad9423..000000000000
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchFromGitHub,
-  kcoreaddons,
-  kwindowsystem,
-  plasma-framework,
-  systemsettings,
-}:
-
-mkDerivation rec {
-  pname = "kwin-tiling";
-  version = "2.4";
-
-  src = fetchFromGitHub {
-    owner = "kwin-scripts";
-    repo = "kwin-tiling";
-    rev = "v${version}";
-    sha256 = "095slpvipy0zcmbn0l7mdnl9g74jaafkr2gqi09b0by5fkvnbh37";
-  };
-
-  # This is technically not needed, but we might as well clean up
-  postPatch = ''
-    rm release.sh
-  '';
-
-  buildInputs = [
-    kcoreaddons
-    kwindowsystem
-    plasma-framework
-    systemsettings
-  ];
-
-  dontBuild = true;
-
-  # 1. --global still installs to $HOME/.local/share so we use --packageroot
-  # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually
-  installPhase = ''
-    runHook preInstall
-
-    plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts
-    install -Dm644 ${src}/metadata.desktop $out/share/kservices5/kwin-script-tiling.desktop
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Tiling script for kwin";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ peterhoeg ];
-    inherit (src.meta) homepage;
-    inherit (kwindowsystem.meta) platforms;
-  };
-}
diff --git a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix b/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix
deleted file mode 100644
index cb8189b994ea..000000000000
--- a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchFromGitHub,
-  cmake,
-  extra-cmake-modules,
-  kdecoration,
-  kcoreaddons,
-  kguiaddons,
-  kconfigwidgets,
-  kwindowsystem,
-  kiconthemes,
-  qtx11extras,
-}:
-
-mkDerivation rec {
-  pname = "lightly";
-  version = "0.4.1";
-  src = fetchFromGitHub {
-    owner = "Luwx";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "k1fEZbhzluNlAmj5s/O9X20aCVQxlWQm/Iw/euX7cmI=";
-  };
-
-  extraCmakeFlags = [ "-DBUILD_TESTING=OFF" ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kcoreaddons
-    kguiaddons
-    kconfigwidgets
-    kwindowsystem
-    kiconthemes
-    qtx11extras
-    kdecoration
-  ];
-
-  meta = with lib; {
-    description = "Modern style for qt applications";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ pasqui23 ];
-    homepage = "https://github.com/Luwx/Lightly/";
-    inherit (kwindowsystem.meta) platforms;
-  };
-}
diff --git a/pkgs/desktops/plasma-5/aura-browser.nix b/pkgs/desktops/plasma-5/aura-browser.nix
deleted file mode 100644
index b012417a6bc7..000000000000
--- a/pkgs/desktops/plasma-5/aura-browser.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  qtwebengine,
-  qtquickcontrols2,
-  kirigami2,
-  ki18n,
-}:
-mkDerivation {
-  pname = "aura-browser";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    qtwebengine
-    qtquickcontrols2
-    kirigami2
-    ki18n
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix
deleted file mode 100644
index 0ad806520c53..000000000000
--- a/pkgs/desktops/plasma-5/bluedevil.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  shared-mime-info,
-  qtbase,
-  qtdeclarative,
-  bluez-qt,
-  kcoreaddons,
-  kcmutils,
-  kdbusaddons,
-  kded,
-  ki18n,
-  kiconthemes,
-  kio,
-  knotifications,
-  kwidgetsaddons,
-  kwindowsystem,
-  plasma-framework,
-}:
-
-mkDerivation {
-  pname = "bluedevil";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    shared-mime-info
-  ];
-  buildInputs = [
-    qtbase
-    qtdeclarative
-    bluez-qt
-    ki18n
-    kio
-    kwindowsystem
-    plasma-framework
-    kcoreaddons
-    kdbusaddons
-    kded
-    kiconthemes
-    knotifications
-    kwidgetsaddons
-    kcmutils
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix
deleted file mode 100644
index cbfb47efade7..000000000000
--- a/pkgs/desktops/plasma-5/breeze-grub.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  mkDerivation,
-}:
-
-mkDerivation {
-  pname = "breeze-grub";
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p "$out/grub/themes"
-    mv breeze "$out/grub/themes"
-
-    runHook postInstall
-  '';
-}
diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix
deleted file mode 100644
index 2974ff51798a..000000000000
--- a/pkgs/desktops/plasma-5/breeze-gtk.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  qtbase,
-  sassc,
-  python3,
-  breeze-qt5,
-}:
-
-mkDerivation {
-  pname = "breeze-gtk";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    sassc
-    python3
-    python3.pkgs.pycairo
-    breeze-qt5
-  ];
-  buildInputs = [ qtbase ];
-  patches = [
-    ./patches/0001-fix-add-executable-bit.patch
-  ];
-  cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ];
-}
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
deleted file mode 100644
index 164394cfa3a4..000000000000
--- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  plymouth,
-  imagemagick,
-  netpbm,
-  perl,
-  logoName ? null,
-  logoFile ? null,
-  osName ? null,
-  osVersion ? null,
-  topColor ? "black",
-  bottomColor ? "black",
-}:
-
-let
-  validColors = [
-    "black"
-    "cardboard_grey"
-    "charcoal_grey"
-    "icon_blue"
-    "paper_white"
-    "plasma_blue"
-    "neon_blue"
-    "neon_green"
-  ];
-  resolvedLogoName =
-    if (logoFile != null && logoName == null) then
-      lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile))
-    else
-      logoName;
-in
-assert lib.asserts.assertOneOf "topColor" topColor validColors;
-assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors;
-
-mkDerivation {
-  pname = "breeze-plymouth";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ]
-  ++ lib.optionals (logoFile != null) [
-    imagemagick
-    netpbm
-    perl
-  ];
-  buildInputs = [ plymouth ];
-  patches = [
-    ./install-paths.patch
-  ];
-  cmakeFlags =
-    [ ]
-    ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}"
-    ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}"
-    ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}"
-    ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}"
-    ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}";
-
-  postPatch = ''
-    substituteInPlace cmake/FindPlymouth.cmake --subst-var out
-  ''
-  + lib.optionalString (logoFile != null) ''
-    cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png
-
-    # conversion for 16bit taken from the breeze-plymouth readme
-    convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png
-    pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png
-  '';
-}
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch b/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch
deleted file mode 100644
index 5d5856d122dd..000000000000
--- a/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: breeze-plymouth-5.7.3/cmake/FindPlymouth.cmake
-===================================================================
---- breeze-plymouth-5.7.3.orig/cmake/FindPlymouth.cmake
-+++ breeze-plymouth-5.7.3/cmake/FindPlymouth.cmake
-@@ -24,12 +24,8 @@
- include(FindPkgConfig)
- 
- pkg_check_modules(Plymouth ply-boot-client ply-splash-core)
--exec_program(${PKG_CONFIG_EXECUTABLE}
--    ARGS ply-splash-core --variable=pluginsdir
--    OUTPUT_VARIABLE Plymouth_PLUGINSDIR)
--exec_program(${PKG_CONFIG_EXECUTABLE}
--    ARGS ply-splash-core --variable=themesdir
--    OUTPUT_VARIABLE Plymouth_THEMESDIR)
-+set(Plymouth_PLUGINSDIR "@out@/lib/plymouth")
-+set(Plymouth_THEMESDIR "@out@/share/plymouth/themes")
- 
- find_package_handle_standard_args(Plymouth
-     FOUND_VAR
diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix
deleted file mode 100644
index 2d50f89e1d39..000000000000
--- a/pkgs/desktops/plasma-5/breeze-qt5.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  frameworkintegration,
-  kcmutils,
-  kconfigwidgets,
-  kcoreaddons,
-  kdecoration,
-  kguiaddons,
-  ki18n,
-  kwayland,
-  kwindowsystem,
-  plasma-framework,
-  qtdeclarative,
-  qtx11extras,
-  fftw,
-}:
-
-mkDerivation {
-  pname = "breeze-qt5";
-  sname = "breeze";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    frameworkintegration
-    kcmutils
-    kconfigwidgets
-    kcoreaddons
-    kdecoration
-    kguiaddons
-    ki18n
-    kwayland
-    kwindowsystem
-    plasma-framework
-    qtdeclarative
-    qtx11extras
-    fftw
-  ];
-  outputs = [
-    "bin"
-    "dev"
-    "out"
-  ];
-  cmakeFlags = [ "-DUSE_Qt4=OFF" ];
-}
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
deleted file mode 100644
index db92d5734049..000000000000
--- a/pkgs/desktops/plasma-5/default.nix
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-  # New packages
-
-  READ THIS FIRST
-
-  This module is for official packages in KDE Plasma 5. All available packages are
-  listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see
-  below).
-
-  IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
-
-  Many of the packages released upstream are not yet built in Nixpkgs due to lack
-  of demand. To add a Nixpkgs build for an upstream package, copy one of the
-  existing packages here and modify it as necessary.
-
-  # Updates
-
-  1. Update the URL in `./fetch.sh`.
-  2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5`
-   from the top of the Nixpkgs tree.
-  3. Use `nox-review wip` to check that everything builds.
-  4. Commit the changes and open a pull request.
-*/
-
-{
-  libsForQt5,
-  lib,
-  config,
-  fetchurl,
-  gsettings-desktop-schemas,
-}:
-
-let
-  maintainers = with lib.maintainers; [
-    ttuegel
-    nyanloutre
-  ];
-  license = with lib.licenses; [
-    lgpl21Plus
-    lgpl3Plus
-    bsd2
-    mit
-    gpl2Plus
-    gpl3Plus
-    fdl12Plus
-  ];
-
-  srcs = import ./srcs.nix {
-    inherit fetchurl;
-    mirror = "mirror://kde";
-  };
-
-  qtStdenv = libsForQt5.callPackage ({ stdenv }: stdenv) { };
-
-  packages =
-    self:
-    let
-
-      propagate =
-        out:
-        let
-          setupHook =
-            { writeScript }:
-            writeScript "setup-hook" ''
-              if [[ "''${hookName-}" != postHook ]]; then
-                  postHooks+=("source @dev@/nix-support/setup-hook")
-              else
-                  # Propagate $${out} output
-                  appendToVar propagatedUserEnvPkgs "@${out}@"
-
-                  if [ -z "$outputDev" ]; then
-                      echo "error: \$outputDev is unset!" >&2
-                      exit 1
-                  fi
-
-                  # Propagate $dev so that this setup hook is propagated
-                  # But only if there is a separate $dev output
-                  if [ "$outputDev" != out ]; then
-                      appendToVar propagatedBuildInputs "@dev@"
-                  fi
-              fi
-            '';
-        in
-        callPackage setupHook { };
-
-      propagateBin = propagate "bin";
-
-      callPackage = self.newScope {
-        inherit propagate propagateBin;
-
-        mkDerivation =
-          args:
-          let
-            inherit (args) pname;
-            sname = args.sname or pname;
-            inherit (srcs.${sname}) src version;
-
-            outputs = args.outputs or [ "out" ];
-            hasBin = lib.elem "bin" outputs;
-            hasDev = lib.elem "dev" outputs;
-
-            defaultSetupHook = if hasBin && hasDev then propagateBin else null;
-            setupHook = args.setupHook or defaultSetupHook;
-            nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ libsForQt5.wrapQtAppsHook ];
-
-            meta =
-              let
-                meta = args.meta or { };
-              in
-              meta
-              // {
-                homepage = meta.homepage or "http://www.kde.org";
-                license = meta.license or license;
-                maintainers = (meta.maintainers or [ ]) ++ maintainers;
-                platforms = meta.platforms or lib.platforms.linux;
-              };
-          in
-          qtStdenv.mkDerivation (
-            args
-            // {
-              inherit
-                pname
-                version
-                meta
-                outputs
-                setupHook
-                src
-                nativeBuildInputs
-                ;
-            }
-          );
-      };
-
-    in
-    {
-      aura-browser = callPackage ./aura-browser.nix { };
-      bluedevil = callPackage ./bluedevil.nix { };
-      breeze-gtk = callPackage ./breeze-gtk.nix { };
-      breeze-qt5 = callPackage ./breeze-qt5.nix { };
-      breeze-grub = callPackage ./breeze-grub.nix { };
-      breeze-plymouth = callPackage ./breeze-plymouth { };
-      discover = callPackage ./discover.nix { };
-      flatpak-kcm = callPackage ./flatpak-kcm.nix { };
-      kactivitymanagerd = callPackage ./kactivitymanagerd.nix { };
-      kde-cli-tools = callPackage ./kde-cli-tools.nix { };
-      kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; };
-      kdecoration = callPackage ./kdecoration.nix { };
-      kdeplasma-addons = callPackage ./kdeplasma-addons.nix { };
-      kgamma5 = callPackage ./kgamma5.nix { };
-      khotkeys = callPackage ./khotkeys.nix { };
-      kinfocenter = callPackage ./kinfocenter { };
-      kmenuedit = callPackage ./kmenuedit.nix { };
-      kpipewire = callPackage ./kpipewire.nix { };
-      kscreen = callPackage ./kscreen.nix { };
-      kscreenlocker = callPackage ./kscreenlocker.nix { };
-      ksshaskpass = callPackage ./ksshaskpass.nix { };
-      ksystemstats = callPackage ./ksystemstats.nix { };
-      kwallet-pam = callPackage ./kwallet-pam.nix { };
-      kwayland-integration = callPackage ./kwayland-integration.nix { };
-      kwin = callPackage ./kwin { };
-      kwrited = callPackage ./kwrited.nix { };
-      layer-shell-qt = callPackage ./layer-shell-qt.nix { };
-      libkscreen = callPackage ./libkscreen { };
-      libksysguard = callPackage ./libksysguard { };
-      milou = callPackage ./milou.nix { };
-      oxygen = callPackage ./oxygen.nix { };
-      oxygen-sounds = callPackage ./oxygen-sounds.nix { };
-      plank-player = callPackage ./plank-player.nix { };
-      plasma-bigscreen = callPackage ./plasma-bigscreen.nix { };
-      plasma-browser-integration = callPackage ./plasma-browser-integration.nix { };
-      plasma-desktop = callPackage ./plasma-desktop { };
-      plasma-disks = callPackage ./plasma-disks.nix { };
-      plasma-firewall = callPackage ./plasma-firewall.nix { };
-      plasma-integration = callPackage ./plasma-integration { };
-      plasma-mobile = callPackage ./plasma-mobile { };
-      plasma-nano = callPackage ./plasma-nano { };
-      plasma-nm = callPackage ./plasma-nm { };
-      plasma-pa = callPackage ./plasma-pa.nix { };
-      plasma-remotecontrollers = callPackage ./plasma-remotecontrollers.nix { };
-      plasma-sdk = callPackage ./plasma-sdk.nix { };
-      plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { };
-      plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { };
-      plasma-vault = callPackage ./plasma-vault { };
-      plasma-welcome = callPackage ./plasma-welcome.nix { };
-      plasma-workspace = callPackage ./plasma-workspace { };
-      plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix { };
-      polkit-kde-agent = callPackage ./polkit-kde-agent.nix { };
-      powerdevil = callPackage ./powerdevil.nix { };
-      qqc2-breeze-style = callPackage ./qqc2-breeze-style.nix { };
-      sddm-kcm = callPackage ./sddm-kcm.nix { };
-      systemsettings = callPackage ./systemsettings.nix { };
-      xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix { };
-
-      thirdParty =
-        let
-          inherit (libsForQt5) callPackage;
-        in
-        {
-          plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { };
-          plasma-applet-virtual-desktop-bar = callPackage ./3rdparty/addons/virtual-desktop-bar.nix { };
-          bismuth = callPackage ./3rdparty/addons/bismuth { };
-          kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { };
-          kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { };
-          krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { };
-          krunner-ssh = callPackage ./3rdparty/addons/krunner-ssh.nix { };
-          krunner-symbols = callPackage ./3rdparty/addons/krunner-symbols.nix { };
-          kzones = callPackage ./3rdparty/kwin/scripts/kzones.nix { };
-          lightly = callPackage ./3rdparty/lightly { };
-          parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { };
-        };
-
-    }
-    // lib.optionalAttrs config.allowAliases {
-      ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
-      plasma-phone-components = throw "'plasma-phone-components' has been renamed to/replaced by 'plasma-mobile'";
-    };
-in
-lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix
deleted file mode 100644
index d5a48a11d8dc..000000000000
--- a/pkgs/desktops/plasma-5/discover.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  gettext,
-  kdoctools,
-  python3,
-  appstream-qt,
-  discount,
-  flatpak,
-  fwupd,
-  ostree,
-  pcre,
-  util-linux,
-  qtquickcontrols2,
-  qtwebview,
-  qtx11extras,
-  karchive,
-  kcmutils,
-  kconfig,
-  kcrash,
-  kdbusaddons,
-  kdeclarative,
-  kidletime,
-  kio,
-  kirigami2,
-  kitemmodels,
-  knewstuff,
-  kpurpose,
-  kuserfeedback,
-  kwindowsystem,
-  kxmlgui,
-  plasma-framework,
-}:
-
-mkDerivation {
-  pname = "discover";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    gettext
-    kdoctools
-    python3
-  ];
-  buildInputs = [
-    # discount is needed for libmarkdown
-    appstream-qt
-    discount
-    flatpak
-    fwupd
-    ostree
-    pcre
-    util-linux
-    qtquickcontrols2
-    qtwebview
-    qtx11extras
-    karchive
-    kcmutils
-    kconfig
-    kcrash
-    kdbusaddons
-    kdeclarative
-    kidletime
-    kio
-    kirigami2
-    kitemmodels
-    knewstuff
-    kpurpose
-    kuserfeedback
-    kwindowsystem
-    kxmlgui
-    plasma-framework
-  ];
-
-  # Incompatible with our current version of fwupd:
-  # error: 'fwupd_release_get_uri' was not declared in this scope
-  meta.broken = true;
-}
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
deleted file mode 100644
index a64e0ec1581d..000000000000
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ /dev/null
@@ -1 +0,0 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.11/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/flatpak-kcm.nix b/pkgs/desktops/plasma-5/flatpak-kcm.nix
deleted file mode 100644
index 3cf54431898c..000000000000
--- a/pkgs/desktops/plasma-5/flatpak-kcm.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  flatpak,
-  kcmutils,
-  kconfig,
-  kdeclarative,
-  kitemmodels,
-}:
-
-mkDerivation {
-  pname = "flatpak-kcm";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    flatpak
-    kcmutils
-    kconfig
-    kdeclarative
-    kitemmodels
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
deleted file mode 100644
index 8fa5be590a20..000000000000
--- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  boost,
-  kconfig,
-  kcoreaddons,
-  kdbusaddons,
-  ki18n,
-  kio,
-  kglobalaccel,
-  kwindowsystem,
-  kxmlgui,
-  kcrash,
-  qtbase,
-}:
-
-mkDerivation {
-  pname = "kactivitymanagerd";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    boost
-    kconfig
-    kcoreaddons
-    kdbusaddons
-    kglobalaccel
-    ki18n
-    kio
-    kwindowsystem
-    kxmlgui
-    kcrash
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix
deleted file mode 100644
index 506d20318067..000000000000
--- a/pkgs/desktops/plasma-5/kde-cli-tools.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kcmutils,
-  kconfig,
-  kdesu,
-  ki18n,
-  kiconthemes,
-  kinit,
-  kio,
-  kwindowsystem,
-  qtsvg,
-  qtx11extras,
-  kactivities,
-  plasma-workspace,
-}:
-
-mkDerivation {
-  pname = "kde-cli-tools";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcmutils
-    kconfig
-    kdesu
-    ki18n
-    kiconthemes
-    kinit
-    kio
-    kwindowsystem
-    qtsvg
-    qtx11extras
-    kactivities
-    plasma-workspace
-  ];
-  postInstall = ''
-    # install a symlink in bin so that kdesu can eventually be found in PATH
-    mkdir -p $out/bin
-    ln -s $out/libexec/kf5/kdesu $out/bin
-  '';
-  dontWrapQtApps = true;
-  preFixup = ''
-    for program in $out/bin/*; do
-      wrapQtApp $program
-    done
-
-    # kdesu looks for kdeinit5 in PATH
-    wrapQtApp $out/libexec/kf5/kdesu --suffix PATH : ${lib.getBin kinit}/bin
-  '';
-}
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch b/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch
deleted file mode 100644
index 2fe4672f6757..000000000000
--- a/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/kded/gtkconfig.cpp b/kded/gtkconfig.cpp
-index 5303636..199c4d5 100644
---- a/kded/gtkconfig.cpp
-+++ b/kded/gtkconfig.cpp
-@@ -41,6 +41,16 @@ GtkConfig::GtkConfig(QObject *parent, const QVariantList&) :
-     kdeglobalsConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kdeglobals")))),
-     kwinConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kwinrc"))))
- {
-+    // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS.
-+    // Normally this would be done by wrapGAppsHook, but this plugin
-+    // (shared object) cannot be wrapped.
-+    QByteArray xdgdata = qgetenv("XDG_DATA_DIRS");
-+    if (!xdgdata.isEmpty()) {
-+        xdgdata.push_front(":");
-+    }
-+    xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH));
-+    qputenv("XDG_DATA_DIRS", xdgdata);
-+
-     QDBusConnection dbus = QDBusConnection::sessionBus();
-     dbus.registerService(QStringLiteral("org.kde.GtkConfig"));
-     dbus.registerObject(QStringLiteral("/GtkConfig"), this, QDBusConnection::ExportScriptableSlots);
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
deleted file mode 100644
index 83442c3359ae..000000000000
--- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  wrapGAppsHook3,
-  glib,
-  gtk3,
-  karchive,
-  kcmutils,
-  kconfigwidgets,
-  ki18n,
-  kiconthemes,
-  kio,
-  knewstuff,
-  gsettings-desktop-schemas,
-  xsettingsd,
-  kdecoration,
-  sass,
-}:
-
-mkDerivation {
-  pname = "kde-gtk-config";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    wrapGAppsHook3
-  ];
-  dontWrapGApps = true; # There is nothing to wrap
-  buildInputs = [
-    ki18n
-    kio
-    glib
-    gtk3
-    karchive
-    kcmutils
-    kconfigwidgets
-    kiconthemes
-    knewstuff
-    gsettings-desktop-schemas
-    xsettingsd
-    kdecoration
-    sass
-  ];
-  cmakeFlags = [
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
-    "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"
-  ];
-  # The gtkconfig KDED module will crash the daemon if the GSettings schemas
-  # aren't found.
-  patches = [ ./0001-gsettings-schemas-path.patch ];
-  preConfigure = ''
-    NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\""
-  '';
-}
diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix
deleted file mode 100644
index e1290656352c..000000000000
--- a/pkgs/desktops/plasma-5/kdecoration.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  qtbase,
-  ki18n,
-  kcoreaddons,
-}:
-
-mkDerivation {
-  pname = "kdecoration";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    qtbase
-    ki18n
-    kcoreaddons
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
deleted file mode 100644
index 1f737ec8dedf..000000000000
--- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  kcmutils,
-  kholidays,
-  kio,
-  knewstuff,
-  kpurpose,
-  kross,
-  krunner,
-  kservice,
-  kunitconversion,
-  ibus,
-  plasma-framework,
-  plasma-workspace,
-  qtdeclarative,
-  qtwebengine,
-  qtx11extras,
-}:
-
-mkDerivation {
-  pname = "kdeplasma-addons";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kcmutils
-    kholidays
-    kio
-    knewstuff
-    kpurpose
-    kross
-    krunner
-    kservice
-    kunitconversion
-    ibus
-    plasma-framework
-    plasma-workspace
-    qtdeclarative
-    qtwebengine
-    qtx11extras
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix
deleted file mode 100644
index 80a8ebb880f1..000000000000
--- a/pkgs/desktops/plasma-5/kgamma5.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kconfig,
-  kconfigwidgets,
-  ki18n,
-  qtx11extras,
-  libXxf86vm,
-}:
-
-mkDerivation {
-  pname = "kgamma5";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kconfig
-    kconfigwidgets
-    ki18n
-    qtx11extras
-    libXxf86vm
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
deleted file mode 100644
index af2299c1adeb..000000000000
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kcmutils,
-  kdbusaddons,
-  kdelibs4support,
-  kglobalaccel,
-  ki18n,
-  kio,
-  kxmlgui,
-  plasma-framework,
-  plasma-workspace,
-  qtx11extras,
-}:
-
-mkDerivation {
-  pname = "khotkeys";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcmutils
-    kdbusaddons
-    kdelibs4support
-    kglobalaccel
-    ki18n
-    kio
-    kxmlgui
-    plasma-framework
-    plasma-workspace
-    qtx11extras
-  ];
-  outputs = [
-    "bin"
-    "dev"
-    "out"
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch b/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch
deleted file mode 100644
index c6cf9bd8d6df..000000000000
--- a/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in
-index f591b9c..e883212 100644
---- a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in
-+++ b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in
-@@ -63,6 +63,6 @@
-         "Name[x-test]": "xxWindow Managerxx",
-         "Name[zh_CN]": "窗口管理器"
-     },
--    "TryExec": "@QtBinariesDir@/qdbus",
-+    "TryExec": "@qdbus@",
-     "X-KDE-KInfoCenter-Category": "graphical_information"
- }
-diff --git a/Modules/kwinsupportinfo/main.cpp b/Modules/kwinsupportinfo/main.cpp
-index 667c079..b727b67 100644
---- a/Modules/kwinsupportinfo/main.cpp
-+++ b/Modules/kwinsupportinfo/main.cpp
-@@ -19,7 +19,7 @@ public:
-     explicit KCMKWinSupportInfo(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
-         : ConfigModule(parent, data, args)
-     {
--        auto outputContext = new CommandOutputContext(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"),
-+        auto outputContext = new CommandOutputContext(QStringLiteral("@qdbus@"),
-                                                       {QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")},
-                                                       parent);
-         qmlRegisterSingletonInstance("org.kde.kinfocenter.kwinsupportinfo.private", 1, 0, "InfoOutputContext", outputContext);
-diff --git a/Modules/xserver/kcm_xserver.json b/Modules/xserver/kcm_xserver.json
-index 04acd6b..24b8f36 100644
---- a/Modules/xserver/kcm_xserver.json
-+++ b/Modules/xserver/kcm_xserver.json
-@@ -130,7 +130,7 @@
-         "Name[zh_CN]": "X 服务器",
-         "Name[zh_TW]": "X 伺服器"
-     },
--    "TryExec": "xdpyinfo",
-+    "TryExec": "@xdpyinfo@",
-     "X-DocPath": "kinfocenter/graphical.html#xserver",
-     "X-KDE-KInfoCenter-Category": "graphical_information",
-     "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information",
-diff --git a/Modules/xserver/main.cpp b/Modules/xserver/main.cpp
-index c406ff7..a261b90 100644
---- a/Modules/xserver/main.cpp
-+++ b/Modules/xserver/main.cpp
-@@ -17,7 +17,7 @@ public:
-     explicit KCMXServer(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
-         : ConfigModule(parent, data, args)
-     {
--        auto outputContext = new CommandOutputContext(QStringLiteral("xdpyinfo"), {}, parent);
-+        auto outputContext = new CommandOutputContext(QStringLiteral("@xdpyinfo@"), {}, parent);
-         qmlRegisterSingletonInstance("org.kde.kinfocenter.xserver.private", 1, 0, "InfoOutputContext", outputContext);
- 
-         auto *about = new KAboutData(QStringLiteral("kcm_xserver"), i18nc("@label kcm name", "X-Server"), QStringLiteral("1.0"), QString(), KAboutLicense::GPL);
diff --git a/pkgs/desktops/plasma-5/kinfocenter/default.nix b/pkgs/desktops/plasma-5/kinfocenter/default.nix
deleted file mode 100644
index ac9964eb4315..000000000000
--- a/pkgs/desktops/plasma-5/kinfocenter/default.nix
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  qttools,
-  kcmutils,
-  kcompletion,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  kdbusaddons,
-  kdeclarative,
-  ki18n,
-  kiconthemes,
-  kio,
-  kirigami2,
-  kpackage,
-  kservice,
-  kwayland,
-  kwidgetsaddons,
-  kxmlgui,
-  solid,
-  systemsettings,
-  dmidecode,
-  fwupd,
-  libraw1394,
-  libusb1,
-  libGLU,
-  pciutils,
-  smartmontools,
-  util-linux,
-  vulkan-tools,
-  wayland-utils,
-  xdpyinfo,
-}:
-
-let
-  inherit (lib) getBin getExe;
-
-  qdbus = "${getBin qttools}/bin/qdbus";
-
-in
-mkDerivation {
-  pname = "kinfocenter";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  buildInputs = [
-    kcmutils
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kdbusaddons
-    kdeclarative
-    ki18n
-    kiconthemes
-    kio
-    kirigami2
-    kpackage
-    kservice
-    kwayland
-    kwidgetsaddons
-    kxmlgui
-    solid
-    systemsettings
-
-    dmidecode
-    fwupd
-    libraw1394
-    libusb1
-    libGLU
-    pciutils
-    smartmontools
-    util-linux
-    vulkan-tools
-    wayland-utils
-    xdpyinfo
-  ];
-
-  patches = [
-    ./0001-tool-paths.patch
-  ];
-
-  postPatch = ''
-    for f in Modules/kwinsupportinfo/{kcm_kwinsupportinfo.json.in,main.cpp}; do
-      substituteInPlace $f \
-        --replace "@qdbus@" "${qdbus}"
-    done
-
-    for f in Modules/xserver/{kcm_xserver.json,main.cpp}; do
-      substituteInPlace $f \
-        --replace "@xdpyinfo@" "${getExe xdpyinfo}"
-    done
-  '';
-
-  # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in
-  # the same directory, while it is actually located in a completely different
-  # store path
-  preFixup = ''
-    ln -sf ${systemsettings}/bin/systemsettings $out/bin/kinfocenter
-  '';
-}
diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix
deleted file mode 100644
index d22002f3ebcf..000000000000
--- a/pkgs/desktops/plasma-5/kmenuedit.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kdbusaddons,
-  khotkeys,
-  ki18n,
-  kiconthemes,
-  kio,
-  kxmlgui,
-  sonnet,
-}:
-
-mkDerivation {
-  pname = "kmenuedit";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kdbusaddons
-    khotkeys
-    ki18n
-    kiconthemes
-    kio
-    kxmlgui
-    sonnet
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/kpipewire.nix b/pkgs/desktops/plasma-5/kpipewire.nix
deleted file mode 100644
index 0b961199d036..000000000000
--- a/pkgs/desktops/plasma-5/kpipewire.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kwayland,
-  ki18n,
-  kcoreaddons,
-  plasma-wayland-protocols,
-  libepoxy,
-  ffmpeg,
-  libgbm,
-  pipewire,
-  wayland,
-}:
-
-mkDerivation {
-  pname = "kpipewire";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kwayland
-    ki18n
-    kcoreaddons
-    plasma-wayland-protocols
-    ffmpeg
-    libgbm
-    pipewire
-    wayland
-  ];
-  propagatedBuildInputs = [ libepoxy ];
-}
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
deleted file mode 100644
index a731051096dd..000000000000
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kconfig,
-  kcmutils,
-  kconfigwidgets,
-  kdbusaddons,
-  kglobalaccel,
-  ki18n,
-  kwidgetsaddons,
-  kxmlgui,
-  libkscreen,
-  qtdeclarative,
-  qtgraphicaleffects,
-  qtsensors,
-  kwindowsystem,
-  kdeclarative,
-  plasma-framework,
-  qtx11extras,
-  layer-shell-qt,
-}:
-
-mkDerivation {
-  pname = "kscreen";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig
-    kcmutils
-    kconfigwidgets
-    kdbusaddons
-    kglobalaccel
-    ki18n
-    kwidgetsaddons
-    kxmlgui
-    libkscreen
-    qtdeclarative
-    qtgraphicaleffects
-    qtsensors
-    kwindowsystem
-    kdeclarative
-    plasma-framework
-    qtx11extras
-    layer-shell-qt
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix
deleted file mode 100644
index 98212a45df79..000000000000
--- a/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  wayland-scanner,
-  kcmutils,
-  kcrash,
-  kdeclarative,
-  kglobalaccel,
-  kidletime,
-  libkscreen,
-  kwayland,
-  libXcursor,
-  pam,
-  plasma-framework,
-  qtdeclarative,
-  qtx11extras,
-  wayland,
-  layer-shell-qt,
-}:
-
-mkDerivation {
-  pname = "kscreenlocker";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    wayland-scanner
-  ];
-  buildInputs = [
-    kcmutils
-    kcrash
-    kdeclarative
-    kglobalaccel
-    kidletime
-    libkscreen
-    kwayland
-    libXcursor
-    pam
-    plasma-framework
-    qtdeclarative
-    qtx11extras
-    wayland
-    layer-shell-qt
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix
deleted file mode 100644
index d112a2579457..000000000000
--- a/pkgs/desktops/plasma-5/ksshaskpass.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kcoreaddons,
-  ki18n,
-  kwallet,
-  kwidgetsaddons,
-  qtbase,
-}:
-
-mkDerivation {
-  pname = "ksshaskpass";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcoreaddons
-    ki18n
-    kwallet
-    kwidgetsaddons
-    qtbase
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix
deleted file mode 100644
index 97591f6cdb14..000000000000
--- a/pkgs/desktops/plasma-5/ksystemstats.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  libksysguard,
-  libnl,
-  lm_sensors,
-  networkmanager-qt,
-}:
-
-mkDerivation {
-  pname = "ksystemstats";
-  env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getBin libksysguard}/share" ];
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    libksysguard
-    libnl
-    lm_sensors
-    networkmanager-qt
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
deleted file mode 100644
index 629b64f79b9e..000000000000
--- a/pkgs/desktops/plasma-5/kwallet-pam.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  pam,
-  socat,
-  libgcrypt,
-  qtbase,
-  kwallet,
-}:
-
-mkDerivation {
-  pname = "kwallet-pam";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    pam
-    socat
-    libgcrypt
-    qtbase
-    kwallet
-  ];
-  postPatch = ''
-    sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|"
-  '';
-
-  # We get a crash when QT_PLUGIN_PATH is more than 1000 characters.
-  # pam_kwallet_init passes its environment to kwalletd5, but
-  # wrapQtApps gives our environment a huge QT_PLUGIN_PATH value. We
-  # are able to unset it here since kwalletd5 will have its own
-  # QT_PLUGIN_PATH.
-  postFixup = ''
-    wrapProgram $out/libexec/pam_kwallet_init --unset QT_PLUGIN_PATH
-  '';
-
-  dontWrapQtApps = true;
-}
diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix
deleted file mode 100644
index e97bdf5c0ec4..000000000000
--- a/pkgs/desktops/plasma-5/kwayland-integration.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kguiaddons,
-  kidletime,
-  kwayland,
-  kwindowsystem,
-  qtbase,
-  wayland-protocols,
-  wayland-scanner,
-  wayland,
-}:
-
-mkDerivation {
-  pname = "kwayland-integration";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    wayland-scanner
-  ];
-  buildInputs = [
-    kguiaddons
-    kidletime
-    kwindowsystem
-    kwayland
-    qtbase
-    wayland-protocols
-    wayland
-  ];
-
-  meta = {
-    description = "Integration plugins for various KDE frameworks for the Wayland windowing system";
-    homepage = "https://invent.kde.org/plasma/kwayland-integration";
-  };
-}
diff --git a/pkgs/desktops/plasma-5/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch b/pkgs/desktops/plasma-5/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
deleted file mode 100644
index e6408605aa43..000000000000
--- a/pkgs/desktops/plasma-5/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 232e480ab1303f37d37d295b57fdcbb6b6648bca Mon Sep 17 00:00:00 2001
-From: Alois Wohlschlager <alois1@gmx-topmail.de>
-Date: Sun, 7 Aug 2022 16:12:31 +0200
-Subject: [PATCH] Lower CAP_SYS_NICE from the ambient set
-
-The capabilities wrapper raises CAP_SYS_NICE into the ambient set so it
-is inherited by the wrapped program. However, we don't want it to leak
-into the entire desktop environment.
-
-Lower the capability again at startup so that the kernel will clear it
-on exec.
----
- src/main_wayland.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp
-index 1720e14e7..f2bb446b0 100644
---- a/src/main_wayland.cpp
-+++ b/src/main_wayland.cpp
-@@ -39,7 +39,9 @@
- #include <QWindow>
- #include <qplatformdefs.h>
- 
-+#include <linux/capability.h>
- #include <sched.h>
-+#include <sys/prctl.h>
- #include <sys/resource.h>
- 
- #include <iomanip>
-@@ -285,6 +287,7 @@ static QString automaticBackendSelection()
- 
- int main(int argc, char *argv[])
- {
-+    prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_LOWER, CAP_SYS_NICE, 0, 0);
-     KWin::Application::setupMalloc();
-     KWin::Application::setupLocalizedString();
-     KWin::gainRealTime();
--- 
-2.37.1
-
diff --git a/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch b/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
deleted file mode 100644
index cdc8245ce5b5..000000000000
--- a/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 29ec6fada935ef966e5859082435ed57daa9522d Mon Sep 17 00:00:00 2001
-From: Samuel Dionne-Riel <samuel@dionne-riel.com>
-Date: Tue, 16 Mar 2021 15:03:59 -0400
-Subject: [PATCH] [NixOS] Unwrap executable name for .desktop search
-
-Why is this necessary even though -a "$0" is used in the wrapper?
-Because it's completely bypassing argv0! This looks at the executable
-file in-use according to the kernel!
-
-Wrappers cannot affect the `/proc/.../exe` symlink!
-
-Co-authored-by: Yaroslav Bolyukin <iam@lach.pw>
----
- src/nixos_utils.h     | 41 +++++++++++++++++++++++++++++++++++++++++
- src/service_utils.h   |  4 +++-
- src/waylandwindow.cpp |  5 ++++-
- 3 files changed, 48 insertions(+), 2 deletions(-)
- create mode 100644 src/nixos_utils.h
-
-diff --git a/src/nixos_utils.h b/src/nixos_utils.h
-new file mode 100644
-index 0000000..726065d
---- /dev/null
-+++ b/src/nixos_utils.h
-@@ -0,0 +1,41 @@
-+#ifndef NIXOS_UTILS_H
-+#define NIXOS_UTILS_H
-+
-+// kwin
-+#include <kwinglobals.h>
-+
-+namespace KWin
-+{
-+
-+static QString unwrapExecutablePath(const QString &in_executablePath)
-+{
-+    // NixOS fixes many packaging issues through "wrapper" scripts that manipulates the environment or does
-+    // miscellaneous trickeries and mischievous things to make the programs work.
-+    // In turn, programs often employs different mischievous schemes and trickeries to do *other things.
-+    // It often happens that they conflict.
-+    // Here, `kwin` tries to detect the .desktop file for a given process.
-+    // `kwin` followed the process `/proc/.../exe` up to the actual binary running.
-+    // It normally would be fine, e.g. /usr/bin/foobar is what's in the desktop file.
-+    // But it's not the truth here! It's extremely likely the resolved path is /nix/store/.../bin/.foobar-wrapped
-+    // rather than what the desktop file points to, something like /nix/store/.../bin/foobar !!
-+    // Since the wrappers for Nixpkgs *always* prepend a dot and append -wrapped, we assume here that we can keep
-+    // `/^(.*)\/\.([^/]*)-wrapped/` until the (equivalent) regex does not match.
-+    // This should canonicalize the wrapper name to the expected name to look for in the desktop file.
-+
-+    // Use a copy of the const string
-+    QString executablePath(in_executablePath);
-+
-+    // While the parts needed are present, "unwrap" one layer of wrapper names.
-+    while (executablePath.endsWith("-wrapped") && executablePath[executablePath.lastIndexOf("/")+1] == QChar('.')) {
-+        // Approximately equivalent to s/-wrapped$//
-+        executablePath.remove(executablePath.length() - 8, 8);
-+        // Approximately equivalent to s;/\.;/;
-+        executablePath.remove(executablePath.lastIndexOf("/")+1, 1);
-+    }
-+
-+    return executablePath;
-+}
-+
-+}// namespace
-+
-+#endif // NIXOS_UTILS_H
-diff --git a/src/utils/serviceutils.h b/src/utils/serviceutils.h
-index 8a70c1f..475b15d 100644
---- a/src/utils/serviceutils.h
-+++ b/src/utils/serviceutils.h
-@@ -19,6 +19,7 @@
- #include <QLoggingCategory>
- //KF
- #include <KApplicationTrader>
-+#include "nixos_utils.h"
- 
- namespace KWin
- {
-@@ -26,8 +27,9 @@ namespace KWin
- const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces");
- const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces");
- 
--static QStringList fetchProcessServiceField(const QString &executablePath, const QString &fieldName)
-+static QStringList fetchProcessServiceField(const QString &in_executablePath, const QString &fieldName)
- {
-+    const QString executablePath = unwrapExecutablePath(in_executablePath);
-     // needed to be able to use the logging category in a header static function
-     static QLoggingCategory KWIN_UTILS ("KWIN_UTILS", QtWarningMsg);
-     const auto servicesFound = KApplicationTrader::query([&executablePath] (const KService::Ptr &service) {
-diff --git a/src/waylandwindow.cpp b/src/waylandwindow.cpp
-index fd2c0c1..ae8cf96 100644
---- a/src/waylandwindow.cpp
-+++ b/src/waylandwindow.cpp
-@@ -10,6 +10,7 @@
- #include "screens.h"
- #include "wayland_server.h"
- #include "workspace.h"
-+#include "nixos_utils.h"
- 
- #include <KWaylandServer/display.h>
- #include <KWaylandServer/clientbuffer.h>
-@@ -173,7 +174,9 @@ void WaylandWindow::updateIcon()
- 
- void WaylandWindow::updateResourceName()
- {
--    const QFileInfo fileInfo(surface()->client()->executablePath());
-+    const QString in_path = surface()->client()->executablePath();
-+    const QString path = unwrapExecutablePath(in_path);
-+    const QFileInfo fileInfo(path);
-     if (fileInfo.exists()) {
-         const QByteArray executableFileName = fileInfo.fileName().toUtf8();
-         setResourceClass(executableFileName, executableFileName);
--- 
-2.32.0
diff --git a/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch
deleted file mode 100644
index efde4f4dcf04..000000000000
--- a/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From af569c9ed8079169b524b31461e2789baa09ef7a Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Mon, 27 Jan 2020 05:31:13 -0600
-Subject: [PATCH 1/3] follow symlinks
-
----
- src/plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.cpp b/src/plugins/kdecorations/aurorae/src/aurorae.cpp
-index 5242cb7..2e4ddae 100644
---- a/src/plugins/kdecorations/aurorae/src/aurorae.cpp
-+++ b/src/plugins/kdecorations/aurorae/src/aurorae.cpp
-@@ -201,7 +201,7 @@ void Helper::init()
-     // so let's try to locate our plugin:
-     QString pluginPath;
-     for (const QString &path : m_engine->importPathList()) {
--        QDirIterator it(path, QDirIterator::Subdirectories);
-+        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             it.next();
-             QFileInfo fileInfo = it.fileInfo();
--- 
-2.29.2
-
diff --git a/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch b/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch
deleted file mode 100644
index dfd25e727f94..000000000000
--- a/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5c90dd84f541bd4789525f12f12ad24411b99018 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Mon, 27 Jan 2020 05:31:23 -0600
-Subject: [PATCH 2/3] xwayland
-
----
- src/xwayland/xwaylandlauncher.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xwayland/xwaylandlauncher.cpp b/src/xwayland/xwaylandlauncher.cpp
-index 57efdde..a211a58 100644
---- a/src/xwayland/xwaylandlauncher.cpp
-+++ b/src/xwayland/xwaylandlauncher.cpp
-@@ -163,7 +163,7 @@ void Xwayland::start()
- 
-     m_xwaylandProcess = new QProcess(this);
-     m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);
--    m_xwaylandProcess->setProgram(QStringLiteral("Xwayland"));
-+    m_xwaylandProcess->setProgram(QLatin1String(NIXPKGS_XWAYLAND));
-     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-     env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd));
-     if (qEnvironmentVariableIsSet("KWIN_XWAYLAND_DEBUG")) {
--- 
-2.29.2
-
diff --git a/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch b/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
deleted file mode 100644
index d0be721b044c..000000000000
--- a/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8d49f5ef8692c352a62f4f8b1bc68e6e210bbee6 Mon Sep 17 00:00:00 2001
-From: Yaroslav  Bolyukin <iam@lach.pw>
-Date: Wed, 23 Dec 2020 18:02:14 +0300
-Subject: [PATCH 3/3] plugins/qpa: allow using nixos wrapper
-
-Signed-off-by: Yaroslav  Bolyukin <iam@lach.pw>
----
- src/plugins/qpa/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/qpa/main.cpp b/src/plugins/qpa/main.cpp
-index efd236b..a69c046 100644
---- a/src/plugins/qpa/main.cpp
-+++ b/src/plugins/qpa/main.cpp
-@@ -23,7 +23,7 @@ public:
-
- QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList &paramList)
- {
--    if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) {
-+    if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) {
-         // Not KWin
-         return nullptr;
-     }
--- 
-2.29.2
-
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
deleted file mode 100644
index 405a7c0a576e..000000000000
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ /dev/null
@@ -1,166 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  wayland-scanner,
-  fetchpatch,
-  libepoxy,
-  lcms2,
-  libICE,
-  libSM,
-  libcap,
-  libdrm,
-  libinput,
-  libxkbcommon,
-  libgbm,
-  pipewire,
-  udev,
-  wayland,
-  xcb-util-cursor,
-  xwayland,
-  plasma-wayland-protocols,
-  wayland-protocols,
-  libxcvt,
-  qtdeclarative,
-  qtmultimedia,
-  qtquickcontrols2,
-  qtscript,
-  qtsensors,
-  qtvirtualkeyboard,
-  qtx11extras,
-  breeze-qt5,
-  kactivities,
-  kcompletion,
-  kcmutils,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  kcrash,
-  kdeclarative,
-  kdecoration,
-  kglobalaccel,
-  ki18n,
-  kiconthemes,
-  kidletime,
-  kinit,
-  kio,
-  knewstuff,
-  knotifications,
-  kpackage,
-  krunner,
-  kscreenlocker,
-  kservice,
-  kwayland,
-  kwidgetsaddons,
-  kwindowsystem,
-  kxmlgui,
-  plasma-framework,
-  libqaccessibilityclient,
-}:
-
-# TODO (ttuegel): investigate qmlplugindump failure
-
-mkDerivation {
-  pname = "kwin";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    wayland-scanner
-  ];
-  buildInputs = [
-    libepoxy
-    lcms2
-    libICE
-    libSM
-    libcap
-    libdrm
-    libinput
-    libxkbcommon
-    libgbm
-    pipewire
-    udev
-    wayland
-    xcb-util-cursor
-    xwayland
-    libxcvt
-    plasma-wayland-protocols
-    wayland-protocols
-
-    qtdeclarative
-    qtmultimedia
-    qtquickcontrols2
-    qtscript
-    qtsensors
-    qtvirtualkeyboard
-    qtx11extras
-
-    breeze-qt5
-    kactivities
-    kcmutils
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kcrash
-    kdeclarative
-    kdecoration
-    kglobalaccel
-    ki18n
-    kiconthemes
-    kidletime
-    kinit
-    kio
-    knewstuff
-    knotifications
-    kpackage
-    krunner
-    kscreenlocker
-    kservice
-    kwayland
-    kwidgetsaddons
-    kwindowsystem
-    kxmlgui
-    plasma-framework
-    libqaccessibilityclient
-
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  postPatch = ''
-    patchShebangs src/effects/strip-effect-metadata.py
-  '';
-
-  patches = [
-    ./0001-follow-symlinks.patch
-    ./0002-xwayland.patch
-    ./0003-plugins-qpa-allow-using-nixos-wrapper.patch
-    ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
-    ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
-    # Pass special environments through arguments to `kwin_wayland`, bypassing
-    # ld.so(8) environment stripping due to `kwin_wayland`'s capabilities.
-    # We need this to have `TZDIR` correctly set for `plasmashell`, or
-    # everything related to timezone, like clock widgets, will be broken.
-    # https://invent.kde.org/plasma/kwin/-/merge_requests/1590
-    (fetchpatch {
-      url = "https://invent.kde.org/plasma/kwin/-/commit/9a008b223ad696db3bf5692750f2b74e578e08b8.diff";
-      sha256 = "sha256-f35G+g2MVABLDbAkCed3ZmtDWrzYn1rdD08mEx35j4k=";
-    })
-  ];
-
-  CXXFLAGS = [
-    ''-DNIXPKGS_XWAYLAND=\"${lib.getExe xwayland}\"''
-  ];
-
-  postInstall = ''
-    # Some package(s) refer to these service types by the wrong name.
-    # I would prefer to patch those packages, but I cannot find them!
-    ln -s ''${!outputBin}/share/kservicetypes5/kwineffect.desktop \
-          ''${!outputBin}/share/kservicetypes5/kwin-effect.desktop
-    ln -s ''${!outputBin}/share/kservicetypes5/kwinscript.desktop \
-          ''${!outputBin}/share/kservicetypes5/kwin-script.desktop
-  '';
-}
diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix
deleted file mode 100644
index 02375111f93d..000000000000
--- a/pkgs/desktops/plasma-5/kwrited.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kcoreaddons,
-  kdbusaddons,
-  ki18n,
-  knotifications,
-  kpty,
-  qtbase,
-}:
-
-mkDerivation {
-  pname = "kwrited";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons
-    kdbusaddons
-    ki18n
-    knotifications
-    kpty
-    qtbase
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/layer-shell-qt.nix b/pkgs/desktops/plasma-5/layer-shell-qt.nix
deleted file mode 100644
index 17ea2317c8ad..000000000000
--- a/pkgs/desktops/plasma-5/layer-shell-qt.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kguiaddons,
-  kidletime,
-  kwayland,
-  kwindowsystem,
-  qtbase,
-  wayland-scanner,
-  wayland,
-  wayland-protocols,
-}:
-
-mkDerivation {
-  pname = "layer-shell-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kguiaddons
-    kidletime
-    kwindowsystem
-    kwayland
-    qtbase
-    wayland-scanner
-    wayland
-    wayland-protocols
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix
deleted file mode 100644
index 93c17f96e3ef..000000000000
--- a/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  mkDerivation,
-  propagate,
-  extra-cmake-modules,
-  wayland-scanner,
-  kconfig,
-  kwayland,
-  plasma-wayland-protocols,
-  wayland,
-  libXrandr,
-  qtx11extras,
-  qttools,
-}:
-
-mkDerivation {
-  pname = "libkscreen";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    wayland-scanner
-  ];
-  buildInputs = [
-    kconfig
-    kwayland
-    plasma-wayland-protocols
-    wayland
-    libXrandr
-    qtx11extras
-    qttools
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  patches = [
-    ./libkscreen-backends-path.patch
-  ];
-  preConfigure = ''
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\""
-  '';
-  setupHook = propagate "out";
-}
diff --git a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
deleted file mode 100644
index 948c045db4b1..000000000000
--- a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/backendmanager.cpp b/src/backendmanager.cpp
-index e1013d5..4bded53 100644
---- a/src/backendmanager.cpp
-+++ b/src/backendmanager.cpp
-@@ -164,18 +164,11 @@ QFileInfo BackendManager::preferredBackend(const QString &backend)
- 
- QFileInfoList BackendManager::listBackends()
- {
--    // Compile a list of installed backends first
--    const QString backendFilter = QStringLiteral("KSC_*");
--    const QStringList paths = QCoreApplication::libraryPaths();
--    QFileInfoList finfos;
--    for (const QString &path : paths) {
--        const QDir dir(path + QStringLiteral("/kf" QT_STRINGIFY(QT_VERSION_MAJOR) "/kscreen/"),
--                       backendFilter,
--                       QDir::SortFlags(QDir::QDir::Name),
--                       QDir::NoDotAndDotDot | QDir::Files);
--        finfos.append(dir.entryInfoList());
--    }
--    return finfos;
-+    const QDir dir(QLatin1String(NIXPKGS_LIBKSCREEN_BACKENDS),
-+                   QStringLiteral("KSC_*"),
-+                   QDir::SortFlags(QDir::QDir::Name),
-+                   QDir::NoDotAndDotDot | QDir::Files);
-+    return dir.entryInfoList();
- }
- 
- void BackendManager::setBackendArgs(const QVariantMap &arguments)
diff --git a/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index ec4a34037dcb..000000000000
--- a/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 07:07:22 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- processui/scripting.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/processui/scripting.cpp b/processui/scripting.cpp
-index efed8ff..841761a 100644
---- a/processui/scripting.cpp
-+++ b/processui/scripting.cpp
-@@ -293,7 +293,7 @@ void Scripting::loadContextMenu()
-     const QStringList dirs =
-         QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("ksysguard/scripts/"), QStandardPaths::LocateDirectory);
-     for (const QString &dir : dirs) {
--        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             scripts.append(it.next());
-         }
--- 
-2.5.2
diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
deleted file mode 100644
index 1ebd1c38c5a2..000000000000
--- a/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kauth,
-  kcompletion,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  ki18n,
-  kiconthemes,
-  knewstuff,
-  kservice,
-  kwidgetsaddons,
-  kwindowsystem,
-  plasma-framework,
-  qtscript,
-  qtwebengine,
-  qtx11extras,
-  libnl,
-  libpcap,
-  qtsensors,
-  lm_sensors,
-}:
-
-mkDerivation {
-  pname = "libksysguard";
-  patches = [
-    ./0001-qdiriterator-follow-symlinks.patch
-  ];
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kauth
-    kconfig
-    ki18n
-    kiconthemes
-    kwindowsystem
-    kcompletion
-    kconfigwidgets
-    kcoreaddons
-    kservice
-    kwidgetsaddons
-    plasma-framework
-    qtscript
-    qtx11extras
-    qtwebengine
-    knewstuff
-    libnl
-    libpcap
-    qtsensors
-    lm_sensors
-  ];
-  outputs = [
-    "bin"
-    "dev"
-    "out"
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix
deleted file mode 100644
index faf8352400d0..000000000000
--- a/pkgs/desktops/plasma-5/milou.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kcoreaddons,
-  kdeclarative,
-  ki18n,
-  kitemmodels,
-  krunner,
-  kservice,
-  plasma-framework,
-  qtscript,
-  qtdeclarative,
-}:
-
-mkDerivation {
-  pname = "milou";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons
-    kdeclarative
-    ki18n
-    kitemmodels
-    krunner
-    kservice
-    plasma-framework
-    qtdeclarative
-    qtscript
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/oxygen-sounds.nix b/pkgs/desktops/plasma-5/oxygen-sounds.nix
deleted file mode 100644
index ddb5be869bea..000000000000
--- a/pkgs/desktops/plasma-5/oxygen-sounds.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-}:
-
-mkDerivation {
-  pname = "oxygen-sounds";
-  nativeBuildInputs = [ extra-cmake-modules ];
-}
diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix
deleted file mode 100644
index 8308cc827591..000000000000
--- a/pkgs/desktops/plasma-5/oxygen.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  frameworkintegration,
-  kcmutils,
-  kcompletion,
-  kconfig,
-  kdecoration,
-  kguiaddons,
-  ki18n,
-  kwidgetsaddons,
-  kservice,
-  kwayland,
-  kwindowsystem,
-  qtdeclarative,
-  qtx11extras,
-  libXdmcp,
-}:
-
-mkDerivation {
-  pname = "oxygen";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    frameworkintegration
-    kcmutils
-    kcompletion
-    kconfig
-    kdecoration
-    kguiaddons
-    ki18n
-    kservice
-    kwayland
-    kwidgetsaddons
-    kwindowsystem
-    qtdeclarative
-    qtx11extras
-    libXdmcp
-  ];
-  outputs = [
-    "bin"
-    "dev"
-    "out"
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/patches/0001-fix-add-executable-bit.patch b/pkgs/desktops/plasma-5/patches/0001-fix-add-executable-bit.patch
deleted file mode 100644
index 8ed822220598..000000000000
--- a/pkgs/desktops/plasma-5/patches/0001-fix-add-executable-bit.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From da6a4651f74625f4c7f3c31f1125cfa4e774780b Mon Sep 17 00:00:00 2001
-From: Yaroslav Bolyukin <iam@lach.pw>
-Date: Mon, 27 Sep 2021 22:45:58 +0300
-Subject: [PATCH] fix: add executable bit
-
-Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 79ff12d..4f3d746 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -2,7 +2,7 @@ file(GLOB_RECURSE SCSS_SOURCES "*.scss")
- file(GLOB CSS_SOURCES "*.css")
- file(GLOB_RECURSE GTK2_SOURCES "gtk2/*")
- 
--configure_file(build_theme.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/build_theme.sh @ONLY)
-+configure_file(build_theme.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/build_theme.sh FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE @ONLY)
- 
- set(SOURCES
-     ${SCSS_SOURCES}
--- 
-2.33.0
diff --git a/pkgs/desktops/plasma-5/plank-player.nix b/pkgs/desktops/plasma-5/plank-player.nix
deleted file mode 100644
index 536db96ef3c3..000000000000
--- a/pkgs/desktops/plasma-5/plank-player.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  qtquickcontrols2,
-  qtmultimedia,
-  kirigami2,
-  ki18n,
-}:
-mkDerivation {
-  pname = "plank-player";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    qtquickcontrols2
-    qtmultimedia
-    kirigami2
-    ki18n
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-bigscreen.nix b/pkgs/desktops/plasma-5/plasma-bigscreen.nix
deleted file mode 100644
index dc6024a1e210..000000000000
--- a/pkgs/desktops/plasma-5/plasma-bigscreen.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kactivities,
-  kactivities-stats,
-  plasma-framework,
-  ki18n,
-  kirigami2,
-  kdeclarative,
-  kcmutils,
-  knotifications,
-  kio,
-  kwayland,
-  kwindowsystem,
-  plasma-workspace,
-  qtmultimedia,
-}:
-mkDerivation {
-  pname = "plasma-bigscreen";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kactivities
-    kactivities-stats
-    plasma-framework
-    ki18n
-    kirigami2
-    kdeclarative
-    kcmutils
-    knotifications
-    kio
-    kwayland
-    kwindowsystem
-    plasma-workspace
-    qtmultimedia
-  ];
-
-  postPatch = ''
-    substituteInPlace bin/plasma-bigscreen-wayland.in \
-      --replace @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec"
-  '';
-
-  preFixup = ''
-    wrapQtApp $out/bin/plasma-bigscreen-x11
-    wrapQtApp $out/bin/plasma-bigscreen-wayland
-  '';
-
-  passthru.providedSessions = [
-    "plasma-bigscreen-x11"
-    "plasma-bigscreen-wayland"
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/pkgs/desktops/plasma-5/plasma-browser-integration.nix
deleted file mode 100644
index 3694282ce348..000000000000
--- a/pkgs/desktops/plasma-5/plasma-browser-integration.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  qtbase,
-  kfilemetadata,
-  kio,
-  ki18n,
-  kconfig,
-  kdbusaddons,
-  knotifications,
-  kpurpose,
-  krunner,
-  kwindowsystem,
-  kactivities,
-  plasma-workspace,
-}:
-
-mkDerivation {
-  pname = "plasma-browser-integration";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    qtbase
-    kfilemetadata
-    kio
-    ki18n
-    kconfig
-    kdbusaddons
-    knotifications
-    kpurpose
-    krunner
-    kwindowsystem
-    kactivities
-    plasma-workspace
-  ];
-
-  meta = {
-    description = "Components necessary to integrate browsers into the Plasma Desktop";
-    mainProgram = "plasma-browser-integration-host";
-    homepage = "https://community.kde.org/Plasma/Browser_Integration";
-  };
-}
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
deleted file mode 100644
index 616c52b886e8..000000000000
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ /dev/null
@@ -1,149 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  wayland-scanner,
-  boost,
-  fontconfig,
-  ibus,
-  libXcursor,
-  libXft,
-  libcanberra_kde,
-  libpulseaudio,
-  libxkbfile,
-  xf86inputevdev,
-  xf86inputsynaptics,
-  xinput,
-  xkeyboard_config,
-  xorgserver,
-  util-linux,
-  wayland,
-  wayland-protocols,
-  accounts-qt,
-  qtdeclarative,
-  qtquickcontrols,
-  qtquickcontrols2,
-  qtsvg,
-  qtx11extras,
-  attica,
-  baloo,
-  kaccounts-integration,
-  kactivities,
-  kactivities-stats,
-  kauth,
-  kcmutils,
-  kdbusaddons,
-  kdeclarative,
-  kded,
-  kdelibs4support,
-  kemoticons,
-  kglobalaccel,
-  ki18n,
-  kitemmodels,
-  knewstuff,
-  knotifications,
-  knotifyconfig,
-  kpeople,
-  krunner,
-  kscreenlocker,
-  kwallet,
-  kwin,
-  phonon,
-  plasma-framework,
-  plasma-workspace,
-  qqc2-desktop-style,
-  xf86inputlibinput,
-  glib,
-  gsettings-desktop-schemas,
-  runCommandLocal,
-  makeWrapper,
-}:
-let
-  # run gsettings with desktop schemas for using in "kcm_access" kcm
-  # and in kaccess
-  gsettings-wrapper = runCommandLocal "gsettings-wrapper" { nativeBuildInputs = [ makeWrapper ]; } ''
-    mkdir -p $out/bin
-    makeWrapper ${glib}/bin/gsettings $out/bin/gsettings --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas.out}/share/gsettings-schemas/${gsettings-desktop-schemas.name}
-  '';
-in
-mkDerivation {
-  pname = "plasma-desktop";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    wayland-scanner
-  ];
-  buildInputs = [
-    boost
-    fontconfig
-    ibus
-    libcanberra_kde
-    libpulseaudio
-    libXcursor
-    libXft
-    xorgserver
-    libxkbfile
-    phonon
-    xf86inputlibinput
-    xf86inputevdev
-    xf86inputsynaptics
-    xinput
-    xkeyboard_config
-    wayland
-    wayland-protocols
-
-    accounts-qt
-    qtdeclarative
-    qtquickcontrols
-    qtquickcontrols2
-    qtsvg
-    qtx11extras
-
-    attica
-    baloo
-    kaccounts-integration
-    kactivities
-    kactivities-stats
-    kauth
-    kcmutils
-    kdbusaddons
-    kdeclarative
-    kded
-    kdelibs4support
-    kemoticons
-    kglobalaccel
-    ki18n
-    kitemmodels
-    knewstuff
-    knotifications
-    knotifyconfig
-    kpeople
-    krunner
-    kscreenlocker
-    kwallet
-    kwin
-    plasma-framework
-    plasma-workspace
-    qqc2-desktop-style
-  ];
-
-  patches = [
-    ./hwclock-path.patch
-    ./tzdir.patch
-    ./kcm-access.patch
-    ./no-discover-shortcut.patch
-  ];
-  CXXFLAGS = [
-    ''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/bin/hwclock\"''
-    ''-DNIXPKGS_GSETTINGS=\"${gsettings-wrapper}/bin/gsettings\"''
-  ];
-  postInstall = ''
-    # Display ~/Desktop contents on the desktop by default.
-    sed -i "''${!outputBin}/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \
-        -e 's/Containment=org.kde.desktopcontainment/Containment=org.kde.plasma.folder/'
-  '';
-
-  # wrap kaccess with wrapped gsettings so it can access accessibility schemas
-  qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ gsettings-wrapper ]}" ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
deleted file mode 100644
index c85d66ad0031..000000000000
--- a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
-===================================================================
---- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
-+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
-@@ -48,10 +48,6 @@
- #include <sys/types.h>
- #endif
-
--// We cannot rely on the $PATH environment variable, because D-Bus activation
--// clears it. So we have to use a reasonable default.
--static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin");
--
- int ClockHelper::ntp(const QStringList &ntpServers, bool ntpEnabled)
- {
-     int ret = 0;
-@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
- 
- void ClockHelper::toHwclock()
- {
--    QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':')));
-+    QString hwclock = QLatin1String(NIXPKGS_HWCLOCK);
-     if (!hwclock.isEmpty()) {
-         KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));
-     }
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/kcm-access.patch b/pkgs/desktops/plasma-5/plasma-desktop/kcm-access.patch
deleted file mode 100644
index 89f6dd8b84f7..000000000000
--- a/pkgs/desktops/plasma-5/plasma-desktop/kcm-access.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/kcms/access/kcmaccess.cpp b/kcms/access/kcmaccess.cpp
-index 4f8d3e2..a96f755 100644
---- a/kcms/access/kcmaccess.cpp
-+++ b/kcms/access/kcmaccess.cpp
-@@ -176,7 +176,7 @@ void KAccessConfig::launchOrcaConfiguration()
-                                       QStringLiteral("screen-reader-enabled"),
-                                       QStringLiteral("true")};
- 
--    int ret = QProcess::execute(QStringLiteral("gsettings"), gsettingArgs);
-+    int ret = QProcess::execute(QStringLiteral(NIXPKGS_GSETTINGS), gsettingArgs);
-     if (ret) {
-         const QString errorStr = QLatin1String("gsettings ") + gsettingArgs.join(QLatin1Char(' '));
-         setOrcaLaunchFeedback(i18n("Could not set gsettings for Orca: \"%1\" failed", errorStr));
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch b/pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch
deleted file mode 100644
index f186671c9cc5..000000000000
--- a/pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/applets/taskmanager/package/contents/config/main.xml b/applets/taskmanager/package/contents/config/main.xml
-index 6bb27695d..25e621810 100644
---- a/applets/taskmanager/package/contents/config/main.xml
-+++ b/applets/taskmanager/package/contents/config/main.xml
-@@ -85,7 +85,7 @@
-     </entry>
-     <entry name="launchers" type="StringList">
-       <label>The list of launcher tasks on the widget. Usually .desktop file or executable URLs. Special URLs such as preferred://browser that expand to default applications are supported.</label>
--      <default>applications:systemsettings.desktop,applications:org.kde.discover.desktop,preferred://filemanager,preferred://browser</default>
-+      <default>applications:systemsettings.desktop,preferred://filemanager,preferred://browser</default>
-     </entry>
-     <entry name="middleClickAction" type="Enum">
-       <label>What to do on middle-mouse click on a task button.</label>
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch b/pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch
deleted file mode 100644
index 97504b330fed..000000000000
--- a/pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
-===================================================================
---- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
-+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
-@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& sele
- 
-     val = selectedzone;
- #else
--    QString tz = "/usr/share/zoneinfo/" + selectedzone;
-+    QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR"));
-+    QString tz = tzdir + "/" + selectedzone;
-+    if (tzdir.isEmpty()) {
-+      // Standard Linux path
-+      tz = "/usr/share/zoneinfo/" + selectedzone;
-+    }
- 
-     if (QFile::exists(tz)) { // make sure the new TZ really exists
-         QFile::remove(QStringLiteral("/etc/localtime"));
diff --git a/pkgs/desktops/plasma-5/plasma-disks.nix b/pkgs/desktops/plasma-5/plasma-disks.nix
deleted file mode 100644
index 8f179c9da132..000000000000
--- a/pkgs/desktops/plasma-5/plasma-disks.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kcmutils,
-  kconfig,
-  kdbusaddons,
-  khtml,
-  ki18n,
-  kiconthemes,
-  kio,
-  kitemviews,
-  kservice,
-  kwindowsystem,
-  kxmlgui,
-  qtquickcontrols,
-  qtquickcontrols2,
-  kactivities,
-  kactivities-stats,
-  kirigami2,
-  kcrash,
-  plasma-workspace,
-  systemsettings,
-}:
-
-mkDerivation {
-  pname = "plasma-disks";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcmutils
-    kconfig
-    kdbusaddons
-    khtml
-    ki18n
-    kiconthemes
-    kio
-    kitemviews
-    kservice
-    kwindowsystem
-    kxmlgui
-    qtquickcontrols
-    qtquickcontrols2
-    kactivities
-    kactivities-stats
-    kirigami2
-    kcrash
-    plasma-workspace
-    systemsettings
-  ];
-  outputs = [
-    "bin"
-    "dev"
-    "out"
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-firewall.nix b/pkgs/desktops/plasma-5/plasma-firewall.nix
deleted file mode 100644
index 2f19a9c86789..000000000000
--- a/pkgs/desktops/plasma-5/plasma-firewall.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  python3,
-  plasma-framework,
-  kcmutils,
-}:
-mkDerivation {
-  pname = "plasma-firewall";
-
-  outputs = [ "out" ];
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kcmutils
-    plasma-framework
-    python3
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-integration/default.nix b/pkgs/desktops/plasma-5/plasma-integration/default.nix
deleted file mode 100644
index 79390b6ed53c..000000000000
--- a/pkgs/desktops/plasma-5/plasma-integration/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  wayland-scanner,
-  breeze-qt5,
-  kconfig,
-  kconfigwidgets,
-  kiconthemes,
-  kio,
-  knotifications,
-  kwayland,
-  libXcursor,
-  qtquickcontrols2,
-  wayland,
-  wayland-protocols,
-  plasma-wayland-protocols,
-}:
-
-# TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration
-
-mkDerivation {
-  pname = "plasma-integration";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    wayland-scanner
-  ];
-  buildInputs = [
-    breeze-qt5
-    kconfig
-    kconfigwidgets
-    kiconthemes
-    kio
-    knotifications
-    kwayland
-    libXcursor
-    qtquickcontrols2
-    wayland
-    wayland-protocols
-    plasma-wayland-protocols
-  ];
-
-  meta = {
-    description = "Set of plugins responsible for better integration of Qt applications when running on a KDE Plasma workspace";
-    homepage = "https://invent.kde.org/plasma/plasma-integration";
-  };
-}
diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix
deleted file mode 100644
index 90acebb762c5..000000000000
--- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  libdbusmenu,
-  pam,
-  wayland,
-  appstream,
-  kdeclarative,
-  kdelibs4support,
-  kpeople,
-  kconfig,
-  krunner,
-  kinit,
-  kirigami-addons,
-  kwayland,
-  kwin,
-  plasma-framework,
-  telepathy,
-  libphonenumber,
-  protobuf,
-  libqofono,
-  modemmanager-qt,
-  networkmanager-qt,
-  plasma-workspace,
-  maliit-framework,
-  maliit-keyboard,
-  qtfeedback,
-  qttools,
-}:
-
-mkDerivation {
-  pname = "plasma-mobile";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    appstream
-    libdbusmenu
-    pam
-    wayland
-    kdeclarative
-    kdelibs4support
-    kpeople
-    kconfig
-    krunner
-    kinit
-    kirigami-addons
-    kwayland
-    kwin
-    plasma-framework
-    telepathy
-    libphonenumber
-    protobuf
-    libqofono
-    modemmanager-qt
-    networkmanager-qt
-    maliit-framework
-    maliit-keyboard
-    plasma-workspace
-    qtfeedback
-  ];
-
-  postPatch = ''
-    substituteInPlace bin/startplasmamobile.in \
-      --replace @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec"
-
-    substituteInPlace bin/plasma-mobile.desktop.cmake \
-      --replace @CMAKE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec"
-  '';
-
-  # Ensures dependencies like libqofono (at the very least) are present for the shell.
-  preFixup = ''
-    wrapQtApp "$out/bin/startplasmamobile"
-  '';
-
-  passthru.providedSessions = [ "plasma-mobile" ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-nano/default.nix b/pkgs/desktops/plasma-5/plasma-nano/default.nix
deleted file mode 100644
index f66163104d61..000000000000
--- a/pkgs/desktops/plasma-5/plasma-nano/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  plasma-framework,
-}:
-
-mkDerivation {
-  pname = "plasma-nano";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    plasma-framework
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
deleted file mode 100644
index c32e73bc2c6c..000000000000
--- a/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp b/vpn/openvpn/openvpnadvancedwidget.cpp
-index 2f11ba1d..310f11b4 100644
---- a/vpn/openvpn/openvpnadvancedwidget.cpp
-+++ b/vpn/openvpn/openvpnadvancedwidget.cpp
-@@ -75,7 +75,7 @@ OpenVpnAdvancedWidget::OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::P
-     connect(m_ui->cmbProxyType, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::proxyTypeChanged);
- 
-     // start openVPN process and get its cipher list
--    const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList{"/sbin", "/usr/sbin"});
-+    const QString openVpnBinary = "@openvpn@/bin/openvpn";
-     const QStringList ciphersArgs(QLatin1String("--show-ciphers"));
-     const QStringList versionArgs(QLatin1String("--version"));
- 
diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
deleted file mode 100644
index 55818dffbe25..000000000000
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  mkDerivation,
-  replaceVars,
-  extra-cmake-modules,
-  kdoctools,
-  kcmutils,
-  kcompletion,
-  kconfigwidgets,
-  kcoreaddons,
-  kdbusaddons,
-  kdeclarative,
-  ki18n,
-  kiconthemes,
-  kinit,
-  kio,
-  kitemviews,
-  knotifications,
-  kservice,
-  kwallet,
-  kwidgetsaddons,
-  kwindowsystem,
-  kxmlgui,
-  plasma-framework,
-  prison,
-  solid,
-  mobile-broadband-provider-info,
-  openconnect,
-  openvpn,
-  modemmanager-qt,
-  networkmanager-qt,
-  qca-qt5,
-  qtdeclarative,
-  qttools,
-}:
-
-mkDerivation {
-  pname = "plasma-nm";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    qttools
-  ];
-  buildInputs = [
-    kdeclarative
-    ki18n
-    kio
-    kwindowsystem
-    plasma-framework
-    kcompletion
-    kcmutils
-    kconfigwidgets
-    kcoreaddons
-    kdbusaddons
-    kiconthemes
-    kinit
-    kitemviews
-    knotifications
-    kservice
-    kwallet
-    kwidgetsaddons
-    kxmlgui
-    prison
-    solid
-
-    qtdeclarative
-    modemmanager-qt
-    networkmanager-qt
-    qca-qt5
-    mobile-broadband-provider-info
-    openconnect
-  ];
-
-  cmakeFlags = [
-    "-DBUILD_MOBILE=ON"
-  ];
-
-  patches = [
-    (replaceVars ./0002-openvpn-binary-path.patch {
-      inherit openvpn;
-    })
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
deleted file mode 100644
index 7b37c98f8337..000000000000
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kcmutils,
-  kconfigwidgets,
-  kcoreaddons,
-  kdeclarative,
-  kglobalaccel,
-  ki18n,
-  kwindowsystem,
-  plasma-framework,
-  qtbase,
-  qtdeclarative,
-  glib,
-  libcanberra-gtk3,
-  libpulseaudio,
-  sound-theme-freedesktop,
-}:
-
-mkDerivation {
-  pname = "plasma-pa";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    glib
-    libcanberra-gtk3
-    libpulseaudio
-    sound-theme-freedesktop
-
-    kcmutils
-    kconfigwidgets
-    kcoreaddons
-    kdeclarative
-    kglobalaccel
-    ki18n
-    plasma-framework
-    kwindowsystem
-
-    qtbase
-    qtdeclarative
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix
deleted file mode 100644
index 1e6b4b2707d4..000000000000
--- a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kconfig,
-  knotifications,
-  ki18n,
-  solid,
-  kcoreaddons,
-  kdeclarative,
-  kcmutils,
-  kpackage,
-  kscreenlocker,
-  kwindowsystem,
-  udevCheckHook,
-  wayland,
-  wayland-scanner,
-  pkg-config,
-  libcec,
-  libcec_platform,
-  libevdev,
-  plasma-workspace,
-  plasma-wayland-protocols,
-}:
-mkDerivation {
-  pname = "plasma-remotecontrollers";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    pkg-config
-    udevCheckHook
-    wayland-scanner
-  ];
-  buildInputs = [
-    kconfig
-    knotifications
-    ki18n
-    solid
-    kcoreaddons
-    kdeclarative
-    kcmutils
-    kpackage
-    kscreenlocker
-    kwindowsystem
-    wayland
-    libcec
-    libcec_platform
-    libevdev
-    plasma-workspace
-    plasma-wayland-protocols
-  ];
-  doInstallCheck = true;
-}
diff --git a/pkgs/desktops/plasma-5/plasma-sdk.nix b/pkgs/desktops/plasma-5/plasma-sdk.nix
deleted file mode 100644
index 465284aca798..000000000000
--- a/pkgs/desktops/plasma-5/plasma-sdk.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  karchive,
-  kcompletion,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  kdbusaddons,
-  kdeclarative,
-  ki18n,
-  kiconthemes,
-  kio,
-  kitemmodels,
-  plasma-framework,
-  kservice,
-  ktexteditor,
-  kwidgetsaddons,
-  kdoctools,
-}:
-
-mkDerivation {
-  pname = "plasma-sdk";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    karchive
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kdbusaddons
-    kdeclarative
-    ki18n
-    kiconthemes
-    kio
-    kitemmodels
-    plasma-framework
-    kservice
-    ktexteditor
-    kwidgetsaddons
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix
deleted file mode 100644
index a9d9e9f1596c..000000000000
--- a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  qtquickcontrols2,
-  kconfig,
-  kcoreaddons,
-  ki18n,
-  kiconthemes,
-  kitemmodels,
-  kitemviews,
-  knewstuff,
-  libksysguard,
-  kquickcharts,
-  ksystemstats,
-  qqc2-desktop-style,
-  qtbase,
-}:
-
-mkDerivation {
-  pname = "plasma-systemmonitor";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    qtquickcontrols2
-    kconfig
-    kcoreaddons
-    ki18n
-    kitemmodels
-    kitemviews
-    knewstuff
-    kiconthemes
-    libksysguard
-    kquickcharts
-    ksystemstats
-    qqc2-desktop-style
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-thunderbolt.nix b/pkgs/desktops/plasma-5/plasma-thunderbolt.nix
deleted file mode 100644
index f9908439e992..000000000000
--- a/pkgs/desktops/plasma-5/plasma-thunderbolt.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kcmutils,
-  kcoreaddons,
-  bolt,
-}:
-
-mkDerivation {
-  pname = "plasma-thunderbolt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcmutils
-    kcoreaddons
-    bolt
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-vault/0001-encfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/0001-encfs-path.patch
deleted file mode 100644
index a5e9d8c531e1..000000000000
--- a/pkgs/desktops/plasma-5/plasma-vault/0001-encfs-path.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fef6bfe87db4411e3dda2f96741cd8204fe41d85 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Tue, 2 Nov 2021 05:57:50 -0500
-Subject: [PATCH 1/3] encfs path
-
----
- kded/engine/backends/encfs/encfsbackend.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp
-index 2d15fa2..3f49867 100644
---- a/kded/engine/backends/encfs/encfsbackend.cpp
-+++ b/kded/engine/backends/encfs/encfsbackend.cpp
-@@ -101,12 +101,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
-     auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
-     KConfigGroup backendConfig(config, "EncfsBackend");
- 
--    return process("encfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
-+    return process(NIXPKGS_ENCFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
- }
- 
- QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const
- {
--    return process("encfsctl", arguments, {});
-+    return process(NIXPKGS_ENCFSCTL, arguments, {});
- }
- 
- } // namespace PlasmaVault
--- 
-2.33.1
-
diff --git a/pkgs/desktops/plasma-5/plasma-vault/0002-cryfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/0002-cryfs-path.patch
deleted file mode 100644
index 4c7567b15076..000000000000
--- a/pkgs/desktops/plasma-5/plasma-vault/0002-cryfs-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a89a0d3f9088d272c01ccb9b730d1dbb500f9cb8 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Tue, 2 Nov 2021 05:59:34 -0500
-Subject: [PATCH 2/3] cryfs path
-
----
- kded/engine/backends/cryfs/cryfsbackend.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp
-index 64138b6..1a9fde2 100644
---- a/kded/engine/backends/cryfs/cryfsbackend.cpp
-+++ b/kded/engine/backends/cryfs/cryfsbackend.cpp
-@@ -207,7 +207,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
-     auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
-     KConfigGroup backendConfig(config, "CryfsBackend");
- 
--    return process("cryfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});
-+    return process(NIXPKGS_CRYFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});
- }
- 
- } // namespace PlasmaVault
--- 
-2.33.1
-
diff --git a/pkgs/desktops/plasma-5/plasma-vault/0003-fusermount-path.patch b/pkgs/desktops/plasma-5/plasma-vault/0003-fusermount-path.patch
deleted file mode 100644
index 0d4481c70541..000000000000
--- a/pkgs/desktops/plasma-5/plasma-vault/0003-fusermount-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 63571e28c65935f32567c0b179a096d62726b778 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Tue, 2 Nov 2021 06:00:32 -0500
-Subject: [PATCH 3/3] fusermount path
-
----
- kded/engine/fusebackend_p.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
-index 91f3523..1c19d88 100644
---- a/kded/engine/fusebackend_p.cpp
-+++ b/kded/engine/fusebackend_p.cpp
-@@ -86,7 +86,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg
- 
- QProcess *FuseBackend::fusermount(const QStringList &arguments) const
- {
--    return process("fusermount", arguments, {});
-+    return process(NIXPKGS_FUSERMOUNT, arguments, {});
- }
- 
- FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload)
--- 
-2.33.1
-
diff --git a/pkgs/desktops/plasma-5/plasma-vault/0004-gocryptfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/0004-gocryptfs-path.patch
deleted file mode 100644
index 8790f877ff07..000000000000
--- a/pkgs/desktops/plasma-5/plasma-vault/0004-gocryptfs-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
-index 2d6df94..3e8ec9a 100644
---- a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
-+++ b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp
-@@ -202,7 +202,7 @@ QProcess *GocryptfsBackend::gocryptfs(const QStringList &arguments) const
-     auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
-     KConfigGroup backendConfig(config, "GocryptfsBackend");
- 
--    return process("gocryptfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
-+    return process(NIXPKGS_GOCRYPTFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
- }
- 
- QString GocryptfsBackend::getConfigFilePath(const Device &device) const
diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix
deleted file mode 100644
index 20408af392a9..000000000000
--- a/pkgs/desktops/plasma-5/plasma-vault/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kactivities,
-  plasma-framework,
-  kwindowsystem,
-  networkmanager-qt,
-  libksysguard,
-  encfs,
-  cryfs,
-  fuse,
-  gocryptfs,
-}:
-
-mkDerivation {
-  pname = "plasma-vault";
-  nativeBuildInputs = [ extra-cmake-modules ];
-
-  patches = [
-    ./0001-encfs-path.patch
-    ./0002-cryfs-path.patch
-    ./0003-fusermount-path.patch
-    ./0004-gocryptfs-path.patch
-  ];
-
-  buildInputs = [
-    kactivities
-    plasma-framework
-    kwindowsystem
-    libksysguard
-    networkmanager-qt
-  ];
-
-  CXXFLAGS = [
-    ''-DNIXPKGS_ENCFS=\"${lib.getBin encfs}/bin/encfs\"''
-    ''-DNIXPKGS_ENCFSCTL=\"${lib.getBin encfs}/bin/encfsctl\"''
-    ''-DNIXPKGS_CRYFS=\"${lib.getBin cryfs}/bin/cryfs\"''
-    ''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount\"''
-    ''-DNIXPKGS_GOCRYPTFS=\"${lib.getBin gocryptfs}/bin/gocryptfs\"''
-  ];
-
-}
diff --git a/pkgs/desktops/plasma-5/plasma-welcome.nix b/pkgs/desktops/plasma-5/plasma-welcome.nix
deleted file mode 100644
index 219db4ea756b..000000000000
--- a/pkgs/desktops/plasma-5/plasma-welcome.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  qtquickcontrols2,
-  accounts-qt,
-  kaccounts-integration,
-  kcoreaddons,
-  kconfigwidgets,
-  kdbusaddons,
-  kdeclarative,
-  ki18n,
-  kio,
-  kirigami2,
-  knewstuff,
-  knotifications,
-  kservice,
-  kuserfeedback,
-  kwindowsystem,
-  plasma-framework,
-  signond,
-}:
-
-mkDerivation {
-  pname = "plasma-welcome";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    qtquickcontrols2
-    accounts-qt
-    kaccounts-integration
-    kcoreaddons
-    kconfigwidgets
-    kdbusaddons
-    kdeclarative
-    ki18n
-    kio
-    kirigami2
-    knewstuff
-    knotifications
-    kservice
-    kuserfeedback
-    kwindowsystem
-    plasma-framework
-    signond
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
deleted file mode 100644
index 799973c21538..000000000000
--- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ mkDerivation, extra-cmake-modules }:
-
-mkDerivation {
-  pname = "plasma-workspace-wallpapers";
-  nativeBuildInputs = [ extra-cmake-modules ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
deleted file mode 100644
index 6a33742dad86..000000000000
--- a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
-index 46363ddcb..d787f9993 100644
---- a/kcms/krdb/krdb.cpp
-+++ b/kcms/krdb/krdb.cpp
-@@ -468,7 +468,7 @@ void runRdb(unsigned int flags)
-     proc.execute();
- 
-     // Needed for applications that don't set their own cursor.
--    QProcess::execute(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
-+    QProcess::execute(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
- 
-     applyGtkStyles(1);
-     applyGtkStyles(2);
-diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp
-index ffec07ebf..11e70fef8 100644
---- a/startkde/plasma-session/startup.cpp
-+++ b/startkde/plasma-session/startup.cpp
-@@ -176,7 +176,7 @@ Startup::Startup(QObject *parent)
-     }
- 
-     // Keep for KF5; remove in KF6 (KInit will be gone then)
--    QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), QStringList());
-+    QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), QStringList());
- 
-     KJob *phase1 = nullptr;
-     m_lock.reset(new QEventLoopLocker);
-diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp
-index 04875c358..5822af37c 100644
---- a/startkde/startplasma-wayland.cpp
-+++ b/startkde/startplasma-wayland.cpp
-@@ -89,7 +89,7 @@ int main(int argc, char **argv)
-     out << "startplasma-wayland: Shutting down...\n";
- 
-     // Keep for KF5; remove in KF6 (KInit will be gone then)
--    runSync(QStringLiteral("kdeinit5_shutdown"), {});
-+    runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {});
- 
-     out << "startplasmacompositor: Shutting down...\n";
-     cleanupPlasmaEnvironment(oldSystemdEnvironment);
-diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
-index 8e82e29c3..1ed176706 100644
---- a/startkde/startplasma-x11.cpp
-+++ b/startkde/startplasma-x11.cpp
-@@ -87,7 +87,7 @@ int main(int argc, char **argv)
-     out << "startkde: Shutting down...\n";
- 
-     // Keep for KF5; remove in KF6 (KInit will be gone then)
--    runSync(QStringLiteral("kdeinit5_shutdown"), {});
-+    runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {});
- 
-     cleanupPlasmaEnvironment(oldSystemdEnvironment);
- 
-diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
-index b0158c97d..c8f7fe223 100644
---- a/startkde/startplasma.cpp
-+++ b/startkde/startplasma.cpp
-@@ -50,7 +50,7 @@ void sigtermHandler(int signalNumber)
- void messageBox(const QString &text)
- {
-     out << text;
--    runSync(QStringLiteral("xmessage"), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text});
-+    runSync(QStringLiteral(NIXPKGS_XMESSAGE), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text});
- }
- 
- QStringList allServices(const QLatin1String &prefix)
-@@ -484,7 +484,7 @@ QProcess *setupKSplash()
-         if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
-             p = new QProcess;
-             p->setProcessChannelMode(QProcess::ForwardedChannels);
--            p->start(QStringLiteral("ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
-+            p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
-         }
-     }
-     return p;
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
deleted file mode 100644
index 45c9f695b452..000000000000
--- a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/lookandfeel/sddm-theme/theme.conf.cmake
-+++ b/lookandfeel/sddm-theme/theme.conf.cmake
-@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg
- type=image
- color=#1d99f3
- fontSize=10
--background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png
-+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png
- needsFullUserModel=false
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
deleted file mode 100644
index 41263142c5bd..000000000000
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ /dev/null
@@ -1,191 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  wayland-scanner,
-  isocodes,
-  libdbusmenu,
-  libSM,
-  libXcursor,
-  libXtst,
-  libXft,
-  pam,
-  wayland,
-  xmessage,
-  xsetroot,
-  baloo,
-  breeze-qt5,
-  kactivities,
-  kactivities-stats,
-  kcmutils,
-  kconfig,
-  kcrash,
-  kdbusaddons,
-  kdeclarative,
-  kdelibs4support,
-  kdesu,
-  kglobalaccel,
-  kidletime,
-  kinit,
-  kjsembed,
-  knewstuff,
-  knotifyconfig,
-  kpackage,
-  kpeople,
-  krunner,
-  kscreenlocker,
-  ktexteditor,
-  ktextwidgets,
-  kwallet,
-  kwayland,
-  kwin,
-  kxmlrpcclient,
-  libkscreen,
-  libksysguard,
-  libqalculate,
-  networkmanager-qt,
-  phonon,
-  plasma-framework,
-  prison,
-  solid,
-  kholidays,
-  kquickcharts,
-  appstream-qt,
-  plasma-wayland-protocols,
-  kpipewire,
-  libkexiv2,
-  kuserfeedback,
-  qtgraphicaleffects,
-  qtquickcontrols,
-  qtquickcontrols2,
-  qtscript,
-  qttools,
-  qtwayland,
-  qtx11extras,
-  qqc2-desktop-style,
-  polkit-qt,
-  pipewire,
-  libdrm,
-  fetchpatch,
-}:
-
-let
-  inherit (lib) getBin getLib;
-in
-
-mkDerivation {
-  pname = "plasma-workspace";
-  passthru.providedSessions = [
-    "plasma"
-    "plasmawayland"
-  ];
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    wayland-scanner
-  ];
-  buildInputs = [
-    isocodes
-    libdbusmenu
-    libSM
-    libXcursor
-    libXtst
-    libXft
-    pam
-    wayland
-
-    baloo
-    kactivities
-    kactivities-stats
-    kcmutils
-    kconfig
-    kcrash
-    kdbusaddons
-    kdeclarative
-    kdelibs4support
-    kdesu
-    kglobalaccel
-    kidletime
-    kjsembed
-    knewstuff
-    knotifyconfig
-    kpackage
-    kpeople
-    krunner
-    kscreenlocker
-    ktexteditor
-    ktextwidgets
-    kwallet
-    kwayland
-    kwin
-    kxmlrpcclient
-    libkscreen
-    libksysguard
-    libqalculate
-    networkmanager-qt
-    phonon
-    plasma-framework
-    prison
-    solid
-    kholidays
-    kquickcharts
-    appstream-qt
-    plasma-wayland-protocols
-    kpipewire
-    libkexiv2
-
-    kuserfeedback
-    qtgraphicaleffects
-    qtquickcontrols
-    qtquickcontrols2
-    qtscript
-    qtwayland
-    qtx11extras
-    qqc2-desktop-style
-    polkit-qt
-
-    pipewire
-    libdrm
-  ];
-  propagatedUserEnvPkgs = [ qtgraphicaleffects ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  cmakeFlags = [
-    ''-DNIXPKGS_BREEZE_WALLPAPERS=${getBin breeze-qt5}/share/wallpapers''
-  ];
-
-  patches = [
-    ./0001-startkde.patch
-    ./0002-absolute-wallpaper-install-dir.patch
-
-    # Backport patch for cleaner shutdowns
-    (fetchpatch {
-      url = "https://invent.kde.org/plasma/plasma-workspace/-/commit/6ce8f434139f47e6a71bf0b68beae92be8845ce4.patch";
-      hash = "sha256-cYw/4/9tSnCbArLr72O8F8V0NLkVXdCVnJGoGxSzZMg=";
-    })
-  ];
-
-  # QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace 'ecm_query_qt(QtBinariesDir QT_INSTALL_BINS)' 'set(QtBinariesDir "${lib.getBin qttools}/bin")'
-  '';
-
-  # work around wrapQtAppsHook double-wrapping kcminit_startup,
-  # which is a symlink to kcminit
-  postFixup = ''
-    ln -sf $out/bin/kcminit $out/bin/kcminit_startup
-  '';
-
-  env.NIX_CFLAGS_COMPILE = toString [
-    ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"''
-    ''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"''
-    ''-DNIXPKGS_START_KDEINIT_WRAPPER="${getLib kinit}/libexec/kf5/start_kdeinit_wrapper"''
-    ''-DNIXPKGS_KDEINIT5_SHUTDOWN="${getBin kinit}/bin/kdeinit5_shutdown"''
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
deleted file mode 100644
index 5f35fc7e4cac..000000000000
--- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kcoreaddons,
-  kconfig,
-  kcrash,
-  kdbusaddons,
-  ki18n,
-  kiconthemes,
-  knotifications,
-  kwidgetsaddons,
-  kwindowsystem,
-  polkit-qt,
-}:
-
-mkDerivation {
-  pname = "polkit-kde-agent";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kdbusaddons
-    kwidgetsaddons
-    kcoreaddons
-    kcrash
-    kconfig
-    ki18n
-    kiconthemes
-    knotifications
-    kwindowsystem
-    polkit-qt
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix
deleted file mode 100644
index fe24fdf01f09..000000000000
--- a/pkgs/desktops/plasma-5/powerdevil.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  bluez-qt,
-  kactivities,
-  kauth,
-  kconfig,
-  kdbusaddons,
-  kglobalaccel,
-  ki18n,
-  kidletime,
-  kio,
-  knotifyconfig,
-  kwayland,
-  libkscreen,
-  networkmanager-qt,
-  plasma-workspace,
-  qtx11extras,
-  solid,
-  udev,
-}:
-
-mkDerivation {
-  pname = "powerdevil";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kconfig
-    kdbusaddons
-    knotifyconfig
-    solid
-    udev
-    bluez-qt
-    kactivities
-    kauth
-    kglobalaccel
-    ki18n
-    kio
-    kidletime
-    kwayland
-    libkscreen
-    networkmanager-qt
-    plasma-workspace
-    qtx11extras
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/qqc2-breeze-style.nix b/pkgs/desktops/plasma-5/qqc2-breeze-style.nix
deleted file mode 100644
index 36bd9382ad1d..000000000000
--- a/pkgs/desktops/plasma-5/qqc2-breeze-style.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kconfig,
-  kconfigwidgets,
-  kdoctools,
-  kguiaddons,
-  kiconthemes,
-  kirigami2,
-  qtquickcontrols2,
-  qtx11extras,
-}:
-
-mkDerivation {
-  pname = "qqc2-breeze-style";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kconfig
-    kconfigwidgets
-    kguiaddons
-    kiconthemes
-    kirigami2
-    qtquickcontrols2
-    qtx11extras
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix
deleted file mode 100644
index a89ba50418e4..000000000000
--- a/pkgs/desktops/plasma-5/sddm-kcm.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  shared-mime-info,
-  libpthreadstubs,
-  libXcursor,
-  libXdmcp,
-  qtquickcontrols2,
-  qtx11extras,
-  karchive,
-  kcmutils,
-  kdeclarative,
-  ki18n,
-  kio,
-  knewstuff,
-}:
-
-mkDerivation {
-  pname = "sddm-kcm";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    shared-mime-info
-  ];
-  buildInputs = [
-    libpthreadstubs
-    libXcursor
-    libXdmcp
-    qtquickcontrols2
-    qtx11extras
-    karchive
-    kcmutils
-    kdeclarative
-    ki18n
-    kio
-    knewstuff
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
deleted file mode 100644
index be39fe59556e..000000000000
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ /dev/null
@@ -1,486 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5/
-{ fetchurl, mirror }:
-
-{
-  aura-browser = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/aura-browser-5.27.11.tar.xz";
-      sha256 = "098s0r3lr5svdysc93nvv8xqj3dlslly733hf8pz1nlp621dhx7k";
-      name = "aura-browser-5.27.11.tar.xz";
-    };
-  };
-  bluedevil = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/bluedevil-5.27.11.tar.xz";
-      sha256 = "1134pm16db70h79q55c9ir1d1amqscdd8bvkf92nmmk6s2zsimdl";
-      name = "bluedevil-5.27.11.tar.xz";
-    };
-  };
-  breeze = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/breeze-5.27.11.tar.xz";
-      sha256 = "1ascvlkycbn4h0bi2cdjljnpi3cfp7whvzslm4fb2gdwwlpnlx8l";
-      name = "breeze-5.27.11.tar.xz";
-    };
-  };
-  breeze-grub = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/breeze-grub-5.27.11.tar.xz";
-      sha256 = "03l6lpqj1fp2645qy23fcngfzwzhdgyj3xw563gx3gcgqwrc84h6";
-      name = "breeze-grub-5.27.11.tar.xz";
-    };
-  };
-  breeze-gtk = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/breeze-gtk-5.27.11.tar.xz";
-      sha256 = "1vkzyv65m37jg436brscgn61dd6mil50s8jyn2szwka0hyzx7gfw";
-      name = "breeze-gtk-5.27.11.tar.xz";
-    };
-  };
-  breeze-plymouth = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/breeze-plymouth-5.27.11.tar.xz";
-      sha256 = "16vp6a2bp6s57wb9cb4dhac650m93829xp7q44n172564lz0pn8d";
-      name = "breeze-plymouth-5.27.11.tar.xz";
-    };
-  };
-  discover = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/discover-5.27.11.tar.xz";
-      sha256 = "0b79x5xfggymxmh0fr45ndc3k3xd2gjryhmy8xd370bd5d964arl";
-      name = "discover-5.27.11.tar.xz";
-    };
-  };
-  drkonqi = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/drkonqi-5.27.11.tar.xz";
-      sha256 = "0g2q959wswjwpn2vj4mmfy3xr6yj4mch55lr8b2xyd0bxw4vb810";
-      name = "drkonqi-5.27.11.tar.xz";
-    };
-  };
-  flatpak-kcm = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/flatpak-kcm-5.27.11.tar.xz";
-      sha256 = "0jnzxk9fhpck19k48fw2mcvr5512xnw3jss9c7xp5h27jhml8b4p";
-      name = "flatpak-kcm-5.27.11.tar.xz";
-    };
-  };
-  kactivitymanagerd = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kactivitymanagerd-5.27.11.tar.xz";
-      sha256 = "1mawqh3vkbibyjijh5797fzj5ldadzvbmkck23v6s34516rpgfxj";
-      name = "kactivitymanagerd-5.27.11.tar.xz";
-    };
-  };
-  kde-cli-tools = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kde-cli-tools-5.27.11.tar.xz";
-      sha256 = "0mc2n91124cxgfhdz6l0x87665q2jamiq14qlzapynjflvzgh9ca";
-      name = "kde-cli-tools-5.27.11.tar.xz";
-    };
-  };
-  kde-gtk-config = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kde-gtk-config-5.27.11.tar.xz";
-      sha256 = "02hdy55vp6yvx8p877jdr5l5hs46k1rxrwj90m93m2vv0ysib2d4";
-      name = "kde-gtk-config-5.27.11.tar.xz";
-    };
-  };
-  kdecoration = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kdecoration-5.27.11.tar.xz";
-      sha256 = "0f7qy5y0352ib6lqq8fv22y3f5zvfbzm9ydn8li3m4lk3531gi3i";
-      name = "kdecoration-5.27.11.tar.xz";
-    };
-  };
-  kdeplasma-addons = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kdeplasma-addons-5.27.11.tar.xz";
-      sha256 = "016dsfg54gyjk4l0qr8s7rdmyhrvf7b2n9nfkx65cb5ja2x6h875";
-      name = "kdeplasma-addons-5.27.11.tar.xz";
-    };
-  };
-  kgamma = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kgamma-5.27.11.tar.xz";
-      sha256 = "0y6n2dp0d7snj72vhm63612a5649qscfv7zcgvdmz3mb8h1xhm5n";
-      name = "kgamma-5.27.11.tar.xz";
-    };
-  };
-  kgamma5 = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kgamma5-5.27.11.tar.xz";
-      sha256 = "0y6n2dp0d7snj72vhm63612a5649qscfv7zcgvdmz3mb8h1xhm5n";
-      name = "kgamma5-5.27.11.tar.xz";
-    };
-  };
-  khotkeys = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/khotkeys-5.27.11.tar.xz";
-      sha256 = "0na4h225yrjfivyw3d1c3p2db1djymyz3wahjgmlz1s6wml7qjcb";
-      name = "khotkeys-5.27.11.tar.xz";
-    };
-  };
-  kinfocenter = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kinfocenter-5.27.11.tar.xz";
-      sha256 = "01qdyklvr1ff83zlpgysa7qlkzv9m6ff1hjjnxcp007k5cal79r9";
-      name = "kinfocenter-5.27.11.tar.xz";
-    };
-  };
-  kmenuedit = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kmenuedit-5.27.11.tar.xz";
-      sha256 = "0mrvqif3k7lsvwn7slmm7b4k27v2km04r7v5jr9dsl865h3dwkch";
-      name = "kmenuedit-5.27.11.tar.xz";
-    };
-  };
-  kpipewire = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kpipewire-5.27.11.tar.xz";
-      sha256 = "1h2czy5qz026gqid2klfnqim4j1p5r526vrp44jxrf1fjhj0z6mc";
-      name = "kpipewire-5.27.11.tar.xz";
-    };
-  };
-  kscreen = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kscreen-5.27.11.tar.xz";
-      sha256 = "0ly7rd519glhv25a4dsxnnxjizqj6j62gf2kfrbcimg7yj77lzvy";
-      name = "kscreen-5.27.11.tar.xz";
-    };
-  };
-  kscreenlocker = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kscreenlocker-5.27.11.tar.xz";
-      sha256 = "1pynfzms3iihfpzhlma7769zaaslk9jnfpgmhx6kah227gmcxf1k";
-      name = "kscreenlocker-5.27.11.tar.xz";
-    };
-  };
-  ksshaskpass = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/ksshaskpass-5.27.11.tar.xz";
-      sha256 = "1fqrw6n9fggdz6rhg0985s6dg6x2h1a8i9zic5zsv24wnbqvsy4y";
-      name = "ksshaskpass-5.27.11.tar.xz";
-    };
-  };
-  ksystemstats = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/ksystemstats-5.27.11.tar.xz";
-      sha256 = "1mawh8icgrx18z7dyqzxxikl0z9fq87z5a1hx6ykimcri345z3ip";
-      name = "ksystemstats-5.27.11.tar.xz";
-    };
-  };
-  kwallet-pam = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kwallet-pam-5.27.11.tar.xz";
-      sha256 = "0h6qmrl4qa5m4csqvn3rvkvlqi6aa606bnfaxx77kqc65a7vhlvz";
-      name = "kwallet-pam-5.27.11.tar.xz";
-    };
-  };
-  kwayland-integration = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kwayland-integration-5.27.11.tar.xz";
-      sha256 = "1dmwd3mw5s67pngb0gd6ki0vfzj0aamkyxiqagn06jkvwsxlfjcb";
-      name = "kwayland-integration-5.27.11.tar.xz";
-    };
-  };
-  kwin = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kwin-5.27.11.tar.xz";
-      sha256 = "0vxmj50wran5glgzs3cwpyjk9qwgwnzlmq0gb4kcsm5x54xv40l9";
-      name = "kwin-5.27.11.tar.xz";
-    };
-  };
-  kwrited = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/kwrited-5.27.11.tar.xz";
-      sha256 = "18f054ya2kkxsivh5pdfl7ja5g26m337bkp65famwd94gsnca487";
-      name = "kwrited-5.27.11.tar.xz";
-    };
-  };
-  layer-shell-qt = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/layer-shell-qt-5.27.11.tar.xz";
-      sha256 = "0l6kfqg0v5gm4dp9xs5kvhw4ahx45gr8ymp3x7zsxj8r2q4j3hzl";
-      name = "layer-shell-qt-5.27.11.tar.xz";
-    };
-  };
-  libkscreen = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/libkscreen-5.27.11.tar.xz";
-      sha256 = "1m8xl9z000pjbgk18mpaz8cfpx7prvlfx8p5i0wk0clz90fz848d";
-      name = "libkscreen-5.27.11.tar.xz";
-    };
-  };
-  libksysguard = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/libksysguard-5.27.11.tar.xz";
-      sha256 = "0ncnrg5g1h7c1w66mks73md3fz5n4axmxw5jb85a3kg8vm6gbx11";
-      name = "libksysguard-5.27.11.tar.xz";
-    };
-  };
-  milou = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/milou-5.27.11.tar.xz";
-      sha256 = "06iyb2zn19xz837wfz86xz5i3rkfkyvyy6xgywhjknvsvi06k08b";
-      name = "milou-5.27.11.tar.xz";
-    };
-  };
-  oxygen = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/oxygen-5.27.11.tar.xz";
-      sha256 = "0w7mnh4ds7avv3xdgd4rb6b5612krbpzm8dx3fgpr2yp7c1lfbxs";
-      name = "oxygen-5.27.11.tar.xz";
-    };
-  };
-  oxygen-sounds = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/oxygen-sounds-5.27.11.tar.xz";
-      sha256 = "1ppikl4b9rldj9d0cgn52vi7jhjrkqkj0blq7c11x52ibb2lk8kg";
-      name = "oxygen-sounds-5.27.11.tar.xz";
-    };
-  };
-  plank-player = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plank-player-5.27.11.tar.xz";
-      sha256 = "1sg6zk97qawpmizdykl6q27h5aha6cfj0qcqx4l606mcixf4gskc";
-      name = "plank-player-5.27.11.tar.xz";
-    };
-  };
-  plasma-bigscreen = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-bigscreen-5.27.11.tar.xz";
-      sha256 = "0rv0hcff6z6xnxpx10by5mxmi6pm16wsa9akd9nf8m5jbm1b7r43";
-      name = "plasma-bigscreen-5.27.11.tar.xz";
-    };
-  };
-  plasma-browser-integration = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-browser-integration-5.27.11.tar.xz";
-      sha256 = "0k0jbhhvmgv1xqw8bz4kn7j1r8d69n1r1mbb1px8ibl6d4famrn4";
-      name = "plasma-browser-integration-5.27.11.tar.xz";
-    };
-  };
-  plasma-desktop = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-desktop-5.27.11.tar.xz";
-      sha256 = "18s4zh8z1x0519xlh156xfay865hpyyhf172znvb9rsic9bix7yh";
-      name = "plasma-desktop-5.27.11.tar.xz";
-    };
-  };
-  plasma-disks = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-disks-5.27.11.tar.xz";
-      sha256 = "1js1m46bh7hshcqx90b97rc5k9gk9rg4kyqc8h3bs767fbvp9l4q";
-      name = "plasma-disks-5.27.11.tar.xz";
-    };
-  };
-  plasma-firewall = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-firewall-5.27.11.tar.xz";
-      sha256 = "01f1429ks9rkh8wsmjw91ryrmifnsxq3q8mxawcwaswiykyykkil";
-      name = "plasma-firewall-5.27.11.tar.xz";
-    };
-  };
-  plasma-integration = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-integration-5.27.11.tar.xz";
-      sha256 = "0ydzy1fy6j6ais1y5zgfai6kxhinf8478jcsa7blg43061zsj55j";
-      name = "plasma-integration-5.27.11.tar.xz";
-    };
-  };
-  plasma-mobile = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-mobile-5.27.11.tar.xz";
-      sha256 = "167hm5p3bhpnf8c5xn4f4r6grldv31wcfbrpyfvkf4kv94pspsq4";
-      name = "plasma-mobile-5.27.11.tar.xz";
-    };
-  };
-  plasma-nano = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-nano-5.27.11.tar.xz";
-      sha256 = "1yrgfhhj6vdc6ppnc8iys1b8wj3mfsf1p9w81d05fy5ka8ykjh0c";
-      name = "plasma-nano-5.27.11.tar.xz";
-    };
-  };
-  plasma-nm = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-nm-5.27.11.tar.xz";
-      sha256 = "0mlybqjnx9xgdmdbhzh65is62x8mwy6h8aw21n31g3nlwafq2spz";
-      name = "plasma-nm-5.27.11.tar.xz";
-    };
-  };
-  plasma-pa = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-pa-5.27.11.tar.xz";
-      sha256 = "1cr0lywxpidhmn0n62xsf4gs94g723rxv5lwdf26jfqnlwg6gaix";
-      name = "plasma-pa-5.27.11.tar.xz";
-    };
-  };
-  plasma-remotecontrollers = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-remotecontrollers-5.27.11.tar.xz";
-      sha256 = "0w77bh27d948sznbs22j5jzlp06711x0g0v3sbm7cy3r6dw7rwsr";
-      name = "plasma-remotecontrollers-5.27.11.tar.xz";
-    };
-  };
-  plasma-sdk = {
-    version = "5.27.11.1";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-sdk-5.27.11.1.tar.xz";
-      sha256 = "0i073qv2drnjixv7p8kzzq05wggdsj2jdckhz1i46dwsd65s38lh";
-      name = "plasma-sdk-5.27.11.1.tar.xz";
-    };
-  };
-  plasma-systemmonitor = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-systemmonitor-5.27.11.tar.xz";
-      sha256 = "1zaxddrjhypf7pc40gyanymf0l5bbdijc3lf5bkl6p8vjaywpjha";
-      name = "plasma-systemmonitor-5.27.11.tar.xz";
-    };
-  };
-  plasma-thunderbolt = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-thunderbolt-5.27.11.tar.xz";
-      sha256 = "1yw9bampcbjxqrxiri3ac933gk29rmn2jcfbxqsb5kcb6gbc5rsz";
-      name = "plasma-thunderbolt-5.27.11.tar.xz";
-    };
-  };
-  plasma-vault = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-vault-5.27.11.tar.xz";
-      sha256 = "1hkn4a61kwnhscl1cq3nza323p4l513d0c3va70vqa7psxwrsn8b";
-      name = "plasma-vault-5.27.11.tar.xz";
-    };
-  };
-  plasma-welcome = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-welcome-5.27.11.tar.xz";
-      sha256 = "02rjm23qqfwnasiqj4ksl4yayg0xijmdxzqqc4f5by17vplcmgng";
-      name = "plasma-welcome-5.27.11.tar.xz";
-    };
-  };
-  plasma-workspace = {
-    version = "5.27.11.1";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-workspace-5.27.11.1.tar.xz";
-      sha256 = "1bib8z7pmb5mscw2p07mbfsphzpvwsiib84s0g25fz4mma6l4hn7";
-      name = "plasma-workspace-5.27.11.1.tar.xz";
-    };
-  };
-  plasma-workspace-wallpapers = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plasma-workspace-wallpapers-5.27.11.tar.xz";
-      sha256 = "02p59m54g453pl3cjx932xpfhz73lc8yq1hxq9pzsyhjd3y2fg12";
-      name = "plasma-workspace-wallpapers-5.27.11.tar.xz";
-    };
-  };
-  plymouth-kcm = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/plymouth-kcm-5.27.11.tar.xz";
-      sha256 = "1m645zw0vi1zj6sqplc7x23ycwkh9x41nxq413njz5sgmb76k8ig";
-      name = "plymouth-kcm-5.27.11.tar.xz";
-    };
-  };
-  polkit-kde-agent = {
-    version = "1-5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/polkit-kde-agent-1-5.27.11.tar.xz";
-      sha256 = "06swprc498fjbk0aw2ac6x4g7sx5whzbaci12nwl068h9y4hisf9";
-      name = "polkit-kde-agent-1-5.27.11.tar.xz";
-    };
-  };
-  powerdevil = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/powerdevil-5.27.11.tar.xz";
-      sha256 = "0wvmdjrmlphxx2jcabsnqzayz50chvrgxsp5ynw3kgdw0lpapli8";
-      name = "powerdevil-5.27.11.tar.xz";
-    };
-  };
-  qqc2-breeze-style = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/qqc2-breeze-style-5.27.11.tar.xz";
-      sha256 = "03v1wdl3wq5xn185b28ljj62qggjllw6s8xzi91s0g3sxfvp3fgx";
-      name = "qqc2-breeze-style-5.27.11.tar.xz";
-    };
-  };
-  sddm-kcm = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/sddm-kcm-5.27.11.tar.xz";
-      sha256 = "1h3lg25hrggwd8f3ivgndwd9vwkvhxh22jgfmsvjxqcv6n0zx6rv";
-      name = "sddm-kcm-5.27.11.tar.xz";
-    };
-  };
-  systemsettings = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/systemsettings-5.27.11.tar.xz";
-      sha256 = "0jlj3wcf3npwi83yhgczkz116p0fiwvgkwnk39zmdba4kqkj8pqg";
-      name = "systemsettings-5.27.11.tar.xz";
-    };
-  };
-  xdg-desktop-portal-kde = {
-    version = "5.27.11";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.11/xdg-desktop-portal-kde-5.27.11.tar.xz";
-      sha256 = "1cyr2scjrdvx0x2qcpky7qr5rxxjlsavwvyjwajlfm0l3s5qjxin";
-      name = "xdg-desktop-portal-kde-5.27.11.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix
deleted file mode 100644
index 363038744186..000000000000
--- a/pkgs/desktops/plasma-5/systemsettings.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kcmutils,
-  kconfig,
-  kdbusaddons,
-  khtml,
-  ki18n,
-  kiconthemes,
-  kio,
-  kitemviews,
-  kservice,
-  kwindowsystem,
-  kxmlgui,
-  qtquickcontrols,
-  qtquickcontrols2,
-  kactivities,
-  kactivities-stats,
-  kirigami2,
-  kirigami-addons,
-  kcrash,
-  plasma-workspace,
-}:
-
-mkDerivation {
-  pname = "systemsettings";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcmutils
-    kconfig
-    kdbusaddons
-    khtml
-    ki18n
-    kiconthemes
-    kio
-    kitemviews
-    kservice
-    kwindowsystem
-    kxmlgui
-    qtquickcontrols
-    qtquickcontrols2
-    kactivities
-    kactivities-stats
-    kirigami2
-    kirigami-addons
-    kcrash
-    plasma-workspace
-  ];
-  outputs = [
-    "bin"
-    "dev"
-    "out"
-  ];
-  meta.mainProgram = "systemsettings5";
-}
diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
deleted file mode 100644
index 3e520dd2ef04..000000000000
--- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  gettext,
-  kdoctools,
-  wayland-scanner,
-  cups,
-  libepoxy,
-  libgbm,
-  pcre,
-  pipewire,
-  wayland,
-  wayland-protocols,
-  kcoreaddons,
-  knotifications,
-  kwayland,
-  kwidgetsaddons,
-  kwindowsystem,
-  kirigami2,
-  kdeclarative,
-  plasma-framework,
-  plasma-wayland-protocols,
-  plasma-workspace,
-  kio,
-  qtbase,
-}:
-
-mkDerivation {
-  pname = "xdg-desktop-portal-kde";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    gettext
-    kdoctools
-    wayland-scanner
-  ];
-  buildInputs = [
-    cups
-    libepoxy
-    libgbm
-    pcre
-    pipewire
-    wayland
-    wayland-protocols
-
-    kio
-    kcoreaddons
-    knotifications
-    kwayland
-    kwidgetsaddons
-    kwindowsystem
-    kirigami2
-    kdeclarative
-    plasma-framework
-    plasma-wayland-protocols
-    plasma-workspace
-  ];
-}
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index df4ad2874a9f..050efba1c446 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -39,17 +39,6 @@ makeScopeWithSplicing' {
         in
         (lib.makeOverridable mkFrameworks attrs);
 
-      plasma5 =
-        let
-          mkPlasma5 = import ../desktops/plasma-5;
-          attrs = {
-            inherit libsForQt5;
-            inherit (pkgs) config lib fetchurl;
-            inherit (pkgs) gsettings-desktop-schemas;
-          };
-        in
-        (lib.makeOverridable mkPlasma5 attrs);
-
       kdeGear =
         let
           mkGear = import ../applications/kde;
@@ -72,15 +61,12 @@ makeScopeWithSplicing' {
     in
     (noExtraAttrs (
       kdeFrameworks
-      // plasma5
-      // plasma5.thirdParty
       // kdeGear
       // qt5
       // {
 
         inherit
           kdeFrameworks
-          plasma5
           kdeGear
           qt5
           ;

From 9d94c5649c60e9aa70125f90b06c6a29842549b3 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Aug 2025 19:39:49 +0300
Subject: [PATCH 2559/3724] kdeGear: drop

---
 .../kde/akonadi-calendar-tools.nix            |   34 -
 pkgs/applications/kde/akonadi-calendar.nix    |   50 -
 pkgs/applications/kde/akonadi-contacts.nix    |   62 -
 .../kde/akonadi-import-wizard.nix             |   55 -
 pkgs/applications/kde/akonadi-mime.nix        |   44 -
 pkgs/applications/kde/akonadi-notes.nix       |   45 -
 pkgs/applications/kde/akonadi-search.nix      |   55 -
 .../kde/akonadi/0001-akonadi-paths.patch      |  190 --
 .../kde/akonadi/0002-akonadi-timestamps.patch |   26 -
 ...0003-akonadi-revert-make-relocatable.patch |   45 -
 pkgs/applications/kde/akonadi/default.nix     |   90 -
 pkgs/applications/kde/akonadiconsole.nix      |   59 -
 pkgs/applications/kde/akregator.nix           |   70 -
 pkgs/applications/kde/alligator.nix           |   47 -
 pkgs/applications/kde/analitza.nix            |   39 -
 pkgs/applications/kde/angelfish.nix           |   80 -
 pkgs/applications/kde/arianna.nix             |   63 -
 pkgs/applications/kde/ark/default.nix         |   96 -
 pkgs/applications/kde/audiotube.nix           |   79 -
 pkgs/applications/kde/baloo-widgets.nix       |   36 -
 pkgs/applications/kde/bomber.nix              |   35 -
 pkgs/applications/kde/bovo.nix                |   33 -
 pkgs/applications/kde/calendarsupport.nix     |   55 -
 pkgs/applications/kde/calindori.nix           |   47 -
 pkgs/applications/kde/cantor.nix              |  131 --
 pkgs/applications/kde/colord-kde.nix          |   56 -
 pkgs/applications/kde/default.nix             |  284 ---
 pkgs/applications/kde/dolphin-plugins.nix     |   32 -
 pkgs/applications/kde/dolphin.nix             |   82 -
 pkgs/applications/kde/dragon.nix              |   74 -
 pkgs/applications/kde/elisa.nix               |   56 -
 pkgs/applications/kde/eventviews.nix          |   49 -
 pkgs/applications/kde/falkon.nix              |   64 -
 pkgs/applications/kde/fetch.sh                |    1 -
 pkgs/applications/kde/ffmpegthumbs.nix        |   25 -
 pkgs/applications/kde/filelight.nix           |   45 -
 pkgs/applications/kde/ghostwriter.nix         |   56 -
 pkgs/applications/kde/granatier.nix           |   28 -
 .../kde/grantleetheme/default.nix             |   59 -
 pkgs/applications/kde/gwenview/default.nix    |   77 -
 .../kde/gwenview/kimageannotator.patch        |   56 -
 pkgs/applications/kde/incidenceeditor.nix     |   51 -
 pkgs/applications/kde/juk.nix                 |   39 -
 .../kde/kaccounts-integration.nix             |   35 -
 pkgs/applications/kde/kaccounts-providers.nix |   45 -
 pkgs/applications/kde/kaddressbook.nix        |   74 -
 pkgs/applications/kde/kalarm.nix              |  103 -
 pkgs/applications/kde/kalgebra.nix            |   50 -
 pkgs/applications/kde/kalk.nix                |   52 -
 pkgs/applications/kde/kalzium.nix             |   39 -
 pkgs/applications/kde/kamoso.nix              |   60 -
 pkgs/applications/kde/kapman.nix              |   30 -
 pkgs/applications/kde/kapptemplate.nix        |   31 -
 pkgs/applications/kde/kasts.nix               |   83 -
 pkgs/applications/kde/kate.nix                |   87 -
 pkgs/applications/kde/katomic.nix             |   32 -
 pkgs/applications/kde/kblackbox.nix           |   30 -
 pkgs/applications/kde/kblocks.nix             |   30 -
 pkgs/applications/kde/kbounce.nix             |   32 -
 pkgs/applications/kde/kbreakout.nix           |   41 -
 pkgs/applications/kde/kcachegrind.nix         |   45 -
 pkgs/applications/kde/kcalc.nix               |   42 -
 pkgs/applications/kde/kcalutils.nix           |   47 -
 pkgs/applications/kde/kcharselect.nix         |   40 -
 pkgs/applications/kde/kclock.nix              |   47 -
 pkgs/applications/kde/kcolorchooser.nix       |   25 -
 pkgs/applications/kde/kde-inotify-survey.nix  |   32 -
 pkgs/applications/kde/kdebugsettings.nix      |   42 -
 pkgs/applications/kde/kdeconnect-kde.nix      |   87 -
 .../kde/kdegraphics-mobipocket.nix            |   20 -
 .../kde/kdegraphics-thumbnailers/default.nix  |   36 -
 .../kdegraphics-thumbnailers/gs-paths.patch   |   22 -
 .../kde/kdenetwork-filesharing.nix            |   37 -
 pkgs/applications/kde/kdenlive/default.nix    |  124 --
 .../kde/kdenlive/dependency-paths.patch       |   52 -
 pkgs/applications/kde/kdepim-addons.nix       |   78 -
 .../kde/kdepim-runtime/default.nix            |   88 -
 pkgs/applications/kde/kdevelop/kdev-php.nix   |   35 -
 .../applications/kde/kdevelop/kdev-python.nix |   38 -
 .../kde/kdevelop/kdevelop-pg-qt.nix           |   42 -
 pkgs/applications/kde/kdevelop/kdevelop.nix   |  145 --
 pkgs/applications/kde/kdevelop/wrapper.nix    |   12 -
 pkgs/applications/kde/kdf.nix                 |   32 -
 pkgs/applications/kde/kdialog.nix             |   34 -
 pkgs/applications/kde/kdiamond.nix            |   34 -
 pkgs/applications/kde/keditbookmarks.nix      |   33 -
 pkgs/applications/kde/keysmith.nix            |   43 -
 pkgs/applications/kde/kfind.nix               |   35 -
 pkgs/applications/kde/kgeography.nix          |   35 -
 pkgs/applications/kde/kget.nix                |   54 -
 pkgs/applications/kde/kgpg.nix                |   66 -
 pkgs/applications/kde/khelpcenter.nix         |   49 -
 pkgs/applications/kde/kidentitymanagement.nix |   51 -
 pkgs/applications/kde/kig.nix                 |   38 -
 pkgs/applications/kde/kigo.nix                |   32 -
 pkgs/applications/kde/killbots.nix            |   30 -
 pkgs/applications/kde/kimap.nix               |   47 -
 pkgs/applications/kde/kio-admin.nix           |   29 -
 pkgs/applications/kde/kio-extras.nix          |   92 -
 pkgs/applications/kde/kio-gdrive.nix          |   37 -
 pkgs/applications/kde/kipi-plugins.nix        |   44 -
 pkgs/applications/kde/kirigami-gallery.nix    |   34 -
 pkgs/applications/kde/kitinerary.nix          |   42 -
 pkgs/applications/kde/kldap.nix               |   49 -
 pkgs/applications/kde/kleopatra.nix           |   56 -
 pkgs/applications/kde/klettres.nix            |   32 -
 pkgs/applications/kde/klines.nix              |   30 -
 pkgs/applications/kde/kmag.nix                |   28 -
 pkgs/applications/kde/kmahjongg.nix           |   31 -
 .../applications/kde/kmail-account-wizard.nix |   63 -
 pkgs/applications/kde/kmail.nix               |  138 --
 pkgs/applications/kde/kmailtransport.nix      |   63 -
 pkgs/applications/kde/kmbox.nix               |   39 -
 pkgs/applications/kde/kmime.nix               |   31 -
 pkgs/applications/kde/kmines.nix              |   34 -
 pkgs/applications/kde/kmix.nix                |   41 -
 pkgs/applications/kde/kmousetool.nix          |   42 -
 pkgs/applications/kde/kmplot.nix              |   38 -
 pkgs/applications/kde/knavalbattle.nix        |   32 -
 pkgs/applications/kde/knetwalk.nix            |   30 -
 pkgs/applications/kde/knights.nix             |   34 -
 pkgs/applications/kde/knotes.nix              |   85 -
 pkgs/applications/kde/koko.nix                |   86 -
 pkgs/applications/kde/kolf.nix                |   29 -
 pkgs/applications/kde/kollision.nix           |   30 -
 pkgs/applications/kde/kolourpaint.nix         |   34 -
 pkgs/applications/kde/kompare.nix             |   36 -
 pkgs/applications/kde/kongress.nix            |   37 -
 pkgs/applications/kde/konqueror.nix           |   47 -
 pkgs/applications/kde/konquest.nix            |   41 -
 pkgs/applications/kde/konsole.nix             |   76 -
 pkgs/applications/kde/kontact.nix             |   66 -
 pkgs/applications/kde/kontactinterface.nix    |   39 -
 pkgs/applications/kde/konversation.nix        |   74 -
 pkgs/applications/kde/kopeninghours.nix       |   36 -
 pkgs/applications/kde/korganizer.nix          |   70 -
 pkgs/applications/kde/kosmindoormap.nix       |   42 -
 pkgs/applications/kde/kpat.nix                |   32 -
 pkgs/applications/kde/kpimtextedit.nix        |   59 -
 pkgs/applications/kde/kpkpass.nix             |   28 -
 pkgs/applications/kde/kpmcore/default.nix     |   53 -
 .../kde/kpmcore/nixostrustedprefix.patch      |   13 -
 pkgs/applications/kde/kpublictransport.nix    |   23 -
 pkgs/applications/kde/kqtquickcharts.nix      |   24 -
 pkgs/applications/kde/krdc.nix                |   55 -
 pkgs/applications/kde/krecorder.nix           |   44 -
 pkgs/applications/kde/kreversi.nix            |   26 -
 pkgs/applications/kde/krfb.nix                |   65 -
 pkgs/applications/kde/kruler.nix              |   31 -
 pkgs/applications/kde/ksanecore.nix           |   22 -
 pkgs/applications/kde/kshisen.nix             |   32 -
 pkgs/applications/kde/ksmtp/default.nix       |   37 -
 pkgs/applications/kde/kspaceduel.nix          |   41 -
 pkgs/applications/kde/ksquares.nix            |   32 -
 pkgs/applications/kde/ksudoku.nix             |   29 -
 pkgs/applications/kde/ksystemlog.nix          |   33 -
 pkgs/applications/kde/kteatime.nix            |   34 -
 pkgs/applications/kde/ktimer.nix              |   28 -
 pkgs/applications/kde/ktnef.nix               |   39 -
 pkgs/applications/kde/ktorrent.nix            |   47 -
 pkgs/applications/kde/ktrip.nix               |   49 -
 pkgs/applications/kde/kturtle.nix             |   30 -
 pkgs/applications/kde/kwalletmanager.nix      |   37 -
 pkgs/applications/kde/kwave.nix               |   61 -
 pkgs/applications/kde/kweather.nix            |   53 -
 pkgs/applications/kde/libgravatar.nix         |   43 -
 pkgs/applications/kde/libkcddb.nix            |   40 -
 pkgs/applications/kde/libkdcraw.nix           |   26 -
 pkgs/applications/kde/libkdegames.nix         |   34 -
 pkgs/applications/kde/libkdepim.nix           |   59 -
 pkgs/applications/kde/libkexiv2.nix           |   26 -
 pkgs/applications/kde/libkgapi.nix            |   35 -
 pkgs/applications/kde/libkipi.nix             |   32 -
 pkgs/applications/kde/libkleo.nix             |   55 -
 pkgs/applications/kde/libkmahjongg.nix        |   36 -
 pkgs/applications/kde/libkomparediff2.nix     |   19 -
 pkgs/applications/kde/libksane.nix            |   32 -
 pkgs/applications/kde/libksieve.nix           |   57 -
 pkgs/applications/kde/libktorrent.nix         |   43 -
 pkgs/applications/kde/mailcommon.nix          |   69 -
 pkgs/applications/kde/mailimporter.nix        |   51 -
 pkgs/applications/kde/marble.nix              |   53 -
 pkgs/applications/kde/mbox-importer.nix       |   41 -
 pkgs/applications/kde/merkuro.nix             |  114 -
 pkgs/applications/kde/messagelib.nix          |   92 -
 pkgs/applications/kde/minuet.nix              |   53 -
 pkgs/applications/kde/okular.nix              |  113 -
 pkgs/applications/kde/palapeli.nix            |   31 -
 .../kde/partitionmanager/default.nix          |  116 -
 pkgs/applications/kde/picmi.nix               |   33 -
 pkgs/applications/kde/pim-data-exporter.nix   |   75 -
 pkgs/applications/kde/pim-sieve-editor.nix    |   49 -
 pkgs/applications/kde/pimcommon.nix           |   85 -
 pkgs/applications/kde/plasmatube/default.nix  |   60 -
 pkgs/applications/kde/print-manager.nix       |   53 -
 pkgs/applications/kde/qmlkonsole.nix          |   48 -
 pkgs/applications/kde/rocs.nix                |   54 -
 pkgs/applications/kde/skanlite.nix            |   30 -
 pkgs/applications/kde/skanpage.nix            |   34 -
 pkgs/applications/kde/spectacle.nix           |   92 -
 pkgs/applications/kde/srcs.nix                | 1942 -----------------
 pkgs/applications/kde/telly-skout.nix         |   32 -
 pkgs/applications/kde/tokodon.nix             |   63 -
 pkgs/applications/kde/umbrello.nix            |   31 -
 pkgs/applications/kde/yakuake.nix             |   70 -
 pkgs/applications/kde/zanshin.nix             |   27 -
 pkgs/top-level/qt5-packages.nix               |   15 -
 207 files changed, 12340 deletions(-)
 delete mode 100644 pkgs/applications/kde/akonadi-calendar-tools.nix
 delete mode 100644 pkgs/applications/kde/akonadi-calendar.nix
 delete mode 100644 pkgs/applications/kde/akonadi-contacts.nix
 delete mode 100644 pkgs/applications/kde/akonadi-import-wizard.nix
 delete mode 100644 pkgs/applications/kde/akonadi-mime.nix
 delete mode 100644 pkgs/applications/kde/akonadi-notes.nix
 delete mode 100644 pkgs/applications/kde/akonadi-search.nix
 delete mode 100644 pkgs/applications/kde/akonadi/0001-akonadi-paths.patch
 delete mode 100644 pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch
 delete mode 100644 pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
 delete mode 100644 pkgs/applications/kde/akonadi/default.nix
 delete mode 100644 pkgs/applications/kde/akonadiconsole.nix
 delete mode 100644 pkgs/applications/kde/akregator.nix
 delete mode 100644 pkgs/applications/kde/alligator.nix
 delete mode 100644 pkgs/applications/kde/analitza.nix
 delete mode 100644 pkgs/applications/kde/angelfish.nix
 delete mode 100644 pkgs/applications/kde/arianna.nix
 delete mode 100644 pkgs/applications/kde/ark/default.nix
 delete mode 100644 pkgs/applications/kde/audiotube.nix
 delete mode 100644 pkgs/applications/kde/baloo-widgets.nix
 delete mode 100644 pkgs/applications/kde/bomber.nix
 delete mode 100644 pkgs/applications/kde/bovo.nix
 delete mode 100644 pkgs/applications/kde/calendarsupport.nix
 delete mode 100644 pkgs/applications/kde/calindori.nix
 delete mode 100644 pkgs/applications/kde/cantor.nix
 delete mode 100644 pkgs/applications/kde/colord-kde.nix
 delete mode 100644 pkgs/applications/kde/default.nix
 delete mode 100644 pkgs/applications/kde/dolphin-plugins.nix
 delete mode 100644 pkgs/applications/kde/dolphin.nix
 delete mode 100644 pkgs/applications/kde/dragon.nix
 delete mode 100644 pkgs/applications/kde/elisa.nix
 delete mode 100644 pkgs/applications/kde/eventviews.nix
 delete mode 100644 pkgs/applications/kde/falkon.nix
 delete mode 100644 pkgs/applications/kde/fetch.sh
 delete mode 100644 pkgs/applications/kde/ffmpegthumbs.nix
 delete mode 100644 pkgs/applications/kde/filelight.nix
 delete mode 100644 pkgs/applications/kde/ghostwriter.nix
 delete mode 100644 pkgs/applications/kde/granatier.nix
 delete mode 100644 pkgs/applications/kde/grantleetheme/default.nix
 delete mode 100644 pkgs/applications/kde/gwenview/default.nix
 delete mode 100644 pkgs/applications/kde/gwenview/kimageannotator.patch
 delete mode 100644 pkgs/applications/kde/incidenceeditor.nix
 delete mode 100644 pkgs/applications/kde/juk.nix
 delete mode 100644 pkgs/applications/kde/kaccounts-integration.nix
 delete mode 100644 pkgs/applications/kde/kaccounts-providers.nix
 delete mode 100644 pkgs/applications/kde/kaddressbook.nix
 delete mode 100644 pkgs/applications/kde/kalarm.nix
 delete mode 100644 pkgs/applications/kde/kalgebra.nix
 delete mode 100644 pkgs/applications/kde/kalk.nix
 delete mode 100644 pkgs/applications/kde/kalzium.nix
 delete mode 100644 pkgs/applications/kde/kamoso.nix
 delete mode 100644 pkgs/applications/kde/kapman.nix
 delete mode 100644 pkgs/applications/kde/kapptemplate.nix
 delete mode 100644 pkgs/applications/kde/kasts.nix
 delete mode 100644 pkgs/applications/kde/kate.nix
 delete mode 100644 pkgs/applications/kde/katomic.nix
 delete mode 100644 pkgs/applications/kde/kblackbox.nix
 delete mode 100644 pkgs/applications/kde/kblocks.nix
 delete mode 100644 pkgs/applications/kde/kbounce.nix
 delete mode 100644 pkgs/applications/kde/kbreakout.nix
 delete mode 100644 pkgs/applications/kde/kcachegrind.nix
 delete mode 100644 pkgs/applications/kde/kcalc.nix
 delete mode 100644 pkgs/applications/kde/kcalutils.nix
 delete mode 100644 pkgs/applications/kde/kcharselect.nix
 delete mode 100644 pkgs/applications/kde/kclock.nix
 delete mode 100644 pkgs/applications/kde/kcolorchooser.nix
 delete mode 100644 pkgs/applications/kde/kde-inotify-survey.nix
 delete mode 100644 pkgs/applications/kde/kdebugsettings.nix
 delete mode 100644 pkgs/applications/kde/kdeconnect-kde.nix
 delete mode 100644 pkgs/applications/kde/kdegraphics-mobipocket.nix
 delete mode 100644 pkgs/applications/kde/kdegraphics-thumbnailers/default.nix
 delete mode 100644 pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch
 delete mode 100644 pkgs/applications/kde/kdenetwork-filesharing.nix
 delete mode 100644 pkgs/applications/kde/kdenlive/default.nix
 delete mode 100644 pkgs/applications/kde/kdenlive/dependency-paths.patch
 delete mode 100644 pkgs/applications/kde/kdepim-addons.nix
 delete mode 100644 pkgs/applications/kde/kdepim-runtime/default.nix
 delete mode 100644 pkgs/applications/kde/kdevelop/kdev-php.nix
 delete mode 100644 pkgs/applications/kde/kdevelop/kdev-python.nix
 delete mode 100644 pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix
 delete mode 100644 pkgs/applications/kde/kdevelop/kdevelop.nix
 delete mode 100644 pkgs/applications/kde/kdevelop/wrapper.nix
 delete mode 100644 pkgs/applications/kde/kdf.nix
 delete mode 100644 pkgs/applications/kde/kdialog.nix
 delete mode 100644 pkgs/applications/kde/kdiamond.nix
 delete mode 100644 pkgs/applications/kde/keditbookmarks.nix
 delete mode 100644 pkgs/applications/kde/keysmith.nix
 delete mode 100644 pkgs/applications/kde/kfind.nix
 delete mode 100644 pkgs/applications/kde/kgeography.nix
 delete mode 100644 pkgs/applications/kde/kget.nix
 delete mode 100644 pkgs/applications/kde/kgpg.nix
 delete mode 100644 pkgs/applications/kde/khelpcenter.nix
 delete mode 100644 pkgs/applications/kde/kidentitymanagement.nix
 delete mode 100644 pkgs/applications/kde/kig.nix
 delete mode 100644 pkgs/applications/kde/kigo.nix
 delete mode 100644 pkgs/applications/kde/killbots.nix
 delete mode 100644 pkgs/applications/kde/kimap.nix
 delete mode 100644 pkgs/applications/kde/kio-admin.nix
 delete mode 100644 pkgs/applications/kde/kio-extras.nix
 delete mode 100644 pkgs/applications/kde/kio-gdrive.nix
 delete mode 100644 pkgs/applications/kde/kipi-plugins.nix
 delete mode 100644 pkgs/applications/kde/kirigami-gallery.nix
 delete mode 100644 pkgs/applications/kde/kitinerary.nix
 delete mode 100644 pkgs/applications/kde/kldap.nix
 delete mode 100644 pkgs/applications/kde/kleopatra.nix
 delete mode 100644 pkgs/applications/kde/klettres.nix
 delete mode 100644 pkgs/applications/kde/klines.nix
 delete mode 100644 pkgs/applications/kde/kmag.nix
 delete mode 100644 pkgs/applications/kde/kmahjongg.nix
 delete mode 100644 pkgs/applications/kde/kmail-account-wizard.nix
 delete mode 100644 pkgs/applications/kde/kmail.nix
 delete mode 100644 pkgs/applications/kde/kmailtransport.nix
 delete mode 100644 pkgs/applications/kde/kmbox.nix
 delete mode 100644 pkgs/applications/kde/kmime.nix
 delete mode 100644 pkgs/applications/kde/kmines.nix
 delete mode 100644 pkgs/applications/kde/kmix.nix
 delete mode 100644 pkgs/applications/kde/kmousetool.nix
 delete mode 100644 pkgs/applications/kde/kmplot.nix
 delete mode 100644 pkgs/applications/kde/knavalbattle.nix
 delete mode 100644 pkgs/applications/kde/knetwalk.nix
 delete mode 100644 pkgs/applications/kde/knights.nix
 delete mode 100644 pkgs/applications/kde/knotes.nix
 delete mode 100644 pkgs/applications/kde/koko.nix
 delete mode 100644 pkgs/applications/kde/kolf.nix
 delete mode 100644 pkgs/applications/kde/kollision.nix
 delete mode 100644 pkgs/applications/kde/kolourpaint.nix
 delete mode 100644 pkgs/applications/kde/kompare.nix
 delete mode 100644 pkgs/applications/kde/kongress.nix
 delete mode 100644 pkgs/applications/kde/konqueror.nix
 delete mode 100644 pkgs/applications/kde/konquest.nix
 delete mode 100644 pkgs/applications/kde/konsole.nix
 delete mode 100644 pkgs/applications/kde/kontact.nix
 delete mode 100644 pkgs/applications/kde/kontactinterface.nix
 delete mode 100644 pkgs/applications/kde/konversation.nix
 delete mode 100644 pkgs/applications/kde/kopeninghours.nix
 delete mode 100644 pkgs/applications/kde/korganizer.nix
 delete mode 100644 pkgs/applications/kde/kosmindoormap.nix
 delete mode 100644 pkgs/applications/kde/kpat.nix
 delete mode 100644 pkgs/applications/kde/kpimtextedit.nix
 delete mode 100644 pkgs/applications/kde/kpkpass.nix
 delete mode 100644 pkgs/applications/kde/kpmcore/default.nix
 delete mode 100644 pkgs/applications/kde/kpmcore/nixostrustedprefix.patch
 delete mode 100644 pkgs/applications/kde/kpublictransport.nix
 delete mode 100644 pkgs/applications/kde/kqtquickcharts.nix
 delete mode 100644 pkgs/applications/kde/krdc.nix
 delete mode 100644 pkgs/applications/kde/krecorder.nix
 delete mode 100644 pkgs/applications/kde/kreversi.nix
 delete mode 100644 pkgs/applications/kde/krfb.nix
 delete mode 100644 pkgs/applications/kde/kruler.nix
 delete mode 100644 pkgs/applications/kde/ksanecore.nix
 delete mode 100644 pkgs/applications/kde/kshisen.nix
 delete mode 100644 pkgs/applications/kde/ksmtp/default.nix
 delete mode 100644 pkgs/applications/kde/kspaceduel.nix
 delete mode 100644 pkgs/applications/kde/ksquares.nix
 delete mode 100644 pkgs/applications/kde/ksudoku.nix
 delete mode 100644 pkgs/applications/kde/ksystemlog.nix
 delete mode 100644 pkgs/applications/kde/kteatime.nix
 delete mode 100644 pkgs/applications/kde/ktimer.nix
 delete mode 100644 pkgs/applications/kde/ktnef.nix
 delete mode 100644 pkgs/applications/kde/ktorrent.nix
 delete mode 100644 pkgs/applications/kde/ktrip.nix
 delete mode 100644 pkgs/applications/kde/kturtle.nix
 delete mode 100644 pkgs/applications/kde/kwalletmanager.nix
 delete mode 100644 pkgs/applications/kde/kwave.nix
 delete mode 100644 pkgs/applications/kde/kweather.nix
 delete mode 100644 pkgs/applications/kde/libgravatar.nix
 delete mode 100644 pkgs/applications/kde/libkcddb.nix
 delete mode 100644 pkgs/applications/kde/libkdcraw.nix
 delete mode 100644 pkgs/applications/kde/libkdegames.nix
 delete mode 100644 pkgs/applications/kde/libkdepim.nix
 delete mode 100644 pkgs/applications/kde/libkexiv2.nix
 delete mode 100644 pkgs/applications/kde/libkgapi.nix
 delete mode 100644 pkgs/applications/kde/libkipi.nix
 delete mode 100644 pkgs/applications/kde/libkleo.nix
 delete mode 100644 pkgs/applications/kde/libkmahjongg.nix
 delete mode 100644 pkgs/applications/kde/libkomparediff2.nix
 delete mode 100644 pkgs/applications/kde/libksane.nix
 delete mode 100644 pkgs/applications/kde/libksieve.nix
 delete mode 100644 pkgs/applications/kde/libktorrent.nix
 delete mode 100644 pkgs/applications/kde/mailcommon.nix
 delete mode 100644 pkgs/applications/kde/mailimporter.nix
 delete mode 100644 pkgs/applications/kde/marble.nix
 delete mode 100644 pkgs/applications/kde/mbox-importer.nix
 delete mode 100644 pkgs/applications/kde/merkuro.nix
 delete mode 100644 pkgs/applications/kde/messagelib.nix
 delete mode 100644 pkgs/applications/kde/minuet.nix
 delete mode 100644 pkgs/applications/kde/okular.nix
 delete mode 100644 pkgs/applications/kde/palapeli.nix
 delete mode 100644 pkgs/applications/kde/partitionmanager/default.nix
 delete mode 100644 pkgs/applications/kde/picmi.nix
 delete mode 100644 pkgs/applications/kde/pim-data-exporter.nix
 delete mode 100644 pkgs/applications/kde/pim-sieve-editor.nix
 delete mode 100644 pkgs/applications/kde/pimcommon.nix
 delete mode 100644 pkgs/applications/kde/plasmatube/default.nix
 delete mode 100644 pkgs/applications/kde/print-manager.nix
 delete mode 100644 pkgs/applications/kde/qmlkonsole.nix
 delete mode 100644 pkgs/applications/kde/rocs.nix
 delete mode 100644 pkgs/applications/kde/skanlite.nix
 delete mode 100644 pkgs/applications/kde/skanpage.nix
 delete mode 100644 pkgs/applications/kde/spectacle.nix
 delete mode 100644 pkgs/applications/kde/srcs.nix
 delete mode 100644 pkgs/applications/kde/telly-skout.nix
 delete mode 100644 pkgs/applications/kde/tokodon.nix
 delete mode 100644 pkgs/applications/kde/umbrello.nix
 delete mode 100644 pkgs/applications/kde/yakuake.nix
 delete mode 100644 pkgs/applications/kde/zanshin.nix

diff --git a/pkgs/applications/kde/akonadi-calendar-tools.nix b/pkgs/applications/kde/akonadi-calendar-tools.nix
deleted file mode 100644
index 204fe6f46a0a..000000000000
--- a/pkgs/applications/kde/akonadi-calendar-tools.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  calendarsupport,
-}:
-
-mkDerivation {
-  pname = "akonadi-calendar-tools";
-  meta = {
-    homepage = "https://github.com/KDE/akonadi-calendar-tools";
-    description = "Console applications and utilities for managing calendars in Akonadi";
-    license = with lib.licenses; [
-      gpl2Plus
-      cc0
-    ];
-    maintainers = with lib.maintainers; [ kennyballou ];
-    platforms = lib.platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    akonadi
-    calendarsupport
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/pkgs/applications/kde/akonadi-calendar.nix
deleted file mode 100644
index 6b4a248d88dd..000000000000
--- a/pkgs/applications/kde/akonadi-calendar.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  akonadi-contacts,
-  kcalendarcore,
-  kcalutils,
-  kcontacts,
-  kidentitymanagement,
-  kio,
-  kmailtransport,
-  messagelib,
-}:
-
-mkDerivation {
-  pname = "akonadi-calendar";
-  meta = {
-    license = with lib.licenses; [
-      gpl2
-      lgpl21
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    akonadi
-    akonadi-contacts
-    kcalendarcore
-    kcalutils
-    kcontacts
-    kidentitymanagement
-    kio
-    kmailtransport
-    messagelib
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix
deleted file mode 100644
index d00fe2e8f56b..000000000000
--- a/pkgs/applications/kde/akonadi-contacts.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  qtwebengine,
-  grantlee,
-  grantleetheme,
-  kcmutils,
-  kdbusaddons,
-  ki18n,
-  kiconthemes,
-  kio,
-  kitemmodels,
-  ktextwidgets,
-  prison,
-  akonadi,
-  akonadi-mime,
-  kcontacts,
-  kmime,
-  libkleo,
-}:
-
-mkDerivation {
-  pname = "akonadi-contacts";
-  meta = {
-    license = with lib.licenses; [
-      gpl2
-      lgpl21
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    qtwebengine
-    grantlee
-    kcmutils
-    kdbusaddons
-    ki18n
-    kiconthemes
-    kio
-    kitemmodels
-    ktextwidgets
-    prison
-    akonadi-mime
-    kcontacts
-    kmime
-    libkleo
-  ];
-  propagatedBuildInputs = [
-    akonadi
-    grantleetheme
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/akonadi-import-wizard.nix b/pkgs/applications/kde/akonadi-import-wizard.nix
deleted file mode 100644
index fcdab9b52858..000000000000
--- a/pkgs/applications/kde/akonadi-import-wizard.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  karchive,
-  kcontacts,
-  kcrash,
-  kidentitymanagement,
-  kio,
-  kmailtransport,
-  kwallet,
-  mailcommon,
-  mailimporter,
-  messagelib,
-  qtkeychain,
-  libsecret,
-}:
-
-mkDerivation {
-  pname = "akonadi-import-wizard";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi
-    karchive
-    kcontacts
-    kcrash
-    kidentitymanagement
-    kio
-    kmailtransport
-    kwallet
-    mailcommon
-    mailimporter
-    messagelib
-    qtkeychain
-    libsecret
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
deleted file mode 100644
index fb5385743493..000000000000
--- a/pkgs/applications/kde/akonadi-mime.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  shared-mime-info,
-  akonadi,
-  kdbusaddons,
-  ki18n,
-  kio,
-  kitemmodels,
-  kmime,
-}:
-
-mkDerivation {
-  pname = "akonadi-mime";
-  meta = {
-    license = with lib.licenses; [
-      gpl2
-      lgpl21
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    shared-mime-info
-  ];
-  buildInputs = [
-    akonadi
-    kdbusaddons
-    ki18n
-    kio
-    kitemmodels
-    kmime
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/akonadi-notes.nix b/pkgs/applications/kde/akonadi-notes.nix
deleted file mode 100644
index f40d588ff687..000000000000
--- a/pkgs/applications/kde/akonadi-notes.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  kcompletion,
-  ki18n,
-  kitemmodels,
-  kmime,
-  kxmlgui,
-}:
-
-mkDerivation {
-  pname = "akonadi-notes";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi
-    kcompletion
-    ki18n
-    kitemmodels
-    kmime
-    kxmlgui
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/akonadi-search.nix b/pkgs/applications/kde/akonadi-search.nix
deleted file mode 100644
index 5050d2ae3ddc..000000000000
--- a/pkgs/applications/kde/akonadi-search.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  akonadi-mime,
-  kcalendarcore,
-  kcmutils,
-  kcontacts,
-  kcoreaddons,
-  kmime,
-  krunner,
-  qtbase,
-  xapian,
-}:
-
-mkDerivation {
-  pname = "akonadi-search";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcmutils
-    krunner
-    xapian
-  ];
-  propagatedBuildInputs = [
-    akonadi
-    akonadi-mime
-    kcalendarcore
-    kcontacts
-    kcoreaddons
-    kmime
-    qtbase
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch b/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch
deleted file mode 100644
index d5e4fe1ee728..000000000000
--- a/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From ca8ff6e6d527ee968300cce5e8cd148f6a4d256b Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Sun, 25 Apr 2021 08:00:10 -0500
-Subject: [PATCH 1/3] akonadi paths
-
----
- src/akonadicontrol/agentmanager.cpp         |  4 ++--
- src/akonadicontrol/agentprocessinstance.cpp |  2 +-
- src/server/storage/dbconfigmysql.cpp        | 26 ++++-----------------
- src/server/storage/dbconfigpostgresql.cpp   | 19 +++------------
- 4 files changed, 11 insertions(+), 40 deletions(-)
-
-diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
-index 44ceec5..eb5fa50 100644
---- a/src/akonadicontrol/agentmanager.cpp
-+++ b/src/akonadicontrol/agentmanager.cpp
-@@ -47,7 +47,7 @@ public:
-         connect(this, &Akonadi::ProcessControl::unableToStart, this, []() {
-             QCoreApplication::instance()->exit(255);
-         });
--        start(QStringLiteral("akonadiserver"), args, RestartOnCrash);
-+        start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash);
-     }
-
-     ~StorageProcessControl() override
-@@ -69,7 +69,7 @@ public:
-         connect(this, &Akonadi::ProcessControl::unableToStart, this, []() {
-             qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
-         });
--        start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash);
-+        start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash);
-     }
-
-     ~AgentServerProcessControl() override
-diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
-index 8e92e08..f98dfd8 100644
---- a/src/akonadicontrol/agentprocessinstance.cpp
-+++ b/src/akonadicontrol/agentprocessinstance.cpp
-@@ -47,7 +47,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
-     } else {
-         Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
-         const QStringList arguments = QStringList() << executable << identifier();
--        const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher"));
-+        const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher");
-         mController->start(agentLauncherExec, arguments);
-     }
-     return true;
-diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index 1a437ac..3550f9d 100644
---- a/src/server/storage/dbconfigmysql.cpp
-+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -72,7 +72,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
-     // determine default settings depending on the driver
-     QString defaultHostName;
-     QString defaultOptions;
--    QString defaultServerPath;
-     QString defaultCleanShutdownCommand;
-
- #ifndef Q_OS_WIN
-@@ -80,16 +79,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
- #endif
-
-     const bool defaultInternalServer = true;
--#ifdef MYSQLD_EXECUTABLE
--    if (QFile::exists(QStringLiteral(MYSQLD_EXECUTABLE))) {
--        defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE);
--    }
--#endif
--    if (defaultServerPath.isEmpty()) {
--        defaultServerPath = findExecutable(QStringLiteral("mysqld"));
--    }
--
--    const QString mysqladminPath = findExecutable(QStringLiteral("mysqladmin"));
-+    const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN);
-     if (!mysqladminPath.isEmpty()) {
- #ifndef Q_OS_WIN
-         defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown")
-@@ -99,10 +89,10 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
- #endif
-     }
-
--    mMysqlInstallDbPath = findExecutable(QStringLiteral("mysql_install_db"));
-+    mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
-     qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath;
-
--    mMysqlCheckPath = findExecutable(QStringLiteral("mysqlcheck"));
-+    mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK);
-     qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
-
-     mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
-@@ -119,7 +109,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
-     mUserName = settings.value(QStringLiteral("User")).toString();
-     mPassword = settings.value(QStringLiteral("Password")).toString();
-     mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
--    mMysqldPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString();
-+    mMysqldPath = QLatin1String(NIXPKGS_MYSQL_MYSQLD);
-     mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
-     settings.endGroup();
-
-@@ -129,9 +119,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
-         // intentionally not namespaced as we are the only one in this db instance when using internal mode
-         mDatabaseName = QStringLiteral("akonadi");
-     }
--    if (mInternalServer && (mMysqldPath.isEmpty() || !QFile::exists(mMysqldPath))) {
--        mMysqldPath = defaultServerPath;
--    }
-
-     qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
-
-@@ -141,9 +128,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
-         settings.setValue(QStringLiteral("Name"), mDatabaseName);
-         settings.setValue(QStringLiteral("Host"), mHostName);
-         settings.setValue(QStringLiteral("Options"), mConnectionOptions);
--        if (!mMysqldPath.isEmpty()) {
--            settings.setValue(QStringLiteral("ServerPath"), mMysqldPath);
--        }
-         settings.setValue(QStringLiteral("StartServer"), mInternalServer);
-         settings.endGroup();
-         settings.sync();
-@@ -215,7 +199,7 @@ bool DbConfigMysql::startInternalServer()
- #endif
-
-     // generate config file
--    const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf"));
-+    const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
-     const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
-     const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
-     if (globalConfig.isEmpty()) {
-diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
-index 4df61da..e3469c4 100644
---- a/src/server/storage/dbconfigpostgresql.cpp
-+++ b/src/server/storage/dbconfigpostgresql.cpp
-@@ -125,9 +125,7 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
-     // determine default settings depending on the driver
-     QString defaultHostName;
-     QString defaultOptions;
--    QString defaultServerPath;
-     QString defaultInitDbPath;
--    QString defaultPgUpgradePath;
-     QString defaultPgData;
-
- #ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows
-@@ -138,12 +136,8 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
-
-     mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
-     if (mInternalServer) {
--        const auto paths = postgresSearchPaths(QStringLiteral("/usr/lib/postgresql"));
--
--        defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), paths);
--        defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), paths);
-+        defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB);
-         defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
--        defaultPgUpgradePath = QStandardPaths::findExecutable(QStringLiteral("pg_upgrade"), paths);
-         defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
-     }
-
-@@ -162,20 +156,14 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
-     mUserName = settings.value(QStringLiteral("User")).toString();
-     mPassword = settings.value(QStringLiteral("Password")).toString();
-     mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
--    mServerPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString();
--    if (mInternalServer && mServerPath.isEmpty()) {
--        mServerPath = defaultServerPath;
--    }
-+    mServerPath = QLatin1String(NIXPKGS_POSTGRES_PG_CTL);
-     qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
-     mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
-     if (mInternalServer && mInitDbPath.isEmpty()) {
-         mInitDbPath = defaultInitDbPath;
-     }
-     qCDebug(AKONADISERVER_LOG) << "Found initdb:" << mServerPath;
--    mPgUpgradePath = settings.value(QStringLiteral("UpgradePath"), defaultPgUpgradePath).toString();
--    if (mInternalServer && mPgUpgradePath.isEmpty()) {
--        mPgUpgradePath = defaultPgUpgradePath;
--    }
-+    mPgUpgradePath = QLatin1String(NIXPKGS_POSTGRES_PG_UPGRADE);
-     qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath;
-     mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString();
-     if (mPgData.isEmpty()) {
-@@ -192,7 +180,6 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
-             settings.setValue(QStringLiteral("Port"), mHostPort);
-         }
-         settings.setValue(QStringLiteral("Options"), mConnectionOptions);
--        settings.setValue(QStringLiteral("ServerPath"), mServerPath);
-         settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
-         settings.setValue(QStringLiteral("StartServer"), mInternalServer);
-         settings.endGroup();
---
-2.31.1
-
diff --git a/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch b/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch
deleted file mode 100644
index 1da52dbad0e1..000000000000
--- a/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f6c446cf6fab2edbd2606b4c6100903e9437362a Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Sun, 25 Apr 2021 08:01:02 -0500
-Subject: [PATCH 2/3] akonadi timestamps
-
----
- src/server/storage/dbconfigmysql.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index 3550f9d..e9e8887 100644
---- a/src/server/storage/dbconfigmysql.cpp
-+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -241,8 +241,7 @@ bool DbConfigMysql::startInternalServer()
-     bool confUpdate = false;
-     QFile actualFile(actualConfig);
-     // update conf only if either global (or local) is newer than actual
--    if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified())
--        || (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) {
-+    if (true) {
-         QFile globalFile(globalConfig);
-         QFile localFile(localConfig);
-         if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) {
--- 
-2.31.1
-
diff --git a/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch b/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
deleted file mode 100644
index 6d4d5a4b363b..000000000000
--- a/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4b90a0bd4411a66bbe6ecf85ce89a60a58bee969 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Sun, 25 Apr 2021 08:01:21 -0500
-Subject: [PATCH 3/3] akonadi revert make relocatable
-
----
- CMakeLists.txt            | 3 ---
- KPimAkonadiConfig.cmake.in | 6 +++---
- 2 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4e8cc81..63161b7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -368,9 +368,6 @@ configure_package_config_file(
-     "${CMAKE_CURRENT_SOURCE_DIR}/KPimAkonadiConfig.cmake.in"
-     "${CMAKE_CURRENT_BINARY_DIR}/KPimAkonadiConfig.cmake"
-     INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
--    PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
--              AKONADI_INCLUDE_DIR
--              KF5Akonadi_DATA_DIR
- )
- 
- install(FILES
-diff --git a/KPimAkonadiConfig.cmake.in b/KPimAkonadiConfig.cmake.in
-index bcf7320..1574319 100644
---- a/KPimAkonadiConfig.cmake.in
-+++ b/KPimAkonadiConfig.cmake.in
-@@ -1,10 +1,10 @@
- @PACKAGE_INIT@
- 
--set_and_check(AKONADI_DBUS_INTERFACES_DIR  "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
--set_and_check(AKONADI_INCLUDE_DIR          "@PACKAGE_AKONADI_INCLUDE_DIR@")
-+set_and_check(AKONADI_DBUS_INTERFACES_DIR  "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
-+set_and_check(AKONADI_INCLUDE_DIR          "@AKONADI_INCLUDE_DIR@")
- 
- # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
--set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
-+set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
- 
- # set the directories
- if(NOT AKONADI_INSTALL_DIR)
--- 
-2.31.1
-
diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
deleted file mode 100644
index fc3fd063720d..000000000000
--- a/pkgs/applications/kde/akonadi/default.nix
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  shared-mime-info,
-  accounts-qt,
-  boost,
-  kaccounts-integration,
-  kcompletion,
-  kconfigwidgets,
-  kcrash,
-  kdbusaddons,
-  kdesignerplugin,
-  ki18n,
-  kiconthemes,
-  kio,
-  kitemmodels,
-  kwindowsystem,
-  mariadb,
-  postgresql,
-  qttools,
-  signond,
-  xz,
-
-  mysqlSupport ? true,
-  postgresSupport ? false,
-  defaultDriver ? if mysqlSupport then "MYSQL" else "POSTGRES",
-}:
-
-assert mysqlSupport || postgresSupport;
-
-mkDerivation {
-  pname = "akonadi";
-  meta = {
-    license = [ lib.licenses.lgpl21 ];
-    maintainers = kdepimTeam;
-  };
-  patches = [
-    ./0001-akonadi-paths.patch
-    ./0002-akonadi-timestamps.patch
-    ./0003-akonadi-revert-make-relocatable.patch
-  ];
-  nativeBuildInputs = [
-    extra-cmake-modules
-    shared-mime-info
-  ];
-  buildInputs = [
-    kaccounts-integration
-    kcompletion
-    kconfigwidgets
-    kcrash
-    kdbusaddons
-    kdesignerplugin
-    ki18n
-    kiconthemes
-    kio
-    kwindowsystem
-    xz
-    accounts-qt
-    qttools
-    signond
-  ];
-  propagatedBuildInputs = [
-    boost
-    kitemmodels
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  CXXFLAGS = [
-    ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqld"}\"''
-    ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqladmin"}\"''
-    ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysql_install_db"}\"''
-    ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqlcheck"}\"''
-    ''-DNIXPKGS_POSTGRES_PG_CTL=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/pg_ctl"}\"''
-    ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/pg_upgrade"}\"''
-    ''-DNIXPKGS_POSTGRES_INITDB=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/initdb"}\"''
-    ''-DNIX_OUT=\"${placeholder "out"}\"''
-    ''-I${lib.getDev kio}/include/KF5'' # Fixes: kio_version.h: No such file or directory
-  ];
-
-  cmakeFlags = lib.optional (defaultDriver != "MYSQL") "-DDATABASE_BACKEND=${defaultDriver}";
-
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix
deleted file mode 100644
index da5f1ec023cd..000000000000
--- a/pkgs/applications/kde/akonadiconsole.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  akonadi-contacts,
-  calendarsupport,
-  kcalendarcore,
-  kcompletion,
-  kconfigwidgets,
-  kcontacts,
-  kdbusaddons,
-  kitemmodels,
-  kpimtextedit,
-  libkdepim,
-  ktextwidgets,
-  kxmlgui,
-  messagelib,
-  qtbase,
-  akonadi-search,
-  xapian,
-}:
-
-mkDerivation {
-  pname = "akonadiconsole";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi
-    akonadi-contacts
-    calendarsupport
-    kcalendarcore
-    kcompletion
-    kconfigwidgets
-    kcontacts
-    kdbusaddons
-    kitemmodels
-    kpimtextedit
-    ktextwidgets
-    kxmlgui
-    messagelib
-    qtbase
-    libkdepim
-    akonadi-search
-    xapian
-  ];
-}
diff --git a/pkgs/applications/kde/akregator.nix b/pkgs/applications/kde/akregator.nix
deleted file mode 100644
index 1d86d93a73b1..000000000000
--- a/pkgs/applications/kde/akregator.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  qtwebengine,
-  grantlee,
-  kcmutils,
-  kcrash,
-  kiconthemes,
-  knotifyconfig,
-  kparts,
-  ktexteditor,
-  kuserfeedback,
-  kwindowsystem,
-  akonadi,
-  akonadi-mime,
-  grantleetheme,
-  kontactinterface,
-  libkdepim,
-  libkleo,
-  messagelib,
-  syndication,
-}:
-
-mkDerivation {
-  pname = "akregator";
-  meta = {
-    homepage = "https://apps.kde.org/akregator/";
-    description = "KDE feed reader";
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    qtwebengine
-
-    grantlee
-
-    kcmutils
-    kcrash
-    kiconthemes
-    knotifyconfig
-    kparts
-    ktexteditor
-    kuserfeedback
-    kwindowsystem
-
-    akonadi
-    akonadi-mime
-    grantleetheme
-    kontactinterface
-    libkdepim
-    libkleo
-    messagelib
-    syndication
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/alligator.nix b/pkgs/applications/kde/alligator.nix
deleted file mode 100644
index 0a57cece717e..000000000000
--- a/pkgs/applications/kde/alligator.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-
-  kconfig,
-  kcoreaddons,
-  ki18n,
-  kirigami-addons,
-  kirigami2,
-  qtquickcontrols2,
-  syndication,
-}:
-
-mkDerivation {
-  pname = "alligator";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kconfig
-    kcoreaddons
-    ki18n
-    kirigami-addons
-    kirigami2
-    qtquickcontrols2
-    syndication
-  ];
-
-  meta = with lib; {
-    description = "RSS reader made with kirigami";
-    mainProgram = "alligator";
-    homepage = "https://invent.kde.org/plasma-mobile/alligator";
-    # https://invent.kde.org/plasma-mobile/alligator/-/commit/db30f159c4700244532b17a260deb95551045b7a
-    #  * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-    license = with licenses; [
-      gpl2Only
-      gpl3Only
-    ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/analitza.nix b/pkgs/applications/kde/analitza.nix
deleted file mode 100644
index 74d1b4f816f0..000000000000
--- a/pkgs/applications/kde/analitza.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  qtbase,
-  qtsvg,
-  eigen,
-  kdoctools,
-  qttools,
-}:
-
-mkDerivation {
-  pname = "analitza";
-
-  nativeBuildInputs = [
-    cmake
-    eigen
-    extra-cmake-modules
-    kdoctools
-    qttools
-  ];
-
-  buildInputs = [
-    qtbase
-    qtsvg
-  ];
-
-  meta = with lib; {
-    description = "Front end to powerful mathematics and statistics packages";
-    homepage = "https://cantor.kde.org/";
-    license = with licenses; [
-      gpl2Only
-      lgpl2Only
-      fdl12Only
-    ];
-    maintainers = with maintainers; [ hqurve ];
-  };
-}
diff --git a/pkgs/applications/kde/angelfish.nix b/pkgs/applications/kde/angelfish.nix
deleted file mode 100644
index 43f1241c66ad..000000000000
--- a/pkgs/applications/kde/angelfish.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cargo,
-  cmake,
-  corrosion,
-  extra-cmake-modules,
-  fetchpatch2,
-  futuresql,
-  kconfig,
-  kcoreaddons,
-  kdbusaddons,
-  ki18n,
-  kirigami-addons,
-  kirigami2,
-  knotifications,
-  kpurpose,
-  kwindowsystem,
-  qcoro,
-  qtfeedback,
-  qtquickcontrols2,
-  qqc2-desktop-style,
-  qtwebengine,
-  rustPlatform,
-  rustc,
-  srcs,
-}:
-
-mkDerivation rec {
-  pname = "angelfish";
-
-  patches = [
-    (fetchpatch2 {
-      name = "fix-build-with-corrosion-0.5.patch";
-      url = "https://invent.kde.org/network/angelfish/-/commit/b04928e3b62a11b647622b81fb67b7c0db656ac8.patch";
-      hash = "sha256-9rpkMKQKrvGJFIQDwSIeeZyk4/vd348r660mBOKzM2E=";
-    })
-  ];
-
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    # include version in the name so we invalidate the FOD
-    name = "${pname}-${srcs.angelfish.version}";
-    inherit (srcs.angelfish) src;
-    hash = "sha256-M3CtP7eWqOxMvnak6K3QvB/diu4jAfMmlsa6ySFIHCU=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    corrosion
-    extra-cmake-modules
-    rustPlatform.cargoSetupHook
-    cargo
-    rustc
-  ];
-
-  buildInputs = [
-    futuresql
-    kconfig
-    kcoreaddons
-    kdbusaddons
-    ki18n
-    kirigami-addons
-    kirigami2
-    knotifications
-    kpurpose
-    kwindowsystem
-    qcoro
-    qtfeedback
-    qtquickcontrols2
-    qqc2-desktop-style
-    qtwebengine
-  ];
-
-  meta = with lib; {
-    description = "Web browser for Plasma Mobile";
-    homepage = "https://invent.kde.org/plasma-mobile/angelfish";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/applications/kde/arianna.nix b/pkgs/applications/kde/arianna.nix
deleted file mode 100644
index 79cb3670895f..000000000000
--- a/pkgs/applications/kde/arianna.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  qtbase,
-  qtdeclarative,
-  qtquickcontrols2,
-  qtwebchannel,
-  qtwebengine,
-  qtwebsockets,
-  baloo,
-  karchive,
-  kconfig,
-  kcoreaddons,
-  kdbusaddons,
-  kfilemetadata,
-  ki18n,
-  kirigami-addons,
-  kitemmodels,
-  kquickcharts,
-  kwindowsystem,
-  qqc2-desktop-style,
-}:
-
-mkDerivation {
-  pname = "arianna";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    qtbase
-    qtdeclarative
-    qtquickcontrols2
-    qtwebchannel
-    qtwebengine
-    qtwebsockets
-    baloo
-    karchive
-    kconfig
-    kcoreaddons
-    kdbusaddons
-    kfilemetadata
-    ki18n
-    kirigami-addons
-    kitemmodels
-    kquickcharts
-    kwindowsystem
-    qqc2-desktop-style
-  ];
-
-  meta = with lib; {
-    description = "Epub Reader for Plasma and Plasma Mobile";
-    mainProgram = "arianna";
-    homepage = "https://invent.kde.org/graphics/arianna";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ Thra11 ];
-  };
-}
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
deleted file mode 100644
index 3a3a5810e8b7..000000000000
--- a/pkgs/applications/kde/ark/default.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  breeze-icons,
-  karchive,
-  kconfig,
-  kcrash,
-  kdbusaddons,
-  ki18n,
-  kiconthemes,
-  kitemmodels,
-  khtml,
-  kio,
-  kparts,
-  kpty,
-  kservice,
-  kwidgetsaddons,
-  libarchive,
-  libzip,
-  # Archive tools
-  p7zip,
-  lrzip,
-  unar,
-  # Unfree tools
-  unfreeEnableUnrar ? false,
-  unrar,
-}:
-
-let
-  extraTools = [
-    p7zip
-    lrzip
-    unar
-  ]
-  ++ lib.optional unfreeEnableUnrar unrar;
-in
-
-mkDerivation {
-  pname = "ark";
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  buildInputs = [
-    libarchive
-    libzip
-  ]
-  ++ extraTools;
-
-  propagatedBuildInputs = [
-    breeze-icons
-    karchive
-    kconfig
-    kcrash
-    kdbusaddons
-    khtml
-    ki18n
-    kiconthemes
-    kio
-    kitemmodels
-    kparts
-    kpty
-    kservice
-    kwidgetsaddons
-  ];
-
-  qtWrapperArgs = [
-    "--prefix"
-    "PATH"
-    ":"
-    (lib.makeBinPath extraTools)
-  ];
-
-  meta = with lib; {
-    homepage = "https://apps.kde.org/ark/";
-    description = "Graphical file compression/decompression utility";
-    mainProgram = "ark";
-    license =
-      with licenses;
-      [
-        gpl2
-        lgpl3
-      ]
-      ++ optional unfreeEnableUnrar unfree;
-    maintainers = [ maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/applications/kde/audiotube.nix b/pkgs/applications/kde/audiotube.nix
deleted file mode 100644
index f2b815c9699d..000000000000
--- a/pkgs/applications/kde/audiotube.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  extra-cmake-modules,
-  wrapGAppsHook3,
-
-  futuresql,
-  gst_all_1,
-  kcoreaddons,
-  kcrash,
-  ki18n,
-  kirigami2,
-  kirigami-addons,
-  kpurpose,
-  qcoro,
-  qtimageformats,
-  qtmultimedia,
-  qtquickcontrols2,
-  python3Packages,
-}:
-
-mkDerivation rec {
-  pname = "audiotube";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    wrapGAppsHook3
-    python3Packages.wrapPython
-    python3Packages.pybind11
-  ];
-
-  buildInputs = [
-    futuresql
-    kcoreaddons
-    kcrash
-    ki18n
-    kirigami2
-    kirigami-addons
-    kpurpose
-    qcoro
-    qtimageformats
-    qtmultimedia
-    qtquickcontrols2
-  ]
-  ++ (with gst_all_1; [
-    gst-plugins-bad
-    gst-plugins-base
-    gst-plugins-good
-    gstreamer
-  ])
-  ++ pythonPath;
-
-  pythonPath = with python3Packages; [
-    yt-dlp
-    ytmusicapi
-  ];
-
-  preFixup = ''
-    buildPythonPath "$pythonPath"
-    qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-  dontWrapGApps = true;
-
-  meta = with lib; {
-    description = "Client for YouTube Music";
-    mainProgram = "audiotube";
-    homepage = "https://invent.kde.org/plasma-mobile/audiotube";
-    # https://invent.kde.org/plasma-mobile/audiotube/-/tree/c503d0607a3386112beaa9cf990ab85fe33ef115/LICENSES
-    license = with licenses; [
-      bsd2
-      cc0
-      gpl2Only
-      gpl3Only
-    ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix
deleted file mode 100644
index 646a4582a5e2..000000000000
--- a/pkgs/applications/kde/baloo-widgets.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  baloo,
-  kconfig,
-  kfilemetadata,
-  ki18n,
-  kio,
-  kservice,
-}:
-
-mkDerivation {
-  pname = "baloo-widgets";
-  meta = {
-    license = [ lib.licenses.lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    baloo
-    kconfig
-    kfilemetadata
-    ki18n
-    kio
-    kservice
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/bomber.nix b/pkgs/applications/kde/bomber.nix
deleted file mode 100644
index 9e84dc1edfa3..000000000000
--- a/pkgs/applications/kde/bomber.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  libkdegames,
-  extra-cmake-modules,
-  kdeclarative,
-  knewstuff,
-}:
-
-mkDerivation {
-  pname = "bomber";
-  meta = with lib; {
-    homepage = "https://apps.kde.org/bomber/";
-    description = "Single player arcade game";
-    mainProgram = "bomber";
-    longDescription = ''
-      Bomber is a single player arcade game. The player is invading various
-      cities in a plane that is decreasing in height.
-
-      The goal of the game is to destroy all the buildings and advance to the next level.
-      Each level gets a bit harder by increasing the speed of the plane and the height of the buildings.
-    '';
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kdeclarative
-    knewstuff
-    libkdegames
-  ];
-}
diff --git a/pkgs/applications/kde/bovo.nix b/pkgs/applications/kde/bovo.nix
deleted file mode 100644
index b441234d65fe..000000000000
--- a/pkgs/applications/kde/bovo.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  libkdegames,
-  extra-cmake-modules,
-  kdeclarative,
-  knewstuff,
-}:
-
-mkDerivation {
-  pname = "bovo";
-  meta = with lib; {
-    homepage = "https://apps.kde.org/bovo/";
-    description = "Five in a row application";
-    mainProgram = "bovo";
-    longDescription = ''
-      Bovo is a Gomoku (from Japanese 五目並べ - lit. "five points") like game for two players,
-      where the opponents alternate in placing their respective pictogram on the game board.
-      (Also known as: Connect Five, Five in a row, X and O, Naughts and Crosses)
-    '';
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kdeclarative
-    knewstuff
-    libkdegames
-  ];
-}
diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix
deleted file mode 100644
index f28eb200ce68..000000000000
--- a/pkgs/applications/kde/calendarsupport.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  akonadi-calendar,
-  akonadi-mime,
-  akonadi-notes,
-  kcalutils,
-  kholidays,
-  kidentitymanagement,
-  kmime,
-  pimcommon,
-  qttools,
-}:
-
-mkDerivation {
-  pname = "calendarsupport";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi
-    akonadi-mime
-    akonadi-notes
-    kcalutils
-    kholidays
-    pimcommon
-    qttools
-  ];
-  propagatedBuildInputs = [
-    akonadi-calendar
-    kidentitymanagement
-    kmime
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/calindori.nix b/pkgs/applications/kde/calindori.nix
deleted file mode 100644
index fd8626c9d224..000000000000
--- a/pkgs/applications/kde/calindori.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-
-  kcalendarcore,
-  kconfig,
-  kcoreaddons,
-  kdbusaddons,
-  ki18n,
-  kirigami2,
-  knotifications,
-  kpeople,
-  kservice,
-  qtquickcontrols2,
-}:
-
-mkDerivation {
-  pname = "calindori";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kcalendarcore
-    kconfig
-    kcoreaddons
-    kdbusaddons
-    ki18n
-    kirigami2
-    knotifications
-    kpeople
-    kservice
-    qtquickcontrols2
-  ];
-
-  meta = with lib; {
-    description = "Calendar for Plasma Mobile";
-    homepage = "https://invent.kde.org/plasma-mobile/calindori";
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/cantor.nix b/pkgs/applications/kde/cantor.nix
deleted file mode 100644
index cd9d8751ba8c..000000000000
--- a/pkgs/applications/kde/cantor.nix
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-  makeWrapper,
-  shared-mime-info,
-
-  fetchpatch,
-  qtbase,
-  qtsvg,
-  qttools,
-  qtwebengine,
-  qtxmlpatterns,
-
-  poppler,
-
-  karchive,
-  kcompletion,
-  kconfig,
-  kcoreaddons,
-  kcrash,
-  kdoctools,
-  ki18n,
-  kiconthemes,
-  kio,
-  knewstuff,
-  kparts,
-  kpty,
-  ktexteditor,
-  ktextwidgets,
-  kxmlgui,
-  syntax-highlighting,
-
-  libspectre,
-
-  # Backends. Set to null if you want to omit from the build
-  withAnalitza ? true,
-  analitza,
-  wtihJulia ? true,
-  julia,
-  withQalculate ? true,
-  libqalculate,
-  withLua ? true,
-  luajit,
-  withPython ? true,
-  python3,
-  withR ? true,
-  R,
-  withSage ? true,
-  sage,
-  sage-with-env ? sage.with-env,
-}:
-
-mkDerivation {
-  pname = "cantor";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    makeWrapper
-    shared-mime-info
-    qttools
-  ];
-
-  buildInputs = [
-    qtbase
-    qtsvg
-    qtwebengine
-    qtxmlpatterns
-
-    poppler
-
-    karchive
-    kcompletion
-    kconfig
-    kcoreaddons
-    kcrash
-    kdoctools
-    ki18n
-    kiconthemes
-    kio
-    knewstuff
-    kparts
-    kpty
-    ktexteditor
-    ktextwidgets
-    kxmlgui
-    syntax-highlighting
-
-    libspectre
-  ]
-  # backends
-  ++ lib.optional withAnalitza analitza
-  ++ lib.optional wtihJulia julia
-  ++ lib.optional withQalculate libqalculate
-  ++ lib.optional withLua luajit
-  ++ lib.optional withPython python3
-  ++ lib.optional withR R
-  ++ lib.optional withSage sage-with-env;
-
-  qtWrapperArgs = [
-    "--prefix PATH : ${placeholder "out"}/bin"
-  ]
-  ++ lib.optional withSage "--prefix PATH : ${sage-with-env}/bin";
-
-  # Causes failures on Hydra and ofborg from some reason
-  enableParallelBuilding = false;
-
-  patches = [
-    # fix build for julia 1.1 from upstream
-    (fetchpatch {
-      url = "https://github.com/KDE/cantor/commit/ed9525ec7895c2251668d11218f16f186db48a59.patch?full_index=1";
-      hash = "sha256-paq0e7Tl2aiUjBf1bDHLLUpShwdCQLICNTPNsXSoe5M=";
-    })
-  ];
-
-  meta = {
-    description = "Front end to powerful mathematics and statistics packages";
-    homepage = "https://cantor.kde.org/";
-    license = with lib.licenses; [
-      bsd3
-      cc0
-      gpl2Only
-      gpl2Plus
-      gpl3Only
-    ];
-    maintainers = with lib.maintainers; [ hqurve ];
-  };
-}
diff --git a/pkgs/applications/kde/colord-kde.nix b/pkgs/applications/kde/colord-kde.nix
deleted file mode 100644
index 02fe456061d7..000000000000
--- a/pkgs/applications/kde/colord-kde.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  ki18n,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  kdbusaddons,
-  kiconthemes,
-  kirigami-addons,
-  kcmutils,
-  kio,
-  knotifications,
-  plasma-framework,
-  kwidgetsaddons,
-  kwindowsystem,
-  kitemmodels,
-  kitemviews,
-  lcms2,
-  libXrandr,
-  qtx11extras,
-}:
-
-mkDerivation {
-  pname = "colord-kde";
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-
-  buildInputs = [
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kdbusaddons
-    kiconthemes
-    kirigami-addons
-    kcmutils
-    ki18n
-    kio
-    knotifications
-    plasma-framework
-    kwidgetsaddons
-    kwindowsystem
-    kitemmodels
-    kitemviews
-    lcms2
-    libXrandr
-    qtx11extras
-  ];
-
-  meta = with lib; {
-    homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
deleted file mode 100644
index f87b8c7eae15..000000000000
--- a/pkgs/applications/kde/default.nix
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
-  # New packages
-
-  READ THIS FIRST
-
-  This module is for official packages in the KDE Gear. All available
-  packages are listed in `./srcs.nix`, although some are not yet
-  packaged in Nixpkgs (see below).
-
-  IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
-
-  Many of the packages released upstream are not yet built in Nixpkgs due to lack
-  of demand. To add a Nixpkgs build for an upstream package, copy one of the
-  existing packages here and modify it as necessary. A simple example package that
-  still shows most of the available features is in `./gwenview`.
-
-  # Updates
-
-  1. Update the URL in `./fetch.sh`.
-  2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde`
-     from the top of the Nixpkgs tree.
-  3. Use `nox-review wip` to check that everything builds.
-  4. Commit the changes and open a pull request.
-*/
-
-{
-  lib,
-  config,
-  libsForQt5,
-  fetchurl,
-}:
-
-let
-  mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit fetchurl mirror; };
-
-  mkDerivation =
-    args:
-    let
-      inherit (args) pname;
-      inherit (srcs.${pname}) src version;
-      mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) { };
-    in
-    mkDerivation (
-      args
-      // {
-        inherit pname version src;
-
-        outputs = args.outputs or [ "out" ];
-
-        meta =
-          let
-            meta = args.meta or { };
-          in
-          meta
-          // {
-            homepage = meta.homepage or "http://www.kde.org";
-            platforms = meta.platforms or lib.platforms.linux;
-          };
-      }
-    );
-
-  packages =
-    self:
-    with self;
-    let
-      callPackage = self.newScope {
-        inherit mkDerivation;
-
-        # Team of maintainers assigned to the KDE PIM suite
-        kdepimTeam = with lib.maintainers; [
-          ttuegel
-          vandenoever
-          nyanloutre
-        ];
-      };
-    in
-    {
-      akonadi = callPackage ./akonadi { };
-      akonadi-calendar = callPackage ./akonadi-calendar.nix { };
-      akonadi-calendar-tools = callPackage ./akonadi-calendar-tools.nix { };
-      akonadi-contacts = callPackage ./akonadi-contacts.nix { };
-      akonadi-import-wizard = callPackage ./akonadi-import-wizard.nix { };
-      akonadi-mime = callPackage ./akonadi-mime.nix { };
-      akonadi-notes = callPackage ./akonadi-notes.nix { };
-      akonadi-search = callPackage ./akonadi-search.nix { };
-      akonadiconsole = callPackage ./akonadiconsole.nix { };
-      akregator = callPackage ./akregator.nix { };
-      analitza = callPackage ./analitza.nix { };
-      arianna = callPackage ./arianna.nix { };
-      ark = callPackage ./ark { };
-      baloo-widgets = callPackage ./baloo-widgets.nix { };
-      bomber = callPackage ./bomber.nix { };
-      bovo = callPackage ./bovo.nix { };
-      calendarsupport = callPackage ./calendarsupport.nix { };
-      colord-kde = callPackage ./colord-kde.nix { };
-      cantor = callPackage ./cantor.nix { };
-      dolphin = callPackage ./dolphin.nix { };
-      dolphin-plugins = callPackage ./dolphin-plugins.nix { };
-      dragon = callPackage ./dragon.nix { };
-      elisa = callPackage ./elisa.nix { };
-      eventviews = callPackage ./eventviews.nix { };
-      falkon = callPackage ./falkon.nix { };
-      ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
-      filelight = callPackage ./filelight.nix { };
-      ghostwriter = callPackage ./ghostwriter.nix { };
-      granatier = callPackage ./granatier.nix { };
-      grantleetheme = callPackage ./grantleetheme { };
-      gwenview = callPackage ./gwenview { };
-      incidenceeditor = callPackage ./incidenceeditor.nix { };
-      juk = callPackage ./juk.nix { };
-      kaccounts-integration = callPackage ./kaccounts-integration.nix { };
-      kaccounts-providers = callPackage ./kaccounts-providers.nix { };
-      kaddressbook = callPackage ./kaddressbook.nix { };
-      kalarm = callPackage ./kalarm.nix { };
-      kalgebra = callPackage ./kalgebra.nix { };
-      merkuro = callPackage ./merkuro.nix { };
-      kalzium = callPackage ./kalzium.nix { };
-      kamoso = callPackage ./kamoso.nix { };
-      kapman = callPackage ./kapman.nix { };
-      kapptemplate = callPackage ./kapptemplate.nix { };
-      kate = callPackage ./kate.nix { };
-      katomic = callPackage ./katomic.nix { };
-      kblackbox = callPackage ./kblackbox.nix { };
-      kblocks = callPackage ./kblocks.nix { };
-      kbounce = callPackage ./kbounce.nix { };
-      kbreakout = callPackage ./kbreakout.nix { };
-      kcachegrind = callPackage ./kcachegrind.nix { };
-      kcalc = callPackage ./kcalc.nix { };
-      kcalutils = callPackage ./kcalutils.nix { };
-      kcharselect = callPackage ./kcharselect.nix { };
-      kcolorchooser = callPackage ./kcolorchooser.nix { };
-      kde-inotify-survey = callPackage ./kde-inotify-survey.nix { };
-      kdebugsettings = callPackage ./kdebugsettings.nix { };
-      kdeconnect-kde = callPackage ./kdeconnect-kde.nix { };
-      kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix { };
-      kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers { };
-      kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix { };
-      kdenlive = callPackage ./kdenlive { };
-      kdepim-addons = callPackage ./kdepim-addons.nix { };
-      kdepim-runtime = callPackage ./kdepim-runtime { };
-      kdev-php = callPackage ./kdevelop/kdev-php.nix { };
-      kdev-python = callPackage ./kdevelop/kdev-python.nix { };
-      kdevelop = callPackage ./kdevelop/wrapper.nix { };
-      kdevelop-pg-qt = callPackage ./kdevelop/kdevelop-pg-qt.nix { };
-      kdevelop-unwrapped = callPackage ./kdevelop/kdevelop.nix { };
-      kdf = callPackage ./kdf.nix { };
-      kdialog = callPackage ./kdialog.nix { };
-      kdiamond = callPackage ./kdiamond.nix { };
-      keditbookmarks = callPackage ./keditbookmarks.nix { };
-      kfind = callPackage ./kfind.nix { };
-      kgeography = callPackage ./kgeography.nix { };
-      kget = callPackage ./kget.nix { };
-      kgpg = callPackage ./kgpg.nix { };
-      khelpcenter = callPackage ./khelpcenter.nix { };
-      kidentitymanagement = callPackage ./kidentitymanagement.nix { };
-      kig = callPackage ./kig.nix { };
-      kigo = callPackage ./kigo.nix { };
-      killbots = callPackage ./killbots.nix { };
-      kimap = callPackage ./kimap.nix { };
-      kio-admin = callPackage ./kio-admin.nix { };
-      kio-extras = callPackage ./kio-extras.nix { };
-      kio-gdrive = callPackage ./kio-gdrive.nix { };
-      kipi-plugins = callPackage ./kipi-plugins.nix { };
-      kirigami-gallery = callPackage ./kirigami-gallery.nix { };
-      kitinerary = callPackage ./kitinerary.nix { };
-      kldap = callPackage ./kldap.nix { };
-      kleopatra = callPackage ./kleopatra.nix { };
-      klettres = callPackage ./klettres.nix { };
-      klines = callPackage ./klines.nix { };
-      kmag = callPackage ./kmag.nix { };
-      kmahjongg = callPackage ./kmahjongg.nix { };
-      kmail = callPackage ./kmail.nix { };
-      kmail-account-wizard = callPackage ./kmail-account-wizard.nix { };
-      kmailtransport = callPackage ./kmailtransport.nix { };
-      kmbox = callPackage ./kmbox.nix { };
-      kmime = callPackage ./kmime.nix { };
-      kmines = callPackage ./kmines.nix { };
-      kmix = callPackage ./kmix.nix { };
-      kmousetool = callPackage ./kmousetool.nix { };
-      kmplot = callPackage ./kmplot.nix { };
-      knavalbattle = callPackage ./knavalbattle.nix { };
-      knetwalk = callPackage ./knetwalk.nix { };
-      knights = callPackage ./knights.nix { };
-      knotes = callPackage ./knotes.nix { };
-      kolf = callPackage ./kolf.nix { };
-      kollision = callPackage ./kollision.nix { };
-      kolourpaint = callPackage ./kolourpaint.nix { };
-      kompare = callPackage ./kompare.nix { };
-      konqueror = callPackage ./konqueror.nix { };
-      konquest = callPackage ./konquest.nix { };
-      konsole = callPackage ./konsole.nix { };
-      kontact = callPackage ./kontact.nix { };
-      konversation = callPackage ./konversation.nix { };
-      kontactinterface = callPackage ./kontactinterface.nix { };
-      kopeninghours = callPackage ./kopeninghours.nix { };
-      korganizer = callPackage ./korganizer.nix { };
-      kosmindoormap = callPackage ./kosmindoormap.nix { };
-      kpat = callPackage ./kpat.nix { };
-      kpimtextedit = callPackage ./kpimtextedit.nix { };
-      kpkpass = callPackage ./kpkpass.nix { };
-      kpmcore = callPackage ./kpmcore { };
-      kpublictransport = callPackage ./kpublictransport.nix { };
-      kqtquickcharts = callPackage ./kqtquickcharts.nix { };
-      krdc = callPackage ./krdc.nix { };
-      kreversi = callPackage ./kreversi.nix { };
-      krfb = callPackage ./krfb.nix { };
-      kruler = callPackage ./kruler.nix { };
-      ksanecore = callPackage ./ksanecore.nix { };
-      kshisen = callPackage ./kshisen.nix { };
-      ksmtp = callPackage ./ksmtp { };
-      kspaceduel = callPackage ./kspaceduel.nix { };
-      ksquares = callPackage ./ksquares.nix { };
-      ksudoku = callPackage ./ksudoku.nix { };
-      ksystemlog = callPackage ./ksystemlog.nix { };
-      kteatime = callPackage ./kteatime.nix { };
-      ktimer = callPackage ./ktimer.nix { };
-      ktnef = callPackage ./ktnef.nix { };
-      ktorrent = callPackage ./ktorrent.nix { };
-      kturtle = callPackage ./kturtle.nix { };
-      kwalletmanager = callPackage ./kwalletmanager.nix { };
-      kwave = callPackage ./kwave.nix { };
-      libgravatar = callPackage ./libgravatar.nix { };
-      libkcddb = callPackage ./libkcddb.nix { };
-      libkdcraw = callPackage ./libkdcraw.nix { };
-      libkdegames = callPackage ./libkdegames.nix { };
-      libkdepim = callPackage ./libkdepim.nix { };
-      libkexiv2 = callPackage ./libkexiv2.nix { };
-      libkgapi = callPackage ./libkgapi.nix { };
-      libkipi = callPackage ./libkipi.nix { };
-      libkleo = callPackage ./libkleo.nix { };
-      libkmahjongg = callPackage ./libkmahjongg.nix { };
-      libkomparediff2 = callPackage ./libkomparediff2.nix { };
-      libksane = callPackage ./libksane.nix { };
-      libksieve = callPackage ./libksieve.nix { };
-      libktorrent = callPackage ./libktorrent.nix { };
-      mailcommon = callPackage ./mailcommon.nix { };
-      mailimporter = callPackage ./mailimporter.nix { };
-      marble = callPackage ./marble.nix { };
-      mbox-importer = callPackage ./mbox-importer.nix { };
-      messagelib = callPackage ./messagelib.nix { };
-      minuet = callPackage ./minuet.nix { };
-      okular = callPackage ./okular.nix { };
-      palapeli = callPackage ./palapeli.nix { };
-      partitionmanager = callPackage ./partitionmanager { };
-      picmi = callPackage ./picmi.nix { };
-      pim-data-exporter = callPackage ./pim-data-exporter.nix { };
-      pim-sieve-editor = callPackage ./pim-sieve-editor.nix { };
-      pimcommon = callPackage ./pimcommon.nix { };
-      print-manager = callPackage ./print-manager.nix { };
-      rocs = callPackage ./rocs.nix { };
-      skanlite = callPackage ./skanlite.nix { };
-      skanpage = callPackage ./skanpage.nix { };
-      spectacle = callPackage ./spectacle.nix { };
-      umbrello = callPackage ./umbrello.nix { };
-      yakuake = callPackage ./yakuake.nix { };
-      zanshin = callPackage ./zanshin.nix { };
-
-      # Plasma Mobile Gear
-      alligator = callPackage ./alligator.nix { };
-      angelfish = callPackage ./angelfish.nix { inherit srcs; };
-      audiotube = callPackage ./audiotube.nix { };
-      calindori = callPackage ./calindori.nix { };
-      kalk = callPackage ./kalk.nix { };
-      kasts = callPackage ./kasts.nix { };
-      kclock = callPackage ./kclock.nix { };
-      keysmith = callPackage ./keysmith.nix { };
-      koko = callPackage ./koko.nix { };
-      kongress = callPackage ./kongress.nix { };
-      krecorder = callPackage ./krecorder.nix { };
-      ktrip = callPackage ./ktrip.nix { };
-      kweather = callPackage ./kweather.nix { };
-      plasmatube = callPackage ./plasmatube { };
-      qmlkonsole = callPackage ./qmlkonsole.nix { };
-      telly-skout = callPackage ./telly-skout.nix { };
-      tokodon = callPackage ./tokodon.nix { };
-    }
-    // lib.optionalAttrs config.allowAliases {
-      k3b = throw "libsForQt5.k3b has been dropped in favor of kdePackages.k3b";
-      ktouch = throw "ktouch has been dropped due keyboard layout issues";
-    };
-
-in
-lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix
deleted file mode 100644
index 946fcd4143dd..000000000000
--- a/pkgs/applications/kde/dolphin-plugins.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  dolphin,
-  ki18n,
-  kio,
-  kxmlgui,
-}:
-
-mkDerivation {
-  pname = "dolphin-plugins";
-  meta = {
-    license = [ lib.licenses.gpl2 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    dolphin
-    ki18n
-    kio
-    kxmlgui
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix
deleted file mode 100644
index 69ce5b03e455..000000000000
--- a/pkgs/applications/kde/dolphin.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  baloo,
-  baloo-widgets,
-  kactivities,
-  kbookmarks,
-  kcmutils,
-  kcompletion,
-  kconfig,
-  kcoreaddons,
-  kdbusaddons,
-  kfilemetadata,
-  ki18n,
-  kiconthemes,
-  kinit,
-  kio,
-  knewstuff,
-  knotifications,
-  kparts,
-  ktexteditor,
-  kwindowsystem,
-  phonon,
-  solid,
-  kuserfeedback,
-  wayland,
-  qtwayland,
-  qtx11extras,
-  qtimageformats,
-}:
-
-mkDerivation {
-  pname = "dolphin";
-  meta = {
-    homepage = "https://apps.kde.org/dolphin/";
-    description = "KDE file manager";
-    license = with lib.licenses; [
-      gpl2Plus
-      fdl12Plus
-    ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedUserEnvPkgs = [ baloo ];
-  propagatedBuildInputs = [
-    baloo
-    baloo-widgets
-    kactivities
-    kbookmarks
-    kcmutils
-    kcompletion
-    kconfig
-    kcoreaddons
-    kdbusaddons
-    kfilemetadata
-    ki18n
-    kiconthemes
-    kinit
-    kio
-    knewstuff
-    knotifications
-    kparts
-    ktexteditor
-    kwindowsystem
-    phonon
-    solid
-    kuserfeedback
-    wayland
-    qtwayland
-    qtx11extras
-    qtimageformats
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/dragon.nix b/pkgs/applications/kde/dragon.nix
deleted file mode 100644
index d1bc7233a5f8..000000000000
--- a/pkgs/applications/kde/dragon.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  baloo,
-  baloo-widgets,
-  kactivities,
-  kbookmarks,
-  kcmutils,
-  kcompletion,
-  kconfig,
-  kcoreaddons,
-  kdbusaddons,
-  kfilemetadata,
-  ki18n,
-  kiconthemes,
-  kinit,
-  kio,
-  knewstuff,
-  knotifications,
-  kparts,
-  ktexteditor,
-  kwindowsystem,
-  phonon,
-  solid,
-  phonon-backend-gstreamer,
-}:
-
-mkDerivation {
-  pname = "dragon";
-  meta = {
-    homepage = "https://apps.kde.org/dragonplayer/";
-    license = with lib.licenses; [
-      gpl2Plus
-      fdl12Plus
-    ];
-    description = "Simple media player for KDE";
-    mainProgram = "dragon";
-    maintainers = [ lib.maintainers.jonathanreeve ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    baloo
-    baloo-widgets
-    kactivities
-    kbookmarks
-    kcmutils
-    kcompletion
-    kconfig
-    kcoreaddons
-    kdbusaddons
-    kfilemetadata
-    ki18n
-    kiconthemes
-    kinit
-    kio
-    knewstuff
-    knotifications
-    kparts
-    ktexteditor
-    kwindowsystem
-    phonon
-    solid
-    phonon-backend-gstreamer
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix
deleted file mode 100644
index f920f4811ae4..000000000000
--- a/pkgs/applications/kde/elisa.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  qtmultimedia,
-  qtquickcontrols2,
-  qtwebsockets,
-  kconfig,
-  kcmutils,
-  kcrash,
-  kdeclarative,
-  kfilemetadata,
-  kinit,
-  kirigami2,
-  baloo,
-  libvlc,
-}:
-
-mkDerivation {
-  pname = "elisa";
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  buildInputs = [ libvlc ];
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  propagatedBuildInputs = [
-    baloo
-    kcmutils
-    kconfig
-    kcrash
-    kdeclarative
-    kfilemetadata
-    kinit
-    kirigami2
-    qtmultimedia
-    qtquickcontrols2
-    qtwebsockets
-  ];
-
-  meta = with lib; {
-    homepage = "https://apps.kde.org/elisa/";
-    description = "Simple media player for KDE";
-    mainProgram = "elisa";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-}
diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix
deleted file mode 100644
index 12fbe28e6148..000000000000
--- a/pkgs/applications/kde/eventviews.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  calendarsupport,
-  kcalutils,
-  kdiagram,
-  libkdepim,
-  qtbase,
-  qttools,
-  kholidays,
-}:
-
-mkDerivation {
-  pname = "eventviews";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi
-    calendarsupport
-    kcalutils
-    kdiagram
-    libkdepim
-    qtbase
-    qttools
-    kholidays
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/falkon.nix b/pkgs/applications/kde/falkon.nix
deleted file mode 100644
index e696acd20077..000000000000
--- a/pkgs/applications/kde/falkon.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  stdenv,
-  mkDerivation,
-  lib,
-  cmake,
-  extra-cmake-modules,
-  pkg-config,
-  libpthreadstubs,
-  libxcb,
-  libXdmcp,
-  qtsvg,
-  qttools,
-  qtwebengine,
-  qtx11extras,
-  qtwayland,
-  wrapQtAppsHook,
-  kwallet,
-  kpurpose,
-  karchive,
-  kio,
-}:
-
-mkDerivation {
-  pname = "falkon";
-
-  preConfigure = ''
-    export NONBLOCK_JS_DIALOGS=true
-    export KDE_INTEGRATION=true
-    export GNOME_INTEGRATION=false
-    export FALKON_PREFIX=$out
-  '';
-
-  buildInputs = [
-    libpthreadstubs
-    libxcb
-    libXdmcp
-    qtsvg
-    qttools
-    qtwebengine
-    qtx11extras
-    kwallet
-    kpurpose
-    karchive
-    kio
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    pkg-config
-    qttools
-    wrapQtAppsHook
-  ];
-
-  meta = with lib; {
-    description = "QtWebEngine based cross-platform web browser";
-    mainProgram = "falkon";
-    homepage = "https://www.falkon.org";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
deleted file mode 100644
index de4f09e09a0c..000000000000
--- a/pkgs/applications/kde/fetch.sh
+++ /dev/null
@@ -1 +0,0 @@
-WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.5/src -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix
deleted file mode 100644
index 76d04046d741..000000000000
--- a/pkgs/applications/kde/ffmpegthumbs.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  ffmpeg,
-  kio,
-  taglib,
-}:
-
-mkDerivation {
-  pname = "ffmpegthumbs";
-  meta = {
-    license = with lib.licenses; [
-      gpl2
-      bsd3
-    ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    ffmpeg
-    kio
-    taglib
-  ];
-}
diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix
deleted file mode 100644
index b64add65981d..000000000000
--- a/pkgs/applications/kde/filelight.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kio,
-  kparts,
-  kxmlgui,
-  qtscript,
-  solid,
-  qtquickcontrols2,
-  kdeclarative,
-  kirigami2,
-  kquickcharts,
-}:
-
-mkDerivation {
-  pname = "filelight";
-  meta = {
-    description = "Disk usage statistics";
-    mainProgram = "filelight";
-    homepage = "https://apps.kde.org/filelight/";
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ vcunat ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    kio
-    kparts
-    kxmlgui
-    qtscript
-    solid
-    qtquickcontrols2
-    kdeclarative
-    kirigami2
-    kquickcharts
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/ghostwriter.nix b/pkgs/applications/kde/ghostwriter.nix
deleted file mode 100644
index 3541de3df6c4..000000000000
--- a/pkgs/applications/kde/ghostwriter.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  qttools,
-  qtwebengine,
-  kcoreaddons,
-  kconfigwidgets,
-  sonnet,
-  kxmlgui,
-  hunspell,
-  cmark,
-  multimarkdown,
-  pandoc,
-}:
-
-mkDerivation {
-  pname = "ghostwriter";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    qttools
-  ];
-
-  buildInputs = [
-    qtwebengine
-    hunspell
-    kcoreaddons
-    kconfigwidgets
-    sonnet
-    kxmlgui
-  ];
-
-  qtWrapperArgs = [
-    "--prefix"
-    "PATH"
-    ":"
-    (lib.makeBinPath [
-      cmark
-      multimarkdown
-      pandoc
-    ])
-  ];
-
-  meta = with lib; {
-    description = "Cross-platform, aesthetic, distraction-free Markdown editor";
-    mainProgram = "ghostwriter";
-    homepage = "https://ghostwriter.kde.org/";
-    changelog = "https://invent.kde.org/office/ghostwriter/-/blob/master/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
-      dotlambda
-      erictapen
-    ];
-  };
-}
diff --git a/pkgs/applications/kde/granatier.nix b/pkgs/applications/kde/granatier.nix
deleted file mode 100644
index 35683214a721..000000000000
--- a/pkgs/applications/kde/granatier.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  libkdegames,
-  extra-cmake-modules,
-  kdeclarative,
-  knewstuff,
-}:
-
-mkDerivation {
-  pname = "granatier";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.granatier";
-    description = "Clone of the classic Bomberman game";
-    mainProgram = "granatier";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kdeclarative
-    knewstuff
-    libkdegames
-  ];
-}
diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix
deleted file mode 100644
index 7e5aa89f128e..000000000000
--- a/pkgs/applications/kde/grantleetheme/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  grantlee,
-  ki18n,
-  kiconthemes,
-  knewstuff,
-  kservice,
-  kxmlgui,
-  qtbase,
-}:
-
-mkDerivation {
-  pname = "grantleetheme";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  outputs = [
-    "out"
-    "dev"
-  ];
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    grantlee
-    ki18n
-    kiconthemes
-    knewstuff
-    kservice
-    kxmlgui
-    qtbase
-  ];
-  propagatedBuildInputs = [
-    grantlee
-    kiconthemes
-    knewstuff
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-
-    # This is a really disgusting hack, no idea how search paths work for kde,
-    # but apparently kde is looking in $out/$out rather than $out for this library.
-    # Having this symlink fixes kmail finding it and makes my html work (Yay!).
-    mkdir -p $out/$out/lib/grantlee/
-    libpath=$(echo $out/lib/grantlee/*)
-    ln -s $libpath $out/$out/lib/grantlee/$(basename $libpath)
-  '';
-}
diff --git a/pkgs/applications/kde/gwenview/default.nix b/pkgs/applications/kde/gwenview/default.nix
deleted file mode 100644
index 13dc1b52a60b..000000000000
--- a/pkgs/applications/kde/gwenview/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  exiv2,
-  lcms2,
-  cfitsio,
-  baloo,
-  kactivities,
-  kio,
-  kipi-plugins,
-  kitemmodels,
-  kparts,
-  libkdcraw,
-  libkipi,
-  phonon,
-  qtimageformats,
-  qtsvg,
-  qtx11extras,
-  kinit,
-  kpurpose,
-  kcolorpicker,
-  kimageannotator,
-  wayland,
-  wayland-protocols,
-  wayland-scanner,
-}:
-
-mkDerivation {
-  pname = "gwenview";
-  meta = {
-    homepage = "https://apps.kde.org/gwenview/";
-    description = "KDE image viewer";
-    license = with lib.licenses; [
-      gpl2Plus
-      fdl12Plus
-    ];
-    maintainers = [ lib.maintainers.ttuegel ];
-    mainProgram = "gwenview";
-  };
-
-  # Fix build with versioned kImageAnnotator
-  patches = [ ./kimageannotator.patch ];
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    wayland-scanner
-  ];
-  buildInputs = [
-    baloo
-    kactivities
-    kio
-    kitemmodels
-    kparts
-    libkdcraw
-    libkipi
-    phonon
-    exiv2
-    lcms2
-    cfitsio
-    qtimageformats
-    qtsvg
-    qtx11extras
-    kpurpose
-    kcolorpicker
-    kimageannotator
-    wayland
-    wayland-protocols
-  ];
-  propagatedUserEnvPkgs = [
-    kipi-plugins
-    libkipi
-    (lib.getBin kinit)
-  ];
-}
diff --git a/pkgs/applications/kde/gwenview/kimageannotator.patch b/pkgs/applications/kde/gwenview/kimageannotator.patch
deleted file mode 100644
index 83cba93e49c1..000000000000
--- a/pkgs/applications/kde/gwenview/kimageannotator.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 01db0fb1..06319c54 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -166,12 +166,12 @@ if(NOT WITHOUT_X11)
- endif()
- 
- if (QT_MAJOR_VERSION STREQUAL "5")
--    find_package(kImageAnnotator)
--    set_package_properties(kImageAnnotator PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED)
--    if(kImageAnnotator_FOUND)
-+    find_package(kImageAnnotator-Qt5)
-+    set_package_properties(kImageAnnotator-Qt5 PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED)
-+    if(kImageAnnotator-Qt5_FOUND)
-         set(KIMAGEANNOTATOR_FOUND 1)
--        find_package(kColorPicker REQUIRED)
--        if(NOT kImageAnnotator_VERSION VERSION_LESS 0.5.0)
-+        find_package(kColorPicker-Qt5 REQUIRED)
-+        if(NOT kImageAnnotator-Qt5_VERSION VERSION_LESS 0.5.0)
-             set(KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS 1)
-         endif()
-     endif()
-diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
-index 8c136835..ef4cff74 100644
---- a/app/CMakeLists.txt
-+++ b/app/CMakeLists.txt
-@@ -157,6 +157,6 @@ target_link_libraries(slideshowfileitemaction
-     KF${QT_MAJOR_VERSION}::KIOWidgets
-     KF${QT_MAJOR_VERSION}::Notifications)
- 
--if(kImageAnnotator_FOUND)
-+if(kImageAnnotator-Qt5_FOUND)
-     target_link_libraries(gwenview kImageAnnotator::kImageAnnotator)
- endif()
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 05a2ea67..4167a1bb 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -157,7 +157,7 @@ set(gwenviewlib_SRCS
-     touch/touch_helper.cpp
-     ${GV_JPEG_DIR}/transupp.c
-     )
--if (kImageAnnotator_FOUND)
-+if (kImageAnnotator-Qt5_FOUND)
-     set(gwenviewlib_SRCS ${gwenviewlib_SRCS}
-         annotate/annotatedialog.cpp
-         annotate/annotateoperation.cpp
-@@ -338,7 +338,7 @@ if (GWENVIEW_SEMANTICINFO_BACKEND_BALOO)
-         )
- endif()
- 
--if(kImageAnnotator_FOUND)
-+if(kImageAnnotator-Qt5_FOUND)
-     target_link_libraries(gwenviewlib kImageAnnotator::kImageAnnotator)
- endif()
- 
diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix
deleted file mode 100644
index 36b056280992..000000000000
--- a/pkgs/applications/kde/incidenceeditor.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  akonadi-mime,
-  calendarsupport,
-  eventviews,
-  kdiagram,
-  kldap,
-  kmime,
-  pimcommon,
-  qtbase,
-}:
-
-mkDerivation {
-  pname = "incidenceeditor";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi
-    akonadi-mime
-    calendarsupport
-    eventviews
-    kdiagram
-    kldap
-    kmime
-    pimcommon
-    qtbase
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/juk.nix b/pkgs/applications/kde/juk.nix
deleted file mode 100644
index 4e887562b070..000000000000
--- a/pkgs/applications/kde/juk.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  wrapQtAppsHook,
-  kdoctools,
-  kcoreaddons,
-  kxmlgui,
-  kio,
-  phonon,
-  taglib,
-}:
-
-mkDerivation {
-  pname = "juk";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    wrapQtAppsHook
-    kdoctools
-  ];
-
-  buildInputs = [
-    kcoreaddons
-    kxmlgui
-    kio
-    phonon
-    taglib
-  ];
-
-  meta = with lib; {
-    homepage = "https://invent.kde.org/multimedia/juk";
-    description = "Audio jukebox app, supporting collections of MP3, Ogg Vorbis and FLAC audio files";
-    mainProgram = "juk";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ zendo ];
-  };
-}
diff --git a/pkgs/applications/kde/kaccounts-integration.nix b/pkgs/applications/kde/kaccounts-integration.nix
deleted file mode 100644
index ef9b3deb2d19..000000000000
--- a/pkgs/applications/kde/kaccounts-integration.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kcmutils,
-  kcoreaddons,
-  kwallet,
-  accounts-qt,
-  signond,
-  qcoro,
-}:
-
-mkDerivation {
-  pname = "kaccounts-integration";
-  meta = with lib; {
-    homepage = "https://community.kde.org/KTp/Setting_up_KAccounts";
-    description = "Online accounts integration";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kcmutils
-    kcoreaddons
-    kdoctools
-    kwallet
-    accounts-qt
-    signond
-    qcoro
-  ];
-}
diff --git a/pkgs/applications/kde/kaccounts-providers.nix b/pkgs/applications/kde/kaccounts-providers.nix
deleted file mode 100644
index 3e265c376778..000000000000
--- a/pkgs/applications/kde/kaccounts-providers.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  accounts-qt,
-  extra-cmake-modules,
-  intltool,
-  kaccounts-integration,
-  kcmutils,
-  kcoreaddons,
-  kdeclarative,
-  kdoctools,
-  kio,
-  kpackage,
-  kwallet,
-  qtwebengine,
-  signond,
-}:
-
-mkDerivation {
-  pname = "kaccounts-providers";
-  meta = with lib; {
-    homepage = "https://community.kde.org/KTp/Setting_up_KAccounts";
-    description = "Online account providers";
-    maintainers = with maintainers; [ kennyballou ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    intltool
-    kdoctools
-  ];
-  buildInputs = [
-    accounts-qt
-    kaccounts-integration
-    kcmutils
-    kcoreaddons
-    kdeclarative
-    kio
-    kpackage
-    kwallet
-    qtwebengine
-    signond
-  ];
-}
diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix
deleted file mode 100644
index 9e01da6d5a19..000000000000
--- a/pkgs/applications/kde/kaddressbook.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  akonadi-search,
-  grantlee,
-  grantleetheme,
-  kcmutils,
-  kcompletion,
-  kcrash,
-  kdbusaddons,
-  ki18n,
-  kontactinterface,
-  kparts,
-  kpimtextedit,
-  kuserfeedback,
-  kxmlgui,
-  libkdepim,
-  libkleo,
-  mailcommon,
-  pimcommon,
-  prison,
-  qgpgme,
-  qtbase,
-}:
-
-mkDerivation {
-  pname = "kaddressbook";
-  meta = {
-    homepage = "https://apps.kde.org/kaddressbook/";
-    description = "KDE contact manager";
-    mainProgram = "kaddressbook";
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi
-    akonadi-search
-    grantlee
-    grantleetheme
-    kcmutils
-    kcompletion
-    kcrash
-    kdbusaddons
-    ki18n
-    kontactinterface
-    kparts
-    kpimtextedit
-    kuserfeedback
-    kxmlgui
-    libkdepim
-    libkleo
-    mailcommon
-    pimcommon
-    prison
-    qgpgme
-    qtbase
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$out/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix
deleted file mode 100644
index 6a546c8f2355..000000000000
--- a/pkgs/applications/kde/kalarm.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-
-  kauth,
-  kcodecs,
-  kcompletion,
-  kconfig,
-  kconfigwidgets,
-  kdbusaddons,
-  kdoctools,
-  kguiaddons,
-  ki18n,
-  kiconthemes,
-  kidletime,
-  kjobwidgets,
-  kcmutils,
-  kio,
-  knotifications,
-  knotifyconfig,
-  kservice,
-  kwidgetsaddons,
-  kwindowsystem,
-  kxmlgui,
-  phonon,
-
-  kimap,
-  akonadi,
-  akonadi-contacts,
-  akonadi-mime,
-  kcalendarcore,
-  kcalutils,
-  kholidays,
-  kidentitymanagement,
-  libkdepim,
-  mailcommon,
-  kmailtransport,
-  kmime,
-  pimcommon,
-  kpimtextedit,
-  messagelib,
-
-  qtx11extras,
-
-  kdepim-runtime,
-}:
-
-mkDerivation {
-  pname = "kalarm";
-  meta = {
-    homepage = "https://apps.kde.org/kalarm/";
-    description = "Personal alarm scheduler";
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = [ ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kauth
-    kcodecs
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kdbusaddons
-    kdoctools
-    kguiaddons
-    ki18n
-    kiconthemes
-    kidletime
-    kjobwidgets
-    kcmutils
-    kio
-    knotifications
-    knotifyconfig
-    kservice
-    kwidgetsaddons
-    kwindowsystem
-    kxmlgui
-    phonon
-
-    kimap
-    akonadi
-    akonadi-contacts
-    akonadi-mime
-    kcalendarcore
-    kcalutils
-    kholidays
-    kidentitymanagement
-    libkdepim
-    mailcommon
-    kmailtransport
-    kmime
-    pimcommon
-    kpimtextedit
-    messagelib
-
-    qtx11extras
-  ];
-  propagatedUserEnvPkgs = [ kdepim-runtime ];
-}
diff --git a/pkgs/applications/kde/kalgebra.nix b/pkgs/applications/kde/kalgebra.nix
deleted file mode 100644
index b3d6e7b76df4..000000000000
--- a/pkgs/applications/kde/kalgebra.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  analitza,
-  ki18n,
-  kinit,
-  kirigami2,
-  kconfigwidgets,
-  kwidgetsaddons,
-  kio,
-  kxmlgui,
-  qtwebengine,
-  plasma-framework,
-}:
-
-mkDerivation {
-  pname = "kalgebra";
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  buildInputs = [
-    ki18n
-    analitza
-    kinit
-    kirigami2
-    kconfigwidgets
-    kwidgetsaddons
-    kio
-    kxmlgui
-    qtwebengine
-    plasma-framework
-  ];
-
-  meta = {
-    homepage = "https://apps.kde.org/kalgebra/";
-    description = "2D and 3D Graph Calculator";
-    license = with lib.licenses; [ gpl2Plus ];
-    maintainers = with lib.maintainers; [ ninjafb ];
-  };
-}
diff --git a/pkgs/applications/kde/kalk.nix b/pkgs/applications/kde/kalk.nix
deleted file mode 100644
index 87fe82a281df..000000000000
--- a/pkgs/applications/kde/kalk.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-  bison,
-  flex,
-
-  gmp,
-  mpfr,
-
-  kconfig,
-  kcoreaddons,
-  ki18n,
-  kirigami2,
-  kunitconversion,
-  qtfeedback,
-  qtquickcontrols2,
-}:
-
-mkDerivation {
-  pname = "kalk";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    bison
-    flex
-  ];
-
-  buildInputs = [
-    gmp
-    mpfr
-
-    kconfig
-    kcoreaddons
-    ki18n
-    kirigami2
-    kunitconversion
-    qtfeedback
-    qtquickcontrols2
-  ];
-
-  meta = with lib; {
-    description = "Calculator built with kirigami";
-    mainProgram = "kalk";
-    homepage = "https://invent.kde.org/plasma-mobile/kalk";
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/kalzium.nix b/pkgs/applications/kde/kalzium.nix
deleted file mode 100644
index 8565fc6d8d72..000000000000
--- a/pkgs/applications/kde/kalzium.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  openbabel,
-  qtscript,
-  kparts,
-  kplotting,
-  kunitconversion,
-}:
-
-mkDerivation {
-  pname = "kalzium";
-  meta = with lib; {
-    homepage = "https://edu.kde.org/kalzium/";
-    description = "Program that shows you the Periodic Table of Elements";
-    mainProgram = "kalzium";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    qtscript
-    #avogadro
-    kdoctools
-    ki18n
-    kio
-    openbabel
-    kparts
-    kplotting
-    kunitconversion
-  ];
-}
diff --git a/pkgs/applications/kde/kamoso.nix b/pkgs/applications/kde/kamoso.nix
deleted file mode 100644
index 42de6ca81e9f..000000000000
--- a/pkgs/applications/kde/kamoso.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  wrapQtAppsHook,
-  qtdeclarative,
-  qtgraphicaleffects,
-  qtquickcontrols2,
-  kirigami2,
-  kpurpose,
-  gst_all_1,
-  pcre,
-}:
-
-let
-  gst = with gst_all_1; [
-    gstreamer
-    gst-libav
-    gst-plugins-base
-    gst-plugins-good
-    gst-plugins-bad
-  ];
-
-in
-mkDerivation {
-  pname = "kamoso";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    wrapQtAppsHook
-  ];
-  buildInputs = [ pcre ] ++ gst;
-  propagatedBuildInputs = [
-    qtdeclarative
-    qtgraphicaleffects
-    qtquickcontrols2
-    kirigami2
-    kpurpose
-  ];
-
-  cmakeFlags = [
-    "-DOpenGL_GL_PREFERENCE=GLVND"
-    "-DGSTREAMER_VIDEO_INCLUDE_DIR=${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"
-  ];
-
-  qtWrapperArgs = [
-    "--prefix GST_PLUGIN_PATH : ${lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gst}"
-  ];
-
-  meta = {
-    homepage = "https://apps.kde.org/kamoso/";
-    description = "Simple and friendly program to use your camera";
-    mainProgram = "kamoso";
-    license = with lib.licenses; [
-      lgpl21Only
-      gpl3Only
-    ];
-  };
-}
diff --git a/pkgs/applications/kde/kapman.nix b/pkgs/applications/kde/kapman.nix
deleted file mode 100644
index 2d736f974cdc..000000000000
--- a/pkgs/applications/kde/kapman.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  libkdegames,
-}:
-
-mkDerivation {
-  pname = "kapman";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.kapman";
-    description = "Clone of the well known game Pac-Man";
-    mainProgram = "kapman";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libkdegames
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/kapptemplate.nix b/pkgs/applications/kde/kapptemplate.nix
deleted file mode 100644
index 278e14a24427..000000000000
--- a/pkgs/applications/kde/kapptemplate.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  qtbase,
-  kactivities,
-}:
-mkDerivation {
-
-  pname = "kapptemplate";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    cmake
-  ];
-
-  buildInputs = [
-    kactivities
-    qtbase
-  ];
-
-  meta = with lib; {
-    description = "KDE App Code Template Generator";
-    mainProgram = "kapptemplate";
-    license = licenses.gpl2;
-    homepage = "https://kde.org/applications/en/development/org.kde.kapptemplate";
-    maintainers = [ maintainers.shamilton ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/kde/kasts.nix b/pkgs/applications/kde/kasts.nix
deleted file mode 100644
index 63913df1bb2c..000000000000
--- a/pkgs/applications/kde/kasts.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-  wrapGAppsHook3,
-
-  gst_all_1,
-  kconfig,
-  kcoreaddons,
-  ki18n,
-  kirigami-addons,
-  kirigami2,
-  networkmanager-qt,
-  qtkeychain,
-  qtmultimedia,
-  qtquickcontrols2,
-  syndication,
-  taglib,
-  threadweaver,
-}:
-
-let
-  inherit (gst_all_1)
-    gstreamer
-    gst-plugins-base
-    gst-plugins-good
-    gst-plugins-bad
-    ;
-in
-mkDerivation {
-  pname = "kasts";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    gst-plugins-bad
-    gst-plugins-base
-    gst-plugins-good
-    gstreamer
-
-    kconfig
-    kcoreaddons
-    ki18n
-    kirigami-addons
-    kirigami2
-    networkmanager-qt
-    qtkeychain
-    qtmultimedia
-    qtquickcontrols2
-    syndication
-    taglib
-    threadweaver
-  ];
-
-  preFixup = ''
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-  dontWrapGApps = true;
-
-  meta = with lib; {
-    description = "Mobile podcast application";
-    mainProgram = "kasts";
-    homepage = "https://apps.kde.org/kasts/";
-    # https://invent.kde.org/plasma-mobile/kasts/-/tree/master/LICENSES
-    license = with licenses; [
-      bsd2
-      cc-by-sa-40
-      cc0
-      gpl2Only
-      gpl2Plus
-      gpl3Only
-      gpl3Plus
-      lgpl3Plus
-    ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
deleted file mode 100644
index 6ac890208f57..000000000000
--- a/pkgs/applications/kde/kate.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kactivities,
-  kconfig,
-  kcrash,
-  kdbusaddons,
-  kguiaddons,
-  kiconthemes,
-  ki18n,
-  kinit,
-  kio,
-  kitemmodels,
-  kjobwidgets,
-  knewstuff,
-  knotifications,
-  konsole,
-  kparts,
-  ktexteditor,
-  kwindowsystem,
-  kwallet,
-  kxmlgui,
-  libgit2,
-  kuserfeedback,
-  plasma-framework,
-  qtscript,
-  threadweaver,
-  qtx11extras,
-}:
-
-mkDerivation {
-  pname = "kate";
-  meta = {
-    homepage = "https://apps.kde.org/kate/";
-    description = "Advanced text editor";
-    license = with lib.licenses; [
-      gpl3
-      lgpl3
-      lgpl2
-    ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-
-  # InitialPreference values are too high and end up making kate &
-  # kwrite defaults for anything considered text/plain. Resetting to
-  # 1, which is the default.
-  postPatch = ''
-    substituteInPlace apps/kate/data/org.kde.kate.desktop \
-      --replace InitialPreference=9 InitialPreference=1
-    substituteInPlace apps/kwrite/data/org.kde.kwrite.desktop \
-      --replace InitialPreference=8 InitialPreference=1
-  '';
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    libgit2
-    kactivities
-    ki18n
-    kio
-    ktexteditor
-    kwindowsystem
-    plasma-framework
-    qtscript
-    kconfig
-    kcrash
-    kguiaddons
-    kiconthemes
-    kinit
-    kjobwidgets
-    kparts
-    kxmlgui
-    kdbusaddons
-    kwallet
-    kitemmodels
-    knotifications
-    threadweaver
-    knewstuff
-    kuserfeedback
-    qtx11extras
-  ];
-  propagatedUserEnvPkgs = [ konsole ];
-}
diff --git a/pkgs/applications/kde/katomic.nix b/pkgs/applications/kde/katomic.nix
deleted file mode 100644
index b6b39e04365c..000000000000
--- a/pkgs/applications/kde/katomic.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  libkdegames,
-  knewstuff,
-}:
-
-mkDerivation {
-  pname = "katomic";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.katomic";
-    description = "Fun educational game built around molecular geometry";
-    mainProgram = "katomic";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    knewstuff
-    libkdegames
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/kblackbox.nix b/pkgs/applications/kde/kblackbox.nix
deleted file mode 100644
index 167a2d833011..000000000000
--- a/pkgs/applications/kde/kblackbox.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  libkdegames,
-}:
-
-mkDerivation {
-  pname = "kblackbox";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.kblackbox";
-    description = "Game of hide and seek played on a grid of boxes";
-    mainProgram = "kblackbox";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libkdegames
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/kblocks.nix b/pkgs/applications/kde/kblocks.nix
deleted file mode 100644
index 80107c310a39..000000000000
--- a/pkgs/applications/kde/kblocks.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  libkdegames,
-}:
-
-mkDerivation {
-  pname = "kblocks";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.kblocks";
-    description = "Classic falling blocks game";
-    mainProgram = "kblocks";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libkdegames
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/kbounce.nix b/pkgs/applications/kde/kbounce.nix
deleted file mode 100644
index 531f703489f9..000000000000
--- a/pkgs/applications/kde/kbounce.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  libkdegames,
-  kconfig,
-  kcrash,
-  kio,
-  ki18n,
-}:
-
-mkDerivation {
-  pname = "kbounce";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.kbounce";
-    description = "Single player arcade game with the elements of puzzle";
-    mainProgram = "kbounce";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libkdegames
-    kconfig
-    kcrash
-    kio
-    ki18n
-  ];
-}
diff --git a/pkgs/applications/kde/kbreakout.nix b/pkgs/applications/kde/kbreakout.nix
deleted file mode 100644
index 71ce5517667a..000000000000
--- a/pkgs/applications/kde/kbreakout.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  cmake,
-  kdbusaddons,
-  ki18n,
-  kconfigwidgets,
-  kcrash,
-  kxmlgui,
-  libkdegames,
-}:
-
-mkDerivation {
-  pname = "kbreakout";
-  meta = {
-    homepage = "https://apps.kde.org/kbreakout/";
-    description = "Breakout-like game";
-    mainProgram = "kbreakout";
-    license = with lib.licenses; [
-      lgpl21
-      gpl3
-    ];
-  };
-  outputs = [
-    "out"
-    "dev"
-  ];
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-  propagatedBuildInputs = [
-    kdbusaddons
-    ki18n
-    kconfigwidgets
-    kcrash
-    kxmlgui
-    libkdegames
-  ];
-}
diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
deleted file mode 100644
index db65a3ef4c29..000000000000
--- a/pkgs/applications/kde/kcachegrind.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  karchive,
-  ki18n,
-  kio,
-  perl,
-  python3,
-  php,
-  qttools,
-  kdbusaddons,
-  makeBinaryWrapper,
-  graphviz,
-}:
-
-mkDerivation {
-  pname = "kcachegrind";
-  meta = {
-    homepage = "https://apps.kde.org/kcachegrind/";
-    description = "Profiler frontend";
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ orivej ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeBinaryWrapper
-  ];
-  buildInputs = [
-    karchive
-    ki18n
-    kio
-    perl
-    python3
-    php
-    qttools
-    kdbusaddons
-  ];
-  postInstall = ''
-    wrapProgram $out/bin/kcachegrind \
-      --suffix PATH : "${lib.makeBinPath [ graphviz ]}"
-  '';
-}
diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix
deleted file mode 100644
index bbfc5661ebac..000000000000
--- a/pkgs/applications/kde/kcalc.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  gmp,
-  kconfig,
-  kconfigwidgets,
-  kcrash,
-  kguiaddons,
-  ki18n,
-  kinit,
-  knotifications,
-  kxmlgui,
-  mpfr,
-}:
-
-mkDerivation {
-  pname = "kcalc";
-  meta = {
-    homepage = "https://apps.kde.org/kcalc/";
-    description = "Scientific calculator";
-    mainProgram = "kcalc";
-    license = with lib.licenses; [ gpl2 ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    gmp
-    kconfig
-    kconfigwidgets
-    kcrash
-    kguiaddons
-    ki18n
-    kinit
-    knotifications
-    kxmlgui
-    mpfr
-  ];
-}
diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix
deleted file mode 100644
index 3cfbc789a508..000000000000
--- a/pkgs/applications/kde/kcalutils.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  grantlee,
-  kcalendarcore,
-  kconfig,
-  kontactinterface,
-  kcoreaddons,
-  kidentitymanagement,
-  kpimtextedit,
-}:
-
-mkDerivation {
-  pname = "kcalutils";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    grantlee
-    kcalendarcore
-    kconfig
-    kontactinterface
-    kcoreaddons
-    kidentitymanagement
-    kpimtextedit
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/kcharselect.nix b/pkgs/applications/kde/kcharselect.nix
deleted file mode 100644
index 5f92632cda85..000000000000
--- a/pkgs/applications/kde/kcharselect.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kbookmarks,
-  kconfig,
-  kconfigwidgets,
-  kcrash,
-  kcoreaddons,
-  ki18n,
-  kwidgetsaddons,
-  kxmlgui,
-}:
-
-mkDerivation {
-  pname = "kcharselect";
-  meta = {
-    homepage = "https://apps.kde.org/kcharselect/";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.schmittlauch ];
-    description = "Tool to select special characters from all installed fonts and copy them into the clipboard";
-    mainProgram = "kcharselect";
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kbookmarks
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kcrash
-    ki18n
-    kwidgetsaddons
-    kxmlgui
-  ];
-  enableParallelBuilding = true;
-}
diff --git a/pkgs/applications/kde/kclock.nix b/pkgs/applications/kde/kclock.nix
deleted file mode 100644
index 9a2abb608294..000000000000
--- a/pkgs/applications/kde/kclock.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-
-  kconfig,
-  kcoreaddons,
-  kdbusaddons,
-  ki18n,
-  kirigami-addons,
-  kirigami2,
-  knotifications,
-  plasma-framework,
-  qtmultimedia,
-  qtquickcontrols2,
-}:
-
-mkDerivation {
-  pname = "kclock";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kconfig
-    kcoreaddons
-    kdbusaddons
-    ki18n
-    kirigami-addons
-    kirigami2
-    knotifications
-    plasma-framework
-    qtmultimedia
-    qtquickcontrols2
-  ];
-
-  meta = with lib; {
-    description = "Clock app for plasma mobile";
-    homepage = "https://invent.kde.org/plasma-mobile/kclock";
-    license = licenses.gpl2Plus;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix
deleted file mode 100644
index 2a9777388b1c..000000000000
--- a/pkgs/applications/kde/kcolorchooser.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  ki18n,
-  kwidgetsaddons,
-  kxmlgui,
-}:
-
-mkDerivation {
-  pname = "kcolorchooser";
-  meta = {
-    homepage = "https://apps.kde.org/kcolorchooser/";
-    description = "Color chooser";
-    mainProgram = "kcolorchooser";
-    license = with lib.licenses; [ mit ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    ki18n
-    kwidgetsaddons
-    kxmlgui
-  ];
-}
diff --git a/pkgs/applications/kde/kde-inotify-survey.nix b/pkgs/applications/kde/kde-inotify-survey.nix
deleted file mode 100644
index 9fa9c91758e8..000000000000
--- a/pkgs/applications/kde/kde-inotify-survey.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kauth,
-  kcoreaddons,
-  kdbusaddons,
-  ki18n,
-  knotifications,
-}:
-
-mkDerivation {
-  pname = "kde-inotify-survey";
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-
-  buildInputs = [
-    kauth
-    kcoreaddons
-    kdbusaddons
-    ki18n
-    knotifications
-  ];
-
-  meta = {
-    description = "Tooling for monitoring inotify limits and informing the user when they have been or about to be reached";
-    mainProgram = "kde-inotify-survey";
-    homepage = "https://invent.kde.org/system/kde-inotify-survey";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix
deleted file mode 100644
index 968096d66871..000000000000
--- a/pkgs/applications/kde/kdebugsettings.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  gettext,
-  kcoreaddons,
-  kconfig,
-  kdbusaddons,
-  kwidgetsaddons,
-  kitemviews,
-  kcompletion,
-  kxmlgui,
-  python3,
-}:
-
-mkDerivation {
-  pname = "kdebugsettings";
-  meta = {
-    homepage = "https://apps.kde.org/kdebugsettings/";
-    description = "KDE debug settings";
-    mainProgram = "kdebugsettings";
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = [ ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    gettext
-    kcoreaddons
-    kconfig
-    kdbusaddons
-    kwidgetsaddons
-    kitemviews
-    kcompletion
-    kxmlgui
-    python3
-  ];
-  propagatedUserEnvPkgs = [ ];
-}
diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix
deleted file mode 100644
index 736a25ec58fd..000000000000
--- a/pkgs/applications/kde/kdeconnect-kde.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kcmutils,
-  kconfigwidgets,
-  kdbusaddons,
-  kdoctools,
-  ki18n,
-  kiconthemes,
-  kio,
-  kirigami2,
-  kirigami-addons,
-  knotifications,
-  kpeople,
-  kpeoplevcard,
-  kwayland,
-  lib,
-  libXtst,
-  libfakekey,
-  makeWrapper,
-  modemmanager-qt,
-  pulseaudio-qt,
-  qca-qt5,
-  qqc2-desktop-style,
-  qtgraphicaleffects,
-  qtmultimedia,
-  qtquickcontrols2,
-  qtx11extras,
-  breeze-icons,
-  sshfs,
-  wayland,
-  wayland-protocols,
-  wayland-scanner,
-  plasma-wayland-protocols,
-}:
-
-mkDerivation {
-  pname = "kdeconnect-kde";
-
-  buildInputs = [
-    kcmutils
-    kconfigwidgets
-    kdbusaddons
-    ki18n
-    kiconthemes
-    kio
-    kirigami2
-    kirigami-addons
-    knotifications
-    kpeople
-    kpeoplevcard
-    kwayland
-    libXtst
-    libfakekey
-    modemmanager-qt
-    pulseaudio-qt
-    qca-qt5
-    qqc2-desktop-style
-    qtgraphicaleffects
-    qtmultimedia
-    qtquickcontrols2
-    qtx11extras
-    wayland
-    wayland-protocols
-    wayland-scanner
-    plasma-wayland-protocols
-    # otherwise buttons are blank on non-kde
-    breeze-icons
-  ];
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeWrapper
-  ];
-
-  qtWrapperArgs = [
-    "--prefix PATH : ${lib.makeBinPath [ sshfs ]}"
-  ];
-
-  meta = with lib; {
-    description = "KDE Connect provides several features to integrate your phone and your computer";
-    homepage = "https://community.kde.org/KDEConnect";
-    license = with licenses; [ gpl2 ];
-    mainProgram = "kdeconnect-app";
-  };
-}
diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix
deleted file mode 100644
index 221e8bbabcf1..000000000000
--- a/pkgs/applications/kde/kdegraphics-mobipocket.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kio,
-}:
-
-mkDerivation {
-  pname = "kdegraphics-mobipocket";
-  meta = {
-    license = [ lib.licenses.gpl2Plus ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kio ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix b/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix
deleted file mode 100644
index f3b59d245338..000000000000
--- a/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  ghostscript,
-  replaceVars,
-  extra-cmake-modules,
-  karchive,
-  kio,
-  libkexiv2,
-  libkdcraw,
-  kdegraphics-mobipocket,
-}:
-
-mkDerivation {
-  pname = "kdegraphics-thumbnailers";
-  meta = {
-    license = [ lib.licenses.lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    karchive
-    kio
-    libkexiv2
-    libkdcraw
-    kdegraphics-mobipocket
-  ];
-
-  patches = [
-    # Hardcode patches to Ghostscript so PDF thumbnails work OOTB.
-    # Intentionally not doing the same for dvips because TeX is big.
-    (replaceVars ./gs-paths.patch {
-      gs = "${ghostscript}/bin/gs";
-    })
-  ];
-}
diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch b/pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch
deleted file mode 100644
index 5aa4a8d7444c..000000000000
--- a/pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/ps/gscreator.cpp b/ps/gscreator.cpp
-index 5b84e49..cbb7c25 100644
---- a/ps/gscreator.cpp
-+++ b/ps/gscreator.cpp
-@@ -101,7 +101,7 @@ static const char *epsprolog =
-     "[ ] 0 setdash newpath false setoverprint false setstrokeadjust\n";
- 
- static const char * gsargs_ps[] = {
--    "gs",
-+    "@gs@",
-     "-sDEVICE=png16m",
-     "-sOutputFile=-",
-     "-dSAFER",
-@@ -120,7 +120,7 @@ static const char * gsargs_ps[] = {
- };
- 
- static const char * gsargs_eps[] = {
--    "gs",
-+    "@gs@",
-     "-sDEVICE=png16m",
-     "-sOutputFile=-",
-     "-dSAFER",
diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix
deleted file mode 100644
index 8300986b634e..000000000000
--- a/pkgs/applications/kde/kdenetwork-filesharing.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kcoreaddons,
-  kdeclarative,
-  ki18n,
-  kio,
-  kwidgetsaddons,
-  samba,
-  qcoro,
-}:
-
-mkDerivation {
-  pname = "kdenetwork-filesharing";
-  meta = {
-    license = [
-      lib.licenses.gpl2
-      lib.licenses.lgpl21
-    ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcoreaddons
-    kdeclarative
-    ki18n
-    kio
-    kwidgetsaddons
-    samba
-    qcoro
-  ];
-}
diff --git a/pkgs/applications/kde/kdenlive/default.nix b/pkgs/applications/kde/kdenlive/default.nix
deleted file mode 100644
index 5aa4c40fef19..000000000000
--- a/pkgs/applications/kde/kdenlive/default.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  mkDerivation,
-  replaceVars,
-  lib,
-  extra-cmake-modules,
-  breeze-icons,
-  breeze-qt5,
-  kdoctools,
-  kconfig,
-  kcrash,
-  kguiaddons,
-  kiconthemes,
-  ki18n,
-  kinit,
-  kdbusaddons,
-  knotifications,
-  knewstuff,
-  karchive,
-  knotifyconfig,
-  kplotting,
-  ktextwidgets,
-  mediainfo,
-  mlt,
-  shared-mime-info,
-  libv4l,
-  kfilemetadata,
-  ffmpeg-full,
-  frei0r,
-  phonon-backend-gstreamer,
-  qtdeclarative,
-  qtmultimedia,
-  qtnetworkauth,
-  qtquickcontrols2,
-  qtscript,
-  rttr,
-  kpurpose,
-  kdeclarative,
-  wrapGAppsHook3,
-  glaxnimate,
-}:
-
-let
-  mlt-full = mlt.override {
-    ffmpeg = ffmpeg-full;
-  };
-in
-mkDerivation {
-  pname = "kdenlive";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    breeze-icons
-    breeze-qt5
-    kconfig
-    kcrash
-    kdbusaddons
-    kfilemetadata
-    kguiaddons
-    ki18n
-    kiconthemes
-    kinit
-    knotifications
-    knewstuff
-    karchive
-    knotifyconfig
-    kplotting
-    ktextwidgets
-    mediainfo
-    mlt-full
-    phonon-backend-gstreamer
-    qtdeclarative
-    qtmultimedia
-    qtnetworkauth
-    qtquickcontrols2
-    qtscript
-    shared-mime-info
-    libv4l
-    ffmpeg-full
-    frei0r
-    rttr
-    kpurpose
-    kdeclarative
-    wrapGAppsHook3
-  ];
-
-  # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it
-  # doesn't find them. See:
-  # https://github.com/NixOS/nixpkgs/issues/83885
-  patches = [
-    (replaceVars ./dependency-paths.patch {
-      inherit mediainfo glaxnimate;
-      ffmpeg = ffmpeg-full;
-      mlt = mlt-full;
-    })
-  ];
-
-  postPatch =
-    # Module Qt5::Concurrent must be included in `find_package` before it is used.
-    ''
-      sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
-    '';
-
-  dontWrapGApps = true;
-
-  # Frei0r path needs to be set too or Kdenlive will complain. See:
-  # https://github.com/NixOS/nixpkgs/issues/83885
-  # https://github.com/NixOS/nixpkgs/issues/29614#issuecomment-488849325
-  qtWrapperArgs = [
-    "--set FREI0R_PATH ${frei0r}/lib/frei0r-1"
-  ];
-
-  preFixup = ''
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
-  meta = {
-    homepage = "https://apps.kde.org/kdenlive/";
-    description = "Video editor";
-    license = with lib.licenses; [ gpl2Plus ];
-    maintainers = with lib.maintainers; [ turion ];
-  };
-}
diff --git a/pkgs/applications/kde/kdenlive/dependency-paths.patch b/pkgs/applications/kde/kdenlive/dependency-paths.patch
deleted file mode 100644
index 013960377268..000000000000
--- a/pkgs/applications/kde/kdenlive/dependency-paths.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -u b/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
---- b/src/kdenlivesettings.kcfg
-+++ b/src/kdenlivesettings.kcfg
-@@ -517,7 +517,7 @@
-   <group name="env">
-     <entry name="mltpath" type="Path">
-       <label>Mlt framework install path.</label>
--      <default></default>
-+      <default>@mlt@/share/mlt/profiles</default>
-     </entry>
- 
-     <entry name="kdenliverendererpath" type="Path">
-@@ -527,27 +527,27 @@
- 
-     <entry name="meltpath" type="Path">
-       <label>Mlt melt renderer install path.</label>
--      <default></default>
-+      <default>@mlt@/bin/melt</default>
-     </entry>
- 
-     <entry name="ffmpegpath" type="Path">
-       <label>FFmpeg / Libav binary path.</label>
--      <default></default>
-+      <default>@ffmpeg@/bin/ffmpeg</default>
-     </entry>
- 
-     <entry name="ffplaypath" type="Path">
-       <label>FFplay / avplay binary path.</label>
--      <default></default>
-+      <default>@ffmpeg@/bin/ffplay</default>
-     </entry>
- 
-     <entry name="ffprobepath" type="Path">
-       <label>FFprobe / avprobe binary path.</label>
--      <default></default>
-+      <default>@ffmpeg@/bin/ffprobe</default>
-     </entry>
- 
-     <entry name="mediainfopath" type="Path">
-       <label>mediaInfo binary path.</label>
--      <default></default>
-+      <default>@mediainfo@/bin/mediainfo</default>
-     </entry>
- 
-     <entry name="processingthreads" type="Int">
-@@ -657,5 +657,5 @@
-     <entry name="glaxnimatePath" type="String">
-       <label>Path to the Glaxnimate application.</label>
--      <default></default>
-+      <default>@glaxnimate@/bin/glaxnimate</default>
-     </entry>
-     <entry name="nice_tasks" type="Bool">
diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix
deleted file mode 100644
index e86e774416eb..000000000000
--- a/pkgs/applications/kde/kdepim-addons.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  shared-mime-info,
-  akonadi-import-wizard,
-  akonadi-notes,
-  calendarsupport,
-  eventviews,
-  incidenceeditor,
-  kcalendarcore,
-  kcalutils,
-  kconfig,
-  kdbusaddons,
-  kdeclarative,
-  kholidays,
-  ki18n,
-  kmime,
-  ktexteditor,
-  ktnef,
-  libgravatar,
-  libksieve,
-  mailcommon,
-  mailimporter,
-  messagelib,
-  poppler,
-  prison,
-  kpkpass,
-  kitinerary,
-  kontactinterface,
-  kaddressbook,
-  discount,
-}:
-
-mkDerivation {
-  pname = "kdepim-addons";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    shared-mime-info
-  ];
-  buildInputs = [
-    akonadi-import-wizard
-    akonadi-notes
-    calendarsupport
-    eventviews
-    incidenceeditor
-    kcalendarcore
-    kcalutils
-    kconfig
-    kdbusaddons
-    kdeclarative
-    kholidays
-    ki18n
-    kmime
-    ktexteditor
-    ktnef
-    libgravatar
-    libksieve
-    mailcommon
-    mailimporter
-    messagelib
-    poppler
-    prison
-    kpkpass
-    kitinerary
-    kontactinterface
-    kaddressbook
-    discount
-  ];
-}
diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix
deleted file mode 100644
index 5287737fb4b1..000000000000
--- a/pkgs/applications/kde/kdepim-runtime/default.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  shared-mime-info,
-  akonadi,
-  akonadi-calendar,
-  akonadi-contacts,
-  akonadi-mime,
-  akonadi-notes,
-  cyrus_sasl,
-  kholidays,
-  kcalutils,
-  kcontacts,
-  kdav,
-  kidentitymanagement,
-  kimap,
-  kldap,
-  kmailtransport,
-  kmbox,
-  kmime,
-  knotifications,
-  knotifyconfig,
-  pimcommon,
-  libkgapi,
-  libsecret,
-  qca-qt5,
-  qtkeychain,
-  qtnetworkauth,
-  qtspeech,
-  qtwebengine,
-  qtxmlpatterns,
-}:
-
-mkDerivation {
-  pname = "kdepim-runtime";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    shared-mime-info
-  ];
-  buildInputs = [
-    akonadi
-    akonadi-calendar
-    akonadi-contacts
-    akonadi-mime
-    akonadi-notes
-    kholidays
-    kcalutils
-    kcontacts
-    kdav
-    kidentitymanagement
-    kimap
-    kldap
-    kmailtransport
-    kmbox
-    kmime
-    knotifications
-    knotifyconfig
-    qtwebengine
-    pimcommon
-    libkgapi
-    libsecret
-    qca-qt5
-    qtkeychain
-    qtnetworkauth
-    qtspeech
-    qtxmlpatterns
-  ];
-  qtWrapperArgs = [
-    "--prefix SASL_PATH : ${
-      lib.makeSearchPath "lib/sasl2" [
-        cyrus_sasl.out
-        libkgapi
-      ]
-    }"
-  ];
-}
diff --git a/pkgs/applications/kde/kdevelop/kdev-php.nix b/pkgs/applications/kde/kdevelop/kdev-php.nix
deleted file mode 100644
index b8b3cff36bc9..000000000000
--- a/pkgs/applications/kde/kdevelop/kdev-php.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  cmake,
-  extra-cmake-modules,
-  threadweaver,
-  ktexteditor,
-  kdevelop-unwrapped,
-  kdevelop-pg-qt,
-}:
-
-mkDerivation {
-  pname = "kdev-php";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kdevelop-pg-qt
-    threadweaver
-    ktexteditor
-    kdevelop-unwrapped
-  ];
-
-  dontWrapQtApps = true;
-
-  meta = with lib; {
-    maintainers = [ maintainers.aanderse ];
-    platforms = platforms.linux;
-    description = "PHP support for KDevelop";
-    homepage = "https://www.kdevelop.org";
-    license = [ licenses.gpl2 ];
-  };
-}
diff --git a/pkgs/applications/kde/kdevelop/kdev-python.nix b/pkgs/applications/kde/kdevelop/kdev-python.nix
deleted file mode 100644
index 284732de3037..000000000000
--- a/pkgs/applications/kde/kdevelop/kdev-python.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  cmake,
-  extra-cmake-modules,
-  threadweaver,
-  ktexteditor,
-  kdevelop-unwrapped,
-  python3,
-}:
-
-mkDerivation {
-  pname = "kdev-python";
-
-  cmakeFlags = [
-    "-DPYTHON_EXECUTABLE=${lib.getExe python3}"
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    threadweaver
-    ktexteditor
-    kdevelop-unwrapped
-  ];
-
-  dontWrapQtApps = true;
-
-  meta = with lib; {
-    maintainers = [ maintainers.aanderse ];
-    platforms = platforms.linux;
-    description = "Python support for KDevelop";
-    homepage = "https://www.kdevelop.org";
-    license = [ licenses.gpl2 ];
-  };
-}
diff --git a/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix
deleted file mode 100644
index f164e3f2e96f..000000000000
--- a/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  cmake,
-  pkg-config,
-  extra-cmake-modules,
-  qtbase,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "kdevelop-pg-qt";
-  version = "2.2.2";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
-    sha256 = "sha256-PVZgTEefjwSuMqUj7pHzB4xxcRfQ3rOelz4iSUy7ZfE=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    extra-cmake-modules
-  ];
-
-  buildInputs = [ qtbase ];
-
-  dontWrapQtApps = true;
-
-  meta = with lib; {
-    maintainers = [ maintainers.ambrop72 ];
-    platforms = platforms.linux;
-    description = "Parser-generator from KDevplatform";
-    mainProgram = "kdev-pg-qt";
-    longDescription = ''
-      KDevelop-PG-Qt is the parser-generator from KDevplatform.
-      It is used for some KDevelop-languagesupport-plugins (Ruby, PHP, CSS...).
-    '';
-    homepage = "https://www.kdevelop.org";
-    license = with lib.licenses; [ lgpl2Plus ];
-  };
-}
diff --git a/pkgs/applications/kde/kdevelop/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix
deleted file mode 100644
index f1380474496b..000000000000
--- a/pkgs/applications/kde/kdevelop/kdevelop.nix
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  cmake,
-  gettext,
-  pkg-config,
-  extra-cmake-modules,
-  qtquickcontrols,
-  qttools,
-  kde-cli-tools,
-  kconfig,
-  kdeclarative,
-  kdoctools,
-  kiconthemes,
-  ki18n,
-  kitemmodels,
-  kitemviews,
-  kjobwidgets,
-  kcmutils,
-  kio,
-  knewstuff,
-  knotifyconfig,
-  kparts,
-  ktexteditor,
-  threadweaver,
-  kxmlgui,
-  kwindowsystem,
-  grantlee,
-  kcrash,
-  karchive,
-  kguiaddons,
-  plasma-framework,
-  krunner,
-  kdevelop-pg-qt,
-  shared-mime-info,
-  libkomparediff2,
-  libksysguard,
-  konsole,
-  llvmPackages_13,
-  makeWrapper,
-  kpurpose,
-  boost,
-  qtwebengine,
-  cppcheck,
-}:
-
-let
-  llvmPackages = llvmPackages_13;
-in
-mkDerivation {
-  pname = "kdevelop";
-
-  nativeBuildInputs = [
-    cmake
-    gettext
-    pkg-config
-    extra-cmake-modules
-    makeWrapper
-  ];
-
-  buildInputs = [
-    kdevelop-pg-qt
-    llvmPackages.llvm
-    llvmPackages.libclang
-  ];
-
-  propagatedBuildInputs = [
-    qtquickcontrols
-    boost
-    libkomparediff2
-    kconfig
-    kdeclarative
-    kdoctools
-    kiconthemes
-    ki18n
-    kitemmodels
-    kitemviews
-    kjobwidgets
-    kcmutils
-    kio
-    knewstuff
-    knotifyconfig
-    kparts
-    ktexteditor
-    threadweaver
-    kxmlgui
-    kwindowsystem
-    grantlee
-    plasma-framework
-    krunner
-    shared-mime-info
-    libksysguard
-    konsole
-    kcrash
-    karchive
-    kguiaddons
-    kpurpose
-    cppcheck
-    qtwebengine
-  ];
-
-  # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b
-  # required as nixos seems to be unable to find CLANG_BUILTIN_DIR
-  cmakeFlags = [
-    "-DCLANG_BUILTIN_DIR=${lib.getLib llvmPackages.libclang}/lib/clang/${lib.getVersion llvmPackages.clang}/include"
-  ];
-
-  dontWrapQtApps = true;
-
-  postInstall = ''
-    # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH.
-    wrapProgram "$out/bin/kdevelop!" \
-      --prefix PATH ":" "${
-        lib.makeBinPath [
-          qttools
-          kde-cli-tools
-        ]
-      }"
-
-    wrapQtApp "$out/bin/kdevelop"
-
-    # Fix the (now wrapped) kdevelop! to find things in right places:
-    # - Fixup the one use where KDEV_BASEDIR is assumed to contain kdevelop.
-    kdev_fixup_sed+=";s|\\\$KDEV_BASEDIR/kdevelop|$out/bin/kdevelop|"
-    sed -E -i "$kdev_fixup_sed" "$out/bin/.kdevelop!-wrapped"
-  '';
-
-  meta = with lib; {
-    maintainers = [ maintainers.ambrop72 ];
-    platforms = platforms.linux;
-    description = "KDE official IDE";
-    longDescription = ''
-      A free, opensource IDE (Integrated Development Environment)
-      for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a
-      feature-full, plugin extendable IDE for C/C++ and other
-      programming languages. It is based on KDevPlatform, KDE and Qt
-      libraries and is under development since 1998.
-    '';
-    homepage = "https://www.kdevelop.org";
-    license = with licenses; [
-      gpl2Plus
-      lgpl2Plus
-    ];
-  };
-}
diff --git a/pkgs/applications/kde/kdevelop/wrapper.nix b/pkgs/applications/kde/kdevelop/wrapper.nix
deleted file mode 100644
index 757e4d5db8d3..000000000000
--- a/pkgs/applications/kde/kdevelop/wrapper.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  lib,
-  symlinkJoin,
-  kdevelop-unwrapped,
-  plugins ? null,
-}:
-
-symlinkJoin {
-  name = "kdevelop-with-plugins";
-
-  paths = [ kdevelop-unwrapped ] ++ (lib.optionals (plugins != null) plugins);
-}
diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix
deleted file mode 100644
index 931d0ce88feb..000000000000
--- a/pkgs/applications/kde/kdf.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kcmutils,
-  ki18n,
-  kiconthemes,
-  kio,
-  knotifications,
-  kxmlgui,
-}:
-
-mkDerivation {
-  pname = "kdf";
-  meta = {
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = [ lib.maintainers.peterhoeg ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcmutils
-    ki18n
-    kiconthemes
-    kio
-    knotifications
-    kxmlgui
-  ];
-}
diff --git a/pkgs/applications/kde/kdialog.nix b/pkgs/applications/kde/kdialog.nix
deleted file mode 100644
index 857ce19890f5..000000000000
--- a/pkgs/applications/kde/kdialog.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kinit,
-  kguiaddons,
-  kwindowsystem,
-}:
-
-mkDerivation {
-  pname = "kdialog";
-
-  meta = {
-    homepage = "https://apps.kde.org/kdialog/";
-    description = "Display dialog boxes from shell scripts";
-    license = with lib.licenses; [
-      gpl2Plus
-      fdl12Plus
-    ];
-    maintainers = with lib.maintainers; [ peterhoeg ];
-  };
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  propagatedBuildInputs = [
-    kinit
-    kguiaddons
-    kwindowsystem
-  ];
-}
diff --git a/pkgs/applications/kde/kdiamond.nix b/pkgs/applications/kde/kdiamond.nix
deleted file mode 100644
index 8415deb26180..000000000000
--- a/pkgs/applications/kde/kdiamond.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  libkdegames,
-  kconfig,
-  knotifyconfig,
-}:
-
-mkDerivation {
-  pname = "kdiamond";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.kdiamond";
-    description = "Single player puzzle game";
-    mainProgram = "kdiamond";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libkdegames
-    knotifyconfig
-    kconfig
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/keditbookmarks.nix b/pkgs/applications/kde/keditbookmarks.nix
deleted file mode 100644
index f5fa35591c80..000000000000
--- a/pkgs/applications/kde/keditbookmarks.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kio,
-  kparts,
-  kwindowsystem,
-}:
-
-mkDerivation {
-  pname = "keditbookmarks";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kio
-    kparts
-    kwindowsystem
-  ];
-  meta = with lib; {
-    homepage = "http://www.kde.org";
-    license = with licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-      bsd3
-    ];
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/kde/keysmith.nix b/pkgs/applications/kde/keysmith.nix
deleted file mode 100644
index 06de93c408f7..000000000000
--- a/pkgs/applications/kde/keysmith.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-
-  kdbusaddons,
-  ki18n,
-  kirigami2,
-  kirigami-addons,
-  kwindowsystem,
-  libsodium,
-  qtquickcontrols2,
-}:
-
-mkDerivation {
-  pname = "keysmith";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kdbusaddons
-    ki18n
-    kirigami2
-    kirigami-addons
-    kwindowsystem
-    libsodium
-    qtquickcontrols2
-  ];
-
-  meta = with lib; {
-    description = "OTP client for Plasma Mobile and Desktop";
-    mainProgram = "keysmith";
-    license = licenses.gpl3;
-    homepage = "https://github.com/KDE/keysmith";
-    maintainers = with maintainers; [ shamilton ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/kde/kfind.nix b/pkgs/applications/kde/kfind.nix
deleted file mode 100644
index 70b79716dc3d..000000000000
--- a/pkgs/applications/kde/kfind.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  karchive,
-  kcoreaddons,
-  kfilemetadata,
-  ktextwidgets,
-  kwidgetsaddons,
-  kio,
-}:
-
-mkDerivation {
-  pname = "kfind";
-  meta = {
-    homepage = "https://apps.kde.org/kfind/";
-    description = "Find files/folders";
-    mainProgram = "kfind";
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = [ lib.maintainers.iblech ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    karchive
-    kcoreaddons
-    kfilemetadata
-    ktextwidgets
-    kwidgetsaddons
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/kgeography.nix b/pkgs/applications/kde/kgeography.nix
deleted file mode 100644
index e38c3a12bf92..000000000000
--- a/pkgs/applications/kde/kgeography.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  cmake,
-  extra-cmake-modules,
-  qtbase,
-  kconfigwidgets,
-  kxmlgui,
-  kcrash,
-  kdoctools,
-  kitemviews,
-}:
-
-mkDerivation {
-  pname = "kgeography";
-  meta = {
-    homepage = "https://apps.kde.org/kgeography/";
-    description = "Geography trainer";
-    mainProgram = "kgeography";
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = [ lib.maintainers.globin ];
-  };
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    qtbase
-    kconfigwidgets
-    kxmlgui
-    kcrash
-    kdoctools
-    kitemviews
-  ];
-}
diff --git a/pkgs/applications/kde/kget.nix b/pkgs/applications/kde/kget.nix
deleted file mode 100644
index d086b193cf80..000000000000
--- a/pkgs/applications/kde/kget.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kdelibs4support,
-  libgcrypt,
-  libktorrent,
-  qca-qt5,
-  qgpgme,
-  kcmutils,
-  kcompletion,
-  kcoreaddons,
-  knotifyconfig,
-  kparts,
-  kwallet,
-  kwidgetsaddons,
-  kwindowsystem,
-  kxmlgui,
-}:
-
-mkDerivation {
-  pname = "kget";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  buildInputs = [
-    kdelibs4support
-    libgcrypt
-    libktorrent
-    qca-qt5
-    qgpgme
-    kcmutils
-    kcompletion
-    kcoreaddons
-    knotifyconfig
-    kparts
-    kwallet
-    kwidgetsaddons
-    kwindowsystem
-    kxmlgui
-  ];
-
-  meta = with lib; {
-    homepage = "https://apps.kde.org/kget/";
-    description = "Download manager";
-    mainProgram = "kget";
-    license = with licenses; [ gpl2 ];
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-}
diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix
deleted file mode 100644
index 8c4faa87f727..000000000000
--- a/pkgs/applications/kde/kgpg.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  makeWrapper,
-  akonadi-contacts,
-  gnupg,
-  karchive,
-  kcodecs,
-  kcontacts,
-  kcoreaddons,
-  kcrash,
-  kdbusaddons,
-  kiconthemes,
-  kjobwidgets,
-  kio,
-  knotifications,
-  kservice,
-  ktextwidgets,
-  kxmlgui,
-  kwidgetsaddons,
-  kwindowsystem,
-  qgpgme,
-}:
-
-mkDerivation {
-  pname = "kgpg";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeWrapper
-  ];
-  buildInputs = [
-    akonadi-contacts
-    gnupg
-    karchive
-    kcodecs
-    kcontacts
-    kcoreaddons
-    kcrash
-    kdbusaddons
-    ki18n
-    kiconthemes
-    kjobwidgets
-    kio
-    knotifications
-    kservice
-    ktextwidgets
-    kxmlgui
-    kwidgetsaddons
-    kwindowsystem
-    qgpgme
-  ];
-  postFixup = ''
-    wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg ]}"
-  '';
-  meta = {
-    homepage = "https://apps.kde.org/kgpg/";
-    description = "KDE based interface for GnuPG, a powerful encryption utility";
-    mainProgram = "kgpg";
-    license = [ lib.licenses.gpl2 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix
deleted file mode 100644
index 838705a3812e..000000000000
--- a/pkgs/applications/kde/khelpcenter.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  grantlee,
-  kcmutils,
-  kconfig,
-  kcoreaddons,
-  kdbusaddons,
-  ki18n,
-  kinit,
-  khtml,
-  kservice,
-  xapian,
-}:
-
-mkDerivation {
-  pname = "khelpcenter";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    grantlee
-    kcmutils
-    kconfig
-    kcoreaddons
-    kdbusaddons
-    khtml
-    ki18n
-    kinit
-    kservice
-    xapian
-  ];
-
-  preFixup = ''
-    qtWrapperArgs+=(
-      --prefix MANPATH : /nix/var/nix/profiles/system/sw/share/man
-    )
-  '';
-
-  meta = with lib; {
-    homepage = "https://apps.kde.org/help/";
-    description = "Help center";
-    mainProgram = "khelpcenter";
-    license = licenses.gpl2Plus;
-  };
-}
diff --git a/pkgs/applications/kde/kidentitymanagement.nix b/pkgs/applications/kde/kidentitymanagement.nix
deleted file mode 100644
index 024bed81044b..000000000000
--- a/pkgs/applications/kde/kidentitymanagement.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  kcompletion,
-  kcoreaddons,
-  kemoticons,
-  kiconthemes,
-  kio,
-  kpimtextedit,
-  ktextwidgets,
-  kxmlgui,
-}:
-
-mkDerivation {
-  pname = "kidentitymanagement";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcompletion
-    kemoticons
-    kiconthemes
-    kio
-    ktextwidgets
-    kxmlgui
-  ];
-  propagatedBuildInputs = [
-    kcoreaddons
-    kpimtextedit
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix
deleted file mode 100644
index 9eb9c3e7a853..000000000000
--- a/pkgs/applications/kde/kig.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  boost,
-  karchive,
-  kcrash,
-  kiconthemes,
-  kparts,
-  ktexteditor,
-  qtsvg,
-  qtxmlpatterns,
-}:
-
-mkDerivation {
-  pname = "kig";
-  meta = {
-    homepage = "https://apps.kde.org/kig/";
-    description = "Interactive geometry";
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ raskin ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    boost
-    karchive
-    kcrash
-    kiconthemes
-    kparts
-    ktexteditor
-    qtsvg
-    qtxmlpatterns
-  ];
-}
diff --git a/pkgs/applications/kde/kigo.nix b/pkgs/applications/kde/kigo.nix
deleted file mode 100644
index d6780752c546..000000000000
--- a/pkgs/applications/kde/kigo.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  libkdegames,
-  knewstuff,
-}:
-
-mkDerivation {
-  pname = "kigo";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.kigo";
-    description = "Open-source implementation of the popular Go game";
-    mainProgram = "kigo";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libkdegames
-    knewstuff
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/killbots.nix b/pkgs/applications/kde/killbots.nix
deleted file mode 100644
index dd3500be7ffa..000000000000
--- a/pkgs/applications/kde/killbots.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  libkdegames,
-}:
-
-mkDerivation {
-  pname = "killbots";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.killbots";
-    description = "Game where you avoid robots";
-    mainProgram = "killbots";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libkdegames
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/kimap.nix b/pkgs/applications/kde/kimap.nix
deleted file mode 100644
index fd0a21d4312e..000000000000
--- a/pkgs/applications/kde/kimap.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  cyrus_sasl,
-  kcoreaddons,
-  ki18n,
-  kio,
-  kmime,
-  kitemmodels,
-}:
-
-mkDerivation {
-  pname = "kimap";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    ki18n
-    kio
-  ];
-  propagatedBuildInputs = [
-    cyrus_sasl
-    kcoreaddons
-    kmime
-    kitemmodels
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/kio-admin.nix b/pkgs/applications/kde/kio-admin.nix
deleted file mode 100644
index 824ef5edb66e..000000000000
--- a/pkgs/applications/kde/kio-admin.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  qtbase,
-  kio,
-  ki18n,
-  polkit-qt,
-}:
-
-mkDerivation {
-  pname = "kio-admin";
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    qtbase
-    kio
-    ki18n
-    polkit-qt
-  ];
-
-  meta = with lib; {
-    description = "Manage files as administrator using the admin:// KIO protocol";
-    homepage = "https://invent.kde.org/system/kio-admin";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ k900 ];
-  };
-}
diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix
deleted file mode 100644
index 918c74301ad5..000000000000
--- a/pkgs/applications/kde/kio-extras.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  shared-mime-info,
-  exiv2,
-  kactivities,
-  kactivities-stats,
-  karchive,
-  kbookmarks,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  kdbusaddons,
-  kdsoap,
-  kguiaddons,
-  kdnssd,
-  kiconthemes,
-  ki18n,
-  kio,
-  khtml,
-  kpty,
-  syntax-highlighting,
-  libmtp,
-  libssh,
-  openexr,
-  libtirpc,
-  phonon,
-  qtsvg,
-  samba,
-  solid,
-  gperf,
-  taglib,
-  libX11,
-  libXcursor,
-}:
-
-mkDerivation {
-  pname = "kio-extras";
-  meta = {
-    license = with lib.licenses; [
-      gpl2
-      lgpl21
-    ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    shared-mime-info
-  ];
-  buildInputs = [
-    exiv2
-    kactivities
-    kactivities-stats
-    karchive
-    kbookmarks
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kdbusaddons
-    kdsoap
-    kguiaddons
-    kdnssd
-    kiconthemes
-    ki18n
-    kio
-    khtml
-    kpty
-    syntax-highlighting
-    libmtp
-    libssh
-    openexr
-    libtirpc
-    phonon
-    qtsvg
-    samba
-    solid
-    gperf
-    taglib
-    libX11
-    libXcursor
-  ];
-
-  # org.kde.kmtpd5 DBUS service launches kiod5 binary from kio derivation, not from kio-extras
-  postInstall = ''
-    substituteInPlace $out/share/dbus-1/services/org.kde.kmtpd5.service \
-      --replace Exec=$out Exec=${kio}
-  '';
-
-}
diff --git a/pkgs/applications/kde/kio-gdrive.nix b/pkgs/applications/kde/kio-gdrive.nix
deleted file mode 100644
index 13076e58987c..000000000000
--- a/pkgs/applications/kde/kio-gdrive.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kio,
-  libkgapi,
-  kcalendarcore,
-  kcontacts,
-  qtkeychain,
-  libsecret,
-  kaccounts-integration,
-}:
-
-mkDerivation {
-  pname = "kio-gdrive";
-  meta = with lib; {
-    homepage = "https://github.com/KDE/kio-gdrive";
-    description = "KIO slave for Google APIs";
-    maintainers = with maintainers; [ kennyballou ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcalendarcore
-    kcontacts
-    kaccounts-integration
-    libkgapi
-    libsecret
-    kio
-    qtkeychain
-  ];
-}
diff --git a/pkgs/applications/kde/kipi-plugins.nix b/pkgs/applications/kde/kipi-plugins.nix
deleted file mode 100644
index a9de8cf2dabb..000000000000
--- a/pkgs/applications/kde/kipi-plugins.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  karchive,
-  kconfig,
-  ki18n,
-  kiconthemes,
-  kio,
-  kservice,
-  kwindowsystem,
-  kxmlgui,
-  libkipi,
-  qtbase,
-  qtsvg,
-  qtxmlpatterns,
-}:
-
-mkDerivation {
-  pname = "kipi-plugins";
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    karchive
-    kconfig
-    ki18n
-    kiconthemes
-    kio
-    kservice
-    kwindowsystem
-    kxmlgui
-    libkipi
-    qtbase
-    qtsvg
-    qtxmlpatterns
-  ];
-
-  meta = {
-    description = "Plugins for KDE-based image applications";
-    license = lib.licenses.gpl2;
-    homepage = "https://github.com/KDE/kipi-plugins";
-    maintainers = with lib.maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/applications/kde/kirigami-gallery.nix b/pkgs/applications/kde/kirigami-gallery.nix
deleted file mode 100644
index 34ce15ffc6d1..000000000000
--- a/pkgs/applications/kde/kirigami-gallery.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kirigami2,
-  extra-cmake-modules,
-  kitemmodels,
-  qtgraphicaleffects,
-  qtquickcontrols2,
-  qttools,
-}:
-
-mkDerivation {
-  pname = "kirigami-gallery";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    qttools
-  ];
-
-  buildInputs = [
-    qtgraphicaleffects
-    qtquickcontrols2
-    kirigami2
-    kitemmodels
-  ];
-
-  meta = with lib; {
-    homepage = "https://apps.kde.org/kirigami2.gallery/";
-    description = "View examples of Kirigami components";
-    mainProgram = "kirigami2gallery";
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ shadowrz ];
-  };
-}
diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix
deleted file mode 100644
index d0376e1030f3..000000000000
--- a/pkgs/applications/kde/kitinerary.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  qtdeclarative,
-  ki18n,
-  kmime,
-  kpkpass,
-  poppler,
-  kcontacts,
-  kcalendarcore,
-  shared-mime-info,
-  zxing-cpp,
-}:
-
-mkDerivation {
-  pname = "kitinerary";
-  meta = {
-    license = with lib.licenses; [ lgpl21 ];
-    maintainers = [ lib.maintainers.bkchr ];
-    broken = true; # doesn't build with latest Poppler
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    shared-mime-info # for update-mime-database
-  ];
-  buildInputs = [
-    qtdeclarative
-    kmime
-    kpkpass
-    poppler
-    kcontacts
-    kcalendarcore
-    ki18n
-    zxing-cpp
-  ];
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/kldap.nix b/pkgs/applications/kde/kldap.nix
deleted file mode 100644
index 2cd16f9235f7..000000000000
--- a/pkgs/applications/kde/kldap.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  cyrus_sasl,
-  ki18n,
-  kio,
-  kmbox,
-  libsecret,
-  openldap,
-  qtkeychain,
-}:
-
-mkDerivation {
-  pname = "kldap";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    ki18n
-    kio
-    kmbox
-    libsecret
-    qtkeychain
-  ];
-  propagatedBuildInputs = [
-    cyrus_sasl
-    openldap
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix
deleted file mode 100644
index 1b07daee7a33..000000000000
--- a/pkgs/applications/kde/kleopatra.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  boost,
-  gpgme,
-  kcmutils,
-  kdbusaddons,
-  kiconthemes,
-  kitemmodels,
-  kmime,
-  knotifications,
-  kwindowsystem,
-  kxmlgui,
-  libkleo,
-  kcrash,
-  kpipewire,
-}:
-
-mkDerivation {
-  pname = "kleopatra";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  buildInputs = [
-    boost
-    gpgme
-    kcmutils
-    kdbusaddons
-    kiconthemes
-    kitemmodels
-    kmime
-    knotifications
-    kwindowsystem
-    kxmlgui
-    libkleo
-    kcrash
-    kpipewire
-  ];
-
-  meta = {
-    homepage = "https://apps.kde.org/kleopatra/";
-    description = "Certificate manager and unified crypto GUI";
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-}
diff --git a/pkgs/applications/kde/klettres.nix b/pkgs/applications/kde/klettres.nix
deleted file mode 100644
index 6e87d5651985..000000000000
--- a/pkgs/applications/kde/klettres.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  phonon,
-  knewstuff,
-}:
-
-mkDerivation {
-  pname = "klettres";
-  meta = with lib; {
-    homepage = "https://invent.kde.org/education/klettres";
-    description = "Application specially designed to help the user to learn an alphabet";
-    mainProgram = "klettres";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    phonon
-    knewstuff
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/klines.nix b/pkgs/applications/kde/klines.nix
deleted file mode 100644
index 36d76211c81d..000000000000
--- a/pkgs/applications/kde/klines.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  libkdegames,
-}:
-
-mkDerivation {
-  pname = "klines";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.klines";
-    description = "Simple but highly addictive one player game";
-    mainProgram = "klines";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libkdegames
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/kmag.nix b/pkgs/applications/kde/kmag.nix
deleted file mode 100644
index b12e36917623..000000000000
--- a/pkgs/applications/kde/kmag.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-}:
-
-mkDerivation {
-  pname = "kmag";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/utilities/org.kde.kmag";
-    description = "Small Linux utility to magnify a part of the screen";
-    mainProgram = "kmag";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/kmahjongg.nix b/pkgs/applications/kde/kmahjongg.nix
deleted file mode 100644
index 9d3bef13e588..000000000000
--- a/pkgs/applications/kde/kmahjongg.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kdeclarative,
-  knewstuff,
-  libkdegames,
-  libkmahjongg,
-}:
-
-mkDerivation {
-  pname = "kmahjongg";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kdeclarative
-    libkmahjongg
-    knewstuff
-    libkdegames
-  ];
-  meta = {
-    description = "Mahjongg solitaire";
-    mainProgram = "kmahjongg";
-    homepage = "https://apps.kde.org/kmahjongg/";
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix
deleted file mode 100644
index 6a2e867fa346..000000000000
--- a/pkgs/applications/kde/kmail-account-wizard.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  shared-mime-info,
-  akonadi,
-  kcmutils,
-  kcrash,
-  kdbusaddons,
-  kidentitymanagement,
-  kldap,
-  kmailtransport,
-  knewstuff,
-  knotifications,
-  knotifyconfig,
-  kparts,
-  kross,
-  ktexteditor,
-  kwallet,
-  libkdepim,
-  libkleo,
-  pimcommon,
-  qttools,
-}:
-
-mkDerivation {
-  pname = "kmail-account-wizard";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    shared-mime-info
-  ];
-  buildInputs = [
-    akonadi
-    kcmutils
-    kcrash
-    kdbusaddons
-    kidentitymanagement
-    kldap
-    kmailtransport
-    knewstuff
-    knotifications
-    knotifyconfig
-    kparts
-    kross
-    ktexteditor
-    kwallet
-    libkdepim
-    libkleo
-    pimcommon
-    qttools
-  ];
-}
diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix
deleted file mode 100644
index d8876da285a5..000000000000
--- a/pkgs/applications/kde/kmail.nix
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  akonadi,
-  akonadi-import-wizard,
-  akonadi-search,
-  extra-cmake-modules,
-  kaddressbook,
-  kbookmarks,
-  kcalutils,
-  kcmutils,
-  kcompletion,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  kdepim-addons,
-  kdepim-runtime,
-  kdepimTeam,
-  kdoctools,
-  kguiaddons,
-  ki18n,
-  kiconthemes,
-  kinit,
-  kio,
-  kldap,
-  kleopatra,
-  kmail-account-wizard,
-  kmailtransport,
-  knotifications,
-  knotifyconfig,
-  kontactinterface,
-  kparts,
-  kpty,
-  kservice,
-  ktextwidgets,
-  ktnef,
-  kuserfeedback,
-  kwallet,
-  kwidgetsaddons,
-  kwindowsystem,
-  kxmlgui,
-  libgravatar,
-  libkdepim,
-  libksieve,
-  libsecret,
-  mailcommon,
-  messagelib,
-  pim-data-exporter,
-  pim-sieve-editor,
-  qtkeychain,
-  qtscript,
-  qtwebengine,
-}:
-
-mkDerivation {
-  pname = "kmail";
-  meta = {
-    homepage = "https://apps.kde.org/kmail2/";
-    description = "Mail client";
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi-search
-    kbookmarks
-    kcalutils
-    kcmutils
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kdepim-addons
-    kguiaddons
-    ki18n
-    kiconthemes
-    kinit
-    kio
-    kldap
-    kmail-account-wizard
-    kmailtransport
-    knotifications
-    knotifyconfig
-    kontactinterface
-    kparts
-    kpty
-    kservice
-    ktextwidgets
-    ktnef
-    kuserfeedback
-    kwidgetsaddons
-    kwindowsystem
-    kxmlgui
-    libgravatar
-    libkdepim
-    libksieve
-    libsecret
-    mailcommon
-    messagelib
-    pim-sieve-editor
-    qtkeychain
-    qtscript
-    qtwebengine
-    akonadi-import-wizard
-    kaddressbook
-    kleopatra
-    pim-data-exporter
-  ];
-  outputs = [
-    "out"
-    "doc"
-  ];
-  propagatedUserEnvPkgs = [
-    kdepim-runtime
-    kwallet
-    akonadi
-  ];
-  postFixup = ''
-    wrapProgram "$out/bin/kmail" \
-      --prefix PATH : "${
-        lib.makeBinPath [
-          akonadi
-          akonadi-import-wizard
-          kaddressbook
-          kleopatra
-          kmail-account-wizard
-          pim-data-exporter
-        ]
-      }"
-  '';
-}
diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix
deleted file mode 100644
index 335e4a42b663..000000000000
--- a/pkgs/applications/kde/kmailtransport.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  akonadi-mime,
-  cyrus_sasl,
-  kcmutils,
-  ki18n,
-  kio,
-  kmime,
-  kwallet,
-  ksmtp,
-  libkgapi,
-  kcalendarcore,
-  kcontacts,
-  qtkeychain,
-  libsecret,
-}:
-
-mkDerivation {
-  pname = "kmailtransport";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi
-    kcmutils
-    ki18n
-    kio
-    ksmtp
-    libkgapi
-    kcalendarcore
-    kcontacts
-    qtkeychain
-    libsecret
-  ];
-  propagatedBuildInputs = [
-    akonadi-mime
-    cyrus_sasl
-    kmime
-    kwallet
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/kmbox.nix b/pkgs/applications/kde/kmbox.nix
deleted file mode 100644
index d14d3dba08b5..000000000000
--- a/pkgs/applications/kde/kmbox.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  kmime,
-  qtbase,
-  kcodecs,
-}:
-
-mkDerivation {
-  pname = "kmbox";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kmime
-    qtbase
-    kcodecs
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix
deleted file mode 100644
index 6e2ad294db1c..000000000000
--- a/pkgs/applications/kde/kmime.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  ki18n,
-  kcodecs,
-  qtbase,
-}:
-
-mkDerivation {
-  pname = "kmime";
-  meta = {
-    license = [ lib.licenses.lgpl21 ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs
-    ki18n
-    qtbase
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/kmines.nix b/pkgs/applications/kde/kmines.nix
deleted file mode 100644
index d527f9f0aff2..000000000000
--- a/pkgs/applications/kde/kmines.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  libkdegames,
-  kconfig,
-  kcrash,
-  kdoctools,
-  ki18n,
-  kio,
-}:
-
-mkDerivation {
-  pname = "kmines";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.kmines";
-    description = "Classic Minesweeper game";
-    mainProgram = "kmines";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libkdegames
-    kconfig
-    kcrash
-    kio
-    kdoctools
-    ki18n
-  ];
-}
diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix
deleted file mode 100644
index 1c433395dc24..000000000000
--- a/pkgs/applications/kde/kmix.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kglobalaccel,
-  kxmlgui,
-  kcoreaddons,
-  plasma-framework,
-  libpulseaudio,
-  alsa-lib,
-  libcanberra_kde,
-}:
-
-mkDerivation {
-  pname = "kmix";
-  meta = {
-    homepage = "https://apps.kde.org/kmix/";
-    description = "Sound mixer";
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = [ lib.maintainers.rongcuid ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    alsa-lib
-    kglobalaccel
-    kxmlgui
-    kcoreaddons
-    libcanberra_kde
-    libpulseaudio
-    plasma-framework
-  ];
-  cmakeFlags = [ "-DKMIX_KF5_BUILD=1" ];
-}
diff --git a/pkgs/applications/kde/kmousetool.nix b/pkgs/applications/kde/kmousetool.nix
deleted file mode 100644
index b750a34d1899..000000000000
--- a/pkgs/applications/kde/kmousetool.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kiconthemes,
-  knotifications,
-  kxmlgui,
-  kwindowsystem,
-  phonon,
-  libXtst,
-  libXt,
-}:
-
-mkDerivation {
-  pname = "kmousetool";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    ki18n
-    kiconthemes
-    knotifications
-    kxmlgui
-    kwindowsystem
-    phonon
-    libXtst
-    libXt
-  ];
-  meta = {
-    homepage = "https://github.com/KDE/kmousetool";
-    description = "Program that clicks the mouse for you";
-    mainProgram = "kmousetool";
-    license = with lib.licenses; [
-      gpl2Plus
-      fdl12Plus
-    ];
-    maintainers = [ lib.maintainers.jayesh-bhoot ];
-  };
-}
diff --git a/pkgs/applications/kde/kmplot.nix b/pkgs/applications/kde/kmplot.nix
deleted file mode 100644
index b4a35a8bbc09..000000000000
--- a/pkgs/applications/kde/kmplot.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kcrash,
-  kguiaddons,
-  ki18n,
-  kparts,
-  kwidgetsaddons,
-  kdbusaddons,
-}:
-
-mkDerivation {
-  pname = "kmplot";
-  meta = {
-    homepage = "https://apps.kde.org/kmplot/";
-    description = "Mathematical function plotter";
-    mainProgram = "kmplot";
-    license = with lib.licenses; [
-      gpl2Plus
-      fdl12Plus
-    ];
-    maintainers = [ lib.maintainers.orivej ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcrash
-    kguiaddons
-    ki18n
-    kparts
-    kwidgetsaddons
-    kdbusaddons
-  ];
-}
diff --git a/pkgs/applications/kde/knavalbattle.nix b/pkgs/applications/kde/knavalbattle.nix
deleted file mode 100644
index dce8ac5f0515..000000000000
--- a/pkgs/applications/kde/knavalbattle.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  libkdegames,
-  kdnssd,
-}:
-
-mkDerivation {
-  pname = "knavalbattle";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.knavalbattle";
-    description = "Naval Battle is a ship sinking game";
-    mainProgram = "knavalbattle";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libkdegames
-    kdoctools
-    ki18n
-    kio
-    kdnssd
-  ];
-}
diff --git a/pkgs/applications/kde/knetwalk.nix b/pkgs/applications/kde/knetwalk.nix
deleted file mode 100644
index 14c301c06521..000000000000
--- a/pkgs/applications/kde/knetwalk.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  libkdegames,
-}:
-
-mkDerivation {
-  pname = "knetwalk";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.knetwalk";
-    description = "Single player logic game";
-    mainProgram = "knetwalk";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libkdegames
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/knights.nix b/pkgs/applications/kde/knights.nix
deleted file mode 100644
index a96486d62dbf..000000000000
--- a/pkgs/applications/kde/knights.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  kplotting,
-  plasma-framework,
-  libkdegames,
-}:
-
-mkDerivation {
-  pname = "knights";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.knights";
-    description = "Chess game";
-    mainProgram = "knights";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libkdegames
-    plasma-framework
-    kplotting
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/knotes.nix b/pkgs/applications/kde/knotes.nix
deleted file mode 100644
index cf8bf1658bb7..000000000000
--- a/pkgs/applications/kde/knotes.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kcompletion,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  kcrash,
-  kdbusaddons,
-  kdnssd,
-  kglobalaccel,
-  kiconthemes,
-  kitemmodels,
-  kitemviews,
-  kcmutils,
-  knewstuff,
-  knotifications,
-  knotifyconfig,
-  kparts,
-  ktextwidgets,
-  kwidgetsaddons,
-  kwindowsystem,
-  grantlee,
-  grantleetheme,
-  qtx11extras,
-  akonadi,
-  akonadi-notes,
-  akonadi-search,
-  kcalutils,
-  kontactinterface,
-  libkdepim,
-  kmime,
-  pimcommon,
-  kpimtextedit,
-  kcalendarcore,
-}:
-
-mkDerivation {
-  pname = "knotes";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kcrash
-    kdbusaddons
-    kdnssd
-    kglobalaccel
-    kiconthemes
-    kitemmodels
-    kitemviews
-    kcmutils
-    knewstuff
-    knotifications
-    knotifyconfig
-    kparts
-    ktextwidgets
-    kwidgetsaddons
-    kwindowsystem
-    grantlee
-    grantleetheme
-    qtx11extras
-    akonadi
-    akonadi-notes
-    kcalutils
-    kontactinterface
-    libkdepim
-    kmime
-    pimcommon
-    kpimtextedit
-    akonadi-search
-    kcalendarcore
-  ];
-  meta = with lib; {
-    homepage = "https://apps.kde.org/knotes/";
-    description = "Popup notes";
-    license = licenses.gpl2Plus;
-  };
-}
diff --git a/pkgs/applications/kde/koko.nix b/pkgs/applications/kde/koko.nix
deleted file mode 100644
index 524aeba87ed3..000000000000
--- a/pkgs/applications/kde/koko.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  fetchurl,
-  cmake,
-  extra-cmake-modules,
-
-  exiv2,
-  kconfig,
-  kcoreaddons,
-  kdeclarative,
-  kfilemetadata,
-  kguiaddons,
-  ki18n,
-  kio,
-  kirigami2,
-  knotifications,
-  kpurpose,
-  kquickimageedit,
-  qtgraphicaleffects,
-  qtlocation,
-  qtquickcontrols2,
-}:
-
-let
-  # URLs snapshotted through
-  # https://web.archive.org/save/$url
-  # Update when stale enough I guess?
-  admin1 = fetchurl {
-    url = "https://web.archive.org/web/20210714035424if_/http://download.geonames.org/export/dump/admin1CodesASCII.txt";
-    sha256 = "0r783yzajs26hvccdy4jv2v06xfgadx2g90fz3yn7lx8flz4nhwm";
-  };
-  admin2 = fetchurl {
-    url = "https://web.archive.org/web/20210714035427if_/http://download.geonames.org/export/dump/admin2Codes.txt";
-    sha256 = "1n5nzp3xblhr93rb1sadi5vfbw29slv5lc6cxq21h3x3cg0mwqh3";
-  };
-  cities1000 = fetchurl {
-    url = "https://web.archive.org/web/20210714035406if_/http://download.geonames.org/export/dump/cities1000.zip";
-    sha256 = "0cwbfff8gzci5zrahh6d53b9b3bfv1cbwlv0k6076531i1c7md9p";
-  };
-in
-mkDerivation {
-  pname = "koko";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    exiv2
-    kconfig
-    kcoreaddons
-    kdeclarative
-    kfilemetadata
-    kguiaddons
-    ki18n
-    kio
-    kirigami2
-    knotifications
-    kpurpose
-    kquickimageedit
-    qtgraphicaleffects
-    qtlocation
-    qtquickcontrols2
-  ];
-
-  prePatch = ''
-    ln -s ${admin1}     src/admin1CodesASCII.txt
-    ln -s ${admin2}     src/admin2Codes.txt
-    ln -s ${cities1000} src/cities1000.zip
-  '';
-
-  meta = with lib; {
-    description = "Image gallery mobile application";
-    mainProgram = "koko";
-    homepage = "https://apps.kde.org/koko/";
-    # LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-    license = [
-      licenses.lgpl3Only
-      licenses.lgpl21Only
-    ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/kolf.nix b/pkgs/applications/kde/kolf.nix
deleted file mode 100644
index eeddcf100710..000000000000
--- a/pkgs/applications/kde/kolf.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  libkdegames,
-  kio,
-  ktextwidgets,
-}:
-
-mkDerivation {
-  pname = "kolf";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    libkdegames
-    kio
-    ktextwidgets
-  ];
-  meta = {
-    homepage = "https://apps.kde.org/kolf/";
-    description = "Miniature golf";
-    mainProgram = "kolf";
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ peterhoeg ];
-  };
-}
diff --git a/pkgs/applications/kde/kollision.nix b/pkgs/applications/kde/kollision.nix
deleted file mode 100644
index eced7728016e..000000000000
--- a/pkgs/applications/kde/kollision.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  libkdegames,
-}:
-
-mkDerivation {
-  pname = "kollision";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.kollision";
-    description = "Casual game";
-    mainProgram = "kollision";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libkdegames
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix
deleted file mode 100644
index 1182cdf8d6be..000000000000
--- a/pkgs/applications/kde/kolourpaint.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kguiaddons,
-  kio,
-  ktextwidgets,
-  kwidgetsaddons,
-  kxmlgui,
-  libkexiv2,
-}:
-
-mkDerivation {
-  pname = "kolourpaint";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kguiaddons
-    kio
-    ktextwidgets
-    kwidgetsaddons
-    kxmlgui
-    libkexiv2
-  ];
-  meta = {
-    homepage = "https://apps.kde.org/kolourpaint/";
-    description = "Paint program";
-    mainProgram = "kolourpaint";
-    license = with lib.licenses; [ gpl2 ];
-  };
-}
diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix
deleted file mode 100644
index efcc37a33903..000000000000
--- a/pkgs/applications/kde/kompare.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kiconthemes,
-  kparts,
-  ktexteditor,
-  kwidgetsaddons,
-  libkomparediff2,
-}:
-
-mkDerivation {
-  pname = "kompare";
-  meta = {
-    homepage = "https://apps.kde.org/kompare/";
-    description = "Diff/patch frontend";
-    mainProgram = "kompare";
-    license = with lib.licenses; [ gpl2 ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kiconthemes
-    kparts
-    ktexteditor
-    kwidgetsaddons
-    libkomparediff2
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/kongress.nix b/pkgs/applications/kde/kongress.nix
deleted file mode 100644
index 75c650c2c85f..000000000000
--- a/pkgs/applications/kde/kongress.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  qtquickcontrols2,
-  kcalendarcore,
-  kconfig,
-  kcoreaddons,
-  kdbusaddons,
-  kirigami2,
-  ki18n,
-  knotifications,
-}:
-
-mkDerivation {
-  pname = "kongress";
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-
-  buildInputs = [
-    qtquickcontrols2
-    kcalendarcore
-    kconfig
-    kcoreaddons
-    kdbusaddons
-    kirigami2
-    ki18n
-    knotifications
-  ];
-
-  meta = {
-    description = "Companion application for conferences";
-    homepage = "https://apps.kde.org/kongress/";
-    license = lib.licenses.gpl3;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/konqueror.nix b/pkgs/applications/kde/konqueror.nix
deleted file mode 100644
index ce734cb3024a..000000000000
--- a/pkgs/applications/kde/konqueror.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kinit,
-  kcmutils,
-  khtml,
-  kdesu,
-  qtwebengine,
-  qtx11extras,
-  qtscript,
-  qtwayland,
-}:
-
-mkDerivation {
-  pname = "konqueror";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcmutils
-    khtml
-    kinit
-    kdesu
-    qtwebengine
-    qtx11extras
-    qtscript
-    qtwayland
-  ];
-
-  # InitialPreference values are too high and any text/html ends up
-  # opening konqueror, even if firefox or chromium are also available.
-  # Resetting to 1, which is the default.
-  postPatch = ''
-    substituteInPlace kfmclient_html.desktop \
-      --replace InitialPreference=9 InitialPreference=1
-  '';
-
-  meta = {
-    homepage = "https://apps.kde.org/konqueror/";
-    description = "Web browser, file manager and viewer";
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/konquest.nix b/pkgs/applications/kde/konquest.nix
deleted file mode 100644
index 5de5fc7eb5df..000000000000
--- a/pkgs/applications/kde/konquest.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kconfig,
-  kcoreaddons,
-  kcrash,
-  kdbusaddons,
-  kguiaddons,
-  kxmlgui,
-  kwidgetsaddons,
-  libkdegames,
-  qtquickcontrols,
-}:
-
-mkDerivation {
-  pname = "konquest";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kconfig
-    kcoreaddons
-    kcrash
-    kdbusaddons
-    kguiaddons
-    kxmlgui
-    kwidgetsaddons
-    libkdegames
-    qtquickcontrols
-  ];
-  meta = {
-    homepage = "https://apps.kde.org/konquest/";
-    description = "Galactic strategy game";
-    mainProgram = "konquest";
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
deleted file mode 100644
index 3a5ba815b956..000000000000
--- a/pkgs/applications/kde/konsole.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  nixosTests,
-  extra-cmake-modules,
-  kdoctools,
-  kbookmarks,
-  kcompletion,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  kguiaddons,
-  ki18n,
-  kiconthemes,
-  kinit,
-  kio,
-  knotifications,
-  knotifyconfig,
-  kparts,
-  kpty,
-  kservice,
-  ktextwidgets,
-  kwidgetsaddons,
-  kwindowsystem,
-  kxmlgui,
-  qtscript,
-  knewstuff,
-  qtmultimedia,
-}:
-
-mkDerivation {
-  pname = "konsole";
-  meta = {
-    homepage = "https://apps.kde.org/konsole/";
-    description = "KDE terminal emulator";
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = with lib.maintainers; [ ttuegel ];
-    mainProgram = "konsole";
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kbookmarks
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kguiaddons
-    ki18n
-    kiconthemes
-    kinit
-    kio
-    knotifications
-    knotifyconfig
-    kparts
-    kpty
-    kservice
-    ktextwidgets
-    kwidgetsaddons
-    kwindowsystem
-    kxmlgui
-    qtscript
-    knewstuff
-    qtmultimedia
-  ];
-
-  passthru.tests.test = nixosTests.terminal-emulators.konsole;
-
-  propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
-}
diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix
deleted file mode 100644
index 7923157c96f4..000000000000
--- a/pkgs/applications/kde/kontact.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  qtwebengine,
-  kcmutils,
-  kcrash,
-  kdbusaddons,
-  kparts,
-  kwindowsystem,
-  akonadi,
-  grantleetheme,
-  kontactinterface,
-  kpimtextedit,
-  mailcommon,
-  libkdepim,
-  pimcommon,
-  akregator,
-  kaddressbook,
-  kmail,
-  knotes,
-  korganizer,
-  zanshin,
-}:
-
-mkDerivation {
-  pname = "kontact";
-  meta = {
-    homepage = "https://apps.kde.org/kontact/";
-    description = "Personal information manager";
-    mainProgram = "kontact";
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    qtwebengine
-    kcmutils
-    kcrash
-    kdbusaddons
-    kparts
-    kwindowsystem
-    akonadi
-    grantleetheme
-    kontactinterface
-    kpimtextedit
-    mailcommon
-    libkdepim
-    pimcommon
-    akregator
-    kaddressbook
-    kmail
-    knotes
-    korganizer
-    zanshin
-  ];
-}
diff --git a/pkgs/applications/kde/kontactinterface.nix b/pkgs/applications/kde/kontactinterface.nix
deleted file mode 100644
index c1b7957dee4e..000000000000
--- a/pkgs/applications/kde/kontactinterface.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  kiconthemes,
-  kparts,
-  kwindowsystem,
-  kxmlgui,
-  qtx11extras,
-}:
-
-mkDerivation {
-  pname = "kontactinterface";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kiconthemes
-    kwindowsystem
-    kxmlgui
-    qtx11extras
-  ];
-  propagatedBuildInputs = [ kparts ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$out/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/konversation.nix b/pkgs/applications/kde/konversation.nix
deleted file mode 100644
index 0752c253f7f4..000000000000
--- a/pkgs/applications/kde/konversation.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kbookmarks,
-  karchive,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  kcrash,
-  kdbusaddons,
-  kemoticons,
-  kglobalaccel,
-  ki18n,
-  kiconthemes,
-  kidletime,
-  kitemviews,
-  knewstuff,
-  knotifications,
-  knotifyconfig,
-  kwindowsystem,
-  kio,
-  kparts,
-  kwallet,
-  solid,
-  sonnet,
-  phonon,
-  qtmultimedia,
-}:
-
-mkDerivation {
-  pname = "konversation";
-
-  buildInputs = [
-    kbookmarks
-    karchive
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kcrash
-    kdbusaddons
-    kdoctools
-    kemoticons
-    kglobalaccel
-    ki18n
-    kiconthemes
-    kidletime
-    kitemviews
-    knewstuff
-    knotifications
-    knotifyconfig
-    kwindowsystem
-    kio
-    kparts
-    kwallet
-    solid
-    sonnet
-    phonon
-    qtmultimedia
-  ];
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  meta = {
-    description = "Integrated IRC client for KDE";
-    mainProgram = "konversation";
-    license = with lib.licenses; [ gpl2 ];
-    homepage = "https://konversation.kde.org";
-  };
-}
diff --git a/pkgs/applications/kde/kopeninghours.nix b/pkgs/applications/kde/kopeninghours.nix
deleted file mode 100644
index a35fa19dc56c..000000000000
--- a/pkgs/applications/kde/kopeninghours.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  bison,
-  extra-cmake-modules,
-  flex,
-  kholidays,
-  ki18n,
-}:
-
-mkDerivation {
-  pname = "kopeninghours";
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  nativeBuildInputs = [
-    bison
-    extra-cmake-modules
-    flex
-  ];
-
-  buildInputs = [
-    kholidays
-    ki18n
-  ];
-
-  meta = {
-    license = with lib.licenses; [
-      bsd3
-      cc0
-      lgpl2Plus
-    ];
-  };
-}
diff --git a/pkgs/applications/kde/korganizer.nix b/pkgs/applications/kde/korganizer.nix
deleted file mode 100644
index 811b67345eeb..000000000000
--- a/pkgs/applications/kde/korganizer.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  qtbase,
-  qttools,
-  phonon,
-  knewstuff,
-  akonadi-calendar,
-  akonadi-contacts,
-  akonadi-notes,
-  akonadi-search,
-  calendarsupport,
-  eventviews,
-  incidenceeditor,
-  kcalutils,
-  kholidays,
-  kidentitymanagement,
-  kldap,
-  kmailtransport,
-  kontactinterface,
-  kparts,
-  kpimtextedit,
-  kuserfeedback,
-  pimcommon,
-}:
-
-mkDerivation {
-  pname = "korganizer";
-  meta = {
-    homepage = "https://apps.kde.org/korganizer/";
-    description = "Personal organizer";
-    mainProgram = "korganizer";
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    qtbase
-    qttools
-    phonon
-    knewstuff
-    akonadi-calendar
-    akonadi-contacts
-    akonadi-notes
-    akonadi-search
-    calendarsupport
-    eventviews
-    incidenceeditor
-    kcalutils
-    kholidays
-    kidentitymanagement
-    kldap
-    kmailtransport
-    kontactinterface
-    kparts
-    kpimtextedit
-    kuserfeedback
-    pimcommon
-  ];
-}
diff --git a/pkgs/applications/kde/kosmindoormap.nix b/pkgs/applications/kde/kosmindoormap.nix
deleted file mode 100644
index 6569615eb6b0..000000000000
--- a/pkgs/applications/kde/kosmindoormap.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  bison,
-  extra-cmake-modules,
-  flex,
-  ki18n,
-  kopeninghours,
-  kpublictransport,
-}:
-
-mkDerivation {
-  pname = "kosmindoormap";
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  nativeBuildInputs = [
-    bison
-    extra-cmake-modules
-    flex
-  ];
-
-  buildInputs = [
-    ki18n
-    kopeninghours
-    kpublictransport
-  ];
-
-  meta = {
-    license = with lib.licenses; [
-      bsd2
-      bsd3
-      cc0
-      lgpl2Plus
-      lgpl3Plus
-      mit
-      odbl
-    ];
-  };
-}
diff --git a/pkgs/applications/kde/kpat.nix b/pkgs/applications/kde/kpat.nix
deleted file mode 100644
index 077a6ea5b4e3..000000000000
--- a/pkgs/applications/kde/kpat.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  knewstuff,
-  shared-mime-info,
-  libkdegames,
-  freecell-solver,
-  black-hole-solver,
-}:
-
-mkDerivation {
-  pname = "kpat";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    shared-mime-info
-  ];
-  buildInputs = [
-    black-hole-solver
-    knewstuff
-    libkdegames
-    freecell-solver
-  ];
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = with lib.maintainers; [ rnhmjoj ];
-  };
-}
diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix
deleted file mode 100644
index 634cc2ab26fe..000000000000
--- a/pkgs/applications/kde/kpimtextedit.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  grantlee,
-  kcodecs,
-  kconfigwidgets,
-  kemoticons,
-  ki18n,
-  kiconthemes,
-  kio,
-  kdesignerplugin,
-  ktextwidgets,
-  sonnet,
-  syntax-highlighting,
-  qttools,
-  qtspeech,
-}:
-
-mkDerivation {
-  pname = "kpimtextedit";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    grantlee
-    kcodecs
-    kconfigwidgets
-    kemoticons
-    ki18n
-    kiconthemes
-    kio
-    kdesignerplugin
-    sonnet
-    syntax-highlighting
-    qttools
-    qtspeech
-  ];
-  propagatedBuildInputs = [ ktextwidgets ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix
deleted file mode 100644
index 94dd6381a0d5..000000000000
--- a/pkgs/applications/kde/kpkpass.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  qtbase,
-  karchive,
-  shared-mime-info,
-}:
-
-mkDerivation {
-  pname = "kpkpass";
-  meta = {
-    license = with lib.licenses; [ lgpl21 ];
-    maintainers = [ lib.maintainers.bkchr ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    shared-mime-info
-  ];
-  buildInputs = [
-    qtbase
-    karchive
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/kpmcore/default.nix b/pkgs/applications/kde/kpmcore/default.nix
deleted file mode 100644
index 2f8de5b853ad..000000000000
--- a/pkgs/applications/kde/kpmcore/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  qca-qt5,
-  kauth,
-  kio,
-  polkit-qt,
-  util-linux,
-}:
-
-mkDerivation {
-  pname = "kpmcore";
-
-  patches = [
-    ./nixostrustedprefix.patch
-  ];
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-
-  buildInputs = [
-    qca-qt5
-    kauth
-    kio
-    polkit-qt
-
-    util-linux # Needs blkid in configure script (note that this is not provided by util-linux-compat)
-  ];
-
-  dontWrapQtApps = true;
-
-  preConfigure = ''
-    substituteInPlace src/util/CMakeLists.txt \
-      --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions
-    substituteInPlace src/backend/corebackend.cpp \
-      --replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy
-  '';
-
-  meta = with lib; {
-    description = "KDE Partition Manager core library";
-    homepage = "https://invent.kde.org/system/kpmcore";
-    license = with licenses; [
-      cc-by-40
-      cc0
-      gpl3Plus
-      mit
-    ];
-    maintainers = with maintainers; [
-      peterhoeg
-      oxalica
-    ];
-  };
-}
diff --git a/pkgs/applications/kde/kpmcore/nixostrustedprefix.patch b/pkgs/applications/kde/kpmcore/nixostrustedprefix.patch
deleted file mode 100644
index cb1eb68364dd..000000000000
--- a/pkgs/applications/kde/kpmcore/nixostrustedprefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/util/externalcommandhelper.cpp b/src/util/externalcommandhelper.cpp
-index a879c8d..3d7863b 100644
---- a/src/util/externalcommandhelper.cpp
-+++ b/src/util/externalcommandhelper.cpp
-@@ -387,7 +387,7 @@ QVariantMap ExternalCommandHelper::RunCommand(const QString& command, const QStr
-     if (dirname == QStringLiteral("bin") || dirname == QStringLiteral("sbin")) {
-         prefix.cdUp();
-     }
--    if (trustedPrefixes.find(prefix.path()) == trustedPrefixes.end()) { // TODO: C++20: replace with contains
-+    if (!prefix.path().startsWith(QStringLiteral("/nix/store")) && !prefix.path().startsWith(QStringLiteral("/run/current-system/sw"))) { // TODO: C++20: replace with contains
-         qInfo() << prefix.path() << "prefix is not one of the trusted command prefixes";
-         reply[QStringLiteral("success")] = false;
-         return reply;
diff --git a/pkgs/applications/kde/kpublictransport.nix b/pkgs/applications/kde/kpublictransport.nix
deleted file mode 100644
index 87cc7e65bc88..000000000000
--- a/pkgs/applications/kde/kpublictransport.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  qtquickcontrols2,
-  networkmanager-qt,
-  ki18n,
-}:
-
-mkDerivation {
-  pname = "kpublictransport";
-  meta = with lib; {
-    license = [ licenses.cc0 ];
-    maintainers = [ ];
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-
-  buildInputs = [
-    qtquickcontrols2
-    networkmanager-qt
-    ki18n
-  ];
-}
diff --git a/pkgs/applications/kde/kqtquickcharts.nix b/pkgs/applications/kde/kqtquickcharts.nix
deleted file mode 100644
index 16b4432cb934..000000000000
--- a/pkgs/applications/kde/kqtquickcharts.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  qtbase,
-  qtdeclarative,
-}:
-
-mkDerivation {
-  pname = "kqtquickcharts";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    qtbase
-    qtdeclarative
-  ];
-}
diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix
deleted file mode 100644
index 2c6f4106ec53..000000000000
--- a/pkgs/applications/kde/krdc.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  makeWrapper,
-  kcmutils,
-  kcompletion,
-  kconfig,
-  kdnssd,
-  knotifyconfig,
-  kwallet,
-  kwidgetsaddons,
-  kwindowsystem,
-  libvncserver,
-  freerdp,
-}:
-
-mkDerivation {
-  pname = "krdc";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeWrapper
-  ];
-  buildInputs = [
-    kcmutils
-    kcompletion
-    kconfig
-    kdnssd
-    knotifyconfig
-    kwallet
-    kwidgetsaddons
-    kwindowsystem
-    freerdp
-    libvncserver
-  ];
-  postFixup = ''
-    wrapProgram $out/bin/krdc \
-      --prefix PATH : ${lib.makeBinPath [ freerdp ]}
-  '';
-  meta = with lib; {
-    homepage = "http://www.kde.org";
-    description = "Remote desktop client";
-    mainProgram = "krdc";
-    license = with licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-      bsd3
-    ];
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/kde/krecorder.nix b/pkgs/applications/kde/krecorder.nix
deleted file mode 100644
index 39fd2a71ea0e..000000000000
--- a/pkgs/applications/kde/krecorder.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-
-  kconfig,
-  kcoreaddons,
-  ki18n,
-  kirigami2,
-  kirigami-addons,
-  kwindowsystem,
-  qtmultimedia,
-  qtquickcontrols2,
-}:
-
-mkDerivation {
-  pname = "krecorder";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kconfig
-    kcoreaddons
-    ki18n
-    kirigami2
-    kirigami-addons
-    kwindowsystem
-    qtmultimedia
-    qtquickcontrols2
-  ];
-
-  meta = with lib; {
-    description = "Audio recorder for Plasma Mobile";
-    mainProgram = "krecorder";
-    homepage = "https://invent.kde.org/plasma-mobile/krecorder";
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/kreversi.nix b/pkgs/applications/kde/kreversi.nix
deleted file mode 100644
index 0afc0a8eef87..000000000000
--- a/pkgs/applications/kde/kreversi.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  libkdegames,
-  kdeclarative,
-}:
-
-mkDerivation {
-  pname = "kreversi";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.kreversi";
-    description = "Simple one player strategy game played against the computer";
-    mainProgram = "kreversi";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kdeclarative
-    libkdegames
-  ];
-}
diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix
deleted file mode 100644
index efd564de083f..000000000000
--- a/pkgs/applications/kde/krfb.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  wayland-scanner,
-  kconfig,
-  kcoreaddons,
-  kcrash,
-  kdbusaddons,
-  kdnssd,
-  knotifications,
-  kwallet,
-  kwidgetsaddons,
-  kwindowsystem,
-  kxmlgui,
-  kwayland,
-  kpipewire,
-  libvncserver,
-  libXtst,
-  libXdamage,
-  qtx11extras,
-  pipewire,
-  plasma-wayland-protocols,
-  wayland,
-}:
-
-mkDerivation {
-  pname = "krfb";
-  meta = {
-    homepage = "https://apps.kde.org/krfb/";
-    description = "Desktop sharing (VNC)";
-    license = with lib.licenses; [
-      gpl2Plus
-      fdl12Plus
-    ];
-    maintainers = with lib.maintainers; [ jerith666 ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    wayland-scanner
-  ];
-  buildInputs = [
-    libvncserver
-    libXtst
-    libXdamage
-    kconfig
-    kcoreaddons
-    kcrash
-    kdbusaddons
-    knotifications
-    kwallet
-    kwidgetsaddons
-    kwindowsystem
-    kxmlgui
-    kwayland
-    kpipewire
-    qtx11extras
-    pipewire
-    plasma-wayland-protocols
-    wayland
-  ];
-  propagatedBuildInputs = [ kdnssd ];
-}
diff --git a/pkgs/applications/kde/kruler.nix b/pkgs/applications/kde/kruler.nix
deleted file mode 100644
index fe905d37cd0a..000000000000
--- a/pkgs/applications/kde/kruler.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  knotifications,
-  kwindowsystem,
-  kxmlgui,
-  qtx11extras,
-}:
-
-mkDerivation {
-  pname = "kruler";
-  meta = {
-    homepage = "https://apps.kde.org/kruler/";
-    description = "Screen ruler";
-    mainProgram = "kruler";
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = [ lib.maintainers.vandenoever ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kwindowsystem
-    knotifications
-    kxmlgui
-    qtx11extras
-  ];
-}
diff --git a/pkgs/applications/kde/ksanecore.nix b/pkgs/applications/kde/ksanecore.nix
deleted file mode 100644
index ae9ec9dfebcd..000000000000
--- a/pkgs/applications/kde/ksanecore.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  qtbase,
-  ki18n,
-  sane-backends,
-}:
-
-mkDerivation {
-  pname = "ksanecore";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    qtbase
-    ki18n
-    sane-backends
-  ];
-  meta = with lib; {
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ andrevmatos ];
-  };
-}
diff --git a/pkgs/applications/kde/kshisen.nix b/pkgs/applications/kde/kshisen.nix
deleted file mode 100644
index 3ec0dc535025..000000000000
--- a/pkgs/applications/kde/kshisen.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  libkdegames,
-  libkmahjongg,
-}:
-
-mkDerivation {
-  pname = "kshisen";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.kshisen";
-    description = "Solitaire-like game played using the standard set of Mahjong tiles";
-    mainProgram = "kshisen";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libkdegames
-    libkmahjongg
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/ksmtp/default.nix b/pkgs/applications/kde/ksmtp/default.nix
deleted file mode 100644
index f25110706d65..000000000000
--- a/pkgs/applications/kde/ksmtp/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  kcoreaddons,
-  kio,
-  kmime,
-  cyrus_sasl,
-}:
-
-mkDerivation {
-  pname = "ksmtp";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcoreaddons
-    kio
-    kmime
-  ];
-  propagatedBuildInputs = [ cyrus_sasl ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$out/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/kspaceduel.nix b/pkgs/applications/kde/kspaceduel.nix
deleted file mode 100644
index 15adbd15a87b..000000000000
--- a/pkgs/applications/kde/kspaceduel.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  cmake,
-  kdbusaddons,
-  ki18n,
-  kconfigwidgets,
-  kcrash,
-  kxmlgui,
-  libkdegames,
-}:
-
-mkDerivation {
-  pname = "kspaceduel";
-  meta = {
-    homepage = "https://apps.kde.org/kspaceduel/";
-    description = "Space arcade game";
-    mainProgram = "kspaceduel";
-    license = with lib.licenses; [
-      lgpl21
-      gpl3
-    ];
-  };
-  outputs = [
-    "out"
-    "dev"
-  ];
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-  propagatedBuildInputs = [
-    kdbusaddons
-    ki18n
-    kconfigwidgets
-    kcrash
-    kxmlgui
-    libkdegames
-  ];
-}
diff --git a/pkgs/applications/kde/ksquares.nix b/pkgs/applications/kde/ksquares.nix
deleted file mode 100644
index cdd2ce84afad..000000000000
--- a/pkgs/applications/kde/ksquares.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  libkdegames,
-  kconfig,
-  kcrash,
-  kxmlgui,
-}:
-
-mkDerivation {
-  pname = "ksquares";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/games/org.kde.ksquares";
-    description = "Game of Dots and Boxes";
-    mainProgram = "ksquares";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kdoctools
-    libkdegames
-    kconfig
-    kcrash
-    kxmlgui
-  ];
-}
diff --git a/pkgs/applications/kde/ksudoku.nix b/pkgs/applications/kde/ksudoku.nix
deleted file mode 100644
index dd5744c7aa9a..000000000000
--- a/pkgs/applications/kde/ksudoku.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  libGLU,
-  kdoctools,
-  kdeclarative,
-  libkdegames,
-}:
-
-mkDerivation {
-  pname = "ksudoku";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    libGLU
-    kdeclarative
-    libkdegames
-  ];
-  meta = {
-    homepage = "https://apps.kde.org/ksudoku/";
-    description = "Suduko game";
-    mainProgram = "ksudoku";
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/ksystemlog.nix b/pkgs/applications/kde/ksystemlog.nix
deleted file mode 100644
index f3e88e6e0352..000000000000
--- a/pkgs/applications/kde/ksystemlog.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  gettext,
-  kdoctools,
-  karchive,
-  kconfig,
-  kio,
-}:
-
-mkDerivation {
-  pname = "ksystemlog";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    gettext
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    karchive
-    kconfig
-    kio
-  ];
-
-  meta = with lib; {
-    homepage = "https://apps.kde.org/ksystemlog/";
-    description = "System log viewer";
-    mainProgram = "ksystemlog";
-    license = with licenses; [ gpl2 ];
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-}
diff --git a/pkgs/applications/kde/kteatime.nix b/pkgs/applications/kde/kteatime.nix
deleted file mode 100644
index 0f48b6c8b45a..000000000000
--- a/pkgs/applications/kde/kteatime.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kconfig,
-  kcrash,
-  kiconthemes,
-  knotifyconfig,
-}:
-
-mkDerivation {
-  pname = "kteatime";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/utilities/org.kde.kteatime";
-    description = "Handy timer for steeping tea";
-    mainProgram = "kteatime";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kdoctools
-    ki18n
-    kconfig
-    kcrash
-    kiconthemes
-    knotifyconfig
-  ];
-}
diff --git a/pkgs/applications/kde/ktimer.nix b/pkgs/applications/kde/ktimer.nix
deleted file mode 100644
index a4034b83f474..000000000000
--- a/pkgs/applications/kde/ktimer.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-}:
-
-mkDerivation {
-  pname = "ktimer";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/utilities/org.kde.ktimer";
-    description = "Little tool to execute programs after some time";
-    mainProgram = "ktimer";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kdoctools
-    ki18n
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/ktnef.nix b/pkgs/applications/kde/ktnef.nix
deleted file mode 100644
index 0bde31a482e0..000000000000
--- a/pkgs/applications/kde/ktnef.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  kcalendarcore,
-  kcalutils,
-  kcontacts,
-}:
-
-mkDerivation {
-  pname = "ktnef";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    kcalendarcore
-    kcalutils
-    kcontacts
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/ktorrent.nix b/pkgs/applications/kde/ktorrent.nix
deleted file mode 100644
index b2e5118bee8e..000000000000
--- a/pkgs/applications/kde/ktorrent.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  karchive,
-  kcmutils,
-  kcrash,
-  kdnssd,
-  ki18n,
-  knotifications,
-  knotifyconfig,
-  kplotting,
-  kross,
-  libgcrypt,
-  libktorrent,
-  taglib,
-}:
-
-mkDerivation {
-  pname = "ktorrent";
-  meta = with lib; {
-    description = "KDE integrated BtTorrent client";
-    homepage = "https://apps.kde.org/ktorrent/";
-    license = licenses.gpl2Plus;
-    maintainers = [ ];
-  };
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    karchive
-    kcmutils
-    kcrash
-    kdnssd
-    ki18n
-    knotifications
-    knotifyconfig
-    kplotting
-    kross
-    libgcrypt
-    libktorrent
-    taglib
-  ];
-}
diff --git a/pkgs/applications/kde/ktrip.nix b/pkgs/applications/kde/ktrip.nix
deleted file mode 100644
index f1b931ffdc4e..000000000000
--- a/pkgs/applications/kde/ktrip.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-
-  kconfig,
-  kcontacts,
-  kcoreaddons,
-  ki18n,
-  kirigami-addons,
-  kirigami2,
-  kitemmodels,
-  kpublictransport,
-  qqc2-desktop-style,
-  qtquickcontrols2,
-}:
-
-mkDerivation {
-  pname = "ktrip";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kconfig
-    kcontacts
-    kcoreaddons
-    ki18n
-    kirigami-addons
-    kirigami2
-    kitemmodels
-    kpublictransport
-    qqc2-desktop-style
-    qtquickcontrols2
-  ];
-
-  meta = with lib; {
-    description = "Public transport trip planner";
-    mainProgram = "ktrip";
-    homepage = "https://apps.kde.org/ktrip/";
-    # GPL-2.0-or-later
-    license = licenses.gpl2Plus;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/kturtle.nix b/pkgs/applications/kde/kturtle.nix
deleted file mode 100644
index af0b867ae988..000000000000
--- a/pkgs/applications/kde/kturtle.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  kio,
-  knewstuff,
-}:
-
-mkDerivation {
-  pname = "kturtle";
-  meta = with lib; {
-    homepage = "https://invent.kde.org/education/kturtle";
-    description = "Educational programming environment for learning how to program";
-    mainProgram = "kturtle";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kdoctools
-    ki18n
-    kio
-    knewstuff
-  ];
-}
diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix
deleted file mode 100644
index 8edc210f2e06..000000000000
--- a/pkgs/applications/kde/kwalletmanager.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  kauth,
-  kcmutils,
-  kconfigwidgets,
-  kcoreaddons,
-  kdbusaddons,
-  kwallet,
-  kxmlgui,
-}:
-
-mkDerivation {
-  pname = "kwalletmanager";
-  meta = {
-    homepage = "https://apps.kde.org/kwalletmanager5/";
-
-    description = "KDE wallet management tool";
-    mainProgram = "kwalletmanager5";
-    license = with lib.licenses; [ gpl2 ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kauth
-    kcmutils
-    kconfigwidgets
-    kcoreaddons
-    kdbusaddons
-    kwallet
-    kxmlgui
-  ];
-}
diff --git a/pkgs/applications/kde/kwave.nix b/pkgs/applications/kde/kwave.nix
deleted file mode 100644
index 899b0177da98..000000000000
--- a/pkgs/applications/kde/kwave.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  qtmultimedia,
-  kcompletion,
-  kconfig,
-  kcrash,
-  kiconthemes,
-  kio,
-  audiofile,
-  libsamplerate,
-  alsa-lib,
-  libpulseaudio,
-  flac,
-  id3lib,
-  libogg,
-  libmad,
-  libopus,
-  libvorbis,
-  fftw,
-  librsvg,
-}:
-
-mkDerivation {
-  pname = "kwave";
-
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/multimedia/org.kde.kwave";
-    description = "Simple media player";
-    mainProgram = "kwave";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    alsa-lib
-    audiofile
-    kcrash
-    kdoctools
-    qtmultimedia
-    kcompletion
-    kconfig
-    kiconthemes
-    kio
-    libpulseaudio
-    libsamplerate
-    flac
-    fftw
-    id3lib
-    libogg
-    libmad
-    libopus
-    libvorbis
-    librsvg
-  ];
-}
diff --git a/pkgs/applications/kde/kweather.nix b/pkgs/applications/kde/kweather.nix
deleted file mode 100644
index 3c3283f43d62..000000000000
--- a/pkgs/applications/kde/kweather.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-
-  kconfig,
-  kholidays,
-  ki18n,
-  kirigami-addons,
-  kirigami2,
-  knotifications,
-  kquickcharts,
-  kweathercore,
-  plasma-framework,
-  qtcharts,
-  qtquickcontrols2,
-}:
-
-mkDerivation {
-  pname = "kweather";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kconfig
-    kholidays
-    ki18n
-    kirigami-addons
-    kirigami2
-    knotifications
-    kquickcharts
-    kweathercore
-    plasma-framework
-    qtcharts
-    qtquickcontrols2
-  ];
-
-  meta = with lib; {
-    description = "Weather application for Plasma Mobile";
-    mainProgram = "kweather";
-    homepage = "https://invent.kde.org/plasma-mobile/kweather";
-    license = with licenses; [
-      gpl2Plus
-      cc-by-40
-    ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/libgravatar.nix b/pkgs/applications/kde/libgravatar.nix
deleted file mode 100644
index b444d0488e33..000000000000
--- a/pkgs/applications/kde/libgravatar.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  kconfig,
-  kio,
-  ktextwidgets,
-  kwidgetsaddons,
-  pimcommon,
-}:
-
-mkDerivation {
-  pname = "libgravatar";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    kconfig
-    kio
-    ktextwidgets
-    kwidgetsaddons
-    pimcommon
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix
deleted file mode 100644
index 1a634fd44532..000000000000
--- a/pkgs/applications/kde/libkcddb.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  qtbase,
-  kdoctools,
-  kcodecs,
-  ki18n,
-  kio,
-  kwidgetsaddons,
-  kcmutils,
-  libmusicbrainz5,
-}:
-
-mkDerivation {
-  pname = "libkcddb";
-  meta = with lib; {
-    license = with licenses; [
-      gpl2
-      lgpl21
-      bsd3
-    ];
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    qtbase
-    kcmutils
-  ];
-  propagatedBuildInputs = [
-    kcodecs
-    ki18n
-    kio
-    kwidgetsaddons
-    libmusicbrainz5
-  ];
-}
diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix
deleted file mode 100644
index 545233d970f9..000000000000
--- a/pkgs/applications/kde/libkdcraw.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  libraw,
-  qtbase,
-}:
-
-mkDerivation {
-  pname = "libkdcraw";
-  meta = {
-    license = with lib.licenses; [
-      gpl2
-      lgpl21
-      bsd3
-    ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
-  propagatedBuildInputs = [ libraw ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/libkdegames.nix b/pkgs/applications/kde/libkdegames.nix
deleted file mode 100644
index dc667eb75a97..000000000000
--- a/pkgs/applications/kde/libkdegames.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  kdoctools,
-  qtdeclarative,
-  kdeclarative,
-  kdnssd,
-  knewstuff,
-  openal,
-  libsndfile,
-  qtquickcontrols,
-}:
-
-mkDerivation {
-  pname = "libkdegames";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    qtdeclarative
-    kdeclarative
-    kdnssd
-    knewstuff
-    openal
-    libsndfile
-    qtquickcontrols
-  ];
-  meta = {
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/libkdepim.nix b/pkgs/applications/kde/libkdepim.nix
deleted file mode 100644
index 63eb02658501..000000000000
--- a/pkgs/applications/kde/libkdepim.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  akonadi-contacts,
-  akonadi-search,
-  kcmutils,
-  kcodecs,
-  kcompletion,
-  kconfigwidgets,
-  kcontacts,
-  ki18n,
-  kiconthemes,
-  kio,
-  kitemviews,
-  kjobwidgets,
-  kldap,
-  kwallet,
-}:
-
-mkDerivation {
-  pname = "libkdepim";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi
-    akonadi-contacts
-    akonadi-search
-    kcmutils
-    kcodecs
-    kcompletion
-    kconfigwidgets
-    kcontacts
-    ki18n
-    kiconthemes
-    kio
-    kitemviews
-    kjobwidgets
-    kldap
-    kwallet
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$out/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix
deleted file mode 100644
index 3017618fcaa5..000000000000
--- a/pkgs/applications/kde/libkexiv2.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  exiv2,
-  extra-cmake-modules,
-  qtbase,
-}:
-
-mkDerivation {
-  pname = "libkexiv2";
-  meta = {
-    license = with lib.licenses; [
-      gpl2
-      lgpl21
-      bsd3
-    ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
-  propagatedBuildInputs = [ exiv2 ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix
deleted file mode 100644
index 3e3678d58812..000000000000
--- a/pkgs/applications/kde/libkgapi.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  qtwebengine,
-  kio,
-  kcalendarcore,
-  kcontacts,
-  cyrus_sasl,
-}:
-
-mkDerivation {
-  pname = "libkgapi";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    qtwebengine
-    kio
-    kcalendarcore
-    kcontacts
-    cyrus_sasl
-  ];
-}
diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix
deleted file mode 100644
index 79fd1eed63b9..000000000000
--- a/pkgs/applications/kde/libkipi.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kconfig,
-  ki18n,
-  kservice,
-  kxmlgui,
-}:
-
-mkDerivation {
-  pname = "libkipi";
-  meta = {
-    license = with lib.licenses; [
-      gpl2
-      lgpl21
-      bsd3
-    ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig
-    ki18n
-    kservice
-    kxmlgui
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/libkleo.nix b/pkgs/applications/kde/libkleo.nix
deleted file mode 100644
index ac13ea5ae853..000000000000
--- a/pkgs/applications/kde/libkleo.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  boost,
-  qgpgme,
-  kcodecs,
-  kcompletion,
-  kconfig,
-  kcoreaddons,
-  ki18n,
-  kitemmodels,
-  kpimtextedit,
-  kwidgetsaddons,
-  kwindowsystem,
-}:
-
-mkDerivation {
-  pname = "libkleo";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    boost
-    kcodecs
-    kcompletion
-    kconfig
-    kcoreaddons
-    ki18n
-    kitemmodels
-    kpimtextedit
-    kwidgetsaddons
-    kwindowsystem
-  ];
-  propagatedBuildInputs = [ qgpgme ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/libkmahjongg.nix b/pkgs/applications/kde/libkmahjongg.nix
deleted file mode 100644
index 97ff358b9b54..000000000000
--- a/pkgs/applications/kde/libkmahjongg.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  kcompletion,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  ki18n,
-  kwidgetsaddons,
-}:
-
-mkDerivation {
-  pname = "libkmahjongg";
-  meta = {
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = [ ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    ki18n
-    kwidgetsaddons
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix
deleted file mode 100644
index 8f18cd0b3b2e..000000000000
--- a/pkgs/applications/kde/libkomparediff2.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  ki18n,
-  kxmlgui,
-  kcodecs,
-  kio,
-}:
-
-mkDerivation {
-  pname = "libkomparediff2";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kcodecs
-    ki18n
-    kxmlgui
-    kio
-  ];
-}
diff --git a/pkgs/applications/kde/libksane.nix b/pkgs/applications/kde/libksane.nix
deleted file mode 100644
index 241a9e284b86..000000000000
--- a/pkgs/applications/kde/libksane.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  qtbase,
-  ki18n,
-  ktextwidgets,
-  kwallet,
-  kwidgetsaddons,
-  ksanecore,
-  sane-backends,
-}:
-
-mkDerivation {
-  pname = "libksane";
-  meta = with lib; {
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ polendri ];
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    qtbase
-    ki18n
-    ktextwidgets
-    kwallet
-    kwidgetsaddons
-  ];
-  propagatedBuildInputs = [
-    ksanecore
-    sane-backends
-  ];
-}
diff --git a/pkgs/applications/kde/libksieve.nix b/pkgs/applications/kde/libksieve.nix
deleted file mode 100644
index f6e3d3252b3b..000000000000
--- a/pkgs/applications/kde/libksieve.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  karchive,
-  kcompletion,
-  kiconthemes,
-  kidentitymanagement,
-  kio,
-  kmailtransport,
-  knewstuff,
-  kwindowsystem,
-  kxmlgui,
-  libkdepim,
-  pimcommon,
-  qtwebengine,
-  syntax-highlighting,
-}:
-
-mkDerivation {
-  pname = "libksieve";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  outputs = [
-    "out"
-    "dev"
-  ];
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi
-    karchive
-    kcompletion
-    kiconthemes
-    kidentitymanagement
-    kio
-    kmailtransport
-    knewstuff
-    kwindowsystem
-    kxmlgui
-    libkdepim
-    pimcommon
-    qtwebengine
-  ];
-  propagatedBuildInputs = [ syntax-highlighting ];
-}
diff --git a/pkgs/applications/kde/libktorrent.nix b/pkgs/applications/kde/libktorrent.nix
deleted file mode 100644
index c7432bb0f1d3..000000000000
--- a/pkgs/applications/kde/libktorrent.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  karchive,
-  kcrash,
-  ki18n,
-  kio,
-  libgcrypt,
-  qca-qt5,
-  solid,
-  boost,
-  gmp,
-}:
-
-mkDerivation {
-  pname = "libktorrent";
-  meta = {
-    description = "BitTorrent library used by KTorrent";
-    homepage = "https://apps.kde.org/ktorrent/";
-    maintainers = [ ];
-  };
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    karchive
-    kcrash
-    ki18n
-    kio
-    libgcrypt
-    qca-qt5
-    solid
-  ];
-  propagatedBuildInputs = [
-    boost
-    gmp
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  dontWrapQtApps = true;
-}
diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix
deleted file mode 100644
index b703f056488b..000000000000
--- a/pkgs/applications/kde/mailcommon.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  akonadi-mime,
-  karchive,
-  kcodecs,
-  kcompletion,
-  kconfigwidgets,
-  kdbusaddons,
-  kdesignerplugin,
-  kiconthemes,
-  kio,
-  kitemmodels,
-  kldap,
-  kmailtransport,
-  kwindowsystem,
-  mailimporter,
-  messagelib,
-  phonon,
-  libkdepim,
-}:
-
-mkDerivation {
-  pname = "mailcommon";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi
-    akonadi-mime
-    karchive
-    kcodecs
-    kcompletion
-    kconfigwidgets
-    kdbusaddons
-    kdesignerplugin
-    kiconthemes
-    kio
-    kitemmodels
-    kldap
-    kmailtransport
-    kwindowsystem
-    mailimporter
-    messagelib
-    phonon
-    libkdepim
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix
deleted file mode 100644
index 270c515f5fe8..000000000000
--- a/pkgs/applications/kde/mailimporter.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  akonadi-mime,
-  karchive,
-  kcompletion,
-  kconfig,
-  kcoreaddons,
-  ki18n,
-  kmime,
-  kxmlgui,
-  libkdepim,
-  pimcommon,
-}:
-
-mkDerivation {
-  pname = "mailimporter";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi
-    akonadi-mime
-    karchive
-    kcompletion
-    kconfig
-    kcoreaddons
-    ki18n
-    kmime
-    kxmlgui
-    libkdepim
-    pimcommon
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$out/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
deleted file mode 100644
index e4a06dcd7a5d..000000000000
--- a/pkgs/applications/kde/marble.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  qtscript,
-  qtsvg,
-  qtquickcontrols,
-  qtwebengine,
-  krunner,
-  shared-mime-info,
-  kparts,
-  knewstuff,
-  gpsd,
-  perl,
-  protobuf_21,
-}:
-
-mkDerivation {
-  pname = "marble";
-  meta = {
-    homepage = "https://apps.kde.org/marble/";
-    description = "Virtual globe";
-    license = with lib.licenses; [
-      lgpl21
-      gpl3
-    ];
-  };
-  outputs = [
-    "out"
-    "dev"
-  ];
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    perl
-  ];
-  propagatedBuildInputs = [
-    protobuf_21
-    qtscript
-    qtsvg
-    qtquickcontrols
-    qtwebengine
-    shared-mime-info
-    krunner
-    kparts
-    knewstuff
-    gpsd
-  ];
-  cmakeFlags = [
-    "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
-  ];
-}
diff --git a/pkgs/applications/kde/mbox-importer.nix b/pkgs/applications/kde/mbox-importer.nix
deleted file mode 100644
index fe1864b11e84..000000000000
--- a/pkgs/applications/kde/mbox-importer.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  akonadi-search,
-  kconfig,
-  kservice,
-  kio,
-  mailcommon,
-  mailimporter,
-  messagelib,
-}:
-
-mkDerivation {
-  pname = "mbox-importer";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi
-    akonadi-search
-    kconfig
-    kservice
-    kio
-    mailcommon
-    mailimporter
-    messagelib
-  ];
-}
diff --git a/pkgs/applications/kde/merkuro.nix b/pkgs/applications/kde/merkuro.nix
deleted file mode 100644
index 89220319be13..000000000000
--- a/pkgs/applications/kde/merkuro.nix
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  cmake,
-  extra-cmake-modules,
-  makeWrapper,
-
-  qtbase,
-  qtquickcontrols2,
-  qtsvg,
-  qtlocation,
-  qtdeclarative,
-  qqc2-desktop-style,
-
-  kirigami2,
-  kirigami-addons,
-  kdbusaddons,
-  ki18n,
-  kcalendarcore,
-  kconfigwidgets,
-  kwindowsystem,
-  kcoreaddons,
-  kcontacts,
-  kitemmodels,
-  kxmlgui,
-  knotifications,
-  kiconthemes,
-  kservice,
-  kmime,
-  kpackage,
-  eventviews,
-  calendarsupport,
-
-  akonadi,
-  akonadi-search,
-  akonadi-contacts,
-  akonadi-calendar-tools,
-  kdepim-runtime,
-  gpgme,
-  pimcommon,
-  mailcommon,
-  messagelib,
-}:
-
-mkDerivation {
-  pname = "merkuro";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    makeWrapper
-  ];
-
-  buildInputs = [
-    qtbase
-    qtquickcontrols2
-    qtsvg
-    qtlocation
-    qtdeclarative
-    qqc2-desktop-style
-
-    kirigami2
-    kirigami-addons
-    kdbusaddons
-    ki18n
-    kcalendarcore
-    kconfigwidgets
-    kwindowsystem
-    kcoreaddons
-    kcontacts
-    kitemmodels
-    kxmlgui
-    knotifications
-    kiconthemes
-    kservice
-    kmime
-    kpackage
-    eventviews
-    calendarsupport
-
-    akonadi-search
-    akonadi-contacts
-    akonadi-calendar-tools
-    kdepim-runtime
-
-    gpgme
-    pimcommon
-    mailcommon
-    messagelib
-  ];
-
-  propagatedUserEnvPkgs = [
-    akonadi
-    kdepim-runtime
-    akonadi-search
-  ];
-  qtWrapperArgs = [
-    ''--prefix PATH : "${
-      lib.makeBinPath [
-        akonadi
-        kdepim-runtime
-        akonadi-search
-      ]
-    }"''
-  ];
-
-  meta = with lib; {
-    description = "Calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)";
-    homepage = "https://invent.kde.org/pim/merkuro";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ Thra11 ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix
deleted file mode 100644
index 8c1e91e9f6f2..000000000000
--- a/pkgs/applications/kde/messagelib.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  akonadi-mime,
-  akonadi-notes,
-  akonadi-search,
-  gpgme,
-  grantlee,
-  grantleetheme,
-  karchive,
-  kcodecs,
-  kconfig,
-  kconfigwidgets,
-  kcontacts,
-  kiconthemes,
-  kidentitymanagement,
-  kio,
-  kjobwidgets,
-  kldap,
-  kmailtransport,
-  kmbox,
-  kmime,
-  kwindowsystem,
-  libgravatar,
-  libkdepim,
-  libkleo,
-  pimcommon,
-  qca-qt5,
-  qtwebengine,
-  syntax-highlighting,
-}:
-
-mkDerivation {
-  pname = "messagelib";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi-notes
-    akonadi-search
-    gpgme
-    grantlee
-    grantleetheme
-    karchive
-    kcodecs
-    kconfig
-    kconfigwidgets
-    kiconthemes
-    kio
-    kjobwidgets
-    kldap
-    kmailtransport
-    kmbox
-    kmime
-    kwindowsystem
-    libgravatar
-    libkdepim
-    qca-qt5
-    syntax-highlighting
-  ];
-  propagatedBuildInputs = [
-    akonadi
-    akonadi-mime
-    kcontacts
-    kidentitymanagement
-    kmime
-    libkleo
-    pimcommon
-    qtwebengine
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  postInstall = ''
-    # added as an include directory by cmake files and fails to compile if it's missing
-    mkdir -p "$dev/include/KF5"
-  '';
-}
diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix
deleted file mode 100644
index c3000bdec25d..000000000000
--- a/pkgs/applications/kde/minuet.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  gettext,
-  python3,
-  drumstick,
-  fluidsynth,
-  kcoreaddons,
-  kcrash,
-  kdoctools,
-  qtquickcontrols2,
-  qtsvg,
-  qttools,
-  qtdeclarative,
-}:
-
-mkDerivation {
-  pname = "minuet";
-  meta = with lib; {
-    homepage = "https://apps.kde.org/minuet/";
-    description = "Music Education Software";
-    mainProgram = "minuet";
-    license = with licenses; [
-      lgpl21
-      gpl3
-    ];
-    maintainers = with maintainers; [
-      peterhoeg
-      HaoZeke
-    ];
-  };
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    gettext
-    kdoctools
-    python3
-    qtdeclarative
-  ];
-
-  propagatedBuildInputs = [
-    drumstick
-    fluidsynth
-    kcoreaddons
-    kcrash
-    qtquickcontrols2
-    qtsvg
-    qttools
-  ];
-
-  enableParallelBuilding = true;
-}
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
deleted file mode 100644
index 10ed1ebb0a96..000000000000
--- a/pkgs/applications/kde/okular.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  breeze-icons,
-  chmlib,
-  discount,
-  djvulibre,
-  ebook_tools,
-  kactivities,
-  karchive,
-  kbookmarks,
-  kcompletion,
-  kconfig,
-  kconfigwidgets,
-  kcoreaddons,
-  kdbusaddons,
-  kdegraphics-mobipocket,
-  kiconthemes,
-  kjs,
-  khtml,
-  kio,
-  kparts,
-  kpty,
-  kpurpose,
-  kwallet,
-  kwindowsystem,
-  libkexiv2,
-  libspectre,
-  libzip,
-  phonon,
-  poppler,
-  qca-qt5,
-  qtdeclarative,
-  qtsvg,
-  threadweaver,
-  kcrash,
-  withSpeech ? true,
-  qtspeech,
-  qtx11extras,
-}:
-
-mkDerivation {
-  pname = "okular";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  buildInputs = [
-    breeze-icons
-    discount
-    djvulibre
-    ebook_tools
-    kactivities
-    karchive
-    kbookmarks
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kdbusaddons
-    kdegraphics-mobipocket
-    kiconthemes
-    kjs
-    khtml
-    kio
-    kparts
-    kpty
-    kpurpose
-    kwallet
-    kwindowsystem
-    libkexiv2
-    libspectre
-    libzip
-    phonon
-    poppler
-    qca-qt5
-    qtdeclarative
-    qtsvg
-    threadweaver
-    kcrash
-    chmlib
-    qtx11extras
-  ]
-  ++ lib.optional withSpeech qtspeech;
-
-  # InitialPreference values are too high and end up making okular
-  # default for anything considered text/plain. Resetting to 1, which
-  # is the default.
-  postPatch = ''
-    substituteInPlace generators/txt/okularApplication_txt.desktop \
-      --replace InitialPreference=3 InitialPreference=1
-  '';
-
-  cmakeFlags = lib.optional (!withSpeech) "-DFORCE_NOT_REQUIRED_DEPENDENCIES=Qt5TextToSpeech";
-
-  meta = with lib; {
-    homepage = "http://www.kde.org";
-    description = "KDE document viewer";
-    mainProgram = "okular";
-    license = with licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-      bsd3
-    ];
-    maintainers = with maintainers; [ ttuegel ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/kde/palapeli.nix b/pkgs/applications/kde/palapeli.nix
deleted file mode 100644
index b6752063f539..000000000000
--- a/pkgs/applications/kde/palapeli.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  shared-mime-info,
-  kdoctools,
-  kio,
-  ktextwidgets,
-  libkdegames,
-}:
-
-mkDerivation {
-  pname = "palapeli";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    shared-mime-info
-  ];
-  buildInputs = [
-    libkdegames
-    kio
-    ktextwidgets
-  ];
-  meta = {
-    homepage = "https://apps.kde.org/palapeli/";
-    description = "Single-player jigsaw puzzle game";
-    mainProgram = "palapeli";
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ municorn ];
-  };
-}
diff --git a/pkgs/applications/kde/partitionmanager/default.nix b/pkgs/applications/kde/partitionmanager/default.nix
deleted file mode 100644
index 049348429534..000000000000
--- a/pkgs/applications/kde/partitionmanager/default.nix
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  wrapGAppsHook3,
-  kconfig,
-  kcrash,
-  kinit,
-  kpmcore,
-  polkit-qt,
-  cryptsetup,
-  lvm2,
-  mdadm,
-  smartmontools,
-  systemdMinimal,
-  util-linux,
-  btrfs-progs,
-  dosfstools,
-  e2fsprogs,
-  exfat,
-  f2fs-tools,
-  fatresize,
-  jfsutils,
-  nilfs-utils,
-  ntfs3g,
-  udftools,
-  xfsprogs,
-  zfs,
-}:
-
-let
-  # External programs are resolved by `partition-manager` and then
-  # invoked by `kpmcore_externalcommand` from `kpmcore` as root.
-  # So these packages should be in PATH of `partition-manager`.
-  # https://github.com/KDE/kpmcore/blob/06f15334ecfbe871730a90dbe2b694ba060ee998/src/util/externalcommand_whitelist.h
-  runtimeDeps = lib.makeBinPath [
-    cryptsetup
-    lvm2
-    mdadm
-    smartmontools
-    systemdMinimal
-    util-linux
-
-    btrfs-progs
-    dosfstools
-    e2fsprogs
-    exfat
-    f2fs-tools
-    fatresize
-    # hfsprogs intentionally omitted due to being unmaintained
-    jfsutils
-    nilfs-utils
-    ntfs3g
-    # reiser{4,fs}progs intentionally omitted due to filesystem removal from Linux.
-    udftools
-    xfsprogs
-    zfs
-
-    # FIXME: Missing command: tune.exfat hfsck hformat fsck.nilfs2 {fsck,mkfs,debugfs,tunefs}.ocfs2
-  ];
-
-in
-mkDerivation {
-  pname = "partitionmanager";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    wrapGAppsHook3
-  ];
-
-  propagatedBuildInputs = [
-    kconfig
-    kcrash
-    kinit
-    kpmcore
-    polkit-qt
-  ];
-
-  dontWrapGApps = true;
-  preFixup = ''
-    qtWrapperArgs+=(
-      "''${gappsWrapperArgs[@]}"
-      --prefix PATH : "${runtimeDeps}"
-    )
-  '';
-
-  passthru = {
-    inherit kpmcore;
-  };
-
-  meta = with lib; {
-    description = "KDE Partition Manager";
-    longDescription = ''
-      KDE Partition Manager is a utility to help you manage the disks, partitions, and file systems on your computer.
-      It allows you to easily create, copy, move, delete, back up, restore, and resize them without losing data.
-      It supports a large number of file systems, including ext2/3/4, btrfs, NTFS, FAT16/32, JFS, XFS and more.
-
-      To install on NixOS, use the option `programs.partition-manager.enable = true`.
-    '';
-    license = with licenses; [
-      cc-by-40
-      cc0
-      gpl3Plus
-      lgpl3Plus
-      mit
-    ];
-    homepage = "https://www.kde.org/applications/system/kdepartitionmanager/";
-    maintainers = with maintainers; [
-      peterhoeg
-      oxalica
-    ];
-    mainProgram = "partitionmanager";
-  };
-}
diff --git a/pkgs/applications/kde/picmi.nix b/pkgs/applications/kde/picmi.nix
deleted file mode 100644
index 7261f1f39256..000000000000
--- a/pkgs/applications/kde/picmi.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  libkdegames,
-  extra-cmake-modules,
-  kdeclarative,
-  knewstuff,
-}:
-
-mkDerivation {
-  pname = "picmi";
-  meta = with lib; {
-    homepage = "https://apps.kde.org/picmi/";
-    description = "Nonogram game";
-    mainProgram = "picmi";
-    longDescription = ''
-      The goal is to reveal the hidden pattern in the board by coloring or
-      leaving blank the cells in a grid according to numbers given at the side of the grid.
-    '';
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kdeclarative
-    knewstuff
-    libkdegames
-  ];
-}
diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix
deleted file mode 100644
index f40365eb36da..000000000000
--- a/pkgs/applications/kde/pim-data-exporter.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  akonadi-notes,
-  kcalendarcore,
-  kcmutils,
-  kcrash,
-  kdbusaddons,
-  kidentitymanagement,
-  kldap,
-  kmailtransport,
-  knewstuff,
-  knotifications,
-  knotifyconfig,
-  kparts,
-  kross,
-  ktexteditor,
-  kuserfeedback,
-  kwallet,
-  libkdepim,
-  libkleo,
-  pimcommon,
-  qttools,
-  karchive,
-  mailcommon,
-  messagelib,
-}:
-
-mkDerivation {
-  pname = "pim-data-exporter";
-  meta = {
-    homepage = "https://apps.kde.org/pimdataexporter/";
-    description = "Saves and restores all data from PIM apps";
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi
-    akonadi-notes
-    kcalendarcore
-    kcmutils
-    kcrash
-    kdbusaddons
-    kidentitymanagement
-    kldap
-    kmailtransport
-    knewstuff
-    knotifications
-    knotifyconfig
-    kparts
-    kross
-    ktexteditor
-    kuserfeedback
-    kwallet
-    libkdepim
-    libkleo
-    pimcommon
-    qttools
-    karchive
-    mailcommon
-    messagelib
-  ];
-}
diff --git a/pkgs/applications/kde/pim-sieve-editor.nix b/pkgs/applications/kde/pim-sieve-editor.nix
deleted file mode 100644
index def5908a205d..000000000000
--- a/pkgs/applications/kde/pim-sieve-editor.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  kdbusaddons,
-  kcrash,
-  kbookmarks,
-  kiconthemes,
-  kio,
-  kpimtextedit,
-  kmailtransport,
-  kuserfeedback,
-  libksieve,
-  pimcommon,
-  qtkeychain,
-  libsecret,
-}:
-
-mkDerivation {
-  pname = "pim-sieve-editor";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kdbusaddons
-    kcrash
-    kbookmarks
-    kiconthemes
-    kio
-    kpimtextedit
-    kmailtransport
-    kuserfeedback
-    libksieve
-    pimcommon
-    qtkeychain
-    libsecret
-  ];
-}
diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix
deleted file mode 100644
index 1fa03b02b5c6..000000000000
--- a/pkgs/applications/kde/pimcommon.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdepimTeam,
-  extra-cmake-modules,
-  kdoctools,
-  akonadi,
-  akonadi-contacts,
-  akonadi-mime,
-  akonadi-search,
-  grantlee,
-  karchive,
-  kcmutils,
-  kcodecs,
-  kcompletion,
-  kconfig,
-  kconfigwidgets,
-  kcontacts,
-  kdbusaddons,
-  kiconthemes,
-  kimap,
-  kio,
-  kitemmodels,
-  kjobwidgets,
-  kldap,
-  knewstuff,
-  kpimtextedit,
-  kpurpose,
-  kwallet,
-  kwindowsystem,
-  libkdepim,
-  qtwebengine,
-  ktextaddons,
-}:
-
-mkDerivation {
-  pname = "pimcommon";
-  meta = {
-    license = with lib.licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    akonadi-mime
-    grantlee
-    karchive
-    kcmutils
-    kcodecs
-    kcompletion
-    kconfigwidgets
-    kdbusaddons
-    kiconthemes
-    kio
-    kitemmodels
-    kjobwidgets
-    knewstuff
-    kldap
-    kpurpose
-    kwallet
-    kwindowsystem
-    libkdepim
-    qtwebengine
-    ktextaddons
-  ];
-  propagatedBuildInputs = [
-    akonadi
-    akonadi-contacts
-    akonadi-search
-    kconfig
-    kcontacts
-    kimap
-    kpimtextedit
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-}
diff --git a/pkgs/applications/kde/plasmatube/default.nix b/pkgs/applications/kde/plasmatube/default.nix
deleted file mode 100644
index b9f4602a731f..000000000000
--- a/pkgs/applications/kde/plasmatube/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  wrapGAppsHook3,
-  gst_all_1,
-  kcoreaddons,
-  kdeclarative,
-  ki18n,
-  kirigami2,
-  mpv,
-  qtmultimedia,
-  qtquickcontrols2,
-  yt-dlp,
-}:
-
-mkDerivation {
-  pname = "plasmatube";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    kcoreaddons
-    kdeclarative
-    ki18n
-    kirigami2
-    mpv
-    qtmultimedia
-    qtquickcontrols2
-  ]
-  ++ (with gst_all_1; [
-    gst-plugins-bad
-    gst-plugins-base
-    gst-plugins-good
-    gstreamer
-  ]);
-
-  qtWrapperArgs = [
-    "--prefix"
-    "PATH"
-    ":"
-    (lib.makeBinPath [ yt-dlp ])
-  ];
-
-  preFixup = ''
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-  dontWrapGApps = true;
-
-  meta = {
-    description = "Youtube player powered by an invidious server";
-    mainProgram = "plasmatube";
-    homepage = "https://invent.kde.org/plasma-mobile/plasmatube";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix
deleted file mode 100644
index 5b213cc914ee..000000000000
--- a/pkgs/applications/kde/print-manager.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  cups,
-  ki18n,
-  kconfig,
-  kconfigwidgets,
-  kdbusaddons,
-  kiconthemes,
-  kcmutils,
-  kio,
-  knotifications,
-  kwidgetsaddons,
-  kwindowsystem,
-  kitemviews,
-  plasma-framework,
-  qtdeclarative,
-}:
-
-mkDerivation {
-  pname = "print-manager";
-  meta = {
-    license = [ lib.licenses.gpl2 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    cups
-    ki18n
-  ];
-  propagatedBuildInputs = [
-    kconfig
-    kconfigwidgets
-    kdbusaddons
-    kiconthemes
-    kcmutils
-    knotifications
-    kwidgetsaddons
-    kitemviews
-    kio
-    kwindowsystem
-    plasma-framework
-    qtdeclarative
-  ];
-  outputs = [
-    "out"
-    "dev"
-  ];
-  # Fix build with cups deprecations etc.
-  # See: https://github.com/NixOS/nixpkgs/issues/73334
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security";
-}
diff --git a/pkgs/applications/kde/qmlkonsole.nix b/pkgs/applications/kde/qmlkonsole.nix
deleted file mode 100644
index 5cf001eb1ed1..000000000000
--- a/pkgs/applications/kde/qmlkonsole.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-
-  kconfig,
-  ki18n,
-  kirigami-addons,
-  kirigami2,
-  kcoreaddons,
-  qtquickcontrols2,
-  kwindowsystem,
-  qmltermwidget,
-}:
-
-mkDerivation {
-  pname = "qmlkonsole";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    kconfig
-    ki18n
-    kirigami-addons
-    kirigami2
-    qtquickcontrols2
-    kcoreaddons
-    kwindowsystem
-    qmltermwidget
-  ];
-
-  meta = with lib; {
-    description = "Terminal app for Plasma Mobile";
-    mainProgram = "qmlkonsole";
-    homepage = "https://invent.kde.org/plasma-mobile/qmlkonsole";
-    license = with licenses; [
-      gpl2Plus
-      gpl3Plus
-      cc0
-    ];
-    maintainers = with maintainers; [ balsoft ];
-  };
-}
diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix
deleted file mode 100644
index 6742ad2182c7..000000000000
--- a/pkgs/applications/kde/rocs.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  boost,
-  qtbase,
-  qtscript,
-  qtquickcontrols,
-  qtxmlpatterns,
-  grantlee,
-  kdoctools,
-  karchive,
-  kxmlgui,
-  kcrash,
-  kdeclarative,
-  ktexteditor,
-  kguiaddons,
-}:
-
-mkDerivation {
-  pname = "rocs";
-
-  meta = with lib; {
-    homepage = "https://edu.kde.org/rocs/";
-    description = "Graph theory IDE";
-    mainProgram = "rocs";
-    license = with licenses; [
-      gpl2Plus
-      lgpl21Plus
-      fdl12Plus
-    ];
-    platforms = lib.platforms.linux;
-    maintainers = with maintainers; [ knairda ];
-  };
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    boost
-    qtbase
-    qtscript
-    qtquickcontrols
-    qtxmlpatterns
-    grantlee
-    kxmlgui
-    kcrash
-    kdeclarative
-    karchive
-    ktexteditor
-    kguiaddons
-  ];
-}
diff --git a/pkgs/applications/kde/skanlite.nix b/pkgs/applications/kde/skanlite.nix
deleted file mode 100644
index 6dcba10e0897..000000000000
--- a/pkgs/applications/kde/skanlite.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  wrapGAppsHook3,
-  extra-cmake-modules,
-  kdoctools,
-  kio,
-  libksane,
-}:
-
-mkDerivation {
-  pname = "skanlite";
-  meta = with lib; {
-    description = "KDE simple image scanning application";
-    mainProgram = "skanlite";
-    homepage = "https://apps.kde.org/skanlite";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ polendri ];
-  };
-
-  nativeBuildInputs = [
-    wrapGAppsHook3
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kio
-    libksane
-  ];
-}
diff --git a/pkgs/applications/kde/skanpage.nix b/pkgs/applications/kde/skanpage.nix
deleted file mode 100644
index 8f4a636f5cb1..000000000000
--- a/pkgs/applications/kde/skanpage.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  extra-cmake-modules,
-  kirigami2,
-  ktextwidgets,
-  libksane,
-  qtquickcontrols2,
-  kpurpose,
-  kquickimageedit,
-}:
-
-mkDerivation {
-  pname = "skanpage";
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-
-  buildInputs = [
-    kirigami2
-    ktextwidgets
-    libksane
-    qtquickcontrols2
-    kpurpose
-    kquickimageedit
-  ];
-
-  meta = with lib; {
-    description = "KDE utility to scan images and multi-page documents";
-    mainProgram = "skanpage";
-    homepage = "https://apps.kde.org/skanpage";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
deleted file mode 100644
index 657af4cbc26b..000000000000
--- a/pkgs/applications/kde/spectacle.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  kdoctools,
-  ki18n,
-  xcb-util-cursor,
-  kconfig,
-  kcoreaddons,
-  kdbusaddons,
-  kdeclarative,
-  kio,
-  kipi-plugins,
-  knotifications,
-  kscreen,
-  kwidgetsaddons,
-  kwindowsystem,
-  kxmlgui,
-  libkipi,
-  qtx11extras,
-  knewstuff,
-  kwayland,
-  qttools,
-  kcolorpicker,
-  kimageannotator,
-  qcoro,
-  qtquickcontrols2,
-  wayland,
-  plasma-wayland-protocols,
-  kpurpose,
-  kpipewire,
-  wrapGAppsHook3,
-  wayland-scanner,
-}:
-
-mkDerivation {
-  pname = "spectacle";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    wrapGAppsHook3
-    wayland-scanner
-  ];
-  buildInputs = [
-    kconfig
-    kcoreaddons
-    kdbusaddons
-    kdeclarative
-    ki18n
-    kio
-    knotifications
-    kscreen
-    kwidgetsaddons
-    kwindowsystem
-    kxmlgui
-    libkipi
-    qtx11extras
-    xcb-util-cursor
-    knewstuff
-    kwayland
-    kcolorpicker
-    kimageannotator
-    qcoro
-    qtquickcontrols2
-    wayland
-    plasma-wayland-protocols
-    kpurpose
-    kpipewire
-  ];
-  postPatch = ''
-    substituteInPlace desktop/org.kde.spectacle.desktop.cmake \
-      --replace "Exec=@QtBinariesDir@/qdbus" "Exec=${lib.getBin qttools}/bin/qdbus"
-  '';
-
-  dontWrapGApps = true;
-
-  preFixup = ''
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
-  propagatedUserEnvPkgs = [
-    kipi-plugins
-    libkipi
-  ];
-  meta = with lib; {
-    homepage = "https://apps.kde.org/spectacle/";
-    description = "Screenshot capture utility";
-    mainProgram = "spectacle";
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
deleted file mode 100644
index 58f9d0e73b8c..000000000000
--- a/pkgs/applications/kde/srcs.nix
+++ /dev/null
@@ -1,1942 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde
-{ fetchurl, mirror }:
-
-{
-  akonadi = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/akonadi-23.08.5.tar.xz";
-      sha256 = "0f2gkifli8aslcrcqclai6kv9vrimmsj2afp378nljh8q4ldpnxb";
-      name = "akonadi-23.08.5.tar.xz";
-    };
-  };
-  akonadi-calendar = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/akonadi-calendar-23.08.5.tar.xz";
-      sha256 = "1jirjckcix5ny3dqqk7qf1089kwfvzibk2jaxr437v8jji0ak3fg";
-      name = "akonadi-calendar-23.08.5.tar.xz";
-    };
-  };
-  akonadi-calendar-tools = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/akonadi-calendar-tools-23.08.5.tar.xz";
-      sha256 = "1al0b11cln9axh3fhv4hlns73v7z36yq24z1v8i6ka4n81445fw3";
-      name = "akonadi-calendar-tools-23.08.5.tar.xz";
-    };
-  };
-  akonadi-contacts = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/akonadi-contacts-23.08.5.tar.xz";
-      sha256 = "0la2rxcngxffm7pz6xmmv3zv2qzand88194q8c3xpnxlddyb7977";
-      name = "akonadi-contacts-23.08.5.tar.xz";
-    };
-  };
-  akonadi-import-wizard = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/akonadi-import-wizard-23.08.5.tar.xz";
-      sha256 = "19jdk7bcb0cyd28lwzfm1nyzsvh9wm664c27mhfadsin0jy9dj9w";
-      name = "akonadi-import-wizard-23.08.5.tar.xz";
-    };
-  };
-  akonadi-mime = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/akonadi-mime-23.08.5.tar.xz";
-      sha256 = "0cy8wl6r9arzy6zb4mmzy7nxy7j647kklrwms43q3zkkxacyah7x";
-      name = "akonadi-mime-23.08.5.tar.xz";
-    };
-  };
-  akonadi-notes = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/akonadi-notes-23.08.5.tar.xz";
-      sha256 = "13l3wnmbips201xpa8wk7gj35m4fnw1aqd8js15sinc7r768wfpy";
-      name = "akonadi-notes-23.08.5.tar.xz";
-    };
-  };
-  akonadi-search = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/akonadi-search-23.08.5.tar.xz";
-      sha256 = "1d5dh5jn1a7l1w0ab0vabrcbhj3sy18g9ya9p50agvk8fh5ka8gg";
-      name = "akonadi-search-23.08.5.tar.xz";
-    };
-  };
-  akonadiconsole = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/akonadiconsole-23.08.5.tar.xz";
-      sha256 = "171apc4vdwlg4904am5cnb3rcsv4f9bfcpk4y46ki0dvi3x4vj31";
-      name = "akonadiconsole-23.08.5.tar.xz";
-    };
-  };
-  akregator = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/akregator-23.08.5.tar.xz";
-      sha256 = "12q2d3w4jk6mzglabzx8djmsd6y5b5bfx02gnncgpm2n5a3iydsj";
-      name = "akregator-23.08.5.tar.xz";
-    };
-  };
-  alligator = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/alligator-23.08.5.tar.xz";
-      sha256 = "17h0h2gl3ybawnnlj1v1mz7izb6vj3rkan3fkdvjb1w63fm7pgaa";
-      name = "alligator-23.08.5.tar.xz";
-    };
-  };
-  analitza = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/analitza-23.08.5.tar.xz";
-      sha256 = "1h06nr5fclkp6f98pdw45ibn03bv29js294czi0y7n3w729kxzs6";
-      name = "analitza-23.08.5.tar.xz";
-    };
-  };
-  angelfish = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/angelfish-23.08.5.tar.xz";
-      sha256 = "0rpc4kqvmxmx393vbj92303phzf72k5djgy1c6fmmbx87myj2aic";
-      name = "angelfish-23.08.5.tar.xz";
-    };
-  };
-  arianna = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/arianna-23.08.5.tar.xz";
-      sha256 = "0rf3538940zxkgfsi34zha0k0k1895dj9sbl86kr0bsqjsjvpzgg";
-      name = "arianna-23.08.5.tar.xz";
-    };
-  };
-  ark = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ark-23.08.5.tar.xz";
-      sha256 = "1sygmsbrd6ps8zjy29n7nsfilij3737x50qld49m3qnlw9jcb0b0";
-      name = "ark-23.08.5.tar.xz";
-    };
-  };
-  artikulate = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/artikulate-23.08.5.tar.xz";
-      sha256 = "18bb67l0hklmyaxciwpfd92n4xyqlmr6qismf7kzsksjv2k9n2d7";
-      name = "artikulate-23.08.5.tar.xz";
-    };
-  };
-  audiocd-kio = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/audiocd-kio-23.08.5.tar.xz";
-      sha256 = "1ir383qwfcabdc0x3203x60k6vpkzcjmay5dk6vk4ra5hglvrj2m";
-      name = "audiocd-kio-23.08.5.tar.xz";
-    };
-  };
-  audiotube = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/audiotube-23.08.5.tar.xz";
-      sha256 = "06bx8bsz784z19937vf723dylpfk7xah2w0p4c1vhv47mznqn991";
-      name = "audiotube-23.08.5.tar.xz";
-    };
-  };
-  baloo-widgets = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/baloo-widgets-23.08.5.tar.xz";
-      sha256 = "1m1q77qagyiv9bnnsyzwi6mh48slwdgb725k1awkisyzfiznq6a9";
-      name = "baloo-widgets-23.08.5.tar.xz";
-    };
-  };
-  blinken = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/blinken-23.08.5.tar.xz";
-      sha256 = "1im3gci81bdh3il0fyf9d2pxdkdcp1pkn9ib5z8isyy9ffclpl2a";
-      name = "blinken-23.08.5.tar.xz";
-    };
-  };
-  bomber = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/bomber-23.08.5.tar.xz";
-      sha256 = "12mk93y3y006n6rm4p1n9xcx6wq84rnxgjc9rnvf46hg99fb37kn";
-      name = "bomber-23.08.5.tar.xz";
-    };
-  };
-  bovo = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/bovo-23.08.5.tar.xz";
-      sha256 = "0jqy3yjq9qjl52bcph3pycslqs7rbw40axzmznr4h4wzj36b6yfv";
-      name = "bovo-23.08.5.tar.xz";
-    };
-  };
-  calendarsupport = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/calendarsupport-23.08.5.tar.xz";
-      sha256 = "1wrydz0nn6k9f8vwcfcsd95dc9b0y5y6xycwaynmsl8rgskmryk5";
-      name = "calendarsupport-23.08.5.tar.xz";
-    };
-  };
-  calindori = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/calindori-23.08.5.tar.xz";
-      sha256 = "03ls91vr495i3qxs49whl4ks7sx8frnfqw4prs9nxpx9gjysn13a";
-      name = "calindori-23.08.5.tar.xz";
-    };
-  };
-  cantor = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/cantor-23.08.5.tar.xz";
-      sha256 = "07fq3zfcd3hxgi1pa6ma7gw852ry4x9fzj1yy7a2bk2lz2b0p5mz";
-      name = "cantor-23.08.5.tar.xz";
-    };
-  };
-  cervisia = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/cervisia-23.08.5.tar.xz";
-      sha256 = "07vzn6g87m737nbxb8qqsds3bc5spkn9z060jjwyzdpjj3sld2b0";
-      name = "cervisia-23.08.5.tar.xz";
-    };
-  };
-  colord-kde = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/colord-kde-23.08.5.tar.xz";
-      sha256 = "1f80dqax0wk4g94140qd0lij2vf9083kbsdl7hkc19ric6y2fss6";
-      name = "colord-kde-23.08.5.tar.xz";
-    };
-  };
-  dolphin = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/dolphin-23.08.5.tar.xz";
-      sha256 = "1wziw71xyjz2457hb5l8f9sg5l4f340z341pd87qkzkdavdan2b3";
-      name = "dolphin-23.08.5.tar.xz";
-    };
-  };
-  dolphin-plugins = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/dolphin-plugins-23.08.5.tar.xz";
-      sha256 = "0pf0ddg8dz8l959yd6sig54411gylp8il1wjpfr7ihcd8zm8wi1g";
-      name = "dolphin-plugins-23.08.5.tar.xz";
-    };
-  };
-  dragon = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/dragon-23.08.5.tar.xz";
-      sha256 = "0w8ml7087z4vikp92mh6cm2mzxp4zjk0cr8mxzvap745vbxj21j1";
-      name = "dragon-23.08.5.tar.xz";
-    };
-  };
-  elisa = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/elisa-23.08.5.tar.xz";
-      sha256 = "1hml0bmp1cfqc9x9q2a1lz2f6ab7ygblf6xz0qlwjxripvqw8b47";
-      name = "elisa-23.08.5.tar.xz";
-    };
-  };
-  eventviews = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/eventviews-23.08.5.tar.xz";
-      sha256 = "06qwmzxayfxsyzmg90j1xycvfs6ynyggvk0xkrf7gfp682ckba99";
-      name = "eventviews-23.08.5.tar.xz";
-    };
-  };
-  falkon = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/falkon-23.08.5.tar.xz";
-      sha256 = "0xxhhdqlxfs97qphfpkb8gfmsi1gk3cbpd2y4rj0zrd668a5y2l0";
-      name = "falkon-23.08.5.tar.xz";
-    };
-  };
-  ffmpegthumbs = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ffmpegthumbs-23.08.5.tar.xz";
-      sha256 = "1pz5bc52z5lkydl1w9c6bhvbdjn07p3r4qgx36xl3wfc5zi3rn6s";
-      name = "ffmpegthumbs-23.08.5.tar.xz";
-    };
-  };
-  filelight = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/filelight-23.08.5.tar.xz";
-      sha256 = "08kmy39r6l6akkkl00snjvw5zf5115gc5czf1m5xr189zjp4vz5p";
-      name = "filelight-23.08.5.tar.xz";
-    };
-  };
-  ghostwriter = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ghostwriter-23.08.5.tar.xz";
-      sha256 = "1nfhnjf627p3qgfamy1nb09dvqavv0qh5cs6czpy4ghz8i4mddx0";
-      name = "ghostwriter-23.08.5.tar.xz";
-    };
-  };
-  granatier = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/granatier-23.08.5.tar.xz";
-      sha256 = "1vi9cws499g9962k4hyjzl13sbsrga0qyjqdp9i0v5pr3mi4l1zh";
-      name = "granatier-23.08.5.tar.xz";
-    };
-  };
-  grantlee-editor = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/grantlee-editor-23.08.5.tar.xz";
-      sha256 = "130a57bmg6ydcj0jn21i39ilf61prsisz2f2lw9gcq5g1s2xbk9j";
-      name = "grantlee-editor-23.08.5.tar.xz";
-    };
-  };
-  grantleetheme = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/grantleetheme-23.08.5.tar.xz";
-      sha256 = "1xa2y8zxn6s9hvs6nsf2bzkifg1xcdk9mz7r2pj2h3gvl2rq2qv8";
-      name = "grantleetheme-23.08.5.tar.xz";
-    };
-  };
-  gwenview = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/gwenview-23.08.5.tar.xz";
-      sha256 = "0f4h2vf8nkz1jcrxw98n52divvdmxh434659m1pd4l5pag0d3z54";
-      name = "gwenview-23.08.5.tar.xz";
-    };
-  };
-  incidenceeditor = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/incidenceeditor-23.08.5.tar.xz";
-      sha256 = "153kh0syw4v67sfjfhq45s34mlsz6lz96mvmfrl9lm9dn5bwyq6z";
-      name = "incidenceeditor-23.08.5.tar.xz";
-    };
-  };
-  juk = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/juk-23.08.5.tar.xz";
-      sha256 = "0wddl5sp2sbi8c8vxrqikipv2d6b65w28nxzsinz703cliyjcx67";
-      name = "juk-23.08.5.tar.xz";
-    };
-  };
-  k3b = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/k3b-23.08.5.tar.xz";
-      sha256 = "16ihb7xnzjbcywfki6vx932m3wi691n70ribzl85fl688n5m32f7";
-      name = "k3b-23.08.5.tar.xz";
-    };
-  };
-  kaccounts-integration = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kaccounts-integration-23.08.5.tar.xz";
-      sha256 = "1f99s7hiix1ccp8zz2z6vb1xf13ffpaan6sqqz4xz1y3jmaf4bn0";
-      name = "kaccounts-integration-23.08.5.tar.xz";
-    };
-  };
-  kaccounts-providers = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kaccounts-providers-23.08.5.tar.xz";
-      sha256 = "1ig5k4aalqcq6jjj0y6kg914zj2a0bc3pvws6kjhcyc1kq1q0g88";
-      name = "kaccounts-providers-23.08.5.tar.xz";
-    };
-  };
-  kaddressbook = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kaddressbook-23.08.5.tar.xz";
-      sha256 = "08lbkbscqaa5ir7knby457zi0ig79280rcan1fak7gapvpipwhd8";
-      name = "kaddressbook-23.08.5.tar.xz";
-    };
-  };
-  kajongg = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kajongg-23.08.5.tar.xz";
-      sha256 = "05ji28lld3y80smj6krwrv5hb74j4wchv65b2q046snk5i5hlf0p";
-      name = "kajongg-23.08.5.tar.xz";
-    };
-  };
-  kalarm = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kalarm-23.08.5.tar.xz";
-      sha256 = "1g85pm0l5wjd1hp10klsz8prnic9g7jcbp56a1wkf0f25pzg1pq9";
-      name = "kalarm-23.08.5.tar.xz";
-    };
-  };
-  kalgebra = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kalgebra-23.08.5.tar.xz";
-      sha256 = "0fjkx5m34qwgad9amjbgql4awbl8irqhfyrfrxjpwp773lhifbq4";
-      name = "kalgebra-23.08.5.tar.xz";
-    };
-  };
-  kalk = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kalk-23.08.5.tar.xz";
-      sha256 = "1q4p6f4xrd73iqw1dqk2z65sly123dh9gwvi07i71dk49r9ykrfr";
-      name = "kalk-23.08.5.tar.xz";
-    };
-  };
-  kalzium = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kalzium-23.08.5.tar.xz";
-      sha256 = "1134q2z6vx8p244grk8szxnlw942ry50a72j2qfyf96ksrs5bz4v";
-      name = "kalzium-23.08.5.tar.xz";
-    };
-  };
-  kamera = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kamera-23.08.5.tar.xz";
-      sha256 = "1chddpy4larjavd2c2blzxk23kay7hbpsm06fxfa052344qqd5j6";
-      name = "kamera-23.08.5.tar.xz";
-    };
-  };
-  kamoso = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kamoso-23.08.5.tar.xz";
-      sha256 = "00cdy2yyaw3p6vv0hg4zgc70yyggy6v6yzp97m8c21i9v8w4bk44";
-      name = "kamoso-23.08.5.tar.xz";
-    };
-  };
-  kanagram = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kanagram-23.08.5.tar.xz";
-      sha256 = "0163sja60kysny0zbq76q438hxfmv2a9hxrbzhqsniy38w5zr44j";
-      name = "kanagram-23.08.5.tar.xz";
-    };
-  };
-  kapman = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kapman-23.08.5.tar.xz";
-      sha256 = "1rx1rrka76r4y5d71kxin8zb8b4xgfndf8g5875ygfij0l05yxg3";
-      name = "kapman-23.08.5.tar.xz";
-    };
-  };
-  kapptemplate = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kapptemplate-23.08.5.tar.xz";
-      sha256 = "0lan9219l29vdg974cpnchndwsl9g59w13kdkz8hmcb1fycxcy4v";
-      name = "kapptemplate-23.08.5.tar.xz";
-    };
-  };
-  kasts = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kasts-23.08.5.tar.xz";
-      sha256 = "1n5n2rlfsp4fn34xsmcsvmacgy3h88md5aynsxaw8hf8mhl7hrwh";
-      name = "kasts-23.08.5.tar.xz";
-    };
-  };
-  kate = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kate-23.08.5.tar.xz";
-      sha256 = "0dsfiwd0v0chmcc0v2s193fdyals4ijpnq0bcssd9axjqkcljg38";
-      name = "kate-23.08.5.tar.xz";
-    };
-  };
-  katomic = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/katomic-23.08.5.tar.xz";
-      sha256 = "0hmc873kydzgrz0shz53qaii5bqm4rwh2c12w1d9xrml38yxpchd";
-      name = "katomic-23.08.5.tar.xz";
-    };
-  };
-  kbackup = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kbackup-23.08.5.tar.xz";
-      sha256 = "0pxyqvn2m9q6qh77156vx7spjj53a4shn3sqqyvlqv7acxd4sv51";
-      name = "kbackup-23.08.5.tar.xz";
-    };
-  };
-  kblackbox = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kblackbox-23.08.5.tar.xz";
-      sha256 = "0n918g1146fpi2h86sphaxjqpad3ff9mawkh8wzr9jqb91bjw200";
-      name = "kblackbox-23.08.5.tar.xz";
-    };
-  };
-  kblocks = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kblocks-23.08.5.tar.xz";
-      sha256 = "09xadysjcxpkab805a4hdg9qsp9wv1jkbrmmy4dmbghv7rl9fjcg";
-      name = "kblocks-23.08.5.tar.xz";
-    };
-  };
-  kbounce = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kbounce-23.08.5.tar.xz";
-      sha256 = "1yxcy10bkz3wj48dys9ag4nm2r7acn7syfj76ss508mdysxw00gi";
-      name = "kbounce-23.08.5.tar.xz";
-    };
-  };
-  kbreakout = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kbreakout-23.08.5.tar.xz";
-      sha256 = "0j5gcqvbpr9973bkzxsl0pcic4rbc3x5f9ry20cqb3z311mkhbyh";
-      name = "kbreakout-23.08.5.tar.xz";
-    };
-  };
-  kbruch = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kbruch-23.08.5.tar.xz";
-      sha256 = "10hiw23kpil059vsscpz0xssxj5x7036jvm84icgzj9vhbklfzfv";
-      name = "kbruch-23.08.5.tar.xz";
-    };
-  };
-  kcachegrind = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kcachegrind-23.08.5.tar.xz";
-      sha256 = "1dmpvg1h6zfwg25zl4rkkf43n7q5lyawyf1pa2q9s15hmnvqfrh5";
-      name = "kcachegrind-23.08.5.tar.xz";
-    };
-  };
-  kcalc = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kcalc-23.08.5.tar.xz";
-      sha256 = "0zj32xipmzq7bipdi5yj2wkig5sfgdhl0b7z9q5lhnzji5rxcig5";
-      name = "kcalc-23.08.5.tar.xz";
-    };
-  };
-  kcalutils = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kcalutils-23.08.5.tar.xz";
-      sha256 = "0gbahhzx14zd0rkwkpxxfhvs6dd9m3ajzajwrqyy6kd9zbfwgdlx";
-      name = "kcalutils-23.08.5.tar.xz";
-    };
-  };
-  kcharselect = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kcharselect-23.08.5.tar.xz";
-      sha256 = "11k3x06r9p7jgjl2rpkm10gkqkjj0ysrb7116482d20i09n348mz";
-      name = "kcharselect-23.08.5.tar.xz";
-    };
-  };
-  kclock = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kclock-23.08.5.tar.xz";
-      sha256 = "1cdqpcngg096vig7q04n0p9blrrxynphmkhq9y13vaywjvq744yx";
-      name = "kclock-23.08.5.tar.xz";
-    };
-  };
-  kcolorchooser = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kcolorchooser-23.08.5.tar.xz";
-      sha256 = "08dvjaczf88kv8ii754v30b6r1p8cm0l4r81jds7ffs23wcphan6";
-      name = "kcolorchooser-23.08.5.tar.xz";
-    };
-  };
-  kcron = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kcron-23.08.5.tar.xz";
-      sha256 = "0hnwkn2pvmmx9cqfchbwiw1pka893izs9pw7ina2am7x6x0y7s82";
-      name = "kcron-23.08.5.tar.xz";
-    };
-  };
-  kde-dev-scripts = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kde-dev-scripts-23.08.5.tar.xz";
-      sha256 = "1wn1g8sgxw2hhc4w2xs0fh45yr6vbfizx5npxsr7qqnl9d2q5c8c";
-      name = "kde-dev-scripts-23.08.5.tar.xz";
-    };
-  };
-  kde-dev-utils = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kde-dev-utils-23.08.5.tar.xz";
-      sha256 = "10zfdznf0n57q18q9nqn3ckgx200m10laylyl20qv65kh4zzbp96";
-      name = "kde-dev-utils-23.08.5.tar.xz";
-    };
-  };
-  kde-inotify-survey = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kde-inotify-survey-23.08.5.tar.xz";
-      sha256 = "0qwcwzx25hvvais13bq2mdvhk0lsj8k8mw34h075rkhrbgir5j1q";
-      name = "kde-inotify-survey-23.08.5.tar.xz";
-    };
-  };
-  kdebugsettings = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdebugsettings-23.08.5.tar.xz";
-      sha256 = "042bw5jmdg9ahwxv24yg8yzcd7fr2xdnph4r83z4jiz7z8f01ccq";
-      name = "kdebugsettings-23.08.5.tar.xz";
-    };
-  };
-  kdeconnect-kde = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdeconnect-kde-23.08.5.tar.xz";
-      sha256 = "0r0d604nki60g0x06131hsn0fqdy59xi9iq9vlnvmf94z1kcshjb";
-      name = "kdeconnect-kde-23.08.5.tar.xz";
-    };
-  };
-  kdeedu-data = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdeedu-data-23.08.5.tar.xz";
-      sha256 = "0d139xqm3iv5h7ns57wgxxm3rynvb80f991aa1dsc768170nbnli";
-      name = "kdeedu-data-23.08.5.tar.xz";
-    };
-  };
-  kdegraphics-mobipocket = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdegraphics-mobipocket-23.08.5.tar.xz";
-      sha256 = "1z53132pll7w0z2p4iifcny19ahgvqnk0bm0pdgi815hqwdsjkvi";
-      name = "kdegraphics-mobipocket-23.08.5.tar.xz";
-    };
-  };
-  kdegraphics-thumbnailers = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdegraphics-thumbnailers-23.08.5.tar.xz";
-      sha256 = "0c3gk3badbparz327a1d2i78qwg335i2k36y4sh9s1zs74008nmh";
-      name = "kdegraphics-thumbnailers-23.08.5.tar.xz";
-    };
-  };
-  kdenetwork-filesharing = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdenetwork-filesharing-23.08.5.tar.xz";
-      sha256 = "1pkq11dn0gf841am57bg0i3m8dzx8bkbh2n3fp9452qbg0i6319z";
-      name = "kdenetwork-filesharing-23.08.5.tar.xz";
-    };
-  };
-  kdenlive = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdenlive-23.08.5.tar.xz";
-      sha256 = "1nw338bfak806p77329z1wk401ql190l2lw4z4iw6mx2wrc69scs";
-      name = "kdenlive-23.08.5.tar.xz";
-    };
-  };
-  kdepim-addons = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdepim-addons-23.08.5.tar.xz";
-      sha256 = "1c24vlvqvfk0rfbq7z9mvjywjmf52h8xdziha8drgzk64spyklsq";
-      name = "kdepim-addons-23.08.5.tar.xz";
-    };
-  };
-  kdepim-runtime = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdepim-runtime-23.08.5.tar.xz";
-      sha256 = "1xvpqlx1n3hcigdd19q3g1l86wvz1bdr0d9szilc2yqn5zb0f6zy";
-      name = "kdepim-runtime-23.08.5.tar.xz";
-    };
-  };
-  kdesdk-kio = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdesdk-kio-23.08.5.tar.xz";
-      sha256 = "0dfgzm8q4raycjwc38g651gkz3m4jfl0hhc3ppvnpq71wapdjdvy";
-      name = "kdesdk-kio-23.08.5.tar.xz";
-    };
-  };
-  kdesdk-thumbnailers = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdesdk-thumbnailers-23.08.5.tar.xz";
-      sha256 = "1yz44jf3sm7ja2ifqqjdiipjz4g77dj9ywkzjrcbh0qby56497i5";
-      name = "kdesdk-thumbnailers-23.08.5.tar.xz";
-    };
-  };
-  kdev-php = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdev-php-23.08.5.tar.xz";
-      sha256 = "0xrfgrs14mq7dkw4k90srkxxhrwq0r321s006qfpjyd4za7jjqr6";
-      name = "kdev-php-23.08.5.tar.xz";
-    };
-  };
-  kdev-python = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdev-python-23.08.5.tar.xz";
-      sha256 = "02knvrppybs76xmsyyz1q21lacdkxna14ws6mfcmb1rhpghlkgvs";
-      name = "kdev-python-23.08.5.tar.xz";
-    };
-  };
-  kdevelop = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdevelop-23.08.5.tar.xz";
-      sha256 = "1y71rvz19akdzsq7ky6w5aarj65lpbwa47nyyabi0vicyy3z4d6n";
-      name = "kdevelop-23.08.5.tar.xz";
-    };
-  };
-  kdf = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdf-23.08.5.tar.xz";
-      sha256 = "0zqpxam34s22wv08cd4x49raswyqpvx0pcbszhgng8bb162bi3ma";
-      name = "kdf-23.08.5.tar.xz";
-    };
-  };
-  kdialog = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdialog-23.08.5.tar.xz";
-      sha256 = "1p56dmndvaqbm9mw6hki5k4jr4p5w9sg26wvr13s7jcnyca21hqj";
-      name = "kdialog-23.08.5.tar.xz";
-    };
-  };
-  kdiamond = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kdiamond-23.08.5.tar.xz";
-      sha256 = "19kjg5r0260rim4gl5d1bi547p4mm2ac56pn6w423my8cjzdrgri";
-      name = "kdiamond-23.08.5.tar.xz";
-    };
-  };
-  keditbookmarks = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/keditbookmarks-23.08.5.tar.xz";
-      sha256 = "1h8al2kryvfm7a45axxg0n72nr5myampbqyjgfqm1ibzkfgf4skd";
-      name = "keditbookmarks-23.08.5.tar.xz";
-    };
-  };
-  keysmith = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/keysmith-23.08.5.tar.xz";
-      sha256 = "0nix18xvy3kdz1kw9a7annl8yy43f1x9a50him85dbkk9bn7731g";
-      name = "keysmith-23.08.5.tar.xz";
-    };
-  };
-  kfind = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kfind-23.08.5.tar.xz";
-      sha256 = "1j1fihfhdg1x5glayfz57xz2k9j54lyrnkj3i9x8pzvrkznfj55s";
-      name = "kfind-23.08.5.tar.xz";
-    };
-  };
-  kfourinline = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kfourinline-23.08.5.tar.xz";
-      sha256 = "1fnprcpm6jpdl0kzwjq2jq36swv3z3vvmxcnz5mzjl5gnh51223d";
-      name = "kfourinline-23.08.5.tar.xz";
-    };
-  };
-  kgeography = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kgeography-23.08.5.tar.xz";
-      sha256 = "1wcy2fxrj73sa283n0xbj6zyrbgmhkxw4dn01w7kqix2afwa1wdm";
-      name = "kgeography-23.08.5.tar.xz";
-    };
-  };
-  kget = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kget-23.08.5.tar.xz";
-      sha256 = "13pkvcp8sfl23l34lwnrgl80d8wcg7k5rvvzvzyafvkjy1xjpaif";
-      name = "kget-23.08.5.tar.xz";
-    };
-  };
-  kgoldrunner = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kgoldrunner-23.08.5.tar.xz";
-      sha256 = "032v02z825d363yhbbyb6blaff7zwrg41k2jlzhhqldcnd814qpc";
-      name = "kgoldrunner-23.08.5.tar.xz";
-    };
-  };
-  kgpg = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kgpg-23.08.5.tar.xz";
-      sha256 = "14l51g4m9vfwzmja3qknb6jdx43sqhgrdy5xnng401gfjhir2b1q";
-      name = "kgpg-23.08.5.tar.xz";
-    };
-  };
-  khangman = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/khangman-23.08.5.tar.xz";
-      sha256 = "1xjnrlgwpccgjf0cawy7vh554l6jpnp4b2x3lp6s226s39y021s3";
-      name = "khangman-23.08.5.tar.xz";
-    };
-  };
-  khelpcenter = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/khelpcenter-23.08.5.tar.xz";
-      sha256 = "1mvzflhiqgpvgk7a1av9hf6x2halxb32ppcy7f34q3m8apxnj3sc";
-      name = "khelpcenter-23.08.5.tar.xz";
-    };
-  };
-  kidentitymanagement = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kidentitymanagement-23.08.5.tar.xz";
-      sha256 = "00bjswh55aciphzifmakw118v1pknk4bsfbpi8cjsjx24vpzgmxw";
-      name = "kidentitymanagement-23.08.5.tar.xz";
-    };
-  };
-  kig = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kig-23.08.5.tar.xz";
-      sha256 = "0pkh5l5nn70ag5fcld30n43i6mwfk9wxdq1bpm741pa0ji6vsq5g";
-      name = "kig-23.08.5.tar.xz";
-    };
-  };
-  kigo = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kigo-23.08.5.tar.xz";
-      sha256 = "1x4anmxcgd7jb39cmfc1klg1vqmp9lxpbwlab1m60542r5s7rh0a";
-      name = "kigo-23.08.5.tar.xz";
-    };
-  };
-  killbots = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/killbots-23.08.5.tar.xz";
-      sha256 = "0j1m8f3zmskk7m47i9vqfvrf3c7fd6bi23pwhlhraabixpd9wv9i";
-      name = "killbots-23.08.5.tar.xz";
-    };
-  };
-  kimagemapeditor = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kimagemapeditor-23.08.5.tar.xz";
-      sha256 = "036zj278mpfnh35h0qvwcjgb7661xkxnqccib3v55w0vdpn8y9hg";
-      name = "kimagemapeditor-23.08.5.tar.xz";
-    };
-  };
-  kimap = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kimap-23.08.5.tar.xz";
-      sha256 = "0gbq8pc91a1ak0yg55m4xpi4zgz2dfajvxgwq0simnm7mhcj1za2";
-      name = "kimap-23.08.5.tar.xz";
-    };
-  };
-  kio-admin = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kio-admin-23.08.5.tar.xz";
-      sha256 = "0bksn8vpqwp0qfwyapbm33karf46hlmcmkhsybn6d8wljb44cq48";
-      name = "kio-admin-23.08.5.tar.xz";
-    };
-  };
-  kio-extras = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kio-extras-23.08.5.tar.xz";
-      sha256 = "0gr63gmnivxz5rfhfmky1skx8r5krqljdjyq8vxd97r3qwffrq0s";
-      name = "kio-extras-23.08.5.tar.xz";
-    };
-  };
-  kio-gdrive = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kio-gdrive-23.08.5.tar.xz";
-      sha256 = "19pdspi0ysx9589zqrdlkj3hly9rxl80pgqvas1iwhw4aahkx66m";
-      name = "kio-gdrive-23.08.5.tar.xz";
-    };
-  };
-  kio-zeroconf = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kio-zeroconf-23.08.5.tar.xz";
-      sha256 = "0d0an6i63gkrr2gxpi6xdzdpzwav9wvghcy299dc1xqipdk939h9";
-      name = "kio-zeroconf-23.08.5.tar.xz";
-    };
-  };
-  kipi-plugins = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kipi-plugins-23.08.5.tar.xz";
-      sha256 = "0sjkxsaxhns0d21n36zlzhxzysr3y3675z9vbc4ji10gjlskxq10";
-      name = "kipi-plugins-23.08.5.tar.xz";
-    };
-  };
-  kirigami-gallery = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kirigami-gallery-23.08.5.tar.xz";
-      sha256 = "0my44hmjgn551bm1j3ij6dynmxag7pxlkxvvvdizr1imcd0p1qy4";
-      name = "kirigami-gallery-23.08.5.tar.xz";
-    };
-  };
-  kiriki = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kiriki-23.08.5.tar.xz";
-      sha256 = "1mnyd9w5cf0sm4m8fg6fhg1cxrwmhmbjhn2k8h7zxp1k80k4gcy6";
-      name = "kiriki-23.08.5.tar.xz";
-    };
-  };
-  kiten = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kiten-23.08.5.tar.xz";
-      sha256 = "0fk264sm6yfiwikrjpva8ybxh2bnwh42mqsyryng76vwxdmm3s0y";
-      name = "kiten-23.08.5.tar.xz";
-    };
-  };
-  kitinerary = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kitinerary-23.08.5.tar.xz";
-      sha256 = "1a3qw7s5qwd4x4f4phxwis0y13yf5j463wjai2awr641zq121gdf";
-      name = "kitinerary-23.08.5.tar.xz";
-    };
-  };
-  kjournald = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kjournald-23.08.5.tar.xz";
-      sha256 = "1l7d4zqsxak2c2yvsqx1x1mw8b6sxx54svg0lxznjrk4va1h55zp";
-      name = "kjournald-23.08.5.tar.xz";
-    };
-  };
-  kjumpingcube = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kjumpingcube-23.08.5.tar.xz";
-      sha256 = "0w4wsc1n6qlz8m3kjdqbjw6ccfqzc3fpa2n11k5vhb1vysxa3vld";
-      name = "kjumpingcube-23.08.5.tar.xz";
-    };
-  };
-  kldap = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kldap-23.08.5.tar.xz";
-      sha256 = "1gkc31028fqdvf5yf7nwhyqii1zy3sxggnid74xxwfknr0pxqacx";
-      name = "kldap-23.08.5.tar.xz";
-    };
-  };
-  kleopatra = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kleopatra-23.08.5.tar.xz";
-      sha256 = "19pivdjnq6b0m79gy4mfqyrl604mnlhd41c3zr432xnkkrcidi59";
-      name = "kleopatra-23.08.5.tar.xz";
-    };
-  };
-  klettres = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/klettres-23.08.5.tar.xz";
-      sha256 = "0zl1r4b84a5yq593lbla6wfw823l1qnqg9zxpzip10vrzji2gjga";
-      name = "klettres-23.08.5.tar.xz";
-    };
-  };
-  klickety = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/klickety-23.08.5.tar.xz";
-      sha256 = "11wir03ci5x4s2m4j14qbmid5m9grgd4n7zqrvjrsr9mipbm5p39";
-      name = "klickety-23.08.5.tar.xz";
-    };
-  };
-  klines = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/klines-23.08.5.tar.xz";
-      sha256 = "07ipifmjpfszifi8jy8g1rmbi0jx4l4jqf81wvhv80llbna48ypx";
-      name = "klines-23.08.5.tar.xz";
-    };
-  };
-  kmag = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kmag-23.08.5.tar.xz";
-      sha256 = "1jaf97dyc8lcdmmlva11ivkylkcpbim48lrrm08cvsvs3iw66vr5";
-      name = "kmag-23.08.5.tar.xz";
-    };
-  };
-  kmahjongg = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kmahjongg-23.08.5.tar.xz";
-      sha256 = "0id838z75xppc7lwg94w1a7xy5jzy331xz2x80nsdn425fhgyhw7";
-      name = "kmahjongg-23.08.5.tar.xz";
-    };
-  };
-  kmail = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kmail-23.08.5.tar.xz";
-      sha256 = "0mdp5ax7215x3mfi90cspp181l1cmhdwlhpijcnqq842gdjaqf3i";
-      name = "kmail-23.08.5.tar.xz";
-    };
-  };
-  kmail-account-wizard = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kmail-account-wizard-23.08.5.tar.xz";
-      sha256 = "1fjxzyg8sb16kd85nqrw6xql143mmm4wz463flc0hsjdpcnfb297";
-      name = "kmail-account-wizard-23.08.5.tar.xz";
-    };
-  };
-  kmailtransport = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kmailtransport-23.08.5.tar.xz";
-      sha256 = "05f4kp4rwb4lk82av4aqzllbcizam25994wsvyxcpddfv37jpd63";
-      name = "kmailtransport-23.08.5.tar.xz";
-    };
-  };
-  kmbox = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kmbox-23.08.5.tar.xz";
-      sha256 = "007lrmzbm44mrp46n7j510hqgg9wq947g0b7zbxfp5dr1rxvi0z5";
-      name = "kmbox-23.08.5.tar.xz";
-    };
-  };
-  kmime = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kmime-23.08.5.tar.xz";
-      sha256 = "1nizvbjn3prbcgzgg03vfgffpjqmpxy7pqvxzjs8yfmz79rlx2dn";
-      name = "kmime-23.08.5.tar.xz";
-    };
-  };
-  kmines = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kmines-23.08.5.tar.xz";
-      sha256 = "0lwkiq5vcw10h8lvqsb4jri8pghdsp3b8jp4c5ihwawjzwl29cyb";
-      name = "kmines-23.08.5.tar.xz";
-    };
-  };
-  kmix = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kmix-23.08.5.tar.xz";
-      sha256 = "10415kj94d63fpx2i5xhbrj93i4d91hn8d1bbj484375vflsqwc6";
-      name = "kmix-23.08.5.tar.xz";
-    };
-  };
-  kmousetool = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kmousetool-23.08.5.tar.xz";
-      sha256 = "01wmhd0kb0xbyg5lr0vbj8nrk1ri5nllq5fd9pyq9whxvsar4fyz";
-      name = "kmousetool-23.08.5.tar.xz";
-    };
-  };
-  kmouth = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kmouth-23.08.5.tar.xz";
-      sha256 = "15sa5q37fd9228m78d7w7xdfsy18hyd43snvrngiiw4317x9km4n";
-      name = "kmouth-23.08.5.tar.xz";
-    };
-  };
-  kmplot = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kmplot-23.08.5.tar.xz";
-      sha256 = "05rdpjc7hlwkh2klhvybjjq73g15apysk31wph2pljg46mwh9sc4";
-      name = "kmplot-23.08.5.tar.xz";
-    };
-  };
-  knavalbattle = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/knavalbattle-23.08.5.tar.xz";
-      sha256 = "09s7lax3yd4vx6rp29540vzy555b2yp1m7lq5pd8ighiww78pznb";
-      name = "knavalbattle-23.08.5.tar.xz";
-    };
-  };
-  knetwalk = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/knetwalk-23.08.5.tar.xz";
-      sha256 = "0d47650cc4cabycilhbc6zbrbbbsn4awiswsk91lzkp47jpvjfqb";
-      name = "knetwalk-23.08.5.tar.xz";
-    };
-  };
-  knights = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/knights-23.08.5.tar.xz";
-      sha256 = "10xy3cr2z10l6zp2fp5kv8s94wbizz39afcg2i7n30w1r9pj6csn";
-      name = "knights-23.08.5.tar.xz";
-    };
-  };
-  knotes = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/knotes-23.08.5.tar.xz";
-      sha256 = "1bh2f10z2djvf77rsdlrwg0s4crkirjqaw0cwjapv2d2y03blgx6";
-      name = "knotes-23.08.5.tar.xz";
-    };
-  };
-  koko = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/koko-23.08.5.tar.xz";
-      sha256 = "0drs0yj7r5qm762x2y5ixczvcnlk8gy7qsh3h88k0cb95wxgz7dq";
-      name = "koko-23.08.5.tar.xz";
-    };
-  };
-  kolf = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kolf-23.08.5.tar.xz";
-      sha256 = "1cfmdbplhabaz62zs0jrf0p146rm688riiapckg19mcqzcvqq8cq";
-      name = "kolf-23.08.5.tar.xz";
-    };
-  };
-  kollision = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kollision-23.08.5.tar.xz";
-      sha256 = "15amfmyma1p0gpq0xx3yix6n0wj469gws8pydpynmn75z89r61zz";
-      name = "kollision-23.08.5.tar.xz";
-    };
-  };
-  kolourpaint = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kolourpaint-23.08.5.tar.xz";
-      sha256 = "1kjaxab9iasszgn7zfq5lhb2nkxrkd42x16y6pqs9ar4ixc6nbwl";
-      name = "kolourpaint-23.08.5.tar.xz";
-    };
-  };
-  kompare = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kompare-23.08.5.tar.xz";
-      sha256 = "0yajvzm98rqs214lp2rfrzz925ddgqgjmdxq7zm74qarixq3kyic";
-      name = "kompare-23.08.5.tar.xz";
-    };
-  };
-  kongress = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kongress-23.08.5.tar.xz";
-      sha256 = "04mb4siivza5gjcyb68cv34vlkd9xsk79nv0z6g7f2l7ir7q9l42";
-      name = "kongress-23.08.5.tar.xz";
-    };
-  };
-  konqueror = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/konqueror-23.08.5.tar.xz";
-      sha256 = "1yhc6yyw8549qmask70rqja1p70wcwbkg8hiln16bxsb6ngl9aw4";
-      name = "konqueror-23.08.5.tar.xz";
-    };
-  };
-  konquest = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/konquest-23.08.5.tar.xz";
-      sha256 = "0c04lzmacmx5ch5awsxn2wx0vyv632qazypak0vp45jm885fg059";
-      name = "konquest-23.08.5.tar.xz";
-    };
-  };
-  konsole = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/konsole-23.08.5.tar.xz";
-      sha256 = "1jn1c01cc6xsgd5b6c2q0fbr9fdn0nqzfc9fwsy4cyn279sj1yy6";
-      name = "konsole-23.08.5.tar.xz";
-    };
-  };
-  kontact = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kontact-23.08.5.tar.xz";
-      sha256 = "1p205y9z0y7khvpbl9lq9yl1z6pvnpl98yj8baj42rfynnvj5sx6";
-      name = "kontact-23.08.5.tar.xz";
-    };
-  };
-  kontactinterface = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kontactinterface-23.08.5.tar.xz";
-      sha256 = "1gxjb3g3a2prbiki6f980vm9jdkiicnw138p8clvarw1zqr6vwgd";
-      name = "kontactinterface-23.08.5.tar.xz";
-    };
-  };
-  kontrast = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kontrast-23.08.5.tar.xz";
-      sha256 = "1azx1x3136z2qzf3drw52k9l8g8vffc0jx0pvfpqhgkpi471l4vy";
-      name = "kontrast-23.08.5.tar.xz";
-    };
-  };
-  konversation = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/konversation-23.08.5.tar.xz";
-      sha256 = "1gi57pk10cs8cnaw26xjp8ffyqi77azvns99c5mmk29pfwb6ymv0";
-      name = "konversation-23.08.5.tar.xz";
-    };
-  };
-  kopeninghours = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kopeninghours-23.08.5.tar.xz";
-      sha256 = "0ihrjdyxaw5a5wvyjx6n0gl5l37djrqlc30mwaf9ihwrbvvlqb16";
-      name = "kopeninghours-23.08.5.tar.xz";
-    };
-  };
-  kopete = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kopete-23.08.5.tar.xz";
-      sha256 = "0ccf3flphc1zh59np8y0pl6rvq0ff9qfrqqmaqzfqmn2y02piy0a";
-      name = "kopete-23.08.5.tar.xz";
-    };
-  };
-  korganizer = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/korganizer-23.08.5.tar.xz";
-      sha256 = "1hgdrnax7m5ngjh8qcxsxr2aq3cdx56bkzl747byh08klrmbx9n4";
-      name = "korganizer-23.08.5.tar.xz";
-    };
-  };
-  kosmindoormap = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kosmindoormap-23.08.5.tar.xz";
-      sha256 = "00xb91x3d3r3wmlyw83975f4h2igmbybi3ac951jal1nfpix8yv4";
-      name = "kosmindoormap-23.08.5.tar.xz";
-    };
-  };
-  kpat = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kpat-23.08.5.tar.xz";
-      sha256 = "1grilk4jdaygfi63h7km8q1iv82sz2azsmgzbzz67alg4add1k6m";
-      name = "kpat-23.08.5.tar.xz";
-    };
-  };
-  kpimtextedit = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kpimtextedit-23.08.5.tar.xz";
-      sha256 = "1ir7wxlbfmagnnmh15b0k7gqhvlrl2mzmin9nf9c20l21hmrdp2f";
-      name = "kpimtextedit-23.08.5.tar.xz";
-    };
-  };
-  kpkpass = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kpkpass-23.08.5.tar.xz";
-      sha256 = "1cfsgky40zszyjbil7xjf12dbg1aymza2db70ghkvjjsp2xn17nn";
-      name = "kpkpass-23.08.5.tar.xz";
-    };
-  };
-  kpmcore = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kpmcore-23.08.5.tar.xz";
-      sha256 = "0yj1hpg53w3rfahhchslhgiw7yakxc99jyf59kzdv4z55mql0jml";
-      name = "kpmcore-23.08.5.tar.xz";
-    };
-  };
-  kpublictransport = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kpublictransport-23.08.5.tar.xz";
-      sha256 = "0n2s4l5vrsnmyj0p2icqrjc8qc3g5cm8nkhq4q6k29lbkrpfbxz3";
-      name = "kpublictransport-23.08.5.tar.xz";
-    };
-  };
-  kqtquickcharts = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kqtquickcharts-23.08.5.tar.xz";
-      sha256 = "1zikypr3v8kqs2qxc1x09acr25i6blcqfhqlgy65k26gb9qk1xk2";
-      name = "kqtquickcharts-23.08.5.tar.xz";
-    };
-  };
-  krdc = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/krdc-23.08.5.tar.xz";
-      sha256 = "1x2ry209mqazv2l9cx51x86ivpw5wia5cc3cbp7034ianbmprif2";
-      name = "krdc-23.08.5.tar.xz";
-    };
-  };
-  krecorder = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/krecorder-23.08.5.tar.xz";
-      sha256 = "0198wy6pa9nc1lly4szfxyma2np693pkg408iljxx3pxxi8vvvn8";
-      name = "krecorder-23.08.5.tar.xz";
-    };
-  };
-  kreversi = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kreversi-23.08.5.tar.xz";
-      sha256 = "1mddxiawjyzjpwvb72jrh10012kq3q7nlvi33v02xs4qlw1npyy0";
-      name = "kreversi-23.08.5.tar.xz";
-    };
-  };
-  krfb = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/krfb-23.08.5.tar.xz";
-      sha256 = "0xmkzrg408qab1nrv48kkpghxds6vm981iipqrfc2fv8b2khmr46";
-      name = "krfb-23.08.5.tar.xz";
-    };
-  };
-  kross-interpreters = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kross-interpreters-23.08.5.tar.xz";
-      sha256 = "0yzs6y42m9dx02ig9i2m932q6qcclg0r67sd4k53c038giri0y1m";
-      name = "kross-interpreters-23.08.5.tar.xz";
-    };
-  };
-  kruler = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kruler-23.08.5.tar.xz";
-      sha256 = "0gilrz96yidqx698vs42gymb552d16vjwynmnpxs8hsr2z8snsqs";
-      name = "kruler-23.08.5.tar.xz";
-    };
-  };
-  ksanecore = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ksanecore-23.08.5.tar.xz";
-      sha256 = "18lv3lvh4cx4jwsdwa2ip9qngf7bd1vdf62xhfyb969py75c869x";
-      name = "ksanecore-23.08.5.tar.xz";
-    };
-  };
-  kshisen = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kshisen-23.08.5.tar.xz";
-      sha256 = "1xa6nmgcavxxsiw0igjqfkzlr6qv5d620mp606afi890qw2firzj";
-      name = "kshisen-23.08.5.tar.xz";
-    };
-  };
-  ksirk = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ksirk-23.08.5.tar.xz";
-      sha256 = "0rggnzv6kaabqb6nhr6ldxfbn4lndr60vfch34lhwwgpb5f06d3a";
-      name = "ksirk-23.08.5.tar.xz";
-    };
-  };
-  ksmtp = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ksmtp-23.08.5.tar.xz";
-      sha256 = "1i8vmk1cmill8arglq1af0ck2r0j3bzx4sfz8r94bh0ybfarh1nx";
-      name = "ksmtp-23.08.5.tar.xz";
-    };
-  };
-  ksnakeduel = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ksnakeduel-23.08.5.tar.xz";
-      sha256 = "1whqx45pg8kzhwvip20i408j6qk622cvisbpv91kfd0ab76p2k4b";
-      name = "ksnakeduel-23.08.5.tar.xz";
-    };
-  };
-  kspaceduel = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kspaceduel-23.08.5.tar.xz";
-      sha256 = "0cf1yi05l0s05p8p38m6ygqjxb9zyiijf89raw8y2kjhp30cnjsn";
-      name = "kspaceduel-23.08.5.tar.xz";
-    };
-  };
-  ksquares = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ksquares-23.08.5.tar.xz";
-      sha256 = "055wkwr7nhwlzzqbz8m34yi4zgsnnw8pbxdn30d2rndra9kxmmx0";
-      name = "ksquares-23.08.5.tar.xz";
-    };
-  };
-  ksudoku = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ksudoku-23.08.5.tar.xz";
-      sha256 = "0rhpjhmqk4xhcjxi2l0v7yzhsa8b8mmgsylmxl4hw4lsvp7vx5lj";
-      name = "ksudoku-23.08.5.tar.xz";
-    };
-  };
-  ksystemlog = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ksystemlog-23.08.5.tar.xz";
-      sha256 = "0mn36n3g5g7sihw2r2y1a79ggmxpwikvxkh1rlhpavx721jh7rl0";
-      name = "ksystemlog-23.08.5.tar.xz";
-    };
-  };
-  kteatime = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kteatime-23.08.5.tar.xz";
-      sha256 = "1rn23hlnn9grjrx5kh2c9dsx8pm3gd0rg6i49wwrml2hvmkmg1af";
-      name = "kteatime-23.08.5.tar.xz";
-    };
-  };
-  ktimer = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ktimer-23.08.5.tar.xz";
-      sha256 = "05nxbzh4ka0w8f40q15wm7lj0vpgq70q2qb3vfliv7xdz4b59yjm";
-      name = "ktimer-23.08.5.tar.xz";
-    };
-  };
-  ktnef = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ktnef-23.08.5.tar.xz";
-      sha256 = "0a5ld53az9k8csb6psb622xx4nm96f6wz96z5rfdbnamqmyci7rp";
-      name = "ktnef-23.08.5.tar.xz";
-    };
-  };
-  ktorrent = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ktorrent-23.08.5.tar.xz";
-      sha256 = "10npi12qdibzpxjx102fh8fxiv5gk89xlp1s43aq01mckcnsvf0n";
-      name = "ktorrent-23.08.5.tar.xz";
-    };
-  };
-  ktouch = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ktouch-23.08.5.tar.xz";
-      sha256 = "0pcwypzfn5kh1byvj902vcsxsiyqqbp8w4xv51k6g90darrjl41d";
-      name = "ktouch-23.08.5.tar.xz";
-    };
-  };
-  ktrip = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ktrip-23.08.5.tar.xz";
-      sha256 = "17kn0jqhraxp5anj18lhv4v6xwjx3qybnsvz47biwbfiy8b715yl";
-      name = "ktrip-23.08.5.tar.xz";
-    };
-  };
-  ktuberling = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/ktuberling-23.08.5.tar.xz";
-      sha256 = "1263qkjvbg0dcrrr7w847vm9mq249glwgvxn9i5yck5qdk3cb4wm";
-      name = "ktuberling-23.08.5.tar.xz";
-    };
-  };
-  kturtle = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kturtle-23.08.5.tar.xz";
-      sha256 = "1mhd8b4rdysvvcjh37vr36ykg2avzdl3sgdsn5svzdga808vc8z4";
-      name = "kturtle-23.08.5.tar.xz";
-    };
-  };
-  kubrick = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kubrick-23.08.5.tar.xz";
-      sha256 = "000cc8rf63y2km0zzykpdxv24d5jp83p71kf4f3jxqr1lan2gxbm";
-      name = "kubrick-23.08.5.tar.xz";
-    };
-  };
-  kwalletmanager = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kwalletmanager-23.08.5.tar.xz";
-      sha256 = "1f45jqzn5j23adxb8p7z468klbn42kg2idcjqjm616kia348l7rr";
-      name = "kwalletmanager-23.08.5.tar.xz";
-    };
-  };
-  kwave = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kwave-23.08.5.tar.xz";
-      sha256 = "0264rz92198pa6rdjiim95z50wlp0myyr2f56m82cig5x69kl666";
-      name = "kwave-23.08.5.tar.xz";
-    };
-  };
-  kweather = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kweather-23.08.5.tar.xz";
-      sha256 = "04qab954y4mlz7ng1giyc20ndmihi0plli4wqjl6clzip7wi99l7";
-      name = "kweather-23.08.5.tar.xz";
-    };
-  };
-  kwordquiz = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/kwordquiz-23.08.5.tar.xz";
-      sha256 = "1w5hczhn0cv7r89s5kq1smwc1kkpsxrd7bqan4v26jd0d4r28jjy";
-      name = "kwordquiz-23.08.5.tar.xz";
-    };
-  };
-  libgravatar = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libgravatar-23.08.5.tar.xz";
-      sha256 = "15ynbjn2lrz08iriqf2il2b7hqwvypb758p24z1d6hj68hjgl9dc";
-      name = "libgravatar-23.08.5.tar.xz";
-    };
-  };
-  libkcddb = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libkcddb-23.08.5.tar.xz";
-      sha256 = "1igrrhzvs1rvn8p1cmiwl68h3bza4wc1pkllphksq5vjb9w9plj3";
-      name = "libkcddb-23.08.5.tar.xz";
-    };
-  };
-  libkcompactdisc = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libkcompactdisc-23.08.5.tar.xz";
-      sha256 = "1zwn9nic6fm2wkyhdc8ssyq0jjc6jrvc7aym422fzkmhr104llkg";
-      name = "libkcompactdisc-23.08.5.tar.xz";
-    };
-  };
-  libkdcraw = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libkdcraw-23.08.5.tar.xz";
-      sha256 = "04cgjz0f580v8nszki2qk6ms7p0wp8zj0pxsnwr80ipz97j8045b";
-      name = "libkdcraw-23.08.5.tar.xz";
-    };
-  };
-  libkdegames = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libkdegames-23.08.5.tar.xz";
-      sha256 = "1vggyamhr15k29zkyyjp0kgvq8n9a4yyxaal41w06q3x6bs87i8a";
-      name = "libkdegames-23.08.5.tar.xz";
-    };
-  };
-  libkdepim = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libkdepim-23.08.5.tar.xz";
-      sha256 = "17yvnpgrmwi23b3ia3c73nzma2n46jh7n9a1vjgivjx32rs2w7kf";
-      name = "libkdepim-23.08.5.tar.xz";
-    };
-  };
-  libkeduvocdocument = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libkeduvocdocument-23.08.5.tar.xz";
-      sha256 = "05lyycpx6yz6xg0z88fmlf1zzlxwiy9nkk1ma88p8f06kz1qkbmx";
-      name = "libkeduvocdocument-23.08.5.tar.xz";
-    };
-  };
-  libkexiv2 = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libkexiv2-23.08.5.tar.xz";
-      sha256 = "1wlv3byg8lkc57mr1mf1ymc1ghg49im6xr6bgvqzlrchg4q30h9i";
-      name = "libkexiv2-23.08.5.tar.xz";
-    };
-  };
-  libkgapi = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libkgapi-23.08.5.tar.xz";
-      sha256 = "18yp81mbq0dvpmi1yiab6nnjg65n89fl3l2iw9rnm8m8lcr9y90h";
-      name = "libkgapi-23.08.5.tar.xz";
-    };
-  };
-  libkipi = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libkipi-23.08.5.tar.xz";
-      sha256 = "11b2c3qwb47ijr7q04hcc50kwdclig9n72injadw7df6fnp18h3j";
-      name = "libkipi-23.08.5.tar.xz";
-    };
-  };
-  libkleo = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libkleo-23.08.5.tar.xz";
-      sha256 = "09a6ihlia4wpj5lwwih94w92xw277fk6bdj1ngbzix8cnzjd6c23";
-      name = "libkleo-23.08.5.tar.xz";
-    };
-  };
-  libkmahjongg = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libkmahjongg-23.08.5.tar.xz";
-      sha256 = "0rf37nbxr6m2l7dgj8alfh57zmp39d76swrvv98k9hn5dh5v923s";
-      name = "libkmahjongg-23.08.5.tar.xz";
-    };
-  };
-  libkomparediff2 = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libkomparediff2-23.08.5.tar.xz";
-      sha256 = "1l2awsm0ikf1kba72j67k0x5jfc48398pw406saq86l1mcfl23fr";
-      name = "libkomparediff2-23.08.5.tar.xz";
-    };
-  };
-  libksane = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libksane-23.08.5.tar.xz";
-      sha256 = "0vig4iws3c1kl1749gfig9g7fjz31g35lysb9ijdbzck46czzpfy";
-      name = "libksane-23.08.5.tar.xz";
-    };
-  };
-  libksieve = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libksieve-23.08.5.tar.xz";
-      sha256 = "0p422lvgvm1ma0vm4wf24d1bhjj4jns7qaxp8nkhwhsvs0nlh1js";
-      name = "libksieve-23.08.5.tar.xz";
-    };
-  };
-  libktorrent = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/libktorrent-23.08.5.tar.xz";
-      sha256 = "1gcpsa49g35jymy9162pjanx8ih0q7viygqwdvvylslfb8zkr8hg";
-      name = "libktorrent-23.08.5.tar.xz";
-    };
-  };
-  lokalize = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/lokalize-23.08.5.tar.xz";
-      sha256 = "0v1yhcljbzlm4jgk5bc7d6bp13s6si7issi7h4mz92awpp0a6fc5";
-      name = "lokalize-23.08.5.tar.xz";
-    };
-  };
-  lskat = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/lskat-23.08.5.tar.xz";
-      sha256 = "1qg1y9lhk9x573gwzs6c84bcx7nsmn80il29w5gxf88hkngznlsd";
-      name = "lskat-23.08.5.tar.xz";
-    };
-  };
-  mailcommon = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/mailcommon-23.08.5.tar.xz";
-      sha256 = "1h0gsrgxxvyhjy7vsh21wch1j1lwadjnyvssvvdzncw2ky63ppb5";
-      name = "mailcommon-23.08.5.tar.xz";
-    };
-  };
-  mailimporter = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/mailimporter-23.08.5.tar.xz";
-      sha256 = "0njkw27ag6z21n6sp1395mv4khf9r6qi5333nfspqw690gfjp5wl";
-      name = "mailimporter-23.08.5.tar.xz";
-    };
-  };
-  marble = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/marble-23.08.5.tar.xz";
-      sha256 = "120b987irps4i80amri7d7ci28vi6zjd74nc0m5n9y954wqzyv45";
-      name = "marble-23.08.5.tar.xz";
-    };
-  };
-  markdownpart = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/markdownpart-23.08.5.tar.xz";
-      sha256 = "1wpbspb5xhxqybanc5ckwrb2h5fqa3ivj564i31jbxlkwdvmp41j";
-      name = "markdownpart-23.08.5.tar.xz";
-    };
-  };
-  mbox-importer = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/mbox-importer-23.08.5.tar.xz";
-      sha256 = "1ar06iz73qs81k6bd2n77qj4390ql37j37w50jvjpbysbxk2knjz";
-      name = "mbox-importer-23.08.5.tar.xz";
-    };
-  };
-  merkuro = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/merkuro-23.08.5.tar.xz";
-      sha256 = "15s2hwwh9b4jf11am6v7llsgvix11y6qnlwdspyzpq45378hwpcs";
-      name = "merkuro-23.08.5.tar.xz";
-    };
-  };
-  messagelib = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/messagelib-23.08.5.tar.xz";
-      sha256 = "1y6xa3z6j04gxdwcfk3y4pskx7blvpxwrixxgjadba51x4lsydys";
-      name = "messagelib-23.08.5.tar.xz";
-    };
-  };
-  minuet = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/minuet-23.08.5.tar.xz";
-      sha256 = "1bk5y99gb1qmvyf48vk6gfwyqi6nk535868k3jm375bvd956sd3m";
-      name = "minuet-23.08.5.tar.xz";
-    };
-  };
-  okular = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/okular-23.08.5.tar.xz";
-      sha256 = "0r73ki98lv3293s7zvz3rq2xgj9z2jbqy3p7gs8518knn5lizmfm";
-      name = "okular-23.08.5.tar.xz";
-    };
-  };
-  palapeli = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/palapeli-23.08.5.tar.xz";
-      sha256 = "1lc9dc25bbagqz6iklwvk81pknwvc2a7kjicmyj8zz5432d7psps";
-      name = "palapeli-23.08.5.tar.xz";
-    };
-  };
-  parley = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/parley-23.08.5.tar.xz";
-      sha256 = "0rr0dn714khrrgda0lmsd81l0fyc84q3f3xc4fhblz6icj37b5an";
-      name = "parley-23.08.5.tar.xz";
-    };
-  };
-  partitionmanager = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/partitionmanager-23.08.5.tar.xz";
-      sha256 = "0d08sgml90minr2y1k8niz6d74hh5lavaaa1j0bvyj8gfgkdwflq";
-      name = "partitionmanager-23.08.5.tar.xz";
-    };
-  };
-  picmi = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/picmi-23.08.5.tar.xz";
-      sha256 = "0f1zvl7sidpaw1y93xrqg704s44l8wg405c5pas4yahl6nrs1i1x";
-      name = "picmi-23.08.5.tar.xz";
-    };
-  };
-  pim-data-exporter = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/pim-data-exporter-23.08.5.tar.xz";
-      sha256 = "0axzlzam82c70868dc93lwljbc5rllkrslyn4cnc33fvz1xf41kc";
-      name = "pim-data-exporter-23.08.5.tar.xz";
-    };
-  };
-  pim-sieve-editor = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/pim-sieve-editor-23.08.5.tar.xz";
-      sha256 = "1r756987lwzl27mcdsb0k2wa8crm2lw1xvr197f73j3bnd4a3njx";
-      name = "pim-sieve-editor-23.08.5.tar.xz";
-    };
-  };
-  pimcommon = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/pimcommon-23.08.5.tar.xz";
-      sha256 = "0bjdbz89141rh1895c4ghx3s2v93wpdghpymi50203rark1iqnsz";
-      name = "pimcommon-23.08.5.tar.xz";
-    };
-  };
-  plasmatube = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/plasmatube-23.08.5.tar.xz";
-      sha256 = "178vgir5j2535q6gh2p11c7gjsm61f368lmysr8jdmsr43f4zjk6";
-      name = "plasmatube-23.08.5.tar.xz";
-    };
-  };
-  poxml = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/poxml-23.08.5.tar.xz";
-      sha256 = "1i371b4x4a1ciklxicpwghajzzg7qnvssqgzr6lqnfy9gi8p4p3s";
-      name = "poxml-23.08.5.tar.xz";
-    };
-  };
-  print-manager = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/print-manager-23.08.5.tar.xz";
-      sha256 = "0jssp0nczr928v1dz9fg5ycsr5s1f0x9yr60lpxa33mgmyrrkvgp";
-      name = "print-manager-23.08.5.tar.xz";
-    };
-  };
-  qmlkonsole = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/qmlkonsole-23.08.5.tar.xz";
-      sha256 = "0fjw7781a5qzfbkamcvfz3dl1sf793phmjlcp8bdgj3ha4kk9ffl";
-      name = "qmlkonsole-23.08.5.tar.xz";
-    };
-  };
-  rocs = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/rocs-23.08.5.tar.xz";
-      sha256 = "1c9yrn42bs3r50nzdmib3v6z80kykd271paqbgj4isi2hamw3g7r";
-      name = "rocs-23.08.5.tar.xz";
-    };
-  };
-  signon-kwallet-extension = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/signon-kwallet-extension-23.08.5.tar.xz";
-      sha256 = "1z4vwmgh102jxbacf40sp9x1bjy2bvnamhi6lv387rpx7snwlmp5";
-      name = "signon-kwallet-extension-23.08.5.tar.xz";
-    };
-  };
-  skanlite = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/skanlite-23.08.5.tar.xz";
-      sha256 = "1fhd10gr7pya08l98cylc4dkh0hisa0zgj32djkzb64pr16wlyk6";
-      name = "skanlite-23.08.5.tar.xz";
-    };
-  };
-  skanpage = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/skanpage-23.08.5.tar.xz";
-      sha256 = "1fvj1ckh67sch4m0dfz8wficmsr12b8jk74q66skpi362h731qiq";
-      name = "skanpage-23.08.5.tar.xz";
-    };
-  };
-  spectacle = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/spectacle-23.08.5.tar.xz";
-      sha256 = "0g3n3n42jp2vi1jv3d8j8rf9362axf9pfpsphbsag15jdppk1y2l";
-      name = "spectacle-23.08.5.tar.xz";
-    };
-  };
-  step = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/step-23.08.5.tar.xz";
-      sha256 = "0lafzlnjaiqvkz4jcyc6nghiv182x5rlwrn5qrhhvmf5r4qlxnxm";
-      name = "step-23.08.5.tar.xz";
-    };
-  };
-  svgpart = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/svgpart-23.08.5.tar.xz";
-      sha256 = "1fbqfzn9nppvx51kvam08w9kcfz9y3l86bddvlmyj1j0v26kf6ll";
-      name = "svgpart-23.08.5.tar.xz";
-    };
-  };
-  sweeper = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/sweeper-23.08.5.tar.xz";
-      sha256 = "1mf1s8725pfbh4s6cl4nmi6dk0kl5l9ldjkwgb7dh15dli37gpss";
-      name = "sweeper-23.08.5.tar.xz";
-    };
-  };
-  telly-skout = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/telly-skout-23.08.5.tar.xz";
-      sha256 = "1a196ychw81k1m5kql3nnzkzhz98cpn35d257sa8qah0hz3ad4bx";
-      name = "telly-skout-23.08.5.tar.xz";
-    };
-  };
-  tokodon = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/tokodon-23.08.5.tar.xz";
-      sha256 = "0r8jx2k5znv6pi3wnss0rng870ky3d1c8bd7lhd7fakihsjpm22b";
-      name = "tokodon-23.08.5.tar.xz";
-    };
-  };
-  umbrello = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/umbrello-23.08.5.tar.xz";
-      sha256 = "1067chdyxfb6h5ma628dia1fjrs8yz3204jn5iprfhasxqi44h2c";
-      name = "umbrello-23.08.5.tar.xz";
-    };
-  };
-  yakuake = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/yakuake-23.08.5.tar.xz";
-      sha256 = "097bl6rjs5pj7arypcmncwb8ji9jfd8gli0y65454b0aafa5hnac";
-      name = "yakuake-23.08.5.tar.xz";
-    };
-  };
-  zanshin = {
-    version = "23.08.5";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.08.5/src/zanshin-23.08.5.tar.xz";
-      sha256 = "0vpmcmik362b6i232awd0f695w5q82bi4x2lq3x3plnh0wf5xyf0";
-      name = "zanshin-23.08.5.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/applications/kde/telly-skout.nix b/pkgs/applications/kde/telly-skout.nix
deleted file mode 100644
index 12496afe9dbf..000000000000
--- a/pkgs/applications/kde/telly-skout.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  qtquickcontrols2,
-  kcoreaddons,
-  kconfig,
-  ki18n,
-  kirigami2,
-}:
-
-mkDerivation {
-  pname = "telly-skout";
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-
-  buildInputs = [
-    qtquickcontrols2
-    kcoreaddons
-    kconfig
-    ki18n
-    kirigami2
-  ];
-
-  meta = {
-    description = "Convergent Kirigami TV guide";
-    mainProgram = "telly-skout";
-    homepage = "https://apps.kde.org/telly-skout/";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/kde/tokodon.nix b/pkgs/applications/kde/tokodon.nix
deleted file mode 100644
index 5771ce5c60e5..000000000000
--- a/pkgs/applications/kde/tokodon.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  mkDerivation,
-
-  cmake,
-  extra-cmake-modules,
-  pkg-config,
-
-  kconfig,
-  kdbusaddons,
-  ki18n,
-  kirigami2,
-  kirigami-addons,
-  knotifications,
-  qqc2-desktop-style,
-  qtbase,
-  qtkeychain,
-  qtmultimedia,
-  qtquickcontrols2,
-  qttools,
-  qtwebsockets,
-  kitemmodels,
-  pimcommon,
-  mpv,
-}:
-
-mkDerivation {
-  pname = "tokodon";
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    pkg-config
-  ];
-
-  buildInputs = [
-    kconfig
-    kdbusaddons
-    ki18n
-    kirigami2
-    kirigami-addons
-    knotifications
-    qqc2-desktop-style
-    qtbase
-    qtkeychain
-    qtmultimedia
-    qtquickcontrols2
-    qttools
-    qtwebsockets
-    kitemmodels
-    pimcommon
-    mpv
-  ];
-
-  meta = with lib; {
-    description = "Mastodon client for Plasma and Plasma Mobile";
-    mainProgram = "tokodon";
-    homepage = "https://invent.kde.org/network/tokodon";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ matthiasbeyer ];
-  };
-}
diff --git a/pkgs/applications/kde/umbrello.nix b/pkgs/applications/kde/umbrello.nix
deleted file mode 100644
index e6ee77742877..000000000000
--- a/pkgs/applications/kde/umbrello.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  cmake,
-  karchive,
-  ki18n,
-  kiconthemes,
-  kdelibs4support,
-  ktexteditor,
-}:
-
-mkDerivation {
-  pname = "umbrello";
-  meta = {
-    homepage = "https://umbrello.kde.org/";
-    description = "Unified Modelling Language (UML) diagram program";
-    license = [ lib.licenses.gpl2 ];
-  };
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-  propagatedBuildInputs = [
-    karchive
-    ki18n
-    kiconthemes
-    kdelibs4support
-    ktexteditor
-  ];
-}
diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix
deleted file mode 100644
index b64a7aac6964..000000000000
--- a/pkgs/applications/kde/yakuake.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  kdoctools,
-  extra-cmake-modules,
-  karchive,
-  kcrash,
-  kdbusaddons,
-  ki18n,
-  kiconthemes,
-  knewstuff,
-  knotifications,
-  knotifyconfig,
-  konsole,
-  kparts,
-  kwayland,
-  kwindowsystem,
-  qtx11extras,
-}:
-
-mkDerivation {
-  pname = "yakuake";
-
-  buildInputs = [
-    karchive
-    kcrash
-    kdbusaddons
-    ki18n
-    kiconthemes
-    knewstuff
-    knotifications
-    knotifyconfig
-    kparts
-    kwayland
-    kwindowsystem
-    qtx11extras
-  ];
-
-  propagatedBuildInputs = [
-    karchive
-    kcrash
-    kdbusaddons
-    ki18n
-    kiconthemes
-    knewstuff
-    knotifications
-    knotifyconfig
-    kparts
-    kwindowsystem
-  ];
-
-  propagatedUserEnvPkgs = [ konsole ];
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  meta = {
-    homepage = "https://yakuake.kde.org";
-    description = "Quad-style terminal emulator for KDE";
-    mainProgram = "yakuake";
-    license = lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/applications/kde/zanshin.nix b/pkgs/applications/kde/zanshin.nix
deleted file mode 100644
index 137f7fc02c55..000000000000
--- a/pkgs/applications/kde/zanshin.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  akonadi-calendar,
-  boost,
-  kontactinterface,
-  krunner,
-}:
-
-mkDerivation {
-  pname = "zanshin";
-  meta = with lib; {
-    description = "Powerful yet simple application to manage your day to day actions, getting your mind like water";
-    homepage = "https://zanshin.kde.org/";
-    maintainers = with maintainers; [ zraexy ];
-    license = licenses.gpl2Plus;
-  };
-
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    akonadi-calendar
-    boost
-    kontactinterface
-    krunner
-  ];
-}
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 050efba1c446..9200d884c129 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -39,16 +39,6 @@ makeScopeWithSplicing' {
         in
         (lib.makeOverridable mkFrameworks attrs);
 
-      kdeGear =
-        let
-          mkGear = import ../applications/kde;
-          attrs = {
-            inherit config libsForQt5;
-            inherit (pkgs) lib fetchurl;
-          };
-        in
-        (lib.makeOverridable mkGear attrs);
-
       noExtraAttrs =
         set:
         lib.attrsets.removeAttrs set [
@@ -61,19 +51,14 @@ makeScopeWithSplicing' {
     in
     (noExtraAttrs (
       kdeFrameworks
-      // kdeGear
       // qt5
       // {
 
         inherit
           kdeFrameworks
-          kdeGear
           qt5
           ;
 
-        # Alias for backwards compatibility. Added 2021-05-07.
-        kdeApplications = kdeGear;
-
         ### LIBRARIES
 
         accounts-qml-module = callPackage ../development/libraries/accounts-qml-module { };

From e103989b1005ee20448ffc637a0264e16d29f24f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 21 Aug 2025 22:58:15 +0300
Subject: [PATCH 2560/3724] aliases.nix: be smarter about throw messages

---
 pkgs/top-level/aliases.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e3cc1f13656b..a4e8e6844fa5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -346,11 +346,14 @@ let
 
   makePlasma5Throw =
     name:
-    throw ''
-      The libsForQt5.${name} package and the corresponding top-level ${name} alias have been removed.
-
-      Please explicitly use kdePackages.${name} for the latest Qt 6-based version.
-    '';
+    throw (
+      ''
+        The libsForQt5.${name} package and the corresponding top-level ${name} alias have been removed, as KDE Gear 5 and Plasma 5 have reached end of life.
+      ''
+      + lib.optionalString (kdePackages ? ${name}) ''
+        Please explicitly use kdePackages.${name} for the latest Qt 6-based version.
+      ''
+    );
 
   plasma5Throws = lib.mapAttrs (k: _: makePlasma5Throw k) deprecatedPlasma5Packages;
 

From 9913dd115ddcf298a0e65022a6816c2fca209d5f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 21 Aug 2025 23:05:53 +0300
Subject: [PATCH 2561/3724] nixos/doc/rl-2511: relnote Plasma/Gear 5 removal

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

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index b13dac4e5e6e..3bd80f616f12 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -12,6 +12,8 @@
 
 - The NetworkManager module does not ship with a default set of VPN plugins anymore. All required VPN plugins must now be explicitly configured in [`networking.networkmanager.plugins`](#opt-networking.networkmanager.plugins).
 
+- The Qt 5-based versions of KDE Gear, Plasma, Maui and Deepin have been removed. Users are advised to migrate to Plasma 6 and Gear 25.08, available under `kdePackages`.
+
 ## New Modules {#sec-release-25.11-new-modules}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

From 9036b632786e69e6029aa264357aac2d3caaac5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 20:31:53 +0000
Subject: [PATCH 2562/3724] irust: 1.76.0 -> 1.76.1

---
 pkgs/by-name/ir/irust/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ir/irust/package.nix b/pkgs/by-name/ir/irust/package.nix
index 05445ae66713..437b4f92c9c5 100644
--- a/pkgs/by-name/ir/irust/package.nix
+++ b/pkgs/by-name/ir/irust/package.nix
@@ -21,16 +21,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "irust";
-  version = "1.76.0";
+  version = "1.76.1";
 
   src = fetchFromGitHub {
     owner = "sigmaSd";
     repo = "IRust";
     rev = "irust@${version}";
-    hash = "sha256-VCuXqOE4XQvfXxpDe8kSrTkiBAa4eU5m5Xv85+NZuFE=";
+    hash = "sha256-rNPB+POWDT6DKoqowHFmojNluFWjd+lXzYYsc9I6ebU=";
   };
 
-  cargoHash = "sha256-I1IiyMvJXccIqRnmL9IWMQT/uyGUN/knn6RXTM8YN60=";
+  cargoHash = "sha256-OGK5CzDuA1sWmZgh2OCQBiTvGLdTjMALFnPXM5pYZo4=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 122e29198212ac3ddea30f914355355e02203321 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 11 Aug 2025 13:59:28 +0200
Subject: [PATCH 2563/3724] nixos/slurm: update test, make more reliable

* start services in proper order
  (avoid random failures due to randomly ordered startup)
* clean up test script
* add sbatch test
---
 nixos/tests/slurm.nix | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index 1747e714117a..76041f87187a 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -49,6 +49,16 @@ let
       mkdir -p $out/bin
       ${lib.getDev pkgs.mpi}/bin/mpicc ${mpitestC} -o $out/bin/mpitest
     '';
+
+  sbatchOutput = "/tmp/shared/sbatch.log";
+  sbatchScript = pkgs.writeText "sbatchScript" ''
+    #!${pkgs.runtimeShell}
+    #SBATCH --nodes 1
+    #SBATCH --ntasks 1
+    #SBATCH --output ${sbatchOutput}
+
+    echo "sbatch success"
+  '';
 in
 {
   name = "slurm";
@@ -127,43 +137,38 @@ in
     };
 
   testScript = ''
-    start_all()
-
-    # Make sure DBD is up after DB initialzation
     with subtest("can_start_slurmdbd"):
-        dbd.succeed("systemctl restart slurmdbd")
         dbd.wait_for_unit("slurmdbd.service")
         dbd.wait_for_open_port(6819)
 
-    # there needs to be an entry for the current
-    # cluster in the database before slurmctld is restarted
-    with subtest("add_account"):
-        control.succeed("sacctmgr -i add cluster default")
-        # check for cluster entry
-        control.succeed("sacctmgr list cluster | awk '{ print $1 }' | grep default")
-
-    with subtest("can_start_slurmctld"):
-        control.succeed("systemctl restart slurmctld")
+    with subtest("cluster_is_initialized"):
+        control.wait_for_unit("multi-user.target")
         control.wait_for_unit("slurmctld.service")
+        control.wait_until_succeeds("sacctmgr list cluster | awk '{ print $1 }' | grep default")
+
+    start_all()
 
     with subtest("can_start_slurmd"):
         for node in [node1, node2, node3]:
-            node.succeed("systemctl restart slurmd.service")
             node.wait_for_unit("slurmd")
 
     # Test that the cluster works and can distribute jobs;
+    submit.wait_for_unit("multi-user.target")
 
     with subtest("run_distributed_command"):
         # Run `hostname` on 3 nodes of the partition (so on all the 3 nodes).
         # The output must contain the 3 different names
         submit.succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq")
 
-        with subtest("check_slurm_dbd"):
+        with subtest("check_slurm_dbd_job"):
             # find the srun job from above in the database
-            control.succeed("sleep 5")
-            control.succeed("sacct | grep hostname")
+            control.wait_until_succeeds("sacct | grep hostname")
 
     with subtest("run_PMIx_mpitest"):
         submit.succeed("srun -N 3 --mpi=pmix mpitest | grep size=3")
+
+    with subtest("run_sbatch"):
+        submit.succeed("sbatch --wait ${sbatchScript}")
+        submit.succeed("grep 'sbatch success' ${sbatchOutput}")
   '';
 }

From b745ad72a214e0b0d1181f7ce4ccb0b4b5397988 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 21 Aug 2025 22:38:37 +0200
Subject: [PATCH 2564/3724] evcc: 0.207.3 -> 0.207.4

https://github.com/evcc-io/evcc/releases/tag/0.207.4
---
 pkgs/by-name/ev/evcc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index e4afa7e05bf3..7445be0aa1c2 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,16 +17,16 @@
 }:
 
 let
-  version = "0.207.3";
+  version = "0.207.4";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-BXfYtz8aZt8NmBAe5/oViDG7k0y4dc08C9frV4NkVgw=";
+    hash = "sha256-TQOeeGcgkaMoMyDbJQKIZIKJ6Wpz/wJqvpQjglnJRXI=";
   };
 
-  vendorHash = "sha256-VITdJ23xrO346EOlNe5uoOKcsQ76x+Yb7Vhl0/H+WTI=";
+  vendorHash = "sha256-qH0wHP5xHxnnURwlk4AA3H1NCftFFgAYAWPW3cdpwdk=";
 
   commonMeta = with lib; {
     license = licenses.mit;

From 28edeae8e695b1e24b9656e3c2194d53d0e14063 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 20 Aug 2025 22:30:27 -0400
Subject: [PATCH 2565/3724] python313Packages.ome-zarr: 0.12rc1 -> 0.12.1

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

diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix
index 4ebfd118b616..4f69ffe262ba 100644
--- a/pkgs/development/python-modules/ome-zarr/default.nix
+++ b/pkgs/development/python-modules/ome-zarr/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "ome-zarr";
-  version = "0.12rc1";
+  version = "0.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ome";
     repo = "ome-zarr-py";
     tag = "v${version}";
-    hash = "sha256-uwAcICrFHZYYULfacWII5C3Y+Rs2Bf8ZLQEijfkldn8=";
+    hash = "sha256-xBznMQ5wbz0CP30cuU7Tdet9dFKLBRiyLww+iNamwnA=";
   };
 
   build-system = [

From 9db25b08a28b517a6cc3ea0eeb5c668b27daed30 Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Thu, 21 Aug 2025 19:39:12 +0300
Subject: [PATCH 2566/3724] warp-terminal: 0.2025.08.06.08.12.stable_02 ->
 0.2025.08.13.08.12.stable_02

Changelog: https://docs.warp.dev/getting-started/changelog#id-2025.08.13-v0.2025.08.13.08.12
---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index 2f52dbc180bf..d6a1d7141aaf 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-wO3xE8cSSMaYVc6eoswDcR3acBzWwB/BHbins8ciM4Y=",
-    "version": "0.2025.08.06.08.12.stable_02"
+    "hash": "sha256-B9Qhh+1vvisdpE9XYQRbJ87Ilo4Qmy9Uvd7Zn4+TLxg=",
+    "version": "0.2025.08.13.08.12.stable_02"
   },
   "linux_x86_64": {
-    "hash": "sha256-/Nhy0fyslK8h5zzhwlDJT+6nhNmdBowj/jGOTCunX4w=",
-    "version": "0.2025.08.06.08.12.stable_02"
+    "hash": "sha256-x87HElhBSrh00LiCcKX9AnWiROVN4SEZTqu7D1R72LI=",
+    "version": "0.2025.08.13.08.12.stable_02"
   },
   "linux_aarch64": {
-    "hash": "sha256-Jqm2aUg11nrIZUofcLDYZ7BQtaSPx7KrrM91i0bc+ig=",
-    "version": "0.2025.08.06.08.12.stable_02"
+    "hash": "sha256-+lv8dpx5fi12rhG258zSj0att/vTi7DidKCYlUCIbvo=",
+    "version": "0.2025.08.13.08.12.stable_02"
   }
 }

From 4abfb5d48e29bdc05c2946925ebb5e22b2d82697 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 05:18:27 +0000
Subject: [PATCH 2567/3724] hyprutils: 0.8.2 -> 0.8.3

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

diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix
index aefb3383ec63..442a68e6c30b 100644
--- a/pkgs/by-name/hy/hyprutils/package.nix
+++ b/pkgs/by-name/hy/hyprutils/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprutils";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprutils";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W0xgXsaqGa/5/7IBzKNhf0+23MqGPymYYfqT7ECqeTE=";
+    hash = "sha256-PosTxeL39YrLvCX5MqqPA6NNWQ4T5ea5K55nmN7ju9Q=";
   };
 
   nativeBuildInputs = [

From 299b23c0e130ea890dad51533eeaab52082d6026 Mon Sep 17 00:00:00 2001
From: Jan Solanti <jhs@psonet.com>
Date: Sat, 19 Jul 2025 19:06:20 +0300
Subject: [PATCH 2568/3724] python3Packages.pysdl3: 0.9.8b1 -> 0.9.8b9

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

diff --git a/pkgs/development/python-modules/pysdl3/default.nix b/pkgs/development/python-modules/pysdl3/default.nix
index 747458a05187..3df4aab1fd9d 100644
--- a/pkgs/development/python-modules/pysdl3/default.nix
+++ b/pkgs/development/python-modules/pysdl3/default.nix
@@ -19,18 +19,18 @@
 let
   dochash =
     if stdenv.hostPlatform.isLinux then
-      "sha256-+1zLd308zL+m68kLMeOWWxT0wYDgCd6g9cc2hEtaeUs="
+      "sha256-d2YQUBWRlDROwiDMJ5mQAR9o+cYsbv1jiulsr1SAaik="
     else if stdenv.hostPlatform.isDarwin then
-      "sha256-2uB9+ABgv5O376LyHb0ShGjM4LHYzMRMxk/k+1LBmv0="
+      "sha256-eIzTsn4wYz7TEyWN8QssM7fxpMfz/ENlxDVUMz0Cm4c="
     else if stdenv.hostPlatform.isWindows then
-      "sha256-46bQSPYctycizf2GXichd5V74LjxwIAPhBmklXAJ/Jg="
+      "sha256-+iagR5jvpHi8WDh4/DO+GDP6jajEpZ6G1ROhM+zkSiw="
     else
       throw "PySDL3 does not support ${stdenv.hostPlatform.uname.system}";
   lib_ext = stdenv.hostPlatform.extensions.sharedLibrary;
 in
 buildPythonPackage rec {
   pname = "pysdl3";
-  version = "0.9.8b1";
+  version = "0.9.8b9";
   pyproject = true;
 
   pythonImportsCheck = [ "sdl3" ];
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "Aermoss";
     repo = "PySDL3";
     tag = "v${version}";
-    hash = "sha256-FVUCcqKTq6qdNkYHTYFiUxt2HIaNC5LK0BEUfz8Mue8=";
+    hash = "sha256-TpfMpp8CGb8lYALCWlMtyucxObDg1VYEvBW+mVHN9JM=";
   };
 
   docfile = fetchurl {

From 54b69cc5c7b5f53fc3bfff50b6c9692ea469fc4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 21:07:41 +0000
Subject: [PATCH 2569/3724] grafana-alloy: 1.10.1 -> 1.10.2

---
 pkgs/by-name/gr/grafana-alloy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix
index 21d93cf91cfd..a1383984f474 100644
--- a/pkgs/by-name/gr/grafana-alloy/package.nix
+++ b/pkgs/by-name/gr/grafana-alloy/package.nix
@@ -17,17 +17,17 @@
 
 buildGoModule rec {
   pname = "grafana-alloy";
-  version = "1.10.1";
+  version = "1.10.2";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "alloy";
     tag = "v${version}";
-    hash = "sha256-TqbXhWlAoQyr25MtKVs2g8mfS/e6Rs2S8VaGwVto/S4=";
+    hash = "sha256-7KOnpkpQzqvqyMAuDyUjIzseJAxqmkjEw9ecHD+kI3I=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-LHUJO7V4yobuFmEJBReKg3v21ses/s0TeqLOl+3YXZ0=";
+  vendorHash = "sha256-/G00ZJnAQoAFR66sYkO3bqhnWXvGmronjFnk7m8ogYA=";
 
   nativeBuildInputs = [
     fixup-yarn-lock

From 60e22fc17e8f153c6bc3ab764898c14b1f086c5e Mon Sep 17 00:00:00 2001
From: Jan Solanti <jhs@psonet.com>
Date: Sat, 19 Jul 2025 19:06:57 +0300
Subject: [PATCH 2570/3724] tauon: 8.0.1 -> 8.1.4

---
 pkgs/by-name/ta/tauon/install_mode_true.patch | 15 ---------------
 pkgs/by-name/ta/tauon/package.nix             |  8 ++------
 2 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/by-name/ta/tauon/install_mode_true.patch

diff --git a/pkgs/by-name/ta/tauon/install_mode_true.patch b/pkgs/by-name/ta/tauon/install_mode_true.patch
deleted file mode 100644
index e4510e9d2ee1..000000000000
--- a/pkgs/by-name/ta/tauon/install_mode_true.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/tauon/__main__.py b/src/tauon/__main__.py
-index 04691586..e48afa02 100755
---- a/src/tauon/__main__.py
-+++ b/src/tauon/__main__.py
-@@ -115,8 +115,8 @@ def transfer_args_and_exit() -> None:
- if "--no-start" in sys.argv:
- 	transfer_args_and_exit()
- 
--# If we're installed, use home data locations
--install_mode = bool(str(install_directory).startswith(("/opt/", "/usr/", "/app/", "/snap/")) or sys.platform in ("darwin", "win32"))
-+# Nixpkgs install, use home data dirs.
-+install_mode = True
- 
- # Assume that it's a classic Linux install, use standard paths
- if str(install_directory).startswith("/usr/") and Path("/usr/share/TauonMusicBox").is_dir():
diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix
index d302aa1650b2..bdbf27dc97c0 100644
--- a/pkgs/by-name/ta/tauon/package.nix
+++ b/pkgs/by-name/ta/tauon/package.nix
@@ -48,14 +48,14 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "tauon";
-  version = "8.0.1";
+  version = "8.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Taiko2k";
     repo = "Tauon";
     tag = "v${version}";
-    hash = "sha256-m94/zdlJu/u/dchIXhqB47bkl6Uej2hVr8R6RNg8Vaw=";
+    hash = "sha256-AV8B09H/25+2ZOoGux2/A4xP8sBBpRP197JYkS9/awk=";
   };
 
   postUnpack = ''
@@ -66,10 +66,6 @@ python3Packages.buildPythonApplication rec {
     ln -s ${miniaudio.src} source/src/phazor/miniaudio
   '';
 
-  patches = [
-    ./install_mode_true.patch
-  ];
-
   postPatch = ''
     substituteInPlace src/tauon/t_modules/t_phazor.py \
       --replace-fail 'base_path = Path(pctl.install_directory).parent.parent / "build"' 'base_path = Path("${placeholder "out"}/${python3Packages.python.sitePackages}")'

From f474c11711993d21cc4b1d7d96979a5b1cde1908 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2571/3724] ctranslate2: use `cudaPackages.backendStdenv`

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

diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix
index 93d8c1321c54..550fb0bc164d 100644
--- a/pkgs/development/libraries/ctranslate2/default.nix
+++ b/pkgs/development/libraries/ctranslate2/default.nix
@@ -24,8 +24,9 @@
 
 let
   cmakeBool = b: if b then "ON" else "OFF";
+  stdenv' = if withCUDA then cudaPackages.backendStdenv else stdenv;
 in
-stdenv.mkDerivation rec {
+stdenv'.mkDerivation rec {
   pname = "ctranslate2";
   version = "4.6.0";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a8280e600fa..9c100fcf6b01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7634,7 +7634,6 @@ with pkgs;
   inherit (cosmopolitan) cosmocc;
 
   ctranslate2 = callPackage ../development/libraries/ctranslate2 rec {
-    stdenv = if withCUDA then gcc11Stdenv else pkgs.stdenv;
     withCUDA = pkgs.config.cudaSupport;
     withCuDNN = withCUDA && (cudaPackages ? cudnn);
     cudaPackages = pkgs.cudaPackages;

From 22afa19059b33e6db644add0ac791d723e966e28 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2572/3724] librealsenseWithCuda: use
 `cudaPackages.backendStdenv`

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

diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index de33e8d0c968..d970a1fc35d8 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -24,7 +24,11 @@
 assert cudaSupport -> (cudaPackages ? cudatoolkit && cudaPackages.cudatoolkit != null);
 assert enablePython -> pythonPackages != null;
 
-stdenv.mkDerivation rec {
+let
+  stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv;
+in
+
+stdenv'.mkDerivation rec {
   pname = "librealsense";
   version = "2.56.3";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c100fcf6b01..d14840a5369a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10792,9 +10792,6 @@ with pkgs;
 
   librealsenseWithCuda = callPackage ../development/libraries/librealsense {
     cudaSupport = true;
-    # librealsenseWithCuda doesn't build on gcc11. CUDA 11.3 is the last version
-    # to use pre-gcc11, in particular gcc9.
-    stdenv = gcc9Stdenv;
   };
 
   librealsenseWithoutCuda = callPackage ../development/libraries/librealsense {

From 27c8d2648b2013c16f65cabdf04f258d53ccdfce Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2573/3724] hashcat: unpin CUDA

Builds successfully with the default version.
---
 pkgs/by-name/ha/hashcat/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/hashcat/package.nix b/pkgs/by-name/ha/hashcat/package.nix
index c4f8f9f6b295..d922fc7713a8 100644
--- a/pkgs/by-name/ha/hashcat/package.nix
+++ b/pkgs/by-name/ha/hashcat/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   addDriverRunpath,
   config,
-  cudaPackages_12_4 ? { },
+  cudaPackages,
   cudaSupport ? config.cudaSupport,
   fetchurl,
   makeWrapper,
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
           "${ocl-icd}/lib"
         ]
         ++ lib.optionals cudaSupport [
-          "${cudaPackages_12_4.cudatoolkit}/lib"
+          "${cudaPackages.cudatoolkit}/lib"
         ]
       );
     in

From 0e0ae0064119d2be25e638372569a21a0433a525 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2574/3724] python312Packages.paddlepaddle: unpin CUDA

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

diff --git a/pkgs/development/python-modules/paddlepaddle/default.nix b/pkgs/development/python-modules/paddlepaddle/default.nix
index ba2235bd86b0..f807bf7aca52 100644
--- a/pkgs/development/python-modules/paddlepaddle/default.nix
+++ b/pkgs/development/python-modules/paddlepaddle/default.nix
@@ -10,7 +10,7 @@
   zlib,
   setuptools,
   cudaSupport ? config.cudaSupport or false,
-  cudaPackages_11 ? { },
+  cudaPackages,
   addDriverRunpath,
   # runtime dependencies
   httpx,
@@ -88,7 +88,7 @@ buildPythonPackage {
           (lib.getLib stdenv.cc.cc)
         ]
         ++ lib.optionals cudaSupport (
-          with cudaPackages_11;
+          with cudaPackages;
           [
             cudatoolkit.lib
             cudatoolkit.out

From 40cdfdc7f5561b8cf9e5d56a21caa2433b8b6133 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2575/3724] python313Packages.tensorrt: unpin CUDA

---
 pkgs/top-level/python-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index afb3dbb3fda4..5eb818759f92 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17952,9 +17952,7 @@ self: super: with self; {
 
   tensorly = callPackage ../development/python-modules/tensorly { };
 
-  tensorrt = callPackage ../development/python-modules/tensorrt {
-    cudaPackages = pkgs.cudaPackages_11;
-  };
+  tensorrt = callPackage ../development/python-modules/tensorrt { };
 
   tensorstore = callPackage ../development/python-modules/tensorstore { };
 

From 148fa282f71cb172f579d71c985e2822dbd48bf5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2576/3724] catboost: mark as broken under `cudaSupport`

---
 pkgs/by-name/ca/catboost/package.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix      |  6 ------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ca/catboost/package.nix b/pkgs/by-name/ca/catboost/package.nix
index f8dc6d272ed5..dae453510a5c 100644
--- a/pkgs/by-name/ca/catboost/package.nix
+++ b/pkgs/by-name/ca/catboost/package.nix
@@ -15,7 +15,6 @@
   gitUpdater,
   cudaSupport ? config.cudaSupport,
   cudaPackages ? { },
-  llvmPackagesCuda ? llvmPackages,
   pythonSupport ? false,
 }:
 let
@@ -91,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
     # catboost requires clang 14+ for build, but does clang 12 for cuda build.
     # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it.
     # see https://catboost.ai/en/docs/installation/build-environment-setup-for-cmake#compilers,-linkers-and-related-tools
-    CUDAHOSTCXX = lib.optionalString cudaSupport "${llvmPackagesCuda.stdenv.cc}/bin/cc";
+    CUDAHOSTCXX = lib.optionalString cudaSupport "${stdenv.cc}/bin/cc";
     NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isLinux "-fuse-ld=lld";
     NIX_LDFLAGS = "-lc -lm";
     NIX_CFLAGS_COMPILE = toString (
@@ -139,7 +138,10 @@ stdenv.mkDerivation (finalAttrs: {
       natsukium
     ];
     mainProgram = "catboost";
-    # /nix/store/hzxiynjmmj35fpy3jla7vcqwmzj9i449-Libsystem-1238.60.2/include/sys/_types/_mbstate_t.h:31:9: error: unknown type name '__darwin_mbstate_t'
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
+    broken =
+      # See: <https://github.com/catboost/catboost/issues/2755>
+      cudaSupport
+      # /nix/store/hzxiynjmmj35fpy3jla7vcqwmzj9i449-Libsystem-1238.60.2/include/sys/_types/_mbstate_t.h:31:9: error: unknown type name '__darwin_mbstate_t'
+      || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d14840a5369a..16cc47ed1aa2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7594,12 +7594,6 @@ with pkgs;
 
   ormolu = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.ormolu);
 
-  catboost = callPackage ../by-name/ca/catboost/package.nix {
-    # https://github.com/catboost/catboost/issues/2540
-    cudaPackages = cudaPackages_11;
-    llvmPackagesCuda = llvmPackages_14;
-  };
-
   cctag = callPackage ../development/libraries/cctag {
     stdenv = clangStdenv;
     tbb = tbb_2021;

From ea388239959c33728ed029e5cc8e3badf3214b49 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 21:49:56 +0100
Subject: [PATCH 2577/3724] dcgm: 3.3.9 -> 4.3.1

---
 pkgs/by-name/dc/dcgm/fix-includes.patch | 110 -----------
 pkgs/by-name/dc/dcgm/fix-paths.patch    | 252 ++++++++++++++++++++++++
 pkgs/by-name/dc/dcgm/package.nix        |  85 +++++---
 3 files changed, 307 insertions(+), 140 deletions(-)
 delete mode 100644 pkgs/by-name/dc/dcgm/fix-includes.patch
 create mode 100644 pkgs/by-name/dc/dcgm/fix-paths.patch

diff --git a/pkgs/by-name/dc/dcgm/fix-includes.patch b/pkgs/by-name/dc/dcgm/fix-includes.patch
deleted file mode 100644
index 2f15ddca1f7e..000000000000
--- a/pkgs/by-name/dc/dcgm/fix-includes.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/common/CudaWorker/DcgmDgemm.cpp b/common/CudaWorker/DcgmDgemm.cpp
-index 8d33a3256e..6b3284258d 100644
---- a/common/CudaWorker/DcgmDgemm.cpp
-+++ b/common/CudaWorker/DcgmDgemm.cpp
-@@ -17,6 +17,7 @@
- 
- #include <exception>
- #include <stdexcept>
-+#include <cinttypes>
- 
- #define CU_CHK(op)                                               \
-     if (auto const status = op; status != CUBLAS_STATUS_SUCCESS) \
-@@ -122,4 +123,4 @@
-     return CUBLAS_STATUS_SUCCESS;
- }
- 
--} // namespace DcgmNs
-\ No newline at end of file
-+} // namespace DcgmNs
-diff --git a/common/DcgmError.h b/common/DcgmError.h
-index 8638cdceb1..e8d817c0d4 100644
---- a/common/DcgmError.h
-+++ b/common/DcgmError.h
-@@ -17,6 +17,7 @@
- 
- #include <sstream>
- #include <string>
-+#include <cinttypes>
- 
- #include <dcgm_agent.h>
- #include <dcgm_errors.h>
-diff --git a/common/DcgmStringHelpers.cpp b/common/DcgmStringHelpers.cpp
-index b41917e3b7..1fe63980c7 100644
---- a/common/DcgmStringHelpers.cpp
-+++ b/common/DcgmStringHelpers.cpp
-@@ -17,6 +17,7 @@
- 
- #include <cstring>
- #include <string>
-+#include <algorithm>
- 
- /*****************************************************************************/
- void dcgmTokenizeString(const std::string &src, const std::string &delimiter, std::vector<std::string> &tokens)
-diff --git a/dcgmi/CommandOutputController.cpp b/dcgmi/CommandOutputController.cpp
-index 5057205564..8520171efa 100644
---- a/dcgmi/CommandOutputController.cpp
-+++ b/dcgmi/CommandOutputController.cpp
-@@ -24,6 +24,7 @@
- #include "dcgm_agent.h"
- #include <DcgmStringHelpers.h>
- #include <algorithm>
-+#include <functional>
- #include <cstdarg>
- #include <iostream>
- #include <string>
-diff --git a/dcgmi/Diag.h b/dcgmi/Diag.h
-index a326f7b949..563fb3c9c0 100755
---- a/dcgmi/Diag.h
-+++ b/dcgmi/Diag.h
-@@ -24,6 +24,7 @@
- #define DIAG_H_
- 
- #include <optional>
-+#include <functional>
- 
- #include "Command.h"
- #include "CommandOutputController.h"
-diff --git a/hostengine/src/HostEngineOutput.cpp b/hostengine/src/HostEngineOutput.cpp
-index 23c6ca9f54..798b83b3e4 100644
---- a/hostengine/src/HostEngineOutput.cpp
-+++ b/hostengine/src/HostEngineOutput.cpp
-@@ -20,6 +20,7 @@
- #include <iostream>
- #include <limits>
- #include <string_view>
-+#include <unordered_map>
- 
- namespace
- {
-@@ -365,4 +366,4 @@
-         }
-     }
-     os << std::endl;
--}
-\ No newline at end of file
-+}
-diff --git a/nvvs/src/NvvsCommon.cpp b/nvvs/src/NvvsCommon.cpp
-index 8f7888649b..1604d9dabe 100644
---- a/nvvs/src/NvvsCommon.cpp
-+++ b/nvvs/src/NvvsCommon.cpp
-@@ -15,6 +15,7 @@
-  */
- #include <sstream>
- #include <stdexcept>
-+#include <algorithm>
- #include <sys/stat.h>
- #include <sys/types.h>
- 
-diff --git a/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp b/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp
-index 9eebeaf1c4..6e21201229 100644
---- a/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp
-+++ b/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp
-@@ -20,6 +20,7 @@
- 
- #include <atomic>
- #include <mutex>
-+#include <cstdlib>
- 
- static void *g_nvmlLib                                     = 0;
- static std::atomic_uint32_t g_nvmlStaticLibResetHooksCount = 1;
diff --git a/pkgs/by-name/dc/dcgm/fix-paths.patch b/pkgs/by-name/dc/dcgm/fix-paths.patch
new file mode 100644
index 000000000000..86581f406986
--- /dev/null
+++ b/pkgs/by-name/dc/dcgm/fix-paths.patch
@@ -0,0 +1,252 @@
+diff --git a/common/LsHw.cpp b/common/LsHw.cpp
+index 8d0f35cd89..12fe26957f 100644
+--- a/common/LsHw.cpp
++++ b/common/LsHw.cpp
+@@ -145,7 +145,7 @@
+ {
+     static std::string const cmd = "lshw -json";
+     std::string cmdOutput;
+-    static std::array<std::string, 2> const cmdPathPrefix { "/usr/bin/", "/usr/sbin/" };
++    static std::array<std::string, 1> const cmdPathPrefix { "@lshw@/bin/" };
+ 
+     dcgmReturn_t result = DCGM_ST_OK;
+     for (auto const &prefix : cmdPathPrefix)
+@@ -162,4 +162,4 @@
+     }
+ 
+     return cmdOutput;
+-}
+\ No newline at end of file
++}
+diff --git a/common/tests/LsHwTests.cpp b/common/tests/LsHwTests.cpp
+index edb65e599e..5950fb8d9e 100644
+--- a/common/tests/LsHwTests.cpp
++++ b/common/tests/LsHwTests.cpp
+@@ -609,7 +609,7 @@
+         std::unique_ptr<MockRunningUserChecker> checker = std::make_unique<MockRunningUserChecker>();
+         checker->MockIsRoot(true);
+         std::unique_ptr<MockRunCmdHelper> runCmdHelper = std::make_unique<MockRunCmdHelper>();
+-        runCmdHelper->MockCmdOutput("/usr/bin/lshw -json", DCGM_ST_OK, lshwMultipleCpusAbridgedValidJson);
++        runCmdHelper->MockCmdOutput("@lshw@/bin/lshw -json", DCGM_ST_OK, lshwMultipleCpusAbridgedValidJson);
+ 
+         LsHw lshw;
+         lshw.SetChecker(std::move(checker));
+@@ -626,7 +626,7 @@
+         std::unique_ptr<MockRunningUserChecker> checker = std::make_unique<MockRunningUserChecker>();
+         checker->MockIsRoot(true);
+         std::unique_ptr<MockRunCmdHelper> runCmdHelper = std::make_unique<MockRunCmdHelper>();
+-        runCmdHelper->MockCmdOutput("/usr/bin/lshw -json", DCGM_ST_OK, lshwSingleCpuAbridgedValidJson);
++        runCmdHelper->MockCmdOutput("@lshw@/bin/lshw -json", DCGM_ST_OK, lshwSingleCpuAbridgedValidJson);
+ 
+         LsHw lshw;
+         lshw.SetChecker(std::move(checker));
+@@ -642,7 +642,7 @@
+         std::unique_ptr<MockRunningUserChecker> checker = std::make_unique<MockRunningUserChecker>();
+         checker->MockIsRoot(true);
+         std::unique_ptr<MockRunCmdHelper> runCmdHelper = std::make_unique<MockRunCmdHelper>();
+-        runCmdHelper->MockCmdOutput("/usr/bin/lshw -json", DCGM_ST_OK, lshwSingleCpuNoSerialNumberAbridgedValidJson);
++        runCmdHelper->MockCmdOutput("@lshw@/bin/lshw -json", DCGM_ST_OK, lshwSingleCpuNoSerialNumberAbridgedValidJson);
+ 
+         LsHw lshw;
+         lshw.SetChecker(std::move(checker));
+@@ -658,7 +658,7 @@
+         std::unique_ptr<MockRunningUserChecker> checker = std::make_unique<MockRunningUserChecker>();
+         checker->MockIsRoot(true);
+         std::unique_ptr<MockRunCmdHelper> runCmdHelper = std::make_unique<MockRunCmdHelper>();
+-        runCmdHelper->MockCmdOutput("/usr/bin/lshw -json", DCGM_ST_OK, lshwSingleNonNvidiaCpuAbridgedValidJson);
++        runCmdHelper->MockCmdOutput("@lshw@/bin/lshw -json", DCGM_ST_OK, lshwSingleNonNvidiaCpuAbridgedValidJson);
+ 
+         LsHw lshw;
+         lshw.SetChecker(std::move(checker));
+@@ -673,7 +673,7 @@
+         std::unique_ptr<MockRunningUserChecker> checker = std::make_unique<MockRunningUserChecker>();
+         checker->MockIsRoot(true);
+         std::unique_ptr<MockRunCmdHelper> runCmdHelper = std::make_unique<MockRunCmdHelper>();
+-        runCmdHelper->MockCmdOutput("/usr/bin/lshw -json", DCGM_ST_OK, lshwIncorrectIdValueTypeJson);
++        runCmdHelper->MockCmdOutput("@lshw@/bin/lshw -json", DCGM_ST_OK, lshwIncorrectIdValueTypeJson);
+ 
+         LsHw lshw;
+         lshw.SetChecker(std::move(checker));
+@@ -687,7 +687,7 @@
+         std::unique_ptr<MockRunningUserChecker> checker = std::make_unique<MockRunningUserChecker>();
+         checker->MockIsRoot(true);
+         std::unique_ptr<MockRunCmdHelper> runCmdHelper = std::make_unique<MockRunCmdHelper>();
+-        runCmdHelper->MockCmdOutput("/usr/bin/lshw -json", DCGM_ST_OK, lshwMissingCpuJson);
++        runCmdHelper->MockCmdOutput("@lshw@/bin/lshw -json", DCGM_ST_OK, lshwMissingCpuJson);
+ 
+         LsHw lshw;
+         lshw.SetChecker(std::move(checker));
+@@ -702,7 +702,7 @@
+         std::unique_ptr<MockRunningUserChecker> checker = std::make_unique<MockRunningUserChecker>();
+         checker->MockIsRoot(true);
+         std::unique_ptr<MockRunCmdHelper> runCmdHelper = std::make_unique<MockRunCmdHelper>();
+-        runCmdHelper->MockCmdOutput("/usr/bin/lshw -json", DCGM_ST_OK, lshwBadSyntaxJson);
++        runCmdHelper->MockCmdOutput("@lshw@/bin/lshw -json", DCGM_ST_OK, lshwBadSyntaxJson);
+ 
+         LsHw lshw;
+         lshw.SetChecker(std::move(checker));
+@@ -716,6 +716,7 @@
+ {
+     SECTION("Will try /usr/sbin/")
+     {
++        SKIP("Nixpkgs patches this out");
+         std::unique_ptr<MockRunningUserChecker> checker = std::make_unique<MockRunningUserChecker>();
+         checker->MockIsRoot(true);
+         std::unique_ptr<MockRunCmdHelper> runCmdHelper = std::make_unique<MockRunCmdHelper>();
+@@ -730,4 +731,4 @@
+         REQUIRE(cpuSerials.value()[0] == "0x000000017820B1C80400000015FF81C0");
+         REQUIRE(cpuSerials.value()[1] == "0x000000017820B1C8040000000A0200C0");
+     }
+-}
+\ No newline at end of file
++}
+diff --git a/modules/diag/DcgmDiagManager.cpp b/modules/diag/DcgmDiagManager.cpp
+index d0a75dcede..ccd4347719 100644
+--- a/modules/diag/DcgmDiagManager.cpp
++++ b/modules/diag/DcgmDiagManager.cpp
+@@ -253,7 +253,7 @@
+     int result;
+ 
+     // Default NVVS binary path
+-    cmd = "/usr/libexec/datacenter-gpu-manager-4/nvvs";
++    cmd = "@dcgm_out@/libexec/datacenter-gpu-manager-4/nvvs";
+ 
+     // Check for NVVS binary path enviroment variable
+     value = std::getenv("NVVS_BIN_PATH");
+diff --git a/modules/mndiag/dcgm_mndiag_structs.hpp b/modules/mndiag/dcgm_mndiag_structs.hpp
+index 40e61a8fd0..7e43ce8bed 100644
+--- a/modules/mndiag/dcgm_mndiag_structs.hpp
++++ b/modules/mndiag/dcgm_mndiag_structs.hpp
+@@ -33,8 +33,8 @@
+ constexpr std::string_view ENV_ALLOW_RUN_AS_ROOT = "DCGM_MPIRUN_ALLOW_RUN_AS_ROOT";
+ 
+ // Default paths
+-constexpr std::string_view DEFAULT_MPIRUN_PATH     = "/usr/bin/mpirun";
+-constexpr std::string_view DEFAULT_MNUBERGEMM_PATH = "/usr/libexec/datacenter-gpu-manager-4/plugins/cuda12/mnubergemm";
++constexpr std::string_view DEFAULT_MPIRUN_PATH     = "@mpi@/bin/mpirun";
++constexpr std::string_view DEFAULT_MNUBERGEMM_PATH = "@dcgm_out@/libexec/datacenter-gpu-manager-4/plugins/cuda12/mnubergemm";
+ } //namespace MnDiagConstants
+ 
+ // Message types
+diff --git a/modules/mndiag/tests/MnDiagManagerTests.cpp b/modules/mndiag/tests/MnDiagManagerTests.cpp
+index 40dbda3b72..5ec8dafa1c 100644
+--- a/modules/mndiag/tests/MnDiagManagerTests.cpp
++++ b/modules/mndiag/tests/MnDiagManagerTests.cpp
+@@ -2228,7 +2228,7 @@
+         mockStateMachine->SetMnubergemmPathCallback([&capturedPath](std::string const &path) { capturedPath = path; });
+ 
+         // Set env to custom path
+-        std::string customPath = "/bin/true";
++        std::string customPath = "@coreutils@/bin/true";
+         setenv(MnDiagConstants::ENV_MNUBERGEMM_PATH.data(), customPath.c_str(), 1);
+ 
+         auto mockCoreProxy = std::make_unique<MockDcgmCoreProxy>();
+@@ -3112,7 +3112,7 @@
+     {
+         // Save current environment state
+         auto savedPath         = saveEnvVar(MnDiagConstants::ENV_MNUBERGEMM_PATH.data());
+-        std::string customPath = "/bin/true";
++        std::string customPath = "@coreutils@/bin/true";
+         setenv(MnDiagConstants::ENV_MNUBERGEMM_PATH.data(), customPath.c_str(), 1);
+ 
+         // Setup mock DCGM API with callback to inspect request
+@@ -3251,7 +3251,7 @@
+         auto savedPath = saveEnvVar(MnDiagConstants::ENV_MNUBERGEMM_PATH.data());
+ 
+         // Use a known executable that exists
+-        std::string customPath = "/bin/true";
++        std::string customPath = "@coreutils@/bin/true";
+         setenv(MnDiagConstants::ENV_MNUBERGEMM_PATH.data(), customPath.c_str(), 1);
+ 
+         // Call the method and verify path
+diff --git a/modules/mndiag/tests/MnDiagProcessUtilsTests.cpp b/modules/mndiag/tests/MnDiagProcessUtilsTests.cpp
+index 633e327c42..168ed91db2 100644
+--- a/modules/mndiag/tests/MnDiagProcessUtilsTests.cpp
++++ b/modules/mndiag/tests/MnDiagProcessUtilsTests.cpp
+@@ -71,7 +71,7 @@
+     {
+         // Start a long-running process
+         DcgmNs::Common::Subprocess::ChildProcessBuilder builder;
+-        builder.SetExecutable("/bin/sleep").AddArg("0.5");
++        builder.SetExecutable("@coreutils@/bin/sleep").AddArg("0.5");
+ 
+         IoContext ioContext {};
+         auto process = std::make_unique<DcgmNs::Common::Subprocess::ChildProcess>(builder.Build(ioContext));
+@@ -155,4 +155,4 @@
+ 
+         REQUIRE(result.empty());
+     }
+-}
+\ No newline at end of file
++}
+diff --git a/modules/mndiag/tests/MpiRunnerTests.cpp b/modules/mndiag/tests/MpiRunnerTests.cpp
+index 526c80fd47..1e8596d3b7 100755
+--- a/modules/mndiag/tests/MpiRunnerTests.cpp
++++ b/modules/mndiag/tests/MpiRunnerTests.cpp
+@@ -60,7 +60,7 @@
+ 
+     std::string GetMpiBinPath() const override
+     {
+-        return "/bin/bash";
++        return "@shell@";
+     }
+ 
+ private:
+@@ -138,9 +138,9 @@
+         runner.ConstructMpiCommand(&config);
+ 
+         // Verify command construction
+-        REQUIRE(runner.GetMpiBinPath() == "/bin/bash");
++        REQUIRE(runner.GetMpiBinPath() == "@shell@");
+         std::string fullCommand = runner.GetLastCommand();
+-        REQUIRE(fullCommand.find("/bin/bash -c") != std::string::npos);
++        REQUIRE(fullCommand.find("@shell@ -c") != std::string::npos);
+         REQUIRE(fullCommand.find("sleep 1") != std::string::npos);
+         REQUIRE(fullCommand.find("Output from sleep process") != std::string::npos);
+ 
+@@ -244,4 +244,4 @@
+         // Test with invalid parameter (null pointer)
+         REQUIRE(runner.PopulateResponse(nullptr, nodeInfoMap_t()) == DCGM_ST_BADPARAM);
+     }
+-}
+\ No newline at end of file
++}
+diff --git a/modules/sysmon/DcgmCpuTopology.cpp b/modules/sysmon/DcgmCpuTopology.cpp
+index 786d3877fc..ccbeccc81d 100644
+--- a/modules/sysmon/DcgmCpuTopology.cpp
++++ b/modules/sysmon/DcgmCpuTopology.cpp
+@@ -136,7 +136,7 @@
+ {
+     static std::string cmd = "lscpu --json";
+     std::string cmdOutput;
+-    static std::array<std::string, 2> cmdPathPrefix = { "/usr/bin/", "/usr/sbin/" };
++    static std::array<std::string, 1> cmdPathPrefix = { "@util-linux@/bin/" };
+ 
+     dcgmReturn_t result = DCGM_ST_OK;
+     for (auto const &prefix : cmdPathPrefix)
+diff --git a/nvvs/plugin_src/nvbandwidth/NVBandwidthPlugin.cpp b/nvvs/plugin_src/nvbandwidth/NVBandwidthPlugin.cpp
+index 261bba4490..4d439ad452 100644
+--- a/nvvs/plugin_src/nvbandwidth/NVBandwidthPlugin.cpp
++++ b/nvvs/plugin_src/nvbandwidth/NVBandwidthPlugin.cpp
+@@ -238,7 +238,7 @@
+     std::vector<std::string> const search_paths
+         = { GetCurrentModuleLocation(),
+             fmt::format("./apps/nvvs/plugins/cuda{}", m_cudaDriverMajorVersion),
+-            fmt::format("/usr/libexec/datacenter-gpu-manager-4/plugins/cuda{}", m_cudaDriverMajorVersion),
++            fmt::format("@dcgm_out@/libexec/datacenter-gpu-manager-4/plugins/cuda{}", m_cudaDriverMajorVersion),
+             GetNvvsBinCheckPath(m_cudaDriverMajorVersion) };
+     std::stringstream path_buf;
+ 
+diff --git a/testing/TestDiagManager.cpp b/testing/TestDiagManager.cpp
+index 8087123a49..a6333b3a3d 100644
+--- a/testing/TestDiagManager.cpp
++++ b/testing/TestDiagManager.cpp
+@@ -236,7 +236,7 @@
+     if (nvvsPathEnv)
+         nvvsBinPath = std::string(nvvsPathEnv) + "/nvvs";
+     else
+-        nvvsBinPath = "/usr/libexec/datacenter-gpu-manager-4/nvvs";
++        nvvsBinPath = "@dcgm_out@/libexec/datacenter-gpu-manager-4/nvvs";
+ 
+     std::string diagResponseVersionArg = fmt::format("--response-version {}", dcgmDiagResponse_version12);
+     expected.push_back(nvvsBinPath + " --channel-fd 3 " + diagResponseVersionArg
diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix
index 396d243bb61c..140cf98257c1 100644
--- a/pkgs/by-name/dc/dcgm/package.nix
+++ b/pkgs/by-name/dc/dcgm/package.nix
@@ -3,20 +3,27 @@
   stdenv,
   fetchFromGitHub,
   autoAddDriverRunpath,
-  catch2,
+  catch2_3,
   cmake,
+  ctestCheckHook,
+  coreutils,
+  mpi,
+  mpiCheckPhaseHook,
   ninja,
   cudaPackages_11,
   cudaPackages_12,
-  boost,
-  fmt_9,
+  boost186,
+  fmt_10,
   git,
   jsoncpp,
   libevent,
+  lshw,
   plog,
   python3,
+  replaceVars,
   symlinkJoin,
   tclap_1_4,
+  util-linux,
   yaml-cpp,
 }:
 let
@@ -67,18 +74,27 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "dcgm";
-  version = "3.3.9"; # N.B: If you change this, be sure prometheus-dcgm-exporter supports this version.
+  version = "4.3.1"; # N.B: If you change this, be sure prometheus-dcgm-exporter supports this version.
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "DCGM";
-    tag = "v${version}";
-    hash = "sha256-PysxuN5WT7GB0oOvT5ezYeOau6AMVDDWE5HOAcmqw/Y=";
+    # No tag for 4.3.1 yet.
+    #tag = "v${version}";
+    rev = "1477d8785e899ab3450fdff2b486102e9bed096b";
+    hash = "sha256-FebqG28aodENGLNBBbiGpckzzeuP+y44dCALtYnN1yU=";
   };
 
   patches = [
-    ./fix-includes.patch
     ./dynamic-libs.patch
+    (replaceVars ./fix-paths.patch {
+      inherit coreutils;
+      inherit util-linux;
+      inherit lshw;
+      inherit mpi;
+      inherit (stdenv) shell;
+      dcgm_out = null;
+    })
   ];
 
   hardeningDisable = [ "all" ];
@@ -99,17 +115,39 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     # Header-only
-    boost
-    catch2
+    boost186
+    catch2_3
     plog.dev
     tclap_1_4
 
-    fmt_9
+    fmt_10
     yaml-cpp
     jsoncpp
     libevent
   ];
 
+  nativeCheckInputs = [
+    mpi
+    ctestCheckHook
+    mpiCheckPhaseHook
+  ];
+
+  disabledTests = [
+    # Fail due to lack of `/sys` in the sandbox.
+    "DcgmModuleSysmon::PauseResume Module resumed after initialization"
+    "DcgmModuleSysmon PauseResume Module rejects invalid messages"
+    "DcgmModuleSysmon PauseResume Module accepts valid messages"
+    "DcgmModuleSysmon Watches"
+    "DcgmModuleSysmon maxSampleAge"
+    "DcgmModuleSysmon::CalculateCoreUtilization"
+    "DcgmModuleSysmon::ParseProcStatCpuLine"
+    "DcgmModuleSysmon::ParseThermalFileContentsAndStore"
+    "DcgmModuleSysmon::PopulateTemperatureFileMap"
+    "DcgmModuleSysmon::ReadCoreSpeed"
+    "DcgmModuleSysmon::ReadTemperature"
+    "Sysmon: initialize module"
+  ];
+
   # Add our paths to the CMake flags so FindCuda.cmake can find them.
   cmakeFlags = lib.concatMap mkCudaFlags cudaPackageSets;
 
@@ -117,31 +155,18 @@ stdenv.mkDerivation rec {
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
 
   doCheck = true;
+  dontUseNinjaCheck = true;
 
-  checkPhase = ''
-    runHook preCheck
-
-    ctest -j $NIX_BUILD_CORES --output-on-failure --exclude-regex ${
-      lib.escapeShellArg (
-        lib.concatMapStringsSep "|" (test: "^${lib.escapeRegex test}$") [
-          "DcgmModuleSysmon Watches"
-          "DcgmModuleSysmon maxSampleAge"
-          "DcgmModuleSysmon::CalculateCoreUtilization"
-          "DcgmModuleSysmon::ParseProcStatCpuLine"
-          "DcgmModuleSysmon::ParseThermalFileContentsAndStore"
-          "DcgmModuleSysmon::PopulateTemperatureFileMap"
-          "DcgmModuleSysmon::ReadCoreSpeed"
-          "DcgmModuleSysmon::ReadTemperature"
-          "Sysmon: initialize module"
-        ]
-      )
-    }
-
-    runHook postCheck
+  postPatch = ''
+    while read -r -d "" file; do
+      substituteInPlace "$file" --replace-quiet @dcgm_out@ "$out"
+    done < <(find . '(' -name '*.h' -or -name '*.cpp' ')' -print0)
   '';
 
   disallowedReferences = lib.concatMap getCudaPackages cudaPackageSets;
 
+  __structuredAttrs = true;
+
   meta = with lib; {
     description = "Data Center GPU Manager (DCGM) is a daemon that allows users to monitor NVIDIA data-center GPUs";
     homepage = "https://developer.nvidia.com/dcgm";

From 283bab3ab67c63a3bac0078c86f83c132d3cd12e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 21:49:56 +0100
Subject: [PATCH 2578/3724] prometheus-dcgm-exporter: 3.3.9-3.6.1 ->
 4.3.1-4.4.0

---
 pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
index 92863b5b8008..21df16abf035 100644
--- a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
@@ -10,13 +10,13 @@ buildGoModule rec {
 
   # The first portion of this version string corresponds to a compatible DCGM
   # version.
-  version = "3.3.9-3.6.1"; # N.B: If you change this, update dcgm as well to the matching version.
+  version = "4.3.1-4.4.0"; # N.B: If you change this, update dcgm as well to the matching version.
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "dcgm-exporter";
     tag = version;
-    hash = "sha256-BAMN2yuIW5FcHY3o9MUIMgPnTEFFRCbqhoAkcaZDxcM=";
+    hash = "sha256-NafQWP1NxHTwmOND8ovy3oVia7qq0rCwZYE3VNlMBKQ=";
   };
 
   CGO_LDFLAGS = "-ldcgm";
@@ -29,7 +29,7 @@ buildGoModule rec {
   # symbols are available on startup.
   hardeningDisable = [ "bindnow" ];
 
-  vendorHash = "sha256-b7GyPsmSGHx7hK0pDa88FKA+ZKJES2cdAGjT2aAfX/A=";
+  vendorHash = "sha256-BfHC49Dzb4ArXK87JKD+aYEHR5HUS5NL0fEHa0jOCYM=";
 
   nativeBuildInputs = [
     autoAddDriverRunpath

From 82bd1798b8bdc5c24ac381c6a90402fd25dc7e48 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 21:49:56 +0100
Subject: [PATCH 2579/3724] dcgm: patch out CUDA 11 support

---
 pkgs/by-name/dc/dcgm/package.nix          |   5 +-
 pkgs/by-name/dc/dcgm/remove-cuda-11.patch | 289 ++++++++++++++++++++++
 2 files changed, 291 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/dc/dcgm/remove-cuda-11.patch

diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix
index 140cf98257c1..d097d2957312 100644
--- a/pkgs/by-name/dc/dcgm/package.nix
+++ b/pkgs/by-name/dc/dcgm/package.nix
@@ -10,7 +10,6 @@
   mpi,
   mpiCheckPhaseHook,
   ninja,
-  cudaPackages_11,
   cudaPackages_12,
   boost186,
   fmt_10,
@@ -27,11 +26,10 @@
   yaml-cpp,
 }:
 let
-  # DCGM depends on 2 different versions of CUDA at the same time.
+  # DCGM can depend on multiple versions of CUDA at the same time.
   # The runtime closure, thankfully, is quite small as it does not
   # include the CUDA libraries.
   cudaPackageSets = [
-    cudaPackages_11
     cudaPackages_12
   ];
 
@@ -86,6 +84,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
+    ./remove-cuda-11.patch
     ./dynamic-libs.patch
     (replaceVars ./fix-paths.patch {
       inherit coreutils;
diff --git a/pkgs/by-name/dc/dcgm/remove-cuda-11.patch b/pkgs/by-name/dc/dcgm/remove-cuda-11.patch
new file mode 100644
index 000000000000..81a49ad0a888
--- /dev/null
+++ b/pkgs/by-name/dc/dcgm/remove-cuda-11.patch
@@ -0,0 +1,289 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 11317ae20f..7a6b1d5b75 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -269,10 +269,8 @@
+     add_library(testing_dcgm_cublas_stubs STATIC)
+ endif()
+ 
+-add_executable(BwChecker_11)
+ add_executable(BwChecker_12)
+ add_executable(dcgmi)
+-add_executable(dcgmproftester11)
+ add_executable(dcgmproftester12)
+ add_executable(nv-hostengine)
+ add_executable(nvvs)
+@@ -327,9 +325,7 @@
+ add_library(childprocess STATIC)
+ add_library(common_watch_objects STATIC)
+ add_library(dcgm_common STATIC)
+-add_library(dcgm_cuda_worker11 STATIC)
+ add_library(dcgm_cuda_worker12 STATIC)
+-add_library(dcgm_cuda_lib11 STATIC)
+ add_library(dcgm_cuda_lib12 STATIC)
+ add_library(dcgm_entity_types STATIC)
+ add_library(dcgm_logging STATIC)
+@@ -342,7 +338,6 @@
+ add_library(nvvs_without_main_objects OBJECT)
+ add_library(nvvs_main_objects OBJECT)
+ add_library(nvvs_plugins_common_objects OBJECT)
+-add_library(pluginCudaCommon_11 STATIC)
+ add_library(pluginCudaCommon_12 STATIC)
+ add_library(remoteconn STATIC)
+ add_library(sdk_nvml_essentials_objects STATIC)
+@@ -368,24 +363,16 @@
+ add_library(dcgmmodulepolicy SHARED)
+ add_library(dcgmmodulesysmon SHARED)
+ 
+-add_library(ContextCreate_11 SHARED)
+ add_library(ContextCreate_12 SHARED)
+-add_library(Diagnostic_11 SHARED)
+ add_library(Diagnostic_12 SHARED)
+-add_library(Memory_11 SHARED)
+ add_library(Memory_12 SHARED)
+-add_library(Memtest_11 SHARED)
+ add_library(Memtest_12 SHARED)
+ add_library(NVBandwidth_12 SHARED)
+-add_library(Pcie_11 SHARED)
+ add_library(Pcie_12 SHARED)
+-add_library(TargetedPower_11 SHARED)
+ add_library(TargetedPower_12 SHARED)
+-add_library(TargetedStress_11 SHARED)
+ add_library(TargetedStress_12 SHARED)
+ 
+ add_library(dcgm SHARED)
+-add_library(dcgm_cublas_proxy11 SHARED)
+ add_library(dcgm_cublas_proxy12 SHARED)
+ add_library(pluginCommon SHARED)
+ 
+@@ -395,20 +382,13 @@
+ add_library(DCGM::dcgm ALIAS dcgm)
+ 
+ set_target_properties(
+-    ContextCreate_11
+     ContextCreate_12
+-    Diagnostic_11
+     Diagnostic_12
+-    Memory_11
+     Memory_12
+-    Memtest_11
+     Memtest_12
+     NVBandwidth_12
+-    Pcie_11
+     Pcie_12
+-    TargetedPower_11
+     TargetedPower_12
+-    TargetedStress_11
+     TargetedStress_12
+     dcgm
+     dcgmmoduleconfig
+@@ -419,7 +399,6 @@
+     dcgmmodulenvswitch
+     dcgmmodulepolicy
+     dcgmmodulesysmon
+-    dcgm_cublas_proxy11
+     dcgm_cublas_proxy12
+     pluginCommon
+     PROPERTIES
+@@ -433,7 +412,6 @@
+     RUNTIME_OUTPUT_DIRECTORY nvvs)
+ 
+ set_target_properties(
+-    BwChecker_11
+     BwChecker_12
+     PROPERTIES
+         INSTALL_RPATH "${DCGM_RPATH}:$ORIGIN/../../../${DCGM_TESTS_ARCH}")
+@@ -441,27 +419,19 @@
+ set_target_properties(dcgmi PROPERTIES RUNTIME_OUTPUT_DIRECTORY dcgmi)
+ 
+ set_target_properties(
+-    ContextCreate_11
+     ContextCreate_12
+-    Diagnostic_11
+     Diagnostic_12
+-    Memory_11
+     Memory_12
+-    Memtest_11
+     Memtest_12
+     NVBandwidth_12
+-    Pcie_11
+     Pcie_12
+-    TargetedPower_11
+     TargetedPower_12
+-    TargetedStress_11
+     TargetedStress_12
+     nvml_injection
+     nvmli_public
+     nvvs_without_main_objects
+     nvvs_plugins_common_objects
+     pluginCommon
+-    pluginCudaCommon_11
+     pluginCudaCommon_12
+     PROPERTIES
+         C_VISIBILITY_PRESET default
+@@ -594,18 +564,6 @@
+         COMPONENT Core)
+ 
+ install(
+-    TARGETS
+-        dcgm_cublas_proxy11
+-        dcgmproftester11
+-    LIBRARY
+-        DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-        COMPONENT Cuda11
+-        NAMELINK_SKIP
+-    RUNTIME
+-        DESTINATION "${CMAKE_INSTALL_BINDIR}"
+-        COMPONENT Cuda11)
+-
+-install(
+     TARGETS pluginCommon
+     LIBRARY
+         DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME}/plugins/cudaless"
+@@ -618,29 +576,6 @@
+     LIBRARY
+         DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME}/plugins/cudaless"
+         COMPONENT Core)
+-
+-install(
+-    TARGETS
+-        BwChecker_11
+-        ContextCreate_11
+-        Diagnostic_11
+-        Memory_11
+-        Memtest_11
+-        Pcie_11
+-        TargetedPower_11
+-        TargetedStress_11
+-    LIBRARY
+-        DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME}/plugins/cuda11"
+-        PERMISSIONS
+-            OWNER_READ OWNER_WRITE OWNER_EXECUTE
+-            GROUP_READ GROUP_EXECUTE
+-            WORLD_READ WORLD_EXECUTE
+-        COMPONENT Cuda11
+-        NAMELINK_SKIP
+-    RUNTIME
+-        DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME}/plugins/cuda11"
+-        COMPONENT Cuda11)
+-
+ install(
+     TARGETS
+         dcgm_cublas_proxy12
+@@ -686,7 +621,6 @@
+ install(
+     TARGETS
+         dcgm
+-        dcgm_cublas_proxy11
+         dcgm_cublas_proxy12
+         dcgmi
+         dcgmmoduleconfig
+@@ -697,7 +631,6 @@
+         dcgmmodulenvswitch
+         dcgmmodulepolicy
+         dcgmmodulesysmon
+-        dcgmproftester11
+         dcgmproftester12
+         nv-hostengine
+         nvml_injection
+@@ -725,28 +658,6 @@
+ 
+ install(
+     TARGETS
+-        BwChecker_11
+-        ContextCreate_11
+-        Diagnostic_11
+-        Memory_11
+-        Memtest_11
+-        Pcie_11
+-        TargetedPower_11
+-        TargetedStress_11
+-    LIBRARY
+-        DESTINATION "${CMAKE_INSTALL_DATADIR}/dcgm_tests/apps/nvvs/plugins/cuda11"
+-        PERMISSIONS
+-            OWNER_READ OWNER_WRITE OWNER_EXECUTE
+-            GROUP_READ GROUP_EXECUTE
+-            WORLD_READ WORLD_EXECUTE
+-        COMPONENT Tests
+-        NAMELINK_SKIP
+-    RUNTIME
+-        DESTINATION "${CMAKE_INSTALL_DATADIR}/dcgm_tests/apps/nvvs/plugins/cuda11"
+-        COMPONENT Tests)
+-
+-install(
+-    TARGETS
+         BwChecker_12
+         ContextCreate_12
+         Diagnostic_12
+diff --git a/cmake/FindCuda.cmake b/cmake/FindCuda.cmake
+index 3c1769597a..cf3e54d332 100644
+--- a/cmake/FindCuda.cmake
++++ b/cmake/FindCuda.cmake
+@@ -94,10 +94,6 @@
+ 
+ endmacro()
+ 
+-if (NOT DEFINED CUDA11_INCLUDE_DIR)
+-    load_cuda(11)
+-endif()
+-
+ if (NOT DEFINED CUDA12_INCLUDE_DIR)
+     load_cuda(12)
+ endif()
+diff --git a/common/CudaLib/CMakeLists.txt b/common/CudaLib/CMakeLists.txt
+index 0b2b0e0217..ea6fd17d8d 100644
+--- a/common/CudaLib/CMakeLists.txt
++++ b/common/CudaLib/CMakeLists.txt
+@@ -40,7 +40,6 @@
+         CudaLib.h)
+ endmacro()
+ 
+-define_dcgm_cuda_lib(11)
+ define_dcgm_cuda_lib(12)
+ 
+ target_include_directories(cuda_lib_base_interface INTERFACE
+diff --git a/common/CudaWorker/CMakeLists.txt b/common/CudaWorker/CMakeLists.txt
+index 958ace542f..f2c6ae748e 100644
+--- a/common/CudaWorker/CMakeLists.txt
++++ b/common/CudaWorker/CMakeLists.txt
+@@ -35,5 +35,4 @@
+         DcgmDgemm.cpp)
+ endmacro()
+ 
+-define_dcgm_cuda_worker(11)
+ define_dcgm_cuda_worker(12)
+diff --git a/cublas_proxy/CMakeLists.txt b/cublas_proxy/CMakeLists.txt
+index 90dff9e0d2..fe6dd40861 100755
+--- a/cublas_proxy/CMakeLists.txt
++++ b/cublas_proxy/CMakeLists.txt
+@@ -38,5 +38,4 @@
+         rt)
+ endmacro()
+ 
+-add_subdirectory(Cuda11)
+ add_subdirectory(Cuda12)
+diff --git a/dcgmproftester/CMakeLists.txt b/dcgmproftester/CMakeLists.txt
+index 9d18940bf1..97aa78321f 100755
+--- a/dcgmproftester/CMakeLists.txt
++++ b/dcgmproftester/CMakeLists.txt
+@@ -62,7 +62,6 @@
+             ${COMMON_SRCS})
+ endmacro()
+ 
+-define_dcgmproftester(11)
+ define_dcgmproftester(12)
+ 
+ install(
+diff --git a/nvvs/plugin_src/CMakeLists.txt b/nvvs/plugin_src/CMakeLists.txt
+index 21d0131c4a..5a3d371c29 100644
+--- a/nvvs/plugin_src/CMakeLists.txt
++++ b/nvvs/plugin_src/CMakeLists.txt
+@@ -71,7 +71,7 @@
+     target_link_libraries(nvvs_plugins INTERFACE "${PLUGIN_NAME}_${CUDA_VER}")
+ endmacro()
+ 
+-set(SUPPORTED_CUDA_VERSIONS 11 12)
++set(SUPPORTED_CUDA_VERSIONS 12)
+ 
+ add_subdirectory(common)
+ add_subdirectory(contextcreate)

From e7c103bb1faa921907c240343b0eb2e27b8e9ef9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 21:09:47 +0000
Subject: [PATCH 2580/3724] python3Packages.templateflow: 25.0.1 -> 25.0.3

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

diff --git a/pkgs/development/python-modules/templateflow/default.nix b/pkgs/development/python-modules/templateflow/default.nix
index e5298e321364..2680aa479548 100644
--- a/pkgs/development/python-modules/templateflow/default.nix
+++ b/pkgs/development/python-modules/templateflow/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "templateflow";
-  version = "25.0.1";
+  version = "25.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "templateflow";
     repo = "python-client";
     tag = version;
-    hash = "sha256-d4la1xjW74oCxUsEzc3LG0xiyLBbTYbomsUWMD0Wyp8=";
+    hash = "sha256-5LGAuDaJzc2asM5EPOVuOxZwpV0LQNBhMhYKHJlXHmE=";
   };
 
   build-system = [

From 0951589765779edcc80bb2a664889f6a537d27c3 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 22 Aug 2025 00:05:20 +0300
Subject: [PATCH 2581/3724] kdePackages.kwayland-integration: fix build, use in
 Plasma 6

This is still the Qt5 version, but we deleted the old Qt5 version
along with the rest of Plasma 5 so we need this now.
---
 .../services/desktop-managers/plasma6.nix     |  2 +-
 .../plasma/kwayland-integration/default.nix   | 43 +++++++++++++++++--
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index 12bdb2a6db69..529734bd503f 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -183,7 +183,7 @@ in
       ++ lib.optionals config.services.desktopManager.plasma6.enableQt5Integration [
         breeze.qt5
         plasma-integration.qt5
-        pkgs.plasma5Packages.kwayland-integration
+        kwayland-integration
         (
           # Only symlink the KIO plugins, so we don't accidentally pull any services
           # like KCMs or kcookiejar
diff --git a/pkgs/kde/plasma/kwayland-integration/default.nix b/pkgs/kde/plasma/kwayland-integration/default.nix
index 8de6d3fae8be..1f4790f09a29 100644
--- a/pkgs/kde/plasma/kwayland-integration/default.nix
+++ b/pkgs/kde/plasma/kwayland-integration/default.nix
@@ -1,6 +1,41 @@
-{ mkKdeDerivation }:
-mkKdeDerivation {
+{
+  stdenv,
+  sources,
+
+  cmake,
+  pkg-config,
+  libsForQt5,
+  wayland-scanner,
+
+  plasma-wayland-protocols,
+  wayland,
+  wayland-protocols,
+}:
+# not mkKdeDerivation because this is Qt5 land
+stdenv.mkDerivation rec {
   pname = "kwayland-integration";
-  # FIXME(qt5)
-  meta.broken = true;
+  inherit (sources.${pname}) version;
+
+  src = sources.${pname};
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    libsForQt5.extra-cmake-modules
+  ];
+
+  buildInputs = [
+    libsForQt5.qtbase
+    libsForQt5.qtwayland
+
+    libsForQt5.kwayland
+    libsForQt5.kwindowsystem
+
+    plasma-wayland-protocols
+    wayland
+    wayland-protocols
+    wayland-scanner
+  ];
+
+  dontWrapQtApps = true;
 }

From 834be953f24d673dc8730631c0f63edd94ad6d34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 21:20:51 +0000
Subject: [PATCH 2582/3724] libretro.puae: 0-unstable-2025-07-20 ->
 0-unstable-2025-08-19

---
 pkgs/applications/emulators/libretro/cores/puae.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix
index e8981db6296f..505289eec8a1 100644
--- a/pkgs/applications/emulators/libretro/cores/puae.nix
+++ b/pkgs/applications/emulators/libretro/cores/puae.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "puae";
-  version = "0-unstable-2025-07-20";
+  version = "0-unstable-2025-08-19";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-uae";
-    rev = "3fc66ee4b562910a17e2e2f3bad74572a8bcc134";
-    hash = "sha256-rCdrM4511Q0OFwCsHZpYtg/4J1A4hwDc5WjwY0HDj8k=";
+    rev = "9e2aa770a9b6b0a4e1f4fc05eb0db6c8e7aba8ee";
+    hash = "sha256-YTS0OgYJCGawpsDHvU79dDA+iePna5Fcab2Le3vdVSk=";
   };
 
   makefile = "Makefile";

From 3ab6f5c2b79098b7ce4a1e5eea6c6c781e1e6f12 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 21 Aug 2025 15:08:14 -0500
Subject: [PATCH 2583/3724] vimPlugins: update on 2025-08-21

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../editors/vim/plugins/generated.nix         | 738 +++++++++---------
 1 file changed, 369 insertions(+), 369 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index f332559c4459..78c064422cec 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -74,12 +74,12 @@ final: prev: {
 
   CopilotChat-nvim = buildVimPlugin {
     pname = "CopilotChat.nvim";
-    version = "2025-08-14";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "CopilotC-Nvim";
       repo = "CopilotChat.nvim";
-      rev = "5f3c57083515ea511deda291ae72434db568ee6f";
-      sha256 = "0nqry8fg21sygrs8l6akq9nzgkysq1axr9s6b6bp68jx6vnbdi0c";
+      rev = "f7bb32dbbe2ff5e26f5033e2142b5920cf427236";
+      sha256 = "0cdilfh4964vqwb7m24hzgwy7jp6fxriskd7k3a7ajh8yc0kmr8i";
     };
     meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
     meta.hydraPlatforms = [ ];
@@ -399,12 +399,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "2025-08-14";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "ae4039eceaeda147a91b6b26e4fb4a2ca16bb503";
-      sha256 = "0z9ykmrndpcxr8j4c7wbyna20x4wzdrvamfn5kida8gli8jhf395";
+      rev = "21a54161a87ab38b85d8b1eb52cc86c973a5fafe";
+      sha256 = "1l26mm5dki4qvmz2jfai2pfbwknbp018yh5vi2nh0za9hc7nk655";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.hydraPlatforms = [ ];
@@ -634,12 +634,12 @@ final: prev: {
 
   advanced-git-search-nvim = buildVimPlugin {
     pname = "advanced-git-search.nvim";
-    version = "2025-07-24";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "aaronhallaert";
       repo = "advanced-git-search.nvim";
-      rev = "a9979109d9e8f28c72fb4bf1e14c80c3c94490ab";
-      sha256 = "1pb00qblbbnylvqnajnngfi2xx9klrjwb23dv0si2j5pwafqhaa4";
+      rev = "ec0dabe38857bc7ba2097677e80155a572e0dfbe";
+      sha256 = "04rsv04xndk60sibwq4xx9mzkbv4444nhpk15mxnk15hp2784149";
     };
     meta.homepage = "https://github.com/aaronhallaert/advanced-git-search.nvim/";
     meta.hydraPlatforms = [ ];
@@ -660,12 +660,12 @@ final: prev: {
 
   aerial-nvim = buildVimPlugin {
     pname = "aerial.nvim";
-    version = "2025-06-04";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "aerial.nvim";
-      rev = "5c0df1679bf7c814c924dc6646cc5291daca8363";
-      sha256 = "1dhsg3bli32d0p36c9f1i95p7h9hn5czr1zwlcd3v926qzj9wp1j";
+      rev = "a5f3055f9d628ca0f4c74a0df07b029d2a74760c";
+      sha256 = "1h1bj6wj5zdpgqw2dg4q95fnac9m3is15kdvhpzxw4vb06iz56i2";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@@ -752,12 +752,12 @@ final: prev: {
 
   ale = buildVimPlugin {
     pname = "ale";
-    version = "2025-08-14";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "9acafa8018993e8110a200fb3adbf6d2cb22d1fe";
-      sha256 = "0x9nhsa9407vfffqzv3jhfmsd5s6qj4bpsc90lld98pii1flpjxv";
+      rev = "528e25954ba05bf43692bd243bf30ef9548a630a";
+      sha256 = "124sysw9r74z905wvj9znaxv70id5zdwskin941wk1xcyv984xj3";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
     meta.hydraPlatforms = [ ];
@@ -1194,12 +1194,12 @@ final: prev: {
 
   auto-session = buildVimPlugin {
     pname = "auto-session";
-    version = "2025-08-14";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "rmagatti";
       repo = "auto-session";
-      rev = "6403b7415da71ad05f49827cb569eddaef0b0be0";
-      sha256 = "18gji86kxg19i45ysif27sf6xk2g6s0x9xjy9ahqxlqcs39pzfax";
+      rev = "8cda7244a02f1304664889a78194604587ffc772";
+      sha256 = "0n7cgkca18ml1ms663zyjrpba2rfxqycq22m8vlr88piqkflwwlx";
     };
     meta.homepage = "https://github.com/rmagatti/auto-session/";
     meta.hydraPlatforms = [ ];
@@ -1390,12 +1390,12 @@ final: prev: {
 
   base16-nvim = buildVimPlugin {
     pname = "base16-nvim";
-    version = "2025-08-09";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "base16-nvim";
-      rev = "45416f9c7a1ce25c9efb789fbbf96bce9e826d60";
-      sha256 = "1hia5xrwagvi2f14nhbj3idhvpd339kksizxzymgkq15b5nj24cc";
+      rev = "0f2863e28d66a65129b6a277e0652736f9ad4fad";
+      sha256 = "199ass8sm0v9xcp03qwzzy4x46gfaha3r6yagkf0dcswc09vv83k";
     };
     meta.homepage = "https://github.com/RRethy/base16-nvim/";
     meta.hydraPlatforms = [ ];
@@ -1676,12 +1676,12 @@ final: prev: {
 
   blink-ripgrep-nvim = buildVimPlugin {
     pname = "blink-ripgrep.nvim";
-    version = "2025-08-12";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "blink-ripgrep.nvim";
-      rev = "132d0843ded621b9d9a7475187fd676328389630";
-      sha256 = "0j2hcq657gzcwdx9nm8dk6dnq2ahsvg7xq8aiqlqj0qldl3snzqg";
+      rev = "da53e523ca28bdc4aedda5cfcac7aec6120779da";
+      sha256 = "0113cfi5iy9xwxzcl78djia94ymp6zzw3bfjaj6hwri30qq3xl9k";
     };
     meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1793,12 +1793,12 @@ final: prev: {
 
   bufexplorer = buildVimPlugin {
     pname = "bufexplorer";
-    version = "2025-07-01";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "jlanzarotta";
       repo = "bufexplorer";
-      rev = "5ba88af1cad462317ab33192401ce4dc9d547854";
-      sha256 = "1dl4ln4vlbdlg1li4il8mphhx101azs0qs15ghiyp1k88r7skac0";
+      rev = "b96d275811b92e86ee52be3112e1de735ba08fb9";
+      sha256 = "1hcvm4nnaxb9hr8il47v9jpfbqr14msq0r8wjpk6anl6zmb6qibc";
     };
     meta.homepage = "https://github.com/jlanzarotta/bufexplorer/";
     meta.hydraPlatforms = [ ];
@@ -1884,12 +1884,12 @@ final: prev: {
 
   camelcasemotion = buildVimPlugin {
     pname = "camelcasemotion";
-    version = "2019-12-02";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "bkad";
       repo = "camelcasemotion";
-      rev = "de439d7c06cffd0839a29045a103fe4b44b15cdc";
-      sha256 = "0yfsb0d9ly8abmc95nqcmr8r8ylif80zdjppib7g1qj1wapdhc69";
+      rev = "e69b0024f8f63db10c5d0df26d4920760755d454";
+      sha256 = "1x69pgyd85razrkjbwc10ac0lnsf34cwyzdsjcydb970whhiir3x";
     };
     meta.homepage = "https://github.com/bkad/camelcasemotion/";
     meta.hydraPlatforms = [ ];
@@ -1897,12 +1897,12 @@ final: prev: {
 
   catppuccin-nvim = buildVimPlugin {
     pname = "catppuccin-nvim";
-    version = "2025-08-13";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "nvim";
-      rev = "3aaf3ab60221bca8edb1354e41bd514a22c89de2";
-      sha256 = "0fqrp754rdwzqiccmzav3l4za0lqnlmcv42nfzn4d1y31z4m4d4x";
+      rev = "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86";
+      sha256 = "00disdqjhnvxsxyprbsx52df71a12r3pyi9f0cz1wfp2z8q4pid3";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
     meta.hydraPlatforms = [ ];
@@ -2846,12 +2846,12 @@ final: prev: {
 
   cmp_yanky = buildVimPlugin {
     pname = "cmp_yanky";
-    version = "2025-08-12";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "cmp_yanky";
-      rev = "8957296634ceb9c18a7a9f53ce337f6753974aa6";
-      sha256 = "1igd7vhp967kmywyy0jrr5wwbqcss42d7ic861877k3v57fmdbwx";
+      rev = "518f948ede8110060c4e346a41a0e38f0a28a4d9";
+      sha256 = "1yifdg25n4fxqgg6g7w4vdqgrzk9609sqxd1mrl37x2zq643q8gq";
     };
     meta.homepage = "https://github.com/chrisgrieser/cmp_yanky/";
     meta.hydraPlatforms = [ ];
@@ -2937,12 +2937,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "2025-08-08";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "5e34cdeff4d6b77eccb07b2f63f30e811ea125dc";
-      sha256 = "067r7q4hpmvh2fw0hi02gax85afazl5g8sxx8444gxsw40jb1xwq";
+      rev = "0e8e1cbb731f420b5d3a41bae6b712b4911273a0";
+      sha256 = "16ni09frbrh54li62xchfgiqrbq64aphq6afb902bb69bnf9827d";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2989,12 +2989,12 @@ final: prev: {
 
   codecompanion-history-nvim = buildVimPlugin {
     pname = "codecompanion-history.nvim";
-    version = "2025-08-05";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "ravitemer";
       repo = "codecompanion-history.nvim";
-      rev = "336987afe9aca1fca30c20ca27dc91e1f7690c77";
-      sha256 = "0x9afqfviz4z0lsxnm4hf15pz8wgp1pk3yms5n4vax3g6aq0bh1h";
+      rev = "44a4a3fbe62427fbe0b5b513b5ac6c976986fdfc";
+      sha256 = "0jsc6x2x1zj3ksbpfvkvkvnlza38qdnyb4a3xfnx3r21pybb7ssh";
     };
     meta.homepage = "https://github.com/ravitemer/codecompanion-history.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3002,12 +3002,12 @@ final: prev: {
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "2025-08-14";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      rev = "c5aa3c6231f861f2ab20c886e0776c5b2f43bbe8";
-      sha256 = "01ynjyn6m5w4daxlkmrklhmfkwkdkhz3mgiqvbqhm5jal70n97x1";
+      rev = "79cc678ca5f79a5ed04affa73116cb9bbe41bb12";
+      sha256 = "1lm10bijwcr5dl7br6djlij3ixn12bhplc24j7qfiypphxw78yxq";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3067,12 +3067,12 @@ final: prev: {
 
   colorful-winsep-nvim = buildVimPlugin {
     pname = "colorful-winsep.nvim";
-    version = "2025-08-12";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "nvim-zh";
       repo = "colorful-winsep.nvim";
-      rev = "794a64425c0b622d2274ea5975b689bad6f7682b";
-      sha256 = "1ikjjzh7fhvgflg0fqappishf6adf5y105lqnz9qdhg4ya0rkw8f";
+      rev = "b8e72a231daf2a199bbc319364adcfc4d8b18e9f";
+      sha256 = "1fsbwgyrivxach2hh5msr23m16r14db4g53azha1flrn27vsmkyr";
     };
     meta.homepage = "https://github.com/nvim-zh/colorful-winsep.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3301,12 +3301,12 @@ final: prev: {
 
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "2025-07-02";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "973f3cb73887d510321653044791d7937c7ec0fa";
-      sha256 = "1yx6chdrkvwalgp8641ljdxhlcfww6l5c3z374fadb3lm3mvcvkf";
+      rev = "9ddab4e14c44196d393a72b958b4da6dab99ecef";
+      sha256 = "1m0s9ff49bikqspg0w3nhwbb7i7q65bm9spjvrxs39v06hhk5m6p";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/conform.nvim/";
@@ -3315,12 +3315,12 @@ final: prev: {
 
   conjure = buildVimPlugin {
     pname = "conjure";
-    version = "2025-08-08";
+    version = "2025-08-17";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "conjure";
-      rev = "0649a6866017e61457d8f5093827fd48db8a08f1";
-      sha256 = "0564rv3vympy377yvqc1865bn02q9dcz3rfghl6kq9mzzi4q3if4";
+      rev = "91980ec7de78dcbca23b2044da1686778311cc6e";
+      sha256 = "018yhrcwinl09fzj5nw849qzrh9a9b9zxfx1bdjbm88l38w2f4r6";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
     meta.hydraPlatforms = [ ];
@@ -3380,12 +3380,12 @@ final: prev: {
 
   copilot-lsp = buildVimPlugin {
     pname = "copilot-lsp";
-    version = "2025-07-31";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "copilotlsp-nvim";
       repo = "copilot-lsp";
-      rev = "173c015ea61cb493997e3b1fa80bf57f6db58c26";
-      sha256 = "0jymlyr8yxgr8icqnh7b5kmsjl7gslx57fizbz7skb5y26m761h2";
+      rev = "79899e9225505c569db297dec5d2f6c66ff2e7be";
+      sha256 = "10427qyh9spfsc5q7hhqwrl6ggqdc02m0a7skj9vjxm09vh63ykb";
     };
     meta.homepage = "https://github.com/copilotlsp-nvim/copilot-lsp/";
     meta.hydraPlatforms = [ ];
@@ -3393,12 +3393,12 @@ final: prev: {
 
   copilot-lua = buildVimPlugin {
     pname = "copilot.lua";
-    version = "2025-08-15";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "5b49bff9fa85a60a7b181b870eae212ec910f1aa";
-      sha256 = "1xjhpfd11bvysmsv9jxq9yqc6bddwy34a0ypifsla2zm8zk8bxgm";
+      rev = "f7bacd90f571c2aef2be4d136a0d811b2d7930cf";
+      sha256 = "18n5ikwwrrwrwv8vn6513c1h12lhd2cpiwlhax00s44zdbh7y3gi";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
     meta.hydraPlatforms = [ ];
@@ -3718,12 +3718,12 @@ final: prev: {
 
   darcubox-nvim = buildVimPlugin {
     pname = "darcubox-nvim";
-    version = "2025-08-10";
+    version = "2025-08-15";
     src = fetchFromGitHub {
       owner = "Koalhack";
       repo = "darcubox-nvim";
-      rev = "bbf6d13f3d36ae2008dbba63e2a423ee163b1e12";
-      sha256 = "0sbycaivbmgzdj2rp0snd4lrmmvc87f3kpm35wg4z25gfb1176l1";
+      rev = "5e102a1f2a997842e1a6361499991160cb2c3606";
+      sha256 = "0qgw5rlkp2pa8nw4hqrb1imx9195s8h7vlzm8xixcza9rky3pwzm";
     };
     meta.homepage = "https://github.com/Koalhack/darcubox-nvim/";
     meta.hydraPlatforms = [ ];
@@ -3731,12 +3731,12 @@ final: prev: {
 
   darkearth-nvim = buildVimPlugin {
     pname = "darkearth-nvim";
-    version = "2025-08-15";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "ptdewey";
       repo = "darkearth-nvim";
-      rev = "e09fde1b82d741afb46c24427350eeecab44463b";
-      sha256 = "0mm5v9ap47amfc3dw665kzhpn1ki3lzwianq3v28fr9jwz73iw8x";
+      rev = "1a33a92f083f1ec069ce5653121cb181c0c4cdf3";
+      sha256 = "0cck11ja7q45rwzqhq0mhzvk2z1ja3d3424ck5nb3f7rwsfpa293";
     };
     meta.homepage = "https://github.com/ptdewey/darkearth-nvim/";
     meta.hydraPlatforms = [ ];
@@ -3991,12 +3991,12 @@ final: prev: {
 
   demicolon-nvim = buildVimPlugin {
     pname = "demicolon.nvim";
-    version = "2025-08-11";
+    version = "2025-08-15";
     src = fetchFromGitHub {
       owner = "mawkler";
       repo = "demicolon.nvim";
-      rev = "42eaf79845b777d3608b134f283d97ce44c87e82";
-      sha256 = "19jmf8pkcyc6yfd45xb8hk6rnksanqmbqf3alwr5axgrr9xm2rsh";
+      rev = "7cd3587c4f4d22cb645c3a2b5ca93ec08012d23f";
+      sha256 = "1b5a4lgcwfyv4hdg44r38fiscvc6xgsy6qiq9zk9jb0qd4x28ym4";
     };
     meta.homepage = "https://github.com/mawkler/demicolon.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4383,12 +4383,12 @@ final: prev: {
 
   diagram-nvim = buildVimPlugin {
     pname = "diagram.nvim";
-    version = "2025-03-27";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "3rd";
       repo = "diagram.nvim";
-      rev = "84fe677aa940605ef248f36c0ea23561690c95eb";
-      sha256 = "1izimzfvydhhwh71yj9sj309h8nvkxvh8pawmnjdw1fw6avjlfl3";
+      rev = "1a30e794beaa4dd19f0dcea8721cb74b0c8681d0";
+      sha256 = "0ly6ssvws69354pawlz7iibklim9g8xi7r22pxbpw5h1pb8pqiq3";
     };
     meta.homepage = "https://github.com/3rd/diagram.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4539,12 +4539,12 @@ final: prev: {
 
   dropbar-nvim = buildVimPlugin {
     pname = "dropbar.nvim";
-    version = "2025-08-02";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "Bekaboo";
       repo = "dropbar.nvim";
-      rev = "418897fe7828b2749ca78056ec8d8ad43136b695";
-      sha256 = "1cjlclvln0rism3xgz0pk52mhry6aisg3x9vk5idk5h0c9afqm0z";
+      rev = "596f95e98a21e8fccf3db91fec481129eb82ff61";
+      sha256 = "11xb6mj24lsf18c2fzr18as0z71fjzw3rwm1sqjf4d2alyl3llfz";
     };
     meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4565,12 +4565,12 @@ final: prev: {
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "2025-08-12";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "e11452d0937b1464894cfb0fb51516c67925512a";
-      sha256 = "0cdq7hzcqgpf3bjfinsv5i5an4yq8n82vc75wi14krbvnvskc9rb";
+      rev = "d23d2fdcffea11d18ef160672e81c9d63a9a78fa";
+      sha256 = "1m1078avhff392s6d3v75v7924iccn8zv2gd72kjbzsdip3c62sv";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4604,12 +4604,12 @@ final: prev: {
 
   edge = buildVimPlugin {
     pname = "edge";
-    version = "2025-08-03";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "edge";
-      rev = "1d203dc579c09db5bf3188e1ce84e0348598ceff";
-      sha256 = "15aaz9160rk7xnjgsr12jd6j8gv7r81cl4gy1n4psg361v08schk";
+      rev = "2a2de5438b067a692cae1074ae77b904e8c08e16";
+      sha256 = "1xdvfxxa79hpk0v0qfw38hn7gbd1b2mmm6hraq242g3lfgc2lxr6";
     };
     meta.homepage = "https://github.com/sainnhe/edge/";
     meta.hydraPlatforms = [ ];
@@ -4801,12 +4801,12 @@ final: prev: {
 
   everforest = buildVimPlugin {
     pname = "everforest";
-    version = "2025-08-03";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "everforest";
-      rev = "4132e797f6ce555de53825b6ef3df0b618456703";
-      sha256 = "0fz56gvf8dsw23vlnrbiniwf7w2rnp0hkywy7yvg66bsd2p8cb3f";
+      rev = "28d59e29d972e21f2e802ce916f28dcab30697ae";
+      sha256 = "12f14zyqxgca7rqm1b2i1129g6qq1k2rbjymapw2vhmhyb5gk9mj";
     };
     meta.homepage = "https://github.com/sainnhe/everforest/";
     meta.hydraPlatforms = [ ];
@@ -4814,12 +4814,12 @@ final: prev: {
 
   executor-nvim = buildVimPlugin {
     pname = "executor.nvim";
-    version = "2025-08-13";
+    version = "2025-08-15";
     src = fetchFromGitHub {
       owner = "google";
       repo = "executor.nvim";
-      rev = "30cbcb597c89af6a5ce3903c29311033c17a3599";
-      sha256 = "1kmlpqmc45gbq32av55l0d79vcchyr5vkk46nv39flg32dajqsyh";
+      rev = "56dfbe6f7fbf4a6ba7e5934df2d95810e0235f64";
+      sha256 = "1y82fz4wa5c88qswc5aq74hfpixmrhvh6i3pgmi9106b7p6hxmqm";
     };
     meta.homepage = "https://github.com/google/executor.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5075,12 +5075,12 @@ final: prev: {
 
   flit-nvim = buildVimPlugin {
     pname = "flit.nvim";
-    version = "2025-07-17";
+    version = "2025-08-15";
     src = fetchFromGitHub {
       owner = "ggandor";
       repo = "flit.nvim";
-      rev = "7fbf60207cc170be75db3f42e6f6db0d4d887e5d";
-      sha256 = "1xma8wwms81dlh55c65mfbi4yzij7k58lh1vs23hzz5k7hyjd3nc";
+      rev = "513e38abe61237c53a9e983e45595b1d2e7d5391";
+      sha256 = "11i0hzayx0x8hdh1qjwk9ajdkp45nk0zlfwi5rlwh0aqvgxqc4ji";
     };
     meta.homepage = "https://github.com/ggandor/flit.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5700,12 +5700,12 @@ final: prev: {
 
   goto-preview = buildVimPlugin {
     pname = "goto-preview";
-    version = "2025-04-02";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "rmagatti";
       repo = "goto-preview";
-      rev = "d1faf6ea992b5bcaaaf2c682e1aba3131a01143e";
-      sha256 = "1rq2mfvcn0np0n0hmdf6mxmpsj94hvh3i3hnkmk4f20v36ak9xjq";
+      rev = "b5eb40a425caf6f8cff08aa40f2cfc0f0b0bda2c";
+      sha256 = "0nf5xxay1sig4mzwvnawc2z1xj710xhypxsnhamn7kllccxi6mji";
     };
     meta.homepage = "https://github.com/rmagatti/goto-preview/";
     meta.hydraPlatforms = [ ];
@@ -5830,12 +5830,12 @@ final: prev: {
 
   gruvbox-material = buildVimPlugin {
     pname = "gruvbox-material";
-    version = "2025-08-03";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "gruvbox-material";
-      rev = "d080710b58e605b45db0b0e4288205ca6f7587f0";
-      sha256 = "1l59p0w6w5rm6d55a8ysnh65b38kqd3lnk6gb2iw57qm736xgl9n";
+      rev = "6a100833060d26cd3ab85c34c5f7154a1000c12f";
+      sha256 = "0nljh0z3jv91jq1s77g49pd8lzzll2ryv7qbnsri0nj8ah14vgw2";
     };
     meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
     meta.hydraPlatforms = [ ];
@@ -5856,12 +5856,12 @@ final: prev: {
 
   gruvbox-nvim = buildVimPlugin {
     pname = "gruvbox.nvim";
-    version = "2025-06-25";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "ellisonleao";
       repo = "gruvbox.nvim";
-      rev = "58a2cda2e953a99e2f87c12b7fb4602da4e0709c";
-      sha256 = "1hdhlpvxql42h3jdr85rbkaxb7a84q1l5km3w1qs4vxd60jixsmn";
+      rev = "12c2624287dc827edb5d72b2bc4c9619e692a554";
+      sha256 = "0kwzwy85v2lq7ifbjjasng6ykldcna3aycfmma6fhfvv9akll9y2";
     };
     meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5882,12 +5882,12 @@ final: prev: {
 
   guard-nvim = buildVimPlugin {
     pname = "guard.nvim";
-    version = "2025-06-11";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "guard.nvim";
-      rev = "9a9f00a6f70e5da2ea8379f203fcd45d8a7250cc";
-      sha256 = "15v0snqjsrx711zy4cbw139nk2b4xcs8p8c6156bx75nqqj09v3f";
+      rev = "b16aa1d92c8adac7d63c442b31498761ec09bdd9";
+      sha256 = "0jfpyf93fjc76bjx6dkp1mq628c5p3azn9i3jk9i67z8g79ykmf1";
     };
     meta.homepage = "https://github.com/nvimdev/guard.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6274,12 +6274,12 @@ final: prev: {
 
   hover-nvim = buildVimPlugin {
     pname = "hover.nvim";
-    version = "2025-08-11";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "hover.nvim";
-      rev = "ddb4ac300170bc13acd85f88e886f0342a63cf44";
-      sha256 = "1ffzxm0w2psmnnx8pjw43rvlygg85qyv5dd4kw98miwh6d64my5a";
+      rev = "24a43e0eda924f1f32361c76ee9a1f0e8cc25650";
+      sha256 = "1nf69lsbqlwllkvljafqf5yjs6j3l2yv3viyqja9qk7qzwca0qrx";
     };
     meta.homepage = "https://github.com/lewis6991/hover.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6743,12 +6743,12 @@ final: prev: {
 
   jinja-vim = buildVimPlugin {
     pname = "jinja.vim";
-    version = "2025-07-21";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "HiPhish";
       repo = "jinja.vim";
-      rev = "dacfd49e9f410647b62b3ae7905a7628cfd61d5e";
-      sha256 = "00dr4ldnhkq0j1v8py5w1579j52nbbzpz8wc0i96242y3vxxahg4";
+      rev = "05373374a288b20845937cbc3a7abda23a2e65d2";
+      sha256 = "14xvzpfw6670yavdb81qi4wk11s5k3vs44kaf2m6bvr26vfnidmr";
     };
     meta.homepage = "https://github.com/HiPhish/jinja.vim/";
     meta.hydraPlatforms = [ ];
@@ -6834,12 +6834,12 @@ final: prev: {
 
   kanagawa-paper-nvim = buildVimPlugin {
     pname = "kanagawa-paper.nvim";
-    version = "2025-06-23";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "thesimonho";
       repo = "kanagawa-paper.nvim";
-      rev = "b0df20cca3b7087c06f241983b488190cc8e23af";
-      sha256 = "0274dr528cdvhxjnssvbgrxig6v04gbgdijb5wcxmybpkbada5qz";
+      rev = "6fca75ee0de76f5c9964aab89de6ac7bd4df5e2f";
+      sha256 = "0vkm0j4yml86cqrbf4f2w1ynz2a3chszjxjpgla6ln725cv1v1cz";
     };
     meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6847,12 +6847,12 @@ final: prev: {
 
   kanso-nvim = buildVimPlugin {
     pname = "kanso.nvim";
-    version = "2025-08-09";
+    version = "2025-08-16";
     src = fetchFromGitHub {
       owner = "webhooked";
       repo = "kanso.nvim";
-      rev = "f107190b81e84c132d5755d0153944f0f1e1e380";
-      sha256 = "18x4nqzj4a9lvxm4fbrb9vg8r3zqg49c52w37x6x23k1zkwvyxyh";
+      rev = "151dbc23fe890d09c26df11b1208dd8129dca012";
+      sha256 = "1n8qak22wwakf82i9kiq8mq4gy5x6jxs39grcf5gw4bxd1sj3wl8";
     };
     meta.homepage = "https://github.com/webhooked/kanso.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6951,12 +6951,12 @@ final: prev: {
 
   kulala-nvim = buildVimPlugin {
     pname = "kulala.nvim";
-    version = "2025-08-03";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "mistweaverco";
       repo = "kulala.nvim";
-      rev = "65d102f65cfee9f338ba8a0bd43187a7cac898e9";
-      sha256 = "16g66lzb64ddpwz1ymhk6rml6wjx7snh67qgnqm1708fxkjcrd9r";
+      rev = "1695bdfc87e2af737bec034cd4cd2d11098a22fd";
+      sha256 = "0ghvd9kgg9ir29sxa3pjcl7a0b4yg5njxkp9y6zmazbdczpsq2rf";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
@@ -7108,12 +7108,12 @@ final: prev: {
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2025-08-14";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "ccf0f5c2bdd084626ea9319db5e78b9f6ed82533";
-      sha256 = "02qx9f10y91d58yxjfkwa6mx6kln724yv48dhv6ymncscbp0g43z";
+      rev = "62623347cdd5a27a73436c24eb9b4745ea207630";
+      sha256 = "0m17w3v91chsasxff8h6dp8w3g1ji58caxc89r01g3dhsj2s5bx4";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7147,12 +7147,12 @@ final: prev: {
 
   leap-nvim = buildVimPlugin {
     pname = "leap.nvim";
-    version = "2025-08-03";
+    version = "2025-08-15";
     src = fetchFromGitHub {
       owner = "ggandor";
       repo = "leap.nvim";
-      rev = "02bf52e49c72cc5dabb53ec9494d10d304f0b2c9";
-      sha256 = "0bw0pbqjxwv6fhlwxhq7bl2390fkm7w2zjszf5vxcn1a8ymlrblm";
+      rev = "8b03b5d62d11cd9da5ea8be62ab8e9ff3fabab8f";
+      sha256 = "0nnbdzxgk4fq955wrzlgrg6slqrpmsm5mq5h30i0d2xp6ipkvh2m";
     };
     meta.homepage = "https://github.com/ggandor/leap.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7524,12 +7524,12 @@ final: prev: {
 
   llama-vim = buildVimPlugin {
     pname = "llama.vim";
-    version = "2025-07-03";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "ggml-org";
       repo = "llama.vim";
-      rev = "f886bada32c730e31fb90c149982535f709a162a";
-      sha256 = "0v6b2d2al0sizx395pvjczxfcv8nn55206zhhnaicjgry8s6v5q1";
+      rev = "1b4a03fbf0d1c7aeaa10c390065751a9503de436";
+      sha256 = "0nzsp6mjxsazmgzdbx1kgbavhk55pypvfxl2pm6y69qkhf3swcwz";
     };
     meta.homepage = "https://github.com/ggml-org/llama.vim/";
     meta.hydraPlatforms = [ ];
@@ -7901,12 +7901,12 @@ final: prev: {
 
   markview-nvim = buildVimPlugin {
     pname = "markview.nvim";
-    version = "2025-08-04";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "OXY2DEV";
       repo = "markview.nvim";
-      rev = "2d68c060ad4387d9895577af43c3ace41a80de5d";
-      sha256 = "16h0841vmd198cxa5412s0d5ji0xwh9v4q24cd96i4gfqfg19hjv";
+      rev = "2fddeef5755f434a24bc452b0666f1ffd9882dae";
+      sha256 = "1i207rdln8r8pd3kwminjh3brz0qpi67z9a36pa3mh3nygdnp7d9";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/OXY2DEV/markview.nvim/";
@@ -7915,12 +7915,12 @@ final: prev: {
 
   mason-lspconfig-nvim = buildVimPlugin {
     pname = "mason-lspconfig.nvim";
-    version = "2025-08-06";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "mason-org";
       repo = "mason-lspconfig.nvim";
-      rev = "7f0bf635082bb9b7d2b37766054526a6ccafdb85";
-      sha256 = "0gmxnwjf62i5ly533c7236v8q8va8slai0slam5nn603wws2w9h3";
+      rev = "1ec4da522fa49dcecee8d190efda273464dd2192";
+      sha256 = "11sij20d2ancsbf7iygkfx14sw7i717gpy126bplgf107482xdbq";
     };
     meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8214,12 +8214,12 @@ final: prev: {
 
   mini-clue = buildVimPlugin {
     pname = "mini.clue";
-    version = "2025-08-14";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.clue";
-      rev = "0b5e4b138b62ffda7d95904aa2f208d4cfb008c1";
-      sha256 = "0sn0jj1lbnlmycrf0f60ssnhmg544v51m4h49ic7hq2c1d384wvs";
+      rev = "21fc8ad164e82da22665e94948d44a4727d6980a";
+      sha256 = "1g1sqk3kdp7y74ds0fkh3c07whd58w3ccl0glay7mwfbf802ji1w";
     };
     meta.homepage = "https://github.com/echasnovski/mini.clue/";
     meta.hydraPlatforms = [ ];
@@ -8253,12 +8253,12 @@ final: prev: {
 
   mini-completion = buildVimPlugin {
     pname = "mini.completion";
-    version = "2025-08-07";
+    version = "2025-08-17";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.completion";
-      rev = "d2deece67fd71a4e50a24d6d2b6dae4e96e13334";
-      sha256 = "11mknj3qdnxb20cg9phc2rwclgqmzhqs0yshanzmkp2qsy0lf14z";
+      rev = "b635036d3fe5ea6f4450358a02e376612b628ac4";
+      sha256 = "1awppnng3lab5vx7wbdc2hxr62586ria9yw96wja5c8rd281wajd";
     };
     meta.homepage = "https://github.com/echasnovski/mini.completion/";
     meta.hydraPlatforms = [ ];
@@ -8318,12 +8318,12 @@ final: prev: {
 
   mini-extra = buildVimPlugin {
     pname = "mini.extra";
-    version = "2025-07-22";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.extra";
-      rev = "0dec9611833d058f9d2d48f6333b41631f5ef3b9";
-      sha256 = "1q1jas6kx8sxyxrvf8c5d7jlb76bxfps9zsjaqmh7y4rx4pk103k";
+      rev = "b77a21a3c8c2a8815d8e8cf9f4d5fbac4c876197";
+      sha256 = "0d4m6yhga756js73hxg3vz9kpj5myc6kxgc3i0n6ia6znfcmj5wj";
     };
     meta.homepage = "https://github.com/echasnovski/mini.extra/";
     meta.hydraPlatforms = [ ];
@@ -8383,12 +8383,12 @@ final: prev: {
 
   mini-hues = buildVimPlugin {
     pname = "mini.hues";
-    version = "2025-07-22";
+    version = "2025-08-15";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.hues";
-      rev = "9149f51a5124ca34fe50c637e2dd5ac3b4e4a55e";
-      sha256 = "1bgigv8f262kh2493sncy975vr4nl49mw171n19rmgnixmh23w0s";
+      rev = "44a1df43693f82821650ff99f9812a32c276b30c";
+      sha256 = "1nrgsxg7g7kc5ii21k2j70455hrq1ys3i16nqs98nfg3x1l3gdij";
     };
     meta.homepage = "https://github.com/echasnovski/mini.hues/";
     meta.hydraPlatforms = [ ];
@@ -8474,12 +8474,12 @@ final: prev: {
 
   mini-misc = buildVimPlugin {
     pname = "mini.misc";
-    version = "2025-07-22";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.misc";
-      rev = "186e543e5c322e1d474d541ec66197839ec51778";
-      sha256 = "0rgcmzqbpnq0b07vi5bjq70skjhm959kvw7h3wsaihb68yri56m7";
+      rev = "6b1525c853c1f6008601ce474ad4e5b787047ca4";
+      sha256 = "05vkfmxcaxmr6wwnnc7is3f2mp8synrjffcj9dzm1w8i8ps5hmxn";
     };
     meta.homepage = "https://github.com/echasnovski/mini.misc/";
     meta.hydraPlatforms = [ ];
@@ -8513,12 +8513,12 @@ final: prev: {
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2025-08-14";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "301ee9f3afa2224b833de7c182574ba6c61e8c6e";
-      sha256 = "0mc6327agyqf09qiypm1h4sr4qslv85r91lr8c5n9v7nnb1armny";
+      rev = "e38547768b2e12bdd48b16b8cfdca2e3b7543e22";
+      sha256 = "1dc4i9lhnhn2mcq77znzim8zc12bj1k4vbln236anjhr8xyycif0";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8669,12 +8669,12 @@ final: prev: {
 
   mini-visits = buildVimPlugin {
     pname = "mini.visits";
-    version = "2025-07-22";
+    version = "2025-08-16";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.visits";
-      rev = "f2997b74f9255663c4f382ae538d4899509617f7";
-      sha256 = "1mhjzjnqi7lzcyfikzncadpxd8ljl5jp5g8sap66n499f9nshhxq";
+      rev = "065a8b3e7f1b7059c4c748a54034b6a113d91fe8";
+      sha256 = "01fgxzr5p0hpdx18vv7y4zqyvqh9ad3lvjabfkd0nkc7wz216nzk";
     };
     meta.homepage = "https://github.com/echasnovski/mini.visits/";
     meta.hydraPlatforms = [ ];
@@ -8695,12 +8695,12 @@ final: prev: {
 
   minuet-ai-nvim = buildVimPlugin {
     pname = "minuet-ai.nvim";
-    version = "2025-08-11";
+    version = "2025-08-16";
     src = fetchFromGitHub {
       owner = "milanglacier";
       repo = "minuet-ai.nvim";
-      rev = "9ba12416fd241d619e059b861811fb30366671c4";
-      sha256 = "17bj5msca178v3a5rbds8wf56wlf8zjjkr6gdbx2sc9cxj5gzym3";
+      rev = "2083b86ea01cb18dc9e7cb7a68f932ea06e999e8";
+      sha256 = "01r0llibyl4smr5q2y31qlqgngvjmrhkncc1g174qbsc8jxv9n8a";
     };
     meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8786,12 +8786,12 @@ final: prev: {
 
   molten-nvim = buildVimPlugin {
     pname = "molten-nvim";
-    version = "2025-06-28";
+    version = "2025-08-17";
     src = fetchFromGitHub {
       owner = "benlubas";
       repo = "molten-nvim";
-      rev = "9af9526ee2e0436663d4e00c35eee3746c98d16e";
-      sha256 = "0rjpwlzihb58k1vs57pi7n6hnvh0mw20w18ziqf878w3r1kvzy60";
+      rev = "2f8a97d347d9dae08dea0d674c0852b05141ee09";
+      sha256 = "09h51wvaqh5ryxkns8rbrhjc1mrqqi3bc40sxvzpg6slafxdi0hp";
     };
     meta.homepage = "https://github.com/benlubas/molten-nvim/";
     meta.hydraPlatforms = [ ];
@@ -9163,12 +9163,12 @@ final: prev: {
 
   neo-tree-nvim = buildVimPlugin {
     pname = "neo-tree.nvim";
-    version = "2025-07-30";
+    version = "2025-08-17";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "46fa0c22ca39e05fe15744102d21feb07fe9a94a";
-      sha256 = "1wf7lx4qcgyqqk5kq1dglivib2x5id1i5rf619mncivzffhwdnj5";
+      rev = "bbeda076c8a2e7d16614287cd70239f577e5bf55";
+      sha256 = "1705g7qkg3nm8gr8k7x44mjalm5dj5h2ww5qfspsapr2fj25fp0p";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9189,12 +9189,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "2025-08-15";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "8601c3f54532e65581042cac43dd9bff224b6a2d";
-      sha256 = "1pq5kiapmriglqv3b0w4n5y1pvb8y2ihjyk4ffclmva8k9n2q8qf";
+      rev = "48a2208cf74af1b4a2ed14b75435690e2925d262";
+      sha256 = "1k6i88gh32b421yxfwj928sin9l94xq1d7hlpprn7r850mgj5hd2";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9267,12 +9267,12 @@ final: prev: {
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "2025-08-11";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "49d0527143fe748196ae9a20b8c9ff54cbf45fab";
-      sha256 = "1c6kakgdkq8ij7h0z4qbab4j3pzw2lbw5dz7bdwy0yh8c189ggrx";
+      rev = "aec66c46c132a019296e9e73a2ef6d753bf15563";
+      sha256 = "0vsk7kzl0s0915h69anvpa22ahjd32z830pvkass5wfkgj90vb1m";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.hydraPlatforms = [ ];
@@ -9542,12 +9542,12 @@ final: prev: {
 
   neotest-golang = buildVimPlugin {
     pname = "neotest-golang";
-    version = "2025-08-08";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "fredrikaverpil";
       repo = "neotest-golang";
-      rev = "3f0617ee9c3e6fd3d0d88645cd2e1751dad60c1f";
-      sha256 = "0hqxchs1168gy43ihzps8iz9q9hhga556fi69k2zhwsbb30w17c5";
+      rev = "e892eeb585f8bb041eb50e9fc58d6d48f62c3717";
+      sha256 = "0d7qkh3531ifwwywn746vc338dzcw3x6yj3b88shc41n283s4vr3";
     };
     meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/";
     meta.hydraPlatforms = [ ];
@@ -9582,12 +9582,12 @@ final: prev: {
 
   neotest-haskell = buildVimPlugin {
     pname = "neotest-haskell";
-    version = "2025-08-10";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "6b790de64a0789a12c1f16736fd492e382fda265";
-      sha256 = "020s30b7l6274mv26kl1k9q0z8wjm83d9drrcnwn90hv4jfg6ymc";
+      rev = "c9166b6793e95a9ec3046c39fb2f017c1865dd26";
+      sha256 = "19k71s819bka3j7ni9yiz8mwn1w4m1jnd4mvn7vg0zfhvz4xl116";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
     meta.hydraPlatforms = [ ];
@@ -9595,12 +9595,12 @@ final: prev: {
 
   neotest-java = buildVimPlugin {
     pname = "neotest-java";
-    version = "2025-07-26";
+    version = "2025-08-15";
     src = fetchFromGitHub {
       owner = "rcasia";
       repo = "neotest-java";
-      rev = "65e96a745f88ec06e72298378ec39a029171b815";
-      sha256 = "003yl2yz8zhmshzr5pfvbwvpaw4w1d53ckpr0bk3abwnh21i21b6";
+      rev = "0f31785a9cffa98c71eaeb80bf9f55d0d80fcb4d";
+      sha256 = "14ij78jfsgcg0qvb4kzcs60gm7x61ay7s4p87b4yyh9lc78min3v";
     };
     meta.homepage = "https://github.com/rcasia/neotest-java/";
     meta.hydraPlatforms = [ ];
@@ -9621,12 +9621,12 @@ final: prev: {
 
   neotest-minitest = buildVimPlugin {
     pname = "neotest-minitest";
-    version = "2024-12-03";
+    version = "2025-08-16";
     src = fetchFromGitHub {
       owner = "zidhuss";
       repo = "neotest-minitest";
-      rev = "7ff057de8ab2c27491ff27c7be9826b8f3bb5ec1";
-      sha256 = "1fxhvnffhci2cfnksf26k6lwnl346rp6pm4fpb30p4xzh4jpvan8";
+      rev = "4d1c19f80be0efff7656dea76a589c02bf418b68";
+      sha256 = "17jikp5cqqc0gmiljvfjzzirvkwf823kyj07nz0364dn87ljh3vk";
     };
     meta.homepage = "https://github.com/zidhuss/neotest-minitest/";
     meta.hydraPlatforms = [ ];
@@ -9725,12 +9725,12 @@ final: prev: {
 
   neotest-rust = buildVimPlugin {
     pname = "neotest-rust";
-    version = "2025-08-12";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "rouge8";
       repo = "neotest-rust";
-      rev = "3975b9a88978adbffe1a6c0f5973818a522c1e8d";
-      sha256 = "06my45f1x5xa0v7qfnjh28d89cid2awm2wyncvy9nfwxi2iqsqrf";
+      rev = "2c9941d4a358839918fac21d20fc8fef0e1ad05f";
+      sha256 = "0kp2z3i7sn3pw0rzba1nv708mgqzyalx9qzx8a6pj3qgd5drvj4j";
     };
     meta.homepage = "https://github.com/rouge8/neotest-rust/";
     meta.hydraPlatforms = [ ];
@@ -9790,12 +9790,12 @@ final: prev: {
 
   neovim-ayu = buildVimPlugin {
     pname = "neovim-ayu";
-    version = "2025-08-08";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "Shatur";
       repo = "neovim-ayu";
-      rev = "8f236d3d65cf55bf0664aefd850c326580152270";
-      sha256 = "1dqhwkfb61x12klbbshbi5l99lqbyziily93p7xi78afr7vgxi87";
+      rev = "cc78e880cce5dfc1187d144ed7251c746feff259";
+      sha256 = "1fdxapbm08g1hqdk31261c2fnfr4vawgb9pg0kxglc8lkyrn2w8b";
     };
     meta.homepage = "https://github.com/Shatur/neovim-ayu/";
     meta.hydraPlatforms = [ ];
@@ -9959,12 +9959,12 @@ final: prev: {
 
   nfnl = buildVimPlugin {
     pname = "nfnl";
-    version = "2025-07-19";
+    version = "2025-08-17";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "nfnl";
-      rev = "4cbcfecf053417a05c643d1fd1d70d77772396cb";
-      sha256 = "1gmic1qsnh8fngi9plijrxprk13745pqw25n69bniqjr0fs4a4md";
+      rev = "eb30d38bffcd7e8f67f3d208a5d3e4cf2d844e12";
+      sha256 = "1y5s1j6dxy2wrkhv45rzs4a6242fcvyvq0xby3n9v28k4sw44b1f";
     };
     meta.homepage = "https://github.com/Olical/nfnl/";
     meta.hydraPlatforms = [ ];
@@ -10076,12 +10076,12 @@ final: prev: {
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "2025-08-14";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "80d31152df16c3ee8711b44f8ce0eaa22d967c7c";
-      sha256 = "1kd0p2v8xn025aa0bvlr4bdzrvzlbxv8axv2yjv2kck2jz33yvbz";
+      rev = "d64b7088f257c3bd38bb6b9ef5be00d7a710c5d1";
+      sha256 = "0ai0xfqx8gk8qgqx259aavn1nad1593cycrcwgdihrhdjcrysdhj";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10505,12 +10505,12 @@ final: prev: {
 
   nvim-dap = buildVimPlugin {
     pname = "nvim-dap";
-    version = "2025-08-02";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "a479e25ed5b5d331fb46ee4b9e160ff02ac64310";
-      sha256 = "0id0mfll6ab5y608zhqgb16xgs13yss6c3vppn2pp5jpsvz1x6v6";
+      rev = "f777d1d20ed50c2f312e286892c062d9c2f1c6fe";
+      sha256 = "1jqfmfsgyzfy4b5889sw6z40j59pywsgbiy5pw302r9pwwdizjyi";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
     meta.hydraPlatforms = [ ];
@@ -10557,12 +10557,12 @@ final: prev: {
 
   nvim-dap-python = buildVimPlugin {
     pname = "nvim-dap-python";
-    version = "2025-05-12";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap-python";
-      rev = "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c";
-      sha256 = "1rnymif8x0wcy4pdawn3jps9zynajkhwbrm37n4md2hfd7wbb7yl";
+      rev = "679762ea611a37803090b5acb79fcc367a2d35b0";
+      sha256 = "0n3qm932sr9x82b8xnvi34k9ai7jwqsqbqdysyv857gyh66mfsqv";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/";
     meta.hydraPlatforms = [ ];
@@ -10609,12 +10609,12 @@ final: prev: {
 
   nvim-dap-view = buildVimPlugin {
     pname = "nvim-dap-view";
-    version = "2025-08-13";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "igorlfs";
       repo = "nvim-dap-view";
-      rev = "4ef43cb40ae652fcd19ab8f6f3d477e13394d1ce";
-      sha256 = "1qfpgx96agfjgksjh0dd7ixhd51gz349pp01lzqimc5m54nlq634";
+      rev = "e7dd190b7ef9c620e251d537b6404026d1d7d978";
+      sha256 = "05nwp0wi1lqc0pwvwrb6gxg377k7hr4pr0v6bfgh4qv9q3hsfig2";
     };
     meta.homepage = "https://github.com/igorlfs/nvim-dap-view/";
     meta.hydraPlatforms = [ ];
@@ -10661,12 +10661,12 @@ final: prev: {
 
   nvim-early-retirement = buildVimPlugin {
     pname = "nvim-early-retirement";
-    version = "2025-08-12";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-early-retirement";
-      rev = "b95724575f10f0d1deaad7284fa762141dcdc092";
-      sha256 = "18ns62isvif816j6a021lqkz04c2vc84bb2chm0qc4zkv0dm36si";
+      rev = "ef9fc0267da4204432ab7bf3ab9df359874cfeb6";
+      sha256 = "14jhgpgqnkiryc4xccn99bwgqjcmhjly172nj3dfpjw2lizmkkzp";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-early-retirement/";
     meta.hydraPlatforms = [ ];
@@ -10726,12 +10726,12 @@ final: prev: {
 
   nvim-genghis = buildVimPlugin {
     pname = "nvim-genghis";
-    version = "2025-08-02";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-genghis";
-      rev = "8f521e775a06928bd349f095d5bad3c38b816892";
-      sha256 = "1zwlm0hfji7g41cymk7qls1qi8f0kyzzijv8am90p59s2yinrjlm";
+      rev = "ff9cb27e2edfcde26ecd738c0f2ea835b1201b7e";
+      sha256 = "1mknj2bg1hy17q4k2jfzlkndfsjdygaw755imzmm92vsq4fby3np";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
     meta.hydraPlatforms = [ ];
@@ -10765,12 +10765,12 @@ final: prev: {
 
   nvim-highlight-colors = buildVimPlugin {
     pname = "nvim-highlight-colors";
-    version = "2025-04-14";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "brenoprata10";
       repo = "nvim-highlight-colors";
-      rev = "b42a5ccec7457b44e89f7ed3b3afb1b375bb2093";
-      sha256 = "0zw59ymsy1vl57akpb273psy93vl49i5zkfkp7r5k3dq67l28f37";
+      rev = "1ce0a09bfc28c7274e649d20927cea51e440b65c";
+      sha256 = "1wsscm2mycd7zalxv8paa3fk0qy46bbhq4yfr73sl71wvkdh6yjn";
     };
     meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/";
     meta.hydraPlatforms = [ ];
@@ -10986,12 +10986,12 @@ final: prev: {
 
   nvim-lint = buildVimPlugin {
     pname = "nvim-lint";
-    version = "2025-07-31";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "7ef127aaede2a4d5ad8df8321e2eb4e567f29594";
-      sha256 = "06p4xllqkkjm2d3v2shfm5k87lxm993qc3y88kw1w9ypcrrd4r8s";
+      rev = "ee04d481d4e6089892c2fb2ad8924b1a053591e1";
+      sha256 = "033qp7az1jgqplz2wglqimhydf33ajkkymgx2c44y79q8sw0lww4";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
     meta.hydraPlatforms = [ ];
@@ -11038,12 +11038,12 @@ final: prev: {
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2025-08-15";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "4da7247b2b348b4f6cade30a7a7fcb299879d275";
-      sha256 = "0g662vfbdv52934c2bm5wy7dx880a4z7v859mln64ns0cm04858l";
+      rev = "0e268f5e0a398e77b2188aa94472b63daaa793b8";
+      sha256 = "01n863qsly6cvsjpcyy495pp7ds180flslz14ysb92i83jphml48";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
     meta.hydraPlatforms = [ ];
@@ -11220,12 +11220,12 @@ final: prev: {
 
   nvim-origami = buildVimPlugin {
     pname = "nvim-origami";
-    version = "2025-08-11";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-origami";
-      rev = "7601195576615ba209d79f3dccc764f82d802b5c";
-      sha256 = "0p9kmwzsnx43z9mi91hpl6l3z3kaackib08q8px0g4swz4p9azg7";
+      rev = "5da8ffca21f303e53114ed6e5e1adc0827adf8e9";
+      sha256 = "0pjxczb3vqdxra9bw5wxg5h1lcijbyp36vsbfzg47av4b8v40njz";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-origami/";
     meta.hydraPlatforms = [ ];
@@ -11337,12 +11337,12 @@ final: prev: {
 
   nvim-rip-substitute = buildVimPlugin {
     pname = "nvim-rip-substitute";
-    version = "2025-08-02";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-rip-substitute";
-      rev = "4f9ad4ce47f940e6ac7419493074ed63de5b4fa9";
-      sha256 = "1nkk27yxm9gqiaaqmb65kg6ff64xynyv7shyc5y7yz3nj1mdlyz7";
+      rev = "b12256e1c3e717cc980adb16eb64232971f131f8";
+      sha256 = "0854nrdpniakf5i9xn07748395k3milsdgj7x6qzrlsh8w4pcic3";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/";
     meta.hydraPlatforms = [ ];
@@ -11454,12 +11454,12 @@ final: prev: {
 
   nvim-spider = buildVimPlugin {
     pname = "nvim-spider";
-    version = "2025-08-11";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-spider";
-      rev = "b23cad515d3979717edb1c0954da26b9f967c084";
-      sha256 = "1cr2drjzb6zlbnwqm8rv6lsyxssbc6xxwv7x9j7li1hdjlmc729x";
+      rev = "a619b0d2799ae89b460a6461af74170b583193e5";
+      sha256 = "0s39qzf43gbqazx7hlnf8fxj17apmm03i9wdyvv1pppg3d06cz76";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
     meta.hydraPlatforms = [ ];
@@ -11467,12 +11467,12 @@ final: prev: {
 
   nvim-surround = buildVimPlugin {
     pname = "nvim-surround";
-    version = "2025-08-01";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "kylechui";
       repo = "nvim-surround";
-      rev = "c271c9082886a24866353764cf96c9d957e95b2b";
-      sha256 = "0v3px2jqsdlrv765fic1plzb8v5jidqmbmprlw5s5magxirgcz6w";
+      rev = "d56752df477ebd808cb82cea2fc68cf7455abb21";
+      sha256 = "0j2gqmkwrkpyyv7qpvyvpazz009jb5s1kvjb1bqi9gn6bg0s9dbw";
     };
     meta.homepage = "https://github.com/kylechui/nvim-surround/";
     meta.hydraPlatforms = [ ];
@@ -11519,12 +11519,12 @@ final: prev: {
 
   nvim-tinygit = buildVimPlugin {
     pname = "nvim-tinygit";
-    version = "2025-08-02";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-tinygit";
-      rev = "a8832a2a889e82efe59b7af569795dc0ae657a5a";
-      sha256 = "05c6y28i0gyyxaklvmivlaydfbykwmck071d8nxji18pbvb8ah2m";
+      rev = "b8d4d7a12427db58c774ac6807edd005b2bae71c";
+      sha256 = "0z0wjw5ds3b361mp1lvl3r2c8mcfk64fw8cfdqvv4bjmc5r93yp5";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-tinygit/";
     meta.hydraPlatforms = [ ];
@@ -11532,12 +11532,12 @@ final: prev: {
 
   nvim-tree-lua = buildVimPlugin {
     pname = "nvim-tree.lua";
-    version = "2025-08-14";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "f0e9951778802526b14c934f7bf746e1e0ae5ed0";
-      sha256 = "0rxgra5kpjpr6h9n83bhsav0nvqjqz29pq10wwd2fxi7dadppmq9";
+      rev = "f4fa6ebd3cbfa299fb554766c56b2f7cc1233f27";
+      sha256 = "1z87vv5davz9jc3bqi90lrr4dxn5sdqjs45i7har8cmr8v5786d5";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
     meta.hydraPlatforms = [ ];
@@ -11571,12 +11571,12 @@ final: prev: {
 
   nvim-treesitter-endwise = buildVimPlugin {
     pname = "nvim-treesitter-endwise";
-    version = "2025-08-14";
+    version = "2025-08-15";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "nvim-treesitter-endwise";
-      rev = "02a9e4e096e087bc417059e303e30af7f5f07971";
-      sha256 = "179h1d71hxmx7zgbq590y92b19jilr5capc5qag5nmavky110p8d";
+      rev = "a61a9de7965324d4019fb1637b66bfacdcb01f51";
+      sha256 = "1vl1my4rcp2qd7j7a77dv6sdavzjcglwx2irh7jws37j6zjxvv01";
     };
     meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/";
     meta.hydraPlatforms = [ ];
@@ -11701,12 +11701,12 @@ final: prev: {
 
   nvim-ufo = buildVimPlugin {
     pname = "nvim-ufo";
-    version = "2025-06-09";
+    version = "2025-08-17";
     src = fetchFromGitHub {
       owner = "kevinhwang91";
       repo = "nvim-ufo";
-      rev = "80fe8215ba566df2fbf3bf4d25f59ff8f41bc0e1";
-      sha256 = "1rwk6hfkpvmm9sbbrqy89aacb00myha2ggsmfqqpnv06vmr68z34";
+      rev = "d31e2a9fd572a25a4d5011776677223a8ccb7e35";
+      sha256 = "172v3fh3h3765d93h2ymzzm539i41dw04pj4cxyn2ljb2rb0hfiv";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/";
     meta.hydraPlatforms = [ ];
@@ -11727,12 +11727,12 @@ final: prev: {
 
   nvim-various-textobjs = buildVimPlugin {
     pname = "nvim-various-textobjs";
-    version = "2025-08-11";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-various-textobjs";
-      rev = "7322cd3319049d88a6b7cf09dbf45d0de50b66fd";
-      sha256 = "0zs7ckvm5jbsakfb3qqwrqyv9h2y1kzxkfgd0d5c63hapywsbwbh";
+      rev = "8f0634188a607071a9a21b264a7f9b09f5fc5724";
+      sha256 = "059wdcwkc4hka37fmxh10idgmjifsds0c0yaqkm0f4f123z8jh81";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/";
     meta.hydraPlatforms = [ ];
@@ -11883,12 +11883,12 @@ final: prev: {
 
   obsidian-nvim = buildVimPlugin {
     pname = "obsidian.nvim";
-    version = "2025-08-13";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "obsidian-nvim";
       repo = "obsidian.nvim";
-      rev = "4fd01de50c7fea3616f6809f19e9be8d2dc6ce63";
-      sha256 = "02qfmiv0jzmxq98k9frh2z91ngk9qsz6g6w6p2s56jp0xz0q8k34";
+      rev = "e7818ca1f469dc90a3d7aef886531da11ffbe254";
+      sha256 = "0ygvmg7xqxdbnfc40sl3xvcysnd8mxks2ri034pxic2ad3z6z8ga";
     };
     meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/";
     meta.hydraPlatforms = [ ];
@@ -11922,12 +11922,12 @@ final: prev: {
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "2025-08-11";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "86192674d685cf9076d0228e50d281f840d2c889";
-      sha256 = "1ayww79zrlb4dndh4li0c3bc51g4hprwx2d2csrmnb33zbqkcqa3";
+      rev = "6dabe62fb6678804ad38fb0f060854a5d1d4a7ef";
+      sha256 = "0bhky1cmhd6hnwkqlvkca1jp052dhr1lyw9ny831xwhnl3p3c0g2";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12052,12 +12052,12 @@ final: prev: {
 
   onedarkpro-nvim = buildVimPlugin {
     pname = "onedarkpro.nvim";
-    version = "2025-07-31";
+    version = "2025-08-17";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "onedarkpro.nvim";
-      rev = "3891f6f8db49774aa861d08ddc7c18ad8f1340e9";
-      sha256 = "15k4719y2bq52yy5vxk2h7w7x64j0m0iabhgm3laanijykqz6ia7";
+      rev = "ddbcb80d1403a789b3c656064c3ec448a50caa41";
+      sha256 = "0y822hfb7f380lkv0w76g874qcy91g8r7rpqcxxs78rspzbjcl0m";
     };
     meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12117,12 +12117,12 @@ final: prev: {
 
   opencode-nvim = buildVimPlugin {
     pname = "opencode.nvim";
-    version = "2025-08-15";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "NickvanDyke";
       repo = "opencode.nvim";
-      rev = "2e20e08ff11f6deabad2b48b28f724d8db4b8b9f";
-      sha256 = "1bxmdlwl35vzxwaimdr6jnc1sbacxbcd1k237l8m5kdbm5ak40al";
+      rev = "e4bc3f05d71f12b6296125802512a08a69126d54";
+      sha256 = "1kqnv9vrd02lbdc7l6kfbca0pccjp6ybcxxrf1ig49slwrl9zhkm";
     };
     meta.homepage = "https://github.com/NickvanDyke/opencode.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12339,12 +12339,12 @@ final: prev: {
 
   parrot-nvim = buildVimPlugin {
     pname = "parrot.nvim";
-    version = "2025-07-21";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "frankroeder";
       repo = "parrot.nvim";
-      rev = "6ad76a1b170b3fa49851504ab17cb39075b93b03";
-      sha256 = "1x6knk6n576zyk2927hy2xisp96vmqg5fa1pbq4m0f2vc8g7qiw0";
+      rev = "820cc7d4014ab1dca52547c66e3e407510e5e4bc";
+      sha256 = "1ad7xwaxn96clgchj9fgmbfh41vh01km8fgbvbvhnwlfbf3y3hkr";
     };
     meta.homepage = "https://github.com/frankroeder/parrot.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12417,12 +12417,12 @@ final: prev: {
 
   persisted-nvim = buildVimPlugin {
     pname = "persisted.nvim";
-    version = "2025-03-30";
+    version = "2025-08-16";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "persisted.nvim";
-      rev = "d35a3ed973e17defd8800acd46a0c893498a2671";
-      sha256 = "08rlcgyhjp18sbhkw00d48lf81ld77gwdzkii5xd37sijrkjgyf7";
+      rev = "5063ee8e3589a43eefadcca57496aea01b6170fa";
+      sha256 = "01wbl2nf3wp419aya1q4jp2ykvl57ykwac7b8innw4mnd3fq69l4";
     };
     meta.homepage = "https://github.com/olimorris/persisted.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12704,12 +12704,12 @@ final: prev: {
 
   project-nvim = buildVimPlugin {
     pname = "project.nvim";
-    version = "2025-08-15";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "DrKJeff16";
       repo = "project.nvim";
-      rev = "55d2562a74f2f4ef2ed0d9a286833dab2d6c8d48";
-      sha256 = "1i84fw1h4ka475asyz0jgv89zdy6cqh5yxx4da7bd852sg1vkwz0";
+      rev = "1328b1b445824d31bf8c5c810860103dac40c2dc";
+      sha256 = "0y06gykqqh0qmkfq96cjxsg9w344w9iqidvfzgbcayp3mwlb3i69";
     };
     meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12756,12 +12756,12 @@ final: prev: {
 
   pum-vim = buildVimPlugin {
     pname = "pum.vim";
-    version = "2025-08-01";
+    version = "2025-08-17";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "pum.vim";
-      rev = "fc526871540121f79f5c9abb1fb7c5e4b22656fd";
-      sha256 = "0whndq74nj9xw5vyyb12bbq5x535vqdy9pv3w5mpj6x7rm6856k7";
+      rev = "03bba26c153d82f0dffc158acf58e499a7b082f3";
+      sha256 = "0g8pbhmv557llhgpg6c7j15ab3gnvlii8jd8c51h901wilqf7cjr";
     };
     meta.homepage = "https://github.com/Shougo/pum.vim/";
     meta.hydraPlatforms = [ ];
@@ -13095,12 +13095,12 @@ final: prev: {
 
   remote-nvim-nvim = buildVimPlugin {
     pname = "remote-nvim.nvim";
-    version = "2025-07-26";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "amitds1997";
       repo = "remote-nvim.nvim";
-      rev = "4c5e8e3468895ff86ee599686724b8f33616c37c";
-      sha256 = "0fs1yh3jg1q7v5hvrsaidr3kjawd6rjabxfyvlnyqgsir878ikcw";
+      rev = "f0e271b84e6d820f1a2abf7f57bfb391e45d1b6c";
+      sha256 = "153zxm31xfc1bmq2qarc1h6yrbh813lp1nac24cjya4y55irhxd1";
     };
     meta.homepage = "https://github.com/amitds1997/remote-nvim.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13108,12 +13108,12 @@ final: prev: {
 
   remote-sshfs-nvim = buildVimPlugin {
     pname = "remote-sshfs.nvim";
-    version = "2025-08-14";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "nosduco";
       repo = "remote-sshfs.nvim";
-      rev = "d78933aa69dc44a15386ff25a91b2908d49fc363";
-      sha256 = "0ckjrfjfdl18pm3dcnag01lqg17m1f5v255vrhadnz72n299ab8a";
+      rev = "8b0974c0e23ef086f5598ebbb1980257171dc370";
+      sha256 = "11kxyyqpz5q8hcldz7pn66z77a7h139k9v908zgl4xqi5g8bjby7";
     };
     meta.homepage = "https://github.com/nosduco/remote-sshfs.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13134,12 +13134,12 @@ final: prev: {
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "2025-08-15";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "7b37aaba005df5744fc7a6bd4225983576b2a950";
-      sha256 = "0napk73f3xmc6v3rrz6ak1jd30qd03k9y7fk8ymdj765wcy80020";
+      rev = "c4ff9acddcf0f79b3187393319adb5cac5865bd3";
+      sha256 = "0hvi2hq81i3lvv5wdkijdh2hxl4fxpgyknx0mp3w11729w3kwjk4";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13265,12 +13265,12 @@ final: prev: {
 
   roslyn-nvim = buildVimPlugin {
     pname = "roslyn.nvim";
-    version = "2025-08-14";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "seblyng";
       repo = "roslyn.nvim";
-      rev = "c2b90375f1cf3ed7ac0f441f994d08ac3666b8e0";
-      sha256 = "11r098gzhczdxc83bmvccz2ng6r54nq2qd4r56lldf4xwqsfi6f4";
+      rev = "0c4a6f5b64122b51a64e0c8f7aae140ec979690e";
+      sha256 = "1facfrxmr57iy2l98zqf1jh2dyipkqydzcrbl5da8afia3lwg45m";
     };
     meta.homepage = "https://github.com/seblyng/roslyn.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13434,12 +13434,12 @@ final: prev: {
 
   scretch-nvim = buildVimPlugin {
     pname = "scretch.nvim";
-    version = "2025-02-05";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "0xJohnnyboy";
       repo = "scretch.nvim";
-      rev = "fbdbb5d8e495aa6a097c7b3dc78164a8843a3d32";
-      sha256 = "0hb8sdaqaaq9nr4n9cggyp0c8v2m0lm9qcv66i1v0waq1r4clv5y";
+      rev = "559f17773d26cfdbe05c792ef7e22d07e258f058";
+      sha256 = "01xjjzwwg9pfmkbx9j07dqg39a0ypf36q14p8rpa2zlhysl7r1zj";
     };
     meta.homepage = "https://github.com/0xJohnnyboy/scretch.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13643,12 +13643,12 @@ final: prev: {
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2025-08-08";
+    version = "2025-08-15";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "52ee119752ee7e98a2a62f0f172926b5fbbc28a5";
-      sha256 = "1w7ip31vg6hzgd29dzw959mb8cx7ig06208il6ln08ph2ls71slj";
+      rev = "dcdb68cf610e76573434f8cd21b37327d28cc8c4";
+      sha256 = "1xaj1zrzzax0m120zn0qpf6qjf28vrwn7v76gwkc3iyjxh1z0543";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13695,12 +13695,12 @@ final: prev: {
 
   smear-cursor-nvim = buildVimPlugin {
     pname = "smear-cursor.nvim";
-    version = "2025-08-14";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "sphamba";
       repo = "smear-cursor.nvim";
-      rev = "b900f1feca8c37479c30889b29327385257443c0";
-      sha256 = "0m4vrfvd8cr1wm39dhw11cv1lxv43vl7rxyiwhjz7zcimf1w3s7d";
+      rev = "4b86df8a0c5f46e708616b21a02493bb0e47ecbd";
+      sha256 = "00x8wmlvwgvn9qb68qnax9i5iiis37pdhc4w635jz81j9wghc98f";
     };
     meta.homepage = "https://github.com/sphamba/smear-cursor.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13734,12 +13734,12 @@ final: prev: {
 
   snipe-nvim = buildVimPlugin {
     pname = "snipe.nvim";
-    version = "2025-08-10";
+    version = "2025-08-16";
     src = fetchFromGitHub {
       owner = "leath-dub";
       repo = "snipe.nvim";
-      rev = "c3f4325053ce29aace4829b46d71f64e02707141";
-      sha256 = "1hr1bcd5il2hdmxn8vbnz25fpnq306vbbk5hwizxn0c0dbwrdy3k";
+      rev = "9e98df38f81cdf3822936c919c8115e9529a491a";
+      sha256 = "18hpgskhaaf5ammgg99pb6vr81fhk2b5k2xia840lbybsq4hfgsm";
     };
     meta.homepage = "https://github.com/leath-dub/snipe.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13786,12 +13786,12 @@ final: prev: {
 
   sonokai = buildVimPlugin {
     pname = "sonokai";
-    version = "2025-08-03";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "sonokai";
-      rev = "27a71a6e058ba0a88b14b137a89020f6caeec93b";
-      sha256 = "1rajgpaqhqjj6sbwawgig4p5lgnb1vjvphk146y63zhgc336xxvr";
+      rev = "45481a54f9e44b8b9d89509df514b86bbf22aa07";
+      sha256 = "07f4inv3i7pqj654y8pmc1q7jxw5cf28nvq4jhgh6wpzby1d5z40";
     };
     meta.homepage = "https://github.com/sainnhe/sonokai/";
     meta.hydraPlatforms = [ ];
@@ -13799,12 +13799,12 @@ final: prev: {
 
   sort-nvim = buildVimPlugin {
     pname = "sort.nvim";
-    version = "2025-07-30";
+    version = "2025-08-15";
     src = fetchFromGitHub {
       owner = "sQVe";
       repo = "sort.nvim";
-      rev = "7d70ef9fdc6f47fbf58383cf7ae94edb93efec48";
-      sha256 = "1mbkzgll6rnazy504fg6d1n5bzrbngkskwkncn2x4paaq2xyqqx7";
+      rev = "939f3f55536dbdaf68e9c9a37609d0ce9ba383c0";
+      sha256 = "1a4cg7s4vj14xdy84c3zg64ghr79h8jgak1q68878c7rkw50sd9h";
     };
     meta.homepage = "https://github.com/sQVe/sort.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15014,12 +15014,12 @@ final: prev: {
 
   texpresso-vim = buildVimPlugin {
     pname = "texpresso.vim";
-    version = "2024-12-25";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "let-def";
       repo = "texpresso.vim";
-      rev = "907838c08bbf99ad6bed3c908f1d0551a92ab4e0";
-      sha256 = "1s971w5794cf3maa0rqdbkz7j4ndnm4haabvj6fhrd0d827x21ky";
+      rev = "d543df30b61ea886cb726a18c1d1d28ea36d30cc";
+      sha256 = "0rppcjd2j683r4443pjid4an2lh12an3bfnlv7v4br6aka3lg6j6";
     };
     meta.homepage = "https://github.com/let-def/texpresso.vim/";
     meta.hydraPlatforms = [ ];
@@ -15105,12 +15105,12 @@ final: prev: {
 
   timerly = buildVimPlugin {
     pname = "timerly";
-    version = "2025-07-03";
+    version = "2025-08-16";
     src = fetchFromGitHub {
       owner = "nvzone";
       repo = "timerly";
-      rev = "11a750d016a94e254da08aa845aa282c3c0b38f6";
-      sha256 = "1wf7w3vvf9nkf132vf8dcxiq57fjc039x95ymzcjg5kxa5fp03k9";
+      rev = "1c78999480af0e4f8201fe6bfa1e5e0b70a59acf";
+      sha256 = "0jbncbq03vp1v9fyd1s6mjymbgxp81qjklfal6s02xw9x41azxjw";
     };
     meta.homepage = "https://github.com/nvzone/timerly/";
     meta.hydraPlatforms = [ ];
@@ -15144,12 +15144,12 @@ final: prev: {
 
   tinted-nvim = buildVimPlugin {
     pname = "tinted-nvim";
-    version = "2025-08-09";
+    version = "2025-08-16";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-nvim";
-      rev = "8298e72724a7e6854657a4cac4b5e550fb13acf5";
-      sha256 = "02dylm04yrgjzmghiwvhzz5ap0nqq0dx65lvxdsi4yaz6g4mdwdz";
+      rev = "e56eabc1cded0301fe9a5d5207cb64beb456e045";
+      sha256 = "19vzg1s6n41vhg5js43c3aknn0jgmlw1ds67758q7bhsyn1rwjb9";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-nvim/";
     meta.hydraPlatforms = [ ];
@@ -15196,12 +15196,12 @@ final: prev: {
 
   tiny-inline-diagnostic-nvim = buildVimPlugin {
     pname = "tiny-inline-diagnostic.nvim";
-    version = "2025-07-16";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-inline-diagnostic.nvim";
-      rev = "7dcf8542059fb15c978de845fc8665428ae13a04";
-      sha256 = "1dr96isp19yskiz46vvjfc09y5iyyv2yfl01lrgfjybhhdhqcs84";
+      rev = "f64efd33a51ea89bdb847fb3aaf716e96b83ba1a";
+      sha256 = "08fsc8lcrsm3gpw4d3nlsxn52i999ah59461gfzjd8q4cm2vzmd1";
     };
     meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15667,12 +15667,12 @@ final: prev: {
 
   ultimate-autopair-nvim = buildVimPlugin {
     pname = "ultimate-autopair.nvim";
-    version = "2025-02-14";
+    version = "2025-08-17";
     src = fetchFromGitHub {
       owner = "altermo";
       repo = "ultimate-autopair.nvim";
-      rev = "b24b97c538b71b6de0ce9d84e47df27b6ecafd76";
-      sha256 = "0dvjxzrwrnkr2f8hbahn31x6nr6ck5q72l8qdqr1spzzdvndpwy8";
+      rev = "e65731d50c548c020f3961bb42071671f0fa923c";
+      sha256 = "1japs52c9q6x0fk8dzrsy5mkv81dxwhs0h24yj4k9mnna17yc6qg";
     };
     meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15758,12 +15758,12 @@ final: prev: {
 
   unison = buildVimPlugin {
     pname = "unison";
-    version = "2025-08-14";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "897f245dbcaed481d0a97447fc5cba92f889a1f6";
-      sha256 = "066ajpp6qns1g5yqw7g9yyk83qqf5arkxhmbbql2xq38zv6bwx5v";
+      rev = "c9c45fc5241b48c333e9b8101f85039bdfe1dc46";
+      sha256 = "1glqzw4y3p13nsdlv5jyx78am3p4h0nidij0z1gk0p4q5cfwsw45";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
     meta.hydraPlatforms = [ ];
@@ -15862,12 +15862,12 @@ final: prev: {
 
   vague-nvim = buildVimPlugin {
     pname = "vague.nvim";
-    version = "2025-08-13";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "vague2k";
       repo = "vague.nvim";
-      rev = "087ff41d1b4d90e7b64e1c97860700fa6b7f0daf";
-      sha256 = "0y6b11piz4wxzrrgyvkwfw020qbwhiwzdcykijgdig1w6qxhg2i6";
+      rev = "6c44ca64a7efc89bb86f501602e6ddd51bc92b3a";
+      sha256 = "02r0wy9db7dlbynv9hqmwpf3mdilwvx1x4g1wdi2vgmf339ynwb7";
     };
     meta.homepage = "https://github.com/vague2k/vague.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15914,12 +15914,12 @@ final: prev: {
 
   vim-CtrlXA = buildVimPlugin {
     pname = "vim-CtrlXA";
-    version = "2024-07-21";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "Konfekt";
       repo = "vim-CtrlXA";
-      rev = "084d00284f532eab511a771f21a184d2024a9e46";
-      sha256 = "197a13nnvq4w81l0c2bimfgwxdxxsqjzghmh901z1665y919fc5m";
+      rev = "ebc1e30b78e44bb3862ca20c48657522fd1e1b66";
+      sha256 = "0xx5f8fma0qxvk5zrav8ylvghryjb7j656hbbca3bhg0nny3ira7";
     };
     meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/";
     meta.hydraPlatforms = [ ];
@@ -16304,12 +16304,12 @@ final: prev: {
 
   vim-airline = buildVimPlugin {
     pname = "vim-airline";
-    version = "2025-07-14";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "5ca7f0b7fef4f174d57fd741b477bbbac0b7886a";
-      sha256 = "1jl570hryxkkqp3pms8a44ac6w8bfp4yb4m3nz72l27krwvxj6y5";
+      rev = "e40a696db0cb8ae412bceee93c94ff27091151ee";
+      sha256 = "023sw1z20xzhzpgmcqnpinaxs0knfk00m5xpmadbj307cgd5si33";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline/";
     meta.hydraPlatforms = [ ];
@@ -18059,12 +18059,12 @@ final: prev: {
 
   vim-habamax = buildVimPlugin {
     pname = "vim-habamax";
-    version = "2025-08-15";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "habamax";
       repo = "vim-habamax";
-      rev = "e0eb015324aa24cfde3fd429e9c94ad7a552e193";
-      sha256 = "1hl0pnb5kzs8gd1hnd3vch7gdyq3q1nxkzcypz6p0hwpz9xkgy9i";
+      rev = "0016f249614b4aee33a2556efb29d7299bd5cf0f";
+      sha256 = "0iv7krz4li40a9096ql09zlb7lq3wzr10d3a1vi97jxkdzwsxgp6";
     };
     meta.homepage = "https://github.com/habamax/vim-habamax/";
     meta.hydraPlatforms = [ ];
@@ -18659,12 +18659,12 @@ final: prev: {
 
   vim-just = buildVimPlugin {
     pname = "vim-just";
-    version = "2025-07-14";
+    version = "2025-08-18";
     src = fetchFromGitHub {
       owner = "NoahTheDuke";
       repo = "vim-just";
-      rev = "e0c04b6433b9c636274f074356744fdfae039b7e";
-      sha256 = "0v6sjkznlc1v14vcqxv6zbv9jqzgxggd4s48cfrk3hfb21awyr69";
+      rev = "04b0f122f14c83f55a0f8bb2a087754dc98cdccc";
+      sha256 = "1vy1x6gg80qh5n07nrf623yarfcivy8lalrxd8dvbpbwllxw2kqj";
     };
     meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
     meta.hydraPlatforms = [ ];
@@ -19712,12 +19712,12 @@ final: prev: {
 
   vim-peekaboo = buildVimPlugin {
     pname = "vim-peekaboo";
-    version = "2019-12-12";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-peekaboo";
-      rev = "cc4469c204099c73dd7534531fa8ba271f704831";
-      sha256 = "11lgf60v2kj772d9azkfddypwidcgfps5mvnhmp4gg0fmfx12h99";
+      rev = "2a8a3187ba6b15201b2563a3f0331fcdf49da36c";
+      sha256 = "1cfpqwrrg0y73ff77lmi4hm227ai4xz9symkq59s6ni8irj6m8kx";
     };
     meta.homepage = "https://github.com/junegunn/vim-peekaboo/";
     meta.hydraPlatforms = [ ];
@@ -20310,12 +20310,12 @@ final: prev: {
 
   vim-sexp-mappings-for-regular-people = buildVimPlugin {
     pname = "vim-sexp-mappings-for-regular-people";
-    version = "2022-11-26";
+    version = "2025-08-16";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-sexp-mappings-for-regular-people";
-      rev = "cc5923e357373ea6ef0c13eae82f44e6b9b1d374";
-      sha256 = "0jr5dyqbysp0g2pahgirq1lhzr26wv50rmnyc5l4jbvdwvnhzhjn";
+      rev = "4debb74b0a3e530f1b18e5b7dff98a40b2ad26f1";
+      sha256 = "1xz7rbnr417pkbplnvr10lnlvxv6c8dilja2iix8373vnrvrm2c6";
     };
     meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/";
     meta.hydraPlatforms = [ ];
@@ -20596,12 +20596,12 @@ final: prev: {
 
   vim-spirv = buildVimPlugin {
     pname = "vim-spirv";
-    version = "2025-07-30";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "kbenzie";
       repo = "vim-spirv";
-      rev = "8d7a5d707505df563ab3ae7f44ac440d8a7ed565";
-      sha256 = "02sbk59vlraj86fw3svkwxfs509wp3cp0i071xl93x3d8kxppkjm";
+      rev = "77bf035687275b503a624360738796fe0e0c5177";
+      sha256 = "0ampix9ajrz570778k8qvyq9yq6wfvchz6blpqkviahviiwsjcz3";
     };
     meta.homepage = "https://github.com/kbenzie/vim-spirv/";
     meta.hydraPlatforms = [ ];
@@ -20870,12 +20870,12 @@ final: prev: {
 
   vim-test = buildVimPlugin {
     pname = "vim-test";
-    version = "2025-08-09";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "vim-test";
       repo = "vim-test";
-      rev = "191c9ee3a7c798bd25fe48f3534dcab5cb05c60d";
-      sha256 = "1g4g06qxxbvh59sdzahd10s709ixjss3j9zy9h4i6rlki38zpl0v";
+      rev = "35f286da462d544a78810b7606778d3467ef4369";
+      sha256 = "06wj34s05zwfifjw5a96nva0v0w7ml19g4040ybs0iibcibh6dl0";
     };
     meta.homepage = "https://github.com/vim-test/vim-test/";
     meta.hydraPlatforms = [ ];
@@ -21169,12 +21169,12 @@ final: prev: {
 
   vim-unimpaired = buildVimPlugin {
     pname = "vim-unimpaired";
-    version = "2022-11-21";
+    version = "2025-08-16";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-unimpaired";
-      rev = "6d44a6dc2ec34607c41ec78acf81657248580bf1";
-      sha256 = "1ak992awy2xv01h1w3js2hrz6j5n9wj55b9r7mp2dnvyisy6chr9";
+      rev = "db65482581a28e4ccf355be297f1864a4e66985c";
+      sha256 = "1fmff7dlw9v1cvwslqxbx6xc7ckid980aprpxf1bkvjmz4xzgjl6";
     };
     meta.homepage = "https://github.com/tpope/vim-unimpaired/";
     meta.hydraPlatforms = [ ];
@@ -21351,12 +21351,12 @@ final: prev: {
 
   vim-wayland-clipboard = buildVimPlugin {
     pname = "vim-wayland-clipboard";
-    version = "2025-04-01";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "jasonccox";
       repo = "vim-wayland-clipboard";
-      rev = "2fa6178d39925eab6a33dd13583d1bd9b67d3f65";
-      sha256 = "1fqb4jwkz5qi3b4fxxz00m6qj8sj8ylblqznwkmq4hqw6r8mj43m";
+      rev = "7e9fb4e66d345e9898045b52df544c9e553ef5e4";
+      sha256 = "1bb2yaq13l65p8k77a2bml0lvazhzjan4k7f4n43szkby1dvhdll";
     };
     meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/";
     meta.hydraPlatforms = [ ];
@@ -21481,12 +21481,12 @@ final: prev: {
 
   vim-zettel = buildVimPlugin {
     pname = "vim-zettel";
-    version = "2025-06-04";
+    version = "2025-08-16";
     src = fetchFromGitHub {
       owner = "michal-h21";
       repo = "vim-zettel";
-      rev = "ba9268e4b99510b5aef3d839fbf4326540b99bf4";
-      sha256 = "1ddiz8v03fbmw8qrhvp3bxwp08lvwrbacw15dhcqdihjkwx4jx5m";
+      rev = "b4fd4d1537b1475bdbe32bb27253f4eca6737ae3";
+      sha256 = "1k6z3vq5ikvqhv0spq9fc1738smd7d99bia1dm72ih1a2ccr97as";
     };
     meta.homepage = "https://github.com/michal-h21/vim-zettel/";
     meta.hydraPlatforms = [ ];
@@ -21690,12 +21690,12 @@ final: prev: {
 
   vimtex = buildVimPlugin {
     pname = "vimtex";
-    version = "2025-08-12";
+    version = "2025-08-17";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "2b1ca6635dd419d485162c9debd4866fab662cad";
-      sha256 = "1kq7l4g57418q1jqp1hpby4252hizz8v1brk7671gwac9r5q90dw";
+      rev = "c74d9927d9ac2fd24f965634ab56fc5d3c0a60a7";
+      sha256 = "0pjy088rf3j3jrbia8wpxhb6d8vdqkbc3niyb5mrnd6fczxd7iiz";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
     meta.hydraPlatforms = [ ];
@@ -21807,12 +21807,12 @@ final: prev: {
 
   vs-tasks-nvim = buildVimPlugin {
     pname = "vs-tasks.nvim";
-    version = "2025-07-15";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "EthanJWright";
       repo = "vs-tasks.nvim";
-      rev = "b21d4d3eda0d1891cfc39f78c643a4e7396d1bb0";
-      sha256 = "05jn15vz38jzv3j3i71zyb7prb5ar00d7r9v1a6zimf7kalwwgkv";
+      rev = "d5a28e46a76ba1a6f9189e68168f5b963797303a";
+      sha256 = "0r7jyd7wfywnf7j9ym0f9b4lh4ng69nm3z6qm5jjhjhr51nkhs3k";
     };
     meta.homepage = "https://github.com/EthanJWright/vs-tasks.nvim/";
     meta.hydraPlatforms = [ ];
@@ -21937,12 +21937,12 @@ final: prev: {
 
   wiki-vim = buildVimPlugin {
     pname = "wiki.vim";
-    version = "2025-07-17";
+    version = "2025-08-20";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "wiki.vim";
-      rev = "d91a73f262e057ff008cc35e3566d378cc43fe10";
-      sha256 = "0ljz2zfqb8khji4q6mkpv3181k4k602g76zzds8y772ipjzrc4in";
+      rev = "ef3fad8a7e0bd64c012cff5c6b1219f8f2cc6d82";
+      sha256 = "1g1ga1dsphnlhhnnyd1fb5v4csn1x3scjwm0r676lz2n4kihxkkg";
     };
     meta.homepage = "https://github.com/lervag/wiki.vim/";
     meta.hydraPlatforms = [ ];
@@ -22119,12 +22119,12 @@ final: prev: {
 
   wtf-nvim = buildVimPlugin {
     pname = "wtf.nvim";
-    version = "2025-08-03";
+    version = "2025-08-19";
     src = fetchFromGitHub {
       owner = "piersolenski";
       repo = "wtf.nvim";
-      rev = "77008b7279a804a06b44da4999f8c988f9a12ae7";
-      sha256 = "0yl2q48f21fpcnvx9xqmkr38mpwq0gpqfp80ail05551a88d2w3i";
+      rev = "ef0961a56d1898d938c68b1b49ac31fe057ae005";
+      sha256 = "13581zz4wgmdm9jq1vjkjskva5ckapq1bq2sc4mckly96yclhrvp";
     };
     meta.homepage = "https://github.com/piersolenski/wtf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22210,12 +22210,12 @@ final: prev: {
 
   yats-vim = buildVimPlugin {
     pname = "yats.vim";
-    version = "2025-08-04";
+    version = "2025-08-17";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
-      rev = "c3d71452154a12ccf9f6e4219ccbd625474602e5";
-      sha256 = "0g0yz9m1s1h986pipl2rz5vfmihz47sqdcrhz538mnkgggjnr9ig";
+      rev = "9507e827a1bfa9d136ca8f6539814a9597c13b29";
+      sha256 = "1l96vszc6mxrjyfh4cnv7b79jvnnypi995cz4qq5n0l8ldwhqr6b";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";
@@ -22224,12 +22224,12 @@ final: prev: {
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "2025-08-13";
+    version = "2025-08-21";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "74460dc4533bde424983702f1257df420455eebe";
-      sha256 = "1yvq9kx23l6dxy7r7nmb7ii1yn2qfdybz3rxfgl38spx1hz8rbqk";
+      rev = "f3c747e616651ff97d31373a335c8479bab2af2a";
+      sha256 = "19i0hpg9kj0i1s7qq3a5spbf4hygi79ms383h3jhp5cyg794ik1d";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
     meta.hydraPlatforms = [ ];

From 49e3cd6b64a76c81fa1072c193064c4324b6418d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 21 Aug 2025 15:09:30 -0500
Subject: [PATCH 2584/3724] vimPlugins.nvim-treesitter: update grammars

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../vim/plugins/nvim-treesitter/generated.nix | 96 +++++++++----------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index edcb5ca0c281..e38a3a9eb3a8 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -66,12 +66,12 @@
   };
   arduino = buildGrammar {
     language = "arduino";
-    version = "0.0.0+rev=1b1fd5d";
+    version = "0.0.0+rev=3b5ddcd";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-arduino";
-      rev = "1b1fd5dbd196e80342cf79f6fc5de154232c2829";
-      hash = "sha256-M+X2ofdy3wPUcDELNpjAFLywUG4rTsONQwZp63uYWfE=";
+      rev = "3b5ddcdbcac43c6084358d3d14a30e10e2d36b88";
+      hash = "sha256-qoVN/84BbuvhTb+WuwmTtNGqf9mKelViHMIVjMqyvG4=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-arduino";
   };
@@ -619,12 +619,12 @@
   };
   editorconfig = buildGrammar {
     language = "editorconfig";
-    version = "0.0.0+rev=2d92f8b";
+    version = "0.0.0+rev=17be0e8";
     src = fetchFromGitHub {
       owner = "ValdezFOmar";
       repo = "tree-sitter-editorconfig";
-      rev = "2d92f8bb8304d0b56883bb9df8f17cb351a07cc3";
-      hash = "sha256-QXbSTVijZw0xoQC5CcYDTG63RwMVgumiPsjL98GtltY=";
+      rev = "17be0e84ac012b6731626baf6920ff24e1865a03";
+      hash = "sha256-ktWPp0pH44FsddH744GpC1KnMDEe7smglBpspwApawU=";
     };
     meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
   };
@@ -751,12 +751,12 @@
   };
   fennel = buildGrammar {
     language = "fennel";
-    version = "0.0.0+rev=653c8ab";
+    version = "0.0.0+rev=fd4a24e";
     src = fetchFromGitHub {
       owner = "alexmozaidze";
       repo = "tree-sitter-fennel";
-      rev = "653c8abc72d1415cb85e032108d39022feb460be";
-      hash = "sha256-0FdAiuemiWcpud8/g4ajL685jq0uvtf3W/hGbNPrqOE=";
+      rev = "fd4a24e349bcbac8a03a5a00d0dfa207baf53ca5";
+      hash = "sha256-/+WJDDduMAEQvcTwplzNO8hfTiNbOyT2px4jRDxVQw0=";
     };
     meta.homepage = "https://github.com/alexmozaidze/tree-sitter-fennel";
   };
@@ -939,12 +939,12 @@
   };
   gitattributes = buildGrammar {
     language = "gitattributes";
-    version = "0.0.0+rev=f23072a";
+    version = "0.0.0+rev=1b7af09";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-gitattributes";
-      rev = "f23072a51e1c764d6c5bf461194a775c8a5c7a95";
-      hash = "sha256-CPs4loc+UcFZTeC+NkFo/LK2UAxG39RTkbnKR6g9kOE=";
+      rev = "1b7af09d45b579f9f288453b95ad555f1f431645";
+      hash = "sha256-eHDcJgHpWemOYtKACVhl5Muri1W1Igrjm/p0rAbvrNY=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gitattributes";
   };
@@ -1126,12 +1126,12 @@
   };
   gpg = buildGrammar {
     language = "gpg";
-    version = "0.0.0+rev=50482a3";
+    version = "0.0.0+rev=4024eb2";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-gpg-config";
-      rev = "50482a322cf1fa00dfe327ef8b00e4607eeeaa1d";
-      hash = "sha256-LHoFNQP3L1yozgOi0YOnOTmbXBc3H1hXsOB7sFDvSDg=";
+      rev = "4024eb268c59204280f8ac71ef146b8ff5e737f6";
+      hash = "sha256-aV0CUthayxs9O8Bpdoj9UyvUffLFYurOtkegJVH73Do=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gpg-config";
   };
@@ -1380,12 +1380,12 @@
   };
   idl = buildGrammar {
     language = "idl";
-    version = "0.0.0+rev=777b395";
+    version = "0.0.0+rev=6ab5582";
     src = fetchFromGitHub {
       owner = "cathaysia";
       repo = "tree-sitter-idl";
-      rev = "777b39538f9dc4ece1d891733bb4c91fc0627b16";
-      hash = "sha256-L8nDDMdYsTnF+TRzgStJqChBL8lCzb51xe74P3+YKBs=";
+      rev = "6ab5582bd47b86df75afe90cdd8dc55d2d480ce1";
+      hash = "sha256-PvUJR9SwmMWDO8kT8naNVwxneHhZ/rbuuWFl0R9m7aU=";
     };
     meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
   };
@@ -1457,12 +1457,12 @@
   };
   javadoc = buildGrammar {
     language = "javadoc";
-    version = "0.0.0+rev=76ed31d";
+    version = "0.0.0+rev=77afe93";
     src = fetchFromGitHub {
       owner = "rmuir";
       repo = "tree-sitter-javadoc";
-      rev = "76ed31dff40686b350c994ceb4da90ad7f3a7f44";
-      hash = "sha256-pYmxMR/W8BF0i9k1YNM8V2f1djQ6vmLLDHRIaniAX7E=";
+      rev = "77afe93bc6fc10f2cf4935857b8e055b2a47bb94";
+      hash = "sha256-HkhVHPYe+IgVkRlJu72Y+3eNZnPPpDqs6UJ0ej0PZrI=";
     };
     meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
   };
@@ -1735,12 +1735,12 @@
   };
   llvm = buildGrammar {
     language = "llvm";
-    version = "0.0.0+rev=be4864b";
+    version = "0.0.0+rev=470886d";
     src = fetchFromGitHub {
       owner = "benwilliamgraham";
       repo = "tree-sitter-llvm";
-      rev = "be4864bec38412aa2987b6dad01d1e389e9e9ca9";
-      hash = "sha256-qPJQjqmZOpkn5Z7WLPY+aeW4VR6E2FEN4P1Azkl6oyQ=";
+      rev = "470886ddd635e0ee48a4cb169e33d0c6d9bff32e";
+      hash = "sha256-1Fv1r644UfHXC4x4mbMetC0ThroYHwYDtKTSX3Nd4fo=";
     };
     meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm";
   };
@@ -1880,12 +1880,12 @@
   };
   mlir = buildGrammar {
     language = "mlir";
-    version = "0.0.0+rev=e2818d6";
+    version = "0.0.0+rev=b209a18";
     src = fetchFromGitHub {
       owner = "artagnon";
       repo = "tree-sitter-mlir";
-      rev = "e2818d616fc43cbbba316723cbd68a53c66a2704";
-      hash = "sha256-59h3UAk3uWuiMptT+aU8vABn9iVz6ZNscMfy/pwjZ78=";
+      rev = "b209a18d1a0f440acd3a85b6d633dac2660114e1";
+      hash = "sha256-aAfrn3my/qfEy9uK/WPCxSefBOsekJ+rT04K9UmDVvs=";
     };
     generate = true;
     meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -1969,12 +1969,12 @@
   };
   nix = buildGrammar {
     language = "nix";
-    version = "0.0.0+rev=42d2e0e";
+    version = "0.0.0+rev=ff4e2b4";
     src = fetchFromGitHub {
       owner = "nix-community";
       repo = "tree-sitter-nix";
-      rev = "42d2e0e2996dec99ea7eb82d64a138e12a7ba006";
-      hash = "sha256-GyqoIqu8neRjz5jpAqumuy3B5hDvNWhmT3xqFHdtwl8=";
+      rev = "ff4e2b4c5a3598e8be3edf16bc69f6677af32145";
+      hash = "sha256-VPkXKsoKs5ywVIGz+xqvD73nINur2flpEmKUKJRFYy8=";
     };
     meta.homepage = "https://github.com/nix-community/tree-sitter-nix";
   };
@@ -2093,12 +2093,12 @@
   };
   pem = buildGrammar {
     language = "pem";
-    version = "0.0.0+rev=7374eab";
+    version = "0.0.0+rev=e525b17";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-pem";
-      rev = "7374eab76f2caae02396721850f87af437b66c06";
-      hash = "sha256-goD7j8UmWgBBiOMaJ9E1tiwB4CSBoiUo6wKakEerGDI=";
+      rev = "e525b177a229b1154fd81bc0691f943028d9e685";
+      hash = "sha256-2fhqFGLdQ5eugv405osviYUcAPMdm1N0VfGoVuI84Qk=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-pem";
   };
@@ -2194,12 +2194,12 @@
   };
   poe_filter = buildGrammar {
     language = "poe_filter";
-    version = "0.0.0+rev=e449216";
+    version = "0.0.0+rev=205a7d5";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-poe-filter";
-      rev = "e449216700449f1bccaebbd3820cce794d6fd687";
-      hash = "sha256-6X+ZXtca0TKrVveD2aMMh0tTIrIwe9VsYqR7tiWDRLI=";
+      rev = "205a7d576984feb38a9fc2d8cfe729617f9e0548";
+      hash = "sha256-oFe/U3G5Fi73YtctonfUqZe5/UScM09c98R8C3aR7yU=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-poe-filter";
   };
@@ -2417,12 +2417,12 @@
   };
   query = buildGrammar {
     language = "query";
-    version = "0.0.0+rev=8a43889";
+    version = "0.0.0+rev=2668cc5";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-query";
-      rev = "8a43889f89fd0667289936341bff3a77bafade17";
-      hash = "sha256-b+S7NO5UrOerwU4//JcrueWzsNafW+jbGAucFjpGwio=";
+      rev = "2668cc53024953224a40b1e6546d7b8ec5a11150";
+      hash = "sha256-KrdriPQLxb0Eay5gVRwU2hYfgC0oP/VtDmvnNIctjhc=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-query";
   };
@@ -2927,12 +2927,12 @@
   };
   superhtml = buildGrammar {
     language = "superhtml";
-    version = "0.0.0+rev=6ce62c9";
+    version = "0.0.0+rev=0daae52";
     src = fetchFromGitHub {
       owner = "kristoff-it";
       repo = "superhtml";
-      rev = "6ce62c9f0683f909de7e1601bc866f1db9cf92c9";
-      hash = "sha256-0a3z8QGPbT81mgS59p0RQrTztB4yFkjJdkVL9Ns978E=";
+      rev = "0daae5239bd9366dda0c28c7540d7503b0c104d4";
+      hash = "sha256-dfH7/i/xnjQRMAhzNPkDMhre+lR+pJ/s8aDxXhPqyic=";
     };
     location = "tree-sitter-superhtml";
     meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -3398,12 +3398,12 @@
   };
   vimdoc = buildGrammar {
     language = "vimdoc";
-    version = "0.0.0+rev=9f6191a";
+    version = "0.0.0+rev=ffa29e8";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "tree-sitter-vimdoc";
-      rev = "9f6191a98702edc1084245abd5523279d4b681fb";
-      hash = "sha256-vAKX9Mx+ZYz7c2dWv01GOJN6Wud7pjddg2luAis0Ib4=";
+      rev = "ffa29e863738adfc1496717c4acb7aae92a80ed4";
+      hash = "sha256-bx81EFcS3PZ0uYmsFxElB6qcA9sUjTGu3E6X7T9wEHQ=";
     };
     meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc";
   };
@@ -3498,12 +3498,12 @@
   };
   xresources = buildGrammar {
     language = "xresources";
-    version = "0.0.0+rev=3b1445a";
+    version = "0.0.0+rev=6113943";
     src = fetchFromGitHub {
       owner = "ValdezFOmar";
       repo = "tree-sitter-xresources";
-      rev = "3b1445a48e5ce26b43e37b51dec5abb3bf1fb3e4";
-      hash = "sha256-kMvfqw6/NgOWLsKdJpeQBixEaZQOCWg+2lhadFivIio=";
+      rev = "6113943ab0847a307f3f3c38ff91d9cdfce9d0d9";
+      hash = "sha256-ZqJvLw475e/5KBcJzx0w+aPbGCIAFfdig9cpZ5oaat8=";
     };
     meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
   };

From 717d217d451611e3bf42fae12b19917d2012caab Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 21 Aug 2025 23:27:52 +0200
Subject: [PATCH 2585/3724] kdbg: 3.1.0 -> 3.2.0

---
 pkgs/development/tools/misc/kdbg/default.nix | 40 ++++++++++----------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix
index f442bd561341..349ffc59be2e 100644
--- a/pkgs/development/tools/misc/kdbg/default.nix
+++ b/pkgs/development/tools/misc/kdbg/default.nix
@@ -3,41 +3,39 @@
   stdenv,
   fetchurl,
   cmake,
-  extra-cmake-modules,
-  qt5,
-  ki18n,
-  kconfig,
-  kiconthemes,
-  kxmlgui,
-  kwindowsystem,
-  qtbase,
-  makeWrapper,
+  qt6,
+  kdePackages,
 }:
 
 stdenv.mkDerivation rec {
   pname = "kdbg";
-  version = "3.1.0";
+  version = "3.2.0";
   src = fetchurl {
-    url = "mirror://sourceforge/kdbg/${version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-aLX/0GXof77NqQj7I7FUCZjyDtF1P8MJ4/NHJNm4Yr0=";
+    url = "mirror://sourceforge/kdbg/${version}/kdbg-${version}.tar.gz";
+    hash = "sha256-GoWLKWD/nWXBTiTbDLxeNArDMyPI/gSzADqyOgxrNHE=";
   };
 
   nativeBuildInputs = [
     cmake
-    extra-cmake-modules
-    makeWrapper
+    kdePackages.extra-cmake-modules
+    qt6.wrapQtAppsHook
   ];
   buildInputs = [
-    qt5.qtbase
-    ki18n
-    kconfig
-    kiconthemes
-    kxmlgui
-    kwindowsystem
+    qt6.qt5compat
+    qt6.qtbase
+    kdePackages.ki18n
+    kdePackages.kconfig
+    kdePackages.kiconthemes
+    kdePackages.kxmlgui
+    kdePackages.kwindowsystem
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "BUILD_FOR_KDE_VERSION" "6")
   ];
 
   postInstall = ''
-    wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix}
+    wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}
   '';
 
   dontWrapQtApps = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db14e2e1bb15..4d6173bbe8be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3413,7 +3413,7 @@ with pkgs;
     lua = lua5_2_compat;
   };
 
-  kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { };
+  kdbg = callPackage ../development/tools/misc/kdbg { };
 
   kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { };
 

From 14a1e9ca35203ed2349f2926aac2399e05d80a8c Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 20 Aug 2025 11:32:49 -0700
Subject: [PATCH 2586/3724] Revert "python3Packages.google-cloud-kms: 3.4.1 ->
 3.31.3"

This reverts commit 0b643fb31df5d4ebf74e8188041021dc2a6abb3c.

The automatic update changed the tag from `google-cloud-kms-v` to
`google-cloud-build-v` and picked up the wrong version number.
---
 .../development/python-modules/google-cloud-kms/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix
index 7dafc791f334..b671e36c0c90 100644
--- a/pkgs/development/python-modules/google-cloud-kms/default.nix
+++ b/pkgs/development/python-modules/google-cloud-kms/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-kms";
-  version = "3.31.3";
+  version = "3.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-python";
-    tag = "google-cloud-build-v${version}";
-    hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U=";
+    tag = "google-cloud-kms-v${version}";
+    hash = "sha256-5PzidE1CWN+pt7+gcAtbuXyL/pq6cnn0MCRkBfmeUSw=";
   };
 
   sourceRoot = "${src.name}/packages/google-cloud-kms";

From f81cd13dc5ee39fbfaae30772b9b0a2ef982b037 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 21:51:27 +0000
Subject: [PATCH 2587/3724] skeema: 1.12.3 -> 1.13.0

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

diff --git a/pkgs/by-name/sk/skeema/package.nix b/pkgs/by-name/sk/skeema/package.nix
index a9a84e9c9517..0341610ff3dd 100644
--- a/pkgs/by-name/sk/skeema/package.nix
+++ b/pkgs/by-name/sk/skeema/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "skeema";
-  version = "1.12.3";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "skeema";
     repo = "skeema";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3sxUy/TkacuRN8UDGgrvkdUQi//6VufoYoVFN1+X3BM=";
+    hash = "sha256-rTfB34ELNSJ3VX7cJednWnjx0OGm2r120r5KILFVTUo=";
   };
 
   vendorHash = null;

From 379732e158ae42ccce7fe1e7e4fe0026822c1698 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 21 Aug 2025 23:47:12 +0200
Subject: [PATCH 2588/3724] thrust: remove

---
 pkgs/development/tools/thrust/default.nix | 96 -----------------------
 pkgs/top-level/aliases.nix                |  1 +
 pkgs/top-level/all-packages.nix           |  4 -
 3 files changed, 1 insertion(+), 100 deletions(-)
 delete mode 100644 pkgs/development/tools/thrust/default.nix

diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix
deleted file mode 100644
index 22a3d67bef6d..000000000000
--- a/pkgs/development/tools/thrust/default.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  buildEnv,
-  makeWrapper,
-  glib,
-  alsa-lib,
-  dbus,
-  gtk2,
-  atk,
-  pango,
-  freetype,
-  fontconfig,
-  gdk-pixbuf,
-  cairo,
-  cups,
-  expat,
-  nspr,
-  gconf,
-  nss,
-  xorg,
-  libcap,
-  unzip,
-}:
-
-let
-  thrustEnv = buildEnv {
-    name = "env-thrust";
-    paths = [
-      stdenv.cc.cc
-      glib
-      dbus
-      gtk2
-      atk
-      pango
-      freetype
-      fontconfig
-      gdk-pixbuf
-      cairo
-      cups
-      expat
-      alsa-lib
-      nspr
-      gconf
-      nss
-      xorg.libXrender
-      xorg.libX11
-      xorg.libXext
-      xorg.libXdamage
-      xorg.libXtst
-      xorg.libXcomposite
-      xorg.libXi
-      xorg.libXfixes
-      xorg.libXrandr
-      xorg.libXcursor
-      libcap
-    ];
-  };
-in
-stdenv.mkDerivation rec {
-  pname = "thrust";
-  version = "0.7.6";
-
-  src = fetchurl {
-    url = "https://github.com/breach/thrust/releases/download/v${version}/thrust-v${version}-linux-x64.zip";
-    sha256 = "07rrnlj0gk500pvar4b1wdqm05p4n9yjwn911x93bd2qwc8r5ymc";
-  };
-
-  nativeBuildInputs = [
-    makeWrapper
-    unzip
-  ];
-  buildInputs = [ thrustEnv ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/libexec/thrust
-    unzip -d $out/libexec/thrust/ $src
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      $out/libexec/thrust/thrust_shell
-    wrapProgram $out/libexec/thrust/thrust_shell \
-      --prefix "LD_LIBRARY_PATH" : "${thrustEnv}/lib:${thrustEnv}/lib64"
-    ln -s $out/libexec/thrust/thrust_shell $out/bin
-  '';
-
-  meta = with lib; {
-    description = "Chromium-based cross-platform / cross-language application framework";
-    mainProgram = "thrust_shell";
-    homepage = "https://github.com/breach/thrust";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.mit;
-    maintainers = [ maintainers.osener ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ac417a127764..b10582961968 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1805,6 +1805,7 @@ mapAliases {
   tex-match = throw "'tex-match' has been removed due to lack of maintenance upstream. Consider using 'hieroglyphic' instead"; # Added 2024-09-24
   texinfo5 = throw "'texinfo5' has been removed from nixpkgs"; # Added 2024-09-10
   timescaledb = throw "'timescaledb' has been removed. Use 'postgresqlPackages.timescaledb' instead."; # Added 2025-07-19
+  thrust = throw "'thrust' has been removed due to lack of maintenance"; # Added 2025-08-21
   tsearch_extras = throw "'tsearch_extras' has been removed from nixpkgs"; # Added 2024-12-15
 
   postgresql_12 = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a8280e600fa..02d6c47fc458 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5889,10 +5889,6 @@ with pkgs;
     inherit (ocaml-ng.ocamlPackages_4_14) buildDunePackage;
   };
 
-  thrust = callPackage ../development/tools/thrust {
-    gconf = gnome2.GConf;
-  };
-
   urweb = callPackage ../development/compilers/urweb {
     icu = icu67;
   };

From 6e0313d24e6529571fe1f72f59b1d7c87dde2baf Mon Sep 17 00:00:00 2001
From: Jade Lovelace <jadel@mercury.com>
Date: Wed, 20 Aug 2025 15:23:04 -0700
Subject: [PATCH 2589/3724] default.nix: say which old Nix version is being
 used

We are hitting a long tail of problems at work related to old nix-direnv
sneaking old nix versions in that would be fixed by
https://github.com/nix-community/nix-direnv/pull/513, except that the
issue is that nix-direnv itself is too old.

It would at least be very helpful to print out *what* ancient nix
version is at fault.
---
 default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index bdab048245e2..afba797b01fc 100644
--- a/default.nix
+++ b/default.nix
@@ -6,7 +6,8 @@ if !builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.n
 
   abort ''
 
-    This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade:
+    This version of Nixpkgs requires Nix >= ${requiredVersion} but it is being
+    evaluated with Nix ${builtins.nixVersion or "(too old to know)"}, please upgrade:
 
     - If you are running NixOS, `nixos-rebuild' can be used to upgrade your system.
 

From fd7f32b9fffbbb4666a98aebb1bf8989da31d885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Thu, 21 Aug 2025 23:59:06 +0200
Subject: [PATCH 2590/3724] wasm-tools: 1.236.1 -> 1.237.0

---
 pkgs/by-name/wa/wasm-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix
index b863092bd74a..9b4aeb331765 100644
--- a/pkgs/by-name/wa/wasm-tools/package.nix
+++ b/pkgs/by-name/wa/wasm-tools/package.nix
@@ -6,20 +6,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-tools";
-  version = "1.236.1";
+  version = "1.237.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasm-tools";
     tag = "v${version}";
-    hash = "sha256-kg8I74i5MlsrmFGeHMFDs+FyuCNqNwj8buJE/apRMkg=";
+    hash = "sha256-MTNOGWbMviiNgKN4eIE8DTJmL5v3X4SymdxIn+sGA0M=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
 
-  cargoHash = "sha256-5QUYWhWfmvvmHxlpPNT3nQmRb2D17XGkcHTzwvdjh6g=";
+  cargoHash = "sha256-BC93yiC5AHS0WT561Bi4VhwtSaz3/VTS08fHV8MkPwY=";
   cargoBuildFlags = [
     "--package"
     "wasm-tools"

From d29c0b875ad2b5991efbb6617da22cc54a88a3e1 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 21 Aug 2025 23:24:33 +0200
Subject: [PATCH 2591/3724] python3Packages.ffmpy: 0.6.0 -> 0.6.1

https://github.com/Ch00k/ffmpy/commit/8bc9ffcd478a169171c240581e61ee47de333586 matches our internal patch precisely,
which is the only change between these two versions, so we can easily remove it and bump the package

Diff: https://github.com/Ch00k/ffmpy/compare/0.6.0...0.6.1
---
 pkgs/development/python-modules/ffmpy/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix
index 884899fc994e..a576b37cd48f 100644
--- a/pkgs/development/python-modules/ffmpy/default.nix
+++ b/pkgs/development/python-modules/ffmpy/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "ffmpy";
-  version = "0.6.0";
+  version = "0.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8.1";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Ch00k";
     repo = "ffmpy";
     tag = version;
-    hash = "sha256-U20mBg+428kkka6NY9qc7X8jH8A5bKa++g2+PTn/MYg=";
+    hash = "sha256-u//L2vxucFlWmk1+pdp+iCrpzzMZUonDAn1LELgX86E=";
   };
 
   postPatch =
@@ -37,11 +37,6 @@ buildPythonPackage rec {
       for fname in tests/*.py; do
         echo >>"$fname" 'FFmpeg.__init__.__defaults__ = ("ffmpeg", *FFmpeg.__init__.__defaults__[1:])'
       done
-    ''
-    # uv-build in nixpkgs is now at 0.8.0, which otherwise breaks the constraint set by the package.
-    + ''
-      substituteInPlace pyproject.toml \
-        --replace-fail 'requires = ["uv_build>=0.7.9,<0.8.0"]' 'requires = ["uv_build>=0.7.9,<0.9.0"]'
     '';
 
   pythonImportsCheck = [ "ffmpy" ];

From fd16f5aaa06dced05140db6a0cee3abea861cc75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 22:02:52 +0000
Subject: [PATCH 2592/3724] python3Packages.pyezvizapi: 1.0.1.3 -> 1.0.1.6

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

diff --git a/pkgs/development/python-modules/pyezvizapi/default.nix b/pkgs/development/python-modules/pyezvizapi/default.nix
index 9d8bdbe8af19..ddbf51bcb9d0 100644
--- a/pkgs/development/python-modules/pyezvizapi/default.nix
+++ b/pkgs/development/python-modules/pyezvizapi/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyezvizapi";
-  version = "1.0.1.3";
+  version = "1.0.1.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "RenierM26";
     repo = "pyEzvizApi";
     tag = version;
-    hash = "sha256-V2/Tyo6jLlbyhyQEc5GiB/KvpJ735GuwaLMyHydI5nM=";
+    hash = "sha256-3HiL/l4fYb1T2JSuUgMdws3ae2YofzqDCF4zkmRY2+c=";
   };
 
   build-system = [ setuptools ];

From 63ea54ac57217887c9cf15610821d28781d29d73 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 19 Aug 2025 19:26:35 +0200
Subject: [PATCH 2593/3724] gitea-mcp-server: 0.3.0 -> 0.3.1

---
 pkgs/by-name/gi/gitea-mcp-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitea-mcp-server/package.nix b/pkgs/by-name/gi/gitea-mcp-server/package.nix
index b48424e2d6d3..04389fec7efc 100644
--- a/pkgs/by-name/gi/gitea-mcp-server/package.nix
+++ b/pkgs/by-name/gi/gitea-mcp-server/package.nix
@@ -5,17 +5,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "gitea-mcp-server";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitea {
     domain = "gitea.com";
     owner = "gitea";
     repo = "gitea-mcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hJQ0ryEcPg/WOi54RLZswhWZOjkbllZWOsYyOhe+4AA=";
+    hash = "sha256-wtQMwIm4bQ75t93cWnwEyzpcIA1ZlI2XOVrQJrX0xXo=";
   };
 
-  vendorHash = "sha256-u9jIjrbDUhnaaeBET+pKQTKhaQLUeQvKOXSBfS0vMJM=";
+  vendorHash = "sha256-LZIgADgUUNrMPBdCF0kz4koZUvGfHvzb8T+hwbiIYjs=";
 
   subPackages = [ "." ];
 

From 01513e405ce1ecef6f8c72d51a9b80218ec1b455 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 22:22:01 +0000
Subject: [PATCH 2594/3724] nuclei: 3.4.7 -> 3.4.8

---
 pkgs/by-name/nu/nuclei/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix
index 229fff436b98..fedced71e028 100644
--- a/pkgs/by-name/nu/nuclei/package.nix
+++ b/pkgs/by-name/nu/nuclei/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "nuclei";
-  version = "3.4.7";
+  version = "3.4.8";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei";
     tag = "v${version}";
-    hash = "sha256-UlcMHbN41jY8T5aGlUvobzEUDopAzyI7pqs9SpzuPWU=";
+    hash = "sha256-SESLzN2Fc+GY4ztJ8V9GfSb/Ja88PPpgptJLL2jx1SI=";
   };
 
-  vendorHash = "sha256-W/lnL2bcYIBFKt9vNiKLkas/QB3100DSdhW6yUN1MOY=";
+  vendorHash = "sha256-cDK0xP3vHRVBeFK2dKDnaCNge7EBKkMcrYen12XI7G0=";
 
   proxyVendor = true; # hash mismatch between Linux and Darwin
 

From d50d8f6aa513dd0a4731e4ccd3c4232f09a9ebf0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 22:50:13 +0000
Subject: [PATCH 2595/3724] golines: 0.12.2 -> 0.13.0

---
 pkgs/by-name/go/golines/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/golines/package.nix b/pkgs/by-name/go/golines/package.nix
index a978a7ded4f8..4ccb3c97d892 100644
--- a/pkgs/by-name/go/golines/package.nix
+++ b/pkgs/by-name/go/golines/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "golines";
-  version = "0.12.2";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "segmentio";
     repo = "golines";
     rev = "v${version}";
-    sha256 = "sha256-D0gI9BA0vgM1DBqwolNTfPsTCWuOGrcu5gAVFEdyVGg=";
+    sha256 = "sha256-Y4q3xpGw8bAi87zJ48+LVbdgOc7HB1lRdYhlsF1YcVA=";
   };
 
-  vendorHash = "sha256-jI3/m1UdZMKrS3H9jPhcVAUCjc1G/ejzHi9SCTy24ak=";
+  vendorHash = "sha256-94IXh9iBAE0jJXovaElY8oFdXE6hxYg0Ww0ZEHLnEwc=";
 
   meta = with lib; {
     description = "Golang formatter that fixes long lines";

From 621f6631f13d39a87a396cd6216f6c703dc0a42b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 22:55:29 +0000
Subject: [PATCH 2596/3724] fx: 39.0.1 -> 39.0.2

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

diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix
index ff7a3448c29e..7a8ca9a84f2a 100644
--- a/pkgs/by-name/fx/fx/package.nix
+++ b/pkgs/by-name/fx/fx/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "fx";
-  version = "39.0.1";
+  version = "39.0.2";
 
   src = fetchFromGitHub {
     owner = "antonmedv";
     repo = "fx";
     tag = finalAttrs.version;
-    hash = "sha256-KVnPESE0Fp1liOZtpDgNpAggROnGHYdefAAECkbgZDE=";
+    hash = "sha256-fsUKdKbH+H1PD5khhIubL1DT3Qc6dLaooKe5UCXlYk0=";
   };
 
   vendorHash = "sha256-7x0nbgMzEJznDH6Wf5iaTYXLh/2IGUSeSVvb0UKKTOQ=";

From 110fc438fdae42a9b3621c625a282221c6bcc463 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Fri, 22 Aug 2025 06:57:16 +0800
Subject: [PATCH 2597/3724] miru: drop

The binaries released upstream are not trustworthy. Packaging from source is discouraged by upstream. The new version provides a poor user experience for nixpkgs users.
---
 pkgs/by-name/mi/miru/darwin.nix  | 39 ----------------------
 pkgs/by-name/mi/miru/linux.nix   | 43 -------------------------
 pkgs/by-name/mi/miru/package.nix | 55 --------------------------------
 pkgs/by-name/mi/miru/update.sh   | 52 ------------------------------
 pkgs/top-level/aliases.nix       |  1 +
 5 files changed, 1 insertion(+), 189 deletions(-)
 delete mode 100644 pkgs/by-name/mi/miru/darwin.nix
 delete mode 100644 pkgs/by-name/mi/miru/linux.nix
 delete mode 100644 pkgs/by-name/mi/miru/package.nix
 delete mode 100755 pkgs/by-name/mi/miru/update.sh

diff --git a/pkgs/by-name/mi/miru/darwin.nix b/pkgs/by-name/mi/miru/darwin.nix
deleted file mode 100644
index 42aabead4c49..000000000000
--- a/pkgs/by-name/mi/miru/darwin.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  stdenvNoCC,
-  fetchurl,
-  unzip,
-  makeWrapper,
-
-  pname,
-  version,
-  meta,
-  passthru,
-}:
-stdenvNoCC.mkDerivation rec {
-  inherit
-    pname
-    version
-    meta
-    passthru
-    ;
-
-  src = fetchurl {
-    url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/mac-Miru-${version}-mac.zip";
-    hash = "sha256-V4Vo9fuQ0X7Q6CBM7Akh3+MrgQOBgCuC41khFatYWi4=";
-  };
-
-  sourceRoot = ".";
-
-  nativeBuildInputs = [
-    unzip
-    makeWrapper
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/{bin,Applications}
-    cp -r Miru.app $out/Applications/
-    makeWrapper $out/Applications/Miru.app/Contents/MacOS/Miru $out/bin/miru
-    runHook postInstall
-  '';
-}
diff --git a/pkgs/by-name/mi/miru/linux.nix b/pkgs/by-name/mi/miru/linux.nix
deleted file mode 100644
index b04d2df6b219..000000000000
--- a/pkgs/by-name/mi/miru/linux.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  fetchurl,
-  makeWrapper,
-  appimageTools,
-
-  pname,
-  version,
-  meta,
-  passthru,
-}:
-
-appimageTools.wrapType2 rec {
-  inherit
-    pname
-    version
-    meta
-    passthru
-    ;
-
-  src = fetchurl {
-    url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage";
-    name = "${pname}-${version}.AppImage";
-    hash = "sha256-nLPqEI6u5NNQ/kPbXRWPG0pIwutKNK2J8JeTPN6wHlg=";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  extraInstallCommands =
-    let
-      contents = appimageTools.extractType2 { inherit pname version src; };
-    in
-    ''
-      mkdir -p "$out/share/applications"
-      mkdir -p "$out/share/lib/miru"
-      cp -r ${contents}/{locales,resources} "$out/share/lib/miru"
-      cp -r ${contents}/usr/* "$out"
-      cp "${contents}/${pname}.desktop" "$out/share/applications/"
-      # https://github.com/ThaUnknown/miru/issues/562
-      # Miru does not work under wayland currently, so force it to use X11
-      wrapProgram $out/bin/miru --set ELECTRON_OZONE_PLATFORM_HINT x11
-      substituteInPlace $out/share/applications/${pname}.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
-    '';
-}
diff --git a/pkgs/by-name/mi/miru/package.nix b/pkgs/by-name/mi/miru/package.nix
deleted file mode 100644
index f4ad906c56d8..000000000000
--- a/pkgs/by-name/mi/miru/package.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  stdenv,
-  lib,
-  callPackage,
-}:
-let
-  pname = "miru";
-  version = "5.5.10";
-  meta = {
-    description = "Stream anime torrents, real-time with no waiting for downloads";
-    homepage = "https://miru.watch";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [
-      d4ilyrun
-    ];
-    mainProgram = "miru";
-
-    platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin;
-    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
-
-    longDescription = ''
-      A pure JS BitTorrent streaming environment, with a built-in list manager.
-      Imagine qBit + Taiga + MPV, all in a single package, but streamed real-time.
-      Completely ad free with no tracking/data collection.
-
-      This app is meant to feel look, work and perform like a streaming website/app,
-      while providing all the advantages of torrenting, like file downloads,
-      higher download speeds, better video quality and quicker releases.
-
-      Unlike qBit's sequential, seeking into undownloaded data will prioritise downloading that data,
-      instead of flat out closing MPV.
-    '';
-  };
-  passthru = {
-    updateScript = ./update.sh;
-  };
-in
-if stdenv.hostPlatform.isDarwin then
-  callPackage ./darwin.nix {
-    inherit
-      pname
-      version
-      meta
-      passthru
-      ;
-  }
-else
-  callPackage ./linux.nix {
-    inherit
-      pname
-      version
-      meta
-      passthru
-      ;
-  }
diff --git a/pkgs/by-name/mi/miru/update.sh b/pkgs/by-name/mi/miru/update.sh
deleted file mode 100755
index e2d2cba736a6..000000000000
--- a/pkgs/by-name/mi/miru/update.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq gnused
-
-set -euo pipefail
-
-ROOT="$(dirname "$(readlink -f "$0")")"
-if [[ ! "$(basename $ROOT)" == "miru" || ! -f "$ROOT/package.nix" ]]; then
-    echo "error: Not in the miru folder" >&2
-    exit 1
-fi
-
-PACKAGE_NIX="$ROOT/package.nix"
-LINUX_NIX="$ROOT/linux.nix"
-DARWIN_NIX="$ROOT/darwin.nix"
-
-MIRU_LATEST_VER="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/ThaUnknown/miru/releases/latest" | jq -r .tag_name | sed 's/^v//')"
-MIRU_CURRENT_VER="$(grep -oP 'version = "\K[^"]+' "$PACKAGE_NIX")"
-
-if [[ "$MIRU_LATEST_VER" == "null" ]]; then
-    echo "error: could not fetch miru latest version from GitHub API" >&2
-    exit 1
-fi
-
-if [[ "$MIRU_LATEST_VER" == "$MIRU_CURRENT_VER" ]]; then
-    echo "miru is up-to-date"
-    exit 0
-fi
-
-get_hash() {
-    # $1: URL
-    nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "$1")"
-}
-
-replace_hash_in_file() {
-    # $1: file
-    # $2: new hash
-    sed -i "s#hash = \".*\"#hash = \"$2\"#g" "$1"
-}
-
-replace_version_in_file() {
-    # $1: file
-    # $2: new version
-    sed -i "s#version = \".*\";#version = \"$2\";#g" "$1"
-}
-
-MIRU_LINUX_HASH="$(get_hash "https://github.com/ThaUnknown/miru/releases/download/v${MIRU_LATEST_VER}/linux-Miru-${MIRU_LATEST_VER}.AppImage")"
-MIRU_DARWIN_HASH="$(get_hash "https://github.com/ThaUnknown/miru/releases/download/v${MIRU_LATEST_VER}/mac-Miru-${MIRU_LATEST_VER}-mac.zip")"
-
-replace_hash_in_file "$LINUX_NIX" "$MIRU_LINUX_HASH"
-replace_hash_in_file "$DARWIN_NIX" "$MIRU_DARWIN_HASH"
-
-replace_version_in_file "$PACKAGE_NIX" "$MIRU_LATEST_VER"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eb9c5f9ddad4..ff8fc17424dc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1323,6 +1323,7 @@ mapAliases {
   minetestserver = luanti-server; # Added 2024-11-11
   minetest-touch = luanti-client; # Added 2024-08-12
   minizip2 = pkgs.minizip-ng; # Added 2022-12-28
+  miru = throw "'miru' has been removed due to lack maintenance"; # Added 2025-08-21
   mmsd = throw "'mmsd' has been removed due to being unmaintained upstream. Consider using 'mmsd-tng' instead"; # Added 2025-06-07
   mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17
   mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17

From d4a2195349afbe0191e973c49f258d5a49d9c6f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 23:13:48 +0000
Subject: [PATCH 2598/3724] python3Packages.craft-application: 5.6.3 -> 5.6.5

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

diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix
index 9e8d86e6d3b6..5a31b052eb8e 100644
--- a/pkgs/development/python-modules/craft-application/default.nix
+++ b/pkgs/development/python-modules/craft-application/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "craft-application";
-  version = "5.6.3";
+  version = "5.6.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "craft-application";
     tag = version;
-    hash = "sha256-jsDh9LhZ0uZuAe7VwHFZ5rgu1zHDxW7yVanCiYXXExs=";
+    hash = "sha256-1TQolHJDyuUxUBv7ATI0Gqedi9y2q/sU1JAS2eYYcqc=";
   };
 
   postPatch = ''

From 1eebcad9d6ca6e106040e5a1c1735be5a565042d Mon Sep 17 00:00:00 2001
From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com>
Date: Fri, 22 Aug 2025 01:14:23 +0200
Subject: [PATCH 2599/3724] syncthingtray: 1.7.10 -> 2.0.0

changelog: https://github.com/Martchus/syncthingtray/releases/tag/v2.0.0
---
 pkgs/applications/misc/syncthingtray/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index bd18dd05a9da..1b9a825d7ad2 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -38,14 +38,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.7.10";
+  version = "2.0.0";
   pname = "syncthingtray";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "syncthingtray";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ik/UKemhSuhe3oXPPLAR/qKO7J4Mq35zimixVHNj7go=";
+    hash = "sha256-OtAHejLNHumlZUPy3HRKF/lne3y2VXul1FlAMyrz6dc=";
   };
 
   buildInputs = [

From 0e24e32ce7d256a92d88826382060e4bc0aef41c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 23:24:57 +0000
Subject: [PATCH 2600/3724] devspace: 6.3.16 -> 6.3.17

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

diff --git a/pkgs/by-name/de/devspace/package.nix b/pkgs/by-name/de/devspace/package.nix
index 7f4586d9418c..0cba8fd7831c 100644
--- a/pkgs/by-name/de/devspace/package.nix
+++ b/pkgs/by-name/de/devspace/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "devspace";
-  version = "6.3.16";
+  version = "6.3.17";
 
   src = fetchFromGitHub {
     owner = "devspace-sh";
     repo = "devspace";
     rev = "v${version}";
-    hash = "sha256-MkH38rzeHnw3kf7HEPFVJIUzm+dcmplD92+tw4dyOyE=";
+    hash = "sha256-b0eRiPt4g8JEoQPdl3qXsEXuYIy+VvVBU8/cPIqW/20=";
   };
 
   vendorHash = null;

From ff63eca997423e6fc29c72912c4a06bdbbb7f5f8 Mon Sep 17 00:00:00 2001
From: dmkhitaryan <davtot111@icloud.com>
Date: Thu, 21 Aug 2025 13:27:21 +0200
Subject: [PATCH 2601/3724] flameshot: 13.0.1 -> 13.1.0

---
 .../fl/flameshot/load-missing-deps.patch      | 41 ++++++++-----------
 pkgs/by-name/fl/flameshot/macos-build.patch   | 23 ++++-------
 pkgs/by-name/fl/flameshot/package.nix         |  5 ++-
 3 files changed, 28 insertions(+), 41 deletions(-)

diff --git a/pkgs/by-name/fl/flameshot/load-missing-deps.patch b/pkgs/by-name/fl/flameshot/load-missing-deps.patch
index 0d97e252a007..848f5cdaeebe 100644
--- a/pkgs/by-name/fl/flameshot/load-missing-deps.patch
+++ b/pkgs/by-name/fl/flameshot/load-missing-deps.patch
@@ -1,9 +1,15 @@
---- a/CMakeLists.txt	2025-08-15 11:37:20
-+++ b/CMakeLists.txt	2025-08-15 11:40:06
-@@ -29,21 +29,7 @@
- if(EXISTS "${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets/CMakeLists.txt")
-     add_subdirectory("${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets" EXCLUDE_FROM_ALL)
- else()
+--- a/CMakeLists.txt	2025-08-21 13:12:55
++++ b/CMakeLists.txt	2025-08-21 13:16:26
+@@ -24,28 +24,8 @@
+ #Needed due to linker error with QtColorWidget
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ 
++find_package(QtColorWidgets REQUIRED)
+ 
+-# Dependency can be fetched via flatpak builder
+-if(EXISTS "${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets/CMakeLists.txt")
+-    add_subdirectory("${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets" EXCLUDE_FROM_ALL)
+-else()
 -    FetchContent_Declare(
 -        qtColorWidgets
 -        GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git
@@ -19,25 +25,12 @@
 -  else()
 -      FetchContent_MakeAvailable(qtColorWidgets)
 -  endif()
-+    find_package(QtColorWidgets REQUIRED)
- endif()
- 
+-endif()
+-
  # This can be read from ${PROJECT_NAME} after project() is called
-@@ -115,12 +101,7 @@
-   if(EXISTS "${CMAKE_SOURCE_DIR}/external/KDSingleApplication/CMakeLists.txt")
-     add_subdirectory("${CMAKE_SOURCE_DIR}/external/KDSingleApplication")
-   else()
--    FetchContent_Declare(
--        kdsingleApplication
--        GIT_REPOSITORY https://github.com/KDAB/KDSingleApplication.git
--        GIT_TAG v1.2.0
--    )
--    FetchContent_MakeAvailable(KDSingleApplication)
-+    find_package(KDSingleApplication-qt6 REQUIRED)
-   endif()
- endif()
- 
-@@ -128,12 +109,7 @@
+ if (APPLE)
+   set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
+@@ -133,12 +113,7 @@
  option(BUILD_STATIC_LIBS ON)
  
  if (APPLE)
diff --git a/pkgs/by-name/fl/flameshot/macos-build.patch b/pkgs/by-name/fl/flameshot/macos-build.patch
index 3c18ac8e0eef..5d5691dfff63 100644
--- a/pkgs/by-name/fl/flameshot/macos-build.patch
+++ b/pkgs/by-name/fl/flameshot/macos-build.patch
@@ -1,18 +1,11 @@
---- a/src/CMakeLists.txt	2025-08-12 16:34:27
-+++ b/src/CMakeLists.txt	2025-08-15 11:45:56
-@@ -220,7 +220,7 @@
- 
-   target_link_libraries(
-           flameshot
--          kdsingleapplication
-+          kdsingleapplication-qt6
-   )
- endif()
- 
-@@ -447,64 +447,3 @@
+--- a/src/CMakeLists.txt	2025-08-21 13:12:55
++++ b/src/CMakeLists.txt	2025-08-21 13:18:55
+@@ -449,66 +449,4 @@
+     else ()
+         message(WARNING "Unable to find executable windeployqt.")
      endif ()
- endif ()
- 
+-endif ()
+-
 -# macdeployqt
 -if (APPLE)
 -# Code signing settings - optional, set to empty string to skip signing
@@ -73,4 +66,4 @@
 -   endif()
 -
 -
--endif ()
+ endif ()
diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix
index 5419f6cb8a65..3f71fa56f40d 100644
--- a/pkgs/by-name/fl/flameshot/package.nix
+++ b/pkgs/by-name/fl/flameshot/package.nix
@@ -18,17 +18,18 @@ assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flameshot";
-  version = "13.0.1";
+  version = "13.1.0";
 
   src = fetchFromGitHub {
     owner = "flameshot-org";
     repo = "flameshot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Zo+rhvpwhcYqgn8PZ0b48sCb/YWqGSormFnY6pbY8Qc=";
+    hash = "sha256-Wg0jc1AqgetaESmTyhzAHx3zal/5DMDum7fzhClqeck=";
   };
 
   cmakeFlags = [
     "-DCMAKE_CXX_FLAGS=-I${kdsingleapplication}/include/kdsingleapplication-qt6"
+    (lib.cmakeBool "USE_BUNDLED_KDSINGLEAPPLICATION" false)
     (lib.cmakeBool "DISABLE_UPDATE_CHECKER" true)
     (lib.cmakeBool "USE_MONOCHROME_ICON" enableMonochromeIcon)
   ]

From 0167f996fd9a87a82e3fcf0ae732889e3676fee5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 23:28:57 +0000
Subject: [PATCH 2602/3724] devenv: 1.8.1 -> 1.8.2

---
 pkgs/by-name/de/devenv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index 03b67dee3e2b..b50a71452fe2 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -30,7 +30,7 @@ let
         __intentionallyOverridingVersion = true;
       });
 
-  version = "1.8.1";
+  version = "1.8.2";
 in
 rustPlatform.buildRustPackage {
   pname = "devenv";
@@ -40,10 +40,10 @@ rustPlatform.buildRustPackage {
     owner = "cachix";
     repo = "devenv";
     tag = "v${version}";
-    hash = "sha256-YsSFlVWUu4RSYnObqcBJ4Mr3bJVVhuFhaQAktHytBAI=";
+    hash = "sha256-j1IujIUZFdKKv33ldsptrcbe0avAX725SYhGtNrGJcI=";
   };
 
-  cargoHash = "sha256-zJorGAsp5k5oBuXogYqEPVexcNsYCeiTmrQqySd1AGs=";
+  cargoHash = "sha256-NNfqmdnDIKmp1upkBwJMp+VirSYsUXJNgGbAzcHs8LY=";
 
   buildAndTestSubdir = "devenv";
 

From 57d00f085573f1bf3efc6e39481686c5abe86f9c Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 21 Aug 2025 18:10:29 -0400
Subject: [PATCH 2603/3724] cargo-tauri: cleanup dependencies

This removes the {,webkit}gtk dependencies that aren't directly used by
the CLI, while explicitly declaring the some dependencies that
were previously being pulled in through {,webkit}gtk or just vendored by
crates
---
 pkgs/by-name/ca/cargo-tauri/package.nix   | 30 ++++++++++++++---------
 pkgs/by-name/ca/cargo-tauri_1/package.nix |  3 +++
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index 317b40b2735a..f2acfc74c8e1 100644
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -1,14 +1,14 @@
 {
   lib,
   stdenv,
+  bzip2,
   callPackage,
   rustPlatform,
   fetchFromGitHub,
-  gtk4,
   nix-update-script,
-  openssl,
   pkg-config,
-  webkitgtk_4_1,
+  xz,
+  zstd,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -24,19 +24,27 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-nkY1ydc2VewRwY+B5nR68mz8Ff3FK1KoHE4dLzNtPkY=";
 
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    openssl
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    gtk4
-    webkitgtk_4_1
+  nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
+    pkg-config
   ];
 
+  buildInputs =
+    # Required for tauri-macos-sign and RPM support in tauri-bundler
+    lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
+      bzip2
+      xz
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      zstd
+    ];
+
   cargoBuildFlags = [ "--package tauri-cli" ];
   cargoTestFlags = cargoBuildFlags;
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isLinux {
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+  };
+
   passthru = {
     # See ./doc/hooks/tauri.section.md
     hook = callPackage ./hook.nix { };
diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix
index 453295d5fa78..cc05adcca3cb 100644
--- a/pkgs/by-name/ca/cargo-tauri_1/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix
@@ -8,6 +8,7 @@
   gtk3,
   libsoup_2_4,
   openssl,
+  pkg-config,
   webkitgtk_4_0,
 }:
 
@@ -36,6 +37,8 @@ cargo-tauri.overrideAttrs (
       hash = "sha256-t5sR02qC06H7A2vukwyZYKA2XMVUzJrgIOYuNSf42mE=";
     };
 
+    nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ pkg-config ];
+
     buildInputs = [
       openssl
     ]

From 91d17ed9d768ca106a92eda767ba2daa4401ae79 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 21 Aug 2025 19:25:50 -0400
Subject: [PATCH 2604/3724] cargo-tauri: rec -> finalAttrs

---
 pkgs/by-name/ca/cargo-tauri/package.nix   | 14 +++++++-------
 pkgs/by-name/ca/cargo-tauri_1/package.nix |  5 +----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index f2acfc74c8e1..bf466fd86d9c 100644
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -11,14 +11,14 @@
   zstd,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tauri";
   version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "tauri";
-    tag = "tauri-cli-v${version}";
+    tag = "tauri-cli-v${finalAttrs.version}";
     hash = "sha256-0J55AvAvvqTVls4474GcgLPBtSC+rh8cXVKluMjAVBE=";
   };
 
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
     ];
 
   cargoBuildFlags = [ "--package tauri-cli" ];
-  cargoTestFlags = cargoBuildFlags;
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
 
   env = lib.optionalAttrs stdenv.hostPlatform.isLinux {
     ZSTD_SYS_USE_PKG_CONFIG = true;
@@ -47,10 +47,10 @@ rustPlatform.buildRustPackage rec {
 
   passthru = {
     # See ./doc/hooks/tauri.section.md
-    hook = callPackage ./hook.nix { };
+    hook = callPackage ./hook.nix { cargo-tauri = finalAttrs.finalPackage; };
 
     tests = {
-      hook = callPackage ./test-app.nix { };
+      hook = callPackage ./test-app.nix { cargo-tauri = finalAttrs.finalPackage; };
     };
 
     updateScript = nix-update-script {
@@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Build smaller, faster, and more secure desktop applications with a web frontend";
     homepage = "https://tauri.app/";
-    changelog = "https://github.com/tauri-apps/tauri/releases/tag/${src.tag}";
+    changelog = "https://github.com/tauri-apps/tauri/releases/tag/tauri-cli-v${finalAttrs.version}";
     license = with lib.licenses; [
       asl20 # or
       mit
@@ -76,4 +76,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "cargo-tauri";
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix
index cc05adcca3cb..03ba763bb62d 100644
--- a/pkgs/by-name/ca/cargo-tauri_1/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix
@@ -4,7 +4,6 @@
   rustPlatform,
   fetchFromGitHub,
   cargo-tauri,
-  cargo-tauri_1,
   gtk3,
   libsoup_2_4,
   openssl,
@@ -48,9 +47,7 @@ cargo-tauri.overrideAttrs (
       webkitgtk_4_0
     ];
 
-    passthru = {
-      hook = cargo-tauri.hook.override { cargo-tauri = cargo-tauri_1; };
-    };
+    passthru = { inherit (oldAttrs.passthru) hook; };
 
     meta = {
       inherit (oldAttrs.meta)

From 3b64826e42b843d33baf3f20456f0a8c10052081 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Fri, 22 Aug 2025 00:45:25 +0200
Subject: [PATCH 2605/3724] update-python-libraries: support GitHub
 repositories with tag releases only

Certain repositories such as https://github.com/django/asgiref do not
contain any stable releases in the GitHub parlance but tags.

Those tags are still releases.

These repositories are important.

Let's expand the capabilities of update-python-libraries to make the
life of the hero making Python packages up-to-date.

Change-Id: Ifc7a3ecca42fc6b449f3f2dffc7b4e7651c0f0ba
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 .../update-python-libraries/update-python-libraries.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py
index 0c8f81c763f6..b8e1b81b437a 100755
--- a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py
+++ b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py
@@ -283,7 +283,14 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t
     releases = list(filter(lambda x: not x["prerelease"], all_releases))
 
     if len(releases) == 0:
-        raise ValueError(f"{homepage} does not contain any stable releases")
+        logging.warning(f"{homepage} does not contain any stable releases, looking for tags instead...")
+        url = f"https://api.github.com/repos/{owner}/{repo}/tags"
+        all_tags = _fetch_github(url)
+        # Releases are used with a couple of fields that tags possess as well. We will fake these releases.
+        releases = [{'tag_name': tag['name'], 'tarball_url': tag['tarball_url']} for tag in all_tags]
+
+    if len(releases) == 0:
+        raise ValueError(f"{homepage} does not contain any stable releases neither tags, stopping now.")
 
     versions = map(lambda x: strip_prefix(x["tag_name"]), releases)
     version = _determine_latest_version(current_version, target, versions)
@@ -457,6 +464,7 @@ def _update_package(path, target):
             successful_fetch = True
             break
         except ValueError:
+            logging.exception(f"Failed to fetch releases for {pname}")
             continue
 
     if not successful_fetch:

From e039bafe45c2e8128a3eea84d4845917b3616bcf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 23:52:43 +0000
Subject: [PATCH 2606/3724] sby: 0.55 -> 0.56

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

diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix
index 7f01f8466315..8ac2b53c0824 100644
--- a/pkgs/by-name/sb/sby/package.nix
+++ b/pkgs/by-name/sb/sby/package.nix
@@ -19,13 +19,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sby";
-  version = "0.55";
+  version = "0.56";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "sby";
     tag = "v${version}";
-    hash = "sha256-Q02CLx8GYu7Rnngd03kRGstYVOm8mBl7JsP0bYOFtDg=";
+    hash = "sha256-uKndGUoLbG7SBhsOSYyM/v9g33pq7zFFajzvTUYa7NY=";
   };
 
   nativeCheckInputs = [

From ca436e95e26d97efd31bcf748767d291d1bdaf69 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 21 Aug 2025 19:54:47 -0400
Subject: [PATCH 2607/3724] cargo-tauri: add version test

---
 pkgs/by-name/ca/cargo-tauri/package.nix   | 2 ++
 pkgs/by-name/ca/cargo-tauri_1/package.nix | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index bf466fd86d9c..befe5011f2dc 100644
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -7,6 +7,7 @@
   fetchFromGitHub,
   nix-update-script,
   pkg-config,
+  testers,
   xz,
   zstd,
 }:
@@ -51,6 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     tests = {
       hook = callPackage ./test-app.nix { cargo-tauri = finalAttrs.finalPackage; };
+      version = testers.testVersion { package = finalAttrs.finalPackage; };
     };
 
     updateScript = nix-update-script {
diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix
index 03ba763bb62d..9c82a73ca686 100644
--- a/pkgs/by-name/ca/cargo-tauri_1/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix
@@ -47,7 +47,10 @@ cargo-tauri.overrideAttrs (
       webkitgtk_4_0
     ];
 
-    passthru = { inherit (oldAttrs.passthru) hook; };
+    passthru = {
+      inherit (oldAttrs.passthru) hook;
+      tests = { inherit (oldAttrs.passthru.tests) version; };
+    };
 
     meta = {
       inherit (oldAttrs.meta)

From 1f9e69f7535e03f12e103bf2a655681a9cca6955 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 21 Aug 2025 19:08:00 -0400
Subject: [PATCH 2608/3724] cargo-tauri_1: cleanup dependencies

This removes the {,webkit}gtk dependencies that aren't directly used by
the CLI, while explicitly declaring the some dependencies that
were previously being pulled in through {,webkit}gtk or just vendored by
crates
---
 pkgs/by-name/ca/cargo-tauri_1/package.nix | 26 ++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix
index 9c82a73ca686..0facf494764b 100644
--- a/pkgs/by-name/ca/cargo-tauri_1/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix
@@ -1,14 +1,13 @@
 {
   lib,
   stdenv,
-  rustPlatform,
+  bzip2,
   fetchFromGitHub,
-  cargo-tauri,
-  gtk3,
-  libsoup_2_4,
-  openssl,
   pkg-config,
-  webkitgtk_4_0,
+  rustPlatform,
+  xz,
+  zstd,
+  cargo-tauri,
 }:
 
 cargo-tauri.overrideAttrs (
@@ -39,13 +38,16 @@ cargo-tauri.overrideAttrs (
     nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ pkg-config ];
 
     buildInputs = [
-      openssl
+      # Required by `zip` in `tauri-bundler`
+      bzip2
+      zstd
     ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      gtk3
-      libsoup_2_4
-      webkitgtk_4_0
-    ];
+    # Required by `rpm` in `tauri-bundler`
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ xz ];
+
+    env = {
+      ZSTD_SYS_USE_PKG_CONFIG = true;
+    };
 
     passthru = {
       inherit (oldAttrs.passthru) hook;

From e3a9a74a5e3e7fdcdf71a2b79dd7a74dddc7a229 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 21 Aug 2025 19:41:57 -0400
Subject: [PATCH 2609/3724] cargo-tauri_1: 1.8.1 -> 1.6.6

This appears to be a downgrade, but is actually a upgrade!

Previously this package tracked the main `tauri` crate, and not the
actual CLI. Oops.

Diff: https://github.com/tauri-apps/tauri/compare/tauri-v1.8.1...tauri-cli-v1.6.6

Changelog: https://github.com/tauri-apps/tauri/releases/tag/tauri-cli-v1.6.6
---
 pkgs/by-name/ca/cargo-tauri_1/package.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix
index 0facf494764b..fd19b708fdcd 100644
--- a/pkgs/by-name/ca/cargo-tauri_1/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   bzip2,
-  fetchFromGitHub,
   pkg-config,
   rustPlatform,
   xz,
@@ -11,28 +10,25 @@
 }:
 
 cargo-tauri.overrideAttrs (
-  newAttrs: oldAttrs: {
-    version = "1.8.1";
+  finalAttrs: oldAttrs: {
+    version = "1.6.6";
 
-    src = fetchFromGitHub {
-      owner = "tauri-apps";
-      repo = "tauri";
-      rev = "tauri-v${newAttrs.version}";
-      hash = "sha256-z8dfiLghN6m95PLCMDgpBMNo+YEvvsGN9F101fAcVF4=";
+    src = oldAttrs.src.override {
+      hash = "sha256-UE/mJ0WdbVT4E1YuUCtu80UB+1WR+KRWs+4Emy3Nclc=";
     };
 
     # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
     # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
-    sourceRoot = "${newAttrs.src.name}/tooling/cli";
+    sourceRoot = "${finalAttrs.src.name}/tooling/cli";
 
     cargoDeps = rustPlatform.fetchCargoVendor {
-      inherit (newAttrs)
+      inherit (finalAttrs)
         pname
         version
         src
         sourceRoot
         ;
-      hash = "sha256-t5sR02qC06H7A2vukwyZYKA2XMVUzJrgIOYuNSf42mE=";
+      hash = "sha256-kAaq6Kam3e5n8569Y4zdFEiClI8q97XFX1hBD7NkUqw=";
     };
 
     nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ pkg-config ];

From 601a1d80f1921210569ef3cdf96309ddac8539ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 21 Aug 2025 23:58:29 +0000
Subject: [PATCH 2610/3724] pnpm_10: 10.14.0 -> 10.15.0

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

diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 189f18727da5..abe35197b783 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -16,8 +16,8 @@ let
       hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
     };
     "10" = {
-      version = "10.14.0";
-      hash = "sha256-KXU05l1YQkUFOcHoAiyIMateH+LrdGZHh6gVUZVC1iA=";
+      version = "10.15.0";
+      hash = "sha256-hMGeeI19fuJI5Ka3FS+Ou6D0/nOApfRDyhfXbAMAUtI=";
     };
   };
 

From 50de9e5ef36d64f09a397c42ae00399ccbf67772 Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sat, 16 Aug 2025 16:51:27 +0000
Subject: [PATCH 2611/3724] python312Packages.langchain-chroma: 0.2.4 -> 0.2.5

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

diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix
index 7b0c8ed4ca24..211cb58a1c78 100644
--- a/pkgs/development/python-modules/langchain-chroma/default.nix
+++ b/pkgs/development/python-modules/langchain-chroma/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-chroma";
-  version = "0.2.4";
+  version = "0.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-chroma==${version}";
-    hash = "sha256-w4xvPPLYkPiQA34bimVHLe+vghMI9Pq36CHoE/EMnr8=";
+    hash = "sha256-iOPhtDVsB2f6Jwr47aK3kaWAJEChNeVz7rS7slCUt04=";
   };
 
   sourceRoot = "${src.name}/libs/partners/chroma";

From e4105a277f4ed8abc4977e1eaf56f8a0a37b2978 Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sat, 16 Aug 2025 16:53:43 +0000
Subject: [PATCH 2612/3724] python312Packages.langchain-anthropic: 0.3.17 ->
 0.3.18

---
 .../python-modules/langchain-anthropic/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-anthropic/default.nix b/pkgs/development/python-modules/langchain-anthropic/default.nix
index 56bffb3d8dcb..69feac9399db 100644
--- a/pkgs/development/python-modules/langchain-anthropic/default.nix
+++ b/pkgs/development/python-modules/langchain-anthropic/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-anthropic";
-  version = "0.3.17";
+  version = "0.3.18";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-anthropic==${version}";
-    hash = "sha256-oUT4Mu/vG+bVF6zLQX2RbVUglJ6VMyBt8XtCBSlBlpU=";
+    hash = "sha256-ZedCz4FyKowhxLVpHrBsmGKHkMCA5yW7ui6LI0QGQ44=";
   };
 
   sourceRoot = "${src.name}/libs/partners/anthropic";

From 0915bf8d453892c64db6845e301577a2e3cb8dc6 Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sat, 16 Aug 2025 16:54:36 +0000
Subject: [PATCH 2613/3724] python312Packages.langchain-groq: 0.3.6 -> 0.3.7

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

diff --git a/pkgs/development/python-modules/langchain-groq/default.nix b/pkgs/development/python-modules/langchain-groq/default.nix
index 58d01224f502..e0bdf7d2db2b 100644
--- a/pkgs/development/python-modules/langchain-groq/default.nix
+++ b/pkgs/development/python-modules/langchain-groq/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-groq";
-  version = "0.3.6";
+  version = "0.3.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-groq==${version}";
-    hash = "sha256-f0s8fBT1+uZbatWSPehKfrGYGotBFeNixCiGaAc753o=";
+    hash = "sha256-++9I6t5nED6Nm35X4TVIZ3wCClKXU97QqmSJ0p7YChM=";
   };
 
   sourceRoot = "${src.name}/libs/partners/groq";

From 3852b2b0460f48c777242ced7c7a6c6fdfe2cc70 Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sat, 16 Aug 2025 16:55:22 +0000
Subject: [PATCH 2614/3724] python312Packages.langchain-huggingface: 0.3.0 ->
 0.3.1

---
 .../python-modules/langchain-huggingface/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix
index 0d267785c342..c6953f29790e 100644
--- a/pkgs/development/python-modules/langchain-huggingface/default.nix
+++ b/pkgs/development/python-modules/langchain-huggingface/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-huggingface";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-huggingface==${version}";
-    hash = "sha256-+7fxCw4YYyfXwXw30lf1Xb01aj01C6X0B5yUrNPQzNY=";
+    hash = "sha256-nae7KwCKjkvenOO8vErxFQStHolc+N8EUuK6U8r48Kc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/huggingface";

From 02c65eb2df4479c4fd7470fb1bc8fd2e865182dd Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sat, 16 Aug 2025 16:55:24 +0000
Subject: [PATCH 2615/3724] python312Packages.langchain-google-genai: 2.1.8 ->
 2.1.9

---
 .../python-modules/langchain-google-genai/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-google-genai/default.nix b/pkgs/development/python-modules/langchain-google-genai/default.nix
index c1b2989e55e5..9ebf4abbc76d 100644
--- a/pkgs/development/python-modules/langchain-google-genai/default.nix
+++ b/pkgs/development/python-modules/langchain-google-genai/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-google-genai";
-  version = "2.1.8";
+  version = "2.1.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-google";
     tag = "libs/genai/v${version}";
-    hash = "sha256-ObeQuxBEiJhR2AgkFeIZ1oe2GxhhQywRA8eCALOwkT8=";
+    hash = "sha256-9jXiX4WDx5YY39MytuzAWGuDzLkGmtq95ShAIW3zH0U=";
   };
 
   sourceRoot = "${src.name}/libs/genai";

From 8fafe8114162120349f30b0ac351aa9e2694f5ff Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Thu, 21 Aug 2025 20:03:45 -0400
Subject: [PATCH 2616/3724] embellish: 0.4.7 -> 0.5.1

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

diff --git a/pkgs/by-name/em/embellish/package.nix b/pkgs/by-name/em/embellish/package.nix
index 0c7256568c0e..6911f0fb0595 100644
--- a/pkgs/by-name/em/embellish/package.nix
+++ b/pkgs/by-name/em/embellish/package.nix
@@ -6,6 +6,7 @@
   ninja,
   pkg-config,
   glib,
+  blueprint-compiler,
   gobject-introspection,
   gtk4,
   desktop-file-utils,
@@ -19,13 +20,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "embellish";
-  version = "0.4.7";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "getnf";
     repo = "embellish";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+tTuQNok2rqTcQR4CRMc4qRqw0Ah2rovIut618z9GhU=";
+    hash = "sha256-Db7/vo9LVE7IeFFHx/BKs+qxzsvuB+6ZLRb7A1NHrxQ=";
   };
 
   nativeBuildInputs = [
@@ -33,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     glib
+    blueprint-compiler
     gobject-introspection
     gtk4
     gettext

From 0794997950561d7eb8fee8c68f7c9e67736fe162 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 22 Aug 2025 01:06:10 +0200
Subject: [PATCH 2617/3724] jenkins: 2.516.1 -> 2.516.2

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/je/jenkins/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix
index b82aa1457c04..d4731991b1c3 100644
--- a/pkgs/by-name/je/jenkins/package.nix
+++ b/pkgs/by-name/je/jenkins/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jenkins";
-  version = "2.516.1";
+  version = "2.516.2";
 
   src = fetchurl {
     url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
-    hash = "sha256-wwiifoH0zjqmeH6WyvdxU09/IG/vu4OWnXexX8fycAo=";
+    hash = "sha256-7WucCZXXgGLgVcekKgVbZRh8TSbqNvubSdjy3Ya8b8g=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From d5ffbd6c32212f512339607a9e2098c69eca436c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 22:56:09 +0000
Subject: [PATCH 2618/3724] gh: 2.76.2 -> 2.78.0

---
 pkgs/by-name/gh/gh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix
index d50bb232cbd7..94c85072b714 100644
--- a/pkgs/by-name/gh/gh/package.nix
+++ b/pkgs/by-name/gh/gh/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "2.76.2";
+  version = "2.78.0";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-tIA2zFXGmnaTuhO6UNzlk01/20CPg5RQ4Kz1UMmbTGc=";
+    hash = "sha256-hrOyXAyWfJPNRKYPBsE1yaBdyvI4q9rJW2XgtBeZv20=";
   };
 
-  vendorHash = "sha256-NXyqWeiESkLVb2Bb88MoD+4ssvfOy0HGHFAOrT83t0c=";
+  vendorHash = "sha256-2wOh1Jw+dVBD7omzDzWPwDFJ9jHqSG/3+fd4e/1zVIk=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 73d3b32c3f4e578347aefb5573b1b6dd0e8c3715 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Thu, 21 Aug 2025 14:32:11 -0500
Subject: [PATCH 2619/3724] topiary: 0.6.0 -> 0.6.1

---
 pkgs/by-name/to/topiary/package.nix | 36 +++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/to/topiary/package.nix b/pkgs/by-name/to/topiary/package.nix
index 9391a437a739..79439f3a1d25 100644
--- a/pkgs/by-name/to/topiary/package.nix
+++ b/pkgs/by-name/to/topiary/package.nix
@@ -8,22 +8,21 @@
   versionCheckHook,
   nix-update-script,
 }:
-
 rustPlatform.buildRustPackage rec {
   pname = "topiary";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "tweag";
     repo = "topiary";
     tag = "v${version}";
-    hash = "sha256-nRVxjdEtYvgF8Vpw0w64hUd1scZh7f+NjFtbTg8L5Qc=";
+    hash = "sha256-CyqZhkzAOqC3xWhwUzCpkDO0UFsO0S4/3sV7zIILiVg=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  cargoHash = "sha256-EqalIF1wx3F/5CiD21IaYsPdks6Mv1VfwL8OTRWsWaU=";
+  cargoHash = "sha256-akAjn9a7dMwjPSNveDY2KJ62evjHCAWpRR3A7Ghkb5A=";
 
   # https://github.com/NixOS/nixpkgs/pull/359145#issuecomment-2542418786
   depsExtraArgs.postBuild = ''
@@ -42,6 +41,31 @@ rustPlatform.buildRustPackage rec {
 
   # Skip tests that cannot be executed in sandbox (operation not permitted)
   checkFlags = [
+    "--skip=formatted_query_tester"
+    "--skip=test_coverage::coverage_input_bash"
+    "--skip=test_coverage::coverage_input_css"
+    "--skip=test_coverage::coverage_input_json"
+    "--skip=test_coverage::coverage_input_nickel"
+    "--skip=test_coverage::coverage_input_ocaml"
+    "--skip=test_coverage::coverage_input_ocamllex"
+    "--skip=test_coverage::coverage_input_openscad"
+    "--skip=test_coverage::coverage_input_sdml"
+    "--skip=test_coverage::coverage_input_toml"
+    "--skip=test_coverage::coverage_input_tree_sitter_query"
+    "--skip=test_coverage::coverage_input_wit"
+    "--skip=test_fmt::fmt_input_bash"
+    "--skip=test_fmt::fmt_input_css"
+    "--skip=test_fmt::fmt_input_json"
+    "--skip=test_fmt::fmt_input_nickel"
+    "--skip=test_fmt::fmt_input_ocaml"
+    "--skip=test_fmt::fmt_input_ocaml_interface"
+    "--skip=test_fmt::fmt_input_ocamllex"
+    "--skip=test_fmt::fmt_input_openscad"
+    "--skip=test_fmt::fmt_input_sdml"
+    "--skip=test_fmt::fmt_input_toml"
+    "--skip=test_fmt::fmt_input_tree_sitter_query"
+    "--skip=test_fmt::fmt_input_wit"
+    "--skip=test_fmt::fmt_queries"
     "--skip=test_fmt_dir"
     "--skip=test_fmt_files"
     "--skip=test_fmt_files_query_fallback"
@@ -50,9 +74,7 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_fmt_stdin_query"
     "--skip=test_fmt_stdin_query_fallback"
     "--skip=test_vis"
-    "--skip=formatted_query_tester"
-    "--skip=input_output_tester"
-    "--skip=coverage_tester"
+    "--skip=test_vis_invalid"
   ];
 
   env.TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/queries";

From c47d779ed356b392c849eb79be02d6c40ae4807c Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Thu, 21 Aug 2025 16:45:17 -0700
Subject: [PATCH 2620/3724] npingler: init at unstable-2025-08-21

---
 pkgs/by-name/np/npingler/package.nix | 32 ++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/np/npingler/package.nix

diff --git a/pkgs/by-name/np/npingler/package.nix b/pkgs/by-name/np/npingler/package.nix
new file mode 100644
index 000000000000..6223a0eaac79
--- /dev/null
+++ b/pkgs/by-name/np/npingler/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "npingler";
+  version = "unstable-2025-08-21";
+
+  src = fetchFromGitHub {
+    owner = "9999years";
+    repo = "npingler";
+    rev = "de47bb5c5c188ba3b36958c2284dbc6d24f2687f";
+    hash = "sha256-4Q8oG2iem9dgsTTEFfhyw2rPAxtXdGx+Uhb/9uAdUy4=";
+  };
+
+  cargoHash = "sha256-wTW0cwi6C2WRlH2ifPMTdLAEZg4VbE5Jr5Mh+e+SjaM=";
+
+  meta = {
+    description = "Nix profile manager for use with npins";
+    homepage = "https://github.com/9999years/npingler";
+    license = lib.licenses.mit;
+    maintainers = [
+      lib.maintainers._9999years
+    ];
+    mainProgram = "npingler";
+  };
+
+  passthru.updateScript = nix-update-script { };
+}

From 7ff6e06d6634f9507cd10f9397771dfa247b57fd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 10:31:30 +1000
Subject: [PATCH 2621/3724] python3Packages.aiorussound: 4.8.0 -> 4.8.1
 (#435627)

https://github.com/noahhusby/aiorussound/releases/tag/4.8.1
---
 pkgs/development/python-modules/aiorussound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix
index dd636bfcfbad..6122a3431cff 100644
--- a/pkgs/development/python-modules/aiorussound/default.nix
+++ b/pkgs/development/python-modules/aiorussound/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "aiorussound";
-  version = "4.8.0";
+  version = "4.8.1";
   pyproject = true;
 
   # requires newer f-strings introduced in 3.12
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "noahhusby";
     repo = "aiorussound";
     tag = version;
-    hash = "sha256-JKHuCDabW/OuwM+Kcm8lkLqgql8fhEuTL5pVEGibwzY=";
+    hash = "sha256-LagnFE5aWEoNYbthE01cM0fQBEGDF0ReJzSTvteg2BU=";
   };
 
   build-system = [ poetry-core ];

From 048507355c6e8069c47642fc037da6d34b95acef Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Aug 2025 02:11:51 +0200
Subject: [PATCH 2622/3724] buildPythonPackage: use nix-update as the default
 update script

Much more robust and supports various fetchers like cargo, npm or yarn.
---
 doc/release-notes/rl-2511.section.md                  |  2 ++
 .../interpreters/python/mk-python-derivation.nix      | 11 ++---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 885948c0ea3a..01fa21d1f229 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -127,6 +127,8 @@
   recommendation](https://clickhouse.com/docs/faq/operations/production). Users
   can continue to use the `clickhouse-lts` package if desired.
 
+- `buildPythonPackage` and `buildPythonApplication` now default to `nix-update-script` as their default `updateScript`. This should improve automated updates, since nix-update is better maintained than the in-tree update script and has more robust fetcher support.
+
 ## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 9d392bfcb95a..e634df7a1e96 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -10,7 +10,7 @@
   # Whether the derivation provides a Python module or not.
   toPythonModule,
   namePrefix,
-  update-python-libraries,
+  nix-update-script,
   setuptools,
   pypaBuildHook,
   pypaInstallHook,
@@ -399,14 +399,7 @@ let
         inherit disabled;
       }
       // {
-        updateScript =
-          let
-            filename = head (splitString ":" finalAttrs.finalPackage.meta.position);
-          in
-          [
-            update-python-libraries
-            filename
-          ];
+        updateScript = nix-update-script { };
       }
       // optionalAttrs (dependencies != [ ]) {
         inherit dependencies;

From 0ee68bd683ba0f4d39a01821812b3e35ca6a1322 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 00:37:31 +0000
Subject: [PATCH 2623/3724] libretro.fbneo: 0-unstable-2025-08-13 ->
 0-unstable-2025-08-19

---
 pkgs/applications/emulators/libretro/cores/fbneo.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix
index 54de29fbc44a..ed4c98411327 100644
--- a/pkgs/applications/emulators/libretro/cores/fbneo.nix
+++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fbneo";
-  version = "0-unstable-2025-08-13";
+  version = "0-unstable-2025-08-19";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "fbneo";
-    rev = "525a07bd5abd52481a653dc790b987b8f50d0686";
-    hash = "sha256-O1QEvQ2ZZ7rU6KObV1hFaYLVWwDZ6Lu30JMbln7Z7DA=";
+    rev = "7345d0f50079ca989e3685152687f1ee15bad829";
+    hash = "sha256-MohvlQtLtDq6GGOL3nAbRGUdbJDnc0nTgSQKlUGWDBU=";
   };
 
   makefile = "Makefile";

From 87a1fbce27f33ea3159d5c533fa41c4951ebd63d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 00:39:26 +0000
Subject: [PATCH 2624/3724] libretro.mame: 0-unstable-2025-08-03 ->
 0-unstable-2025-08-18

---
 pkgs/applications/emulators/libretro/cores/mame.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix
index e6758d63c089..471993cb12f2 100644
--- a/pkgs/applications/emulators/libretro/cores/mame.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame.nix
@@ -9,13 +9,13 @@
 }:
 mkLibretroCore {
   core = "mame";
-  version = "0-unstable-2025-08-03";
+  version = "0-unstable-2025-08-18";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame";
-    rev = "9c05f5b1ed748394cc8ef83a77873c6c9ab9a6a5";
-    hash = "sha256-b/Qwto3draMZOD7a6IHxQwQmaKf11v/r/sOS2oCrGVg=";
+    rev = "d9f594146b6c43b7b15ee2569d1175e62030f0cb";
+    hash = "sha256-sQZUuAwCYy4YKaiPPt+0q8lblqb7U7kiGWk2kYK3Kmk=";
     fetchSubmodules = true;
   };
 

From bc3869f8ae2289ae9db8f0c8b55b3377bcd3e160 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Aug 2025 02:39:29 +0200
Subject: [PATCH 2625/3724] python3Packages.aioamazondevices: 4.0.1 -> 5.0.0

https://github.com/chemelli74/aioamazondevices/blob/v5.0.0/CHANGELOG.md
---
 pkgs/development/python-modules/aioamazondevices/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix
index 817451a12539..435c52643f15 100644
--- a/pkgs/development/python-modules/aioamazondevices/default.nix
+++ b/pkgs/development/python-modules/aioamazondevices/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "aioamazondevices";
-  version = "4.0.1";
+  version = "5.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aioamazondevices";
     tag = "v${version}";
-    hash = "sha256-FTIACTsDFg+TUvtQOI46ecOZxFmyeUSlOZm9xXAlkhY=";
+    hash = "sha256-MB7CRYHT4V7JvNFkdX9x/fMRkJrHwF4XnQ2eH0kD8Ng=";
   };
 
   build-system = [ poetry-core ];

From 5249452c32c3a0db4b1b69eea09bef1ae210a695 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Aug 2025 02:39:54 +0200
Subject: [PATCH 2626/3724] python3Packages.bleak-retry-connector: 4.0.1 ->
 4.3.0

https://github.com/bluetooth-devices/bleak-retry-connector/blob/v4.3.0/CHANGELOG.md
---
 .../python-modules/bleak-retry-connector/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix
index 33f3bddbf267..2a6ebf9bcd95 100644
--- a/pkgs/development/python-modules/bleak-retry-connector/default.nix
+++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "bleak-retry-connector";
-  version = "4.0.1";
+  version = "4.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bleak-retry-connector";
     tag = "v${version}";
-    hash = "sha256-6x9n8DG7nyGLFCcPAEyIy3sWZ4sthgFT24/Owv0KTsQ=";
+    hash = "sha256-NqJBxWuFr+vMOt3Yjwaey7SPII/KNc22NKAb2DLXtKM=";
   };
 
   build-system = [ poetry-core ];

From 7ecfb2b81d69f622cbc61a1dd16685c7f2e899cd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Aug 2025 02:40:15 +0200
Subject: [PATCH 2627/3724] python3Packages.boschshcpy: 0.2.105 -> 0.2.107

https://github.com/tschamm/boschshcpy/compare/0.2.105...0.2.107
---
 pkgs/development/python-modules/boschshcpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix
index 5334e90c3c4d..93b76a8b7dcd 100644
--- a/pkgs/development/python-modules/boschshcpy/default.nix
+++ b/pkgs/development/python-modules/boschshcpy/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "boschshcpy";
-  version = "0.2.105";
+  version = "0.2.107";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "tschamm";
     repo = "boschshcpy";
     tag = version;
-    hash = "sha256-aouZryqn2qMdfqTFXP49UUY0X1HzQCldLQUBfnlUfHI=";
+    hash = "sha256-JHOaviN8pjG/VcYCZUk7vRTLKCfj5TMCQYo+dNDdX5I=";
   };
 
   build-system = [ setuptools ];

From d02c0d75c24ae57c916066490231f8c5e85aba4a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Aug 2025 02:41:53 +0200
Subject: [PATCH 2628/3724] python3Packages.imgw-pib: 1.5.3 -> 1.5.4

https://github.com/bieniu/imgw-pib/releases/tag/1.5.4
---
 pkgs/development/python-modules/imgw-pib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/imgw-pib/default.nix b/pkgs/development/python-modules/imgw-pib/default.nix
index 8aee6a1bbbe0..74d65d88f72f 100644
--- a/pkgs/development/python-modules/imgw-pib/default.nix
+++ b/pkgs/development/python-modules/imgw-pib/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "imgw-pib";
-  version = "1.5.3";
+  version = "1.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bieniu";
     repo = "imgw-pib";
     tag = version;
-    hash = "sha256-rsR1ZlbNCAlJmiTefgJ4gurGaC17z/kKgDHpuMkyxz8=";
+    hash = "sha256-IRT0tEVKQ1ebvRtBsdf30DII1U6vjV2/MTk7PoC9zd4=";
   };
 
   build-system = [ setuptools ];

From a5dd736bc26292d79c595e42aa4a0d706e215fcb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Aug 2025 02:42:12 +0200
Subject: [PATCH 2629/3724] python3Packages.onvif-zeep-async: 4.0.3 -> 4.0.4

https://github.com/openvideolibs/python-onvif-zeep-async/releases/tag/v4.0.4
---
 pkgs/development/python-modules/onvif-zeep-async/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix
index 0b48a401535f..3b222f67f0be 100644
--- a/pkgs/development/python-modules/onvif-zeep-async/default.nix
+++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "onvif-zeep-async";
-  version = "4.0.3";
+  version = "4.0.4";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "openvideolibs";
     repo = "python-onvif-zeep-async";
     tag = "v${version}";
-    hash = "sha256-xffbMz8NZpazLw3uRPMNv5i23yk6RmOBCgE1gSj9d7A=";
+    hash = "sha256-IZ48CB4+C+XS/Qt51hohurdQoJ1uANus/PodtZ9ZpCY=";
   };
 
   build-system = [ setuptools ];

From e6cbfd03eb4586d04c587c256b9f7ff86b8f3db2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Aug 2025 02:42:42 +0200
Subject: [PATCH 2630/3724] python3Packages.opower: 0.15.1 -> 0.15.2

https://github.com/tronikos/opower/releases/tag/v0.15.2
---
 pkgs/development/python-modules/opower/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index c980deaaba50..7b75db2db8f9 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "opower";
-  version = "0.15.1";
+  version = "0.15.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tronikos";
     repo = "opower";
     tag = "v${version}";
-    hash = "sha256-FB9m1aFEqbqLYfg5cMhZMLvp9ENsudQqf5dXKnGtZkA=";
+    hash = "sha256-2Zt0mzsAEF+h2gE1mBkRqa5u+EFPRXtdF3WOUHjbnCk=";
   };
 
   build-system = [ setuptools ];

From 3584d5b358a83cdbd249b0727e2b40edda3174c8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Aug 2025 02:43:00 +0200
Subject: [PATCH 2631/3724] python3Packages.pyatmo: 9.2.1 -> 9.2.3

https://github.com/jabesq/pyatmo/blob/v9.2.3/CHANGELOG.md
---
 pkgs/development/python-modules/pyatmo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix
index ac91832f43f2..770f9c2444c3 100644
--- a/pkgs/development/python-modules/pyatmo/default.nix
+++ b/pkgs/development/python-modules/pyatmo/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pyatmo";
-  version = "9.2.1";
+  version = "9.2.3";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "jabesq";
     repo = "pyatmo";
     tag = "v${version}";
-    hash = "sha256-vSyZsWhqyQqKFukD6GbtkAJd3QBmRwdmRIYD19DXQW0=";
+    hash = "sha256-czHn5pgiyQwn+78NQnJDo49knstL9m2Gp3neZeb75js=";
   };
 
   pythonRelaxDeps = [

From 609fa5101d7fc8ed47efc959e72484c84bf2d253 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Aug 2025 02:43:23 +0200
Subject: [PATCH 2632/3724] python3Packages.pysmartthings: 3.2.8 -> 3.2.9

https://github.com/andrewsayre/pysmartthings/releases/tag/v3.2.9
---
 pkgs/development/python-modules/pysmartthings/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix
index d9a34b383192..c72c040bc56e 100644
--- a/pkgs/development/python-modules/pysmartthings/default.nix
+++ b/pkgs/development/python-modules/pysmartthings/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pysmartthings";
-  version = "3.2.8";
+  version = "3.2.9";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "andrewsayre";
     repo = "pysmartthings";
     tag = "v${version}";
-    hash = "sha256-bTE4N2TwrAyi0NZcj/GghLZ7Vq4eoc9mQH2OBeCfHn8=";
+    hash = "sha256-5buCkZ+VBZFHId616YxTUPNVd1QRh+bO0OBq0JL4dvo=";
   };
 
   build-system = [ poetry-core ];

From e0a11f197072707040a556f31d68522f0c93afd7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Aug 2025 02:46:55 +0200
Subject: [PATCH 2633/3724] python3Packages.zcc-helper: 3.5.2 -> 3.6

https://bitbucket.org/mark_hannon/zcc/branches/compare/release_3.6%0Drelease_3.5.2
---
 .../development/python-modules/zcc-helper/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/zcc-helper/default.nix b/pkgs/development/python-modules/zcc-helper/default.nix
index a53b5f032f71..2a12bb60cb67 100644
--- a/pkgs/development/python-modules/zcc-helper/default.nix
+++ b/pkgs/development/python-modules/zcc-helper/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "zcc-helper";
-  version = "3.5.2";
+  version = "3.6";
   pyproject = true;
 
   src = fetchFromBitbucket {
     owner = "mark_hannon";
     repo = "zcc";
     rev = "release_${version}";
-    hash = "sha256-6cpLpzzJPoyWaldXZzptV2LY5aYmRtVf0rd1Ye71VG0=";
+    hash = "sha256-93zSEGr5y00+heuG0hTME+BkLQBUmHnXXMH12ktMtM4=";
   };
 
   build-system = [ setuptools ];
@@ -26,13 +26,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTestPaths = [
-    # tests require running a server
-    "tests/test_controller.py"
-    # fixture 'when' not found
-    "tests/test_socket.py"
-  ];
-
   meta = {
     description = "ZIMI ZCC helper module";
     homepage = "https://bitbucket.org/mark_hannon/zcc";

From 3ff189497e58c45242490afb843462851bbdec16 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Aug 2025 02:47:05 +0200
Subject: [PATCH 2634/3724] home-assistant: 2025.8.2 -> 2025.8.3

https://github.com/home-assistant/core/releases/tag/2025.8.3
---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/default.nix            | 6 +++---
 pkgs/servers/home-assistant/frontend.nix           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 913c646f41f0..a9dd1981e23c 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2025.8.2";
+  version = "2025.8.3";
   components = {
     "3_day_blinds" =
       ps: with ps; [
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 17410219fc5e..9eb40aa68e00 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -341,7 +341,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2025.8.2";
+  hassVersion = "2025.8.3";
 
 in
 python.pkgs.buildPythonApplication rec {
@@ -362,13 +362,13 @@ python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-z/wEYitbn8D0LEUTnBfDWfeo+NdDxX42Ifz2D5pbM8I=";
+    hash = "sha256-FiaRCXWEn1AsLaLH88hfZjMNeRcmP5uNJxxFvEW5K3c=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-6VnXCc6NWwKUQWmIB/xJmR2AZgfXEXh8DNmoKzSY3GI=";
+    hash = "sha256-X7G9SAN1t4OPLdyRu/Fwfq70JWu5k1F6Qgz8YgP4jis=";
   };
 
   build-system = with python.pkgs; [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index e4ef9c1c508b..0119ef48a07d 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20250811.0";
+  version = "20250811.1";
   format = "wheel";
 
   src = fetchPypi {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-x//iMjNup4bf3PpvISYkHxOXKH20J2s+6oWQ22gS4BI=";
+    hash = "sha256-26qhkFf0m4Pf/k8drf6RvT5YFHXma2aP/k5a/gIkqoo=";
   };
 
   # there is nothing to strip in this package

From 5f59f7353042cd4a66766bff99c992e77919c2ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 00:56:20 +0000
Subject: [PATCH 2635/3724] geph: 0.2.77 -> 0.2.82

---
 pkgs/by-name/ge/geph/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix
index c304623e7b94..67d47bc8ad16 100644
--- a/pkgs/by-name/ge/geph/package.nix
+++ b/pkgs/by-name/ge/geph/package.nix
@@ -24,16 +24,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "geph5";
-  version = "0.2.77";
+  version = "0.2.82";
 
   src = fetchFromGitHub {
     owner = "geph-official";
     repo = "geph5";
     rev = "geph5-client-v${finalAttrs.version}";
-    hash = "sha256-xm2eSCLIPYydR8iwMlZyc/M6bFrUZRqL5yZUXuYdk/k=";
+    hash = "sha256-z4f6XoMSjMmq+Uf8A/6M+aJs6oDJGdMffVflwc0Q2so=";
   };
 
-  cargoHash = "sha256-DNk4BQoY8m3OmglXMZzGstl9aC+LhZq9EN0OLW7sBrw=";
+  cargoHash = "sha256-PhLNS6DdCisQ8sOWm1V72UJpLZX4gVNkt1779mmMB1c=";
 
   postPatch = ''
     substituteInPlace binaries/geph5-client/src/vpn/*.sh \

From a9127140bf70a08911f2def32d1e2c6d74c3de86 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Fri, 22 Aug 2025 08:58:00 +0800
Subject: [PATCH 2636/3724] zbackup: drop

The upstream section has not been maintained for nearly 10 years.
---
 pkgs/tools/backup/zbackup/default.nix         | 54 -------------------
 .../backup/zbackup/protobuf-api-change.patch  | 11 ----
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 --
 4 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 pkgs/tools/backup/zbackup/default.nix
 delete mode 100644 pkgs/tools/backup/zbackup/protobuf-api-change.patch

diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix
deleted file mode 100644
index 21df241f7db8..000000000000
--- a/pkgs/tools/backup/zbackup/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  protobufc,
-  libunwind,
-  lzo,
-  openssl,
-  protobuf,
-  zlib,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "zbackup";
-  version = "1.4.4";
-
-  src = fetchFromGitHub {
-    owner = "zbackup";
-    repo = "zbackup";
-    rev = version;
-    hash = "sha256-9Fk4EhEeQ2J4Kirc7oad4CzmW70Mmza6uozd87qfgZI=";
-  };
-
-  patches = [
-    # compare with https://github.com/zbackup/zbackup/pull/158;
-    # but that doesn't apply cleanly to this version
-    ./protobuf-api-change.patch
-  ];
-
-  # zbackup uses dynamic exception specifications which are not
-  # allowed in C++17
-  env.NIX_CFLAGS_COMPILE = toString [ "--std=c++14" ];
-
-  buildInputs = [
-    zlib
-    openssl
-    protobuf
-    lzo
-    libunwind
-  ];
-  nativeBuildInputs = [
-    cmake
-    protobufc
-  ];
-
-  meta = {
-    description = "Versatile deduplicating backup tool";
-    mainProgram = "zbackup";
-    homepage = "http://zbackup.org/";
-    platforms = lib.platforms.linux;
-    license = lib.licenses.gpl2Plus;
-  };
-}
diff --git a/pkgs/tools/backup/zbackup/protobuf-api-change.patch b/pkgs/tools/backup/zbackup/protobuf-api-change.patch
deleted file mode 100644
index d071709878be..000000000000
--- a/pkgs/tools/backup/zbackup/protobuf-api-change.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/backup_restorer.cc
-+++ b/backup_restorer.cc
-@@ -48,7 +48,7 @@
-   // TODO: this disables size checks for each separate message. Figure a better
-   // way to do this while keeping them enabled. It seems we need to create an
-   // instance of CodedInputStream for each message, but it might be expensive
--  cis.SetTotalBytesLimit( backupData.size(), -1 );
-+  cis.SetTotalBytesLimit( backupData.size() );
- 
-   // Used when emitting chunks
-   string chunk;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eb9c5f9ddad4..60f883915a11 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2260,6 +2260,7 @@ mapAliases {
   z3_4_8 = throw "'z3_4_8' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
   zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'.";
   zabbix64 = throw "'zabbix64' has been removed because it reached its End of Life. Consider upgrading to 'zabbix70'.";
+  zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22
   zeroadPackages = recurseIntoAttrs {
     zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22
     zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a08d4f67c496..da8ac99d5844 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4617,10 +4617,6 @@ with pkgs;
   # To expose more packages for Yi, override the extraPackages arg.
   yi = callPackage ../applications/editors/yi/wrapper.nix { };
 
-  zbackup = callPackage ../tools/backup/zbackup {
-    protobuf = protobuf_21;
-  };
-
   zbar = libsForQt5.callPackage ../tools/graphics/zbar { };
 
   # Nvidia support does not require any proprietary libraries, so CI can build it.

From c24b121fc528e2636872dfc4207f14f2b152e991 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 15:50:57 +0200
Subject: [PATCH 2637/3724] esphome: 2025.7.5 -> 2025.8.0

https://github.com/esphome/esphome/releases/tag/2025.8.0
---
 pkgs/by-name/es/esphome/dashboard.nix | 6 +++---
 pkgs/by-name/es/esphome/package.nix   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix
index cdbab8d18f13..301bb8ae675b 100644
--- a/pkgs/by-name/es/esphome/dashboard.nix
+++ b/pkgs/by-name/es/esphome/dashboard.nix
@@ -13,19 +13,19 @@
 
 buildPythonPackage rec {
   pname = "esphome-dashboard";
-  version = "20250514.0";
+  version = "20250814.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "dashboard";
     rev = "refs/tags/${version}";
-    hash = "sha256-t0+YlITnxgnLrK/SN0bSmMIv3djR9DKMlnFrR9Btwx8=";
+    hash = "sha256-WQsyv3s3LKKOwYEkX5GcAPnbH061q1ts7TU4HU6I8CI=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-Uiz26kPxoz32t/GRppiYiVBVwWcQqUzPr0kScVUZak8=";
+    hash = "sha256-ShuJPS7qP2XZ3lwJrFeKRkQwX7tvyiC/0L7sGn0cMn8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index ef77f7baaf53..8ddc1417ae04 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -34,14 +34,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2025.7.5";
+  version = "2025.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "esphome";
     tag = version;
-    hash = "sha256-f6HBgjg6yiFCQk6hIvQMYw+5/KjIVvUJaK+c/xmIseM=";
+    hash = "sha256-LOHsiSiqeCLrKLcVfAiPZl54aDTaYuKw073h0XMDiTE=";
   };
 
   build-system = with python.pkgs; [

From d6febe133b10d5157e1773a9f5612c8ea48699f6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 16:38:47 +0200
Subject: [PATCH 2638/3724] python3Packages.esp-idf-size: init at 1.7.1

---
 .../python-modules/esp-idf-size/default.nix   | 59 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/development/python-modules/esp-idf-size/default.nix

diff --git a/pkgs/development/python-modules/esp-idf-size/default.nix b/pkgs/development/python-modules/esp-idf-size/default.nix
new file mode 100644
index 000000000000..71b492d97f74
--- /dev/null
+++ b/pkgs/development/python-modules/esp-idf-size/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  pyyaml,
+  rich,
+
+  # tests
+  esptool,
+  jsonschema,
+  pytestCheckHook,
+  distutils,
+}:
+
+buildPythonPackage rec {
+  pname = "esp-idf-size";
+  version = "1.7.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "espressif";
+    repo = "esp-idf-size";
+    tag = "v${version}";
+    hash = "sha256-dgvmrwnaipudKyNJ/xFAwvfjGmtDRnFbXxI2VuC/SKo=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pyyaml
+    rich
+  ];
+
+  doCheck = false; # requires ESP-IDF
+
+  nativeCheckInputs = [
+    distutils
+    esptool
+    jsonschema
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "esp_idf_size"
+  ];
+
+  meta = {
+    description = "";
+    homepage = "https://github.com/espressif/esp-idf-size";
+    changelog = "https://github.com/espressif/esp-idf-size/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index afb3dbb3fda4..aafdab065454 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4739,6 +4739,8 @@ self: super: with self; {
 
   esig = callPackage ../development/python-modules/esig { };
 
+  esp-idf-size = callPackage ../development/python-modules/esp-idf-size { };
+
   espeak-phonemizer = callPackage ../development/python-modules/espeak-phonemizer { };
 
   esper = callPackage ../development/python-modules/esper { };

From 3e3263a580b51122ec3be103ba984dc0af3ccdf5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 16:59:08 +0200
Subject: [PATCH 2639/3724] platformio: add more dependencies

---
 pkgs/development/embedded/platformio/core.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix
index 541c119f3051..f0afbb6b5642 100644
--- a/pkgs/development/embedded/platformio/core.nix
+++ b/pkgs/development/embedded/platformio/core.nix
@@ -72,6 +72,7 @@ buildPythonApplication rec {
     click
     click-completion
     colorama
+    esp-idf-size
     git
     intelhex
     lockfile
@@ -81,6 +82,7 @@ buildPythonApplication rec {
     pyserial
     pyyaml
     requests
+    rich-click
     semantic-version
     setuptools
     spdx-license-list-data.json

From f813cdf76be6118b9879a82333aae42d455be447 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 01:00:32 +0000
Subject: [PATCH 2640/3724] cimg: 3.5.5 -> 3.6.0

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

diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix
index 2d3d6d963c98..699f650eb86d 100644
--- a/pkgs/by-name/ci/cimg/package.nix
+++ b/pkgs/by-name/ci/cimg/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cimg";
-  version = "3.5.5";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "GreycLab";
     repo = "CImg";
     tag = "v.${finalAttrs.version}";
-    hash = "sha256-vVRdSjrSCprhxraLzZ531zIYXsqbnnxOcoawJddwvgY=";
+    hash = "sha256-j4WYdLQvNZAMb+16zO4M24CNKJFTITN9VXa1jFKduOk=";
   };
 
   outputs = [

From 8a7385417a9e7da440064acfc0428b3c4bd4c711 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 01:03:48 +0000
Subject: [PATCH 2641/3724] LycheeSlicer: 7.4.2 -> 7.4.3

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

diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix
index 1c859fd9767c..8621e4ce26ca 100644
--- a/pkgs/by-name/ly/LycheeSlicer/package.nix
+++ b/pkgs/by-name/ly/LycheeSlicer/package.nix
@@ -9,11 +9,11 @@
 }:
 let
   pname = "LycheeSlicer";
-  version = "7.4.2";
+  version = "7.4.3";
 
   src = fetchurl {
     url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage";
-    hash = "sha256-RTLlNB6eiesXZayC69hpnXQsAgmPuaJTC+18Q6KzAP0=";
+    hash = "sha256-V+X8aF+uFnhSIm5MC8/EfYwWkLoHqqgT1G5Ozn5Y69I=";
   };
 
   desktopItem = makeDesktopItem {

From 782bfcc37b6e967721f391cb5375c0a1fbcade02 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 21 Aug 2025 21:14:22 -0400
Subject: [PATCH 2642/3724] t4kcommon: drop aanderse as maintainer

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

diff --git a/pkgs/by-name/t4/t4kcommon/package.nix b/pkgs/by-name/t4/t4kcommon/package.nix
index 2cfc91f0b4cf..956002f5a0e7 100644
--- a/pkgs/by-name/t4/t4kcommon/package.nix
+++ b/pkgs/by-name/t4/t4kcommon/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     description = "Library of code shared between tuxmath and tuxtype";
     homepage = "https://github.com/tux4kids/t4kcommon";
     license = licenses.gpl3Plus;
-    maintainers = [ maintainers.aanderse ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }

From ef752176a95effa2af1fa867452380f66a96c938 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 21 Aug 2025 21:14:57 -0400
Subject: [PATCH 2643/3724] tuxtype: drop aanderse as maintainer

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

diff --git a/pkgs/by-name/tu/tuxtype/package.nix b/pkgs/by-name/tu/tuxtype/package.nix
index 3a30f42e1388..b16b77d8d6f7 100644
--- a/pkgs/by-name/tu/tuxtype/package.nix
+++ b/pkgs/by-name/tu/tuxtype/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     mainProgram = "tuxtype";
     homepage = "https://github.com/tux4kids/tuxtype";
     license = licenses.gpl3Plus;
-    maintainers = [ maintainers.aanderse ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }

From d456facdbb5951bc5e61643a6e85615f2f6bb9fc Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 11 Aug 2025 22:59:04 +0200
Subject: [PATCH 2644/3724] lixPackageSets.*.nix-serve-ng: init at
 1.0.1-unstable-2025-05-28

---
 .../development/haskell-modules/configuration-nix.nix |  4 ++++
 pkgs/tools/package-management/lix/default.nix         | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index feb7aa2ef940..7628751f973f 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -354,6 +354,10 @@ builtins.intersectAttrs super {
     (overrideCabal (old: {
       # Doesn't declare boost dependency
       pkg-configDepends = (old.pkg-configDepends or [ ]) ++ [ pkgs.boost.dev ];
+
+      passthru = old.passthru or { } // {
+        tests.lix = pkgs.lixPackageSets.stable.nix-serve-ng;
+      };
     }))
   ];
 
diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index efc0ef628b0a..8877fa03b6ed 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -17,6 +17,8 @@
   nixpkgs-review,
   nix-direnv,
   nix-fast-build,
+  haskell,
+  nix-serve-ng,
   colmena,
 
   storeDir ? "/nix/store",
@@ -110,6 +112,15 @@ let
             inherit (self) nix-eval-jobs;
           };
 
+          nix-serve-ng = lib.pipe (nix-serve-ng.override { nix = self.lix; }) [
+            (haskell.lib.compose.enableCabalFlag "lix")
+            (haskell.lib.compose.overrideCabal (drv: {
+              # https://github.com/aristanetworks/nix-serve-ng/issues/46
+              # Resetting (previous) broken flag since it may be related to C++ Nix
+              broken = lib.versionAtLeast self.lix.version "2.93";
+            }))
+          ];
+
           colmena = colmena.override {
             nix = self.lix;
             inherit (self) nix-eval-jobs;

From a0fd4453b7471db47f6b06a9510efbcc8f9c08ad Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Aug 2025 03:40:35 +0200
Subject: [PATCH 2645/3724] esphome: fix esp32 post-build merging

---
 .../esp32-post-build-esptool-reference.patch        | 13 +++++++++++++
 pkgs/by-name/es/esphome/package.nix                 |  8 ++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/by-name/es/esphome/esp32-post-build-esptool-reference.patch

diff --git a/pkgs/by-name/es/esphome/esp32-post-build-esptool-reference.patch b/pkgs/by-name/es/esphome/esp32-post-build-esptool-reference.patch
new file mode 100644
index 000000000000..6f323145e85f
--- /dev/null
+++ b/pkgs/by-name/es/esphome/esp32-post-build-esptool-reference.patch
@@ -0,0 +1,13 @@
+diff --git a/esphome/components/esp32/post_build.py.script b/esphome/components/esp32/post_build.py.script
+index c99521423..e29821d7e 100644
+--- a/esphome/components/esp32/post_build.py.script
++++ b/esphome/components/esp32/post_build.py.script
+@@ -88,8 +88,6 @@ def merge_factory_bin(source, target, env):
+     output_path = firmware_path.with_suffix(".factory.bin")
+     python_exe = f'"{env.subst("$PYTHONEXE")}"'
+     cmd = [
+-        python_exe,
+-        "-m",
+         "esptool",
+         "--chip",
+         chip,
diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 8ddc1417ae04..fce4a85e7f8c 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -44,6 +44,14 @@ python.pkgs.buildPythonApplication rec {
     hash = "sha256-LOHsiSiqeCLrKLcVfAiPZl54aDTaYuKw073h0XMDiTE=";
   };
 
+  patches = [
+    # Use the esptool executable directly in the ESP32 post build script, that
+    # gets executed by platformio. This is required, because platformio uses its
+    # own python environment through `python -m esptool` and then fails to find
+    # the esptool library.
+    ./esp32-post-build-esptool-reference.patch
+  ];
+
   build-system = with python.pkgs; [
     setuptools
   ];

From 00033acffbd3e7db2e06078d8dd36418653c13d1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Aug 2025 04:32:20 +0200
Subject: [PATCH 2646/3724] python3Packages.homeassistant-stubs: 2025.8.2 ->
 2025.8.3

https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.8.3
---
 pkgs/servers/home-assistant/stubs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 1ab4d285ab48..fe2e3f6babf3 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2025.8.2";
+  version = "2025.8.3";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     tag = version;
-    hash = "sha256-E4/j08PMAi4zetJtBSZWLoCB4NUlgr+wzytfRgybL34=";
+    hash = "sha256-6cCHaWh9k8mWMvjWou90rJEpht4ba/4CGVVqkK0S67E=";
   };
 
   build-system = [

From 4d4fcdbc5a3db39f3e389b7f882698a18a3d7bd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 03:48:31 +0000
Subject: [PATCH 2647/3724] python3Packages.coiled: 1.118.1 -> 1.118.3

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

diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix
index e9141b124cdb..0b2a75ee6c1e 100644
--- a/pkgs/development/python-modules/coiled/default.nix
+++ b/pkgs/development/python-modules/coiled/default.nix
@@ -39,12 +39,12 @@
 
 buildPythonPackage rec {
   pname = "coiled";
-  version = "1.118.1";
+  version = "1.118.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-74LILNrkvopEdEdECe0pwfgwxdGrfXucWf76Vkj95GQ=";
+    hash = "sha256-HjbBZsTqb3D5uh3cBZPFkhe/QbJtnHwduUDCaMl3vc4=";
   };
 
   build-system = [

From a1d86b86b20eb9cf826de47bb69de52acf823aa3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 04:02:18 +0000
Subject: [PATCH 2648/3724] python3Packages.colcon-parallel-executor: 0.3.0 ->
 0.4.0

---
 .../python-modules/colcon-parallel-executor/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/colcon-parallel-executor/default.nix b/pkgs/development/python-modules/colcon-parallel-executor/default.nix
index bcd6cbfdf548..b8fbc7798998 100644
--- a/pkgs/development/python-modules/colcon-parallel-executor/default.nix
+++ b/pkgs/development/python-modules/colcon-parallel-executor/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "colcon-parallel-executor";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "colcon";
     repo = "colcon-parallel-executor";
     tag = version;
-    hash = "sha256-uhVl1fqoyMF/L98PYCmM6m7+52c4mWj2qlna5sz/RxE=";
+    hash = "sha256-JjpVhBpkVNFOsTnY8vEqIre4Hzwg+eDYwrR2iaIC5TA=";
   };
   build-system = [ setuptools ];
 

From d068c48ce7b4afd3972b9a19148411c7340b79cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 04:14:54 +0000
Subject: [PATCH 2649/3724] jackett: 0.22.2196 -> 0.22.2319

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

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index cc98b1ee58fe..0a400e2688e0 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -11,13 +11,13 @@
 
 buildDotnetModule rec {
   pname = "jackett";
-  version = "0.22.2196";
+  version = "0.22.2319";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha512-gyiCv8fXGKdzD9RvbMG0U1XAkacEjYQlmcpcQQ6tRGvbVqjyCPesBjRyDDWz8N//nnDHpZ2A5G5TMv/RzHp71w==";
+    hash = "sha512-JPHm5WkaS31U3PSuKlicGgebDgzt0X58lhXrjqA37iAmv/jpcgLUH732E7pJLza4ERcOBlLwSbOKbEtZhH+ISw==";
   };
 
   projectFile = "src/Jackett.Server/Jackett.Server.csproj";

From f7cb3d5cb7eabe6dbaea25283e6bdec45e287b38 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Thu, 24 Jul 2025 19:44:55 -0400
Subject: [PATCH 2650/3724] python3.pkgs.coloraide: init at 4.7.2

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

diff --git a/pkgs/development/python-modules/coloraide/default.nix b/pkgs/development/python-modules/coloraide/default.nix
new file mode 100644
index 000000000000..88605667912c
--- /dev/null
+++ b/pkgs/development/python-modules/coloraide/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+  typing-extensions,
+}:
+let
+  pname = "coloraide";
+  version = "4.7.2";
+in
+buildPythonPackage {
+  inherit pname version;
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-fomOKtF3hzgJvR9f2x2QYYrYdASf6tlS/0Rw0VdmbUs=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [
+    "coloraide"
+  ];
+
+  meta = {
+    description = "A color library for Python";
+    homepage = "https://pypi.org/project/coloraide/";
+    license = lib.licenses.mit;
+    maintainers = [
+      lib.maintainers._9999years
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aafdab065454..b397360c29ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2801,6 +2801,8 @@ self: super: with self; {
 
   color-parser-py = callPackage ../development/python-modules/color-parser-py { };
 
+  coloraide = callPackage ../development/python-modules/coloraide { };
+
   colorama = callPackage ../development/python-modules/colorama { };
 
   colorcet = callPackage ../development/python-modules/colorcet { };

From a1836985b247bac95bc9ab84443fbe489cdab3f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 04:28:08 +0000
Subject: [PATCH 2651/3724] kubernetes-helm: 3.18.5 -> 3.18.6

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

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 06da7b5a8d2e..01bcfdebd40c 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubernetes-helm";
-  version = "3.18.5";
+  version = "3.18.6";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-SVaNuTIBnM9TFk+xy7yvUXX+8BEbfQdbHPTWUuimVw4=";
+    sha256 = "sha256-aUnPLjSt1law6O2M4IQnHB3QiMDYVQ6h//zJbE2vap8=";
   };
   vendorHash = "sha256-Gn2h7a4bu9nWPEiqW9uN8SnKSZ7NRfchfRoFfpp49+M=";
 

From 3e54a47f4c803a8c97c5694736073a9d218d4c89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 04:34:24 +0000
Subject: [PATCH 2652/3724] nelm: 1.12.0 -> 1.12.2

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

diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix
index 4964a4135217..84b5c0d56a0a 100644
--- a/pkgs/by-name/ne/nelm/package.nix
+++ b/pkgs/by-name/ne/nelm/package.nix
@@ -9,13 +9,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "nelm";
-  version = "1.12.0";
+  version = "1.12.2";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "nelm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HooW+nwjh8kNh9XwB3+/wt9hzhRnwRDSOh6YKucus+Q=";
+    hash = "sha256-fhHkWkbMGLr/dlHFtbg/tZA0Yr8dKDKGiN//CNSVAOs=";
   };
 
   vendorHash = "sha256-53pIUVbGXU1GGFZtUtjSOufCbvHEPUltZd52eZEGSio=";

From 2a1374786a4deabfb1f5de093918504ab9b2ed2b Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Thu, 24 Jul 2025 19:44:55 -0400
Subject: [PATCH 2653/3724] python3.pkgs.rich-tables: init at 0.8.0

---
 .../python-modules/rich-tables/default.nix    | 66 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/python-modules/rich-tables/default.nix

diff --git a/pkgs/development/python-modules/rich-tables/default.nix b/pkgs/development/python-modules/rich-tables/default.nix
new file mode 100644
index 000000000000..2c7d29b51316
--- /dev/null
+++ b/pkgs/development/python-modules/rich-tables/default.nix
@@ -0,0 +1,66 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  poetry-core,
+  coloraide,
+  humanize,
+  multimethod,
+  platformdirs,
+  rich,
+  sqlparse,
+  typing-extensions,
+  rgbxy ? null,
+}:
+let
+  version = "0.8.0";
+in
+buildPythonPackage {
+  pname = "rich-tables";
+  inherit version;
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "rich_tables";
+    inherit version;
+    hash = "sha256-MN8QH6kLyogbcQ0VE9U034cwSFnaFDB2/Rnvy1DYyl4=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    coloraide
+    humanize
+    multimethod
+    platformdirs
+    rich
+    sqlparse
+    typing-extensions
+  ];
+
+  optional-dependencies = {
+    hue = [
+      rgbxy
+    ];
+  };
+
+  pythonRelaxDeps = [
+    "multimethod"
+  ];
+
+  pythonImportsCheck = [
+    "rich_tables"
+  ];
+
+  meta = {
+    description = "Ready-made rich tables for various purposes";
+    homepage = "https://pypi.org/project/rich-tables/";
+    license = lib.licenses.mit;
+    maintainers = [
+      lib.maintainers._9999years
+    ];
+    mainProgram = "table";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b397360c29ed..58c4e5e209b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15827,6 +15827,8 @@ self: super: with self; {
 
   rich-rst = callPackage ../development/python-modules/rich-rst { };
 
+  rich-tables = callPackage ../development/python-modules/rich-tables { };
+
   rich-theme-manager = callPackage ../development/python-modules/rich-theme-manager { };
 
   rich-toolkit = callPackage ../development/python-modules/rich-toolkit { };

From 602cc45c0946a306846b3eaa4cf53649d686e96e Mon Sep 17 00:00:00 2001
From: Jade Lovelace <software@lfcode.ca>
Date: Thu, 21 Aug 2025 21:36:18 -0700
Subject: [PATCH 2654/3724] nixos/gateone: remove

The package is literally gone, this could never work.
---
 .../manual/release-notes/rl-2511.section.md   |  2 +
 nixos/modules/misc/ids.nix                    |  4 +-
 nixos/modules/module-list.nix                 |  1 -
 nixos/modules/rename.nix                      |  3 +
 nixos/modules/services/networking/gateone.nix | 73 -------------------
 5 files changed, 7 insertions(+), 76 deletions(-)
 delete mode 100644 nixos/modules/services/networking/gateone.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 51a9cfb49686..774d0edbe659 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -136,6 +136,8 @@
 
 - `netbox-manage` script created by the `netbox` module no longer uses `sudo -u netbox` internally. It can be run as root and will change it's user to `netbox` using `runuser`
 
+- `services.gateone` has been removed as the package was removed such that it does not work.
+
 - `services.dwm-status.extraConfig` was replaced by [RFC0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md)-compliant [](#opt-services.dwm-status.settings), which is used to generate the config file. `services.dwm-status.order` is now moved to [](#opt-services.dwm-status.settings.order), as it's a part of the config file.
 
 - `gitversion` was updated to 6.3.0, which includes a number of breaking changes, old configurations may need updating or they will cause the tool to fail to run.
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index b50d7c7a50c8..8813cb8f3d9f 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -246,7 +246,7 @@ in
       subsonic = 204;
       # riak = 205; # unused, remove 2022-07-22
       #shout = 206; # dynamically allocated as of 2021-09-18, module removed 2024-10-19
-      gateone = 207;
+      #gateone = 207; # removed 2025-08-21
       namecoin = 208;
       #lxd = 210; # unused
       #kibana = 211;# dynamically allocated as of 2021-09-03
@@ -582,7 +582,7 @@ in
       subsonic = 204;
       # riak = 205;#unused, removed 2022-06-22
       #shout = 206; #unused
-      gateone = 207;
+      #gateone = 207; #removed 2025-08-21
       namecoin = 208;
       #lxd = 210; # unused
       #kibana = 211;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9415089e180e..23e93f20e0cd 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1154,7 +1154,6 @@
   ./services/networking/frp.nix
   ./services/networking/frr.nix
   ./services/networking/g3proxy.nix
-  ./services/networking/gateone.nix
   ./services/networking/gdomap.nix
   ./services/networking/ghostunnel.nix
   ./services/networking/git-daemon.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index d2c016861133..ef212ef7f4b6 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -367,6 +367,9 @@ in
     (mkRemovedOptionModule [ "services" "private-gpt" ] ''
       The private-gpt package and the corresponding module have been removed due to being broken and unmaintained.
     '')
+    (mkRemovedOptionModule [ "services" "gateone" ] ''
+      The gateone module was removed since the package was removed alongside much other obsolete python 2.
+    '')
     # Do NOT add any option renames here, see top of the file
   ];
 }
diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix
deleted file mode 100644
index 51817124cb1d..000000000000
--- a/nixos/modules/services/networking/gateone.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.services.gateone;
-in
-{
-  options = {
-    services.gateone = {
-      enable = lib.mkEnableOption "GateOne server";
-      pidDir = lib.mkOption {
-        default = "/run/gateone";
-        type = lib.types.path;
-        description = "Path of pid files for GateOne.";
-      };
-      settingsDir = lib.mkOption {
-        default = "/var/lib/gateone";
-        type = lib.types.path;
-        description = "Path of configuration files for GateOne.";
-      };
-    };
-  };
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs.pythonPackages; [
-      gateone
-      pkgs.openssh
-      pkgs.procps
-      pkgs.coreutils
-      pkgs.cacert
-    ];
-
-    users.users.gateone = {
-      description = "GateOne privilege separation user";
-      uid = config.ids.uids.gateone;
-      home = cfg.settingsDir;
-    };
-    users.groups.gateone.gid = config.ids.gids.gateone;
-
-    systemd.services.gateone = with pkgs; {
-      description = "GateOne web-based terminal";
-      path = [
-        pythonPackages.gateone
-        nix
-        openssh
-        procps
-        coreutils
-      ];
-      preStart = ''
-        if [ ! -d ${cfg.settingsDir} ] ; then
-          mkdir -m 0750 -p ${cfg.settingsDir}
-          chown -R gateone:gateone ${cfg.settingsDir}
-        fi
-        if [ ! -d ${cfg.pidDir} ] ; then
-          mkdir -m 0750 -p ${cfg.pidDir}
-          chown -R gateone:gateone ${cfg.pidDir}
-        fi
-      '';
-      #unitConfig.RequiresMountsFor = "${cfg.settingsDir}";
-      serviceConfig = {
-        ExecStart = ''${pythonPackages.gateone}/bin/gateone --settings_dir=${cfg.settingsDir} --pid_file=${cfg.pidDir}/gateone.pid --gid=${toString config.ids.gids.gateone} --uid=${toString config.ids.uids.gateone}'';
-        User = "gateone";
-        Group = "gateone";
-        WorkingDirectory = cfg.settingsDir;
-      };
-
-      wantedBy = [ "multi-user.target" ];
-      requires = [ "network.target" ];
-    };
-  };
-}

From 290fffd834980daec436dfde3dea455053a4a558 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Thu, 24 Jul 2025 19:59:34 -0400
Subject: [PATCH 2655/3724] python3.pkgs.beetcamp: init at 0.22.0

---
 .../python-modules/beetcamp/default.nix       | 67 +++++++++++++
 .../beetcamp/remove-git-pytest-option.diff    | 98 +++++++++++++++++++
 .../python-modules/coloraide/default.nix      |  2 +-
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 168 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/beetcamp/default.nix
 create mode 100644 pkgs/development/python-modules/beetcamp/remove-git-pytest-option.diff

diff --git a/pkgs/development/python-modules/beetcamp/default.nix b/pkgs/development/python-modules/beetcamp/default.nix
new file mode 100644
index 000000000000..4d267ef0fd40
--- /dev/null
+++ b/pkgs/development/python-modules/beetcamp/default.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  beets,
+  buildPythonPackage,
+  fetchFromGitHub,
+  httpx,
+  packaging,
+  poetry-core,
+  pycountry,
+  pytest-cov-stub,
+  pytestCheckHook,
+  rich-tables,
+  filelock,
+  writableTmpDirAsHomeHook,
+  nix-update-script,
+}:
+
+let
+  version = "0.22.0";
+in
+buildPythonPackage {
+  pname = "beetcamp";
+  inherit version;
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "snejus";
+    repo = "beetcamp";
+    tag = version;
+    hash = "sha256-5tcQtvYmXT213mZnzKz2kwE5K22rro++lRF65PjC5X0=";
+  };
+
+  patches = [
+    ./remove-git-pytest-option.diff
+  ];
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    beets
+    httpx
+    packaging
+    pycountry
+  ];
+
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+    pytestCheckHook
+    pytest-cov-stub
+    rich-tables
+    filelock
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Bandcamp autotagger source for beets (http://beets.io)";
+    homepage = "https://github.com/snejus/beetcamp";
+    license = lib.licenses.gpl2Only;
+    maintainers = [
+      lib.maintainers._9999years
+    ];
+    mainProgram = "beetcamp";
+  };
+}
diff --git a/pkgs/development/python-modules/beetcamp/remove-git-pytest-option.diff b/pkgs/development/python-modules/beetcamp/remove-git-pytest-option.diff
new file mode 100644
index 000000000000..21a4c2e23fac
--- /dev/null
+++ b/pkgs/development/python-modules/beetcamp/remove-git-pytest-option.diff
@@ -0,0 +1,98 @@
+The test suite has support for comparing results against a base revision of the
+repository.
+
+This requires that we run the tests from a Git checkout of the `beetcamp` repo,
+which we do not do. We don't want to compare against a base revision, so we
+just remove the option entirely.
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 04d81f66f0..018d9e3c0c 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -9,7 +9,6 @@
+ 
+ import pytest
+ from beets.autotag.hooks import AlbumInfo, TrackInfo
+-from git import Repo
+ from rich_tables.diff import pretty_diff
+ from rich_tables.utils import make_console
+ 
+@@ -17,10 +16,8 @@
+ from beetsplug.bandcamp.helpers import Helpers
+ 
+ if TYPE_CHECKING:
+-    from _pytest.config import Config
+     from _pytest.config.argparsing import Parser
+     from _pytest.fixtures import SubRequest
+-    from _pytest.terminal import TerminalReporter
+     from rich.console import Console
+ 
+ 
+@@ -29,28 +26,6 @@
+ 
+ 
+ def pytest_addoption(parser: Parser) -> None:
+-    newest_folders = sorted(
+-        (p for p in Path("lib_tests").glob("*") if p.is_dir()),
+-        key=lambda p: p.stat().st_ctime,
+-        reverse=True,
+-    )
+-    all_names = [f.name for f in newest_folders]
+-    names = [n for n in all_names if n != "dev"]
+-    names_set = set(names)
+-
+-    base_name = ""
+-    for commit in Repo(".").iter_commits(paths=["./beetsplug"]):
+-        short_commit = str(commit)[:8]
+-        if short_commit in names_set:
+-            base_name = short_commit
+-            break
+-
+-    parser.addoption(
+-        "--base",
+-        choices=all_names,
+-        default=base_name or "dev",
+-        help="base directory / comparing against",
+-    )
+     parser.addoption(
+         "--target",
+         default="dev",
+@@ -64,16 +39,6 @@
+     )
+ 
+ 
+-def pytest_terminal_summary(
+-    terminalreporter: TerminalReporter,
+-    exitstatus: int,  # noqa: ARG001
+-    config: Config,
+-) -> None:
+-    base = config.getoption("base")
+-    target = config.getoption("target")
+-    terminalreporter.write(f"--- Compared {target} against {base} ---\n")
+-
+-
+ def pytest_assertrepr_compare(op: str, left: Any, right: Any):  # noqa: ARG001
+     """Pretty print the difference between dict objects."""
+     actual, expected = left, right
+diff --git a/tests/test_lib.py b/tests/test_lib.py
+index 665d5aa61d..0a81e42b24 100644
+--- a/tests/test_lib.py
++++ b/tests/test_lib.py
+@@ -19,7 +19,6 @@
+ 
+ import pytest
+ from filelock import FileLock
+-from git import Repo
+ from rich import box
+ from rich.console import Group
+ from rich.markup import escape
+@@ -273,9 +272,6 @@
+             return
+ 
+         sections = [("Failed", summary["failed"], "red")]
+-        with suppress(TypeError):
+-            if Repo(pytestconfig.rootpath).active_branch.name == "dev":
+-                sections.append(("Fixed", summary["fixed"], "green"))
+ 
+         columns = []
+         for name, all_changes, color in sections:
diff --git a/pkgs/development/python-modules/coloraide/default.nix b/pkgs/development/python-modules/coloraide/default.nix
index 88605667912c..03c702dde374 100644
--- a/pkgs/development/python-modules/coloraide/default.nix
+++ b/pkgs/development/python-modules/coloraide/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage {
   ];
 
   meta = {
-    description = "A color library for Python";
+    description = "Color library for Python";
     homepage = "https://pypi.org/project/coloraide/";
     license = lib.licenses.mit;
     maintainers = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 58c4e5e209b1..572598bac0b4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1801,6 +1801,8 @@ self: super: with self; {
 
   bech32 = callPackage ../development/python-modules/bech32 { };
 
+  beetcamp = callPackage ../development/python-modules/beetcamp { };
+
   before-after = callPackage ../development/python-modules/before-after { };
 
   behave = callPackage ../development/python-modules/behave { };

From 0f9dcfb70bc99c6b22ec275dcc07e92bbc0d61d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 05:00:25 +0000
Subject: [PATCH 2656/3724] python3Packages.resolvelib: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix
index 3bb181342c65..9dc507922700 100644
--- a/pkgs/development/python-modules/resolvelib/default.nix
+++ b/pkgs/development/python-modules/resolvelib/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "resolvelib";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sarugaku";
     repo = "resolvelib";
-    rev = version;
-    hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8=";
+    tag = version;
+    hash = "sha256-8ffJ1Jlb/hzKY4pfE3B95ip2e1CxUByiR0cul/ZnxxA=";
   };
 
   build-system = [ setuptools ];
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Resolve abstract dependencies into concrete ones";
     homepage = "https://github.com/sarugaku/resolvelib";
-    changelog = "https://github.com/sarugaku/resolvelib/blob/${src.rev}/CHANGELOG.rst";
+    changelog = "https://github.com/sarugaku/resolvelib/blob/${src.tag}/CHANGELOG.rst";
     license = licenses.isc;
     maintainers = [ ];
   };

From 6c379a8bb626824fd6fbc97739296729a4ad0dc5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 05:02:04 +0000
Subject: [PATCH 2657/3724] gdevelop: 5.5.238 -> 5.5.239

---
 pkgs/by-name/gd/gdevelop/darwin.nix  | 2 +-
 pkgs/by-name/gd/gdevelop/linux.nix   | 2 +-
 pkgs/by-name/gd/gdevelop/package.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix
index 915461483ad0..14ce3896cb4b 100644
--- a/pkgs/by-name/gd/gdevelop/darwin.nix
+++ b/pkgs/by-name/gd/gdevelop/darwin.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
-    hash = "sha256-tEkiVbhX14RkK5Q61CYOxmnhMqM6XkHvCy9M060oJvI=";
+    hash = "sha256-f0kqLk6Poc8jiwJGetNnN2zQ72I104R8uXHpS5MNkFY=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix
index 7e41cc33d633..eac2516997a7 100644
--- a/pkgs/by-name/gd/gdevelop/linux.nix
+++ b/pkgs/by-name/gd/gdevelop/linux.nix
@@ -13,7 +13,7 @@ let
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
-        hash = "sha256-6vtF9iLbSXJT4YZWnz/XmoINJY2JMzocrrqqIaIYlnk=";
+        hash = "sha256-AYj1o6yiChVCrZypulN1bTzmLlCMonv4lbkw/uzEv6w=";
       }
     else
       throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix
index bf11a0194d65..ff966982eb68 100644
--- a/pkgs/by-name/gd/gdevelop/package.nix
+++ b/pkgs/by-name/gd/gdevelop/package.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  version = "5.5.238";
+  version = "5.5.239";
   pname = "gdevelop";
   meta = {
     description = "Graphical Game Development Studio";

From d5519a849c0794a1937feb181486df5039599c63 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Fri, 22 Aug 2025 13:43:24 +0800
Subject: [PATCH 2658/3724] xjump: drop

The new version is considered a separate project, and the old version of the software should be deprecated and removed.
---
 pkgs/by-name/xj/xjump/darwin.patch | 21 ---------------
 pkgs/by-name/xj/xjump/package.nix  | 43 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 3 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 pkgs/by-name/xj/xjump/darwin.patch
 delete mode 100644 pkgs/by-name/xj/xjump/package.nix

diff --git a/pkgs/by-name/xj/xjump/darwin.patch b/pkgs/by-name/xj/xjump/darwin.patch
deleted file mode 100644
index 8221677658e3..000000000000
--- a/pkgs/by-name/xj/xjump/darwin.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xjump/src/main.c	2018-02-20 09:15:15.608807657 +0100
-+++ xjump-patched/src/main.c	2018-02-20 09:15:34.148949100 +0100
-@@ -604,18 +604,6 @@
-    * optimistic privilege dropping function. */
-   setgroups(0, NULL);
- 
--  if (setresgid(-1, realgid, realgid) != 0) {
--    perror("Could not drop setgid privileges.  Aborting.");
--    exit(1);
--  }
--
--  /* Dropping user privileges must come last.
--   * Otherwise we won't be able to drop group privileges anymore */
--  if (setresuid(-1, realuid, realuid) != 0) {
--    perror("Could not drop setuid privileges.  Aborting.");
--    exit(1);
--  }
--
-   /* From now on we run with regular user privileges */
- 
-   static XtActionsRec a_table[] = {
diff --git a/pkgs/by-name/xj/xjump/package.nix b/pkgs/by-name/xj/xjump/package.nix
deleted file mode 100644
index aed50689aeda..000000000000
--- a/pkgs/by-name/xj/xjump/package.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoconf,
-  automake,
-  libX11,
-  libXt,
-  libXpm,
-  libXaw,
-  localStateDir ? null,
-}:
-
-stdenv.mkDerivation {
-  pname = "xjump";
-  version = "2.9.3";
-  src = fetchFromGitHub {
-    owner = "hugomg";
-    repo = "xjump";
-    rev = "e7f20fb8c2c456bed70abb046c1a966462192b80";
-    sha256 = "0hq4739cvi5a47pxdc0wwkj2lmlqbf1xigq0v85qs5bq3ixmq2f7";
-  };
-  nativeBuildInputs = [
-    autoconf
-    automake
-  ];
-  buildInputs = [
-    libX11
-    libXt
-    libXpm
-    libXaw
-  ];
-  preConfigure = "autoreconf --install";
-  patches = lib.optionals stdenv.buildPlatform.isDarwin [ ./darwin.patch ];
-  configureFlags = lib.optionals (localStateDir != null) [ "--localstatedir=${localStateDir}" ];
-
-  meta = with lib; {
-    description = "Falling tower game";
-    mainProgram = "xjump";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ pmeunier ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 56f14e523835..67604e714bd8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2385,6 +2385,7 @@ mapAliases {
   xenPackages = throw "The attributes in the xenPackages set have been promoted to the top-level. (xenPackages.xen_4_19 -> xen)";
   xineLib = throw "'xineLib' has been renamed to/replaced by 'xine-lib'"; # Converted to throw 2024-10-17
   xineUI = throw "'xineUI' has been renamed to/replaced by 'xine-ui'"; # Converted to throw 2024-10-17
+  xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22
   xlsxgrep = throw "'xlsxgrep' has been dropped due to lack of maintenance."; # Added 2024-11-01
   xmlada = gnatPackages.xmlada; # Added 2024-02-25
   xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18

From 97c79be45d5804435c6101cf32fc33c376c5715c Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Fri, 22 Aug 2025 13:44:26 +0800
Subject: [PATCH 2659/3724] xsw: drop

The upstream section has not been maintained for nearly 16 years.
---
 pkgs/applications/misc/xsw/default.nix     | 65 ----------------------
 pkgs/applications/misc/xsw/parse.patch     | 21 -------
 pkgs/applications/misc/xsw/sdl-error.patch | 11 ----
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            | 10 ----
 5 files changed, 1 insertion(+), 107 deletions(-)
 delete mode 100644 pkgs/applications/misc/xsw/default.nix
 delete mode 100644 pkgs/applications/misc/xsw/parse.patch
 delete mode 100644 pkgs/applications/misc/xsw/sdl-error.patch

diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix
deleted file mode 100644
index 6d57f49a6a30..000000000000
--- a/pkgs/applications/misc/xsw/default.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  pkg-config,
-  SDL,
-  SDL_image,
-  SDL_ttf,
-  SDL_gfx,
-  flex,
-  bison,
-}:
-
-let
-  makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL");
-
-in
-stdenv.mkDerivation rec {
-  pname = "xsw";
-  version = "0.1.2";
-
-  src = fetchFromGitHub {
-    owner = "andrenho";
-    repo = "xsw";
-    rev = version;
-    sha256 = "092vp61ngd2vscsvyisi7dv6qrk5m1i81gg19hyfl5qvjq5p0p8g";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    flex
-    bison
-  ];
-
-  buildInputs = [
-    SDL
-    SDL_image
-    SDL_ttf
-    SDL_gfx
-  ];
-
-  env.NIX_CFLAGS_COMPILE =
-    toString (makeSDLFlags [
-      SDL
-      SDL_image
-      SDL_ttf
-      SDL_gfx
-    ])
-    + " -lSDL";
-
-  patches = [
-    ./parse.patch # Fixes compilation error by avoiding redundant definitions.
-    ./sdl-error.patch # Adds required include for SDL_GetError.
-  ];
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    description = "Slide show presentation tool";
-
-    platforms = platforms.unix;
-    license = licenses.gpl3;
-    maintainers = [ ];
-    mainProgram = "xsw";
-  };
-}
diff --git a/pkgs/applications/misc/xsw/parse.patch b/pkgs/applications/misc/xsw/parse.patch
deleted file mode 100644
index 6db6c14c26a7..000000000000
--- a/pkgs/applications/misc/xsw/parse.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-The `%code` causes Color definition to be added in both parser.h and parser.c
-causing duplicate definitions error. This ensures that once it has been included
-as part of parser.h, it wont be redefined in parser.c
-
---- xsw-0.1.2-src/src/parser.y	1969-12-31 16:00:01.000000000 -0800
-+++ xsw-0.1.2-src/src/parser.y	2016-06-28 13:21:35.707027770 -0700
-@@ -38,7 +38,13 @@
- 
- %}
- 
--%code requires { typedef struct { unsigned char c; } Color; }
-+%code requires
-+{
-+#ifndef COLORDEF
-+#define COLORDEF
-+typedef struct { unsigned char c; } Color;
-+#endif
-+}
- 
- %token SLIDE COLON HIFEN TEXT X Y W H IMAGE SIZE SCALE TEMPLATE BACKGROUND FONT
- %token STYLE ALIGN EXPAND PLUS IMAGE_PATH
diff --git a/pkgs/applications/misc/xsw/sdl-error.patch b/pkgs/applications/misc/xsw/sdl-error.patch
deleted file mode 100644
index 83751e3cf5fc..000000000000
--- a/pkgs/applications/misc/xsw/sdl-error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/src/presenter.c b/src/presenter.c
-index a082541..74bfbec 100644
---- a/src/presenter.c
-+++ b/src/presenter.c
-@@ -5,5 +5,6 @@
- #include <stdlib.h>
- #include "SDL_ttf.h"
-+#include <SDL/SDL_error.h>
- #include "presenter.h"
- #include "execute.h"
- #include "list.h"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 56f14e523835..e97133f83677 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2396,6 +2396,7 @@ mapAliases {
   xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14
   xsd = throw "'xsd' has been removed."; # Added 2025-04-02
   xsv = throw "'xsv' has been removed due to lack of upstream maintenance. Please see 'xan' for a maintained alternative";
+  xsw = throw "'xsw' has been removed due to lack of upstream maintenance"; # Added 2025-08-22
   xtrlock-pam = throw "xtrlock-pam has been removed because it is unmaintained for 10 years and doesn't support Python 3.10 or newer"; # Added 2025-01-25
   xulrunner = firefox-unwrapped; # Added 2023-11-03
   xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3072866de458..afa5e45a5fa3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15656,16 +15656,6 @@ with pkgs;
     }
   );
 
-  xsw = callPackage ../applications/misc/xsw {
-    # Enable the next line to use this in terminal.
-    # Note that it requires sixel capable terminals such as mlterm
-    # or xterm -ti 340
-    SDL = SDL_sixel;
-    SDL_gfx = SDL_gfx.override { SDL = SDL_sixel; };
-    SDL_image = SDL_image.override { SDL = SDL_sixel; };
-    SDL_ttf = SDL_ttf.override { SDL = SDL_sixel; };
-  };
-
   yamale = with python3Packages; toPythonApplication yamale;
 
   zap-chip-gui = zap-chip.override { withGui = true; };

From 26c854ff8e4cf8d000ce4791603df21c532e7929 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 19 Aug 2025 16:41:55 +0200
Subject: [PATCH 2660/3724] radicle-node: use finalAttrs pattern

---
 pkgs/by-name/ra/radicle-node/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 347044035a06..5d8100c6c41c 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -17,16 +17,16 @@
   testers,
   xdg-utils,
 }:
-rustPlatform.buildRustPackage rec {
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radicle-node";
   version = "1.3.0";
-  env.RADICLE_VERSION = version;
 
   src = fetchFromRadicle {
     seed = "seed.radicle.xyz";
     repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5";
     node = "z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-0gK+fM/YGGpxlcR1HQixbLK0/sv+HH29h6ajEP2w2pI=";
     leaveDotGit = true;
     postFetch = ''
@@ -38,6 +38,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-qLRFZXbVbsgMyXiljsb8lOBCDZKa17LcxWuPaUYSG70=";
 
+  env.RADICLE_VERSION = finalAttrs.version;
+
   nativeBuildInputs = [
     asciidoctor
     installShellFiles
@@ -56,7 +58,7 @@ rustPlatform.buildRustPackage rec {
     "--package=radicle-remote-helper"
   ];
 
-  cargoTestFlags = cargoBuildFlags;
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
 
   # tests regularly time out on aarch64
   doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86;
@@ -166,4 +168,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "rad";
   };
-}
+})

From cda70f9efa652d2d9d10e95909e660b0139b3e6a Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 19 Aug 2025 16:43:10 +0200
Subject: [PATCH 2661/3724] radicle-node: use canonical release reference

---
 pkgs/by-name/ra/radicle-node/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 5d8100c6c41c..575be9bdd70c 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -25,8 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromRadicle {
     seed = "seed.radicle.xyz";
     repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5";
-    node = "z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM";
-    tag = "v${finalAttrs.version}";
+    tag = "releases/${finalAttrs.version}";
     hash = "sha256-0gK+fM/YGGpxlcR1HQixbLK0/sv+HH29h6ajEP2w2pI=";
     leaveDotGit = true;
     postFetch = ''

From d6b07e06cc2ebe5698c2672ac02d644a9b54e0b3 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 19 Aug 2025 17:04:16 +0200
Subject: [PATCH 2662/3724] radicle-node: depend on gitMinimal instead of git

---
 pkgs/by-name/ra/radicle-node/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 575be9bdd70c..8f9f339fbea4 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -1,7 +1,7 @@
 {
   asciidoctor,
   fetchFromRadicle,
-  git,
+  gitMinimal,
   installShellFiles,
   jq,
   lib,
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     installShellFiles
     makeWrapper
   ];
-  nativeCheckInputs = [ git ];
+  nativeCheckInputs = [ gitMinimal ];
 
   preBuild = ''
     export GIT_HEAD=$(<$src/.git_head)
@@ -90,7 +90,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       wrapProgram "$program" \
         --prefix PATH : "${
           lib.makeBinPath [
-            git
+            gitMinimal
             man-db
             openssh
             xdg-utils
@@ -125,7 +125,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
             rad debug | jq -e '
                 (.sshVersion | contains("${openssh.version}"))
               and
-                (.gitVersion | contains("${git.version}"))
+                (.gitVersion | contains("${gitMinimal.version}"))
             '
 
             touch $out

From 4f2c8f74eb89c6e616a9a2b573c305eb52650e28 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 19 Aug 2025 17:06:05 +0200
Subject: [PATCH 2663/3724] radicle-node: use makeBinaryWrapper

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

diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 8f9f339fbea4..618a2a26b3d4 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -5,7 +5,7 @@
   installShellFiles,
   jq,
   lib,
-  makeWrapper,
+  makeBinaryWrapper,
   man-db,
   nixos,
   nixosTests,
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [
     asciidoctor
     installShellFiles
-    makeWrapper
+    makeBinaryWrapper
   ];
   nativeCheckInputs = [ gitMinimal ];
 

From 65c6af38ef2520b476759e5e74c3d926fdd7d3c0 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 19 Aug 2025 17:09:11 +0200
Subject: [PATCH 2664/3724] radicle-node: use versionCheckHook

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

diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 618a2a26b3d4..7e4138e972bc 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -16,6 +16,7 @@
   stdenv,
   testers,
   xdg-utils,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -84,6 +85,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     done
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   postFixup = ''
     for program in $out/bin/* ;
     do
@@ -104,7 +109,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       package = radicle-node;
     in
     {
-      version = testers.testVersion { inherit package; };
       basic =
         runCommand "${package.name}-basic-test"
           {

From 5ce300b6aa0630b5760e2f3d565fdaeef57ffa13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 05:58:19 +0000
Subject: [PATCH 2665/3724] python3Packages.nclib: 1.0.7 -> 1.0.8

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

diff --git a/pkgs/development/python-modules/nclib/default.nix b/pkgs/development/python-modules/nclib/default.nix
index 8e32235f733b..8d84993e6259 100644
--- a/pkgs/development/python-modules/nclib/default.nix
+++ b/pkgs/development/python-modules/nclib/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "nclib";
-  version = "1.0.7";
+  version = "1.0.8";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-40Bdkhmd3LiZAR1v36puV9l4tgtDb6T8k9j02JTR4Jo=";
+    hash = "sha256-IVnWqHpoYF5bzek0aWWiKtlWiUaX1jcZq+DfLK0FGoI=";
   };
 
   build-system = [ setuptools ];

From ab24d5d37808977b7fb7daaf30cb342777e07e37 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Fri, 22 Aug 2025 08:00:50 +0200
Subject: [PATCH 2666/3724] harper: 0.58.0 -> 0.59.0

Changelog: https://github.com/Automattic/harper/releases/tag/v0.59.0
Diff: https://github.com/Automattic/harper/compare/v0.58.0...v0.59.0
---
 pkgs/by-name/ha/harper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 7b43bdab13f5..d4e1ccad0f45 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.58.0";
+  version = "0.59.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-KGi/toi02JPDYdNvrhIg9hh+188C5jP41Zk3IKOgO/E=";
+    hash = "sha256-SUrTdVbxMQ/oPTinYyQD60el6a6Pt3ZDVlFdA+plnnM=";
   };
 
   buildAndTestSubdir = "harper-ls";
 
-  cargoHash = "sha256-Er056RhUW33UrRMP412/tj+Qa878Jk+nIcFuF8Ytaes=";
+  cargoHash = "sha256-tlJ5D1M15QEFmyZ/+FJAVHxKUg9ajfiQxAi+YRz3yk4=";
 
   passthru.updateScript = nix-update-script { };
 

From 5d27a3d769ab445c532b7578d3e232bddb90739a Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 22 Aug 2025 08:19:56 +0200
Subject: [PATCH 2667/3724] claude-code: 1.0.86 -> 1.0.88

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

- Fixed "OAuth authentication is currently not supported" issue
- Status line input now includes `exceeds_200k_tokens`
- Fixed incorrect usage tracking in /cost
- Introduced `ANTHROPIC_DEFAULT_SONNET_MODEL` and `ANTHROPIC_DEFAULT_OPUS_MODEL` for controlling model aliases
- Bedrock: Updated default Sonnet model to Sonnet 4
---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 08c2e439a644..03c66386adeb 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -6,13 +6,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.86"
+        "@anthropic-ai/claude-code": "^1.0.88"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.86",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.86.tgz",
-      "integrity": "sha512-js1h6JUnFJ1dHvFPBiCxwFChaWjh28XOFamrwebmhOIUBVhQZwMfDJYsNfRyv0qEwpxKxYedvK4nv4WqMCwu9Q==",
+      "version": "1.0.88",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.88.tgz",
+      "integrity": "sha512-Np6H4EjkbmNolUpx98DvqLXV/iJrw2y7dz2rDJ7av9ajMz6HZfB8bdJV5D75+jO+Gk1pvA54HCIm0c65lDrzcw==",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index e36d28b5f9a9..7ef65342b038 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.86";
+  version = "1.0.88";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-mVXS75KgeKgD7EI5t9X6+TkwjBFyBLOo4/m50sS9XdA=";
+    hash = "sha256-o0A9P0sBB2Fk18CArGGv/QBi55ZtFgoJ2/3gHlDwyEU=";
   };
 
-  npmDepsHash = "sha256-BXpySywlTI19xMaRbJkqBpzbfr8lzAYdpn4dSonmWWg=";
+  npmDepsHash = "sha256-KONgl7DYG8Fj7JM6+hUZBQ+ETTNAPEimdIgseQ1bptQ=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 32e24204843acdd31cd118ec8f94f26493e92533 Mon Sep 17 00:00:00 2001
From: iamanaws <78835633+Iamanaws@users.noreply.github.com>
Date: Thu, 21 Aug 2025 23:21:14 -0700
Subject: [PATCH 2668/3724] mongodb-tools: add updateScript, add iamanaws as a
 maintainer

---
 pkgs/by-name/mo/mongodb-tools/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mo/mongodb-tools/package.nix b/pkgs/by-name/mo/mongodb-tools/package.nix
index f45fbaf55695..5454fcd1e6a5 100644
--- a/pkgs/by-name/mo/mongodb-tools/package.nix
+++ b/pkgs/by-name/mo/mongodb-tools/package.nix
@@ -5,6 +5,7 @@
   openssl,
   pkg-config,
   libpcap,
+  nix-update-script,
 }:
 
 buildGoModule rec {
@@ -52,10 +53,15 @@ buildGoModule rec {
       runHook postBuild
     '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     homepage = "https://github.com/mongodb/mongo-tools";
     description = "Tools for the MongoDB";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ bryanasdev000 ];
+    maintainers = with lib.maintainers; [
+      bryanasdev000
+      iamanaws
+    ];
   };
 }

From 7359141cd860244129111e22c6d31c4e99549661 Mon Sep 17 00:00:00 2001
From: iamanaws <78835633+Iamanaws@users.noreply.github.com>
Date: Thu, 21 Aug 2025 23:22:32 -0700
Subject: [PATCH 2669/3724] mongodb-tools: 100.10.0 -> 100.13.0

---
 pkgs/by-name/mo/mongodb-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/mongodb-tools/package.nix b/pkgs/by-name/mo/mongodb-tools/package.nix
index 5454fcd1e6a5..bd10ffdca620 100644
--- a/pkgs/by-name/mo/mongodb-tools/package.nix
+++ b/pkgs/by-name/mo/mongodb-tools/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "mongo-tools";
-  version = "100.10.0";
+  version = "100.13.0";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-tools";
-    rev = version;
-    sha256 = "sha256-9DUfPD6wrv65PLVtxAF21BZ/joWFVFk+cItt9m/1Nx8=";
+    tag = version;
+    hash = "sha256-aQrwJFFdaCIkcnofdGtZ/BMX9KPqr1pHxwm+A04LhXI=";
   };
 
   vendorHash = null;

From 8ec348d6441a19add90ba2e98d34e6510e40703e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 09:18:32 +0200
Subject: [PATCH 2670/3724] ci/github-script/commits: fix
 not-cherry-picked-because regex

This needs the multiline flags, which enables `^` and `$` to match line
start and line end, not start and end of the whole string.

Not sure how this got past testing when initially merged.
---
 ci/github-script/commits.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index 41922c810a69..2e44de487b55 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -22,7 +22,7 @@ module.exports = async ({ github, context, core, dry }) => {
 
     async function extract({ sha, commit }) {
       const noCherryPick = Array.from(
-        commit.message.matchAll(/^Not-cherry-picked-because: (.*)$/g),
+        commit.message.matchAll(/^Not-cherry-picked-because: (.*)$/gm),
       ).at(0)
 
       if (noCherryPick)

From 64d8d846f157ac4d64067c35cd52d00b013d446f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 00:07:27 +0000
Subject: [PATCH 2671/3724] grimblast: 0.1-unstable-2025-07-23 ->
 0.1-unstable-2025-08-20

---
 pkgs/by-name/gr/grimblast/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix
index 4151a243a625..6ba590401fd2 100644
--- a/pkgs/by-name/gr/grimblast/package.nix
+++ b/pkgs/by-name/gr/grimblast/package.nix
@@ -18,13 +18,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "grimblast";
-  version = "0.1-unstable-2025-07-23";
+  version = "0.1-unstable-2025-08-20";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "contrib";
-    rev = "6839b23345b71db17cd408373de4f5605bf589b8";
-    hash = "sha256-PFAJoEqQWMlo1J+yZb+4HixmhbRVmmNl58e/AkLYDDI=";
+    rev = "04721247f417256ca96acf28cdfe946cf1006263";
+    hash = "sha256-g7/g5o0spemkZCzPa8I21RgCmN0Kv41B5z9Z5HQWraY=";
   };
 
   strictDeps = true;

From 52e9a5a32d6b88512e7f3ae1b43be40c33e64ab2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 07:24:18 +0000
Subject: [PATCH 2672/3724] python3Packages.typst: 0.13.4 -> 0.13.5

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

diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix
index da1ef0070e12..0a8f82df359f 100644
--- a/pkgs/development/python-modules/typst/default.nix
+++ b/pkgs/development/python-modules/typst/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "typst";
-  version = "0.13.4";
+  version = "0.13.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,12 +22,12 @@ buildPythonPackage rec {
     owner = "messense";
     repo = "typst-py";
     tag = "v${version}";
-    hash = "sha256-nY5ErzIApQuVMcmVmufab/ugznKHXV3BkyeWRBPH7Z0=";
+    hash = "sha256-MGO5OSUlFvYBzNm71Rs84yr4j30kKCg/pqvRdQqwk+A=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-02nnO9Ie+AcS0Zssh70rqMGT8nmRJZ/Sz1opkqbooKQ=";
+    hash = "sha256-/R0iFrqWtIATtgPrw88WDD00ML8XrTFgoOABLFzgtyk=";
   };
 
   build-system = [

From 2257beb1d0a13f14b8965122b20eb933617a5fa3 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 09:24:41 +0200
Subject: [PATCH 2673/3724] ci/github-script/commits: fix logging
 no-cherry-pick message

This has severity "important", which is not a `core` function. Falling
back to `core.info` for all unknown values now.
---
 ci/github-script/commits.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index 2e44de487b55..1391779e79ff 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -169,7 +169,16 @@ module.exports = async ({ github, context, core, dry }) => {
       core.startGroup(`Commit ${sha}`)
       core.info(`Author: ${commit.author.name} ${commit.author.email}`)
       core.info(`Date: ${new Date(commit.author.date)}`)
-      core[severity](message)
+      switch (severity) {
+        case 'error':
+          core.error(message)
+          break
+        case 'warning':
+          core.warning(message)
+          break
+        default:
+          core.info(message)
+      }
       core.endGroup()
       if (colored_diff) core.info(colored_diff)
     })

From 3d315da358e95b046b568cad1c981d0d1ad54924 Mon Sep 17 00:00:00 2001
From: Raf Pauwels <rs_net.git@pauwels-cordier.be>
Date: Fri, 22 Aug 2025 00:55:14 +0200
Subject: [PATCH 2674/3724] libg15render: add standard headers to fix build
 with GCC 14

---
 .../g15daemon/libg15render-implicit-decls.patch   | 15 +++++++++++++++
 pkgs/by-name/g1/g15daemon/package.nix             |  4 ++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/by-name/g1/g15daemon/libg15render-implicit-decls.patch

diff --git a/pkgs/by-name/g1/g15daemon/libg15render-implicit-decls.patch b/pkgs/by-name/g1/g15daemon/libg15render-implicit-decls.patch
new file mode 100644
index 000000000000..2636789f3fa5
--- /dev/null
+++ b/pkgs/by-name/g1/g15daemon/libg15render-implicit-decls.patch
@@ -0,0 +1,15 @@
+diff --git a/pixel.c b/pixel.c
+
+--- a/pixel.c
++++ b/pixel.c
+@@ -19,6 +19,10 @@
+ #include <fcntl.h>
+ #include "libg15render.h"
+
++#include <math.h>
++#include <stdlib.h>
++#include <unistd.h>
++
+ void
+ swap (int *x, int *y)
+ {
diff --git a/pkgs/by-name/g1/g15daemon/package.nix b/pkgs/by-name/g1/g15daemon/package.nix
index 5f01cd57a2cf..09088443deca 100644
--- a/pkgs/by-name/g1/g15daemon/package.nix
+++ b/pkgs/by-name/g1/g15daemon/package.nix
@@ -47,6 +47,10 @@ let
       sha256 = "03yjb78j1fnr2fwklxy54sdljwi0imvp29m8kmwl9v0pdapka8yj";
     };
 
+    patches = [
+      ./libg15render-implicit-decls.patch
+    ];
+
     buildInputs = [ libg15 ];
 
     enableParallelBuilding = true;

From 5338752e38d1578ef3cd296ed8035c8f056d47a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 07:30:08 +0000
Subject: [PATCH 2675/3724] python3Packages.kuzu: 0.11.1 -> 0.11.2

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

diff --git a/pkgs/development/python-modules/kuzu/default.nix b/pkgs/development/python-modules/kuzu/default.nix
index 87a9ce0afcf9..e606b72ac24f 100644
--- a/pkgs/development/python-modules/kuzu/default.nix
+++ b/pkgs/development/python-modules/kuzu/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "kuzu";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-H3lqQYEGVqswk955lKBUpmVn69scg40UUlss54w/PfE=";
+    hash = "sha256-nyJOwhirFloYrK6pA2lXeXgNcDNbr0Atm39ZujidsL0=";
   };
 
   pyproject = true;

From 352dc09a50b5c38e867ab45dfe9f3cad2265f49d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 07:44:47 +0000
Subject: [PATCH 2676/3724] lychee: 0.19.1 -> 0.20.0

---
 pkgs/by-name/ly/lychee/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ly/lychee/package.nix b/pkgs/by-name/ly/lychee/package.nix
index f87a6b128baa..fa4fdbfc4e13 100644
--- a/pkgs/by-name/ly/lychee/package.nix
+++ b/pkgs/by-name/ly/lychee/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lychee";
-  version = "0.19.1";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "lycheeverse";
     repo = "lychee";
     rev = "lychee-v${version}";
-    hash = "sha256-OyJ3K6ZLAUCvvrsuhN3FMh31sAYe1bWPmOSibdBL9+4=";
+    hash = "sha256-HbawSQ6ZUDhXSIjRN7SfHMpEPKRb8UD/MXfhxwehK6c=";
   };
 
-  cargoHash = "sha256-hruCTnj6rZak5JbZjtdSpajg+Y+GVTZqvS0Z09S7cfE=";
+  cargoHash = "sha256-T1mfknbxw9Vvl2VGVH++CeKlLuqsIem/i/ifM1yrZGw=";
 
   nativeBuildInputs = [ pkg-config ];
 

From fb32eb0f296812da443357eafaa350031de431d7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 09:43:03 +0200
Subject: [PATCH 2677/3724] actions/checkout: use single tmpfs with subfolders

This fixes problems on darwin, where the new tmpfs folder would not be
fully empty, but git only creates worktrees on fully empty directories.
---
 .github/actions/checkout/action.yml | 30 ++++++++++++++---------------
 .github/workflows/build.yml         | 14 +++++++-------
 .github/workflows/check.yml         |  6 +++---
 .github/workflows/eval.yml          | 14 +++++++-------
 .github/workflows/lint.yml          |  6 +++---
 5 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml
index 1b61b9b0d08d..e14c5936e62d 100644
--- a/.github/actions/checkout/action.yml
+++ b/.github/actions/checkout/action.yml
@@ -79,22 +79,20 @@ runs:
           // This would fail without --refetch, because the we had a partial clone before, but changed it above.
           await run('git', 'fetch', '--depth=1', '--refetch', 'origin', ...(commits.map(({ sha }) => sha)))
 
+          // Checking out onto tmpfs takes 1s and is faster by at least factor 10x.
+          await run('mkdir', 'nixpkgs')
+          switch (process.env.RUNNER_OS) {
+            case 'macOS':
+              await run('sudo', 'mount_tmpfs', 'nixpkgs')
+              break
+            case 'Linux':
+              await run('sudo', 'mount', '-t', 'tmpfs', 'tmpfs', 'nixpkgs')
+              break
+          }
+
           // Create all worktrees in parallel.
           await Promise.all(commits.map(async ({ sha, path }) => {
-            // Checking out onto tmpfs takes 1s and is faster by at least factor 10x.
-            await run('mkdir', path)
-            switch (process.env.RUNNER_OS) {
-              case 'macOS':
-                await run('sudo', 'mount_tmpfs', path)
-                // macOS creates this hidden folder to log file system activity.
-                // This trips up git when adding a worktree below, because the target folder is not empty.
-                await run('sudo', 'rm', '-rf', join(path, '.fseventsd'))
-                break
-              case 'Linux':
-                await run('sudo', 'mount', '-t', 'tmpfs', 'tmpfs', path)
-                break
-            }
-            await run('git', 'worktree', 'add', path, sha, '--no-checkout', '--force')
-            await run('git', '-C', path, 'sparse-checkout', 'disable')
-            await run('git', '-C', path, 'checkout', '--progress')
+            await run('git', 'worktree', 'add', join('nixpkgs', path), sha, '--no-checkout')
+            await run('git', '-C', join('nixpkgs', path), 'sparse-checkout', 'disable')
+            await run('git', '-C', join('nixpkgs', path), 'checkout', '--progress')
           }))
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d499297eada2..20fcb47dc7a0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -66,33 +66,33 @@ jobs:
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
           pushFilter: '(-source$|-nixpkgs-tarball-)'
 
-      - run: nix-env --install -f pinned -A nix-build-uncached
+      - run: nix-env --install -f nixpkgs/pinned -A nix-build-uncached
 
       - name: Build shell
         if: contains(matrix.builds, 'shell')
-        run: echo "${{ matrix.systems }}" | xargs -n1 nix-build-uncached untrusted/ci --arg nixpkgs ./pinned -A shell --argstr system
+        run: echo "${{ matrix.systems }}" | xargs -n1 nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A shell --argstr system
 
       - name: Build NixOS manual
         if: |
           contains(matrix.builds, 'manual-nixos') && !cancelled() &&
           contains(fromJSON(inputs.baseBranch).type, 'primary')
-        run: nix-build-uncached untrusted/ci --arg nixpkgs ./pinned -A manual-nixos --out-link nixos-manual
+        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A manual-nixos --out-link nixos-manual
 
       - name: Build Nixpkgs manual
         if: contains(matrix.builds, 'manual-nixpkgs') && !cancelled()
-        run: nix-build-uncached untrusted/ci --arg nixpkgs ./pinned -A manual-nixpkgs -A manual-nixpkgs-tests
+        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A manual-nixpkgs -A manual-nixpkgs-tests
 
       - name: Build Nixpkgs manual tests
         if: contains(matrix.builds, 'manual-nixpkgs-tests') && !cancelled()
-        run: nix-build-uncached untrusted/ci --arg nixpkgs ./pinned -A manual-nixpkgs-tests
+        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A manual-nixpkgs-tests
 
       - name: Build lib tests
         if: contains(matrix.builds, 'lib-tests') && !cancelled()
-        run: nix-build-uncached untrusted/ci --arg nixpkgs ./pinned -A lib-tests
+        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A lib-tests
 
       - name: Build tarball
         if: contains(matrix.builds, 'tarball') && !cancelled()
-        run: nix-build-uncached untrusted/ci --arg nixpkgs ./pinned -A tarball
+        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A tarball
 
       - name: Upload NixOS manual
         if: |
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index ba3cc99620bf..287d4f80d557 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -117,7 +117,7 @@ jobs:
           pushFilter: -source$
 
       - name: Build codeowners validator
-        run: nix-build trusted/ci --arg nixpkgs ./pinned -A codeownersValidator
+        run: nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/pinned -A codeownersValidator
 
       - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
         if: github.event_name == 'pull_request_target' && vars.OWNER_RO_APP_ID
@@ -137,9 +137,9 @@ jobs:
       - name: Validate codeowners
         if: steps.app-token.outputs.token
         env:
-          OWNERS_FILE: untrusted/ci/OWNERS
+          OWNERS_FILE: nixpkgs/untrusted/ci/OWNERS
           GITHUB_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }}
-          REPOSITORY_PATH: untrusted
+          REPOSITORY_PATH: nixpkgs/untrusted
           OWNER_CHECKER_REPOSITORY: ${{ github.repository }}
           # Set this to "notowned,avoid-shadowing" to check that all files are owned by somebody
           EXPERIMENTAL_CHECKS: "avoid-shadowing"
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 805303ac679e..c3b1c70034be 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -111,7 +111,7 @@ jobs:
           MATRIX_SYSTEM: ${{ matrix.system }}
           MATRIX_VERSION: ${{ matrix.version || 'nixVersions.latest' }}
         run: |
-          nix-build untrusted/ci --arg nixpkgs ./pinned  -A eval.singleSystem \
+          nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned  -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
             --arg chunkSize 8000 \
             --argstr nixPath "$MATRIX_VERSION" \
@@ -190,7 +190,7 @@ jobs:
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
         run: |
-          nix-build untrusted/ci --arg nixpkgs ./pinned -A eval.diff \
+          nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A eval.diff \
             --arg beforeDir ./target \
             --arg afterDir "$(readlink ./merged)" \
             --argstr evalSystem "$MATRIX_SYSTEM" \
@@ -233,7 +233,7 @@ jobs:
 
       - name: Combine all output paths and eval stats
         run: |
-          nix-build trusted/ci --arg nixpkgs ./pinned -A eval.combine \
+          nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/pinned -A eval.combine \
             --arg diffDir ./diff \
             --out-link combined
 
@@ -241,11 +241,11 @@ jobs:
         env:
           AUTHOR_ID: ${{ github.event.pull_request.user.id }}
         run: |
-          git -C trusted diff --name-only ${{ inputs.mergedSha }} \
+          git -C nixpkgs/trusted diff --name-only ${{ inputs.mergedSha }} \
             | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
 
           # Use the target branch to get accurate maintainer info
-          nix-build trusted/ci --arg nixpkgs ./pinned -A eval.compare \
+          nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/pinned -A eval.compare \
             --arg combinedDir "$(realpath ./combined)" \
             --arg touchedFilesJson ./touched-files.json \
             --argstr githubAuthorId "$AUTHOR_ID" \
@@ -392,8 +392,8 @@ jobs:
         uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
       - name: Ensure flake outputs on all systems still evaluate
-        run: nix flake check --all-systems --no-build './untrusted?shallow=1'
+        run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1'
 
       - name: Query nixpkgs with aliases enabled to check for basic syntax errors
         run: |
-          time nix-env -I ./untrusted -f ./untrusted -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null
+          time nix-env -I ./nixpkgs/untrusted -f ./nixpkgs/untrusted -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8e270c4e43c0..771a64c4a5d6 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -44,7 +44,7 @@ jobs:
           # Note that it's fine to run this on untrusted code because:
           # - There's no secrets accessible here
           # - The build is sandboxed
-          if ! nix-build untrusted/ci --arg nixpkgs ./pinned -A fmt.check; then
+          if ! nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A fmt.check; then
             echo "Some files are not properly formatted"
             echo "Please format them by going to the Nixpkgs root directory and running one of:"
             echo "  nix-shell --run treefmt"
@@ -81,7 +81,7 @@ jobs:
       - name: Parse all nix files
         run: |
           # Tests multiple versions at once, let's make sure all of them run, so keep-going.
-          nix-build untrusted/ci --arg nixpkgs ./pinned -A parse --keep-going
+          nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A parse --keep-going
 
   nixpkgs-vet:
     runs-on: ubuntu-24.04-arm
@@ -112,7 +112,7 @@ jobs:
           # Force terminal colors to be enabled. The library that `nixpkgs-vet` uses respects https://bixense.com/clicolors/
           CLICOLOR_FORCE: 1
         run: |
-          if nix-build untrusted/ci --arg nixpkgs ./pinned -A nixpkgs-vet --arg base "./trusted" --arg head "./untrusted"; then
+          if nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A nixpkgs-vet --arg base "./nixpkgs/trusted" --arg head "./nixpkgs/untrusted"; then
             exit 0
           else
             exitCode=$?

From 45c1777cd95c0064348d2e64a5bebc18c3cd7ac2 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Fri, 22 Aug 2025 15:45:50 +0800
Subject: [PATCH 2678/3724] xflux-gui: drop

The upstream project is no longer being maintained. https://github.com/xflux-gui/fluxgui#this-package-is-barely-maintained
---
 pkgs/tools/misc/xflux/default.nix | 51 -----------------------
 pkgs/tools/misc/xflux/gui.nix     | 68 -------------------------------
 pkgs/top-level/aliases.nix        |  1 +
 pkgs/top-level/all-packages.nix   |  1 -
 4 files changed, 1 insertion(+), 120 deletions(-)
 delete mode 100644 pkgs/tools/misc/xflux/default.nix
 delete mode 100644 pkgs/tools/misc/xflux/gui.nix

diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix
deleted file mode 100644
index 442d7f8d5d7e..000000000000
--- a/pkgs/tools/misc/xflux/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  libXxf86vm,
-  libXext,
-  libX11,
-  libXrandr,
-  gcc,
-}:
-stdenv.mkDerivation {
-  pname = "xflux";
-  version = "unstable-2013-09-01";
-  src = fetchurl {
-    url = "https://justgetflux.com/linux/xflux64.tgz";
-    sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021";
-  };
-
-  libPath = lib.makeLibraryPath [
-    gcc.cc
-    libXxf86vm
-    libXext
-    libX11
-    libXrandr
-  ];
-
-  unpackPhase = ''
-    unpackFile $src;
-  '';
-  installPhase = ''
-    mkdir -p "$out/bin"
-    cp  xflux "$out/bin"
-  '';
-  postFixup = ''
-    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "$libPath" "$out/bin/xflux"
-  '';
-  meta = {
-    description = "Adjusts your screen to emit warmer light at night";
-    longDescription = ''
-      xflux changes the color temperature of your screen to be much warmer
-      when the sun sets, and then changes it back its colder temperature
-      when the sun rises.
-    '';
-    homepage = "https://justgetflux.com/";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = lib.licenses.unfree;
-    platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.paholg ];
-    mainProgram = "xflux";
-  };
-}
diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix
deleted file mode 100644
index cdbef0d9ddbf..000000000000
--- a/pkgs/tools/misc/xflux/gui.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  buildPythonApplication,
-  python,
-  wrapGAppsHook3,
-  xflux,
-  gtk3,
-  gobject-introspection,
-  pango,
-  gdk-pixbuf,
-  atk,
-  pexpect,
-  pygobject3,
-  pyxdg,
-  libappindicator-gtk3,
-}:
-buildPythonApplication rec {
-  pname = "xflux-gui";
-  version = "1.2.0";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    repo = "xflux-gui";
-    owner = "xflux-gui";
-    rev = "v${version}";
-    sha256 = "09zphcd9821ink63636swql4g85hg6lpsazqg1mawlk9ikc8zbps";
-  };
-
-  propagatedBuildInputs = [
-    pyxdg
-    pexpect
-    pygobject3
-  ];
-
-  buildInputs = [
-    xflux
-    gtk3
-  ];
-
-  nativeBuildInputs = [
-    wrapGAppsHook3
-    gobject-introspection
-    pango
-    gdk-pixbuf
-    atk
-    libappindicator-gtk3
-  ];
-
-  postPatch = ''
-    substituteInPlace src/fluxgui/xfluxcontroller.py \
-      --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${xflux}/bin/xflux\""
-  '';
-
-  postFixup = ''
-    wrapGAppsHook
-    wrapPythonPrograms
-    patchPythonScript $out/${python.sitePackages}/fluxgui/fluxapp.py
-  '';
-
-  meta = {
-    description = "Better lighting for Linux. Open source GUI for xflux";
-    homepage = "https://justgetflux.com/linux.html";
-    license = lib.licenses.unfree; # marked as unfree since the source code contains a copy of the unfree xflux binary
-    maintainers = [ lib.maintainers.sheenobu ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 56f14e523835..26a9d22cb2cf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2383,6 +2383,7 @@ mapAliases {
   xen_4_18 = throw "Due to technical challenges involving building older versions of Xen with newer dependencies, the Xen Project Hypervisor Maintenance Team decided to switch to a latest-only support cycle. As Xen 4.18 would have been the 'n-1' version, it was removed"; # Added 2024-10-05
   xen_4_19 = throw "Use 'xen' instead"; # Added 2024-10-05
   xenPackages = throw "The attributes in the xenPackages set have been promoted to the top-level. (xenPackages.xen_4_19 -> xen)";
+  xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22
   xineLib = throw "'xineLib' has been renamed to/replaced by 'xine-lib'"; # Converted to throw 2024-10-17
   xineUI = throw "'xineUI' has been renamed to/replaced by 'xine-ui'"; # Converted to throw 2024-10-17
   xlsxgrep = throw "'xlsxgrep' has been dropped due to lack of maintenance."; # Added 2024-11-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3072866de458..b28159fb12fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4547,7 +4547,6 @@ with pkgs;
   xdot = with python3Packages; toPythonApplication xdot;
 
   xflux = callPackage ../tools/misc/xflux { };
-  xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { };
 
   libxfs = xfsprogs.dev;
 

From 978931902c68b3bc074c5d005bdd3d73c3422e37 Mon Sep 17 00:00:00 2001
From: phaer <hello@phaer.org>
Date: Mon, 28 Jul 2025 14:06:16 +0200
Subject: [PATCH 2679/3724] maintainers: drop abbradar

Listed as maintainer for ~170 packages but last commit that made it to
master was 6786ceb in February 2022.

Unresponsive on PRs, such as i.e. #411522
---
 maintainers/maintainer-list.nix                      |  6 ------
 nixos/tests/docker-rootless.nix                      |  2 +-
 pkgs/applications/audio/deadbeef/default.nix         |  2 +-
 pkgs/applications/audio/deadbeef/plugins/mpris2.nix  |  2 +-
 .../applications/display-managers/sddm/unwrapped.nix |  1 -
 pkgs/applications/emulators/kega-fusion/default.nix  |  2 +-
 pkgs/applications/misc/cura/default.nix              |  4 +---
 pkgs/applications/misc/curaengine/default.nix        |  4 +---
 pkgs/applications/misc/openbrf/default.nix           |  2 +-
 .../networking/instant-messengers/gajim/default.nix  |  1 -
 .../pidgin/pidgin-plugins/otr/default.nix            |  2 +-
 .../pidgin/pidgin-plugins/pidgin-latex/default.nix   |  2 +-
 .../science/robotics/sumorobot-manager/default.nix   |  2 +-
 .../rxvt-unicode-plugins/urxvt-perls/default.nix     |  2 +-
 .../rxvt-unicode-plugins/urxvt-tabbedex/default.nix  |  2 +-
 .../window-managers/xmonad/log-applet/default.nix    |  2 +-
 pkgs/by-name/an/android-udev-rules/package.nix       |  2 +-
 pkgs/by-name/av/avidemux/package.nix                 |  2 +-
 pkgs/by-name/bl/blueman/package.nix                  |  2 +-
 pkgs/by-name/bu/bumblebee/package.nix                |  2 +-
 pkgs/by-name/ca/cachefilesd/package.nix              |  2 +-
 pkgs/by-name/cp/cppzmq/package.nix                   |  2 +-
 pkgs/by-name/do/double-conversion/package.nix        |  2 +-
 pkgs/by-name/dr/dropbear/package.nix                 |  2 +-
 pkgs/by-name/ds/dspam/package.nix                    |  2 +-
 pkgs/by-name/ej/ejabberd/package.nix                 |  1 -
 pkgs/by-name/fa/fast-downward/package.nix            |  2 +-
 pkgs/by-name/fo/folly/package.nix                    |  1 -
 pkgs/by-name/fp/fprintd/package.nix                  |  2 +-
 pkgs/by-name/gb/gbenchmark/package.nix               |  2 +-
 pkgs/by-name/go/google-guest-agent/package.nix       |  2 +-
 pkgs/by-name/go/google-guest-configs/package.nix     |  2 +-
 pkgs/by-name/ij/ijs/package.nix                      |  2 +-
 pkgs/by-name/im/imgurbash2/package.nix               |  2 +-
 pkgs/by-name/in/innoextract/package.nix              |  2 +-
 pkgs/by-name/io/ioquake3/package.nix                 |  1 -
 pkgs/by-name/ip/ipopt/package.nix                    |  2 +-
 pkgs/by-name/kr/krita/generic.nix                    |  1 -
 pkgs/by-name/lb/lbzip2/package.nix                   |  2 +-
 pkgs/by-name/li/libaacs/package.nix                  |  2 +-
 pkgs/by-name/li/libbdplus/package.nix                |  2 +-
 pkgs/by-name/li/libbluray/package.nix                |  2 +-
 pkgs/by-name/li/libburn/package.nix                  |  4 +---
 pkgs/by-name/li/libchardet/package.nix               |  2 +-
 pkgs/by-name/li/libfprint/package.nix                |  2 +-
 pkgs/by-name/li/libiberty/package.nix                |  1 -
 pkgs/by-name/li/libisofs/package.nix                 |  4 +---
 pkgs/by-name/li/libtirpc/package.nix                 |  2 +-
 pkgs/by-name/li/libudev0-shim/package.nix            |  2 +-
 pkgs/by-name/li/libvdpau-va-gl/package.nix           |  2 +-
 pkgs/by-name/li/libxls/package.nix                   |  2 +-
 pkgs/by-name/lo/logmein-hamachi/package.nix          |  2 +-
 pkgs/by-name/lt/ltunify/package.nix                  |  2 +-
 pkgs/by-name/m3/m33-linux/package.nix                |  2 +-
 pkgs/by-name/mj/mjpegtools/package.nix               |  2 +-
 pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix     |  2 +-
 pkgs/by-name/mx/mxnet/package.nix                    |  2 +-
 pkgs/by-name/my/mystem/package.nix                   |  2 +-
 pkgs/by-name/ne/networkmanager-l2tp/package.nix      |  1 -
 pkgs/by-name/nf/nfs-utils/package.nix                |  2 +-
 pkgs/by-name/oc/octoprint/package.nix                |  1 -
 pkgs/by-name/oc/octoprint/plugins.nix                | 12 ++++++------
 pkgs/by-name/od/odroid-xu3-bootloader/package.nix    |  2 +-
 pkgs/by-name/op/opendkim/package.nix                 |  2 +-
 pkgs/by-name/op/openjfx/package.nix                  |  2 +-
 pkgs/by-name/op/openspades/package.nix               |  1 -
 pkgs/by-name/os/osi/package.nix                      |  2 +-
 pkgs/by-name/pa/pacparser/package.nix                |  2 +-
 pkgs/by-name/pa/pam_pgsql/package.nix                |  2 +-
 pkgs/by-name/pa/pamtester/package.nix                |  2 +-
 pkgs/by-name/pa/paprefs/package.nix                  |  2 +-
 pkgs/by-name/pa/pavucontrol/package.nix              |  2 +-
 pkgs/by-name/po/postsrsd/package.nix                 |  2 +-
 pkgs/by-name/pr/primusLib/package.nix                |  2 +-
 pkgs/by-name/pr/prosody-filer/package.nix            |  2 +-
 pkgs/by-name/qp/qpdf/package.nix                     |  2 +-
 pkgs/by-name/rp/rpcbind/package.nix                  |  2 +-
 pkgs/by-name/rp/rpcs3/package.nix                    |  1 -
 pkgs/by-name/rp/rpmextract/package.nix               |  2 +-
 pkgs/by-name/sc/schedtool/package.nix                |  2 +-
 pkgs/by-name/sc/scorched3d/package.nix               |  2 +-
 pkgs/by-name/sd/sdl-jstest/package.nix               |  2 +-
 pkgs/by-name/so/soundfont-fluid/package.nix          |  2 +-
 pkgs/by-name/st/stremio/package.nix                  |  1 -
 pkgs/by-name/sv/svox/package.nix                     |  2 +-
 pkgs/by-name/sw/swarm/package.nix                    |  2 +-
 pkgs/by-name/th/the-powder-toy/package.nix           |  1 -
 pkgs/by-name/th/thermald/package.nix                 |  2 +-
 pkgs/by-name/un/unnethack/package.nix                |  2 +-
 pkgs/by-name/ut/utsushi-networkscan/package.nix      |  2 +-
 pkgs/by-name/uw/uwsgi/package.nix                    |  1 -
 pkgs/by-name/vc/vcg/package.nix                      |  2 +-
 pkgs/by-name/wi/wipe/package.nix                     |  2 +-
 pkgs/by-name/xg/xgboost/package.nix                  |  1 -
 pkgs/by-name/xi/xiccd/package.nix                    |  2 +-
 pkgs/by-name/xi/xits-math/package.nix                |  2 +-
 pkgs/by-name/xl/xl2tpd/package.nix                   |  2 +-
 pkgs/by-name/xl/xlslib/package.nix                   |  2 +-
 pkgs/by-name/ya/yaml-merge/package.nix               |  2 +-
 pkgs/by-name/ye/yed/package.nix                      |  2 +-
 pkgs/by-name/ze/zeroc-ice/package.nix                |  2 +-
 pkgs/data/fonts/emojione/default.nix                 |  2 +-
 .../applications/xfce4-volumed-pulse/default.nix     |  2 +-
 .../development/interpreters/spidermonkey/common.nix |  1 -
 pkgs/development/libraries/dee/default.nix           |  2 +-
 pkgs/development/libraries/qt-5/modules/qtwebkit.nix |  1 -
 .../libraries/qtwebkit-plugins/default.nix           |  2 +-
 pkgs/development/libraries/vc/0.7.nix                |  2 +-
 pkgs/development/libraries/vc/default.nix            |  2 +-
 .../python-modules/awesome-slugify/default.nix       |  2 +-
 pkgs/development/python-modules/chainmap/default.nix |  2 +-
 pkgs/development/python-modules/crc16/default.nix    |  2 +-
 .../development/python-modules/datatable/default.nix |  2 +-
 .../python-modules/flask-assets/default.nix          |  2 +-
 .../python-modules/flask-login/default.nix           |  2 +-
 .../python-modules/flask-principal/default.nix       |  2 +-
 .../python-modules/flask-script/default.nix          |  2 +-
 pkgs/development/python-modules/hmmlearn/default.nix |  2 +-
 pkgs/development/python-modules/libarcus/default.nix |  4 +---
 .../python-modules/libsavitar/default.nix            |  1 -
 pkgs/development/python-modules/mlrose/default.nix   |  2 +-
 pkgs/development/python-modules/nbxmpp/default.nix   |  2 +-
 pkgs/development/python-modules/plyfile/default.nix  |  2 +-
 .../python-modules/pychromecast/default.nix          |  2 +-
 pkgs/development/python-modules/pylru/default.nix    |  2 +-
 .../development/python-modules/pymystem3/default.nix |  2 +-
 pkgs/development/python-modules/pyspf/default.nix    |  2 +-
 .../python-axolotl-curve25519/default.nix            |  2 +-
 .../python-modules/python-axolotl/default.nix        |  2 +-
 .../python-modules/python-pam/default.nix            |  1 -
 .../python-modules/python-uinput/default.nix         |  2 +-
 pkgs/development/python-modules/regex/default.nix    |  2 +-
 pkgs/development/python-modules/sarge/default.nix    |  2 +-
 .../python-modules/sockjs-tornado/default.nix        |  2 +-
 pkgs/development/python-modules/sphfile/default.nix  |  2 +-
 .../tensorboard-data-server/default.nix              |  2 +-
 .../python-modules/tensorboard/default.nix           |  2 +-
 pkgs/development/python-modules/tensorflow/bin.nix   |  4 +---
 .../python-modules/tensorflow/default.nix            |  2 +-
 .../python-modules/typesentry/default.nix            |  2 +-
 pkgs/development/python-modules/uranium/default.nix  |  4 +---
 pkgs/development/python-modules/virtkey/default.nix  |  2 +-
 .../development/python-modules/webassets/default.nix |  2 +-
 .../development/python-modules/zeroc-ice/default.nix |  2 +-
 pkgs/development/python-modules/zeroconf/default.nix |  2 +-
 pkgs/development/python2-modules/scandir/default.nix |  2 +-
 pkgs/games/crawl/default.nix                         |  2 +-
 pkgs/games/doom-ports/slade/default.nix              |  2 +-
 pkgs/games/dwarf-fortress/dfhack/default.nix         |  1 -
 .../games/dwarf-fortress/dwarf-therapist/default.nix |  1 -
 pkgs/games/dwarf-fortress/game.nix                   |  1 -
 pkgs/games/dwarf-fortress/unfuck.nix                 |  1 -
 pkgs/games/nethack/default.nix                       |  2 +-
 pkgs/games/openmw/default.nix                        |  1 -
 pkgs/games/quake3/content/arena.nix                  |  2 +-
 pkgs/games/quake3/content/demo.nix                   |  2 +-
 pkgs/games/quake3/content/pointrelease.nix           |  2 +-
 pkgs/games/warsow/default.nix                        |  1 -
 pkgs/games/warsow/engine.nix                         |  1 -
 pkgs/games/wesnoth/default.nix                       |  1 -
 pkgs/os-specific/linux/bbswitch/default.nix          |  2 +-
 pkgs/os-specific/linux/displaylink/default.nix       |  2 +-
 pkgs/os-specific/linux/nvidia-x11/persistenced.nix   |  2 +-
 pkgs/os-specific/linux/nvidia-x11/settings.nix       |  1 -
 pkgs/servers/mail/spf-engine/default.nix             |  2 +-
 pkgs/servers/mtprotoproxy/default.nix                |  2 +-
 pkgs/servers/nosql/influxdb2/cli.nix                 |  2 +-
 pkgs/servers/nosql/influxdb2/default.nix             |  2 +-
 pkgs/tools/X11/virtualgl/lib.nix                     |  2 +-
 pkgs/tools/misc/grub4dos/default.nix                 |  2 +-
 pkgs/tools/misc/scfbuild/default.nix                 |  2 +-
 pkgs/tools/misc/tlp/default.nix                      |  1 -
 pkgs/tools/networking/openvpn/update-resolv-conf.nix |  2 +-
 pkgs/top-level/perl-packages.nix                     |  3 +--
 174 files changed, 149 insertions(+), 199 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b10c92acaa98..c1f5d62eb6b7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -432,12 +432,6 @@
     name = "Ashish SHUKLA";
     keys = [ { fingerprint = "F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0"; } ];
   };
-  abbradar = {
-    email = "ab@fmap.me";
-    github = "abbradar";
-    githubId = 1174810;
-    name = "Nikolay Amiantov";
-  };
   abcsds = {
     email = "abcsds@gmail.com";
     github = "abcsds";
diff --git a/nixos/tests/docker-rootless.nix b/nixos/tests/docker-rootless.nix
index a2e6a52ca13c..c1925bababfa 100644
--- a/nixos/tests/docker-rootless.nix
+++ b/nixos/tests/docker-rootless.nix
@@ -3,7 +3,7 @@
 {
   name = "docker-rootless";
   meta = with pkgs.lib.maintainers; {
-    maintainers = [ abbradar ];
+    maintainers = [ ];
   };
 
   nodes = {
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 7393b0c80e74..28e55a7225cb 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -191,6 +191,6 @@ clangStdenv.mkDerivation {
       "x86_64-linux"
       "i686-linux"
     ];
-    maintainers = [ maintainers.abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
index bb41a6f0f5f4..0b008be7ebc2 100644
--- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/DeaDBeeF-Player/deadbeef-mpris2-plugin/";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix
index 2e2bb8710280..1081289b5583 100644
--- a/pkgs/applications/display-managers/sddm/unwrapped.nix
+++ b/pkgs/applications/display-managers/sddm/unwrapped.nix
@@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "QML based X11 display manager";
     homepage = "https://github.com/sddm/sddm";
     maintainers = with maintainers; [
-      abbradar
       ttuegel
       k900
     ];
diff --git a/pkgs/applications/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix
index e74e02d9e506..12df94db6f75 100644
--- a/pkgs/applications/emulators/kega-fusion/default.nix
+++ b/pkgs/applications/emulators/kega-fusion/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Sega SG1000, SC3000, SF7000, Master System, Game Gear, Genesis/Megadrive, SVP, Pico, SegaCD/MegaCD and 32X emulator";
     homepage = "https://www.carpeludum.com/kega-fusion/";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfreeRedistributable;
     platforms = [ "i686-linux" ];
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 88f3579753c2..1275693f7895 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -89,8 +89,6 @@ mkDerivation rec {
     homepage = "https://github.com/Ultimaker/Cura";
     license = licenses.lgpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [
-      abbradar
-    ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 20a0359c6ebd..39f94f8afa79 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -43,9 +43,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Ultimaker/CuraEngine";
     license = licenses.agpl3Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [
-      abbradar
-    ];
+    maintainers = [ ];
     mainProgram = "CuraEngine";
   };
 }
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
index bfac320abe8a..6daad96ec869 100644
--- a/pkgs/applications/misc/openbrf/default.nix
+++ b/pkgs/applications/misc/openbrf/default.nix
@@ -77,7 +77,7 @@ mkDerivation {
     description = "Tool to edit resource files (BRF)";
     mainProgram = "openBrf";
     homepage = "https://github.com/cfcohen/openbrf";
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
     license = licenses.free;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 1ef204d6ad7e..c36739360cbb 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -141,7 +141,6 @@ python3.pkgs.buildPythonApplication rec {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       raskin
-      abbradar
       hlad
     ];
     downloadPage = "http://gajim.org/download/";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/otr/default.nix
index 912afcc18e15..be7a3f1b7920 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/otr/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/otr/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     description = "Plugin for Pidgin 2.x which implements OTR Messaging";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-latex/default.nix
index bdf455ea9ee9..947039a5d9b9 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-latex/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-latex/default.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation {
     description = "LaTeX rendering plugin for Pidgin IM";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
index 226d83b6beda..b729f9246d19 100644
--- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix
+++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
@@ -55,6 +55,6 @@ stdenv.mkDerivation rec {
     mainProgram = "sumorobot-manager";
     homepage = "https://www.robokoding.com/kits/sumorobot/sumomanager/";
     license = licenses.mit;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix
index 1055f7ba19c8..88c1a0292116 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description = "Perl extensions for the rxvt-unicode terminal emulator";
     homepage = "https://github.com/muennich/urxvt-perls";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
index 0c9eec816abb..da50d1b751ba 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)";
     homepage = "https://github.com/mina86/urxvt-tabbedex";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
index 2d93fa25bd1a..5aaa3ae310c2 100644
--- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix
+++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
@@ -68,6 +68,6 @@ stdenv.mkDerivation rec {
     broken = desktopSupport == "gnomeflashback" || desktopSupport == "xfce4";
     description = "Applet that will display XMonad log information (${desktopSupport} version)";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/an/android-udev-rules/package.nix b/pkgs/by-name/an/android-udev-rules/package.nix
index 0feccf16cc1f..4c118124e02b 100644
--- a/pkgs/by-name/an/android-udev-rules/package.nix
+++ b/pkgs/by-name/an/android-udev-rules/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.abbradar ];
+    maintainers = [ ];
     teams = [ lib.teams.android ];
   };
 })
diff --git a/pkgs/by-name/av/avidemux/package.nix b/pkgs/by-name/av/avidemux/package.nix
index 804251f8ab3a..b570d6036af6 100644
--- a/pkgs/by-name/av/avidemux/package.nix
+++ b/pkgs/by-name/av/avidemux/package.nix
@@ -165,7 +165,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "http://fixounet.free.fr/avidemux/";
     description = "Free video editor designed for simple video editing tasks";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     # "CPU not supported" errors on AArch64
     platforms = [
       "i686-linux"
diff --git a/pkgs/by-name/bl/blueman/package.nix b/pkgs/by-name/bl/blueman/package.nix
index a446c718fc80..8255698f799d 100644
--- a/pkgs/by-name/bl/blueman/package.nix
+++ b/pkgs/by-name/bl/blueman/package.nix
@@ -99,6 +99,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
     changelog = "https://github.com/blueman-project/blueman/releases/tag/${version}";
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/bu/bumblebee/package.nix b/pkgs/by-name/bu/bumblebee/package.nix
index 396de3a8e486..4d59f5c5de5d 100644
--- a/pkgs/by-name/bu/bumblebee/package.nix
+++ b/pkgs/by-name/bu/bumblebee/package.nix
@@ -182,7 +182,7 @@ stdenv.mkDerivation rec {
     description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)";
     homepage = "https://github.com/Bumblebee-Project/Bumblebee";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ca/cachefilesd/package.nix b/pkgs/by-name/ca/cachefilesd/package.nix
index c6e2f2467d57..d2f90e05dc40 100644
--- a/pkgs/by-name/ca/cachefilesd/package.nix
+++ b/pkgs/by-name/ca/cachefilesd/package.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     homepage = "https://people.redhat.com/dhowells/fscache/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cp/cppzmq/package.nix b/pkgs/by-name/cp/cppzmq/package.nix
index b3433f72589f..27783daa1418 100644
--- a/pkgs/by-name/cp/cppzmq/package.nix
+++ b/pkgs/by-name/cp/cppzmq/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/zeromq/cppzmq";
     license = licenses.bsd2;
     description = "C++ binding for 0MQ";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/do/double-conversion/package.nix b/pkgs/by-name/do/double-conversion/package.nix
index 508a6d576cb2..11e87a0546c0 100644
--- a/pkgs/by-name/do/double-conversion/package.nix
+++ b/pkgs/by-name/do/double-conversion/package.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/google/double-conversion";
     license = licenses.bsd3;
     platforms = platforms.unix ++ platforms.windows;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/dr/dropbear/package.nix b/pkgs/by-name/dr/dropbear/package.nix
index aa787b877641..fb46cd50916f 100644
--- a/pkgs/by-name/dr/dropbear/package.nix
+++ b/pkgs/by-name/dr/dropbear/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     homepage = "https://matt.ucc.asn.au/dropbear/dropbear.html";
     changelog = "https://github.com/mkj/dropbear/raw/DROPBEAR_${version}/CHANGES";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ds/dspam/package.nix b/pkgs/by-name/ds/dspam/package.nix
index 2458bde95bd7..e4fedd60710e 100644
--- a/pkgs/by-name/ds/dspam/package.nix
+++ b/pkgs/by-name/ds/dspam/package.nix
@@ -149,6 +149,6 @@ stdenv.mkDerivation rec {
     description = "Community Driven Antispam Filter";
     license = licenses.agpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix
index 18cac7c484c6..fe5759d5ca38 100644
--- a/pkgs/by-name/ej/ejabberd/package.nix
+++ b/pkgs/by-name/ej/ejabberd/package.nix
@@ -222,7 +222,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       sander
-      abbradar
       chuangzhu
       toastal
     ];
diff --git a/pkgs/by-name/fa/fast-downward/package.nix b/pkgs/by-name/fa/fast-downward/package.nix
index 644e75080674..102057098896 100644
--- a/pkgs/by-name/fa/fast-downward/package.nix
+++ b/pkgs/by-name/fa/fast-downward/package.nix
@@ -74,6 +74,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.fast-downward.org/";
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix
index 0d6ab08f0dbd..4589aeac7ed9 100644
--- a/pkgs/by-name/fo/folly/package.nix
+++ b/pkgs/by-name/fo/folly/package.nix
@@ -211,7 +211,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     badPlatforms = [ lib.systems.inspect.patterns.is32bit ];
     maintainers = with lib.maintainers; [
-      abbradar
       pierreis
       emily
       techknowlogick
diff --git a/pkgs/by-name/fp/fprintd/package.nix b/pkgs/by-name/fp/fprintd/package.nix
index 18214fb2cc89..8f30b1437c8b 100644
--- a/pkgs/by-name/fp/fprintd/package.nix
+++ b/pkgs/by-name/fp/fprintd/package.nix
@@ -117,6 +117,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/gb/gbenchmark/package.nix b/pkgs/by-name/gb/gbenchmark/package.nix
index f2a3303ee57d..f029c4e0603a 100644
--- a/pkgs/by-name/gb/gbenchmark/package.nix
+++ b/pkgs/by-name/gb/gbenchmark/package.nix
@@ -53,6 +53,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/google/benchmark";
     license = licenses.asl20;
     platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/go/google-guest-agent/package.nix b/pkgs/by-name/go/google-guest-agent/package.nix
index 9c2f5877df70..a732049dd286 100644
--- a/pkgs/by-name/go/google-guest-agent/package.nix
+++ b/pkgs/by-name/go/google-guest-agent/package.nix
@@ -61,7 +61,7 @@ buildGoModule rec {
     homepage = "https://github.com/GoogleCloudPlatform/guest-agent";
     changelog = "https://github.com/GoogleCloudPlatform/guest-agent/releases/tag/${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/go/google-guest-configs/package.nix b/pkgs/by-name/go/google-guest-configs/package.nix
index de856f0d0d57..c8d39f859a14 100644
--- a/pkgs/by-name/go/google-guest-configs/package.nix
+++ b/pkgs/by-name/go/google-guest-configs/package.nix
@@ -73,6 +73,6 @@ stdenv.mkDerivation rec {
     description = "Linux Guest Environment for Google Compute Engine";
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ij/ijs/package.nix b/pkgs/by-name/ij/ijs/package.nix
index d8f363082df4..0ee5ee45cd82 100644
--- a/pkgs/by-name/ij/ijs/package.nix
+++ b/pkgs/by-name/ij/ijs/package.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation {
     license = licenses.gpl3Plus;
 
     platforms = platforms.all;
-    maintainers = [ maintainers.abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/im/imgurbash2/package.nix b/pkgs/by-name/im/imgurbash2/package.nix
index 10bb01e7690f..64e09892387a 100644
--- a/pkgs/by-name/im/imgurbash2/package.nix
+++ b/pkgs/by-name/im/imgurbash2/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     description = "Shell script that uploads images to imgur";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     homepage = "https://github.com/ram-on/imgurbash2";
     mainProgram = "imgurbash2";
   };
diff --git a/pkgs/by-name/in/innoextract/package.nix b/pkgs/by-name/in/innoextract/package.nix
index 922d4d8d0e19..644c57812260 100644
--- a/pkgs/by-name/in/innoextract/package.nix
+++ b/pkgs/by-name/in/innoextract/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     description = "Tool to unpack installers created by Inno Setup";
     homepage = "https://constexpr.org/innoextract/";
     license = licenses.zlib;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "innoextract";
   };
diff --git a/pkgs/by-name/io/ioquake3/package.nix b/pkgs/by-name/io/ioquake3/package.nix
index 7565199dc9e6..59fcc1e7a882 100644
--- a/pkgs/by-name/io/ioquake3/package.nix
+++ b/pkgs/by-name/io/ioquake3/package.nix
@@ -127,7 +127,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     mainProgram = "ioquake3";
     maintainers = with lib.maintainers; [
-      abbradar
       rvolosatovs
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ip/ipopt/package.nix b/pkgs/by-name/ip/ipopt/package.nix
index 13b083cb7eb8..59495c77b3db 100644
--- a/pkgs/by-name/ip/ipopt/package.nix
+++ b/pkgs/by-name/ip/ipopt/package.nix
@@ -70,6 +70,6 @@ stdenv.mkDerivation rec {
     homepage = "https://projects.coin-or.org/Ipopt";
     license = lib.licenses.epl10;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/kr/krita/generic.nix b/pkgs/by-name/kr/krita/generic.nix
index cb34f8c16d24..efbe92621424 100644
--- a/pkgs/by-name/kr/krita/generic.nix
+++ b/pkgs/by-name/kr/krita/generic.nix
@@ -168,7 +168,6 @@ mkDerivation rec {
     description = "Free and open source painting application";
     homepage = "https://krita.org/";
     maintainers = with lib.maintainers; [
-      abbradar
       sifmelcara
       nek0
     ];
diff --git a/pkgs/by-name/lb/lbzip2/package.nix b/pkgs/by-name/lb/lbzip2/package.nix
index b08fa3c46516..795d35089771 100644
--- a/pkgs/by-name/lb/lbzip2/package.nix
+++ b/pkgs/by-name/lb/lbzip2/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/kjn/lbzip2"; # Formerly http://lbzip2.org/
     description = "Parallel bzip2 compression utility";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/li/libaacs/package.nix b/pkgs/by-name/li/libaacs/package.nix
index 656aca8ddfa8..01eacc918a74 100644
--- a/pkgs/by-name/li/libaacs/package.nix
+++ b/pkgs/by-name/li/libaacs/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     description = "Library to access AACS protected Blu-Ray disks";
     mainProgram = "aacs_info";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/by-name/li/libbdplus/package.nix b/pkgs/by-name/li/libbdplus/package.nix
index c894a07eba1f..65ce5347951a 100644
--- a/pkgs/by-name/li/libbdplus/package.nix
+++ b/pkgs/by-name/li/libbdplus/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.videolan.org/developers/libbdplus.html";
     description = "Library to access BD+ protected Blu-Ray disks";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/by-name/li/libbluray/package.nix b/pkgs/by-name/li/libbluray/package.nix
index 684c53c62d00..b65ebdf349e3 100644
--- a/pkgs/by-name/li/libbluray/package.nix
+++ b/pkgs/by-name/li/libbluray/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.videolan.org/developers/libbluray.html";
     description = "Library to access Blu-Ray disks for video playback";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/li/libburn/package.nix b/pkgs/by-name/li/libburn/package.nix
index 8eafecde7828..6741cb3e0925 100644
--- a/pkgs/by-name/li/libburn/package.nix
+++ b/pkgs/by-name/li/libburn/package.nix
@@ -45,9 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)";
     changelog = "https://dev.lovelyhq.com/libburnia/libburn/src/tag/${finalAttrs.src.rev}/ChangeLog";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [
-      abbradar
-    ];
+    maintainers = [ ];
     mainProgram = "cdrskin";
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/li/libchardet/package.nix b/pkgs/by-name/li/libchardet/package.nix
index ba922c6f98cf..de4963ccea37 100644
--- a/pkgs/by-name/li/libchardet/package.nix
+++ b/pkgs/by-name/li/libchardet/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     mainProgram = "chardet-config";
     homepage = "ftp://ftp.oops.org/pub/oops/libchardet/index.html";
     license = licenses.mpl11;
-    maintainers = [ maintainers.abbradar ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/li/libfprint/package.nix b/pkgs/by-name/li/libfprint/package.nix
index 6e08860d3f3d..501f9042bed9 100644
--- a/pkgs/by-name/li/libfprint/package.nix
+++ b/pkgs/by-name/li/libfprint/package.nix
@@ -94,6 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Library designed to make it easy to add support for consumer fingerprint readers";
     license = lib.licenses.lgpl21Only;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/li/libiberty/package.nix b/pkgs/by-name/li/libiberty/package.nix
index f3d63bdac2e3..8046b08b791a 100644
--- a/pkgs/by-name/li/libiberty/package.nix
+++ b/pkgs/by-name/li/libiberty/package.nix
@@ -39,7 +39,6 @@ stdenv.mkDerivation {
     license = licenses.lgpl2;
     description = "Collection of subroutines used by various GNU programs";
     maintainers = with maintainers; [
-      abbradar
       ericson2314
     ];
     platforms = platforms.unix;
diff --git a/pkgs/by-name/li/libisofs/package.nix b/pkgs/by-name/li/libisofs/package.nix
index 5e6307f2616d..dcb64802ad31 100644
--- a/pkgs/by-name/li/libisofs/package.nix
+++ b/pkgs/by-name/li/libisofs/package.nix
@@ -49,9 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet";
     changelog = "https://dev.lovelyhq.com/libburnia/libisofs/src/tag/${finalAttrs.src.rev}/ChangeLog";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [
-      abbradar
-    ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/li/libtirpc/package.nix b/pkgs/by-name/li/libtirpc/package.nix
index 95819e42330e..1c18d91862d1 100644
--- a/pkgs/by-name/li/libtirpc/package.nix
+++ b/pkgs/by-name/li/libtirpc/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     description = "Transport-independent Sun RPC implementation (TI-RPC)";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     longDescription = ''
       Currently, NFS commands use the SunRPC routines provided by the
       glibc.  These routines do not support IPv6 addresses.  Ulrich
diff --git a/pkgs/by-name/li/libudev0-shim/package.nix b/pkgs/by-name/li/libudev0-shim/package.nix
index 55f51b8b412d..012c8436b2a1 100644
--- a/pkgs/by-name/li/libudev0-shim/package.nix
+++ b/pkgs/by-name/li/libudev0-shim/package.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/archlinux/libudev0-shim";
     platforms = platforms.linux;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/li/libvdpau-va-gl/package.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix
index 0f035821e476..7741308d9dc1 100644
--- a/pkgs/by-name/li/libvdpau-va-gl/package.nix
+++ b/pkgs/by-name/li/libvdpau-va-gl/package.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     description = "VDPAU driver with OpenGL/VAAPI backend";
     license = licenses.lgpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/li/libxls/package.nix b/pkgs/by-name/li/libxls/package.nix
index 50dab3f68365..ab020551d986 100644
--- a/pkgs/by-name/li/libxls/package.nix
+++ b/pkgs/by-name/li/libxls/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "Extract Cell Data From Excel xls files";
     homepage = "https://github.com/libxls/libxls";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     mainProgram = "xls2csv";
     platforms = platforms.unix;
   };
diff --git a/pkgs/by-name/lo/logmein-hamachi/package.nix b/pkgs/by-name/lo/logmein-hamachi/package.nix
index 64e1a06071fd..04e4e30baaac 100644
--- a/pkgs/by-name/lo/logmein-hamachi/package.nix
+++ b/pkgs/by-name/lo/logmein-hamachi/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     changelog = "https://support.logmeininc.com/central/help/whats-new-in-hamachi";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfreeRedistributable;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/lt/ltunify/package.nix b/pkgs/by-name/lt/ltunify/package.nix
index d507cf119e32..e4595c1623b3 100644
--- a/pkgs/by-name/lt/ltunify/package.nix
+++ b/pkgs/by-name/lt/ltunify/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://lekensteyn.nl/logitech-unifying.html";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "ltunify";
   };
diff --git a/pkgs/by-name/m3/m33-linux/package.nix b/pkgs/by-name/m3/m33-linux/package.nix
index d95c32297ad7..ff43ccdf154e 100644
--- a/pkgs/by-name/m3/m33-linux/package.nix
+++ b/pkgs/by-name/m3/m33-linux/package.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation {
     mainProgram = "m33-linux";
     license = licenses.gpl2Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/mj/mjpegtools/package.nix b/pkgs/by-name/mj/mjpegtools/package.nix
index afdc37a8b839..ad5ad85e729c 100644
--- a/pkgs/by-name/mj/mjpegtools/package.nix
+++ b/pkgs/by-name/mj/mjpegtools/package.nix
@@ -70,6 +70,6 @@ stdenv.mkDerivation rec {
     homepage = "http://mjpeg.sourceforge.net/";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix b/pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix
index f073053536eb..2dceca860d4f 100644
--- a/pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix
+++ b/pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     description = "ipconfig and nfsmount tools for root on NFS, ported from klibc";
     license = licenses.gpl2Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/mx/mxnet/package.nix b/pkgs/by-name/mx/mxnet/package.nix
index 958706e7c6c8..47941595a72a 100644
--- a/pkgs/by-name/mx/mxnet/package.nix
+++ b/pkgs/by-name/mx/mxnet/package.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler";
     homepage = "https://mxnet.incubator.apache.org/";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     license = licenses.asl20;
     platforms = platforms.linux;
   };
diff --git a/pkgs/by-name/my/mystem/package.nix b/pkgs/by-name/my/mystem/package.nix
index cd7e9bd1ad2b..0d114dab1f12 100644
--- a/pkgs/by-name/my/mystem/package.nix
+++ b/pkgs/by-name/my/mystem/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = "https://yandex.ru/dev/mystem/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfreeRedistributable;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "mystem";
   };
diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
index 2e840c03bcf8..ddb1a9ea489d 100644
--- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix
+++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
@@ -81,7 +81,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/nm-l2tp/network-manager-l2tp";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [
-      abbradar
       obadz
     ];
   };
diff --git a/pkgs/by-name/nf/nfs-utils/package.nix b/pkgs/by-name/nf/nfs-utils/package.nix
index 725267ce727e..25b66292cc63 100644
--- a/pkgs/by-name/nf/nfs-utils/package.nix
+++ b/pkgs/by-name/nf/nfs-utils/package.nix
@@ -195,6 +195,6 @@ stdenv.mkDerivation rec {
     homepage = "https://linux-nfs.org/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix
index 3d74b0a2e0b8..16f81d840bee 100644
--- a/pkgs/by-name/oc/octoprint/package.nix
+++ b/pkgs/by-name/oc/octoprint/package.nix
@@ -231,7 +231,6 @@ let
             mainProgram = "octoprint";
             license = licenses.agpl3Only;
             maintainers = with maintainers; [
-              abbradar
               WhittlesJr
               gador
             ];
diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix
index e60016edfb73..3bb06d182cfc 100644
--- a/pkgs/by-name/oc/octoprint/plugins.nix
+++ b/pkgs/by-name/oc/octoprint/plugins.nix
@@ -122,7 +122,7 @@ in
       description = "Plugin for slicing via Cura Legacy from within OctoPrint";
       homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy";
       license = licenses.agpl3Only;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -408,7 +408,7 @@ in
       description = "Better print time estimation for OctoPrint";
       homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius";
       license = licenses.agpl3Only;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -459,7 +459,7 @@ in
       description = "OctoPrint plugin to control ATX/AUX power supply";
       homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl";
       license = licenses.agpl3Only;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -521,7 +521,7 @@ in
       description = "Simple stl viewer tab for OctoPrint";
       homepage = "https://github.com/jneilliii/Octoprint-STLViewer";
       license = licenses.agpl3Only;
-      maintainers = with maintainers; [ abbradar ];
+      maintainers = [ ];
     };
   };
 
@@ -603,7 +603,7 @@ in
       description = "Show printers status in window title";
       homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus";
       license = licenses.agpl3Only;
-      maintainers = with maintainers; [ abbradar ];
+      maintainers = [ ];
     };
   };
 
@@ -623,7 +623,7 @@ in
       description = "Touch friendly interface for a small TFT module or phone for OctoPrint";
       homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI";
       license = licenses.agpl3Only;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
diff --git a/pkgs/by-name/od/odroid-xu3-bootloader/package.nix b/pkgs/by-name/od/odroid-xu3-bootloader/package.nix
index 33bcc22fd52d..a1e446db9eb8 100644
--- a/pkgs/by-name/od/odroid-xu3-bootloader/package.nix
+++ b/pkgs/by-name/od/odroid-xu3-bootloader/package.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     license = licenses.unfreeRedistributableFirmware;
     description = "Secure boot enabled boot loader for ODROID-XU{3,4}";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/op/opendkim/package.nix b/pkgs/by-name/op/opendkim/package.nix
index 37ab8aac3ed7..2b8a2190de05 100644
--- a/pkgs/by-name/op/opendkim/package.nix
+++ b/pkgs/by-name/op/opendkim/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service";
     homepage = "http://www.opendkim.org/";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     license = licenses.bsd3;
     platforms = platforms.unix;
   };
diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix
index aef6b92888fc..6e188f0cb8af 100644
--- a/pkgs/by-name/op/openjfx/package.nix
+++ b/pkgs/by-name/op/openjfx/package.nix
@@ -191,7 +191,7 @@ stdenv.mkDerivation {
     description = "Next-generation Java client toolkit";
     homepage = "https://openjdk.org/projects/openjfx/";
     license = lib.licenses.gpl2Classpath;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/op/openspades/package.nix b/pkgs/by-name/op/openspades/package.nix
index 5988ca9d4300..13e55f7d5a91 100644
--- a/pkgs/by-name/op/openspades/package.nix
+++ b/pkgs/by-name/op/openspades/package.nix
@@ -96,7 +96,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     platforms = platforms.all;
     maintainers = with maintainers; [
-      abbradar
       azahi
     ];
     # never built on aarch64-linux since first introduction in nixpkgs
diff --git a/pkgs/by-name/os/osi/package.nix b/pkgs/by-name/os/osi/package.nix
index 2c1a6f95def0..0bb2d186f3bd 100644
--- a/pkgs/by-name/os/osi/package.nix
+++ b/pkgs/by-name/os/osi/package.nix
@@ -62,6 +62,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/coin-or/Osi";
     license = licenses.epl20;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pa/pacparser/package.nix b/pkgs/by-name/pa/pacparser/package.nix
index 378a81b02dcf..e2a400e9e1ad 100644
--- a/pkgs/by-name/pa/pacparser/package.nix
+++ b/pkgs/by-name/pa/pacparser/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://pacparser.manugarg.com/";
     license = lib.licenses.lgpl3;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
     mainProgram = "pactester";
   };
 })
diff --git a/pkgs/by-name/pa/pam_pgsql/package.nix b/pkgs/by-name/pa/pam_pgsql/package.nix
index ef1edab6f03d..e21c64af05d1 100644
--- a/pkgs/by-name/pa/pam_pgsql/package.nix
+++ b/pkgs/by-name/pa/pam_pgsql/package.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/pam-pgsql/pam-pgsql";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pa/pamtester/package.nix b/pkgs/by-name/pa/pamtester/package.nix
index 294ef8fb5f3d..4bf254808f92 100644
--- a/pkgs/by-name/pa/pamtester/package.nix
+++ b/pkgs/by-name/pa/pamtester/package.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     homepage = "https://pamtester.sourceforge.net/";
     license = licenses.bsd3;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pa/paprefs/package.nix b/pkgs/by-name/pa/paprefs/package.nix
index 63ce64a74e2a..7308eb69a9e1 100644
--- a/pkgs/by-name/pa/paprefs/package.nix
+++ b/pkgs/by-name/pa/paprefs/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl2Plus;
 
-    maintainers = [ maintainers.abbradar ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/pa/pavucontrol/package.nix b/pkgs/by-name/pa/pavucontrol/package.nix
index bb0c09158d8c..cc388685d8ee 100644
--- a/pkgs/by-name/pa/pavucontrol/package.nix
+++ b/pkgs/by-name/pa/pavucontrol/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
       easily control the volume of all clients, sinks, etc.
     '';
     mainProgram = "pavucontrol";
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/po/postsrsd/package.nix b/pkgs/by-name/po/postsrsd/package.nix
index 98d81aaa21e5..18bd8f159fdc 100644
--- a/pkgs/by-name/po/postsrsd/package.nix
+++ b/pkgs/by-name/po/postsrsd/package.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     mainProgram = "postsrsd";
     license = licenses.gpl2Plus;
     platforms = platforms.all;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pr/primusLib/package.nix b/pkgs/by-name/pr/primusLib/package.nix
index dfe3c58ce1fa..77f37052f1bb 100644
--- a/pkgs/by-name/pr/primusLib/package.nix
+++ b/pkgs/by-name/pr/primusLib/package.nix
@@ -64,6 +64,6 @@ stdenv.mkDerivation {
       "x86_64-linux"
     ];
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pr/prosody-filer/package.nix b/pkgs/by-name/pr/prosody-filer/package.nix
index b92819c8f0dc..a4901bb7e7b3 100644
--- a/pkgs/by-name/pr/prosody-filer/package.nix
+++ b/pkgs/by-name/pr/prosody-filer/package.nix
@@ -21,7 +21,7 @@ buildGoModule {
 
   meta = with lib; {
     homepage = "https://github.com/ThomasLeister/prosody-filer";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     license = licenses.mit;
     platforms = platforms.linux;
     description = "Simple file server for handling XMPP http_upload requests";
diff --git a/pkgs/by-name/qp/qpdf/package.nix b/pkgs/by-name/qp/qpdf/package.nix
index 857ea50290a1..aab8a8f3e046 100644
--- a/pkgs/by-name/qp/qpdf/package.nix
+++ b/pkgs/by-name/qp/qpdf/package.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://qpdf.sourceforge.io/";
     description = "C++ library and set of programs that inspect and manipulate the structure of PDF files";
     license = lib.licenses.asl20; # as of 7.0.0, people may stay at artistic2
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
     mainProgram = "qpdf";
     platforms = lib.platforms.all;
     changelog = "https://github.com/qpdf/qpdf/blob/v${finalAttrs.version}/ChangeLog";
diff --git a/pkgs/by-name/rp/rpcbind/package.nix b/pkgs/by-name/rp/rpcbind/package.nix
index 71bd239aedf3..41cf39e44269 100644
--- a/pkgs/by-name/rp/rpcbind/package.nix
+++ b/pkgs/by-name/rp/rpcbind/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
     license = licenses.bsd3;
     platforms = platforms.unix;
     homepage = "https://linux-nfs.org/";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     longDescription = ''
       Universal addresses to RPC program number mapper.
     '';
diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index 6f3a4a582b32..5d9b5b60ab1b 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -154,7 +154,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "PS3 emulator/debugger";
     homepage = "https://rpcs3.net/";
     maintainers = with maintainers; [
-      abbradar
       neonfuz
       ilian
     ];
diff --git a/pkgs/by-name/rp/rpmextract/package.nix b/pkgs/by-name/rp/rpmextract/package.nix
index 71630ed687c1..e728473e5df4 100644
--- a/pkgs/by-name/rp/rpmextract/package.nix
+++ b/pkgs/by-name/rp/rpmextract/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     description = "Script to extract RPM archives";
     platforms = platforms.all;
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     mainProgram = "rpmextract";
   };
 }
diff --git a/pkgs/by-name/sc/schedtool/package.nix b/pkgs/by-name/sc/schedtool/package.nix
index 11c4e958f05f..284da9ffc211 100644
--- a/pkgs/by-name/sc/schedtool/package.nix
+++ b/pkgs/by-name/sc/schedtool/package.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/freequaos/schedtool";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/sc/scorched3d/package.nix b/pkgs/by-name/sc/scorched3d/package.nix
index cdfa6d7ca6b5..c0a08fd5ca43 100644
--- a/pkgs/by-name/sc/scorched3d/package.nix
+++ b/pkgs/by-name/sc/scorched3d/package.nix
@@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
     description = "3D Clone of the classic Scorched Earth";
     license = licenses.gpl2Plus;
     platforms = platforms.linux; # maybe more
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/sd/sdl-jstest/package.nix b/pkgs/by-name/sd/sdl-jstest/package.nix
index 2d2bd48387a3..5292d012d0df 100644
--- a/pkgs/by-name/sd/sdl-jstest/package.nix
+++ b/pkgs/by-name/sd/sdl-jstest/package.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation {
     description = "Simple SDL joystick test application for the console";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/so/soundfont-fluid/package.nix b/pkgs/by-name/so/soundfont-fluid/package.nix
index 606341847a0e..eb9b3941ccd2 100644
--- a/pkgs/by-name/so/soundfont-fluid/package.nix
+++ b/pkgs/by-name/so/soundfont-fluid/package.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation {
     homepage = "http://www.hammersound.net/";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/st/stremio/package.nix b/pkgs/by-name/st/stremio/package.nix
index f71b9e098cec..55b5ce50284c 100644
--- a/pkgs/by-name/st/stremio/package.nix
+++ b/pkgs/by-name/st/stremio/package.nix
@@ -62,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
       unfree
     ];
     maintainers = with lib.maintainers; [
-      abbradar
       griffi-gh
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/sv/svox/package.nix b/pkgs/by-name/sv/svox/package.nix
index 7664f0433575..b859234e612a 100644
--- a/pkgs/by-name/sv/svox/package.nix
+++ b/pkgs/by-name/sv/svox/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     homepage = "https://android.googlesource.com/platform/external/svox";
     platforms = platforms.linux;
     license = licenses.asl20;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     mainProgram = "pico2wave";
   };
 }
diff --git a/pkgs/by-name/sw/swarm/package.nix b/pkgs/by-name/sw/swarm/package.nix
index a6113c0f54ef..b4432ace0953 100644
--- a/pkgs/by-name/sw/swarm/package.nix
+++ b/pkgs/by-name/sw/swarm/package.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation {
     homepage = "http://spinroot.com/";
     license = licenses.free;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix
index 34bb72c9f55e..b34ba4b17444 100644
--- a/pkgs/by-name/th/the-powder-toy/package.nix
+++ b/pkgs/by-name/th/the-powder-toy/package.nix
@@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [
-      abbradar
       siraben
     ];
     mainProgram = "powder";
diff --git a/pkgs/by-name/th/thermald/package.nix b/pkgs/by-name/th/thermald/package.nix
index fbf1e7fdf9aa..77909a2c5c72 100644
--- a/pkgs/by-name/th/thermald/package.nix
+++ b/pkgs/by-name/th/thermald/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
       "x86_64-linux"
       "i686-linux"
     ];
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     mainProgram = "thermald";
   };
 }
diff --git a/pkgs/by-name/un/unnethack/package.nix b/pkgs/by-name/un/unnethack/package.nix
index cb24d0e987b3..4250a98d0a3e 100644
--- a/pkgs/by-name/un/unnethack/package.nix
+++ b/pkgs/by-name/un/unnethack/package.nix
@@ -79,6 +79,6 @@ stdenv.mkDerivation {
     homepage = "https://unnethack.wordpress.com/";
     license = "nethack";
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ut/utsushi-networkscan/package.nix b/pkgs/by-name/ut/utsushi-networkscan/package.nix
index 7f339c15e404..377f32d50ff3 100644
--- a/pkgs/by-name/ut/utsushi-networkscan/package.nix
+++ b/pkgs/by-name/ut/utsushi-networkscan/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "Network scan plugin for ImageScan v3";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/by-name/uw/uwsgi/package.nix b/pkgs/by-name/uw/uwsgi/package.nix
index 9426057e6b50..0f8fe4f8c98b 100644
--- a/pkgs/by-name/uw/uwsgi/package.nix
+++ b/pkgs/by-name/uw/uwsgi/package.nix
@@ -185,7 +185,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://uwsgi-docs.readthedocs.org/en/latest/";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
-      abbradar
       schneefux
       globin
     ];
diff --git a/pkgs/by-name/vc/vcg/package.nix b/pkgs/by-name/vc/vcg/package.nix
index 8b4753d0f69d..487b4510263e 100644
--- a/pkgs/by-name/vc/vcg/package.nix
+++ b/pkgs/by-name/vc/vcg/package.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes";
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/wi/wipe/package.nix b/pkgs/by-name/wi/wipe/package.nix
index 117a32fec6bb..72ccce937c1d 100644
--- a/pkgs/by-name/wi/wipe/package.nix
+++ b/pkgs/by-name/wi/wipe/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     homepage = "https://wipe.sourceforge.net/";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
-    maintainers = [ lib.maintainers.abbradar ];
+    maintainers = [ ];
     mainProgram = "wipe";
   };
 }
diff --git a/pkgs/by-name/xg/xgboost/package.nix b/pkgs/by-name/xg/xgboost/package.nix
index d853131809e2..dfd7e60cafa5 100644
--- a/pkgs/by-name/xg/xgboost/package.nix
+++ b/pkgs/by-name/xg/xgboost/package.nix
@@ -199,7 +199,6 @@ effectiveStdenv.mkDerivation rec {
     mainProgram = "xgboost";
     platforms = platforms.unix;
     maintainers = with maintainers; [
-      abbradar
       nviets
     ];
   };
diff --git a/pkgs/by-name/xi/xiccd/package.nix b/pkgs/by-name/xi/xiccd/package.nix
index 9221077b3ac6..72751da6d3b9 100644
--- a/pkgs/by-name/xi/xiccd/package.nix
+++ b/pkgs/by-name/xi/xiccd/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "X color profile daemon";
     homepage = "https://github.com/agalakhov/xiccd";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "xiccd";
   };
diff --git a/pkgs/by-name/xi/xits-math/package.nix b/pkgs/by-name/xi/xits-math/package.nix
index d997fad5d11f..246635fe18f9 100644
--- a/pkgs/by-name/xi/xits-math/package.nix
+++ b/pkgs/by-name/xi/xits-math/package.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     description = "OpenType implementation of STIX fonts with math support";
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/xl/xl2tpd/package.nix b/pkgs/by-name/xl/xl2tpd/package.nix
index f6b9abecb94b..aaf95affed29 100644
--- a/pkgs/by-name/xl/xl2tpd/package.nix
+++ b/pkgs/by-name/xl/xl2tpd/package.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/xl/xlslib/package.nix b/pkgs/by-name/xl/xlslib/package.nix
index 175e91617bd3..e4f3ab83e567 100644
--- a/pkgs/by-name/xl/xlslib/package.nix
+++ b/pkgs/by-name/xl/xlslib/package.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     homepage = "https://sourceforge.net/projects/xlslib/";
     license = licenses.bsd2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ya/yaml-merge/package.nix b/pkgs/by-name/ya/yaml-merge/package.nix
index e83011bfe67f..6f4888729f59 100644
--- a/pkgs/by-name/ya/yaml-merge/package.nix
+++ b/pkgs/by-name/ya/yaml-merge/package.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/abbradar/yaml-merge";
     license = licenses.bsd2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ye/yed/package.nix b/pkgs/by-name/ye/yed/package.nix
index 0665320956b2..3fdce8e0b288 100644
--- a/pkgs/by-name/ye/yed/package.nix
+++ b/pkgs/by-name/ye/yed/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.yworks.com/products/yed";
     description = "Powerful desktop application that can be used to quickly and effectively generate high-quality diagrams";
     platforms = jre.meta.platforms;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     mainProgram = "yed";
   };
 }
diff --git a/pkgs/by-name/ze/zeroc-ice/package.nix b/pkgs/by-name/ze/zeroc-ice/package.nix
index 2bcd6e85f399..a9639f7c52fa 100644
--- a/pkgs/by-name/ze/zeroc-ice/package.nix
+++ b/pkgs/by-name/ze/zeroc-ice/package.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
     description = "Internet communications engine";
     license = licenses.gpl2Only;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix
index d46325f6a81c..124561583440 100644
--- a/pkgs/data/fonts/emojione/default.nix
+++ b/pkgs/data/fonts/emojione/default.nix
@@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
     description = "Open source emoji set";
     homepage = "http://emojione.com/";
     license = licenses.cc-by-40;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
index 425a3b73a68a..1aab0a5605cd 100644
--- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.xfce.org/apps/xfce4-volumed-pulse";
     mainProgram = "xfce4-volumed-pulse";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
     teams = [ lib.teams.xfce ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index be2a146097ad..d29b10978948 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -193,7 +193,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://spidermonkey.dev/";
     license = licenses.mpl20;
     maintainers = with maintainers; [
-      abbradar
       lostnet
       catap
     ];
diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix
index a5dc5b7219af..ffd642bd847b 100644
--- a/pkgs/development/libraries/dee/default.nix
+++ b/pkgs/development/libraries/dee/default.nix
@@ -76,6 +76,6 @@ stdenv.mkDerivation rec {
     homepage = "https://launchpad.net/dee";
     license = licenses.lgpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index e3eef5f1d22e..bba5e4f393db 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -109,7 +109,6 @@ qtModule {
 
   meta = {
     maintainers = with lib.maintainers; [
-      abbradar
       periklis
     ];
     knownVulnerabilities = [
diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix
index 9d2541c0b721..88647d938293 100644
--- a/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/QupZilla/qtwebkit-plugins";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix
index c894dc31de22..7636fbf2a0f5 100644
--- a/pkgs/development/libraries/vc/0.7.nix
+++ b/pkgs/development/libraries/vc/0.7.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/VcDevel/Vc";
     license = licenses.bsd3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     # never built on aarch64-darwin since first introduction in nixpkgs
     broken =
       (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index 8ff1ccd81d53..4bf520a6c55c 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/VcDevel/Vc";
     license = licenses.bsd3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/awesome-slugify/default.nix b/pkgs/development/python-modules/awesome-slugify/default.nix
index 1b43d389ee75..f0ff466b9fce 100644
--- a/pkgs/development/python-modules/awesome-slugify/default.nix
+++ b/pkgs/development/python-modules/awesome-slugify/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Python flexible slugify function";
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix
index 3babd3d41897..ec3bdce9c713 100644
--- a/pkgs/development/python-modules/chainmap/default.nix
+++ b/pkgs/development/python-modules/chainmap/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     description = "Backport/clone of ChainMap";
     homepage = "https://bitbucket.org/jeunice/chainmap";
     license = licenses.psfl;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/crc16/default.nix b/pkgs/development/python-modules/crc16/default.nix
index 6ef211c06fba..2fb033d80b00 100644
--- a/pkgs/development/python-modules/crc16/default.nix
+++ b/pkgs/development/python-modules/crc16/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Python library for calculating CRC16";
     homepage = "https://code.google.com/archive/p/pycrc16/";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix
index 374caec8582a..95366472ac9c 100644
--- a/pkgs/development/python-modules/datatable/default.nix
+++ b/pkgs/development/python-modules/datatable/default.nix
@@ -70,6 +70,6 @@ buildPythonPackage rec {
     description = "data.table for Python";
     homepage = "https://github.com/h2oai/datatable";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix
index b51762a23926..d529ad159f4a 100644
--- a/pkgs/development/python-modules/flask-assets/default.nix
+++ b/pkgs/development/python-modules/flask-assets/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/miracle2k/flask-assets";
     description = "Asset management for Flask, to compress and merge CSS and Javascript files";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix
index ce9da8b158dc..291c89da6b01 100644
--- a/pkgs/development/python-modules/flask-login/default.nix
+++ b/pkgs/development/python-modules/flask-login/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     description = "User session management for Flask";
     homepage = "https://github.com/maxcountryman/flask-login";
     license = licenses.mit;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix
index f85610d84f9e..b86c6a52b6c6 100644
--- a/pkgs/development/python-modules/flask-principal/default.nix
+++ b/pkgs/development/python-modules/flask-principal/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "http://packages.python.org/Flask-Principal/";
     description = "Identity management for flask";
     license = licenses.mit;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix
index 3a7a8693385e..781a5398670c 100644
--- a/pkgs/development/python-modules/flask-script/default.nix
+++ b/pkgs/development/python-modules/flask-script/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/smurfix/flask-script";
     description = "Scripting support for Flask";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix
index deaaa0362269..b12d9b415349 100644
--- a/pkgs/development/python-modules/hmmlearn/default.nix
+++ b/pkgs/development/python-modules/hmmlearn/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     description = "Hidden Markov Models in Python with scikit-learn like API";
     homepage = "https://github.com/hmmlearn/hmmlearn";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index cf13ca12e3e2..b408fdbb5f48 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -44,8 +44,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Ultimaker/libArcus";
     license = licenses.lgpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [
-      abbradar
-    ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix
index da39e67f5225..a2522c5dc816 100644
--- a/pkgs/development/python-modules/libsavitar/default.nix
+++ b/pkgs/development/python-modules/libsavitar/default.nix
@@ -36,7 +36,6 @@ buildPythonPackage rec {
     license = licenses.lgpl3Plus;
     platforms = platforms.unix;
     maintainers = with maintainers; [
-      abbradar
       orivej
     ];
   };
diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix
index 8e303b4de62f..c10866a6408c 100644
--- a/pkgs/development/python-modules/mlrose/default.nix
+++ b/pkgs/development/python-modules/mlrose/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     description = "Machine Learning, Randomized Optimization and SEarch";
     homepage = "https://github.com/gkhayes/mlrose";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index 8d522d0c24e5..be51deb7592f 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -60,6 +60,6 @@ buildPythonPackage rec {
     homepage = "https://dev.gajim.org/gajim/python-nbxmpp";
     description = "Non-blocking Jabber/XMPP module";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix
index babf414c11a4..5c1241343d5e 100644
--- a/pkgs/development/python-modules/plyfile/default.nix
+++ b/pkgs/development/python-modules/plyfile/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
   meta = {
     description = "NumPy-based text/binary PLY file reader/writer for Python";
     homepage = "https://github.com/dranjan/python-plyfile";
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
index 0a5f43eeb186..56c3b6184b93 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/home-assistant-libs/pychromecast";
     changelog = "https://github.com/home-assistant-libs/pychromecast/releases/tag/${src.tag}";
     license = licenses.mit;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix
index 4cc3c20817ab..9e2cdd162842 100644
--- a/pkgs/development/python-modules/pylru/default.nix
+++ b/pkgs/development/python-modules/pylru/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Least recently used (LRU) cache implementation";
     homepage = "https://github.com/jlhutch/pylru";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pymystem3/default.nix b/pkgs/development/python-modules/pymystem3/default.nix
index 0dd0b329acd0..9cf9eb106c2d 100644
--- a/pkgs/development/python-modules/pymystem3/default.nix
+++ b/pkgs/development/python-modules/pymystem3/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Python wrapper for the Yandex MyStem 3.1 morpholocial analyzer of the Russian language";
     homepage = "https://github.com/nlpub/pymystem3";
     license = licenses.mit;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix
index bde01221be42..73295e3793c7 100644
--- a/pkgs/development/python-modules/pyspf/default.nix
+++ b/pkgs/development/python-modules/pyspf/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = "http://bmsi.com/python/milter.html";
     description = "Python API for Sendmail Milters (SPF)";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     license = licenses.gpl2;
   };
 }
diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
index 6dfdab632d04..dcdb14545349 100644
--- a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
+++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/tgalal/python-axolotl-curve25519";
     description = "Curve25519 with ed25519 signatures";
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
     license = lib.licenses.gpl3;
   };
 }
diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix
index 8af55b83ff58..48f9794db058 100644
--- a/pkgs/development/python-modules/python-axolotl/default.nix
+++ b/pkgs/development/python-modules/python-axolotl/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = "https://github.com/tgalal/python-axolotl";
     description = "Python port of libaxolotl-android";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     license = licenses.gpl3;
   };
 }
diff --git a/pkgs/development/python-modules/python-pam/default.nix b/pkgs/development/python-modules/python-pam/default.nix
index 3df5479a72c0..05135fdae841 100644
--- a/pkgs/development/python-modules/python-pam/default.nix
+++ b/pkgs/development/python-modules/python-pam/default.nix
@@ -42,7 +42,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/FirefighterBlu3/python-pam";
     license = licenses.mit;
     maintainers = with maintainers; [
-      abbradar
       mkg20001
     ];
   };
diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix
index 01f1f2483282..a40267a5f6a5 100644
--- a/pkgs/development/python-modules/python-uinput/default.nix
+++ b/pkgs/development/python-modules/python-uinput/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Pythonic API to Linux uinput kernel module";
     homepage = "https://tjjr.fi/sw/python-uinput/";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index 8c9810bdd5fa..4543c90e1e42 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Alternative regular expression module, to replace re";
     homepage = "https://bitbucket.org/mrabarnett/mrab-regex";
     license = licenses.psfl;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix
index 34eed3242f03..3c86f1448599 100644
--- a/pkgs/development/python-modules/sarge/default.nix
+++ b/pkgs/development/python-modules/sarge/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Python wrapper for subprocess which provides command pipeline functionality";
     homepage = "https://sarge.readthedocs.org/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix
index dd653621d6c5..ba23c3e7493d 100644
--- a/pkgs/development/python-modules/sockjs-tornado/default.nix
+++ b/pkgs/development/python-modules/sockjs-tornado/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mrjoes/sockjs-tornado/";
     description = "SockJS python server implementation on top of Tornado framework";
     license = licenses.mit;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix
index 806f39efa63b..b659f9a4403d 100644
--- a/pkgs/development/python-modules/sphfile/default.nix
+++ b/pkgs/development/python-modules/sphfile/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     description = "Numpy-based NIST SPH audio-file reader";
     homepage = "https://github.com/mcfletch/sphfile";
     license = licenses.mit;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/tensorboard-data-server/default.nix b/pkgs/development/python-modules/tensorboard-data-server/default.nix
index ef0662c4c2da..37fbd1eb700a 100644
--- a/pkgs/development/python-modules/tensorboard-data-server/default.nix
+++ b/pkgs/development/python-modules/tensorboard-data-server/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Fast data loading for TensorBoard";
     homepage = "https://github.com/tensorflow/tensorboard/tree/master/tensorboard/data/server";
     license = licenses.asl20;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix
index 2a7be3be31b1..ac4647c99f13 100644
--- a/pkgs/development/python-modules/tensorboard/default.nix
+++ b/pkgs/development/python-modules/tensorboard/default.nix
@@ -77,6 +77,6 @@ buildPythonPackage rec {
     homepage = "https://www.tensorflow.org/";
     license = lib.licenses.asl20;
     mainProgram = "tensorboard";
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index a3d566987e0b..ddbdedd266e1 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -226,9 +226,7 @@ buildPythonPackage rec {
     homepage = "http://tensorflow.org";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      abbradar
-    ];
+    maintainers = [ ];
     badPlatforms = [ "x86_64-darwin" ];
     # unsupported combination
     broken = stdenv.hostPlatform.isDarwin && cudaSupport;
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 8d334c5cc8b7..d4b4fee8e7bb 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -581,7 +581,7 @@ let
       description = "Computation using data flow graphs for scalable machine learning";
       homepage = "http://tensorflow.org";
       license = lib.licenses.asl20;
-      maintainers = with lib.maintainers; [ abbradar ];
+      maintainers = [ ];
       platforms = with lib.platforms; linux ++ darwin;
       broken =
         stdenv.hostPlatform.isDarwin
diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix
index adb56fd0ad82..9697c85beae0 100644
--- a/pkgs/development/python-modules/typesentry/default.nix
+++ b/pkgs/development/python-modules/typesentry/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage {
     description = "Python 2.7 & 3.5+ runtime type-checker";
     homepage = "https://github.com/h2oai/typesentry";
     license = licenses.asl20;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index cb3bde14e581..88adb319bc29 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -59,8 +59,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Ultimaker/Uranium";
     license = licenses.lgpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [
-      abbradar
-    ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix
index 553721e83eea..89d15ad66c30 100644
--- a/pkgs/development/python-modules/virtkey/default.nix
+++ b/pkgs/development/python-modules/virtkey/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     description = "Extension to emulate keypresses and to get the layout information from the X server";
     homepage = "https://launchpad.net/virtkey";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix
index d64ca27ece01..347eadfdcfb6 100644
--- a/pkgs/development/python-modules/webassets/default.nix
+++ b/pkgs/development/python-modules/webassets/default.nix
@@ -68,6 +68,6 @@ buildPythonPackage rec {
     mainProgram = "webassets";
     homepage = "https://github.com/miracle2k/webassets/";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix
index 9217dddaa6cf..bab5db2297c5 100644
--- a/pkgs/development/python-modules/zeroc-ice/default.nix
+++ b/pkgs/development/python-modules/zeroc-ice/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     license = licenses.gpl2;
     description = "Comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more";
     mainProgram = "slice2py";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index 27e920f19833..8c72f6d2cca9 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -66,6 +66,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/python-zeroconf/python-zeroconf";
     changelog = "https://github.com/python-zeroconf/python-zeroconf/blob/${src.tag}/CHANGELOG.md";
     license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python2-modules/scandir/default.nix b/pkgs/development/python2-modules/scandir/default.nix
index c11a76eb1cda..48adbc976009 100644
--- a/pkgs/development/python2-modules/scandir/default.nix
+++ b/pkgs/development/python2-modules/scandir/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Better directory iterator and faster os.walk()";
     homepage = "https://github.com/benhoyt/scandir";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index 8a21ea4bed56..09f7600b0244 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -132,6 +132,6 @@ stdenv.mkDerivation rec {
       licenses.zlib
       cc0
     ];
-    maintainers = [ maintainers.abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/doom-ports/slade/default.nix b/pkgs/games/doom-ports/slade/default.nix
index 99418f2499ea..e804417ee625 100644
--- a/pkgs/games/doom-ports/slade/default.nix
+++ b/pkgs/games/doom-ports/slade/default.nix
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
     homepage = "http://slade.mancubus.net/";
     license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 82f20430d1fa..a97439344ab0 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -243,7 +243,6 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [
       robbinch
       a1russell
-      abbradar
       numinit
       ncfavier
     ];
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index ce41cd2c3398..75be441dd985 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -58,7 +58,6 @@ stdenv.mkDerivation rec {
     mainProgram = "dwarftherapist";
     description = "Tool to manage dwarves in a running game of Dwarf Fortress";
     maintainers = with maintainers; [
-      abbradar
       bendlas
       numinit
     ];
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index b9e1000bb2b1..1fd93ff69036 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -194,7 +194,6 @@ stdenv.mkDerivation {
       a1russell
       robbinch
       roconnor
-      abbradar
       numinit
       shazow
       ncfavier
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 15bb084c1e00..4d47e4102575 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -124,7 +124,6 @@ stdenv.mkDerivation {
     license = licenses.free;
     platforms = platforms.linux;
     maintainers = with maintainers; [
-      abbradar
       numinit
     ];
   };
diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index da9a3ee83a00..2f157d4887ab 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -227,7 +227,7 @@ stdenv.mkDerivation rec {
     homepage = "http://nethack.org/";
     license = "nethack";
     platforms = if x11Mode then platforms.linux else platforms.unix;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     mainProgram = "nethack";
   };
 }
diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index 8201d10e847d..3315e64f52c2 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -123,7 +123,6 @@ stdenv.mkDerivation rec {
     homepage = "https://openmw.org";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [
-      abbradar
       marius851000
     ];
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/games/quake3/content/arena.nix b/pkgs/games/quake3/content/arena.nix
index 3d5b85717282..cb215cd263af 100644
--- a/pkgs/games/quake3/content/arena.nix
+++ b/pkgs/games/quake3/content/arena.nix
@@ -60,6 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.idsoftware.com/";
     license = lib.licenses.unfreeRedistributable;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/games/quake3/content/demo.nix b/pkgs/games/quake3/content/demo.nix
index 9be05d8b90bb..3edf3e76a6b1 100644
--- a/pkgs/games/quake3/content/demo.nix
+++ b/pkgs/games/quake3/content/demo.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation {
     homepage = "https://www.idsoftware.com/";
     license = licenses.unfreeRedistributable;
     platforms = platforms.all;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/quake3/content/pointrelease.nix b/pkgs/games/quake3/content/pointrelease.nix
index e3b548596070..6eb81e2bc7ce 100644
--- a/pkgs/games/quake3/content/pointrelease.nix
+++ b/pkgs/games/quake3/content/pointrelease.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation {
     description = "Quake 3 Arena point release";
     license = licenses.unfreeRedistributable;
     platforms = platforms.all;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
index d586265e581e..b7f96d0272ca 100644
--- a/pkgs/games/warsow/default.nix
+++ b/pkgs/games/warsow/default.nix
@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.warsow.net";
     license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [
-      abbradar
     ];
     platforms = warsow-engine.meta.platforms;
   };
diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix
index 4fa5dfad7e5b..8a7113aae559 100644
--- a/pkgs/games/warsow/engine.nix
+++ b/pkgs/games/warsow/engine.nix
@@ -87,7 +87,6 @@ stdenv.mkDerivation {
     homepage = "http://www.warsow.net";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [
-      abbradar
     ];
     platforms = platforms.linux;
     broken = stdenv.hostPlatform.isAarch64;
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index a38830086375..1db4ae430e28 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -117,7 +117,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/wesnoth/wesnoth/blob/${finalAttrs.version}/changelog.md";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
-      abbradar
       niklaskorz
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index eab7eb5a1d93..b42cc6660569 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation {
       "i686-linux"
     ];
     homepage = "https://github.com/Bumblebee-Project/bbswitch";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     license = licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index d95688c9766c..39389a93da74 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     hydraPlatforms = [ ];
     license = licenses.unfree;
     mainProgram = "DisplayLinkManager";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = [
       "x86_64-linux"
       "i686-linux"
diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index 749dc2acfb27..d125cf520447 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
     description = "Settings application for NVIDIA graphics cards";
     license = licenses.unfreeRedistributable;
     platforms = nvidia_x11.meta.platforms;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     mainProgram = "nvidia-persistenced";
   };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index 15f3dad44275..5ab9b0066a58 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -37,7 +37,6 @@ let
     homepage = "https://www.nvidia.com/object/unix.html";
     platforms = nvidia_x11.meta.platforms;
     maintainers = with maintainers; [
-      abbradar
       aidalgol
     ];
   };
diff --git a/pkgs/servers/mail/spf-engine/default.nix b/pkgs/servers/mail/spf-engine/default.nix
index bb7f9f0b7a38..a6b21036c141 100644
--- a/pkgs/servers/mail/spf-engine/default.nix
+++ b/pkgs/servers/mail/spf-engine/default.nix
@@ -37,7 +37,7 @@ buildPythonApplication rec {
   meta = {
     homepage = "https://launchpad.net/spf-engine/";
     description = "Postfix policy engine for Sender Policy Framework (SPF) checking";
-    maintainers = with lib.maintainers; [ abbradar ];
+    maintainers = [ ];
     license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix
index 4c0ed8d0abda..773f41d6de70 100644
--- a/pkgs/servers/mtprotoproxy/default.nix
+++ b/pkgs/servers/mtprotoproxy/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     homepage = "https://github.com/alexbers/mtprotoproxy";
     platforms = python.meta.platforms;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     mainProgram = "mtprotoproxy";
   };
 }
diff --git a/pkgs/servers/nosql/influxdb2/cli.nix b/pkgs/servers/nosql/influxdb2/cli.nix
index 85b3e910b696..f22bca89052e 100644
--- a/pkgs/servers/nosql/influxdb2/cli.nix
+++ b/pkgs/servers/nosql/influxdb2/cli.nix
@@ -42,7 +42,7 @@ buildGoModule {
     description = "CLI for managing resources in InfluxDB v2";
     license = licenses.mit;
     homepage = "https://influxdata.com/";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     mainProgram = "influx";
   };
 }
diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix
index 6628e1130ce2..bacf1c7feb55 100644
--- a/pkgs/servers/nosql/influxdb2/default.nix
+++ b/pkgs/servers/nosql/influxdb2/default.nix
@@ -136,6 +136,6 @@ buildGoModule {
     description = "Open-source distributed time series database";
     license = licenses.mit;
     homepage = "https://influxdata.com/";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index 744fbfc50a81..ea9025a0dd78 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -67,6 +67,6 @@ stdenv.mkDerivation rec {
     description = "X11 GL rendering in a remote computer with full 3D hw acceleration";
     license = licenses.wxWindows;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index af5cc1d8b0e2..25651c6f5c58 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     homepage = "http://grub4dos.chenall.net/";
     description = "GRUB for DOS is the dos extension of GRUB";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
     # Needs a port to modern binutils:
diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix
index 6dfe9d0a0a63..e5831a33ce9a 100644
--- a/pkgs/tools/misc/scfbuild/default.nix
+++ b/pkgs/tools/misc/scfbuild/default.nix
@@ -43,7 +43,7 @@ buildPythonApplication {
     description = "SVGinOT color font builder";
     homepage = "https://github.com/13rac1/scfbuild";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     mainProgram = "scfbuild";
   };
 }
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index 99ea5484c214..04564c690f1a 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -143,7 +143,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     mainProgram = "tlp";
     maintainers = with maintainers; [
-      abbradar
       lovesegfault
     ];
     license = licenses.gpl2Plus;
diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
index 4d8adb867e47..3ae303a1d53a 100644
--- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix
+++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options";
     homepage = "https://github.com/masterkorp/openvpn-update-resolv-conf/";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = [ ];
     license = licenses.gpl2Only;
     platforms = platforms.unix;
   };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8ae45e88e52e..5ff4d114a76c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4712,7 +4712,6 @@ with self;
       homepage = "https://pcsc-perl.apdu.fr/";
       license = with lib.licenses; [ gpl2Plus ];
       maintainers = with maintainers; [
-        abbradar
         anthonyroussel
       ];
     };
@@ -8192,7 +8191,7 @@ with self;
         artistic1
         gpl1Plus
       ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
       mainProgram = "hexdump";
     };
   };

From dc09d3a3f680452a10ef1d5740b7273daccf93bd Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Fri, 22 Aug 2025 15:53:40 +0800
Subject: [PATCH 2680/3724] xflux: drop

The upstream project has not been maintained for years, and the software has been non-functional for nearly a decade.
---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 26a9d22cb2cf..6f48fdd63e83 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2384,6 +2384,7 @@ mapAliases {
   xen_4_19 = throw "Use 'xen' instead"; # Added 2024-10-05
   xenPackages = throw "The attributes in the xenPackages set have been promoted to the top-level. (xenPackages.xen_4_19 -> xen)";
   xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22
+  xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22
   xineLib = throw "'xineLib' has been renamed to/replaced by 'xine-lib'"; # Converted to throw 2024-10-17
   xineUI = throw "'xineUI' has been renamed to/replaced by 'xine-ui'"; # Converted to throw 2024-10-17
   xlsxgrep = throw "'xlsxgrep' has been dropped due to lack of maintenance."; # Added 2024-11-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b28159fb12fb..b36900f1c7b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4546,8 +4546,6 @@ with pkgs;
 
   xdot = with python3Packages; toPythonApplication xdot;
 
-  xflux = callPackage ../tools/misc/xflux { };
-
   libxfs = xfsprogs.dev;
 
   xmlto = callPackage ../tools/typesetting/xmlto {

From 37cb69ecdcceacd8588f5085622521c90e5c9386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Fri, 22 Aug 2025 11:43:33 +0700
Subject: [PATCH 2681/3724] =?UTF-8?q?h2o:=202.3.0-untagged-2025-08-14=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2025-08-22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/h2/h2o/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index e13075fd3862..2f4b722984d9 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-untagged-2025-08-14";
+  version = "2.3.0-rolling-2025-08-22";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "ffab9c49c33b1f0e9aec9804028156aae9db8ef0";
-    hash = "sha256-kdU2p9oUhxGnw8JU9qGjV4mn2jMeSUL0rLgveMs6NiI=";
+    rev = "6476496bd544c3c7f601d7ab2b07e378e8310e11";
+    hash = "sha256-ZSBYg1HCuYifTyDmHyNIjEWab5N1TT+q/4m62mFFDJ0=";
   };
 
   outputs = [

From 042b75d35b435caeb392214c71e0734492df9c06 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 08:04:36 +0000
Subject: [PATCH 2682/3724] albert: 0.32.0 -> 0.32.1

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

diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix
index c49e42cdce80..3ad42236da59 100644
--- a/pkgs/by-name/al/albert/package.nix
+++ b/pkgs/by-name/al/albert/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "albert";
-  version = "0.32.0";
+  version = "0.32.1";
 
   src = fetchFromGitHub {
     owner = "albertlauncher";
     repo = "albert";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qxJ73aI8EgHgv5xWedGXkynMtZ9vLV8azBSmJGd0v7g=";
+    hash = "sha256-v2SMY0KGFwwybsiMu1W1wBWdyoDEFF3hWd4LeaT8Nts=";
     fetchSubmodules = true;
   };
 

From b49a50ccc92c51fddee9a969fed6999c331e138e Mon Sep 17 00:00:00 2001
From: Ezri Zhu <me@ezrizhu.com>
Date: Thu, 21 Aug 2025 23:29:43 -0400
Subject: [PATCH 2683/3724] nrfutil: fix stub-ld error and drop darwin support
 #398197

* nrfutil dep segger-jlink does not have darwin support
* fix stub-ld error via autoPatchelfHook
* added ezrizhu as maintainers
---
 pkgs/by-name/nr/nrfutil/package.nix | 35 +++++++++++++++++++----------
 pkgs/by-name/nr/nrfutil/source.nix  |  8 -------
 pkgs/by-name/nr/nrfutil/update.sh   |  2 --
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/nr/nrfutil/package.nix b/pkgs/by-name/nr/nrfutil/package.nix
index b72c55b55736..926dcd030251 100644
--- a/pkgs/by-name/nr/nrfutil/package.nix
+++ b/pkgs/by-name/nr/nrfutil/package.nix
@@ -2,9 +2,12 @@
   lib,
   stdenvNoCC,
   fetchurl,
-  makeWrapper,
+  zlib,
   libusb1,
   segger-jlink-headless,
+  gcc,
+  autoPatchelfHook,
+  versionCheckHook,
 }:
 
 let
@@ -23,7 +26,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (platform) hash;
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    zlib
+    libusb1
+    gcc.cc.lib
+    segger-jlink-headless
+  ];
 
   dontConfigure = true;
   dontBuild = true;
@@ -34,17 +46,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     mkdir -p $out
     mv data/* $out/
 
-    wrapProgram $out/bin/nrfutil \
-      --prefix LD_LIBRARY_PATH : "${
-        lib.makeLibraryPath [
-          segger-jlink-headless
-          libusb1
-        ]
-      }"
-
     runHook postInstall
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
   passthru.updateScript = ./update.sh;
 
   meta = with lib; {
@@ -52,8 +60,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Util";
     changelog = "https://docs.nordicsemi.com/bundle/nrfutil/page/guides/revision_history.html";
     license = licenses.unfree;
-    platforms = attrNames supported;
-    maintainers = with maintainers; [ h7x4 ];
+    platforms = lib.attrNames supported;
+    maintainers = with maintainers; [
+      h7x4
+      ezrizhu
+    ];
     mainProgram = "nrfutil";
   };
 })
diff --git a/pkgs/by-name/nr/nrfutil/source.nix b/pkgs/by-name/nr/nrfutil/source.nix
index 6d48b7274120..ba5df8b720a5 100644
--- a/pkgs/by-name/nr/nrfutil/source.nix
+++ b/pkgs/by-name/nr/nrfutil/source.nix
@@ -4,12 +4,4 @@
     name = "x86_64-unknown-linux-gnu";
     hash = "sha256-R3OF/340xEab+0zamfwvejY16fjy/3TrzMvQaBlVxHw=";
   };
-  x86_64-darwin = {
-    name = "x86_64-apple-darwin";
-    hash = "sha256-cnZkVkTbQ/+ciITPEx2vxxZchCC54T0JOApB4HKp8e0=";
-  };
-  aarch64-darwin = {
-    name = "aarch64-apple-darwin";
-    hash = "sha256-5VxDQ25tW+qTXHwkltpaAm4AnQvA18qGMaflYQzE2pQ=";
-  };
 }
diff --git a/pkgs/by-name/nr/nrfutil/update.sh b/pkgs/by-name/nr/nrfutil/update.sh
index a7efb9d49aae..199983e4aabb 100755
--- a/pkgs/by-name/nr/nrfutil/update.sh
+++ b/pkgs/by-name/nr/nrfutil/update.sh
@@ -14,8 +14,6 @@ declare -A versions
 declare -A hashes
 
 architectures["x86_64-linux"]="x86_64-unknown-linux-gnu"
-architectures["x86_64-darwin"]="x86_64-apple-darwin"
-architectures["aarch64-darwin"]="aarch64-apple-darwin"
 
 BASE_URL="https://files.nordicsemi.com/artifactory/swtools/external/nrfutil"
 

From d1ad3a2c43224cf78f55cea6a826917a4f796b82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 08:08:13 +0000
Subject: [PATCH 2684/3724] qdigidoc: 4.8.0 -> 4.8.2

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

diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix
index 67d1f21b5dce..1bcfd43c85eb 100644
--- a/pkgs/tools/security/qdigidoc/default.nix
+++ b/pkgs/tools/security/qdigidoc/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qdigidoc";
-  version = "4.8.0";
+  version = "4.8.2";
 
   src = fetchFromGitHub {
     owner = "open-eid";
     repo = "DigiDoc4-Client";
     tag = "v${version}";
-    hash = "sha256-3irEJnVzbmJbznyTIkDMw5t0SfegpCi51rQ0UxFXzBY=";
+    hash = "sha256-HxFH1vpXXPVSYnaMrPOJwYCt8Z0pnOLrpixQlDkTN5w=";
     fetchSubmodules = true;
   };
 

From 80f88d9af5af76cab95c8578ab88d5d1ea01da10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 08:18:39 +0000
Subject: [PATCH 2685/3724] slsk-batchdl: 2.4.7 -> 2.5.0

---
 pkgs/by-name/sl/slsk-batchdl/deps.json   | 89 +-----------------------
 pkgs/by-name/sl/slsk-batchdl/package.nix |  4 +-
 2 files changed, 4 insertions(+), 89 deletions(-)

diff --git a/pkgs/by-name/sl/slsk-batchdl/deps.json b/pkgs/by-name/sl/slsk-batchdl/deps.json
index e2c86476f9d0..d0b600b9ee34 100644
--- a/pkgs/by-name/sl/slsk-batchdl/deps.json
+++ b/pkgs/by-name/sl/slsk-batchdl/deps.json
@@ -39,91 +39,16 @@
     "version": "1.11.72",
     "hash": "sha256-MRt7yj6+/ORmr2WBERpQ+1gMRzIaPFKddHoB4zZmv2k="
   },
-  {
-    "pname": "Microsoft.ApplicationInsights",
-    "version": "2.22.0",
-    "hash": "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="
-  },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
     "version": "9.0.1",
     "hash": "sha256-A3W2Hvhlf1ODx1NYWHwUyziZOGMaDPvXHZ/ubgNLYJA="
   },
-  {
-    "pname": "Microsoft.CodeCoverage",
-    "version": "17.9.0",
-    "hash": "sha256-OaGa4+jRPHs+T+p/oekm2Miluqfd2IX8Rt+BmUx8kr4="
-  },
   {
     "pname": "Microsoft.CSharp",
     "version": "4.7.0",
     "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
   },
-  {
-    "pname": "Microsoft.NET.Test.Sdk",
-    "version": "17.9.0",
-    "hash": "sha256-q/1AJ7eNlk02wvN76qvjl2xBx5iJ+h5ssiE/4akLmtI="
-  },
-  {
-    "pname": "Microsoft.Testing.Extensions.Telemetry",
-    "version": "1.5.3",
-    "hash": "sha256-bIXwPSa3jkr2b6xINOqMUs6/uj/r4oVFM7xq3uVIZDU="
-  },
-  {
-    "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
-    "version": "1.5.3",
-    "hash": "sha256-IfMRfcyaIKEMRtx326ICKtinDBEfGw/Sv8ZHawJ96Yc="
-  },
-  {
-    "pname": "Microsoft.Testing.Extensions.VSTestBridge",
-    "version": "1.5.3",
-    "hash": "sha256-XpM/yFjhLSsuzyDV+xKubs4V1zVVYiV05E0+N4S1h0g="
-  },
-  {
-    "pname": "Microsoft.Testing.Platform",
-    "version": "1.5.3",
-    "hash": "sha256-y61Iih6w5D79dmrj2V675mcaeIiHoj1HSa1FRit2BLM="
-  },
-  {
-    "pname": "Microsoft.Testing.Platform.MSBuild",
-    "version": "1.5.3",
-    "hash": "sha256-YspvjE5Jfi587TAfsvfDVJXNrFOkx1B3y1CKV6m7YLY="
-  },
-  {
-    "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "17.12.0",
-    "hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w="
-  },
-  {
-    "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "17.9.0",
-    "hash": "sha256-iiXUFzpvT8OWdzMj9FGJDqanwHx40s1TXVY9l3ii+s0="
-  },
-  {
-    "pname": "Microsoft.TestPlatform.TestHost",
-    "version": "17.9.0",
-    "hash": "sha256-1BZIY1z+C9TROgdTV/tq4zsPy7Q71GQksr/LoMKAzqU="
-  },
-  {
-    "pname": "MSTest.Analyzers",
-    "version": "3.7.3",
-    "hash": "sha256-6mNfHtx9FBWA6/QrRUepwbxXWG/54GRyeZYazDiMacg="
-  },
-  {
-    "pname": "MSTest.TestAdapter",
-    "version": "3.7.3",
-    "hash": "sha256-3O/AXeS+3rHWstinivt73oa0QDp+xQpTc9p46EF+Mtc="
-  },
-  {
-    "pname": "MSTest.TestFramework",
-    "version": "3.7.3",
-    "hash": "sha256-RweCMMf14GI6HqjDIP68JM67IaJKYQTZy0jk5Q4DFxs="
-  },
-  {
-    "pname": "Newtonsoft.Json",
-    "version": "13.0.1",
-    "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
-  },
   {
     "pname": "Newtonsoft.Json",
     "version": "13.0.3",
@@ -136,8 +61,8 @@
   },
   {
     "pname": "Soulseek",
-    "version": "7.1.0",
-    "hash": "sha256-n6LUNuPmmy9QYNNALR0ObYyR9LJalf0H8P+SKnoqfFc="
+    "version": "7.1.2",
+    "hash": "sha256-yel9mxRf1idEQssM7n4SIVQPMQDMDmyvfL5owllqgf0="
   },
   {
     "pname": "SpotifyAPI.Web",
@@ -154,11 +79,6 @@
     "version": "7.0.0",
     "hash": "sha256-7IPt39cY+0j0ZcRr/J45xPtEjnSXdUJ/5ai3ebaYQiE="
   },
-  {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "5.0.0",
-    "hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4="
-  },
   {
     "pname": "System.IO.Pipelines",
     "version": "9.0.1",
@@ -174,11 +94,6 @@
     "version": "4.6.0",
     "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo="
   },
-  {
-    "pname": "System.Reflection.Metadata",
-    "version": "1.6.0",
-    "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
-  },
   {
     "pname": "System.Text.Encodings.Web",
     "version": "9.0.1",
diff --git a/pkgs/by-name/sl/slsk-batchdl/package.nix b/pkgs/by-name/sl/slsk-batchdl/package.nix
index 5967bd8ed2ee..f890d10e59ac 100644
--- a/pkgs/by-name/sl/slsk-batchdl/package.nix
+++ b/pkgs/by-name/sl/slsk-batchdl/package.nix
@@ -7,13 +7,13 @@
 }:
 buildDotnetModule (finalAttrs: {
   pname = "slsk-batchdl";
-  version = "2.4.7";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "fiso64";
     repo = "slsk-batchdl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-P7V7YJUA1bkfp13Glb1Q+NJ7iTya/xgO1TM88z1Nddc=";
+    hash = "sha256-ZgNjNdk03jIc/REJMmuc5rZLbibLoy94DJxh7jAJY7g=";
   };
 
   postPatch = ''

From 931b59fd50f408c83e9d556b1c7304df4041ef76 Mon Sep 17 00:00:00 2001
From: genga <genga898@gmail.com>
Date: Fri, 22 Aug 2025 11:20:23 +0300
Subject: [PATCH 2686/3724] rclone-ui: 1.0.4 -> 1.7.1

Diff: https://github.com/rclone-ui/rclone-ui/compare/v1.0.4...v1.7.1
Changelog: https://github.com/rclone-ui/rclone-ui/releases/tag/v1.7.1
---
 pkgs/by-name/rc/rclone-ui/package.nix          |  9 +++++----
 pkgs/by-name/rc/rclone-ui/remove_updater.patch | 16 +++++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/rc/rclone-ui/package.nix b/pkgs/by-name/rc/rclone-ui/package.nix
index 55c7e1aacddd..703e3bb5f1bd 100644
--- a/pkgs/by-name/rc/rclone-ui/package.nix
+++ b/pkgs/by-name/rc/rclone-ui/package.nix
@@ -20,26 +20,26 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rclone-ui";
-  version = "1.0.4";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "rclone-ui";
     repo = "rclone-ui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KTi/vCHiZVRAmQAiVXSWHCTTv1NnsvM5UZg8cpuFbRQ=";
+    hash = "sha256-Rc3otUWcwzEjwDEe1NwWjqjlFK5/b59oKDOUzvvea00=";
   };
 
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
     forceGitDeps = true;
-    hash = "sha256-18QkqqYS1kGY701FbFBHLvr5WBkJzxFgR9VMnydeelY=";
+    hash = "sha256-Rj0iv0TxOTnxpiHhA4gu2d9hdm3lhslZYvx4Jx1jmeU=";
   };
 
   cargoRoot = "src-tauri";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
-  cargoHash = "sha256-o21of2eS2KZtg1U1E6RwdaA8jGhEVzg7HkgOv1k5wxI=";
+  cargoHash = "sha256-OG0raNHwukMJkIlsmVvHVJ30FMhpxKeYjuyi6Clm104=";
 
   # Disable tauri bundle updater, can be removed when #389107 is merged
   patches = [ ./remove_updater.patch ];
@@ -78,6 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Cross-platform desktop GUI for rclone & S3";
     homepage = "https://github.com/rclone-ui/rclone-ui";
+    downloadPage = "https://github.com/rclone-ui/rclone-ui";
     changelog = "https://github.com/rclone-ui/rclone-ui/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ genga898 ];
diff --git a/pkgs/by-name/rc/rclone-ui/remove_updater.patch b/pkgs/by-name/rc/rclone-ui/remove_updater.patch
index 398ba86b2bc8..4dd542283795 100644
--- a/pkgs/by-name/rc/rclone-ui/remove_updater.patch
+++ b/pkgs/by-name/rc/rclone-ui/remove_updater.patch
@@ -1,23 +1,23 @@
 diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
-index 001faa3..2d7ae0c 100644
+index 04ea191..72d178d 100644
 --- a/src-tauri/src/lib.rs
 +++ b/src-tauri/src/lib.rs
-@@ -82,7 +82,6 @@ pub fn run() {
-     let _guard = minidump::init(&client);
+@@ -83,7 +83,6 @@ pub fn run() {
  	
      let mut app = tauri::Builder::default()
+         .plugin(tauri_plugin_clipboard_manager::init())
 -        .plugin(tauri_plugin_updater::Builder::new().build())
          .plugin(tauri_plugin_os::init())
          .plugin(tauri_plugin_notification::init())
          .plugin(tauri_plugin_process::init())
 diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
-index 4f9df22..58d6c06 100644
+index 8b1c89f..1705861 100644
 --- a/src-tauri/tauri.conf.json
 +++ b/src-tauri/tauri.conf.json
-@@ -86,14 +86,9 @@
+@@ -86,16 +86,9 @@
                  "installMode": "both"
              },
-             "signCommand": "trusted-signing-cli %1 -e https://eus.codesigning.azure.net -a sign-1 -c Sign1"
+             "signCommand": "trusted-signing-cli -e https://eus.codesigning.azure.net -a sign-1 -c Sign1 -d Rclone %1"
 -        },
 -        "createUpdaterArtifacts": true
 +        }
@@ -25,7 +25,9 @@ index 4f9df22..58d6c06 100644
      "plugins": {
 -        "updater": {
 -            "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDIyNDFENEZGNjFDNTBGOEYKUldTUEQ4VmgvOVJCSWhVZmw0enhmcW1kWFk3TS9mMzBDRjVEZWdxKzQ5ZmRhTlYvT2gvdFNMbE8K",
--            "endpoints": ["https://github.com/FTCHD/rclone-ui/releases/latest/download/latest.json"]
+-            "endpoints": [
+-                "https://github.com/rclone-ui/rclone-ui/releases/latest/download/latest.json"
+-            ]
 -        },
          "fs": {
              "requireLiteralLeadingDot": false

From 9de2b9fddb16f73411bba341324eaa33d738d17e Mon Sep 17 00:00:00 2001
From: Henri Rosten <henri.rosten@unikie.com>
Date: Fri, 22 Aug 2025 11:25:38 +0300
Subject: [PATCH 2687/3724] vulnix: 1.11.0 -> 1.12.0

Signed-off-by: Henri Rosten <henri.rosten@unikie.com>
---
 pkgs/by-name/vu/vulnix/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulnix/package.nix b/pkgs/by-name/vu/vulnix/package.nix
index 43a317d2d95d..e676c525b2fc 100644
--- a/pkgs/by-name/vu/vulnix/package.nix
+++ b/pkgs/by-name/vu/vulnix/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "vulnix";
-  version = "1.11.0";
+  version = "1.12.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "vulnix";
     tag = version;
-    hash = "sha256-bQjmAmTRP/ce25hSP1nTtuDmUtk46DxkKWtylJRoj3s=";
+    hash = "sha256-Z13YbGpXnOZByweGhsdmNwpYelcd96/jlWyvnsmn7tM=";
   };
 
   __darwinAllowLocalNetworking = true;

From f2fab41add8cc1b3c65c68695e7cf1c449639e9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 08:33:37 +0000
Subject: [PATCH 2688/3724] python3Packages.opower: 0.15.1 -> 0.15.2

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

diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index c980deaaba50..7b75db2db8f9 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "opower";
-  version = "0.15.1";
+  version = "0.15.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tronikos";
     repo = "opower";
     tag = "v${version}";
-    hash = "sha256-FB9m1aFEqbqLYfg5cMhZMLvp9ENsudQqf5dXKnGtZkA=";
+    hash = "sha256-2Zt0mzsAEF+h2gE1mBkRqa5u+EFPRXtdF3WOUHjbnCk=";
   };
 
   build-system = [ setuptools ];

From 31d5c4e753c996f5fd431b9988af9db91581ec09 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 22 Aug 2025 11:33:45 +0300
Subject: [PATCH 2689/3724] nixos/treewide: clean up some more references to
 deleted qt5 things

---
 nixos/modules/config/qt.nix                   | 31 ++-----------------
 .../modules/system/boot/loader/grub/grub.nix  |  2 +-
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/nixos/modules/config/qt.nix b/nixos/modules/config/qt.nix
index d78d4f092b72..187f4679bd68 100644
--- a/nixos/modules/config/qt.nix
+++ b/nixos/modules/config/qt.nix
@@ -17,11 +17,6 @@ let
       qt6Packages.qt6gtk2
     ];
     kde = [
-      libsForQt5.kio
-      libsForQt5.plasma-integration
-      libsForQt5.systemsettings
-    ];
-    kde6 = [
       kdePackages.kio
       kdePackages.plasma-integration
       kdePackages.systemsettings
@@ -36,11 +31,6 @@ let
     ];
   };
 
-  # Maps style names to their QT_QPA_PLATFORMTHEME, if necessary.
-  styleNames = {
-    kde6 = "kde";
-  };
-
   stylePackages = with pkgs; {
     bb10bright = [ libsForQt5.qtstyleplugins ];
     bb10dark = [ libsForQt5.qtstyleplugins ];
@@ -71,8 +61,8 @@ let
     ];
 
     breeze = [
-      libsForQt5.breeze-qt5
       kdePackages.breeze
+      kdePackages.breeze.qt5
     ];
 
     kvantum = [
@@ -111,10 +101,6 @@ in
         relatedPackages = [
           "qgnomeplatform"
           "qgnomeplatform-qt6"
-          [
-            "libsForQt5"
-            "plasma-integration"
-          ]
           [
             "libsForQt5"
             "qt5ct"
@@ -123,10 +109,6 @@ in
             "libsForQt5"
             "qtstyleplugins"
           ]
-          [
-            "libsForQt5"
-            "systemsettings"
-          ]
           [
             "kdePackages"
             "plasma-integration"
@@ -158,8 +140,7 @@ in
           The options are
           - `gnome`: Use GNOME theme with [qgnomeplatform](https://github.com/FedoraQt/QGnomePlatform)
           - `gtk2`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins)
-          - `kde`: Use Qt settings from Plasma 5.
-          - `kde6`: Use Qt settings from Plasma 6.
+          - `kde`: Use Qt settings from Plasma.
           - `lxqt`: Use LXQt style set using the [lxqt-config-appearance](https://github.com/lxqt/lxqt-config)
              application.
           - `qt5ct`: Use Qt style set using the [qt5ct](https://sourceforge.net/projects/qt5ct/)
@@ -174,10 +155,6 @@ in
         relatedPackages = [
           "adwaita-qt"
           "adwaita-qt6"
-          [
-            "libsForQt5"
-            "breeze-qt5"
-          ]
           [
             "libsForQt5"
             "qtstyleplugin-kvantum"
@@ -236,9 +213,7 @@ in
       ];
 
     environment.variables = {
-      QT_QPA_PLATFORMTHEME =
-        lib.mkIf (cfg.platformTheme != null)
-          styleNames.${cfg.platformTheme} or cfg.platformTheme;
+      QT_QPA_PLATFORMTHEME = lib.mkIf (cfg.platformTheme != null) cfg.platformTheme;
       QT_STYLE_OVERRIDE = lib.mkIf (cfg.style != null) cfg.style;
     };
 
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index d7614d99775b..c18d5431bd8a 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -558,7 +558,7 @@ in
 
       theme = mkOption {
         type = types.nullOr types.path;
-        example = literalExpression ''"''${pkgs.libsForQt5.breeze-grub}/grub/themes/breeze"'';
+        example = literalExpression ''"''${pkgs.kdePackages.breeze-grub}/grub/themes/breeze"'';
         default = null;
         description = ''
           Path to the grub theme to be used.

From f68e7e745bea059a585e1a831dfbd691f5165bd7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 00:57:06 +0000
Subject: [PATCH 2690/3724] qmmp: 2.2.7 -> 2.2.8

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

diff --git a/pkgs/by-name/qm/qmmp/package.nix b/pkgs/by-name/qm/qmmp/package.nix
index adc1427480ce..0006efa17170 100644
--- a/pkgs/by-name/qm/qmmp/package.nix
+++ b/pkgs/by-name/qm/qmmp/package.nix
@@ -54,11 +54,11 @@
 
 stdenv.mkDerivation rec {
   pname = "qmmp";
-  version = "2.2.7";
+  version = "2.2.8";
 
   src = fetchurl {
     url = "https://qmmp.ylsoftware.com/files/qmmp/2.2/${pname}-${version}.tar.bz2";
-    hash = "sha256-3c/wthj0eQgC9tUtmnlrXzLLfQ8jyZGBuAT2FPq1+7I=";
+    hash = "sha256-cwqXoGOkmOs32p4vgZjf5XBpPmpsfyshDVgb2H27k4o=";
   };
 
   nativeBuildInputs = [

From 1b39a4b99baa167a2554a41b00a008e4710cce17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 08:45:06 +0000
Subject: [PATCH 2691/3724] python3Packages.logassert: 8.5 -> 8.6

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

diff --git a/pkgs/development/python-modules/logassert/default.nix b/pkgs/development/python-modules/logassert/default.nix
index 05dfc18f7be8..52251a53e138 100644
--- a/pkgs/development/python-modules/logassert/default.nix
+++ b/pkgs/development/python-modules/logassert/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "logassert";
-  version = "8.5";
+  version = "8.6";
 
   pyproject = true;
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "facundobatista";
     repo = "logassert";
     tag = version;
-    hash = "sha256-77oP7NE1fK1pA6baTHoSbfR7kR4URSmSpZSCgFO5Pb4=";
+    hash = "sha256-dkBsR4FmiKjHzZc74Mt2cAffO7ZuIRnLOpFx60e9+so=";
   };
 
   build-system = [ setuptools ];

From 924f6e510e2ba9be09b054d8e7eab20dd636021a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 08:46:11 +0000
Subject: [PATCH 2692/3724] xv: 6.0.3 -> 6.0.4

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

diff --git a/pkgs/by-name/xv/xv/package.nix b/pkgs/by-name/xv/xv/package.nix
index 0abb9e0eea39..999634c8a9b1 100644
--- a/pkgs/by-name/xv/xv/package.nix
+++ b/pkgs/by-name/xv/xv/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xv";
-  version = "6.0.3";
+  version = "6.0.4";
 
   src = fetchFromGitHub {
     owner = "jasper-software";
     repo = "xv";
     rev = "v${version}";
-    sha256 = "sha256-508P88Kac1W0xwjNblOjkYJri36ReZkjzrNzrrSBZjg=";
+    sha256 = "sha256-5bhLMGdj7HJOsSOFjNO5s3wDA9XbPTwG+g7OSrKMMXk=";
   };
 
   nativeBuildInputs = [ cmake ];

From 56dfb8b617654ae99af09a1db7cddc22ea843978 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 09:02:59 +0000
Subject: [PATCH 2693/3724] nak: 0.15.2 -> 0.15.3

---
 pkgs/by-name/na/nak/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix
index 9d5af4fe435f..eac7b61676bd 100644
--- a/pkgs/by-name/na/nak/package.nix
+++ b/pkgs/by-name/na/nak/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "nak";
-  version = "0.15.2";
+  version = "0.15.3";
 
   src = fetchFromGitHub {
     owner = "fiatjaf";
     repo = "nak";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pYSD6pVp4WRbRzv/voiHpgPKbC9J+PLJGGx6hH813FQ=";
+    hash = "sha256-PSg+27uTpPIrKlYArWOv92l5muQRQiFZ6Vvu7hDLt5s=";
   };
 
-  vendorHash = "sha256-Xoi0sepupJK3pT0egbXRYQkPgwc0G2Xgwiz71Tqj8T4=";
+  vendorHash = "sha256-qwi3awU1DHjT/4scGUrhsdlmXJYwq0g/t4LaZ8FGYB0=";
 
   ldflags = [
     "-s"

From 706f659c75c4ec3bbfb24b1843c290f4afe1b308 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 09:21:50 +0000
Subject: [PATCH 2694/3724] python3Packages.s3fs: 2025.2.0 -> 2025.7.0

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

diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index 47ea05d11f2b..2685476d9fa3 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "s3fs";
-  version = "2025.2.0";
+  version = "2025.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = "s3fs";
     tag = version;
-    hash = "sha256-nnfvccORDspj54sRxL3d0hn4MpzKYGKE2Kl0v/wLaNw=";
+    hash = "sha256-1e+Y4nY61+BwGNCuBlAlf0Lpxj95di0iDrbmxlyAjVI=";
   };
 
   build-system = [

From 5c56bd2e265c8c04fa417772ecbbcf3dc8658c15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 09:30:20 +0000
Subject: [PATCH 2695/3724] velocity: 3.4.0-unstable-2025-08-13 ->
 3.4.0-unstable-2025-08-14

---
 pkgs/by-name/ve/velocity/deps.json   | 244 +++++++++++++--------------
 pkgs/by-name/ve/velocity/package.nix |   6 +-
 2 files changed, 125 insertions(+), 125 deletions(-)

diff --git a/pkgs/by-name/ve/velocity/deps.json b/pkgs/by-name/ve/velocity/deps.json
index 39a782eaf699..f0d0581a8c29 100644
--- a/pkgs/by-name/ve/velocity/deps.json
+++ b/pkgs/by-name/ve/velocity/deps.json
@@ -661,102 +661,102 @@
    "jar": "sha256-wmJ0R0s4RLzbfYPPc6eFNm+EtFO8F6GRz6T4/D4CIjQ=",
    "pom": "sha256-3Etrgt7DQXBSvBc7lC+5asogUIpLmkfp8b2yQAXkPuc="
   },
-  "io/netty#netty-buffer/4.2.3.Final": {
-   "jar": "sha256-qE+AnL+14CCqdFEXJ/TrOM8TxiN3nTptXhvs3Bc0c70=",
-   "pom": "sha256-iRZkcKHco4p768EiNBVjqG1ljK+9hZUUgoyi9nWRfnI="
+  "io/netty#netty-buffer/4.2.4.Final": {
+   "jar": "sha256-ng3ULx6rxYQzli76MprNNy3zBcMKaljNF/6xzTL54ok=",
+   "pom": "sha256-YayQwoVv20mqh1+iPbM7XwOc3AfU8pO00Y5Wsts7EAo="
   },
-  "io/netty#netty-codec-base/4.2.3.Final": {
-   "jar": "sha256-KM75Eub2Km9ZJuOVdb2xiQd5qxkoQXRHh6Ok2Z9L5vQ=",
-   "pom": "sha256-fFqqtOVkCtacmEBqkLvVgikjOU8Q0u8CcnGzxLtM1PY="
+  "io/netty#netty-codec-base/4.2.4.Final": {
+   "jar": "sha256-CvLBN6ijsmS68ViHRw2Faom/cSAloIZSwwOL//v+ZjQ=",
+   "pom": "sha256-+Rs+uU5/48eizc1rXkVTRUAgvu4hoxc03WZGOXLTXhc="
   },
-  "io/netty#netty-codec-compression/4.2.3.Final": {
-   "jar": "sha256-anuL5vYq7OEmWDdlgHqZGnYCZtoesrsYl6q24tcm35I=",
-   "pom": "sha256-30Yl9QQDBiADH3Xt7NMY8QcNicuRGJU/NYUEwYXj638="
+  "io/netty#netty-codec-compression/4.2.4.Final": {
+   "jar": "sha256-Y5ccgGYysIOJxtCzydhT3+8EdhjNTPVV8jqZLhVc4Jw=",
+   "pom": "sha256-RwN70nKjw72l1x7pE/A9C/JVreg2g9V1+2gBRY8KRlw="
   },
-  "io/netty#netty-codec-haproxy/4.2.3.Final": {
-   "jar": "sha256-p73EbZ4Ku+0OcIuupOsII7Hm8VRIOURcn4DfJGHUgqw=",
-   "pom": "sha256-MST4IVR0lmfsoNS9ppg8Ic7hOZE6dFDkH/3fwwPEA4k="
+  "io/netty#netty-codec-haproxy/4.2.4.Final": {
+   "jar": "sha256-9FJsPWgZqI8NYXSpA4HiZDHjcICnXbeVvAx4RJIuMQ0=",
+   "pom": "sha256-wQvuTJBVMBBN7utiD8+SOK+Z9rcpWhZzeaqjBHOsnDI="
   },
-  "io/netty#netty-codec-http/4.2.3.Final": {
-   "jar": "sha256-BeLOUhSA74RtRKvsG7riB/dnRzWb/n/Ka1lxiLd9Smg=",
-   "pom": "sha256-Zx9BTXgvTfnYoYZah3jFBJx8PodUaNyH11LRb5mqCkQ="
+  "io/netty#netty-codec-http/4.2.4.Final": {
+   "jar": "sha256-veaJ3fKU9w8QXQlVz8bXhNHl7k6ncwpzOx/EcoRW2VA=",
+   "pom": "sha256-xmEFuF/3Bd4cLon3uORV5Ot7CWiSTxWFTe4ZFWL40wA="
   },
-  "io/netty#netty-codec-marshalling/4.2.3.Final": {
-   "jar": "sha256-vpkn+uQVSP9WEXNCLElK2lXJmDlmrVTyDBgfGqmbRL0=",
-   "pom": "sha256-H0wOGS22gfyWwIdj+lVuWFT6bjvG20CZCyfANX5T15s="
+  "io/netty#netty-codec-marshalling/4.2.4.Final": {
+   "jar": "sha256-KjqLHmMShP0rU4wRyb00bJP/FtwccLurVY3I8k8aQEQ=",
+   "pom": "sha256-j3MxT6zWuv0NsDaIVshuKPbKb12Q91l0CoAO0ylea2w="
   },
-  "io/netty#netty-codec-protobuf/4.2.3.Final": {
-   "jar": "sha256-8jMnfOCEcgui7qf2ea02SxwKEPuSB9kztucSQGIQpdI=",
-   "pom": "sha256-qB7ueV2s3HgW82mR5+HJ+xpW8yMNgVPMuerztjp2Xtc="
+  "io/netty#netty-codec-protobuf/4.2.4.Final": {
+   "jar": "sha256-Ixj1IQF97o4OTlD9jV6KGx1HYty2nqmqUqe3n/jHYL8=",
+   "pom": "sha256-i9PbMlMNXvZ5v/AFthdbO/wLJMmUEQ4s1LVDq9U+m2I="
   },
-  "io/netty#netty-codec/4.2.3.Final": {
-   "jar": "sha256-e9+J8CDdkQpnOSuXVNcWVrCMXQsxVdDipCJ94CnHLpM=",
-   "pom": "sha256-4L/Y1glKSVu9VaNOtZXmy7+7Lio0KKTp6x98v1rVShk="
+  "io/netty#netty-codec/4.2.4.Final": {
+   "jar": "sha256-htpiccbS7wbPXkKgO7xnpfB0+XeEZPUS8chMM/v8iak=",
+   "pom": "sha256-BGQ/YG9suwhDDkNAtE0hmEPQxjzcd1bY7kqZIRvIl+8="
   },
-  "io/netty#netty-common/4.2.3.Final": {
-   "jar": "sha256-2gLPoSX6PdxS4sdw6Lm/6Jhh7N5MTe01AYlWkv9JstQ=",
-   "pom": "sha256-BqQtEX7CXFeRnmRWcB5kkzvBZNnIOIoQ/2UwoGBSuio="
+  "io/netty#netty-common/4.2.4.Final": {
+   "jar": "sha256-3VdEhGNmIVTDLgz6CZlgoW7aXwiWBQ5EGVsPwphjg38=",
+   "pom": "sha256-RXP+DQg7pRLmGQxP8OFeVp0LUT2E6Xw+1kgP/p2Z/iw="
   },
-  "io/netty#netty-handler/4.2.3.Final": {
-   "jar": "sha256-6pwQ9MOF8mAlZYD4fG9U8cE9Bb/Teey0DI8KzEw5DLI=",
-   "pom": "sha256-6bXP9gOCM5xv7NPH0MzdD7F1P2sboWJgmr+i+dTxjRk="
+  "io/netty#netty-handler/4.2.4.Final": {
+   "jar": "sha256-UoC37ITUlAUbqZY5yGeTsE2STqfr2trBUo5m9P6Dksg=",
+   "pom": "sha256-yPVvwMYP9vqmTX29FwnDWm6B8/L24FaZyPMkH20KhVc="
   },
-  "io/netty#netty-parent/4.2.3.Final": {
-   "pom": "sha256-Hv4svswTjgmw8494nkIptnV/kc4tByzejztmwlqpcB0="
+  "io/netty#netty-parent/4.2.4.Final": {
+   "pom": "sha256-Ri3r3EQgCvZiVkSS/wWtRVxe6HEdB1h+IGh+tmd+MG4="
   },
-  "io/netty#netty-resolver/4.2.3.Final": {
-   "jar": "sha256-GXUh4KkIlx+lfYRA4wGpw5VRjechozsN+uBTybYWxkI=",
-   "pom": "sha256-BFpHO5FIrc+x2WVX1K4SU0K3X7LKVjKJD6PCOPnYgcc="
+  "io/netty#netty-resolver/4.2.4.Final": {
+   "jar": "sha256-FStlMcD5CStqXEDJq3Cc+sJ15DO0wIBQF0B5DTmGOgw=",
+   "pom": "sha256-1jPP6gJtU2X+yBbtBTbr9CyMcuSNfqPBYs/b/aoZc68="
   },
-  "io/netty#netty-transport-classes-epoll/4.2.3.Final": {
-   "jar": "sha256-j5oICgTnoaiZO1lC3hxydm8663PgO/Tf8iMDAaZkjWA=",
-   "pom": "sha256-BIJRpHBiMLlGgvlj0PIqcBfckN3QSABeKQQEQGpK3rU="
+  "io/netty#netty-transport-classes-epoll/4.2.4.Final": {
+   "jar": "sha256-wRqsFVM/ls3uQ+WL9eexCdJzMupygRH1/WLwNzYVMSg=",
+   "pom": "sha256-53E1vT0TCN5/AXaGD5yWu5sCYeUzFN0xqnb+8zs0LFE="
   },
-  "io/netty#netty-transport-classes-io_uring/4.2.3.Final": {
-   "jar": "sha256-GmDWN2JgVWu7eIo7T0KVvTiG3yZy3ciwRNdCdu2xObo=",
-   "pom": "sha256-vlpW4b6EXBoz5WckCdHhx+hsxgckvys2Am0/hN2gEFA="
+  "io/netty#netty-transport-classes-io_uring/4.2.4.Final": {
+   "jar": "sha256-BheCAqyclFrUBFqDEAsGsMkXfmzIHtNr9UCEMz4L7l0=",
+   "pom": "sha256-Dh9r8LfmTCgz4gLrcsk4zA+nUpDYdGBqYdxVmyf8G9k="
   },
-  "io/netty#netty-transport-classes-kqueue/4.2.3.Final": {
-   "jar": "sha256-g6eRvF01c8e/966kF/X2D+hSpJDrnXGv82m+M8RI8bw=",
-   "pom": "sha256-HoIDHN+VP4HilqVwKyOzwLcnV4rgscml1SpQxt1t1IM="
+  "io/netty#netty-transport-classes-kqueue/4.2.4.Final": {
+   "jar": "sha256-+proWJoZUiMF0MBMaolR/IAZ0c/9tE+F4Eu4xkqVVLg=",
+   "pom": "sha256-tDNOT3hUZ24tR9jFwh08/i9ljFLePpJTy3pbbxG2u4k="
   },
-  "io/netty#netty-transport-native-epoll/4.2.3.Final": {
-   "jar": "sha256-l3aX9ZNb3xxTXAzUMPiu5Xqvf7PWvO6C9RZuqrMdKy4=",
-   "pom": "sha256-Kuh5vHL7CtnZZobT/KgQ4MiITHSOTUxyGBcVm8rKrao="
+  "io/netty#netty-transport-native-epoll/4.2.4.Final": {
+   "jar": "sha256-FKIGZ7wNJcSvmgb45xLf45Kqs/6gLO3NczPinhrvDqU=",
+   "pom": "sha256-fX9QgM6meAVW0RnmQVphprCSznIrHiXS37MEB7SdsIM="
   },
-  "io/netty#netty-transport-native-epoll/4.2.3.Final/linux-aarch_64": {
-   "jar": "sha256-JOdtx0MJWtxpZ/1RqvhxiMQ4rrmlBECRk9bxeaOVD6Q="
+  "io/netty#netty-transport-native-epoll/4.2.4.Final/linux-aarch_64": {
+   "jar": "sha256-zn4qRb6UJ19z8r/KOouchPvz3u7bL70XQvB5EvhoVTk="
   },
-  "io/netty#netty-transport-native-epoll/4.2.3.Final/linux-x86_64": {
-   "jar": "sha256-43lQ7X/WHEcw5IO1cU0xaoC6c2XawEUIsO4UcugRv/Y="
+  "io/netty#netty-transport-native-epoll/4.2.4.Final/linux-x86_64": {
+   "jar": "sha256-ZzzEBzWkDbGFsYQ3zoxzSQcMxhq45y7BxPmgD8Y9wzA="
   },
-  "io/netty#netty-transport-native-io_uring/4.2.3.Final": {
-   "jar": "sha256-Eua64ls90kVTr38BwwtZbpCzrRCDDAv3Xh57FAZkFmE=",
-   "pom": "sha256-Ll/iBk6SUi+9M8f2a5W0pvYA9a1BZ+EquiC7NoEnQ/Y="
+  "io/netty#netty-transport-native-io_uring/4.2.4.Final": {
+   "jar": "sha256-0MAryHaf9Bjxg19rSbTup/14fFsQvYqPB/xjcPFayZY=",
+   "pom": "sha256-CSpxzbsHg6QCpnn1DuZ+yc0w4UumZCWk8Ly1XiFC5GU="
   },
-  "io/netty#netty-transport-native-io_uring/4.2.3.Final/linux-aarch_64": {
-   "jar": "sha256-SkYKRO+yPVw8c+ljDIFagr78U8PY2jsyXG4JfguQroo="
+  "io/netty#netty-transport-native-io_uring/4.2.4.Final/linux-aarch_64": {
+   "jar": "sha256-eUuBBohdL6LSaZCutzLc4MG0MY88nw1nHa385g47nT4="
   },
-  "io/netty#netty-transport-native-io_uring/4.2.3.Final/linux-x86_64": {
-   "jar": "sha256-KYHFM7OrlmxODOWuxS3J9cG8PQ491PhWqDPC163RJoM="
+  "io/netty#netty-transport-native-io_uring/4.2.4.Final/linux-x86_64": {
+   "jar": "sha256-4fbWenPelBRbWocO+xVweUvBnSmsBI/pcbnLuqdtR0c="
   },
-  "io/netty#netty-transport-native-kqueue/4.2.3.Final": {
-   "jar": "sha256-UmQvRVD7pR42pQtnL0UC/2esnT70FMd2lwQJ52dPZ4U=",
-   "pom": "sha256-SZmx6MKCEM2c6XpU33cjkwvoILy/QqwP+OYlcU/Npmg="
+  "io/netty#netty-transport-native-kqueue/4.2.4.Final": {
+   "jar": "sha256-RKqm6ZpJLlTNR6RB7QZGhWP46Z6JOGIpEpqJRtlIOJI=",
+   "pom": "sha256-snXJGraVPRi+ZaOk1a9JyD0wOupJfTxkrygGnd8HsYk="
   },
-  "io/netty#netty-transport-native-kqueue/4.2.3.Final/osx-aarch_64": {
-   "jar": "sha256-LZAQjwE6R4gvuz8FRIeNMANyvRKWu8cIbK4RlMZTGAg="
+  "io/netty#netty-transport-native-kqueue/4.2.4.Final/osx-aarch_64": {
+   "jar": "sha256-dTWoJPWe3dACXmTVLzzwaT5n5Iuep5f0xUI8cEgl1+g="
   },
-  "io/netty#netty-transport-native-kqueue/4.2.3.Final/osx-x86_64": {
-   "jar": "sha256-BFMxwe9+GXD9JvSyRn7VZOFeE6OgTjTrU+LxZRijT3M="
+  "io/netty#netty-transport-native-kqueue/4.2.4.Final/osx-x86_64": {
+   "jar": "sha256-CRp9eTJ8DcuA2iogxG8KS5b4I5tfuqcicDEyda8DUrI="
   },
-  "io/netty#netty-transport-native-unix-common/4.2.3.Final": {
-   "jar": "sha256-11JDOI6+i6P1YYMnm3JXIaA6xOeTIJ2s5v4VFLhdZ5s=",
-   "pom": "sha256-u3asm4lXSX4306D+gy7j9A8ffZj7Wkp1bstKAw4jjHs="
+  "io/netty#netty-transport-native-unix-common/4.2.4.Final": {
+   "jar": "sha256-0uT1oUevhUb1JQ8fp9G8CLDyjhXw8xlcfyTrsYYqQ8E=",
+   "pom": "sha256-Oel7uwR+M9yMUXn9M1q4hDKfIeJUAEg3QuYZiBT2sVg="
   },
-  "io/netty#netty-transport/4.2.3.Final": {
-   "jar": "sha256-0/wgHcn+iHFRkT0wDncNqgkA8TIiIQVleofCyWyG5QU=",
-   "pom": "sha256-v3iNbongKeLxVIvnlMJSngras0pYbvag/4Ans1JoPrw="
+  "io/netty#netty-transport/4.2.4.Final": {
+   "jar": "sha256-x4c4WLzyXVkhH5nT3TWlLWRO/FEWzQoAzUQCs9I8Y3I=",
+   "pom": "sha256-tq1ktxu0hdLgxgtaS5HQnb/UEymeZ5nn11kpRgmpfpY="
   },
   "it/unimi/dsi#fastutil/8.5.15": {
    "jar": "sha256-z/62ZzvfHm5Dd9aE3y9VrDWc9c9t9hPgXmLe7qUAk2o=",
@@ -787,24 +787,24 @@
    "jar": "sha256-Yq4oGH7SsGKBPaap1We/7nM8NBWCaZti3ZgCMHKaAxM=",
    "pom": "sha256-NYRJ1sc1OFhFCN2K5s/eVrr0o0t2e3HZzEZE8PH0IRo="
   },
-  "net/kyori#adventure-api/4.23.0": {
-   "jar": "sha256-Ubn89img4yWTTyoyHpdL1tqCMzMmb/CZtK2GJC7cXvQ=",
-   "module": "sha256-ssVpI4V4Sh8OZm+ETRp3aMFkoIqFDC+SjNxBW/lSLJ0=",
-   "pom": "sha256-rXHK/j8ZankUdWLS1zFs2Xy4IEzWT1u7tDbaxsd69sk="
+  "net/kyori#adventure-api/4.24.0": {
+   "jar": "sha256-2MHWbbD7rwhOgXmz8lQdn/ZEAqeIEHCnHos8JsJtOE4=",
+   "module": "sha256-c06XRjLjZiH+7Ze3ThrLSXl+pzw3EUR8p+LGBLmLEFU=",
+   "pom": "sha256-eG4PXAYZB2RwjAVpqFTsfjHG/gcZO0Rfg4l1Uorbt30="
   },
-  "net/kyori#adventure-bom/4.23.0": {
-   "module": "sha256-c9ge6qJeY3eAOKKVCMQKFLwJ6bZWEjaIoUJHc5HDOeo=",
-   "pom": "sha256-FGu/m1sl8kwUwlpmW76XgKXsCUmgPGttk7c/PfaQ9fM="
+  "net/kyori#adventure-bom/4.24.0": {
+   "module": "sha256-ElMB4ouFj88PjnGC2uoUXQqOHXy/zPTEOXsjHUpQYkw=",
+   "pom": "sha256-1+utxlvrCvSg9UpTNWc7z/YwqRH1QKD0TH/38CxPOIU="
   },
-  "net/kyori#adventure-key/4.23.0": {
-   "jar": "sha256-gDd4WEpb+PpfF7q5s7YkUO4TEP2SjyAPFoOSmkMMJmQ=",
-   "module": "sha256-o4U17pVdUtrTEco9rneVLJRybh55ytyr98WMYusqn0U=",
-   "pom": "sha256-iaYmnO5F3YJsKqD5mSQebjvq79mtSfkyxSZNvNcxewk="
+  "net/kyori#adventure-key/4.24.0": {
+   "jar": "sha256-1PIfQoHonas0WpAEVnZoeUgZ+cxIPq/4v9ZMV0lKkVA=",
+   "module": "sha256-0gI7+Of0qK+PCK5DpIPMOk8261sVrG8l0Nh0HZa6EvA=",
+   "pom": "sha256-SIhAxvEcX0+ObfLgYWcusVi4dJNUGz5hipSKoRXZ0TE="
   },
-  "net/kyori#adventure-nbt/4.23.0": {
-   "jar": "sha256-2HqbMvVCeqeGOjG7+8q6t36WIExdKKYvf4DWalJtcEY=",
-   "module": "sha256-cdaqmcJYMWM5RELtBF4FrGyY3KvHEtMi5KBpBbdKOTY=",
-   "pom": "sha256-lKa0XCvcLlfTGwOL2sLeaV8qRp4TlpDLskiFuG4vOM4="
+  "net/kyori#adventure-nbt/4.24.0": {
+   "jar": "sha256-j//4nbx/DB5MzfMzf5ASDpoPz/NsxGl9Hndp/0vVaFM=",
+   "module": "sha256-MP2lzkSXyclV00dsiIVysTvXKWsz3NDqy1V/mUvutvI=",
+   "pom": "sha256-nzBN7cX6Asa2avbR+8MpCYop3DlTLMHMQlp8dnezHXA="
   },
   "net/kyori#adventure-platform-api/4.3.4": {
    "jar": "sha256-7GBGKMK3wWXqdMH8s6LQ8DNZwsd6FJYOOgvC43lnCsI=",
@@ -816,50 +816,50 @@
    "module": "sha256-VYXzbUzK6MaYbW4tmAjZs5ywl28CLK8sANPP5v1HTQQ=",
    "pom": "sha256-wP6w6syf5B8iL5iXsS4lrDw0Ub3VYWwUhclppgBO2eE="
   },
-  "net/kyori#adventure-text-logger-slf4j/4.23.0": {
-   "jar": "sha256-e41RpiLFfZgt64llKz4tbukSj2V82lSRKtkmaL2r42Q=",
-   "module": "sha256-/xZGn2LzFSLEpmN50bXR0/vJfGKBNd1fpVG3Nkck8Eo=",
-   "pom": "sha256-zSk39q2IjiVO5SB9RWW2jmd2XErDNHAezauWoWQjC2s="
+  "net/kyori#adventure-text-logger-slf4j/4.24.0": {
+   "jar": "sha256-IuMKbpKnDgpELrZMkGUkp3bzwwPiheGDzyt8Q1+QqBw=",
+   "module": "sha256-wqz29Ezc3OpasWJUoi5oR8ctmKUQW1ivXfWDh59oKws=",
+   "pom": "sha256-d0TIFm0AFD3jVhhoFrSERT0vxrS8uaDZQ0HyqIOknMw="
   },
-  "net/kyori#adventure-text-minimessage/4.23.0": {
-   "jar": "sha256-Vu0nZroiOLQBuuqWDTquRftY/aFhTalo/iuR/bnDgTw=",
-   "module": "sha256-H19hklBkEB3mY1LP0Qq43fWu/2RyVZt7KL1wERxaf2c=",
-   "pom": "sha256-fxTmmBxHbcYjPE5oGCZWIP4vV0uxfdj3UzKd8J8Cd2Q="
+  "net/kyori#adventure-text-minimessage/4.24.0": {
+   "jar": "sha256-en9E3Dt4N5uRj5Hc44v/JqCWO/4wOj/hbJHTClxeI+U=",
+   "module": "sha256-avCNo6rbj+hz4Q+qUVc1ybN6LWWCbLGJhzWm4ZeJPXY=",
+   "pom": "sha256-4BPr7EgImiEaIx5RluvxFNWw5lOBK94GO2RPX89ETqQ="
   },
-  "net/kyori#adventure-text-serializer-ansi/4.23.0": {
-   "jar": "sha256-rF6iq0xE0wLnlkag9NRfSsmESi6sBpDoCnPc/SOy5Vw=",
-   "module": "sha256-/65qUt91zjFf3gi4HVKZ9JfEyfxcbGw3cCcfOMR2NQA=",
-   "pom": "sha256-9zq7B/otQpS9CaSm9Gpbu/WzbcUNpx/zPOPFuBlesKU="
+  "net/kyori#adventure-text-serializer-ansi/4.24.0": {
+   "jar": "sha256-UVBc8RPZd0RNePNKC3FnwcbMl2A1TwbQi0W/evdr7B4=",
+   "module": "sha256-Qc860iafJsWIDQPY5ifYusvAWo5AW2TOOLgieLrrCEQ=",
+   "pom": "sha256-wUCpODx3U1wRy1kDQGLNQyW4/BSpIVQNymJnO2BQEB0="
   },
-  "net/kyori#adventure-text-serializer-commons/4.23.0": {
-   "jar": "sha256-7ol3hRw6RFAN4rCOuqvVOX7Anzs2foblMInROHty+p0=",
-   "module": "sha256-YjLHYBQobnByp5HHWVWahxFizy18z81tDqGE3juXwgY=",
-   "pom": "sha256-ZyydJyIj/+Q6qskmSMNidr3yFBPKIG1Z0dOfAAjGEg0="
+  "net/kyori#adventure-text-serializer-commons/4.24.0": {
+   "jar": "sha256-EBAgLHMSTT4Hid/auyd4pfuM+thybXCvm+tcV1nUzP0=",
+   "module": "sha256-ZluaH9IrMPGnKJGFuOk8zs7ZrWjdU1V5ObQHXdMJxx0=",
+   "pom": "sha256-ktKTr+2UmcMulX470ff9xFHVt59JBDDSJ1dL46VmEVo="
   },
-  "net/kyori#adventure-text-serializer-gson/4.23.0": {
-   "jar": "sha256-PiaD2i0UAwMjzJZFu6TNhtfLq/zkK9Fi7C2lDF59Yig=",
-   "module": "sha256-bX0ip7YdYnZqtPATdojSzM3ensdkP6OTzOlswwyX9vw=",
-   "pom": "sha256-bD3I0ry/SXG30bxzV8i+Xg5w4EqKhEt8RPQdada4XWo="
+  "net/kyori#adventure-text-serializer-gson/4.24.0": {
+   "jar": "sha256-JBTDzl/+G34x3oaWjr0+nypQ41STmydliO0s1kxDGCE=",
+   "module": "sha256-LIxWNeQnjlirNfFCQD61u1+sBXiDYpB8VTpa9p8DNN0=",
+   "pom": "sha256-TUCD1oj9+/RoW6QHPZouJPlqCdImOd+mMTQ34V2Rejk="
   },
-  "net/kyori#adventure-text-serializer-json-legacy-impl/4.23.0": {
-   "jar": "sha256-ovBQ7uMdiedww3bnPZoxt/b8QaORU0QTyUvksIF4vuQ=",
-   "module": "sha256-5Zqpg2TubngVdr3o0r6KLAd9quhvOqXKmUjAbW8s+XM=",
-   "pom": "sha256-iPCayPZoGa4ib7nDqSt2ZzrG4m9VMH+adhOVhraDO40="
+  "net/kyori#adventure-text-serializer-json-legacy-impl/4.24.0": {
+   "jar": "sha256-HeO71Wx6B++HNNXQiYKNZUIDofwZiz78odK7asDDdsQ=",
+   "module": "sha256-5KAg8wQ2jA3hvhcEZv/DBdSfW0j9OdGbGcMQgiBHQpE=",
+   "pom": "sha256-TP64sxOpOubU71EEYqI/z+LO4idiPhJ/iDXHHC1wAB4="
   },
-  "net/kyori#adventure-text-serializer-json/4.23.0": {
-   "jar": "sha256-/CvHvwb8Cv5wbWJ493GDcqRoTSGhblLk1iJldxUomE8=",
-   "module": "sha256-KNC8Tk4rwY5zi1eBI+hXFug0GOlabO+KMeCPiVvw1MQ=",
-   "pom": "sha256-9b8uVtQSdYvaYyQEpwh2LILTQDI8zz1AEkHGdz1oeqw="
+  "net/kyori#adventure-text-serializer-json/4.24.0": {
+   "jar": "sha256-/2qANEy/FNanUZR8r525Zp3QdArqyMxVXJuGSP9XcbI=",
+   "module": "sha256-aqvU2ZfRWJl/Uf2Phue7b1+iKNcB+gkRAITn9d9OZ7k=",
+   "pom": "sha256-SxTq6y0vN6TfeA/1YgxLM2arJeexk7qYvkgLxz1XgxQ="
   },
-  "net/kyori#adventure-text-serializer-legacy/4.23.0": {
-   "jar": "sha256-1SgOt1vypertB5eXGmzJAtxrjLtv6sJwEcyGJGEIIJ0=",
-   "module": "sha256-ci7v3AmzXyiOb6kKZ/CviLiS+ySDGUNqbg0QAxo4ADU=",
-   "pom": "sha256-9jjCmc72C3tNLOpg7vXYMntHW5d2HxxNq5VOHUWXUik="
+  "net/kyori#adventure-text-serializer-legacy/4.24.0": {
+   "jar": "sha256-QO1Tr+Kn1mi4FK3WneFaz0vajp+VHE5dTiJNd3BUaF4=",
+   "module": "sha256-uwBv4g+J/qOEZM/dz/SCvDXAGhI5wt8DEP6NBgHNGU4=",
+   "pom": "sha256-WLFnVzl0ZXM+9deg6toSxPG1e+28BZqGv9+JgECwxjc="
   },
-  "net/kyori#adventure-text-serializer-plain/4.23.0": {
-   "jar": "sha256-wuHYBMob54Q09K1r29U8yXoROtkpXLTJNs87nZAsWR4=",
-   "module": "sha256-OwEWAKJgf8zpq1+u7fWcvNQkgUmlMlXXfHZJJmO+IxM=",
-   "pom": "sha256-qVKWXEA9cuZKvM5m+BgxxE7dgimWU/sqlhbwzWfgAQI="
+  "net/kyori#adventure-text-serializer-plain/4.24.0": {
+   "jar": "sha256-flKpjlkNCI/we+H4sOdZhkcXRm/TXbGGL7tuu0GyRds=",
+   "module": "sha256-3ir7UDVDHLvHI6WgSBYGB99yHeiHLTgeG7mICCRocfg=",
+   "pom": "sha256-/pRYAmrIQoPR20OQFZd8wI2yGZ4j/zJqtyBFsgCjcrU="
   },
   "net/kyori#ansi/1.1.1": {
    "jar": "sha256-tsVp4aCSW57rNJ4S2zXiI3VWEH4zNmV+Cy694mHYr9c=",
diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix
index aad52afc3a4f..55c02819fc71 100644
--- a/pkgs/by-name/ve/velocity/package.nix
+++ b/pkgs/by-name/ve/velocity/package.nix
@@ -35,13 +35,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "velocity";
-  version = "3.4.0-unstable-2025-08-13";
+  version = "3.4.0-unstable-2025-08-14";
 
   src = fetchFromGitHub {
     owner = "PaperMC";
     repo = "Velocity";
-    rev = "5d450ab3c74ae7ccca13abe2cde20b8473fe64e4";
-    hash = "sha256-snRSNXjhm297GcyO1dhd8wDXYB0M+k2BPF8g4w0XC6s=";
+    rev = "d2d333a958af801a7b09465aa7402b0f7857aeb2";
+    hash = "sha256-jdYcUZxdn8Q4A884jA5olrodJvzfIUCl8MwDsps4Pg4=";
   };
 
   nativeBuildInputs = [

From a83b370032e74a6ac6bd4c16970830257def4249 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 22 Apr 2025 02:04:57 +0900
Subject: [PATCH 2696/3724] crystal: simplify installPhase as a follow-up to
 drop crystal_1_2

Workaround added in e3382c257c3fd8a1d127d028851b333f1c8bb623 is unnecessary now,
since dropped crystal_1_2 in fdd64ce4046dc2986d3699144fc781057f08095b.
---
 pkgs/development/compilers/crystal/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index dfe1b2a8de67..43b9dd87d97c 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -247,8 +247,7 @@ let
         ln -s $bin/bin $out/bin
         ln -s $bin/share/bash-completion $out/share/bash-completion
         ln -s $bin/share/zsh $out/share/zsh
-        # fish completion was introduced in 1.6.0
-        test -f etc/completion.fish && ln -s $bin/share/fish $out/share/fish
+        ln -s $bin/share/fish $out/share/fish
         ln -s $lib $out/lib
 
         runHook postInstall

From 3ac7140edcca86e03ab4ba8ce532f3dec44f5019 Mon Sep 17 00:00:00 2001
From: drew-dirac <drew@diracinc.com>
Date: Tue, 11 Feb 2025 16:46:43 +0000
Subject: [PATCH 2697/3724] cgal: 5.6.2 -> 6.0.1

correct maintainer sort

correct formatting
---
 maintainers/maintainer-list.nix  | 6 ++++++
 pkgs/by-name/cg/cgal/package.nix | 9 ++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c1f5d62eb6b7..b145d74a83f9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6826,6 +6826,12 @@
     githubId = 81854406;
     name = "Chew Cheng Hong";
   };
+  drew-dirac = {
+    email = "drew@diracinc.com";
+    github = "drew-dirac";
+    githubId = 187309685;
+    name = "Drew Council";
+  };
   drewrisinger = {
     email = "drisinger+nixpkgs@gmail.com";
     github = "drewrisinger";
diff --git a/pkgs/by-name/cg/cgal/package.nix b/pkgs/by-name/cg/cgal/package.nix
index 2615fc73d02d..f87d29f4f5eb 100644
--- a/pkgs/by-name/cg/cgal/package.nix
+++ b/pkgs/by-name/cg/cgal/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cgal";
-  version = "5.6.2";
+  version = "6.0.1";
 
   src = fetchurl {
     url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz";
-    hash = "sha256-RY9g346PHy/a2TyPJOGqj0sJXMYaFPrIG5BoDXMGpC4=";
+    sha256 = "0zwvyp096p0vx01jks9yf74nx6zjh0vjbwr6sl6n6mn52zrzpk8a";
   };
 
   # note: optional component libCGAL_ImageIO would need zlib and opengl;
@@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
       lgpl3Plus
     ];
     platforms = platforms.all;
-    maintainers = [ maintainers.raskin ];
+    maintainers = with lib.maintainers; [
+      raskin
+      drew-dirac
+    ];
   };
 }

From 5334a0c9eac0dd8230799d37d18799485e5452e5 Mon Sep 17 00:00:00 2001
From: drew-dirac <drew@diracinc.com>
Date: Mon, 24 Feb 2025 10:34:55 -0500
Subject: [PATCH 2698/3724] add cgal_5

---
 pkgs/by-name/cg/cgal/5.nix | 43 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/cg/cgal/5.nix

diff --git a/pkgs/by-name/cg/cgal/5.nix b/pkgs/by-name/cg/cgal/5.nix
new file mode 100644
index 000000000000..3cd02b75cb92
--- /dev/null
+++ b/pkgs/by-name/cg/cgal/5.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  cmake,
+  boost,
+  gmp,
+  mpfr,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cgal";
+  version = "5.6.2";
+
+  src = fetchurl {
+    url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz";
+    hash = "sha256-RY9g346PHy/a2TyPJOGqj0sJXMYaFPrIG5BoDXMGpC4=";
+  };
+
+  # note: optional component libCGAL_ImageIO would need zlib and opengl;
+  #   there are also libCGAL_Qt{3,4} omitted ATM
+  buildInputs = [
+    boost
+    gmp
+    mpfr
+  ];
+  nativeBuildInputs = [ cmake ];
+
+  patches = [ ./cgal_path.patch ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Computational Geometry Algorithms Library";
+    homepage = "http://cgal.org";
+    license = with licenses; [
+      gpl3Plus
+      lgpl3Plus
+    ];
+    platforms = platforms.all;
+    maintainers = [ maintainers.raskin ];
+  };
+}
\ No newline at end of file

From 74ef9bac2fea4f6c02bff112bb9b24bf0e85afbe Mon Sep 17 00:00:00 2001
From: drew-dirac <drew@diracinc.com>
Date: Mon, 24 Feb 2025 10:41:59 -0500
Subject: [PATCH 2699/3724] formatting

---
 pkgs/by-name/cg/cgal/5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/cg/cgal/5.nix b/pkgs/by-name/cg/cgal/5.nix
index 3cd02b75cb92..2615fc73d02d 100644
--- a/pkgs/by-name/cg/cgal/5.nix
+++ b/pkgs/by-name/cg/cgal/5.nix
@@ -40,4 +40,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     maintainers = [ maintainers.raskin ];
   };
-}
\ No newline at end of file
+}

From 375ff088807faae30f643d4dc9228abb92621b00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 04:14:59 +0000
Subject: [PATCH 2700/3724] lighttpd: 1.4.80 -> 1.4.81

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

diff --git a/pkgs/by-name/li/lighttpd/package.nix b/pkgs/by-name/li/lighttpd/package.nix
index 3a8a56f73c0b..51ecd3f05174 100644
--- a/pkgs/by-name/li/lighttpd/package.nix
+++ b/pkgs/by-name/li/lighttpd/package.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lighttpd";
-  version = "1.4.80";
+  version = "1.4.81";
 
   src = fetchurl {
     url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";
-    sha256 = "sha256-zF8Pceiy7mutVF0ekd/D+VRxbJF057NSwhR63UTyW/M=";
+    sha256 = "sha256-19QsP9L9lLY8kVqn0Y9No8rFk33boz6Qn4HPUIQqWEA=";
   };
 
   separateDebugInfo = true;

From 5b27e57a8ba64ba325826ed5c06bc6bbd064a526 Mon Sep 17 00:00:00 2001
From: Ravi Peters <r.y.peters@tudelft.nl>
Date: Fri, 22 Aug 2025 11:31:22 +0200
Subject: [PATCH 2701/3724] cgal -> cgal_5 if package breaks with cgal v6.0.1

---
 pkgs/applications/misc/prusa-slicer/default.nix          | 4 ++--
 pkgs/by-name/ka/kagen/package.nix                        | 4 ++--
 pkgs/by-name/op/openscad/package.nix                     | 4 ++--
 pkgs/by-name/or/orca-slicer/package.nix                  | 4 ++--
 pkgs/development/python-modules/ifcopenshell/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                          | 2 ++
 pkgs/top-level/python-packages.nix                       | 2 +-
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
index d7c1343026a6..929b169a254d 100644
--- a/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -8,7 +8,7 @@
   wrapGAppsHook3,
   boost186,
   cereal,
-  cgal,
+  cgal_5,
   curl,
   dbus,
   eigen,
@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
     binutils
     boost186 # does not build with 1.87, see https://github.com/prusa3d/PrusaSlicer/issues/13799
     cereal
-    cgal
+    cgal_5
     curl
     dbus
     eigen
diff --git a/pkgs/by-name/ka/kagen/package.nix b/pkgs/by-name/ka/kagen/package.nix
index ec780e878a8f..1b830896ca49 100644
--- a/pkgs/by-name/ka/kagen/package.nix
+++ b/pkgs/by-name/ka/kagen/package.nix
@@ -6,7 +6,7 @@
   cmake,
   pkg-config,
   mpi,
-  cgal,
+  cgal_5,
   boost,
   gmp,
   mpfr,
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     mpi
-    cgal
+    cgal_5
     sparsehash
     imagemagick
     # should be propagated by cgal
diff --git a/pkgs/by-name/op/openscad/package.nix b/pkgs/by-name/op/openscad/package.nix
index 1609c8b42565..5f9b6378b196 100644
--- a/pkgs/by-name/op/openscad/package.nix
+++ b/pkgs/by-name/op/openscad/package.nix
@@ -12,7 +12,7 @@
   libGL,
   glew,
   opencsg,
-  cgal,
+  cgal_5,
   mpfr,
   gmp,
   glib,
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
     boost
     glew
     opencsg
-    cgal
+    cgal_5
     mpfr
     gmp
     glib
diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
index 8f5f53fa3c9e..763b957d7835 100644
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@@ -9,7 +9,7 @@
   wrapGAppsHook3,
   boost186,
   cereal,
-  cgal,
+  cgal_5,
   curl,
   dbus,
   eigen,
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
     })
     boost186.dev
     cereal
-    cgal
+    cgal_5
     curl
     dbus
     eigen
diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix
index c7129931b7cc..fa6d2b99b5c3 100644
--- a/pkgs/development/python-modules/ifcopenshell/default.nix
+++ b/pkgs/development/python-modules/ifcopenshell/default.nix
@@ -16,7 +16,7 @@
   # native dependencies
   eigen,
   boost,
-  cgal,
+  cgal_5,
   gmp,
   hdf5,
   icu,
@@ -93,7 +93,7 @@ buildPythonPackage rec {
     # ifcopenshell needs stdc++
     (lib.getLib stdenv.cc.cc)
     boost
-    cgal
+    cgal_5
     eigen
     gmp
     hdf5
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9cb3198772a..ea1ae4d38951 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -320,6 +320,8 @@ with pkgs;
 
   cameractrls-gtk3 = cameractrls.override { withGtk = 3; };
 
+  cgal_5 = callPackage ../by-name/cg/cgal/5.nix { };
+
   checkpointBuildTools = callPackage ../build-support/checkpoint-build.nix { };
 
   celeste-classic-pm = pkgs.celeste-classic.override {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 572598bac0b4..774efed0bf58 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6909,7 +6909,7 @@ self: super: with self; {
   ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { };
 
   ifcopenshell = callPackage ../development/python-modules/ifcopenshell {
-    inherit (pkgs) cgal libxml2;
+    inherit (pkgs) cgal_5 libxml2;
   };
 
   igloohome-api = callPackage ../development/python-modules/igloohome-api { };

From ceac2683548002070e40fd2dafa64a9cf53eb4fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 10:14:40 +0000
Subject: [PATCH 2702/3724] ruffle: 0-nightly-2025-08-14 ->
 0-nightly-2025-08-22

---
 pkgs/by-name/ru/ruffle/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 466011e50e4f..6c1c34a8ee88 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -21,16 +21,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruffle";
-  version = "0-nightly-2025-08-14";
+  version = "0-nightly-2025-08-22";
 
   src = fetchFromGitHub {
     owner = "ruffle-rs";
     repo = "ruffle";
     tag = lib.strings.removePrefix "0-" finalAttrs.version;
-    hash = "sha256-+JdZoYderFUngMbFMNXw1pbW6qogb7vCeqdIHEzqMjQ=";
+    hash = "sha256-bv8ZQuEU8QqtC7fvtELXlkQkjPoGqqSglhE0lzsTEIk=";
   };
 
-  cargoHash = "sha256-P+uFE92ZWa491snEanzB1T0OPPOOYZsy2RAmwtIIAdo=";
+  cargoHash = "sha256-89xxPl6nIp4VLsQqsaXH9VKWX6Ehw6KCJaOuxnSxu0g=";
   cargoBuildFlags = lib.optional withRuffleTools "--workspace";
 
   env =

From 354961905650aa127e26fc646ddfffa0ad195a1a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Aug 2025 12:25:12 +0200
Subject: [PATCH 2703/3724] 
 home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.271 ->
 0.13.272

https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.272/CHANGELOG.md
---
 .../home-assistant/pytest-homeassistant-custom-component.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
index a648dcabbc42..0284bd58c961 100644
--- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
+++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-homeassistant-custom-component";
-  version = "0.13.271";
+  version = "0.13.272";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "MatthewFlamm";
     repo = "pytest-homeassistant-custom-component";
     rev = "refs/tags/${version}";
-    hash = "sha256-2XRj7W0XKKQovP8azU3VzyZaGTCYYxCtzwPWvAVv75M=";
+    hash = "sha256-uzDssCqyZAVa9YIGQ7l0cNNSO+3LNvOh7nK85Rzz68Q=";
   };
 
   build-system = [ setuptools ];

From c67491977390eddcda46121190ff7922101a9af8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 10:28:11 +0000
Subject: [PATCH 2704/3724] python3Packages.reolink: 0053 -> 0.64

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

diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix
index 7bb09d8283f7..9658b0890cc9 100644
--- a/pkgs/development/python-modules/reolink/default.nix
+++ b/pkgs/development/python-modules/reolink/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "reolink";
-  version = "0053";
+  version = "0.64";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "fwestenberg";
     repo = "reolink";
     tag = "v${version}";
-    hash = "sha256-DZcTfmzO9rBhhRN2RkgoPwUPE+LPPeZgc8kmhYU9V2I=";
+    hash = "sha256-3r5BwVlNolji2HIGjqv8gkizx4wWxrKYkiNmSJedKmI=";
   };
 
   propagatedBuildInputs = [

From e9fcfeee43e9a1c9c2ce96f520768e226c023bfa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 10:33:48 +0000
Subject: [PATCH 2705/3724] forgejo-runner: 9.1.0 -> 9.1.1

---
 pkgs/by-name/fo/forgejo-runner/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix
index 6b6e4072d5ce..d96267f79b7f 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -41,17 +41,17 @@ let
 in
 buildGoModule rec {
   pname = "forgejo-runner";
-  version = "9.1.0";
+  version = "9.1.1";
 
   src = fetchFromGitea {
     domain = "code.forgejo.org";
     owner = "forgejo";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-w8tFpJeEx0rgzz0z3916FKEjvpewsCAXDWdSTSXo/bg=";
+    hash = "sha256-tJ1BEGKthOUf//MM8GS712YEzkcr9w2LN1ejDbVOITU=";
   };
 
-  vendorHash = "sha256-vjsrnPg5D9+Ugf3Oeajkif6YmUX3D88QULYVgXiLJ/o=";
+  vendorHash = "sha256-hdEpA7tG1uJOBRPQTaWst/D30Y9Uez4ecK2dkZCQITk=";
 
   # See upstream Makefile
   # https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile

From f976d52c0131ac66c04d879c0c17a0fd8940f883 Mon Sep 17 00:00:00 2001
From: Ravi Peters <r.y.peters@tudelft.nl>
Date: Fri, 22 Aug 2025 12:41:31 +0200
Subject: [PATCH 2706/3724] remove cgal_5 alias since it is a real package now

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

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c98e3bcd08be..19f5a0cdd10d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -583,7 +583,7 @@ mapAliases {
   centerim = throw "centerim has been removed due to upstream disappearing"; # Added 2025-04-18
   certmgr-selfsigned = certmgr; # Added 2023-11-30
   cgal_4 = throw "cgal_4 has been removed as it is obsolete use cgal instead"; # Added 2024-12-30
-  cgal_5 = cgal; # Added 2024-12-30
+
   challenger = taler-challenger; # Added 2024-09-04
   check_smartmon = nagiosPlugins.check_smartmon; # Added 2024-05-03
   check_systemd = nagiosPlugins.check_systemd; # Added 2024-05-03

From ab4281e9679ab820dcd4f98f1a20e5fdf8874b93 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 11 Aug 2025 19:05:50 +0200
Subject: [PATCH 2707/3724] lib/minfeatures: init from minver.nix

The concept of having a "minimum supported Nix version" doesn't work
anymore today, for the following reasons:
- With multiple forks / implementations of Nix available, their feature
sets and versions will differ. We'd need *multiple* minimum versions,
one for each implementation.
- Lix does not expose its real version. It only reports "2.18.3-lix",
even though its real version is in the 2.90+ range.
- A minimum version has the expectation that it could be *raised* in the
future. That's not possible with Lix, because Lix will always and
forever report the above version.
- A minimum version has the expectation that *all* versions bigger than
the minimum are supported. That was already quite a stretch when minver
was 2.3 and none of the Nix versions between 2.4 and 2.23 were packed
anymore. But it's impossible for us to test all these non-LTS versions
anyway: We don't have Nix 2.18, 2.19, 2.20, 2.21, 2.22, 2.23, 2.25, 2.26
and 2.27 available in Nixpkgs at the time of this writing.

With their policy around `builtins.nixVersion`, Lix forces our hand: We
need to replace minver.nix with a "feature detection" mechanism.

This PR introduces the first two features:
- The availability of `builtins.nixVersion`: If this is not available,
the version of Nix is so old, that we surely don't support it anymore.
- The value of `builtins.nixVersion` being greater or equal to 2.18.

Note, that this does **not** imply support for Nix 2.18. Instead,
explicitly supported versions of Lix and Nix are only these that we
actually test against.

If, eventually, we realize that the supported versions have advanced and
Nixpkgs has adopted a feature only available in newer versions, we will
have to add a feature check for this.

Put differently: The list of features in `minfeatures.nix` is not
expected to be complete. It's a list of known-to-be-bad conditions that
will cause problems when evaluating Nixpkgs. Their only purpose is to be
able to show a helpful error message. Some other versions might also not
be supported, but might fail with more subtle errors. That's just
reality and has always been the case previously as well.
---
 default.nix         | 10 ++++++----
 lib/README.md       |  2 +-
 lib/minfeatures.nix | 19 +++++++++++++++++++
 lib/minver.nix      |  2 --
 4 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 lib/minfeatures.nix
 delete mode 100644 lib/minver.nix

diff --git a/default.nix b/default.nix
index afba797b01fc..5f759c13014d 100644
--- a/default.nix
+++ b/default.nix
@@ -1,13 +1,15 @@
 let
-  requiredVersion = import ./lib/minver.nix;
+  missingFeatures = map ({ description, ... }: description) (import ./lib/minfeatures.nix).missing;
 in
 
-if !builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.nixVersion == 1 then
+if missingFeatures != [ ] then
 
   abort ''
 
-    This version of Nixpkgs requires Nix >= ${requiredVersion} but it is being
-    evaluated with Nix ${builtins.nixVersion or "(too old to know)"}, please upgrade:
+    This version of Nixpkgs requires an implementation of Nix with the following features:
+    - ${builtins.concatStringsSep "\n- " missingFeatures}
+
+    Your are evaluating with Nix ${builtins.nixVersion or "(too old to know)"}, please upgrade:
 
     - If you are running NixOS, `nixos-rebuild' can be used to upgrade your system.
 
diff --git a/lib/README.md b/lib/README.md
index 1cf10670ecb2..d7c757a15c8c 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -19,7 +19,7 @@ This file evaluates to an attribute set containing two separate kinds of attribu
   Example: `lib.take` is an alias for `lib.lists.take`.
 
 Most files in this directory are definitions of sub-libraries, but there are a few others:
-- [`minver.nix`](minver.nix): A string of the minimum version of Nix that is required to evaluate Nixpkgs.
+- [`minfeatures.nix`](minfeatures.nix): A list of conditions for the used Nix version to match that are required to evaluate Nixpkgs.
 - [`tests`](tests): Tests, see [Running tests](#running-tests)
   - [`release.nix`](tests/release.nix): A derivation aggregating all tests
   - [`misc.nix`](tests/misc.nix): Evaluation unit tests for most sub-libraries
diff --git a/lib/minfeatures.nix b/lib/minfeatures.nix
new file mode 100644
index 000000000000..da804a854942
--- /dev/null
+++ b/lib/minfeatures.nix
@@ -0,0 +1,19 @@
+let
+  features = [
+    {
+      description = "the `nixVersion` builtin";
+      condition = builtins ? nixVersion;
+    }
+    {
+      description = "`builtins.nixVersion` reports at least 2.18";
+      condition = builtins ? nixVersion && builtins.compareVersions "2.18" builtins.nixVersion != 1;
+    }
+  ];
+
+  evaluated = builtins.partition ({ condition, ... }: condition) features;
+in
+{
+  all = features;
+  supported = evaluated.right;
+  missing = evaluated.wrong;
+}
diff --git a/lib/minver.nix b/lib/minver.nix
deleted file mode 100644
index c9fc45354d2e..000000000000
--- a/lib/minver.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-# Expose the minimum required version for evaluating Nixpkgs
-"2.18"

From c18d1e4af8eb84649ad4db16d220cf816731b3c0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 21 Aug 2025 12:12:46 +0200
Subject: [PATCH 2708/3724] actions/checkout: always checkout pinned commits

With the latest performance improvements, this only adds up to 1s, but
reduces complexity in managing pinned checkouts explicitly, especially
when we need *both* pinned checkouts in the next commit.
---
 .github/actions/checkout/action.yml | 12 +++++-------
 .github/workflows/build.yml         | 15 +++++++--------
 .github/workflows/check.yml         |  3 +--
 .github/workflows/eval.yml          | 10 ++++------
 .github/workflows/lint.yml          |  9 +++------
 5 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml
index e14c5936e62d..868d832bf8f3 100644
--- a/.github/actions/checkout/action.yml
+++ b/.github/actions/checkout/action.yml
@@ -5,8 +5,6 @@ description: 'Checkout into trusted / untrusted / pinned folders consistently.'
 inputs:
   merged-as-untrusted-at:
     description: "Whether and which SHA to checkout for the merge commit in the ./untrusted folder."
-  pinned-from:
-    description: "Whether to checkout the pinned nixpkgs for CI and from where (trusted, untrusted)."
   target-as-trusted-at:
     description: "Whether and which SHA to checkout for the target commit in the ./trusted folder."
 
@@ -16,7 +14,6 @@ runs:
     - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
       env:
         MERGED_SHA: ${{ inputs.merged-as-untrusted-at }}
-        PINNED_FROM: ${{ inputs.pinned-from }}
         TARGET_SHA: ${{ inputs.target-as-trusted-at }}
       with:
         script: |
@@ -45,6 +42,7 @@ runs:
           // A single fetch call comes with a lot less overhead. The fetch takes essentially the
           // same time no matter whether its 1, 2 or 3 commits at once.
           async function getPinnedSha(ref) {
+            if (!ref) return undefined
             const { content, encoding } = (await github.rest.repos.getContent({
               ...context.repo,
               path: 'ci/pinned.json',
@@ -60,16 +58,16 @@ runs:
               path: 'untrusted',
             },
             {
-              sha: process.env.PINNED_FROM === 'untrusted' && (await getPinnedSha(process.env.MERGED_SHA)),
-              path: 'pinned'
+              sha: await getPinnedSha(process.env.MERGED_SHA),
+              path: 'untrusted-pinned'
             },
             {
               sha: process.env.TARGET_SHA,
               path: 'trusted',
             },
             {
-              sha: process.env.PINNED_FROM === 'trusted' && (await getPinnedSha(process.env.TARGET_SHA)),
-              path: 'pinned'
+              sha: await getPinnedSha(process.env.TARGET_SHA),
+              path: 'trusted-pinned'
             }
           ].filter(({ sha }) => Boolean(sha))
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 20fcb47dc7a0..0acb7dab64f0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -51,7 +51,6 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
-          pinned-from: untrusted
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
         with:
@@ -66,33 +65,33 @@ jobs:
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
           pushFilter: '(-source$|-nixpkgs-tarball-)'
 
-      - run: nix-env --install -f nixpkgs/pinned -A nix-build-uncached
+      - run: nix-env --install -f nixpkgs/untrusted-pinned -A nix-build-uncached
 
       - name: Build shell
         if: contains(matrix.builds, 'shell')
-        run: echo "${{ matrix.systems }}" | xargs -n1 nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A shell --argstr system
+        run: echo "${{ matrix.systems }}" | xargs -n1 nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A shell --argstr system
 
       - name: Build NixOS manual
         if: |
           contains(matrix.builds, 'manual-nixos') && !cancelled() &&
           contains(fromJSON(inputs.baseBranch).type, 'primary')
-        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A manual-nixos --out-link nixos-manual
+        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A manual-nixos --out-link nixos-manual
 
       - name: Build Nixpkgs manual
         if: contains(matrix.builds, 'manual-nixpkgs') && !cancelled()
-        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A manual-nixpkgs -A manual-nixpkgs-tests
+        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A manual-nixpkgs -A manual-nixpkgs-tests
 
       - name: Build Nixpkgs manual tests
         if: contains(matrix.builds, 'manual-nixpkgs-tests') && !cancelled()
-        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A manual-nixpkgs-tests
+        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A manual-nixpkgs-tests
 
       - name: Build lib tests
         if: contains(matrix.builds, 'lib-tests') && !cancelled()
-        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A lib-tests
+        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A lib-tests
 
       - name: Build tarball
         if: contains(matrix.builds, 'tarball') && !cancelled()
-        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A tarball
+        run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A tarball
 
       - name: Upload NixOS manual
         if: |
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 287d4f80d557..ded8bad536c4 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -103,7 +103,6 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
-          pinned-from: trusted
           target-as-trusted-at: ${{ inputs.targetSha }}
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
@@ -117,7 +116,7 @@ jobs:
           pushFilter: -source$
 
       - name: Build codeowners validator
-        run: nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/pinned -A codeownersValidator
+        run: nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A codeownersValidator
 
       - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
         if: github.event_name == 'pull_request_target' && vars.OWNER_RO_APP_ID
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index c3b1c70034be..a2b16638b910 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -93,7 +93,6 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
-          pinned-from: untrusted
 
       - name: Install Nix
         uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
@@ -111,7 +110,7 @@ jobs:
           MATRIX_SYSTEM: ${{ matrix.system }}
           MATRIX_VERSION: ${{ matrix.version || 'nixVersions.latest' }}
         run: |
-          nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned  -A eval.singleSystem \
+          nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned  -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
             --arg chunkSize 8000 \
             --argstr nixPath "$MATRIX_VERSION" \
@@ -190,7 +189,7 @@ jobs:
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
         run: |
-          nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A eval.diff \
+          nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A eval.diff \
             --arg beforeDir ./target \
             --arg afterDir "$(readlink ./merged)" \
             --argstr evalSystem "$MATRIX_SYSTEM" \
@@ -219,7 +218,6 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
-          pinned-from: trusted
 
       - name: Download output paths and eval stats for all systems
         uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
@@ -233,7 +231,7 @@ jobs:
 
       - name: Combine all output paths and eval stats
         run: |
-          nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/pinned -A eval.combine \
+          nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.combine \
             --arg diffDir ./diff \
             --out-link combined
 
@@ -245,7 +243,7 @@ jobs:
             | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
 
           # Use the target branch to get accurate maintainer info
-          nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/pinned -A eval.compare \
+          nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.compare \
             --arg combinedDir "$(realpath ./combined)" \
             --arg touchedFilesJson ./touched-files.json \
             --argstr githubAuthorId "$AUTHOR_ID" \
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 771a64c4a5d6..4d94df1578fa 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -31,7 +31,6 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
-          pinned-from: untrusted
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
@@ -44,7 +43,7 @@ jobs:
           # Note that it's fine to run this on untrusted code because:
           # - There's no secrets accessible here
           # - The build is sandboxed
-          if ! nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A fmt.check; then
+          if ! nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A fmt.check; then
             echo "Some files are not properly formatted"
             echo "Please format them by going to the Nixpkgs root directory and running one of:"
             echo "  nix-shell --run treefmt"
@@ -66,7 +65,6 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
-          pinned-from: untrusted
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
@@ -81,7 +79,7 @@ jobs:
       - name: Parse all nix files
         run: |
           # Tests multiple versions at once, let's make sure all of them run, so keep-going.
-          nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A parse --keep-going
+          nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A parse --keep-going
 
   nixpkgs-vet:
     runs-on: ubuntu-24.04-arm
@@ -94,7 +92,6 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
-          pinned-from: untrusted
           target-as-trusted-at: ${{ inputs.targetSha }}
 
       - uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
@@ -112,7 +109,7 @@ jobs:
           # Force terminal colors to be enabled. The library that `nixpkgs-vet` uses respects https://bixense.com/clicolors/
           CLICOLOR_FORCE: 1
         run: |
-          if nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/pinned -A nixpkgs-vet --arg base "./nixpkgs/trusted" --arg head "./nixpkgs/untrusted"; then
+          if nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A nixpkgs-vet --arg base "./nixpkgs/trusted" --arg head "./nixpkgs/untrusted"; then
             exit 0
           else
             exitCode=$?

From c663bae26f7217fd9e95880f376b785b68d14908 Mon Sep 17 00:00:00 2001
From: Ravi Peters <r.y.peters@tudelft.nl>
Date: Fri, 22 Aug 2025 12:58:42 +0200
Subject: [PATCH 2709/3724] maintainers: add ylannl

---
 maintainers/maintainer-list.nix  | 6 ++++++
 pkgs/by-name/cg/cgal/package.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b145d74a83f9..c3da2a5e38a4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28110,6 +28110,12 @@
     githubId = 1311192;
     name = "Alexander Kiselyov";
   };
+  ylannl = {
+    email = "ravi@ylan.nl";
+    github = "ylannl";
+    githubId = 1742643;
+    name = "Ravi Peters";
+  };
   ylecornec = {
     email = "yves.stan.lecornec@tweag.io";
     github = "ylecornec";
diff --git a/pkgs/by-name/cg/cgal/package.nix b/pkgs/by-name/cg/cgal/package.nix
index f87d29f4f5eb..8a4af395fa99 100644
--- a/pkgs/by-name/cg/cgal/package.nix
+++ b/pkgs/by-name/cg/cgal/package.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [
       raskin
       drew-dirac
+      ylannl
     ];
   };
 }

From c1b06db57b316c99aa1933778343de7f90266640 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 19 Aug 2025 17:47:27 +0200
Subject: [PATCH 2710/3724] workflows/eval: pass outpaths via cachix instead of
 artifacts

Instead of uploading the outpaths as artifact, this uploads them via
cachix. Most of all, this makes CI less brittle, because Eval in PRs
will still be able to succeed, even if no workflow run for the push
event could be found on the target branch. It will just take longer.

This also makes moving Eval into the Merge Queue easier to do: When
downloading artifacts from a different run, these would always have to
match on the right event, too. By pulling from cachix, the same workflow
can support target branches with merge queue and without merge queue at
the same time. The latter would still use the push event, while the
former could use the merge_group event.

Last but not least, this should fix Eval on PRs targeting `wip-`
branches and any other branches that the push event doesn't trigger on.
These would never find an Eval result from the target branch and could
never show rebuilds accurately. Now these PRs should work at a slightly
higher runtime cost.
---
 .github/workflows/eval.yml | 105 +++++++++++++------------------------
 ci/eval/default.nix        |   2 +
 2 files changed, 37 insertions(+), 70 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index a2b16638b910..7efa71913ac7 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -71,8 +71,6 @@ jobs:
     # to not interrupt main Eval's compare step.
     continue-on-error: ${{ matrix.version != '' }}
     name: ${{ matrix.system }}${{ matrix.version && format(' @ {0}', matrix.version) || '' }}
-    outputs:
-      targetRunId: ${{ steps.targetRunId.outputs.targetRunId }}
     timeout-minutes: 15
     steps:
       # This is not supposed to be used and just acts as a fallback.
@@ -89,10 +87,11 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           sparse-checkout: .github/actions
-      - name: Check out the PR at the test merge commit
+      - name: Check out the PR at merged and target commits
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
+          target-as-trusted-at: ${{ inputs.targetSha }}
 
       - name: Install Nix
         uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
@@ -105,7 +104,7 @@ jobs:
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
           pushFilter: '(-source|-single-chunk)$'
 
-      - name: Evaluate the ${{ matrix.system }} output paths for all derivation attributes
+      - name: Evaluate the ${{ matrix.system }} output paths at the merge commit
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
           MATRIX_VERSION: ${{ matrix.version || 'nixVersions.latest' }}
@@ -115,88 +114,54 @@ jobs:
             --arg chunkSize 8000 \
             --argstr nixPath "$MATRIX_VERSION" \
             --out-link merged
-          # If it uses too much memory, slightly decrease chunkSize
+          # If it uses too much memory, slightly decrease chunkSize.
+          # Note: Keep the same further down in sync!
 
-      - name: Upload the output paths and eval stats
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: ${{ matrix.version && format('{0}-', matrix.version) || '' }}merged-${{ matrix.system }}
-          path: merged/*
-
-      - name: Log current API rate limits
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: gh api /rate_limit | jq
-
-      - name: Get target run id
+      # Running the attrpath generation step separately from the outpath step afterwards.
+      # The idea is that, *if* Eval on the target branch has not finished, yet, we will
+      # generate the attrpaths in the meantime - and the separate command command afterwards
+      # will check cachix again for whether Eval has finished. If no Eval result from the
+      # target branch can be found the second time, we proceed to run it in here. Attrpaths
+      # generation takes roughly 30 seconds, so for every normal use-case this should be more
+      # than enough of a head start for Eval on the target branch to finish.
+      # This edge-case, that Eval on the target branch is delayed is unlikely to happen anyway:
+      # For a commit to become the target commit of a PR, it must *already* be on the branch.
+      # Normally, CI should always start running on that push event *before* it starts running
+      # on the PR.
+      - name: Evaluate the ${{ matrix.system }} attribute paths at the target commit
         if: inputs.targetSha
-        id: targetRunId
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
-          TARGET_SHA: ${{ inputs.targetSha }}
-        with:
-          script: |
-            const system = process.env.MATRIX_SYSTEM
-            const targetSha = process.env.TARGET_SHA
+        run: |
+          nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.attrpathsSuperset \
+            --argstr evalSystem "$MATRIX_SYSTEM" \
+            --argstr nixPath "nixVersions.latest"
 
-            let run_id
-            try {
-              run_id = (await github.rest.actions.listWorkflowRuns({
-                ...context.repo,
-                workflow_id: 'push.yml',
-                event: 'push',
-                head_sha: targetSha
-              })).data.workflow_runs[0].id
-            } catch {
-              throw new Error(`Could not find a push.yml workflow run for ${targetSha}.`)
-            }
-
-            // Waiting 120 * 5 sec = 10 min. max.
-            // Eval takes max 5-6 minutes, normally.
-            for (let i = 0; i < 120; i++) {
-              const result = await github.rest.actions.listWorkflowRunArtifacts({
-                ...context.repo,
-                run_id,
-                name: `merged-${system}`
-              })
-              if (result.data.total_count > 0) {
-                core.setOutput('targetRunId', run_id)
-                return
-              }
-              await new Promise(resolve => setTimeout(resolve, 5000))
-            }
-            // No artifact found at this stage. This usually means that Eval failed on the target branch.
-            // This should only happen when Eval is broken on the target branch and this PR fixes it.
-            // Continue without targetRunId to skip the remaining steps, but pass the job.
-
-      - name: Log current API rate limits
+      - name: Evaluate the ${{ matrix.system }} output paths at the target commit
+        if: inputs.targetSha
         env:
-          GH_TOKEN: ${{ github.token }}
-        run: gh api /rate_limit | jq
-
-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
-        if: steps.targetRunId.outputs.targetRunId
-        with:
-          run-id: ${{ steps.targetRunId.outputs.targetRunId }}
-          name: merged-${{ matrix.system }}
-          path: target
-          github-token: ${{ github.token }}
-          merge-multiple: true
+          MATRIX_SYSTEM: ${{ matrix.system }}
+        # This should be very quick, because it pulls the eval results from Cachix.
+        run: |
+          nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.singleSystem \
+            --argstr evalSystem "$MATRIX_SYSTEM" \
+            --arg chunkSize 8000 \
+            --argstr nixPath "nixVersions.latest" \
+            --out-link target
 
       - name: Compare outpaths against the target branch
-        if: steps.targetRunId.outputs.targetRunId
+        if: inputs.targetSha
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
         run: |
           nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A eval.diff \
-            --arg beforeDir ./target \
+            --arg beforeDir "$(readlink ./target)" \
             --arg afterDir "$(readlink ./merged)" \
             --argstr evalSystem "$MATRIX_SYSTEM" \
             --out-link diff
 
       - name: Upload outpaths diff and stats
-        if: steps.targetRunId.outputs.targetRunId
+        if: inputs.targetSha
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ matrix.version && format('{0}-', matrix.version) || '' }}diff-${{ matrix.system }}
@@ -205,7 +170,7 @@ jobs:
   compare:
     runs-on: ubuntu-24.04-arm
     needs: [eval]
-    if: needs.eval.outputs.targetRunId && !cancelled() && !failure()
+    if: inputs.targetSha && !cancelled() && !failure()
     permissions:
       statuses: write
     timeout-minutes: 5
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 363804cce716..8d79034db59e 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -141,6 +141,8 @@ let
         env = {
           inherit evalSystem chunkSize;
         };
+        __structuredAttrs = true;
+        unsafeDiscardReferences.out = true;
       }
       ''
         export NIX_STATE_DIR=$(mktemp -d)

From d42a66fa8a1f985f6e4026a6a8fa76ab019d580c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 11:07:53 +0000
Subject: [PATCH 2711/3724] python3Packages.llama-cpp-python: 0.3.15 -> 0.3.16

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

diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix
index 199d9bed0984..ee0807ca067b 100644
--- a/pkgs/development/python-modules/llama-cpp-python/default.nix
+++ b/pkgs/development/python-modules/llama-cpp-python/default.nix
@@ -39,14 +39,14 @@ let
 in
 buildPythonPackage rec {
   pname = "llama-cpp-python";
-  version = "0.3.15";
+  version = "0.3.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "abetlen";
     repo = "llama-cpp-python";
     tag = "v${version}";
-    hash = "sha256-tovyBWknHI3SleGwvdzu2KNK4QXdpwWa2lxt5sxoy+o=";
+    hash = "sha256-EUDtCv86J4bznsTqNsdgj1IYkAu83cf+RydFTUb2NEE=";
     fetchSubmodules = true;
   };
   # src = /home/gaetan/llama-cpp-python;

From 317fc34b26897c628b53040e2431730bb3e0f06e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 22 Aug 2025 13:34:47 +0200
Subject: [PATCH 2712/3724] freerdp: 3.16.0 -> 3.17.0

Diff: https://github.com/FreeRDP/FreeRDP/compare/3.16.0...3.17.0
---
 pkgs/by-name/fr/freerdp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix
index e8a60ea8b340..57621f3c5704 100644
--- a/pkgs/by-name/fr/freerdp/package.nix
+++ b/pkgs/by-name/fr/freerdp/package.nix
@@ -63,13 +63,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freerdp";
-  version = "3.16.0";
+  version = "3.17.0";
 
   src = fetchFromGitHub {
     owner = "FreeRDP";
     repo = "FreeRDP";
     rev = finalAttrs.version;
-    hash = "sha256-HF4Is3ak2nYD2Fq6HGHwyM5OTBVqYqbB22otOprzfiQ=";
+    hash = "sha256-86RbzRgC93ZOt3MHRKJIRklEuyCQs6tHff5jk++yFok=";
   };
 
   postPatch = ''

From 3eba985d255e463876ccd6e48a51f52c4c0f88ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 18 Aug 2025 19:15:58 +0200
Subject: [PATCH 2713/3724] python3Packages.django-cachalot: 2.7.0 -> 2.8.0,
 switch to pyproject = true

Diff: https://github.com/noripyt/django-cachalot/compare/v2.7.0...v2.8.0

Changelog: https://github.com/noripyt/django-cachalot/blob/refs/tags/v2.8.0/CHANGELOG.rst
---
 .../django-cachalot/default.nix               | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix
index 3b83eb8f6a16..55f91c63bb2d 100644
--- a/pkgs/development/python-modules/django-cachalot/default.nix
+++ b/pkgs/development/python-modules/django-cachalot/default.nix
@@ -7,20 +7,26 @@
   psycopg2,
   jinja2,
   beautifulsoup4,
+  pytest-django,
+  pytestCheckHook,
   python,
   pytz,
+  redis,
+  redisTestHook,
+  setuptools,
+  stdenv,
 }:
 
 buildPythonPackage rec {
   pname = "django-cachalot";
-  version = "2.7.0";
-  format = "setuptools";
+  version = "2.8.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "noripyt";
     repo = "django-cachalot";
     tag = "v${version}";
-    hash = "sha256-Fi5UvqH2bVb4v/GWDkEYIcBMBVos+35g4kcEnZTOQvw=";
+    hash = "sha256-3W+9cULL3mMtAkxbqetoIj2FL/HRbzWHIDMe9O1e6BM=";
   };
 
   patches = [
@@ -29,18 +35,27 @@ buildPythonPackage rec {
     ./disable-unsupported-tests.patch
   ];
 
-  propagatedBuildInputs = [ django ];
+  build-system = [ setuptools ];
 
-  checkInputs = [
+  dependencies = [ django ];
+
+  nativeCheckInputs = [
     beautifulsoup4
     django-debug-toolbar
     psycopg2
     jinja2
+    pytest-django
+    pytestCheckHook
     pytz
+    redis
+    redisTestHook
   ];
 
   pythonImportsCheck = [ "cachalot" ];
 
+  # redisTestHook does not work on darwin
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
   # disable broken pinning test
   preCheck = ''
     substituteInPlace cachalot/tests/read.py \

From 15b173668f296e6c6b453b470d00b7e53fbf6d18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 18 Aug 2025 19:47:35 +0200
Subject: [PATCH 2714/3724] python3Packages.django-guardian: 2.4.0 -> 3.0.3,
 set pyproject = true

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

diff --git a/pkgs/development/python-modules/django-guardian/default.nix b/pkgs/development/python-modules/django-guardian/default.nix
index a6727b8f055b..4a3aa9660684 100644
--- a/pkgs/development/python-modules/django-guardian/default.nix
+++ b/pkgs/development/python-modules/django-guardian/default.nix
@@ -1,25 +1,30 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   django-environ,
   mock,
   django,
   pytestCheckHook,
   pytest-django,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "django-guardian";
-  version = "2.4.0";
-  format = "setuptools";
+  version = "3.0.3";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c58a68ae76922d33e6bdc0e69af1892097838de56e93e78a8361090bcd9f89a0";
+  src = fetchFromGitHub {
+    owner = "django-guardian";
+    repo = "django-guardian";
+    tag = version;
+    hash = "sha256-0rOEue+OApWQmSBuwTLnu/yU5HUa5pgvVBUG5fT4iwY=";
   };
 
-  propagatedBuildInputs = [ django ];
+  build-system = [ setuptools ];
+
+  dependencies = [ django ];
 
   nativeCheckInputs = [
     django-environ
@@ -34,7 +39,6 @@ buildPythonPackage rec {
     description = "Per object permissions for Django";
     homepage = "https://github.com/django-guardian/django-guardian";
     license = with licenses; [
-      mit
       bsd2
     ];
     maintainers = [ ];

From e6330dcf18132a52cd0dcf9ddd1fb4efd003b95f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 18 Aug 2025 21:00:29 +0200
Subject: [PATCH 2715/3724] python3Packages.djangorestframework-guardian: 0.3.0
 -> 0.4.0, switch to pyproject and run tests with pytest

---
 .../djangorestframework-guardian/default.nix  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/djangorestframework-guardian/default.nix b/pkgs/development/python-modules/djangorestframework-guardian/default.nix
index 4d4a1d45fc9c..d722ff95ee74 100644
--- a/pkgs/development/python-modules/djangorestframework-guardian/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-guardian/default.nix
@@ -2,36 +2,38 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  django,
   django-guardian,
   djangorestframework,
+  pytest-django,
+  pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "djangorestframework-guardian";
-  version = "0.3.0";
-  format = "setuptools";
+  version = "0.4.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rpkilby";
     repo = "django-rest-framework-guardian";
     rev = version;
-    hash = "sha256-jl/VEl1pUHU8J1d5ZQSGJweNJayIGw1iVAmwID85fqw=";
+    hash = "sha256-7SaKyWoLen5DAwSyrWeA4rEmjXMcPwJ7LM7WYxk+IKs=";
   };
 
-  postPatch = ''
-    chmod +x manage.py
-    patchShebangs manage.py
-  '';
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     django-guardian
     djangorestframework
   ];
 
-  checkPhase = ''
-    ./manage.py test
-  '';
+  nativeCheckInputs = [
+    pytest-django
+    pytestCheckHook
+  ];
+
+  env.DJANGO_SETTINGS_MODULE = "tests.settings";
 
   pythonImportsCheck = [ "rest_framework_guardian" ];
 
@@ -40,7 +42,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/rpkilby/django-rest-framework-guardian";
     license = licenses.bsd3;
     maintainers = [ ];
-    # unmaintained, last compatible version is 3.x, use djangorestframework-guardian2 instead
-    broken = lib.versionAtLeast django.version "4";
   };
 }

From 8a5bbd0b9da36322a17ca8233cfe17b6b99c1f36 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 9 Aug 2025 20:39:18 +0100
Subject: [PATCH 2716/3724] =?UTF-8?q?treewide:=20remove=20already=E2=80=90?=
 =?UTF-8?q?obsolete=20CUDA=20version=20conditions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ca/catboost/package.nix                      | 4 ----
 pkgs/by-name/ma/magma/package.nix                         | 6 ------
 pkgs/by-name/ti/tiny-cuda-nn/package.nix                  | 2 +-
 pkgs/by-name/xg/xgboost/package.nix                       | 1 -
 .../cuda-modules/_cuda/fixups/nsight_systems.nix          | 2 +-
 pkgs/development/cuda-modules/cutensor/extension.nix      | 8 +-------
 pkgs/development/libraries/ctranslate2/default.nix        | 2 +-
 pkgs/development/python-modules/torch/source/default.nix  | 5 +----
 8 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/ca/catboost/package.nix b/pkgs/by-name/ca/catboost/package.nix
index dae453510a5c..76fc6f64def7 100644
--- a/pkgs/by-name/ca/catboost/package.nix
+++ b/pkgs/by-name/ca/catboost/package.nix
@@ -44,10 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
     shopt -s globstar
     for cmakelists in **/CMakeLists.*; do
       sed -i "s/OpenSSL::OpenSSL/OpenSSL::SSL/g" $cmakelists
-      ${lib.optionalString (cudaPackages.cudaOlder "11.8") ''
-        sed -i 's/-gencode=arch=compute_89,code=sm_89//g' $cmakelists
-        sed -i 's/-gencode=arch=compute_90,code=sm_90//g' $cmakelists
-      ''}
     done
   '';
 
diff --git a/pkgs/by-name/ma/magma/package.nix b/pkgs/by-name/ma/magma/package.nix
index 2e6a94e91990..9c5d762fd8eb 100644
--- a/pkgs/by-name/ma/magma/package.nix
+++ b/pkgs/by-name/ma/magma/package.nix
@@ -2,7 +2,6 @@
   autoPatchelfHook,
   blas,
   cmake,
-  cudaPackages_11 ? null,
   cudaPackages,
   cudaSupport ? config.cudaSupport,
   fetchurl,
@@ -158,11 +157,6 @@ stdenv.mkDerivation (finalAttrs: {
       cuda_cudart # cuda_runtime.h
       libcublas # cublas_v2.h
       libcusparse # cusparse.h
-    ]
-    ++ lists.optionals (cudaOlder "11.8") [
-      cuda_nvprof # <cuda_profiler_api.h>
-    ]
-    ++ lists.optionals (cudaAtLeast "11.8") [
       cuda_profiler_api # <cuda_profiler_api.h>
     ]
   )
diff --git a/pkgs/by-name/ti/tiny-cuda-nn/package.nix b/pkgs/by-name/ti/tiny-cuda-nn/package.nix
index d5cf4d2d7285..ebeea75fa20b 100644
--- a/pkgs/by-name/ti/tiny-cuda-nn/package.nix
+++ b/pkgs/by-name/ti/tiny-cuda-nn/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Remove this once a release is made with
   # https://github.com/NVlabs/tiny-cuda-nn/commit/78a14fe8c292a69f54e6d0d47a09f52b777127e1
-  postPatch = lib.optionals (cudaAtLeast "11.0") ''
+  postPatch = ''
     substituteInPlace bindings/torch/setup.py --replace-fail \
       "-std=c++14" "-std=c++17"
   '';
diff --git a/pkgs/by-name/xg/xgboost/package.nix b/pkgs/by-name/xg/xgboost/package.nix
index d853131809e2..ecacbabdd837 100644
--- a/pkgs/by-name/xg/xgboost/package.nix
+++ b/pkgs/by-name/xg/xgboost/package.nix
@@ -194,7 +194,6 @@ effectiveStdenv.mkDerivation rec {
   meta = with lib; {
     description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library";
     homepage = "https://github.com/dmlc/xgboost";
-    broken = cudaSupport && cudaPackages.cudaOlder "11.4";
     license = licenses.asl20;
     mainProgram = "xgboost";
     platforms = platforms.unix;
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
index a6e346eb27c2..9983f880b58b 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
@@ -114,7 +114,7 @@ in
       xorg.libXtst
     ]
     # NOTE(@connorbaker): Seems to be required only for aarch64-linux.
-    ++ lib.optionals (stdenv.hostPlatform.isAarch64 && cudaAtLeast "11.8") [
+    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
       gst_all_1.gst-plugins-bad
     ];
 
diff --git a/pkgs/development/cuda-modules/cutensor/extension.nix b/pkgs/development/cuda-modules/cutensor/extension.nix
index 57de518aa7ac..ef26bf7e43f2 100644
--- a/pkgs/development/cuda-modules/cutensor/extension.nix
+++ b/pkgs/development/cuda-modules/cutensor/extension.nix
@@ -74,17 +74,11 @@ let
   # The subdirectories in lib/ tell us which versions of CUDA are supported.
   # Typically the names will look like this:
   #
-  # - 10.2
   # - 11
-  # - 11.0
   # - 12
 
   # libPath :: String
-  libPath =
-    let
-      cudaMajorVersion = versions.major cudaMajorMinorVersion;
-    in
-    if cudaMajorMinorVersion == "10.2" then cudaMajorMinorVersion else cudaMajorVersion;
+  libPath = versions.major cudaMajorMinorVersion;
 
   # A release is supported if it has a libPath that matches our CUDA version for our platform.
   # LibPath are not constant across the same release -- one platform may support fewer
diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix
index 550fb0bc164d..8524bb3e16ce 100644
--- a/pkgs/development/libraries/ctranslate2/default.nix
+++ b/pkgs/development/libraries/ctranslate2/default.nix
@@ -99,6 +99,6 @@ stdenv'.mkDerivation rec {
       hexa
       misuzu
     ];
-    broken = (cudaPackages.cudaOlder "11.4") || !(withCuDNN -> withCUDA);
+    broken = !(withCuDNN -> withCUDA);
   };
 }
diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 18ede02d80d9..014c01adca4d 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -552,10 +552,7 @@ buildPythonPackage rec {
       # Some platforms do not support NCCL (i.e., Jetson)
       nccl # Provides nccl.h AND a static copy of NCCL!
     ]
-    ++ lists.optionals (cudaOlder "11.8") [
-      cuda_nvprof # <cuda_profiler_api.h>
-    ]
-    ++ lists.optionals (cudaAtLeast "11.8") [
+    ++ [
       cuda_profiler_api # <cuda_profiler_api.h>
     ]
   )

From f24c0439ea1296e295445e0d8117d282bdacaa9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Fri, 22 Aug 2025 18:50:54 +0700
Subject: [PATCH 2717/3724] =?UTF-8?q?ocamlPackages.multicore-magic:=202.3.?=
 =?UTF-8?q?0=20=E2=86=92=202.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/multicore-magic/default.nix          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/multicore-magic/default.nix b/pkgs/development/ocaml-modules/multicore-magic/default.nix
index 534d47dfaa56..358e3aed57ea 100644
--- a/pkgs/development/ocaml-modules/multicore-magic/default.nix
+++ b/pkgs/development/ocaml-modules/multicore-magic/default.nix
@@ -2,17 +2,19 @@
   lib,
   buildDunePackage,
   fetchurl,
+  nodejs-slim,
   alcotest,
   domain_shims,
+  js_of_ocaml,
 }:
 
 buildDunePackage rec {
   pname = "multicore-magic";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchurl {
     url = "https://github.com/ocaml-multicore/multicore-magic/releases/download/${version}/multicore-magic-${version}.tbz";
-    hash = "sha256-r50UqLOd2DoTz0CEXHpJMHX0fty+mGiAKTdtykgnzu4=";
+    hash = "sha256-Adcgi9yfEhhygbBK04H6N9ozg3O6JJWrXrD1MxUcGV8=";
   };
 
   doCheck = true;
@@ -21,6 +23,10 @@ buildDunePackage rec {
     alcotest
     domain_shims
   ];
+  nativeCheckInputs = [
+    nodejs-slim
+    js_of_ocaml
+  ];
 
   meta = {
     description = "Low-level multicore utilities for OCaml";

From 40ba2715d90f4ca2697003bd94bda0846fae3b96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 19:16:06 +0000
Subject: [PATCH 2718/3724] scheherazade-new: 4.300 -> 4.400

---
 pkgs/by-name/sc/scheherazade/package.nix | 1 +
 pkgs/top-level/all-packages.nix          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sc/scheherazade/package.nix b/pkgs/by-name/sc/scheherazade/package.nix
index 9c40b1a2d3e5..944c00a78a4c 100644
--- a/pkgs/by-name/sc/scheherazade/package.nix
+++ b/pkgs/by-name/sc/scheherazade/package.nix
@@ -13,6 +13,7 @@ let
       "3.300" = "sha256-LaaA6DWAE2dcwVVX4go9cJaiuwI6efYbPk82ym3W3IY=";
       "4.000" = "sha256-FhgHlHCfojIl3Y11EDYhNTmLYwQ60OrwnA9nbZbZGJE=";
       "4.300" = "sha256-djUZyBJaX6cFG4SYn+HIldNhRQ4Hg+Jt3uDfYzo9H5o=";
+      "4.400" = "sha256-76CQvy17lvzjVFICtrGU4DdT6u1nSPdSNkec2FcTwGw=";
     }
     ."${version}";
   pname = "scheherazade${lib.optionalString new "-new"}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 556b25890efd..10496172907f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11351,7 +11351,7 @@ with pkgs;
       { useQt5 = true; };
 
   scheherazade-new = scheherazade.override {
-    version = "4.300";
+    version = "4.400";
   };
 
   inherit (callPackages ../data/fonts/gdouros { })

From cd1e55c7f2279044098b671926804893520498b0 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 17 Aug 2025 05:39:16 +0200
Subject: [PATCH 2719/3724] gxneur: remove

---
 pkgs/applications/misc/gxneur/default.nix | 56 -----------------------
 pkgs/top-level/aliases.nix                |  1 +
 pkgs/top-level/all-packages.nix           |  4 --
 3 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 pkgs/applications/misc/gxneur/default.nix

diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix
deleted file mode 100644
index 4fecff22e3c7..000000000000
--- a/pkgs/applications/misc/gxneur/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  intltool,
-  gtk2,
-  xorg,
-  glib,
-  xneur,
-  libglade,
-  GConf,
-  libappindicator-gtk2,
-  pcre,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gxneur";
-  version = "0.20.0";
-
-  src = fetchurl {
-    url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/${version}/gxneur_${version}.orig.tar.gz";
-    sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr";
-  };
-
-  # glib-2.62 deprecations
-  env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
-  buildInputs = [
-    xorg.libX11
-    glib
-    gtk2
-    xorg.libXpm
-    xorg.libXt
-    xorg.libXext
-    xneur
-    libglade
-    GConf
-    pcre
-    libappindicator-gtk2
-  ];
-
-  meta = with lib; {
-    description = "GUI for XNEUR keyboard layout switcher";
-    platforms = platforms.linux;
-    license = with licenses; [
-      gpl2
-      gpl3
-    ];
-    mainProgram = "gxneur";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 19f5a0cdd10d..9ec3197d249a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1073,6 +1073,7 @@ mapAliases {
   guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09
   guile-disarchive = disarchive; # Added 2023-10-27
   gutenprintBin = gutenprint-bin; # Added 2025-08-21
+  gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17
 
   ### H ###
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea1ae4d38951..28c449163d8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13836,10 +13836,6 @@ with pkgs;
           ;
       };
 
-  gxneur = callPackage ../applications/misc/gxneur {
-    inherit (gnome2) libglade GConf;
-  };
-
   xournalpp = callPackage ../applications/graphics/xournalpp {
     lua = lua5_3;
   };

From f4fbb606882d44753e99b95ddabb5e04f7aa55c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 12:32:54 +0000
Subject: [PATCH 2720/3724] gnuchess: 6.2.11 -> 6.3.0

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

diff --git a/pkgs/by-name/gn/gnuchess/package.nix b/pkgs/by-name/gn/gnuchess/package.nix
index 69e0d4f07325..dcdb488e9424 100644
--- a/pkgs/by-name/gn/gnuchess/package.nix
+++ b/pkgs/by-name/gn/gnuchess/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnuchess";
-  version = "6.2.11";
+  version = "6.3.0";
 
   src = fetchurl {
     url = "mirror://gnu/chess/gnuchess-${version}.tar.gz";
-    sha256 = "sha256-2BFA7qXGnRSwz7Y4FtS0yeGPulH1Jn3lsVOfRok56b0=";
+    sha256 = "sha256-Cze+wgmMKtaVt0Q+XXlE3G3IKE+NAfzDC9uU3QM8ojo=";
   };
 
   buildInputs = [

From 2e716b00a7bc95105a1b21514657527c4afefa74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 12:34:31 +0000
Subject: [PATCH 2721/3724] watchlog: 1.246.0 -> 1.248.0

---
 pkgs/by-name/wa/watchlog/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/watchlog/package.nix b/pkgs/by-name/wa/watchlog/package.nix
index e1d074fa2049..f10aeadc5b73 100644
--- a/pkgs/by-name/wa/watchlog/package.nix
+++ b/pkgs/by-name/wa/watchlog/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "watchlog";
-  version = "1.246.0";
+  version = "1.248.0";
 
   src = fetchFromGitLab {
     owner = "kevincox";
     repo = "watchlog";
     rev = "v${version}";
-    hash = "sha256-1AcA2Ar2XVLMfBxG2GtsXe9zNF/8pJBZ2NzihhMm3Vk=";
+    hash = "sha256-zi1tfndcjDoAT5IPj1ydjqeQyKAocR0O/jLeZTZAfO0=";
   };
 
-  cargoHash = "sha256-83vDlH/S8rZqLwBux3WoTIkGFf01Powyz9sZpsVY+AQ=";
+  cargoHash = "sha256-/yUXaHGnhx/eOeXmAhLg9zWWHOuLGqbBBLjAJsB6JZw=";
 
   meta = {
     description = "Easier monitoring of live logs";

From 6c9b2a21442a147df455665f849871633c4ee48b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 12:45:06 +0000
Subject: [PATCH 2722/3724] affine: 0.24.0 -> 0.24.1

---
 pkgs/by-name/af/affine/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix
index b78dd9e9ee91..3336fa529d70 100644
--- a/pkgs/by-name/af/affine/package.nix
+++ b/pkgs/by-name/af/affine/package.nix
@@ -43,17 +43,17 @@ in
 stdenv.mkDerivation (finalAttrs: {
   pname = binName;
 
-  version = "0.24.0";
+  version = "0.24.1";
   src = fetchFromGitHub {
     owner = "toeverything";
     repo = "AFFiNE";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vI4lCucwNdrbmst78NUkHXtluZvrc7aHymzm1Zbls78=";
+    hash = "sha256-Yq5TD5yInv+0d1S6M58I8CneCAGUwH0ThGrEJfLIrX0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-OdzjT6ktxvQNIk0Um9iru7Wm5LcBE3f5vrO4rsksf5U=";
+    hash = "sha256-tRDc7Rky59Rh08QTNiG3yopErHJzARxN8BZGrSUECLE=";
   };
   yarnOfflineCache = stdenvNoCC.mkDerivation {
     name = "yarn-offline-cache";
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
       '';
     dontInstall = true;
     outputHashMode = "recursive";
-    outputHash = "sha256-wSEAxOSLS0ul5vQDTj/bVXH8ViqDFsq6jHTaXJFAm/U=";
+    outputHash = "sha256-U2FGvdtGiM97aXmbfNIfi87hvwDkd1dvlAABYiDgAGI=";
   };
 
   buildInputs = lib.optionals hostPlatform.isDarwin [

From 9e56584b0fa6cf5f9c394e84b5cba08b6a126971 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 12:45:28 +0000
Subject: [PATCH 2723/3724] python3Packages.python-openstackclient: 8.1.0 ->
 8.2.0

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

diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix
index 905cc3d4b17f..3898978c74d8 100644
--- a/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/pkgs/development/python-modules/python-openstackclient/default.nix
@@ -33,13 +33,13 @@
 
 buildPythonPackage rec {
   pname = "python-openstackclient";
-  version = "8.1.0";
+  version = "8.2.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "python_openstackclient";
     inherit version;
-    hash = "sha256-m5xCs/a8S0tICmJU/FYKywGXh4MeCUOW2/msmuVxrks=";
+    hash = "sha256-1hKvGN/GbMjzHmzpZpC2wnOt6KJA7EC39INaiJb7vgE=";
   };
 
   build-system = [

From bbad17c5540828db4741d50e75de535d2755d77b Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 21 Aug 2025 21:41:49 -0400
Subject: [PATCH 2724/3724] envoy-bin: 1.35.0 -> 1.35.1

---
 pkgs/by-name/en/envoy-bin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix
index 09a30a0e7eeb..c99456b9e486 100644
--- a/pkgs/by-name/en/envoy-bin/package.nix
+++ b/pkgs/by-name/en/envoy-bin/package.nix
@@ -8,7 +8,7 @@
   versionCheckHook,
 }:
 let
-  version = "1.35.0";
+  version = "1.35.1";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "envoy-bin is not available for ${system}.";
 
@@ -21,8 +21,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-PLlFrs65Z+mV5V2OoW+bb/91DC5V9Ss2HnERccIunWY=";
-      x86_64-linux = "sha256-0l12MVwCNrUPjn9t6hOpuUscP6EQQHNLd0kG4YjhEeY=";
+      aarch64-linux = "sha256-tIBXnm6bGdA6tlYFL+aDf1bOjlUVof0MDNDpFi0tcbE=";
+      x86_64-linux = "sha256-emAbbVhEw0MA21rPxQD/z/p3yVuDi5JZg1yjuRkkmlo=";
     }
     .${system} or throwSystem;
 in

From 2bae40120ebd3a35961fd65d7d50a627f53602ca Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Fri, 22 Aug 2025 14:47:00 +0200
Subject: [PATCH 2725/3724] code-browser: remove

---
 .../editors/code-browser/default.nix          | 79 -------------------
 pkgs/top-level/aliases.nix                    |  3 +
 pkgs/top-level/all-packages.nix               |  4 -
 3 files changed, 3 insertions(+), 83 deletions(-)
 delete mode 100644 pkgs/applications/editors/code-browser/default.nix

diff --git a/pkgs/applications/editors/code-browser/default.nix b/pkgs/applications/editors/code-browser/default.nix
deleted file mode 100644
index 4528c6a33687..000000000000
--- a/pkgs/applications/editors/code-browser/default.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  copper,
-  python3,
-  pkg-config,
-  withQt ? false,
-  qtbase ? null,
-  wrapQtAppsHook ? null,
-  withGtk2 ? false,
-  gtk2,
-  withGtk3 ? false,
-  gtk3,
-  mkDerivation ? stdenv.mkDerivation,
-}:
-let
-  onlyOneEnabled = xs: 1 == builtins.length (builtins.filter lib.id xs);
-in
-assert onlyOneEnabled [
-  withQt
-  withGtk2
-  withGtk3
-];
-mkDerivation rec {
-  pname = "code-browser";
-  version = "8.0";
-  src = fetchurl {
-    url = "https://tibleiz.net/download/code-browser-${version}-src.tar.gz";
-    sha256 = "sha256-beCp4lx4MI1+hVgWp2h3piE/zu51zfwQdB5g7ImgmwY=";
-  };
-  postPatch = ''
-    substituteInPlace Makefile --replace "LFLAGS=-no-pie" "LFLAGS=-no-pie -L."
-    patchShebangs .
-  ''
-  + lib.optionalString withQt ''
-    substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o"
-    substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: qt"
-  ''
-  + lib.optionalString withGtk2 ''
-    substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: gtk2"
-  ''
-  + lib.optionalString withGtk3 ''
-    substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: gtk"
-  '';
-  nativeBuildInputs = [
-    copper
-    python3
-    pkg-config
-  ]
-  ++ lib.optionals withGtk2 [ gtk2 ]
-  ++ lib.optionals withGtk3 [ gtk3 ]
-  ++ lib.optionals withQt [
-    qtbase
-    wrapQtAppsHook
-  ];
-  buildInputs =
-    lib.optionals withQt [ qtbase ]
-    ++ lib.optionals withGtk2 [ gtk2 ]
-    ++ lib.optionals withGtk3 [ gtk3 ];
-  makeFlags = [
-    "prefix=$(out)"
-    "COPPER=${copper}/bin/copper-elf64"
-    "with-local-libs"
-  ]
-  ++ lib.optionals withQt [
-    "QINC=${qtbase.dev}/include"
-    "UI=qt"
-  ]
-  ++ lib.optionals withGtk2 [ "UI=gtk2" ]
-  ++ lib.optionals withGtk3 [ "UI=gtk" ];
-
-  meta = with lib; {
-    description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code";
-    homepage = "https://tibleiz.net/code-browser/";
-    license = licenses.gpl2;
-    platforms = platforms.x86_64;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 19f5a0cdd10d..4905caf4369d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -619,6 +619,9 @@ mapAliases {
   cloudlogoffline = throw "cloudlogoffline has been removed"; # added 2025-05-18
   clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   CoinMP = coinmp; # Added 2024-06-12
+  code-browser-gtk = throw "'code-browser-gtk' has been removed, as it was broken since 22.11"; # Added 2025-08-22
+  code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22
+  code-browser-qt = throw "'code-browser-qt' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   collada-dom = opencollada; # added 2024-02-21
   colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea1ae4d38951..0e416f0e8d5b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2615,10 +2615,6 @@ with pkgs;
 
   cask-server = libsForQt5.callPackage ../applications/misc/cask-server { };
 
-  code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; };
-  code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; };
-  code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; };
-
   cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert;
 
   ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { };

From cdafc1530792f4f1ca0fd3d4f98c41d84e8827f8 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Fri, 22 Aug 2025 14:47:06 +0200
Subject: [PATCH 2726/3724] copper: remove

---
 pkgs/by-name/co/copper/package.nix | 34 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 pkgs/by-name/co/copper/package.nix

diff --git a/pkgs/by-name/co/copper/package.nix b/pkgs/by-name/co/copper/package.nix
deleted file mode 100644
index d6b24177d291..000000000000
--- a/pkgs/by-name/co/copper/package.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  libffi,
-}:
-stdenv.mkDerivation rec {
-  pname = "copper";
-  version = "4.6";
-  src = fetchurl {
-    url = "https://tibleiz.net/download/copper-${version}-src.tar.gz";
-    sha256 = "sha256-tyxAMJp4H50eBz8gjt2O3zj5fq6nOIXKX47wql8aUUg=";
-  };
-  buildInputs = [
-    libffi
-  ];
-  postPatch = ''
-    patchShebangs .
-  '';
-  buildPhase = ''
-    make BACKEND=elf64 boot-elf64
-    make BACKEND=elf64 COPPER=stage3/copper-elf64 copper-elf64
-  '';
-  installPhase = ''
-    make BACKEND=elf64 install prefix=$out
-  '';
-  meta = with lib; {
-    description = "Simple imperative language, statically typed with type inference and genericity";
-    homepage = "https://tibleiz.net/copper/";
-    license = licenses.bsd2;
-    platforms = platforms.x86_64;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4905caf4369d..bb86ffe4175a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -627,6 +627,7 @@ mapAliases {
   colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19
   colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15
   connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27
+  copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07
   coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
   corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01

From 18c700b28a00cb713b9e1266906e6abbaad21f92 Mon Sep 17 00:00:00 2001
From: Julian Hoch <julian.hoch@hoch-software.ch>
Date: Fri, 22 Aug 2025 14:20:10 +0200
Subject: [PATCH 2727/3724] maintainers: add julian-hoch

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c3da2a5e38a4..7c486fd57a97 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12846,6 +12846,11 @@
     githubId = 70963316;
     keys = [ { fingerprint = "C61D 7747 43DE EF05 4E4A  3AC1 6FE2 79EB 5C9F 3466"; } ];
   };
+  julian-hoch = {
+    name = "Julian Hoch";
+    github = "julian-hoch";
+    githubId = 95583314;
+  };
   juliendehos = {
     email = "dehos@lisic.univ-littoral.fr";
     github = "juliendehos";

From e27f83ae02c5024cc8221f4be2dfe118c9cf3326 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 22 Aug 2025 08:55:15 -0400
Subject: [PATCH 2728/3724] openvswitch: 3.5.1 -> 3.6.0

Changelog: https://www.openvswitch.org/releases/NEWS-3.6.0.txt
---
 pkgs/by-name/op/openvswitch/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix
index 7681aaf86f9d..40b9f127a031 100644
--- a/pkgs/by-name/op/openvswitch/package.nix
+++ b/pkgs/by-name/op/openvswitch/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation rec {
   pname = if withDPDK then "openvswitch-dpdk" else "openvswitch";
-  version = "3.5.1";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "openvswitch";
     repo = "ovs";
     tag = "v${version}";
-    hash = "sha256-iiFpX4w6vdsRxjhRcxXTTtSAb8WPwg1afqwgBpzjhoA=";
+    hash = "sha256-zzEE1H0fjFOZY3KXFPb91Bmk3irPL1mHEbEBsumPlkw=";
   };
 
   outputs = [

From cdd75cbaf7a97defc39c099f801bfce097283e4a Mon Sep 17 00:00:00 2001
From: kivuno <kivuno@users.noreply.github.com>
Date: Fri, 22 Aug 2025 09:36:06 +0800
Subject: [PATCH 2729/3724] youtube-music: 3.9.0 -> 3.10.0

---
 pkgs/applications/audio/youtube-music/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix
index ba02694aa40f..fd747fb36438 100644
--- a/pkgs/applications/audio/youtube-music/default.nix
+++ b/pkgs/applications/audio/youtube-music/default.nix
@@ -13,19 +13,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "youtube-music";
-  version = "3.9.0";
+  version = "3.10.0";
 
   src = fetchFromGitHub {
     owner = "th-ch";
     repo = "youtube-music";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-xaHYNfW5ZLYiaeJ0F32NQ87woMh6K4Ea9rjgNOyabck=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+PCDA7lHaUQw9DhODRsEScyJC+9v8UPiZ1W8w2h/Ljg=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-xIQyTetHU37gTxCcQp4VCqzGdIfVQGy/aORCVba6YQ0=";
+    fetcherVersion = 2;
+    hash = "sha256-b5I0n3CedA6qCL68lePU3pwyGp1JlQHzUpfCvhqw2qI=";
   };
 
   nativeBuildInputs = [
@@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Electron wrapper around YouTube Music";
     homepage = "https://th-ch.github.io/youtube-music/";
     changelog = "https://github.com/th-ch/youtube-music/blob/master/changelog.md#${
-      lib.replaceStrings [ "." ] [ "" ] finalAttrs.src.rev
+      lib.replaceStrings [ "." ] [ "" ] finalAttrs.src.tag
     }";
     license = licenses.mit;
     maintainers = with maintainers; [

From 8586b9b7b4f4e29ddb78919041e0f3bdf9ef370a Mon Sep 17 00:00:00 2001
From: kivuno <kivuno@users.noreply.github.com>
Date: Fri, 22 Aug 2025 09:38:17 +0800
Subject: [PATCH 2730/3724] youtube-music: remove with lib

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

diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix
index fd747fb36438..bb1099f554ee 100644
--- a/pkgs/applications/audio/youtube-music/default.nix
+++ b/pkgs/applications/audio/youtube-music/default.nix
@@ -100,14 +100,14 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Electron wrapper around YouTube Music";
     homepage = "https://th-ch.github.io/youtube-music/";
     changelog = "https://github.com/th-ch/youtube-music/blob/master/changelog.md#${
       lib.replaceStrings [ "." ] [ "" ] finalAttrs.src.tag
     }";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       aacebedo
       SuperSandro2000
     ];

From e55053a5851af00b90819bc67915c212dc7cf0e2 Mon Sep 17 00:00:00 2001
From: kivuno <kivuno@users.noreply.github.com>
Date: Fri, 22 Aug 2025 09:40:32 +0800
Subject: [PATCH 2731/3724] youtube-music: sort

---
 .../audio/youtube-music/default.nix           | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix
index bb1099f554ee..2db52d565c68 100644
--- a/pkgs/applications/audio/youtube-music/default.nix
+++ b/pkgs/applications/audio/youtube-music/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   makeWrapper,
   electron,
   python3,
-  stdenv,
   copyDesktopItems,
   nodejs,
   pnpm,
@@ -22,6 +22,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-+PCDA7lHaUQw9DhODRsEScyJC+9v8UPiZ1W8w2h/Ljg=";
   };
 
+  patches = [
+    # MPRIS's DesktopEntry property needs to match the desktop entry basename
+    ./fix-mpris-desktop-entry.patch
+  ];
+
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
@@ -36,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ];
 
-  ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
+  env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
 
   postBuild =
     lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -51,6 +56,17 @@ stdenv.mkDerivation (finalAttrs: {
         -c.electronVersion=${electron.version}
     '';
 
+  desktopItems = [
+    (makeDesktopItem {
+      name = "com.github.th_ch.youtube_music";
+      exec = "youtube-music %u";
+      icon = "youtube-music";
+      desktopName = "YouTube Music";
+      startupWMClass = "com.github.th_ch.youtube_music";
+      categories = [ "AudioVideo" ];
+    })
+  ];
+
   installPhase = ''
     runHook preInstall
 
@@ -84,22 +100,6 @@ stdenv.mkDerivation (finalAttrs: {
       --inherit-argv0
   '';
 
-  patches = [
-    # MPRIS's DesktopEntry property needs to match the desktop entry basename
-    ./fix-mpris-desktop-entry.patch
-  ];
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "com.github.th_ch.youtube_music";
-      exec = "youtube-music %u";
-      icon = "youtube-music";
-      desktopName = "YouTube Music";
-      startupWMClass = "com.github.th_ch.youtube_music";
-      categories = [ "AudioVideo" ];
-    })
-  ];
-
   meta = {
     description = "Electron wrapper around YouTube Music";
     homepage = "https://th-ch.github.io/youtube-music/";

From b36e2faecba30319c1a0356788144c9002d0480c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 13:07:17 +0000
Subject: [PATCH 2732/3724] angie: 1.10.1 -> 1.10.2

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

diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix
index 8df5eeb09b1c..6c0fb856ecb8 100644
--- a/pkgs/servers/http/angie/default.nix
+++ b/pkgs/servers/http/angie/default.nix
@@ -9,12 +9,12 @@
 }@args:
 
 callPackage ../nginx/generic.nix args rec {
-  version = "1.10.1";
+  version = "1.10.2";
   pname = if withQuic then "angieQuic" else "angie";
 
   src = fetchurl {
     url = "https://download.angie.software/files/angie-${version}.tar.gz";
-    hash = "sha256-VxhmxhN56wB57x5/vJEeLddv5USsXv8oNLSVh+XO4+8=";
+    hash = "sha256-pcKrk33ySoDnhq9WOJIvRuqKc9FhQYPIyQKYrocwlLg=";
   };
 
   configureFlags =

From 23c2bda6fda8119834d25c1d726b2a0e45a26b16 Mon Sep 17 00:00:00 2001
From: kivuno <kivuno@users.noreply.github.com>
Date: Fri, 22 Aug 2025 09:44:31 +0800
Subject: [PATCH 2733/3724] youtube-music: set --wayland-text-input-version=3,
 move out of $out/share/lib directory

---
 pkgs/applications/audio/youtube-music/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix
index 2db52d565c68..b11d3d6a11fd 100644
--- a/pkgs/applications/audio/youtube-music/default.nix
+++ b/pkgs/applications/audio/youtube-music/default.nix
@@ -74,11 +74,11 @@ stdenv.mkDerivation (finalAttrs: {
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/{Applications,bin}
     mv pack/mac*/YouTube\ Music.app $out/Applications
-    makeWrapper $out/Applications/YouTube\ Music.app/Contents/MacOS/YouTube\ Music $out/bin/youtube-music
+    ln -s "$out/Applications/YouTube Music.app/Contents/MacOS/YouTube Music" $out/bin/youtube-music
   ''
   + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-    mkdir -p "$out/share/lib/youtube-music"
-    cp -r pack/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/youtube-music"
+    mkdir -p "$out/share/youtube-music"
+    cp -r pack/*-unpacked/{locales,resources{,.pak}} "$out/share/youtube-music"
 
     pushd assets/generated/icons/png
     for file in *.png; do
@@ -93,8 +93,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     makeWrapper ${electron}/bin/electron $out/bin/youtube-music \
-      --add-flags $out/share/lib/youtube-music/resources/app.asar \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags $out/share/youtube-music/resources/app.asar \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
       --set-default ELECTRON_FORCE_IS_PACKAGED 1 \
       --set-default ELECTRON_IS_DEV 0 \
       --inherit-argv0

From f102c789cc8274030013261660da7b74f72d59ca Mon Sep 17 00:00:00 2001
From: kivuno <kivuno@users.noreply.github.com>
Date: Fri, 22 Aug 2025 09:47:07 +0800
Subject: [PATCH 2734/3724] youtube-music: add updateScript

---
 pkgs/applications/audio/youtube-music/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix
index b11d3d6a11fd..cde0d6cd26ad 100644
--- a/pkgs/applications/audio/youtube-music/default.nix
+++ b/pkgs/applications/audio/youtube-music/default.nix
@@ -9,6 +9,7 @@
   nodejs,
   pnpm,
   makeDesktopItem,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -100,6 +101,8 @@ stdenv.mkDerivation (finalAttrs: {
       --inherit-argv0
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Electron wrapper around YouTube Music";
     homepage = "https://th-ch.github.io/youtube-music/";

From 4d8d60a0375c43bcb18badfb7d36e98c37a3708f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 18 Aug 2025 21:00:55 +0200
Subject: [PATCH 2735/3724] python3Packages.djangorestframework-guardian2: drop
 in favor of djangorestframework-guardian 0.4.0

---
 pkgs/by-name/au/authentik/package.nix         |  4 +-
 pkgs/by-name/pa/paperless-ngx/package.nix     |  5 +-
 .../djangorestframework-guardian2/default.nix | 46 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  4 --
 5 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/development/python-modules/djangorestframework-guardian2/default.nix

diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix
index 14e8700c416c..ef2639eb71ba 100644
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@@ -308,8 +308,6 @@ let
           substituteInPlace authentik/lib/default.yml \
             --replace-fail '/blueprints' "$out/blueprints" \
             --replace-fail './media' '/var/lib/authentik/media'
-          substituteInPlace pyproject.toml \
-            --replace-fail 'djangorestframework-guardian' 'djangorestframework-guardian2'
           substituteInPlace authentik/stages/email/utils.py \
             --replace-fail 'web/' '${webui}/'
         '';
@@ -346,7 +344,7 @@ let
             django-storages
             django-tenants
             djangorestframework
-            djangorestframework-guardian2
+            djangorestframework-guardian
             docker
             drf-orjson-renderer
             drf-spectacular
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 58dcc0543931..2b253fd5bc69 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -149,8 +149,7 @@ python.pkgs.buildPythonApplication rec {
     fi
     substituteInPlace pyproject.toml \
       --replace-fail '"--numprocesses=auto",' "" \
-      --replace-fail '--maxprocesses=16' "--numprocesses=$NIX_BUILD_CORES" \
-      --replace-fail "djangorestframework-guardian~=0.3.0" "djangorestframework-guardian2"
+      --replace-fail '--maxprocesses=16' "--numprocesses=$NIX_BUILD_CORES"
   '';
 
   nativeBuildInputs = [
@@ -194,7 +193,7 @@ python.pkgs.buildPythonApplication rec {
       django-multiselectfield
       django-soft-delete
       djangorestframework
-      djangorestframework-guardian2
+      djangorestframework-guardian
       drf-spectacular
       drf-spectacular-sidecar
       drf-writable-nested
diff --git a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix
deleted file mode 100644
index 25081535d2f0..000000000000
--- a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  django-guardian,
-  djangorestframework,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "djangorestframework-guardian2";
-  version = "0.7.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "johnthagen";
-    repo = "django-rest-framework-guardian2";
-    tag = "v${version}";
-    hash = "sha256-LrIhOoBWC3HttjAGbul4zof++OW35pGMyFGZzUpG1Tk=";
-  };
-
-  postPatch = ''
-    chmod +x manage.py
-    patchShebangs manage.py
-  '';
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    django-guardian
-    djangorestframework
-  ];
-
-  checkPhase = ''
-    ./manage.py test
-  '';
-
-  pythonImportsCheck = [ "rest_framework_guardian" ];
-
-  meta = with lib; {
-    description = "Django-guardian support for Django REST Framework";
-    homepage = "https://github.com/johnthagen/django-rest-framework-guardian2/";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ e1mo ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index ca53096917a3..4204c244407c 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -188,6 +188,7 @@ mapAliases ({
   distutils_extra = distutils-extra; # added 2023-10-12
   digital-ocean = python-digitalocean; # addad 2024-04-12
   dj-stripe = throw "dj-stripe has been removed because it is unused and broken"; # added 2025-07-21
+  djangorestframework-guardian2 = throw "djangorestframework-guardian2 has been removed because djangorestframework-guardian is active again and the upstream project was archived"; # added 2025-08-22
   djangorestframework-jwt = drf-jwt; # added 2021-07-20
   django-allauth-2fa = throw "django-allauth-2fa was removed because it was unused and django-allauth now contains 2fa logic itself."; # added 2025-02-15
   django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf11b8374764..682df8d127a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4142,10 +4142,6 @@ self: super: with self; {
     callPackage ../development/python-modules/djangorestframework-guardian
       { };
 
-  djangorestframework-guardian2 =
-    callPackage ../development/python-modules/djangorestframework-guardian2
-      { };
-
   djangorestframework-jsonp = callPackage ../development/python-modules/djangorestframework-jsonp { };
 
   djangorestframework-recursive =

From 103adb01314f5fc734504931ce1f5544ff80c624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 18 Aug 2025 20:27:41 +0200
Subject: [PATCH 2736/3724] python3Packages.djangorestframework-dataclasses:
 run tests with pytest

---
 .../djangorestframework-dataclasses/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
index 149993805a6e..f3c6d0ed3776 100644
--- a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
@@ -3,6 +3,8 @@
   buildPythonPackage,
   fetchFromGitHub,
   djangorestframework,
+  pytest-django,
+  pytestCheckHook,
   setuptools,
 }:
 
@@ -18,21 +20,20 @@ buildPythonPackage rec {
     hash = "sha256-nUkR5xTyeBv7ziJ6Mej9TKvMOa5/k+ELBqt4BVam/wk=";
   };
 
-  build-system = [ setuptools ];
-
   postPatch = ''
     patchShebangs manage.py
   '';
 
+  build-system = [ setuptools ];
+
   dependencies = [ djangorestframework ];
 
-  checkPhase = ''
-    runHook preCheck
+  nativeCheckInputs = [
+    pytest-django
+    pytestCheckHook
+  ];
 
-    ./manage.py test
-
-    runHook postCheck
-  '';
+  env.DJANGO_SETTINGS_MODULE = "tests.django_settings";
 
   pythonImportsCheck = [ "rest_framework_dataclasses" ];
 

From 72dc30c5ddc4f22fcee1d11e407591380d41ca57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 19 Aug 2025 00:25:28 +0200
Subject: [PATCH 2737/3724] python3Packages.tika-client: 0.9.0 -> 0.10.0

Diff: https://github.com/stumpylog/tika-client/compare/0.9.0...0.10.0

Changelog: https://github.com/stumpylog/tika-client/blob/0.10.0/CHANGELOG.md
---
 .../python-modules/tika-client/default.nix     | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix
index f70747fef55b..b16ace6df913 100644
--- a/pkgs/development/python-modules/tika-client/default.nix
+++ b/pkgs/development/python-modules/tika-client/default.nix
@@ -2,35 +2,33 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
+  anyio,
   hatchling,
   httpx,
 }:
 
 buildPythonPackage rec {
   pname = "tika-client";
-  version = "0.9.0";
+  version = "0.10.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "stumpylog";
     repo = "tika-client";
     tag = version;
-    hash = "sha256-lg6syUbEbPb70iBa4lw5fVN8cvfWY3bkG2jNGxxNLDo=";
+    hash = "sha256-XYyMp+02lWzE+3Txr+shVGVwalLEJHvoy988tA7SWgY=";
   };
 
   build-system = [ hatchling ];
 
-  dependencies = [ httpx ];
+  dependencies = [
+    anyio
+    httpx
+  ];
 
   pythonImportsCheck = [ "tika_client" ];
 
-  # Almost all of the tests (all except one in 0.1.0) fail since there
-  # is no tika http API endpoint reachable. Since tika is not yet
-  # packaged for nixpkgs, it seems like an unreasonable amount of effort
-  # fixing these tests.
+  # The tests expect the tika-server to run in a docker container
   doChecks = false;
 
   meta = with lib; {

From c70e3aafbf58a0b8a23b2457b3533e4877c9ac8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 19 Aug 2025 00:43:37 +0200
Subject: [PATCH 2738/3724] python3Packages.drf-spectacular-sidecar: 2025.4.1
 -> 2025.8.1

Diff: https://github.com/tfranzel/drf-spectacular-sidecar/compare/2025.4.1...2025.8.1
---
 .../python-modules/drf-spectacular-sidecar/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
index bd8da61a4f6e..811e370ffc78 100644
--- a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
+++ b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "drf-spectacular-sidecar";
-  version = "2025.4.1";
+  version = "2025.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tfranzel";
     repo = "drf-spectacular-sidecar";
     rev = version;
-    hash = "sha256-YzSUwShj7QGCVKlTRM2Gro38Y+jGYQsMGBMAH0radmA=";
+    hash = "sha256-H2eHFX7VG7YqLztEV/G4QnVYytkfADeHxgBTRlmKt50=";
   };
 
   build-system = [ setuptools ];

From 0f22a85409ffc9cb1cb800220adb87a268ffb457 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Jun 2025 10:24:45 +0000
Subject: [PATCH 2739/3724] python3Packages.django-multiselectfield: 0.1.13 ->
 1.0.1

(cherry picked from commit f631ce240aa9472dce32e2e59611940dc2a33459)
---
 .../python-modules/django-multiselectfield/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix
index ad365b7062f3..0945ab27d9e5 100644
--- a/pkgs/development/python-modules/django-multiselectfield/default.nix
+++ b/pkgs/development/python-modules/django-multiselectfield/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "django-multiselectfield";
-  version = "0.1.13";
+  version = "1.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "django_multiselectfield";
     inherit version;
-    hash = "sha256-Q31yYy9MDKQWlRkXYyUpw9HUK2K7bDwD4zlvpQJlvpQ=";
+    hash = "sha256-P4tP/z4H1Kkci7S4Cbw1yusitBdptgb0ye3FO41ypmc=";
   };
 
   build-system = [ setuptools ];

From ae730b371bcd426f2e2aee4c532d3be76949d855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 21 Aug 2025 00:48:12 +0200
Subject: [PATCH 2740/3724] froide: fix initdb not being in PATH

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

diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix
index 8b5e9ffc64d9..e4cf9a7cbcc2 100644
--- a/pkgs/by-name/fr/froide/package.nix
+++ b/pkgs/by-name/fr/froide/package.nix
@@ -135,7 +135,7 @@ python.pkgs.buildPythonApplication rec {
   '';
 
   nativeCheckInputs = with python.pkgs; [
-    (postgresql.withPackages (p: [ p.postgis ]))
+    (postgresql.withPackages (p: [ p.postgis ])).out
     postgresqlTestHook
     pytest-django
     pytest-playwright

From 0de3cbd1a2100263ad66b81e622f5ea4218ef7cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 19 Aug 2025 21:54:00 +0200
Subject: [PATCH 2741/3724] paperless-ngx: format and sort

---
 pkgs/by-name/pa/paperless-ngx/package.nix | 128 +++++++++++-----------
 1 file changed, 62 insertions(+), 66 deletions(-)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 2b253fd5bc69..9291d2d9f08f 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -68,73 +68,69 @@ let
     poppler-utils
   ];
 
-  frontend =
-    let
-      frontendSrc = src + "/src-ui";
-    in
-    stdenv.mkDerivation rec {
-      pname = "paperless-ngx-frontend";
-      inherit version;
+  frontend = stdenv.mkDerivation (finalAttrs: {
+    pname = "paperless-ngx-frontend";
+    inherit version;
 
-      src = frontendSrc;
+    src = src + "/src-ui";
 
-      pnpmDeps = pnpm.fetchDeps {
-        inherit pname version src;
-        fetcherVersion = 1;
-        hash = "sha256-VtYYwpMXPAC3g1OESnw3dzLTwiGqJBQcicFZskEucok=";
-      };
-
-      nativeBuildInputs = [
-        node-gyp
-        nodejs_20
-        pkg-config
-        pnpm.configHook
-        python3
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        xcbuild
-      ];
-
-      buildInputs = [
-        pango
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        giflib
-      ];
-
-      CYPRESS_INSTALL_BINARY = "0";
-      NG_CLI_ANALYTICS = "false";
-
-      buildPhase = ''
-        runHook preBuild
-
-        pushd node_modules/canvas
-        node-gyp rebuild
-        popd
-
-        pnpm run build --configuration production
-
-        runHook postBuild
-      '';
-
-      doCheck = true;
-      checkPhase = ''
-        runHook preCheck
-
-        pnpm run test
-
-        runHook postCheck
-      '';
-
-      installPhase = ''
-        runHook preInstall
-
-        mkdir -p $out/lib/paperless-ui
-        mv ../src/documents/static/frontend $out/lib/paperless-ui/
-
-        runHook postInstall
-      '';
+    pnpmDeps = pnpm.fetchDeps {
+      inherit (finalAttrs) pname version src;
+      fetcherVersion = 1;
+      hash = "sha256-VtYYwpMXPAC3g1OESnw3dzLTwiGqJBQcicFZskEucok=";
     };
+
+    nativeBuildInputs = [
+      node-gyp
+      nodejs_20
+      pkg-config
+      pnpm.configHook
+      python3
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      xcbuild
+    ];
+
+    buildInputs = [
+      pango
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      giflib
+    ];
+
+    CYPRESS_INSTALL_BINARY = "0";
+    NG_CLI_ANALYTICS = "false";
+
+    buildPhase = ''
+      runHook preBuild
+
+      pushd node_modules/canvas
+      node-gyp rebuild
+      popd
+
+      pnpm run build --configuration production
+
+      runHook postBuild
+    '';
+
+    doCheck = true;
+    checkPhase = ''
+      runHook preCheck
+
+      pnpm run test
+
+      runHook postCheck
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/lib/paperless-ui
+      mv ../src/documents/static/frontend $out/lib/paperless-ui/
+
+      runHook postInstall
+    '';
+  });
 in
 python.pkgs.buildPythonApplication rec {
   pname = "paperless-ngx";
@@ -323,9 +319,9 @@ python.pkgs.buildPythonApplication rec {
 
   passthru = {
     inherit
-      python
-      path
       frontend
+      path
+      python
       tesseract5
       ;
     nltkData = with nltk-data; [

From 06db824d91a0de8f7028e28801b99756830dd44a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 18 Aug 2025 02:24:34 +0200
Subject: [PATCH 2742/3724] paperless-ngx: 2.17.1 -> 2.18.1

Changelog: https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.18.0
Changelog: https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.18.1
---
 nixos/modules/services/misc/paperless.nix |  5 +--
 pkgs/by-name/pa/paperless-ngx/package.nix | 54 +++++++++++++----------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix
index db69d7424275..4a54e637507a 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@@ -31,10 +31,7 @@ let
     PAPERLESS_REDIS = "unix://${redisServer.unixSocket}";
   }
   // lib.optionalAttrs (cfg.settings.PAPERLESS_ENABLE_NLTK or true) {
-    PAPERLESS_NLTK_DIR = pkgs.symlinkJoin {
-      name = "paperless_ngx_nltk_data";
-      paths = cfg.package.nltkData;
-    };
+    PAPERLESS_NLTK_DIR = cfg.package.nltkDataDir;
   }
   // lib.optionalAttrs (cfg.openMPThreadingWorkaround) {
     OMP_NUM_THREADS = "1";
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 9291d2d9f08f..33a620860457 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -22,34 +22,24 @@
   xcbuild,
   pango,
   pkg-config,
+  symlinkJoin,
   nltk-data,
   xorg,
 }:
 let
-  version = "2.17.1";
+  version = "2.18.1";
 
   src = fetchFromGitHub {
     owner = "paperless-ngx";
     repo = "paperless-ngx";
     tag = "v${version}";
-    hash = "sha256-6FvP/HgomsPxqCtKrZFxMlD2fFyT2e/JII2L7ANiOao=";
+    hash = "sha256-POHF00cV8pl6i1rcwxtZ+Q1AlLybDj6gSlL0lPwSSCo=";
   };
 
   python = python3.override {
     self = python;
     packageOverrides = final: prev: {
-      django = prev.django_5_1;
-
-      # TODO remove when paperless-ngx is updated past 2.17.1
-      imap-tools = prev.imap-tools.overridePythonAttrs {
-        version = "1.10.0";
-        src = fetchFromGitHub {
-          owner = "ikvk";
-          repo = "imap_tools";
-          tag = "v1.10.0";
-          hash = "sha256-lan12cHkoxCKadgyFey4ShcnwFg3Gl/VqKWlYAkvF3Y=";
-        };
-      };
+      django = prev.django_5_2;
 
       # tesseract5 may be overwritten in the paperless module and we need to propagate that to make the closure reduction effective
       ocrmypdf = prev.ocrmypdf.override { tesseract = tesseract5; };
@@ -77,7 +67,7 @@ let
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname version src;
       fetcherVersion = 1;
-      hash = "sha256-VtYYwpMXPAC3g1OESnw3dzLTwiGqJBQcicFZskEucok=";
+      hash = "sha256-bx/jXlG3lRiwKyz1M0dU00Xn5xaeALSIxIAGzo8gAgo=";
     };
 
     nativeBuildInputs = [
@@ -108,7 +98,8 @@ let
       node-gyp rebuild
       popd
 
-      pnpm run build --configuration production
+      # cat forcefully disables angular cli's spinner which doesn't work with nix' tty which is 0x0
+      pnpm run build --configuration production | cat
 
       runHook postBuild
     '';
@@ -117,7 +108,7 @@ let
     checkPhase = ''
       runHook preCheck
 
-      pnpm run test
+      pnpm run test | cat
 
       runHook postCheck
     '';
@@ -131,6 +122,15 @@ let
       runHook postInstall
     '';
   });
+
+  nltkDataDir = symlinkJoin {
+    name = "paperless_ngx_nltk_data";
+    paths = with nltk-data; [
+      punkt-tab
+      snowball-data
+      stopwords
+    ];
+  };
 in
 python.pkgs.buildPythonApplication rec {
   pname = "paperless-ngx";
@@ -154,14 +154,17 @@ python.pkgs.buildPythonApplication rec {
   ];
 
   pythonRelaxDeps = [
-    "django-allauth"
-    "pathvalidate"
+    # https://github.com/NixOS/nixpkgs/pull/432489
+    "django"
+    "scikit-learn"
+
     "redis"
   ];
 
   dependencies =
     with python.pkgs;
     [
+      babel
       bleach
       channels
       channels-redis
@@ -180,6 +183,7 @@ python.pkgs.buildPythonApplication rec {
         }
       ))
       django-auditlog
+      django-cachalot
       django-celery-results
       django-compression-middleware
       django-cors-headers
@@ -208,6 +212,7 @@ python.pkgs.buildPythonApplication rec {
       pathvalidate
       pdf2image
       psycopg
+      psycopg-pool
       python-dateutil
       python-dotenv
       python-gnupg
@@ -296,6 +301,7 @@ python.pkgs.buildPythonApplication rec {
     export PATH="${path}:$PATH"
     export HOME=$(mktemp -d)
     export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS"
+    export PAPERLESS_NLTK_DIR=${passthru.nltkDataDir}
   '';
 
   disabledTests = [
@@ -313,6 +319,10 @@ python.pkgs.buildPythonApplication rec {
     # Favicon tests fail due to static file handling in the test environment
     "test_favicon_view"
     "test_favicon_view_missing_file"
+    # Requires DNS
+    "test_send_webhook_data_or_json"
+    "test_workflow_webhook_send_webhook_retry"
+    "test_workflow_webhook_send_webhook_task"
   ];
 
   doCheck = !stdenv.hostPlatform.isDarwin;
@@ -320,15 +330,11 @@ python.pkgs.buildPythonApplication rec {
   passthru = {
     inherit
       frontend
+      nltkDataDir
       path
       python
       tesseract5
       ;
-    nltkData = with nltk-data; [
-      punkt-tab
-      snowball-data
-      stopwords
-    ];
     tests = { inherit (nixosTests) paperless; };
   };
 

From 8778dc2ef6062c90a43e21326e8e50e04b6481c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 22 Aug 2025 00:11:54 +0200
Subject: [PATCH 2743/3724] python3Packages.rq: disable checkPhase on darwin

> Could not connect to Valkey at /nix/build/nix-build-python3.12-rq-2.4.drv-12323-615855295/run/redis.sock: No such file or directory
---
 pkgs/development/python-modules/rq/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix
index fd802dd70f70..fdd697e9d76a 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -49,6 +49,9 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
+  # redisTestHook does not work on darwin-x86_64
+  doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
+
   disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
     # PermissionError: [Errno 13] Permission denied: '/tmp/rq-tests.txt'
     "test_deleted_jobs_arent_executed"

From c602abd9b9c4509e6c10776dfc0279c7d1ca3a2a Mon Sep 17 00:00:00 2001
From: wrrrzr <wozrer@proton.me>
Date: Fri, 22 Aug 2025 16:26:05 +0300
Subject: [PATCH 2744/3724] maintainers: add wozrer

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c3da2a5e38a4..019b2d8c7f21 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27618,6 +27618,12 @@
     githubId = 25372613;
     name = "Woze Parrot";
   };
+  wozrer = {
+    name = "wozrer";
+    email = "wozrer@proton.me";
+    github = "wrrrzr";
+    githubId = 161970349;
+  };
   wr0belj = {
     name = "Jakub Wróbel";
     email = "wrobel.jakub@protonmail.com";

From 0bb8e9c6cee90f2bcca4a09069c4c99ed3260297 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 13:27:50 +0000
Subject: [PATCH 2745/3724] python3Packages.openstacksdk: 4.6.0 -> 4.7.0

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

diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix
index 32a027892633..36761e2210ff 100644
--- a/pkgs/development/python-modules/openstacksdk/default.nix
+++ b/pkgs/development/python-modules/openstacksdk/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "openstacksdk";
-  version = "4.6.0";
+  version = "4.7.0";
   pyproject = true;
 
   outputs = [
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5H4WbEcy6a6mUijmGNSQ5L5d8GUmobleLVmV19CXfT0=";
+    hash = "sha256-7muFOJez7vNH+lBCGHF0AmrRgalf9uaTOEH1+caXsb0=";
   };
 
   postPatch = ''

From cf9404b31580f213935838e10312ebcce118d059 Mon Sep 17 00:00:00 2001
From: wrrrzr <wozrer@proton.me>
Date: Fri, 22 Aug 2025 16:30:40 +0300
Subject: [PATCH 2746/3724] nixos/byedpi: init

---
 .../manual/release-notes/rl-2511.section.md   |  2 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/networking/byedpi.nix  | 53 +++++++++++++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 nixos/modules/services/networking/byedpi.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 774d0edbe659..958fc683be72 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -18,6 +18,8 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
+- [byedpi](https://github.com/hufrea/byedpi), a DPI bypass service. Available as [services.byedpi](#opt-services.byedpi.enable).
+
 - [Overseerr](https://overseerr.dev), a request management and media discovery tool for the Plex ecosystem. Available as [services.overseerr](#opt-services.overseerr.enable).
 
 - [gtklock](https://github.com/jovanlanik/gtklock), a GTK-based lockscreen for Wayland. Available as [programs.gtklock](#opt-programs.gtklock.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 23e93f20e0cd..4f5224274d1a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1094,6 +1094,7 @@
   ./services/networking/bitlbee.nix
   ./services/networking/blockbook-frontend.nix
   ./services/networking/blocky.nix
+  ./services/networking/byedpi.nix
   ./services/networking/cato-client.nix
   ./services/networking/centrifugo.nix
   ./services/networking/cgit.nix
diff --git a/nixos/modules/services/networking/byedpi.nix b/nixos/modules/services/networking/byedpi.nix
new file mode 100644
index 000000000000..92aed5643dfd
--- /dev/null
+++ b/nixos/modules/services/networking/byedpi.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.byedpi;
+in
+{
+  options.services.byedpi = {
+    enable = lib.mkEnableOption "the ByeDPI service";
+    package = lib.mkPackageOption pkgs "byedpi" { };
+    extraArgs = lib.mkOption {
+      type = with lib.types; listOf str;
+      default = [ ];
+      example = [
+        "--split"
+        "1"
+        "--disorder"
+        "3+s"
+        "--mod-http=h,d"
+        "--auto=torst"
+        "--tlsrec"
+        "1+s"
+      ];
+      description = "Extra command line arguments.";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    systemd.services.byedpi = {
+      description = "ByeDPI";
+      wantedBy = [ "default.target" ];
+      wants = [ "network-online.target" ];
+      after = [
+        "network-online.target"
+        "nss-lookup.target"
+      ];
+      serviceConfig = {
+        ExecStart = lib.escapeShellArgs ([ (lib.getExe cfg.package) ] ++ cfg.extraArgs);
+        NoNewPrivileges = "yes";
+        StandardOutput = "null";
+        StandardError = "journal";
+        TimeoutStopSec = "5s";
+        PrivateTmp = "true";
+        ProtectSystem = "full";
+      };
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ wozrer ];
+}

From 55024503f61c7363a1ab80824decf75d549d0129 Mon Sep 17 00:00:00 2001
From: Julian Hoch <julian.hoch@hoch-software.ch>
Date: Fri, 22 Aug 2025 14:38:43 +0200
Subject: [PATCH 2747/3724] xscreenruler: init at 1.0.2

---
 maintainers/maintainer-list.nix          | 10 +++---
 pkgs/by-name/xs/xscreenruler/package.nix | 43 ++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/xs/xscreenruler/package.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7c486fd57a97..800fa2d99174 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12840,17 +12840,17 @@
     github = "juliamertz";
     githubId = 35079666;
   };
+  julian-hoch = {
+    name = "Julian Hoch";
+    github = "julian-hoch";
+    githubId = 95583314;
+  };
   JulianFP = {
     name = "Julian Partanen";
     github = "JulianFP";
     githubId = 70963316;
     keys = [ { fingerprint = "C61D 7747 43DE EF05 4E4A  3AC1 6FE2 79EB 5C9F 3466"; } ];
   };
-  julian-hoch = {
-    name = "Julian Hoch";
-    github = "julian-hoch";
-    githubId = 95583314;
-  };
   juliendehos = {
     email = "dehos@lisic.univ-littoral.fr";
     github = "juliendehos";
diff --git a/pkgs/by-name/xs/xscreenruler/package.nix b/pkgs/by-name/xs/xscreenruler/package.nix
new file mode 100644
index 000000000000..ea3d54c88be5
--- /dev/null
+++ b/pkgs/by-name/xs/xscreenruler/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  xorg,
+  makeWrapper,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xscreenruler";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "julian-hoch";
+    repo = "xscreenruler";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oRbZ8r9EOPcLuuX8VyCBNt6ljdnko/EV8C8aeR85xYU=";
+  };
+
+  buildInputs = [ xorg.libX11 ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 xscreenruler -t $out/bin
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/xscreenruler \
+      --prefix PATH : ${lib.makeBinPath [ xorg.xsetroot ]}
+  '';
+
+  meta = {
+    description = "Simple screen ruler using xlib";
+    homepage = "https://github.com/julian-hoch/xscreenruler";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.julian-hoch ];
+  };
+})

From bd8730182360577a13948e818dff60c24e10652b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Guimmara?=
 <sebastien.guimmara@oslandia.com>
Date: Fri, 22 Aug 2025 15:44:13 +0200
Subject: [PATCH 2748/3724] docker-color-output: fix binary name

---
 pkgs/by-name/do/docker-color-output/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/do/docker-color-output/package.nix b/pkgs/by-name/do/docker-color-output/package.nix
index 9008d9ac70f1..a5a29249beb4 100644
--- a/pkgs/by-name/do/docker-color-output/package.nix
+++ b/pkgs/by-name/do/docker-color-output/package.nix
@@ -16,6 +16,10 @@ buildGoModule rec {
     hash = "sha256-r11HNRXnmTC1CJR871sX7xW9ts9KAu1+azwIwXH09qg=";
   };
 
+  postInstall = ''
+    mv $out/bin/cli $out/bin/docker-color-output
+  '';
+
   vendorHash = null;
 
   passthru = {

From 3d9a85af645916f15be3c773a0b4903335205cb4 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 22 Aug 2025 14:40:37 +0100
Subject: [PATCH 2749/3724] qpdf: disable timestamp test for now

---
 .../qp/qpdf/disable-timestamp-test.patch      | 31 +++++++++++++++++++
 pkgs/by-name/qp/qpdf/package.nix              | 10 ++++++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/qp/qpdf/disable-timestamp-test.patch

diff --git a/pkgs/by-name/qp/qpdf/disable-timestamp-test.patch b/pkgs/by-name/qp/qpdf/disable-timestamp-test.patch
new file mode 100644
index 000000000000..97509f27a318
--- /dev/null
+++ b/pkgs/by-name/qp/qpdf/disable-timestamp-test.patch
@@ -0,0 +1,31 @@
+diff --git a/libtests/qtest/qutil/qutil.out b/libtests/qtest/qutil/qutil.out
+index a5f7b108c7..08c6c2eccc 100644
+--- a/libtests/qtest/qutil/qutil.out
++++ b/libtests/qtest/qutil/qutil.out
+@@ -126,13 +126,6 @@
+ create file
+ rename over existing
+ delete file
+----- timestamp
+-D:20210209144925-05'00'
+-2021-02-09T14:49:25-05:00
+-D:20210210011925+05'30'
+-2021-02-10T01:19:25+05:30
+-D:20210209191925Z
+-2021-02-09T19:19:25Z
+ ---- is_long_long
+ done
+ ---- memory usage
+diff --git a/libtests/qutil.cc b/libtests/qutil.cc
+index 78ae82c8e3..daa9281a19 100644
+--- a/libtests/qutil.cc
++++ b/libtests/qutil.cc
+@@ -766,8 +766,6 @@
+         hex_encode_decode_test();
+         std::cout << "---- rename/delete" << std::endl;
+         rename_delete_test();
+-        std::cout << "---- timestamp" << std::endl;
+-        timestamp_test();
+         std::cout << "---- is_long_long" << std::endl;
+         is_long_long_test();
+         std::cout << "---- memory usage" << std::endl;
diff --git a/pkgs/by-name/qp/qpdf/package.nix b/pkgs/by-name/qp/qpdf/package.nix
index 5531aff39c17..f865daf1c4f4 100644
--- a/pkgs/by-name/qp/qpdf/package.nix
+++ b/pkgs/by-name/qp/qpdf/package.nix
@@ -64,6 +64,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
+  # Cursed system‐dependent(?!) failure with libc++ because another
+  # test in the same process sets the global locale; skip for now.
+  #
+  # See:
+  # * <https://github.com/llvm/llvm-project/issues/39399>
+  # * <https://github.com/llvm/llvm-project/issues/123309>
+  ${if stdenv.cc.libcxx != null then "patches" else null} = [
+    ./disable-timestamp-test.patch
+  ];
+
   passthru.tests = {
     pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
     inherit (python3.pkgs) pikepdf;

From c9a4e8bee4ca479a01badc5b2f7a57539a76f030 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 14:03:00 +0000
Subject: [PATCH 2750/3724] libsupermesh: 2025.3.0 -> 2025.4

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

diff --git a/pkgs/by-name/li/libsupermesh/package.nix b/pkgs/by-name/li/libsupermesh/package.nix
index ea15c72ccf21..3608367671c8 100644
--- a/pkgs/by-name/li/libsupermesh/package.nix
+++ b/pkgs/by-name/li/libsupermesh/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libsupermesh";
-  version = "2025.3.0";
+  version = "2025.4";
 
   src = fetchFromGitHub {
     owner = "firedrakeproject";
     repo = "libsupermesh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RKBi89bUhkbRATaSB8629D+/NeYE3YNDIMEGzSK8z04=";
+    hash = "sha256-VIGfuSVneCBapZyU0GXyi6isUSdhD2Ylm4mCymSvzbo=";
   };
 
   strictDeps = true;

From c5728e977981af067c074685487225fb9c31bd77 Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Fri, 22 Aug 2025 16:33:14 +0200
Subject: [PATCH 2751/3724] sdl2-compat: fix cross build on mingw

---
 pkgs/by-name/sd/sdl2-compat/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix
index a5d373c12d89..e8890a344cfa 100644
--- a/pkgs/by-name/sd/sdl2-compat/package.nix
+++ b/pkgs/by-name/sd/sdl2-compat/package.nix
@@ -20,6 +20,8 @@
   SDL_compat,
   ffmpeg,
   qemu,
+
+  x11Support ? !stdenv.hostPlatform.isAndroid && !stdenv.hostPlatform.isWindows,
 }:
 let
   # tray support on sdl3 pulls in gtk3, which is quite an expensive dependency.
@@ -44,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     sdl3'
-    libX11
-  ];
+  ]
+  ++ lib.optional x11Support libX11;
 
   checkInputs = [ libGL ];
 

From 04f6885f1063fb165ac8518c6852b030287f1c2a Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 22 Aug 2025 10:35:52 -0400
Subject: [PATCH 2752/3724] ejabberd: 25.07 -> 25.08

https://github.com/processone/ejabberd/releases/tag/25.08
---
 pkgs/by-name/ej/ejabberd/package.nix    |  4 +--
 pkgs/by-name/ej/ejabberd/rebar-deps.nix | 42 ++++++++++++-------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix
index 18cac7c484c6..d8688bda27ca 100644
--- a/pkgs/by-name/ej/ejabberd/package.nix
+++ b/pkgs/by-name/ej/ejabberd/package.nix
@@ -141,7 +141,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ejabberd";
-  version = "25.07";
+  version = "25.08";
 
   nativeBuildInputs = [
     makeWrapper
@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "processone";
     repo = "ejabberd";
     tag = finalAttrs.version;
-    hash = "sha256-DDvxmRennd9tAC9LqV8eAAzcF+kZemvgsOviWD9CHlM=";
+    hash = "sha256-nipFr4ezo2prlpLfAW8iu8HAG8nhkIXXiAbsoM7QKTM=";
   };
 
   passthru.tests = {
diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
index 0742da7d2665..5f102ca8151a 100644
--- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix
+++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
@@ -44,21 +44,21 @@ let
     };
     yconf = builder {
       name = "yconf";
-      version = "1.0.20";
+      version = "1.0.21";
       src = fetchHex {
         pkg = "yconf";
-        version = "1.0.20";
-        sha256 = "sha256-8rPXMHVvwuSv0cCwq277mfDkSJUtJdwV7XWsFjW/iII=";
+        version = "1.0.21";
+        sha256 = "sha256-xSSl8f2Gh12FtGnMLjaMIE+XzKHDkYc24h9QAcAdCWw=";
       };
       beamDeps = [ fast_yaml ];
     };
     xmpp = builder {
       name = "xmpp";
-      version = "1.11.0";
+      version = "1.11.1";
       src = fetchHex {
         pkg = "xmpp";
-        version = "1.11.0";
-        sha256 = "sha256-NKGR1qO3To8KQjRvhZ4sq1s6Kuflwo85Lly1ZhLnzoU=";
+        version = "1.11.1";
+        sha256 = "sha256-pckz35BKs87BVCXaM05BDOhOw657ge/gaeXbNop7NxY=";
       };
       beamDeps = [
         ezlib
@@ -71,11 +71,11 @@ let
     };
     stun = builder {
       name = "stun";
-      version = "1.2.20";
+      version = "1.2.21";
       src = fetchHex {
         pkg = "stun";
-        version = "1.2.20";
-        sha256 = "sha256-eeSfgmpPfVIsk5q2M9k1x519ayKeTLfgX2LzO1AXdBQ=";
+        version = "1.2.21";
+        sha256 = "sha256-PX/o77nQWyQKaqmmv4uLe/8tgCiV0XBEPFiJh9weEtk=";
       };
       beamDeps = [
         fast_tls
@@ -124,11 +124,11 @@ let
     };
     p1_pgsql = builder {
       name = "p1_pgsql";
-      version = "1.1.34";
+      version = "1.1.35";
       src = fetchHex {
         pkg = "p1_pgsql";
-        version = "1.1.34";
-        sha256 = "sha256-yw4y4IbJw10OPpZuOGPYMnN8e00rXxRzFqRlwLJD6n8=";
+        version = "1.1.35";
+        sha256 = "sha256-6ZWURGxBHGYGlnlbBiM29cS9gARR2PYgu01M4wTiVcI=";
       };
       beamDeps = [ xmpp ];
     };
@@ -154,11 +154,11 @@ let
     };
     p1_acme = builder {
       name = "p1_acme";
-      version = "1.0.27";
+      version = "1.0.28";
       src = fetchHex {
         pkg = "p1_acme";
-        version = "1.0.27";
-        sha256 = "sha256-qmS2qIVrGiKaEovqJ2Md4uGiIZg146gz+hETcUOo13M=";
+        version = "1.0.28";
+        sha256 = "sha256-zmhpht4/nV/Sha/odSPLRTKaNJxsa+eswe2RZyXUZCM=";
       };
       beamDeps = [
         base64url
@@ -230,11 +230,11 @@ let
     };
     fast_tls = builder {
       name = "fast_tls";
-      version = "1.1.24";
+      version = "1.1.25";
       src = fetchHex {
         pkg = "fast_tls";
-        version = "1.1.24";
-        sha256 = "sha256-//iK2jn60QRkVnoWBkP0Up70rtSdFWkZ9dH0FbbNu7Y=";
+        version = "1.1.25";
+        sha256 = "sha256-WeGDtXQOZw4CuKpr5nO153eeX+W/zGef4tSZPRlJqCE=";
       };
       beamDeps = [ p1_utils ];
     };
@@ -250,11 +250,11 @@ let
     };
     esip = builder {
       name = "esip";
-      version = "1.0.58";
+      version = "1.0.59";
       src = fetchHex {
         pkg = "esip";
-        version = "1.0.58";
-        sha256 = "sha256-4PQgSl7eD6fQDaPMQvZECqNiusf69Tb3HqKfo/D6fHU=";
+        version = "1.0.59";
+        sha256 = "sha256-C98uPDSdwLFE8XMVAynmdcalGsRz16Cy42IkX6rT++Y=";
       };
       beamDeps = [
         fast_tls

From eb72906168b24bffe342ee3e03a9149b64916f2f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 21 Aug 2025 23:39:07 +0800
Subject: [PATCH 2753/3724] spidermonkey_140: init at 140.2.0

---
 .../interpreters/spidermonkey/140.nix         |  4 ++++
 .../interpreters/spidermonkey/common.nix      | 23 ++++++++++++++++++-
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/spidermonkey/140.nix

diff --git a/pkgs/development/interpreters/spidermonkey/140.nix b/pkgs/development/interpreters/spidermonkey/140.nix
new file mode 100644
index 000000000000..48b9a6fb289e
--- /dev/null
+++ b/pkgs/development/interpreters/spidermonkey/140.nix
@@ -0,0 +1,4 @@
+import ./common.nix {
+  version = "140.2.0";
+  hash = "sha512-5Fl8TYOuGoT86SSP5splKvbDYVYH/IlzvZF7/b0qu87Kk3/kxinAzcifoKXIRrXi2KS0Tav3/rIB3rOC3gzMWw==";
+}
diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index be2a146097ad..46831d9ec46d 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -24,6 +24,7 @@
 
   # runtime
   icu75,
+  icu77,
   nspr,
   readline,
   zlib,
@@ -65,6 +66,14 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://src.fedoraproject.org/rpms/mozjs91/raw/e3729167646775e60a3d8c602c0412e04f206baf/f/0001-Python-Build-Use-r-instead-of-rU-file-read-modes.patch";
         hash = "sha256-WgDIBidB9XNQ/+HacK7jxWnjOF8PEUt5eB0+Aubtl48=";
       })
+    ]
+    ++ lib.optionals (lib.versionAtLeast version "140") [
+      # mozjs-140.pc does not contain -DXP_UNIX on Linux
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=1973994
+      (fetchpatch {
+        url = "https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch";
+        hash = "sha256-SsyO5g7wlrxE7y2+VTHfmUDamofeZVqge8fv2y0ZhuU=";
+      })
     ];
 
   nativeBuildInputs = [
@@ -89,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    icu75
+    (if (lib.versionAtLeast version "140") then icu77 else icu75)
     nspr
     readline
     zlib
@@ -120,6 +129,12 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (lib.versionAtLeast version "91") [
     "--disable-debug"
   ]
+  ++ lib.optionals (lib.versionAtLeast version "140") [
+    # For pkgconfig file.
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1907030
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1957023
+    "--includedir=${placeholder "dev"}/include"
+  ]
   ++ [
     "--disable-jemalloc"
     "--disable-strip"
@@ -177,6 +192,11 @@ stdenv.mkDerivation (finalAttrs: {
       configureScript=../js/src/configure
     '';
 
+  env = lib.optionalAttrs (lib.versionAtLeast version "140") {
+    # '-Wformat-security' ignored without '-Wformat'
+    NIX_CFLAGS_COMPILE = "-Wformat";
+  };
+
   # Remove unnecessary static lib
   preFixup = ''
     moveToOutput bin/js${lib.versions.major version}-config "$dev"
@@ -196,6 +216,7 @@ stdenv.mkDerivation (finalAttrs: {
       abbradar
       lostnet
       catap
+      bobby285271
     ];
     broken = stdenv.hostPlatform.isDarwin; # 91 is broken, >=115 requires SDK 13.3 (see #242666).
     platforms = platforms.unix;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c60ad7b5884..3176791f7d24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6545,10 +6545,12 @@ with pkgs;
       spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { };
       spidermonkey_115 = callPackage ../development/interpreters/spidermonkey/115.nix { };
       spidermonkey_128 = callPackage ../development/interpreters/spidermonkey/128.nix { };
+      spidermonkey_140 = callPackage ../development/interpreters/spidermonkey/140.nix { };
     })
     spidermonkey_91
     spidermonkey_115
     spidermonkey_128
+    spidermonkey_140
     ;
 
   supercollider = libsForQt5.callPackage ../development/interpreters/supercollider {

From 8d7a928c05aa1704ad873c3e71767ba08749b1ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 14:42:45 +0000
Subject: [PATCH 2754/3724] crowdin-cli: 4.9.1 -> 4.10.0

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

diff --git a/pkgs/by-name/cr/crowdin-cli/package.nix b/pkgs/by-name/cr/crowdin-cli/package.nix
index 42718799e882..b598c38674be 100644
--- a/pkgs/by-name/cr/crowdin-cli/package.nix
+++ b/pkgs/by-name/cr/crowdin-cli/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "crowdin-cli";
-  version = "4.9.1";
+  version = "4.10.0";
 
   src = fetchurl {
     url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
-    hash = "sha256-VU3kG8Y/p6bM/kkExmP6Mww46d1kxpljhNIRNhUY6kg=";
+    hash = "sha256-xvDF9vptkGXkPSHntPrNX0Z4pYmS6Bu4jEswTk/4uhE=";
   };
 
   nativeBuildInputs = [

From 17ef695a1ebfd1e51d1782651b1578cdabbc2f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Fri, 22 Aug 2025 21:29:17 +0700
Subject: [PATCH 2755/3724] =?UTF-8?q?ocamlPackages.multicore-bench:=200.1.?=
 =?UTF-8?q?4=20=E2=86=92=200.1.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/multicore-bench/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/multicore-bench/default.nix b/pkgs/development/ocaml-modules/multicore-bench/default.nix
index 7f367f983eea..4e7ecf88a560 100644
--- a/pkgs/development/ocaml-modules/multicore-bench/default.nix
+++ b/pkgs/development/ocaml-modules/multicore-bench/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildDunePackage,
   fetchurl,
+  backoff,
   domain-local-await,
   mtime,
   multicore-magic,
@@ -10,14 +11,15 @@
 
 buildDunePackage rec {
   pname = "multicore-bench";
-  version = "0.1.4";
+  version = "0.1.7";
 
   src = fetchurl {
     url = "https://github.com/ocaml-multicore/multicore-bench/releases/download/${version}/multicore-bench-${version}.tbz";
-    hash = "sha256-iCx5QvhYo/e53cW23Sza2as4aez4HeESVvLPF1DW85A=";
+    hash = "sha256-vrp9yiuTwhijhYjeDKPFRGyh/5LeydKWJSyMLZRRXIM=";
   };
 
   propagatedBuildInputs = [
+    backoff
     domain-local-await
     mtime
     multicore-magic

From 97f917f288cf24a891c7902f131879d6337965bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 14:57:23 +0000
Subject: [PATCH 2756/3724] okteto: 3.10.0 -> 3.10.1

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

diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix
index 19217b79f422..a23d8913633f 100644
--- a/pkgs/by-name/ok/okteto/package.nix
+++ b/pkgs/by-name/ok/okteto/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "okteto";
-  version = "3.10.0";
+  version = "3.10.1";
 
   src = fetchFromGitHub {
     owner = "okteto";
     repo = "okteto";
     tag = finalAttrs.version;
-    hash = "sha256-ZMvZP7p/Ew3TvPLV5U1v0TG0FCWU8VTAcSMtOJLrWVQ=";
+    hash = "sha256-gYdws+cUJpr0tIztO9tjc/dVtBWau6HdriP/Y8p+kOQ=";
   };
 
   vendorHash = "sha256-Pun9LgQAv/wlX0CwU4AJuEkMeZgPTL+ExmUevURvjYE=";

From dfe0f0e79192504560fa18c3dc867c7e00dca818 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 14:57:42 +0000
Subject: [PATCH 2757/3724] emmylua-doc-cli: 0.11.0 -> 0.12.0

---
 pkgs/by-name/em/emmylua-doc-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix
index 03d11fdd46f0..6f113229a87d 100644
--- a/pkgs/by-name/em/emmylua-doc-cli/package.nix
+++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix
@@ -6,18 +6,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "emmylua_doc_cli";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "EmmyLuaLs";
     repo = "emmylua-analyzer-rust";
     tag = finalAttrs.version;
-    hash = "sha256-HbjGOvK/b7SyhNF/Jff0SgJdOfSbzjkDkqQwuflOABA=";
+    hash = "sha256-IXoiXfRnGOZQ7c8AJaK8OGjqp1bczd/tKjtpbYdCZlU=";
   };
 
   buildAndTestSubdir = "crates/emmylua_doc_cli";
 
-  cargoHash = "sha256-3x71VNWCTFb75STx8w/T++dLo1s2FwNhFm+lyZHS7qI=";
+  cargoHash = "sha256-7QQipbnqelLdzQr+lIORyQNM9SS5yHaJLQ31M52lYCw=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From c32c0a555ec748e88b5ab2c51f1d6832ec22681a Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2758/3724] cudaPackages_11: drop

---
 doc/release-notes/rl-2511.section.md          |    2 +
 pkgs/by-name/ll/llama-cpp/package.nix         |    2 +-
 pkgs/by-name/wh/whisper-cpp/package.nix       |    2 +-
 .../cuda-modules/_cuda/db/bootstrap/cuda.nix  |   16 -
 .../cuda-modules/_cuda/db/bootstrap/nvcc.nix  |   13 -
 .../cuda-modules/_cuda/fixups/cuda_gdb.nix    |    3 +-
 .../cuda-modules/_cuda/fixups/libcusolver.nix |   12 +-
 .../cuda-modules/_cuda/fixups/libcusparse.nix |    8 +-
 .../_cuda/fixups/nsight_compute.nix           |    4 +-
 .../cuda-library-samples/generic.nix          |   34 +-
 .../cuda-modules/cuda-samples/extension.nix   |    1 -
 .../cuda-modules/cuda/extension.nix           |    1 -
 .../cuda/manifests/feature_11.8.0.json        | 1540 -----------------
 .../cuda/manifests/redistrib_11.8.0.json      | 1074 ------------
 .../cuda-modules/cudatoolkit/default.nix      |   93 +-
 .../cuda-modules/cudnn/releases.nix           |  105 --
 .../cuda-modules/packages/backendStdenv.nix   |    4 +-
 .../cuda-modules/packages/nccl-tests.nix      |    2 -
 .../cuda-modules/packages/nccl.nix            |   18 +-
 .../cuda-modules/packages/saxpy/package.nix   |    4 +-
 .../cuda-modules/tensorrt/releases.nix        |   48 -
 .../python-modules/tensorflow/default.nix     |    9 +-
 .../python-modules/tensorrt/default.nix       |    1 -
 pkgs/test/cuda/default.nix                    |    3 -
 pkgs/top-level/aliases.nix                    |   10 +
 pkgs/top-level/all-packages.nix               |    4 -
 pkgs/top-level/python-packages.nix            |    3 +-
 27 files changed, 94 insertions(+), 2922 deletions(-)
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/feature_11.8.0.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/redistrib_11.8.0.json

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 885948c0ea3a..eb34a070f3e8 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -69,6 +69,8 @@
 
 - `mongodb-6_0` was removed as it is end of life as of 2025-07-31.
 
+- CUDA versions below 12.0 have been removed, as they are unmaintained upstream and depend on end‐of‐life compilers.
+
 - `vmware-horizon-client` was renamed to `omnissa-horizon-client`, following [VMware's sale of their end-user business to Omnissa](https://www.omnissa.com/insights/introducing-omnissa-the-former-vmware-end-user-computing-business/). The binary has been renamed from `vmware-view` to `horizon-client`.
 
 - `neovimUtils.makeNeovimConfig` now uses `customLuaRC` parameter instead of accepting `luaRcContent`. The old usage is deprecated but still works with a warning.
diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 70b335d1fe24..ad626ee7c4ce 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -40,7 +40,7 @@
 let
   # It's necessary to consistently use backendStdenv when building with CUDA support,
   # otherwise we get libstdc++ errors downstream.
-  # cuda imposes an upper bound on the gcc version, e.g. the latest gcc compatible with cudaPackages_11 is gcc11
+  # cuda imposes an upper bound on the gcc version
   effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv;
   inherit (lib)
     cmakeBool
diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix
index b0aedd9ec344..95d31ad3b662 100644
--- a/pkgs/by-name/wh/whisper-cpp/package.nix
+++ b/pkgs/by-name/wh/whisper-cpp/package.nix
@@ -38,7 +38,7 @@ assert coreMLSupport -> stdenv.hostPlatform.isDarwin;
 let
   # It's necessary to consistently use backendStdenv when building with CUDA support,
   # otherwise we get libstdc++ errors downstream.
-  # cuda imposes an upper bound on the gcc version, e.g. the latest gcc compatible with cudaPackages_11 is gcc11
+  # cuda imposes an upper bound on the gcc version
   effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv;
   inherit (lib)
     cmakeBool
diff --git a/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
index e852bc85b639..1d6dece1e8ed 100644
--- a/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
+++ b/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
@@ -100,22 +100,6 @@
         }
       )
       {
-        # Tesla K40
-        "3.5" = {
-          archName = "Kepler";
-          minCudaMajorMinorVersion = "10.0";
-          dontDefaultAfterCudaMajorMinorVersion = "11.0";
-          maxCudaMajorMinorVersion = "11.8";
-        };
-
-        # Tesla K80
-        "3.7" = {
-          archName = "Kepler";
-          minCudaMajorMinorVersion = "10.0";
-          dontDefaultAfterCudaMajorMinorVersion = "11.0";
-          maxCudaMajorMinorVersion = "11.8";
-        };
-
         # Tesla/Quadro M series
         "5.0" = {
           archName = "Maxwell";
diff --git a/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
index ed6ba978d882..f574405150cb 100644
--- a/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
+++ b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
@@ -28,19 +28,6 @@
       ```
   */
   nvccCompatibilities = {
-    # Added support for Clang 14
-    # https://docs.nvidia.com/cuda/archive/11.8.0/cuda-installation-guide-linux/index.html#system-requirements
-    "11.8" = {
-      clang = {
-        maxMajorVersion = "14";
-        minMajorVersion = "7";
-      };
-      gcc = {
-        maxMajorVersion = "11";
-        minMajorVersion = "6";
-      };
-    };
-
     # Added support for GCC 12
     # https://docs.nvidia.com/cuda/archive/12.0.1/cuda-installation-guide-linux/index.html#system-requirements
     "12.0" = {
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix
index c76e8e131c9d..0e551bb397c5 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix
@@ -13,8 +13,7 @@
 prevAttrs: {
   buildInputs =
     prevAttrs.buildInputs or [ ]
-    # x86_64 only needs gmp from 12.0 and on
-    ++ lib.lists.optionals (cudaAtLeast "12.0") [ gmp ]
+    ++ [ gmp ]
     # Additional dependencies for CUDA 12.5 and later, which
     # support multiple Python versions.
     ++ lib.lists.optionals (cudaAtLeast "12.5") [
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix
index 90378d67e09f..5d3e7a1bc926 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix
@@ -8,16 +8,16 @@
 prevAttrs: {
   buildInputs =
     prevAttrs.buildInputs or [ ]
-    # Always depends on this
-    ++ [ libcublas ]
-    # Dependency from 12.0 and on
-    ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink ]
+    # Always depends on these
+    ++ [
+      libcublas
+      libnvjitlink
+    ]
     # Dependency from 12.1 and on
     ++ lib.lists.optionals (cudaAtLeast "12.1") [ libcusparse ];
 
   brokenConditions = prevAttrs.brokenConditions or { } // {
-    "libnvjitlink missing (CUDA >= 12.0)" =
-      !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink != null));
+    "libnvjitlink missing" = !(libnvjitlink != null);
     "libcusparse missing (CUDA >= 12.1)" =
       !(cudaAtLeast "12.1" -> (libcusparse != null && libcusparse != null));
   };
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/libcusparse.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcusparse.nix
index 45893e0ca6de..e895e568d784 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/libcusparse.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/libcusparse.nix
@@ -4,13 +4,9 @@
   libnvjitlink ? null,
 }:
 prevAttrs: {
-  buildInputs =
-    prevAttrs.buildInputs or [ ]
-    # Dependency from 12.0 and on
-    ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink ];
+  buildInputs = prevAttrs.buildInputs or [ ] ++ [ libnvjitlink ];
 
   brokenConditions = prevAttrs.brokenConditions or { } // {
-    "libnvjitlink missing (CUDA >= 12.0)" =
-      !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink != null));
+    "libnvjitlink missing (CUDA >= 12.0)" = libnvjitlink == null;
   };
 }
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
index 32f12685520a..584fa362d3f2 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
@@ -42,7 +42,7 @@ in
       gst_all_1.gstreamer
       gst_all_1.gst-plugins-base
     ]
-    ++ lib.optionals (cudaAtLeast "12.0" && cudaOlder "12.7") [
+    ++ lib.optionals (cudaOlder "12.7") [
       e2fsprogs
       ucx
     ]
@@ -70,7 +70,7 @@ in
       wrapQtApp "''${!outputBin}/bin/host/${archDir}/ncu-ui.bin"
     ''
     # NOTE(@connorbaker): No idea what this platform is or how to patchelf for it.
-    + lib.optionalString (flags.isJetsonBuild && cudaAtLeast "11.8" && cudaOlder "12.9") ''
+    + lib.optionalString (flags.isJetsonBuild && cudaOlder "12.9") ''
       nixLog "Removing QNX 700 target directory for Jetson builds"
       rm -rfv "''${!outputBin}/target/qnx-700-t210-a64"
     ''
diff --git a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
index 3f3388ff9e6b..a433a52c7394 100644
--- a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
+++ b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
@@ -7,8 +7,6 @@
   cuda_cccl ? null,
   cuda_cudart ? null,
   cuda_nvcc ? null,
-  cudaAtLeast,
-  cudaOlder,
   cudatoolkit,
   cusparselt ? null,
   cutensor ? null,
@@ -100,19 +98,15 @@ in
 
       sourceRoot = "${finalAttrs.src.name}/cuSPARSELt/matmul";
 
-      nativeBuildInputs =
-        prevAttrs.nativeBuildInputs or [ ]
-        ++ [
-          cmake
-          addDriverRunpath
-          (lib.getDev cusparselt)
-          (lib.getDev libcusparse)
-          cuda_nvcc
-          (lib.getDev cuda_cudart) # <cuda_runtime_api.h>
-        ]
-        ++ lib.optionals (cudaAtLeast "12.0") [
-          cuda_cccl # <nv/target>
-        ];
+      nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [
+        cmake
+        addDriverRunpath
+        (lib.getDev cusparselt)
+        (lib.getDev libcusparse)
+        cuda_nvcc
+        (lib.getDev cuda_cudart) # <cuda_runtime_api.h>
+        cuda_cccl # <nv/target>
+      ];
 
       postPatch = prevAttrs.postPatch or "" + ''
         substituteInPlace CMakeLists.txt \
@@ -132,11 +126,11 @@ in
       meta = prevAttrs.meta or { } // {
         broken =
           # Base dependencies
-          (cusparselt == null || libcusparse == null)
-          # CUDA 11.4+ dependencies
-          || (cudaAtLeast "11.4" && (cuda_nvcc == null || cuda_cudart == null))
-          # CUDA 12.0+ dependencies
-          || (cudaAtLeast "12.0" && cuda_cccl == null);
+          cusparselt == null
+          || libcusparse == null
+          || cuda_nvcc == null
+          || cuda_cudart == null
+          || cuda_cccl == null;
       };
     }
   );
diff --git a/pkgs/development/cuda-modules/cuda-samples/extension.nix b/pkgs/development/cuda-modules/cuda-samples/extension.nix
index c89683a15c96..fc6f8fdb52d8 100644
--- a/pkgs/development/cuda-modules/cuda-samples/extension.nix
+++ b/pkgs/development/cuda-modules/cuda-samples/extension.nix
@@ -5,7 +5,6 @@
 }:
 let
   cudaVersionToHash = {
-    "11.8" = "sha256-7+1P8+wqTKUGbCUBXGMDO9PkxYr2+PLDx9W2hXtXbuc=";
     "12.0" = "sha256-Lj2kbdVFrJo5xPYPMiE4BS7Z8gpU5JLKXVJhZABUe/g=";
     "12.1" = "sha256-xE0luOMq46zVsIEWwK4xjLs7NorcTIi9gbfZPVjIlqo=";
     "12.2" = "sha256-pOy0qfDjA/Nr0T9PNKKefK/63gQnJV2MQsN2g3S2yng=";
diff --git a/pkgs/development/cuda-modules/cuda/extension.nix b/pkgs/development/cuda-modules/cuda/extension.nix
index cacf163c833c..c04c5e09e61c 100644
--- a/pkgs/development/cuda-modules/cuda/extension.nix
+++ b/pkgs/development/cuda-modules/cuda/extension.nix
@@ -7,7 +7,6 @@ let
   # https://developer.download.nvidia.com/compute/cuda/redist/
   # Maps a cuda version to the specific version of the manifest.
   cudaVersionMap = {
-    "11.8" = "11.8.0";
     "12.0" = "12.0.1";
     "12.1" = "12.1.1";
     "12.2" = "12.2.2";
diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_11.8.0.json b/pkgs/development/cuda-modules/cuda/manifests/feature_11.8.0.json
deleted file mode 100644
index d2e9958206bf..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/feature_11.8.0.json
+++ /dev/null
@@ -1,1540 +0,0 @@
-{
-  "cuda_cccl": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_compat": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cudart": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuobjdump": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cupti": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": true,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuxxfilt": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_demo_suite": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_documentation": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_gdb": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_memcheck": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nsight": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvcc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvdisasm": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvml_dev": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprof": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprune": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvrtc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvtx": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvvp": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_profiler_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sanitizer_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "fabricmanager": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcublas": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcudla": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufft": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufile": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    }
-  },
-  "libcurand": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusolver": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusparse": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnpp": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvidia_nscq": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjpeg": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_compute": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_nvtx": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_systems": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_vse": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_driver": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_fs": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "visual_studio_integration": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_11.8.0.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_11.8.0.json
deleted file mode 100644
index 132bb19df18c..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/redistrib_11.8.0.json
+++ /dev/null
@@ -1,1074 +0,0 @@
-{
-    "release_date": "2022-10-03",
-    "cuda_cccl": {
-        "name": "CXX Core Compute Libraries",
-        "license": "CUDA Toolkit",
-        "version": "11.8.89",
-        "linux-x86_64": {
-            "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-11.8.89-archive.tar.xz",
-            "sha256": "99d77d9e4c75d5e4663e473577f1871e65bca4ea0b9023f544a3556f0c1776c7",
-            "md5": "01bef0511cad90660a0ff50bbb4615fe",
-            "size": "1006416"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-11.8.89-archive.tar.xz",
-            "sha256": "6d40a8f268ddf8befea453a827a140d6ecd1e02a437eb4ddf4fe1d7d35b66918",
-            "md5": "ea0ba182ff91a9b641b12ea627c593e0",
-            "size": "1006640"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-11.8.89-archive.tar.xz",
-            "sha256": "b7cdd513d4ee079f3ebe78ae1e156b678fa4f7df096459ae5bea8dc63db8a4f4",
-            "md5": "708f4d01e5b5bbc2d0e8bcdea443424e",
-            "size": "1006188"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-11.8.89-archive.zip",
-            "sha256": "548fe5e0cf6a64568a61713cdb475306ce7445d98dfbbe7f910fd78a7f6b616c",
-            "md5": "b345dfa53a38008bf54ddc47af3594f7",
-            "size": "2570742"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-11.8.89-archive.tar.xz",
-            "sha256": "454c6f6e30176e82590b130971b8d49931db4d16c8cd127eb7bc225e348114bd",
-            "md5": "c401a3d74db67fa342e017f041d73736",
-            "size": "1006656"
-        }
-    },
-    "cuda_compat": {
-        "name": "CUDA compat L4T",
-        "license": "CUDA Toolkit",
-        "version": "11.8.31339915",
-        "linux-aarch64": {
-            "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-11.8.31339915-archive.tar.xz",
-            "sha256": "7aa1b62da35b52eaa13e254d1072aff10c907416604e5e5cc1ddcebbfe341dc7",
-            "md5": "41cba7b241724ad04234dc3f20526525",
-            "size": "15780868"
-        }
-    },
-    "cuda_cudart": {
-        "name": "CUDA Runtime (cudart)",
-        "license": "CUDA Toolkit",
-        "version": "11.8.89",
-        "linux-x86_64": {
-            "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-11.8.89-archive.tar.xz",
-            "sha256": "56129e0c42df03ecb50a7bb23fc3285fa39af1a818f8826b183cf793529098bb",
-            "md5": "1087b1284b033511c34ac3f1d42e1ecd",
-            "size": "913876"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-11.8.89-archive.tar.xz",
-            "sha256": "8c0cc24e09e015079accc3c37c8fffd7bbeb04a688c9958a672785ffb785ffac",
-            "md5": "2ab98046768706eb1818c83a1dcc2bf6",
-            "size": "855176"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-11.8.89-archive.tar.xz",
-            "sha256": "88f496a2f96f5bb2a9cb351e6704dfe6a45e713e571c958a3924b2a02e7adea0",
-            "md5": "ca730f28308a18a0311f0167338455b0",
-            "size": "855196"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-11.8.89-archive.zip",
-            "sha256": "988cc9e7d3785d4b1975521f312c57c6814cbf15e73a2b7941d961835f2a945e",
-            "md5": "5b6c4db1e2c621c0061994156d35b64a",
-            "size": "2987306"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-11.8.89-archive.tar.xz",
-            "sha256": "e7622a46261df6424e8cd892e1631ef3bbfae90d0aace4a63fd35cdcffa9c788",
-            "md5": "aea3364b82bc403d589f1a62f461e8a8",
-            "size": "819640"
-        }
-    },
-    "cuda_cuobjdump": {
-        "name": "cuobjdump",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "linux-x86_64": {
-            "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-11.8.86-archive.tar.xz",
-            "sha256": "28218273db8ffeb3ae4b31bfb4e4d90f0ae3373454c7970703c063dfd0377ba7",
-            "md5": "60c880a2a3f13ce47b13d093b23bef55",
-            "size": "162092"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-11.8.86-archive.tar.xz",
-            "sha256": "c982c7dd7b6b8f9e8328ae0b67c9d7507ea58b64c893374766f77be3ce58ac6c",
-            "md5": "3a18aab2c893cc93c27a5b84766b6438",
-            "size": "205016"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-11.8.86-archive.tar.xz",
-            "sha256": "a630e95396437d0a8643d0184e95ac10a7c85488eff23955c94d1270dd45af2e",
-            "md5": "09d2c9c7b11e8f492b8ca0faabd542b7",
-            "size": "171160"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-11.8.86-archive.zip",
-            "sha256": "9961e1770fdde91844938a7046d03d7dfa3c3ff7271f77e9e859ca84d631ebf4",
-            "md5": "83ad84a30f896afa36d7a385776b3b75",
-            "size": "3777109"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-11.8.86-archive.tar.xz",
-            "sha256": "9ef1314c2e9b0149c3ffb07559cf1226bfd716515c92e6dbaf400863b3f4d44c",
-            "md5": "4e530c57a7f4dc4c38bb982790f7b76e",
-            "size": "170944"
-        }
-    },
-    "cuda_cupti": {
-        "name": "CUPTI",
-        "license": "CUDA Toolkit",
-        "version": "11.8.87",
-        "linux-x86_64": {
-            "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-11.8.87-archive.tar.xz",
-            "sha256": "b2ebc5672aa7b896b5986200d132933c37e72df6b0bf5ac25c9cb18c2c03057f",
-            "md5": "5fc2edc95353ab45f29a411823176ca9",
-            "size": "18049564"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-11.8.87-archive.tar.xz",
-            "sha256": "48e3bd8f14d5846e0fff88bcd712a6bf0fc9566095ff24462bccdf43506f5d6a",
-            "md5": "c2e083b0a944afabd0dc1432284b0cc6",
-            "size": "9535008"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-11.8.87-archive.tar.xz",
-            "sha256": "d53c7e5da57d1e9df1f5bb3009e4964fbbcc8382906f64153ba4fab2ddeae607",
-            "md5": "6c9ba6e9045d95a667fe623f9a7f9347",
-            "size": "9307904"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-11.8.87-archive.zip",
-            "sha256": "a243ffc6b5cfd9ba469bc3dd02208186c4f1956e91d54e9bca295757edd9dafa",
-            "md5": "d4fdbcf3bb3e75c334f9a6b21d4cdf5f",
-            "size": "13045751"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-11.8.87-archive.tar.xz",
-            "sha256": "a7d2b993dcfdec7bf24cd8e7cee292679bc351d95bc58e99e3394593f708fa80",
-            "md5": "a5041dd165f9ca49c16912a0bf586000",
-            "size": "6976012"
-        }
-    },
-    "cuda_cuxxfilt": {
-        "name": "CUDA cuxxfilt (demangler)",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "linux-x86_64": {
-            "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-11.8.86-archive.tar.xz",
-            "sha256": "42e41e765fa0577c32706c9fd50016230d06e54dacb760f41ded7093923927af",
-            "md5": "165cd45c312f49edf66d30004e242aa8",
-            "size": "185836"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-11.8.86-archive.tar.xz",
-            "sha256": "00699d77a701372fb06d5c0d1eb6c51858f2b1aa97ae103589f434aebaa4999f",
-            "md5": "3159fa2ede95d25c22a15819d3265896",
-            "size": "179528"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-11.8.86-archive.tar.xz",
-            "sha256": "c3c5802ff0c9fe96db03b49be6da4298258459e067138b868378f067cf31ea65",
-            "md5": "f48b56257116197573daddb3b8c2f78e",
-            "size": "172016"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-11.8.86-archive.zip",
-            "sha256": "a852b129290c1f9084ca7b626d5972d32fe5ec190ad55878c1c0993566d369c1",
-            "md5": "818838b992877c87396c390369143506",
-            "size": "168499"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-11.8.86-archive.tar.xz",
-            "sha256": "0f838658f46e86cddf37af16928a9f971335d03d79ddb53d71b3329e5c1834ce",
-            "md5": "86b33cc615f1af37a45a998224e4680a",
-            "size": "171664"
-        }
-    },
-    "cuda_demo_suite": {
-        "name": "CUDA Demo Suite",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "linux-x86_64": {
-            "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-11.8.86-archive.tar.xz",
-            "sha256": "18cd11f6b846a855f34b949aa87477f5978d1462bc4c354e6a39af929f505b72",
-            "md5": "791ea9fa085582efac7e68b795f33f0d",
-            "size": "3993532"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-11.8.86-archive.zip",
-            "sha256": "35ebaba27ba4c91962e069847ab8c355305b76139a342ac0945173658a4cbf40",
-            "md5": "f38e557fd705098963ddd65cf407c9d5",
-            "size": "5050011"
-        }
-    },
-    "cuda_documentation": {
-        "name": "CUDA Documentation",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "linux-x86_64": {
-            "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-11.8.86-archive.tar.xz",
-            "sha256": "45355431a1cc1edd78db903aba6e50f548cbf34dc1a77f9c56ac7c294ddd0799",
-            "md5": "dfc70528af84c65b7262f824ee8c1289",
-            "size": "67156"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-11.8.86-archive.tar.xz",
-            "sha256": "7594463c636373abd1f09581b5da6767eca7d7f5218f96c700b932d9fb3ba8d3",
-            "md5": "cee8eaafed9470a7b12da8515d77187b",
-            "size": "67052"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-11.8.86-archive.tar.xz",
-            "sha256": "41958cbfc53e170ed60140d2501a6fa00a0c2c6aa5496594ee6ee76c93b2da75",
-            "md5": "7898fc3e98473293441ea75bf438214d",
-            "size": "67076"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-11.8.86-archive.zip",
-            "sha256": "1f7b0c60be931debf0bbf1ff6ddecd8c61ae19c27ed370fabda0cbcfa2075ba5",
-            "md5": "df6b8628ac018257fdd23c7fc8646f97",
-            "size": "105364"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-11.8.86-archive.tar.xz",
-            "sha256": "9879ba1dc577e22670d4575de80a64dd86cd02a78644af84c8aaab5f31972df2",
-            "md5": "46f135b33cad414f6e74cfab19874a27",
-            "size": "67100"
-        }
-    },
-    "cuda_gdb": {
-        "name": "CUDA GDB",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "linux-x86_64": {
-            "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-11.8.86-archive.tar.xz",
-            "sha256": "15252a58df4c2b09dfd3c4bf91c3aebdb2bbb84a61573d92690076ee5066bdff",
-            "md5": "008e94bb7b3f4e0208ceea015a962262",
-            "size": "64334476"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-11.8.86-archive.tar.xz",
-            "sha256": "2f79d874373af9f7ff6898f28b5ef8269f2182e03ce12cd716c56dda0bad0cdd",
-            "md5": "a13c9ea95b13bf3b70ac1d79fab1750f",
-            "size": "64179404"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-11.8.86-archive.tar.xz",
-            "sha256": "acca29e2e8d341d058bb4cad76ec8c565fe15f39205aba72f5e92d360e49a360",
-            "md5": "e86e497ef3e6fd6b5099ba11e71c5ae5",
-            "size": "64001800"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-11.8.86-archive.tar.xz",
-            "sha256": "b4e7dde3b001019a1e4ac7646cbae48e66a9642376745335a8bc245ad91b3a2c",
-            "md5": "827911d9bb2f98068c55111e4a6564f0",
-            "size": "63936148"
-        }
-    },
-    "cuda_memcheck": {
-        "name": "CUDA Memcheck",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "linux-x86_64": {
-            "relative_path": "cuda_memcheck/linux-x86_64/cuda_memcheck-linux-x86_64-11.8.86-archive.tar.xz",
-            "sha256": "539ce6b3cf03593f72f7830217145c87f94246b1c8c056fde2da82234aba2a3e",
-            "md5": "b3c4d2321f005cd7f4a2be2f647ebf5b",
-            "size": "139812"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_memcheck/linux-ppc64le/cuda_memcheck-linux-ppc64le-11.8.86-archive.tar.xz",
-            "sha256": "9f5a8ce507b2fa401180d3ca2213765069f8c5ea387f4164ea29cc32b22c9497",
-            "md5": "19ff70b8373e4c6e545427f1733ca64f",
-            "size": "147964"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_memcheck/windows-x86_64/cuda_memcheck-windows-x86_64-11.8.86-archive.zip",
-            "sha256": "387339972a16daefb5aca029d9d8d9c5f2fc8d823ccd4f4b89d2a2767f19dc2d",
-            "md5": "d9deb261404f40461099d814c8699d2c",
-            "size": "172894"
-        }
-    },
-    "cuda_nsight": {
-        "name": "Nsight Eclipse Edition Plugin",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "linux-x86_64": {
-            "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-11.8.86-archive.tar.xz",
-            "sha256": "4568af4eb961fba800b629b9456e4bed82eebf6e4c0c152f83e415b23983699d",
-            "md5": "ea71a5e487e05343fda0f8317c681be3",
-            "size": "118607548"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-11.8.86-archive.tar.xz",
-            "sha256": "67d1a47e1b39c0969201a45bac527e597ec1fc0f268ab3a78ab0a94363be58f2",
-            "md5": "6bbdefd52ed09fce18d909fd6f18479e",
-            "size": "118607576"
-        }
-    },
-    "cuda_nvcc": {
-        "name": "CUDA NVCC",
-        "license": "CUDA Toolkit",
-        "version": "11.8.89",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-11.8.89-archive.tar.xz",
-            "sha256": "7ee8450dbcc16e9fe5d2a7b567d6dec220c5894a94ac6640459e06231e3b39a5",
-            "md5": "ea3b1b2afc8cfa824328adbe998a4a76",
-            "size": "43230952"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-11.8.89-archive.tar.xz",
-            "sha256": "16fcfac1ef89584a36bf725b1706c51ecf9754acc712600f5f3e70f6ba119c8c",
-            "md5": "bee55785b363cbec80cafd90d750aae8",
-            "size": "40307408"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-11.8.89-archive.tar.xz",
-            "sha256": "17d30d924a1d6ff5748a0b6a4e7c25fd39644250cef9184fba520362f70ff798",
-            "md5": "dbaf022f1014ce621935c8bbb96113f0",
-            "size": "39022020"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-11.8.89-archive.zip",
-            "sha256": "4cdd7555f31186e5af0b14ab761838bbc8b5e6441589f5bb326930c7a502dcd3",
-            "md5": "240a8b9fca8d478aed61d9863e2cf4d3",
-            "size": "57346486"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-11.8.89-archive.tar.xz",
-            "sha256": "e6cd1a039b5318cabc848840f0e660c4e0971186ae84ff0b2a56246b898ace1e",
-            "md5": "e3974c22515f9f20c44d9225de994696",
-            "size": "39063696"
-        }
-    },
-    "cuda_nvdisasm": {
-        "name": "CUDA nvdisasm",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-11.8.86-archive.tar.xz",
-            "sha256": "9c1a92d012ec7e63334863a70f8c48b25d3a7df13253813318454358eeaa4400",
-            "md5": "76f004fb938f650841744b54fba3e0a1",
-            "size": "50769012"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-11.8.86-archive.tar.xz",
-            "sha256": "af86ce4c1a69be36b3d3363cbf2c47d752e916bf2690b7d7a845d78da10a02c0",
-            "md5": "3892df811a27b3566f447617b333aba9",
-            "size": "50762364"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-11.8.86-archive.tar.xz",
-            "sha256": "8e6f10a708937283919ebd57ba55a5a3575a751c92f63ac9a99f5bcfda8ac1dc",
-            "md5": "ab35abb462f5eed823244a54341f966f",
-            "size": "50707044"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-11.8.86-archive.zip",
-            "sha256": "56888ecebbac419f1d5e91bff33ea1268fda12a3ce8818b0c6f360521cf07152",
-            "md5": "f6fc3655bed1293c8ff9bc96f06ecab9",
-            "size": "51000989"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-11.8.86-archive.tar.xz",
-            "sha256": "578604e16d2c687a41fe1beb9eff44a72ad7e0ae9acc147fe28c37e1d3962f8a",
-            "md5": "67ae5c58f02a38a90159563438f8bf4b",
-            "size": "50697028"
-        }
-    },
-    "cuda_nvml_dev": {
-        "name": "CUDA NVML Headers",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-11.8.86-archive.tar.xz",
-            "sha256": "2a03b591f7e6714811f34f807a76be1dea7d68788c898ab4a21ec2ccecf2e368",
-            "md5": "03ab04f1f7ff9557e4eafa22d3600cee",
-            "size": "78320"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-11.8.86-archive.tar.xz",
-            "sha256": "b6b067595b9721409092b44d1fc0b5373a0368faed984150aa27545f96adc1dd",
-            "md5": "0f93570ff9c5ab184755dc4be71aa7e9",
-            "size": "78388"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-11.8.86-archive.tar.xz",
-            "sha256": "4b759ba07830b6394cf6d28c0e0e1a3e8bf88adfd5df575812dc1e1f9308f6d5",
-            "md5": "930827da97dd8f43a17bdf395e8bfb7e",
-            "size": "78948"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-11.8.86-archive.zip",
-            "sha256": "8eb977d7ed61eaa70a32963f1c2bd63ef92710a5a6486800125dec4ed8ebd6fb",
-            "md5": "8b4e968ead1fd332feedacb692009c57",
-            "size": "110045"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-11.8.86-archive.tar.xz",
-            "sha256": "233c4f3ed5429930284b32c2b755ca01c4f2899e1dbb9036c738af85c874d53b",
-            "md5": "eca97d5c09108fcccc8e5ce10e9dedee",
-            "size": "78916"
-        }
-    },
-    "cuda_nvprof": {
-        "name": "CUDA nvprof",
-        "license": "CUDA Toolkit",
-        "version": "11.8.87",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-11.8.87-archive.tar.xz",
-            "sha256": "cc01bc16f11b3aca89539a750c458121a4390d7694842627ca0221cc0b537107",
-            "md5": "a55fb3f318f5ea9fbdbfeb775952554f",
-            "size": "1955928"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-11.8.87-archive.tar.xz",
-            "sha256": "8e3ec9c4da81e88033e1ce013a995ac51a7c5e158c7fbbae8383e706356c244a",
-            "md5": "adf1828636a2c57333434d62aa725767",
-            "size": "1608680"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-11.8.87-archive.zip",
-            "sha256": "24f0cdf3692241efb8948230ea82b57245ae9654fafdcbea31314b06a7527580",
-            "md5": "b1ffe59994228212c4d58189a9e9cd31",
-            "size": "1599731"
-        }
-    },
-    "cuda_nvprune": {
-        "name": "CUDA nvprune",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-11.8.86-archive.tar.xz",
-            "sha256": "6165a58e3b17dba210eb7fa6bab0b7c82aa83d6584e21adc54e9ce820f4a02b2",
-            "md5": "f6bb6d9a16863a54c12c79796c711dee",
-            "size": "55788"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-11.8.86-archive.tar.xz",
-            "sha256": "ee82495f51873831b5448b6181c05d1d8ef3abb7aa5d9e93c7e4f47fd1e0ee49",
-            "md5": "850be2894997205633df0f20d651b488",
-            "size": "56360"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-11.8.86-archive.tar.xz",
-            "sha256": "c113d2340e4c91f7ee32e123f6a7736a070b79521bf33787a066fbb626790954",
-            "md5": "56578ad334bc57ee224eba840f6e055f",
-            "size": "48008"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-11.8.86-archive.zip",
-            "sha256": "75f77f308dfd216925e3ec02b2a2a0631d3cc72e023ba52b29b902f508dc6bf0",
-            "md5": "12512ae51bfedba3cb6767eff3435d7a",
-            "size": "145633"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-11.8.86-archive.tar.xz",
-            "sha256": "090030bc5e4b65cb2d64cdb10964ae555b1db2f3a1c9446db17bf901c303b3f1",
-            "md5": "8e6be3ba89e40ba208e4c6959ad11564",
-            "size": "47924"
-        }
-    },
-    "cuda_nvrtc": {
-        "name": "CUDA NVRTC",
-        "license": "CUDA Toolkit",
-        "version": "11.8.89",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-11.8.89-archive.tar.xz",
-            "sha256": "4bde6bdd6550110b91a5b8e442579c26ddf3a4bc9d380bed03daee8bf70a5286",
-            "md5": "f09fddad27e3d6896f472fcd37df2e61",
-            "size": "29507552"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-11.8.89-archive.tar.xz",
-            "sha256": "c4c305c31b38afb66e69c522263e6c04e8a08425330eebf7323a9f9d489d5a58",
-            "md5": "86bcf8a01a3fb1e4d00f2ea706ef189f",
-            "size": "27515068"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-11.8.89-archive.tar.xz",
-            "sha256": "d81246bc36adb4664a816ebebd2a572b92a74b3a36a830454fc91a13bdad7d18",
-            "md5": "700eff66b08ad3fcb727abd8ca9cf814",
-            "size": "27381644"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-11.8.89-archive.zip",
-            "sha256": "e5d571247e71e0b0922a929516175844efa9e7ac424ed3c1b764bffb4899d3c9",
-            "md5": "b10471319dd70571927accc50a739781",
-            "size": "95854990"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-11.8.89-archive.tar.xz",
-            "sha256": "89f3f8067b1a5812b0c46a24b4a82864516bf7026c951f8ccfe91c2b7c430596",
-            "md5": "7dc9f9c8419d26b6c4c7d8a6322e9bc7",
-            "size": "27383920"
-        }
-    },
-    "cuda_nvtx": {
-        "name": "CUDA NVTX",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-11.8.86-archive.tar.xz",
-            "sha256": "d08af53e4116d5535112680c6f8a6774744c625a260bc5a64399a3be35700201",
-            "md5": "34a29024041db12d6c39c4db19276674",
-            "size": "48184"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-11.8.86-archive.tar.xz",
-            "sha256": "e0162a4e404079650b2cdcfb21a77eca69a70a9670a68cb368bb7b567a6a78d5",
-            "md5": "a95cb8d1ff95be59223602c44fff060d",
-            "size": "48148"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-11.8.86-archive.tar.xz",
-            "sha256": "b5f1835ef51e7584a0ec16ff2c573c59f91fac4defbfc78de31e93514d50e5ff",
-            "md5": "487458d132db455e585369653d712ff7",
-            "size": "48800"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-11.8.86-archive.zip",
-            "sha256": "133c8c61904c06f1273dac35c0d602765e6a9f14175c9572b8c76b8b3d052105",
-            "md5": "ee20c858be84a6eb61830693f0c9d5a2",
-            "size": "65690"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-11.8.86-archive.tar.xz",
-            "sha256": "780c37fd80f25f15efb72827d7d439d70618b3ead5ea6ff99727b9656ef3d6ef",
-            "md5": "0df92af46da66b19e5e488bb5130f401",
-            "size": "48092"
-        }
-    },
-    "cuda_nvvp": {
-        "name": "CUDA NVVP",
-        "license": "CUDA Toolkit",
-        "version": "11.8.87",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-11.8.87-archive.tar.xz",
-            "sha256": "68a1ff1118220c7e1d3852de52110b36251045635dd7c4a42eae9a6a3e31116c",
-            "md5": "0316f5eb34c2597a21b984b32a2130fc",
-            "size": "117590868"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-11.8.87-archive.tar.xz",
-            "sha256": "1188a21ebb4f4d8a2cddffea5d6317b1863fce8ef9c9cffba678b37552e4f511",
-            "md5": "c078f22f422a4da514a66528eea3cb42",
-            "size": "117029624"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-11.8.87-archive.zip",
-            "sha256": "8e0f1da8541612ad5f21936a4c237fdce97d1fb4e8bc234698c15f2052db170a",
-            "md5": "b30aaf5036a5069ffc6a796e2af0692f",
-            "size": "120361858"
-        }
-    },
-    "cuda_profiler_api": {
-        "name": "CUDA Profiler API",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "linux-x86_64": {
-            "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-11.8.86-archive.tar.xz",
-            "sha256": "0845942ac7f6fac6081780c32e0d95c883c786638b54d5a8eda05fde8089d532",
-            "md5": "b45edeb69dee2eea33e63517b52c1242",
-            "size": "16140"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_profiler_api/linux-ppc64le/cuda_profiler_api-linux-ppc64le-11.8.86-archive.tar.xz",
-            "sha256": "cd0d212a4a49ee1d709fcd1d46eed5b34087d91d2465e342622caf7b173b1e34",
-            "md5": "478ec6b63bbcd8298fe6d9e8e231a98d",
-            "size": "16144"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-11.8.86-archive.tar.xz",
-            "sha256": "472bbce7395e259ac609b6591cf4f01f2c7aae0af2562f77bf1433a3f578c6ee",
-            "md5": "56075a87654f2d9742a4a2c14618ebc2",
-            "size": "16144"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-11.8.86-archive.zip",
-            "sha256": "64f9ff04d1660ca0d611c8ac60ace7124f3e647519d67f78f681277e1c9221cc",
-            "md5": "ebd55b552f4fa46887cc9184495c40e1",
-            "size": "20587"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-11.8.86-archive.tar.xz",
-            "sha256": "567818017d8eed04c7ea5bd3d7aacadc3008e32d33773feef55260c6473f9920",
-            "md5": "a7958e6be9d55cedbab6b245f58c950d",
-            "size": "16144"
-        }
-    },
-    "cuda_sanitizer_api": {
-        "name": "CUDA Compute Sanitizer API",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "linux-x86_64": {
-            "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-11.8.86-archive.tar.xz",
-            "sha256": "d5536917cbb0e2a1a5287e57e7c47e8645117a5a514cdbfd0da686986db71e75",
-            "md5": "5ca11ca504fae4bb3578a7ac04a3dff6",
-            "size": "8274596"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-11.8.86-archive.tar.xz",
-            "sha256": "b76e464506821e4643d536f79c650e07a6c42de075d124fa885e449b138f21d4",
-            "md5": "bfbcbf2d8167824b82d74eaabe4260f6",
-            "size": "7715068"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-11.8.86-archive.tar.xz",
-            "sha256": "00975421bfa738b026ee1d89d41b76456d221cfe5737399604aca473f89ff922",
-            "md5": "c4030e1425847287f84b58a444af19e8",
-            "size": "6459140"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-11.8.86-archive.zip",
-            "sha256": "24fdaaa3a80dc1faea90a49213bef2098f0abbad8bd5108fada5b77d7ad00dcc",
-            "md5": "14aab57c462477036ba60f88e59fc415",
-            "size": "13572050"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-11.8.86-archive.tar.xz",
-            "sha256": "0b1ec1096f87a796a0352188b89ac85bce19e97af504b72a2684f254de667d1e",
-            "md5": "6dfc8e796940d22fabd195c74d4f2b78",
-            "size": "3320104"
-        }
-    },
-    "fabricmanager": {
-        "name": "NVIDIA Fabric Manager",
-        "license": "NVIDIA Driver",
-        "version": "520.61.05",
-        "linux-x86_64": {
-            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-520.61.05-archive.tar.xz",
-            "sha256": "a3c29b9a483ba9ccca41c95a1af1325cdcc4396abd6694199fdb3279f7e71221",
-            "md5": "7f90460c03ed9cbe4a50bdfb0bc8adf3",
-            "size": "1612804"
-        },
-        "linux-sbsa": {
-            "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-520.61.05-archive.tar.xz",
-            "sha256": "9333e7c4584b6edd73c497f1666afd4d1c8c4a36e2de8c9ef36aeebf22cd2b07",
-            "md5": "54fa3cce18980ef9b3f764a9ba0b51cf",
-            "size": "1494656"
-        }
-    },
-    "libcublas": {
-        "name": "CUDA cuBLAS",
-        "license": "CUDA Toolkit",
-        "version": "11.11.3.6",
-        "linux-x86_64": {
-            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-11.11.3.6-archive.tar.xz",
-            "sha256": "045e6455c9f8789b1c7ced19957c7904d23c221f4d1d75bb574a2c856aebae98",
-            "md5": "86f56e585870e5a95d173ab30d866d9c",
-            "size": "500681532"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-11.11.3.6-archive.tar.xz",
-            "sha256": "27b07d1fa375404ed0f7ce37573de1c8a5ff8c313b9f388ee7b4ff41d4a8409f",
-            "md5": "c6b15c77cbd467d4fa3dc4c97dbf2aaa",
-            "size": "377908948"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-11.11.3.6-archive.tar.xz",
-            "sha256": "38fe90cbbc7da3dbdcd8c29e0fcd60f69baf580d9b3f71a4ee102e3c7fc30b3d",
-            "md5": "87306fc3764e990423d21bfe4153bcc8",
-            "size": "377934916"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-11.11.3.6-archive.zip",
-            "sha256": "67b0934a6359e4ee26fff823c356021589d392c4fd49ca12624f570edc08e2b9",
-            "md5": "1915e7979597f6b877f24f03364eb0ca",
-            "size": "420850025"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-11.11.3.6-archive.tar.xz",
-            "sha256": "05252a76ee24a73b4def52a52c3a4d08e790f3956b020dfaba56af0cc169b08a",
-            "md5": "e87d3390d507b22b8bafe94fb79fa110",
-            "size": "288337012"
-        }
-    },
-    "libcudla": {
-        "name": "cuDLA",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "linux-aarch64": {
-            "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-11.8.86-archive.tar.xz",
-            "sha256": "2fedefe9ebd567767e0079e168155f643100b7bf4ff6331c14f791290c932614",
-            "md5": "14b0a2506fa1377d54b5fefe3acf5420",
-            "size": "65508"
-        }
-    },
-    "libcufft": {
-        "name": "CUDA cuFFT",
-        "license": "CUDA Toolkit",
-        "version": "10.9.0.58",
-        "linux-x86_64": {
-            "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-10.9.0.58-archive.tar.xz",
-            "sha256": "eadca0b30a4a2c1f741fde88d6dd611604e488fdb51c676861eabc08d2c4612f",
-            "md5": "3bca3ded75663fa9c1924ba09c3cdc14",
-            "size": "274730492"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-10.9.0.58-archive.tar.xz",
-            "sha256": "c2203e0e48733acf40b76a7a3ff15d105d8c2f02dc8bb2865eb814e091ba0c5a",
-            "md5": "1f488aeeef7a93c08ac547b101c042e1",
-            "size": "274679080"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-10.9.0.58-archive.tar.xz",
-            "sha256": "e2bec93081e31ee2f0234d2fa93c2b501de29d2143fae287fe729c3318811e56",
-            "md5": "23319a56cc345c5ebe2bf5c4d7cbe46e",
-            "size": "212419228"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-10.9.0.58-archive.zip",
-            "sha256": "a4071a85e3983bf42ea7a2e9bebe3b0b3c9ac258668580adc32ee1c385f7556f",
-            "md5": "8d2069024c2bc29a2a0f84645a76f76a",
-            "size": "168982770"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-10.9.0.58-archive.tar.xz",
-            "sha256": "7337babe858b3b9d267603207da5e450d24d7fdd8173c4c5d303f6586e83611c",
-            "md5": "ff1d058b48df190318f44004ae1d5013",
-            "size": "264578816"
-        }
-    },
-    "libcufile": {
-        "name": "CUDA cuFile",
-        "license": "CUDA Toolkit",
-        "version": "1.4.0.31",
-        "linux-x86_64": {
-            "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.4.0.31-archive.tar.xz",
-            "sha256": "c926846769a63f6626c3f0006cc4d82306850ec8aa3be3216458116a551fe76a",
-            "md5": "8bf5d11a64b95bbf53ccee02830358c3",
-            "size": "39957500"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.4.0.31-archive.tar.xz",
-            "sha256": "bf434cf2ac47911daf10ee837ee7f9cc91cb2bbc83ad4ec004765b9c264d39ae",
-            "md5": "8af06935ae790bff51775615e546a398",
-            "size": "40473296"
-        }
-    },
-    "libcurand": {
-        "name": "CUDA cuRAND",
-        "license": "CUDA Toolkit",
-        "version": "10.3.0.86",
-        "linux-x86_64": {
-            "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.0.86-archive.tar.xz",
-            "sha256": "9d30be251c1a0463b52203f6514dac5062844c606d13e234d1386e80c83db279",
-            "md5": "60021684fd162fbf75db4b687de5debc",
-            "size": "83523868"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.3.0.86-archive.tar.xz",
-            "sha256": "7349ddfc41ceb2f80cd13bc0e26447f05eaf540ae55110cf8b8774ed2860228b",
-            "md5": "cc395eea8203f26e186eadff339d0be7",
-            "size": "83574916"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.0.86-archive.tar.xz",
-            "sha256": "3df3571103b056ab354e616f1c0737b1b2a25a7875b98b1b9bf32dee94449699",
-            "md5": "402182e6ca2bbbdebc618c8a38141873",
-            "size": "83497320"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.0.86-archive.zip",
-            "sha256": "aaccf56d68a63378edc05109c233ed47e185237c8d334f9df136923440a9a6b7",
-            "md5": "f693dc58062505b2f40e9255ff920b4d",
-            "size": "56863367"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.0.86-archive.tar.xz",
-            "sha256": "56411f5ce1f7c8a0a6a9db0b50f3454321226ad82abf6a189b176efd86587b77",
-            "md5": "01ef8ebea1eb265284382245ebdb72f1",
-            "size": "82232816"
-        }
-    },
-    "libcusolver": {
-        "name": "CUDA cuSOLVER",
-        "license": "CUDA Toolkit",
-        "version": "11.4.1.48",
-        "linux-x86_64": {
-            "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.4.1.48-archive.tar.xz",
-            "sha256": "ed136d960d28001fef1fe896aab56ea3e6a886970ab732274c9306e1bec88c96",
-            "md5": "ce3c0bb9a696bbec942b0f3ba542fe08",
-            "size": "85082320"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.4.1.48-archive.tar.xz",
-            "sha256": "fa3bcc0a9b1fb8c9c4d9c866284c561be765f101175a37aaaf6b6c25e584dfa1",
-            "md5": "b4dc0b612c07f60fa06f411ac4522c67",
-            "size": "85064564"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.4.1.48-archive.tar.xz",
-            "sha256": "554a404bc39eb8369b5ad90cc7bb45fdb33dae509bd9a34cb0cbeff831d8569a",
-            "md5": "bbb50591bf44a4de96932ddf97072ebb",
-            "size": "84284636"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.4.1.48-archive.zip",
-            "sha256": "965298e47640b643827cd6fe4ca5cab3c5a97b4bedc5357e9b6551298d1f9c2c",
-            "md5": "23ba061f4482a84e72abcf7df8b544ec",
-            "size": "120198030"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.4.1.48-archive.tar.xz",
-            "sha256": "25010c938487032feb4ff8efbe9e60d9cc2fe68e865ce263be0a2542929d16be",
-            "md5": "a440363c729a49b30551888d3c816ed5",
-            "size": "70468000"
-        }
-    },
-    "libcusparse": {
-        "name": "CUDA cuSPARSE",
-        "license": "CUDA Toolkit",
-        "version": "11.7.5.86",
-        "linux-x86_64": {
-            "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-11.7.5.86-archive.tar.xz",
-            "sha256": "9250fe539d4bd6a378581dc0b528e8cfc418b57f28545bf39d70cae762075df7",
-            "md5": "93b1c707413b5de5257190faf793047e",
-            "size": "227085840"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-11.7.5.86-archive.tar.xz",
-            "sha256": "1072e26dc118cbf9d6f061eddbff45f2da2eef6c87c2b8a64fd1586af91a2735",
-            "md5": "1bfca7f1de356eea5da55adc425bf3f5",
-            "size": "227171492"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-11.7.5.86-archive.tar.xz",
-            "sha256": "191ae1f26b15955b743f6c4978c8562b973b16671a9f684368d501919f906ce5",
-            "md5": "1804e51f97d6d5cd8e9b8692202efa15",
-            "size": "226831828"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-11.7.5.86-archive.zip",
-            "sha256": "b51a46f4f6bb9476ffe433a1dedad2c94a546c8a92e70dfed63207b64ff57e50",
-            "md5": "e8914191f10a4df1e9c869431c9aed0c",
-            "size": "201218990"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-11.7.5.86-archive.tar.xz",
-            "sha256": "a7795a1f97ea1b7c1e5753294e7ddaecc3e99e18da29e1e9adcbd73e61946365",
-            "md5": "de93b81f33cd3887fe79970c1ab28e7c",
-            "size": "192532892"
-        }
-    },
-    "libnpp": {
-        "name": "CUDA NPP",
-        "license": "CUDA Toolkit",
-        "version": "11.8.0.86",
-        "linux-x86_64": {
-            "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-11.8.0.86-archive.tar.xz",
-            "sha256": "1aaacf07e4df2dda5f6246763fc89c1bb9af9d4723596f4530826bcae148f9b4",
-            "md5": "d30d8c48b7d0a836fc2386ebc9d0b471",
-            "size": "200538792"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-11.8.0.86-archive.tar.xz",
-            "sha256": "cc559ab9c4972e331b1b90b7ee6ab909c80f818a6f522885109f800ed6d9db1e",
-            "md5": "af75693a60e88ae68fee15e622bfb32a",
-            "size": "200739960"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-11.8.0.86-archive.tar.xz",
-            "sha256": "cb5608a2a52fbe316bf89373e47c5b801ee4cbdbe8eaea777f8c4dcf4225c65e",
-            "md5": "6d4cb57caf765c53beba968626c56a10",
-            "size": "199830000"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-11.8.0.86-archive.zip",
-            "sha256": "5cd2ba50234b0743242bab212bf742c114e274fd639ec9d79fd62e1295756d32",
-            "md5": "e931a386b39e10e7ab335841823f3e6e",
-            "size": "160781198"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-11.8.0.86-archive.tar.xz",
-            "sha256": "1ef920c64610e03933ed94fc1dd34377c298c35bca83b9e864114dd7ad512c58",
-            "md5": "f58c5fd842623e8babc6b46a5dd83a1e",
-            "size": "174774196"
-        }
-    },
-    "libnvidia_nscq": {
-        "name": "NVIDIA NSCQ API",
-        "license": "NVIDIA Driver",
-        "version": "520.61.05",
-        "linux-x86_64": {
-            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-520.61.05-archive.tar.xz",
-            "sha256": "3041cc4b7486e320467bab16350cf51acb84055b36df518b835dd801e18a1ec6",
-            "md5": "dfc5430590addc9cc5727d57739d78be",
-            "size": "339124"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-520.61.05-archive.tar.xz",
-            "sha256": "c28cc5574846305479a3a2438278cf9ef67c640105a24f25c2cb2b92eebc16f0",
-            "md5": "4fd3355154c6bc70769189f9218ded28",
-            "size": "307812"
-        }
-    },
-    "libnvjpeg": {
-        "name": "CUDA nvJPEG",
-        "license": "CUDA Toolkit",
-        "version": "11.9.0.86",
-        "linux-x86_64": {
-            "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-11.9.0.86-archive.tar.xz",
-            "sha256": "2dd496ef4f974cf73ef293fd3de3b5b5abcaaf36150304c4f7bd0228e3e34e9d",
-            "md5": "0efa17e6a939eaf65268580725fff407",
-            "size": "2084164"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-11.9.0.86-archive.tar.xz",
-            "sha256": "2f3b7468c0b20a8de9fe6c93456cf5405f1eab70482964e35bf732aaa09ccaf0",
-            "md5": "8aa8bb109c68e9e9b9db4393cceb6f0c",
-            "size": "2098644"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-11.9.0.86-archive.tar.xz",
-            "sha256": "bab943ceddc0d7103b0777953dca8cfb66db35b54fcee75187397345ada6e112",
-            "md5": "853fde580b85d0e5d095a9dc76d72f25",
-            "size": "1929336"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-11.9.0.86-archive.zip",
-            "sha256": "caddf3d887a5bfb7db32757016fce18922838c889c80e910d91edd0644039116",
-            "md5": "876752c9a9da6109f5419ff4d1b1324d",
-            "size": "2054090"
-        }
-    },
-    "nsight_compute": {
-        "name": "Nsight Compute",
-        "license": "NVIDIA SLA",
-        "version": "2022.3.0.22",
-        "linux-x86_64": {
-            "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2022.3.0.22-archive.tar.xz",
-            "sha256": "1ce06d1f7fb5b9124570db1e12a7caf0caa61d60f757c8d0bcb233f818cd3e0c",
-            "md5": "16f6fd94b2c477c6b4c4038bd79ddc3f",
-            "size": "578530596"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2022.3.0.22-archive.tar.xz",
-            "sha256": "e7eb2794136cec15cbfcb2d69e230e1b28164091eee886cb17182000e4ffff8b",
-            "md5": "b0a5ae542e09a0c8f6b954804562f4ef",
-            "size": "179631780"
-        },
-        "linux-sbsa": {
-            "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2022.3.0.22-archive.tar.xz",
-            "sha256": "95f817d0526e60a16dc918e9240bc2b4155216833b7beecde5308687d8aaaead",
-            "md5": "e19f502868ba6a20fb6de760313f7177",
-            "size": "336218564"
-        },
-        "windows-x86_64": {
-            "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2022.3.0.22-archive.zip",
-            "sha256": "e72b239b8be0801f6377204949fb4696bf3cc8b86327f428f4bb8cbd55f7f110",
-            "md5": "564365913c7c6e107f7d970e573e5378",
-            "size": "477847800"
-        },
-        "linux-aarch64": {
-            "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2022.3.0.22-archive.tar.xz",
-            "sha256": "bd1b3770c183bab6ef27e018d26db480a7d52495df1bb517b785b1732b083782",
-            "md5": "7795118b5706d4597bfd7ee65e2abd17",
-            "size": "697905636"
-        }
-    },
-    "nsight_nvtx": {
-        "name": "Nsight NVTX",
-        "license": "CUDA Toolkit",
-        "version": "1.21018621",
-        "windows-x86_64": {
-            "relative_path": "nsight_nvtx/windows-x86_64/nsight_nvtx-windows-x86_64-1.21018621-archive.zip",
-            "sha256": "d99b015bfb1308206f9d7c16ea401bf426fed3a5a99953b855fe4e68be5ed2d1",
-            "md5": "34ee04d45cfca1c4e3cbfba0ec8f6f80",
-            "size": "315692"
-        }
-    },
-    "nsight_systems": {
-        "name": "Nsight Systems",
-        "license": "NVIDIA SLA",
-        "version": "2022.4.2.1",
-        "linux-x86_64": {
-            "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2022.4.2.1-archive.tar.xz",
-            "sha256": "372808c5d4e2c4b99ffe324f8947ae4f2b31ab406fd835409b3032f23198ed26",
-            "md5": "793910c8b14cd7471a1dc7d5a5a0b3f0",
-            "size": "196239560"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2022.4.2.1-archive.tar.xz",
-            "sha256": "ab34e5818b6bbcdd1726509738e727b9500144868c8a8f48f348824bdf3c3ce2",
-            "md5": "dbd5ac2f2e5a72a033575e0de505de9b",
-            "size": "52933936"
-        },
-        "linux-sbsa": {
-            "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2022.4.2.1-archive.tar.xz",
-            "sha256": "f7b1a917f279bf47caf87af1db1cf1681734fdfd00fe8fccd5bd7a2cfe6ade91",
-            "md5": "1621ec2e6dc63821288b1196d202450e",
-            "size": "185788748"
-        },
-        "windows-x86_64": {
-            "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2022.4.2.1-archive.zip",
-            "sha256": "0a0df11d7cb449c82d7bcf96960740df482da78e698903941e0a9643af3c7b22",
-            "md5": "a5aa599af3a04405575f363139b52c43",
-            "size": "384428030"
-        }
-    },
-    "nsight_vse": {
-        "name": "Nsight Visual Studio Edition (VSE)",
-        "license": "NVIDIA SLA",
-        "version": "2022.3.0.22245",
-        "windows-x86_64": {
-            "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2022.3.0.22245-archive.zip",
-            "sha256": "0de65ab3e57a42d63422fcb52d8cc813aed70cfa6603847508475775442e778c",
-            "md5": "385a2882cb154f2bd5e03ddd61ef1faf",
-            "size": "535810712"
-        }
-    },
-    "nvidia_driver": {
-        "name": "NVIDIA Linux Driver",
-        "license": "NVIDIA Driver",
-        "version": "520.61.05",
-        "linux-x86_64": {
-            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-520.61.05-archive.tar.xz",
-            "sha256": "c28127087bfd4a865f3c7fcf16c6e5b0c21318d19268b5289c5d825e615888b7",
-            "md5": "3ecd427f21946334d48cca97f6c7587d",
-            "size": "409484656"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-520.61.05-archive.tar.xz",
-            "sha256": "0485cef7466d694900c9a6b990380c5be4504e3470dc89c6e667b7b0a6837c3c",
-            "md5": "282e06b3fa823b133f5174dc784067bf",
-            "size": "97602224"
-        },
-        "linux-sbsa": {
-            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-520.61.05-archive.tar.xz",
-            "sha256": "e8de6ffdac2be419d7b940a00a0482de63a147db0acbc5265f27027c1b8f603a",
-            "md5": "b161fc8992e3b94a330bfc40b67a53a5",
-            "size": "260589160"
-        }
-    },
-    "nvidia_fs": {
-        "name": "NVIDIA filesystem",
-        "license": "CUDA Toolkit",
-        "version": "2.13.5",
-        "linux-x86_64": {
-            "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.13.5-archive.tar.xz",
-            "sha256": "f3962442f26be807b358c307cba5ffc45a7d8219a532d6152e66db238d778dbf",
-            "md5": "46ae5fef3efcb780a910f27877578117",
-            "size": "67792"
-        },
-        "linux-aarch64": {
-            "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.13.5-archive.tar.xz",
-            "sha256": "7970d053e76366e2e68aec2e61cd4eb39a749664345721742244b77f8ccbb151",
-            "md5": "6c15f64e3c1881f344e9d6aaa4a37a69",
-            "size": "67760"
-        }
-    },
-    "visual_studio_integration": {
-        "name": "CUDA Visual Studio Integration",
-        "license": "CUDA Toolkit",
-        "version": "11.8.86",
-        "windows-x86_64": {
-            "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-11.8.86-archive.zip",
-            "sha256": "67c847a57cc8664b2180ecbdd06b399b50cfcb871c9d04bad3ce1510485aee36",
-            "md5": "08c19db58ba62ebc15af19f52b63a71c",
-            "size": "517053"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix
index 9201f7755d4a..ff33803f641c 100644
--- a/pkgs/development/cuda-modules/cudatoolkit/default.nix
+++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix
@@ -1,7 +1,6 @@
 {
   cudaMajorMinorVersion,
   cudaAtLeast,
-  cudaOlder,
   runPatches ? [ ],
   autoPatchelfHook,
   autoAddDriverRunpath,
@@ -129,8 +128,8 @@ backendStdenv.mkDerivation {
     xorg.libxshmfence
     xorg.libxkbfile
   ]
-  ++ (lib.optionals (cudaAtLeast "12") (
-    map lib.getLib ([
+  ++ map lib.getLib (
+    [
       # Used by `/target-linux-x64/CollectX/clx` and `/target-linux-x64/CollectX/libclx_api.so` for:
       # - `libcurl.so.4`
       curlMinimal
@@ -138,7 +137,7 @@ backendStdenv.mkDerivation {
       # Used by `/host-linux-x64/Scripts/WebRTCContainer/setup/neko/server/bin/neko`
       gst_all_1.gstreamer
       gst_all_1.gst-plugins-base
-    ])
+    ]
     ++ (with qt6; [
       qtmultimedia
       qttools
@@ -148,7 +147,7 @@ backendStdenv.mkDerivation {
       qtwebchannel
       qtwebengine
     ])
-  ))
+  )
   ++ lib.optionals (cudaAtLeast "12.6") [
     # libcrypt.so.1
     libxcrypt-legacy
@@ -235,41 +234,29 @@ backendStdenv.mkDerivation {
     mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64
     mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64
     rm $out/host-linux-x64/libstdc++.so*
-      ${lib.optionalString (cudaAtLeast "11.8" && cudaOlder "12")
-        # error: auto-patchelf could not satisfy dependency libtiff.so.5 wanted by /nix/store/.......-cudatoolkit-12.0.1/host-linux-x64/Plugins/imageformats/libqtiff.so
-        # we only ship libtiff.so.6, so let's use qt plugins built by Nix.
-        # TODO: don't copy, come up with a symlink-based "merge"
-        ''
-          rsync ${lib.getLib qt6Packages.qtimageformats}/lib/qt-6/plugins/ $out/host-linux-x64/Plugins/ -aP
-        ''
-      }
-      ${lib.optionalString (cudaAtLeast "12")
-        # Use Qt plugins built by Nix.
-        ''
-          for qtlib in $out/host-linux-x64/Plugins/*/libq*.so; do
-            qtdir=$(basename $(dirname $qtlib))
-            filename=$(basename $qtlib)
-            for qtpkgdir in ${
-              lib.concatMapStringsSep " " (x: qt6Packages.${x}) [
-                "qtbase"
-                "qtimageformats"
-                "qtsvg"
-                "qtwayland"
-              ]
-            }; do
-              if [ -e $qtpkgdir/lib/qt-6/plugins/$qtdir/$filename ]; then
-                ln -snf $qtpkgdir/lib/qt-6/plugins/$qtdir/$filename $qtlib
-              fi
-            done
-          done
-        ''
-      }
+  ''
+  # Use Qt plugins built by Nix.
+  + ''
+    for qtlib in $out/host-linux-x64/Plugins/*/libq*.so; do
+      qtdir=$(basename $(dirname $qtlib))
+      filename=$(basename $qtlib)
+      for qtpkgdir in ${
+        lib.concatMapStringsSep " " (x: qt6Packages.${x}) [
+          "qtbase"
+          "qtimageformats"
+          "qtsvg"
+          "qtwayland"
+        ]
+      }; do
+        if [ -e $qtpkgdir/lib/qt-6/plugins/$qtdir/$filename ]; then
+          ln -snf $qtpkgdir/lib/qt-6/plugins/$qtdir/$filename $qtlib
+        fi
+      done
+    done
 
     rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
 
-    ${lib.optionalString (cudaAtLeast "12.0") ''
-      rm $out/host-linux-x64/libQt6*
-    ''}
+    rm $out/host-linux-x64/libQt6*
 
     # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
     if [ -d "$out"/cuda-samples ]; then
@@ -304,12 +291,10 @@ backendStdenv.mkDerivation {
       wrapProgram $out/bin/nvprof \
         --prefix LD_LIBRARY_PATH : $out/lib
     ''
-  # 11.8 and 12.9 include a broken symlink, include/include, pointing to targets/x86_64-linux/include
-  + lib.optionalString (cudaMajorMinorVersion == "11.8" || cudaMajorMinorVersion == "12.9") ''
-    rm $out/include/include
-  ''
-  # 12.9 has another broken symlink, lib64/lib64, pointing to lib/targets/x86_64-linux/lib
+  # 12.9 includes a broken symlink, include/include, pointing to targets/x86_64-linux/include
+  # and another, lib64/lib64, pointing to lib/targets/x86_64-linux/lib
   + lib.optionalString (cudaMajorMinorVersion == "12.9") ''
+    rm $out/include/include
     rm $out/lib64/lib64
   ''
   # Python 3.8 and 3.9 are not in nixpkgs anymore, delete Python 3.{8,9} cuda-gdb support
@@ -327,19 +312,17 @@ backendStdenv.mkDerivation {
       wrapProgram "$out/bin/$b" \
         --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
     done
-    ${lib.optionalString (cudaAtLeast "12")
-      # Check we don't have any lurking vendored qt libraries that weren't
-      # replaced during installPhase
-      ''
-        qtlibfiles=$(find $out -name "libq*.so" -type f)
-        if [ ! -z "$qtlibfiles" ]; then
-          echo "Found unexpected vendored Qt library files in $out" >&2
-          echo $qtlibfiles >&2
-          echo "These should be replaced with symlinks in installPhase" >&2
-          exit 1
-        fi
-      ''
-    }
+  ''
+  # Check we don't have any lurking vendored qt libraries that weren't
+  # replaced during installPhase
+  + ''
+    qtlibfiles=$(find $out -name "libq*.so" -type f)
+    if [ ! -z "$qtlibfiles" ]; then
+      echo "Found unexpected vendored Qt library files in $out" >&2
+      echo $qtlibfiles >&2
+      echo "These should be replaced with symlinks in installPhase" >&2
+      exit 1
+    fi
   '';
 
   # cuda-gdb doesn't run correctly when not using sandboxing, so
diff --git a/pkgs/development/cuda-modules/cudnn/releases.nix b/pkgs/development/cuda-modules/cudnn/releases.nix
index 7543051bf988..bfa1e2093c47 100644
--- a/pkgs/development/cuda-modules/cudnn/releases.nix
+++ b/pkgs/development/cuda-modules/cudnn/releases.nix
@@ -40,27 +40,6 @@
     linux-ppc64le = [ ];
     # server-grade arm
     linux-sbsa = [
-      {
-        version = "8.6.0.163";
-        minCudaVersion = "11.0";
-        maxCudaVersion = "11.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.6.0.163_cuda11-archive.tar.xz";
-        hash = "sha256-oCAieNPL1POtw/eBa/9gcWIcsEKwkDaYtHesrIkorAY=";
-      }
-      {
-        version = "8.7.0.84";
-        minCudaVersion = "11.0";
-        maxCudaVersion = "11.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.7.0.84_cuda11-archive.tar.xz";
-        hash = "sha256-z5Z/eNv2wHUkPMg6oYdZ43DbN1SqFbEqChTov2ejqdQ=";
-      }
-      {
-        version = "8.8.1.3";
-        minCudaVersion = "11.0";
-        maxCudaVersion = "11.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.8.1.3_cuda11-archive.tar.xz";
-        hash = "sha256-OzWq+aQkmIbZONmWSYyFoZzem3RldoXyJy7GVT6GM1k=";
-      }
       {
         version = "8.8.1.3";
         minCudaVersion = "12.0";
@@ -68,13 +47,6 @@
         url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.8.1.3_cuda12-archive.tar.xz";
         hash = "sha256-njl3qhudBuuGC1gqyJM2MGdaAkMCnCWb/sW7VpmGfSA=";
       }
-      {
-        version = "8.9.7.29";
-        minCudaVersion = "11.0";
-        maxCudaVersion = "11.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.7.29_cuda11-archive.tar.xz";
-        hash = "sha256-kcN8+0WPVBQZ6YUQ8TqvWXXAIyxhPhi3djhUkAdO6hc=";
-      }
       {
         version = "8.9.7.29";
         minCudaVersion = "12.0";
@@ -89,13 +61,6 @@
         url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-9.3.0.75_cuda12-archive.tar.xz";
         hash = "sha256-Eibdm5iciYY4VSlj0ACjz7uKCgy5uvjLCear137X1jk=";
       }
-      {
-        version = "9.3.0.75";
-        minCudaVersion = "11.8";
-        maxCudaVersion = "11.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-9.3.0.75_cuda11-archive.tar.xz";
-        hash = "sha256-BLVvv3vuFcJOM5wrqU0Xqoi54zTQzRnnWFPcVFJ5S/c=";
-      }
       {
         version = "9.7.1.26";
         minCudaVersion = "12.0";
@@ -103,13 +68,6 @@
         url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-9.7.1.26_cuda12-archive.tar.xz";
         hash = "sha256-koJFUKlesnWwbJCZhBDhLOBRQOBQjwkFZExlTJ7Xp2Q=";
       }
-      {
-        version = "9.7.1.26";
-        minCudaVersion = "11.8";
-        maxCudaVersion = "11.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-9.7.1.26_cuda11-archive.tar.xz";
-        hash = "sha256-JcpY/ylUAaj37bzrJlerSDxO5KgPmpL40Mvl8VquHN4=";
-      }
       {
         version = "9.8.0.87";
         minCudaVersion = "12.0";
@@ -117,13 +75,6 @@
         url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-9.8.0.87_cuda12-archive.tar.xz";
         hash = "sha256-IvYvR08MuzW+9UCtsdhB2mPJzT33azxOQwEPQ2ss2Fw=";
       }
-      {
-        version = "9.8.0.87";
-        minCudaVersion = "11.8";
-        maxCudaVersion = "11.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-9.8.0.87_cuda11-archive.tar.xz";
-        hash = "sha256-j/EXcV+zMjAy0bSJiAEXVWrYteV6kGAUPwy3I4TbdxA=";
-      }
       {
         version = "9.11.0.98";
         minCudaVersion = "12.0";
@@ -135,41 +86,6 @@
     ];
     # x86_64
     linux-x86_64 = [
-      {
-        version = "8.6.0.163";
-        minCudaVersion = "11.0";
-        maxCudaVersion = "11.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda11-archive.tar.xz";
-        hash = "sha256-u8OW30cpTGV+3AnGAGdNYIyxv8gLgtz0VHBgwhcRFZ4=";
-      }
-      {
-        version = "8.7.0.84";
-        minCudaVersion = "11.0";
-        maxCudaVersion = "11.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.7.0.84_cuda11-archive.tar.xz";
-        hash = "sha256-l2xMunIzyXrnQAavq1Fyl2MAukD1slCiH4z3H1nJ920=";
-      }
-      {
-        version = "8.8.1.3";
-        minCudaVersion = "11.0";
-        maxCudaVersion = "11.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.8.1.3_cuda11-archive.tar.xz";
-        hash = "sha256-r3WEyuDMVSS1kT7wjCm6YVQRPGDrCjegWQqRtRWoqPk=";
-      }
-      {
-        version = "8.8.1.3";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.0";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.8.1.3_cuda12-archive.tar.xz";
-        hash = "sha256-edd6dpx+cXWrx7XC7VxJQUjAYYqGQThyLIh/lcYjd3w=";
-      }
-      {
-        version = "8.9.7.29";
-        minCudaVersion = "11.0";
-        maxCudaVersion = "11.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.7.29_cuda11-archive.tar.xz";
-        hash = "sha256-o+JQkCjOzaARfOWg9CEGNG6C6G05D0u5R1r8l2x3QC4=";
-      }
       {
         version = "8.9.7.29";
         minCudaVersion = "12.0";
@@ -184,13 +100,6 @@
         url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.3.0.75_cuda12-archive.tar.xz";
         hash = "sha256-PW7xCqBtyTOaR34rBX4IX/hQC73ueeQsfhNlXJ7/LCY=";
       }
-      {
-        version = "9.3.0.75";
-        minCudaVersion = "11.8";
-        maxCudaVersion = "11.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.3.0.75_cuda11-archive.tar.xz";
-        hash = "sha256-Bp2ghM02jzn7gw1MTpMYAwZPtl52b0z33y2ko0aiup8";
-      }
       {
         version = "9.7.1.26";
         minCudaVersion = "12.0";
@@ -198,13 +107,6 @@
         url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.7.1.26_cuda12-archive.tar.xz";
         hash = "sha256-EJpeXGvN9Dlub2Pz+GLtLc8W7pPuA03HBKGxG98AwLE=";
       }
-      {
-        version = "9.7.1.26";
-        minCudaVersion = "11.8";
-        maxCudaVersion = "11.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.7.1.26_cuda11-archive.tar.xz";
-        hash = "sha256-c6rfLRtyGjS9e5CQjQKQYlfyrdvSRs+NtY4h1o2FXqI=";
-      }
       {
         version = "9.8.0.87";
         minCudaVersion = "12.0";
@@ -212,13 +114,6 @@
         url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.8.0.87_cuda12-archive.tar.xz";
         hash = "sha256-MhubM7sSh0BNk9VnLTUvFv6rxLIgrGrguG5LJ/JX3PQ=";
       }
-      {
-        version = "9.8.0.87";
-        minCudaVersion = "11.8";
-        maxCudaVersion = "11.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.8.0.87_cuda11-archive.tar.xz";
-        hash = "sha256-z03674MR2YfWQKMi9mjNUkCsPlMCq+lhfdmRtbJTJ1g=";
-      }
       {
         version = "9.11.0.98";
         minCudaVersion = "12.0";
diff --git a/pkgs/development/cuda-modules/packages/backendStdenv.nix b/pkgs/development/cuda-modules/packages/backendStdenv.nix
index 7122ad2da319..c0fbb7068a9a 100644
--- a/pkgs/development/cuda-modules/packages/backendStdenv.nix
+++ b/pkgs/development/cuda-modules/packages/backendStdenv.nix
@@ -1,9 +1,9 @@
 # This is what nvcc uses as a backend,
-# and it has to be an officially supported one (e.g. gcc11 for cuda11).
+# and it has to be an officially supported one (e.g. gcc14 for cuda12).
 #
 # It, however, propagates current stdenv's libstdc++ to avoid "GLIBCXX_* not found errors"
 # when linked with other C++ libraries.
-# E.g. for cudaPackages_11_8 we use gcc11 with gcc12's libstdc++
+# E.g. for cudaPackages_12_9 we use gcc14 with gcc's libstdc++
 # Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context
 {
   config,
diff --git a/pkgs/development/cuda-modules/packages/nccl-tests.nix b/pkgs/development/cuda-modules/packages/nccl-tests.nix
index 4b61d95895dc..4ce489a34d00 100644
--- a/pkgs/development/cuda-modules/packages/nccl-tests.nix
+++ b/pkgs/development/cuda-modules/packages/nccl-tests.nix
@@ -49,8 +49,6 @@ backendStdenv.mkDerivation (finalAttrs: {
     nccl
     cuda_nvcc # crt/host_config.h
     cuda_cudart
-  ]
-  ++ lib.optionals (cudaAtLeast "12.0") [
     cuda_cccl # <nv/target>
   ]
   ++ lib.optionals mpiSupport [ mpi ];
diff --git a/pkgs/development/cuda-modules/packages/nccl.nix b/pkgs/development/cuda-modules/packages/nccl.nix
index 083bce92b1a8..2d89653ebe0d 100644
--- a/pkgs/development/cuda-modules/packages/nccl.nix
+++ b/pkgs/development/cuda-modules/packages/nccl.nix
@@ -20,14 +20,8 @@ let
     cudaAtLeast
     flags
     ;
-  # versions 2.26+ with CUDA 11.x error with
-  # fatal error: cuda/atomic: No such file or directory
-  version = if cudaAtLeast "12.0" then "2.27.6-1" else "2.25.1-1";
-  hash =
-    if cudaAtLeast "12.0" then
-      "sha256-/BiLSZaBbVIqOfd8nQlgUJub0YR3SR4B93x2vZpkeiU="
-    else
-      "sha256-3snh0xdL9I5BYqdbqdl+noizJoI38mZRVOJChgEE1I8=";
+  version = "2.27.6-1";
+  hash = "sha256-/BiLSZaBbVIqOfd8nQlgUJub0YR3SR4B93x2vZpkeiU=";
 in
 backendStdenv.mkDerivation (finalAttrs: {
   pname = "nccl";
@@ -58,12 +52,8 @@ backendStdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cuda_nvcc # crt/host_config.h
     cuda_cudart
-  ]
-  # NOTE: CUDA versions in Nixpkgs only use a major and minor version. When we do comparisons
-  # against other version, like below, it's important that we use the same format. Otherwise,
-  # we'll get incorrect results.
-  # For example, lib.versionAtLeast "12.0" "12.0.0" == false.
-  ++ lib.optionals (cudaAtLeast "12.0") [ cuda_cccl ];
+    cuda_cccl
+  ];
 
   env.NIX_CFLAGS_COMPILE = toString [ "-Wno-unused-function" ];
 
diff --git a/pkgs/development/cuda-modules/packages/saxpy/package.nix b/pkgs/development/cuda-modules/packages/saxpy/package.nix
index afed598510de..5e3c2bb168ad 100644
--- a/pkgs/development/cuda-modules/packages/saxpy/package.nix
+++ b/pkgs/development/cuda-modules/packages/saxpy/package.nix
@@ -37,8 +37,8 @@ backendStdenv.mkDerivation {
     (getLib libcublas)
     (getOutput "static" libcublas)
     cuda_cudart
-  ]
-  ++ lib.optionals (cudaAtLeast "12.0") [ cuda_cccl ];
+    cuda_cccl
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
diff --git a/pkgs/development/cuda-modules/tensorrt/releases.nix b/pkgs/development/cuda-modules/tensorrt/releases.nix
index 565837d38c5b..17cf4fd698b0 100644
--- a/pkgs/development/cuda-modules/tensorrt/releases.nix
+++ b/pkgs/development/cuda-modules/tensorrt/releases.nix
@@ -10,14 +10,6 @@
     linux-ppc64le = [ ];
     # server-grade arm
     linux-sbsa = [
-      {
-        version = "8.5.3.1";
-        minCudaVersion = "11.8";
-        maxCudaVersion = "11.8";
-        cudnnVersion = "8.6";
-        filename = "TensorRT-8.5.3.1.Ubuntu-20.04.aarch64-gnu.cuda-11.8.cudnn8.6.tar.gz";
-        hash = "sha256-GW//mX0brvN/waHo9Wd07xerOEz3X/H/HAW2ZehYtTA=";
-      }
       {
         version = "8.6.1.6";
         minCudaVersion = "12.0";
@@ -45,22 +37,6 @@
     ];
     # x86_64
     linux-x86_64 = [
-      {
-        version = "8.5.3.1";
-        minCudaVersion = "11.0";
-        maxCudaVersion = "11.8";
-        cudnnVersion = "8.6";
-        filename = "TensorRT-8.5.3.1.Linux.x86_64-gnu.cuda-11.8.cudnn8.6.tar.gz";
-        hash = "sha256-BNeuOYvPTUAfGxI0DVsNrX6Z/FAB28+SE0ptuGu7YDY=";
-      }
-      {
-        version = "8.6.1.6";
-        minCudaVersion = "11.0";
-        maxCudaVersion = "11.8";
-        cudnnVersion = "8.9";
-        filename = "TensorRT-8.6.1.6.Linux.x86_64-gnu.cuda-11.8.tar.gz";
-        hash = "sha256-Fb/mBT1F/uxF7McSOpEGB2sLQ/oENfJC2J3KB3gzd1k=";
-      }
       {
         version = "8.6.1.6";
         minCudaVersion = "12.0";
@@ -69,14 +45,6 @@
         filename = "TensorRT-8.6.1.6.Linux.x86_64-gnu.cuda-12.0.tar.gz";
         hash = "sha256-D4FXpfxTKZQ7M4uJNZE3M1CvqQyoEjnNrddYDNHrolQ=";
       }
-      {
-        version = "10.3.0.26";
-        minCudaVersion = "11.0";
-        maxCudaVersion = "11.8";
-        cudnnVersion = "8.9";
-        filename = "TensorRT-10.3.0.26.Linux.x86_64-gnu.cuda-11.8.tar.gz";
-        hash = "sha256-1O9TwlUP0eLqTozMs53EefmjriiaHjxb4A4GIuN9jvc=";
-      }
       {
         version = "10.3.0.26";
         minCudaVersion = "12.0";
@@ -85,14 +53,6 @@
         filename = "TensorRT-10.3.0.26.Linux.x86_64-gnu.cuda-12.5.tar.gz";
         hash = "sha256-rf8c1avl2HATgGFyNR5Y/QJOW/D8YdSe9LhM047ZkIE=";
       }
-      {
-        version = "10.8.0.43";
-        minCudaVersion = "11.0";
-        maxCudaVersion = "11.8";
-        cudnnVersion = "8.9";
-        filename = "TensorRT-10.8.0.43.Linux.x86_64-gnu.cuda-11.8.tar.gz";
-        hash = "sha256-ZhdJ9ZUanOSQ3TbKNEIvS+fHLQ+TXZ+SdrUL4UiER+k=";
-      }
       {
         version = "10.8.0.43";
         minCudaVersion = "12.0";
@@ -101,14 +61,6 @@
         filename = "TensorRT-10.8.0.43.Linux.x86_64-gnu.cuda-12.8.tar.gz";
         hash = "sha256-V31tivU4FTQUuYZ8ZmtPZYUvwusefA6jogbl+vvH1J4=";
       }
-      {
-        version = "10.9.0.34";
-        minCudaVersion = "11.0";
-        maxCudaVersion = "11.8";
-        cudnnVersion = "8.9";
-        filename = "TensorRT-10.9.0.34.Linux.x86_64-gnu.cuda-11.8.tar.gz";
-        hash = "sha256-nQtdgeOIxRA8RsL3ZvQHeBxA4dbJvyWEoFvmSxPaBLA=";
-      }
       {
         version = "10.9.0.34";
         minCudaVersion = "12.0";
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 8d334c5cc8b7..6d40fc7d61a1 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -111,7 +111,8 @@ let
   # use compatible cuDNN (https://www.tensorflow.org/install/source#gpu)
   # cudaPackages.cudnn led to this:
   # https://github.com/tensorflow/tensorflow/issues/60398
-  cudnnAttribute = "cudnn_8_6";
+  #cudnnAttribute = "cudnn_8_6";
+  cudnnAttribute = "cudnn";
   cudnnMerged = symlinkJoin {
     name = "cudnn-merged";
     paths = [
@@ -584,7 +585,11 @@ let
       maintainers = with lib.maintainers; [ abbradar ];
       platforms = with lib.platforms; linux ++ darwin;
       broken =
-        stdenv.hostPlatform.isDarwin
+        # Dependencies are EOL and have been removed; an update
+        # to a newer TensorFlow version will be required to fix the
+        # source build.
+        true
+        || stdenv.hostPlatform.isDarwin
         || !(xlaSupport -> cudaSupport)
         || !(cudaSupport -> builtins.hasAttr cudnnAttribute cudaPackages)
         || !(cudaSupport -> cudaPackages ? cudatoolkit);
diff --git a/pkgs/development/python-modules/tensorrt/default.nix b/pkgs/development/python-modules/tensorrt/default.nix
index 2dcdb54035a3..1a14db80348b 100644
--- a/pkgs/development/python-modules/tensorrt/default.nix
+++ b/pkgs/development/python-modules/tensorrt/default.nix
@@ -14,7 +14,6 @@ let
   wheelVersion = lib.optionalString (cudaPackages ? tensorrt) (
     if
       (builtins.elem buildVersion [
-        "8.6.1.6"
         "10.3.0.26"
       ])
     then
diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix
index dfe9b543b4fb..2ed72caa1caf 100644
--- a/pkgs/test/cuda/default.nix
+++ b/pkgs/test/cuda/default.nix
@@ -4,9 +4,6 @@
 
   cudaPackages,
 
-  cudaPackages_11_8,
-  cudaPackages_11,
-
   cudaPackages_12_0,
   cudaPackages_12_1,
   cudaPackages_12_2,
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ac417a127764..ebf094042002 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -655,6 +655,16 @@ mapAliases {
   cudaPackages_10_1 = throw "CUDA 10.1 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
   cudaPackages_10_2 = throw "CUDA 10.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
   cudaPackages_10 = throw "CUDA 10 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
+  cudaPackages_11_0 = throw "CUDA 11.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_11_1 = throw "CUDA 11.1 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_11_2 = throw "CUDA 11.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_11_3 = throw "CUDA 11.3 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_11_4 = throw "CUDA 11.4 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_11_5 = throw "CUDA 11.5 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_11_6 = throw "CUDA 11.6 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_11_7 = throw "CUDA 11.7 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_11_8 = throw "CUDA 11.8 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_11 = throw "CUDA 11 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
   cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27
   cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16cc47ed1aa2..b225e5459fb2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2651,9 +2651,6 @@ with pkgs;
   # Top-level fix-point used in `cudaPackages`' internals
   _cuda = import ../development/cuda-modules/_cuda;
 
-  cudaPackages_11_8 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.8"; };
-  cudaPackages_11 = recurseIntoAttrs cudaPackages_11_8;
-
   cudaPackages_12_0 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.0"; };
   cudaPackages_12_1 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.1"; };
   cudaPackages_12_2 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.2"; };
@@ -2669,7 +2666,6 @@ with pkgs;
 
   # TODO: move to alias
   cudatoolkit = cudaPackages.cudatoolkit;
-  cudatoolkit_11 = cudaPackages_11.cudatoolkit;
 
   curlFull = curl.override {
     ldapSupport = true;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5eb818759f92..8cf2bec48f6c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17886,7 +17886,8 @@ self: super: with self; {
       compat = rec {
         protobufTF = pkgs.protobuf_21.override { abseil-cpp = pkgs.abseil-cpp_202301; };
         # https://www.tensorflow.org/install/source#gpu
-        cudaPackagesTF = pkgs.cudaPackages_11;
+        #cudaPackagesTF = pkgs.cudaPackages_11;
+        cudaPackagesTF = pkgs.cudaPackages;
         grpcTF =
           (pkgs.grpc.overrideAttrs (oldAttrs: rec {
             # nvcc fails on recent grpc versions, so we use the latest patch level

From d261f16536d3288cb21c3ab9f951de0a679111e8 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 22 Aug 2025 10:56:55 -0400
Subject: [PATCH 2759/3724] python313Packages.edlib: 1.3.9 -> 1.3.9post1

edlib: unstable-2021-08-20 -> 1.3.9post1
---
 pkgs/by-name/ed/edlib/package.nix             | 18 +++++++--------
 .../python-modules/edlib/default.nix          | 23 ++++++++++++-------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/ed/edlib/package.nix b/pkgs/by-name/ed/edlib/package.nix
index 7042a92b8caf..9358ca49435c 100644
--- a/pkgs/by-name/ed/edlib/package.nix
+++ b/pkgs/by-name/ed/edlib/package.nix
@@ -5,15 +5,15 @@
   cmake,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "edlib";
-  version = "unstable-2021-08-20";
+  version = "1.3.9.post1";
 
   src = fetchFromGitHub {
     owner = "Martinsos";
     repo = "edlib";
-    rev = "f8afceb49ab0095c852e0b8b488ae2c88e566afd";
-    hash = "sha256-P/tFbvPBtA0MYCNDabW+Ypo3ltwP4S+6lRDxwAZ1JFo=";
+    tag = finalAttrs.version;
+    hash = "sha256-XejxohLVdBBzpYZ//OpqC1ActmCaZ8tunJyhOYtZmKQ=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -25,11 +25,11 @@ stdenv.mkDerivation {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://martinsos.github.io/edlib";
     description = "Lightweight, fast C/C++ library for sequence alignment using edit distance";
-    maintainers = with maintainers; [ bcdarwin ];
-    license = licenses.mit;
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/development/python-modules/edlib/default.nix b/pkgs/development/python-modules/edlib/default.nix
index 5a16cd6e023f..2a464b1565b3 100644
--- a/pkgs/development/python-modules/edlib/default.nix
+++ b/pkgs/development/python-modules/edlib/default.nix
@@ -4,14 +4,17 @@
   edlib,
   cython,
   python,
+  setuptools,
 }:
 
 buildPythonPackage {
-  inherit (edlib) pname src meta;
-  version = "1.3.9";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
+  inherit (edlib)
+    pname
+    src
+    version
+    meta
+    ;
+  pyproject = true;
 
   sourceRoot = "${edlib.src.name}/bindings/python";
 
@@ -19,10 +22,14 @@ buildPythonPackage {
     ln -s ${edlib.src}/edlib .
   '';
 
-  EDLIB_OMIT_README_RST = 1;
-  EDLIB_USE_CYTHON = 1;
+  env.EDLIB_OMIT_README_RST = 1;
+  env.EDLIB_USE_CYTHON = 1;
+
+  build-system = [
+    setuptools
+    cython
+  ];
 
-  nativeBuildInputs = [ cython ];
   buildInputs = [ edlib ];
 
   checkPhase = ''

From 55b046451c118c858e8ae3aa6dd9b198bf0f6704 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 17:18:02 +0200
Subject: [PATCH 2760/3724] ci: remove python-updates from development branches

The python-updates branch is not a "development" branch in the sense of
ci/README.md's classification. That's because it allows force pushes.
When rewrites are possible, cherry-picking from this branch should not
be allowed, because the commit references will potentially end up out of
sync.

These kind of branches are now termed "Work-in-Progress" branches. Up
until recently these branches didn't work well for Pull Requests
targeting them, because Eval wouldn't run on them with a push event and
thus, Eval in the PR couldn't succeed either. That's now fixed, PRs
towards *any* WIP branch should work correctly.
---
 .github/workflows/push.yml          | 1 -
 ci/README.md                        | 2 +-
 ci/request-reviews/dev-branches.txt | 1 -
 ci/supportedBranches.js             | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 265f0fba8927..4031c3a9cc6f 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -13,7 +13,6 @@ on:
       - release-*
       - staging-*
       - haskell-updates
-      - python-updates
 
 permissions: {}
 
diff --git a/ci/README.md b/ci/README.md
index c55d0ca62d07..797f231aea62 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -36,7 +36,7 @@ For the purposes of CI, branches in the NixOS/nixpkgs repository are classified
   - Pull Requests required.
   - Long-lived, no deletion, no force push.
 - **Secondary development** branches
-  - `staging-` prefix, `haskell-updates` and `python-updates`
+  - `staging-` prefix and `haskell-updates`
   - Pull Requests normally required, except when merging development branches into each other.
   - Long-lived, no deletion, no force push.
 - **Work-In-Progress** branches
diff --git a/ci/request-reviews/dev-branches.txt b/ci/request-reviews/dev-branches.txt
index 9e0609e325ec..b34092546f18 100644
--- a/ci/request-reviews/dev-branches.txt
+++ b/ci/request-reviews/dev-branches.txt
@@ -6,4 +6,3 @@ staging
 release-*
 staging-*
 haskell-updates
-python-updates
diff --git a/ci/supportedBranches.js b/ci/supportedBranches.js
index d1a826e89147..fd7dcc9144f3 100755
--- a/ci/supportedBranches.js
+++ b/ci/supportedBranches.js
@@ -9,7 +9,6 @@ const typeConfig = {
   staging: ['development', 'secondary'],
   'staging-next': ['development', 'secondary'],
   'haskell-updates': ['development', 'secondary'],
-  'python-updates': ['development', 'secondary'],
   nixos: ['channel'],
   nixpkgs: ['channel'],
 }

From 1bcb29135a399074b023c47f9be4da7ac6b1f2bc Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2761/3724] cudaPackages_{12_0,12_1,12_2,12_3,12_4,12_5}: drop

---
 doc/languages-frameworks/cuda.section.md      |    6 +-
 doc/release-notes/rl-2511.section.md          |    2 +-
 .../cuda-modules/_cuda/db/bootstrap/cuda.nix  |   10 -
 .../cuda-modules/_cuda/db/bootstrap/nvcc.nix  |   82 +-
 .../cuda-modules/_cuda/fixups/cuda_gdb.nix    |    8 +-
 .../cuda-modules/_cuda/fixups/cuda_nvcc.nix   |    8 -
 .../cuda-modules/_cuda/fixups/libcusolver.nix |   19 +-
 .../_cuda/fixups/nsight_compute.nix           |    7 -
 .../cuda-modules/cuda-samples/extension.nix   |   31 -
 .../cuda-modules/cuda-samples/generic.nix     |   70 -
 .../cuda-modules/cuda/extension.nix           |    6 -
 .../cuda/manifests/feature_12.0.1.json        | 1622 ----------------
 .../cuda/manifests/feature_12.1.1.json        | 1622 ----------------
 .../cuda/manifests/feature_12.2.2.json        | 1600 ----------------
 .../cuda/manifests/feature_12.3.2.json        | 1316 -------------
 .../cuda/manifests/feature_12.4.1.json        | 1674 -----------------
 .../cuda/manifests/feature_12.5.1.json        | 1374 --------------
 .../cuda/manifests/redistrib_12.0.1.json      | 1127 -----------
 .../cuda/manifests/redistrib_12.1.1.json      | 1127 -----------
 .../cuda/manifests/redistrib_12.2.2.json      | 1151 ------------
 .../cuda/manifests/redistrib_12.3.2.json      |  971 ----------
 .../cuda/manifests/redistrib_12.4.1.json      | 1205 ------------
 .../cuda/manifests/redistrib_12.5.1.json      | 1025 ----------
 .../cuda-modules/cudatoolkit/default.nix      |    6 +-
 .../cuda-modules/cudnn/releases.nix           |   14 -
 .../cuda-modules/cutensor/extension.nix       |    5 -
 .../cutensor/manifests/feature_1.3.3.json     |   44 -
 .../cutensor/manifests/feature_1.4.0.json     |   44 -
 .../cutensor/manifests/feature_1.5.0.json     |   44 -
 .../cutensor/manifests/feature_1.6.2.json     |   44 -
 .../cutensor/manifests/feature_1.7.0.json     |   44 -
 .../cutensor/manifests/redistrib_1.3.3.json   |   32 -
 .../cutensor/manifests/redistrib_1.4.0.json   |   32 -
 .../cutensor/manifests/redistrib_1.5.0.json   |   32 -
 .../cutensor/manifests/redistrib_1.6.2.json   |   32 -
 .../cutensor/manifests/redistrib_1.7.0.json   |   32 -
 .../cuda-modules/tensorrt/releases.nix        |   24 -
 .../jax-cuda12-pjrt/default.nix               |    3 +-
 .../jax-cuda12-plugin/default.nix             |    3 +-
 .../python-modules/tensorrt/default.nix       |   14 +-
 pkgs/test/cuda/default.nix                    |    7 -
 pkgs/top-level/aliases.nix                    |    6 +
 pkgs/top-level/all-packages.nix               |    6 -
 pkgs/top-level/cuda-packages.nix              |   11 +-
 44 files changed, 28 insertions(+), 16514 deletions(-)
 delete mode 100644 pkgs/development/cuda-modules/cuda-samples/extension.nix
 delete mode 100644 pkgs/development/cuda-modules/cuda-samples/generic.nix
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/feature_12.0.1.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/feature_12.1.1.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/feature_12.2.2.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/feature_12.3.2.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/feature_12.4.1.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/feature_12.5.1.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/redistrib_12.0.1.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/redistrib_12.1.1.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/redistrib_12.2.2.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/redistrib_12.3.2.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/redistrib_12.4.1.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/redistrib_12.5.1.json
 delete mode 100644 pkgs/development/cuda-modules/cutensor/manifests/feature_1.3.3.json
 delete mode 100644 pkgs/development/cuda-modules/cutensor/manifests/feature_1.4.0.json
 delete mode 100644 pkgs/development/cuda-modules/cutensor/manifests/feature_1.5.0.json
 delete mode 100644 pkgs/development/cuda-modules/cutensor/manifests/feature_1.6.2.json
 delete mode 100644 pkgs/development/cuda-modules/cutensor/manifests/feature_1.7.0.json
 delete mode 100644 pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.3.3.json
 delete mode 100644 pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.4.0.json
 delete mode 100644 pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.5.0.json
 delete mode 100644 pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.6.2.json
 delete mode 100644 pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.7.0.json

diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index 8699594e1d6d..c7e54b7da4eb 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -12,11 +12,11 @@ Nixpkgs provides a number of CUDA package sets, each based on a different CUDA r
 - `cudaPackages_x`: A major-versioned alias to the major-minor-versioned CUDA package set with the latest widely supported major CUDA release.
 - `cudaPackages`: An unversioned alias to the major-versioned alias for the latest widely supported CUDA release. The package set referenced by this alias is also referred to as the "default" CUDA package set.
 
-It is recommended to use the unversioned `cudaPackages` attribute. While versioned package sets are available (e.g., `cudaPackages_12_2`), they are periodically removed.
+It is recommended to use the unversioned `cudaPackages` attribute. While versioned package sets are available (e.g., `cudaPackages_12_8`), they are periodically removed.
 
 Here are two examples to illustrate the naming conventions:
 
-- If `cudaPackages_12_8` is the latest release in the 12.x series, but core libraries like OpenCV or ONNX Runtime fail to build with it, `cudaPackages_12` may alias `cudaPackages_12_6` instead of `cudaPackages_12_8`.
+- If `cudaPackages_12_9` is the latest release in the 12.x series, but core libraries like OpenCV or ONNX Runtime fail to build with it, `cudaPackages_12` may alias `cudaPackages_12_8` instead of `cudaPackages_12_9`.
 - If `cudaPackages_13_1` is the latest release, but core libraries like PyTorch or Torch Vision fail to build with it, `cudaPackages` may alias `cudaPackages_12` instead of `cudaPackages_13`.
 
 All CUDA package sets include common CUDA packages like `libcublas`, `cudnn`, `tensorrt`, and `nccl`.
@@ -146,7 +146,7 @@ These settings ensure that the CUDA setup hooks function as intended.
 When using `callPackage`, you can choose to pass in a different variant, e.g. when a package requires a specific version of CUDA:
 
 ```nix
-{ mypkg = callPackage { cudaPackages = cudaPackages_12_2; }; }
+{ mypkg = callPackage { cudaPackages = cudaPackages_12_6; }; }
 ```
 
 ::: {.caution}
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index eb34a070f3e8..900d1b168e38 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -69,7 +69,7 @@
 
 - `mongodb-6_0` was removed as it is end of life as of 2025-07-31.
 
-- CUDA versions below 12.0 have been removed, as they are unmaintained upstream and depend on end‐of‐life compilers.
+- CUDA versions below 12.6 have been removed, as they are unmaintained upstream and depend on end‐of‐life compilers.
 
 - `vmware-horizon-client` was renamed to `omnissa-horizon-client`, following [VMware's sale of their end-user business to Omnissa](https://www.omnissa.com/insights/introducing-omnissa-the-former-vmware-end-user-computing-business/). The binary has been renamed from `vmware-view` to `horizon-client`.
 
diff --git a/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
index 1d6dece1e8ed..eaee60b2434e 100644
--- a/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
+++ b/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
@@ -142,16 +142,6 @@
           dontDefaultAfterCudaMajorMinorVersion = "12.5";
         };
 
-        # Jetson AGX Xavier, Drive AGX Pegasus, Xavier NX
-        "7.2" = {
-          archName = "Volta";
-          minCudaMajorMinorVersion = "10.0";
-          # Note: without `cuda_compat`, maxCudaMajorMinorVersion is 11.8
-          # https://docs.nvidia.com/cuda/cuda-for-tegra-appnote/index.html#deployment-considerations-for-cuda-upgrade-package
-          maxCudaMajorMinorVersion = "12.2";
-          isJetson = true;
-        };
-
         # GTX/RTX Turing – GTX 1660 Ti, RTX 2060, RTX 2070, RTX 2080, Titan RTX, Quadro RTX 4000,
         # Quadro RTX 5000, Quadro RTX 6000, Quadro RTX 8000, Quadro T1000/T2000, Tesla T4
         "7.5" = {
diff --git a/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
index f574405150cb..76704f9c5c65 100644
--- a/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
+++ b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
@@ -28,87 +28,7 @@
       ```
   */
   nvccCompatibilities = {
-    # Added support for GCC 12
-    # https://docs.nvidia.com/cuda/archive/12.0.1/cuda-installation-guide-linux/index.html#system-requirements
-    "12.0" = {
-      clang = {
-        maxMajorVersion = "14";
-        minMajorVersion = "7";
-      };
-      gcc = {
-        maxMajorVersion = "12";
-        minMajorVersion = "6";
-      };
-    };
-
-    # Added support for Clang 15
-    # https://docs.nvidia.com/cuda/archive/12.1.1/cuda-toolkit-release-notes/index.html#cuda-compilers-new-features
-    "12.1" = {
-      clang = {
-        maxMajorVersion = "15";
-        minMajorVersion = "7";
-      };
-      gcc = {
-        maxMajorVersion = "12";
-        minMajorVersion = "6";
-      };
-    };
-
-    # Added support for Clang 16
-    # https://docs.nvidia.com/cuda/archive/12.2.2/cuda-installation-guide-linux/index.html#host-compiler-support-policy
-    "12.2" = {
-      clang = {
-        maxMajorVersion = "16";
-        minMajorVersion = "7";
-      };
-      gcc = {
-        maxMajorVersion = "12";
-        minMajorVersion = "6";
-      };
-    };
-
-    # No changes from 12.2 to 12.3
-    # https://docs.nvidia.com/cuda/archive/12.3.2/cuda-installation-guide-linux/index.html#host-compiler-support-policy
-    "12.3" = {
-      clang = {
-        maxMajorVersion = "16";
-        minMajorVersion = "7";
-      };
-      gcc = {
-        maxMajorVersion = "12";
-        minMajorVersion = "6";
-      };
-    };
-
-    # Maximum Clang version is 17
-    # Minimum GCC version is still 6, but all versions prior to GCC 7.3 are deprecated.
-    # Maximum GCC version is 13.2
-    # https://docs.nvidia.com/cuda/archive/12.4.1/cuda-installation-guide-linux/index.html#host-compiler-support-policy
-    "12.4" = {
-      clang = {
-        maxMajorVersion = "17";
-        minMajorVersion = "7";
-      };
-      gcc = {
-        maxMajorVersion = "13";
-        minMajorVersion = "6";
-      };
-    };
-
-    # No changes from 12.4 to 12.5
-    # https://docs.nvidia.com/cuda/archive/12.5.1/cuda-installation-guide-linux/index.html#host-compiler-support-policy
-    "12.5" = {
-      clang = {
-        maxMajorVersion = "17";
-        minMajorVersion = "7";
-      };
-      gcc = {
-        maxMajorVersion = "13";
-        minMajorVersion = "6";
-      };
-    };
-
-    # Maximum Clang version is 18
+    # Our baseline
     # https://docs.nvidia.com/cuda/archive/12.6.0/cuda-installation-guide-linux/index.html#host-compiler-support-policy
     "12.6" = {
       clang = {
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix
index 0e551bb397c5..e3593b0a90f0 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix
@@ -13,10 +13,8 @@
 prevAttrs: {
   buildInputs =
     prevAttrs.buildInputs or [ ]
-    ++ [ gmp ]
-    # Additional dependencies for CUDA 12.5 and later, which
-    # support multiple Python versions.
-    ++ lib.lists.optionals (cudaAtLeast "12.5") [
+    ++ [
+      gmp
       libxcrypt-legacy
       ncurses6
       python310
@@ -30,7 +28,7 @@ prevAttrs: {
     prevAttrs.installPhase or ""
     # Python 3.8 is not in nixpkgs anymore, delete Python 3.8 cuda-gdb support
     # to avoid autopatchelf failing to find libpython3.8.so.
-    + lib.optionalString (cudaAtLeast "12.5") ''
+    + ''
       find $bin -name '*python3.8*' -delete
       find $bin -name '*python3.9*' -delete
     '';
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix
index a4c7c6b55d1a..f042222ab9fd 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix
@@ -1,7 +1,6 @@
 {
   lib,
   backendStdenv,
-  cudaOlder,
   setupCudaHook,
 }:
 prevAttrs: {
@@ -35,13 +34,6 @@ prevAttrs: {
           '$(TOP)/$(_TARGET_DIR_)/include' \
           "''${!outputDev}/include"
     ''
-    # Additional patching required pre-CUDA 12.5.
-    + lib.optionalString (cudaOlder "12.5") ''
-      substituteInPlace bin/nvcc.profile \
-        --replace-fail \
-          '$(TOP)/$(_NVVM_BRANCH_)' \
-          "''${!outputBin}/nvvm"
-    ''
     + ''
       cat << EOF >> bin/nvcc.profile
 
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix
index 5d3e7a1bc926..699f0f708260 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix
@@ -6,19 +6,14 @@
   libnvjitlink ? null,
 }:
 prevAttrs: {
-  buildInputs =
-    prevAttrs.buildInputs or [ ]
-    # Always depends on these
-    ++ [
-      libcublas
-      libnvjitlink
-    ]
-    # Dependency from 12.1 and on
-    ++ lib.lists.optionals (cudaAtLeast "12.1") [ libcusparse ];
+  buildInputs = prevAttrs.buildInputs or [ ] ++ [
+    libcublas
+    libnvjitlink
+    libcusparse
+  ];
 
   brokenConditions = prevAttrs.brokenConditions or { } // {
-    "libnvjitlink missing" = !(libnvjitlink != null);
-    "libcusparse missing (CUDA >= 12.1)" =
-      !(cudaAtLeast "12.1" -> (libcusparse != null && libcusparse != null));
+    "libnvjitlink missing (CUDA >= 12.0)" = libnvjitlink == null;
+    "libcusparse missing (CUDA >= 12.1)" = libcusparse == null;
   };
 }
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
index 584fa362d3f2..2865b0e2fecc 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
@@ -35,13 +35,6 @@ in
       (qt6.qtwebengine or qt6.full)
       rdma-core
     ]
-    ++ lib.optionals (cudaMajorMinorVersion == "12.0" && stdenv.hostPlatform.isAarch64) [
-      libjpeg8
-    ]
-    ++ lib.optionals (cudaAtLeast "12.1" && cudaOlder "12.4") [
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-    ]
     ++ lib.optionals (cudaOlder "12.7") [
       e2fsprogs
       ucx
diff --git a/pkgs/development/cuda-modules/cuda-samples/extension.nix b/pkgs/development/cuda-modules/cuda-samples/extension.nix
deleted file mode 100644
index fc6f8fdb52d8..000000000000
--- a/pkgs/development/cuda-modules/cuda-samples/extension.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  cudaMajorMinorVersion,
-  lib,
-  stdenv,
-}:
-let
-  cudaVersionToHash = {
-    "12.0" = "sha256-Lj2kbdVFrJo5xPYPMiE4BS7Z8gpU5JLKXVJhZABUe/g=";
-    "12.1" = "sha256-xE0luOMq46zVsIEWwK4xjLs7NorcTIi9gbfZPVjIlqo=";
-    "12.2" = "sha256-pOy0qfDjA/Nr0T9PNKKefK/63gQnJV2MQsN2g3S2yng=";
-    "12.3" = "sha256-fjVp0G6uRCWxsfe+gOwWTN+esZfk0O5uxS623u0REAk=";
-  };
-
-  inherit (stdenv) hostPlatform;
-
-  # Samples are built around the CUDA Toolkit, which is not available for
-  # aarch64. Check for both CUDA version and platform.
-  cudaVersionIsSupported = cudaVersionToHash ? ${cudaMajorMinorVersion};
-  platformIsSupported = hostPlatform.isx86_64;
-  isSupported = cudaVersionIsSupported && platformIsSupported;
-
-  # Build our extension
-  extension =
-    final: _:
-    lib.attrsets.optionalAttrs isSupported {
-      cuda-samples = final.callPackage ./generic.nix {
-        hash = cudaVersionToHash.${cudaMajorMinorVersion};
-      };
-    };
-in
-extension
diff --git a/pkgs/development/cuda-modules/cuda-samples/generic.nix b/pkgs/development/cuda-modules/cuda-samples/generic.nix
deleted file mode 100644
index 3c69fc4081ad..000000000000
--- a/pkgs/development/cuda-modules/cuda-samples/generic.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  autoAddDriverRunpath,
-  backendStdenv,
-  cmake,
-  cudatoolkit,
-  cudaMajorMinorVersion,
-  fetchFromGitHub,
-  freeimage,
-  glfw3,
-  hash,
-  lib,
-  pkg-config,
-  stdenv,
-}:
-let
-  inherit (lib) lists strings;
-in
-backendStdenv.mkDerivation (finalAttrs: {
-  strictDeps = true;
-
-  pname = "cuda-samples";
-  version = cudaMajorMinorVersion;
-
-  src = fetchFromGitHub {
-    owner = "NVIDIA";
-    repo = "cuda-samples";
-    rev = "v${finalAttrs.version}";
-    inherit hash;
-  };
-
-  nativeBuildInputs = [
-    autoAddDriverRunpath
-    pkg-config
-  ]
-  # CMake has to run as a native, build-time dependency for libNVVM samples.
-  # However, it's not the primary build tool -- that's still make.
-  # As such, we disable CMake's build system.
-  ++ lists.optionals (strings.versionAtLeast finalAttrs.version "12.2") [ cmake ];
-
-  dontUseCmakeConfigure = true;
-
-  buildInputs = [
-    cudatoolkit
-    freeimage
-    glfw3
-  ];
-
-  enableParallelBuilding = true;
-
-  preConfigure = ''
-    export CUDA_PATH=${cudatoolkit}
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 -t $out/bin bin/${stdenv.hostPlatform.parsed.cpu.name}/${stdenv.hostPlatform.parsed.kernel.name}/release/*
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit";
-    # CUDA itself is proprietary, but these sample apps are not.
-    license = lib.licenses.bsd3;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with lib.maintainers; [ obsidian-systems-maintenance ];
-    teams = [ lib.teams.cuda ];
-  };
-})
diff --git a/pkgs/development/cuda-modules/cuda/extension.nix b/pkgs/development/cuda-modules/cuda/extension.nix
index c04c5e09e61c..706631c06285 100644
--- a/pkgs/development/cuda-modules/cuda/extension.nix
+++ b/pkgs/development/cuda-modules/cuda/extension.nix
@@ -7,12 +7,6 @@ let
   # https://developer.download.nvidia.com/compute/cuda/redist/
   # Maps a cuda version to the specific version of the manifest.
   cudaVersionMap = {
-    "12.0" = "12.0.1";
-    "12.1" = "12.1.1";
-    "12.2" = "12.2.2";
-    "12.3" = "12.3.2";
-    "12.4" = "12.4.1";
-    "12.5" = "12.5.1";
     "12.6" = "12.6.3";
     "12.8" = "12.8.1";
     "12.9" = "12.9.1";
diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.0.1.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.0.1.json
deleted file mode 100644
index 8dd918286158..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/feature_12.0.1.json
+++ /dev/null
@@ -1,1622 +0,0 @@
-{
-  "cuda_cccl": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_compat": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cudart": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuobjdump": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cupti": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": true,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuxxfilt": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_demo_suite": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_documentation": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_gdb": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nsight": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvcc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvdisasm": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvml_dev": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprof": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprune": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvrtc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvtx": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvvp": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_opencl": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_profiler_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sanitizer_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "fabricmanager": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcublas": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcudla": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufft": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufile": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    }
-  },
-  "libcurand": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusolver": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusparse": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnpp": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvidia_nscq": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjitlink": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjpeg": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvvm_samples": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_compute": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_systems": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_vse": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_driver": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_fs": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "visual_studio_integration": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.1.1.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.1.1.json
deleted file mode 100644
index 8dd918286158..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/feature_12.1.1.json
+++ /dev/null
@@ -1,1622 +0,0 @@
-{
-  "cuda_cccl": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_compat": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cudart": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuobjdump": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cupti": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": true,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuxxfilt": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_demo_suite": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_documentation": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_gdb": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nsight": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvcc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvdisasm": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvml_dev": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprof": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprune": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvrtc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvtx": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvvp": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_opencl": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_profiler_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sanitizer_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "fabricmanager": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcublas": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcudla": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufft": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufile": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    }
-  },
-  "libcurand": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusolver": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusparse": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnpp": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvidia_nscq": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjitlink": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjpeg": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvvm_samples": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_compute": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_systems": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_vse": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_driver": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_fs": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "visual_studio_integration": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.2.2.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.2.2.json
deleted file mode 100644
index 84ea7f24ebed..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/feature_12.2.2.json
+++ /dev/null
@@ -1,1600 +0,0 @@
-{
-  "cuda_cccl": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_compat": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cudart": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuobjdump": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cupti": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": true,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuxxfilt": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_demo_suite": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_documentation": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_gdb": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nsight": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvcc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvdisasm": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvml_dev": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprof": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprune": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvrtc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvtx": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvvp": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_opencl": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_profiler_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sanitizer_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "fabricmanager": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcublas": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcudla": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufft": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufile": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    }
-  },
-  "libcurand": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusolver": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusparse": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnpp": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvidia_nscq": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjitlink": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjpeg": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_compute": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_systems": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_vse": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_driver": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_fs": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "visual_studio_integration": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.3.2.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.3.2.json
deleted file mode 100644
index d8e1d0b0aeae..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/feature_12.3.2.json
+++ /dev/null
@@ -1,1316 +0,0 @@
-{
-  "cuda_cccl": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cudart": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuobjdump": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cupti": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": true,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuxxfilt": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_demo_suite": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_documentation": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_gdb": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nsight": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvcc": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvdisasm": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvml_dev": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprof": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprune": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvrtc": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvtx": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvvp": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_opencl": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_profiler_api": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sanitizer_api": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "fabricmanager": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcublas": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufft": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufile": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    }
-  },
-  "libcurand": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusolver": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusparse": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnpp": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvidia_nscq": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjitlink": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjpeg": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_compute": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_systems": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_vse": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_driver": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_fs": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "visual_studio_integration": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.4.1.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.4.1.json
deleted file mode 100644
index 7756c13c4b55..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/feature_12.4.1.json
+++ /dev/null
@@ -1,1674 +0,0 @@
-{
-  "cuda_cccl": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_compat": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cudart": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuobjdump": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cupti": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": true,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuxxfilt": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_demo_suite": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_documentation": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_gdb": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nsight": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvcc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvdisasm": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvml_dev": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprof": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprune": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvrtc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvtx": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvvp": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_opencl": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_profiler_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sanitizer_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "fabricmanager": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "imex": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcublas": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcudla": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufft": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufile": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    }
-  },
-  "libcurand": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusolver": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusparse": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnpp": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvfatbin": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvidia_nscq": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjitlink": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjpeg": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_compute": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_systems": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_vse": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_driver": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_fs": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "visual_studio_integration": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.5.1.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.5.1.json
deleted file mode 100644
index c6740a3b93f3..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/feature_12.5.1.json
+++ /dev/null
@@ -1,1374 +0,0 @@
-{
-  "cuda_cccl": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_compat": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cudart": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuobjdump": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cupti": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": true,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuxxfilt": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_demo_suite": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_documentation": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_gdb": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nsight": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvcc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvdisasm": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvml_dev": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprof": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprune": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvrtc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvtx": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvvp": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_opencl": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_profiler_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sanitizer_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "fabricmanager": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "imex": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcublas": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcudla": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufft": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufile": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    }
-  },
-  "libcurand": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusolver": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusparse": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnpp": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvfatbin": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvidia_nscq": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjitlink": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjpeg": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_compute": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_systems": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_vse": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_driver": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_fs": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "visual_studio_integration": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.0.1.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.0.1.json
deleted file mode 100644
index 48d14f17baf8..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.0.1.json
+++ /dev/null
@@ -1,1127 +0,0 @@
-{
-    "release_date": "2023-01-31",
-    "cuda_cccl": {
-        "name": "CXX Core Compute Libraries",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "99ab5e0f671490141e0f41724f271dbfad75fb1105532f0726523d4fdcf12783",
-            "md5": "b77b8d051671afd1d6f994c67ef3baeb",
-            "size": "1031260"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "12a24d11fe5d77e57adbd9db5a596224a17d6bcee3df7f51a65a3fb01c191028",
-            "md5": "5b5be14567397d68e3d90b86b3ba2f94",
-            "size": "1031500"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "8ac9fa2cbaf2ead8c7794b787eea98a7ee94ecf44f99d564e1a4ae349f08a153",
-            "md5": "0799dc5f7591ceb6b7f10e54366c5884",
-            "size": "1030984"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "4a660ecc7d6651f797279cb5aeeaef90defc33469b2015ef2a15375c7c56aeec",
-            "md5": "94df119ff7099e090e335913869abbdb",
-            "size": "2610906"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "c5333a62613f990396496988c4b6021ffdeea2d633bdd980e7a038cc2db0db79",
-            "md5": "1e969e1e7cd53b8e4d64ee093517a23a",
-            "size": "1031408"
-        }
-    },
-    "cuda_compat": {
-        "name": "CUDA compat L4T",
-        "license": "CUDA Toolkit",
-        "version": "12.0.32271208",
-        "linux-aarch64": {
-            "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-12.0.32271208-archive.tar.xz",
-            "sha256": "343819e63007e307947f2d4ce981a36693bd0266e99516cc0c91b24897e25938",
-            "md5": "ab3e1ac6c9a31912df5620d94ed44ae6",
-            "size": "16078292"
-        }
-    },
-    "cuda_cudart": {
-        "name": "CUDA Runtime (cudart)",
-        "license": "CUDA Toolkit",
-        "version": "12.0.146",
-        "linux-x86_64": {
-            "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.0.146-archive.tar.xz",
-            "sha256": "af047b03ea261db8413fe61cd9c5d480e784b41f286d1cd31925eddaf8b2e84c",
-            "md5": "7b4b29816f73a489cf99b35cd1bc6d1f",
-            "size": "976768"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-12.0.146-archive.tar.xz",
-            "sha256": "21db5f223ba9d6f0c873b81068e6ca9d1dede310ab43d2f200820530aa41ef9b",
-            "md5": "74f380e1b605220c08140d1a09b94761",
-            "size": "968140"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.0.146-archive.tar.xz",
-            "sha256": "33b14bd774b0bec908d4758bfb30fcf2020cd0c93ad899376f438113de3df519",
-            "md5": "837b6e6688b50b85085862b95fb1e5e5",
-            "size": "969116"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.0.146-archive.zip",
-            "sha256": "f40f5ab0d3a566f30d865903f76b504a168a58adc11cf16e0c53f1c2cea4a588",
-            "md5": "bbc51b42e2afb43e20719fd93b9ec4e8",
-            "size": "2362874"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-12.0.146-archive.tar.xz",
-            "sha256": "cb333a5ef5da06aa88823501c3269dbde7b3b2aa53b3cf9d76c7ebad9d53a532",
-            "md5": "672231dc9e9f9fb59d86267d58b831c6",
-            "size": "977400"
-        }
-    },
-    "cuda_cuobjdump": {
-        "name": "cuobjdump",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "6f032c74da29c8a4738e30e69f42111f754dc7ffde2aa0417cfb3b3813aef0a1",
-            "md5": "b22f9840396ae7a033e90a6d84358a89",
-            "size": "166916"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "c1c8361fcbec46156df7fb764a7a8b213f06ec0ae926e98316bc4ec63ce3a68e",
-            "md5": "28894e39e6fa6e5994684a85f557226e",
-            "size": "206572"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "899dde9d02095a6802c81021480dd093ae4a1d2af314ba3cefdd93e8a2eb076b",
-            "md5": "72ce0111cde945e9eae10988086afb17",
-            "size": "175484"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "51def3bad16ad68a33a7fcb3ab75ee8b7c607e025bf1aeb07105377085450691",
-            "md5": "8988bc0c90e8a57de436d44672b2ef7c",
-            "size": "3789889"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "fef156cad68f94b8180ac20b99f57cbbeeb05107ed42dc160b33a529c2cd010f",
-            "md5": "d4c8bbd42a90279a5a77ad9ea47baf1a",
-            "size": "175420"
-        }
-    },
-    "cuda_cupti": {
-        "name": "CUPTI",
-        "license": "CUDA Toolkit",
-        "version": "12.0.146",
-        "linux-x86_64": {
-            "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.0.146-archive.tar.xz",
-            "sha256": "ab0cd16702748861a58668e78fe6ed27d69c649f585a616927e7809a4108881b",
-            "md5": "9450ec8fe5cdef7ad0fad2fae37e04a1",
-            "size": "18991980"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-12.0.146-archive.tar.xz",
-            "sha256": "24d5bdeed953816ea2137393b306dbe1eb269e6411d2d4d50665104357716866",
-            "md5": "3536b230cddd5f569d9db5933e533302",
-            "size": "9815620"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.0.146-archive.tar.xz",
-            "sha256": "df39906fe2320a4b7901b5afe6bc39c43c0cd83871bcd153005166bca3036fba",
-            "md5": "86b5b0201e44a97e7c6d0776f28ccbae",
-            "size": "9725744"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.0.146-archive.zip",
-            "sha256": "cc888b32d5e2d6dfbdab00c5ac99bbb35f45cbee6a9e79f679013a550811a322",
-            "md5": "aeb8b8d7a4a22becfbb0b3500357a423",
-            "size": "13237455"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-12.0.146-archive.tar.xz",
-            "sha256": "36e00f979177b559fd6b137ecbdf8cf9e5ed6d3e2d9960c3d17e9b375cecf540",
-            "md5": "183727f766b796a8819abcbf563f225d",
-            "size": "7679384"
-        }
-    },
-    "cuda_cuxxfilt": {
-        "name": "CUDA cuxxfilt (demangler)",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "fee967a2ca2c22ca74495c55b7771d0f1f373c21e5320d655f0d4dcc863548ec",
-            "md5": "add93722725ad91107e7dc46bba4cd55",
-            "size": "186184"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "5b00578c3504e72c65140b30785a652b1f231b0ef7643a104605ab601a2d38ac",
-            "md5": "85bd21a31c60192b9b88157ff3a5192e",
-            "size": "179804"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "a92c6ac9c386630fcdf4566cada5bb45b8d826690649c1cdb796da0ada07720d",
-            "md5": "e9b4589c18ad44a527237b48afeda30e",
-            "size": "171972"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "c25359098a319adf86020da49c0a7718be0f9684e424f7daee4bc39c5e42063f",
-            "md5": "d2f0a956d3c38740bbd9ede6651aa31a",
-            "size": "168497"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "e53500b0b8b468c03e34bbc05089f6cd2b11e6874e1c9c995e6cde13a50d67f6",
-            "md5": "11daee96f53bf5e095b61b54d6157e5c",
-            "size": "171980"
-        }
-    },
-    "cuda_demo_suite": {
-        "name": "CUDA Demo Suite",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "e535d9c8ca9830c24c70e9b08fb6aef009cc490dbfe11e514a5b6a9abdb87e1f",
-            "md5": "f03dd4d7871da95689970a29fdb889b1",
-            "size": "3972436"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "a220773af909aecfa467eeb1be10c5390bce9660fa3eb7dec56e367ee2984b24",
-            "md5": "9469c1c926def7b2e01e8c1469c21cb1",
-            "size": "5048369"
-        }
-    },
-    "cuda_documentation": {
-        "name": "CUDA Documentation",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "e9d35c48e30a7bb4d8835580494849ca7b5b39b244cafeb792864488f83b3cec",
-            "md5": "97e971e6cfb8b14f25f024096f8de3c1",
-            "size": "67044"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "33f7b839f5f01a81285fc6da4f121cfb8857e7e85ef3041f89332ea39a811981",
-            "md5": "8d597206f5afa27c761bae8a2b67c8e6",
-            "size": "67112"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "1b952a3a38949e546ac70d1307dea0d2013778dd550aa26485d0fde6784c4e81",
-            "md5": "c0a8d48a5d2244458e0ca2fc770201d8",
-            "size": "67180"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "1166dad7c941068e680277b1deb3f92417ce17acbcb4022a262a3a1ad5c410f5",
-            "md5": "59155977b997a67e0b53d45a06d1675c",
-            "size": "105380"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "5c5f1ddc8c05dbf8e46f0de6b300c7dedd91e2047906500e2c4f46a363cca5c3",
-            "md5": "193b5539477134fee9afe8b1456f6251",
-            "size": "67044"
-        }
-    },
-    "cuda_gdb": {
-        "name": "CUDA GDB",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "d8a9f3ce2b10b3586dd6af887b3e00cb76e7013b12e7060d23f01ff9b4808738",
-            "md5": "ae797cca7f7f80e5b34a9d241b262034",
-            "size": "65706444"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "c2cc2e789d267af56b7a0782412d8b4c09229f7e064c6b076401f4a10811695f",
-            "md5": "f060b14655e923dd2364225b08d1fba3",
-            "size": "65484032"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "eb4ee6eed7cf749026e9cdfd1676ea7d39213b16cb8ed9cf3076fb1f56c6f646",
-            "md5": "269fe631516733aee8c382ad2781266a",
-            "size": "65381072"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "f6b3c5eecd79ec0cf1757629231a682c96be96b52c3e50d036071d457ee941dc",
-            "md5": "8ac5b300e21d08be2e64f2f706c99f56",
-            "size": "65243124"
-        }
-    },
-    "cuda_nsight": {
-        "name": "Nsight Eclipse Edition Plugin",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "3495eb983d528dd8d1917e4fabd833e9ec88acb0b30e02fcaf5cfc5598683ec7",
-            "md5": "1bca54c09196aa1c6dacc120fdf9471d",
-            "size": "118610252"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "ad40ea617abe96b4cd55ffb3dcf30b56704dacb35eaacac79391971d69fe9736",
-            "md5": "0a423201f7f68802b94893c37a4b9c6b",
-            "size": "118610260"
-        }
-    },
-    "cuda_nvcc": {
-        "name": "CUDA NVCC",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "906b894dffd853acefe6ab3d2a6cd74a0aa99b34bb8ca1e848174bddf55bfa3b",
-            "md5": "6a0d869f8220935bbaadfc0bb337fa3d",
-            "size": "44036908"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "9cd7b8e584c74a648147c9cfbedb505165c90187f0eb10a4696541ac0751f2b5",
-            "md5": "3ab025c357486c3912f6cc4ce1374f3c",
-            "size": "40987532"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "04ea3493f4411007f1941eacc2de4af2277804a3d5be2e18f2aea54a362431bd",
-            "md5": "c9597a42999bf90124515ea4039e367b",
-            "size": "39730304"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "410100486923612c1984e4b4d93b04c9d689f5aca9e93294f1d78e3af745746b",
-            "md5": "0a82b305e8d5ece3a0ce45a942039c9e",
-            "size": "58942235"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "9540d9b13bc5d576f3ea645cb077b420c672c7197c7e5c9dae3db75d5a671d67",
-            "md5": "38ec2847d9b1418c338e6987826e3c28",
-            "size": "39767432"
-        }
-    },
-    "cuda_nvdisasm": {
-        "name": "CUDA nvdisasm",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "edcd6133f55d04dce7f09c0b9e70b3c2e3b67a4ac526aaaffd98cbdf619fd160",
-            "md5": "432998db00587b79d2df4f167853a8e9",
-            "size": "49877104"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "69e46bf5eafa22ba341a61cdb23cb78fa09b43656c77c219a3a53f2ab5105bc0",
-            "md5": "6c8365934df42e34cb4731038cc59aa0",
-            "size": "49865372"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "591da3a8957102934dd4af1c18a4a781c071b7da6a88213ad05edba3393783ce",
-            "md5": "5eeb1815186c5fed4a9aa6a7ecfdc48f",
-            "size": "49808164"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "ac84be4b8657dff366ac949d2a1827ed30ff8a130a46bad92006c4bad6a79be6",
-            "md5": "7f09d7a69988beefac772b7ac5f5be55",
-            "size": "50113623"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "27bd736406574ab8c4090725da5b3504905e2e2aed4d1cc1fbf3ddbaf1e2cd18",
-            "md5": "2e690fe0ee14d3c052a615b890eb155a",
-            "size": "49797168"
-        }
-    },
-    "cuda_nvml_dev": {
-        "name": "CUDA NVML Headers",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "c775973769480a1e2e1f6dcd3ae8e384e8829bb8afd5669b6f5af9a442b947e3",
-            "md5": "f2503fc3152d1c41adb1b29babefbb30",
-            "size": "81756"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "414c1faea0f537965b3af44631fe2f3a285fdac8d641b8b3c120e48230327ba5",
-            "md5": "e786d89b7bfc30bcdd9914e161b63d59",
-            "size": "81376"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "f41a552e53842e8fe9d0851f29433c115a0bc05cc44c93bc33a7ad5b91d73a14",
-            "md5": "4a0f57b6cc1fcc16ac3277fb47a79b5c",
-            "size": "81856"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "4c753f4b871a62f3586e9c3afa51128445c7b1479da303daebfcbc5a3743e9a8",
-            "md5": "056c25ad1d6e4c113fcd43fbfdbdd970",
-            "size": "114004"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "4635668f7b0dfcf78cf497c2132a7a02eebf2c31ef082edf03a9ff9fe985e3f4",
-            "md5": "35a7f4c9c1c3595b5039c9c11b35d2c9",
-            "size": "81912"
-        }
-    },
-    "cuda_nvprof": {
-        "name": "CUDA nvprof",
-        "license": "CUDA Toolkit",
-        "version": "12.0.146",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.0.146-archive.tar.xz",
-            "sha256": "b37b2f8f5a2289accb75378cf75ed56404b1e608d56f35fcb70c952235fd2f8b",
-            "md5": "41626aec89fa0bd023a9f0ebd9e3d01e",
-            "size": "2438328"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-12.0.146-archive.tar.xz",
-            "sha256": "9accaff6e628e949c8e744900e0b602579b75f40a4b8e225b6faf64ffc691838",
-            "md5": "95d8e7233519f26bcc2a7c6dbede4c03",
-            "size": "2116312"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.0.146-archive.zip",
-            "sha256": "f44dffd0ad1d6e38d1f4a1ac8046e91a8cdf6deb52ea8bb830a07d27dce5d785",
-            "md5": "f7a1de81dc1707ab16413c14fa6075bd",
-            "size": "1699140"
-        }
-    },
-    "cuda_nvprune": {
-        "name": "CUDA nvprune",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "6ffa51a5e0b2977302204b218337900948b1662e596617a5947e520ff4cf3662",
-            "md5": "9e0895e3a15a8654e4d5b5f4749c1445",
-            "size": "56364"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "c8c5b05b8ddf84718c16ebd49076b7759dfac7f8e8118cd25f9b53db9f142ccf",
-            "md5": "54c8d5a5c66798a1f015d88490d0bc6a",
-            "size": "57044"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "38583e2894b3ccb9231a5396d17b0a7484662f50b22cfa3da788f9fe4b8f4e7c",
-            "md5": "ff47e44fa4e14bd97d1bf61b58e73c42",
-            "size": "48380"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "812a98986560898885d0bf404d2c885019af7cf07c76a91198ee3e63c983eea9",
-            "md5": "317154c8f87e3244ebf84f5eee673f05",
-            "size": "145970"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "cbd65b9b9e9c6b25b4ec7537d8e318c209826244b0d448dac3a5249069b35d61",
-            "md5": "117e73f57dbd89f4777bedbd8a1aaf12",
-            "size": "48368"
-        }
-    },
-    "cuda_nvrtc": {
-        "name": "CUDA NVRTC",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "90199c8586a1ee88363358c25e028b1ae301457c5f3e36120a4135b8d941a5d8",
-            "md5": "e060441812dab7d91c6640a8ed75d754",
-            "size": "30077936"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "b6001319eb9ae636a41a1578a86999f596f6e3b68c5a2d3b9f971686dcdc7d28",
-            "md5": "476c0cf7b89963bb7b7be164156fa8d2",
-            "size": "27780348"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "a6af3286a30ffa69ec667886c0e0aa44df23cd32dd77807c39ff8cab1ecc3492",
-            "md5": "22ba03908fb5ecc1e2c5324d83e828ba",
-            "size": "27628256"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "cd8e8c5be748ad2675040ebcf8435c6431ef6dc08e3313e537d67cc31f370c3d",
-            "md5": "e59638914ede3ce08335903618554b4f",
-            "size": "96584114"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "3482f78e1170b3ba5ab43b024c56d635721ca01ab9e3f691eb32544c1743eac9",
-            "md5": "d58028836d92c6aaac6361112e820fa8",
-            "size": "27623484"
-        }
-    },
-    "cuda_nvtx": {
-        "name": "CUDA NVTX",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "de43a0f2b6e1923cf399fd45f4bb233a5d16a4e87ce2c625c8743a1c1e44473a",
-            "md5": "1aa900b42fe683ac2de6f80acb994bdc",
-            "size": "48416"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "acf77f9563c403e395588dffebb38a1aa7022db6b557a3c3bfd74e5fc3afa089",
-            "md5": "81f24300cc240345097e59750d125bd4",
-            "size": "48496"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "0d3a5f2b182dead113f5593d8738761ba4893cf24ba10388d8b65fb3c4cc6e58",
-            "md5": "8cf63d7d607d9ea6701385f5901194d8",
-            "size": "48964"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "e5a79481f7289bf7f2e4f6cf2c50f639fa4f2b3e7155c060e160f0d9ae2e2515",
-            "md5": "18794972b4a5648fb35de89916835097",
-            "size": "65732"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "cdcf8f1e0adaaddd343ed0ad4db54a951233f8584e602ec568bce853968780dc",
-            "md5": "7aaa8ef2a023cddb2036df0718d54645",
-            "size": "48880"
-        }
-    },
-    "cuda_nvvp": {
-        "name": "CUDA NVVP",
-        "license": "CUDA Toolkit",
-        "version": "12.0.146",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.0.146-archive.tar.xz",
-            "sha256": "5d067e1081ace9e3bced739ee3ee15dd17d5120e835bba84ec25f7b55b59c91a",
-            "md5": "c4bdf5353f06cce21a745e003d954a2c",
-            "size": "112429480"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-12.0.146-archive.tar.xz",
-            "sha256": "c81acd1d577243434495d2da002f2bd30d6dd298f0ee46bd44ab509b000d37fd",
-            "md5": "6eabf361592df6c6504edea599fa3408",
-            "size": "117087696"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.0.146-archive.zip",
-            "sha256": "eece54744ed33210e0e117ad5cb68680c787546fbdff8f1fded89493ec7483b3",
-            "md5": "6d96dca3bc76ad0616259cde4f9b932f",
-            "size": "120359555"
-        }
-    },
-    "cuda_opencl": {
-        "name": "CUDA OpenCL",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "100df7f9554b7e2c6139d2ac4a9d6268fe40c78a1346c65ace44f1c1a545f255",
-            "md5": "8de4e80fb65427242823ff40f7ffee84",
-            "size": "69236"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "17e52184c473564c0ed9fd3e9c6be86fba2f41ae5a7526ef2d1416221029ada5",
-            "md5": "846e8734c5a79b4289bd677a40d3bafb",
-            "size": "103599"
-        }
-    },
-    "cuda_profiler_api": {
-        "name": "CUDA Profiler API",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "48663707a6ea2cbf5468b4bd956c650afd5793f0a32f2f8f0775d0a731695495",
-            "md5": "c02d36417d57de4311d410aa50597007",
-            "size": "16048"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_profiler_api/linux-ppc64le/cuda_profiler_api-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "599e7a9d9cc937fd52775545c9d234bbbd0c361632fe16ce5764edb89740d053",
-            "md5": "04b5e051a56a319ec3f4c96619135e95",
-            "size": "16048"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "d181eedf77a91dc4dacec561c5735c957d07f8d7fcb69fa70fe35989c1398a82",
-            "md5": "c6e5719d9aaf0668dae442d2d9ffd903",
-            "size": "16044"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "303405e4184be2cee7ecfbbb3744e33288bcb82f9191f33a58961ee33b53c4f6",
-            "md5": "16a4627384b03b417cd134528ce6269c",
-            "size": "20085"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "047a0d78f2253b1026f4afffc3540d5e26b2315841a5e97cc7346abdf87a8359",
-            "md5": "a587551ecc7be7c7dd54b33caf1c4846",
-            "size": "16048"
-        }
-    },
-    "cuda_sanitizer_api": {
-        "name": "CUDA Compute Sanitizer API",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "9de1b2862f2994c7f730928d715dab442e5de0adba8409d5eabb5cd103a3c0e0",
-            "md5": "76f096cf40b5343fd1e50ab17d4755d4",
-            "size": "8127860"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "2fd04f3345b3010f77120181ea65d0fa507389ca89680d239509e5f38c6bf522",
-            "md5": "9ae700f4339b16e2f1be8db4decf26a4",
-            "size": "7425776"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "fc16a5451538c5c901ba738e89743eb63d0ec6055e9ec892745bb08fc3371cfa",
-            "md5": "fd0ecb32481fa34a86f2f382ae6fd46f",
-            "size": "6006356"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "51abebc3d4bb715b65e8979d1d8d209d955cc56d714d7c8d7561c1a8a7d61186",
-            "md5": "466ad0f4e4a5282eedcaa86fdeda52fb",
-            "size": "13693692"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "f5345690ded34f3ece4a4232480ff78d646beecc175438c4fe2d5986bef9157a",
-            "md5": "c38c53652b569bad8c70dfd76f47623f",
-            "size": "3447724"
-        }
-    },
-    "fabricmanager": {
-        "name": "NVIDIA Fabric Manager",
-        "license": "NVIDIA Driver",
-        "version": "525.85.12",
-        "linux-x86_64": {
-            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-525.85.12-archive.tar.xz",
-            "sha256": "01e6e1a873347c91489860509e6332d5224eb48704dd3160335601083ffd0c74",
-            "md5": "9fb80a825581049edc6900212677a10d",
-            "size": "1629480"
-        },
-        "linux-sbsa": {
-            "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-525.85.12-archive.tar.xz",
-            "sha256": "ba615237bda8b4e939d2cd0967b4c76a74f18266a410414069368b04a3a25d74",
-            "md5": "4d5ff6479fe477e6a7d15a1bd7752ee4",
-            "size": "1508600"
-        }
-    },
-    "libcublas": {
-        "name": "CUDA cuBLAS",
-        "license": "CUDA Toolkit",
-        "version": "12.0.2.224",
-        "linux-x86_64": {
-            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.0.2.224-archive.tar.xz",
-            "sha256": "67f9d7f639762685a93a8d3a12b8625084749fade6a887323fbb53bf6fefc81b",
-            "md5": "935441a812035b68de6e8ac1c5c5b57b",
-            "size": "459134512"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-12.0.2.224-archive.tar.xz",
-            "sha256": "54a6b189a76a924b9e34e76124d7a0564f554c5106b9641d9101c9ea55b9b57b",
-            "md5": "29b5588ea8b9ff28e75d7853490fed72",
-            "size": "382119004"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.0.2.224-archive.tar.xz",
-            "sha256": "024561f702d72795f69a8c2a481da8961c85b954c43a3cb9ad66dd6f01ffbf65",
-            "md5": "3d88d77dbcb3738882f28c6d62aa992b",
-            "size": "456807572"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.0.2.224-archive.zip",
-            "sha256": "d7094c6ac5a9dfa27bfecca7b0afea8293f0828e1bce895c9b87740674bbc75f",
-            "md5": "c6661bab87b9e8f75cd6d1012ea4ec94",
-            "size": "390167374"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-12.0.2.224-archive.tar.xz",
-            "sha256": "779817bf118e62c6a1b80037b045128f389b80b05bde774b4e7ec9b2b03e86c7",
-            "md5": "0b64240177205e6227f12b822c2e42f7",
-            "size": "328770940"
-        }
-    },
-    "libcudla": {
-        "name": "cuDLA",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-aarch64": {
-            "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "7cebd3bebc36e72428132b82363afe3da4430c0f0d67244a2388343c4b134fbb",
-            "md5": "cc0be7e33d4c99f0993da0657cecb33e",
-            "size": "38488"
-        }
-    },
-    "libcufft": {
-        "name": "CUDA cuFFT",
-        "license": "CUDA Toolkit",
-        "version": "11.0.1.95",
-        "linux-x86_64": {
-            "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.0.1.95-archive.tar.xz",
-            "sha256": "0052bb2dfbb2d5bbe11c986b4c6f20cd2fb2ec006336829c70976ce6b9cb3f88",
-            "md5": "58d2016dbacfffb93030f952e3f86dad",
-            "size": "121897888"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-11.0.1.95-archive.tar.xz",
-            "sha256": "ca5d8102a3727494ff09c85245d978d034cb6e6f271060f9a342e1bb40c69a5b",
-            "md5": "2e9b9a83a2fcc0a311c3c34c71b5e86d",
-            "size": "122079000"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.0.1.95-archive.tar.xz",
-            "sha256": "2df31984726527989418ffbec944f2c0fcc59707d5c84dd53c04a35c5b93dc95",
-            "md5": "c4d046384b9cd532b0bfdc67d7ceb643",
-            "size": "121291816"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.0.1.95-archive.zip",
-            "sha256": "3e284518643b7788c38c0f67a9a34f6310b4558a9e72d71d1e7d95a80d947038",
-            "md5": "bf34ccc53e8f01c4294b83cd17ed13b0",
-            "size": "87874793"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-11.0.1.95-archive.tar.xz",
-            "sha256": "c2ded0d0cf2d2686d31da81488d6e0d56c5d97f8509a3de9a7f41a6636d916de",
-            "md5": "b80ed442ecafa22400026f42d272f3fd",
-            "size": "121616748"
-        }
-    },
-    "libcufile": {
-        "name": "CUDA cuFile",
-        "license": "CUDA Toolkit",
-        "version": "1.5.1.14",
-        "linux-x86_64": {
-            "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.5.1.14-archive.tar.xz",
-            "sha256": "5b4a1d07c2edab0a41e538032e986de21d0b463a676c6da8db1874c1be222c98",
-            "md5": "a81f90496568078342e7c8308268b5ee",
-            "size": "40936936"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.5.1.14-archive.tar.xz",
-            "sha256": "5d92d5ce85c34fe543817061af37f5776e065322cadbc8fcc6371609069b5ed9",
-            "md5": "fe7ac7da49dfa00274ea937d5325b677",
-            "size": "40599536"
-        }
-    },
-    "libcurand": {
-        "name": "CUDA cuRAND",
-        "license": "CUDA Toolkit",
-        "version": "10.3.1.124",
-        "linux-x86_64": {
-            "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.1.124-archive.tar.xz",
-            "sha256": "0a890a9dd99c199973d909bd7a4a3614f236810b7b2b713417d1ceeb00cc2c51",
-            "md5": "bc25b5d48ad0946c57bf2be0710970b9",
-            "size": "81951488"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.3.1.124-archive.tar.xz",
-            "sha256": "14a828fca560d9656c416f5b2a1db492e9d4b7910756f8da64d6e18fa145df4a",
-            "md5": "12c06d06351d6423f225a54ac033b374",
-            "size": "81985552"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.1.124-archive.tar.xz",
-            "sha256": "d73bfb1fee2cef2d5e72a71777ebe7a21a3002db95fb1f367c573189c3dd0253",
-            "md5": "f9c1095bcac07a6600f07c54748f031a",
-            "size": "81937240"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.1.124-archive.zip",
-            "sha256": "e214f386e7313371e1a70928f0cefe315093ee9ecceb48b784fcb8d8ce92bbb9",
-            "md5": "c2e74f8cb80a9523b291f219576e914d",
-            "size": "55278625"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.1.124-archive.tar.xz",
-            "sha256": "4d9b6ef38bd646f9a9219e605b6dc2a33ae2b5a15458b57b297f27938eee9a79",
-            "md5": "a0b62f77a0a460be6e70be4324f9cfc8",
-            "size": "82232176"
-        }
-    },
-    "libcusolver": {
-        "name": "CUDA cuSOLVER",
-        "license": "CUDA Toolkit",
-        "version": "11.4.3.1",
-        "linux-x86_64": {
-            "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.4.3.1-archive.tar.xz",
-            "sha256": "7e457ec82af1819d7ceed3bdc68dd31819a51f9562836e24a7a9baecd71af08f",
-            "md5": "7ad5190e540fb9135d658753c45b86e8",
-            "size": "82229860"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.4.3.1-archive.tar.xz",
-            "sha256": "1a413618bc7c6cc7c720d149132a8af980cb9fcccc1ddc61d7987b8512432f01",
-            "md5": "c13e69f550e16d08021bcd759cbdabe5",
-            "size": "82525004"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.4.3.1-archive.tar.xz",
-            "sha256": "f707901e02374dd1bbfa5ac8901da799cca5fdc18c088cd4d8a8d7ba1b91e02e",
-            "md5": "1156776fece680992de827278a708bcc",
-            "size": "81414176"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.4.3.1-archive.zip",
-            "sha256": "f4fd50ca109b8633409c26806dac80f2cb0cf9e8d715158c1addee1403ce9792",
-            "md5": "b39d8229fc5fe70ab055b7bb8eb70531",
-            "size": "122536913"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.4.3.1-archive.tar.xz",
-            "sha256": "9ee052656581ea67b37fcbe0430f680530351bfa77a2fd3575f5afc262a6cf26",
-            "md5": "5244e0816734c75637854d54e1bfb1fa",
-            "size": "75620036"
-        }
-    },
-    "libcusparse": {
-        "name": "CUDA cuSPARSE",
-        "license": "CUDA Toolkit",
-        "version": "12.0.1.140",
-        "linux-x86_64": {
-            "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.0.1.140-archive.tar.xz",
-            "sha256": "e6042e6e8c9f075e6f23a172473a384858dd8d0a1e97950763f96eec329e168b",
-            "md5": "cabeacf931dadcb975d77e6284b4cc84",
-            "size": "204690448"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-12.0.1.140-archive.tar.xz",
-            "sha256": "c5242ffb1297af6829b99351c95b17d340358309e15920100ff1626bfa2beb1a",
-            "md5": "ca44fdb9a271e3518efe020f39ede832",
-            "size": "204824704"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.0.1.140-archive.tar.xz",
-            "sha256": "f0df2c3d36b4529d84f8d447c7640a988f4c52db965b4582abfc282c90173937",
-            "md5": "bbe10d53442afd198854a7baa19983d0",
-            "size": "204323552"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.0.1.140-archive.zip",
-            "sha256": "0721ffa90bcf2d25b46245f76b30a8d948a3a05bca8f63ca0a4380d76ab37233",
-            "md5": "4078766b5b56d2788c4953d298b03f52",
-            "size": "186154754"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-12.0.1.140-archive.tar.xz",
-            "sha256": "878b02e09d73677365fc9195f282164c80f004921ae33b84c804333c1a28ab9d",
-            "md5": "1b5a38918444442d6f96347f1b59a03f",
-            "size": "197912292"
-        }
-    },
-    "libnpp": {
-        "name": "CUDA NPP",
-        "license": "CUDA Toolkit",
-        "version": "12.0.1.104",
-        "linux-x86_64": {
-            "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.0.1.104-archive.tar.xz",
-            "sha256": "8ec3a0b1f4f465f8602a7113b8109fad19433ff03cb4d8e5018c30af29000776",
-            "md5": "39084873a037e853f828b95a1a3a59ed",
-            "size": "184050196"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-12.0.1.104-archive.tar.xz",
-            "sha256": "7a98948ae3de878578acf44a2e164fe8885e51d15001a62b21b58c900e07c5bc",
-            "md5": "306ee2637f755bd64a7ce83309929127",
-            "size": "184321688"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.0.1.104-archive.tar.xz",
-            "sha256": "a34350a0ba18d6d11627ffbff407d356b9505935455bdb5f299b6c3ec5e30dae",
-            "md5": "9c34f25849843d20cce021a136f6858b",
-            "size": "183391228"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.0.1.104-archive.zip",
-            "sha256": "59a51d922eb358097a3e22d1293843d2f3c2004979ac687469c6846b01b4375f",
-            "md5": "058232598b0d0ec8548d27264819b9e3",
-            "size": "152997938"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-12.0.1.104-archive.tar.xz",
-            "sha256": "db02a7461a8921167b86f2b8702fbea545180840895740f6ff006d7578d22734",
-            "md5": "403dde0ba97503e96ae0e22e513b9664",
-            "size": "177965376"
-        }
-    },
-    "libnvidia_nscq": {
-        "name": "NVIDIA NSCQ API",
-        "license": "NVIDIA Driver",
-        "version": "525.85.12",
-        "linux-x86_64": {
-            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-525.85.12-archive.tar.xz",
-            "sha256": "3539eb9651970ea4c1dffa9b5c884c2c421649fff52b691fcc42220f7e24b7ec",
-            "md5": "4ad512a2936fbe583c84aa4c9e06305e",
-            "size": "561656"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-525.85.12-archive.tar.xz",
-            "sha256": "d97f6f9f6c038218ff1bedab1d96d5c94fa48bc2fe2bb2de7d5b221d2f629a31",
-            "md5": "85a6b8d66d05b202752a2e5350515e87",
-            "size": "515764"
-        }
-    },
-    "libnvjitlink": {
-        "name": "NVIDIA compiler library for JIT LTO functionality",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "6bbfae3c369ad5b7807e9697000cb60ecc84e4a21af9376b9f42ed56f8ce9c7a",
-            "md5": "b35eecc3329a2bee14681d869e7fe47f",
-            "size": "25648248"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnvjitlink/linux-ppc64le/libnvjitlink-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "5e2852073355e56d8cb8b13471dd64b2192ef65d86f4729e79196316d09e9190",
-            "md5": "674254a8c7618392655edf25740ef555",
-            "size": "23619516"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "7b45ef9787670e2676257e769deb60c12467a4751806ed4da49ff6c3826e8939",
-            "md5": "1271ae15c7378d5e8e890b5799aa1aad",
-            "size": "23449160"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "88c4d3ca3fe2275b4ef0212034a67748465af2e9e193560c63c4c251f618caf9",
-            "md5": "998fcaa70cb98b1667e67f20bc235ace",
-            "size": "86246489"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnvjitlink/linux-aarch64/libnvjitlink-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "65fd365da945c56562057ab2992582783bfa69f411a69f8bc51635349737821b",
-            "md5": "59b5856a104a98ae441d7a70f7aaeb94",
-            "size": "23450460"
-        }
-    },
-    "libnvjpeg": {
-        "name": "CUDA nvJPEG",
-        "license": "CUDA Toolkit",
-        "version": "12.0.1.102",
-        "linux-x86_64": {
-            "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.0.1.102-archive.tar.xz",
-            "sha256": "b32bcd888bbbbb33f5005ac0e6a11eedaa5b959ecf9ee3249efc171f51a113ec",
-            "md5": "e82d14cff3fbb8b3cb10a51741ecf477",
-            "size": "1969992"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-12.0.1.102-archive.tar.xz",
-            "sha256": "89202c70183641b619dfef9735a2733c84ff8253c0285f8285c5e18653b0a990",
-            "md5": "0a05211b4466527f6c711e4ca9f732cc",
-            "size": "1980928"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.0.1.102-archive.tar.xz",
-            "sha256": "7ef6721a63aed4cd352c0099e68dd9e4da9d46bfefa51e4fbc2502c25e65f9cc",
-            "md5": "07f679e66d7f796bcda1e54e074c48ef",
-            "size": "1785664"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.0.1.102-archive.zip",
-            "sha256": "c79833f8f39c0dfa113418f277d97eb251fc21ba1a2513270ada080e367c2a5e",
-            "md5": "1f7bc966ef37116f8e229c29a1fa38a4",
-            "size": "1944326"
-        }
-    },
-    "libnvvm_samples": {
-        "name": "NVVM library samples",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "linux-x86_64": {
-            "relative_path": "libnvvm_samples/linux-x86_64/libnvvm_samples-linux-x86_64-12.0.140-archive.tar.xz",
-            "sha256": "ce3929b34e8e384c723812d4a9c0f11548ba0babcb48d60055c3df60fe188715",
-            "md5": "538f8a1603d7b61b5b05199cb963f059",
-            "size": "28996"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnvvm_samples/linux-ppc64le/libnvvm_samples-linux-ppc64le-12.0.140-archive.tar.xz",
-            "sha256": "4df51724b43fcaa04d6c3ce5dc399a8b769ae467dbaacc4d7a3bd9c20d3ec4c8",
-            "md5": "1e1afdcaf6f5842dacd4bdf21e64675d",
-            "size": "29012"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvvm_samples/linux-sbsa/libnvvm_samples-linux-sbsa-12.0.140-archive.tar.xz",
-            "sha256": "a2335d32398255a2d320c02190e765fb24152390cebae5c769bf36cad68b8012",
-            "md5": "c50e4529ebe1c4c5c744079f5ea78e24",
-            "size": "29000"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvvm_samples/windows-x86_64/libnvvm_samples-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "333f4061c49e4b16e2c27e8d98e4d15c6022d054d9961abb735f769362bc1598",
-            "md5": "00c4ba15a0e049e1cf32842c010849da",
-            "size": "44435"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnvvm_samples/linux-aarch64/libnvvm_samples-linux-aarch64-12.0.140-archive.tar.xz",
-            "sha256": "58fb261c21b65e621435c3aa84e74ca226a83b8aef10aa819597ee90dc156729",
-            "md5": "6173ccfadd99fab98ceafa1a7f783dfb",
-            "size": "29016"
-        }
-    },
-    "nsight_compute": {
-        "name": "Nsight Compute",
-        "license": "NVIDIA SLA",
-        "version": "2022.4.1.6",
-        "linux-x86_64": {
-            "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2022.4.1.6-archive.tar.xz",
-            "sha256": "956e33a364c05c241119ad516e3f60bedafa3153e3e9c0767d339e991cb7834e",
-            "md5": "965db56d5e997049488d3d9d4330ac90",
-            "size": "704959776"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2022.4.1.6-archive.tar.xz",
-            "sha256": "ee5573bacb6b9f62a4d72cfaa206e932b47104a92e5ecb5b66f477f2b246aef3",
-            "md5": "3e6d3d24244026f434aec56561f22511",
-            "size": "181949792"
-        },
-        "linux-sbsa": {
-            "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2022.4.1.6-archive.tar.xz",
-            "sha256": "ffe9a0ab066d507b6842eadb6742cf96809d040b94cc8290b5d385622b0e1a44",
-            "md5": "ffbcb1f275e8d2015205334f46661e08",
-            "size": "341205496"
-        },
-        "windows-x86_64": {
-            "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2022.4.1.6-archive.zip",
-            "sha256": "28c5bd4fd1feb9bcc8d172c7de9892443d0b58ff805780d7d73a69e641f4e542",
-            "md5": "0592d427662087dc120bc5c1a50b24fb",
-            "size": "634500519"
-        },
-        "linux-aarch64": {
-            "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2022.4.1.6-archive.tar.xz",
-            "sha256": "aa2c3b2ed5876ae456f2a18b2c7ad1ef7a9513045fd5265080d499db6a3c7c98",
-            "md5": "5ee36f325cffd6668b30ecbad5916ac3",
-            "size": "704427344"
-        }
-    },
-    "nsight_systems": {
-        "name": "Nsight Systems",
-        "license": "NVIDIA SLA",
-        "version": "2022.4.2.50",
-        "linux-x86_64": {
-            "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2022.4.2.50-archive.tar.xz",
-            "sha256": "3bc4e45b902769e3863f2666d494702646f94c45879a4bcfbc95d75ca752e53a",
-            "md5": "8222d8bb9c59ce9c6533ba00dd6990b8",
-            "size": "197298716"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2022.4.2.50-archive.tar.xz",
-            "sha256": "b5697fbc0ca527bbcfe9843618726b902c37505e74b87bfa29a7f7c5fe8a2dff",
-            "md5": "1b25cc578badf50022f88ef910fdb4ad",
-            "size": "53269504"
-        },
-        "linux-sbsa": {
-            "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2022.4.2.50-archive.tar.xz",
-            "sha256": "4a4fa9fb31e4d4761c0f37b5cf8f40bb8410896fea5339c089ffe9424284a891",
-            "md5": "048181e9705e7118e0d18c99fcdb9d93",
-            "size": "189113176"
-        },
-        "windows-x86_64": {
-            "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2022.4.2.50-archive.zip",
-            "sha256": "b3a6e73159059330c69c6e31cef9a01b30516af0d6ce2e00b2335fef16a9c7ba",
-            "md5": "a6521a96e888f93f575e65dbe711c183",
-            "size": "729036951"
-        }
-    },
-    "nsight_vse": {
-        "name": "Nsight Visual Studio Edition (VSE)",
-        "license": "NVIDIA SLA",
-        "version": "2022.4.1.23005",
-        "windows-x86_64": {
-            "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2022.4.1.23005-archive.zip",
-            "sha256": "4097057929dff3f868bc564ba2b6892118b902c8629acc2433e7ae0a7adffb92",
-            "md5": "fe5e9856cfa1a77a1977dbebea40d7b3",
-            "size": "536311869"
-        }
-    },
-    "nvidia_driver": {
-        "name": "NVIDIA Linux Driver",
-        "license": "NVIDIA Driver",
-        "version": "525.85.12",
-        "linux-x86_64": {
-            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-525.85.12-archive.tar.xz",
-            "sha256": "65583fc002a79e0ea71fd8dc2aaf47a605f49a9d037becf1591f698c392d7f1d",
-            "md5": "7df3732c5e635b3f9da5cbc5fde57069",
-            "size": "418377088"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-525.85.12-archive.tar.xz",
-            "sha256": "043fe51133095d886e615d9517cfab5314768581c203497dfd7f947d153b3be0",
-            "md5": "26b7254d5cf55d04818defa011269247",
-            "size": "98002240"
-        },
-        "linux-sbsa": {
-            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-525.85.12-archive.tar.xz",
-            "sha256": "9367b72119fe1fd62bafe80107a576a0c8aafc0b3b53f4f35dd9cf0c5ff5b201",
-            "md5": "328c5d3992ba97a9a7355174ac624013",
-            "size": "269356144"
-        }
-    },
-    "nvidia_fs": {
-        "name": "NVIDIA filesystem",
-        "license": "CUDA Toolkit",
-        "version": "2.14.14",
-        "linux-x86_64": {
-            "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.14.14-archive.tar.xz",
-            "sha256": "e60b3ee35d1e18350fe3efa5de126db241d03cf31bf4ba7cde7452496951b6d0",
-            "md5": "c8f5b97b446c7c5bba00133567399ed4",
-            "size": "57120"
-        },
-        "linux-aarch64": {
-            "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.14.14-archive.tar.xz",
-            "sha256": "04277985c736a905d7de7fcbc3be28181c8dcbea4860a6a7c41568a879305bf4",
-            "md5": "cf75db54f806ccde883205de966b768d",
-            "size": "57132"
-        }
-    },
-    "visual_studio_integration": {
-        "name": "CUDA Visual Studio Integration",
-        "license": "CUDA Toolkit",
-        "version": "12.0.140",
-        "windows-x86_64": {
-            "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.0.140-archive.zip",
-            "sha256": "7e767ba60251d7d4c524b5874121ddc3a5aeccb26cc594fb2e5506dc56131f66",
-            "md5": "8032bbb001599e6758fb71ec07cddb11",
-            "size": "545134"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.1.1.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.1.1.json
deleted file mode 100644
index 98294dcf1cc8..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.1.1.json
+++ /dev/null
@@ -1,1127 +0,0 @@
-{
-    "release_date": "2023-04-19",
-    "cuda_cccl": {
-        "name": "CXX Core Compute Libraries",
-        "license": "CUDA Toolkit",
-        "version": "12.1.109",
-        "linux-x86_64": {
-            "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.1.109-archive.tar.xz",
-            "sha256": "b84ef3ec3dc1b4891267be25846f0c3ed7f9fa84154d59eba805402b86991baa",
-            "md5": "7133971e57e54ca78dd4476270c13d56",
-            "size": "1024940"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-12.1.109-archive.tar.xz",
-            "sha256": "54fc03a5d3682e7f09c04d67f8db84a1921b6144838d9e4281584b556e8bdf68",
-            "md5": "1bcbce0bc6c96279637084ff34b12ee3",
-            "size": "1025056"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.1.109-archive.tar.xz",
-            "sha256": "bddd9462467f65e1e766998a75b363643e1e99e7ad1640c4e94f5df7d881e757",
-            "md5": "ac9b5a4ee1d8a4321e3f68ea8adab473",
-            "size": "1024688"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.1.109-archive.zip",
-            "sha256": "2bf3d61e695abc8c4b5dbb06c6b5286cfd4c27037bb5ea7e6ba232a266b6677b",
-            "md5": "f986f8077feb482e86c64d822d7c777b",
-            "size": "2610919"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-12.1.109-archive.tar.xz",
-            "sha256": "5630dafabf1e3c205661d5caae8e229a17819fd928e24015063196617b8e85f9",
-            "md5": "2a1ed84390a2829a6e772ecf06ffdb4f",
-            "size": "1025192"
-        }
-    },
-    "cuda_compat": {
-        "name": "CUDA compat L4T",
-        "license": "CUDA Toolkit",
-        "version": "12.1.32956252",
-        "linux-aarch64": {
-            "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-12.1.32956252-archive.tar.xz",
-            "sha256": "ab73e05d9610c79f6f4184fa7f0864f15d5afc99248c053f3189a21808d4c743",
-            "md5": "3ae7a8045bddb5972601073efaa0ae39",
-            "size": "16300032"
-        }
-    },
-    "cuda_cudart": {
-        "name": "CUDA Runtime (cudart)",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "6096ec878c8c443258d39c6e9cf2decef127f8aa8da594fdc5a336d047ab6bd9",
-            "md5": "4562908c66430be2baed868c490990b7",
-            "size": "984372"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "5e50478b7b1e4ffde463d2dafb33df8e52748d469257ae53fffc66249ac9d8b9",
-            "md5": "b5d14928bd3b4969410cb78d618da895",
-            "size": "975184"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "4a08376f30c2b3c4274fbd40e546738b59c046beb9766c1d76c5f4d192d2aa2c",
-            "md5": "aa65bdcfe58286bc6678a60ae0a7c02f",
-            "size": "975408"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "99b884fc761a4c8592f819a170947db2dff2cd26fafc350bd4dd3c2b4b9aaf19",
-            "md5": "bbe760196c077c5d94fae5413a2d00d4",
-            "size": "2388734"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "ca7358c878d217b4982df896e726d49146f00396e3687778409bf022b7ce15e1",
-            "md5": "995c7c7e73627521d6557f70afc9e563",
-            "size": "1042344"
-        }
-    },
-    "cuda_cuobjdump": {
-        "name": "cuobjdump",
-        "license": "CUDA Toolkit",
-        "version": "12.1.111",
-        "linux-x86_64": {
-            "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.1.111-archive.tar.xz",
-            "sha256": "1098b58dac2be496bf9a2766c9cdc17c20848a0dd42fc7283aa9c669c0afda52",
-            "md5": "94136b6cc6b8584f1c83f5d4654cae3a",
-            "size": "170292"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-12.1.111-archive.tar.xz",
-            "sha256": "9838b259bcc5baae86371a05f336af0f8e5cf8b75b8f7c2532864424e4bf1185",
-            "md5": "136700b759d9ebd4893d356874238d4b",
-            "size": "211324"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.1.111-archive.tar.xz",
-            "sha256": "36ebf3301076b41c826df39816cf3db72e08d857191a87f052dceb2edb68993c",
-            "md5": "46ef304ede48c48c099791ad357cf5ee",
-            "size": "178396"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.1.111-archive.zip",
-            "sha256": "c4b10ad15fcfd8ae9d8253361026c87db716cf3f6b4ca562f411afe557ca5eec",
-            "md5": "bdaafe80180823df8b706b905b5b7620",
-            "size": "3939463"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-12.1.111-archive.tar.xz",
-            "sha256": "bf03ce708bf5e4b6fd03401c668985fa21bd8bc12259f961b9f4522e2ad11137",
-            "md5": "71538f9f70e44c4debda20da72d78950",
-            "size": "178400"
-        }
-    },
-    "cuda_cupti": {
-        "name": "CUPTI",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "397594a200619aa748bdd9e1c95bbf01bfddbb00624940c5ed26e43df1bec363",
-            "md5": "5b3931f56eb0ef25dc17a7be6f87b1df",
-            "size": "19531632"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "197a4ce0e42f41f68fe49ae7d6a7bef9a1f49838785955ef0285a008f6ded365",
-            "md5": "417f9c3232d49810545728ec270115d9",
-            "size": "9890596"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "ead8d9a706b89cd0e4d5243920ccfdf032304187e69f0cc844ec76f7293d4d46",
-            "md5": "e07f6ec79cd468c02b7dc9105ba64ba1",
-            "size": "9823408"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "15d09e7226bc1157c57044af8cc6d01b74847954c856942d93a58f9450f43163",
-            "md5": "3d6be91145958f28a0b7ad57f7f74d26",
-            "size": "13249593"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "7a6d7381bada9a77f723945da77187670b443885be539114ad6fef1fcd9a4792",
-            "md5": "089c04ea2f30089f174a3929a9287b65",
-            "size": "7609012"
-        }
-    },
-    "cuda_cuxxfilt": {
-        "name": "CUDA cuxxfilt (demangler)",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "1dc4f9cb38d1d9582994bd5656eef4d0536f217ec00ec1ac035a11afdc1b416d",
-            "md5": "8ed4c137c68ab60a6d6f8009b09cb97b",
-            "size": "188412"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "3778f811e5e28f899f02a5079af31478227420436ad4db42bb4ae454a8ae7654",
-            "md5": "cd6a267514b84173dc592b65646ff283",
-            "size": "182056"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "fa1354301e6c993de2364cb78664e87fca8ddbc571cff28c5fb5a0fc694f7692",
-            "md5": "d2a7c4ef44aee80c2270ced9fd4b84a1",
-            "size": "174336"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "db3c55cff2a860b2a6a5e4ae563002bc177657cfc24eee8cf139594d0c1966db",
-            "md5": "331a8f363ec4058080f3367a8c4de8e4",
-            "size": "168665"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "7f254d2d23ac5c2644cc12282cda9a88fd2b471a81d4100845f15bd0b5c64b96",
-            "md5": "8c207acf191188ddaed731f12f2121cb",
-            "size": "174444"
-        }
-    },
-    "cuda_demo_suite": {
-        "name": "CUDA Demo Suite",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "17fb34cbfab110c30e1de6bd6eb55b5e60313f4005447d58195261f3032abd1c",
-            "md5": "c58b43c5122590df0306700999843ea8",
-            "size": "4002272"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "2040fca50af1ea0fc6354d10eec29460c6ad1281707d9a90e769c09c19d57323",
-            "md5": "4da3b6c821850878d0e64be717303b19",
-            "size": "5048732"
-        }
-    },
-    "cuda_documentation": {
-        "name": "CUDA Documentation",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "218d2fc583b47d6afa3e8d0c627c9855b444b5a187350f5034c3cda388b1e9d6",
-            "md5": "69cf9cb2267901e4ed10aba0dade705c",
-            "size": "66968"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "1baa62e3d7f6ee21ed59f73debc901a8db8543f455011ebc3c96c7b05da61c1d",
-            "md5": "c3af6d0e92447be67f3a476ab8d6d5ea",
-            "size": "67004"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "85d459c7e6fb6fc0a0eb356b37c791c4287aee083e524800e3f79ad401a6a832",
-            "md5": "524a27c87ac3408985d843396103a7dd",
-            "size": "67008"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "d8cd5cd098fdeafd2fd9b685a1e44d8198c3f0d885a571285a08493c2a12dfb4",
-            "md5": "961aabc26353144b397cec97daa35432",
-            "size": "105380"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "91f29bae1f18b0120e37aa90d3b8232005ee5163b480ecf800cfd42c440d66d2",
-            "md5": "068eb585e84dd2f46661f29ac3bfdbde",
-            "size": "67112"
-        }
-    },
-    "cuda_gdb": {
-        "name": "CUDA GDB",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "c4beeae8c5bf76aba1288fb250e1b6da8e3944e7b97a4009203e1bd0a3700508",
-            "md5": "f2775b80ef3e62afc5f2ac6db9305f6f",
-            "size": "65729064"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "7f7a34ed5523f8009fdb254649936349c612928d239442da66b8d5cdaea14fd0",
-            "md5": "937842198afe6ce0a270ab7b014cee0c",
-            "size": "65447760"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "38872097b48fd54717e327c87d8a1074faafa9318b265ffcd154809b2aa33153",
-            "md5": "114d15c7a9f33bc284f4e3009b3f72bd",
-            "size": "65361736"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "5c5acf1aa245e8bff1cf889daa1c8b25b7e0e9ce2b271d1ef2127b207ebe0ced",
-            "md5": "adf1bc7c5197e00e759681005e626fee",
-            "size": "65277972"
-        }
-    },
-    "cuda_nsight": {
-        "name": "Nsight Eclipse Edition Plugin",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "76d61e20abbd07e794ab640179d8f86f092c05c418e8ee6d2845ab1626db1655",
-            "md5": "5dcadf51ae2e74ac3e102bf6651f0395",
-            "size": "118607604"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "1b0636867c23e5dd0348ad7b49d9b10a2c831e0cdaac99dce23686a31aebde52",
-            "md5": "e140a6b74c206a6c035cb9b134c3d9b9",
-            "size": "118607596"
-        }
-    },
-    "cuda_nvcc": {
-        "name": "CUDA NVCC",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "0b85f7eee17788abbd170b0b493c74ce2e9fd5a9604461b99c2c378165e1083b",
-            "md5": "40610a303fa8aa49e3641d2899654a44",
-            "size": "44459684"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "e6e2c4c80e44409cd9006c6f1fd56d7c48c4a8bcd2d130f9405bcb7af16660a0",
-            "md5": "b773302b3be16b253de79f8867746769",
-            "size": "41272608"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "6e795ec791241e9320ec300657408cbfafbe7e79ceda0da46522cc85ced358f4",
-            "md5": "d7bf2ee4a59943ca0d101d4eff18692d",
-            "size": "40149352"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "3b452d704c92e8af6d59247ee842b2ca8c8e37dd04c015eea59c74c265672074",
-            "md5": "99137e9a69b1fe95bdb6f2bb79ff1fd4",
-            "size": "59619440"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "16f8614a0478b5d90cf0c9a5aec7c6a28077f8ec11bba09579dc21d05a0e2536",
-            "md5": "7e253d329b35af3ac395313b4e4e0a03",
-            "size": "40137460"
-        }
-    },
-    "cuda_nvdisasm": {
-        "name": "CUDA nvdisasm",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "f47cbfd3f139e37da7cfd648e5a4f3d3f2d67a6f1515e8c1f9bb135f1ce6a9e9",
-            "md5": "fbab3080aaaed467883dc2c6a4e36db1",
-            "size": "49869060"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "1c8201b8825f385be4ede895941852b17feff39706b9f950d1ce9502a464b213",
-            "md5": "51d8aaeae0f4dd627482136290296e7d",
-            "size": "49869828"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "9592d0de8a0be49af357b9a7894e073005d9657f3aa23b13b6d665d937d1f90c",
-            "md5": "a2fac2f3dbb6dd35fe52650c5786b941",
-            "size": "49798992"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "32e6b7a9e49ed132fba2968fdf964f019e6a3c34d796c93d37445b5278ba6216",
-            "md5": "cf3c24e497ba4e54d3b18e6ee8895f37",
-            "size": "50121383"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "c239aa158b1081ae8746bf89ac64f502b8a950106bbe59f2485fd7c3420fd35e",
-            "md5": "bc9851b7ccb1cba7b66b9f8d0d2da9b6",
-            "size": "49811684"
-        }
-    },
-    "cuda_nvml_dev": {
-        "name": "CUDA NVML Headers",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "20ae775b1c78a107fca1cc52f2cba35f55e5296356fe0678937212f70923d77f",
-            "md5": "f0f7a5d66f2a0865f1af0c761cbf87fd",
-            "size": "80740"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "22e57945f33e4b995d63899993b7a0f07fb512fc8ecb5279d183da726b3550fe",
-            "md5": "02460ca6038b585390f659b6c2323787",
-            "size": "80308"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "c8580a12241b20fc46bdf3acfce09d5395bf5dc665df2db4c2d5e9491326b8cb",
-            "md5": "615a65a9561478b14616777613357c2e",
-            "size": "80840"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "44a500778ecf60988525d1f1b8f32fa224b80d771057bdbe7488cc3c662d6d38",
-            "md5": "521b5f1d6542dad60962037378375727",
-            "size": "112614"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "9dd50f8856d3abcf0dcc00df8d7115922b30464d9ae46d19c93c35b8e5025471",
-            "md5": "b922b83454ef5209f501ff162af02a86",
-            "size": "80828"
-        }
-    },
-    "cuda_nvprof": {
-        "name": "CUDA nvprof",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "e935e68342597a12b3e1c5adf15cfa497ca633424dbf583d5e38db0cb810e5a3",
-            "md5": "005a24622b25d5b2d8b0f9a6da6c1f98",
-            "size": "2438996"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "84490cc8c8b610203c122215f3c2e1fc189d84c6a58e7aba4c82b52fd6e2a9e9",
-            "md5": "ae4a39d501ffc82590a6d0ac4c431734",
-            "size": "2116212"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "387d95aa1fcab9d54de34287576ab0ac0455060bdbd297dee82010aea1a20a4e",
-            "md5": "cef902eb145d949db01c2309def9ca22",
-            "size": "1699172"
-        }
-    },
-    "cuda_nvprune": {
-        "name": "CUDA nvprune",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "aaf3b1f67bb3d6cafc1ea2b9519ec4285a8312be0f44402c7ac292a6a0d23163",
-            "md5": "80a03231204049ee365acb6f3d279ca9",
-            "size": "56112"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "f0d9d46ac68030d4f0958c4d3f9de462c0ca93a03c6058de6e46575c2e732259",
-            "md5": "f828bdda82f4c3461594a6ddeb141020",
-            "size": "57072"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "0af184fce75a6407cdd7d87e9abc51d6740bacb694c2f22a35ce29b71988de16",
-            "md5": "7cb1b663ee28c6fa132060fd6d118447",
-            "size": "48140"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "daf438d2f1f48484428fa06a5d9d72c3f8f1fb6b01c7c38270981ba76ede45dc",
-            "md5": "323903166bd99d6e3e5bc6df85de7932",
-            "size": "145887"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "fe522567b7082475f8f2cae12989e9469892d2e7be9d5f65e5112078c781b1c1",
-            "md5": "8ec842811ef6155e97782b50ecc1f6b1",
-            "size": "48264"
-        }
-    },
-    "cuda_nvrtc": {
-        "name": "CUDA NVRTC",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "bb15706aca6760770f0bfb814517f875ab0cfd479bc6b1d5dd7792c5ded8317b",
-            "md5": "370ced2f49edf8abcbfcf73b4dde6407",
-            "size": "30298852"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "9b931993944a6fe82a996bf765e14360e1f27c6ee2ca77316be6bb2b26e4bc81",
-            "md5": "b7f0f373ec2f04eaa89c328edca80cd1",
-            "size": "27964548"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "0b42518c99cc31bb45ccbecde0de6f8d60f846dd822656eeeb56e78a91a35f0c",
-            "md5": "74405ecbc39f6712605365a63efe326e",
-            "size": "27947404"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "7fa294726483b10815305fe1c07c9ceb23e048fc43bb459775eb68dee82d1a8f",
-            "md5": "e810060bf1485e91b388cab3823f9179",
-            "size": "97082567"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "6160d7f26427e39d5493c42a7f1bde525db813fcd14669f174d944621e3eb72a",
-            "md5": "39e263540f9151bee6919b0724de3a94",
-            "size": "27949992"
-        }
-    },
-    "cuda_nvtx": {
-        "name": "CUDA NVTX",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "8ca2c72c247bf10ca10653637c60e792a1249cbeecc1d817c4815d98b45cf1c2",
-            "md5": "d9a136e881d34e73d2c8fac20240bbb2",
-            "size": "48392"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "61a8522850e0b07f650d72fd9bf5182e06e348f660ef37a7b8fcdf862ea215dc",
-            "md5": "e57f226b073b6b5cf7fcfa93a53b4689",
-            "size": "48384"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "cde9802f1c2cc817c6e1d2f516212c4847621b80a204ad7d84fd11b39c386741",
-            "md5": "47262cab870aba1065ae712ba264023d",
-            "size": "48960"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "862f9289b193d5d229ebb1a8417eb988a2f318837b35f887e93f74940f7abd1e",
-            "md5": "66378ef4c49f25cf85f88c5f7e9ceae3",
-            "size": "65732"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "57aa538cd488794fc29af621af755f51ffdabd39e0536605558a0b7be80d04c9",
-            "md5": "8a4bbd1acc73a2f16e6889cf5b1b78bd",
-            "size": "48900"
-        }
-    },
-    "cuda_nvvp": {
-        "name": "CUDA NVVP",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "90692b8d390a3e7fd9e3e395b3e41b5b8c245e8359f73e6819da22258eb5c451",
-            "md5": "de39a01d0cc5ddce2b9e574afdc62696",
-            "size": "117590064"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "7393407c1902c4ef5d19b9ae80c022a1b7089ff5d5ac0a03baee74d42b32c9f8",
-            "md5": "f20a0d87c73219e3cbca4655531c3090",
-            "size": "117191204"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "ecf8a8623e36f376d6353b2cfd6152a3f58946e47a6ba15fd1b062f39165c466",
-            "md5": "36ecadd9342f2ec18603568456a695ea",
-            "size": "120359941"
-        }
-    },
-    "cuda_opencl": {
-        "name": "CUDA OpenCL",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "9dbd1f857c93f8785baa0a001def26e56176a4c9550d642dc8f4963791588acc",
-            "md5": "00a8b62612d1402ea8655f6da195da90",
-            "size": "74948"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "f74b45e80e149640edc03ebd6b069848cdde14aa2bea7b72847f9637c2709ba8",
-            "md5": "e88c84b8a2cb5e32ecb2ff5336ddb58c",
-            "size": "111872"
-        }
-    },
-    "cuda_profiler_api": {
-        "name": "CUDA Profiler API",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "3fff6cb6eb0e04f96b0b5fca26d97486cacd1ea6d3d0d2fcf8d2982bf0b3eda0",
-            "md5": "6973dc03ee650bc13a7d9675123f0126",
-            "size": "16044"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_profiler_api/linux-ppc64le/cuda_profiler_api-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "3fc2cf6556bc3eb8c01044a089c12ae15fcec8a8beb0886b234c0aa61e4b1356",
-            "md5": "facfb6a72b03b048d28330bd38900e0c",
-            "size": "16060"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "f7e0a26f39e65b8ccdac72ee37b74cd91ca6a02dad5e37eb95d6fb916fdfae2f",
-            "md5": "e065ffa67d6e3d8afda6f1baf74c8a01",
-            "size": "16052"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "027c91b2bf617a769f97ac381369c2e7d9906df6f10d289e40723212680b854b",
-            "md5": "00552553440481edd0a57936c97581e6",
-            "size": "20085"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "f95aa99a08cfe543c1e257aa72e0ab1ab1d6aa2392a23a054b75c51160c608ff",
-            "md5": "e2acc123c186ea0bc6685553cad6b381",
-            "size": "16060"
-        }
-    },
-    "cuda_sanitizer_api": {
-        "name": "CUDA Compute Sanitizer API",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "dfa911da08c37bd521b993bf35c26a9975c4737c77fd8eea92af23be13afa602",
-            "md5": "2b2670d0d0ce84436d34d91b9c6e3569",
-            "size": "8201172"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "e38e89cd64d5e63223fee80d8d5f61b5329c42f84a41b27d5348b6824f9be1c2",
-            "md5": "ebf7670de0330f46a595bd9c2ad51ca2",
-            "size": "7504248"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "a03f9530b695114c56fdc8ee9fd3cf004697aef7faec9dc025d0985020562687",
-            "md5": "3eeb12d08df90ee42702993de0ba63fe",
-            "size": "6130188"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "40d6e1620ed8d2437cc92183ea5758f88e6106ba82260a4c6597a016d98bfec7",
-            "md5": "c707f9b508c213138c72492680c19705",
-            "size": "13778916"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "98732b8e98532de8d442e0863054ba7e80e502bb99717b30a5222fc5154e3b06",
-            "md5": "e349cd3718c25ef049ad2da40ba88bd3",
-            "size": "3488580"
-        }
-    },
-    "fabricmanager": {
-        "name": "NVIDIA Fabric Manager",
-        "license": "NVIDIA Driver",
-        "version": "530.30.02",
-        "linux-x86_64": {
-            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-530.30.02-archive.tar.xz",
-            "sha256": "8829106dc8f6fbd43555c91bee42b24fd83f03a8866f9832a0d39762e7075e18",
-            "md5": "c09a93d9534e3fb624c99de82992ff75",
-            "size": "1640772"
-        },
-        "linux-sbsa": {
-            "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-530.30.02-archive.tar.xz",
-            "sha256": "279bcd0d2a0d9bc01a64bfea7b0c307a462c9e89724a3735d9a77a670ab9f56c",
-            "md5": "dc5346ae2383541e954c8b9ffffe131c",
-            "size": "1517396"
-        }
-    },
-    "libcublas": {
-        "name": "CUDA cuBLAS",
-        "license": "CUDA Toolkit",
-        "version": "12.1.3.1",
-        "linux-x86_64": {
-            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.1.3.1-archive.tar.xz",
-            "sha256": "90044d7ad8c44f33cb670c1fe6f2c22246db6c22c2db22c7a172bb61cccb438c",
-            "md5": "620a5e5f4260fc28e551a7814172770d",
-            "size": "486381128"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-12.1.3.1-archive.tar.xz",
-            "sha256": "25f08898e157c2ac2952ff7ce82fa2938580d713494d545a9809ee9aec7cf9f1",
-            "md5": "1099e15913eed6a452edcc074a13fd00",
-            "size": "389886724"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.1.3.1-archive.tar.xz",
-            "sha256": "95d01b8185a3e43dad819c10496df17f36c319f0896a45b1a76407ee31d8df78",
-            "md5": "e134c6cfc12390b12699bb41ac0f0b1b",
-            "size": "484671980"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.1.3.1-archive.zip",
-            "sha256": "c55de20432e3a2469de8cb3999b829f74441d00384e058b2dcfa1a65d8c280ef",
-            "md5": "297455cb80a983a6c71c37f9153b9684",
-            "size": "433280194"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-12.1.3.1-archive.tar.xz",
-            "sha256": "2e395b3cdf4e492101ecabde4b4ea2d75b6e9d36fcbc37b0e9d78f7fefefffaf",
-            "md5": "f0aa6afface882b17f88228d8a6c4683",
-            "size": "444613724"
-        }
-    },
-    "libcudla": {
-        "name": "cuDLA",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-aarch64": {
-            "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "2af462a0130b71b06ea80ece1b53857047f55eb0466dfc7118e9562a6f0ade30",
-            "md5": "bf283975fb5b1971a3b094db73c89891",
-            "size": "38784"
-        }
-    },
-    "libcufft": {
-        "name": "CUDA cuFFT",
-        "license": "CUDA Toolkit",
-        "version": "11.0.2.54",
-        "linux-x86_64": {
-            "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.0.2.54-archive.tar.xz",
-            "sha256": "7136c1d42c7d1fbc29db2f401c8d5f169d4b81cff4d017946d3e6f45077e7b14",
-            "md5": "61ebbb5cf403fba1307082713c6adaef",
-            "size": "168580988"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-11.0.2.54-archive.tar.xz",
-            "sha256": "2c7c8c5950de601f400d916095248683401c6d26a3e81497d0db0d129ba6730a",
-            "md5": "e47c320ad1a333cabbce49a732545f24",
-            "size": "168774744"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.0.2.54-archive.tar.xz",
-            "sha256": "138ad4dc1d0895a8bf8ed6b32b204dcbda176397a23a044ec76a6785c7452fa4",
-            "md5": "2691db0e505f79a65ce3699a3403d41b",
-            "size": "168136048"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.0.2.54-archive.zip",
-            "sha256": "87cd7a4453a873d011210075bfedf76397ca08f29237354277b07076a9e057b3",
-            "md5": "891e19293f838492a24bbf2b3cc13f91",
-            "size": "119758471"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-11.0.2.54-archive.tar.xz",
-            "sha256": "e6bc88cafdf640f2a8483408cf1582297036437746a17c23a86f0341d2ecbe4e",
-            "md5": "897594e0fb8ffca1260845311c34db70",
-            "size": "168766860"
-        }
-    },
-    "libcufile": {
-        "name": "CUDA cuFile",
-        "license": "CUDA Toolkit",
-        "version": "1.6.1.9",
-        "linux-x86_64": {
-            "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.6.1.9-archive.tar.xz",
-            "sha256": "c2a635c98aaafff7c7c9daf4c1a60c96c2cbd7b580cff488a26376f42194d9a0",
-            "md5": "f2e84470315651409ab195fbc12f2121",
-            "size": "40933956"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.6.1.9-archive.tar.xz",
-            "sha256": "d42d78134a3fd9650867ef6401d7b4367fc788d9537d96045726fc18faa3a943",
-            "md5": "bfa0c27ae0f7922327b12725d3aa985d",
-            "size": "40604524"
-        }
-    },
-    "libcurand": {
-        "name": "CUDA cuRAND",
-        "license": "CUDA Toolkit",
-        "version": "10.3.2.106",
-        "linux-x86_64": {
-            "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.2.106-archive.tar.xz",
-            "sha256": "9941216fad2d419e6172dbd2ee431d77effe671065c08490782fc286ebb364de",
-            "md5": "bf666aed73b07e8dcc82b114888fa30f",
-            "size": "81957052"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.3.2.106-archive.tar.xz",
-            "sha256": "fa3c5424bba7f7ea4bef08278099f2c0cb63eeff80ee51d0fea9965315732817",
-            "md5": "89806fab1c07506392d2e5142301b951",
-            "size": "81998648"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.2.106-archive.tar.xz",
-            "sha256": "525d997d74b391a3484f9c71e7a6e51a136267b8a2dddbfef1420134f3011827",
-            "md5": "d4caf3b2687f3225459d2239aad88f43",
-            "size": "81945548"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.2.106-archive.zip",
-            "sha256": "9d899a09c9d227d995b7fd2a4e9f0c16abfe1e0543f41b09ccb05802c9fa107b",
-            "md5": "ad8a371884599e1d98ce06af5a694a2d",
-            "size": "55277946"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.2.106-archive.tar.xz",
-            "sha256": "43922977f6bbd83329a2b69df06693f4721e0ff66d904eff220984778a1c8553",
-            "md5": "4437cc01b11eb445766b4ae2ab375b6b",
-            "size": "84137248"
-        }
-    },
-    "libcusolver": {
-        "name": "CUDA cuSOLVER",
-        "license": "CUDA Toolkit",
-        "version": "11.4.5.107",
-        "linux-x86_64": {
-            "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.4.5.107-archive.tar.xz",
-            "sha256": "7169970001e71fbd8ff2678830af9a90edd23d0165f53c829c00a6decfe464f8",
-            "md5": "22f544337bc73be71b201fb8b9bda09b",
-            "size": "122638448"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.4.5.107-archive.tar.xz",
-            "sha256": "4366b28caf8d44703a491bd654ca2388ad3f122e22fd494396b78707889f538a",
-            "md5": "c70e626d7f9cd07f9f50ac6b0c7bf6e9",
-            "size": "122608296"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.4.5.107-archive.tar.xz",
-            "sha256": "06bb7bdc008de189117f258ebc4c190392be3950afbcd78b40603ff165bdef74",
-            "md5": "b270531e7da69e9c33a827eb149fdc6c",
-            "size": "121875340"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.4.5.107-archive.zip",
-            "sha256": "974f0754076678dff903a0f34f50594fa683e54b7ad1ee59b98b86a60a591cdb",
-            "md5": "7998782f61817781f8c9117e9875108f",
-            "size": "120075736"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.4.5.107-archive.tar.xz",
-            "sha256": "185c2f5733e8f62bc8eef74e35bdd0031f47c48b5fa615d823c92b0c89ea2873",
-            "md5": "100a70e808ea1eebe1652b7d8d7897f1",
-            "size": "132349940"
-        }
-    },
-    "libcusparse": {
-        "name": "CUDA cuSPARSE",
-        "license": "CUDA Toolkit",
-        "version": "12.1.0.106",
-        "linux-x86_64": {
-            "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.1.0.106-archive.tar.xz",
-            "sha256": "ae1f604d6aa753b156e3072519a29938b74b37b727c7bd78fab73add78f83907",
-            "md5": "f26e877fd4bb52784b751ca1d017207c",
-            "size": "213244220"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-12.1.0.106-archive.tar.xz",
-            "sha256": "7b767e2294b6ea89cb0163d7f2d37d7c28973d06e0ea1273a650fd1b6933518e",
-            "md5": "8b9cde1a194d92e2ad33e0bdc5dcebad",
-            "size": "213389568"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.1.0.106-archive.tar.xz",
-            "sha256": "1cede312d23dd19225cac1124363835127a08d9641f7e2a330056b7c35190703",
-            "md5": "1a39e5c5e22accf3d4c7f7557cf5a5a0",
-            "size": "212898536"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.1.0.106-archive.zip",
-            "sha256": "882156f87ec1f95938d7b1a35419fbc340e475488dbd45664ef8b8705767c1d2",
-            "md5": "cd2b9f1575ac6d6832426aed78f99a8a",
-            "size": "193245943"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-12.1.0.106-archive.tar.xz",
-            "sha256": "334ada7297132db8042cd4275045dfe88b343c83ffd65449d6c7bc8f138fb5ef",
-            "md5": "b6037b1c8de6d9638e308a14f74823c8",
-            "size": "228310912"
-        }
-    },
-    "libnpp": {
-        "name": "CUDA NPP",
-        "license": "CUDA Toolkit",
-        "version": "12.1.0.40",
-        "linux-x86_64": {
-            "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.1.0.40-archive.tar.xz",
-            "sha256": "52c42e32c7961ecf8b8eef0e46fca6701928a935d2d918c788038a8d1b448bd1",
-            "md5": "701b8b4eb69d0eb7f3ed63e3965c7822",
-            "size": "183926752"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-12.1.0.40-archive.tar.xz",
-            "sha256": "5eb467e72d4a6c4ce76ded7d26cfbaa3410de78a853660e777ec165c14211c90",
-            "md5": "59c8f4f487dc999d9fc5f64d9b4beaa7",
-            "size": "183959808"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.1.0.40-archive.tar.xz",
-            "sha256": "658523dd6d269eb433b30d863c4c9f267941bb8cffc0927db49d35bb0f166cfd",
-            "md5": "a4890024b493df30ed7c00e43a8ad657",
-            "size": "183074132"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.1.0.40-archive.zip",
-            "sha256": "36d19f9f0635860f18aa6034359fd661c2a58fe41d891df27b48fb8ac6d42336",
-            "md5": "0250a66b0cda023bd4b0155038792b72",
-            "size": "152885082"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-12.1.0.40-archive.tar.xz",
-            "sha256": "70747c485df1dc434fc76eca56868b45144f7822965f70142972450cf0a40b11",
-            "md5": "4c0eaa97558c733b57ac188baf9d2832",
-            "size": "200270560"
-        }
-    },
-    "libnvidia_nscq": {
-        "name": "NVIDIA NSCQ API",
-        "license": "NVIDIA Driver",
-        "version": "530.30.02",
-        "linux-x86_64": {
-            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-530.30.02-archive.tar.xz",
-            "sha256": "92f04a09ad4abea1f3abddd79a93bbea96fe860a0d71ec1cf8a1d0560ed4983f",
-            "md5": "9335a0980c022961a17585579bc47856",
-            "size": "566496"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-530.30.02-archive.tar.xz",
-            "sha256": "876558b581ab341c5cc70af4482ef022fd93e417563465b403372f5f8fa076d5",
-            "md5": "32c1adeb59c19d98f6199608dbeeab4b",
-            "size": "522780"
-        }
-    },
-    "libnvjitlink": {
-        "name": "NVIDIA compiler library for JIT LTO functionality",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "21ee6206cf9509e1c1c31be918b1971da8eb1e7c5492804ecd6750105c7db6b4",
-            "md5": "df8e9e5b969d9b1a7bdf764588896fd2",
-            "size": "25844852"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnvjitlink/linux-ppc64le/libnvjitlink-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "4feb6cf35852dc191e3d20d1522374ecbbe9773d70a52fd58e1674642e1b09bf",
-            "md5": "5cb8d20acca552a9cd177670b8688b6c",
-            "size": "23779324"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "0a314ce11a20f097ac844ebe7b8d6ca1cfc00dd1d24624d86b51ad09f41625ed",
-            "md5": "98b01d8a290d04653941e312311047dd",
-            "size": "23712884"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "f89184abc5a1d4a1c12ef202c2524671a3be6d464e0b7d8e9fb67c1a9e714097",
-            "md5": "d2172d6bdfc367275e7c95b7f6b98224",
-            "size": "86687097"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnvjitlink/linux-aarch64/libnvjitlink-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "dfcdecc04bd0d3d30b7605433e23b0ff92d498cd0aeaefa55e3c90f9fc68cb95",
-            "md5": "75cbce40a29b8e91d78f806d38b03b58",
-            "size": "23707576"
-        }
-    },
-    "libnvjpeg": {
-        "name": "CUDA nvJPEG",
-        "license": "CUDA Toolkit",
-        "version": "12.2.0.2",
-        "linux-x86_64": {
-            "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.2.0.2-archive.tar.xz",
-            "sha256": "d293267a822c8c87a53cee97cccf49b2eb20c53b99f477328dfa1d7d1c5c7f75",
-            "md5": "ed416e0a36f2ad18eee7ab347366742d",
-            "size": "2514348"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-12.2.0.2-archive.tar.xz",
-            "sha256": "9312eda8337dafa28b4abbca013d1c8bc530de504dd44c0836ba1050929b20fd",
-            "md5": "86ef519a12c8c0203bde1fdcad4c0cd0",
-            "size": "2507988"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.2.0.2-archive.tar.xz",
-            "sha256": "54add0d5e2ba36880f47c9a45bdaf9d6b2e41311e40a8d4b933d46f774a6a2fe",
-            "md5": "790aad9c44a0c1d7dc561268751bcb5f",
-            "size": "2340304"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.2.0.2-archive.zip",
-            "sha256": "f7e51c1c86298b5ef35d17435234d3ffa8d28e8d10c2439c87bb1875e77f8726",
-            "md5": "7a0ecd4398d55475f39db10c0004214d",
-            "size": "2774956"
-        }
-    },
-    "libnvvm_samples": {
-        "name": "NVVM library samples",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "linux-x86_64": {
-            "relative_path": "libnvvm_samples/linux-x86_64/libnvvm_samples-linux-x86_64-12.1.105-archive.tar.xz",
-            "sha256": "b8ca8a3e7e913755eef4f70e15edf0108a684ec6538d84f40a491b60a1568d5e",
-            "md5": "c5ee2fbff8fa2301cbc9b17034030c0e",
-            "size": "28980"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnvvm_samples/linux-ppc64le/libnvvm_samples-linux-ppc64le-12.1.105-archive.tar.xz",
-            "sha256": "b7e60cf5d037f1763658350c01eb5eb43d8243592a7499bc55de21ad13c9f783",
-            "md5": "e8dfd495ed3a5bee5535453f8d7d13f2",
-            "size": "29008"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvvm_samples/linux-sbsa/libnvvm_samples-linux-sbsa-12.1.105-archive.tar.xz",
-            "sha256": "41471179b9e5909165928afa36e6806c1ffae1b64d39403c829f8b11e73fa021",
-            "md5": "36eb55edba4b0dc6c6c03d6f6b6cc66c",
-            "size": "28980"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvvm_samples/windows-x86_64/libnvvm_samples-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "6df8bf51393ac935f0366db9dfbbfce29ccd05e53ebbc6f8e41cdc553d153ee8",
-            "md5": "8b34d002032fbef5d9caa0c8c641815d",
-            "size": "44435"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnvvm_samples/linux-aarch64/libnvvm_samples-linux-aarch64-12.1.105-archive.tar.xz",
-            "sha256": "26563a500a33e92f51a04c96b56e045a87e304212fb399614a22408bf6ffad12",
-            "md5": "9b400d3f8de5b0afdca75e30a8535d04",
-            "size": "29012"
-        }
-    },
-    "nsight_compute": {
-        "name": "Nsight Compute",
-        "license": "NVIDIA SLA",
-        "version": "2023.1.1.4",
-        "linux-x86_64": {
-            "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2023.1.1.4-archive.tar.xz",
-            "sha256": "0b19f1fe19e549b217aae3834fea36b0dd56273bf2d6abe682c30916dec83004",
-            "md5": "f1b56347347a8d45bae7521cf070e4c9",
-            "size": "708773752"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2023.1.1.4-archive.tar.xz",
-            "sha256": "2dc7ea5c7719550ced4da69e892aae3e97bf03cfdf61a7b70bdf1b4ea6dce227",
-            "md5": "c7f3d83f04a346fb60272c14d1e6c9f7",
-            "size": "181168472"
-        },
-        "linux-sbsa": {
-            "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2023.1.1.4-archive.tar.xz",
-            "sha256": "4c93ca3a701a0563e33f1668d85d08a173f5419f2c5170cece2767f4ff322a1b",
-            "md5": "b312e69310f02adaa53221b2c9209916",
-            "size": "344531080"
-        },
-        "windows-x86_64": {
-            "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2023.1.1.4-archive.zip",
-            "sha256": "7873643159e97aba86922a6cd26ca9f7451edf6e1e13dbaf5c22e9a16290587b",
-            "md5": "923deaf1a7f14f75391336b17c6c18de",
-            "size": "638766762"
-        },
-        "linux-aarch64": {
-            "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2023.1.1.4-archive.tar.xz",
-            "sha256": "a45ba005d765e9467e9f1a6ad6121c5a9efcbdabc284b304ec01c3bda5858eb0",
-            "md5": "10563ea9fad22436b33e9b82915f9f27",
-            "size": "733017452"
-        }
-    },
-    "nsight_systems": {
-        "name": "Nsight Systems",
-        "license": "NVIDIA SLA",
-        "version": "2023.1.2.43",
-        "linux-x86_64": {
-            "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2023.1.2.43-archive.tar.xz",
-            "sha256": "db7beae0d1cfd58468a24a682f268828adfb49320e11b3ac2d3b508bce4b2792",
-            "md5": "57f29d05eed0940150c6a1fbcc18ccba",
-            "size": "207237352"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2023.1.2.43-archive.tar.xz",
-            "sha256": "8798acb9760a5bb60936e0a209fe3d07835a8c9534a884568f0143bfa5be85f8",
-            "md5": "1113a98ac43d1d3f711a6763c1bc0d66",
-            "size": "60829540"
-        },
-        "linux-sbsa": {
-            "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2023.1.2.43-archive.tar.xz",
-            "sha256": "5cd6af8100a17a36a423606f349fe81521982edff3a787486fb97d38bb444883",
-            "md5": "f02c7aa4aa44ece30ade62dcc87bb27b",
-            "size": "195592688"
-        },
-        "windows-x86_64": {
-            "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2023.1.2.43-archive.zip",
-            "sha256": "8d70dcca4d105e42d8c7afe37d81b3dabd73ce4111068b04e379c5c4f1f8776f",
-            "md5": "570964242a20a8bfa24f558891f9f27b",
-            "size": "326985615"
-        }
-    },
-    "nsight_vse": {
-        "name": "Nsight Visual Studio Edition (VSE)",
-        "license": "NVIDIA SLA",
-        "version": "2023.1.1.23089",
-        "windows-x86_64": {
-            "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2023.1.1.23089-archive.zip",
-            "sha256": "c227d16d9c8c90095ba13290528a4630f5c8d853d0b5555763eb4d21e1a9d2d2",
-            "md5": "03ba47f92340ff97b0d9bf50a8321808",
-            "size": "526974722"
-        }
-    },
-    "nvidia_driver": {
-        "name": "NVIDIA Linux Driver",
-        "license": "NVIDIA Driver",
-        "version": "530.30.02",
-        "linux-x86_64": {
-            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-530.30.02-archive.tar.xz",
-            "sha256": "db30bba7b44458b2de2e0fb13d335b9eec5886034bde5999dffba23bc4e198ee",
-            "md5": "bfec08e43cc45f45aa07616d9856d2a5",
-            "size": "416508828"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-530.30.02-archive.tar.xz",
-            "sha256": "a5b51d096c36b962c424038bae2279975bc2ccd3caaf7c68fabd67302973b1cc",
-            "md5": "6c8073bc881f177fab52913cd9e95b6e",
-            "size": "98199608"
-        },
-        "linux-sbsa": {
-            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-530.30.02-archive.tar.xz",
-            "sha256": "a16bfd2ac3cbe16bee5da5c85254a64352cc7bd6a17400db1b65ad692b6ad100",
-            "md5": "1c9513fb5563f4d58507af0d4705a0db",
-            "size": "267452360"
-        }
-    },
-    "nvidia_fs": {
-        "name": "NVIDIA filesystem",
-        "license": "CUDA Toolkit",
-        "version": "2.15.3",
-        "linux-x86_64": {
-            "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.15.3-archive.tar.xz",
-            "sha256": "7193562d0c4c1f37ae75d2deedc385bf0bc8d3c580b4e1a3a04dd07011366d6b",
-            "md5": "6d3496b0fb42846df9e77f63ec7b884e",
-            "size": "57576"
-        },
-        "linux-aarch64": {
-            "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.15.3-archive.tar.xz",
-            "sha256": "63d80d1bdfdbd1ffaa6bc85f7374752fa47e18dc9e24c1af1ca05ac362f594db",
-            "md5": "dbb45f4bc4cd0c33d1aafc5d602bc945",
-            "size": "57608"
-        }
-    },
-    "visual_studio_integration": {
-        "name": "CUDA Visual Studio Integration",
-        "license": "CUDA Toolkit",
-        "version": "12.1.105",
-        "windows-x86_64": {
-            "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.1.105-archive.zip",
-            "sha256": "15f513a7ebfa1ad9920f4f1a4adb9949072eb4b3ed6891c65724a72d896734ee",
-            "md5": "236c98bf27739c0f90cc344f1320f86b",
-            "size": "518009"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.2.2.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.2.2.json
deleted file mode 100644
index abaab337c2fe..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.2.2.json
+++ /dev/null
@@ -1,1151 +0,0 @@
-{
-    "release_date": "2023-08-29",
-    "release_label": "12.2.2",
-    "release_product": "cuda",
-    "cuda_cccl": {
-        "name": "CXX Core Compute Libraries",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cccl/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "90fa538e41f7f444896b61d573d502ea501f44126f8ff64442987e192a8a39dd",
-            "md5": "00ea502586a8c17e086292690d6680d6",
-            "size": "1150676"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "9503cf76dcb0ca16e8b29771916fc41100906c1c38cfc1c055ab07046cf6a5db",
-            "md5": "426d244e235592832920527e6eec817e",
-            "size": "1150768"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "f28c327c745030e16aa9f41526401d169f5646ffe3de3f1ac533d91929f44e5c",
-            "md5": "2f74c30cc6309a609af2ac980f02b5c6",
-            "size": "1150316"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "6a83fda78793e5328d89ef0258d2f26bba5177ff118b6657a7be38ffd89f10b0",
-            "md5": "aa623b334362cb9ad2f2032a40cd771b",
-            "size": "3044697"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "ca3956b1528b4b4a637f5e9f2d708e955f23ae4510f7aca4fd30080e3329fb02",
-            "md5": "fa7040730790c8bfe0e9eea6163b8e6a",
-            "size": "1151012"
-        }
-    },
-    "cuda_compat": {
-        "name": "CUDA compat L4T",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_compat/LICENSE.txt",
-        "version": "12.2.34086590",
-        "linux-aarch64": {
-            "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-12.2.34086590-archive.tar.xz",
-            "sha256": "fd59f6c5f6c670a62b7bac75d74db29a26f3e3703f0e5035cf30f7b6cfd5a74d",
-            "md5": "2dc0b8c8bcbab6cb689ee781c3f10dd5",
-            "size": "18680292"
-        }
-    },
-    "cuda_cudart": {
-        "name": "CUDA Runtime (cudart)",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cudart/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "baebd331249bca0edf36776ead90e6b2024ffee01ea26cd9dd07344bebeaff08",
-            "md5": "030e85f4d0305c2924e2b76e84e2da32",
-            "size": "1058992"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "aa4c0ae347e137f7b373f954b4bf180b5d43d5279afcfa34d6ab8621b8530622",
-            "md5": "daeb0b246be9617a4b9dfafe5fd12dc1",
-            "size": "1037696"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "11c263e07a0d0cef82d754b0beea3db191654b4f18b74b7ea40777244e6c8246",
-            "md5": "09a39a5890136df6f833dcd304bb7867",
-            "size": "1050456"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "c63a17cd542a47aa6734263586e3dab6f1e127779099af92d9d01f220f80d750",
-            "md5": "029c67a417c3214309e92b0fd511dcf9",
-            "size": "2416001"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "ec0b5100d7c20819a2b775a479478fb571039b5743eddd5d51e1df0edf7fcb37",
-            "md5": "8722506d664f51a7f547bd1f3ce64679",
-            "size": "1108360"
-        }
-    },
-    "cuda_cuobjdump": {
-        "name": "cuobjdump",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cuobjdump/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "6c5c3d6e50f3ea14fcd356a83338110882305bffa8d5e4eecbaaf7479599f0d0",
-            "md5": "0cc4b4ca345f0f68d91d8753771f2d56",
-            "size": "170816"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "654e40c4627a04542554efb2277ee669d1c43df5276866dfde6ba481ae2451fa",
-            "md5": "5d34fc1b5630d235583e3801bb327e67",
-            "size": "212764"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "a02cff8dbb77804308db65b1d3dfc155a8a4ec029da3deaaebb73b0d36a7f97c",
-            "md5": "9432ad242258ad66a09317f0d91f2f67",
-            "size": "179176"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "e84dc5ebf92b48aa57e9cfb1be0341534184f106fc45b52bc0bad297761af21e",
-            "md5": "ebf9f8b8e82214168ee00a40d556eb5a",
-            "size": "3775990"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "0941bd2602ecafdfcdc98ce7b84c4396b3f145eee824316dc4885b9d05b6791b",
-            "md5": "49134b65d1345d8b02ad6e19b4ec6d73",
-            "size": "162612"
-        }
-    },
-    "cuda_cupti": {
-        "name": "CUPTI",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cupti/LICENSE.txt",
-        "version": "12.2.142",
-        "linux-x86_64": {
-            "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.2.142-archive.tar.xz",
-            "sha256": "b269a3616634c6bbab8b0c3929aae05d9f7d7dc5f0f1a07f35d8847196965b6e",
-            "md5": "3d8f2f2add81b626593bc0a800cfb928",
-            "size": "19580992"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-12.2.142-archive.tar.xz",
-            "sha256": "74c05cf0f37020c564039e27ea10adab70e6dac0eaaa70bae4b5ff6e84e2d79c",
-            "md5": "7af107ed1f6fb0596ac80f012dbff2bf",
-            "size": "10755848"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.2.142-archive.tar.xz",
-            "sha256": "d8ed35787533d9bfb0d19f05f05aedf11da5d5964ac19157bdb91ba594667c12",
-            "md5": "bbf21983d31e1d0d866241a909fde74f",
-            "size": "9848436"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.2.142-archive.zip",
-            "sha256": "5eb71c13a03b3c1ad6004094b5a17f509ca857b23c36fb40f5def766c8ffa6e6",
-            "md5": "1c135a1a4028e65f717b93797c9271ca",
-            "size": "13053349"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-12.2.142-archive.tar.xz",
-            "sha256": "2659cc15e8cf0ae04c5500a9db4dade5bcef480030821f4dfdb0ff646252aec4",
-            "md5": "6411b58e0d9d2affa871be74cba59663",
-            "size": "7770036"
-        }
-    },
-    "cuda_cuxxfilt": {
-        "name": "CUDA cuxxfilt (demangler)",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cuxxfilt/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "56b3dd86ee2ed566eeff24f8e09e80870e59888a8c3ff7114b97ea51461d97dd",
-            "md5": "505019c5059fdf8a473202e895a614e4",
-            "size": "187948"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "95fdbc129cda98dd079c9e3bedbfd3db06ece3e8abf80cdbea81b4124f0b7a9d",
-            "md5": "086b382d4c8d11b271d369af439f0de0",
-            "size": "180796"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "f19348fc92130e0d8c329a96529102d1ab58e3fd7e7f9dbd62cedbb5b1daf394",
-            "md5": "4e8fb685cd244b29ce6a338f9c9974e1",
-            "size": "174664"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "a4099bc6b905e1373a1a83f86720e6f7dc40f355d11c1ff4005b5d0be7387e20",
-            "md5": "fb1c65bfc46d22338fcc8ee3cdd58631",
-            "size": "169420"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "1acfc797da55ce72905fcbf8592696e61b40412f8b2817b2588d97c899b955f5",
-            "md5": "98206bcb97591242beb8deb52cdc01ea",
-            "size": "167344"
-        }
-    },
-    "cuda_demo_suite": {
-        "name": "CUDA Demo Suite",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_demo_suite/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "07fdfe90313b690e8d4b959c184abebdc92f1304b38952cb6dd5747b24ddb5bd",
-            "md5": "a90ecf71c9e22859271049e842468a8c",
-            "size": "3994692"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "4810bd2560912b0a26b0fe842d46b3a48a63a4be583a837c27401a7cb2064619",
-            "md5": "e9b465d8d66f8c3f4299a9bb9e0c3950",
-            "size": "5052205"
-        }
-    },
-    "cuda_documentation": {
-        "name": "CUDA Documentation",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_documentation/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "f717834f00c01a309df9d7d8e23a62133a458e0c3ec1952bf797d09309f84439",
-            "md5": "2d4b1d2ae641066b2bf1a28b0b4b1f82",
-            "size": "66956"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "4db6c52188c458bf8c55d7f1eba67dd5ac5cf8adcf3064df5b9f9e04895f78fe",
-            "md5": "a79e122c5ba0b62022c23bf31f4eb860",
-            "size": "67220"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "94e42ba6ed970b89d6b8f761601a27d472d3e2ec3d5b2af063fb6102ff86cf9f",
-            "md5": "2f401a68b558b633fd37931c04ee9c4e",
-            "size": "67172"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "c9c83a42be5be26ea955b1bfaa5ab356fd50c76ef0346a17a4f0d828c7589629",
-            "md5": "1d3680ff052e4e9851c88a8f5ada2b95",
-            "size": "105380"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "9759bbf7e2381f0e2e2e20b283e8669eba3cd421196fac9c48f35af2950c0188",
-            "md5": "e16dcd0484ea8b1eaef550156fc3dcd8",
-            "size": "67164"
-        }
-    },
-    "cuda_gdb": {
-        "name": "CUDA GDB",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_gdb/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "94f8b223412689544e86bc28660acf4f53e75674eeba2c9a62b51ff58686f9fc",
-            "md5": "760e4a05bcb6e9588aa4569c7c1d10e9",
-            "size": "65686592"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "2fbfede97d3fa7f09796b4ff416d66e4520ec47ed6a24e17083d1643adb116f8",
-            "md5": "a67ba3b07c54fd93b9be40d7107288cc",
-            "size": "65461272"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "2cd74b1f6d8158be1b145bc021316cfb6f13d242b1e7eb6b3b9e436f886aaaff",
-            "md5": "e6d58a5c8fc4dacf7b30c47c1b4bedfc",
-            "size": "65336976"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "1568ded1d37348413e1c907618c5477959479e7c44406a2ee93a720962a33c55",
-            "md5": "86fa1ad3a522a6a00cd93ee79bb8bc7a",
-            "size": "65360184"
-        }
-    },
-    "cuda_nsight": {
-        "name": "Nsight Eclipse Edition Plugin",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nsight/LICENSE.txt",
-        "version": "12.2.144",
-        "linux-x86_64": {
-            "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.2.144-archive.tar.xz",
-            "sha256": "36660b186dae381b6387c0dd85f339aa510ab74101356d89df240bdbc71056bb",
-            "md5": "eccd1246f8668b4112943c4927071aa6",
-            "size": "118680060"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-12.2.144-archive.tar.xz",
-            "sha256": "0d17dfe7db7bcc2253bb57e6423b10f4c75b6b766448692cc3eb0f01da537a1a",
-            "md5": "3a08ac54e25f153e9e64b865746915cb",
-            "size": "118680056"
-        }
-    },
-    "cuda_nvcc": {
-        "name": "CUDA NVCC",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvcc/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "3feaab191e1ae3fded02c02b0f24453069ada96b2e3a750251293b36079dc2f1",
-            "md5": "65d90cb219e8e7a204ec2f4e642c3e43",
-            "size": "46728284"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "cc515b95932445624a21bd179256dd7211c02000f543cc68fee6a99d735f137c",
-            "md5": "c45b9b8f784a901aa17abaa0800b708a",
-            "size": "42046684"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "3e9df10648af47cd4b1b985be81da9e4706623b6dd6f640e53f6d8badd84c155",
-            "md5": "5ffd328ae2b8ec7905c69749d3fc2064",
-            "size": "41041912"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "140ca9c560f2fa4f6f7275d815d1d6fa6bbf08901a9bae48152f6c5e50c0bb1c",
-            "md5": "28c00dfb6128227725668ae755df7ede",
-            "size": "60265384"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "1b127448457a201c74a21077ab2cf0b3291f525ed8570341649c95314468a2d0",
-            "md5": "7e74ecb9f853ce6872073eb3d1ce81fe",
-            "size": "42600752"
-        }
-    },
-    "cuda_nvdisasm": {
-        "name": "CUDA nvdisasm",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvdisasm/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "ca07e223ff3d9954ff2664f90ea1bdfcde1c3cbdcdfd0dbfcd131c36f6ae0449",
-            "md5": "d5f94fa5ef2e2911173474f16bc17ccc",
-            "size": "49869556"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "67a2ccd74368160feac5cd8f1dbf69291d6a83573756b51f56fdd99018ec2103",
-            "md5": "bcd3bc8e259f3ca4ebcc42497f023605",
-            "size": "49871208"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "38b9253059be117c4593efe43483a34754672c13c58b6d413708ac6336b6ae77",
-            "md5": "f2647474eab846e0edc9c0f84c84e151",
-            "size": "49799296"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "8ab067d496dcf7f98845c46c8163d7452414a0f012e4e24e91b2b8baa456bb01",
-            "md5": "5b34b6476609a8d20dd169252f2cde30",
-            "size": "50125124"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "94ae6926a92ec3f090daed525e8a8ffbea358cc484b4bb928704536a9986635c",
-            "md5": "2c58a02cbbd660b37647b6853a6e8361",
-            "size": "49820048"
-        }
-    },
-    "cuda_nvml_dev": {
-        "name": "CUDA NVML Headers",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvml_dev/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "9542ff071138d5efd541071ed4211d515b90fc988afdf7ba5b8ff1e863630429",
-            "md5": "e8a22ad0fab4f47191df8c6683f27192",
-            "size": "86216"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "ae470775b3c7422b19948a4e85a1d8d1507122c4a60bc2a412d38c29bcc97e08",
-            "md5": "4a44337bd43939f63e3037084b9cb41c",
-            "size": "85228"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "fd0cf20c55d7f6d8b55093a2cceb741f4e9b6ee19b937ae2bed5fa2f606e5f87",
-            "md5": "78beedb2fca52f2aa190be34d7b08c0d",
-            "size": "85764"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "cfd23524e8d626a3f85a21c5b58d80eb44d673405174fa2cf18caf851ed0ceed",
-            "md5": "1205d8d748380eb0a2390c8f26945062",
-            "size": "120119"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "be4d96927aa52c7468fd0eb15eaac89526f154a164c4a64732afb502a03bcbf8",
-            "md5": "cf24cb7205485ef92ab2ace728a9fedc",
-            "size": "85720"
-        }
-    },
-    "cuda_nvprof": {
-        "name": "CUDA nvprof",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvprof/LICENSE.txt",
-        "version": "12.2.142",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.2.142-archive.tar.xz",
-            "sha256": "85903ca190885de9cabbaa9644a2b91c9245bea050ce553b0aa8bd3370996051",
-            "md5": "1dc2a4845781ec935a671c2318bc111e",
-            "size": "2441056"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-12.2.142-archive.tar.xz",
-            "sha256": "3d12bbbf161d9981ae5eae302f098a312929f657edf12a4b00412aa0023ede79",
-            "md5": "0ba8a43f0793cb77dc485deb6331f820",
-            "size": "2119280"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.2.142-archive.zip",
-            "sha256": "968366fb51f413229d48e404951f99ebfa70898b84b8fbb06a5909fbdeb59177",
-            "md5": "8f31af94a9edd798e5d4a4259a829f4c",
-            "size": "1701039"
-        }
-    },
-    "cuda_nvprune": {
-        "name": "CUDA nvprune",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvprune/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "f5cf2db9d3214d540490c663691b171b11531be98611b4e6b86b208c7ee4f5cf",
-            "md5": "874fe6f55aed07403f033fa0e467dfeb",
-            "size": "55976"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "e949f93789a8256ab647b95b7d63bf814492003ba28c4d1d915753dcffd2b709",
-            "md5": "0f51bf0f64d774f7fbc1c48162ea33cd",
-            "size": "57088"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "4e434e9ced2efb9a3bc83edca93262eaa54546cf74783658239f2a05b119eb47",
-            "md5": "0c346f28f771525c802b49a09b56de32",
-            "size": "48176"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "a001ccae83160a713332887d8965f271bbc9fcf5d4eb645c3bab8dbea8a4a72e",
-            "md5": "71a565d385a177a9a0df7c835b7c97c5",
-            "size": "145889"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "1911f27cf6629cbdb9183b35b42e700f7e86447f7950ebb6fe2cbc66fee7cebe",
-            "md5": "8e0300d2559ca3e84fd173f767af0e87",
-            "size": "49756"
-        }
-    },
-    "cuda_nvrtc": {
-        "name": "CUDA NVRTC",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvrtc/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "d13903b5785f9c2157bec4c0d48f2217bfd9079dae5e9873901e4723a83a31d4",
-            "md5": "542800990ddee343974e5113a5214114",
-            "size": "30863708"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "9a7a75d5187af062babe8c03e3969b112ea57ae01c1331d4dee721ab4b5d0330",
-            "md5": "94c9050afac3c1966dac9389713790a4",
-            "size": "28225232"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "ff478c5f4bf51a76a1d5ca9f6ca2d8f248f3eb04b7656c8de84d69f5b33c0951",
-            "md5": "1282906a59976c61a5e4b69960696dad",
-            "size": "28239756"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "3c02299e9fad2b5fda67301140e841f31db7edac57a57f9233f98d9066d14e32",
-            "md5": "c63e3b6908f2f74306049eaf21f36e11",
-            "size": "96131961"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "30056d9fadac1b6b347e316463cbdb0245ef699f0ba51b890f8419827b0d0623",
-            "md5": "ab55d00f7dfd247da5eb5df920662da2",
-            "size": "29348908"
-        }
-    },
-    "cuda_nvtx": {
-        "name": "CUDA NVTX",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvtx/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "2651bfb5c15fc546556da2d6b1dc48c97e1ee6f8c38d3f1910df56f24d5d028e",
-            "md5": "2e695953ecc05f4b1b10fed36af6463a",
-            "size": "48384"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "5e41c750f1677801848765b0db6ac1672b2ea29cc2f5c0ef914d84e52e2a4989",
-            "md5": "bd06c5f123015ad1173b5cd82aba5733",
-            "size": "48476"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "b94ecd3824a7ecaf95b3d74b8972a29aae5ab98af349333f9c737f106d10b16a",
-            "md5": "989d0b2b18e9aebf9d18d55041ab6338",
-            "size": "49008"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "6e68b436760aa05a5190d04c104a2c4f2f47073b099c6c25cb989a769c69f77a",
-            "md5": "6d5d9e9988529a1a00dce81cc399cbc0",
-            "size": "65732"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "cda3e9725103446d17ba8e117230f985834d85bdacb4ed036cef5a113abed352",
-            "md5": "a35a15866757be7f2f49a37272f445f5",
-            "size": "51544"
-        }
-    },
-    "cuda_nvvp": {
-        "name": "CUDA NVVP",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvvp/LICENSE.txt",
-        "version": "12.2.142",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.2.142-archive.tar.xz",
-            "sha256": "a5afc346567aa1a0129b901c2ea2246e69c49b21451e93cafd15c2c7cc3776e2",
-            "md5": "b72eb16023bf083e7422bf2bf681f3c2",
-            "size": "117735088"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-12.2.142-archive.tar.xz",
-            "sha256": "7a2d6cc4ca2b9c907f68cb82ee861283d746e6a99f9fc1f7090ae4bfeafa3bbf",
-            "md5": "6bc08cb579e4e75433509d3441173825",
-            "size": "117180108"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.2.142-archive.zip",
-            "sha256": "0be4646875789d14013c70040e9e61abb4ebd4892e2418a5d4238a73ade44058",
-            "md5": "cf9c31100d163ea912d2fdf504f05849",
-            "size": "120341504"
-        }
-    },
-    "cuda_opencl": {
-        "name": "CUDA OpenCL",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_opencl/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "2d921db089c490addc3f66047ea51858dc4e77c74a43fd53454c44a3c22a7a87",
-            "md5": "71116747f33359fe617bfcc9787b32bd",
-            "size": "74896"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "966cdd101773ebaf5da77217f9da75324ec6f3dc8a3d4663e5ec439ccdf06e7b",
-            "md5": "a22fcb058bd2b909dc0b2feb572ff919",
-            "size": "112950"
-        }
-    },
-    "cuda_profiler_api": {
-        "name": "CUDA Profiler API",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_profiler_api/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "4c27538fb10dc86d0a54ff205e4099204ca2534784605dde80284a59be05d7ae",
-            "md5": "c0d27b98ea356c39dd99263a7bd2197d",
-            "size": "16052"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_profiler_api/linux-ppc64le/cuda_profiler_api-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "fa6f0e0273677c35e5dd025e91171863ba6434e9557b4526f166eeae3146227c",
-            "md5": "0e4c5faac5b7232f5057b6eec5988901",
-            "size": "16056"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "dbfc2e5b4f45c47601549f6481955d2629aa1001921ac3dce284a1626f805d6c",
-            "md5": "0d349e18c3a6c43344f78948cefa800d",
-            "size": "16048"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "36d865be0bcd4a8be8bdd48fd24bc8b5d5e5f181ea12631d3c8a52e8321807f9",
-            "md5": "2c552582bfbc00cf8b23456c2a52d9e2",
-            "size": "20085"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "a93303be55363f9e8f2570a1a16abbcf0194f36fd5c894624f73e76d5a3282e2",
-            "md5": "19578120942de186c59679f0cf7b117a",
-            "size": "16052"
-        }
-    },
-    "cuda_sanitizer_api": {
-        "name": "CUDA Compute Sanitizer API",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_sanitizer_api/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "1d02913ab7a1389a13b4f66479be73fe6391df29a53123cf86efba5f88e991d2",
-            "md5": "4b87808b82a9309287fc0254233c6d37",
-            "size": "8296348"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "5f37b3d901403094c68b2bdbc34381f3daaae7504fc92e5e8ab8feefe196f2b2",
-            "md5": "aae50148dc628403eb2ad71499501d52",
-            "size": "7643868"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "a16ca8a7283b4eb074ee878fc44c85dab8946ed6d2ff6a8893c409ebff3c8e3e",
-            "md5": "134e9d9a6b20e2fa53618cfe590eeeb5",
-            "size": "6213596"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "1c1d84647d331759bbed4ef820e3ad26866af7383ddcc0ba02d695b9886d7820",
-            "md5": "384a685b9b81204b4273f5e1cac7481d",
-            "size": "13897879"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "4503ed0e7f2b24bbe8b47ceef5df44f2ef9ddf707d33bdd561964f1d5ad01cf7",
-            "md5": "b679a95b4dc76e267990547025587dab",
-            "size": "3562156"
-        }
-    },
-    "fabricmanager": {
-        "name": "NVIDIA Fabric Manager",
-        "license": "NVIDIA Driver",
-        "license_path": "fabricmanager/LICENSE.txt",
-        "version": "535.104.05",
-        "linux-x86_64": {
-            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-535.104.05-archive.tar.xz",
-            "sha256": "d71c8bb69b90421d8e761937b5ed4b9b6e81ecae581f7abcfd9e1fc351488791",
-            "md5": "1f8c835831781c1916503f95e52050f2",
-            "size": "1819572"
-        },
-        "linux-sbsa": {
-            "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-535.104.05-archive.tar.xz",
-            "sha256": "da60bdc321f396003a466e771dc69b4aea06f084e6076606dcdd5db473169cdf",
-            "md5": "f2838a9c204d9dc8d23fa5c857cded19",
-            "size": "1680668"
-        }
-    },
-    "libcublas": {
-        "name": "CUDA cuBLAS",
-        "license": "CUDA Toolkit",
-        "license_path": "libcublas/LICENSE.txt",
-        "version": "12.2.5.6",
-        "linux-x86_64": {
-            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.2.5.6-archive.tar.xz",
-            "sha256": "56ccf7ffbe7ea204fbb0c5c4c55829ef3fb81b2e811f8073fcd0bbef438b262e",
-            "md5": "dfd9fc6f65d0d2200cbbf0c28d5c7067",
-            "size": "505014804"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-12.2.5.6-archive.tar.xz",
-            "sha256": "0883ddfb1460cb69219a80fffe3e1ef02d59caf08ff60fb86453cdabdf5c7318",
-            "md5": "53db5e36efe8dbf45135d8835cf6ca0a",
-            "size": "400304640"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.2.5.6-archive.tar.xz",
-            "sha256": "be6885ddccdf7b5f6efaf4272aef7cffbb5502258e9991cd93c5bc110a38e364",
-            "md5": "bde4d96c012a7cc232e1b5709e0d076c",
-            "size": "496898260"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.2.5.6-archive.zip",
-            "sha256": "205f20a1e91a9502ad4b9bca2e66effa76ef14ef5378e1fc5b6e2a223158ac5b",
-            "md5": "23535cff27e5ab460026dd2164123935",
-            "size": "443774878"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-12.2.5.6-archive.tar.xz",
-            "sha256": "db001ba7f3e33568846b1c37ccdf54dcea66396975e43720471d799d08e1eb5f",
-            "md5": "7f68aaa55b34724cc64458e85b6625b5",
-            "size": "453455004"
-        }
-    },
-    "libcudla": {
-        "name": "cuDLA",
-        "license": "CUDA Toolkit",
-        "license_path": "libcudla/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-aarch64": {
-            "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "3e4e3b6ecdd80f8519f3411ee01b479260130665c38b620cad163e7838b3a863",
-            "md5": "ce878668cba58c1dc7ff8ad35ecd41cb",
-            "size": "37772"
-        }
-    },
-    "libcufft": {
-        "name": "CUDA cuFFT",
-        "license": "CUDA Toolkit",
-        "license_path": "libcufft/LICENSE.txt",
-        "version": "11.0.8.103",
-        "linux-x86_64": {
-            "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.0.8.103-archive.tar.xz",
-            "sha256": "b146efb8bb500ee82519a7783b55c68c36f2c350a61cbba7d7b642ddc0d68bcb",
-            "md5": "b3e0cf021beaab33668fefef599a7fdc",
-            "size": "170424256"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-11.0.8.103-archive.tar.xz",
-            "sha256": "5b001c8e37c1e5e098c54afae5100bff70171bcf5ba245eb423f3c4bac197ffd",
-            "md5": "38440f3f109bcb2be1b83307f9d853c1",
-            "size": "170548816"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.0.8.103-archive.tar.xz",
-            "sha256": "c4c247f2c3d608aa690ed0237e5e0413455a9ee10a59ce84e2643b44800705cc",
-            "md5": "169c5bfa425c8b2a7ed10e41e6fec6ad",
-            "size": "170566888"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.0.8.103-archive.zip",
-            "sha256": "d523ea42f195f16c4b117276797093834a1fffbbcd006c2b24cf31736d995e60",
-            "md5": "162ddfeab043199e2d81ab1ff835285a",
-            "size": "97456781"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-11.0.8.103-archive.tar.xz",
-            "sha256": "15d1ada050f60a5362b80650ef63be4663bf6749a8c298bfa93009ce4b8113fa",
-            "md5": "65df3f69475f750b96ee97f272e73a02",
-            "size": "170672168"
-        }
-    },
-    "libcufile": {
-        "name": "CUDA cuFile",
-        "license": "CUDA Toolkit",
-        "license_path": "libcufile/LICENSE.txt",
-        "version": "1.7.2.10",
-        "linux-x86_64": {
-            "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.7.2.10-archive.tar.xz",
-            "sha256": "60f9e442b09998d1937827b4f56982bfc22fa1c15ede9bc1261e9cc947a94087",
-            "md5": "57a580d197e88709494844c86d983874",
-            "size": "41854504"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcufile/linux-sbsa/libcufile-linux-sbsa-1.7.2.10-archive.tar.xz",
-            "sha256": "00be847ca86b90fb540174ad70f34899c2f8f351637775b9c5fef5b7ad3adb76",
-            "md5": "a743513410e6ef3243f0f49d3dffc191",
-            "size": "41302032"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.7.2.10-archive.tar.xz",
-            "sha256": "36477dbe734c00945ff5f99369c9324bd560c4ad65b65a260996ae41d3b2e4f5",
-            "md5": "51397e31461a10e590c9c459bb3d0899",
-            "size": "41277664"
-        }
-    },
-    "libcurand": {
-        "name": "CUDA cuRAND",
-        "license": "CUDA Toolkit",
-        "license_path": "libcurand/LICENSE.txt",
-        "version": "10.3.3.141",
-        "linux-x86_64": {
-            "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.3.141-archive.tar.xz",
-            "sha256": "105ce31a3e83e8e548e35efe8e3b9f18b4fdb30048d0305015c2cf62257a090c",
-            "md5": "d1bd0610eb7014957b802f9d349bbcfc",
-            "size": "81947124"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.3.3.141-archive.tar.xz",
-            "sha256": "21f2cd0312bc35037fd8a1dde1444af75050e409a316a1502f26a48f00f6db5c",
-            "md5": "d568a4c72d5d2cf54c6f5ba1b9818037",
-            "size": "81983516"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.3.141-archive.tar.xz",
-            "sha256": "a1e754fe336f12848cb9f4f7b3c13a6bc81df375fe4babfb160936242a71d99d",
-            "md5": "c87d4ac4804368253053b628aca51992",
-            "size": "81932084"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.3.141-archive.zip",
-            "sha256": "46058aefc4fd8fb120c8565fc6ec5dcc6b4374cf973c2523b5cb8189e51e27bb",
-            "md5": "967ecfc6dd8480a5bfeec6f8e40fbff1",
-            "size": "55279391"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.3.141-archive.tar.xz",
-            "sha256": "b1430ba8424f638ef1eeb16a602641d68d9929b88f5a6328217da0d660a0694e",
-            "md5": "0be2590de89b92ed414ec46b24558765",
-            "size": "84106840"
-        }
-    },
-    "libcusolver": {
-        "name": "CUDA cuSOLVER",
-        "license": "CUDA Toolkit",
-        "license_path": "libcusolver/LICENSE.txt",
-        "version": "11.5.2.141",
-        "linux-x86_64": {
-            "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.5.2.141-archive.tar.xz",
-            "sha256": "7037b9fda9d5e4cebab204e0850a9df7e6f66724f798c4ca17e9af21dcfe9ba3",
-            "md5": "cae5929ff01dc4c8bb1be402c25ba977",
-            "size": "123206104"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.5.2.141-archive.tar.xz",
-            "sha256": "9edc8138ed3f9a06c1a09789073988acae3a8a0efac368904efa3bb044f1e2a6",
-            "md5": "d1efcf4e667f035b11c0ac35434ee685",
-            "size": "123174440"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.5.2.141-archive.tar.xz",
-            "sha256": "57a1912f8f0f53a192254863d2c5feccb6a878cdf8dfce39594788aca5f46b8f",
-            "md5": "cc088b37f04e7734c86924129787e805",
-            "size": "122133404"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.5.2.141-archive.zip",
-            "sha256": "e49095d45121c18f566a06aa9e688088193f892a1a381e6028233b037bbd39fa",
-            "md5": "00cd279c6ee12667f297ab45e9c555f1",
-            "size": "120619029"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.5.2.141-archive.tar.xz",
-            "sha256": "988c5e61477e4425c02b3c162c6e8eaad907452ccbdcd0297040e9c0c0ac12df",
-            "md5": "0bf9fb89f0413da2b6ad78a9d3b203e9",
-            "size": "133247048"
-        }
-    },
-    "libcusparse": {
-        "name": "CUDA cuSPARSE",
-        "license": "CUDA Toolkit",
-        "license_path": "libcusparse/LICENSE.txt",
-        "version": "12.1.2.141",
-        "linux-x86_64": {
-            "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.1.2.141-archive.tar.xz",
-            "sha256": "042d635487006837e08ebe0c307ee1ccfa026209d0ce2c64183581626c79ff3b",
-            "md5": "65b0479aadb72845e07110de537b681a",
-            "size": "211882788"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-12.1.2.141-archive.tar.xz",
-            "sha256": "623895f34c8a80bbcb2ba2e0f491b1919cb7891480b0284afb5d6c3e7452bf5f",
-            "md5": "50b234d86a02e4c889b4f32efff94e98",
-            "size": "212005264"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.1.2.141-archive.tar.xz",
-            "sha256": "5068d6909a37bb96989f6af6a197280986eb917398391da2f45df2e47eb44cf6",
-            "md5": "117f01470d0e6087616c7ea430484f12",
-            "size": "211611296"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.1.2.141-archive.zip",
-            "sha256": "70ea2dfc918aa23fadb8e3804cd6f04e80ec19f44eeffa635bf3e69e76b3c046",
-            "md5": "f77e684538cfa54df2d818d9418774ee",
-            "size": "192615584"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-12.1.2.141-archive.tar.xz",
-            "sha256": "12f3b910e7facb0f4204cdfd9cc1d46e828a6d6d220da36e852bb4be3fa10b15",
-            "md5": "6f76bb018c30f8b1d40f338640bd44a5",
-            "size": "226905832"
-        }
-    },
-    "libnpp": {
-        "name": "CUDA NPP",
-        "license": "CUDA Toolkit",
-        "license_path": "libnpp/LICENSE.txt",
-        "version": "12.2.1.4",
-        "linux-x86_64": {
-            "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.2.1.4-archive.tar.xz",
-            "sha256": "82aff958dab64a89ec719ae082290b998082719aea6be4de9d642bf2c9fcbc04",
-            "md5": "06767a79831f85adc36e0629bb91dc64",
-            "size": "183348052"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-12.2.1.4-archive.tar.xz",
-            "sha256": "35dc58629efbb0af289e28b866f299d464d44fdb2b824b4870421cdfbd5b9153",
-            "md5": "aed7ef1d0e624e9d8ef6c30635bfa2c7",
-            "size": "183901836"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.2.1.4-archive.tar.xz",
-            "sha256": "a7ff7086df1ee8a253e8f8b50730738b515b084ec32b57ea1c7cd2154f9e007c",
-            "md5": "1e6fc062ee6987ec09e1d756a1925cb3",
-            "size": "182584840"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.2.1.4-archive.zip",
-            "sha256": "4815f6e77ea000b7f7ec50e4c1e2772e3be05a40afcc501c8c7e6d7c4f5f53ac",
-            "md5": "7a0d5709c07a50181465a8d7314d5c0a",
-            "size": "153082156"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-12.2.1.4-archive.tar.xz",
-            "sha256": "b046373786657d7f8c7a2aca170900d38ec62bd91c728489e2ed62f78e5ac588",
-            "md5": "be6a424f4d4cd41b48e19dbdeb9273bd",
-            "size": "200658988"
-        }
-    },
-    "libnvidia_nscq": {
-        "name": "NVIDIA NSCQ API",
-        "license": "NVIDIA Driver",
-        "license_path": "libnvidia_nscq/LICENSE.txt",
-        "version": "535.104.05",
-        "linux-x86_64": {
-            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-535.104.05-archive.tar.xz",
-            "sha256": "ab3704b11cdf381d739fdae98e53aea6aec95538a32efc89cc90dbd3a8595091",
-            "md5": "480b1a8a966d5fc7f0306b90e3e68f6b",
-            "size": "350592"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-535.104.05-archive.tar.xz",
-            "sha256": "3f59ae0385b30677ef6cce248e805da6ef71fc151ec4779825716f42bff6274e",
-            "md5": "91f8d38263ad9b013dce0c3e7db1e8a2",
-            "size": "317620"
-        }
-    },
-    "libnvjitlink": {
-        "name": "NVIDIA compiler library for JIT LTO functionality",
-        "license": "CUDA Toolkit",
-        "license_path": "libnvjitlink/LICENSE.txt",
-        "version": "12.2.140",
-        "linux-x86_64": {
-            "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.2.140-archive.tar.xz",
-            "sha256": "1d6339ea90dc0d68e8e3d819c92ca1b3b1a0fab4837587d546a3289c152e5337",
-            "md5": "d806f9651074516ffbf1ae133155b03f",
-            "size": "26317844"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnvjitlink/linux-ppc64le/libnvjitlink-linux-ppc64le-12.2.140-archive.tar.xz",
-            "sha256": "5a202c4c460537b3f9a423ea3b4956da1616254222f10cd6b169f1169f1917b7",
-            "md5": "c16ab243b07f4cb28ca6d55848c96519",
-            "size": "23972384"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.2.140-archive.tar.xz",
-            "sha256": "0d661c092c3f5eafe889ff1bce131f0f2a0ab00e4ee7a06a118cebf8051ad737",
-            "md5": "631b76cc50df2bfd36367a6d916950fc",
-            "size": "23930512"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "21795de33dfffefa314ce7461aae3ea7509974848b8acd1842d600ee19278c4f",
-            "md5": "8003ea4a05fc864584c7f73ac7466342",
-            "size": "86973701"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnvjitlink/linux-aarch64/libnvjitlink-linux-aarch64-12.2.140-archive.tar.xz",
-            "sha256": "42f0caf3f922464edda5b8c1973ad388a39d606245793c59ebbaefc69cbc327d",
-            "md5": "762b587f30ff99bac0beb1a4ce1d274c",
-            "size": "25032700"
-        }
-    },
-    "libnvjpeg": {
-        "name": "CUDA nvJPEG",
-        "license": "CUDA Toolkit",
-        "license_path": "libnvjpeg/LICENSE.txt",
-        "version": "12.2.2.4",
-        "linux-x86_64": {
-            "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.2.2.4-archive.tar.xz",
-            "sha256": "86f5dde034a89c0ca26f39c6ec14e1ce47c88f7e7852913137153fd45de78f4b",
-            "md5": "7c7ce0b140a7cb16717d5fdd12c0889b",
-            "size": "2556648"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-12.2.2.4-archive.tar.xz",
-            "sha256": "ae73ecef99852488cd7cb36ab1f0a1a5e2c43c3b3addc4a9485cb5741fbb0bb0",
-            "md5": "15a5f09aab83a4e6b5036f07dd4eac22",
-            "size": "2584100"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.2.2.4-archive.tar.xz",
-            "sha256": "3dec2a261f3e7fa23537e270cbfe57cdd768c2994db1dadbe0740a26fcb16c31",
-            "md5": "4704427b2485e5a4391bba7d499bacff",
-            "size": "2384748"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.2.2.4-archive.zip",
-            "sha256": "9efe4c5cb0a13b00862c7dd860a96216ec8794c311d4648d1291e8dc1d3f6e0c",
-            "md5": "d48dd3780c2d3001c15ae54410cd9ef0",
-            "size": "2830376"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnvjpeg/linux-aarch64/libnvjpeg-linux-aarch64-12.2.2.4-archive.tar.xz",
-            "sha256": "3fc0049b56dbfc380eebcaf77cdeddd2a4f1ea71ab89a2caaaf529924d52404d",
-            "md5": "f51c25d446ba25a3c1625fc22e903575",
-            "size": "2528220"
-        }
-    },
-    "nsight_compute": {
-        "name": "Nsight Compute",
-        "license": "NVIDIA SLA",
-        "license_path": "nsight_compute/LICENSE.txt",
-        "version": "2023.2.2.3",
-        "linux-x86_64": {
-            "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2023.2.2.3-archive.tar.xz",
-            "sha256": "b2927dce0f75c34b6be00a7cdc2d6f75c0704e98fd7576b9068cdd2f0291deee",
-            "md5": "b893062619e138908a8f5867be6adbf0",
-            "size": "724649144"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2023.2.2.3-archive.tar.xz",
-            "sha256": "404de395caa2e05749985e6539174f4cab27d2ca2de765825474bf58c1cfd57f",
-            "md5": "a81d54aefd491fbdfd8414791ea11242",
-            "size": "185173220"
-        },
-        "linux-sbsa": {
-            "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2023.2.2.3-archive.tar.xz",
-            "sha256": "77bf1f7c016a05ce301c1d68e1fc0ca4b290bcc56771e368d0d0b12ef6f1dc89",
-            "md5": "1d1fe09d2db3bda1ef92cf00ca05091e",
-            "size": "350202056"
-        },
-        "windows-x86_64": {
-            "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2023.2.2.3-archive.zip",
-            "sha256": "92edddf25449e9337864faf4a5018e91e5fbbb33e68b184fd3557d16d86e1fe0",
-            "md5": "37f66efef784946095bb405869076049",
-            "size": "664653357"
-        },
-        "linux-aarch64": {
-            "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2023.2.2.3-archive.tar.xz",
-            "sha256": "5e5c840fbdf1cd67dd1ecba79c49b550dd18156cd5b491a191cb327d50bb2f1e",
-            "md5": "33dfafbaaab58809530f1c8f36ab5fb4",
-            "size": "740366868"
-        }
-    },
-    "nsight_systems": {
-        "name": "Nsight Systems",
-        "license": "NVIDIA SLA",
-        "license_path": "nsight_systems/LICENSE.txt",
-        "version": "2023.2.3.1004",
-        "linux-x86_64": {
-            "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2023.2.3.1004-archive.tar.xz",
-            "sha256": "d0fd2d347d563e22de4e420d0f169c434a49fde3a8391dc072c87903803781f6",
-            "md5": "89c440861b5f85a4c93f98bea99ed39e",
-            "size": "223340448"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2023.2.3.1004-archive.tar.xz",
-            "sha256": "0a91c310da7d8755c51b2e3c03a3bf0f28a034fa67129365fc06a064c9a5c741",
-            "md5": "4a78d50fc945f6236d0d6af1be0037b4",
-            "size": "64909400"
-        },
-        "linux-sbsa": {
-            "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2023.2.3.1004-archive.tar.xz",
-            "sha256": "3bec2b405da6a090e694d5641d9376ed8f50c7d29b7ab8bd02c628f5ca845957",
-            "md5": "2f41741cb5db83db66fa6282fdf21163",
-            "size": "195417228"
-        },
-        "windows-x86_64": {
-            "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2023.2.3.1004-archive.zip",
-            "sha256": "ff34ce8a50fc6c4de7b494fda970dac9ce3658a2483629865243d83561d41718",
-            "md5": "11629d3685f8d2b74108afc242131f2a",
-            "size": "335314514"
-        }
-    },
-    "nsight_vse": {
-        "name": "Nsight Visual Studio Edition (VSE)",
-        "license": "NVIDIA SLA",
-        "license_path": "nsight_vse/LICENSE.txt",
-        "version": "2023.2.2.23221",
-        "windows-x86_64": {
-            "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2023.2.2.23221-archive.zip",
-            "sha256": "a310ef2a2604ecdb741f1f8961d26ebb969a17db81a89c769224a60645181553",
-            "md5": "8bce1c927bf0b902fa3cb6557af4c0d5",
-            "size": "526808861"
-        }
-    },
-    "nvidia_driver": {
-        "name": "NVIDIA Linux Driver",
-        "license": "NVIDIA Driver",
-        "license_path": "nvidia_driver/LICENSE.txt",
-        "version": "535.104.05",
-        "linux-x86_64": {
-            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-535.104.05-archive.tar.xz",
-            "sha256": "f19c11dfda9e1e5c3e0a2ca775cdaa851431648540f4e8e2916c53735debd450",
-            "md5": "eeb4a2a99f4d2f5f0323cd4369e99cb1",
-            "size": "392555044"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-535.104.05-archive.tar.xz",
-            "sha256": "7c83f0a42a94ec60fbda5ce18e99f4c90758757698c1d21a8d83957daafa26b7",
-            "md5": "f251522e7b479c04008b3d0c573a218c",
-            "size": "100007576"
-        },
-        "linux-sbsa": {
-            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-535.104.05-archive.tar.xz",
-            "sha256": "eb089f52ddda09f4b2bcf0eb661d0bb7881a3d63cbca558c9530ab50b4ef84ee",
-            "md5": "1f518fbc7860141e885366e7e526f235",
-            "size": "306432584"
-        }
-    },
-    "nvidia_fs": {
-        "name": "NVIDIA filesystem",
-        "license": "CUDA Toolkit",
-        "license_path": "nvidia_fs/LICENSE.txt",
-        "version": "2.17.5",
-        "linux-x86_64": {
-            "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.17.5-archive.tar.xz",
-            "sha256": "3b6d9b6bc82cf575b38e99467a7987d40725a50004a67bc5edce4c40cd2b239e",
-            "md5": "b9164b9d3c34733257da7a15e5d38bcb",
-            "size": "58420"
-        },
-        "linux-sbsa": {
-            "relative_path": "nvidia_fs/linux-sbsa/nvidia_fs-linux-sbsa-2.17.5-archive.tar.xz",
-            "sha256": "e51f5a6ea897fa1b875f8b5da1cb3d16368dcdd5a6e8e02fc996b535a020a2fc",
-            "md5": "60aad0a8803dcece1e837fc7281b92e0",
-            "size": "58404"
-        },
-        "linux-aarch64": {
-            "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.17.5-archive.tar.xz",
-            "sha256": "c3bdb6177a0a5dc12fb1d41471b6bed4dae6a95c3d32e5fb6c0b740f6551b366",
-            "md5": "8010eaa202a53499a469d6216bee9fc9",
-            "size": "58420"
-        }
-    },
-    "visual_studio_integration": {
-        "name": "CUDA Visual Studio Integration",
-        "license": "CUDA Toolkit",
-        "license_path": "visual_studio_integration/LICENSE.txt",
-        "version": "12.2.140",
-        "windows-x86_64": {
-            "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.2.140-archive.zip",
-            "sha256": "6e754aabb61d0e8d1154aa22c42b95ff2c8b35a2989c99ec08a8c0f5e85128ec",
-            "md5": "ef934c22792d947d6e8872859dbc5102",
-            "size": "518030"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.3.2.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.3.2.json
deleted file mode 100644
index a8ea565bce1a..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.3.2.json
+++ /dev/null
@@ -1,971 +0,0 @@
-{
-    "release_date": "2024-01-02",
-    "release_label": "12.3.2",
-    "release_product": "cuda",
-    "cuda_cccl": {
-        "name": "CXX Core Compute Libraries",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cccl/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "dabd433bbef5f6d1b79f9a7eea909a3c273e20641f07a6a8667f42577462e34d",
-            "md5": "f3119f37a745c62d8d1656553e4463ae",
-            "size": "1148952"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "3be1948414533a6724d79dbfedd1963fb5074a4ed184626cd8735e38d10716f6",
-            "md5": "40beebf3920832ce4536686bf23a68ed",
-            "size": "1149484"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.3.101-archive.tar.xz",
-            "sha256": "77b22b4b5c54d7649edd62253979e7290314de73f268df152c1c21811ae20084",
-            "md5": "6a3f6d0a6dc231061cfb123c424c4979",
-            "size": "1148576"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "9ead3b6a606727ca05645f3f6b050d1158358c3bc9e518169666c9766f090306",
-            "md5": "fe38472401c6f4e30f99fdff4f5fb6b8",
-            "size": "3044697"
-        }
-    },
-    "cuda_cudart": {
-        "name": "CUDA Runtime (cudart)",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cudart/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "e37d478d1e7a10490d55fb87a5ef379a18c648f3010e1d3687c4298ddc3e9e19",
-            "md5": "4468b80ed363109753937f5367ed1dc1",
-            "size": "1088388"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "23f6ef558bb954dea3ef5b378c3ad28e1da93080890bd8bf1a18a75ae2ee605d",
-            "md5": "16395f8fd1eb591459897975c244d5fb",
-            "size": "1068376"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.3.101-archive.tar.xz",
-            "sha256": "131e62c60ba979f6870687db99a7537482f6df445915789d2a4799dc4e898b66",
-            "md5": "7e7175d5ca2e379062306b9779a2c990",
-            "size": "1078280"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "310a71bc9c92d6e61eeddf3489cc195519665fbfaca16c618b03da0ac5ea9f7d",
-            "md5": "92f4e20c900ce5a6ef368bf28bae842e",
-            "size": "2463054"
-        }
-    },
-    "cuda_cuobjdump": {
-        "name": "cuobjdump",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cuobjdump/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "0862d4b6a9e753fcfa4802e52ea917c5ae0e9ebdfe7e35bb3c1eb1f6f57857be",
-            "md5": "24fc1f4c0451a4246c6aab5fb508a207",
-            "size": "172472"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "46c759ec6faea974cf3218113fdcd2da4e92bc9ab12777d4c3b6c61aaf6c67a2",
-            "md5": "e0b0144945533913427739dc75b9f5c4",
-            "size": "215140"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.3.101-archive.tar.xz",
-            "sha256": "3fa1028791d0bc64532d33b080575f75f80150170fdcf3c0f2fa475da2f37167",
-            "md5": "6fe7599fe0e9ae4358c3664717cdb2c5",
-            "size": "181624"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "c37af9d07d7adff82096200ad73f96826a7a1153a1318917531abd06d311cbf0",
-            "md5": "3c61472d71d827d3d69e1cd0d6fa2cf8",
-            "size": "4013255"
-        }
-    },
-    "cuda_cupti": {
-        "name": "CUPTI",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cupti/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "082c178c1b94671d2feac5f1cc241ea0e8b46860b1fd1aed530eca2d919e4360",
-            "md5": "502cdf8cc1005e742f4cbbfe49d21fd0",
-            "size": "19315124"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "f3fdeb6ed036f6ff4771edc36eed421273780e9e9084f7821f6e85dfbe211c46",
-            "md5": "687a1b88a89c3fab3cf1b54d78ec286b",
-            "size": "10835996"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.3.101-archive.tar.xz",
-            "sha256": "a9417e7ef9af4e592099e372b0e6a1714d617866b2fc93c6832da2bdc07a707c",
-            "md5": "453fa202b2ec00286b6a14d8c5e1b06b",
-            "size": "10010512"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "fb57c570cbd71c167d8b4227508b39bdf8d2e79a38ba6f669217045d774df027",
-            "md5": "52e9ac3a512ad0ebab73382d333647ee",
-            "size": "13150781"
-        }
-    },
-    "cuda_cuxxfilt": {
-        "name": "CUDA cuxxfilt (demangler)",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cuxxfilt/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "6ecaa13bf5118a97d8f3275bd66646115f120ac76cdb1f88a5440504f173d864",
-            "md5": "fd640c2e78dacef9dfc047dc4748e90b",
-            "size": "188268"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "6e838311106b5ae0d5c57456a5c7249033a2b6d413a65a333712792d3ca993a8",
-            "md5": "cd43912dc4fbee3dc8856632b23b058d",
-            "size": "182332"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.3.101-archive.tar.xz",
-            "sha256": "778d1ae0d2fd0245122dd357f34cb50a8264980697ba1cf8d7da51f6e5101df5",
-            "md5": "a5dd901e3af1f14820e8daba9e46dafe",
-            "size": "174444"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "25d1726e4d0d4cb1de60a8297d29432f0e04a4d69a510ddf3bd192c666591257",
-            "md5": "7323d0e137462f2329a77d0de3f64f76",
-            "size": "170357"
-        }
-    },
-    "cuda_demo_suite": {
-        "name": "CUDA Demo Suite",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_demo_suite/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "ee400c1695b2804ec7521e8d21b7571daea0e4fc32156e21e2fa507921a0019e",
-            "md5": "b7341feb37bc6d81c8764b47db095016",
-            "size": "4005468"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "d2b710cd189b851f60cbfc9a4d423ff94379d50af76f44bd7854d4b92010bd7d",
-            "md5": "538353b556bc50f59c178caa8761b0d8",
-            "size": "5061041"
-        }
-    },
-    "cuda_documentation": {
-        "name": "CUDA Documentation",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_documentation/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "3d2775809d57f9e65c52c311671768e2a3082ebd2c325a1315ab311508db9da2",
-            "md5": "ea6c8f16badb67fe841d879cf77cc9e7",
-            "size": "66988"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "e27bd9984e23979aaf3ee54e748bd7bff32d50ff8d4e31031a891c0a4b625f2c",
-            "md5": "df246dc0d4d00390c775dd2568d76a3b",
-            "size": "67160"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.3.101-archive.tar.xz",
-            "sha256": "d7134f64a0644497aa27b7acb7a4f335978b60c01f012616fca669d404f3e352",
-            "md5": "14e27075244eeb433d0049f38fa5fe47",
-            "size": "67096"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "b15505f1a12cd42fb933867feccf1f7274371e9266f7e24edb9d408c03caf486",
-            "md5": "52b986cbe824279095f58e5fcfc83d27",
-            "size": "105380"
-        }
-    },
-    "cuda_gdb": {
-        "name": "CUDA GDB",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_gdb/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "3b8a692e7db61321c24896f151e72a761e1c7a88d84d3cde95eab0a97dc91e88",
-            "md5": "3b44bdf387bdb00026741833af010ece",
-            "size": "65763492"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "0e3fb5c5ac8b03326e5a61bf72d7579718bf7498d887ae93ce6c7b08f0faa601",
-            "md5": "b97a75ea07ba1a1e5fd64f7ffce7f34c",
-            "size": "65489936"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.3.101-archive.tar.xz",
-            "sha256": "74ed3c6b0b69ac69faa2cc46d26627149b36e14e47394ba39f5ee49e988ce6f4",
-            "md5": "b4bdb7e478ac72037d63c17d03fe5eac",
-            "size": "65436776"
-        }
-    },
-    "cuda_nsight": {
-        "name": "Nsight Eclipse Edition Plugin",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nsight/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "299d7e9bd3171a9db0790f08666a85c14b9a6fd09818f3c572f300d5be46ac61",
-            "md5": "fa5c57f87c50676914aa3aecf7b5c2e0",
-            "size": "118685744"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "281c00d45a7b5d2e3456d084137a4a45858f2dc9333eea8a2644b6a61ca6189b",
-            "md5": "01d088acf0a6704510b249b6afc0be6e",
-            "size": "118685756"
-        }
-    },
-    "cuda_nvcc": {
-        "name": "CUDA NVCC",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvcc/LICENSE.txt",
-        "version": "12.3.107",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.3.107-archive.tar.xz",
-            "sha256": "65dba017ed1dbbe819a6ccc1841a4add4dfbc652603aa89be773888e82a5629e",
-            "md5": "896329e1059bd078b891e502c9292c08",
-            "size": "47766584"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-12.3.107-archive.tar.xz",
-            "sha256": "0a5caf3e0cfd44f3aaa235f861c98573ac735f550faf57bda199650551fa27f1",
-            "md5": "254aae27caef8ed77be1bd17acb6abe6",
-            "size": "42929084"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.3.107-archive.tar.xz",
-            "sha256": "4c0e6a79a67fb86489be9e0976cc22127ca2ae160b1ad22ac4742d52f0ebe32d",
-            "md5": "4f35923354104295911afdcac21145d6",
-            "size": "41813056"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.3.107-archive.zip",
-            "sha256": "8398faefe86092b434d6be2f0b74addae639965217b8fb8f77099c8d75eb99df",
-            "md5": "b167359cdccc00f021cc63c8084e6c94",
-            "size": "62744070"
-        }
-    },
-    "cuda_nvdisasm": {
-        "name": "CUDA nvdisasm",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvdisasm/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "02409ad45cad89920bb6b5f9ef8332f4566347a33037d3730a5db562e8b3e4bb",
-            "md5": "1678671b839e55487f9e5be6e58f56b7",
-            "size": "49893160"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "54ed51e325e0fcf6b19598ed6e146fc5c3e99b291bb61e341e8b116448ad972e",
-            "md5": "d67d76f3d47cce4351d97e5a596324aa",
-            "size": "49890852"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.3.101-archive.tar.xz",
-            "sha256": "fa9a5b1f1c68080cb0e58297d52fff695c9fb4ab71906acc4a3500d7654fddc5",
-            "md5": "f91d8a5f0c8505a2ef47e62cc93ce7fd",
-            "size": "49807020"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "e4f984462be44e897d8e56382b5e18091d447ba46c0b325916dae197ac73007e",
-            "md5": "0f5dfa3054c730472104c6fab6935f93",
-            "size": "50139405"
-        }
-    },
-    "cuda_nvml_dev": {
-        "name": "CUDA NVML Headers",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvml_dev/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "34ab12792d46a839012236608ec446a13f6e7775556f9122a7c33bc742b3b29d",
-            "md5": "64a48a82f244d8db42f23973c544ce2d",
-            "size": "86476"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "655c44679b0d5c6f8756257770d99ba01bf31557a831076c5623b372adaaeadd",
-            "md5": "0f58b219e6637978d5392e869bf5d11f",
-            "size": "85684"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.3.101-archive.tar.xz",
-            "sha256": "e14f15f6eb8dc25d37872d713bfb40530b67b68e7b8441078310f40a3aec121f",
-            "md5": "32b850819909bc3c61a4fe973f016e81",
-            "size": "86280"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "73fef685ec993d8abdae25e8b0b96a562811e8e3b8709f3bf97c7388234dd81d",
-            "md5": "a956bc3471267309a6b3cb4c702c9d43",
-            "size": "120959"
-        }
-    },
-    "cuda_nvprof": {
-        "name": "CUDA nvprof",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvprof/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "00a0a569a7cf56c7aefdfb70a4f9b9e75ef861f1e18b233ef557e9d00481ce53",
-            "md5": "013eb78294db5f16c2ee0110b0add032",
-            "size": "2442448"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "0db875a38e947c038a7e67059d3b61863de751e36e2fa83c9f69aeac77b0b49d",
-            "md5": "f88d8cd79056574e325954a9bb685bae",
-            "size": "2119636"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "3abf2993dad74a981b5ea3405cdd0c5173ab848cbbd0a5ea140b04ae9fdf4baa",
-            "md5": "d8a34da67a0694c1166360312a8a4a03",
-            "size": "1700921"
-        }
-    },
-    "cuda_nvprune": {
-        "name": "CUDA nvprune",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvprune/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "61ac07de3c24e666932f61467ca79f8ac39560b04ea43b0c270e36bae64cd923",
-            "md5": "29304a18e402505195a0c79509313ab9",
-            "size": "56232"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "32f921da04a1b76a3dcc0f82e10ae69f58e3ffd4436f29b9bd810456fabb5400",
-            "md5": "8b4c75036f9c9c65fa6dab7d8346ed49",
-            "size": "57128"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.3.101-archive.tar.xz",
-            "sha256": "bc91e618a3548631ee6a7990d615987ffd480a92b35a73bbb3db5c283d9506d2",
-            "md5": "b4ddce3f6d8cb16f435de19251dce143",
-            "size": "48384"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "ad7b454e8a7b9e7fb513dd7fcf73635b8b2023a34b9325c966f8743dcbb8d173",
-            "md5": "0bd3b4de6eae3c7e13f8e4797c15bfbc",
-            "size": "146071"
-        }
-    },
-    "cuda_nvrtc": {
-        "name": "CUDA NVRTC",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvrtc/LICENSE.txt",
-        "version": "12.3.107",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.3.107-archive.tar.xz",
-            "sha256": "bc9d2f9d8f8847f76cc936f61d66f55ea4a898294e1799e2a63480b553b60e0b",
-            "md5": "67a2de1833667dc19bf8663b47274d69",
-            "size": "31329444"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-12.3.107-archive.tar.xz",
-            "sha256": "456b3f7ddb55547fb5dfc6f61b2f06a16fa92336981baeb318f47ba2a456789d",
-            "md5": "30c2c5342a095d4ac75e4c6e2cfc47e4",
-            "size": "28578552"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.3.107-archive.tar.xz",
-            "sha256": "efadf1837f40eeecb29255516afaff258602e74fb9c436b15024b6a295c506f5",
-            "md5": "cb8a93362a74b798898eced4330d3b82",
-            "size": "28665080"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.3.107-archive.zip",
-            "sha256": "535f226462c1f5025e054f7f76dd55573b6c59bdc734b314df554085b9c782ed",
-            "md5": "1421ed79aff390a16335af12bcf7d4de",
-            "size": "102253018"
-        }
-    },
-    "cuda_nvtx": {
-        "name": "CUDA NVTX",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvtx/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "cd21f7fc329337f3c1be888e68aef5d580f243b5cc9a63d392cdb08e49be1689",
-            "md5": "33f40082431501318d3f7078a62be60d",
-            "size": "48380"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "48c55ef200dc7164018ddf8c954b37805bae75419c2d80c4996d251e2d51058b",
-            "md5": "78af17ce108918a8e367fa090cf24a3d",
-            "size": "48396"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.3.101-archive.tar.xz",
-            "sha256": "69535a21d1db11e904eaddfa6861bec8203f5f4e97fe9b191ab35ca7ba5e5e1e",
-            "md5": "53a1a7e25de8bc5782995bb1f88b8853",
-            "size": "48964"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "5761c579e7381ae8f602eec14627ce89bfe4afed401bd788b72c70a45d5f0294",
-            "md5": "3544f2ef567d3725676ed0ac6a833306",
-            "size": "65732"
-        }
-    },
-    "cuda_nvvp": {
-        "name": "CUDA NVVP",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvvp/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "d186cae0f9a641b2777080272d6aab90955ebafa45667639c2326577e078dbe7",
-            "md5": "31f060b2ee6d6f9a5affafcf7f5a6550",
-            "size": "117712464"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "5ddbd92cc6ddce5530f38bd2e874021b7927fd60b4d4eb22805c043317347cbb",
-            "md5": "30c313fd38404f59eee5531f0900507e",
-            "size": "117150880"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "6b05de592c734373ba4cad2df7cd5383916e95bbe6fbdc7def68f0fa16d76fc7",
-            "md5": "8e2c9c7593170e17248fbd9aa7001733",
-            "size": "120344076"
-        }
-    },
-    "cuda_opencl": {
-        "name": "CUDA OpenCL",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_opencl/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "e984ff10ee56651869b24dc74f80c404b2526abdaa16235d6edfff3d9f58b0fa",
-            "md5": "2fc8fa39f41c1ec4183219dc18f70e9b",
-            "size": "75660"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "fa854efbb672785d07aa4e680312d9dc43da1d315aa8cfe403d9f25cd4291020",
-            "md5": "9d01c79bad666504b33e17b5da73402c",
-            "size": "114767"
-        }
-    },
-    "cuda_profiler_api": {
-        "name": "CUDA Profiler API",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_profiler_api/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "0fc298c934a3081cd5f52d57286b25db81f14b2a370342313b40b157578a3e35",
-            "md5": "3016b7861e13125957a1bef416919ffe",
-            "size": "16052"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_profiler_api/linux-ppc64le/cuda_profiler_api-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "46081476f70995881d8afa3b541c33f10c13bf53a0510de738a6368735a6a94d",
-            "md5": "fe421fd21653eb1f13e471dfb0a8b687",
-            "size": "16048"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.3.101-archive.tar.xz",
-            "sha256": "0e803fdb13a1201ed4c5202c3c82a7aa0590c65b9075383e9dabe02d4d01e372",
-            "md5": "3fe9d3bdb34dcd182e6148e50c5f82a0",
-            "size": "16060"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "9eb456ec5d7c7b7e0b0eeac5c7624380ce249774b4e261eda621881aeb04b5b9",
-            "md5": "90ff175654c9133428ad46e191a57102",
-            "size": "20085"
-        }
-    },
-    "cuda_sanitizer_api": {
-        "name": "CUDA Compute Sanitizer API",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_sanitizer_api/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "e65b92b71467efc156bbc3d1ebaf5b14dfbc4e9f269ab2995a37bbf84530666c",
-            "md5": "c7def2056d5add8b5e9c6a9314864b4a",
-            "size": "8204980"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "869d2dc46a291686f8c40f3b98232cddd85e4696be0d7e119ce92ec46e330590",
-            "md5": "6007da874390eb54cc366d0dde110ced",
-            "size": "7780796"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.3.101-archive.tar.xz",
-            "sha256": "c01d0b46a50e50292afcca33a3b768a900500d5b442925452801331ee0a61644",
-            "md5": "090ab33b8be87e5e2bd93b17ec20efa6",
-            "size": "6315216"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "8674b7e74d20ec9dc7566b9fa72a8ff1b4713c400000021d81d10e7497bc86d8",
-            "md5": "805e7a46427b35d6b71ac120f59a431e",
-            "size": "14115084"
-        }
-    },
-    "fabricmanager": {
-        "name": "NVIDIA Fabric Manager",
-        "license": "NVIDIA Driver",
-        "license_path": "fabricmanager/LICENSE.txt",
-        "version": "545.23.08",
-        "linux-x86_64": {
-            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-545.23.08-archive.tar.xz",
-            "sha256": "50af13d611cba79fe8c8f8d91b2d9203882f9c6c66080c73eb392b6a4ae91b74",
-            "md5": "e862955420ca5d0dc3ea6e2891bea964",
-            "size": "5086652"
-        },
-        "linux-sbsa": {
-            "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-545.23.08-archive.tar.xz",
-            "sha256": "b72a3f396003311c7697cecda9b4504b48cd26d1998d2e9e83106fffa0f34d03",
-            "md5": "6710d5bb9c71763131ddd181f53f381d",
-            "size": "4649412"
-        }
-    },
-    "libcublas": {
-        "name": "CUDA cuBLAS",
-        "license": "CUDA Toolkit",
-        "license_path": "libcublas/LICENSE.txt",
-        "version": "12.3.4.1",
-        "linux-x86_64": {
-            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.3.4.1-archive.tar.xz",
-            "sha256": "2cb5c340f89d9bad6e0f1fb2a93a8a4962fe106eeb96d8887abd25c1552bd219",
-            "md5": "35f21496d6181b588e00705424668d5a",
-            "size": "499925424"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-12.3.4.1-archive.tar.xz",
-            "sha256": "bfe394a4f8374d59df406c9ce1b7bc11c6a9449a48a9ed3b30e88e6f35c76ab4",
-            "md5": "eff9572ed0cc1de20b06680c42790d44",
-            "size": "392625472"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.3.4.1-archive.tar.xz",
-            "sha256": "063f0e1a130b35ff662d21c2e05613122146bec2eab4818139eaee5a1c4d94bd",
-            "md5": "f0d5d343147859d83d12f00ad02973a5",
-            "size": "492030856"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.3.4.1-archive.zip",
-            "sha256": "e29c419a99a2f5e3ea0e7394a58c23536429a26b7eccc3f89f172f7fd2818a23",
-            "md5": "b0c9a8c8250eaeaa51fd48525e9ab620",
-            "size": "439481897"
-        }
-    },
-    "libcufft": {
-        "name": "CUDA cuFFT",
-        "license": "CUDA Toolkit",
-        "license_path": "libcufft/LICENSE.txt",
-        "version": "11.0.12.1",
-        "linux-x86_64": {
-            "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.0.12.1-archive.tar.xz",
-            "sha256": "db057e20e123124fa43e71c97276a8bb02bb14dcdd467e901f542217ca603a48",
-            "md5": "d38b97c129aa0c288c690ef95e010522",
-            "size": "172057020"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-11.0.12.1-archive.tar.xz",
-            "sha256": "7ab861a691c82929f7b081f4c575b703ef6d08a5addae3da2684a2b228cd98c7",
-            "md5": "86924c66cb4d088c9f1a845c723b00f5",
-            "size": "173407672"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.0.12.1-archive.tar.xz",
-            "sha256": "8bde00bd10cba318998d6aee5677b5094be55c6e77259581495f8b31450c3ec2",
-            "md5": "0e73f8725bbc4ef94dc4776de52c67a2",
-            "size": "172362656"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.0.12.1-archive.zip",
-            "sha256": "c961016efe08da23f481f76efd8be0c2767496aaa7afead51789460ebac81cee",
-            "md5": "e45934973d0b3969313450fa2e4773bb",
-            "size": "96311678"
-        }
-    },
-    "libcufile": {
-        "name": "CUDA cuFile",
-        "license": "CUDA Toolkit",
-        "license_path": "libcufile/LICENSE.txt",
-        "version": "1.8.1.2",
-        "linux-x86_64": {
-            "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.8.1.2-archive.tar.xz",
-            "sha256": "3f71f3497a7a87dffc3e8c7dc06e128bb4d876eebd8719be94f366c62975035e",
-            "md5": "6386959420d4222ea5334137d5af8f62",
-            "size": "41870208"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcufile/linux-sbsa/libcufile-linux-sbsa-1.8.1.2-archive.tar.xz",
-            "sha256": "5800140ba9b1e0b32a862e6ea0ec2685fc67745dc5bdcd22a5b24284de021031",
-            "md5": "003dd09b8c5e4feb3f62e3f522c579e0",
-            "size": "41313804"
-        }
-    },
-    "libcurand": {
-        "name": "CUDA cuRAND",
-        "license": "CUDA Toolkit",
-        "license_path": "libcurand/LICENSE.txt",
-        "version": "10.3.4.107",
-        "linux-x86_64": {
-            "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.4.107-archive.tar.xz",
-            "sha256": "ae34384e17563b2bb156f0491ef30a280298509a243e4c32e6edf507606bdb4d",
-            "md5": "cfeed245f30607b56b6160a300741d31",
-            "size": "81716044"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.3.4.107-archive.tar.xz",
-            "sha256": "610f80af681113a0903b82e76092fbf889d14f55dc4fd5c1dcd714de07118d0c",
-            "md5": "0e21ddfc42e2899e567b0080781d5278",
-            "size": "81760420"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.4.107-archive.tar.xz",
-            "sha256": "eaf641c5f29b3e8984c489bdfbe57f5c64711446e5ff83486b9e2e3d1da92d37",
-            "md5": "5bd87490c85063c801d46d123f0cd56e",
-            "size": "81703492"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.4.107-archive.zip",
-            "sha256": "8cae76b0ad0ef62623cc6ee2b64646d5628fd3f7cf753c264607462426e1c7d7",
-            "md5": "f174af47d4f023753810c9965ede4c35",
-            "size": "55100204"
-        }
-    },
-    "libcusolver": {
-        "name": "CUDA cuSOLVER",
-        "license": "CUDA Toolkit",
-        "license_path": "libcusolver/LICENSE.txt",
-        "version": "11.5.4.101",
-        "linux-x86_64": {
-            "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.5.4.101-archive.tar.xz",
-            "sha256": "c271621cba76a12dd3cbddc491416f6cfea975bea695c418abb1f7fe281b8596",
-            "md5": "841b67ce5b0616cacc8547982336b5b9",
-            "size": "123457448"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.5.4.101-archive.tar.xz",
-            "sha256": "203089b6418ec1dcc5867eed897558ba4202c2891d3d80da0e4cd004c8b90dbd",
-            "md5": "9c8ecbda4426e77d5a2a693f60df53a2",
-            "size": "123578832"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.5.4.101-archive.tar.xz",
-            "sha256": "66cfb75fa2941b13b0ac287230f38b686369f9a8eb1eec01690095daf4205939",
-            "md5": "923abae537f3cb534019884749d22245",
-            "size": "122842936"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.5.4.101-archive.zip",
-            "sha256": "698149cd3bbd09ac8c426f95a7598d84e62f4452cde13c1d29f707f8091047b9",
-            "md5": "fb748b4fca3f9a0634d6e1ae7a47c86a",
-            "size": "120932643"
-        }
-    },
-    "libcusparse": {
-        "name": "CUDA cuSPARSE",
-        "license": "CUDA Toolkit",
-        "license_path": "libcusparse/LICENSE.txt",
-        "version": "12.2.0.103",
-        "linux-x86_64": {
-            "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.2.0.103-archive.tar.xz",
-            "sha256": "2705bea3c1ae1f0eeb5850a32b9af58bd9d3ecacca6cd2a557236e11a1c46efa",
-            "md5": "ae8b0830e1fc621b7f4104fe815b82e3",
-            "size": "214793932"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-12.2.0.103-archive.tar.xz",
-            "sha256": "f2625f9c514985cc5caf0dbec8b4c2be80cf2d16af4c6ff9dabbf02a5bff76ee",
-            "md5": "2d1889ea035b3ae2b613ddab34843ea2",
-            "size": "214834608"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.2.0.103-archive.tar.xz",
-            "sha256": "f356b0fff937946e661582362c754bec29314191613d26867db2b1625c06e208",
-            "md5": "e2cb3a9f6608dc9bfb9a1ded5f74ec35",
-            "size": "214460600"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.2.0.103-archive.zip",
-            "sha256": "1913315cc0cf73dff68266cd130c67884615ac410d92fa97f1726f71ff7c5a29",
-            "md5": "cdc4d725b30e0cf9e600b0ad127f0ca4",
-            "size": "192264843"
-        }
-    },
-    "libnpp": {
-        "name": "CUDA NPP",
-        "license": "CUDA Toolkit",
-        "license_path": "libnpp/LICENSE.txt",
-        "version": "12.2.3.2",
-        "linux-x86_64": {
-            "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.2.3.2-archive.tar.xz",
-            "sha256": "280ec785dc356b8a61d895c3bc798338d62a3ca280429e48a32ed7d4386ddf5f",
-            "md5": "51104b94654927aeb9e3a353aacb2cff",
-            "size": "188167540"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-12.2.3.2-archive.tar.xz",
-            "sha256": "5107ffc94d1312075ce06698a7e50671190b6725266660b23bffec1ae7d6d0d1",
-            "md5": "11aafbf67e094504207916c4bf614589",
-            "size": "187563296"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.2.3.2-archive.tar.xz",
-            "sha256": "1763612518fa9ad2be622d571561142780d05877f780607e83d8bd6f42d5a52f",
-            "md5": "517636ea62f7b37b4d55b3ae1e2a8fd6",
-            "size": "187600180"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.2.3.2-archive.zip",
-            "sha256": "e2ab4695d9cc1ac77973e817711f6452e70af61aad0e5cb5108927681a0adbc0",
-            "md5": "9cc1f2e4270a8207a64044b27d7a4153",
-            "size": "159177860"
-        }
-    },
-    "libnvidia_nscq": {
-        "name": "NVIDIA NSCQ API",
-        "license": "NVIDIA Driver",
-        "license_path": "libnvidia_nscq/LICENSE.txt",
-        "version": "545.23.08",
-        "linux-x86_64": {
-            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-545.23.08-archive.tar.xz",
-            "sha256": "4fc2aaf5352fb3ecbabf6b5c4a09087b0c01bc74788af0a44962aad23a345890",
-            "md5": "344aebed1125fe43a01eed34b248984f",
-            "size": "352604"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-545.23.08-archive.tar.xz",
-            "sha256": "cef34e4f6ea0884c3f06c98b1721c96beba68cc13224ddbc589612022d27df3a",
-            "md5": "cd495095c1b1fd7eaf1449fd444a093e",
-            "size": "319228"
-        }
-    },
-    "libnvjitlink": {
-        "name": "NVIDIA compiler library for JIT LTO functionality",
-        "license": "CUDA Toolkit",
-        "license_path": "libnvjitlink/LICENSE.txt",
-        "version": "12.3.101",
-        "linux-x86_64": {
-            "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.3.101-archive.tar.xz",
-            "sha256": "c66ebf27cf9bcfc584918c98eb7683ea2f5ab68c9c95c361ccb9e27d0520df13",
-            "md5": "bbc8a16bde8cf7887ae0354966a064c8",
-            "size": "26484404"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnvjitlink/linux-ppc64le/libnvjitlink-linux-ppc64le-12.3.101-archive.tar.xz",
-            "sha256": "b37ab8489d53ad90ad23d73d5b67b41bedf1c2653c42c7adb2f5b8fda3a52344",
-            "md5": "6875800c5d9ee0108537cf11dce56508",
-            "size": "24033912"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.3.101-archive.tar.xz",
-            "sha256": "cae34a104a8b61f061ba5f133792c28e2f6f6c0b6a726ff15c225a58649816d2",
-            "md5": "5f51d2ac50e3d2b501592cd8311b2f63",
-            "size": "24067016"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "05de293d0f8bb2c23fc5953ae725d2281bca7ddc2971ada55de246265ecc5842",
-            "md5": "7c9d6acb21db85eaca42db5be2398832",
-            "size": "90896453"
-        }
-    },
-    "libnvjpeg": {
-        "name": "CUDA nvJPEG",
-        "license": "CUDA Toolkit",
-        "license_path": "libnvjpeg/LICENSE.txt",
-        "version": "12.3.0.81",
-        "linux-x86_64": {
-            "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.3.0.81-archive.tar.xz",
-            "sha256": "2ab40ef82d528b0ccdf5326754915f8d89991360d57ca56c58ff1c25c65c2236",
-            "md5": "3a6602b920bd9005e90896d67f44f896",
-            "size": "2584092"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-12.3.0.81-archive.tar.xz",
-            "sha256": "dd397f31c66b948d03971c9463487549bc401e7891eeea3c5558bf3d22302613",
-            "md5": "6e5518111ebfc41cdd8a9c525bcd621e",
-            "size": "2580252"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.3.0.81-archive.tar.xz",
-            "sha256": "dc25a4b967c6fa8ddcea1f90448af7d18eb24d332639488fc9ed0316eb60a919",
-            "md5": "6e50dfcd7a0c9a95184bd9ab00d51f23",
-            "size": "2411660"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.3.0.81-archive.zip",
-            "sha256": "6cd5fc8ae477ea67c6d11f6c9d04fcf382e43378ee774b8a52b94ac68ee68b8c",
-            "md5": "bd4d9808fdf5bc6eb6ba368bb224aaba",
-            "size": "2830315"
-        }
-    },
-    "nsight_compute": {
-        "name": "Nsight Compute",
-        "license": "NVIDIA SLA",
-        "license_path": "nsight_compute/LICENSE.txt",
-        "version": "2023.3.1.1",
-        "linux-x86_64": {
-            "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2023.3.1.1-archive.tar.xz",
-            "sha256": "78934c8cc402401814ad6f0046173fdb4f0d2875c7bc70b99d472856d0d525b8",
-            "md5": "623be3a561380437a2293f24a24cee96",
-            "size": "737391740"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2023.3.1.1-archive.tar.xz",
-            "sha256": "0e54bf8e887fd2c3bafe3576596b358404f5a81c358244143be6d155ae11982c",
-            "md5": "aa53c45e692d05cccf5580870d910a7a",
-            "size": "141240260"
-        },
-        "linux-sbsa": {
-            "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2023.3.1.1-archive.tar.xz",
-            "sha256": "20023f701cc9a79fbe3c42f7b2fb3d3e30a562fae9ced2c5c4a2e707caecf4ab",
-            "md5": "0f6ac65ad7f21b58d2b8682de119f3d9",
-            "size": "360258864"
-        },
-        "windows-x86_64": {
-            "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2023.3.1.1-archive.zip",
-            "sha256": "5b090609aacd8cb41ad56a848a0b637a568f62869af701a77f3f61ce46e7ce48",
-            "md5": "47adc1bff6b0181472dd93dec7a40729",
-            "size": "675520339"
-        }
-    },
-    "nsight_systems": {
-        "name": "Nsight Systems",
-        "license": "NVIDIA SLA",
-        "license_path": "nsight_systems/LICENSE.txt",
-        "version": "2023.3.3.42",
-        "linux-x86_64": {
-            "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2023.3.3.42-archive.tar.xz",
-            "sha256": "dafded1be045abea2804697646178a66bec4a5eebb1b28b2637a37c2f22c7b93",
-            "md5": "34208b6d0c71444babf10a9bfeac86b0",
-            "size": "227696524"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2023.3.3.42-archive.tar.xz",
-            "sha256": "5095fc2a432267c002fa84d14f8c09985c7ba17becb6095699d7407fcbe3234d",
-            "md5": "8f873649a9686b23c71ab4f5c575bf74",
-            "size": "67233156"
-        },
-        "linux-sbsa": {
-            "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2023.3.3.42-archive.tar.xz",
-            "sha256": "93976454c75ca4dc6da28c7e8cc886cc21ec513d4e0f294f56b9afad245e4071",
-            "md5": "98e172f249dfa5da3eaa564a86179601",
-            "size": "198960916"
-        },
-        "windows-x86_64": {
-            "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2023.3.3.42-archive.zip",
-            "sha256": "9049d2bd0f17d967f7c84f33eee04b83c6b65349e3b12f97a3a9211d411e0009",
-            "md5": "54e49f657acf7b5e337c77f94b9d0943",
-            "size": "348461444"
-        }
-    },
-    "nsight_vse": {
-        "name": "Nsight Visual Studio Edition (VSE)",
-        "license": "NVIDIA SLA",
-        "license_path": "nsight_vse/LICENSE.txt",
-        "version": "2023.3.1.23311",
-        "windows-x86_64": {
-            "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2023.3.1.23311-archive.zip",
-            "sha256": "b5525a09194a7523fe7195f3e75a5060bff3603825f0c360b858052702b45c27",
-            "md5": "15cc72b370af5298daf8fcd6d06b798a",
-            "size": "527222171"
-        }
-    },
-    "nvidia_driver": {
-        "name": "NVIDIA Linux Driver",
-        "license": "NVIDIA Driver",
-        "license_path": "nvidia_driver/LICENSE.txt",
-        "version": "545.23.08",
-        "linux-x86_64": {
-            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-545.23.08-archive.tar.xz",
-            "sha256": "cccca4ef72d9e2ac5e61f8c3338b6fc1570bfc9592f99a5f35cfbeffa7a6d893",
-            "md5": "127fdc550adfbdaee21875e73dd19dbd",
-            "size": "372041236"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-545.23.08-archive.tar.xz",
-            "sha256": "645795a18372096ce669fc23cbecd6ae2600d83f327ab02c5bed7dee67ca0125",
-            "md5": "d1c60c8d36c2746f1196ca8d7fa71611",
-            "size": "100070028"
-        },
-        "linux-sbsa": {
-            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-545.23.08-archive.tar.xz",
-            "sha256": "2a7afa5648131b4ad04c566a6177aa93cd506849d89474f1627bf9fa9d245399",
-            "md5": "caa756359c00f9f8ddf7731587531aa2",
-            "size": "288674496"
-        }
-    },
-    "nvidia_fs": {
-        "name": "NVIDIA filesystem",
-        "license": "CUDA Toolkit",
-        "license_path": "nvidia_fs/LICENSE.txt",
-        "version": "2.18.3",
-        "linux-x86_64": {
-            "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.18.3-archive.tar.xz",
-            "sha256": "4b2b045c932c1449f28be246b3b28658981e81507825d73a35e11e9450774ac4",
-            "md5": "74135e8f97454338505b58bbcc5483a5",
-            "size": "58448"
-        },
-        "linux-sbsa": {
-            "relative_path": "nvidia_fs/linux-sbsa/nvidia_fs-linux-sbsa-2.18.3-archive.tar.xz",
-            "sha256": "80bae8ef6f977e2aeecb392c00e056e579657632abb02eb75e86bbf306db6f50",
-            "md5": "f88dd5297012268400192de8877f4606",
-            "size": "58460"
-        }
-    },
-    "visual_studio_integration": {
-        "name": "CUDA Visual Studio Integration",
-        "license": "CUDA Toolkit",
-        "license_path": "visual_studio_integration/LICENSE.txt",
-        "version": "12.3.101",
-        "windows-x86_64": {
-            "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.3.101-archive.zip",
-            "sha256": "207d1feca96de6cce11a38293ccaa39ea548527912395fcd225a0a61ea870a58",
-            "md5": "ed679d6582e39344cb7d961ad9b7e647",
-            "size": "518226"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.4.1.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.4.1.json
deleted file mode 100644
index 991da2d99e39..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.4.1.json
+++ /dev/null
@@ -1,1205 +0,0 @@
-{
-    "release_date": "2024-04-03",
-    "release_label": "12.4.1",
-    "release_product": "cuda",
-    "cuda_cccl": {
-        "name": "CXX Core Compute Libraries",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cccl/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "e1636f27a142d24e73dfd831c54bbf5575b498fd5900648d7372fae46f824fdf",
-            "md5": "70fcec0e14bd2e47d0758425695bf55c",
-            "size": "1157180"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "3304e563ed089be1129f79d8e45c9badc8eeba155c8b672f9659f223494edcd9",
-            "md5": "c70add0951817bb00664fbf7c0c7f897",
-            "size": "1157244"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "171073fd6557360b9db7f8559e17b1bb55679aadd5158681318ed9be67e54667",
-            "md5": "305d1dfe78ba55728ca1afe0759f2842",
-            "size": "1156520"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "908742d8f3c6fdd6d1d6316a7b919b5c506474f9551f491aa7335cb4f50bffbd",
-            "md5": "93501754092630bf266b2a26e80c5385",
-            "size": "3171223"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "23ddd81e43f1522247fcdc1948f3473d2f474a048527c1f20fb3bec345807e2c",
-            "md5": "ab7f4b2c99f5af27f006669706b16969",
-            "size": "1157400"
-        }
-    },
-    "cuda_compat": {
-        "name": "CUDA compat L4T",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_compat/LICENSE.txt",
-        "version": "12.4.35753180",
-        "linux-aarch64": {
-            "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-12.4.35753180-archive.tar.xz",
-            "sha256": "7b8a09396c61ccf94a55a418c6a16e371f4e8b9fc4bdae7e2c33cbabcb7a97f3",
-            "md5": "91bb5bc8c790d31cb43fa2cca1b690d6",
-            "size": "19191916"
-        }
-    },
-    "cuda_cudart": {
-        "name": "CUDA Runtime (cudart)",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cudart/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "0483bff9a36e7a44465db3cd42874f6f70f019297dcf803fbefcbf58d7448c8f",
-            "md5": "5c452d73cb03a42c1711f8655fa2fb8a",
-            "size": "1099680"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "f5e636944c7817b4f178070daa1259f25b3e84ebd092305d32aa189b21ae37e3",
-            "md5": "1400b00bf1ee2d51eff22ab82f516cd3",
-            "size": "1077184"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "fb96abcff3544384440b9259f9aeab9bf222a5775348546ef87c68ee02eee379",
-            "md5": "bb5fdb01994b0aaf329fb8c7cd825750",
-            "size": "1090256"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "6a1c32e68ee1a95ca17334691ff9ad1ffe7f352c24a083d55e4c96b8063b2bcb",
-            "md5": "9b8b0f24f6b0777ef3b0823f8a0ff2bb",
-            "size": "2474721"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "0fc5240b1c2a27169b3fefb1e7390cdb0177cb86469fd545f580cd4cc69c7fde",
-            "md5": "cf6075294bf72afdb93e45a75a5d0797",
-            "size": "1149332"
-        }
-    },
-    "cuda_cuobjdump": {
-        "name": "cuobjdump",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cuobjdump/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "ae4f9bcb5333b78a84a3babe23feeb8d48c00b6faa21b31477ce4c19f22f39a4",
-            "md5": "10c7a28d9de1ea74fca768694afebb81",
-            "size": "222176"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "f80c713d690d4f0eef21648d45e47b6de08212a5b3291747f35950564fb37196",
-            "md5": "45b83401550b4afead5609244c9c3e9f",
-            "size": "262464"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "d9076a8261d5c7bd49e7892c76760ddbff0bed9c84e20d86d472d3ac33535495",
-            "md5": "0d12b4a609ba4f980ed752d0c4d007c5",
-            "size": "213492"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "8a8eacddc1c0b9e6530a149e60d33219a18d5be586a5c9dab0996ed1214ab602",
-            "md5": "761a8e18757c4729f24a611131a79675",
-            "size": "4172726"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "a7724c73b8a072886aab25ec80a279fb500d9995a4c02f5e06e4ce2e03b116c4",
-            "md5": "df4feb7e5129cf6294403e77d3830188",
-            "size": "196000"
-        }
-    },
-    "cuda_cupti": {
-        "name": "CUPTI",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cupti/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "232f4677a30335f4bafcd4a42b61d4cb65060680067e0dce32966d663f4224ac",
-            "md5": "e423452138a44bd5ef21592c9aa740c8",
-            "size": "20753628"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "6e86197149b0c0bd131ad925c165251fff1c054ae477c10b5c45e052789e1a2d",
-            "md5": "84af4ecc8d12d8a62e597a061859a122",
-            "size": "12038720"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "62f3a245ade16dfb17c56eaaad4df5f339acaa34d2e05ddc15f49fc30e78663c",
-            "md5": "558b13e34d57f2e81d2ffd669553efd1",
-            "size": "11152548"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "6ad8df634d60e4bc96cf6914af71a5708f6460a25a39d0183780c6bdebfa60c7",
-            "md5": "6ea8d481af3a4cdceb7620ccfcfe1cbc",
-            "size": "14921079"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "93275f4069a05e2342f4648130e039de20900bc3e81d797a7239032ddec5556e",
-            "md5": "2feb723c8e3130da2ffa3df424fb67fc",
-            "size": "7871848"
-        }
-    },
-    "cuda_cuxxfilt": {
-        "name": "CUDA cuxxfilt (demangler)",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cuxxfilt/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "5c9a74786bc84dee6f2ea941f3933ce77bfa26a9135a8d38ee8c3a7183b9b200",
-            "md5": "02808e685235763526236ef1b1d935cf",
-            "size": "187628"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "3bbf33a7a4757c82900500940e8cfe8b1a42a4a7e48e9cd732c5fb94f3433704",
-            "md5": "e373f3e1c62adb1e1ee33803ee4ed0b0",
-            "size": "182780"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "e8bb04577e3271477b43c6948c5a39686c93d22f87ddeefd838682298ee399ef",
-            "md5": "0214bb4c524aa6ac3bf74575526a752d",
-            "size": "176408"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "646d523d25f8cfa0feb731b2220da15065ecc793b2a830a81bf537e16d273dd9",
-            "md5": "a62a20fc730cee85bc3ceba23b68768f",
-            "size": "170572"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "88683921e0c5624b7d416fe0f9b225ace448cf7dceb450afbcd25a3b3d8e3421",
-            "md5": "60aa1555031d20bc243d57c674e2d011",
-            "size": "170320"
-        }
-    },
-    "cuda_demo_suite": {
-        "name": "CUDA Demo Suite",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_demo_suite/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "288bb5fe5e5e531de4b6e6724f1044da1390ddce65dcc8ebe70e6bca45ce1370",
-            "md5": "a41d1d89724a4078bc9e17c60e3de387",
-            "size": "4003068"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "374cb13ff18f8fb8c84a44c8b5e3ec0e28f63df434105d475defb536af38b491",
-            "md5": "7a56556c59cce5d39c780398c1253444",
-            "size": "5063926"
-        }
-    },
-    "cuda_documentation": {
-        "name": "CUDA Documentation",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_documentation/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "fe2f8351cab18853abf3d2d2ed4d5ce7419de6731676b88a2dafa07060cc2257",
-            "md5": "c4db0370537a4d5fb55dd1bd54df13eb",
-            "size": "67172"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "cf2262b7c928fd5e32305e4ca9d2d789915c95e3be0f2b497a1b8ec459415ac8",
-            "md5": "75c6b4510dcaa980e15be334aa86df91",
-            "size": "67128"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "af65e904d6ebce8bfde257ecfd8f7d4e052cea60c9e99e98eec726a41227d99c",
-            "md5": "fcb181b3b6966497bca279ab4c59f6ca",
-            "size": "67120"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "2215bee2262cf71e40f63ad28bf12a3a53f8f456789dda5bc5ff5131e7901793",
-            "md5": "5dc869c80f00efcfc807d5d596d4e22b",
-            "size": "105674"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "c18c0f6db3b26c90820597fd105dd6a38e785213a0d32a36480ddaf96dc94b51",
-            "md5": "8d65c666a26394a6d70b000dc589d8f0",
-            "size": "67184"
-        }
-    },
-    "cuda_gdb": {
-        "name": "CUDA GDB",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_gdb/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "b882e12dd05dd40e4e742c4f77dfbbb493efab87949548896c84ced4ad90ee08",
-            "md5": "d91efd01374adc4d997b494775079414",
-            "size": "44100580"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "0194505308ef1db8d6699ae8a9bb90928f72ecc0f58a4b3fa9daed162ac0c551",
-            "md5": "6a1c1b37cdfa436bc7456fb360a038ec",
-            "size": "43767748"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "99fb61a444bc05709bab18288661cd87104c08671e66b61cb7abe096cd008c64",
-            "md5": "da367eb0bc8b162c913ad913620303fe",
-            "size": "43751576"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "5a0ef8bb17b30b9be7ff36f5dd78108c943d555f57c81af94a5a6032e97e9b61",
-            "md5": "af4e139a8c31a5e61896e19f11f6fc24",
-            "size": "43698380"
-        }
-    },
-    "cuda_nsight": {
-        "name": "Nsight Eclipse Edition Plugin",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nsight/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "f1ee8c2c7990225b992e82d4df7334cf112450f273e8ef641b7edf6d66932936",
-            "md5": "2cbd09ed5c9a799a0ee8564a9d5f60eb",
-            "size": "118684472"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "2e402c471dedcc41bb0be2517a836bdadcc539ce799fb7599304c5ffdc7dc566",
-            "md5": "865b786b8f63efa218b98f2ecf73bf21",
-            "size": "118684500"
-        }
-    },
-    "cuda_nvcc": {
-        "name": "CUDA NVCC",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvcc/LICENSE.txt",
-        "version": "12.4.131",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.4.131-archive.tar.xz",
-            "sha256": "7ffba1ada0e4b8c17e451ac7a60d386aa2642ecd08d71202a0b100c98bd74681",
-            "md5": "66486841dab183168d79684c74df1928",
-            "size": "51184484"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-12.4.131-archive.tar.xz",
-            "sha256": "2934e83a4df2e0f4182e148753cfd1f29af226a280ea459008819531e9edb5b9",
-            "md5": "087420e4fc0c753c524d4d6c1a4b1475",
-            "size": "45950148"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.4.131-archive.tar.xz",
-            "sha256": "83f130dab0325e12b90fdf1279c0cbbd88acf638ef0a7e0cad72d50855a4f44a",
-            "md5": "bf47b6c3a39a6dce68cacf98cc381fa5",
-            "size": "44923460"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.4.131-archive.zip",
-            "sha256": "3b14cf8dd9dda4a3b1a9682270d46eef775f018e17650187a8a448a06111f2b8",
-            "md5": "8656529f78c412e33aab0612c140fd3f",
-            "size": "63662970"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-12.4.131-archive.tar.xz",
-            "sha256": "9e7a26fb7acd86ec8d4b67799a329d9bc6bd48bbf27a89f87df4385eb7fe5758",
-            "md5": "688da9b43e479fefc91e353a967f8836",
-            "size": "46315392"
-        }
-    },
-    "cuda_nvdisasm": {
-        "name": "CUDA nvdisasm",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvdisasm/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "44018a76ee5977b603b0a1f3176a8398eaa893008dadf23e82d01733c20b5542",
-            "md5": "a147cccaf45fe9c28b27985163df3e2a",
-            "size": "49880772"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "8407848aea496afd7708c9ed61c6a1d19c56362798341e1adcfeb77d34a5fea7",
-            "md5": "c2d1c6a5c88a53baddfdc16a4069f802",
-            "size": "49881368"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "ec0480837e789f14803ae148f5ada2cfbd02216afc832c23d6a38037b88be381",
-            "md5": "a54c74a03e1e836365cc3004ac427996",
-            "size": "49808680"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "62a15a4ef3c0641352d7e5c184243d20f9e4992f040538c0f14cd40ec7e5ef7b",
-            "md5": "2abd28024cf6d9e407eceac3c716e4ed",
-            "size": "50146842"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "db97528d051cc8ee4a00e33a5dc8ca098196295862d3dcd264d61ac5ed1ebd2d",
-            "md5": "917fe51b82ccd7fa801cde9380b437dd",
-            "size": "49831444"
-        }
-    },
-    "cuda_nvml_dev": {
-        "name": "CUDA NVML Headers",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvml_dev/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "15af54c7d909f6e24db8b557e34276d70778fcb26f1969b7a9fe42abaa919265",
-            "md5": "9fad58bd78317fdee3e565253c8717c9",
-            "size": "142744"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "e3e2c040a2edc8238bc72c0b600d1b7639b240223d5f3f1fb419162a4c1afb14",
-            "md5": "e116f3e0eaafad6001f3a5961205f667",
-            "size": "139468"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "81820623c4ad794efbd00a38649af7847b951cd5fce2659d001a525e6f6bb72d",
-            "md5": "d70cd674f5744b6c46f023421acdbe1f",
-            "size": "143480"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "8240b666b0da2aebc58c861410c70f4d5ffe157e7071586314ba0d79200f7519",
-            "md5": "8eb77d343eb128112809134777d57183",
-            "size": "127269"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "1ccaf8990080ac498f39799f081af770b476983bc0a24f40f168985379029519",
-            "md5": "ce2dd6abf5a8d94cfc3f4d70b2346610",
-            "size": "144148"
-        }
-    },
-    "cuda_nvprof": {
-        "name": "CUDA nvprof",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvprof/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "5ac35eb3edf867ba757c3c04a6fd4b79cae38de47bd3f384af9ab5615b1d0083",
-            "md5": "a47051ced76211bdfb10f7b72d40199d",
-            "size": "2433916"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "6bfc9e12fb06176c093659cc108fd9397e4b5168697609660b309f42811ff806",
-            "md5": "112aa9c78185c05ab2ed0cb2342abf52",
-            "size": "2116424"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "bd434d759948b4ef9d9e663b89f5019ea104afec6bf7a17267c624b0bfbc1a03",
-            "md5": "f43bdf3d1a27cc2568e24b5e0de8686d",
-            "size": "1701799"
-        }
-    },
-    "cuda_nvprune": {
-        "name": "CUDA nvprune",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvprune/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "85d348b08d1e652ac2fd6377d1f837aa1aeaf7f784aa451175fd5ea58fd3b28b",
-            "md5": "aa09d8f50c302bfc907836cd8fa9b697",
-            "size": "56380"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "28b297f44bf568b7e477ede212457216c215ffceb53e0610d942e573b95fec05",
-            "md5": "52ad7660a488716512321ab8914da89c",
-            "size": "57020"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "ec6b7ed538496507b99274b5361f36cf84ad18048892e0c6ebf74336c0181b15",
-            "md5": "bc81cb6ff80f92b19e0da829bb3771ca",
-            "size": "48352"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "a322bb849e8974e759d1287977dd237d4ca240159e70fe3e131df600a7cf4d32",
-            "md5": "705bccfbebf390d5163a21be69ffface",
-            "size": "146240"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "ffd1d4c587056be277885b696077fd744890a6875d0c27577aed33bd75f43b03",
-            "md5": "801667ee9291f7b8e9c8fe9be27b76ec",
-            "size": "50164"
-        }
-    },
-    "cuda_nvrtc": {
-        "name": "CUDA NVRTC",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvrtc/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "b5e7a984fcf05d3123684d7926e595306d31fbf99f9b19e9a0d268a02fc75827",
-            "md5": "3e5625687340658034d0fb41e1e29e44",
-            "size": "34123316"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "cae11cf45b9443643e82bdaecd51aec9f827db7cdab9498df388471532255480",
-            "md5": "a5f5e3280ebd65ad906c579833eab982",
-            "size": "31421316"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "f9e4bd972ffee5951577b45524b656eda681407a3c761c57978acec26a3acc25",
-            "md5": "c0f103fe3cc1f589d7769afd45efd099",
-            "size": "31422784"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "f140545e06d0d10780c1382a577db2e2c242db7a2d94970f0e6026b2d01aeb1b",
-            "md5": "2804f543c452c09ada1cb5705a1cc932",
-            "size": "101865624"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "9fb6f14168c3194225f29f85467d95150ea65ea676f86303c5ea47ef42ff302f",
-            "md5": "a97fd2007d18388be8d1415d6c1bcca8",
-            "size": "32669152"
-        }
-    },
-    "cuda_nvtx": {
-        "name": "CUDA NVTX",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvtx/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "f3afccda5ff1e7521cca74153e92708349148294bc75559afe64d57c43763454",
-            "md5": "df06d96b86197ba1a3163303445fef40",
-            "size": "48560"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "772b01a6bfe9d0191f8fdd7f75462563af1926afa2637dd816cc2e9747181536",
-            "md5": "2c738d4a6deeb34dceae9719a8a8cd38",
-            "size": "48616"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "c1d60013e97108fd69caf29e5e7d9b0a1562508517fc1a2bab65c294990bd7e3",
-            "md5": "78a1206060af66b3b1bd88a8d82487ad",
-            "size": "49148"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "95b7f96bdb2701d764d969cdadfbc439b4ab995d0a3695682da5284e14f66d21",
-            "md5": "bc7c949a95ac8d1ab24926c9dad82a6f",
-            "size": "65879"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "d7fbb08e056f11bacae8d4165d5bd4ec4cc601ab326dc36e76678eec6971f612",
-            "md5": "eb65bc05a8f93ffced733221ef9010e2",
-            "size": "51792"
-        }
-    },
-    "cuda_nvvp": {
-        "name": "CUDA NVVP",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvvp/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "94c8b79180f382edaf13d93c3a4dadff43833d0dd624448968eec4f3685c2982",
-            "md5": "e4da126db63c381319e1f0a7d5d9affa",
-            "size": "114592132"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "83ea88a78128acbf1d488f43c6207c1babbef5a5ef06f7604fbefbec0ac01f87",
-            "md5": "828fc847d197c0c16408e5986fa2bacb",
-            "size": "117200208"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "80593019abbd1aec121d2048ec9e6ffa0adc3a7eeb5f6451ceb593af54ac2c03",
-            "md5": "360fb70106eb44e81723eea128e7118b",
-            "size": "120343803"
-        }
-    },
-    "cuda_opencl": {
-        "name": "CUDA OpenCL",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_opencl/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "34648ff01acb49ec0247e4cb240470b93e9d0c9ee0641091a7bfee0698f09ed9",
-            "md5": "d26623cc9aac8d85af54ba7216d8fc5f",
-            "size": "91476"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "4b5be4ad11ded8c33e83f757435a6c3fa5ff309339b13e18da9f520fb349bf3b",
-            "md5": "fc73bc5396fcca98afe7c5bc8b03a2c6",
-            "size": "137051"
-        }
-    },
-    "cuda_profiler_api": {
-        "name": "CUDA Profiler API",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_profiler_api/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "fa11c08e39ab35453e07dd5012adc0767408955431fc4acdf64ca4cdd7692646",
-            "md5": "0d594036001b8fae7a1bd2b8b2353caf",
-            "size": "16176"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_profiler_api/linux-ppc64le/cuda_profiler_api-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "71b6102a07676635ec9fd0a34250bbe1c646e5e72d79e57e9072fef411f0d52f",
-            "md5": "76348fc9fab4a1507504c309d6da555c",
-            "size": "16180"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "aaab63b12aba7278c4d72072dc71bbdb7773137af5428c7bb0414496ae78632a",
-            "md5": "94c5f7c70b274ff6c0e66854eb1d4907",
-            "size": "16168"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "8c0c81125d2f0ef6f42bc46723f2c5565863731cf3a3de3ea3e738ea2d7a938f",
-            "md5": "2dec7aeff036c224f4299c82dda201bb",
-            "size": "20232"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "9ec80b22522f8491425f4194f86ac4f74a990207bd1fa85169829be5dd450076",
-            "md5": "f58a3f980d3d5c5495e7b57997e5c04a",
-            "size": "16180"
-        }
-    },
-    "cuda_sanitizer_api": {
-        "name": "CUDA Compute Sanitizer API",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_sanitizer_api/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "b719c6b2a8cd330ab0e4361e41dda5493946fb7fa0c4b04c8dbd776fadc3b11b",
-            "md5": "1558561259291e2013f810a72727e377",
-            "size": "8236716"
-        },
-        "linux-ppc64le": {
-            "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "5ceae6170471d7a9e4540796760642747d10d7d4f609dacede90f84927e59618",
-            "md5": "c92e3dfd851d20cca60974bfa7be4718",
-            "size": "7741432"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "0e5ff35535ecb1ed0b482a2ac5e3a20e94722736f023fc802cbfd4900e590746",
-            "md5": "3a3966496aab1485f4833dd161e1ec93",
-            "size": "6367224"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "f15613b7c3088299659356456abfe2c3a98eed7eea9d8292fe0ec46726f5ec73",
-            "md5": "d67f646c3661714b53bc6b67ea468ef8",
-            "size": "14136485"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "d93b5d59c0a18753678fbcce9fa0d83c6b2ff008cebbcb226a2e138b26305aa9",
-            "md5": "b7adbb31f0e824b1a74123fe525e7d30",
-            "size": "3728732"
-        }
-    },
-    "fabricmanager": {
-        "name": "NVIDIA Fabric Manager",
-        "license": "NVIDIA Driver",
-        "license_path": "fabricmanager/LICENSE.txt",
-        "version": "550.54.15",
-        "linux-x86_64": {
-            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-550.54.15-archive.tar.xz",
-            "sha256": "73396a744821f280168090175f06efc26b86ce3a4ac3c88b3bf39dd8d9e4c978",
-            "md5": "293115e77e87c5f73141487194f1194b",
-            "size": "5785060"
-        },
-        "linux-sbsa": {
-            "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-550.54.15-archive.tar.xz",
-            "sha256": "c8a8534875816cb9bfe30f151bf86e8a22fffe017c1715b91698f098950f9547",
-            "md5": "7e3ff10fc4a71e0731fd65babf435fa1",
-            "size": "5218672"
-        }
-    },
-    "imex": {
-        "name": "Imex",
-        "license": "NVIDIA Proprietary",
-        "license_path": "imex/LICENSE.txt",
-        "version": "550.54.15",
-        "linux-x86_64": {
-            "relative_path": "imex/linux-x86_64/imex-linux-x86_64-550.54.15-archive.tar.xz",
-            "sha256": "0212d562b487ed599d1b4a20d1d4ff0a7d4ded6e2e593e8d464f199b7e93e9bc",
-            "md5": "c2ef7e81023ce30d52f0cced72f92bd5",
-            "size": "7300824"
-        },
-        "linux-sbsa": {
-            "relative_path": "imex/linux-sbsa/imex-linux-sbsa-550.54.15-archive.tar.xz",
-            "sha256": "5b2782a58b267cb83bc3efcd62c3d5546044caee06f56afa8cad496123a312c9",
-            "md5": "bdb8e5328489449fb09f710f6696ce56",
-            "size": "6498388"
-        }
-    },
-    "libcublas": {
-        "name": "CUDA cuBLAS",
-        "license": "CUDA Toolkit",
-        "license_path": "libcublas/LICENSE.txt",
-        "version": "12.4.5.8",
-        "linux-x86_64": {
-            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.4.5.8-archive.tar.xz",
-            "sha256": "c267c4d2cd42065ae2c30ca41a43ddce4e0ecc5484de23f299e3c397b5506eda",
-            "md5": "3c0fe94786ee5288bf6a117cfcc6c9fe",
-            "size": "468331916"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-12.4.5.8-archive.tar.xz",
-            "sha256": "40726bd8bb106dacf5c1aef8815f3561078b13433671fed40dff431d13a34ff1",
-            "md5": "83cd04d43526fb78beccfd0c82318e80",
-            "size": "360246616"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.4.5.8-archive.tar.xz",
-            "sha256": "e946460149f1970e8c07472bab447f30054dfcc809eb2809bcd9b0090b0b876f",
-            "md5": "323b840b5f3e281a90acd29bd128a2ab",
-            "size": "466990080"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.4.5.8-archive.zip",
-            "sha256": "698140f12da055a3709eee2e022fcfe7bc8edf31f30115e3f7a5c877a9491de5",
-            "md5": "6edf7e3134dccd20636c70cae849800d",
-            "size": "391538487"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-12.4.5.8-archive.tar.xz",
-            "sha256": "1d3886c1da442325d21424f5c021957bdb0c9c8b0b8aef7bf5ca5a449f60490b",
-            "md5": "b9461271cad612b581771495ce96d9fa",
-            "size": "432576828"
-        }
-    },
-    "libcudla": {
-        "name": "cuDLA",
-        "license": "CUDA Toolkit",
-        "license_path": "libcudla/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-aarch64": {
-            "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "ed418c2104eeb8edd640c8e7694c548e57f42e3f92b53486b16c61db1613232a",
-            "md5": "ea7dd261fd92379f057fc82035c0f7fc",
-            "size": "38692"
-        }
-    },
-    "libcufft": {
-        "name": "CUDA cuFFT",
-        "license": "CUDA Toolkit",
-        "license_path": "libcufft/LICENSE.txt",
-        "version": "11.2.1.3",
-        "linux-x86_64": {
-            "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.2.1.3-archive.tar.xz",
-            "sha256": "0963b4b57fb7fe9217e97b494159ff4719f1abdc407b2dc215d71bae0576bb02",
-            "md5": "3269400f8ccdffc37e84541ee7d13d97",
-            "size": "509571792"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-11.2.1.3-archive.tar.xz",
-            "sha256": "5d020dc916a7c5f901802d21ca10ad4d40eaa21c4a1d487ad13a40cab60b4467",
-            "md5": "dce4e38e22bebf2f77a2c4f801b2489a",
-            "size": "511052864"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.2.1.3-archive.tar.xz",
-            "sha256": "4087e27f2429d5f1f820ec49ac400391cbfe84c4abfadb95aaf90705ae84e725",
-            "md5": "7e93f2d42f1735d3f77a2fe9e95f169c",
-            "size": "509862516"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.2.1.3-archive.zip",
-            "sha256": "df1594afd3de4e23779511eb8eccc1f77faacd9fa64e6154828b9bdd68d9a785",
-            "md5": "be165c0565ed09389d687683c30ac98e",
-            "size": "209047054"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-11.2.1.3-archive.tar.xz",
-            "sha256": "538735221a110b052d21ebfe57f710572814b4d8a820c125ce63db621f6b973b",
-            "md5": "c2a65ffbb2dea600778c79aaae31ee6d",
-            "size": "509581888"
-        }
-    },
-    "libcufile": {
-        "name": "CUDA cuFile",
-        "license": "CUDA Toolkit",
-        "license_path": "libcufile/LICENSE.txt",
-        "version": "1.9.1.3",
-        "linux-x86_64": {
-            "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.9.1.3-archive.tar.xz",
-            "sha256": "5bf067c142e0e78d6b5eb9904f0703a1f5f814a27c44cff596f54630582bb2a9",
-            "md5": "01288701dc7a350e9a3a9e24e3377b4a",
-            "size": "41837868"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcufile/linux-sbsa/libcufile-linux-sbsa-1.9.1.3-archive.tar.xz",
-            "sha256": "5db80b1905b3fe25a07f29462c8694af1375834c1d8e7b6bf4cf4ffbb8c0b934",
-            "md5": "3e5fa16a3d5e0c0a697a8ec9fc06fed0",
-            "size": "41281928"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.9.1.3-archive.tar.xz",
-            "sha256": "90e691a5eec221701231401aa645b95c25c7ec9c509f00717bfdea6399d8c678",
-            "md5": "c4de445d63a79b1d30adca9ccfb3a58a",
-            "size": "41264512"
-        }
-    },
-    "libcurand": {
-        "name": "CUDA cuRAND",
-        "license": "CUDA Toolkit",
-        "license_path": "libcurand/LICENSE.txt",
-        "version": "10.3.5.147",
-        "linux-x86_64": {
-            "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.5.147-archive.tar.xz",
-            "sha256": "f3752abef1ffae7bc9180bd9885905e971cc9c28d7f4d5860731a012e07638a3",
-            "md5": "d89df6d57ccac1caf85775a12de1d809",
-            "size": "81720172"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.3.5.147-archive.tar.xz",
-            "sha256": "42ed22ceebcb1840b391cb4369a41e6ed1ae31c5aae0b66fe15ba242db06c4d9",
-            "md5": "c31a0ecf60e6ca0eb75f0bfb1921da14",
-            "size": "81770160"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.5.147-archive.tar.xz",
-            "sha256": "ee337fa4c53136e336f974ba5d1a9be2a1ec5da674be3bb972a8d645051bbfae",
-            "md5": "72683f5c992721a868973018bbfcd01d",
-            "size": "81710072"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.5.147-archive.zip",
-            "sha256": "24c3b0fb7063e49ccc0ac1bff387c5f4fd9617b72aab3fa3b642f08607770ad3",
-            "md5": "b6950f92d0607f4f223eda34cd93741e",
-            "size": "55087990"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.5.147-archive.tar.xz",
-            "sha256": "3be3a69ab2b242cfc78ef2f85a14c3d02b04d4e64a4345c75f565d981ae99415",
-            "md5": "e6cfa09022835d1bf619112c5665a64b",
-            "size": "83938360"
-        }
-    },
-    "libcusolver": {
-        "name": "CUDA cuSOLVER",
-        "license": "CUDA Toolkit",
-        "license_path": "libcusolver/LICENSE.txt",
-        "version": "11.6.1.9",
-        "linux-x86_64": {
-            "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.6.1.9-archive.tar.xz",
-            "sha256": "0a35a16e3bc02ba6fe0393e916da087bac079eb998a01666c79533db4f0d37f6",
-            "md5": "4413cd12f780d1f12955f8d0a3e0119c",
-            "size": "126742916"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.6.1.9-archive.tar.xz",
-            "sha256": "55c3e49dce2cdfadaec23aeb408383d713bc0838e882f22b41931599525af795",
-            "md5": "e7f8fb988c3966a28f8239d876618dd5",
-            "size": "127205496"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.6.1.9-archive.tar.xz",
-            "sha256": "3344980ec35d4d850cf10909a2b0f5c1fdea7f2c1af0c6ad9b72dbd188391c3c",
-            "md5": "51bc8fa6c57206fa1e055363e96de0bc",
-            "size": "126349932"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.6.1.9-archive.zip",
-            "sha256": "e1f98fab494b099beaf39b533a725c241afad5b885a88a01e21c5e0aa8bbf978",
-            "md5": "b9dcf7794aa18130fda2a4e3bdc728cf",
-            "size": "123611055"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.6.1.9-archive.tar.xz",
-            "sha256": "82050419231f3ab6252cf4edb6673504adcdd712cb34ab519f7913beadb8526e",
-            "md5": "c4677035f9b09f9bc1dd9fe22cd72fe4",
-            "size": "138196596"
-        }
-    },
-    "libcusparse": {
-        "name": "CUDA cuSPARSE",
-        "license": "CUDA Toolkit",
-        "license_path": "libcusparse/LICENSE.txt",
-        "version": "12.3.1.170",
-        "linux-x86_64": {
-            "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.3.1.170-archive.tar.xz",
-            "sha256": "21b7e5c3afd8c3e761471c644b8bbf36cd528dd0f9d274becbeb09b79dd9bec5",
-            "md5": "7f9fc64c7cb961fcd8dac565bc51a8fc",
-            "size": "223377616"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-12.3.1.170-archive.tar.xz",
-            "sha256": "8f52b2849dcc9a95fb7b2e2eea46afe5c1b459d372f3ce9eff1769845f33e0a5",
-            "md5": "955338a7dff201e885713b8f79ada264",
-            "size": "223489508"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.3.1.170-archive.tar.xz",
-            "sha256": "098169df5ee6ad441ca22ca7d1168c4adedada57e32238b68db42a9934347534",
-            "md5": "d59f4d0e3e00af8d6f4a1bd59baa685d",
-            "size": "222984764"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.3.1.170-archive.zip",
-            "sha256": "d1cef671112537a290ef9282f5258b86bc1ae55e76b1995e330d356b6a140d4e",
-            "md5": "332d7ff19a0f4e03ec029edb11431669",
-            "size": "202432148"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-12.3.1.170-archive.tar.xz",
-            "sha256": "0ae1b89c7c26aa1fc1c59e4b5fd65b37bbefe0914cae3b36e057e8a66bd3c349",
-            "md5": "b295b235acb09fc7914cc2b1e358ee87",
-            "size": "238279416"
-        }
-    },
-    "libnpp": {
-        "name": "CUDA NPP",
-        "license": "CUDA Toolkit",
-        "license_path": "libnpp/LICENSE.txt",
-        "version": "12.2.5.30",
-        "linux-x86_64": {
-            "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.2.5.30-archive.tar.xz",
-            "sha256": "9062bec77b9844663692459255f35fe70cf826bce2fc8065278410fc5f27023f",
-            "md5": "5d36e45d04e314b5ab9a28e2d905a5d4",
-            "size": "184801936"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-12.2.5.30-archive.tar.xz",
-            "sha256": "2ada6d5ec9f0a963de3bf2eb1a5e8d431a40fc4c616e1e51e04d96bbbc2604f8",
-            "md5": "57bb46f42d1633c3e5f9fe5f04a96ea7",
-            "size": "185183912"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.2.5.30-archive.tar.xz",
-            "sha256": "e91905f9a23d749fb8389f8671df67f71f49401d19f955d5029c7ebc3d839f73",
-            "md5": "571fd9cdeb13651df5f06a1930c12b91",
-            "size": "184329432"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.2.5.30-archive.zip",
-            "sha256": "56d1a741a3c4f5c4b2fe73dd4eb104ab1defaea3382ed5a65e4b5fe202e9c5b1",
-            "md5": "5e0986267a14179faedb717489719bf7",
-            "size": "156823745"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-12.2.5.30-archive.tar.xz",
-            "sha256": "c3eaaa8ac7e566d0a0452b1451c52d453f4509a236164b2b231cd194dcd2d7a6",
-            "md5": "769e4226352ea9edb78626228685d49e",
-            "size": "202127304"
-        }
-    },
-    "libnvfatbin": {
-        "name": "NVIDIA compiler library for fatbin interaction",
-        "license": "CUDA Toolkit",
-        "license_path": "libnvfatbin/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "libnvfatbin/linux-x86_64/libnvfatbin-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "1278f5f6562ed1ae78c3c0bfa665033c986472858bf38ab31e7a1e3091efae0e",
-            "md5": "7fbf212c3ab289387856b5cab4b04d72",
-            "size": "888520"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnvfatbin/linux-ppc64le/libnvfatbin-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "071ecdda624aa570fbc45220253b149070a993e1797dc7c2ea8d662e20fae4c9",
-            "md5": "b1153dab90745f19d6a144aa70873aa5",
-            "size": "856144"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvfatbin/linux-sbsa/libnvfatbin-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "585d89846cf12cd6862e27e53d98aa54d357ea3d153c219a3efb1e1ecc918ffd",
-            "md5": "9ca67e355b7699e475256ea1bf6056e9",
-            "size": "788256"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvfatbin/windows-x86_64/libnvfatbin-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "9a8f4d18626733b221bdbdc823a75a0c86f8555ab1f5201b44faf70fb47580e1",
-            "md5": "6173341f2290fa30426502f4e167cf0e",
-            "size": "1501167"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnvfatbin/linux-aarch64/libnvfatbin-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "271247df10e84047646e67b4ae2ded4f9e562bbec085c556f44490f77855d32c",
-            "md5": "26001074c8f1cfa562f477ee8822f5ab",
-            "size": "762748"
-        }
-    },
-    "libnvidia_nscq": {
-        "name": "NVIDIA NSCQ API",
-        "license": "NVIDIA Driver",
-        "license_path": "libnvidia_nscq/LICENSE.txt",
-        "version": "550.54.15",
-        "linux-x86_64": {
-            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-550.54.15-archive.tar.xz",
-            "sha256": "170788919ae9ef6a026a5a784df47e23bb25dcae3b22b1a68dfe91c41f8fe165",
-            "md5": "c11e142a82675466a340d496a06e57f6",
-            "size": "352864"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-550.54.15-archive.tar.xz",
-            "sha256": "bd31f2ca27a24538805ae2476ccd20edde0a1e03cb050b650f563a65859ce64d",
-            "md5": "6386fbbabd76d64ebd25bf5d3f643963",
-            "size": "319136"
-        }
-    },
-    "libnvjitlink": {
-        "name": "NVIDIA compiler library for JIT LTO functionality",
-        "license": "CUDA Toolkit",
-        "license_path": "libnvjitlink/LICENSE.txt",
-        "version": "12.4.127",
-        "linux-x86_64": {
-            "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.4.127-archive.tar.xz",
-            "sha256": "0e0ec59ee56d3dfa29c66bd4e225b1a6330d42b36545ab4377880009d42b675c",
-            "md5": "40957c683f43bd4110094bb2ec248088",
-            "size": "29161664"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnvjitlink/linux-ppc64le/libnvjitlink-linux-ppc64le-12.4.127-archive.tar.xz",
-            "sha256": "a08da1a0b990ef7eb845655eb51ddc9fc920921da14ee2b32ad8daaebeb1c68b",
-            "md5": "6cf7c3bcd4a9344933e878a6fd86fb8a",
-            "size": "26724712"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.4.127-archive.tar.xz",
-            "sha256": "c85f5c50f18e1b8249a318432dbefdbb752ec81d374a59ab452f8d74acaf6017",
-            "md5": "d6a38db7370ce315e9db1517d220db38",
-            "size": "26668060"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "d8f4086215f482263dbfbe47a3580e88acbcdacbb284f8aa0c21a8fe408e671d",
-            "md5": "3e58db25554c0b86fdbf1e1bd3c33d0b",
-            "size": "91513391"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnvjitlink/linux-aarch64/libnvjitlink-linux-aarch64-12.4.127-archive.tar.xz",
-            "sha256": "104229ab8ed7f585339a4b4e43f7926d8f7478e9b376a376613bbe402dfd5e5b",
-            "md5": "47f822beab403cd6f0ee0728955f4fc9",
-            "size": "27916004"
-        }
-    },
-    "libnvjpeg": {
-        "name": "CUDA nvJPEG",
-        "license": "CUDA Toolkit",
-        "license_path": "libnvjpeg/LICENSE.txt",
-        "version": "12.3.1.117",
-        "linux-x86_64": {
-            "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.3.1.117-archive.tar.xz",
-            "sha256": "9f297a160b8a934e8095c4eb2ee1674a3497e06ca6a0a7d6f2cdea983d443c96",
-            "md5": "09dae899f2e5b84818c4abe84bc88f8c",
-            "size": "2580832"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-12.3.1.117-archive.tar.xz",
-            "sha256": "501efffdb76a9bbeab0bab66834dec310346a73dc16ae839854258f5b2e520fa",
-            "md5": "72fc5540ee21f3679a92781a70428e20",
-            "size": "2624724"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.3.1.117-archive.tar.xz",
-            "sha256": "c1c2eeff199aa55b678acd59c0a76a3b44ca99f730e52becfd0373a55c2df2e3",
-            "md5": "d1ef94c997f3547bdec2e5685e2288e8",
-            "size": "2417676"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.3.1.117-archive.zip",
-            "sha256": "63101a25268a70380a129c9b05cd5fcfe8cafaf8594b6b358a5e082ce482b679",
-            "md5": "5c689be0c0212422f05ad60486e95393",
-            "size": "2833408"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnvjpeg/linux-aarch64/libnvjpeg-linux-aarch64-12.3.1.117-archive.tar.xz",
-            "sha256": "9950455d771f18ba4dc4f60de75ed072e04b19d9ea6c01f69b40315b10709194",
-            "md5": "2b3fe4f6edc867704c0244d4dd40ab9d",
-            "size": "2562292"
-        }
-    },
-    "nsight_compute": {
-        "name": "Nsight Compute",
-        "license": "NVIDIA SLA",
-        "license_path": "nsight_compute/LICENSE.txt",
-        "version": "2024.1.1.4",
-        "linux-x86_64": {
-            "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2024.1.1.4-archive.tar.xz",
-            "sha256": "b6aee577e61db6823a2fe44fcce4902962c7ea90fbb29800ffcceb3df7ea8d47",
-            "md5": "a27549e05b460ea4cf3c000f610e91b1",
-            "size": "599288172"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2024.1.1.4-archive.tar.xz",
-            "sha256": "267c884f074163e5ffde8fe2a798f795b5d375e0fb1df4439e143a992e7e5f6d",
-            "md5": "af2a15b4d0e300449c0bdfde48222ca4",
-            "size": "114721700"
-        },
-        "linux-sbsa": {
-            "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2024.1.1.4-archive.tar.xz",
-            "sha256": "5e3b489eaffe329cc3b204a31e9b9c9bd231203ddfd89f57e04fc59c3119527e",
-            "md5": "f209d70764ce909ca0a76a2a365528fb",
-            "size": "260307276"
-        },
-        "windows-x86_64": {
-            "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2024.1.1.4-archive.zip",
-            "sha256": "a8e497fd4a9dbf12e328e961984f5fad445045efc2568b0cb594ff51da977ba0",
-            "md5": "40e93cd6fdd528e7592c1048befa49f7",
-            "size": "545282883"
-        },
-        "linux-aarch64": {
-            "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2024.1.1.4-archive.tar.xz",
-            "sha256": "122981317d978e5ab98ccb4aa1a922f496d23c2e45ecc3fab2e1524879eb899c",
-            "md5": "e189006ab0b8b281ed6a6484d430b18f",
-            "size": "551145232"
-        }
-    },
-    "nsight_systems": {
-        "name": "Nsight Systems",
-        "license": "NVIDIA SLA",
-        "license_path": "nsight_systems/LICENSE.txt",
-        "version": "2023.4.4.54",
-        "linux-x86_64": {
-            "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2023.4.4.54-archive.tar.xz",
-            "sha256": "25ecbd3e670eb976abafdbdec688008b7eec90ddc230b74d7c276d9f8fdcf076",
-            "md5": "397a7063c1a06aa49265bb4838af9076",
-            "size": "220434032"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2023.4.4.54-archive.tar.xz",
-            "sha256": "d59ade067dcd4747faf9499f4399749d67ca570b03ecc50b22a8fc97d621b756",
-            "md5": "2ebe95985f4b57380e34e8c7ca733355",
-            "size": "58502288"
-        },
-        "linux-sbsa": {
-            "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2023.4.4.54-archive.tar.xz",
-            "sha256": "d681d18a5bde7815f7bf0cd28581905b156aac52413fc8caaef472af63e80096",
-            "md5": "45c98835ee2edf014795e8e54fa56989",
-            "size": "189600532"
-        },
-        "windows-x86_64": {
-            "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2023.4.4.54-archive.zip",
-            "sha256": "319ac041502f4f62e3c55ad01146f2b8f51e96811bb944fcf3549b8649b67baf",
-            "md5": "81278ddcc510f2e133c2854d617c818f",
-            "size": "336162677"
-        }
-    },
-    "nsight_vse": {
-        "name": "Nsight Visual Studio Edition (VSE)",
-        "license": "NVIDIA SLA",
-        "license_path": "nsight_vse/LICENSE.txt",
-        "version": "2024.1.1.24072",
-        "windows-x86_64": {
-            "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2024.1.1.24072-archive.zip",
-            "sha256": "7d9a5f4175d4cc8eff2722be71bca3ff7a4e28e85a5cedd8fa283abfc3eb114e",
-            "md5": "4bdada6c38106fd9e69a172f3e8a83eb",
-            "size": "510208957"
-        }
-    },
-    "nvidia_driver": {
-        "name": "NVIDIA Linux Driver",
-        "license": "NVIDIA Driver",
-        "license_path": "nvidia_driver/LICENSE.txt",
-        "version": "550.54.15",
-        "linux-x86_64": {
-            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-550.54.15-archive.tar.xz",
-            "sha256": "e1416ebc1e7b4a14d393ca584e3f9c5e22f9750f4ba502a8ba2c5c5ad943bbb5",
-            "md5": "4c757f62a0aa0d7025bd290f0f62b1f2",
-            "size": "352810260"
-        },
-        "linux-ppc64le": {
-            "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-550.54.15-archive.tar.xz",
-            "sha256": "ae53576c73f16084f3975aad254ee756e524525b1ca6d72d49d6e4b33083d818",
-            "md5": "af099e16e7493fb762a45223ec1e3d4b",
-            "size": "99127276"
-        },
-        "linux-sbsa": {
-            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-550.54.15-archive.tar.xz",
-            "sha256": "b39a8cb837fe3846284d89ab2202e93b14804349d3fc9aa8a8384fd2759ec2f5",
-            "md5": "d5704afba3f1144108125cdb19718ce3",
-            "size": "268726204"
-        }
-    },
-    "nvidia_fs": {
-        "name": "NVIDIA filesystem",
-        "license": "CUDA Toolkit",
-        "license_path": "nvidia_fs/LICENSE.txt",
-        "version": "2.19.7",
-        "linux-x86_64": {
-            "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.19.7-archive.tar.xz",
-            "sha256": "8a38bc4167f7978e850dcb30311bd3e9789b7a3c12b1fcb9e112cd42b4671c52",
-            "md5": "dd263b808034a918483a6e1f8c7ca211",
-            "size": "58860"
-        },
-        "linux-sbsa": {
-            "relative_path": "nvidia_fs/linux-sbsa/nvidia_fs-linux-sbsa-2.19.7-archive.tar.xz",
-            "sha256": "4c686aa77c837c1ff6d3e280fd93ff512ca73835f5fedee2d986b587629efa9a",
-            "md5": "6daab1d6388500fe7da8652e981af65d",
-            "size": "58880"
-        },
-        "linux-aarch64": {
-            "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.19.7-archive.tar.xz",
-            "sha256": "8da41452c44e4e3e392ec30c9c2bf0da76179d4e7ea077ab9023ed89138af992",
-            "md5": "46ffa52c9bc008b42d36624ea9241024",
-            "size": "58888"
-        }
-    },
-    "visual_studio_integration": {
-        "name": "CUDA Visual Studio Integration",
-        "license": "CUDA Toolkit",
-        "license_path": "visual_studio_integration/LICENSE.txt",
-        "version": "12.4.127",
-        "windows-x86_64": {
-            "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.4.127-archive.zip",
-            "sha256": "c89fd04ac409b93ae0d575626d5d956e3f3d9a21656765ce1c0b25e36c2a103d",
-            "md5": "43687b1d572ae7d462b96f712cc1ea6c",
-            "size": "518984"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.5.1.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.5.1.json
deleted file mode 100644
index 2b2419bbd406..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.5.1.json
+++ /dev/null
@@ -1,1025 +0,0 @@
-{
-    "release_date": "2024-07-01",
-    "release_label": "12.5.1",
-    "release_product": "cuda",
-    "cuda_cccl": {
-        "name": "CXX Core Compute Libraries",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cccl/LICENSE.txt",
-        "version": "12.5.39",
-        "linux-x86_64": {
-            "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.5.39-archive.tar.xz",
-            "sha256": "837c4e27939478ffa3d2ad18f9a109b83c05afbe891769732c5c615e53081fc1",
-            "md5": "aa178bee2e001ca04731a00233f8df7a",
-            "size": "1200412"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.5.39-archive.tar.xz",
-            "sha256": "7052855e3624aeb4abf91b0b9deed68f91054f898b85abef1d511c29ce544cc2",
-            "md5": "2b8b166bbea49b1de2ec33f79855b90f",
-            "size": "1199624"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.5.39-archive.zip",
-            "sha256": "748c07d466556b1562cc46a0389948af1e3fd92cc667ebf697bf6a9a30e736de",
-            "md5": "9767f947432a866baa5a31039c17dd0b",
-            "size": "3339288"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-12.5.39-archive.tar.xz",
-            "sha256": "850714c86724c6b29e3e236ab7944a365691bb25083857c3ae9685c708d58f17",
-            "md5": "829276b4cbb021841bfe0161b770e550",
-            "size": "1200908"
-        }
-    },
-    "cuda_compat": {
-        "name": "CUDA compat L4T",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_compat/LICENSE.txt",
-        "version": "12.5.36505571",
-        "linux-aarch64": {
-            "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-12.5.36505571-archive.tar.xz",
-            "sha256": "9f4cf3a00d380a9175aa7f75314eeb1d9ca190a78a763f07588f07919a9fabb2",
-            "md5": "c9105ec7834e52dbd08af979d3844ca2",
-            "size": "18729484"
-        }
-    },
-    "cuda_cudart": {
-        "name": "CUDA Runtime (cudart)",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cudart/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "2e92179494712a41e9ba979ac81909cccbc7cbbadac9c3e0fd217fd410270df5",
-            "md5": "da14f0eef5c16f0dd1c8b18ea9a7f80f",
-            "size": "1106276"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.5.82-archive.tar.xz",
-            "sha256": "4b0421f8cde1d3276682954c20d3a5089c6297cdb2f4f5ea070846a0e7170a25",
-            "md5": "9ed351ee42a153b0ae79e08dc11363ee",
-            "size": "1095644"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "079dd4349ee536a80308bfeb745a75b729d3957a430dd1cd0051bbd26fe4007e",
-            "md5": "5fe0de7bbdff5b9de31a58524bec03b7",
-            "size": "2488589"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-12.5.82-archive.tar.xz",
-            "sha256": "fb2108b7af85d7334d06accc44080e4da0a8caec0069b0e89ce4d6a7e08e2d64",
-            "md5": "dbd9fc3f3d7ee99191a7012689fc0d04",
-            "size": "1156376"
-        }
-    },
-    "cuda_cuobjdump": {
-        "name": "cuobjdump",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cuobjdump/LICENSE.txt",
-        "version": "12.5.39",
-        "linux-x86_64": {
-            "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.5.39-archive.tar.xz",
-            "sha256": "aaeb67ca9d9e4a024d8e7974c89c194abe75997b71aedfbf137a5755fe6b3bff",
-            "md5": "5788f59668e766d5c5ae888b03f45a8e",
-            "size": "217844"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.5.39-archive.tar.xz",
-            "sha256": "4ee35638cdd9848a79fc3edda02a8cba9eca0bd75006ce945663f512ccfdb0d6",
-            "md5": "93adc92e12cc88676e50dfafe0549917",
-            "size": "207640"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.5.39-archive.zip",
-            "sha256": "39ca9868db618af029cbbcf36950fbd02dbbc2e8dcb61758a68ae5ebb70dd6d9",
-            "md5": "27602ed464175243cb7820e637dde8f6",
-            "size": "4223325"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-12.5.39-archive.tar.xz",
-            "sha256": "1374a78b9598b67e9b57b898bdc4e67992070e40ecaa3f29fd5603c25dbe9d6f",
-            "md5": "d7b05a9a6339f4e9be12e84003ffc0d1",
-            "size": "195076"
-        }
-    },
-    "cuda_cupti": {
-        "name": "CUPTI",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cupti/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "5054985d6454cdb1ef67a3baacd19cac98a89fe8d39fd31bd727bfa65eed6b0a",
-            "md5": "f4a00ff36cfd9d2ea83da0799d6d7ecc",
-            "size": "20789416"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.5.82-archive.tar.xz",
-            "sha256": "1fe17ad05fa001d06e9a3aacd1720d956a9d370e8d9a25349aee8bfa3d42bf2c",
-            "md5": "5830f10c489beaac533117b263f5c324",
-            "size": "11317604"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "efaaa348b74d697f5f8267c3d49132b43fa71127ed74310696b94c4d26a2eb49",
-            "md5": "b9a271a9440519a9e27b23055aeecab5",
-            "size": "14911905"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-12.5.82-archive.tar.xz",
-            "sha256": "ca4f11504c336146e6b4fd5c6d363607e5c41aaf7cfbd917db7e3e06aa869cab",
-            "md5": "f8f0ef7a786abf0220aba79ef2e90c25",
-            "size": "8050824"
-        }
-    },
-    "cuda_cuxxfilt": {
-        "name": "CUDA cuxxfilt (demangler)",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_cuxxfilt/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "24d131d9ee45d4096ff617fbaa93dc175a387b6f9300829040d4bd94511564d2",
-            "md5": "28b1f35dbdc21a62fb1b99e9f8435916",
-            "size": "188308"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.5.82-archive.tar.xz",
-            "sha256": "9f3542cc095b283c6e35471afd493d970b46d305d0b39361bc646acd0ec214cc",
-            "md5": "b774de0528a21c1d8dfd719515d37b7c",
-            "size": "177496"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "3805c9ec6c9bbe323e1677aa2338ecdcc72ef217402281ac4b4065a473f1dca4",
-            "md5": "8fa5475be1c9e91bf2f4961a49876f50",
-            "size": "170575"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-12.5.82-archive.tar.xz",
-            "sha256": "2441e488f0114dacf5f44b8e1b7acdcba0da4469f35bc377edcbac9f87f80ed6",
-            "md5": "fb2d456d467cf750c59baba4079faf81",
-            "size": "170080"
-        }
-    },
-    "cuda_demo_suite": {
-        "name": "CUDA Demo Suite",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_demo_suite/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "da777a9d688160359659c5b9efa2713e8b30a56e2753e0232e37d77ac2d33c83",
-            "md5": "d94e838576d2b58e9c443a9ea0d3e5b1",
-            "size": "3989036"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "5003fe6758f6ce1e9c341eeda149eabd77f2236d033258a17b05263070b1c2b5",
-            "md5": "6fc684e4ec2ef235ad9a45214368aa40",
-            "size": "5064355"
-        }
-    },
-    "cuda_documentation": {
-        "name": "CUDA Documentation",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_documentation/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "e68fc3b2cfbe7cf8cee048dbe70986c4d0f86a7da2e901e045d369bae5270527",
-            "md5": "6dec210d4a129983f3671f3df2b484cd",
-            "size": "67320"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.5.82-archive.tar.xz",
-            "sha256": "ebb834f54d34eb66eaaa982e5cd37754c01e8b5259177cdb4cb1ae1647773e02",
-            "md5": "9ca24df4a742d87e8bf034439a385827",
-            "size": "67184"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "54ee6f09aaeeada8b3682cf150d04fd1e7273206c1fedbd7300f535eebe3f52f",
-            "md5": "3a081bd9915079974529e53f60d846ec",
-            "size": "105658"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-12.5.82-archive.tar.xz",
-            "sha256": "4b60a9f2a16cf3d1a27500a666e02b46d5811ed78e8f58b802d05cbecbfe8339",
-            "md5": "b2157b172ea83ce67c9423f2f8b8fc9c",
-            "size": "67052"
-        }
-    },
-    "cuda_gdb": {
-        "name": "CUDA GDB",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_gdb/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "25bc68ff2ec6133ad7271aece6535f4820b057821421d16932a8c9080b162520",
-            "md5": "782a5ab410f402dea98643018e0b92ad",
-            "size": "66192652"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.5.82-archive.tar.xz",
-            "sha256": "0cecc82647b80b42c3e7cd934485407588d0143917ebd3673bfaf935855ef252",
-            "md5": "63c6c99f1b8b60df839bdc103e26a48d",
-            "size": "43791708"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-12.5.82-archive.tar.xz",
-            "sha256": "d285b73ed1df5ea5a691ca8f18d48a62235adb549269b24cb8fd2d2eac1a451f",
-            "md5": "4d7512e2ee05948e2aad90f86a43c246",
-            "size": "43694356"
-        }
-    },
-    "cuda_nsight": {
-        "name": "Nsight Eclipse Edition Plugin",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nsight/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "3250e4670ebe2729b0d2e3075493473f00d007e813de0eb14b65c8a5ec62e984",
-            "md5": "4c0d97ac6f6fd4962300d53e646c5890",
-            "size": "118683344"
-        }
-    },
-    "cuda_nvcc": {
-        "name": "CUDA NVCC",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvcc/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "ded05fe3c8d075c6c1bf892005d3c50bde3eceaa049b879fcdff6158e068e3be",
-            "md5": "ea26f9d1fea3a355064feb61bb8e2e50",
-            "size": "51687876"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.5.82-archive.tar.xz",
-            "sha256": "345a80c87627a414516e1bfdd99ec97f6a02039c9b82b2610bc5a93e035ca954",
-            "md5": "03a918bb58c49e05c1e489b6fb8a8c0a",
-            "size": "45264504"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "51cec40087b524478c4d204a102ad5de86cd30d0bd2f9e87339032b55296448b",
-            "md5": "1cda218e27ac1d7be9943319eabbc998",
-            "size": "79630604"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-12.5.82-archive.tar.xz",
-            "sha256": "76f57ce3e4294fe9f69eb93b04ab294f696d5e7cde996f33929e68fdde7ab462",
-            "md5": "40120c80e89585e5d29a12c27bf974d8",
-            "size": "46840484"
-        }
-    },
-    "cuda_nvdisasm": {
-        "name": "CUDA nvdisasm",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvdisasm/LICENSE.txt",
-        "version": "12.5.39",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.5.39-archive.tar.xz",
-            "sha256": "fa775b95352302585732644bdd3254a210ccbe477fe5ab85f81956299ca40909",
-            "md5": "22acb62e972a1ff2d9bdf161516c24cb",
-            "size": "49895304"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.5.39-archive.tar.xz",
-            "sha256": "b6a2a8f74cb4ccf5f489308b95568e24917fd384471f0e41235d2a48c2d71729",
-            "md5": "f4c4e8e0b722f6d1e48f4d0937fd7d14",
-            "size": "49810460"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.5.39-archive.zip",
-            "sha256": "2b378494913d9e86c9f6210c2e5389df2fe9de1be1b1dd4a229b86f2bca0cd98",
-            "md5": "67ce76f6d57eb80a5c70b7dd3d786f0a",
-            "size": "50153445"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-12.5.39-archive.tar.xz",
-            "sha256": "07c6861cef0953997feaca5d897a8b15ab7466f193c9f7c07b6ef34dae710a23",
-            "md5": "bb17a840f1c18d2c35446944ca7ee4d4",
-            "size": "49832920"
-        }
-    },
-    "cuda_nvml_dev": {
-        "name": "CUDA NVML Headers",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvml_dev/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "52991dfd16427cf7c99b808b3ff259a1064cec11a8663c7a76611704d4990903",
-            "md5": "d35cee9fcc88d9705011c98db773d574",
-            "size": "143876"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.5.82-archive.tar.xz",
-            "sha256": "529a79fc189088004e1929961f06c978052aea9cec0db93eecf74e51e3bfe608",
-            "md5": "3a22a1f39556d0c8e0f60b106756d1e3",
-            "size": "146604"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "9826ff7f00ed6ae9a8787cd6a20b935114bef7a22bb64ad2490dfd5f13eebb30",
-            "md5": "48a8d7a915deb29f284e0157ad75deef",
-            "size": "128184"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-12.5.82-archive.tar.xz",
-            "sha256": "13ff2985c3074239461458a1fe3a44449642b9345360f7a297a95d7e5a3c954c",
-            "md5": "52a91607a85221b23f594e7c3157849d",
-            "size": "146740"
-        }
-    },
-    "cuda_nvprof": {
-        "name": "CUDA nvprof",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvprof/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "ff3750690c2d3e085dae08c31d31064364cb68d89d96fb2dc0f3adac7c19ad72",
-            "md5": "b4e40b9ddd48cc964ad64341428c704d",
-            "size": "2436132"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "d2e6c92b116b940d7bd689af21f77c4783b86f6dd9afa00dd0c856335ddd0e39",
-            "md5": "1984ed508759a187e41604f2ecef436f",
-            "size": "1702615"
-        }
-    },
-    "cuda_nvprune": {
-        "name": "CUDA nvprune",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvprune/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "afced555949fb3be875d467fcbf6903166917aa5ad42672f1ceca0a972d6b49f",
-            "md5": "e1739ef9ddfc01a4c522a4afff9dcdfb",
-            "size": "56904"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.5.82-archive.tar.xz",
-            "sha256": "ab2fa66bce3553b6a497575d476c81105d8d8c3f2b3646eb52a6edb624cc2b14",
-            "md5": "8daba43096a5d323c0bc747552723384",
-            "size": "48920"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "d3de38ab97d772e7a002fdedbf0fc3cb701c18a3602e54d05282337bc70b7707",
-            "md5": "ef77b32b6f7a23e68676b2913f0480db",
-            "size": "146639"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-12.5.82-archive.tar.xz",
-            "sha256": "4dd0f3e1229998e0aae5d196d8458bb9b80deccae1b5955ff92c7ff9942aa854",
-            "md5": "05944a2a3213629109c0bd8ce1d7f42b",
-            "size": "50656"
-        }
-    },
-    "cuda_nvrtc": {
-        "name": "CUDA NVRTC",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvrtc/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "6745275167fd1c84f95cab9117066a7c41178cd26d4615ae685cb1b777b456b1",
-            "md5": "524c2f9b14ed8dcf502aa03c5d060510",
-            "size": "34189932"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.5.82-archive.tar.xz",
-            "sha256": "a086a54a207477eb7e89ac670021bab514faf689d9ebbe67f5d26cf70c441610",
-            "md5": "fd59c73266a8ccdabc304dbd885b1a2e",
-            "size": "31681388"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "0bc5443fe432d69495412e1ee275fcc5f7590a65bda360ee5e25c20eb192632e",
-            "md5": "4b803550386a0045c4536f038248cc8b",
-            "size": "187054336"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-12.5.82-archive.tar.xz",
-            "sha256": "9a10a8cccd427fc6e47ab6632267c72579d19801b3c0fd2066cd9ef3669d9b83",
-            "md5": "9d6e25cd90c5ad00193f5529a00cdfc3",
-            "size": "32917400"
-        }
-    },
-    "cuda_nvtx": {
-        "name": "CUDA NVTX",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvtx/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "f12a029386f8fbd87f71311d8f4cc51a94414b997c52cf5eabc62c83c655ea47",
-            "md5": "4480413ab9426f999c866ae8f59af806",
-            "size": "48492"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.5.82-archive.tar.xz",
-            "sha256": "8a0d3787f1cce8db70cbad05e6303e72602415c171f8a383da4d1118ce5e89b3",
-            "md5": "b78f9f24b2816b44518aafdbdd83e08d",
-            "size": "49120"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "07f301cff5390b9b56361dda033c2f467f1bddbe3609285afa5a79f31c6e38d6",
-            "md5": "474ef9b449c1731723468a0ccab807f8",
-            "size": "65837"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-12.5.82-archive.tar.xz",
-            "sha256": "8289c3e857f74ef53b2960d19fd211324a62f72169f2bc5d1fb0a7f26889c2f6",
-            "md5": "0ef0b905e0be2cf1e99c76970af1654f",
-            "size": "51720"
-        }
-    },
-    "cuda_nvvp": {
-        "name": "CUDA NVVP",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_nvvp/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "2031d1a86ba91f2deaa2cea115e2c49c65766fb93bbadd780257789a0924207c",
-            "md5": "a49ce8919b3321e9e13f7fada49c3e8e",
-            "size": "117718568"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "d82f6452cbd9194690e054feb6ae1c00e4c110fe6b8419221cc92efa6ceebdd5",
-            "md5": "f7c10c359e14a24aa7d3966008e965e2",
-            "size": "120340741"
-        }
-    },
-    "cuda_opencl": {
-        "name": "CUDA OpenCL",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_opencl/LICENSE.txt",
-        "version": "12.5.39",
-        "linux-x86_64": {
-            "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.5.39-archive.tar.xz",
-            "sha256": "e754a2d3b95b52602d68f011a8b8e9bdfce16eaf5f9bb281503ab503d24d12f4",
-            "md5": "d215116f98cbd9bb754712e0885cd416",
-            "size": "92184"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.5.39-archive.zip",
-            "sha256": "0b01ecdd86229e7e2cb58933cc9204a636767c885a5659752d46296d376427bb",
-            "md5": "85087c5b356945928ec086c9017311c7",
-            "size": "137329"
-        }
-    },
-    "cuda_profiler_api": {
-        "name": "CUDA Profiler API",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_profiler_api/LICENSE.txt",
-        "version": "12.5.39",
-        "linux-x86_64": {
-            "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.5.39-archive.tar.xz",
-            "sha256": "4dfefe155e042d1e00a7a8d847a2d886ca5f39a7019dd14ae72b69aaf6e94986",
-            "md5": "48eb7058e4352518fcc1a8a88474ff49",
-            "size": "16168"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.5.39-archive.tar.xz",
-            "sha256": "09417ae94cbfe41203b825906083a7658e3ba7b4380fb6de7e896fc741d3046c",
-            "md5": "14c620b09b47202140cc41ef87bcafb4",
-            "size": "16168"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.5.39-archive.zip",
-            "sha256": "1397be6e24a773dab8550ba9df2231dde2dca7a4a15c48363bd03621a48fee91",
-            "md5": "6d5038cda340581274073141bb829829",
-            "size": "20222"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-12.5.39-archive.tar.xz",
-            "sha256": "5895e01303f58d5ee2e18d3fbed3db5447342b4d52ca75193666bb1b60be51a4",
-            "md5": "ff5db05a57ab712adc0e4fe5d9a3a7af",
-            "size": "16180"
-        }
-    },
-    "cuda_sanitizer_api": {
-        "name": "CUDA Compute Sanitizer API",
-        "license": "CUDA Toolkit",
-        "license_path": "cuda_sanitizer_api/LICENSE.txt",
-        "version": "12.5.81",
-        "linux-x86_64": {
-            "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.5.81-archive.tar.xz",
-            "sha256": "2c86bd1b37bc9b085914076e0db0122c667da32aa62463edd8bdcfc047eb10e3",
-            "md5": "45187c4b8426971972c9d43ed3d24a30",
-            "size": "8539520"
-        },
-        "linux-sbsa": {
-            "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.5.81-archive.tar.xz",
-            "sha256": "f76b88164b0642ddf6ff80031ed35bd3b851512b8af405cf6838351c518a8000",
-            "md5": "a0dca8f9226fec8c35b5f67bdabca4d3",
-            "size": "6472844"
-        },
-        "windows-x86_64": {
-            "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.5.81-archive.zip",
-            "sha256": "09a8e3438cae3a2f391f3befe7d092bfd2c2157ec4383e5494a2904a2d708ca3",
-            "md5": "6b512975fd30874955d66c6755d0ddde",
-            "size": "14150887"
-        },
-        "linux-aarch64": {
-            "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-12.5.81-archive.tar.xz",
-            "sha256": "bd14ce734d61b2545b7a92b0d2212555a747dec0e8e4de9b956cbf0bc05ce4c3",
-            "md5": "9be2da4482e894a42be51aead752903d",
-            "size": "3821148"
-        }
-    },
-    "fabricmanager": {
-        "name": "NVIDIA Fabric Manager",
-        "license": "NVIDIA Driver",
-        "license_path": "fabricmanager/LICENSE.txt",
-        "version": "555.42.06",
-        "linux-x86_64": {
-            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-555.42.06-archive.tar.xz",
-            "sha256": "e9fde09dab3474b2e9f71bdb7f31b179f12a5023c67dc5b73fb267af4402f6c6",
-            "md5": "5284b959080ed610324668f6ed5ce33e",
-            "size": "5805572"
-        },
-        "linux-sbsa": {
-            "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-555.42.06-archive.tar.xz",
-            "sha256": "89acd66b0622cbb1bf05025e8ba8a1d7db9cf82081a808bec1960f5cccc29fa0",
-            "md5": "70a043fb0504ef67ce7438c5e844829a",
-            "size": "5239004"
-        }
-    },
-    "imex": {
-        "name": "Nvidia-Imex",
-        "license": "NVIDIA Proprietary",
-        "license_path": "imex/LICENSE.txt",
-        "version": "555.42.06",
-        "linux-x86_64": {
-            "relative_path": "imex/linux-x86_64/nvidia-imex-linux-x86_64-555.42.06-archive.tar.xz",
-            "sha256": "91fa5001dfe985519ffff015b545893fb917ff401942103e8d999b43fa1e1828",
-            "md5": "60dffe74401a419378b3c5c78767bbaf",
-            "size": "7331868"
-        },
-        "linux-sbsa": {
-            "relative_path": "imex/linux-sbsa/nvidia-imex-linux-sbsa-555.42.06-archive.tar.xz",
-            "sha256": "c26979b1d0f6a4d2ce77ad0190fcccc5de83fb2b2b6450813e2059180fa48720",
-            "md5": "37409d412e0868395dc806ca847a4a3c",
-            "size": "6536312"
-        }
-    },
-    "libcublas": {
-        "name": "CUDA cuBLAS",
-        "license": "CUDA Toolkit",
-        "license_path": "libcublas/LICENSE.txt",
-        "version": "12.5.3.2",
-        "linux-x86_64": {
-            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.5.3.2-archive.tar.xz",
-            "sha256": "5cac4f3cf97aebc947442aad606069cb747dc585c5b36cb022770046d984d9da",
-            "md5": "79fef7e2cb333b07f506458e570b34cc",
-            "size": "490244196"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.5.3.2-archive.tar.xz",
-            "sha256": "136491297d7bcedad4449ac442557ae0c583b8408bad4dde5223c4acf387dce1",
-            "md5": "350710e77f110438a8b8670c9447bb21",
-            "size": "488650160"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.5.3.2-archive.zip",
-            "sha256": "d3628039eb3d39ba9fe6a5350447b10483dd13d5973b5e4cde1d3e917d457d01",
-            "md5": "40121a00c01df1791160fb2d291a8458",
-            "size": "392940930"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-12.5.3.2-archive.tar.xz",
-            "sha256": "90d2f6abfc66ce6226cd42af54f0e94adf8c49be3e161cf4cb31c6c01441e42c",
-            "md5": "98fb0c138ac1e8a147f87b69d09b662d",
-            "size": "433236344"
-        }
-    },
-    "libcudla": {
-        "name": "cuDLA",
-        "license": "CUDA Toolkit",
-        "license_path": "libcudla/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-aarch64": {
-            "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-12.5.82-archive.tar.xz",
-            "sha256": "874e64e52cbfe7abc3aaf4df0593d340e166671b71f4aa693fc8f17bc77bb05e",
-            "md5": "1d8bd670086190a99cd89fd72694b1e0",
-            "size": "38560"
-        }
-    },
-    "libcufft": {
-        "name": "CUDA cuFFT",
-        "license": "CUDA Toolkit",
-        "license_path": "libcufft/LICENSE.txt",
-        "version": "11.2.3.61",
-        "linux-x86_64": {
-            "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.2.3.61-archive.tar.xz",
-            "sha256": "c69cc32712f2396aaf497894945572e8c3e2668b89614e1a56c2d8e3cece4e54",
-            "md5": "5abb4f9ecf5f4eb5af13fc9bb100877f",
-            "size": "453127556"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.2.3.61-archive.tar.xz",
-            "sha256": "50831766eb16a52a803484e746197d604e5e5181fdadbc0fbfaf90ff90e6b18f",
-            "md5": "7a855c8afa71a5a577c9dec9ca1fa1fe",
-            "size": "453105776"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.2.3.61-archive.zip",
-            "sha256": "afe77d89bce4ee669516597bfb635adddc156988409ee2e220f7b492fe81201e",
-            "md5": "6a4d81e5cde4ee3de495ce9f5d741360",
-            "size": "189989107"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-11.2.3.61-archive.tar.xz",
-            "sha256": "314e7437de38a69e0ea38db79525174e0fab99c4720532acdfe74efe89804dbb",
-            "md5": "0177ef0599c2d44261f6d19e432f251c",
-            "size": "453207636"
-        }
-    },
-    "libcufile": {
-        "name": "CUDA cuFile",
-        "license": "CUDA Toolkit",
-        "license_path": "libcufile/LICENSE.txt",
-        "version": "1.10.1.7",
-        "linux-x86_64": {
-            "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.10.1.7-archive.tar.xz",
-            "sha256": "4198c85cabadd8f3744d0a84b88d8d80173fca0ab2216b49214be05c5e6155d5",
-            "md5": "1a1ea838dbe086aeb19f2d095afd65c0",
-            "size": "41843020"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcufile/linux-sbsa/libcufile-linux-sbsa-1.10.1.7-archive.tar.xz",
-            "sha256": "63b0b113709a1e3b7ffef27199ae017330b6d68b0c5e87526294e71e7179ddc5",
-            "md5": "fa0ce44ec65e5d79ec08a29f2424da05",
-            "size": "41298932"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.10.1.7-archive.tar.xz",
-            "sha256": "516daa26f7715da233592f552e80ef2986b1929351d732b251486e5538c31d93",
-            "md5": "6c62ddb80f3e5cbf1c0b6a26fbb6b6fc",
-            "size": "41264800"
-        }
-    },
-    "libcurand": {
-        "name": "CUDA cuRAND",
-        "license": "CUDA Toolkit",
-        "license_path": "libcurand/LICENSE.txt",
-        "version": "10.3.6.82",
-        "linux-x86_64": {
-            "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.6.82-archive.tar.xz",
-            "sha256": "af41597788fd30eb5ccae390be5fe0db59b0a3285a8db97de604a75eeaac93f7",
-            "md5": "6fa9b816ea551f992756a7e8b69afde2",
-            "size": "81700968"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.6.82-archive.tar.xz",
-            "sha256": "35584cad6b5908d69ace5bc223e96cadcc7f2940d71468535503033fcbd9a7f3",
-            "md5": "130469d5157de7b51e09977245b1b2a9",
-            "size": "81685744"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.6.82-archive.zip",
-            "sha256": "49f1d18d35af5b446b47d81757f822c054058bade9107c4d96e42b06baafaa2c",
-            "md5": "45a1d93c726428d9f24fa175285447e8",
-            "size": "55085680"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.6.82-archive.tar.xz",
-            "sha256": "e5dfb488e1a232e35b159d89de01755389e175d1d39e8d1841fbd5ef98457c41",
-            "md5": "9cb2736be27ce7d902826171cf864982",
-            "size": "83909736"
-        }
-    },
-    "libcusolver": {
-        "name": "CUDA cuSOLVER",
-        "license": "CUDA Toolkit",
-        "license_path": "libcusolver/LICENSE.txt",
-        "version": "11.6.3.83",
-        "linux-x86_64": {
-            "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.6.3.83-archive.tar.xz",
-            "sha256": "f2fae41cd7637e22cb539c79dc44845cbd7ab932f006c5a8faf459a89054bf7f",
-            "md5": "f651fb361354f3d5d48f22856c7cea08",
-            "size": "129904672"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.6.3.83-archive.tar.xz",
-            "sha256": "846d86d8f4e5af49abd311d158cab5c2affbb47d65942735cca3310d32c55751",
-            "md5": "ced65f6dbdb46f220b77af8f2bad299e",
-            "size": "129073208"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.6.3.83-archive.zip",
-            "sha256": "2f4d929f206937e9d87d7ef6e5340923e4d8a47db1dbdd560eb968cf53b9ea47",
-            "md5": "80ec1591594c35ccda0f7061fd408649",
-            "size": "125989954"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.6.3.83-archive.tar.xz",
-            "sha256": "eff8e95800dfb3cc332b26e93e6ecfe6c1c95a4e185ed48adc95fa8d3b6fbd6f",
-            "md5": "1ec6884593ce4327269ea10e8b2a0f7f",
-            "size": "141195340"
-        }
-    },
-    "libcusparse": {
-        "name": "CUDA cuSPARSE",
-        "license": "CUDA Toolkit",
-        "license_path": "libcusparse/LICENSE.txt",
-        "version": "12.5.1.3",
-        "linux-x86_64": {
-            "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.5.1.3-archive.tar.xz",
-            "sha256": "2b1c4295f7c5d57b986268086ee3e05b599afcc6fe303ccacf393cda2a7b1aff",
-            "md5": "d86d9b52332c189104e89c13ca0ab62f",
-            "size": "236855792"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.5.1.3-archive.tar.xz",
-            "sha256": "a93e0e59c378405de53a47363759fdeed30c1c9b23df98a4b86dc375a77e56d8",
-            "md5": "154f94fc89d22d5b50ef54fae08c22ab",
-            "size": "236438924"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.5.1.3-archive.zip",
-            "sha256": "c526cbf7db1fff65229433733027ef4e8daeec36dc7cd8f3043754ebca704da3",
-            "md5": "7554101787fc62098d08e93796cecf30",
-            "size": "212374153"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-12.5.1.3-archive.tar.xz",
-            "sha256": "d1c083686f8dbb7db77160d6a14eef940f587fb8942be024a2f3a32aff1d72cc",
-            "md5": "85a955b8e58d836acea8ddab9383dc80",
-            "size": "254219868"
-        }
-    },
-    "libnpp": {
-        "name": "CUDA NPP",
-        "license": "CUDA Toolkit",
-        "license_path": "libnpp/LICENSE.txt",
-        "version": "12.3.0.159",
-        "linux-x86_64": {
-            "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.3.0.159-archive.tar.xz",
-            "sha256": "5bcb6af62e3affac26c7716bc3d91c1b69ecdd86668a7dc62f3a9c7bf25edd11",
-            "md5": "0315f315a6b2eb441288bc98547754cf",
-            "size": "184260856"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.3.0.159-archive.tar.xz",
-            "sha256": "0a109d01c2a497e18630f06ff5c407c59346d93e5cb7d48916cce6f1de0a1d05",
-            "md5": "cddc03965f1244722ec6f5e4363292cc",
-            "size": "184506068"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.3.0.159-archive.zip",
-            "sha256": "1aa7e6243dffebeb7aa9c50a64f64c4af37d2eacf639e624ff97f3c3f0cf7dc0",
-            "md5": "38b25dca7eaaf92fc07b16374e8e0a8d",
-            "size": "157072527"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-12.3.0.159-archive.tar.xz",
-            "sha256": "fd5241c8657851d159ac11bab351ed42a2bc2930a447aa5aa21b725f659fd36d",
-            "md5": "2996db520d7bc71eec9e63843efc83d9",
-            "size": "202520548"
-        }
-    },
-    "libnvfatbin": {
-        "name": "NVIDIA compiler library for fatbin interaction",
-        "license": "CUDA Toolkit",
-        "license_path": "libnvfatbin/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "libnvfatbin/linux-x86_64/libnvfatbin-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "d04cc1a3ff99cd2022a10293beec12f3590344fe23ef3dc0eff5178a65a8c728",
-            "md5": "cd26d7b2ec80780e675595fb41ba9502",
-            "size": "909052"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvfatbin/linux-sbsa/libnvfatbin-linux-sbsa-12.5.82-archive.tar.xz",
-            "sha256": "fa975e8a90ec8473e60ca41b65a379a9258601c3243d8354959df21e23318df8",
-            "md5": "46ddc2e60b63164195479520f5b387bf",
-            "size": "810644"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvfatbin/windows-x86_64/libnvfatbin-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "8c3733310059c64650b8b0e1da4ec46e9c4aa24cb7c7411c1d3b37035b9c620b",
-            "md5": "b92b8459a06330f53a552df0c88326a9",
-            "size": "2134142"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnvfatbin/linux-aarch64/libnvfatbin-linux-aarch64-12.5.82-archive.tar.xz",
-            "sha256": "a7a103ffacc1e5226a8147c371144f3a32789095c71e3c6cf74b8db90b915e07",
-            "md5": "c95d8d95640f1d24af75c7d50b40f48a",
-            "size": "784440"
-        }
-    },
-    "libnvidia_nscq": {
-        "name": "NVIDIA NSCQ API",
-        "license": "NVIDIA Driver",
-        "license_path": "libnvidia_nscq/LICENSE.txt",
-        "version": "555.42.06",
-        "linux-x86_64": {
-            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-555.42.06-archive.tar.xz",
-            "sha256": "e1b0be458914bc29119dd6e8cbaa596960f2e1f0db87a9e50d6877cb6a68675a",
-            "md5": "5d59e7e1a2c93e6c7a2f97e485672ba2",
-            "size": "352772"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-555.42.06-archive.tar.xz",
-            "sha256": "c1fdc42798a1c8f7a1c18bf2bc5fa2c6647f93c187916097e785674efdb768e1",
-            "md5": "aded2da9827d0662192f3666c3ab25d0",
-            "size": "346884"
-        }
-    },
-    "libnvjitlink": {
-        "name": "NVIDIA compiler library for JIT LTO functionality",
-        "license": "CUDA Toolkit",
-        "license_path": "libnvjitlink/LICENSE.txt",
-        "version": "12.5.82",
-        "linux-x86_64": {
-            "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.5.82-archive.tar.xz",
-            "sha256": "cbe265b0b2db1e99468191d9cab896bf94a532dfb41827f17ed8e91d0ea0b5dd",
-            "md5": "bb7d7a50c162ee2bb07f27db1bef190d",
-            "size": "29454740"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.5.82-archive.tar.xz",
-            "sha256": "7fcbd26170ee91891e497f728cd25c91c61e23ff490eef2aaf4791b3535cda7d",
-            "md5": "d89d18b59d048c8231b0357683202d23",
-            "size": "26917044"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "410e0bd78ee7e89e9b0ddbeb6825c898a18d7fb637450db8df6b3fec57c2a5bd",
-            "md5": "9d22664b4e22f9c8014f13401d121167",
-            "size": "152952500"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnvjitlink/linux-aarch64/libnvjitlink-linux-aarch64-12.5.82-archive.tar.xz",
-            "sha256": "359ee281f4e8ef4c50163659d9efd1e4e3b677ad045013ad40af9bb86bcfda68",
-            "md5": "cb1fabfe2827102eb6b9e4f6d827186f",
-            "size": "28159356"
-        }
-    },
-    "libnvjpeg": {
-        "name": "CUDA nvJPEG",
-        "license": "CUDA Toolkit",
-        "license_path": "libnvjpeg/LICENSE.txt",
-        "version": "12.3.2.81",
-        "linux-x86_64": {
-            "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.3.2.81-archive.tar.xz",
-            "sha256": "e39aebec1678033184f666d0ab0114c8c55c2e0dfae3e310ede9c42d3ee3957a",
-            "md5": "c507a27d4183ae8b81f81e46e6e258a1",
-            "size": "2584788"
-        },
-        "linux-sbsa": {
-            "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.3.2.81-archive.tar.xz",
-            "sha256": "1d0da2db76adc55441385e334a439db064b4b2f38b09dc37a29681de973d5a9d",
-            "md5": "9ef0a31458a3b51c635ddec911426f12",
-            "size": "2422156"
-        },
-        "windows-x86_64": {
-            "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.3.2.81-archive.zip",
-            "sha256": "c543b35b16ab5bc696cddd7ede02c15714643a1b1458ca2c041efe04c01d9c01",
-            "md5": "6bd2d7efa5657c1e14e4eb0b82f48b5a",
-            "size": "2835792"
-        },
-        "linux-aarch64": {
-            "relative_path": "libnvjpeg/linux-aarch64/libnvjpeg-linux-aarch64-12.3.2.81-archive.tar.xz",
-            "sha256": "559165ea790b5471b5b072f5f97caaace8a7ddacf27280f57a2de9cf7f10c522",
-            "md5": "491bc2257755acdc4fb459d78b7a4fc2",
-            "size": "2564048"
-        }
-    },
-    "nsight_compute": {
-        "name": "Nsight Compute",
-        "license": "NVIDIA SLA",
-        "license_path": "nsight_compute/LICENSE.txt",
-        "version": "2024.2.1.2",
-        "linux-x86_64": {
-            "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2024.2.1.2-archive.tar.xz",
-            "sha256": "8790e5cdfa35ab99f5046854523ca4a3f6a877dfbb5359fb090a9cbc7c844c47",
-            "md5": "95a21c0375b86961027377e4d0494c6b",
-            "size": "435413360"
-        },
-        "linux-sbsa": {
-            "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2024.2.1.2-archive.tar.xz",
-            "sha256": "c598d394ebbcfa9dd34641bdead530315823cbf25412dbcf74bc184763e3740d",
-            "md5": "c0271d59029b03c9469518c799417427",
-            "size": "222043308"
-        },
-        "windows-x86_64": {
-            "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2024.2.1.2-archive.zip",
-            "sha256": "c3259047dfd59b2b958b7b865f64353391f78d77722b0d3e1be95ac19ceb074e",
-            "md5": "9dde35d4531c4b5d93a15ccb2291e948",
-            "size": "469359174"
-        },
-        "linux-aarch64": {
-            "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2024.2.1.2-archive.tar.xz",
-            "sha256": "08602ad114ac704efc51e486739aaaf12631a2417188f5b27cb96a6ba5c84a76",
-            "md5": "83f01dd315b3f5582baf23ca31e30601",
-            "size": "439441508"
-        }
-    },
-    "nsight_systems": {
-        "name": "Nsight Systems",
-        "license": "NVIDIA SLA",
-        "license_path": "nsight_systems/LICENSE.txt",
-        "version": "2024.2.3.38",
-        "linux-x86_64": {
-            "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2024.2.3.38-archive.tar.xz",
-            "sha256": "36b457ec34572699c7ddba94aec659a02d4ec78fe19bec7750918fd7e9b79119",
-            "md5": "4bdc45128eaef2473f8f55ca000e523e",
-            "size": "241641720"
-        },
-        "linux-sbsa": {
-            "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2024.2.3.38-archive.tar.xz",
-            "sha256": "ca55ab91c8b81a05c44f2298b06579f412b8b2627312626e69e74dd4661553e0",
-            "md5": "d45cdbec6291127a4873cf18b300c6e8",
-            "size": "205635660"
-        },
-        "windows-x86_64": {
-            "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2024.2.3.38-archive.zip",
-            "sha256": "6f48b9ad4309021be0218e4a57501c15783a867c55ec208338430a64362d4190",
-            "md5": "074c4861711fcfb4244706a53512e39b",
-            "size": "363718912"
-        }
-    },
-    "nsight_vse": {
-        "name": "Nsight Visual Studio Edition (VSE)",
-        "license": "NVIDIA SLA",
-        "license_path": "nsight_vse/LICENSE.txt",
-        "version": "2024.2.1.24155",
-        "windows-x86_64": {
-            "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2024.2.1.24155-archive.zip",
-            "sha256": "c3dc85353506f689c79f62054d27ddd6a890c8229db3b9a11b3e3bd1a50e125e",
-            "md5": "4adc497894c1f44f3b02bdb32e5ffc48",
-            "size": "473152523"
-        }
-    },
-    "nvidia_driver": {
-        "name": "NVIDIA Linux Driver",
-        "license": "NVIDIA Driver",
-        "license_path": "nvidia_driver/LICENSE.txt",
-        "version": "555.42.06",
-        "linux-x86_64": {
-            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-555.42.06-archive.tar.xz",
-            "sha256": "944a7b3c30265f440fe8d2d2579fca82a2bd01431d4ad3ab43f9a03725a0c447",
-            "md5": "b746cdd33f83142380f04b4a0eb556df",
-            "size": "348473024"
-        },
-        "linux-sbsa": {
-            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-555.42.06-archive.tar.xz",
-            "sha256": "a764c03c9be66fb35144ec23aafa7cf73f9d392fced38db982c32ac53f997a7d",
-            "md5": "bea12d882f9440064ac310698979e41e",
-            "size": "265918892"
-        }
-    },
-    "nvidia_fs": {
-        "name": "NVIDIA filesystem",
-        "license": "CUDA Toolkit",
-        "license_path": "nvidia_fs/LICENSE.txt",
-        "version": "2.20.6",
-        "linux-x86_64": {
-            "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.20.6-archive.tar.xz",
-            "sha256": "3930523280dceb2bb491d063949911a620672f4f38472ba9af4161f40581534f",
-            "md5": "ed8dfbba5df4ac381af4a356629811c8",
-            "size": "59268"
-        },
-        "linux-sbsa": {
-            "relative_path": "nvidia_fs/linux-sbsa/nvidia_fs-linux-sbsa-2.20.6-archive.tar.xz",
-            "sha256": "52e088d6caf89e1510bf53ddc8e0dbeb2e9b6ea523e4e0dabe654e33f1dd4850",
-            "md5": "39bb3d1e65b529f0245c5a3ab90db843",
-            "size": "59276"
-        },
-        "linux-aarch64": {
-            "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.20.6-archive.tar.xz",
-            "sha256": "3b193267ac26bc58e15f0f6afc130527bd21306fd25263d4facd5e8e23e1d2e5",
-            "md5": "e10534905b16c1725f9003d22e80211d",
-            "size": "59296"
-        }
-    },
-    "visual_studio_integration": {
-        "name": "CUDA Visual Studio Integration",
-        "license": "CUDA Toolkit",
-        "license_path": "visual_studio_integration/LICENSE.txt",
-        "version": "12.5.82",
-        "windows-x86_64": {
-            "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.5.82-archive.zip",
-            "sha256": "bde772fbe66039b0450d0997f1c5bce217082389ac950b0f900d0fd6f7dfe229",
-            "md5": "4f3337f5a4b65437ba69d9aaa8d6299d",
-            "size": "533174"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix
index ff33803f641c..e4f72bb93395 100644
--- a/pkgs/development/cuda-modules/cudatoolkit/default.nix
+++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix
@@ -148,14 +148,12 @@ backendStdenv.mkDerivation {
       qtwebengine
     ])
   )
-  ++ lib.optionals (cudaAtLeast "12.6") [
+  ++ [
     # libcrypt.so.1
     libxcrypt-legacy
     ncurses6
     python310
     python311
-  ]
-  ++ lib.optionals (cudaAtLeast "12.9") [
     # Replace once https://github.com/NixOS/nixpkgs/pull/421740 is merged.
     (libxml2.overrideAttrs rec {
       version = "2.13.8";
@@ -299,7 +297,7 @@ backendStdenv.mkDerivation {
   ''
   # Python 3.8 and 3.9 are not in nixpkgs anymore, delete Python 3.{8,9} cuda-gdb support
   # to avoid autopatchelf failing to find libpython3.{8,9}.so.
-  + lib.optionalString (cudaAtLeast "12.6") ''
+  + ''
     find $out -name '*python3.8*' -delete
     find $out -name '*python3.9*' -delete
   ''
diff --git a/pkgs/development/cuda-modules/cudnn/releases.nix b/pkgs/development/cuda-modules/cudnn/releases.nix
index bfa1e2093c47..d8c4d70ddd09 100644
--- a/pkgs/development/cuda-modules/cudnn/releases.nix
+++ b/pkgs/development/cuda-modules/cudnn/releases.nix
@@ -14,13 +14,6 @@
         url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-aarch64/cudnn-linux-aarch64-8.9.5.30_cuda12-archive.tar.xz";
         hash = "sha256-BJH3sC9VwiB362eL8xTB+RdSS9UHz1tlgjm/mKRyM6E=";
       }
-      {
-        version = "9.3.0.75";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.6";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-aarch64/cudnn-linux-aarch64-9.3.0.75_cuda12-archive.tar.xz";
-        hash = "sha256-Gq5L/O1j+TC0Z3+eko4ZeHjezi7dUcqPp6uDY9Dm7WA=";
-      }
       {
         version = "9.7.1.26";
         minCudaVersion = "12.0";
@@ -40,13 +33,6 @@
     linux-ppc64le = [ ];
     # server-grade arm
     linux-sbsa = [
-      {
-        version = "8.8.1.3";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.0";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.8.1.3_cuda12-archive.tar.xz";
-        hash = "sha256-njl3qhudBuuGC1gqyJM2MGdaAkMCnCWb/sW7VpmGfSA=";
-      }
       {
         version = "8.9.7.29";
         minCudaVersion = "12.0";
diff --git a/pkgs/development/cuda-modules/cutensor/extension.nix b/pkgs/development/cuda-modules/cutensor/extension.nix
index ef26bf7e43f2..5f6724549e3e 100644
--- a/pkgs/development/cuda-modules/cutensor/extension.nix
+++ b/pkgs/development/cuda-modules/cutensor/extension.nix
@@ -31,11 +31,6 @@ let
   pname = "libcutensor";
 
   cutensorVersions = [
-    "1.3.3"
-    "1.4.0"
-    "1.5.0"
-    "1.6.2"
-    "1.7.0"
     "2.0.2"
     "2.1.0"
   ];
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.3.3.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.3.3.json
deleted file mode 100644
index 99679aecbc44..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.3.3.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "libcutensor": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.4.0.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.4.0.json
deleted file mode 100644
index 99679aecbc44..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.4.0.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "libcutensor": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.5.0.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.5.0.json
deleted file mode 100644
index 99679aecbc44..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.5.0.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "libcutensor": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.6.2.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.6.2.json
deleted file mode 100644
index 99679aecbc44..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.6.2.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "libcutensor": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.7.0.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.7.0.json
deleted file mode 100644
index 99679aecbc44..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.7.0.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "libcutensor": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.3.3.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.3.3.json
deleted file mode 100644
index ca12b8c92e98..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.3.3.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "release_date": "2021-09-22",
-    "libcutensor": {
-        "name": "NVIDIA cuTENSOR",
-        "license": "cuTensor",
-        "version": "1.3.3.2",
-        "linux-x86_64": {
-            "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-1.3.3.2-archive.tar.xz",
-            "sha256": "2e9517f31305872a7e496b6aa8ea329acda6b947b0c1eb1250790eaa2d4e2ecc",
-            "md5": "977699555cfcc8d2ffeff018a0f975b0",
-            "size": "201849628"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcutensor/linux-ppc64le/libcutensor-linux-ppc64le-1.3.3.2-archive.tar.xz",
-            "sha256": "79f294c4a7933e5acee5f150145c526d6cd4df16eefb63f2d65df1dbc683cd68",
-            "md5": "1f632c9d33ffef9c819e10c95d69a134",
-            "size": "202541908"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-1.3.3.2-archive.tar.xz",
-            "sha256": "0b62d5305abfdfca4776290f16a1796c78c1fa83b203680c012f37d44706fcdb",
-            "md5": "e476675490aff0b154f2f38063f0c10b",
-            "size": "149059520"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-1.3.3.2-archive.zip",
-            "sha256": "3abeacbe7085af7026ca1399a77c681c219c10a1448a062964e97aaac2b05851",
-            "md5": "fe75f031c53260c00ad5f7c5d69d31e5",
-            "size": "374926147"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.4.0.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.4.0.json
deleted file mode 100644
index 45008c2d0af9..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.4.0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "release_date": "2021-11-19",
-    "libcutensor": {
-        "name": "NVIDIA cuTENSOR",
-        "license": "cuTensor",
-        "version": "1.4.0.6",
-        "linux-x86_64": {
-            "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-1.4.0.6-archive.tar.xz",
-            "sha256": "467ba189195fcc4b868334fc16a0ae1e51574139605975cc8004cedebf595964",
-            "md5": "5d4009390be0226fc3ee75d225053123",
-            "size": "218277136"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcutensor/linux-ppc64le/libcutensor-linux-ppc64le-1.4.0.6-archive.tar.xz",
-            "sha256": "5da44ff2562ab7b9286122653e54f28d2222c8aab4bb02e9bdd4cf7e4b7809be",
-            "md5": "6058c728485072c980f652c2de38b016",
-            "size": "218951992"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-1.4.0.6-archive.tar.xz",
-            "sha256": "6b06d63a5bc49c1660be8c307795f8a901c93dcde7b064455a6c81333c7327f4",
-            "md5": "a6f3fd515c052df43fbee9508ea87e1e",
-            "size": "163596044"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-1.4.0.6-archive.zip",
-            "sha256": "4f01a8aac2c25177e928c63381a80e3342f214ec86ad66965dcbfe81fc5c901d",
-            "md5": "d21e0d5f2bd8c29251ffacaa85f0d733",
-            "size": "431385567"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.5.0.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.5.0.json
deleted file mode 100644
index fe1852f261f2..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.5.0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "release_date": "2022-03-08",
-    "libcutensor": {
-        "name": "NVIDIA cuTENSOR",
-        "license": "cuTensor",
-        "version": "1.5.0.3",
-        "linux-x86_64": {
-            "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-1.5.0.3-archive.tar.xz",
-            "sha256": "4fdebe94f0ba3933a422cff3dd05a0ef7a18552ca274dd12564056993f55471d",
-            "md5": "7e1b1a613b819d6cf6ee7fbc70f16105",
-            "size": "208925360"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcutensor/linux-ppc64le/libcutensor-linux-ppc64le-1.5.0.3-archive.tar.xz",
-            "sha256": "ad736acc94e88673b04a3156d7d3a408937cac32d083acdfbd8435582cbe15db",
-            "md5": "bcdafb6d493aceebfb9a420880f1486c",
-            "size": "208384668"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-1.5.0.3-archive.tar.xz",
-            "sha256": "5b9ac479b1dadaf40464ff3076e45f2ec92581c07df1258a155b5bcd142f6090",
-            "md5": "62149d726480d12c9a953d27edc208dc",
-            "size": "156512748"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-1.5.0.3-archive.zip",
-            "sha256": "de76f7d92600dda87a14ac756e9d0b5733cbceb88bcd20b3935a82c99342e6cd",
-            "md5": "66feef08de8c7fccf7269383e663fd06",
-            "size": "421810766"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.6.2.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.6.2.json
deleted file mode 100644
index 95b3706fc56f..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.6.2.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "release_date": "2022-12-12",
-    "libcutensor": {
-        "name": "NVIDIA cuTENSOR",
-        "license": "cuTensor",
-        "version": "1.6.2.3",
-        "linux-x86_64": {
-            "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-1.6.2.3-archive.tar.xz",
-            "sha256": "0f2745681b1d0556f9f46ff6af4937662793498d7367b5f8f6b8625ac051629e",
-            "md5": "b84a2f6712e39314f6c54b429152339f",
-            "size": "538838404"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcutensor/linux-ppc64le/libcutensor-linux-ppc64le-1.6.2.3-archive.tar.xz",
-            "sha256": "558329fa05409f914ebbe218a1cf7c9ccffdb7aa2642b96db85fd78b5ad534d1",
-            "md5": "8d5d129aa7863312a95084ab5a27b7e7",
-            "size": "535585612"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-1.6.2.3-archive.tar.xz",
-            "sha256": "7d4d9088c892bb692ffd70750b49625d1ccbb85390f6eb7c70d6cf582df6d935",
-            "md5": "f6e0cce3a3b38ced736e55a19da587a3",
-            "size": "450705724"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-1.6.2.3-archive.zip",
-            "sha256": "07cb312d7cafc7bb2f33d775e1ef5fffd1703d5c6656e785a7a8f0f01939907e",
-            "md5": "5ae1c56bf4d457933dc1acb58a4ac995",
-            "size": "1063805254"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.7.0.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.7.0.json
deleted file mode 100644
index f09abaa62940..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.7.0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "release_date": "2023-03-16",
-    "libcutensor": {
-        "name": "NVIDIA cuTENSOR",
-        "license": "cuTensor",
-        "version": "1.7.0.1",
-        "linux-x86_64": {
-            "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-1.7.0.1-archive.tar.xz",
-            "sha256": "dd3557891371a19e73e7c955efe5383b0bee954aba6a30e4892b0e7acb9deb26",
-            "md5": "7c7e655e2ef1c57ede351f5f5c7c59be",
-            "size": "542970468"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcutensor/linux-ppc64le/libcutensor-linux-ppc64le-1.7.0.1-archive.tar.xz",
-            "sha256": "af4ad5e29dcb636f1bf941ed1fd7fc8053eeec4813fbc0b41581e114438e84c8",
-            "md5": "30739decf9f5267f2a5f28c7c1a1dc3d",
-            "size": "538487672"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-1.7.0.1-archive.tar.xz",
-            "sha256": "c31f8e4386539434a5d1643ebfed74572011783b4e21b62be52003e3a9de3720",
-            "md5": "3185c17e8f32c9c54f591006b917365e",
-            "size": "454324456"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-1.7.0.1-archive.zip",
-            "sha256": "cdbb53bcc1c7b20ee0aa2dee781644a324d2d5e8065944039024fe22d6b822ab",
-            "md5": "7d20a5823e94074e273525b0713f812b",
-            "size": "1070143817"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/tensorrt/releases.nix b/pkgs/development/cuda-modules/tensorrt/releases.nix
index 17cf4fd698b0..9ead3767a286 100644
--- a/pkgs/development/cuda-modules/tensorrt/releases.nix
+++ b/pkgs/development/cuda-modules/tensorrt/releases.nix
@@ -10,14 +10,6 @@
     linux-ppc64le = [ ];
     # server-grade arm
     linux-sbsa = [
-      {
-        version = "8.6.1.6";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.0";
-        cudnnVersion = null;
-        filename = "TensorRT-8.6.1.6.Ubuntu-20.04.aarch64-gnu.cuda-12.0.tar.gz";
-        hash = "sha256-Lc4+v/yBr17VlecCSFMLUDlXMTYV68MGExwnUjGme5E=";
-      }
       {
         version = "10.8.0.43";
         minCudaVersion = "12.8";
@@ -37,22 +29,6 @@
     ];
     # x86_64
     linux-x86_64 = [
-      {
-        version = "8.6.1.6";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.1";
-        cudnnVersion = "8.9";
-        filename = "TensorRT-8.6.1.6.Linux.x86_64-gnu.cuda-12.0.tar.gz";
-        hash = "sha256-D4FXpfxTKZQ7M4uJNZE3M1CvqQyoEjnNrddYDNHrolQ=";
-      }
-      {
-        version = "10.3.0.26";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.5";
-        cudnnVersion = "9.3";
-        filename = "TensorRT-10.3.0.26.Linux.x86_64-gnu.cuda-12.5.tar.gz";
-        hash = "sha256-rf8c1avl2HATgGFyNR5Y/QJOW/D8YdSe9LhM047ZkIE=";
-      }
       {
         version = "10.8.0.43";
         minCudaVersion = "12.0";
diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
index 00a7a946b69b..a12bf301fc19 100644
--- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
@@ -13,7 +13,6 @@
 }:
 let
   inherit (jaxlib) version;
-  inherit (cudaPackages) cudaAtLeast;
 
   cudaLibPath = lib.makeLibraryPath (
     with cudaPackages;
@@ -101,6 +100,6 @@ buildPythonPackage rec {
     platforms = lib.platforms.linux;
     # see CUDA compatibility matrix
     # https://jax.readthedocs.io/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder
-    broken = !(cudaAtLeast "12.1") || !(lib.versionAtLeast cudaPackages.cudnn.version "9.1");
+    broken = !(lib.versionAtLeast cudaPackages.cudnn.version "9.1");
   };
 }
diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
index ccc76d08b1df..4416b1829a52 100644
--- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
@@ -13,7 +13,6 @@
 }:
 let
   inherit (jaxlib) version;
-  inherit (cudaPackages) cudaAtLeast;
   inherit (jax-cuda12-pjrt) cudaLibPath;
 
   getSrcFromPypi =
@@ -133,6 +132,6 @@ buildPythonPackage {
     platforms = lib.platforms.linux;
     # see CUDA compatibility matrix
     # https://jax.readthedocs.io/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder
-    broken = !(cudaAtLeast "12.1") || !(lib.versionAtLeast cudaPackages.cudnn.version "9.1");
+    broken = !(lib.versionAtLeast cudaPackages.cudnn.version "9.1");
   };
 }
diff --git a/pkgs/development/python-modules/tensorrt/default.nix b/pkgs/development/python-modules/tensorrt/default.nix
index 1a14db80348b..12f07753be8a 100644
--- a/pkgs/development/python-modules/tensorrt/default.nix
+++ b/pkgs/development/python-modules/tensorrt/default.nix
@@ -11,20 +11,10 @@
 let
   pyVersion = "${lib.versions.major python.version}${lib.versions.minor python.version}";
   buildVersion = lib.optionalString (cudaPackages ? tensorrt) cudaPackages.tensorrt.version;
-  wheelVersion = lib.optionalString (cudaPackages ? tensorrt) (
-    if
-      (builtins.elem buildVersion [
-        "10.3.0.26"
-      ])
-    then
-      builtins.concatStringsSep "." (lib.take 3 (builtins.splitVersion buildVersion))
-    else
-      buildVersion
-  );
 in
 buildPythonPackage rec {
   pname = "tensorrt";
-  version = wheelVersion;
+  version = buildVersion;
 
   src = cudaPackages.tensorrt.src;
 
@@ -41,7 +31,7 @@ buildPythonPackage rec {
   preUnpack = ''
     mkdir -p dist
     tar --strip-components=2 -xf "$src" --directory=dist \
-      "TensorRT-${buildVersion}/python/tensorrt-${wheelVersion}-cp${pyVersion}-none-linux_x86_64.whl"
+      "TensorRT-${buildVersion}/python/tensorrt-${buildVersion}-cp${pyVersion}-none-linux_x86_64.whl"
   '';
 
   sourceRoot = ".";
diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix
index 2ed72caa1caf..242d3c71b273 100644
--- a/pkgs/test/cuda/default.nix
+++ b/pkgs/test/cuda/default.nix
@@ -4,12 +4,6 @@
 
   cudaPackages,
 
-  cudaPackages_12_0,
-  cudaPackages_12_1,
-  cudaPackages_12_2,
-  cudaPackages_12_3,
-  cudaPackages_12_4,
-  cudaPackages_12_5,
   cudaPackages_12_6,
   cudaPackages_12_8,
   cudaPackages_12_9,
@@ -20,7 +14,6 @@ let
   isTest =
     name: package:
     builtins.elem (package.pname or null) [
-      "cuda-samples"
       "cuda-library-samples"
       "saxpy"
     ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ebf094042002..2f100211c146 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -665,6 +665,12 @@ mapAliases {
   cudaPackages_11_7 = throw "CUDA 11.7 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11_8 = throw "CUDA 11.8 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11 = throw "CUDA 11 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_12_0 = throw "CUDA 12.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_12_1 = throw "CUDA 12.1 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_12_2 = throw "CUDA 12.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_12_3 = throw "CUDA 12.3 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_12_4 = throw "CUDA 12.4 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
+  cudaPackages_12_5 = throw "CUDA 12.5 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
   cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27
   cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b225e5459fb2..e160c065e815 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2651,12 +2651,6 @@ with pkgs;
   # Top-level fix-point used in `cudaPackages`' internals
   _cuda = import ../development/cuda-modules/_cuda;
 
-  cudaPackages_12_0 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.0"; };
-  cudaPackages_12_1 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.1"; };
-  cudaPackages_12_2 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.2"; };
-  cudaPackages_12_3 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.3"; };
-  cudaPackages_12_4 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.4"; };
-  cudaPackages_12_5 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.5"; };
   cudaPackages_12_6 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.6"; };
   cudaPackages_12_8 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.8"; };
   cudaPackages_12_9 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.9"; };
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index a033057e3303..b9fd4eff19ff 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -226,9 +226,6 @@ let
         releasesModule = ../development/cuda-modules/tensorrt/releases.nix;
         shimsFn = ../development/cuda-modules/tensorrt/shims.nix;
       })
-      (import ../development/cuda-modules/cuda-samples/extension.nix {
-        inherit cudaMajorMinorVersion lib stdenv;
-      })
       (import ../development/cuda-modules/cuda-library-samples/extension.nix { inherit lib stdenv; })
     ]
     ++ lib.optionals config.allowAliases [
@@ -241,10 +238,4 @@ let
     fixedPoints.extends composedExtension passthruFunction
   );
 in
-# We want to warn users about the upcoming deprecation of old CUDA
-# versions, without breaking Nixpkgs CI with evaluation warnings. This
-# gross hack ensures that the warning only triggers if aliases are
-# enabled, which is true by default, but not for ofborg.
-lib.warnIf (cudaPackages.cudaOlder "12.0" && config.allowAliases)
-  "CUDA versions older than 12.0 will be removed in Nixpkgs 25.05; see the 24.11 release notes for more information"
-  cudaPackages
+cudaPackages

From ded7bc01f5e8d5bcc30b807d8e66d261edd3b7d2 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2762/3724] bazel_5: drop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

EOL and out of security support for over half a year; only used by
outdated TensorFlow source builds. Since we use `tensorflow-bin`
by default now and CUDA 11 and GCC 12 are both being removed, I
think it’s okay to mark these broken until updates can be finished
and merged.
---
 pkgs/by-name/te/tensorflow-lite/package.nix   |    5 +-
 .../python-modules/tensorflow/default.nix     |    6 +-
 .../bazel/bazel_5/actions_path.patch          |   41 -
 .../bazel/bazel_5/bazel_darwin_sandbox.patch  |   11 -
 .../build-managers/bazel/bazel_5/default.nix  |  763 ------
 .../build-managers/bazel/bazel_5/no-arc.patch |   42 -
 .../bazel/bazel_5/src-deps.json               | 2160 -----------------
 .../bazel/bazel_5/upb-clang16.patch           |   83 -
 .../bazel/bazel_5/update-srcDeps.py           |   54 -
 .../bazel/bazel_darwin_sandbox.patch          |   11 -
 .../build-managers/bazel/nix-hacks.patch      |   43 -
 pkgs/top-level/aliases.nix                    |    1 +
 pkgs/top-level/all-packages.nix               |   14 -
 13 files changed, 9 insertions(+), 3225 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_5/actions_path.patch
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_5/bazel_darwin_sandbox.patch
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_5/upb-clang16.patch
 delete mode 100755 pkgs/development/tools/build-managers/bazel/bazel_5/update-srcDeps.py
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_darwin_sandbox.patch
 delete mode 100644 pkgs/development/tools/build-managers/bazel/nix-hacks.patch

diff --git a/pkgs/by-name/te/tensorflow-lite/package.nix b/pkgs/by-name/te/tensorflow-lite/package.nix
index 26554df0709c..f81420f1e847 100644
--- a/pkgs/by-name/te/tensorflow-lite/package.nix
+++ b/pkgs/by-name/te/tensorflow-lite/package.nix
@@ -42,7 +42,8 @@ buildBazelPackage rec {
     hash = "sha256-Rq5pAVmxlWBVnph20fkAwbfy+iuBNlfFy14poDPd5h0=";
   };
 
-  bazel = buildPackages.bazel_5;
+  #bazel = buildPackages.bazel_5;
+  bazel = buildPackages.bazel;
 
   nativeBuildInputs = [
     pythonEnv
@@ -120,5 +121,7 @@ buildBazelPackage rec {
       "x86_64-linux"
       "aarch64-linux"
     ];
+    # Bazel 5 was removed.
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 6d40fc7d61a1..c2ff10788030 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -1,6 +1,7 @@
 {
   stdenv,
-  bazel_5,
+  #bazel_5,
+  bazel,
   buildBazelPackage,
   lib,
   fetchFromGitHub,
@@ -285,7 +286,8 @@ let
 
   _bazel-build = buildBazelPackage.override { inherit stdenv; } {
     name = "${pname}-${version}";
-    bazel = bazel_5;
+    #bazel = bazel_5;
+    bazel = bazel;
 
     src = fetchFromGitHub {
       owner = "tensorflow";
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/actions_path.patch b/pkgs/development/tools/build-managers/bazel/bazel_5/actions_path.patch
deleted file mode 100644
index 1fa1e5748333..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_5/actions_path.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java
-index 6fff2af..7e2877e 100644
---- a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java
-+++ b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java
-@@ -47,6 +47,16 @@ public final class PosixLocalEnvProvider implements LocalEnvProvider {
-       Map<String, String> env, BinTools binTools, String fallbackTmpDir) {
-     ImmutableMap.Builder<String, String> result = ImmutableMap.builder();
-     result.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR")));
-+
-+    // In case we are running on NixOS.
-+    // If bash is called with an unset PATH on this platform,
-+    // it will set it to /no-such-path and default tools will be missings.
-+    // See, https://github.com/NixOS/nixpkgs/issues/94222
-+    // So we ensure that minimal dependencies are present.
-+    if (!env.containsKey("PATH")){
-+        result.put("PATH", "@actionsPathPatch@");
-+    }
-+ 
-     String p = clientEnv.get("TMPDIR");
-     if (Strings.isNullOrEmpty(p)) {
-       // Do not use `fallbackTmpDir`, use `/tmp` instead. This way if the user didn't export TMPDIR
-index 95642767c6..39d3c62461 100644
---- a/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java
-+++ b/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java
-@@ -74,6 +74,16 @@ public final class XcodeLocalEnvProvider implements LocalEnvProvider {
-
-     ImmutableMap.Builder<String, String> newEnvBuilder = ImmutableMap.builder();
-     newEnvBuilder.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR")));
-+
-+    // In case we are running on NixOS.
-+    // If bash is called with an unset PATH on this platform,
-+    // it will set it to /no-such-path and default tools will be missings.
-+    // See, https://github.com/NixOS/nixpkgs/issues/94222
-+    // So we ensure that minimal dependencies are present.
-+    if (!env.containsKey("PATH")){
-+      newEnvBuilder.put("PATH", "@actionsPathPatch@");
-+    }
-+
-     String p = clientEnv.get("TMPDIR");
-     if (Strings.isNullOrEmpty(p)) {
-       // Do not use `fallbackTmpDir`, use `/tmp` instead. This way if the user didn't export TMPDIR
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/bazel_darwin_sandbox.patch b/pkgs/development/tools/build-managers/bazel/bazel_5/bazel_darwin_sandbox.patch
deleted file mode 100644
index 725b901f893e..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_5/bazel_darwin_sandbox.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru a/src/main/native/unix_jni_darwin.cc b/src/main/native/unix_jni_darwin.cc
---- a/src/main/native/unix_jni_darwin.cc	1980-01-01 00:00:00.000000000 -0500
-+++ b/src/main/native/unix_jni_darwin.cc	2021-11-27 20:35:29.000000000 -0500
-@@ -270,6 +270,7 @@
- }
- 
- void portable_start_suspend_monitoring() {
-+  if (getenv("NIX_BUILD_TOP")) return;
-   static dispatch_once_t once_token;
-   static SuspendState suspend_state;
-   dispatch_once(&once_token, ^{
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
deleted file mode 100644
index de35cd433d58..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
+++ /dev/null
@@ -1,763 +0,0 @@
-{
-  stdenv,
-  callPackage,
-  lib,
-  fetchurl,
-  fetchFromGitHub,
-  installShellFiles,
-  runCommand,
-  runCommandCC,
-  makeWrapper,
-  # this package (through the fixpoint glass)
-  bazel_self,
-  lr,
-  xe,
-  zip,
-  unzip,
-  bash,
-  coreutils,
-  which,
-  gawk,
-  gnused,
-  gnutar,
-  gnugrep,
-  gzip,
-  findutils,
-  # updater
-  python3,
-  writeScript,
-  # Apple dependencies
-  cctools,
-  sigtool,
-  # Allow to independently override the jdks used to build and run respectively
-  buildJdk,
-  runJdk,
-  runtimeShell,
-  # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
-  # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
-  enableNixHacks ? false,
-  file,
-  replaceVars,
-  writeTextFile,
-}:
-
-let
-  version = "5.4.1";
-  sourceRoot = ".";
-
-  src = fetchurl {
-    url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    hash = "sha256-3P9pNXVqp6yk/Fabsr0m4VN/Cx9tG9pfKyAPqDXMUH8=";
-  };
-
-  # Update with
-  # 1. export BAZEL_SELF=$(nix-build -A bazel_5)
-  # 2. update version and hash for sources above
-  # 3. `eval $(nix-build -A bazel_5.updater)`
-  # 4. add new dependencies from the dict in ./src-deps.json if required by failing build
-  srcDeps = lib.attrsets.attrValues srcDepsSet;
-  srcDepsSet =
-    let
-      srcs = lib.importJSON ./src-deps.json;
-      toFetchurl =
-        d:
-        lib.attrsets.nameValuePair d.name (fetchurl {
-          urls = d.urls;
-          sha256 = d.sha256;
-        });
-    in
-    builtins.listToAttrs (
-      map toFetchurl [
-        srcs.desugar_jdk_libs
-        srcs.io_bazel_skydoc
-        srcs.bazel_skylib
-        srcs.bazelci_rules
-        srcs.io_bazel_rules_sass
-        srcs.platforms
-        srcs."remote_java_tools_for_testing"
-        srcs."coverage_output_generator-v2.5.zip"
-        srcs.build_bazel_rules_nodejs
-        srcs."android_tools_pkg-0.23.0.tar.gz"
-        srcs.bazel_toolchains
-        srcs.com_github_grpc_grpc
-        srcs.upb
-        srcs.com_google_protobuf
-        srcs.rules_pkg
-        srcs.rules_cc
-        srcs.rules_java
-        srcs.rules_proto
-        srcs.com_google_absl
-        srcs.com_googlesource_code_re2
-        srcs.com_github_cares_cares
-      ]
-    );
-
-  distDir = runCommand "bazel-deps" { } ''
-    mkdir -p $out
-    for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done
-  '';
-
-  defaultShellUtils =
-    # Keep this list conservative. For more exotic tools, prefer to use
-    # @rules_nixpkgs to pull in tools from the nix repository. Example:
-    #
-    # WORKSPACE:
-    #
-    #     nixpkgs_git_repository(
-    #         name = "nixpkgs",
-    #         revision = "def5124ec8367efdba95a99523dd06d918cb0ae8",
-    #     )
-    #
-    #     # This defines an external Bazel workspace.
-    #     nixpkgs_package(
-    #         name = "bison",
-    #         repositories = { "nixpkgs": "@nixpkgs//:default.nix" },
-    #     )
-    #
-    # some/BUILD.bazel:
-    #
-    #     genrule(
-    #        ...
-    #        cmd = "$(location @bison//:bin/bison) -other -args",
-    #        tools = [
-    #            ...
-    #            "@bison//:bin/bison",
-    #        ],
-    #     )
-    [
-      bash
-      coreutils
-      file
-      findutils
-      gawk
-      gnugrep
-      gnused
-      gnutar
-      gzip
-      python3
-      unzip
-      which
-      zip
-    ];
-
-  defaultShellPath = lib.makeBinPath defaultShellUtils;
-
-  platforms = lib.platforms.linux ++ lib.platforms.darwin;
-
-  system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";
-
-  # on aarch64 Darwin, `uname -m` returns "arm64"
-  arch = with stdenv.hostPlatform; if isDarwin && isAarch64 then "arm64" else parsed.cpu.name;
-
-  bazelRC = writeTextFile {
-    name = "bazel-rc";
-    text = ''
-      startup --server_javabase=${runJdk}
-
-      # Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054
-      # Most commands inherit from 'build' anyway.
-      build --distdir=${distDir}
-      fetch --distdir=${distDir}
-      query --distdir=${distDir}
-
-      build --extra_toolchains=@bazel_tools//tools/jdk:nonprebuilt_toolchain_definition
-      build --tool_java_runtime_version=local_jdk_11
-      build --java_runtime_version=local_jdk_11
-
-      # load default location for the system wide configuration
-      try-import /etc/bazel.bazelrc
-    '';
-  };
-
-in
-stdenv.mkDerivation rec {
-  pname = "bazel";
-  inherit version;
-
-  meta = with lib; {
-    homepage = "https://github.com/bazelbuild/bazel/";
-    description = "Build tool that builds code quickly and reliably";
-    sourceProvenance = with sourceTypes; [
-      fromSource
-      binaryBytecode # source bundles dependencies as jars
-    ];
-    license = licenses.asl20;
-    teams = [ lib.teams.bazel ];
-    mainProgram = "bazel";
-    inherit platforms;
-  };
-
-  inherit src;
-  inherit sourceRoot;
-  patches = [
-    ./upb-clang16.patch
-
-    # On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
-    # This is breaking the build of any C target. This patch removes the last
-    # argument if it's found to be an empty string.
-    ../trim-last-argument-to-gcc-if-empty.patch
-
-    # On Darwin, using clang 6 to build fails because of a linker error (see #105573),
-    # but using clang 7 fails because libarclite_macosx.a cannot be found when linking
-    # the xcode_locator tool.
-    # This patch removes using the -fobjc-arc compiler option and makes the code
-    # compile without automatic reference counting. Caveat: this leaks memory, but
-    # we accept this fact because xcode_locator is only a short-lived process used during the build.
-    (replaceVars ./no-arc.patch {
-      multiBinPatch = if stdenv.hostPlatform.system == "aarch64-darwin" then "arm64" else "x86_64";
-    })
-
-    # --experimental_strict_action_env (which may one day become the default
-    # see bazelbuild/bazel#2574) hardcodes the default
-    # action environment to a non hermetic value (e.g. "/usr/local/bin").
-    # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries.
-    # So we are replacing this bazel paths by defaultShellPath,
-    # improving hermeticity and making it work in nixos.
-    (replaceVars ../strict_action_env.patch {
-      strictActionEnvPatch = defaultShellPath;
-    })
-
-    (replaceVars ./actions_path.patch {
-      actionsPathPatch = defaultShellPath;
-    })
-
-    # bazel reads its system bazelrc in /etc
-    # override this path to a builtin one
-    (replaceVars ../bazel_rc.patch {
-      bazelSystemBazelRCPath = bazelRC;
-    })
-
-    # disable suspend detection during a build inside Nix as this is
-    # not available inside the darwin sandbox
-    ./bazel_darwin_sandbox.patch
-  ]
-  ++ lib.optional enableNixHacks ../nix-hacks.patch;
-
-  # Additional tests that check bazel’s functionality. Execute
-  #
-  #     nix-build . -A bazel_5.tests
-  #
-  # in the nixpkgs checkout root to exercise them locally.
-  passthru.tests =
-    let
-      runLocal =
-        name: attrs: script:
-        let
-          attrs' = removeAttrs attrs [ "buildInputs" ];
-          buildInputs = attrs.buildInputs or [ ];
-        in
-        runCommandCC name (
-          {
-            inherit buildInputs;
-            preferLocalBuild = true;
-            meta.platforms = platforms;
-          }
-          // attrs'
-        ) script;
-
-      # bazel wants to extract itself into $install_dir/install every time it runs,
-      # so let’s do that only once.
-      extracted =
-        bazelPkg:
-        let
-          install_dir =
-            # `install_base` field printed by `bazel info`, minus the hash.
-            # yes, this path is kinda magic. Sorry.
-            "$HOME/.cache/bazel/_bazel_nixbld";
-        in
-        runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } ''
-          export HOME=$(mktemp -d)
-          touch WORKSPACE # yeah, everything sucks
-          install_base="$(${bazelPkg}/bin/bazel info | grep install_base)"
-          # assert it’s actually below install_dir
-          [[ "$install_base" =~ ${install_dir} ]] \
-            || (echo "oh no! $install_base but we are \
-          trying to copy ${install_dir} to $out instead!"; exit 1)
-          cp -R ${install_dir} $out
-        '';
-
-      bazelTest =
-        {
-          name,
-          bazelScript,
-          workspaceDir,
-          bazelPkg,
-          buildInputs ? [ ],
-        }:
-        let
-          be = extracted bazelPkg;
-        in
-        runLocal name { inherit buildInputs; } (
-          # skip extraction caching on Darwin, because nobody knows how Darwin works
-          (lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-            # set up home with pre-unpacked bazel
-            export HOME=$(mktemp -d)
-            mkdir -p ${be.install_dir}
-            cp -R ${be}/install ${be.install_dir}
-
-            # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6
-            # Bazel checks whether the mtime of the install dir files
-            # is >9 years in the future, otherwise it extracts itself again.
-            # see PosixFileMTime::IsUntampered in src/main/cpp/util
-            # What the hell bazel.
-            ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {}
-          '')
-          + ''
-            # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609
-            # about why to create a subdir for the workspace.
-            cp -r ${workspaceDir} wd && chmod u+w wd && cd wd
-
-            ${bazelScript}
-
-            touch $out
-          ''
-        );
-
-      bazelWithNixHacks = bazel_self.override { enableNixHacks = true; };
-
-      bazel-examples = fetchFromGitHub {
-        owner = "bazelbuild";
-        repo = "examples";
-        rev = "4183fc709c26a00366665e2d60d70521dc0b405d";
-        sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k";
-      };
-
-    in
-    (lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
-      # `extracted` doesn’t work on darwin
-      shebang = callPackage ../shebang-test.nix {
-        inherit
-          runLocal
-          extracted
-          bazelTest
-          distDir
-          ;
-        bazel = bazel_self;
-      };
-    })
-    // {
-      bashTools = callPackage ../bash-tools-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazel_self;
-      };
-      cpp = callPackage ../cpp-test.nix {
-        inherit
-          runLocal
-          bazelTest
-          bazel-examples
-          distDir
-          ;
-        bazel = bazel_self;
-      };
-      java = callPackage ../java-test.nix {
-        inherit
-          runLocal
-          bazelTest
-          bazel-examples
-          distDir
-          ;
-        bazel = bazel_self;
-      };
-      protobuf = callPackage ../protobuf-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazel_self;
-      };
-      pythonBinPath = callPackage ../python-bin-path-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazel_self;
-      };
-
-      bashToolsWithNixHacks = callPackage ../bash-tools-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazelWithNixHacks;
-      };
-
-      cppWithNixHacks = callPackage ../cpp-test.nix {
-        inherit
-          runLocal
-          bazelTest
-          bazel-examples
-          distDir
-          ;
-        bazel = bazelWithNixHacks;
-      };
-      javaWithNixHacks = callPackage ../java-test.nix {
-        inherit
-          runLocal
-          bazelTest
-          bazel-examples
-          distDir
-          ;
-        bazel = bazelWithNixHacks;
-      };
-      protobufWithNixHacks = callPackage ../protobuf-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazelWithNixHacks;
-      };
-      pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazelWithNixHacks;
-      };
-    };
-
-  src_for_updater = stdenv.mkDerivation {
-    name = "updater-sources";
-    inherit src;
-    nativeBuildInputs = [ unzip ];
-    inherit sourceRoot;
-    installPhase = ''
-      runHook preInstall
-
-      cp -r . "$out"
-
-      runHook postInstall
-    '';
-  };
-  # update the list of workspace dependencies
-  passthru.updater = writeScript "update-bazel-deps.sh" ''
-    #!${runtimeShell}
-    (cd "${src_for_updater}" &&
-        BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
-        "$BAZEL_SELF"/bin/bazel \
-            query 'kind(http_archive, //external:*) + kind(http_file, //external:*) + kind(distdir_tar, //external:*) + kind(git_repository, //external:*)' \
-            --loading_phase_threads=1 \
-            --output build) \
-    | "${python3}"/bin/python3 "${./update-srcDeps.py}" \
-      "${builtins.toString ./src-deps.json}"
-  '';
-
-  # Necessary for the tests to pass on Darwin with sandbox enabled.
-  # Bazel starts a local server and needs to bind a local address.
-  __darwinAllowLocalNetworking = true;
-
-  postPatch =
-    let
-
-      darwinPatches = ''
-        bazelLinkFlags () {
-          eval set -- "$NIX_LDFLAGS"
-          local flag
-          for flag in "$@"; do
-            printf ' -Wl,%s' "$flag"
-          done
-        }
-
-        # Disable Bazel's Xcode toolchain detection which would configure compilers
-        # and linkers from Xcode instead of from PATH
-        export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
-
-        # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
-        export GCOV=${coreutils}/bin/false
-
-        # libcxx includes aren't added by libcxx hook
-        # https://github.com/NixOS/nixpkgs/pull/41589
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
-        # for CLang 16 compatibility in external/{absl,upb} dependencies and in execlog
-        export NIX_CFLAGS_COMPILE+=" -Wno-deprecated-builtins -Wno-gnu-offsetof-extensions -Wno-implicit-function-declaration"
-
-        # don't use system installed Xcode to run clang, use Nix clang instead
-        sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
-          scripts/bootstrap/compile.sh \
-          tools/osx/BUILD
-
-        substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' ""
-
-        # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead
-        sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc
-
-        # clang installed from Xcode has a compatibility wrapper that forwards
-        # invocations of gcc to clang, but vanilla clang doesn't
-        sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
-        sed -i -e 's;env -i codesign --identifier $@ --force --sign;env -i CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${sigtool}/bin/codesign --identifier $@ --force -s;g' tools/osx/BUILD
-        sed -i -e 's;"/usr/bin/libtool";_find_generic(repository_ctx, "libtool", "LIBTOOL", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
-        wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl )
-        for wrapper in "''${wrappers[@]}"; do
-          sed -i -e "s,/usr/bin/gcc,${stdenv.cc}/bin/clang,g" $wrapper
-          sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
-        done
-      '';
-
-      genericPatches = ''
-        # Substitute j2objc and objc wrapper's python shebang to plain python path.
-        substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
-        substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
-        substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
-
-        # md5sum is part of coreutils
-        sed -i 's|/sbin/md5|md5sum|g' \
-          src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh
-
-        # replace initial value of pythonShebang variable in BazelPythonSemantics.java
-        substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \
-          --replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\""
-
-        substituteInPlace src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/PyRuntimeInfoApi.java \
-          --replace '"#!/usr/bin/env python3"' "\"#!${python3}/bin/python\""
-
-        # substituteInPlace is rather slow, so prefilter the files with grep
-        grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
-          # If you add more replacements here, you must change the grep above!
-          # Only files containing /bin are taken into account.
-          substituteInPlace "$path" \
-            --replace /bin/bash ${bash}/bin/bash \
-            --replace "/usr/bin/env bash" ${bash}/bin/bash \
-            --replace "/usr/bin/env python" ${python3}/bin/python \
-            --replace /usr/bin/env ${coreutils}/bin/env \
-            --replace /bin/true ${coreutils}/bin/true
-        done
-
-        grep -rlZ /bin/ tools/python | while IFS="" read -r -d "" path; do
-          substituteInPlace "$path" \
-            --replace "/usr/bin/env python2" ${python3.interpreter} \
-            --replace "/usr/bin/env python3" ${python3}/bin/python \
-            --replace /usr/bin/env ${coreutils}/bin/env
-        done
-
-        # bazel test runner include references to /bin/bash
-        substituteInPlace tools/build_rules/test_rules.bzl \
-          --replace /bin/bash ${bash}/bin/bash
-
-        for i in $(find tools/cpp/ -type f)
-        do
-          substituteInPlace $i \
-            --replace /bin/bash ${bash}/bin/bash
-        done
-
-        # Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
-        substituteInPlace scripts/bootstrap/compile.sh \
-            --replace /bin/bash ${bash}/bin/bash
-
-        # add nix environment vars to .bazelrc
-        cat >> .bazelrc <<EOF
-        # Limit the resources Bazel is allowed to use during the build to 1/2 the
-        # available RAM and 3/4 the available CPU cores. This should help avoid
-        # overwhelming the build machine.
-        build --local_ram_resources=HOST_RAM*.5
-        build --local_cpu_resources=HOST_CPUS*.75
-
-        build --distdir=${distDir}
-        fetch --distdir=${distDir}
-        build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')"
-        build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')"
-        build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')"
-        build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')"
-        build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')"
-        build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')"
-        build --extra_toolchains=@bazel_tools//tools/jdk:nonprebuilt_toolchain_definition
-        build --verbose_failures
-        build --curses=no
-        build --features=-layering_check
-        EOF
-
-        cat >> tools/jdk/BUILD.tools <<EOF
-        load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain", "NONPREBUILT_TOOLCHAIN_CONFIGURATION")
-        default_java_toolchain(
-          name = "nonprebuilt_toolchain",
-          configuration = NONPREBUILT_TOOLCHAIN_CONFIGURATION,
-          java_runtime = "@local_jdk//:jdk",
-        )
-        EOF
-
-        cat >> third_party/grpc/bazel_1.41.0.patch <<EOF
-        diff --git a/third_party/grpc/BUILD b/third_party/grpc/BUILD
-        index 39ee9f97c6..9128d20c85 100644
-        --- a/third_party/grpc/BUILD
-        +++ b/third_party/grpc/BUILD
-        @@ -28,7 +28,6 @@ licenses(["notice"])
-         package(
-             default_visibility = ["//visibility:public"],
-             features = [
-        -        "layering_check",
-                 "-parse_headers",
-             ],
-         )
-        EOF
-
-        # add the same environment vars to compile.sh
-        sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \
-            -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \
-            -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \
-            -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \
-            -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \
-            -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \
-            -e "/\$command \\\\$/a --tool_java_runtime_version=local_jdk_11 \\\\" \
-            -e "/\$command \\\\$/a --java_runtime_version=local_jdk_11 \\\\" \
-            -e "/\$command \\\\$/a --verbose_failures \\\\" \
-            -e "/\$command \\\\$/a --curses=no \\\\" \
-            -e "/\$command \\\\$/a --features=-layering_check \\\\" \
-            -i scripts/bootstrap/compile.sh
-
-        # This is necessary to avoid:
-        # "error: no visible @interface for 'NSDictionary' declares the selector
-        # 'initWithContentsOfURL:error:'"
-        # This can be removed when the apple_sdk is upgraded beyond 10.13+
-        sed -i '/initWithContentsOfURL:versionPlistUrl/ {
-          N
-          s/error:nil\];/\];/
-        }' tools/osx/xcode_locator.m
-
-        # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash
-        echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp
-        cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp
-        mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
-
-        patchShebangs .
-      '';
-    in
-    lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches + genericPatches;
-
-  buildInputs = [ buildJdk ] ++ defaultShellUtils;
-
-  # when a command can’t be found in a bazel build, you might also
-  # need to add it to `defaultShellPath`.
-  nativeBuildInputs = [
-    installShellFiles
-    makeWrapper
-    python3
-    unzip
-    which
-    zip
-    python3.pkgs.absl-py # Needed to build fish completion
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-    cctools
-  ];
-
-  # Bazel makes extensive use of symlinks in the WORKSPACE.
-  # This causes problems with infinite symlinks if the build output is in the same location as the
-  # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a
-  # subdirectory.
-  # Failing to do this causes "infinite symlink expansion detected"
-  preBuildPhases = [ "preBuildPhase" ];
-  preBuildPhase = ''
-    mkdir bazel_src
-    shopt -s dotglob extglob
-    mv !(bazel_src) bazel_src
-  '';
-  buildPhase = ''
-    runHook preBuild
-
-    # Increasing memory during compilation might be necessary.
-    # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m"
-
-    # If EMBED_LABEL isn't set, it'd be auto-detected from CHANGELOG.md
-    # and `git rev-parse --short HEAD` which would result in
-    # "3.7.0- (@non-git)" due to non-git build and incomplete changelog.
-    # Actual bazel releases use scripts/release/common.sh which is based
-    # on branch/tag information which we don't have with tarball releases.
-    # Note that .bazelversion is always correct and is based on bazel-*
-    # executable name, version checks should work fine
-    export EMBED_LABEL="${version}- (@non-git)"
-    ${bash}/bin/bash ./bazel_src/compile.sh
-    ./bazel_src/scripts/generate_bash_completion.sh \
-        --bazel=./bazel_src/output/bazel \
-        --output=./bazel_src/output/bazel-complete.bash \
-        --prepend=./bazel_src/scripts/bazel-complete-header.bash \
-        --prepend=./bazel_src/scripts/bazel-complete-template.bash
-    ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \
-        --bazel=./bazel_src/output/bazel \
-        --output=./bazel_src/output/bazel-complete.fish
-
-    # need to change directory for bazel to find the workspace
-    cd ./bazel_src
-    # build execlog tooling
-    export HOME=$(mktemp -d)
-    ./output/bazel build  src/tools/execlog:parser_deploy.jar
-    cd -
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-
-    # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel
-    # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch}
-    # The binary _must_ exist with this naming if your project contains a .bazelversion
-    # file.
-    cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
-    wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath}
-    mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
-
-    mkdir $out/share
-    cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar
-    cat <<EOF > $out/bin/bazel-execlog
-    #!${runtimeShell} -e
-    ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@
-    EOF
-    chmod +x $out/bin/bazel-execlog
-
-    # shell completion files
-    installShellCompletion --bash \
-      --name bazel.bash \
-      ./bazel_src/output/bazel-complete.bash
-    installShellCompletion --zsh \
-      --name _bazel \
-      ./bazel_src/scripts/zsh_completion/_bazel
-    installShellCompletion --fish \
-      --name bazel.fish \
-      ./bazel_src/output/bazel-complete.fish
-
-    runHook postInstall
-  '';
-
-  # Install check fails on `aarch64-darwin`
-  # https://github.com/NixOS/nixpkgs/issues/145587
-  doInstallCheck = stdenv.hostPlatform.system != "aarch64-darwin";
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    export TEST_TMPDIR=$(pwd)
-
-    hello_test () {
-      $out/bin/bazel test \
-        --test_output=errors \
-        examples/cpp:hello-success_test \
-        examples/java-native/src/test/java/com/example/myproject:hello
-    }
-
-    cd ./bazel_src
-    rm .bazelversion # this doesn't necessarily match the version we built
-
-    # test whether $WORKSPACE_ROOT/tools/bazel works
-
-    mkdir -p tools
-    cat > tools/bazel <<"EOF"
-    #!${runtimeShell} -e
-    exit 1
-    EOF
-    chmod +x tools/bazel
-
-    # first call should fail if tools/bazel is used
-    ! hello_test
-
-    cat > tools/bazel <<"EOF"
-    #!${runtimeShell} -e
-    exec "$BAZEL_REAL" "$@"
-    EOF
-
-    # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch}
-    hello_test
-
-    runHook postInstallCheck
-  '';
-
-  # Save paths to hardcoded dependencies so Nix can detect them.
-  # This is needed because the templates get tar’d up into a .jar.
-  postFixup = ''
-    mkdir -p $out/nix-support
-    echo "${defaultShellPath}" >> $out/nix-support/depends
-    # The string literal specifying the path to the bazel-rc file is sometimes
-    # stored non-contiguously in the binary due to gcc optimisations, which leads
-    # Nix to miss the hash when scanning for dependencies
-    echo "${bazelRC}" >> $out/nix-support/depends
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    echo "${cctools}" >> $out/nix-support/depends
-  '';
-
-  dontStrip = true;
-  dontPatchELF = true;
-}
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch b/pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch
deleted file mode 100644
index e7a4498839dc..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/tools/osx/BUILD b/tools/osx/BUILD
-index 990afe3e8c..cd5b7b1b7a 100644
---- a/tools/osx/BUILD
-+++ b/tools/osx/BUILD
-@@ -28,8 +28,8 @@ exports_files([
- ])
- 
- DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
--  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
--      -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \
-+  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -framework CoreServices \
-+      -framework Foundation -arch @multiBinPatch@ -Wl,-no_uuid -o $@ $< && \
-   env -i codesign --identifier $@ --force --sign - $@
- """
- 
-diff --git a/tools/osx/xcode_configure.bzl b/tools/osx/xcode_configure.bzl
-index 2b819f07ec..a98ce37673 100644
---- a/tools/osx/xcode_configure.bzl
-+++ b/tools/osx/xcode_configure.bzl
-@@ -127,7 +127,6 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label):
-         "macosx",
-         "clang",
-         "-mmacosx-version-min=10.13",
--        "-fobjc-arc",
-         "-framework",
-         "CoreServices",
-         "-framework",
-diff --git a/tools/osx/xcode_locator.m b/tools/osx/xcode_locator.m
-index ed2ef87453..e0ce6dbdd1 100644
---- a/tools/osx/xcode_locator.m
-+++ b/tools/osx/xcode_locator.m
-@@ -21,10 +21,6 @@
- // 6,6.4,6.4.1 = 6.4.1
- // 6.3,6.3.0 = 6.3
- 
--#if !defined(__has_feature) || !__has_feature(objc_arc)
--#error "This file requires ARC support."
--#endif
--
- #import <CoreServices/CoreServices.h>
- #import <Foundation/Foundation.h>
- 
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json
deleted file mode 100644
index 042c06ed74d7..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json
+++ /dev/null
@@ -1,2160 +0,0 @@
-{
-    "1.25.0.zip": {
-        "name": "1.25.0.zip",
-        "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip",
-            "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip"
-        ]
-    },
-    "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": {
-        "name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
-        "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
-            "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
-        ]
-    },
-    "20211102.0.tar.gz": {
-        "name": "20211102.0.tar.gz",
-        "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4",
-        "urls": [
-            "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
-            "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz"
-        ]
-    },
-    "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz": {
-        "name": "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz",
-        "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4",
-        "urls": [
-            "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz",
-            "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz"
-        ]
-    },
-    "5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip": {
-        "name": "5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip",
-        "sha256": "299452e6f4a4981b2e6d22357f7332713382a63e4c137f5fd6b89579f6d610cb",
-        "urls": [
-            "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip",
-            "https://github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip"
-        ]
-    },
-    "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": {
-        "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
-        "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
-            "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
-        ]
-    },
-    "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz": {
-        "name": "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
-        "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
-            "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz"
-        ]
-    },
-    "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": {
-        "name": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz",
-        "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e",
-        "urls": [
-            "https://mirror.bazel.build/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz",
-            "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz"
-        ]
-    },
-    "android_tools": {
-        "name": "android_tools",
-        "sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e",
-        "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz"
-    },
-    "android_tools_for_testing": {
-        "name": "android_tools_for_testing",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e",
-        "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz"
-    },
-    "android_tools_pkg-0.23.0.tar.gz": {
-        "name": "android_tools_pkg-0.23.0.tar.gz",
-        "sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e",
-        "urls": [
-            "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz"
-        ]
-    },
-    "b1c40e1de81913a3c40e5948f78719c28152486d.zip": {
-        "name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip",
-        "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip",
-            "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip"
-        ]
-    },
-    "bazel-skylib-1.0.3.tar.gz": {
-        "name": "bazel-skylib-1.0.3.tar.gz",
-        "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz"
-        ]
-    },
-    "bazel_compdb": {
-        "generator_function": "grpc_deps",
-        "generator_name": "bazel_compdb",
-        "name": "bazel_compdb",
-        "sha256": "bcecfd622c4ef272fd4ba42726a52e140b961c4eac23025f18b346c968a8cfb4",
-        "strip_prefix": "bazel-compilation-database-0.4.5",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/grailbio/bazel-compilation-database/archive/0.4.5.tar.gz",
-            "https://github.com/grailbio/bazel-compilation-database/archive/0.4.5.tar.gz"
-        ]
-    },
-    "bazel_gazelle": {
-        "generator_function": "grpc_deps",
-        "generator_name": "bazel_gazelle",
-        "name": "bazel_gazelle",
-        "sha256": "d987004a72697334a095bbaa18d615804a28280201a50ed6c234c40ccc41e493",
-        "strip_prefix": "bazel-gazelle-0.19.1",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/bazel-gazelle/archive/v0.19.1.tar.gz",
-            "https://github.com/bazelbuild/bazel-gazelle/archive/v0.19.1.tar.gz"
-        ]
-    },
-    "bazel_j2objc": {
-        "name": "bazel_j2objc",
-        "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b",
-        "strip_prefix": "j2objc-2.5",
-        "urls": [
-            "https://mirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip",
-            "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip"
-        ]
-    },
-    "bazel_skylib": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "bazel_skylib",
-        "name": "bazel_skylib",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz"
-        ]
-    },
-    "bazel_toolchains": {
-        "generator_function": "grpc_deps",
-        "generator_name": "bazel_toolchains",
-        "name": "bazel_toolchains",
-        "sha256": "0b36eef8a66f39c8dbae88e522d5bbbef49d5e66e834a982402c79962281be10",
-        "strip_prefix": "bazel-toolchains-1.0.1",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/1.0.1.tar.gz",
-            "https://github.com/bazelbuild/bazel-toolchains/releases/download/1.0.1/bazel-toolchains-1.0.1.tar.gz"
-        ]
-    },
-    "bazel_website": {
-        "build_file_content": "\nexports_files([\"_sass/style.scss\"])\n",
-        "name": "bazel_website",
-        "sha256": "a5f531dd1d62e6947dcfc279656ffc2fdf6f447c163914c5eabf7961b4cb6eb4",
-        "strip_prefix": "bazel-website-c174fa288aa079b68416d2ce2cc97268fa172f42",
-        "urls": [
-            "https://github.com/bazelbuild/bazel-website/archive/c174fa288aa079b68416d2ce2cc97268fa172f42.tar.gz"
-        ]
-    },
-    "bazelci_rules": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "bazelci_rules",
-        "name": "bazelci_rules",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e",
-        "strip_prefix": "bazelci_rules-1.0.0",
-        "urls": [
-            "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz"
-        ]
-    },
-    "bazelci_rules-1.0.0.tar.gz": {
-        "name": "bazelci_rules-1.0.0.tar.gz",
-        "sha256": "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e",
-        "urls": [
-            "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz"
-        ]
-    },
-    "boringssl": {
-        "generator_function": "grpc_deps",
-        "generator_name": "boringssl",
-        "name": "boringssl",
-        "sha256": "6f640262999cd1fb33cf705922e453e835d2d20f3f06fe0d77f6426c19257308",
-        "strip_prefix": "boringssl-fc44652a42b396e1645d5e72aba053349992136a",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/fc44652a42b396e1645d5e72aba053349992136a.tar.gz",
-            "https://github.com/google/boringssl/archive/fc44652a42b396e1645d5e72aba053349992136a.tar.gz"
-        ]
-    },
-    "build_bazel_apple_support": {
-        "generator_function": "grpc_deps",
-        "generator_name": "build_bazel_apple_support",
-        "name": "build_bazel_apple_support",
-        "sha256": "122ebf7fe7d1c8e938af6aeaee0efe788a3a2449ece5a8d6a428cb18d6f88033",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz",
-            "https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz"
-        ]
-    },
-    "build_bazel_rules_apple": {
-        "generator_function": "grpc_deps",
-        "generator_name": "build_bazel_rules_apple",
-        "name": "build_bazel_rules_apple",
-        "sha256": "bdc8e66e70b8a75da23b79f1f8c6207356df07d041d96d2189add7ee0780cf4e",
-        "strip_prefix": "rules_apple-b869b0d3868d78a1d4ffd866ccb304fb68aa12c3",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz",
-            "https://github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz"
-        ]
-    },
-    "build_bazel_rules_nodejs": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "build_bazel_rules_nodejs",
-        "name": "build_bazel_rules_nodejs",
-        "sha256": "f2194102720e662dbf193546585d705e645314319554c6ce7e47d8b59f459e9c",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz",
-            "https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz"
-        ]
-    },
-    "com_envoyproxy_protoc_gen_validate": {
-        "generator_function": "grpc_deps",
-        "generator_name": "com_envoyproxy_protoc_gen_validate",
-        "name": "com_envoyproxy_protoc_gen_validate",
-        "sha256": "dd4962e4a9e8388a4fbc5c33e64d73bdb222f103e4bad40ca5535f81c2c606c2",
-        "strip_prefix": "protoc-gen-validate-59da36e59fef2267fc2b1849a05159e3ecdf24f3",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/protoc-gen-validate/archive/59da36e59fef2267fc2b1849a05159e3ecdf24f3.tar.gz",
-            "https://github.com/envoyproxy/protoc-gen-validate/archive/59da36e59fef2267fc2b1849a05159e3ecdf24f3.tar.gz"
-        ]
-    },
-    "com_github_cares_cares": {
-        "build_file": "@com_github_grpc_grpc//third_party:cares/cares.BUILD",
-        "generator_function": "grpc_deps",
-        "generator_name": "com_github_cares_cares",
-        "name": "com_github_cares_cares",
-        "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a",
-        "strip_prefix": "c-ares-e982924acee7f7313b4baa4ee5ec000c5e373c30",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
-            "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz"
-        ]
-    },
-    "com_github_google_benchmark": {
-        "generator_function": "grpc_deps",
-        "generator_name": "com_github_google_benchmark",
-        "name": "com_github_google_benchmark",
-        "sha256": "daa4a97e0547d76de300e325a49177b199f3689ce5a35e25d47696f7cb050f86",
-        "strip_prefix": "benchmark-73d4d5e8d6d449fc8663765a42aa8aeeee844489",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/73d4d5e8d6d449fc8663765a42aa8aeeee844489.tar.gz",
-            "https://github.com/google/benchmark/archive/73d4d5e8d6d449fc8663765a42aa8aeeee844489.tar.gz"
-        ]
-    },
-    "com_github_grpc_grpc": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "com_github_grpc_grpc",
-        "name": "com_github_grpc_grpc",
-        "patch_args": [
-            "-p1"
-        ],
-        "patches": [
-            "//third_party/grpc:grpc_1.41.0.patch",
-            "//third_party/grpc:grpc_1.41.0.win_arm64.patch"
-        ],
-        "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656",
-        "strip_prefix": "grpc-1.41.0",
-        "urls": [
-            "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.41.0.tar.gz",
-            "https://github.com/grpc/grpc/archive/v1.41.0.tar.gz"
-        ]
-    },
-    "com_google_absl": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "com_google_absl",
-        "name": "com_google_absl",
-        "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4",
-        "strip_prefix": "abseil-cpp-20211102.0",
-        "urls": [
-            "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
-            "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz"
-        ]
-    },
-    "com_google_googleapis": {
-        "generator_function": "grpc_deps",
-        "generator_name": "com_google_googleapis",
-        "name": "com_google_googleapis",
-        "sha256": "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0",
-        "strip_prefix": "googleapis-2f9af297c84c55c8b871ba4495e01ade42476c92",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz",
-            "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz"
-        ]
-    },
-    "com_google_googletest": {
-        "name": "com_google_googletest",
-        "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",
-        "strip_prefix": "googletest-release-1.10.0",
-        "urls": [
-            "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz",
-            "https://github.com/google/googletest/archive/release-1.10.0.tar.gz"
-        ]
-    },
-    "com_google_protobuf": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "com_google_protobuf",
-        "name": "com_google_protobuf",
-        "patch_args": [
-            "-p1"
-        ],
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "patches": [
-            "//third_party/protobuf:3.13.0.patch"
-        ],
-        "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
-        "strip_prefix": "protobuf-3.13.0",
-        "urls": [
-            "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
-            "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz"
-        ]
-    },
-    "com_google_testparameterinjector": {
-        "build_file_content": "\njava_library(\n    name = \"testparameterinjector\",\n    testonly = True,\n    srcs = glob([\"src/main/**/*.java\"]),\n    deps = [\n      \"@org_snakeyaml//:snakeyaml\",\n      \"@//third_party:auto_value\",\n      \"@//third_party:guava\",\n      \"@//third_party:junit4\",\n      \"@//third_party/protobuf:protobuf_java\",\n    ],\n    visibility = [\"//visibility:public\"],\n)\n",
-        "name": "com_google_testparameterinjector",
-        "sha256": "562a0e87eb413a7dcad29ebc8d578f6f97503473943585b051c1398a58189b06",
-        "strip_prefix": "TestParameterInjector-1.0",
-        "urls": [
-            "https://mirror.bazel.build/github.com/google/TestParameterInjector/archive/v1.0.tar.gz",
-            "https://github.com/google/TestParameterInjector/archive/v1.0.tar.gz"
-        ]
-    },
-    "com_googlesource_code_re2": {
-        "generator_function": "grpc_deps",
-        "generator_name": "com_googlesource_code_re2",
-        "name": "com_googlesource_code_re2",
-        "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e",
-        "strip_prefix": "re2-aecba11114cf1fac5497aeb844b6966106de3eb6",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz",
-            "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz"
-        ]
-    },
-    "coverage_output_generator-v2.5.zip": {
-        "name": "coverage_output_generator-v2.5.zip",
-        "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
-        "urls": [
-            "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"
-        ]
-    },
-    "cython": {
-        "build_file": "@com_github_grpc_grpc//third_party:cython.BUILD",
-        "generator_function": "grpc_deps",
-        "generator_name": "cython",
-        "name": "cython",
-        "sha256": "e2e38e1f0572ca54d6085df3dec8b607d20e81515fb80215aed19c81e8fe2079",
-        "strip_prefix": "cython-0.29.21",
-        "urls": [
-            "https://github.com/cython/cython/archive/0.29.21.tar.gz"
-        ]
-    },
-    "desugar_jdk_libs": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "desugar_jdk_libs",
-        "name": "desugar_jdk_libs",
-        "sha256": "299452e6f4a4981b2e6d22357f7332713382a63e4c137f5fd6b89579f6d610cb",
-        "strip_prefix": "desugar_jdk_libs-5847d6a06302136d95a14b4cbd4b55a9c9f1436e",
-        "urls": [
-            "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip",
-            "https://github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip"
-        ]
-    },
-    "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": {
-        "name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
-        "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a",
-        "urls": [
-            "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
-            "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz"
-        ]
-    },
-    "enum34": {
-        "build_file": "@com_github_grpc_grpc//third_party:enum34.BUILD",
-        "generator_function": "grpc_deps",
-        "generator_name": "enum34",
-        "name": "enum34",
-        "sha256": "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1",
-        "strip_prefix": "enum34-1.1.6",
-        "urls": [
-            "https://files.pythonhosted.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz"
-        ]
-    },
-    "envoy_api": {
-        "generator_function": "grpc_deps",
-        "generator_name": "envoy_api",
-        "name": "envoy_api",
-        "sha256": "330f2f9c938fc038b7ab438919b692d30cdfba3cf596e7824410f88da16c30b5",
-        "strip_prefix": "data-plane-api-2f0d081fab0b0823f088c6e368f40e1992f46fcd",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/2f0d081fab0b0823f088c6e368f40e1992f46fcd.tar.gz",
-            "https://github.com/envoyproxy/data-plane-api/archive/2f0d081fab0b0823f088c6e368f40e1992f46fcd.tar.gz"
-        ]
-    },
-    "futures": {
-        "build_file": "@com_github_grpc_grpc//third_party:futures.BUILD",
-        "generator_function": "grpc_deps",
-        "generator_name": "futures",
-        "name": "futures",
-        "sha256": "7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794",
-        "strip_prefix": "futures-3.3.0",
-        "urls": [
-            "https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00/futures-3.3.0.tar.gz"
-        ]
-    },
-    "io_bazel_rules_go": {
-        "generator_function": "grpc_deps",
-        "generator_name": "io_bazel_rules_go",
-        "name": "io_bazel_rules_go",
-        "sha256": "dbf5a9ef855684f84cac2e7ae7886c5a001d4f66ae23f6904da0faaaef0d61fc",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.24.11/rules_go-v0.24.11.tar.gz",
-            "https://github.com/bazelbuild/rules_go/releases/download/v0.24.11/rules_go-v0.24.11.tar.gz"
-        ]
-    },
-    "io_bazel_rules_python": {
-        "generator_function": "grpc_deps",
-        "generator_name": "io_bazel_rules_python",
-        "name": "io_bazel_rules_python",
-        "sha256": "aa96a691d3a8177f3215b14b0edc9641787abaaa30363a080165d06ab65e1161",
-        "url": "https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz"
-    },
-    "io_bazel_rules_sass": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "io_bazel_rules_sass",
-        "name": "io_bazel_rules_sass",
-        "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647",
-        "strip_prefix": "rules_sass-1.25.0",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip",
-            "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip"
-        ]
-    },
-    "io_bazel_skydoc": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "io_bazel_skydoc",
-        "name": "io_bazel_skydoc",
-        "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
-        "strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
-            "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
-        ]
-    },
-    "io_opencensus_cpp": {
-        "generator_function": "grpc_deps",
-        "generator_name": "io_opencensus_cpp",
-        "name": "io_opencensus_cpp",
-        "sha256": "90d6fafa8b1a2ea613bf662731d3086e1c2ed286f458a95c81744df2dbae41b1",
-        "strip_prefix": "opencensus-cpp-c9a4da319bc669a772928ffc55af4a61be1a1176",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz",
-            "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz"
-        ]
-    },
-    "java_tools-v11.7.1.zip": {
-        "name": "java_tools-v11.7.1.zip",
-        "sha256": "2eede49b2d80135e0ea22180f63df26db2ed4b795c1c041b25cc653d6019fbec",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools-v11.7.1.zip"
-        ]
-    },
-    "java_tools_darwin-v11.7.1.zip": {
-        "name": "java_tools_darwin-v11.7.1.zip",
-        "sha256": "4d6d388b54ad3b9aa35b30dd67af8d71c4c240df8cfb5000bbec67bdd5c53a73",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_darwin-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_darwin-v11.7.1.zip"
-        ]
-    },
-    "java_tools_langtools_javac11": {
-        "name": "java_tools_langtools_javac11",
-        "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip"
-        ]
-    },
-    "java_tools_linux-v11.7.1.zip": {
-        "name": "java_tools_linux-v11.7.1.zip",
-        "sha256": "f78077f0c043d0d13c82de0ee4a99753e66bb18ec46e3601fa2a10e7f26798a8",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_linux-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_linux-v11.7.1.zip"
-        ]
-    },
-    "java_tools_windows-v11.7.1.zip": {
-        "name": "java_tools_windows-v11.7.1.zip",
-        "sha256": "a7086734866505292ee4c206328c73c6af127e69bd51b98c9c186ae4b9b6d2db",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_windows-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_windows-v11.7.1.zip"
-        ]
-    },
-    "jekyll_tree_0_17_1": {
-        "name": "jekyll_tree_0_17_1",
-        "sha256": "02256ddd20eeaf70cf8fcfe9b2cdddd7be87aedd5848d549474fb0358e0031d3",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.17.1.tar"
-        ]
-    },
-    "jekyll_tree_0_17_2": {
-        "name": "jekyll_tree_0_17_2",
-        "sha256": "13b35dd309a0d52f0a2518a1193f42729c75255f5fae40cea68e4d4224bfaa2e",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.17.2.tar"
-        ]
-    },
-    "jekyll_tree_0_18_1": {
-        "name": "jekyll_tree_0_18_1",
-        "sha256": "98b77f48e37a50fc6f83100bf53f661e10732bb3ddbc226e02d0225cb7a9a7d8",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.18.1.tar"
-        ]
-    },
-    "jekyll_tree_0_19_1": {
-        "name": "jekyll_tree_0_19_1",
-        "sha256": "ec892c59ba18bb8de1f9ae2bde937db144e45f28d6d1c32a2cee847ee81b134d",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.19.1.tar"
-        ]
-    },
-    "jekyll_tree_0_19_2": {
-        "name": "jekyll_tree_0_19_2",
-        "sha256": "3c2d9f21ec2fd1c0b8a310f6eb6043027c838810cdfc2457d4346a0e5cdcaa7a",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.19.2.tar"
-        ]
-    },
-    "jekyll_tree_0_20_0": {
-        "name": "jekyll_tree_0_20_0",
-        "sha256": "bb79a63810bf1b0aa1f89bd3bbbeb4a547a30ab9af70c9be656cc6866f4b015b",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.20.0.tar"
-        ]
-    },
-    "jekyll_tree_0_21_0": {
-        "name": "jekyll_tree_0_21_0",
-        "sha256": "23ec39c0138d358c544151e5c81586716d5d1c6124f10a742bead70516e6eb93",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.21.0.tar"
-        ]
-    },
-    "jekyll_tree_0_22_0": {
-        "name": "jekyll_tree_0_22_0",
-        "sha256": "bec5cfaa5560e082e41e33bde276cf93f0f7bcfd2914a3e868f921df8b3ab725",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.22.0.tar"
-        ]
-    },
-    "jekyll_tree_0_23_0": {
-        "name": "jekyll_tree_0_23_0",
-        "sha256": "56c80fcf49dc606fab8ed5e737a7409e9a486585b7b98673be69b5a4984dd774",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.23.0.tar"
-        ]
-    },
-    "jekyll_tree_0_24_0": {
-        "name": "jekyll_tree_0_24_0",
-        "sha256": "988fa567906a73e50d3669909285187ef88c76ecd4aa277f4d1f355fc06a90c8",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.24.0.tar"
-        ]
-    },
-    "jekyll_tree_0_25_0": {
-        "name": "jekyll_tree_0_25_0",
-        "sha256": "e8ab61c047225e808982a564ecd692fd63bd243dccc88a8768ed069a5362a685",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.25.0.tar"
-        ]
-    },
-    "jekyll_tree_0_26_0": {
-        "name": "jekyll_tree_0_26_0",
-        "sha256": "3907dfc6fb27d246e67877e553e8951fac239bb49f2dec7e06b6b09cb0b98b8d",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.26.0.tar"
-        ]
-    },
-    "jekyll_tree_0_27_0": {
-        "name": "jekyll_tree_0_27_0",
-        "sha256": "97e2633fefee389daade775da43907aa68699b32212f4e48cb095abe18aa7e65",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.27.0.tar"
-        ]
-    },
-    "jekyll_tree_0_28_0": {
-        "name": "jekyll_tree_0_28_0",
-        "sha256": "64b3fc267fb1f4c56345d96f0ad9f07a2efe43bd15361f818368849cf941b3b7",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.28.0.tar"
-        ]
-    },
-    "jekyll_tree_0_29_0": {
-        "name": "jekyll_tree_0_29_0",
-        "sha256": "99d7a6bf9ef0145c59c54b4319fb31cb855681782080a5490909c4a5463c7215",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.29.0.tar"
-        ]
-    },
-    "jekyll_tree_0_29_1": {
-        "name": "jekyll_tree_0_29_1",
-        "sha256": "cf0a517f1660a7c4fd26a7ef6f3594bbefcf2b670bc0ed610bf3bb6ec3a9fdc3",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.29.1.tar"
-        ]
-    },
-    "jekyll_tree_1_0_0": {
-        "name": "jekyll_tree_1_0_0",
-        "sha256": "61ef65c738a8cd65059f58f2ee5f7eef493136ac4d5e5c3464787d17043febdf",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.0.0.tar"
-        ]
-    },
-    "jekyll_tree_1_1_0": {
-        "name": "jekyll_tree_1_1_0",
-        "sha256": "46d82c9249896903ee6be2295fc52a1346a9ee82f61f89b8a2181232c3bd999b",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.1.0.tar"
-        ]
-    },
-    "jekyll_tree_1_2_0": {
-        "name": "jekyll_tree_1_2_0",
-        "sha256": "d402a8391ca2624673f124ff42ba8d0d40d4139e5d23111f3995dc6c5f70f63d",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.2.0.tar"
-        ]
-    },
-    "jekyll_tree_2_0_0": {
-        "name": "jekyll_tree_2_0_0",
-        "sha256": "7d7c424ede503856c61b645d8fdc2513ec6ea8600d76c5e87c45a9a45c16de3e",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.0.0.tar"
-        ]
-    },
-    "jekyll_tree_2_1_0": {
-        "name": "jekyll_tree_2_1_0",
-        "sha256": "b0fd257b1d6b1b05705742d55a13b9a20d3e99f49c89334750c872d620e5b88f",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.1.0.tar"
-        ]
-    },
-    "jekyll_tree_2_2_0": {
-        "name": "jekyll_tree_2_2_0",
-        "sha256": "4c1506786ab98df8039ec7354b82da7b586b2ae4ab7f7e7d08f3caf74ff28e3d",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.2.0.tar"
-        ]
-    },
-    "jekyll_tree_3_0_0": {
-        "name": "jekyll_tree_3_0_0",
-        "sha256": "bd1096ad609c253fa7b1473edf4a3aa51f36243e188dbb62c68d8ed4aca2419d",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.0.0.tar"
-        ]
-    },
-    "jekyll_tree_3_1_0": {
-        "name": "jekyll_tree_3_1_0",
-        "sha256": "f9d2e22e24af426d6c9de163d91abe6d8af7eb1eabb1d7ff5e9cf4bededf465a",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.1.0-807b377.tar"
-        ]
-    },
-    "jekyll_tree_3_2_0": {
-        "name": "jekyll_tree_3_2_0",
-        "sha256": "6cff8654e739a0c3062183a5a6cc82fcf9a77323051f8c007866d7f4101052a6",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.2.0.tar"
-        ]
-    },
-    "jekyll_tree_3_3_0": {
-        "name": "jekyll_tree_3_3_0",
-        "sha256": "36b81e8ddf4f3caccf41acc82d9e49f000c1be9e92c9cc82793d60ff70636176",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.3.0.tar"
-        ]
-    },
-    "jekyll_tree_3_4_0": {
-        "name": "jekyll_tree_3_4_0",
-        "sha256": "af82e775d911135bcff76e500bb003c4a9fccb949f8ddf4d93c58eca195bf5e8",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.4.0.tar"
-        ]
-    },
-    "jekyll_tree_3_5_0": {
-        "name": "jekyll_tree_3_5_0",
-        "sha256": "aa96cbad14cfab0b422d1d17eac3107a75eb05854d40ab4f1379a6fc87b2e1f8",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.5.0.tar"
-        ]
-    },
-    "jekyll_tree_3_5_1": {
-        "name": "jekyll_tree_3_5_1",
-        "sha256": "1c949ba8da353c93c74a70638e5cb321ea1cd5582eda1b6ad88c6d2d0b569f2f",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.5.1.tar"
-        ]
-    },
-    "jekyll_tree_3_6_0": {
-        "name": "jekyll_tree_3_6_0",
-        "sha256": "1b7a16a2098ca0c290c208a11db886e950d6c523b2cac2d0a0cba4a04aa832f3",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.6.0.tar"
-        ]
-    },
-    "jekyll_tree_3_7_0": {
-        "name": "jekyll_tree_3_7_0",
-        "sha256": "a534d37ef3867c92fae8692852f92820a34f63a5f9092bbbec6505c0f69d8094",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.7.0.tar"
-        ]
-    },
-    "jekyll_tree_4_0_0": {
-        "name": "jekyll_tree_4_0_0",
-        "sha256": "9d8e350a17b85624d8d78291d440e05f6ba8af493c1ccb846d0493579dade1b6",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-4.0.0.tar"
-        ]
-    },
-    "jekyll_tree_4_1_0": {
-        "name": "jekyll_tree_4_1_0",
-        "sha256": "9ed45a322906029d161f5514371841fbec214c63b9517fccb225c8670ebb482a",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-4.1.0.tar"
-        ]
-    },
-    "jekyll_tree_4_2_0": {
-        "name": "jekyll_tree_4_2_0",
-        "sha256": "1188fc6c3354f85741bacbb2bc7dab6bbfd1d2f44475846293ff232fb01709b8",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-4.2.0.tar"
-        ]
-    },
-    "jekyll_tree_4_2_1": {
-        "name": "jekyll_tree_4_2_1",
-        "sha256": "b767b7aa949f96b602257587add3be38acbead03bf919fe871397bc80d97f8b2",
-        "urls": [
-            "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-4.2.1.tar"
-        ]
-    },
-    "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip": {
-        "name": "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip",
-        "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
-        "urls": [
-            "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
-        ]
-    },
-    "opencensus_proto": {
-        "generator_function": "grpc_deps",
-        "generator_name": "opencensus_proto",
-        "name": "opencensus_proto",
-        "sha256": "b7e13f0b4259e80c3070b583c2f39e53153085a6918718b1c710caf7037572b0",
-        "strip_prefix": "opencensus-proto-0.3.0/src",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz",
-            "https://github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz"
-        ]
-    },
-    "openjdk11_darwin_aarch64_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk11_darwin_aarch64_archive",
-        "sha256": "e908a0b4c0da08d41c3e19230f819b364ff2e5f1dafd62d2cf991a85a34d3a17",
-        "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz"
-        ]
-    },
-    "openjdk11_darwin_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk11_darwin_archive",
-        "sha256": "0b8c8b7cf89c7c55b7e2239b47201d704e8d2170884875b00f3103cf0662d6d7",
-        "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_x64.tar.gz"
-        ]
-    },
-    "openjdk11_linux_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk11_linux_archive",
-        "sha256": "b8e8a63b79bc312aa90f3558edbea59e71495ef1a9c340e38900dd28a1c579f3",
-        "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz"
-        ]
-    },
-    "openjdk11_windows_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk11_windows_archive",
-        "sha256": "42ae65e75d615a3f06a674978e1fa85fdf078cad94e553fee3e779b2b42bb015",
-        "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip"
-        ]
-    },
-    "openjdk11_windows_arm64_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk11_windows_arm64_archive",
-        "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
-        "strip_prefix": "jdk-11.0.13+8",
-        "urls": [
-            "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
-        ]
-    },
-    "openjdk15_darwin_aarch64_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk15_darwin_aarch64_archive",
-        "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5",
-        "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz"
-        ]
-    },
-    "openjdk15_darwin_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk15_darwin_archive",
-        "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482",
-        "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz"
-        ]
-    },
-    "openjdk15_linux_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk15_linux_archive",
-        "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad",
-        "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz"
-        ]
-    },
-    "openjdk15_windows_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk15_windows_archive",
-        "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6",
-        "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip"
-        ]
-    },
-    "openjdk16_darwin_aarch64_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk16_darwin_aarch64_archive",
-        "sha256": "c92131e83bc71474850e667bc4e05fca33662b8feb009a0547aa14e76b40e890",
-        "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_aarch64.tar.gz"
-        ]
-    },
-    "openjdk16_darwin_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk16_darwin_archive",
-        "sha256": "6d47ef22dc56ce1f5a102ed39e21d9a97320f0bb786818e2c686393109d79bc5",
-        "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz"
-        ]
-    },
-    "openjdk16_linux_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk16_linux_archive",
-        "sha256": "236b5ea97aff3cb312e743848d7efa77faf305170e41371a732ca93c1b797665",
-        "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz"
-        ]
-    },
-    "openjdk16_windows_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk16_windows_archive",
-        "sha256": "6cbf98ada27476526a5f6dff79fd5f2c15e2f671818e503bdf741eb6c8fed3d4",
-        "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip"
-        ]
-    },
-    "openjdk17_darwin_aarch64_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk17_darwin_aarch64_archive",
-        "sha256": "6b17f01f767ee7abf4704149ca4d86423aab9b16b68697b7d36e9b616846a8b0",
-        "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_aarch64.tar.gz"
-        ]
-    },
-    "openjdk17_darwin_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk17_darwin_archive",
-        "sha256": "6029b1fe6853cecad22ab99ac0b3bb4fb8c903dd2edefa91c3abc89755bbd47d",
-        "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz"
-        ]
-    },
-    "openjdk17_linux_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk17_linux_archive",
-        "sha256": "37c4f8e48536cceae8c6c20250d6c385e176972532fd35759fa7d6015c965f56",
-        "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz"
-        ]
-    },
-    "openjdk17_windows_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "name": "openjdk17_windows_archive",
-        "sha256": "f4437011239f3f0031c794bb91c02a6350bc941d4196bdd19c9f157b491815a3",
-        "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip"
-        ]
-    },
-    "openjdk17_windows_arm64_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk17_windows_arm64_archive",
-        "name": "openjdk17_windows_arm64_archive",
-        "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",
-        "strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"
-        ]
-    },
-    "openjdk_linux": {
-        "downloaded_file_path": "zulu-linux.tar.gz",
-        "name": "openjdk_linux",
-        "sha256": "65bfe4e0ffa74a680ee4410db46b17e30cd9397b664a92a886599fe1f3530969",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-linux_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689070.tar.gz"
-        ]
-    },
-    "openjdk_linux_aarch64": {
-        "downloaded_file_path": "zulu-linux-aarch64.tar.gz",
-        "name": "openjdk_linux_aarch64",
-        "sha256": "6b245793087300db3ee82ab0d165614f193a73a60f2f011e347756c1e6ca5bac",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz"
-        ]
-    },
-    "openjdk_linux_aarch64_minimal": {
-        "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz",
-        "name": "openjdk_linux_aarch64_minimal",
-        "sha256": "06f6520a877704c77614bcfc4f846cc7cbcbf5eaad149bf7f19f4f16e285c9de",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz"
-        ]
-    },
-    "openjdk_linux_aarch64_vanilla": {
-        "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz",
-        "name": "openjdk_linux_aarch64_vanilla",
-        "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz"
-        ]
-    },
-    "openjdk_linux_minimal": {
-        "downloaded_file_path": "zulu-linux-minimal.tar.gz",
-        "name": "openjdk_linux_minimal",
-        "sha256": "91f7d52f695c681d4e21499b4319d548aadef249a6b3053e306308992e1e29ae",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz"
-        ]
-    },
-    "openjdk_linux_ppc64le_vanilla": {
-        "downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz",
-        "name": "openjdk_linux_ppc64le_vanilla",
-        "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
-            "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
-        ]
-    },
-    "openjdk_linux_s390x_vanilla": {
-        "downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz",
-        "name": "openjdk_linux_s390x_vanilla",
-        "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059",
-        "urls": [
-            "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz",
-            "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"
-        ]
-    },
-    "openjdk_linux_vanilla": {
-        "downloaded_file_path": "zulu-linux-vanilla.tar.gz",
-        "name": "openjdk_linux_vanilla",
-        "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"
-        ]
-    },
-    "openjdk_macos_aarch64": {
-        "downloaded_file_path": "zulu-macos-aarch64.tar.gz",
-        "name": "openjdk_macos_aarch64",
-        "sha256": "a900ef793cb34b03ac5d93ea2f67291b6842e99d500934e19393a8d8f9bfa6ff",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-allmodules-1611665569.tar.gz"
-        ]
-    },
-    "openjdk_macos_aarch64_minimal": {
-        "downloaded_file_path": "zulu-macos-aarch64-minimal.tar.gz",
-        "name": "openjdk_macos_aarch64_minimal",
-        "sha256": "f4f606926e6deeaa8b8397e299313d9df87642fe464b0ccf1ed0432aeb00640b",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-minimal-1611665562.tar.gz"
-        ]
-    },
-    "openjdk_macos_aarch64_vanilla": {
-        "downloaded_file_path": "zulu-macos-aarch64-vanilla.tar.gz",
-        "name": "openjdk_macos_aarch64_vanilla",
-        "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz"
-        ]
-    },
-    "openjdk_macos_x86_64": {
-        "downloaded_file_path": "zulu-macos.tar.gz",
-        "name": "openjdk_macos_x86_64",
-        "sha256": "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz"
-        ]
-    },
-    "openjdk_macos_x86_64_minimal": {
-        "downloaded_file_path": "zulu-macos-minimal.tar.gz",
-        "name": "openjdk_macos_x86_64_minimal",
-        "sha256": "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz"
-        ]
-    },
-    "openjdk_macos_x86_64_vanilla": {
-        "downloaded_file_path": "zulu-macos-vanilla.tar.gz",
-        "name": "openjdk_macos_x86_64_vanilla",
-        "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz"
-        ]
-    },
-    "openjdk_win": {
-        "downloaded_file_path": "zulu-win.zip",
-        "name": "openjdk_win",
-        "sha256": "8e1604b3a27dcf639bc6d1a73103f1211848139e4cceb081d0a74a99e1e6f995",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip"
-        ]
-    },
-    "openjdk_win_arm64_vanilla": {
-        "downloaded_file_path": "zulu-win-arm64.zip",
-        "name": "openjdk_win_arm64_vanilla",
-        "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"
-        ]
-    },
-    "openjdk_win_minimal": {
-        "downloaded_file_path": "zulu-win-minimal.zip",
-        "name": "openjdk_win_minimal",
-        "sha256": "b90a713c9c2d9ea23cad44d2c2dfcc9af22faba9bde55dedc1c3bb9f556ac1ae",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip"
-        ]
-    },
-    "openjdk_win_vanilla": {
-        "downloaded_file_path": "zulu-win-vanilla.zip",
-        "name": "openjdk_win_vanilla",
-        "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"
-        ]
-    },
-    "org_snakeyaml": {
-        "build_file_content": "\njava_library(\n    name = \"snakeyaml\",\n    testonly = True,\n    srcs = glob([\"src/main/**/*.java\"]),\n    visibility = [\"@com_google_testparameterinjector//:__pkg__\"],\n)\n",
-        "name": "org_snakeyaml",
-        "sha256": "fd0e0cc6c5974fc8f08be3a15fb4a59954c7dd958b5b68186a803de6420b6e40",
-        "strip_prefix": "asomov-snakeyaml-b28f0b4d87c6",
-        "urls": [
-            "https://mirror.bazel.build/bitbucket.org/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz"
-        ]
-    },
-    "platforms": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "platforms",
-        "name": "platforms",
-        "sha256": "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz",
-            "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz"
-        ]
-    },
-    "platforms-0.0.5.tar.gz": {
-        "name": "platforms-0.0.5.tar.gz",
-        "sha256": "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz",
-            "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz"
-        ]
-    },
-    "remote_coverage_tools": {
-        "name": "remote_coverage_tools",
-        "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
-        "urls": [
-            "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"
-        ]
-    },
-    "remote_java_tools": {
-        "generator_function": "maybe",
-        "generator_name": "remote_java_tools",
-        "name": "remote_java_tools",
-        "sha256": "2eede49b2d80135e0ea22180f63df26db2ed4b795c1c041b25cc653d6019fbec",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools-v11.7.1.zip"
-        ]
-    },
-    "remote_java_tools_darwin": {
-        "generator_function": "maybe",
-        "generator_name": "remote_java_tools_darwin",
-        "name": "remote_java_tools_darwin",
-        "sha256": "4d6d388b54ad3b9aa35b30dd67af8d71c4c240df8cfb5000bbec67bdd5c53a73",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_darwin-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_darwin-v11.7.1.zip"
-        ]
-    },
-    "remote_java_tools_darwin_for_testing": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_darwin_for_testing",
-        "name": "remote_java_tools_darwin_for_testing",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "4d6d388b54ad3b9aa35b30dd67af8d71c4c240df8cfb5000bbec67bdd5c53a73",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_darwin-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_darwin-v11.7.1.zip"
-        ]
-    },
-    "remote_java_tools_for_testing": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_for_testing",
-        "name": "remote_java_tools_for_testing",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "2eede49b2d80135e0ea22180f63df26db2ed4b795c1c041b25cc653d6019fbec",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools-v11.7.1.zip"
-        ]
-    },
-    "remote_java_tools_linux": {
-        "generator_function": "maybe",
-        "generator_name": "remote_java_tools_linux",
-        "name": "remote_java_tools_linux",
-        "sha256": "f78077f0c043d0d13c82de0ee4a99753e66bb18ec46e3601fa2a10e7f26798a8",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_linux-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_linux-v11.7.1.zip"
-        ]
-    },
-    "remote_java_tools_linux_for_testing": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_linux_for_testing",
-        "name": "remote_java_tools_linux_for_testing",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "f78077f0c043d0d13c82de0ee4a99753e66bb18ec46e3601fa2a10e7f26798a8",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_linux-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_linux-v11.7.1.zip"
-        ]
-    },
-    "remote_java_tools_test": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_test",
-        "name": "remote_java_tools_test",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "2eede49b2d80135e0ea22180f63df26db2ed4b795c1c041b25cc653d6019fbec",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools-v11.7.1.zip"
-        ]
-    },
-    "remote_java_tools_test_darwin": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_test_darwin",
-        "name": "remote_java_tools_test_darwin",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "4d6d388b54ad3b9aa35b30dd67af8d71c4c240df8cfb5000bbec67bdd5c53a73",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_darwin-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_darwin-v11.7.1.zip"
-        ]
-    },
-    "remote_java_tools_test_linux": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_test_linux",
-        "name": "remote_java_tools_test_linux",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "f78077f0c043d0d13c82de0ee4a99753e66bb18ec46e3601fa2a10e7f26798a8",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_linux-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_linux-v11.7.1.zip"
-        ]
-    },
-    "remote_java_tools_test_windows": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_test_windows",
-        "name": "remote_java_tools_test_windows",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "a7086734866505292ee4c206328c73c6af127e69bd51b98c9c186ae4b9b6d2db",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_windows-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_windows-v11.7.1.zip"
-        ]
-    },
-    "remote_java_tools_windows": {
-        "generator_function": "maybe",
-        "generator_name": "remote_java_tools_windows",
-        "name": "remote_java_tools_windows",
-        "sha256": "a7086734866505292ee4c206328c73c6af127e69bd51b98c9c186ae4b9b6d2db",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_windows-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_windows-v11.7.1.zip"
-        ]
-    },
-    "remote_java_tools_windows_for_testing": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_windows_for_testing",
-        "name": "remote_java_tools_windows_for_testing",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "a7086734866505292ee4c206328c73c6af127e69bd51b98c9c186ae4b9b6d2db",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_windows-v11.7.1.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_windows-v11.7.1.zip"
-        ]
-    },
-    "remotejdk11_linux": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_linux",
-        "name": "remotejdk11_linux",
-        "sha256": "b8e8a63b79bc312aa90f3558edbea59e71495ef1a9c340e38900dd28a1c579f3",
-        "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz"
-        ]
-    },
-    "remotejdk11_linux_aarch64": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_linux_aarch64",
-        "name": "remotejdk11_linux_aarch64",
-        "sha256": "61254688067454d3ccf0ef25993b5dcab7b56c8129e53b73566c28a8dd4d48fb",
-        "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-linux_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk11_linux_aarch64_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk11_linux_aarch64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "61254688067454d3ccf0ef25993b5dcab7b56c8129e53b73566c28a8dd4d48fb",
-        "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-linux_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk11_linux_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk11_linux_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "b8e8a63b79bc312aa90f3558edbea59e71495ef1a9c340e38900dd28a1c579f3",
-        "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz"
-        ]
-    },
-    "remotejdk11_linux_ppc64le": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_linux_ppc64le",
-        "name": "remotejdk11_linux_ppc64le",
-        "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
-        "strip_prefix": "jdk-11.0.7+10",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
-            "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
-        ]
-    },
-    "remotejdk11_linux_ppc64le_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk11_linux_ppc64le_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
-        "strip_prefix": "jdk-11.0.7+10",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
-            "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
-        ]
-    },
-    "remotejdk11_linux_s390x": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_linux_s390x",
-        "name": "remotejdk11_linux_s390x",
-        "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059",
-        "strip_prefix": "jdk-11.0.7+10",
-        "urls": [
-            "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz",
-            "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"
-        ]
-    },
-    "remotejdk11_linux_s390x_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk11_linux_s390x_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059",
-        "strip_prefix": "jdk-11.0.7+10",
-        "urls": [
-            "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz",
-            "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"
-        ]
-    },
-    "remotejdk11_macos": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_macos",
-        "name": "remotejdk11_macos",
-        "sha256": "0b8c8b7cf89c7c55b7e2239b47201d704e8d2170884875b00f3103cf0662d6d7",
-        "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_x64.tar.gz"
-        ]
-    },
-    "remotejdk11_macos_aarch64": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_macos_aarch64",
-        "name": "remotejdk11_macos_aarch64",
-        "sha256": "e908a0b4c0da08d41c3e19230f819b364ff2e5f1dafd62d2cf991a85a34d3a17",
-        "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk11_macos_aarch64_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk11_macos_aarch64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "e908a0b4c0da08d41c3e19230f819b364ff2e5f1dafd62d2cf991a85a34d3a17",
-        "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk11_macos_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk11_macos_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "0b8c8b7cf89c7c55b7e2239b47201d704e8d2170884875b00f3103cf0662d6d7",
-        "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_x64.tar.gz"
-        ]
-    },
-    "remotejdk11_win": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_win",
-        "name": "remotejdk11_win",
-        "sha256": "42ae65e75d615a3f06a674978e1fa85fdf078cad94e553fee3e779b2b42bb015",
-        "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip"
-        ]
-    },
-    "remotejdk11_win_arm64": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_win_arm64",
-        "name": "remotejdk11_win_arm64",
-        "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
-        "strip_prefix": "jdk-11.0.13+8",
-        "urls": [
-            "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
-        ]
-    },
-    "remotejdk11_win_arm64_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk11_win_arm64_for_testing",
-        "name": "remotejdk11_win_arm64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
-        "strip_prefix": "jdk-11.0.13+8",
-        "urls": [
-            "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
-        ]
-    },
-    "remotejdk11_win_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk11_win_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "42ae65e75d615a3f06a674978e1fa85fdf078cad94e553fee3e779b2b42bb015",
-        "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip"
-        ]
-    },
-    "remotejdk15_linux": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk15_linux",
-        "name": "remotejdk15_linux",
-        "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad",
-        "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz"
-        ]
-    },
-    "remotejdk15_linux_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk15_linux_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad",
-        "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz"
-        ]
-    },
-    "remotejdk15_macos": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk15_macos",
-        "name": "remotejdk15_macos",
-        "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482",
-        "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz"
-        ]
-    },
-    "remotejdk15_macos_aarch64": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk15_macos_aarch64",
-        "name": "remotejdk15_macos_aarch64",
-        "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5",
-        "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk15_macos_aarch64_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk15_macos_aarch64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5",
-        "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk15_macos_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk15_macos_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482",
-        "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz"
-        ]
-    },
-    "remotejdk15_win": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk15_win",
-        "name": "remotejdk15_win",
-        "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6",
-        "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip"
-        ]
-    },
-    "remotejdk15_win_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk15_win_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6",
-        "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip"
-        ]
-    },
-    "remotejdk16_linux": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk16_linux",
-        "name": "remotejdk16_linux",
-        "sha256": "236b5ea97aff3cb312e743848d7efa77faf305170e41371a732ca93c1b797665",
-        "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz"
-        ]
-    },
-    "remotejdk16_linux_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk16_linux_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "236b5ea97aff3cb312e743848d7efa77faf305170e41371a732ca93c1b797665",
-        "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz"
-        ]
-    },
-    "remotejdk16_macos": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk16_macos",
-        "name": "remotejdk16_macos",
-        "sha256": "6d47ef22dc56ce1f5a102ed39e21d9a97320f0bb786818e2c686393109d79bc5",
-        "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz"
-        ]
-    },
-    "remotejdk16_macos_aarch64": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk16_macos_aarch64",
-        "name": "remotejdk16_macos_aarch64",
-        "sha256": "c92131e83bc71474850e667bc4e05fca33662b8feb009a0547aa14e76b40e890",
-        "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk16_macos_aarch64_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk16_macos_aarch64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "c92131e83bc71474850e667bc4e05fca33662b8feb009a0547aa14e76b40e890",
-        "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk16_macos_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk16_macos_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "6d47ef22dc56ce1f5a102ed39e21d9a97320f0bb786818e2c686393109d79bc5",
-        "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz"
-        ]
-    },
-    "remotejdk16_win": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk16_win",
-        "name": "remotejdk16_win",
-        "sha256": "6cbf98ada27476526a5f6dff79fd5f2c15e2f671818e503bdf741eb6c8fed3d4",
-        "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip"
-        ]
-    },
-    "remotejdk16_win_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk16_win_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "6cbf98ada27476526a5f6dff79fd5f2c15e2f671818e503bdf741eb6c8fed3d4",
-        "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip"
-        ]
-    },
-    "remotejdk17_linux": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk17_linux",
-        "name": "remotejdk17_linux",
-        "sha256": "37c4f8e48536cceae8c6c20250d6c385e176972532fd35759fa7d6015c965f56",
-        "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz"
-        ]
-    },
-    "remotejdk17_linux_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk17_linux_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "37c4f8e48536cceae8c6c20250d6c385e176972532fd35759fa7d6015c965f56",
-        "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz"
-        ]
-    },
-    "remotejdk17_macos": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk17_macos",
-        "name": "remotejdk17_macos",
-        "sha256": "6029b1fe6853cecad22ab99ac0b3bb4fb8c903dd2edefa91c3abc89755bbd47d",
-        "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz"
-        ]
-    },
-    "remotejdk17_macos_aarch64": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk17_macos_aarch64",
-        "name": "remotejdk17_macos_aarch64",
-        "sha256": "6b17f01f767ee7abf4704149ca4d86423aab9b16b68697b7d36e9b616846a8b0",
-        "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk17_macos_aarch64_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk17_macos_aarch64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "6b17f01f767ee7abf4704149ca4d86423aab9b16b68697b7d36e9b616846a8b0",
-        "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk17_macos_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk17_macos_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "6029b1fe6853cecad22ab99ac0b3bb4fb8c903dd2edefa91c3abc89755bbd47d",
-        "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz"
-        ]
-    },
-    "remotejdk17_win": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk17_win",
-        "name": "remotejdk17_win",
-        "sha256": "f4437011239f3f0031c794bb91c02a6350bc941d4196bdd19c9f157b491815a3",
-        "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip"
-        ]
-    },
-    "remotejdk17_win_arm64": {
-        "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk17_win_arm64",
-        "name": "remotejdk17_win_arm64",
-        "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",
-        "strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"
-        ]
-    },
-    "remotejdk17_win_arm64_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk17_win_arm64_for_testing",
-        "name": "remotejdk17_win_arm64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",
-        "strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"
-        ]
-    },
-    "remotejdk17_win_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "name": "remotejdk17_win_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "f4437011239f3f0031c794bb91c02a6350bc941d4196bdd19c9f157b491815a3",
-        "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip"
-        ]
-    },
-    "rules_cc": {
-        "name": "rules_cc",
-        "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd",
-        "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip",
-            "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip"
-        ]
-    },
-    "rules_java": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "rules_java",
-        "name": "rules_java",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598",
-        "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
-            "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
-        ]
-    },
-    "rules_nodejs-2.2.2.tar.gz": {
-        "name": "rules_nodejs-2.2.2.tar.gz",
-        "sha256": "f2194102720e662dbf193546585d705e645314319554c6ce7e47d8b59f459e9c",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz",
-            "https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz"
-        ]
-    },
-    "rules_pkg": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "rules_pkg",
-        "name": "rules_pkg",
-        "sha256": "038f1caa773a7e35b3663865ffb003169c6a71dc995e39bf4815792f385d837d",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
-            "https://github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz"
-        ]
-    },
-    "rules_pkg-0.4.0.tar.gz": {
-        "name": "rules_pkg-0.4.0.tar.gz",
-        "sha256": "038f1caa773a7e35b3663865ffb003169c6a71dc995e39bf4815792f385d837d",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
-            "https://github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz"
-        ]
-    },
-    "rules_proto": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "rules_proto",
-        "name": "rules_proto",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da",
-        "strip_prefix": "rules_proto-7e4afce6fe62dbff0a4a03450143146f9f2d7488",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
-            "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz"
-        ]
-    },
-    "six": {
-        "build_file": "@com_github_grpc_grpc//third_party:six.BUILD",
-        "generator_function": "grpc_deps",
-        "generator_name": "six",
-        "name": "six",
-        "sha256": "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
-        "urls": [
-            "https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e/six-1.16.0.tar.gz"
-        ]
-    },
-    "upb": {
-        "generator_function": "grpc_deps",
-        "generator_name": "upb",
-        "name": "upb",
-        "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4",
-        "strip_prefix": "upb-2de300726a1ba2de9a468468dc5ff9ed17a3215f",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz",
-            "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz"
-        ]
-    },
-    "v1.41.0.tar.gz": {
-        "name": "v1.41.0.tar.gz",
-        "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656",
-        "urls": [
-            "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.41.0.tar.gz",
-            "https://github.com/grpc/grpc/archive/v1.41.0.tar.gz"
-        ]
-    },
-    "v1.5.0-4.zip": {
-        "name": "v1.5.0-4.zip",
-        "sha256": "d320d59b89a163c5efccbe4915ae6a49883ce653cdc670643dfa21c6063108e4",
-        "urls": [
-            "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/v1.5.0-4.zip",
-            "https://github.com/luben/zstd-jni/archive/v1.5.0-4.zip"
-        ]
-    },
-    "v3.13.0.tar.gz": {
-        "name": "v3.13.0.tar.gz",
-        "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
-        "urls": [
-            "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
-            "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz"
-        ]
-    },
-    "zlib": {
-        "build_file": "@com_github_grpc_grpc//third_party:zlib.BUILD",
-        "generator_function": "grpc_deps",
-        "generator_name": "zlib",
-        "name": "zlib",
-        "sha256": "6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45",
-        "strip_prefix": "zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz",
-            "https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz"
-        ]
-    },
-    "zstd-jni": {
-        "build_file": "//third_party:zstd-jni/zstd-jni.BUILD",
-        "generator_function": "dist_http_archive",
-        "generator_name": "zstd-jni",
-        "name": "zstd-jni",
-        "patch_args": [
-            "-p1"
-        ],
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "patches": [
-            "//third_party:zstd-jni/Native.java.patch"
-        ],
-        "sha256": "d320d59b89a163c5efccbe4915ae6a49883ce653cdc670643dfa21c6063108e4",
-        "strip_prefix": "zstd-jni-1.5.0-4",
-        "urls": [
-            "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/v1.5.0-4.zip",
-            "https://github.com/luben/zstd-jni/archive/v1.5.0-4.zip"
-        ]
-    },
-    "zulu11.50.19-ca-jdk11.0.12-linux_aarch64.tar.gz": {
-        "name": "zulu11.50.19-ca-jdk11.0.12-linux_aarch64.tar.gz",
-        "sha256": "61254688067454d3ccf0ef25993b5dcab7b56c8129e53b73566c28a8dd4d48fb",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_aarch64.tar.gz"
-        ]
-    },
-    "zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz": {
-        "name": "zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz",
-        "sha256": "b8e8a63b79bc312aa90f3558edbea59e71495ef1a9c340e38900dd28a1c579f3",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz"
-        ]
-    },
-    "zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz": {
-        "name": "zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz",
-        "sha256": "e908a0b4c0da08d41c3e19230f819b364ff2e5f1dafd62d2cf991a85a34d3a17",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz"
-        ]
-    },
-    "zulu11.50.19-ca-jdk11.0.12-macosx_x64.tar.gz": {
-        "name": "zulu11.50.19-ca-jdk11.0.12-macosx_x64.tar.gz",
-        "sha256": "0b8c8b7cf89c7c55b7e2239b47201d704e8d2170884875b00f3103cf0662d6d7",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_x64.tar.gz"
-        ]
-    },
-    "zulu11.50.19-ca-jdk11.0.12-win_x64.tar.gz": {
-        "name": "zulu11.50.19-ca-jdk11.0.12-win_x64.tar.gz",
-        "sha256": "42ae65e75d615a3f06a674978e1fa85fdf078cad94e553fee3e779b2b42bb015",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip"
-        ]
-    },
-    "zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip": {
-        "name": "zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
-        "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"
-        ]
-    }
-}
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/upb-clang16.patch b/pkgs/development/tools/build-managers/bazel/bazel_5/upb-clang16.patch
deleted file mode 100644
index 6280082e52a5..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_5/upb-clang16.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/distdir_deps.bzl b/distdir_deps.bzl
-index 9068f50537..b3f45e8653 100644
---- a/distdir_deps.bzl
-+++ b/distdir_deps.bzl
-@@ -110,6 +110,8 @@ DIST_DEPS = {
-     "protocolbuffers": {
-         "archive": "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz",
-         "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4",
-+        "patches": ["//:upb-clang16.patch"],
-+        "patch_args": ["-p1"],
-         "urls": [
-             "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz",
-             "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz",
-@@ -131,6 +133,7 @@ DIST_DEPS = {
-         "patches": [
-             "//third_party/grpc:grpc_1.41.0.patch",
-             "//third_party/grpc:grpc_1.41.0.win_arm64.patch",
-+            "//:grpc-upb-clang16.patch",
-         ],
-         "used_in": [
-             "additional_distfiles",
-diff --git a/grpc-upb-clang16.patch b/grpc-upb-clang16.patch
-new file mode 100644
-index 0000000000..69194099db
---- /dev/null
-+++ b/grpc-upb-clang16.patch
-@@ -0,0 +1,13 @@
-+diff -r -u a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
-+--- a/bazel/grpc_deps.bzl
-++++ b/bazel/grpc_deps.bzl
-+@@ -340,6 +340,8 @@
-+             name = "upb",
-+             sha256 = "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4",
-+             strip_prefix = "upb-2de300726a1ba2de9a468468dc5ff9ed17a3215f",
-++            patches = ["//:upb-clang16.patch"],
-++            patch_args = ["-p1"],
-+             urls = [
-+                 "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz",
-+                 "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz",
-+
-+diff -r -u a/third_party/upb/bazel/build_defs.bzl b/third_party/upb/bazel/build_defs.bzl
-+--- a/third_party/upb/bazel/build_defs.bzl	2021-09-25 04:33:41.000000000 +0200
-++++ b/third_party/upb/bazel/build_defs.bzl	2023-11-22 22:27:39.421459688 +0100
-+@@ -34,6 +34,7 @@
-+         "-Wextra",
-+         # "-Wshorten-64-to-32",  # not in GCC (and my Kokoro images doesn't have Clang)
-+         "-Werror",
-++        "-Wno-gnu-offsetof-extensions",
-+         "-Wno-long-long",
-+         # copybara:strip_end
-+     ],
-+@@ -48,6 +49,7 @@
-+         "-pedantic",
-+         "-Werror=pedantic",
-+         "-Wall",
-++        "-Wno-gnu-offsetof-extensions",
-+         "-Wstrict-prototypes",
-+         # GCC (at least) emits spurious warnings for this that cannot be fixed
-+         # without introducing redundant initialization (with runtime cost):
-diff --git a/upb-clang16.patch b/upb-clang16.patch
-new file mode 100644
-index 0000000000..f81855181f
---- /dev/null
-+++ upb-clang16.patch
-@@ -0,0 +1,18 @@
-+--- a/bazel/build_defs.bzl
-++++ b/bazel/build_defs.bzl
-+@@ -34,6 +34,7 @@
-+         "-Wextra",
-+         # "-Wshorten-64-to-32",  # not in GCC (and my Kokoro images doesn't have Clang)
-+         "-Werror",
-++        "-Wno-gnu-offsetof-extensions",
-+         "-Wno-long-long",
-+         # copybara:strip_end
-+     ],
-+@@ -48,6 +49,7 @@
-+         "-pedantic",
-+         "-Werror=pedantic",
-+         "-Wall",
-++        "-Wno-gnu-offsetof-extensions",
-+         "-Wstrict-prototypes",
-+         # GCC (at least) emits spurious warnings for this that cannot be fixed
-+         # without introducing redundant initialization (with runtime cost):
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/update-srcDeps.py b/pkgs/development/tools/build-managers/bazel/bazel_5/update-srcDeps.py
deleted file mode 100755
index d409a32e1389..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_5/update-srcDeps.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import json
-
-if len(sys.argv) != 2:
-    print("usage: ./this-script src-deps.json < WORKSPACE", file=sys.stderr)
-    print("Takes the bazel WORKSPACE file and reads all archives into a json dict (by evaling it as python code)", file=sys.stderr)
-    print("Hail Eris.", file=sys.stderr)
-    sys.exit(1)
-
-http_archives = []
-
-# just the kw args are the dict { name, sha256, urls … }
-def http_archive(**kw):
-    http_archives.append(kw)
-# like http_file
-def http_file(**kw):
-    http_archives.append(kw)
-
-# this is inverted from http_archive/http_file and bundles multiple archives
-def _distdir_tar(**kw):
-    for archive_name in kw['archives']:
-        http_archives.append({
-            "name": archive_name,
-            "sha256": kw['sha256'][archive_name],
-            "urls": kw['urls'][archive_name]
-        })
-
-# TODO?
-def git_repository(**kw):
-    print(json.dumps(kw, sort_keys=True, indent=4), file=sys.stderr)
-    sys.exit(1)
-
-# execute the WORKSPACE like it was python code in this module,
-# using all the function stubs from above.
-exec(sys.stdin.read())
-
-# transform to a dict with the names as keys
-d = { el['name']: el for el in http_archives }
-
-def has_urls(el):
-    return ('url' in el and el['url']) or ('urls' in el and el['urls'])
-def has_sha256(el):
-    return 'sha256' in el and el['sha256']
-bad_archives = list(filter(lambda el: not has_urls(el) or not has_sha256(el), d.values()))
-if bad_archives:
-    print('Following bazel dependencies are missing url or sha256', file=sys.stderr)
-    print('Check bazel sources for master or non-checksummed dependencies', file=sys.stderr)
-    for el in bad_archives:
-        print(json.dumps(el, sort_keys=True, indent=4), file=sys.stderr)
-    sys.exit(1)
-
-with open(sys.argv[1], "w") as f:
-    print(json.dumps(d, sort_keys=True, indent=4), file=f)
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_darwin_sandbox.patch b/pkgs/development/tools/build-managers/bazel/bazel_darwin_sandbox.patch
deleted file mode 100644
index 87e6c99287fb..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_darwin_sandbox.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru a/src/main/native/unix_jni_darwin.cc b/src/main/native/unix_jni_darwin.cc
---- a/src/main/native/unix_jni_darwin.cc	1980-01-01 00:00:00.000000000 -0500
-+++ b/src/main/native/unix_jni_darwin.cc	2021-11-27 20:35:29.000000000 -0500
-@@ -270,6 +270,7 @@
- }
- 
- int portable_suspend_count() {
-+  if (getenv("NIX_BUILD_TOP")) return 0;
-   static dispatch_once_t once_token;
-   static SuspendState suspend_state;
-   dispatch_once(&once_token, ^{
diff --git a/pkgs/development/tools/build-managers/bazel/nix-hacks.patch b/pkgs/development/tools/build-managers/bazel/nix-hacks.patch
deleted file mode 100644
index 95f07646802e..000000000000
--- a/pkgs/development/tools/build-managers/bazel/nix-hacks.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
-index 8e772005cd..6ffa1c919c 100644
---- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
-+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
-@@ -432,25 +432,7 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
-       String content;
-       try {
-         content = FileSystemUtils.readContent(markerPath, StandardCharsets.UTF_8);
--        String markerRuleKey = readMarkerFile(content, markerData);
--        boolean verified = false;
--        if (Preconditions.checkNotNull(ruleKey).equals(markerRuleKey)
--            && Objects.equals(
--                markerData.get(MANAGED_DIRECTORIES_MARKER),
--                this.markerData.get(MANAGED_DIRECTORIES_MARKER))) {
--          verified = handler.verifyMarkerData(rule, markerData, env);
--          if (env.valuesMissing()) {
--            return null;
--          }
--        }
--
--        if (verified) {
--          return new Fingerprint().addString(content).digestAndReset();
--        } else {
--          // So that we are in a consistent state if something happens while fetching the repository
--          markerPath.delete();
--          return null;
--        }
-+        return new Fingerprint().addString(content).digestAndReset();
-       } catch (IOException e) {
-         throw new RepositoryFunctionException(e, Transience.TRANSIENT);
-       }
-diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
-index c282d57ab6..f9b0c08627 100644
---- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
-+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
-@@ -146,7 +146,6 @@ public class JavaSubprocessFactory implements SubprocessFactory {
-     ProcessBuilder builder = new ProcessBuilder();
-     builder.command(params.getArgv());
-     if (params.getEnv() != null) {
--      builder.environment().clear();
-       builder.environment().putAll(params.getEnv());
-     }
- 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2f100211c146..a535e039a467 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -500,6 +500,7 @@ mapAliases {
   bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17
   bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17
   bareboxTools = throw "bareboxTools has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
+  bazel_5 = throw "bazel_5 has been removed as it is EOL"; # Added 2025-08-09
   BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12
   beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01
   beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e160c065e815..6f909e780811 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6702,20 +6702,6 @@ with pkgs;
 
   bazel = bazel_6;
 
-  bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 {
-    inherit (darwin) sigtool;
-    buildJdk = jdk11_headless;
-    runJdk = jdk11_headless;
-    stdenv =
-      if stdenv.cc.isClang then
-        llvmPackages_17.stdenv
-      else if stdenv.cc.isGNU then
-        gcc12Stdenv
-      else
-        stdenv;
-    bazel_self = bazel_5;
-  };
-
   bazel_6 = callPackage ../development/tools/build-managers/bazel/bazel_6 {
     inherit (darwin) sigtool;
     buildJdk = jdk11_headless;

From 5e733d73a6defa0188e9e3a16fdcde6e0a7b69ed Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2763/3724] abseil-cpp_202301: drop

Only used by the broken TensorFlow source build.
---
 .../libraries/abseil-cpp/202301.nix           | 62 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  1 -
 pkgs/top-level/python-packages.nix            |  5 +-
 4 files changed, 4 insertions(+), 65 deletions(-)
 delete mode 100644 pkgs/development/libraries/abseil-cpp/202301.nix

diff --git a/pkgs/development/libraries/abseil-cpp/202301.nix b/pkgs/development/libraries/abseil-cpp/202301.nix
deleted file mode 100644
index 43ae8a96099c..000000000000
--- a/pkgs/development/libraries/abseil-cpp/202301.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  cmake,
-  gtest,
-  static ? stdenv.hostPlatform.isStatic,
-  cxxStandard ? null,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "abseil-cpp";
-  version = "20230125.4";
-
-  src = fetchFromGitHub {
-    owner = "abseil";
-    repo = "abseil-cpp";
-    rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-7C/QIXYRyUyNVVE0tqmv8b5g/uWc58iBI5jzdtddQ+U=";
-  };
-
-  patches = [
-    # Fixes: clang++: error: unsupported option '-msse4.1' for target 'aarch64-apple-darwin'
-    # https://github.com/abseil/abseil-cpp/pull/1707
-    (fetchpatch {
-      name = "fix-compile-breakage-on-darwin";
-      url = "https://github.com/abseil/abseil-cpp/commit/6dee153242d7becebe026a9bed52f4114441719d.patch";
-      hash = "sha256-r6QnHPnwPwOE/hv4kLNA3FqNq2vU/QGmwAc5q0/q1cs=";
-    })
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages
-    # that require a different SDK other than the default one.
-    ./cmake-core-foundation.patch
-  ];
-
-  cmakeFlags = [
-    "-DABSL_BUILD_TEST_HELPERS=ON"
-    "-DABSL_USE_EXTERNAL_GOOGLETEST=ON"
-    "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
-  ]
-  ++ lib.optionals (cxxStandard != null) [
-    "-DCMAKE_CXX_STANDARD=${cxxStandard}"
-  ];
-
-  strictDeps = true;
-
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [ gtest ];
-
-  meta = with lib; {
-    description = "Open-source collection of C++ code designed to augment the C++ standard library";
-    homepage = "https://abseil.io/";
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = [ maintainers.andersk ];
-    # Requires LFS64 APIs. 202401 and later are fine.
-    broken = stdenv.hostPlatform.isMusl;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a535e039a467..e02c8b2cd472 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -383,6 +383,7 @@ mapAliases {
 
   AusweisApp2 = ausweisapp; # Added 2023-11-08
   a4term = a4; # Added 2023-10-06
+  abseil-cpp_202301 = throw "abseil-cpp_202301 has been removed as it was unused in tree"; # Added 2025-08-09
   acorn = throw "acorn has been removed as the upstream project was archived"; # Added 2024-04-27
   acousticbrainz-client = throw "acousticbrainz-client has been removed since the AcousticBrainz project has been shut down"; # Added 2024-06-04
   adminer-pematon = adminneo; # Added 2025-02-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f909e780811..568d0805887c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7471,7 +7471,6 @@ with pkgs;
   ### DEVELOPMENT / LIBRARIES
 
   abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { };
-  abseil-cpp_202301 = callPackage ../development/libraries/abseil-cpp/202301.nix { };
   abseil-cpp_202401 = callPackage ../development/libraries/abseil-cpp/202401.nix { };
   abseil-cpp_202407 = callPackage ../development/libraries/abseil-cpp/202407.nix { };
   abseil-cpp = abseil-cpp_202501;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8cf2bec48f6c..5e6ebbe1d868 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17884,7 +17884,8 @@ self: super: with self; {
   tensorflow-build =
     let
       compat = rec {
-        protobufTF = pkgs.protobuf_21.override { abseil-cpp = pkgs.abseil-cpp_202301; };
+        #protobufTF = pkgs.protobuf_21.override { abseil-cpp = pkgs.abseil-cpp_202301; };
+        protobufTF = pkgs.protobuf;
         # https://www.tensorflow.org/install/source#gpu
         #cudaPackagesTF = pkgs.cudaPackages_11;
         cudaPackagesTF = pkgs.cudaPackages;
@@ -17926,7 +17927,7 @@ self: super: with self; {
       grpc = compat.grpcTF;
       grpcio = compat.grpcioTF;
       tensorboard = compat.tensorboardTF;
-      abseil-cpp = pkgs.abseil-cpp_202301;
+      #abseil-cpp = pkgs.abseil-cpp_202301;
       snappy-cpp = pkgs.snappy;
 
       # Tensorflow 2.13 doesn't support gcc13:

From 24c43a415b941462c61172353cac982761e39386 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 15:22:29 +0000
Subject: [PATCH 2764/3724] ispc: 1.28.0 -> 1.28.1

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

diff --git a/pkgs/by-name/is/ispc/package.nix b/pkgs/by-name/is/ispc/package.nix
index 17a6a8ef2fa3..7a5045ad356b 100644
--- a/pkgs/by-name/is/ispc/package.nix
+++ b/pkgs/by-name/is/ispc/package.nix
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ispc";
-  version = "1.28.0";
+  version = "1.28.1";
 
   dontFixCmake = true; # https://github.com/NixOS/nixpkgs/pull/232522#issuecomment-2133803566
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     owner = "ispc";
     repo = "ispc";
     rev = "v${version}";
-    sha256 = "sha256-JnJGpuhbABD6/93EBeDJH441nDlG4CKHcyOoTHJ3QcU=";
+    sha256 = "sha256-ZgVkS/l6WVtIh10Q/WIWwFIuMqORdI4UwReTDML5wC4=";
   };
 
   nativeBuildInputs = [

From 6b7b6b30b4f3f30eccfea2cb21cdf1ad2a8782b6 Mon Sep 17 00:00:00 2001
From: oluceps <secinia@outlook.com>
Date: Fri, 22 Aug 2025 23:28:47 +0800
Subject: [PATCH 2765/3724] maple-font: 7.4 -> 7.6

---
 pkgs/data/fonts/maple-font/default.nix |  2 +-
 pkgs/data/fonts/maple-font/hashes.json | 89 +++++++++++++-------------
 2 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/pkgs/data/fonts/maple-font/default.nix b/pkgs/data/fonts/maple-font/default.nix
index 98b6c88c860d..721d73c96d1f 100644
--- a/pkgs/data/fonts/maple-font/default.nix
+++ b/pkgs/data/fonts/maple-font/default.nix
@@ -17,7 +17,7 @@ let
     }:
     stdenv.mkDerivation rec {
       inherit pname;
-      version = "7.4";
+      version = "7.6";
       src = fetchurl {
         url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip";
         inherit hash;
diff --git a/pkgs/data/fonts/maple-font/hashes.json b/pkgs/data/fonts/maple-font/hashes.json
index 111fed91e04a..1025910086a8 100644
--- a/pkgs/data/fonts/maple-font/hashes.json
+++ b/pkgs/data/fonts/maple-font/hashes.json
@@ -1,47 +1,46 @@
 {
-  "MapleMono-CN-unhinted": "sha256-pYhWiOB9RGof+3Uy5KlVgGtHRtoPjkKHW/aulEftrN8=",
-  "MapleMono-CN": "sha256-uDhFvaS8Cz0Gh4uPdHxGHB+ibnmjPgo3brw1Reyubjo=",
-  "MapleMono-NF-CN-unhinted": "sha256-m0OenEinfqOzFPd9J+9hvmlWZyo9gN48KsvtnSJZbQw=",
-  "MapleMono-NF-CN": "sha256-1H1AkMaE+yG2Wlp4NxvKu9z/VEnSyGLVVHX7YK9YlKg=",
-  "MapleMono-NF-unhinted": "sha256-1D7oAcurpS3PCQRky+Spb2l0z2j+ZxMqzQqLdCXAppA=",
-  "MapleMono-NF": "sha256-qPAKfND9r5YomfKQyS6lO7BQwwo4F+KqQdX7Jr9EM9Y=",
-  "MapleMono-OTF": "sha256-6Zl9snDOsgvoswTIa8dqRx+pYAy9N5yQ4J62qvsdlKs=",
-  "MapleMono-TTF-AutoHint": "sha256-ddzGDLCD73+qpdmgY+g2zbk0dNdsLF1dA9yuw3xzTS0=",
-  "MapleMono-TTF": "sha256-ggAJq9Sg8i1lXpE6adNqhVXJH5A1N7derskN/ZTn+KE=",
-  "MapleMono-Variable": "sha256-YKWtUvz3aGrEjihEzcjq6gKG0xFpRKqiSW6cGfhvsy8=",
-  "MapleMono-Woff2": "sha256-NPniX47eSSt6pp7qiqhhq6EpacBDKxlWsiwRToyT2E0=",
-  "MapleMonoNL-CN-unhinted": "sha256-KqFyvmKeDizD1LlaR+L3kiIeXSe+7VoaMJGV1/NMz/8=",
-  "MapleMonoNL-CN": "sha256-HJAWQ/Dw3Mpfjcc756aquUPsRLgKv7tN/w8jDZh4xZ4=",
-  "MapleMonoNL-NF-CN-unhinted": "sha256-hgjKmKScjn3erpKgBetzf7iiJa5WYdC4JzTZQkGbqNg=",
-  "MapleMonoNL-NF-CN": "sha256-qIBhdbJSw9w9k8Vh/goG2F46Yvhn1apeqlSbkD2yn1Q=",
-  "MapleMonoNL-NF-unhinted": "sha256-UI8OAt0PuRXYek4gtg00zZaYKiNiZWx5c79izq/eAbY=",
-  "MapleMonoNL-NF": "sha256-8UlJu96gL1XhZFs1llmAaisH+KsIYsXA9DIqB2EMfjo=",
-  "MapleMonoNL-OTF": "sha256-OOa/etMQQvmrrqC4ZZu4QwLHnsUtypKb00vGlp8Y2j4=",
-  "MapleMonoNL-TTF-AutoHint": "sha256-eQyk1LR+dff3UxfT/I0RCgU0spm1LWRoZtQ0m0JUGRE=",
-  "MapleMonoNL-TTF": "sha256-aRhtKSbzUs179usRUhOpsFMyrM4dqh7xt5mY0POskR4=",
-  "MapleMonoNL-Variable": "sha256-1ueWNUfeavEnHxH4g5Qhci/+LxobRwZq4pTsj4v1os4=",
-  "MapleMonoNL-Woff2": "sha256-5ZRCll9rq79oAnr9WgWxgNFtcdL8ljY72wDZnsox5bI=",
-  "MapleMonoNormal-CN-unhinted": "sha256-hNJfhsaxRnzv/3Y8Gzaf5ym9XxDEyVOrLR3E9FpFl8s=",
-  "MapleMonoNormal-CN": "sha256-SoS52L09o2qZlyKFuRBO5F4PKXBFAFxI6xpc4Ef1XHc=",
-  "MapleMonoNormal-NF-CN-unhinted": "sha256-vbWIGQl5g/OKFF0UK3m2RUZ30bu3H/btzXe0MbJk5IA=",
-  "MapleMonoNormal-NF-CN": "sha256-bcH9LMLMaKJ5A+9994yvbMoUNgz43vQUDTs200YeHn4=",
-  "MapleMonoNormal-NF-unhinted": "sha256-yW15Rf7GE8Qy5Ye9QGBMLma+Kx2Kj+3l/SAAzpBLg8k=",
-  "MapleMonoNormal-NF": "sha256-Eg3hKcHkslsvGzkJDrhkyN0IAYrjHJ+erzFAVAu/K0g=",
-  "MapleMonoNormal-OTF": "sha256-PVsYL/MdD7aX3P5kYafa/xwR84B2uG5TzMfi7i1ROWM=",
-  "MapleMonoNormal-TTF-AutoHint": "sha256-vtEHKBv0gjI6IuzXBmZcUVJS6fPNH/HJqohVZBwXN0U=",
-  "MapleMonoNormal-TTF": "sha256-YkUNl59nllTQca1Duj9phu20rLMiTSmcCXc0RluKln4=",
-  "MapleMonoNormal-Variable": "sha256-i0slIrBUwAXZj6VVUBUsEyN+mySgIBJcA5LL7iBamBA=",
-  "MapleMonoNormal-Woff2": "sha256-U4w4PqR8YC0HotDs/rHuUSf28WBnKNnVHe8FtO8MCHA=",
-  "MapleMonoNormalNL-CN-unhinted": "sha256-dJ2Si+l+NQAC+arOxOhvBFyy5uvWWRKh3RD62fSIl8Q=",
-  "MapleMonoNormalNL-CN": "sha256-/c5jU7O6M+hnRYZuFDVxg/PA+wk75HdllNX5IIarw2k=",
-  "MapleMonoNormalNL-NF-CN-unhinted": "sha256-At6I9eSGrF+9aWF5L2f4b2a3PWq4er7YMnYZJg4xwC8=",
-  "MapleMonoNormalNL-NF-CN": "sha256-EVHoFU4PQkbHknlfEfafYzDKwPwfQsAd+1oZaT8heao=",
-  "MapleMonoNormalNL-NF-unhinted": "sha256-5acGvUcFPQMdSh9CK7MWS/NNo52eiDpUiBRiVH3rsz4=",
-  "MapleMonoNormalNL-NF": "sha256-Y2XSNB9xCOGx9y1fnEHGztK7c9BjAdYj4PH2+Ft9cQ8=",
-  "MapleMonoNormalNL-OTF": "sha256-Sp81tk2teKk9fg7p0LJ0CLXmoh65ZcFNi/BOVzemGqQ=",
-  "MapleMonoNormalNL-TTF-AutoHint": "sha256-JKPgSZOaxqTSlsqEqbfo6ra27LqCxzFRpe78aUWunBw=",
-  "MapleMonoNormalNL-TTF": "sha256-KZBB4fyQmTUVwXsRC8yqiZtG9ED3isj64/tE8sDgSS4=",
-  "MapleMonoNormalNL-Variable": "sha256-95OvqOs9qo/38UPnGWGCF5SGxrRWnEE6OWT8M0J6XY0=",
-  "MapleMonoNormalNL-Woff2": "sha256-BwRa9BpkAe8Tw4mn16+g41Z3giIVoxJTGdC2Vk30lgg="
+  "MapleMono-CN-unhinted": "sha256-QnjRoW04WvGtgoKVm46U0Z0wImp2YVBdB/8LD37mfWk=",
+  "MapleMono-CN": "sha256-BF8VP6uZHgyuy/X0iie43jdJ6zyJUCXHlzHt6fOPEEQ=",
+  "MapleMono-NF-CN-unhinted": "sha256-8PSw/qGYXjpaazyY99bOQFbM+QOkJfizrmll8DTGwq8=",
+  "MapleMono-NF-CN": "sha256-q3wIvSszhOLyZkqvgvipQ2eEvG9K3Sf2o5hrpHS2vD8=",
+  "MapleMono-NF-unhinted": "sha256-7KEs6EtgfdO2DZIFGlHAWdIzKqKDaq7aRTG08HEYihw=",
+  "MapleMono-NF": "sha256-If/kKAFiyOs5NnxXeDOGsLSZRsCdhDmgOtP0SuN96pg=",
+  "MapleMono-OTF": "sha256-5XsHz8QsruS4oNfwazEfAWXSPr+mX+a5ayUPe5DF/nc=",
+  "MapleMono-TTF-AutoHint": "sha256-gmBHcBQk8GuWhdVF+TCB23Bh0raB5HVSwHNacVOScWM=",
+  "MapleMono-TTF": "sha256-n4kivPRcI80jEj7dRX3/SKyWHiBiiXXoY4jEV7eCSSI=",
+  "MapleMono-Variable": "sha256-8US2XL/RTIeWHatHeLv7/yWib5Vv7rdOyNC5qosRXw0=",
+  "MapleMono-Woff2": "sha256-f6khGfztBDMX8q7o9VlvLA2YikPoNDqxCf0KVxAR498=",
+  "MapleMonoNL-CN-unhinted": "sha256-qmtqUCoaWpqGIfIGOBlUU2WIm6vUOUP3S/SyUCCQSSE=",
+  "MapleMonoNL-CN": "sha256-rs5WcOBR9SYVsCFog6CY04RstSfZmbwo4HuwpeGw/V8=",
+  "MapleMonoNL-NF-CN-unhinted": "sha256-p8J1tiBXxus2xTvV884QjT8N19vV/uIlz/bCIIGCUp0=",
+  "MapleMonoNL-NF-CN": "sha256-aDutuElaeOrcKBjNxi096SEylvsSHVe5Fmcj3yoT19M=",
+  "MapleMonoNL-NF-unhinted": "sha256-fcAQa79JDpxB6A4bAGpY5K9RZhVTmoVnyHx72pRtHxE=",
+  "MapleMonoNL-NF": "sha256-HZByDLhGkJPDV7t0LXsINLDMYKso19bJD72MiWU/8N4=",
+  "MapleMonoNL-OTF": "sha256-4zjWL0g7BubP8lVswUe4nPuLHV0rBsAHD/TwmROVXdI=",
+  "MapleMonoNL-TTF-AutoHint": "sha256-9Q4MdpzfiTZB9QFbH3K2O66hkEQmJdgjPRA1iGG51yc=",
+  "MapleMonoNL-TTF": "sha256-PM5Dy1lU5MX5nilxHA34x5jBNYp4m8BknJ/aHrprxpY=",
+  "MapleMonoNL-Variable": "sha256-jvUfLi+DLTCHkdNuKMgcVp49MMeRiVVjwdIVXNKOaYc=",
+  "MapleMonoNL-Woff2": "sha256-SOCpyCMfXS9atPD2g58dTK67M61rJkoYOIolveCjVYY=",
+  "MapleMonoNormal-CN-unhinted": "sha256-X6cnYCp2V7pNLxeYE7BmxQncOfes6Vl4TTpONb10xrI=",
+  "MapleMonoNormal-CN": "sha256-FmZt06ZgRWTRemGMzxkQjU9B26FSQsAFXLc8b/Hv1Ko=",
+  "MapleMonoNormal-NF-CN-unhinted": "sha256-uRJEJVkcoAyK85V788UU29R9lH9Vuw9RbsrrSEOzdMU=",
+  "MapleMonoNormal-NF-CN": "sha256-nXENizBJawD/UgrYUNP9mU8m2mt9KH2Sy6vQeXFOmNI=",
+  "MapleMonoNormal-NF-unhinted": "sha256-qIDYALvHBz8g3V4/jaVAEz5ZIgfNSkLqrVv/AT6pRPM=",
+  "MapleMonoNormal-NF": "sha256-xWAhVQl9xsKXTJWNCfPBUV6gdHhmf9WUUrAYk2erTM0=",
+  "MapleMonoNormal-OTF": "sha256-EU4/dvUR68LaM/je41IyXTQyDxroJUTQ6GvkcaTHsSw=",
+  "MapleMonoNormal-TTF-AutoHint": "sha256-N7DM6nzYRi2zGXMlvc9FmwcWMLvC1bq1AULzsZu0c9E=",
+  "MapleMonoNormal-TTF": "sha256-HRy0W3srGzO54/VxFk+7q6m0iXFHcii47+Tcxz2RkzI=",
+  "MapleMonoNormal-Variable": "sha256-CE1XGv0AlbXRW9uRzXKN4pcQHqK4gtoOQyYLM3S4QZo=",
+  "MapleMonoNormal-Woff2": "sha256-tUvhscxn9r8P8DSJPMRmmUhIB7Owv5fI3fYCYP3CWtg=",
+  "MapleMonoNormalNL-CN-unhinted": "sha256-XT7cnDJsjNm8OFPqnBWMargcaWo9nl77K+4+DHuYZ4w=",
+  "MapleMonoNormalNL-CN": "sha256-6okDLMwtXgIiHfSapwKPk7ZKSSxGTBHFzg5STmgTO9Q=",
+  "MapleMonoNormalNL-NF-CN-unhinted": "sha256-6xQPEAlMjEFb0BaTSqC/4QfCcZYD8uUYMDOgGVFqdrs=",
+  "MapleMonoNormalNL-NF-CN": "sha256-z1xQa89ex5M4fOnl30Ay0O+eVpuP5644OpRVwE4s8qo=",
+  "MapleMonoNormalNL-NF-unhinted": "sha256-7BBO3nUUxFf/Nd1CWBukNjGIhc5MmvB8R7B5V0nTJ6I=",
+  "MapleMonoNormalNL-NF": "sha256-yd8HUSmsTq2RdTNaK0gkh8WpPfuf93vMUD9SZOU415s=",
+  "MapleMonoNormalNL-OTF": "sha256-nNbOJeqWG55IXWmShMMb2YTrjQe5Yz5A0y2zwwV9irI=",
+  "MapleMonoNormalNL-TTF-AutoHint": "sha256-/Dpk7Hb7h/VCU5dHR8AyVrrJTGNHHB6OMY85eJNhMhU=",
+  "MapleMonoNormalNL-TTF": "sha256-ydFuYEgK8o57s67lK1ZAxwTBpuM7fHFGZamQh7YmZcI=",
+  "MapleMonoNormalNL-Variable": "sha256-KcWDxyp2/kdehiL3/eE1I33so+pR7iFl4zSsKSygsWE=",
+  "MapleMonoNormalNL-Woff2": "sha256-f5MaDdfaBgxeR0rGlBr6LrCqyPalZjc2ffUVarD24aw="
 }
-

From b60ce90124afbf92712834506a28f249bfb8a7d6 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 15 Aug 2025 12:28:58 -0400
Subject: [PATCH 2766/3724] windows.sdk: 17.14.10+36327.8 -> 17.14.13+36414.22

---
 pkgs/os-specific/windows/msvcSdk/default.nix  |  6 +-
 pkgs/os-specific/windows/msvcSdk/hashes.json  |  5 +-
 .../os-specific/windows/msvcSdk/manifest.json | 89 ++++++++++---------
 pkgs/os-specific/windows/msvcSdk/update.nu    |  7 +-
 4 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/pkgs/os-specific/windows/msvcSdk/default.nix b/pkgs/os-specific/windows/msvcSdk/default.nix
index 3f7f920b0d67..17e0cce656a6 100644
--- a/pkgs/os-specific/windows/msvcSdk/default.nix
+++ b/pkgs/os-specific/windows/msvcSdk/default.nix
@@ -7,7 +7,7 @@
   llvmPackages,
 }:
 let
-  version = (builtins.fromJSON (builtins.readFile ./manifest.json)).info.productSemanticVersion;
+  version = (builtins.fromJSON (builtins.readFile ./manifest.json)).info.buildVersion;
 
   hashes = (builtins.fromJSON (builtins.readFile ./hashes.json));
 
@@ -117,8 +117,8 @@ else
         url = "https://www.visualstudio.com/license-terms/mt644918/";
       };
       platforms = lib.platforms.all;
-      # The arm manifest is missing critical pieces.
-      broken = stdenvNoCC.hostPlatform.isAarch;
+      # The arm32 manifest is missing critical pieces.
+      broken = stdenvNoCC.hostPlatform.isAarch32;
       sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
       teams = [ lib.teams.windows ];
     };
diff --git a/pkgs/os-specific/windows/msvcSdk/hashes.json b/pkgs/os-specific/windows/msvcSdk/hashes.json
index 725df500ba65..6df8b21c9516 100644
--- a/pkgs/os-specific/windows/msvcSdk/hashes.json
+++ b/pkgs/os-specific/windows/msvcSdk/hashes.json
@@ -1,4 +1,5 @@
 {
-  "x86_64": "sha256-s3iaz9SkV8H1j3rQ1ZWKe9I1o/42+buqxCnGAoA17j8=",
-  "x86": "sha256-ZiFms3GWhTrEcE6/nf3pUjpdux5PRI3AtOzxofk93pk="
+  "x86_64": "sha256-kp+xePTRZgqdAV3/BYhqKke3dXIkLWLM+IWFXtN2rHM=",
+  "x86": "sha256-xEXV+XBNoXpAO8R/oDj8gfGb5tICr9ps4DN8Q4lqK2k=",
+  "aarch64": "sha256-r0tTQUq3CePJ/7Vuzf4Zsy3Ebu0KiXNBwRHmrO3d15E="
 }
diff --git a/pkgs/os-specific/windows/msvcSdk/manifest.json b/pkgs/os-specific/windows/msvcSdk/manifest.json
index 52a9f130cca8..bb4ee81c35f2 100644
--- a/pkgs/os-specific/windows/msvcSdk/manifest.json
+++ b/pkgs/os-specific/windows/msvcSdk/manifest.json
@@ -1,50 +1,51 @@
 {
   "manifestVersion": "1.1",
   "info": {
-    "id": "VisualStudio.17.Release/17.14.10+36327.8",
+    "id": "VisualStudio.17.Release/17.14.13+36414.22.-august.2025-",
     "buildBranch": "d17.14",
-    "buildVersion": "17.14.36327.8",
-    "commitId": "9c44947270e1855daef3c04c366aea2e90d9b7e8",
-    "communityOrLowerFlightId": "eafa266867f74eb",
+    "buildVersion": "17.14.36414.22",
+    "commitId": "1481a1f5e0b5858ec46c868f91b27039ed0d233d",
+    "communityOrLowerFlightId": "1f9f81a7bb554db",
     "localBuild": "build-lab",
     "manifestName": "VisualStudio.17.Release",
     "manifestType": "channel",
-    "productDisplayVersion": "17.14.10",
+    "productDisplayVersion": "17.14.13 (August 2025)",
     "productLine": "Dev17",
     "productLineVersion": "2022",
     "productMilestone": "RTW",
     "productMilestoneIsPreRelease": "False",
     "productName": "Visual Studio",
-    "productPatchVersion": "10",
+    "productPatchVersion": "13",
     "productPreReleaseMilestoneSuffix": "1.0",
-    "productSemanticVersion": "17.14.10+36327.8",
-    "professionalOrGreaterFlightId": "4bfa166bd6094b0",
-    "qBuildSessionId": "8f5f40fc-b90a-ea8e-46c5-2c40390680d0"
+    "productReleaseNameSuffix": "(August 2025)",
+    "productSemanticVersion": "17.14.13+36414.22.-august.2025-",
+    "professionalOrGreaterFlightId": "39d353be42bf474",
+    "qBuildSessionId": "e533c3b6-eb6e-a0b2-8734-a13c66345cb8"
   },
   "channelItems": [
     {
       "id": "Microsoft.VisualStudio.Manifests.VisualStudio",
-      "version": "17.14.36327.8",
+      "version": "17.14.36414.22",
       "type": "Manifest",
       "payloads": [
         {
           "fileName": "VisualStudio.vsman",
-          "sha256": "219fcc842c9f5a431105a409e8f9642ceeebd285a3d6a1c1502cf1761cc564e0",
-          "size": 31342440,
-          "url": "https://download.visualstudio.microsoft.com/download/pr/fd84d0bb-e8dd-4174-b4ad-b2556426fe65/219fcc842c9f5a431105a409e8f9642ceeebd285a3d6a1c1502cf1761cc564e0/VisualStudio.vsman"
+          "sha256": "0cacd8477885cc6f8d7c5de44af0f86e6a53ec9138a7c3d559e227ccacab8f46",
+          "size": 30484157,
+          "url": "https://download.visualstudio.microsoft.com/download/pr/89ee1303-1ba2-4f66-b07c-5099983fd1e4/0cacd8477885cc6f8d7c5de44af0f86e6a53ec9138a7c3d559e227ccacab8f46/VisualStudio.vsman"
         }
       ]
     },
     {
       "id": "Microsoft.VisualStudio.Product.BuildTools",
-      "version": "17.14.36327.8",
+      "version": "17.14.36414.22",
       "type": "ChannelProduct",
       "icon": {
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
       "isHidden": true,
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.10",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
       "localizedResources": [
         {
           "language": "en-us",
@@ -134,7 +135,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Community",
-      "version": "17.14.36327.8",
+      "version": "17.14.36414.22",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "arm64",
@@ -142,7 +143,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.10",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -239,7 +240,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Community",
-      "version": "17.14.36327.8",
+      "version": "17.14.36414.22",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "x64",
@@ -247,7 +248,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.10",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -355,7 +356,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Enterprise",
-      "version": "17.14.36327.8",
+      "version": "17.14.36414.22",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "arm64",
@@ -363,7 +364,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.10",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -460,7 +461,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Enterprise",
-      "version": "17.14.36327.8",
+      "version": "17.14.36414.22",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "x64",
@@ -468,7 +469,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.10",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -576,7 +577,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Professional",
-      "version": "17.14.36327.8",
+      "version": "17.14.36414.22",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "arm64",
@@ -584,7 +585,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.10",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -681,7 +682,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Professional",
-      "version": "17.14.36327.8",
+      "version": "17.14.36414.22",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "x64",
@@ -689,7 +690,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.10",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -797,7 +798,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.TeamExplorer",
-      "version": "17.14.36327.8",
+      "version": "17.14.36414.22",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "x64",
@@ -806,7 +807,7 @@
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
       "isHidden": true,
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.10",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
       "localizedResources": [
         {
           "language": "en-us",
@@ -913,14 +914,14 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.TestAgent",
-      "version": "17.14.36327.8",
+      "version": "17.14.36414.22",
       "type": "ChannelProduct",
       "icon": {
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MCA0MCI+DQogIDxzdHlsZT4uaWNvbi1jYW52YXMtdHJhbnNwYXJlbnR7b3BhY2l0eTowO2ZpbGw6I2Y2ZjZmNn0uYnJhbmQtdnNpZGV7ZmlsbDojODY1ZmM1fTwvc3R5bGU+DQogIDxwYXRoIGNsYXNzPSJpY29uLWNhbnZhcy10cmFuc3BhcmVudCIgZD0iTTQwIDQwSDBWMGg0MHY0MHoiIGlkPSJjYW52YXMiLz4NCiAgPHBhdGggY2xhc3M9ImJyYW5kLXZzaWRlIiBkPSJNMzAuMjIxLS4wMDJMMTMuODg3IDE2LjE2IDQuMDUyIDguNzQ2IDAgMTAuMTAyVjI5LjlsNC4wNTIgMS4zNTYgOS44MzUtNy40MTQgMTYuMzM0IDE2LjE2TDQwIDM1Ljg0MlY0LjE1OGwtOS43NzktNC4xNnpNNC4wNTIgMjUuODlWMTQuMTExTDEwLjAwNCAyMGwtNS45NTIgNS44OXpNMzAgMjguNDcyTDE4Ljk4MyAyMCAzMCAxMS41Mjh2MTYuOTQ0eiIvPg0KPC9zdmc+"
       },
       "isHidden": true,
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.10",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
       "localizedResources": [
         {
           "language": "en-us",
@@ -1010,14 +1011,14 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.TestController",
-      "version": "17.14.36327.8",
+      "version": "17.14.36414.22",
       "type": "ChannelProduct",
       "icon": {
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MCA0MCI+DQogIDxzdHlsZT4uaWNvbi1jYW52YXMtdHJhbnNwYXJlbnR7b3BhY2l0eTowO2ZpbGw6I2Y2ZjZmNn0uYnJhbmQtdnNpZGV7ZmlsbDojODY1ZmM1fTwvc3R5bGU+DQogIDxwYXRoIGNsYXNzPSJpY29uLWNhbnZhcy10cmFuc3BhcmVudCIgZD0iTTQwIDQwSDBWMGg0MHY0MHoiIGlkPSJjYW52YXMiLz4NCiAgPHBhdGggY2xhc3M9ImJyYW5kLXZzaWRlIiBkPSJNMzAuMjIxLS4wMDJMMTMuODg3IDE2LjE2IDQuMDUyIDguNzQ2IDAgMTAuMTAyVjI5LjlsNC4wNTIgMS4zNTYgOS44MzUtNy40MTQgMTYuMzM0IDE2LjE2TDQwIDM1Ljg0MlY0LjE1OGwtOS43NzktNC4xNnpNNC4wNTIgMjUuODlWMTQuMTExTDEwLjAwNCAyMGwtNS45NTIgNS44OXpNMzAgMjguNDcyTDE4Ljk4MyAyMCAzMCAxMS41Mjh2MTYuOTQ0eiIvPg0KPC9zdmc+"
       },
       "isHidden": true,
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.10",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
       "localizedResources": [
         {
           "language": "en-us",
@@ -1107,7 +1108,7 @@
     },
     {
       "id": "VisualStudio.17.Release",
-      "version": "17.14.36327.8",
+      "version": "17.14.36414.22",
       "type": "Channel",
       "localizedResources": [
         {
@@ -1198,15 +1199,15 @@
     },
     {
       "id": "VisualStudio.17.Release.Bootstrappers.Setup",
-      "version": "3.14.2082.286130193",
+      "version": "3.14.2084.286130193",
       "type": "Bootstrapper",
-      "installerVersion": "3.14.2082.42463",
+      "installerVersion": "3.14.2084.208",
       "payloads": [
         {
           "fileName": "vs_Setup.exe",
-          "sha256": "4e6f2345ffe48d7978d9dc239008ce9d49f107c548c9c04eed997b22c2706fa3",
-          "size": 4469024,
-          "url": "https://download.visualstudio.microsoft.com/download/pr/fd84d0bb-e8dd-4174-b4ad-b2556426fe65/4e6f2345ffe48d7978d9dc239008ce9d49f107c548c9c04eed997b22c2706fa3/vs_Setup.exe"
+          "sha256": "1d6cf12ef1543d5e9e54731aec6f10b3931c910abb397f39466a30b6303314db",
+          "size": 4464984,
+          "url": "https://download.visualstudio.microsoft.com/download/pr/89ee1303-1ba2-4f66-b07c-5099983fd1e4/1d6cf12ef1543d5e9e54731aec6f10b3931c910abb397f39466a30b6303314db/vs_Setup.exe"
         }
       ]
     }
@@ -1215,10 +1216,10 @@
     "signInfo": {
       "signatureMethod": "sha256RSA_cng",
       "digestMethod": "sha256",
-      "digestValue": "qUUfinnWy9j/vZ3sjUpT+qiJ2E6vjwYVl97HyPPMRoQ=",
+      "digestValue": "lbYNxXS9fhWwdYlTA8367Q14VLuZk7VWROdUyhPwraI=",
       "canonicalization": ""
     },
-    "signatureValue": "RMBQmisqHpU6tRAoJAgeAsJxabSYi+NdquccW/6tY2zo+NyZ28Nw0JkeqUEXwcKbEU/+SwhnDo+sQuVYYilVs7Q5role/SIBgxedocuffJxEDROkXjEhx5i7LGyg7hPwHGhgpdY6kfcBe6pQBgUUafWosH1zwS7qo/wDTP8qAiDiG/jCGDQ4sZtARHAKVPFJk4HjdQeKIkeErOH/r0WUBT5zFK8fmw4cvZhaC3ctxLuj5BK8EurkMZPn7mS7MfqJxozS4wFMpkdmlBzjx+S5CX3Ko9jIFRveHsIa+6GS0RTHzmjJQML8Gp6SMWesMX1Q13nTq4WhkiBLjQWE07vKkQ==",
+    "signatureValue": "Y5Ni1cH09prdAaftGTIdPVSXAEUfVJILWtNJJbdM59Y33c9uGb+jU9JTQA1dl4Fj4ubmYO+6uxp4wYkNMb8eJY3ZAu76PzabU3duyLe8bsBHAW+3t8qi4raMUP4UXfzawIBKnO0GLAcGLka4NcjNq3vA57pdN5e98TsUZKCwgezqBMEkCjOeBkl26uedWjlrv+HCqTYxFarFargd+elD3IPIB/9RhPwwkyJ+divdoUgqclcoNWV7dC9+TWkJrInCBGVAudOpJEBbotu/nyWYN6AFoB90TuhXpV+LLidY1/i5iA8w0V6y61TsK2ERhJNZoIMFqdYLNeqDEWg7eto0MQ==",
     "keyInfo": {
       "keyValue": {
         "rsaKeyValue": {
@@ -1234,13 +1235,13 @@
     },
     "counterSign": {
       "x509Data": [
-        "MIIHKDCCBRCgAwIBAgITMwAAAgAL16p/GyoXVgABAAACADANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDAeFw0yNDA3MjUxODMxMjFaFw0yNTEwMjIxODMxMjFaMIHTMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQgSXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJzAlBgNVBAsTHm5TaGllbGQgVFNTIEVTTjo1MjFBLTA1RTAtRDk0NzElMCMGA1UEAxMcTWljcm9zb2Z0IFRpbWUtU3RhbXAgU2VydmljZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK9V2mnSpD9k5Lp6Exee9/7ReyiTPQ6Ir93HL9upqp1IZr9gzOfYpBE+Fp0X6OW4hSB3Oi6qyHqgoE/X0/xpLOVSjvdGUFtmr4fzzB55dJGX1/yOc3VaKFx23VFJD4mXzV7M1rMJi/VJVqPJs8r/S6fUwLcP6FzmEwMXWEqjgeVM89UNwPLgqTZbpkDQyRg2OnEp9DJWLpF5JQKwoaupfimK5eq/1pzql0pJwAaYIErCd96C96J5g4jfWFAKWcI5zYfTOpA2p3ks+/P2LQ/9qRqcffy1xC6GsxFBcYcoOCnZqFhjWMHUe/4nfNYHjhEevZeXSb+9Uv5h/i8W+i+vdp/LhJgFcOn1bxPnPMI4GGW5WQjTwMpwpw3bkS3ZNY7MAqo6jXN1/1iMwOxhrOB1EuGCKwFMfB9gPeLwzYgPAFmu2fx0sEwsiIHlW5XV2DNgbcTCqt5J3kaE9uzUO2O5/GU2gI3uwZX47vN7KRj/0FmDWdcGM2FRkcjqXQPFpsauVfH+a+B2hvcz3MpDsiaUWcvld0RooIRZrAiVwHDM4ju+h4p8AiIyJpwhShifyGy4x+ie3yV6kT24Ph+q2C2fFwaZlwRR+D02pGVWMQfz/hEGy+SzcNGSDPnrn8QpY1eDvpx5DPs4EsfPtOwVWTwSrJaKHm7JoSHATtO+/ZHoXImDAgMBAAGjggFJMIIBRTAdBgNVHQ4EFgQUgCUk2r4JIyqoHucUDl59+X13dzowHwYDVR0jBBgwFoAUn6cVXQBeYl2D9OXSZacbUzUZ6XIwXwYDVR0fBFgwVjBUoFKgUIZOaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jcmwvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUyMDIwMTAoMSkuY3JsMGwGCCsGAQUFBwEBBGAwXjBcBggrBgEFBQcwAoZQaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jZXJ0cy9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAxMCgxKS5jcnQwDAYDVR0TAQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAOBgNVHQ8BAf8EBAMCB4AwDQYJKoZIhvcNAQELBQADggIBACjwhvZ40bSKkPn7hAoMc1jLEDiNx71u7FfT5hFggjlpU7hgiMzYt4m3S2UtG9iAx4NMi67XVbgYtxcVXXrCF7s2MqHyHv2pUwXVeA4Yoy017QezYDp6Oxtdojt7eo8tYT0qrsxi68v9phGQcCLEqEtg/h/txwicTw8oczBaj/qZZbTwAgf0DcGe6vhxsmb97/Hrfq0GIPLBdz07lng4N3Uf85NTWsCf3XxQg2JVjXggQi7zT0AXHjGFxURSoXElMLO5hXSAw4WacasiCg9lg8BcjSBhHs5/p3eJF0bqXjRMfnkqSV8pUQ/tXeOYW+j8ziBewZHD7UbRVtsF4JIy6rU1lpQZL85drjX2Cdwj2VWg8jA2ml4Dvh+g4q7CeCBvYpCHfeNfplg3o5I+WmJ/UDekTn6PxzR4NbYpsKRaFIr6gBbuoq1mRcOVfsi6/BS3O52zGtpRUosc7ves3Zw7DyJs9HOkrW2MoSkpTN7g0YvVFsnUiqpxG7SejJPmLsb86a5LlkCWFn6T77oPsE54qMpFcHNMkVXLHeMTM5550bWQxjElBJfbTFZ3m2EbIcGSMiU7AYC2ZhzO6tkxSv1/feOEpCKsmNtgHLi3tBqqDXwEgiHGbc22f8z+JU9vzdKQ259n3wM42ZISPkK6q/fN5kGVsGXa905NTGBJQ04c9g9D",
+        "MIIHKDCCBRCgAwIBAgITMwAAAf8SOHz3wWXWoQABAAAB/zANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDAeFw0yNDA3MjUxODMxMTlaFw0yNTEwMjIxODMxMTlaMIHTMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQgSXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJzAlBgNVBAsTHm5TaGllbGQgVFNTIEVTTjo0QzFBLTA1RTAtRDk0NzElMCMGA1UEAxMcTWljcm9zb2Z0IFRpbWUtU3RhbXAgU2VydmljZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMnoldKQe24PP6nP5pIg3SV58yVj2IJPZkxniN6c0KbMq0SURFnCmB3f/XW/oN8+HVOFQpAGRF6r5MT+UDU7QRuSKXsaaYeD4W4iSsL1/lEuCpEhYX9cH5QwGNbbvQkKoYcXxxVe74bZqhywgpg8YWT5ggYff13xSUCFMFWUfEbVJIM5jfW5lomIH19EfmwwJ53FHbadcYxpgqXQTMoJPytId21E1M0B2+JD39spZCj6FhWJ9hjWIFsPDxgVDtL0zCo2A+qS3gT9IWQ4eT93+MYRi5usffMbiEKf0RZ8wW4LYcklxpfjU9XGQKhshIU+y9EnUe6kJb+acAzXq2yt2EhAypN7A4fUutISyTaj+9YhypBte+RwMoOs5hOad3zja/f3yBKTwJQvGIrMV2hl+EaQwWFSqRo9BQmcIrImbMZtF/cOmUpPDjl3/CcU2FiKn0bls3VIq9Gd44jjrWg6u13cqQeIGa4a/dCnD0w0cL8utM60HGv9Q9Sez0CQCTm24mm6ItdrrFfGsbZU/3QnjwuJ3XBXGq9b/n5wpYbPbtxZ+i5Bw0WXzc4V4CwxMG+nQOMt7OhvoEN+aPdI9oumpmmvCbFf3Ahfog0hswMWWNbENZq3TJs8X1s1zerDyTMuPbXbFkyIGVlTkkvblB4UmJG4DMZy3oil3geTAfUDHDknAgMBAAGjggFJMIIBRTAdBgNVHQ4EFgQUw/qV5P60/3exP9EBO4R9MM/ulGEwHwYDVR0jBBgwFoAUn6cVXQBeYl2D9OXSZacbUzUZ6XIwXwYDVR0fBFgwVjBUoFKgUIZOaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jcmwvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUyMDIwMTAoMSkuY3JsMGwGCCsGAQUFBwEBBGAwXjBcBggrBgEFBQcwAoZQaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jZXJ0cy9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAxMCgxKS5jcnQwDAYDVR0TAQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAOBgNVHQ8BAf8EBAMCB4AwDQYJKoZIhvcNAQELBQADggIBADkjTeTKS4srp5vOun61iItIXWsyjS4Ead1mT34WIDwtyvwzTMy5YmEFAKelrYKJSK2rYr14zhtZSI2shva+nsOB9Z+V2XQ3yddgy46KWqeXtYlP2JNHrrT8nzonr327CM05PxudfrolCZO+9p1c2ruoSNihshgSTrwGwFRUdIPKaWcC4IU+M95pBmY6vzuGfz3JlRrYxqbNkwrSOK2YzzVvDuHP+GiUZmEPzXVvdSUazl0acl60ylD3t5DfDeeo6ZfZKLS4Xb3fPUWzrCTX9l86mwFe141eHGgoJQNm7cw8XMn38F4S7vRzFN3S2EwCPdYEzVBewQPatRL0pQiipTfDddGOIlNJ8iJH6UcWMgG0cquUD2DyRxgNE8tDw/N2gre/UWtCHQyDErsF5aVJ8iMscKw8pYHzhssrFgcEP47NuPW6kDmD3acjnYEXvLV3Rq4A6AXrlTivnEQpV6YpjWMK+taGdv5DzM1a80VGDJAV3vVqnUns4fLcrbrpWGHESveaooRdIq0LOv1jkCZbUF+/ZcxVxPRRZZ/TIsdGrPguBz83fktGwTdwN10UTsAL9NeiArk/IWNSJ8lu48FZjfjpENc3ouui61OUbQM9J08ceTnj8o502iLU0mODhrhlNUl2h+PSUj97fMhmAP76K21uFZ3ng+9tRYMGiU6BxZDi",
         "MIIHcTCCBVmgAwIBAgITMwAAABXF52ueAptJmQAAAAAAFTANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTAwHhcNMjEwOTMwMTgyMjI1WhcNMzAwOTMwMTgzMjI1WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOThpkzntHIhC3miy9ckeb0O1YLT/e6cBwfSqWxOdcjKNVf2AX9sSuDivbk+F2Az/1xPx2b3lVNxWuJ+Slr+uDZnhUYjDLWNE893MsAQGOhgfWpSg0S3po5GawcU88V29YZQ3MFEyHFcUTE3oAo4bo3t1w/YJlN8OWECesSq/XJprx2rrPY2vjUmZNqYO7oaezOtgFt+jBAcnVL+tuhiJdxqD89d9P6OU8/W7IVWTe/dvI2k45GPsjksUZzpcGkNyjYtcI4xyDUoveO0hyTD4MmPfrVUj9z6BVWYbWg7mka97aSueik3rMvrg0XnRm7KMtXAhjBcTyziYrLNueKNiOSWrAFKu75xqRdbZ2De+JKRHh09/SDPc31BmkZ1zcRfNN0Sidb9pSB9fvzZnkXftnIv231fgLrbqn427DZM9ituqBJR6L8FA6PRc6ZNN3SUHDSCD/AQ8rdHGO2n6Jl8P0zbr17C89XYcz1DTsEzOUyOArxCaC4Q6oRRRuLRvWoYWmEBc8pnol7XKHYC4jMYctenIPDC+hIK12NvDMk2ZItboKaDIV1fMHSRlJTYuVD5C4lh8zYGNRiER9vcG9H9stQcxWv2XFJRXRLbJbqvUAV6bMURHXLvjflSxIUXk8A8FdsaN8cIFRg/eKtFtvUeh17aj54WcmnGrnu3tz5q4i6tAgMBAAGjggHdMIIB2TASBgkrBgEEAYI3FQEEBQIDAQABMCMGCSsGAQQBgjcVAgQWBBQqp1L+ZMSavoKRPEY1Kc8Q/y8E7jAdBgNVHQ4EFgQUn6cVXQBeYl2D9OXSZacbUzUZ6XIwXAYDVR0gBFUwUzBRBgwrBgEEAYI3TIN9AQEwQTA/BggrBgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9Eb2NzL1JlcG9zaXRvcnkuaHRtMBMGA1UdJQQMMAoGCCsGAQUFBwMIMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNX2VsuP6KJcYmjRPZSQW9fOmhjEMFYGA1UdHwRPME0wS6BJoEeGRWh0dHA6Ly9jcmwubWljcm9zb2Z0LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNybDBaBggrBgEFBQcBAQROMEwwSgYIKwYBBQUHMAKGPmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2kvY2VydHMvTWljUm9vQ2VyQXV0XzIwMTAtMDYtMjMuY3J0MA0GCSqGSIb3DQEBCwUAA4ICAQCdVX38Kq3hLB9nATEkW+Geckv8qW/qXBS2Pk5HZHixBpOXPTEztTnXwnE2P9pkbHzQdTltuw8x5MKP+2zRoZQYIu7pZmc6U03dmLq2HnjYNi6cqYJWAAOwBb6J6Gngugnue99qb74py27YP0h1AdkY3m2CDPVtI1TkeFN1JFe53Z/zjj3G82jfZfakVqr3lbYoVSfQJL1AoL8ZthISEV09J+BAljis9/kpicO8F7BUhUKz/AyeixmJ5/ALaoHCgRlCGVJ1ijbCHcNhcy4sa3tuPywJeBTpkbKpW99Jo3QMvOyRgNI95ko+ZjtPu4b6MhrZlvSP9pEB9s7GdP32THJvEKt1MMU0sHrYUP4KWN1APMdUbZ1jdEgssU5HLcEUBHG/ZPkkvnNtyo4JvbMBV0lUZNlz138eW0QBjloZkWsNn6Qo3GcZKCS6OEuabvshVGtqRRFHqfG3rsjoiV5PndLQTHa1V1QJsWkBRH58oWFsc/4Ku+xBZj1p/cvBQUl+fpO+y/g75LcVv7TOPqUxUYS8vwLBgqJ7Fx0ViY1w/ue10CgaiQuPNtq6TPmb/wrpNPgkNWcr4A245oyZ1uEi6vAnQj0llOZ0dFtq0Z4+7X6gMTN9vMvpe784cETRkPHIqzqKOghif9lwY1NNje6CbaUFEMFxBmoQtB1VM1izoXBm8g==",
         "MIIF7TCCA9WgAwIBAgIQKMw6Jb+6RKxEmptYa0M5qjANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTAwHhcNMTAwNjIzMjE1NzI0WhcNMzUwNjIzMjIwNDAxWjCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC5CJ4o5OTsBk5QaLNBxXvrrraOr4G6IkQfZTRpTL5wQBfyFnvief2G7Q059BuorZKQHss9do9a2bWREC48BY2KbSRU5x/tVq2DtFCcFaUXdIhZIPwIxYR202jUbyh4zly481CQRP/jY1++oZoslhUE1gf+HoQh4EIxEcQoNpTPUKRinsnWq3EAslsM5pbUCiSW9f/G1bcb18u3IWKvEtyhXTfjGvsaRpjAm8DnYx8qCJMCfh5qjvKfGInkIoWisYRXQP/1DthvnO3iRTEBzRfpf7CBReOqIUAmoXKqp088AQV+7oNYsV4GY5likXiCtw2TDCRqtBvbJ+xflQQ/k0ow9ZcYs6f5GaeTMx0ByNsiUlzXJclG+aL7h1lDvptisY0thkQaRqx4YX4wCfquicRBKiJmA5E5RZzHiwyoyg0v+1LqDPdjMyOd/rAfrWfWp1ADxgRwY7UssYZaQ7f7rvluKW4hIUEmBozJw+6wwoWTobmF2eYybEtMP9Zdo+W1nXfDnMBVt3QA47g4q4OXUOGaQiQdxsCjMNEaWshSNPdz8ccYHzOteuzLQWDzI5QgwkhFrFxRxi6AwuJ3Fb2Fh+02nZaR7gC1o3Dsn+ONgGiDdrqvXXBSIhbiZvu6s8XC9z4vd6bK3sGmxkhMwzdRI9Mn17hOcJbwoUR2r3jPmuFmEwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU1fZWy4/oolxiaNE9lJBb186aGMQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQELBQADggIBAKylloy/u66m9tdxh0MxVoj9HDJxWzW31PCR8q834hTx8wImBT4WFH8UurhP+4mysufUCcxtuVs7ZGVwZrfysVrfGgLz9VG4Z215879We+SEuSsem0CcJjT5RxiYadgc17bRv49hwmfEte9gQ44QGzZJ5CDKrafBsSdlCfjN9Vsq0IQz8+8f8vWcC1iTN6B1oN5y3mx1KmYi9YwGMFafQLkwqkB3FYLXi+zA07K9g8V3DB6urxlToE15cZ8PrzDOZ/nWLMwiQXoH8pdCGM5ZeRBV3m8Q5Ljag2ZAFgloI1uXLiaaArtXjMW4umliMoCJnqH9wJJ8eyszGYQqY8UAaGL6n0eNmXpFOqfp7e5pQrXzgZtHVhB7/HA2hBhz6u/5l02eMyPdJgu6Krc/RNyDJ/+9YVkrEbfKT9vFiwwcMa4y+Pi5Qvd/3GGadrFaBOERPWZFtxhxvskkhdbz1LpBNF0SLSW5jaYTSG1LsAd9mZMJYYF0VyaKq2nj5NnHiMwk2OxSJFwevJEU4pbe6wrant1fs1vb1ILsxiBQhyVAOvvH7s3+M+Vuw4QJVQMlOcDpNV1lMaj2v6AJzSnHszYyLtyV84PBWs+LjfbqsyH4pO0eMQ62TBGrYAukEiMiF6M2ZIKRBBLgq28ey1AFYbRA/1mGcdHVM2l8qXOKONdkDPFp"
       ],
-      "timestamp": "2025-07-27-04:42:04",
+      "timestamp": "2025-08-14-07:37:33",
       "counterSignatureMethod": "timeStamp",
-      "counterSignature": "MIIXmAYJKoZIhvcNAQcCoIIXiTCCF4UCAQMxDzANBglghkgBZQMEAgEFADCCAV0GCyqGSIb3DQEJEAEEoIIBTASCAUgwggFEAgEBBgorBgEEAYRZCgMBMDEwDQYJYIZIAWUDBAIBBQAEIJh+vi75Frd/XH94ra2iJX44MrM/tCHaPTf/AQFgHdAIAgZoerIqRaQYEzIwMjUwNzI3MjM0MjA0LjY1NFowBIACAfQCAZGggdmkgdYwgdMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEnMCUGA1UECxMeblNoaWVsZCBUU1MgRVNOOjUyMUEtMDVFMC1EOTQ3MSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFtcCBTZXJ2aWNloIIR+zCCBygwggUQoAMCAQICEzMAAAIAC9eqfxsqF1YAAQAAAgAwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwHhcNMjQwNzI1MTgzMTIxWhcNMjUxMDIyMTgzMTIxWjCB0zELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEtMCsGA1UECxMkTWljcm9zb2Z0IElyZWxhbmQgT3BlcmF0aW9ucyBMaW1pdGVkMScwJQYDVQQLEx5uU2hpZWxkIFRTUyBFU046NTIxQS0wNUUwLUQ5NDcxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvVdpp0qQ/ZOS6ehMXnvf+0Xsokz0OiK/dxy/bqaqdSGa/YMzn2KQRPhadF+jluIUgdzouqsh6oKBP19P8aSzlUo73RlBbZq+H88weeXSRl9f8jnN1Wihcdt1RSQ+Jl81ezNazCYv1SVajybPK/0un1MC3D+hc5hMDF1hKo4HlTPPVDcDy4Kk2W6ZA0MkYNjpxKfQyVi6ReSUCsKGrqX4piuXqv9ac6pdKScAGmCBKwnfegveieYOI31hQClnCOc2H0zqQNqd5LPvz9i0P/akanH38tcQuhrMRQXGHKDgp2ahYY1jB1Hv+J3zWB44RHr2Xl0m/vVL+Yf4vFvovr3afy4SYBXDp9W8T5zzCOBhluVkI08DKcKcN25Et2TWOzAKqOo1zdf9YjMDsYazgdRLhgisBTHwfYD3i8M2IDwBZrtn8dLBMLIiB5VuV1dgzYG3EwqreSd5GhPbs1DtjufxlNoCN7sGV+O7zeykY/9BZg1nXBjNhUZHI6l0DxabGrlXx/mvgdob3M9zKQ7ImlFnL5XdEaKCEWawIlcBwzOI7voeKfAIiMiacIUoYn8hsuMfont8lepE9uD4fqtgtnxcGmZcEUfg9NqRlVjEH8/4RBsvks3DRkgz565/EKWNXg76ceQz7OBLHz7TsFVk8EqyWih5uyaEhwE7Tvv2R6FyJgwIDAQABo4IBSTCCAUUwHQYDVR0OBBYEFIAlJNq+CSMqqB7nFA5effl9d3c6MB8GA1UdIwQYMBaAFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMF8GA1UdHwRYMFYwVKBSoFCGTmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY3Jvc29mdCUyMFRpbWUtU3RhbXAlMjBQQ0ElMjAyMDEwKDEpLmNybDBsBggrBgEFBQcBAQRgMF4wXAYIKwYBBQUHMAKGUGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY2VydHMvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUyMDIwMTAoMSkuY3J0MAwGA1UdEwEB/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwDgYDVR0PAQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUAA4ICAQAo8Ib2eNG0ipD5+4QKDHNYyxA4jce9buxX0+YRYII5aVO4YIjM2LeJt0tlLRvYgMeDTIuu11W4GLcXFV16whe7NjKh8h79qVMF1XgOGKMtNe0Hs2A6ejsbXaI7e3qPLWE9Kq7MYuvL/aYRkHAixKhLYP4f7ccInE8PKHMwWo/6mWW08AIH9A3Bnur4cbJm/e/x636tBiDywXc9O5Z4ODd1H/OTU1rAn918UINiVY14IEIu809AFx4xhcVEUqFxJTCzuYV0gMOFmnGrIgoPZYPAXI0gYR7Of6d3iRdG6l40TH55KklfKVEP7V3jmFvo/M4gXsGRw+1G0VbbBeCSMuq1NZaUGS/OXa419gncI9lVoPIwNppeA74foOKuwnggb2KQh33jX6ZYN6OSPlpif1A3pE5+j8c0eDW2KbCkWhSK+oAW7qKtZkXDlX7IuvwUtzudsxraUVKLHO73rN2cOw8ibPRzpK1tjKEpKUze4NGL1RbJ1IqqcRu0noyT5i7G/OmuS5ZAlhZ+k++6D7BOeKjKRXBzTJFVyx3jEzOeedG1kMYxJQSX20xWd5thGyHBkjIlOwGAtmYczurZMUr9f33jhKQirJjbYBy4t7Qaqg18BIIhxm3Ntn/M/iVPb83SkNufZ98DONmSEj5Cuqv3zeZBlbBl2vdOTUxgSUNOHPYPQzCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUwDQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aORmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqEUUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTEmr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwGA1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNVHSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29mdC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5jcmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDANBgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th542DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRXud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBewVIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+CljdQDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFrDZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFhbHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7ntdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6FwZvKhggNWMIICPgIBATCCAQGhgdmkgdYwgdMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEnMCUGA1UECxMeblNoaWVsZCBUU1MgRVNOOjUyMUEtMDVFMC1EOTQ3MSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFtcCBTZXJ2aWNloiMKAQEwBwYFKw4DAhoDFQCMk58tlveK+KkvexIuVYVsutaOZKCBgzCBgKR+MHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBDQSAyMDEwMA0GCSqGSIb3DQEBCwUAAgUA7DENkzAiGA8yMDI1MDcyNzIwNDE1NVoYDzIwMjUwNzI4MjA0MTU1WjB0MDoGCisGAQQBhFkKBAExLDAqMAoCBQDsMQ2TAgEAMAcCAQACAhypMAcCAQACAhK6MAoCBQDsMl8TAgEAMDYGCisGAQQBhFkKBAIxKDAmMAwGCisGAQQBhFkKAwKgCjAIAgEAAgMHoSChCjAIAgEAAgMBhqAwDQYJKoZIhvcNAQELBQADggEBABqxFyrNR8Zpr4peLLfWcoT7tbIY6cWdaO/JuxqHklTdbK1vIJ+ddd6asymw4PorliS9UDcVU76gixt7kswLcgkyxNikiIGPCB5Z8lYXMiQrc9ZXpUJH8Gk2ffzjfX5anw9OpQc/nkOlFEMhGW43Zr2a7ClWVmDLev2ciwBpVQ4KAs2vEbG7UD0OWBGVga+v4D+bSf1FkcIvdYlCYk/of+GKiS1xUsF3w8zUe04WrCHahH715uti/i2lFcCr/rMc+95FGh89z5dQCE8GMobpfyObfpXD2JKfyBnNP18TC20fHXs/B35KYcknCaKSsLgqh4JK9WXZmAgO43dV9jut04wxggQNMIIECQIBATCBkzB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAgAL16p/GyoXVgABAAACADANBglghkgBZQMEAgEFAKCCAUowGgYJKoZIhvcNAQkDMQ0GCyqGSIb3DQEJEAEEMC8GCSqGSIb3DQEJBDEiBCCfk1sUrlE2LqTEM7arB8TGcYqqMrYG46yfR8MVajH/tDCB+gYLKoZIhvcNAQkQAi8xgeowgecwgeQwgb0EINTI7ew1ndu6sE0MZQJXg18zaAfhpa5G50iT/0oCT9knMIGYMIGApH4wfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTACEzMAAAIAC9eqfxsqF1YAAQAAAgAwIgQg1O1SgOjzXdzxUcKDpV3Edcq+/A52LcDhewVG1Bjdoq8wDQYJKoZIhvcNAQELBQAEggIAaHqZpIVHkTu/tuSBagQQ2TeBOlZyuBbT+HJGPNXhwl+pdpUjYHvBL7Ij7nm8noe/roHNoxsXXXIXlzycM4NUWotreCEiVPmsEsA2C5rCCdHegLTPqVq+WQP2PuoLRF8e2A/Doyo+A/r4FNYkTELzTnjs4znf3PT0gOJG+H6/+ogYOqlLFEvBprnS1ApKBflUQ1MbeBrMzSQb3+Ma2FfacfpiVXJvHeNappjz7/dnx1bjWJ4YIeJGGcehE3KrY4xNUYOsmOU32TazsTBErzY5O5PvkgFmXvEv2egAVQAKpQtfJShLBVlQ0YAUsYmlRNZ4AgZ/WLJ7T3i/hcc7J3FiBQs7KZpSXyIdti3F+K4BLqzJTOlOmoR+xJloObAndQsYOdiJAQQJVwNJgodp8wjwJxYXR3x00gvBDm/PQAPk2nNHYSPmsiKk5y2w0q9rUf4lamrGBckTqFrkg7jLhs9Ud94bp3SDyCJz/xZLFFfNaYfjkRNbfBXouVXR3BgdouJUW4wm7SYU9dxKRjy/V129uFrZdDRQLu9f1aSNZwCveAtRKNvHrQ0Kj6aHAxSqY57h8UXcgQIIEa7qxBRx/7Bf+5Grjuri4jjNv7nkeoF1IT1Ii7whdPDT5k3CT+8dDhEHejelupyEpieQ3KeWSXkCy/WDLZiixhMvbGUcyOI9rsgA"
+      "counterSignature": "MIIXmAYJKoZIhvcNAQcCoIIXiTCCF4UCAQMxDzANBglghkgBZQMEAgEFADCCAV0GCyqGSIb3DQEJEAEEoIIBTASCAUgwggFEAgEBBgorBgEEAYRZCgMBMDEwDQYJYIZIAWUDBAIBBQAEIPIVdDv5yLUBRQZGsZ7lC10/RB9UrYCBWuetUfd6yLdRAgZok+pHITYYEzIwMjUwODE1MDIzNzMzLjA1M1owBIACAfQCAUyggdmkgdYwgdMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEnMCUGA1UECxMeblNoaWVsZCBUU1MgRVNOOjRDMUEtMDVFMC1EOTQ3MSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFtcCBTZXJ2aWNloIIR+zCCBygwggUQoAMCAQICEzMAAAH/Ejh898Fl1qEAAQAAAf8wDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwHhcNMjQwNzI1MTgzMTE5WhcNMjUxMDIyMTgzMTE5WjCB0zELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEtMCsGA1UECxMkTWljcm9zb2Z0IElyZWxhbmQgT3BlcmF0aW9ucyBMaW1pdGVkMScwJQYDVQQLEx5uU2hpZWxkIFRTUyBFU046NEMxQS0wNUUwLUQ5NDcxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ6JXSkHtuDz+pz+aSIN0lefMlY9iCT2ZMZ4jenNCmzKtElERZwpgd3/11v6DfPh1ThUKQBkReq+TE/lA1O0Ebkil7GmmHg+FuIkrC9f5RLgqRIWF/XB+UMBjW270JCqGHF8cVXu+G2aocsIKYPGFk+YIGH39d8UlAhTBVlHxG1SSDOY31uZaJiB9fRH5sMCedxR22nXGMaYKl0EzKCT8rSHdtRNTNAdviQ9/bKWQo+hYVifYY1iBbDw8YFQ7S9MwqNgPqkt4E/SFkOHk/d/jGEYubrH3zG4hCn9EWfMFuC2HJJcaX41PVxkCobISFPsvRJ1HupCW/mnAM16tsrdhIQMqTewOH1LrSEsk2o/vWIcqQbXvkcDKDrOYTmnd842v398gSk8CULxiKzFdoZfhGkMFhUqkaPQUJnCKyJmzGbRf3DplKTw45d/wnFNhYip9G5bN1SKvRneOI461oOrtd3KkHiBmuGv3Qpw9MNHC/LrTOtBxr/UPUns9AkAk5tuJpuiLXa6xXxrG2VP90J48Lid1wVxqvW/5+cKWGz27cWfouQcNFl83OFeAsMTBvp0DjLezob6BDfmj3SPaLpqZprwmxX9wIX6INIbMDFljWxDWat0ybPF9bNc3qw8kzLj212xZMiBlZU5JL25QeFJiRuAzGct6Ipd4HkwH1Axw5JwIDAQABo4IBSTCCAUUwHQYDVR0OBBYEFMP6leT+tP93sT/RATuEfTDP7pRhMB8GA1UdIwQYMBaAFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMF8GA1UdHwRYMFYwVKBSoFCGTmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY3Jvc29mdCUyMFRpbWUtU3RhbXAlMjBQQ0ElMjAyMDEwKDEpLmNybDBsBggrBgEFBQcBAQRgMF4wXAYIKwYBBQUHMAKGUGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY2VydHMvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUyMDIwMTAoMSkuY3J0MAwGA1UdEwEB/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwDgYDVR0PAQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUAA4ICAQA5I03kykuLK6ebzrp+tYiLSF1rMo0uBGndZk9+FiA8Lcr8M0zMuWJhBQCnpa2CiUitq2K9eM4bWUiNrIb2vp7DgfWfldl0N8nXYMuOilqnl7WJT9iTR660/J86J699uwjNOT8bnX66JQmTvvadXNq7qEjYobIYEk68BsBUVHSDymlnAuCFPjPeaQZmOr87hn89yZUa2MamzZMK0jitmM81bw7hz/holGZhD811b3UlGs5dGnJetMpQ97eQ3w3nqOmX2Si0uF293z1Fs6wk1/ZfOpsBXteNXhxoKCUDZu3MPFzJ9/BeEu70cxTd0thMAj3WBM1QXsED2rUS9KUIoqU3w3XRjiJTSfIiR+lHFjIBtHKrlA9g8kcYDRPLQ8PzdoK3v1FrQh0MgxK7BeWlSfIjLHCsPKWB84bLKxYHBD+Ozbj1upA5g92nI52BF7y1d0auAOgF65U4r5xEKVemKY1jCvrWhnb+Q8zNWvNFRgyQFd71ap1J7OHy3K266VhhxEr3mqKEXSKtCzr9Y5AmW1Bfv2XMVcT0UWWf0yLHRqz4Lgc/N35LRsE3cDddFE7AC/TXogK5PyFjUifJbuPBWY346RDXN6LroutTlG0DPSdPHHk54/KOdNoi1NJjg4a4ZTVJdofj0lI/e3zIZgD++ittbhWd54PvbUWDBolOgcWQ4jCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUwDQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aORmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqEUUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTEmr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwGA1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNVHSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29mdC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5jcmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDANBgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th542DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRXud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBewVIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+CljdQDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFrDZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFhbHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7ntdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6FwZvKhggNWMIICPgIBATCCAQGhgdmkgdYwgdMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEnMCUGA1UECxMeblNoaWVsZCBUU1MgRVNOOjRDMUEtMDVFMC1EOTQ3MSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFtcCBTZXJ2aWNloiMKAQEwBwYFKw4DAhoDFQCpE4xsxLwlxSVyc+TBEsVE9cWymaCBgzCBgKR+MHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBDQSAyMDEwMA0GCSqGSIb3DQEBCwUAAgUA7Ej0AzAiGA8yMDI1MDgxNDIzNDcxNVoYDzIwMjUwODE1MjM0NzE1WjB0MDoGCisGAQQBhFkKBAExLDAqMAoCBQDsSPQDAgEAMAcCAQACAhv6MAcCAQACAhKpMAoCBQDsSkWDAgEAMDYGCisGAQQBhFkKBAIxKDAmMAwGCisGAQQBhFkKAwKgCjAIAgEAAgMHoSChCjAIAgEAAgMBhqAwDQYJKoZIhvcNAQELBQADggEBAK9fpi47WvMujqooPn8AldaYVVTd/MknJtSAfWHf4talrClHZ/GY3RO9tO0acKtSswr3jH2AMF6lAZj+839y/4N0s+bSGllnh9ivYTHw4LeEd3G0PNmbM3aNMKpdlHkXtK4N/6cRwFlkt5zCZvLGaXbkkqrKGqh2Q9X90yxbgbs1H69TAR4/HWcjHTmz0iM093b/w/oJS4LQMciF6g0gpzWVktLVtwfQkzUt16J57c1Z2ipgHojIkeKh09jVPGONJWvABMLmhuahJTDwud4UoHtqrict23MAqaLXzamFbp+98co3t0PCBnJUmpz4VLPQqjp7hZXJOsQK+G64hGxjzcoxggQNMIIECQIBATCBkzB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAf8SOHz3wWXWoQABAAAB/zANBglghkgBZQMEAgEFAKCCAUowGgYJKoZIhvcNAQkDMQ0GCyqGSIb3DQEJEAEEMC8GCSqGSIb3DQEJBDEiBCDXBkeR4xTPjhDrPRQ1qvy98Ybi5Vhtp3ov4Z2GiCR/MDCB+gYLKoZIhvcNAQkQAi8xgeowgecwgeQwgb0EIOQy777JAndprJwi4xPq8Dsk24xpU4jeoONIRXy6nKf9MIGYMIGApH4wfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTACEzMAAAH/Ejh898Fl1qEAAQAAAf8wIgQg54faFq0iHrgxPYuiO0j9wz5AMnXH4ONR1azCBODS3e8wDQYJKoZIhvcNAQELBQAEggIAogObF40R8uk/BOJK2PFjNq2yumWOFcywt0eqZP3QDfy46ul9no0QPjJw+Xgd0Xil5KQiclWmVAE8AUaLXO8dohdf9uuNDgIF3gqEDbug6NPIhJAqEW5AQuSkC+kSqr5K//StsjQEO86OBZRDjqwF2hPAcKUi6yM0vM1EUXBM0wzdsBjKYBmcXSU027HNmawtlj1jJdBdOq8beqVm5G0b2WAVwvdp9kSE0KjslsDNQYMpZjM10AyiGocjb2sgASk5FP8dMzd21mUMDg5OBREXmJIObMQa91ppJLwtgC9jMXOgK4kG1nq4CfSUu4q74+hvc7woNYZx61KAZjA7TdRkv9Vta68JDE+FePNORKXc8NJ+uOqNV8OVzdBLP1++G6yzT+4azot71gvl8V0e+06B43Q9jEkSdX3tOZ6+kUZ9pox1PJ0dAGfs1gcbjH16IdA2ZSktuOkzWxwXs1K9zCyPdmK017dwXQwz2IEY9noycI4L/Id+tXBUKvnHDxzZsz/snNWJPpiyA3mhEXrSAo6nrlCXrHCp5TT0CX8aPjuwuJz1pQG5pF4f1m1mNh2tW4L/D9ZXOql5S3/o3hm8ovjJGTaUTrIG/oBw9OB+1qzBnA07YJ0uSKpEJSFTD3fMUYAUtHq8YzYi4TQjStgddA0h8Q0LWaE2nwEUkVgXGTDt+3wA"
     }
   }
 }
diff --git a/pkgs/os-specific/windows/msvcSdk/update.nu b/pkgs/os-specific/windows/msvcSdk/update.nu
index f713dad36593..7c6ce40880e8 100755
--- a/pkgs/os-specific/windows/msvcSdk/update.nu
+++ b/pkgs/os-specific/windows/msvcSdk/update.nu
@@ -1,5 +1,6 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i nu -p nushell xwin
+#!nix-shell -I nixpkgs=./.
 
 use std/log
 use std/dirs
@@ -19,19 +20,19 @@ def main [] {
   let current_version = nix eval -f "" windows.sdk.version --json | from json
 
   let new_manifest = http get $MANIFEST_URL | decode | from json
-  let new_version = $new_manifest.info.productSemanticVersion
+  let new_version = $new_manifest.info.buildVersion
 
   if $current_version == $new_version {
       log info "Current Windows SDK manifest matches the newest version, exiting..."
       exit 0
   } else {
-    log info $"Previous version (current_version)\nNew version (new_version)"
+    log info $"Previous version ($current_version)\nNew version ($new_version)"
   }
 
   $new_manifest | to json | append "\n" | str join | save -f ($PATH | path join manifest.json)
 
   # TODO: Add arm once it isn't broken
-  let hashes = ["x86_64", "x86"] | par-each {
+  let hashes = ["x86_64", "x86", "aarch64"] | par-each {
     |arch|
     let dir = mktemp -d
 

From c2943d8bd9642392b226696627d30b2ffe839d8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 15:44:00 +0000
Subject: [PATCH 2767/3724] cloudlog: 2.6.20 -> 2.7.0

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

diff --git a/pkgs/by-name/cl/cloudlog/package.nix b/pkgs/by-name/cl/cloudlog/package.nix
index c2336c82ba1b..d16933621601 100644
--- a/pkgs/by-name/cl/cloudlog/package.nix
+++ b/pkgs/by-name/cl/cloudlog/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cloudlog";
-  version = "2.6.20";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "magicbug";
     repo = "Cloudlog";
     rev = version;
-    hash = "sha256-weCD5CgNarAxQ6LzLQTKjg+p2D/JmlWWpsqMHbnP7Iw=";
+    hash = "sha256-OP+CUBuc0Zl/cqZlF1Ryo4WlTDEmAflwxpYPJr3BPvg=";
   };
 
   postPatch = ''

From 5241898a20e15031177759db454308929ee6c578 Mon Sep 17 00:00:00 2001
From: schnusch <schnusch@users.noreply.github.com>
Date: Sat, 22 Mar 2025 00:07:19 +0100
Subject: [PATCH 2768/3724] nixos/systemd-user: enable
 systemd-tmpfiles-clean.timer

Set systemd.user.timers.systemd-tmpfiles-clean.wantedBy when any user tmpfiles
rules are set so NixOS knows to enable the unit.
---
 nixos/modules/system/boot/systemd/user.nix  | 15 ++++++++++-----
 nixos/tests/systemd-user-tmpfiles-rules.nix | 13 +++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/systemd/user.nix b/nixos/modules/system/boot/systemd/user.nix
index 6d60e7c1e7f1..63472a66653b 100644
--- a/nixos/modules/system/boot/systemd/user.nix
+++ b/nixos/modules/system/boot/systemd/user.nix
@@ -12,6 +12,9 @@ with lib;
 let
   cfg = config.systemd.user;
 
+  hasTmpfiles =
+    cfg.tmpfiles.rules != [ ] || any (cfg': cfg'.rules != [ ]) (attrValues cfg.tmpfiles.users);
+
   systemd = config.systemd.package;
 
   inherit (systemdUtils.lib)
@@ -210,11 +213,15 @@ in
       // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit v)) cfg.targets
       // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit v)) cfg.timers;
 
+    systemd.user.timers = {
+      # enable systemd user tmpfiles
+      systemd-tmpfiles-clean.wantedBy = optional hasTmpfiles "timers.target";
+    }
     # Generate timer units for all services that have a ‘startAt’ value.
-    systemd.user.timers = mapAttrs (name: service: {
+    // (mapAttrs (name: service: {
       wantedBy = [ "timers.target" ];
       timerConfig.OnCalendar = service.startAt;
-    }) (filterAttrs (name: service: service.startAt != [ ]) cfg.services);
+    }) (filterAttrs (name: service: service.startAt != [ ]) cfg.services));
 
     # Provide the systemd-user PAM service, required to run systemd
     # user instances.
@@ -233,9 +240,7 @@ in
     systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions.
 
     # enable systemd user tmpfiles
-    systemd.user.services.systemd-tmpfiles-setup.wantedBy = optional (
-      cfg.tmpfiles.rules != [ ] || any (cfg': cfg'.rules != [ ]) (attrValues cfg.tmpfiles.users)
-    ) "basic.target";
+    systemd.user.services.systemd-tmpfiles-setup.wantedBy = optional hasTmpfiles "basic.target";
 
     # /run/current-system/sw/etc/xdg is in systemd's $XDG_CONFIG_DIRS so we can
     # write the tmpfiles.d rules for everyone there
diff --git a/nixos/tests/systemd-user-tmpfiles-rules.nix b/nixos/tests/systemd-user-tmpfiles-rules.nix
index c74a52c4f169..a4a81bb61a85 100644
--- a/nixos/tests/systemd-user-tmpfiles-rules.nix
+++ b/nixos/tests/systemd-user-tmpfiles-rules.nix
@@ -21,6 +21,15 @@
         users.alice.rules = [
           "d %h/only_alice"
         ];
+        users.bob.rules = [
+          "D %h/cleaned_up - - - 0"
+        ];
+      };
+
+      # run every 10 seconds
+      systemd.user.timers.systemd-tmpfiles-clean.timerConfig = {
+        OnStartupSec = "10s";
+        OnUnitActiveSec = "10s";
       };
     };
 
@@ -36,5 +45,9 @@
       machine.wait_until_succeeds("systemctl --user --machine=bob@ is-active systemd-tmpfiles-setup.service")
       machine.succeed("[ -d ~bob/user_tmpfiles_created ]")
       machine.succeed("[ ! -e ~bob/only_alice ]")
+
+      machine.succeed("systemctl --user --machine=bob@ is-active systemd-tmpfiles-clean.timer")
+      machine.succeed("runuser -u bob -- touch ~bob/cleaned_up/file")
+      machine.wait_until_fails("[ -e ~bob/cleaned_up/file ]")
     '';
 }

From ccedb3a95ef7a324626387fc9dcb5c3f5cdef105 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 19 Aug 2025 10:28:20 -0700
Subject: [PATCH 2769/3724] python3Packages.chromadb: pkgs.zstd -> custom
 zstd-c

---
 pkgs/development/python-modules/chromadb/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix
index 8efba3b0d97a..4a351addae9e 100644
--- a/pkgs/development/python-modules/chromadb/default.nix
+++ b/pkgs/development/python-modules/chromadb/default.nix
@@ -11,8 +11,8 @@
   protobuf,
   rustc,
   rustPlatform,
-  pkgs, # zstd hidden by python3Packages.zstd
   openssl,
+  zstd-c,
 
   # dependencies
   bcrypt,
@@ -117,7 +117,7 @@ buildPythonPackage rec {
 
   buildInputs = [
     openssl
-    pkgs.zstd
+    zstd-c
   ];
 
   dependencies = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index afb3dbb3fda4..2966fa30f9b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2520,7 +2520,7 @@ self: super: with self; {
 
   chroma-hnswlib = callPackage ../development/python-modules/chroma-hnswlib { };
 
-  chromadb = callPackage ../development/python-modules/chromadb { };
+  chromadb = callPackage ../development/python-modules/chromadb { zstd-c = pkgs.zstd; };
 
   chromaprint = callPackage ../development/python-modules/chromaprint { };
 

From 44c7414cc634635bfeee3527fc8cc4ecf52c50c9 Mon Sep 17 00:00:00 2001
From: schnusch <schnusch@users.noreply.github.com>
Date: Fri, 22 Aug 2025 12:44:04 +0200
Subject: [PATCH 2770/3724] nixos/systemd-user: add
 systemd.user.tmpfiles.enable

enabled by default, see #391976
---
 nixos/modules/system/boot/systemd/user.nix  | 14 +++++++++-----
 nixos/tests/systemd-user-tmpfiles-rules.nix | 17 ++++++++++++++---
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/system/boot/systemd/user.nix b/nixos/modules/system/boot/systemd/user.nix
index 63472a66653b..802893cecf13 100644
--- a/nixos/modules/system/boot/systemd/user.nix
+++ b/nixos/modules/system/boot/systemd/user.nix
@@ -12,9 +12,6 @@ with lib;
 let
   cfg = config.systemd.user;
 
-  hasTmpfiles =
-    cfg.tmpfiles.rules != [ ] || any (cfg': cfg'.rules != [ ]) (attrValues cfg.tmpfiles.users);
-
   systemd = config.systemd.package;
 
   inherit (systemdUtils.lib)
@@ -123,6 +120,13 @@ in
     };
 
     systemd.user.tmpfiles = {
+      enable =
+        (mkEnableOption "systemd user units systemd-tmpfiles-setup.service and systemd-tmpfiles-clean.timer")
+        // {
+          default = true;
+          example = false;
+        };
+
       rules = mkOption {
         type = types.listOf types.str;
         default = [ ];
@@ -215,7 +219,7 @@ in
 
     systemd.user.timers = {
       # enable systemd user tmpfiles
-      systemd-tmpfiles-clean.wantedBy = optional hasTmpfiles "timers.target";
+      systemd-tmpfiles-clean.wantedBy = optional cfg.tmpfiles.enable "timers.target";
     }
     # Generate timer units for all services that have a ‘startAt’ value.
     // (mapAttrs (name: service: {
@@ -240,7 +244,7 @@ in
     systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions.
 
     # enable systemd user tmpfiles
-    systemd.user.services.systemd-tmpfiles-setup.wantedBy = optional hasTmpfiles "basic.target";
+    systemd.user.services.systemd-tmpfiles-setup.wantedBy = optional cfg.tmpfiles.enable "basic.target";
 
     # /run/current-system/sw/etc/xdg is in systemd's $XDG_CONFIG_DIRS so we can
     # write the tmpfiles.d rules for everyone there
diff --git a/nixos/tests/systemd-user-tmpfiles-rules.nix b/nixos/tests/systemd-user-tmpfiles-rules.nix
index a4a81bb61a85..db621c5e606f 100644
--- a/nixos/tests/systemd-user-tmpfiles-rules.nix
+++ b/nixos/tests/systemd-user-tmpfiles-rules.nix
@@ -6,9 +6,8 @@
     maintainers = [ schnusch ];
   };
 
-  nodes.machine =
-    { ... }:
-    {
+  nodes = rec {
+    machine = {
       users.users = {
         alice.isNormalUser = true;
         bob.isNormalUser = true;
@@ -32,6 +31,11 @@
         OnUnitActiveSec = "10s";
       };
     };
+    disabled = {
+      imports = [ machine ];
+      systemd.user.tmpfiles.enable = false;
+    };
+  };
 
   testScript =
     { ... }:
@@ -49,5 +53,12 @@
       machine.succeed("systemctl --user --machine=bob@ is-active systemd-tmpfiles-clean.timer")
       machine.succeed("runuser -u bob -- touch ~bob/cleaned_up/file")
       machine.wait_until_fails("[ -e ~bob/cleaned_up/file ]")
+
+      # disabled user tmpfiles
+      disabled.succeed("loginctl enable-linger alice bob")
+      for user in ("alice", "bob"):
+          for verb in ("is-enabled", "is-active"):
+              for unit in ("systemd-tmpfiles-setup.service", "systemd-tmpfiles-clean.timer"):
+                  disabled.fail(f"systemctl --user --machine={user}@ {verb} {unit}")
     '';
 }

From ef2c135062257b38aa03cb8aad8c39bd7fad1871 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 19 Aug 2025 10:28:20 -0700
Subject: [PATCH 2771/3724] python3Packages.chromadb: disable integration and
 distributed tests

---
 .../python-modules/chromadb/default.nix            | 10 +++-------
 .../chromadb/disable-fastapi-fixtures.patch        | 14 --------------
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/development/python-modules/chromadb/disable-fastapi-fixtures.patch

diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix
index 4a351addae9e..eaaa7ab4bbac 100644
--- a/pkgs/development/python-modules/chromadb/default.nix
+++ b/pkgs/development/python-modules/chromadb/default.nix
@@ -88,11 +88,6 @@ buildPythonPackage rec {
     hash = "sha256-H+kXxA/6rKzYA19v7Zlx2HbIg/DGicD5FDIs0noVGSk=";
   };
 
-  patches = [
-    # The fastapi servers can't set up their networking in the test environment, so disable for testing
-    ./disable-fastapi-fixtures.patch
-  ];
-
   postPatch = ''
     # Nixpkgs is taking the version from `chromadb_rust_bindings` which is versioned independently
     substituteInPlace pyproject.toml \
@@ -188,9 +183,12 @@ buildPythonPackage rec {
     "-Wignore:PytestCollectionWarning"
   ];
 
+  # Skip the distributed and integration tests
+  # See https://github.com/chroma-core/chroma/issues/5315
   preCheck = ''
     (($(ulimit -n) < 1024)) && ulimit -n 1024
     export HOME=$(mktemp -d)
+    export CHROMA_RUST_BINDINGS_TEST_ONLY=1
   '';
 
   disabledTests = [
@@ -209,8 +207,6 @@ buildPythonPackage rec {
     "test_collection_query_with_invalid_collection_throws"
     "test_collection_update_with_invalid_collection_throws"
     "test_default_embedding"
-    "test_invalid_index_params"
-    "test_peek"
     "test_persist_index_loading"
     "test_query_id_filtering_e2e"
     "test_query_id_filtering_medium_dataset"
diff --git a/pkgs/development/python-modules/chromadb/disable-fastapi-fixtures.patch b/pkgs/development/python-modules/chromadb/disable-fastapi-fixtures.patch
deleted file mode 100644
index 7c63ced3cf95..000000000000
--- a/pkgs/development/python-modules/chromadb/disable-fastapi-fixtures.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/chromadb/test/conftest.py b/chromadb/test/conftest.py
-index efde1c382..163f55c57 100644
---- a/chromadb/test/conftest.py
-+++ b/chromadb/test/conftest.py
-@@ -678,9 +678,6 @@ def sqlite_persistent(request: pytest.FixtureRequest) -> Generator[System, None,
- 
- def system_fixtures() -> List[Callable[[], Generator[System, None, None]]]:
-     fixtures = [
--        fastapi,
--        async_fastapi,
--        fastapi_persistent,
-         sqlite_fixture,
-         sqlite_persistent_fixture,
-     ]

From ccc82635447efe6fb9c92ecd4690ae52d3674e8a Mon Sep 17 00:00:00 2001
From: Sean Gilligan <sean@msgilligan.com>
Date: Thu, 21 Aug 2025 17:32:03 -0700
Subject: [PATCH 2772/3724] graalvm-oracle_23: drop

GraalVM 23 is EOL and has been replaced by GraalVM 24.
---
 pkgs/development/compilers/graalvm/default.nix |  2 +-
 .../graalvm/graalvm-oracle/hashes.nix          | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 33842ffdc498..68f77702eb19 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -31,11 +31,11 @@ lib.makeScope pkgs.newScope (
     graalvm-oracle_24 = (self.callPackage ./graalvm-oracle { version = "24"; }).overrideAttrs (prev: {
       autoPatchelfIgnoreMissingDeps = [ "libonnxruntime.so.1.18.0" ];
     });
-    graalvm-oracle_23 = self.callPackage ./graalvm-oracle { version = "23"; };
     graalvm-oracle_17 = self.callPackage ./graalvm-oracle { version = "17"; };
     graalvm-oracle = self.graalvm-oracle_24;
   }
   // lib.optionalAttrs config.allowAliases {
     graalvm-oracle_22 = throw "GraalVM 22 is EOL, use a newer version instead";
+    graalvm-oracle_23 = throw "GraalVM 23 is EOL, use a newer version instead";
   }
 )
diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
index 325824e2bfa3..ade7a26a62f1 100644
--- a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
+++ b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
@@ -40,24 +40,6 @@
       url = "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_macos-aarch64_bin.tar.gz";
     };
   };
-  "23" = {
-    "aarch64-linux" = {
-      hash = "sha256-VlB664/l7NWFQrPE3vEJvCXkEzKEJ0ck/HNU5pGGTwU=";
-      url = "https://download.oracle.com/graalvm/23/archive/graalvm-jdk-23.0.2_linux-aarch64_bin.tar.gz";
-    };
-    "x86_64-linux" = {
-      hash = "sha256-2wmx/hi4PzOK+bMpFEN3SzFw2euhdTjOLuOcXm1gHfw=";
-      url = "https://download.oracle.com/graalvm/23/archive/graalvm-jdk-23.0.2_linux-x64_bin.tar.gz";
-    };
-    "x86_64-darwin" = {
-      hash = "sha256-tFmfv9OUMEqE6UNb98ZzBp1P4MVl0tRNcPD29YBM6jU=";
-      url = "https://download.oracle.com/graalvm/23/archive/graalvm-jdk-23.0.2_macos-x64_bin.tar.gz";
-    };
-    "aarch64-darwin" = {
-      hash = "sha256-DmRLktA9Ob30hC43i4sicT+qpO2ujv/w2pkp0eBN0Ms=";
-      url = "https://download.oracle.com/graalvm/23/archive/graalvm-jdk-23.0.2_macos-aarch64_bin.tar.gz";
-    };
-  };
   "17" = {
     "aarch64-linux" = {
       hash = "sha256-vZkdSGuS3rdDN7iB4PE6dkycHpD8NYgZCA9zIfpRdeg=";

From c25dd6c655c0ce5d605ba255c9dde53fd1c9ec59 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 22 Aug 2025 17:30:44 +0100
Subject: [PATCH 2773/3724] actions/checkout: update input descriptions

In fb32eb0f296812da443357eafaa350031de431d7 we moved the checked-out
worktrees into a `nixpkgs` directory. Update the input descriptions to
reflect this.
---
 .github/actions/checkout/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml
index 868d832bf8f3..6009cd121c1e 100644
--- a/.github/actions/checkout/action.yml
+++ b/.github/actions/checkout/action.yml
@@ -4,9 +4,9 @@ description: 'Checkout into trusted / untrusted / pinned folders consistently.'
 
 inputs:
   merged-as-untrusted-at:
-    description: "Whether and which SHA to checkout for the merge commit in the ./untrusted folder."
+    description: "Whether and which SHA to checkout for the merge commit in the ./nixpkgs/untrusted folder."
   target-as-trusted-at:
-    description: "Whether and which SHA to checkout for the target commit in the ./trusted folder."
+    description: "Whether and which SHA to checkout for the target commit in the ./nixpkgs/trusted folder."
 
 runs:
   using: composite

From 9d4fb0c40f9b8554723d6f67b60fc0ef562c6766 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 19 Aug 2025 16:01:25 +0200
Subject: [PATCH 2774/3724] workflows/push: remove unused permissions and
 secrets

These were left-over from when the eval workflow still had the labeling
and reviewer components.
---
 .github/workflows/eval.yml | 2 --
 .github/workflows/pr.yml   | 1 -
 .github/workflows/push.yml | 2 --
 3 files changed, 5 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 7efa71913ac7..0acf37476ecc 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -18,8 +18,6 @@ on:
     secrets:
       CACHIX_AUTH_TOKEN:
         required: true
-      OWNER_APP_PRIVATE_KEY:
-        required: false
 
 permissions: {}
 
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 3fcb35bfacc7..82fdd1f3aa82 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -80,7 +80,6 @@ jobs:
       statuses: write
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
-      OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
     with:
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
       targetSha: ${{ needs.prepare.outputs.targetSha }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 4031c3a9cc6f..e980dbe42951 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -39,8 +39,6 @@ jobs:
     # Those are not actually used on push, but will throw an error if not set.
     permissions:
       # compare
-      issues: write
-      pull-requests: write
       statuses: write
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}

From f5267c408d9205aaaeec6e60e18d9230efb62f72 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 18:50:07 +0200
Subject: [PATCH 2775/3724] .github/labeler-no-sync: add backport label to
 action changes

Sometimes *only* the action is changed as well.
---
 .github/labeler-no-sync.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml
index 850b11837ef0..65d54e81a0b2 100644
--- a/.github/labeler-no-sync.yml
+++ b/.github/labeler-no-sync.yml
@@ -26,6 +26,7 @@
   - any:
       - changed-files:
           - any-glob-to-any-file:
+              - .github/actions/*
               - .github/workflows/*
               - ci/**/*.*
 

From b711f8b6398740141b8c1af43b4e48e9cb57f0eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 17:00:46 +0000
Subject: [PATCH 2776/3724] chirp: 0.4.0-unstable-2025-08-13 ->
 0.4.0-unstable-2025-08-19

---
 pkgs/by-name/ch/chirp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index eea4bca31760..b2131feb003f 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2025-08-13";
+  version = "0.4.0-unstable-2025-08-19";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "acb1a78384a804dab1f2f0cc453b3da972d39072";
-    hash = "sha256-+1hzT7peZWtiREeOJqpCyrZNUxOVchxysv9RIAVKPds=";
+    rev = "0705a4c61e11f952ef1bcdb282f22a74dc72782f";
+    hash = "sha256-gUiSuulthiEC94SuXfGzuDDrf2dYTsJLsAjtjAsTIPY=";
   };
 
   nativeBuildInputs = [

From dc8ccdc7737011abb2c92cb4f50de38cf38327fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 17:09:39 +0000
Subject: [PATCH 2777/3724] python3Packages.mitogen: 0.3.26 -> 0.3.27

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

diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix
index a006a471ffdb..45221bc684f3 100644
--- a/pkgs/development/python-modules/mitogen/default.nix
+++ b/pkgs/development/python-modules/mitogen/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "mitogen";
-  version = "0.3.26";
+  version = "0.3.27";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "mitogen-hq";
     repo = "mitogen";
     tag = "v${version}";
-    hash = "sha256-FP8BRiim6be4h+UYIyXR3fSw/bpLcSP6vUdnRruNVLU=";
+    hash = "sha256-vW3OgVFu9xw45g9Idurb2feguH8AhY7qcWbF9nXjLLw=";
   };
 
   build-system = [ setuptools ];

From 12c3277231748ed805db724ec3f46d14eea303eb Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 22 Aug 2025 13:14:30 -0400
Subject: [PATCH 2778/3724] python312Packages.nipype: fix dependencies, minor
 refactor

Removing `future` allows building with Python 3.13.
---
 .../python-modules/nipype/default.nix         | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 80d0a894a9c8..8a656cf0c78d 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -9,8 +9,6 @@
   python-dateutil,
   etelemetry,
   filelock,
-  funcsigs,
-  future,
   looseversion,
   mock,
   networkx,
@@ -19,6 +17,7 @@
   packaging,
   prov,
   psutil,
+  puremagic,
   pybids,
   pydot,
   pytest,
@@ -42,7 +41,6 @@
 buildPythonPackage rec {
   pname = "nipype";
   version = "1.10.0";
-  disabled = pythonOlder "3.7";
   format = "setuptools";
 
   src = fetchPypi {
@@ -52,18 +50,16 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace nipype/interfaces/base/tests/test_core.py \
-      --replace "/usr/bin/env bash" "${bash}/bin/bash"
+      --replace-fail "/usr/bin/env bash" "${bash}/bin/bash"
   '';
 
   pythonRelaxDeps = [ "traits" ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     click
     python-dateutil
     etelemetry
     filelock
-    funcsigs
-    future
     looseversion
     networkx
     nibabel
@@ -71,6 +67,7 @@ buildPythonPackage rec {
     packaging
     prov
     psutil
+    puremagic
     pydot
     rdflib
     scipy
@@ -97,11 +94,12 @@ buildPythonPackage rec {
   '';
   pythonImportsCheck = [ "nipype" ];
 
-  meta = with lib; {
-    homepage = "https://nipy.org/nipype/";
+  meta = {
+    homepage = "https://nipy.org/nipype";
     description = "Neuroimaging in Python: Pipelines and Interfaces";
+    changelog = "https://github.com/nipy/nipype/releases/tag/${version}";
     mainProgram = "nipypecli";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ ashgillman ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ashgillman ];
   };
 }

From 5500e4adb93d838455a12e990148ca9432600eed Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Fri, 22 Aug 2025 19:15:16 +0200
Subject: [PATCH 2779/3724] caddy: 2.10.0 -> 2.10.1

---
 nixos/tests/caddy.nix             |  2 +-
 pkgs/by-name/ca/caddy/package.nix | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix
index 357ebe77f060..7f55fffee6f0 100644
--- a/nixos/tests/caddy.nix
+++ b/nixos/tests/caddy.nix
@@ -74,7 +74,7 @@
           services.caddy = {
             package = pkgs.caddy.withPlugins {
               plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20241211194404-3865845790a7" ];
-              hash = "sha256-BJ+//h/bkj6y2Zhxas8oJyrryiTDR2Qpz7+VloqrbwQ=";
+              hash = "sha256-Da1XSih/yRehXZhvrv3wGp1OEouE7W8WQrdohz9rehQ=";
             };
             configFile = pkgs.writeText "Caddyfile" ''
               {
diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix
index 7e01ddc7a67c..a8cb59e37b8b 100644
--- a/pkgs/by-name/ca/caddy/package.nix
+++ b/pkgs/by-name/ca/caddy/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGoModule,
+  buildGo125Module,
   callPackage,
   fetchFromGitHub,
   nixosTests,
@@ -10,15 +10,15 @@
   stdenv,
 }:
 let
-  version = "2.10.0";
+  version = "2.10.1";
   dist = fetchFromGitHub {
     owner = "caddyserver";
     repo = "dist";
     tag = "v${version}";
-    hash = "sha256-us1TnszA/10OMVSDsNvzRb6mcM4eMR3pQ5EF4ggA958=";
+    hash = "sha256-D1qI7TDJpSvtgpo1FsPZk6mpqRvRharFZ8soI7Mn3RE=";
   };
 in
-buildGoModule {
+buildGo125Module {
   pname = "caddy";
   inherit version;
 
@@ -26,10 +26,10 @@ buildGoModule {
     owner = "caddyserver";
     repo = "caddy";
     tag = "v${version}";
-    hash = "sha256-hzDd2BNTZzjwqhc/STbSAHnNlP7g1cFuMehqU1LumQE=";
+    hash = "sha256-6E4l84UKLz3OxAj5M5CGj1elp9A7jyaoin5Gi/O0y0A=";
   };
 
-  vendorHash = "sha256-9Iu4qmBVkGeSAywLgQuDR7y+TwCBqwhVxhfaXhCDnUc=";
+  vendorHash = "sha256-wjcmWKVmLBAybILUi8tKEDnFbhtybf042ODH7jEq6r8=";
 
   subPackages = [ "cmd/caddy" ];
 

From 5656103c8c4f37908714d2b081585495258fcf63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 17:47:14 +0000
Subject: [PATCH 2780/3724] python3Packages.asyncsleepiq: 1.5.3 -> 1.6.0

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

diff --git a/pkgs/development/python-modules/asyncsleepiq/default.nix b/pkgs/development/python-modules/asyncsleepiq/default.nix
index 9f78951b7d98..ad40e62ec14f 100644
--- a/pkgs/development/python-modules/asyncsleepiq/default.nix
+++ b/pkgs/development/python-modules/asyncsleepiq/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "asyncsleepiq";
-  version = "1.5.3";
+  version = "1.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TDHFKLifNmmAVvD5DjSopEXFbR+KPMIdSA+rLAKrfpI=";
+    hash = "sha256-Fhs1vsAmuCKpkNr5paoY4JGoS8LQzkiZn+m5JWq6Hc0=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 5a07f707c58763a1e72e0ea0c046e060589d9cef Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 22 Aug 2025 18:29:32 +0100
Subject: [PATCH 2781/3724] lib.customisation.callPackageWith: fix line number
 interpolation

We need to use `toString` on `loc.line` because it is an int.
---
 lib/customisation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 802c9ef9a4b8..ba06dfb8055b 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -287,7 +287,7 @@ rec {
           loc = builtins.unsafeGetAttrPos arg fargs;
         in
         "Function called without required argument \"${arg}\" at "
-        + "${loc.file}:${loc.line}${prettySuggestions (getSuggestions arg)}";
+        + "${loc.file}:${toString loc.line}${prettySuggestions (getSuggestions arg)}";
 
       # Only show the error for the first missing argument
       error = errorForArg (head (attrNames missingArgs));

From 6994d6098ec5519f0d4657f92f4947043713b6cd Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 18 Feb 2025 21:19:52 -0400
Subject: [PATCH 2782/3724] technitium-dns-server: fix inaccessible state
 directory

---
 nixos/modules/services/networking/technitium-dns-server.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/technitium-dns-server.nix b/nixos/modules/services/networking/technitium-dns-server.nix
index 0c8499e072d4..143b0c43cfdc 100644
--- a/nixos/modules/services/networking/technitium-dns-server.nix
+++ b/nixos/modules/services/networking/technitium-dns-server.nix
@@ -7,7 +7,6 @@
 
 let
   cfg = config.services.technitium-dns-server;
-  stateDir = "/var/lib/technitium-dns-server";
   inherit (lib)
     mkEnableOption
     mkPackageOption
@@ -61,13 +60,11 @@ in
       after = [ "network.target" ];
 
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/technitium-dns-server ${stateDir}";
+        ExecStart = "${cfg.package}/bin/technitium-dns-server $STATE_DIRECTORY";
 
         DynamicUser = true;
 
         StateDirectory = "technitium-dns-server";
-        WorkingDirectory = stateDir;
-        BindPaths = stateDir;
 
         Restart = "always";
         RestartSec = 10;

From b846984e7cec603433422a729b517bd09662de57 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 22 Aug 2025 14:49:55 -0300
Subject: [PATCH 2783/3724] nixosTests.technitium-dns-server: stop service from
 restarting

---
 nixos/tests/technitium-dns-server.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/technitium-dns-server.nix b/nixos/tests/technitium-dns-server.nix
index 7ac06371ead9..a1736eba79b2 100644
--- a/nixos/tests/technitium-dns-server.nix
+++ b/nixos/tests/technitium-dns-server.nix
@@ -6,6 +6,8 @@
     machine =
       { pkgs, ... }:
       {
+        systemd.services.technitium-dns-server.serviceConfig.Restart = lib.mkForce "no";
+
         services.technitium-dns-server = {
           enable = true;
           openFirewall = true;

From 789cb18a7e377fe4dabf092f522171375e03e469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 21 Aug 2025 08:59:59 -0400
Subject: [PATCH 2784/3724] flameshot: support wlr by default

(cherry picked from commit dad69740359002e6e492663cef08b6c86d8020b5)
---
 pkgs/by-name/fl/flameshot/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix
index 3f71fa56f40d..021707044ad7 100644
--- a/pkgs/by-name/fl/flameshot/package.nix
+++ b/pkgs/by-name/fl/flameshot/package.nix
@@ -10,7 +10,7 @@
   makeBinaryWrapper,
   kdsingleapplication,
   nix-update-script,
-  enableWlrSupport ? false,
+  enableWlrSupport ? !stdenv.hostPlatform.isDarwin,
   enableMonochromeIcon ? false,
 }:
 

From 6ff74a4de154825cd9abe5bf79974cdc68e5e33d Mon Sep 17 00:00:00 2001
From: acture <acturea@gmail.com>
Date: Tue, 29 Jul 2025 17:31:52 +0800
Subject: [PATCH 2785/3724] maintainers: add acture

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c3da2a5e38a4..c18b152c7122 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -547,6 +547,13 @@
     githubId = 124545;
     name = "Anthony Cowley";
   };
+  acture = {
+    email = "acturea@gmail.com";
+    github = "Acture";
+    githubId = 11632382;
+    name = "Acture";
+    keys = [ { fingerprint = "30D9 BFA9 6998 4393 37B1  08EC B0FE 879A 0504 3C80"; } ];
+  };
   acuteaangle = {
     name = "Summer Tea";
     email = "zestypurple@protonmail.com";

From 8c68eb97112b0636fd9a58010852378edb68bde0 Mon Sep 17 00:00:00 2001
From: acture <acturea@gmail.com>
Date: Sat, 26 Jul 2025 22:19:27 +0800
Subject: [PATCH 2786/3724] flang: init at 20.x

---
 .../compilers/llvm/common/default.nix         |  5 +
 .../compilers/llvm/common/flang/default.nix   | 95 +++++++++++++++++++
 .../llvm/common/flang/dummy_target_19+.patch  | 27 ++++++
 pkgs/top-level/all-packages.nix               |  5 +
 4 files changed, 132 insertions(+)
 create mode 100644 pkgs/development/compilers/llvm/common/flang/default.nix
 create mode 100644 pkgs/development/compilers/llvm/common/flang/dummy_target_19+.patch

diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index ce8caa3f01bf..2fc33f526385 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -488,6 +488,11 @@ let
         {
           libclc = callPackage ./libclc { };
         }
+    // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") {
+      flang = callPackage ./flang {
+        mlir = tools.mlir;
+      };
+    }
   );
 
   libraries = lib.makeExtensible (
diff --git a/pkgs/development/compilers/llvm/common/flang/default.nix b/pkgs/development/compilers/llvm/common/flang/default.nix
new file mode 100644
index 000000000000..4a452c0dc962
--- /dev/null
+++ b/pkgs/development/compilers/llvm/common/flang/default.nix
@@ -0,0 +1,95 @@
+{
+  lib,
+  llvm_meta,
+  monorepoSrc,
+  release_version,
+  runCommand,
+  cmake,
+  libxml2,
+  libllvm,
+  ninja,
+  libffi,
+  libclang,
+  stdenv,
+  clang,
+  mlir,
+  version,
+  python3,
+  buildLlvmTools,
+  devExtraCmakeFlags ? [ ],
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "flang";
+  inherit version;
+
+  src = runCommand "flang-src-${version}" { inherit (monorepoSrc) passthru; } ''
+    mkdir -p "$out"
+    cp -r ${monorepoSrc}/${finalAttrs.pname} "$out"
+    cp -r ${monorepoSrc}/cmake "$out"
+    cp -r ${monorepoSrc}/llvm "$out"
+    cp -r ${monorepoSrc}/clang "$out"
+    cp -r ${monorepoSrc}/mlir "$out"
+    cp -r ${monorepoSrc}/third-party "$out"
+    chmod -R +w $out/llvm
+  '';
+
+  patches = [
+    ./dummy_target_19+.patch
+  ];
+  patchFlags = [ "-p2" ];
+
+  sourceRoot = "${finalAttrs.src.name}/flang";
+
+  buildInputs = [
+    libffi
+    libxml2
+    libllvm
+    libclang
+    mlir
+  ];
+  nativeBuildInputs = [
+    cmake
+    clang
+    ninja
+    python3
+    libllvm.dev
+    mlir.dev
+  ];
+  preConfigure = ''
+    ls -l ${libllvm.dev}/lib/cmake/llvm/LLVMConfig.cmake
+    ls -l ${libclang.dev}/lib/cmake/clang/ClangConfig.cmake
+    ls -l ${mlir.dev}/lib/cmake/mlir/MLIRConfig.cmake
+  '';
+  cmakeFlags = [
+    (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
+    (lib.cmakeFeature "LLVM_DIR" "${libllvm.dev}/lib/cmake/llvm")
+    (lib.cmakeFeature "LLVM_TOOLS_BINARY_DIR" "${buildLlvmTools.tblgen}/bin/")
+    (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${buildLlvmTools.tblgen}/bin/llvm-lit")
+    (lib.cmakeFeature "CLANG_DIR" "${libclang.dev}/lib/cmake/clang")
+    (lib.cmakeFeature "MLIR_DIR" "${mlir.dev}/lib/cmake/mlir")
+    (lib.cmakeFeature "MLIR_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/mlir-tblgen")
+    (lib.cmakeFeature "MLIR_TABLEGEN_TARGET" "MLIR-TBLGen")
+    (lib.cmakeBool "LLVM_BUILD_EXAMPLES" false)
+    (lib.cmakeBool "LLVM_ENABLE_PLUGINS" false)
+    (lib.cmakeBool "FLANG_STANDALONE_BUILD" true)
+    (lib.cmakeBool "LLVM_INCLUDE_EXAMPLES" false)
+    (lib.cmakeBool "FLANG_INCLUDE_TESTS" false)
+
+  ]
+  ++ devExtraCmakeFlags;
+
+  postUnpack = ''
+    chmod -R u+w -- $sourceRoot/..
+  '';
+
+  outputs = [ "out" ];
+  requiredSystemFeatures = [ "big-parallel" ];
+  meta = llvm_meta // {
+    homepage = "https://flang.llvm.org/";
+    description = "LLVM-based Fortran frontend";
+    license = lib.licenses.ncsa;
+    mainProgram = "flang";
+    maintainers = with lib.maintainers; [ acture ];
+  };
+})
diff --git a/pkgs/development/compilers/llvm/common/flang/dummy_target_19+.patch b/pkgs/development/compilers/llvm/common/flang/dummy_target_19+.patch
new file mode 100644
index 000000000000..ab09ef650416
--- /dev/null
+++ b/pkgs/development/compilers/llvm/common/flang/dummy_target_19+.patch
@@ -0,0 +1,27 @@
+diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt
+index 070c39eb6e9a..168c97524943 100644
+--- a/flang/CMakeLists.txt
++++ b/flang/CMakeLists.txt
+@@ -1,6 +1,22 @@
+ cmake_minimum_required(VERSION 3.20.0)
+ set(LLVM_SUBPROJECT_TITLE "Flang")
+ 
++# Patch: define dummy mlir-tblgen target for TableGen.cmake
++if(DEFINED MLIR_TABLEGEN_EXE AND NOT TARGET mlir-tblgen)
++  add_executable(mlir-tblgen IMPORTED GLOBAL)
++  set_target_properties(mlir-tblgen PROPERTIES
++    IMPORTED_LOCATION "${MLIR_TABLEGEN_EXE}"
++  )
++endif()
++
++if(DEFINED MLIR_TABLEGEN_EXE AND NOT TARGET MLIR-TBLGen)
++  add_executable(MLIR-TBLGen IMPORTED GLOBAL)
++  set_target_properties(MLIR-TBLGen PROPERTIES
++    IMPORTED_LOCATION "${MLIR_TABLEGEN_EXE}"
++  )
++endif()
++
++
+ if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
+   set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
+ endif()
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 55b7d01de5f6..bfe47208bd2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5580,6 +5580,7 @@ with pkgs;
 
   mlir_16 = llvmPackages_16.mlir;
   mlir_17 = llvmPackages_17.mlir;
+  flang = llvmPackages_20.flang;
 
   libclc = llvmPackages.libclc;
   libllvm = llvmPackages.libllvm;
@@ -5617,6 +5618,7 @@ with pkgs;
       lldb_20 = llvmPackages_20.lldb;
       llvm_20 = llvmPackages_20.llvm;
       bolt_20 = llvmPackages_20.bolt;
+      flang_20 = llvmPackages_20.flang;
 
       llvmPackages_21 = llvmPackagesSet."21";
       clang_21 = llvmPackages_21.clang;
@@ -5624,6 +5626,7 @@ with pkgs;
       lldb_21 = llvmPackages_21.lldb;
       llvm_21 = llvmPackages_21.llvm;
       bolt_21 = llvmPackages_21.bolt;
+      flang_21 = llvmPackages_21.flang;
 
       mkLLVMPackages = llvmPackagesSet.mkPackage;
     })
@@ -5650,12 +5653,14 @@ with pkgs;
     lldb_20
     llvm_20
     bolt_20
+    flang_20
     llvmPackages_21
     clang_21
     lld_21
     lldb_21
     llvm_21
     bolt_21
+    flang_21
     mkLLVMPackages
     ;
 

From 3cdfa9471c6a7884e8e9427a47dd4e7ed93cbec1 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Fri, 22 Aug 2025 19:26:35 +0100
Subject: [PATCH 2787/3724] postgresqlPackages.pgvecto-rs: fix build with rust
 1.89

The `dangerous_implicit_autorefs` lint now causes a compile error [1],
which breaks pgvecto-rs.
This commit forces the lint to only throw a warning.

[1]: https://github.com/rust-lang/rust/pull/141661
---
 ...002-allow-dangerous-implicit-autorefs.diff | 21 +++++++++++++++++++
 .../sql/postgresql/ext/pgvecto-rs/package.nix |  3 +++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-allow-dangerous-implicit-autorefs.diff

diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-allow-dangerous-implicit-autorefs.diff b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-allow-dangerous-implicit-autorefs.diff
new file mode 100644
index 000000000000..34230c372de0
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-allow-dangerous-implicit-autorefs.diff
@@ -0,0 +1,21 @@
+diff --git a/crates/common/src/lib.rs b/crates/common/src/lib.rs
+index 18172b9..6fc7e82 100644
+--- a/crates/common/src/lib.rs
++++ b/crates/common/src/lib.rs
+@@ -1,3 +1,4 @@
++#![warn(dangerous_implicit_autorefs)]
+ pub mod clean;
+ pub mod dir_ops;
+ pub mod file_atomic;
+diff --git a/src/lib.rs b/src/lib.rs
+index 068c65d..82609e9 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -6,6 +6,7 @@
+ #![allow(clippy::needless_range_loop)]
+ #![allow(clippy::single_match)]
+ #![allow(clippy::too_many_arguments)]
++#![warn(dangerous_implicit_autorefs)]
+ 
+ mod bgworker;
+ mod datatype;
diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix
index 323674e11833..412e46646247 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix
@@ -27,6 +27,9 @@ buildPgrxExtension (finalAttrs: {
     (replaceVars ./0001-read-clang-flags-from-environment.diff {
       clang = lib.getExe clang;
     })
+    # Rust 1.89 denies implicit autorefs by default, making the compilation fail.
+    # This restores the behaviour of previous rust versions by making the lint throw a warning instead.
+    ./0002-allow-dangerous-implicit-autorefs.diff
   ];
 
   src = fetchFromGitHub {

From 2082790e795e9bf2e075872db0549d9e4bd3a8ed Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:30:00 +0200
Subject: [PATCH 2788/3724] python313Packages.publicsuffixlist: 1.0.2.20250820
 -> 1.0.2.20250821

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250821-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index fdee10a3f410..73d6960e2aa6 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250820";
+  version = "1.0.2.20250821";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-T2K3Zay1dHGPzMOAxnFymk6Hwwu7U7WTrVrvrcGLva4=";
+    hash = "sha256-QUe1RYmLvjNtHOJqi6MYFW3Zr6bWbI0emz/8ym+CFxY=";
   };
 
   build-system = [ setuptools ];

From e46d5a1bba48d6be3a7786fae773a7904963c20f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:30:31 +0200
Subject: [PATCH 2789/3724] 
 python312Packages.mypy-boto3-apigatewaymanagementapi: 1.40.0 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index dafbdbf65caa..e77084c0a85e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -82,8 +82,8 @@ rec {
       "sha256-mfMTQ3XSVHDjTjQEY/EL1xq4t0KRaPwG2Nu0Pwsbk3o=";
 
   mypy-boto3-apigatewaymanagementapi =
-    buildMypyBoto3Package "apigatewaymanagementapi" "1.40.0"
-      "sha256-wt5RDgTkJZv+GZURGu98gGJRvM0a63JTePQ9aDrwLaE=";
+    buildMypyBoto3Package "apigatewaymanagementapi" "1.40.15"
+      "sha256-E7R5SOWEYyulF1Jh17x7iL89ucc0KpmDnOWo4thHFuk=";
 
   mypy-boto3-apigatewayv2 =
     buildMypyBoto3Package "apigatewayv2" "1.40.0"

From 042556975c3ee5d874b87736b6a6a77aca9f0265 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:30:33 +0200
Subject: [PATCH 2790/3724] python312Packages.mypy-boto3-appfabric: 1.40.0 ->
 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e77084c0a85e..98a43abc8cc3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -98,8 +98,8 @@ rec {
       "sha256-/6S/GdXeAYY9wdapWjcrCyaDmeijp6kSy63m0ITW3fs=";
 
   mypy-boto3-appfabric =
-    buildMypyBoto3Package "appfabric" "1.40.0"
-      "sha256-NtPZSYolKwbty/QgQHi5XeuBE6uDMM+hf3RRw+S9UtE=";
+    buildMypyBoto3Package "appfabric" "1.40.15"
+      "sha256-wLCPBODUaTw6VdnbZ0bD9BzIVTPuGpVlZfeGBZY95B8=";
 
   mypy-boto3-appflow =
     buildMypyBoto3Package "appflow" "1.40.0"

From 041bc2a69b9b7b6447ca950bd6072542b3588613 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:30:37 +0200
Subject: [PATCH 2791/3724] python312Packages.mypy-boto3-backup-gateway: 1.40.0
 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 98a43abc8cc3..3c2b2964d2da 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -162,8 +162,8 @@ rec {
       "sha256-q7HoaGzpwKAPik9I6e9+esVbwH2zRrIhzPQoIW4juPA=";
 
   mypy-boto3-backup-gateway =
-    buildMypyBoto3Package "backup-gateway" "1.40.0"
-      "sha256-7FIXPtt4FMjxXbHtiO4qbS4wUfi10rmVODshIORlfhs=";
+    buildMypyBoto3Package "backup-gateway" "1.40.15"
+      "sha256-BZXrWhqf5gFrTW0fAsiyiydzc0cTv2lPj5DTRLrv+pI=";
 
   mypy-boto3-batch =
     buildMypyBoto3Package "batch" "1.40.12"

From 1ea3925d5ddf904a277b31aee73d469df144de6b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:30:42 +0200
Subject: [PATCH 2792/3724] python312Packages.mypy-boto3-cloudhsm: 1.40.0 ->
 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3c2b2964d2da..4894967b87bc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -234,8 +234,8 @@ rec {
       "sha256-vuRBMVk6gQ+mfNLG/QV/EjvwfX3mM3ttgK/zUsi0ghA=";
 
   mypy-boto3-cloudhsm =
-    buildMypyBoto3Package "cloudhsm" "1.40.0"
-      "sha256-GqcCTcfrPGdt1F2e2kFBZVJuK30sFiP+JSXYXV/sH7g=";
+    buildMypyBoto3Package "cloudhsm" "1.40.15"
+      "sha256-qr7Okanc/7cgrb31a6mxb23S8nvw3iztCcbGNHcMIhk=";
 
   mypy-boto3-cloudhsmv2 =
     buildMypyBoto3Package "cloudhsmv2" "1.40.0"

From 30c452778fdbb19073d4d4600853e4ae7ed4405e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:30:49 +0200
Subject: [PATCH 2793/3724] python312Packages.mypy-boto3-cognito-identity:
 1.40.0 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4894967b87bc..c7d0c926095f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -310,8 +310,8 @@ rec {
       "sha256-AsC0tMY0LbaFxJgLK3QLDrXNOjLkZkvp60AwyQEkeRw=";
 
   mypy-boto3-cognito-identity =
-    buildMypyBoto3Package "cognito-identity" "1.40.0"
-      "sha256-uEEXHsqyaLnPGXs0wVrx+cjUkm8IykxTnWeBOBXb3DU=";
+    buildMypyBoto3Package "cognito-identity" "1.40.15"
+      "sha256-dcRx6MHTZl2tdroNAqvkTtj74tbMULAlw5pkWs57NOk=";
 
   mypy-boto3-cognito-idp =
     buildMypyBoto3Package "cognito-idp" "1.40.7"

From 05cb4853631cbdb05c9f5ffe59a7dcd4a4fa4686 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:30:50 +0200
Subject: [PATCH 2794/3724] python312Packages.mypy-boto3-cognito-idp: 1.40.7 ->
 1.40.14

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c7d0c926095f..a41bbe89ee28 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -314,8 +314,8 @@ rec {
       "sha256-dcRx6MHTZl2tdroNAqvkTtj74tbMULAlw5pkWs57NOk=";
 
   mypy-boto3-cognito-idp =
-    buildMypyBoto3Package "cognito-idp" "1.40.7"
-      "sha256-n1n2O5k0hUHLiMEP2freTDMcYKximRt+yWt86BEjj9I=";
+    buildMypyBoto3Package "cognito-idp" "1.40.14"
+      "sha256-g79jptfBbK/WuUeQDMnEogENZ0ysf1UKfMFa1fzlWkU=";
 
   mypy-boto3-cognito-sync =
     buildMypyBoto3Package "cognito-sync" "1.40.0"

From eef72d1eaf96b6cbc5d6c2b649cee442b692578b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:30:51 +0200
Subject: [PATCH 2795/3724] python312Packages.mypy-boto3-comprehend: 1.40.0 ->
 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a41bbe89ee28..bbc9269940eb 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -322,8 +322,8 @@ rec {
       "sha256-3BylDhj1qWTDr/xeUxdnrKNXbXisMgXL0OoThhdoSZg=";
 
   mypy-boto3-comprehend =
-    buildMypyBoto3Package "comprehend" "1.40.0"
-      "sha256-KVfYSlwqY7/ufb+DEChO5Df3bfX0nw2W60YZW7UXSgk=";
+    buildMypyBoto3Package "comprehend" "1.40.15"
+      "sha256-8lrg38NrNjdyZ/8qKsD1glKqnzrwPvkQ1RAk3qiCi3Q=";
 
   mypy-boto3-comprehendmedical =
     buildMypyBoto3Package "comprehendmedical" "1.40.0"

From 463057f7330580e6c0247b91cbdf0bdbb0414d82 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:30:56 +0200
Subject: [PATCH 2796/3724] python312Packages.mypy-boto3-detective: 1.40.0 ->
 1.40.14

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index bbc9269940eb..d4fec6a59eed 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -390,8 +390,8 @@ rec {
       "sha256-8WIQT3ZFLScp4zge1Cu5OkxeXS9GCCPdYlwJPwwz1GU=";
 
   mypy-boto3-detective =
-    buildMypyBoto3Package "detective" "1.40.0"
-      "sha256-npKb6WwOkXnxh5YYQ4spoS17J5oyzI4u1hw/2+d7dH0=";
+    buildMypyBoto3Package "detective" "1.40.14"
+      "sha256-QDNLIgNekgueP8XNyBbRpT1NbD+ZwxQ2OzWU4aF9/GM=";
 
   mypy-boto3-devicefarm =
     buildMypyBoto3Package "devicefarm" "1.40.0"

From e2744e6758b565ef4a99dde26c736fefb40cd5c7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:00 +0200
Subject: [PATCH 2797/3724] python312Packages.mypy-boto3-dynamodb: 1.40.10 ->
 1.40.14

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d4fec6a59eed..92c6d27fe4a9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -434,8 +434,8 @@ rec {
       "sha256-MjtEiMiKguv1RAeY4Cjk/apJlgi5jH/6avgMtdcp+2Q=";
 
   mypy-boto3-dynamodb =
-    buildMypyBoto3Package "dynamodb" "1.40.10"
-      "sha256-6mAMWQ5aEyi+TeJ9noEG4Sx5KKNmIuiBGK9QYv/xI8s=";
+    buildMypyBoto3Package "dynamodb" "1.40.14"
+      "sha256-fsjrcUrAgOfVVy7IxVaVOTCrpdL7zAWKo8u4fMzkrHk=";
 
   mypy-boto3-dynamodbstreams =
     buildMypyBoto3Package "dynamodbstreams" "1.40.0"

From df4d27bdb89d84b5a556ed00ddb463c8f51c90b8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:01 +0200
Subject: [PATCH 2798/3724] python312Packages.mypy-boto3-ebs: 1.40.0 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 92c6d27fe4a9..a0ea09211f9f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -442,8 +442,8 @@ rec {
       "sha256-x/0Scc259VN45rx94YT48Q3NS7nnd2oNRgxQAmy3nSQ=";
 
   mypy-boto3-ebs =
-    buildMypyBoto3Package "ebs" "1.40.0"
-      "sha256-p+NFAi4x4J6S4v0f2u0awDG+lb2V7r3XwgYwl5CvhHo=";
+    buildMypyBoto3Package "ebs" "1.40.15"
+      "sha256-jtkx0kbI7SB74U5uWyGdVhKMlsy/T82lz3P89k8LMPA=";
 
   mypy-boto3-ec2 =
     buildMypyBoto3Package "ec2" "1.40.13"

From 8fc3e859c42d1c262b366618368e4b884a60ded1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:03 +0200
Subject: [PATCH 2799/3724] python312Packages.mypy-boto3-ecr-public: 1.40.0 ->
 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a0ea09211f9f..290a9a4dfc22 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -458,8 +458,8 @@ rec {
       "sha256-dzPkK8ipL/2Tvr8DQ68TP9UmmP/r0yPYL/3nVc4oaH8=";
 
   mypy-boto3-ecr-public =
-    buildMypyBoto3Package "ecr-public" "1.40.0"
-      "sha256-/BYvjLnsA+u/7Jy54ApT9Ss5acGB6FFBzrWhby8ctxA=";
+    buildMypyBoto3Package "ecr-public" "1.40.15"
+      "sha256-mkaBmHn3LsOHnH4kTWkGbCsL4w/TrPBt/pBXnj+1Ai8=";
 
   mypy-boto3-ecs =
     buildMypyBoto3Package "ecs" "1.40.0"

From 638335d120c1929d9b420d02e5650bb78d7e51ab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:04 +0200
Subject: [PATCH 2800/3724] python312Packages.mypy-boto3-ecs: 1.40.0 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 290a9a4dfc22..a698b57c159a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -462,8 +462,8 @@ rec {
       "sha256-mkaBmHn3LsOHnH4kTWkGbCsL4w/TrPBt/pBXnj+1Ai8=";
 
   mypy-boto3-ecs =
-    buildMypyBoto3Package "ecs" "1.40.0"
-      "sha256-f6FsEABh57bwQ+ffj4b0qds+7X5JGKyDRfuVR2W4J4A=";
+    buildMypyBoto3Package "ecs" "1.40.15"
+      "sha256-ZqswkZ6qHqFpxJctVjK7bZnUz4kE9A5x+1mAjxucPxM=";
 
   mypy-boto3-efs =
     buildMypyBoto3Package "efs" "1.40.0"

From 5130f40fd67b1ba7baf50f18f6f9c060dc61911f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:05 +0200
Subject: [PATCH 2801/3724] python312Packages.mypy-boto3-eks: 1.40.3 -> 1.40.14

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a698b57c159a..f01208f96137 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -470,8 +470,8 @@ rec {
       "sha256-DQZUI72cnRt4YwHMQivMdL4y9B9EN2H7dIMmybcX/Uk=";
 
   mypy-boto3-eks =
-    buildMypyBoto3Package "eks" "1.40.3"
-      "sha256-vkqLHrhHhU4CsvLez2MDUHWwlU91i4i+DVEs5TM3Rp8=";
+    buildMypyBoto3Package "eks" "1.40.14"
+      "sha256-h997Y0qrpGtWKvwDMX5S9wmm+JDEpa/zb5LTYWZJyoQ=";
 
   mypy-boto3-elastic-inference =
     buildMypyBoto3Package "elastic-inference" "1.36.0"

From 15bedb575f0ffe3ff11b648e864b0adbece4d8ee Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:07 +0200
Subject: [PATCH 2802/3724] python312Packages.mypy-boto3-elasticbeanstalk:
 1.40.0 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index f01208f96137..20082ef65ad3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -482,8 +482,8 @@ rec {
       "sha256-wOxSRFLJHcO1Vc26rFKaxe49l5/PKAxDBycvV0ER1Co=";
 
   mypy-boto3-elasticbeanstalk =
-    buildMypyBoto3Package "elasticbeanstalk" "1.40.0"
-      "sha256-uMYIfSNSkNPJnpRgCeM+HVccKZbxyrSXgkfvq+WyoAk=";
+    buildMypyBoto3Package "elasticbeanstalk" "1.40.15"
+      "sha256-TMfQt3rK4aT7DnlJCbJj7sFrDL9NqQc4kQS8sdTdDS0=";
 
   mypy-boto3-elastictranscoder =
     buildMypyBoto3Package "elastictranscoder" "1.40.0"

From 0ef5422cdb94e16454a5227b380a8c000741db35 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:10 +0200
Subject: [PATCH 2803/3724] python312Packages.mypy-boto3-es: 1.40.0 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 20082ef65ad3..39631854e2cb 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -514,8 +514,8 @@ rec {
       "sha256-/Xzo0KU2N14S39gkb1MnJV27anIN92ANcCbKl1b9YVw=";
 
   mypy-boto3-es =
-    buildMypyBoto3Package "es" "1.40.0"
-      "sha256-0lQVhW0/lc/xsR7QN66dMmT5ApN+SxYDZk78liqtqi4=";
+    buildMypyBoto3Package "es" "1.40.15"
+      "sha256-nIRSeL+cX4FVozkogF455I0kGhNJUOMauQPOxCtju50=";
 
   mypy-boto3-events =
     buildMypyBoto3Package "events" "1.40.0"

From a2ba81ff120560e1e0a653359cbf213f87afa173 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:13 +0200
Subject: [PATCH 2804/3724] python312Packages.mypy-boto3-forecastquery: 1.40.0
 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 39631854e2cb..3b9ce8a1d194 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -550,8 +550,8 @@ rec {
       "sha256-mo2xp2XnApilK6zB+KZLt/KcJ6mTPskjidfZ0ju6Xss=";
 
   mypy-boto3-forecastquery =
-    buildMypyBoto3Package "forecastquery" "1.40.0"
-      "sha256-J/cpFdOZUL5B1LxtIBOnE++TdSA1sbqA7ckJ+Ag1Os0=";
+    buildMypyBoto3Package "forecastquery" "1.40.15"
+      "sha256-QPQz6ou7edU28tUPuoFq4v3Hnz/uASm46c7TMSOy+WY=";
 
   mypy-boto3-frauddetector =
     buildMypyBoto3Package "frauddetector" "1.40.0"

From 899b9f2e37b7d2cb44fe32048257535a9abaffe4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:15 +0200
Subject: [PATCH 2805/3724] python312Packages.mypy-boto3-glue: 1.40.11 ->
 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3b9ce8a1d194..d3342e8ef2b3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -574,8 +574,8 @@ rec {
       "sha256-So/NDL0KF5iypLYitnJ/38C5RovqBGXcUhHtlEMnjMM=";
 
   mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.40.11"
-      "sha256-+nNOFsBvWARDHTyOyckg0DTga068yNRP9k35wbXUc8E=";
+    buildMypyBoto3Package "glue" "1.40.15"
+      "sha256-N7fPk0kCAxoiMds7lDpqUcl32+po7MwWI4lHySADHyA=";
 
   mypy-boto3-grafana =
     buildMypyBoto3Package "grafana" "1.40.0"

From 886663881a4ce115215aa9fad45a638b0f5ffd1e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:17 +0200
Subject: [PATCH 2806/3724] python312Packages.mypy-boto3-greengrassv2: 1.40.0
 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d3342e8ef2b3..8854862206cd 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -586,8 +586,8 @@ rec {
       "sha256-LjQRVGdaDoTkLT+FRRt5adFZhzrjV+q2s9HyBrR0pdQ=";
 
   mypy-boto3-greengrassv2 =
-    buildMypyBoto3Package "greengrassv2" "1.40.0"
-      "sha256-FMt0y3H1PQ8I7VdZvh/spGzluAmfPFEXypcR8zsebdM=";
+    buildMypyBoto3Package "greengrassv2" "1.40.15"
+      "sha256-/O+fM3MU2HtFIt1S8+yE3RG59dsHKwJbnINaVmYUnD0=";
 
   mypy-boto3-groundstation =
     buildMypyBoto3Package "groundstation" "1.40.0"

From 0c4200118445c0178e9e5bc7c3a1d6649f0cd5b5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:18 +0200
Subject: [PATCH 2807/3724] python312Packages.mypy-boto3-guardduty: 1.40.10 ->
 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 8854862206cd..1d5b5c8cf53d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -594,8 +594,8 @@ rec {
       "sha256-/LlMFYC7cJWb9C5JIt0dTEPtl2sPsalSq7mYaFSf3c4=";
 
   mypy-boto3-guardduty =
-    buildMypyBoto3Package "guardduty" "1.40.10"
-      "sha256-N1zgIPqI1eeE7ET0VDvMlqj7CQzq/gg2q2uCChZ6Q3c=";
+    buildMypyBoto3Package "guardduty" "1.40.15"
+      "sha256-ZcqIhxhJp0LYjHfCq6mLm8cLp1RXsvDSIwWQLFMDXWE=";
 
   mypy-boto3-health =
     buildMypyBoto3Package "health" "1.40.0"

From e2ddd04b607e2dd63af7366a7089443af4380b1f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:23 +0200
Subject: [PATCH 2808/3724] python312Packages.mypy-boto3-iotdeviceadvisor:
 1.40.0 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1d5b5c8cf53d..7bb5ca3e086c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -658,8 +658,8 @@ rec {
       "sha256-llbeFHGDeVXv++P6wtIh+lwMbVlNPIpDim7s5Ux4MV8=";
 
   mypy-boto3-iotdeviceadvisor =
-    buildMypyBoto3Package "iotdeviceadvisor" "1.40.0"
-      "sha256-mo2XR9wv93818e+usfVTp3m/NbZndY8bSbiTZa+TrSI=";
+    buildMypyBoto3Package "iotdeviceadvisor" "1.40.15"
+      "sha256-E6Y+2g7LsW7wbF1t/SAiFN5S9p0+4vwNykkJdl19voA=";
 
   mypy-boto3-iotevents =
     buildMypyBoto3Package "iotevents" "1.40.0"

From 93d327681f28b0ab53eac07b698f452eee4fea49 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:24 +0200
Subject: [PATCH 2809/3724] python312Packages.mypy-boto3-iotevents: 1.40.0 ->
 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7bb5ca3e086c..c0cc167c2e3f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -662,8 +662,8 @@ rec {
       "sha256-E6Y+2g7LsW7wbF1t/SAiFN5S9p0+4vwNykkJdl19voA=";
 
   mypy-boto3-iotevents =
-    buildMypyBoto3Package "iotevents" "1.40.0"
-      "sha256-3PlH9KqX9zXYayYoseqio20l34nt34YYrp8Zmu/9yIs=";
+    buildMypyBoto3Package "iotevents" "1.40.15"
+      "sha256-Q1s5t45DKkIeolXDh6fhoiYVomIdFTTZyhiGkSrlNgo=";
 
   mypy-boto3-iotevents-data =
     buildMypyBoto3Package "iotevents-data" "1.40.0"

From 66283171e5d11c54d5f1c04a3fb445b8221e8320 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:25 +0200
Subject: [PATCH 2810/3724] python312Packages.mypy-boto3-iotevents-data: 1.40.0
 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c0cc167c2e3f..89fe2aaa265e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -666,8 +666,8 @@ rec {
       "sha256-Q1s5t45DKkIeolXDh6fhoiYVomIdFTTZyhiGkSrlNgo=";
 
   mypy-boto3-iotevents-data =
-    buildMypyBoto3Package "iotevents-data" "1.40.0"
-      "sha256-sIOK6xeN9S4rW+SIdhdHuHEeu4Z1t9xiBQfgspSJYSc=";
+    buildMypyBoto3Package "iotevents-data" "1.40.15"
+      "sha256-CIr9UTs6qHRvEWrlHLooTOYzFKaWA+BwG/N8Fp+XTJg=";
 
   mypy-boto3-iotfleethub =
     buildMypyBoto3Package "iotfleethub" "1.40.0"

From e586c740d84fe6d5fc96cd8ca817f84716d74c04 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:27 +0200
Subject: [PATCH 2811/3724] python312Packages.mypy-boto3-iotthingsgraph: 1.40.0
 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 89fe2aaa265e..7fd971c3e91e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -686,8 +686,8 @@ rec {
       "sha256-BXLPMwfbqcpaRnAuxrmG4pWUsVFHUW+foMvB1gh5Ye4=";
 
   mypy-boto3-iotthingsgraph =
-    buildMypyBoto3Package "iotthingsgraph" "1.40.0"
-      "sha256-0uHWqsERVDW0RYP0fO3TGN/TRGVjf2ShprnuPmpuhUc=";
+    buildMypyBoto3Package "iotthingsgraph" "1.40.15"
+      "sha256-ZBh/vd5cNWOv0kk30gFXNnDrfCmlSUr8mKypEYucUgc=";
 
   mypy-boto3-iottwinmaker =
     buildMypyBoto3Package "iottwinmaker" "1.40.0"

From 00a7ee577c374bd58a0a556dd7c4baea336ea791 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:31 +0200
Subject: [PATCH 2812/3724] 
 python312Packages.mypy-boto3-kinesis-video-signaling: 1.40.0 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7fd971c3e91e..e88bf094f83b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -742,8 +742,8 @@ rec {
       "sha256-OqHwNMeLo8y1J9ClofZc2b8or9LL9ZW66qIOqnBPE4Q=";
 
   mypy-boto3-kinesis-video-signaling =
-    buildMypyBoto3Package "kinesis-video-signaling" "1.40.0"
-      "sha256-+M5DE6Ha6ZT3xRwwfNr6Wk/WZIkOGkEXl89rfWwd7Iw=";
+    buildMypyBoto3Package "kinesis-video-signaling" "1.40.15"
+      "sha256-3XwZsjSiQmed7Msz2HHP796iY9x2nSyd6aMglkv3Lfo=";
 
   mypy-boto3-kinesis-video-webrtc-storage =
     buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.40.0"

From 2e3cfc219e0e1015a4ce38d7b1fa881ce00e2c19 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:33 +0200
Subject: [PATCH 2813/3724] python312Packages.mypy-boto3-kinesisanalyticsv2:
 1.40.0 -> 1.40.14

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e88bf094f83b..632773a4f673 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -754,8 +754,8 @@ rec {
       "sha256-92xYlrd3Q31HrOvJ1dOB/F2zM+CyldYvZBYbHZaOtIw=";
 
   mypy-boto3-kinesisanalyticsv2 =
-    buildMypyBoto3Package "kinesisanalyticsv2" "1.40.0"
-      "sha256-+TJmy+596jgW2w+sJqvZPyJuODHb+94gCqm3ssjXZH0=";
+    buildMypyBoto3Package "kinesisanalyticsv2" "1.40.14"
+      "sha256-rb9scmO7uC9WmimwoCkWyM11yfOSZHQgQR2w1PkRRo0=";
 
   mypy-boto3-kinesisvideo =
     buildMypyBoto3Package "kinesisvideo" "1.40.0"

From 9bc790f4d9f555063cab9d4dfc8ca841b0586fb2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:36 +0200
Subject: [PATCH 2814/3724] python312Packages.mypy-boto3-lexv2-runtime: 1.40.0
 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 632773a4f673..a433d8c7516e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -786,8 +786,8 @@ rec {
       "sha256-FgQalWvHO0Zzisw9CLKIKeNchDh5DMHjos2OIyXto40=";
 
   mypy-boto3-lexv2-runtime =
-    buildMypyBoto3Package "lexv2-runtime" "1.40.0"
-      "sha256-h9SwctBQvaiaMXVHaj5tzwsBVlDrEz5GWv9Hn222Ukc=";
+    buildMypyBoto3Package "lexv2-runtime" "1.40.15"
+      "sha256-75J3DLBsf70P6ur8XyB6iGExyzosrHbb82o7RjE5/3M=";
 
   mypy-boto3-license-manager =
     buildMypyBoto3Package "license-manager" "1.40.0"

From c451701036bac8ec6a978c62bcbef8ab1a65ab64 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:39 +0200
Subject: [PATCH 2815/3724] python312Packages.mypy-boto3-lookoutmetrics: 1.40.0
 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a433d8c7516e..09486c9c5132 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -818,8 +818,8 @@ rec {
       "sha256-REAeA7qKwik8cKk9WZoOcG2uZLtFFKr4jTRdAu902bs=";
 
   mypy-boto3-lookoutmetrics =
-    buildMypyBoto3Package "lookoutmetrics" "1.40.0"
-      "sha256-DGEK29ev4GQ4vpwqO8iq+t9asJxywHsMk3YuqSrfF3s=";
+    buildMypyBoto3Package "lookoutmetrics" "1.40.15"
+      "sha256-ZcL1sZGlckqZFhCqTZwMeghP8K9Hee1Zi3N6wZb9hts=";
 
   mypy-boto3-lookoutvision =
     buildMypyBoto3Package "lookoutvision" "1.40.0"

From 90d554d74d827af2087d01b7b873b59261dfdfa3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:41 +0200
Subject: [PATCH 2816/3724] python312Packages.mypy-boto3-managedblockchain:
 1.40.0 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 09486c9c5132..f4e1564da19a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -838,8 +838,8 @@ rec {
       "sha256-YQD3ujd2DtQuygjhJH/bJnxUQ30n1gyUcSMRMIXcjTc=";
 
   mypy-boto3-managedblockchain =
-    buildMypyBoto3Package "managedblockchain" "1.40.0"
-      "sha256-1zDaKlR03f23CmBe975XugFBDiVC/1WWayCrDZBnBkY=";
+    buildMypyBoto3Package "managedblockchain" "1.40.15"
+      "sha256-YBNBXwG0T7a805OPXYmCvqh8wHubtMG3QW38/eCCuB4=";
 
   mypy-boto3-managedblockchain-query =
     buildMypyBoto3Package "managedblockchain-query" "1.40.0"

From db3143737d880c4bb4237be5c0f0d7ff12e2e3be Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:43 +0200
Subject: [PATCH 2817/3724] python312Packages.mypy-boto3-mediapackage: 1.40.0
 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index f4e1564da19a..2390f0e4fed3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -870,8 +870,8 @@ rec {
       "sha256-hGbdgOvsb+gd7640D1WeXj4tOkzuGwi8Ib/RmmQd4tY=";
 
   mypy-boto3-mediapackage =
-    buildMypyBoto3Package "mediapackage" "1.40.0"
-      "sha256-J1Njm18w+cm4u901YSBLAGmRp4xehLglFCXmrZYMXEQ=";
+    buildMypyBoto3Package "mediapackage" "1.40.15"
+      "sha256-HMPme3zTPKCGRHUhRXgw83o0UV+Frz25+0eOEB9cDdA=";
 
   mypy-boto3-mediapackage-vod =
     buildMypyBoto3Package "mediapackage-vod" "1.40.0"

From 25bcacc5163013d72a513a0baa1076dba5c4d439 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:52 +0200
Subject: [PATCH 2818/3724] python312Packages.mypy-boto3-panorama: 1.40.0 ->
 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2390f0e4fed3..81a17778762b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -998,8 +998,8 @@ rec {
       "sha256-iZ8rz+esBOvQSDwfbF/eaGUWt5Dvfh+lFvCn7XXK4BY=";
 
   mypy-boto3-panorama =
-    buildMypyBoto3Package "panorama" "1.40.0"
-      "sha256-KmP7bsUmw3+/ptwGQtLoNpRdHAgxMVjJptVx/y292cQ=";
+    buildMypyBoto3Package "panorama" "1.40.15"
+      "sha256-PgXa3veO1qGxxUBwZe2bxauFNT3nc0j8vEVk0Q4NtVU=";
 
   mypy-boto3-payment-cryptography =
     buildMypyBoto3Package "payment-cryptography" "1.40.0"

From 3f62d854f851f72be6f845d01544574cd48b589f Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 19 Aug 2025 20:16:00 +0200
Subject: [PATCH 2819/3724] radicle-node: add updateScript

---
 pkgs/by-name/ra/radicle-node/package.nix | 1 +
 pkgs/by-name/ra/radicle-node/update.sh   | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100755 pkgs/by-name/ra/radicle-node/update.sh

diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 7e4138e972bc..e3ec0cc68bfc 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -104,6 +104,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     done
   '';
 
+  passthru.updateScript = ./update.sh;
   passthru.tests =
     let
       package = radicle-node;
diff --git a/pkgs/by-name/ra/radicle-node/update.sh b/pkgs/by-name/ra/radicle-node/update.sh
new file mode 100755
index 000000000000..b1a79b18da55
--- /dev/null
+++ b/pkgs/by-name/ra/radicle-node/update.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p coreutils gnused common-updater-scripts nix-update
+
+version=$(list-git-tags | tail -1 | sed 's|^releases/||')
+nix-update --version="$version" radicle-node

From 28320ab9d72bd4b88dbe73009033c61fc23a1938 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:55 +0200
Subject: [PATCH 2820/3724] python312Packages.mypy-boto3-pinpoint-email: 1.40.0
 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 81a17778762b..cf2f1a21c8df 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1034,8 +1034,8 @@ rec {
       "sha256-7H0lySCszWZpr7YeyGS0nfUeKZX51vf6ILPtHnltHsA=";
 
   mypy-boto3-pinpoint-email =
-    buildMypyBoto3Package "pinpoint-email" "1.40.0"
-      "sha256-jXKgufKeGz07mPq2MBZV4TbKajiXtqDhqMZZ1C3tluU=";
+    buildMypyBoto3Package "pinpoint-email" "1.40.15"
+      "sha256-MZ3FLJdyo1RoUFj6baYu4dR9T8/0nCilk5RRZ+0wvQQ=";
 
   mypy-boto3-pinpoint-sms-voice =
     buildMypyBoto3Package "pinpoint-sms-voice" "1.40.0"

From 108f3389a5a90e0f720ffd1815ebf758c7b3ce7f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:31:56 +0200
Subject: [PATCH 2821/3724] python312Packages.mypy-boto3-pinpoint-sms-voice-v2:
 1.40.0 -> 1.40.14

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index cf2f1a21c8df..1bc7fe3e2189 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1042,8 +1042,8 @@ rec {
       "sha256-Io/83KkG+w+JahVEiFX9GmNyT/6H8qBisemmYpRh4fk=";
 
   mypy-boto3-pinpoint-sms-voice-v2 =
-    buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.40.0"
-      "sha256-3NLCAmTWnTtOErdhtsnYwvQkR043++Ew0G/vT1HcfZg=";
+    buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.40.14"
+      "sha256-Jogfc4bdSgo6ufRjkX+jC6tCcjF2QEF5Wc5a3tZxjPM=";
 
   mypy-boto3-pipes =
     buildMypyBoto3Package "pipes" "1.40.0"

From 6203ba7f0b9addbfe687f241b0cae233a703298f Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 19 Aug 2025 16:43:48 +0200
Subject: [PATCH 2822/3724] radicle-node: add defelo as maintainer

---
 pkgs/by-name/ra/radicle-node/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index e3ec0cc68bfc..fbdb2eebfa64 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -169,6 +169,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       amesgen
       lorenzleutgeb
+      defelo
     ];
     mainProgram = "rad";
   };

From d4d4b211818fc304ead8c6f60717f35d67499723 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:32:01 +0200
Subject: [PATCH 2823/3724] python312Packages.mypy-boto3-resource-groups:
 1.40.0 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1bc7fe3e2189..281d898982cc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1118,8 +1118,8 @@ rec {
       "sha256-qlgF3um/4jRBAMsb9Ru7N8sm4VekcBkhSCvJw6S/4Uk=";
 
   mypy-boto3-resource-groups =
-    buildMypyBoto3Package "resource-groups" "1.40.0"
-      "sha256-ItxjwhL7oRnh/KWFVsVxX1ayANALBasbEPNe0dBmY5Q=";
+    buildMypyBoto3Package "resource-groups" "1.40.15"
+      "sha256-q6SqqJEsDrQfjYpiFp1S2+CnAjKUW+wBsLVSjYng9ZE=";
 
   mypy-boto3-resourcegroupstaggingapi =
     buildMypyBoto3Package "resourcegroupstaggingapi" "1.40.0"

From 679dbc23665c29fa8829863629a5d80cc2874c60 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:32:03 +0200
Subject: [PATCH 2824/3724] 
 python312Packages.mypy-boto3-route53-recovery-control-config: 1.40.0 ->
 1.40.14

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 281d898982cc..f49cfcee1f10 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1142,8 +1142,8 @@ rec {
       "sha256-bl9tBA5QmntHCYMcYhLW8N8w+oTTStr33J5C8kbXnZs=";
 
   mypy-boto3-route53-recovery-control-config =
-    buildMypyBoto3Package "route53-recovery-control-config" "1.40.0"
-      "sha256-4o3SPst6sQ91GZsH6JEVjk2PqPc7zUYQpdQxM/Ki3VI=";
+    buildMypyBoto3Package "route53-recovery-control-config" "1.40.14"
+      "sha256-xHo8vLsSgGMCM3uVYv1ihLAOpkSc3XjuPgKWLFTqDkk=";
 
   mypy-boto3-route53-recovery-readiness =
     buildMypyBoto3Package "route53-recovery-readiness" "1.40.0"

From 11bd5f953436093718b7bdc1af2c0661b282a94e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:32:06 +0200
Subject: [PATCH 2825/3724] python312Packages.mypy-boto3-s3outposts: 1.40.0 ->
 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index f49cfcee1f10..b8ed9016214b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1170,8 +1170,8 @@ rec {
       "sha256-lC5XVPtSUMab52QRqv6o9+2grzETdFjpscjDwvqGNvE=";
 
   mypy-boto3-s3outposts =
-    buildMypyBoto3Package "s3outposts" "1.40.0"
-      "sha256-WRLXguy8jlRl+jw472aPmJXdcZg1mPZ/dfhETIVNLiU=";
+    buildMypyBoto3Package "s3outposts" "1.40.15"
+      "sha256-HPAyUwvfUNZl3Ts3H0evVO7UifAiiwrDPyYJ4titkqA=";
 
   mypy-boto3-sagemaker =
     buildMypyBoto3Package "sagemaker" "1.40.12"

From 43d55f0e58e784cfa4a5ec88cfd703096253c2b6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:32:07 +0200
Subject: [PATCH 2826/3724] python312Packages.mypy-boto3-sagemaker: 1.40.12 ->
 1.40.14

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b8ed9016214b..24ec74af8d4b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1174,8 +1174,8 @@ rec {
       "sha256-HPAyUwvfUNZl3Ts3H0evVO7UifAiiwrDPyYJ4titkqA=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.40.12"
-      "sha256-FJviPobCElEmfwHhttJsF2D/CmruODvljv8e2T0yjSs=";
+    buildMypyBoto3Package "sagemaker" "1.40.14"
+      "sha256-c68Off9js9/KX5ElnEKx1UI0DQvAVsPXyWI0kBs++BQ=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.0"

From c2a2a354d50e4b536910202d8ccfa57df7ea57c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:32:15 +0200
Subject: [PATCH 2827/3724] python312Packages.mypy-boto3-ssm-contacts: 1.40.0
 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 24ec74af8d4b..0d73893e2c38 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1298,8 +1298,8 @@ rec {
       "sha256-SmViQOrSn/z7KOlc58erbJu61xu+fOgfMo/5shT/EUs=";
 
   mypy-boto3-ssm-contacts =
-    buildMypyBoto3Package "ssm-contacts" "1.40.0"
-      "sha256-QUWxj3Yz4+Vi9t3J2f0DCHL/RG/VbJnIqC4BUT9AmOk=";
+    buildMypyBoto3Package "ssm-contacts" "1.40.15"
+      "sha256-4My0GYzzmWFuuIgKWPxxUaCipvSYj7nsb44b7a1krbU=";
 
   mypy-boto3-ssm-incidents =
     buildMypyBoto3Package "ssm-incidents" "1.40.0"

From 2ee118cb2c10e5850f6c54fc8ff13a10119469be Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:32:28 +0200
Subject: [PATCH 2828/3724] python313Packages.boto3-stubs: 1.40.13 -> 1.40.15

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 49b881e377d1..50c5f2efc015 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.13";
+  version = "1.40.15";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-SmZVienkvt+PShB7pvlkxv7zyrPMY6PEaiG4vsNpACo=";
+    hash = "sha256-RzcP/f2fGJmQC7pVT0rhhGQjxFm+rM8R4urkaJavURk=";
   };
 
   build-system = [ setuptools ];

From 3ef40e5b2c9cef34b658e2b3a36c05a5d9fccdd2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 20:39:02 +0200
Subject: [PATCH 2829/3724] favirecon: 1.0.0 -> 1.0.1

Diff: https://github.com/edoardottt/favirecon/compare/v1.0.0...v1.0.1

Changelog: https://github.com/edoardottt/favirecon/releases/tag/v1.0.1
---
 pkgs/by-name/fa/favirecon/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fa/favirecon/package.nix b/pkgs/by-name/fa/favirecon/package.nix
index ef142c9a0d66..1b7398048281 100644
--- a/pkgs/by-name/fa/favirecon/package.nix
+++ b/pkgs/by-name/fa/favirecon/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "favirecon";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "edoardottt";
     repo = "favirecon";
     tag = "v${version}";
-    hash = "sha256-nL5W4i4NJEjhkiO83hL9qK4XCIT5fnwRshyDkU1fASk=";
+    hash = "sha256-fxUukhKbxxUUaOMcYxNR29H1nxRb0IWT0Qy5XJNOYjU=";
   };
 
-  vendorHash = "sha256-PRLXVuqth9z0FkaMqUlEue1BFTI37oiobKOg3JvBYGU=";
+  vendorHash = "sha256-Xsi4EA6wBgF7jmel38csh1T3I/SQfkMI0g1pR54nwCM=";
 
   ldflags = [
     "-s"

From 531a96edd4d4d73bae27ce5eb4ef7f2697ee01b5 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Fri, 22 Aug 2025 20:43:06 +0200
Subject: [PATCH 2830/3724] readest: 0.9.72 -> 0.9.75

Changelog: https://github.com/readest/readest/releases/tag/v0.9.75
Diff: https://github.com/readest/readest/compare/v0.9.72...v0.9.75
---
 pkgs/by-name/re/readest/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index 7a21097d26d6..2dce0c3bf969 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -20,13 +20,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.72";
+  version = "0.9.75";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TaE/u6LmKRe0yHPjaMIXpDOx/QNlBEJv2aw6/ihlkwc=";
+    hash = "sha256-lmBQl4cl8ujUKTkml8Tt/m2K7mh0U8K/sjSSOpN2gKI=";
     fetchSubmodules = true;
   };
 
@@ -40,12 +40,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-EF7HCSxgL/6a45yaKboe812LxCtnvTF2XGVD1AfmoUc=";
+    hash = "sha256-3H+HEQcXUbmTp+Gu7xz/NpxJgrnw1ubWH79yYKhFTeM=";
   };
 
   pnpmRoot = "../..";
 
-  cargoHash = "sha256-rt5QeKK7SChvz3Wi+Y2YY1fWak5xs2p3muJgPxcYUrs=";
+  cargoHash = "sha256-z4S5LqGM92jKnc/bcuPNA3tHfuloH4P6/5hDjJ+Tzs0=";
 
   cargoRoot = "../..";
 

From 34c5aa33a2ebe5ece4254f21674340969f554947 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 18:48:18 +0000
Subject: [PATCH 2831/3724] liboprf: 0.7.1 -> 0.8.0

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

diff --git a/pkgs/by-name/li/liboprf/package.nix b/pkgs/by-name/li/liboprf/package.nix
index 3944080262fb..15a453da8eca 100644
--- a/pkgs/by-name/li/liboprf/package.nix
+++ b/pkgs/by-name/li/liboprf/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "liboprf";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "stef";
     repo = "liboprf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-auC6iVTMbLktKCPY8VgOdx2dMI2KDzNgtY1zyNXjM1A=";
+    hash = "sha256-xDE9UkHDAaA7zC6IxxEIUG7ziS1yYNLJbmVJZLJyL7U=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";

From d751de9e8bc62dba2664799c7e8426fac1a744dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 18:56:12 +0000
Subject: [PATCH 2832/3724] werf: 2.47.0 -> 2.47.2

---
 pkgs/by-name/we/werf/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index 28b20f51873c..dde28c787c1e 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -10,17 +10,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "werf";
-  version = "2.47.0";
+  version = "2.47.2";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FrFo/RJuwNQps6Fqr/B+xwgYvL9wbVyEkvh91ujf3gU=";
+    hash = "sha256-Dzd5Bo2583J1A08uOMUhApqiSQUlQ1gDh8lmUi8vft0=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-/0snKYzNJMbXGikMq81XIwn7ip53bV7MT31VmeA668g=";
+  vendorHash = "sha256-kFaXOvJBp/QU0N2Jwq450G48O2GYgC2Pc+2bGK9rJ9g=";
 
   subPackages = [ "cmd/werf" ];
 

From f21aab67183b28df3663c9762fb835179643b68a Mon Sep 17 00:00:00 2001
From: Dmitry Moskowski <me@corpix.ru>
Date: Fri, 22 Aug 2025 19:18:15 +0000
Subject: [PATCH 2833/3724] pcb2gcode: fix finding boost

---
 pkgs/by-name/pc/pcb2gcode/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/pc/pcb2gcode/package.nix b/pkgs/by-name/pc/pcb2gcode/package.nix
index 3d0cc9ef7069..06ea18078fdb 100644
--- a/pkgs/by-name/pc/pcb2gcode/package.nix
+++ b/pkgs/by-name/pc/pcb2gcode/package.nix
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-c5YabBqZn6ilIkF3lifTsYyLZMsZN21jDj1hNu0PRAc=";
   };
 
+  configureFlags = [
+    (lib.withFeatureAs true "boost" boost.dev)
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     pkg-config

From 35bf41ffdd2213a75cdc36d2a16aab4aff73a708 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 00:51:24 +0000
Subject: [PATCH 2834/3724] cflow: 1.7 -> 1.8

---
 pkgs/by-name/cf/cflow/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cf/cflow/package.nix b/pkgs/by-name/cf/cflow/package.nix
index e6685a63ab7d..06e0c6af6ca5 100644
--- a/pkgs/by-name/cf/cflow/package.nix
+++ b/pkgs/by-name/cf/cflow/package.nix
@@ -8,17 +8,18 @@
 
 stdenv.mkDerivation rec {
   pname = "cflow";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchurl {
-    url = "mirror://gnu/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-0BFGyvkAHiZhM0F8KoJYpktfwW/LCCoU9lKCBNDJcIY=";
+    url = "mirror://gnu/cflow/cflow-${version}.tar.bz2";
+    hash = "sha256-gyFie1W2x4d/akP8xvn4RqlLFHaggaA1Rl96eNNJmrg=";
   };
 
-  patchPhase = ''
-    substituteInPlace "src/cflow.h"					\
-      --replace "/usr/bin/cpp"						\
-                "$(cat ${stdenv.cc}/nix-support/orig-cc)/bin/cpp"
+  postPatch = ''
+    substituteInPlace "config.h.in" \
+      --replace-fail "[[__maybe_unused__]]" "__attribute__((__unused__))"
+    substituteInPlace "src/cflow.h" \
+      --replace-fail "/usr/bin/cpp" "${stdenv.cc.cc}/bin/cpp"
   '';
 
   buildInputs = [

From f0d61f002420e9a92c1d28127617f14027fb7b0b Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Fri, 22 Aug 2025 20:45:28 +0200
Subject: [PATCH 2835/3724] shader-slang: 2025.12.1 -> 2025.14.3

Changelogs:

- https://github.com/shader-slang/slang/releases/tag/v2025.13
- https://github.com/shader-slang/slang/releases/tag/v2025.13.1
- https://github.com/shader-slang/slang/releases/tag/v2025.13.2
- https://github.com/shader-slang/slang/releases/tag/v2025.14
- https://github.com/shader-slang/slang/releases/tag/v2025.14.1
- https://github.com/shader-slang/slang/releases/tag/v2025.14.2
- https://github.com/shader-slang/slang/releases/tag/v2025.14.3
---
 pkgs/by-name/sh/shader-slang/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index 78edfe7f43ac..b45b51197a47 100644
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shader-slang";
-  version = "2025.12.1";
+  version = "2025.14.3";
 
   src = fetchFromGitHub {
     owner = "shader-slang";
     repo = "slang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5M/sKoCFVGW4VcOPzL8dVhTuo+esjINPXw76fnO7OEw=";
+    hash = "sha256-tHLm0XmS5vV+o3VmFHWG8wZnrb0p63Nz1zVyvc/e5+s=";
     fetchSubmodules = true;
   };
 
@@ -114,13 +114,14 @@ stdenv.mkDerivation (finalAttrs: {
     # Handled by separateDebugInfo so we don't need special installation handling
     "-DSLANG_ENABLE_SPLIT_DEBUG_INFO=OFF"
     "-DSLANG_VERSION_FULL=v${finalAttrs.version}-nixpkgs"
-    # slang-rhi tries to download WebGPU dawn binaries, and as stated on
-    # https://github.com/shader-slang/slang-rhi is "under active refactoring
-    # and development, and is not yet ready for general use."
-    "-DSLANG_ENABLE_SLANG_RHI=OFF"
     "-DSLANG_USE_SYSTEM_MINIZ=ON"
     "-DSLANG_USE_SYSTEM_LZ4=ON"
     "-DSLANG_SLANG_LLVM_FLAVOR=${if withLLVM then "USE_SYSTEM_LLVM" else "DISABLE"}"
+    # slang-rhi tries to download headers and precompiled binaries for these backends
+    "-DSLANG_RHI_ENABLE_OPTIX=OFF"
+    "-DSLANG_RHI_ENABLE_VULKAN=OFF"
+    "-DSLANG_RHI_ENABLE_METAL=OFF"
+    "-DSLANG_RHI_ENABLE_WGPU=OFF"
   ]
   ++ lib.optionals withGlslang [
     "-DSLANG_USE_SYSTEM_SPIRV_TOOLS=ON"

From 9c6e65b76774f359280060baa3bd9b1c9967cbc0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 19:53:13 +0000
Subject: [PATCH 2836/3724] python3Packages.meilisearch: 0.36.0 -> 0.37.0

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

diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix
index 68816037d814..c51821ed6ec2 100644
--- a/pkgs/development/python-modules/meilisearch/default.nix
+++ b/pkgs/development/python-modules/meilisearch/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "meilisearch";
-  version = "0.36.0";
+  version = "0.37.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "meilisearch";
     repo = "meilisearch-python";
     tag = "v${version}";
-    hash = "sha256-S6l/nH+UWLgNUOkRVjLptKhWeYrlN1KL8jSfyBHMI3s=";
+    hash = "sha256-KKJ93WvkbQEtyRgROT3uGShLSwOaKrOpPDNyMJLqQ4M=";
   };
 
   build-system = [ setuptools ];

From d739b8a5ec88953b3d3b42cc6baa42e4152da8b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 19:53:32 +0000
Subject: [PATCH 2837/3724] drawterm: 0-unstable-2025-06-29 ->
 0-unstable-2025-08-18

---
 pkgs/by-name/dr/drawterm/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix
index da8175e8b3d9..db082e86640a 100644
--- a/pkgs/by-name/dr/drawterm/package.nix
+++ b/pkgs/by-name/dr/drawterm/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "drawterm";
-  version = "0-unstable-2025-06-29";
+  version = "0-unstable-2025-08-18";
 
   src = fetchFrom9Front {
     owner = "plan9front";
     repo = "drawterm";
-    rev = "903bcd8dba9cb9dfc70707a28089c469e5302539";
-    hash = "sha256-gZAPNRzAuvpIAV7ArPGsqVv6SYBJkqA+Okf6FmStvsU=";
+    rev = "44a7bdfaeb268bbc9df69693fa52d551beb2516d";
+    hash = "sha256-ov0BkKWUpRBi4COETtEw3x9WOSMy6HXkxrU9bVSI+AM=";
   };
 
   enableParallelBuilding = true;

From 1ea8159525d8ab959f0ee63305379820d52c5731 Mon Sep 17 00:00:00 2001
From: Brent Monning <brent.monning.jr@gmail.com>
Date: Wed, 6 Aug 2025 15:02:11 -0700
Subject: [PATCH 2838/3724] macmon: 0.5.1 -> 0.6.1

---
 pkgs/by-name/ma/macmon/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/macmon/package.nix b/pkgs/by-name/ma/macmon/package.nix
index ae1c31ec6e44..e4e42878e4a1 100644
--- a/pkgs/by-name/ma/macmon/package.nix
+++ b/pkgs/by-name/ma/macmon/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "macmon";
-  version = "0.5.1";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "vladkens";
     repo = "macmon";
     rev = "v${version}";
-    hash = "sha256-Uc+UjlCeG7W++l7d/3tSkIVbUi8IbNn3A5fqyshG+xE=";
+    hash = "sha256-GiSF5PBRUcKZzd9vWf9MmKKZbtqchnu0DjFgbXmp7bg=";
   };
 
-  cargoHash = "sha256-erKN6wR/W48QF1FbUkzjo6xaN1GVbAelruzxf4NS07o=";
+  cargoHash = "sha256-b9CpHSC3/kj7lHs+QhDqnRZfda9rtJJEs3j24NDZSPQ=";
 
   meta = {
     homepage = "https://github.com/vladkens/macmon";

From 9360f6151ef1cdda0aad0117a1c2356dcf4f3311 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Fri, 22 Aug 2025 12:07:15 -0700
Subject: [PATCH 2839/3724] linux_latest-libre: 19835 -> 19872

There doesn't appear to be any changelogs possible for these scripts. Sad.

Running `nix-build -A nixosTests.kernel-generic.linux_libre` succeeds.
---
 pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index a087f288e860..e5e2b8aee674 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -5,8 +5,8 @@
   linux,
   scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "19835";
-    hash = "sha256-5usyLmlTr5nlM+/uWPQepzhhNSLi3Hol1BfnWb9CFws=";
+    rev = "19872";
+    hash = "sha256-zbs5iWCaDtwovJLHnBlHfDBZ2DbggToRj3YZ5Nbx/RM=";
   },
   ...
 }@args:

From 081c0f35c213ad443c8b7ae7fdfc1e9656cf7f79 Mon Sep 17 00:00:00 2001
From: Justin Hill <justin@so.dang.cool>
Date: Fri, 22 Aug 2025 13:13:00 -0700
Subject: [PATCH 2840/3724] findup: 1.1.2 -> 1.1.3

---
 pkgs/by-name/fi/findup/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fi/findup/package.nix b/pkgs/by-name/fi/findup/package.nix
index 1be7ec2b1a05..41e60f6df5ad 100644
--- a/pkgs/by-name/fi/findup/package.nix
+++ b/pkgs/by-name/fi/findup/package.nix
@@ -3,26 +3,24 @@
   stdenv,
   fetchFromGitHub,
   testers,
-  zig,
+  zig_0_14,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "findup";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "booniepepper";
     repo = "findup";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EjfKNIYJBXjlKFNV4dJpOaXCfB5PUdeMjl4k1jFRfG0=";
+    hash = "sha256-ZrwEOWoXo1RnujroQDGAv4vqRD0ZSyzo8MEnIbHFrY4=";
   };
 
-  nativeBuildInputs = [ zig.hook ];
+  nativeBuildInputs = [ zig_0_14.hook ];
 
   passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = {
-    # Doesn't support zig 0.12 or newer, last commit was 2 years ago.
-    broken = lib.versionAtLeast zig.version "0.12";
     homepage = "https://github.com/booniepepper/findup";
     description = "Search parent directories for sentinel files";
     license = lib.licenses.mit;

From 74735e8a9d5329467d9f1f4f460d540fbc75cd30 Mon Sep 17 00:00:00 2001
From: thattemperature <2719023332@qq.com>
Date: Fri, 22 Aug 2025 23:15:27 +0800
Subject: [PATCH 2841/3724] emacsPackages.eaf: 0-unstable-2025-08-01 ->
 0-unstable-2025-08-22

---
 .../manual-packages/emacs-application-framework/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/default.nix
index 28c27c569c13..26d1bbe7a98f 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/default.nix
@@ -66,13 +66,13 @@ in
 melpaBuild (finalAttrs: {
 
   pname = "eaf";
-  version = "0-unstable-2025-08-01";
+  version = "0-unstable-2025-08-22";
 
   src = fetchFromGitHub {
     owner = "emacs-eaf";
     repo = "emacs-application-framework";
-    rev = "f7431199fb3143f4487213b7ea6a16a3d037b2ff";
-    hash = "sha256-qpaLizkxuOKd/9kfym3+xAssVm+sV3IlxLCApv+yUz8=";
+    rev = "dc5f6e7fa21a15b5e05c7722c2b8f32158aeab82";
+    hash = "sha256-wWC5Ma9p/k0GLcGpPn7NO0KqkIXmEbaQc7TJ2ImMIr4=";
   };
 
   packageRequires = [

From 011a6b6d2b92ace11012b5a02fb2f8e50d668636 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 20:25:33 +0000
Subject: [PATCH 2842/3724] python3Packages.bk7231tools: 2.0.2 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/bk7231tools/default.nix b/pkgs/development/python-modules/bk7231tools/default.nix
index cde2416c8126..1bbb1ef4cdcf 100644
--- a/pkgs/development/python-modules/bk7231tools/default.nix
+++ b/pkgs/development/python-modules/bk7231tools/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "bk7231tools";
-  version = "2.0.2";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tuya-cloudcutter";
     repo = "bk7231tools";
     tag = "v${version}";
-    hash = "sha256-Ag63VNBSKEPDaxhS40SVB8rKIJRS1IsrZ9wSD0FglSU=";
+    hash = "sha256-+gjcXSkPb6BI3rSZekGWgQcFtAN23tyvZLEKQvtUlFU=";
   };
 
   pythonRelaxDeps = [

From bafc202175ab4d9917c1178c0a0117ecb1e5d080 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Fri, 22 Aug 2025 22:26:51 +0200
Subject: [PATCH 2843/3724] netdata: 2.6.2 -> 2.6.3

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

diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index de20003b7ca2..4a91d9b281ca 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -58,14 +58,14 @@
   withSystemdUnits ? stdenv.hostPlatform.isLinux,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  version = "2.6.2";
+  version = "2.6.3";
   pname = "netdata";
 
   src = fetchFromGitHub {
     owner = "netdata";
     repo = "netdata";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XtU+oGynAnpwWTinwXVjtRYsTwIyAhkiRqY9CaOo7B0=";
+    hash = "sha256-J6QHeukhtHHLx92NGtoOmPwq6gvL9eyVYBQiDD1cEDk=";
     fetchSubmodules = true;
   };
 

From 30a27b3ec163a89fb822eccbe7367744c077041f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 20:29:35 +0000
Subject: [PATCH 2844/3724] faas-cli: 0.17.6 -> 0.17.7

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

diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix
index ae9a85d9609c..a3329642d32d 100644
--- a/pkgs/by-name/fa/faas-cli/package.nix
+++ b/pkgs/by-name/fa/faas-cli/package.nix
@@ -24,13 +24,13 @@ let
 in
 buildGoModule rec {
   pname = "faas-cli";
-  version = "0.17.6";
+  version = "0.17.7";
 
   src = fetchFromGitHub {
     owner = "openfaas";
     repo = "faas-cli";
     rev = version;
-    sha256 = "sha256-3J77QzIjF++8wOdImcsDtUzswP+tkTLnSmj0z0zCK30=";
+    sha256 = "sha256-9+IR6xSuKq3MXR51oHaKZKtdYLNPqykMx7aCz10kXIw=";
   };
 
   vendorHash = null;

From be80c8a868ce1ee3e3584488251c094ccbd05ea7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 20:47:55 +0000
Subject: [PATCH 2845/3724] peergos: 1.9.0 -> 1.10.0

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

diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix
index e1a7b84ddca1..3f8937944991 100644
--- a/pkgs/by-name/pe/peergos/package.nix
+++ b/pkgs/by-name/pe/peergos/package.nix
@@ -41,12 +41,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "peergos";
-  version = "1.9.0";
+  version = "1.10.0";
   src = fetchFromGitHub {
     owner = "Peergos";
     repo = "web-ui";
     rev = "v${version}";
-    hash = "sha256-KQyy1O8daex1nuKbO891kkJ+lETovUrHKF+D+1iHjXA=";
+    hash = "sha256-L6r0Ut/8HnJO7MYOZsDX7AzntVBTZb5iRKwaFvFKdUs=";
     fetchSubmodules = true;
   };
 

From 02b707190455bc37658782b057a674ee0193aba0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 11:22:16 +0000
Subject: [PATCH 2846/3724] discordo: 0-unstable-2025-07-28 ->
 0-unstable-2025-08-06

---
 pkgs/by-name/di/discordo/package.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/di/discordo/package.nix b/pkgs/by-name/di/discordo/package.nix
index df8d37d78ab8..fbee6757311d 100644
--- a/pkgs/by-name/di/discordo/package.nix
+++ b/pkgs/by-name/di/discordo/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildGoModule,
   fetchFromGitHub,
   nix-update-script,
@@ -10,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "discordo";
-  version = "0-unstable-2025-07-28";
+  version = "0-unstable-2025-08-06";
 
   src = fetchFromGitHub {
     owner = "ayn2op";
     repo = "discordo";
-    rev = "a4c8787f1d1699ce661df9d6aaa5002568b6e75a";
-    hash = "sha256-WN4qaL0kcvNcutoYHBvB9DP+/U4tDbUrkNW5FBPYpvQ=";
+    rev = "cdd97ff900a099ca520e5a720c547780dd6de162";
+    hash = "sha256-dJwinbkSVXxcNV9zXZaNnyZi1XorfNBITuYb9D987Vk=";
   };
 
-  vendorHash = "sha256-0zPocgwSmHG0BEzitQoDLG8y8of3Bt9swfUSDzzedo8=";
+  vendorHash = "sha256-6JpLXLoozkPWl7z0KGFIgr78bMR4DegvyEWODBKuWpE=";
 
   env.CGO_ENABLED = 0;
 
@@ -28,9 +29,11 @@ buildGoModule (finalAttrs: {
   ];
 
   # Clipboard support on X11 and Wayland
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    makeWrapper
+  ];
 
-  postInstall = ''
+  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     wrapProgram $out/bin/discordo \
       --prefix PATH : ${
         lib.makeBinPath [

From 7c6000a7689b5eb231af8ba3e5426e2e276b757f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 20:52:27 +0000
Subject: [PATCH 2847/3724] python3Packages.meshtastic: 2.7.0 -> 2.7.1

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

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 8d2fc1c11558..41cf201fc2ca 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -34,7 +34,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.7.0";
+  version = "2.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     owner = "meshtastic";
     repo = "python";
     tag = version;
-    hash = "sha256-7VBT4W0TWAEyjAEOA0FPOECS1JxFEpNLkWNHVFiWL1E=";
+    hash = "sha256-gIMn6rDcYloxD3G+rl40ZE+Cpi1UNGPwt10iCfYoqvg=";
   };
 
   pythonRelaxDeps = [

From 4c39d9ab8ecf569c4c28ee6235219c2808a3c6fc Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Fri, 22 Aug 2025 22:57:06 +0200
Subject: [PATCH 2848/3724] wealthfolio: 1.1.6 -> 1.2.0

https://github.com/afadil/wealthfolio/releases/tag/v1.2.0
---
 pkgs/by-name/we/wealthfolio/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix
index 40f667ecc140..cf6e3d6fdf8e 100644
--- a/pkgs/by-name/we/wealthfolio/package.nix
+++ b/pkgs/by-name/we/wealthfolio/package.nix
@@ -18,19 +18,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wealthfolio";
-  version = "1.1.6";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "afadil";
     repo = "wealthfolio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YjCAMWyGSEEC4NhSKxWbaP11yP9xLs5Mk5B+NZRQwDo=";
+    hash = "sha256-M1HaExPwm0T2EgKqOEubikIJ1tnR8qHCrmsgudY6GHY=";
   };
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) src pname version;
     fetcherVersion = 1;
-    hash = "sha256-KupqObdNrnWbbt9C4NNmgmQCfJ2O4FjJBwGy6XQhhHg=";
+    hash = "sha256-KkTABMrnU122hgYWw7FGRgb22IPK6kWpgIovY1r0DHc=";
   };
 
   cargoRoot = "src-tauri";
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       cargoRoot
       ;
-    hash = "sha256-scgo526LDZTj7XHiX4/hF8PRPJuA7ul8DD3kIZyPUKs=";
+    hash = "sha256-3PRIHQLYpJ91Xkkv8ktfsWBsRfta6wMu+MuYlL5CYD0=";
   };
 
   nativeBuildInputs = [

From a3b8bf9a65680fdd8cb13d07d8cd5c66021345f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 20:58:14 +0000
Subject: [PATCH 2849/3724] python3Packages.coinmetrics-api-client: 2025.8.8.16
 -> 2025.8.15.15

---
 .../python-modules/coinmetrics-api-client/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
index 814c35ffc3d4..ca277f60dc4c 100644
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "coinmetrics-api-client";
-  version = "2025.8.8.16";
+  version = "2025.8.15.15";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "coinmetrics_api_client";
-    hash = "sha256-/k0LwHxPZEF1Hyll3Xemzg/LqWtKnU+AToK1BpYfUDY=";
+    hash = "sha256-vk+L6PXygyI0UlO5l3xhw7Gcp5qi6sTH3TFdFAkQGZA=";
   };
 
   pythonRelaxDeps = [ "typer" ];

From 6232f889d785bb38113d6a5584a911b3dfc17046 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 21:00:38 +0000
Subject: [PATCH 2850/3724] commitlint-rs: 0.2.2 -> 0.2.3

---
 pkgs/by-name/co/commitlint-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/commitlint-rs/package.nix b/pkgs/by-name/co/commitlint-rs/package.nix
index fd8843eade77..91620d2baa2d 100644
--- a/pkgs/by-name/co/commitlint-rs/package.nix
+++ b/pkgs/by-name/co/commitlint-rs/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "commitlint-rs";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "KeisukeYamashita";
     repo = "commitlint-rs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9az7AJ4NXmisRZiCFTdHQBVatgEIdRuKU6ZEKVHEgnQ=";
+    hash = "sha256-rNCMvIVJ/aOTNMyAmwX3Ir6IjHf6wxZ1XlGIWp7omkQ=";
   };
 
-  cargoHash = "sha256-qTJ7/3jIqDXSu6H16YZJqtc/AqMIb4t7SulTtcVbKMI=";
+  cargoHash = "sha256-+MPHEkL5/+yR5+aKTDTaVO9D/v2xccwSo7clo20H1G0=";
 
   passthru = {
     tests.version = testers.testVersion { package = commitlint-rs; };

From 757ff4df878de8113ddb95b8365b2afdb1ada596 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Aug 2025 23:09:34 +0200
Subject: [PATCH 2851/3724] python313Packages.reolink: refactor

---
 .../python-modules/reolink/default.nix           | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix
index 9658b0890cc9..89d4837c6421 100644
--- a/pkgs/development/python-modules/reolink/default.nix
+++ b/pkgs/development/python-modules/reolink/default.nix
@@ -6,16 +6,14 @@
   fetchFromGitHub,
   ffmpeg-python,
   pytestCheckHook,
-  pythonOlder,
   requests,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "reolink";
   version = "0.64";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.8";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fwestenberg";
@@ -24,7 +22,9 @@ buildPythonPackage rec {
     hash = "sha256-3r5BwVlNolji2HIGjqv8gkizx4wWxrKYkiNmSJedKmI=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     aiohttp
     ffmpeg-python
     requests
@@ -57,11 +57,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "reolink" ];
 
+  passthru.skipBulkUpdate = true;
+
   meta = with lib; {
     description = "Module to interact with the Reolink IP camera API";
     homepage = "https://github.com/fwestenberg/reolink";
-    changelog = "https://github.com/fwestenberg/reolink/releases/tag/v${version}";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/fwestenberg/reolink/releases/tag/${src.tag}";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }

From 68f642ce87794c26365af0702fe1e8eaea71402c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 21:17:59 +0000
Subject: [PATCH 2852/3724] python3Packages.pycm: 4.3 -> 4.4

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

diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix
index 9c0ba320116b..1153f19f25cf 100644
--- a/pkgs/development/python-modules/pycm/default.nix
+++ b/pkgs/development/python-modules/pycm/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pycm";
-  version = "4.3";
+  version = "4.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sepandhaghighi";
     repo = "pycm";
     tag = "v${version}";
-    hash = "sha256-JX75UEaONL+2n6xePE2hbIEMmnt0RknWNWgpbMwNyhw=";
+    hash = "sha256-CKvNnpZBT6CV71887jd+V4plBBdWQhMqAhO38APUg20=";
   };
 
   build-system = [ setuptools ];

From 3be790be3a6d3fb6dacfb1f6589f87499bb6bc26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leon=20Schwarz=C3=A4ugl?=
 <leon.schwarzaeugl@imba.oeaw.ac.at>
Date: Fri, 22 Aug 2025 22:44:18 +0200
Subject: [PATCH 2853/3724] terragrunt: 0.85.0 -> 0.86.0

---
 pkgs/by-name/te/terragrunt/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix
index d3d33ccab881..9dd433b1024d 100644
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@@ -1,20 +1,19 @@
 {
   lib,
-  buildGoModule,
+  buildGo125Module,
   fetchFromGitHub,
   versionCheckHook,
   mockgen,
 }:
-
-buildGoModule (finalAttrs: {
+buildGo125Module (finalAttrs: {
   pname = "terragrunt";
-  version = "0.85.0";
+  version = "0.86.0";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "terragrunt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ey3Qbwg036OzWYfw/0lso3CentUXGF0/NB/w3ss3Dp0=";
+    hash = "sha256-Xmka1391wEGufEEavQNoB5YuzR7npe6ky8MzKJnGQt8=";
   };
 
   nativeBuildInputs = [
@@ -26,7 +25,7 @@ buildGoModule (finalAttrs: {
     make generate-mocks
   '';
 
-  vendorHash = "sha256-n0fPaeigwXvd0S5KvMG+ZerDqdaapUGK6mhY7WmEkIE=";
+  vendorHash = "sha256-aQzt7yeNoL1OF+mO6y2axeiuJbfuMBzoEAm0+Y9+Xr8=";
 
   doCheck = false;
 

From 87f6fc43f10d268c71b10a1f60ded2bbc5e9421f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Aug 2025 23:29:09 +0200
Subject: [PATCH 2854/3724] azurehound: 2.7.0 -> 2.7.1

Diff: https://github.com/SpecterOps/AzureHound/compare/refs/tags/v2.7.0...refs/tags/v2.7.1

Changelog: https://github.com/SpecterOps/AzureHound/releases/tag/v2.7.1
---
 pkgs/by-name/az/azurehound/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix
index 855f09289ed1..024b29001b65 100644
--- a/pkgs/by-name/az/azurehound/package.nix
+++ b/pkgs/by-name/az/azurehound/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "azurehound";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "SpecterOps";
     repo = "AzureHound";
     tag = "v${version}";
-    hash = "sha256-UmEgrADPolWw1Ml1nHobH9xHjG9cIL6Rzup42Bw6GAU=";
+    hash = "sha256-fCs9C86IO1aTzBFZiA7SaVlk0Zdm/ItWtLhE8Ii2W0A=";
   };
 
   vendorHash = "sha256-ScFHEIarDvxd9R6eUONdECmtK+5aZRdo71khljLz8c4=";

From 33cce4f8c6c3f1b9f54c948fe689da55c4239907 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 23:29:57 +0200
Subject: [PATCH 2855/3724] vuls: 0.33.2 -> 0.33.3

Diff: https://github.com/future-architect/vuls/compare/v0.33.2...v0.33.3

Changelog: https://github.com/future-architect/vuls/blob/refs/tags/v0.33.3/CHANGELOG.md
---
 pkgs/by-name/vu/vuls/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vu/vuls/package.nix b/pkgs/by-name/vu/vuls/package.nix
index 4cc534718ceb..1c23853533f7 100644
--- a/pkgs/by-name/vu/vuls/package.nix
+++ b/pkgs/by-name/vu/vuls/package.nix
@@ -6,17 +6,17 @@
 
 buildGo124Module rec {
   pname = "vuls";
-  version = "0.33.2";
+  version = "0.33.3";
 
   src = fetchFromGitHub {
     owner = "future-architect";
     repo = "vuls";
     tag = "v${version}";
-    hash = "sha256-6tpX8pZNKJXJv6ArwNWn9ih19LU3DNeBUXy9U/dHhVc=";
+    hash = "sha256-sIsdXtvMoVi72eHGuJqGQz9dAb9OqAyYvbDT55dnJb8=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-vZMpQvEswcsfppZ5tIaI4fqrKkwbN53shefRyLR/Sg8=";
+  vendorHash = "sha256-OjE+j91QgS74FknfYLnkA7RKDSnC8yUZDIRXw3taORA=";
 
   ldflags = [
     "-s"

From 6629b4846ff6a52ef254f9ab8a38344ddac3b485 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 21:34:07 +0000
Subject: [PATCH 2856/3724] python3Packages.govee-ble: 0.44.0 -> 0.45.0

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

diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix
index fb74554ad83e..ada45324e92c 100644
--- a/pkgs/development/python-modules/govee-ble/default.nix
+++ b/pkgs/development/python-modules/govee-ble/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "govee-ble";
-  version = "0.44.0";
+  version = "0.45.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "govee-ble";
     tag = "v${version}";
-    hash = "sha256-19kGgelUFuMuiZxzb0ySkG6L52I/CHsfPQdzSbwucPY=";
+    hash = "sha256-SUxK4H0Vo8C4GykIv8duFhhiGBA860QofVQDO37Ubdw=";
   };
 
   build-system = [ poetry-core ];

From 1e6f7680e84ec11dd50288c70c65f8a9fa8bf6ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 21:36:12 +0000
Subject: [PATCH 2857/3724] tigerbeetle: 0.16.54 -> 0.16.55

---
 pkgs/by-name/ti/tigerbeetle/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix
index 069c56a33a38..2b73486a8629 100644
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@@ -10,14 +10,14 @@ let
   platform =
     if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
   hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-bIGSSJ7JsdhVHh8FBP0q+Nol1jg+FudVSnajVfRAiFk=";
-    "x86_64-linux" = "sha256-KpsoPe+YoIvxIh88/0t+DjOarjPvhrTJLVWoyuBhGq4=";
-    "aarch64-linux" = "sha256-c7foGzXfcWW9+ZHDwj4bStCassjzuZT3k/mDwGYYuBw=";
+    "universal-macos" = "sha256-Xwjmwpy9xOSXFlGegj6hXMJtIsYJFme2yhptiaZorGU=";
+    "x86_64-linux" = "sha256-VQ9fQh65GIktHW6BWsnQmQnGwg971KkwY8lgvJgw0YY=";
+    "aarch64-linux" = "sha256-nVGJxJlV+a5vpuCj1r3b1geggjwDammKKdp1Je7z4A8=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tigerbeetle";
-  version = "0.16.54";
+  version = "0.16.55";
 
   src = fetchzip {
     url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";

From 17232471a9f096248d9bb161e709642a50ddd076 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 21:39:49 +0000
Subject: [PATCH 2858/3724] oci-cli: 3.64.0 -> 3.64.1

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

diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix
index 6afa78b61844..1d7bc16b5fb8 100644
--- a/pkgs/by-name/oc/oci-cli/package.nix
+++ b/pkgs/by-name/oc/oci-cli/package.nix
@@ -25,14 +25,14 @@ in
 
 py.pkgs.buildPythonApplication rec {
   pname = "oci-cli";
-  version = "3.64.0";
+  version = "3.64.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "oci-cli";
     tag = "v${version}";
-    hash = "sha256-ywLeU/qX3sJfVothJ/JSEdp3VEkRI9nXNcWHGuY+X84=";
+    hash = "sha256-YiRUvfDtE5uZDI/g4/k0458N8RnNzNgUuU5ZblDsD0E=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From b5f826cfa838132c3756e4b915a5f42512dc5eba Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 22 Aug 2025 23:41:09 +0200
Subject: [PATCH 2859/3724] python3Packages.keras: 3.11.2 -> 3.11.3

Diff: https://github.com/keras-team/keras/compare/v3.11.2...v3.11.3

Changelog: https://github.com/keras-team/keras/releases/tag/v3.11.3
---
 pkgs/development/python-modules/keras/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index 388e29a6b51c..bdfd593816ea 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -36,14 +36,14 @@
 
 buildPythonPackage rec {
   pname = "keras";
-  version = "3.11.2";
+  version = "3.11.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "keras-team";
     repo = "keras";
     tag = "v${version}";
-    hash = "sha256-VRza7ElCPjdMeo4LH0WSBD8WdzxojJStGXlf1pbP3b0=";
+    hash = "sha256-J/NPLR9ShKhvHDU0/NpUNp95RViS2KygqvnuDHdwiP0=";
   };
 
   build-system = [

From d6eb73b5c1d5c5b487c273b098944d4be4bee7e8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 23:48:41 +0200
Subject: [PATCH 2860/3724] python313Packages.arrayqueues: add changelog to
 meta

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

diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix
index a2bd69bf3a19..abd9eb547d3d 100644
--- a/pkgs/development/python-modules/arrayqueues/default.nix
+++ b/pkgs/development/python-modules/arrayqueues/default.nix
@@ -22,6 +22,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/portugueslab/arrayqueues";
     description = "Multiprocessing queues for numpy arrays using shared memory";
+    changelog = "https://github.com/portugueslab/arrayqueues/releases/tag/${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ tbenst ];
   };

From ffdc8441dc6bba2a6c563cd489b9646f8ac53570 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 20:22:11 +0000
Subject: [PATCH 2861/3724] lagrange: 1.18.7 -> 1.18.8

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

diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix
index a1f60475a6ac..2267db95fb87 100644
--- a/pkgs/by-name/la/lagrange/package.nix
+++ b/pkgs/by-name/la/lagrange/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lagrange";
-  version = "1.18.7";
+  version = "1.18.8";
 
   src = fetchFromGitHub {
     owner = "skyjake";
     repo = "lagrange";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9BjkMFG8laHe+lTAD12EPvYXrit6bG/IE7FdaZELL9I=";
+    hash = "sha256-wJ+rfg0LSdtbQ4GyBvPGEpc/Ml67ivlxhnqQskJtsuw=";
   };
 
   nativeBuildInputs = [

From 746b93d7c5fecdda452c3ee6bd9dd36a11a92e7b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 23:50:04 +0200
Subject: [PATCH 2862/3724] python313Packages.arrayqueues: modernize

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

diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix
index abd9eb547d3d..fc21ec2ee587 100644
--- a/pkgs/development/python-modules/arrayqueues/default.nix
+++ b/pkgs/development/python-modules/arrayqueues/default.nix
@@ -4,12 +4,13 @@
   fetchPypi,
   isPy3k,
   numpy,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "arrayqueues";
   version = "1.4.1";
-  format = "setuptools";
+  pyproject = true;
   disabled = !isPy3k;
 
   src = fetchPypi {
@@ -17,7 +18,9 @@ buildPythonPackage rec {
     hash = "sha256-7I+5BQO/gsvTREDkBfxrMblw3JPfY48S4KI4PCGPtFY=";
   };
 
-  propagatedBuildInputs = [ numpy ];
+  build-system = [ setuptools ];
+
+  dependencies = [ numpy ];
 
   meta = {
     homepage = "https://github.com/portugueslab/arrayqueues";

From 6c42b1f98ee6001a1957845a96f40ffd2298cfcc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 23:50:38 +0200
Subject: [PATCH 2863/3724] python313Packages.arrayqueues: remove disabled

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

diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix
index fc21ec2ee587..3313a0edaecf 100644
--- a/pkgs/development/python-modules/arrayqueues/default.nix
+++ b/pkgs/development/python-modules/arrayqueues/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  isPy3k,
   numpy,
   setuptools,
 }:
@@ -11,7 +10,6 @@ buildPythonPackage rec {
   pname = "arrayqueues";
   version = "1.4.1";
   pyproject = true;
-  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;

From b8373ee9e185afda971af03f8983428604fc887f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 23:52:41 +0200
Subject: [PATCH 2864/3724] python313Packages.arrayqueues: switch to Github for
 the source

---
 .../development/python-modules/arrayqueues/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix
index 3313a0edaecf..d9fb2c9bdc93 100644
--- a/pkgs/development/python-modules/arrayqueues/default.nix
+++ b/pkgs/development/python-modules/arrayqueues/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   numpy,
   setuptools,
 }:
@@ -11,9 +11,11 @@ buildPythonPackage rec {
   version = "1.4.1";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-7I+5BQO/gsvTREDkBfxrMblw3JPfY48S4KI4PCGPtFY=";
+  src = fetchFromGitHub {
+    owner = "portugueslab";
+    repo = "arrayqueues";
+    tag = "v${version}";
+    hash = "sha256-tqIfpkwbJNd9jMe0YvAWz9Z8rOO80qxVM2ZcJFeAmwo=";
   };
 
   build-system = [ setuptools ];

From 257a9da3736e03e3421ffefb5d125d2047dfaca9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 Aug 2025 23:54:12 +0200
Subject: [PATCH 2865/3724] python313Packages.arrayqueues: enable tests and add
 pythonImportsCheck

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

diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix
index d9fb2c9bdc93..4d7e03fd6913 100644
--- a/pkgs/development/python-modules/arrayqueues/default.nix
+++ b/pkgs/development/python-modules/arrayqueues/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   numpy,
+  pytestCheckHook,
   setuptools,
 }:
 
@@ -22,6 +23,10 @@ buildPythonPackage rec {
 
   dependencies = [ numpy ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "arrayqueues" ];
+
   meta = {
     homepage = "https://github.com/portugueslab/arrayqueues";
     description = "Multiprocessing queues for numpy arrays using shared memory";

From 4469fd60bff0f02ee40abc5906fe0519b3598ae7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 23 Aug 2025 00:00:28 +0200
Subject: [PATCH 2866/3724] autotrash: add changelog to meta

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

diff --git a/pkgs/by-name/au/autotrash/package.nix b/pkgs/by-name/au/autotrash/package.nix
index ff5a97a4cd64..6e775e86f1a7 100644
--- a/pkgs/by-name/au/autotrash/package.nix
+++ b/pkgs/by-name/au/autotrash/package.nix
@@ -27,12 +27,12 @@ python3Packages.buildPythonPackage rec {
   postInstall = "installManPage doc/autotrash.1";
 
   pythonImportsCheck = [ "autotrash" ];
-  nativeCheckInputs = [ python3Packages.pytestCheckHook ];
 
   meta = {
     description = "Tool to automatically purge old trashed files";
     license = lib.licenses.gpl3Plus;
     homepage = "https://bneijt.nl/pr/autotrash";
+    changelog = "https://github.com/bneijt/autotrash/releases/tag/${src.tag}";
     maintainers = with lib.maintainers; [
       sigmanificient
       mithicspirit

From df0c0570c87efa8f75f100462873c6acc4bccbc8 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2867/3724] arangodb: drop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This requires an EOL GCC to build. The version is over two years
old; the latest version is 3.12.5.2. The listed package maintainer
[no longer uses the package]. If another version is packaged that
builds with a supported compiler, this can be re‐added; per the
[request from 2023] to restore versioned suffixes, it should likely
not be upgraded in place anyway, to avoid unexpected data migrations.

[no longer uses the package]: <https://github.com/NixOS/nixpkgs/pull/255012#issuecomment-3172076400>
[request from 2023]: <https://github.com/NixOS/nixpkgs/issues/254866>
---
 pkgs/by-name/ar/arangodb/package.nix          | 94 -------------------
 .../python-modules/python-arango/default.nix  | 50 +++++-----
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 28 insertions(+), 117 deletions(-)
 delete mode 100644 pkgs/by-name/ar/arangodb/package.nix

diff --git a/pkgs/by-name/ar/arangodb/package.nix b/pkgs/by-name/ar/arangodb/package.nix
deleted file mode 100644
index 8afc588a967e..000000000000
--- a/pkgs/by-name/ar/arangodb/package.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  # gcc 11.2 suggested on 3.10.5.2.
-  # gcc 11.3.0 unsupported yet, investigate gcc support when upgrading
-  # See https://github.com/arangodb/arangodb/issues/17454
-  gcc10Stdenv,
-  git,
-  lib,
-  fetchFromGitHub,
-  openssl,
-  zlib,
-  cmake,
-  python3,
-  perl,
-  snappy,
-  lzo,
-  which,
-  targetArchitecture ? null,
-  asmOptimizations ? gcc10Stdenv.hostPlatform.isx86,
-}:
-
-let
-  defaultTargetArchitecture = if gcc10Stdenv.hostPlatform.isx86 then "haswell" else "core";
-
-  targetArch = if targetArchitecture == null then defaultTargetArchitecture else targetArchitecture;
-in
-
-gcc10Stdenv.mkDerivation rec {
-  pname = "arangodb";
-  version = "3.10.5.2";
-
-  src = fetchFromGitHub {
-    repo = "arangodb";
-    owner = "arangodb";
-    tag = "v${version}";
-    hash = "sha256-64iTxhG8qKTSrTlH/BWDJNnLf8VnaCteCKfQ9D2lGDQ=";
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [
-    cmake
-    git
-    perl
-    python3
-    which
-  ];
-
-  buildInputs = [
-    openssl
-    zlib
-    snappy
-    lzo
-  ];
-
-  # prevent failing with "cmake-3.13.4/nix-support/setup-hook: line 10: ./3rdParty/rocksdb/RocksDBConfig.cmake.in: No such file or directory"
-  dontFixCmake = true;
-  env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-  postPatch = ''
-    sed -i -e 's!/bin/echo!echo!' 3rdParty/V8/gypfiles/*.gypi
-
-    # with nixpkgs, it has no sense to check for a version update
-    substituteInPlace js/client/client.js --replace "require('@arangodb').checkAvailableVersions();" ""
-    substituteInPlace js/server/server.js --replace "require('@arangodb').checkAvailableVersions();" ""
-  '';
-
-  preConfigure = ''
-    patchShebangs utils
-  '';
-
-  cmakeBuildType = "RelWithDebInfo";
-
-  cmakeFlags = [
-    "-DUSE_MAINTAINER_MODE=OFF"
-    "-DUSE_GOOGLE_TESTS=OFF"
-
-    # avoid reading /proc/cpuinfo for feature detection
-    "-DTARGET_ARCHITECTURE=${targetArch}"
-  ]
-  ++ lib.optionals asmOptimizations [
-    "-DASM_OPTIMIZATIONS=ON"
-    "-DHAVE_SSE42=${if gcc10Stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}"
-  ];
-
-  meta = with lib; {
-    homepage = "https://www.arangodb.com";
-    description = "Native multi-model database with flexible data models for documents, graphs, and key-values";
-    license = licenses.asl20;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [
-      flosse
-      jsoo1
-    ];
-  };
-}
diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix
index d7acf848e061..76823eb509f2 100644
--- a/pkgs/development/python-modules/python-arango/default.nix
+++ b/pkgs/development/python-modules/python-arango/default.nix
@@ -18,7 +18,6 @@
   packaging,
 
   # tests
-  arangodb,
   mock,
 }:
 
@@ -61,11 +60,16 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    arangodb
+    #arangodb
     mock
     pytestCheckHook
   ];
 
+  # ArangoDB has been removed from Nixpkgs due to lack of maintenace,
+  # so we cannot run the tests at present.
+  #
+  # Before that, the issue was:
+  #
   # arangodb is compiled only for particular target architectures
   # (i.e. "haswell"). Thus, these tests may not pass reproducibly,
   # failing with: `166: Illegal instruction` if not run on arangodb's
@@ -76,27 +80,27 @@ buildPythonPackage rec {
   # architecture issues will be irrelevant.
   doCheck = false;
 
-  preCheck = lib.optionalString doCheck ''
-    # Start test DB
-    mkdir -p .nix-test/{data,work}
-
-    ICU_DATA=${arangodb}/share/arangodb3 \
-    GLIBCXX_FORCE_NEW=1 \
-    TZ=UTC \
-    TZ_DATA=${arangodb}/share/arangodb3/tzdata \
-    ARANGO_ROOT_PASSWORD=${testDBOpts.password} \
-    ${arangodb}/bin/arangod \
-      --server.uid=$(id -u) \
-      --server.gid=$(id -g) \
-      --server.authentication=true \
-      --server.endpoint=http+tcp://${testDBOpts.host}:${testDBOpts.port} \
-      --server.descriptors-minimum=4096 \
-      --server.jwt-secret=${testDBOpts.secret} \
-      --javascript.app-path=.nix-test/app \
-      --log.file=.nix-test/log \
-      --database.directory=.nix-test/data \
-      --foxx.api=false &
-  '';
+  #preCheck = lib.optionalString doCheck ''
+  #  # Start test DB
+  #  mkdir -p .nix-test/{data,work}
+  #
+  #  ICU_DATA=${arangodb}/share/arangodb3 \
+  #  GLIBCXX_FORCE_NEW=1 \
+  #  TZ=UTC \
+  #  TZ_DATA=${arangodb}/share/arangodb3/tzdata \
+  #  ARANGO_ROOT_PASSWORD=${testDBOpts.password} \
+  #  ${arangodb}/bin/arangod \
+  #    --server.uid=$(id -u) \
+  #    --server.gid=$(id -g) \
+  #    --server.authentication=true \
+  #    --server.endpoint=http+tcp://${testDBOpts.host}:${testDBOpts.port} \
+  #    --server.descriptors-minimum=4096 \
+  #    --server.jwt-secret=${testDBOpts.secret} \
+  #    --javascript.app-path=.nix-test/app \
+  #    --log.file=.nix-test/log \
+  #    --database.directory=.nix-test/data \
+  #    --foxx.api=false &
+  #'';
 
   pytestFlags = [
     "--host=${testDBOpts.host}"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 200ac0ede7c9..aa804154bc1d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -459,6 +459,7 @@ mapAliases {
   apple-sdk_10_14 = throw "apple-sdk_10_14 was removed as Nixpkgs no longer supprots macOS 10.14; see the 25.05 release notes"; # Added 2024-10-27
   apple-sdk_10_15 = throw "apple-sdk_10_15 was removed as Nixpkgs no longer supports macOS 10.15; see the 25.05 release notes"; # Added 2024-10-27
   appthreat-depscan = dep-scan; # Added 2024-04-10
+  arangodb = throw "arangodb has been removed, as it was unmaintained and the packaged version does not build with supported GCC versions"; # Added 2025-08-12
   arb = throw "'arb' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28
   arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07
   archipelago-minecraft = throw "archipelago-minecraft has been removed, as upstream no longer ships minecraft as a default APWorld."; # Added 2025-07-15

From 796e4f546bd3b2ed74df74c679f2c3f2b9e03fe8 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2868/3724] linux_5_4_hardened: drop

Already marked as broken, and due for removal anyway in
<https://github.com/NixOS/nixpkgs/pull/432561>.
---
 pkgs/top-level/all-packages.nix  |  2 --
 pkgs/top-level/linux-kernels.nix | 12 ++----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d5ae53a00b4..ee7493471bf9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10714,8 +10714,6 @@ with pkgs;
   # hardened kernels
   linuxPackages_hardened = linuxKernel.packages.linux_hardened;
   linux_hardened = linuxPackages_hardened.kernel;
-  linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened;
-  linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened;
   linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened;
   linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
   linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 2c9d32830b84..a34fef40385c 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -12,7 +12,6 @@
   newScope,
   lib,
   fetchurl,
-  gcc10Stdenv,
 }:
 
 # When adding a kernel:
@@ -297,14 +296,6 @@ in
 
         linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };
 
-        linux_5_4_hardened = markBroken (
-          hardenedKernelFor kernels.linux_5_4 {
-            stdenv = gcc10Stdenv;
-            buildPackages = buildPackages // {
-              stdenv = buildPackages.gcc10Stdenv;
-            };
-          }
-        );
         linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
         linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
         linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
@@ -321,6 +312,7 @@ in
         linux_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream";
 
         linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
+        linux_5_4_hardened = throw "linux_5_4_hardened was removed because it was broken";
         linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream";
         linux_6_10_hardened = throw "linux 6.10 was removed because it has reached its end of life upstream";
         linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";
@@ -779,7 +771,6 @@ in
 
       linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened);
 
-      linux_5_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_4_hardened);
       linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened);
       linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);
       linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);
@@ -799,6 +790,7 @@ in
     }
     // lib.optionalAttrs config.allowAliases {
       linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
+      linux_5_4_hardened = throw "linux_5_4_hardened was removed because it was broken";
       linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream";
       linux_6_10_hardened = throw "linux 6.10 was removed because it has reached its end of life upstream";
       linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";

From ecba8f422b9139a20cde3271c105e21214ec7c52 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2869/3724] collada2gltf: drop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Vendors outdated dependencies that don’t build with supported
compilers. I tried my best to devendor, but I was unable to get it
building, and upstream has not been active in half a decade.
---
 pkgs/by-name/co/collada2gltf/package.nix | 39 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pkgs/by-name/co/collada2gltf/package.nix

diff --git a/pkgs/by-name/co/collada2gltf/package.nix b/pkgs/by-name/co/collada2gltf/package.nix
deleted file mode 100644
index c3c143419101..000000000000
--- a/pkgs/by-name/co/collada2gltf/package.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  fetchFromGitHub,
-  gcc10Stdenv,
-  lib,
-  cmake,
-}:
-gcc10Stdenv.mkDerivation rec {
-  pname = "COLLADA2GLTF";
-  version = "2.1.5";
-
-  src = fetchFromGitHub {
-    owner = "KhronosGroup";
-    repo = "COLLADA2GLTF";
-    tag = "v${version}";
-    hash = "sha256-3Eo1qS6S5vlc/d2WB4iDJTjUnwMUrx9+Ln6n8PYU5qA=";
-    fetchSubmodules = true;
-  };
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 COLLADA2GLTF-bin $out/bin/COLLADA2GLTF
-
-    runHook postInstall
-  '';
-
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  meta = {
-    description = "Command-line tool to convert COLLADA (.dae) files to glTF";
-    homepage = "https://github.com/KhronosGroup/COLLADA2GLTF";
-    license = lib.licenses.bsd3;
-    mainProgram = "COLLADA2GLTF";
-    maintainers = with lib.maintainers; [ shaddydc ];
-    platforms = with lib.platforms; unix ++ windows;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index aa804154bc1d..9ec8c8620339 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -626,6 +626,7 @@ mapAliases {
   code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   code-browser-qt = throw "'code-browser-qt' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   collada-dom = opencollada; # added 2024-02-21
+  collada2gltf = throw "collada2gltf has been removed from Nixpkgs, as it has been unmaintained upstream for 5 years and does not build with supported GCC versions"; # Addd 2025-08-08
   colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19
   colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15

From 892ebc48e5da74fb8d0e2c12ec696b3a8660377e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2870/3724] obliv-c: drop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Broken on supported compilers when parsing system headers, with
no obvious‐to-me fix from a quick search of the codebase; see
<https://github.com/samee/obliv-c/issues/110>. No upstream activity
since 2021.
---
 .../development/compilers/obliv-c/default.nix | 63 -------------------
 .../obliv-c/ignore-complex-float128.patch     | 37 -----------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  5 --
 4 files changed, 1 insertion(+), 105 deletions(-)
 delete mode 100644 pkgs/development/compilers/obliv-c/default.nix
 delete mode 100644 pkgs/development/compilers/obliv-c/ignore-complex-float128.patch

diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix
deleted file mode 100644
index 2f6777a0b556..000000000000
--- a/pkgs/development/compilers/obliv-c/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  stdenv,
-  libgcrypt,
-  fetchFromGitHub,
-  ocamlPackages,
-  perl,
-}:
-stdenv.mkDerivation {
-  pname = "obliv-c";
-
-  version = "0.0pre20210621";
-
-  strictDeps = true;
-  nativeBuildInputs = [
-    perl
-  ]
-  ++ (with ocamlPackages; [
-    ocaml
-    findlib
-    ocamlbuild
-  ]);
-  buildInputs = [ ocamlPackages.num ];
-  propagatedBuildInputs = [ libgcrypt ];
-  src = fetchFromGitHub {
-    owner = "samee";
-    repo = "obliv-c";
-    rev = "e02e5c590523ef4dae06e167a7fa00037bb3fdaf";
-    sha256 = "sha256:02vyr4689f4dmwqqs0q1mrack9h3g8jz3pj8zqiz987dk0r5mz7a";
-  };
-
-  hardeningDisable = [ "fortify" ];
-
-  patches = [ ./ignore-complex-float128.patch ];
-
-  # https://github.com/samee/obliv-c/issues/76#issuecomment-438958209
-  env.OCAMLBUILD = "ocamlbuild -package num -ocamlopt 'ocamlopt -dontlink num' -ocamlc 'ocamlc -dontlink num'";
-
-  preBuild = ''
-    patchShebangs .
-  '';
-
-  preInstall = ''
-    mkdir -p "$out/bin"
-    cp bin/* "$out/bin"
-    mkdir -p "$out/share/doc/obliv-c"
-    cp -r doc/* README* CHANGE* Change* LICEN* TODO* "$out/share/doc/obliv-c"
-    mkdir -p "$out/share/obliv-c"
-    cp -r test "$out/share/obliv-c"
-    mkdir -p "$out/include"
-    cp src/ext/oblivc/*.h "$out/include"
-    mkdir -p "$out/lib"
-    gcc $(ar t _build/libobliv.a | sed -e 's@^@_build/@') --shared -o _build/libobliv.so
-    cp _build/lib*.a _build/lib*.so* "$out/lib"
-  '';
-
-  meta = {
-    description = "GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs";
-    license = lib.licenses.bsd3;
-    maintainers = [ lib.maintainers.raskin ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/compilers/obliv-c/ignore-complex-float128.patch b/pkgs/development/compilers/obliv-c/ignore-complex-float128.patch
deleted file mode 100644
index e3a5b74a9cb2..000000000000
--- a/pkgs/development/compilers/obliv-c/ignore-complex-float128.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/frontc/clexer.mll
-+++ b/src/frontc/clexer.mll
-@@ -134,9 +134,11 @@ let init_lexicon _ =
-       (* WW: see /usr/include/sys/cdefs.h for why __signed and __volatile
-        * are accepted GCC-isms *)
-       ("_Bool", fun loc -> BOOL loc);
-+      ("_Complex", fun loc -> COMPLEX loc);
-       ("char", fun loc -> CHAR loc);
-       ("int", fun loc -> INT loc);
-       ("float", fun loc -> FLOAT loc);
-+      ("__float128", fun loc -> FLOAT128 loc);
-       ("double", fun loc -> DOUBLE loc);
-       ("void", fun loc -> VOID loc);
-       ("enum", fun loc -> ENUM loc);
---- a/src/frontc/cparser.mly
-+++ b/src/frontc/cparser.mly
-@@ -269,6 +269,8 @@ let oblivState (s:statement): statement =
- %token<Cabs.cabsloc> VOLATILE EXTERN STATIC CONST RESTRICT AUTO REGISTER FROZEN
- %token<Cabs.cabsloc> THREAD
- 
-+%token<Cabs.cabsloc> COMPLEX FLOAT128
-+
- %token<Cabs.cabsloc> SIZEOF ALIGNOF
- 
- %token EQ PLUS_EQ MINUS_EQ STAR_EQ SLASH_EQ PERCENT_EQ
-@@ -1002,7 +1004,11 @@ type_spec:   /* ISO 6.7.2 */
- |   LONG            { Tlong, $1 }
- |   INT64           { Tint64, $1 }
- |   FLOAT           { Tfloat, $1 }
-+|   FLOAT128        { Tfloat, $1 }
- |   DOUBLE          { Tdouble, $1 }
-+|   COMPLEX FLOAT   { Tfloat, $2 }
-+|   COMPLEX FLOAT128{ Tfloat, $2 }
-+|   COMPLEX DOUBLE  { Tdouble, $2 }
- |   SIGNED          { Tsigned, $1 }
- |   UNSIGNED        { Tunsigned, $1 }
- |   STRUCT                 id_or_typename
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9ec8c8620339..372b640f9912 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1672,6 +1672,7 @@ mapAliases {
   o = orbiton; # Added 2023-04-09
   oathToolkit = oath-toolkit; # Added 2022-04-04
   oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17
+  obliv-c = throw "obliv-c has been removed from Nixpkgs, as it has been unmaintained upstream for 4 years and does not build with supported GCC versions"; # Added 2025-08-18
   ocis-bin = throw "ocis-bin has been renamed to ocis_5-bin'. Future major.minor versions will be made available as separate packages"; # Added 2025-03-30
   odoo15 = throw "odoo15 has been removed from nixpkgs as it is unsupported; migrate to a newer version of odoo"; # Added 2025-05-06
   offrss = throw "offrss has been removed due to lack of upstream maintenance; consider using another rss reader"; # Added 2025-06-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee7493471bf9..6b7703b77e9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5706,11 +5706,6 @@ with pkgs;
     enableGui = true;
   };
 
-  obliv-c = callPackage ../development/compilers/obliv-c {
-    stdenv = gcc10Stdenv;
-    ocamlPackages = ocaml-ng.ocamlPackages_4_14;
-  };
-
   ocaml-ng = callPackage ./ocaml-packages.nix { };
   ocaml = ocamlPackages.ocaml;
 

From b8f75c8f75f52dfc8fe1a45b4e5f2b5b19ce8418 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Aug 2025 15:35:19 +0100
Subject: [PATCH 2871/3724] gcc: clean up unused patches

---
 .../gcc/patches/parallel-bconfig.patch        | 32 ------------
 .../gcc/patches/use-source-date-epoch.patch   | 52 -------------------
 2 files changed, 84 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/patches/parallel-bconfig.patch
 delete mode 100644 pkgs/development/compilers/gcc/patches/use-source-date-epoch.patch

diff --git a/pkgs/development/compilers/gcc/patches/parallel-bconfig.patch b/pkgs/development/compilers/gcc/patches/parallel-bconfig.patch
deleted file mode 100644
index bc56ac698f5a..000000000000
--- a/pkgs/development/compilers/gcc/patches/parallel-bconfig.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Hacky work-around for highly parallel builds.
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57125
-
-diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index aad927c..182f666 100644
---- a/gcc/Makefile.in
-+++ b/gcc/Makefile.in
-@@ -3908,21 +3908,21 @@ build/gengtype-lex.o: $(BCONFIG_H)
- 
- gengtype-parse.o build/gengtype-parse.o : gengtype-parse.c gengtype.h \
-   $(SYSTEM_H)
--gengtype-parse.o: $(CONFIG_H)
-+gengtype-parse.o: $(CONFIG_H) $(BCONFIG_H)
- CFLAGS-gengtype-parse.o += -DGENERATOR_FILE
- build/gengtype-parse.o: $(BCONFIG_H)
- 
- gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \
-   gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \
-   $(XREGEX_H)
--gengtype-state.o: $(CONFIG_H)
-+gengtype-state.o: $(CONFIG_H) $(BCONFIG_H)
- CFLAGS-gengtype-state.o += -DGENERATOR_FILE
- build/gengtype-state.o: $(BCONFIG_H)
- 
- gengtype.o build/gengtype.o : gengtype.c $(SYSTEM_H) gengtype.h 	\
-   rtl.def insn-notes.def errors.h double-int.h version.h $(HASHTAB_H) \
-   $(OBSTACK_H) $(XREGEX_H)
--gengtype.o: $(CONFIG_H)
-+gengtype.o: $(CONFIG_H) $(BCONFIG_H)
- CFLAGS-gengtype.o += -DGENERATOR_FILE
- build/gengtype.o: $(BCONFIG_H)
- 
diff --git a/pkgs/development/compilers/gcc/patches/use-source-date-epoch.patch b/pkgs/development/compilers/gcc/patches/use-source-date-epoch.patch
deleted file mode 100644
index 65a5ab028c1c..000000000000
--- a/pkgs/development/compilers/gcc/patches/use-source-date-epoch.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://gcc.gnu.org/ml/gcc-patches/2015-06/msg02210.html
-
-diff --git a/libcpp/macro.c b/libcpp/macro.c
-index 1e0a0b5..a52e3cb 100644
---- a/libcpp/macro.c
-+++ b/libcpp/macro.c
-@@ -349,14 +349,38 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node)
- 	     slow on some systems.  */
- 	  time_t tt;
- 	  struct tm *tb = NULL;
-+	  char *source_date_epoch;
- 
--	  /* (time_t) -1 is a legitimate value for "number of seconds
--	     since the Epoch", so we have to do a little dance to
--	     distinguish that from a genuine error.  */
--	  errno = 0;
--	  tt = time(NULL);
--	  if (tt != (time_t)-1 || errno == 0)
--	    tb = localtime (&tt);
-+	  /* Allow the date and time to be set externally by an exported
-+	     environment variable to enable reproducible builds. */
-+	  source_date_epoch = getenv ("SOURCE_DATE_EPOCH");
-+	  if (source_date_epoch)
-+	    {
-+	      errno = 0;
-+	      tt = (time_t) strtol (source_date_epoch, NULL, 10);
-+	      if (errno == 0)
-+	        {
-+		  tb = gmtime (&tt);
-+		  if (tb == NULL)
-+		    cpp_error (pfile, CPP_DL_ERROR,
-+			       "SOURCE_DATE_EPOCH=\"%s\" is not a valid date",
-+			       source_date_epoch);
-+	        }
-+	      else
-+		cpp_error (pfile, CPP_DL_ERROR,
-+			   "SOURCE_DATE_EPOCH=\"%s\" is not a valid number",
-+			   source_date_epoch);
-+	    }
-+	  else
-+	    {
-+	    /* (time_t) -1 is a legitimate value for "number of seconds
-+	       since the Epoch", so we have to do a little dance to
-+	       distinguish that from a genuine error.  */
-+	    errno = 0;
-+	    tt = time(NULL);
-+	    if (tt != (time_t)-1 || errno == 0)
-+	      tb = localtime (&tt);
-+	  }
- 
- 	  if (tb)
- 	    {

From 2a196a727875db31f845cb97da9fc102240c36b3 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2872/3724] {gcc9,gfortran9}: drop

EOL since 2022; no longer used in the tree.
---
 doc/release-notes/rl-2511.section.md          |   2 +
 pkgs/by-name/gf/gfortran9/package.nix         |  10 -
 .../compilers/gcc/common/dependencies.nix     |   2 +-
 pkgs/development/compilers/gcc/default.nix    |  17 +-
 ...thread-model-support-from-mcfgthread.patch | 306 ------------------
 .../AvailabilityInternal.h-fixincludes.patch  | 105 ------
 ...ix-struct-redefinition-on-glibc-2.36.patch |  31 --
 .../gcc/patches/9/gcc9-darwin-as-gstabs.patch |  99 ------
 .../compilers/gcc/patches/default.nix         |  25 +-
 .../gcc/patches/libstdc++-netbsd-ctypes.patch | 141 --------
 .../gcc/patches/no-sys-dirs-riscv-gcc9.patch  |  17 -
 pkgs/development/compilers/gcc/versions.nix   |   2 -
 pkgs/top-level/aliases.nix                    |   3 +
 pkgs/top-level/all-packages.nix               |   2 -
 14 files changed, 10 insertions(+), 752 deletions(-)
 delete mode 100644 pkgs/by-name/gf/gfortran9/package.nix
 delete mode 100644 pkgs/development/compilers/gcc/patches/9/Added-mcf-thread-model-support-from-mcfgthread.patch
 delete mode 100644 pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch
 delete mode 100644 pkgs/development/compilers/gcc/patches/9/fix-struct-redefinition-on-glibc-2.36.patch
 delete mode 100644 pkgs/development/compilers/gcc/patches/9/gcc9-darwin-as-gstabs.patch
 delete mode 100644 pkgs/development/compilers/gcc/patches/libstdc++-netbsd-ctypes.patch
 delete mode 100644 pkgs/development/compilers/gcc/patches/no-sys-dirs-riscv-gcc9.patch

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 7f97507f0244..523c43f7386a 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -20,6 +20,8 @@
 
 - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
 
+- GCC 9 has been removed, as it has reached end‐of‐life upstream and is no longer supported.
+
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
 - `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
 - `space-orbit` package has been removed due to lack of upstream maintenance. Debian upstream stopped tracking it in 2011.
diff --git a/pkgs/by-name/gf/gfortran9/package.nix b/pkgs/by-name/gf/gfortran9/package.nix
deleted file mode 100644
index 9fce86338bcd..000000000000
--- a/pkgs/by-name/gf/gfortran9/package.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ wrapCC, gcc9 }:
-wrapCC (
-  gcc9.cc.override {
-    name = "gfortran";
-    langFortran = true;
-    langCC = false;
-    langC = false;
-    profiledCompiler = false;
-  }
-)
diff --git a/pkgs/development/compilers/gcc/common/dependencies.nix b/pkgs/development/compilers/gcc/common/dependencies.nix
index b27b59f2f2b9..839d6474836e 100644
--- a/pkgs/development/compilers/gcc/common/dependencies.nix
+++ b/pkgs/development/compilers/gcc/common/dependencies.nix
@@ -76,8 +76,8 @@ in
     gmp
     mpfr
     libmpc
+    libxcrypt
   ]
-  ++ optionals (lib.versionAtLeast version "10") [ libxcrypt ]
   ++ [
     targetPackages.stdenv.cc.bintools # For linking code at run-time
   ]
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 0e4a70f870d5..456c83df7e57 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -53,7 +53,6 @@
   callPackage,
   majorMinorVersion,
   apple-sdk,
-  cctools,
   darwin,
 }:
 
@@ -84,13 +83,11 @@ let
   atLeast13 = versionAtLeast version "13";
   atLeast12 = versionAtLeast version "12";
   atLeast11 = versionAtLeast version "11";
-  atLeast10 = versionAtLeast version "10";
   is14 = majorVersion == "14";
   is13 = majorVersion == "13";
   is12 = majorVersion == "12";
   is11 = majorVersion == "11";
   is10 = majorVersion == "10";
-  is9 = majorVersion == "9";
 
   # releases have a form: MAJOR.MINOR.MICRO, like 14.2.1
   # snapshots have a form like MAJOR.MINOR.MICRO.DATE, like 14.2.1.20250322
@@ -326,11 +323,9 @@ pipe
         depsTargetTarget
         ;
 
-      preConfigure =
-        (callFile ./common/pre-configure.nix { })
-        + optionalString atLeast10 ''
-          ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h
-        '';
+      preConfigure = (callFile ./common/pre-configure.nix { }) + ''
+        ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h
+      '';
 
       dontDisableStatic = true;
 
@@ -466,12 +461,6 @@ pipe
           if (!lib.systems.equals targetPlatform hostPlatform) then [ "aarch64-darwin" ] else [ ];
       };
     }
-    // optionalAttrs (!atLeast10 && stdenv.targetPlatform.isDarwin) {
-      # GCC <10 requires default cctools `strip` instead of `llvm-strip` used by Darwin bintools.
-      preBuild = ''
-        makeFlagsArray+=('STRIP=${getBin cctools}/bin/${stdenv.cc.targetPrefix}strip')
-      '';
-    }
     // optionalAttrs enableMultilib {
       dontMoveLib64 = true;
     }
diff --git a/pkgs/development/compilers/gcc/patches/9/Added-mcf-thread-model-support-from-mcfgthread.patch b/pkgs/development/compilers/gcc/patches/9/Added-mcf-thread-model-support-from-mcfgthread.patch
deleted file mode 100644
index d9809e828f10..000000000000
--- a/pkgs/development/compilers/gcc/patches/9/Added-mcf-thread-model-support-from-mcfgthread.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-From 86f2f767ddffd9f7c6f1470b987ae7b0d251b988 Mon Sep 17 00:00:00 2001
-From: Liu Hao <lh_mouse@126.com>
-Date: Wed, 25 Apr 2018 21:54:19 +0800
-Subject: [PATCH] Added 'mcf' thread model support from mcfgthread.
-
-Signed-off-by: Liu Hao <lh_mouse@126.com>
----
- config/gthr.m4                          |  1 +
- gcc/config.gcc                          |  3 +++
- gcc/config/i386/mingw-mcfgthread.h      |  1 +
- gcc/config/i386/mingw-w64.h             |  2 +-
- gcc/config/i386/mingw32.h               | 11 ++++++++++-
- gcc/configure                           |  2 +-
- gcc/configure.ac                        |  2 +-
- libatomic/configure.tgt                 |  2 +-
- libgcc/config.host                      |  6 ++++++
- libgcc/config/i386/gthr-mcf.h           |  1 +
- libgcc/config/i386/t-mingw-mcfgthread   |  2 ++
- libgcc/configure                        |  1 +
- libstdc++-v3/configure                  |  1 +
- libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++
- libstdc++-v3/libsupc++/guard.cc         | 23 +++++++++++++++++++++++
- libstdc++-v3/src/c++11/thread.cc        |  9 +++++++++
- 16 files changed, 80 insertions(+), 5 deletions(-)
- create mode 100644 gcc/config/i386/mingw-mcfgthread.h
- create mode 100644 libgcc/config/i386/gthr-mcf.h
- create mode 100644 libgcc/config/i386/t-mingw-mcfgthread
-
-diff --git a/config/gthr.m4 b/config/gthr.m4
-index 7b29f1f3327..82e21fe1709 100644
---- a/config/gthr.m4
-+++ b/config/gthr.m4
-@@ -21,6 +21,7 @@ case $1 in
-     tpf)	thread_header=config/s390/gthr-tpf.h ;;
-     vxworks)	thread_header=config/gthr-vxworks.h ;;
-     win32)	thread_header=config/i386/gthr-win32.h ;;
-+    mcf)	thread_header=config/i386/gthr-mcf.h ;;
- esac
- AC_SUBST(thread_header)
- ])
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 46a9029acec..112c24e95a3 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -1758,6 +1758,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
- 	if test x$enable_threads = xposix ; then
- 		tm_file="${tm_file} i386/mingw-pthread.h"
- 	fi
-+	if test x$enable_threads = xmcf ; then
-+		tm_file="${tm_file} i386/mingw-mcfgthread.h"
-+	fi
- 	tm_file="${tm_file} i386/mingw32.h"
- 	# This makes the logic if mingw's or the w64 feature set has to be used
- 	case ${target} in
-diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h
-new file mode 100644
-index 00000000000..ec381a7798f
---- /dev/null
-+++ b/gcc/config/i386/mingw-mcfgthread.h
-@@ -0,0 +1 @@
-+#define TARGET_USE_MCFGTHREAD 1
-diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h
-index 484dc7a9e9f..a15bbeea500 100644
---- a/gcc/config/i386/mingw-w64.h
-+++ b/gcc/config/i386/mingw-w64.h
-@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3.  If not see
- 		 "%{mwindows:-lgdi32 -lcomdlg32} " \
-      "%{fvtable-verify=preinit:-lvtv -lpsapi; \
-         fvtable-verify=std:-lvtv -lpsapi} " \
--		 "-ladvapi32 -lshell32 -luser32 -lkernel32"
-+		 LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"
- 
- #undef SPEC_32
- #undef SPEC_64
-diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
-index 0612b87199a..76cea94f3b7 100644
---- a/gcc/config/i386/mingw32.h
-+++ b/gcc/config/i386/mingw32.h
-@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3.  If not see
- 	 | MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \
- 	 | MASK_MS_BITFIELD_LAYOUT)
- 
-+#ifndef TARGET_USE_MCFGTHREAD
-+#define CPP_MCFGTHREAD()  ((void)0)
-+#define LIB_MCFGTHREAD     ""
-+#else
-+#define CPP_MCFGTHREAD()  (builtin_define("__USING_MCFGTHREAD__"))
-+#define LIB_MCFGTHREAD     " -lmcfgthread "
-+#endif
-+
- /* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS
-    is for compatibility with native compiler.  */
- #define EXTRA_OS_CPP_BUILTINS()					\
-@@ -50,6 +58,7 @@ along with GCC; see the file COPYING3.  If not see
- 	  builtin_define_std ("WIN64");				\
- 	  builtin_define ("_WIN64");				\
- 	}							\
-+	CPP_MCFGTHREAD();	\
-     }								\
-   while (0)
- 
-@@ -93,7 +102,7 @@ along with GCC; see the file COPYING3.  If not see
- 		 "%{mwindows:-lgdi32 -lcomdlg32} " \
-      "%{fvtable-verify=preinit:-lvtv -lpsapi; \
-         fvtable-verify=std:-lvtv -lpsapi} " \
--                 "-ladvapi32 -lshell32 -luser32 -lkernel32"
-+                 LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"
- 
- /* Weak symbols do not get resolved if using a Windows dll import lib.
-    Make the unwind registration references strong undefs.  */
-diff --git a/gcc/configure b/gcc/configure
-index 6121e163259..52f0e00efe6 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -11693,7 +11693,7 @@ case ${enable_threads} in
-     target_thread_file='single'
-     ;;
-   aix | dce | lynx | mipssde | posix | rtems | \
--  single | tpf | vxworks | win32)
-+  single | tpf | vxworks | win32 | mcf)
-     target_thread_file=${enable_threads}
-     ;;
-   *)
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index b066cc609e1..4ecdba88de7 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -1612,7 +1612,7 @@ case ${enable_threads} in
-     target_thread_file='single'
-     ;;
-   aix | dce | lynx | mipssde | posix | rtems | \
--  single | tpf | vxworks | win32)
-+  single | tpf | vxworks | win32 | mcf)
-     target_thread_file=${enable_threads}
-     ;;
-   *)
-diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
-index ea8c34f8c71..23134ad7363 100644
---- a/libatomic/configure.tgt
-+++ b/libatomic/configure.tgt
-@@ -145,7 +145,7 @@ case "${target}" in
-   *-*-mingw*)
- 	# OS support for atomic primitives.
-         case ${target_thread_file} in
--          win32)
-+          win32 | mcf)
-             config_path="${config_path} mingw"
-             ;;
-           posix)
-diff --git a/libgcc/config.host b/libgcc/config.host
-index 11b4acaff55..9fbd38650bd 100644
---- a/libgcc/config.host
-+++ b/libgcc/config.host
-@@ -737,6 +737,9 @@ i[34567]86-*-mingw*)
- 	  posix)
- 	    tmake_file="i386/t-mingw-pthread $tmake_file"
- 	    ;;
-+	  mcf)
-+	    tmake_file="i386/t-mingw-mcfgthread $tmake_file"
-+	    ;;
- 	esac
- 	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
- 	if test x$ac_cv_sjlj_exceptions = xyes; then
-@@ -761,6 +764,9 @@ x86_64-*-mingw*)
- 	  posix)
- 	    tmake_file="i386/t-mingw-pthread $tmake_file"
- 	    ;;
-+	  mcf)
-+	    tmake_file="i386/t-mingw-mcfgthread $tmake_file"
-+	    ;;
- 	esac
- 	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
- 	if test x$ac_cv_sjlj_exceptions = xyes; then
-diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h
-new file mode 100644
-index 00000000000..5ea2908361f
---- /dev/null
-+++ b/libgcc/config/i386/gthr-mcf.h
-@@ -0,0 +1 @@
-+#include <mcfgthread/gthread.h>
-diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread
-new file mode 100644
-index 00000000000..4b9b10e32d6
---- /dev/null
-+++ b/libgcc/config/i386/t-mingw-mcfgthread
-@@ -0,0 +1,2 @@
-+SHLIB_PTHREAD_CFLAG =
-+SHLIB_PTHREAD_LDFLAG = -lmcfgthread
-diff --git a/libgcc/configure b/libgcc/configure
-index b2f3f870844..eff889dc3b3 100644
---- a/libgcc/configure
-+++ b/libgcc/configure
-@@ -5451,6 +5451,7 @@ case $target_thread_file in
-     tpf)	thread_header=config/s390/gthr-tpf.h ;;
-     vxworks)	thread_header=config/gthr-vxworks.h ;;
-     win32)	thread_header=config/i386/gthr-win32.h ;;
-+    mcf)	thread_header=config/i386/gthr-mcf.h ;;
- esac
- 
- 
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index ba094be6f15..979a5ab9ace 100755
---- a/libstdc++-v3/configure
-+++ b/libstdc++-v3/configure
-@@ -15187,6 +15187,7 @@ case $target_thread_file in
-     tpf)	thread_header=config/s390/gthr-tpf.h ;;
-     vxworks)	thread_header=config/gthr-vxworks.h ;;
-     win32)	thread_header=config/i386/gthr-win32.h ;;
-+    mcf)	thread_header=config/i386/gthr-mcf.h ;;
- esac
- 
- 
-diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc
-index de920d714c6..665fb74bd6b 100644
---- a/libstdc++-v3/libsupc++/atexit_thread.cc
-+++ b/libstdc++-v3/libsupc++/atexit_thread.cc
-@@ -25,6 +25,22 @@
- #include <cstdlib>
- #include <new>
- #include "bits/gthr.h"
-+
-+#ifdef __USING_MCFGTHREAD__
-+
-+#include <mcfgthread/gthread.h>
-+
-+extern "C" int
-+__cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *),
-+				 void *obj, void *dso_handle)
-+  _GLIBCXX_NOTHROW
-+{
-+  return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1;
-+  (void)dso_handle;
-+}
-+
-+#else // __USING_MCFGTHREAD__
-+
- #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
-@@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha
- }
- 
- #endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */
-+
-+#endif // __USING_MCFGTHREAD__
-diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
-index 3a2ec3ad0d6..8b4cc96199b 100644
---- a/libstdc++-v3/libsupc++/guard.cc
-+++ b/libstdc++-v3/libsupc++/guard.cc
-@@ -28,6 +28,27 @@
- #include <cxxabi.h>
- #include <exception>
- #include <new>
-+
-+#ifdef __USING_MCFGTHREAD__
-+
-+#include <mcfgthread/gthread.h>
-+
-+namespace __cxxabiv1 {
-+
-+extern "C" int __cxa_guard_acquire(__guard *g){
-+	return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial;
-+}
-+extern "C" void __cxa_guard_abort(__guard *g) throw() {
-+	::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g);
-+}
-+extern "C" void __cxa_guard_release(__guard *g) throw() {
-+	::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g);
-+}
-+
-+}
-+
-+#else // __USING_MCFGTHREAD__
-+
- #include <ext/atomicity.h>
- #include <ext/concurrence.h>
- #include <bits/atomic_lockfree_defines.h>
-@@ -425,3 +446,5 @@ namespace __cxxabiv1
- #endif
-   }
- }
-+
-+#endif
-diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc
-index 8238817c2e9..0c6a1f85f6f 100644
---- a/libstdc++-v3/src/c++11/thread.cc
-+++ b/libstdc++-v3/src/c++11/thread.cc
-@@ -55,6 +55,15 @@ static inline int get_nprocs()
- #elif defined(_GLIBCXX_USE_SC_NPROC_ONLN)
- # include <unistd.h>
- # define _GLIBCXX_NPROCS sysconf(_SC_NPROC_ONLN)
-+#elif defined(_WIN32)
-+# include <windows.h>
-+static inline int get_nprocs()
-+{
-+  SYSTEM_INFO sysinfo;
-+  GetSystemInfo(&sysinfo);
-+  return (int)sysinfo.dwNumberOfProcessors;
-+}
-+# define _GLIBCXX_NPROCS get_nprocs()
- #else
- # define _GLIBCXX_NPROCS 0
- #endif
--- 
-2.17.0
-
diff --git a/pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch b/pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch
deleted file mode 100644
index 8575f71912a1..000000000000
--- a/pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
-index 47a3578f017..6cf22d19b2a 100644
---- a/fixincludes/fixincl.x
-+++ b/fixincludes/fixincl.x
-@@ -3480,6 +3480,43 @@ static const char* apzDarwin_Ucred__AtomicPatch[] = {
- #endif\n",
-     (char*)NULL };
- 
-+/* * * * * * * * * * * * * * * * * * * * * * * * * *
-+ *
-+ *  Description of Darwin_Nix_Sdk_Availabilityinternal fix
-+ */
-+tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] =
-+     "darwin_nix_sdk_availabilityinternal";
-+
-+/*
-+ *  File name selection pattern
-+ */
-+tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] =
-+  "AvailabilityInternal.h\0";
-+/*
-+ *  Machine/OS name selection pattern
-+ */
-+tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = {
-+        "*-*-darwin*",
-+        (const char*)NULL };
-+
-+/*
-+ *  content selection pattern - do fix if pattern found
-+ */
-+tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] =
-+       "(.*)__has_builtin\\(__is_target_os\\)(.*)";
-+
-+#define    DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT  1
-+static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = {
-+  { TT_EGREP,    zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, };
-+
-+/*
-+ *  Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal
-+ */
-+static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = {
-+    "format",
-+    "%10%2",
-+    (char*)NULL };
-+
- /* * * * * * * * * * * * * * * * * * * * * * * * * *
-  *
-  *  Description of Dec_Intern_Asm fix
-@@ -10445,9 +10482,9 @@ static const char* apzX11_SprintfPatch[] = {
-  *
-  *  List of all fixes
-  */
--#define REGEX_COUNT          296
-+#define REGEX_COUNT          297
- #define MACH_LIST_SIZE_LIMIT 187
--#define FIX_COUNT            257
-+#define FIX_COUNT            258
- 
- /*
-  *  Enumerate the fixes
-@@ -10535,6 +10572,7 @@ typedef enum {
-     DARWIN_STDINT_6_FIXIDX,
-     DARWIN_STDINT_7_FIXIDX,
-     DARWIN_UCRED__ATOMIC_FIXIDX,
-+    DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX,
-     DEC_INTERN_ASM_FIXIDX,
-     DJGPP_WCHAR_H_FIXIDX,
-     ECD_CURSOR_FIXIDX,
-@@ -11123,6 +11161,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
-      DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-      aDarwin_Ucred__AtomicTests,   apzDarwin_Ucred__AtomicPatch, 0 },
- 
-+  {  zDarwin_Nix_Sdk_AvailabilityinternalName,    zDarwin_Nix_Sdk_AvailabilityinternalList,
-+     apzDarwin_Nix_Sdk_AvailabilityinternalMachs,
-+     DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-+     aDarwin_Nix_Sdk_AvailabilityinternalTests,   apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 },
-+
-   {  zDec_Intern_AsmName,    zDec_Intern_AsmList,
-      apzDec_Intern_AsmMachs,
-      DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
-diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
-index bf136fdaa20..89bceb46c26 100644
---- a/fixincludes/inclhack.def
-+++ b/fixincludes/inclhack.def
-@@ -1727,6 +1727,20 @@ fix = {
-     test_text = ""; /* Don't provide this for wrap fixes.  */
- };
- 
-+/*
-+ * Newer versions of AvailabilityInternal.h use `__has_builtin`,
-+ * which is not implemented in or compatible with GCC.
-+ */
-+fix = {
-+    hackname  = darwin_nix_sdk_availabilityinternal;
-+    mach      = "*-*-darwin*";
-+    files     = AvailabilityInternal.h;
-+    c_fix     = format;
-+    c_fix_arg = "%10%2";
-+    select    = "(.*)__has_builtin\\(__is_target_os\\)(.*)";
-+    test_text = "__has_builtin(__is_target_os)";
-+};
-+
- /*
-  *  Fix <c_asm.h> on Digital UNIX V4.0:
-  *  It contains a prototype for a DEC C internal asm() function,
diff --git a/pkgs/development/compilers/gcc/patches/9/fix-struct-redefinition-on-glibc-2.36.patch b/pkgs/development/compilers/gcc/patches/9/fix-struct-redefinition-on-glibc-2.36.patch
deleted file mode 100644
index 5b4abfd02e0b..000000000000
--- a/pkgs/development/compilers/gcc/patches/9/fix-struct-redefinition-on-glibc-2.36.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Derived from ../11/fix-struct-redefinition-on-glibc-2.36.patch (upstream commit d2356ebb0084a0d80dbfe33040c9afe938c15d19)
-
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-index e8fce8a02..cb1ac806e 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -65,7 +65,9 @@
- #include <sys/vt.h>
- #include <linux/cdrom.h>
- #include <linux/fd.h>
-+#if SANITIZER_ANDROID
- #include <linux/fs.h>
-+#endif
- #include <linux/hdreg.h>
- #include <linux/input.h>
- #include <linux/ioctl.h>
-@@ -846,10 +848,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
-   unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
-   unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
- #endif
--  unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
--  unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
--  unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
--  unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
-+  unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
-+  unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
-+  unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
-+  unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
-   unsigned IOCTL_GIO_CMAP = GIO_CMAP;
-   unsigned IOCTL_GIO_FONT = GIO_FONT;
-   unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
diff --git a/pkgs/development/compilers/gcc/patches/9/gcc9-darwin-as-gstabs.patch b/pkgs/development/compilers/gcc/patches/9/gcc9-darwin-as-gstabs.patch
deleted file mode 100644
index 454139c5396c..000000000000
--- a/pkgs/development/compilers/gcc/patches/9/gcc9-darwin-as-gstabs.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Backported from https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b2cee5e1e89c8f939bc36fe9756befcb93d96982
-
-diff -ur a/gcc/config/darwin.h b/gcc/config/darwin.h
---- a/gcc/config/darwin.h	2022-05-27 03:21:10.947379000 -0400
-+++ b/gcc/config/darwin.h	2023-11-06 12:18:27.209236423 -0500
-@@ -230,12 +230,18 @@
- 
- #define DSYMUTIL "\ndsymutil"
- 
-+/* Spec that controls whether the debug linker is run automatically for
-+   a link step.  This needs to be done if there is a source file on the
-+   command line which will result in a temporary object (and debug is
-+   enabled).  */
-+
- #define DSYMUTIL_SPEC \
-    "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
-     %{v} \
--    %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\
--    %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm: \
--    %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}"
-+    %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\
-+    %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|\
-+      .f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \
-+    %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}"
- 
- #define LINK_COMMAND_SPEC LINK_COMMAND_SPEC_A DSYMUTIL_SPEC
- 
-@@ -463,21 +469,31 @@
-   %{Zforce_cpusubtype_ALL:-force_cpusubtype_ALL} \
-   %{static}" ASM_MMACOSX_VERSION_MIN_SPEC
- 
--/* Default ASM_DEBUG_SPEC.  Darwin's as cannot currently produce dwarf
--   debugging data.  */
--
-+#ifdef HAS_AS_STABS_DIRECTIVE
-+/* We only pass a debug option to the assembler if that supports stabs, since
-+   dwarf is not uniformly supported in the assemblers.  */
- #define ASM_DEBUG_SPEC  "%{g*:%{%:debug-level-gt(0):%{!gdwarf*:--gstabs}}}"
-+#else
-+#define ASM_DEBUG_SPEC ""
-+#endif
-+
-+#undef  ASM_DEBUG_OPTION_SPEC
-+#define ASM_DEBUG_OPTION_SPEC  ""
-+
- #define ASM_FINAL_SPEC \
-   "%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform} %<gsplit-dwarf"
- 
--/* We still allow output of STABS if the assembler supports it.  */
-+/* We now require C++11 to bootstrap and newer tools than those based on
-+   stabs, so require DWARF-2, even if stabs is supported by the assembler.  */
-+
-+#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-+#define DARWIN_PREFER_DWARF
-+#define DWARF2_DEBUGGING_INFO 1
-+
- #ifdef HAVE_AS_STABS_DIRECTIVE
- #define DBX_DEBUGGING_INFO 1
--#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
- #endif
- 
--#define DWARF2_DEBUGGING_INFO 1
--
- #define DEBUG_FRAME_SECTION	  "__DWARF,__debug_frame,regular,debug"
- #define DEBUG_INFO_SECTION	  "__DWARF,__debug_info,regular,debug"
- #define DEBUG_ABBREV_SECTION	  "__DWARF,__debug_abbrev,regular,debug"
-diff -ur a/gcc/config/darwin9.h b/gcc/config/darwin9.h
---- a/gcc/config/darwin9.h	2022-05-27 03:21:10.947379000 -0400
-+++ b/gcc/config/darwin9.h	2023-11-06 12:18:48.325260590 -0500
-@@ -18,29 +18,6 @@
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
- 
--/* Prefer DWARF2.  */
--#undef PREFERRED_DEBUGGING_TYPE
--#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
--#define DARWIN_PREFER_DWARF
--
--/* Since DWARF2 is default, conditions for running dsymutil are different.  */
--#undef DSYMUTIL_SPEC
--#define DSYMUTIL_SPEC \
--   "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
--    %{v} \
--    %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\
--    %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|.f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \
--    %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}"
--
--/* Tell collect2 to run dsymutil for us as necessary.  */
--#define COLLECT_RUN_DSYMUTIL 1
--
--/* Only ask as for debug data if the debug style is stabs (since as doesn't
--   yet generate dwarf.)  */
--
--#undef  ASM_DEBUG_SPEC
--#define ASM_DEBUG_SPEC  "%{g*:%{%:debug-level-gt(0):%{gstabs:--gstabs}}}"
--
- #undef  ASM_OUTPUT_ALIGNED_COMMON
- #define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN)		\
-   do {									\
diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index 0b57ecab691f..f0bb8d5b7c75 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -32,14 +32,12 @@ let
   atLeast13 = lib.versionAtLeast version "13";
   atLeast12 = lib.versionAtLeast version "12";
   atLeast11 = lib.versionAtLeast version "11";
-  atLeast10 = lib.versionAtLeast version "10";
   is15 = majorVersion == "15";
   is14 = majorVersion == "14";
   is13 = majorVersion == "13";
   is12 = majorVersion == "12";
   is11 = majorVersion == "11";
   is10 = majorVersion == "10";
-  is9 = majorVersion == "9";
 
   # We only apply these patches when building a native toolchain for
   # aarch64-darwin, as it breaks building a foreign one:
@@ -99,7 +97,6 @@ in
       ];
       "11" = [ ./no-sys-dirs-riscv.patch ];
       "10" = [ ./no-sys-dirs-riscv.patch ];
-      "9" = [ ./no-sys-dirs-riscv-gcc9.patch ];
     }
     ."${majorVersion}" or [ ]
   )
@@ -283,14 +280,6 @@ in
   .${majorVersion} or [ ]
 )
 
-# Work around newer AvailabilityInternal.h when building older versions of GCC.
-++ optionals (stdenv.hostPlatform.isDarwin) (
-  {
-    "9" = [ ../patches/9/AvailabilityInternal.h-fixincludes.patch ];
-  }
-  .${majorVersion} or [ ]
-)
-
 ## Windows
 
 # Backported mcf thread model support from gcc13:
@@ -321,7 +310,7 @@ in
 ## gcc 10.0 and older ##############################################################################
 
 # Probably needed for gnat wrapper https://github.com/NixOS/nixpkgs/pull/62314
-++ optional (langAda && (is9 || is10)) ./gnat-cflags.patch
+++ optional (langAda && is10) ./gnat-cflags.patch
 ++
   # Backport native aarch64-darwin compilation fix from gcc12
   # https://github.com/NixOS/nixpkgs/pull/167595
@@ -341,15 +330,3 @@ in
 ++ optional (
   !atLeast11 && stdenv.cc.isClang && stdenv.hostPlatform.isDarwin
 ) ./clang-genconditions.patch
-
-## gcc 9.0 and older ##############################################################################
-
-++ optional (majorVersion == "9") ./9/fix-struct-redefinition-on-glibc-2.36.patch
-# Needed for NetBSD cross comp in older versions
-# https://gcc.gnu.org/pipermail/gcc-patches/2020-January/thread.html#537548
-# https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=98d56ea8900fdcff8f1987cf2bf499a5b7399857
-++ optional (!atLeast10 && targetPlatform.isNetBSD) ./libstdc++-netbsd-ctypes.patch
-
-# Make Darwin bootstrap respect whether the assembler supports `--gstabs`,
-# which is not supported by the clang integrated assembler used by default on Darwin.
-++ optional (is9 && hostPlatform.isDarwin) ./9/gcc9-darwin-as-gstabs.patch
diff --git a/pkgs/development/compilers/gcc/patches/libstdc++-netbsd-ctypes.patch b/pkgs/development/compilers/gcc/patches/libstdc++-netbsd-ctypes.patch
deleted file mode 100644
index 28fff80b786d..000000000000
--- a/pkgs/development/compilers/gcc/patches/libstdc++-netbsd-ctypes.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
-index ff3ec893974..21eccf9fde1 100644
---- a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
-+++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
-@@ -38,40 +38,46 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-   /// @brief  Base class for ctype.
-   struct ctype_base
-   {
--    // Non-standard typedefs.
--    typedef const unsigned char*	__to_type;
- 
-     // NB: Offsets into ctype<char>::_M_table force a particular size
-     // on the mask type. Because of this, we don't use an enum.
--    typedef unsigned char      	mask;
- 
- #ifndef _CTYPE_U
--    static const mask upper    	= _U;
--    static const mask lower 	= _L;
--    static const mask alpha 	= _U | _L;
--    static const mask digit 	= _N;
--    static const mask xdigit 	= _N | _X;
--    static const mask space 	= _S;
--    static const mask print 	= _P | _U | _L | _N | _B;
--    static const mask graph 	= _P | _U | _L | _N;
--    static const mask cntrl 	= _C;
--    static const mask punct 	= _P;
--    static const mask alnum 	= _U | _L | _N;
-+    // Non-standard typedefs.
-+    typedef const unsigned char*	__to_type;
-+
-+    typedef unsigned char	mask;
-+
-+    static const mask upper	= _U;
-+    static const mask lower	= _L;
-+    static const mask alpha	= _U | _L;
-+    static const mask digit	= _N;
-+    static const mask xdigit	= _N | _X;
-+    static const mask space	= _S;
-+    static const mask print	= _P | _U | _L | _N | _B;
-+    static const mask graph	= _P | _U | _L | _N;
-+    static const mask cntrl	= _C;
-+    static const mask punct	= _P;
-+    static const mask alnum	= _U | _L | _N;
- #else
--    static const mask upper    	= _CTYPE_U;
--    static const mask lower 	= _CTYPE_L;
--    static const mask alpha 	= _CTYPE_U | _CTYPE_L;
--    static const mask digit 	= _CTYPE_N;
--    static const mask xdigit 	= _CTYPE_N | _CTYPE_X;
--    static const mask space 	= _CTYPE_S;
--    static const mask print 	= _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N | _CTYPE_B;
--    static const mask graph 	= _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N;
--    static const mask cntrl 	= _CTYPE_C;
--    static const mask punct 	= _CTYPE_P;
--    static const mask alnum 	= _CTYPE_U | _CTYPE_L | _CTYPE_N;
-+    typedef const unsigned short*	__to_type;
-+
-+    typedef unsigned short	mask;
-+
-+    static const mask upper	= _CTYPE_U;
-+    static const mask lower	= _CTYPE_L;
-+    static const mask alpha	= _CTYPE_A;
-+    static const mask digit	= _CTYPE_D;
-+    static const mask xdigit	= _CTYPE_X;
-+    static const mask space	= _CTYPE_S;
-+    static const mask print	= _CTYPE_R;
-+    static const mask graph	= _CTYPE_G;
-+    static const mask cntrl	= _CTYPE_C;
-+    static const mask punct	= _CTYPE_P;
-+    static const mask alnum	= _CTYPE_A | _CTYPE_D;
- #endif
- #if __cplusplus >= 201103L
--    static const mask blank 	= space;
-+    static const mask blank	= space;
- #endif
-   };
- 
-diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc b/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc
-index ed3b7cd0d6a..33358e8f5d8 100644
---- a/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc
-+++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc
-@@ -38,11 +38,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 
- // Information as gleaned from /usr/include/ctype.h
- 
--  extern "C" const u_int8_t _C_ctype_[];
--
-   const ctype_base::mask*
-   ctype<char>::classic_table() throw()
--  { return _C_ctype_ + 1; }
-+  { return _C_ctype_tab_ + 1; }
- 
-   ctype<char>::ctype(__c_locale, const mask* __table, bool __del,
- 		     size_t __refs)
-@@ -69,14 +67,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 
-   char
-   ctype<char>::do_toupper(char __c) const
--  { return ::toupper((int) __c); }
-+  { return ::toupper((int)(unsigned char) __c); }
- 
-   const char*
-   ctype<char>::do_toupper(char* __low, const char* __high) const
-   {
-     while (__low < __high)
-       {
--	*__low = ::toupper((int) *__low);
-+	*__low = ::toupper((int)(unsigned char) *__low);
- 	++__low;
-       }
-     return __high;
-@@ -84,14 +82,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 
-   char
-   ctype<char>::do_tolower(char __c) const
--  { return ::tolower((int) __c); }
-+  { return ::tolower((int)(unsigned char) __c); }
- 
-   const char*
-   ctype<char>::do_tolower(char* __low, const char* __high) const
-   {
-     while (__low < __high)
-       {
--	*__low = ::tolower((int) *__low);
-+	*__low = ::tolower((int)(unsigned char) *__low);
- 	++__low;
-       }
-     return __high;
-diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h
-index ace1120fba2..3234ce17c70 100644
---- a/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h
-+++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h
-@@ -48,7 +48,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-   is(const char* __low, const char* __high, mask* __vec) const
-   {
-     while (__low < __high)
--      *__vec++ = _M_table[*__low++];
-+      *__vec++ = _M_table[(unsigned char)*__low++];
-     return __high;
-   }
- 
diff --git a/pkgs/development/compilers/gcc/patches/no-sys-dirs-riscv-gcc9.patch b/pkgs/development/compilers/gcc/patches/no-sys-dirs-riscv-gcc9.patch
deleted file mode 100644
index afe3f26360e4..000000000000
--- a/pkgs/development/compilers/gcc/patches/no-sys-dirs-riscv-gcc9.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h
-index 701f5ea1544..8de333caf54 100644
---- a/gcc/config/riscv/riscv.h
-+++ b/gcc/config/riscv/riscv.h
-@@ -886,11 +886,7 @@ extern unsigned riscv_stack_boundary;
-   "%{mabi=lp64f:lp64f}" \
-   "%{mabi=lp64d:lp64d}" \
- 
--#define STARTFILE_PREFIX_SPEC 			\
--   "/lib" XLEN_SPEC "/" ABI_SPEC "/ "		\
--   "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ "	\
--   "/lib/ "					\
--   "/usr/lib/ "
-+#define STARTFILE_PREFIX_SPEC ""
- 
- /* ISA constants needed for code generation.  */
- #define OPCODE_LW    0x2003
diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix
index 9cf3bb9d13cb..25e20d6f1cea 100644
--- a/pkgs/development/compilers/gcc/versions.nix
+++ b/pkgs/development/compilers/gcc/versions.nix
@@ -6,7 +6,6 @@ let
     "12" = "12.4.0";
     "11" = "11.5.0";
     "10" = "10.5.0";
-    "9" = "9.5.0";
   };
 
   fromMajorMinor = majorMinorVersion: majorMinorToVersionMap."${majorMinorVersion}";
@@ -23,7 +22,6 @@ let
       "12.4.0" = "sha256-cE9lJgTMvMsUvavzR4yVEciXiLEss7v/3tNzQZFqkXU=";
       "11.5.0" = "sha256-puIYaOrVRc+H8MAfhCduS1KB1nIJhZHByJYkHwk2NHg=";
       "10.5.0" = "sha256-JRCVQ/30bzl8NHtdi3osflaUpaUczkucbh6opxyjB8E=";
-      "9.5.0" = "13ygjmd938m0wmy946pxdhz9i1wq7z4w10l6pvidak0xxxj9yxi7";
     }
     ."${version}";
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 372b640f9912..80aea71c2600 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -948,6 +948,8 @@ mapAliases {
   gcc7Stdenv = throw "gcc7Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
   gcc8 = throw "gcc8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
   gcc8Stdenv = throw "gcc8Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
+  gcc9 = throw "gcc9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gcc9Stdenv = throw "gcc9Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc10StdenvCompat =
     if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21
   gcc-arm-embedded-6 = throw "gcc-arm-embedded-6 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
@@ -968,6 +970,7 @@ mapAliases {
   gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11
   gfortran7 = throw "gfortran7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
   gfortran8 = throw "gfortran8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
+  gfortran9 = throw "gfortran9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gg = go-graft; # Added 2025-03-07
   ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18
   ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b7703b77e9f..c8cbe66897b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4861,7 +4861,6 @@ with pkgs;
         extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc;
       };
 
-  gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9;
   gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10;
   gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11;
   gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12;
@@ -4966,7 +4965,6 @@ with pkgs;
       });
 
   inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; })
-    gcc9
     gcc10
     gcc11
     gcc12

From 4e7ee62b94d962a4ca28b5730bae0319598beb70 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2873/3724] {gcc10,gfortran10}: drop

EOL since 2023; no longer used in the tree.
---
 doc/release-notes/rl-2511.section.md          |   2 +-
 pkgs/by-name/gf/gfortran10/package.nix        |  10 -
 .../compilers/gcc/common/libgcc.nix           | 267 ++++++++-------
 pkgs/development/compilers/gcc/default.nix    |  77 ++---
 ...thread-model-support-from-mcfgthread.patch | 306 ------------------
 .../gcc/patches/clang-genconditions.patch     |  34 --
 .../compilers/gcc/patches/default.nix         |  37 ---
 .../compilers/gcc/patches/gnat-cflags.patch   |  35 --
 pkgs/development/compilers/gcc/versions.nix   |   2 -
 pkgs/top-level/aliases.nix                    |   6 +-
 pkgs/top-level/all-packages.nix               |   2 -
 11 files changed, 164 insertions(+), 614 deletions(-)
 delete mode 100644 pkgs/by-name/gf/gfortran10/package.nix
 delete mode 100644 pkgs/development/compilers/gcc/patches/10/Added-mcf-thread-model-support-from-mcfgthread.patch
 delete mode 100644 pkgs/development/compilers/gcc/patches/clang-genconditions.patch
 delete mode 100644 pkgs/development/compilers/gcc/patches/gnat-cflags.patch

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 523c43f7386a..f261560026ab 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -20,7 +20,7 @@
 
 - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
 
-- GCC 9 has been removed, as it has reached end‐of‐life upstream and is no longer supported.
+- GCC 9 and 10 have been removed, as they have reached end‐of‐life upstream and are no longer supported.
 
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
 - `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
diff --git a/pkgs/by-name/gf/gfortran10/package.nix b/pkgs/by-name/gf/gfortran10/package.nix
deleted file mode 100644
index 9cd90cd6f3b8..000000000000
--- a/pkgs/by-name/gf/gfortran10/package.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ wrapCC, gcc10 }:
-wrapCC (
-  gcc10.cc.override {
-    name = "gfortran";
-    langFortran = true;
-    langCC = false;
-    langC = false;
-    profiledCompiler = false;
-  }
-)
diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix
index 1d921a0bca8d..e0437bc6e6e0 100644
--- a/pkgs/development/compilers/gcc/common/libgcc.nix
+++ b/pkgs/development/compilers/gcc/common/libgcc.nix
@@ -41,145 +41,138 @@ lib.pipe drv
       )
 
     ]
-    ++
+    ++ (
+      let
+        targetPlatformSlash =
+          if lib.systems.equals hostPlatform targetPlatform then "" else "${targetPlatform.config}/";
 
-      # nixpkgs did not add the "libgcc" output until gcc11.  In theory
-      # the following condition can be changed to `true`, but that has not
-      # been tested.
-      lib.optionals (lib.versionAtLeast version "11.0")
+        # If we are building a cross-compiler and the target libc provided
+        # to us at build time has a libgcc, use that instead of building a
+        # new one.  This avoids having two separate (but identical) libgcc
+        # outpaths in the closure of most packages, which can be confusing.
+        useLibgccFromTargetLibc = libcCross != null && libcCross ? passthru.libgcc;
+
+        enableLibGccOutput =
+          (!stdenv.targetPlatform.isWindows || (lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform))
+          && !langJit
+          && !stdenv.hostPlatform.isDarwin
+          && enableShared
+          && !useLibgccFromTargetLibc;
+
+        # For some reason libgcc_s.so has major-version "2" on m68k but
+        # "1" everywhere else.  Might be worth changing this to "*".
+        libgcc_s-version-major = if targetPlatform.isM68k then "2" else "1";
+
+      in
+      [
 
         (
-          let
-            targetPlatformSlash =
-              if lib.systems.equals hostPlatform targetPlatform then "" else "${targetPlatform.config}/";
-
-            # If we are building a cross-compiler and the target libc provided
-            # to us at build time has a libgcc, use that instead of building a
-            # new one.  This avoids having two separate (but identical) libgcc
-            # outpaths in the closure of most packages, which can be confusing.
-            useLibgccFromTargetLibc = libcCross != null && libcCross ? passthru.libgcc;
-
-            enableLibGccOutput =
-              (!stdenv.targetPlatform.isWindows || (lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform))
-              && !langJit
-              && !stdenv.hostPlatform.isDarwin
-              && enableShared
-              && !useLibgccFromTargetLibc;
-
-            # For some reason libgcc_s.so has major-version "2" on m68k but
-            # "1" everywhere else.  Might be worth changing this to "*".
-            libgcc_s-version-major = if targetPlatform.isM68k then "2" else "1";
-
-          in
-          [
-
-            (
-              pkg:
-              pkg.overrideAttrs (
-                previousAttrs:
-                lib.optionalAttrs useLibgccFromTargetLibc {
-                  passthru = (previousAttrs.passthru or { }) // {
-                    inherit (libcCross) libgcc;
-                  };
-                }
-              )
-            )
-
-            (
-              pkg:
-              pkg.overrideAttrs (
-                previousAttrs:
-                lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) {
-                  outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ];
-                  # This is a separate phase because gcc assembles its phase scripts
-                  # in bash instead of nix (we should fix that).
-                  preFixupPhases =
-                    (previousAttrs.preFixupPhases or [ ])
-                    ++ lib.optionals ((!langC) || enableLibGccOutput) [ "preFixupLibGccPhase" ];
-                  preFixupLibGccPhase =
-                    # delete extra/unused builds of libgcc_s in non-langC builds
-                    # (i.e. libgccjit, gnat, etc) to avoid potential confusion
-                    lib.optionalString (!langC) ''
-                      rm -f $out/lib/libgcc_s.so*
-                    ''
-
-                    # move `libgcc_s.so` into its own output, `$libgcc`
-                    # We maintain $libgcc/lib/$target/ structure to make sure target
-                    # strip runs over libgcc_s.so and remove debug references to headers:
-                    #   https://github.com/NixOS/nixpkgs/issues/316114
-                    + lib.optionalString enableLibGccOutput (
-                      ''
-                        # move libgcc from lib to its own output (libgcc)
-                        mkdir -p $libgcc/${targetPlatformSlash}lib
-                        mv    $lib/${targetPlatformSlash}lib/libgcc_s.so      $libgcc/${targetPlatformSlash}lib/
-                        mv    $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major}    $libgcc/${targetPlatformSlash}lib/
-                        ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so   $lib/${targetPlatformSlash}lib/
-                        ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/
-                      ''
-                      + lib.optionalString (targetPlatformSlash != "") ''
-                        ln -s ${targetPlatformSlash}lib $libgcc/lib
-                      ''
-                      #
-                      # Nixpkgs ordinarily turns dynamic linking into pseudo-static linking:
-                      # libraries are still loaded dynamically, exactly which copy of each
-                      # library is loaded is permanently fixed at compile time (via RUNPATH).
-                      # For libgcc_s we must revert to the "impure dynamic linking" style found
-                      # in imperative software distributions.  We must do this because
-                      # `libgcc_s` calls `malloc()` and therefore has a `DT_NEEDED` for `libc`,
-                      # which creates two problems:
-                      #
-                      #  1. A circular package dependency `glibc`<-`libgcc`<-`glibc`
-                      #
-                      #  2. According to the `-Wl,-rpath` flags added by Nixpkgs' `ld-wrapper`,
-                      #     the two versions of `glibc` in the cycle above are actually
-                      #     different packages.  The later one is compiled by this `gcc`, but
-                      #     the earlier one was compiled by the compiler *that compiled* this
-                      #     `gcc` (usually the bootstrapFiles).  In any event, the `glibc`
-                      #     dynamic loader won't honor that specificity without namespaced
-                      #     manual loads (`dlmopen()`).  Once a `libc` is present in the address
-                      #     space of a process, that `libc` will be used to satisfy all
-                      #     `DT_NEEDED`s for `libc`, regardless of `RUNPATH`s.
-                      #
-                      # So we wipe the RUNPATH using `patchelf --set-rpath ""`.  We can't use
-                      # `patchelf --remove-rpath`, because at least as of patchelf 0.15.0 it
-                      # will leave the old RUNPATH string in the file where the reference
-                      # scanner can still find it:
-                      #
-                      #   https://github.com/NixOS/patchelf/issues/453
-                      #
-                      # Note: we might be using the bootstrapFiles' copy of patchelf, so we have
-                      # to keep doing it this way until both the issue is fixed *and* all the
-                      # bootstrapFiles are regenerated, on every platform.
-                      #
-                      # This patchelfing is *not* effectively equivalent to copying
-                      # `libgcc_s` into `glibc`'s outpath.  There is one minor and one
-                      # major difference:
-                      #
-                      # 1. (Minor): multiple builds of `glibc` (say, with different
-                      #    overrides or parameters) will all reference a single store
-                      #    path:
-                      #
-                      #      /nix/store/xxx...xxx-gcc-libgcc/lib/libgcc_s.so.1
-                      #
-                      #    This many-to-one referrer relationship will be visible in the store's
-                      #    dependency graph, and will be available to `nix-store -q` queries.
-                      #    Copying `libgcc_s` into each of its referrers would lose that
-                      #    information.
-                      #
-                      # 2. (Major): by referencing `libgcc_s.so.1`, rather than copying it, we
-                      #    are still able to run `nix-store -qd` on it to find out how it got
-                      #    built!  Most importantly, we can see from that deriver which compiler
-                      #    was used to build it (or if it is part of the unpacked
-                      #    bootstrap-files).  Copying `libgcc_s.so.1` from one outpath to
-                      #    another eliminates the ability to make these queries.
-                      #
-                      + ''
-                        patchelf --set-rpath "" $libgcc/lib/libgcc_s.so.${libgcc_s-version-major}
-                      ''
-                    );
-                }
-              )
-            )
-          ]
+          pkg:
+          pkg.overrideAttrs (
+            previousAttrs:
+            lib.optionalAttrs useLibgccFromTargetLibc {
+              passthru = (previousAttrs.passthru or { }) // {
+                inherit (libcCross) libgcc;
+              };
+            }
+          )
         )
+
+        (
+          pkg:
+          pkg.overrideAttrs (
+            previousAttrs:
+            lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) {
+              outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ];
+              # This is a separate phase because gcc assembles its phase scripts
+              # in bash instead of nix (we should fix that).
+              preFixupPhases =
+                (previousAttrs.preFixupPhases or [ ])
+                ++ lib.optionals ((!langC) || enableLibGccOutput) [ "preFixupLibGccPhase" ];
+              preFixupLibGccPhase =
+                # delete extra/unused builds of libgcc_s in non-langC builds
+                # (i.e. libgccjit, gnat, etc) to avoid potential confusion
+                lib.optionalString (!langC) ''
+                  rm -f $out/lib/libgcc_s.so*
+                ''
+
+                # move `libgcc_s.so` into its own output, `$libgcc`
+                # We maintain $libgcc/lib/$target/ structure to make sure target
+                # strip runs over libgcc_s.so and remove debug references to headers:
+                #   https://github.com/NixOS/nixpkgs/issues/316114
+                + lib.optionalString enableLibGccOutput (
+                  ''
+                    # move libgcc from lib to its own output (libgcc)
+                    mkdir -p $libgcc/${targetPlatformSlash}lib
+                    mv    $lib/${targetPlatformSlash}lib/libgcc_s.so      $libgcc/${targetPlatformSlash}lib/
+                    mv    $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major}    $libgcc/${targetPlatformSlash}lib/
+                    ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so   $lib/${targetPlatformSlash}lib/
+                    ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/
+                  ''
+                  + lib.optionalString (targetPlatformSlash != "") ''
+                    ln -s ${targetPlatformSlash}lib $libgcc/lib
+                  ''
+                  #
+                  # Nixpkgs ordinarily turns dynamic linking into pseudo-static linking:
+                  # libraries are still loaded dynamically, exactly which copy of each
+                  # library is loaded is permanently fixed at compile time (via RUNPATH).
+                  # For libgcc_s we must revert to the "impure dynamic linking" style found
+                  # in imperative software distributions.  We must do this because
+                  # `libgcc_s` calls `malloc()` and therefore has a `DT_NEEDED` for `libc`,
+                  # which creates two problems:
+                  #
+                  #  1. A circular package dependency `glibc`<-`libgcc`<-`glibc`
+                  #
+                  #  2. According to the `-Wl,-rpath` flags added by Nixpkgs' `ld-wrapper`,
+                  #     the two versions of `glibc` in the cycle above are actually
+                  #     different packages.  The later one is compiled by this `gcc`, but
+                  #     the earlier one was compiled by the compiler *that compiled* this
+                  #     `gcc` (usually the bootstrapFiles).  In any event, the `glibc`
+                  #     dynamic loader won't honor that specificity without namespaced
+                  #     manual loads (`dlmopen()`).  Once a `libc` is present in the address
+                  #     space of a process, that `libc` will be used to satisfy all
+                  #     `DT_NEEDED`s for `libc`, regardless of `RUNPATH`s.
+                  #
+                  # So we wipe the RUNPATH using `patchelf --set-rpath ""`.  We can't use
+                  # `patchelf --remove-rpath`, because at least as of patchelf 0.15.0 it
+                  # will leave the old RUNPATH string in the file where the reference
+                  # scanner can still find it:
+                  #
+                  #   https://github.com/NixOS/patchelf/issues/453
+                  #
+                  # Note: we might be using the bootstrapFiles' copy of patchelf, so we have
+                  # to keep doing it this way until both the issue is fixed *and* all the
+                  # bootstrapFiles are regenerated, on every platform.
+                  #
+                  # This patchelfing is *not* effectively equivalent to copying
+                  # `libgcc_s` into `glibc`'s outpath.  There is one minor and one
+                  # major difference:
+                  #
+                  # 1. (Minor): multiple builds of `glibc` (say, with different
+                  #    overrides or parameters) will all reference a single store
+                  #    path:
+                  #
+                  #      /nix/store/xxx...xxx-gcc-libgcc/lib/libgcc_s.so.1
+                  #
+                  #    This many-to-one referrer relationship will be visible in the store's
+                  #    dependency graph, and will be available to `nix-store -q` queries.
+                  #    Copying `libgcc_s` into each of its referrers would lose that
+                  #    information.
+                  #
+                  # 2. (Major): by referencing `libgcc_s.so.1`, rather than copying it, we
+                  #    are still able to run `nix-store -qd` on it to find out how it got
+                  #    built!  Most importantly, we can see from that deriver which compiler
+                  #    was used to build it (or if it is part of the unpacked
+                  #    bootstrap-files).  Copying `libgcc_s.so.1` from one outpath to
+                  #    another eliminates the ability to make these queries.
+                  #
+                  + ''
+                    patchelf --set-rpath "" $libgcc/lib/libgcc_s.so.${libgcc_s-version-major}
+                  ''
+                );
+            }
+          )
+        )
+      ]
+    )
   )
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 456c83df7e57..2d87fe210b61 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -82,12 +82,10 @@ let
   atLeast14 = versionAtLeast version "14";
   atLeast13 = versionAtLeast version "13";
   atLeast12 = versionAtLeast version "12";
-  atLeast11 = versionAtLeast version "11";
   is14 = majorVersion == "14";
   is13 = majorVersion == "13";
   is12 = majorVersion == "12";
   is11 = majorVersion == "11";
-  is10 = majorVersion == "10";
 
   # releases have a form: MAJOR.MINOR.MICRO, like 14.2.1
   # snapshots have a form like MAJOR.MINOR.MICRO.DATE, like 14.2.1.20250322
@@ -101,7 +99,7 @@ let
   #   "14.2.0" -> "14.2.0"
   baseVersion = lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version));
 
-  disableBootstrap = atLeast11 && !stdenv.hostPlatform.isDarwin && (atLeast12 -> !profiledCompiler);
+  disableBootstrap = !stdenv.hostPlatform.isDarwin && (atLeast12 -> !profiledCompiler);
 
   inherit (stdenv) buildPlatform hostPlatform targetPlatform;
   targetConfig =
@@ -224,7 +222,7 @@ pipe
             "mirror://gcc/snapshots/${majorVersion}-${snapDate}/gcc-${majorVersion}-${snapDate}.tar.xz"
           else
             "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
-        ${if is10 || is11 || is13 then "hash" else "sha256"} = gccVersions.srcHashForVersion version;
+        ${if is11 || is13 then "hash" else "sha256"} = gccVersions.srcHashForVersion version;
       };
 
       inherit patches;
@@ -342,21 +340,16 @@ pipe
       buildFlags =
         # we do not yet have Nix-driven profiling
         assert atLeast12 -> (profiledCompiler -> !disableBootstrap);
-        if atLeast11 then
-          let
-            target =
-              optionalString (profiledCompiler) "profiled"
-              + optionalString (
-                (lib.systems.equals targetPlatform hostPlatform)
-                && (lib.systems.equals hostPlatform buildPlatform)
-                && !disableBootstrap
-              ) "bootstrap";
-          in
-          optional (target != "") target
-        else
-          optional (
-            (lib.systems.equals targetPlatform hostPlatform) && (lib.systems.equals hostPlatform buildPlatform)
-          ) (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+        let
+          target =
+            optionalString (profiledCompiler) "profiled"
+            + optionalString (
+              (lib.systems.equals targetPlatform hostPlatform)
+              && (lib.systems.equals hostPlatform buildPlatform)
+              && !disableBootstrap
+            ) "bootstrap";
+        in
+        optional (target != "") target;
 
       inherit (callFile ./common/strip-attributes.nix { })
         stripDebugList
@@ -421,8 +414,7 @@ pipe
           ;
         isGNU = true;
         hardeningUnsupportedFlags =
-          optional (!atLeast11) "zerocallusedregs"
-          ++ optionals (!atLeast12) [
+          optionals (!atLeast12) [
             "fortify3"
             "trivialautovarinit"
           ]
@@ -452,36 +444,25 @@ pipe
           platforms
           teams
           ;
-      }
-      // optionalAttrs (!atLeast11) {
-        badPlatforms = [ "aarch64-darwin" ];
-      }
-      // optionalAttrs is10 {
-        badPlatforms =
-          if (!lib.systems.equals targetPlatform hostPlatform) then [ "aarch64-darwin" ] else [ ];
       };
     }
     // optionalAttrs enableMultilib {
       dontMoveLib64 = true;
     }
   ))
-  (
-    [
-      (callPackage ./common/libgcc.nix {
-        inherit
-          version
-          langC
-          langCC
-          langJit
-          targetPlatform
-          hostPlatform
-          withoutTargetLibc
-          enableShared
-          libcCross
-          ;
-      })
-    ]
-    ++ optionals atLeast11 [
-      (callPackage ./common/checksum.nix { inherit langC langCC; })
-    ]
-  )
+  ([
+    (callPackage ./common/libgcc.nix {
+      inherit
+        version
+        langC
+        langCC
+        langJit
+        targetPlatform
+        hostPlatform
+        withoutTargetLibc
+        enableShared
+        libcCross
+        ;
+    })
+    (callPackage ./common/checksum.nix { inherit langC langCC; })
+  ])
diff --git a/pkgs/development/compilers/gcc/patches/10/Added-mcf-thread-model-support-from-mcfgthread.patch b/pkgs/development/compilers/gcc/patches/10/Added-mcf-thread-model-support-from-mcfgthread.patch
deleted file mode 100644
index d9809e828f10..000000000000
--- a/pkgs/development/compilers/gcc/patches/10/Added-mcf-thread-model-support-from-mcfgthread.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-From 86f2f767ddffd9f7c6f1470b987ae7b0d251b988 Mon Sep 17 00:00:00 2001
-From: Liu Hao <lh_mouse@126.com>
-Date: Wed, 25 Apr 2018 21:54:19 +0800
-Subject: [PATCH] Added 'mcf' thread model support from mcfgthread.
-
-Signed-off-by: Liu Hao <lh_mouse@126.com>
----
- config/gthr.m4                          |  1 +
- gcc/config.gcc                          |  3 +++
- gcc/config/i386/mingw-mcfgthread.h      |  1 +
- gcc/config/i386/mingw-w64.h             |  2 +-
- gcc/config/i386/mingw32.h               | 11 ++++++++++-
- gcc/configure                           |  2 +-
- gcc/configure.ac                        |  2 +-
- libatomic/configure.tgt                 |  2 +-
- libgcc/config.host                      |  6 ++++++
- libgcc/config/i386/gthr-mcf.h           |  1 +
- libgcc/config/i386/t-mingw-mcfgthread   |  2 ++
- libgcc/configure                        |  1 +
- libstdc++-v3/configure                  |  1 +
- libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++
- libstdc++-v3/libsupc++/guard.cc         | 23 +++++++++++++++++++++++
- libstdc++-v3/src/c++11/thread.cc        |  9 +++++++++
- 16 files changed, 80 insertions(+), 5 deletions(-)
- create mode 100644 gcc/config/i386/mingw-mcfgthread.h
- create mode 100644 libgcc/config/i386/gthr-mcf.h
- create mode 100644 libgcc/config/i386/t-mingw-mcfgthread
-
-diff --git a/config/gthr.m4 b/config/gthr.m4
-index 7b29f1f3327..82e21fe1709 100644
---- a/config/gthr.m4
-+++ b/config/gthr.m4
-@@ -21,6 +21,7 @@ case $1 in
-     tpf)	thread_header=config/s390/gthr-tpf.h ;;
-     vxworks)	thread_header=config/gthr-vxworks.h ;;
-     win32)	thread_header=config/i386/gthr-win32.h ;;
-+    mcf)	thread_header=config/i386/gthr-mcf.h ;;
- esac
- AC_SUBST(thread_header)
- ])
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 46a9029acec..112c24e95a3 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -1758,6 +1758,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
- 	if test x$enable_threads = xposix ; then
- 		tm_file="${tm_file} i386/mingw-pthread.h"
- 	fi
-+	if test x$enable_threads = xmcf ; then
-+		tm_file="${tm_file} i386/mingw-mcfgthread.h"
-+	fi
- 	tm_file="${tm_file} i386/mingw32.h"
- 	# This makes the logic if mingw's or the w64 feature set has to be used
- 	case ${target} in
-diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h
-new file mode 100644
-index 00000000000..ec381a7798f
---- /dev/null
-+++ b/gcc/config/i386/mingw-mcfgthread.h
-@@ -0,0 +1 @@
-+#define TARGET_USE_MCFGTHREAD 1
-diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h
-index 484dc7a9e9f..a15bbeea500 100644
---- a/gcc/config/i386/mingw-w64.h
-+++ b/gcc/config/i386/mingw-w64.h
-@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3.  If not see
- 		 "%{mwindows:-lgdi32 -lcomdlg32} " \
-      "%{fvtable-verify=preinit:-lvtv -lpsapi; \
-         fvtable-verify=std:-lvtv -lpsapi} " \
--		 "-ladvapi32 -lshell32 -luser32 -lkernel32"
-+		 LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"
- 
- #undef SPEC_32
- #undef SPEC_64
-diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
-index 0612b87199a..76cea94f3b7 100644
---- a/gcc/config/i386/mingw32.h
-+++ b/gcc/config/i386/mingw32.h
-@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3.  If not see
- 	 | MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \
- 	 | MASK_MS_BITFIELD_LAYOUT)
- 
-+#ifndef TARGET_USE_MCFGTHREAD
-+#define CPP_MCFGTHREAD()  ((void)0)
-+#define LIB_MCFGTHREAD     ""
-+#else
-+#define CPP_MCFGTHREAD()  (builtin_define("__USING_MCFGTHREAD__"))
-+#define LIB_MCFGTHREAD     " -lmcfgthread "
-+#endif
-+
- /* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS
-    is for compatibility with native compiler.  */
- #define EXTRA_OS_CPP_BUILTINS()					\
-@@ -50,6 +58,7 @@ along with GCC; see the file COPYING3.  If not see
- 	  builtin_define_std ("WIN64");				\
- 	  builtin_define ("_WIN64");				\
- 	}							\
-+	CPP_MCFGTHREAD();	\
-     }								\
-   while (0)
- 
-@@ -93,7 +102,7 @@ along with GCC; see the file COPYING3.  If not see
- 		 "%{mwindows:-lgdi32 -lcomdlg32} " \
-      "%{fvtable-verify=preinit:-lvtv -lpsapi; \
-         fvtable-verify=std:-lvtv -lpsapi} " \
--                 "-ladvapi32 -lshell32 -luser32 -lkernel32"
-+                 LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"
- 
- /* Weak symbols do not get resolved if using a Windows dll import lib.
-    Make the unwind registration references strong undefs.  */
-diff --git a/gcc/configure b/gcc/configure
-index 6121e163259..52f0e00efe6 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -11693,7 +11693,7 @@ case ${enable_threads} in
-     target_thread_file='single'
-     ;;
-   aix | dce | lynx | mipssde | posix | rtems | \
--  single | tpf | vxworks | win32)
-+  single | tpf | vxworks | win32 | mcf)
-     target_thread_file=${enable_threads}
-     ;;
-   *)
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index b066cc609e1..4ecdba88de7 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -1612,7 +1612,7 @@ case ${enable_threads} in
-     target_thread_file='single'
-     ;;
-   aix | dce | lynx | mipssde | posix | rtems | \
--  single | tpf | vxworks | win32)
-+  single | tpf | vxworks | win32 | mcf)
-     target_thread_file=${enable_threads}
-     ;;
-   *)
-diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
-index ea8c34f8c71..23134ad7363 100644
---- a/libatomic/configure.tgt
-+++ b/libatomic/configure.tgt
-@@ -145,7 +145,7 @@ case "${target}" in
-   *-*-mingw*)
- 	# OS support for atomic primitives.
-         case ${target_thread_file} in
--          win32)
-+          win32 | mcf)
-             config_path="${config_path} mingw"
-             ;;
-           posix)
-diff --git a/libgcc/config.host b/libgcc/config.host
-index 11b4acaff55..9fbd38650bd 100644
---- a/libgcc/config.host
-+++ b/libgcc/config.host
-@@ -737,6 +737,9 @@ i[34567]86-*-mingw*)
- 	  posix)
- 	    tmake_file="i386/t-mingw-pthread $tmake_file"
- 	    ;;
-+	  mcf)
-+	    tmake_file="i386/t-mingw-mcfgthread $tmake_file"
-+	    ;;
- 	esac
- 	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
- 	if test x$ac_cv_sjlj_exceptions = xyes; then
-@@ -761,6 +764,9 @@ x86_64-*-mingw*)
- 	  posix)
- 	    tmake_file="i386/t-mingw-pthread $tmake_file"
- 	    ;;
-+	  mcf)
-+	    tmake_file="i386/t-mingw-mcfgthread $tmake_file"
-+	    ;;
- 	esac
- 	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
- 	if test x$ac_cv_sjlj_exceptions = xyes; then
-diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h
-new file mode 100644
-index 00000000000..5ea2908361f
---- /dev/null
-+++ b/libgcc/config/i386/gthr-mcf.h
-@@ -0,0 +1 @@
-+#include <mcfgthread/gthread.h>
-diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread
-new file mode 100644
-index 00000000000..4b9b10e32d6
---- /dev/null
-+++ b/libgcc/config/i386/t-mingw-mcfgthread
-@@ -0,0 +1,2 @@
-+SHLIB_PTHREAD_CFLAG =
-+SHLIB_PTHREAD_LDFLAG = -lmcfgthread
-diff --git a/libgcc/configure b/libgcc/configure
-index b2f3f870844..eff889dc3b3 100644
---- a/libgcc/configure
-+++ b/libgcc/configure
-@@ -5451,6 +5451,7 @@ case $target_thread_file in
-     tpf)	thread_header=config/s390/gthr-tpf.h ;;
-     vxworks)	thread_header=config/gthr-vxworks.h ;;
-     win32)	thread_header=config/i386/gthr-win32.h ;;
-+    mcf)	thread_header=config/i386/gthr-mcf.h ;;
- esac
- 
- 
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index ba094be6f15..979a5ab9ace 100755
---- a/libstdc++-v3/configure
-+++ b/libstdc++-v3/configure
-@@ -15187,6 +15187,7 @@ case $target_thread_file in
-     tpf)	thread_header=config/s390/gthr-tpf.h ;;
-     vxworks)	thread_header=config/gthr-vxworks.h ;;
-     win32)	thread_header=config/i386/gthr-win32.h ;;
-+    mcf)	thread_header=config/i386/gthr-mcf.h ;;
- esac
- 
- 
-diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc
-index de920d714c6..665fb74bd6b 100644
---- a/libstdc++-v3/libsupc++/atexit_thread.cc
-+++ b/libstdc++-v3/libsupc++/atexit_thread.cc
-@@ -25,6 +25,22 @@
- #include <cstdlib>
- #include <new>
- #include "bits/gthr.h"
-+
-+#ifdef __USING_MCFGTHREAD__
-+
-+#include <mcfgthread/gthread.h>
-+
-+extern "C" int
-+__cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *),
-+				 void *obj, void *dso_handle)
-+  _GLIBCXX_NOTHROW
-+{
-+  return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1;
-+  (void)dso_handle;
-+}
-+
-+#else // __USING_MCFGTHREAD__
-+
- #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
-@@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha
- }
- 
- #endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */
-+
-+#endif // __USING_MCFGTHREAD__
-diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
-index 3a2ec3ad0d6..8b4cc96199b 100644
---- a/libstdc++-v3/libsupc++/guard.cc
-+++ b/libstdc++-v3/libsupc++/guard.cc
-@@ -28,6 +28,27 @@
- #include <cxxabi.h>
- #include <exception>
- #include <new>
-+
-+#ifdef __USING_MCFGTHREAD__
-+
-+#include <mcfgthread/gthread.h>
-+
-+namespace __cxxabiv1 {
-+
-+extern "C" int __cxa_guard_acquire(__guard *g){
-+	return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial;
-+}
-+extern "C" void __cxa_guard_abort(__guard *g) throw() {
-+	::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g);
-+}
-+extern "C" void __cxa_guard_release(__guard *g) throw() {
-+	::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g);
-+}
-+
-+}
-+
-+#else // __USING_MCFGTHREAD__
-+
- #include <ext/atomicity.h>
- #include <ext/concurrence.h>
- #include <bits/atomic_lockfree_defines.h>
-@@ -425,3 +446,5 @@ namespace __cxxabiv1
- #endif
-   }
- }
-+
-+#endif
-diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc
-index 8238817c2e9..0c6a1f85f6f 100644
---- a/libstdc++-v3/src/c++11/thread.cc
-+++ b/libstdc++-v3/src/c++11/thread.cc
-@@ -55,6 +55,15 @@ static inline int get_nprocs()
- #elif defined(_GLIBCXX_USE_SC_NPROC_ONLN)
- # include <unistd.h>
- # define _GLIBCXX_NPROCS sysconf(_SC_NPROC_ONLN)
-+#elif defined(_WIN32)
-+# include <windows.h>
-+static inline int get_nprocs()
-+{
-+  SYSTEM_INFO sysinfo;
-+  GetSystemInfo(&sysinfo);
-+  return (int)sysinfo.dwNumberOfProcessors;
-+}
-+# define _GLIBCXX_NPROCS get_nprocs()
- #else
- # define _GLIBCXX_NPROCS 0
- #endif
--- 
-2.17.0
-
diff --git a/pkgs/development/compilers/gcc/patches/clang-genconditions.patch b/pkgs/development/compilers/gcc/patches/clang-genconditions.patch
deleted file mode 100644
index 655afd2abbc2..000000000000
--- a/pkgs/development/compilers/gcc/patches/clang-genconditions.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92061#c5
-
---- a/gcc/genconditions.c	2019-01-01 12:37:19.064943662 +0100
-+++ b/gcc/genconditions.c	2019-10-11 10:57:11.464595789 +0200
-@@ -57,8 +57,9 @@ write_header (void)
- \n\
- /* It is necessary, but not entirely safe, to include the headers below\n\
-    in a generator program.  As a defensive measure, don't do so when the\n\
--   table isn't going to have anything in it.  */\n\
--#if GCC_VERSION >= 3001\n\
-+   table isn't going to have anything in it.\n\
-+   Clang 9 is buggy and doesn't handle __builtin_constant_p correctly.  */\n\
-+#if GCC_VERSION >= 3001 && __clang_major__ < 9\n\
- \n\
- /* Do not allow checking to confuse the issue.  */\n\
- #undef CHECKING_P\n\
-@@ -170,7 +171,7 @@ struct c_test\n\
-    vary at run time.  It works in 3.0.1 and later; 3.0 only when not\n\
-    optimizing.  */\n\
- \n\
--#if GCC_VERSION >= 3001\n\
-+#if GCC_VERSION >= 3001 && __clang_major__ < 9\n\
- static const struct c_test insn_conditions[] = {\n");
- 
-   traverse_c_tests (write_one_condition, 0);
-@@ -191,7 +192,7 @@ write_writer (void)
- 	"  unsigned int i;\n"
-         "  const char *p;\n"
-         "  puts (\"(define_conditions [\");\n"
--	"#if GCC_VERSION >= 3001\n"
-+	"#if GCC_VERSION >= 3001 && __clang_major__ < 9\n"
- 	"  for (i = 0; i < ARRAY_SIZE (insn_conditions); i++)\n"
- 	"    {\n"
- 	"      printf (\"  (%d \\\"\", insn_conditions[i].value);\n"
diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index f0bb8d5b7c75..27f1230f3558 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -31,13 +31,11 @@ let
   atLeast14 = lib.versionAtLeast version "14";
   atLeast13 = lib.versionAtLeast version "13";
   atLeast12 = lib.versionAtLeast version "12";
-  atLeast11 = lib.versionAtLeast version "11";
   is15 = majorVersion == "15";
   is14 = majorVersion == "14";
   is13 = majorVersion == "13";
   is12 = majorVersion == "12";
   is11 = majorVersion == "11";
-  is10 = majorVersion == "10";
 
   # We only apply these patches when building a native toolchain for
   # aarch64-darwin, as it breaks building a foreign one:
@@ -96,7 +94,6 @@ in
         ./12/mangle-NIX_STORE-in-__FILE__.patch
       ];
       "11" = [ ./no-sys-dirs-riscv.patch ];
-      "10" = [ ./no-sys-dirs-riscv.patch ];
     }
     ."${majorVersion}" or [ ]
   )
@@ -266,16 +263,6 @@ in
       # Needed to build LLVM>18
       ./cfi_startproc-reorder-label-2.diff
     ];
-    "10" = [
-      (fetchpatch {
-        # There are no upstream release tags in https://github.com/iains/gcc-10-branch.
-        # d04fe55 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-10.5.0
-        url = "https://github.com/iains/gcc-10-branch/compare/d04fe5541c53cb16d1ca5c80da044b4c7633dbc6...gcc-10-5Dr0-pre-0.diff";
-        hash = "sha256-kVUHZKtYqkWIcqxHG7yAOR2B60w4KWLoxzaiFD/FWYk=";
-      })
-      # Needed to build LLVM>18
-      ./cfi_startproc-reorder-label-2.diff
-    ];
   }
   .${majorVersion} or [ ]
 )
@@ -306,27 +293,3 @@ in
   url = "https://github.com/gcc-mirror/gcc/commit/d243f4009d8071b734df16cd70f4c5d09a373769.patch";
   sha256 = "sha256-H97GZs2wwzfFGiFOgds/5KaweC+luCsWX3hRFf7+Sm4=";
 })
-
-## gcc 10.0 and older ##############################################################################
-
-# Probably needed for gnat wrapper https://github.com/NixOS/nixpkgs/pull/62314
-++ optional (langAda && is10) ./gnat-cflags.patch
-++
-  # Backport native aarch64-darwin compilation fix from gcc12
-  # https://github.com/NixOS/nixpkgs/pull/167595
-  optional
-    (
-      is10
-      && buildPlatform.system == "aarch64-darwin"
-      && (!lib.systems.equals targetPlatform buildPlatform)
-    )
-    (fetchpatch {
-      name = "0008-darwin-aarch64-self-host-driver.patch";
-      url = "https://github.com/gcc-mirror/gcc/commit/834c8749ced550af3f17ebae4072fb7dfb90d271.diff";
-      sha256 = "sha256-XtykrPd5h/tsnjY1wGjzSOJ+AyyNLsfnjuOZ5Ryq9vA=";
-    })
-
-# Fix undefined symbol errors when building older versions with clang
-++ optional (
-  !atLeast11 && stdenv.cc.isClang && stdenv.hostPlatform.isDarwin
-) ./clang-genconditions.patch
diff --git a/pkgs/development/compilers/gcc/patches/gnat-cflags.patch b/pkgs/development/compilers/gcc/patches/gnat-cflags.patch
deleted file mode 100644
index a16266bbf39c..000000000000
--- a/pkgs/development/compilers/gcc/patches/gnat-cflags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
-index 4e74252bd74..0d848b5b4e3 100644
---- a/gcc/ada/gcc-interface/Makefile.in
-+++ b/gcc/ada/gcc-interface/Makefile.in
-@@ -111,7 +111,7 @@ NO_OMIT_ADAFLAGS = -fno-omit-frame-pointer
- NO_SIBLING_ADAFLAGS = -fno-optimize-sibling-calls
- NO_REORDER_ADAFLAGS = -fno-toplevel-reorder
- GNATLIBFLAGS = -W -Wall -gnatpg -nostdinc
--GNATLIBCFLAGS = -g -O2
-+GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET)
- # Pretend that _Unwind_GetIPInfo is available for the target by default.  This
- # should be autodetected during the configuration of libada and passed down to
- # here, but we need something for --disable-libada and hope for the best.
-@@ -198,7 +198,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
- # Link flags used to build gnat tools.  By default we prefer to statically
- # link with libgcc to avoid a dependency on shared libgcc (which is tricky
- # to deal with as it may conflict with the libgcc provided by the system).
--GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc
-+GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc $(CFLAGS_FOR_TARGET)
-
- # End of variables for you to override.
-
-diff --git a/libada/Makefile.in b/libada/Makefile.in
-index 522b9207326..ca866c74471 100644
---- a/libada/Makefile.in
-+++ b/libada/Makefile.in
-@@ -59,7 +59,7 @@ LDFLAGS=
- CFLAGS=-g
- PICFLAG = @PICFLAG@
- GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
--GNATLIBCFLAGS= -g -O2
-+GNATLIBCFLAGS= -g -O2 $(CFLAGS)
- GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(CFLAGS_FOR_TARGET) \
-        -fexceptions -DIN_RTS @have_getipinfo@ @have_capability@
-
diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix
index 25e20d6f1cea..5c25ad3bc215 100644
--- a/pkgs/development/compilers/gcc/versions.nix
+++ b/pkgs/development/compilers/gcc/versions.nix
@@ -5,7 +5,6 @@ let
     "13" = "13.4.0";
     "12" = "12.4.0";
     "11" = "11.5.0";
-    "10" = "10.5.0";
   };
 
   fromMajorMinor = majorMinorVersion: majorMinorToVersionMap."${majorMinorVersion}";
@@ -21,7 +20,6 @@ let
       "13.4.0" = "sha256-nEzm27BAVo/cVFWIrAPFy8lajb8MeqSQFwhDr7WcqPU=";
       "12.4.0" = "sha256-cE9lJgTMvMsUvavzR4yVEciXiLEss7v/3tNzQZFqkXU=";
       "11.5.0" = "sha256-puIYaOrVRc+H8MAfhCduS1KB1nIJhZHByJYkHwk2NHg=";
-      "10.5.0" = "sha256-JRCVQ/30bzl8NHtdi3osflaUpaUczkucbh6opxyjB8E=";
     }
     ."${version}";
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 80aea71c2600..a2a06875ae4f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -950,8 +950,9 @@ mapAliases {
   gcc8Stdenv = throw "gcc8Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
   gcc9 = throw "gcc9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc9Stdenv = throw "gcc9Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gcc10StdenvCompat =
-    if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21
+  gcc10 = throw "gcc10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gcc10Stdenv = throw "gcc10Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gcc10StdenvCompat = throw "gcc10StdenvCompat has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc-arm-embedded-6 = throw "gcc-arm-embedded-6 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gcc-arm-embedded-7 = throw "gcc-arm-embedded-7 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gcc-arm-embedded-8 = throw "gcc-arm-embedded-8 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
@@ -971,6 +972,7 @@ mapAliases {
   gfortran7 = throw "gfortran7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
   gfortran8 = throw "gfortran8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
   gfortran9 = throw "gfortran9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gfortran10 = throw "gfortran10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gg = go-graft; # Added 2025-03-07
   ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18
   ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8cbe66897b4..aae38a0069d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4861,7 +4861,6 @@ with pkgs;
         extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc;
       };
 
-  gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10;
   gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11;
   gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12;
   gcc13Stdenv = overrideCC gccStdenv buildPackages.gcc13;
@@ -4965,7 +4964,6 @@ with pkgs;
       });
 
   inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; })
-    gcc10
     gcc11
     gcc12
     gcc13

From 5376784348f5c54177e835d4454d89cc437fcfc1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 9 Aug 2025 20:08:16 +0100
Subject: [PATCH 2874/3724] cc-wrapper: remove dead code for `langJava`

---
 pkgs/build-support/cc-wrapper/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 2a88e3369a99..e32f8ca58b15 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -545,10 +545,6 @@ stdenvNoCC.mkDerivation {
     export named_fc=${targetPrefix}gfortran
   ''
 
-  + optionalString cc.langJava or false ''
-    wrap ${targetPrefix}gcj $wrapper $ccPath/${targetPrefix}gcj
-  ''
-
   + optionalString cc.langGo or false ''
     wrap ${targetPrefix}gccgo $wrapper $ccPath/${targetPrefix}gccgo
     wrap ${targetPrefix}go ${./go-wrapper.sh} $ccPath/${targetPrefix}go
@@ -559,7 +555,7 @@ stdenvNoCC.mkDerivation {
     bintools
   ]
   ++ extraTools
-  ++ optionals cc.langD or cc.langJava or false [ zlib ];
+  ++ optionals cc.langD or false [ zlib ];
   depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages;
 
   setupHooks = [
@@ -796,7 +792,7 @@ stdenvNoCC.mkDerivation {
       ln -s ${cc.man} $man
       ln -s ${cc.info} $info
     ''
-    + optionalString (cc.langD or cc.langJava or false && !isArocc) ''
+    + optionalString (cc.langD or false && !isArocc) ''
       echo "-B${zlib}${zlib.libdir or "/lib/"}" >> $out/nix-support/libc-cflags
     ''
 

From b5a4a0a6cc9317155a9afe14cb74df9aec9827cb Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 19:49:25 +0100
Subject: [PATCH 2875/3724] {gdc,gdmd}: drop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GDC 11 was the last version that could bootstrap without a D compiler,
and GDC don’t offer their own binaries any more. GCC 11 is now
end‐of‐life and being removed (as is GCC 12, even).

It’s possible that we could use another distribution’s binary
packages to bootstrap this, or go via our DMD package (it’s
apparently not possible to bootstrap GDC with LDC, but I’m not sure
about DMD), but as nobody has worked on it in the three years since
GCC 12 came out, it seems like interest is limited, and it’s more
of a yak shave than I’m up for right now.

A full from‐source bootstrap chain would of course be nice, but is
more the realm of the minimal bootstrap work than something we’d
want to keep GCC 11 around in the main package set indefinitely for.
---
 doc/languages-frameworks/dlang.section.md     |   2 +-
 pkgs/build-support/cc-wrapper/default.nix     |  18 +--
 pkgs/by-name/gd/gdmd/0001-gdc-store-path.diff |  11 --
 pkgs/by-name/gd/gdmd/package.nix              |  48 -------
 pkgs/by-name/ru/rund/package.nix              |   2 +-
 .../compilers/gcc/common/configure-flags.nix  |   5 -
 .../gcc/common/extra-target-flags.nix         |   8 +-
 pkgs/development/compilers/gcc/default.nix    |   7 --
 .../compilers/gcc/ng/common/gcc/default.nix   |   2 -
 .../compilers/gcc/patches/default.nix         |   6 -
 .../compilers/gcc/patches/libphobos.patch     | 119 ------------------
 pkgs/top-level/aliases.nix                    |   3 +
 pkgs/top-level/all-packages.nix               |  13 --
 13 files changed, 11 insertions(+), 233 deletions(-)
 delete mode 100644 pkgs/by-name/gd/gdmd/0001-gdc-store-path.diff
 delete mode 100644 pkgs/by-name/gd/gdmd/package.nix
 delete mode 100644 pkgs/development/compilers/gcc/patches/libphobos.patch

diff --git a/doc/languages-frameworks/dlang.section.md b/doc/languages-frameworks/dlang.section.md
index fa211dc6a43d..a6b40d686d4b 100644
--- a/doc/languages-frameworks/dlang.section.md
+++ b/doc/languages-frameworks/dlang.section.md
@@ -1,6 +1,6 @@
 # D (Dlang) {#dlang}
 
-Nixpkgs provides multiple D compilers such as `ldc`, `dmd` and `gdc`.
+Nixpkgs provides multiple D compilers such as `ldc` and `dmd`.
 These can be used like any other package during build time.
 
 However, Nixpkgs provides a build helper for compiling packages using the `dub` package manager.
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index e32f8ca58b15..c5cbb98d00d3 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -15,7 +15,6 @@
   bintools,
   coreutils ? null,
   apple-sdk ? null,
-  zlib ? null,
   nativeTools,
   noLibc ? false,
   nativeLibc,
@@ -534,10 +533,6 @@ stdenvNoCC.mkDerivation {
     ln -sf ${cc} $out/nix-support/gprconfig-gnat-unwrapped
   ''
 
-  + optionalString cc.langD or false ''
-    wrap ${targetPrefix}gdc $wrapper $ccPath/${targetPrefix}gdc
-  ''
-
   + optionalString cc.langFortran or false ''
     wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran
     ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77
@@ -554,8 +549,7 @@ stdenvNoCC.mkDerivation {
   propagatedBuildInputs = [
     bintools
   ]
-  ++ extraTools
-  ++ optionals cc.langD or false [ zlib ];
+  ++ extraTools;
   depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages;
 
   setupHooks = [
@@ -668,12 +662,12 @@ stdenvNoCC.mkDerivation {
       + optionalString (!isArocc) ''
         echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags
       ''
-      + optionalString (!(cc.langD or false)) ''
+      + ''
         echo "-${
           if isArocc then "I" else "idirafter"
         } ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags
       ''
-      + optionalString (isGNU && (!(cc.langD or false))) ''
+      + optionalString isGNU ''
         for dir in "${cc}"/lib/gcc/*/*/include-fixed; do
           echo '-idirafter' ''${dir} >> $out/nix-support/libc-cflags
         done
@@ -792,9 +786,6 @@ stdenvNoCC.mkDerivation {
       ln -s ${cc.man} $man
       ln -s ${cc.info} $info
     ''
-    + optionalString (cc.langD or false && !isArocc) ''
-      echo "-B${zlib}${zlib.libdir or "/lib/"}" >> $out/nix-support/libc-cflags
-    ''
 
     ##
     ## Hardening support
@@ -853,9 +844,6 @@ stdenvNoCC.mkDerivation {
     + optionalString cc.langAda or false ''
       hardening_unsupported_flags+=" format stackprotector strictoverflow"
     ''
-    + optionalString cc.langD or false ''
-      hardening_unsupported_flags+=" format"
-    ''
     + optionalString cc.langFortran or false ''
       hardening_unsupported_flags+=" format"
     ''
diff --git a/pkgs/by-name/gd/gdmd/0001-gdc-store-path.diff b/pkgs/by-name/gd/gdmd/0001-gdc-store-path.diff
deleted file mode 100644
index e9813c00be20..000000000000
--- a/pkgs/by-name/gd/gdmd/0001-gdc-store-path.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/dmd-script
-+++ b/dmd-script
-@@ -72,7 +72,7 @@ my @run_args;
- # for the target prefix.
- basename($0) =~ m/^(.*-)?g?dmd(-.*)?$/;
- my $target_prefix = $1?$1:"";
--my $gdc_dir = abs_path(dirname($0));
-+my $gdc_dir = "@gdc_dir@";
- my $gdc = File::Spec->catfile( $gdc_dir, $target_prefix . "gdc" . ($2?$2:""));
- 
- sub osHasEXE() {
diff --git a/pkgs/by-name/gd/gdmd/package.nix b/pkgs/by-name/gd/gdmd/package.nix
deleted file mode 100644
index 74bd4799809b..000000000000
--- a/pkgs/by-name/gd/gdmd/package.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchFromGitHub,
-  replaceVars,
-  gdc,
-  perl,
-}:
-stdenvNoCC.mkDerivation {
-  pname = "gdmd";
-  version = "0.1.0-unstable-2024-05-30";
-
-  src = fetchFromGitHub {
-    owner = "D-Programming-GDC";
-    repo = "gdmd";
-    rev = "dc0ad9f739795f3ce5c69825efcd5d1d586bb013";
-    hash = "sha256-Sw8ExEPDvGqGKcM9VKnOI6MGgXW0tAu51A90Wi4qrRE=";
-  };
-
-  patches = [
-    (replaceVars ./0001-gdc-store-path.diff {
-      gdc_dir = "${gdc}/bin";
-    })
-  ];
-
-  buildInputs = [
-    gdc
-    perl
-  ];
-
-  installFlags = [
-    "DESTDIR=$(out)"
-    "prefix="
-  ];
-
-  preInstall = ''
-    install -d $out/bin $out/share/man/man1
-  '';
-
-  meta = {
-    description = "Wrapper for GDC that emulates DMD's command line";
-    homepage = "https://gdcproject.org";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ jtbx ];
-    mainProgram = "gdmd";
-  };
-}
diff --git a/pkgs/by-name/ru/rund/package.nix b/pkgs/by-name/ru/rund/package.nix
index 7a9590fce685..f2f18716e7bc 100644
--- a/pkgs/by-name/ru/rund/package.nix
+++ b/pkgs/by-name/ru/rund/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ dcompiler ];
   buildPhase = ''
-    for candidate in dmd ldmd2 gdmd; do
+    for candidate in dmd ldmd2; do
       echo Checking for DCompiler $candidate ...
       dc=$(type -P $candidate || echo "")
       if [ ! "$dc" == "" ]; then
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
index 7cedb913b1a7..14f27b89caba 100644
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -23,7 +23,6 @@
 
   langC,
   langCC,
-  langD ? false,
   langFortran,
   langAda ? false,
   langGo,
@@ -207,7 +206,6 @@ let
         lib.concatStringsSep "," (
           lib.optional langC "c"
           ++ lib.optional langCC "c++"
-          ++ lib.optional langD "d"
           ++ lib.optional langFortran "fortran"
           ++ lib.optional langAda "ada"
           ++ lib.optional langGo "go"
@@ -287,9 +285,6 @@ let
     ++ lib.optionals langJit [
       "--enable-host-shared"
     ]
-    ++ lib.optionals (langD) [
-      "--with-target-system-zlib=yes"
-    ]
     # On mips64-unknown-linux-gnu libsanitizer defines collide with
     # glibc's definitions and fail the build. It was fixed in gcc-13+.
     ++
diff --git a/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/pkgs/development/compilers/gcc/common/extra-target-flags.nix
index 7acb440b434a..da2ab3029561 100644
--- a/pkgs/development/compilers/gcc/common/extra-target-flags.nix
+++ b/pkgs/development/compilers/gcc/common/extra-target-flags.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   withoutTargetLibc,
-  langD ? false,
   libcCross,
   threadsCross,
 }:
@@ -18,8 +17,8 @@ in
   EXTRA_FLAGS_FOR_TARGET =
     let
       mkFlags =
-        dep: langD:
-        lib.optionals ((!lib.systems.equals targetPlatform hostPlatform) && dep != null && !langD) (
+        dep:
+        lib.optionals ((!lib.systems.equals targetPlatform hostPlatform) && dep != null) (
           [
             "-O2 -idirafter ${lib.getDev dep}${dep.incdir or "/include"}"
           ]
@@ -28,8 +27,7 @@ in
           ]
         );
     in
-    mkFlags libcCross langD
-    ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null) langD);
+    mkFlags libcCross ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null));
 
   EXTRA_LDFLAGS_FOR_TARGET =
     let
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 2d87fe210b61..0aab42a2dc6d 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -11,7 +11,6 @@
   langAda ? false,
   langObjC ? stdenv.targetPlatform.isDarwin,
   langObjCpp ? stdenv.targetPlatform.isDarwin,
-  langD ? false,
   langGo ? false,
   reproducibleBuild ? true,
   profiledCompiler ? false,
@@ -154,7 +153,6 @@ let
       langAda
       langC
       langCC
-      langD
       langFortran
       langGo
       langJit
@@ -195,10 +193,6 @@ assert stdenv.buildPlatform.isDarwin -> gnused != null;
 assert langGo -> langCC;
 assert langAda -> gnat-bootstrap != null;
 
-# TODO: fixup D bootstrapping, probably by using gdc11 (and maybe other changes).
-#   error: GDC is required to build d
-assert atLeast12 -> !langD;
-
 # threadsCross is just for MinGW
 assert threadsCross != { } -> stdenv.targetPlatform.isWindows;
 
@@ -409,7 +403,6 @@ pipe
           langAda
           langFortran
           langGo
-          langD
           version
           ;
         isGNU = true;
diff --git a/pkgs/development/compilers/gcc/ng/common/gcc/default.nix b/pkgs/development/compilers/gcc/ng/common/gcc/default.nix
index 0b6ae8110375..3d8ef0d8300e 100644
--- a/pkgs/development/compilers/gcc/ng/common/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/ng/common/gcc/default.nix
@@ -8,7 +8,6 @@
   langAda ? false,
   langC ? true,
   langCC ? true,
-  langD ? false,
   langFortran ? false,
   langGo ? false,
   langJava ? false,
@@ -176,7 +175,6 @@ stdenv.mkDerivation (finalAttrs: {
         lib.intersperse "," (
           lib.optional langC "c"
           ++ lib.optional langCC "c++"
-          ++ lib.optional langD "d"
           ++ lib.optional langFortran "fortran"
           ++ lib.optional langJava "java"
           ++ lib.optional langAda "ada"
diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index 27f1230f3558..23e4bf10e99f 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -5,7 +5,6 @@
   langAda,
   langObjC,
   langObjCpp,
-  langD,
   langFortran,
   langGo,
   reproducibleBuild,
@@ -109,11 +108,6 @@ in
 # Do not pass a default include dir on PowerPC+Musl
 # See https://github.com/NixOS/nixpkgs/pull/45340/commits/d6bb7d45162ac93e017cc9b665ae4836f6410710
 ++ [ ./ppc-musl.patch ]
-# Patches for libphobos, the standard library of the D language
-# - Forces libphobos to be built with -j1, as libtool misbehaves in parallel
-# - Gets rid of -idirafter flags added by our gcc wrappers, as gdc does not understand them
-# See https://github.com/NixOS/nixpkgs/pull/69144#issuecomment-535176453
-++ optional langD ./libphobos.patch
 # Moves the .cfi_starproc instruction to after the function label
 # Needed to build llvm-18 and later
 # See https://github.com/NixOS/nixpkgs/pull/354107/commits/2de1b4b14e17f42ba8b4bf43a29347c91511e008
diff --git a/pkgs/development/compilers/gcc/patches/libphobos.patch b/pkgs/development/compilers/gcc/patches/libphobos.patch
deleted file mode 100644
index a16ea5416ffb..000000000000
--- a/pkgs/development/compilers/gcc/patches/libphobos.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index a375471..83c5ecb 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -804,7 +804,7 @@ BASE_FLAGS_TO_PASS = \
- 	"STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \
- 	"GNATBIND=$(GNATBIND)" \
- 	"GNATMAKE=$(GNATMAKE)" \
--	"GDC=$(GDC)" \
-+	"`echo 'GDC=$(GDC)' | sed -e 's/-idirafter [^ ]*//g'`" \
- 	"GDCFLAGS=$(GDCFLAGS)" \
- 	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
- 	"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
-@@ -817,7 +817,7 @@ BASE_FLAGS_TO_PASS = \
- 	"GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
- 	"GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \
- 	"GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \
--	"GDC_FOR_TARGET=$(GDC_FOR_TARGET)" \
-+	"`echo 'GDC_FOR_TARGET=$(GDC_FOR_TARGET)' | sed -e 's/-idirafter [^ ]*//g'`" \
- 	"GDCFLAGS_FOR_TARGET=$(GDCFLAGS_FOR_TARGET)" \
- 	"LD_FOR_TARGET=$(LD_FOR_TARGET)" \
- 	"LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \
-@@ -890,7 +890,7 @@ EXTRA_HOST_FLAGS = \
- 	'DLLTOOL=$(DLLTOOL)' \
- 	'GFORTRAN=$(GFORTRAN)' \
- 	'GOC=$(GOC)' \
--	'GDC=$(GDC)' \
-+	"`echo 'GDC=$(GDC)' | sed -e 's/-idirafter [^ ]*//g'`" \
- 	'LD=$(LD)' \
- 	'LIPO=$(LIPO)' \
- 	'NM=$(NM)' \
-@@ -966,8 +966,11 @@ EXTRA_TARGET_FLAGS = \
- 	'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
- 	'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
- 	"TFLAGS=$$TFLAGS"
-+EXTRA_TARGET_FLAGS_D = \
-+	"`echo $(EXTRA_TARGET_FLAGS) | sed -e 's/-idirafter [^ ]*//g'`"
- 
- TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
-+TARGET_FLAGS_TO_PASS_D = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS_D)
- 
- # Flags to pass down to gcc.  gcc builds a library, libgcc.a, so it
- # unfortunately needs the native compiler and the target ar and
-@@ -47285,7 +47288,7 @@ check-target-libphobos:
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libphobos && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-+	  $(MAKE) $(TARGET_FLAGS_TO_PASS_D)   check)
- 
- @endif target-libphobos
- 
-@@ -47300,7 +47303,7 @@ install-target-libphobos: installdirs
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libphobos && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-+	  $(MAKE) $(TARGET_FLAGS_TO_PASS_D)  install)
- 
- @endif target-libphobos
- 
-@@ -47315,7 +47318,7 @@ install-strip-target-libphobos: installdirs
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libphobos && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
-+	  $(MAKE) $(TARGET_FLAGS_TO_PASS_D)  install-strip)
- 
- @endif target-libphobos
- 
-diff --git a/Makefile.tpl b/Makefile.tpl
-index 41cae58..b3d32e7 100644
---- a/Makefile.tpl
-+++ b/Makefile.tpl
-@@ -721,8 +721,11 @@ EXTRA_TARGET_FLAGS = \
- 	'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
- 	'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
- 	"TFLAGS=$$TFLAGS"
-+EXTRA_TARGET_FLAGS_D = \
-+	"`echo $(EXTRA_TARGET_FLAGS) | sed -e 's/-idirafter [^ ]*//g'`"
- 
- TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
-+TARGET_FLAGS_TO_PASS_D = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS_D)
- 
- # Flags to pass down to gcc.  gcc builds a library, libgcc.a, so it
- # unfortunately needs the native compiler and the target ar and
-diff --git a/libphobos/Makefile.in b/libphobos/Makefile.in
-index e894417..2d18dcb 100644
---- a/libphobos/Makefile.in
-+++ b/libphobos/Makefile.in
-@@ -365,6 +365,7 @@ AM_MAKEFLAGS = \
- 	"LIBCFLAGS=$(LIBCFLAGS)" \
- 	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
- 	"MAKE=$(MAKE)" \
-+	"`echo 'MAKEFLAGS=$(MAKEFLAGS)' | sed -e 's/-j[0-9]+/-j1/'`" \
- 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
- 	"PICFLAG=$(PICFLAG)" \
- 	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
-@@ -694,6 +695,8 @@ uninstall-am:
- 
- .PRECIOUS: Makefile
- 
-+.NOTPARALLEL:
-+
- # GNU Make needs to see an explicit $(MAKE) variable in the command it
- # runs to enable its job server during parallel builds.  Hence the
- # comments below.
-diff --git a/libphobos/configure b/libphobos/configure
-index b3cb5f3..25adf2b 100755
---- a/libphobos/configure
-+++ b/libphobos/configure
-@@ -5122,6 +5122,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-+GDC=`$as_echo "$GDC" | sed -e 's/-idirafter [^ ]*//g'`
- 
- ac_ext=d
- ac_compile='$GDC -c $GDCFLAGS conftest.$ac_ext >&5'
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a2a06875ae4f..d4be4bed8dcb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -963,6 +963,9 @@ mapAliases {
   gcj = gcj6; # Added 2024-09-13
   gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15
+  gdc = throw "gdc has been removed from Nixpkgs, as recent versions require complex bootstrapping"; # Added 2025-08-08
+  gdc11 = throw "gdc11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gdmd = throw "gdmd has been removed from Nixpkgs, as it depends on GDC which was removed"; # Added 2025-08-08
   gdome2 = throw "'gdome2' has been removed from nixpkgs, as it is umaintained and obsolete"; # Added 2024-12-29
   geocode-glib = throw "throw 'geocode-glib' has been removed, as it was unused and used outdated libraries"; # Added 2025-04-16
   geos_3_11 = throw "geos_3_11 has been removed from nixpgks. Please use a more recent 'geos' instead.";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aae38a0069d5..5a12b8786180 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5251,19 +5251,6 @@ with pkgs;
 
   gcc-arm-embedded = gcc-arm-embedded-14;
 
-  # It would be better to match the default gcc so that there are no linking errors
-  # when using C/C++ libraries in D packages, but right now versions >= 12 are broken.
-  gdc = gdc11;
-  gdc11 = wrapCC (
-    gcc11.cc.override {
-      name = "gdc";
-      langCC = false;
-      langC = false;
-      langD = true;
-      profiledCompiler = false;
-    }
-  );
-
   # Haskell and GHC
 
   haskell = callPackage ./haskell-packages.nix { };

From 10ce2b47917a22617577ff811ac5ce99de35848c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2876/3724] {gcc11,gfortran11,gdc11,gnat11,gnat-bootstrap11}:
 drop

EOL since 2024; no longer used in the tree.
---
 doc/release-notes/rl-2511.section.md          |   2 +-
 pkgs/by-name/gf/gfortran11/package.nix        |  10 -
 pkgs/development/compilers/gcc/default.nix    |  76 ++---
 ...thread-model-support-from-mcfgthread.patch | 306 ------------------
 .../compilers/gcc/patches/default.nix         |  63 +---
 .../gcc/patches/gfortran-driving.patch        |  20 --
 .../compilers/gcc/patches/no-sys-dirs.patch   |  28 --
 pkgs/development/compilers/gcc/versions.nix   |   2 -
 .../compilers/gnat-bootstrap/default.nix      |  17 -
 pkgs/top-level/aliases.nix                    |   7 +-
 pkgs/top-level/all-packages.nix               |  34 --
 11 files changed, 48 insertions(+), 517 deletions(-)
 delete mode 100644 pkgs/by-name/gf/gfortran11/package.nix
 delete mode 100644 pkgs/development/compilers/gcc/patches/11/Added-mcf-thread-model-support-from-mcfgthread.patch
 delete mode 100644 pkgs/development/compilers/gcc/patches/gfortran-driving.patch
 delete mode 100644 pkgs/development/compilers/gcc/patches/no-sys-dirs.patch

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index f261560026ab..5285a32254be 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -20,7 +20,7 @@
 
 - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
 
-- GCC 9 and 10 have been removed, as they have reached end‐of‐life upstream and are no longer supported.
+- GCC 9, 10, and 11 have been removed, as they have reached end‐of‐life upstream and are no longer supported.
 
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
 - `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
diff --git a/pkgs/by-name/gf/gfortran11/package.nix b/pkgs/by-name/gf/gfortran11/package.nix
deleted file mode 100644
index d27a264fc529..000000000000
--- a/pkgs/by-name/gf/gfortran11/package.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ wrapCC, gcc11 }:
-wrapCC (
-  gcc11.cc.override {
-    name = "gfortran";
-    langFortran = true;
-    langCC = false;
-    langC = false;
-    profiledCompiler = false;
-  }
-)
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 0aab42a2dc6d..6d6189ed7499 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -80,11 +80,9 @@ let
   majorVersion = versions.major version;
   atLeast14 = versionAtLeast version "14";
   atLeast13 = versionAtLeast version "13";
-  atLeast12 = versionAtLeast version "12";
   is14 = majorVersion == "14";
   is13 = majorVersion == "13";
   is12 = majorVersion == "12";
-  is11 = majorVersion == "11";
 
   # releases have a form: MAJOR.MINOR.MICRO, like 14.2.1
   # snapshots have a form like MAJOR.MINOR.MICRO.DATE, like 14.2.1.20250322
@@ -98,7 +96,7 @@ let
   #   "14.2.0" -> "14.2.0"
   baseVersion = lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version));
 
-  disableBootstrap = !stdenv.hostPlatform.isDarwin && (atLeast12 -> !profiledCompiler);
+  disableBootstrap = !stdenv.hostPlatform.isDarwin && !profiledCompiler;
 
   inherit (stdenv) buildPlatform hostPlatform targetPlatform;
   targetConfig =
@@ -216,7 +214,7 @@ pipe
             "mirror://gcc/snapshots/${majorVersion}-${snapDate}/gcc-${majorVersion}-${snapDate}.tar.xz"
           else
             "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
-        ${if is11 || is13 then "hash" else "sha256"} = gccVersions.srcHashForVersion version;
+        ${if is13 then "hash" else "sha256"} = gccVersions.srcHashForVersion version;
       };
 
       inherit patches;
@@ -236,8 +234,7 @@ pipe
         "format"
         "pie"
         "stackclashprotection"
-      ]
-      ++ optionals (is11 && langAda) [ "fortify3" ];
+      ];
 
       postPatch = ''
         configureScripts=$(find . -name configure)
@@ -258,7 +255,7 @@ pipe
       # This should kill all the stdinc frameworks that gcc and friends like to
       # insert into default search paths.
       + optionalString hostPlatform.isDarwin ''
-        substituteInPlace gcc/config/darwin-c.c${optionalString atLeast12 "c"} \
+        substituteInPlace gcc/config/darwin-c.cc \
           --replace 'if (stdinc)' 'if (0)'
 
         substituteInPlace libgcc/config/t-slibgcc-darwin \
@@ -333,7 +330,7 @@ pipe
 
       buildFlags =
         # we do not yet have Nix-driven profiling
-        assert atLeast12 -> (profiledCompiler -> !disableBootstrap);
+        assert profiledCompiler -> !disableBootstrap;
         let
           target =
             optionalString (profiledCompiler) "profiled"
@@ -354,45 +351,38 @@ pipe
       # https://gcc.gnu.org/PR109898
       enableParallelInstalling = false;
 
-      env = mapAttrs (_: v: toString v) (
-        {
+      env = mapAttrs (_: v: toString v) {
 
-          NIX_NO_SELF_RPATH = true;
+        NIX_NO_SELF_RPATH = true;
 
-          # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
-          ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
+        # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+        ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
-          # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
-          # library headers and binaries, regardless of the language being compiled.
-          #
-          # The LTO code doesn't find zlib, so we just add it to $CPATH and
-          # $LIBRARY_PATH in this case.
-          #
-          # Cross-compiling, we need gcc not to read ./specs in order to build the g++
-          # compiler (after the specs for the cross-gcc are created). Having
-          # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks.
+        # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
+        # library headers and binaries, regardless of the language being compiled.
+        #
+        # The LTO code doesn't find zlib, so we just add it to $CPATH and
+        # $LIBRARY_PATH in this case.
+        #
+        # Cross-compiling, we need gcc not to read ./specs in order to build the g++
+        # compiler (after the specs for the cross-gcc are created). Having
+        # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks.
 
-          CPATH = optionals (lib.systems.equals targetPlatform hostPlatform) (
-            makeSearchPathOutput "dev" "include" ([ ] ++ optional (zlib != null) zlib)
-          );
+        CPATH = optionals (lib.systems.equals targetPlatform hostPlatform) (
+          makeSearchPathOutput "dev" "include" ([ ] ++ optional (zlib != null) zlib)
+        );
 
-          LIBRARY_PATH = optionals (lib.systems.equals targetPlatform hostPlatform) (
-            makeLibraryPath (optional (zlib != null) zlib)
-          );
+        LIBRARY_PATH = optionals (lib.systems.equals targetPlatform hostPlatform) (
+          makeLibraryPath (optional (zlib != null) zlib)
+        );
 
-          NIX_LDFLAGS = optionalString hostPlatform.isSunOS "-lm";
+        NIX_LDFLAGS = optionalString hostPlatform.isSunOS "-lm";
 
-          inherit (callFile ./common/extra-target-flags.nix { })
-            EXTRA_FLAGS_FOR_TARGET
-            EXTRA_LDFLAGS_FOR_TARGET
-            ;
-        }
-        //
-          optionalAttrs (!atLeast12 && stdenv.cc.isClang && (!lib.systems.equals targetPlatform hostPlatform))
-            {
-              NIX_CFLAGS_COMPILE = "-Wno-register";
-            }
-      );
+        inherit (callFile ./common/extra-target-flags.nix { })
+          EXTRA_FLAGS_FOR_TARGET
+          EXTRA_LDFLAGS_FOR_TARGET
+          ;
+      };
 
       passthru = {
         inherit
@@ -407,11 +397,7 @@ pipe
           ;
         isGNU = true;
         hardeningUnsupportedFlags =
-          optionals (!atLeast12) [
-            "fortify3"
-            "trivialautovarinit"
-          ]
-          ++ optionals (!atLeast13) [
+          optionals (!atLeast13) [
             "strictflexarrays1"
             "strictflexarrays3"
           ]
diff --git a/pkgs/development/compilers/gcc/patches/11/Added-mcf-thread-model-support-from-mcfgthread.patch b/pkgs/development/compilers/gcc/patches/11/Added-mcf-thread-model-support-from-mcfgthread.patch
deleted file mode 100644
index 77202438e47d..000000000000
--- a/pkgs/development/compilers/gcc/patches/11/Added-mcf-thread-model-support-from-mcfgthread.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-From 86f2f767ddffd9f7c6f1470b987ae7b0d251b988 Mon Sep 17 00:00:00 2001
-From: Liu Hao <lh_mouse@126.com>
-Date: Wed, 25 Apr 2018 21:54:19 +0800
-Subject: [PATCH] Added 'mcf' thread model support from mcfgthread.
-
-Signed-off-by: Liu Hao <lh_mouse@126.com>
----
- config/gthr.m4                          |  1 +
- gcc/config.gcc                          |  3 +++
- gcc/config/i386/mingw-mcfgthread.h      |  1 +
- gcc/config/i386/mingw-w64.h             |  2 +-
- gcc/config/i386/mingw32.h               | 11 ++++++++++-
- gcc/configure                           |  2 +-
- gcc/configure.ac                        |  2 +-
- libatomic/configure.tgt                 |  2 +-
- libgcc/config.host                      |  6 ++++++
- libgcc/config/i386/gthr-mcf.h           |  1 +
- libgcc/config/i386/t-mingw-mcfgthread   |  2 ++
- libgcc/configure                        |  1 +
- libstdc++-v3/configure                  |  1 +
- libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++
- libstdc++-v3/libsupc++/guard.cc         | 23 +++++++++++++++++++++++
- libstdc++-v3/src/c++11/thread.cc        |  9 +++++++++
- 16 files changed, 80 insertions(+), 5 deletions(-)
- create mode 100644 gcc/config/i386/mingw-mcfgthread.h
- create mode 100644 libgcc/config/i386/gthr-mcf.h
- create mode 100644 libgcc/config/i386/t-mingw-mcfgthread
-
-diff --git a/config/gthr.m4 b/config/gthr.m4
-index 7b29f1f3327..82e21fe1709 100644
---- a/config/gthr.m4
-+++ b/config/gthr.m4
-@@ -21,6 +21,7 @@ case $1 in
-     tpf)	thread_header=config/s390/gthr-tpf.h ;;
-     vxworks)	thread_header=config/gthr-vxworks.h ;;
-     win32)	thread_header=config/i386/gthr-win32.h ;;
-+    mcf)	thread_header=config/i386/gthr-mcf.h ;;
- esac
- AC_SUBST(thread_header)
- ])
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 46a9029acec..112c24e95a3 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -1758,6 +1758,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
- 	if test x$enable_threads = xposix ; then
- 		tm_file="${tm_file} i386/mingw-pthread.h"
- 	fi
-+	if test x$enable_threads = xmcf ; then
-+		tm_file="${tm_file} i386/mingw-mcfgthread.h"
-+	fi
- 	tm_file="${tm_file} i386/mingw32.h"
- 	# This makes the logic if mingw's or the w64 feature set has to be used
- 	case ${target} in
-diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h
-new file mode 100644
-index 00000000000..ec381a7798f
---- /dev/null
-+++ b/gcc/config/i386/mingw-mcfgthread.h
-@@ -0,0 +1 @@
-+#define TARGET_USE_MCFGTHREAD 1
-diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h
-index 484dc7a9e9f..a15bbeea500 100644
---- a/gcc/config/i386/mingw-w64.h
-+++ b/gcc/config/i386/mingw-w64.h
-@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3.  If not see
- 		 "%{mwindows:-lgdi32 -lcomdlg32} " \
-      "%{fvtable-verify=preinit:-lvtv -lpsapi; \
-         fvtable-verify=std:-lvtv -lpsapi} " \
--		 "-ladvapi32 -lshell32 -luser32 -lkernel32"
-+		 LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"
- 
- #undef SPEC_32
- #undef SPEC_64
-diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
-index 0612b87199a..76cea94f3b7 100644
---- a/gcc/config/i386/mingw32.h
-+++ b/gcc/config/i386/mingw32.h
-@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3.  If not see
- 	 | MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \
- 	 | MASK_MS_BITFIELD_LAYOUT)
- 
-+#ifndef TARGET_USE_MCFGTHREAD
-+#define CPP_MCFGTHREAD()  ((void)0)
-+#define LIB_MCFGTHREAD     ""
-+#else
-+#define CPP_MCFGTHREAD()  (builtin_define("__USING_MCFGTHREAD__"))
-+#define LIB_MCFGTHREAD     " -lmcfgthread "
-+#endif
-+
- /* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS
-    is for compatibility with native compiler.  */
- #define EXTRA_OS_CPP_BUILTINS()					\
-@@ -50,6 +58,7 @@ along with GCC; see the file COPYING3.  If not see
- 	  builtin_define_std ("WIN64");				\
- 	  builtin_define ("_WIN64");				\
- 	}							\
-+	CPP_MCFGTHREAD();	\
-     }								\
-   while (0)
- 
-@@ -93,7 +102,7 @@ along with GCC; see the file COPYING3.  If not see
- 		 "%{mwindows:-lgdi32 -lcomdlg32} " \
-      "%{fvtable-verify=preinit:-lvtv -lpsapi; \
-         fvtable-verify=std:-lvtv -lpsapi} " \
--                 "-ladvapi32 -lshell32 -luser32 -lkernel32"
-+                 LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"
- 
- /* Weak symbols do not get resolved if using a Windows dll import lib.
-    Make the unwind registration references strong undefs.  */
-diff --git a/gcc/configure b/gcc/configure
-index 6121e163259..52f0e00efe6 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -11693,7 +11693,7 @@ case ${enable_threads} in
-     target_thread_file='single'
-     ;;
-   aix | dce | lynx | mipssde | posix | rtems | \
--  single | tpf | vxworks | win32)
-+  single | tpf | vxworks | win32 | mcf)
-     target_thread_file=${enable_threads}
-     ;;
-   *)
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index b066cc609e1..4ecdba88de7 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -1612,7 +1612,7 @@ case ${enable_threads} in
-     target_thread_file='single'
-     ;;
-   aix | dce | lynx | mipssde | posix | rtems | \
--  single | tpf | vxworks | win32)
-+  single | tpf | vxworks | win32 | mcf)
-     target_thread_file=${enable_threads}
-     ;;
-   *)
-diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
-index ea8c34f8c71..23134ad7363 100644
---- a/libatomic/configure.tgt
-+++ b/libatomic/configure.tgt
-@@ -145,7 +145,7 @@ case "${target}" in
-   *-*-mingw*)
- 	# OS support for atomic primitives.
-         case ${target_thread_file} in
--          win32)
-+          win32 | mcf)
-             config_path="${config_path} mingw"
-             ;;
-           posix)
-diff --git a/libgcc/config.host b/libgcc/config.host
-index 11b4acaff55..9fbd38650bd 100644
---- a/libgcc/config.host
-+++ b/libgcc/config.host
-@@ -737,6 +737,9 @@ i[34567]86-*-mingw*)
- 	  posix)
- 	    tmake_file="i386/t-mingw-pthread $tmake_file"
- 	    ;;
-+	  mcf)
-+	    tmake_file="i386/t-mingw-mcfgthread $tmake_file"
-+	    ;;
- 	esac
- 	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
- 	if test x$ac_cv_sjlj_exceptions = xyes; then
-@@ -761,6 +764,9 @@ x86_64-*-mingw*)
- 	  posix)
- 	    tmake_file="i386/t-mingw-pthread $tmake_file"
- 	    ;;
-+	  mcf)
-+	    tmake_file="i386/t-mingw-mcfgthread $tmake_file"
-+	    ;;
- 	esac
- 	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
- 	if test x$ac_cv_sjlj_exceptions = xyes; then
-diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h
-new file mode 100644
-index 00000000000..5ea2908361f
---- /dev/null
-+++ b/libgcc/config/i386/gthr-mcf.h
-@@ -0,0 +1 @@
-+#include <mcfgthread/gthread.h>
-diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread
-new file mode 100644
-index 00000000000..4b9b10e32d6
---- /dev/null
-+++ b/libgcc/config/i386/t-mingw-mcfgthread
-@@ -0,0 +1,2 @@
-+SHLIB_PTHREAD_CFLAG =
-+SHLIB_PTHREAD_LDFLAG = -lmcfgthread
-diff --git a/libgcc/configure b/libgcc/configure
-index b2f3f870844..eff889dc3b3 100644
---- a/libgcc/configure
-+++ b/libgcc/configure
-@@ -5451,6 +5451,7 @@ case $target_thread_file in
-     tpf)	thread_header=config/s390/gthr-tpf.h ;;
-     vxworks)	thread_header=config/gthr-vxworks.h ;;
-     win32)	thread_header=config/i386/gthr-win32.h ;;
-+    mcf)	thread_header=config/i386/gthr-mcf.h ;;
- esac
- 
- 
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index ba094be6f15..979a5ab9ace 100755
---- a/libstdc++-v3/configure
-+++ b/libstdc++-v3/configure
-@@ -15187,6 +15187,7 @@ case $target_thread_file in
-     tpf)	thread_header=config/s390/gthr-tpf.h ;;
-     vxworks)	thread_header=config/gthr-vxworks.h ;;
-     win32)	thread_header=config/i386/gthr-win32.h ;;
-+    mcf)	thread_header=config/i386/gthr-mcf.h ;;
- esac
- 
- 
-diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc
-index de920d714c6..665fb74bd6b 100644
---- a/libstdc++-v3/libsupc++/atexit_thread.cc
-+++ b/libstdc++-v3/libsupc++/atexit_thread.cc
-@@ -25,6 +25,22 @@
- #include <cstdlib>
- #include <new>
- #include "bits/gthr.h"
-+
-+#ifdef __USING_MCFGTHREAD__
-+
-+#include <mcfgthread/gthread.h>
-+namespace __cxxabiv1 {
-+extern "C" int
-+__cxa_thread_atexit (void (_GLIBCXX_CDTOR_CALLABI *dtor)(void *),
-+				 void *obj, void *dso_handle)
-+  _GLIBCXX_NOTHROW
-+{
-+  return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1;
-+  (void)dso_handle;
-+}
-+}
-+#else // __USING_MCFGTHREAD__
-+
- #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
-@@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha
- }
- 
- #endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */
-+
-+#endif // __USING_MCFGTHREAD__
-diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
-index 3a2ec3ad0d6..8b4cc96199b 100644
---- a/libstdc++-v3/libsupc++/guard.cc
-+++ b/libstdc++-v3/libsupc++/guard.cc
-@@ -28,6 +28,27 @@
- #include <cxxabi.h>
- #include <exception>
- #include <new>
-+
-+#ifdef __USING_MCFGTHREAD__
-+
-+#include <mcfgthread/gthread.h>
-+
-+namespace __cxxabiv1 {
-+
-+extern "C" int __cxa_guard_acquire(__guard *g){
-+	return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial;
-+}
-+extern "C" void __cxa_guard_abort(__guard *g) throw() {
-+	::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g);
-+}
-+extern "C" void __cxa_guard_release(__guard *g) throw() {
-+	::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g);
-+}
-+
-+}
-+
-+#else // __USING_MCFGTHREAD__
-+
- #include <ext/atomicity.h>
- #include <ext/concurrence.h>
- #include <bits/atomic_lockfree_defines.h>
-@@ -425,3 +446,5 @@ namespace __cxxabiv1
- #endif
-   }
- }
-+
-+#endif
-diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc
-index 8238817c2e9..0c6a1f85f6f 100644
---- a/libstdc++-v3/src/c++11/thread.cc
-+++ b/libstdc++-v3/src/c++11/thread.cc
-@@ -55,6 +55,15 @@ static inline int get_nprocs()
- #elif defined(_GLIBCXX_USE_SC_NPROC_ONLN)
- # include <unistd.h>
- # define _GLIBCXX_NPROCS sysconf(_SC_NPROC_ONLN)
-+#elif defined(_WIN32)
-+# include <windows.h>
-+static inline int get_nprocs()
-+{
-+  SYSTEM_INFO sysinfo;
-+  GetSystemInfo(&sysinfo);
-+  return (int)sysinfo.dwNumberOfProcessors;
-+}
-+# define _GLIBCXX_NPROCS get_nprocs()
- #else
- # define _GLIBCXX_NPROCS 0
- #endif
--- 
-2.17.0
-
diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index 23e4bf10e99f..ae5080f9f6b0 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -29,12 +29,10 @@ let
   atLeast15 = lib.versionAtLeast version "15";
   atLeast14 = lib.versionAtLeast version "14";
   atLeast13 = lib.versionAtLeast version "13";
-  atLeast12 = lib.versionAtLeast version "12";
   is15 = majorVersion == "15";
   is14 = majorVersion == "14";
   is13 = majorVersion == "13";
   is12 = majorVersion == "12";
-  is11 = majorVersion == "11";
 
   # We only apply these patches when building a native toolchain for
   # aarch64-darwin, as it breaks building a foreign one:
@@ -49,28 +47,20 @@ let
 in
 
 #
-#  Patches below are organized into three general categories:
-#  1. Patches relevant to gcc>=12 on every platform
-#  2. Patches relevant to gcc>=12 on specific platforms
-#  3. Patches relevant only to gcc<12
+#  Patches below are organized into two general categories:
+#  1. Patches relevant on every platform
+#  2. Patches relevant on specific platforms
 #
 
-## 1. Patches relevant to gcc>=12 on every platform ####################################
+## 1. Patches relevant on every platform ####################################
 
 [ ]
-# Backport "c++: conversion to base of vbase in NSDMI"
-# Fixes https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431
-++ optional (!atLeast12) (fetchpatch {
-  name = "gcc-bug80431-fix";
-  url = "https://github.com/gcc-mirror/gcc/commit/de31f5445b12fd9ab9969dc536d821fe6f0edad0.patch";
-  hash = "sha256-bnHKJP5jR8rNJjRTi58/N/qZ5fPkuFBk7WblJWQpKOs=";
-})
 # Pass the path to a C++ compiler directly in the Makefile.in
 ++ optional (!lib.systems.equals targetPlatform hostPlatform) ./libstdc++-target.patch
 ++ optionals (noSysDirs) (
   [
     # Do not try looking for binaries and libraries in /lib and /usr/lib
-    (if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch)
+    ./gcc-12-no-sys-dirs.patch
   ]
   ++ (
     {
@@ -92,19 +82,17 @@ in
         ./no-sys-dirs-riscv.patch
         ./12/mangle-NIX_STORE-in-__FILE__.patch
       ];
-      "11" = [ ./no-sys-dirs-riscv.patch ];
     }
     ."${majorVersion}" or [ ]
   )
 )
 # Pass CFLAGS on to gnat
-++ optional (atLeast12 && langAda) ./gnat-cflags-11.patch
+++ optional langAda ./gnat-cflags-11.patch
 ++ optional langFortran (
   # Fix interaction of gfortran and libtool
   # Fixes the output of -v
   # See also https://github.com/nixOS/nixpkgs/commit/cc6f814a8f0e9b70ede5b24192558664fa1f98a2
-  if atLeast12 then ./gcc-12-gfortran-driving.patch else ./gfortran-driving.patch
-)
+  ./gcc-12-gfortran-driving.patch)
 # Do not pass a default include dir on PowerPC+Musl
 # See https://github.com/NixOS/nixpkgs/pull/45340/commits/d6bb7d45162ac93e017cc9b665ae4836f6410710
 ++ [ ./ppc-musl.patch ]
@@ -114,12 +102,12 @@ in
 ++ optional (!atLeast14) ./cfi_startproc-reorder-label-09-1.diff
 ++ optional (atLeast14 && !canApplyIainsDarwinPatches) ./cfi_startproc-reorder-label-14-1.diff
 
-## 2. Patches relevant to gcc>=12 on specific platforms ####################################
+## 2. Patches relevant on specific platforms ####################################
 
 ### Musl+Go+gcc12
 
 # backport fixes to build gccgo with musl libc
-++ optionals (stdenv.hostPlatform.isMusl && langGo && atLeast12) [
+++ optionals (stdenv.hostPlatform.isMusl && langGo) [
   # libgo: handle stat st_atim32 field and SYS_SECCOMP
   # syscall: gofmt
   # Add blank lines after //sys comments where needed, and then run gofmt
@@ -185,9 +173,7 @@ in
 ) ../patches/15/libgcc-darwin-detection.patch
 
 # Fix detection of bootstrap compiler Ada support (cctools as) on Nix Darwin
-++ optional (
-  atLeast12 && stdenv.hostPlatform.isDarwin && langAda
-) ./ada-cctools-as-detection-configure.patch
+++ optional (stdenv.hostPlatform.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch
 
 # Remove CoreServices on Darwin, as it is only needed for macOS SDK 14+
 ++ optional (
@@ -247,16 +233,6 @@ in
       # Needed to build LLVM>18
       ./cfi_startproc-reorder-label-2.diff
     ];
-    "11" = [
-      (fetchpatch {
-        # There are no upstream release tags in https://github.com/iains/gcc-11-branch.
-        # 5cc4c42a0d4de08715c2eef8715ad5b2e92a23b6 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.5.0
-        url = "https://github.com/iains/gcc-11-branch/compare/5cc4c42a0d4de08715c2eef8715ad5b2e92a23b6..gcc-11.5-darwin-r0.diff";
-        hash = "sha256-7lH+GkgkrE6nOp9PMdIoqlQNWK31s6oW+lDt1LIkadE=";
-      })
-      # Needed to build LLVM>18
-      ./cfi_startproc-reorder-label-2.diff
-    ];
   }
   .${majorVersion} or [ ]
 )
@@ -268,22 +244,3 @@ in
 ++ optional (
   !atLeast13 && !withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf"
 ) (./. + "/${majorVersion}/Added-mcf-thread-model-support-from-mcfgthread.patch")
-
-##############################################################################
-##
-##  3. Patches relevant only to gcc<12
-##
-##  Above this point are patches which might potentially be applied
-##  to gcc version 12 or newer.  Below this point are patches which
-##  will *only* be used for gcc versions older than gcc12.
-##
-##############################################################################
-
-## gcc 11.0 and older ##############################################################################
-
-# openjdk build fails without this on -march=opteron; is upstream in gcc12
-++ optional is11 (fetchpatch {
-  name = "darwin-aarch64-self-host-driver.patch";
-  url = "https://github.com/gcc-mirror/gcc/commit/d243f4009d8071b734df16cd70f4c5d09a373769.patch";
-  sha256 = "sha256-H97GZs2wwzfFGiFOgds/5KaweC+luCsWX3hRFf7+Sm4=";
-})
diff --git a/pkgs/development/compilers/gcc/patches/gfortran-driving.patch b/pkgs/development/compilers/gcc/patches/gfortran-driving.patch
deleted file mode 100644
index 70708886b405..000000000000
--- a/pkgs/development/compilers/gcc/patches/gfortran-driving.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This patch fixes interaction with Libtool.
-See <http://thread.gmane.org/gmane.comp.gcc.patches/258777>, for details.
-
---- a/gcc/fortran/gfortranspec.c
-+++ b/gcc/fortran/gfortranspec.c
-@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n"));
-     {
-       fprintf (stderr, _("Driving:"));
-       for (i = 0; i < g77_newargc; i++)
-+	{
-+	  if (g77_new_decoded_options[i].opt_index == OPT_l)
-+	    /* Make sure no white space is inserted after `-l'.  */
-+	    fprintf (stderr, " -l%s",
-+		     g77_new_decoded_options[i].canonical_option[1]);
-+	  else
- 	fprintf (stderr, " %s",
- 		 g77_new_decoded_options[i].orig_option_with_args_text);
-+	}
-       fprintf (stderr, "\n");
-     }
diff --git a/pkgs/development/compilers/gcc/patches/no-sys-dirs.patch b/pkgs/development/compilers/gcc/patches/no-sys-dirs.patch
deleted file mode 100644
index 36df51904acf..000000000000
--- a/pkgs/development/compilers/gcc/patches/no-sys-dirs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru -x '*~' gcc-4.8.3-orig/gcc/cppdefault.c gcc-4.8.3/gcc/cppdefault.c
---- gcc-4.8.3-orig/gcc/cppdefault.c	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.3/gcc/cppdefault.c	2014-08-18 16:20:32.893944536 +0200
-@@ -35,6 +35,8 @@
- # undef CROSS_INCLUDE_DIR
- #endif
- 
-+#undef LOCAL_INCLUDE_DIR
-+
- const struct default_include cpp_include_defaults[]
- #ifdef INCLUDE_DEFAULTS
- = INCLUDE_DEFAULTS;
-diff -ru -x '*~' gcc-4.8.3-orig/gcc/gcc.c gcc-4.8.3/gcc/gcc.c
---- gcc-4.8.3-orig/gcc/gcc.c	2014-03-23 12:30:57.000000000 +0100
-+++ gcc-4.8.3/gcc/gcc.c	2014-08-18 13:19:32.689201690 +0200
-@@ -1162,10 +1162,10 @@
- /* Default prefixes to attach to command names.  */
- 
- #ifndef STANDARD_STARTFILE_PREFIX_1
--#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
-+#define STANDARD_STARTFILE_PREFIX_1 ""
- #endif
- #ifndef STANDARD_STARTFILE_PREFIX_2
--#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
-+#define STANDARD_STARTFILE_PREFIX_2 ""
- #endif
- 
- #ifdef CROSS_DIRECTORY_STRUCTURE  /* Don't use these prefixes for a cross compiler.  */
diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix
index 5c25ad3bc215..7c69f0484d77 100644
--- a/pkgs/development/compilers/gcc/versions.nix
+++ b/pkgs/development/compilers/gcc/versions.nix
@@ -4,7 +4,6 @@ let
     "14" = "14.3.0";
     "13" = "13.4.0";
     "12" = "12.4.0";
-    "11" = "11.5.0";
   };
 
   fromMajorMinor = majorMinorVersion: majorMinorToVersionMap."${majorMinorVersion}";
@@ -19,7 +18,6 @@ let
       "14.3.0" = "sha256-4Nx3KXYlYxrI5Q+pL//v6Jmk63AlktpcMu8E4ik6yjo=";
       "13.4.0" = "sha256-nEzm27BAVo/cVFWIrAPFy8lajb8MeqSQFwhDr7WcqPU=";
       "12.4.0" = "sha256-cE9lJgTMvMsUvavzR4yVEciXiLEss7v/3tNzQZFqkXU=";
-      "11.5.0" = "sha256-puIYaOrVRc+H8MAfhCduS1KB1nIJhZHByJYkHwk2NHg=";
     }
     ."${version}";
 
diff --git a/pkgs/development/compilers/gnat-bootstrap/default.nix b/pkgs/development/compilers/gnat-bootstrap/default.nix
index 7de8a33bc5cb..cca928a0f997 100644
--- a/pkgs/development/compilers/gnat-bootstrap/default.nix
+++ b/pkgs/development/compilers/gnat-bootstrap/default.nix
@@ -33,23 +33,6 @@ stdenv.mkDerivation (
         url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-${finalAttrs.version}/gnat-${stdenv.hostPlatform.system}-${finalAttrs.version}.tar.gz";
       in
       {
-        "11" = {
-          gccVersion = "11.2.0";
-          alireRevision = "4";
-        }
-        // {
-          x86_64-darwin = {
-            inherit url;
-            hash = "sha256-FmBgD20PPQlX/ddhJliCTb/PRmKxe9z7TFPa2/SK4GY=";
-            upstreamTriplet = "x86_64-apple-darwin19.6.0";
-          };
-          x86_64-linux = {
-            inherit url;
-            hash = "sha256-8fMBJp6igH+Md5jE4LMubDmC4GLt4A+bZG/Xcz2LAJQ=";
-            upstreamTriplet = "x86_64-pc-linux-gnu";
-          };
-        }
-        .${stdenv.hostPlatform.system} or throwUnsupportedSystem;
         "12" = {
           gccVersion = "12.1.0";
           alireRevision = "2";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d4be4bed8dcb..415050b754e1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -953,6 +953,8 @@ mapAliases {
   gcc10 = throw "gcc10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc10Stdenv = throw "gcc10Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc10StdenvCompat = throw "gcc10StdenvCompat has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gcc11 = throw "gcc11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gcc11Stdenv = throw "gcc11Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc-arm-embedded-6 = throw "gcc-arm-embedded-6 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gcc-arm-embedded-7 = throw "gcc-arm-embedded-7 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gcc-arm-embedded-8 = throw "gcc-arm-embedded-8 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
@@ -976,6 +978,7 @@ mapAliases {
   gfortran8 = throw "gfortran8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
   gfortran9 = throw "gfortran9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran10 = throw "gfortran10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gfortran11 = throw "gfortran11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gg = go-graft; # Added 2025-03-07
   ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18
   ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18
@@ -1023,7 +1026,9 @@ mapAliases {
   gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17
   gmnisrv = throw "'gmnisrv' has been removed due to lack of maintenance upstream"; # Added 2025-06-07
   gmp4 = throw "'gmp4' is end-of-life, consider using 'gmp' instead"; # Added 2024-12-24
-  gnatboot11 = gnat-bootstrap11;
+  gnat11 = throw "gnat11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gnat-bootstrap11 = throw "gnat-bootstrap11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gnatboot11 = throw "gnatboot11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnatboot12 = gnat-bootstrap12;
   gnatboot = gnat-bootstrap;
   gnatcoll-core = gnatPackages.gnatcoll-core; # Added 2024-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a12b8786180..77e1eaaf19bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4861,7 +4861,6 @@ with pkgs;
         extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc;
       };
 
-  gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11;
   gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12;
   gcc13Stdenv = overrideCC gccStdenv buildPackages.gcc13;
   gcc14Stdenv = overrideCC gccStdenv buildPackages.gcc14;
@@ -4964,7 +4963,6 @@ with pkgs;
       });
 
   inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; })
-    gcc11
     gcc12
     gcc13
     gcc14
@@ -4985,34 +4983,6 @@ with pkgs;
 
   gnat = gnat13; # When changing this, update also gnatPackages
 
-  gnat11 = wrapCC (
-    gcc11.cc.override {
-      name = "gnat";
-      langC = true;
-      langCC = false;
-      langAda = true;
-      profiledCompiler = false;
-      # As per upstream instructions building a cross compiler
-      # should be done with a (native) compiler of the same version.
-      # If we are cross-compiling GNAT, we may as well do the same.
-      gnat-bootstrap =
-        if stdenv.hostPlatform == stdenv.targetPlatform && stdenv.buildPlatform == stdenv.hostPlatform then
-          buildPackages.gnat-bootstrap11
-        else
-          buildPackages.gnat11;
-      stdenv =
-        if
-          stdenv.hostPlatform == stdenv.targetPlatform
-          && stdenv.buildPlatform == stdenv.hostPlatform
-          && stdenv.buildPlatform.isDarwin
-          && stdenv.buildPlatform.isx86_64
-        then
-          overrideCC stdenv gnat-bootstrap11
-        else
-          stdenv;
-    }
-  );
-
   gnat12 = wrapCC (
     gcc12.cc.override {
       name = "gnat";
@@ -5126,9 +5096,6 @@ with pkgs;
   );
 
   gnat-bootstrap = gnat-bootstrap12;
-  gnat-bootstrap11 = wrapCC (
-    callPackage ../development/compilers/gnat-bootstrap { majorVersion = "11"; }
-  );
   gnat-bootstrap12 = wrapCCWith (
     {
       cc = callPackage ../development/compilers/gnat-bootstrap { majorVersion = "12"; };
@@ -5911,7 +5878,6 @@ with pkgs;
             libcxx
             extraPackages
             nixSupport
-            zlib
             ;
         }
         // extraArgs;

From 1101f10001f83efecdbf176063940c2cd09edcc0 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2877/3724] gnat-bootstrap: gnat-bootstrap12 ->
 gnat-bootstrap13

According to the comment on the `gnat` definition, this should have happened already.
---
 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 77e1eaaf19bd..6b38fc9051c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5095,7 +5095,7 @@ with pkgs;
     }
   );
 
-  gnat-bootstrap = gnat-bootstrap12;
+  gnat-bootstrap = gnat-bootstrap13;
   gnat-bootstrap12 = wrapCCWith (
     {
       cc = callPackage ../development/compilers/gnat-bootstrap { majorVersion = "12"; };

From f3186c59589ca56c3002ace9846e838879887d24 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Aug 2025 18:22:54 +0100
Subject: [PATCH 2878/3724] {gcc12,gfortran12,gccgo12,gnat12,gnat-bootstrap12}:
 drop

EOL as of July; no longer used in the tree.
---
 doc/release-notes/rl-2511.section.md          |   2 +-
 pkgs/by-name/gf/gfortran12/package.nix        |  10 -
 .../compilers/gcc/common/configure-flags.nix  |  12 -
 pkgs/development/compilers/gcc/default.nix    |   8 +-
 ...thread-model-support-from-mcfgthread.patch | 306 ------------------
 .../12/mangle-NIX_STORE-in-__FILE__.patch     |  99 ------
 .../compilers/gcc/patches/default.nix         |  25 --
 .../gnat-darwin-dylib-install-name.patch      |  19 --
 .../gcc/patches/no-sys-dirs-riscv.patch       |  12 -
 pkgs/development/compilers/gcc/versions.nix   |   2 -
 pkgs/top-level/aliases.nix                    |   9 +-
 pkgs/top-level/all-packages.nix               |  54 ----
 pkgs/top-level/python-packages.nix            |   2 +-
 13 files changed, 11 insertions(+), 549 deletions(-)
 delete mode 100644 pkgs/by-name/gf/gfortran12/package.nix
 delete mode 100644 pkgs/development/compilers/gcc/patches/12/Added-mcf-thread-model-support-from-mcfgthread.patch
 delete mode 100644 pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch
 delete mode 100644 pkgs/development/compilers/gcc/patches/gnat-darwin-dylib-install-name.patch
 delete mode 100644 pkgs/development/compilers/gcc/patches/no-sys-dirs-riscv.patch

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 5285a32254be..bf496bb33a9f 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -20,7 +20,7 @@
 
 - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
 
-- GCC 9, 10, and 11 have been removed, as they have reached end‐of‐life upstream and are no longer supported.
+- GCC 9, 10, 11, and 12 have been removed, as they have reached end‐of‐life upstream and are no longer supported.
 
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
 - `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
diff --git a/pkgs/by-name/gf/gfortran12/package.nix b/pkgs/by-name/gf/gfortran12/package.nix
deleted file mode 100644
index 95280bb8761b..000000000000
--- a/pkgs/by-name/gf/gfortran12/package.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ wrapCC, gcc12 }:
-wrapCC (
-  gcc12.cc.override {
-    name = "gfortran";
-    langFortran = true;
-    langCC = false;
-    langC = false;
-    profiledCompiler = false;
-  }
-)
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
index 14f27b89caba..88d405c3c8e7 100644
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -285,18 +285,6 @@ let
     ++ lib.optionals langJit [
       "--enable-host-shared"
     ]
-    # On mips64-unknown-linux-gnu libsanitizer defines collide with
-    # glibc's definitions and fail the build. It was fixed in gcc-13+.
-    ++
-      lib.optionals
-        (
-          targetPlatform.isMips
-          && targetPlatform.parsed.abi.name == "gnu"
-          && lib.versions.major version == "12"
-        )
-        [
-          "--disable-libsanitizer"
-        ]
     ++ lib.optionals targetPlatform.isAlpha [
       # Workaround build failures like:
       #   cc1: error: fp software completion requires '-mtrap-precision=i' [-Werror]
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 6d6189ed7499..1550dd43f913 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -79,10 +79,8 @@ let
 
   majorVersion = versions.major version;
   atLeast14 = versionAtLeast version "14";
-  atLeast13 = versionAtLeast version "13";
   is14 = majorVersion == "14";
   is13 = majorVersion == "13";
-  is12 = majorVersion == "12";
 
   # releases have a form: MAJOR.MINOR.MICRO, like 14.2.1
   # snapshots have a form like MAJOR.MINOR.MICRO.DATE, like 14.2.1.20250322
@@ -397,11 +395,7 @@ pipe
           ;
         isGNU = true;
         hardeningUnsupportedFlags =
-          optionals (!atLeast13) [
-            "strictflexarrays1"
-            "strictflexarrays3"
-          ]
-          ++ optional (
+          optional (
             !(targetPlatform.isLinux && targetPlatform.isx86_64 && targetPlatform.libc == "glibc")
           ) "shadowstack"
           ++ optional (!(targetPlatform.isLinux && targetPlatform.isAarch64)) "pacret"
diff --git a/pkgs/development/compilers/gcc/patches/12/Added-mcf-thread-model-support-from-mcfgthread.patch b/pkgs/development/compilers/gcc/patches/12/Added-mcf-thread-model-support-from-mcfgthread.patch
deleted file mode 100644
index 77202438e47d..000000000000
--- a/pkgs/development/compilers/gcc/patches/12/Added-mcf-thread-model-support-from-mcfgthread.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-From 86f2f767ddffd9f7c6f1470b987ae7b0d251b988 Mon Sep 17 00:00:00 2001
-From: Liu Hao <lh_mouse@126.com>
-Date: Wed, 25 Apr 2018 21:54:19 +0800
-Subject: [PATCH] Added 'mcf' thread model support from mcfgthread.
-
-Signed-off-by: Liu Hao <lh_mouse@126.com>
----
- config/gthr.m4                          |  1 +
- gcc/config.gcc                          |  3 +++
- gcc/config/i386/mingw-mcfgthread.h      |  1 +
- gcc/config/i386/mingw-w64.h             |  2 +-
- gcc/config/i386/mingw32.h               | 11 ++++++++++-
- gcc/configure                           |  2 +-
- gcc/configure.ac                        |  2 +-
- libatomic/configure.tgt                 |  2 +-
- libgcc/config.host                      |  6 ++++++
- libgcc/config/i386/gthr-mcf.h           |  1 +
- libgcc/config/i386/t-mingw-mcfgthread   |  2 ++
- libgcc/configure                        |  1 +
- libstdc++-v3/configure                  |  1 +
- libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++
- libstdc++-v3/libsupc++/guard.cc         | 23 +++++++++++++++++++++++
- libstdc++-v3/src/c++11/thread.cc        |  9 +++++++++
- 16 files changed, 80 insertions(+), 5 deletions(-)
- create mode 100644 gcc/config/i386/mingw-mcfgthread.h
- create mode 100644 libgcc/config/i386/gthr-mcf.h
- create mode 100644 libgcc/config/i386/t-mingw-mcfgthread
-
-diff --git a/config/gthr.m4 b/config/gthr.m4
-index 7b29f1f3327..82e21fe1709 100644
---- a/config/gthr.m4
-+++ b/config/gthr.m4
-@@ -21,6 +21,7 @@ case $1 in
-     tpf)	thread_header=config/s390/gthr-tpf.h ;;
-     vxworks)	thread_header=config/gthr-vxworks.h ;;
-     win32)	thread_header=config/i386/gthr-win32.h ;;
-+    mcf)	thread_header=config/i386/gthr-mcf.h ;;
- esac
- AC_SUBST(thread_header)
- ])
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 46a9029acec..112c24e95a3 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -1758,6 +1758,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
- 	if test x$enable_threads = xposix ; then
- 		tm_file="${tm_file} i386/mingw-pthread.h"
- 	fi
-+	if test x$enable_threads = xmcf ; then
-+		tm_file="${tm_file} i386/mingw-mcfgthread.h"
-+	fi
- 	tm_file="${tm_file} i386/mingw32.h"
- 	# This makes the logic if mingw's or the w64 feature set has to be used
- 	case ${target} in
-diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h
-new file mode 100644
-index 00000000000..ec381a7798f
---- /dev/null
-+++ b/gcc/config/i386/mingw-mcfgthread.h
-@@ -0,0 +1 @@
-+#define TARGET_USE_MCFGTHREAD 1
-diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h
-index 484dc7a9e9f..a15bbeea500 100644
---- a/gcc/config/i386/mingw-w64.h
-+++ b/gcc/config/i386/mingw-w64.h
-@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3.  If not see
- 		 "%{mwindows:-lgdi32 -lcomdlg32} " \
-      "%{fvtable-verify=preinit:-lvtv -lpsapi; \
-         fvtable-verify=std:-lvtv -lpsapi} " \
--		 "-ladvapi32 -lshell32 -luser32 -lkernel32"
-+		 LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"
- 
- #undef SPEC_32
- #undef SPEC_64
-diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
-index 0612b87199a..76cea94f3b7 100644
---- a/gcc/config/i386/mingw32.h
-+++ b/gcc/config/i386/mingw32.h
-@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3.  If not see
- 	 | MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \
- 	 | MASK_MS_BITFIELD_LAYOUT)
- 
-+#ifndef TARGET_USE_MCFGTHREAD
-+#define CPP_MCFGTHREAD()  ((void)0)
-+#define LIB_MCFGTHREAD     ""
-+#else
-+#define CPP_MCFGTHREAD()  (builtin_define("__USING_MCFGTHREAD__"))
-+#define LIB_MCFGTHREAD     " -lmcfgthread "
-+#endif
-+
- /* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS
-    is for compatibility with native compiler.  */
- #define EXTRA_OS_CPP_BUILTINS()					\
-@@ -50,6 +58,7 @@ along with GCC; see the file COPYING3.  If not see
- 	  builtin_define_std ("WIN64");				\
- 	  builtin_define ("_WIN64");				\
- 	}							\
-+	CPP_MCFGTHREAD();	\
-     }								\
-   while (0)
- 
-@@ -93,7 +102,7 @@ along with GCC; see the file COPYING3.  If not see
- 		 "%{mwindows:-lgdi32 -lcomdlg32} " \
-      "%{fvtable-verify=preinit:-lvtv -lpsapi; \
-         fvtable-verify=std:-lvtv -lpsapi} " \
--                 "-ladvapi32 -lshell32 -luser32 -lkernel32"
-+                 LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"
- 
- /* Weak symbols do not get resolved if using a Windows dll import lib.
-    Make the unwind registration references strong undefs.  */
-diff --git a/gcc/configure b/gcc/configure
-index 6121e163259..52f0e00efe6 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -11693,7 +11693,7 @@ case ${enable_threads} in
-     target_thread_file='single'
-     ;;
-   aix | dce | lynx | mipssde | posix | rtems | \
--  single | tpf | vxworks | win32)
-+  single | tpf | vxworks | win32 | mcf)
-     target_thread_file=${enable_threads}
-     ;;
-   *)
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index b066cc609e1..4ecdba88de7 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -1612,7 +1612,7 @@ case ${enable_threads} in
-     target_thread_file='single'
-     ;;
-   aix | dce | lynx | mipssde | posix | rtems | \
--  single | tpf | vxworks | win32)
-+  single | tpf | vxworks | win32 | mcf)
-     target_thread_file=${enable_threads}
-     ;;
-   *)
-diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
-index ea8c34f8c71..23134ad7363 100644
---- a/libatomic/configure.tgt
-+++ b/libatomic/configure.tgt
-@@ -145,7 +145,7 @@ case "${target}" in
-   *-*-mingw*)
- 	# OS support for atomic primitives.
-         case ${target_thread_file} in
--          win32)
-+          win32 | mcf)
-             config_path="${config_path} mingw"
-             ;;
-           posix)
-diff --git a/libgcc/config.host b/libgcc/config.host
-index 11b4acaff55..9fbd38650bd 100644
---- a/libgcc/config.host
-+++ b/libgcc/config.host
-@@ -737,6 +737,9 @@ i[34567]86-*-mingw*)
- 	  posix)
- 	    tmake_file="i386/t-mingw-pthread $tmake_file"
- 	    ;;
-+	  mcf)
-+	    tmake_file="i386/t-mingw-mcfgthread $tmake_file"
-+	    ;;
- 	esac
- 	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
- 	if test x$ac_cv_sjlj_exceptions = xyes; then
-@@ -761,6 +764,9 @@ x86_64-*-mingw*)
- 	  posix)
- 	    tmake_file="i386/t-mingw-pthread $tmake_file"
- 	    ;;
-+	  mcf)
-+	    tmake_file="i386/t-mingw-mcfgthread $tmake_file"
-+	    ;;
- 	esac
- 	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
- 	if test x$ac_cv_sjlj_exceptions = xyes; then
-diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h
-new file mode 100644
-index 00000000000..5ea2908361f
---- /dev/null
-+++ b/libgcc/config/i386/gthr-mcf.h
-@@ -0,0 +1 @@
-+#include <mcfgthread/gthread.h>
-diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread
-new file mode 100644
-index 00000000000..4b9b10e32d6
---- /dev/null
-+++ b/libgcc/config/i386/t-mingw-mcfgthread
-@@ -0,0 +1,2 @@
-+SHLIB_PTHREAD_CFLAG =
-+SHLIB_PTHREAD_LDFLAG = -lmcfgthread
-diff --git a/libgcc/configure b/libgcc/configure
-index b2f3f870844..eff889dc3b3 100644
---- a/libgcc/configure
-+++ b/libgcc/configure
-@@ -5451,6 +5451,7 @@ case $target_thread_file in
-     tpf)	thread_header=config/s390/gthr-tpf.h ;;
-     vxworks)	thread_header=config/gthr-vxworks.h ;;
-     win32)	thread_header=config/i386/gthr-win32.h ;;
-+    mcf)	thread_header=config/i386/gthr-mcf.h ;;
- esac
- 
- 
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index ba094be6f15..979a5ab9ace 100755
---- a/libstdc++-v3/configure
-+++ b/libstdc++-v3/configure
-@@ -15187,6 +15187,7 @@ case $target_thread_file in
-     tpf)	thread_header=config/s390/gthr-tpf.h ;;
-     vxworks)	thread_header=config/gthr-vxworks.h ;;
-     win32)	thread_header=config/i386/gthr-win32.h ;;
-+    mcf)	thread_header=config/i386/gthr-mcf.h ;;
- esac
- 
- 
-diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc
-index de920d714c6..665fb74bd6b 100644
---- a/libstdc++-v3/libsupc++/atexit_thread.cc
-+++ b/libstdc++-v3/libsupc++/atexit_thread.cc
-@@ -25,6 +25,22 @@
- #include <cstdlib>
- #include <new>
- #include "bits/gthr.h"
-+
-+#ifdef __USING_MCFGTHREAD__
-+
-+#include <mcfgthread/gthread.h>
-+namespace __cxxabiv1 {
-+extern "C" int
-+__cxa_thread_atexit (void (_GLIBCXX_CDTOR_CALLABI *dtor)(void *),
-+				 void *obj, void *dso_handle)
-+  _GLIBCXX_NOTHROW
-+{
-+  return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1;
-+  (void)dso_handle;
-+}
-+}
-+#else // __USING_MCFGTHREAD__
-+
- #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
-@@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha
- }
- 
- #endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */
-+
-+#endif // __USING_MCFGTHREAD__
-diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
-index 3a2ec3ad0d6..8b4cc96199b 100644
---- a/libstdc++-v3/libsupc++/guard.cc
-+++ b/libstdc++-v3/libsupc++/guard.cc
-@@ -28,6 +28,27 @@
- #include <cxxabi.h>
- #include <exception>
- #include <new>
-+
-+#ifdef __USING_MCFGTHREAD__
-+
-+#include <mcfgthread/gthread.h>
-+
-+namespace __cxxabiv1 {
-+
-+extern "C" int __cxa_guard_acquire(__guard *g){
-+	return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial;
-+}
-+extern "C" void __cxa_guard_abort(__guard *g) throw() {
-+	::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g);
-+}
-+extern "C" void __cxa_guard_release(__guard *g) throw() {
-+	::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g);
-+}
-+
-+}
-+
-+#else // __USING_MCFGTHREAD__
-+
- #include <ext/atomicity.h>
- #include <ext/concurrence.h>
- #include <bits/atomic_lockfree_defines.h>
-@@ -425,3 +446,5 @@ namespace __cxxabiv1
- #endif
-   }
- }
-+
-+#endif
-diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc
-index 8238817c2e9..0c6a1f85f6f 100644
---- a/libstdc++-v3/src/c++11/thread.cc
-+++ b/libstdc++-v3/src/c++11/thread.cc
-@@ -55,6 +55,15 @@ static inline int get_nprocs()
- #elif defined(_GLIBCXX_USE_SC_NPROC_ONLN)
- # include <unistd.h>
- # define _GLIBCXX_NPROCS sysconf(_SC_NPROC_ONLN)
-+#elif defined(_WIN32)
-+# include <windows.h>
-+static inline int get_nprocs()
-+{
-+  SYSTEM_INFO sysinfo;
-+  GetSystemInfo(&sysinfo);
-+  return (int)sysinfo.dwNumberOfProcessors;
-+}
-+# define _GLIBCXX_NPROCS get_nprocs()
- #else
- # define _GLIBCXX_NPROCS 0
- #endif
--- 
-2.17.0
-
diff --git a/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch b/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch
deleted file mode 100644
index 8a09af2183f1..000000000000
--- a/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 30908556fece379ffd7c0da96c774d8bd297e459 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <siarheit@google.com>
-Date: Fri, 22 Sep 2023 22:41:49 +0100
-Subject: [PATCH] gcc/file-prefix-map.cc: always mangle __FILE__ into invalid
- store path
-
-Without the change `__FILE__` used in static inline functions in headers
-embed paths to header files into executable images. For local headers
-it's not a problem, but for headers in `/nix/store` this causes `-dev`
-inputs to be retained in runtime closure.
-
-Typical examples are `nix` -> `nlohmann_json` and `pipewire` ->
-`lttng-ust.dev`.
-
-For this reason we want to remove the occurrences of hashes in the
-expansion of `__FILE__`. `nuke-references` does it by replacing hashes
-by `eeeeee...`. It is handy to be able to invert the transformation to
-go back to the original store path. The chosen solution is to make the
-hash uppercase:
-- it does not trigger runtime references (except for all digit hashes,
-  which are unlikely enough)
-- it visually looks like a bogus store path
-- it is easy to find the original store path if required
-
-Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as:
-
-  -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/$HASH1-nlohmann-json-ver
-  -fmacro-prefix-map=/nix/...
-
-In practice it quickly exhausts argument length limit due to `gcc`
-deficiency: https://gcc.gnu.org/PR111527
-
-Until it's fixed let's hardcode header mangling if $NIX_STORE variable
-is present in the environment.
-
-Tested as:
-
-    $ printf "# 0 \"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o -
-    ...
-    .string "/nix/store/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA-pppppp-vvvvvvv"
-    ...
-
-Mangled successfully.
-
-To reverse the effect of the mangle use new `NIX_GCC_DONT_MANGLE_PREFIX_MAP`
-environment variable. It should not normally be needed.
---- a/gcc/file-prefix-map.cc
-+++ b/gcc/file-prefix-map.cc
-@@ -65,7 +65,7 @@ add_prefix_map (file_prefix_map *&maps, const char *arg, const char *opt)
-    remapping was performed.  */
- 
- static const char *
--remap_filename (file_prefix_map *maps, const char *filename)
-+remap_filename (file_prefix_map *maps, const char *filename, bool mangle_nix_store = false)
- {
-   file_prefix_map *map;
-   char *s;
-@@ -76,7 +76,31 @@ remap_filename (file_prefix_map *maps, const char *filename)
-     if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0)
-       break;
-   if (!map)
--    return filename;
-+    {
-+      if (mangle_nix_store && getenv("NIX_GCC_DONT_MANGLE_PREFIX_MAP") == NULL)
-+	{
-+	  /* Remap the 32 characters after $NIX_STORE/ to uppercase
-+	  *
-+	  * That way we avoid argument parameters explosion
-+	  * and still avoid embedding headers into runtime closure:
-+	  *   https://gcc.gnu.org/PR111527
-+	  */
-+	  char * nix_store = getenv("NIX_STORE");
-+	  size_t nix_store_len = nix_store ? strlen(nix_store) : 0;
-+	  const char * name = filename;
-+	  size_t name_len = strlen(name);
-+	  if (nix_store && name_len >= nix_store_len + 1 + 32 && memcmp(name, nix_store, nix_store_len) == 0)
-+	    {
-+	       s = (char *) ggc_alloc_atomic (name_len + 1);
-+	       memcpy(s, name, name_len + 1);
-+	       for (size_t i = nix_store_len + 1; i < nix_store_len + 1 + 32; i++) {
-+		 s[i] = TOUPPER(s[i]);
-+	       }
-+	       return s;
-+	    }
-+	}
-+      return filename;
-+    }
-   name = filename + map->old_len;
-   name_len = strlen (name) + 1;
- 
-@@ -129,7 +153,7 @@ add_profile_prefix_map (const char *arg)
- const char *
- remap_macro_filename (const char *filename)
- {
--  return remap_filename (macro_prefix_maps, filename);
-+  return remap_filename (macro_prefix_maps, filename, true);
- }
- 
- /* Remap using -fdebug-prefix-map.  Return the GC-allocated new name
diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index ae5080f9f6b0..9e6f94b121dc 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -28,11 +28,9 @@
 let
   atLeast15 = lib.versionAtLeast version "15";
   atLeast14 = lib.versionAtLeast version "14";
-  atLeast13 = lib.versionAtLeast version "13";
   is15 = majorVersion == "15";
   is14 = majorVersion == "14";
   is13 = majorVersion == "13";
-  is12 = majorVersion == "12";
 
   # We only apply these patches when building a native toolchain for
   # aarch64-darwin, as it breaks building a foreign one:
@@ -78,10 +76,6 @@ in
         ./13/no-sys-dirs-riscv.patch
         ./13/mangle-NIX_STORE-in-__FILE__.patch
       ];
-      "12" = [
-        ./no-sys-dirs-riscv.patch
-        ./12/mangle-NIX_STORE-in-__FILE__.patch
-      ];
     }
     ."${majorVersion}" or [ ]
   )
@@ -186,7 +180,6 @@ in
     "15" = [ ../patches/14/gnat-darwin-dylib-install-name-14.patch ];
     "14" = [ ../patches/14/gnat-darwin-dylib-install-name-14.patch ];
     "13" = [ ./gnat-darwin-dylib-install-name-13.patch ];
-    "12" = [ ./gnat-darwin-dylib-install-name.patch ];
   }
   .${majorVersion} or [ ]
 )
@@ -223,24 +216,6 @@ in
         hash = "sha256-xqkBDFYZ6fdowtqR3kV7bR8a4Cu11RDokSzGn1k3a1w=";
       })
     ];
-    # Patches from https://github.com/iains/gcc-12-branch/compare/2bada4bc59bed4be34fab463bdb3c3ebfd2b41bb..gcc-12-4-darwin
-    "12" = [
-      (fetchurl {
-        name = "gcc-12-darwin-aarch64-support.patch";
-        url = "https://raw.githubusercontent.com/Homebrew/formula-patches/1ed9eaea059f1677d27382c62f21462b476b37fe/gcc/gcc-12.4.0.diff";
-        sha256 = "sha256-wOjpT79lps4TKG5/E761odhLGCphBIkCbOPiQg/D1Fw=";
-      })
-      # Needed to build LLVM>18
-      ./cfi_startproc-reorder-label-2.diff
-    ];
   }
   .${majorVersion} or [ ]
 )
-
-## Windows
-
-# Backported mcf thread model support from gcc13:
-# https://github.com/gcc-mirror/gcc/commit/f036d759ecee538555fa8c6b11963e4033732463
-++ optional (
-  !atLeast13 && !withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf"
-) (./. + "/${majorVersion}/Added-mcf-thread-model-support-from-mcfgthread.patch")
diff --git a/pkgs/development/compilers/gcc/patches/gnat-darwin-dylib-install-name.patch b/pkgs/development/compilers/gcc/patches/gnat-darwin-dylib-install-name.patch
deleted file mode 100644
index 01e5de86a438..000000000000
--- a/pkgs/development/compilers/gcc/patches/gnat-darwin-dylib-install-name.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/gcc/ada/gcc-interface/Makefile.in	2022-08-19 18:09:52.000000000 +1000
-+++ b/gcc/ada/gcc-interface/Makefile.in	2023-01-11 01:54:06.000000000 +1100
-@@ -795,14 +795,14 @@
- 		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
- 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
- 		$(SO_OPTS) \
--		-Wl,-install_name,@rpath/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+		-Wl,-install_name,$(ADA_RTL_DSO_DIR)/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
- 		$(MISCLIB)
- 	cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
-                 | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -dynamiclib $(PICFLAG_FOR_TARGET) \
- 		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
- 		$(GNATRTL_TASKING_OBJS) \
- 		$(SO_OPTS) \
--		-Wl,-install_name,@rpath/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+		-Wl,-install_name,$(ADA_RTL_DSO_DIR)/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
- 		$(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)
- 	cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
- 		libgnat$(soext)
diff --git a/pkgs/development/compilers/gcc/patches/no-sys-dirs-riscv.patch b/pkgs/development/compilers/gcc/patches/no-sys-dirs-riscv.patch
deleted file mode 100644
index 00e2838af6fd..000000000000
--- a/pkgs/development/compilers/gcc/patches/no-sys-dirs-riscv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/gcc/config/riscv/linux.h
-+++ b/gcc/config/riscv/linux.h
-@@ -69,8 +69,4 @@
- 
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
- 
--#define STARTFILE_PREFIX_SPEC 			\
--   "/lib" XLEN_SPEC "/" ABI_SPEC "/ "		\
--   "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ "	\
--   "/lib/ "					\
--   "/usr/lib/ "
-+#define STARTFILE_PREFIX_SPEC ""
diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix
index 7c69f0484d77..521d129bbb37 100644
--- a/pkgs/development/compilers/gcc/versions.nix
+++ b/pkgs/development/compilers/gcc/versions.nix
@@ -3,7 +3,6 @@ let
     "15" = "15.2.0";
     "14" = "14.3.0";
     "13" = "13.4.0";
-    "12" = "12.4.0";
   };
 
   fromMajorMinor = majorMinorVersion: majorMinorToVersionMap."${majorMinorVersion}";
@@ -17,7 +16,6 @@ let
       "15.2.0" = "sha256-Q4/ZloJrDIJIWinaA6ctcdbjVBqD7HAt9Ccfb+Al0k4=";
       "14.3.0" = "sha256-4Nx3KXYlYxrI5Q+pL//v6Jmk63AlktpcMu8E4ik6yjo=";
       "13.4.0" = "sha256-nEzm27BAVo/cVFWIrAPFy8lajb8MeqSQFwhDr7WcqPU=";
-      "12.4.0" = "sha256-cE9lJgTMvMsUvavzR4yVEciXiLEss7v/3tNzQZFqkXU=";
     }
     ."${version}";
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 415050b754e1..f86b74337d90 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -955,6 +955,8 @@ mapAliases {
   gcc10StdenvCompat = throw "gcc10StdenvCompat has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc11 = throw "gcc11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc11Stdenv = throw "gcc11Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gcc12 = throw "gcc12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gcc12Stdenv = throw "gcc12Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc-arm-embedded-6 = throw "gcc-arm-embedded-6 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gcc-arm-embedded-7 = throw "gcc-arm-embedded-7 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gcc-arm-embedded-8 = throw "gcc-arm-embedded-8 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
@@ -962,6 +964,7 @@ mapAliases {
   gcc-arm-embedded-10 = throw "gcc-arm-embedded-10 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gcc-arm-embedded-11 = throw "gcc-arm-embedded-11 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gcc-arm-embedded-12 = throw "gcc-arm-embedded-12 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
+  gccgo12 = throw "gccgo12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcj = gcj6; # Added 2024-09-13
   gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15
@@ -979,6 +982,7 @@ mapAliases {
   gfortran9 = throw "gfortran9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran10 = throw "gfortran10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran11 = throw "gfortran11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gfortran12 = throw "gfortran12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gg = go-graft; # Added 2025-03-07
   ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18
   ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18
@@ -1029,7 +1033,10 @@ mapAliases {
   gnat11 = throw "gnat11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnat-bootstrap11 = throw "gnat-bootstrap11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnatboot11 = throw "gnatboot11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gnatboot12 = gnat-bootstrap12;
+  gnat12 = throw "gnat12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gnat-bootstrap12 = throw "gnat-bootstrap12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gnatboot12 = throw "gnatboot12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gnat12Packages = throw "gnat12Packages has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnatboot = gnat-bootstrap;
   gnatcoll-core = gnatPackages.gnatcoll-core; # Added 2024-02-25
   gnatcoll-gmp = gnatPackages.gnatcoll-gmp; # Added 2024-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b38fc9051c0..34809a6c4df2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4861,7 +4861,6 @@ with pkgs;
         extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc;
       };
 
-  gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12;
   gcc13Stdenv = overrideCC gccStdenv buildPackages.gcc13;
   gcc14Stdenv = overrideCC gccStdenv buildPackages.gcc14;
   gcc15Stdenv = overrideCC gccStdenv buildPackages.gcc15;
@@ -4963,7 +4962,6 @@ with pkgs;
       });
 
   inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; })
-    gcc12
     gcc13
     gcc14
     gcc15
@@ -4983,34 +4981,6 @@ with pkgs;
 
   gnat = gnat13; # When changing this, update also gnatPackages
 
-  gnat12 = wrapCC (
-    gcc12.cc.override {
-      name = "gnat";
-      langC = true;
-      langCC = false;
-      langAda = true;
-      profiledCompiler = false;
-      # As per upstream instructions building a cross compiler
-      # should be done with a (native) compiler of the same version.
-      # If we are cross-compiling GNAT, we may as well do the same.
-      gnat-bootstrap =
-        if stdenv.hostPlatform == stdenv.targetPlatform && stdenv.buildPlatform == stdenv.hostPlatform then
-          buildPackages.gnat-bootstrap12
-        else
-          buildPackages.gnat12;
-      stdenv =
-        if
-          stdenv.hostPlatform == stdenv.targetPlatform
-          && stdenv.buildPlatform == stdenv.hostPlatform
-          && stdenv.buildPlatform.isDarwin
-          && stdenv.buildPlatform.isx86_64
-        then
-          overrideCC stdenv gnat-bootstrap12
-        else
-          stdenv;
-    }
-  );
-
   gnat13 = wrapCC (
     gcc13.cc.override {
       name = "gnat";
@@ -5096,14 +5066,6 @@ with pkgs;
   );
 
   gnat-bootstrap = gnat-bootstrap13;
-  gnat-bootstrap12 = wrapCCWith (
-    {
-      cc = callPackage ../development/compilers/gnat-bootstrap { majorVersion = "12"; };
-    }
-    // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) {
-      bintools = bintoolsDualAs;
-    }
-  );
   gnat-bootstrap13 = wrapCCWith (
     {
       cc = callPackage ../development/compilers/gnat-bootstrap { majorVersion = "13"; };
@@ -5121,7 +5083,6 @@ with pkgs;
     }
   );
 
-  gnat12Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat12; });
   gnat13Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat13; });
   gnat14Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat14; });
   gnat15Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat15; });
@@ -5147,21 +5108,6 @@ with pkgs;
     }
   );
 
-  gccgo12 = wrapCC (
-    gcc12.cc.override {
-      name = "gccgo";
-      langCC = true; # required for go.
-      langC = true;
-      langGo = true;
-      langJit = true;
-      profiledCompiler = false;
-    }
-    // {
-      # not supported on darwin: https://github.com/golang/go/issues/463
-      meta.broken = stdenv.hostPlatform.isDarwin;
-    }
-  );
-
   gccgo13 = wrapCC (
     gcc13.cc.override {
       name = "gccgo";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 21ac86e4658e..9b3932b29f6b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17943,7 +17943,7 @@ self: super: with self; {
       #
       # We use the nixpkgs' default libstdc++ to stay compatible with other
       # python modules
-      stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv;
+      #stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv;
     };
 
   tensorflow-datasets = callPackage ../development/python-modules/tensorflow-datasets { };

From 9fd881d31d65d8be2458c1dd1f70bba7fd17b751 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Fri, 22 Aug 2025 14:59:34 -0700
Subject: [PATCH 2879/3724] ci: add @philiptaron as a reviewer on anything in
 maintainers that's otherwise not maintained
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

> Anyway, I keep picturing all these little kids playing some game in this big field of rye and all. Thousands of little kids, and nobody’s around―nobody big, I mean―except me. And I’m standing on the edge of some crazy cliff. What I have to do, I have to catch everybody if they start to go over the cliff―I mean if they’re running and they don’t look where they’re going I have to come out from somewhere and catch them. That’s all I’d do all day. I’d just be the catcher in the rye and all. I know it’s crazy, but that’s the only thing I’d really like to be. I know it’s crazy.
---
 ci/OWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/OWNERS b/ci/OWNERS
index 856ca93675ca..cb3b2869a9f1 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -19,6 +19,7 @@
 /.github/workflows                      @NixOS/nixpkgs-ci
 /ci                                     @NixOS/nixpkgs-ci
 /ci/OWNERS                              @infinisil @philiptaron
+/maintainers                            @philiptaron
 
 # Development support
 /.editorconfig @Mic92 @zowoq

From 3a165d84e3e3db43d577a5e5dbaf8013f704a213 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 23 Aug 2025 00:03:08 +0200
Subject: [PATCH 2880/3724] autotrash: set version

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

diff --git a/pkgs/by-name/au/autotrash/package.nix b/pkgs/by-name/au/autotrash/package.nix
index 6e775e86f1a7..e2539fc75f8d 100644
--- a/pkgs/by-name/au/autotrash/package.nix
+++ b/pkgs/by-name/au/autotrash/package.nix
@@ -17,6 +17,11 @@ python3Packages.buildPythonPackage rec {
     hash = "sha256-qMU3jjBL5+fd9vKX5BIqES5AM8D/54aBOmdHFiBtfEo=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"'
+  '';
+
   build-system = [ python3Packages.poetry-core ];
 
   nativeBuildInputs = [

From 84956b5453cd56cb0a90ff133d8c7447e30284c8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 23 Aug 2025 00:03:54 +0200
Subject: [PATCH 2881/3724] autotrash: add blank line between logical sections

---
 pkgs/by-name/au/autotrash/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/au/autotrash/package.nix b/pkgs/by-name/au/autotrash/package.nix
index e2539fc75f8d..8acc2bfc3325 100644
--- a/pkgs/by-name/au/autotrash/package.nix
+++ b/pkgs/by-name/au/autotrash/package.nix
@@ -5,6 +5,7 @@
   pandoc,
   installShellFiles,
 }:
+
 python3Packages.buildPythonPackage rec {
   pname = "autotrash";
   version = "0.4.7";
@@ -28,7 +29,9 @@ python3Packages.buildPythonPackage rec {
     installShellFiles
     pandoc
   ];
+
   postBuild = "make -C doc autotrash.1";
+
   postInstall = "installManPage doc/autotrash.1";
 
   pythonImportsCheck = [ "autotrash" ];

From 9c0c6b382654ccd479cb50b2d6e997cfdd0ba8fa Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13+github@gmail.com>
Date: Wed, 30 Jul 2025 14:46:47 +0200
Subject: [PATCH 2882/3724] wasilibc: 22-unstable-2024-10-26 ->
 27-unstable-2025-07-27

Update the wasilibc to the current release.

Signed-off-by: wucke13 <wucke13+github@gmail.com>
---
 pkgs/by-name/wa/wasilibc/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix
index 4ec6324d61c1..54dbd7d0a139 100644
--- a/pkgs/by-name/wa/wasilibc/package.nix
+++ b/pkgs/by-name/wa/wasilibc/package.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "wasilibc";
-  version = "22-unstable-2024-10-16";
+  version = "27-unstable-2025-07-27";
 in
 stdenvNoLibc.mkDerivation {
   inherit pname version;
@@ -16,8 +16,8 @@ stdenvNoLibc.mkDerivation {
   src = buildPackages.fetchFromGitHub {
     owner = "WebAssembly";
     repo = "wasi-libc";
-    rev = "98897e29fcfc81e2b12e487e4154ac99188330c4";
-    hash = "sha256-NFKhMJj/quvN3mR7lmxzA9w46KhX92iG0rQA9qDeS8I=";
+    rev = "3f7eb4c7d6ede4dde3c4bffa6ed14e8d656fe93f";
+    hash = "sha256-RIjph1XdYc1aGywKks5JApcLajbNFEuWm+Wy/GMHddg=";
     fetchSubmodules = true;
   };
 
@@ -31,6 +31,7 @@ stdenvNoLibc.mkDerivation {
   postPatch = ''
     substituteInPlace Makefile \
       --replace "-Werror" ""
+    patchShebangs scripts/
   '';
 
   preBuild = ''

From 493d9641ce77157c65ee45611cfe983f5662241a Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 19 Aug 2025 10:28:20 -0700
Subject: [PATCH 2883/3724] python3Packages.chromadb: 1.0.12 -> 1.0.20

---
 .../python-modules/chromadb/default.nix       | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix
index eaaa7ab4bbac..ef4ca8891759 100644
--- a/pkgs/development/python-modules/chromadb/default.nix
+++ b/pkgs/development/python-modules/chromadb/default.nix
@@ -7,11 +7,11 @@
 
   # build inputs
   cargo,
+  openssl,
   pkg-config,
   protobuf,
   rustc,
   rustPlatform,
-  openssl,
   zstd-c,
 
   # dependencies
@@ -33,6 +33,7 @@
   orjson,
   overrides,
   posthog,
+  pybase64,
   pydantic,
   pypika,
   pyyaml,
@@ -66,20 +67,20 @@
 
 buildPythonPackage rec {
   pname = "chromadb";
-  version = "1.0.12";
+  version = "1.0.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chroma-core";
     repo = "chroma";
     tag = version;
-    hash = "sha256-Q4PhJTRNzJeVx6DIPWirnI9KksNb8vfOtqb/q9tSK3c=";
+    hash = "sha256-jwgm1IXAyctLzUi9GZfgRMiqAuq1BwpcZp/UMlV2t7g=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     name = "${pname}-${version}-vendor";
-    hash = "sha256-+Ea2aRrsBGfVCLdOF41jeMehJhMurc8d0UKrpR6ndag=";
+    hash = "sha256-A4I0xAGmwF9Th+g8bWEmhCRTAp4Q6GYkejHKDqoczY4=";
   };
 
   # Can't use fetchFromGitHub as the build expects a zipfile
@@ -96,6 +97,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     "fastapi"
+    "posthog"
   ];
 
   build-system = [
@@ -134,6 +136,7 @@ buildPythonPackage rec {
     orjson
     overrides
     posthog
+    pybase64
     pydantic
     pypika
     pyyaml
@@ -187,10 +190,13 @@ buildPythonPackage rec {
   # See https://github.com/chroma-core/chroma/issues/5315
   preCheck = ''
     (($(ulimit -n) < 1024)) && ulimit -n 1024
-    export HOME=$(mktemp -d)
     export CHROMA_RUST_BINDINGS_TEST_ONLY=1
   '';
 
+  enabledTestPaths = [
+    "chromadb/test"
+  ];
+
   disabledTests = [
     # Tests are flaky / timing sensitive
     "test_fastapi_server_token_authn_allows_when_it_should_allow"
@@ -211,6 +217,11 @@ buildPythonPackage rec {
     "test_query_id_filtering_e2e"
     "test_query_id_filtering_medium_dataset"
     "test_query_id_filtering_small_dataset"
+    # Deadlocks intermittently
+    "test_app"
+    # Depends on specific floating-point precision
+    "test_base64_conversion_is_identity_f16"
+    # No such file or directory: 'openssl'
     "test_ssl_self_signed_without_ssl_verify"
     "test_ssl_self_signed"
 
@@ -227,6 +238,8 @@ buildPythonPackage rec {
     "chromadb/test/ef/test_onnx_mini_lm_l6_v2.py"
     "chromadb/test/ef/test_voyageai_ef.py"
     "chromadb/test/property/"
+    "chromadb/test/distributed"
+    "chromadb/test/ef"
     "chromadb/test/property/test_cross_version_persist.py"
     "chromadb/test/stress/"
     "chromadb/test/test_api.py"

From b887ca4634f716858aba3bf1e59d6b78bb3b99b1 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 19 Aug 2025 10:28:20 -0700
Subject: [PATCH 2884/3724] python3Packages.chromadb: remove obsolete test
 exclusions

Audited test exclusions to see which could be removed.
---
 .../python-modules/chromadb/default.nix       | 42 ++++---------------
 1 file changed, 8 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix
index ef4ca8891759..b2a791d5a281 100644
--- a/pkgs/development/python-modules/chromadb/default.nix
+++ b/pkgs/development/python-modules/chromadb/default.nix
@@ -180,7 +180,6 @@ buildPythonPackage rec {
   };
 
   pytestFlags = [
-    "-x" # these are slow tests, so stop on the first failure
     "-v"
     "-Wignore:DeprecationWarning"
     "-Wignore:PytestCollectionWarning"
@@ -198,61 +197,36 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
-    # Tests are flaky / timing sensitive
-    "test_fastapi_server_token_authn_allows_when_it_should_allow"
-    "test_fastapi_server_token_authn_rejects_when_it_should_reject"
-
-    # Issue with event loop
-    "test_http_client_bw_compatibility"
-
-    # httpx ReadError
-    "test_not_existing_collection_delete"
-
-    # Tests launch a server and try to connect to it
-    # These either have https connection errors or name resolution errors
+    # Failure in name resolution
     "test_collection_query_with_invalid_collection_throws"
     "test_collection_update_with_invalid_collection_throws"
     "test_default_embedding"
     "test_persist_index_loading"
-    "test_query_id_filtering_e2e"
-    "test_query_id_filtering_medium_dataset"
-    "test_query_id_filtering_small_dataset"
+
     # Deadlocks intermittently
     "test_app"
+
     # Depends on specific floating-point precision
     "test_base64_conversion_is_identity_f16"
+
     # No such file or directory: 'openssl'
     "test_ssl_self_signed_without_ssl_verify"
     "test_ssl_self_signed"
-
-    # Apparent race condition with sqlite
-    # See https://github.com/chroma-core/chroma/issues/4661
-    "test_multithreaded_get_or_create"
   ];
 
   disabledTestPaths = [
     # Tests require network access
-    "bin/rust_python_compat_test.py"
-    "chromadb/test/configurations/test_collection_configuration.py"
-    "chromadb/test/ef/test_default_ef.py"
-    "chromadb/test/ef/test_onnx_mini_lm_l6_v2.py"
-    "chromadb/test/ef/test_voyageai_ef.py"
-    "chromadb/test/property/"
     "chromadb/test/distributed"
     "chromadb/test/ef"
     "chromadb/test/property/test_cross_version_persist.py"
-    "chromadb/test/stress/"
-    "chromadb/test/test_api.py"
+    "chromadb/test/stress"
 
-    # Tests time out (waiting for server)
-    "chromadb/test/test_cli.py"
-
-    # Cannot find protobuf file while loading test
-    "chromadb/test/distributed/test_log_failover.py"
+    # Excessively slow
+    "chromadb/test/property/test_add.py"
+    "chromadb/test/property/test_persist.py"
 
     # ValueError: An instance of Chroma already exists for ephemeral with different settings
     "chromadb/test/test_chroma.py"
-    "chromadb/test/ef/test_multimodal_ef.py"
   ];
 
   __darwinAllowLocalNetworking = true;

From d8603c74deac7e0a7a9b4d202dd30ae91a136810 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13+github@gmail.com>
Date: Wed, 30 Jul 2025 14:49:16 +0200
Subject: [PATCH 2885/3724] wasilibc: refactor and clean up the package

- remove unused import
- remove unnecessary `let .. in` binding
  - it is unclear to me what the benefit of this binding was, likely a
    remnant from more elaborate src fetching in the past
- replace `buildPackages.fetchFromGitHub` by just `fetchFromGitHub`
  - it is unclear to me why manual splicing would be needed here
- remove old fix from previous version
  - The bugreport was initially for version 16, the last activity in it
    mentions version 20 of the sdk, we are now at version 27
- add myself as maintainer

Co-authored-by: applePrincess <appleprincess@appleprincess.io>
Signed-off-by: wucke13 <wucke13+github@gmail.com>
---
 pkgs/by-name/wa/wasilibc/package.nix | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix
index 54dbd7d0a139..91747c477733 100644
--- a/pkgs/by-name/wa/wasilibc/package.nix
+++ b/pkgs/by-name/wa/wasilibc/package.nix
@@ -1,22 +1,19 @@
 {
   stdenvNoLibc,
-  buildPackages,
+  fetchFromGitHub,
   lib,
   firefox-unwrapped,
   firefox-esr-unwrapped,
 }:
 
-let
+stdenvNoLibc.mkDerivation (finalAttrs: {
   pname = "wasilibc";
-  version = "27-unstable-2025-07-27";
-in
-stdenvNoLibc.mkDerivation {
-  inherit pname version;
+  version = "27";
 
-  src = buildPackages.fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "WebAssembly";
     repo = "wasi-libc";
-    rev = "3f7eb4c7d6ede4dde3c4bffa6ed14e8d656fe93f";
+    tag = "wasi-sdk-${finalAttrs.version}";
     hash = "sha256-RIjph1XdYc1aGywKks5JApcLajbNFEuWm+Wy/GMHddg=";
     fetchSubmodules = true;
   };
@@ -43,10 +40,7 @@ stdenvNoLibc.mkDerivation {
       "SYSROOT_LIB:=$SYSROOT_LIB"
       "SYSROOT_INC:=$SYSROOT_INC"
       "SYSROOT_SHARE:=$SYSROOT_SHARE"
-      # https://bugzilla.mozilla.org/show_bug.cgi?id=1773200
-      "BULK_MEMORY_SOURCES:="
     )
-
   '';
 
   enableParallelBuilding = true;
@@ -63,13 +57,14 @@ stdenvNoLibc.mkDerivation {
   };
 
   meta = with lib; {
-    changelog = "https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-${version}";
+    changelog = "https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-${finalAttrs.version}";
     description = "WASI libc implementation for WebAssembly";
     homepage = "https://wasi.dev";
     platforms = platforms.wasi;
     maintainers = with maintainers; [
       matthewbauer
       rvolosatovs
+      wucke13
     ];
     license = with licenses; [
       asl20
@@ -77,4 +72,4 @@ stdenvNoLibc.mkDerivation {
       mit
     ];
   };
-}
+})

From 6a4aac01d9b272341ace89c1da27cc219f56d407 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13+github@gmail.com>
Date: Wed, 30 Jul 2025 15:05:46 +0200
Subject: [PATCH 2886/3724] wasilibc: enable posix thread-model via opt-in arg

Signed-off-by: wucke13 <wucke13+github@gmail.com>
---
 pkgs/by-name/wa/wasilibc/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix
index 91747c477733..9b58b0ca2f05 100644
--- a/pkgs/by-name/wa/wasilibc/package.nix
+++ b/pkgs/by-name/wa/wasilibc/package.nix
@@ -4,6 +4,7 @@
   lib,
   firefox-unwrapped,
   firefox-esr-unwrapped,
+  enablePosixThreads ? false,
 }:
 
 stdenvNoLibc.mkDerivation (finalAttrs: {
@@ -40,6 +41,7 @@ stdenvNoLibc.mkDerivation (finalAttrs: {
       "SYSROOT_LIB:=$SYSROOT_LIB"
       "SYSROOT_INC:=$SYSROOT_INC"
       "SYSROOT_SHARE:=$SYSROOT_SHARE"
+      ${lib.strings.optionalString enablePosixThreads "THREAD_MODEL:=posix"}
     )
   '';
 

From 7502a33ed32e15963dad9bf9dcdab03c56d6e7ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 22:35:13 +0000
Subject: [PATCH 2887/3724] files-cli: 2.15.77 -> 2.15.85

---
 pkgs/by-name/fi/files-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index dbd0110fe16f..853046abd548 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "files-cli";
-  version = "2.15.77";
+  version = "2.15.85";
 
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
     rev = "v${version}";
-    hash = "sha256-anDChFR4vax0fFdT1+WVdzuzNUhsfgwGljQmQj6jD4E=";
+    hash = "sha256-nARnc4oh0Pfpo8yxh6oXlS/CQK2oMmN2imCajFMbrFI=";
   };
 
-  vendorHash = "sha256-p4ZMukOuU93Cwt19gOxXTqgdTMML4yppSI7WHIwCPag=";
+  vendorHash = "sha256-xU2X+ElbV+iQxJwPIR0ficMCgn2QwMWeZ3wNtcLgLeg=";
 
   ldflags = [
     "-s"

From f0baf6cb3888806cafe0b61292052ccd03313297 Mon Sep 17 00:00:00 2001
From: melvyn <melvyn2@dnsense.pub>
Date: Fri, 22 Aug 2025 15:57:02 -0700
Subject: [PATCH 2888/3724] freeimpi: disable hardcoded uid check By default,
 freeipmi tools refuse to run if they are not ran as root. This is
 unnecessarily restrictive when access to the device file is already root-only
 by default. Disabling this check allows the user to set up permissions as
 they see fit, but does not loosen security by default compared to the
 existing situation.

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

diff --git a/pkgs/by-name/fr/freeipmi/package.nix b/pkgs/by-name/fr/freeipmi/package.nix
index ddae0b150e52..b97bda12b45d 100644
--- a/pkgs/by-name/fr/freeipmi/package.nix
+++ b/pkgs/by-name/fr/freeipmi/package.nix
@@ -25,7 +25,11 @@ stdenv.mkDerivation rec {
     libgpg-error
   ];
 
-  configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+  configureFlags = [
+    # Device permissions are set by udev/kernel, so don't restrict them unnecessarily
+    "--with-dont-check-for-root"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
     "ac_cv_file__dev_urandom=true"
     "ac_cv_file__dev_random=true"
   ];

From 4defcb5a8b1d8913dc5142b8c33272dce95c4dba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 23:02:52 +0000
Subject: [PATCH 2889/3724] python3Packages.cryptg: 0.5.post0 -> 0.5.1

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

diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix
index 0f2cf892241f..9151fcbd0cd3 100644
--- a/pkgs/development/python-modules/cryptg/default.nix
+++ b/pkgs/development/python-modules/cryptg/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "cryptg";
-  version = "0.5.post0";
+  version = "0.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,12 +21,12 @@ buildPythonPackage rec {
     owner = "cher-nov";
     repo = "cryptg";
     rev = "v${version}";
-    hash = "sha256-GCTVxCJQvpvHpzaU+OaFM/AKoRvxLyA0u6VIV+94UTY=";
+    hash = "sha256-jrJy51AfMmLjAyi9FXT3mCi8q1OIpuAdrSS9tmrv3fA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-+RNH9h40UTGUcr0PPJLllhAg81LM1IQnYKmrNxfPPv8=";
+    hash = "sha256-yOfpFGAy7VsDQrkd13H+ha0AzfXQmzmkIuvzsvY9rfk=";
   };
 
   build-system = [

From df8e25a2fbb16dabaffbff713f968674eee0f3db Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sat, 23 Aug 2025 07:06:56 +0800
Subject: [PATCH 2890/3724] spirit: 0.8.0 -> 0.9.0

---
 pkgs/by-name/sp/spirit/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sp/spirit/package.nix b/pkgs/by-name/sp/spirit/package.nix
index 669991608b1a..81479f9fb6d2 100644
--- a/pkgs/by-name/sp/spirit/package.nix
+++ b/pkgs/by-name/sp/spirit/package.nix
@@ -2,20 +2,21 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "spirit";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "block";
     repo = "spirit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bGKqiCd9dggppORouoWlAoAaYdx4vAivsP22KWm1fxU=";
+    hash = "sha256-B9yrPHHIjtfjY1+auC/8h95ejs2f6HD5TCIrt+8dH2k=";
   };
 
-  vendorHash = "sha256-87WUqUjyfprpY63kEKCAx/AU6TN73W7oMdOaKfl8xt4=";
+  vendorHash = "sha256-pMvZxGNnLLAiyWtRRRHJcF28wEQkHgUI3nJCKTlMJhY=";
 
   subPackages = [ "cmd/spirit" ];
 
@@ -24,6 +25,10 @@ buildGoModule (finalAttrs: {
     "-w"
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     homepage = "https://github.com/block/spirit";
     description = "Online schema change tool for MySQL";

From 49c8159c804bc873183640add7c65a39955fb187 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Fri, 22 Aug 2025 19:10:43 -0400
Subject: [PATCH 2891/3724] grub: replace `fetchFromSavannah` with `fetchgit`

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

diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index 8b56473f87ab..e083c3e92ed0 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchFromSavannah,
+  fetchgit,
   flex,
   bison,
   python3,
@@ -67,19 +67,13 @@ let
 
   inPCSystems = lib.any (system: stdenv.hostPlatform.system == system) (lib.attrNames pcSystems);
 
-  gnulib = fetchFromSavannah {
-    repo = "gnulib";
+  gnulib = fetchgit {
+    url = "https://https.git.savannah.gnu.org/git/gnulib.git";
     # NOTE: keep in sync with bootstrap.conf!
     rev = "9f48fb992a3d7e96610c4ce8be969cff2d61a01b";
     hash = "sha256-mzbF66SNqcSlI+xmjpKpNMwzi13yEWoc1Fl7p4snTto=";
   };
 
-  src = fetchFromSavannah {
-    repo = "grub";
-    rev = "grub-2.12";
-    hash = "sha256-lathsBb2f7urh8R86ihpTdwo3h1hAHnRiHd5gCLVpBc=";
-  };
-
   # The locales are fetched from translationproject.org at build time,
   # but those translations are not versioned/stable. For that reason
   # we take them from the nearest release tarball instead:
@@ -95,7 +89,12 @@ assert !(efiSupport && xenSupport);
 stdenv.mkDerivation rec {
   pname = "grub";
   version = "2.12";
-  inherit src;
+
+  src = fetchgit {
+    url = "https://https.git.savannah.gnu.org/git/grub.git";
+    tag = "grub-${version}";
+    hash = "sha256-lathsBb2f7urh8R86ihpTdwo3h1hAHnRiHd5gCLVpBc=";
+  };
 
   patches = [
     ./fix-bash-completion.patch

From 0d7b8a01dc4a1a190296f3ffba047ee5894e9b2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 23:14:26 +0000
Subject: [PATCH 2892/3724] librenms: 25.7.0 -> 25.8.0

---
 pkgs/by-name/li/librenms/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix
index 8426d0838657..0f30b3f4eccd 100644
--- a/pkgs/by-name/li/librenms/package.nix
+++ b/pkgs/by-name/li/librenms/package.nix
@@ -27,16 +27,16 @@ let
 in
 phpPackage.buildComposerProject2 rec {
   pname = "librenms";
-  version = "25.7.0";
+  version = "25.8.0";
 
   src = fetchFromGitHub {
     owner = "librenms";
     repo = "librenms";
     tag = version;
-    sha256 = "sha256-YXSzHqMJwqEYP1c6hLT7t9CyOJ2GZMELoqGQf2GSjdA=";
+    sha256 = "sha256-OJd5wlne5F2fa5pK4i1hRAIzcZlzgOwJjw2UhqkEYfY=";
   };
 
-  vendorHash = "sha256-YlGT326Yp8A6rR4LHaczrNu5SOgQBUA11WBpJhHNhvg=";
+  vendorHash = "sha256-kFyOoE+WJ/3hhPg5tC3w/PrDkLgOtJGeOwZEHsTOdG8=";
 
   php = phpPackage;
 

From 264b8fee01b2d0ef1bddfae3edb190d5bde9cce5 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Sat, 26 Jul 2025 18:00:30 -0700
Subject: [PATCH 2893/3724] =?UTF-8?q?mescc-tools:=20replace=20`fetchFromSa?=
 =?UTF-8?q?vannah`=20with=20mirror;=201.5.1=20=E2=86=92=201.5.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/me/mescc-tools/package.nix b/pkgs/by-name/me/mescc-tools/package.nix
index 875e8e8bd5c0..2df8253addc8 100644
--- a/pkgs/by-name/me/mescc-tools/package.nix
+++ b/pkgs/by-name/me/mescc-tools/package.nix
@@ -1,25 +1,25 @@
 {
   lib,
   stdenv,
-  fetchFromSavannah,
+  fetchurl,
   m2libc,
   which,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mescc-tools";
-  version = "1.5.1";
+  version = "1.5.2";
 
-  src = fetchFromSavannah {
-    repo = "mescc-tools";
-    rev = "Release_${finalAttrs.version}";
-    hash = "sha256-jFDrmzsjKEQKOKlsch1ceWtzUhoJAJVyHjXGVhjE9/U=";
+  src = fetchurl {
+    url = "mirror://savannah/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    hash = "sha256-k2wYbLNasuLRq03BG/DXJySNabKOv9sakgst1V8wU8k=";
   };
 
   # Don't use vendored M2libc
   postPatch = ''
-    rmdir M2libc
+    rm -r M2libc
     ln -s ${m2libc}/include/M2libc M2libc
+    patchShebangs --build Kaem/test.sh
   '';
 
   enableParallelBuilding = true;

From 32873aef855a72f807f11477f94839cb78e4c94e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 23:17:13 +0000
Subject: [PATCH 2894/3724] python3Packages.sharkiq: 1.1.1 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/sharkiq/default.nix b/pkgs/development/python-modules/sharkiq/default.nix
index 21c72d6c6523..7649d7c7020e 100644
--- a/pkgs/development/python-modules/sharkiq/default.nix
+++ b/pkgs/development/python-modules/sharkiq/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "sharkiq";
-  version = "1.1.1";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "JeffResc";
     repo = "sharkiq";
     tag = "v${version}";
-    hash = "sha256-FIPU2D0e0JGcoxFKe5gf5nKZ0T/a18WS9I+LXeig1is=";
+    hash = "sha256-bojLyL16DOFgbU8rglzBRxcgsHwaTQQAsJQZCaXo5pw=";
   };
 
   build-system = [ setuptools ];

From 105872591ac990331e8f58ec2feaba0db1583a13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 23:38:22 +0000
Subject: [PATCH 2895/3724] python3Packages.textual-slider: 0.1.2 -> 0.2.0

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

diff --git a/pkgs/development/python-modules/textual-slider/default.nix b/pkgs/development/python-modules/textual-slider/default.nix
index 669d80637e84..86f071f3191f 100644
--- a/pkgs/development/python-modules/textual-slider/default.nix
+++ b/pkgs/development/python-modules/textual-slider/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage {
   pname = "textual-slider";
-  version = "0.1.2";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "TomJGooding";

From 365b93a0e0b438802001ea8f3e3fcec98222892a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 23:53:08 +0000
Subject: [PATCH 2896/3724] mbake: 1.3.1 -> 1.4.1.pre

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

diff --git a/pkgs/by-name/mb/mbake/package.nix b/pkgs/by-name/mb/mbake/package.nix
index 55409a020ab1..740cdcb24de0 100644
--- a/pkgs/by-name/mb/mbake/package.nix
+++ b/pkgs/by-name/mb/mbake/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mbake";
-  version = "1.3.1";
+  version = "1.4.1.pre";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "EbodShojaei";
     repo = "bake";
     tag = "v${version}";
-    hash = "sha256-gQsie4/iUIe4g6ZH8bL33xW6CNxSg/sh429P4Xv0GjQ=";
+    hash = "sha256-HbBibwrd73GA0Z3xiYJAu1te7BADqsSkk0d99bMrwPw=";
   };
 
   build-system = [

From f9a2a2c48f0f7b71a28e57ecbcf97ff0f4c0a5db Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Wed, 30 Jul 2025 12:50:32 -0700
Subject: [PATCH 2897/3724] gnucap: replace `fetchFromSavannah` with
 `fetchgit`; update links

---
 pkgs/by-name/gn/gnucap/modelgen-verilog.nix |  9 ++++-----
 pkgs/by-name/gn/gnucap/package.nix          | 10 +++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/gn/gnucap/modelgen-verilog.nix b/pkgs/by-name/gn/gnucap/modelgen-verilog.nix
index d0537e3e10fc..54e74d3c7d72 100644
--- a/pkgs/by-name/gn/gnucap/modelgen-verilog.nix
+++ b/pkgs/by-name/gn/gnucap/modelgen-verilog.nix
@@ -1,5 +1,5 @@
 {
-  fetchFromSavannah,
+  fetchgit,
   gnucap,
   installShellFiles,
   lib,
@@ -10,9 +10,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "gnucap-modelgen-verilog";
   version = "20240220";
 
-  src = fetchFromSavannah {
-    repo = "gnucap/gnucap-modelgen-verilog";
-    rev = finalAttrs.version;
+  src = fetchgit {
+    url = "https://https.git.savannah.gnu.org/git/gnucap/gnucap-modelgen-verilog.git";
+    tag = finalAttrs.version;
     hash = "sha256-hDH+aUuCjr5JK2UOy1diNXJaqt6Lrw4GgiiZmQ/SaQs=";
   };
 
@@ -38,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "gnucap modelgen to preprocess, parse and dump vams files";
     homepage = "http://www.gnucap.org/";
-    changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${finalAttrs.version}";
     mainProgram = "gnucap-mg-vams";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/gn/gnucap/package.nix b/pkgs/by-name/gn/gnucap/package.nix
index 61a307422cce..056aac1fb914 100644
--- a/pkgs/by-name/gn/gnucap/package.nix
+++ b/pkgs/by-name/gn/gnucap/package.nix
@@ -1,6 +1,6 @@
 {
   callPackage,
-  fetchFromSavannah,
+  fetchgit,
   installShellFiles,
   lib,
   readline,
@@ -14,9 +14,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "gnucap";
   version = "20240220";
 
-  src = fetchFromSavannah {
-    repo = "gnucap";
-    rev = finalAttrs.version;
+  src = fetchgit {
+    url = "https://https.git.savannah.gnu.org/git/gnucap.git";
+    tag = finalAttrs.version;
     hash = "sha256-aZMiNKwI6eQZAxlF/+GoJhKczohgGwZ0/Wgpv3+AhYY=";
   };
 
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
       It performs nonlinear dc and transient analyses, fourier analysis, and ac analysis.
     '';
     homepage = "http://www.gnucap.org/";
-    changelog = "https://git.savannah.gnu.org/gitweb/?p=gnucap.git;a=blob;f=NEWS";
+    changelog = "https://gitweb.git.savannah.gnu.org/gitweb/?p=gnucap.git;a=blob;f=NEWS";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.all;
     broken = stdenv.hostPlatform.isDarwin; # Relies on LD_LIBRARY_PATH

From 7e9ba753e1414376d34f1faecb6d1dc239eeb79a Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Sat, 23 Aug 2025 03:20:02 +0300
Subject: [PATCH 2898/3724] yt-dlp: 2025.08.20 -> 2025.08.22

Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.08.22
Diff: https://github.com/yt-dlp/yt-dlp/compare/2025.08.20...2025.08.22
---
 pkgs/by-name/yt/yt-dlp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index 3974372a9d36..803a3cbce898 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -19,14 +19,14 @@ python3Packages.buildPythonApplication rec {
   # The websites yt-dlp deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2025.08.20";
+  version = "2025.08.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yt-dlp";
     repo = "yt-dlp";
     tag = version;
-    hash = "sha256-FeIoV7Ya+tGCMvUUXmPrs4MN52zwqrcpzJ6Arh4V450=";
+    hash = "sha256-58Qj+Bt4GEGgWpqAuMVemixm5AUcqS+e2Sajoeun8KY=";
   };
 
   postPatch = ''

From 05b76438c58bd8677ce3b8345c19af5eda9055fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 00:20:54 +0000
Subject: [PATCH 2899/3724] python3Packages.pycasbin: 2.0.0 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/pycasbin/default.nix b/pkgs/development/python-modules/pycasbin/default.nix
index acdc8a94752b..1405569bc3f5 100644
--- a/pkgs/development/python-modules/pycasbin/default.nix
+++ b/pkgs/development/python-modules/pycasbin/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pycasbin";
-  version = "2.0.0";
+  version = "2.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "casbin";
     repo = "pycasbin";
     tag = "v${version}";
-    hash = "sha256-LbJhpDTNPELsjgTmuYyYrOKzgMe81np49KB2PY1wxZs=";
+    hash = "sha256-rlEO6ZBy23MbYICRWOo/RmiphuN5JtiKNK/+k2Ian+g=";
   };
 
   build-system = [ setuptools ];

From 4d129212c4ec9dbb4ed812bd194385683fee4b47 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 00:46:18 +0000
Subject: [PATCH 2900/3724] redocly: 2.0.2 -> 2.0.7

---
 pkgs/by-name/re/redocly/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix
index fd6f2a6b5c12..38e3e1339ec6 100644
--- a/pkgs/by-name/re/redocly/package.nix
+++ b/pkgs/by-name/re/redocly/package.nix
@@ -9,16 +9,16 @@
 
 buildNpmPackage rec {
   pname = "redocly";
-  version = "2.0.2";
+  version = "2.0.7";
 
   src = fetchFromGitHub {
     owner = "Redocly";
     repo = "redocly-cli";
     rev = "@redocly/cli@${version}";
-    hash = "sha256-dIPKvvJpNOvJLQ/tT0EOtRIx9/LfQf0g4+N9JChk37U=";
+    hash = "sha256-diTs1SudDtATY1sNghnWr4Uel1UT38YVSuJZLdb6sZs=";
   };
 
-  npmDepsHash = "sha256-nb6QPtCqnXeRA7YEG3+U3ZWWG41v5cpkIplgNYej4dQ=";
+  npmDepsHash = "sha256-iHfbrX3HYDDol9Nt++vJAhlaBQJDRLypkuVdp0Iwjuc=";
 
   npmBuildScript = "prepare";
 

From 83b4a4bde950a6c873a5e95a9c4aabb32a9254ca Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Fri, 22 Aug 2025 17:53:01 -0700
Subject: [PATCH 2901/3724] joplin-desktop: 3.3.13 -> 3.4.6

---
 pkgs/by-name/jo/joplin-desktop/release-data.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/jo/joplin-desktop/release-data.json b/pkgs/by-name/jo/joplin-desktop/release-data.json
index 748c3518da51..329257377897 100644
--- a/pkgs/by-name/jo/joplin-desktop/release-data.json
+++ b/pkgs/by-name/jo/joplin-desktop/release-data.json
@@ -1,15 +1,15 @@
 {
-  "version": "3.3.13",
+  "version": "3.4.6",
   "x86_64-linux": {
-    "url": "https://github.com/laurent22/joplin/releases/download/v3.3.13/Joplin-3.3.13.AppImage",
-    "sha256": "1gd5qlkjwrx8kxx5d97r58v5wxw4zbzjblr24ydjqbbfhjrr1zr2"
+    "url": "https://github.com/laurent22/joplin/releases/download/v3.4.6/Joplin-3.4.6.AppImage",
+    "sha256": "0xf5lmjv49rq5bnczpydflzzhha8rzcn3iy7zpi5wqzmzsp0jg2p"
   },
   "x86_64-darwin": {
-    "url": "https://github.com/laurent22/joplin/releases/download/v3.3.13/Joplin-3.3.13.dmg",
-    "sha256": "05v5idqnajlya83ax252xs6d1nc0p6679aihij35b885nqiql6f5"
+    "url": "https://github.com/laurent22/joplin/releases/download/v3.4.6/Joplin-3.4.6.dmg",
+    "sha256": "1yahng1rciyrviykksqhk2wfkmrff77frsb7fkaxbhll1p8p74hm"
   },
   "aarch64-darwin": {
-    "url": "https://github.com/laurent22/joplin/releases/download/v3.3.13/Joplin-3.3.13-arm64.dmg",
-    "sha256": "1bafq33n0qdw4hxbq3mp2499zpzz0kc4gqh9cdp650994kmq8207"
+    "url": "https://github.com/laurent22/joplin/releases/download/v3.4.6/Joplin-3.4.6-arm64.dmg",
+    "sha256": "1k5ipsbss3qkyi5b3bw9agk4jmbsakvskrff71v8hg5wk6vi3m7c"
   }
 }

From 0897e382ca784816c012b15f2762f5b0b116b385 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 00:59:11 +0000
Subject: [PATCH 2902/3724] python3Packages.pysmlight: 0.2.7 -> 0.2.8

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

diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix
index b0215e0dfe00..dc14892d80c7 100644
--- a/pkgs/development/python-modules/pysmlight/default.nix
+++ b/pkgs/development/python-modules/pysmlight/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pysmlight";
-  version = "0.2.7";
+  version = "0.2.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "smlight-tech";
     repo = "pysmlight";
     tag = "v${version}";
-    hash = "sha256-w5t8ApshET7DkxxDsEpRBdo3+sg05ch9ec85TI4dAms=";
+    hash = "sha256-PPJotxlY1eSx0PNCDzsgaFvm4oPvG4LL4vb8G8ewMiw=";
   };
 
   build-system = [ poetry-core ];

From 30575381f482bcc328c9fd57661ed6db2522289f Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 22 Aug 2025 08:49:04 -0400
Subject: [PATCH 2903/3724] kanidm: 1.7.2 -> 1.7.3

https://github.com/kanidm/kanidm/releases/tag/v1.7.3
---
 pkgs/by-name/ka/kanidm/1_7.nix                | 10 +++++--
 ...718a8a0325a53e0857668b8a0134d371794d.patch | 29 +++++++++++++++++++
 pkgs/by-name/ka/kanidm/generic.nix            | 11 ++++---
 3 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/by-name/ka/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch

diff --git a/pkgs/by-name/ka/kanidm/1_7.nix b/pkgs/by-name/ka/kanidm/1_7.nix
index ac135ebcddf8..11eb5796bd70 100644
--- a/pkgs/by-name/ka/kanidm/1_7.nix
+++ b/pkgs/by-name/ka/kanidm/1_7.nix
@@ -1,5 +1,9 @@
 import ./generic.nix {
-  version = "1.7.2";
-  hash = "sha256-ETaggYPWxgEx9Vo/8Xehpi3UqkjQO/NAoOsbZxi/DeY=";
-  cargoHash = "sha256-BwrEvtujYlMWG1LNkaNvHlIbrqmEBgbr50xTz+V5KYQ=";
+  version = "1.7.3";
+  hash = "sha256-eptbxhbd3pUvYCncgKprh0qes9CjdvGUl3CsG/sHX7M=";
+  cargoHash = "sha256-M0TXGvpMkV/4U0MRYVqiWQsA+9AHdeS89noLxE2Llt0=";
+  patches = [
+    # remove 1.7.4 - https://github.com/kanidm/kanidm/issues/3813
+    ./a3bc718a8a0325a53e0857668b8a0134d371794d.patch
+  ];
 }
diff --git a/pkgs/by-name/ka/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch b/pkgs/by-name/ka/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch
new file mode 100644
index 000000000000..7b07d8ec75ff
--- /dev/null
+++ b/pkgs/by-name/ka/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch
@@ -0,0 +1,29 @@
+From a3bc718a8a0325a53e0857668b8a0134d371794d Mon Sep 17 00:00:00 2001
+From: Firstyear <william@blackhats.net.au>
+Date: Sat, 16 Aug 2025 13:46:23 +1000
+Subject: [PATCH] Fix account recover-disable edge case (#3796)
+
+---
+ server/lib/src/idm/server.rs | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/server/lib/src/idm/server.rs b/server/lib/src/idm/server.rs
+index 0fc6d78787..51bfbf6705 100644
+--- a/server/lib/src/idm/server.rs
++++ b/server/lib/src/idm/server.rs
+@@ -1900,6 +1900,7 @@ impl IdmServerProxyWriteTransaction<'_> {
+         let modlist = ModifyList::new_list(vec![
+             // Ensure the account is valid from *now*, and that the expiry is unset.
+             m_purge(Attribute::AccountExpire),
++            m_purge(Attribute::AccountValidFrom),
+             Modify::Present(Attribute::AccountValidFrom, v_valid_from),
+             // We need to remove other credentials too.
+             m_purge(Attribute::PassKeys),
+@@ -1934,6 +1935,7 @@ impl IdmServerProxyWriteTransaction<'_> {
+         let modlist = ModifyList::new_list(vec![
+             // Ensure that the account has no validity, and the expiry is now.
+             m_purge(Attribute::AccountValidFrom),
++            m_purge(Attribute::AccountExpire),
+             Modify::Present(Attribute::AccountExpire, v_expire),
+         ]);
+ 
diff --git a/pkgs/by-name/ka/kanidm/generic.nix b/pkgs/by-name/ka/kanidm/generic.nix
index 7ee0fb2f48d0..324a5f596517 100644
--- a/pkgs/by-name/ka/kanidm/generic.nix
+++ b/pkgs/by-name/ka/kanidm/generic.nix
@@ -4,6 +4,7 @@
   cargoHash,
   unsupported ? false,
   eolDate ? null,
+  patches ? [ ],
 }:
 
 {
@@ -60,10 +61,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   env.KANIDM_BUILD_PROFILE = "release_nixpkgs_${arch}";
 
-  patches = lib.optionals enableSecretProvisioning [
-    (./. + "/provision-patches/${versionUnderscored finalAttrs}/oauth2-basic-secret-modify.patch")
-    (./. + "/provision-patches/${versionUnderscored finalAttrs}/recover-account.patch")
-  ];
+  patches =
+    patches
+    ++ lib.optionals enableSecretProvisioning [
+      (./. + "/provision-patches/${versionUnderscored finalAttrs}/oauth2-basic-secret-modify.patch")
+      (./. + "/provision-patches/${versionUnderscored finalAttrs}/recover-account.patch")
+    ];
 
   postPatch =
     let

From 235059aa6abf7566ac816ba943483e4d290d6c53 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 22 Aug 2025 21:25:22 -0400
Subject: [PATCH 2904/3724] zfs_unstable: 2.3.3 -> 2.4.0-rc1

https://github.com/openzfs/zfs/releases/tag/zfs-2.4.0-rc1
---
 pkgs/os-specific/linux/zfs/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index 269110fdc53a..e115be3336a0 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -10,20 +10,20 @@ callPackage ./generic.nix args {
   kernelModuleAttribute = "zfs_unstable";
 
   kernelMinSupportedMajorMinor = "4.18";
-  kernelMaxSupportedMajorMinor = "6.15";
+  kernelMaxSupportedMajorMinor = "6.16";
 
   # this package should point to a version / git revision compatible with the latest kernel release
   # IMPORTANT: Always use a tagged release candidate or commits from the
   # zfs-<version>-staging branch, because this is tested by the OpenZFS
   # maintainers.
-  version = "2.3.3";
+  version = "2.4.0-rc1";
   # rev = "";
 
   tests = {
     inherit (nixosTests.zfs) unstable;
   };
 
-  hash = "sha256-NXAbyGBfpzWfm4NaP1/otTx8fOnoRV17343qUMdQp5U=";
+  hash = "sha256-6BU/Cotu+Lp7Pqp0eyECzAwsl82vKyDBkacxAh9wHPo=";
 
   extraLongDescription = ''
     This is "unstable" ZFS, and will usually be a pre-release version of ZFS.

From fd3b748d319ed775de7eb76fcd07365616fa14fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 01:33:35 +0000
Subject: [PATCH 2905/3724] podman-desktop: 1.20.2 -> 1.21.0

---
 pkgs/by-name/po/podman-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index 9ede1352de4c..25afdcbf3ad0 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -24,7 +24,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "podman-desktop";
-  version = "1.20.2";
+  version = "1.21.0";
 
   passthru.updateScript = _experimental-update-script-combinators.sequence [
     (nix-update-script { })
@@ -57,13 +57,13 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "containers";
     repo = "podman-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+UdVTTm528Q9TIZwznzseBn8JazvQJOxJyjdzBmVUaA=";
+    hash = "sha256-Wio+lETdsDhcZvluKV6gUqjT0lTE9nYL5TqPLCR4Kr0=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-GX33PE534jWX7v9jCwZALuCT6gQClBXlOTPZC09EuC8=";
+    hash = "sha256-yteFC4/raBdL4gjBtsGL/lVRpo11BuhS7Xm0mFgz3t4=";
   };
 
   patches = [

From 421c51084beac92d96ed11b3a623020f382b8c81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 01:48:26 +0000
Subject: [PATCH 2906/3724] nvc: 1.17.1 -> 1.17.2

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

diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix
index 053c21e223f0..4c336ac7fce7 100644
--- a/pkgs/by-name/nv/nvc/package.nix
+++ b/pkgs/by-name/nv/nvc/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nvc";
-  version = "1.17.1";
+  version = "1.17.2";
 
   src = fetchFromGitHub {
     owner = "nickg";
     repo = "nvc";
     tag = "r${version}";
-    hash = "sha256-5mOw69qqKabvbMCJbLoaIV8WwcRr6m4zc/lM0ssvtEw=";
+    hash = "sha256-YNbRgqJSf22YV/4e2Sr9CwKFOQcBVhS6ScDNon3yJUM=";
   };
 
   nativeBuildInputs = [

From 74ab541dfb460da2c1e7f28aa3cbb6ef472d3c48 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 22 Aug 2025 21:58:55 -0400
Subject: [PATCH 2907/3724] fromager: 0.47.0 -> 0.59.0

---
 pkgs/by-name/fr/fromager/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fr/fromager/package.nix b/pkgs/by-name/fr/fromager/package.nix
index 53fdc785c02b..f9edb2825bd1 100644
--- a/pkgs/by-name/fr/fromager/package.nix
+++ b/pkgs/by-name/fr/fromager/package.nix
@@ -6,19 +6,19 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "fromager";
-  version = "0.47.0";
+  version = "0.59.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-wheel-build";
     repo = "fromager";
     tag = version;
-    hash = "sha256-Jw5fOhY4WOwYG5QPCcsT6+BicGtqz9UrHcpPsPQlOWc=";
+    hash = "sha256-aKoZKpzgJ3e5JRYSSeLmLlji1Fj8omxvwGZfNXDOhLs=";
   };
 
   build-system = with python3.pkgs; [
-    setuptools
-    setuptools-scm
+    hatchling
+    hatch-vcs
   ];
 
   dependencies = with python3.pkgs; [
@@ -32,6 +32,7 @@ python3.pkgs.buildPythonApplication rec {
     pyproject-hooks
     pyyaml
     requests
+    requests-mock
     resolvelib
     rich
     setuptools

From 9016134aee8b0a065aa1accac33b6b17c6718016 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Fri, 22 Aug 2025 20:00:26 -0600
Subject: [PATCH 2908/3724] xbyak: 7.28 -> 7.29.2

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

diff --git a/pkgs/by-name/xb/xbyak/package.nix b/pkgs/by-name/xb/xbyak/package.nix
index b20a97aee3c1..4b8a4287008c 100644
--- a/pkgs/by-name/xb/xbyak/package.nix
+++ b/pkgs/by-name/xb/xbyak/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xbyak";
-  version = "7.28";
+  version = "7.29.2";
 
   src = fetchFromGitHub {
     owner = "herumi";
     repo = "xbyak";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jBxpNeA2Ed13zpJ++ODsjKgSC14z/RTFX3px4SapeS0=";
+    hash = "sha256-dKUb6zkMLW6VujTscD3aZdkoj5Q2Jlui/o3g8HOhZEc=";
   };
 
   nativeBuildInputs = [ cmake ];

From a20ac7df84ec8f414c00b47543a8344a4bca7972 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 23 Aug 2025 10:06:08 +0800
Subject: [PATCH 2909/3724] luau: 0.687 -> 0.688

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

diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix
index 6d1d0b5e06f4..843c368f7282 100644
--- a/pkgs/by-name/lu/luau/package.nix
+++ b/pkgs/by-name/lu/luau/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luau";
-  version = "0.687";
+  version = "0.688";
 
   src = fetchFromGitHub {
     owner = "luau-lang";
     repo = "luau";
     tag = finalAttrs.version;
-    hash = "sha256-1NGZd2oy3RovfzsrXvBwZZ9KWVO5MjWknUmvpE7bm78=";
+    hash = "sha256-JrJoFSKvy9EqsJ7jdthLmnzQqZPIsVt9aixwaWbLp8Q=";
   };
 
   nativeBuildInputs = [ cmake ];

From b29384f7f908f847580682aef11e889f04656f9b Mon Sep 17 00:00:00 2001
From: t-monaghan <tomaghan@gmail.com>
Date: Fri, 8 Aug 2025 17:44:44 +1000
Subject: [PATCH 2910/3724] sesh: fix version command and add version check

---
 pkgs/by-name/se/sesh/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix
index d3c8cdaaeed1..eda3938abb6a 100644
--- a/pkgs/by-name/se/sesh/package.nix
+++ b/pkgs/by-name/se/sesh/package.nix
@@ -2,6 +2,7 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
+  versionCheckHook,
 }:
 buildGoModule rec {
   pname = "sesh";
@@ -19,8 +20,13 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
+    "-X main.version=${version}"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckKeepEnvironment = [ "HOME" ];
+  doInstallCheck = true;
+
   meta = {
     description = "Smart session manager for the terminal";
     homepage = "https://github.com/joshmedeski/sesh";

From b9988fc383aba5d2f9b6b8b17712abae4ade5803 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 02:13:05 +0000
Subject: [PATCH 2911/3724] redpanda-client: 25.2.1 -> 25.2.2

---
 pkgs/by-name/re/redpanda-client/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix
index f53dc6069c97..f3b71d78a597 100644
--- a/pkgs/by-name/re/redpanda-client/package.nix
+++ b/pkgs/by-name/re/redpanda-client/package.nix
@@ -7,12 +7,12 @@
   stdenv,
 }:
 let
-  version = "25.2.1";
+  version = "25.2.2";
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
     rev = "v${version}";
-    sha256 = "sha256-zHhWbz2UdsZNMYNhcVBiYE5TD8mSttaD3GltE/9MOTU=";
+    sha256 = "sha256-aISbPpSgqXHmGt5H1t5AcWos+iCKgAOAl+BExYFrdAs=";
   };
 in
 buildGoModule rec {
@@ -20,7 +20,7 @@ buildGoModule rec {
   inherit doCheck src version;
   modRoot = "./src/go/rpk";
   runVend = false;
-  vendorHash = "sha256-ECShBCtZcrM+pvUQD3UZ2O6tCcOfI8WiOpDQjqKdh64=";
+  vendorHash = "sha256-izVae+BsyTT0QA/Fx7e3oxtyGisM41znDOZJchLNor8=";
 
   ldflags = [
     ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''

From 24d2d0fd641e6536518147acd39538b5f373001b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 23 Aug 2025 10:42:29 +0800
Subject: [PATCH 2912/3724] pantheon.elementary-terminal: 7.1.0 -> 7.1.1

https://github.com/elementary/terminal/compare/7.1.0...7.1.1
---
 .../pantheon/apps/elementary-terminal/default.nix  | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index c3c6458927d0..db305cd613e1 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   nix-update-script,
   pkg-config,
   meson,
@@ -22,24 +21,15 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-terminal";
-  version = "7.1.0";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "terminal";
     rev = version;
-    sha256 = "sha256-IbN01o3rojlwp4rBt8NlIPthxIPMOm/bD1rzD5Taibw=";
+    sha256 = "sha256-B/VEVS1dJQGJ8+gqgJ/mb3+r29ZPtCSSlur/CAr6BJg=";
   };
 
-  patches = [
-    # Fix incorrect line breaks when pasting/dropping into foreground processes
-    # https://github.com/elementary/terminal/pull/862
-    (fetchpatch {
-      url = "https://github.com/elementary/terminal/commit/8f93bc77437e45090e59266c7813436a0903d27b.patch";
-      hash = "sha256-4xUFnFVUV4EIDZFprEbL+S49j5Maof5/egHPVaJAVg4=";
-    })
-  ];
-
   nativeBuildInputs = [
     desktop-file-utils
     meson

From d46d689c862cb2ad010c22ee3afda6133dafafaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 Aug 2025 20:12:14 -0700
Subject: [PATCH 2913/3724] python3Packages.bonsai: 1.5.3 -> 1.5.4

Diff: https://github.com/noirello/bonsai/compare/v1.5.3...v1.5.4

Changelog: https://github.com/noirello/bonsai/blob/v1.5.4/CHANGELOG.rst
---
 pkgs/development/python-modules/bonsai/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/bonsai/default.nix b/pkgs/development/python-modules/bonsai/default.nix
index ad14127686ce..d2d0d18f187a 100644
--- a/pkgs/development/python-modules/bonsai/default.nix
+++ b/pkgs/development/python-modules/bonsai/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   setuptools,
   cyrus_sasl,
@@ -14,17 +13,14 @@
 
 buildPythonPackage rec {
   pname = "bonsai";
-  version = "1.5.3";
-
-  disabled = pythonOlder "3.8";
-
+  version = "1.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "noirello";
     repo = "bonsai";
-    rev = "v${version}";
-    hash = "sha256-SAP/YeWqow5dqXlXDzjnTWIfJhMwVeZSSUfWr1Mgmng=";
+    tag = "v${version}";
+    hash = "sha256-1AKdayvkRIY8F9UhuEvGg3uboYh7A/4BkmJ11RkYI9w=";
   };
 
   build-system = [ setuptools ];
@@ -60,7 +56,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "bonsai" ];
 
   meta = {
-    changelog = "https://github.com/noirello/bonsai/blob/${src.rev}/CHANGELOG.rst";
+    changelog = "https://github.com/noirello/bonsai/blob/${src.tag}/CHANGELOG.rst";
     description = "Python 3 module for accessing LDAP directory servers";
     homepage = "https://github.com/noirello/bonsai";
     license = lib.licenses.mit;

From b69895b85d138dc380dc1f671c3d7711f160d1cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 03:18:04 +0000
Subject: [PATCH 2914/3724] graphinder: 1.11.6 -> 2.0.0b4

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

diff --git a/pkgs/by-name/gr/graphinder/package.nix b/pkgs/by-name/gr/graphinder/package.nix
index 04a7dbe29dff..a770ed13a6ae 100644
--- a/pkgs/by-name/gr/graphinder/package.nix
+++ b/pkgs/by-name/gr/graphinder/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "graphinder";
-  version = "1.11.6";
+  version = "2.0.0b4";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Escape-Technologies";
     repo = "graphinder";
     tag = "v${version}";
-    hash = "sha256-TDc6aIFkxShlfC6fLYMKULfrFUAYhQZrIHZNDuMh68g=";
+    hash = "sha256-emBWhEJxYRAw3WTd8t+lurnHX8SeCcLBHGH9B+Owuag=";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From 47054575df7195756d6e53eb00cb76a1290181b5 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 22 Aug 2025 23:14:07 +0800
Subject: [PATCH 2915/3724] xfce.xfdashboard: 1.0.0-unstable-2025-07-18 ->
 1.1.0

http://gitlab.xfce.org/apps/xfdashboard/-/compare/93255940950ef5bc89cab729c8b977a706f98e0c...xfdashboard-1.1.0
---
 .../xfce/applications/xfdashboard/default.nix | 62 ++++++++++++++-----
 1 file changed, 48 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix
index 54101465e6c0..29df0de640a1 100644
--- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix
+++ b/pkgs/desktops/xfce/applications/xfdashboard/default.nix
@@ -1,6 +1,12 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
+  fetchFromGitLab,
+  fetchpatch,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook3,
   clutter,
   gettext,
   libXcomposite,
@@ -14,26 +20,48 @@
   xfconf,
   gtk3,
   glib,
-  dbus-glib,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
-  category = "apps";
+stdenv.mkDerivation (finalAttrs: {
   pname = "xfdashboard";
-  version = "1.0.0-unstable-2025-07-18";
-  # Fix build with gettext 0.25
-  rev = "93255940950ef5bc89cab729c8b977a706f98e0c";
-  rev-prefix = "";
+  version = "1.1.0";
 
-  sha256 = "sha256-Qv0ASuJF0FzPoeLx2D6/kXkxnOJV7mdAFD6PCk+CMac=";
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "apps";
+    repo = "xfdashboard";
+    tag = "xfdashboard-${finalAttrs.version}";
+    hash = "sha256-D8Tue+45CO5yy7sxealKQoFQZobCiDUzoxCsDksTTxI=";
+  };
+
+  patches = [
+    # Exit early if not on X11
+    (fetchpatch {
+      url = "https://gitlab.xfce.org/apps/xfdashboard/-/commit/7452a7074dfc36c5af42c4105aadaac8656c2f60.patch";
+      hash = "sha256-u0djTProV3On0uutg89Q+psgmVGJS768KwiYxZ7dhrE=";
+    })
+
+    # build: Fix version/so_version inversion
+    (fetchpatch {
+      url = "https://gitlab.xfce.org/apps/xfdashboard/-/commit/20f23e62576d186fada6688af3bb05bc7f223f44.patch";
+      hash = "sha256-C2oIBi9tfoQF123Ez3YbFUs8vX2DeYdr3BDc85ExTgQ=";
+    })
+  ];
+
+  strictDeps = true;
 
   nativeBuildInputs = [
     gettext
+    glib # glib-genmarshal
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook3
   ];
 
   buildInputs = [
     clutter
-    dbus-glib
     garcon
     glib
     gtk3
@@ -47,8 +75,14 @@ mkXfceDerivation {
     xfconf
   ];
 
-  meta = with lib; {
-    description = "Gnome shell like dashboard";
-    teams = [ teams.xfce ];
+  passthru.updateScript = gitUpdater { rev-prefix = "xfdashboard-"; };
+
+  meta = {
+    description = "GNOME shell like dashboard";
+    homepage = "https://gitlab.xfce.org/apps/xfdashboard";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "xfdashboard";
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 0425d3980c368b6b65b54ac76771df148ae33d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 Aug 2025 20:26:27 -0700
Subject: [PATCH 2916/3724] python3Packages.fints: 4.2.3 -> 4.2.4

Diff: https://github.com/raphaelm/python-fints/compare/v4.2.3...v4.2.4
---
 pkgs/development/python-modules/fints/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix
index e51e05d1d3b2..469416ab35f4 100644
--- a/pkgs/development/python-modules/fints/default.nix
+++ b/pkgs/development/python-modules/fints/default.nix
@@ -13,7 +13,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.2.3";
+  version = "4.2.4";
   pname = "fints";
   pyproject = true;
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "raphaelm";
     repo = "python-fints";
     tag = "v${version}";
-    hash = "sha256-QR5/mAll6vuP+hJo/oguynLLsGawhTQNaU6TCgww9yM=";
+    hash = "sha256-la5vpWBoZ7hZsAyjjCqHpFfOykDVosI/S9amox1dmzY=";
   };
 
   pythonRemoveDeps = [ "enum-tools" ];

From 8b685fbee0188bbae688925804678a82f391552d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 03:45:17 +0000
Subject: [PATCH 2917/3724] volctl: 0.9.4 -> 0.9.5

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

diff --git a/pkgs/by-name/vo/volctl/package.nix b/pkgs/by-name/vo/volctl/package.nix
index 57c79d878676..a1578720bd0d 100644
--- a/pkgs/by-name/vo/volctl/package.nix
+++ b/pkgs/by-name/vo/volctl/package.nix
@@ -13,14 +13,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "volctl";
-  version = "0.9.4";
+  version = "0.9.5";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "buzz";
     repo = "volctl";
     rev = "v${version}";
-    sha256 = "sha256-jzS97KV17wKeBI6deKE4rEj5lvqC38fq1JGundHn2So=";
+    sha256 = "sha256-zL1m/DeSOrNkjt9B+8pdy2jUgjSp7tt81UpAueGsIwQ=";
   };
 
   postPatch = ''

From ef42534976e60c14737c4bddc5bd821a732fdd85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 03:47:40 +0000
Subject: [PATCH 2918/3724] webcord: 4.11.0 -> 4.11.1

---
 pkgs/by-name/we/webcord/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix
index ae2a230af021..50a9de8366e1 100644
--- a/pkgs/by-name/we/webcord/package.nix
+++ b/pkgs/by-name/we/webcord/package.nix
@@ -11,16 +11,16 @@
 
 buildNpmPackage rec {
   pname = "webcord";
-  version = "4.11.0";
+  version = "4.11.1";
 
   src = fetchFromGitHub {
     owner = "SpacingBat3";
     repo = "WebCord";
     tag = "v${version}";
-    hash = "sha256-JHPvUEHBPsDqdesVifPFtg9mRwTUsln6JeXKXj/o8d8=";
+    hash = "sha256-u2Asoc5cwVRtD6yz77iJ8hA2IfVSA4iYI8snPCLufnE=";
   };
 
-  npmDepsHash = "sha256-5R3kcMZ9TsuZ89M6C3y/daEYDd/0ekRqf3uLBzSOOJA=";
+  npmDepsHash = "sha256-sREnthfmE01yzVwqMN6zbhTAquulztriytMSOcj3ZCo=";
 
   makeCacheWritable = true;
 

From 2de581e65332e7e52dd641736d42adb4bdc7d38c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 04:26:10 +0000
Subject: [PATCH 2919/3724] python3Packages.pyswitchbot: 0.68.3 -> 0.68.4

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

diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index a7aede945cea..5b1dd2d43536 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.68.3";
+  version = "0.68.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     tag = version;
-    hash = "sha256-PMwXaOIEUuJcZ8D7xuOfwTqYStqynu30wS0wWHyc2WI=";
+    hash = "sha256-B3xORFuvgVM4MoAMWWXkO5wUe1wU2gEo+NzWVikMrXg=";
   };
 
   build-system = [ setuptools ];

From 7d225596fd51f930c5a371631403c2234c3340fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 05:00:07 +0000
Subject: [PATCH 2920/3724] netavark: 1.16.0 -> 1.16.1

---
 pkgs/by-name/ne/netavark/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix
index 5607ab7fd327..0b3495e10cf6 100644
--- a/pkgs/by-name/ne/netavark/package.nix
+++ b/pkgs/by-name/ne/netavark/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "netavark";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "netavark";
     rev = "v${version}";
-    hash = "sha256-8PU6CNgpxsTwqLdLHF5cPwAe/9jUMwOBCIWeFoatXEA=";
+    hash = "sha256-8Yai0c5AHHx+xTEVH23C5dy4VXRERLeg0iIAbD/Glis=";
   };
 
-  cargoHash = "sha256-jLA0KfM/lnXrZW5yfjDBBdIb7cE3pq9puV7NDZv43SY=";
+  cargoHash = "sha256-U8rNA5sAR9+q7cWQBt18iJfnylcCq/tVLXAdxWpAhjw=";
 
   nativeBuildInputs = [
     installShellFiles

From 15b8551c882ef641c680b6ff3316d14b0a7bd7c2 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Fri, 22 Aug 2025 22:05:15 -0700
Subject: [PATCH 2921/3724] python3Packages.iglo: init at 1.2.7

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

diff --git a/pkgs/development/python-modules/iglo/default.nix b/pkgs/development/python-modules/iglo/default.nix
new file mode 100644
index 000000000000..3bac1a68efbd
--- /dev/null
+++ b/pkgs/development/python-modules/iglo/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "iglo";
+  version = "1.2.7";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jesserockz";
+    repo = "python-iglo";
+    tag = "v${version}";
+    hash = "sha256-torDjfQcQ+ytv/Qab7PNugt1eLQJ0pPPz6p4f4kcFws=";
+  };
+
+  sourceRoot = "${src.name}/src";
+
+  build-system = [ setuptools ];
+
+  # Package has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "iglo" ];
+
+  meta = {
+    description = "Library to control iGlo based RGB lights";
+    homepage = "https://github.com/jesserockz/python-iglo";
+    changelog = "https://github.com/jesserockz/python-iglo/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b9e90dcfdcb..80dce69470c1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6906,6 +6906,8 @@ self: super: with self; {
     inherit (pkgs) cgal_5 libxml2;
   };
 
+  iglo = callPackage ../development/python-modules/iglo { };
+
   igloohome-api = callPackage ../development/python-modules/igloohome-api { };
 
   ignite = callPackage ../development/python-modules/ignite { };

From a7b962d797544bcd82cc305ab8727ff76a528a33 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Fri, 22 Aug 2025 22:05:58 -0700
Subject: [PATCH 2922/3724] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index a9dd1981e23c..46963324a644 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2590,7 +2590,8 @@
       ];
     "iglo" =
       ps: with ps; [
-      ]; # missing inputs: iglo
+        iglo
+      ];
     "igloohome" =
       ps: with ps; [
         igloohome-api

From 9eaf0db452c748e1071669784cf0f87a3a2d7bc5 Mon Sep 17 00:00:00 2001
From: vik <vik@vidh.net>
Date: Fri, 22 Aug 2025 22:10:33 -0700
Subject: [PATCH 2923/3724] rclone: 1.70.3 -> 1.71.0

Diff: https://github.com/rclone/rclone/compare/v1.70.3...v1.71.0
Changelog: https://github.com/rclone/rclone/blob/v1.71.0/docs/content/changelog.md
---
 pkgs/applications/networking/sync/rclone/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 51e79dbef9b2..9d1f0d72bd68 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -17,7 +17,7 @@
 
 buildGoModule rec {
   pname = "rclone";
-  version = "1.70.3";
+  version = "1.71.0";
 
   outputs = [
     "out"
@@ -28,10 +28,10 @@ buildGoModule rec {
     owner = "rclone";
     repo = "rclone";
     tag = "v${version}";
-    hash = "sha256-3MQyziA+Xq8oSOvex4WeeXs8rPDOcSkLHUH0Fcg8ENs=";
+    hash = "sha256-qTxmcTBZzbQe0TC/MRn9KTKWb/mSWne7L1cQ79AE9bA=";
   };
 
-  vendorHash = "sha256-/A9Sq7KlHitqHxvElVMQtuXUWhweiB0ukut7AJYaJHw=";
+  vendorHash = "sha256-Hapwa+WYz6a22HauRjRUl7q0ZlwR/j/zwex0VebgC+g=";
 
   subPackages = [ "." ];
 

From b58f15124be93425978862212933814fa73f4c46 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sat, 23 Aug 2025 01:40:46 -0400
Subject: [PATCH 2924/3724] gccNGPackages_15.gcc: Fetch more patches

Another has been upstreamed, yay. And for the yet-to-be-merged ones on
top of it, we can fetch from the mailing list instead of vendoring in
Nixpkgs.
---
 ...ram-First-search-with-machine-prefix.patch | 137 ------------------
 ...pass-Pass-to-callback-whether-dir-is.patch | 103 -------------
 ...nly-search-for-prefixed-paths-in-und.patch |  75 ----------
 .../compilers/gcc/ng/common/gcc/default.nix   |  29 +++-
 .../compilers/gcc/ng/common/patches.nix       |  25 ----
 5 files changed, 26 insertions(+), 343 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/ng/15/gcc/0001-find_a_program-First-search-with-machine-prefix.patch
 delete mode 100644 pkgs/development/compilers/gcc/ng/15/gcc/0002-driver-for_each_pass-Pass-to-callback-whether-dir-is.patch
 delete mode 100644 pkgs/development/compilers/gcc/ng/15/gcc/0003-find_a_program-Only-search-for-prefixed-paths-in-und.patch

diff --git a/pkgs/development/compilers/gcc/ng/15/gcc/0001-find_a_program-First-search-with-machine-prefix.patch b/pkgs/development/compilers/gcc/ng/15/gcc/0001-find_a_program-First-search-with-machine-prefix.patch
deleted file mode 100644
index 46eb8d03b89a..000000000000
--- a/pkgs/development/compilers/gcc/ng/15/gcc/0001-find_a_program-First-search-with-machine-prefix.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 3af17de3a5f6acd5a2f9340d84b8667459f43eea Mon Sep 17 00:00:00 2001
-From: John Ericson <git@JohnEricson.me>
-Date: Wed, 18 Aug 2021 01:55:31 -0400
-Subject: [PATCH 1/3] find_a_program: First search with machine prefix
-
-This matches the behavior of Clang, and makes it easier to work with
-cross compilers without heeding to hard-code paths at build time.
----
- gcc/gcc.cc | 78 +++++++++++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 68 insertions(+), 10 deletions(-)
-
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 4fd87f2c4a1..55738d258b3 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1600,6 +1600,11 @@ static const char *machine_suffix = 0;
- 
- static const char *just_machine_suffix = 0;
- 
-+/* Prefix to attach to *basename* of commands being searched.
-+   This is just `MACHINE-'.  */
-+
-+static const char *just_machine_prefix = 0;
-+
- /* Adjusted value of GCC_EXEC_PREFIX envvar.  */
- 
- static const char *gcc_exec_prefix;
-@@ -3043,15 +3048,6 @@ file_at_path (char *path, void *data)
-   memcpy (path + len, info->name, info->name_len);
-   len += info->name_len;
- 
--  /* Some systems have a suffix for executable files.
--     So try appending that first.  */
--  if (info->suffix_len)
--    {
--      memcpy (path + len, info->suffix, info->suffix_len + 1);
--      if (access_check (path, info->mode) == 0)
--	return path;
--    }
--
-   path[len] = '\0';
-   if (access_check (path, info->mode) == 0)
-     return path;
-@@ -3091,12 +3087,52 @@ find_a_file (const struct path_prefix *pprefix, const char *name, int mode,
- 				file_at_path, &info);
- }
- 
-+/* Callback for find_a_program.  Appends the file name to the directory
-+   path. Like file_at_path but tries machine prefix and exe suffix too. */
-+
-+static void *
-+program_at_path (char *path, void *data)
-+{
-+  /* try first with machine-prefixed name */
-+  struct file_at_path_info *info = (struct file_at_path_info *) data;
-+  size_t path_len = strlen (path);
-+
-+  for (auto prefix : { just_machine_prefix, "" })
-+    {
-+      auto len = path_len;
-+
-+      auto prefix_len = strlen(prefix);
-+      memcpy (path + len, prefix, prefix_len);
-+      len += prefix_len;
-+
-+      memcpy (path + len, info->name, info->name_len);
-+      len += info->name_len;
-+
-+      /* Some systems have a suffix for executable files.
-+	 So try appending that first.  */
-+      if (info->suffix_len)
-+	{
-+	  memcpy (path + len, info->suffix, info->suffix_len + 1);
-+	  if (access_check (path, info->mode) == 0)
-+	    return path;
-+	}
-+
-+      path[len] = '\0';
-+      if (access_check (path, info->mode) == 0)
-+	return path;
-+    }
-+
-+  return NULL;
-+}
-+
- /* Specialization of find_a_file for programs that also takes into account
-    configure-specified default programs. */
- 
- static char*
- find_a_program (const char *name)
- {
-+  const int mode = X_OK;
-+
-   /* Do not search if default matches query. */
- 
- #ifdef DEFAULT_ASSEMBLER
-@@ -3114,7 +3150,28 @@ find_a_program (const char *name)
-     return xstrdup (DEFAULT_DSYMUTIL);
- #endif
- 
--  return find_a_file (&exec_prefixes, name, X_OK, false);
-+  /* Find the filename in question (special case for absolute paths).  */
-+
-+  if (IS_ABSOLUTE_PATH (name))
-+    {
-+      if (access (name, mode) == 0)
-+	return xstrdup (name);
-+
-+      return NULL;
-+    }
-+
-+  struct file_at_path_info info;
-+
-+  info.name = name;
-+  info.suffix = HOST_EXECUTABLE_SUFFIX;
-+  info.name_len = strlen (info.name);
-+  info.suffix_len = strlen (info.suffix);
-+  info.mode = mode;
-+
-+  return (char*) for_each_path (
-+    &exec_prefixes, false,
-+    info.name_len + info.suffix_len + strlen(just_machine_prefix),
-+    program_at_path, &info);
- }
- 
- /* Ranking of prefixes in the sort list. -B prefixes are put before
-@@ -8492,6 +8549,7 @@ driver::set_up_specs () const
-   machine_suffix = concat (spec_host_machine, dir_separator_str, spec_version,
- 			   accel_dir_suffix, dir_separator_str, NULL);
-   just_machine_suffix = concat (spec_machine, dir_separator_str, NULL);
-+  just_machine_prefix = concat (spec_machine, "-", NULL);
- 
-   specs_file = find_a_file (&startfile_prefixes, "specs", R_OK, true);
-   /* Read the specs file unless it is a default one.  */
--- 
-2.47.2
-
diff --git a/pkgs/development/compilers/gcc/ng/15/gcc/0002-driver-for_each_pass-Pass-to-callback-whether-dir-is.patch b/pkgs/development/compilers/gcc/ng/15/gcc/0002-driver-for_each_pass-Pass-to-callback-whether-dir-is.patch
deleted file mode 100644
index e0f295f8b88c..000000000000
--- a/pkgs/development/compilers/gcc/ng/15/gcc/0002-driver-for_each_pass-Pass-to-callback-whether-dir-is.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 8e1b7a128a69393c6d3f53b8f66bd52c6bbce908 Mon Sep 17 00:00:00 2001
-From: John Ericson <git@JohnEricson.me>
-Date: Wed, 18 Aug 2021 01:55:45 -0400
-Subject: [PATCH 2/3] driver: for_each_pass: Pass to callback whether dir is
- machine-disambiguated
-
-We will use this in the subsequent diff to control what basenames we
-search for. In machine-specific subdirectories, we should just look for
-the original basename, but in machine-agnostic subdirectories, we might
-additionally look for prefixed disambiguated names, as an alternate
-method of keeping targets apart.
----
- gcc/gcc.cc | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 55738d258b3..f9f83d1a804 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -2783,7 +2783,7 @@ static void *
- for_each_path (const struct path_prefix *paths,
- 	       bool do_multi,
- 	       size_t extra_space,
--	       void *(*callback) (char *, void *),
-+	       void *(*callback) (char *, bool, void *),
- 	       void *callback_info)
- {
-   struct prefix_list *pl;
-@@ -2844,7 +2844,7 @@ for_each_path (const struct path_prefix *paths,
- 	  if (!skip_multi_dir)
- 	    {
- 	      memcpy (path + len, multi_suffix, suffix_len + 1);
--	      ret = callback (path, callback_info);
-+	      ret = callback (path, true, callback_info);
- 	      if (ret)
- 		break;
- 	    }
-@@ -2855,7 +2855,7 @@ for_each_path (const struct path_prefix *paths,
- 	      && pl->require_machine_suffix == 2)
- 	    {
- 	      memcpy (path + len, just_multi_suffix, just_suffix_len + 1);
--	      ret = callback (path, callback_info);
-+	      ret = callback (path, true, callback_info);
- 	      if (ret)
- 		break;
- 	    }
-@@ -2865,7 +2865,7 @@ for_each_path (const struct path_prefix *paths,
- 	      && !pl->require_machine_suffix && multiarch_dir)
- 	    {
- 	      memcpy (path + len, multiarch_suffix, multiarch_len + 1);
--	      ret = callback (path, callback_info);
-+	      ret = callback (path, true, callback_info);
- 	      if (ret)
- 		break;
- 	    }
-@@ -2893,7 +2893,7 @@ for_each_path (const struct path_prefix *paths,
- 	      else
- 		path[len] = '\0';
- 
--	      ret = callback (path, callback_info);
-+	      ret = callback (path, false, callback_info);
- 	      if (ret)
- 		break;
- 	    }
-@@ -2948,7 +2948,7 @@ struct add_to_obstack_info {
- };
- 
- static void *
--add_to_obstack (char *path, void *data)
-+add_to_obstack (char *path, bool, void *data)
- {
-   struct add_to_obstack_info *info = (struct add_to_obstack_info *) data;
- 
-@@ -3040,7 +3040,7 @@ struct file_at_path_info {
- };
- 
- static void *
--file_at_path (char *path, void *data)
-+file_at_path (char *path, bool, void *data)
- {
-   struct file_at_path_info *info = (struct file_at_path_info *) data;
-   size_t len = strlen (path);
-@@ -3091,7 +3091,7 @@ find_a_file (const struct path_prefix *pprefix, const char *name, int mode,
-    path. Like file_at_path but tries machine prefix and exe suffix too. */
- 
- static void *
--program_at_path (char *path, void *data)
-+program_at_path (char *path, bool machine_specific, void *data)
- {
-   /* try first with machine-prefixed name */
-   struct file_at_path_info *info = (struct file_at_path_info *) data;
-@@ -6074,7 +6074,7 @@ struct spec_path_info {
- };
- 
- static void *
--spec_path (char *path, void *data)
-+spec_path (char *path, bool, void *data)
- {
-   struct spec_path_info *info = (struct spec_path_info *) data;
-   size_t len = 0;
--- 
-2.47.2
-
diff --git a/pkgs/development/compilers/gcc/ng/15/gcc/0003-find_a_program-Only-search-for-prefixed-paths-in-und.patch b/pkgs/development/compilers/gcc/ng/15/gcc/0003-find_a_program-Only-search-for-prefixed-paths-in-und.patch
deleted file mode 100644
index 8fd83506b4d4..000000000000
--- a/pkgs/development/compilers/gcc/ng/15/gcc/0003-find_a_program-Only-search-for-prefixed-paths-in-und.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From e1ee1a2df1ad32de24e8fdaeac0a533681710578 Mon Sep 17 00:00:00 2001
-From: John Ericson <git@JohnEricson.me>
-Date: Wed, 18 Aug 2021 01:55:52 -0400
-Subject: [PATCH 3/3] find_a_program: Only search for prefixed paths in
- undisambiguated dirs
-
-This means, we might search for:
-
-- path/$machine/$version/prog
-- path/$machine/prog
-- path/$machine-prog
-
-But not
-
-- path/$machine/$version/$machine-prog
-
-because disambiguating $machine twice is unnecessary.
-
-This does mean we less liberal in what we accept than LLVM, but that's
-OK. The down side of always Postel's law is everyone converges on
-accepting all sorts of garbage, which makes debugging end-to-end hard
-when mistakes are not caught early.
----
- gcc/gcc.cc | 25 ++++++++++++++++---------
- 1 file changed, 16 insertions(+), 9 deletions(-)
-
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index f9f83d1a804..d837b6ea779 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -3097,15 +3097,9 @@ program_at_path (char *path, bool machine_specific, void *data)
-   struct file_at_path_info *info = (struct file_at_path_info *) data;
-   size_t path_len = strlen (path);
- 
--  for (auto prefix : { just_machine_prefix, "" })
-+  auto search = [=](size_t len) -> void *
-     {
--      auto len = path_len;
--
--      auto prefix_len = strlen(prefix);
--      memcpy (path + len, prefix, prefix_len);
--      len += prefix_len;
--
--      memcpy (path + len, info->name, info->name_len);
-+      memcpy (path + len, info->name, info->name_len + 1);
-       len += info->name_len;
- 
-       /* Some systems have a suffix for executable files.
-@@ -3120,9 +3114,22 @@ program_at_path (char *path, bool machine_specific, void *data)
-       path[len] = '\0';
-       if (access_check (path, info->mode) == 0)
- 	return path;
-+
-+      return NULL;
-+    };
-+
-+  /* Additionally search for $target-prog in machine-agnostic dirs, as an
-+     additional way to disambiguate targets. Do not do this in machine-specific
-+     dirs because so further disambiguation is needed. */
-+  if (!machine_specific)
-+    {
-+      auto prefix_len = strlen(just_machine_prefix);
-+      memcpy (path + path_len, just_machine_prefix, prefix_len);
-+      auto res = search(path_len + prefix_len);
-+      if (res) return res;
-     }
- 
--  return NULL;
-+  return search(path_len);
- }
- 
- /* Specialization of find_a_file for programs that also takes into account
--- 
-2.47.2
-
diff --git a/pkgs/development/compilers/gcc/ng/common/gcc/default.nix b/pkgs/development/compilers/gcc/ng/common/gcc/default.nix
index 3d8ef0d8300e..fe4688a96beb 100644
--- a/pkgs/development/compilers/gcc/ng/common/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/ng/common/gcc/default.nix
@@ -5,6 +5,7 @@
   release_version,
   version,
   monorepoSrc ? null,
+  fetchpatch,
   langAda ? false,
   langC ? true,
   langCC ? true,
@@ -49,9 +50,31 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
-    (getVersionFile "gcc/0001-find_a_program-First-search-with-machine-prefix.patch")
-    (getVersionFile "gcc/0002-driver-for_each_pass-Pass-to-callback-whether-dir-is.patch")
-    (getVersionFile "gcc/0003-find_a_program-Only-search-for-prefixed-paths-in-und.patch")
+    (fetchpatch {
+      name = "for_each_path-functional-programming.patch";
+      url = "https://github.com/gcc-mirror/gcc/commit/f23bac62f46fc296a4d0526ef54824d406c3756c.diff";
+      hash = "sha256-J7SrypmVSbvYUzxWWvK2EwEbRsfGGLg4vNZuLEe6Xe0=";
+    })
+    (fetchpatch {
+      name = "find_a_program-separate-from-find_a_file.patch";
+      url = "https://inbox.sourceware.org/gcc-patches/20250822234120.1988059-1-git@JohnEricson.me/raw";
+      hash = "sha256-0gaWaeFZq+a8q7Bcr3eILNjHh1LfzL/Lz4F+W+H6XIU=";
+    })
+    (fetchpatch {
+      name = "simplify-find_a_program-and-find_a_file.patch";
+      url = "https://inbox.sourceware.org/gcc-patches/20250822234120.1988059-2-git@JohnEricson.me/raw";
+      hash = "sha256-ojdyszxLGL+njHK4eAaeBkxAhFTDI57j6lGuAf0A+N0=";
+    })
+    (fetchpatch {
+      name = "for_each_path-pass-machine-specific.patch";
+      url = "https://inbox.sourceware.org/gcc-patches/20250822234120.1988059-3-git@JohnEricson.me/raw";
+      hash = "sha256-C5jUSyNchmZcE8RTXc2dHfCqNKuBHeiouLruK9UooSM=";
+    })
+    (fetchpatch {
+      name = "find_a_program-search-with-machine-prefix.patch";
+      url = "https://inbox.sourceware.org/gcc-patches/20250822234120.1988059-4-git@JohnEricson.me/raw";
+      hash = "sha256-MwcO4OXPlcdaSYivsh5ru+Cfq6qybeAtgCgTEPGYg40=";
+    })
 
     (getVersionFile "gcc/fix-collect2-paths.diff")
   ];
diff --git a/pkgs/development/compilers/gcc/ng/common/patches.nix b/pkgs/development/compilers/gcc/ng/common/patches.nix
index 81d3be9f68bf..4c1fdd822510 100644
--- a/pkgs/development/compilers/gcc/ng/common/patches.nix
+++ b/pkgs/development/compilers/gcc/ng/common/patches.nix
@@ -7,31 +7,6 @@
     }
   ];
 
-  # Submitted (001--003):
-  #  - https://gcc.gnu.org/pipermail/gcc-patches/2021-August/577639.html
-  #  - https://gcc.gnu.org/pipermail/gcc-patches/2021-August/577640.html
-  #  - https://gcc.gnu.org/pipermail/gcc-patches/2021-August/577638.html
-  #
-  # In Git: https://github.com/Ericson2314/gcc/tree/prog-target-15
-  "gcc/0001-find_a_program-First-search-with-machine-prefix.patch" = [
-    {
-      after = "15";
-      path = ../15;
-    }
-  ];
-  "gcc/0002-driver-for_each_pass-Pass-to-callback-whether-dir-is.patch" = [
-    {
-      after = "15";
-      path = ../15;
-    }
-  ];
-  "gcc/0003-find_a_program-Only-search-for-prefixed-paths-in-und.patch" = [
-    {
-      after = "15";
-      path = ../15;
-    }
-  ];
-
   # In Git: https://github.com/Ericson2314/gcc/tree/regular-dirs-in-libgcc-15
   "libgcc/force-regular-dirs.patch" = [
     {

From eec675b6adcea13f843dcaa877063c0852b23a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 23 Aug 2025 08:02:53 +0200
Subject: [PATCH 2925/3724] Revert "python3Packages.thinc: 8.3.6 -> 9.1.1"

This reverts commit 89af1fa9f97aff0171cbc60ba2af2eeb68615971.

https://hydra.nixos.org/build/305213285/nixlog/2/tail
I tried applying a patch, but that wouldn't fix the build:
https://github.com/explosion/thinc/commit/47d8e1067de1fc994711a55d4d

Also note that upstream considers 8.3.6 to be the latest version now:
https://github.com/explosion/thinc/releases/latest
---
 pkgs/development/python-modules/thinc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 37115ac988aa..b577d4cbf2b2 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -22,12 +22,12 @@
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "9.1.1";
+  version = "8.3.6";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-IfrimG13d6bwULkEbcnqsRhS8cmpl9zJAy8+zCJ4Sko=";
+    hash = "sha256-SZg/m33cQ0OpUyaUqRGN0hbXpgBSCiGEmkO2wmjsbK0=";
   };
 
   build-system = [

From 9d45bc2ab26493467f828bc6a6a0be8676c0dfcf Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Fri, 22 Aug 2025 23:06:29 -0700
Subject: [PATCH 2926/3724] python3Packages.proliphix: init at 0.5.0

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

diff --git a/pkgs/development/python-modules/proliphix/default.nix b/pkgs/development/python-modules/proliphix/default.nix
new file mode 100644
index 000000000000..cc5ef5f923d2
--- /dev/null
+++ b/pkgs/development/python-modules/proliphix/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pytestCheckHook,
+  requests,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "proliphix";
+  version = "0.5.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-Tf6gTRofZXY6ikrXBARgp6grzZGQMjvN5njT+7SRZNQ=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "proliphix" ];
+
+  meta = {
+    description = "API for Proliphix nt10e network thermostat";
+    homepage = "https://github.com/sdague/proliphix";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b9e90dcfdcb..6891e36fd7c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12040,6 +12040,8 @@ self: super: with self; {
 
   progressbar33 = callPackage ../development/python-modules/progressbar33 { };
 
+  proliphix = callPackage ../development/python-modules/proliphix { };
+
   prometheus-api-client = callPackage ../development/python-modules/prometheus-api-client { };
 
   prometheus-async = callPackage ../development/python-modules/prometheus-async { };

From 0cf818c9549b4156256e3068e20d3339bf87b352 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Fri, 22 Aug 2025 23:07:16 -0700
Subject: [PATCH 2927/3724] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index a9dd1981e23c..ae5735e52435 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -4613,7 +4613,8 @@
       ]; # missing inputs: ProgettiHWSW
     "proliphix" =
       ps: with ps; [
-      ]; # missing inputs: proliphix
+        proliphix
+      ];
     "prometheus" =
       ps: with ps; [
         prometheus-client

From 14b17996f5db7fce779111b85659fb56d4b7542e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 23 Aug 2025 08:16:30 +0200
Subject: [PATCH 2928/3724] python3Packages.libarchive-c: patch to build on
 darwin

https://hydra.nixos.org/build/304767823/nixlog/4/tail
I'm not sure why the issue doesn't happen on linux.
---
 pkgs/development/python-modules/libarchive-c/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix
index 286148a639a7..f72bf7b43cdc 100644
--- a/pkgs/development/python-modules/libarchive-c/default.nix
+++ b/pkgs/development/python-modules/libarchive-c/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   libarchive,
   glibcLocales,
   mock,
@@ -21,6 +22,14 @@ buildPythonPackage rec {
     sha256 = "sha256-JqXTV1aD3k88OlW+8rT3xsDuW34+1xErG7hkupvL7Uo=";
   };
 
+  patches = [
+    # https://github.com/Changaco/python-libarchive-c/pull/141
+    (fetchpatch {
+      url = "https://github.com/Changaco/python-libarchive-c/commit/e0e2a47b2403632642ee932dd56acd11e4a79efe.diff";
+      hash = "sha256-C9eD4cGQOIdBYy4ytom49lA/Jaarj7LbSIgjxCk/H84=";
+    })
+  ];
+
   LC_ALL = "en_US.UTF-8";
 
   postPatch = ''

From 729428cb73f221293a0c728692d9bbee9498eba7 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Fri, 22 Aug 2025 23:26:45 -0700
Subject: [PATCH 2929/3724] python3Packages.scsgate: init at 0.1.0

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

diff --git a/pkgs/development/python-modules/scsgate/default.nix b/pkgs/development/python-modules/scsgate/default.nix
new file mode 100644
index 000000000000..f61d14a5d418
--- /dev/null
+++ b/pkgs/development/python-modules/scsgate/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pyserial,
+  pyyaml,
+  setuptools,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "scsgate";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "flavio";
+    repo = "scsgate";
+    tag = version;
+    hash = "sha256-wVzXKOKljENAKppod+guqm+0XMPenLgOsZzMQVTBo+k=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pyserial
+    pyyaml
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "scsgate" ];
+
+  meta = {
+    description = "Python module to interact with SCSGate";
+    homepage = "https://github.com/flavio/scsgate";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b9e90dcfdcb..e32c66fec9ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16301,6 +16301,8 @@ self: super: with self; {
 
   scs = callPackage ../development/python-modules/scs { };
 
+  scsgate = callPackage ../development/python-modules/scsgate { };
+
   scspell = callPackage ../development/python-modules/scspell { };
 
   sdbus = callPackage ../development/python-modules/sdbus { };

From 1032226300af52698d73c446fa38c47afc9030c3 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Fri, 22 Aug 2025 23:27:28 -0700
Subject: [PATCH 2930/3724] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index a9dd1981e23c..560b7f2c4490 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -5167,7 +5167,8 @@
       ];
     "scsgate" =
       ps: with ps; [
-      ]; # missing inputs: scsgate
+        scsgate
+      ];
     "search" =
       ps: with ps; [
       ];

From f20cf1ddcacb3899a4da60d41f0330f13f2d6c98 Mon Sep 17 00:00:00 2001
From: HHR2020 <76608828+HHR2020@users.noreply.github.com>
Date: Fri, 22 Aug 2025 20:06:21 +0800
Subject: [PATCH 2931/3724] clash-verge-rev: 2.3.2 -> 2.4.0

Fix verge-mihomo.sock socket path for the new version.

Changelog: https://github.com/clash-verge-rev/clash-verge-rev/releases/tag/v2.4.0
---
 pkgs/by-name/cl/clash-verge-rev/package.nix   | 8 ++++----
 pkgs/by-name/cl/clash-verge-rev/unwrapped.nix | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix
index a225bc3477ab..a966acc355dc 100644
--- a/pkgs/by-name/cl/clash-verge-rev/package.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/package.nix
@@ -12,13 +12,13 @@
 }:
 let
   pname = "clash-verge-rev";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "clash-verge-rev";
     repo = "clash-verge-rev";
     tag = "v${version}";
-    hash = "sha256-Wdd1iZspVcCxifCYvST4vlatQJXnyeZkm3Ifc8Q2xtM=";
+    hash = "sha256-Kw2QXePBjDs0kUMPLE7UyN/v9GvsMNYi1rxcy+O6EWs=";
   };
 
   src-service = fetchFromGitHub {
@@ -29,8 +29,8 @@ let
   };
 
   service-cargo-hash = "sha256-HET7/Lyc0Ip1f9WMVzUWr0QFuL8YN3dgZdK0adl/rYc=";
-  pnpm-hash = "sha256-yizUju+AswVkbfPMxNhHkrkKsFIe7yedEUqS15uy+V0=";
-  vendor-hash = "sha256-u2y0fSx15Kbe3auL7c4enW0y6z4gjvTg4WIGkmXpMmI=";
+  pnpm-hash = "sha256-O6JO5sW3eKjOPcnu2JDnXEUnR2Yma+SkRMOfEjG5X/E=";
+  vendor-hash = "sha256-kUPzKfrcMaGAMGzYy666I9l3ctac7b1xTCO8oMA9fYg=";
 
   service = callPackage ./service.nix {
     inherit
diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
index d5a97ec6dc47..58b985d92210 100644
--- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
@@ -52,6 +52,12 @@ rustPlatform.buildRustPackage {
     # See service.nix for reasons
     substituteInPlace src-tauri/src/core/service_ipc.rs \
       --replace-fail "/tmp/clash-verge-service.sock" "/run/clash-verge-rev/service.sock"
+    # Set verge-mihomo.sock path
+    # In service mode, use /run/clash-verge-rev
+    # In sidecar mode, use $XDG_RUNTIME_DIR or /run/user/$UID or /tmp
+    substituteInPlace src-tauri/src/utils/dirs.rs \
+      --replace-fail '"/var/tmp", "/tmp"' '"/run/clash-verge-rev", &std::env::var("XDG_RUNTIME_DIR").unwrap_or_else(|_| std::env::var("UID").map(|uid| format!("/run/user/{}", uid)).unwrap_or_else(|_| "/tmp".to_string()))' \
+      --replace-fail 'base_dir.join("verge")' 'base_dir'
 
     substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
       --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"

From 700035a4fc4629947895aea7ef39628ee4b8bf80 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Fri, 22 Aug 2025 23:43:52 -0700
Subject: [PATCH 2932/3724] python3Packages.btlewrap: init at 0.1.1

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

diff --git a/pkgs/development/python-modules/btlewrap/default.nix b/pkgs/development/python-modules/btlewrap/default.nix
new file mode 100644
index 000000000000..b0d91e996dfe
--- /dev/null
+++ b/pkgs/development/python-modules/btlewrap/default.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  bluepy,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "btlewrap";
+  version = "0.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ChristianKuehnel";
+    repo = "btlewrap";
+    tag = "v${version}";
+    hash = "sha256-cjPj+Uw/L9kq/BbxlnOCJtaBcnf9VOJKN2NJ3cmKe6U=";
+  };
+
+  build-system = [ setuptools ];
+
+  optional-dependencies = {
+    bluepy = [ bluepy ];
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  disabledTestPaths = [
+    # Require optional dependencies or hardware
+    "test/unit_tests/test_bluepy.py"
+    "test/unit_tests/test_pygatt.py"
+    "test/integration_tests/"
+    "test/unit_tests/test_available_backends.py"
+  ];
+
+  pythonImportsCheck = [ "btlewrap" ];
+
+  meta = {
+    description = "Wrapper around different bluetooth low energy backends";
+    homepage = "https://github.com/ChristianKuehnel/btlewrap";
+    changelog = "https://github.com/ChristianKuehnel/btlewrap/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b9e90dcfdcb..188a8e13cfbc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2168,6 +2168,8 @@ self: super: with self; {
 
   bthomehub5-devicelist = callPackage ../development/python-modules/bthomehub5-devicelist { };
 
+  btlewrap = callPackage ../development/python-modules/btlewrap { };
+
   btrees = callPackage ../development/python-modules/btrees { };
 
   btrfs = callPackage ../development/python-modules/btrfs { };

From 8f4f6cbc7d45a305f7cb6f5d44573773fd2ff05d Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Fri, 22 Aug 2025 23:44:10 -0700
Subject: [PATCH 2933/3724] python3Packages.beewi-smartclim: init at 0.0.10

---
 .../beewi-smartclim/default.nix               | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/beewi-smartclim/default.nix

diff --git a/pkgs/development/python-modules/beewi-smartclim/default.nix b/pkgs/development/python-modules/beewi-smartclim/default.nix
new file mode 100644
index 000000000000..083894116408
--- /dev/null
+++ b/pkgs/development/python-modules/beewi-smartclim/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  btlewrap,
+  bluepy,
+}:
+
+buildPythonPackage rec {
+  pname = "beewi-smartclim";
+  version = "0.0.10";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "alemuro";
+    repo = "beewi_smartclim";
+    tag = version;
+    hash = "sha256-xdr545Q4DFhup2BCMZZ1WYWgt97qT6oipIHWcsp90+A=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    btlewrap
+    bluepy
+  ];
+
+  # No tests available
+  doCheck = false;
+
+  pythonImportsCheck = [ "beewi_smartclim" ];
+
+  meta = {
+    description = "Library to read data from BeeWi SmartClim sensor using Bluetooth LE";
+    homepage = "https://github.com/alemuro/beewi_smartclim";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 188a8e13cfbc..fcae6d76cb26 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1803,6 +1803,8 @@ self: super: with self; {
 
   beetcamp = callPackage ../development/python-modules/beetcamp { };
 
+  beewi-smartclim = callPackage ../development/python-modules/beewi-smartclim { };
+
   before-after = callPackage ../development/python-modules/before-after { };
 
   behave = callPackage ../development/python-modules/behave { };

From 3e2f7638bf295952d06e02a8e75ae74aac99d08b Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Fri, 22 Aug 2025 23:44:52 -0700
Subject: [PATCH 2934/3724] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index a9dd1981e23c..e6bd3686baa4 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -562,7 +562,8 @@
       ];
     "beewi_smartclim" =
       ps: with ps; [
-      ]; # missing inputs: beewi-smartclim
+        beewi-smartclim
+      ];
     "bge" =
       ps: with ps; [
       ];

From bb78e709c53067e84306005b1e746648acbf6384 Mon Sep 17 00:00:00 2001
From: L-Trump <ltrump@163.com>
Date: Sat, 23 Aug 2025 14:47:21 +0800
Subject: [PATCH 2935/3724] easytier: 2.4.1 -> 2.4.2

---
 pkgs/by-name/ea/easytier/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix
index e76bfd0c977b..e4b2e131b4c4 100644
--- a/pkgs/by-name/ea/easytier/package.nix
+++ b/pkgs/by-name/ea/easytier/package.nix
@@ -11,16 +11,24 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "easytier";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "EasyTier";
     repo = "EasyTier";
     tag = "v${version}";
-    hash = "sha256-H7mFBARxElegXeUsp+wTHy8X19Lk5FUL3GuU88+8UVs=";
+    hash = "sha256-N/WOkCaAEtPXJWdZ2452KTQmfFu+tZcH267p3azyntQ=";
   };
 
-  cargoHash = "sha256-BNEc4R3Jzqx4ncMmmeZygM8peHqHGZ/HMy4eJyuvxv0=";
+  # remove if rust 1.89 merged
+  postPatch = ''
+    substituteInPlace easytier/Cargo.toml \
+      --replace-fail 'rust-version = "1.89.0"' ""
+    substituteInPlace easytier-rpc-build/Cargo.toml \
+      --replace-fail 'rust-version = "1.89.0"' ""
+  '';
+
+  cargoHash = "sha256-Z4Q8ZPXPpA5OHkP2j389a6/Cdn9VmULf8sr1vPTelnw=";
 
   nativeBuildInputs = [
     protobuf

From 698ca750ea6c0557c0d8f59b4cae54676974924e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 06:48:45 +0000
Subject: [PATCH 2936/3724] vscode: 1.103.1 -> 1.103.2

---
 pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 1bfa8a5c7874..4a09cbb4c1e1 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -36,20 +36,20 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-0zM9dyK226l4RgF1H81ojp5HC25snaN5K1QCnWIw/nw=";
-      x86_64-darwin = "sha256-PpThKF6TKp7hcku8QEsVYhQYVwgiVFaCWSgNI6Vo2+s=";
-      aarch64-linux = "sha256-bv9WsrvvlUc4PCKNZmsFBXQD6le5Ier1nm5qaXD2Mic=";
-      aarch64-darwin = "sha256-5wWmlgarDlWvk2Y4HRk00/oi0WcjDmnT7YL2Z1rfJ+Y=";
-      armv7l-linux = "sha256-hSYqK1hXg3nfxz344XdLrnWfixmlqbJUpI68PCcfF+I=";
+      x86_64-linux = "sha256-vlmvPk2ljwdDklGygdxmtodPzGB+gNjwEaaVp3N+fQI=";
+      x86_64-darwin = "sha256-k1W/85ehc8YXBKSac+E9aoV2AEif85iyTqqxEZ3MNr8=";
+      aarch64-linux = "sha256-26QfnBYm1Rx1Udzk4dtpNOUSpuDqpIkimv0QlkcnsAg=";
+      aarch64-darwin = "sha256-au/H0QxWb9KwuJkJVV+gVyjUlArziV0zptrAlBtt9f0=";
+      armv7l-linux = "sha256-VRbzwhoqrLCdGbAYRkzVMzVjg8pioRhvKTvV3F+tjjE=";
     }
     .${system} or throwSystem;
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.103.1";
+  version = "1.103.2";
 
   # This is used for VS Code - Remote SSH test
-  rev = "e3550cfac4b63ca4eafca7b601f0d2885817fd1f";
+  rev = "6f17636121051a53c88d3e605c491d22af2ba755";
 in
 callPackage ./generic.nix {
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
@@ -82,7 +82,7 @@ callPackage ./generic.nix {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      hash = "sha256-GEN8WMPaYhwQsgml3tXWJP7F4RXH5vy6Ht0RUGauxnw=";
+      hash = "sha256-6E/rh22SC97uzkDsLMsrard9kbfSanuUcAImrV69JLw=";
     };
     stdenv = stdenvNoCC;
   };

From 3a2ece762eb14a50010435401848ac4409ceb08b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 23 Aug 2025 09:49:27 +0300
Subject: [PATCH 2937/3724] nixos/all-tests: delete deleted test

---
 nixos/tests/all-tests.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9631036f035c..7c05d24a793f 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1187,7 +1187,6 @@ in
   pingvin-share = runTest ./pingvin-share.nix;
   pinnwand = runTest ./pinnwand.nix;
   plantuml-server = runTest ./plantuml-server.nix;
-  plasma-bigscreen = runTest ./plasma-bigscreen.nix;
   plasma6 = runTest ./plasma6.nix;
   plausible = runTest ./plausible.nix;
   playwright-python = runTest ./playwright-python.nix;

From d45f0927dee1f27a3b5f11893eb3c2d2f1f1d85c Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 23 Aug 2025 08:58:15 +0200
Subject: [PATCH 2938/3724] xee: remove build.rs git workaround

---
 pkgs/by-name/xe/xee/package.nix | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/pkgs/by-name/xe/xee/package.nix b/pkgs/by-name/xe/xee/package.nix
index 932546c2c8f0..e8d4eca6fc60 100644
--- a/pkgs/by-name/xe/xee/package.nix
+++ b/pkgs/by-name/xe/xee/package.nix
@@ -24,25 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "xee"
   ];
 
-  nativeBuildInputs = [
-    # "${cargoDeps}/build-data-0.2.1/src/lib.rs" is pretty terrible
-    (writers.writePython3Bin "git" { } ''
-      import sys
-      import os
-      sys.argv[0] = os.path.basename(sys.argv[0])
-      if sys.argv == ["git", "rev-parse", "HEAD"]:
-          print("${finalAttrs.src.rev}")
-      elif sys.argv == ["git", "rev-parse", "--abbrev-ref=loose", "HEAD"]:
-          print("${finalAttrs.src.rev}")
-      elif sys.argv == ["git", "status", "-s"]:
-          pass
-      elif sys.argv == ["git", "log", "-1", "--pretty=%ct"]:
-          print(os.environ.get("SOURCE_DATE_EPOCH", "0"))
-      else:
-          raise RuntimeError(sys.argv[1:])
-    '')
-  ];
-
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";

From 248e39ec23c64a0322108017f1bd1f7cab400b07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 07:06:39 +0000
Subject: [PATCH 2939/3724] python3Packages.sourmash: 4.8.14 -> 4.9.4

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

diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix
index ef8d8b23171f..513b03db10bc 100644
--- a/pkgs/development/python-modules/sourmash/default.nix
+++ b/pkgs/development/python-modules/sourmash/default.nix
@@ -21,18 +21,18 @@
 }:
 buildPythonPackage rec {
   pname = "sourmash";
-  version = "4.8.14";
+  version = "4.9.4";
   pyproject = true;
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-no99VjO1KVE+/JUOJcl0xOz3yZtMr70A8vE1rQVjMH8=";
+    hash = "sha256-KIidEQQeOYgxh1x9F6Nn4+WTewldAGdS5Fx/IwL0Ym0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-DnJ0RFc03+rBg7yNdezgb/YuoQr3RKj+NeMyin/kSRk=";
+    hash = "sha256-/tVuR31T38/xx1+jglSGECAT1GmQEddQp9o6zAqlPyY=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From 2a2113379eccb33de954a33ebf62352764ce86d0 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Tue, 12 Aug 2025 00:33:44 +0900
Subject: [PATCH 2940/3724] process-compose: 1.64.1 -> 1.73.0

https://github.com/F1bonacc1/process-compose/releases/tag/v1.73.0

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/pr/process-compose/package.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix
index 00d8baa134bf..48b697e5c9e9 100644
--- a/pkgs/by-name/pr/process-compose/package.nix
+++ b/pkgs/by-name/pr/process-compose/package.nix
@@ -2,7 +2,6 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  fetchpatch2,
   installShellFiles,
 }:
 
@@ -11,13 +10,13 @@ let
 in
 buildGoModule rec {
   pname = "process-compose";
-  version = "1.64.1";
+  version = "1.73.0";
 
   src = fetchFromGitHub {
     owner = "F1bonacc1";
     repo = "process-compose";
     tag = "v${version}";
-    hash = "sha256-qv/fVfuQD7Nan5Nn1RkwXoGZuPYSRWQaojEn6MCF9BQ=";
+    hash = "sha256-oqScez+Ms01/TyGo3HmhtEgofIbpLqQtEyQH6kxVGrw=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -30,15 +29,6 @@ buildGoModule rec {
     '';
   };
 
-  patches = [
-    # Fix a linker issue with dlopen on x86_64-darwin
-    # https://github.com/f1bonacc1/process-compose/pull/342
-    (fetchpatch2 {
-      url = "https://github.com/F1bonacc1/process-compose/commit/af82749c5dacaa20f2c3b07ca4e081d1b38e40c4.patch";
-      hash = "sha256-5Hgvwn2GEp/lINPefxXdJUGb2TJfufqAPm+/3gdi6XY=";
-    })
-  ];
-
   # ldflags based on metadata from git and source
   preBuild = ''
     ldflags+=" -X ${config-module}.Commit=$(cat COMMIT)"
@@ -55,7 +45,7 @@ buildGoModule rec {
     installShellFiles
   ];
 
-  vendorHash = "sha256-qkfJo+QGqcqiZMLuWbj0CpgRWxbqTu6DGAW8pBu4O/0=";
+  vendorHash = "sha256-fV0yuANSZyJlPGZ/nt5q9Bz6ps5bKM8gtLmNmfPMMoU=";
 
   doCheck = false;
 

From 247a8f015b6d7d16b5c41df3e6141722afa19db2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 23 Aug 2025 09:28:53 +0200
Subject: [PATCH 2941/3724] python313Packages.tencentcloud-sdk-python: 3.0.1446
 -> 3.0.1447

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1447/CHANGELOG.md
---
 .../tencentcloud-sdk-python/default.nix             | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 9e16ce250940..aedbf0a959f4 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -3,23 +3,20 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
   requests,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1446";
+  version = "3.0.1447";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-+lYLCcuM1BX80qEKYoYe/Zuqlk/QbebGICgoLqNbhts=";
+    hash = "sha256-JNuw+Zv5w674Q+cOd78e/5Sj1G+dHJ4cwJoLtjnX2NU=";
   };
 
   build-system = [ setuptools ];
@@ -32,6 +29,12 @@ buildPythonPackage rec {
 
   enabledTestPaths = [ "tests/unit/" ];
 
+  disabledTests = [
+    # KeyError
+    "test_sts_credential_with_default_endpoint"
+    "test_sts_credential_with_set_endpoint"
+  ];
+
   meta = with lib; {
     description = "Tencent Cloud API 3.0 SDK for Python";
     homepage = "https://github.com/TencentCloud/tencentcloud-sdk-python";

From 19a760df2d40f0f41baa8fa899f3fc2342c5ab0d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 17:32:39 +1000
Subject: [PATCH 2942/3724] github-runner: 2.327.1 -> 2.328.0 (#435227)

---
 pkgs/by-name/gi/github-runner/deps.json   | 42 +++++++++++------------
 pkgs/by-name/gi/github-runner/package.nix |  4 +--
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/gi/github-runner/deps.json b/pkgs/by-name/gi/github-runner/deps.json
index cc73b54f8081..6146f1957680 100644
--- a/pkgs/by-name/gi/github-runner/deps.json
+++ b/pkgs/by-name/gi/github-runner/deps.json
@@ -6,13 +6,13 @@
   },
   {
     "pname": "Azure.Storage.Blobs",
-    "version": "12.24.0",
-    "hash": "sha256-PcI3Jf9VrDfkr0YfoR89us45HE1DE8g5J3ZpZ8vZkLs="
+    "version": "12.25.0",
+    "hash": "sha256-SjIwM1sIBd4I9ShAeaIAfPUzc3K7tbodW6y1vNAD+4U="
   },
   {
     "pname": "Azure.Storage.Common",
-    "version": "12.23.0",
-    "hash": "sha256-DAMzFlls76hH5jtXtU89SvbQWhhELaQq+PfG4SK7W+Q="
+    "version": "12.24.0",
+    "hash": "sha256-ZjeMv8xaZXkmb1OgZlN9uJelhAcU7KhO/FK02qiz/zA="
   },
   {
     "pname": "Castle.Core",
@@ -31,13 +31,13 @@
   },
   {
     "pname": "Microsoft.CodeCoverage",
-    "version": "17.13.0",
-    "hash": "sha256-GKrIxeyQo5Az1mztfQgea1kGtJwonnNOrXK/0ULfu8o="
+    "version": "17.14.1",
+    "hash": "sha256-f8QytG8GvRoP47rO2KEmnDLxIpyesaq26TFjDdW40Gs="
   },
   {
     "pname": "Microsoft.NET.Test.Sdk",
-    "version": "17.13.0",
-    "hash": "sha256-sc2wvyV8cGm1FrNP2GGHEI584RCvRPu15erYCsgw5QY="
+    "version": "17.14.1",
+    "hash": "sha256-mZUzDFvFp7x1nKrcnRd0hhbNu5g8EQYt8SKnRgdhT/A="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
@@ -96,13 +96,13 @@
   },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "17.13.0",
-    "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk="
+    "version": "17.14.1",
+    "hash": "sha256-QMf6O+w0IT+16Mrzo7wn+N20f3L1/mDhs/qjmEo1rYs="
   },
   {
     "pname": "Microsoft.TestPlatform.TestHost",
-    "version": "17.13.0",
-    "hash": "sha256-L/CJzou7dhmShUgXq3aXL3CaLTJll17Q+JY2DBdUUpo="
+    "version": "17.14.1",
+    "hash": "sha256-1cxHWcvHRD7orQ3EEEPPxVGEkTpxom1/zoICC9SInJs="
   },
   {
     "pname": "Microsoft.Win32.Primitives",
@@ -134,11 +134,6 @@
     "version": "1.5.0-rc2-24027",
     "hash": "sha256-lddIyqj8Y3IexOm5I1hsE5w1/dOoOaNDHoUPI1vkX80="
   },
-  {
-    "pname": "Newtonsoft.Json",
-    "version": "13.0.1",
-    "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
-  },
   {
     "pname": "Newtonsoft.Json",
     "version": "13.0.3",
@@ -449,6 +444,11 @@
     "version": "4.3.0",
     "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
   },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "8.0.0",
+    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
+  },
   {
     "pname": "System.Console",
     "version": "4.0.0-rc2-24027",
@@ -576,8 +576,8 @@
   },
   {
     "pname": "System.IO.Hashing",
-    "version": "6.0.0",
-    "hash": "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE="
+    "version": "8.0.0",
+    "hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="
   },
   {
     "pname": "System.Linq",
@@ -661,8 +661,8 @@
   },
   {
     "pname": "System.Reflection.Metadata",
-    "version": "1.6.0",
-    "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
+    "version": "8.0.0",
+    "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
   },
   {
     "pname": "System.Reflection.Primitives",
diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index 2f41b1ce826d..776c86e6a945 100644
--- a/pkgs/by-name/gi/github-runner/package.nix
+++ b/pkgs/by-name/gi/github-runner/package.nix
@@ -25,13 +25,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
 
 buildDotnetModule (finalAttrs: {
   pname = "github-runner";
-  version = "2.327.1";
+  version = "2.328.0";
 
   src = fetchFromGitHub {
     owner = "actions";
     repo = "runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wTbhuBg9eIq1wGifeORTUvp9+yWDHb42J88o2Fmnrfo=";
+    hash = "sha256-3Q2bscLKdUBPx+5X0qxwtcy3CU6N/wE8yO1CcATSyBQ=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git-revision

From 226476dc5efcebbc6120ae79fb0316fcb1d61e75 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 23 Aug 2025 09:34:41 +0200
Subject: [PATCH 2943/3724] python313Packages.govee-ble: update disabled

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

diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix
index ada45324e92c..3413143a8fc2 100644
--- a/pkgs/development/python-modules/govee-ble/default.nix
+++ b/pkgs/development/python-modules/govee-ble/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   version = "0.45.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";

From 9ef783d06da93f05afddb3a8df41fcb1987b5cfb Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 23 Aug 2025 10:40:49 +0300
Subject: [PATCH 2944/3724] python313Packages.django-cachalot: actually use
 pytestCheckHook, skip broken tests

---
 .../django-cachalot/default.nix               | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix
index 7d8377e74039..37e126c50621 100644
--- a/pkgs/development/python-modules/django-cachalot/default.nix
+++ b/pkgs/development/python-modules/django-cachalot/default.nix
@@ -56,19 +56,23 @@ buildPythonPackage rec {
   # redisTestHook does not work on darwin
   doCheck = !stdenv.hostPlatform.isDarwin;
 
-  # disable broken pinning test
   preCheck = ''
-    substituteInPlace cachalot/tests/read.py \
-      --replace-fail \
-        "def test_explain(" \
-        "def _test_explain("
+    export DJANGO_SETTINGS_MODULE=settings
   '';
 
-  checkPhase = ''
-    runHook preCheck
-    ${python.interpreter} runtests.py
-    runHook postCheck
-  '';
+  pytestFlags = [
+    "-o python_files=*.py"
+    "-o collect_imported_tests=false"
+    "cachalot/tests"
+    "cachalot/admin_tests"
+  ];
+
+  disabledTests = [
+    # relies on specific EXPLAIN output format from sqlite, which is not stable
+    "test_explain"
+    # broken on django-debug-toolbar 6.0
+    "test_rendering"
+  ];
 
   meta = with lib; {
     description = "No effort, no worry, maximum performance";

From 21dda58bd7d947ba1ee05bcca222d49eacc109d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 07:45:34 +0000
Subject: [PATCH 2945/3724] ngtcp2-gnutls: 1.14.0 -> 1.15.0

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

diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix
index 66d343bac07d..2576638a9b9f 100644
--- a/pkgs/development/libraries/ngtcp2/gnutls.nix
+++ b/pkgs/development/libraries/ngtcp2/gnutls.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ngtcp2";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = "ngtcp2";
     rev = "v${version}";
-    hash = "sha256-TpfCfVhguFbTqQiY+zl6Kn7fsIQHR1tvNC4YLkxmBis=";
+    hash = "sha256-/4nnKkc50Dye3fTRPDr3YnjpwBOM9WpgS123y72O/Qo=";
   };
 
   outputs = [

From 8852657baec91e6f1a6164d371bf6cfe3084738b Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Tue, 1 Jul 2025 01:17:37 -0600
Subject: [PATCH 2946/3724] comaps: init at 2025.08.13-8

---
 pkgs/by-name/co/comaps/package.nix            | 106 ++++++++++++++++++
 pkgs/by-name/co/comaps/remove-lto.patch       |  33 ++++++
 .../co/comaps/use-vendored-protobuf.patch     |  24 ++++
 3 files changed, 163 insertions(+)
 create mode 100644 pkgs/by-name/co/comaps/package.nix
 create mode 100644 pkgs/by-name/co/comaps/remove-lto.patch
 create mode 100644 pkgs/by-name/co/comaps/use-vendored-protobuf.patch

diff --git a/pkgs/by-name/co/comaps/package.nix b/pkgs/by-name/co/comaps/package.nix
new file mode 100644
index 000000000000..73d71e7bd8ea
--- /dev/null
+++ b/pkgs/by-name/co/comaps/package.nix
@@ -0,0 +1,106 @@
+{
+  lib,
+  organicmaps,
+  fetchurl,
+  fetchFromGitea,
+  boost,
+  gtest,
+  glm,
+  gflags,
+  imgui,
+  jansson,
+  python3,
+  optipng,
+  utf8cpp,
+  nix-update-script,
+}:
+let
+  mapRev = 250804;
+
+  worldMap = fetchurl {
+    url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/World.mwm";
+    hash = "sha256-xYMH3y0Y6sSXYUTpy+A5YCyb+n5YChOXhyDvUFqXxZ0=";
+  };
+
+  worldCoasts = fetchurl {
+    url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/WorldCoasts.mwm";
+    hash = "sha256-2vc4kkNX9bRTqXYlALfwVwOlvr122kvUk7pUyM91vjc=";
+  };
+in
+organicmaps.overrideAttrs (oldAttrs: rec {
+  pname = "comaps";
+  version = "2025.08.13-8";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "comaps";
+    repo = "comaps";
+    tag = "v${version}";
+    hash = "sha256-kvE3H+siV/8v4WgsG1Ifd4gMMwGLqz28oXf1hB9gQ2Q=";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    ./remove-lto.patch
+    ./use-vendored-protobuf.patch
+  ];
+
+  postPatch = (oldAttrs.postPatch or "") + ''
+    rm -f 3party/boost/b2
+  '';
+
+  nativeBuildInputs = (builtins.filter (x: x != python3) oldAttrs.nativeBuildInputs or [ ]) ++ [
+    (python3.withPackages (
+      ps: with ps; [
+        protobuf
+      ]
+    ))
+    optipng
+  ];
+
+  buildInputs = (oldAttrs.buildInputs or [ ]) ++ [
+    boost
+    gtest
+    gflags
+    glm
+    imgui
+    jansson
+    utf8cpp
+  ];
+
+  preConfigure = ''
+    bash ./configure.sh --skip-map-download
+  '';
+
+  cmakeFlags = [
+    (lib.cmakeBool "WITH_SYSTEM_PROVIDED_3PARTY" true)
+  ];
+
+  env = {
+    NIX_CFLAGS_COMPILE = toString [
+      "-I/build/source/3party/fast_double_parser/include"
+    ];
+    PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+  };
+
+  postInstall = ''
+    install -Dm644 ${worldMap} $out/share/comaps/data/World.mwm
+    install -Dm644 ${worldCoasts} $out/share/comaps/data/WorldCoasts.mwm
+    ln -s $out/bin/CoMaps $out/bin/comaps
+  '';
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "-vr"
+      "v(.*)"
+    ];
+  };
+
+  meta = oldAttrs.meta // {
+    description = "Community-led fork of Organic Maps";
+    homepage = "https://comaps.app";
+    changelog = "https://codeberg.org/comaps/comaps/releases/tag/v${version}";
+    maintainers = [ lib.maintainers.ryand56 ];
+    mainProgram = "comaps";
+  };
+})
diff --git a/pkgs/by-name/co/comaps/remove-lto.patch b/pkgs/by-name/co/comaps/remove-lto.patch
new file mode 100644
index 000000000000..8959eed2af12
--- /dev/null
+++ b/pkgs/by-name/co/comaps/remove-lto.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c559bf5..42ed617 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,7 +106,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+ elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
+   add_definitions(-DRELEASE)
+   if (NOT MSVC)
+-    add_compile_options(-O3 $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)
++    add_compile_options(-O3)
+   endif()
+ else()
+   message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})
+@@ -116,19 +116,6 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
+   add_compile_options(-fno-omit-frame-pointer)
+ endif()
+ 
+-# Linux GCC LTO plugin fix.
+-if (PLATFORM_LINUX AND (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_BUILD_TYPE MATCHES "^Rel"))
+-  # To force errors if LTO was not enabled.
+-  add_compile_options(-fno-fat-lto-objects)
+-  # To fix ar and ranlib "plugin needed to handle lto object".
+-  string(REGEX MATCH "[0-9]+" GCC_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})
+-  file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}/liblto_plugin.so)
+-  set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
+-  set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
+-  set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
+-  set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
+-endif()
+-
+ message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
+ 
+ if (PLATFORM_LINUX OR PLATFORM_ANDROID)
diff --git a/pkgs/by-name/co/comaps/use-vendored-protobuf.patch b/pkgs/by-name/co/comaps/use-vendored-protobuf.patch
new file mode 100644
index 000000000000..01527c53b2a8
--- /dev/null
+++ b/pkgs/by-name/co/comaps/use-vendored-protobuf.patch
@@ -0,0 +1,24 @@
+diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
+index 5178ae0..abe103f 100644
+--- a/3party/CMakeLists.txt
++++ b/3party/CMakeLists.txt
+@@ -41,9 +41,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
+   # Add pugixml library.
+   add_subdirectory(pugixml)
+
+-  # Add protobuf library.
+-  add_subdirectory(protobuf)
+-
+   if (NOT PLATFORM_LINUX)
+     add_subdirectory(freetype)
+     add_subdirectory(icu)
+@@ -55,6 +52,9 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
+   target_include_directories(utf8cpp INTERFACE "${OMIM_ROOT}/3party/utfcpp/source")
+ endif()
+
++# Add protobuf library.
++add_subdirectory(protobuf)
++
+ add_subdirectory(agg)
+ add_subdirectory(bsdiff-courgette)
+ add_subdirectory(minizip)

From 7b81b01833df10ca60340793a67f4b205ec2f7a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 07:52:53 +0000
Subject: [PATCH 2947/3724] python3Packages.djangocms-alias: 2.0.4 -> 2.0.5

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

diff --git a/pkgs/development/python-modules/djangocms-alias/default.nix b/pkgs/development/python-modules/djangocms-alias/default.nix
index e6b1fc9815ca..16a0ac09a369 100644
--- a/pkgs/development/python-modules/djangocms-alias/default.nix
+++ b/pkgs/development/python-modules/djangocms-alias/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "djangocms-alias";
-  version = "2.0.4";
+  version = "2.0.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "django-cms";
     repo = "djangocms-alias";
     tag = version;
-    hash = "sha256-0lIhPgI+HbAKX9wEpZ/v40OHvN6WWK9ehFxIcpzdcq8=";
+    hash = "sha256-sMMqX4+R4VZveIEV779WqYnZYH/fqZihyxFDAKwlWn0=";
   };
 
   build-system = [ setuptools ];

From 413b9e7efc02554bb3dc1837aa9627c1ebcd8723 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 23 Aug 2025 10:57:25 +0300
Subject: [PATCH 2948/3724] paperless-ngx: drop merged patch

---
 pkgs/by-name/pa/paperless-ngx/package.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 607adc324deb..f191fea5795a 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -152,15 +152,6 @@ python.pkgs.buildPythonApplication rec {
 
   inherit version src;
 
-  # Manual partial backport of:
-  # - https://github.com/paperless-ngx/paperless-ngx/commit/9889c59d3daa8f4ac8ec2400c00ddc36a7ca63c9
-  # - https://github.com/paperless-ngx/paperless-ngx/pull/10538
-  # Fixes build with latest dependency versions.
-  # FIXME: remove in next update
-  patches = [
-    ./dep-updates.patch
-  ];
-
   postPatch = ''
     # pytest-xdist with to many threads makes the tests flaky
     if (( $NIX_BUILD_CORES > 3)); then

From 63d5e1a5245e0f976a3b2dd425fe362191c447ab Mon Sep 17 00:00:00 2001
From: Ladas552 <l.tokshalov@gmail.com>
Date: Sat, 23 Aug 2025 13:04:32 +0500
Subject: [PATCH 2949/3724] nixos/mympd: new documentation links

---
 nixos/modules/services/audio/mympd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/audio/mympd.nix b/nixos/modules/services/audio/mympd.nix
index d6507133366d..3e728abaa4de 100644
--- a/nixos/modules/services/audio/mympd.nix
+++ b/nixos/modules/services/audio/mympd.nix
@@ -61,7 +61,7 @@ in
               description = ''
                 Whether to enable listening on the SSL port.
 
-                Refer to <https://jcorporation.github.io/myMPD/configuration/configuration-files#ssl-options>
+                Refer to <https://jcorporation.github.io/myMPD/020-configuration/configuration-files#ssl-options>
                 for more information.
               '';
               default = false;
@@ -70,7 +70,7 @@ in
         };
         description = ''
           Manages the configuration files declaratively. For all the configuration
-          options, see <https://jcorporation.github.io/myMPD/configuration/configuration-files>.
+          options, see <https://jcorporation.github.io/myMPD/020-configuration/configuration-files>.
 
           Each key represents the "File" column from the upstream configuration table, and the
           value is the content of that file.

From af2826cf7d00a21c078ff5c8718e4ae05ed8f97c Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 23 Aug 2025 08:15:10 +0200
Subject: [PATCH 2950/3724] linux_xanmod: 6.12.42 -> 6.12.43

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

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index f81265b76aac..dd1c9a1f12b9 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,8 +15,8 @@ let
   variants = {
     # ./update-xanmod.sh lts
     lts = {
-      version = "6.12.42";
-      hash = "sha256-q/a6ik5kKRKOcbmGxGBdCDW3dsgIDf/7tvEpcGjDrHI=";
+      version = "6.12.43";
+      hash = "sha256-Jc3VKpUaIc1nBbbCZ/jAx/kteuQBQBO6TEPlaNq8Jrk=";
     };
     # ./update-xanmod.sh main
     main = {

From 792d8f00f4d116878f8b5956aabd3e026b4527c0 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 23 Aug 2025 08:17:01 +0200
Subject: [PATCH 2951/3724] linux_xanmod_latest: 6.15.10 -> 6.15.11

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

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index dd1c9a1f12b9..37f23057c66f 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -20,8 +20,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "6.15.10";
-      hash = "sha256-6ed820JXJr7QqOX3IiF50SFrYeVrx0xCh73zrlmMy5I=";
+      version = "6.15.11";
+      hash = "sha256-251rQqXkzLzmgl1uqN3mvXlkIbH+B25C30hMJ6v4tBE=";
     };
   };
 

From 0e683c50bb9a6ba61899f44d6c68850d4a016f40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 09:01:33 +0000
Subject: [PATCH 2952/3724] python3Packages.tesla-fleet-api: 1.2.3 -> 1.2.4

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

diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix
index c14561dabd4c..202e9a2f2917 100644
--- a/pkgs/development/python-modules/tesla-fleet-api/default.nix
+++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "tesla-fleet-api";
-  version = "1.2.3";
+  version = "1.2.4";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "Teslemetry";
     repo = "python-tesla-fleet-api";
     tag = "v${version}";
-    hash = "sha256-mNqntKsZeUZOhfquyaA+6IC29XnCf/a5FIm0cFzHg/M=";
+    hash = "sha256-h6MGYzDNzEss5FIf+2J5oROQw/7OVLpkXuheYKd4BrQ=";
   };
 
   build-system = [ setuptools ];

From bfd9268302cda22ec3bf50454b0e83bd4b90284d Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 23 Aug 2025 11:03:51 +0200
Subject: [PATCH 2953/3724] nginxMainline: 1.27.5 -> 1.29.1

This change was already accepted in #433600 but reverted in
106b1418bc30cbae35addcb643a883e22de9573b.

Changes:
```
Changes with nginx 1.29.1                                        13 Aug 2025

    *) Security: processing of a specially crafted login/password when using
       the "none" authentication method in the ngx_mail_smtp_module might
       cause worker process memory disclosure to the authentication server
       (CVE-2025-53859).

    *) Change: now TLSv1.3 certificate compression is disabled by default.

    *) Feature: the "ssl_certificate_compression" directive.

    *) Feature: support for 0-RTT in QUIC when using OpenSSL 3.5.1 or newer.

    *) Bugfix: the 103 response might be buffered when using HTTP/2 and the
       "early_hints" directive.

    *) Bugfix: in handling "Host" and ":authority" header lines with equal
       values when using HTTP/2; the bug had appeared in 1.17.9.

    *) Bugfix: in handling "Host" header lines with a port when using
       HTTP/3.

    *) Bugfix: nginx could not be built on NetBSD 10.0.

    *) Bugfix: in the "none" parameter of the "smtp_auth" directive.

Changes with nginx 1.29.0                                        24 Jun 2025

    *) Feature: support for response code 103 from proxy and gRPC backends;
       the "early_hints" directive.

    *) Feature: loading of secret keys from hardware tokens with OpenSSL
       provider.

    *) Feature: support for the "so_keepalive" parameter of the "listen"
       directive on macOS.

    *) Change: the logging level of SSL errors in a QUIC handshake has been
       changed from "error" to "crit" for critical errors, and to "info" for
       the rest; the logging level of unsupported QUIC transport parameters
       has been lowered from "info" to "debug".

    *) Change: the native nginx/Windows binary release is now built using
       Windows SDK 10.

    *) Bugfix: nginx could not be built by gcc 15 if ngx_http_v2_module or
       ngx_http_v3_module modules were used.

    *) Bugfix: nginx might not be built by gcc 14 or newer with -O3 -flto
       optimization if ngx_http_v3_module was used.

    *) Bugfixes and improvements in HTTP/3.
```
---
 pkgs/servers/http/nginx/generic.nix  | 7 -------
 pkgs/servers/http/nginx/mainline.nix | 4 ++--
 pkgs/servers/http/nginx/stable.nix   | 9 ++++++++-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index d339daba8b9f..34356f77fab4 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -218,13 +218,6 @@ stdenv.mkDerivation {
         ./nix-etag-1.15.4.patch
         ./nix-skip-check-logs-path.patch
       ]
-      ++ lib.optionals (!lib.versionAtLeast version "1.29.1") [
-        (fetchpatch {
-          name = "CVE-2025-53859.patch";
-          url = "https://nginx.org/download/patch.2025.smtp.txt";
-          hash = "sha256-v49sLskFNMoKuG8HQISw8ST7ga6DS+ngJiL0D3sUyGk=";
-        })
-      ]
       ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
         (fetchpatch {
           url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/102-sizeof_test_fix.patch";
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index e4ece30ec374..dece0210839e 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix args {
-  version = "1.27.5";
-  hash = "sha256-6WrOu5wqbbigAMPdGzLsuhuBDwzVhiMtTZIeN2Z03Q4=";
+  version = "1.29.1";
+  hash = "sha256-xYn35+2AHdvZBK+/PeJq4k6wzOJ8dxei6U33+xLWrSc=";
 }
diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix
index d38c5d9f27cd..458d907357ea 100644
--- a/pkgs/servers/http/nginx/stable.nix
+++ b/pkgs/servers/http/nginx/stable.nix
@@ -1,6 +1,13 @@
-{ callPackage, ... }@args:
+{ callPackage, fetchpatch, ... }@args:
 
 callPackage ./generic.nix args {
   version = "1.28.0";
   hash = "sha256-xrXGsIbA3508o/9eCEwdDvkJ5gOCecccHD6YX1dv92o=";
+  extraPatches = [
+    (fetchpatch {
+      name = "CVE-2025-53859.patch";
+      url = "https://nginx.org/download/patch.2025.smtp.txt";
+      hash = "sha256-v49sLskFNMoKuG8HQISw8ST7ga6DS+ngJiL0D3sUyGk=";
+    })
+  ];
 }

From 2f68ce7bfc24b55c7e7ee6ed95bde6e19692ebfe Mon Sep 17 00:00:00 2001
From: MidAutumnMoon <me@418.im>
Date: Sat, 23 Aug 2025 17:07:19 +0800
Subject: [PATCH 2954/3724] python312Packages.discid: use pyproject to fix
 build failure

---
 pkgs/development/python-modules/discid/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix
index 75439108a15b..e2cfa9a0670b 100644
--- a/pkgs/development/python-modules/discid/default.nix
+++ b/pkgs/development/python-modules/discid/default.nix
@@ -4,18 +4,23 @@
   libdiscid,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "discid";
   version = "1.3.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-cWChIRrD1qbYIT+4jdPXPjKr5eATNqWkyYWwgql9QzU=";
   };
 
+  build-system = [
+    setuptools
+  ];
+
   patchPhase =
     let
       extension = stdenv.hostPlatform.extensions.sharedLibrary;

From 9aa687472ec943f0725d1283d68a3fd67f122ddc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Aug 2025 11:59:23 +0000
Subject: [PATCH 2955/3724] python3Packages.omemo: 1.2.0 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/omemo/default.nix b/pkgs/development/python-modules/omemo/default.nix
index 6da744b55618..8f4fa6a957df 100644
--- a/pkgs/development/python-modules/omemo/default.nix
+++ b/pkgs/development/python-modules/omemo/default.nix
@@ -10,20 +10,23 @@
 
   pytestCheckHook,
   oldmemo,
+  twomemo,
+  pytest-asyncio,
+  pytest-cov-stub,
 
   # passthru
   omemo,
 }:
 buildPythonPackage rec {
   pname = "omemo";
-  version = "1.2.0";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Syndace";
     repo = "python-omemo";
     tag = "v${version}";
-    hash = "sha256-egb4UFoF/gS3LKutArnJSXxDYH/xyBLOxWec98rOT9Y=";
+    hash = "sha256-uA8Nv8xT6ROlE9eM/Oz2j5HsYtvWzKEu7DSd/ws+WZY=";
   };
 
   build-system = [
@@ -40,6 +43,9 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     oldmemo
+    twomemo
+    pytest-asyncio
+    pytest-cov-stub
   ]
   ++ oldmemo.optional-dependencies.xml;
 

From 00228c484066671006291460fcc68aa5178a8203 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 22 Aug 2025 20:16:58 +0200
Subject: [PATCH 2956/3724] python3Packages.oldmemo: 1.2.0 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/oldmemo/default.nix b/pkgs/development/python-modules/oldmemo/default.nix
index cb1eb2f29008..4152ab68500a 100644
--- a/pkgs/development/python-modules/oldmemo/default.nix
+++ b/pkgs/development/python-modules/oldmemo/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "oldmemo";
-  version = "1.1.0";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Syndace";
     repo = "python-oldmemo";
     tag = "v${version}";
-    hash = "sha256-iAsp42VcGsf3Nhk0I97Wi3SlpLxcA6BkVaFm1yY0HrY=";
+    hash = "sha256-upgpyNoyBUg4IskF2DeQGOwm2h+hydO9lBoIHgwho28=";
   };
 
   build-system = [

From cc35ff8ed3690a4a196dbc62ec8e96cc8fc13a83 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 22 Aug 2025 20:17:05 +0200
Subject: [PATCH 2957/3724] python3Packages.twomemo: 1.2.0 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/twomemo/default.nix b/pkgs/development/python-modules/twomemo/default.nix
index a61db1d57e10..4dfbe7e1b9c4 100644
--- a/pkgs/development/python-modules/twomemo/default.nix
+++ b/pkgs/development/python-modules/twomemo/default.nix
@@ -13,14 +13,14 @@
 }:
 buildPythonPackage rec {
   pname = "twomemo";
-  version = "1.1.0";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Syndace";
     repo = "python-twomemo";
     tag = "v${version}";
-    hash = "sha256-jkazeFdNK0iB76oyHbQu+TLaGz+SH/30CmqXk0K6Sy8=";
+    hash = "sha256-TNM7CLxo4C55APuL5BAts8kTyCl2SDajqwkaXxwK19E=";
   };
 
   strictDeps = true;

From 2b96c79244ded28eafb90b2f7fd2b651a627ff5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 23 Aug 2025 11:15:54 +0200
Subject: [PATCH 2958/3724] Revert "buildMozillaMach: use nss-esr for 140esr
 and older"

This reverts commit c4a261a0519d1353b86a02d3e0f67d9aad75ff3d.
We need to postpone this after updating nss-esr to fix 140esr build
https://github.com/NixOS/nixpkgs/pull/435439#discussion_r2295299515
---
 pkgs/build-support/build-mozilla-mach/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index b7feccb768c0..75e94c5ccfd8 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -577,7 +577,7 @@ buildStdenv.mkDerivation {
       xorg.xorgproto
       zlib
       (
-        if (lib.versionAtLeast version "141") then nss_latest else nss_esr # 3.90
+        if (lib.versionAtLeast version "129") then nss_latest else nss_esr # 3.90
       )
     ]
     ++ lib.optional alsaSupport alsa-lib

From 474f47c12326f52338c0e226b3c5f5aad72717c6 Mon Sep 17 00:00:00 2001
From: Louis Bailleau <louis13.bailleau@gmail.com>
Date: Sat, 23 Aug 2025 11:09:45 +0200
Subject: [PATCH 2959/3724] microsoft-edge: 139.0.3405.104 -> 139.0.3405.111

---
 pkgs/by-name/mi/microsoft-edge/package.nix | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 5a0971829d4b..2361333a8112 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -6,7 +6,6 @@
   patchelf,
   bintools,
   dpkg,
-
   # Linked dynamic libraries.
   alsa-lib,
   at-spi2-atk,
@@ -47,20 +46,15 @@
   pipewire,
   vulkan-loader,
   wayland, # ozone/wayland
-
   # Command line programs
   coreutils,
-
   # command line arguments which are always set e.g "--disable-gpu"
   commandLineArgs ? "",
-
   # Will crash without.
   systemd,
-
   # Loaded at runtime.
   libexif,
   pciutils,
-
   # Additional dependencies according to other distros.
   ## Ubuntu
   curl,
@@ -79,34 +73,25 @@
   ## Gentoo
   bzip2,
   libcap,
-
   # Necessary for USB audio devices.
   libpulseaudio,
   pulseSupport ? true,
-
   adwaita-icon-theme,
   gsettings-desktop-schemas,
-
   # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder)
   libva,
   libvaSupport ? true,
-
   # For Vulkan support (--enable-features=Vulkan)
   addDriverRunpath,
-
   # For QT support
   qt6,
-
   # Edge AAD sync
   cacert,
   libsecret,
-
   # Edge Specific
   libuuid,
 }:
-
 let
-
   opusWithCustomModes = libopus.override { withCustomModes = true; };
 
   deps = [
@@ -175,14 +160,13 @@ let
   ++ lib.optionals pulseSupport [ libpulseaudio ]
   ++ lib.optionals libvaSupport [ libva ];
 in
-
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "139.0.3405.102";
+  version = "139.0.3405.111";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-rY6Q3sMIAGX/ZKOVvwSl6cxq24SB1PiCn7b1pMXMeps=";
+    hash = "sha256-1hsvzvaVCDSWGEpqMjsrz7V9Ra+PtoZ//lSXSlmS3FI=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From d91402763eaa74b13551619201d4b5185e94f700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Sat, 23 Aug 2025 10:35:57 +0100
Subject: [PATCH 2960/3724] claude-code: 1.0.88 -> 1.0.89

---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 03c66386adeb..c77985e6e156 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -6,13 +6,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.88"
+        "@anthropic-ai/claude-code": "^1.0.89"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.88",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.88.tgz",
-      "integrity": "sha512-Np6H4EjkbmNolUpx98DvqLXV/iJrw2y7dz2rDJ7av9ajMz6HZfB8bdJV5D75+jO+Gk1pvA54HCIm0c65lDrzcw==",
+      "version": "1.0.89",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.89.tgz",
+      "integrity": "sha512-FKzFA0whQ1oVqdq3HG7gE3aojcZfGxrhza9z7OMDUFm4YMADHQxn6TWxWss5dhzXze7vd+QOn8CuH+uHnhAr4w==",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 7ef65342b038..157fa465f60a 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.88";
+  version = "1.0.89";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-o0A9P0sBB2Fk18CArGGv/QBi55ZtFgoJ2/3gHlDwyEU=";
+    hash = "sha256-ULOL4emd7VZNvHD5Hk3YI1Cyb1Q1YMCcDDxlRDUM1dc=";
   };
 
-  npmDepsHash = "sha256-KONgl7DYG8Fj7JM6+hUZBQ+ETTNAPEimdIgseQ1bptQ=";
+  npmDepsHash = "sha256-qoPyOrtuYTLwnqROVqjXapKgaGb7k31/hBwEA0V9FUQ=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From f056e4a287d51964d5bba72019e3c20fe0a93199 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 23 Aug 2025 11:46:48 +0200
Subject: [PATCH 2961/3724] zizmor: 1.11.0 -> 1.12.1

Change was already accepted in #433902 but reverted in
106b1418bc30cbae35addcb643a883e22de9573b.

https://github.com/zizmorcore/zizmor/releases/tag/v1.12.1
https://github.com/zizmorcore/zizmor/releases/tag/v1.12.0
---
 pkgs/by-name/zi/zizmor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
index cde6a3164478..0ce9a1fd6dad 100644
--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zizmor";
-  version = "1.11.0";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "zizmorcore";
     repo = "zizmor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zxEF76zpqwLroC5GjSkwIC3+XdXmErvabIEqhVe0zCA=";
+    hash = "sha256-GnKSbcsVYzbhsrwIUAEArltzQe0IE2tiIr2CqsMQyzk=";
   };
 
-  cargoHash = "sha256-vxDyao9pX/CfS08vFmq3vXtgDIg5NXlEwpzroGW48dA=";
+  cargoHash = "sha256-wLJlaV59sAo97KI6Ekw42aaG6hVkul1wFvcC+71+Zp4=";
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     installShellFiles

From d7dc3d0292692a8e6941432abb165449558edc2b Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 23 Aug 2025 09:42:44 +0200
Subject: [PATCH 2962/3724] python3Packages.sphinxext-opengraph: switch to
 pyproject to fix build

---
 .../python-modules/sphinxext-opengraph/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix
index 70bd42464cae..e62e96f242a4 100644
--- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix
+++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix
@@ -7,13 +7,13 @@
   pytestCheckHook,
   pythonOlder,
   beautifulsoup4,
-  setuptools-scm,
+  flit-core,
 }:
 
 buildPythonPackage rec {
   pname = "sphinxext-opengraph";
   version = "0.12.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     hash = "sha256-2ch9BxgrqbfIJ8fzFKYscha4+G7OAVz+OIOqYwX2gSA=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ flit-core ];
 
   optional-dependencies = {
     social_cards_generation = [ matplotlib ];

From 498d03f92f29c1869f3804ccd5ae0bf3ba9f033a Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 23 Aug 2025 10:08:55 +0200
Subject: [PATCH 2963/3724] python3Packages.sphinx-reredirects: switch to
 flit-core to fix build

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

diff --git a/pkgs/development/python-modules/sphinx-reredirects/default.nix b/pkgs/development/python-modules/sphinx-reredirects/default.nix
index b250106a46c9..877676192611 100644
--- a/pkgs/development/python-modules/sphinx-reredirects/default.nix
+++ b/pkgs/development/python-modules/sphinx-reredirects/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  setuptools,
+  flit-core,
   sphinx,
 }:
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   };
 
   build-system = [
-    setuptools
+    flit-core
   ];
 
   dependencies = [

From 349c2206cae116051892c2e56fbd5ff49939f25d Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 23 Aug 2025 11:55:22 +0200
Subject: [PATCH 2964/3724] varnish77: 7.7.2 -> 7.7.3

Changes:
https://varnish-cache.org/releases/rel7.7.3.html
---
 pkgs/servers/varnish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 719bbf9a20e8..ad5e6b3db6ed 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -114,7 +114,7 @@ in
   };
   # EOL 2026-03-15
   varnish77 = common {
-    version = "7.7.2";
-    hash = "sha256-/ad1DhKBog6czMbGZkgdJDf6fA2BZZLIbk+3un/EZK0=";
+    version = "7.7.3";
+    hash = "sha256-6W7q/Ez+KlWO0vtU8eIr46PZlfRvjADaVF1YOq74AjY=";
   };
 }

From b6c00a3a599599bf61492b77fc076b8c6f76b700 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 09:57:49 +0000
Subject: [PATCH 2965/3724] sladeUnstable: 3.2.7-unstable-2025-08-08 ->
 3.2.7-unstable-2025-08-19

---
 pkgs/games/doom-ports/slade/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/doom-ports/slade/git.nix b/pkgs/games/doom-ports/slade/git.nix
index baded118f8d7..aa1b89544902 100644
--- a/pkgs/games/doom-ports/slade/git.nix
+++ b/pkgs/games/doom-ports/slade/git.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation {
   pname = "slade";
-  version = "3.2.7-unstable-2025-08-08";
+  version = "3.2.7-unstable-2025-08-19";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
-    rev = "e39df3a8809508bede6d0342932d0cb8f8a440f2";
-    hash = "sha256-BZllLj50LpUntpYWyUBI9K64wb7vHTwBWzW20GeJRXQ=";
+    rev = "62467e4ea9f41ac04e28bfed266731da22ff874c";
+    hash = "sha256-c32y2/u4HBH9AcUyacTUFrvzyWr0lz7dnsXmRRjlt2E=";
   };
 
   nativeBuildInputs = [

From 2ee236a095ce3875e18eded7ae9826f456b65d96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 10:01:21 +0000
Subject: [PATCH 2966/3724] kubectl-ai: 0.0.20 -> 0.0.22

---
 pkgs/by-name/ku/kubectl-ai/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ku/kubectl-ai/package.nix b/pkgs/by-name/ku/kubectl-ai/package.nix
index ac29224c97a7..6a35ec8699e9 100644
--- a/pkgs/by-name/ku/kubectl-ai/package.nix
+++ b/pkgs/by-name/ku/kubectl-ai/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-ai";
-  version = "0.0.20";
+  version = "0.0.22";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "kubectl-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iyyaQBulncPNJXm7ir/aOjJxJvd0Q178weneiwQbGcU=";
+    hash = "sha256-sU8CATzhp0seUJNYjvxFkRoA/Xqb57kZqGpEOCxypUA=";
   };
 
-  vendorHash = "sha256-a84HesnInU7JZZTx0Rm1Qgsmo7SJC0kMnckgmUk0Vow=";
+  vendorHash = "sha256-OJnpd8z4e6ytoUi5ydFHYPMA77ryU7Tp8wriuab7yuk=";
 
   # Build the main command
   subPackages = [ "cmd" ];

From e71eace6bc32b804f51d1b7e6f6331ca41147262 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 23 Aug 2025 12:12:09 +0200
Subject: [PATCH 2967/3724] cudaPackages.cudatoolkit-legacy-runfile: drop

---
 doc/release-notes/rl-2511.section.md          |   2 +
 pkgs/development/cuda-modules/aliases.nix     |   6 +
 .../cuda-modules/cudatoolkit/default.nix      | 349 ------------------
 .../cuda-modules/cudatoolkit/releases.nix     |  72 ----
 pkgs/top-level/cuda-packages.nix              |   3 +-
 5 files changed, 9 insertions(+), 423 deletions(-)
 delete mode 100644 pkgs/development/cuda-modules/cudatoolkit/default.nix
 delete mode 100644 pkgs/development/cuda-modules/cudatoolkit/releases.nix

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index e248ee6ec705..4d1065a1e84c 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -33,6 +33,8 @@
 
 - `kbd` package's `outputs` now include a `man` and `scripts` outputs. The `unicode_start` and `unicode_stop` Bash scripts are now part of the `scripts` output, allowing most usages of the `kbd` package to not pull in `bash`.
 
+- `cudaPackages.cudatoolkit-legacy-runfile` has been removed.
+
 - `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible.
 
 - `gnome-keyring` no longer ships with an SSH agent anymore because it has been deprecated upstream. You should use `gcr_4` instead, which provides the same features. More information on why this was done can be found on [the relevant GCR upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67).
diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix
index 1c8e9c1d5fab..9f73d75d8d2d 100644
--- a/pkgs/development/cuda-modules/aliases.nix
+++ b/pkgs/development/cuda-modules/aliases.nix
@@ -19,4 +19,10 @@ builtins.mapAttrs mkRenamed {
     path = "cudaPackages.cudaMajorMinorVersion";
     package = final.cudaMajorMinorVersion;
   };
+
+  cudatoolkit-legacy-runfile = {
+    path = "cudaPackages.cudatoolkit";
+    package = final.cudatoolkit;
+  };
+
 }
diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix
deleted file mode 100644
index ddb34fb0459a..000000000000
--- a/pkgs/development/cuda-modules/cudatoolkit/default.nix
+++ /dev/null
@@ -1,349 +0,0 @@
-{
-  cudaMajorMinorVersion,
-  cudaAtLeast,
-  runPatches ? [ ],
-  autoPatchelfHook,
-  autoAddDriverRunpath,
-  addDriverRunpath,
-  alsa-lib,
-  curlMinimal,
-  expat,
-  fetchurl,
-  fontconfig,
-  freetype,
-  gdk-pixbuf,
-  glib,
-  glibc,
-  gst_all_1,
-  gtk2,
-  lib,
-  libxcrypt-legacy,
-  libxkbcommon,
-  libkrb5,
-  libxml2_13,
-  krb5,
-  makeWrapper,
-  markForCudatoolkitRootHook,
-  ncurses5,
-  ncurses6,
-  numactl,
-  nss,
-  patchelf,
-  perl,
-  python3, # FIXME: CUDAToolkit 10 may still need python27
-  python310,
-  python311,
-  python312,
-  pulseaudio,
-  setupCudaHook,
-  stdenv,
-  backendStdenv, # E.g. gcc11Stdenv, set in extension.nix
-  unixODBC,
-  wayland,
-  xorg,
-  zlib,
-  libtiff,
-  qt6Packages,
-  qt6,
-  rdma-core,
-  ucx,
-  rsync,
-  libglvnd,
-}:
-
-let
-  # Version info for the classic cudatoolkit packages that contain everything that is in redist.
-  releases = builtins.import ./releases.nix;
-  release = releases.${cudaMajorMinorVersion};
-in
-
-backendStdenv.mkDerivation {
-  pname = "cudatoolkit";
-  inherit (release) version;
-  inherit runPatches;
-
-  dontPatchELF = true;
-  dontStrip = true;
-
-  src = fetchurl { inherit (release) url sha256; };
-
-  outputs = [
-    "out"
-    "lib"
-    "doc"
-  ];
-
-  nativeBuildInputs = [
-    perl
-    makeWrapper
-    rsync
-    addDriverRunpath
-    autoPatchelfHook
-    autoAddDriverRunpath
-    markForCudatoolkitRootHook
-    qt6Packages.wrapQtAppsHook
-  ];
-  propagatedBuildInputs = [ setupCudaHook ];
-  buildInputs = [
-    # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
-    gdk-pixbuf
-
-    # For autoPatchelf
-    ncurses5
-    expat
-    python3
-    zlib
-    glibc
-    xorg.libX11
-    xorg.libXext
-    xorg.libXrender
-    xorg.libXt
-    xorg.libXtst
-    xorg.libXi
-    xorg.libXext
-    xorg.libXdamage
-    xorg.libxcb
-    xorg.xcbutilimage
-    xorg.xcbutilrenderutil
-    xorg.xcbutilwm
-    xorg.xcbutilkeysyms
-    pulseaudio
-    libxkbcommon
-    libkrb5
-    krb5
-    gtk2
-    glib
-    fontconfig
-    freetype
-    numactl
-    nss
-    unixODBC
-    alsa-lib
-    wayland
-    libglvnd
-    (lib.getLib libtiff)
-    qt6Packages.qtwayland
-    rdma-core
-    (ucx.override { enableCuda = false; }) # Avoid infinite recursion
-    xorg.libxshmfence
-    xorg.libxkbfile
-  ]
-  ++ map lib.getLib (
-    [
-      # Used by `/target-linux-x64/CollectX/clx` and `/target-linux-x64/CollectX/libclx_api.so` for:
-      # - `libcurl.so.4`
-      curlMinimal
-
-      # Used by `/host-linux-x64/Scripts/WebRTCContainer/setup/neko/server/bin/neko`
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-    ]
-    ++ (with qt6; [
-      qtmultimedia
-      qttools
-      qtpositioning
-      qtscxml
-      qtsvg
-      qtwebchannel
-      qtwebengine
-    ])
-  )
-  ++ [
-    # libcrypt.so.1
-    libxcrypt-legacy
-    ncurses6
-    python310
-    python311
-  ]
-  ++ lib.optionals (cudaAtLeast "12.9") [
-    libxml2_13
-    python312
-  ];
-
-  # Prepended to runpaths by autoPatchelf.
-  # The order inherited from older rpath preFixup code
-  runtimeDependencies = [
-    (placeholder "lib")
-    (placeholder "out")
-    "${placeholder "out"}/nvvm"
-    # NOTE: use the same libstdc++ as the rest of nixpkgs, not from backendStdenv
-    "${lib.getLib stdenv.cc.cc}/lib64"
-    "${placeholder "out"}/jre/lib/amd64/jli"
-    "${placeholder "out"}/lib64"
-    "${placeholder "out"}/nvvm/lib64"
-  ];
-
-  autoPatchelfIgnoreMissingDeps = [
-    # This is the hardware-dependent userspace driver that comes from
-    # nvidia_x11 package. It must be deployed at runtime in
-    # /run/opengl-driver/lib or pointed at by LD_LIBRARY_PATH variable, rather
-    # than pinned in runpath
-    "libcuda.so.1"
-
-    # Similar to libcuda.so.1, this is part of the driver package.
-    "libnvidia-ml.so.1"
-
-    # The krb5 expression ships libcom_err.so.3 but cudatoolkit asks for the
-    # older
-    # This dependency is asked for by target-linux-x64/CollectX/RedHat/x86_64/libssl.so.10
-    # - do we even want to use nvidia-shipped libssl?
-    "libcom_err.so.2"
-  ];
-
-  preFixup = ''
-    ${lib.getExe' patchelf "patchelf"} $out/lib64/libnvrtc.so --add-needed libnvrtc-builtins.so
-  '';
-
-  unpackPhase = ''
-    sh $src --keep --noexec
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    mkdir $out
-    mkdir -p $out/bin $out/lib64 $out/include $doc
-    for dir in pkg/builds/* pkg/builds/cuda_nvcc/nvvm pkg/builds/cuda_cupti/extras/CUPTI; do
-      if [ -d $dir/bin ]; then
-        mv $dir/bin/* $out/bin
-      fi
-      if [ -d $dir/doc ]; then
-        (cd $dir/doc && find . -type d -exec mkdir -p $doc/\{} \;)
-        (cd $dir/doc && find . \( -type f -o -type l \) -exec mv \{} $doc/\{} \;)
-      fi
-      if [ -L $dir/include ] || [ -d $dir/include ]; then
-        (cd $dir/include && find . -type d -exec mkdir -p $out/include/\{} \;)
-        (cd $dir/include && find . \( -type f -o -type l \) -exec mv \{} $out/include/\{} \;)
-      fi
-      if [ -L $dir/lib64 ] || [ -d $dir/lib64 ]; then
-        (cd $dir/lib64 && find . -type d -exec mkdir -p $out/lib64/\{} \;)
-        (cd $dir/lib64 && find . \( -type f -o -type l \) -exec mv \{} $out/lib64/\{} \;)
-      fi
-    done
-    mv pkg/builds/cuda_nvcc/nvvm $out/nvvm
-
-    mv pkg/builds/cuda_sanitizer_api $out/cuda_sanitizer_api
-    ln -s $out/cuda_sanitizer_api/compute-sanitizer/compute-sanitizer $out/bin/compute-sanitizer
-
-    mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64
-    mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64
-    rm $out/host-linux-x64/libstdc++.so*
-  ''
-  # Use Qt plugins built by Nix.
-  + ''
-    for qtlib in $out/host-linux-x64/Plugins/*/libq*.so; do
-      qtdir=$(basename $(dirname $qtlib))
-      filename=$(basename $qtlib)
-      for qtpkgdir in ${
-        lib.concatMapStringsSep " " (x: qt6Packages.${x}) [
-          "qtbase"
-          "qtimageformats"
-          "qtsvg"
-          "qtwayland"
-        ]
-      }; do
-        if [ -e $qtpkgdir/lib/qt-6/plugins/$qtdir/$filename ]; then
-          ln -snf $qtpkgdir/lib/qt-6/plugins/$qtdir/$filename $qtlib
-        fi
-      done
-    done
-
-    rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
-
-    rm $out/host-linux-x64/libQt6*
-
-    # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
-    if [ -d "$out"/cuda-samples ]; then
-        mv "$out"/cuda-samples "$out"/samples
-    fi
-
-    # Change the #error on GCC > 4.9 to a #warning.
-    sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/'
-
-    # Fix builds with newer glibc version
-    sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h"
-  ''
-  +
-    # Point NVCC at a compatible compiler
-    # CUDA_TOOLKIT_ROOT_DIR is legacy,
-    # Cf. https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables
-    ''
-      mkdir -p $out/nix-support
-      cat <<EOF >> $out/nix-support/setup-hook
-      cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'
-      EOF
-
-      # Move some libraries to the lib output so that programs that
-      # depend on them don't pull in this entire monstrosity.
-      mkdir -p $lib/lib
-      mv -v $out/lib64/libcudart* $lib/lib/
-
-      # Remove OpenCL libraries as they are provided by ocl-icd and driver.
-      rm -f $out/lib64/libOpenCL*
-
-      # nvprof do not find any program to profile if LD_LIBRARY_PATH is not set
-      wrapProgram $out/bin/nvprof \
-        --prefix LD_LIBRARY_PATH : $out/lib
-    ''
-  # 12.9 includes a broken symlink, include/include, pointing to targets/x86_64-linux/include
-  # and another, lib64/lib64, pointing to lib/targets/x86_64-linux/lib
-  + lib.optionalString (cudaMajorMinorVersion == "12.9") ''
-    rm $out/include/include
-    rm $out/lib64/lib64
-  ''
-  # Python 3.8 and 3.9 are not in nixpkgs anymore, delete Python 3.{8,9} cuda-gdb support
-  # to avoid autopatchelf failing to find libpython3.{8,9}.so.
-  + ''
-    find $out -name '*python3.8*' -delete
-    find $out -name '*python3.9*' -delete
-  ''
-  + ''
-    runHook postInstall
-  '';
-
-  postInstall = ''
-    for b in nvvp; do
-      wrapProgram "$out/bin/$b" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
-    done
-  ''
-  # Check we don't have any lurking vendored qt libraries that weren't
-  # replaced during installPhase
-  + ''
-    qtlibfiles=$(find $out -name "libq*.so" -type f)
-    if [ ! -z "$qtlibfiles" ]; then
-      echo "Found unexpected vendored Qt library files in $out" >&2
-      echo $qtlibfiles >&2
-      echo "These should be replaced with symlinks in installPhase" >&2
-      exit 1
-    fi
-  '';
-
-  # cuda-gdb doesn't run correctly when not using sandboxing, so
-  # temporarily disabling the install check.  This should be set to true
-  # when we figure out how to get `cuda-gdb --version` to run correctly
-  # when not using sandboxing.
-  doInstallCheck = false;
-  postInstallCheck = ''
-    # Smoke test binaries
-    pushd $out/bin
-    for f in *; do
-      case $f in
-        crt)                           continue;;
-        nvcc.profile)                  continue;;
-        nsight_ee_plugins_manage.sh)   continue;;
-        uninstall_cuda_toolkit_6.5.pl) continue;;
-        computeprof|nvvp|nsight)       continue;; # GUIs don't feature "--version"
-        *)                             echo "Executing '$f --version':"; ./$f --version;;
-      esac
-    done
-    popd
-  '';
-
-  meta = with lib; {
-    description = "Deprecated runfile-based CUDAToolkit installation (a compiler for NVIDIA GPUs, math libraries, and tools)";
-    homepage = "https://developer.nvidia.com/cuda-toolkit";
-    platforms = [ "x86_64-linux" ];
-    license = licenses.nvidiaCuda;
-    teams = [ teams.cuda ];
-  };
-}
diff --git a/pkgs/development/cuda-modules/cudatoolkit/releases.nix b/pkgs/development/cuda-modules/cudatoolkit/releases.nix
deleted file mode 100644
index e0358d82acb7..000000000000
--- a/pkgs/development/cuda-modules/cudatoolkit/releases.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-# Type Aliases
-# CudaVersion = String (two-component version, e.g. "10.0")
-# Release = {
-#   version: String
-#     - The version of CUDA.
-#   url: String
-#     - The URL to download the CUDA installer from.
-#   sha256: String
-#     - The SHA256 checksum of the CUDA installer.
-# }
-# Releases = AttrSet CudaVersion Release
-{
-  "11.8" = {
-    version = "11.8.0";
-    url = "https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux.run";
-    sha256 = "sha256-kiPErzrr5Ke77Zq9mxY7A6GzS4VfvCtKDRtwasCaWhY=";
-  };
-
-  "12.0" = {
-    version = "12.0.1";
-    url = "https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux.run";
-    sha256 = "sha256-GyBaBicvFGP0dydv2rkD8/ZmkXwGjlIHOAAeacehh1s=";
-  };
-
-  "12.1" = {
-    version = "12.1.1";
-    url = "https://developer.download.nvidia.com/compute/cuda/12.1.1/local_installers/cuda_12.1.1_530.30.02_linux.run";
-    sha256 = "sha256-10Ai1B2AEFMZ36Ib7qObd6W5kZU5wEh6BcqvJEbWpw4=";
-  };
-
-  "12.2" = {
-    version = "12.2.2";
-    url = "https://developer.download.nvidia.com/compute/cuda/12.2.2/local_installers/cuda_12.2.2_535.104.05_linux.run";
-    sha256 = "sha256-Kzmq4+dhjZ9Zo8j6HxvGHynAsODfdfsFB2uts1KVLvI=";
-  };
-
-  "12.3" = {
-    version = "12.3.2";
-    url = "https://developer.download.nvidia.com/compute/cuda/12.3.2/local_installers/cuda_12.3.2_545.23.08_linux.run";
-    sha256 = "sha256-JLKvyfdw2M9D1vp63C6/1HxAhNsBvdoc484KTUk7pls=";
-  };
-
-  "12.4" = {
-    version = "12.4.1";
-    url = "https://developer.download.nvidia.com/compute/cuda/12.4.1/local_installers/cuda_12.4.1_550.54.15_linux.run";
-    sha256 = "sha256-Nn0imbOkWIq0h6bScnbKXZ6tbjlJBPGLzLnhJDO5xPs=";
-  };
-
-  "12.5" = {
-    version = "12.5.1";
-    url = "https://developer.download.nvidia.com/compute/cuda/12.5.1/local_installers/cuda_12.5.1_555.42.06_linux.run";
-    sha256 = "sha256-teCneeCJyGYQBRFBxM9Ji+70MYWOxjOYEHORcn7L2wQ=";
-  };
-
-  "12.6" = {
-    version = "12.6.3";
-    url = "https://developer.download.nvidia.com/compute/cuda/12.6.3/local_installers/cuda_12.6.3_560.35.05_linux.run";
-    sha256 = "sha256-gdYOSARHlteIOqigSa/mUBuEPyxFY5s3A7I3jeMNVdM=";
-  };
-
-  "12.8" = {
-    version = "12.8.1";
-    url = "https://developer.download.nvidia.com/compute/cuda/12.8.1/local_installers/cuda_12.8.1_570.124.06_linux.run";
-    sha256 = "sha256-Io9ryvW3YY0DKTn0MZFPyS0OXtOevjcJiiRQLyahl5c=";
-  };
-
-  "12.9" = {
-    version = "12.9.1";
-    url = "https://developer.download.nvidia.com/compute/cuda/12.9.1/local_installers/cuda_12.9.1_575.57.08_linux.run";
-    sha256 = "sha256-D22Abd2HIw0q2+imAGqdIBRP29qd4tasxnfapdA2QXo=";
-  };
-}
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index b9fd4eff19ff..cc92f7ae3491 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -117,13 +117,12 @@ let
       };
 
     # Loose packages
-    # Barring packages which share a home (e.g., cudatoolkit and cudatoolkit-legacy-runfile), new packages
+    # Barring packages which share a home (e.g., cudatoolkit), new packages
     # should be added to ../development/cuda-modules/packages in "by-name" style, where they will be automatically
     # discovered and added to the package set.
 
     # TODO: Move to aliases.nix once all Nixpkgs has migrated to the splayed CUDA packages
     cudatoolkit = final.callPackage ../development/cuda-modules/cudatoolkit/redist-wrapper.nix { };
-    cudatoolkit-legacy-runfile = final.callPackage ../development/cuda-modules/cudatoolkit { };
 
     tests =
       let

From 67f6b94a27b7ef9ccf6b51f78c9e13410ed669ea Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 13 Aug 2025 08:44:19 +0200
Subject: [PATCH 2968/3724] python313Packages.scs: add changelog to meta

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

diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix
index 4668c0996151..70292a711206 100644
--- a/pkgs/development/python-modules/scs/default.nix
+++ b/pkgs/development/python-modules/scs/default.nix
@@ -66,6 +66,7 @@ buildPythonPackage rec {
     '';
     inherit (pkgs.scs.meta) homepage;
     downloadPage = "https://github.com/bodono/scs-python";
+    changelog = "https://github.com/bodono/scs-python/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ drewrisinger ];
   };

From c8b23bcbe4399be7c4b8d5c2803ad08e53fce93d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 23 Aug 2025 12:37:46 +0200
Subject: [PATCH 2969/3724] python3Packages.django-hierarkey: 2.0.0 -> 2.0.1

https://github.com/raphaelm/django-hierarkey/compare/2.0.0...2.0.1
---
 pkgs/development/python-modules/django-hierarkey/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-hierarkey/default.nix b/pkgs/development/python-modules/django-hierarkey/default.nix
index bd9702b356b2..21029c39516a 100644
--- a/pkgs/development/python-modules/django-hierarkey/default.nix
+++ b/pkgs/development/python-modules/django-hierarkey/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "django-hierarkey";
-  version = "2.0.0";
+  version = "2.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "raphaelm";
     repo = "django-hierarkey";
     tag = version;
-    hash = "sha256-vXc31tUQrukdXeiMHZYP12o0C3R28CsC5fHjhMgRdU0=";
+    hash = "sha256-zIz7aokOGLGXV/xJnYcz8lBP7b2rxLrfaD3i/DLpFR8=";
   };
 
   build-system = [ setuptools ];

From 18c4f85db4bfd6ddf628f6190e0fb3a2b02a2729 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Aug 2025 02:14:03 +0200
Subject: [PATCH 2970/3724] python313Packages.arcam-fmj: update disabled

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

diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix
index 94ce7ed66ada..c0ba99e384f9 100644
--- a/pkgs/development/python-modules/arcam-fmj/default.nix
+++ b/pkgs/development/python-modules/arcam-fmj/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   version = "2.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "elupus";

From 329ef07609153e270a379ffb667a06300ff04472 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 23 Aug 2025 12:44:16 +0200
Subject: [PATCH 2971/3724] pretix: 2025.7.0 -> 2025.7.1

https://pretix.eu/about/en/blog/20250823-release-2025-7-1/
---
 pkgs/by-name/pr/pretix/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index 263e796e95f5..9a60066d9ccc 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -42,13 +42,13 @@ let
   };
 
   pname = "pretix";
-  version = "2025.7.0";
+  version = "2025.7.1";
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix";
     rev = "refs/tags/v${version}";
-    hash = "sha256-fKAHakrgvtkQR/dpXWL0prsq90TvEdYaS6FLyaI8MrM=";
+    hash = "sha256-emPzCwViqbGqlQRYmyamhQ5y6a3g67TTYIdv6FWbGEU=";
   };
 
   npmDeps = buildNpmPackage {

From 57c3dfc7d8b483906cd7adedde38ac1137708c1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 10:49:02 +0000
Subject: [PATCH 2972/3724] spicedb: 1.45.1 -> 1.45.2

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

diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix
index 5cbd2033445e..57584d390e71 100644
--- a/pkgs/servers/spicedb/default.nix
+++ b/pkgs/servers/spicedb/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "spicedb";
-  version = "1.45.1";
+  version = "1.45.2";
 
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "spicedb";
     rev = "v${version}";
-    hash = "sha256-cKCAA9C0vsCa0BszspvPfrKbdWyaccrMtiO6UWhLIh4=";
+    hash = "sha256-LDAZdcUfrCWtld6V4GDpAbK+BeT/aeVOQ7G++sMoXU4=";
   };
 
-  vendorHash = "sha256-R4lOmHIBgnlvOukMjXdVx5e9Oneo1EizhsrDXiTbwTc=";
+  vendorHash = "sha256-hr+xIfPjlrH9igRsYeqNOPgx/jWhDfu73gA+/NoWWxI=";
 
   ldflags = [
     "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'"

From 657fe3f9c64aef78983d27c387e1a6e71ceed4f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 10:51:18 +0000
Subject: [PATCH 2973/3724] tageditor: 3.9.5 -> 3.9.6

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

diff --git a/pkgs/by-name/ta/tageditor/package.nix b/pkgs/by-name/ta/tageditor/package.nix
index f0babd818ed2..de03722f3c4e 100644
--- a/pkgs/by-name/ta/tageditor/package.nix
+++ b/pkgs/by-name/ta/tageditor/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tageditor";
-  version = "3.9.5";
+  version = "3.9.6";
 
   src = fetchFromGitHub {
     owner = "martchus";
     repo = "tageditor";
     tag = "v${version}";
-    hash = "sha256-Sia6Y/V81WQj4oWjZAAR4o3TngfWq7sWxxiKEuFjQ2M=";
+    hash = "sha256-weGLC8TPSA9XQ/TuLj4DBswmlEbpxPplsxI4sqygHfU=";
   };
 
   nativeBuildInputs = [

From ac425436629fab2ba05a12bc9cfc1d1c6c1c26a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 11:07:37 +0000
Subject: [PATCH 2974/3724] python3Packages.llm-gemini: 0.24 -> 0.25

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

diff --git a/pkgs/development/python-modules/llm-gemini/default.nix b/pkgs/development/python-modules/llm-gemini/default.nix
index 3b89a6066a38..83d575836174 100644
--- a/pkgs/development/python-modules/llm-gemini/default.nix
+++ b/pkgs/development/python-modules/llm-gemini/default.nix
@@ -15,14 +15,14 @@
 }:
 buildPythonPackage rec {
   pname = "llm-gemini";
-  version = "0.24";
+  version = "0.25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-gemini";
     tag = version;
-    hash = "sha256-pMPAfRhcvKoxvtbkmtT3L7EvBg9WsNVOP6wFjbyqncw=";
+    hash = "sha256-jnPFlLUQ+NSTDUStocUldqT7Z+bjrtzGSOJHfMFCScU=";
   };
 
   build-system = [ setuptools ];

From 41d9e0480962e3fa6d7e776293933bf602b91f83 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 23 Aug 2025 13:13:20 +0200
Subject: [PATCH 2975/3724] peertube: 7.2.1 -> 7.2.3

Contains some security fixes caused by some transitive deps.

Changes:
https://github.com/Chocobozzz/PeerTube/releases/tag/v7.2.3
https://github.com/Chocobozzz/PeerTube/releases/tag/v7.2.2
---
 pkgs/by-name/pe/peertube/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix
index 1a18d6c31ce4..2e052db152dc 100644
--- a/pkgs/by-name/pe/peertube/package.nix
+++ b/pkgs/by-name/pe/peertube/package.nix
@@ -47,23 +47,23 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "peertube";
-  version = "7.2.1";
+  version = "7.2.3";
 
   src = fetchFromGitHub {
     owner = "Chocobozzz";
     repo = "PeerTube";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I53LCCtB8iNGuABgvhRjUfxocasXCv4TV7jXtHVpMnU=";
+    hash = "sha256-vbjQoysm5ERY6kG3JhG6z/zKxVlmWmRXQyUnCrVgjFk=";
   };
 
   yarnOfflineCacheServer = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-PMU6ZMcT+9Z3Y6+085e3hRnvs4Xii5FIkkOPvsltfMY=";
+    hash = "sha256-baQgvzJ3W5lULrdukwM9niovtzAI0yvc2c7mqhtCDxk=";
   };
 
   yarnOfflineCacheClient = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/client/yarn.lock";
-    hash = "sha256-AWUnxC/cwtKCa70MKmHeOr6ussMYyQ5awQAnWYzCA1s=";
+    hash = "sha256-Y1boUDDegqCRt9fQaP+svIKYFz+gowGyV6sV7vq8vMA=";
   };
 
   yarnOfflineCacheAppsCli = fetchYarnDeps {

From 643aed3c057dd6757987a7d10c0368aec8c22032 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 11:21:32 +0000
Subject: [PATCH 2976/3724] python3Packages.quantulum3: 0.9.0 -> 0.9.2

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

diff --git a/pkgs/development/python-modules/quantulum3/default.nix b/pkgs/development/python-modules/quantulum3/default.nix
index 85e17eaf53c8..1f6605719a4b 100644
--- a/pkgs/development/python-modules/quantulum3/default.nix
+++ b/pkgs/development/python-modules/quantulum3/default.nix
@@ -16,7 +16,7 @@
 }:
 let
   pname = "quantulum3";
-  version = "0.9.0";
+  version = "0.9.2";
 in
 buildPythonPackage {
   inherit version pname;

From 3d9cb9f3553b74d5fbbaa467dc96c6994daf95d0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Aug 2025 13:10:24 +0200
Subject: [PATCH 2977/3724] workflows/eval.misc: run tasks in parallel

Both `nix flake check` and `nix-env` are single-threaded, so no reason
to serialize their calls and waste time.

This brings down the runtime for this job from ~1:51 to ~1:27 in my
tests.
---
 .github/workflows/eval.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 7efa71913ac7..c75398dde45e 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -354,9 +354,10 @@ jobs:
       - name: Install Nix
         uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31
 
-      - name: Ensure flake outputs on all systems still evaluate
-        run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1'
-
-      - name: Query nixpkgs with aliases enabled to check for basic syntax errors
+      - name: Run misc eval tasks in parallel
         run: |
-          time nix-env -I ./nixpkgs/untrusted -f ./nixpkgs/untrusted -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null
+          # Ensure flake outputs on all systems still evaluate
+          nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1' &
+          # Query nixpkgs with aliases enabled to check for basic syntax errors
+          nix-env -I ./nixpkgs/untrusted -f ./nixpkgs/untrusted -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null &
+          wait

From a113e802ce02ffd0b12b468da8a0ed86f649bca5 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Sat, 23 Aug 2025 13:28:29 +0200
Subject: [PATCH 2978/3724] caddy: 2.10.1 -> 2.10.2

---
 nixos/tests/caddy.nix             | 2 +-
 pkgs/by-name/ca/caddy/package.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix
index 7f55fffee6f0..0b216c439bda 100644
--- a/nixos/tests/caddy.nix
+++ b/nixos/tests/caddy.nix
@@ -74,7 +74,7 @@
           services.caddy = {
             package = pkgs.caddy.withPlugins {
               plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20241211194404-3865845790a7" ];
-              hash = "sha256-Da1XSih/yRehXZhvrv3wGp1OEouE7W8WQrdohz9rehQ=";
+              hash = "sha256-RrB0/qXL0mCvkxKaz8zhj5GWKEtOqItXP2ASYz7VdMU=";
             };
             configFile = pkgs.writeText "Caddyfile" ''
               {
diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix
index a8cb59e37b8b..24e2ee0d798b 100644
--- a/pkgs/by-name/ca/caddy/package.nix
+++ b/pkgs/by-name/ca/caddy/package.nix
@@ -10,7 +10,7 @@
   stdenv,
 }:
 let
-  version = "2.10.1";
+  version = "2.10.2";
   dist = fetchFromGitHub {
     owner = "caddyserver";
     repo = "dist";
@@ -26,7 +26,7 @@ buildGo125Module {
     owner = "caddyserver";
     repo = "caddy";
     tag = "v${version}";
-    hash = "sha256-6E4l84UKLz3OxAj5M5CGj1elp9A7jyaoin5Gi/O0y0A=";
+    hash = "sha256-KvikafRYPFZ0xCXqDdji1rxlkThEDEOHycK8GP5e8vk=";
   };
 
   vendorHash = "sha256-wjcmWKVmLBAybILUi8tKEDnFbhtybf042ODH7jEq6r8=";

From a75b0b3850f984a3838166cb032ee681acc3425f Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 23 Aug 2025 13:35:47 +0200
Subject: [PATCH 2979/3724] gdm: set run-dir to prevent erroneous creation of
 /var/run as directory if it does not exist

closes #432251

The failure occured because:
1. Root directory has wrong permissions
2. systemd-tmpfiles does not produce necessary symlinks because of that (#432261 gets created first)
3. **gdm creates a directory as a fallback**
4. various services (such as nsncd) fail on startup

Fixing the root directory permissions later does not fix this,
because `systemd-tmpfiles` will not replace an existing directory.

Removing the erroneous `/var/run` directory on a running system does
not fix this, as gdm will recreate the directory on shutdown.
---
 pkgs/by-name/gd/gdm/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix
index 75ecc584896e..9145153e384a 100644
--- a/pkgs/by-name/gd/gdm/package.nix
+++ b/pkgs/by-name/gd/gdm/package.nix
@@ -65,6 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
     "--sysconfdir=/etc"
     "--localstatedir=/var"
+    (lib.mesonOption "run-dir" "/run/gdm")
   ];
 
   nativeBuildInputs = [

From e3a8b1083db63c1425ec365702b26f3f984bf4a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 11:38:27 +0000
Subject: [PATCH 2980/3724] libretro.flycast: 0-unstable-2025-08-01 ->
 0-unstable-2025-08-20

---
 pkgs/applications/emulators/libretro/cores/flycast.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix
index 2fbae3a49af2..5190b6e64404 100644
--- a/pkgs/applications/emulators/libretro/cores/flycast.nix
+++ b/pkgs/applications/emulators/libretro/cores/flycast.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "flycast";
-  version = "0-unstable-2025-08-01";
+  version = "0-unstable-2025-08-20";
 
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
-    rev = "40e400ab084175d3bd0f9e10cf8d6ac78c8b9544";
-    hash = "sha256-k/w1tmuGuRD98bR/kmc/9pLFGeobHMhKQapJOv8qVJo=";
+    rev = "9c5408a6d3fff939ae06a319c2fce3aa6f2a4d69";
+    hash = "sha256-AH/XVN7Ah2DzN8/jlagOEAsNSciQMf8WBhfdC7YIMHw=";
     fetchSubmodules = true;
   };
 

From 2a06a134db86f51b1ebd49e27cce25c63efd35f5 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sat, 23 Aug 2025 12:01:07 +0000
Subject: [PATCH 2981/3724] python3Packages.magic-wormhole-transit-relay: fix
 build against twisted 25.5.0

---
 .../magic-wormhole-transit-relay/default.nix           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
index 761e7deff0e9..3c3e46f92c0e 100644
--- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  fetchpatch,
   setuptools,
   autobahn,
   twisted,
@@ -19,6 +20,15 @@ buildPythonPackage rec {
     hash = "sha256-kS2DXaIbESZsdxEdybXlgAJj/AuY8KF5liJn30GBnow=";
   };
 
+  patches = [
+    # TODO: drop when updating beyond version 0.4.0
+    (fetchpatch {
+      name = "stock-Twisted-testing-reactor-seems-to-work.patch";
+      url = "https://github.com/magic-wormhole/magic-wormhole-transit-relay/commit/3abb80fd5e55bd0ba8ee66278ccf76be5f904622.patch";
+      hash = "sha256-qMaJ58kPWvEfnSZiFzxO6GlkBiyVMsgGDEa1deITZco=";
+    })
+  ];
+
   postPatch = ''
     # Passing the environment to twistd is necessary to preserve Python's site path.
     substituteInPlace src/wormhole_transit_relay/test/test_backpressure.py --replace-fail \

From a7a7d5d6ecdb620c7e6af945abf79bb65c54a04c Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sat, 23 Aug 2025 12:01:07 +0000
Subject: [PATCH 2982/3724] magic-wormhole: 0.19.2 -> 0.20.0

https://github.com/magic-wormhole/magic-wormhole/blob/refs/tags/0.20.0/NEWS.md
https://github.com/magic-wormhole/magic-wormhole/compare/refs/tags/0.19.2...refs/tags/0.20.0
---
 .../python-modules/magic-wormhole/default.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index 83152390624b..810a97f6e641 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   installShellFiles,
 
   # build-system
@@ -41,16 +42,25 @@
 
 buildPythonPackage rec {
   pname = "magic-wormhole";
-  version = "0.19.2";
+  version = "0.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "magic-wormhole";
     repo = "magic-wormhole";
     tag = version;
-    hash = "sha256-5Tipcood5RktXY05p20hQpWhSMMnZm67I4iybjV8TcA=";
+    hash = "sha256-YjzdznZZ/0YTU83f3jlOr6+yOWQ++R1wU9IZDrfAMpo=";
   };
 
+  patches = [
+    # TODO: drop when updating beyond version 0.20.0
+    (fetchpatch {
+      name = "SubchannelDemultiplex._pending_opens-fix-type.patch";
+      url = "https://github.com/magic-wormhole/magic-wormhole/commit/6d7f48786b5506df5b6a254bc4e37f6bf5d75593.patch";
+      hash = "sha256-28YH3enyQ9rTT56OU7FfFonb9l8beJ9QRgPoItzrgu4=";
+    })
+  ];
+
   postPatch =
     # enable tests by fixing the location of the wormhole binary
     ''
@@ -104,16 +114,17 @@ buildPythonPackage rec {
   ++ optional-dependencies.dilation
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ unixtools.locale ];
 
-  enabledTestPaths = [ "src/wormhole/test" ];
-
   __darwinAllowLocalNetworking = true;
 
   postInstall = ''
     install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1
+
+    # https://github.com/magic-wormhole/magic-wormhole/issues/619
     installShellCompletion --cmd ${meta.mainProgram} \
       --bash wormhole_complete.bash \
       --fish wormhole_complete.fish \
       --zsh wormhole_complete.zsh
+    rm $out/wormhole_complete.*
   '';
 
   passthru.updateScript = gitUpdater { };

From a442ba0cc167f8b510fd59e00623638e3e68e7bf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 8 Mar 2025 01:35:36 +0100
Subject: [PATCH 2983/3724] python313Packages.reconplogger: 4.16.1 -> 4.17.1

Diff: https://github.com/omni-us/reconplogger/compare/refs/tags/v4.16.1...v4.17.1
---
 pkgs/development/python-modules/reconplogger/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reconplogger/default.nix b/pkgs/development/python-modules/reconplogger/default.nix
index 30928b536475..08714838c5e7 100644
--- a/pkgs/development/python-modules/reconplogger/default.nix
+++ b/pkgs/development/python-modules/reconplogger/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "reconplogger";
-  version = "4.16.1";
+  version = "4.17.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "omni-us";
     repo = "reconplogger";
     tag = "v${version}";
-    hash = "sha256-F/6vT3jLxpteUFtYNtGyiO/JxeRtwJKpdGXTFJ6IDCE=";
+    hash = "sha256-6oFnERueR8TQOFrMiQGbs05wP1NOhp/hqyFJ9ibquEw=";
   };
 
   build-system = [ setuptools ];

From 107a0aad60f1e4ca7ec949ba755c7b6e3e2cfa0a Mon Sep 17 00:00:00 2001
From: ilian <git@ilian.dev>
Date: Sat, 23 Aug 2025 14:17:01 +0200
Subject: [PATCH 2984/3724] maintainers: update ilian email

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9ed80895b3d0..f1c1d31ef1a3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10778,10 +10778,10 @@
     name = "Ilham AM";
   };
   ilian = {
-    email = "ilian@tuta.io";
+    email = "nixos@ilian.dev";
     github = "ilian";
     githubId = 25505957;
-    name = "Ilian";
+    name = "ilian";
   };
   iliayar = {
     email = "iliayar3@gmail.com";

From dd19b4cdfe434f08e1084e6a2c5f7b680ece229f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <123550+andresilva@users.noreply.github.com>
Date: Sat, 23 Aug 2025 13:25:56 +0100
Subject: [PATCH 2985/3724] gimp3: add xz input for liblzma (#436143)

Fixes #436140 (meson.build:798:10: ERROR: Dependency "liblzma" not found, tried pkgconfig).

This is likely caused by libtiff no longer propagates xz ("6b2e5b947405").
---
 pkgs/applications/graphics/gimp/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index c33f3c4cef0e..c0f63b9f11f5 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -33,6 +33,7 @@
   librsvg,
   libwmf,
   zlib,
+  xz,
   libzip,
   ghostscript,
   aalib,
@@ -175,6 +176,7 @@ stdenv.mkDerivation (finalAttrs: {
     librsvg
     libwmf
     zlib
+    xz
     libzip
     ghostscript
     aalib

From 17a789092c0d6367fe779f716bd87e7f8d450fe8 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Fri, 22 Aug 2025 12:23:03 +0200
Subject: [PATCH 2986/3724] img4lib: init at 0-unstable-2021-11-28

---
 pkgs/by-name/im/img4lib/package.nix | 49 +++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/im/img4lib/package.nix

diff --git a/pkgs/by-name/im/img4lib/package.nix b/pkgs/by-name/im/img4lib/package.nix
new file mode 100644
index 000000000000..6e66b62d5103
--- /dev/null
+++ b/pkgs/by-name/im/img4lib/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  lzfse,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "img4lib";
+  version = "0-unstable-2021-11-28";
+
+  src = fetchFromGitHub {
+    owner = "xerub";
+    repo = "img4lib";
+    rev = "69772c72f3c08f021ec9fa4c386f2b3df60a38b7";
+    hash = "sha256-xCWovBJ9cxT17u1uo+aUQnxDoYFQXYy9Qer0mD45aOU=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    lzfse
+    openssl
+  ];
+
+  installPhase = "
+    runHook preInstall
+
+    install -Dm755 img4 $out/bin/img4
+
+    runHook postInstall
+  ";
+
+  strictDeps = true;
+
+  meta = {
+    description = "Library and tool for parsing, manipulating, and patching Apple .img4 container files";
+    homepage = "https://github.com/xerub/img4lib";
+    # No licensing information available
+    # https://github.com/xerub/img4lib/issues/14
+    license = lib.licenses.unfree;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ onny ];
+    mainProgram = "img4";
+  };
+})

From 56ac715da5eb201bb0fb893490f2d704deacac28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 12:34:11 +0000
Subject: [PATCH 2987/3724] python3Packages.session-info2: 0.2 -> 0.2.1

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

diff --git a/pkgs/development/python-modules/session-info2/default.nix b/pkgs/development/python-modules/session-info2/default.nix
index 25aaea957785..d73200fdea16 100644
--- a/pkgs/development/python-modules/session-info2/default.nix
+++ b/pkgs/development/python-modules/session-info2/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "session-info2";
-  version = "0.2";
+  version = "0.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scverse";
     repo = "session-info2";
     tag = "v${version}";
-    hash = "sha256-DsI2mFM7xZgSm24yVzF6B+2aruKsjkTKZAmJPg7mWgg=";
+    hash = "sha256-d56aIKKBiktOepN/SXwuSaFjSelJ9QiTcbO0OvbkNW4=";
   };
 
   build-system = [

From 4c0621af8c459cf22070a5380603ea9223bd0cf6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 13:06:19 +0000
Subject: [PATCH 2988/3724] scip-go: 0.1.24 -> 0.1.25

---
 pkgs/by-name/sc/scip-go/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sc/scip-go/package.nix b/pkgs/by-name/sc/scip-go/package.nix
index 46d0e356b24a..7b4615fd8768 100644
--- a/pkgs/by-name/sc/scip-go/package.nix
+++ b/pkgs/by-name/sc/scip-go/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "scip-go";
-  version = "0.1.24";
+  version = "0.1.25";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "scip-go";
     rev = "v${version}";
-    hash = "sha256-qHGJ6yD3mnhHnu/KOShFb7Gu31jBPtKiEjAkaRlWJpE=";
+    hash = "sha256-qzLDqHnZpJtdBZa/YOLZCiS+V52a1Lxc0TLsfSeRCG8=";
   };
 
-  vendorHash = "sha256-E/1ubWGIx+sGC+owqw4nOkrwUFJfgTeqDNpH8HCwNhA=";
+  vendorHash = "sha256-J/97J/VXmQAYHu1qr9KiTUrB6/SVFcahihRatCKgaD8=";
 
   ldflags = [
     "-s"

From dd9ccc24ed399a61b08d40ed20005fef0c7730b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 13:18:43 +0000
Subject: [PATCH 2989/3724] python3Packages.pkg-about: 1.3.7 -> 1.4.0

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

diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix
index f357ec7d6732..7d5f146c57a0 100644
--- a/pkgs/development/python-modules/pkg-about/default.nix
+++ b/pkgs/development/python-modules/pkg-about/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pkg-about";
-  version = "1.3.7";
+  version = "1.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pkg_about";
     inherit version;
-    hash = "sha256-xYGDHXLRWxqA7dxs4hhh+qsEcdNwSh1jvAhpyUdbJOg=";
+    hash = "sha256-D3lcyisijpDDQkYWR1OB5dUo2ErnRjmV/H9mCsDJuxM=";
   };
 
   # tox is listed in build requirements but not actually used to build

From ab547ac6c7f90579c80536c6dcbf189bf4adb7e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 13:24:52 +0000
Subject: [PATCH 2990/3724] manga-tui: 0.8.1 -> 0.9.0

---
 pkgs/by-name/ma/manga-tui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix
index 117b5ebecf28..a8e2e4e7c5be 100644
--- a/pkgs/by-name/ma/manga-tui/package.nix
+++ b/pkgs/by-name/ma/manga-tui/package.nix
@@ -10,7 +10,7 @@
   nix-update-script,
 }:
 let
-  version = "0.8.1";
+  version = "0.9.0";
 in
 rustPlatform.buildRustPackage {
   pname = "manga-tui";
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
     owner = "josueBarretogit";
     repo = "manga-tui";
     rev = "v${version}";
-    hash = "sha256-CAmXTAUlwdc4iGzXonoYPd1okqgA4hWgR9bnsPsuDus=";
+    hash = "sha256-Q+zTYdAaCztYYtSgHK1X7oE8Q7oHYpf+hAfGAzU4HoA=";
   };
 
-  cargoHash = "sha256-viiL1LcBbWuKA+jgkAPc9gpI7wQu4UXfO5DSPm26ido=";
+  cargoHash = "sha256-FW+nrpFsQl38iqmhMyMmSvF/0W0iVy5+/Hyun8bWJP4=";
 
   nativeBuildInputs = [ pkg-config ];
 

From c8b5657f154f59c549e7aab1cb96fd48cae92543 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 13:25:54 +0000
Subject: [PATCH 2991/3724] obs-studio-plugins.obs-text-pthread: 2.0.5 -> 2.0.6

---
 .../video/obs-studio/plugins/obs-text-pthread.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
index 8a6e77b51f87..411fb9b04d84 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "obs-text-pthread";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchFromGitHub {
     owner = "norihiro";
     repo = "obs-text-pthread";
     rev = version;
-    sha256 = "sha256-zrgxKs3jmrwQJiEgKfZz1BOVToTLauQXtFYcuFlV71o=";
+    sha256 = "sha256-lDGji2ZdK5XoBKLRdgYCIDPndVkhIZltc94wWFRTLCA=";
   };
 
   nativeBuildInputs = [

From 08a6e6d44435643a755b9a2d26cbdc3300ddb671 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Sat, 2 Aug 2025 13:44:14 +0200
Subject: [PATCH 2992/3724] flex-ncat: provide changelog

---
 pkgs/by-name/fl/flex-ncat/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fl/flex-ncat/package.nix b/pkgs/by-name/fl/flex-ncat/package.nix
index ef1db211d8ea..9d0ac31c9e65 100644
--- a/pkgs/by-name/fl/flex-ncat/package.nix
+++ b/pkgs/by-name/fl/flex-ncat/package.nix
@@ -23,6 +23,7 @@ buildGoModule rec {
   meta = {
     homepage = "https://github.com/kc2g-flex-tools/nCAT";
     description = "FlexRadio remote control (CAT) via hamlib/rigctl protocol";
+    changelog = "https://github.com/kc2g-flex-tools/nCAT/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mvs ];
     mainProgram = "nCAT";

From adfa3fbab8e9b9bf4cf5b399ce7fc310a32ec4ae Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Sat, 2 Aug 2025 13:44:51 +0200
Subject: [PATCH 2993/3724] flex-ncat: use finalAttrs pattern

---
 pkgs/by-name/fl/flex-ncat/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fl/flex-ncat/package.nix b/pkgs/by-name/fl/flex-ncat/package.nix
index 9d0ac31c9e65..b6f7de484d9f 100644
--- a/pkgs/by-name/fl/flex-ncat/package.nix
+++ b/pkgs/by-name/fl/flex-ncat/package.nix
@@ -5,14 +5,14 @@
   nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "flex-ncat";
   version = "0.6-20250801.0";
 
   src = fetchFromGitHub {
     owner = "kc2g-flex-tools";
     repo = "nCAT";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-l+A7PlckZFGwibMU5QelMzANP1WS5WPApOnQV0P+SGw=";
   };
 
@@ -23,9 +23,9 @@ buildGoModule rec {
   meta = {
     homepage = "https://github.com/kc2g-flex-tools/nCAT";
     description = "FlexRadio remote control (CAT) via hamlib/rigctl protocol";
-    changelog = "https://github.com/kc2g-flex-tools/nCAT/releases/tag/v${version}";
+    changelog = "https://github.com/kc2g-flex-tools/nCAT/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mvs ];
     mainProgram = "nCAT";
   };
-}
+})

From 61efba2622d0459233d19ad8a825782752f6e75b Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Sat, 2 Aug 2025 13:51:11 +0200
Subject: [PATCH 2994/3724] flex-ndax: provide changelog

---
 pkgs/by-name/fl/flex-ndax/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fl/flex-ndax/package.nix b/pkgs/by-name/fl/flex-ndax/package.nix
index a851705be671..020eb211914b 100644
--- a/pkgs/by-name/fl/flex-ndax/package.nix
+++ b/pkgs/by-name/fl/flex-ndax/package.nix
@@ -28,6 +28,7 @@ buildGoModule rec {
     broken = stdenv.hostPlatform.isDarwin;
     homepage = "https://github.com/kc2g-flex-tools/nDAX";
     description = "FlexRadio digital audio transport (DAX) connector for PulseAudio";
+    changelog = "https://github.com/kc2g-flex-tools/nDAX/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mvs ];
     mainProgram = "nDAX";

From 6df05c75600679726e66e96f862a660a723bc45f Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Sat, 2 Aug 2025 13:51:50 +0200
Subject: [PATCH 2995/3724] flex-ndax: use finalAttrs pattern

---
 pkgs/by-name/fl/flex-ndax/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fl/flex-ndax/package.nix b/pkgs/by-name/fl/flex-ndax/package.nix
index 020eb211914b..817f8a1aad65 100644
--- a/pkgs/by-name/fl/flex-ndax/package.nix
+++ b/pkgs/by-name/fl/flex-ndax/package.nix
@@ -7,14 +7,14 @@
   nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "flex-ndax";
   version = "0.5-20250801.0";
 
   src = fetchFromGitHub {
     owner = "kc2g-flex-tools";
     repo = "nDAX";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-2yHv1FSikQuPamAwSzZB6+ZoblFoD/8Jnvhhv9OO+VY=";
   };
 
@@ -28,9 +28,9 @@ buildGoModule rec {
     broken = stdenv.hostPlatform.isDarwin;
     homepage = "https://github.com/kc2g-flex-tools/nDAX";
     description = "FlexRadio digital audio transport (DAX) connector for PulseAudio";
-    changelog = "https://github.com/kc2g-flex-tools/nDAX/releases/tag/v${version}";
+    changelog = "https://github.com/kc2g-flex-tools/nDAX/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mvs ];
     mainProgram = "nDAX";
   };
-}
+})

From a1d8e5d2d9bf7cbdc2761818d4d20e9365cc2afb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 13:48:10 +0000
Subject: [PATCH 2996/3724] linuxPackages.ecapture: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix
index 9931361b1c87..2ac0efe095f1 100644
--- a/pkgs/by-name/ec/ecapture/package.nix
+++ b/pkgs/by-name/ec/ecapture/package.nix
@@ -24,13 +24,13 @@
 
 buildGoModule rec {
   pname = "ecapture";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "gojue";
     repo = "ecapture";
     tag = "v${version}";
-    hash = "sha256-2YuBgN7KUH8pgFSvvk0gpkAc1YCL8NLrU/UtQ9ykyqw=";
+    hash = "sha256-vVDr0KKfjFg282FLt23foYWoW5XSFdEgGfXgdiWrfk4=";
     fetchSubmodules = true;
   };
 

From 3500a3c98dc08c7b659bd638ab94cb1c240aa302 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 13:52:27 +0000
Subject: [PATCH 2997/3724] python3Packages.ancp-bids: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/development/python-modules/ancp-bids/default.nix b/pkgs/development/python-modules/ancp-bids/default.nix
index 10a184ca67cd..3ad3f61553f5 100644
--- a/pkgs/development/python-modules/ancp-bids/default.nix
+++ b/pkgs/development/python-modules/ancp-bids/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "ancp-bids";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "ANCPLabOldenburg";
     repo = "ancp-bids";
     tag = version;
-    hash = "sha256-n8QfQ2PGdAO6kTfkbFpj3f2gYa3vwuYg+vPpZlGNpb0=";
+    hash = "sha256-brkhXz2b1nR/tjkZQZY5S+P0+GbESvJsANQcVWRCa9k=";
   };
 
   build-system = [ setuptools ];

From a83bdaffdfb7246a6fe06bb9e90c0f69cac5f530 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 14:01:01 +0000
Subject: [PATCH 2998/3724] renode-dts2repl: 0-unstable-2025-08-08 ->
 0-unstable-2025-08-21

---
 pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix
index eb5e17a4b397..55bcc62cdce1 100644
--- a/pkgs/by-name/re/renode-dts2repl/package.nix
+++ b/pkgs/by-name/re/renode-dts2repl/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "renode-dts2repl";
-  version = "0-unstable-2025-08-08";
+  version = "0-unstable-2025-08-21";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antmicro";
     repo = "dts2repl";
-    rev = "0e49cbea7b4047ffec3bb35a59f2ec6dc4606a48";
-    hash = "sha256-YfaOPWJ113UDjmKgj6eaN9bcIk9iW1nc2jeN3M+LyB8=";
+    rev = "94e40c3622d08312226bed788b5d7970e06283c6";
+    hash = "sha256-a8QlQujBQT1ho9JbZjKH2v0l5LugemlGzBKoSSheFMA=";
   };
 
   nativeBuildInputs = [

From 4bd0b9c7ab548711a03922851eebef7bc2ce9f1b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 23 Aug 2025 15:45:01 +0200
Subject: [PATCH 2999/3724] Reapply "Merge remote-tracking branch
 'origin/master' into staging-next"

This reverts commit 106b1418bc30cbae35addcb643a883e22de9573b.

Restores the commits lost during the revert of a merge on staging-next.
---
 lib/default.nix                               |  1 +
 lib/lists.nix                                 | 43 ++++++++-
 lib/tests/misc.nix                            | 64 +++++++++++++
 .../blockchains/bitcoin-knots/default.nix     | 68 +++++++++++++-
 .../blockchains/bitcoin/default.nix           | 57 ++++++++++++
 pkgs/applications/editors/tiled/default.nix   |  5 +-
 .../non-generated/avante-nvim/default.nix     |  8 +-
 pkgs/by-name/ch/chameleon-cli/package.nix     | 91 +++++++++++++++++++
 pkgs/by-name/ch/chameleon-cli/update.sh       | 18 ++++
 pkgs/by-name/ch/chatbox/package.nix           |  4 +-
 pkgs/by-name/ch/chhoto-url/package.nix        |  6 +-
 pkgs/by-name/cl/clouddrive2/package.nix       | 10 +-
 pkgs/by-name/cr/crush/package.nix             |  6 +-
 pkgs/by-name/dr/draupnir/hashes.json          |  2 +-
 pkgs/by-name/dr/draupnir/package.json         |  6 +-
 pkgs/by-name/dr/draupnir/package.nix          |  4 +-
 pkgs/by-name/gi/gitaly/package.nix            |  4 +-
 .../fix-broken-urlcache-tests.diff            | 22 +++++
 .../gi/gitlab-container-registry/package.nix  | 12 ++-
 pkgs/by-name/gi/gitlab-pages/package.nix      |  4 +-
 pkgs/by-name/gi/gitlab/data.json              | 14 +--
 .../gi/gitlab/gitlab-workhorse/default.nix    |  2 +-
 pkgs/by-name/im/imaginer/package.nix          | 69 --------------
 pkgs/by-name/je/jellyfin-tui/package.nix      |  4 +
 pkgs/by-name/re/release-plz/package.nix       |  6 +-
 pkgs/by-name/si/simplotask/package.nix        |  4 +-
 pkgs/by-name/ta/tageditor/package.nix         |  4 +-
 pkgs/by-name/tf/tfmigrate/package.nix         |  6 +-
 pkgs/by-name/ur/urlwatch/package.nix          | 11 ++-
 pkgs/by-name/wa/waytrogen/package.nix         | 10 +-
 pkgs/by-name/zi/zizmor/package.nix            |  6 +-
 pkgs/development/compilers/llvm/default.nix   |  2 +-
 .../python-modules/click-shell/default.nix    | 13 ++-
 .../python-modules/ecpy/default.nix           | 15 ++-
 .../python-modules/jsonargparse/default.nix   |  4 +-
 .../python-modules/mypy-boto3/default.nix     | 21 ++---
 .../python-modules/netdisco/default.nix       | 14 +--
 .../python-modules/nox/default.nix            | 45 +++++----
 .../python-modules/pyftdi/default.nix         |  4 +-
 .../python-modules/pyhomematic/default.nix    | 15 ++-
 .../python-modules/pynamecheap/default.nix    | 23 +++--
 .../python-modules/pynanoleaf/default.nix     | 13 +--
 .../python-modules/sqlfmt/default.nix         | 11 +--
 .../python-modules/sunwatcher/default.nix     | 13 +--
 .../python-modules/timetagger/default.nix     | 26 +++---
 .../python-modules/vultr/default.nix          | 14 ++-
 pkgs/servers/http/nginx/mainline.nix          |  4 +-
 pkgs/servers/spicedb/default.nix              |  6 +-
 pkgs/tools/filesystems/kdiskmark/default.nix  | 10 +-
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 51 files changed, 570 insertions(+), 257 deletions(-)
 create mode 100644 pkgs/by-name/ch/chameleon-cli/package.nix
 create mode 100755 pkgs/by-name/ch/chameleon-cli/update.sh
 create mode 100644 pkgs/by-name/gi/gitlab-container-registry/fix-broken-urlcache-tests.diff
 delete mode 100644 pkgs/by-name/im/imaginer/package.nix

diff --git a/lib/default.nix b/lib/default.nix
index d45e6de0c33f..875a1b9bb3ef 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -287,6 +287,7 @@ let
         init
         crossLists
         unique
+        uniqueStrings
         allUnique
         intersectLists
         subtractLists
diff --git a/lib/lists.nix b/lib/lists.nix
index ec0fe22d2afa..226e264176a0 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -11,7 +11,7 @@ let
     warn
     pipe
     ;
-  inherit (lib.attrsets) mapAttrs;
+  inherit (lib.attrsets) mapAttrs attrNames;
   inherit (lib) max;
 in
 rec {
@@ -1839,6 +1839,10 @@ rec {
   /**
     Remove duplicate elements from the `list`. O(n^2) complexity.
 
+    :::{.note}
+    If the list only contains strings and order is not important, the complexity can be reduced to O(n log n) by using [`lib.lists.uniqueStrings`](#function-library-lib.lists.uniqueStrings) instead.
+    :::
+
     # Inputs
 
     `list`
@@ -1864,6 +1868,43 @@ rec {
   */
   unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) [ ];
 
+  /**
+    Removes duplicate strings from the `list`. O(n log n) complexity.
+
+    :::{.note}
+    Order is not preserved.
+
+    All elements of the list must be strings without context.
+
+    This function fails when the list contains a non-string element or a [string with context](https://nix.dev/manual/nix/latest/language/string-context.html).
+    In that case use [`lib.lists.unique`](#function-library-lib.lists.unique) instead.
+    :::
+
+    # Inputs
+
+    `list`
+
+    : List of strings
+
+    # Type
+
+    ```
+    uniqueStrings :: [ String ] -> [ String ]
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.lists.uniqueStrings` usage example
+
+    ```nix
+    uniqueStrings [ "foo" "bar" "foo" ]
+    => [ "bar" "foo" ] # order is not preserved
+    ```
+
+    :::
+  */
+  uniqueStrings = list: attrNames (groupBy id list);
+
   /**
     Check if list contains only unique elements. O(n^2) complexity.
 
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 22188b4b3bae..880396a0de72 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -113,6 +113,7 @@ let
     toIntBase10
     toShellVars
     types
+    uniqueStrings
     updateManyAttrsByPath
     versions
     xor
@@ -1940,6 +1941,69 @@ runTests {
     expected = false;
   };
 
+  testUniqueStrings_empty = {
+    expr = uniqueStrings [ ];
+    expected = [ ];
+  };
+  testUniqueStrings_singles = {
+    expr = uniqueStrings [
+      "all"
+      "unique"
+      "already"
+    ];
+    expected = [
+      "all"
+      "already"
+      "unique"
+    ];
+  };
+  testUniqueStrings_allDuplicates = {
+    expr = uniqueStrings [
+      "dup"
+      "dup"
+      "dup"
+    ];
+    expected = [ "dup" ];
+  };
+  testUniqueStrings_some_duplicates = {
+    expr = uniqueStrings [
+      "foo"
+      "foo"
+      "bar"
+      "bar"
+      "baz"
+    ];
+    expected = [
+      "bar"
+      "baz"
+      "foo"
+    ];
+  };
+  testUniqueStrings_unicode = {
+    expr = uniqueStrings [
+      "café"
+      "@"
+      "#"
+      "@"
+      "#"
+      "$"
+      "😎"
+      "😎"
+      "🙃"
+      ""
+      ""
+    ];
+    expected = [
+      ""
+      "#"
+      "$"
+      "@"
+      "café"
+      "😎"
+      "🙃"
+    ];
+  };
+
   # ATTRSETS
 
   testConcatMapAttrs = {
diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix
index 53f57d737d2e..49e97d731593 100644
--- a/pkgs/applications/blockchains/bitcoin-knots/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchFromGitHub,
   autoreconfHook,
   pkg-config,
   util-linux,
@@ -21,20 +22,30 @@
   python3,
   withGui,
   withWallet ? true,
+  gnupg,
+  # Signatures from the following GPG public keys checked during verification of the source code.
+  # The list can be found at https://github.com/bitcoinknots/guix.sigs/tree/knots/builder-keys
+  builderKeys ? [
+    "1A3E761F19D2CC7785C5502EA291A2C45D0C504A" # luke-jr.gpg
+    "32FE1E61B1C711186CA378DEFD8981F1BC41ABB9" # oomahq.gpg
+    "CACC7CBB26B3D2EE8FC2F2BC0E37EBAB8574F005" # leo-haf.gpg
+  ],
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = if withGui then "bitcoin-knots" else "bitcoind-knots";
   version = "28.1.knots20250305";
 
   src = fetchurl {
-    url = "https://bitcoinknots.org/files/28.x/${version}/bitcoin-${version}.tar.gz";
+    url = "https://bitcoinknots.org/files/28.x/${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz";
+    # hash retrieved from signed SHA256SUMS
     hash = "sha256-DKO3+43Tn/BTKQVrLrCkeMtzm8SfbaJD8rPlb6lDA8A=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
+    gnupg
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
@@ -58,11 +69,58 @@ stdenv.mkDerivation rec {
     qttools
   ];
 
+  preUnpack =
+    let
+      majorVersion = lib.versions.major finalAttrs.version;
+
+      publicKeys = fetchFromGitHub {
+        owner = "bitcoinknots";
+        repo = "guix.sigs";
+        rev = "b998306d462f39b6077518521700d7156fec76b8";
+        sha256 = "sha256-q4tumAfTr828AZNOa9ia7Y0PYoe6W47V/7SEApTzl3w=";
+      };
+
+      checksums = fetchurl {
+        url = "https://bitcoinknots.org/files/${majorVersion}.x/${finalAttrs.version}/SHA256SUMS";
+        hash = "sha256-xWJKaZBLm9H6AuMBSC21FLy/5TRUI0AQVIUF/2PvDhs=";
+      };
+
+      signatures = fetchurl {
+        url = "https://bitcoinknots.org/files/${majorVersion}.x/${finalAttrs.version}/SHA256SUMS.asc";
+        hash = "sha256-SywdBEzZqsf2aDeOs7J9n513RTCm+TJA/QYP5+h7Ifo=";
+      };
+
+      verifyBuilderKeys =
+        let
+          script = publicKey: ''
+            echo "Checking if public key ${publicKey} signed the checksum file..."
+            grep "^\[GNUPG:\] VALIDSIG .* ${publicKey}$" verify.log > /dev/null
+            echo "OK"
+          '';
+        in
+        builtins.concatStringsSep "\n" (builtins.map script builderKeys);
+    in
+    ''
+      pushd $(mktemp -d)
+      export GNUPGHOME=$PWD/gnupg
+      mkdir -m 700 -p $GNUPGHOME
+      gpg --no-autostart --batch --import ${publicKeys}/builder-keys/*
+      ln -s ${checksums} ./SHA256SUMS
+      ln -s ${signatures} ./SHA256SUMS.asc
+      ln -s $src ./bitcoin-${finalAttrs.version}.tar.gz
+      gpg --no-autostart --batch --verify --status-fd 1 SHA256SUMS.asc SHA256SUMS > verify.log
+      ${verifyBuilderKeys}
+      grep bitcoin-${finalAttrs.version}.tar.gz SHA256SUMS > SHA256SUMS.filtered
+      echo "Verifying the checksum of bitcoin-${finalAttrs.version}.tar.gz..."
+      sha256sum -c SHA256SUMS.filtered
+      popd
+    '';
+
   configureFlags = [
     "--with-boost-libdir=${boost.out}/lib"
     "--disable-bench"
   ]
-  ++ lib.optionals (!doCheck) [
+  ++ lib.optionals (!finalAttrs.doCheck) [
     "--disable-tests"
     "--disable-gui-tests"
   ]
@@ -90,7 +148,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Derivative of Bitcoin Core with a collection of improvements";
     homepage = "https://bitcoinknots.org/";
-    changelog = "https://github.com/bitcoinknots/bitcoin/blob/v${version}/doc/release-notes.md";
+    changelog = "https://github.com/bitcoinknots/bitcoin/blob/v${finalAttrs.version}/doc/release-notes.md";
     maintainers = with lib.maintainers; [
       prusnak
       mmahut
@@ -98,4 +156,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix
index 809f8665050f..1c63e4293929 100644
--- a/pkgs/applications/blockchains/bitcoin/default.nix
+++ b/pkgs/applications/blockchains/bitcoin/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchFromGitHub,
   cmake,
   pkg-config,
   installShellFiles,
@@ -23,6 +24,16 @@
   withGui,
   withWallet ? true,
   enableTracing ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic,
+  gnupg,
+  # Signatures from the following GPG public keys checked during verification of the source code.
+  # The list can be found at https://github.com/bitcoin-core/guix.sigs/tree/main/builder-keys
+  builderKeys ? [
+    "152812300785C96444D3334D17565732E08E5E41" # achow101.gpg
+    "9EDAFF80E080659604F4A76B2EBB056FD847F8A7" # Emzy.gpg
+    "71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg
+    "6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C" # glozow.gpg
+    "D1DBF2C4B96F2DEBF4C16654410108112E7EA81F" # hebasto.gpg
+  ],
 }:
 
 let
@@ -48,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     pkg-config
     installShellFiles
+    gnupg
   ]
   ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
     autoSignDarwinBinariesHook
@@ -70,6 +82,51 @@ stdenv.mkDerivation (finalAttrs: {
     qttools
   ];
 
+  preUnpack =
+    let
+      publicKeys = fetchFromGitHub {
+        owner = "bitcoin-core";
+        repo = "guix.sigs";
+        rev = "a788388207bd244d5ab07b31ecd6c126f213a6c6";
+        sha256 = "sha256-gbenuEWP6pqY9ywPd/yZy6QfWI7jvSObwto27DRXjGI=";
+      };
+
+      checksums = fetchurl {
+        url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS";
+        hash = "sha256-lOwVH0UqIhOT0I9rAvswuqy+tZ8ZRhH0kGnn9VCbRv4=";
+      };
+
+      signatures = fetchurl {
+        url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS.asc";
+        hash = "sha256-s05cRmZ9aoPdSZTaz6D6qmVwX6OprqxynPn5vZQ7bbw=";
+      };
+
+      verifyBuilderKeys =
+        let
+          script = publicKey: ''
+            echo "Checking if public key ${publicKey} signed the checksum file..."
+            grep "^\[GNUPG:\] VALIDSIG .* ${publicKey}$" verify.log > /dev/null
+            echo "OK"
+          '';
+        in
+        builtins.concatStringsSep "\n" (builtins.map script builderKeys);
+    in
+    ''
+      pushd $(mktemp -d)
+      export GNUPGHOME=$PWD/gnupg
+      mkdir -m 700 -p $GNUPGHOME
+      gpg --no-autostart --batch --import ${publicKeys}/builder-keys/*
+      ln -s ${checksums} ./SHA256SUMS
+      ln -s ${signatures} ./SHA256SUMS.asc
+      ln -s $src ./bitcoin-${finalAttrs.version}.tar.gz
+      gpg --no-autostart --batch --verify --status-fd 1 SHA256SUMS.asc SHA256SUMS > verify.log
+      ${verifyBuilderKeys}
+      grep bitcoin-${finalAttrs.version}.tar.gz SHA256SUMS > SHA256SUMS.filtered
+      echo "Verifying the checksum of bitcoin-${finalAttrs.version}.tar.gz..."
+      sha256sum -c SHA256SUMS.filtered
+      popd
+    '';
+
   postInstall = ''
     cd ..
     installShellCompletion --bash contrib/completions/bash/bitcoin-cli.bash
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 773b149a0b6f..e5e031b2b1f4 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -28,13 +28,14 @@ in
 
 stdenv.mkDerivation rec {
   pname = "tiled";
-  version = "1.11.90";
+  # nixpkgs-update: no auto update
+  version = "1.11.2";
 
   src = fetchFromGitHub {
     owner = "mapeditor";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-gGsozdFEE5c315DF+EsIY9wGv50wwrOBycejTkVwEHA=";
+    sha256 = "sha256-9oUKn51MQcsStgIJrp9XW5YAIpAUcO0kzfGnYA3gz/E=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index ba0190c093d1..3afecf4ffc90 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -12,18 +12,18 @@
   pkgs,
 }:
 let
-  version = "0.0.27-unstable-2025-08-06";
+  version = "0.0.27-unstable-2025-08-14";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    rev = "2fc63d4128d2dc2fef0913c7480b4586959ebe4e";
-    hash = "sha256-hHa300Ldszsnp6AuYVJwOFc5FfuRTd3phyM6/qBUIQo=";
+    rev = "be0937a459624ce1170f158f9d8660d0ade47eb4";
+    hash = "sha256-1NzzyWW2Tp91wa+Ujv2cDTv/Cb/HgA6LiDuwxVWdJwU=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";
     inherit version src;
 
-    cargoHash = "sha256-8mBpzndz34RrmhJYezd4hLrJyhVL4S4IHK3plaue1k8=";
+    cargoHash = "sha256-pTWCT2s820mjnfTscFnoSKC37RE7DAPKxP71QuM+JXQ=";
 
     nativeBuildInputs = [
       pkg-config
diff --git a/pkgs/by-name/ch/chameleon-cli/package.nix b/pkgs/by-name/ch/chameleon-cli/package.nix
new file mode 100644
index 000000000000..fec07c514110
--- /dev/null
+++ b/pkgs/by-name/ch/chameleon-cli/package.nix
@@ -0,0 +1,91 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  makeWrapper,
+  xz,
+  python3,
+}:
+
+let
+  # https://github.com/RfidResearchGroup/ChameleonUltra/blob/main/software/script/requirements.txt
+  pythonPath =
+    with python3.pkgs;
+    makePythonPath [
+      colorama
+      prompt-toolkit
+      pyserial
+    ];
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "chameleon-cli";
+  version = "2.0.0-unstable-2025-08-04";
+
+  src = fetchFromGitHub {
+    owner = "RfidResearchGroup";
+    repo = "ChameleonUltra";
+    rev = "098e0a914b206900f7ea7ae7265486c4349ab644";
+    sparseCheckout = [ "software" ];
+    hash = "sha256-WKxP4jLHkTqBO+nwxhr8DRb3TzDIMlwjA4v+6txQbDo=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/software";
+
+  patches = [
+    # Use execute_tool to simplify running hardnested tool,
+    # also fix when the dir conatains hardnested is read only
+    # https://github.com/RfidResearchGroup/ChameleonUltra/pull/266
+    (fetchpatch {
+      url = "https://github.com/RfidResearchGroup/ChameleonUltra/commit/39270fd09ee61ef0659bf3b79ffa4d2b27f3ba63.patch";
+      hash = "sha256-OlHQ2cL+NFdTsSPFI9geg3dabATRjyKxGp5gGG+eDl8=";
+      stripLen = 1;
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace src/CMakeLists.txt \
+      --replace-fail "liblzma" "lzma" \
+      --replace-fail "FetchContent_MakeAvailable(xz)" ""
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+  ];
+
+  buildInputs = [
+    xz
+  ];
+
+  cmakeFlags = [
+    "-S"
+    "../src"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/libexec
+    cp -r ../script/* $out/libexec
+    rm -r $out/libexec/tests
+    rm $out/libexec/requirements.txt
+    makeWrapper ${lib.getExe python3} $out/bin/chameleon-cli \
+      --add-flags "$out/libexec/chameleon_cli_main.py" \
+      --prefix PYTHONPATH : ${pythonPath}
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Command line interface for Chameleon Ultra";
+    homepage = "https://github.com/RfidResearchGroup/ChameleonUltra";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "chameleon-cli";
+    maintainers = with lib.maintainers; [ azuwis ];
+  };
+})
diff --git a/pkgs/by-name/ch/chameleon-cli/update.sh b/pkgs/by-name/ch/chameleon-cli/update.sh
new file mode 100755
index 000000000000..2875b72ffacd
--- /dev/null
+++ b/pkgs/by-name/ch/chameleon-cli/update.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p coreutils nix-update
+
+# This update script exists, because nix-update is unable to ignore `dev`
+# tags that exist on the upstream repo.
+#
+# Once https://github.com/Mic92/nix-update/issues/322 is resolved it can be
+# removed.
+
+set -exuo pipefail
+
+cd "$(git rev-parse --show-toplevel)"
+
+nix-update --version=branch chameleon-cli
+
+tag=$(git ls-remote --tags --refs --sort='-version:refname' https://github.com/RfidResearchGroup/ChameleonUltra.git 'v*' | head -n 1 | cut --delimiter=/ --field=3-)
+tag="${tag#v}"
+sed -i -e 's|version = "[^-]*-unstable-|version = "'"${tag}"'-unstable-|' pkgs/by-name/ch/chameleon-cli/package.nix
diff --git a/pkgs/by-name/ch/chatbox/package.nix b/pkgs/by-name/ch/chatbox/package.nix
index 87cabe193265..75d9a8577dea 100644
--- a/pkgs/by-name/ch/chatbox/package.nix
+++ b/pkgs/by-name/ch/chatbox/package.nix
@@ -6,11 +6,11 @@
 }:
 let
   pname = "chatbox";
-  version = "1.15.2";
+  version = "1.15.4";
 
   src = fetchurl {
     url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage";
-    hash = "sha256-KxL073BIfZfjFndwtkDNXwlt1xny76BMV9CQF3x7ATQ=";
+    hash = "sha256-plKibAg1tv0Togt+Jlwm8qrTp7UbBmuEM20xKLi7bb4=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };
diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index 2f73b19d3f68..2a9abd251ea6 100644
--- a/pkgs/by-name/ch/chhoto-url/package.nix
+++ b/pkgs/by-name/ch/chhoto-url/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chhoto-url";
-  version = "6.2.12";
+  version = "6.2.13";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-hV/YWxOPRTojVTFIXwzqImBKyQ1dCDq5+bgCdS7T1p0=";
+    hash = "sha256-onGmDAVhT2lzq2pQ5runGuHgPdh1MjgFLU7DUvN7nt0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-9wXbd56KOQ7suZqtg2cSFf2FGQJADFMHJbwAAxJ2V4g=";
+  cargoHash = "sha256-GbjbVr82Aj/CRdBl9gPGwHiyrc7l2F918DNnlEoPI58=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url
diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix
index 8d5649807fc4..5c8bcfd3fa2b 100644
--- a/pkgs/by-name/cl/clouddrive2/package.nix
+++ b/pkgs/by-name/cl/clouddrive2/package.nix
@@ -11,16 +11,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clouddrive2";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchurl {
     url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
     hash =
       {
-        x86_64-linux = "sha256-i6+YoZfCFaVcF7XO7wPo8AEpU0LrD4bcsIqLNz/V3aM=";
-        aarch64-linux = "sha256-BV+47uJnvH/Gapz7dACnXIM49x7u/MTdbXiFRGq2DVc=";
-        x86_64-darwin = "sha256-Jjsdx203akCmlveGZD1x8fO6V0N5d3AzGAFIAzgOkHs=";
-        aarch64-darwin = "sha256-DuSZoXTQyfC3CIwNGTsGuQNP410rK9qMBei5T7TZN7A=";
+        x86_64-linux = "sha256-Gsq5rvr0SeGxCRwAeeFRZBPOe32EIa7uO6SAIuinezA=";
+        aarch64-linux = "sha256-M+lCUzoiy/sImBZrOjjeP4eqG3F4wbkMQg9Ho3ELGFo=";
+        x86_64-darwin = "sha256-Uyz1wuHICSq5C+n3ZjPinZznhajd6QR36CZgQBm+QRE=";
+        aarch64-darwin = "sha256-ZQxRHTzLUAhnL1rRLR9l8Ix5XzxeTAds7XAmEgZ9Xmo=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };
diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix
index d7578f1aaffc..8ccf5e0f0454 100644
--- a/pkgs/by-name/cr/crush/package.nix
+++ b/pkgs/by-name/cr/crush/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "crush";
-  version = "0.5.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "crush";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-u2w19Xmcm3cx/B8QRNGaP2qeg+Cif/L92RNlJav6H3w=";
+    hash = "sha256-QUYNJ2Ifny9Zj9YVQHcH80E2qa4clWVg2T075IEWujM=";
   };
 
-  vendorHash = "sha256-H92TgZoWdYQ863AAb2116zJtmgkKXh2hRoEBRcn5zeA=";
+  vendorHash = "sha256-vdzAVVGr7uTW/A/I8TcYW189E3960SCIqatu7Kb60hg=";
 
   # rename TestMain to prevent it from running, as it panics in the sandbox.
   postPatch = ''
diff --git a/pkgs/by-name/dr/draupnir/hashes.json b/pkgs/by-name/dr/draupnir/hashes.json
index 25bf893bf38c..a509437a3988 100644
--- a/pkgs/by-name/dr/draupnir/hashes.json
+++ b/pkgs/by-name/dr/draupnir/hashes.json
@@ -1,3 +1,3 @@
 {
-  "yarn_offline_cache_hash": "sha256-xB9SKCM9m2LotwxIzGgT72mLgrDW2spqvR5VoyexIAA="
+  "yarn_offline_cache_hash": "sha256-SoCuCzrKUWWsD/oEh2W3/T1/hhd7ghfpeBojo84sEI8="
 }
diff --git a/pkgs/by-name/dr/draupnir/package.json b/pkgs/by-name/dr/draupnir/package.json
index 5cbbdbf553c8..bbd5e30084f3 100644
--- a/pkgs/by-name/dr/draupnir/package.json
+++ b/pkgs/by-name/dr/draupnir/package.json
@@ -1,6 +1,6 @@
 {
   "name": "draupnir",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "A moderation tool for Matrix",
   "main": "lib/index.js",
   "repository": "https://github.com/the-draupnir-project/Draupnir.git",
@@ -63,8 +63,8 @@
     "jsdom": "^24.0.0",
     "matrix-appservice-bridge": "^10.3.1",
     "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6",
-    "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@3.10.0",
-    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@3.8.0",
+    "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@3.11.0",
+    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@3.11.0",
     "pg": "^8.8.0",
     "yaml": "^2.3.2"
   },
diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix
index ef61dcf66e02..c36d4823a41b 100644
--- a/pkgs/by-name/dr/draupnir/package.nix
+++ b/pkgs/by-name/dr/draupnir/package.nix
@@ -22,13 +22,13 @@ let
 in
 mkYarnPackage rec {
   pname = "draupnir";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "the-draupnir-project";
     repo = "Draupnir";
     tag = "v${version}";
-    hash = "sha256-v6dHexu9x60onBoHbdI+15p6r5m6mi7bRLgZ9jqF19s=";
+    hash = "sha256-KO2jm9yD/LnJSY1dAbPQ2fJZhmrxWJHU+TIaZzK97bg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 664edf9b73df..884cb31f11cb 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.2.1";
+  version = "18.2.2";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -21,7 +21,7 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-h4JklXImKwudJT3pb/UhHwQHKd87c5aSH1xYC0lRWKo=";
+      hash = "sha256-+OmduG9neb15m3i57qPfE42HI4w/zgmA5T6bhlwzrT0=";
     };
 
     vendorHash = "sha256-RjDV4NGmmdT9STQBHiYf3UUYwPmuSg6970/W/ekxin0=";
diff --git a/pkgs/by-name/gi/gitlab-container-registry/fix-broken-urlcache-tests.diff b/pkgs/by-name/gi/gitlab-container-registry/fix-broken-urlcache-tests.diff
new file mode 100644
index 000000000000..2da75604d95f
--- /dev/null
+++ b/pkgs/by-name/gi/gitlab-container-registry/fix-broken-urlcache-tests.diff
@@ -0,0 +1,22 @@
+diff --git a/registry/storage/driver/middleware/urlcache/urlcache_test.go b/registry/storage/driver/middleware/urlcache/urlcache_test.go
+index 67ef4abc0e..6644c80837 100644
+--- a/registry/storage/driver/middleware/urlcache/urlcache_test.go
++++ b/registry/storage/driver/middleware/urlcache/urlcache_test.go
+@@ -37,7 +37,7 @@
+ 			name:        "missing redis cache",
+ 			options:     make(map[string]any),
+ 			wantErr:     true,
+-			errContains: "urlcache middleware requires `cache` Redis configured",
++			errContains: "`_redisCache` key has not been passed to urlcache middleware",
+ 		},
+ 		{
+ 			name: "default configuration with redis",
+@@ -231,7 +231,7 @@
+ 				"_redisCache": "not a redis cache",
+ 			},
+ 			wantErr:     true,
+-			errContains: "unusable redis cache object",
++			errContains: "redis cache passed to the middleware cannot be used as the type is wrong",
+ 		},
+ 	}
+ 
diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix
index 217966c4b1eb..cbf8c0f80ede 100644
--- a/pkgs/by-name/gi/gitlab-container-registry/package.nix
+++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule rec {
   pname = "gitlab-container-registry";
-  version = "4.25.0";
+  version = "4.26.0";
   rev = "v${version}-gitlab";
 
   # nixpkgs-update: no auto update
@@ -14,10 +14,16 @@ buildGoModule rec {
     owner = "gitlab-org";
     repo = "container-registry";
     inherit rev;
-    hash = "sha256-7jzKFC29NAHi5iag6aA/5LzH6IyqMa3yAxtzV9OsBnQ=";
+    hash = "sha256-XACKJW5sRXNM4Q24DXEVtjzhVfxoBd+JWHJr1s01ocA=";
   };
 
-  vendorHash = "sha256-z9IlfyJ48FQzhbY38GbZaeQjg3cMDU8tLCXKhazP64A=";
+  patches = [
+    # https://gitlab.com/gitlab-org/container-registry/-/merge_requests/2447
+    # Can be removed with next released when merged
+    ./fix-broken-urlcache-tests.diff
+  ];
+
+  vendorHash = "sha256-J4p3vXLmDFYl/z6crqanlmG1FB4Dq04HLx9IhC3usQ4=";
 
   checkFlags =
     let
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index 452d624d23e2..e5d5874ba7bb 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -6,14 +6,14 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "18.2.1";
+  version = "18.2.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-z1Pl3xeaoqeF/9qOVcuCpuciu1r6NQ4UhlLe9gy9+nE=";
+    hash = "sha256-PPa9SYyE3G+peP2xSpNw7WDDO7WiWKSRpd5tBODkA0g=";
   };
 
   vendorHash = "sha256-OubXCpvGtGqegQmdb6R1zw/0DfQ4FdbJGt7qYYRnWnA=";
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index c170a0a5d80b..e14fe7e4fd69 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "18.2.1",
-  "repo_hash": "1i0y46w18476gn98fmkixdjiyrwajz2347p57dg2ijch4ivzpmlv",
-  "yarn_hash": "04mqinnbhr6zgab2p1bq6y6b20bf4c4cynkgfc67mzm9xhybr3fk",
+  "version": "18.2.2",
+  "repo_hash": "0fqpfprxmgxaz5g0d5z4gsir1zj9fkhli7iq1ahx413ymsiqrxd0",
+  "yarn_hash": "0c6njrciqcjaswh784yxly4qza6k2ghq1ljbdkcn65cna4f4hwgk",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.2.1-ee",
+  "rev": "v18.2.2-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.2.1",
-    "GITLAB_PAGES_VERSION": "18.2.1",
+    "GITALY_SERVER_VERSION": "18.2.2",
+    "GITLAB_PAGES_VERSION": "18.2.2",
     "GITLAB_SHELL_VERSION": "14.43.0",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0",
-    "GITLAB_WORKHORSE_VERSION": "18.2.1"
+    "GITLAB_WORKHORSE_VERSION": "18.2.2"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index 739a24476dec..2bec55c36570 100644
--- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
@@ -10,7 +10,7 @@ in
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "18.2.1";
+  version = "18.2.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
diff --git a/pkgs/by-name/im/imaginer/package.nix b/pkgs/by-name/im/imaginer/package.nix
deleted file mode 100644
index a73faf7fad89..000000000000
--- a/pkgs/by-name/im/imaginer/package.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  lib,
-  appstream-glib,
-  blueprint-compiler,
-  desktop-file-utils,
-  fetchFromGitHub,
-  gettext,
-  glib,
-  gobject-introspection,
-  libadwaita,
-  libsoup_3,
-  meson,
-  ninja,
-  pkg-config,
-  python3Packages,
-  wrapGAppsHook4,
-}:
-
-python3Packages.buildPythonApplication rec {
-  pname = "imaginer";
-  version = "0.1.3";
-
-  src = fetchFromGitHub {
-    owner = "ImaginerApp";
-    repo = "Imaginer";
-    rev = "v${version}";
-    hash = "sha256-x1ZnmfaMfxnITiuFDlMPfTU8KZbd1ME9jDevnlsrbJs=";
-  };
-
-  format = "other";
-  dontWrapGApps = true;
-
-  nativeBuildInputs = [
-    appstream-glib
-    blueprint-compiler
-    desktop-file-utils
-    gettext
-    glib
-    gobject-introspection
-    meson
-    ninja
-    pkg-config
-    wrapGAppsHook4
-  ];
-
-  buildInputs = [
-    libadwaita
-    libsoup_3
-  ];
-
-  propagatedBuildInputs = with python3Packages; [
-    openai
-    pillow
-    pygobject3
-    requests
-  ];
-
-  preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/ImaginerApp/Imaginer";
-    description = "AI image generator for GNOME";
-    mainProgram = "imaginer";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ _0xMRTT ];
-  };
-}
diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix
index 0c6b659a011e..5b7840e4b4a6 100644
--- a/pkgs/by-name/je/jellyfin-tui/package.nix
+++ b/pkgs/by-name/je/jellyfin-tui/package.nix
@@ -43,6 +43,10 @@ rustPlatform.buildRustPackage rec {
   '';
   doInstallCheck = true;
 
+  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
+    install -Dm644 src/extra/jellyfin-tui.desktop $out/share/applications/jellyfin-tui.desktop
+  '';
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix
index 84ffbab32ec6..535fdaea13a8 100644
--- a/pkgs/by-name/re/release-plz/package.nix
+++ b/pkgs/by-name/re/release-plz/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "release-plz";
-  version = "0.3.139";
+  version = "0.3.140";
 
   src = fetchFromGitHub {
     owner = "MarcoIeni";
     repo = "release-plz";
     rev = "release-plz-v${version}";
-    hash = "sha256-s2PvMJu0RLO2AOMMonq4xdZlQXHrvKoqh4v9tp72Ud0=";
+    hash = "sha256-pJHyf1aSn4YqzFYW6otuRY+gJ6TBCKFGQuH2Py5uWlE=";
   };
 
-  cargoHash = "sha256-S5YhAcEhTbiM0VCAy3IiObc1uCPbsIi0QqeFxocVqw4=";
+  cargoHash = "sha256-LfadgdrGD9g/PNeFs/XNUk2x0h1i3znzMhIV+w1DjMk=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix
index 66c0d21ebe0d..d98b732ee128 100644
--- a/pkgs/by-name/si/simplotask/package.nix
+++ b/pkgs/by-name/si/simplotask/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "simplotask";
-  version = "1.17.2";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "spot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7EavT4IHEAe3nq6tkhX7qHpDzy7UTdBMZ7x/bquv4Z8=";
+    hash = "sha256-0XAxjh9TWMqMkeSEhdgXX9DflHnT40f7VkHgp1QjQUg=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ta/tageditor/package.nix b/pkgs/by-name/ta/tageditor/package.nix
index f0babd818ed2..de03722f3c4e 100644
--- a/pkgs/by-name/ta/tageditor/package.nix
+++ b/pkgs/by-name/ta/tageditor/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tageditor";
-  version = "3.9.5";
+  version = "3.9.6";
 
   src = fetchFromGitHub {
     owner = "martchus";
     repo = "tageditor";
     tag = "v${version}";
-    hash = "sha256-Sia6Y/V81WQj4oWjZAAR4o3TngfWq7sWxxiKEuFjQ2M=";
+    hash = "sha256-weGLC8TPSA9XQ/TuLj4DBswmlEbpxPplsxI4sqygHfU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tf/tfmigrate/package.nix b/pkgs/by-name/tf/tfmigrate/package.nix
index 0b8ba744f031..54460e85527c 100644
--- a/pkgs/by-name/tf/tfmigrate/package.nix
+++ b/pkgs/by-name/tf/tfmigrate/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tfmigrate";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "minamijoyo";
     repo = "tfmigrate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+5nw+EgFTor8XL4cibxkpJL4fdEQ6UuEj5wyOjpaANA=";
+    hash = "sha256-tuLbcxJj8TsG3I/o3cHO2DtQm9ql3wlhYBtYiMbRW7o=";
   };
 
-  vendorHash = "sha256-mm34U4nLow4lCz/AgfqYZJRb71GpQjR14+tm0hfmdDc=";
+  vendorHash = "sha256-TqZi5NZ+4eSzq98/ZM4Gab7Sud7bz1DNHrp5nGaGHDE=";
 
   checkFlags = [
     "-skip TestExecutorDir" # assumes /usr/bin to be present
diff --git a/pkgs/by-name/ur/urlwatch/package.nix b/pkgs/by-name/ur/urlwatch/package.nix
index 972cd24c1cfd..73429bad880c 100644
--- a/pkgs/by-name/ur/urlwatch/package.nix
+++ b/pkgs/by-name/ur/urlwatch/package.nix
@@ -12,22 +12,26 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "thp";
     repo = "urlwatch";
-    rev = version;
+    tag = version;
     hash = "sha256-X1UR9JrQuujOIUg87W0YqfXsM3A5nttWjjJMIe3hgk8=";
   };
 
   build-system = with python3Packages; [ setuptools ];
 
   dependencies = with python3Packages; [
+    aioxmpp
+    beautifulsoup4
+    cssbeautifier
     cssselect
     jq
+    jsbeautifier
     keyring
     lxml
     markdown2
     matrix-client
     minidb
-    playwright
     platformdirs
+    playwright
     pushbullet-py
     pycodestyle
     pyyaml
@@ -41,12 +45,13 @@ python3Packages.buildPythonApplication rec {
 
   meta = with lib; {
     description = "Tool for monitoring webpages for updates";
-    mainProgram = "urlwatch";
     homepage = "https://thp.io/2008/urlwatch/";
+    changelog = "https://github.com/thp/urlwatch/blob/${src.tag}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [
       kmein
       tv
     ];
+    mainProgram = "urlwatch";
   };
 }
diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix
index 27aec72ba5b3..922b7e0e19e4 100644
--- a/pkgs/by-name/wa/waytrogen/package.nix
+++ b/pkgs/by-name/wa/waytrogen/package.nix
@@ -16,19 +16,19 @@
   desktop-file-utils,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "waytrogen";
   version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "nikolaizombie1";
     repo = "waytrogen";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-vFzOGadWR5xwhIKrKPHoAHstoeyFw4GrS5aYlpvEF5E=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
+    inherit (finalAttrs) pname version src;
     hash = "sha256-k6n6aWEJ/8Dkbd68CJfJ7kbRTltCuQ4AtZ5dALFD3lU=";
   };
 
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
       in the Rust 🦀 programming language. Supports hyprpaper, swaybg, mpvpaper and swww wallpaper changers.
     '';
     homepage = "https://github.com/nikolaizombie1/waytrogen";
-    changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${version}";
+    changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${finalAttrs.version}";
     license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [
       genga898
@@ -76,4 +76,4 @@ stdenv.mkDerivation rec {
     mainProgram = "waytrogen";
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
index cde6a3164478..0ce9a1fd6dad 100644
--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zizmor";
-  version = "1.11.0";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "zizmorcore";
     repo = "zizmor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zxEF76zpqwLroC5GjSkwIC3+XdXmErvabIEqhVe0zCA=";
+    hash = "sha256-GnKSbcsVYzbhsrwIUAEArltzQe0IE2tiIr2CqsMQyzk=";
   };
 
-  cargoHash = "sha256-vxDyao9pX/CfS08vFmq3vXtgDIg5NXlEwpzroGW48dA=";
+  cargoHash = "sha256-wLJlaV59sAo97KI6Ekw42aaG6hVkul1wFvcC+71+Zp4=";
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     installShellFiles
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index d20085c94014..0478e9bd4c85 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -86,4 +86,4 @@ let
 
   llvmPackages = lib.mapAttrs' (version: args: mkPackage (args // { inherit version; })) versions;
 in
-llvmPackages // { inherit mkPackage; }
+llvmPackages // { inherit mkPackage versions; }
diff --git a/pkgs/development/python-modules/click-shell/default.nix b/pkgs/development/python-modules/click-shell/default.nix
index fa95216a3267..5f4536439d3e 100644
--- a/pkgs/development/python-modules/click-shell/default.nix
+++ b/pkgs/development/python-modules/click-shell/default.nix
@@ -5,14 +5,15 @@
   click,
   pytestCheckHook,
   pytest-click,
+  setuptools,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "click-shell";
   version = "2.1";
-  format = "setuptools";
+  pyproject = true;
 
-  # PyPi release is missing tests
   src = fetchFromGitHub {
     owner = "clarkperkins";
     repo = "click-shell";
@@ -20,17 +21,18 @@ buildPythonPackage rec {
     hash = "sha256-4QpQzg0yFuOFymGiTI+A8o6LyX78iTJMqr0ernYbilI=";
   };
 
-  propagatedBuildInputs = [ click ];
+  build-system = [ setuptools ];
+
+  dependencies = [ click ];
 
   nativeCheckInputs = [
     pytest-click
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
   pythonImportsCheck = [ "click_shell" ];
 
-  preCheck = "export HOME=$(mktemp -d)";
-
   meta = with lib; {
     description = "Extension to click that easily turns your click app into a shell utility";
     longDescription = ''
@@ -40,6 +42,7 @@ buildPythonPackage rec {
       with command completion to any click app.
     '';
     homepage = "https://github.com/clarkperkins/click-shell";
+    changelog = "https://github.com/clarkperkins/click-shell/releases/tag/${src.tag}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ binsky ];
   };
diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix
index da36c1c3c865..4303f4806d44 100644
--- a/pkgs/development/python-modules/ecpy/default.nix
+++ b/pkgs/development/python-modules/ecpy/default.nix
@@ -2,26 +2,21 @@
   lib,
   fetchPypi,
   buildPythonPackage,
-  isPy3k,
-  future,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "ecpy";
   version = "1.2.5";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "ECPy";
     inherit version;
-    sha256 = "9635cffb9b6ecf7fd7f72aea1665829ac74a1d272006d0057d45a621aae20228";
+    hash = "sha256-ljXP+5tuz3/X9yrqFmWCmsdKHScgBtAFfUWmIariAig=";
   };
 
-  prePatch = ''
-    sed -i "s|reqs.append('future')|pass|" setup.py
-  '';
-
-  propagatedBuildInputs = lib.optional (!isPy3k) future;
+  build-system = [ setuptools ];
 
   # No tests implemented
   doCheck = false;
@@ -31,6 +26,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Pure Pyhton Elliptic Curve Library";
     homepage = "https://github.com/ubinity/ECPy";
+    changelog = "https://github.com/cslashm/ECPy/releases/tag/${version}";
     license = licenses.asl20;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix
index 90588f7b6864..f1c6e76b41a3 100644
--- a/pkgs/development/python-modules/jsonargparse/default.nix
+++ b/pkgs/development/python-modules/jsonargparse/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "jsonargparse";
-  version = "4.40.1";
+  version = "4.40.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "omni-us";
     repo = "jsonargparse";
     tag = "v${version}";
-    hash = "sha256-GxltSN1o7vAZQXrejpBp5YMqOQaln8pqKxmGNa0vA/Q=";
+    hash = "sha256-3Zs2F46tGcvIF9UOGI/P079BZLJJyEyP9LDPRfvSk4E=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3dd094a0edd8..32201783ddbc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -402,8 +402,8 @@ rec {
       "sha256-aQR1CrCbisf0vApIjFXa5/oKC4Q1eT0AsLTg0EBojAs=";
 
   mypy-boto3-directconnect =
-    buildMypyBoto3Package "directconnect" "1.40.0"
-      "sha256-UmrcCxy3zK/cEkM/KCGnr4JEMOOjhNwBNRC6IiMm+NM=";
+    buildMypyBoto3Package "directconnect" "1.40.10"
+      "sha256-ZM9nCSSzMmRjyxnypQcaORwYXiXMXz25Gw2dJlOVcc0=";
 
   mypy-boto3-discovery =
     buildMypyBoto3Package "discovery" "1.40.0"
@@ -558,8 +558,8 @@ rec {
       "sha256-i76hozLLcN4Y5Jpg/92+6FSgStpw2SfF0HeRhQiRPqE=";
 
   mypy-boto3-fsx =
-    buildMypyBoto3Package "fsx" "1.40.9"
-      "sha256-mNs8PA3GpvonrX6vwErh1muD4K2+zdr0ZWvOJP8PRjY=";
+    buildMypyBoto3Package "fsx" "1.40.10"
+      "sha256-E9s3Mh66bXUsy/BUPorYaOp58hkY0HpkyX3dX0OsXz4=";
 
   mypy-boto3-gamelift =
     buildMypyBoto3Package "gamelift" "1.40.0"
@@ -576,7 +576,6 @@ rec {
   mypy-boto3-glue =
     buildMypyBoto3Package "glue" "1.40.15"
       "sha256-N7fPk0kCAxoiMds7lDpqUcl32+po7MwWI4lHySADHyA=";
-
   mypy-boto3-grafana =
     buildMypyBoto3Package "grafana" "1.40.0"
       "sha256-KQqyk9PFUttzDrZW7viev8xbumdud05EBdNoxz//hEY=";
@@ -866,8 +865,8 @@ rec {
       "sha256-DJEU4Ha8jpV/J8UP6emYMjcv9RfZt1njsBPD11q0BUI=";
 
   mypy-boto3-medialive =
-    buildMypyBoto3Package "medialive" "1.40.0"
-      "sha256-+2qM6+qeDJnvkvVI+z1EzMfGps7ejjVq4FOxOfEzJdg=";
+    buildMypyBoto3Package "medialive" "1.40.10"
+      "sha256-hGbdgOvsb+gd7640D1WeXj4tOkzuGwi8Ib/RmmQd4tY=";
 
   mypy-boto3-mediapackage =
     buildMypyBoto3Package "mediapackage" "1.40.15"
@@ -1246,8 +1245,8 @@ rec {
       "sha256-ET2prHzHi0EBkWB9MlmdudaaJhay5in5+rdUF0T6veE=";
 
   mypy-boto3-servicediscovery =
-    buildMypyBoto3Package "servicediscovery" "1.40.0"
-      "sha256-hg/KQ7V0ej2jmLLYLmBChuxZ4IvKypMWAOs6j5zRoYY=";
+    buildMypyBoto3Package "servicediscovery" "1.40.10"
+      "sha256-/Gyq9dgCjeIrNTxUqE/mvfPr+4c+Ann5+ep3/NJhrW8=";
 
   mypy-boto3-ses =
     buildMypyBoto3Package "ses" "1.40.0"
@@ -1426,8 +1425,8 @@ rec {
       "sha256-zApXRQ+MpzmwpQcghnoC34FaKlLQ/g8kZZUwbU0G8p8=";
 
   mypy-boto3-workspaces =
-    buildMypyBoto3Package "workspaces" "1.40.0"
-      "sha256-LRf2JH9+Z+a1yX1TodO6ASUFY7+Ct9RLu2BS0CF3X0U=";
+    buildMypyBoto3Package "workspaces" "1.40.10"
+      "sha256-6PTGF3akduOS0VRS43ykcKzK25iyQb+bqvpCe+BM9Qw=";
 
   mypy-boto3-workspaces-web =
     buildMypyBoto3Package "workspaces-web" "1.40.0"
diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix
index db1d17de07ca..3b90aaed74b4 100644
--- a/pkgs/development/python-modules/netdisco/default.nix
+++ b/pkgs/development/python-modules/netdisco/default.nix
@@ -1,26 +1,26 @@
 {
   lib,
   buildPythonPackage,
-  isPy3k,
   fetchPypi,
-  requests,
-  zeroconf,
   pytestCheckHook,
+  requests,
+  setuptools,
+  zeroconf,
 }:
 
 buildPythonPackage rec {
   pname = "netdisco";
   version = "3.0.0";
-  format = "setuptools";
-
-  disabled = !isPy3k;
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-TbtZBILzd8zEYeAXQnB8y+jx0tGyhXivkdybf+vNy9I=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     requests
     zeroconf
   ];
diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix
index f419359780c6..7d5dc73a56e5 100644
--- a/pkgs/development/python-modules/nox/default.nix
+++ b/pkgs/development/python-modules/nox/default.nix
@@ -1,17 +1,26 @@
 {
   lib,
-  argcomplete,
-  attrs,
   buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  attrs,
+  argcomplete,
   colorlog,
   dependency-groups,
-  fetchFromGitHub,
-  hatchling,
   jinja2,
   packaging,
-  pytestCheckHook,
-  pythonOlder,
   tomli,
+
+  # tests
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+
+  # passthru
   tox,
   uv,
   virtualenv,
@@ -22,7 +31,7 @@ buildPythonPackage rec {
   version = "2025.05.01";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
     owner = "wntrblm";
@@ -53,22 +62,20 @@ buildPythonPackage rec {
     uv = [ uv ];
   };
 
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
 
   pythonImportsCheck = [ "nox" ];
 
   disabledTests = [
-    # our conda is not available on 3.11
-    "test__create_venv_options"
     # Assertion errors
     "test_uv"
-    # calls to naked python
-    "test_noxfile_script_mode"
+    # Test requires network access
     "test_noxfile_script_mode_url_req"
+    # Don't test CLi mode
+    "test_noxfile_script_mode"
   ];
 
   disabledTestPaths = [
@@ -76,12 +83,12 @@ buildPythonPackage rec {
     "tests/test_tox_to_nox.py"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Flexible test automation for Python";
     homepage = "https://nox.thea.codes/";
     changelog = "https://github.com/wntrblm/nox/blob/${src.tag}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       doronbehar
       fab
     ];
diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix
index b775d1b21ead..c95c9fea7ffb 100644
--- a/pkgs/development/python-modules/pyftdi/default.nix
+++ b/pkgs/development/python-modules/pyftdi/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyftdi";
-  version = "0.56.0";
+  version = "0.57.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "eblot";
     repo = "pyftdi";
     tag = "v${version}";
-    hash = "sha256-/MwgBqwN7xmZepdJzyRhZflbCUpGdWEbEGGKkBnKTFI=";
+    hash = "sha256-RkZXcGvCZXmFrLvj7YqHc6FeZskEqMSQcYgizBSuwIk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index 8b6b6e68627c..a6cd5f14e724 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -1,32 +1,31 @@
 {
   lib,
   buildPythonPackage,
-  isPy3k,
+  setuptools,
   fetchPypi,
-  python,
+  unittestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pyhomematic";
   version = "0.1.78";
-  format = "setuptools";
-
-  disabled = !isPy3k;
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-uB9aDa1urIwL2DBdBwPi0sHWPW7SUZ3EaAjuMLSOudc=";
   };
 
-  checkPhase = ''
-    ${python.interpreter} -m unittest
-  '';
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ unittestCheckHook ];
 
   pythonImportsCheck = [ "pyhomematic" ];
 
   meta = with lib; {
     description = "Python 3 Interface to interact with Homematic devices";
     homepage = "https://github.com/danielperna84/pyhomematic";
+    changelog = "https://github.com/danielperna84/pyhomematic/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };
diff --git a/pkgs/development/python-modules/pynamecheap/default.nix b/pkgs/development/python-modules/pynamecheap/default.nix
index 658ff62a5d26..4ab6da4a25a9 100644
--- a/pkgs/development/python-modules/pynamecheap/default.nix
+++ b/pkgs/development/python-modules/pynamecheap/default.nix
@@ -3,28 +3,35 @@
   buildPythonPackage,
   fetchFromGitHub,
   requests,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pynamecheap";
   version = "0.0.3";
-  format = "setuptools";
-
-  propagatedBuildInputs = [ requests ];
-
-  # Tests require access to api.sandbox.namecheap.com
-  doCheck = false;
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bemmu";
     repo = "PyNamecheap";
-    rev = "v${version}";
-    sha256 = "1g1cd2yc6rpdsc5ax7s93y5nfkf91gcvbgcaqyl9ida6srd9hr97";
+    tag = "v${version}";
+    hash = "sha256-J2WYWtZGtZiox4q9tdkLyU1nix9Jn64K0+1mw7xoLLw=";
   };
 
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
+
+  # Tests require access to api.sandbox.namecheap.com
+  doCheck = false;
+
+  pythonImportsCheck = [ "namecheap" ];
+
   meta = with lib; {
     description = "Namecheap API client in Python";
     homepage = "https://github.com/Bemmu/PyNamecheap";
+    changelog = "https://github.com/Bemmu/PyNamecheap/releases/tag/${src.tag}";
     license = licenses.mit;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pynanoleaf/default.nix b/pkgs/development/python-modules/pynanoleaf/default.nix
index 892900c118ba..113818784680 100644
--- a/pkgs/development/python-modules/pynanoleaf/default.nix
+++ b/pkgs/development/python-modules/pynanoleaf/default.nix
@@ -2,23 +2,23 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  isPy3k,
   requests,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pynanoleaf";
   version = "0.1.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "32a083759c4f99e019e0013670487841f8edf807c7a07742a971fa18707072a7";
+    hash = "sha256-MqCDdZxPmeAZ4AE2cEh4Qfjt+AfHoHdCqXH6GHBwcqc=";
   };
 
-  disabled = !isPy3k;
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ requests ];
+  dependencies = [ requests ];
 
   # pynanoleaf does not contain tests
   doCheck = false;
@@ -26,8 +26,9 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "pynanoleaf" ];
 
   meta = with lib; {
-    homepage = "https://github.com/Oro/pynanoleaf";
     description = "Python3 wrapper for the Nanoleaf API, capable of controlling both Nanoleaf Aurora and Nanoleaf Canvas";
+    homepage = "https://github.com/Oro/pynanoleaf";
+    changelog = "https://github.com/Oro/pynanoleaf/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ oro ];
   };
diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix
index 709a4746c8c9..2f1dff47901a 100644
--- a/pkgs/development/python-modules/sqlfmt/default.nix
+++ b/pkgs/development/python-modules/sqlfmt/default.nix
@@ -5,15 +5,14 @@
   click,
   fetchFromGitHub,
   gitpython,
-  importlib-metadata,
   jinja2,
   platformdirs,
   poetry-core,
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
-  tomli,
   tqdm,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
@@ -21,7 +20,7 @@ buildPythonPackage rec {
   version = "0.27.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
     owner = "tconbeer";
@@ -30,16 +29,12 @@ buildPythonPackage rec {
     hash = "sha256-Yel9SB7KrDqtuZxNx4omz6u4AID8Fk5kFYKBEZD1fuU=";
   };
 
-  pythonRelaxDeps = [ "platformdirs" ];
-
   build-system = [ poetry-core ];
 
   dependencies = [
     click
-    importlib-metadata
     jinja2
     platformdirs
-    tomli
     tqdm
   ];
 
@@ -51,11 +46,11 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
-    export HOME=$(mktemp -d)
     export PATH="$PATH:$out/bin";
   '';
 
diff --git a/pkgs/development/python-modules/sunwatcher/default.nix b/pkgs/development/python-modules/sunwatcher/default.nix
index 0fcac2bfb205..9729093eec66 100644
--- a/pkgs/development/python-modules/sunwatcher/default.nix
+++ b/pkgs/development/python-modules/sunwatcher/default.nix
@@ -4,21 +4,22 @@
   fetchPypi,
   pythonOlder,
   requests,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "sunwatcher";
   version = "0.2.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0swmvmmbfb914k473yv3fc4zizy2abq2qhd7h6lixli11l5wfjxv";
+    hash = "sha256-u0vHCw0h0h6pgadBLPBSwv/4CXNj+3HIJCEtt2rdlWs=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
 
   # Project has no tests
   doCheck = false;
@@ -28,7 +29,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module for the SolarLog HTTP API";
     homepage = "https://bitbucket.org/Lavode/sunwatcher/src/master/";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix
index ae02585f8ba0..af3444f39a1d 100644
--- a/pkgs/development/python-modules/timetagger/default.nix
+++ b/pkgs/development/python-modules/timetagger/default.nix
@@ -12,17 +12,16 @@
   pscript,
   pyjwt,
   pytestCheckHook,
-  pythonOlder,
   requests,
+  setuptools,
   uvicorn,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "timetagger";
   version = "25.06.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "almarklein";
@@ -31,7 +30,9 @@ buildPythonPackage rec {
     hash = "sha256-fuZj4DoqtgIcRd/u7l0GsWqmuLEgF3BW5gN5wY8FdK0=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     asgineer
     bcrypt
     iptools
@@ -43,22 +44,21 @@ buildPythonPackage rec {
     uvicorn
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   nativeCheckInputs = [
     nodejs
     pytestCheckHook
     requests
+    writableTmpDirAsHomeHook
   ];
 
-  meta = with lib; {
+  pythonImportsCheck = [ "timetagger" ];
+
+  meta = {
     description = "Library to interact with TimeTagger";
-    mainProgram = "timetagger";
     homepage = "https://github.com/almarklein/timetagger";
     changelog = "https://github.com/almarklein/timetagger/releases/tag/${src.tag}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ matthiasbeyer ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ matthiasbeyer ];
+    mainProgram = "timetagger";
   };
 }
diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix
index 4e10e0144243..79c4f1060722 100644
--- a/pkgs/development/python-modules/vultr/default.nix
+++ b/pkgs/development/python-modules/vultr/default.nix
@@ -3,21 +3,24 @@
   buildPythonPackage,
   fetchFromGitHub,
   requests,
+  setuptools,
 }:
 
 buildPythonPackage rec {
-  version = "1.0.1";
-  format = "setuptools";
   pname = "vultr";
+  version = "1.0.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "spry-group";
     repo = "python-vultr";
-    rev = "v${version}";
-    sha256 = "00lc5hdhchvm0472p03019bp9541d8y2773xkjy8vblq9qhys8q7";
+    tag = "v${version}";
+    hash = "sha256-ByPtIU6Yro28nH2cIzxqgZR0VwpggCsOAXVDBhssjAI=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
 
   # Tests disabled. They fail because they try to access the network
   doCheck = false;
@@ -27,6 +30,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Vultr.com API Client";
     homepage = "https://github.com/spry-group/python-vultr";
+    changelog = "https://github.com/spry-group/python-vultr/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ lihop ];
   };
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index e4ece30ec374..dece0210839e 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix args {
-  version = "1.27.5";
-  hash = "sha256-6WrOu5wqbbigAMPdGzLsuhuBDwzVhiMtTZIeN2Z03Q4=";
+  version = "1.29.1";
+  hash = "sha256-xYn35+2AHdvZBK+/PeJq4k6wzOJ8dxei6U33+xLWrSc=";
 }
diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix
index 5cbd2033445e..57584d390e71 100644
--- a/pkgs/servers/spicedb/default.nix
+++ b/pkgs/servers/spicedb/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "spicedb";
-  version = "1.45.1";
+  version = "1.45.2";
 
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "spicedb";
     rev = "v${version}";
-    hash = "sha256-cKCAA9C0vsCa0BszspvPfrKbdWyaccrMtiO6UWhLIh4=";
+    hash = "sha256-LDAZdcUfrCWtld6V4GDpAbK+BeT/aeVOQ7G++sMoXU4=";
   };
 
-  vendorHash = "sha256-R4lOmHIBgnlvOukMjXdVx5e9Oneo1EizhsrDXiTbwTc=";
+  vendorHash = "sha256-hr+xIfPjlrH9igRsYeqNOPgx/jWhDfu73gA+/NoWWxI=";
 
   ldflags = [
     "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'"
diff --git a/pkgs/tools/filesystems/kdiskmark/default.nix b/pkgs/tools/filesystems/kdiskmark/default.nix
index 2f9f09fdc9d3..c401567ed9b4 100644
--- a/pkgs/tools/filesystems/kdiskmark/default.nix
+++ b/pkgs/tools/filesystems/kdiskmark/default.nix
@@ -6,19 +6,19 @@
   qttools,
   fio,
   cmake,
-  polkit-qt,
+  polkit-qt-1,
   extra-cmake-modules,
   fetchFromGitHub,
 }:
 stdenv.mkDerivation rec {
   pname = "kdiskmark";
-  version = "3.1.4";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "jonmagon";
     repo = "kdiskmark";
     rev = version;
-    hash = "sha256-JueY7zw9PIo9ETi7pQLpw8FGRhNXYXeXEvTzZGz9lbw=";
+    hash = "sha256-b42PNUrG10RyGct6dPtdT89oO222tEovkSPoRcROfaQ=";
     fetchSubmodules = true;
   };
 
@@ -31,12 +31,12 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qtbase
     qttools
-    polkit-qt
+    polkit-qt-1
   ];
 
   preConfigure = ''
     substituteInPlace CMakeLists.txt \
-      --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions
+      --replace-fail \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions
   '';
 
   qtWrapperArgs = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6ef821fdd265..f86b74337d90 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1154,6 +1154,7 @@ mapAliases {
   imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17
   imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17
   imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17
+  imaginer = throw "'imaginer' has been removed due to lack of upstream maintenance"; # Added 2025-08-15
   immersed-vr = lib.warnOnInstantiate "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11
   inconsolata-nerdfont = lib.warnOnInstantiate "inconsolata-nerdfont is redundant. Use nerd-fonts.inconsolata instead." nerd-fonts.inconsolata; # Added 2024-11-10
   incrtcl = tclPackages.incrtcl; # Added 2024-10-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b85fbca632bb..f896f92bb55c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3305,7 +3305,7 @@ with pkgs;
 
   kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { };
 
-  kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { };
+  kdiskmark = kdePackages.callPackage ../tools/filesystems/kdiskmark { };
 
   keepkey-agent = with python3Packages; toPythonApplication keepkey-agent;
 

From 5fce6770f2199e2752cd9595e46e575000e92d85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 10:06:13 +0000
Subject: [PATCH 3000/3724] python3Packages.craft-grammar: 2.0.3 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix
index a9b5a352eacc..53c8a3691462 100644
--- a/pkgs/development/python-modules/craft-grammar/default.nix
+++ b/pkgs/development/python-modules/craft-grammar/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "craft-grammar";
-  version = "2.0.3";
+  version = "2.1.0";
 
   pyproject = true;
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-grammar";
     tag = version;
-    hash = "sha256-d7U4AAUikYcz26ZSXQwkTobSKN1PpaL20enfggHSKRM=";
+    hash = "sha256-R1+8KuJmG12WhJyeOu5G43hcXPHBD6UOqcKRePQNiZM=";
   };
 
   build-system = [ setuptools-scm ];

From 5f71158592f4fec1a591ddc85235efaa25e7c95e Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 22 Aug 2025 15:12:32 -0400
Subject: [PATCH 3001/3724] openapv: init at 0.2.0.1

---
 pkgs/by-name/op/openapv/package.nix | 37 +++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/op/openapv/package.nix

diff --git a/pkgs/by-name/op/openapv/package.nix b/pkgs/by-name/op/openapv/package.nix
new file mode 100644
index 000000000000..b4f7e162b8b5
--- /dev/null
+++ b/pkgs/by-name/op/openapv/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenv,
+  writeText,
+  fetchFromGitHub,
+  cmake,
+}:
+let
+  # Requires an /etc/os-release file, so we override it with this.
+  osRelease = writeText "os-release" ''ID=NixOS'';
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "openapv";
+  version = "0.2.0.1";
+
+  src = fetchFromGitHub {
+    owner = "AcademySoftwareFoundation";
+    repo = "openapv";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Edj3xQ7AcHcdIbg4o2FidAGZ06fUBltW+1ojJPoIktA=";
+  };
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "/etc/os-release" "${osRelease}"
+  '';
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    changelog = "https://github.com/AcademySoftwareFoundation/openapv/releases/tag/v${finalAttrs.version}";
+    description = "Reference implementation of the APV codec";
+    homepage = "https://github.com/AcademySoftwareFoundation/openapv";
+    license = [ lib.licenses.bsd3 ];
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})

From 5062f1f22fb78fdbf25e3772d5b7e123c5a04b40 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 22 Aug 2025 15:14:49 -0400
Subject: [PATCH 3002/3724] ffmpeg_8{,-headless,-full}: init at 8.0

This is the latest major version of ffmpeg, codenamed "Huffman".

The feature flags added are one for Whisper filter support via
whisper-cpp, and APV encoding support via OpenAPV(which needed to be
packaged)

Further, the withPostproc feature flag is restricted to before version
8.0, as it was removed.

Currently, nasm is the only supported assembler on 8.0+, so we use that.
in order to not cause a mass rebuild, we don't change the assembler for
older builds, even though nasm has been supported since 3.4.
---
 doc/release-notes/rl-2511.section.md          |  2 ++
 pkgs/development/libraries/ffmpeg/default.nix |  8 +++++
 pkgs/development/libraries/ffmpeg/generic.nix | 29 +++++++++++++++++--
 pkgs/top-level/all-packages.nix               |  3 ++
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index e248ee6ec705..6fc627534e75 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -112,6 +112,8 @@
 
 - `lisp-modules` were brought in sync with the [June 2025 Quicklisp release](http://blog.quicklisp.org/2025/07/june-2025-quicklisp-dist-now-available.html).
 
+- `ffmpeg_8`, `ffmpeg_8-headless`, and `ffmpeg_8-full` have been added. The default version of FFmpeg remains ffmpeg_7 for now, though this may change before release.
+
 - `searx` was updated to use `envsubst` instead of `sed` for parsing secrets from environment variables.
   If your previous configuration included a secret reference like `server.secret_key = "@SEARX_SECRET_KEY@"`, you must migrate to the new envsubst syntax: `server.secret_key = "$SEARX_SECRET_KEY"`.
 
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index f24b6b45669f..cc0332510307 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -29,6 +29,10 @@ let
     version = "7.1.1";
     hash = "sha256-GyS8imOqfOUPxXrzCiQtzCQIIH6bvWmQAB0fKUcRsW4=";
   };
+  v8 = {
+    version = "8.0";
+    hash = "sha256-okNZ1/m/thFAY3jK/GSV0+WZFnjrMr8uBPsOdH6Wq9E=";
+  };
 in
 
 rec {
@@ -47,6 +51,10 @@ rec {
   ffmpeg_7-headless = mkFFmpeg v7 "headless";
   ffmpeg_7-full = mkFFmpeg v7 "full";
 
+  ffmpeg_8 = mkFFmpeg v8 "small";
+  ffmpeg_8-headless = mkFFmpeg v8 "headless";
+  ffmpeg_8-full = mkFFmpeg v8 "full";
+
   # Please make sure this is updated to new major versions once they
   # build and work on all the major platforms. If absolutely necessary
   # due to severe breaking changes, the bump can wait a little bit to
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 55b991548309..9e6fba364ea0 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -10,6 +10,7 @@
   texinfo,
   texinfo6,
   yasm,
+  nasm,
 
   # 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.
@@ -108,6 +109,7 @@
   withNvdec ? withHeadlessDeps && withNvcodec,
   withNvenc ? withHeadlessDeps && withNvcodec,
   withOpenal ? withFullDeps, # OpenAL 1.1 capture support
+  withOpenapv ? withHeadlessDeps && lib.versionAtLeast version "8.0", # APV encoding support
   withOpencl ? withHeadlessDeps,
   withOpencoreAmrnb ? withFullDeps && withVersion3, # AMR-NB de/encoder
   withOpencoreAmrwb ? withFullDeps && withVersion3, # AMR-WB decoder
@@ -152,6 +154,7 @@
   withVulkan ? withHeadlessDeps && !stdenv.hostPlatform.isDarwin,
   withVvenc ? withFullDeps && lib.versionAtLeast version "7.1", # H.266/VVC encoding
   withWebp ? withHeadlessDeps, # WebP encoder
+  withWhisper ? withFullDeps && lib.versionAtLeast version "8.0", # Whisper speech recognition
   withX264 ? withHeadlessDeps && withGPL, # H.264/AVC encoder
   withX265 ? withHeadlessDeps && withGPL, # H.265/HEVC encoder
   withXavs ? withFullDeps && withGPL, # AVS encoder
@@ -206,7 +209,9 @@
   # https://github.com/NixOS/nixpkgs/pull/211834#issuecomment-1417435991)
   buildAvresample ? withHeadlessDeps && lib.versionOlder version "5", # Build avresample library
   buildAvutil ? withHeadlessDeps, # Build avutil library
-  buildPostproc ? withHeadlessDeps, # Build postproc library
+  # Libpostproc is only available on versions lower than 8.0
+  # https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/8c920c4c396163e3b9a0b428dd550d3c986236aa
+  buildPostproc ? withHeadlessDeps && lib.versionOlder version "8.0", # Build postproc library
   buildSwresample ? withHeadlessDeps, # Build swresample library
   buildSwscale ? withHeadlessDeps, # Build swscale library
   withLib ?
@@ -313,6 +318,7 @@
   nv-codec-headers-12,
   ocl-icd, # OpenCL ICD
   openal,
+  openapv,
   opencl-headers, # OpenCL headers
   opencore-amr,
   openh264,
@@ -338,6 +344,7 @@
   vulkan-headers,
   vulkan-loader,
   vvenc,
+  whisper-cpp,
   x264,
   x265,
   xavs,
@@ -568,9 +575,12 @@ stdenv.mkDerivation (
       # Ffmpeg > 4 doesn't know about the flag anymore
       (enableFeature buildAvresample "avresample")
     ]
+    ++ optionals (lib.versionOlder version "8.0") [
+      # FFMpeg >= 8 doesn't know about the flag anymore
+      (enableFeature (buildPostproc && withGPL) "postproc")
+    ]
     ++ [
       (enableFeature buildAvutil "avutil")
-      (enableFeature (buildPostproc && withGPL) "postproc")
       (enableFeature buildSwresample "swresample")
       (enableFeature buildSwscale "swscale")
     ]
@@ -678,6 +688,11 @@ stdenv.mkDerivation (
       (enableFeature withNvdec "nvdec")
       (enableFeature withNvenc "nvenc")
       (enableFeature withOpenal "openal")
+    ]
+    ++ optionals (versionAtLeast version "8.0") [
+      (enableFeature withOpenapv "liboapv")
+    ]
+    ++ [
       (enableFeature withOpencl "opencl")
       (enableFeature withOpencoreAmrnb "libopencore-amrnb")
       (enableFeature withOpencoreAmrwb "libopencore-amrwb")
@@ -742,6 +757,11 @@ stdenv.mkDerivation (
     ]
     ++ [
       (enableFeature withWebp "libwebp")
+    ]
+    ++ optionals (versionAtLeast version "8.0") [
+      (enableFeature withWhisper "whisper")
+    ]
+    ++ [
       (enableFeature withX264 "libx264")
       (enableFeature withX265 "libx265")
       (enableFeature withXavs "libxavs")
@@ -803,10 +823,11 @@ stdenv.mkDerivation (
       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 ])
+    # 8.0 is only compatible with nasm, and we don't want to rebuild all older ffmpeg builds at this moment.
+    ++ (if versionOlder version "8.0" then [ yasm ] else [ nasm ])
     ++ optionals withCudaLLVM [ clang ]
     ++ optionals withCudaNVCC [ cuda_nvcc ];
 
@@ -874,6 +895,7 @@ stdenv.mkDerivation (
         cuda_nvcc
       ]
       ++ optionals withOpenal [ openal ]
+      ++ optionals withOpenapv [ openapv ]
       ++ optionals withOpencl [
         ocl-icd
         opencl-headers
@@ -928,6 +950,7 @@ stdenv.mkDerivation (
       ]
       ++ optionals withVvenc [ vvenc ]
       ++ optionals withWebp [ libwebp ]
+      ++ optionals withWhisper [ whisper-cpp ]
       ++ optionals withX264 [ x264 ]
       ++ optionals withX265 [ x265 ]
       ++ optionals withXavs [ xavs ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b85fbca632bb..78c0daccae77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7596,6 +7596,9 @@ with pkgs;
     ffmpeg_7
     ffmpeg_7-headless
     ffmpeg_7-full
+    ffmpeg_8
+    ffmpeg_8-headless
+    ffmpeg_8-full
     ffmpeg
     ffmpeg-headless
     ffmpeg-full

From 7b3b1efb477bcba1398a7638b242707c52ec8e70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 08:18:45 +0000
Subject: [PATCH 3003/3724] python3Packages.pre-commit-hooks: 5.0.0 -> 6.0.0

---
 .../python-modules/pre-commit-hooks/default.nix   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix
index e75265573a6c..a105ca7f21e8 100644
--- a/pkgs/development/python-modules/pre-commit-hooks/default.nix
+++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix
@@ -7,24 +7,27 @@
   pytestCheckHook,
   pythonOlder,
   ruamel-yaml,
+  setuptools,
   tomli,
 }:
 
 buildPythonPackage rec {
   pname = "pre-commit-hooks";
-  version = "5.0.0";
-  format = "setuptools";
+  version = "6.0.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "pre-commit";
     repo = "pre-commit-hooks";
     tag = "v${version}";
-    hash = "sha256-BYNi/xtdichqsn55hqr1MSFwWpH+7cCbLfqmpn9cxto=";
+    hash = "sha256-pxtsnRryTguNGYbdiQ55UhuRyJTQvFfaqVOTcCz2jgk=";
   };
 
-  propagatedBuildInputs = [ ruamel-yaml ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  build-system = [ setuptools ];
+
+  dependencies = [ ruamel-yaml ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   nativeCheckInputs = [
     gitMinimal
@@ -50,7 +53,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Some out-of-the-box hooks for pre-commit";
     homepage = "https://github.com/pre-commit/pre-commit-hooks";
-    changelog = "https://github.com/pre-commit/pre-commit-hooks/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/pre-commit/pre-commit-hooks/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ kalbasit ];
   };

From e6ae63f4383d4437930deb293655c1c948e91ec4 Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Sat, 23 Aug 2025 13:21:49 +0300
Subject: [PATCH 3004/3724] warp-terminal: 0.2025.08.13.08.12.stable_02 ->
 0.2025.08.20.08.11.stable_03

Changelog: https://docs.warp.dev/getting-started/changelog#id-2025.08.20-v0.2025.08.20.08.11
---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index d6a1d7141aaf..004077f05d14 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-B9Qhh+1vvisdpE9XYQRbJ87Ilo4Qmy9Uvd7Zn4+TLxg=",
-    "version": "0.2025.08.13.08.12.stable_02"
+    "hash": "sha256-qfhEXZbsqLhS1yTWwjbcUwUW5/3mIe2sC+GT6NG9bmY=",
+    "version": "0.2025.08.20.08.11.stable_03"
   },
   "linux_x86_64": {
-    "hash": "sha256-x87HElhBSrh00LiCcKX9AnWiROVN4SEZTqu7D1R72LI=",
-    "version": "0.2025.08.13.08.12.stable_02"
+    "hash": "sha256-8aU5tFqqoD8yABQ2F5axqpD1ppL1FQyu5cY9MBEWgME=",
+    "version": "0.2025.08.20.08.11.stable_03"
   },
   "linux_aarch64": {
-    "hash": "sha256-+lv8dpx5fi12rhG258zSj0att/vTi7DidKCYlUCIbvo=",
-    "version": "0.2025.08.13.08.12.stable_02"
+    "hash": "sha256-xFAMoRQJ1Qpuun+VRmmj8DnJaIk+/48zwyIUO9xl6io=",
+    "version": "0.2025.08.20.08.11.stable_03"
   }
 }

From 158f21513fd22503ef35026bb5ac2f32af11999b Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Thu, 14 Aug 2025 18:42:19 +0300
Subject: [PATCH 3005/3724] github-mcp-server: add `passthru.updateScript`

---
 pkgs/by-name/gi/github-mcp-server/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix
index 5c710851b830..22e0214fc730 100644
--- a/pkgs/by-name/gi/github-mcp-server/package.nix
+++ b/pkgs/by-name/gi/github-mcp-server/package.nix
@@ -3,6 +3,7 @@
   buildGoModule,
   fetchFromGitHub,
   versionCheckHook,
+  nix-update-script,
 }:
 
 buildGoModule (finalAttrs: {
@@ -32,6 +33,8 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     changelog = "https://github.com/github/github-mcp-server/releases/tag/v${finalAttrs.version}";
     description = "GitHub's official MCP Server";

From 323caa5f8e31a6db3d9b4bc227c51fcc8d3a2002 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Thu, 14 Aug 2025 18:43:57 +0300
Subject: [PATCH 3006/3724] github-mcp-server: 0.10.0 -> 0.0.13.0

Changelog: https://github.com/github/github-mcp-server/releases/tag/v0.13.0
Diff: https://github.com/github/github-mcp-server/compare/v0.10.0...v0.13.0
---
 pkgs/by-name/gi/github-mcp-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix
index 22e0214fc730..bf6e5836cfac 100644
--- a/pkgs/by-name/gi/github-mcp-server/package.nix
+++ b/pkgs/by-name/gi/github-mcp-server/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "github-mcp-server";
-  version = "0.10.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "github-mcp-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I7Y2vZdQllT8wVttf+axwvBF7Cv4gYM4vxw7qKEmhog=";
+    hash = "sha256-E1ta3qt0xXOFw9KhQYKt6cLolJ2wkH6JU22NbCWeuf0=";
   };
 
-  vendorHash = "sha256-DeojCgMBwVclvoiEs462FoxIf3700XUjXvPbvRZE3CI=";
+  vendorHash = "sha256-F6PR4bxFSixgYQX65zjrVxcxEQxCoavQqa5mBGrZH8o=";
 
   ldflags = [
     "-s"

From 17b7b751a50d170b2130e81fece5a450d5ab1d8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 23:14:35 +0000
Subject: [PATCH 3007/3724] python3Packages.pytest-sugar: 1.0.0 -> 1.1.1

---
 .../python-modules/pytest-sugar/default.nix    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix
index ac77a4ac27f1..eeff296e949c 100644
--- a/pkgs/development/python-modules/pytest-sugar/default.nix
+++ b/pkgs/development/python-modules/pytest-sugar/default.nix
@@ -2,30 +2,30 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   termcolor,
-  pytest,
-  packaging,
   pytestCheckHook,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pytest-sugar";
-  version = "1.0.0";
-  format = "setuptools";
+  version = "1.1.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ZCLoMlj1sMBM58YyF2x3Msq1/bkJyznMpckTn4EnbAo=";
+    hash = "sha256-c7i2UWPr8Q+fZx76ue7T1W8g0spovag/pkdAqSwI9l0=";
   };
 
-  buildInputs = [ pytest ];
+  build-system = [
+    setuptools
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     termcolor
-    packaging
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];

From f8ed391cd2fb64258019afa86e5ec60a2f0ed089 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 15:06:14 +0000
Subject: [PATCH 3008/3724] cliflux: 1.8.0 -> 1.9.0

---
 pkgs/by-name/cl/cliflux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/cliflux/package.nix b/pkgs/by-name/cl/cliflux/package.nix
index 6b002216f6e6..3b980124f75e 100644
--- a/pkgs/by-name/cl/cliflux/package.nix
+++ b/pkgs/by-name/cl/cliflux/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cliflux";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "spencerwi";
     repo = "cliflux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AGkinlN5Ng0LXau6U9Ft+yMIFMpbrbup3R3c3UlglEM=";
+    hash = "sha256-2Hmdze3so74YHv9JrRHfylWcT1LlBrXVcAiBxigW6wU=";
   };
 
-  cargoHash = "sha256-3nNvPQMnYRZlhUab0MSf39vMNidpMLJh56JSjlsrYAg=";
+  cargoHash = "sha256-glA78iRu7SoJZnk6QL7b84jY1+U4RzgUXe/zQpAnK7A=";
 
   nativeBuildInputs = [
     pkg-config

From 6900ce0348a5ed15870ee77b1df069f38a4c6b73 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 23 Aug 2025 18:19:38 +0300
Subject: [PATCH 3009/3724] linux_6_16: 6.16.2 -> 6.16.3

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

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 71cf61687254..8998731ef1e8 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -32,7 +32,7 @@
         "hash": "sha256:14sxwrvw9p4ybizb8ky1rgahc62q0aw5qkmzqp3cpnavqfgldaw9"
     },
     "6.16": {
-        "version": "6.16.2",
-        "hash": "sha256:0vghyk7ggmgnsldyz67v9llzbi6mxyivx83z7fylyxrxg7xacq5p"
+        "version": "6.16.3",
+        "hash": "sha256:118bg72mdrf75r36gki5zi18ynl2kcygrf24pwd58by1anh9nhw0"
     }
 }

From 0d6b66906da431698d58edeb2c252eba348f9e3a Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Sat, 23 Aug 2025 17:26:05 +0200
Subject: [PATCH 3010/3724] freetube: 0.23.7 -> 0.23.8

Changelog:
https://github.com/FreeTubeApp/FreeTube/releases/tag/v0.23.8-beta
Diff:
https://github.com/FreeTubeApp/FreeTube/compare/v0.23.7-beta...v0.23.8-beta
---
 pkgs/by-name/fr/freetube/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix
index f2b7d8ac8541..69c1f4f3008a 100644
--- a/pkgs/by-name/fr/freetube/package.nix
+++ b/pkgs/by-name/fr/freetube/package.nix
@@ -20,13 +20,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "freetube";
-  version = "0.23.7";
+  version = "0.23.8";
 
   src = fetchFromGitHub {
     owner = "FreeTubeApp";
     repo = "FreeTube";
     tag = "v${finalAttrs.version}-beta";
-    hash = "sha256-252d80xCWBZnPHnRESxRqYzT40Gu/LLBbzXr2nIJW/I=";
+    hash = "sha256-CHp/6/E/v6UdSe3xoB66Ot24WuZDPdmNyUG1w2w3bX0=";
   };
 
   # Darwin requires writable Electron dist

From 25ffe1aee5da18f33b05208374f2b1e4592af3a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 15:34:17 +0000
Subject: [PATCH 3011/3724] wdt: 1.27.1612021-unstable-2025-08-06 ->
 1.27.1612021-unstable-2025-08-20

---
 pkgs/by-name/wd/wdt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wd/wdt/package.nix b/pkgs/by-name/wd/wdt/package.nix
index d41446b1a9dc..a6ff29c3b0f3 100644
--- a/pkgs/by-name/wd/wdt/package.nix
+++ b/pkgs/by-name/wd/wdt/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation {
   pname = "wdt";
-  version = "1.27.1612021-unstable-2025-08-06";
+  version = "1.27.1612021-unstable-2025-08-20";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "wdt";
-    rev = "b868ad1fcee52c9686d3101bd46a00c48b68ae53";
-    sha256 = "sha256-3N81m+T2uhNhZ+JSBS2yxsEfYMG2/ppgStDt53j36dY=";
+    rev = "a1261138b955b3bf6fdd741ac9b82e0721bb0c84";
+    sha256 = "sha256-zux6b2XRIqr+VFvB61no30oS6om9GpWOKVczY+cUOOU=";
   };
 
   nativeBuildInputs = [ cmake ];

From 821d14547b1a1dfe7589be8a89f9480099ff6d98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 17:31:30 +0000
Subject: [PATCH 3012/3724] airwindows: 0-unstable-2025-07-27 ->
 0-unstable-2025-08-10

---
 pkgs/by-name/ai/airwindows/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix
index f0c14298cdfa..77d7f556c720 100644
--- a/pkgs/by-name/ai/airwindows/package.nix
+++ b/pkgs/by-name/ai/airwindows/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation {
   pname = "airwindows";
-  version = "0-unstable-2025-07-27";
+  version = "0-unstable-2025-08-10";
 
   src = fetchFromGitHub {
     owner = "airwindows";
     repo = "airwindows";
-    rev = "52565448b14ea481682b4c67cd6f4732fb6bc644";
-    hash = "sha256-VJhxe7hKjECUsyNfX32yGdEX4hkGD3CaO+QnNnXGBhc=";
+    rev = "b00a82a01a4d7e243370a1c6c912e9b3b7d51245";
+    hash = "sha256-qjffMca9vS2DnN++IKdCfl+bCgVLSgXmKY8ZYmB1tVQ=";
   };
 
   # we patch helpers because honestly im spooked out by where those variables

From fd3c91597555f25b508b6d0f1b37db04b56eac48 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Sun, 10 Aug 2025 14:39:25 +0200
Subject: [PATCH 3013/3724] linux-kernels: add LTS flag

This serves to differentiate between a kernel that is an LTS release and one
that is merely a regular "stable" release.
---
 pkgs/os-specific/linux/kernel/generic.nix     |  2 ++
 .../os-specific/linux/kernel/kernels-org.json | 24 ++++++++++++-------
 pkgs/os-specific/linux/kernel/mainline.nix    |  1 +
 .../linux/kernel/update-mainline.py           |  1 +
 pkgs/top-level/linux-kernels.nix              |  7 +++++-
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 1bd981110c02..8899e7bad9d9 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -72,6 +72,7 @@ let
       extraMeta ? { },
       extraPassthru ? { },
 
+      isLTS ? false,
       isZen ? false,
       isLibre ? false,
       isHardened ? false,
@@ -332,6 +333,7 @@ let
               commonStructuredConfig
               structuredExtraConfig
               extraMakeFlags
+              isLTS
               isZen
               isHardened
               isLibre
diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 8998731ef1e8..76b51e7a95cf 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -5,34 +5,42 @@
     },
     "6.1": {
         "version": "6.1.148",
-        "hash": "sha256:18c024bqqc3srzv2gva55p95yghjc6x3p3f54v3hziki4wx3v86r"
+        "hash": "sha256:18c024bqqc3srzv2gva55p95yghjc6x3p3f54v3hziki4wx3v86r",
+        "lts": false
     },
     "5.15": {
         "version": "5.15.189",
-        "hash": "sha256:1hshd26ahn6dbw6jnqi0v5afpk672w7p09mk7iri93i7hxdh5l73"
+        "hash": "sha256:1hshd26ahn6dbw6jnqi0v5afpk672w7p09mk7iri93i7hxdh5l73",
+        "lts": true
     },
     "5.10": {
         "version": "5.10.240",
-        "hash": "sha256:04sdcf4aqsqchii38anzmk9f9x65wv8q1x3m9dandmi6fabw724d"
+        "hash": "sha256:04sdcf4aqsqchii38anzmk9f9x65wv8q1x3m9dandmi6fabw724d",
+        "lts": true
     },
     "5.4": {
         "version": "5.4.296",
-        "hash": "sha256:0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx"
+        "hash": "sha256:0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx",
+        "lts": true
     },
     "6.6": {
         "version": "6.6.102",
-        "hash": "sha256:0p6yjifwyrqlppn40isgxb0b5vqmljggmnp7w75vlc2c6fvzxll0"
+        "hash": "sha256:0p6yjifwyrqlppn40isgxb0b5vqmljggmnp7w75vlc2c6fvzxll0",
+        "lts": true
     },
     "6.12": {
         "version": "6.12.43",
-        "hash": "sha256:1vmxywg11z946i806sg7rk7jr9px87spmwwbzjxpps2nsjybpjqg"
+        "hash": "sha256:1vmxywg11z946i806sg7rk7jr9px87spmwwbzjxpps2nsjybpjqg",
+        "lts": true
     },
     "6.15": {
         "version": "6.15.11",
-        "hash": "sha256:14sxwrvw9p4ybizb8ky1rgahc62q0aw5qkmzqp3cpnavqfgldaw9"
+        "hash": "sha256:14sxwrvw9p4ybizb8ky1rgahc62q0aw5qkmzqp3cpnavqfgldaw9",
+        "lts": false
     },
     "6.16": {
         "version": "6.16.3",
-        "hash": "sha256:118bg72mdrf75r36gki5zi18ynl2kcygrf24pwd58by1anh9nhw0"
+        "hash": "sha256:118bg72mdrf75r36gki5zi18ynl2kcygrf24pwd58by1anh9nhw0",
+        "lts": false
     }
 }
diff --git a/pkgs/os-specific/linux/kernel/mainline.nix b/pkgs/os-specific/linux/kernel/mainline.nix
index 41c5a0218fac..ac8f75c873eb 100644
--- a/pkgs/os-specific/linux/kernel/mainline.nix
+++ b/pkgs/os-specific/linux/kernel/mainline.nix
@@ -32,6 +32,7 @@ let
     (builtins.removeAttrs args [ "branch" ])
     // {
       inherit src version;
+      isLTS = thisKernel.lts;
 
       modDirVersion = lib.versions.pad 3 version;
       extraMeta.branch = branch;
diff --git a/pkgs/os-specific/linux/kernel/update-mainline.py b/pkgs/os-specific/linux/kernel/update-mainline.py
index 13e89d3df1e1..9f61236e67fa 100755
--- a/pkgs/os-specific/linux/kernel/update-mainline.py
+++ b/pkgs/os-specific/linux/kernel/update-mainline.py
@@ -152,6 +152,7 @@ def main():
         all_kernels[branch] = {
             "version": kernel.version,
             "hash": get_hash(kernel),
+            "lts": kernel.nature == KernelNature.LONGTERM,
         }
 
         with VERSIONS_FILE.open("w") as fd:
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index a34fef40385c..83a8a024e0ac 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -345,7 +345,12 @@ in
         inherit (kernel) stdenv; # in particular, use the same compiler by default
 
         # to help determine module compatibility
-        inherit (kernel) isZen isHardened isLibre;
+        inherit (kernel)
+          isLTS
+          isZen
+          isHardened
+          isLibre
+          ;
         inherit (kernel) kernelOlder kernelAtLeast;
         kernelModuleMakeFlags = self.kernel.commonMakeFlags ++ [
           "KBUILD_OUTPUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

From a6c61f0624137f2711ec5d386c27b6460278efcf Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Tue, 3 Dec 2024 23:31:55 +0100
Subject: [PATCH 3014/3724] linux_xanmod: set isLTS

(cherry picked from commit eb85811eb974acaf22cd0602730c034f0d699586)
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 37f23057c66f..9463d9d62df3 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -17,6 +17,7 @@ let
     lts = {
       version = "6.12.43";
       hash = "sha256-Jc3VKpUaIc1nBbbCZ/jAx/kteuQBQBO6TEPlaNq8Jrk=";
+      isLTS = true;
     };
     # ./update-xanmod.sh main
     main = {
@@ -30,6 +31,7 @@ let
       version,
       suffix ? "xanmod1",
       hash,
+      isLTS ? false,
     }:
     buildLinux (
       args
@@ -76,6 +78,7 @@ let
           ./update-xanmod.sh
           variant
         ];
+        inherit isLTS;
 
         extraMeta = {
           branch = lib.versions.majorMinor version;

From eb28e9287c61f057800fe189c5c74303a911cfa3 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Tue, 3 Dec 2024 23:36:23 +0100
Subject: [PATCH 3015/3724] linux-rt: set isLTS

These are all LTS kernels

(cherry picked from commit 1170dcdc89b2c640c449d215e8ba42fdb1b0e63b)
---
 pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 1 +
 pkgs/os-specific/linux/kernel/linux-rt-5.15.nix | 2 ++
 pkgs/os-specific/linux/kernel/linux-rt-5.4.nix  | 2 ++
 pkgs/os-specific/linux/kernel/linux-rt-6.1.nix  | 2 ++
 pkgs/os-specific/linux/kernel/linux-rt-6.6.nix  | 2 ++
 5 files changed, 9 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
index 6bc23341acad..08cc4cfce3cb 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -40,6 +40,7 @@ buildLinux (
       in
       [ rt-patch ] ++ kernelPatches;
 
+    isLTS = true;
     structuredExtraConfig =
       with lib.kernel;
       {
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
index 0db95f0059c7..49c0f89f8a2b 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
@@ -57,6 +57,8 @@ buildLinux (
       }
       // structuredExtraConfig;
 
+    isLTS = true;
+
     extraMeta = extraMeta // {
       inherit branch;
     };
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
index a621d24576fd..5c95493379da 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
@@ -50,6 +50,8 @@ buildLinux (
       }
       // structuredExtraConfig;
 
+    isLTS = true;
+
     extraMeta = extraMeta // {
       inherit branch;
     };
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
index 6c6459e8b14e..f27de5421729 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
@@ -60,6 +60,8 @@ buildLinux (
     extraMeta = extraMeta // {
       inherit branch;
     };
+
+    isLTS = true;
   }
   // argsOverride
 )
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
index 5a877d6c32fb..037fb34519e1 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
@@ -60,6 +60,8 @@ buildLinux (
     extraMeta = extraMeta // {
       inherit branch;
     };
+
+    isLTS = true;
   }
   // argsOverride
 )

From fa336d0e0d39f61fff7fae5984bf77d1b63ac454 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Tue, 3 Dec 2024 23:40:06 +0100
Subject: [PATCH 3016/3724] linux-rpi*: set isLTS

These are based on 6.6.y

(cherry picked from commit d44a5499d71bd03603377ea1b7905ee6ac746be6)
---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 64580caf4098..d0f1a14c48d8 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -41,6 +41,8 @@ lib.overrideDerivation
       }
       // (args.features or { });
 
+      isLTS = true;
+
       extraMeta =
         if (rpiVersion < 3) then
           {

From 6cb440b0d1233294b487d31b40b2a4b2d4305b5f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Aug 2025 17:42:44 +0200
Subject: [PATCH 3017/3724] linux/hardened/patches/5.4: remove

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index a2c9452954c0..32d00fe1a8ac 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -19,16 +19,6 @@
         "sha256": "1p0kjc09qqv361phscny1gqj38di9dpab9gxywljkwqhi5wyn0rx",
         "version": "5.15.185"
     },
-    "5.4": {
-        "patch": {
-            "extra": "-hardened1",
-            "name": "linux-hardened-v5.4.294-hardened1.patch",
-            "sha256": "1q6ffxnpk8j2fwi3g8rpf1lc247m8xiqix2kichxvggkadmjyzg0",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.294-hardened1/linux-hardened-v5.4.294-hardened1.patch"
-        },
-        "sha256": "16bv0x4c9ssr66vrd6jnv2dw5na1y7hxfn4d67g0zaksh6xd0yf8",
-        "version": "5.4.294"
-    },
     "6.1": {
         "patch": {
             "extra": "-hardened1",

From e168abd01b531be7047e1b0c409005adea740019 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Aug 2025 17:42:47 +0200
Subject: [PATCH 3018/3724] linux/hardened/patches/5.10: remove

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 32d00fe1a8ac..c3657f230bc0 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,14 +1,4 @@
 {
-    "5.10": {
-        "patch": {
-            "extra": "-hardened1",
-            "name": "linux-hardened-v5.10.238-hardened1.patch",
-            "sha256": "1y4srk40v0gzfnlqsbh6g9h5vcs8rp5g2b8jjch6xx7dji189myq",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.238-hardened1/linux-hardened-v5.10.238-hardened1.patch"
-        },
-        "sha256": "1dkblixa0as9h11m081dqq8vlz4dcjbzdz7phkz07p621na55j07",
-        "version": "5.10.238"
-    },
     "5.15": {
         "patch": {
             "extra": "-hardened1",

From 6a5e9d07114d87fe7a279af612af47cdf281ab33 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Aug 2025 17:42:48 +0200
Subject: [PATCH 3019/3724] linux/hardened/patches/5.15: remove

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index c3657f230bc0..bff5520f682b 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,14 +1,4 @@
 {
-    "5.15": {
-        "patch": {
-            "extra": "-hardened1",
-            "name": "linux-hardened-v5.15.185-hardened1.patch",
-            "sha256": "00m1p8cm1d76drdlafv4bdrq81xkh40jgg33kvkk3wqcbiikq3h7",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.185-hardened1/linux-hardened-v5.15.185-hardened1.patch"
-        },
-        "sha256": "1p0kjc09qqv361phscny1gqj38di9dpab9gxywljkwqhi5wyn0rx",
-        "version": "5.15.185"
-    },
     "6.1": {
         "patch": {
             "extra": "-hardened1",

From c6c3b01202c193a2c47ed488f4c11c14ce446be9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Aug 2025 17:42:48 +0200
Subject: [PATCH 3020/3724] linux/hardened/patches/6.1: remove

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index bff5520f682b..af9332b0483e 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,14 +1,4 @@
 {
-    "6.1": {
-        "patch": {
-            "extra": "-hardened1",
-            "name": "linux-hardened-v6.1.141-hardened1.patch",
-            "sha256": "10wbx6sjzjh3krx15pb65xxl55xcpia54ws825s9619wx059dskl",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.141-hardened1/linux-hardened-v6.1.141-hardened1.patch"
-        },
-        "sha256": "05n1561cbzaw9vcxp86bqzvhqz5wv7dajpy7cq34bw7myvx4ag5w",
-        "version": "6.1.141"
-    },
     "6.12": {
         "patch": {
             "extra": "-hardened1",

From 353d1400c851c8832494a7d483e6364aa3b7c3ef Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Aug 2025 17:42:48 +0200
Subject: [PATCH 3021/3724] linux/hardened/patches/6.6: remove

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index af9332b0483e..2a992cd4a161 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -28,15 +28,5 @@
         },
         "sha256": "06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z",
         "version": "6.14.11"
-    },
-    "6.6": {
-        "patch": {
-            "extra": "-hardened1",
-            "name": "linux-hardened-v6.6.94-hardened1.patch",
-            "sha256": "0i1dshmsr8v230qmbawda916420m6njwwmillcbr42hsagdjhd0i",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.94-hardened1/linux-hardened-v6.6.94-hardened1.patch"
-        },
-        "sha256": "0mncdsqbqrxii0hirnymi1kmg50jn9v0p26flimlf2xj4vm82fbi",
-        "version": "6.6.94"
     }
 }

From 4819bd89a4c7d554eec23ad92fc5271fef029880 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Aug 2025 17:42:49 +0200
Subject: [PATCH 3022/3724] linux/hardened/patches/6.13: remove

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 2a992cd4a161..dc28ccd88509 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -9,16 +9,6 @@
         "sha256": "0kf2f3r96npzs01kdq3q2ag7zg8l3avfyqwv5qbs9v373wwgxwx7",
         "version": "6.12.34"
     },
-    "6.13": {
-        "patch": {
-            "extra": "-hardened1",
-            "name": "linux-hardened-v6.13.12-hardened1.patch",
-            "sha256": "0i9raq3qcc6pxvs9l6yn5b6k8kiywwlis33kkpd8byqhs57aqsic",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.13.12-hardened1/linux-hardened-v6.13.12-hardened1.patch"
-        },
-        "sha256": "0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1",
-        "version": "6.13.12"
-    },
     "6.14": {
         "patch": {
             "extra": "-hardened1",

From 5b81f754a29e4589e396c688d1e1cb5cea2cd6e9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Aug 2025 17:42:49 +0200
Subject: [PATCH 3023/3724] linux/hardened/patches/6.14: remove

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index dc28ccd88509..673035210688 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -8,15 +8,5 @@
         },
         "sha256": "0kf2f3r96npzs01kdq3q2ag7zg8l3avfyqwv5qbs9v373wwgxwx7",
         "version": "6.12.34"
-    },
-    "6.14": {
-        "patch": {
-            "extra": "-hardened1",
-            "name": "linux-hardened-v6.14.11-hardened1.patch",
-            "sha256": "07f0d76rag6jcclxdl24w70545fb8jrqy98xcdmgxwjabclaa1lp",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.14.11-hardened1/linux-hardened-v6.14.11-hardened1.patch"
-        },
-        "sha256": "06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z",
-        "version": "6.14.11"
     }
 }

From a09f85b9e7e569877ac240be35ec348e4229321b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Aug 2025 17:43:19 +0200
Subject: [PATCH 3024/3724] linux/hardened/patches/6.12: v6.12.34-hardened1 ->
 v6.12.41-hardened1

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

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 673035210688..ca2e040f3df0 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -2,11 +2,11 @@
     "6.12": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.12.34-hardened1.patch",
-            "sha256": "1aw8r52gbxp53sgl4pwv51axw0kmgh3ib6gfvw81dlyaajmlbm6b",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.34-hardened1/linux-hardened-v6.12.34-hardened1.patch"
+            "name": "linux-hardened-v6.12.41-hardened1.patch",
+            "sha256": "1a0gc03nr0aiy2zadg6hfy718nlb2k8p5h5ymvwsdl6kblxi9f47",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.41-hardened1/linux-hardened-v6.12.41-hardened1.patch"
         },
-        "sha256": "0kf2f3r96npzs01kdq3q2ag7zg8l3avfyqwv5qbs9v373wwgxwx7",
-        "version": "6.12.34"
+        "sha256": "09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb",
+        "version": "6.12.41"
     }
 }

From 22b75542c0f4d201afcfd5bd92c4309ee67e8b21 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Aug 2025 17:43:51 +0200
Subject: [PATCH 3025/3724] linux/hardened/patches/6.15: init at
 v6.15.9-hardened1

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

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index ca2e040f3df0..aabd62a41379 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -8,5 +8,15 @@
         },
         "sha256": "09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb",
         "version": "6.12.41"
+    },
+    "6.15": {
+        "patch": {
+            "extra": "-hardened1",
+            "name": "linux-hardened-v6.15.9-hardened1.patch",
+            "sha256": "132h0cgv8kzrlz7jprqvwcnragc2v793a759bhg0q6w3ninmncjc",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.15.9-hardened1/linux-hardened-v6.15.9-hardened1.patch"
+        },
+        "sha256": "0zcma8ycdwwzd4yci9752acsv85wh27lahclh5x2yc4jakw3lkz9",
+        "version": "6.15.9"
     }
 }

From 91f7851fb22471217e118a711c0db77ff528e2f7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Aug 2025 18:03:56 +0200
Subject: [PATCH 3026/3724] linux_hardened: only provide latest LTS and lattest
 stable version

As proposed in #346018 (not closing the ticket, this affects other
variants as well).

The packaging for hardened is in a pretty sad state: it was lagging
several patch-releases behind and nobody seems to care. The update
script aged poorly: the automatic removal was flat-out broken, several
type annotations are plain wrong (`list[int] != packaging.Version`).

This patch is an attempt to reduce the scope for the maintainer team
drastically to provide _some_ maintenance again by only packaging latest
LTS and latest stable.

Also, remove the top-level attributes for this. I still don't see any
compelling reason to give hardly used flavours that special treatment.
---
 nixos/tests/kernel-generic.nix                |   8 +-
 .../linux/kernel/hardened/update.py           | 118 ++++++++----------
 pkgs/top-level/aliases.nix                    |  16 +++
 pkgs/top-level/all-packages.nix               |  14 ---
 pkgs/top-level/linux-kernels.nix              |  24 ++--
 5 files changed, 86 insertions(+), 94 deletions(-)

diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix
index 34e0597777a6..63e833dd7fb3 100644
--- a/nixos/tests/kernel-generic.nix
+++ b/nixos/tests/kernel-generic.nix
@@ -35,14 +35,8 @@ let
     ) args);
   kernels = pkgs.linuxKernel.vanillaPackages // {
     inherit (pkgs.linuxKernel.packages)
-      linux_5_4_hardened
-      linux_5_10_hardened
-      linux_5_15_hardened
-      linux_6_1_hardened
-      linux_6_6_hardened
       linux_6_12_hardened
-      linux_6_13_hardened
-      linux_6_14_hardened
+      linux_6_15_hardened
       linux_rt_5_4
       linux_rt_5_10
       linux_rt_5_15
diff --git a/pkgs/os-specific/linux/kernel/hardened/update.py b/pkgs/os-specific/linux/kernel/hardened/update.py
index 0603812124be..3e12a0e2dd5d 100755
--- a/pkgs/os-specific/linux/kernel/hardened/update.py
+++ b/pkgs/os-specific/linux/kernel/hardened/update.py
@@ -156,10 +156,11 @@ def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]:
     )
 
 
-def parse_version(version_str: str) -> Version:
+def normalize_kernel_version(version_str: str) -> list[str|int]:
     # There have been two variants v6.10[..] and 6.10[..], drop the v
     version_str_without_v = version_str[1:] if not version_str[0].isdigit() else version_str
-    version: Version = []
+
+    version: list[str|int] = []
 
     for component in re.split(r'\.|\-', version_str_without_v):
         try:
@@ -173,14 +174,14 @@ def version_string(version: Version) -> str:
     return ".".join(str(component) for component in version)
 
 
-def major_kernel_version_key(kernel_version: Version) -> str:
+def major_kernel_version_key(kernel_version: list[int|str]) -> str:
     return version_string(kernel_version[:-1])
 
 
-def commit_patches(*, kernel_key: str, message: str) -> None:
+def commit_patches(*, kernel_key: Version, message: str) -> None:
     new_patches_path = HARDENED_PATCHES_PATH.with_suffix(".new")
     with open(new_patches_path, "w") as new_patches_file:
-        json.dump(patches, new_patches_file, indent=4, sort_keys=True)
+        json.dump(patch_json, new_patches_file, indent=4, sort_keys=True)
         new_patches_file.write("\n")
     os.rename(new_patches_path, HARDENED_PATCHES_PATH)
     message = f"linux/hardened/patches/{kernel_key}: {message}"
@@ -197,43 +198,32 @@ def commit_patches(*, kernel_key: str, message: str) -> None:
 
 
 # Load the existing patches.
-patches: Dict[str, Patch]
 with open(HARDENED_PATCHES_PATH) as patches_file:
-    patches = json.load(patches_file)
+    patch_json = json.load(patches_file)
+    patch_versions = set([parse_version(k) for k in patch_json.keys()])
 
-# Get the set of currently packaged kernel versions.
-kernel_versions = {}
 with open(NIXPKGS_KERNEL_PATH / "kernels-org.json") as kernel_versions_json:
     kernel_versions = json.load(kernel_versions_json)
-    for kernel_branch_str in kernel_versions:
-        if kernel_branch_str == "testing": continue
-        kernel_branch = [int(i) for i in kernel_branch_str.split(".")]
-        if kernel_branch < MIN_KERNEL_VERSION: continue
-        kernel_version = [int(i) for i in kernel_versions[kernel_branch_str]["version"].split(".")]
-        kernel_versions[kernel_branch_str] = kernel_version
 
-# Remove patches for unpackaged kernel versions.
-for kernel_key in sorted(patches.keys() - kernel_versions.keys()):
-    del patches[kernel_key]
-    commit_patches(kernel_key=kernel_key, message="remove")
+    kernels = {
+        parse_version(version): meta
+        for version, meta in kernel_versions.items()
+        if version != "testing"
+    }
+
+    latest_lts = sorted(ver for ver, meta in kernels.items() if meta.get("lts", False))[-1]
+    keys = sorted(kernels.keys())
+    latest_release = keys[-1]
+    fallback = keys[-2]
 
 g = Github(os.environ.get("GITHUB_TOKEN"))
 repo = g.get_repo(HARDENED_GITHUB_REPO)
 failures = False
 
-# Match each kernel version with the best patch version.
-releases = {}
-i = 0
-for release in repo.get_releases():
-    # Dirty workaround to make sure that we don't run into issues because
-    # GitHub's API only allows fetching the last 1000 releases.
-    # It's not reliable to exit earlier because not every kernel minor may
-    # have hardened patches, hence the naive search below.
-    i += 1
-    if i > 100:
-        break
-
-    version = parse_version(release.tag_name)
+all_candidates = set([latest_lts, latest_release, fallback])
+kernels_to_package = {}
+for release in repo.get_releases()[:30]:
+    version = normalize_kernel_version(release.tag_name)
     # needs to look like e.g. 5.6.3-hardened1
     if len(version) < 4:
         continue
@@ -242,44 +232,51 @@ for release in repo.get_releases():
         continue
 
     kernel_version = version[:-1]
+    kernel_key = parse_version(major_kernel_version_key(kernel_version))
 
-    kernel_key = major_kernel_version_key(kernel_version)
-    try:
-        packaged_kernel_version = kernel_versions[kernel_key]
-    except KeyError:
+    if kernel_key not in all_candidates:
         continue
 
-    release_info = ReleaseInfo(version=version, release=release)
-
-    if kernel_version == packaged_kernel_version:
-        releases[kernel_key] = release_info
-    else:
-        # Fall back to the latest patch for this major kernel version,
-        # skipping patches for kernels newer than the packaged one.
-        if '.'.join(str(x) for x in kernel_version) > '.'.join(str(x) for x in packaged_kernel_version):
+    try:
+        found = kernels_to_package[kernel_key]
+        if found.version > version:
             continue
-        elif (
-            kernel_key not in releases or releases[kernel_key].version < version
-        ):
-            releases[kernel_key] = release_info
+    except KeyError:
+        pass
+
+    kernels_to_package[kernel_key] = ReleaseInfo(version=version, release=release)
+
+if latest_release in kernels_to_package:
+    if fallback != latest_lts:
+        del kernels_to_package[fallback]
+    kernel_versions = set([latest_lts, latest_release])
+else:
+    kernel_versions = set([latest_lts, fallback])
+
+# Remove patches for unpackaged kernel versions.
+removals = False
+for kernel_key in sorted(patch_versions - kernels_to_package.keys()):
+    del patch_json[str(kernel_key)]
+    removals = True
+    commit_patches(kernel_key=kernel_key, message="remove")
 
 # Update hardened-patches.json for each release.
-for kernel_key in sorted(releases.keys()):
-    release_info = releases[kernel_key]
+for kernel_key in sorted(kernels_to_package.keys()):
+    release_info = kernels_to_package[kernel_key]
     release = release_info.release
     version = release_info.version
     version_str = release.tag_name
     name = f"linux-hardened-{version_str}"
 
-    old_version: Optional[Version] = None
+    old_version: Optional[list[int|str]] = None
     old_version_str: Optional[str] = None
     update: bool
     try:
-        old_filename = patches[kernel_key]["patch"]["name"]
+        old_filename = patch_json[str(kernel_key)]["patch"]["name"]
         old_version_str = old_filename.replace("linux-hardened-", "").replace(
             ".patch", ""
         )
-        old_version = parse_version(old_version_str)
+        old_version = normalize_kernel_version(old_version_str)
         update = old_version < version
     except KeyError:
         update = True
@@ -289,21 +286,16 @@ for kernel_key in sorted(releases.keys()):
         if patch is None:
             failures = True
         else:
-            patches[kernel_key] = patch
-            if old_version:
+            if str(kernel_key) in patch_json:
                 message = f"{old_version_str} -> {version_str}"
             else:
                 message = f"init at {version_str}"
+            patch_json[str(kernel_key)] = patch
+
             commit_patches(kernel_key=kernel_key, message=message)
 
-missing_kernel_versions = kernel_versions.keys() - patches.keys()
-
-if missing_kernel_versions:
-    print(
-        f"warning: no patches for kernel versions "
-        + ", ".join(missing_kernel_versions),
-        file=sys.stderr,
-    )
+if removals:
+    print("Hardened kernels were removed. Don't forget to remove their attributes!")
 
 if failures:
     sys.exit(1)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6ef821fdd265..93e628a8fb72 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1413,6 +1413,22 @@ mapAliases {
   '';
   linux_latest_hardened = linuxPackages_latest_hardened;
 
+  # Added 2025-08-10
+  linuxPackages_hardened = linuxKernel.packages.linux_hardened;
+  linux_hardened = linuxPackages_hardened.kernel;
+  linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened;
+  linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened;
+  linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened;
+  linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
+  linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;
+  linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened;
+  linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened;
+  linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened;
+  linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened;
+  linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened;
+  linuxPackages_6_12_hardened = linuxKernel.packages.linux_6_12_hardened;
+  linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened;
+
   # Added 2023-11-18, modified 2024-01-09
   linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support";
   linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b85fbca632bb..cde6dc7f7bc5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10602,20 +10602,6 @@ with pkgs;
   linux-rt = linuxPackages-rt.kernel;
   linux-rt_latest = linuxPackages-rt_latest.kernel;
 
-  # hardened kernels
-  linuxPackages_hardened = linuxKernel.packages.linux_hardened;
-  linux_hardened = linuxPackages_hardened.kernel;
-  linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened;
-  linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
-  linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;
-  linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened;
-  linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened;
-  linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened;
-  linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened;
-  linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened;
-  linuxPackages_6_12_hardened = linuxKernel.packages.linux_6_12_hardened;
-  linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened;
-
   # GNU Linux-libre kernels
   linuxPackages-libre = linuxKernel.packages.linux_libre;
   linux-libre = linuxPackages-libre.kernel;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 83a8a024e0ac..92e7265ed62b 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -294,14 +294,10 @@ in
 
         linux_latest_libre = deblobKernel packageAliases.linux_latest.kernel;
 
-        linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };
-
-        linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
-        linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
-        linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
-        linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { };
         linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { };
+        linux_6_15_hardened = hardenedKernelFor kernels.linux_6_15 { };
 
+        linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };
       }
       // lib.optionalAttrs config.allowAliases {
         linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
@@ -311,6 +307,11 @@ in
         linux_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream";
         linux_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream";
 
+        linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
+        linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
+        linux_6_1_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
+        linux_6_6_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
+
         linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
         linux_5_4_hardened = throw "linux_5_4_hardened was removed because it was broken";
         linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream";
@@ -776,11 +777,8 @@ in
 
       linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened);
 
-      linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened);
-      linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);
-      linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);
-      linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened);
       linux_6_12_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_12_hardened);
+      linux_6_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_15_hardened);
 
       linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
       linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);
@@ -794,6 +792,12 @@ in
       __recurseIntoDerivationForReleaseJobs = true;
     }
     // lib.optionalAttrs config.allowAliases {
+
+      linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
+      linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
+      linux_6_1_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
+      linux_6_6_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
+
       linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
       linux_5_4_hardened = throw "linux_5_4_hardened was removed because it was broken";
       linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream";

From d9829523d5c9d8bda0b75582e7e125b94c5d5b86 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 23 Aug 2025 17:48:34 +0200
Subject: [PATCH 3027/3724] nixos/profiles/hardened: fix eval with
 !allowAliases

---
 nixos/modules/profiles/hardened.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index dc3bf597cd4b..06e5644f76e9 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -34,7 +34,7 @@ in
       ];
     };
 
-    boot.kernelPackages = mkDefault pkgs.linuxPackages_hardened;
+    boot.kernelPackages = mkDefault pkgs.linuxKernel.packages.linux_hardened;
 
     nix.settings.allowed-users = mkDefault [ "@users" ];
 

From 97f99edc67cec3551665718fc01ec916abed4fa4 Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Thu, 21 Aug 2025 04:56:02 +0200
Subject: [PATCH 3028/3724] ivpn{,-service}: add nix-update-script

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

diff --git a/pkgs/tools/networking/ivpn/default.nix b/pkgs/tools/networking/ivpn/default.nix
index c90c674d6dca..9f80772266b0 100644
--- a/pkgs/tools/networking/ivpn/default.nix
+++ b/pkgs/tools/networking/ivpn/default.nix
@@ -12,6 +12,7 @@
   iptables,
   gawk,
   util-linux,
+  nix-update-script,
 }:
 
 builtins.mapAttrs
@@ -47,6 +48,8 @@ builtins.mapAttrs
           mv $out/bin/{${attrs.modRoot},${pname}}
         '';
 
+        passthru.updateScript = nix-update-script { };
+
         meta = {
           description = "Official IVPN Desktop app";
           homepage = "https://www.ivpn.net/apps";

From aaaf6437dc44e3a3cd4ba8746414eda76127f3cd Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Thu, 21 Aug 2025 05:02:35 +0200
Subject: [PATCH 3029/3724] ivpn{,-service,-ui}: 3.14.29 -> 3.14.34

---
 pkgs/by-name/iv/ivpn-ui/package.nix    | 6 +++---
 pkgs/tools/networking/ivpn/default.nix | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/iv/ivpn-ui/package.nix b/pkgs/by-name/iv/ivpn-ui/package.nix
index 7e7565e56838..f55e3b12d323 100644
--- a/pkgs/by-name/iv/ivpn-ui/package.nix
+++ b/pkgs/by-name/iv/ivpn-ui/package.nix
@@ -10,7 +10,7 @@
   ivpn-service,
 }:
 let
-  version = "3.14.29";
+  version = "3.14.34";
 in
 buildNpmPackage {
   pname = "ivpn-ui";
@@ -20,12 +20,12 @@ buildNpmPackage {
     owner = "ivpn";
     repo = "desktop-app";
     tag = "v${version}";
-    hash = "sha256-8JScty/sGyxzC2ojRpatHpCqEXZw9ksMortIhZnukoU=";
+    hash = "sha256-Q96G5mJahJnXxpqJ8IF0oFie7l0Nd1p8drHH9NSpwEw=";
   };
 
   sourceRoot = "source/ui";
 
-  npmDepsHash = "sha256-2EsXYNo+rj2v+YkZT6ciEcDAirnEZ5MezFlf9zsb/os=";
+  npmDepsHash = "sha256-y/VxvSZUvcIuckJF87639i5pcVJLg8SDAbWmg5bO3/s=";
 
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/pkgs/tools/networking/ivpn/default.nix b/pkgs/tools/networking/ivpn/default.nix
index 9f80772266b0..e87b9ba4c693 100644
--- a/pkgs/tools/networking/ivpn/default.nix
+++ b/pkgs/tools/networking/ivpn/default.nix
@@ -22,7 +22,7 @@ builtins.mapAttrs
       attrs
       // rec {
         inherit pname;
-        version = "3.14.29";
+        version = "3.14.34";
 
         buildInputs = [
           wirelesstools
@@ -32,7 +32,7 @@ builtins.mapAttrs
           owner = "ivpn";
           repo = "desktop-app";
           tag = "v${version}";
-          hash = "sha256-8JScty/sGyxzC2ojRpatHpCqEXZw9ksMortIhZnukoU=";
+          hash = "sha256-Q96G5mJahJnXxpqJ8IF0oFie7l0Nd1p8drHH9NSpwEw=";
         };
 
         proxyVendor = true; # .c file
@@ -64,11 +64,11 @@ builtins.mapAttrs
   {
     ivpn = {
       modRoot = "cli";
-      vendorHash = "sha256-STbkFchrmxwWnSgEJ7RGKN3jGaCC0npL80YjlwUcs1g=";
+      vendorHash = "sha256-xZ1tMiv06fE2wtpDagKjHiVTPYWpj32hM6n/v9ZcgrE=";
     };
     ivpn-service = {
       modRoot = "daemon";
-      vendorHash = "sha256-REIY3XPyMA2Loxo1mKzJMJwZrf9dQMOtnQOUEgN5LP8=";
+      vendorHash = "sha256-DVKSCcEeE7vI8aOYuEwk22n0wtF7MMDOyAgYoXYadwI=";
       nativeBuildInputs = [ makeWrapper ];
 
       patches = [ ./permissions.patch ];

From 3ef74d5fd2f15e2c296374679ef91199ab55290e Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Thu, 21 Aug 2025 05:09:30 +0200
Subject: [PATCH 3030/3724] ivpn{,-service}: add blenderfreaky as maintainer

---
 pkgs/tools/networking/ivpn/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/ivpn/default.nix b/pkgs/tools/networking/ivpn/default.nix
index e87b9ba4c693..39299da1a681 100644
--- a/pkgs/tools/networking/ivpn/default.nix
+++ b/pkgs/tools/networking/ivpn/default.nix
@@ -55,7 +55,10 @@ builtins.mapAttrs
           homepage = "https://www.ivpn.net/apps";
           changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${version}";
           license = lib.licenses.gpl3Only;
-          maintainers = with lib.maintainers; [ urandom ];
+          maintainers = with lib.maintainers; [
+            urandom
+            blenderfreaky
+          ];
           mainProgram = "ivpn";
         };
       }

From 52c7644f6b34bef35e71652e9c5096a9d532699b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 15:59:14 +0000
Subject: [PATCH 3031/3724] mdsf: 0.10.4 -> 0.10.5

---
 pkgs/by-name/md/mdsf/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/md/mdsf/package.nix b/pkgs/by-name/md/mdsf/package.nix
index c9bdd1c25159..44cc1a1f2a62 100644
--- a/pkgs/by-name/md/mdsf/package.nix
+++ b/pkgs/by-name/md/mdsf/package.nix
@@ -7,7 +7,7 @@
 }:
 let
   pname = "mdsf";
-  version = "0.10.4";
+  version = "0.10.5";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
     owner = "hougesen";
     repo = "mdsf";
     tag = "v${version}";
-    hash = "sha256-NH3DE6ef1HuS5ADVFros+iDQMZVVgG8V9OuFzzkig8g=";
+    hash = "sha256-m7VoGozJShEw6qVXScxgX7CCyIh62unVvzjq/W7Ynu8=";
   };
 
-  cargoHash = "sha256-dGqFRXezzqOpHA74fnLUGQAI8KgbPmWIL46UP0wza40=";
+  cargoHash = "sha256-AMo2LPC6RviYu2qx202o0gFIIJdjNJxS/zY06TEcpKw=";
 
   checkFlags = [
     # Failing due to the method under test trying to create a directory & write to the filesystem

From 6c206d964d3e7e7219787f3eb2db5dc240f701b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 00:43:32 +0000
Subject: [PATCH 3032/3724] kdePackages.packagekit-qt: 1.1.2 -> 1.1.3

---
 pkgs/tools/package-management/packagekit/qt.nix | 12 +++---------
 pkgs/top-level/qt5-packages.nix                 |  2 --
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix
index 1cce9329b6f4..ff156cf8559b 100644
--- a/pkgs/tools/package-management/packagekit/qt.nix
+++ b/pkgs/tools/package-management/packagekit/qt.nix
@@ -1,6 +1,5 @@
 {
   stdenv,
-  lib,
   fetchFromGitHub,
   cmake,
   pkg-config,
@@ -8,18 +7,15 @@
   packagekit,
 }:
 
-let
-  isQt6 = lib.versions.major qttools.version == "6";
-in
 stdenv.mkDerivation rec {
   pname = "packagekit-qt";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "PackageKit-Qt";
-    rev = "v${version}";
-    sha256 = "sha256-rLNeVjzIT18qUZgj6Qcf7E59CL4gx/ArYJfs9KHrqNs=";
+    tag = "v${version}";
+    hash = "sha256-ZHkOFPaOMLCectYKzQs9oQ70kv8APOdkjDRimHgld+c=";
   };
 
   buildInputs = [ packagekit ];
@@ -30,8 +26,6 @@ stdenv.mkDerivation rec {
     qttools
   ];
 
-  cmakeFlags = [ (lib.cmakeBool "BUILD_WITH_QT6" isQt6) ];
-
   dontWrapQtApps = true;
 
   meta = packagekit.meta // {
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 9200d884c129..f5f8871f8a86 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -129,8 +129,6 @@ makeScopeWithSplicing' {
 
         libopenshot = callPackage ../development/libraries/libopenshot { };
 
-        packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { };
-
         libopenshot-audio = callPackage ../development/libraries/libopenshot-audio { };
 
         libqglviewer = callPackage ../development/libraries/libqglviewer { };

From bd8bb06804183ca5a353b296d580acc65c17de5b Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 23 Aug 2025 17:49:53 +0200
Subject: [PATCH 3033/3724] solarus{,quest-editor,launcher}: 2.0.0 -> 2.0.1

This release is not tagged due to CI issues, see
<https://solarus-games.org/news/2025-07-23-solarus-2-0-1-release/#git-repository>

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 .../so/solarus-launcher/github-fetches.patch  | 26 +++++++++----------
 pkgs/by-name/so/solarus-launcher/package.nix  | 10 ++-----
 .../so/solarus-quest-editor/package.nix       | 20 +++++---------
 .../solarus-quest-editor/qlementine-src.patch | 13 ----------
 pkgs/by-name/so/solarus/package.nix           | 15 +++--------
 5 files changed, 25 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/by-name/so/solarus-quest-editor/qlementine-src.patch

diff --git a/pkgs/by-name/so/solarus-launcher/github-fetches.patch b/pkgs/by-name/so/solarus-launcher/github-fetches.patch
index 181acbd56123..001b2dd62ddd 100644
--- a/pkgs/by-name/so/solarus-launcher/github-fetches.patch
+++ b/pkgs/by-name/so/solarus-launcher/github-fetches.patch
@@ -1,34 +1,34 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 80b9aab..e56ca84 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -88,8 +88,7 @@ include(FetchContent)
+diff --git a/launcher/cmake/addDependencies.cmake b/launcher/cmake/addDependencies.cmake
+index d2927668e..dc8309de2 100644
+--- a/cmake/addDependencies.cmake
++++ b/cmake/addDependencies.cmake
+@@ -20,8 +20,7 @@ include(FetchContent)
  
- # Qlementine Icons: an SVG icon library made for Qt.
+ # Qlementine-Icons: an SVG icon library made for Qt.
  FetchContent_Declare(qlementine-icons
 -  GIT_REPOSITORY "https://github.com/oclero/qlementine-icons.git"
 -  GIT_TAG v1.8.0
 +  SOURCE_DIR "@qlementine-icons-src@"
+   EXCLUDE_FROM_ALL
  )
  FetchContent_MakeAvailable(qlementine-icons)
- set_target_properties(qlementine-icons
-@@ -99,8 +98,7 @@ set_target_properties(qlementine-icons
+@@ -34,8 +33,7 @@ set_target_properties(qlementine-icons
  
  # Qlementine: the QStyle library to have a modern look n' feel.
  FetchContent_Declare(qlementine
 -  GIT_REPOSITORY "https://github.com/oclero/qlementine.git"
--  GIT_TAG v1.2.0
+-  GIT_TAG v1.2.1
 +  SOURCE_DIR "@qlementine-src@"
+   EXCLUDE_FROM_ALL
  )
  FetchContent_MakeAvailable(qlementine)
- set_target_properties(qlementine
-@@ -109,8 +107,7 @@ set_target_properties(qlementine
- )
+@@ -48,8 +46,7 @@ set_target_properties(qlementine
  
+ # QtAppInstanceManager: a library to manage multiple instances of a Qt application.
  FetchContent_Declare(QtAppInstanceManager
 - GIT_REPOSITORY "https://github.com/oclero/qtappinstancemanager.git"
 - GIT_TAG v1.3.0
 +  SOURCE_DIR "@qtappinstancemanager-src@"
+  EXCLUDE_FROM_ALL
  )
  FetchContent_MakeAvailable(QtAppInstanceManager)
- set_target_properties(QtAppInstanceManager
diff --git a/pkgs/by-name/so/solarus-launcher/package.nix b/pkgs/by-name/so/solarus-launcher/package.nix
index 0e5d799a5cbf..9c0ff6a64260 100644
--- a/pkgs/by-name/so/solarus-launcher/package.nix
+++ b/pkgs/by-name/so/solarus-launcher/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  fetchFromGitLab,
   replaceVars,
   cmake,
   ninja,
@@ -23,14 +22,9 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "solarus-launcher";
-  version = "2.0.0";
+  inherit (solarus) version;
 
-  src = fetchFromGitLab {
-    owner = "solarus-games";
-    repo = "solarus-launcher";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-zBJnHzYJyhfzP1m6TgMkDLRA3EXC1oG8PC0Jq/fC2+Q=";
-  };
+  src = solarus.src + "/launcher";
 
   patches = [
     (replaceVars ./github-fetches.patch {
diff --git a/pkgs/by-name/so/solarus-quest-editor/package.nix b/pkgs/by-name/so/solarus-quest-editor/package.nix
index d6b80649daad..3100cf9aa6ea 100644
--- a/pkgs/by-name/so/solarus-quest-editor/package.nix
+++ b/pkgs/by-name/so/solarus-quest-editor/package.nix
@@ -1,8 +1,6 @@
 {
   lib,
   stdenv,
-  fetchFromGitLab,
-  replaceVars,
   qlementine,
   cmake,
   ninja,
@@ -21,18 +19,9 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "solarus-quest-editor";
-  version = "2.0.0";
+  inherit (solarus) version;
 
-  src = fetchFromGitLab {
-    owner = "solarus-games";
-    repo = "solarus-quest-editor";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-GTslxValldReWGb3x67zRPrvQUuCO/HQSXOEQlJfAmw=";
-  };
-
-  patches = [
-    (replaceVars ./qlementine-src.patch { qlementine-src = qlementine.src; })
-  ];
+  src = solarus.src + "/editor";
 
   strictDeps = true;
   nativeBuildInputs = [
@@ -57,6 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
     glm
   ];
 
+  cmakeFlags = [
+    (lib.cmakeBool "SOLARUS_USE_LOCAL_QLEMENTINE" true)
+    (lib.cmakeFeature "SOLARUS_QLEMENTINE_LOCAL_PATH" "${qlementine.src}")
+  ];
+
   meta = {
     description = "Editor for the Zelda-like ARPG game engine, Solarus";
     mainProgram = "solarus-editor";
diff --git a/pkgs/by-name/so/solarus-quest-editor/qlementine-src.patch b/pkgs/by-name/so/solarus-quest-editor/qlementine-src.patch
deleted file mode 100644
index a19cc2538f9d..000000000000
--- a/pkgs/by-name/so/solarus-quest-editor/qlementine-src.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/AddDependencies.cmake b/cmake/AddDependencies.cmake
-index 8272d14..054c079 100644
---- a/cmake/AddDependencies.cmake
-+++ b/cmake/AddDependencies.cmake
-@@ -51,7 +51,6 @@ endif()
- include(FetchContent)
- FetchContent_Declare(
-   qlementine
--  GIT_REPOSITORY https://github.com/oclero/qlementine.git
--  GIT_TAG        v1.2.0
-+  SOURCE_DIR "@qlementine-src@"
- )
- FetchContent_MakeAvailable(qlementine)
diff --git a/pkgs/by-name/so/solarus/package.nix b/pkgs/by-name/so/solarus/package.nix
index 34db918dc2d4..f1e2f96d63df 100644
--- a/pkgs/by-name/so/solarus/package.nix
+++ b/pkgs/by-name/so/solarus/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  fetchpatch,
   cmake,
   ninja,
   luajit,
@@ -22,23 +21,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "solarus";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitLab {
     owner = "solarus-games";
     repo = "solarus";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-Kfg4pFZrEhsIU4RQlOox3hMpk2PXbOzrkwDElPGnDjA=";
+    rev = "e70e3df7369d690615fc4c9b3f8dfa00066c5e87";
+    hash = "sha256-NOHv4b+r2WnyHEVLtcox+8+3Q3TtSDHB7vpKSTDHVKM=";
   };
 
-  patches = [
-    # https://gitlab.com/solarus-games/solarus/-/merge_requests/1570
-    (fetchpatch {
-      url = "https://gitlab.com/solarus-games/solarus/-/commit/8e1eee51cbfa5acf2511b059739153065b0ba21d.patch";
-      hash = "sha256-KevGavtUhpHRt85WLh9ApmZ8a+NeWB1zDDHKGT08yhQ=";
-    })
-  ];
-
   outputs = [
     "out"
     "lib"

From a48332c193dfefb1ba42cbca1b49d922d7a1a0f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 18:31:17 +0000
Subject: [PATCH 3034/3724] gearlever: 3.4.0 -> 3.4.2

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

diff --git a/pkgs/by-name/ge/gearlever/package.nix b/pkgs/by-name/ge/gearlever/package.nix
index df4279d13344..4ca18b384bf7 100644
--- a/pkgs/by-name/ge/gearlever/package.nix
+++ b/pkgs/by-name/ge/gearlever/package.nix
@@ -23,14 +23,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gearlever";
-  version = "3.4.0";
+  version = "3.4.2";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "mijorus";
     repo = "gearlever";
     tag = version;
-    hash = "sha256-3kTgYlsVumTVH5X6h3YvS0tdex/OGQyn5MzevQ+GuH4=";
+    hash = "sha256-IC3ueAplQc5McGoJkHjjCAGvnLCH9+DUrB3cuKfwMno=";
   };
 
   postPatch =

From 4adf463b69dbe0b01f05b12210582989a0797056 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 16:49:36 +0000
Subject: [PATCH 3035/3724] csharpier: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/by-name/cs/csharpier/package.nix b/pkgs/by-name/cs/csharpier/package.nix
index 97bebd35bab1..1f6c82c5e380 100644
--- a/pkgs/by-name/cs/csharpier/package.nix
+++ b/pkgs/by-name/cs/csharpier/package.nix
@@ -2,10 +2,10 @@
 
 buildDotnetGlobalTool {
   pname = "csharpier";
-  version = "1.1.1";
+  version = "1.1.2";
   executables = "csharpier";
 
-  nugetHash = "sha256-B0ijqWm3eZ31T+C5zRr4TkmfPsOfseaHpGPYZf5Yiw4=";
+  nugetHash = "sha256-dlWIqlErXT0l8WaLwtgKb7xpYVunkZihaJ3EzKqaqFE=";
 
   meta = with lib; {
     description = "Opinionated code formatter for C#";

From 694d2c92544202fb5dad8e2c9848b7748e44fb81 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Sat, 23 Aug 2025 19:00:16 +0200
Subject: [PATCH 3036/3724] todoman: 4.5.0 -> 4.6.0

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

diff --git a/pkgs/by-name/to/todoman/package.nix b/pkgs/by-name/to/todoman/package.nix
index a45aa5b5b9e5..49c38c8b9210 100644
--- a/pkgs/by-name/to/todoman/package.nix
+++ b/pkgs/by-name/to/todoman/package.nix
@@ -5,18 +5,19 @@
   lib,
   python3,
   sphinxHook,
+  writableTmpDirAsHomeHook,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "todoman";
-  version = "4.5.0";
+  version = "4.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pimutils";
     repo = "todoman";
     tag = "v${version}";
-    hash = "sha256-sk5LgFNo5Dc+oHCLu464Q1g0bk1QGsA7xMtMiits/8c=";
+    hash = "sha256-WMIXPPtW1227iDXLqG/JIYdNp5bxHxTlqpFtcIvZ8Aw=";
   };
 
   nativeBuildInputs = [
@@ -49,6 +50,7 @@ python3.pkgs.buildPythonApplication rec {
     pytest-cov-stub
     pytestCheckHook
     pytz
+    writableTmpDirAsHomeHook
   ];
 
   outputs = [

From 2cdf8d6a267630b355ae768bdbe573ffded252b5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 23 Aug 2025 20:11:45 +0300
Subject: [PATCH 3037/3724] linuxManualConfig: reinstate Rust

structuredAttrs strikes again.
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 460a5b0a52b7..38eda04ecb77 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -245,11 +245,13 @@ lib.makeOverridable (
           rust-bindgen-unwrapped
         ];
 
-        RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
+        env = {
+          RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
 
-        # avoid leaking Rust source file names into the final binary, which adds
-        # a false dependency on rust-lib-src on targets with uncompressed kernels
-        KRUSTFLAGS = lib.optionalString withRust "--remap-path-prefix ${rustPlatform.rustLibSrc}=/";
+          # avoid leaking Rust source file names into the final binary, which adds
+          # a false dependency on rust-lib-src on targets with uncompressed kernels
+          KRUSTFLAGS = lib.optionalString withRust "--remap-path-prefix ${rustPlatform.rustLibSrc}=/";
+        };
 
         patches =
           # kernelPatches can contain config changes and no actual patch

From 454c7a68de7db56d20509aadce8c9368f2721043 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Sat, 23 Aug 2025 19:05:58 +0200
Subject: [PATCH 3038/3724] python3.pkgs.rencode: fix build on aarch64-linux

---
 .../development/python-modules/rencode/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix
index 0d8d495eb41c..b99cff73ea1e 100644
--- a/pkgs/development/python-modules/rencode/default.nix
+++ b/pkgs/development/python-modules/rencode/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   cython,
   poetry-core,
   setuptools,
@@ -20,6 +21,19 @@ buildPythonPackage rec {
     hash = "sha256-k2b6DoKwNeQBkmqSRXqaRTjK7CVX6IKuXCLG9lBdLLY=";
   };
 
+  patches = [
+    # backport fix for -msse being passed on aarch64-linux
+    (fetchpatch {
+      url = "https://github.com/aresch/rencode/commit/591b9f4d85d7e2d4f4e99441475ef15366389be2.patch";
+      hash = "sha256-KhfawtYa4CnYiVzBYdtMn/JRkeqCLJetHvLEm1YVOe4=";
+    })
+    # do not pass -march=native etc. on x86_64
+    (fetchpatch {
+      url = "https://github.com/aresch/rencode/commit/e7ec8ea718e73a8fee7dbc007c262e1584f7f94b.patch";
+      hash = "sha256-gNYjxBsMN1p4IAmutV73JF8yCj0iz3DIl7kg7WrBdbs=";
+    })
+  ];
+
   nativeBuildInputs = [
     poetry-core
     setuptools

From a7c15865d079fbbb1e01c910c34606b6b0e55b63 Mon Sep 17 00:00:00 2001
From: Nishimara <me@nishimara.com>
Date: Sat, 23 Aug 2025 20:39:43 +0300
Subject: [PATCH 3039/3724] zapret: 71 -> 71.4

---
 pkgs/by-name/za/zapret/package.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix
index 9f44fc65c395..9908898a71ef 100644
--- a/pkgs/by-name/za/zapret/package.nix
+++ b/pkgs/by-name/za/zapret/package.nix
@@ -8,15 +8,12 @@
   zlib,
   libnetfilter_queue,
   libnfnetlink,
-
-  iptables,
-  nftables,
-  gawk,
+  libmnl,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zapret";
-  version = "71";
+  version = "71.4";
 
   src = fetchFromGitHub {
     owner = "bol-van";
@@ -30,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cwwj0xGEiR3sg2WheurtQo6Hy5JAARcZJNHEHMfAoOE=";
+    hash = "sha256-n7UasKtoQ4zfy2ho2vOREb0RPrDnhjYYbXcXTjelDvg=";
   };
 
   buildInputs = [
@@ -38,12 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     libnetfilter_queue
     libnfnetlink
-  ];
-
-  nativeBuildInputs = [
-    iptables
-    nftables
-    gawk
+    libmnl
   ];
 
   preBuild = ''

From d69cda222b6404c7ee78d250cdc905091693a8fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 23 Aug 2025 19:59:45 +0200
Subject: [PATCH 3040/3724] paperless-ngx: clean up pythonRelaxDeps

---
 pkgs/by-name/pa/paperless-ngx/package.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index f191fea5795a..1fb2305a4cdd 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -168,16 +168,8 @@ python.pkgs.buildPythonApplication rec {
   ];
 
   pythonRelaxDeps = [
-    "django"
     "django-allauth"
-    "django-auditlog"
-    "django-guardian"
-    "django-multiselectfield"
-    "imap-tools"
-    "pathvalidate"
     "redis"
-    "scikit-learn"
-    "tika-client"
   ];
 
   dependencies =

From f04aaa33ece243f37d8eba6d9960adf726d5eb80 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 20 Mar 2025 23:28:03 +0100
Subject: [PATCH 3041/3724] python313Packages.pyopenjtalk: init at 0.4.1

useful to enable japanese voice in kokoro via its misaki dependency
---
 .../python-modules/pyopenjtalk/default.nix    | 79 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 81 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyopenjtalk/default.nix

diff --git a/pkgs/development/python-modules/pyopenjtalk/default.nix b/pkgs/development/python-modules/pyopenjtalk/default.nix
new file mode 100644
index 000000000000..efc59b4b952e
--- /dev/null
+++ b/pkgs/development/python-modules/pyopenjtalk/default.nix
@@ -0,0 +1,79 @@
+{
+  lib,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  fetchzip,
+
+  cmake,
+  cython,
+  numpy,
+  setuptools,
+  setuptools-scm,
+
+  tqdm,
+
+  pytestCheckHook,
+}:
+
+let
+  dic-dirname = "open_jtalk_dic_utf_8-1.11";
+  dic-src = fetchzip {
+    name = dic-dirname;
+    url = "https://github.com/r9y9/open_jtalk/releases/download/v1.11.1/${dic-dirname}.tar.gz";
+    hash = "sha256-+6cHKujNEzmJbpN9Uan6kZKsPdwxRRzT3ZazDnCNi3s=";
+  };
+in
+buildPythonPackage rec {
+  pname = "pyopenjtalk";
+  version = "0.4.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "r9y9";
+    repo = "pyopenjtalk";
+    tag = "v${version}";
+    hash = "sha256-f0JNiMCeKpTY+jH3/9LuCkX2DRb9U8sN0SezT6OTm/E=";
+    fetchSubmodules = true;
+  };
+
+  build-system = [
+    cmake
+    cython
+    numpy
+    setuptools
+    setuptools-scm
+  ];
+
+  dontUseCmakeConfigure = true;
+
+  dependencies = [
+    numpy
+    tqdm
+  ];
+
+  postInstall = ''
+    # the package searches for a cached dic directory in this location
+    ln -s ${dic-src} $out/${python.sitePackages}/pyopenjtalk/${dic-dirname}
+  '';
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    # the built extension modules are only present in $out
+    # so we make sure to resolve pyopenjtalk from $out
+    rm -r pyopenjtalk
+  '';
+
+  pythonImportsCheck = [ "pyopenjtalk" ];
+
+  meta = {
+    changelog = "https://github.com/r9y9/pyopenjtalk/releases/tag/${src.tag}";
+    description = "Python wrapper for OpenJTalk";
+    homepage = "https://github.com/r9y9/pyopenjtalk";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tomasajt ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ab625e0ebb8..064652e4fe5a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13520,6 +13520,8 @@ self: super: with self; {
 
   pyopengltk = callPackage ../development/python-modules/pyopengltk { };
 
+  pyopenjtalk = callPackage ../development/python-modules/pyopenjtalk { };
+
   pyopensprinkler = callPackage ../development/python-modules/pyopensprinkler { };
 
   pyopenssl = callPackage ../development/python-modules/pyopenssl { };

From cae15208433c8ea14cb567c56336aee810c3e465 Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Wed, 4 Jun 2025 20:16:27 -0500
Subject: [PATCH 3042/3724] maintainers: add erichelgeson

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f1c1d31ef1a3..1b9287f0f4a3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18661,6 +18661,12 @@
     githubId = 51034487;
     matrix = "@nullcube:matrix.org";
   };
+  nulleric = {
+    email = "erichelgeson@gmail.com";
+    name = "Eric Helgeson";
+    github = "erichelgeson";
+    githubId = 271734;
+  };
   nullishamy = {
     email = "spam@amyerskine.me";
     name = "nullishamy";

From c29a92fb46069d6c608eb8dc4d4121d74b0f318d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 23 Aug 2025 20:09:18 +0200
Subject: [PATCH 3043/3724] paperless-ngx: 2.18.1 -> 2.28.2

Changelog: https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.18.2
---
 pkgs/by-name/pa/paperless-ngx/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 1fb2305a4cdd..80143f6e9599 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -29,13 +29,13 @@
   xorg,
 }:
 let
-  version = "2.18.1";
+  version = "2.18.2";
 
   src = fetchFromGitHub {
     owner = "paperless-ngx";
     repo = "paperless-ngx";
     tag = "v${version}";
-    hash = "sha256-POHF00cV8pl6i1rcwxtZ+Q1AlLybDj6gSlL0lPwSSCo=";
+    hash = "sha256-JaDeOiubu9VE8E/u2K9BS7GLNSTqXTcX926WhPMGd64=";
   };
 
   python = python3.override {

From 839adf42dfea5e944f28868d867307dfd1079f40 Mon Sep 17 00:00:00 2001
From: ProxyVT <tikit.us@outlook.com>
Date: Sat, 23 Aug 2025 21:18:38 +0300
Subject: [PATCH 3044/3724] qmplay2: pin vulkan-headers dependency to specific
 version

This prevents compilation issues with QmVk library, as it is hardcoded for a specific version of Vulkan-Headers (the package repo uses 1.3.277). I chose version 1.3.300 as it is the latest version that doesn't cause build failures due to changes in the Vulkan SDK that are incompatible with QmVk.

Additionally, version control will help with debugging potential problems that may arise from future updates.
---
 pkgs/by-name/qm/qmplay2/package.nix |  5 ++++-
 pkgs/by-name/qm/qmplay2/sources.nix | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index d5e1985bc0d0..5ce404e93cbc 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -29,6 +29,9 @@
 
 let
   sources = callPackage ./sources.nix { };
+  vulkan-headers-qmplay2 = vulkan-headers.overrideAttrs (oldAttrs: {
+    inherit (sources.vulkan-headers-qmplay2) version src;
+  });
 in
 assert lib.elem qtVersion [
   "5"
@@ -68,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     libva
     libxcb
     taglib
-    vulkan-headers
+    vulkan-headers-qmplay2
     vulkan-tools
   ]
   ++ lib.optionals (qtVersion == "6") [
diff --git a/pkgs/by-name/qm/qmplay2/sources.nix b/pkgs/by-name/qm/qmplay2/sources.nix
index 0e1ce2b25c9e..636563586a9d 100644
--- a/pkgs/by-name/qm/qmplay2/sources.nix
+++ b/pkgs/by-name/qm/qmplay2/sources.nix
@@ -17,6 +17,22 @@
     in
     self;
 
+  vulkan-headers-qmplay2 =
+    let
+      self = {
+        pname = "vulkan-headers";
+        version = "1.3.300";
+
+        src = fetchFromGitHub {
+          owner = "KhronosGroup";
+          repo = "Vulkan-Headers";
+          tag = "v${self.version}";
+          hash = "sha256-6J+6yvbEQXLY+Wkf1pWKtUAZGbe5Tc01uVh3Wqmk2+8=";
+        };
+      };
+    in
+    self;
+
   qmvk = {
     pname = "qmvk";
     version = "0-unstable-2025-06-05";

From f3b7f6ac2085fba26f9bdf5a594808cb2750432b Mon Sep 17 00:00:00 2001
From: ProxyVT <tikit.us@outlook.com>
Date: Wed, 6 Aug 2025 10:19:36 +0300
Subject: [PATCH 3045/3724] qmplay2: 25.01.19 -> 25.06.27

Fixes #380869
---
 pkgs/by-name/qm/qmplay2/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qm/qmplay2/sources.nix b/pkgs/by-name/qm/qmplay2/sources.nix
index 636563586a9d..58ab4a6cb99d 100644
--- a/pkgs/by-name/qm/qmplay2/sources.nix
+++ b/pkgs/by-name/qm/qmplay2/sources.nix
@@ -5,13 +5,13 @@
     let
       self = {
         pname = "qmplay2";
-        version = "25.01.19";
+        version = "25.06.27";
 
         src = fetchFromGitHub {
           owner = "zaps166";
           repo = "QMPlay2";
           tag = self.version;
-          hash = "sha256-Of/zEQ6o2J/wXfAoY10IPtCaMaSk8ux8L6MrimeMWVA=";
+          hash = "sha256-+kDaRKwXOHnHje1RntC9y9xiTaMzs8SGMLVoJ+6IDNk=";
         };
       };
     in

From c9882aa83bb0a51dfcb883bde0d0a2f288422208 Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Sat, 23 Aug 2025 12:20:28 -0500
Subject: [PATCH 3046/3724] ciderpress2: init at 1.1.0

---
 pkgs/by-name/ci/ciderpress2/package.nix       |  44 +++++
 .../ci/ciderpress2/retarget-net8.patch        | 162 ++++++++++++++++++
 2 files changed, 206 insertions(+)
 create mode 100644 pkgs/by-name/ci/ciderpress2/package.nix
 create mode 100644 pkgs/by-name/ci/ciderpress2/retarget-net8.patch

diff --git a/pkgs/by-name/ci/ciderpress2/package.nix b/pkgs/by-name/ci/ciderpress2/package.nix
new file mode 100644
index 000000000000..fe4d0662c82f
--- /dev/null
+++ b/pkgs/by-name/ci/ciderpress2/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildDotnetModule,
+  fetchFromGitHub,
+}:
+
+buildDotnetModule rec {
+  pname = "ciderpress2";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "fadden";
+    repo = "CiderPress2";
+    tag = "v${version}";
+    hash = "sha256-nzCuKCntqYVhjSHljPkY5ziAjYH/qGUqukRPrHzhOzo=";
+  };
+
+  projectFile = [ "cp2/cp2.csproj" ];
+
+  executables = [ "cp2" ];
+
+  patches = [ ./retarget-net8.patch ];
+
+  preBuild = ''
+    # Disable MS telemetry
+    export DOTNET_CLI_TELEMETRY_OPTOUT=1
+    export DOTNET_NOLOGO=1
+  '';
+
+  meta = {
+    description = "File archive utility for Apple II disk images and file archives";
+    longDescription = ''
+      CiderPress 2 is a file archive utility for Apple II disk images and file
+      archives. It can extract files from disk images and file archives, and
+      create new archives.
+    '';
+    homepage = "https://github.com/fadden/CiderPress2";
+    changelog = "https://github.com/fadden/CiderPress2/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nulleric ];
+    platforms = lib.platforms.unix;
+    mainProgram = "cp2";
+  };
+}
diff --git a/pkgs/by-name/ci/ciderpress2/retarget-net8.patch b/pkgs/by-name/ci/ciderpress2/retarget-net8.patch
new file mode 100644
index 000000000000..efa533d19a28
--- /dev/null
+++ b/pkgs/by-name/ci/ciderpress2/retarget-net8.patch
@@ -0,0 +1,162 @@
+From 4b97c8cc49ee2068198bbfaa7eacb17cf1cf067c Mon Sep 17 00:00:00 2001
+From: Eric Helgeson <erichelgeson@gmail.com>
+Date: Fri, 22 Aug 2025 10:05:56 -0500
+Subject: [PATCH] Retarget to .NET 8
+
+---
+ AppCommon/AppCommon.csproj                | 2 +-
+ CommonUtil/CommonUtil.csproj              | 2 +-
+ DiskArc/DiskArc.csproj                    | 2 +-
+ DiskArcTests/DiskArcTests.csproj          | 2 +-
+ Examples/AddFile/AddFile.csproj           | 2 +-
+ Examples/ListContents/ListContents.csproj | 2 +-
+ FileConv/FileConv.csproj                  | 2 +-
+ FileConvTests/FileConvTests.csproj        | 2 +-
+ MakeDist/MakeDist.csproj                  | 2 +-
+ cp2/cp2.csproj                            | 2 +-
+ cp2_wpf/cp2_wpf.csproj                    | 2 +-
+ 11 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/AppCommon/AppCommon.csproj b/AppCommon/AppCommon.csproj
+index 48e8e5c..1e58dc6 100644
+--- a/AppCommon/AppCommon.csproj
++++ b/AppCommon/AppCommon.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <ImplicitUsings>enable</ImplicitUsings>
+     <Nullable>enable</Nullable>
+   </PropertyGroup>
+diff --git a/CommonUtil/CommonUtil.csproj b/CommonUtil/CommonUtil.csproj
+index 132c02c..30402ac 100644
+--- a/CommonUtil/CommonUtil.csproj
++++ b/CommonUtil/CommonUtil.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <ImplicitUsings>enable</ImplicitUsings>
+     <Nullable>enable</Nullable>
+   </PropertyGroup>
+diff --git a/DiskArc/DiskArc.csproj b/DiskArc/DiskArc.csproj
+index a1c95f7..cc0baef 100644
+--- a/DiskArc/DiskArc.csproj
++++ b/DiskArc/DiskArc.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <ImplicitUsings>enable</ImplicitUsings>
+     <Nullable>enable</Nullable>
+   </PropertyGroup>
+diff --git a/DiskArcTests/DiskArcTests.csproj b/DiskArcTests/DiskArcTests.csproj
+index 521776e..40db439 100644
+--- a/DiskArcTests/DiskArcTests.csproj
++++ b/DiskArcTests/DiskArcTests.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <ImplicitUsings>enable</ImplicitUsings>
+     <Nullable>enable</Nullable>
+   </PropertyGroup>
+diff --git a/Examples/AddFile/AddFile.csproj b/Examples/AddFile/AddFile.csproj
+index 09d4137..690e75b 100644
+--- a/Examples/AddFile/AddFile.csproj
++++ b/Examples/AddFile/AddFile.csproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <ImplicitUsings>enable</ImplicitUsings>
+     <Nullable>enable</Nullable>
+   </PropertyGroup>
+diff --git a/Examples/ListContents/ListContents.csproj b/Examples/ListContents/ListContents.csproj
+index 1e27d16..ea1a510 100644
+--- a/Examples/ListContents/ListContents.csproj
++++ b/Examples/ListContents/ListContents.csproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <ImplicitUsings>enable</ImplicitUsings>
+     <Nullable>enable</Nullable>
+   </PropertyGroup>
+diff --git a/FileConv/FileConv.csproj b/FileConv/FileConv.csproj
+index 4c2e0e7..f44d628 100644
+--- a/FileConv/FileConv.csproj
++++ b/FileConv/FileConv.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <ImplicitUsings>enable</ImplicitUsings>
+     <Nullable>enable</Nullable>
+   </PropertyGroup>
+diff --git a/FileConvTests/FileConvTests.csproj b/FileConvTests/FileConvTests.csproj
+index 48e8e5c..1e58dc6 100644
+--- a/FileConvTests/FileConvTests.csproj
++++ b/FileConvTests/FileConvTests.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <ImplicitUsings>enable</ImplicitUsings>
+     <Nullable>enable</Nullable>
+   </PropertyGroup>
+diff --git a/MakeDist/MakeDist.csproj b/MakeDist/MakeDist.csproj
+index 7bcab19..69753a9 100644
+--- a/MakeDist/MakeDist.csproj
++++ b/MakeDist/MakeDist.csproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <ImplicitUsings>enable</ImplicitUsings>
+     <Nullable>enable</Nullable>
+   </PropertyGroup>
+diff --git a/cp2/cp2.csproj b/cp2/cp2.csproj
+index cdcac51..45234aa 100644
+--- a/cp2/cp2.csproj
++++ b/cp2/cp2.csproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <ImplicitUsings>enable</ImplicitUsings>
+     <Nullable>enable</Nullable>
+     <StartupObject>cp2.CP2Main</StartupObject>
+diff --git a/cp2_wpf/cp2_wpf.csproj b/cp2_wpf/cp2_wpf.csproj
+index bdfe5cc..9f5ed90 100644
+--- a/cp2_wpf/cp2_wpf.csproj
++++ b/cp2_wpf/cp2_wpf.csproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>WinExe</OutputType>
+-    <TargetFramework>net6.0-windows</TargetFramework>
++    <TargetFramework>net8.0-windows</TargetFramework>
+     <Nullable>enable</Nullable>
+     <UseWPF>true</UseWPF>
+     <AssemblyName>CiderPress2</AssemblyName>

From df066dbaee076f165266143e9f73276af59a94c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 18:52:06 +0000
Subject: [PATCH 3047/3724] tenv: 4.7.6 -> 4.7.7

---
 pkgs/by-name/te/tenv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix
index 50b681a4a266..d2493571e8a6 100644
--- a/pkgs/by-name/te/tenv/package.nix
+++ b/pkgs/by-name/te/tenv/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "tenv";
-  version = "4.7.6";
+  version = "4.7.7";
 
   src = fetchFromGitHub {
     owner = "tofuutils";
     repo = "tenv";
     tag = "v${version}";
-    hash = "sha256-zgkHE1Vvm2pLBXvpRJyWHHEDL32PDS9Xy8hy48BrO7o=";
+    hash = "sha256-7cFPlrfbKmYLi02LnERFddYzZqH4/HYt407h8eX6tew=";
   };
 
-  vendorHash = "sha256-acJNxu7M3YOBcQ3KY9qL9vpBoaYIZRUtIDuvkLgATTc=";
+  vendorHash = "sha256-kp2/R3zo+Q+ofFBeHwKoSztj7dmLIdaS6NILEFhdG2o=";
 
   excludedPackages = [ "tools" ];
 

From c9425e1fab20e9c8cc6680bdf6cecfbf0f83f49c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 19:01:44 +0000
Subject: [PATCH 3048/3724] meilisearch: 1.17.1 -> 1.18.0

---
 pkgs/by-name/me/meilisearch/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix
index c0cafc47ed27..5635ab8cd137 100644
--- a/pkgs/by-name/me/meilisearch/package.nix
+++ b/pkgs/by-name/me/meilisearch/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   nixosTests,
   nix-update-script,
-  version ? "1.17.1",
+  version ? "1.18.0",
 }:
 
 let
@@ -15,11 +15,11 @@ let
   # the meilisearch module accordingly and to remove the meilisearch_1_11
   # attribute from all-packages.nix at that point too.
   hashes = {
-    "1.17.1" = "sha256-krl8993p7fm3x7mJTrEDPjifB4sbmXb5gtLqHMYoIc0=";
+    "1.18.0" = "sha256-43+/pu3iuoaZ8c2x1PWyVsQqQrFd+EFpvEicABpoeqg=";
     "1.11.3" = "sha256-CVofke9tOGeDEhRHEt6EYwT52eeAYNqlEd9zPpmXQ2U=";
   };
   cargoHashes = {
-    "1.17.1" = "sha256-4g9CpdBAjMv8mQ1dXj02lCyTFaMp62HlcdcsdhIL744=";
+    "1.18.0" = "sha256-mM5moa1GRPrg6NhmsOHtxAZEvoyaEvoCmm0FMTNmYE4=";
     "1.11.3" = "sha256-cEJTokDJQuc9Le5+3ObMDNJmEhWEb+Qh0TV9xZkD9D8=";
   };
 in

From a5f2ee94980d2c5dedb66393f7e8e2532dfd97ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 19:09:43 +0000
Subject: [PATCH 3049/3724] python3Packages.django-registration: 5.1.0 -> 5.2.1

---
 .../python-modules/django-registration/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-registration/default.nix b/pkgs/development/python-modules/django-registration/default.nix
index b2fb52042cf8..4aa4f65c940a 100644
--- a/pkgs/development/python-modules/django-registration/default.nix
+++ b/pkgs/development/python-modules/django-registration/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "django-registration";
-  version = "5.1.0";
+  version = "5.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ubernostrum";
     repo = "django-registration";
     tag = version;
-    hash = "sha256-02kAZXxzTdLBvgff+WNUww2k/yGqxIG5gv8gXy9z7KE=";
+    hash = "sha256-k7r4g+iCdAwAUNQdbtxzS5kqgAavEBAJERSWgXvbXqg=";
   };
 
   build-system = [ pdm-backend ];

From 376664bb45f0aec8c1cf6b332542d912d675bb85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 Aug 2025 18:26:39 -0700
Subject: [PATCH 3050/3724] python3Packages.cupy: 13.5.1 -> 13.6.0

Diff: https://github.com/cupy/cupy/compare/v13.5.1...v13.6.0

Changelog: https://github.com/cupy/cupy/releases/tag/v13.6.0
---
 .../python-modules/cupy/default.nix           | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 719a23037325..f1527a2dd8cf 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -3,16 +3,14 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  cython_0,
+  cython,
   fastrlock,
   numpy,
-  wheel,
   pytestCheckHook,
   mock,
   setuptools,
   cudaPackages,
   addDriverRunpath,
-  pythonOlder,
   symlinkJoin,
 }:
 
@@ -58,10 +56,8 @@ let
 in
 buildPythonPackage rec {
   pname = "cupy";
-  version = "13.5.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "13.6.0";
+  pyproject = true;
 
   stdenv = cudaPackages.backendStdenv;
 
@@ -69,7 +65,7 @@ buildPythonPackage rec {
     owner = "cupy";
     repo = "cupy";
     tag = "v${version}";
-    hash = "sha256-8RgyvsU3lnt6nO0J1tiLBOdYsX0jJkjPH/SpKQz4o7s=";
+    hash = "sha256-nU3VL0MSCN+mI5m7C5sKAjBSL6ybM6YAk5lJiIDY0ck=";
     fetchSubmodules = true;
   };
 
@@ -83,11 +79,14 @@ buildPythonPackage rec {
     export CUPY_NUM_NVCC_THREADS="$NIX_BUILD_CORES"
   '';
 
-  nativeBuildInputs = [
+  build-system = [
+    cython
+    fastrlock
     setuptools
-    wheel
+  ];
+
+  nativeBuildInputs = [
     addDriverRunpath
-    cython_0
     cudaPackages.cuda_nvcc
   ];
 
@@ -101,7 +100,7 @@ buildPythonPackage rec {
   NVCC = "${lib.getExe cudaPackages.cuda_nvcc}"; # FIXME: splicing/buildPackages
   CUDA_PATH = "${cudatoolkit-joined}";
 
-  propagatedBuildInputs = [
+  dependencies = [
     fastrlock
     numpy
   ];

From 87e1134406989ce4ce68fe9d7289ef9564a2b58a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Aug 2025 12:24:15 +0200
Subject: [PATCH 3051/3724] postgresql.tests.postgresql.postgresql-backup-all:
 fix random dump

The new `\restrict` migitation creates random keys in the dump file by
default, which breaks a before/after test for the backup module. By
making the restrict key reproducible, the test passes again.
---
 nixos/modules/services/backup/postgresql-backup.nix | 7 ++-----
 nixos/tests/postgresql/postgresql.nix               | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index b32c0bbc5252..2e78cfa5e6d1 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -124,10 +124,7 @@ in
         type = lib.types.separatedString " ";
         default = "-C";
         description = ''
-          Command line options for pg_dump. This options is not used
-          if `config.services.postgresqlBackup.backupAll` is enabled.
-          Note that config.services.postgresqlBackup.backupAll is also active,
-          when no databases where specified.
+          Command line options for pg_dump or pg_dumpall.
         '';
       };
 
@@ -177,7 +174,7 @@ in
       ];
     })
     (lib.mkIf (cfg.enable && cfg.backupAll) {
-      systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall";
+      systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpOptions}";
     })
     (lib.mkIf (cfg.enable && !cfg.backupAll) {
       systemd.services = lib.listToAttrs (
diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix
index 456cacb54830..a1ea9b8a9028 100644
--- a/nixos/tests/postgresql/postgresql.nix
+++ b/nixos/tests/postgresql/postgresql.nix
@@ -65,6 +65,7 @@ let
           services.postgresqlBackup = {
             enable = true;
             databases = lib.optional (!backupAll) "postgres";
+            pgdumpOptions = "--restrict-key=ABCDEFGHIJKLMNOPQRSTUVWXYZ";
           };
         };
 

From 1b0899fd0ca9f138c500e3cd77f7bcb5264a3f0b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 19:16:50 +0000
Subject: [PATCH 3052/3724] python3Packages.knx-frontend: 2025.8.9.63154 ->
 2025.8.21.181525

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

diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix
index fefe104532bb..efc4b51cf26f 100644
--- a/pkgs/development/python-modules/knx-frontend/default.nix
+++ b/pkgs/development/python-modules/knx-frontend/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "knx-frontend";
-  version = "2025.8.9.63154";
+  version = "2025.8.21.181525";
   pyproject = true;
 
   # TODO: source build, uses yarn.lock
   src = fetchPypi {
     pname = "knx_frontend";
     inherit version;
-    hash = "sha256-Sphetc0ox0Oh70vNdkHorX0jpvC8bckm1TBKk2QSGPo=";
+    hash = "sha256-LWLkQBUpICLeRxyCNerDJTcOCLMGFDL/9Bap/8mbLVM=";
   };
 
   build-system = [ setuptools ];

From 89dab7dab7eafc47d3f6efacb9d5a17778502b89 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 23 Aug 2025 12:16:46 -0700
Subject: [PATCH 3053/3724] task-master-ai: 0.19.0 -> 0.25.1

---
 pkgs/by-name/ta/task-master-ai/package.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ta/task-master-ai/package.nix b/pkgs/by-name/ta/task-master-ai/package.nix
index 87aaf1ba4d5c..bf33addd584d 100644
--- a/pkgs/by-name/ta/task-master-ai/package.nix
+++ b/pkgs/by-name/ta/task-master-ai/package.nix
@@ -7,16 +7,16 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "task-master-ai";
-  version = "0.19.0";
+  version = "0.25.1";
 
   src = fetchFromGitHub {
     owner = "eyaltoledano";
     repo = "claude-task-master";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-OxfY1F30MKrv6sv3ksEy6wMRpWAg5d47w62dA6IDul8=";
+    tag = "task-master-ai@${finalAttrs.version}";
+    hash = "sha256-7Vs8k8/ym2K+FzX3fAke344S9gEhjPCnzz1z+OlounE=";
   };
 
-  npmDepsHash = "sha256-GStmiG+ZwRQl4pQD3Q0lonCsnwB2ReoC5b9vEPGZ5+o=";
+  npmDepsHash = "sha256-6dPIZtbTmLVrJgaSAZE7pT1+xbKVkBS+UF8xfy/micc=";
 
   dontNpmBuild = true;
 
@@ -24,6 +24,16 @@ buildNpmPackage (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
+  postInstall = ''
+    mkdir -p $out/lib/node_modules/task-master-ai/apps
+    cp -r apps/extension $out/lib/node_modules/task-master-ai/apps/extension
+    cp -r apps/docs $out/lib/node_modules/task-master-ai/apps/docs
+  '';
+
+  env = {
+    PUPPETEER_SKIP_DOWNLOAD = 1;
+  };
+
   meta = with lib; {
     description = "Node.js agentic AI workflow orchestrator";
     homepage = "https://task-master.dev";

From 915ef87b9f959e635845b4e94ede6ae50c11f7c6 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 24 Aug 2025 03:18:03 +0800
Subject: [PATCH 3054/3724] elmerfem: use cmakeBool/cmakeFeature

---
 pkgs/by-name/el/elmerfem/package.nix | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/el/elmerfem/package.nix b/pkgs/by-name/el/elmerfem/package.nix
index 21f21231f5fa..2571d0a3afb2 100644
--- a/pkgs/by-name/el/elmerfem/package.nix
+++ b/pkgs/by-name/el/elmerfem/package.nix
@@ -55,22 +55,20 @@ stdenv.mkDerivation rec {
     patchShebangs ./
   '';
 
-  storepath = placeholder "out";
-
   NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
 
   cmakeFlags = [
-    "-DELMER_INSTALL_LIB_DIR=${storepath}/lib"
-    "-DWITH_OpenMP:BOOLEAN=TRUE"
-    "-DWITH_MPI:BOOLEAN=TRUE"
-    "-DWITH_QT5:BOOLEAN=TRUE"
-    "-DWITH_OCC:BOOLEAN=TRUE"
-    "-DWITH_VTK:BOOLEAN=TRUE"
-    "-DWITH_ELMERGUI:BOOLEAN=TRUE"
-    "-DCMAKE_INSTALL_LIBDIR=lib"
-    "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    "-DCMAKE_OpenGL_GL_PREFERENCE=GLVND"
-    "-DUSE_MACOS_PACKAGE_MANAGER=False"
+    (lib.cmakeFeature "ELMER_INSTALL_LIB_DIR" "${placeholder "out"}/lib")
+    (lib.cmakeBool "WITH_OpenMP" true)
+    (lib.cmakeBool "WITH_MPI" true)
+    (lib.cmakeBool "WITH_QT6" true)
+    (lib.cmakeBool "WITH_OCC" true)
+    (lib.cmakeBool "WITH_VTK" true)
+    (lib.cmakeBool "WITH_ELMERGUI" true)
+    (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
+    (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
+    (lib.cmakeFeature "CMAKE_OpenGL_GL_PREFERENCE" "GLVND")
+    (lib.cmakeBool "USE_MACOS_PACKAGE_MANAGER" false)
   ];
 
   meta = with lib; {

From cfc8f3ce85c67c2749c6ba9a7242f1d819918486 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Mon, 18 Aug 2025 04:18:06 +0800
Subject: [PATCH 3055/3724] elmerfem: use qt6Packages

---
 pkgs/by-name/el/elmerfem/package.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/el/elmerfem/package.nix b/pkgs/by-name/el/elmerfem/package.nix
index 2571d0a3afb2..aacf40f49afa 100644
--- a/pkgs/by-name/el/elmerfem/package.nix
+++ b/pkgs/by-name/el/elmerfem/package.nix
@@ -11,9 +11,9 @@
   libGL,
   libGLU,
   opencascade-occt,
-  libsForQt5,
+  qt6Packages,
   tbb,
-  vtkWithQt5,
+  vtkWithQt6,
   llvmPackages,
 }:
 stdenv.mkDerivation rec {
@@ -33,21 +33,20 @@ stdenv.mkDerivation rec {
     cmake
     gfortran
     pkg-config
-    libsForQt5.wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
     mpi
     blas
     liblapack
-    libsForQt5.qtbase
-    libsForQt5.qtscript
-    libsForQt5.qwt
+    qt6Packages.qtbase
+    qt6Packages.qwt
     libGL
     libGLU
     opencascade-occt
     tbb
-    vtkWithQt5
+    vtkWithQt6
   ]
   ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
 
@@ -68,7 +67,10 @@ stdenv.mkDerivation rec {
     (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
     (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
     (lib.cmakeFeature "CMAKE_OpenGL_GL_PREFERENCE" "GLVND")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
     (lib.cmakeBool "USE_MACOS_PACKAGE_MANAGER" false)
+    (lib.cmakeFeature "QWT_INCLUDE_DIR" "${qt6Packages.qwt}/lib/qwt.framework/Headers")
   ];
 
   meta = with lib; {

From 75422624d9686d71129fae4c0d7ae5095ff7cc9a Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sat, 23 Aug 2025 21:48:19 +0200
Subject: [PATCH 3056/3724] metadata:  0.1.9 -> 0.1.10

---
 pkgs/by-name/me/metadata/package.nix | 31 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/me/metadata/package.nix b/pkgs/by-name/me/metadata/package.nix
index 66a5eb55e29f..be00516bcb27 100644
--- a/pkgs/by-name/me/metadata/package.nix
+++ b/pkgs/by-name/me/metadata/package.nix
@@ -1,26 +1,26 @@
 {
   lib,
   fetchFromGitHub,
-  fetchpatch,
   pkg-config,
   ffmpeg,
   rustPlatform,
   glib,
   installShellFiles,
   asciidoc,
+  versionCheckHook,
 }:
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "metadata";
-  version = "0.1.9";
+  version = "0.1.10";
 
   src = fetchFromGitHub {
     owner = "zmwangx";
     repo = "metadata";
-    rev = "ec9614cfa64ffc95d74e4b19496ebd9b026e692b";
-    hash = "sha256-ugirYg3l+zIfKAqp2smLgG99mX9tsy9rmGe6lFAwx5o=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wZ1wLygPFBFZsSYJGxNzYV+mXtbN68GY3nMYDFHPZHo=";
   };
 
-  cargoHash = "sha256-CqPRhfhTAEXTXRAJ9T5gQZx5jAQmJXYPbfQmyXkO6Sk=";
+  cargoHash = "sha256-pWekXsjAhK4wyjf95nZO+Wj9PcH87D8vYsRFAE/w/sw=";
 
   nativeBuildInputs = [
     pkg-config
@@ -29,14 +29,6 @@ rustPlatform.buildRustPackage {
     rustPlatform.bindgenHook
   ];
 
-  cargoPatches = [
-    (fetchpatch {
-      name = "update-crate-ffmpeg-next-version.patch";
-      url = "https://github.com/myclevorname/metadata/commit/a1bc9f53d9aa0aeb17cbb530a1da1de4fdf85328.diff";
-      hash = "sha256-LEwOK1UFUwLZhqLnoUor5CSOwz4DDjNFMnMOGq1S1Sc=";
-    })
-  ];
-
   postBuild = ''
     a2x --doctype manpage --format manpage man/metadata.1.adoc
   '';
@@ -51,6 +43,15 @@ rustPlatform.buildRustPackage {
 
   env.FFMPEG_DIR = ffmpeg.dev;
 
+  checkFlags = [
+    # "AAC (HE-AAC v2)" is reported as "AAC (LC)" in newer ffmpeg
+    # https://github.com/zmwangx/metadata/issues/13
+    "--skip=aac_he_aac"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   meta = {
     description = "Media metadata parser and formatter designed for human consumption, powered by FFmpeg";
     maintainers = with lib.maintainers; [ ];
@@ -58,4 +59,4 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/zmwangx/metadata";
     mainProgram = "metadata";
   };
-}
+})

From 4972897414a74111c1d3ac3927c23cd1788a4930 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Sat, 23 Aug 2025 19:56:38 +0200
Subject: [PATCH 3057/3724] luaPackages.lux-lua: symlink lua version directory

---
 pkgs/development/lua-modules/lux-lua.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/lua-modules/lux-lua.nix b/pkgs/development/lua-modules/lux-lua.nix
index 09a0efd15cec..120b7fc3a231 100644
--- a/pkgs/development/lua-modules/lux-lua.nix
+++ b/pkgs/development/lua-modules/lux-lua.nix
@@ -67,6 +67,8 @@ rustPlatform.buildRustPackage rec {
     runHook preInstall
     cp -r target/dist/share $out
     cp -r target/dist/lib $out
+    mkdir -p $out/lib/lua
+    ln -s $out/share/lux-lua/${luaVersionDir} $out/lib/lua/${luaVersionDir}
     runHook postInstall
   '';
 

From d521659af708dbc3c2542b8a5371bfa20f034ddf Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Sat, 23 Aug 2025 21:53:33 +0200
Subject: [PATCH 3058/3724] luaPackages.lux-lua: add lua to
 propagatedBuildInputs

---
 pkgs/development/lua-modules/lux-lua.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/lua-modules/lux-lua.nix b/pkgs/development/lua-modules/lux-lua.nix
index 120b7fc3a231..ec9b6a49f518 100644
--- a/pkgs/development/lua-modules/lux-lua.nix
+++ b/pkgs/development/lua-modules/lux-lua.nix
@@ -39,10 +39,13 @@ rustPlatform.buildRustPackage rec {
     gpgme
     libgit2
     libgpg-error
-    lua
     openssl
   ];
 
+  propagatedBuildInputs = [
+    lua
+  ];
+
   doCheck = false; # lux-lua tests are broken in nixpkgs
   useNextest = true;
   nativeCheckInputs = [

From d46e5b5301e0e2b76dd786226845d34fc75dc1fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 20:17:12 +0000
Subject: [PATCH 3059/3724] powerhub: 2.0.7 -> 2.0.10

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

diff --git a/pkgs/by-name/po/powerhub/package.nix b/pkgs/by-name/po/powerhub/package.nix
index fcd5180ae4f6..7ab1d8a4f22a 100644
--- a/pkgs/by-name/po/powerhub/package.nix
+++ b/pkgs/by-name/po/powerhub/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "powerhub";
-  version = "2.0.7";
+  version = "2.0.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "AdrianVollmer";
     repo = "PowerHub";
     tag = version;
-    hash = "sha256-ejdG/vMINyvToP8GAhRMdp/Jq8rZNBubDbRcg2i05lM=";
+    hash = "sha256-vZIdYjP7F7lUauOCkouwUpR/gO0gEjFR8HLqD3ZjS3E=";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From 441c6c4f7a8c1c237a580c022089d383c97f0b4b Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 23 Aug 2025 15:45:05 -0400
Subject: [PATCH 3060/3724] python313Packages.llama-cpp-python: restore fix for
 zero MTL devices

It was dropped in:
https://github.com/NixOS/nixpkgs/pull/391734

But upstream regressed so we have to patch it again.
---
 .../python-modules/llama-cpp-python/default.nix      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix
index 199d9bed0984..a99473c344d7 100644
--- a/pkgs/development/python-modules/llama-cpp-python/default.nix
+++ b/pkgs/development/python-modules/llama-cpp-python/default.nix
@@ -4,6 +4,7 @@
   gcc13Stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # nativeBuildInputs
   cmake,
@@ -51,6 +52,17 @@ buildPythonPackage rec {
   };
   # src = /home/gaetan/llama-cpp-python;
 
+  patches = [
+    # Fix test failure on a machine with no metal devices (e.g. nix-community darwin builder)
+    # https://github.com/ggml-org/llama.cpp/pull/15531
+    (fetchpatch {
+      url = "https://github.com/ggml-org/llama.cpp/pull/15531/commits/63a83ffefe4d478ebadff89300a0a3c5d660f56a.patch";
+      stripLen = 1;
+      extraPrefix = "vendor/llama.cpp/";
+      hash = "sha256-9LGnzviBgYYOOww8lhiLXf7xgd/EtxRXGQMredOO4qM=";
+    })
+  ];
+
   dontUseCmakeConfigure = true;
   SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" (
     # Set GGML_NATIVE=off. Otherwise, cmake attempts to build with

From d0e4f523f90a145d9c203e6bee96b2dc106c363a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 20:27:53 +0000
Subject: [PATCH 3061/3724] ficsit-cli: 0.6.0 -> 0.6.1

---
 pkgs/by-name/fi/ficsit-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/ficsit-cli/package.nix b/pkgs/by-name/fi/ficsit-cli/package.nix
index 1de0e4d7104f..6ebc44682a92 100644
--- a/pkgs/by-name/fi/ficsit-cli/package.nix
+++ b/pkgs/by-name/fi/ficsit-cli/package.nix
@@ -6,14 +6,14 @@
 }:
 buildGoModule rec {
   pname = "ficsit-cli";
-  version = "0.6.0";
+  version = "0.6.1";
   commit = "5dc8bdbaf6e8d9b1bcd2895e389d9d072d454e15";
 
   src = fetchFromGitHub {
     owner = "satisfactorymodding";
     repo = "ficsit-cli";
     tag = "v${version}";
-    hash = "sha256-Zwidx0war3hos9NEmk9dEzPBgDGdUtWvZb7FIF5OZMA=";
+    hash = "sha256-eQbHGxxI7g543XlV5y1Np8QTUsfAJdbG9sPXKbUmluc=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
 
   doCheck = false; # Tests make an api call, which always fails in the sandbox.
 
-  vendorHash = "sha256-vmA3jvxOLRYj5BmvWMhSEnCTEoe8BLm8lpm2kruIEv4=";
+  vendorHash = "sha256-3YqOwjCuXF48jsGjwv4mHMoGaiPDgxjzZTcrPAtA7I0=";
 
   meta = {
     description = "CLI tool for managing Satisfactory mods";

From d06b6e8bda2f3fb5251fa2d7c399081932e1c76f Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Sat, 23 Aug 2025 23:34:57 +0300
Subject: [PATCH 3062/3724] arc-browser: 1.106.0-66192 -> 1.109.0-67185

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

diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix
index 35d609920f94..8dcedf453eb2 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -11,11 +11,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arc-browser";
-  version = "1.106.0-66192";
+  version = "1.109.0-67185";
 
   src = fetchurl {
     url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
-    hash = "sha256-AlM0wJ/2okrxw2ZpMPodlSVQaMMkBPf5iIN4bnMTaME=";
+    hash = "sha256-zVErRSKMd5xhIB5fyawBNEatenHnm+q7VLAE78PLkmY=";
   };
 
   nativeBuildInputs = [ undmg ];

From 1df0ced67d397927921987e163c3fbcd58c2c191 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sat, 23 Aug 2025 10:00:54 +1200
Subject: [PATCH 3063/3724] cynthion: make udev rules accessible

Copy udev rules to an output path searched by the NixOS option
services.udev.packages.
---
 pkgs/development/python-modules/cynthion/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/cynthion/default.nix b/pkgs/development/python-modules/cynthion/default.nix
index f0d8d55b6c94..77d51cdeeb98 100644
--- a/pkgs/development/python-modules/cynthion/default.nix
+++ b/pkgs/development/python-modules/cynthion/default.nix
@@ -23,6 +23,7 @@
 
   # tests
   pytestCheckHook,
+  udevCheckHook,
 }:
 buildPythonPackage rec {
   pname = "cynthion";
@@ -44,6 +45,8 @@ buildPythonPackage rec {
       --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
   '';
 
+  nativeBuildInputs = [ udevCheckHook ];
+
   build-system = [
     setuptools
   ];
@@ -72,6 +75,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "cynthion" ];
 
+  # Make udev rules available for NixOS option services.udev.packages
+  postInstall = ''
+    install -Dm444 \
+      -t $out/lib/udev/rules.d \
+      build/lib/cynthion/assets/54-cynthion.rules
+  '';
+
   meta = {
     description = "Python package and utilities for the Great Scott Gadgets Cynthion USB Test Instrument";
     homepage = "https://github.com/greatscottgadgets/cynthion";

From bbb3c208e10322033dce520ee192e493faa046f8 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 23 Aug 2025 16:53:37 -0400
Subject: [PATCH 3064/3724] python313Packages.rapidocr-onnxruntime: fix build

---
 .../rapidocr-onnxruntime/default.nix          | 42 ++++++++++---------
 .../setup-py-override-version-checking.patch  | 29 +++++++------
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix
index 1ead42bb779b..97295a4216b2 100644
--- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix
+++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix
@@ -7,8 +7,10 @@
   replaceVars,
 
   setuptools,
+  colorlog,
   pyclipper,
   opencv-python,
+  omegaconf,
   numpy,
   six,
   shapely,
@@ -62,44 +64,46 @@ buildPythonPackage {
   ];
 
   postPatch = ''
-    mv setup_onnxruntime.py setup.py
-    mkdir -p rapidocr_onnxruntime/models
+    mkdir -p rapidocr/models
 
-    ln -s ${models}/* rapidocr_onnxruntime/models
+    ln -s ${models}/* rapidocr/models
 
     # Magic patch from upstream - what does this even do??
-    echo "from .rapidocr_onnxruntime.main import RapidOCR, VisRes" > __init__.py
+    echo "from .rapidocr.main import RapidOCR, VisRes" > __init__.py
   '';
 
-  # Upstream expects the source files to be under rapidocr_onnxruntime/rapidocr_onnxruntime
-  # instead of rapidocr_onnxruntime for the wheel to build correctly.
+  # Upstream expects the source files to be under rapidocr/rapidocr
+  # instead of rapidocr for the wheel to build correctly.
   preBuild = ''
-    mkdir rapidocr_onnxruntime_t
-    mv rapidocr_onnxruntime rapidocr_onnxruntime_t
-    mv rapidocr_onnxruntime_t rapidocr_onnxruntime
+    mkdir rapidocr_t
+    mv rapidocr rapidocr_t
+    mv rapidocr_t rapidocr
   '';
 
   # Revert the above hack
   postBuild = ''
-    mv rapidocr_onnxruntime rapidocr_onnxruntime_t
-    mv rapidocr_onnxruntime_t/* .
+    mv rapidocr rapidocr_t
+    mv rapidocr_t/* .
   '';
 
   build-system = [ setuptools ];
 
   dependencies = [
-    pyclipper
-    opencv-python
+    colorlog
     numpy
-    six
-    shapely
-    pyyaml
-    pillow
+    omegaconf
     onnxruntime
+    opencv-python
+    pillow
+    pyclipper
+    pyyaml
+    requests
+    shapely
+    six
     tqdm
   ];
 
-  pythonImportsCheck = [ "rapidocr_onnxruntime" ];
+  pythonImportsCheck = [ "rapidocr" ];
 
   # As of version 2.1.0, 61 out of 70 tests require internet access.
   # It's just not plausible to manually pick out ones that actually work
@@ -115,6 +119,6 @@ buildPythonPackage {
     homepage = "https://github.com/RapidAI/RapidOCR";
     license = with lib.licenses; [ asl20 ];
     maintainers = with lib.maintainers; [ pluiedev ];
-    mainProgram = "rapidocr_onnxruntime";
+    mainProgram = "rapidocr";
   };
 }
diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch b/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch
index 3800ded38c6a..f940c1c29dc1 100644
--- a/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch
+++ b/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch
@@ -1,22 +1,25 @@
-diff --git i/setup_onnxruntime.py w/setup_onnxruntime.py
-index e9572e9..f5f3b32 100644
---- i/setup_onnxruntime.py
-+++ w/setup_onnxruntime.py
+diff --git a/setup.py b/setup.py
+index 16938a4..5167972 100644
+--- a/setup.py
++++ b/setup.py
 @@ -6,7 +6,6 @@ from pathlib import Path
  from typing import List, Union
-
+ 
  import setuptools
 -from get_pypi_latest_version import GetPyPiLatestVersion
-
-
+ 
+ 
  def read_txt(txt_path: Union[Path, str]) -> List[str]:
-@@ -25,17 +24,7 @@ def get_readme():
-
-
- MODULE_NAME = "rapidocr_onnxruntime"
+@@ -25,20 +24,7 @@ def get_readme():
+ 
+ 
+ MODULE_NAME = "rapidocr"
 -
 -obtainer = GetPyPiLatestVersion()
--latest_version = obtainer(MODULE_NAME)
+-try:
+-    latest_version = obtainer(MODULE_NAME)
+-except Exception as e:
+-    latest_version = "0.0.0"
 -VERSION_NUM = obtainer.version_add_one(latest_version, add_patch=True)
 -
 -if len(sys.argv) > 2:
@@ -26,6 +29,6 @@ index e9572e9..f5f3b32 100644
 -        VERSION_NUM = matched_versions
 -sys.argv = sys.argv[:2]
 +VERSION_NUM = "@version@"
-
+ 
  project_urls = {
      "Documentation": "https://rapidai.github.io/RapidOCRDocs",

From 91540ce4b158e17d804c755fc269d24a40cffe44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 15:08:09 +0000
Subject: [PATCH 3065/3724] vcpkg-tool-unwrapped: 2025-05-19 -> 2025-07-21

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

diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix
index b3767c50f9ff..38e414cca1fc 100644
--- a/pkgs/by-name/vc/vcpkg-tool/package.nix
+++ b/pkgs/by-name/vc/vcpkg-tool/package.nix
@@ -24,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vcpkg-tool";
-  version = "2025-05-19";
+  version = "2025-07-21";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vcpkg-tool";
     rev = finalAttrs.version;
-    hash = "sha256-st9VLiuvKHKkokUToxw4KQ4aekGMqx8rfVBmmeddgVk=";
+    hash = "sha256-Q2CLqlHItNr4H4xFcuGd0BqootxsInZQ3unTZ7vtz8E=";
   };
 
   nativeBuildInputs = [

From f867d886794c06cf7af2ad3d2885297c5df49ab7 Mon Sep 17 00:00:00 2001
From: Guillaume Racicot <dev@gracicot.com>
Date: Mon, 4 Aug 2025 23:04:38 -0400
Subject: [PATCH 3066/3724] vcpkg: disable wrapper tests on unwrapped package

---
 pkgs/by-name/vc/vcpkg-tool/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix
index 38e414cca1fc..8c6a014844a7 100644
--- a/pkgs/by-name/vc/vcpkg-tool/package.nix
+++ b/pkgs/by-name/vc/vcpkg-tool/package.nix
@@ -176,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: {
     install -Dm555 "$vcpkgWrapperPath" "$out/bin/vcpkg"
   '';
 
-  passthru.tests = {
+  passthru.tests = lib.optionalAttrs doWrap {
     testWrapper = runCommand "vcpkg-tool-test-wrapper" { buildInputs = [ finalAttrs.finalPackage ]; } ''
       export NIX_VCPKG_DEBUG_PRINT_ENVVARS=true
       export VCPKG_ROOT=.

From 3a1675f689bf7038bc4f323b945a6a3dd1e81ba2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 06:22:17 +0000
Subject: [PATCH 3067/3724] vcpkg: 2025.04.09 -> 2025.07.25

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

diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix
index 0f7f7d15196d..4d8f7b873027 100644
--- a/pkgs/by-name/vc/vcpkg/package.nix
+++ b/pkgs/by-name/vc/vcpkg/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "vcpkg";
-  version = "2025.04.09";
+  version = "2025.07.25";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vcpkg";
     tag = finalAttrs.version;
-    hash = "sha256-ZJu3dFsKc7L2THgGXNtBszXUbEEoM3bnLxtf5x5UPTM=";
+    hash = "sha256-1v4IaHDsKipmpkuh+Xx52j3Li98MtG6BYL15rhWJC1w=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"

From 83047e4baabe9887432feb4de06ef3530773d45d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 22:57:14 +0000
Subject: [PATCH 3068/3724] ossia-score: 3.5.3 -> 3.6.1

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

diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix
index 46b1e59d8c44..32133f8ac92d 100644
--- a/pkgs/by-name/os/ossia-score/package.nix
+++ b/pkgs/by-name/os/ossia-score/package.nix
@@ -44,13 +44,13 @@
 
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "ossia-score";
-  version = "3.5.3";
+  version = "3.6.1";
 
   src = fetchFromGitHub {
     owner = "ossia";
     repo = "score";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-khVWoHsxezQjU6O+OX7t1zuzLJpIVTim1rMswD7TaQU=";
+    hash = "sha256-0wFRsu04jjhSYeJ1XVF35MoyAE+PYZqXK96GDug7urg=";
     fetchSubmodules = true;
   };
 

From 02a2dd63a72549bdbafc880d042ac3d519830e84 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 21:31:52 +0000
Subject: [PATCH 3069/3724] protoc-gen-es: 2.6.3 -> 2.7.0

---
 pkgs/by-name/pr/protoc-gen-es/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix
index d21a7028e63d..29dfe959106c 100644
--- a/pkgs/by-name/pr/protoc-gen-es/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-es/package.nix
@@ -7,20 +7,20 @@
 
 buildNpmPackage rec {
   pname = "protoc-gen-es";
-  version = "2.6.3";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "protobuf-es";
     tag = "v${version}";
-    hash = "sha256-7mtI/eVkM0bx6Izf4m00vTg54zJ27AevvRTjKO5/CHM=";
+    hash = "sha256-7jKvjDrqP+pM1nMfLChZ0M9Hevioc3hS+L2YT1CQx1s=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-TUV1byasVU4vJin/L+Ex32zi0BukhFVe2k9u3y2lxG4=";
+  npmDepsHash = "sha256-QXclh75PdMJZTHEQXcMklhP6K61TD9m8GBlravjNsPc=";
 
   npmWorkspace = "packages/protoc-gen-es";
 

From b75e834eb68a4c4c66f5885b82686ea4d351c8d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 22:30:53 +0000
Subject: [PATCH 3070/3724] python3Packages.alexapy: 1.29.7 -> 1.29.8

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

diff --git a/pkgs/development/python-modules/alexapy/default.nix b/pkgs/development/python-modules/alexapy/default.nix
index f1caa8e08eef..100547acf298 100644
--- a/pkgs/development/python-modules/alexapy/default.nix
+++ b/pkgs/development/python-modules/alexapy/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "alexapy";
-  version = "1.29.7";
+  version = "1.29.8";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "keatontaylor";
     repo = "alexapy";
     tag = "v${version}";
-    hash = "sha256-Sd55rt4qtIWoFs9pHfUzC+ypxUwavfgmaNsQUEOiaUI=";
+    hash = "sha256-AmczPJK7v1ymRT3XUUNzFR8GmDr9eZYGRH2FL3RvPsE=";
   };
 
   pythonRelaxDeps = [ "aiofiles" ];

From 5b87656bb58582d22c1ca9d36b50477bba0b59d3 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@users.noreply.github.com>
Date: Sat, 23 Aug 2025 13:48:50 -0700
Subject: [PATCH 3071/3724] terraform-providers.unifi: init at 0.41.3

---
 .../cluster/terraform-providers/providers.json           | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 27f4b2758560..453eee8cfe39 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1417,6 +1417,15 @@
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
+  "unifi": {
+    "hash": "sha256-IqsQRVgAB1PUqYJ0JPig6oq7FKJuS/a2NCgTCxX9+cg=",
+    "homepage": "https://registry.terraform.io/providers/ubiquiti-community/unifi",
+    "owner": "ubiquiti-community",
+    "repo": "terraform-provider-unifi",
+    "rev": "v0.41.3",
+    "spdx": "MPL-2.0",
+    "vendorHash": "sha256-iqwdSzyVZE5CitzXc8rWn2zO3v+VvuDNeS0ll0V6MtU="
+  },
   "utils": {
     "hash": "sha256-vCdPG8cZUdFhs1OmqDlgCDqBdyFiL99p6I8JhL8C6lY=",
     "homepage": "https://registry.terraform.io/providers/cloudposse/utils",

From 31c7ff05eed8e6ab04ba6d64fb67d02f6ad3e389 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 22:55:03 +0000
Subject: [PATCH 3072/3724] python3Packages.signify: 0.7.1 -> 0.8.1

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

diff --git a/pkgs/development/python-modules/signify/default.nix b/pkgs/development/python-modules/signify/default.nix
index 5d8111a9f311..57b60a4efbc2 100644
--- a/pkgs/development/python-modules/signify/default.nix
+++ b/pkgs/development/python-modules/signify/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "signify";
-  version = "0.7.1";
+  version = "0.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "ralphje";
     repo = "signify";
     tag = "v${version}";
-    hash = "sha256-yQCb7vNbz+ZGftqlEUUh6UUuxwv5+zhvBJmUn1eNgqM=";
+    hash = "sha256-kEQPoCNO3jGucnqYKRKOivaBtHHX4SMW9KALBMqqqVo=";
   };
 
   build-system = [ setuptools ];

From ccc052f38d356c888cec8d3952778057c0d3624d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 6 Aug 2025 00:11:08 +0200
Subject: [PATCH 3073/3724] python3Packages.tree-sitter: 0.25.0 -> 0.25.1

Changelog:
https://github.com/tree-sitter/py-tree-sitter/releases/tag/v0.25.1
---
 .../python-modules/tree-sitter/default.nix            | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix
index 74d54cfedbd6..300366a8a4d0 100644
--- a/pkgs/development/python-modules/tree-sitter/default.nix
+++ b/pkgs/development/python-modules/tree-sitter/default.nix
@@ -3,8 +3,11 @@
   stdenv,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
+
+  # build-system
   setuptools,
+
+  # tests
   tree-sitter-python,
   tree-sitter-rust,
   tree-sitter-html,
@@ -14,14 +17,12 @@
 
 buildPythonPackage rec {
   pname = "tree-sitter";
-  version = "0.25.0";
+  version = "0.25.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FciHdc8k2wZne6/mLfBYpkV9im3eZ7qkjdNyO5BeeaY=";
+    hash = "sha256-zXYa0OTR/IiksbgIO64G1PlzrPb18pu/E+qWCcHeycE=";
   };
 
   # see https://github.com/tree-sitter/py-tree-sitter/issues/330#issuecomment-2629403946

From ee57b87f5f32c9dd4ef176bef110fa9009683197 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 24 Aug 2025 01:14:31 +0200
Subject: [PATCH 3074/3724] python3Packages.compressed-tensors: 0.10.2 ->
 0.11.0

Diff: https://github.com/neuralmagic/compressed-tensors/compare/0.10.2...0.11.0

Changelog: https://github.com/neuralmagic/compressed-tensors/releases/tag/0.11.0
---
 .../compressed-tensors/default.nix            | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/compressed-tensors/default.nix b/pkgs/development/python-modules/compressed-tensors/default.nix
index 4c5eea81b0b6..3c6fd45b0ebc 100644
--- a/pkgs/development/python-modules/compressed-tensors/default.nix
+++ b/pkgs/development/python-modules/compressed-tensors/default.nix
@@ -1,12 +1,19 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   setuptools,
+  setuptools-scm,
+
+  # dependencies
+  frozendict,
   pydantic,
   torch,
   transformers,
+
+  # tests
   nbconvert,
   nbformat,
   pytestCheckHook,
@@ -14,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "compressed-tensors";
-  version = "0.10.2";
+  version = "0.11.0";
   pyproject = true;
 
   # Release on PyPI is missing the `utils` directory, which `setup.py` wants to import
@@ -22,12 +29,21 @@ buildPythonPackage rec {
     owner = "neuralmagic";
     repo = "compressed-tensors";
     tag = version;
-    hash = "sha256-BJsMyCs+rupt5+i5JlO7oY08Udc8hI3ZnMiN+8ja0mc=";
+    hash = "sha256-sSXn4/N/Pn+wOCY1Z0ziqFxfMRvRA1c90jPOBe+SwZw=";
   };
 
-  build-system = [ setuptools ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools_scm==8.2.0" "setuptools_scm"
+  '';
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   dependencies = [
+    frozendict
     pydantic
     torch
     transformers
@@ -45,12 +61,17 @@ buildPythonPackage rec {
 
   disabledTests = [
     # these try to download models from HF Hub
+    "test_apply_tinyllama_dynamic_activations"
+    "test_compress_model"
+    "test_compress_model_meta"
+    "test_compressed_linear_from_linear_usage"
+    "test_decompress_model"
     "test_get_observer_token_count"
     "test_kv_cache_quantization"
-    "test_target_prioritization"
     "test_load_compressed_sharded"
+    "test_model_forward_pass"
     "test_save_compressed_model"
-    "test_apply_tinyllama_dynamic_activations"
+    "test_target_prioritization"
   ];
 
   disabledTestPaths = [

From 86c480b259a26d175f62ef24f6e7f69c4177b1b3 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 23 Aug 2025 16:26:13 -0700
Subject: [PATCH 3075/3724] python3Packages.pycayennelpp: fix eval

---
 .../python-modules/pycayennelpp/default.nix           | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pycayennelpp/default.nix b/pkgs/development/python-modules/pycayennelpp/default.nix
index 70cc78370db0..96a72e2d7f12 100644
--- a/pkgs/development/python-modules/pycayennelpp/default.nix
+++ b/pkgs/development/python-modules/pycayennelpp/default.nix
@@ -1,22 +1,21 @@
 {
   lib,
-  python3Packages,
+  buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "pycayennelpp";
   version = "2.4.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "1cc6lz28aa57gs74767xyd3i370lwx046yb5a1nfch6fk3kf7xdx";
   };
 
-  nativeBuildInputs = with python3Packages; [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
   # Patch setup.py to remove pytest-runner
   postPatch = ''

From e35ba13eca4bf2680f9892a08d698099e9eafb27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 00:23:12 +0000
Subject: [PATCH 3076/3724] vscode-extensions.pkief.material-icon-theme: 5.25.0
 -> 5.26.0

---
 .../vscode/extensions/pkief.material-icon-theme/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix
index afee5770f4b7..5df3dee79ce4 100644
--- a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "material-icon-theme";
     publisher = "PKief";
-    version = "5.25.0";
-    hash = "sha256-jkTFfyeFJ4ygsKJj41tWDJ91XitSs2onW4ni3rMNJE8=";
+    version = "5.26.0";
+    hash = "sha256-AXQ2md1lApIFW1NIY5gjVIWdKOv0fxs0rRpIbjmCgwM=";
   };
   meta = {
     description = "Material Design Icons for Visual Studio Code";

From bc75642e58b7ad9c8140628ccc030957575104c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 00:53:06 +0000
Subject: [PATCH 3077/3724] python3Packages.bjoern: 3.2.1 -> 3.2.2

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

diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix
index cbcb7be585c5..e7eb25058871 100644
--- a/pkgs/development/python-modules/bjoern/default.nix
+++ b/pkgs/development/python-modules/bjoern/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "bjoern";
-  version = "3.2.1";
+  version = "3.2.2";
   format = "setuptools";
 
   # tests are not published to pypi anymore
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "jonashaag";
     repo = "bjoern";
     rev = version;
-    hash = "sha256-d7u/lEh2Zr5NYWYu4Zr7kgyeOIQuHQLYrZeiZMHbpio=";
+    hash = "sha256-drFLM6GsgrM8atQDxmb3/1bpj+C1WetQLjNbZqCTzog=";
     fetchSubmodules = true; # fetch http-parser and statsd-c-client submodules
   };
 

From 414138a5245333825f6f8fc9993c1056cd234c71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 01:08:48 +0000
Subject: [PATCH 3078/3724] fosrl-newt: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix
index f5d6ead99a37..f698dee6a930 100644
--- a/pkgs/by-name/fo/fosrl-newt/package.nix
+++ b/pkgs/by-name/fo/fosrl-newt/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "newt";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "newt";
     tag = version;
-    hash = "sha256-rRieo1olWwTSx5p7HpDE0eMY4d2/GcU0o0wIFyXetzI=";
+    hash = "sha256-yfQ9w1PKLhdpakZQLnQEcOAxpA4LC4S2OFX4dYKgDKw=";
   };
 
   vendorHash = "sha256-PENsCO2yFxLVZNPgx2OP+gWVNfjJAfXkwWS7tzlm490=";

From 7189bf6bab12ee504fcebcd9ee60ed768c616f31 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Sat, 23 Aug 2025 21:29:04 -0400
Subject: [PATCH 3079/3724] ruffle: bump up version from "0-" to "0.2-"

---
 pkgs/by-name/ru/ruffle/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 6c1c34a8ee88..298dec6ad36a 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -21,12 +21,12 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruffle";
-  version = "0-nightly-2025-08-22";
+  version = "0.2-nightly-2025-08-22";
 
   src = fetchFromGitHub {
     owner = "ruffle-rs";
     repo = "ruffle";
-    tag = lib.strings.removePrefix "0-" finalAttrs.version;
+    tag = lib.strings.removePrefix "0.2-" finalAttrs.version;
     hash = "sha256-bv8ZQuEU8QqtC7fvtELXlkQkjPoGqqSglhE0lzsTEIk=";
   };
 
@@ -35,8 +35,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   env =
     let
-      tag = lib.strings.removePrefix "0-" finalAttrs.version;
-      versionDate = lib.strings.removePrefix "0-nightly-" finalAttrs.version;
+      tag = lib.strings.removePrefix "0.2-" finalAttrs.version;
+      versionDate = lib.strings.removePrefix "0.2-nightly-" finalAttrs.version;
     in
     {
       VERGEN_IDEMPOTENT = "1";
@@ -116,7 +116,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
           curl https://api.github.com/repos/ruffle-rs/ruffle/releases?per_page=1 | \
           jq -r ".[0].tag_name" \
         )"
-        exec nix-update --version "0-$version" ruffle
+        exec nix-update --version "0.2-$version" ruffle
       '';
     });
   };
@@ -135,7 +135,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://ruffle.rs/";
     downloadPage = "https://ruffle.rs/downloads";
-    changelog = "https://github.com/ruffle-rs/ruffle/releases/tag/${lib.strings.removePrefix "0-" finalAttrs.version}";
+    changelog = "https://github.com/ruffle-rs/ruffle/releases/tag/${lib.strings.removePrefix "0.2" finalAttrs.version}";
     license = [
       lib.licenses.mit
       lib.licenses.asl20

From f4cece247d4c0934dd0afb6354f1123c50c34906 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 02:05:05 +0000
Subject: [PATCH 3080/3724] python3Packages.btest: 1.1 -> 1.2

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

diff --git a/pkgs/development/python-modules/btest/default.nix b/pkgs/development/python-modules/btest/default.nix
index bf75503ca6f4..2fcdc6ff4549 100644
--- a/pkgs/development/python-modules/btest/default.nix
+++ b/pkgs/development/python-modules/btest/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "btest";
-  version = "1.1";
+  version = "1.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "zeek";
     repo = "btest";
     tag = "v${version}";
-    hash = "sha256-D01hAKcE52eKJRUh1/x5DGxRQpWgA2J0nutshpKrtRU=";
+    hash = "sha256-c+iWzqq0RiRkZlRYjUCXIaFqgnyFdbMAWDNrVYZUvgw=";
   };
 
   # No tests available and no module to import

From 5549d6733a4e04745497ee52c571b7fe07f78ce6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 02:22:23 +0000
Subject: [PATCH 3081/3724] emmylua-check: 0.11.0 -> 0.12.0

---
 pkgs/by-name/em/emmylua-check/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/em/emmylua-check/package.nix b/pkgs/by-name/em/emmylua-check/package.nix
index 4cbfcac99066..48d5e7d7a896 100644
--- a/pkgs/by-name/em/emmylua-check/package.nix
+++ b/pkgs/by-name/em/emmylua-check/package.nix
@@ -7,18 +7,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "emmylua_check";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "EmmyLuaLs";
     repo = "emmylua-analyzer-rust";
     tag = finalAttrs.version;
-    hash = "sha256-HbjGOvK/b7SyhNF/Jff0SgJdOfSbzjkDkqQwuflOABA=";
+    hash = "sha256-IXoiXfRnGOZQ7c8AJaK8OGjqp1bczd/tKjtpbYdCZlU=";
   };
 
   buildAndTestSubdir = "crates/emmylua_check";
 
-  cargoHash = "sha256-3x71VNWCTFb75STx8w/T++dLo1s2FwNhFm+lyZHS7qI=";
+  cargoHash = "sha256-7QQipbnqelLdzQr+lIORyQNM9SS5yHaJLQ31M52lYCw=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 29175b958881e289d7b91c0e71f17bbfd34a394b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 02:24:19 +0000
Subject: [PATCH 3082/3724] emmylua-ls: 0.11.0 -> 0.12.0

---
 pkgs/by-name/em/emmylua-ls/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/em/emmylua-ls/package.nix b/pkgs/by-name/em/emmylua-ls/package.nix
index 79fc0dc37bf1..164b1648a9c6 100644
--- a/pkgs/by-name/em/emmylua-ls/package.nix
+++ b/pkgs/by-name/em/emmylua-ls/package.nix
@@ -7,18 +7,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "emmylua_ls";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "EmmyLuaLs";
     repo = "emmylua-analyzer-rust";
     tag = finalAttrs.version;
-    hash = "sha256-HbjGOvK/b7SyhNF/Jff0SgJdOfSbzjkDkqQwuflOABA=";
+    hash = "sha256-IXoiXfRnGOZQ7c8AJaK8OGjqp1bczd/tKjtpbYdCZlU=";
   };
 
   buildAndTestSubdir = "crates/emmylua_ls";
 
-  cargoHash = "sha256-3x71VNWCTFb75STx8w/T++dLo1s2FwNhFm+lyZHS7qI=";
+  cargoHash = "sha256-7QQipbnqelLdzQr+lIORyQNM9SS5yHaJLQ31M52lYCw=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 3a80f0c38c1f730370507f25f42ffa62cb431716 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 03:19:22 +0000
Subject: [PATCH 3083/3724] postfix-tlspol: 1.8.13 -> 1.8.14

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

diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix
index 0e5224de0375..f938699e8f85 100644
--- a/pkgs/by-name/po/postfix-tlspol/package.nix
+++ b/pkgs/by-name/po/postfix-tlspol/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "postfix-tlspol";
-  version = "1.8.13";
+  version = "1.8.14";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${version}";
-    hash = "sha256-ff+tQb3GfWYt+u7idQf/mTN8uSkkbWLfxlq+1m1gfyc=";
+    hash = "sha256-lfezkGMmdYlstchUWGoofCfJLIHOStaDwR/A5j1EOGc=";
   };
 
   vendorHash = null;

From 477089e3a72100014b39a08cdfa98be0418333c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 04:20:35 +0000
Subject: [PATCH 3084/3724] python3Packages.pyoverkiz: 1.18.1 -> 1.18.2

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

diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix
index c8ee9f5670e3..11c9d59b119f 100644
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pyoverkiz";
-  version = "1.18.1";
+  version = "1.18.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "iMicknl";
     repo = "python-overkiz-api";
     tag = "v${version}";
-    hash = "sha256-X/0cNMzNjDJqBRiP4kuua4oJVG+0oRbjoZVYP0D4f9M=";
+    hash = "sha256-kGcDZp1oLkjHy/+iAdnsAceSY+jX9+hw3mFxCaT18YA=";
   };
 
   build-system = [ hatchling ];

From 292d0535fec0239777d953fb9d304d0169f395b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 04:25:05 +0000
Subject: [PATCH 3085/3724] python3Packages.pylutron-caseta: 0.24.0 -> 0.25.0

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

diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix
index 3c67d46ea972..6b5af6670d34 100644
--- a/pkgs/development/python-modules/pylutron-caseta/default.nix
+++ b/pkgs/development/python-modules/pylutron-caseta/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pylutron-caseta";
-  version = "0.24.0";
+  version = "0.25.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "gurumitts";
     repo = "pylutron-caseta";
     tag = "v${version}";
-    hash = "sha256-67y/YaXWHklSppUxsJ44CDMsvBXLzKBGl00LXBWi4+g=";
+    hash = "sha256-VK53y4m86xVVGibAiWtxNge+kBYxQnltmc3mYpoGedw=";
   };
 
   build-system = [ hatchling ];

From f727c3805adc5090adcf4466776db02e0c453a9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 04:32:57 +0000
Subject: [PATCH 3086/3724] cockpit: 343 -> 345

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

diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix
index 7243379305ec..cebfd799199f 100644
--- a/pkgs/by-name/co/cockpit/package.nix
+++ b/pkgs/by-name/co/cockpit/package.nix
@@ -41,13 +41,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit";
-  version = "343";
+  version = "345";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit";
     tag = finalAttrs.version;
-    hash = "sha256-Yov8C1zpSYkkK5U7Lly6jGqvtfIZVH4modd2mLZRrGs=";
+    hash = "sha256-dK2sMqPmxNKMKrlNkr7FoSaHY5Qn1dtNHX32d/IYu8U=";
     fetchSubmodules = true;
   };
 

From 246d0d543967de246fa65063b27db8223f53f5ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 04:39:26 +0000
Subject: [PATCH 3087/3724] ome_zarr: 0.12.1 -> 0.12.2

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

diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix
index 4f69ffe262ba..67a14ed7a03a 100644
--- a/pkgs/development/python-modules/ome-zarr/default.nix
+++ b/pkgs/development/python-modules/ome-zarr/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "ome-zarr";
-  version = "0.12.1";
+  version = "0.12.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ome";
     repo = "ome-zarr-py";
     tag = "v${version}";
-    hash = "sha256-xBznMQ5wbz0CP30cuU7Tdet9dFKLBRiyLww+iNamwnA=";
+    hash = "sha256-lwv6PHm41HFylt7b0d5LHCrCIXNWFNGg59VQvPXYtVc=";
   };
 
   build-system = [

From c8e3e2c984ea985fe5da0bb41d2a212d6e0d1a53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 05:11:37 +0000
Subject: [PATCH 3088/3724] check-jsonschema: 0.33.2 -> 0.33.3

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

diff --git a/pkgs/by-name/ch/check-jsonschema/package.nix b/pkgs/by-name/ch/check-jsonschema/package.nix
index 48c473c6a8df..0d8ec8839182 100644
--- a/pkgs/by-name/ch/check-jsonschema/package.nix
+++ b/pkgs/by-name/ch/check-jsonschema/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "check-jsonschema";
-  version = "0.33.2";
+  version = "0.33.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-jsonschema";
     repo = "check-jsonschema";
     tag = version;
-    hash = "sha256-lYmKhNMXLnEesnNNCWyx5hyS3l2UwTiJH/uTdy2XTb4=";
+    hash = "sha256-h9qEPf3m1eknTq1cLQ4B2RxriyMpS/Kxzg6+bVCANzo=";
   };
 
   build-system = with python3Packages; [ setuptools ];

From 785a9e3f8123a2262d0b3d5b4de36ec50bbdd15c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 05:13:58 +0000
Subject: [PATCH 3089/3724] thunderbird-esr-bin-unwrapped: 140.1.1esr ->
 140.2.0esr

---
 .../thunderbird-bin/release_esr_sources.nix   | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
index 1908f322506d..edeb29ebb3e1 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "140.1.1esr";
+  version = "140.2.0esr";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/af/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/af/thunderbird-140.2.0esr.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "919982590b3b6354c6856cc20b7fb7776d75c61f829992d10932bc684810bf38";
+      sha256 = "e0603bcf5aeb496411dbacbed98e816a527792d76fc7154fa9825627c91615e3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ar/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ar/thunderbird-140.2.0esr.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "6ec79300bdd71d797258b4c9e8f943857f69a0ad5cf948fe326fe0dc9517e502";
+      sha256 = "a0110b6746c64c982ac46c3faf220e736743204ae8697a9772ec1502bcc099cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ast/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ast/thunderbird-140.2.0esr.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "703b0797401fb7eed922522a8467ba3445ad5a71c0f81c7f4858f42cc080fcef";
+      sha256 = "356190fe33ce6c515ad9ff22e5d8a00253c478c0439c11d4892c21b9c343f89e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/be/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/be/thunderbird-140.2.0esr.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "b0a3f3a4e4a9453b054289e5d939b77db4effcf4667e219c4caf348653e5050f";
+      sha256 = "19599d2d1b67f14de585fd741125d790bd7155f903f9b14b6d89b0af0d144219";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/bg/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/bg/thunderbird-140.2.0esr.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "36bfe0d1acb2ba63bbf8ae34e2c39f3ff90b26f8f5c2bec73fdc9b31d70464e3";
+      sha256 = "3efb0fe35814616f4dadfee73456985e2f0554ef1345dce89ab50b534174ff9c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/br/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/br/thunderbird-140.2.0esr.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "0d3a252e23df6de8898912fef53e53b2d050c0dff75dbab4644b7371d27ffb59";
+      sha256 = "ad395c992b4727268fd494fc5e2bd9cd05216db77417a106f74406a30a1e2ac0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ca/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ca/thunderbird-140.2.0esr.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "37e0a46052d49472f75e45d82656aad56b202ba1cd094e271f875e5fe8137a4a";
+      sha256 = "974b0cb086777827abaa6d866248afdea36730d9706bdd257033d85f1fdba6df";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/cak/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/cak/thunderbird-140.2.0esr.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "d7e29fb063478024d7772a867062381252b0db1c4832da0a5254918701ee58c7";
+      sha256 = "e8b8bd3adcb8070f8da652c965d2283c75e756146e08b2493a6d26af2940a30f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/cs/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/cs/thunderbird-140.2.0esr.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "30f6aac467c61950a4e4bf95692d2d68eb1c1e1de3d5987350a8510c413c9991";
+      sha256 = "b8e172fb00f61c404e2070dab7a1049d6fa09c9962482e441b359b34d7d1bdaf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/cy/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/cy/thunderbird-140.2.0esr.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "c94dcd1dc7d235e5c8876bd319aeee64d76747e51a007bdabc2c91ded07da83d";
+      sha256 = "6774a0c1e28f26ad431b16c33bd9b55831b3f43982ea42132cefd4e8237a73bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/da/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/da/thunderbird-140.2.0esr.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "56ec5ec6044ac84fd669445d4a69a181a62f922b4cd9cbd3e8f7d516f0625a30";
+      sha256 = "6a26d79d8331b5984c24cb3d77dd2deb91773556c77750f90c76a4fd5fc94f5c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/de/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/de/thunderbird-140.2.0esr.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "3fe9deaf6deacba4572081b69e8d872bc98f640515153d7bba203544c5de2a43";
+      sha256 = "39ab6222efdb7abbfe0ffe0ff278ca196df21e4babf61544efd4f6527fc6c66f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/dsb/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/dsb/thunderbird-140.2.0esr.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "2be0e2b0d8a7d3d9bb5ccb8124e60ee93bf58a5c60ea0290f30e57724ab1f01c";
+      sha256 = "51c7be3fb39387831032139083e75a52eab974b8911286a4b69d28ae39f79651";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/el/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/el/thunderbird-140.2.0esr.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "f260a4ac4dd618f26386aa0b58e439e6071573ddae17dd851bba1e6ec0b56270";
+      sha256 = "3144cba797bd4981e7509db1a6c33cf9256060fb9fdd8516f2ef34f6084dd458";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/en-CA/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/en-CA/thunderbird-140.2.0esr.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "1e11b27a7ad2734cc0a05290e60ad9d9c52ab14cfc79ce3ca8c7628021bf86a6";
+      sha256 = "00bd106f0427d2290729830ce037bab93d43fa330f6c167ebccc6b06893154bd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/en-GB/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/en-GB/thunderbird-140.2.0esr.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "f8a5c570c2db66cff6579a3849c2a2ee732b7bcb9d08fc78c0b60b809a28655a";
+      sha256 = "31ab146d1e81f6386b660089173d6a8c61463ccf8c7a507fae55c88ef148bc33";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/en-US/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/en-US/thunderbird-140.2.0esr.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "13932d2417a5b88f392e52390ef90b43b3e21b2406d2c3c75879acc7a9737d49";
+      sha256 = "9545f2bda88bc3bb57bf90bd2fd1c202cd1982d45632ceb960e40d0889e970c2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/es-AR/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/es-AR/thunderbird-140.2.0esr.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "23abeb1a746f68bf41756de800e28eb713f0e4c2bb3e45af753d60ff82ff102a";
+      sha256 = "7b4498f85ba6c8f7dc042dac54575368793bcca8d69727101b2554f4ecdca7e9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/es-ES/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/es-ES/thunderbird-140.2.0esr.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "6899c7b9216211cfcf8508234feddd40bd0f3878c075fcaa9786154aeb5d761e";
+      sha256 = "6b920b131187964242a2b6c71efc5ba10d1acf670c670c2d371ee2bf7208a1c3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/es-MX/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/es-MX/thunderbird-140.2.0esr.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "161197e28416206f216985796fcb131ec29e2a64170d7ab7be91e686fbcdc014";
+      sha256 = "c3cdb14615f28b14fbe4084540013bdff97423e6e6003be8432bf21dd60f8b09";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/et/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/et/thunderbird-140.2.0esr.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "f5a693e7d141e9085ed072f1192effd76298e3a3b81517f41994b2b317208447";
+      sha256 = "5ef591e4a8f9e86442932c485e23606f8199a98516fee0c5099dc5626e942c29";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/eu/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/eu/thunderbird-140.2.0esr.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "db90b40e330738e19cdc29fe5386117e363a7980003bf407005278b4a44d43a8";
+      sha256 = "0628ad64b669a3bc4bb10808c0a5dbe54fca19b9775fc7dc7f28115bae8ee60b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/fi/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/fi/thunderbird-140.2.0esr.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "7629a5087f7ba516b6ac202b10f9324458f9e7a65151a0e7a0d01d9b1c40805a";
+      sha256 = "3fe7bc971469dcbebbec12bb0bbab0e8d8ecd576da57174934ff2dae3628d3a4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/fr/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/fr/thunderbird-140.2.0esr.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "8a7f97f15a3d4659cf1effbc4afa8e176e4aed48a0b279e6628dd29e0db6fed0";
+      sha256 = "dd49472ec3992664bb0ad04d9b360b089b550f6e1bf5d7054f479c6dc6668e36";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/fy-NL/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/fy-NL/thunderbird-140.2.0esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "7a0164fc992c1705e7927f5654a091e824cb39e120a99c9767d17555a4019567";
+      sha256 = "d304ac0e7b118b9ea64d9f1eba333ea4217313bf04a4866c347c7bc1db4304db";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ga-IE/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ga-IE/thunderbird-140.2.0esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "cf1e7321db36792779fb6edfe35cc45a3795cc055dcc178aba42d17015873c3e";
+      sha256 = "6368f659b1bb776f180e9e579750775617b2058286a363261fd612d6a00401a6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/gd/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/gd/thunderbird-140.2.0esr.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "008ee962be825a4e087051ddf15af624e8a42f75006bcb1b22d44719a30ba66f";
+      sha256 = "19ee581dd6ccf233d8f5e490be311caea53b8d186b7dfc719ab80b1ee7b02143";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/gl/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/gl/thunderbird-140.2.0esr.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "69ac658f4f79c962382275a126672e4a5ea5dadd987220a5ae05a429f79a7aa1";
+      sha256 = "769a65281a7e2a473fe66919823673d69f091b239cfd0f37431030439310b265";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/he/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/he/thunderbird-140.2.0esr.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "0dfa668cf92869c2da406f3646b004a2549333894468ee3343c6c270ead7400d";
+      sha256 = "97f0d0f80e2e7ff724bc363e71fafb5dc20f60e6b699adb97ebc936e8a227020";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/hr/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/hr/thunderbird-140.2.0esr.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "8fb0c300ae7d8cab35d0048173f75264d6558245ecbf8cdb88db6019f3607800";
+      sha256 = "dec7cfcec03428d2926ce231c3d56ed13b9558384a046b7c70d14ad8978b8b00";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/hsb/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/hsb/thunderbird-140.2.0esr.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "13b239a77e545dd331c446abb8c2d0cc93f26a4264a0a8c0d9a477273d908591";
+      sha256 = "5c9f57d715c9a6cdb73c47cbcfe7643ba5670b5beeb11f9d72f84ecee068d4f6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/hu/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/hu/thunderbird-140.2.0esr.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "ad0667c49e91aaf640c290c356a13b109807c9044a5cc38350e688ce336eeada";
+      sha256 = "614610f72e730d6077d1e9b42cec6f002faf997ea691e0076c1d09e6436d68df";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/hy-AM/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/hy-AM/thunderbird-140.2.0esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "efd985cf24abba96128993d5dacd664023c2d5ee9cb4ad0e93fdf8857f31634c";
+      sha256 = "16d78631bf5471c148829ae40286840d3092d25a283c245950d9ba7fa93b07c7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/id/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/id/thunderbird-140.2.0esr.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "511ab012c1cdfd7904177f7f1abd6cdeb360c26aaaa37174fdf7b3af687adcc4";
+      sha256 = "cdaa1b73d66bcde17a3df149b5bee0270620a475216ede15ab82948038386b85";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/is/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/is/thunderbird-140.2.0esr.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "5e038f13e5b22d6c78647b58451f4b4b762f92da311907a01acb4c8f52228bbc";
+      sha256 = "c3c3fe08f7909f6b5a24002b8ac3d4562763f3fce7fa09e31d6ee5d9c42fb2e4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/it/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/it/thunderbird-140.2.0esr.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "0a6138a7da3416ead8a22810b70a8a135a86755bf3cfe6a69523e484ccdb6d07";
+      sha256 = "9708cde8b786d8321963007d39d8e0f70c67307bf233453edeba6fcc525e82ec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ja/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ja/thunderbird-140.2.0esr.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "26d56b6dbc8fda2f3475b286db25629fa7775d9929f773074889a6940368950c";
+      sha256 = "8e1749fc438880a752537963da1c45c44875f78128a28e221d88c4819f55ed90";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ka/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ka/thunderbird-140.2.0esr.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "07c323d8311f01432bdeb86c7b1ba627b07640a3d692de8d007265a04779ebc0";
+      sha256 = "0f940323c414c6c680dec7f5a5ce02d5fa717a8b1e8306e5b6f1d600b5aeb628";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/kab/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/kab/thunderbird-140.2.0esr.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "e78aec3f7cac1c7898c04f9970aa757fb30372787793bd0cf6cb188d1b5b66bf";
+      sha256 = "f5cebc3b20c19cf73eb3e5a0d2d94ef29068b44a5f01e5f02bcc70720cc85ff9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/kk/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/kk/thunderbird-140.2.0esr.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "c4eaf2b352af08cadae21c0b8237b36b8694f867dd9c01fa12fc80068d2629a6";
+      sha256 = "f214b723b7f6b2678b78b858545bebf02f1b933d2b6de385524d4c060affbfe7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ko/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ko/thunderbird-140.2.0esr.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "5bd2d44c41dfeff1cbc771353d66c01bbbbf2d7796d581cfc5dad85c2f20470a";
+      sha256 = "933c2253c3c5924920faa2889e740b3bb75ea7d372ee2734ef66abafe84e66de";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/lt/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/lt/thunderbird-140.2.0esr.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "e7578f394f4ce64fd85007588ec7f4903b01631207f508222cefd5cb00d6b5b1";
+      sha256 = "b96137326be3eea66923bec0cc2bea05d6660070a3980671ab75cd3a02083ee3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/lv/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/lv/thunderbird-140.2.0esr.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "3ba8716be0a3ac3a85902cdca9b2de5923bf32904ef206412b77341f441d5ebb";
+      sha256 = "fde2a6c3388f74419cc24678da4c93c8925c39f7f305c88b2b2e9adb52af7806";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ms/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ms/thunderbird-140.2.0esr.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "444c096f12e7121f3891224ea533529937d825e7d167e6e962280cb990e8498f";
+      sha256 = "38815d85e46ede7fa01a7f83427a59310de29463fb84dce80a6aa72c3f20108f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/nb-NO/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/nb-NO/thunderbird-140.2.0esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "16d316019ceb2bb89f7982d8989f87a77795c020bb4b0144f8572b335ccddefa";
+      sha256 = "78477255e656a3d6b5997a2d84d365a23954356595664004dd2d2b049f3cbdfa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/nl/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/nl/thunderbird-140.2.0esr.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "9f23477305f39b70c587fd821090f13236a5e159802837f5a1f0a928e420ca94";
+      sha256 = "e2c0f62292ade1a2064e85af6fae1f282ad5215754dce762643170b2021002f6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/nn-NO/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/nn-NO/thunderbird-140.2.0esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "2b9dd6d30206a3c19216745bf97f928ed67e343189056ed78fa0f3d90267a8a8";
+      sha256 = "1b020dc0e571a8229e560be60a9fda94186375fc59333282781894e63e40fff0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/pa-IN/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/pa-IN/thunderbird-140.2.0esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "1b053c1d7a869649450aaf1c8eaba6e2655ce41dbdc631475094e8cf27877cef";
+      sha256 = "78eaefd2b5795d6b645fe0fc5fc10bf8c6014de13ed35e614aa5d1fe2a0178f7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/pl/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/pl/thunderbird-140.2.0esr.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "0d6e31b038fb43ee8289bd0a55558afc108ee0962719bcbe9da37fac4cbeff2d";
+      sha256 = "a95c75044e0deeadf2626e72a37a1f55f7a743a57c3905c17df3fd4ba20b63da";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/pt-BR/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/pt-BR/thunderbird-140.2.0esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "9627781755d71d886cd2204af2b650880cc2fcb58eaaecf4499f3a6053b5f208";
+      sha256 = "04011d9dd415697e392056d915a9b2ccc4119e29f08cc32ec0ab8dcbc4e9c839";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/pt-PT/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/pt-PT/thunderbird-140.2.0esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "366026969b6aae8ffef5e2ee7acd42038749e45e13e754b42e6ee77366fbd2ca";
+      sha256 = "80dea720362931047b584075f5f9323bff0ca6a8641fb158746268cc62280d5a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/rm/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/rm/thunderbird-140.2.0esr.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "cdb9f3cb48dcabb38e75c0ec41660c8d82f0c0dfbb2b13784a09276466a3384e";
+      sha256 = "6a89b903adc52c93b49a61f357da2e9809f5c5d26f2883a62ded68377972b75e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ro/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ro/thunderbird-140.2.0esr.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "a0c34df83fa5cc06e65db07a922b569eca3e56f49745967c11102dfafc368788";
+      sha256 = "174457f9817b9e30c14c7dd3548923fa2787ff3403a5ac738769341c4439166d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/ru/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/ru/thunderbird-140.2.0esr.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "b9f209bb54d649cdcc48f0c6595f06211c90fbe8f2e3c1f5849f0ccace760e40";
+      sha256 = "715822de4ef99309e4b210a9dc43bf064545fa7dae008abb6246853f530520d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sk/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/sk/thunderbird-140.2.0esr.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "4966be49d3205d4e1b8787f905cd6324e4ae7944bbf62211711a019fc76870d1";
+      sha256 = "f122cde00d47d506d6944c459a6291d2438b40efc76f49f862c9a38c8ab2ef42";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sl/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/sl/thunderbird-140.2.0esr.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "3a7099b21c59d7ab78121a690201d1cc11ccd833a83dc0ca8a21803917154594";
+      sha256 = "5057883deb5e1149a761d5a1dc1c4fa8c92cba2a69cab74faf49dce4e519a452";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sq/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/sq/thunderbird-140.2.0esr.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "1e6c192a966e370b71635c3b667f751d030ec94647ea4375935c27adfeaa5d77";
+      sha256 = "8884b14937382aaf033df13da2e83d02d572bdc419ac7d641628002fb7c19e95";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sr/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/sr/thunderbird-140.2.0esr.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "430c02a5a7be79135503fd0ce959dfecee7e5de44018c4cb27901bc8a727c33b";
+      sha256 = "e01acc86bbbe215ba81faec9f5263be2d2d4714f046cbc41e8fd9f3c15e19e1d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/sv-SE/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/sv-SE/thunderbird-140.2.0esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "f1925d6fd429133598c8b79ad11ffb01f27ccc3f016da9321204ca92fd4848ab";
+      sha256 = "69c977a21d06c0e08eb643767f326b66b404baf25c2e60688fbebfff7a1a3ec6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/th/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/th/thunderbird-140.2.0esr.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "e19e8d275e1c898f7c69b9f76012808ce55d5ecbacc841beb603bfc7a6fd27f4";
+      sha256 = "91ed15f92feb265ae7bcacb71258cc39b8ff028c98ff413810976f8c9249d214";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/tr/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/tr/thunderbird-140.2.0esr.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "dc628f393b9090fd4609cce6866af90a704c9ee0f64ca4cfff09f23b8b0b45c1";
+      sha256 = "8972ba199dea0caf53ffec85097a94b41942acfa99def00f8eea208870f06071";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/uk/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/uk/thunderbird-140.2.0esr.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "adafffc44db7c8eb9f1725803da72012b17aa6df3ce5321aed953d607f6fcbc9";
+      sha256 = "2d409996c337b7c63136a5217879968c3bda91c71170e63b199e6e317e5f7cd5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/uz/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/uz/thunderbird-140.2.0esr.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "09221ee37ce66aff9f63bb2a5217f3b7219754b8b7b920fb607ef301f164e547";
+      sha256 = "bf121f42792696666d3deeaceaf15c8667a2d0e70ec494f8ff717f397686f909";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/vi/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/vi/thunderbird-140.2.0esr.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "a0a1234ce4d2370d263d50a3467c5327095c386943da4c01be4dd0ae95bd2c97";
+      sha256 = "f8d2edd0096547195477419b2f7328d3b6b58a4a9ab596bf293dd786b20b3e64";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/zh-CN/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/zh-CN/thunderbird-140.2.0esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "f89fee533f778038626f3c7fa69e09cbad6a1f79f8dd5045cdf645d3f16ba774";
+      sha256 = "c5430798b925e33eeee603bd7f6a54078eabb8b1da54847a8324be671e576c15";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-x86_64/zh-TW/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-x86_64/zh-TW/thunderbird-140.2.0esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "bcb095905122172714cb4a8f587c2eba8b882a71fa51c9668bd957a0cfad0eef";
+      sha256 = "7c00f112373fd9abf22afe8209b0adf561e6018c7473c7d07b42d2efd5fe4c07";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/af/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/af/thunderbird-140.2.0esr.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "6cc4f11c76fbe3f2e3ee273e10ae69e58c0fd8ff14893e2e3077ede0a046ce6f";
+      sha256 = "e1d479ecf98c2a330f877f75688a85535aae8b8847b7acf1f6798bf85d9ca724";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ar/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ar/thunderbird-140.2.0esr.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "aa6572aa65a2049d5aae97740822f1ce6405328de8c28c51a43f161a4473d517";
+      sha256 = "b03e960a8f10e8aec0aa26531beca5296bbb2a3fcad49b1f87590eb1b85f84b5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ast/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ast/thunderbird-140.2.0esr.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "1caae0a85b4b4f70336fafdf6f422213df8f1702ed3c2a5da19a261f7834426a";
+      sha256 = "84b579c1e04dc06f87a6137ec6e2e7f2bd3b39fee7357932eed9a18a8ab8220e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/be/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/be/thunderbird-140.2.0esr.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "79e43954c8ec7f1a81f2145158d58a78f660dc7e09b1f0355b65199678c4ad76";
+      sha256 = "b572b4011ef7fc698b5cdf81234d236f9a5a8bdd08fb8cf038ba38293612d509";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/bg/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/bg/thunderbird-140.2.0esr.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "231a740b88896635a72857d592f004963ff0445885f107198a9562066ae81810";
+      sha256 = "043012b04adb39f884c6217254df3ac35bab2c4fb4b7d29bb02edba0042a7ea2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/br/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/br/thunderbird-140.2.0esr.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "05b58365bb73e856bfd245ee8826ab3184c2ffd5614a8e2b163d942dbcc50e8b";
+      sha256 = "7333886921ef05e5cf2a5be661b68a3a62b1326f56203b6f665634f3e081d009";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ca/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ca/thunderbird-140.2.0esr.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "a71da18c8bcd197aaf02041005abef2215f4ce4ac0ed3928572664e945e8e114";
+      sha256 = "669ca6096791fd618d5adaebb0b45fb42bd09bc8539fa5bdad970506deb8b9a0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/cak/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/cak/thunderbird-140.2.0esr.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "e4e5e7a6640c1e44d8ecb14ae850fb4d1b799a553ff3331ee601c5d324c93a04";
+      sha256 = "a3e5803ed4ea8455ae8a25007320aba1015416a05f225b0ed85dfbcc7f458ae9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/cs/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/cs/thunderbird-140.2.0esr.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "7d9f928ee3762f1263e7d7e62cd4b64a1187bb4b35fe4585d909a2204fa41ccc";
+      sha256 = "dc2f5cd79363e7071f79fbae8f11dde0512461abcb2841816e176e334ed4c46d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/cy/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/cy/thunderbird-140.2.0esr.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "d82180d62d4d76f2fb2fe95d9f25f5e409910ef6d0d96d1de98b56bd11a70b2c";
+      sha256 = "6872b6699d46c7ce3fc2b87142dfcfa26a6adcad78a321a0cccf2406938f9faf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/da/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/da/thunderbird-140.2.0esr.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "4fd3babf16ca6b7e5eb7572a887b4b7ef52740d6f3c6163a53321bfd61f55c11";
+      sha256 = "2111f740ac9d778f5a05e1bb1577d747ab10e94919def84fd941ec679a0bb3ac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/de/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/de/thunderbird-140.2.0esr.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "0c365cccdd4b0de3f66f2b72858fc6bb28a7bc0a14787d3b3f41d8cfd5b5dde3";
+      sha256 = "8d35ca8c2152f4197a2b86e300c4a1fb3c0b89fb231a358b4935833c1939aa0c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/dsb/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/dsb/thunderbird-140.2.0esr.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "7db8f759632c59b9ed6748f0749edd1ecbef9f3b2d6a3e298cd77f752ee091d3";
+      sha256 = "7e61e79f30ac2094bbc1788fe93d73cf83d27f19083603287b91d98521ee96a5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/el/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/el/thunderbird-140.2.0esr.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "a8d1a0161c10f1f169bf55840813994f8c1b548bdec13a588f7fd87729ce4423";
+      sha256 = "da1ece0ef2d892fe87b93024fe29653662563d1a2f2280e3cb005d2f93064b5f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/en-CA/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/en-CA/thunderbird-140.2.0esr.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "8ef975087636a58dbc7466f4aebddedbc8f9d0708300fccbdcaf3a588f3610c4";
+      sha256 = "8220c9eb9dadb54d4329457be5949c3eb83ebc27849a8338aaf9c878dc2dda23";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/en-GB/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/en-GB/thunderbird-140.2.0esr.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "c1da1df9c9fea23f71cd03523d362931eb1e45f8c03cf89e3793dbcb76fc8f84";
+      sha256 = "d20002e128605b757740ccd417e0bde5a18a00abb53eec96c42ee7cc1994ef42";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/en-US/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/en-US/thunderbird-140.2.0esr.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "c0047d20438a99c7d2bc936e6c5b713673c028c786b526c89a432d42b7defad3";
+      sha256 = "dcd90eefb0859015566d3793daaa5f221bb41c0d81a64d9327206988f7d2dc04";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/es-AR/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/es-AR/thunderbird-140.2.0esr.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "9a72134b0d3d0c8c9d927f4b62ac46abdc95a0c356588729beb03ca72d27db27";
+      sha256 = "e7cc813fc9521b21724b83b52b38c48490399569262791da9e5d4045a949fe6e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/es-ES/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/es-ES/thunderbird-140.2.0esr.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "2803618d6d57e7f684baedbbd363f3630ce0c1aad9cb20b8628258663846dc38";
+      sha256 = "1981a0da411e6f09553eafdedd4b5a03da81f80030f3f21b94577f70f20615ac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/es-MX/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/es-MX/thunderbird-140.2.0esr.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "4b27c807a8924f15ec970247d4004e04761a6a03900becf9b92f97317d933bfa";
+      sha256 = "b8d9badc039a8f4319eac984f32949a43241df208d5e251e9495b032c7a93b86";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/et/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/et/thunderbird-140.2.0esr.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "c27b006c65b2a4be498d71e7db794d9071c3b57db797fee96fea88e78ff87f9e";
+      sha256 = "7aaa6507c37fabcc2adaf371349088a5e2766891ec72c4113ffe5a9cc520684c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/eu/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/eu/thunderbird-140.2.0esr.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "72a63b9531ef73dfa331f3440e3e8963ad33aa6ccfb712c8a466ab2025451004";
+      sha256 = "0c7d7754dc8520bd562fc43ffd9edc7ce00513e2e35176eb5589669d1a729334";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/fi/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/fi/thunderbird-140.2.0esr.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "4533513888fe7e5b14933f2171478f4694bc18da21d84762024407b2240a6729";
+      sha256 = "6e9c70ae222430f04c016f71ef11d3c8f35d8492700106b8a7b15c464584736f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/fr/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/fr/thunderbird-140.2.0esr.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "fce8ed9c53637a57ec649b4246a8770e1e0ff6303820f329decb09d0f2f30af8";
+      sha256 = "8ce64ea11265af482fdadbc998b78d29eab077b19b8c7d44443537ca91ea4c2c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/fy-NL/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/fy-NL/thunderbird-140.2.0esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "8ad62f7d30d366e29debb8c38d2b34519773d33eb7cbb042b780d66c30a1a8db";
+      sha256 = "1a7a60200112e65164df4a2aee9ce64137b33055051842c5ff716681758a3544";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ga-IE/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ga-IE/thunderbird-140.2.0esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "089e521b1690ed1878e9bff96329c0d7b659d1dd0c51d134b23e29d6fd494f0b";
+      sha256 = "e7f261f2a0724f55743087472040f74b2b872e13c12dd938c642e78c3ee9b1c8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/gd/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/gd/thunderbird-140.2.0esr.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "c697bb069bc2a01ff952fb5a6b735aebbcfcd5430c369078c50be945a082a4ef";
+      sha256 = "5da7d1af89c5f8b7653306116053eca67830ddcf7ed0cd589dcdf036a03ea69c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/gl/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/gl/thunderbird-140.2.0esr.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "1b68ede56cfe8e3e60760d9e18581570cf1733396c028a83f74c6ae9b8280e0c";
+      sha256 = "c67db96e9b6cf3551a7264016900651961fdf5eeb31613ef89757430a405298b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/he/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/he/thunderbird-140.2.0esr.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "5d9c73f63868a2faec39837b500a37ea7187da3d468caa4333da666cea259a59";
+      sha256 = "7290b3a06df6a04f17a349f10b50f4bd04ae626378b36372c659b00a1cb840d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/hr/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/hr/thunderbird-140.2.0esr.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "4ce9e441a7945c3f400f262b48b6ecd7db576b131144bcdd9769d11677ac3b3a";
+      sha256 = "e588b2a951b8c49665a6b86737c5f2ceb0fdc46a92144263364f61552c0548a2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/hsb/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/hsb/thunderbird-140.2.0esr.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "823fc181b40237cb569634ee2cbaf1538e5b508fec748d92ec3b0bed7ee1615d";
+      sha256 = "85cb2a0e61fcd80d08ed6d3110c778a26bcf3e22aaba96a6d70bc7f21fb46458";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/hu/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/hu/thunderbird-140.2.0esr.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "aaf03a448ed57b22e1c87dcf6de24a937099611699d6b5e567192c9f03f2c8f3";
+      sha256 = "5a34c23c6c2793621bc8a7e36b4af3843c4f2259bf058958d6eb3df66944739b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/hy-AM/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/hy-AM/thunderbird-140.2.0esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "e751a26797c842dd64ce6fc3712cb9101fcd15b7f7548a11efa7db8382af6191";
+      sha256 = "a297365831d52ccf591e6ded2bbd23f05097571c1d717ed82129ac6b4513072a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/id/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/id/thunderbird-140.2.0esr.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "e081ca14bb75d1c266e210ddc015276197303cea85744a3bde34999f8cc30bbd";
+      sha256 = "6997bc0af3aa065b5fbac8b4ad9677f1610be9ae8b8d5799aa9a2b366898543d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/is/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/is/thunderbird-140.2.0esr.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "7638ea46add63843183d2af644ba2fc0de7f5bc2c5e7e0fd8160edeabf962b3c";
+      sha256 = "d29f035faf0a92524da988d93c044f81eed4db890ca127809158bacfd3000553";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/it/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/it/thunderbird-140.2.0esr.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "f8089c7ef857bd840e5b6b4639b808a5cf4b2328649f8e9aa6141f185a7aa652";
+      sha256 = "158d5735052ff5f0a243f3125c330f19abf8a988b287f8a3b16fbc2104bffdef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ja/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ja/thunderbird-140.2.0esr.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "c860b26c7c4efc666198e5e77bae6be8b8a71695e47138404f2f180bbebdceb4";
+      sha256 = "54f824266055aec7e554ec0cacad322e9126df9f82a791d992d46462c78ba175";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ka/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ka/thunderbird-140.2.0esr.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "e7358880c8d23a1b8b3bb1cf422b36d729570005c4402b8d45a303017ed8356b";
+      sha256 = "574afc5ab465127dc3e11218eaaf1886a75095ba527be978f0e4f750c8141ff4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/kab/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/kab/thunderbird-140.2.0esr.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "c8c4ccb172473da7ddf1c0ddaa02893841e7a626e8637a0e8131a9b5ac977339";
+      sha256 = "2be6925da889fad10de5ceb1379d326f25170cd1ef2de4f80ad021b300ea1e6f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/kk/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/kk/thunderbird-140.2.0esr.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "65f18363990578d048a278d26050bef7dd63aebc39e1ddbb4da7402f0ece5a8b";
+      sha256 = "f88fc4e4f6a015093fc843be667f7b63e8caef4a63980c5f8a85fe2f89d0319a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ko/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ko/thunderbird-140.2.0esr.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "53cc7aa0a4514463bc9763e7e647c23b72222aa0e6b0967bb8ec4ace1c25ed87";
+      sha256 = "95138c979e4c149751bc04d4999038d326961f9cf5f49db82af1aab1ba2ca4d2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/lt/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/lt/thunderbird-140.2.0esr.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "413d6886dccab5d313c0e6ac960b46844116b65ba3f126ba7c3bee84bdb32c86";
+      sha256 = "63e39966d929eabf7c1de8b6c1f8f0dbf3a52f9c6afb8c6bd4ef1ef36ede7297";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/lv/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/lv/thunderbird-140.2.0esr.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "a778eec1eabf317759db6378e0aaeabc7cc371906424f257ea0660abc510c17b";
+      sha256 = "5b8499fb1667ef2f7c185d5828df1ef2abe8c4db68b39ddba3de2cec0a4dca20";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ms/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ms/thunderbird-140.2.0esr.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "b36044e05b85912a270314d65ef32644b5eb65db219538c4e7830233b5760b9e";
+      sha256 = "77b16429d9d5b5dc7ce1177e58554a4c22f60c680ddfbe9b8c5f6f7a78e31a3a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/nb-NO/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/nb-NO/thunderbird-140.2.0esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "addba688057aa799ef23bcb5193016d1f31ed1673ae19d6db1daa7a1f6903eac";
+      sha256 = "a270128603f7a4da8d495545450334dddbca0e40dedb37edfec4a8ee7ae6a7b5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/nl/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/nl/thunderbird-140.2.0esr.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "3099e74e36e02f895c5cc4881b2ccd1406e6b77093400d65c14938790bf0dbab";
+      sha256 = "22084c70eb833c79c16508040fa0c84b65cbd3fb26c757967aff87af73b3cbe5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/nn-NO/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/nn-NO/thunderbird-140.2.0esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "8b6d9515c24a85da4bafa1bbd295d254cd67fa5d741805d1c0fe889aea6dea6a";
+      sha256 = "d8045ea607a19a4bc100f546a4593d59024fe85a91ffcc17ae920864708408b6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/pa-IN/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/pa-IN/thunderbird-140.2.0esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "ef189585918f5fdaad181c75603c7c5c3ec9902e56f05eb75e1508061a4c3a51";
+      sha256 = "5ec18f084221ecaa507cb7090103e04ba8974a9c401abb5272316a381dfb138f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/pl/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/pl/thunderbird-140.2.0esr.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "bdd972b7c3950f7cdaced6c9d860effd9be1fd14dfaddd9e1547ce828293b836";
+      sha256 = "706c46de3b89b8d70f0b56185349c2bb2a64cb5d47331868c044d4e9adb4c758";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/pt-BR/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/pt-BR/thunderbird-140.2.0esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "408b669965291276cf31fba0f9aeb0343b42c2e1b8d03ce3a96ca65f09ddf483";
+      sha256 = "1d018e4e786578343f911cf32d6745ab1ab441f0447a8956981f81eb19416ecb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/pt-PT/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/pt-PT/thunderbird-140.2.0esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "e80e3bec252fe673f481dbb22c48ebc1c45784817fcb6142d3ce5205039ca64c";
+      sha256 = "9e02afb517f8f2d4b7fff86fff99d989b9807b3def50f2e50861b8306594c2c3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/rm/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/rm/thunderbird-140.2.0esr.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "3b426eb5d30e63a1496addde69e486db32a72ea8daf0eb3c04dc7fdb32d9b926";
+      sha256 = "2ab5a21a53ee1ec9f9a17c5d1fead8437ed0520abf78c10142c84af69460cee4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ro/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ro/thunderbird-140.2.0esr.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "56aa69817b8f9164832fd682f3f81d8c15d5b1e5332795861f1300bdd2a2611a";
+      sha256 = "5edf5e6971f877652d026bde09b1eb4ac6a29c2ee86a75780b520695f12b7d57";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/ru/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/ru/thunderbird-140.2.0esr.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "3fbbdba3b49631c86a0f755da39f1326635732fd626c33ca01bb58fd2cc41c04";
+      sha256 = "8e3570cdb72e3f96373962926dcf6886f0e77b1e6db62c6c0693ed781d12aa32";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sk/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/sk/thunderbird-140.2.0esr.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "c044ae22b720fddef843627ca24deda9900dd10dac8556f1cfc3954d63b7a4f3";
+      sha256 = "8b7ac31b28933209b419fdf7f9a6519d0642ad69827914a52baa38e5404f3fc2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sl/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/sl/thunderbird-140.2.0esr.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "1db44283d603e10e20e1957ead276ab7fd32b096b886304250f9379af8f0d246";
+      sha256 = "69486f47806876c7cc51d82eb49fc296778ab619d7e1143139859481b6207b8e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sq/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/sq/thunderbird-140.2.0esr.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "c7e41bf70ba0f63896c2268a274aa5b21b73f30b9053d039c1ee2ecb55116123";
+      sha256 = "12407cb07d863749ad8bc1a3a3002427420afcca61ef1065d5bc75fb64cade7c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sr/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/sr/thunderbird-140.2.0esr.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "0be7c47f1f7eb7367c91eaa7077d0fc737ee1a682007500232b84ef840b18a3c";
+      sha256 = "ec863cdeb868209cef55ca0fec3b5f9f0d3e7c454aa2817aca2ea245f62aeb98";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/sv-SE/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/sv-SE/thunderbird-140.2.0esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "970561eebbfa661d3b57e8afb79cbc29430e8977f17c92f39da540ae74f9fe37";
+      sha256 = "d92d1bc44da0a5ac2aeef4c195f6d42c2163e4378515d68b447c54cbcf685903";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/th/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/th/thunderbird-140.2.0esr.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "a893872e1b2a61ffa15479be4531a94c3f0f9cce2a14474442de7213637739ac";
+      sha256 = "df562a5ee6889e9eae19de5f6244ac5a32d946010c1bcbba7a597741c92e845d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/tr/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/tr/thunderbird-140.2.0esr.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "debe95a6215f1216386fc02e6b2ce6fe06a2da81aa1bea21706ed549c26e39d8";
+      sha256 = "7ce319b95d97d8653f5c6b988ef0ee8732b0e811c1e4a792251b44984900216d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/uk/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/uk/thunderbird-140.2.0esr.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "3f9e93456ea40bad341c3c42100bda9293c594b3e0db935008078566962e6aea";
+      sha256 = "088d5209dafeec939456e728507f19ae3ad376a25ec0dc098ed23ded4271c10b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/uz/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/uz/thunderbird-140.2.0esr.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "5c50b03eb4ef9334ac6c7113131e0b6fe54753af4a5d167a8acb94b7e48fbf72";
+      sha256 = "dc3009b097f8842c5cb493782d408f0ea9b05acc767657e1b1831bb900c0b667";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/vi/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/vi/thunderbird-140.2.0esr.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "be0eb2780b1b809173f0598e365b41a92370f732de753ae1d23e0a7fbaa59277";
+      sha256 = "12ee20867162e5e43893d69986e6930a41524b8ffdab85fe210c24783a6f0f9f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/zh-CN/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/zh-CN/thunderbird-140.2.0esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "6f47a9e79002415581c03c909000a9906ab075259e70464e949aeb55261997cb";
+      sha256 = "b66bfbd23972e689e74412c4b578a2cc879a051a130357e660f819ebdd25858a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/linux-i686/zh-TW/thunderbird-140.1.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/linux-i686/zh-TW/thunderbird-140.2.0esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "c400336cd38d41aeb35a53b970c54db9a99e19e5dda98622be5e9a4cb1dff647";
+      sha256 = "82032e81e87b7892388682ddfc4c88269b887887efd24c71abea2cafd8ca8620";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/af/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/af/Thunderbird%20140.2.0esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "797575efd5b5b12a3a99bf3f84e10f7f94521874708fead35b06ac12de67e4f6";
+      sha256 = "ce54605c7c0b0a50022cf6bc416ebf08bcd170c114e522008667fc5bf3ce60c5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ar/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ar/Thunderbird%20140.2.0esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "42525d2e79aa4e12868930952b7e1c6c609d25f7b0630c3f96daed87e446a7f1";
+      sha256 = "2b061e9287c6a34212147513474f9bf8fe5b831b5466608c9ef9688d2ae58535";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ast/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ast/Thunderbird%20140.2.0esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "29c634a3d625ce3be73efcc845b895603cfb68f37ea910447a297ef8c8078244";
+      sha256 = "d00b40250e7c408da0c7bb340977b482341dbd87a2c434819a29a18080cfa414";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/be/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/be/Thunderbird%20140.2.0esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "fe7f25672c7dd739dfdb54e0a403994de346eb2035dec31d64b7a7685f413874";
+      sha256 = "5054077127678769bf458202c73acd9bec1dce93e9b677a61746dc77cb413530";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/bg/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/bg/Thunderbird%20140.2.0esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "d7bec82a811af8e1206ab9a5cee403c935c295d563aecd60cdb0bb019b195d78";
+      sha256 = "72466fe4addb6e0fc2911fd96e11d349f914670fc28a09235df96cfc966758fa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/br/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/br/Thunderbird%20140.2.0esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "aae5b514cc03291e5910f0ce3527b0f36835192bb044541d2fc0083501de918a";
+      sha256 = "41290991d6e680c7a2c82e17c4a869021a3b143cb0e28ac505edfcf443321a70";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ca/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ca/Thunderbird%20140.2.0esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "f0c145866c6c75c6b8ca6945ab8490eed0520ab6ed7c62a22084fba5adcd01f3";
+      sha256 = "c99788cda9531ef8f2b817192f373a5f3a640f7115fbfbc11f70dc933e22db27";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/cak/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/cak/Thunderbird%20140.2.0esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "4b1771496eb50682927c50defb86d0c4608b072c70d0bcc95f48e698d55af226";
+      sha256 = "0105d15a127ea53d2131f9f28e52edfe5b1c98c12a9df384fe61c9120f29b0c0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/cs/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/cs/Thunderbird%20140.2.0esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "d87b6287f3ff9aaa5bf6009d7f3a17b6e2e10f8ef97918182a45eeafcf3054cc";
+      sha256 = "4df2e9734cbc2fddd6b3330ffc370aff7dca09b73232098bbc94def64860b0c8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/cy/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/cy/Thunderbird%20140.2.0esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "ea62044eb217560f94a4238050c6a00825ee436ad6cf5bb9132015e0dc6b6e73";
+      sha256 = "b6eb8df8d061ee1deaff7ca6879ba46cddbf90790a940e9e1b0adea103ee6b44";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/da/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/da/Thunderbird%20140.2.0esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "ea9ee0aef81160c3b8c9d0429320967b868511f5e1f5bc74a7bf74b215d81a8f";
+      sha256 = "bd322be16edd4383d733b592532cc7b1ec44f0c9f2781a0d4a4743262f6d05db";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/de/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/de/Thunderbird%20140.2.0esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "85f90087813a73e85d8541314d4543dac0fbd0bff3053922b34539fc6253c453";
+      sha256 = "905c7c48bfdefd489fb44376852e4a52243e6169a8092f6ce2d96e70874c6862";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/dsb/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/dsb/Thunderbird%20140.2.0esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "486cdbf698ed78d493d6cccf1a7f6eeac25db7226e29c5ca6024e59c1226d6cb";
+      sha256 = "8dc3b37074db57701cf48d4f6cb9f71f7b0bcde95c562c9c7c4673b8777e816f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/el/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/el/Thunderbird%20140.2.0esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "7b19d065927e6ff2dc3ec1fe2cfe147d84e60f2e50d91e788bfb0c46f1f6c1d1";
+      sha256 = "d28ebf8962c8a33c67ebcf600bd8ce41bdf0a6fa7227c9337cd13d9eb1987a12";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/en-CA/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/en-CA/Thunderbird%20140.2.0esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "96f9b9e3f10e06111cb2f2f3889a21ba52e02691542fbe5db92e14b6157a215e";
+      sha256 = "999adb6c3b624c0052fc7eb4297cc30050df23e397a1ae0f7f3ab0760d7ef991";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/en-GB/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/en-GB/Thunderbird%20140.2.0esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "d96bab18d6f5d90f399be928796e5b83f713d36798f70dca31a98476594e9d9e";
+      sha256 = "7b47b28f9b8ff5b57a3a053faed2d549a1263f9ae74359799dc3dfd20d51d1be";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/en-US/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/en-US/Thunderbird%20140.2.0esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "934eb7a4ed8516600c2bf8bccff3888e68448c8c77320e2a0097835b6639f922";
+      sha256 = "c9875a79879091b5d00567adc2ec6bbb985f130d32df75e4018f4dca9a9ca015";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/es-AR/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/es-AR/Thunderbird%20140.2.0esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "f6fe9a754111f6103bab2de4d071e9178c141180cc0576df1680c1620c624e8d";
+      sha256 = "0767f4c0c5393100337dbb267051d0d4d61637441ff2d8ac797f59a9d9e6f956";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/es-ES/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/es-ES/Thunderbird%20140.2.0esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "e9d3f75885ff8d1b0e7094bf3e33b5752704c531928c38c75d56064b3bfa6810";
+      sha256 = "ad4acb8c8e5b804328c4a075d1ea5aafc6bcce2a17383b85d697331cdd9a6a84";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/es-MX/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/es-MX/Thunderbird%20140.2.0esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "c6ff81be8b3b25e019481ae6aa7e9bf5368c40b1f7d044cd1bf29023c322f274";
+      sha256 = "be1d206f4fe5732e21880f48aabeede6e144f8b0d26f964fceddee8befd4febd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/et/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/et/Thunderbird%20140.2.0esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "96987565f5a1aef4cb515340d91b1fc876ee53da711f9d5af3e6641cceabdc84";
+      sha256 = "dcfa0e6eb888a020a9ffcbd5368e021122243261383879ee2155645bd0312c5c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/eu/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/eu/Thunderbird%20140.2.0esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "66aacca35cc54596e9e1876609eb72a2f92af1692d5fd6cce81477decd92915e";
+      sha256 = "5ce0b69a5b3f2a1b29b9aca11076d97e3810705c654214edf81b5a67c28457dd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/fi/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/fi/Thunderbird%20140.2.0esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "8cb1a78debfebc3d54c2c7f5da45c3c05b06bcba85e7ccb51f222aa6d79e1739";
+      sha256 = "11ddafa9775ac08020ec5070cc4fb495be2fadd46f3a6d43f0e1a143c9045a2a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/fr/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/fr/Thunderbird%20140.2.0esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "9d4cad3bef814f0718a69a6b3a9e676346c266dd8bf0b0b1e4451858e8d4c0e5";
+      sha256 = "efc74e9e925ba189b97bca77c5c7d38a352e8fb2f14bbd4f1ecf73f493a14c9b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/fy-NL/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/fy-NL/Thunderbird%20140.2.0esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "61b7b484547e911bc645e1b1673b5bede4b9a874090c12ac7d8c935a4ef09da2";
+      sha256 = "b188c3aca74e2860904521a4b64b264004aec15e2d0db87d89c5a048fd712604";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ga-IE/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ga-IE/Thunderbird%20140.2.0esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "2198a3ef1bfd5c9d089a0a4a4e0a693695b82c07dd063c26536e15178c5d6ccb";
+      sha256 = "03258823e37fe90afd0720dddab690f673a4c8a4d03b7d9a9e8d89c6d53b5fa3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/gd/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/gd/Thunderbird%20140.2.0esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "76a58b5b79f38f6921d1011e58ec61e61a2f3e1e8dcf5d293e5da4a7112d4928";
+      sha256 = "39c6364adb55ae147f19ed26ba16a64126d6e9ed7e67e999c9315ca2ddb510ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/gl/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/gl/Thunderbird%20140.2.0esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "02459b648de1ead3884a81c2b34f4d55cb54350545834779a6bd8370a0e99e7e";
+      sha256 = "97888306997dbbc0d1b6408222dc8138894814d373dbbca2e7b904f5612a6d1e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/he/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/he/Thunderbird%20140.2.0esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "d703010093db63fafcddb0476151fa5cac32f239d86744a79ff76dd2e418b273";
+      sha256 = "ba84a780bdbd9fd1be53ab6ef2f646d6d5349ab09395b7b3210d712c8d96398b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/hr/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/hr/Thunderbird%20140.2.0esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "8c61715202f7ebaa565a23fccf843b4a12fde8003d86ca682390cbeb78fc957f";
+      sha256 = "f2b89aac5dec53a3bce1b7fa00d2e9e5f48712e25497d44a94683e658ef51083";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/hsb/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/hsb/Thunderbird%20140.2.0esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "c59eaa7a992350649cf490ee00e7e03e3c9a581d5cd5b60779990578fb361d45";
+      sha256 = "a860af6b47cf20030aae796cd1df76d053c658d7509479e458fe7977e44e9a35";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/hu/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/hu/Thunderbird%20140.2.0esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "81a3e11b53bdf5418d60a5b527e4b1198a4e4c7fee7f9d92b07efa7a88a681c1";
+      sha256 = "760d3f693e21d11b8f6f0a47f7b049231ff8fd3677caff490ff1a21412a11538";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/hy-AM/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/hy-AM/Thunderbird%20140.2.0esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "862f3693b60e3a35048ffaa408829433975390030b6a6a7da8d597205eac763d";
+      sha256 = "ed2cf577c6748595996839a7b723dd17a1fb84ed28ef6e866a47b7e53ad5c33b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/id/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/id/Thunderbird%20140.2.0esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "005b06b94a27268c4363d8185b61b0ca0a2b7e559e7b6adb7a07d3e20e4939bc";
+      sha256 = "6ff757d63a91c25191f03614706d5c37346075508419443811141a449e9ebd8a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/is/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/is/Thunderbird%20140.2.0esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "55355ca4c324638b653ee1c574dd617205b65ab4147dba8e5426d6ddf9f1d28b";
+      sha256 = "9b8abcbe128a32578e48bb5f3f55f4b5d8552f5121c47ee84b00540cc84cb75d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/it/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/it/Thunderbird%20140.2.0esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "3ebb7b8188cd8c6793a549de0af43fedf3f8a7ae8d9d2a4334d752136164d61f";
+      sha256 = "85a65eed6ea9b4c34ea7e0c51ce66bac0b23326a571a9a8c90378136d0b3e889";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ja-JP-mac/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ja-JP-mac/Thunderbird%20140.2.0esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "e3b776bfcf7e78baf1b0702537c527e9c81ec1f7617056d530a4cf9f1410132b";
+      sha256 = "1fda073e04b32c220d26de16a0e3cceecac7dc118de7ed4228006a6e2f85511d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ka/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ka/Thunderbird%20140.2.0esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "4837e71ad60f6c20404a643a29ffab095593b5a235da1fe6d9be6a932a07c0da";
+      sha256 = "6f12f95134d067ebe1f641581c7f5e30b897fb08177a37c92ca48b1c3d825756";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/kab/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/kab/Thunderbird%20140.2.0esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "b4e97d509004c3c87fe1dd3ec2a45566d4b3b36de88fe41ea67a81864ba0958a";
+      sha256 = "817206e4339853ffab6aca1fab7ca6f1294026a75e6368a9d723a25aa5759991";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/kk/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/kk/Thunderbird%20140.2.0esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "89a368c446c9a05fd32fc075106d49c9f9514f0439a67696d573695a050a2e24";
+      sha256 = "c866f4849a1ccbc416b2341be8f008963ad7cf3cf0f4bd2902cba08c629ad6ed";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ko/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ko/Thunderbird%20140.2.0esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "e06b01a16d1b236bf550a7c3646080845559abfeae21e6a3e3017a664864002d";
+      sha256 = "36c869ce7c2fff3e20cfd818fa33ebd1aae371dd32bfb5c0469f79b3d895966b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/lt/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/lt/Thunderbird%20140.2.0esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "369da53d044d5eb3e2ebaf3f7d03dce9777dd3052415330fbda37bf23f58cc98";
+      sha256 = "29f493b08847d1b490c17e23d4fe6f94be5fd395dda8e991f3236afb7b0a679e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/lv/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/lv/Thunderbird%20140.2.0esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "533e1725b732c4ce9ccffe96c3748e481298d660d0fc190c03816c8929ca0848";
+      sha256 = "91225669ead9f0775d9cf1902d092b8ee7e0635b227c1e15650cac8b14efbc48";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ms/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ms/Thunderbird%20140.2.0esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "a6452269b4d9248da45fb9b2b9740685d4abf7e32f4e1c52ca3360560e3c0a49";
+      sha256 = "5fa2d8881ef16bf4aa2ed4200c3a1eb7f82225e08da8c24fed356b6a735fa458";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/nb-NO/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/nb-NO/Thunderbird%20140.2.0esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "59a82f4c4a20159eb7ed35882f87720a6c047a31e78e61a222c7480bcd1c711e";
+      sha256 = "7f5a59cd8dd68723c67815707541a0d90f950e8fca778c4d07bab38979018241";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/nl/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/nl/Thunderbird%20140.2.0esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "c1032863f047cdcc59504027572c0719500a6388368f61578a937c0d11d316b1";
+      sha256 = "5cd754e1fb31b1d0c0ae9d68cd0d8364d95cf50445a3da023e83cf5f50d2a02a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/nn-NO/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/nn-NO/Thunderbird%20140.2.0esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "7617c3582e2a4d1bab02ee76ac4e2f6cb301f0d9f764cf178a8e5b135add80b9";
+      sha256 = "0faf16cb323faf777e8baf4a43fa7700797b9f6274efcc392e0ad2186e9eb473";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/pa-IN/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/pa-IN/Thunderbird%20140.2.0esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "8a014b567aca2f29be9b2b12235f3bce26e632292a3ec5dfb5abe02156c62d66";
+      sha256 = "dade69c73af00d92b8cf4b7865a28f32ab658c33b995964e3a20045561789894";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/pl/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/pl/Thunderbird%20140.2.0esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "75459b73f1697314d7efd71f75c0fc722312a688f63cf408b11f63d228623065";
+      sha256 = "718a80432616090d3e6deb69be9658f74625a44a46b720b397933ef5f3164141";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/pt-BR/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/pt-BR/Thunderbird%20140.2.0esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "fe4643a894823a43b8026a71f1f2d98a83eaae61c295e2139d59325a5edeb78e";
+      sha256 = "aecae2788d02433ef368c3562369e7403ae9eb8997f351a68b1cd646eccb46d2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/pt-PT/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/pt-PT/Thunderbird%20140.2.0esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "1d97c378456248514e8b0874c3c4e407c7a4b0a971d46d3e28ff9fd88ea03652";
+      sha256 = "f60dd43847efa924d9b856571d0a5a01b6209e0442e5f959f6b9b3fd3477c577";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/rm/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/rm/Thunderbird%20140.2.0esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "9701c817cb919f0c75b08589837197f4c8d65c59c5fb2572014d14664eac04ca";
+      sha256 = "f91d817d92948caacc1345739d89ee67690a9ef75acc1d86f0c0068ee49599e6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ro/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ro/Thunderbird%20140.2.0esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "cfe268bfae42cf72baf53a65ab5b59f07c897e53650b8c4f7fc4e22e037cfe68";
+      sha256 = "e00bb3343c92eb50d703b53a4a48b1315bf099728c83a1d728a39ef3a8304e66";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/ru/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/ru/Thunderbird%20140.2.0esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "a904ded4e1e6554d8ec358a6355f44e091b2632595683c76dd1ebc1ed405e054";
+      sha256 = "c96891f01601bc7ed3fa593bbb1fce27cc9130546d3bd3c22c406357eb5a724e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sk/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/sk/Thunderbird%20140.2.0esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "b0e5dde48ee7f62b94d88790e85cd39d4c43cea30bbff8c45dfd1d8e8ea2e007";
+      sha256 = "ba44a57490fb73becdd2563c88534c264b71b06d69670623bd6f62a5880d9723";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sl/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/sl/Thunderbird%20140.2.0esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "82922b0d994cea8f8f2746f729b06e827200801b3d7bfdfd52c043961630d6a5";
+      sha256 = "1d2a721bb5dd8e0e3264474a8b33f850ceea3b160b5d8bf006b6e32cb20039a3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sq/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/sq/Thunderbird%20140.2.0esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "2ba790ad85c6ee2902be523e324de55723f03185d75c3678f191fbba1150a550";
+      sha256 = "3f9ef5c2857d9cc89376db4ef16c4d7079fa35b465701724c2dbe57a752b970f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sr/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/sr/Thunderbird%20140.2.0esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "7598622285914fde08afbf7e3bfd7a73d45e45babe026f66da8df49303c84226";
+      sha256 = "53f73851ba19824b8ac0bc6d6b9d74bb8e376344598b597c6d3ac08ea5d07c6f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/sv-SE/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/sv-SE/Thunderbird%20140.2.0esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "c1da913ad66d451e39745af397e778470cec80fa1defad493cd2dd820e7bc94e";
+      sha256 = "55c8c3db6b9e7fdf6c1dd91ce671f31dda545f2e5a248cd59413106adfe7a417";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/th/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/th/Thunderbird%20140.2.0esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "a3a50dacb30e3fc60f8bf9e71ed1f2edc7442ff88e0ec55b8903fe083bc06991";
+      sha256 = "85fc399146933fc392f0728f9244d48176845395dab82690c76eb97f02b8a4d5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/tr/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/tr/Thunderbird%20140.2.0esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "882e37d632ab22d7dc27d46e29b37f772b4fe5d54d6b5029d73382fcb5473e46";
+      sha256 = "0f019f08f99fb80348934181df9356480a0aca9c6a764d065c8bb3686cbf3b99";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/uk/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/uk/Thunderbird%20140.2.0esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "70885ce0f0060db46c3ccb808ddf2c15020b489ff856b43825d8f065cb43a9e7";
+      sha256 = "eceefb85e3841a06de248cdadca14bbea90d26d752e78be5f0c98450759da7bc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/uz/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/uz/Thunderbird%20140.2.0esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "4dd5fa09a91df2c274d53f638ae925fb543a10d6e8e265d624c861ac99ef6fc5";
+      sha256 = "ff114f243efb544ef47256294122d85e2776d298d323b250c51b135d1c3d75a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/vi/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/vi/Thunderbird%20140.2.0esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "8017586e7c3f025e4f9f17839f744fec8f5eedf2a8ead01628b2d8e96dd4e3bd";
+      sha256 = "93e1aab8ce3a37bb6f22674ae701417d80067a58355262948067ffdc3d82dcea";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/zh-CN/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/zh-CN/Thunderbird%20140.2.0esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "e6d109cc54679a3dad37b183737762d74622629797896de20cc83752af3ae8a0";
+      sha256 = "38833e805acdd5f2a5ba614e9fec2a737a18d231f39040f25e9447d879a2c6c4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.1esr/mac/zh-TW/Thunderbird%20140.1.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.2.0esr/mac/zh-TW/Thunderbird%20140.2.0esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "4d4736b5d11221baea9d5b30a10506cadc2a99deb90181d0714d90b164474145";
+      sha256 = "7e82319ccaabb0aa248cad7a89ae73a48020d649be8f9e30b399eb8667986427";
     }
   ];
 }

From 3eeef11c8166d972222e1eea85be593da92e7bef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 05:34:31 +0000
Subject: [PATCH 3090/3724] stevenblack-blocklist: 3.16.12 -> 3.16.13

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

diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix
index 87c981407a5a..b8b5a9b4077e 100644
--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.16.12";
+  version = "3.16.13";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     tag = finalAttrs.version;
-    hash = "sha256-RqO03N6dRQqbAaSEG20PRyqvmdV1sJYx1P7wTZsOSjE=";
+    hash = "sha256-tvtHai3Z/kXhHSVOwopJBqTwrBFckcuj/GSe8wtk7u4=";
   };
 
   outputs = [

From fd3e90d3e3e468a461e72eedda8d3c50154a961f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 24 Aug 2025 05:41:54 +0000
Subject: [PATCH 3091/3724] vscodium: 1.103.15539 -> 1.103.25610

---
 pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 91cd9987e18e..0ae4cfe70e5f 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -26,11 +26,11 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-DobpiO5v7iCeVtu3RTVeA44tHhcKnct9dnGVky+gyYw=";
-      x86_64-darwin = "sha256-qXuREA4opCtp10Z3GjQCIDXH/rfeOmi5SYOrRIFDQOE=";
-      aarch64-linux = "sha256-yr5tTf5+qatTczEjTO4ehOJLhjaBHZHEYucZnII6Ejo=";
-      aarch64-darwin = "sha256-N0cz4yWY3dMYKZFGJPDQD305DNbxK8RQtxnvvOvR4RQ=";
-      armv7l-linux = "sha256-ulf1BKf5eBThPh9PuMQ6dIqWkcKQ2lwsCNMAVqCFsFM=";
+      x86_64-linux = "sha256-Q5Qa0K1tWYyWzTa+H3zBv3jHJ1aV4FcZBOat1TYyMTE=";
+      x86_64-darwin = "sha256-RjRWfqWMxx4GW2eRztaU8g21dxr4+SsG3hElDaMMpjw=";
+      aarch64-linux = "sha256-DOyS3bda4i5U1pnQbA2NnPLfPW5L7QovpjGT2PJ4IC8=";
+      aarch64-darwin = "sha256-fcViJYnWqDsC265F0dA19ZRL3tPfCYf4jmKUsXqhLf0=";
+      armv7l-linux = "sha256-wBCi+xM665xMRlW8Y36296MF6Yi7I+fVAkgqoCBO2sc=";
     }
     .${system} or throwSystem;
 
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.103.15539";
+  version = "1.103.25610";
   pname = "vscodium";
 
   executableName = "codium";

From 14bf2ef1f9b5cd78f18a973e3888798f47a01782 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 17:19:43 +0000
Subject: [PATCH 3092/3724] hyprprop: 0.1-unstable-2025-07-23 ->
 0.1-unstable-2025-08-20

---
 pkgs/by-name/hy/hyprprop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix
index fc6aa4731167..8d695f0b26cf 100644
--- a/pkgs/by-name/hy/hyprprop/package.nix
+++ b/pkgs/by-name/hy/hyprprop/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "hyprprop";
-  version = "0.1-unstable-2025-07-23";
+  version = "0.1-unstable-2025-08-20";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "contrib";
-    rev = "6839b23345b71db17cd408373de4f5605bf589b8";
-    hash = "sha256-PFAJoEqQWMlo1J+yZb+4HixmhbRVmmNl58e/AkLYDDI=";
+    rev = "04721247f417256ca96acf28cdfe946cf1006263";
+    hash = "sha256-g7/g5o0spemkZCzPa8I21RgCmN0Kv41B5z9Z5HQWraY=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/hyprprop";

From 80b801880a065e3cdd1fa57ba9333a70fe93e973 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Sat, 23 Aug 2025 16:53:21 +0900
Subject: [PATCH 3093/3724] android-studio: 2025.1.2.11 -> 2025.1.2.12

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/applications/editors/android-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index b7413bfb101a..d3578652ff79 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -16,8 +16,8 @@ let
       inherit tiling_wm;
     };
   stableVersion = {
-    version = "2025.1.2.11"; # "Android Studio Narwhal Feature Drop | 2025.1.2"
-    sha256Hash = "sha256-jzh0xrEZU4zdlse8tlVV/uqBEz4lH2k2XSHd13d3vng=";
+    version = "2025.1.2.12"; # "Android Studio Narwhal Feature Drop | 2025.1.2 Patch 1"
+    sha256Hash = "sha256-fLjCbB9Wwrx7siYQTmtWvce+8TdYTea+y6HTtSTYWAY=";
   };
   betaVersion = {
     version = "2025.1.3.5"; # "Android Studio Narwhal 3 Feature Drop | 2025.1.3 RC 1"

From 73b3a580270a3dc0a5a76299e17b09376cfc9689 Mon Sep 17 00:00:00 2001
From: Shogo Takata <peshogo@gmail.com>
Date: Sun, 24 Aug 2025 13:29:36 +0900
Subject: [PATCH 3094/3724] gitify: update fetcher version

Uses fetcher version 2.
The output of the fetcher was non deterministic with version 1,
specifically on github actions. This seems to fix the issue.
Possibly related to https://github.com/NixOS/nixpkgs/issues/422889
---
 pkgs/by-name/gi/gitify/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix
index 1fc3d39a0fbe..29fbd5564fc5 100644
--- a/pkgs/by-name/gi/gitify/package.nix
+++ b/pkgs/by-name/gi/gitify/package.nix
@@ -33,8 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-oUjlLE7PzA4wfiQlVPnAYk3MF/lqD7hb+k++0RFGvw4=";
+    fetcherVersion = 2;
+    hash = "sha256-AvDKdyJW4kWh2r6XFDyx9DB3PEJc9a0viHKboOVQATg=";
   };
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;

From 428a6e2a503bad4b80f2ccc4bd727e6766f1c481 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 06:13:53 +0000
Subject: [PATCH 3095/3724] python3Packages.openai-agents: 0.2.7 -> 0.2.9

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

diff --git a/pkgs/development/python-modules/openai-agents/default.nix b/pkgs/development/python-modules/openai-agents/default.nix
index 94829965e15e..0812eb19d871 100644
--- a/pkgs/development/python-modules/openai-agents/default.nix
+++ b/pkgs/development/python-modules/openai-agents/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "openai-agents";
-  version = "0.2.7";
+  version = "0.2.9";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "openai_agents";
-    hash = "sha256-sFEFoo8s0WM7xlUmTTLHujAP0zN960rDLwVPmYvDSFI=";
+    hash = "sha256-YZxRyM5J+EFHSp5hlXPW9/lqRkMpAHUhRa0EMJq3Cuk=";
   };
 
   build-system = [

From fd1d33825dadab12a6fc7678c63adee5feac00d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 06:25:03 +0000
Subject: [PATCH 3096/3724] pyprojectize: 1a6 -> 1a7

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

diff --git a/pkgs/by-name/py/pyprojectize/package.nix b/pkgs/by-name/py/pyprojectize/package.nix
index 018963f2a6fc..c019e300f831 100644
--- a/pkgs/by-name/py/pyprojectize/package.nix
+++ b/pkgs/by-name/py/pyprojectize/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "pyprojectize";
-  version = "1a6";
+  version = "1a7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hroncok";
     repo = "pyprojectize";
     tag = version;
-    hash = "sha256-NW74IoGdghtX2Wlxocosx8zb3Htfqq6zN9iNpICdffs=";
+    hash = "sha256-MVA8Mx+jpPrNB099BfAxGBfZWyvFTYR8q0vyspj7jSY=";
   };
 
   build-system = with python3.pkgs; [

From 44827a9dbfc2ea6d0459456f767c2a188451056f Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Mon, 14 Jul 2025 22:16:10 +0300
Subject: [PATCH 3097/3724] maintainers: add acidbong

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3bc03735be8a..646373f6c266 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -541,6 +541,12 @@
     github = "aciceri";
     githubId = 2318843;
   };
+  acidbong = {
+    name = "Acid Bong";
+    email = "acidbong@tilde.club";
+    github = "acid-bong";
+    githubId = 94849097;
+  };
   acowley = {
     email = "acowley@gmail.com";
     github = "acowley";

From b64de85592d5162f817666c819c359d2701cf7a2 Mon Sep 17 00:00:00 2001
From: fyxae <fyxae@users.noreply.github.com>
Date: Sun, 24 Aug 2025 14:37:45 +0800
Subject: [PATCH 3098/3724] auto-cpufreq: relax urwid

---
 pkgs/by-name/au/auto-cpufreq/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix
index 8f26f63605e5..b2c5c3443e91 100644
--- a/pkgs/by-name/au/auto-cpufreq/package.nix
+++ b/pkgs/by-name/au/auto-cpufreq/package.nix
@@ -63,6 +63,8 @@ python3Packages.buildPythonPackage rec {
     requests
   ];
 
+  pythonRelaxDeps = [ "urwid" ];
+
   nativeBuildInputs = [
     gobject-introspection
     wrapGAppsHook3

From 3fc71b5d7a488c13474efd003047ddcb415e5e2d Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 24 Aug 2025 00:51:18 -0600
Subject: [PATCH 3099/3724] kanri: run nixfmt

---
 pkgs/by-name/ka/kanri/package.nix | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ka/kanri/package.nix b/pkgs/by-name/ka/kanri/package.nix
index beaf4956cbe2..53022bd47288 100644
--- a/pkgs/by-name/ka/kanri/package.nix
+++ b/pkgs/by-name/ka/kanri/package.nix
@@ -33,19 +33,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-z0RLQ6n3hdsaBy3BiIOpuvpPBq3ST02r7lfsGfJypb8=";
   };
 
-  nativeBuildInputs =
-    [
-      nodejs
-      cargo-tauri.hook
+  nativeBuildInputs = [
+    nodejs
+    cargo-tauri.hook
 
-      yarnConfigHook
-      yarnBuildHook
+    yarnConfigHook
+    yarnBuildHook
 
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      wrapGAppsHook4
-    ];
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wrapGAppsHook4
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     glib-networking

From 9ab4929950d034b780afb037bb22548362afb96a Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Mon, 14 Jul 2025 22:16:28 +0300
Subject: [PATCH 3100/3724] mpdris2-rs: init at 1.0.2

---
 pkgs/by-name/mp/mpdris2-rs/package.nix | 41 ++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/mp/mpdris2-rs/package.nix

diff --git a/pkgs/by-name/mp/mpdris2-rs/package.nix b/pkgs/by-name/mp/mpdris2-rs/package.nix
new file mode 100644
index 000000000000..1615412a4ad9
--- /dev/null
+++ b/pkgs/by-name/mp/mpdris2-rs/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "mpdris2-rs";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "szclsya";
+    repo = "mpdris2-rs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-E9H6bjmWZx35fZo/ZPvJL1w/YQ34pJ7z81YbB5fUZSU=";
+  };
+  cargoHash = "sha256-rA/za8fc2RiURaiijc49y+2QBcS6cDavZQFjVh+7Iow=";
+
+  postPatch = ''
+    substituteInPlace misc/mpdris2-rs.service --replace-fail "/usr/local" "$out"
+  '';
+
+  postInstall = ''
+    install -Dm644 misc/mpdris2-rs.service -t $out/lib/systemd/user
+  '';
+
+  meta = {
+    description = "Exposing MPRIS V2.2 D-Bus interface for MPD";
+    longDescription = ''
+      A lightweight implementation of MPD to D-Bus bridge, which exposes MPD
+      player and playlist information onto MPRIS2 interface so other programs
+      can use this generic interface to retrieve MPD's playback state.
+    '';
+    homepage = "https://github.com/szclsya/mpdris2-rs";
+    changelog = "https://github.com/szclsya/mpdris2-rs/blob/${finalAttrs.src.rev}/Changes.md";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      acidbong
+    ];
+    mainProgram = "mpdris2-rs";
+  };
+})

From a480fa1c53c9196b8faf495cd3d49b32b5b827b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 24 Aug 2025 09:20:52 +0200
Subject: [PATCH 3101/3724] equicord: 2025-07-25 -> 2025-08-24

---
 pkgs/by-name/eq/equicord/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index 91834cdeb634..940c43d124ac 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -3,7 +3,7 @@
   git,
   lib,
   nodejs,
-  pnpm_9,
+  pnpm_10,
   stdenv,
   nix-update-script,
   buildWebExtension ? false,
@@ -14,25 +14,25 @@ stdenv.mkDerivation (finalAttrs: {
   # the Equicord repository. Dates as tags (and automatic releases) were the compromise
   # we came to with upstream. Please do not change the version schema (e.g., to semver)
   # unless upstream changes the tag schema from dates.
-  version = "2025-07-25";
+  version = "2025-08-24";
 
   src = fetchFromGitHub {
     owner = "Equicord";
     repo = "Equicord";
     tag = "${finalAttrs.version}";
-    hash = "sha256-6p7lfdRaxQusqZf86a1qclal2E0LusYYT1y3BPkOSKY=";
+    hash = "sha256-BK0Mvy0Bp0Q6wj4aECEtyGsW56hqbLkkELZ9yN+QRw8=";
   };
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-LXbr/qh1QZXQ/Na5180Im2WW8KbWU78Oo0O12SiNMWg=";
+    hash = "sha256-xVnryPA7+gnRvpMzuFJl4YeEPOky2+iOu76V3Rf6bow=";
   };
 
   nativeBuildInputs = [
     git
     nodejs
-    pnpm_9.configHook
+    pnpm_10.configHook
   ];
 
   env = {

From 60088b75eb1aab91c3811fcb83f0dc73f41b508c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 2 Aug 2025 16:37:12 +0200
Subject: [PATCH 3102/3724] discord: add equicord support

---
 .../networking/instant-messengers/discord/darwin.nix     | 9 ++++++++-
 .../networking/instant-messengers/discord/linux.nix      | 8 ++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
index 179d0651a839..b92dae846efa 100644
--- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
@@ -17,6 +17,8 @@
   openasar,
   withVencord ? false,
   vencord,
+  withEquicord ? false,
+  equicord,
   withMoonlight ? false,
   moonlight,
   commandLineArgs ? "",
@@ -81,7 +83,12 @@ stdenv.mkDerivation {
       echo '{"name":"discord","main":"index.js"}' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json
       echo 'require("${vencord}/patcher.js")' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/index.js
     ''
-
+    + lib.strings.optionalString withEquicord ''
+      mv $out/Applications/${desktopName}.app/Contents/Resources/app.asar $out/Applications/${desktopName}.app/Contents/Resources/_app.asar
+      mkdir $out/Applications/${desktopName}.app/Contents/Resources/app.asar
+      echo '{"name":"discord","main":"index.js"}' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json
+      echo 'require("${equicord}/patcher.js")' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/index.js
+    ''
     + lib.strings.optionalString withMoonlight ''
       mv $out/Applications/${desktopName}.app/Contents/Resources/app.asar $out/Applications/${desktopName}.app/Contents/Resources/_app.asar
       mkdir $out/Applications/${desktopName}.app/Contents/Resources/app.asar
diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index 8646fc8d7417..75247a729315 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -61,6 +61,8 @@
   openasar,
   withVencord ? false,
   vencord,
+  withEquicord ? false,
+  equicord,
   withMoonlight ? false,
   moonlight,
   withTTS ? true,
@@ -208,6 +210,12 @@ stdenv.mkDerivation rec {
       echo '{"name":"discord","main":"index.js"}' > $out/opt/${binaryName}/resources/app.asar/package.json
       echo 'require("${vencord}/patcher.js")' > $out/opt/${binaryName}/resources/app.asar/index.js
     ''
+    + lib.strings.optionalString withEquicord ''
+      mv $out/opt/${binaryName}/resources/app.asar $out/opt/${binaryName}/resources/_app.asar
+      mkdir $out/opt/${binaryName}/resources/app.asar
+      echo '{"name":"discord","main":"index.js"}' > $out/opt/${binaryName}/resources/app.asar/package.json
+      echo 'require("${equicord}/desktop/patcher.js")' > $out/opt/${binaryName}/resources/app.asar/index.js
+    ''
     + lib.strings.optionalString withMoonlight ''
       mv $out/opt/${binaryName}/resources/app.asar $out/opt/${binaryName}/resources/_app.asar
       mkdir $out/opt/${binaryName}/resources/app

From 6b5d51d3b9fd651ad99b350a01242698c8c3cdfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 2 Aug 2025 17:01:57 +0200
Subject: [PATCH 3103/3724] discord: make vencord, equicord and moonlight
 mutually exclusive

---
 .../instant-messengers/discord/darwin.nix          | 14 ++++++++++----
 .../instant-messengers/discord/linux.nix           | 14 +++++++++++---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
index b92dae846efa..f4ebf4537ded 100644
--- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
@@ -24,11 +24,14 @@
   commandLineArgs ? "",
 }:
 
-assert lib.assertMsg (
-  !(withMoonlight && withVencord)
-) "discord: Moonlight and Vencord can not be enabled at the same time";
-
 let
+  discordMods = [
+    withVencord
+    withEquicord
+    withMoonlight
+  ];
+  enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods);
+
   disableBreakingUpdates =
     runCommand "disable-breaking-updates.py"
       {
@@ -43,6 +46,9 @@ let
         chmod +x $out/bin/disable-breaking-updates.py
       '';
 in
+assert lib.assertMsg (
+  enabledDiscordModsCount <= 1
+) "discord: Only one of Vencord, Equicord or Moonlight can be enabled at the same time";
 stdenv.mkDerivation {
   inherit
     pname
diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index 75247a729315..c91ae5ddfaa9 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -73,10 +73,15 @@
   disableUpdates ? true,
   commandLineArgs ? "",
 }:
-assert lib.assertMsg (
-  !(withMoonlight && withVencord)
-) "discord: Moonlight and Vencord can not be enabled at the same time";
+
 let
+  discordMods = [
+    withVencord
+    withEquicord
+    withMoonlight
+  ];
+  enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods);
+
   disableBreakingUpdates =
     runCommand "disable-breaking-updates.py"
       {
@@ -91,6 +96,9 @@ let
         chmod +x $out/bin/disable-breaking-updates.py
       '';
 in
+assert lib.assertMsg (
+  enabledDiscordModsCount <= 1
+) "discord: Only one of Vencord, Equicord or Moonlight can be enabled at the same time";
 stdenv.mkDerivation rec {
   inherit
     pname

From 09ab794379be9d87f5e3f07dfd8cc662e94831f5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 24 Aug 2025 09:36:13 +0200
Subject: [PATCH 3104/3724] python313Packages.aioelectricitymaps: 1.1.0 ->
 1.1.1

Diff: https://github.com/jpbede/aioelectricitymaps/compare/v1.1.0...v1.1.1

Changelog: https://github.com/jpbede/aioelectricitymaps/releases/tag/v1.1.1
---
 .../development/python-modules/aioelectricitymaps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioelectricitymaps/default.nix b/pkgs/development/python-modules/aioelectricitymaps/default.nix
index af761db4b26f..1f487500e3bc 100644
--- a/pkgs/development/python-modules/aioelectricitymaps/default.nix
+++ b/pkgs/development/python-modules/aioelectricitymaps/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aioelectricitymaps";
-  version = "1.1.0";
+  version = "1.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "jpbede";
     repo = "aioelectricitymaps";
     tag = "v${version}";
-    hash = "sha256-YYoWdI+m+WiBCC7lPBm0x0jYL/+02iT/4Z5sdxBPvHY=";
+    hash = "sha256-6d9StqUMOGWyK5KAY+S0QE0c6Mi+XDUUAyzRt9RG52Q=";
   };
 
   postPatch = ''

From 151b882c22322e365e83cbdd23ed9c2e3db39a6d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 24 Aug 2025 09:36:46 +0200
Subject: [PATCH 3105/3724] python313Packages.asusrouter: 1.18.2 -> 1.20.1

Diff: https://github.com/Vaskivskyi/asusrouter/compare/1.18.2...1.20.1

Changelog: https://github.com/Vaskivskyi/asusrouter/releases/tag/1.20.1
---
 pkgs/development/python-modules/asusrouter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asusrouter/default.nix b/pkgs/development/python-modules/asusrouter/default.nix
index 75059262071c..37f86cc98454 100644
--- a/pkgs/development/python-modules/asusrouter/default.nix
+++ b/pkgs/development/python-modules/asusrouter/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "asusrouter";
-  version = "1.18.2";
+  version = "1.20.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Vaskivskyi";
     repo = "asusrouter";
     tag = version;
-    hash = "sha256-8kETQKvPwURyEabK/g8Ub+aLcPPTRs0FFWbSNU4jJZc=";
+    hash = "sha256-RZdSwLR/7uJICc56lLO0YyFs1ZDzpk/8Ebm3juG+gss=";
   };
 
   postPatch = ''

From c52ad993b0c689ac3c2a648689fbb47f1922d4c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 24 Aug 2025 09:37:10 +0200
Subject: [PATCH 3106/3724] python313Packages.yalexs: 8.11.1 -> 8.12.0

Diff: https://github.com/bdraco/yalexs/compare/v8.11.1...v8.12.0

Changelog: https://github.com/bdraco/yalexs/blob/v8.12.0/CHANGELOG.md
---
 pkgs/development/python-modules/yalexs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix
index 58286c2fdc6c..47a56b8f766e 100644
--- a/pkgs/development/python-modules/yalexs/default.nix
+++ b/pkgs/development/python-modules/yalexs/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "yalexs";
-  version = "8.11.1";
+  version = "8.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "yalexs";
     tag = "v${version}";
-    hash = "sha256-J7fVj3vb6cLfjijEHJwWS+LmWGM74HoFs392+apdlrc=";
+    hash = "sha256-wOJHeswtGy912repFKFMKAzmODssnNtsJpJZ+9wpqPI=";
   };
 
   build-system = [ poetry-core ];

From c813a1d280bbdfcbc51d4cb081e834dce51f6b43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 07:51:38 +0000
Subject: [PATCH 3107/3724] vscode-extensions.catppuccin.catppuccin-vsc-icons:
 1.23.0 -> 1.24.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index a77d0a338345..741f86f7a2b2 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -902,8 +902,8 @@ let
           mktplcRef = {
             name = "catppuccin-vsc-icons";
             publisher = "catppuccin";
-            version = "1.23.0";
-            hash = "sha256-jnn169toS1zaixiOrtWjgOvv3UskM13vfFcvaQEesjU=";
+            version = "1.24.0";
+            hash = "sha256-2M7N4Ccw9FAaMmG36hGHi6i0i1qR+uPCSgXELAA03Xk=";
           };
           meta = {
             changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc-icons/changelog";

From 3d78b0258b7f836230191ddb6a13607619e72059 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Aug 2025 09:56:41 +0200
Subject: [PATCH 3108/3724] python313Packages.bjoern: add changelog to meta

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

diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix
index e7eb25058871..ae4de2f37c9c 100644
--- a/pkgs/development/python-modules/bjoern/default.nix
+++ b/pkgs/development/python-modules/bjoern/default.nix
@@ -11,11 +11,10 @@ buildPythonPackage rec {
   version = "3.2.2";
   format = "setuptools";
 
-  # tests are not published to pypi anymore
   src = fetchFromGitHub {
     owner = "jonashaag";
     repo = "bjoern";
-    rev = version;
+    tag = version;
     hash = "sha256-drFLM6GsgrM8atQDxmb3/1bpj+C1WetQLjNbZqCTzog=";
     fetchSubmodules = true; # fetch http-parser and statsd-c-client submodules
   };
@@ -30,6 +29,7 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = "https://github.com/jonashaag/bjoern";
     description = "Screamingly fast Python 2/3 WSGI server written in C";
+    changelog = "https://github.com/jonashaag/bjoern/blob/${src.tag}/CHANGELOG";
     license = licenses.bsd2;
     maintainers = with maintainers; [ cmcdragonkai ];
   };

From ec867d2d2db74c3073f2e6ace8cff6d9ceb29c4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 19:39:30 +0000
Subject: [PATCH 3109/3724] pt2-clone: 1.75 -> 1.76

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

diff --git a/pkgs/by-name/pt/pt2-clone/package.nix b/pkgs/by-name/pt/pt2-clone/package.nix
index df94a8895e82..fcafc70f5a15 100644
--- a/pkgs/by-name/pt/pt2-clone/package.nix
+++ b/pkgs/by-name/pt/pt2-clone/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pt2-clone";
-  version = "1.75";
+  version = "1.76";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "pt2-clone";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-kHXryQTC2bbF4Fbl9++Mn/miSdCSPmoj7lgNfzjg9k8=";
+    sha256 = "sha256-oiOkUPvw0wY8HsRRKN4wdF3m2dFCdzYEBhx6JU2nqyQ=";
   };
 
   nativeBuildInputs = [ cmake ];

From 685ee6c821777b2ca9e786f2e226498192f668dd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Aug 2025 09:57:48 +0200
Subject: [PATCH 3110/3724] python313Packages.bjoern: modernize

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

diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix
index ae4de2f37c9c..f6fb503578e9 100644
--- a/pkgs/development/python-modules/bjoern/default.nix
+++ b/pkgs/development/python-modules/bjoern/default.nix
@@ -4,12 +4,13 @@
   fetchFromGitHub,
   libev,
   python,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "bjoern";
   version = "3.2.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jonashaag";
@@ -19,6 +20,8 @@ buildPythonPackage rec {
     fetchSubmodules = true; # fetch http-parser and statsd-c-client submodules
   };
 
+  build-system = [ setuptools ];
+
   buildInputs = [ libev ];
 
   checkPhase = ''

From a397c9bbf2eb21d2dc71f4ed38a253c54a5add3c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Aug 2025 10:00:57 +0200
Subject: [PATCH 3111/3724] python313Packages.btest: modernize

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

diff --git a/pkgs/development/python-modules/btest/default.nix b/pkgs/development/python-modules/btest/default.nix
index 2fcdc6ff4549..44a510dc8895 100644
--- a/pkgs/development/python-modules/btest/default.nix
+++ b/pkgs/development/python-modules/btest/default.nix
@@ -3,14 +3,15 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "btest";
   version = "1.2";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "zeek";
@@ -19,13 +20,15 @@ buildPythonPackage rec {
     hash = "sha256-c+iWzqq0RiRkZlRYjUCXIaFqgnyFdbMAWDNrVYZUvgw=";
   };
 
+  build-system = [ setuptools ];
+
   # No tests available and no module to import
   doCheck = false;
 
   meta = with lib; {
     description = "Generic Driver for Powerful System Tests";
     homepage = "https://github.com/zeek/btest";
-    changelog = "https://github.com/zeek/btest/blob/${version}/CHANGES";
+    changelog = "https://github.com/zeek/btest/blob/${src.tag}/CHANGES";
     license = licenses.bsd3;
     maintainers = with maintainers; [ fab ];
   };

From 1b564816b93fdc537f16680ff4a00dd624e02b17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 08:01:26 +0000
Subject: [PATCH 3112/3724] otree: 0.5.0 -> 0.5.1

---
 pkgs/by-name/ot/otree/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ot/otree/package.nix b/pkgs/by-name/ot/otree/package.nix
index 78dfee42229b..e45d1eae012e 100644
--- a/pkgs/by-name/ot/otree/package.nix
+++ b/pkgs/by-name/ot/otree/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "otree";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "fioncat";
     repo = "otree";
     tag = "v${version}";
-    hash = "sha256-zsBHra8X1nM8QINaxi3Vcs82T8S5WtfNRN5vb/ppuLU=";
+    hash = "sha256-nfRCqqOJl5tpKFyWAHa98Z1Q2lD61eFPD3O155mawf8=";
   };
 
-  cargoHash = "sha256-Ncyj5s4EfbKsFGV29FDViK35nKOAZM+DODzIVRCpbuQ=";
+  cargoHash = "sha256-+rBS9t743OwfNCy6v5dRdjWZRHA5GNniaWVnAtb5yaw=";
 
   meta = {
     description = "Command line tool to view objects (json/yaml/toml) in TUI tree widget";

From 6d174d69924fc253ccd914dc9c0d5ea948dfbc1d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 24 Aug 2025 10:12:26 +0200
Subject: [PATCH 3113/3724] python313Packages.fpdf2: modernize

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

diff --git a/pkgs/development/python-modules/fpdf2/default.nix b/pkgs/development/python-modules/fpdf2/default.nix
index 41e518d00490..f2c6bd602056 100644
--- a/pkgs/development/python-modules/fpdf2/default.nix
+++ b/pkgs/development/python-modules/fpdf2/default.nix
@@ -1,20 +1,17 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
-
-  setuptools,
-
-  defusedxml,
-  pillow,
-  fonttools,
-
-  pytestCheckHook,
-  pytest-cov-stub,
-  qrcode,
   camelot,
-  uharfbuzz,
+  defusedxml,
+  fetchFromGitHub,
+  fonttools,
   lxml,
+  pillow,
+  pytest-cov-stub,
+  pytestCheckHook,
+  qrcode,
+  setuptools,
+  uharfbuzz,
 }:
 
 buildPythonPackage rec {
@@ -29,21 +26,21 @@ buildPythonPackage rec {
     hash = "sha256-uLaVRseakLg7Q9QO4F6BM7vQIFeA44ry8cqDfas8oMA=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     defusedxml
-    pillow
     fonttools
+    pillow
   ];
 
   nativeCheckInputs = [
-    pytestCheckHook
-    pytest-cov-stub
-    qrcode
     camelot
-    uharfbuzz
     lxml
+    pytest-cov-stub
+    pytestCheckHook
+    qrcode
+    uharfbuzz
   ];
 
   disabledTestPaths = [

From dabf42d8e577e57182d36b4c3fe2102a5c709e04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 08:17:11 +0000
Subject: [PATCH 3114/3724] python3Packages.skyfield: 1.49 -> 1.53

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

diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix
index b917cf214890..24b19b7e2f86 100644
--- a/pkgs/development/python-modules/skyfield/default.nix
+++ b/pkgs/development/python-modules/skyfield/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "skyfield";
-  version = "1.49";
+  version = "1.53";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "skyfielders";
     repo = "python-skyfield";
     rev = version;
-    hash = "sha256-PZ63sohdfpop3nYQr2RIMjPbrL9jdfincEhw5D8NZ+Y=";
+    hash = "sha256-CQe+ik6HciOUaRpFp8Cx6cOlOFzeVoMVJrk7+rdcQEo=";
   };
 
   # Fix broken tests on "exotic" platforms.

From 879f7ce87251fd7927c3505157c62bf4ef5c33b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 08:23:12 +0000
Subject: [PATCH 3115/3724] python3Packages.unstructured: 0.18.12 -> 0.18.13

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

diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix
index 5cd2137eca44..a52897c9197f 100644
--- a/pkgs/development/python-modules/unstructured/default.nix
+++ b/pkgs/development/python-modules/unstructured/default.nix
@@ -116,7 +116,7 @@
   grpcio,
 }:
 let
-  version = "0.18.12";
+  version = "0.18.13";
 in
 buildPythonPackage rec {
   pname = "unstructured";
@@ -127,7 +127,7 @@ buildPythonPackage rec {
     owner = "Unstructured-IO";
     repo = "unstructured";
     tag = version;
-    hash = "sha256-YZsfpfkvjkNStYhU4lC3I/Hr1ahJ1wccyJ8lckwejaA=";
+    hash = "sha256-6q5radXIY0Ox5U6xvVb5xmc4HjY5G2VbFiAPWNoMYHQ=";
   };
 
   build-system = [ setuptools ];

From 4f2529ac468accc26a5b02fcbb45fd9c3ee13698 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 24 Aug 2025 10:25:38 +0200
Subject: [PATCH 3116/3724] python313Packages.fpdf2: add missing input

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

diff --git a/pkgs/development/python-modules/fpdf2/default.nix b/pkgs/development/python-modules/fpdf2/default.nix
index f2c6bd602056..6ed3c3b46f90 100644
--- a/pkgs/development/python-modules/fpdf2/default.nix
+++ b/pkgs/development/python-modules/fpdf2/default.nix
@@ -6,6 +6,7 @@
   fetchFromGitHub,
   fonttools,
   lxml,
+  pikepdf,
   pillow,
   pytest-cov-stub,
   pytestCheckHook,
@@ -37,6 +38,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     camelot
     lxml
+    pikepdf
     pytest-cov-stub
     pytestCheckHook
     qrcode

From 2d13a4916799ea28d854912203b29487c129cc58 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 24 Aug 2025 10:31:52 +0200
Subject: [PATCH 3117/3724] python313Packages.firecrawl-py: add missing aiohttp

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

diff --git a/pkgs/development/python-modules/firecrawl-py/default.nix b/pkgs/development/python-modules/firecrawl-py/default.nix
index 35858d74ca5e..baf845e53b81 100644
--- a/pkgs/development/python-modules/firecrawl-py/default.nix
+++ b/pkgs/development/python-modules/firecrawl-py/default.nix
@@ -1,12 +1,13 @@
 {
   lib,
+  aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
   nest-asyncio,
   pydantic,
   python-dotenv,
   requests,
+  setuptools,
   websockets,
 }:
 
@@ -27,6 +28,7 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
+    aiohttp
     nest-asyncio
     pydantic
     python-dotenv

From 4cd81eaad5bdaf1431fd916117549df3ab5a1e57 Mon Sep 17 00:00:00 2001
From: sudosubin <sudosubin@gmail.com>
Date: Sun, 24 Aug 2025 18:19:19 +0900
Subject: [PATCH 3118/3724] cursor-cli: init at 0-unstable-2025-08-22

Co-authored-by: Andrew Bastin <andrewbastin.k@gmail.com>
---
 maintainers/maintainer-list.nix        |  6 +++
 pkgs/by-name/cu/cursor-cli/package.nix | 67 ++++++++++++++++++++++++++
 pkgs/by-name/cu/cursor-cli/update.sh   | 32 ++++++++++++
 3 files changed, 105 insertions(+)
 create mode 100644 pkgs/by-name/cu/cursor-cli/package.nix
 create mode 100755 pkgs/by-name/cu/cursor-cli/update.sh

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3bc03735be8a..34675db4a0bc 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1581,6 +1581,12 @@
     githubId = 587021;
     name = "André V L Matos";
   };
+  andrewbastin = {
+    email = "andrewbastin.k@gmail.com";
+    github = "AndrewBastin";
+    githubId = 9131943;
+    name = "Andrew Bastin";
+  };
   andrewchambers = {
     email = "ac@acha.ninja";
     github = "andrewchambers";
diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix
new file mode 100644
index 000000000000..2f231df39a91
--- /dev/null
+++ b/pkgs/by-name/cu/cursor-cli/package.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  fetchurl,
+  stdenv,
+  autoPatchelfHook,
+}:
+
+let
+  inherit (stdenv) hostPlatform;
+  sources = {
+    x86_64-linux = fetchurl {
+      url = "https://downloads.cursor.com/lab/2025.08.22-82fb571/linux/x64/agent-cli-package.tar.gz";
+      hash = "sha256-jfjYWM9Vuq9sYZcnqiap3TKuVWHHKt/aF7XaVilJjsE=";
+    };
+    aarch64-linux = fetchurl {
+      url = "https://downloads.cursor.com/lab/2025.08.22-82fb571/linux/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-uMK5jO77TQntsrR450WWBj9q5VBowNUhO6UkZ/z1ys4=";
+    };
+    x86_64-darwin = fetchurl {
+      url = "https://downloads.cursor.com/lab/2025.08.22-82fb571/darwin/x64/agent-cli-package.tar.gz";
+      hash = "sha256-gFM+igXGdLLJXVHAou6pRTIVqsg6iPagaghBAzRcPXw=";
+    };
+    aarch64-darwin = fetchurl {
+      url = "https://downloads.cursor.com/lab/2025.08.22-82fb571/darwin/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-XN2QaFt/lbVHfFfdZaznRvUlMWIHq7nUbe3uptrGjN0=";
+    };
+  };
+in
+stdenv.mkDerivation {
+  pname = "cursor-cli";
+  version = "0-unstable-2025-08-22";
+
+  src = sources.${hostPlatform.system};
+
+  nativeBuildInputs = lib.optionals hostPlatform.isLinux [
+    autoPatchelfHook
+    stdenv.cc.cc.lib
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/cursor-agent
+    cp -r * $out/share/cursor-agent/
+    ln -s $out/share/cursor-agent/cursor-agent $out/bin/cursor-agent
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    inherit sources;
+    updateScript = ./update.sh;
+  };
+
+  meta = {
+    description = "Cursor CLI";
+    homepage = "https://cursor.com/cli";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
+      sudosubin
+      andrewbastin
+    ];
+    platforms = builtins.attrNames sources;
+    mainProgram = "cursor-agent";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+}
diff --git a/pkgs/by-name/cu/cursor-cli/update.sh b/pkgs/by-name/cu/cursor-cli/update.sh
new file mode 100755
index 000000000000..82484933310f
--- /dev/null
+++ b/pkgs/by-name/cu/cursor-cli/update.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl coreutils common-updater-scripts
+set -eu -o pipefail
+
+release=$(curl -s https://cursor.com/install | grep -oP "lab/\K[^/]+")
+
+# Check if release matches the pattern YYYY.MM.DD-{commithash}
+if [[ "$release" =~ ^[0-9]{4}\.[0-9]{2}\.[0-9]{2}-[a-f0-9]+$ ]]; then
+  timestamp=$(echo "$release" | cut -d"-" -f1 | tr "." "-")
+  latestVersion="0-unstable-$timestamp"
+else
+  latestVersion="$release"
+fi
+
+currentVersion=$(nix eval --raw -f . cursor-cli.version)
+
+echo "latest  version: $latestVersion"
+echo "current version: $currentVersion"
+
+if [[ "$latestVersion" == "$currentVersion" ]]; then
+  echo "package is up-to-date"
+  exit 0
+fi
+
+declare -A platforms=( [x86_64-linux]="linux/x64" [aarch64-linux]="linux/arm64" [x86_64-darwin]="darwin/x64" [aarch64-darwin]="darwin/arm64" )
+
+for platform in "${!platforms[@]}"; do
+  url="https://downloads.cursor.com/lab/$release/${platforms[$platform]}/agent-cli-package.tar.gz"
+  source=$(nix-prefetch-url "$url" --name "cursor-cli-$latestVersion")
+  hash=$(nix-hash --to-sri --type sha256 "$source")
+  update-source-version cursor-cli "$latestVersion" "$hash" "$url" --system="$platform" --source-key="sources.$platform" --ignore-same-version
+done

From 2fd6cf32042ec18af156a72630246ff418713a77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 09:31:54 +0000
Subject: [PATCH 3119/3724] enumer: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/by-name/en/enumer/package.nix b/pkgs/by-name/en/enumer/package.nix
index aeefd7bdc880..2128e9cb8325 100644
--- a/pkgs/by-name/en/enumer/package.nix
+++ b/pkgs/by-name/en/enumer/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "enumer";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "dmarkham";
     repo = "enumer";
     tag = "v${version}";
-    hash = "sha256-6K9xsJ9VmsfMDAUZZpQPtwZKzyITuRy2mmduwhya9EY=";
+    hash = "sha256-Motlnq1U40gUGhDdFtKgQ7ogGfm8RvittTnRWOqIhKU=";
   };
 
   vendorHash = "sha256-w9T9PWMJjBJP2MmhGC7e78zbszgCwtVrfO5AQlu/ugQ=";

From 5327b31c713da2e062defd9bc3fd45ac4ea713f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 09:47:10 +0000
Subject: [PATCH 3120/3724] kapitano: 1.1.2 -> 1.1.5

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

diff --git a/pkgs/by-name/ka/kapitano/package.nix b/pkgs/by-name/ka/kapitano/package.nix
index a44ecf34a681..6dbcfe1e8643 100644
--- a/pkgs/by-name/ka/kapitano/package.nix
+++ b/pkgs/by-name/ka/kapitano/package.nix
@@ -18,7 +18,7 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "kapitano";
-  version = "1.1.2";
+  version = "1.1.5";
   pyproject = false;
 
   src = fetchFromGitea {
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
     owner = "zynequ";
     repo = "Kapitano";
     tag = version;
-    hash = "sha256-914M0VRyuzDiITUT5sjt9vNaqshn4skz/FWWMxgPTdc=";
+    hash = "sha256-eX35ZR2O56NwoFnqGNZi2lNUpoBvaYZqFh69dQ+Eng0=";
     fetchLFS = true;
   };
 

From 978637556630170d189b4c8e68c7eed5a2d21573 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 24 Aug 2025 17:48:36 +0800
Subject: [PATCH 3121/3724] ibus-engines.libpinyin: Fix typelib finding

Same as 9f7bd20a997a.

Fixes `ValueError: Namespace Gtk not available for version 3.0` when
opening ibus-setup-libpinyin from gnome-control-center (when `cat
./result/libexec/ibus-setup-libpinyin` you will now find GI_TYPELIB_PATH
being passed to makeCWrapper).

The issue can be not reproducible on some impure environments,
I guess the best way to test is to directly run
GI_TYPELIB_PATH= ./result/libexec/ibus-setup-libpinyin
---
 pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
index 072bbebda0be..fd144555a31e 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   autoreconfHook,
   gettext,
+  gobject-introspection,
   pkg-config,
   wrapGAppsHook3,
   sqlite,
@@ -34,6 +35,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     gettext
+    gobject-introspection.setupHook
     pkg-config
     wrapGAppsHook3
   ];

From f38281ffaa05422b9e87c5a0ea55cae1032bab64 Mon Sep 17 00:00:00 2001
From: Soner Sayakci <s.sayakci@gmail.com>
Date: Sun, 24 Aug 2025 12:05:19 +0200
Subject: [PATCH 3122/3724] maintainers: remove shyim

---
 nixos/tests/opensearch.nix                       | 2 +-
 pkgs/by-name/ad/adminerevo/package.nix           | 4 +---
 pkgs/by-name/an/anydesk/package.nix              | 4 +---
 pkgs/by-name/bl/blackfire/package.nix            | 2 +-
 pkgs/by-name/bl/blackfire/php-probe.nix          | 2 +-
 pkgs/by-name/dy/dynamodb-local/package.nix       | 1 -
 pkgs/by-name/fa/fastly/package.nix               | 1 -
 pkgs/by-name/fr/frankenphp/package.nix           | 1 -
 pkgs/by-name/fs/fsnotifier/package.nix           | 2 +-
 pkgs/by-name/gi/git-credential-oauth/package.nix | 2 +-
 pkgs/by-name/lu/ludtwig/package.nix              | 1 -
 pkgs/by-name/my/mysql84/package.nix              | 1 -
 pkgs/by-name/op/opensearch-cli/package.nix       | 2 +-
 pkgs/by-name/op/opensearch/package.nix           | 2 +-
 pkgs/by-name/pl/platformsh/package.nix           | 1 -
 pkgs/by-name/ro/roadrunner/package.nix           | 2 +-
 pkgs/by-name/vi/viceroy/package.nix              | 1 -
 pkgs/development/php-packages/zstd/default.nix   | 2 +-
 18 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/nixos/tests/opensearch.nix b/nixos/tests/opensearch.nix
index a8794340f306..5ecb62c6cd80 100644
--- a/nixos/tests/opensearch.nix
+++ b/nixos/tests/opensearch.nix
@@ -5,7 +5,7 @@ let
       { pkgs, lib, ... }:
       {
         name = "opensearch";
-        meta.maintainers = with pkgs.lib.maintainers; [ shyim ];
+        meta.maintainers = with pkgs.lib.maintainers; [ ];
 
         nodes.machine = lib.mkMerge [
           {
diff --git a/pkgs/by-name/ad/adminerevo/package.nix b/pkgs/by-name/ad/adminerevo/package.nix
index 76af150c85dc..0ed80d3a4c3c 100644
--- a/pkgs/by-name/ad/adminerevo/package.nix
+++ b/pkgs/by-name/ad/adminerevo/package.nix
@@ -69,9 +69,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       asl20
       gpl2Only
     ];
-    maintainers = with maintainers; [
-      shyim
-    ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 })
diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix
index 274f726d5ba6..755ca8ccea4e 100644
--- a/pkgs/by-name/an/anydesk/package.nix
+++ b/pkgs/by-name/an/anydesk/package.nix
@@ -143,8 +143,6 @@ stdenv.mkDerivation (finalAttrs: {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers = with lib.maintainers; [
-      shyim
-    ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/bl/blackfire/package.nix b/pkgs/by-name/bl/blackfire/package.nix
index fc6896b8c19a..86fdb5e8f856 100644
--- a/pkgs/by-name/bl/blackfire/package.nix
+++ b/pkgs/by-name/bl/blackfire/package.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
     homepage = "https://blackfire.io/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    maintainers = with maintainers; [ shyim ];
+    maintainers = with maintainers; [ ];
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix
index 01d3423b6aa9..dce07cf71e4d 100644
--- a/pkgs/by-name/bl/blackfire/php-probe.nix
+++ b/pkgs/by-name/bl/blackfire/php-probe.nix
@@ -156,7 +156,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Blackfire Profiler PHP module";
     homepage = "https://blackfire.io/";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ shyim ];
+    maintainers = with lib.maintainers; [ ];
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/by-name/dy/dynamodb-local/package.nix b/pkgs/by-name/dy/dynamodb-local/package.nix
index 82be1d83820d..88bd0e960818 100644
--- a/pkgs/by-name/dy/dynamodb-local/package.nix
+++ b/pkgs/by-name/dy/dynamodb-local/package.nix
@@ -86,7 +86,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = licenses.unfree;
     mainProgram = "dynamodb-local";
     maintainers = with maintainers; [
-      shyim
       martinjlowm
     ];
     platforms = platforms.all;
diff --git a/pkgs/by-name/fa/fastly/package.nix b/pkgs/by-name/fa/fastly/package.nix
index 58058b53ab66..a2c8b81be704 100644
--- a/pkgs/by-name/fa/fastly/package.nix
+++ b/pkgs/by-name/fa/fastly/package.nix
@@ -82,7 +82,6 @@ buildGoModule rec {
     license = licenses.asl20;
     maintainers = with maintainers; [
       ereslibre
-      shyim
     ];
     mainProgram = "fastly";
   };
diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix
index 6ca75b2e12af..7b18d41171be 100644
--- a/pkgs/by-name/fr/frankenphp/package.nix
+++ b/pkgs/by-name/fr/frankenphp/package.nix
@@ -133,7 +133,6 @@ buildGoModule rec {
     mainProgram = "frankenphp";
     maintainers = with lib.maintainers; [
       gaelreyrol
-      shyim
     ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
diff --git a/pkgs/by-name/fs/fsnotifier/package.nix b/pkgs/by-name/fs/fsnotifier/package.nix
index bb9215713d61..f3f575d78356 100644
--- a/pkgs/by-name/fs/fsnotifier/package.nix
+++ b/pkgs/by-name/fs/fsnotifier/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "IntelliJ Platform companion program for watching and reporting file and directory structure modification";
     license = lib.licenses.asl20;
     mainProgram = "fsnotifier";
-    maintainers = with lib.maintainers; [ shyim ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/gi/git-credential-oauth/package.nix b/pkgs/by-name/gi/git-credential-oauth/package.nix
index 5dce5e3a02c1..df1abb977d41 100644
--- a/pkgs/by-name/gi/git-credential-oauth/package.nix
+++ b/pkgs/by-name/gi/git-credential-oauth/package.nix
@@ -35,7 +35,7 @@ buildGoModule rec {
     homepage = "https://github.com/hickford/git-credential-oauth";
     changelog = "https://github.com/hickford/git-credential-oauth/releases/tag/${src.rev}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ shyim ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "git-credential-oauth";
   };
 }
diff --git a/pkgs/by-name/lu/ludtwig/package.nix b/pkgs/by-name/lu/ludtwig/package.nix
index cab1a74a5069..e91c8c71c60e 100644
--- a/pkgs/by-name/lu/ludtwig/package.nix
+++ b/pkgs/by-name/lu/ludtwig/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/MalteJanz/ludtwig";
     license = licenses.mit;
     maintainers = with maintainers; [
-      shyim
       maltejanz
     ];
     mainProgram = "ludtwig";
diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix
index dfc07e36b6f7..c7ed5567b802 100644
--- a/pkgs/by-name/my/mysql84/package.nix
+++ b/pkgs/by-name/my/mysql84/package.nix
@@ -119,7 +119,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.gpl2;
     maintainers = with maintainers; [
       orivej
-      shyim
     ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/by-name/op/opensearch-cli/package.nix b/pkgs/by-name/op/opensearch-cli/package.nix
index 7a5c5d40cb7a..082905811338 100644
--- a/pkgs/by-name/op/opensearch-cli/package.nix
+++ b/pkgs/by-name/op/opensearch-cli/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
     homepage = "https://github.com/opensearch-project/opensearch-cli";
     license = lib.licenses.asl20;
     mainProgram = "opensearch-cli";
-    maintainers = with lib.maintainers; [ shyim ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.unix;
     sourceProvenance = with lib.sourceTypes; [ fromSource ];
   };
diff --git a/pkgs/by-name/op/opensearch/package.nix b/pkgs/by-name/op/opensearch/package.nix
index 68e6c81d5720..413b3e76aa03 100644
--- a/pkgs/by-name/op/opensearch/package.nix
+++ b/pkgs/by-name/op/opensearch/package.nix
@@ -61,7 +61,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Open Source, Distributed, RESTful Search Engine";
     homepage = "https://github.com/opensearch-project/OpenSearch";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ shyim ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.unix;
     sourceProvenance = with lib.sourceTypes; [
       binaryBytecode
diff --git a/pkgs/by-name/pl/platformsh/package.nix b/pkgs/by-name/pl/platformsh/package.nix
index e5960098085d..2f6d7c0a4b9a 100644
--- a/pkgs/by-name/pl/platformsh/package.nix
+++ b/pkgs/by-name/pl/platformsh/package.nix
@@ -65,7 +65,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     mainProgram = "platform";
     maintainers = with lib.maintainers; [
-      shyim
       spk
     ];
     platforms = [
diff --git a/pkgs/by-name/ro/roadrunner/package.nix b/pkgs/by-name/ro/roadrunner/package.nix
index 9b501b5433da..7a5d24f3afd9 100644
--- a/pkgs/by-name/ro/roadrunner/package.nix
+++ b/pkgs/by-name/ro/roadrunner/package.nix
@@ -56,6 +56,6 @@ buildGoModule rec {
     homepage = "https://roadrunner.dev";
     license = lib.licenses.mit;
     mainProgram = "rr";
-    maintainers = with lib.maintainers; [ shyim ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/vi/viceroy/package.nix b/pkgs/by-name/vi/viceroy/package.nix
index 35a933589796..e96f6919768a 100644
--- a/pkgs/by-name/vi/viceroy/package.nix
+++ b/pkgs/by-name/vi/viceroy/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.asl20;
     maintainers = with maintainers; [
       ereslibre
-      shyim
     ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/php-packages/zstd/default.nix b/pkgs/development/php-packages/zstd/default.nix
index 9774808cf1be..20ae6a2b83d4 100644
--- a/pkgs/development/php-packages/zstd/default.nix
+++ b/pkgs/development/php-packages/zstd/default.nix
@@ -30,6 +30,6 @@ buildPecl {
     description = "Zstd Extension for PHP";
     license = licenses.mit;
     homepage = "https://github.com/kjdev/php-ext-zstd";
-    maintainers = with lib.maintainers; [ shyim ];
+    maintainers = with lib.maintainers; [ ];
   };
 }

From 443f30f811f20431079e0321fb14d6e7460f5dac Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 19 Aug 2025 15:35:01 +0200
Subject: [PATCH 3123/3724] workflows/test: init

This workflow runs the PR and Push workflow files on a `pull_request`
trigger. The intent is to test changes to the workflow files
immediately. Previously, these were run directly from the respective
workflow files.

The new approach allows us to move the logic to run this only when
workflow files changed from the pull_request trigger into a job. This
has the advantage that older jobs are cleaned up, when the PR changes
from a state of "workflow files changed" to "no workflow files changed".
This can happen when changing a PR's base from staging to master, in
which case changes from master would temporarily appear in the PR as
changes. When these include changes to workflow files, this would
trigger the PR workflow via `pull_request`. Once the base is changed,
the PR is closed and re-opened, so CI runs again - but since it's on the
same commit and the new run doesn't trigger `pull_request`, the results
of the previous run are still kept and displayed. These results may
include cancelled or failed jobs, which are impossible to recover from
without another force-push.

Checking this condition at run-time is only possible, because we move it
into a separate workflow, turning the `pr.yml` workflow into a re-usable
workflow. This will make sure to skip the whole workflow at once, when
no change was detected, which will prevent the "no PR failures" job from
appearing as skipped - which would imply "success" and make the PR
mergeable immediately. Instead the "no PR failures" job is not shown at
all for this trigger, which is generally what we want.

Do the same for `push.yml` for consistency.
---
 .github/workflows/pr.yml        | 21 +++++-----
 .github/workflows/push.yml      |  8 ++--
 .github/workflows/reviewers.yml |  2 +-
 .github/workflows/test.yml      | 72 +++++++++++++++++++++++++++++++++
 ci/github-script/commits.js     |  2 +-
 5 files changed, 89 insertions(+), 16 deletions(-)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 82fdd1f3aa82..a7720df7226a 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -1,17 +1,18 @@
 name: PR
 
 on:
-  pull_request:
-    paths:
-      - .github/actions/checkout/action.yml
-      - .github/workflows/build.yml
-      - .github/workflows/check.yml
-      - .github/workflows/eval.yml
-      - .github/workflows/lint.yml
-      - .github/workflows/pr.yml
-      - .github/workflows/labels.yml
-      - .github/workflows/reviewers.yml # needs eval results from the same event type
   pull_request_target:
+  workflow_call:
+    secrets:
+      CACHIX_AUTH_TOKEN:
+        required: true
+      NIXPKGS_CI_APP_PRIVATE_KEY:
+        required: true
+      OWNER_APP_PRIVATE_KEY:
+        # The Test workflow should not actually request reviews from owners.
+        required: false
+      OWNER_RO_APP_PRIVATE_KEY:
+        required: true
 
 concurrency:
   group: pr-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index e980dbe42951..bb372f196b83 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -1,10 +1,6 @@
 name: Push
 
 on:
-  pull_request:
-    paths:
-      - .github/workflows/push.yml
-      # eval is tested via pr.yml
   push:
     # Keep this synced with ci/request-reviews/dev-branches.txt
     branches:
@@ -13,6 +9,10 @@ on:
       - release-*
       - staging-*
       - haskell-updates
+  workflow_call:
+    secrets:
+      CACHIX_AUTH_TOKEN:
+        required: true
 
 permissions: {}
 
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 5c2acb55a8de..9b3de2338553 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -95,7 +95,7 @@ jobs:
             const run_id = (await github.rest.actions.listWorkflowRuns({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              workflow_id: 'pr.yml',
+              workflow_id: context.eventName === 'pull_request' ? 'test.yml' : 'pr.yml',
               event: context.eventName,
               head_sha: context.payload.pull_request.head.sha
             })).data.workflow_runs[0].id
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000000000000..a90c13c3f738
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,72 @@
+name: Test
+
+on:
+  pull_request:
+
+concurrency:
+  group: test-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
+  cancel-in-progress: true
+
+permissions: {}
+
+jobs:
+  prepare:
+    runs-on: ubuntu-24.04-arm
+    outputs:
+      pr: ${{ steps.files.outputs.pr }}
+      push: ${{ steps.files.outputs.push }}
+    steps:
+      - name: Determine changed files
+        id: files
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            const files = (await github.paginate(github.rest.pulls.listFiles, {
+              ...context.repo,
+              pull_number: context.payload.pull_request.number,
+              per_page: 100,
+            })).map(file => file.filename)
+
+            if (files.some(file => [
+              '.github/actions/checkout/action.yml',
+              '.github/workflows/build.yml',
+              '.github/workflows/check.yml',
+              '.github/workflows/eval.yml',
+              '.github/workflows/labels.yml',
+              '.github/workflows/lint.yml',
+              '.github/workflows/pr.yml',
+              '.github/workflows/reviewers.yml',
+              '.github/workflows/test.yml',
+            ].includes(file))) core.setOutput('pr', true)
+
+            if (files.some(file => [
+              '.github/workflows/eval.yml',
+              '.github/workflows/push.yml',
+              '.github/workflows/test.yml',
+            ].includes(file))) core.setOutput('push', true)
+
+  pr:
+    if: needs.prepare.outputs.pr
+    name: PR
+    needs: [prepare]
+    uses: ./.github/workflows/pr.yml
+    # Those are not actually used on pull_request, but will throw an error if not set.
+    permissions:
+      issues: write
+      pull-requests: write
+      statuses: write
+    secrets:
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
+      NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+      OWNER_RO_APP_PRIVATE_KEY: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }}
+
+  push:
+    if: needs.prepare.outputs.push
+    name: Push
+    needs: [prepare]
+    uses: ./.github/workflows/push.yml
+    # Those are not actually used on push, but will throw an error if not set.
+    permissions:
+      statuses: write
+    secrets:
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index 1391779e79ff..242abda88658 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -16,7 +16,7 @@ module.exports = async ({ github, context, core, dry }) => {
           run_id: context.runId,
           per_page: 100,
         })
-      ).find(({ name }) => name === 'Check / cherry-pick').html_url +
+      ).find(({ name }) => name.endsWith('Check / cherry-pick')).html_url +
         '?pr=' +
         pull_number
 

From 06a0eba240350dd7def5133c9b67a97baa6a4e46 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 14:44:48 +0200
Subject: [PATCH 3124/3724] workflows/test: run push job on correct commit

Previously, the test for the push workflow was running on the HEAD
commit of the PR only. It would be better to run it on the merged result
instead, just like any other tests we run in a PR.
---
 .github/workflows/push.yml |  6 +++++-
 .github/workflows/test.yml | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index bb372f196b83..31d3932e2cd4 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -10,6 +10,10 @@ on:
       - staging-*
       - haskell-updates
   workflow_call:
+    inputs:
+      mergedSha:
+        required: true
+        type: string
     secrets:
       CACHIX_AUTH_TOKEN:
         required: true
@@ -43,5 +47,5 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
-      mergedSha: ${{ github.sha }}
+      mergedSha: ${{ inputs.mergedSha || github.sha }}
       systems: ${{ needs.prepare.outputs.systems }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a90c13c3f738..c28ca61817c5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,9 +13,27 @@ jobs:
   prepare:
     runs-on: ubuntu-24.04-arm
     outputs:
+      mergedSha: ${{ steps.prepare.outputs.mergedSha }}
       pr: ${{ steps.files.outputs.pr }}
       push: ${{ steps.files.outputs.push }}
     steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          sparse-checkout-cone-mode: true # default, for clarity
+          sparse-checkout: |
+            ci/github-script
+      - id: prepare
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            require('./ci/github-script/prepare.js')({
+              github,
+              context,
+              core,
+              // Review comments will be posted by the main PR workflow on the pull_request_target event.
+              dry: false,
+            })
+
       - name: Determine changed files
         id: files
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
@@ -70,3 +88,5 @@ jobs:
       statuses: write
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
+    with:
+      mergedSha: ${{ needs.prepare.outputs.mergedSha }}

From 534d41ee9c97d30abab3e953513b48cbeac58206 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 19 Aug 2025 15:38:44 +0200
Subject: [PATCH 3125/3724] workflows/test: test merge-group workflow

Changes to the merge-group workflow should also validate that the file
is hooked up correctly and works - otherwise we risk merging CI changes
that cause the merge queue to fail consistently.
---
 .github/workflows/merge-group.yml | 15 +++++++++++++--
 .github/workflows/test.yml        | 19 +++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml
index 9ed7125c76d2..dac02065debf 100644
--- a/.github/workflows/merge-group.yml
+++ b/.github/workflows/merge-group.yml
@@ -2,6 +2,17 @@ name: Merge Group
 
 on:
   merge_group:
+  workflow_call:
+    inputs:
+      mergedSha:
+        required: true
+        type: string
+      targetSha:
+        required: true
+        type: string
+    secrets:
+      CACHIX_AUTH_TOKEN:
+        required: true
 
 permissions: {}
 
@@ -12,8 +23,8 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
-      mergedSha: ${{ github.event.merge_group.head_sha }}
-      targetSha: ${{ github.event.merge_group.base_sha }}
+      mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }}
+      targetSha: ${{ inputs.targetSha || github.event.merge_group.base_sha }}
 
   # This job's only purpose is to serve as a target for the "Required Status Checks" branch ruleset.
   # It "needs" all the jobs that should block the Merge Queue.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c28ca61817c5..f26c371a5563 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,9 +13,11 @@ jobs:
   prepare:
     runs-on: ubuntu-24.04-arm
     outputs:
+      merge-group: ${{ steps.files.outputs.merge-group }}
       mergedSha: ${{ steps.prepare.outputs.mergedSha }}
       pr: ${{ steps.files.outputs.pr }}
       push: ${{ steps.files.outputs.push }}
+      targetSha: ${{ steps.prepare.outputs.targetSha }}
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
@@ -45,6 +47,12 @@ jobs:
               per_page: 100,
             })).map(file => file.filename)
 
+            if (files.some(file => [
+              '.github/workflows/lint.yml',
+              '.github/workflows/merge-group.yml',
+              '.github/workflows/test.yml',
+            ].includes(file))) core.setOutput('merge-group', true)
+
             if (files.some(file => [
               '.github/actions/checkout/action.yml',
               '.github/workflows/build.yml',
@@ -63,6 +71,17 @@ jobs:
               '.github/workflows/test.yml',
             ].includes(file))) core.setOutput('push', true)
 
+  merge-group:
+    if: needs.prepare.outputs.merge-group
+    name: Merge Group
+    needs: [prepare]
+    uses: ./.github/workflows/merge-group.yml
+    secrets:
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
+    with:
+      mergedSha: ${{ needs.prepare.outputs.mergedSha }}
+      targetSha: ${{ needs.prepare.outputs.targetSha }}
+
   pr:
     if: needs.prepare.outputs.pr
     name: PR

From 6f8511675a671ce9ef52934242212ba85be4483c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 10:13:00 +0000
Subject: [PATCH 3126/3724] n8n: 1.106.3 -> 1.107.4

---
 pkgs/by-name/n8/n8n/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index c6692c8e059f..57500ce6ba37 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -17,19 +17,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "n8n";
-  version = "1.106.3";
+  version = "1.107.4";
 
   src = fetchFromGitHub {
     owner = "n8n-io";
     repo = "n8n";
     tag = "n8n@${finalAttrs.version}";
-    hash = "sha256-lPZdpQlCNeoyFI3iHx2++RT3QYxdQMnCYTm4T+JVjHg=";
+    hash = "sha256-CbqxWRIw9NvKJKO/YEmnfYzZ03B6xXqr/J1qkZgpTtE=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-11hve7PEOjphvPbzeYnsDHtVOCZ3ZYKoA9zUDM+rYxM=";
+    hash = "sha256-smSj/4E4Ix0kvWhuRTvJkFbhZRgDI55//WScOLU7R/8=";
   };
 
   nativeBuildInputs = [

From b6bbf7b2509cf967934baa3bbe5502cdd7fa7151 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 21 Aug 2025 15:08:23 +0200
Subject: [PATCH 3127/3724] workflows/check: always run commits job

This is the very first step to extending the commits job to do more than
just cherry-picks in the future: It could check reverts or merge
commits, but also the commit message format and more.

Of course, cherry-picks are still just checked on the stable branches as
before. For now, this allows us to run the part that dismisses automated
reviews automatically. This helps us when we do branch related checks in
the prepare step, which would also create such a review. To avoid
cluttering multiple reviews across a PR, we'll want all of these reviews
to be handled by the same code, thus this change.
---
 .github/workflows/check.yml | 11 ++++++-----
 ci/github-script/commits.js | 20 +++++++++++++-------
 ci/github-script/run        | 12 +++++++-----
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index ded8bad536c4..cace4dd2259c 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -42,10 +42,7 @@ jobs:
           EOF
           exit 1
 
-  cherry-pick:
-    if: |
-      github.event_name == 'pull_request' ||
-      (fromJSON(inputs.baseBranch).stable && !contains(fromJSON(inputs.headBranch).type, 'development'))
+  commits:
     permissions:
       pull-requests: write
     runs-on: ubuntu-24.04-arm
@@ -65,16 +62,20 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: gh api /rate_limit | jq
 
-      - name: Check cherry-picks
+      - name: Check commits
         id: check
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        env:
+          TARGETS_STABLE: ${{ fromJSON(inputs.baseBranch).stable && !contains(fromJSON(inputs.headBranch).type, 'development') }}
         with:
           script: |
+            const targetsStable = JSON.parse(process.env.TARGETS_STABLE)
             require('./trusted/ci/github-script/commits.js')({
               github,
               context,
               core,
               dry: context.eventName == 'pull_request',
+              cherryPicks: context.eventName == 'pull_request' || targetsStable,
             })
 
       - name: Log current API rate limits
diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index 242abda88658..92e1265c4747 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -1,4 +1,4 @@
-module.exports = async ({ github, context, core, dry }) => {
+module.exports = async ({ github, context, core, dry, cherryPicks }) => {
   const { execFileSync } = require('node:child_process')
   const { classify } = require('../supportedBranches.js')
   const withRateLimit = require('./withRateLimit.js')
@@ -16,7 +16,7 @@ module.exports = async ({ github, context, core, dry }) => {
           run_id: context.runId,
           per_page: 100,
         })
-      ).find(({ name }) => name.endsWith('Check / cherry-pick')).html_url +
+      ).find(({ name }) => name.endsWith('Check / commits')).html_url +
         '?pr=' +
         pull_number
 
@@ -137,10 +137,14 @@ module.exports = async ({ github, context, core, dry }) => {
       }
     }
 
-    const commits = await github.paginate(github.rest.pulls.listCommits, {
-      ...context.repo,
-      pull_number,
-    })
+    // For now we short-circuit the list of commits when cherryPicks should not be checked.
+    // This will not run any checks, but still trigger the "dismiss reviews" part below.
+    const commits = !cherryPicks
+      ? []
+      : await github.paginate(github.rest.pulls.listCommits, {
+          ...context.repo,
+          pull_number,
+        })
 
     const extracted = await Promise.all(commits.map(extract))
 
@@ -185,6 +189,8 @@ module.exports = async ({ github, context, core, dry }) => {
 
     // Only create step summary below in case of warnings or errors.
     // Also clean up older reviews, when all checks are good now.
+    // An empty results array will always trigger this condition, which is helpful
+    // to clean up reviews created by the prepare step when on the wrong branch.
     if (results.every(({ severity }) => severity === 'info')) {
       if (!dry) {
         await Promise.all(
@@ -201,7 +207,7 @@ module.exports = async ({ github, context, core, dry }) => {
                   ...context.repo,
                   pull_number,
                   review_id: review.id,
-                  message: 'All cherry-picks are good now, thank you!',
+                  message: 'All good now, thank you!',
                 })
               }
               await github.graphql(
diff --git a/ci/github-script/run b/ci/github-script/run
index ae107df73b51..17dac5ab3a2d 100755
--- a/ci/github-script/run
+++ b/ci/github-script/run
@@ -7,7 +7,7 @@ import { program } from 'commander'
 import * as core from '@actions/core'
 import { getOctokit } from '@actions/github'
 
-async function run(action, owner, repo, pull_number, dry = true) {
+async function run(action, owner, repo, pull_number, options = {}) {
   const token = execSync('gh auth token', { encoding: 'utf-8' }).trim()
 
   const github = getOctokit(token)
@@ -35,7 +35,8 @@ async function run(action, owner, repo, pull_number, dry = true) {
       },
     },
     core,
-    dry,
+    dry: true,
+    ...options,
   })
 }
 
@@ -56,9 +57,10 @@ program
   .argument('<owner>', 'Owner of the GitHub repository to check (Example: NixOS)')
   .argument('<repo>', 'Name of the GitHub repository to check (Example: nixpkgs)')
   .argument('<pr>', 'Number of the Pull Request to check')
-  .action(async (owner, repo, pr) => {
+  .option('--no-cherry-picks', 'Do not expect cherry-picks.')
+  .action(async (owner, repo, pr, options) => {
     const commits = (await import('./commits.js')).default
-    run(commits, owner, repo, pr)
+    run(commits, owner, repo, pr, options)
   })
 
 program
@@ -74,7 +76,7 @@ program
     try {
       process.env.GITHUB_WORKSPACE = tmp
       process.chdir(tmp)
-      run(labels, owner, repo, pr, options.dry)
+      run(labels, owner, repo, pr, options)
     } finally {
       rmSync(tmp, { recursive: true })
     }

From c96b0e6d3df6c2cc5a156595ac2b3d4d00fd92e2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 21 Aug 2025 16:25:53 +0200
Subject: [PATCH 3128/3724] ci/github-script/commits: split review function
 into separate file

This allows re-using postReview in the next commit.
---
 ci/github-script/commits.js | 77 +++------------------------------
 ci/github-script/reviews.js | 85 +++++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 71 deletions(-)
 create mode 100644 ci/github-script/reviews.js

diff --git a/ci/github-script/commits.js b/ci/github-script/commits.js
index 92e1265c4747..241bc95ee1b5 100644
--- a/ci/github-script/commits.js
+++ b/ci/github-script/commits.js
@@ -2,6 +2,7 @@ module.exports = async ({ github, context, core, dry, cherryPicks }) => {
   const { execFileSync } = require('node:child_process')
   const { classify } = require('../supportedBranches.js')
   const withRateLimit = require('./withRateLimit.js')
+  const { dismissReviews, postReview } = require('./reviews.js')
 
   await withRateLimit({ github, core }, async (stats) => {
     stats.prs = 1
@@ -192,37 +193,7 @@ module.exports = async ({ github, context, core, dry, cherryPicks }) => {
     // An empty results array will always trigger this condition, which is helpful
     // to clean up reviews created by the prepare step when on the wrong branch.
     if (results.every(({ severity }) => severity === 'info')) {
-      if (!dry) {
-        await Promise.all(
-          (
-            await github.paginate(github.rest.pulls.listReviews, {
-              ...context.repo,
-              pull_number,
-            })
-          )
-            .filter((review) => review.user.login === 'github-actions[bot]')
-            .map(async (review) => {
-              if (review.state === 'CHANGES_REQUESTED') {
-                await github.rest.pulls.dismissReview({
-                  ...context.repo,
-                  pull_number,
-                  review_id: review.id,
-                  message: 'All good now, thank you!',
-                })
-              }
-              await github.graphql(
-                `mutation($node_id:ID!) {
-                  minimizeComment(input: {
-                    classifier: RESOLVED,
-                    subjectId: $node_id
-                  })
-                  { clientMutationId }
-                }`,
-                { node_id: review.node_id },
-              )
-            }),
-        )
-      }
+      await dismissReviews({ github, context, dry })
       return
     }
 
@@ -342,45 +313,9 @@ module.exports = async ({ github, context, core, dry, cherryPicks }) => {
     const body = core.summary.stringify()
     core.summary.write()
 
-    const pendingReview = (
-      await github.paginate(github.rest.pulls.listReviews, {
-        ...context.repo,
-        pull_number,
-      })
-    ).find(
-      (review) =>
-        review.user.login === 'github-actions[bot]' &&
-        // If a review is still pending, we can just update this instead
-        // of posting a new one.
-        (review.state === 'CHANGES_REQUESTED' ||
-          // No need to post a new review, if an older one with the exact
-          // same content had already been dismissed.
-          review.body === body),
-    )
-
-    if (dry) {
-      if (pendingReview)
-        core.info(`pending review found: ${pendingReview.html_url}`)
-      else core.info('no pending review found')
-    } else {
-      // Either of those two requests could fail for very long comments. This can only happen
-      // with multiple commits all hitting the truncation limit for the diff. If you ever hit
-      // this case, consider just splitting up those commits into multiple PRs.
-      if (pendingReview) {
-        await github.rest.pulls.updateReview({
-          ...context.repo,
-          pull_number,
-          review_id: pendingReview.id,
-          body,
-        })
-      } else {
-        await github.rest.pulls.createReview({
-          ...context.repo,
-          pull_number,
-          event: 'REQUEST_CHANGES',
-          body,
-        })
-      }
-    }
+    // Posting a review could fail for very long comments. This can only happen with
+    // multiple commits all hitting the truncation limit for the diff. If you ever hit
+    // this case, consider just splitting up those commits into multiple PRs.
+    await postReview({ github, context, core, dry, body })
   })
 }
diff --git a/ci/github-script/reviews.js b/ci/github-script/reviews.js
new file mode 100644
index 000000000000..107ec3975c98
--- /dev/null
+++ b/ci/github-script/reviews.js
@@ -0,0 +1,85 @@
+async function dismissReviews({ github, context, dry }) {
+  const pull_number = context.payload.pull_request.number
+
+  if (dry) {
+    return
+  }
+
+  await Promise.all(
+    (
+      await github.paginate(github.rest.pulls.listReviews, {
+        ...context.repo,
+        pull_number,
+      })
+    )
+      .filter((review) => review.user.login === 'github-actions[bot]')
+      .map(async (review) => {
+        if (review.state === 'CHANGES_REQUESTED') {
+          await github.rest.pulls.dismissReview({
+            ...context.repo,
+            pull_number,
+            review_id: review.id,
+            message: 'All good now, thank you!',
+          })
+        }
+        await github.graphql(
+          `mutation($node_id:ID!) {
+            minimizeComment(input: {
+              classifier: RESOLVED,
+              subjectId: $node_id
+            })
+            { clientMutationId }
+          }`,
+          { node_id: review.node_id },
+        )
+      }),
+  )
+}
+
+async function postReview({ github, context, core, dry, body }) {
+  const pull_number = context.payload.pull_request.number
+
+  const pendingReview = (
+    await github.paginate(github.rest.pulls.listReviews, {
+      ...context.repo,
+      pull_number,
+    })
+  ).find(
+    (review) =>
+      review.user.login === 'github-actions[bot]' &&
+      // If a review is still pending, we can just update this instead
+      // of posting a new one.
+      (review.state === 'CHANGES_REQUESTED' ||
+        // No need to post a new review, if an older one with the exact
+        // same content had already been dismissed.
+        review.body === body),
+  )
+
+  if (dry) {
+    if (pendingReview)
+      core.info(`pending review found: ${pendingReview.html_url}`)
+    else core.info('no pending review found')
+    core.info(body)
+  } else {
+    if (pendingReview) {
+      await github.rest.pulls.updateReview({
+        ...context.repo,
+        pull_number,
+        review_id: pendingReview.id,
+        body,
+      })
+    } else {
+      await github.rest.pulls.createReview({
+        ...context.repo,
+        pull_number,
+        event: 'REQUEST_CHANGES',
+        body,
+      })
+    }
+  }
+}
+
+module.exports = {
+  dismissReviews,
+  postReview,
+}

From a72c704caa4d5f3a7efca286f3ff790edb007999 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Aug 2025 11:17:00 +0000
Subject: [PATCH 3129/3724] networkmanager-openvpn: 1.12.0 -> 1.12.2

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

diff --git a/pkgs/by-name/ne/networkmanager-openvpn/package.nix b/pkgs/by-name/ne/networkmanager-openvpn/package.nix
index 56e02c52ea7b..0271e693bde8 100644
--- a/pkgs/by-name/ne/networkmanager-openvpn/package.nix
+++ b/pkgs/by-name/ne/networkmanager-openvpn/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "NetworkManager-openvpn";
-  version = "1.12.0";
+  version = "1.12.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor finalAttrs.version}/NetworkManager-openvpn-${finalAttrs.version}.tar.xz";
-    sha256 = "kD/UwK69KqescMnYwr7Y35ImVdItdkUUQDVmrom36IY=";
+    sha256 = "qhtfmt341kvIxFk2HPDV4+uZ8Utg6oKjUAYxkor2Km8=";
   };
 
   patches = [

From 6d4e89ee0864d5063dd97bf710498e529bafc9bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 10:25:27 +0000
Subject: [PATCH 3130/3724] go-xmlstruct: 1.11.1 -> 1.11.2

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

diff --git a/pkgs/by-name/go/go-xmlstruct/package.nix b/pkgs/by-name/go/go-xmlstruct/package.nix
index 4b2b0a9ef29a..78ce7fbf19b5 100644
--- a/pkgs/by-name/go/go-xmlstruct/package.nix
+++ b/pkgs/by-name/go/go-xmlstruct/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-xmlstruct";
-  version = "1.11.1";
+  version = "1.11.2";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "go-xmlstruct";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FS3rFiYpaw6DlttyvJUcPc4ZDQRj5kBYwGxTWb+AAho=";
+    hash = "sha256-wkU8YIE3+kuC8g1/qNnW/nLxsDktS2NNTI88GWdwbLw=";
   };
 
   vendorHash = "sha256-myt5JjEDnLfkYkB+yb/oaH4dgIOB9qFcqcEb6KO5vBk=";

From bd8420d9c5ab3b03f9892b6cc8c8771674573240 Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Fri, 22 Aug 2025 20:21:02 +0200
Subject: [PATCH 3131/3724] phpPackages.composer: 2.8.5 -> 2.8.11, add
 completion, adopt

---
 pkgs/build-support/php/pkgs/composer-phar.nix     | 15 +++++++++++++--
 .../development/php-packages/composer/default.nix |  8 ++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/php/pkgs/composer-phar.nix b/pkgs/build-support/php/pkgs/composer-phar.nix
index 90884d9a5256..82dcdeaf535d 100644
--- a/pkgs/build-support/php/pkgs/composer-phar.nix
+++ b/pkgs/build-support/php/pkgs/composer-phar.nix
@@ -11,6 +11,8 @@
   xz,
   version,
   pharHash,
+  installShellFiles,
+  stdenv,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -24,7 +26,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   dontUnpack = true;
 
-  nativeBuildInputs = [ makeBinaryWrapper ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    installShellFiles
+  ];
 
   installPhase = ''
     runHook preInstall
@@ -46,13 +51,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd composer \
+      --bash <($out/bin/composer completion bash)
+  '';
+
   meta = {
     changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}";
     description = "Dependency Manager for PHP, shipped from the PHAR file";
     homepage = "https://getcomposer.org/";
     license = lib.licenses.mit;
     mainProgram = "composer";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ lib.maintainers.patka ];
+    teams = [ lib.teams.php ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix
index 6dd3d98830db..986347de7f4c 100644
--- a/pkgs/development/php-packages/composer/default.nix
+++ b/pkgs/development/php-packages/composer/default.nix
@@ -16,13 +16,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "composer";
-  version = "2.8.5";
+  version = "2.8.11";
 
   # Hash used by ../../../build-support/php/pkgs/composer-phar.nix to
   # use together with the version from this package to keep the
   # bootstrap phar file up-to-date together with the end user composer
   # package.
-  passthru.pharHash = "sha256-nO8YIS4iI1GutHa4HeeypTg/d1M2R0Rnv1x8z+hKsMw=";
+  passthru.pharHash = "sha256-JXqWnpqdJ+DkXP6VSDXBenYDO6hKOI4PRy24Pt7WWos=";
 
   composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix {
     inherit (finalAttrs) version;
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "composer";
     repo = "composer";
     tag = finalAttrs.version;
-    hash = "sha256-/E/fXh+jefPwzsADpmGyrJ+xqW5CSPNok0DVLD1KZDY=";
+    hash = "sha256-ufkrrCnIwJHtAsjKdaFzlJkCH0i7Tm17+eIqgSqDwlE=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];
@@ -87,7 +87,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "sha256-UcMB0leKqD8cXeExXpjDgPvF8pfhGXnCR0EN4FVWouw=";
+    outputHash = "sha256-elh3zgN4DJK0lY6TDRGWfBjmnWZzy7s1sMWe34RsLEE=";
   };
 
   installPhase = ''

From 5520631943d2ea53d95fed5f65e9a44014ea4e84 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 10:42:28 +0000
Subject: [PATCH 3132/3724] python3Packages.dragonmapper: 0.2.7 -> 0.3.0

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

diff --git a/pkgs/development/python-modules/dragonmapper/default.nix b/pkgs/development/python-modules/dragonmapper/default.nix
index 779ba542e9ca..2620025e6f62 100644
--- a/pkgs/development/python-modules/dragonmapper/default.nix
+++ b/pkgs/development/python-modules/dragonmapper/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "dragonmapper";
-  version = "0.2.7";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tsroten";
     repo = "dragonmapper";
     tag = "v${version}";
-    hash = "sha256-/02vcjcsUpQA1R1hcp34g/MSzNrKwuEyY5ERQQ5Vemw=";
+    hash = "sha256-3SRSu/9cpg2YcEuPFxBXg6KHgRSX5SiMAFbyE40m6ks=";
   };
 
   build-system = [ hatchling ];

From d8fae0591af082a1bc6366a4b63d643ad4c0ea97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 14:37:59 +0000
Subject: [PATCH 3133/3724] cent: 1.3.4 -> 2.0.0

---
 pkgs/by-name/ce/cent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ce/cent/package.nix b/pkgs/by-name/ce/cent/package.nix
index 46d7367b4c63..9706182283b0 100644
--- a/pkgs/by-name/ce/cent/package.nix
+++ b/pkgs/by-name/ce/cent/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "cent";
-  version = "1.3.4";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "xm1k3";
     repo = "cent";
     tag = "v${version}";
-    hash = "sha256-xwGmBZgdpyYJ1AKoNUUPEMbU5/racalE4SLrx/E51wM=";
+    hash = "sha256-AmOq+n+TcpwDgFjFsFNVl/fAIAJbqYdoR2P1dasb8h8=";
   };
 
-  vendorHash = "sha256-GMnTIEnkOt0cRN9pZzEuqqtWmO27uVja9VG5UNeCHJo=";
+  vendorHash = "sha256-sn4ZIDP07u9dwVJHy7KrQFZHsGrqpkM8CzcIbNMDiIo=";
 
   ldflags = [
     "-s"

From 9aca6057ebbdc81a0c4e57b1264d23065a7a2386 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Aug 2025 13:07:08 +0000
Subject: [PATCH 3134/3724] typos-lsp: 0.1.40 -> 0.1.41

---
 pkgs/by-name/ty/typos-lsp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix
index 1e9a9148bb2f..2dfc93d878f4 100644
--- a/pkgs/by-name/ty/typos-lsp/package.nix
+++ b/pkgs/by-name/ty/typos-lsp/package.nix
@@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec {
   pname = "typos-lsp";
   # Please update the corresponding VSCode extension too.
   # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
-  version = "0.1.40";
+  version = "0.1.41";
 
   src = fetchFromGitHub {
     owner = "tekumara";
     repo = "typos-lsp";
     tag = "v${version}";
-    hash = "sha256-O8TikrjFpmZ7PX7KmnErMW3OE6BoAlSAeZGD9qOEfog=";
+    hash = "sha256-DJnq0PtRGYRgC0JhR8myeIddBTAvP+Ey3+qEZi75EmQ=";
   };
 
-  cargoHash = "sha256-V6uYmnsbWuQc002hdDfc/B1mzrS7xu0xcR/6m2oxyMU=";
+  cargoHash = "sha256-OSTPVLVLl3LaijEorcSSscOMiDfgIGRXSvaFMKJ+hq0=";
 
   # fix for compilation on aarch64
   # see https://github.com/NixOS/nixpkgs/issues/145726

From 48f3c9e441d2080fde07537e2f6ded26ddba4baa Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 24 Aug 2025 13:18:46 +0200
Subject: [PATCH 3135/3724] vscode-extensions.tekumara.typos-vscode: 0.1.40 ->
 0.1.41

---
 .../extensions/tekumara.typos-vscode/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
index 079afeaf0cc4..f681eb3b11e2 100644
--- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
@@ -14,19 +14,19 @@ let
     {
       x86_64-linux = {
         arch = "linux-x64";
-        hash = "sha256-lxslDmnBA5TSFH/5J5Mt/TYsiE+5noQXCnHKAfA7mko=";
+        hash = "sha256-2hmkSgS3r4ghAXA8E0blWhe7kLvtZoApSRWXf6Ff5AE=";
       };
       aarch64-linux = {
         arch = "linux-arm64";
-        hash = "sha256-hCRtlgRNO49D9YrmPcw+guNwk6RE+mLi9MrJTKI+FdU=";
+        hash = "sha256-XVygGMHtEhk+Fttd/xdZr5Yau9P3yCSo43RrXhqh/PQ=";
       };
       x86_64-darwin = {
         arch = "darwin-x64";
-        hash = "sha256-CCsYPdiepfKa5s51ZZT/Rn9PoI4IKzGV+ztNkoQb9eo=";
+        hash = "sha256-8awJFJVSo6ru3ej4utkTF/5eK4dMw63Z3KHNHRRFSBs=";
       };
       aarch64-darwin = {
         arch = "darwin-arm64";
-        hash = "sha256-JOJf5JI46eBjSJ26aIe2nJ8TGHFsXsDNkIoCV9upSRA=";
+        hash = "sha256-JNik8Q9/BDjjuLVNJFOazyH9/a4s2HmkuENLQlDdKP4=";
       };
     }
     .${system} or (throw "Unsupported system: ${system}");
@@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     # Please update the corresponding binary (typos-lsp)
     # when updating this extension.
     # See pkgs/by-name/ty/typos-lsp/package.nix
-    version = "0.1.40";
+    version = "0.1.41";
     inherit (extInfo) hash arch;
   };
 

From a0c53ddfb2e1104c3c81fa95b7bba0b3c121e61c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 10:34:39 +0000
Subject: [PATCH 3136/3724] rmfuse: unstable-2021-06-06 -> 0.2.3

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

diff --git a/pkgs/by-name/rm/rmfuse/package.nix b/pkgs/by-name/rm/rmfuse/package.nix
index 25de3b42ca68..830fff401bf6 100644
--- a/pkgs/by-name/rm/rmfuse/package.nix
+++ b/pkgs/by-name/rm/rmfuse/package.nix
@@ -6,7 +6,7 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "rmfuse";
-  version = "unstable-2021-06-06";
+  version = "0.2.3";
 
   pyproject = true;
 

From b8a35d1d1534f2cbbb3c757613c8599dbef0d9b3 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Sun, 24 Aug 2025 12:49:05 +0100
Subject: [PATCH 3137/3724] npins: remove explicit dependency on nix

from what i can see other packages that depend on nix don't seem to add
it to the PATH but rather assume you have nix already in your PATH.

e.g.
https://github.com/NixOS/nixpkgs/blob/20075955deac2583bb12f07151c2df830ef346b4/pkgs/by-name/nv/nvd/package.nix
https://github.com/NixOS/nixpkgs/blob/20075955deac2583bb12f07151c2df830ef346b4/pkgs/by-name/li/lix-diff/package.nix
https://github.com/NixOS/nixpkgs/blob/20075955deac2583bb12f07151c2df830ef346b4/pkgs/tools/package-management/nix-prefetch-scripts/default.nix#L49
---
 pkgs/by-name/np/npins/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/np/npins/package.nix b/pkgs/by-name/np/npins/package.nix
index f7614a447257..8d10fcab54b5 100644
--- a/pkgs/by-name/np/npins/package.nix
+++ b/pkgs/by-name/np/npins/package.nix
@@ -5,14 +5,12 @@
   makeWrapper,
 
   # runtime dependencies
-  nix, # for nix-prefetch-url
   nix-prefetch-git,
   git, # for git ls-remote
 }:
 
 let
   runtimePath = lib.makeBinPath [
-    nix
     nix-prefetch-git
     git
   ];

From 4218a1dc47ad05cebba4a33b389632e6716f6b0f Mon Sep 17 00:00:00 2001
From: Zhong Jianxin <azuwis@gmail.com>
Date: Sun, 24 Aug 2025 19:55:16 +0800
Subject: [PATCH 3138/3724] chameleon-cli: 2.0.0-unstable-2025-08-04 ->
 2.0.0-unstable-2025-08-19

Also remove patch that already merged upstream
---
 pkgs/by-name/ch/chameleon-cli/package.nix | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ch/chameleon-cli/package.nix b/pkgs/by-name/ch/chameleon-cli/package.nix
index fec07c514110..5fa514d7db20 100644
--- a/pkgs/by-name/ch/chameleon-cli/package.nix
+++ b/pkgs/by-name/ch/chameleon-cli/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   makeWrapper,
   xz,
@@ -22,29 +21,18 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "chameleon-cli";
-  version = "2.0.0-unstable-2025-08-04";
+  version = "2.0.0-unstable-2025-08-19";
 
   src = fetchFromGitHub {
     owner = "RfidResearchGroup";
     repo = "ChameleonUltra";
-    rev = "098e0a914b206900f7ea7ae7265486c4349ab644";
+    rev = "09870c3fc5094fee779b821feaae31397d4f040c";
     sparseCheckout = [ "software" ];
-    hash = "sha256-WKxP4jLHkTqBO+nwxhr8DRb3TzDIMlwjA4v+6txQbDo=";
+    hash = "sha256-ePY602AT9+LBRcVLWR7I46rV+6JK0HYcb9iy/UQwmwU=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/software";
 
-  patches = [
-    # Use execute_tool to simplify running hardnested tool,
-    # also fix when the dir conatains hardnested is read only
-    # https://github.com/RfidResearchGroup/ChameleonUltra/pull/266
-    (fetchpatch {
-      url = "https://github.com/RfidResearchGroup/ChameleonUltra/commit/39270fd09ee61ef0659bf3b79ffa4d2b27f3ba63.patch";
-      hash = "sha256-OlHQ2cL+NFdTsSPFI9geg3dabATRjyKxGp5gGG+eDl8=";
-      stripLen = 1;
-    })
-  ];
-
   postPatch = ''
     substituteInPlace src/CMakeLists.txt \
       --replace-fail "liblzma" "lzma" \

From 6770ea5ddde1d5dece5baf96e8434c380449b232 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 24 Aug 2025 13:58:41 +0200
Subject: [PATCH 3139/3724] gnumeric: switch to gitlab sources, fix build

- switch to gitlab sources to avoid bad pre-baked autotools artifacts
- run autogen.sh to refresh po-functions/Makefile.in.in with correct intltool
- supply build dependencies that were previously unnecessary
    due to using pre-baked autotools artifacts
- remove `with lib;` from meta
---
 pkgs/by-name/gn/gnumeric/package.nix | 32 +++++++++++++++++++---------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/gn/gnumeric/package.nix b/pkgs/by-name/gn/gnumeric/package.nix
index 12a5ed975906..03c5237b67b1 100644
--- a/pkgs/by-name/gn/gnumeric/package.nix
+++ b/pkgs/by-name/gn/gnumeric/package.nix
@@ -2,8 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  autoconf,
-  automake,
   pkg-config,
   intltool,
   libxml2,
@@ -17,6 +15,11 @@
   bison,
   python3Packages,
   itstool,
+  autoreconfHook,
+  gtk-doc,
+  fetchFromGitLab,
+  gettext,
+  yelp-tools,
 }:
 
 let
@@ -26,16 +29,25 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "gnumeric";
   version = "1.12.59";
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnumeric/${lib.versions.majorMinor finalAttrs.version}/gnumeric-${finalAttrs.version}.tar.xz";
-    sha256 = "yzdQsXbWQflCPfchuDFljIKVV1UviIf+34pT2Qfs61E=";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "gnumeric";
+    tag = "GNUMERIC_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
+    hash = "sha256-7xCDOqPx3QLDHLoKG46e8te4smSFrLOgCcWkiJXGjDQ=";
   };
 
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
   configureFlags = [ "--disable-component" ];
 
   nativeBuildInputs = [
-    autoconf
-    automake
+    autoreconfHook
+    gettext
+    gtk-doc
+    yelp-tools
     pkg-config
     intltool
     bison
@@ -74,11 +86,11 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "GNOME Office Spreadsheet";
     license = lib.licenses.gpl2Plus;
     homepage = "http://projects.gnome.org/gnumeric/";
-    platforms = platforms.unix;
-    maintainers = [ maintainers.vcunat ];
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.vcunat ];
   };
 })

From c5914302a0f349c722856b05033874ee769fcedd Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 24 Aug 2025 12:12:22 +0000
Subject: [PATCH 3140/3724] =?UTF-8?q?python3Packages.temporalio:=201.15.0?=
 =?UTF-8?q?=20=E2=86=92=201.16.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix
index 2a8775ca4b86..53c977258832 100644
--- a/pkgs/development/python-modules/temporalio/default.nix
+++ b/pkgs/development/python-modules/temporalio/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "temporalio";
-  version = "1.15.0";
+  version = "1.16.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "temporalio";
     repo = "sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-NY7+ryldTV60K1Ky9Q1iNEmXqXlZgSMEE4f6PGeZ5BE=";
+    hash = "sha256-PwU50Xa87bjJQXqHcovZBByYwwFp7ar7qHYsdFIrnhA=";
     fetchSubmodules = true;
   };
 
@@ -41,7 +41,7 @@ buildPythonPackage rec {
       src
       cargoRoot
       ;
-    hash = "sha256-Z0LxIGY7af1tcRTcMe4FDCH1zxzX1J9AJuZfZUMAAUI=";
+    hash = "sha256-yE5mShJ++Zx+5AwsotGn20b7dC6BEbTiIy1xST9du+U=";
   };
 
   cargoRoot = "temporalio/bridge";

From 62dda3ae411f497e2982dc34406a73f63162dbae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 12:42:23 +0000
Subject: [PATCH 3141/3724] xpipe: 17.4 -> 18.0.1

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

diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix
index ab8c967e6fe5..211ca2d1cad8 100644
--- a/pkgs/by-name/xp/xpipe/package.nix
+++ b/pkgs/by-name/xp/xpipe/package.nix
@@ -39,7 +39,7 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-r6vrE3rdFFYIQDCxLn/K/IEQZMWi6ic7Hsa3jGQnlhU=";
+      x86_64-linux = "sha256-Z/hrrrHS1IgecPSUHZ0u0yNFEyZsohPF52jgeMPQr28=";
     }
     .${system} or throwSystem;
 
@@ -48,7 +48,7 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "xpipe";
-  version = "17.4";
+  version = "18.0.1";
 
   src = fetchzip {
     url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";

From d877589762b895661e73e8616f4d60be85fb6121 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 12:45:04 +0000
Subject: [PATCH 3142/3724] video-compare: 20250420 -> 20250824

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

diff --git a/pkgs/by-name/vi/video-compare/package.nix b/pkgs/by-name/vi/video-compare/package.nix
index 5db6f0777e1a..da597e00712e 100644
--- a/pkgs/by-name/vi/video-compare/package.nix
+++ b/pkgs/by-name/vi/video-compare/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "video-compare";
-  version = "20250420";
+  version = "20250824";
 
   src = fetchFromGitHub {
     owner = "pixop";
     repo = "video-compare";
     tag = version;
-    hash = "sha256-q61ZT2a2AkYWk4v2oZqCLHVu5eZQQrDLgD8vxitGyA4=";
+    hash = "sha256-4gJIit0GcjYKPZUFoKbMufA1UcfXexBncDUHX3IOqes=";
   };
 
   postPatch = ''

From 0e35e768a2e997841e8a427e70422656793cb827 Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Sun, 24 Aug 2025 09:22:52 -0400
Subject: [PATCH 3143/3724] jai: 0.2.012 -> 0.2.017

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

diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix
index b675790b0cd6..5e9acfed111c 100644
--- a/pkgs/by-name/ja/jai/package.nix
+++ b/pkgs/by-name/ja/jai/package.nix
@@ -9,7 +9,7 @@
 let
   pname = "jai";
   minor = "2";
-  patch = "012";
+  patch = "017";
   version = "0.${minor}.${patch}";
   zipName = "jai-beta-${minor}-${patch}.zip";
   jai = stdenv.mkDerivation {
@@ -20,7 +20,7 @@ let
           nix-store --add-fixed sha256 ${zipName}
       '';
       name = zipName;
-      sha256 = "sha256-1cUEQ+C3qwo3v4E2ioH2NcIH864Cay2dxQT+Yo/fZJ8=";
+      sha256 = "sha256-qVBF71qpFXfBkke9vCs7Wq/+P7ZQIgg4l1iLw8NmQhA=";
     };
     nativeBuildInputs = [ unzip ];
     buildCommand = "unzip $src -d $out";

From f7ea7cb07ebff722a19c3c2fe21cc08ca0fea342 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 13:31:57 +0000
Subject: [PATCH 3144/3724] minijinja: 2.11.0 -> 2.12.0

---
 pkgs/by-name/mi/minijinja/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix
index 5f86326d9268..91ab020ea88a 100644
--- a/pkgs/by-name/mi/minijinja/package.nix
+++ b/pkgs/by-name/mi/minijinja/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "minijinja";
-  version = "2.11.0";
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "mitsuhiko";
     repo = "minijinja";
     rev = version;
-    hash = "sha256-0qRQuYhta4RUNy8Ac+SSCad172vVshddDS6mizSqO2A=";
+    hash = "sha256-R/bnJx0JygrcMvGDl2YBdGNziKBOds3azGj1IHzpU2Q=";
   };
 
-  cargoHash = "sha256-zE0n+vkkJ1R8eT/Tetqx6GSITB6xM/9SgrEB/9pAkqw=";
+  cargoHash = "sha256-SKnq/CbpPnUvjqWGt8Val/xKcqxpj7jCI4ABI8t4Lao=";
 
   # The tests relies on the presence of network connection
   doCheck = false;

From 91202448f8d8361e1c7c862ab74b82e6e0f523af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 13:43:16 +0000
Subject: [PATCH 3145/3724] kodiPackages.netflix: 1.23.4 -> 1.23.5

---
 pkgs/applications/video/kodi/addons/netflix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix
index 76ec7fd1d242..4d61e5c73ef5 100644
--- a/pkgs/applications/video/kodi/addons/netflix/default.nix
+++ b/pkgs/applications/video/kodi/addons/netflix/default.nix
@@ -12,13 +12,13 @@
 buildKodiAddon rec {
   pname = "netflix";
   namespace = "plugin.video.netflix";
-  version = "1.23.4";
+  version = "1.23.5";
 
   src = fetchFromGitHub {
     owner = "CastagnaIT";
     repo = namespace;
     rev = "v${version}";
-    hash = "sha256-yq5XNhKQSBh7r/2apHXLMjhovV6xhL9DcDwXn9nt0KQ=";
+    hash = "sha256-IIRut99AH08Z3udTkzUf2wz7dQMA94dOnfROm7iM9RM=";
   };
 
   propagatedBuildInputs = [

From e83a6c6443ae91f108292a9a306a4e76d16baf4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 13:45:53 +0000
Subject: [PATCH 3146/3724] ipv6calc: 4.3.2 -> 4.3.3

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

diff --git a/pkgs/by-name/ip/ipv6calc/package.nix b/pkgs/by-name/ip/ipv6calc/package.nix
index bcdc3ad5c87a..24a496f42636 100644
--- a/pkgs/by-name/ip/ipv6calc/package.nix
+++ b/pkgs/by-name/ip/ipv6calc/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ipv6calc";
-  version = "4.3.2";
+  version = "4.3.3";
 
   src = fetchFromGitHub {
     owner = "pbiering";
     repo = "ipv6calc";
     rev = version;
-    sha256 = "sha256-s+B549Ni0AnvAeHD9VnDB67j3quFlqzF1pV/fpvCnlM=";
+    sha256 = "sha256-+oh9sXcww9S2WtOgLXP7mSGGnGmaSSixZIQk5CZwqyU=";
   };
 
   buildInputs = [

From 6d516d5d9bfc03559c9c445a6f5b9e1d277aebbe Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Tue, 29 Jul 2025 11:05:10 +0200
Subject: [PATCH 3147/3724] euphonica: add updateScript

---
 pkgs/by-name/eu/euphonica/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/eu/euphonica/package.nix b/pkgs/by-name/eu/euphonica/package.nix
index 007714d76cd0..6a101d8d4817 100644
--- a/pkgs/by-name/eu/euphonica/package.nix
+++ b/pkgs/by-name/eu/euphonica/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
   cargo,
   meson,
   ninja,
@@ -35,6 +36,13 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  passthru.updateScript = nix-update-script {
+    # to be dropped once there are stable releases
+    extraArgs = [
+      "--version=unstable"
+    ];
+  };
+
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
     hash = "sha256-zFGFmiPozfBSIYxCu4fHynb2eh9emfVPtj3grPAoZeA=";

From ad662d85a7a446089add7404131865c93afe5e36 Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Tue, 29 Jul 2025 11:46:15 +0200
Subject: [PATCH 3148/3724] euphonica: build release profile

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

diff --git a/pkgs/by-name/eu/euphonica/package.nix b/pkgs/by-name/eu/euphonica/package.nix
index 6a101d8d4817..42e2b06c490c 100644
--- a/pkgs/by-name/eu/euphonica/package.nix
+++ b/pkgs/by-name/eu/euphonica/package.nix
@@ -48,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-zFGFmiPozfBSIYxCu4fHynb2eh9emfVPtj3grPAoZeA=";
   };
 
+  mesonBuildType = "release";
+
   nativeBuildInputs = [
     cargo
     meson

From 51ea4a3d0eaabb3ebeab8c0c47a9164f4f5e0cab Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Tue, 12 Aug 2025 19:04:07 +0200
Subject: [PATCH 3149/3724] euphonica: 0.96.1-beta -> 0.96.3-beta

---
 pkgs/by-name/eu/euphonica/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/eu/euphonica/package.nix b/pkgs/by-name/eu/euphonica/package.nix
index 42e2b06c490c..d64563b41bc0 100644
--- a/pkgs/by-name/eu/euphonica/package.nix
+++ b/pkgs/by-name/eu/euphonica/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "euphonica";
-  version = "0.96.1-beta";
+  version = "0.96.3-beta";
 
   src = fetchFromGitHub {
     owner = "htkhiem";
     repo = "euphonica";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MMrTabKE+zqVSmbjOg0NCsI47eSu1c73RnsPDgCbhCo=";
+    hash = "sha256-IxU0LXSh516I2x8keLuuoFwfjVF+Xp0Dc56ryYY6w10=";
     fetchSubmodules = true;
   };
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-zFGFmiPozfBSIYxCu4fHynb2eh9emfVPtj3grPAoZeA=";
+    hash = "sha256-j4btvkBIQ+SppqE1rvIHWbQSgBn8ORcKGFDXYypEqsA=";
   };
 
   mesonBuildType = "release";

From cb88ba34d7702ea99f42170b4060129507aed321 Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Tue, 12 Aug 2025 19:26:53 +0200
Subject: [PATCH 3150/3724] lucida-downloader: switch to nix-update-script

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

diff --git a/pkgs/by-name/lu/lucida-downloader/package.nix b/pkgs/by-name/lu/lucida-downloader/package.nix
index ce81a0aace4c..82509bffc478 100644
--- a/pkgs/by-name/lu/lucida-downloader/package.nix
+++ b/pkgs/by-name/lu/lucida-downloader/package.nix
@@ -1,7 +1,7 @@
 {
   fetchFromGitHub,
-  gitUpdater,
   lib,
+  nix-update-script,
   rustPlatform,
 }:
 
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-9wXnxsgZZprUez3PggBWbTU/Vx7JFkNC7fuOiqWG87Y=";
   };
 
-  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+  passthru.updateScript = nix-update-script { };
 
   cargoHash = "sha256-OfnCKFWUxpFu6NU4MNMCimXAbhspBf1n6Qz5ff7MHI4=";
 

From 5cf54bdc38e7a99cfb0af57b7de6f3dc21fdf865 Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Tue, 12 Aug 2025 19:28:17 +0200
Subject: [PATCH 3151/3724] lucida-downloader: 0.2.0 -> 0.6.0

---
 pkgs/by-name/lu/lucida-downloader/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lu/lucida-downloader/package.nix b/pkgs/by-name/lu/lucida-downloader/package.nix
index 82509bffc478..d5015e12a854 100644
--- a/pkgs/by-name/lu/lucida-downloader/package.nix
+++ b/pkgs/by-name/lu/lucida-downloader/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lucida-downloader";
-  version = "0.2.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "jelni";
     repo = "lucida-downloader";
     tag = "v${version}";
-    hash = "sha256-9wXnxsgZZprUez3PggBWbTU/Vx7JFkNC7fuOiqWG87Y=";
+    hash = "sha256-/T3iB2DbcIbdwROzyB4UqXqrF7soRPCW7EUjZ8orhf4=";
   };
 
   passthru.updateScript = nix-update-script { };
 
-  cargoHash = "sha256-OfnCKFWUxpFu6NU4MNMCimXAbhspBf1n6Qz5ff7MHI4=";
+  cargoHash = "sha256-GHEGz7m/IDtPaynDPQQ9Zq3wDKe4BV+H+rrF6G4QA6s=";
 
   meta = {
     description = "Multithreaded client for downloading music for free with lucida";

From 240d6b4d6685d8ab8f115a30fea9859bd6f5d6c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 14:10:23 +0000
Subject: [PATCH 3152/3724] 
 home-assistant-custom-lovelace-modules.universal-remote-card: 4.6.8 -> 4.6.11

---
 .../universal-remote-card/package.nix                       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
index 0212f5621b17..8ae71f34e648 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
@@ -6,18 +6,18 @@
 
 buildNpmPackage rec {
   pname = "universal-remote-card";
-  version = "4.6.8";
+  version = "4.6.11";
 
   src = fetchFromGitHub {
     owner = "Nerwyn";
     repo = "android-tv-card";
     rev = version;
-    hash = "sha256-UvvEfjj6mDXMBSCxpIexJyXed32hfUieDy2lc2O8cI4=";
+    hash = "sha256-JlP4miJGtOP5738N57xTYgSSGTHAa/JEwCnR8gk/e18=";
   };
 
   patches = [ ./dont-call-git.patch ];
 
-  npmDepsHash = "sha256-oqG38l56S49Lecz+LqbyYnqkJRlijkRUPfqgmUcSslk=";
+  npmDepsHash = "sha256-ALxCA9f1kn73r1f1QhEUg+WEK6CEHvm9lQn4AGG2Js0=";
 
   installPhase = ''
     runHook preInstall

From 56426e1a0c1a8eb246aca9a89fd173a47ba248b0 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Sun, 24 Aug 2025 16:34:55 +0200
Subject: [PATCH 3153/3724] lnd: 0.19.2-beta -> 0.19.3-beta

Diff: https://github.com/lightningnetwork/lnd/compare/v0.19.2-beta...v0.19.3-beta
---
 pkgs/by-name/ln/lnd/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ln/lnd/package.nix b/pkgs/by-name/ln/lnd/package.nix
index 27cbf2bd3276..554808f5c76e 100644
--- a/pkgs/by-name/ln/lnd/package.nix
+++ b/pkgs/by-name/ln/lnd/package.nix
@@ -23,16 +23,16 @@
 
 buildGoModule rec {
   pname = "lnd";
-  version = "0.19.2-beta";
+  version = "0.19.3-beta";
 
   src = fetchFromGitHub {
     owner = "lightningnetwork";
     repo = "lnd";
     rev = "v${version}";
-    hash = "sha256-LUBUODPKXqU/wzQhjmC0NfvM284sD5dc7iQFSsdzyyI=";
+    hash = "sha256-j37tLwVmAI18N0Xb3epACKRpJbs60HamZOlKDxWngFA=";
   };
 
-  vendorHash = "sha256-3eOKZ/NgSPrtYfDYUTDnVVb7EyMz8s+mtFo2UMyieHY=";
+  vendorHash = "sha256-Ah5jOknXSoWEOnn0UKRuuwqT+E4eAkCg1h4qzW0rSHM=";
 
   subPackages = [
     "cmd/lncli"

From 2af0f196e49270ef65b773284cce2af6b049b390 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 00:37:41 +1000
Subject: [PATCH 3154/3724] 
 home-assistant-custom-lovelace-modules.advanced-camera-card: 7.14.3 -> 7.15.0
 (#436341)

https://github.com/dermotduffy/advanced-camera-card/releases/tag/v7.15.0
---
 .../custom-lovelace-modules/advanced-camera-card/package.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
index 6cbbd38cb81b..4e1381b3183a 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "advanced-camera-card";
-  version = "7.14.3";
+  version = "7.15.0";
 
   src = fetchzip {
     url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip";
-    hash = "sha256-pbca+z0abg2aeffBZ3yqfz7nbR+sqQgvRUML2DH0tIY=";
+    hash = "sha256-7Xtr+MloMWB9lGOZvPNGjRWdznkal8HMhiU0fvZ6bK0=";
   };
 
   # TODO: build from source once yarn berry support lands in nixpkgs

From 16b49dfcf0a6737dde6dba74906bb7661c279d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 Aug 2025 15:03:52 -0700
Subject: [PATCH 3155/3724] radicale: 3.5.4 -> 3.5.5

Diff: https://github.com/Kozea/Radicale/compare/v3.5.4...v3.5.5

Changelog: https://github.com/Kozea/Radicale/blob/v3.5.5/CHANGELOG.md
---
 pkgs/by-name/ra/radicale/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix
index 5d3b72dd129a..15c5309b71c3 100644
--- a/pkgs/by-name/ra/radicale/package.nix
+++ b/pkgs/by-name/ra/radicale/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "radicale";
-  version = "3.5.4";
+  version = "3.5.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kozea";
     repo = "Radicale";
     tag = "v${version}";
-    hash = "sha256-45YLZyjQabv92izrMS1euyPhn6AATY0p+p5/GXuQxnM=";
+    hash = "sha256-Hrjqf0wm2Et6PMT94a0H/iJQQSEz4pfL7E4Ic0tstaY=";
   };
 
   build-system = with python3.pkgs; [

From c895484283cae1c2faa5904dfa9d354f26512d43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 14:44:46 +0000
Subject: [PATCH 3156/3724] _86Box-with-roms: 4.2.1 -> 5.0

---
 pkgs/by-name/_8/_86Box/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/_8/_86Box/package.nix b/pkgs/by-name/_8/_86Box/package.nix
index 4e2cdb3eac5e..a0f912d7c547 100644
--- a/pkgs/by-name/_8/_86Box/package.nix
+++ b/pkgs/by-name/_8/_86Box/package.nix
@@ -39,13 +39,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "86Box";
-  version = "4.2.1";
+  version = "5.0";
 
   src = fetchFromGitHub {
     owner = "86Box";
     repo = "86Box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ue5Coy2MpP7Iwl81KJPQPC7eD53/Db5a0PGIR+DdPYI=";
+    hash = "sha256-vuVaV87BHgqiEDyaRqiqqT1AuBuPSMHs0d+/mT4cEuk=";
   };
 
   patches = [ ./darwin.patch ];
@@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
       owner = "86Box";
       repo = "roms";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-p3djn950mTUIchFCEg56JbJtIsUuxmqRdYFRl50kI5Y=";
+      hash = "sha256-bMCmDAdGTkO3BuU0EBC1svulZYP3tPqWBELbXwV0KO8=";
     };
     updateScript = ./update.sh;
   };

From 6499992bd3498d95d5493a5913a091b769e2cfc8 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sun, 24 Aug 2025 10:52:15 -0400
Subject: [PATCH 3157/3724] python3Packages.oracledb: fix build and modernize

---
 .../python-modules/oracledb/default.nix       | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix
index e0ea963e9d4e..e1957ef0cf5c 100644
--- a/pkgs/development/python-modules/oracledb/default.nix
+++ b/pkgs/development/python-modules/oracledb/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   cryptography,
   cython,
-  fetchPypi,
+  fetchFromGitHub,
   pythonOlder,
   setuptools,
   wheel,
@@ -14,13 +14,21 @@ buildPythonPackage rec {
   version = "3.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-6DDTVEoVeClryqVMboyK4QpYx9tGfFKMSyetv5yLTLA=";
+  src = fetchFromGitHub {
+    owner = "oracle";
+    repo = "python-oracledb";
+    tag = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-SHIEl4pzuQBJ02KRPmOydFtmVD9qF3LGk9WPiDSpVzQ=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "cython == 3.1" "cython"
+  '';
+
   build-system = [
     cython
     setuptools
@@ -34,14 +42,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "oracledb" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python driver for Oracle Database";
     homepage = "https://oracle.github.io/python-oracledb";
     changelog = "https://github.com/oracle/python-oracledb/blob/v${version}/doc/src/release_notes.rst";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # and or
       upl
     ];
-    maintainers = with maintainers; [ harvidsen ];
+    maintainers = with lib.maintainers; [ harvidsen ];
   };
 }

From 19156cb53739c40fc045d40f1178795e6cba6fc5 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sun, 24 Aug 2025 10:52:25 -0400
Subject: [PATCH 3158/3724] python3Packages.django-modeltranslation: fix build
 and modernize

---
 .../django-modeltranslation/default.nix            | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix
index 91ee56a3382d..cb4f79bf0e12 100644
--- a/pkgs/development/python-modules/django-modeltranslation/default.nix
+++ b/pkgs/development/python-modules/django-modeltranslation/default.nix
@@ -9,7 +9,8 @@
   pytest-django,
   pytestCheckHook,
   pythonOlder,
-  setuptools,
+  hatchling,
+  hatch-vcs,
 }:
 
 buildPythonPackage rec {
@@ -26,7 +27,10 @@ buildPythonPackage rec {
     hash = "sha256-8A5fIZuUMlXe8bHQR0Ha5HoT9VIQsgqpJVMONB5KqCI=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    hatchling
+    hatch-vcs
+  ];
 
   dependencies = [ django ];
 
@@ -40,11 +44,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "modeltranslation" ];
 
-  meta = with lib; {
+  meta = {
     description = "Translates Django models using a registration approach";
     homepage = "https://github.com/deschler/django-modeltranslation";
     changelog = "https://github.com/deschler/django-modeltranslation/blob/v${src.tag}/CHANGELOG.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ augustebaum ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ augustebaum ];
   };
 }

From 88670a3166d12740c3b91d2635a4ffc67eee8eb4 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sun, 24 Aug 2025 10:59:22 -0400
Subject: [PATCH 3159/3724] python3Packages.pyexcel-xls: fix build

Removes a patch that is applied in 0.7.1
---
 .../python-modules/pyexcel-xls/default.nix            | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix
index eede60aa59a9..414ed55d827c 100644
--- a/pkgs/development/python-modules/pyexcel-xls/default.nix
+++ b/pkgs/development/python-modules/pyexcel-xls/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
   pyexcel-io,
   xlrd,
   xlwt,
@@ -24,16 +23,6 @@ buildPythonPackage rec {
     hash = "sha256-+iwdMSGUsUbWFO4s4+3Zf+47J9bzFffWthZoeThT8f0=";
   };
 
-  patches = [
-    # https://github.com/pyexcel/pyexcel-xls/pull/54
-    (fetchpatch2 {
-      name = "nose-to-pytest.patch";
-      url = "https://github.com/pyexcel/pyexcel-xls/compare/d8953c8ff7dc9a4a3465f2cfc182acafa49f6ea2...9f0d48035114f73077dd0f109395af32b4d9d48b.patch";
-      hash = "sha256-2kVdN+kEYaJjXGzv9eudfKjRweMG0grTd5wnZXIDzUU=";
-      excludes = [ ".github/*" ];
-    })
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [

From b6c6fab8ceea024d8331cc44e4956c9ba210681b Mon Sep 17 00:00:00 2001
From: Angelo Delefortrie <angelo.delefortrie@gmail.com>
Date: Sun, 24 Aug 2025 17:02:08 +0200
Subject: [PATCH 3160/3724] swagger-typescript-api: 13.2.7 -> 13.2.8

---
 .../missing-hashes.json                       | 107 +++++++++---------
 .../sw/swagger-typescript-api/package.nix     |   6 +-
 2 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json b/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json
index cd7be18b0240..4600a0aeaff9 100644
--- a/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json
+++ b/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json
@@ -1,37 +1,38 @@
 {
-  "@biomejs/cli-darwin-arm64@npm:2.0.5": "0ff323d033dcbbd5b3ca36db38797710ae334e75979b59cb2c9a507d54a86864312425144583534132c26be03f874adb51ccf28b767687afda0e69e79c37558d",
-  "@biomejs/cli-darwin-x64@npm:2.0.5": "29a30e069d5c17a92251508be6b75285b692cfdac2919723f053d0de1ad769a61a76b1169539c6e65b297b609fb5be897e6b9f690df0cdbf431b8fb4759f5d44",
-  "@biomejs/cli-linux-arm64-musl@npm:2.0.5": "b4af94b86d85fbe57c59dfb3d099853f75badb21bfcc47565a44ddcd01e58cca4acec491265ddd38ac501e8bfcff22c97d0ea96a244a0be6e3ebd18e38fd6c3a",
-  "@biomejs/cli-linux-arm64@npm:2.0.5": "78f4ff67d4cb14dfed2a942d26e24be375cf1bb2d66f50247748bbdcea18505ccd03e30489f2fe34c7a2705f093a68b26e7c6c08c17a19c130de1b3a0d41cb35",
-  "@biomejs/cli-linux-x64-musl@npm:2.0.5": "f70b57ca309e00398078f88b4873108626d01262fd8e28f4b8719a709e778ab45d28b4bd4277d059c79c3cf45aca5c020b482701e49a34598d202427057e658b",
-  "@biomejs/cli-linux-x64@npm:2.0.5": "6c7827dd705bfc5b751ba9c6377a3c847c772aefd64655345b1b5ab1da96af6c931626087223fa03aa88d1ccb4f58cef63cc5224199051385efa0baf86c139ec",
-  "@biomejs/cli-win32-arm64@npm:2.0.5": "5c2584ab24a217335f818a50cb8a47e9dca742f45d109c0e4bd519900ea3de140980c07c91ce0af9f7989c96bd6cf6606ad8086142b7fa692dbc124ed996e34c",
-  "@biomejs/cli-win32-x64@npm:2.0.5": "f5b3228d90cd8212d01587e1011db7d61c84832a53e3ee491c18f875f349d75a3127183f660bd7edef4bbfaf1b6590039b694137c96aad90d8db4a18292fc384",
-  "@esbuild/aix-ppc64@npm:0.25.5": "fb872b34a2843293dc60e809968fedf93e0d8f7174b062decffae6ba861eb56aaea0cd0aba87ba99162ceb2a690f0cde4fc29c000b52c035e40c91ec7861d43e",
-  "@esbuild/android-arm64@npm:0.25.5": "c818e799b19b5587466bf68a27b578ccaaf866c1d144573fbde7659e3fd3f555422ec3e67f5bd186a87648957d1b6e74df4f847edea7219c16979c9916f36e91",
-  "@esbuild/android-arm@npm:0.25.5": "a5384933f9f2ffcadce2be49da6ff43249fe42f32a04071316434e9f633fc20c8d4029072e9a53555620c3531045786297607b852579eee30b6dbc3bc9d98cd9",
-  "@esbuild/android-x64@npm:0.25.5": "8ce115dc7e1e6735f23b4aadb2dfca29c0abd8577ce34802ea3d017a64e388928949134fe225dfe190babdc5ec01be5fc7794eca84738cdefc12c5e3789ce43b",
-  "@esbuild/darwin-arm64@npm:0.25.5": "a009eab62f2bd284a6f2001d5e08217059186ffc16907bbe873e1de40fe9b5ed92c0db2f4c4d0dc41545838850a430c8f2f35d7bdb9cd01a1a04293acd97afca",
-  "@esbuild/darwin-x64@npm:0.25.5": "cac8021a7a0c549263e076913346b35a5bb81f76ffbc1abfad5e7b67303f013ac0c76f111bf624ea8447b327ec86c18a60c6ff307d743a2269f5d47313f5b2de",
-  "@esbuild/freebsd-arm64@npm:0.25.5": "d248e7103b7094eb4288db7c9a78b2905a25b4a957f2b945531ca88d3394f45ceca2343a7c84954734534af6159bc741eb3d5c1ed9df990f7395337a1b14192c",
-  "@esbuild/freebsd-x64@npm:0.25.5": "8a7be0740f07f5dbb3e24bf782ca6ef518a8ce9b53e5d864221722045713586d41774cbd531df97dc868b291b3b303c12e50ca8611c3cb7b5fe09a30b38285eb",
-  "@esbuild/linux-arm64@npm:0.25.5": "ce3c8fca47cf0a92148fb288eb35a5c4a4dcf7a700730b3a48fdd63c13e17c719eb6b350378203fba773477eb5be637f47a6d52c5d4ce5bdc0075ee917156006",
-  "@esbuild/linux-arm@npm:0.25.5": "cc81ea76ab86ed2a837c9da329f7c63412d288dc0aa608c8dcdf51705dc93d5b7f966a429be4896babe611074e5898c7e6c8e07ad7f50123a05478975294fbb4",
-  "@esbuild/linux-ia32@npm:0.25.5": "bfed6750923afd56148f658f6ec8995479f5115116dc212ecb9e4c556064422e22eda855177e7c02cbc945494e4db1167101918c5fa932278115db2c7025a3f6",
-  "@esbuild/linux-loong64@npm:0.25.5": "e5c20140bbbdba53f0d86dd72961ed73e6255d2ada2d3a626f390b352170605644822ad7592f695b6e520edcefe0c5f6ba19d10694b5d11d725745d9792bde01",
-  "@esbuild/linux-mips64el@npm:0.25.5": "6b3559517efd0dd1301debc7af7e275b055859c26facdda2e229b1aaab6ebea4c480a1da151c46211ee4035d95bfa7f0cdacf735b57ee99d41b69c77357310b9",
-  "@esbuild/linux-ppc64@npm:0.25.5": "a1a1af99d758efce928335637924dcd8ddec4201af51014e1f831b012d53a0a673b1e0c31036ec9e8c5a0311439283419ec8abdfc67ecb245fa7f7b653006ed0",
-  "@esbuild/linux-riscv64@npm:0.25.5": "6cd8dce6723b73e0f89898ab6cd52e0d009afdacdfc0d5529134de7b832c92c2e0421fbb5cbfc0e0c0b2b00a9b1ff2c4cdb9695b2c535ebc174960e986c727a7",
-  "@esbuild/linux-s390x@npm:0.25.5": "31b86dbc93d19eb362bad3353e65d6da771118346e723582d06c05f1b6ffad1c3765001b5215ef1e8f0c2bb29130d98815359bbc88e5c08304354d5a92e6ea94",
-  "@esbuild/linux-x64@npm:0.25.5": "f878a3e40edfd8a50de94bf982a9eaf03e636a0332af163a6c905490063aae652384fb392d4765c4338fb6f991034949c92ec768ee65c3b2fceeb494b89fe8b3",
-  "@esbuild/netbsd-arm64@npm:0.25.5": "941c5e28a63a93f19122271b5490e196db12815702c2266c6d66401b6909a4364ab889611ba81c5359624e3ce61f0505a680a1179ed9a555d1415fa1c485d75d",
-  "@esbuild/netbsd-x64@npm:0.25.5": "edbefdd88ca24a373497a7c8d1fdab418827ff89c6eee1c574159dbb4d9174552aa87753f35525a894964b77c14b012164ec5582b9f19dd4d6c1f5d45df411c7",
-  "@esbuild/openbsd-arm64@npm:0.25.5": "d44633a374c109d2fb9c678882016e3ec3d79f0c5f21a6e6fb0114ea709bc539200b037a4e3ec52304eea2f8c5957bf16c6f0a7af5cfde41b652c4bac604bba6",
-  "@esbuild/openbsd-x64@npm:0.25.5": "efc4641ea653dedc9886f0603c2e7cfc6fbe94c34d4cdaee9b060a8b9d8143d1192c45da93b3e802af2c26f72ab1ad3a3fad0e0cb297d06de55814fe83ccd32c",
-  "@esbuild/sunos-x64@npm:0.25.5": "29860663381b6098c0fda6f69235407654dfad953e83b3f9f06a270950d5c37da4ca60a4b5915b8e2606d468b560be6179870f64a22d5b046e8a930c31a7b554",
-  "@esbuild/win32-arm64@npm:0.25.5": "a77d395251c8a62ab0cec07d5230222823fa02fbf3ef008d94b5213a335c9f949872c3f1c2f947abaa28098b669018e429af42f59616e049860a0072f3b006de",
-  "@esbuild/win32-ia32@npm:0.25.5": "ff1b6cbe835082aef5b93c3e2012d51be431d05c6ae5f90a5bc89687c687e8e2340c262dedddd124b27b511616bbc4088b5a4a949d3147f677084dc6ec572629",
-  "@esbuild/win32-x64@npm:0.25.5": "266e69e8d37bd4deb77443588e49472e4e9791178cb39e1692eabb67cf65d8e85a932ac468e7ebb2072c8a9ee23ad413c8f0f7d954c474f643cedbbf7aad952a",
+  "@biomejs/cli-darwin-arm64@npm:2.1.4": "11ec854dec62d9ba34df3ce240a6baca6ff78d41d2bbcfed47741f3c13566007a93f60290eb043d6e4bc4b5f7997ebcbd843781d6cdadb74368bad788e7f8d86",
+  "@biomejs/cli-darwin-x64@npm:2.1.4": "e35434896cb45410cd2565d1c476526c6ac0421368d27624a84b12993ccb8afdd5b8b45eaec9b4fe92497a0718ecb6d0ff26de4d8d2647ac821906e8d77bdbea",
+  "@biomejs/cli-linux-arm64-musl@npm:2.1.4": "42f9e3ca494471875fd404c79d5fa19c01626aee48fde619861ebe695d40fd5ecca3a6d211eb165058ba2091e3e0df317e16e4c887794198291144de0d3742b3",
+  "@biomejs/cli-linux-arm64@npm:2.1.4": "49896343090353fdd1b5f1bdd109bcd2f93ce43a73d3d58bafbd58b5dfda2b1cde288adcd9d58603a9b34c2c83ba0471ee2bde06724b4388af940df9fb4ae4a0",
+  "@biomejs/cli-linux-x64-musl@npm:2.1.4": "11f30c976bd395e7cdaac88858055c06327bd20a4f7d499a799286c05c653d025ce2783b1ed741e07afb2757803dd324a8f217fc804d04859ab6f9650c050811",
+  "@biomejs/cli-linux-x64@npm:2.1.4": "3e9831d10f9113be37ecdd293a3fb54645e63edc3acae9d810a37e028ebe2061d71ba6e8589f6a2e41c31533fa011403366cadff7d1606765dd7363e1bf7cd14",
+  "@biomejs/cli-win32-arm64@npm:2.1.4": "44a1400a476e76c48d4522a723af594afb1c2d837b3bebcb084ce84fedd3cf58c7c848cff72c788ee7e428ff40954baefb54b754632cd41a3649e1dc5f027284",
+  "@biomejs/cli-win32-x64@npm:2.1.4": "2414e6b01d637739c851b08393a3298cfc6a6912037042f58ec63d789cdd6ccd2ad634d44613b09daa21ade9d880a0575d67486c0ed37668dab4746fb9ae519b",
+  "@esbuild/aix-ppc64@npm:0.25.8": "37fc14b17214c1f6bf41175029b62a43664a6a5a5b802614fe1d837bbf7abf5eaf2f6b735b6a446ebcfabb632e038c8ad9cccd87a259c45a1846689f8527874a",
+  "@esbuild/android-arm64@npm:0.25.8": "e367e989238292ccee72013511dde1aef2d2160d8d5d669a12272f693cf9a0970fac9d7835178b3c46ed6936a0c4b29d21d58ed11851a3697bf98b4320be4b74",
+  "@esbuild/android-arm@npm:0.25.8": "cbfa2c802d8931e5f4d06582f20573cb34774ab713b4712c37eb15bfab6f90b693878b661de2a3bb9c81eecf45b37e0ddf2e9c79ef4ff932bbc37da588c40183",
+  "@esbuild/android-x64@npm:0.25.8": "1d4b900dd2f43790415745d20ae6cadb53e9412911578aaf43462277169c22800eca1f49a9f8ce9c37236e1691279494f91967d28310720707911910ec765013",
+  "@esbuild/darwin-arm64@npm:0.25.8": "a8a50e303056e668e99370a88d1744de4a83e62e2f3f7fcf2ff611142346505229568b0ec5edda93ec96e33e842a585880a312790553202750f123d9636fa97d",
+  "@esbuild/darwin-x64@npm:0.25.8": "9806fe9d54f3228a01f535e7c51aea26bd1bab3c5d64d5f77f4606de44f361f049222776d32bfd262d45991b7aecca645ed576ea338edbf4f8044b22b3e331ad",
+  "@esbuild/freebsd-arm64@npm:0.25.8": "8e6cbdd45819390ecdb62a70a4f119a9269a90895f3e1237788b36a512248a756233ef59f55f9033658af372a196f0edc3567f078f1387e150238d2bd51f733b",
+  "@esbuild/freebsd-x64@npm:0.25.8": "3f920c686037f825859a2fe82104085f4b254b77821cc71a71db512ef0679dd01481c136c3f7057ba7250daff2458aa3ffd101cc28cb5fff2d55270ba5930ec8",
+  "@esbuild/linux-arm64@npm:0.25.8": "234edc9f815cdc74d21c6a90a3542c941deeaf3a24b408c74a4651616bd270383ba5a15eaef837ab347a374032c7028fc29e4f1da0becb33f0b8dd8f744934d7",
+  "@esbuild/linux-arm@npm:0.25.8": "dc6dc225ae278cb3383e11d9829d22f301e1b79f2ed4efde1a01896ae67e45efde98caa61f10cb425a809e9b61e9a4651b60d2b6a3e9ad6174519e8ce74bc02a",
+  "@esbuild/linux-ia32@npm:0.25.8": "1c780012035552e27adea34d11f959a3ddd4a4d576cddd03d320b1db18110e777c1adca2c6d10affd587a4454900d3ffcad9371956855e56739babdc2e4edcd3",
+  "@esbuild/linux-loong64@npm:0.25.8": "d3d39691d301d144c7d61f52163a2fe64caaf928f4117d906707dc1456f3d88d1a7a3b16fb988ccfc0b0bc203f4bcd56665a9c7405dc380b3165a26ab195b9ec",
+  "@esbuild/linux-mips64el@npm:0.25.8": "437e51b2be977cf7774114e04c141e3c0f1ceb7f12b961b7b3ac7f99c4e203afdd74c41e072ecdc4bab3cde4f14feedd78653727d1b2013ed3611bd89117ee8c",
+  "@esbuild/linux-ppc64@npm:0.25.8": "29d2e344b1c8b767518d25b23eb9e98d85deae1f2def2e01c1939536ac7d1fc9e92749a8d29b29277b3340d3613e4b0f96213c6aa2de7e06885a19d3d269870a",
+  "@esbuild/linux-riscv64@npm:0.25.8": "82b2ef7fd5a00b465da97bd797246269d7460ed710c0533517a1f8ad8e32527f405509b2ce27e29f8f3df1affa04e45cf5d1a71205f69dab5c1a27118cf10fb8",
+  "@esbuild/linux-s390x@npm:0.25.8": "74168a6e8927d12c883dba56006f5277f8888c7b1b5e4d132a3c235b8629c3015b4715968ba128a79ff55c9f08a23df84fe44047e8cda4366b9699c5c45f27a4",
+  "@esbuild/linux-x64@npm:0.25.8": "d531002ac2ead0bdb293ec1a4eceea687d37815e298196af2471107cdd4c1f76ef7d12417052b51852b80f66111abfb5ad8375c58b97da92306b975e9a8f0649",
+  "@esbuild/netbsd-arm64@npm:0.25.8": "55626924ae946a6225707062648aabb79c70d61e7e094b067338ea1adf72493b502e99e59440fe0d3abfe20eb36c33f78115815d63e72fa99f5e90146c2ee5d9",
+  "@esbuild/netbsd-x64@npm:0.25.8": "d03122aaa3e9a8bda686bc4120820805b5d9701099458a2c928ee1a292fabcc47df0cb178c8c428edb78a058e75cf7c0d80fa25b71fb91db43d73fe6e4062c41",
+  "@esbuild/openbsd-arm64@npm:0.25.8": "113ed8722788986b5b703c791bb9c954e80a861b92f453c66c79318d71cc6eac509c1dc79d20671b4af92165eee05a28eb7b3122537d8701447d30f58c428942",
+  "@esbuild/openbsd-x64@npm:0.25.8": "dfa68d80d68ae825de85aeccc118724ced6b232dcf25da6d862ba03abda2f55e75483dccbf8cb3a7338e7882a05e5425fcf5a902b7dced72c9f1a9c2650912bd",
+  "@esbuild/openharmony-arm64@npm:0.25.8": "8dab5710d93ad4a78a34a0016f6ea0bf2e16489845f9895ecaf354c1c3db209bed8f05a31309b95c358bfeaea53829605f4e315e9a53dae4d9fdb58e31ca4688",
+  "@esbuild/sunos-x64@npm:0.25.8": "ccc940bd687d1f6d320d2538ac594b7fe5e291e194380a8b392dd2348d738cf8d322f9f62bcea82b3809f98796a0a004cd02ba9c4d563e5e336665e1ec8e1e1d",
+  "@esbuild/win32-arm64@npm:0.25.8": "b0a9a86548d4a62e68b12a89e21aaadda3d6d3e96541a2714b74df370cc344e1a2d91604998a26951da28c2f932bd2ee033adc9346bb232622c3ac419107136a",
+  "@esbuild/win32-ia32@npm:0.25.8": "5880e933c8fb8dc1de1225128c171ea64f4b27fe52fc11ed9cfe6b0ca8ae091c2703d4cb629f08c06731810c46f48cf881516d0d54b3ac408dec34586ea84d27",
+  "@esbuild/win32-x64@npm:0.25.8": "9e98fe0e7eef7a0e774ab761c59d520ea1c997a7a6e4c7f9cbc967471a4a7ffb14bc27c60d2aa10796c4e945c3da2613fcc297054566fe3f5191e1250691d622",
   "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.9-commit.d91dfb5": "a4636b96d36bfaccc655f9de258cef17daedd025463309657ed213b63b4226aeb6901eaa05d00d577e486bfb4d4ef99ee1457d8d7a8b5170afe07c86d2a5c18d",
   "@rolldown/binding-darwin-x64@npm:1.0.0-beta.9-commit.d91dfb5": "a7b89d92f33ad9a718de70c56452dc481962e5396b32d66cbc08e588f45fa090ed6e3b7d8fc2ec641acf3de2a550b6d05416b14179ed4fcc8d336fdbd697d40b",
   "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.9-commit.d91dfb5": "7da382e43eeada73dec31bb63680432f129fa17efed7ed211da0c9915a89c9dfa2e8ec35aa7f07a4be99a36eb14df67059a375ac4bc5e6a5cdc16e02f7a9bd3c",
@@ -44,24 +45,24 @@
   "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "17086030865bbfb6668d04f882926035fc1f72db81c3415a8f81e6196b9f849eabd6f2a62066e83f87255fcec106fe274353c8f5ff9c782417b6eddc664a129c",
   "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "ecd226ec05f9f863d97de98ca4d7cb9026bcb0cd2fff12e325209664eaca1fa131744ad72d1352b522567adfe4967ca73e50987f96ab475b50e9b96456dd50cf",
   "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "9e50f65fb7ad451a6eb4f9305650605e7a4efdd6873ad9412520edb8fd4c7f0bb67aa9922dbf1bad055c01a0de677eace73abf4285409cb9defae93956a83b24",
-  "@rollup/rollup-android-arm-eabi@npm:4.43.0": "8e37e27b359200197cddf9c1aa5bb5f2d0d8e640fe30f0ccc4b77d9c730b2fdda6f3b6f97a0afc45c5113f23637f98c5c89abf982a222cc3f6b00192a2a998fa",
-  "@rollup/rollup-android-arm64@npm:4.43.0": "6e7ee0f496d30cfeca8d930c512f331053d87076b67f06303339ef19120dca5895bc2072ab3da7b99fb93f6c6c275d4d874a66bff08afeac4cea5447cdc709a3",
-  "@rollup/rollup-darwin-arm64@npm:4.43.0": "7b76fb8e7ccc40ff17f9584b0cdacce22e384ce1229860b0971417236884d100362a79a12cdcbd0254dcd0f68d7db6cfe11c60f38e7a672cf62b0b8abe6834e9",
-  "@rollup/rollup-darwin-x64@npm:4.43.0": "9209a1d1f97dad0810dc280485658b78cf597398da4ce2c2ccab04d4bbe0a05966325760d399209b67d746711bf204c4d8896941159ac5569e6a3a6738807e3a",
-  "@rollup/rollup-freebsd-arm64@npm:4.43.0": "d89e2a6234d2cd2f18c168a832f518864c2c66c93f230ada42014b631ea0d04cb790269cbe0bb67e0bfbdcdf8b5b5069de1382be15380f469c02a51570d60729",
-  "@rollup/rollup-freebsd-x64@npm:4.43.0": "0d4c3c6dc027a57e4ef1897acc58996e179f89130858f8849de9c6fbe4a9ffab5b226d0729c1bc8b15528271c0d0093e9c6df9831a01fa5baa870825306484a0",
-  "@rollup/rollup-linux-arm-gnueabihf@npm:4.43.0": "f7c29e494b75719b3efdf6958c81e95b9c79bd4e3b8fe775088676a35da4e49301175fe4d1b3dc176348817f3ee7645ed34381e4801655c62c8b7de5a079c8e3",
-  "@rollup/rollup-linux-arm-musleabihf@npm:4.43.0": "0ff5c0dfe63f3d4a5f3914555b6557f5d9a76af751ee4ae8fd4264ac8e2538108b20fb4049637bfee71f67e69b8cc5a4c38d1c0a029247e657a703594ec5733c",
-  "@rollup/rollup-linux-arm64-gnu@npm:4.43.0": "2138243743cd1c5ff59de2e56f7b40aefb0c8e7b54a028fa6f40407594cf82a8f71d7c25368d54e5470e12fe6565dde2ade26e7a2e303368a4c216f907407feb",
-  "@rollup/rollup-linux-arm64-musl@npm:4.43.0": "7b7ec641ff9b86e144971913ab40e6fdccbf9a45e501c6c5dc6e102ef28e1cad4a05ede0f4c9c1d21da9242033e221b491948e552acb5774cc033f97519da5dc",
-  "@rollup/rollup-linux-loongarch64-gnu@npm:4.43.0": "eca2d22690858529fee43bacb8e5c3da972d07d68a0418437af18294a6abe181e0d46aac597ce13dd5ff9b22b3a4eec88e958f526082ae116d140a3e04466801",
-  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.43.0": "2b560dc6d6af7350fa7bd504c9e4357e677a56c4c62c27efa0162252482c8fffdbb1c77710a4f37325e8a8afd3ed9272b9998fb82472e72a2cacc5fa11cda633",
-  "@rollup/rollup-linux-riscv64-gnu@npm:4.43.0": "7eaf269704ed32475620e5e293bc7db7ca15c0556de3b487cb0e08619610a45a9bec8c1db5f4a3294f229bed95a6c099fea37f2d1a012cef0322a9b42a5bd27f",
-  "@rollup/rollup-linux-riscv64-musl@npm:4.43.0": "fe28cbe57646d2c78966119db6c91c42c0f48a9f1175fd4596697107a6f4a229484f45344fbd8656f6875fcc22fa565603688fd02a02c98007aa30aee34b066d",
-  "@rollup/rollup-linux-s390x-gnu@npm:4.43.0": "60691ae9cc5f68fb845c972e337c8c8230078fe9a204a249670de21c72d1e8ccac1f0d47347eb720e87068b0f1fb86af54edbcf5d20fe25b1d1cd5e76db7a0f1",
-  "@rollup/rollup-linux-x64-gnu@npm:4.43.0": "337a87aed8d5b07f8e5bd8e1b0fe6b7e03edaabc948076dd817d70badb5c5081e9c0faf36411e54fddc633e0a8eb4f1f348208678184794116cecbded2c5b288",
-  "@rollup/rollup-linux-x64-musl@npm:4.43.0": "e85942bd31ecf417f25220f1f376395e5a679f8d0c9e4fa7084d5d61265da00d2f483aef3a97884c94ed572e6d3b98ecc7707efbbf2dbdd4d8b9a5b9c4350a56",
-  "@rollup/rollup-win32-arm64-msvc@npm:4.43.0": "c6a793b1a16fdfe801018f2ff9d92290da6695e8041fc543a36daca859379f03fcb2d1d688891a9cfff0223962da38fd33f661a5c93d46a794c1eb4fa79ff119",
-  "@rollup/rollup-win32-ia32-msvc@npm:4.43.0": "305a82fdea7656d83efce73720c0d36c6da4734e9e05f3696d032272fd61de767991e04fa02b0abaf18c4aeaf17f7a61a2e7552d923d89d6a9abfba4a5e37657",
-  "@rollup/rollup-win32-x64-msvc@npm:4.43.0": "966e5f3d7996f41ea6cee2e0a20276cb314029bceee9b9e7512c47a3d139e1601231490229a66e8f5824b64d72c508e272f9f5f62d6b8b2a61722c17aa0ac3a1"
+  "@rollup/rollup-android-arm-eabi@npm:4.45.1": "c8f4939edd5bdac2d846307e7accddd8d777accbc900757386feeb26b609813b1e6cb1860464700b8f724f0175701a52cfe35aaab40193e471d72967d2580cea",
+  "@rollup/rollup-android-arm64@npm:4.45.1": "f4a842bbd8ec08eea0a3d76381bf7441e0bd9cca34b83519044c9d30514639d6c9125234253705b14dcade1faef603829892627f3e5b3fb79ca2fffdb7f0a1dc",
+  "@rollup/rollup-darwin-arm64@npm:4.45.1": "9cd3c451dd4727ea97d67f7a1d19c16cd91b53509c2b7f0e123ca2ecfa5a542ac9e0d7ed5d4a2fc6e0e2636b2d783a5ea94d3d9b079e58094807f46af2d3b1f5",
+  "@rollup/rollup-darwin-x64@npm:4.45.1": "beff80194e9aa470f233783230e607c16c3180c479c630b1affb792ea94517305c7736f5bcc50bf7485532179713258b8688904ffd1a39b4cedbbd37a60fc676",
+  "@rollup/rollup-freebsd-arm64@npm:4.45.1": "92a873121ff3828a904ae5c073ac11206749cffaa2f0f717a0261318cda8992d951993ae57aae519ffd840fe74b8e4cb41a419996e4b7114007e163dafd24d28",
+  "@rollup/rollup-freebsd-x64@npm:4.45.1": "919ff2d364ddeb2c4ed717c772b9f9e4b616dbcb8db25123a9f48468b1777e0db0ab2a80a48674e0dad7036cbf5407de83532123b09986226ad3759806fe369e",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.45.1": "f519dc61d585495502a81f10898eed4a1d7d3d3d7675c0e9082924622a68212d586dcc31ad6fff4562eacdf0420c3017e66c9960fc972b4c3605d2f7bc3d6581",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.45.1": "aad10aefd9142278a87f9d6489d1f14666ca4c9345b099942dee8e30fb5e1cc6bee630c8de48d4b11302315e8341bdc0664560388792db248823532eb81eee4a",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.45.1": "2822750ecd8f9566095c3a51e2666c9e35d307fb322f730303259d035b3d2f3960441d9647cc3fd15b3bc5e37bc8190461c318a05c189dc95ff636024b0b4169",
+  "@rollup/rollup-linux-arm64-musl@npm:4.45.1": "372430e2ae57007b64358eb4c26720b1dcdd80fd2ee24688ceb4d6031158790039f9d1a48f60df7a57e17e82395609428eca90e5e467766d867a60104c73eed5",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.45.1": "fb0063b86d3308eea4940798ea711867a8de1a7494070b55bbf86a03b401b41b75cb88868e13f45148653699a18b1d2363351801a5b0c0b653867e4e662daa98",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.45.1": "bc9f4c68939f98562864b5100a78a6f6e3d9597db2f459b99fa114e498c14f06171647be3d7a560781483ee1971122a7e3b3ab58e2584b960447994ba444eb4e",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.45.1": "bc0a285841a777e14836be0102d58ecaf064d0373fde1aae730844d27c7f2982ccdfc0cab41d3c689b1472258fdc93568ca71660423ed670d938e3583570f69b",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.45.1": "2150cb74acb44af2a2ead9068006efc76201b651f0ee09061aebd4e6e22b75254b3e64a8e1684c422ef72ea4001049379110199126dac288602464c4432dbdb6",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.45.1": "a11dad7ddd921104d33d1d5aed05beef4ac8d6e79b69e5afc3612d424a2e12e67c6cd67d916b4f0f981bdb5738fe7c59a5e342fe265bc989a2acc9c981d3e212",
+  "@rollup/rollup-linux-x64-gnu@npm:4.45.1": "baf9081b367a5f557cfcd17ae60b196c00a933e87c5b16045efa312cb142518c91706ae3e6a4be1d09f7fbf2b133d386fc4ff3f6dd2d5b7149ac139af4a63391",
+  "@rollup/rollup-linux-x64-musl@npm:4.45.1": "dd53812371c9e7c68d4a4d6d96993c3d2def5c91c7bd9f264d832263f5fb0b7601789cb394b4ee835ff5c828a02da7421bef43e31131c44eccb548cca576d886",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.45.1": "5d336c675befca41c76b0529e194e30eca93465512db3a95afcb626cf3fe56664d9e1e9b124a29c02383f43fe8638c5a1652171bdd341d8ea65ebc8462050e3f",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.45.1": "53e1aea2fb90f3704b272d3f89009a04891ce318d7cdf5dea85092b1f039499a8f916065e9775ddebaa1af411bf8213d656bd540eabfcd7f764eaf0d21c33b98",
+  "@rollup/rollup-win32-x64-msvc@npm:4.45.1": "801641e0ecef2e8fd0e616ba443b029adb9a2ed5303b8f7ad8caf23a6615ba5e221dbefb138d17ef77039e6a240c0ba1ea022cf1e116a5545ea518a6063c1e63"
 }
diff --git a/pkgs/by-name/sw/swagger-typescript-api/package.nix b/pkgs/by-name/sw/swagger-typescript-api/package.nix
index 3ea50c9aa136..55277421c6e6 100644
--- a/pkgs/by-name/sw/swagger-typescript-api/package.nix
+++ b/pkgs/by-name/sw/swagger-typescript-api/package.nix
@@ -8,7 +8,7 @@
 }:
 let
   pname = "swagger-typescript-api";
-  version = "13.2.7";
+  version = "13.2.8";
   yarn-berry = yarn-berry_4;
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "acacode";
     repo = "swagger-typescript-api";
     rev = version;
-    hash = "sha256-sK1zqpxQLnO5/6Spw/fgFcwotwb7vHX/aQUCW601HBQ=";
+    hash = "sha256-3IPap3Ln8UheYD3/PE4y1ga1KXMNihm36bkMCKy6WuQ=";
   };
 
   nativeBuildInputs = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   missingHashes = ./missing-hashes.json;
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-KyE+Wmbx8hN9ewOyNk5imlrae7kqZgOYoyCg+K/dC+k=";
+    hash = "sha256-3vVaW9beLNuudq7RB8pnw6aMJ8nJ1YBFaYr1d9K/k5U=";
   };
 
   buildPhase = ''

From 98a41b36697896a9d67dc9e72d01aba8b0747877 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 15:08:16 +0000
Subject: [PATCH 3161/3724] angelscript: 2.37.0 -> 2.38.0

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

diff --git a/pkgs/by-name/an/angelscript/package.nix b/pkgs/by-name/an/angelscript/package.nix
index 82ae8c96687d..a84cc9910126 100644
--- a/pkgs/by-name/an/angelscript/package.nix
+++ b/pkgs/by-name/an/angelscript/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "angelscript";
-  version = "2.37.0";
+  version = "2.38.0";
 
   src = fetchurl {
     url = "https://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    sha256 = "sha256-DFLRaIAWoLJITpylSUccTild8GB3DFeEAUTGSBX1TxA=";
+    sha256 = "sha256-sztdvNoQMX72fWKDU9gyRphM5vysEC1Nwq7RIeulLm8=";
   };
 
   nativeBuildInputs = [

From 47562bbe456884e79603a5ff7e38e2d9f5d9874e Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 24 Aug 2025 17:16:15 +0200
Subject: [PATCH 3162/3724] hashcat: 7.1.1 -> 7.1.2

https://github.com/hashcat/hashcat/releases/tag/v7.1.2
---
 pkgs/by-name/ha/hashcat/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ha/hashcat/package.nix b/pkgs/by-name/ha/hashcat/package.nix
index bbc17b29453a..5bbcafff9ebf 100644
--- a/pkgs/by-name/ha/hashcat/package.nix
+++ b/pkgs/by-name/ha/hashcat/package.nix
@@ -19,21 +19,21 @@
 
 stdenv.mkDerivation rec {
   pname = "hashcat";
-  version = "7.1.1";
+  version = "7.1.2";
 
   src = fetchurl {
     url = "https://hashcat.net/files/hashcat-${version}.tar.gz";
-    sha256 = "sha256-HN9tswWAiNfjiD9jUZtdNF29oBhOyOHhy5hOElXil/A=";
+    sha256 = "sha256-lUamMm10dTC0T8wHm6utQDBKh/MtPJCAAW1Ys5z8i5Y=";
   };
 
   postPatch = ''
      # MACOSX_DEPLOYMENT_TARGET is defined by the enviroment
      # Remove hardcoded paths on darwin
     substituteInPlace src/Makefile \
-      --replace "export MACOSX_DEPLOYMENT_TARGET" "#export MACOSX_DEPLOYMENT_TARGET" \
-      --replace "/usr/bin/ar" "ar" \
-      --replace "/usr/bin/sed" "sed" \
-      --replace '-i ""' '-i'
+      --replace-fail "export MACOSX_DEPLOYMENT_TARGET" "#export MACOSX_DEPLOYMENT_TARGET" \
+      --replace-fail "/usr/bin/ar" "ar" \
+      --replace-fail "/usr/bin/sed" "sed" \
+      --replace-fail '-i ""' '-i'
   '';
 
   nativeBuildInputs = [

From 759dcc6981cd4aa222d36069f78fe7064d563305 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 01:43:11 +1000
Subject: [PATCH 3163/3724] python3Packages.jq: 1.8.0 -> 1.10.0 (#436059)

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

diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix
index b554f7f2a482..d8ed319e2673 100644
--- a/pkgs/development/python-modules/jq/default.nix
+++ b/pkgs/development/python-modules/jq/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "jq";
-  version = "1.8.0";
+  version = "1.10.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "mwilliamson";
     repo = "jq.py";
     tag = version;
-    hash = "sha256-rPc4qIs1lGfbv0ShxJ+uUfbTGchJ+Q0qWWRZVuABlU4=";
+    hash = "sha256-xzkOWIMvGBVJtdZWFFIQkfgTivMTxV+dze71E8S6SlM=";
   };
 
   env.JQPY_USE_SYSTEM_LIBS = 1;

From ab59e0f0ff04fb7c230cb91860a5960de950552c Mon Sep 17 00:00:00 2001
From: Cryolitia PukNgae <Cryolitia@gmail.com>
Date: Sun, 24 Aug 2025 23:43:27 +0800
Subject: [PATCH 3164/3724] gridtracker2: 2.250815.0 -> 2.250820.0

---
 .../by-name/gr/gridtracker2/package-lock.json | 260 ++++++++++++------
 pkgs/by-name/gr/gridtracker2/package.nix      |   6 +-
 2 files changed, 180 insertions(+), 86 deletions(-)

diff --git a/pkgs/by-name/gr/gridtracker2/package-lock.json b/pkgs/by-name/gr/gridtracker2/package-lock.json
index e4cb369d718c..20b28aac55c2 100644
--- a/pkgs/by-name/gr/gridtracker2/package-lock.json
+++ b/pkgs/by-name/gr/gridtracker2/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "GridTracker2",
-  "version": "2.250815.0",
+  "version": "2.250820.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "GridTracker2",
-      "version": "2.250815.0",
+      "version": "2.250820.0",
       "hasInstallScript": true,
       "dependencies": {
         "@electron-toolkit/preload": "3.0.1",
@@ -27,9 +27,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.28.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.2.tgz",
-      "integrity": "sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==",
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.3.tgz",
+      "integrity": "sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -159,9 +159,9 @@
       }
     },
     "node_modules/@electron/fuses/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -316,9 +316,9 @@
       }
     },
     "node_modules/@electron/notarize/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -389,9 +389,9 @@
       }
     },
     "node_modules/@electron/osx-sign/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -456,9 +456,9 @@
       }
     },
     "node_modules/@electron/rebuild/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -545,9 +545,9 @@
       }
     },
     "node_modules/@electron/universal/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -583,6 +583,72 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/@electron/windows-sign": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.2.tgz",
+      "integrity": "sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "cross-dirname": "^0.1.0",
+        "debug": "^4.3.4",
+        "fs-extra": "^11.1.1",
+        "minimist": "^1.2.8",
+        "postject": "^1.0.0-alpha.6"
+      },
+      "bin": {
+        "electron-windows-sign": "bin/electron-windows-sign.js"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/@electron/windows-sign/node_modules/fs-extra": {
+      "version": "11.3.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz",
+      "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/@electron/windows-sign/node_modules/jsonfile": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@electron/windows-sign/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
@@ -886,9 +952,9 @@
       }
     },
     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz",
+      "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1026,9 +1092,9 @@
       }
     },
     "node_modules/@malept/flatpak-bundler/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1255,9 +1321,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.17.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.1.tgz",
-      "integrity": "sha512-y3tBaz+rjspDTylNjAX37jEC3TETEFGNJL6uQDxwF9/8GLLIjW1rvVHlynyuUKMnMr1Roq8jOv3vkopBjC4/VA==",
+      "version": "22.17.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.2.tgz",
+      "integrity": "sha512-gL6z5N9Jm9mhY+U2KXZpteb+09zyffliRkZyZOHODGATyC5B1Jt/7TzuuiLkFsSUMLbS1OLmlj/E+/3KF4Q/4w==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
@@ -1328,9 +1394,9 @@
       "license": "ISC"
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.8.10",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
-      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
+      "version": "0.8.11",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.11.tgz",
+      "integrity": "sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1548,9 +1614,9 @@
       }
     },
     "node_modules/app-builder-lib/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1673,9 +1739,9 @@
       "license": "MIT"
     },
     "node_modules/bl": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.1.tgz",
-      "integrity": "sha512-yYc8UIHrd1ZTLgNBIE7JjMzUPZH+dec3q7nWkrSHEbtvkQ3h6WKC63W9K5jthcL5EXFyMuWYq+2pq5WMSIgFHw==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.2.tgz",
+      "integrity": "sha512-6J3oG82fpJ71WF4l0W6XslkwAPMr+Zcp+AmdxJ0L8LsXNzFeO8GYesV2J9AzGArBjrsb2xR50Ocbn/CL1B44TA==",
       "license": "MIT",
       "dependencies": {
         "@types/readable-stream": "^4.0.0",
@@ -1823,9 +1889,9 @@
       }
     },
     "node_modules/builder-util/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2303,6 +2369,15 @@
         "buffer": "^5.1.0"
       }
     },
+    "node_modules/cross-dirname": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz",
+      "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -2512,9 +2587,9 @@
       }
     },
     "node_modules/dmg-builder/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2714,9 +2789,9 @@
       }
     },
     "node_modules/electron-builder/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2778,9 +2853,9 @@
       }
     },
     "node_modules/electron-publish/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2844,9 +2919,9 @@
       }
     },
     "node_modules/electron-updater/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "license": "MIT",
       "dependencies": {
         "universalify": "^2.0.0"
@@ -3135,9 +3210,9 @@
       }
     },
     "node_modules/eslint_d/node_modules/@eslint/js": {
-      "version": "9.33.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.33.0.tgz",
-      "integrity": "sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==",
+      "version": "9.34.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.34.0.tgz",
+      "integrity": "sha512-EoyvqQnBNsV1CWaEJ559rxXL4c8V92gxirbawSmVUOWXlsRxxQXl6LmCpdUblgxgSkDIqKnhzba2SjRTI/A5Rw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3148,9 +3223,9 @@
       }
     },
     "node_modules/eslint_d/node_modules/eslint": {
-      "version": "9.33.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.33.0.tgz",
-      "integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==",
+      "version": "9.34.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.34.0.tgz",
+      "integrity": "sha512-RNCHRX5EwdrESy3Jc9o8ie8Bog+PeYvvSR8sDGoZxNFTvZ4dlxUB3WzQ3bQMztFrSRODGrLLj8g6OFuGY/aiQg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3160,7 +3235,7 @@
         "@eslint/config-helpers": "^0.3.1",
         "@eslint/core": "^0.15.2",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.33.0",
+        "@eslint/js": "9.34.0",
         "@eslint/plugin-kit": "^0.3.5",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -4257,15 +4332,11 @@
       "license": "ISC"
     },
     "node_modules/ip-address": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz",
+      "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "jsbn": "1.1.0",
-        "sprintf-js": "^1.1.3"
-      },
       "engines": {
         "node": ">= 12"
       }
@@ -4432,13 +4503,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jsbn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -5347,6 +5411,36 @@
         "node": ">=10.4.0"
       }
     },
+    "node_modules/postject": {
+      "version": "1.0.0-alpha.6",
+      "resolved": "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz",
+      "integrity": "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "commander": "^9.4.0"
+      },
+      "bin": {
+        "postject": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/postject/node_modules/commander": {
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -5881,13 +5975,13 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.8.6",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.6.tgz",
-      "integrity": "sha512-pe4Y2yzru68lXCb38aAqRf5gvN8YdjP1lok5o0J7BOHljkyCGKVz7H3vpVIXKD27rj2giOJ7DwVyk/GWrPHDWA==",
+      "version": "2.8.7",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
+      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ip-address": "^9.0.5",
+        "ip-address": "^10.0.1",
         "smart-buffer": "^4.2.0"
       },
       "engines": {
@@ -5957,8 +6051,8 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
       "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-      "devOptional": true,
-      "license": "BSD-3-Clause"
+      "license": "BSD-3-Clause",
+      "optional": true
     },
     "node_modules/ssri": {
       "version": "9.0.1",
@@ -6174,9 +6268,9 @@
       }
     },
     "node_modules/temp-file/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/pkgs/by-name/gr/gridtracker2/package.nix b/pkgs/by-name/gr/gridtracker2/package.nix
index ee345e3fe650..281b022469ae 100644
--- a/pkgs/by-name/gr/gridtracker2/package.nix
+++ b/pkgs/by-name/gr/gridtracker2/package.nix
@@ -18,7 +18,7 @@
   xorg,
 }:
 let
-  version = "2.250815.0";
+  version = "2.250820.0";
   electron = electron_35;
 in
 buildNpmPackage (finalAttrs: {
@@ -29,10 +29,10 @@ buildNpmPackage (finalAttrs: {
     owner = "gridtracker.org";
     repo = "gridtracker2";
     tag = "v${version}";
-    hash = "sha256-GBMnBL+8HGMusO2D0qy0TXWvIFw1fD1Bd0PXhkJ5O1o=";
+    hash = "sha256-d40oq8UXNFaybjbbhqV8Gfkj8SEdTuF92Y0elW9dksY=";
   };
 
-  npmDepsHash = "sha256-8eJAjf/McFTgLA1gAANX8L93h1SDnf0XdAeqmcLiPF0=";
+  npmDepsHash = "sha256-q9QGNYMmeNCouPW9GFsVHSYK9T8N7H4hg6hkOtjmLAY=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

From 79701ac7e98aef7ff676267d1276f81abaf41d83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 16:18:57 +0000
Subject: [PATCH 3165/3724] python3Packages.weblate-schemas: 2025.2 -> 2025.5

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

diff --git a/pkgs/development/python-modules/weblate-schemas/default.nix b/pkgs/development/python-modules/weblate-schemas/default.nix
index 4181eb68a018..4563d1ee40ac 100644
--- a/pkgs/development/python-modules/weblate-schemas/default.nix
+++ b/pkgs/development/python-modules/weblate-schemas/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "weblate-schemas";
-  version = "2025.2";
+  version = "2025.5";
 
   pyproject = true;
 
   src = fetchPypi {
     pname = "weblate_schemas";
     inherit version;
-    hash = "sha256-C8+p+NHCAbLnHh8ujV5YdbjFSzXsKAoUyNhM3iIRPG4=";
+    hash = "sha256-ZhFF3UD7lX/KXVDZFOn+Gc1w/cpzzVYVrbpVeJ9/wiE=";
   };
 
   build-system = [ setuptools ];

From 15f1903fc773094b070701637632eff32ba3d133 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Fri, 15 Aug 2025 14:13:26 +0200
Subject: [PATCH 3166/3724] weblate: 5.12.2 -> 5.13

Changelog: https://github.com/WeblateOrg/weblate/releases/tag/weblate-5.13
---
 pkgs/by-name/we/weblate/cache.lock.patch | 22 ----------------------
 pkgs/by-name/we/weblate/package.nix      | 17 +++--------------
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/by-name/we/weblate/cache.lock.patch

diff --git a/pkgs/by-name/we/weblate/cache.lock.patch b/pkgs/by-name/we/weblate/cache.lock.patch
deleted file mode 100644
index dc5c50cdf77e..000000000000
--- a/pkgs/by-name/we/weblate/cache.lock.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/weblate/utils/lock.py b/weblate/utils/lock.py
-index 53c1486bc9..a0a5fc5a74 100644
---- a/weblate/utils/lock.py
-+++ b/weblate/utils/lock.py
-@@ -43,8 +43,6 @@ class WeblateLock:
-             self._name = self._format_template(cache_template)
-             self._lock = cache.lock(
-                 key=self._name,
--                expire=3600,
--                auto_renewal=True,
-             )
-             self._enter_implementation = self._enter_redis
-         else:
-@@ -62,7 +60,7 @@ class WeblateLock:
- 
-     def _enter_redis(self):
-         try:
--            lock_result = self._lock.acquire(timeout=self._timeout)
-+            lock_result = self._lock.acquire()
-         except AlreadyAcquired:
-             return
- 
diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index 36bbdc21b1ea..82f83e075713 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -27,7 +27,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "weblate";
-  version = "5.12.2";
+  version = "5.13";
 
   pyproject = true;
 
@@ -40,14 +40,9 @@ python.pkgs.buildPythonApplication rec {
     owner = "WeblateOrg";
     repo = "weblate";
     tag = "weblate-${version}";
-    hash = "sha256-YaP0lhL7E0pv3ZyfpQ47CjhrzjJPDwGpSTcgXDaMZdA=";
+    hash = "sha256-fx07SmQodgC4bI/zQT6TNcvGYzVoKT42aXpUx5SlUrk=";
   };
 
-  patches = [
-    # FIXME This shouldn't be necessary and probably has to do with some dependency mismatch.
-    ./cache.lock.patch
-  ];
-
   build-system = with python.pkgs; [ setuptools ];
 
   nativeBuildInputs = [ gettext ];
@@ -83,6 +78,7 @@ python.pkgs.buildPythonApplication rec {
       certifi
       charset-normalizer
       crispy-bootstrap3
+      crispy-bootstrap5
       cryptography
       cssselect
       cython
@@ -125,7 +121,6 @@ python.pkgs.buildPythonApplication rec {
       pyicumessageformat
       pyparsing
       python-dateutil
-      python-redis-lock
       qrcode
       rapidfuzz
       redis
@@ -145,16 +140,10 @@ python.pkgs.buildPythonApplication rec {
       weblate-schemas
     ]
     ++ django.optional-dependencies.argon2
-    ++ python-redis-lock.optional-dependencies.django
     ++ celery.optional-dependencies.redis
     ++ drf-spectacular.optional-dependencies.sidecar
     ++ drf-standardized-errors.optional-dependencies.openapi;
 
-  pythonRelaxDeps = [
-    "certifi"
-    "lxml"
-  ];
-
   optional-dependencies = {
     postgres = with python.pkgs; [ psycopg ];
   };

From 60066ec4c5646a0128d3b73085b60ab7fa6db4dd Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 24 Aug 2025 23:56:49 +0800
Subject: [PATCH 3167/3724] adios2: force use of -fallow-argument-mismatch

---
 pkgs/by-name/ad/adios2/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ad/adios2/package.nix b/pkgs/by-name/ad/adios2/package.nix
index c772ca5cfe41..f5d73d9695b3 100644
--- a/pkgs/by-name/ad/adios2/package.nix
+++ b/pkgs/by-name/ad/adios2/package.nix
@@ -161,6 +161,9 @@ stdenv.mkDerivation (finalAttrs: {
     # Enable support for Little/Big Endian Interoperability
     (lib.cmakeBool "ADIOS2_USE_Endian_Reverse" true)
 
+    # force use of "-fallow-argument-mismatch"
+    (lib.cmakeBool "ADIOS2_USE_Fortran_flag_argument_mismatch" true)
+
     (lib.cmakeBool "ADIOS2_BUILD_EXAMPLES" withExamples)
     (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
     (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")

From 0601cf6fd0868b31429d3e1c90781fbba8b2b0c2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 21 Aug 2025 16:46:15 +0200
Subject: [PATCH 3168/3724] ci/github-script/prepare: avoid running CI when
 targeting channel branches

This moves the no-channel-base check into the prepare script to exit
early and prevent all of CI to run against those branches. We also
provide better output by posting a "Changes Requested" review, using the
existing infrastructure from the old cherry-picks check.

The review will be dismissed automatically once the branch has been
corrected, because the commits check will run and do it.
---
 .github/workflows/check.yml | 14 -------------
 .github/workflows/pr.yml    |  4 ++++
 ci/github-script/prepare.js | 41 +++++++++++++++++++++++++------------
 ci/supportedBranches.js     |  1 +
 4 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index cace4dd2259c..c58d525121aa 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -28,20 +28,6 @@ defaults:
     shell: bash
 
 jobs:
-  no-channel-base:
-    name: no channel base
-    if: contains(fromJSON(inputs.baseBranch).type, 'channel')
-    runs-on: ubuntu-24.04-arm
-    steps:
-      - run: |
-          cat <<EOF
-          The nixos-* and nixpkgs-* branches are pushed to by the channel
-          release script and should not be merged into directly.
-
-          Please target the equivalent release-* branch or master instead.
-          EOF
-          exit 1
-
   commits:
     permissions:
       pull-requests: write
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index a7720df7226a..518ba5d8b5c1 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -23,6 +23,9 @@ permissions: {}
 jobs:
   prepare:
     runs-on: ubuntu-24.04-arm
+    permissions:
+      # wrong branch review comment
+      pull-requests: write
     outputs:
       baseBranch: ${{ steps.prepare.outputs.base }}
       headBranch: ${{ steps.prepare.outputs.head }}
@@ -44,6 +47,7 @@ jobs:
               github,
               context,
               core,
+              dry: context.eventName == 'pull_request',
             })
 
   check:
diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js
index fb000cb6820a..ec117fa466b9 100644
--- a/ci/github-script/prepare.js
+++ b/ci/github-script/prepare.js
@@ -1,6 +1,7 @@
 const { classify } = require('../supportedBranches.js')
+const { postReview } = require('./reviews.js')
 
-module.exports = async ({ github, context, core }) => {
+module.exports = async ({ github, context, core, dry }) => {
   const pull_number = context.payload.pull_request.number
 
   for (const retryInterval of [5, 10, 20, 40, 80]) {
@@ -24,6 +25,32 @@ module.exports = async ({ github, context, core }) => {
 
     const { base, head } = prInfo
 
+    const baseClassification = classify(base.ref)
+    core.setOutput('base', baseClassification)
+    console.log('base classification:', baseClassification)
+
+    const headClassification =
+      base.repo.full_name === head.repo.full_name
+        ? classify(head.ref)
+        : // PRs from forks are always considered WIP.
+          { type: ['wip'] }
+    core.setOutput('head', headClassification)
+    console.log('head classification:', headClassification)
+
+    if (baseClassification.type.includes('channel')) {
+      const { stable, version } = baseClassification
+      const correctBranch = stable ? `release-${version}` : 'master'
+      const body = [
+        'The `nixos-*` and `nixpkgs-*` branches are pushed to by the channel release script and should not be merged into directly.',
+        '',
+        `Please target \`${correctBranch}\` instead.`,
+      ].join('\n')
+
+      await postReview({ github, context, core, dry, body })
+
+      throw new Error('The PR targets a channel branch.')
+    }
+
     let mergedSha, targetSha
 
     if (prInfo.mergeable) {
@@ -56,18 +83,6 @@ module.exports = async ({ github, context, core }) => {
 
     core.setOutput('systems', require('../supportedSystems.json'))
 
-    const baseClassification = classify(base.ref)
-    core.setOutput('base', baseClassification)
-    console.log('base classification:', baseClassification)
-
-    const headClassification =
-      base.repo.full_name === head.repo.full_name
-        ? classify(head.ref)
-        : // PRs from forks are always considered WIP.
-          { type: ['wip'] }
-    core.setOutput('head', headClassification)
-    console.log('head classification:', headClassification)
-
     const files = (
       await github.paginate(github.rest.pulls.listFiles, {
         ...context.repo,
diff --git a/ci/supportedBranches.js b/ci/supportedBranches.js
index fd7dcc9144f3..8cc630afce21 100755
--- a/ci/supportedBranches.js
+++ b/ci/supportedBranches.js
@@ -26,6 +26,7 @@ function classify(branch) {
   return {
     stable: (version ?? 'unstable') !== 'unstable',
     type: typeConfig[prefix] ?? ['wip'],
+    version: version ?? 'unstable',
   }
 }
 

From 87d9b08ffbb7d91109c159900809097d7e401524 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 16 Aug 2025 20:56:17 +0200
Subject: [PATCH 3169/3724] ci/github-script/prepare: identify real base branch

When a contributor mistakenly sets the wrong target branch for a Pull
Request, this can lead to bad consequences for CI. Most prominent is the
mass ping of codeowners, that is already handled in
`ci/request-reviews/verify-base-branch.sh`. But there are other things
that go wrong:
- After eval, a mass ping of maintainers would still be possible, in
theory. Practically, this doesn't happen, because we have a limit of 10
reviewer requests at the same time.
- This will most often contain a change to `ci/pinned.json`, thus the
full Eval matrix of all Lix/Nix versions will be run, burning a lot of
resources.
- The PR will be labelled with almost all labels that are available.

We can improve on the current situation with some API calls to determine
the "best" merge-base for the current PR. We then consider this as the
"real base". If the current target is not the real base, we fail the
prepare step, which is early enough to prevent all other CI from
running.
---
 .github/workflows/push.yml                    |   1 -
 ci/github-script/prepare.js                   | 130 +++++++++++++++++-
 ci/github-script/run                          |   5 +-
 ci/request-reviews/default.nix                |   3 -
 ci/request-reviews/dev-branches.txt           |   8 --
 .../request-code-owner-reviews.sh             |  24 +---
 ci/request-reviews/verify-base-branch.sh      | 104 --------------
 ci/supportedBranches.js                       |  14 ++
 8 files changed, 147 insertions(+), 142 deletions(-)
 delete mode 100644 ci/request-reviews/dev-branches.txt
 delete mode 100755 ci/request-reviews/verify-base-branch.sh

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 31d3932e2cd4..d76b7f3867bd 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -2,7 +2,6 @@ name: Push
 
 on:
   push:
-    # Keep this synced with ci/request-reviews/dev-branches.txt
     branches:
       - master
       - staging
diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js
index ec117fa466b9..5b04c5456de5 100644
--- a/ci/github-script/prepare.js
+++ b/ci/github-script/prepare.js
@@ -51,6 +51,134 @@ module.exports = async ({ github, context, core, dry }) => {
       throw new Error('The PR targets a channel branch.')
     }
 
+    if (headClassification.type.includes('wip')) {
+      // In the following, we look at the git history to determine the base branch that
+      // this Pull Request branched off of. This is *supposed* to be the branch that it
+      // merges into, but humans make mistakes. Once that happens we want to error out as
+      // early as possible.
+
+      // To determine the "real base", we are looking at the merge-base of primary development
+      // branches and the head of the PR. The merge-base which results in the least number of
+      // commits between that base and head is the real base. We can query for this via GitHub's
+      // REST API. There can be multiple candidates for the real base with the same number of
+      // commits. In this case we pick the "best" candidate by a fixed ordering of branches,
+      // as defined in ci/supportedBranches.js.
+      //
+      // These requests take a while, when comparing against the wrong release - they need
+      // to look at way more than 10k commits in that case. Thus, we try to minimize the
+      // number of requests across releases:
+      // - First, we look at the primary development branches only: master and release-xx.yy.
+      //   The branch with the fewest commits gives us the release this PR belongs to.
+      // - We then compare this number against the relevant staging branches for this release
+      //   to find the exact branch that this belongs to.
+
+      // All potential development branches
+      const branches = (
+        await github.paginate(github.rest.repos.listBranches, {
+          ...context.repo,
+          per_page: 100,
+        })
+      ).map(({ name }) => classify(name))
+
+      // All stable primary development branches from latest to oldest.
+      const releases = branches
+        .filter(({ stable, type }) => type.includes('primary') && stable)
+        .sort((a, b) => b.version.localeCompare(a.version))
+
+      async function mergeBase({ branch, order, version }) {
+        const { data } = await github.rest.repos.compareCommitsWithBasehead({
+          ...context.repo,
+          basehead: `${branch}...${head.sha}`,
+          // Pagination for this endpoint is about the commits listed, which we don't care about.
+          per_page: 1,
+          // Taking the second page skips the list of files of this changeset.
+          page: 2,
+        })
+        return {
+          branch,
+          order,
+          version,
+          commits: data.total_commits,
+          sha: data.merge_base_commit.sha,
+        }
+      }
+
+      // Multiple branches can be OK at the same time, if the PR was created of a merge-base,
+      // thus storing as array.
+      let candidates = [await mergeBase(classify('master'))]
+      for (const release of releases) {
+        const nextCandidate = await mergeBase(release)
+        if (candidates[0].commits === nextCandidate.commits)
+          candidates.push(nextCandidate)
+        if (candidates[0].commits > nextCandidate.commits)
+          candidates = [nextCandidate]
+        // The number 10000 is principally arbitrary, but the GitHub API returns this value
+        // when the number of commits exceeds it in reality. The difference between two stable releases
+        // is certainly more than 10k commits, thus this works for us as well: If we're targeting
+        // a wrong release, the number *will* be 10000.
+        if (candidates[0].commits < 10000) break
+      }
+
+      core.info(`This PR is for NixOS ${candidates[0].version}.`)
+
+      // Secondary development branches for the selected version only.
+      const secondary = branches.filter(
+        ({ branch, type, version }) =>
+          type.includes('secondary') && version === candidates[0].version,
+      )
+
+      // Make sure that we always check the current target as well, even if its a WIP branch.
+      // If it's not a WIP branch, it was already included in either releases or secondary.
+      if (classify(base.ref).type.includes('wip')) {
+        secondary.push(classify(base.ref))
+      }
+
+      for (const branch of secondary) {
+        const nextCandidate = await mergeBase(branch)
+        if (candidates[0].commits === nextCandidate.commits)
+          candidates.push(nextCandidate)
+        if (candidates[0].commits > nextCandidate.commits)
+          candidates = [nextCandidate]
+      }
+
+      // If the current branch is among the candidates, this is always better than any other,
+      // thus sorting at -1.
+      candidates = candidates
+        .map((candidate) =>
+          candidate.branch === base.ref
+            ? { ...candidate, order: -1 }
+            : candidate,
+        )
+        .sort((a, b) => a.order - b.order)
+
+      const best = candidates.at(0)
+
+      core.info('The base branches for this PR are:')
+      core.info(`github: ${base.ref}`)
+      core.info(
+        `candidates: ${candidates.map(({ branch }) => branch).join(',')}`,
+      )
+      core.info(`best candidate: ${best.branch}`)
+
+      if (best.branch !== base.ref) {
+        const current = await mergeBase(classify(base.ref))
+        const body = [
+          `The PR's base branch is set to \`${current.branch}\`, but ${current.commits === 10000 ? 'at least 10000' : current.commits - best.commits} commits from the \`${best.branch}\` branch are included. Make sure you know the [right base branch for your changes](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#branch-conventions), then:`,
+          `- If the changes should go to the \`${best.branch}\` branch, [change the base branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request).`,
+          `- If the changes should go to the \`${current.branch}\` branch, rebase your PR onto the correct merge-base:`,
+          '  ```bash',
+          `  # git rebase --onto $(git merge-base upstream/${current.branch} HEAD) $(git merge-base upstream/${best.branch} HEAD)`,
+          `  git rebase --onto ${current.sha} ${best.sha}`,
+          `  git push --force-with-lease`,
+          '  ```',
+        ].join('\n')
+
+        await postReview({ github, context, core, dry, body })
+
+        throw new Error(`The PR contains commits from a different base.`)
+      }
+    }
+
     let mergedSha, targetSha
 
     if (prInfo.mergeable) {
@@ -66,7 +194,7 @@ module.exports = async ({ github, context, core, dry }) => {
     } else {
       core.warning('The PR has a merge conflict.')
 
-      mergedSha = prInfo.head.sha
+      mergedSha = head.sha
       targetSha = (
         await github.rest.repos.compareCommitsWithBasehead({
           ...context.repo,
diff --git a/ci/github-script/run b/ci/github-script/run
index 17dac5ab3a2d..eeaee253ef42 100755
--- a/ci/github-script/run
+++ b/ci/github-script/run
@@ -46,9 +46,10 @@ program
   .argument('<owner>', 'Owner of the GitHub repository to check (Example: NixOS)')
   .argument('<repo>', 'Name of the GitHub repository to check (Example: nixpkgs)')
   .argument('<pr>', 'Number of the Pull Request to check')
-  .action(async (owner, repo, pr) => {
+  .option('--no-dry', 'Make actual modifications')
+  .action(async (owner, repo, pr, options) => {
     const prepare = (await import('./prepare.js')).default
-    run(prepare, owner, repo, pr)
+    run(prepare, owner, repo, pr, options)
   })
 
 program
diff --git a/ci/request-reviews/default.nix b/ci/request-reviews/default.nix
index b180d60be97c..075ff52fd564 100644
--- a/ci/request-reviews/default.nix
+++ b/ci/request-reviews/default.nix
@@ -17,15 +17,12 @@ stdenvNoCC.mkDerivation {
       ./get-code-owners.sh
       ./request-reviewers.sh
       ./request-code-owner-reviews.sh
-      ./verify-base-branch.sh
-      ./dev-branches.txt
     ];
   };
   nativeBuildInputs = [ makeWrapper ];
   dontBuild = true;
   installPhase = ''
     mkdir -p $out/bin
-    mv dev-branches.txt $out/bin
     for bin in *.sh; do
       mv "$bin" "$out/bin"
       wrapProgram "$out/bin/$bin" \
diff --git a/ci/request-reviews/dev-branches.txt b/ci/request-reviews/dev-branches.txt
deleted file mode 100644
index b34092546f18..000000000000
--- a/ci/request-reviews/dev-branches.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Trusted development branches:
-# These generally require PRs to update and are built by Hydra.
-# Keep this synced with the branches in .github/workflows/eval.yml
-master
-staging
-release-*
-staging-*
-haskell-updates
diff --git a/ci/request-reviews/request-code-owner-reviews.sh b/ci/request-reviews/request-code-owner-reviews.sh
index fefc8c3be3fa..663285ae03fe 100755
--- a/ci/request-reviews/request-code-owner-reviews.sh
+++ b/ci/request-reviews/request-code-owner-reviews.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Requests reviews for a PR after verifying that the base branch is correct
+# Requests reviews for a PR
 
 set -euo pipefail
 tmp=$(mktemp -d)
@@ -11,14 +11,6 @@ log() {
     echo "$@" >&2
 }
 
-effect() {
-    if [[ -n "${DRY_MODE:-}" ]]; then
-        log "Skipping in dry mode:" "${@@Q}"
-    else
-        "$@"
-    fi
-}
-
 if (( $# < 3 )); then
     log "Usage: $0 GITHUB_REPO PR_NUMBER OWNERS_FILE"
     exit 1
@@ -63,20 +55,6 @@ git -C "$tmp/nixpkgs.git" config remote.fork.promisor true
 git -C "$tmp/nixpkgs.git" fetch --no-tags fork "$prBranch"
 headRef=$(git -C "$tmp/nixpkgs.git" rev-parse refs/remotes/fork/"$prBranch")
 
-log "Checking correctness of the base branch"
-if ! "$SCRIPT_DIR"/verify-base-branch.sh "$tmp/nixpkgs.git" "$headRef" "$baseRepo" "$baseBranch" "$prRepo" "$prBranch" | tee "$tmp/invalid-base-error" >&2; then
-    log "Posting error as comment"
-    if ! response=$(effect gh api \
-        --method POST \
-        -H "Accept: application/vnd.github+json" \
-        -H "X-GitHub-Api-Version: 2022-11-28" \
-        "/repos/$baseRepo/issues/$prNumber/comments" \
-        -F "body=@$tmp/invalid-base-error"); then
-        log "Failed to post the comment: $response"
-    fi
-    exit 1
-fi
-
 log "Requesting reviews from code owners"
 "$SCRIPT_DIR"/get-code-owners.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseBranch" "$headRef" | \
     "$SCRIPT_DIR"/request-reviewers.sh "$baseRepo" "$prNumber" "$prAuthor"
diff --git a/ci/request-reviews/verify-base-branch.sh b/ci/request-reviews/verify-base-branch.sh
deleted file mode 100755
index 7be280db8d65..000000000000
--- a/ci/request-reviews/verify-base-branch.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env bash
-
-# Check that a PR doesn't include commits from other development branches.
-# Fails with next steps if it does
-
-set -euo pipefail
-tmp=$(mktemp -d)
-trap 'rm -rf "$tmp"' exit
-SCRIPT_DIR=$(dirname "$0")
-
-log() {
-    echo "$@" >&2
-}
-
-# Small helper to check whether an element is in a list
-# Usage: `elementIn foo "${list[@]}"`
-elementIn() {
-    local e match=$1
-    shift
-    for e; do
-        if [[ "$e" == "$match" ]]; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-if (( $# < 6 )); then
-    log "Usage: $0 LOCAL_REPO HEAD_REF BASE_REPO BASE_BRANCH PR_REPO PR_BRANCH"
-    exit 1
-fi
-localRepo=$1
-headRef=$2
-baseRepo=$3
-baseBranch=$4
-prRepo=$5
-prBranch=$6
-
-# All development branches
-devBranchPatterns=()
-while read -r pattern; do
-    if [[ "$pattern" != '#'* ]]; then
-        devBranchPatterns+=("$pattern")
-    fi
-done < "$SCRIPT_DIR/dev-branches.txt"
-
-git -C "$localRepo" branch --list --format "%(refname:short)" "${devBranchPatterns[@]}" > "$tmp/dev-branches"
-readarray -t devBranches < "$tmp/dev-branches"
-
-if [[ "$baseRepo" == "$prRepo" ]] && elementIn "$prBranch" "${devBranches[@]}"; then
-    log "This PR merges $prBranch into $baseBranch, no commit check necessary"
-    exit 0
-fi
-
-# The current merge base of the PR
-prMergeBase=$(git -C "$localRepo" merge-base "$baseBranch" "$headRef")
-log "The PR's merge base with the base branch $baseBranch is $prMergeBase"
-
-# This is purely for debugging
-git -C "$localRepo" rev-list --reverse "$baseBranch".."$headRef" > "$tmp/pr-commits"
-log "The PR includes these $(wc -l < "$tmp/pr-commits") commits:"
-cat <"$tmp/pr-commits" >&2
-
-for testBranch in "${devBranches[@]}"; do
-
-    if [[ -z "$(git -C "$localRepo" rev-list -1 --since="1 month ago" "$testBranch")" ]]; then
-        log "Not checking $testBranch, was inactive for the last month"
-        continue
-    fi
-    log "Checking if commits from $testBranch are included in the PR"
-
-    # We need to check for any commits that are in the PR which are also in the test branch.
-    # We could check each commit from the PR individually, but that's unnecessarily slow.
-    #
-    # This does _almost_ what we want: `git rev-list --count headRef testBranch ^baseBranch`,
-    # except that it includes commits that are reachable from _either_ headRef or testBranch,
-    # instead of restricting it to ones reachable by both
-
-    # Easily fixable though, because we can use `git merge-base testBranch headRef`
-    # to get the least common ancestor (aka merge base) commit reachable by both.
-    # If the branch being tested is indeed the right base branch,
-    # this is then also the commit from that branch that the PR is based on top of.
-    testMergeBase=$(git -C "$localRepo" merge-base "$testBranch" "$headRef")
-
-    # And then use the `git rev-list --count`, but replacing the non-working
-    # `headRef testBranch` with the merge base of the two.
-    extraCommits=$(git -C "$localRepo" rev-list --count "$testMergeBase" ^"$baseBranch")
-
-    if (( extraCommits != 0 )); then
-        log -e "\e[33m"
-        echo "The PR's base branch is set to $baseBranch, but $extraCommits commits from the $testBranch branch are included. Make sure you know the [right base branch for your changes](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#branch-conventions), then:"
-        echo "- If the changes should go to the $testBranch branch, [change the base branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request) to $testBranch"
-        echo "- If the changes should go to the $baseBranch branch, rebase your PR onto the merge base with the $baseBranch branch:"
-        echo "  \`\`\`bash"
-        echo "  # git rebase --onto \$(git merge-base upstream/$baseBranch HEAD) \$(git merge-base upstream/$testBranch HEAD)"
-        echo "  git rebase --onto $prMergeBase $testMergeBase"
-        echo "  git push --force-with-lease"
-        echo "  \`\`\`"
-        log -e "\e[m"
-        exit 1
-    fi
-done
-
-log "Base branch is correct, no commits from development branches are included"
diff --git a/ci/supportedBranches.js b/ci/supportedBranches.js
index 8cc630afce21..5bce128e52ff 100755
--- a/ci/supportedBranches.js
+++ b/ci/supportedBranches.js
@@ -13,6 +13,16 @@ const typeConfig = {
   nixpkgs: ['channel'],
 }
 
+// "order" ranks the development branches by how likely they are the intended base branch
+// when they are an otherwise equally good fit according to ci/github-script/prepare.js.
+const orderConfig = {
+  master: 0,
+  release: 1,
+  staging: 2,
+  'haskell-updates': 3,
+  'staging-next': 4,
+}
+
 function split(branch) {
   return {
     ...branch.match(
@@ -24,6 +34,8 @@ function split(branch) {
 function classify(branch) {
   const { prefix, version } = split(branch)
   return {
+    branch,
+    order: orderConfig[prefix] ?? Infinity,
     stable: (version ?? 'unstable') !== 'unstable',
     type: typeConfig[prefix] ?? ['wip'],
     version: version ?? 'unstable',
@@ -40,6 +52,7 @@ if (!module.parent) {
   }
   testSplit('master')
   testSplit('release-25.05')
+  testSplit('staging')
   testSplit('staging-next')
   testSplit('staging-25.05')
   testSplit('staging-next-25.05')
@@ -56,6 +69,7 @@ if (!module.parent) {
   }
   testClassify('master')
   testClassify('release-25.05')
+  testClassify('staging')
   testClassify('staging-next')
   testClassify('staging-25.05')
   testClassify('staging-next-25.05')

From b5b19bf460bf3269e15616792fb8c38a7e61437e Mon Sep 17 00:00:00 2001
From: Ludovico Piero <lewdovico@gnuweeb.org>
Date: Mon, 25 Aug 2025 01:36:10 +0900
Subject: [PATCH 3170/3724] gallery-dl: 1.30.4 -> 1.30.5

Changelog: https://github.com/mikf/gallery-dl/blob/v1.30.5/CHANGELOG.md

Signed-off-by: Ludovico Piero <lewdovico@gnuweeb.org>
---
 pkgs/by-name/ga/gallery-dl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix
index 94f75a7d304d..b0e2d3910e5a 100644
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "gallery-dl";
-  version = "1.30.4";
+  version = "1.30.5";
 in
 python3Packages.buildPythonApplication {
   inherit pname version;
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
     owner = "mikf";
     repo = "gallery-dl";
     tag = "v${version}";
-    hash = "sha256-fDLtB3l682+APcOkvQCPAfxCqWhjEi2E7sEU617fzyg=";
+    hash = "sha256-RsYg3DSiB6DWVlwAJT7iN7rNxUJqT5EAIGNEuMuIm8Y=";
   };
 
   build-system = [ python3Packages.setuptools ];

From 397d5560f235d9a23e46e7a6ef751d7ce1c4733a Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 24 Aug 2025 12:45:48 +0000
Subject: [PATCH 3171/3724] nixos/temporal: init module

---
 nixos/modules/module-list.nix                 |   1 +
 .../services/cluster/temporal/default.nix     | 146 ++++++++++++++++++
 2 files changed, 147 insertions(+)
 create mode 100644 nixos/modules/services/cluster/temporal/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4f5224274d1a..b4d2ebc3c7ae 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -484,6 +484,7 @@
   ./services/cluster/patroni/default.nix
   ./services/cluster/rke2/default.nix
   ./services/cluster/spark/default.nix
+  ./services/cluster/temporal/default.nix
   ./services/computing/boinc/client.nix
   ./services/computing/foldingathome/client.nix
   ./services/computing/slurm/slurm.nix
diff --git a/nixos/modules/services/cluster/temporal/default.nix b/nixos/modules/services/cluster/temporal/default.nix
new file mode 100644
index 000000000000..57a3e39157d3
--- /dev/null
+++ b/nixos/modules/services/cluster/temporal/default.nix
@@ -0,0 +1,146 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.temporal;
+
+  settingsFormat = pkgs.formats.yaml { };
+
+  usingDefaultDataDir = cfg.dataDir == "/var/lib/temporal";
+  usingDefaultUserAndGroup = cfg.user == "temporal" && cfg.group == "temporal";
+in
+{
+  meta.maintainers = [ lib.maintainers.jpds ];
+
+  options.services.temporal = {
+    enable = lib.mkEnableOption "Temporal";
+
+    package = lib.mkPackageOption pkgs "Temporal" {
+      default = [ "temporal" ];
+    };
+
+    settings = lib.mkOption {
+      type = lib.types.submodule {
+        freeformType = settingsFormat.type;
+      };
+
+      description = ''
+        Temporal configuration.
+
+        See <https://docs.temporal.io/references/configuration> for more
+        information about Temporal configuration options
+      '';
+    };
+
+    dataDir = lib.mkOption {
+      type = lib.types.path;
+      default = "/var/lib/temporal";
+      apply = lib.converge (lib.removeSuffix "/");
+      description = ''
+        Data directory for Temporal. If you change this, you need to
+        manually create the directory. You also need to create the
+        `temporal` user and group, or change
+        [](#opt-services.temporal.user) and
+        [](#opt-services.temporal.group) to existing ones with
+        access to the directory.
+      '';
+    };
+
+    user = lib.mkOption {
+      type = lib.types.str;
+      default = "temporal";
+      description = ''
+        The user Temporal runs as. Should be left at default unless
+        you have very specific needs.
+      '';
+    };
+
+    group = lib.mkOption {
+      type = lib.types.str;
+      default = "temporal";
+      description = ''
+        The group temporal runs as. Should be left at default unless
+        you have very specific needs.
+      '';
+    };
+
+    restartIfChanged = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Automatically restart the service on config change.
+        This can be set to false to defer restarts on a server or cluster.
+        Please consider the security implications of inadvertently running an older version,
+        and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option.
+      '';
+      default = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.etc."temporal/temporal-server.yaml".source =
+      settingsFormat.generate "temporal-server.yaml" cfg.settings;
+
+    systemd.services.temporal = {
+      description = "Temporal server";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      inherit (cfg) restartIfChanged;
+      restartTriggers = [ config.environment.etc."temporal/temporal-server.yaml".source ];
+      environment = {
+        HOME = cfg.dataDir;
+      };
+      serviceConfig = {
+        ExecStart = ''
+          ${cfg.package}/bin/temporal-server --root / --config /etc/temporal/ -e temporal-server start
+        '';
+        User = cfg.user;
+        Group = cfg.group;
+        Restart = "on-failure";
+        DynamicUser = usingDefaultUserAndGroup && usingDefaultDataDir;
+        CapabilityBoundingSet = [ "" ];
+        DevicePolicy = "closed";
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectControlGroups = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "strict";
+        ReadWritePaths = [
+          cfg.dataDir
+        ];
+        RestrictAddressFamilies = [
+          "AF_NETLINK"
+          "AF_INET"
+          "AF_INET6"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          # 1. allow a reasonable set of syscalls
+          "@system-service @resources"
+          # 2. and deny unreasonable ones
+          "~@privileged"
+          # 3. then allow the required subset within denied groups
+          "@chown"
+        ];
+      }
+      // (lib.optionalAttrs (usingDefaultDataDir) {
+        StateDirectory = "temporal";
+        StateDirectoryMode = "0700";
+      });
+    };
+  };
+}

From 20da4c1b706f92a2895e29024e4034e447f9e3d2 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 24 Aug 2025 12:46:22 +0000
Subject: [PATCH 3172/3724] nixos/temporal: init test

---
 nixos/tests/all-tests.nix |   1 +
 nixos/tests/temporal.nix  | 311 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 312 insertions(+)
 create mode 100644 nixos/tests/temporal.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1c354f312617..b3d2fbaee8ed 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1488,6 +1488,7 @@ in
   teleport = handleTest ./teleport.nix { };
   teleports = runTest ./teleports.nix;
   thelounge = handleTest ./thelounge.nix { };
+  temporal = runTest ./temporal.nix;
   terminal-emulators = handleTest ./terminal-emulators.nix { };
   thanos = runTest ./thanos.nix;
   tiddlywiki = runTest ./tiddlywiki.nix;
diff --git a/nixos/tests/temporal.nix b/nixos/tests/temporal.nix
new file mode 100644
index 000000000000..80ad0540a673
--- /dev/null
+++ b/nixos/tests/temporal.nix
@@ -0,0 +1,311 @@
+(
+  { lib, pkgs, ... }:
+
+  {
+    name = "temporal";
+    meta.maintainers = [ pkgs.lib.maintainers.jpds ];
+
+    nodes = {
+      temporal =
+        { config, pkgs, ... }:
+        {
+          networking.firewall.allowedTCPPorts = [ 7233 ];
+
+          environment.systemPackages = [
+            (pkgs.writers.writePython3Bin "temporal-hello-workflow.py"
+              {
+                libraries = [ pkgs.python3Packages.temporalio ];
+              }
+              # Graciously taken from https://github.com/temporalio/samples-python/blob/main/hello/hello_activity.py
+              ''
+                import asyncio
+                from concurrent.futures import ThreadPoolExecutor
+                from dataclasses import dataclass
+                from datetime import timedelta
+
+                from temporalio import activity, workflow
+                from temporalio.client import Client
+                from temporalio.worker import Worker
+
+
+                # While we could use multiple parameters in the activity, Temporal strongly
+                # encourages using a single dataclass instead which can have fields added to it
+                # in a backwards-compatible way.
+                @dataclass
+                class ComposeGreetingInput:
+                    greeting: str
+                    name: str
+
+
+                # Basic activity that logs and does string concatenation
+                @activity.defn
+                def compose_greeting(input: ComposeGreetingInput) -> str:
+                    activity.logger.info("Running activity with parameter %s" % input)
+                    return f"{input.greeting}, {input.name}!"
+
+
+                # Basic workflow that logs and invokes an activity
+                @workflow.defn
+                class GreetingWorkflow:
+                    @workflow.run
+                    async def run(self, name: str) -> str:
+                        workflow.logger.info("Running workflow with parameter %s" % name)
+                        return await workflow.execute_activity(
+                            compose_greeting,
+                            ComposeGreetingInput("Hello", name),
+                            start_to_close_timeout=timedelta(seconds=10),
+                        )
+
+
+                async def main():
+                    # Uncomment the lines below to see logging output
+                    # import logging
+                    # logging.basicConfig(level=logging.INFO)
+
+                    # Start client
+                    client = await Client.connect("localhost:7233")
+
+                    # Run a worker for the workflow
+                    async with Worker(
+                        client,
+                        task_queue="hello-activity-task-queue",
+                        workflows=[GreetingWorkflow],
+                        activities=[compose_greeting],
+                        # Non-async activities require an executor;
+                        # a thread pool executor is recommended.
+                        # This same thread pool could be passed to multiple workers if desired.
+                        activity_executor=ThreadPoolExecutor(5),
+                    ):
+
+                        # While the worker is running, use the client to run the workflow and
+                        # print out its result. Note, in many production setups, the client
+                        # would be in a completely separate process from the worker.
+                        result = await client.execute_workflow(
+                            GreetingWorkflow.run,
+                            "World",
+                            id="hello-activity-workflow-id",
+                            task_queue="hello-activity-task-queue",
+                        )
+                        print(f"Result: {result}")
+
+
+                if __name__ == "__main__":
+                    asyncio.run(main())
+              ''
+            )
+            pkgs.temporal-cli
+          ];
+
+          services.temporal = {
+            enable = true;
+            settings = {
+              # Based on https://github.com/temporalio/temporal/blob/main/config/development-sqlite.yaml
+              log = {
+                stdout = true;
+                level = "info";
+              };
+              services = {
+                frontend = {
+                  rpc = {
+                    grpcPort = 7233;
+                    membershipPort = 6933;
+                    bindOnLocalHost = true;
+                    httpPort = 7243;
+                  };
+                };
+                matching = {
+                  rpc = {
+                    grpcPort = 7235;
+                    membershipPort = 6935;
+                    bindOnLocalHost = true;
+                  };
+                };
+                history = {
+                  rpc = {
+                    grpcPort = 7234;
+                    membershipPort = 6934;
+                    bindOnLocalHost = true;
+                  };
+                };
+                worker = {
+                  rpc = {
+                    grpcPort = 7239;
+                    membershipPort = 6939;
+                    bindOnLocalHost = true;
+                  };
+                };
+              };
+
+              persistence = {
+                defaultStore = "sqlite-default";
+                visibilityStore = "sqlite-visibility";
+                numHistoryShards = 1;
+                datastores = {
+                  sqlite-default = {
+                    sql = {
+                      user = "";
+                      password = "";
+                      pluginName = "sqlite";
+                      databaseName = "default";
+                      connectAddr = "localhost";
+                      connectProtocol = "tcp";
+                      connectAttributes = {
+                        mode = "memory";
+                        cache = "private";
+                      };
+                      maxConns = 1;
+                      maxIdleConns = 1;
+                      maxConnLifetime = "1h";
+                      tls = {
+                        enabled = false;
+                        caFile = "";
+                        certFile = "";
+                        keyFile = "";
+                        enableHostVerification = false;
+                        serverName = "";
+                      };
+                    };
+                  };
+                  sqlite-visibility = {
+                    sql = {
+                      user = "";
+                      password = "";
+                      pluginName = "sqlite";
+                      databaseName = "default";
+                      connectAddr = "localhost";
+                      connectProtocol = "tcp";
+                      connectAttributes = {
+                        mode = "memory";
+                        cache = "private";
+                      };
+                      maxConns = 1;
+                      maxIdleConns = 1;
+                      maxConnLifetime = "1h";
+                      tls = {
+                        enabled = false;
+                        caFile = "";
+                        certFile = "";
+                        keyFile = "";
+                        enableHostVerification = false;
+                        serverName = "";
+                      };
+                    };
+                  };
+                };
+              };
+              clusterMetadata = {
+                enableGlobalNamespace = false;
+                failoverVersionIncrement = 10;
+                masterClusterName = "active";
+                currentClusterName = "active";
+                clusterInformation = {
+                  active = {
+                    enabled = true;
+                    initialFailoverVersion = 1;
+                    rpcName = "frontend";
+                    rpcAddress = "localhost:7233";
+                    httpAddress = "localhost:7243";
+                  };
+                };
+              };
+
+              dcRedirectionPolicy = {
+                policy = "noop";
+              };
+
+              archival = {
+                history = {
+                  state = "enabled";
+                  enableRead = true;
+                  provider = {
+                    filestore = {
+                      fileMode = "0666";
+                      dirMode = "0766";
+                    };
+                    gstorage = {
+                      credentialsPath = "/tmp/gcloud/keyfile.json";
+                    };
+                  };
+                };
+                visibility = {
+                  state = "enabled";
+                  enableRead = true;
+                  provider = {
+                    filestore = {
+                      fileMode = "0666";
+                      dirMode = "0766";
+                    };
+                  };
+                };
+              };
+
+              namespaceDefaults = {
+                archival = {
+                  history = {
+                    state = "disabled";
+                    URI = "file:///tmp/temporal_archival/development";
+                  };
+                  visibility = {
+                    state = "disabled";
+                    URI = "file:///tmp/temporal_vis_archival/development";
+                  };
+                };
+              };
+            };
+          };
+        };
+    };
+
+    testScript = ''
+      temporal.wait_for_unit("temporal")
+      temporal.wait_for_open_port(6933)
+      temporal.wait_for_open_port(6934)
+      temporal.wait_for_open_port(6935)
+      temporal.wait_for_open_port(7233)
+      temporal.wait_for_open_port(7234)
+      temporal.wait_for_open_port(7235)
+
+      temporal.wait_until_succeeds(
+        "journalctl -o cat -u temporal.service | grep 'server-version' | grep '${pkgs.temporal.version}'"
+      )
+
+      temporal.wait_until_succeeds(
+        "journalctl -o cat -u temporal.service | grep 'Frontend is now healthy'"
+      )
+
+      import json
+      cluster_list_json = json.loads(temporal.wait_until_succeeds("temporal operator cluster list --output json"))
+      assert cluster_list_json[0]['clusterName'] == "active"
+
+      cluster_describe_json = json.loads(temporal.wait_until_succeeds("temporal operator cluster describe --output json"))
+      assert cluster_describe_json['serverVersion'] in "${pkgs.temporal.version}"
+
+      temporal.log(temporal.wait_until_succeeds("temporal operator namespace create --namespace default"))
+
+      temporal.wait_until_succeeds(
+        "journalctl -o cat -u temporal.service | grep 'Register namespace succeeded'"
+      )
+
+      namespace_list_json = json.loads(temporal.wait_until_succeeds("temporal operator namespace list --output json"))
+      assert len(namespace_list_json) == 2
+
+      namespace_describe_json = json.loads(temporal.wait_until_succeeds("temporal operator namespace describe --output json --namespace default"))
+      assert namespace_describe_json['namespaceInfo']['name'] == "default"
+      assert namespace_describe_json['namespaceInfo']['state'] == "NAMESPACE_STATE_REGISTERED"
+
+      workflow_json = json.loads(temporal.wait_until_succeeds("temporal workflow list --output json"))
+      assert len(workflow_json) == 0
+
+      out = temporal.wait_until_succeeds("temporal-hello-workflow.py")
+      assert "Result: Hello, World!" in out
+
+      workflow_json = json.loads(temporal.wait_until_succeeds("temporal workflow list --output json"))
+      assert workflow_json[0]['execution']['workflowId'] == "hello-activity-workflow-id"
+      assert workflow_json[0]['status'] == "WORKFLOW_EXECUTION_STATUS_COMPLETED"
+
+      temporal.log(temporal.succeed(
+        "systemd-analyze security temporal.service | grep -v '✓'"
+      ))
+    '';
+  }
+)

From 04fa7e2527a6dafe78f8885451e8d82f764ea599 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 24 Aug 2025 12:48:10 +0000
Subject: [PATCH 3173/3724] temporal: Add NixOS test to passthru.tests

---
 pkgs/by-name/te/temporal/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/te/temporal/package.nix b/pkgs/by-name/te/temporal/package.nix
index cd8d5fe9f2f7..4563b01153a0 100644
--- a/pkgs/by-name/te/temporal/package.nix
+++ b/pkgs/by-name/te/temporal/package.nix
@@ -2,6 +2,7 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
+  nixosTests,
   testers,
   temporal,
 }:
@@ -46,8 +47,11 @@ buildGoModule rec {
     runHook postInstall
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = temporal;
+  passthru.tests = {
+    inherit (nixosTests) temporal;
+    version = testers.testVersion {
+      package = temporal;
+    };
   };
 
   meta = {

From 097eec36759a1cbface8f615c0794ba937ec90b3 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 24 Aug 2025 12:49:42 +0000
Subject: [PATCH 3174/3724] python3Packages.temporalio: Add NixOS test to
 passthru.tests

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

diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix
index 53c977258832..7a0da27c77cb 100644
--- a/pkgs/development/python-modules/temporalio/default.nix
+++ b/pkgs/development/python-modules/temporalio/default.nix
@@ -7,6 +7,7 @@
   maturin,
   nexusrpc,
   nix-update-script,
+  nixosTests,
   pythonOlder,
   poetry-core,
   protobuf5,
@@ -79,7 +80,10 @@ buildPythonPackage rec {
     "temporalio.worker"
   ];
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    tests = { inherit (nixosTests) temporal; };
+    updateScript = nix-update-script { };
+  };
 
   meta = {
     description = "Temporal Python SDK";

From f20852e46ff999ae9ff2f2fbeb53044ebdcf4a42 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 24 Aug 2025 12:51:51 +0000
Subject: [PATCH 3175/3724] doc/release-notes: 25.11: Add Temporal item to new
 services

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

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index fb7f8196dca1..38becffc6c94 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -98,6 +98,10 @@
 
 - [KMinion](https://github.com/redpanda-data/kminion), feature-rich Prometheus exporter for Apache Kafka. Available as [services.prometheus.exporters.kafka](options.html#opt-services.prometheus.exporters.kafka).
 
+- [Temporal](https://temporal.io/), a durable execution platform that enables
+  developers to build scalable applications without sacrificing productivity or
+  reliability. Available as [services.temporal](#opt-services.temporal.enable).
+
 ## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

From 89526e117150b80fc5b57129be8ed363a7350a6c Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Wed, 20 Aug 2025 23:46:10 +0200
Subject: [PATCH 3176/3724] nixos/logind: migrate to settings option

---
 .../manual/release-notes/rl-2511.section.md   |   2 +
 nixos/modules/system/boot/systemd/logind.nix  | 230 +++++-------------
 2 files changed, 62 insertions(+), 170 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 3bd80f616f12..66f673dfbdfb 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -202,6 +202,8 @@
   - `systemd.watchdog.kexecTime` was renamed to `systemd.settings.Manager.KExecWatchdogSec`
   - `systemd.enableCgroupAccounting` was removed. Cgroup accounting now needs to be disabled directly using `systemd.settings.Manager.*Accounting`.
 
+- `services.logind.extraConfig` was converted to RFC42-style `services.logind.settings.Login`.
+
 - `services.ntpd-rs` now performs configuration validation.
 
 - Immich now has support for [VectorChord](https://github.com/tensorchord/VectorChord) when using the PostgreSQL configuration provided by `services.immich.database.enable`, which replaces `pgvecto-rs`. VectorChord support can be toggled with the option `services.immich.database.enableVectorChord`. Additionally, `pgvecto-rs` support is now disabled from NixOS 25.11 onwards using the option `services.immich.database.enableVectors`. This option will be removed fully in the future once Immich drops support for `pgvecto-rs` fully. See [Immich migration instructions](#module-services-immich-vectorchord-migration)
diff --git a/nixos/modules/system/boot/systemd/logind.nix b/nixos/modules/system/boot/systemd/logind.nix
index 097b77a91656..2eff86008e65 100644
--- a/nixos/modules/system/boot/systemd/logind.nix
+++ b/nixos/modules/system/boot/systemd/logind.nix
@@ -5,164 +5,39 @@
   utils,
   ...
 }:
-let
-  cfg = config.services.logind;
-
-  logindHandlerType = lib.types.enum [
-    "ignore"
-    "poweroff"
-    "reboot"
-    "halt"
-    "kexec"
-    "suspend"
-    "hibernate"
-    "hybrid-sleep"
-    "suspend-then-hibernate"
-    "sleep"
-    "lock"
-  ];
-in
 {
   options.services.logind = {
-    extraConfig = lib.mkOption {
-      default = "";
-      type = lib.types.lines;
-      example = "IdleAction=lock";
+    settings.Login = lib.mkOption {
       description = ''
-        Extra config options for systemd-logind.
-        See {manpage}`logind.conf(5)`
-        for available options.
+        Settings option for systemd-logind.
+        See {manpage}`logind.conf(5)` for available options.
       '';
-    };
+      type = lib.types.submodule {
+        freeformType = lib.types.attrsOf utils.systemdUtils.unitOptions.unitOption;
+        options.KillUserProcesses = lib.mkOption {
+          default = false;
+          type = lib.types.bool;
+          description = ''
+            Specifies whether the processes of a user should be killed
+            when the user logs out.  If true, the scope unit corresponding
+            to the session and all processes inside that scope will be
+            terminated.  If false, the scope is "abandoned"
+            (see {manpage}`systemd.scope(5)`),
+            and processes are not killed.
 
-    killUserProcesses = lib.mkOption {
-      default = false;
-      type = lib.types.bool;
-      description = ''
-        Specifies whether the processes of a user should be killed
-        when the user logs out.  If true, the scope unit corresponding
-        to the session and all processes inside that scope will be
-        terminated.  If false, the scope is "abandoned"
-        (see {manpage}`systemd.scope(5)`),
-        and processes are not killed.
+            See {manpage}`logind.conf(5)` for more details.
 
-        See {manpage}`logind.conf(5)`
-        for more details.
-      '';
-    };
-
-    powerKey = lib.mkOption {
-      default = "poweroff";
-      example = "ignore";
-      type = logindHandlerType;
-
-      description = ''
-        Specifies what to do when the power key is pressed.
-      '';
-    };
-
-    powerKeyLongPress = lib.mkOption {
-      default = "ignore";
-      example = "reboot";
-      type = logindHandlerType;
-
-      description = ''
-        Specifies what to do when the power key is long-pressed.
-      '';
-    };
-
-    rebootKey = lib.mkOption {
-      default = "reboot";
-      example = "ignore";
-      type = logindHandlerType;
-
-      description = ''
-        Specifies what to do when the reboot key is pressed.
-      '';
-    };
-
-    rebootKeyLongPress = lib.mkOption {
-      default = "poweroff";
-      example = "ignore";
-      type = logindHandlerType;
-
-      description = ''
-        Specifies what to do when the reboot key is long-pressed.
-      '';
-    };
-
-    suspendKey = lib.mkOption {
-      default = "suspend";
-      example = "ignore";
-      type = logindHandlerType;
-
-      description = ''
-        Specifies what to do when the suspend key is pressed.
-      '';
-    };
-
-    suspendKeyLongPress = lib.mkOption {
-      default = "hibernate";
-      example = "ignore";
-      type = logindHandlerType;
-
-      description = ''
-        Specifies what to do when the suspend key is long-pressed.
-      '';
-    };
-
-    hibernateKey = lib.mkOption {
-      default = "hibernate";
-      example = "ignore";
-      type = logindHandlerType;
-
-      description = ''
-        Specifies what to do when the hibernate key is pressed.
-      '';
-    };
-
-    hibernateKeyLongPress = lib.mkOption {
-      default = "ignore";
-      example = "suspend";
-      type = logindHandlerType;
-
-      description = ''
-        Specifies what to do when the hibernate key is long-pressed.
-      '';
-    };
-
-    lidSwitch = lib.mkOption {
-      default = "suspend";
-      example = "ignore";
-      type = logindHandlerType;
-
-      description = ''
-        Specifies what to do when the laptop lid is closed.
-      '';
-    };
-
-    lidSwitchExternalPower = lib.mkOption {
-      default = cfg.lidSwitch;
-      defaultText = lib.literalExpression "services.logind.lidSwitch";
-      example = "ignore";
-      type = logindHandlerType;
-
-      description = ''
-        Specifies what to do when the laptop lid is closed
-        and the system is on external power. By default use
-        the same action as specified in services.logind.lidSwitch.
-      '';
-    };
-
-    lidSwitchDocked = lib.mkOption {
-      default = "ignore";
-      example = "suspend";
-      type = logindHandlerType;
-
-      description = ''
-        Specifies what to do when the laptop lid is closed
-        and another screen is added.
-      '';
+            Defaulted to false in nixpkgs because many tools that rely on
+            persistent user processes—like `tmux`, `screen`, `mosh`, `VNC`,
+            `nohup`, and more — would break by the systemd-default behavior.
+          '';
+        };
+      };
+      default = { };
+      example = {
+        KillUserProcesses = false;
+        HandleLidSwitch = "ignore";
+      };
     };
   };
 
@@ -187,24 +62,10 @@ in
       "user-runtime-dir@.service"
     ];
 
-    environment.etc = {
-      "systemd/logind.conf".text = ''
-        [Login]
-        KillUserProcesses=${if cfg.killUserProcesses then "yes" else "no"}
-        HandlePowerKey=${cfg.powerKey}
-        HandlePowerKeyLongPress=${cfg.powerKeyLongPress}
-        HandleRebootKey=${cfg.rebootKey}
-        HandleRebootKeyLongPress=${cfg.rebootKeyLongPress}
-        HandleSuspendKey=${cfg.suspendKey}
-        HandleSuspendKeyLongPress=${cfg.suspendKeyLongPress}
-        HandleHibernateKey=${cfg.hibernateKey}
-        HandleHibernateKeyLongPress=${cfg.hibernateKeyLongPress}
-        HandleLidSwitch=${cfg.lidSwitch}
-        HandleLidSwitchExternalPower=${cfg.lidSwitchExternalPower}
-        HandleLidSwitchDocked=${cfg.lidSwitchDocked}
-        ${cfg.extraConfig}
-      '';
-    };
+    environment.etc."systemd/logind.conf".text = ''
+      [Login]
+      ${utils.systemdUtils.lib.attrsToSection config.services.logind.settings.Login}
+    '';
 
     # Restarting systemd-logind breaks X11
     # - upstream commit: https://cgit.freedesktop.org/xorg/xserver/commit/?id=dc48bd653c7e101
@@ -218,4 +79,33 @@ in
     systemd.services."user-runtime-dir@".stopIfChanged = false;
     systemd.services."user-runtime-dir@".restartIfChanged = false;
   };
+
+  imports =
+    let
+      settingsRename =
+        old: new:
+        lib.mkRenamedOptionModule
+          [ "services" "logind" old ]
+          [ "services" "logind" "settings" "Login" new ];
+    in
+    [
+      (lib.mkRemovedOptionModule [
+        "services"
+        "logind"
+        "extraConfig"
+      ] "Use services.logind.settings.Login instead.")
+
+      (settingsRename "killUserProcesses" "KillUserProcesses")
+      (settingsRename "powerKey" "HandlePowerKey")
+      (settingsRename "powerKeyLongPress" "HandlePowerKeyLongPress")
+      (settingsRename "rebootKey" "HandleRebootKey")
+      (settingsRename "rebootKeyLongPress" "HandleRebootKeyLongPress")
+      (settingsRename "suspendKey" "HandleSuspendKey")
+      (settingsRename "suspendKeyLongPress" "HandleSuspendKeyLongPress")
+      (settingsRename "hibernateKey" "HandleHibernateKey")
+      (settingsRename "hibernateKeyLongPress" "HandleHibernateKeyLongPress")
+      (settingsRename "lidSwitch" "HandleLidSwitch")
+      (settingsRename "lidSwitchExternalPower" "HandleLidSwitchExternalPower")
+      (settingsRename "lidSwitchDocked" "HandleLidSwitchDocked")
+    ];
 }

From 40ab1553c4fac2dafb3ab18b4710670282cbaade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Mon, 18 Aug 2025 10:45:16 -0600
Subject: [PATCH 3177/3724] gst_all_1.gst-plugins-rs: disable tests

Tests disabled due to failing tests blocking unstable channel and no fix
being found in several days

Test failures: https://cache.nixos.org/log/0j86pshk6xb0cnqxq64f007ws0b7yzbb-gst-plugins-rs-0.14.1.drv
Upstream issue: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/723
---
 .../libraries/gstreamer/rs/default.nix        |  7 +---
 .../gstreamer/rs/ignore-network-tests.patch   | 12 ------
 .../libraries/gstreamer/rs/ignore-tests.patch | 40 +++++++++++++++++++
 3 files changed, 42 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/gstreamer/rs/ignore-network-tests.patch
 create mode 100644 pkgs/development/libraries/gstreamer/rs/ignore-tests.patch

diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index d1f33e7951d8..aff3768552fb 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -187,11 +187,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    # Disable uriplaylistbin test that requires network access.
-    # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/676
-    # TODO: Remove in 0.14, it has been replaced by a different fix:
-    # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2140
-    ./ignore-network-tests.patch
+    # Related to https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/723
+    ./ignore-tests.patch
   ];
 
   strictDeps = true;
diff --git a/pkgs/development/libraries/gstreamer/rs/ignore-network-tests.patch b/pkgs/development/libraries/gstreamer/rs/ignore-network-tests.patch
deleted file mode 100644
index 22bcce3f2e37..000000000000
--- a/pkgs/development/libraries/gstreamer/rs/ignore-network-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs
-index dfd1c9ce..8ed24949 100644
---- a/utils/uriplaylistbin/tests/uriplaylistbin.rs
-+++ b/utils/uriplaylistbin/tests/uriplaylistbin.rs
-@@ -534,6 +534,7 @@ fn infinite_to_finite() {
-     assert_eq!(current_uri_index, 0);
- }
- 
-+#[ignore = "Requires network access"]
- #[test]
- /// cache HTTP playlist items
- fn cache() {
diff --git a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch b/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch
new file mode 100644
index 000000000000..63c053f9a066
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch
@@ -0,0 +1,40 @@
+diff --git a/mux/mp4/tests/tests.rs b/mux/mp4/tests/tests.rs
+index 52b91f59..c5875554 100644
+--- a/mux/mp4/tests/tests.rs
++++ b/mux/mp4/tests/tests.rs
+@@ -1339,6 +1339,7 @@ fn test_taic_encode_cannot_sync(video_enc: &str) {
+     );
+ }
+ 
++#[ignore = "Unknown failure"]
+ #[test]
+ fn test_taic_x264() {
+     init();
+@@ -1359,6 +1360,7 @@ fn test_taic_stai_x264_not_enabled() {
+     test_taic_stai_encode("x264enc", false);
+ }
+ 
++#[ignore = "Unknown failure"]
+ #[test]
+ fn test_taic_x264_no_sync() {
+     init();
+diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs
+index 3489eaa8..569635d6 100644
+--- a/utils/uriplaylistbin/tests/uriplaylistbin.rs
++++ b/utils/uriplaylistbin/tests/uriplaylistbin.rs
+@@ -388,6 +388,7 @@ fn multi_audio() {
+     assert_eq!(current_uri_index, 2);
+ }
+ 
++#[ignore = "Unknown failure"]
+ #[test]
+ fn multi_audio_video() {
+     let (_events, current_iteration, current_uri_index, eos) = test(
+@@ -403,6 +404,7 @@ fn multi_audio_video() {
+     assert_eq!(current_uri_index, 1);
+ }
+ 
++#[ignore = "Unknown failure"]
+ #[test]
+ fn iterations() {
+     let (_events, current_iteration, current_uri_index, eos) = test(

From 3909c419fbbd6c7b55718cb23cfd475c77d93fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcell=20T=C3=B3th?= <elfenermarcell@gmail.com>
Date: Sun, 24 Aug 2025 19:12:59 +0200
Subject: [PATCH 3178/3724] ed-odyssey-materials-helper: 2.223 -> 2.240

The wrapper was changed as the program now logs to a seperate log directory.
Upstream moved various things to build secrets, this means that none of upstream's telemetry is included in this build anymore.
---
 .../ed/ed-odyssey-materials-helper/deps.json  | 81 ++++++++++---------
 .../ed-odyssey-materials-helper/package.nix   | 22 ++---
 .../remove-sentry.patch                       | 53 ------------
 3 files changed, 54 insertions(+), 102 deletions(-)
 delete mode 100644 pkgs/by-name/ed/ed-odyssey-materials-helper/remove-sentry.patch

diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
index f5c91e0b0c33..95c248cc7a85 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
@@ -7,12 +7,6 @@
    "pom": "sha256-7wF38tn4fbnw0w7dQy2wLlhqHejMkVb8HcZRgvDh5oA="
   }
  },
- "https://nexus.jixxed.nl": {
-  "nexus/content/repositories/releases/nl/jixxed#opencv/4.5.3-0": {
-   "jar": "sha256-PwimnmKzejFrZdIsiNLtTExlvRvWKxKPDBbMTe4KhQQ=",
-   "pom": "sha256-yE9S2bEo5C5Y+j2+eQOHGnpJ1G1Soee7rNFHiRr/pNo="
-  }
- },
  "https://plugins.gradle.org/m2": {
   "com/cedarsoftware#json-io/4.14.1": {
    "jar": "sha256-UY3ynWhbHfjcpYCfEr9udnDY280SKAt/z5mjWNRs/fw=",
@@ -146,13 +140,13 @@
    "jar": "sha256-rOceeYcwWeJzA2Z0VgtQw9a5RbfKFosNSWKtdlCuHuw=",
    "pom": "sha256-rK0VkHGQpeZ7hZfM+wEx795ZbC+gXYrZ9LnGHaMfNkU="
   },
-  "org/beryx#badass-jlink-plugin/3.1.2": {
-   "jar": "sha256-JBAoa9WLW12KhHDH5AyAupDXEe28mC7YO258wSqDXx8=",
-   "module": "sha256-6pOdc3KiF+6oJK8ovJh9kpaR+PcVRlFeRgXRfK3RgW4=",
-   "pom": "sha256-so4VCD6W0FC05XzLTBA7lwnRCtVi9wNRyK3dJpv7vvk="
+  "org/beryx#badass-jlink-plugin/3.1.3": {
+   "jar": "sha256-2GievCLcBpg3WsaEHep23em1Q6kgW/fLFNzET/v99gA=",
+   "module": "sha256-FnogeApeGbRUUJnX/cBRAj0uD9RWwc6qqinRLf0LXvQ=",
+   "pom": "sha256-hxMC7pW+Z93NTEEgh4sV30fgfZCI2+tMus5iGDdNqx8="
   },
-  "org/beryx/jlink#org.beryx.jlink.gradle.plugin/3.1.2": {
-   "pom": "sha256-v3WZWFF1FKmxUeeI81VK9+qb778Qr6/F9Z/MdpRhGQM="
+  "org/beryx/jlink#org.beryx.jlink.gradle.plugin/3.1.3": {
+   "pom": "sha256-S9pQnIlx/bxI4ceXuEnuT8tqEMwnOAGzrlSVGEGsSH4="
   },
   "org/bouncycastle#bcpkix-lts8on/2.73.7": {
    "jar": "sha256-WHRYb7Se7ryZuH8SNShnm8Wlw4j+pL+E0semmQguKK0=",
@@ -424,9 +418,9 @@
    "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
    "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
   },
-  "com/google/j2objc#j2objc-annotations/3.0.0": {
-   "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=",
-   "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc="
+  "com/google/j2objc#j2objc-annotations/3.1": {
+   "jar": "sha256-hNOhUFGEhfgUDqmbiphWVnSWKfZDPJK4DHWzaro7CZs=",
+   "pom": "sha256-FFcIOFAANPwbR8ggXOHJ1rJVwczdLRr9zcv3XomySjM="
   },
   "com/ibm/icu#icu4j/68.1": {
    "jar": "sha256-B+T4suXJvOIq/BXtmAY8D8k29eYT2CD+rnypB17FUlk=",
@@ -532,10 +526,10 @@
    "module": "sha256-tDIZwIxsAgw+sN8lRtrqd5IZP4lgRtVcozqZhfvajuc=",
    "pom": "sha256-fpMFhj0zE0zUpy0It/Evre4hda2ef3Jzi0nIptw8BVA="
   },
-  "io/sentry#sentry/8.18.0": {
-   "jar": "sha256-DDdafXlmZOMFnSurvvGTAmDT5Gp1WcM336VzXvmv8Jg=",
-   "module": "sha256-zaBT2zOx0RXEWanp3uilodhp9LoEDUrbzjnlq+hE8kA=",
-   "pom": "sha256-9wezZekQ7eUHSwYQmOv8/dh+IClFv6lBvaYJt/eAiqA="
+  "io/sentry#sentry/8.19.1": {
+   "jar": "sha256-C8udFKYqldae7JnSpmmYqFPiy+ngdvUI4yoZiu3On+g=",
+   "module": "sha256-K1+maQxgBynruFumu22Lytzm8jgOznnbTIoekMhQYbQ=",
+   "pom": "sha256-TBrEgd1LWn9qquRfPQHpriNmY0qzjPhyZ767+8/D2IE="
   },
   "jakarta/json/bind#jakarta.json.bind-api/2.0.0": {
    "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=",
@@ -578,22 +572,22 @@
    "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
    "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
   },
-  "net/bytebuddy#byte-buddy-agent/1.17.5": {
-   "jar": "sha256-xbkzStguYy9q9g3yK7vbu2LO4Eh39PQ8OLoErtm9mQE=",
-   "pom": "sha256-C4NIL7Ujtb+UdKqCp8XTzhPPOlqatdY6zpVZGfbXzBQ="
+  "net/bytebuddy#byte-buddy-agent/1.17.6": {
+   "jar": "sha256-ioCVlGW7CYSM1BqJMBSQxVudlA3G7DDYq6wPY7Of1dA=",
+   "pom": "sha256-Zw0Cz7w5b05+ZhTd3PSghC+vF/l5k3PX4Mt7aq3Njm8="
   },
   "net/bytebuddy#byte-buddy-parent/1.15.11": {
    "pom": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY="
   },
-  "net/bytebuddy#byte-buddy-parent/1.17.5": {
-   "pom": "sha256-HoN1gn7n0vXkxwyzHJFn7OxgaTz2pbdzoeZv1NJnU2c="
+  "net/bytebuddy#byte-buddy-parent/1.17.6": {
+   "pom": "sha256-3RX5X9VgUmPwZdncuOzuzEjr5NZmw3KY/0RgAUlCQL0="
   },
   "net/bytebuddy#byte-buddy/1.15.11": {
    "pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4="
   },
-  "net/bytebuddy#byte-buddy/1.17.5": {
-   "jar": "sha256-cVaMn4OWZ3IZ9lAmj79kk97UhO3NvfLa5hKcpb6B6Ns=",
-   "pom": "sha256-U81D27NbSORHJc1XbSAG4fcfIWh9BA94DMcKCn79QcI="
+  "net/bytebuddy#byte-buddy/1.17.6": {
+   "jar": "sha256-0mOCqDnLJtXGKgsPBHFbzvVaUx+WrGzkDeRSocBTnnA=",
+   "pom": "sha256-UExH3b8VsOc8ymO52woBwSp83n+LM6DF2dW1BtGUaz4="
   },
   "net/java#jvnet-parent/1": {
    "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78="
@@ -782,9 +776,9 @@
    "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
    "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
   },
-  "org/assertj#assertj-core/3.27.3": {
-   "jar": "sha256-W4omIF9tXqYK2c5lzkpAoq/kxIq+7GG9B0CgiMJOifU=",
-   "pom": "sha256-jrN+QWt4B+e/833QN8QMBrlWk6dgWcX7m+uFSaTO19w="
+  "org/assertj#assertj-core/3.27.4": {
+   "jar": "sha256-zGmqhPeTVstjXD+f8/ht/w+djufve2hKLJqZgE/0UAg=",
+   "pom": "sha256-nLMcgATISEPShMQCqBRTvupFCb+neP9CKmcvfny/Ygw="
   },
   "org/controlsfx#controlsfx/11.2.2": {
    "jar": "sha256-BDwGYtUmljR9r4T8aQJ0xhIuD4CjFXo1St086oPA3qk=",
@@ -937,17 +931,17 @@
   "org/mockito#mockito-bom/4.11.0": {
    "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
   },
-  "org/mockito#mockito-core/5.18.0": {
-   "jar": "sha256-o9TkD3/mYBb+QsAN5ONDd310Eyr8hQGODwOsYzSmDyk=",
-   "pom": "sha256-cCZWNGCaFVU3MDM5Ht/rh5Apl0EgpxL+DZrYC6JI790="
+  "org/mockito#mockito-core/5.19.0": {
+   "jar": "sha256-2HX/I0pLcuDu3+Fw3YBHl6S4e6THYgfJZZ1vRrUnh3s=",
+   "pom": "sha256-NlnpFp4TwLUT6D7c1R6vqlcdYMYq9YGOzQkhqi0M0Bg="
   },
   "org/mockito#mockito-inline/5.2.0": {
    "jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=",
    "pom": "sha256-cG00cOVtMaO1YwaY0Qeb79uYMUWwGE5LorhNo4eo9oQ="
   },
-  "org/mockito#mockito-junit-jupiter/5.18.0": {
-   "jar": "sha256-CIEdIIXe74Puy7vGeIXXpvbO+ZunJmgoAXCqxqSs0mU=",
-   "pom": "sha256-6pbNic+y9Ik1qjjyZVwGL/LGKkimAFgXk+/7qaa+iUY="
+  "org/mockito#mockito-junit-jupiter/5.19.0": {
+   "jar": "sha256-fPu3qcEZgFPGmcZjR5/Ug2rMIsJlAAPI3uIOf7xVplo=",
+   "pom": "sha256-x+4XLR/ALo/I/I8EPIfHGzXLfXR+kJNGQ9SSCTrXoUs="
   },
   "org/objenesis#objenesis-parent/3.3": {
    "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8="
@@ -1124,13 +1118,22 @@
    "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y="
   }
  },
- "https://repo.repsy.io/mvn/jixxed/maven/nl/jixxed": {
-  "lept4j#lept4j/1.16.6": {
+ "https://repo.repsy.io/mvn/jixxed/maven/nl": {
+  "jixxed#opencv/4.5.3-0": {
+   "jar": "sha256-KzFMlU3fA60Knu+V8kRhemJ3XJaSXQ+QUunWXY/N34A=",
+   "pom": "sha256-1EU8kcvQYRI0F7rVkj5mBy068m4z2lXQE9KaMy+tlOY="
+  },
+  "jixxed/ed/awesome#ed-awesome-api/1.5": {
+   "jar": "sha256-o9e81yDaCYeLT/GknUb3Zvs6CTCKOuG1NTEy1X8sEYQ=",
+   "module": "sha256-bMYa+9HB0MB2VrO9lcBhH6XfMGMxx5XROs1YZ7VDpH8=",
+   "pom": "sha256-CCCnYjzmYx8Zfde+rTBQIYOfNJsnboNevcIS3BS9LEg="
+  },
+  "jixxed/lept4j#lept4j/1.16.6": {
    "jar": "sha256-39j+jS92/MW/A8WLaUZYKTkNPB+0IgNWkjcau9MMlx0=",
    "module": "sha256-fPk3r5TQdJrz0O5SgutXUWnI44UqKJxPBiiQC+wcSgA=",
    "pom": "sha256-k31BbQcMlLWOjhhkUgrWnOUyb/zKBhRzq8hC6p6d/eY="
   },
-  "tess4j#tess4j/5.2.9": {
+  "jixxed/tess4j#tess4j/5.2.9": {
    "jar": "sha256-+3uZj+yC3t90jQ6oWIde0oIvWyxqXduuqrwwGO+EqvA=",
    "module": "sha256-0t0sL5hBJtAuoZuSPFUZdupaPmn86ECeCZYYRDD+aCg=",
    "pom": "sha256-l0rKnFKWtfPI/6pBDXpfbJpNEAri7igU24iaZyvY168="
diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
index 7a6ba9e3d327..efd37788d163 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   gradle,
   jdk24,
-  makeWrapper,
   wrapGAppsHook3,
   libXxf86vm,
   libXtst,
@@ -19,18 +18,17 @@
 }:
 stdenv.mkDerivation rec {
   pname = "ed-odyssey-materials-helper";
-  version = "2.223";
+  version = "2.240";
 
   src = fetchFromGitHub {
     owner = "jixxed";
     repo = "ed-odyssey-materials-helper";
     tag = version;
-    hash = "sha256-NPiy1KQxi6iRR3tEjdPnx8w++sCLIsZ2FQXSUQL0WrA=";
+    hash = "sha256-KRWOfLFrczOON6HiddM8g2qi2hzGfZbUsk02VvW2VyA=";
   };
 
   nativeBuildInputs = [
     gradle
-    makeWrapper
     wrapGAppsHook3
     copyDesktopItems
   ];
@@ -40,9 +38,6 @@ stdenv.mkDerivation rec {
     # so this removes 1) the popup about it when you first start the program, 2) the option in the settings
     # and makes the program always know that it is set up
     ./remove-urlscheme-settings.patch
-
-    # Upstream requested that sentry is only to be used with official builds, remove it so it doesn't complain about the lack of DSN
-    ./remove-sentry.patch
   ];
   postPatch = ''
     # oslib doesn't seem to do releases and hasn't had a change since 2021, so always use commit d6ee6549bb
@@ -74,6 +69,15 @@ stdenv.mkDerivation rec {
 
   gradleBuildTask = "application:jpackage";
 
+  env = {
+    EDDN_SOFTWARE_NAME = "EDO Materials Helper";
+  };
+
+  preBuild = ''
+    # required to make EDDN_SOFTWARE_NAME work and for the program to know its own version
+    gradle $gradleFlags application:generateSecrets
+  '';
+
   installPhase = ''
     runHook preInstall
 
@@ -89,9 +93,7 @@ stdenv.mkDerivation rec {
   dontWrapGApps = true;
 
   postFixup = ''
-    # The logs would go into the current directory, so the wrapper will cd to the config dir first
-    makeShellWrapper $out/share/ed-odyssey-materials-helper/bin/Elite\ Dangerous\ Odyssey\ Materials\ Helper $out/bin/ed-odyssey-materials-helper \
-      --run 'mkdir -p ~/.config/odyssey-materials-helper/ && cd ~/.config/odyssey-materials-helper/' \
+    makeWrapper $out/share/ed-odyssey-materials-helper/bin/Elite\ Dangerous\ Odyssey\ Materials\ Helper $out/bin/ed-odyssey-materials-helper \
       --prefix LD_LIBRARY_PATH : ${
         lib.makeLibraryPath [
           libXxf86vm
diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-sentry.patch b/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-sentry.patch
deleted file mode 100644
index 16da10edb102..000000000000
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-sentry.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/Main.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/Main.java
-index 04b101f0..2e589e12 100644
---- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/Main.java
-+++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/Main.java
-@@ -51,48 +51,6 @@ public class Main {
-                 System.exit(0);
-             }
-             log.info("launching app with java version: " + getVersion());
--            if (System.getProperty("sentry.dsn") == null || System.getProperty("sentry.dsn").isBlank() || System.getProperty("sentry.dsn").equals("null")) {
--                log.error("Sentry DSN is not set. Please set the DSN.");
--            }
--            Sentry.init(options -> {
--
--                final String buildVersion = getBuildVersion();
--                options.setDsn(System.getProperty("sentry.dsn"));
--                options.setEnvironment(getEnvironment(buildVersion));
--                options.setRelease("edomh-app@" + buildVersion);
--                options.setEnabled(!buildVersion.equals("dev"));
--                options.setBeforeSend((event, hint) -> {
--                    if (!VersionService.isLatestVersion()) {
--                        return null;  // Returning null prevents the event from being sent to Sentry
--                    }
--                    if (Duration.between(lastSentTime, Instant.now()).getSeconds() < 30) {
--                        return null;  // Throttle if less than 30 seconds have passed
--                    }
--                    lastSentTime = Instant.now();
--                    String supportFile = "";
--                    try {
--                        supportFile = SupportService.createSupportPackage();
--                    } catch (Exception e) {
--                        log.error("Failed to create support package", e);
--                    }
--                    if (!supportFile.isBlank()) {
--                        Attachment attachment = new Attachment(supportFile);
--                        hint.addAttachment(attachment);
--                    }
--                    OperatingSystem os = new OperatingSystem();
--                    os.setName(System.getProperty("os.name"));
--                    os.setVersion(System.getProperty("os.version"));
--                    os.setBuild(System.getProperty("os.arch"));
--                    event.getContexts().setOperatingSystem(os);
--                    if (APPLICATION_STATE.getFileheader() != null) {
--                        event.setTag("game.version", APPLICATION_STATE.getFileheader().getGameversion());
--                        event.setTag("game.build", APPLICATION_STATE.getFileheader().getBuild());
--                        event.setTag("game.language", APPLICATION_STATE.getFileheader().getLanguage());
--                        event.setTag("game.odyssey", String.valueOf(APPLICATION_STATE.getFileheader().getOdyssey()));
--                    }
--                    return event;
--                });
--            });
-             FXApplication.launchFx(args);
-         }
-     }

From ca683c6eebd4475998a2cbe048fce0a15fe635f6 Mon Sep 17 00:00:00 2001
From: Roman Maksimovich <r.a.maksimovich@gmail.com>
Date: Sun, 24 Aug 2025 19:22:37 +0200
Subject: [PATCH 3179/3724] pshash: 0.1.15.0 -> 0.1.15.1 (#436327)

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

diff --git a/pkgs/by-name/ps/pshash/package.nix b/pkgs/by-name/ps/pshash/package.nix
index d5fd1efe885e..95abcae42bf8 100644
--- a/pkgs/by-name/ps/pshash/package.nix
+++ b/pkgs/by-name/ps/pshash/package.nix
@@ -5,12 +5,12 @@
 }:
 haskellPackages.mkDerivation rec {
   pname = "pshash";
-  version = "0.1.15.0";
+  version = "0.1.15.1";
   src = fetchFromGitHub {
     owner = "thornoar";
     repo = "pshash";
     tag = "v${version}";
-    hash = "sha256-i3jDt9ghA21OkkKjBk5a7Xok+ESskMPNA8WP+MUZxVk=";
+    hash = "sha256-TnMXT0sgUkHCbZ2YgDmSgOg8A2DKk/LyKK2XXwabrYc=";
   };
 
   postPatch = ''

From 3a5b2aa3bb4a81fd3234aa5dde9e572602ed81e4 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Aug 2025 18:35:30 +0100
Subject: [PATCH 3180/3724] perf_data_converter: bump to Bazel 7

---
 pkgs/by-name/pe/perf_data_converter/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pe/perf_data_converter/package.nix b/pkgs/by-name/pe/perf_data_converter/package.nix
index 01f7ae149eee..d2550d299181 100644
--- a/pkgs/by-name/pe/perf_data_converter/package.nix
+++ b/pkgs/by-name/pe/perf_data_converter/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   buildBazelPackage,
   fetchFromGitHub,
-  bazel_6,
+  bazel_7,
   jdk,
   elfutils,
   libcap,
@@ -29,7 +29,7 @@ buildBazelPackage {
     hash = "sha256-AScXL74K0Eiajdib56+7ay3K/MMWbmeUWkRWMaEJRC8=";
   };
 
-  bazel = bazel_6;
+  bazel = bazel_7;
   bazelFlags = [
     "--registry"
     "file://${registry}"
@@ -38,8 +38,8 @@ buildBazelPackage {
   fetchAttrs = {
     hash =
       {
-        aarch64-linux = "sha256-Ksae4VC2FbkW79N5EGn/rTdj+GFKQsZCdi4LPfnzV7Y=";
-        x86_64-linux = "sha256-TYeS1bax7sA0hJLXqtE8Q5FLnIylcWPZynVE2LhvZKc=";
+        aarch64-linux = "sha256-GvuOEQfzPF5J75TRlEc4oDiXXUN4G3fMfRhMDmg3FL0=";
+        x86_64-linux = "sha256-A47JJg+GUIhR7FhufxEsfsIuSg6dd7sPNzSWiQZXIEE=";
       }
       .${system} or (throw "No hash for system: ${system}");
   };

From 6da76297f0c9e3f4c33ae9352f145a56e5d2da5e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Aug 2025 18:35:30 +0100
Subject: [PATCH 3181/3724] mozc: bump to Bazel 7

Co-authored-by: Shogo Takata <peshogo@gmail.com>
---
 pkgs/by-name/mo/mozc/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/mo/mozc/package.nix b/pkgs/by-name/mo/mozc/package.nix
index 16e88d44278f..f5773a640f0c 100644
--- a/pkgs/by-name/mo/mozc/package.nix
+++ b/pkgs/by-name/mo/mozc/package.nix
@@ -5,7 +5,7 @@
   qt6,
   pkg-config,
   protobuf_27,
-  bazel,
+  bazel_7,
   ibus,
   unzip,
   xdg-utils,
@@ -43,14 +43,18 @@ buildBazelPackage rec {
   dontAddBazelOpts = true;
   removeRulesCC = false;
 
-  inherit bazel;
+  bazel = bazel_7;
 
   fetchAttrs = {
-    sha256 = "sha256-+N7AhSemcfhq6j0IUeWZ0DyVvr1l5FbAkB+kahTy3pM=";
+    hash = "sha256-c+v2vWvTmwJ7MFh3VJlUh+iSINjsX66W9K0UBX5K/1s=";
 
-    # remove references of buildInputs and zip code files
     preInstall = ''
-      rm -rv $bazelOut/external/{ibus,qt_linux,zip_code_*}
+      # Remove zip code data. It will be replaced with jp-zip-codes from nixpkgs
+      rm -rv "$bazelOut"/external/zip_code_{jigyosyo,ken_all}
+      # Remove references to buildInputs
+      rm -rv "$bazelOut"/external/{ibus,qt_linux}
+      # Remove reference to the host platform
+      rm -rv "$bazelOut"/external/host_platform
     '';
   };
 

From adaf301dad3fbc4ff80bcbef1eb20bc84524cd97 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Aug 2025 18:35:30 +0100
Subject: [PATCH 3182/3724] fcitx5-mozc: bump to Bazel 7

Co-authored-by: Shogo Takata <peshogo@gmail.com>
---
 pkgs/by-name/fc/fcitx5-mozc/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fc/fcitx5-mozc/package.nix b/pkgs/by-name/fc/fcitx5-mozc/package.nix
index f7a9ec71328c..12e755592dd9 100644
--- a/pkgs/by-name/fc/fcitx5-mozc/package.nix
+++ b/pkgs/by-name/fc/fcitx5-mozc/package.nix
@@ -1,5 +1,5 @@
 {
-  bazel_6,
+  bazel_7,
   buildBazelPackage,
   fcitx5,
   fetchFromGitHub,
@@ -45,7 +45,7 @@ buildBazelPackage {
     sed -i -e 's|^\(LINUX_MOZC_SERVER_DIR = \).\+|\1"${mozc}/lib/mozc"|' src/config.bzl
   '';
 
-  bazel = bazel_6;
+  bazel = bazel_7;
   removeRulesCC = false;
   dontAddBazelOpts = true;
 
@@ -63,10 +63,13 @@ buildBazelPackage {
 
   fetchAttrs = {
     preInstall = ''
+      # Remove reference to buildInput
       rm -rf $bazelOut/external/fcitx5
+      # Remove reference to the host platform
+      rm -rv "$bazelOut"/external/host_platform
     '';
 
-    sha256 = "sha256-rrRp/v1pty7Py80/6I8rVVQvkeY72W+nlixUeYkjp+o=";
+    hash = "sha256-nFPGhZWvzzBOSeIa35XQbK6dHgJJSYum/5X8eAA0uCY=";
   };
 
   preConfigure = ''

From 1163733449992247e4c45fd9fde5aead6cf95e7d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Aug 2025 19:21:17 +0100
Subject: [PATCH 3183/3724] bant: bump to Bazel 7

---
 pkgs/by-name/ba/bant/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix
index b1701c13bca5..32b31e217a9a 100644
--- a/pkgs/by-name/ba/bant/package.nix
+++ b/pkgs/by-name/ba/bant/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   buildBazelPackage,
   fetchFromGitHub,
-  bazel_6,
+  bazel_7,
   jdk,
   nix-update-script,
   cctools,
@@ -39,12 +39,14 @@ buildBazelPackage rec {
     patchShebangs scripts/create-workspace-status.sh
   '';
 
+  removeRulesCC = false;
+
   fetchAttrs = {
     hash =
       {
-        aarch64-linux = "sha256-ibv49Y0VjAvfTUwxRUH4BmzUvz8J/qfYPGnI5Tw51HA=";
-        x86_64-linux = "sha256-VHR08FB4G0LlczWtBb8AdU5tNEzBDNUZpHoB6e3HB1M=";
-        aarch64-darwin = "sha256-5uKCLDJs0tzOJ7YiKP90RIfIYrken3XFyhT5HHdzft0=";
+        aarch64-linux = "sha256-1iy2S0mmXksfwucks+HOZ2/HUGaVBqk7VlR+kO6iYZE=";
+        x86_64-linux = "sha256-YOIwwlCYlNINlYbm/vq3Jjhe+/zgrtECdMRl+vE8FgI=";
+        aarch64-darwin = "sha256-7g1deAihrjpwAxNbG7rv9dDs3FjOCuRIFieLbENKmbw=";
       }
       .${system} or (throw "No hash for system: ${system}");
   };
@@ -52,7 +54,7 @@ buildBazelPackage rec {
   nativeBuildInputs = [
     jdk
   ];
-  bazel = bazel_6;
+  bazel = bazel_7;
 
   bazelBuildFlags = [ "-c opt" ];
   bazelTestTargets = [ "//..." ];

From 68c17550acca50c3fa291947e6e8090ded424e41 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Aug 2025 19:21:17 +0100
Subject: [PATCH 3184/3724] verible: bump to Bazel 7

---
 pkgs/by-name/ve/verible/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ve/verible/package.nix b/pkgs/by-name/ve/verible/package.nix
index 57046395f5f1..3c2f45c5058f 100644
--- a/pkgs/by-name/ve/verible/package.nix
+++ b/pkgs/by-name/ve/verible/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   buildBazelPackage,
   fetchFromGitHub,
-  bazel_6,
+  bazel_7,
   jdk,
   bison,
   flex,
@@ -41,7 +41,7 @@ buildBazelPackage rec {
     hash = "sha256-/RZqBNmyBZI6CO2ffS6p8T4wse1MKytNMphXFdkTOWQ=";
   };
 
-  bazel = bazel_6;
+  bazel = bazel_7;
   bazelFlags = [
     "--//bazel:use_local_flex_bison"
     "--registry"
@@ -51,9 +51,9 @@ buildBazelPackage rec {
   fetchAttrs = {
     hash =
       {
-        aarch64-linux = "sha256-ErhBpmXhtiZbBWy506rLp4TQh5oXJQ44lw25jlVkjUM=";
-        x86_64-linux = "sha256-d8CYiqpL7rM3VvEqHSBvtgF2WLyH23jSvK7w4ChTtgU=";
-        aarch64-darwin = "sha256-lHMbziDzQpmXvsW25SgjQUkPRIRYv6TJIPTAEvhSfuA=";
+        aarch64-linux = "sha256-jgh+wEqZba30MODmgmPoQn1ErNmm40d16jB/kE2jYPg=";
+        x86_64-linux = "sha256-kiI/LX0l9ERxItsqiAyl+BP3QnLr0Ly2YVb988M4jVs=";
+        aarch64-darwin = "sha256-bkw4ErWYblzr3lQhoXSBqIBHjXzhZHeTKdT0E/YsiFQ=";
       }
       .${system} or (throw "No hash for system: ${system}");
   };

From 9f15e04f1884c9c560055a2e0266aaed0cae1d29 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 24 Aug 2025 19:29:47 +0200
Subject: [PATCH 3185/3724] maintainers: drop ertes

Last activity in 2014.
---
 maintainers/maintainer-list.nix      | 6 ------
 pkgs/by-name/do/doom-bcc/package.nix | 1 -
 pkgs/by-name/pa/pari/package.nix     | 1 -
 pkgs/by-name/pi/picom/package.nix    | 1 -
 pkgs/games/doom-ports/slade/git.nix  | 1 -
 5 files changed, 10 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f15b37b74964..388a3a8a1332 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7790,12 +7790,6 @@
     githubId = 5427394;
     name = "Ersin Akinci";
   };
-  ertes = {
-    email = "esz@posteo.de";
-    github = "ertes";
-    githubId = 1855930;
-    name = "Ertugrul Söylemez";
-  };
   esau79p = {
     github = "EsAu79p";
     githubId = 21313906;
diff --git a/pkgs/by-name/do/doom-bcc/package.nix b/pkgs/by-name/do/doom-bcc/package.nix
index 3c78b892970c..99e03b0ab19c 100644
--- a/pkgs/by-name/do/doom-bcc/package.nix
+++ b/pkgs/by-name/do/doom-bcc/package.nix
@@ -32,6 +32,5 @@ stdenv.mkDerivation {
     mainProgram = "bcc";
     homepage = "https://github.com/wormt/bcc";
     license = licenses.mit;
-    maintainers = with maintainers; [ ertes ];
   };
 }
diff --git a/pkgs/by-name/pa/pari/package.nix b/pkgs/by-name/pa/pari/package.nix
index d51d6875cbc2..af5bc9bbabfb 100644
--- a/pkgs/by-name/pa/pari/package.nix
+++ b/pkgs/by-name/pa/pari/package.nix
@@ -78,7 +78,6 @@ stdenv.mkDerivation rec {
     '';
     downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ertes ];
     teams = [ teams.sage ];
     platforms = platforms.linux ++ platforms.darwin;
     mainProgram = "gp";
diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix
index 6a54b69fc98a..f1a0b3076827 100644
--- a/pkgs/by-name/pi/picom/package.nix
+++ b/pkgs/by-name/pi/picom/package.nix
@@ -131,7 +131,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/yshui/picom";
     mainProgram = "picom";
     maintainers = with lib.maintainers; [
-      ertes
       gepbird
       thiagokokada
       twey
diff --git a/pkgs/games/doom-ports/slade/git.nix b/pkgs/games/doom-ports/slade/git.nix
index baded118f8d7..c5d0f94a0ce3 100644
--- a/pkgs/games/doom-ports/slade/git.nix
+++ b/pkgs/games/doom-ports/slade/git.nix
@@ -74,6 +74,5 @@ stdenv.mkDerivation {
     homepage = "http://slade.mancubus.net/";
     license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ertes ];
   };
 }

From 4c5513d312bf139a3b51d06c81c0888b823feee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sun, 24 Aug 2025 11:30:37 -0600
Subject: [PATCH 3186/3724] mopidy: remove upstreamed patch

---
 pkgs/applications/audio/mopidy/mopidy.nix     |   17 +-
 .../mopidy/spotify-access-token-auth.patch    | 2207 -----------------
 .../libraries/gstreamer/rs/default.nix        |    6 -
 3 files changed, 1 insertion(+), 2229 deletions(-)
 delete mode 100644 pkgs/applications/audio/mopidy/spotify-access-token-auth.patch

diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix
index d4446a098ffa..b0beb5a8a516 100644
--- a/pkgs/applications/audio/mopidy/mopidy.nix
+++ b/pkgs/applications/audio/mopidy/mopidy.nix
@@ -33,22 +33,7 @@ pythonPackages.buildPythonApplication rec {
       gst-plugins-base
       gst-plugins-good
       gst-plugins-ugly
-      # Required patches for the Spotify plugin (https://github.com/mopidy/mopidy-spotify/releases/tag/v5.0.0a3)
-      (gst-plugins-rs.overrideAttrs (
-        newAttrs: oldAttrs: {
-          cargoDeps = oldAttrs.cargoDeps.overrideAttrs (oldAttrs': {
-            vendorStaging = oldAttrs'.vendorStaging.overrideAttrs {
-              inherit (newAttrs) patches;
-              outputHash = "sha256-urRYH5N1laBq1/SUEmwFKAtsHAC+KWYfYp+fmb7Ey7s=";
-            };
-          });
-
-          # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1801/
-          patches = oldAttrs.patches or [ ] ++ [
-            ./spotify-access-token-auth.patch
-          ];
-        }
-      ))
+      gst-plugins-rs
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pipewire ];
 
diff --git a/pkgs/applications/audio/mopidy/spotify-access-token-auth.patch b/pkgs/applications/audio/mopidy/spotify-access-token-auth.patch
deleted file mode 100644
index 3f5ccc49ef8b..000000000000
--- a/pkgs/applications/audio/mopidy/spotify-access-token-auth.patch
+++ /dev/null
@@ -1,2207 +0,0 @@
-From b66aac80f433dc3301be26e379f2ecea6fbbf990 Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes@onestream.live>
-Date: Wed, 15 Dec 2021 17:15:20 +0100
-Subject: [PATCH] spotify: replace username/password auth with access token.
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1801>
----
- Cargo.lock                               | 1082 +++++++++++++++++-----
- audio/spotify/Cargo.toml                 |    6 +-
- audio/spotify/README.md                  |   25 +-
- audio/spotify/src/common.rs              |  141 ++-
- audio/spotify/src/spotifyaudiosrc/imp.rs |   19 +-
- docs/plugins/gst_plugins_cache.json      |   12 +
- 6 files changed, 973 insertions(+), 312 deletions(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 244256cd..226254e3 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -19,45 +19,13 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
- 
- [[package]]
- name = "aes"
--version = "0.6.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561"
--dependencies = [
-- "aes-soft",
-- "aesni",
-- "cipher",
--]
--
--[[package]]
--name = "aes-ctr"
--version = "0.6.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7729c3cde54d67063be556aeac75a81330d802f0259500ca40cb52967f975763"
--dependencies = [
-- "aes-soft",
-- "aesni",
-- "cipher",
-- "ctr",
--]
--
--[[package]]
--name = "aes-soft"
--version = "0.6.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072"
--dependencies = [
-- "cipher",
-- "opaque-debug",
--]
--
--[[package]]
--name = "aesni"
--version = "0.10.0"
-+version = "0.8.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce"
-+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
- dependencies = [
-+ "cfg-if",
-  "cipher",
-- "opaque-debug",
-+ "cpufeatures",
- ]
- 
- [[package]]
-@@ -370,6 +338,29 @@ dependencies = [
-  "zeroize",
- ]
- 
-+[[package]]
-+name = "aws-lc-rs"
-+version = "1.13.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "19b756939cb2f8dc900aa6dcd505e6e2428e9cae7ff7b028c49e3946efa70878"
-+dependencies = [
-+ "aws-lc-sys",
-+ "zeroize",
-+]
-+
-+[[package]]
-+name = "aws-lc-sys"
-+version = "0.28.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b9f7720b74ed28ca77f90769a71fd8c637a0137f6fae4ae947e1050229cff57f"
-+dependencies = [
-+ "bindgen",
-+ "cc",
-+ "cmake",
-+ "dunce",
-+ "fs_extra",
-+]
-+
- [[package]]
- name = "aws-runtime"
- version = "1.2.0"
-@@ -461,7 +452,7 @@ dependencies = [
-  "bytes",
-  "fastrand",
-  "hex",
-- "hmac 0.12.1",
-+ "hmac",
-  "http 0.2.12",
-  "http-body 0.4.6",
-  "lru 0.12.5",
-@@ -603,7 +594,7 @@ dependencies = [
-  "crypto-bigint 0.5.5",
-  "form_urlencoded",
-  "hex",
-- "hmac 0.12.1",
-+ "hmac",
-  "http 0.2.12",
-  "http 1.2.0",
-  "once_cell",
-@@ -869,6 +860,29 @@ dependencies = [
-  "serde",
- ]
- 
-+[[package]]
-+name = "bindgen"
-+version = "0.69.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
-+dependencies = [
-+ "bitflags 2.9.0",
-+ "cexpr",
-+ "clang-sys",
-+ "itertools 0.12.1",
-+ "lazy_static",
-+ "lazycell",
-+ "log",
-+ "prettyplease",
-+ "proc-macro2",
-+ "quote",
-+ "regex",
-+ "rustc-hash 1.1.0",
-+ "shlex",
-+ "syn 2.0.99",
-+ "which",
-+]
-+
- [[package]]
- name = "bitflags"
- version = "1.3.2"
-@@ -887,15 +901,6 @@ version = "2.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e"
- 
--[[package]]
--name = "block-buffer"
--version = "0.9.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
--dependencies = [
-- "generic-array",
--]
--
- [[package]]
- name = "block-buffer"
- version = "0.10.4"
-@@ -1041,6 +1046,15 @@ dependencies = [
-  "thiserror 2.0.12",
- ]
- 
-+[[package]]
-+name = "cexpr"
-+version = "0.6.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-+dependencies = [
-+ "nom 7.1.3",
-+]
-+
- [[package]]
- name = "cfg-expr"
- version = "0.15.8"
-@@ -1090,11 +1104,23 @@ dependencies = [
- 
- [[package]]
- name = "cipher"
--version = "0.2.5"
-+version = "0.4.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
-+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
- dependencies = [
-- "generic-array",
-+ "crypto-common",
-+ "inout",
-+]
-+
-+[[package]]
-+name = "clang-sys"
-+version = "1.8.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-+dependencies = [
-+ "glob",
-+ "libc",
-+ "libloading",
- ]
- 
- [[package]]
-@@ -1143,6 +1169,15 @@ version = "0.4.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688"
- 
-+[[package]]
-+name = "cmake"
-+version = "0.1.54"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
-+dependencies = [
-+ "cc",
-+]
-+
- [[package]]
- name = "color-name"
- version = "1.1.0"
-@@ -1233,6 +1268,16 @@ dependencies = [
-  "libc",
- ]
- 
-+[[package]]
-+name = "core-foundation"
-+version = "0.10.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
-+dependencies = [
-+ "core-foundation-sys",
-+ "libc",
-+]
-+
- [[package]]
- name = "core-foundation-sys"
- version = "0.8.7"
-@@ -1332,16 +1377,6 @@ dependencies = [
-  "typenum",
- ]
- 
--[[package]]
--name = "crypto-mac"
--version = "0.11.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e"
--dependencies = [
-- "generic-array",
-- "subtle",
--]
--
- [[package]]
- name = "csound"
- version = "0.1.8"
-@@ -1366,9 +1401,9 @@ dependencies = [
- 
- [[package]]
- name = "ctr"
--version = "0.6.0"
-+version = "0.9.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f"
-+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
- dependencies = [
-  "cipher",
- ]
-@@ -1434,7 +1469,7 @@ dependencies = [
-  "iso8601",
-  "lazy_static",
-  "num-traits",
-- "quick-xml",
-+ "quick-xml 0.37.2",
-  "regex",
-  "serde",
-  "serde_path_to_error",
-@@ -1499,6 +1534,17 @@ dependencies = [
-  "zeroize",
- ]
- 
-+[[package]]
-+name = "der"
-+version = "0.7.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
-+dependencies = [
-+ "const-oid",
-+ "pem-rfc7468",
-+ "zeroize",
-+]
-+
- [[package]]
- name = "deranged"
- version = "0.3.11"
-@@ -1510,27 +1556,50 @@ dependencies = [
- ]
- 
- [[package]]
--name = "diff"
--version = "0.1.13"
-+name = "derive_builder"
-+version = "0.20.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-+checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
-+dependencies = [
-+ "derive_builder_macro",
-+]
- 
- [[package]]
--name = "digest"
--version = "0.9.0"
-+name = "derive_builder_core"
-+version = "0.20.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-+checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
- dependencies = [
-- "generic-array",
-+ "darling",
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.99",
-+]
-+
-+[[package]]
-+name = "derive_builder_macro"
-+version = "0.20.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
-+dependencies = [
-+ "derive_builder_core",
-+ "syn 2.0.99",
- ]
- 
-+[[package]]
-+name = "diff"
-+version = "0.1.13"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-+
- [[package]]
- name = "digest"
- version = "0.10.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
- dependencies = [
-- "block-buffer 0.10.4",
-+ "block-buffer",
-+ "const-oid",
-  "crypto-common",
-  "subtle",
- ]
-@@ -1567,6 +1636,12 @@ dependencies = [
-  "rgb",
- ]
- 
-+[[package]]
-+name = "dunce"
-+version = "1.0.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
-+
- [[package]]
- name = "ebml-iterable"
- version = "0.6.3"
-@@ -1614,10 +1689,10 @@ version = "0.14.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
- dependencies = [
-- "der",
-+ "der 0.6.1",
-  "elliptic-curve",
-  "rfc6979",
-- "signature",
-+ "signature 1.6.4",
- ]
- 
- [[package]]
-@@ -1626,7 +1701,7 @@ version = "1.5.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
- dependencies = [
-- "signature",
-+ "signature 1.6.4",
- ]
- 
- [[package]]
-@@ -1643,12 +1718,12 @@ checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
- dependencies = [
-  "base16ct",
-  "crypto-bigint 0.4.9",
-- "der",
-- "digest 0.10.7",
-+ "der 0.6.1",
-+ "digest",
-  "ff",
-  "generic-array",
-  "group",
-- "pkcs8",
-+ "pkcs8 0.9.0",
-  "rand_core 0.6.4",
-  "sec1",
-  "subtle",
-@@ -1856,6 +1931,12 @@ dependencies = [
-  "autocfg",
- ]
- 
-+[[package]]
-+name = "fs_extra"
-+version = "1.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
-+
- [[package]]
- name = "fst"
- version = "0.4.7"
-@@ -1933,6 +2014,12 @@ version = "0.3.31"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
- 
-+[[package]]
-+name = "futures-timer"
-+version = "3.0.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
-+
- [[package]]
- name = "futures-util"
- version = "0.3.31"
-@@ -2209,6 +2296,24 @@ dependencies = [
-  "system-deps 7.0.3",
- ]
- 
-+[[package]]
-+name = "governor"
-+version = "0.6.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b"
-+dependencies = [
-+ "cfg-if",
-+ "futures",
-+ "futures-timer",
-+ "no-std-compat",
-+ "nonzero_ext",
-+ "parking_lot",
-+ "portable-atomic",
-+ "rand 0.8.5",
-+ "smallvec",
-+ "spinning_top",
-+]
-+
- [[package]]
- name = "graphene-rs"
- version = "0.20.9"
-@@ -2488,7 +2593,7 @@ dependencies = [
-  "gstreamer-video",
-  "m3u8-rs",
-  "once_cell",
-- "quick-xml",
-+ "quick-xml 0.37.2",
-  "serde",
- ]
- 
-@@ -2680,7 +2785,7 @@ dependencies = [
-  "gstreamer-video",
-  "libloading",
-  "once_cell",
-- "quick-xml",
-+ "quick-xml 0.37.2",
-  "smallvec",
-  "thiserror 2.0.12",
- ]
-@@ -3763,21 +3868,20 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
- 
- [[package]]
- name = "hmac"
--version = "0.11.0"
-+version = "0.12.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
-+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
- dependencies = [
-- "crypto-mac",
-- "digest 0.9.0",
-+ "digest",
- ]
- 
- [[package]]
--name = "hmac"
--version = "0.12.1"
-+name = "home"
-+version = "0.5.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
- dependencies = [
-- "digest 0.10.7",
-+ "windows-sys 0.59.0",
- ]
- 
- [[package]]
-@@ -3923,18 +4027,24 @@ dependencies = [
- ]
- 
- [[package]]
--name = "hyper-proxy"
--version = "0.9.1"
-+name = "hyper-proxy2"
-+version = "0.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc"
-+checksum = "9043b7b23fb0bc4a1c7014c27b50a4fc42cc76206f71d34fc0dfe5b28ddc3faf"
- dependencies = [
-  "bytes",
-- "futures",
-- "headers 0.3.9",
-- "http 0.2.12",
-- "hyper 0.14.32",
-+ "futures-util",
-+ "headers 0.4.0",
-+ "http 1.2.0",
-+ "hyper 1.6.0",
-+ "hyper-rustls 0.26.0",
-+ "hyper-util",
-+ "pin-project-lite",
-+ "rustls-native-certs 0.7.3",
-  "tokio",
-+ "tokio-rustls 0.25.0",
-  "tower-service",
-+ "webpki",
- ]
- 
- [[package]]
-@@ -3948,11 +4058,30 @@ dependencies = [
-  "hyper 0.14.32",
-  "log",
-  "rustls 0.21.12",
-- "rustls-native-certs",
-+ "rustls-native-certs 0.6.3",
-  "tokio",
-  "tokio-rustls 0.24.1",
- ]
- 
-+[[package]]
-+name = "hyper-rustls"
-+version = "0.26.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
-+dependencies = [
-+ "futures-util",
-+ "http 1.2.0",
-+ "hyper 1.6.0",
-+ "hyper-util",
-+ "log",
-+ "rustls 0.22.4",
-+ "rustls-native-certs 0.7.3",
-+ "rustls-pki-types",
-+ "tokio",
-+ "tokio-rustls 0.25.0",
-+ "tower-service",
-+]
-+
- [[package]]
- name = "hyper-rustls"
- version = "0.27.5"
-@@ -3963,7 +4092,9 @@ dependencies = [
-  "http 1.2.0",
-  "hyper 1.6.0",
-  "hyper-util",
-+ "log",
-  "rustls 0.23.23",
-+ "rustls-native-certs 0.8.1",
-  "rustls-pki-types",
-  "tokio",
-  "tokio-rustls 0.26.2",
-@@ -4052,7 +4183,7 @@ dependencies = [
-  "iana-time-zone-haiku",
-  "js-sys",
-  "wasm-bindgen",
-- "windows-core",
-+ "windows-core 0.52.0",
- ]
- 
- [[package]]
-@@ -4261,6 +4392,15 @@ dependencies = [
-  "serde",
- ]
- 
-+[[package]]
-+name = "inout"
-+version = "0.1.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
-+dependencies = [
-+ "generic-array",
-+]
-+
- [[package]]
- name = "interpolate_name"
- version = "0.2.4"
-@@ -4372,6 +4512,15 @@ name = "lazy_static"
- version = "1.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-+dependencies = [
-+ "spin",
-+]
-+
-+[[package]]
-+name = "lazycell"
-+version = "1.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
- 
- [[package]]
- name = "lewton"
-@@ -4380,7 +4529,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030"
- dependencies = [
-  "byteorder",
-- "ogg",
-  "tinyvec",
- ]
- 
-@@ -4418,108 +4566,141 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
- 
- [[package]]
- name = "librespot-audio"
--version = "0.4.2"
-+version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c176a31355e1ea8e0b9c4ced19df4947bfe4770661c25c142b6fba2365940d9d"
-+checksum = "5fbda070a5598b32718e497f585f46891f7113e64aff20a13c0f2ba8fe7ccad9"
- dependencies = [
-- "aes-ctr",
-- "byteorder",
-+ "aes",
-  "bytes",
-+ "ctr",
-  "futures-util",
-+ "http-body-util",
-+ "hyper 1.6.0",
-+ "hyper-util",
-  "librespot-core",
-  "log",
-+ "parking_lot",
-  "tempfile",
-+ "thiserror 1.0.69",
-  "tokio",
- ]
- 
- [[package]]
- name = "librespot-core"
--version = "0.4.2"
-+version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "046349f25888e644bf02d9c5de0164b2a493d29aa4ce18e1ad0b756da9b55d6d"
-+checksum = "505a5ddd966231755994b60435607a1e8ae1d41c7f1169b078e0511bfb82d931"
- dependencies = [
-  "aes",
-- "base64 0.13.1",
-+ "base64 0.22.1",
-  "byteorder",
-  "bytes",
-+ "data-encoding",
-  "form_urlencoded",
-  "futures-core",
-  "futures-util",
-- "hmac 0.11.0",
-- "http 0.2.12",
-+ "governor",
-+ "hmac",
-+ "http 1.2.0",
-+ "http-body-util",
-  "httparse",
-- "hyper 0.14.32",
-- "hyper-proxy",
-+ "hyper 1.6.0",
-+ "hyper-proxy2",
-+ "hyper-rustls 0.27.5",
-+ "hyper-util",
-+ "librespot-oauth",
-  "librespot-protocol",
-  "log",
-+ "nonzero_ext",
-  "num-bigint",
-+ "num-derive",
-  "num-integer",
-  "num-traits",
-  "once_cell",
-+ "parking_lot",
-  "pbkdf2",
-+ "pin-project-lite",
-  "priority-queue",
-  "protobuf",
-+ "quick-xml 0.36.2",
-  "rand 0.8.5",
-+ "rsa",
-  "serde",
-  "serde_json",
-- "sha-1",
-+ "sha1",
-  "shannon",
-+ "sysinfo",
-  "thiserror 1.0.69",
-+ "time",
-  "tokio",
-  "tokio-stream",
-+ "tokio-tungstenite 0.24.0",
-  "tokio-util",
-  "url",
-  "uuid",
-- "vergen",
-+ "vergen-gitcl",
- ]
- 
- [[package]]
- name = "librespot-metadata"
--version = "0.4.2"
-+version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6b80361fcbcb5092056fd47c08c34d5d51b08385d8efb6941c0d3e46d032c21c"
-+checksum = "6a10ab5a390f65281e763cd09c617b173f0e665994eae3d242526924625fdc66"
- dependencies = [
-  "async-trait",
-- "byteorder",
-+ "bytes",
-  "librespot-core",
-  "librespot-protocol",
-  "log",
-  "protobuf",
-+ "serde",
-+ "serde_json",
-+ "thiserror 1.0.69",
-+ "uuid",
- ]
- 
- [[package]]
--name = "librespot-playback"
--version = "0.4.2"
-+name = "librespot-oauth"
-+version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5190a0b9bcc7f70ee4196a6b4a1c731d405ca130d4a6fcd4c561cfdde8b7cfb7"
-+checksum = "57bda94233b358fb41c04ed15507c61136c80efe876c6e05a10ddb9a182b144e"
- dependencies = [
-- "byteorder",
-- "futures-executor",
-- "futures-util",
-- "lewton",
-- "librespot-audio",
-- "librespot-core",
-- "librespot-metadata",
-  "log",
-- "ogg",
-+ "oauth2",
-+ "thiserror 1.0.69",
-+ "url",
-+]
-+
-+[[package]]
-+name = "librespot-playback"
-+version = "0.5.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5b1bcfe1d72c5ac14c798c7e3e1c20e1fb6af2b9c254794545cfcb1f2a4627e2"
-+dependencies = [
-+ "futures-util",
-+ "librespot-audio",
-+ "librespot-core",
-+ "librespot-metadata",
-+ "log",
-+ "ogg",
-  "parking_lot",
-  "rand 0.8.5",
-  "rand_distr",
-  "shell-words",
-+ "symphonia",
-  "thiserror 1.0.69",
-  "tokio",
-- "zerocopy 0.6.6",
-+ "zerocopy 0.7.35",
- ]
- 
- [[package]]
- name = "librespot-protocol"
--version = "0.4.2"
-+version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5d6d3ac6196ac0ea67bbe039f56d6730a5d8b31502ef9bce0f504ed729dcb39f"
-+checksum = "0d6f343f573e0469d3ff8a02b99bbd9789faa01e2ff167332542ac840a8b31e7"
- dependencies = [
-- "glob",
-  "protobuf",
-- "protobuf-codegen-pure",
-+ "protobuf-codegen",
- ]
- 
- [[package]]
-@@ -4674,7 +4855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
- dependencies = [
-  "cfg-if",
-- "digest 0.10.7",
-+ "digest",
- ]
- 
- [[package]]
-@@ -4801,7 +4982,7 @@ dependencies = [
-  "openssl-probe",
-  "openssl-sys",
-  "schannel",
-- "security-framework",
-+ "security-framework 2.11.1",
-  "security-framework-sys",
-  "tempfile",
- ]
-@@ -4834,6 +5015,12 @@ dependencies = [
-  "rustfft",
- ]
- 
-+[[package]]
-+name = "no-std-compat"
-+version = "0.4.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
-+
- [[package]]
- name = "nom"
- version = "7.1.3"
-@@ -4853,12 +5040,27 @@ dependencies = [
-  "memchr",
- ]
- 
-+[[package]]
-+name = "nonzero_ext"
-+version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
-+
- [[package]]
- name = "noop_proc_macro"
- version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
- 
-+[[package]]
-+name = "ntapi"
-+version = "0.4.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
-+dependencies = [
-+ "winapi",
-+]
-+
- [[package]]
- name = "nu-ansi-term"
- version = "0.46.0"
-@@ -4880,6 +5082,23 @@ dependencies = [
-  "rand 0.8.5",
- ]
- 
-+[[package]]
-+name = "num-bigint-dig"
-+version = "0.8.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
-+dependencies = [
-+ "byteorder",
-+ "lazy_static",
-+ "libm",
-+ "num-integer",
-+ "num-iter",
-+ "num-traits",
-+ "rand 0.8.5",
-+ "smallvec",
-+ "zeroize",
-+]
-+
- [[package]]
- name = "num-complex"
- version = "0.4.6"
-@@ -4915,6 +5134,17 @@ dependencies = [
-  "num-traits",
- ]
- 
-+[[package]]
-+name = "num-iter"
-+version = "0.1.45"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
-+dependencies = [
-+ "autocfg",
-+ "num-integer",
-+ "num-traits",
-+]
-+
- [[package]]
- name = "num-rational"
- version = "0.4.2"
-@@ -4947,6 +5177,35 @@ dependencies = [
-  "libc",
- ]
- 
-+[[package]]
-+name = "num_threads"
-+version = "0.1.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
-+dependencies = [
-+ "libc",
-+]
-+
-+[[package]]
-+name = "oauth2"
-+version = "4.4.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f"
-+dependencies = [
-+ "base64 0.13.1",
-+ "chrono",
-+ "getrandom 0.2.15",
-+ "http 0.2.12",
-+ "rand 0.8.5",
-+ "reqwest 0.11.27",
-+ "serde",
-+ "serde_json",
-+ "serde_path_to_error",
-+ "sha2",
-+ "thiserror 1.0.69",
-+ "url",
-+]
-+
- [[package]]
- name = "object"
- version = "0.36.7"
-@@ -4958,9 +5217,9 @@ dependencies = [
- 
- [[package]]
- name = "ogg"
--version = "0.8.0"
-+version = "0.9.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e"
-+checksum = "fdab8dcd8d4052eaacaf8fb07a3ccd9a6e26efadb42878a413c68fc4af1dee2b"
- dependencies = [
-  "byteorder",
- ]
-@@ -4971,12 +5230,6 @@ version = "1.20.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
- 
--[[package]]
--name = "opaque-debug"
--version = "0.3.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
--
- [[package]]
- name = "openssl"
- version = "0.10.71"
-@@ -5188,12 +5441,12 @@ dependencies = [
- 
- [[package]]
- name = "pbkdf2"
--version = "0.8.0"
-+version = "0.12.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
-+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
- dependencies = [
-- "crypto-mac",
-- "hmac 0.11.0",
-+ "digest",
-+ "hmac",
- ]
- 
- [[package]]
-@@ -5206,6 +5459,15 @@ dependencies = [
-  "serde",
- ]
- 
-+[[package]]
-+name = "pem-rfc7468"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
-+dependencies = [
-+ "base64ct",
-+]
-+
- [[package]]
- name = "percent-encoding"
- version = "2.3.1"
-@@ -5254,14 +5516,35 @@ version = "0.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
- 
-+[[package]]
-+name = "pkcs1"
-+version = "0.7.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
-+dependencies = [
-+ "der 0.7.9",
-+ "pkcs8 0.10.2",
-+ "spki 0.7.3",
-+]
-+
- [[package]]
- name = "pkcs8"
- version = "0.9.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
- dependencies = [
-- "der",
-- "spki",
-+ "der 0.6.1",
-+ "spki 0.6.0",
-+]
-+
-+[[package]]
-+name = "pkcs8"
-+version = "0.10.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
-+dependencies = [
-+ "der 0.7.9",
-+ "spki 0.7.3",
- ]
- 
- [[package]]
-@@ -5304,6 +5587,12 @@ dependencies = [
-  "windows-sys 0.59.0",
- ]
- 
-+[[package]]
-+name = "portable-atomic"
-+version = "1.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
-+
- [[package]]
- name = "powerfmt"
- version = "0.2.0"
-@@ -5350,12 +5639,13 @@ dependencies = [
- 
- [[package]]
- name = "priority-queue"
--version = "1.4.0"
-+version = "2.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a0bda9164fe05bc9225752d54aae413343c36f684380005398a6a8fde95fe785"
-+checksum = "ef08705fa1589a1a59aa924ad77d14722cb0cd97b67dd5004ed5f4a4873fce8d"
- dependencies = [
-  "autocfg",
-- "indexmap 1.9.3",
-+ "equivalent",
-+ "indexmap 2.7.1",
- ]
- 
- [[package]]
-@@ -5474,27 +5764,53 @@ dependencies = [
- 
- [[package]]
- name = "protobuf"
--version = "2.28.0"
-+version = "3.7.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
-+checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4"
-+dependencies = [
-+ "once_cell",
-+ "protobuf-support",
-+ "thiserror 1.0.69",
-+]
- 
- [[package]]
- name = "protobuf-codegen"
--version = "2.28.0"
-+version = "3.7.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "033460afb75cf755fcfc16dfaed20b86468082a2ea24e05ac35ab4a099a017d6"
-+checksum = "5d3976825c0014bbd2f3b34f0001876604fe87e0c86cd8fa54251530f1544ace"
- dependencies = [
-+ "anyhow",
-+ "once_cell",
-  "protobuf",
-+ "protobuf-parse",
-+ "regex",
-+ "tempfile",
-+ "thiserror 1.0.69",
- ]
- 
- [[package]]
--name = "protobuf-codegen-pure"
--version = "2.28.0"
-+name = "protobuf-parse"
-+version = "3.7.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "95a29399fc94bcd3eeaa951c715f7bea69409b2445356b00519740bcd6ddd865"
-+checksum = "b4aeaa1f2460f1d348eeaeed86aea999ce98c1bded6f089ff8514c9d9dbdc973"
- dependencies = [
-+ "anyhow",
-+ "indexmap 2.7.1",
-+ "log",
-  "protobuf",
-- "protobuf-codegen",
-+ "protobuf-support",
-+ "tempfile",
-+ "thiserror 1.0.69",
-+ "which",
-+]
-+
-+[[package]]
-+name = "protobuf-support"
-+version = "3.7.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6"
-+dependencies = [
-+ "thiserror 1.0.69",
- ]
- 
- [[package]]
-@@ -5513,6 +5829,16 @@ dependencies = [
-  "psl-types",
- ]
- 
-+[[package]]
-+name = "quick-xml"
-+version = "0.36.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
-+dependencies = [
-+ "memchr",
-+ "serde",
-+]
-+
- [[package]]
- name = "quick-xml"
- version = "0.37.2"
-@@ -5533,7 +5859,7 @@ dependencies = [
-  "pin-project-lite",
-  "quinn-proto",
-  "quinn-udp",
-- "rustc-hash",
-+ "rustc-hash 2.1.1",
-  "rustls 0.23.23",
-  "socket2",
-  "thiserror 2.0.12",
-@@ -5551,7 +5877,7 @@ dependencies = [
-  "getrandom 0.2.15",
-  "rand 0.8.5",
-  "ring",
-- "rustc-hash",
-+ "rustc-hash 2.1.1",
-  "rustls 0.23.23",
-  "rustls-pki-types",
-  "slab",
-@@ -5812,6 +6138,7 @@ dependencies = [
-  "http 0.2.12",
-  "http-body 0.4.6",
-  "hyper 0.14.32",
-+ "hyper-rustls 0.24.2",
-  "hyper-tls 0.5.0",
-  "ipnet",
-  "js-sys",
-@@ -5821,6 +6148,7 @@ dependencies = [
-  "once_cell",
-  "percent-encoding",
-  "pin-project-lite",
-+ "rustls 0.21.12",
-  "rustls-pemfile 1.0.4",
-  "serde",
-  "serde_json",
-@@ -5829,11 +6157,13 @@ dependencies = [
-  "system-configuration 0.5.1",
-  "tokio",
-  "tokio-native-tls",
-+ "tokio-rustls 0.24.1",
-  "tower-service",
-  "url",
-  "wasm-bindgen",
-  "wasm-bindgen-futures",
-  "web-sys",
-+ "webpki-roots",
-  "winreg",
- ]
- 
-@@ -5892,7 +6222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
- dependencies = [
-  "crypto-bigint 0.4.9",
-- "hmac 0.12.1",
-+ "hmac",
-  "zeroize",
- ]
- 
-@@ -5919,6 +6249,26 @@ dependencies = [
-  "windows-sys 0.52.0",
- ]
- 
-+[[package]]
-+name = "rsa"
-+version = "0.9.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b"
-+dependencies = [
-+ "const-oid",
-+ "digest",
-+ "num-bigint-dig",
-+ "num-integer",
-+ "num-traits",
-+ "pkcs1",
-+ "pkcs8 0.10.2",
-+ "rand_core 0.6.4",
-+ "signature 2.2.0",
-+ "spki 0.7.3",
-+ "subtle",
-+ "zeroize",
-+]
-+
- [[package]]
- name = "rtcp-types"
- version = "0.1.0"
-@@ -5968,6 +6318,12 @@ version = "0.1.24"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
- 
-+[[package]]
-+name = "rustc-hash"
-+version = "1.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-+
- [[package]]
- name = "rustc-hash"
- version = "2.1.1"
-@@ -6032,12 +6388,28 @@ dependencies = [
-  "sct",
- ]
- 
-+[[package]]
-+name = "rustls"
-+version = "0.22.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
-+dependencies = [
-+ "log",
-+ "ring",
-+ "rustls-pki-types",
-+ "rustls-webpki 0.102.8",
-+ "subtle",
-+ "zeroize",
-+]
-+
- [[package]]
- name = "rustls"
- version = "0.23.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
- dependencies = [
-+ "aws-lc-rs",
-+ "log",
-  "once_cell",
-  "ring",
-  "rustls-pki-types",
-@@ -6055,7 +6427,32 @@ dependencies = [
-  "openssl-probe",
-  "rustls-pemfile 1.0.4",
-  "schannel",
-- "security-framework",
-+ "security-framework 2.11.1",
-+]
-+
-+[[package]]
-+name = "rustls-native-certs"
-+version = "0.7.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
-+dependencies = [
-+ "openssl-probe",
-+ "rustls-pemfile 2.2.0",
-+ "rustls-pki-types",
-+ "schannel",
-+ "security-framework 2.11.1",
-+]
-+
-+[[package]]
-+name = "rustls-native-certs"
-+version = "0.8.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
-+dependencies = [
-+ "openssl-probe",
-+ "rustls-pki-types",
-+ "schannel",
-+ "security-framework 3.2.0",
- ]
- 
- [[package]]
-@@ -6101,6 +6498,7 @@ version = "0.102.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
- dependencies = [
-+ "aws-lc-rs",
-  "ring",
-  "rustls-pki-types",
-  "untrusted",
-@@ -6190,9 +6588,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
- dependencies = [
-  "base16ct",
-- "der",
-+ "der 0.6.1",
-  "generic-array",
-- "pkcs8",
-+ "pkcs8 0.9.0",
-  "subtle",
-  "zeroize",
- ]
-@@ -6204,7 +6602,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
- dependencies = [
-  "bitflags 2.9.0",
-- "core-foundation",
-+ "core-foundation 0.9.4",
-+ "core-foundation-sys",
-+ "libc",
-+ "security-framework-sys",
-+]
-+
-+[[package]]
-+name = "security-framework"
-+version = "3.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
-+dependencies = [
-+ "bitflags 2.9.0",
-+ "core-foundation 0.10.0",
-  "core-foundation-sys",
-  "libc",
-  "security-framework-sys",
-@@ -6353,19 +6764,6 @@ dependencies = [
-  "syn 2.0.99",
- ]
- 
--[[package]]
--name = "sha-1"
--version = "0.9.8"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
--dependencies = [
-- "block-buffer 0.9.0",
-- "cfg-if",
-- "cpufeatures",
-- "digest 0.9.0",
-- "opaque-debug",
--]
--
- [[package]]
- name = "sha1"
- version = "0.10.6"
-@@ -6374,7 +6772,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
- dependencies = [
-  "cfg-if",
-  "cpufeatures",
-- "digest 0.10.7",
-+ "digest",
- ]
- 
- [[package]]
-@@ -6385,7 +6783,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
- dependencies = [
-  "cfg-if",
-  "cpufeatures",
-- "digest 0.10.7",
-+ "digest",
- ]
- 
- [[package]]
-@@ -6443,7 +6841,17 @@ version = "1.6.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
- dependencies = [
-- "digest 0.10.7",
-+ "digest",
-+ "rand_core 0.6.4",
-+]
-+
-+[[package]]
-+name = "signature"
-+version = "2.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
-+dependencies = [
-+ "digest",
-  "rand_core 0.6.4",
- ]
- 
-@@ -6514,6 +6922,15 @@ dependencies = [
-  "lock_api",
- ]
- 
-+[[package]]
-+name = "spinning_top"
-+version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
-+dependencies = [
-+ "lock_api",
-+]
-+
- [[package]]
- name = "spki"
- version = "0.6.0"
-@@ -6521,7 +6938,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
- dependencies = [
-  "base64ct",
-- "der",
-+ "der 0.6.1",
-+]
-+
-+[[package]]
-+name = "spki"
-+version = "0.7.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
-+dependencies = [
-+ "base64ct",
-+ "der 0.7.9",
- ]
- 
- [[package]]
-@@ -6569,6 +6996,90 @@ version = "2.6.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
- 
-+[[package]]
-+name = "symphonia"
-+version = "0.5.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9"
-+dependencies = [
-+ "lazy_static",
-+ "symphonia-bundle-mp3",
-+ "symphonia-codec-vorbis",
-+ "symphonia-core",
-+ "symphonia-format-ogg",
-+ "symphonia-metadata",
-+]
-+
-+[[package]]
-+name = "symphonia-bundle-mp3"
-+version = "0.5.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4"
-+dependencies = [
-+ "lazy_static",
-+ "log",
-+ "symphonia-core",
-+ "symphonia-metadata",
-+]
-+
-+[[package]]
-+name = "symphonia-codec-vorbis"
-+version = "0.5.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5a98765fb46a0a6732b007f7e2870c2129b6f78d87db7987e6533c8f164a9f30"
-+dependencies = [
-+ "log",
-+ "symphonia-core",
-+ "symphonia-utils-xiph",
-+]
-+
-+[[package]]
-+name = "symphonia-core"
-+version = "0.5.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3"
-+dependencies = [
-+ "arrayvec",
-+ "bitflags 1.3.2",
-+ "bytemuck",
-+ "lazy_static",
-+ "log",
-+]
-+
-+[[package]]
-+name = "symphonia-format-ogg"
-+version = "0.5.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ada3505789516bcf00fc1157c67729eded428b455c27ca370e41f4d785bfa931"
-+dependencies = [
-+ "log",
-+ "symphonia-core",
-+ "symphonia-metadata",
-+ "symphonia-utils-xiph",
-+]
-+
-+[[package]]
-+name = "symphonia-metadata"
-+version = "0.5.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c"
-+dependencies = [
-+ "encoding_rs",
-+ "lazy_static",
-+ "log",
-+ "symphonia-core",
-+]
-+
-+[[package]]
-+name = "symphonia-utils-xiph"
-+version = "0.5.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "484472580fa49991afda5f6550ece662237b00c6f562c7d9638d1b086ed010fe"
-+dependencies = [
-+ "symphonia-core",
-+ "symphonia-metadata",
-+]
-+
- [[package]]
- name = "syn"
- version = "1.0.109"
-@@ -6617,6 +7128,19 @@ dependencies = [
-  "syn 2.0.99",
- ]
- 
-+[[package]]
-+name = "sysinfo"
-+version = "0.31.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be"
-+dependencies = [
-+ "core-foundation-sys",
-+ "libc",
-+ "memchr",
-+ "ntapi",
-+ "windows",
-+]
-+
- [[package]]
- name = "system-configuration"
- version = "0.5.1"
-@@ -6624,7 +7148,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
- dependencies = [
-  "bitflags 1.3.2",
-- "core-foundation",
-+ "core-foundation 0.9.4",
-  "system-configuration-sys 0.5.0",
- ]
- 
-@@ -6635,7 +7159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
- dependencies = [
-  "bitflags 2.9.0",
-- "core-foundation",
-+ "core-foundation 0.9.4",
-  "system-configuration-sys 0.6.0",
- ]
- 
-@@ -6819,7 +7343,9 @@ checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
- dependencies = [
-  "deranged",
-  "itoa",
-+ "libc",
-  "num-conv",
-+ "num_threads",
-  "powerfmt",
-  "serde",
-  "time-core",
-@@ -6916,6 +7442,17 @@ dependencies = [
-  "tokio",
- ]
- 
-+[[package]]
-+name = "tokio-rustls"
-+version = "0.25.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
-+dependencies = [
-+ "rustls 0.22.4",
-+ "rustls-pki-types",
-+ "tokio",
-+]
-+
- [[package]]
- name = "tokio-rustls"
- version = "0.26.2"
-@@ -6963,6 +7500,22 @@ dependencies = [
-  "tungstenite 0.21.0",
- ]
- 
-+[[package]]
-+name = "tokio-tungstenite"
-+version = "0.24.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9"
-+dependencies = [
-+ "futures-util",
-+ "log",
-+ "rustls 0.23.23",
-+ "rustls-native-certs 0.8.1",
-+ "rustls-pki-types",
-+ "tokio",
-+ "tokio-rustls 0.26.2",
-+ "tungstenite 0.24.0",
-+]
-+
- [[package]]
- name = "tokio-util"
- version = "0.7.13"
-@@ -7154,6 +7707,26 @@ dependencies = [
-  "utf-8",
- ]
- 
-+[[package]]
-+name = "tungstenite"
-+version = "0.24.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
-+dependencies = [
-+ "byteorder",
-+ "bytes",
-+ "data-encoding",
-+ "http 1.2.0",
-+ "httparse",
-+ "log",
-+ "rand 0.8.5",
-+ "rustls 0.23.23",
-+ "rustls-pki-types",
-+ "sha1",
-+ "thiserror 1.0.69",
-+ "utf-8",
-+]
-+
- [[package]]
- name = "tungstenite"
- version = "0.26.2"
-@@ -7218,6 +7791,7 @@ dependencies = [
-  "form_urlencoded",
-  "idna",
-  "percent-encoding",
-+ "serde",
- ]
- 
- [[package]]
-@@ -7266,6 +7840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
- dependencies = [
-  "getrandom 0.3.1",
-+ "rand 0.9.0",
- ]
- 
- [[package]]
-@@ -7299,13 +7874,40 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
- 
- [[package]]
- name = "vergen"
--version = "3.2.0"
-+version = "9.0.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e7141e445af09c8919f1d5f8a20dae0b20c3b57a45dee0d5823c6ed5d237f15a"
-+checksum = "e0d2f179f8075b805a43a2a21728a46f0cc2921b3c58695b28fa8817e103cd9a"
- dependencies = [
-- "bitflags 1.3.2",
-- "chrono",
-- "rustc_version",
-+ "anyhow",
-+ "derive_builder",
-+ "rustversion",
-+ "time",
-+ "vergen-lib",
-+]
-+
-+[[package]]
-+name = "vergen-gitcl"
-+version = "1.0.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b2f89d70a58a4506a6079cedf575c64cf51649ccbb4e02a63dac539b264b7711"
-+dependencies = [
-+ "anyhow",
-+ "derive_builder",
-+ "rustversion",
-+ "time",
-+ "vergen",
-+ "vergen-lib",
-+]
-+
-+[[package]]
-+name = "vergen-lib"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9b07e6010c0f3e59fcb164e0163834597da68d1f864e2b8ca49f74de01e9c166"
-+dependencies = [
-+ "anyhow",
-+ "derive_builder",
-+ "rustversion",
- ]
- 
- [[package]]
-@@ -7495,12 +8097,40 @@ dependencies = [
-  "ebml-iterable",
- ]
- 
-+[[package]]
-+name = "webpki"
-+version = "0.22.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
-+dependencies = [
-+ "ring",
-+ "untrusted",
-+]
-+
-+[[package]]
-+name = "webpki-roots"
-+version = "0.25.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
-+
- [[package]]
- name = "weezl"
- version = "0.1.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
- 
-+[[package]]
-+name = "which"
-+version = "4.4.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
-+dependencies = [
-+ "either",
-+ "home",
-+ "once_cell",
-+ "rustix",
-+]
-+
- [[package]]
- name = "winapi"
- version = "0.3.9"
-@@ -7532,6 +8162,16 @@ version = "0.4.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
- 
-+[[package]]
-+name = "windows"
-+version = "0.57.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
-+dependencies = [
-+ "windows-core 0.57.0",
-+ "windows-targets 0.52.6",
-+]
-+
- [[package]]
- name = "windows-core"
- version = "0.52.0"
-@@ -7541,6 +8181,40 @@ dependencies = [
-  "windows-targets 0.52.6",
- ]
- 
-+[[package]]
-+name = "windows-core"
-+version = "0.57.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
-+dependencies = [
-+ "windows-implement",
-+ "windows-interface",
-+ "windows-result 0.1.2",
-+ "windows-targets 0.52.6",
-+]
-+
-+[[package]]
-+name = "windows-implement"
-+version = "0.57.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.99",
-+]
-+
-+[[package]]
-+name = "windows-interface"
-+version = "0.57.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.99",
-+]
-+
- [[package]]
- name = "windows-link"
- version = "0.1.0"
-@@ -7553,11 +8227,20 @@ version = "0.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
- dependencies = [
-- "windows-result",
-+ "windows-result 0.2.0",
-  "windows-strings",
-  "windows-targets 0.52.6",
- ]
- 
-+[[package]]
-+name = "windows-result"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
-+dependencies = [
-+ "windows-targets 0.52.6",
-+]
-+
- [[package]]
- name = "windows-result"
- version = "0.2.0"
-@@ -7573,7 +8256,7 @@ version = "0.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
- dependencies = [
-- "windows-result",
-+ "windows-result 0.2.0",
-  "windows-targets 0.52.6",
- ]
- 
-@@ -7836,16 +8519,6 @@ dependencies = [
-  "synstructure",
- ]
- 
--[[package]]
--name = "zerocopy"
--version = "0.6.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
--dependencies = [
-- "byteorder",
-- "zerocopy-derive 0.6.6",
--]
--
- [[package]]
- name = "zerocopy"
- version = "0.7.35"
-@@ -7865,17 +8538,6 @@ dependencies = [
-  "zerocopy-derive 0.8.21",
- ]
- 
--[[package]]
--name = "zerocopy-derive"
--version = "0.6.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
--dependencies = [
-- "proc-macro2",
-- "quote",
-- "syn 2.0.99",
--]
--
- [[package]]
- name = "zerocopy-derive"
- version = "0.7.35"
-diff --git a/audio/spotify/Cargo.toml b/audio/spotify/Cargo.toml
-index 387785cd..b063b8ca 100644
---- a/audio/spotify/Cargo.toml
-+++ b/audio/spotify/Cargo.toml
-@@ -11,9 +11,9 @@ rust-version.workspace = true
- [dependencies]
- gst.workspace = true
- gst-base.workspace = true
--librespot-core = "0.4"
--librespot-playback = "0.4"
--tokio = { version = "1", features = ["rt-multi-thread"] }
-+librespot-core = "0.5"
-+librespot-playback = { version = "0.5", features = ['passthrough-decoder'] }
-+tokio = { version = "1.0", features = ["rt-multi-thread"] }
- futures = "0.3"
- anyhow = "1.0"
- url = "2.3"
-diff --git a/audio/spotify/README.md b/audio/spotify/README.md
-index 98237747..2e364926 100644
---- a/audio/spotify/README.md
-+++ b/audio/spotify/README.md
-@@ -9,23 +9,36 @@ to respect their legal/licensing restrictions.
- ## Spotify Credentials
- 
- This plugin requires a [Spotify Premium](https://www.spotify.com/premium/) account.
--If your account is linked with Facebook, you'll need to setup
--a [device username and password](https://www.spotify.com/us/account/set-device-password/).
- 
--Those username and password are then set using the `username` and `password` properties.
-+Provide a Spotify access token with 'streaming' scope using the `access-token` property. Such a token can be obtained by completing
-+[Spotify's OAuth flow](https://developer.spotify.com/documentation/web-api/concepts/authorization) or using the facility on their
-+[Web SDK getting started guide](https://developer.spotify.com/documentation/web-playback-sdk/tutorials/getting-started).
-+A token can also be obtained using [librespot-oauth](https://github.com/librespot-org/librespot/blob/dev/oauth/examples/oauth.rs):
- 
--You may also want to cache credentials and downloaded files, see the `cache-` properties on the element.
-+```console
-+cargo install librespot-oauth --example oauth && oauth
-+```
-+
-+Note, Spotify access tokens are only valid for 1 hour and must be [refreshed](https://developer.spotify.com/documentation/web-api/tutorials/refreshing-tokens)
-+for usage beyond that.
-+
-+It is therefore advisable to also use the `cache-credentials` property. On first usage, your access token is exchanged for a reusable credentials blob and
-+stored at the location specified by this property. Once obtained, that credentials blob is used for login and any provided `access-token` is ignored.
-+Unlike Spotify access tokens, the user's credentials blob does not expire. Avoiding handling token refresh greatly simplifies plugin usage.
-+If you do not set `cache-credentials`, you must manage refreshing your Spotify access token so it's valid for login when the element starts.
-+
-+You may also want to cache downloaded files, see the `cache-files` property.
- 
- ## spotifyaudiosrc
- 
- The `spotifyaudiosrc` element can be used to play a song from Spotify using its [Spotify URI](https://community.spotify.com/t5/FAQs/What-s-a-Spotify-URI/ta-p/919201).
- 
- ```
--gst-launch-1.0 spotifyaudiosrc username=$USERNAME password=$PASSWORD track=spotify:track:3i3P1mGpV9eRlfKccjDjwi ! oggdemux ! vorbisdec ! audioconvert ! autoaudiosink
-+gst-launch-1.0 spotifyaudiosrc access-token=$ACCESS_TOKEN track=spotify:track:3i3P1mGpV9eRlfKccjDjwi ! oggdemux ! vorbisdec ! audioconvert ! autoaudiosink
- ```
- 
- The element also implements an URI handler which accepts credentials and cache settings as URI parameters:
- 
- ```console
--gst-launch-1.0 playbin3 uri=spotify:track:3i3P1mGpV9eRlfKccjDjwi?username=$USERNAME\&password=$PASSWORD\&cache-credentials=cache\&cache-files=cache
-+gst-launch-1.0 playbin3 uri=spotify:track:3i3P1mGpV9eRlfKccjDjwi?access-token=$ACCESS_TOKEN\&cache-credentials=cache\&cache-files=cache
- ```
-\ No newline at end of file
-diff --git a/audio/spotify/src/common.rs b/audio/spotify/src/common.rs
-index ed77dcc6..a5764ef8 100644
---- a/audio/spotify/src/common.rs
-+++ b/audio/spotify/src/common.rs
-@@ -18,8 +18,7 @@ use librespot_core::{
- 
- #[derive(Default, Debug, Clone)]
- pub struct Settings {
--    username: String,
--    password: String,
-+    access_token: String,
-     cache_credentials: String,
-     cache_files: String,
-     cache_max_size: u64,
-@@ -28,52 +27,46 @@ pub struct Settings {
- 
- impl Settings {
-     pub fn properties() -> Vec<glib::ParamSpec> {
--        vec![glib::ParamSpecString::builder("username")
--                    .nick("Username")
--                    .blurb("Spotify username, Facebook accounts need a device username from https://www.spotify.com/us/account/set-device-password/")
--                    .default_value(Some(""))
--                    .mutable_ready()
--                    .build(),
--                glib::ParamSpecString::builder("password")
--                    .nick("Password")
--                    .blurb("Spotify password, Facebook accounts need a device password from https://www.spotify.com/us/account/set-device-password/")
--                    .default_value(Some(""))
--                    .mutable_ready()
--                    .build(),
--                glib::ParamSpecString::builder("cache-credentials")
--                    .nick("Credentials cache")
--                    .blurb("Directory where to cache Spotify credentials")
--                    .default_value(Some(""))
--                    .mutable_ready()
--                    .build(),
--                glib::ParamSpecString::builder("cache-files")
--                    .nick("Files cache")
--                    .blurb("Directory where to cache downloaded files from Spotify")
--                    .default_value(Some(""))
--                    .mutable_ready()
--                    .build(),
--                glib::ParamSpecUInt64::builder("cache-max-size")
--                    .nick("Cache max size")
--                    .blurb("The max allowed size of the cache, in bytes, or 0 to disable the cache limit")
--                    .default_value(0)
--                    .mutable_ready()
--                    .build(),
--                glib::ParamSpecString::builder("track")
--                    .nick("Spotify URI")
--                    .blurb("Spotify track URI, in the form 'spotify:track:$SPOTIFY_ID'")
--                    .default_value(Some(""))
--                    .mutable_ready()
--                    .build(),
--            ]
-+        vec![
-+            glib::ParamSpecString::builder("access-token")
-+                .nick("Access token")
-+                .blurb("Spotify access token, requires 'streaming' scope")
-+                .default_value(Some(""))
-+                .mutable_ready()
-+                .build(),
-+            glib::ParamSpecString::builder("cache-credentials")
-+                .nick("Credentials cache")
-+                .blurb("Directory where to cache Spotify credentials")
-+                .default_value(Some(""))
-+                .mutable_ready()
-+                .build(),
-+            glib::ParamSpecString::builder("cache-files")
-+                .nick("Files cache")
-+                .blurb("Directory where to cache downloaded files from Spotify")
-+                .default_value(Some(""))
-+                .mutable_ready()
-+                .build(),
-+            glib::ParamSpecUInt64::builder("cache-max-size")
-+                .nick("Cache max size")
-+                .blurb(
-+                    "The max allowed size of the cache, in bytes, or 0 to disable the cache limit",
-+                )
-+                .default_value(0)
-+                .mutable_ready()
-+                .build(),
-+            glib::ParamSpecString::builder("track")
-+                .nick("Spotify URI")
-+                .blurb("Spotify track URI, in the form 'spotify:track:$SPOTIFY_ID'")
-+                .default_value(Some(""))
-+                .mutable_ready()
-+                .build(),
-+        ]
-     }
- 
-     pub fn set_property(&mut self, value: &glib::Value, pspec: &glib::ParamSpec) {
-         match pspec.name() {
--            "username" => {
--                self.username = value.get().expect("type checked upstream");
--            }
--            "password" => {
--                self.password = value.get().expect("type checked upstream");
-+            "access-token" => {
-+                self.access_token = value.get().expect("type checked upstream");
-             }
-             "cache-credentials" => {
-                 self.cache_credentials = value.get().expect("type checked upstream");
-@@ -93,8 +86,7 @@ impl Settings {
- 
-     pub fn property(&self, pspec: &glib::ParamSpec) -> glib::Value {
-         match pspec.name() {
--            "username" => self.username.to_value(),
--            "password" => self.password.to_value(),
-+            "access-token" => self.access_token.to_value(),
-             "cache-credentials" => self.cache_credentials.to_value(),
-             "cache-files" => self.cache_files.to_value(),
-             "cache-max-size" => self.cache_max_size.to_value(),
-@@ -132,32 +124,20 @@ impl Settings {
-         let cache = Cache::new(credentials_cache, None, files_cache, max_size)?;
- 
-         if let Some(cached_cred) = cache.credentials() {
--            if !self.username.is_empty() && self.username != cached_cred.username {
--                gst::debug!(
--                    cat,
--                    obj = &src,
--                    "ignore cached credentials for user {} which mismatch user {}",
--                    cached_cred.username,
--                    self.username
--                );
--            } else {
--                gst::debug!(
--                    cat,
--                    obj = &src,
--                    "reuse cached credentials for user {}",
--                    cached_cred.username
--                );
--                if let Ok((session, _credentials)) = Session::connect(
--                    SessionConfig::default(),
--                    cached_cred,
--                    Some(cache.clone()),
--                    true,
--                )
--                .await
--                {
--                    return Ok(session);
--                }
--            }
-+            let cached_username = cached_cred
-+                .username
-+                .as_ref()
-+                .map_or("UNKNOWN", |s| s.as_str());
-+            gst::debug!(
-+                cat,
-+                obj = &src,
-+                "reuse cached credentials for user {}",
-+                cached_username
-+            );
-+
-+            let session = Session::new(SessionConfig::default(), Some(cache));
-+            session.connect(cached_cred, true).await?;
-+            return Ok(session);
-         }
- 
-         gst::debug!(
-@@ -166,17 +146,14 @@ impl Settings {
-             "credentials not in cache or cached credentials invalid",
-         );
- 
--        if self.username.is_empty() {
--            bail!("username is not set and credentials are not in cache");
--        }
--        if self.password.is_empty() {
--            bail!("password is not set and credentials are not in cache");
-+        if self.access_token.is_empty() {
-+            bail!("access-token is not set and credentials are not in cache");
-         }
- 
--        let cred = Credentials::with_password(&self.username, &self.password);
-+        let cred = Credentials::with_access_token(&self.access_token);
- 
--        let (session, _credentials) =
--            Session::connect(SessionConfig::default(), cred, Some(cache), true).await?;
-+        let session = Session::new(SessionConfig::default(), Some(cache));
-+        session.connect(cred, true).await?;
- 
-         Ok(session)
-     }
-@@ -185,9 +162,7 @@ impl Settings {
-         if self.track.is_empty() {
-             bail!("track is not set");
-         }
--        let track = SpotifyId::from_uri(&self.track).map_err(|_| {
--            anyhow::anyhow!("failed to create Spotify URI from track {}", self.track)
--        })?;
-+        let track = SpotifyId::from_uri(&self.track)?;
- 
-         Ok(track)
-     }
-diff --git a/audio/spotify/src/spotifyaudiosrc/imp.rs b/audio/spotify/src/spotifyaudiosrc/imp.rs
-index 6f429682..932f5a9f 100644
---- a/audio/spotify/src/spotifyaudiosrc/imp.rs
-+++ b/audio/spotify/src/spotifyaudiosrc/imp.rs
-@@ -52,7 +52,7 @@ enum Message {
- }
- 
- struct State {
--    player: Player,
-+    player: Arc<Player>,
- 
-     /// receiver sending buffer to streaming thread
-     receiver: mpsc::Receiver<Message>,
-@@ -321,11 +321,10 @@ struct BufferSink {
- 
- impl Sink for BufferSink {
-     fn write(&mut self, packet: AudioPacket, _converter: &mut Converter) -> SinkResult<()> {
--        let oggdata = match packet {
--            AudioPacket::OggData(data) => data,
--            AudioPacket::Samples(_) => unimplemented!(),
-+        let buffer = match packet {
-+            AudioPacket::Samples(_) => unreachable!(),
-+            AudioPacket::Raw(ogg) => gst::Buffer::from_slice(ogg),
-         };
--        let buffer = gst::Buffer::from_slice(oggdata);
- 
-         // ignore if sending fails as that means the source element is being shutdown
-         let _ = self.sender.send(Message::Buffer(buffer));
-@@ -360,7 +359,7 @@ impl URIHandlerImpl for SpotifyAudioSrc {
-         // allow to configure auth and cache settings from the URI
-         for (key, value) in url.query_pairs() {
-             match key.as_ref() {
--                "username" | "password" | "cache-credentials" | "cache-files" => {
-+                "access-token" | "cache-credentials" | "cache-files" => {
-                     self.obj().set_property(&key, value.as_ref());
-                 }
-                 _ => {
-@@ -435,10 +434,10 @@ impl SpotifyAudioSrc {
-         let (sender, receiver) = mpsc::sync_channel(2);
-         let sender_clone = sender.clone();
- 
--        let (mut player, mut player_event_channel) =
--            Player::new(player_config, session, Box::new(NoOpVolume), || {
--                Box::new(BufferSink { sender })
--            });
-+        let player = Player::new(player_config, session, Box::new(NoOpVolume), || {
-+            Box::new(BufferSink { sender })
-+        });
-+        let mut player_event_channel = player.get_player_event_channel();
- 
-         player.load(track, true, 0);
- 
-diff --git a/docs/plugins/gst_plugins_cache.json b/docs/plugins/gst_plugins_cache.json
-index 4e2a1361..73aba5b9 100644
---- a/docs/plugins/gst_plugins_cache.json
-+++ b/docs/plugins/gst_plugins_cache.json
-@@ -11472,6 +11472,18 @@
-                     }
-                 },
-                 "properties": {
-+                    "access-token": {
-+                        "blurb": "Spotify access token, requires 'streaming' scope",
-+                        "conditionally-available": false,
-+                        "construct": false,
-+                        "construct-only": false,
-+                        "controllable": false,
-+                        "default": "",
-+                        "mutable": "ready",
-+                        "readable": true,
-+                        "type": "gchararray",
-+                        "writable": true
-+                    },
-                     "bitrate": {
-                         "blurb": "Spotify audio bitrate in kbit/s",
-                         "conditionally-available": false,
--- 
-2.48.1
-
diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index aff3768552fb..f8390aed9c40 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -265,12 +265,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    tests = {
-      # Applies patches.
-      # TODO: remove with 0.14
-      inherit mopidy;
-    };
-
     updateScript = nix-update-script {
       # use numbered releases rather than gstreamer-* releases
       # this matches upstream's recommendation: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/470#note_2202772

From 607afb7655bcea3bb5ee4bf8a7b9ca77ef214719 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 23 Aug 2025 20:36:13 -0400
Subject: [PATCH 3187/3724] python313Packages.docling-core: 2.44.2 -> 2.45.0

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

diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix
index 017638c9d268..452600a2bc06 100644
--- a/pkgs/development/python-modules/docling-core/default.nix
+++ b/pkgs/development/python-modules/docling-core/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "docling-core";
-  version = "2.44.2";
+  version = "2.45.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling-core";
     tag = "v${version}";
-    hash = "sha256-CLPJYt3P6DUt0lQQOQ54vXPJcoi3Kyq7eZ6OwjGkmGk=";
+    hash = "sha256-9gTGC5jATmiYNrYXWb3KCBvaa/7H5ienUSQ+wBefwdQ=";
   };
 
   build-system = [

From 2d2dea1980dd3da656ab516137246831af476c8b Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 23 Aug 2025 20:37:30 -0400
Subject: [PATCH 3188/3724] python313Packages.docling-parse: 4.1.0 -> 4.2.3

---
 .../python-modules/docling-parse/default.nix  | 22 +++++++++----------
 .../docling-parse/test_parse.patch            | 20 -----------------
 2 files changed, 10 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/development/python-modules/docling-parse/test_parse.patch

diff --git a/pkgs/development/python-modules/docling-parse/default.nix b/pkgs/development/python-modules/docling-parse/default.nix
index 990083f9d54d..0b78e4272e7d 100644
--- a/pkgs/development/python-modules/docling-parse/default.nix
+++ b/pkgs/development/python-modules/docling-parse/default.nix
@@ -5,7 +5,7 @@
   cmake,
   pkg-config,
   cxxopts,
-  poetry-core,
+  setuptools,
   pybind11,
   zlib,
   nlohmann_json,
@@ -23,24 +23,16 @@
 
 buildPythonPackage rec {
   pname = "docling-parse";
-  version = "4.1.0";
+  version = "4.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling-parse";
     tag = "v${version}";
-    hash = "sha256-1vl5Ij25NXAwhoXLJ35lcr5r479jrdKd9DxWhYbCApw=";
+    hash = "sha256-0X9fP2PiHjZs+RT+VngHvNt4U0zpXq09BnaO/5tpfY8=";
   };
 
-  patches = [
-    # Fixes test_parse unit tests
-    # export_to_textlines in docling-core >= 2.38.2 includes text direction
-    # by default, which is not included in upstream's groundtruth data.
-    # TODO: remove when docling-core version gets bumped in upstream's uv.lock
-    ./test_parse.patch
-  ];
-
   dontUseCmakeConfigure = true;
 
   nativeBuildInputs = [
@@ -49,7 +41,7 @@ buildPythonPackage rec {
   ];
 
   build-system = [
-    poetry-core
+    setuptools
   ];
 
   env.NIX_CFLAGS_COMPILE = "-I${lib.getDev utf8cpp}/include/utf8cpp";
@@ -83,6 +75,12 @@ buildPythonPackage rec {
     "pillow"
   ];
 
+  # Listed as runtime dependencies but only used in CI to build wheels
+  preBuild = ''
+    sed -i '/cibuildwheel/d' pyproject.toml
+    sed -i '/delocate/d' pyproject.toml
+  '';
+
   pythonImportsCheck = [
     "docling_parse"
   ];
diff --git a/pkgs/development/python-modules/docling-parse/test_parse.patch b/pkgs/development/python-modules/docling-parse/test_parse.patch
deleted file mode 100644
index f58c78dcad0b..000000000000
--- a/pkgs/development/python-modules/docling-parse/test_parse.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/tests/test_parse.py b/tests/test_parse.py
-index 84e17ae..e1eb6ae 100644
---- a/tests/test_parse.py
-+++ b/tests/test_parse.py
-@@ -242,6 +242,7 @@ def test_reference_documents_from_filenames():
-                         cell_unit=unit,
-                         add_fontkey=True,
-                         add_fontname=False,
-+                        add_text_direction=False,
-                     )
-                     _fname = fname + f".{unit}.txt"
-                     with open(_fname, "w") as fw:
-@@ -254,6 +255,7 @@ def test_reference_documents_from_filenames():
-                         cell_unit=unit,
-                         add_fontkey=True,
-                         add_fontname=False,
-+                        add_text_direction=False,
-                     )
- 
-                     _fname = fname + f".{unit}.txt"

From a120ad68aad1d8c9a0fad127c25fbda66ee2f1b0 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 23 Aug 2025 20:37:47 -0400
Subject: [PATCH 3189/3724] python313Packages.docling: 2.43.0 -> 2.47.1

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

diff --git a/pkgs/development/python-modules/docling/default.nix b/pkgs/development/python-modules/docling/default.nix
index 54731e8bcb56..2392c0754e34 100644
--- a/pkgs/development/python-modules/docling/default.nix
+++ b/pkgs/development/python-modules/docling/default.nix
@@ -52,14 +52,14 @@
 
 buildPythonPackage rec {
   pname = "docling";
-  version = "2.43.0";
+  version = "2.47.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling";
     tag = "v${version}";
-    hash = "sha256-fMLED97DhfHp74GVDtdPXrJvfpKw6bOvQAaGTWZrPyE=";
+    hash = "sha256-U82hGvWXkKwZ4um0VevVoYiIfzswu5hLDYvxtqJqmHU=";
   };
 
   build-system = [
@@ -101,6 +101,8 @@ buildPythonPackage rec {
   ];
 
   pythonRelaxDeps = [
+    "lxml"
+    "pypdfium2"
     "pillow"
   ];
 

From 6e17d1560a09a8a13d9a4c21212cf82b7773dadd Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sun, 24 Aug 2025 13:44:29 -0400
Subject: [PATCH 3190/3724] python313Packes.docling: disable tests that access
 network

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

diff --git a/pkgs/development/python-modules/docling/default.nix b/pkgs/development/python-modules/docling/default.nix
index 2392c0754e34..aa0d05259557 100644
--- a/pkgs/development/python-modules/docling/default.nix
+++ b/pkgs/development/python-modules/docling/default.nix
@@ -169,6 +169,8 @@ buildPythonPackage rec {
     "test_confidence"
     "test_e2e_webp_conversions"
     "test_asr_pipeline_conversion"
+    "test_threaded_pipeline"
+    "test_pipeline_comparison"
 
     # AssertionError: pred_itxt==true_itxt
     "test_e2e_valid_csv_conversions"

From 7858cb0472cdd47fedfdfbc37de0c3e3d83256df Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Sun, 24 Aug 2025 12:00:10 -0600
Subject: [PATCH 3191/3724] amazon-q-cli: 1.13.3 -> 1.14.1

---
 pkgs/by-name/am/amazon-q-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index f6ea3094f629..e861befe2f92 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -7,20 +7,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "amazon-q-cli";
-  version = "1.13.3";
+  version = "1.14.1";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1y7mQjZurT+JCh8Nl/nbfwMlyYKFmfc8Kwp46Dt9Lz4=";
+    hash = "sha256-RZUe08hPcfPuovfDqndytjz+OVwd3SGvAhWp5XMm+jU=";
   };
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
   ];
 
-  cargoHash = "sha256-qepnwdkh0g/C40l8JMWVRRheSKbLWeu4AC+ib/DwfKE=";
+  cargoHash = "sha256-qcuxJf038260hr/1Mi5hgWC4Nwmj2xkt4XFkdfgs4QQ=";
 
   cargoBuildFlags = [
     "-p"

From 36b4528952059d7df1a1ee1663cd8ce3b1e820f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 20:12:57 +0000
Subject: [PATCH 3192/3724] linuxPackages.xone: 0.4.1 -> 0.4.3

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

diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix
index eaab145f9845..cb89449424c7 100644
--- a/pkgs/os-specific/linux/xone/default.nix
+++ b/pkgs/os-specific/linux/xone/default.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xone";
-  version = "0.4.1";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "dlundqvist";
     repo = "xone";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-myiKYXJ4Qisz6uJYO75xs/lGj7A/Ft+6frky9lBuWzc=";
+    hash = "sha256-ab/OlVezruvccKzcM4Ews6ydAJ8r64XfkPlFYpUycLQ=";
   };
 
   setSourceRoot = ''

From c3a29b5c1d79dbe0ed6b3069dbe7a82a3aa8e8ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 24 Aug 2025 11:05:38 -0700
Subject: [PATCH 3193/3724] imagemagick: 7.1.2-1 -> 7.1.2-2

Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.2-1...7.1.2-2

Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
---
 pkgs/applications/graphics/ImageMagick/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index f282ed41ee5a..5eb50ac2ef42 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -85,13 +85,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "7.1.2-1";
+  version = "7.1.2-2";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     tag = finalAttrs.version;
-    hash = "sha256-SHzDSknIHz8/CHV0Lnlr8YtOhs67MPMXiVHfv50gfwY=";
+    hash = "sha256-bQzHZGTr3dl8G7cMSjC5Is+H/7pnRtqgp/rvYZeJDu0=";
   };
 
   outputs = [

From 961847a69f21dda52975f496ffb66fdee2e2bf85 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Sun, 24 Aug 2025 00:15:33 +0200
Subject: [PATCH 3194/3724] victorialogs: 1.26.0 -> 1.29.0

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

diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix
index 65f560443603..1743f4554197 100644
--- a/pkgs/by-name/vi/victorialogs/package.nix
+++ b/pkgs/by-name/vi/victorialogs/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaLogs";
-  version = "1.26.0";
+  version = "1.29.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaLogs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PnXpu2Dna5grozKOGRHi/Gic7djszYh7wJ96EiEYP8U=";
+    hash = "sha256-IKKVCVsHFijSnLawy9oq1qCji2O4+QkSWUvQ4S6tAN8=";
   };
 
   vendorHash = null;
@@ -32,6 +32,15 @@ buildGoModule (finalAttrs: {
     ]
     ++ lib.optionals withVlAgent [ "app/vlagent" ];
 
+  postPatch = ''
+    # Allow older go versions
+    substituteInPlace go.mod \
+      --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}"
+
+    substituteInPlace vendor/modules.txt \
+      --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}"
+  '';
+
   ldflags = [
     "-s"
     "-w"

From 8d128a41380cd5a9759d8880cca3bdc2cdbdb42c Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 24 Aug 2025 19:40:04 +0200
Subject: [PATCH 3195/3724] testers.testEqualContents: add postFailureMessage
 parameter

Add an optional postFailureMessage parameter to testEqualContents that allows
users to provide additional context when tests fail. This is particularly useful
for providing instructions on how to update expected results when they change
intentionally.

The message is displayed after the standard failure output, helping maintainers
understand what to do next when a test fails.
---
 doc/build-helpers/testers.chapter.md        | 23 +++++++++++
 pkgs/build-support/testers/default.nix      | 12 +++++-
 pkgs/build-support/testers/test/default.nix | 46 ++++++++++++++-------
 3 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md
index 344f4dc75dfd..d4e33b04f3e9 100644
--- a/doc/build-helpers/testers.chapter.md
+++ b/doc/build-helpers/testers.chapter.md
@@ -405,6 +405,22 @@ The tester produces an empty output and only succeeds when the checks using `exp
 
 Check that two paths have the same contents.
 
+`assertion` (string)
+
+: A message that is printed before the comparison, after `Checking:`.
+
+`expected` (path or value coercible to store path)
+
+: The path to the expected [file system object] content
+
+`actual` (value coercible to store path) <!-- path value is possible, but wrong in practice, but let's not bother readers with our predictions -->
+
+: The path to the actual file system object content to check
+
+`postFailureMessage` (string)
+
+: A message that is printed last if the file system object contents at the two paths don't match exactly.
+
 :::{.example #ex-testEqualContents-toyexample}
 
 # Check that two paths have the same contents
@@ -427,6 +443,11 @@ testers.testEqualContents {
       ''
         sed -e 's/bar/baz/g' $base >$out
       '';
+  # if applicable
+  postFailureMessage = ''
+    The bar-baz replacer produced an unexpected result.
+    If the new behavior is acceptable and validated against the bar-baz specification, run ./adopt-new-bar-baz-result.sh to adjust this test and require the new behavior.
+  '';
 }
 ```
 
@@ -695,3 +716,5 @@ Notable attributes:
  * `nodes`: the evaluated NixOS configurations. Useful for debugging and exploring the configuration.
 
  * `driverInteractive`: a script that launches an interactive Python session in the context of the `testScript`.
+
+[file system object]: https://nix.dev/manual/nix/latest/store/file-system-object
diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix
index ca6731722ec1..9bd25940a194 100644
--- a/pkgs/build-support/testers/default.nix
+++ b/pkgs/build-support/testers/default.nix
@@ -56,10 +56,16 @@
       assertion,
       actual,
       expected,
+      postFailureMessage ? null,
     }:
     runCommand "equal-contents-${lib.strings.toLower assertion}"
       {
-        inherit assertion actual expected;
+        inherit
+          assertion
+          actual
+          expected
+          postFailureMessage
+          ;
         nativeBuildInputs = [ diffoscopeMinimal ];
       }
       ''
@@ -69,6 +75,10 @@
         then
           echo
           echo 'Contents must be equal, but were not!'
+          if [[ -n "''${postFailureMessage:-}" ]]; then
+            echo
+            echo "$postFailureMessage"
+          fi
           echo
           echo "+: expected,   at $expected"
           echo "-: unexpected, at $actual"
diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix
index 67e11da2383b..739f415d7670 100644
--- a/pkgs/build-support/testers/test/default.nix
+++ b/pkgs/build-support/testers/test/default.nix
@@ -270,22 +270,40 @@ lib.recurseIntoAttrs {
       '';
     };
 
-    fileMissing = testers.testBuildFailure (
-      testers.testEqualContents {
-        assertion = "Directories with different file list are not recognized as equal";
-        expected = runCommand "expected" { } ''
-          mkdir -p -- "$out/c"
-          echo a >"$out/a"
-          echo b >"$out/b"
-          echo d >"$out/c/d"
+    # - Test whether a missing file triggers a failure as expected
+    # - Test the postFailureMessage
+    fileMissing =
+      let
+        log = testers.testBuildFailure (
+          testers.testEqualContents {
+            assertion = "Directories with different file list are not recognized as equal";
+            expected = runCommand "expected" { } ''
+              mkdir -p -- "$out/c"
+              echo a >"$out/a"
+              echo b >"$out/b"
+              echo d >"$out/c/d"
+            '';
+            actual = runCommand "actual" { } ''
+              mkdir -p -- "$out/c"
+              echo a >"$out/a"
+              echo d >"$out/c/d"
+            '';
+            inherit postFailureMessage;
+          }
+        );
+        postFailureMessage = ''
+          If after careful review, you find that the changes are acceptable, run `suchandsuch` to adopt the new behavior.
         '';
-        actual = runCommand "actual" { } ''
-          mkdir -p -- "$out/c"
-          echo a >"$out/a"
-          echo d >"$out/c/d"
+      in
+      runCommand "fileMissing-failure-and-log-check"
+        {
+          inherit log;
+          inherit postFailureMessage;
+        }
+        ''
+          grep -F "$postFailureMessage" "$log/testBuildFailure.log"
+          touch $out
         '';
-      }
-    );
 
     equalExe = testers.testEqualContents {
       assertion = "The same executable file contents at different paths are recognized as equal";

From 2c25cb0891d23f052baac7db22004ec39e683921 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 18:11:21 +0200
Subject: [PATCH 3196/3724] workflows/{merge-group,pr}: post "no PR failures"
 status manually

Posting the status manually allows us to avoid the strange "skipped ==
success" logic and properly skip the `unlock` job for pull_request
events in the next commit.

This should be much easier to understand than the previous logic.
---
 .github/workflows/merge-group.yml | 30 ++++++++++++++++++---------
 .github/workflows/pr.yml          | 34 ++++++++++++++++++-------------
 .github/workflows/test.yml        |  7 +++++--
 3 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml
index dac02065debf..e7404d5a6975 100644
--- a/.github/workflows/merge-group.yml
+++ b/.github/workflows/merge-group.yml
@@ -26,19 +26,29 @@ jobs:
       mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }}
       targetSha: ${{ inputs.targetSha || github.event.merge_group.base_sha }}
 
-  # This job's only purpose is to serve as a target for the "Required Status Checks" branch ruleset.
+  # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset.
   # It "needs" all the jobs that should block the Merge Queue.
-  # If they pass, it is skipped — which counts as "success" for purposes of the branch ruleset.
-  # However, if any of them fail, this job will also fail — thus blocking the branch ruleset.
-  no-pr-failures:
+  unlock:
     # Modify this list to add or remove jobs from required status checks.
     needs:
       - lint
-    # WARNING:
-    # Do NOT change the name of this job, otherwise the rule will not catch it anymore.
-    # This would prevent all PRs from passing the merge queue.
-    name: no PR failures
-    if: ${{ failure() }}
     runs-on: ubuntu-24.04-arm
+    permissions:
+      statuses: write
     steps:
-      - run: exit 1
+      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            const { serverUrl, repo, runId, payload } = context
+            const target_url =
+              `${serverUrl}/${repo.owner}/${repo.repo}/actions/runs/${runId}`
+            await github.rest.repos.createCommitStatus({
+              ...repo,
+              sha: payload.merge_group.head_sha,
+              // WARNING:
+              // Do NOT change the name of this, otherwise the rule will not catch it anymore.
+              // This would prevent all PRs from merging.
+              context: 'no PR failures',
+              state: 'success',
+              target_url,
+            })
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index a7720df7226a..b280e7c4dd35 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -119,26 +119,32 @@ jobs:
       baseBranch: ${{ needs.prepare.outputs.baseBranch }}
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
 
-  # This job's only purpose is to serve as a target for the "Required Status Checks" branch ruleset.
+  # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset.
   # It "needs" all the jobs that should block merging a PR.
-  # If they pass, it is skipped — which counts as "success" for purposes of the branch ruleset.
-  # However, if any of them fail, this job will also fail — thus blocking the branch ruleset.
-  no-pr-failures:
+  unlock:
     # Modify this list to add or remove jobs from required status checks.
     needs:
       - check
       - lint
       - eval
       - build
-    # WARNING:
-    # Do NOT change the name of this job, otherwise the rule will not catch it anymore.
-    # This would prevent all PRs from merging.
-    name: no PR failures
-    # A single job is "cancelled" when it hits its timeout. This is not the same
-    # as "skipped", which happens when the `if` condition doesn't apply.
-    # The "cancelled()" function only checks the whole workflow, but not individual
-    # jobs.
-    if: ${{ failure() || contains(needs.*.result, 'cancelled') }}
     runs-on: ubuntu-24.04-arm
+    permissions:
+      statuses: write
     steps:
-      - run: exit 1
+      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            const { serverUrl, repo, runId, payload } = context
+            const target_url =
+              `${serverUrl}/${repo.owner}/${repo.repo}/actions/runs/${runId}?pr=${payload.pull_request.number}`
+            await github.rest.repos.createCommitStatus({
+              ...repo,
+              sha: payload.pull_request.head.sha,
+              // WARNING:
+              // Do NOT change the name of this, otherwise the rule will not catch it anymore.
+              // This would prevent all PRs from merging.
+              context: 'no PR failures',
+              state: 'success',
+              target_url,
+            })
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f26c371a5563..b3c2c6c59863 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -76,6 +76,9 @@ jobs:
     name: Merge Group
     needs: [prepare]
     uses: ./.github/workflows/merge-group.yml
+    # Those are actually only used on the merge_group event, but will throw an error if not set.
+    permissions:
+      statuses: write
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
@@ -87,7 +90,7 @@ jobs:
     name: PR
     needs: [prepare]
     uses: ./.github/workflows/pr.yml
-    # Those are not actually used on pull_request, but will throw an error if not set.
+    # Those are actually only used on the pull_request_target event, but will throw an error if not set.
     permissions:
       issues: write
       pull-requests: write
@@ -102,7 +105,7 @@ jobs:
     name: Push
     needs: [prepare]
     uses: ./.github/workflows/push.yml
-    # Those are not actually used on push, but will throw an error if not set.
+    # Those are not actually used on the push or pull_request events, but will throw an error if not set.
     permissions:
       statuses: write
     secrets:

From 5ff32763b23369e3e1c06d3728e71a7bace4e0e3 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 18:14:07 +0200
Subject: [PATCH 3197/3724] workflows/{merge-group,pr}: avoid posting "no PR
 failures" for pull_request trigger

The required status checks should depend on exactly one workflow,
triggered via pull_request_target or merge_group. Anything that is
triggered by pull_request is for testing purposes of the workflows
themselves only.
---
 .github/workflows/merge-group.yml | 1 +
 .github/workflows/pr.yml          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml
index e7404d5a6975..9af5cf0ebb71 100644
--- a/.github/workflows/merge-group.yml
+++ b/.github/workflows/merge-group.yml
@@ -29,6 +29,7 @@ jobs:
   # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset.
   # It "needs" all the jobs that should block the Merge Queue.
   unlock:
+    if: github.event_name != 'pull_request'
     # Modify this list to add or remove jobs from required status checks.
     needs:
       - lint
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index b280e7c4dd35..936a9173e7c4 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -122,6 +122,7 @@ jobs:
   # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset.
   # It "needs" all the jobs that should block merging a PR.
   unlock:
+    if: github.event_name != 'pull_request'
     # Modify this list to add or remove jobs from required status checks.
     needs:
       - check

From 956d0a744d2fa17a392bb04b2a25d10aef642813 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 22 Aug 2025 18:44:19 +0200
Subject: [PATCH 3198/3724] workflows/check: allow owners to fail when
 ci/OWNERS is untouched

The owners check is not reproducible, because it depends on the state of
the NixOS org on GitHub. Owners can rename their accounts or they can
leave the organisation and access to Nixpkgs can be removed from teams.
All of this breaks the owners check for reasons unrelated to the PR at
hand.

This PR makes the check for the owners file conditionally required: Only
when the ci/OWNERS file is actually modified a failed check will block
merging the PR. When that's not the case, the check will still fail
visibily in the checklist, but the failure can be ignored.

This is especially relevant for the Merge Queue, which should not be
entirely blocked whenever any of these events happen.

Also, it allows passing the checks in a fork when testing, where the
owners check will *always* fail, because the respective teams and
members are never part of the "user org" that a fork is.
---
 .github/workflows/check.yml | 4 ++++
 .github/workflows/pr.yml    | 1 +
 ci/github-script/prepare.js | 6 ++++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index ded8bad536c4..9192264266a1 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -12,6 +12,9 @@ on:
       mergedSha:
         required: true
         type: string
+      ownersCanFail:
+        required: true
+        type: boolean
       targetSha:
         required: true
         type: string
@@ -94,6 +97,7 @@ jobs:
   # handling untrusted PR input.
   owners:
     runs-on: ubuntu-24.04-arm
+    continue-on-error: ${{ inputs.ownersCanFail }}
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 936a9173e7c4..81f0f1d0f507 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -61,6 +61,7 @@ jobs:
       headBranch: ${{ needs.prepare.outputs.headBranch }}
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
       targetSha: ${{ needs.prepare.outputs.targetSha }}
+      ownersCanFail: ${{ !contains(fromJSON(needs.prepare.outputs.touched), 'owners') }}
 
   lint:
     name: Lint
diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js
index fb000cb6820a..0fcec880f376 100644
--- a/ci/github-script/prepare.js
+++ b/ci/github-script/prepare.js
@@ -76,8 +76,10 @@ module.exports = async ({ github, context, core }) => {
       })
     ).map((file) => file.filename)
 
-    if (files.includes('ci/pinned.json')) core.setOutput('touched', ['pinned'])
-    else core.setOutput('touched', [])
+    const touched = []
+    if (files.includes('ci/pinned.json')) touched.push('pinned')
+    if (files.includes('ci/OWNERS')) touched.push('owners')
+    core.setOutput('touched', touched)
 
     return
   }

From e4cbe6247099d98a912e570df36ea1223bbdb315 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 24 Aug 2025 11:22:19 -0700
Subject: [PATCH 3199/3724] vintagestory: 1.20.12 -> 1.21.0-rc.7

---
 pkgs/by-name/vi/vintagestory/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 928734a145f9..84fab6ea8e74 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -16,16 +16,16 @@
   libglvnd,
   pipewire,
   libpulseaudio,
-  dotnet-runtime_7,
+  dotnet-runtime_8,
 }:
 
 stdenv.mkDerivation rec {
   pname = "vintagestory";
-  version = "1.20.12";
+  version = "1.21.0-rc.7";
 
   src = fetchurl {
-    url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
-    hash = "sha256-h6YXEZoVVV9IuKkgtK9Z3NTvJogVNHmXdAcKxwfvqcE=";
+    url = "https://cdn.vintagestory.at/gamefiles/unstable/vs_client_linux-x64_${version}.tar.gz";
+    hash = "sha256-uoQjsSzQQ/4JjhPCDp3VWV0NCQsM5lca7VKB8OnKtYA=";
   };
 
   nativeBuildInputs = [
@@ -76,12 +76,12 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory \
+    makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory \
       --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
       --set-default mesa_glthread true \
       --add-flags $out/share/vintagestory/Vintagestory.dll
 
-    makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory-server \
+    makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory-server \
       --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
       --set-default mesa_glthread true \
       --add-flags $out/share/vintagestory/VintagestoryServer.dll

From 8416afc141769df88bc3de92a875e333c4cdd030 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 18:23:59 +0000
Subject: [PATCH 3200/3724] snx-rs: 4.5.0 -> 4.6.0

---
 pkgs/by-name/sn/snx-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix
index f4da1773fcc4..aa7086957869 100644
--- a/pkgs/by-name/sn/snx-rs/package.nix
+++ b/pkgs/by-name/sn/snx-rs/package.nix
@@ -14,13 +14,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "snx-rs";
-  version = "4.5.0";
+  version = "4.6.0";
 
   src = fetchFromGitHub {
     owner = "ancwrd1";
     repo = "snx-rs";
     tag = "v${version}";
-    hash = "sha256-24zklkFczsp7fhvka3T3Nz3bL61Owyrs8eHt7F9CQM8=";
+    hash = "sha256-KfN4lyBngatjk1e3DYabz+sruX/NjELg0psktMb8Pew=";
   };
 
   passthru.updateScript = nix-update-script { };
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
     versionCheckHook
   ];
 
-  cargoHash = "sha256-uDQzUl1q6mlDzs5D3b1/Q53Sz//BFeJZrE88HfMrXIk=";
+  cargoHash = "sha256-QMfQqy9VV3GF4ZWmzeWe+xGHYcvAxJUFg3QSCEMgS9E=";
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/snx-rs";

From 4afbcac6c81369f11eaf0ef9e43547c0284966f9 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Aug 2025 19:21:17 +0100
Subject: [PATCH 3201/3724] protoc-gen-js: 3.21.2 -> 3.21.4

---
 pkgs/by-name/pr/protoc-gen-js/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-js/package.nix b/pkgs/by-name/pr/protoc-gen-js/package.nix
index a3754ce78e46..2dc507f78eab 100644
--- a/pkgs/by-name/pr/protoc-gen-js/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-js/package.nix
@@ -2,23 +2,23 @@
   stdenv,
   lib,
   buildBazelPackage,
-  bazel_6,
+  bazel_7,
   fetchFromGitHub,
   cctools,
 }:
 
 buildBazelPackage rec {
   pname = "protoc-gen-js";
-  version = "3.21.2";
+  version = "3.21.4";
 
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "protobuf-javascript";
     rev = "v${version}";
-    hash = "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=";
+    hash = "sha256-eIOtVRnHv2oz4xuVc4aL6JmhpvlODQjXHt1eJHsjnLg=";
   };
 
-  bazel = bazel_6;
+  bazel = bazel_7;
   bazelTargets = [ "generator:protoc-gen-js" ];
   bazelBuildFlags = lib.optionals stdenv.cc.isClang [
     "--cxxopt=-x"
@@ -31,7 +31,13 @@ buildBazelPackage rec {
 
   LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool";
 
-  fetchAttrs.hash = "sha256-WOBlZ0XNrl5UxIaSDxZeOfzS2a8ZkrKdTLKHBDC9UNQ=";
+  fetchAttrs = {
+    preInstall = ''
+      rm -rv "$bazelOut/external/host_platform"
+    '';
+
+    hash = "sha256-CekpXINZSr6Hysa4qrVkdchBla9pgBwRtqBiuUGPNq0=";
+  };
 
   buildAttrs.installPhase = ''
     mkdir -p $out/bin

From c2374fd15ed1198e71e579d2e5fba5960b5de7ac Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Aug 2025 18:35:30 +0100
Subject: [PATCH 3202/3724] bazel: bazel_6 -> bazel_7

---
 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 01ca7d904597..99557af93b45 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6587,7 +6587,7 @@ with pkgs;
 
   bandit = with python3Packages; toPythonApplication bandit;
 
-  bazel = bazel_6;
+  bazel = bazel_7;
 
   bazel_6 = callPackage ../development/tools/build-managers/bazel/bazel_6 {
     inherit (darwin) sigtool;

From 95cfbc3383cc7b7680fc4c5c74ea8e0ffdaf5d42 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Aug 2025 18:35:30 +0100
Subject: [PATCH 3203/3724] bazel_6: drop

---
 .../python-modules/jaxlib/default.nix         |    9 +-
 .../tensorflow-probability/default.nix        |    8 +-
 .../bazel/bazel_6/actions_path.patch          |   41 -
 .../bazel/bazel_6/darwin_sleep.patch          |   56 -
 .../build-managers/bazel/bazel_6/default.nix  |  855 -------
 .../bazel/bazel_6/java_toolchain.patch        |   33 -
 .../bazel/bazel_6/nix-hacks.patch             |   40 -
 .../build-managers/bazel/bazel_6/no-arc.patch |   42 -
 .../bazel/bazel_6/src-deps.json               | 2269 -----------------
 .../bazel/bazel_6/strict_proto_deps.patch     |   21 -
 .../bazel/bazel_6/upb-clang16.patch           |   30 -
 .../bazel/bazel_6/update-srcDeps.py           |   54 -
 pkgs/top-level/aliases.nix                    |    1 +
 pkgs/top-level/all-packages.nix               |    8 -
 14 files changed, 14 insertions(+), 3453 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_6/actions_path.patch
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_6/darwin_sleep.patch
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_6/java_toolchain.patch
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_6/nix-hacks.patch
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_6/no-arc.patch
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_6/strict_proto_deps.patch
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_6/upb-clang16.patch
 delete mode 100755 pkgs/development/tools/build-managers/bazel/bazel_6/update-srcDeps.py

diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix
index bb675972525a..429dce1b4594 100644
--- a/pkgs/development/python-modules/jaxlib/default.nix
+++ b/pkgs/development/python-modules/jaxlib/default.nix
@@ -6,7 +6,8 @@
   # Build-time dependencies:
   addDriverRunpath,
   autoAddDriverRunpath,
-  bazel_6,
+  #bazel_6,
+  bazel,
   binutils,
   buildBazelPackage,
   buildPythonPackage,
@@ -77,6 +78,9 @@ let
     # however even with that fix applied, it doesn't work for everyone:
     # https://github.com/NixOS/nixpkgs/pull/184395#issuecomment-1207287129
     platforms = platforms.linux;
+
+    # Needs update for Bazel 7.
+    broken = true;
   };
 
   # Bazel wants a merged cudnn at configuration time
@@ -221,7 +225,8 @@ let
     name = "bazel-build-${pname}-${version}";
 
     # See https://github.com/google/jax/blob/main/.bazelversion for the latest.
-    bazel = bazel_6;
+    #bazel = bazel_6;
+    bazel = bazel;
 
     src = fetchFromGitHub {
       owner = "google";
diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix
index 862520463b30..06989acddfe6 100644
--- a/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/pkgs/development/python-modules/tensorflow-probability/default.nix
@@ -12,7 +12,8 @@
   wheel,
   absl-py,
 
-  bazel_6,
+  #bazel_6,
+  bazel,
   cctools,
 
   # python package
@@ -60,7 +61,8 @@ let
       wheel
     ];
 
-    bazel = bazel_6;
+    #bazel = bazel_6;
+    bazel = bazel;
 
     bazelTargets = [ ":pip_pkg" ];
     LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool";
@@ -131,5 +133,7 @@ buildPythonPackage {
     changelog = "https://github.com/tensorflow/probability/releases/tag/v${version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ GaetanLepage ];
+    # Needs update for Bazel 7.
+    broken = true;
   };
 }
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/actions_path.patch b/pkgs/development/tools/build-managers/bazel/bazel_6/actions_path.patch
deleted file mode 100644
index 1fa1e5748333..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_6/actions_path.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java
-index 6fff2af..7e2877e 100644
---- a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java
-+++ b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java
-@@ -47,6 +47,16 @@ public final class PosixLocalEnvProvider implements LocalEnvProvider {
-       Map<String, String> env, BinTools binTools, String fallbackTmpDir) {
-     ImmutableMap.Builder<String, String> result = ImmutableMap.builder();
-     result.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR")));
-+
-+    // In case we are running on NixOS.
-+    // If bash is called with an unset PATH on this platform,
-+    // it will set it to /no-such-path and default tools will be missings.
-+    // See, https://github.com/NixOS/nixpkgs/issues/94222
-+    // So we ensure that minimal dependencies are present.
-+    if (!env.containsKey("PATH")){
-+        result.put("PATH", "@actionsPathPatch@");
-+    }
-+ 
-     String p = clientEnv.get("TMPDIR");
-     if (Strings.isNullOrEmpty(p)) {
-       // Do not use `fallbackTmpDir`, use `/tmp` instead. This way if the user didn't export TMPDIR
-index 95642767c6..39d3c62461 100644
---- a/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java
-+++ b/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java
-@@ -74,6 +74,16 @@ public final class XcodeLocalEnvProvider implements LocalEnvProvider {
-
-     ImmutableMap.Builder<String, String> newEnvBuilder = ImmutableMap.builder();
-     newEnvBuilder.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR")));
-+
-+    // In case we are running on NixOS.
-+    // If bash is called with an unset PATH on this platform,
-+    // it will set it to /no-such-path and default tools will be missings.
-+    // See, https://github.com/NixOS/nixpkgs/issues/94222
-+    // So we ensure that minimal dependencies are present.
-+    if (!env.containsKey("PATH")){
-+      newEnvBuilder.put("PATH", "@actionsPathPatch@");
-+    }
-+
-     String p = clientEnv.get("TMPDIR");
-     if (Strings.isNullOrEmpty(p)) {
-       // Do not use `fallbackTmpDir`, use `/tmp` instead. This way if the user didn't export TMPDIR
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/darwin_sleep.patch b/pkgs/development/tools/build-managers/bazel/bazel_6/darwin_sleep.patch
deleted file mode 100644
index 731ede89388a..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_6/darwin_sleep.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/src/main/native/darwin/sleep_prevention_jni.cc b/src/main/native/darwin/sleep_prevention_jni.cc
-index 67c35b201e..e50a58320e 100644
---- a/src/main/native/darwin/sleep_prevention_jni.cc
-+++ b/src/main/native/darwin/sleep_prevention_jni.cc
-@@ -33,31 +33,13 @@ static int g_sleep_state_stack = 0;
- static IOPMAssertionID g_sleep_state_assertion = kIOPMNullAssertionID;
- 
- int portable_push_disable_sleep() {
--  std::lock_guard<std::mutex> lock(g_sleep_state_mutex);
--  BAZEL_CHECK_GE(g_sleep_state_stack, 0);
--  if (g_sleep_state_stack == 0) {
--    BAZEL_CHECK_EQ(g_sleep_state_assertion, kIOPMNullAssertionID);
--    CFStringRef reasonForActivity = CFSTR("build.bazel");
--    IOReturn success = IOPMAssertionCreateWithName(
--        kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, reasonForActivity,
--        &g_sleep_state_assertion);
--    BAZEL_CHECK_EQ(success, kIOReturnSuccess);
--  }
--  g_sleep_state_stack += 1;
--  return 0;
-+  // Unreliable, disable for now
-+  return -1;
- }
- 
- int portable_pop_disable_sleep() {
--  std::lock_guard<std::mutex> lock(g_sleep_state_mutex);
--  BAZEL_CHECK_GT(g_sleep_state_stack, 0);
--  g_sleep_state_stack -= 1;
--  if (g_sleep_state_stack == 0) {
--    BAZEL_CHECK_NE(g_sleep_state_assertion, kIOPMNullAssertionID);
--    IOReturn success = IOPMAssertionRelease(g_sleep_state_assertion);
--    BAZEL_CHECK_EQ(success, kIOReturnSuccess);
--    g_sleep_state_assertion = kIOPMNullAssertionID;
--  }
--  return 0;
-+  // Unreliable, disable for now
-+  return -1;
- }
- 
- }  // namespace blaze_jni
-diff --git a/src/main/native/darwin/system_suspension_monitor_jni.cc b/src/main/native/darwin/system_suspension_monitor_jni.cc
-index 3483aa7935..51782986ec 100644
---- a/src/main/native/darwin/system_suspension_monitor_jni.cc
-+++ b/src/main/native/darwin/system_suspension_monitor_jni.cc
-@@ -83,10 +83,7 @@ void portable_start_suspend_monitoring() {
-     // Register to receive system sleep notifications.
-     // Testing needs to be done manually. Use the logging to verify
-     // that sleeps are being caught here.
--    suspend_state.connect_port = IORegisterForSystemPower(
--        &suspend_state, &notifyPortRef, SleepCallBack, &notifierObject);
--    BAZEL_CHECK_NE(suspend_state.connect_port, MACH_PORT_NULL);
--    IONotificationPortSetDispatchQueue(notifyPortRef, queue);
-+    // XXX: Unreliable, disable for now
- 
-     // Register to deal with SIGCONT.
-     // We register for SIGCONT because we can't catch SIGSTOP.
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
deleted file mode 100644
index 009ecd25ed88..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
+++ /dev/null
@@ -1,855 +0,0 @@
-{
-  stdenv,
-  callPackage,
-  lib,
-  fetchurl,
-  fetchFromGitHub,
-  installShellFiles,
-  runCommand,
-  runCommandCC,
-  makeWrapper,
-  recurseIntoAttrs,
-  # this package (through the fixpoint glass)
-  bazel_self,
-  lr,
-  xe,
-  zip,
-  unzip,
-  bash,
-  coreutils,
-  which,
-  gawk,
-  gnused,
-  gnutar,
-  gnugrep,
-  gzip,
-  findutils,
-  diffutils,
-  gnupatch,
-  # updater
-  python3,
-  writeScript,
-  # Apple dependencies
-  cctools,
-  sigtool,
-  # Allow to independently override the jdks used to build and run respectively
-  buildJdk,
-  runJdk,
-  runtimeShell,
-  # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
-  # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
-  enableNixHacks ? false,
-  file,
-  replaceVars,
-  writeTextFile,
-  writeShellApplication,
-  makeBinaryWrapper,
-}:
-
-let
-  version = "6.5.0";
-  sourceRoot = ".";
-
-  src = fetchurl {
-    url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    hash = "sha256-/InakZQVKJ8p5P8YpeAScOzppv6Dy2CWchi6xKO7PtI=";
-  };
-
-  # Update with
-  # 1. export BAZEL_SELF=$(nix-build -A bazel_6)
-  # 2. update version and hash for sources above
-  # 3. `eval $(nix-build -A bazel_6.updater)`
-  # 4. add new dependencies from the dict in ./src-deps.json if required by failing build
-  srcDeps = lib.attrsets.attrValues srcDepsSet;
-  srcDepsSet =
-    let
-      srcs = lib.importJSON ./src-deps.json;
-      toFetchurl =
-        d:
-        lib.attrsets.nameValuePair d.name (fetchurl {
-          urls = d.urls or [ d.url ];
-          sha256 = d.sha256;
-        });
-    in
-    builtins.listToAttrs (
-      map toFetchurl [
-        srcs.desugar_jdk_libs
-        srcs.io_bazel_skydoc
-        srcs.bazel_skylib
-        srcs.bazelci_rules
-        srcs.io_bazel_rules_sass
-        srcs.platforms
-        srcs.remote_java_tools_for_testing
-        srcs."coverage_output_generator-v2.6.zip"
-        srcs.build_bazel_rules_nodejs
-        srcs.android_tools_for_testing
-        srcs.openjdk_linux_vanilla
-        srcs.bazel_toolchains
-        srcs.com_github_grpc_grpc
-        srcs.upb
-        srcs.com_google_protobuf
-        srcs.rules_pkg
-        srcs.rules_cc
-        srcs.rules_java
-        srcs.rules_proto
-        srcs.rules_nodejs
-        srcs.rules_license
-        srcs.com_google_absl
-        srcs.com_googlesource_code_re2
-        srcs.com_github_cares_cares
-        srcs.com_envoyproxy_protoc_gen_validate
-        srcs.com_google_googleapis
-        srcs.bazel_gazelle
-      ]
-    );
-
-  distDir = runCommand "bazel-deps" { } ''
-    mkdir -p $out
-    for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done
-  '';
-
-  defaultShellUtils =
-    # Keep this list conservative. For more exotic tools, prefer to use
-    # @rules_nixpkgs to pull in tools from the nix repository. Example:
-    #
-    # WORKSPACE:
-    #
-    #     nixpkgs_git_repository(
-    #         name = "nixpkgs",
-    #         revision = "def5124ec8367efdba95a99523dd06d918cb0ae8",
-    #     )
-    #
-    #     # This defines an external Bazel workspace.
-    #     nixpkgs_package(
-    #         name = "bison",
-    #         repositories = { "nixpkgs": "@nixpkgs//:default.nix" },
-    #     )
-    #
-    # some/BUILD.bazel:
-    #
-    #     genrule(
-    #        ...
-    #        cmd = "$(location @bison//:bin/bison) -other -args",
-    #        tools = [
-    #            ...
-    #            "@bison//:bin/bison",
-    #        ],
-    #     )
-    [
-      bash
-      coreutils
-      diffutils
-      file
-      findutils
-      gawk
-      gnugrep
-      gnupatch
-      gnused
-      gnutar
-      gzip
-      python3
-      unzip
-      which
-      zip
-    ];
-
-  defaultShellPath = lib.makeBinPath defaultShellUtils;
-
-  bashWithDefaultShellUtilsSh = writeShellApplication {
-    name = "bash";
-    runtimeInputs = defaultShellUtils;
-    text = ''
-      if [[ "$PATH" == "/no-such-path" ]]; then
-        export PATH=${defaultShellPath}
-      fi
-      exec ${bash}/bin/bash "$@"
-    '';
-  };
-
-  # Script-based interpreters in shebangs aren't guaranteed to work,
-  # especially on MacOS. So let's produce a binary
-  bashWithDefaultShellUtils = stdenv.mkDerivation {
-    name = "bash";
-    src = bashWithDefaultShellUtilsSh;
-    nativeBuildInputs = [ makeBinaryWrapper ];
-    buildPhase = ''
-      makeWrapper ${bashWithDefaultShellUtilsSh}/bin/bash $out/bin/bash
-    '';
-  };
-
-  platforms = lib.platforms.linux ++ lib.platforms.darwin;
-
-  system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";
-
-  # on aarch64 Darwin, `uname -m` returns "arm64"
-  arch = with stdenv.hostPlatform; if isDarwin && isAarch64 then "arm64" else parsed.cpu.name;
-
-  bazelRC = writeTextFile {
-    name = "bazel-rc";
-    text = ''
-      startup --server_javabase=${runJdk}
-
-      # Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054
-      # Most commands inherit from 'build' anyway.
-      build --distdir=${distDir}
-      fetch --distdir=${distDir}
-      query --distdir=${distDir}
-
-      build --extra_toolchains=@bazel_tools//tools/jdk:nonprebuilt_toolchain_definition
-      build --tool_java_runtime_version=local_jdk_11
-      build --java_runtime_version=local_jdk_11
-
-      # load default location for the system wide configuration
-      try-import /etc/bazel.bazelrc
-    '';
-  };
-
-in
-stdenv.mkDerivation rec {
-  pname = "bazel${lib.optionalString enableNixHacks "-hacks"}";
-  inherit version;
-
-  meta = with lib; {
-    homepage = "https://github.com/bazelbuild/bazel/";
-    description = "Build tool that builds code quickly and reliably";
-    sourceProvenance = with sourceTypes; [
-      fromSource
-      binaryBytecode # source bundles dependencies as jars
-    ];
-    license = licenses.asl20;
-    teams = [ lib.teams.bazel ];
-    mainProgram = "bazel";
-    inherit platforms;
-  };
-
-  inherit src;
-  inherit sourceRoot;
-  patches = [
-    # upb definition inside bazel sets its own copts that take precedence
-    # over flags we set externally, so need to patch them at the source
-    ./upb-clang16.patch
-
-    # Force usage of the _non_ prebuilt java toolchain.
-    # the prebuilt one does not work in nix world.
-    ./java_toolchain.patch
-
-    # Bazel integrates with apple IOKit to inhibit and track system sleep.
-    # Inside the darwin sandbox, these API calls are blocked, and bazel
-    # crashes. It seems possible to allow these APIs inside the sandbox, but it
-    # feels simpler to patch bazel not to use it at all. So our bazel is
-    # incapable of preventing system sleep, which is a small price to pay to
-    # guarantee that it will always run in any nix context.
-    #
-    # See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses
-    # NIX_BUILD_TOP env var to conditionally disable sleep features inside the
-    # sandbox.
-    #
-    # If you want to investigate the sandbox profile path,
-    # IORegisterForSystemPower can be allowed with
-    #
-    #     propagatedSandboxProfile = ''
-    #       (allow iokit-open (iokit-user-client-class "RootDomainUserClient"))
-    #     '';
-    #
-    # I do not know yet how to allow IOPMAssertion{CreateWithName,Release}
-    ./darwin_sleep.patch
-
-    # On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
-    # This is breaking the build of any C target. This patch removes the last
-    # argument if it's found to be an empty string.
-    ../trim-last-argument-to-gcc-if-empty.patch
-
-    # `java_proto_library` ignores `strict_proto_deps`
-    # https://github.com/bazelbuild/bazel/pull/16146
-    ./strict_proto_deps.patch
-
-    # On Darwin, using clang 6 to build fails because of a linker error (see #105573),
-    # but using clang 7 fails because libarclite_macosx.a cannot be found when linking
-    # the xcode_locator tool.
-    # This patch removes using the -fobjc-arc compiler option and makes the code
-    # compile without automatic reference counting. Caveat: this leaks memory, but
-    # we accept this fact because xcode_locator is only a short-lived process used during the build.
-    (replaceVars ./no-arc.patch {
-      multiBinPatch = if stdenv.hostPlatform.system == "aarch64-darwin" then "arm64" else "x86_64";
-    })
-
-    # --experimental_strict_action_env (which may one day become the default
-    # see bazelbuild/bazel#2574) hardcodes the default
-    # action environment to a non hermetic value (e.g. "/usr/local/bin").
-    # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries.
-    # So we are replacing this bazel paths by defaultShellPath,
-    # improving hermeticity and making it work in nixos.
-    (replaceVars ../strict_action_env.patch {
-      strictActionEnvPatch = defaultShellPath;
-    })
-
-    (replaceVars ./actions_path.patch {
-      actionsPathPatch = defaultShellPath;
-    })
-
-    # bazel reads its system bazelrc in /etc
-    # override this path to a builtin one
-    (replaceVars ../bazel_rc.patch {
-      bazelSystemBazelRCPath = bazelRC;
-    })
-  ]
-  ++ lib.optional enableNixHacks ./nix-hacks.patch;
-
-  # Additional tests that check bazel’s functionality. Execute
-  #
-  #     nix-build . -A bazel_6.tests
-  #
-  # in the nixpkgs checkout root to exercise them locally.
-  passthru.tests =
-    let
-      runLocal =
-        name: attrs: script:
-        let
-          attrs' = removeAttrs attrs [ "buildInputs" ];
-          buildInputs = attrs.buildInputs or [ ];
-        in
-        runCommandCC name (
-          {
-            inherit buildInputs;
-            preferLocalBuild = true;
-            meta.platforms = platforms;
-          }
-          // attrs'
-        ) script;
-
-      # bazel wants to extract itself into $install_dir/install every time it runs,
-      # so let’s do that only once.
-      extracted =
-        bazelPkg:
-        let
-          install_dir =
-            # `install_base` field printed by `bazel info`, minus the hash.
-            # yes, this path is kinda magic. Sorry.
-            "$HOME/.cache/bazel/_bazel_nixbld";
-        in
-        runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } ''
-          export HOME=$(mktemp -d)
-          touch WORKSPACE # yeah, everything sucks
-          install_base="$(${bazelPkg}/bin/bazel info | grep install_base)"
-          # assert it’s actually below install_dir
-          [[ "$install_base" =~ ${install_dir} ]] \
-            || (echo "oh no! $install_base but we are \
-          trying to copy ${install_dir} to $out instead!"; exit 1)
-          cp -R ${install_dir} $out
-        '';
-
-      bazelTest =
-        {
-          name,
-          bazelScript,
-          workspaceDir,
-          bazelPkg,
-          buildInputs ? [ ],
-        }:
-        let
-          be = extracted bazelPkg;
-        in
-        runLocal name
-          {
-            inherit buildInputs;
-            # Necessary for the tests to pass on Darwin with sandbox enabled.
-            __darwinAllowLocalNetworking = true;
-          }
-          (
-            # skip extraction caching on Darwin, because nobody knows how Darwin works
-            (lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-              # set up home with pre-unpacked bazel
-              export HOME=$(mktemp -d)
-              mkdir -p ${be.install_dir}
-              cp -R ${be}/install ${be.install_dir}
-
-              # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6
-              # Bazel checks whether the mtime of the install dir files
-              # is >9 years in the future, otherwise it extracts itself again.
-              # see PosixFileMTime::IsUntampered in src/main/cpp/util
-              # What the hell bazel.
-              ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {}
-            '')
-            + ''
-              # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609
-              # about why to create a subdir for the workspace.
-              cp -r ${workspaceDir} wd && chmod u+w wd && cd wd
-
-              ${bazelScript}
-
-              touch $out
-            ''
-          );
-
-      bazelWithNixHacks = bazel_self.override { enableNixHacks = true; };
-
-      bazel-examples = fetchFromGitHub {
-        owner = "bazelbuild";
-        repo = "examples";
-        rev = "4183fc709c26a00366665e2d60d70521dc0b405d";
-        sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k";
-      };
-
-    in
-    (lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
-      # `extracted` doesn’t work on darwin
-      shebang = callPackage ../shebang-test.nix {
-        inherit
-          runLocal
-          extracted
-          bazelTest
-          distDir
-          ;
-        bazel = bazel_self;
-      };
-    })
-    // {
-      bashTools = callPackage ../bash-tools-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazel_self;
-      };
-      cpp = callPackage ../cpp-test.nix {
-        inherit
-          runLocal
-          bazelTest
-          bazel-examples
-          distDir
-          ;
-        bazel = bazel_self;
-      };
-      java = callPackage ../java-test.nix {
-        inherit
-          runLocal
-          bazelTest
-          bazel-examples
-          distDir
-          ;
-        bazel = bazel_self;
-      };
-      protobuf = callPackage ../protobuf-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazel_self;
-      };
-      pythonBinPath = callPackage ../python-bin-path-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazel_self;
-      };
-
-      bashToolsWithNixHacks = callPackage ../bash-tools-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazelWithNixHacks;
-      };
-
-      cppWithNixHacks = callPackage ../cpp-test.nix {
-        inherit
-          runLocal
-          bazelTest
-          bazel-examples
-          distDir
-          ;
-        bazel = bazelWithNixHacks;
-      };
-      javaWithNixHacks = callPackage ../java-test.nix {
-        inherit
-          runLocal
-          bazelTest
-          bazel-examples
-          distDir
-          ;
-        bazel = bazelWithNixHacks;
-      };
-      protobufWithNixHacks = callPackage ../protobuf-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazelWithNixHacks;
-      };
-      pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix {
-        inherit runLocal bazelTest distDir;
-        bazel = bazelWithNixHacks;
-      };
-    };
-
-  src_for_updater = stdenv.mkDerivation {
-    name = "updater-sources";
-    inherit src;
-    nativeBuildInputs = [ unzip ];
-    inherit sourceRoot;
-    installPhase = ''
-      runHook preInstall
-
-      # prevent bazel version check failing in the updater
-      rm .bazelversion
-      cp -r . "$out"
-
-      runHook postInstall
-    '';
-  };
-  # update the list of workspace dependencies
-  passthru.updater = writeScript "update-bazel-deps.sh" ''
-    #!${runtimeShell}
-    (cd "${src_for_updater}" &&
-        BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
-        "$BAZEL_SELF"/bin/bazel \
-            query 'kind(http_archive, //external:*) + kind(http_file, //external:*) + kind(distdir_tar, //external:*) + kind(git_repository, //external:*)' \
-            --loading_phase_threads=1 \
-            --output build) \
-    | "${python3}"/bin/python3 "${./update-srcDeps.py}" \
-      "${builtins.toString ./src-deps.json}"
-  '';
-
-  # Necessary for the tests to pass on Darwin with sandbox enabled.
-  # Bazel starts a local server and needs to bind a local address.
-  __darwinAllowLocalNetworking = true;
-
-  postPatch =
-    let
-
-      darwinPatches = ''
-        bazelLinkFlags () {
-          eval set -- "$NIX_LDFLAGS"
-          local flag
-          for flag in "$@"; do
-            printf ' -Wl,%s' "$flag"
-          done
-        }
-
-        # Disable Bazel's Xcode toolchain detection which would configure compilers
-        # and linkers from Xcode instead of from PATH
-        export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
-
-        # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
-        export GCOV=${coreutils}/bin/false
-
-        # libcxx includes aren't added by libcxx hook
-        # https://github.com/NixOS/nixpkgs/pull/41589
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
-        # for CLang 16 compatibility in external/{absl,upb} dependencies
-        export NIX_CFLAGS_COMPILE+=" -Wno-deprecated-builtins -Wno-gnu-offsetof-extensions"
-
-        # don't use system installed Xcode to run clang, use Nix clang instead
-        sed -i -E \
-          -e "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
-          -e "s;/usr/bin/codesign;CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${sigtool}/bin/codesign;" \
-          -e "s;env -i codesign;env -i CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${sigtool}/bin/codesign;" \
-          scripts/bootstrap/compile.sh \
-          tools/osx/BUILD
-
-        substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' ""
-
-        # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead
-        sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc
-
-        # clang installed from Xcode has a compatibility wrapper that forwards
-        # invocations of gcc to clang, but vanilla clang doesn't
-        sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
-
-        sed -i -e 's;"/usr/bin/libtool";_find_generic(repository_ctx, "libtool", "LIBTOOL", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
-        wrappers=( tools/cpp/osx_cc_wrapper.sh.tpl )
-        for wrapper in "''${wrappers[@]}"; do
-          sed -i -e "s,/usr/bin/gcc,${stdenv.cc}/bin/clang,g" $wrapper
-          sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
-          sed -i -e "s,/usr/bin/xcrun install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
-        done
-      '';
-
-      genericPatches = ''
-        # md5sum is part of coreutils
-        sed -i 's|/sbin/md5|md5sum|g' \
-          src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh
-
-        # replace initial value of pythonShebang variable in BazelPythonSemantics.java
-        substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \
-          --replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\""
-
-        substituteInPlace src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/PyRuntimeInfoApi.java \
-          --replace '"#!/usr/bin/env python3"' "\"#!${python3}/bin/python\""
-
-        # substituteInPlace is rather slow, so prefilter the files with grep
-        grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
-          # If you add more replacements here, you must change the grep above!
-          # Only files containing /bin are taken into account.
-          substituteInPlace "$path" \
-            --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash \
-            --replace "/usr/bin/env bash" ${bashWithDefaultShellUtils}/bin/bash \
-            --replace "/usr/bin/env python" ${python3}/bin/python \
-            --replace /usr/bin/env ${coreutils}/bin/env \
-            --replace /bin/true ${coreutils}/bin/true
-        done
-
-        grep -rlZ /bin/ tools/python | while IFS="" read -r -d "" path; do
-          substituteInPlace "$path" \
-            --replace "/usr/bin/env python2" ${python3.interpreter} \
-            --replace "/usr/bin/env python3" ${python3}/bin/python \
-            --replace /usr/bin/env ${coreutils}/bin/env
-        done
-
-        # bazel test runner include references to /bin/bash
-        substituteInPlace tools/build_rules/test_rules.bzl \
-          --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash
-
-        for i in $(find tools/cpp/ -type f)
-        do
-          substituteInPlace $i \
-            --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash
-        done
-
-        # Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
-        substituteInPlace scripts/bootstrap/compile.sh \
-            --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash
-
-        # add nix environment vars to .bazelrc
-        cat >> .bazelrc <<EOF
-        # Limit the resources Bazel is allowed to use during the build to 1/2 the
-        # available RAM and 3/4 the available CPU cores. This should help avoid
-        # overwhelming the build machine.
-        build --toolchain_resolution_debug=".*"
-        build --local_ram_resources=HOST_RAM*.5
-        build --local_cpu_resources=HOST_CPUS*.75
-
-        build --distdir=${distDir}
-        fetch --distdir=${distDir}
-        build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')"
-        build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')"
-        build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')"
-        build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')"
-        build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')"
-        build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')"
-        build --extra_toolchains=@bazel_tools//tools/jdk:nonprebuilt_toolchain_definition
-        build --verbose_failures
-        build --curses=no
-        build --features=-layering_check
-        build --experimental_strict_java_deps=off
-        build --strict_proto_deps=off
-        EOF
-
-        cat >> third_party/grpc/bazel_1.41.0.patch <<EOF
-        diff --git a/third_party/grpc/BUILD b/third_party/grpc/BUILD
-        index 39ee9f97c6..9128d20c85 100644
-        --- a/third_party/grpc/BUILD
-        +++ b/third_party/grpc/BUILD
-        @@ -28,7 +28,6 @@ licenses(["notice"])
-         package(
-             default_visibility = ["//visibility:public"],
-             features = [
-        -        "layering_check",
-                 "-parse_headers",
-             ],
-         )
-        EOF
-
-        # add the same environment vars to compile.sh
-        sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \
-            -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \
-            -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \
-            -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \
-            -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \
-            -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \
-            -e "/\$command \\\\$/a --tool_java_runtime_version=local_jdk_11 \\\\" \
-            -e "/\$command \\\\$/a --java_runtime_version=local_jdk_11 \\\\" \
-            -e "/\$command \\\\$/a --verbose_failures \\\\" \
-            -e "/\$command \\\\$/a --curses=no \\\\" \
-            -e "/\$command \\\\$/a --features=-layering_check \\\\" \
-            -e "/\$command \\\\$/a --experimental_strict_java_deps=off \\\\" \
-            -e "/\$command \\\\$/a --strict_proto_deps=off \\\\" \
-            -i scripts/bootstrap/compile.sh
-
-        # This is necessary to avoid:
-        # "error: no visible @interface for 'NSDictionary' declares the selector
-        # 'initWithContentsOfURL:error:'"
-        # This can be removed when the apple_sdk is upgraded beyond 10.13+
-        sed -i '/initWithContentsOfURL:versionPlistUrl/ {
-          N
-          s/error:nil\];/\];/
-        }' tools/osx/xcode_locator.m
-
-        # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash
-        echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp
-        cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp
-        mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
-
-        patchShebangs .
-      '';
-    in
-    lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches + genericPatches;
-
-  buildInputs = [
-    buildJdk
-    bashWithDefaultShellUtils
-  ]
-  ++ defaultShellUtils;
-
-  # when a command can’t be found in a bazel build, you might also
-  # need to add it to `defaultShellPath`.
-  nativeBuildInputs = [
-    installShellFiles
-    makeWrapper
-    python3
-    unzip
-    which
-    zip
-    python3.pkgs.absl-py # Needed to build fish completion
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-    cctools
-    sigtool
-  ];
-
-  # Bazel makes extensive use of symlinks in the WORKSPACE.
-  # This causes problems with infinite symlinks if the build output is in the same location as the
-  # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a
-  # subdirectory.
-  # Failing to do this causes "infinite symlink expansion detected"
-  preBuildPhases = [ "preBuildPhase" ];
-  preBuildPhase = ''
-    mkdir bazel_src
-    shopt -s dotglob extglob
-    mv !(bazel_src) bazel_src
-  '';
-  buildPhase = ''
-    runHook preBuild
-
-    # Increasing memory during compilation might be necessary.
-    # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m"
-
-    # If EMBED_LABEL isn't set, it'd be auto-detected from CHANGELOG.md
-    # and `git rev-parse --short HEAD` which would result in
-    # "3.7.0- (@non-git)" due to non-git build and incomplete changelog.
-    # Actual bazel releases use scripts/release/common.sh which is based
-    # on branch/tag information which we don't have with tarball releases.
-    # Note that .bazelversion is always correct and is based on bazel-*
-    # executable name, version checks should work fine
-    export EMBED_LABEL="${version}- (@non-git)"
-    ${bash}/bin/bash ./bazel_src/compile.sh
-    ./bazel_src/scripts/generate_bash_completion.sh \
-        --bazel=./bazel_src/output/bazel \
-        --output=./bazel_src/output/bazel-complete.bash \
-        --prepend=./bazel_src/scripts/bazel-complete-header.bash \
-        --prepend=./bazel_src/scripts/bazel-complete-template.bash
-    ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \
-        --bazel=./bazel_src/output/bazel \
-        --output=./bazel_src/output/bazel-complete.fish
-  ''
-  +
-    # disable execlog parser on darwin, since it fails to build
-    # see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055
-    lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      # need to change directory for bazel to find the workspace
-      cd ./bazel_src
-      # build execlog tooling
-      export HOME=$(mktemp -d)
-      ./output/bazel build src/tools/execlog:parser_deploy.jar
-      cd -
-
-      runHook postBuild
-    '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-
-    # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel
-    # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch}
-    # The binary _must_ exist with this naming if your project contains a .bazelversion
-    # file.
-    cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
-    wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath}
-    mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
-
-  ''
-  +
-    # disable execlog parser on darwin, since it fails to build
-    # see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055
-    (lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      mkdir $out/share
-      cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar
-      cat <<EOF > $out/bin/bazel-execlog
-      #!${runtimeShell} -e
-      ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@
-      EOF
-      chmod +x $out/bin/bazel-execlog
-    '')
-  + ''
-    # shell completion files
-    installShellCompletion --bash \
-      --name bazel.bash \
-      ./bazel_src/output/bazel-complete.bash
-    installShellCompletion --zsh \
-      --name _bazel \
-      ./bazel_src/scripts/zsh_completion/_bazel
-    installShellCompletion --fish \
-      --name bazel.fish \
-      ./bazel_src/output/bazel-complete.fish
-
-    runHook postInstall
-  '';
-
-  # Install check fails on `aarch64-darwin`
-  # https://github.com/NixOS/nixpkgs/issues/145587
-  doInstallCheck = stdenv.hostPlatform.system != "aarch64-darwin";
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    export TEST_TMPDIR=$(pwd)
-
-    hello_test () {
-      $out/bin/bazel test \
-        --test_output=errors \
-        examples/cpp:hello-success_test \
-        examples/java-native/src/test/java/com/example/myproject:hello
-    }
-
-    cd ./bazel_src
-
-    # If .bazelversion file is present in dist files and doesn't match `bazel` version
-    # running `bazel` command within bazel_src will fail.
-    # Let's remove .bazelversion within the test, if present it is meant to indicate bazel version
-    # to compile bazel with, not version of bazel to be built and tested.
-    rm -f .bazelversion
-
-    # test whether $WORKSPACE_ROOT/tools/bazel works
-
-    mkdir -p tools
-    cat > tools/bazel <<"EOF"
-    #!${runtimeShell} -e
-    exit 1
-    EOF
-    chmod +x tools/bazel
-
-    # first call should fail if tools/bazel is used
-    ! hello_test
-
-    cat > tools/bazel <<"EOF"
-    #!${runtimeShell} -e
-    exec "$BAZEL_REAL" "$@"
-    EOF
-
-    # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch}
-    hello_test
-
-    ## Test that the GSON serialisation files are present
-    gson_classes=$(unzip -l $($out/bin/bazel info install_base)/A-server.jar | grep -F -c _GsonTypeAdapter.class)
-    if [ "$gson_classes" -lt 10 ]; then
-      echo "Missing GsonTypeAdapter classes in A-server.jar. Lockfile generation will not work"
-      exit 1
-    fi
-
-    runHook postInstallCheck
-  '';
-
-  # Save paths to hardcoded dependencies so Nix can detect them.
-  # This is needed because the templates get tar’d up into a .jar.
-  postFixup = ''
-    mkdir -p $out/nix-support
-    echo "${defaultShellPath}" >> $out/nix-support/depends
-    # The string literal specifying the path to the bazel-rc file is sometimes
-    # stored non-contiguously in the binary due to gcc optimisations, which leads
-    # Nix to miss the hash when scanning for dependencies
-    echo "${bazelRC}" >> $out/nix-support/depends
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    echo "${cctools}" >> $out/nix-support/depends
-  '';
-
-  dontStrip = true;
-  dontPatchELF = true;
-}
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/java_toolchain.patch b/pkgs/development/tools/build-managers/bazel/bazel_6/java_toolchain.patch
deleted file mode 100644
index 219f4e0b7035..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_6/java_toolchain.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/tools/jdk/BUILD.tools b/tools/jdk/BUILD.tools
---- a/tools/jdk/BUILD.tools
-+++ b/tools/jdk/BUILD.tools
-@@ -3,6 +3,7 @@ load(
-     "DEFAULT_TOOLCHAIN_CONFIGURATION",
-     "PREBUILT_TOOLCHAIN_CONFIGURATION",
-     "VANILLA_TOOLCHAIN_CONFIGURATION",
-+    "NONPREBUILT_TOOLCHAIN_CONFIGURATION",
-     "bootclasspath",
-     "default_java_toolchain",
-     "java_runtime_files",
-@@ -321,6 +322,21 @@ alias(
-     actual = ":toolchain",
- )
- 
-+default_java_toolchain(
-+  name = "nonprebuilt_toolchain",
-+  configuration = NONPREBUILT_TOOLCHAIN_CONFIGURATION,
-+  java_runtime = "@local_jdk//:jdk",
-+)
-+
-+default_java_toolchain(
-+  name = "nonprebuilt_toolchain_java11",
-+  configuration = NONPREBUILT_TOOLCHAIN_CONFIGURATION,
-+  java_runtime = "@local_jdk//:jdk",
-+  source_version = "11",
-+  target_version = "11",
-+)
-+
-+
- RELEASES = (8, 9, 10, 11)
- 
- [
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/nix-hacks.patch b/pkgs/development/tools/build-managers/bazel/bazel_6/nix-hacks.patch
deleted file mode 100644
index acae500d522c..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_6/nix-hacks.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
-index 25fbdcac9d..49616d37df 100644
---- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
-+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
-@@ -568,22 +568,7 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
-       String content;
-       try {
-         content = FileSystemUtils.readContent(markerPath, StandardCharsets.UTF_8);
--        String markerRuleKey = readMarkerFile(content, markerData);
--        boolean verified = false;
--        if (Preconditions.checkNotNull(ruleKey).equals(markerRuleKey)) {
--          verified = handler.verifyMarkerData(rule, markerData, env);
--          if (env.valuesMissing()) {
--            return null;
--          }
--        }
--
--        if (verified) {
--          return new Fingerprint().addString(content).digestAndReset();
--        } else {
--          // So that we are in a consistent state if something happens while fetching the repository
--          markerPath.delete();
--          return null;
--        }
-+        return new Fingerprint().addString(content).digestAndReset();
-       } catch (IOException e) {
-         throw new RepositoryFunctionException(e, Transience.TRANSIENT);
-       }
-diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
-index 1a45b8a3a2..a6b73213f6 100644
---- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
-+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
-@@ -152,7 +152,6 @@ public class JavaSubprocessFactory implements SubprocessFactory {
-     ProcessBuilder builder = new ProcessBuilder();
-     builder.command(params.getArgv());
-     if (params.getEnv() != null) {
--      builder.environment().clear();
-       builder.environment().putAll(params.getEnv());
-     }
- 
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/no-arc.patch b/pkgs/development/tools/build-managers/bazel/bazel_6/no-arc.patch
deleted file mode 100644
index e7a4498839dc..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_6/no-arc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/tools/osx/BUILD b/tools/osx/BUILD
-index 990afe3e8c..cd5b7b1b7a 100644
---- a/tools/osx/BUILD
-+++ b/tools/osx/BUILD
-@@ -28,8 +28,8 @@ exports_files([
- ])
- 
- DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
--  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
--      -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \
-+  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -framework CoreServices \
-+      -framework Foundation -arch @multiBinPatch@ -Wl,-no_uuid -o $@ $< && \
-   env -i codesign --identifier $@ --force --sign - $@
- """
- 
-diff --git a/tools/osx/xcode_configure.bzl b/tools/osx/xcode_configure.bzl
-index 2b819f07ec..a98ce37673 100644
---- a/tools/osx/xcode_configure.bzl
-+++ b/tools/osx/xcode_configure.bzl
-@@ -127,7 +127,6 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label):
-         "macosx",
-         "clang",
-         "-mmacosx-version-min=10.13",
--        "-fobjc-arc",
-         "-framework",
-         "CoreServices",
-         "-framework",
-diff --git a/tools/osx/xcode_locator.m b/tools/osx/xcode_locator.m
-index ed2ef87453..e0ce6dbdd1 100644
---- a/tools/osx/xcode_locator.m
-+++ b/tools/osx/xcode_locator.m
-@@ -21,10 +21,6 @@
- // 6,6.4,6.4.1 = 6.4.1
- // 6.3,6.3.0 = 6.3
- 
--#if !defined(__has_feature) || !__has_feature(objc_arc)
--#error "This file requires ARC support."
--#endif
--
- #import <CoreServices/CoreServices.h>
- #import <Foundation/Foundation.h>
- 
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json
deleted file mode 100644
index d894a51c5d84..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json
+++ /dev/null
@@ -1,2269 +0,0 @@
-{
-    "1.25.0.zip": {
-        "name": "1.25.0.zip",
-        "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip",
-            "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip"
-        ]
-    },
-    "1.3.3.zip": {
-        "name": "1.3.3.zip",
-        "sha256": "bb529ba133c0256df49139bd403c17835edbf60d2ecd6463549c6a5fe279364d",
-        "urls": [
-            "https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.3.3.zip"
-        ]
-    },
-    "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": {
-        "name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
-        "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
-            "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
-        ]
-    },
-    "20230802.0.tar.gz": {
-        "name": "20230802.0.tar.gz",
-        "sha256": "59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5",
-        "urls": [
-            "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.0.tar.gz"
-        ]
-    },
-    "2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz": {
-        "name": "2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz",
-        "sha256": "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0",
-        "urls": [
-            "https://mirror.bazel.build/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz",
-            "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz"
-        ]
-    },
-    "4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz": {
-        "name": "4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz",
-        "sha256": "1e490b98005664d149b379a9529a6aa05932b8a11b76b4cd86f3d22d76346f47",
-        "urls": [
-            "https://mirror.bazel.build/github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz",
-            "https://github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz"
-        ]
-    },
-    "5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip": {
-        "name": "5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip",
-        "sha256": "299452e6f4a4981b2e6d22357f7332713382a63e4c137f5fd6b89579f6d610cb",
-        "urls": [
-            "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip",
-            "https://github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip"
-        ]
-    },
-    "6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz": {
-        "name": "6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz",
-        "sha256": "ec76c5e79db59762776bece58b69507d095856c37b81fd35bfb0958e74b61d93",
-        "urls": [
-            "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz",
-            "https://github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz"
-        ]
-    },
-    "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz": {
-        "name": "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
-        "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
-            "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz"
-        ]
-    },
-    "a5477045acaa34586420942098f5fecd3570f577.tar.gz": {
-        "name": "a5477045acaa34586420942098f5fecd3570f577.tar.gz",
-        "sha256": "cf7f71eaff90b24c1a28b49645a9ff03a9a6c1e7134291ce70901cb63e7364b5",
-        "urls": [
-            "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz",
-            "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz"
-        ]
-    },
-    "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": {
-        "name": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz",
-        "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e",
-        "urls": [
-            "https://mirror.bazel.build/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz",
-            "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz"
-        ]
-    },
-    "android_tools": {
-        "generator_function": "maybe",
-        "generator_name": "android_tools",
-        "name": "android_tools",
-        "sha256": "5d0f140125afba82603ccd5050c78dd2e2863ca992a17f43f6df9a9119ffcb9b",
-        "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.2.tar"
-    },
-    "android_tools_for_testing": {
-        "name": "android_tools_for_testing",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "5d0f140125afba82603ccd5050c78dd2e2863ca992a17f43f6df9a9119ffcb9b",
-        "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.2.tar"
-    },
-    "android_tools_pkg-0.27.2.tar": {
-        "name": "android_tools_pkg-0.27.2.tar",
-        "sha256": "5d0f140125afba82603ccd5050c78dd2e2863ca992a17f43f6df9a9119ffcb9b",
-        "urls": [
-            "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.2.tar"
-        ]
-    },
-    "bazel-gazelle-v0.24.0.tar.gz": {
-        "name": "bazel-gazelle-v0.24.0.tar.gz",
-        "sha256": "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz",
-            "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz"
-        ]
-    },
-    "bazel-skylib-1.0.3.tar.gz": {
-        "name": "bazel-skylib-1.0.3.tar.gz",
-        "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz"
-        ]
-    },
-    "bazel_compdb": {
-        "generator_function": "grpc_deps",
-        "generator_name": "bazel_compdb",
-        "name": "bazel_compdb",
-        "sha256": "bcecfd622c4ef272fd4ba42726a52e140b961c4eac23025f18b346c968a8cfb4",
-        "strip_prefix": "bazel-compilation-database-0.4.5",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/grailbio/bazel-compilation-database/archive/0.4.5.tar.gz",
-            "https://github.com/grailbio/bazel-compilation-database/archive/0.4.5.tar.gz"
-        ]
-    },
-    "bazel_gazelle": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "bazel_gazelle",
-        "name": "bazel_gazelle",
-        "sha256": "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz",
-            "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz"
-        ]
-    },
-    "bazel_skylib": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "bazel_skylib",
-        "name": "bazel_skylib",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz"
-        ]
-    },
-    "bazel_toolchains": {
-        "generator_function": "grpc_deps",
-        "generator_name": "bazel_toolchains",
-        "name": "bazel_toolchains",
-        "sha256": "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024",
-        "strip_prefix": "bazel-toolchains-4.1.0",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/4.1.0.tar.gz",
-            "https://github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz"
-        ]
-    },
-    "bazelci_rules": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "bazelci_rules",
-        "name": "bazelci_rules",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e",
-        "strip_prefix": "bazelci_rules-1.0.0",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz",
-            "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz"
-        ]
-    },
-    "bazelci_rules-1.0.0.tar.gz": {
-        "name": "bazelci_rules-1.0.0.tar.gz",
-        "sha256": "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz",
-            "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz"
-        ]
-    },
-    "blake3": {
-        "build_file": "//third_party:blake3/blake3.BUILD",
-        "generator_function": "dist_http_archive",
-        "generator_name": "blake3",
-        "name": "blake3",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "bb529ba133c0256df49139bd403c17835edbf60d2ecd6463549c6a5fe279364d",
-        "strip_prefix": "BLAKE3-1.3.3",
-        "urls": [
-            "https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.3.3.zip"
-        ]
-    },
-    "boringssl": {
-        "generator_function": "grpc_deps",
-        "generator_name": "boringssl",
-        "name": "boringssl",
-        "sha256": "534fa658bd845fd974b50b10f444d392dfd0d93768c4a51b61263fd37d851c40",
-        "strip_prefix": "boringssl-b9232f9e27e5668bc0414879dcdedb2a59ea75f2",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/b9232f9e27e5668bc0414879dcdedb2a59ea75f2.tar.gz",
-            "https://github.com/google/boringssl/archive/b9232f9e27e5668bc0414879dcdedb2a59ea75f2.tar.gz"
-        ]
-    },
-    "build_bazel_apple_support": {
-        "generator_function": "grpc_deps",
-        "generator_name": "build_bazel_apple_support",
-        "name": "build_bazel_apple_support",
-        "sha256": "76df040ade90836ff5543888d64616e7ba6c3a7b33b916aa3a4b68f342d1b447",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.11.0/apple_support.0.11.0.tar.gz",
-            "https://github.com/bazelbuild/apple_support/releases/download/0.11.0/apple_support.0.11.0.tar.gz"
-        ]
-    },
-    "build_bazel_rules_apple": {
-        "generator_function": "grpc_deps",
-        "generator_name": "build_bazel_rules_apple",
-        "name": "build_bazel_rules_apple",
-        "sha256": "0052d452af7742c8f3a4e0929763388a66403de363775db7e90adecb2ba4944b",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/releases/download/0.31.3/rules_apple.0.31.3.tar.gz",
-            "https://github.com/bazelbuild/rules_apple/releases/download/0.31.3/rules_apple.0.31.3.tar.gz"
-        ]
-    },
-    "build_bazel_rules_nodejs": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "build_bazel_rules_nodejs",
-        "name": "build_bazel_rules_nodejs",
-        "sha256": "0fad45a9bda7dc1990c47b002fd64f55041ea751fafc00cd34efb96107675778",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-5.5.0.tar.gz",
-            "https://github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-5.5.0.tar.gz"
-        ]
-    },
-    "cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz": {
-        "name": "cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz",
-        "sha256": "5bc8365613fe2f8ce6cc33959b7667b13b7fe56cb9d16ba740c06e1a7c4242fc",
-        "urls": [
-            "https://mirror.bazel.build/github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz",
-            "https://github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz"
-        ]
-    },
-    "com_envoyproxy_protoc_gen_validate": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "com_envoyproxy_protoc_gen_validate",
-        "name": "com_envoyproxy_protoc_gen_validate",
-        "patch_args": [
-            "-p1"
-        ],
-        "patches": [
-            "//third_party/protoc_gen_validate:protoc_gen_validate.patch"
-        ],
-        "sha256": "1e490b98005664d149b379a9529a6aa05932b8a11b76b4cd86f3d22d76346f47",
-        "strip_prefix": "protoc-gen-validate-4694024279bdac52b77e22dc87808bd0fd732b69",
-        "urls": [
-            "https://mirror.bazel.build/github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz",
-            "https://github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz"
-        ]
-    },
-    "com_github_cares_cares": {
-        "build_file": "@com_github_grpc_grpc//third_party:cares/cares.BUILD",
-        "generator_function": "grpc_deps",
-        "generator_name": "com_github_cares_cares",
-        "name": "com_github_cares_cares",
-        "sha256": "ec76c5e79db59762776bece58b69507d095856c37b81fd35bfb0958e74b61d93",
-        "strip_prefix": "c-ares-6654436a307a5a686b008c1d4c93b0085da6e6d8",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz",
-            "https://github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz"
-        ]
-    },
-    "com_github_cncf_udpa": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "com_github_cncf_udpa",
-        "name": "com_github_cncf_udpa",
-        "patch_args": [
-            "-p1"
-        ],
-        "patches": [
-            "//third_party/cncf_udpa:cncf_udpa_0.0.1.patch"
-        ],
-        "sha256": "5bc8365613fe2f8ce6cc33959b7667b13b7fe56cb9d16ba740c06e1a7c4242fc",
-        "strip_prefix": "xds-cb28da3451f158a947dfc45090fe92b07b243bc1",
-        "urls": [
-            "https://mirror.bazel.build/github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz",
-            "https://github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz"
-        ]
-    },
-    "com_github_google_benchmark": {
-        "generator_function": "grpc_deps",
-        "generator_name": "com_github_google_benchmark",
-        "name": "com_github_google_benchmark",
-        "sha256": "0b921a3bc39e35f4275c8dcc658af2391c150fb966102341287b0401ff2e6f21",
-        "strip_prefix": "benchmark-0baacde3618ca617da95375e0af13ce1baadea47",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/0baacde3618ca617da95375e0af13ce1baadea47.tar.gz",
-            "https://github.com/google/benchmark/archive/0baacde3618ca617da95375e0af13ce1baadea47.tar.gz"
-        ]
-    },
-    "com_github_grpc_grpc": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "com_github_grpc_grpc",
-        "name": "com_github_grpc_grpc",
-        "patch_args": [
-            "-p1"
-        ],
-        "patches": [
-            "//third_party/grpc:grpc_1.47.0.patch",
-            "//third_party/grpc:grpc_1.47.0.win_arm64.patch"
-        ],
-        "sha256": "271bdc890bf329a8de5b65819f0f9590a5381402429bca37625b63546ed19e54",
-        "strip_prefix": "grpc-1.47.0",
-        "urls": [
-            "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.47.0.tar.gz",
-            "https://github.com/grpc/grpc/archive/v1.47.0.tar.gz"
-        ]
-    },
-    "com_github_libuv_libuv": {
-        "build_file": "@com_github_grpc_grpc//third_party:libuv.BUILD",
-        "generator_function": "grpc_deps",
-        "generator_name": "com_github_libuv_libuv",
-        "name": "com_github_libuv_libuv",
-        "sha256": "5ca4e9091f3231d8ad8801862dc4e851c23af89c69141d27723157776f7291e7",
-        "strip_prefix": "libuv-02a9e1be252b623ee032a3137c0b0c94afbe6809",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/libuv/libuv/archive/02a9e1be252b623ee032a3137c0b0c94afbe6809.tar.gz",
-            "https://github.com/libuv/libuv/archive/02a9e1be252b623ee032a3137c0b0c94afbe6809.tar.gz"
-        ]
-    },
-    "com_google_absl": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "com_google_absl",
-        "name": "com_google_absl",
-        "sha256": "59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5",
-        "strip_prefix": "abseil-cpp-20230802.0",
-        "urls": [
-            "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.0.tar.gz"
-        ]
-    },
-    "com_google_googleapis": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "com_google_googleapis",
-        "name": "com_google_googleapis",
-        "sha256": "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0",
-        "strip_prefix": "googleapis-2f9af297c84c55c8b871ba4495e01ade42476c92",
-        "urls": [
-            "https://mirror.bazel.build/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz",
-            "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz"
-        ]
-    },
-    "com_google_googletest": {
-        "name": "com_google_googletest",
-        "sha256": "81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2",
-        "strip_prefix": "googletest-release-1.12.1",
-        "urls": [
-            "https://mirror.bazel.build/github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz",
-            "https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz"
-        ]
-    },
-    "com_google_protobuf": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "com_google_protobuf",
-        "name": "com_google_protobuf",
-        "patch_args": [
-            "-p1"
-        ],
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "patches": [
-            "//third_party/protobuf:3.19.6.patch"
-        ],
-        "sha256": "9a301cf94a8ddcb380b901e7aac852780b826595075577bb967004050c835056",
-        "strip_prefix": "protobuf-3.19.6",
-        "urls": [
-            "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz",
-            "https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz"
-        ]
-    },
-    "com_google_testparameterinjector": {
-        "build_file_content": "\njava_library(\n    name = \"testparameterinjector\",\n    testonly = True,\n    srcs = glob([\"src/main/**/*.java\"]),\n    deps = [\n      \"@org_snakeyaml//:snakeyaml\",\n      \"@//third_party:auto_value\",\n      \"@//third_party:guava\",\n      \"@//third_party:junit4\",\n      \"@//third_party/protobuf:protobuf_java\",\n    ],\n    visibility = [\"//visibility:public\"],\n)\n",
-        "name": "com_google_testparameterinjector",
-        "sha256": "562a0e87eb413a7dcad29ebc8d578f6f97503473943585b051c1398a58189b06",
-        "strip_prefix": "TestParameterInjector-1.0",
-        "urls": [
-            "https://mirror.bazel.build/github.com/google/TestParameterInjector/archive/v1.0.tar.gz",
-            "https://github.com/google/TestParameterInjector/archive/v1.0.tar.gz"
-        ]
-    },
-    "com_googlesource_code_re2": {
-        "generator_function": "grpc_deps",
-        "generator_name": "com_googlesource_code_re2",
-        "name": "com_googlesource_code_re2",
-        "sha256": "319a58a58d8af295db97dfeecc4e250179c5966beaa2d842a82f0a013b6a239b",
-        "strip_prefix": "re2-8e08f47b11b413302749c0d8b17a1c94777495d5",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/8e08f47b11b413302749c0d8b17a1c94777495d5.tar.gz",
-            "https://github.com/google/re2/archive/8e08f47b11b413302749c0d8b17a1c94777495d5.tar.gz"
-        ]
-    },
-    "coverage_output_generator-v2.6.zip": {
-        "name": "coverage_output_generator-v2.6.zip",
-        "sha256": "7006375f6756819b7013ca875eab70a541cf7d89142d9c511ed78ea4fefa38af",
-        "urls": [
-            "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.6.zip"
-        ]
-    },
-    "cython": {
-        "build_file": "@com_github_grpc_grpc//third_party:cython.BUILD",
-        "generator_function": "grpc_deps",
-        "generator_name": "cython",
-        "name": "cython",
-        "sha256": "bb72b2f0ef029472759c711f0a4bded6e15e3f9bda3797550cef3c1d87d02283",
-        "strip_prefix": "cython-0.29.26",
-        "urls": [
-            "https://github.com/cython/cython/archive/0.29.26.tar.gz"
-        ]
-    },
-    "desugar_jdk_libs": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "desugar_jdk_libs",
-        "name": "desugar_jdk_libs",
-        "sha256": "299452e6f4a4981b2e6d22357f7332713382a63e4c137f5fd6b89579f6d610cb",
-        "strip_prefix": "desugar_jdk_libs-5847d6a06302136d95a14b4cbd4b55a9c9f1436e",
-        "urls": [
-            "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip",
-            "https://github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip"
-        ]
-    },
-    "enum34": {
-        "build_file": "@com_github_grpc_grpc//third_party:enum34.BUILD",
-        "generator_function": "grpc_deps",
-        "generator_name": "enum34",
-        "name": "enum34",
-        "sha256": "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1",
-        "strip_prefix": "enum34-1.1.6",
-        "urls": [
-            "https://files.pythonhosted.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz"
-        ]
-    },
-    "envoy_api": {
-        "generator_function": "grpc_deps",
-        "generator_name": "envoy_api",
-        "name": "envoy_api",
-        "sha256": "c5807010b67033330915ca5a20483e30538ae5e689aa14b3631d6284beca4630",
-        "strip_prefix": "data-plane-api-9c42588c956220b48eb3099d186487c2f04d32ec",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/9c42588c956220b48eb3099d186487c2f04d32ec.tar.gz",
-            "https://github.com/envoyproxy/data-plane-api/archive/9c42588c956220b48eb3099d186487c2f04d32ec.tar.gz"
-        ]
-    },
-    "futures": {
-        "build_file": "@com_github_grpc_grpc//third_party:futures.BUILD",
-        "generator_function": "grpc_deps",
-        "generator_name": "futures",
-        "name": "futures",
-        "sha256": "7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794",
-        "strip_prefix": "futures-3.3.0",
-        "urls": [
-            "https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00/futures-3.3.0.tar.gz"
-        ]
-    },
-    "io_bazel_rules_go": {
-        "generator_function": "grpc_deps",
-        "generator_name": "io_bazel_rules_go",
-        "name": "io_bazel_rules_go",
-        "sha256": "69de5c704a05ff37862f7e0f5534d4f479418afc21806c887db544a316f3cb6b",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz",
-            "https://github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz"
-        ]
-    },
-    "io_bazel_rules_python": {
-        "generator_function": "grpc_deps",
-        "generator_name": "io_bazel_rules_python",
-        "name": "io_bazel_rules_python",
-        "patch_args": [
-            "-p1"
-        ],
-        "patches": [
-            "@com_github_grpc_grpc//third_party:rules_python.patch"
-        ],
-        "sha256": "954aa89b491be4a083304a2cb838019c8b8c3720a7abb9c4cb81ac7a24230cea",
-        "url": "https://github.com/bazelbuild/rules_python/releases/download/0.4.0/rules_python-0.4.0.tar.gz"
-    },
-    "io_bazel_rules_sass": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "io_bazel_rules_sass",
-        "name": "io_bazel_rules_sass",
-        "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647",
-        "strip_prefix": "rules_sass-1.25.0",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip",
-            "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip"
-        ]
-    },
-    "io_bazel_skydoc": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "io_bazel_skydoc",
-        "name": "io_bazel_skydoc",
-        "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
-        "strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
-            "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
-        ]
-    },
-    "io_opencensus_cpp": {
-        "generator_function": "grpc_deps",
-        "generator_name": "io_opencensus_cpp",
-        "name": "io_opencensus_cpp",
-        "sha256": "90d6fafa8b1a2ea613bf662731d3086e1c2ed286f458a95c81744df2dbae41b1",
-        "strip_prefix": "opencensus-cpp-c9a4da319bc669a772928ffc55af4a61be1a1176",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz",
-            "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz"
-        ]
-    },
-    "java_tools-v12.7.zip": {
-        "name": "java_tools-v12.7.zip",
-        "sha256": "aa11ecd5fc0af2769f0f2bdd25e2f4de7c1291ed24326fb23fa69bdd5dcae2b5",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools-v12.7.zip"
-        ]
-    },
-    "java_tools_darwin_arm64-v12.7.zip": {
-        "name": "java_tools_darwin_arm64-v12.7.zip",
-        "sha256": "ecedf6305768dfd51751d0ad732898af092bd7710d497c6c6c3214af7e49395f",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_arm64-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_arm64-v12.7.zip"
-        ]
-    },
-    "java_tools_darwin_x86_64-v12.7.zip": {
-        "name": "java_tools_darwin_x86_64-v12.7.zip",
-        "sha256": "e116c649c0355ab57ffcc870ce1139e5e1528cabac458bd50263d2b84ea4ffb2",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_x86_64-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_x86_64-v12.7.zip"
-        ]
-    },
-    "java_tools_linux-v12.7.zip": {
-        "name": "java_tools_linux-v12.7.zip",
-        "sha256": "a346b9a291b6db1bb06f7955f267e47522d99963fe14e337da1d75d125a8599f",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_linux-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_linux-v12.7.zip"
-        ]
-    },
-    "java_tools_windows-v12.7.zip": {
-        "name": "java_tools_windows-v12.7.zip",
-        "sha256": "bae6a03b5aeead5804ba7bcdcc8b14ec3ed05b37f3db5519f788ab060bc53b05",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_windows-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_windows-v12.7.zip"
-        ]
-    },
-    "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip": {
-        "name": "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip",
-        "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
-        "urls": [
-            "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
-        ]
-    },
-    "nuget_python_i686_3.10.0": {
-        "build_file_content": "\ncc_import(\n    name = \"python_full_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python310.dll\",\n    interface_library = \"libs/python310.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n    name = \"python_limited_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python3.dll\",\n    interface_library = \"libs/python3.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n",
-        "generator_function": "grpc_extra_deps",
-        "generator_name": "nuget_python_i686_3.10.0",
-        "name": "nuget_python_i686_3.10.0",
-        "patch_cmds": [
-            "cp -r include/* ."
-        ],
-        "sha256": "e115e102eb90ce160ab0ef7506b750a8d7ecc385bde0a496f02a54337a8bc333",
-        "strip_prefix": "tools",
-        "type": "zip",
-        "urls": [
-            "https://www.nuget.org/api/v2/package/pythonx86/3.10.0"
-        ]
-    },
-    "nuget_python_i686_3.7.0": {
-        "build_file_content": "\ncc_import(\n    name = \"python_full_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python37.dll\",\n    interface_library = \"libs/python37.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n    name = \"python_limited_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python3.dll\",\n    interface_library = \"libs/python3.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n",
-        "generator_function": "grpc_extra_deps",
-        "generator_name": "nuget_python_i686_3.7.0",
-        "name": "nuget_python_i686_3.7.0",
-        "patch_cmds": [
-            "cp -r include/* ."
-        ],
-        "sha256": "a8bb49fa1ca62ad55430fcafaca1b58015e22943e66b1a87d5e7cef2556c6a54",
-        "strip_prefix": "tools",
-        "type": "zip",
-        "urls": [
-            "https://www.nuget.org/api/v2/package/pythonx86/3.7.0"
-        ]
-    },
-    "nuget_python_i686_3.8.0": {
-        "build_file_content": "\ncc_import(\n    name = \"python_full_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python38.dll\",\n    interface_library = \"libs/python38.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n    name = \"python_limited_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python3.dll\",\n    interface_library = \"libs/python3.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n",
-        "generator_function": "grpc_extra_deps",
-        "generator_name": "nuget_python_i686_3.8.0",
-        "name": "nuget_python_i686_3.8.0",
-        "patch_cmds": [
-            "cp -r include/* ."
-        ],
-        "sha256": "87a6481f5eef30b42ac12c93f06f73bd0b8692f26313b76a6615d1641c4e7bca",
-        "strip_prefix": "tools",
-        "type": "zip",
-        "urls": [
-            "https://www.nuget.org/api/v2/package/pythonx86/3.8.0"
-        ]
-    },
-    "nuget_python_i686_3.9.0": {
-        "build_file_content": "\ncc_import(\n    name = \"python_full_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python39.dll\",\n    interface_library = \"libs/python39.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n    name = \"python_limited_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python3.dll\",\n    interface_library = \"libs/python3.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n",
-        "generator_function": "grpc_extra_deps",
-        "generator_name": "nuget_python_i686_3.9.0",
-        "name": "nuget_python_i686_3.9.0",
-        "patch_cmds": [
-            "cp -r include/* ."
-        ],
-        "sha256": "229abecbe49dc08fe5709e0b31e70edfb3b88f23335ebfc2904c44f940fd59b6",
-        "strip_prefix": "tools",
-        "type": "zip",
-        "urls": [
-            "https://www.nuget.org/api/v2/package/pythonx86/3.9.0"
-        ]
-    },
-    "nuget_python_x86-64_3.10.0": {
-        "build_file_content": "\ncc_import(\n    name = \"python_full_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python310.dll\",\n    interface_library = \"libs/python310.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n    name = \"python_limited_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python3.dll\",\n    interface_library = \"libs/python3.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n",
-        "generator_function": "grpc_extra_deps",
-        "generator_name": "nuget_python_x86-64_3.10.0",
-        "name": "nuget_python_x86-64_3.10.0",
-        "patch_cmds": [
-            "cp -r include/* ."
-        ],
-        "sha256": "4474c83c25625d93e772e926f95f4cd398a0abbb52793625fa30f39af3d2cc00",
-        "strip_prefix": "tools",
-        "type": "zip",
-        "urls": [
-            "https://www.nuget.org/api/v2/package/python/3.10.0"
-        ]
-    },
-    "nuget_python_x86-64_3.7.0": {
-        "build_file_content": "\ncc_import(\n    name = \"python_full_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python37.dll\",\n    interface_library = \"libs/python37.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n    name = \"python_limited_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python3.dll\",\n    interface_library = \"libs/python3.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n",
-        "generator_function": "grpc_extra_deps",
-        "generator_name": "nuget_python_x86-64_3.7.0",
-        "name": "nuget_python_x86-64_3.7.0",
-        "patch_cmds": [
-            "cp -r include/* ."
-        ],
-        "sha256": "66eb796a5bdb1e6787b8f655a1237a6b6964af2115b7627cf4f0032cf068b4b2",
-        "strip_prefix": "tools",
-        "type": "zip",
-        "urls": [
-            "https://www.nuget.org/api/v2/package/python/3.7.0"
-        ]
-    },
-    "nuget_python_x86-64_3.8.0": {
-        "build_file_content": "\ncc_import(\n    name = \"python_full_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python38.dll\",\n    interface_library = \"libs/python38.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n    name = \"python_limited_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python3.dll\",\n    interface_library = \"libs/python3.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n",
-        "generator_function": "grpc_extra_deps",
-        "generator_name": "nuget_python_x86-64_3.8.0",
-        "name": "nuget_python_x86-64_3.8.0",
-        "patch_cmds": [
-            "cp -r include/* ."
-        ],
-        "sha256": "96c61321ce90dd053c8a04f305a5f6cc6d91350b862db34440e4a4f069b708a0",
-        "strip_prefix": "tools",
-        "type": "zip",
-        "urls": [
-            "https://www.nuget.org/api/v2/package/python/3.8.0"
-        ]
-    },
-    "nuget_python_x86-64_3.9.0": {
-        "build_file_content": "\ncc_import(\n    name = \"python_full_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python39.dll\",\n    interface_library = \"libs/python39.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n    name = \"python_limited_api\",\n    hdrs = glob([\"**/*.h\"]),\n    shared_library = \"python3.dll\",\n    interface_library = \"libs/python3.lib\",\n    visibility = [\"@upb//python:__pkg__\"],\n)\n",
-        "generator_function": "grpc_extra_deps",
-        "generator_name": "nuget_python_x86-64_3.9.0",
-        "name": "nuget_python_x86-64_3.9.0",
-        "patch_cmds": [
-            "cp -r include/* ."
-        ],
-        "sha256": "6af58a733e7dfbfcdd50d55788134393d6ffe7ab8270effbf724bdb786558832",
-        "strip_prefix": "tools",
-        "type": "zip",
-        "urls": [
-            "https://www.nuget.org/api/v2/package/python/3.9.0"
-        ]
-    },
-    "opencensus_proto": {
-        "generator_function": "grpc_deps",
-        "generator_name": "opencensus_proto",
-        "name": "opencensus_proto",
-        "sha256": "b7e13f0b4259e80c3070b583c2f39e53153085a6918718b1c710caf7037572b0",
-        "strip_prefix": "opencensus-proto-0.3.0/src",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz",
-            "https://github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz"
-        ]
-    },
-    "openjdk11_darwin_aarch64_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk11_darwin_aarch64_archive",
-        "name": "openjdk11_darwin_aarch64_archive",
-        "sha256": "6bb0d2c6e8a29dcd9c577bbb2986352ba12481a9549ac2c0bcfd00ed60e538d2",
-        "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz"
-        ]
-    },
-    "openjdk11_darwin_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk11_darwin_archive",
-        "name": "openjdk11_darwin_archive",
-        "sha256": "2614e5c5de8e989d4d81759de4c333aa5b867b17ab9ee78754309ba65c7f6f55",
-        "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz"
-        ]
-    },
-    "openjdk11_linux_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk11_linux_archive",
-        "name": "openjdk11_linux_archive",
-        "sha256": "e064b61d93304012351242bf0823c6a2e41d9e28add7ea7f05378b7243d34247",
-        "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz"
-        ]
-    },
-    "openjdk11_windows_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk11_windows_archive",
-        "name": "openjdk11_windows_archive",
-        "sha256": "a106c77389a63b6bd963a087d5f01171bd32aa3ee7377ecef87531390dcb9050",
-        "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip"
-        ]
-    },
-    "openjdk11_windows_arm64_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk11_windows_arm64_archive",
-        "name": "openjdk11_windows_arm64_archive",
-        "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
-        "strip_prefix": "jdk-11.0.13+8",
-        "urls": [
-            "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
-        ]
-    },
-    "openjdk17_darwin_aarch64_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk17_darwin_aarch64_archive",
-        "name": "openjdk17_darwin_aarch64_archive",
-        "sha256": "515dd56ec99bb5ae8966621a2088aadfbe72631818ffbba6e4387b7ee292ab09",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz"
-        ]
-    },
-    "openjdk17_darwin_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk17_darwin_archive",
-        "name": "openjdk17_darwin_archive",
-        "sha256": "e6317cee4d40995f0da5b702af3f04a6af2bbd55febf67927696987d11113b53",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz"
-        ]
-    },
-    "openjdk17_linux_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk17_linux_archive",
-        "name": "openjdk17_linux_archive",
-        "sha256": "20c91a922eec795f3181eaa70def8b99d8eac56047c9a14bfb257c85b991df1b",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz"
-        ]
-    },
-    "openjdk17_windows_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk17_windows_archive",
-        "name": "openjdk17_windows_archive",
-        "sha256": "9972c5b62a61b45785d3d956c559e079d9e91f144ec46225f5deeda214d48f27",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip"
-        ]
-    },
-    "openjdk17_windows_arm64_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk17_windows_arm64_archive",
-        "name": "openjdk17_windows_arm64_archive",
-        "sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip"
-        ]
-    },
-    "openjdk18_darwin_aarch64_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk18_darwin_aarch64_archive",
-        "name": "openjdk18_darwin_aarch64_archive",
-        "sha256": "9595e001451e201fdf33c1952777968a3ac18fe37273bdeaea5b5ed2c4950432",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_aarch64.tar.gz"
-        ]
-    },
-    "openjdk18_darwin_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk18_darwin_archive",
-        "name": "openjdk18_darwin_archive",
-        "sha256": "780a9aa4bda95a6793bf41d13f837c59ef915e9bfd0e0c5fd4c70e4cdaa88541",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz"
-        ]
-    },
-    "openjdk18_linux_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk18_linux_archive",
-        "name": "openjdk18_linux_archive",
-        "sha256": "959a94ca4097dcaabc7886784cec10dfdf2b0a3bff890ea8943cc09c5fff29cb",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_x64.tar.gz"
-        ]
-    },
-    "openjdk18_windows_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk18_windows_archive",
-        "name": "openjdk18_windows_archive",
-        "sha256": "6c75498163b047595386fdb909cb6d4e04282c3a81799743c5e1f9316391fe16",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_x64.zip"
-        ]
-    },
-    "openjdk18_windows_arm64_archive": {
-        "build_file_content": "\njava_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
-        "generator_function": "dist_http_archive",
-        "generator_name": "openjdk18_windows_arm64_archive",
-        "name": "openjdk18_windows_arm64_archive",
-        "sha256": "9b52b259516e4140ee56b91f77750667bffbc543e78ad8c39082449d4c377b54",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-win_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip"
-        ]
-    },
-    "openjdk_linux": {
-        "downloaded_file_path": "zulu-linux.tar.gz",
-        "name": "openjdk_linux",
-        "sha256": "65bfe4e0ffa74a680ee4410db46b17e30cd9397b664a92a886599fe1f3530969",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-linux_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689070.tar.gz"
-        ]
-    },
-    "openjdk_linux_aarch64": {
-        "downloaded_file_path": "zulu-linux-aarch64.tar.gz",
-        "name": "openjdk_linux_aarch64",
-        "sha256": "6b245793087300db3ee82ab0d165614f193a73a60f2f011e347756c1e6ca5bac",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz"
-        ]
-    },
-    "openjdk_linux_aarch64_minimal": {
-        "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz",
-        "name": "openjdk_linux_aarch64_minimal",
-        "sha256": "06f6520a877704c77614bcfc4f846cc7cbcbf5eaad149bf7f19f4f16e285c9de",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz"
-        ]
-    },
-    "openjdk_linux_aarch64_vanilla": {
-        "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz",
-        "generator_function": "dist_http_file",
-        "generator_name": "openjdk_linux_aarch64_vanilla",
-        "name": "openjdk_linux_aarch64_vanilla",
-        "sha256": "fc7c41a0005180d4ca471c90d01e049469e0614cf774566d4cf383caa29d1a97",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz"
-        ]
-    },
-    "openjdk_linux_minimal": {
-        "downloaded_file_path": "zulu-linux-minimal.tar.gz",
-        "name": "openjdk_linux_minimal",
-        "sha256": "91f7d52f695c681d4e21499b4319d548aadef249a6b3053e306308992e1e29ae",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz"
-        ]
-    },
-    "openjdk_linux_ppc64le_vanilla": {
-        "downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz",
-        "generator_function": "dist_http_file",
-        "generator_name": "openjdk_linux_ppc64le_vanilla",
-        "name": "openjdk_linux_ppc64le_vanilla",
-        "sha256": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f",
-        "urls": [
-            "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz",
-            "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz"
-        ]
-    },
-    "openjdk_linux_s390x_vanilla": {
-        "downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz",
-        "generator_function": "dist_http_file",
-        "generator_name": "openjdk_linux_s390x_vanilla",
-        "name": "openjdk_linux_s390x_vanilla",
-        "sha256": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b",
-        "urls": [
-            "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz",
-            "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz"
-        ]
-    },
-    "openjdk_linux_vanilla": {
-        "downloaded_file_path": "zulu-linux-vanilla.tar.gz",
-        "generator_function": "dist_http_file",
-        "generator_name": "openjdk_linux_vanilla",
-        "name": "openjdk_linux_vanilla",
-        "sha256": "e064b61d93304012351242bf0823c6a2e41d9e28add7ea7f05378b7243d34247",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz"
-        ]
-    },
-    "openjdk_macos_aarch64": {
-        "downloaded_file_path": "zulu-macos-aarch64.tar.gz",
-        "name": "openjdk_macos_aarch64",
-        "sha256": "a900ef793cb34b03ac5d93ea2f67291b6842e99d500934e19393a8d8f9bfa6ff",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-allmodules-1611665569.tar.gz"
-        ]
-    },
-    "openjdk_macos_aarch64_minimal": {
-        "downloaded_file_path": "zulu-macos-aarch64-minimal.tar.gz",
-        "name": "openjdk_macos_aarch64_minimal",
-        "sha256": "f4f606926e6deeaa8b8397e299313d9df87642fe464b0ccf1ed0432aeb00640b",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-minimal-1611665562.tar.gz"
-        ]
-    },
-    "openjdk_macos_aarch64_vanilla": {
-        "downloaded_file_path": "zulu-macos-aarch64-vanilla.tar.gz",
-        "generator_function": "dist_http_file",
-        "generator_name": "openjdk_macos_aarch64_vanilla",
-        "name": "openjdk_macos_aarch64_vanilla",
-        "sha256": "6bb0d2c6e8a29dcd9c577bbb2986352ba12481a9549ac2c0bcfd00ed60e538d2",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz"
-        ]
-    },
-    "openjdk_macos_x86_64": {
-        "downloaded_file_path": "zulu-macos.tar.gz",
-        "name": "openjdk_macos_x86_64",
-        "sha256": "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz"
-        ]
-    },
-    "openjdk_macos_x86_64_minimal": {
-        "downloaded_file_path": "zulu-macos-minimal.tar.gz",
-        "name": "openjdk_macos_x86_64_minimal",
-        "sha256": "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz"
-        ]
-    },
-    "openjdk_macos_x86_64_vanilla": {
-        "downloaded_file_path": "zulu-macos-vanilla.tar.gz",
-        "generator_function": "dist_http_file",
-        "generator_name": "openjdk_macos_x86_64_vanilla",
-        "name": "openjdk_macos_x86_64_vanilla",
-        "sha256": "2614e5c5de8e989d4d81759de4c333aa5b867b17ab9ee78754309ba65c7f6f55",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz"
-        ]
-    },
-    "openjdk_win": {
-        "downloaded_file_path": "zulu-win.zip",
-        "name": "openjdk_win",
-        "sha256": "8e1604b3a27dcf639bc6d1a73103f1211848139e4cceb081d0a74a99e1e6f995",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip"
-        ]
-    },
-    "openjdk_win_arm64_vanilla": {
-        "downloaded_file_path": "zulu-win-arm64.zip",
-        "generator_function": "dist_http_file",
-        "generator_name": "openjdk_win_arm64_vanilla",
-        "name": "openjdk_win_arm64_vanilla",
-        "sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip"
-        ]
-    },
-    "openjdk_win_minimal": {
-        "downloaded_file_path": "zulu-win-minimal.zip",
-        "name": "openjdk_win_minimal",
-        "sha256": "b90a713c9c2d9ea23cad44d2c2dfcc9af22faba9bde55dedc1c3bb9f556ac1ae",
-        "urls": [
-            "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip"
-        ]
-    },
-    "openjdk_win_vanilla": {
-        "downloaded_file_path": "zulu-win-vanilla.zip",
-        "generator_function": "dist_http_file",
-        "generator_name": "openjdk_win_vanilla",
-        "name": "openjdk_win_vanilla",
-        "sha256": "a106c77389a63b6bd963a087d5f01171bd32aa3ee7377ecef87531390dcb9050",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip"
-        ]
-    },
-    "org_snakeyaml": {
-        "build_file_content": "\njava_library(\n    name = \"snakeyaml\",\n    srcs = glob([\"src/main/**/*.java\"]),\n    visibility = [\n        \"@io_bazel//src/main/java/com/google/devtools/build/docgen/release:__pkg__\",\n        \"@com_google_testparameterinjector//:__pkg__\",\n    ],\n)\n",
-        "name": "org_snakeyaml",
-        "sha256": "fd0e0cc6c5974fc8f08be3a15fb4a59954c7dd958b5b68186a803de6420b6e40",
-        "strip_prefix": "asomov-snakeyaml-b28f0b4d87c6",
-        "urls": [
-            "https://mirror.bazel.build/bitbucket.org/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz"
-        ]
-    },
-    "platforms": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "platforms",
-        "name": "platforms",
-        "sha256": "3a561c99e7bdbe9173aa653fd579fe849f1d8d67395780ab4770b1f381431d51",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz",
-            "https://github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz"
-        ]
-    },
-    "platforms-0.0.7.tar.gz": {
-        "name": "platforms-0.0.7.tar.gz",
-        "sha256": "3a561c99e7bdbe9173aa653fd579fe849f1d8d67395780ab4770b1f381431d51",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz",
-            "https://github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz"
-        ]
-    },
-    "python-3.7.0": {
-        "build_file_content": "\ncc_library(\n    name = \"python_headers\",\n    hdrs = glob([\"**/Include/**/*.h\"]),\n    strip_include_prefix = \"Python-3.7.0/Include\",\n    visibility = [\"//visibility:public\"],\n)\n",
-        "generator_function": "grpc_extra_deps",
-        "generator_name": "python-3.7.0",
-        "name": "python-3.7.0",
-        "patch_cmds": [
-            "echo '#define SIZEOF_WCHAR_T 4' > Python-3.7.0/Include/pyconfig.h"
-        ],
-        "sha256": "85bb9feb6863e04fb1700b018d9d42d1caac178559ffa453d7e6a436e259fd0d",
-        "urls": [
-            "https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tgz"
-        ]
-    },
-    "r8-8.0.40.jar": {
-        "name": "r8-8.0.40.jar",
-        "sha256": "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
-        "urls": [
-            "https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar"
-        ]
-    },
-    "remote_coverage_tools": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_coverage_tools",
-        "name": "remote_coverage_tools",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "7006375f6756819b7013ca875eab70a541cf7d89142d9c511ed78ea4fefa38af",
-        "urls": [
-            "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.6.zip"
-        ]
-    },
-    "remote_java_tools": {
-        "generator_function": "maybe",
-        "generator_name": "remote_java_tools",
-        "name": "remote_java_tools",
-        "sha256": "aa11ecd5fc0af2769f0f2bdd25e2f4de7c1291ed24326fb23fa69bdd5dcae2b5",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools-v12.7.zip"
-        ]
-    },
-    "remote_java_tools_darwin_arm64": {
-        "generator_function": "maybe",
-        "generator_name": "remote_java_tools_darwin_arm64",
-        "name": "remote_java_tools_darwin_arm64",
-        "sha256": "ecedf6305768dfd51751d0ad732898af092bd7710d497c6c6c3214af7e49395f",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_arm64-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_arm64-v12.7.zip"
-        ]
-    },
-    "remote_java_tools_darwin_arm64_for_testing": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_darwin_arm64_for_testing",
-        "name": "remote_java_tools_darwin_arm64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "ecedf6305768dfd51751d0ad732898af092bd7710d497c6c6c3214af7e49395f",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_arm64-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_arm64-v12.7.zip"
-        ]
-    },
-    "remote_java_tools_darwin_x86_64": {
-        "generator_function": "maybe",
-        "generator_name": "remote_java_tools_darwin_x86_64",
-        "name": "remote_java_tools_darwin_x86_64",
-        "sha256": "e116c649c0355ab57ffcc870ce1139e5e1528cabac458bd50263d2b84ea4ffb2",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_x86_64-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_x86_64-v12.7.zip"
-        ]
-    },
-    "remote_java_tools_darwin_x86_64_for_testing": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_darwin_x86_64_for_testing",
-        "name": "remote_java_tools_darwin_x86_64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "e116c649c0355ab57ffcc870ce1139e5e1528cabac458bd50263d2b84ea4ffb2",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_x86_64-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_x86_64-v12.7.zip"
-        ]
-    },
-    "remote_java_tools_for_testing": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_for_testing",
-        "name": "remote_java_tools_for_testing",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "aa11ecd5fc0af2769f0f2bdd25e2f4de7c1291ed24326fb23fa69bdd5dcae2b5",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools-v12.7.zip"
-        ]
-    },
-    "remote_java_tools_linux": {
-        "generator_function": "maybe",
-        "generator_name": "remote_java_tools_linux",
-        "name": "remote_java_tools_linux",
-        "sha256": "a346b9a291b6db1bb06f7955f267e47522d99963fe14e337da1d75d125a8599f",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_linux-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_linux-v12.7.zip"
-        ]
-    },
-    "remote_java_tools_linux_for_testing": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_linux_for_testing",
-        "name": "remote_java_tools_linux_for_testing",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "a346b9a291b6db1bb06f7955f267e47522d99963fe14e337da1d75d125a8599f",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_linux-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_linux-v12.7.zip"
-        ]
-    },
-    "remote_java_tools_test": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_test",
-        "name": "remote_java_tools_test",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "aa11ecd5fc0af2769f0f2bdd25e2f4de7c1291ed24326fb23fa69bdd5dcae2b5",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools-v12.7.zip"
-        ]
-    },
-    "remote_java_tools_test_darwin_arm64": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_test_darwin_arm64",
-        "name": "remote_java_tools_test_darwin_arm64",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "ecedf6305768dfd51751d0ad732898af092bd7710d497c6c6c3214af7e49395f",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_arm64-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_arm64-v12.7.zip"
-        ]
-    },
-    "remote_java_tools_test_darwin_x86_64": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_test_darwin_x86_64",
-        "name": "remote_java_tools_test_darwin_x86_64",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "e116c649c0355ab57ffcc870ce1139e5e1528cabac458bd50263d2b84ea4ffb2",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_x86_64-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_x86_64-v12.7.zip"
-        ]
-    },
-    "remote_java_tools_test_linux": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_test_linux",
-        "name": "remote_java_tools_test_linux",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "a346b9a291b6db1bb06f7955f267e47522d99963fe14e337da1d75d125a8599f",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_linux-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_linux-v12.7.zip"
-        ]
-    },
-    "remote_java_tools_test_windows": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_test_windows",
-        "name": "remote_java_tools_test_windows",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "bae6a03b5aeead5804ba7bcdcc8b14ec3ed05b37f3db5519f788ab060bc53b05",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_windows-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_windows-v12.7.zip"
-        ]
-    },
-    "remote_java_tools_windows": {
-        "generator_function": "maybe",
-        "generator_name": "remote_java_tools_windows",
-        "name": "remote_java_tools_windows",
-        "sha256": "bae6a03b5aeead5804ba7bcdcc8b14ec3ed05b37f3db5519f788ab060bc53b05",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_windows-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_windows-v12.7.zip"
-        ]
-    },
-    "remote_java_tools_windows_for_testing": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "remote_java_tools_windows_for_testing",
-        "name": "remote_java_tools_windows_for_testing",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "bae6a03b5aeead5804ba7bcdcc8b14ec3ed05b37f3db5519f788ab060bc53b05",
-        "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_windows-v12.7.zip",
-            "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_windows-v12.7.zip"
-        ]
-    },
-    "remotejdk11_linux": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 11,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_linux",
-        "name": "remotejdk11_linux",
-        "sha256": "e064b61d93304012351242bf0823c6a2e41d9e28add7ea7f05378b7243d34247",
-        "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz"
-        ]
-    },
-    "remotejdk11_linux_aarch64": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 11,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_linux_aarch64",
-        "name": "remotejdk11_linux_aarch64",
-        "sha256": "fc7c41a0005180d4ca471c90d01e049469e0614cf774566d4cf383caa29d1a97",
-        "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-linux_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk11_linux_aarch64_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk11_linux_aarch64_for_testing",
-        "name": "remotejdk11_linux_aarch64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "fc7c41a0005180d4ca471c90d01e049469e0614cf774566d4cf383caa29d1a97",
-        "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-linux_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk11_linux_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk11_linux_for_testing",
-        "name": "remotejdk11_linux_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "e064b61d93304012351242bf0823c6a2e41d9e28add7ea7f05378b7243d34247",
-        "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz"
-        ]
-    },
-    "remotejdk11_linux_ppc64le": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 11,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_linux_ppc64le",
-        "name": "remotejdk11_linux_ppc64le",
-        "sha256": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f",
-        "strip_prefix": "jdk-11.0.15+10",
-        "urls": [
-            "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz",
-            "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz"
-        ]
-    },
-    "remotejdk11_linux_ppc64le_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk11_linux_ppc64le_for_testing",
-        "name": "remotejdk11_linux_ppc64le_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f",
-        "strip_prefix": "jdk-11.0.15+10",
-        "urls": [
-            "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz",
-            "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz"
-        ]
-    },
-    "remotejdk11_linux_s390x": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 11,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_linux_s390x",
-        "name": "remotejdk11_linux_s390x",
-        "sha256": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b",
-        "strip_prefix": "jdk-11.0.15+10",
-        "urls": [
-            "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz",
-            "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz"
-        ]
-    },
-    "remotejdk11_linux_s390x_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk11_linux_s390x_for_testing",
-        "name": "remotejdk11_linux_s390x_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b",
-        "strip_prefix": "jdk-11.0.15+10",
-        "urls": [
-            "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz",
-            "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz"
-        ]
-    },
-    "remotejdk11_macos": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 11,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_macos",
-        "name": "remotejdk11_macos",
-        "sha256": "2614e5c5de8e989d4d81759de4c333aa5b867b17ab9ee78754309ba65c7f6f55",
-        "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz"
-        ]
-    },
-    "remotejdk11_macos_aarch64": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 11,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_macos_aarch64",
-        "name": "remotejdk11_macos_aarch64",
-        "sha256": "6bb0d2c6e8a29dcd9c577bbb2986352ba12481a9549ac2c0bcfd00ed60e538d2",
-        "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk11_macos_aarch64_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk11_macos_aarch64_for_testing",
-        "name": "remotejdk11_macos_aarch64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "6bb0d2c6e8a29dcd9c577bbb2986352ba12481a9549ac2c0bcfd00ed60e538d2",
-        "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk11_macos_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk11_macos_for_testing",
-        "name": "remotejdk11_macos_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "2614e5c5de8e989d4d81759de4c333aa5b867b17ab9ee78754309ba65c7f6f55",
-        "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz"
-        ]
-    },
-    "remotejdk11_win": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 11,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_win",
-        "name": "remotejdk11_win",
-        "sha256": "a106c77389a63b6bd963a087d5f01171bd32aa3ee7377ecef87531390dcb9050",
-        "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip"
-        ]
-    },
-    "remotejdk11_win_arm64": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 11,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk11_win_arm64",
-        "name": "remotejdk11_win_arm64",
-        "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
-        "strip_prefix": "jdk-11.0.13+8",
-        "urls": [
-            "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
-        ]
-    },
-    "remotejdk11_win_arm64_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk11_win_arm64_for_testing",
-        "name": "remotejdk11_win_arm64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
-        "strip_prefix": "jdk-11.0.13+8",
-        "urls": [
-            "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
-        ]
-    },
-    "remotejdk11_win_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk11_win_for_testing",
-        "name": "remotejdk11_win_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "a106c77389a63b6bd963a087d5f01171bd32aa3ee7377ecef87531390dcb9050",
-        "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip"
-        ]
-    },
-    "remotejdk17_linux": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 17,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk17_linux",
-        "name": "remotejdk17_linux",
-        "sha256": "20c91a922eec795f3181eaa70def8b99d8eac56047c9a14bfb257c85b991df1b",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz"
-        ]
-    },
-    "remotejdk17_linux_aarch64": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 17,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk17_linux_aarch64",
-        "name": "remotejdk17_linux_aarch64",
-        "sha256": "dbc6ae9163e7ff469a9ab1f342cd1bc1f4c1fb78afc3c4f2228ee3b32c4f3e43",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-linux_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk17_linux_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk17_linux_for_testing",
-        "name": "remotejdk17_linux_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "20c91a922eec795f3181eaa70def8b99d8eac56047c9a14bfb257c85b991df1b",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz"
-        ]
-    },
-    "remotejdk17_macos": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 17,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk17_macos",
-        "name": "remotejdk17_macos",
-        "sha256": "e6317cee4d40995f0da5b702af3f04a6af2bbd55febf67927696987d11113b53",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz"
-        ]
-    },
-    "remotejdk17_macos_aarch64": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 17,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk17_macos_aarch64",
-        "name": "remotejdk17_macos_aarch64",
-        "sha256": "515dd56ec99bb5ae8966621a2088aadfbe72631818ffbba6e4387b7ee292ab09",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk17_macos_aarch64_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk17_macos_aarch64_for_testing",
-        "name": "remotejdk17_macos_aarch64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "515dd56ec99bb5ae8966621a2088aadfbe72631818ffbba6e4387b7ee292ab09",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk17_macos_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk17_macos_for_testing",
-        "name": "remotejdk17_macos_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "e6317cee4d40995f0da5b702af3f04a6af2bbd55febf67927696987d11113b53",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz"
-        ]
-    },
-    "remotejdk17_win": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 17,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk17_win",
-        "name": "remotejdk17_win",
-        "sha256": "9972c5b62a61b45785d3d956c559e079d9e91f144ec46225f5deeda214d48f27",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip"
-        ]
-    },
-    "remotejdk17_win_arm64": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 17,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk17_win_arm64",
-        "name": "remotejdk17_win_arm64",
-        "sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip"
-        ]
-    },
-    "remotejdk17_win_arm64_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk17_win_arm64_for_testing",
-        "name": "remotejdk17_win_arm64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip"
-        ]
-    },
-    "remotejdk17_win_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk17_win_for_testing",
-        "name": "remotejdk17_win_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "9972c5b62a61b45785d3d956c559e079d9e91f144ec46225f5deeda214d48f27",
-        "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip"
-        ]
-    },
-    "remotejdk18_linux": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 18,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk18_linux",
-        "name": "remotejdk18_linux",
-        "sha256": "959a94ca4097dcaabc7886784cec10dfdf2b0a3bff890ea8943cc09c5fff29cb",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_x64.tar.gz"
-        ]
-    },
-    "remotejdk18_linux_aarch64": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 18,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk18_linux_aarch64",
-        "name": "remotejdk18_linux_aarch64",
-        "sha256": "a1d5f78172f32f819d08e9043b0f82fa7af738b37c55c6ca8d6092c61d204d53",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-linux_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk18_linux_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk18_linux_for_testing",
-        "name": "remotejdk18_linux_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "959a94ca4097dcaabc7886784cec10dfdf2b0a3bff890ea8943cc09c5fff29cb",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-linux_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_x64.tar.gz"
-        ]
-    },
-    "remotejdk18_macos": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 18,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk18_macos",
-        "name": "remotejdk18_macos",
-        "sha256": "780a9aa4bda95a6793bf41d13f837c59ef915e9bfd0e0c5fd4c70e4cdaa88541",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz"
-        ]
-    },
-    "remotejdk18_macos_aarch64": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 18,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk18_macos_aarch64",
-        "name": "remotejdk18_macos_aarch64",
-        "sha256": "9595e001451e201fdf33c1952777968a3ac18fe37273bdeaea5b5ed2c4950432",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk18_macos_aarch64_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk18_macos_aarch64_for_testing",
-        "name": "remotejdk18_macos_aarch64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "9595e001451e201fdf33c1952777968a3ac18fe37273bdeaea5b5ed2c4950432",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-macosx_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_aarch64.tar.gz"
-        ]
-    },
-    "remotejdk18_macos_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk18_macos_for_testing",
-        "name": "remotejdk18_macos_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "780a9aa4bda95a6793bf41d13f837c59ef915e9bfd0e0c5fd4c70e4cdaa88541",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-macosx_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz"
-        ]
-    },
-    "remotejdk18_win": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 18,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk18_win",
-        "name": "remotejdk18_win",
-        "sha256": "6c75498163b047595386fdb909cb6d4e04282c3a81799743c5e1f9316391fe16",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_x64.zip"
-        ]
-    },
-    "remotejdk18_win_arm64": {
-        "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n                       \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n                       \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n    name = \"jni_header\",\n    srcs = [\"include/jni.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-darwin\",\n    srcs = [\"include/darwin/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-linux\",\n    srcs = [\"include/linux/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-freebsd\",\n    srcs = [\"include/freebsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-openbsd\",\n    srcs = [\"include/openbsd/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jni_md_header-windows\",\n    srcs = [\"include/win32/jni_md.h\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"java\",\n    srcs = select({\n        \":windows\": [\"bin/java.exe\"],\n        \"//conditions:default\": [\"bin/java\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jar\",\n    srcs = select({\n        \":windows\": [\"bin/jar.exe\"],\n        \"//conditions:default\": [\"bin/jar\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javac\",\n    srcs = select({\n        \":windows\": [\"bin/javac.exe\"],\n        \"//conditions:default\": [\"bin/javac\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"javadoc\",\n    srcs = select({\n        \":windows\": [\"bin/javadoc.exe\"],\n        \"//conditions:default\": [\"bin/javadoc\"],\n    }),\n    data = [\":jdk\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"xjc\",\n    srcs = [\"bin/xjc\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"wsimport\",\n    srcs = [\"bin/wsimport\"],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n    \"rt.jar\",\n    \"resources.jar\",\n    \"jsse.jar\",\n    \"jce.jar\",\n    \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n    name = \"bootclasspath\",\n    srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-bin\",\n    srcs = select({\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        \":windows\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n            exclude = [\"jre/bin/plugin2/**\"],\n        ),\n        \"//conditions:default\": glob(\n            [\"jre/bin/**\"],\n            allow_empty = True,\n        ),\n    }),\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jre-lib\",\n    srcs = glob(\n        [\"jre/lib/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jre\",\n    srcs = [\":jre-default\"],\n)\n\nfilegroup(\n    name = \"jre-default\",\n    srcs = [\n        \":jre-bin\",\n        \":jre-lib\",\n    ],\n    deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n#This folder holds security policies\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre-default\",\n    ],\n    version = 18,\n)\n\nconfig_setting(\n    name = \"windows\",\n    constraint_values = [\"@platforms//os:windows\"],\n    visibility = [\"//visibility:private\"],\n)\n",
-        "generator_function": "maybe",
-        "generator_name": "remotejdk18_win_arm64",
-        "name": "remotejdk18_win_arm64",
-        "sha256": "9b52b259516e4140ee56b91f77750667bffbc543e78ad8c39082449d4c377b54",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-win_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip"
-        ]
-    },
-    "remotejdk18_win_arm64_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk18_win_arm64_for_testing",
-        "name": "remotejdk18_win_arm64_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "9b52b259516e4140ee56b91f77750667bffbc543e78ad8c39082449d4c377b54",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-win_aarch64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip"
-        ]
-    },
-    "remotejdk18_win_for_testing": {
-        "build_file": "@local_jdk//:BUILD.bazel",
-        "generator_function": "dist_http_archive",
-        "generator_name": "remotejdk18_win_for_testing",
-        "name": "remotejdk18_win_for_testing",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "6c75498163b047595386fdb909cb6d4e04282c3a81799743c5e1f9316391fe16",
-        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-win_x64",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_x64.zip"
-        ]
-    },
-    "rules_cc": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "rules_cc",
-        "name": "rules_cc",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "58bff40957ace85c2de21ebfc72e53ed3a0d33af8cc20abd0ceec55c63be7de2",
-        "urls": [
-            "https://github.com/bazelbuild/rules_cc/releases/download/0.0.2/rules_cc-0.0.2.tar.gz"
-        ]
-    },
-    "rules_cc-0.0.2.tar.gz": {
-        "name": "rules_cc-0.0.2.tar.gz",
-        "sha256": "58bff40957ace85c2de21ebfc72e53ed3a0d33af8cc20abd0ceec55c63be7de2",
-        "urls": [
-            "https://github.com/bazelbuild/rules_cc/releases/download/0.0.2/rules_cc-0.0.2.tar.gz"
-        ]
-    },
-    "rules_java": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "rules_java",
-        "name": "rules_java",
-        "patch_cmds": [
-            "test -f BUILD && chmod u+w BUILD || true",
-            "echo >> BUILD",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "73b88f34dc251bce7bc6c472eb386a6c2b312ed5b473c81fe46855c248f792e0",
-        "strip_prefix": "",
-        "urls": [
-            "https://github.com/bazelbuild/rules_java/releases/download/5.5.1/rules_java-5.5.1.tar.gz"
-        ]
-    },
-    "rules_java-5.5.1.tar.gz": {
-        "name": "rules_java-5.5.1.tar.gz",
-        "sha256": "73b88f34dc251bce7bc6c472eb386a6c2b312ed5b473c81fe46855c248f792e0",
-        "urls": [
-            "https://github.com/bazelbuild/rules_java/releases/download/5.5.1/rules_java-5.5.1.tar.gz"
-        ]
-    },
-    "rules_jvm_external": {
-        "generator_function": "grpc_extra_deps",
-        "generator_name": "rules_jvm_external",
-        "name": "rules_jvm_external",
-        "sha256": "f36441aa876c4f6427bfb2d1f2d723b48e9d930b62662bf723ddfb8fc80f0140",
-        "strip_prefix": "rules_jvm_external-4.1",
-        "urls": [
-            "https://github.com/bazelbuild/rules_jvm_external/archive/4.1.zip"
-        ]
-    },
-    "rules_license": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "rules_license",
-        "name": "rules_license",
-        "sha256": "00ccc0df21312c127ac4b12880ab0f9a26c1cff99442dc6c5a331750360de3c3",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.3/rules_license-0.0.3.tar.gz",
-            "https://github.com/bazelbuild/rules_license/releases/download/0.0.3/rules_license-0.0.3.tar.gz"
-        ]
-    },
-    "rules_license-0.0.3.tar.gz": {
-        "name": "rules_license-0.0.3.tar.gz",
-        "sha256": "00ccc0df21312c127ac4b12880ab0f9a26c1cff99442dc6c5a331750360de3c3",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.3/rules_license-0.0.3.tar.gz",
-            "https://github.com/bazelbuild/rules_license/releases/download/0.0.3/rules_license-0.0.3.tar.gz"
-        ]
-    },
-    "rules_nodejs": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "rules_nodejs",
-        "name": "rules_nodejs",
-        "sha256": "4d48998e3fa1e03c684e6bdf7ac98051232c7486bfa412e5b5475bbaec7bb257",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-core-5.5.0.tar.gz",
-            "https://github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-core-5.5.0.tar.gz"
-        ]
-    },
-    "rules_nodejs-5.5.0.tar.gz": {
-        "name": "rules_nodejs-5.5.0.tar.gz",
-        "sha256": "0fad45a9bda7dc1990c47b002fd64f55041ea751fafc00cd34efb96107675778",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-5.5.0.tar.gz",
-            "https://github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-5.5.0.tar.gz"
-        ]
-    },
-    "rules_nodejs-core-5.5.0.tar.gz": {
-        "name": "rules_nodejs-core-5.5.0.tar.gz",
-        "sha256": "4d48998e3fa1e03c684e6bdf7ac98051232c7486bfa412e5b5475bbaec7bb257",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-core-5.5.0.tar.gz",
-            "https://github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-core-5.5.0.tar.gz"
-        ]
-    },
-    "rules_pkg": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "rules_pkg",
-        "name": "rules_pkg",
-        "sha256": "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz",
-            "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz"
-        ]
-    },
-    "rules_pkg-0.7.0.tar.gz": {
-        "name": "rules_pkg-0.7.0.tar.gz",
-        "sha256": "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz",
-            "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz"
-        ]
-    },
-    "rules_proto": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "rules_proto",
-        "name": "rules_proto",
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da",
-        "strip_prefix": "rules_proto-7e4afce6fe62dbff0a4a03450143146f9f2d7488",
-        "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
-            "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz"
-        ]
-    },
-    "six": {
-        "build_file": "@com_github_grpc_grpc//third_party:six.BUILD",
-        "generator_function": "grpc_deps",
-        "generator_name": "six",
-        "name": "six",
-        "sha256": "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
-        "urls": [
-            "https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e/six-1.16.0.tar.gz"
-        ]
-    },
-    "upb": {
-        "generator_function": "dist_http_archive",
-        "generator_name": "upb",
-        "name": "upb",
-        "sha256": "cf7f71eaff90b24c1a28b49645a9ff03a9a6c1e7134291ce70901cb63e7364b5",
-        "strip_prefix": "upb-a5477045acaa34586420942098f5fecd3570f577",
-        "urls": [
-            "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz",
-            "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz"
-        ]
-    },
-    "v1.47.0.tar.gz": {
-        "name": "v1.47.0.tar.gz",
-        "sha256": "271bdc890bf329a8de5b65819f0f9590a5381402429bca37625b63546ed19e54",
-        "urls": [
-            "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.47.0.tar.gz",
-            "https://github.com/grpc/grpc/archive/v1.47.0.tar.gz"
-        ]
-    },
-    "v1.5.2-3.zip": {
-        "name": "v1.5.2-3.zip",
-        "sha256": "366009a43cfada35015e4cc40a7efc4b7f017c6b8df5cac3f87d2478027b2056",
-        "urls": [
-            "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip",
-            "https://github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip"
-        ]
-    },
-    "v3.19.6.tar.gz": {
-        "name": "v3.19.6.tar.gz",
-        "sha256": "9a301cf94a8ddcb380b901e7aac852780b826595075577bb967004050c835056",
-        "urls": [
-            "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz",
-            "https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz"
-        ]
-    },
-    "zlib": {
-        "build_file": "@com_github_grpc_grpc//third_party:zlib.BUILD",
-        "generator_function": "grpc_deps",
-        "generator_name": "zlib",
-        "name": "zlib",
-        "sha256": "ef47b0fbe646d69a2fc5ba012cb278de8e8946a8e9649f83a807cc05559f0eff",
-        "strip_prefix": "zlib-21767c654d31d2dccdde4330529775c6c5fd5389",
-        "urls": [
-            "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/21767c654d31d2dccdde4330529775c6c5fd5389.tar.gz",
-            "https://github.com/madler/zlib/archive/21767c654d31d2dccdde4330529775c6c5fd5389.tar.gz"
-        ]
-    },
-    "zstd-jni": {
-        "build_file": "//third_party:zstd-jni/zstd-jni.BUILD",
-        "generator_function": "dist_http_archive",
-        "generator_name": "zstd-jni",
-        "name": "zstd-jni",
-        "patch_args": [
-            "-p1"
-        ],
-        "patch_cmds": [
-            "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
-            "echo >> BUILD.bazel",
-            "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
-        ],
-        "patch_cmds_win": [
-            "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
-        ],
-        "patches": [
-            "//third_party:zstd-jni/Native.java.patch"
-        ],
-        "sha256": "366009a43cfada35015e4cc40a7efc4b7f017c6b8df5cac3f87d2478027b2056",
-        "strip_prefix": "zstd-jni-1.5.2-3",
-        "urls": [
-            "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip",
-            "https://github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip"
-        ]
-    },
-    "zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz": {
-        "name": "zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz",
-        "sha256": "fc7c41a0005180d4ca471c90d01e049469e0614cf774566d4cf383caa29d1a97",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz"
-        ]
-    },
-    "zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz": {
-        "name": "zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz",
-        "sha256": "e064b61d93304012351242bf0823c6a2e41d9e28add7ea7f05378b7243d34247",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz"
-        ]
-    },
-    "zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz": {
-        "name": "zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz",
-        "sha256": "6bb0d2c6e8a29dcd9c577bbb2986352ba12481a9549ac2c0bcfd00ed60e538d2",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz"
-        ]
-    },
-    "zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz": {
-        "name": "zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz",
-        "sha256": "2614e5c5de8e989d4d81759de4c333aa5b867b17ab9ee78754309ba65c7f6f55",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz"
-        ]
-    },
-    "zulu11.56.19-ca-jdk11.0.15-win_x64.zip": {
-        "name": "zulu11.56.19-ca-jdk11.0.15-win_x64.zip",
-        "sha256": "a106c77389a63b6bd963a087d5f01171bd32aa3ee7377ecef87531390dcb9050",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip"
-        ]
-    },
-    "zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz": {
-        "name": "zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz",
-        "sha256": "dbc6ae9163e7ff469a9ab1f342cd1bc1f4c1fb78afc3c4f2228ee3b32c4f3e43",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz"
-        ]
-    },
-    "zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip": {
-        "name": "zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
-        "sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip"
-        ]
-    },
-    "zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz": {
-        "name": "zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz",
-        "sha256": "a1d5f78172f32f819d08e9043b0f82fa7af738b37c55c6ca8d6092c61d204d53",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz"
-        ]
-    },
-    "zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip": {
-        "name": "zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip",
-        "sha256": "9b52b259516e4140ee56b91f77750667bffbc543e78ad8c39082449d4c377b54",
-        "urls": [
-            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip",
-            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip"
-        ]
-    }
-}
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/strict_proto_deps.patch b/pkgs/development/tools/build-managers/bazel/bazel_6/strict_proto_deps.patch
deleted file mode 100644
index 7362de839311..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_6/strict_proto_deps.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl b/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl
-index 63f68167e4..f106e64c9b 100644
---- a/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl
-+++ b/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl
-@@ -114,6 +114,7 @@ def java_compile_for_protos(ctx, output_jar_suffix, source_jar = None, deps = []
-             exports = exports,
-             output = output_jar,
-             output_source_jar = source_jar,
-+            strict_deps = ctx.fragments.proto.strict_proto_deps(),
-             injecting_rule_kind = injecting_rule_kind,
-             javac_opts = java_toolchain.compatible_javacopts("proto"),
-             enable_jspecify = False,
-@@ -140,7 +141,7 @@ bazel_java_proto_aspect = aspect(
-     attr_aspects = ["deps", "exports"],
-     required_providers = [ProtoInfo],
-     provides = [JavaInfo, JavaProtoAspectInfo],
--    fragments = ["java"],
-+    fragments = ["java", "proto"],
- )
- 
- def bazel_java_proto_library_rule(ctx):
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/upb-clang16.patch b/pkgs/development/tools/build-managers/bazel/bazel_6/upb-clang16.patch
deleted file mode 100644
index 915585778384..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_6/upb-clang16.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/distdir_deps.bzl b/distdir_deps.bzl
-index c7fc4588e4..01e6966fca 100644
---- a/distdir_deps.bzl
-+++ b/distdir_deps.bzl
-@@ -192,6 +192,8@@ DIST_DEPS = {
-         "archive": "a5477045acaa34586420942098f5fecd3570f577.tar.gz",
-         "sha256": "cf7f71eaff90b24c1a28b49645a9ff03a9a6c1e7134291ce70901cb63e7364b5",
-         "strip_prefix": "upb-a5477045acaa34586420942098f5fecd3570f577",
-+        "patches": ["//:upb-clang16.patch"],
-+        "patch_args": ["-p1"],
-         "urls": [
-             "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz",
-             "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz",
-diff --git a/upb-clang16.patch b/upb-clang16.patch
-new file mode 100644
-index 0000000000..f81855181f
---- /dev/null
-+++ upb-clang16.patch
-@@ -0,0 +1,10 @@
-+--- a/bazel/build_defs.bzl
-++++ b/bazel/build_defs.bzl
-+@@ -43,6 +43,7 @@
-+     "-Werror=pedantic",
-+     "-Wall",
-+     "-Wstrict-prototypes",
-++    "-Wno-gnu-offsetof-extensions",
-+     # GCC (at least) emits spurious warnings for this that cannot be fixed
-+     # without introducing redundant initialization (with runtime cost):
-+     #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635
-
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/update-srcDeps.py b/pkgs/development/tools/build-managers/bazel/bazel_6/update-srcDeps.py
deleted file mode 100755
index d409a32e1389..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_6/update-srcDeps.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import json
-
-if len(sys.argv) != 2:
-    print("usage: ./this-script src-deps.json < WORKSPACE", file=sys.stderr)
-    print("Takes the bazel WORKSPACE file and reads all archives into a json dict (by evaling it as python code)", file=sys.stderr)
-    print("Hail Eris.", file=sys.stderr)
-    sys.exit(1)
-
-http_archives = []
-
-# just the kw args are the dict { name, sha256, urls … }
-def http_archive(**kw):
-    http_archives.append(kw)
-# like http_file
-def http_file(**kw):
-    http_archives.append(kw)
-
-# this is inverted from http_archive/http_file and bundles multiple archives
-def _distdir_tar(**kw):
-    for archive_name in kw['archives']:
-        http_archives.append({
-            "name": archive_name,
-            "sha256": kw['sha256'][archive_name],
-            "urls": kw['urls'][archive_name]
-        })
-
-# TODO?
-def git_repository(**kw):
-    print(json.dumps(kw, sort_keys=True, indent=4), file=sys.stderr)
-    sys.exit(1)
-
-# execute the WORKSPACE like it was python code in this module,
-# using all the function stubs from above.
-exec(sys.stdin.read())
-
-# transform to a dict with the names as keys
-d = { el['name']: el for el in http_archives }
-
-def has_urls(el):
-    return ('url' in el and el['url']) or ('urls' in el and el['urls'])
-def has_sha256(el):
-    return 'sha256' in el and el['sha256']
-bad_archives = list(filter(lambda el: not has_urls(el) or not has_sha256(el), d.values()))
-if bad_archives:
-    print('Following bazel dependencies are missing url or sha256', file=sys.stderr)
-    print('Check bazel sources for master or non-checksummed dependencies', file=sys.stderr)
-    for el in bad_archives:
-        print(json.dumps(el, sort_keys=True, indent=4), file=sys.stderr)
-    sys.exit(1)
-
-with open(sys.argv[1], "w") as f:
-    print(json.dumps(d, sort_keys=True, indent=4), file=f)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6a6ac68b11a7..caa14a364ed4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -504,6 +504,7 @@ mapAliases {
   bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17
   bareboxTools = throw "bareboxTools has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
   bazel_5 = throw "bazel_5 has been removed as it is EOL"; # Added 2025-08-09
+  bazel_6 = throw "bazel_6 has been removed as it will be EOL by the release of Nixpkgs 25.11"; # Added 2025-08-19
   BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12
   beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01
   beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99557af93b45..76acb4bb54f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6589,14 +6589,6 @@ with pkgs;
 
   bazel = bazel_7;
 
-  bazel_6 = callPackage ../development/tools/build-managers/bazel/bazel_6 {
-    inherit (darwin) sigtool;
-    buildJdk = jdk11_headless;
-    runJdk = jdk11_headless;
-    stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv else stdenv;
-    bazel_self = bazel_6;
-  };
-
   bazel_7 = callPackage ../development/tools/build-managers/bazel/bazel_7 {
     inherit (darwin) sigtool;
     buildJdk = jdk21_headless;

From 3333ada32855a58703b39ab6ff5f938070ae1677 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 18:46:42 +0000
Subject: [PATCH 3204/3724] tparse: 0.17.0 -> 0.18.0

---
 pkgs/by-name/tp/tparse/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tp/tparse/package.nix b/pkgs/by-name/tp/tparse/package.nix
index 5fe61b6088a7..2925a24cae93 100644
--- a/pkgs/by-name/tp/tparse/package.nix
+++ b/pkgs/by-name/tp/tparse/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "tparse";
-  version = "0.17.0";
+  version = "0.18.0";
 in
 buildGoModule {
   inherit pname version;
@@ -14,10 +14,10 @@ buildGoModule {
     owner = "mfridman";
     repo = "tparse";
     rev = "v${version}";
-    hash = "sha256-yU4hP+EJ+Ci3Ms0dAoSuqZFT9RRwqmN1V0x5cV+87z0=";
+    hash = "sha256-oJApKmdo8uvnm6npXpzcKBRRkZ901AH1kZqGuoLdB3U=";
   };
 
-  vendorHash = "sha256-m0YTGzzjr7/4+vTNhfPb7y2xtsI/y4Q2pbg+3yqSFaw=";
+  vendorHash = "sha256-4W6RryyQByUcwM2P2jmG2wXjNMrnpcCTSOJiw1M/Kd0=";
 
   ldflags = [
     "-s"

From e4688fcbde0e3bbe50ab8ea5e04f5bf6c405058a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 18:57:15 +0000
Subject: [PATCH 3205/3724] tombi: 0.5.6 -> 0.5.18

---
 pkgs/by-name/to/tombi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix
index 333d98c90df7..c6feb47dd225 100644
--- a/pkgs/by-name/to/tombi/package.nix
+++ b/pkgs/by-name/to/tombi/package.nix
@@ -7,19 +7,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tombi";
-  version = "0.5.6";
+  version = "0.5.18";
 
   src = fetchFromGitHub {
     owner = "tombi-toml";
     repo = "tombi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EjKvVBIiG20qsr4XmGtjx7I39/tvl9HGPza5fpbwMeg=";
+    hash = "sha256-bzoBNSAqTBbdwsbxFJ2Gosh7s9/ZLx3D7bZ+PFLV+so=";
   };
 
   # Tests relies on the presence of network
   doCheck = false;
   cargoBuildFlags = [ "--package tombi-cli" ];
-  cargoHash = "sha256-TlGGkj0YtVp00swQfgjRqmYkKHDBxEUh3e4FYh6vRgk=";
+  cargoHash = "sha256-rq7uuyHCrsSpRUeTiSbsv7HtwJUhMUigyZ2e8JOzEeI=";
 
   postPatch = ''
     substituteInPlace Cargo.toml \

From 4a6afa1e2c2abb0e5610ab9b5c3e6cdb9fa5afd3 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.be>
Date: Sun, 24 Aug 2025 20:57:47 +0200
Subject: [PATCH 3206/3724] eid-mw: 5.1.21 -> 5.1.23

https://github.com/Fedict/eid-mw/releases/tag/v5.1.23
---
 pkgs/by-name/ei/eid-mw/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ei/eid-mw/package.nix b/pkgs/by-name/ei/eid-mw/package.nix
index cc4eb1e06f46..c632cacdd15c 100644
--- a/pkgs/by-name/ei/eid-mw/package.nix
+++ b/pkgs/by-name/ei/eid-mw/package.nix
@@ -23,13 +23,13 @@
 stdenv.mkDerivation rec {
   pname = "eid-mw";
   # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.
-  version = "5.1.21";
+  version = "5.1.23";
 
   src = fetchFromGitHub {
     owner = "Fedict";
     repo = "eid-mw";
     rev = "v${version}";
-    hash = "sha256-WFXVQ2CNrEEy4R6xGiwWkAZmbvXK44FtO5w6s1ZUZpA=";
+    hash = "sha256-nZn3LSXn8g0mtorJZjE9nc8vf99buwvW1fdxHOAsIwU=";
   };
 
   postPatch = ''

From 9a34bfab4da963b2443504fec0d63389b9973117 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 19:05:22 +0000
Subject: [PATCH 3207/3724] nezha: 1.13.0 -> 1.13.1

---
 pkgs/by-name/ne/nezha/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix
index d3917939e31c..bb6fb3388bb0 100644
--- a/pkgs/by-name/ne/nezha/package.nix
+++ b/pkgs/by-name/ne/nezha/package.nix
@@ -14,7 +14,7 @@
 
 let
   pname = "nezha";
-  version = "1.13.0";
+  version = "1.13.1";
 
   frontendName = lib.removePrefix "nezha-theme-";
 
@@ -58,7 +58,7 @@ buildGo124Module {
     owner = "nezhahq";
     repo = "nezha";
     tag = "v${version}";
-    hash = "sha256-lZN9ZH70AzDCtvFnr2dxjXSKhGd/+HvN9hCydlOYpKU=";
+    hash = "sha256-BVaGlkr7lJTVewLkRoyl7JOZ4mwRaRs5JCSSFWO21Dk=";
   };
 
   proxyVendor = true;
@@ -96,7 +96,7 @@ buildGo124Module {
     GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d . -g ./cmd/dashboard/main.go -o ./cmd/dashboard/docs --parseGoList=false
   '';
 
-  vendorHash = "sha256-Pj5HfrwIuWt3Uwt2Y9Tz96B2kL7Svq5rzU1hKf/RZ4s=";
+  vendorHash = "sha256-e4FlXKE9A7WpZpafSv0Ais97cyta56ElD9pL4eIvnUk=";
 
   ldflags = [
     "-s"

From 42b6d626997c4ebe420da7ccd70352cc08681238 Mon Sep 17 00:00:00 2001
From: ibizaman <ibizaman@tiserbox.com>
Date: Wed, 16 Jul 2025 03:04:44 +0200
Subject: [PATCH 3208/3724] lldap: add options to set important secrets

---
 nixos/modules/services/databases/lldap.nix | 71 +++++++++++++++++++++
 nixos/tests/lldap.nix                      | 72 +++++++++++++++++++---
 2 files changed, 134 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/databases/lldap.nix b/nixos/modules/services/databases/lldap.nix
index a9fbe8f7e11a..1607754d7d9c 100644
--- a/nixos/modules/services/databases/lldap.nix
+++ b/nixos/modules/services/databases/lldap.nix
@@ -102,12 +102,83 @@ in
             default = "sqlite://./users.db?mode=rwc";
             example = "postgres://postgres-user:password@postgres-server/my-database";
           };
+
+          ldap_user_pass_file = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+            description = ''
+              Path to a file containing the default admin password.
+
+              If you want to update the default admin password through this setting,
+              you must set `force_ldap_user_pass_reset` to `true`.
+              Otherwise changing this setting will have no effect
+              unless this is the very first time LLDAP is started and its database is still empty.
+            '';
+          };
+
+          force_ldap_user_pass_reset = mkOption {
+            type = types.oneOf [
+              types.bool
+              (types.enum [ "always" ])
+            ];
+            default = false;
+            description = ''
+              Force reset of the admin password.
+
+              Set this setting to `"always"` to update the admin password when `ldap_user_pass_file` changes.
+              Setting to `"always"` also means any password update in the UI will be overwritten next time the service restarts.
+
+              The difference between `true` and `"always"` is the former is intended for a one time fix
+              while the latter is intended for a declarative workflow. In practice, the result
+              is the same: the password gets reset. The only practical difference is the former
+              outputs a warning message while the latter outputs an info message.
+            '';
+          };
+
+          jwt_secret_file = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+            description = ''
+              Path to a file containing the JWT secret.
+            '';
+          };
         };
       };
+
+      # TOML does not allow null values, so we use null to omit those fields
+      apply = lib.filterAttrsRecursive (_: v: v != null);
+    };
+
+    silenceForceUserPassResetWarning = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Disable warning when the admin password is set declaratively with the `ldap_user_pass_file` setting
+        but the `force_ldap_user_pass_reset` is set to `false`.
+
+        This can lead to the admin password to drift from the one given declaratively.
+        If that is okay for you and you want to silence the warning, set this option to `true`.
+      '';
     };
   };
 
   config = lib.mkIf cfg.enable {
+    warnings =
+      lib.optionals
+        (
+          (cfg.settings.ldap_user_pass_file or null) != null
+          && cfg.settings.force_ldap_user_pass_reset == false
+          && cfg.silenceForceUserPassResetWarning == false
+        )
+        [
+          ''
+            lldap: The default admin password is declared with the setting `ldap_user_pass_file`, but `force_ldap_user_pass_reset` is set to `false`.
+            This means the admin password can be changed through the UI and will drift from the one defined in your nix config.
+            It also means changing the setting `ldap_user_pass_file` will have no effect on the admin password.
+            Either set `force_ldap_user_pass_reset` to `"always"` or silence this warning by setting the option `services.lldap.silenceForceUserPassResetWarning` to `true`.
+          ''
+        ];
+
     systemd.services.lldap = {
       description = "Lightweight LDAP server (lldap)";
       wants = [ "network-online.target" ];
diff --git a/nixos/tests/lldap.nix b/nixos/tests/lldap.nix
index c2e48525a5f3..aea6b2058727 100644
--- a/nixos/tests/lldap.nix
+++ b/nixos/tests/lldap.nix
@@ -1,4 +1,7 @@
 { ... }:
+let
+  adminPassword = "mySecretPassword";
+in
 {
   name = "lldap";
 
@@ -7,23 +10,74 @@
     {
       services.lldap = {
         enable = true;
+
         settings = {
           verbose = true;
           ldap_base_dn = "dc=example,dc=com";
         };
       };
       environment.systemPackages = [ pkgs.openldap ];
+
+      specialisation = {
+        differentAdminPassword.configuration =
+          { ... }:
+          {
+            services.lldap.settings = {
+              ldap_user_pass_file = toString (pkgs.writeText "adminPasswordFile" adminPassword);
+              force_ldap_user_pass_reset = "always";
+            };
+          };
+
+        changeAdminPassword.configuration =
+          { ... }:
+          {
+            services.lldap.settings = {
+              ldap_user_pass_file = toString (pkgs.writeText "adminPasswordFile" "password");
+              force_ldap_user_pass_reset = false;
+            };
+          };
+      };
     };
 
-  testScript = ''
-    machine.wait_for_unit("lldap.service")
-    machine.wait_for_open_port(3890)
-    machine.wait_for_open_port(17170)
+  testScript =
+    { nodes, ... }:
+    let
+      specializations = "${nodes.machine.system.build.toplevel}/specialisation";
+    in
+    ''
+      machine.wait_for_unit("lldap.service")
+      machine.wait_for_open_port(3890)
+      machine.wait_for_open_port(17170)
 
-    machine.succeed("curl --location --fail http://localhost:17170/")
+      machine.succeed("curl --location --fail http://localhost:17170/")
 
-    print(
-      machine.succeed('ldapsearch -H ldap://localhost:3890 -D uid=admin,ou=people,dc=example,dc=com -b "ou=people,dc=example,dc=com" -w password')
-    )
-  '';
+      adminPassword="${adminPassword}"
+
+      def try_login(user, password, expect_success=True):
+          cmd = f'ldapsearch -H ldap://localhost:3890 -D uid={user},ou=people,dc=example,dc=com -b "ou=people,dc=example,dc=com" -w {password}'
+          code, response = machine.execute(cmd)
+          print(cmd)
+          print(response)
+          if expect_success:
+              if code != 0:
+                  raise Exception(f"Expected success, had failure {code}")
+          else:
+              if code == 0:
+                  raise Exception("Expected failure, had success")
+          return response
+
+      with subtest("default admin password"):
+          try_login("admin", "password",    expect_success=True)
+          try_login("admin", adminPassword, expect_success=False)
+
+      with subtest("different admin password"):
+          machine.succeed('${specializations}/differentAdminPassword/bin/switch-to-configuration test')
+          try_login("admin", "password",    expect_success=False)
+          try_login("admin", adminPassword, expect_success=True)
+
+      with subtest("change admin password has no effect"):
+          machine.succeed('${specializations}/differentAdminPassword/bin/switch-to-configuration test')
+          try_login("admin", "password",    expect_success=False)
+          try_login("admin", adminPassword, expect_success=True)
+    '';
 }

From 078b5bba8345d56692d19a03a9f993933ee2a991 Mon Sep 17 00:00:00 2001
From: ibizaman <ibizaman@tiserbox.com>
Date: Tue, 15 Jul 2025 18:42:42 +0200
Subject: [PATCH 3209/3724] lldap: lldap 0.6.1 -> 0.6.2

---
 nixos/modules/services/databases/lldap.nix    | 54 +++++++++++-----
 nixos/tests/lldap.nix                         |  8 ++-
 .../0001-parameterize-frontend-location.patch | 64 -------------------
 pkgs/by-name/ll/lldap/package.nix             | 30 +++++----
 4 files changed, 61 insertions(+), 95 deletions(-)
 delete mode 100644 pkgs/by-name/ll/lldap/0001-parameterize-frontend-location.patch

diff --git a/nixos/modules/services/databases/lldap.nix b/nixos/modules/services/databases/lldap.nix
index 1607754d7d9c..3738dba506a7 100644
--- a/nixos/modules/services/databases/lldap.nix
+++ b/nixos/modules/services/databases/lldap.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  utils,
   ...
 }:
 
@@ -103,6 +102,16 @@ in
             example = "postgres://postgres-user:password@postgres-server/my-database";
           };
 
+          ldap_user_pass = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+            description = ''
+              Password for default admin password.
+
+              Unsecure: Use `ldap_user_pass_file` settings instead.
+            '';
+          };
+
           ldap_user_pass_file = mkOption {
             type = types.nullOr types.str;
             default = null;
@@ -163,21 +172,36 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion =
+          (cfg.settings.ldap_user_pass_file or null) != null || (cfg.settings.ldap_user_pass or null) != null;
+        message = "lldap: Default admin user password must be set. Please set the `ldap_user_pass` or better the `ldap_user_pass_file` setting.";
+      }
+      {
+        assertion =
+          (cfg.settings.ldap_user_pass_file or null) == null || (cfg.settings.ldap_user_pass or null) == null;
+        message = "lldap: Both `ldap_user_pass` and `ldap_user_pass_file` settings should not be set at the same time. Set one to `null`.";
+      }
+    ];
+
     warnings =
-      lib.optionals
-        (
-          (cfg.settings.ldap_user_pass_file or null) != null
-          && cfg.settings.force_ldap_user_pass_reset == false
-          && cfg.silenceForceUserPassResetWarning == false
-        )
-        [
-          ''
-            lldap: The default admin password is declared with the setting `ldap_user_pass_file`, but `force_ldap_user_pass_reset` is set to `false`.
-            This means the admin password can be changed through the UI and will drift from the one defined in your nix config.
-            It also means changing the setting `ldap_user_pass_file` will have no effect on the admin password.
-            Either set `force_ldap_user_pass_reset` to `"always"` or silence this warning by setting the option `services.lldap.silenceForceUserPassResetWarning` to `true`.
-          ''
-        ];
+      lib.optionals (cfg.settings.ldap_user_pass or null != null) [
+        ''
+          lldap: Unsecure `ldap_user_pass` setting is used. Prefer `ldap_user_pass_file` instead.
+        ''
+      ]
+      ++
+        lib.optionals
+          (cfg.settings.force_ldap_user_pass_reset == false && cfg.silenceForceUserPassResetWarning == false)
+          [
+            ''
+              lldap: The `force_ldap_user_pass_reset` setting is set to `false` which means
+              the admin password can be changed through the UI and will drift from the one defined in your nix config.
+              It also means changing the setting `ldap_user_pass` or `ldap_user_pass_file` will have no effect on the admin password.
+              Either set `force_ldap_user_pass_reset` to `"always"` or silence this warning by setting the option `services.lldap.silenceForceUserPassResetWarning` to `true`.
+            ''
+          ];
 
     systemd.services.lldap = {
       description = "Lightweight LDAP server (lldap)";
diff --git a/nixos/tests/lldap.nix b/nixos/tests/lldap.nix
index aea6b2058727..8e38d4bdefa3 100644
--- a/nixos/tests/lldap.nix
+++ b/nixos/tests/lldap.nix
@@ -6,7 +6,7 @@ in
   name = "lldap";
 
   nodes.machine =
-    { pkgs, ... }:
+    { pkgs, lib, ... }:
     {
       services.lldap = {
         enable = true;
@@ -14,6 +14,8 @@ in
         settings = {
           verbose = true;
           ldap_base_dn = "dc=example,dc=com";
+
+          ldap_user_pass = "password";
         };
       };
       environment.systemPackages = [ pkgs.openldap ];
@@ -23,7 +25,8 @@ in
           { ... }:
           {
             services.lldap.settings = {
-              ldap_user_pass_file = toString (pkgs.writeText "adminPasswordFile" adminPassword);
+              ldap_user_pass = lib.mkForce null;
+              ldap_user_pass_file = lib.mkForce (toString (pkgs.writeText "adminPasswordFile" adminPassword));
               force_ldap_user_pass_reset = "always";
             };
           };
@@ -32,6 +35,7 @@ in
           { ... }:
           {
             services.lldap.settings = {
+              ldap_user_pass = lib.mkForce null;
               ldap_user_pass_file = toString (pkgs.writeText "adminPasswordFile" "password");
               force_ldap_user_pass_reset = false;
             };
diff --git a/pkgs/by-name/ll/lldap/0001-parameterize-frontend-location.patch b/pkgs/by-name/ll/lldap/0001-parameterize-frontend-location.patch
deleted file mode 100644
index c33f5a7afa10..000000000000
--- a/pkgs/by-name/ll/lldap/0001-parameterize-frontend-location.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From a09babb0cd9dd532ad2de920a2a35aa03d740dc6 Mon Sep 17 00:00:00 2001
-From: Herwig Hochleitner <herwig@bendlas.net>
-Date: Thu, 8 Aug 2024 00:29:14 +0200
-Subject: [PATCH] parameterize frontend location
-
----
- server/src/infra/tcp_server.rs | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/server/src/infra/tcp_server.rs b/server/src/infra/tcp_server.rs
-index fa5f11f..16e64c5 100644
---- a/server/src/infra/tcp_server.rs
-+++ b/server/src/infra/tcp_server.rs
-@@ -25,7 +25,7 @@ use std::sync::RwLock;
- use tracing::info;
- 
- async fn index<Backend>(data: web::Data<AppState<Backend>>) -> actix_web::Result<impl Responder> {
--    let mut file = std::fs::read_to_string(r"./app/index.html")?;
-+    let mut file = std::fs::read_to_string(r"@frontend@/index.html")?;
- 
-     if data.server_url.path() != "/" {
-         file = file.replace(
-@@ -80,7 +80,7 @@ pub(crate) fn error_to_http_response(error: TcpError) -> HttpResponse {
- async fn main_js_handler<Backend>(
-     data: web::Data<AppState<Backend>>,
- ) -> actix_web::Result<impl Responder> {
--    let mut file = std::fs::read_to_string(r"./app/static/main.js")?;
-+    let mut file = std::fs::read_to_string(r"@frontend@/static/main.js")?;
- 
-     if data.server_url.path() != "/" {
-         file = file.replace("/pkg/", format!("{}/pkg/", data.server_url.path()).as_str());
-@@ -92,12 +92,12 @@ async fn main_js_handler<Backend>(
- }
- 
- async fn wasm_handler() -> actix_web::Result<impl Responder> {
--    Ok(actix_files::NamedFile::open_async("./app/pkg/lldap_app_bg.wasm").await?)
-+    Ok(actix_files::NamedFile::open_async("@frontend@/pkg/lldap_app_bg.wasm").await?)
- }
- 
- async fn wasm_handler_compressed() -> actix_web::Result<impl Responder> {
-     Ok(
--        actix_files::NamedFile::open_async("./app/pkg/lldap_app_bg.wasm.gz")
-+        actix_files::NamedFile::open_async("@frontend@/pkg/lldap_app_bg.wasm.gz")
-             .await?
-             .customize()
-             .insert_header(header::ContentEncoding::Gzip)
-@@ -143,11 +143,11 @@ fn http_config<Backend>(
-     .service(web::resource("/pkg/lldap_app_bg.wasm").route(web::route().to(wasm_handler)))
-     .service(web::resource("/static/main.js").route(web::route().to(main_js_handler::<Backend>)))
-     // Serve the /pkg path with the compiled WASM app.
--    .service(Files::new("/pkg", "./app/pkg"))
-+    .service(Files::new("/pkg", "@frontend@/pkg"))
-     // Serve static files
--    .service(Files::new("/static", "./app/static"))
-+    .service(Files::new("/static", "@frontend@/static"))
-     // Serve static fonts
--    .service(Files::new("/static/fonts", "./app/static/fonts"))
-+    .service(Files::new("/static/fonts", "@frontend@/static/fonts"))
-     // Default to serve index.html for unknown routes, to support routing.
-     .default_service(web::route().guard(guard::Get()).to(index::<Backend>));
- }
--- 
-2.45.2
-
diff --git a/pkgs/by-name/ll/lldap/package.nix b/pkgs/by-name/ll/lldap/package.nix
index c335ffa727bf..becae0dea4a3 100644
--- a/pkgs/by-name/ll/lldap/package.nix
+++ b/pkgs/by-name/ll/lldap/package.nix
@@ -3,29 +3,30 @@
   fetchFromGitHub,
   lib,
   lldap,
+  makeWrapper,
   nixosTests,
   rustPlatform,
   rustc,
-  wasm-bindgen-cli_0_2_95,
+  wasm-bindgen-cli_0_2_100,
   wasm-pack,
   which,
 }:
 
 let
+  version = "0.6.2";
 
-  commonDerivationAttrs = rec {
+  commonDerivationAttrs = {
     pname = "lldap";
-    version = "0.6.1";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "lldap";
       repo = "lldap";
       rev = "v${version}";
-      hash = "sha256-iQ+Vv9kx/pWHoa/WZChBK+FD2r1avzWWz57bnnzRjUg=";
+      hash = "sha256-UBQWOrHika8X24tYdFfY8ETPh9zvI7/HV5j4aK8Uq+Y=";
     };
 
-    cargoHash = "sha256-qXYgr9uRswuo9hwVROUX9KUKpkzR0VEcXImbdyOgxsY=";
-
+    cargoHash = "sha256-SO7+HiiXNB/KF3fjzSMeiTPjRQq/unEfsnplx4kZv9c=";
   };
 
   frontend = rustPlatform.buildRustPackage (
@@ -35,7 +36,7 @@ let
 
       nativeBuildInputs = [
         wasm-pack
-        wasm-bindgen-cli_0_2_95
+        wasm-bindgen-cli_0_2_100
         binaryen
         which
         rustc
@@ -68,12 +69,10 @@ rustPlatform.buildRustPackage (
       "lldap_set_password"
     ];
 
-    patches = [
-      ./0001-parameterize-frontend-location.patch
-    ];
-
-    postPatch = ''
-      substituteInPlace server/src/infra/tcp_server.rs --subst-var-by frontend '${frontend}'
+    nativeBuildInputs = [ makeWrapper ];
+    postInstall = ''
+      wrapProgram $out/bin/lldap \
+        --set LLDAP_ASSETS_PATH ${frontend}
     '';
 
     passthru = {
@@ -89,7 +88,10 @@ rustPlatform.buildRustPackage (
       changelog = "https://github.com/lldap/lldap/blob/v${lldap.version}/CHANGELOG.md";
       license = licenses.gpl3Only;
       platforms = platforms.linux;
-      maintainers = with maintainers; [ bendlas ];
+      maintainers = with maintainers; [
+        bendlas
+        ibizaman
+      ];
       mainProgram = "lldap";
     };
   }

From edbbe79a6defbf900a8497357376f56541f243dc Mon Sep 17 00:00:00 2001
From: Diego <diego@strebel.com>
Date: Sun, 24 Aug 2025 21:32:04 +0200
Subject: [PATCH 3210/3724] cdncheck: 1.1.32 -> 1.1.33

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

diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index c48042bf475b..07441d7667f1 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "cdncheck";
-  version = "1.1.32";
+  version = "1.1.33";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${version}";
-    hash = "sha256-K2nuReA5rl78qrZ8e7vfR2kuB7CSRJeUILHOE9qIIuE=";
+    hash = "sha256-T00lM/jA0+3z5RViQkzACNyUqsgSzYtdgGwNli+nm7w=";
   };
 
   vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";

From 35bbf24122dd03522dc281fef72309f206429c48 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sat, 16 Aug 2025 14:12:31 -0400
Subject: [PATCH 3211/3724] nixos/tests/bees: Use autoFormat

---
 nixos/tests/bees.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/nixos/tests/bees.nix b/nixos/tests/bees.nix
index b9e38b385d3c..e13e169bff14 100644
--- a/nixos/tests/bees.nix
+++ b/nixos/tests/bees.nix
@@ -5,29 +5,33 @@
   nodes.machine =
     { config, pkgs, ... }:
     {
-      boot.initrd.postDeviceCommands = ''
-        ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux1 /dev/vdb
-        ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux2 /dev/vdc
-      '';
       virtualisation.emptyDiskImages = [
-        4096
-        4096
+        {
+          size = 4096;
+          driveConfig.deviceExtraOpts.serial = "aux1";
+        }
+        {
+          size = 4096;
+          driveConfig.deviceExtraOpts.serial = "aux2";
+        }
       ];
       virtualisation.fileSystems = {
         "/aux1" = {
           # filesystem configured to be deduplicated
-          device = "/dev/disk/by-label/aux1";
+          device = "/dev/disk/by-id/virtio-aux1";
           fsType = "btrfs";
+          autoFormat = true;
         };
         "/aux2" = {
           # filesystem not configured to be deduplicated
-          device = "/dev/disk/by-label/aux2";
+          device = "/dev/disk/by-id/virtio-aux2";
           fsType = "btrfs";
+          autoFormat = true;
         };
       };
       services.beesd.filesystems = {
         aux1 = {
-          spec = "LABEL=aux1";
+          spec = "/dev/disk/by-id/virtio-aux1";
           hashTableSizeMB = 16;
           verbosity = "debug";
         };

From d22eef5cfa0cd941529ce3ad4d9b5d91ea791043 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sat, 16 Aug 2025 14:12:31 -0400
Subject: [PATCH 3212/3724] nixos/tests/glusterfs: Use autoFormat

---
 nixos/tests/glusterfs.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/glusterfs.nix b/nixos/tests/glusterfs.nix
index e8b0a442aedc..9224797704e2 100644
--- a/nixos/tests/glusterfs.nix
+++ b/nixos/tests/glusterfs.nix
@@ -19,17 +19,18 @@ let
       networking.firewall.enable = false;
       services.glusterfs.enable = true;
 
-      # create a mount point for the volume
-      boot.initrd.postDeviceCommands = ''
-        ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
-      '';
-
-      virtualisation.emptyDiskImages = [ 1024 ];
+      virtualisation.emptyDiskImages = [
+        {
+          size = 1024;
+          driveConfig.deviceExtraOpts.serial = "data";
+        }
+      ];
 
       virtualisation.fileSystems = {
         "/data" = {
-          device = "/dev/disk/by-label/data";
+          device = "/dev/disk/by-id/virtio-data";
           fsType = "ext4";
+          autoFormat = true;
         };
       };
     };

From dc4a8f961ae3c9de85284d8d9a6850280d64f998 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sat, 16 Aug 2025 14:12:31 -0400
Subject: [PATCH 3213/3724] nixos/tests/hardened: Use autoFormat

---
 nixos/tests/hardened.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index 5a11b0a90567..f025e85e3821 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -24,14 +24,17 @@
       imports = [ ../modules/profiles/hardened.nix ];
       environment.memoryAllocator.provider = "graphene-hardened";
       nix.settings.sandbox = false;
-      virtualisation.emptyDiskImages = [ 4096 ];
-      boot.initrd.postDeviceCommands = ''
-        ${pkgs.dosfstools}/bin/mkfs.vfat -n EFISYS /dev/vdb
-      '';
+      virtualisation.emptyDiskImages = [
+        {
+          size = 4096;
+          driveConfig.deviceExtraOpts.serial = "deferred";
+        }
+      ];
       virtualisation.fileSystems = {
-        "/efi" = {
-          device = "/dev/disk/by-label/EFISYS";
+        "/deferred" = {
+          device = "/dev/disk/by-id/virtio-deferred";
           fsType = "vfat";
+          autoFormat = true;
           options = [ "noauto" ];
         };
       };
@@ -87,10 +90,9 @@
 
       # Test deferred mount
       with subtest("Deferred mounts work"):
-          machine.fail("mountpoint -q /efi")  # was deferred
-          machine.execute("mkdir -p /efi")
-          machine.succeed("mount /dev/disk/by-label/EFISYS /efi")
-          machine.succeed("mountpoint -q /efi")  # now mounted
+          machine.fail("mountpoint -q /deferred")  # was deferred
+          machine.systemctl("start deferred.mount")
+          machine.succeed("mountpoint -q /deferred")  # now mounted
 
 
       # Test Nix dæmon usage

From b9057606a5334caca626dc22277e2b85df25c04b Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sat, 16 Aug 2025 14:12:31 -0400
Subject: [PATCH 3214/3724] nixos/tests/moosefs: Use autoFormat

---
 nixos/tests/moosefs.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/moosefs.nix b/nixos/tests/moosefs.nix
index 3166d34bf14a..9b4ccba08b8a 100644
--- a/nixos/tests/moosefs.nix
+++ b/nixos/tests/moosefs.nix
@@ -22,15 +22,18 @@ let
   chunkserver =
     { pkgs, ... }:
     {
-      virtualisation.emptyDiskImages = [ 4096 ];
-      boot.initrd.postDeviceCommands = ''
-        ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
-      '';
+      virtualisation.emptyDiskImages = [
+        {
+          size = 4096;
+          driveConfig.deviceExtraOpts.serial = "data";
+        }
+      ];
 
       fileSystems = pkgs.lib.mkVMOverride {
         "/data" = {
-          device = "/dev/disk/by-label/data";
+          device = "/dev/disk/by-id/virtio-data";
           fsType = "ext4";
+          autoFormat = true;
         };
       };
 

From e31cb2587707ac6dfeebc048083e11903541c2c5 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sat, 16 Aug 2025 14:12:31 -0400
Subject: [PATCH 3215/3724] nixos/tests/orangefs: Use autoFormat

---
 nixos/tests/orangefs.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/orangefs.nix b/nixos/tests/orangefs.nix
index fe9335f74981..5c88a481b709 100644
--- a/nixos/tests/orangefs.nix
+++ b/nixos/tests/orangefs.nix
@@ -5,16 +5,19 @@ let
     { pkgs, ... }:
     {
       networking.firewall.allowedTCPPorts = [ 3334 ];
-      boot.initrd.postDeviceCommands = ''
-        ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
-      '';
 
-      virtualisation.emptyDiskImages = [ 4096 ];
+      virtualisation.emptyDiskImages = [
+        {
+          size = 4096;
+          driveConfig.deviceExtraOpts.serial = "data";
+        }
+      ];
 
       virtualisation.fileSystems = {
         "/data" = {
-          device = "/dev/disk/by-label/data";
+          device = "/dev/disk/by-id/virtio-data";
           fsType = "ext4";
+          autoFormat = true;
         };
       };
 

From e2e7ac25049773709e07f04003af7fdf8532f936 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sat, 16 Aug 2025 14:12:31 -0400
Subject: [PATCH 3216/3724] nixos/tests/saunafs: Use autoFormat

---
 nixos/tests/saunafs.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/saunafs.nix b/nixos/tests/saunafs.nix
index cc0c9e941372..0d89fb0c0b3b 100644
--- a/nixos/tests/saunafs.nix
+++ b/nixos/tests/saunafs.nix
@@ -20,15 +20,18 @@ let
   chunkserver =
     { pkgs, ... }:
     {
-      virtualisation.emptyDiskImages = [ 4096 ];
-      boot.initrd.postDeviceCommands = ''
-        ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
-      '';
+      virtualisation.emptyDiskImages = [
+        {
+          size = 4096;
+          driveConfig.deviceExtraOpts.serial = "data";
+        }
+      ];
 
       fileSystems = pkgs.lib.mkVMOverride {
         "/data" = {
-          device = "/dev/disk/by-label/data";
+          device = "/dev/disk/by-id/virtio-data";
           fsType = "ext4";
+          autoFormat = true;
         };
       };
 

From bb51c2d8fe4ba70d5400932f625c1e828708a60c Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sat, 16 Aug 2025 14:12:31 -0400
Subject: [PATCH 3217/3724] nixos/tests/snapper: Use autoFormat

---
 nixos/tests/snapper.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/snapper.nix b/nixos/tests/snapper.nix
index 4a03b85cc71d..b8a86c51d694 100644
--- a/nixos/tests/snapper.nix
+++ b/nixos/tests/snapper.nix
@@ -5,16 +5,18 @@
   nodes.machine =
     { pkgs, lib, ... }:
     {
-      boot.initrd.postDeviceCommands = ''
-        ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux /dev/vdb
-      '';
-
-      virtualisation.emptyDiskImages = [ 4096 ];
+      virtualisation.emptyDiskImages = [
+        {
+          size = 4096;
+          driveConfig.deviceExtraOpts.serial = "aux";
+        }
+      ];
 
       virtualisation.fileSystems = {
         "/home" = {
-          device = "/dev/disk/by-label/aux";
+          device = "/dev/disk/by-id/virtio-aux";
           fsType = "btrfs";
+          autoFormat = true;
         };
       };
       services.snapper.configs.home.SUBVOLUME = "/home";

From 328b6d874bd3c7fb4b9a327e73b1af072a41de44 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sat, 16 Aug 2025 14:12:31 -0400
Subject: [PATCH 3218/3724] nixos/tests/swap-file-btrfs: Use autoFormat

---
 nixos/tests/swap-file-btrfs.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/swap-file-btrfs.nix b/nixos/tests/swap-file-btrfs.nix
index d074a781ce0a..620639ae893f 100644
--- a/nixos/tests/swap-file-btrfs.nix
+++ b/nixos/tests/swap-file-btrfs.nix
@@ -5,20 +5,18 @@
   meta.maintainers = with lib.maintainers; [ oxalica ];
 
   nodes.machine =
-    { pkgs, ... }:
+    { config, pkgs, ... }:
     {
       virtualisation.useDefaultFilesystems = false;
 
       virtualisation.rootDevice = "/dev/vda";
 
-      boot.initrd.postDeviceCommands = ''
-        ${pkgs.btrfs-progs}/bin/mkfs.btrfs --label root /dev/vda
-      '';
-
+      boot.initrd.systemd.enable = true;
       virtualisation.fileSystems = {
         "/" = {
-          device = "/dev/disk/by-label/root";
+          device = config.virtualisation.rootDevice;
           fsType = "btrfs";
+          autoFormat = true;
         };
       };
 

From ec44a39a389cb2cb4f515060c307abdf29b9c4b0 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 1 Jun 2025 19:06:26 -0400
Subject: [PATCH 3219/3724] nixos/qemu-vm: Allow configuration of empty disk
 image qemu devices.

---
 nixos/modules/virtualisation/qemu-vm.nix | 56 +++++++++++++++++-------
 1 file changed, 40 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 0832ca937d32..0cc1b1146a84 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -20,25 +20,17 @@ let
 
   cfg = config.virtualisation;
 
-  opt = options.virtualisation;
-
   qemu = cfg.qemu.package;
 
   hostPkgs = cfg.host.pkgs;
 
   consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles;
 
-  driveOpts =
+  driveOptions =
     { ... }:
     {
 
       options = {
-
-        file = mkOption {
-          type = types.str;
-          description = "The file image used for this drive.";
-        };
-
         driveExtraOpts = mkOption {
           type = types.attrsOf types.str;
           default = { };
@@ -299,7 +291,9 @@ let
 
     ${lib.pipe cfg.emptyDiskImages [
       (lib.imap0 (
-        idx: size: ''
+        idx:
+        { size, ... }:
+        ''
           test -e "empty${builtins.toString idx}.qcow2" || ${qemu}/bin/qemu-img create -f qcow2 "empty${builtins.toString idx}.qcow2" "${builtins.toString size}M"
         ''
       ))
@@ -477,7 +471,20 @@ in
     };
 
     virtualisation.emptyDiskImages = mkOption {
-      type = types.listOf types.ints.positive;
+      type = types.listOf (
+        types.coercedTo types.ints.positive (size: { inherit size; }) (
+          types.submodule {
+            options.size = mkOption {
+              type = types.ints.positive;
+              description = "The size of the disk in MiB";
+            };
+            options.driveConfig = mkOption {
+              type = lib.types.submodule driveOptions;
+              description = "Drive configuration to pass to {option}`virtualisation.qemu.drives`";
+            };
+          }
+        )
+      );
       default = [ ];
       description = ''
         Additional disk images to provide to the VM. The value is
@@ -829,7 +836,18 @@ in
       };
 
       drives = mkOption {
-        type = types.listOf (types.submodule driveOpts);
+        type = types.listOf (
+          types.submodule {
+            imports = [ driveOptions ];
+
+            options = {
+              file = mkOption {
+                type = types.str;
+                description = "The file image used for this drive.";
+              };
+            };
+          }
+        );
         description = "Drives passed to qemu.";
       };
 
@@ -1310,10 +1328,16 @@ in
           driveExtraOpts.format = "raw";
         }
       ])
-      (imap0 (idx: _: {
-        file = "$(pwd)/empty${toString idx}.qcow2";
-        driveExtraOpts.werror = "report";
-      }) cfg.emptyDiskImages)
+      (imap0 (
+        idx: imgCfg:
+        lib.mkMerge [
+          {
+            file = "$(pwd)/empty${toString idx}.qcow2";
+            driveExtraOpts.werror = "report";
+          }
+          imgCfg.driveConfig
+        ]
+      ) cfg.emptyDiskImages)
     ];
 
     # By default, use mkVMOverride to enable building test VMs (e.g. via

From 93cedfd1e76dfe7bc19d773deafd22416fc81afe Mon Sep 17 00:00:00 2001
From: polyfloyd <floyd@polyfloyd.net>
Date: Sun, 24 Aug 2025 20:00:30 +0200
Subject: [PATCH 3220/3724] ansible-later: remove

---
 doc/release-notes/rl-2511.section.md      |  2 +
 pkgs/by-name/an/ansible-later/package.nix | 63 -----------------------
 pkgs/top-level/aliases.nix                |  1 +
 pkgs/top-level/python-aliases.nix         |  1 -
 4 files changed, 3 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/by-name/an/ansible-later/package.nix

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 4d1065a1e84c..7849646b84a1 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -48,6 +48,8 @@
 
 - Zig 0.12 has been removed.
 
+- `ansible-later` has been removed because it was discontinued by the author.
+
 - `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTA’s delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x).
 
 - Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases.
diff --git a/pkgs/by-name/an/ansible-later/package.nix b/pkgs/by-name/an/ansible-later/package.nix
deleted file mode 100644
index 08012dacdccd..000000000000
--- a/pkgs/by-name/an/ansible-later/package.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3Packages,
-  writableTmpDirAsHomeHook,
-}:
-
-python3Packages.buildPythonApplication rec {
-  pname = "ansible-later";
-  version = "4.0.8";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "thegeeklab";
-    repo = "ansible-later";
-    tag = "v${version}";
-    hash = "sha256-4ZHCnLeG5gr0UtKQLU+6xnTxUbxnLcmDd51Psnaa42I=";
-  };
-
-  pythonRelaxDeps = [
-    "python-json-logger"
-    "yamllint"
-  ];
-
-  build-system = with python3Packages; [
-    poetry-core
-    poetry-dynamic-versioning
-  ];
-
-  dependencies = with python3Packages; [
-    pyyaml
-    ansible-core
-    ansible
-    anyconfig
-    appdirs
-    colorama
-    jsonschema
-    nested-lookup
-    pathspec
-    python-json-logger
-    toolz
-    unidiff
-    yamllint
-  ];
-
-  nativeCheckInputs = with python3Packages; [
-    pytest-cov-stub
-    pytest-mock
-    pytestCheckHook
-    writableTmpDirAsHomeHook
-  ];
-
-  pythonImportsCheck = [ "ansiblelater" ];
-
-  meta = {
-    description = "Best practice scanner for Ansible roles and playbooks";
-    homepage = "https://github.com/thegeeklab/ansible-later";
-    changelog = "https://github.com/thegeeklab/ansible-later/releases/tag/${src.tag}";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ tboerger ];
-    mainProgram = "ansible-later";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6a6ac68b11a7..148f61549139 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -436,6 +436,7 @@ mapAliases {
   animeko = throw "'animeko' has been removed since it is unmaintained"; # Added 2025-08-20
   ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11
   ansible_2_15 = throw "Ansible 2.15 goes end of life in 2024/11 and can't be supported throughout the 24.11 release cycle"; # Added 2024-11-08
+  ansible-later = throw "ansible-later has been discontinued. The author recommends switching to ansible-lint"; # Added 2025-08-24
   antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21
   androidndkPkgs_21 = throw "androidndkPkgs_21 has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_23 = throw "androidndkPkgs_23 has been removed, as it is EOL"; # Added 2025-08-09
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b5830cf6fe21..ca1b7c303038 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -78,7 +78,6 @@ mapAliases ({
   amiibo-py = throw "amiibo-py has been removed because the upstream repository was removed"; # Added 2025-01-13
   ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30
   ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute name: `pkgs.ansible-doctor`"; # Added 2023-05-16
-  ansible-later = throw "ansible-later has been promoted to a top-level attribute name: `pkgs.ansible-later`"; # Added 2023-05-16
   ansible-lint = throw "ansible-lint has been promoted to a top-level attribute name: `pkgs.ansible-lint`"; # Added 2023-05-16
   ansible-navigator = throw "ansible-navigator has been promoted to a top-level attribute name: pkgs.ansible-navigator"; # Added 2024-08-07
   anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18

From e82d0ac21dd78d745f471c88f90d05a3809bcd58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 20:05:04 +0000
Subject: [PATCH 3221/3724] fosrl-pangolin: 1.8.0 -> 1.9.0

---
 pkgs/by-name/fo/fosrl-pangolin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix
index 5b0770516cd8..50ca8ad15e5c 100644
--- a/pkgs/by-name/fo/fosrl-pangolin/package.nix
+++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix
@@ -28,16 +28,16 @@ in
 
 buildNpmPackage (finalAttrs: {
   pname = "pangolin";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "pangolin";
     tag = finalAttrs.version;
-    hash = "sha256-Cy5COyZAH0NPQDMpKUmweYWkyupDC2sNf2CP+EJ5GiE=";
+    hash = "sha256-X8Jvk/1gDj4cqXP3vlsrhWEM5lR42FsQ0HaSNeNxTXg=";
   };
 
-  npmDepsHash = "sha256-OGqYmOO6pizcOrdaoSGgjDQgqpjU0SIw3ceh57eyjr4=";
+  npmDepsHash = "sha256-OygskQhveT9CiymOOd5gx+aR9v3nMUZj72k/om3IF/c=";
 
   nativeBuildInputs = [
     esbuild

From 4212d5f497dd9b9b1f94f9f6c71c31a80bf3c209 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 24 Aug 2025 21:15:42 +0100
Subject: [PATCH 3222/3724] libopenraw: fix the (missing `boost` dependency)

Without the chnage the build fails on `master` as
https://hydra.nixos.org/build/305803536:

    checking for Boost headers version >= 1.60.0... no
    configure: error: cannot find Boost headers version >= 1.60.0

Auto-detection fails as `boost` detector iterates over a set of
pre-defined `boost` header locations like `/usr/include`.

Let's fix it by providing an explicit path.
---
 pkgs/by-name/li/libopenraw/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/li/libopenraw/package.nix b/pkgs/by-name/li/libopenraw/package.nix
index bbf1bf94ef5a..5bf344a7f43b 100644
--- a/pkgs/by-name/li/libopenraw/package.nix
+++ b/pkgs/by-name/li/libopenraw/package.nix
@@ -40,6 +40,10 @@ stdenv.mkDerivation rec {
       -e "s,GDK_PIXBUF_DIR=.*,GDK_PIXBUF_DIR=$out/lib/gdk-pixbuf-2.0/2.10.0/loaders,"
   '';
 
+  configureFlags = [
+    "--with-boost=${lib.getDev boost}"
+  ];
+
   meta = with lib; {
     description = "RAW camerafile decoding library";
     homepage = "https://libopenraw.freedesktop.org";

From 29be71ca4946732d442320cff2c8f2450d837a84 Mon Sep 17 00:00:00 2001
From: zimward <zimward@zimward.moe>
Date: Tue, 29 Jul 2025 21:26:00 +0200
Subject: [PATCH 3223/3724] nixos/nixos-containers: actually eliminate costs if
 no containers are used

---
 doc/release-notes/rl-2511.section.md              | 3 +++
 nixos/modules/virtualisation/nixos-containers.nix | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 3871e9ad9a57..29d96c28d80f 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -85,6 +85,9 @@
   and called `setup.py` from the source tree, which is deprecated.
   The modern alternative is to configure `pyproject = true` with `build-system = [ setuptools ]`.
 
+- `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`.
+  If you use the `nixos-container` tool for imperative container management, set `boot.enableContainers = true;` explicitly.
+
 ### Deprecations {#sec-nixpkgs-release-25.11-lib-deprecations}
 
 - Create the first release note entry in this section!
diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index d692da48e30b..c86cd36ca0a3 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -518,10 +518,10 @@ in
 
     boot.enableContainers = mkOption {
       type = types.bool;
-      default = true;
+      default = config.containers != { };
+      defaultText = lib.literalExpression "config.containers != { }";
       description = ''
-        Whether to enable support for NixOS containers. Defaults to true
-        (at no cost if containers are not actually used).
+        Whether to enable support for NixOS containers.
       '';
     };
 
@@ -861,7 +861,8 @@ in
 
               # Removed option. See `checkAssertion` below for the accompanying error message.
               pkgs = mkOption { visible = false; };
-            } // networkOptions;
+            }
+            // networkOptions;
 
             config =
               let

From 13d52457bc93720f6a406d1e72d4c56fdd1d31f2 Mon Sep 17 00:00:00 2001
From: Clover Ison <clover@isons.org>
Date: Sun, 24 Aug 2025 13:17:56 -0700
Subject: [PATCH 3224/3724] maintainers: Update pyrotelekinetic

Updating my entry so my name and email match my git config. I have
removed my gpg key because I now sign commits with my ssh key instead.
---
 maintainers/maintainer-list.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 388a3a8a1332..bb7100174063 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -20815,11 +20815,10 @@
     githubId = 7279609;
   };
   pyrotelekinetic = {
-    name = "Clover";
-    email = "carter@isons.org";
+    name = "Clover Ison";
+    email = "clover@isons.org";
     github = "pyrotelekinetic";
     githubId = 29682759;
-    keys = [ { fingerprint = "5963 78DB 25AA 608D 2743  D466 5D6A D9AE 71B3 F983"; } ];
   };
   pyrox0 = {
     name = "Pyrox";

From c45e1c3ad0540a98512c748dedf0eb01921ff273 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 20:38:19 +0000
Subject: [PATCH 3225/3724] python3Packages.scikit-base: 0.12.4 -> 0.12.5

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

diff --git a/pkgs/development/python-modules/scikit-base/default.nix b/pkgs/development/python-modules/scikit-base/default.nix
index 29e4b9385bd3..146053af5015 100644
--- a/pkgs/development/python-modules/scikit-base/default.nix
+++ b/pkgs/development/python-modules/scikit-base/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "scikit-base";
-  version = "0.12.4";
+  version = "0.12.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sktime";
     repo = "skbase";
     tag = "v${version}";
-    hash = "sha256-gyI/UCPAIH3gtW/e93w0D5e/HDdLA7GpSml/IJE8ipM=";
+    hash = "sha256-+7GAMpXS013Fqm5/13Cawf3ha6IcZfZ8t/QGVImPxcQ=";
   };
 
   build-system = [ setuptools ];

From 036be304cfbf473540381c78e25d81844ef1c9df Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Sat, 16 Aug 2025 14:15:03 +1000
Subject: [PATCH 3226/3724] rPackages: CRAN and BioC update

---
 .../r-modules/bioc-experiment-packages.json   |     8 +-
 pkgs/development/r-modules/bioc-packages.json |   413 +-
 pkgs/development/r-modules/cran-packages.json | 11699 +++++++++-------
 3 files changed, 7025 insertions(+), 5095 deletions(-)

diff --git a/pkgs/development/r-modules/bioc-experiment-packages.json b/pkgs/development/r-modules/bioc-experiment-packages.json
index d7c990fb86e3..bf4594187e86 100644
--- a/pkgs/development/r-modules/bioc-experiment-packages.json
+++ b/pkgs/development/r-modules/bioc-experiment-packages.json
@@ -899,8 +899,8 @@
     },
     "PhyloProfileData": {
       "name": "PhyloProfileData",
-      "version": "1.22.0",
-      "sha256": "0zbs9aaf8xmz3is9vf54d0iib00ypa6vly5s207dbcj7l1x4h0yc",
+      "version": "1.22.3",
+      "sha256": "0bc702idbsnqs2fga4jd9qwqphc0hrv3j1hidwz26awkfwb8yv59",
       "depends": ["BiocStyle", "Biostrings", "ExperimentHub"]
     },
     "ProData": {
@@ -911,8 +911,8 @@
     },
     "ProteinGymR": {
       "name": "ProteinGymR",
-      "version": "1.2.1",
-      "sha256": "1xwva9gnfldgx2bw62zwz3wlc84k4jlnybq81nr0xqa6xdr9fycl",
+      "version": "1.2.4",
+      "sha256": "0czlxm1z5bpb096alwb96a3gwpv9244h0b8isbbfdiy70rcd21rm",
       "depends": ["AnnotationHub", "ComplexHeatmap", "ExperimentHub", "bio3d", "circlize", "dplyr", "forcats", "ggExtra", "ggdist", "gghalves", "ggplot2", "htmltools", "lifecycle", "pals", "purrr", "queryup", "r3dmol", "rlang", "spdl", "stringr", "tidyr", "tidyselect"]
     },
     "PtH2O2lipids": {
diff --git a/pkgs/development/r-modules/bioc-packages.json b/pkgs/development/r-modules/bioc-packages.json
index 498b69161211..01a85184cc29 100644
--- a/pkgs/development/r-modules/bioc-packages.json
+++ b/pkgs/development/r-modules/bioc-packages.json
@@ -227,8 +227,8 @@
     },
     "AlphaMissenseR": {
       "name": "AlphaMissenseR",
-      "version": "1.4.0",
-      "sha256": "0zxdq9afill3dkfvc0ykdr3vxz568siigxdb30n9va8kdf34iqwm",
+      "version": "1.4.2",
+      "sha256": "0q608p7mj57xi4g1n1wk00pmc5qb39acc7s4wbr9ckfsp3m8v8av",
       "depends": ["BiocBaseUtils", "BiocFileCache", "DBI", "curl", "dplyr", "duckdb", "ggplot2", "memoise", "rjsoncons", "rlang", "spdl", "whisker"]
     },
     "AlpsNMR": {
@@ -239,8 +239,8 @@
     },
     "AnVIL": {
       "name": "AnVIL",
-      "version": "1.20.1",
-      "sha256": "0sy545m0bp76kf34cwm06bfhagf4pcn3bb7d7xsyvnm7zb8p8kzl",
+      "version": "1.20.3",
+      "sha256": "1sxhfp0h2ffaasjcpaw6lcr5msxk4bpz93c95yis724b7qmq341r",
       "depends": ["AnVILBase", "BiocBaseUtils", "DT", "dplyr", "futile_logger", "htmltools", "httr", "jsonlite", "miniUI", "rapiclient", "rlang", "shiny", "tibble", "tidyr", "tidyselect", "yaml"]
     },
     "AnVILAz": {
@@ -311,8 +311,8 @@
     },
     "AnnotationHub": {
       "name": "AnnotationHub",
-      "version": "3.16.0",
-      "sha256": "02cbx21lnbayyi282f71z2rdcarcxghfmvy7hjw4jm7kyybxzzxd",
+      "version": "3.16.1",
+      "sha256": "16iw33kbkrbla9srj837ib458ddx2zaafinjya9xs27awhxdpc4p",
       "depends": ["AnnotationDbi", "BiocFileCache", "BiocGenerics", "BiocManager", "BiocVersion", "RSQLite", "S4Vectors", "curl", "dplyr", "httr", "rappdirs", "yaml"]
     },
     "AnnotationHubData": {
@@ -461,8 +461,8 @@
     },
     "BUSpaRse": {
       "name": "BUSpaRse",
-      "version": "1.22.0",
-      "sha256": "16gim1zvifj9b82c4cy0px568w73zsbfffmnjnxf1474savadll4",
+      "version": "1.22.1",
+      "sha256": "1rlzw7p8mzfw20a9njnaam2y5895ccakhvzkw70p5zsx3vf76vzv",
       "depends": ["AnnotationDbi", "AnnotationFilter", "BH", "BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "S4Vectors", "biomaRt", "dplyr", "ensembldb", "ggplot2", "magrittr", "plyranges", "stringr", "tibble", "tidyr", "zeallot"]
     },
     "BUSseq": {
@@ -527,8 +527,8 @@
     },
     "BayesSpace": {
       "name": "BayesSpace",
-      "version": "1.18.1",
-      "sha256": "0br1mkb32317v3svs4gc4rninhfw6wj55gamhxbflzykn2x7kxgc",
+      "version": "1.18.4",
+      "sha256": "11d05flnpc284k5mbymsc5l4ij81g1v3nxf92slmakwkwwm689gn",
       "depends": ["BiocFileCache", "BiocParallel", "BiocSingular", "DirichletReg", "Matrix", "RCurl", "Rcpp", "RcppArmadillo", "RcppDist", "RcppProgress", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "arrow", "assertthat", "coda", "dplyr", "ggplot2", "magrittr", "mclust", "microbenchmark", "purrr", "rhdf5", "rjson", "rlang", "scales", "scater", "scran", "tibble", "tidyr", "xgboost"]
     },
     "BeadDataPackR": {
@@ -539,9 +539,9 @@
     },
     "BgeeCall": {
       "name": "BgeeCall",
-      "version": "1.24.0",
-      "sha256": "0fjqwnaq26dzca4n3d7nsq8psim2k8vq6l6gdz11psf805k60hdl",
-      "depends": ["Biostrings", "GenomicFeatures", "biomaRt", "data_table", "dplyr", "jsonlite", "rhdf5", "rslurm", "rtracklayer", "sjmisc", "txdbmaker", "tximport"]
+      "version": "1.24.1",
+      "sha256": "0xkrl2c31hkqb6px59274sxnr10apdyyi4yl040di0rl40f23qsr",
+      "depends": ["AnnotationDbi", "Biostrings", "GenomicFeatures", "IRanges", "RCurl", "RSQLite", "curl", "data_table", "dplyr", "ggplot2", "jsonlite", "readr", "rhdf5", "rslurm", "rtracklayer", "scales", "sjmisc", "spatstat_univar", "stringr", "txdbmaker", "tximport"]
     },
     "BgeeDB": {
       "name": "BgeeDB",
@@ -671,8 +671,8 @@
     },
     "BiocFileCache": {
       "name": "BiocFileCache",
-      "version": "2.16.0",
-      "sha256": "182liy633q2aln2578saxhr83f5c64v3140g89yzblbyh4hnvql4",
+      "version": "2.16.1",
+      "sha256": "0plnrd95jxkmiy624a7wdvsb73k2sn75b2z2ylvrd8whzzk39b1y",
       "depends": ["DBI", "RSQLite", "curl", "dbplyr", "dplyr", "filelock", "httr"]
     },
     "BiocGenerics": {
@@ -1079,8 +1079,8 @@
     },
     "COTAN": {
       "name": "COTAN",
-      "version": "2.8.2",
-      "sha256": "0jp7npxiarr1q2ad8v49dndlqj0yswl5x3qrdn5vx39qflnqm1hn",
+      "version": "2.8.5",
+      "sha256": "036l4ahlq8l2xyb5rabirpyy17amvflv0pw8021af4gxg3dnf1h8",
       "depends": ["BiocSingular", "ComplexHeatmap", "Matrix", "RColorBrewer", "Rfast", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "assertthat", "circlize", "dendextend", "dplyr", "gghalves", "ggplot2", "ggrepel", "ggthemes", "parallelDist", "parallelly", "proxy", "rlang", "scales", "stringr", "tibble", "tidyr", "withr", "zeallot"]
     },
     "CPSM": {
@@ -1151,8 +1151,8 @@
     },
     "CaMutQC": {
       "name": "CaMutQC",
-      "version": "1.4.0",
-      "sha256": "1r1c454h3jssr5pzl2vp0sgkgdybpdnkcvjr2qjsqq55mn7129m8",
+      "version": "1.4.5",
+      "sha256": "0zgrq0vh6klaqqlafbdihfpi7fpv7fbl130asp9xrrqgq4v7acg5",
       "depends": ["DT", "MesKit", "clusterProfiler", "data_table", "dplyr", "ggplot2", "maftools", "org_Hs_eg_db", "stringr", "tidyr", "vcfR"]
     },
     "Cardinal": {
@@ -1267,7 +1267,7 @@
       "name": "ChIPQC",
       "version": "1.44.0",
       "sha256": "1zmxyh9a26niix1rch1xl8imc4fwzjbdbbfbcq14hqhdjha0g95p",
-      "depends": ["Biobase", "BiocGenerics", "BiocParallel", "DiffBind", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Nozzle_R1", "Rsamtools", "S4Vectors", "TxDb_Celegans_UCSC_ce6_ensGene", "TxDb_Dmelanogaster_UCSC_dm3_ensGene", "TxDb_Hsapiens_UCSC_hg18_knownGene", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Mmusculus_UCSC_mm10_knownGene", "TxDb_Mmusculus_UCSC_mm9_knownGene", "TxDb_Rnorvegicus_UCSC_rn4_ensGene", "chipseq", "ggplot2", "gtools", "reshape2"]
+      "depends": ["Biobase", "BiocGenerics", "BiocParallel", "DiffBind", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "TxDb_Celegans_UCSC_ce6_ensGene", "TxDb_Dmelanogaster_UCSC_dm3_ensGene", "TxDb_Hsapiens_UCSC_hg18_knownGene", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Mmusculus_UCSC_mm10_knownGene", "TxDb_Mmusculus_UCSC_mm9_knownGene", "TxDb_Rnorvegicus_UCSC_rn4_ensGene", "chipseq", "ggplot2", "gtools", "reshape2"]
     },
     "ChIPXpress": {
       "name": "ChIPXpress",
@@ -1439,8 +1439,8 @@
     },
     "ComplexHeatmap": {
       "name": "ComplexHeatmap",
-      "version": "2.24.0",
-      "sha256": "0l1613dzggm15l8cxdrdrwdld9gfsg47rmq3w8z00pssdk95l09a",
+      "version": "2.24.1",
+      "sha256": "0ys41vjk1wc23my7yihwzygw8rvi495npy1vpyfw9g9p2ml0xkdj",
       "depends": ["GetoptLong", "GlobalOptions", "IRanges", "RColorBrewer", "circlize", "clue", "codetools", "colorspace", "digest", "doParallel", "foreach", "matrixStats", "png"]
     },
     "CompoundDb": {
@@ -1491,6 +1491,12 @@
       "sha256": "1sjxd132r7l9p56yiakkcyysbbvw5hy0j4l3kg6liskyp6cridxx",
       "depends": ["BiocGenerics", "DBI", "HDF5Array", "S4Vectors", "Seurat", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "assertthat", "cli", "dbplyr", "dplyr", "duckdb", "glue", "httr", "purrr", "rlang", "stringr", "tibble"]
     },
+    "CyTOFpower": {
+      "name": "CyTOFpower",
+      "version": "1.14.0",
+      "sha256": "0a4qr7b095mvv9z0f75cja16zm73gpr888djn9vzmckmrmddns7f",
+      "depends": ["CytoGLMM", "DT", "SummarizedExperiment", "diffcyt", "dplyr", "ggplot2", "magrittr", "rlang", "shiny", "shinyFeedback", "shinyMatrix", "shinyjs", "tibble", "tidyr"]
+    },
     "CytoDx": {
       "name": "CytoDx",
       "version": "1.28.0",
@@ -1499,9 +1505,9 @@
     },
     "CytoGLMM": {
       "name": "CytoGLMM",
-      "version": "1.16.0",
-      "sha256": "1wp2vgvpyx5kdrdzv6mz83lwbgfi44abnjpwnh82dwzr9dz8yykg",
-      "depends": ["BiocParallel", "MASS", "Matrix", "RColorBrewer", "caret", "cowplot", "dplyr", "factoextra", "flexmix", "ggplot2", "ggrepel", "magrittr", "pheatmap", "rlang", "stringr", "strucchange", "tibble", "tidyr"]
+      "version": "1.16.1",
+      "sha256": "1c7wyvqh9if4zbcn6m73fa4dk04bbp6nb8jdd0i5psga50bjm0c9",
+      "depends": ["BiocParallel", "MASS", "Matrix", "RColorBrewer", "caret", "cowplot", "doParallel", "dplyr", "factoextra", "flexmix", "ggplot2", "ggrepel", "logging", "magrittr", "mbest", "pheatmap", "rlang", "stringr", "strucchange", "tibble", "tidyr"]
     },
     "CytoMDS": {
       "name": "CytoMDS",
@@ -1913,8 +1919,8 @@
     },
     "DropletUtils": {
       "name": "DropletUtils",
-      "version": "1.28.0",
-      "sha256": "0amxjg46a9yqkfcqg2493dl8spfsaglpv2kas38ni2w3q5wzn0yp",
+      "version": "1.28.1",
+      "sha256": "1fg8m5fcwqcdp81q0vbm7sq4c274zhnbami1c4g71rd712xhjnd0",
       "depends": ["BH", "BiocGenerics", "BiocParallel", "DelayedArray", "DelayedMatrixStats", "GenomicRanges", "HDF5Array", "IRanges", "Matrix", "R_utils", "Rcpp", "Rhdf5lib", "S4Vectors", "SingleCellExperiment", "SparseArray", "SummarizedExperiment", "beachmat", "dqrng", "edgeR", "rhdf5", "scuttle"]
     },
     "DrugVsDisease": {
@@ -2015,9 +2021,9 @@
     },
     "ENmix": {
       "name": "ENmix",
-      "version": "1.44.1",
-      "sha256": "0pv7c2pnjhan8sx5n0nn61j5wnsjalfn1b3gcpdmf8sx8rqlcb40",
-      "depends": ["AnnotationHub", "Biobase", "ExperimentHub", "IRanges", "RPMM", "S4Vectors", "SummarizedExperiment", "doParallel", "dynamicTreeCut", "foreach", "genefilter", "geneplotter", "gplots", "gtools", "illuminaio", "impute", "irlba", "matrixStats", "minfi", "quadprog"]
+      "version": "1.44.3",
+      "sha256": "0xlf0661gam69ajvy74bg09fmlm9mqq0sb4vbp0ag9lpk1wr3yzi",
+      "depends": ["AnnotationHub", "Biobase", "ExperimentHub", "GenomeInfoDb", "IRanges", "RPMM", "S4Vectors", "SummarizedExperiment", "doParallel", "dynamicTreeCut", "foreach", "genefilter", "geneplotter", "gplots", "gtools", "illuminaio", "impute", "irlba", "matrixStats", "minfi", "quadprog"]
     },
     "ERSSA": {
       "name": "ERSSA",
@@ -2123,8 +2129,8 @@
     },
     "ExperimentHub": {
       "name": "ExperimentHub",
-      "version": "2.16.0",
-      "sha256": "1kib4ajkdjic89z195y8aq9qd9r24r3wmc1anm2djp6cx9m0dvzs",
+      "version": "2.16.1",
+      "sha256": "1pgd1ai6l84y5f7s3mq58g3mpafczakm6aclzl8zi5d7yxqkd2cm",
       "depends": ["AnnotationHub", "BiocFileCache", "BiocGenerics", "BiocManager", "S4Vectors", "rappdirs"]
     },
     "ExperimentHubData": {
@@ -2633,8 +2639,8 @@
     },
     "GenomeInfoDb": {
       "name": "GenomeInfoDb",
-      "version": "1.44.0",
-      "sha256": "0rvf2v2bcspm0xlrdxcvyjfp3h5vcykmd61x073sizdsxkn4dd68",
+      "version": "1.44.1",
+      "sha256": "1vws4pal7hjq100v7z6xdrvwayk8ry0h7v0jnahhdib3dcs3nl6w",
       "depends": ["BiocGenerics", "GenomeInfoDbData", "IRanges", "S4Vectors", "UCSC_utils"]
     },
     "GenomicAlignments": {
@@ -2687,8 +2693,8 @@
     },
     "GenomicPlot": {
       "name": "GenomicPlot",
-      "version": "1.6.0",
-      "sha256": "1572hy15rajjakpclvbrikyaqabakx3r69nszqx4hxiy3nskbm22",
+      "version": "1.6.1",
+      "sha256": "0fjdnzgwlifdbh3yzlg9mqxbr0l5rg2av41jlwaici1lcjhcq9js",
       "depends": ["BiocGenerics", "ComplexHeatmap", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RCAS", "Rsamtools", "VennDiagram", "circlize", "cowplot", "dplyr", "edgeR", "genomation", "ggplot2", "ggplotify", "ggpubr", "ggsci", "ggsignif", "plyranges", "rtracklayer", "scales", "tidyr", "txdbmaker", "viridis"]
     },
     "GenomicRanges": {
@@ -2699,8 +2705,8 @@
     },
     "GenomicScores": {
       "name": "GenomicScores",
-      "version": "2.20.0",
-      "sha256": "0c1997f3xbj19wgikqfad7bd573wf7czyazilcy662jmal9dnxmw",
+      "version": "2.20.2",
+      "sha256": "0mp0vbbzwry6spjyzizw19r1azccw8ndq48zlppyj02lxspdncgy",
       "depends": ["AnnotationHub", "Biobase", "BiocFileCache", "BiocGenerics", "BiocManager", "Biostrings", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "S4Vectors", "XML", "httr", "rhdf5"]
     },
     "GenomicSuperSignature": {
@@ -2729,14 +2735,14 @@
     },
     "GeomxTools": {
       "name": "GeomxTools",
-      "version": "3.11.0",
-      "sha256": "052xdxg97zazwzwyx2ijyysny4nqpfdqbs81km2mnfph1b4d12kl",
+      "version": "3.12.0",
+      "sha256": "1v2gslpagchv0j4cgp431i8lbbkk4sfwndwdpxk61da36d83fg3k",
       "depends": ["Biobase", "BiocGenerics", "EnvStats", "GGally", "NanoStringNCTools", "S4Vectors", "SeuratObject", "data_table", "dplyr", "ggplot2", "lmerTest", "readxl", "reshape2", "rjson", "rlang", "stringr"]
     },
     "GladiaTOX": {
       "name": "GladiaTOX",
-      "version": "1.24.0",
-      "sha256": "0k80njzbcgiy4gnddg2jcs7gxj291ihpn2lc4mcxkpd04i54441m",
+      "version": "1.24.1",
+      "sha256": "0a5lhxv8n3h6jimvq12qxcb2m6ix1mi23kjgfi2lxnfz1wdma1h4",
       "depends": ["DBI", "RColorBrewer", "RCurl", "RJSONIO", "RMariaDB", "RSQLite", "XML", "brew", "data_table", "ggplot2", "ggrepel", "numDeriv", "stringr", "tidyr", "xtable"]
     },
     "Glimma": {
@@ -2933,8 +2939,8 @@
     },
     "HiCDOC": {
       "name": "HiCDOC",
-      "version": "1.10.1",
-      "sha256": "0g2j5a51m8274rv84fphwh8c7saa8bjfmh8dfa40gmcjmkpm4280",
+      "version": "1.10.2",
+      "sha256": "056i8q3fblmymlm7qdmijkdwc2gi278bb6pmh07sl2880iw7iwix",
       "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "InteractionSet", "Rcpp", "S4Vectors", "SummarizedExperiment", "cowplot", "data_table", "ggplot2", "gridExtra", "gtools", "multiHiCcompare", "pbapply"]
     },
     "HiCExperiment": {
@@ -3011,8 +3017,8 @@
     },
     "HuBMAPR": {
       "name": "HuBMAPR",
-      "version": "1.2.0",
-      "sha256": "04m7i8q8j5krs1s4bsvc94m0hv3dqqysvi2l96bab8mwdx2xipdx",
+      "version": "1.2.2",
+      "sha256": "1si9l6f029rjwa2jpgf1nmdkn8n1rfvvyhcaj6yrda6pyb0kpq8q",
       "depends": ["dplyr", "httr2", "purrr", "rjsoncons", "rlang", "stringr", "tibble", "tidyr", "whisker"]
     },
     "HubPub": {
@@ -3251,8 +3257,8 @@
     },
     "KEGGREST": {
       "name": "KEGGREST",
-      "version": "1.48.0",
-      "sha256": "10l2hbgjp96y6wz9v95c03m6kshpky4g34ycbvmhdd2xnmqrnq0f",
+      "version": "1.48.1",
+      "sha256": "0k380w6qb3yal2vyr894kkc64vlqr63214agi112vw888v71g6in",
       "depends": ["Biostrings", "httr", "png"]
     },
     "KEGGgraph": {
@@ -3299,8 +3305,8 @@
     },
     "LOBSTAHS": {
       "name": "LOBSTAHS",
-      "version": "1.33.0",
-      "sha256": "0wh2akkwkh88wfh8gg1n1zq3jgp0a9wgyv0c6fcr8z5zwprkach6",
+      "version": "1.34.1",
+      "sha256": "019m518sw3675fpj8szp5ww5jv1hl25kp7dxsk2zhfwz7pbj06cc",
       "depends": ["CAMERA", "xcms"]
     },
     "LOLA": {
@@ -3341,8 +3347,8 @@
     },
     "LimROTS": {
       "name": "LimROTS",
-      "version": "1.0.2",
-      "sha256": "09sbim99c75qk7mfzlrp4qrxvir08qz15pwwlvgv5lkwrycl154k",
+      "version": "1.0.3",
+      "sha256": "1c0yrivrz5l8if150dzvqx7cxfn582sdd0ls2a9r724xarp65hhw",
       "depends": ["BiocParallel", "S4Vectors", "SummarizedExperiment", "dplyr", "limma", "qvalue", "stringr"]
     },
     "LinTInd": {
@@ -3677,8 +3683,8 @@
     },
     "MSstats": {
       "name": "MSstats",
-      "version": "4.16.0",
-      "sha256": "1jadszjnl6cz1zz95h25hhisvxcm2qp8plq8yqmjd9a87pldvxal",
+      "version": "4.16.1",
+      "sha256": "157njfvy42826w1i0148d9sz8ac24nxgpzgbvw012w4xi7v464vy",
       "depends": ["MASS", "MSstatsConvert", "Rcpp", "RcppArmadillo", "checkmate", "data_table", "ggplot2", "ggrepel", "gplots", "htmltools", "limma", "lme4", "marray", "plotly", "preprocessCore", "statmod", "survival"]
     },
     "MSstatsBig": {
@@ -3695,8 +3701,8 @@
     },
     "MSstatsConvert": {
       "name": "MSstatsConvert",
-      "version": "1.18.0",
-      "sha256": "0hxmv5ngfkrsv5zib3jf68py333lk33mrmh3z21rb353qdkmks5n",
+      "version": "1.18.1",
+      "sha256": "181s0cg3b65pkvgwb0w11fv7j9jaf6qp8fyy37vmbfkgfc1r5ihy",
       "depends": ["checkmate", "data_table", "log4r", "stringi"]
     },
     "MSstatsLOBD": {
@@ -3713,8 +3719,8 @@
     },
     "MSstatsPTM": {
       "name": "MSstatsPTM",
-      "version": "2.10.0",
-      "sha256": "148kh0i2ksqfykx0a8jwh7nz05403r6v61ihh63lrybr74vbdc9d",
+      "version": "2.10.1",
+      "sha256": "0by9a7393c3rnam0i6qr5knw9spca0w42rx311pc9lbphh31i1i2",
       "depends": ["Biostrings", "MSstats", "MSstatsConvert", "MSstatsTMT", "Rcpp", "checkmate", "data_table", "dplyr", "ggplot2", "ggrepel", "gridExtra", "stringi", "stringr"]
     },
     "MSstatsQC": {
@@ -3761,8 +3767,8 @@
     },
     "Macarron": {
       "name": "Macarron",
-      "version": "1.12.0",
-      "sha256": "10wivwyka0jn1cc57fds85zz0ybl3q0sk9hi6dczwb4wdz8d1l6m",
+      "version": "1.12.2",
+      "sha256": "1gmpw9lf39hdvaqfwqkr3vbq32g5ik8i48njdfmq2f42kdmdpxy6",
       "depends": ["BiocParallel", "DelayedArray", "Maaslin2", "RJSONIO", "SummarizedExperiment", "WGCNA", "data_table", "dynamicTreeCut", "ff", "httr", "logging", "plyr", "psych", "xml2"]
     },
     "MantelCorr": {
@@ -4037,8 +4043,8 @@
     },
     "MsBackendMassbank": {
       "name": "MsBackendMassbank",
-      "version": "1.16.0",
-      "sha256": "1xnnlf893gq9bsv1x0ckq0qvmykb42lhrp2k1dp2d90p2va5ksnx",
+      "version": "1.16.1",
+      "sha256": "03783makc8q3jpqmxx86ymhfb3q3679m8a1bvi8ad8z4n0yx4w3i",
       "depends": ["BiocParallel", "DBI", "IRanges", "MsCoreUtils", "ProtGenerics", "S4Vectors", "Spectra"]
     },
     "MsBackendMetaboLights": {
@@ -4097,8 +4103,8 @@
     },
     "MsQuality": {
       "name": "MsQuality",
-      "version": "1.8.0",
-      "sha256": "071zkcpjc189rfxdnq7qyjb34x6ap5ln1vji9sl3fbgw62zl0v00",
+      "version": "1.8.2",
+      "sha256": "07yjack89qq6875b8f995r37wwnb0c3ldkfbx2wmi5f08i7rr687",
       "depends": ["BiocParallel", "MsExperiment", "ProtGenerics", "Spectra", "ggplot2", "htmlwidgets", "msdata", "plotly", "rlang", "rmzqc", "shiny", "shinydashboard", "stringr", "tibble", "tidyr"]
     },
     "MuData": {
@@ -4211,8 +4217,8 @@
     },
     "NanoStringNCTools": {
       "name": "NanoStringNCTools",
-      "version": "1.15.0",
-      "sha256": "1b86ji5fffnvyjsf0zj6d8cqqm49hy9nc33pmk3fsl4cbq7vxp9l",
+      "version": "1.16.1",
+      "sha256": "0bjjnxi7yp9r244mx7mcval71cn68ygbl48fzgqvic8dngymxfih",
       "depends": ["Biobase", "BiocGenerics", "Biostrings", "IRanges", "RColorBrewer", "S4Vectors", "ggbeeswarm", "ggiraph", "ggplot2", "ggthemes", "pheatmap"]
     },
     "NanoTube": {
@@ -4343,8 +4349,8 @@
     },
     "OUTRIDER": {
       "name": "OUTRIDER",
-      "version": "1.26.2",
-      "sha256": "1pnkqc85myvvxam6m8x94iixyz4smh5kps66xzqsmpgsh2v6r999",
+      "version": "1.26.3",
+      "sha256": "1kdr3ycxqxjl1ka9fij08cpj6ifmbrpmskgvr0c8wli52xkmi2vq",
       "depends": ["BBmisc", "BiocGenerics", "BiocParallel", "DESeq2", "GenomicFeatures", "GenomicRanges", "IRanges", "PRROC", "RColorBrewer", "RMTstat", "Rcpp", "RcppArmadillo", "S4Vectors", "SummarizedExperiment", "data_table", "generics", "ggplot2", "ggrepel", "heatmaply", "matrixStats", "pcaMethods", "pheatmap", "plotly", "plyr", "pracma", "reshape2", "scales", "txdbmaker"]
     },
     "OVESEG": {
@@ -4649,8 +4655,8 @@
     },
     "PharmacoGx": {
       "name": "PharmacoGx",
-      "version": "3.11.1",
-      "sha256": "00rlkl5bri5phsbhp0z80aqkpaxnw987qbggvwrzckqp03ndsp10",
+      "version": "3.12.2",
+      "sha256": "1nx93z9xzyqfqxnilkc7351bk8n8kzvf5w4hhcnc1c2wcb32zraf",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "CoreGx", "MultiAssayExperiment", "RColorBrewer", "Rcpp", "S4Vectors", "SummarizedExperiment", "boot", "caTools", "checkmate", "coop", "data_table", "downloader", "ggplot2", "jsonlite", "magicaxis", "reshape2"]
     },
     "PhenStat": {
@@ -4673,9 +4679,9 @@
     },
     "PhyloProfile": {
       "name": "PhyloProfile",
-      "version": "2.0.4",
-      "sha256": "038im33ij200mnprq3d46q65ymjqwaxk9jspjn494156qaf2w5zz",
-      "depends": ["BiocStyle", "Biostrings", "DT", "ExperimentHub", "RColorBrewer", "RCurl", "Rfast", "ape", "bioDist", "colourpicker", "data_table", "dplyr", "energy", "extrafont", "fastcluster", "ggplot2", "gridExtra", "htmlwidgets", "pbapply", "plotly", "scattermore", "shiny", "shinyBS", "shinyFiles", "shinycssloaders", "shinyjs", "stringr", "svglite", "tsne", "umap", "xml2", "yaml", "zoo"]
+      "version": "2.0.6",
+      "sha256": "0hdmz9zjl10wq6n29nvqyjfp0gr72iy115hcgfnavg1bkrfg5qv8",
+      "depends": ["BiocStyle", "Biostrings", "DT", "RColorBrewer", "RCurl", "Rfast", "ape", "bioDist", "colourpicker", "data_table", "dplyr", "energy", "extrafont", "fastcluster", "ggplot2", "gridExtra", "htmlwidgets", "pbapply", "plotly", "scattermore", "shiny", "shinyBS", "shinyFiles", "shinycssloaders", "shinyjs", "stringr", "svglite", "tsne", "umap", "xml2", "yaml", "zoo"]
     },
     "Pigengene": {
       "name": "Pigengene",
@@ -4793,8 +4799,8 @@
     },
     "QuasR": {
       "name": "QuasR",
-      "version": "1.48.0",
-      "sha256": "0qgc9zfw58d3lp1qyyl4pj9vmd2k2k2614dyg860ynwm38f4wrsy",
+      "version": "1.48.1",
+      "sha256": "12rzljfqfz5sjwji4m6hbmgrlgj039rickvyvzryzxxh7kbzqk16",
       "depends": ["AnnotationDbi", "BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicFiles", "GenomicRanges", "IRanges", "Rbowtie", "Rhtslib", "Rsamtools", "S4Vectors", "ShortRead", "rtracklayer", "txdbmaker"]
     },
     "QuaternaryProd": {
@@ -4889,8 +4895,8 @@
     },
     "RCy3": {
       "name": "RCy3",
-      "version": "2.28.0",
-      "sha256": "0y1vpyvaihh1cm7vxmsrh11i84mm9l60c1xgsqdvil17ycbnsagy",
+      "version": "2.28.1",
+      "sha256": "1r900ckrg82hdnk9f324dq1iihaf5y0nn1vhiybg7jmxbng9fcq5",
       "depends": ["BiocGenerics", "IRdisplay", "IRkernel", "RColorBrewer", "RCurl", "RJSONIO", "XML", "base64enc", "base64url", "fs", "glue", "gplots", "graph", "httr", "stringi", "uuid"]
     },
     "RCyjs": {
@@ -4951,7 +4957,7 @@
       "name": "RITAN",
       "version": "1.32.0",
       "sha256": "0ah14512zk6dixis8h61p02hawjdkbxaizar9yzlw5i59b7q0mc2",
-      "depends": ["AnnotationFilter", "BgeeDB", "EnsDb_Hsapiens_v86", "GenomicFeatures", "MCL", "RColorBrewer", "RITANdata", "STRINGdb", "dynamicTreeCut", "ensembldb", "ggplot2", "gplots", "gridExtra", "gsubfn", "hash", "igraph", "knitr", "linkcomm", "plotrix", "png", "reshape2", "sqldf"]
+      "depends": ["AnnotationFilter", "BgeeDB", "EnsDb_Hsapiens_v86", "GenomicFeatures", "MCL", "RColorBrewer", "RITANdata", "STRINGdb", "dynamicTreeCut", "ensembldb", "ggplot2", "gplots", "gridExtra", "gsubfn", "hash", "igraph", "knitr", "plotrix", "png", "reshape2", "sqldf"]
     },
     "RIVER": {
       "name": "RIVER",
@@ -5579,8 +5585,8 @@
     },
     "SCnorm": {
       "name": "SCnorm",
-      "version": "1.30.0",
-      "sha256": "1c99faz7rbfsjdxszy1xvc0rqwrimdzx2gvqd7mvawrl7cqqvcry",
+      "version": "1.30.1",
+      "sha256": "0zc5cxax45gf4k0lwhzbfignqr6f410sya2mgz8ba5nn2fx4rmrl",
       "depends": ["BiocGenerics", "BiocParallel", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "cluster", "data_table", "forcats", "ggplot2", "moments", "quantreg"]
     },
     "SDAMS": {
@@ -5783,8 +5789,8 @@
     },
     "SVP": {
       "name": "SVP",
-      "version": "1.0.1",
-      "sha256": "1w07nxa1dhrvwj9691ll3lgnmmpcj9zgzkg2adxgds7m7h9b3k3z",
+      "version": "1.0.2",
+      "sha256": "14b21sixf25g5d41sb8rlx96w4qa7aydnnfkg95ah6bi88bn65aj",
       "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "DelayedMatrixStats", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "cli", "deldir", "dplyr", "dqrng", "fastmatch", "ggfun", "ggplot2", "ggstar", "ggtree", "pracma", "rlang", "withr"]
     },
     "SWATH2stats": {
@@ -5831,8 +5837,8 @@
     },
     "SeqArray": {
       "name": "SeqArray",
-      "version": "1.48.0",
-      "sha256": "0nmd00asqqwxidydbmsr3dgy6lbnjsw9mqnv0s95b4pjsck3g8bp",
+      "version": "1.48.1",
+      "sha256": "16vysi5lwlrl3k6hrk8a2hrgz799b5cis4w2h4mcgg8bg8wsgxxc",
       "depends": ["Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "digest", "gdsfmt"]
     },
     "SeqGSEA": {
@@ -5969,8 +5975,8 @@
     },
     "SparseArray": {
       "name": "SparseArray",
-      "version": "1.8.0",
-      "sha256": "1kwb75kib4y0qbi0sv9m2lznj7iwjwjss5r3ignr4k68qy86mb48",
+      "version": "1.8.1",
+      "sha256": "0hkcaqn7nrad6db83pp615bb87yvqiqcw6k3wjhpncrp7s923p8w",
       "depends": ["BiocGenerics", "IRanges", "Matrix", "MatrixGenerics", "S4Arrays", "S4Vectors", "XVector", "matrixStats"]
     },
     "SparseSignatures": {
@@ -6197,8 +6203,8 @@
     },
     "TDbasedUFEadv": {
       "name": "TDbasedUFEadv",
-      "version": "1.8.0",
-      "sha256": "0r7cms37pzsjfj2gsgrqc1rrfifx6c2jjvl2gzkm7kij801lcbjn",
+      "version": "1.8.1",
+      "sha256": "01k0candqvkshpf6sc886c37481hh39b25ik67pvy7hqh8rg6h4r",
       "depends": ["Biobase", "DOSE", "GenomicRanges", "RTCGA", "STRINGdb", "TDbasedUFE", "enrichR", "enrichplot", "hash", "rTensor", "shiny"]
     },
     "TEKRABber": {
@@ -6335,8 +6341,8 @@
     },
     "TVTB": {
       "name": "TVTB",
-      "version": "1.34.0",
-      "sha256": "06rw3jsjkmnfh088yd31a2n7vnblg3ppgjiz2gd8skcic13asbvj",
+      "version": "1.34.1",
+      "sha256": "1w4ki0qrwk8sw5dy3020rqx8g2kymb4a17jlzl3wnadpsnn072zj",
       "depends": ["AnnotationFilter", "BiocGenerics", "BiocParallel", "Biostrings", "GGally", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "ensembldb", "ggplot2", "limma", "reshape2"]
     },
     "TargetDecoy": {
@@ -6797,8 +6803,8 @@
     },
     "alabaster_base": {
       "name": "alabaster.base",
-      "version": "1.8.0",
-      "sha256": "0jj26kgd1wi2rn89d2a2v4r559qy9jh8syh5mryxl68q38rkmvrr",
+      "version": "1.8.1",
+      "sha256": "08ia5540l5qqsk7s0jwcwabgj1mi0lrnn34sm89n6cs9c8kyga6f",
       "depends": ["Rcpp", "Rhdf5lib", "S4Vectors", "alabaster_schemas", "assorthead", "jsonlite", "jsonvalidate", "rhdf5"]
     },
     "alabaster_bumpy": {
@@ -6911,8 +6917,8 @@
     },
     "annotate": {
       "name": "annotate",
-      "version": "1.86.0",
-      "sha256": "1n5x0ia1138ghc3xii7cfxny3z1fxgbzj92p0qdprsf6m6fmn0i8",
+      "version": "1.86.1",
+      "sha256": "04xnr350xpb6wgrnafyis6yvzij69ybwvzcrld1anlfkky5iybkf",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "XML", "httr", "xtable"]
     },
     "annotationTools": {
@@ -7043,8 +7049,8 @@
     },
     "bambu": {
       "name": "bambu",
-      "version": "3.10.0",
-      "sha256": "0f2rznakgkbqd8i7zgmdgjwwmdz69hkh1fr8jv1n7d05yxyc2m6l",
+      "version": "3.10.1",
+      "sha256": "0asx4b1kw7zp9yyw3lk1ibb1c559y9s69klrsqx4d0radkcb61p4",
       "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rcpp", "RcppArmadillo", "Rsamtools", "S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "tidyr", "xgboost"]
     },
     "bamsignals": {
@@ -7145,8 +7151,8 @@
     },
     "bedbaser": {
       "name": "bedbaser",
-      "version": "1.0.0",
-      "sha256": "0lvaxshgarcx4shkm87ifphzwydaxp3vgw4hswcjlm1qyvrbik88",
+      "version": "1.0.3",
+      "sha256": "1h52xsw5bvzjj633wz9jxd4z3b75bw8w86p9vnb7dc9kcrzanp3l",
       "depends": ["AnVIL", "BiocFileCache", "GenomeInfoDb", "GenomicRanges", "R_utils", "dplyr", "httr", "purrr", "rlang", "rtracklayer", "stringr", "tibble", "tidyr"]
     },
     "beer": {
@@ -7157,8 +7163,8 @@
     },
     "benchdamic": {
       "name": "benchdamic",
-      "version": "1.14.2",
-      "sha256": "0yhzv6c7bcswp56pjr3ssgls2h4fpg8klx1wdy125f7fzbs8hkln",
+      "version": "1.14.3",
+      "sha256": "0xc05qghdr2xynf5gk695xbpb5hj0wrfcjps34h8cqd249by2dk6",
       "depends": ["ALDEx2", "ANCOMBC", "BiocParallel", "DESeq2", "GUniFrac", "MAST", "MGLM", "Maaslin2", "MicrobiomeStat", "NOISeq", "RColorBrewer", "Seurat", "SummarizedExperiment", "TreeSummarizedExperiment", "corncob", "cowplot", "dearseq", "edgeR", "ggdendro", "ggplot2", "ggridges", "limma", "lme4", "maaslin3", "metagenomeSeq", "microbiome", "mixOmics", "phyloseq", "plyr", "reshape2", "tidytext", "zinbwave"]
     },
     "betaHMM": {
@@ -7295,8 +7301,8 @@
     },
     "biosigner": {
       "name": "biosigner",
-      "version": "1.36.0",
-      "sha256": "1gx5v9jmmgfdxqyfzihfi0l0azn42i9f3mqd7wxfc0fmbv5nzixr",
+      "version": "1.36.4",
+      "sha256": "1yrr8lsg05m8y57snsk3jpzj29kfl2264gr3d49lsmsnpnrg9h6h",
       "depends": ["Biobase", "MultiAssayExperiment", "MultiDataSet", "SummarizedExperiment", "e1071", "randomForest", "ropls"]
     },
     "biotmle": {
@@ -7373,8 +7379,8 @@
     },
     "broadSeq": {
       "name": "broadSeq",
-      "version": "1.2.1",
-      "sha256": "11h5qshrarpzz9v4pzpzmrhcfwg2hfq2gfp4hxsxfhbi8w4j9grp",
+      "version": "1.2.4",
+      "sha256": "00xqpr915yhimmimbr43010ljdj7fiq613a3yq6haxvkqjpv83ri",
       "depends": ["BiocStyle", "DELocal", "DESeq2", "EBSeq", "NOISeq", "SummarizedExperiment", "clusterProfiler", "dplyr", "edgeR", "forcats", "genefilter", "ggplot2", "ggplotify", "ggpubr", "pheatmap", "plyr", "purrr", "sechm", "stringr"]
     },
     "bsseq": {
@@ -7529,8 +7535,8 @@
     },
     "cellxgenedp": {
       "name": "cellxgenedp",
-      "version": "1.12.0",
-      "sha256": "0myv4zgnxzay5xn462l6nzixb57l544rqpiiksfqz631ng6f1zp3",
+      "version": "1.12.1",
+      "sha256": "0gc7vp94vrrqqdxmcdbvvarx3g3196jyzcpwaap8f5glkfvwc8yz",
       "depends": ["DT", "cli", "curl", "dplyr", "httr", "rjsoncons", "shiny"]
     },
     "censcyt": {
@@ -7751,8 +7757,8 @@
     },
     "cn_farms": {
       "name": "cn.farms",
-      "version": "1.55.0",
-      "sha256": "061qxr4pbl31kd6f3dhjazgmr23m48ng3vszvm0rxdz2bbzgq0yr",
+      "version": "1.56.2",
+      "sha256": "1q35z7mywmrkibgbhaddyrk78wbnyvlkxv43bsa59bdcsbw7ns6m",
       "depends": ["Biobase", "DBI", "DNAcopy", "affxparser", "ff", "lattice", "oligo", "oligoClasses", "preprocessCore", "snow"]
     },
     "cn_mops": {
@@ -8147,9 +8153,9 @@
     },
     "dandelionR": {
       "name": "dandelionR",
-      "version": "1.0.0",
-      "sha256": "074ffacb89bg59byslfq27r2fp7ldp5647hdikd4ihn68bm4xbvv",
-      "depends": ["BiocGenerics", "MASS", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "bluster", "destiny", "igraph", "miloR", "purrr", "rlang", "spam", "uwot"]
+      "version": "1.0.2",
+      "sha256": "0m8p003mgf03n69z0bcbid2insskg04vhhrvrppsciqcc9a4rbb4",
+      "depends": ["BiocGenerics", "MASS", "Matrix", "RANN", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "bluster", "destiny", "igraph", "miloR", "purrr", "rlang", "spam", "uwot"]
     },
     "dar": {
       "name": "dar",
@@ -8197,7 +8203,7 @@
       "name": "debCAM",
       "version": "1.26.0",
       "sha256": "1sh8vbhgrkk1xfk139jxi88s2z70pnr4ji2pnb2gb3s5013zrhk8",
-      "depends": ["Biobase", "BiocParallel", "DMwR2", "NMF", "SummarizedExperiment", "apcluster", "corpcor", "geometry", "nnls", "pcaPP", "rJava"]
+      "depends": ["Biobase", "BiocParallel", "NMF", "SummarizedExperiment", "apcluster", "corpcor", "geometry", "nnls", "pcaPP", "rJava"]
     },
     "debrowser": {
       "name": "debrowser",
@@ -8225,8 +8231,8 @@
     },
     "deconvR": {
       "name": "deconvR",
-      "version": "1.14.0",
-      "sha256": "076ay8fcihsk8y4kab7wdh96p6lpx4w3n78l3bnry2xnmywyxchk",
+      "version": "1.14.2",
+      "sha256": "04s0g9p2dvcq2pin9j80pqcrmbfvvajj6s3d000sd2afa7b5rpb2",
       "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "assertthat", "data_table", "dplyr", "e1071", "foreach", "magrittr", "matrixStats", "methylKit", "minfi", "nnls", "quadprog", "rsq", "tidyr"]
     },
     "decoupleR": {
@@ -8405,8 +8411,8 @@
     },
     "doubletrouble": {
       "name": "doubletrouble",
-      "version": "1.8.0",
-      "sha256": "1m26a8m6sqsd1s2b6g1k7qb9n3ndrvlhz64py3fgqd38d1h47vpg",
+      "version": "1.8.1",
+      "sha256": "1a08sd6a56h75km9y306a7gfhlnv5m2zzs1kaixwqk2v2lfvq6g2",
       "depends": ["AnnotationDbi", "Biostrings", "GenomicFeatures", "GenomicRanges", "MSA2dist", "ggplot2", "mclust", "rlang", "syntenet"]
     },
     "drawProteins": {
@@ -8477,8 +8483,8 @@
     },
     "edgeR": {
       "name": "edgeR",
-      "version": "4.6.2",
-      "sha256": "0gy5z5h2z2al9iggly1m1p3clqw3xycix47bxx0h8az7s6jyrz4p",
+      "version": "4.6.3",
+      "sha256": "139vnp9dgpw02nbpa69bcl7jx3nw16l0w2gj3ljq4cgk5amwdplk",
       "depends": ["limma", "locfit"]
     },
     "eds": {
@@ -8507,14 +8513,14 @@
     },
     "enrichViewNet": {
       "name": "enrichViewNet",
-      "version": "1.6.0",
-      "sha256": "0handzfkmnq0s7dy0h9dc4a0x98r1g2jf9hhp38snyxzlszjgkqx",
+      "version": "1.6.1",
+      "sha256": "0qi63zwn78506gryf438w3fdcv0m98v4db5v6wv44f35r74s1khv",
       "depends": ["DOSE", "RCy3", "enrichplot", "gprofiler2", "jsonlite", "strex", "stringr"]
     },
     "enrichplot": {
       "name": "enrichplot",
-      "version": "1.28.2",
-      "sha256": "05fh0n4ig50q0lzvhs0j1qa9ma6mkksnw52df0fzvnmvhbiyybqh",
+      "version": "1.28.4",
+      "sha256": "0wlhx0djh3by2949y7gmjjiscgh7mdvzm2al7p81vxjrgaw221k7",
       "depends": ["DOSE", "GOSemSim", "RColorBrewer", "aplot", "ggfun", "ggnewscale", "ggplot2", "ggrepel", "ggtangle", "ggtree", "igraph", "magrittr", "plyr", "purrr", "reshape2", "rlang", "scatterpie", "yulab_utils"]
     },
     "ensembldb": {
@@ -8717,8 +8723,8 @@
     },
     "fastreeR": {
       "name": "fastreeR",
-      "version": "1.12.2",
-      "sha256": "15q6mkka780kfydg2j8s5kk82gkqj8qaa7py6k9k85mq08iyqq6w",
+      "version": "1.12.5",
+      "sha256": "1ydbj10aksv1amkh7wpz76g1kx0r947qz4gxxindic8wk4kilcsn",
       "depends": ["R_utils", "ape", "data_table", "dynamicTreeCut", "rJava", "stringr"]
     },
     "fastseg": {
@@ -8765,8 +8771,8 @@
     },
     "fgsea": {
       "name": "fgsea",
-      "version": "1.34.0",
-      "sha256": "0q04whwss0yrqq7yvizkcp1sj06p4zk1007y72djv73f5hzdvraa",
+      "version": "1.34.2",
+      "sha256": "1wq3n3pqjmcf8zj8cj5fkkyz5mf4ii656qj7vbny6vf46jl7bq5f",
       "depends": ["BH", "BiocParallel", "Matrix", "Rcpp", "cowplot", "data_table", "fastmatch", "ggplot2", "scales"]
     },
     "findIPs": {
@@ -9089,8 +9095,8 @@
     },
     "gdsfmt": {
       "name": "gdsfmt",
-      "version": "1.44.0",
-      "sha256": "1zp7ydzg492ifnlypc0ypfi6a0jq6c1gv5ckwcwzwmqfwavk5jfq",
+      "version": "1.44.1",
+      "sha256": "0xyhjlpasrncyjz3hh3lx8midy52z1b6dp59bv383wa621fb0j0b",
       "depends": []
     },
     "geNetClassifier": {
@@ -9107,8 +9113,8 @@
     },
     "gemma_R": {
       "name": "gemma.R",
-      "version": "3.4.4",
-      "sha256": "10snazyyvy285dqm6fmr6s3znszgqqik7fiyvka85v0srz1x1g8c",
+      "version": "3.4.5",
+      "sha256": "00n90ysznnx3gv6j6646f7wjjfia56ig4d2qayq058shxwdcays3",
       "depends": ["Biobase", "R_utils", "S4Vectors", "SummarizedExperiment", "assertthat", "base64enc", "bit64", "data_table", "digest", "glue", "httr", "jsonlite", "kableExtra", "lubridate", "magrittr", "memoise", "rappdirs", "rlang", "stringr", "tibble", "tidyr"]
     },
     "genArise": {
@@ -9233,8 +9239,8 @@
     },
     "gg4way": {
       "name": "gg4way",
-      "version": "1.6.0",
-      "sha256": "1igh50yhkj86va1wbx3jzyqxp83cr4sqdgi3n90295hfxaxxa609",
+      "version": "1.6.1",
+      "sha256": "1hlriz5hr31dn62dld1f6cg6dbr0gbahq7aavy4shchgbsnj6cji",
       "depends": ["DESeq2", "dplyr", "edgeR", "ggplot2", "ggrepel", "glue", "janitor", "limma", "magrittr", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr"]
     },
     "ggbio": {
@@ -9263,14 +9269,14 @@
     },
     "ggmsa": {
       "name": "ggmsa",
-      "version": "1.14.0",
-      "sha256": "0hd5vvx3p767q2fxp4rwq5ds348ki29b0qkmk67mmlflh8cz8p8f",
-      "depends": ["Biostrings", "R4RNA", "RColorBrewer", "aplot", "dplyr", "ggalt", "ggforce", "ggplot2", "ggtree", "magrittr", "seqmagick", "statebins", "tidyr"]
+      "version": "1.14.1",
+      "sha256": "0abaqsxv9b2bniw74dg0nwianxi76z8mlnnjjlrfdbxivph9ccyw",
+      "depends": ["Biostrings", "R4RNA", "RColorBrewer", "aplot", "dplyr", "ggforce", "ggfun", "ggplot2", "ggtree", "magrittr", "seqmagick", "tidyr"]
     },
     "ggsc": {
       "name": "ggsc",
-      "version": "1.6.0",
-      "sha256": "1xqrd0ghkav7wpb1s4wb42ic2h313varf3b4w0bqnaly3r05h9wr",
+      "version": "1.6.1",
+      "sha256": "0avni6b37snrpw9jldzmibklrz52jp46j680w8pgprbasfy27313",
       "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "RcppParallel", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "cli", "dplyr", "ggfun", "ggplot2", "rlang", "scales", "scattermore", "tibble", "tidydr", "tidyr", "yulab_utils"]
     },
     "ggseqalign": {
@@ -9287,8 +9293,8 @@
     },
     "ggtree": {
       "name": "ggtree",
-      "version": "3.16.0",
-      "sha256": "06wvqh66c0gf4xc9c65qr75w0rl99aqc4c4hks55axzb5q84yg6s",
+      "version": "3.16.3",
+      "sha256": "06ij3l921vazzcv07jbggsv1mb9ikgqfwhc9g20yjz7y0xcgmclj",
       "depends": ["ape", "aplot", "cli", "dplyr", "ggfun", "ggplot2", "magrittr", "purrr", "rlang", "scales", "tidyr", "tidytree", "treeio", "yulab_utils"]
     },
     "ggtreeDendro": {
@@ -9407,8 +9413,8 @@
     },
     "graper": {
       "name": "graper",
-      "version": "1.23.0",
-      "sha256": "1xaa9656ng3fs94qhn761rg6ac4z5rypm1rvw5p4sbs487mdv0rs",
+      "version": "1.24.2",
+      "sha256": "067ppcg89dpi10qkqcnyyd7b3r15jwhmcczjzq2z2f8q4ahplp05",
       "depends": ["BH", "Matrix", "Rcpp", "RcppArmadillo", "cowplot", "ggplot2", "matrixStats"]
     },
     "graph": {
@@ -9797,9 +9803,9 @@
     },
     "immApex": {
       "name": "immApex",
-      "version": "1.2.1",
-      "sha256": "04ns6k3054mw1gjvvyb4rpfvpah0s9r1nn5wx7ylnx92qrrp3qpz",
-      "depends": ["Rcpp", "SingleCellExperiment", "hash", "httr", "igraph", "keras3", "magrittr", "matrixStats", "reticulate", "rvest", "stringi", "stringr", "tensorflow"]
+      "version": "1.2.5",
+      "sha256": "1045g2ag0y84bcpcd26y58rrifx4q38gjy6gman9xlxnjxg0v221",
+      "depends": ["SingleCellExperiment", "basilisk", "hash", "httr", "keras3", "magrittr", "matrixStats", "rvest", "stringi", "stringr", "tensorflow"]
     },
     "immunoClust": {
       "name": "immunoClust",
@@ -9905,8 +9911,8 @@
     },
     "jazzPanda": {
       "name": "jazzPanda",
-      "version": "1.0.0",
-      "sha256": "0wskp62qny21r6mfa8qa9bxhand3hzz80zbkwsmjm56ba7930cm9",
+      "version": "1.0.1",
+      "sha256": "0l24f6w6kv7g08gjisqpl48cgd6zx5lzb14zi8j09l691gls1xgz",
       "depends": ["BiocParallel", "BumpyMatrix", "SpatialExperiment", "caret", "doParallel", "dplyr", "foreach", "glmnet", "magrittr", "spatstat_geom"]
     },
     "karyoploteR": {
@@ -9995,8 +10001,8 @@
     },
     "limma": {
       "name": "limma",
-      "version": "3.64.1",
-      "sha256": "0l20jfcny1mjn4wykaqxsgabsfwpidk4pxicnqflqwidhq9cxski",
+      "version": "3.64.3",
+      "sha256": "0vbm8cbnb9k1bx6bslib9lnm77fkf4zh07ixy1ybgbyspcq6liih",
       "depends": ["statmod"]
     },
     "limmaGUI": {
@@ -10007,8 +10013,8 @@
     },
     "limpa": {
       "name": "limpa",
-      "version": "1.0.3",
-      "sha256": "1zzv88m0mnlx0mzq6ya5haa0fw2p9grnjklmp6z9k9fa67ndlizf",
+      "version": "1.0.5",
+      "sha256": "038qx6gniisgbjmiry7gidrg37vh2ddjsa4ydhv0843sjylpx6yw",
       "depends": ["data_table", "limma", "statmod"]
     },
     "limpca": {
@@ -10495,7 +10501,7 @@
       "name": "miRSM",
       "version": "2.4.0",
       "sha256": "0vkb5f9nycaijbk3ydalxc5f26l92iaxw69qywg99br7wl1kjxdv",
-      "depends": ["BiBitR", "BicARE", "Biobase", "DOSE", "GFA", "GSEABase", "MCL", "MatrixCorrelation", "NMF", "PMA", "Rcpp", "ReactomePA", "SOMbrero", "SummarizedExperiment", "WGCNA", "biclust", "clusterProfiler", "dbscan", "dynamicTreeCut", "energy", "fabia", "flashClust", "iBBiG", "igraph", "isa2", "linkcomm", "mclust", "org_Hs_eg_db", "ppclust", "rqubic", "s4vd", "subspace"]
+      "depends": ["BiBitR", "BicARE", "Biobase", "DOSE", "GFA", "GSEABase", "MCL", "MatrixCorrelation", "NMF", "PMA", "Rcpp", "ReactomePA", "SOMbrero", "SummarizedExperiment", "WGCNA", "biclust", "clusterProfiler", "dbscan", "dynamicTreeCut", "energy", "fabia", "flashClust", "iBBiG", "igraph", "isa2", "mclust", "org_Hs_eg_db", "ppclust", "rqubic"]
     },
     "miRcomp": {
       "name": "miRcomp",
@@ -10507,12 +10513,12 @@
       "name": "miRspongeR",
       "version": "2.12.0",
       "sha256": "1lxd782xrdvd68h13795142930nrvkcg3h1b06h1x39573gs34dr",
-      "depends": ["DOSE", "MCL", "Rcpp", "ReactomePA", "SPONGE", "clusterProfiler", "corpcor", "doParallel", "foreach", "igraph", "linkcomm", "org_Hs_eg_db", "survival"]
+      "depends": ["DOSE", "MCL", "Rcpp", "ReactomePA", "SPONGE", "clusterProfiler", "corpcor", "doParallel", "foreach", "igraph", "org_Hs_eg_db", "survival"]
     },
     "mia": {
       "name": "mia",
-      "version": "1.16.0",
-      "sha256": "0mhf6d4yw3qsxjlq1smsfb7ywhbknvzi01s3q1k9d005w7wk24ai",
+      "version": "1.16.1",
+      "sha256": "1b2g3g1qwg4gcl6a77wzxmx2c1mcbvfyy1135xkd8nicdyslbq8n",
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "DECIPHER", "DelayedArray", "DelayedMatrixStats", "DirichletMultinomial", "IRanges", "MASS", "MatrixGenerics", "MultiAssayExperiment", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TreeSummarizedExperiment", "ape", "bluster", "decontam", "dplyr", "rbiom", "rlang", "scater", "scuttle", "stringr", "tibble", "tidyr", "vegan"]
     },
     "miaDash": {
@@ -10877,8 +10883,8 @@
     },
     "musicatk": {
       "name": "musicatk",
-      "version": "2.2.0",
-      "sha256": "1sgxl4ar4ql3ajmpay1jgcid1yppmvvclic8gjhfp62im3blhib5",
+      "version": "2.2.1",
+      "sha256": "115zg1ypa4jks26zg7rwg8a3pk1nh43c3760dfbk89szyry4vxq9",
       "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "BSgenome_Mmusculus_UCSC_mm10", "BSgenome_Mmusculus_UCSC_mm9", "Biostrings", "ComplexHeatmap", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "MASS", "MCMCprecision", "Matrix", "NMF", "S4Vectors", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "VariantAnnotation", "cluster", "data_table", "decompTumor2Sig", "dplyr", "factoextra", "ggplot2", "ggpubr", "ggrepel", "gridExtra", "gtools", "maftools", "magrittr", "matrixTests", "philentropy", "plotly", "rlang", "scales", "shiny", "stringi", "stringr", "tibble", "tidyr", "tidyverse", "topicmodels", "uwot"]
     },
     "mygene": {
@@ -11075,9 +11081,9 @@
     },
     "omXplore": {
       "name": "omXplore",
-      "version": "1.2.0",
-      "sha256": "1bqjd858vv4rzpfcsxql9dfbcq3b80l5xfkf81zj9ygmfhwz6hn9",
-      "depends": ["DT", "FactoMineR", "MSnbase", "MultiAssayExperiment", "PSMatch", "RColorBrewer", "SummarizedExperiment", "bs4Dash", "dendextend", "dplyr", "factoextra", "gplots", "highcharter", "htmlwidgets", "nipals", "shiny", "shinyBS", "shinyjqui", "shinyjs", "thematic", "tibble", "tidyr", "vioplot", "visNetwork", "waiter"]
+      "version": "1.2.2",
+      "sha256": "0x9ag6brzimbfddi5v6q60bhp57zvrpkhk8cc2shzbm1j11fhnyn",
+      "depends": ["DT", "FactoMineR", "MSnbase", "MultiAssayExperiment", "PSMatch", "RColorBrewer", "SummarizedExperiment", "dendextend", "dplyr", "factoextra", "gplots", "highcharter", "htmlwidgets", "nipals", "shiny", "shinyBS", "shinyjqui", "shinyjs", "tibble", "tidyr", "vioplot", "visNetwork"]
     },
     "omada": {
       "name": "omada",
@@ -11141,8 +11147,8 @@
     },
     "ontoProc": {
       "name": "ontoProc",
-      "version": "2.2.0",
-      "sha256": "0xk5gvbf8jkkkxjcmgycprr8hngl4s005id1n9qhmxfzjad99bjh",
+      "version": "2.2.1",
+      "sha256": "050lg114ygfli28a6shc3r2aqn01vdja8dyaxm0hsavq9jslpf5s",
       "depends": ["AnnotationHub", "Biobase", "BiocFileCache", "DT", "R_utils", "Rgraphviz", "S4Vectors", "SummarizedExperiment", "basilisk", "dplyr", "graph", "httr", "igraph", "magrittr", "ontologyIndex", "ontologyPlot", "reticulate", "shiny"]
     },
     "openCyto": {
@@ -11153,8 +11159,8 @@
     },
     "openPrimeR": {
       "name": "openPrimeR",
-      "version": "1.29.0",
-      "sha256": "0r8cxhvr3mszv2l33v9cfi7i7vmk5bsg5lnr0bi7zc00zihjj20f",
+      "version": "1.30.1",
+      "sha256": "1yz39y7902qhb1yjrzzj7c0qkq9pld4wf352sb1p2dkxs8cr7qm5",
       "depends": ["BiocGenerics", "Biostrings", "DECIPHER", "GenomicRanges", "Hmisc", "IRanges", "RColorBrewer", "S4Vectors", "XML", "ape", "digest", "dplyr", "foreach", "ggplot2", "lpSolveAPI", "magrittr", "openxlsx", "plyr", "pwalign", "reshape2", "scales", "seqinr", "stringdist", "stringr", "uniqtag"]
     },
     "oposSOM": {
@@ -11513,8 +11519,8 @@
     },
     "plyxp": {
       "name": "plyxp",
-      "version": "1.2.0",
-      "sha256": "16hjdwzv792il9dhqi3g8h0lb805hsj7mcj23lksxgxxwb9jl4zb",
+      "version": "1.2.7",
+      "sha256": "03c469y98jfwk48alfky18mpb9dmh57cahkp42dgdfr8pvdknx2p",
       "depends": ["S4Vectors", "S7", "SummarizedExperiment", "cli", "dplyr", "glue", "pillar", "purrr", "rlang", "tibble", "tidyr", "tidyselect", "vctrs"]
     },
     "pmm": {
@@ -11909,8 +11915,8 @@
     },
     "rcellminer": {
       "name": "rcellminer",
-      "version": "2.30.0",
-      "sha256": "14mn84ivyr6l2vlgdmkn9ycbvm5m53jwra5a4gmahhn3h96nsqjf",
+      "version": "2.30.1",
+      "sha256": "067y9k9376x9vdkxghi6baarsif9f80cww2z7vdj01w2sw8jpffx",
       "depends": ["Biobase", "ggplot2", "gplots", "rcellminerData", "shiny", "stringr"]
     },
     "rebook": {
@@ -12323,8 +12329,8 @@
     },
     "scDotPlot": {
       "name": "scDotPlot",
-      "version": "1.2.0",
-      "sha256": "04mnm2l3gdrzqxlk47bjh00ac3d4qvpzaknd4x1gc8aq3zlplgn6",
+      "version": "1.2.1",
+      "sha256": "1zdfa1pqccx88m4j3dkdqbl4lq7w1w1cgfajvh11005ywmd39g12",
       "depends": ["BiocGenerics", "Seurat", "SingleCellExperiment", "aplot", "cli", "dplyr", "ggplot2", "ggsci", "ggtree", "magrittr", "purrr", "rlang", "scales", "scater", "stringr", "tibble", "tidyr"]
     },
     "scFeatureFilter": {
@@ -12443,8 +12449,8 @@
     },
     "scTensor": {
       "name": "scTensor",
-      "version": "2.17.0",
-      "sha256": "13sjq90kwj0a6lf7a3yn6h9a9dysdhka29xsbdxvd0vwmfifk1ph",
+      "version": "2.18.2",
+      "sha256": "1410amdbbzw8c4gn5lkidaxqrm2wlw564a5rgrfln55sn6w0k9lg",
       "depends": ["AnnotationDbi", "AnnotationHub", "BiocManager", "BiocStyle", "Category", "DOSE", "GOstats", "MeSHDbi", "RSQLite", "ReactomePA", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "abind", "ccTensor", "checkmate", "crayon", "ggplot2", "heatmaply", "igraph", "knitr", "meshr", "nnTensor", "outliers", "plotly", "plotrix", "rTensor", "reactome_db", "rmarkdown", "schex", "tagcloud", "visNetwork"]
     },
     "scTreeViz": {
@@ -12713,8 +12719,8 @@
     },
     "shinyDSP": {
       "name": "shinyDSP",
-      "version": "1.0.0",
-      "sha256": "0nd1vl899rk8cia4fmjkbnfxnma5k4alq09hmb410pyzzzchvn07",
+      "version": "1.0.3",
+      "sha256": "00ha1cjk5g70szzxnani43ixgim43mrg89nf8rrqimvwsbbzndbn",
       "depends": ["AnnotationHub", "BiocGenerics", "ComplexHeatmap", "DT", "ExperimentHub", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "bsicons", "bslib", "circlize", "cowplot", "dplyr", "edgeR", "ggplot2", "ggpubr", "ggrepel", "htmltools", "limma", "magrittr", "pals", "readr", "scales", "scater", "shiny", "shinyWidgets", "shinycssloaders", "shinyjs", "shinyvalidate", "standR", "stringr", "tibble", "tidyr", "withr"]
     },
     "shinyMethyl": {
@@ -12791,8 +12797,8 @@
     },
     "simpleSeg": {
       "name": "simpleSeg",
-      "version": "1.10.0",
-      "sha256": "03592r9swg2w2d81y4kkm8fw3ypnx9dnq6nnbqa7al9cs5d9if1v",
+      "version": "1.10.1",
+      "sha256": "1ygp3ij55fifbscy823fr3j0097yp2kj31zv7gb25jickl0p15fd",
       "depends": ["BiocParallel", "EBImage", "S4Vectors", "SummarizedExperiment", "cytomapper", "spatstat_geom", "terra"]
     },
     "simplifyEnrichment": {
@@ -12809,8 +12815,8 @@
     },
     "singleCellTK": {
       "name": "singleCellTK",
-      "version": "2.18.0",
-      "sha256": "0pvaqr5pv6v3g3b9lxfzdh7gjj47g7g0l84s5sjpwvvh09whrfz5",
+      "version": "2.18.1",
+      "sha256": "02b7wscz4r38rckbf3y1pjk94kkmvs3l8v1yb7ywgyk319hg6ig3",
       "depends": ["AnnotationHub", "Biobase", "BiocParallel", "ComplexHeatmap", "DESeq2", "DT", "DelayedArray", "DelayedMatrixStats", "DropletUtils", "ExperimentHub", "GSEABase", "GSVA", "GSVAdata", "KernSmooth", "MAST", "Matrix", "ROCR", "R_utils", "Rtsne", "S4Vectors", "Seurat", "SingleCellExperiment", "SingleR", "SoupX", "SummarizedExperiment", "TENxPBMCData", "TSCAN", "TrajectoryUtils", "VAM", "anndata", "ape", "batchelor", "celda", "celldex", "circlize", "cluster", "colorspace", "colourpicker", "cowplot", "data_table", "dplyr", "eds", "enrichR", "ensembldb", "fields", "ggplot2", "ggplotify", "ggrepel", "ggtree", "gridExtra", "igraph", "limma", "magrittr", "matrixStats", "metap", "msigdbr", "multtest", "plotly", "plyr", "reshape2", "reticulate", "rlang", "rmarkdown", "scDblFinder", "scMerge", "scRNAseq", "scater", "scds", "scran", "scuttle", "shiny", "shinyalert", "shinycssloaders", "shinyjs", "stringr", "sva", "tibble", "tidyr", "tximport", "withr", "yaml", "zellkonverter", "zinbwave"]
     },
     "singscore": {
@@ -12887,8 +12893,8 @@
     },
     "snifter": {
       "name": "snifter",
-      "version": "1.18.0",
-      "sha256": "13xad95ai6ck5v0q0yx5w199byapy1sx1lkkz6j9d1s0sqsb979k",
+      "version": "1.18.1",
+      "sha256": "165fs7f2lwhzvbb6i2vz5l4h7fl2gc5dvqkjbzj3prdqw3rhgmig",
       "depends": ["assertthat", "basilisk", "irlba", "reticulate"]
     },
     "snm": {
@@ -12911,8 +12917,8 @@
     },
     "sosta": {
       "name": "sosta",
-      "version": "1.0.0",
-      "sha256": "1adj1s8xj9jrnacdwhsd2f4s03abp38qwpminv992lxs90m86m5k",
+      "version": "1.0.1",
+      "sha256": "1nassx117qqd53jnhvhj30f419l125nyr1f68d6n9zmvzmq9kqnl",
       "depends": ["EBImage", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "patchwork", "rlang", "sf", "smoothr", "spatstat_explore", "spatstat_geom", "spatstat_random", "terra"]
     },
     "spaSim": {
@@ -12959,8 +12965,8 @@
     },
     "spatialHeatmap": {
       "name": "spatialHeatmap",
-      "version": "2.14.0",
-      "sha256": "1m4v5mfl2xzlwnvximj696dp852f17ivkpyxply02hapgmig0hjq",
+      "version": "2.14.1",
+      "sha256": "002w2srp628asbwjc5q8jn51f4czrbna8raqa0sb1w7qlhckccak",
       "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "data_table", "dplyr", "edgeR", "genefilter", "ggplot2", "ggplotify", "grImport", "gridExtra", "igraph", "reshape2", "rsvg", "shiny", "shinydashboard", "spsComps", "tibble", "xml2"]
     },
     "spatialSimGP": {
@@ -12989,8 +12995,8 @@
     },
     "spicyR": {
       "name": "spicyR",
-      "version": "1.20.1",
-      "sha256": "0xiklakkiz1z8vyyif8v0mwyy8y2w27nzzg58cx0iwb15z8wqa8c",
+      "version": "1.20.2",
+      "sha256": "0whm8kwby01rrcm2ym7z5xldkb5hid11w50z1iykbjxclv1gmzcz",
       "depends": ["BiocParallel", "ClassifyR", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "cli", "concaveman", "coxme", "data_table", "dplyr", "ggforce", "ggh4x", "ggnewscale", "ggplot2", "ggthemes", "lifecycle", "lmerTest", "magrittr", "pheatmap", "rlang", "scam", "simpleSeg", "spatstat_explore", "spatstat_geom", "survival", "tibble", "tidyr"]
     },
     "spikeLI": {
@@ -13127,8 +13133,8 @@
     },
     "struct": {
       "name": "struct",
-      "version": "1.20.1",
-      "sha256": "1qily88h48gvj88ixrcjfk13cfr5dlq61rwp60nwh9jvvs93nn2v",
+      "version": "1.20.2",
+      "sha256": "0280k9mv8q46fh78yhr5hxp5xayszl0q8qn39xhndin7i50pwni3",
       "depends": ["S4Vectors", "SummarizedExperiment", "knitr", "ontologyIndex", "rols"]
     },
     "structToolbox": {
@@ -13235,9 +13241,9 @@
     },
     "syntenet": {
       "name": "syntenet",
-      "version": "1.10.0",
-      "sha256": "1zrycma4mdxlcfph478pfcllm0nbvs1qaw7smk2ik6khrs6d66l6",
-      "depends": ["BiocParallel", "Biostrings", "GenomicRanges", "RColorBrewer", "Rcpp", "ggnetwork", "ggplot2", "igraph", "intergraph", "pheatmap", "rlang", "rtracklayer", "testthat"]
+      "version": "1.10.2",
+      "sha256": "0lxjxcx08n30s72n7sdpzssb1faxsclvd4rmd0gqfvh331y3j70q",
+      "depends": ["BiocParallel", "Biostrings", "GenomicRanges", "RColorBrewer", "Rcpp", "ggnetwork", "ggplot2", "igraph", "intergraph", "pheatmap", "rlang", "testthat"]
     },
     "systemPipeR": {
       "name": "systemPipeR",
@@ -13433,8 +13439,8 @@
     },
     "topGO": {
       "name": "topGO",
-      "version": "2.59.0",
-      "sha256": "025hsqkjzs07s62dqnh4navqp0iwz0kb59ibz83iamclbyyyxzxq",
+      "version": "2.60.1",
+      "sha256": "059fh7z47f8pvfqaxgq5pzp3a39rvg14xw2pk0fgj8d38706l18f",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "GO_db", "SparseM", "graph", "lattice", "matrixStats"]
     },
     "topconfects": {
@@ -13595,8 +13601,8 @@
     },
     "txdbmaker": {
       "name": "txdbmaker",
-      "version": "1.4.1",
-      "sha256": "0yfdm8v371mr76mxwbs8gc8bxnh5l9hpsrm9n7j2z1ipz4rn8scj",
+      "version": "1.4.2",
+      "sha256": "1ldc53w03gzig68c3mihywdpa83li1yxkxjwb16nlf9sc283spcx",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocIO", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "UCSC_utils", "biomaRt", "httr", "rjson", "rtracklayer"]
     },
     "tximeta": {
@@ -13607,8 +13613,8 @@
     },
     "tximport": {
       "name": "tximport",
-      "version": "1.36.0",
-      "sha256": "1ds2h7kmzj0r3sbj7g4w4h6j2vz7j2srbvz5wribdlpa611amqly",
+      "version": "1.36.1",
+      "sha256": "1wmapwbrx43q69dv0vgajzha2hq95xb6k3bx2vxpf29d771fsv46",
       "depends": []
     },
     "uSORT": {
@@ -13781,14 +13787,14 @@
     },
     "xCell2": {
       "name": "xCell2",
-      "version": "1.0.2",
-      "sha256": "18nvrfl47h92cf9fx0cxglswq18fbmxgh1lzxpfvkgqrb4clvwki",
+      "version": "1.0.9",
+      "sha256": "1k1ab1rsiwzfagf0hd718mrxk5qwc47qjvf2qq3wqvv5fbpq0iqv",
       "depends": ["AnnotationHub", "BiocParallel", "Matrix", "Rfast", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "magrittr", "minpack_lm", "ontologyIndex", "pracma", "progress", "quadprog", "readr", "singscore", "tibble", "tidyselect"]
     },
     "xcms": {
       "name": "xcms",
-      "version": "4.6.0",
-      "sha256": "1yf5x69f7m8bqassxzzhys7gbnvsyw79b13xlib156abyjvr5g2b",
+      "version": "4.6.3",
+      "sha256": "12cylv5gfbxjf6y64hrl76h55j30xc1fc7qvsv5vj0xynxa92lyy",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "IRanges", "MSnbase", "MassSpecWavelet", "MetaboCoreUtils", "MsCoreUtils", "MsExperiment", "MsFeatures", "ProtGenerics", "RColorBrewer", "S4Vectors", "Spectra", "SummarizedExperiment", "lattice", "mzR", "progress"]
     },
     "xcore": {
@@ -14235,13 +14241,6 @@
       "depends": ["cowplot", "flexmix", "ggplot2", "gtools", "limma", "maptpx", "picante", "plyr", "reshape2", "slam", "SQUAREM"],
       "broken": true
     },
-    "CyTOFpower": {
-      "name": "CyTOFpower",
-      "version": "1.10.0",
-      "sha256": "158ixl91yfhzik2d22xijarllirbxg33783i5pxixcdz3amp1z56",
-      "depends": ["CytoGLMM", "DT", "SummarizedExperiment", "diffcyt", "dplyr", "ggplot2", "magrittr", "rlang", "shiny", "shinyFeedback", "shinyMatrix", "shinyjs", "tibble", "tidyr"],
-      "broken": true
-    },
     "CytoTree": {
       "name": "CytoTree",
       "version": "1.6.0",
diff --git a/pkgs/development/r-modules/cran-packages.json b/pkgs/development/r-modules/cran-packages.json
index e838ab68953c..71363b3e8e27 100644
--- a/pkgs/development/r-modules/cran-packages.json
+++ b/pkgs/development/r-modules/cran-packages.json
@@ -69,9 +69,9 @@
     },
     "ACDm": {
       "name": "ACDm",
-      "version": "1.0.4.3",
-      "sha256": "0g89827az5mnllp6l71znbvwxzygb8nvnmsv6x052w2ajhd16v7v",
-      "depends": ["Rsolnp", "dplyr", "ggplot2", "plyr", "zoo"]
+      "version": "1.1.0",
+      "sha256": "1ia863y3mazvzvhxdfcm4r11g0l3s0xam5691hl2mcfn4pa7y4k3",
+      "depends": ["Rcpp", "Rsolnp", "broom", "dplyr", "ggplot2", "numDeriv", "plyr", "zoo"]
     },
     "ACE_CoCo": {
       "name": "ACE.CoCo",
@@ -181,12 +181,6 @@
       "sha256": "04biinzr0x3jkwss00q6zxfnzk62dafc6386z5vfqs4ch0ifh60n",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "Rdpack", "doParallel", "foreach"]
     },
-    "ADMUR": {
-      "name": "ADMUR",
-      "version": "1.0.3",
-      "sha256": "1wv5frav8vjkvsqwng9zddajmb7rdm4iqrikw9cjpqdpk7njl8ph",
-      "depends": ["mathjaxr", "scales", "zoo"]
-    },
     "ADP": {
       "name": "ADP",
       "version": "0.1.6",
@@ -231,8 +225,8 @@
     },
     "AER": {
       "name": "AER",
-      "version": "1.2-14",
-      "sha256": "06l7h1gdyc007hx5xavkb879mgqnskcq2zrbr0xbm88rv1b63a26",
+      "version": "1.2-15",
+      "sha256": "0i8zr3nsdiyhcs055y7k6hr6ir2lkcvymnrhkmgk2hx4xsrqlk5h",
       "depends": ["Formula", "car", "lmtest", "sandwich", "survival", "zoo"]
     },
     "AEenrich": {
@@ -315,9 +309,9 @@
     },
     "AHPtools": {
       "name": "AHPtools",
-      "version": "0.3.0",
-      "sha256": "053lk31xsv4hipah0px5xpxyd0s798pq08qpcynygkf84hjja2x0",
-      "depends": []
+      "version": "1.0.1",
+      "sha256": "0bgn3vg93hz1blyvpbs15vgbg68rkfgg6832rr5hqj5iwnvw02rz",
+      "depends": ["data_tree", "readxl"]
     },
     "AHSurv": {
       "name": "AHSurv",
@@ -373,12 +367,6 @@
       "sha256": "0gk8hxh4p0fi47sf1zsvvxxbzp38vzk60wh8hmc63phnjab6qkv4",
       "depends": ["HyperbolicDist", "sn"]
     },
-    "ALEPlot": {
-      "name": "ALEPlot",
-      "version": "1.1",
-      "sha256": "0bakl8a7xda7vh9zsc66kkd5w5jmb5j28kfwpfq2ifvk2mrakr3w",
-      "depends": ["yaImpute"]
-    },
     "ALFAM2": {
       "name": "ALFAM2",
       "version": "4.2",
@@ -555,8 +543,8 @@
     },
     "APCtools": {
       "name": "APCtools",
-      "version": "1.0.4",
-      "sha256": "0xp90p7q3a33cqsyh6n2gcsfnq9gchm5vcl13s72gqyfx4jjcnv7",
+      "version": "1.0.8",
+      "sha256": "04qpdpa5b6gz5nmryy4y8dvblqv2j17y9v203lp9ybsnvkws0wpd",
       "depends": ["checkmate", "colorspace", "dplyr", "ggplot2", "ggpubr", "knitr", "mgcv", "scales", "stringr", "tidyr"]
     },
     "APFr": {
@@ -577,6 +565,12 @@
       "sha256": "1bg9ma4i3k3xdgyk2h4f368gqnczvlhvjw4114iznmrv1wl4g25c",
       "depends": ["densratio"]
     },
+    "APRScenario": {
+      "name": "APRScenario",
+      "version": "0.0.3.0",
+      "sha256": "1vwp04gh33wg0jwl0a7ri09pq2yzv6px3sga1465j8x524vgm33p",
+      "depends": ["MASS", "Rcpp", "RcppArmadillo", "RcppProgress", "abind", "dplyr", "ggplot2", "lubridate", "psych", "tidyr"]
+    },
     "APTIcalc": {
       "name": "APTIcalc",
       "version": "0.1.0",
@@ -597,8 +591,8 @@
     },
     "AQEval": {
       "name": "AQEval",
-      "version": "0.6.0",
-      "sha256": "1208g41km6hiyfzg5v9xcjsndxiq5if8pw5qx5d9qng99zsxyzfc",
+      "version": "0.6.2",
+      "sha256": "1rrs9d6i81bhr3q051jikvw8fim0n343z8348fn78vjc32a2hgcz",
       "depends": ["data_table", "dplyr", "ggplot2", "ggtext", "loa", "lubridate", "mgcv", "openair", "purrr", "segmented", "strucchange", "tidyr"]
     },
     "AQLSchemes": {
@@ -625,6 +619,12 @@
       "sha256": "1wn4g2997c4vc3mzq2pv8ld0ryp0i78v4zlqqryvhshxgnz4f2pr",
       "depends": ["DISTRIB"]
     },
+    "ARCHISSUR": {
+      "name": "ARCHISSUR",
+      "version": "0.0.1",
+      "sha256": "11lnl40g5vyc73a1z137aagsz4gdh9bsn7mhj0z6zxk1m80jlkab",
+      "depends": ["DiceKriging", "GPCsign", "KrigInv", "TruncatedNormal", "future_apply", "randtoolbox", "rgenoud"]
+    },
     "ARCensReg": {
       "name": "ARCensReg",
       "version": "3.0.1",
@@ -639,8 +639,8 @@
     },
     "ARDECO": {
       "name": "ARDECO",
-      "version": "2.2.2",
-      "sha256": "0ns4dgp3rv12mfv9h65hkr41j6zgsligxghjdd8d3nvz0zb1mqj3",
+      "version": "2.2.3",
+      "sha256": "08xa2yy6xwgd1v0jnyjjmqib71v7ikq61k27jgf3apzv9hk95918",
       "depends": ["arrow", "dplyr", "ghql", "httr", "jsonlite", "stringr", "tidyr"]
     },
     "ARDL": {
@@ -711,8 +711,8 @@
     },
     "ARUtools": {
       "name": "ARUtools",
-      "version": "0.7.2",
-      "sha256": "1irc7gklf6n9057g2rk38fa027rcl0zsaa0iyfwxy528pkvy04g6",
+      "version": "0.7.3",
+      "sha256": "0v6m5fjlai25ms9qzdshc2pqjq09v6cnzrm8f1kpmafpryqdr4fx",
       "depends": ["dplyr", "fs", "glue", "here", "hms", "lifecycle", "lubridate", "lutz", "parzer", "purrr", "readr", "rlang", "seewave", "sf", "spsurvey", "stringr", "suncalc", "tidyr", "units", "withr"]
     },
     "ARpLMEC": {
@@ -867,15 +867,15 @@
     },
     "AccSamplingDesign": {
       "name": "AccSamplingDesign",
-      "version": "0.0.3",
-      "sha256": "0ybwk2nc0g7pma48rr3kbwadvgmaqp7206n3qmdhz4c86an9kgk4",
+      "version": "0.0.6",
+      "sha256": "13df3863xcix82ga3acqvf2d6wwq4sg8xhn3cc0hprlfmwyazy45",
       "depends": []
     },
     "AccelStab": {
       "name": "AccelStab",
-      "version": "2.2.1",
-      "sha256": "1cymvl74lgpa96k4bfri5w7w9bdsz13g7i5i57x6rv0nz6g8pky3",
-      "depends": ["dplyr", "ggplot2", "minpack_lm", "mvtnorm", "scales"]
+      "version": "2.3.1",
+      "sha256": "1k3vkqdyg42d5mxx7c8ky78nyyshy0h6kqky7rwpkq5pk6s75xga",
+      "depends": ["dplyr", "ggplot2", "minpack_lm", "scales"]
     },
     "AcceptReject": {
       "name": "AcceptReject",
@@ -885,8 +885,8 @@
     },
     "AcceptanceSampling": {
       "name": "AcceptanceSampling",
-      "version": "1.0-10",
-      "sha256": "1sbv2yrvnn0zgdmqvjlmz2vllsg6r9nlmxdgadhymhm9s51gfx65",
+      "version": "1.0.11",
+      "sha256": "0r0b25njagb3ng38rv85psbi2w95bajjapbs1p1779zi7z8nr17v",
       "depends": []
     },
     "Achilles": {
@@ -921,8 +921,8 @@
     },
     "ActivePathways": {
       "name": "ActivePathways",
-      "version": "2.0.5",
-      "sha256": "098p21g7rm3q03wifg0zb71ldg3dyqp3iwhqmg3ci9r73dl4agjh",
+      "version": "2.0.6",
+      "sha256": "16icf52xh0659b59x7w5mv35dbi0wqkr3ya55vvyg3akwvcj48zn",
       "depends": ["data_table", "ggplot2"]
     },
     "ActivityIndex": {
@@ -1033,11 +1033,17 @@
       "sha256": "0prdw8yjdrcyc8msk2a8ia5cjd4gm88isg8dqp9yj2aqbfz6pin7",
       "depends": ["dplyr", "flextable", "ggplot2", "ggthemes", "purrr", "stringr", "tidyr", "tidyselect"]
     },
+    "AgeBandDecomposition": {
+      "name": "AgeBandDecomposition",
+      "version": "1.0.1",
+      "sha256": "19nc60qbjxad2z7i598r9nyb1m5ibgljnrb7w98qdjljr8bhdzbf",
+      "depends": ["dplyr", "ggplot2", "patchwork", "readxl", "tibble", "tidyr"]
+    },
     "AgePopDenom": {
       "name": "AgePopDenom",
-      "version": "0.4.0",
-      "sha256": "0vwjha2hnpxknkad3h84wcq2lpzsvv96zad86jmz7mah9yh62bgf",
-      "depends": ["TMB", "cli", "curl", "dplyr", "exactextractr", "ggplot2", "httr", "numDeriv", "pdist", "sf", "terra", "tibble", "tidyr"]
+      "version": "1.2.3",
+      "sha256": "0ys88hwxs1hnq48rv3f5yv416yx2pxvis6id00w7g8l05kd80mrg",
+      "depends": ["TMB", "cli", "countrycode", "crayon", "curl", "dplyr", "ggplot2", "glue", "gstat", "haven", "here", "purrr", "rdhs", "rlang", "sf", "stringr", "terra", "tidyr"]
     },
     "AggregateR": {
       "name": "AggregateR",
@@ -1053,14 +1059,14 @@
     },
     "AgroR": {
       "name": "AgroR",
-      "version": "1.3.6",
-      "sha256": "0gbdba18fzk3x32wk1ycbj2ci8y1dpdmcysnmdd2361mp5yhvn7h",
+      "version": "1.3.7",
+      "sha256": "1f6vm5md63jara10i51wj7xf6z6ld2p1v915hzi8kairjg70dya1",
       "depends": ["MASS", "RColorBrewer", "cowplot", "crayon", "drc", "dunn_test", "emmeans", "ggplot2", "ggrepel", "gridExtra", "gtools", "knitr", "lme4", "lmtest", "multcomp", "multcompView", "nortest"]
     },
     "AgroReg": {
       "name": "AgroReg",
-      "version": "1.2.10",
-      "sha256": "1rvlgir48lhypw7vj23rg2xxi237sgmprp9syfryhmfz59wy6dcv",
+      "version": "1.2.11",
+      "sha256": "0n66jvcbbalizvlzarfrf7livzd1qh19j66ky8xp4rylika32wvd",
       "depends": ["boot", "broom", "dplyr", "drc", "egg", "ggplot2", "minpack_lm", "purrr", "rcompanion"]
     },
     "AgroTech": {
@@ -1093,6 +1099,12 @@
       "sha256": "06ff1m4n5rab56jgka4mnl091lqz8j4vrpxv0v5cl91gb87rz2cj",
       "depends": ["MazamaCoreUtils", "MazamaRollUtils", "MazamaTimeSeries", "dplyr", "dygraphs", "leaflet", "lubridate", "magrittr", "readr", "rlang", "stringr", "tidyselect", "xts"]
     },
+    "AirScreen": {
+      "name": "AirScreen",
+      "version": "0.1.0",
+      "sha256": "1qmpnr2pdrwkjqx8gpf6mkilc28r7k2gwwb6nmr80vmka9fmmax2",
+      "depends": []
+    },
     "AirportProblems": {
       "name": "AirportProblems",
       "version": "0.1.0",
@@ -1101,8 +1113,8 @@
     },
     "Ake": {
       "name": "Ake",
-      "version": "1.0.1",
-      "sha256": "0mdpx1dnk57yr0mpf9hqqdjx96j0sqdjdy964qvwmqbycvxxnp3z",
+      "version": "1.0.2",
+      "sha256": "1hma0nv512nmx7b50sdhf8l0ji88s3xixnh93fs5ikqjajbyybi0",
       "depends": []
     },
     "AlgDesign": {
@@ -1233,8 +1245,8 @@
     },
     "Analitica": {
       "name": "Analitica",
-      "version": "1.8.1",
-      "sha256": "08i32s1finkrksiacn7xyhdx6597gdvaczmfsc0v5qyyaj6xrzkq",
+      "version": "1.8.5",
+      "sha256": "1mw0jdk2ps2wdpnyr79l4nqwn5rll73mk7rzws2xqa21w65xf931",
       "depends": ["dplyr", "ggplot2", "ggridges", "magrittr", "moments", "multcompView", "patchwork", "rlang", "tidyr", "tidyselect"]
     },
     "AnalysisLin": {
@@ -1243,12 +1255,24 @@
       "sha256": "1mf77l74lfjlr856w48spjnn7pvjf9zygy1xcaj3fmi335h77j2x",
       "depends": ["DT", "Hmisc", "RANN", "caret", "ggplot2", "htmltools", "magrittr", "plotly"]
     },
+    "AnalyzeFMRI": {
+      "name": "AnalyzeFMRI",
+      "version": "1.1-25",
+      "sha256": "13k41766iz2qmx07h06wn9566m156h6v6y8yb0bjvc2z499jz53j",
+      "depends": ["R_matlab", "fastICA"]
+    },
     "AnanseSeurat": {
       "name": "AnanseSeurat",
       "version": "1.2.0",
       "sha256": "12r6bxh0cvh94nb91lzdj7sa7na1ljc5gdmdfx6dwilhpdafn0a3",
       "depends": ["Seurat", "dplyr", "ggplot2", "ggpubr", "magrittr", "patchwork", "png", "purrr", "rlang", "stringr"]
     },
+    "AncReg": {
+      "name": "AncReg",
+      "version": "1.0.1",
+      "sha256": "06ab812yja82kd3z546fx6h4jl4y7680lqhkrdrhfp0vsd5mjvi6",
+      "depends": ["Rdpack", "tsutils"]
+    },
     "AncestryMapper": {
       "name": "AncestryMapper",
       "version": "2.0",
@@ -1263,8 +1287,8 @@
     },
     "Andromeda": {
       "name": "Andromeda",
-      "version": "1.0.0",
-      "sha256": "116gpx9wixa0j83sq3ri0cjak5a0cc5mflah05ay1rnr0zf3qm43",
+      "version": "1.1.0",
+      "sha256": "1rmdsjdlz5gnrf4nmgym6gjnrqxzdbh53bnbavi35170b462jmjz",
       "depends": ["DBI", "cli", "dbplyr", "dplyr", "duckdb", "pillar", "rlang", "tidyselect", "zip"]
     },
     "AnglerCreelSurveySimulation": {
@@ -1329,14 +1353,14 @@
     },
     "Anthropometry": {
       "name": "Anthropometry",
-      "version": "1.19",
-      "sha256": "0aj70wm37bd5i4gzajvs6lf3zg0bz3kkf4srrcslg6drqk6n5z5l",
+      "version": "1.20",
+      "sha256": "0ym5kicy83gfzjx2hd8pyx495mww0ygrndkq3lhsqsdnyy3srff6",
       "depends": ["FNN", "ICGE", "archetypes", "biclust", "cluster", "ddalpha", "nnls", "rgl", "shapes"]
     },
     "AntibodyForests": {
       "name": "AntibodyForests",
-      "version": "1.0.0",
-      "sha256": "1mk7nr88k8imadnc23b3cq04366x3pwqvk5i6240i6xv74b5fg8a",
+      "version": "1.1.0",
+      "sha256": "0ndp1lhgdvrh13dchl88wyfpcamnq2hksp92m3y61zch1jcv15n3",
       "depends": ["Biostrings", "ape", "dplyr", "gtools", "igraph", "magrittr", "pwalign", "rlang", "scales", "seqinr", "stringdist", "stringr", "tidyr", "viridis"]
     },
     "AntibodyTiters": {
@@ -1441,6 +1465,18 @@
       "sha256": "0yffzc9jmyiil3p0bvf0fpq64mn55swcnizi3bgsl44d4j93y68q",
       "depends": []
     },
+    "ArctosR": {
+      "name": "ArctosR",
+      "version": "0.1.1",
+      "sha256": "08aspnmzlnx9z92plwr5rpvfqwyynnd8piq7jf3d1r6xj0zr4z6j",
+      "depends": ["R6", "curl", "jsonlite"]
+    },
+    "ArgentinAPI": {
+      "name": "ArgentinAPI",
+      "version": "0.1.0",
+      "sha256": "1g386nv5pwhc5cd198m6v1b6j89vfcdgh5fs98nfqjsf60zvsykl",
+      "depends": ["dplyr", "httr", "jsonlite", "lubridate"]
+    },
     "Argentum": {
       "name": "Argentum",
       "version": "1.0.0",
@@ -1483,6 +1519,12 @@
       "sha256": "063iqmxrnir2qpa9hh8pi0mmya2i24yn4d1wxapz6wrbmfryc306",
       "depends": []
     },
+    "AssumpSure": {
+      "name": "AssumpSure",
+      "version": "1.0.0",
+      "sha256": "0qzp3zwkgj8q77105h40wzb26lw9apbj88jqx74181i92szf2w66",
+      "depends": ["DHARMa", "DT", "MASS", "MVN", "bestNormalize", "broom", "broom_mixed", "bslib", "car", "compositions", "correlation", "fontawesome", "htmltools", "knitr", "lmerTest", "modelbased", "nnet", "patchwork", "performance", "rstatix", "see", "shiny", "shinyBS", "shinyjs", "shinyscreenshot", "sjPlot", "tidyverse"]
+    },
     "AsthmaNHANES": {
       "name": "AsthmaNHANES",
       "version": "1.1.0",
@@ -1575,9 +1617,9 @@
     },
     "AutoScore": {
       "name": "AutoScore",
-      "version": "1.0.0",
-      "sha256": "14wn566xm308zir12rckwc5fagm2x1mrphy0a7iri0cbrffgnkz4",
-      "depends": ["Hmisc", "car", "coxed", "dplyr", "ggplot2", "knitr", "magrittr", "ordinal", "pROC", "plotly", "randomForest", "randomForestSRC", "rlang", "survAUC", "survival", "survminer", "tableone", "tidyr"]
+      "version": "1.1.0",
+      "sha256": "0hn9972df580kxs13fsxp2lzc1rfja72ypxnvvsbgv5fbqi5f0mj",
+      "depends": ["Hmisc", "car", "dplyr", "ggplot2", "knitr", "magrittr", "ordinal", "pROC", "plotly", "randomForest", "randomForestSRC", "rlang", "survAUC", "survival", "survminer", "tableone", "tidyr"]
     },
     "AutoStepwiseGLM": {
       "name": "AutoStepwiseGLM",
@@ -1665,8 +1707,8 @@
     },
     "AzureGraph": {
       "name": "AzureGraph",
-      "version": "1.3.4",
-      "sha256": "0x7ya1yxk0cga9cfbfkd332l2syswdqjamzr2xqvb6ybwc5lpcy2",
+      "version": "1.3.5",
+      "sha256": "10lk1sha1amw5w500yk3gfkrh9g64rj39hivvm18sxjdrfvbng5h",
       "depends": ["AzureAuth", "R6", "curl", "httr", "jsonlite", "openssl"]
     },
     "AzureKeyVault": {
@@ -1689,8 +1731,8 @@
     },
     "AzureRMR": {
       "name": "AzureRMR",
-      "version": "2.4.4",
-      "sha256": "09mjc5ibk1g1azskqnrcgfb5bi88aw55g96cyas5vlwgi54xzs70",
+      "version": "2.4.5",
+      "sha256": "0z3vw4lf903grjhpc7m38pcw1li6xp1fnm928pkik5f08nbhzy0h",
       "depends": ["AzureAuth", "AzureGraph", "R6", "httr", "jsonlite", "uuid"]
     },
     "AzureStor": {
@@ -1821,9 +1863,9 @@
     },
     "BAT": {
       "name": "BAT",
-      "version": "2.10.0",
-      "sha256": "0gs6l0azb4qikv4ia37gavxzd028dqnhr9ga93ncm10kg4kl3jwr",
-      "depends": ["MASS", "TreeTools", "ape", "geometry", "hypervolume", "nls2", "phytools", "terra", "vegan"]
+      "version": "2.11.0",
+      "sha256": "1qhvidnyv9r8p3czhzcpmmjw42ga8mx8b6ayfxymkksqd10wqg8l",
+      "depends": ["MASS", "TreeTools", "ape", "boot", "geometry", "hypervolume", "nls2", "phytools", "terra", "vegan"]
     },
     "BATSS": {
       "name": "BATSS",
@@ -1891,6 +1933,12 @@
       "sha256": "1ighfc6zsgclvpfan0vdi0k896y4lnwkvm9g3fj1zmmzf2pym3mj",
       "depends": ["LaplacesDemon", "MASS", "MCMCpack", "Rcpp", "RcppArmadillo", "Rmpfr", "abind", "cluster", "coda", "ggplot2", "gridExtra", "label_switching", "lme4", "mclust", "mixAK", "mvtnorm", "nnet", "truncdist"]
     },
+    "BCD": {
+      "name": "BCD",
+      "version": "0.1.1",
+      "sha256": "0gqxsi73mrn1fhvymhvflzqca58mni21r9109jw8q4gsl0pxkvzr",
+      "depends": []
+    },
     "BCDAG": {
       "name": "BCDAG",
       "version": "1.1.3",
@@ -1905,9 +1953,9 @@
     },
     "BCEA": {
       "name": "BCEA",
-      "version": "2.4.7",
-      "sha256": "0bjwf3x6gxn8v9z9bwfvw7fxfqh4b84gwmr72zz8gkwk90fkqpas",
-      "depends": ["MASS", "MCMCvis", "Matrix", "Rdpack", "cli", "dplyr", "ggplot2", "gridExtra", "purrr", "reshape2", "rlang", "rstan", "scales", "voi"]
+      "version": "2.4.81",
+      "sha256": "18247xd1xs6agh3il26rjgi1x7iflhc40lah2fzf9sbcn5r97q8y",
+      "depends": ["MASS", "MCMCvis", "Matrix", "Rdpack", "cli", "dplyr", "ggplot2", "gridExtra", "plotly", "purrr", "reshape2", "rlang", "rstan", "scales", "voi"]
     },
     "BCEE": {
       "name": "BCEE",
@@ -1927,12 +1975,6 @@
       "sha256": "17h0ara1y3fh2xyhjarbw3b549v6kq108bg946ndh7kjykara9dd",
       "depends": []
     },
-    "BCSub": {
-      "name": "BCSub",
-      "version": "0.5",
-      "sha256": "0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp",
-      "depends": ["MASS", "Rcpp", "RcppArmadillo", "mcclust", "nFactors"]
-    },
     "BCT": {
       "name": "BCT",
       "version": "1.2",
@@ -2121,8 +2163,8 @@
     },
     "BGmisc": {
       "name": "BGmisc",
-      "version": "1.4.3.1",
-      "sha256": "0hhalx81i5ilfk6fhiyd0cnwfvbjndwpvniqllm5fa9yy3cbd4iy",
+      "version": "1.5.0",
+      "sha256": "0d6nmd7zm5f7hms1gr1ij3amjxg256ibrmps2nmgb9lxp69nysh4",
       "depends": ["Matrix", "data_table", "igraph", "stringr"]
     },
     "BH": {
@@ -2239,6 +2281,12 @@
       "sha256": "1bhlnwb88diyw2f9h9gyk73m4s9s30f51imclif8rwa45dpylmd3",
       "depends": []
     },
+    "BKP": {
+      "name": "BKP",
+      "version": "0.1.0",
+      "sha256": "14229948ly34jxc72mhqpwgci9zmzn6rshggqhf93rc4dcicns1a",
+      "depends": ["gridExtra", "lattice", "optimx", "tgp"]
+    },
     "BKT": {
       "name": "BKT",
       "version": "0.1.0",
@@ -2325,9 +2373,15 @@
     },
     "BMEmapping": {
       "name": "BMEmapping",
-      "version": "0.3.0",
-      "sha256": "0m84cz4214avdb3n3g99xblw50sir6qjrxd286cqq97n5x5kn7np",
-      "depends": ["mvtnorm"]
+      "version": "1.2.0",
+      "sha256": "0rb85sragwiyp065s613c1aqv3nvkr3ph6sbqn0bx0yzlhfa1l7s",
+      "depends": ["ggplot2", "gridExtra", "mvtnorm"]
+    },
+    "BMIselect": {
+      "name": "BMIselect",
+      "version": "1.0.1",
+      "sha256": "0xlh82iiq2k1aracc294zc8hhrcfaija8l7g22q6y9s75i7l8b59",
+      "depends": ["GIGrvg", "MASS", "MCMCpack", "Rfast", "abind", "arm", "doParallel", "foreach", "mice", "mvnfast", "posterior", "stringr"]
     },
     "BMRBr": {
       "name": "BMRBr",
@@ -2373,8 +2427,8 @@
     },
     "BNPdensity": {
       "name": "BNPdensity",
-      "version": "2023.3.8",
-      "sha256": "0b0hv634k5vnc74iw2c0arx9rl3bh5hahhrhp14gx324jv279fs5",
+      "version": "2025.7.29",
+      "sha256": "1209n082spkjkg4lpymyjncj3g4b8zgarddzyzd8sj5k8l3c66qc",
       "depends": ["coda", "dplyr", "ggplot2", "gridExtra", "survival", "tidyr", "viridis"]
     },
     "BNPmix": {
@@ -2485,12 +2539,6 @@
       "sha256": "13qi78v3057qn4hfby14sp26hy3ibl50f06x8gpak6gi76g8bhwi",
       "depends": []
     },
-    "BRVM": {
-      "name": "BRVM",
-      "version": "5.3.0",
-      "sha256": "0vkx0lbamfkmpcpd7kp85jqzf2fivp898yw0dvkgan8kkfqclra5",
-      "depends": ["dplyr", "fBasics", "formattable", "goftest", "gsheet", "highcharter", "httr", "httr2", "lubridate", "magrittr", "nortest", "rlang", "rvest", "stringr", "tibble", "tidyr", "timeDate", "tseries", "xml2", "xts"]
-    },
     "BRcal": {
       "name": "BRcal",
       "version": "1.0.1",
@@ -2577,8 +2625,8 @@
     },
     "BTLLasso": {
       "name": "BTLLasso",
-      "version": "0.1-13",
-      "sha256": "19r45qm1iq3sjb6r5ficgv8q9zwpbilxwrf6rxvqdl333xcnnjy4",
+      "version": "0.1-14",
+      "sha256": "015by5qnv5rzvw8ll9n0kxgy5bm4hdii179filmvpnmzhkkq7z3b",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "psychotools", "stringr"]
     },
     "BTM": {
@@ -2595,9 +2643,9 @@
     },
     "BTSR": {
       "name": "BTSR",
-      "version": "0.1.5",
-      "sha256": "0kqgy61ijalpclrm20xwjbvbb5pkhkbgsbdbsz0mrb4v30a05dh4",
-      "depends": []
+      "version": "1.0.0",
+      "sha256": "0sfjvz7jagjw5bbrs7gyjxzsnnk9z61655cfrp1x9s8cizan9r0r",
+      "depends": ["Rdpack"]
     },
     "BTTL": {
       "name": "BTTL",
@@ -2743,6 +2791,12 @@
       "sha256": "07b1611k639whrc32xcjdlqyxjsdyd9gmpgx3f7b8hcchnhx98ay",
       "depends": ["NlcOptim"]
     },
+    "BasketTrial": {
+      "name": "BasketTrial",
+      "version": "0.1.0",
+      "sha256": "01sakgphrp3wjj1sqhlcd2r453rnc4nrjv5kbzgfpgd3d97qwank",
+      "depends": []
+    },
     "BasketballAnalyzeR": {
       "name": "BasketballAnalyzeR",
       "version": "0.8.0",
@@ -2809,6 +2863,12 @@
       "sha256": "1b18qg0mjbmrilwqffrq33gw04fzask2xgj1bp4cli51cjf2slf7",
       "depends": ["coda", "doParallel", "foreach", "label_switching"]
     },
+    "BayesBrainMap": {
+      "name": "BayesBrainMap",
+      "version": "0.1.3",
+      "sha256": "0mxsx8rpqs06791xaqmxs0arvl1hishkfwmi7vz2434h22cl1rw3",
+      "depends": ["Matrix", "SQUAREM", "abind", "fMRIscrub", "fMRItools", "foreach", "matrixStats", "pesel"]
+    },
     "BayesCACE": {
       "name": "BayesCACE",
       "version": "1.2.3",
@@ -2835,8 +2895,8 @@
     },
     "BayesCVI": {
       "name": "BayesCVI",
-      "version": "1.0.1",
-      "sha256": "0j2kaq0ssbs9d0y17kmj8p89g7gh8dpaa8wrf6ylm3jy27g8b48j",
+      "version": "1.0.2",
+      "sha256": "0jk79q8dansq1z6kw10833n25q442cg0fspk4i5p063fw7bhplzs",
       "depends": ["UniversalCVI", "e1071", "ggplot2", "mclust"]
     },
     "BayesChange": {
@@ -2883,8 +2943,8 @@
     },
     "BayesERtools": {
       "name": "BayesERtools",
-      "version": "0.2.2",
-      "sha256": "08d7dyfjmc1wr7fmn4nr3a5vnm3lfcfzx0xxcarn81nxv5ygapdr",
+      "version": "0.2.3",
+      "sha256": "1fy0y549zn77b90dnv94hz07f6f4748n8smbvbadysjjbxmfxf2r",
       "depends": ["cli", "dplyr", "ggplot2", "gt", "loo", "posterior", "purrr", "rlang", "rstanarm", "rstanemax", "tidybayes", "tidyr"]
     },
     "BayesESS": {
@@ -2961,8 +3021,8 @@
     },
     "BayesLN": {
       "name": "BayesLN",
-      "version": "0.2.10",
-      "sha256": "0p8g0h4zqz5njr7lkkv2hhq9qas9lvrxamg8xb9hkqrxfxd0d3nn",
+      "version": "0.2.12",
+      "sha256": "1v2qi70zdrym4q9lyghjm2y10fsga7pkfa5szrpp7c8j7ryaghl0",
       "depends": ["GeneralizedHyperbolic", "MASS", "Matrix", "Rcpp", "RcppEigen", "coda", "data_table", "gsl", "lme4", "optimx"]
     },
     "BayesLogit": {
@@ -2979,8 +3039,8 @@
     },
     "BayesMallows": {
       "name": "BayesMallows",
-      "version": "2.2.4",
-      "sha256": "1l38ykvbyda03233g6x4mbg8g37y87cjm1ks06hjbpzryprwph0g",
+      "version": "2.2.5",
+      "sha256": "01dzj7hs48ri8xsm4ffcdsvmcpfq8jhaglg2vsi2mavml9hlgnss",
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "ggplot2", "relations", "rlang", "sets", "testthat"]
     },
     "BayesMixSurv": {
@@ -2989,10 +3049,16 @@
       "sha256": "0kg44sfqrpd7cyb6wm0m8ya75azm6k6wzhm7jz50ayln8whad87l",
       "depends": ["survival"]
     },
+    "BayesMoFo": {
+      "name": "BayesMoFo",
+      "version": "0.1.0",
+      "sha256": "1bh8yy1plpkzrd3dphhspn9lliadh9rylrfyxd78p18gcnhcfr63",
+      "depends": ["coda", "dplyr", "insight", "magrittr", "rjags", "rlang", "tidyverse"]
+    },
     "BayesMortalityPlus": {
       "name": "BayesMortalityPlus",
-      "version": "0.2.4",
-      "sha256": "15g87wpaj7rsm8dnz7w57vw9bpkj0aj5f6hi8v7m8kamki8m7chm",
+      "version": "1.0.0",
+      "sha256": "1f1ccnp18a2x4wsq0cs7n1jsvnlmaj6casnzlgrjhwxhc1w48css",
       "depends": ["MASS", "dplyr", "ggplot2", "magrittr", "mvtnorm", "progress", "scales", "tidyr"]
     },
     "BayesMultMeta": {
@@ -3019,12 +3085,6 @@
       "sha256": "1c6a82qlcrpbb2c4zp3gk24wcgw6x62lm8hm6n2l1r307dxm2rpb",
       "depends": ["RColorBrewer", "bnlearn", "doBy", "fields", "graph", "igraph"]
     },
-    "BayesOrdDesign": {
-      "name": "BayesOrdDesign",
-      "version": "0.1.2",
-      "sha256": "1417zd1n5sip999n6q6bgs85c0000ksl73a4p94y0lmdn27i8pmj",
-      "depends": ["R2jags", "coda", "ggplot2", "gsDesign", "madness", "ordinal", "rjags", "rjmcmc", "schoolmath", "superdiag"]
-    },
     "BayesPIM": {
       "name": "BayesPIM",
       "version": "1.0.0",
@@ -3073,6 +3133,12 @@
       "sha256": "0fhvnckabp0z1cdsbjgv3ijnzaxwhrk83fwcflgqbhvm3a9lzr77",
       "depends": ["coda", "ggplot2", "metRology", "reshape", "rjags"]
     },
+    "BayesRegDTR": {
+      "name": "BayesRegDTR",
+      "version": "1.0.1",
+      "sha256": "154zhysln45rrif4v9dlpprmjkqal5rrhlmday07ha6bhvcrsynz",
+      "depends": ["Rcpp", "RcppArmadillo", "doRNG", "foreach", "future", "mvtnorm", "progressr"]
+    },
     "BayesRep": {
       "name": "BayesRep",
       "version": "0.42.2",
@@ -3129,8 +3195,8 @@
     },
     "BayesTools": {
       "name": "BayesTools",
-      "version": "0.2.19",
-      "sha256": "0bb4ywfj2592m5hgn0xvza381g1029ar848sjkw46z0fwq7kwi6v",
+      "version": "0.2.20",
+      "sha256": "1fxa09i3ha0d9wnv6nzbxc6d7h9nifzgzy7gn6a6q3yrnyxqms42",
       "depends": ["Rdpack", "bridgesampling", "coda", "extraDistr", "ggplot2", "mvtnorm", "rlang"]
     },
     "BayesTree": {
@@ -3193,6 +3259,12 @@
       "sha256": "09yb1qqx6qlsspk3ndrcqxy0956iqznw0rmyvqxgxxp3zd3y21xp",
       "depends": ["MASS", "statmod"]
     },
+    "BayesianLasso": {
+      "name": "BayesianLasso",
+      "version": "0.3.5",
+      "sha256": "05qixcihnplzbfkns22vhcs820hg7iddxhlc7vbgglpv7aijk81z",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppClock", "RcppEigen", "RcppNumerical"]
+    },
     "BayesianLaterality": {
       "name": "BayesianLaterality",
       "version": "0.1.2",
@@ -3285,8 +3357,8 @@
     },
     "BeastJar": {
       "name": "BeastJar",
-      "version": "1.10.6",
-      "sha256": "0581q9m7lb681d12vld231vn6wqv5s2sqkvav4fd0xllvjighlx7",
+      "version": "10.5.0",
+      "sha256": "1qddk86fjirl8ikhfxrs8lwdy4bx3fkfyn2k8c9qa6qfix7vrhfw",
       "depends": ["rJava"]
     },
     "BeeBDC": {
@@ -3471,8 +3543,8 @@
     },
     "BigVAR": {
       "name": "BigVAR",
-      "version": "1.1.2",
-      "sha256": "1f67gk54gzdlil79gqqws0i6j0rvjqk4k0bhdb9adcvcsdxfkwwy",
+      "version": "1.1.3",
+      "sha256": "1aqmgmpwfkll7q20l3sda26nkmi2fjjs4cfxbhvhjy5q3a7k1lr1",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "RcppEigen", "abind", "lattice", "zoo"]
     },
     "BimodalIndex": {
@@ -3567,8 +3639,8 @@
     },
     "BioM2": {
       "name": "BioM2",
-      "version": "1.1.2",
-      "sha256": "1p61w98q5h08yramikqc017ahr93yxwb361j5wj28j0w4kmm0ib1",
+      "version": "1.1.3",
+      "sha256": "10chzn3p3ga8xjd18mz589xa744dqb452f4f9bav9lkw01anmcvg",
       "depends": ["CMplot", "ROCR", "WGCNA", "caret", "ggforce", "ggnetwork", "ggplot2", "ggpubr", "ggsci", "ggstatsplot", "ggthemes", "htmlwidgets", "igraph", "mlr3", "mlr3verse", "uwot", "viridis", "webshot", "wordcloud2"]
     },
     "BioPET": {
@@ -3781,12 +3853,6 @@
       "sha256": "1w3ghs29qlnjrd46lvv055snclwwy6a22fgdqszqm377w4favnhm",
       "depends": []
     },
-    "Bodi": {
-      "name": "Bodi",
-      "version": "0.1.0",
-      "sha256": "1z3xamj4qh3g5asrl3kbvcnx3r66mch34d0hlz9vg0498s9fwn6s",
-      "depends": ["gbm", "mgcv", "opera", "ranger", "rpart"]
-    },
     "Bolstad": {
       "name": "Bolstad",
       "version": "0.2.42",
@@ -3817,11 +3883,17 @@
       "sha256": "00fdqsy7znlwszwjm7mzd5yb3bbx463iy4fbkrzc5nn08rfa395g",
       "depends": ["Rcpp", "timeDate"]
     },
+    "BoneDensityMapping": {
+      "name": "BoneDensityMapping",
+      "version": "0.1.2",
+      "sha256": "1c0r6sm5yqmvgacrf3xaxym9b9vn0ynid7xbfknld472za71wp1l",
+      "depends": ["FNN", "RNifti", "Rvcg", "concaveman", "cowplot", "geometry", "ggplot2", "ggpubr", "nat", "oro_nifti", "ptinpoly", "rdist", "rgl", "rjson", "sp"]
+    },
     "BoneProfileR": {
       "name": "BoneProfileR",
-      "version": "3.1",
-      "sha256": "0r9fmrb2v0jlbp9f2c644v17hbdfz91dl6j87mgxwkpc472iz9w8",
-      "depends": ["HelpersMG", "imager", "knitr", "rmarkdown", "shiny"]
+      "version": "4.0",
+      "sha256": "1barqcz91dg1fphv40hldhlwavgcs9smbxrajg6r5lvsi6734kfx",
+      "depends": ["HelpersMG", "Rdpack", "imager", "knitr", "rmarkdown", "shiny"]
     },
     "BoolFilter": {
       "name": "BoolFilter",
@@ -3885,8 +3957,8 @@
     },
     "Boruta": {
       "name": "Boruta",
-      "version": "8.0.0",
-      "sha256": "1irx7qg1sw69ggsk4jgxfd3pp741kd944fipnda1qbcbphg5prrq",
+      "version": "9.0.0",
+      "sha256": "1rdzcncmpbbkmifayscagf73m5k61nf3fxxra4xcp5kawxxfxvkx",
       "depends": ["ranger"]
     },
     "BosonSampling": {
@@ -3903,9 +3975,9 @@
     },
     "BoundaryStats": {
       "name": "BoundaryStats",
-      "version": "2.2.0",
-      "sha256": "0dwigyi25y93jb3hisx9d4rrfy202mia6wvbhgnh47ia6l7cdsis",
-      "depends": ["dplyr", "fields", "ggplot2", "igraph", "magrittr", "pdqr", "scales", "sf", "terra", "tibble"]
+      "version": "2.3.0",
+      "sha256": "1q4f6b3q3r60gw6a3gk9c90bmcnf9m3www84vfnrrs1fmsqamnk9",
+      "depends": ["dplyr", "fields", "ggplot2", "gstat", "igraph", "magrittr", "scales", "terra", "tibble"]
     },
     "BoutrosLab_plotting_general": {
       "name": "BoutrosLab.plotting.general",
@@ -3949,6 +4021,12 @@
       "sha256": "194ckp3b6yini9z6nh953n7x0yp6x1zwvxg42z6pq5wsd07g76n5",
       "depends": ["dplyr", "geobr", "janitor", "openxlsx", "tidyr"]
     },
+    "BrazilDataAPI": {
+      "name": "BrazilDataAPI",
+      "version": "0.1.0",
+      "sha256": "0j2nfj9prm2dq9g7kcffsi86gizj1z5vv22n125vpms4xxhfsskj",
+      "depends": ["dplyr", "httr", "jsonlite"]
+    },
     "BrazilMet": {
       "name": "BrazilMet",
       "version": "0.4.0",
@@ -3969,8 +4047,8 @@
     },
     "BrokenAdaptiveRidge": {
       "name": "BrokenAdaptiveRidge",
-      "version": "1.0.0",
-      "sha256": "0f46wwyfcqslk25cbm63pbnp8bwamqhr4g4wdlrqn666yiwn1sc2",
+      "version": "1.0.1",
+      "sha256": "08kpfiyzs5147hhml21akqa6vylnfbdbyj333353f8m4nd41ms02",
       "depends": ["Cyclops", "bit64", "futile_logger"]
     },
     "BrownDog": {
@@ -4023,8 +4101,8 @@
     },
     "BuyseTest": {
       "name": "BuyseTest",
-      "version": "3.2.0",
-      "sha256": "1ij7ahjhs24zhy9y5k8bv12w6k0gdm1rr4aq2g3fqxxdi7yshk0f",
+      "version": "3.3.3",
+      "sha256": "0ihp597hmrm3zkiz1i0l5lr79md8z9y8nmr71ibgdc43lfgppx24",
       "depends": ["Rcpp", "RcppArmadillo", "data_table", "doSNOW", "foreach", "ggplot2", "lava", "prodlim", "riskRegression", "rlang", "scales"]
     },
     "Bvalue": {
@@ -4353,14 +4431,14 @@
     },
     "CDM": {
       "name": "CDM",
-      "version": "8.2-6",
-      "sha256": "1lcq3i5rlyqkc12c26kj0x4fm2gh1jsisp6kbf59y3hjdkiqajhl",
+      "version": "8.3-14",
+      "sha256": "1857g1r1v6g9kjmnc4q6xr181whxdl69s322kdj5fwjlld9cgbhz",
       "depends": ["Rcpp", "RcppArmadillo", "mvtnorm", "polycor"]
     },
     "CDMConnector": {
       "name": "CDMConnector",
-      "version": "2.0.0",
-      "sha256": "15aj7fzxl10b4rr913qdn3jp16p994gdjx00wblgsskkzgvg08n6",
+      "version": "2.1.1",
+      "sha256": "0kn7mc5j4wy91dh0lssddy1aqi26j03jwpbzb59p1b7w234srz9l",
       "depends": ["DBI", "checkmate", "cli", "dbplyr", "dplyr", "generics", "glue", "jsonlite", "lifecycle", "omopgenerics", "purrr", "readr", "rlang", "stringi", "stringr", "tidyr", "tidyselect", "withr"]
     },
     "CDSE": {
@@ -4423,12 +4501,6 @@
       "sha256": "0b9rvmiyz993bivghnhd22c1xmiqb701f8q4vn7zrrxs3cvkvxhy",
       "depends": ["DEoptim", "MASS", "Matrix", "anticlust", "fastmatch", "quadprog"]
     },
-    "CEOdata": {
-      "name": "CEOdata",
-      "version": "1.3.1.1",
-      "sha256": "0cf8d3qw2x2lww6hxw96b1b6dl6pq2n0w1ffl2d7870vcvzl3lwr",
-      "depends": ["dplyr", "haven", "jsonlite", "stringr", "urltools"]
-    },
     "CERFIT": {
       "name": "CERFIT",
       "version": "0.1.0",
@@ -4539,8 +4611,8 @@
     },
     "CHNOSZ": {
       "name": "CHNOSZ",
-      "version": "2.1.0",
-      "sha256": "1iwg6pfnkq5ap0p3nscadfx6fyakvvjgmgx2wkva65bgkbhs6x9v",
+      "version": "2.2.0",
+      "sha256": "0jsf52sy3n1vk04l75lkw8cjphiy8qcwfzcgc16m80ybydc09crs",
       "depends": []
     },
     "CHOIRBM": {
@@ -4569,16 +4641,10 @@
     },
     "CICI": {
       "name": "CICI",
-      "version": "0.9.5",
-      "sha256": "1fxwd0sgsrs8g97mg7n53knhr51gf858qymcd98i1m0qjdvlaxwd",
+      "version": "0.9.6",
+      "sha256": "0yad8v8sml6d5vl8wsl6p8v82ryp37g1ig9cn6s1b3f1r0i75g8n",
       "depends": ["doParallel", "doRNG", "foreach", "ggplot2", "glmnet", "mgcv", "rngtools"]
     },
-    "CIDER": {
-      "name": "CIDER",
-      "version": "0.99.4",
-      "sha256": "16cv4w38x9zadc28x0z1hajfyy32vhf0w818zcqcakarrz6y7d08",
-      "depends": ["Seurat", "dbscan", "doParallel", "edgeR", "foreach", "ggplot2", "igraph", "kernlab", "limma", "pheatmap", "viridis"]
-    },
     "CIEE": {
       "name": "CIEE",
       "version": "0.1.1",
@@ -4641,8 +4707,8 @@
     },
     "CITAN": {
       "name": "CITAN",
-      "version": "2022.1.1",
-      "sha256": "09m9f6s9y7ygbixcymg93vsrqz5jsjp968cjhxnj1v73hzalk168",
+      "version": "2025.7.1",
+      "sha256": "0krlljwwxx4n5xzm7p1x5l5ql8mvssf8cy69fg80mqyqnj2kk80m",
       "depends": ["DBI", "RSQLite", "agop", "stringi"]
     },
     "CITMIC": {
@@ -4995,8 +5061,8 @@
     },
     "CPC": {
       "name": "CPC",
-      "version": "2.6.0",
-      "sha256": "0n1vsn7b1rllbsad2bshhi0c6pz7zqz6bmcc176qh50hm4hgp99r",
+      "version": "2.6.2",
+      "sha256": "1g6k7m96fc2jp63g0k3vwiq8kh7c66q4cqcc548wqxqa4kh90yx4",
       "depends": ["Rfast", "cluster", "dbscan"]
     },
     "CPCAT": {
@@ -5367,9 +5433,9 @@
     },
     "CalibrationCurves": {
       "name": "CalibrationCurves",
-      "version": "2.0.4",
-      "sha256": "0vd48vj3ma0qaa1d3zf3lbw3y9k3kspb4jr0x7r2cng6iacqh58r",
-      "depends": ["Hmisc", "bookdown", "ggplot2", "rms", "rstudioapi", "survival"]
+      "version": "2.0.7",
+      "sha256": "1rl47dvf2m253dyf5rr8yx12yqldwr50awvl5dcp67x3x0amb6vq",
+      "depends": ["Hmisc", "bookdown", "ggplot2", "riskRegression", "rms", "rstudioapi", "survival", "timeROC"]
     },
     "CamelUp": {
       "name": "CamelUp",
@@ -5535,8 +5601,8 @@
     },
     "CausalQueries": {
       "name": "CausalQueries",
-      "version": "1.3.3",
-      "sha256": "1jdmsy970bx2qv8bmvkvn9dpiny77rf0r0pw1rz8hg8bnxd07l0f",
+      "version": "1.4.3",
+      "sha256": "0ykcc7k8a1agcwcnwxw1l4nykkd233awbdb72japfprjaxvm3brr",
       "depends": ["BH", "Rcpp", "RcppArmadillo", "RcppEigen", "StanHeaders", "dirmult", "dplyr", "ggplot2", "ggraph", "knitr", "latex2exp", "lifecycle", "rlang", "rstan", "rstantools", "stringr"]
     },
     "CautiousLearning": {
@@ -5685,8 +5751,8 @@
     },
     "ChaosGame": {
       "name": "ChaosGame",
-      "version": "1.4",
-      "sha256": "06d2jm8b3l242yqgbfsr1cclph0l8xdxqfq7xvbghsavzk3lf367",
+      "version": "1.5",
+      "sha256": "0kfvbplvvrs8wm1fp0yad84pp880wf953n70d4bfv4xy1q32xb2h",
       "depends": ["RColorBrewer", "colorRamps", "ggplot2", "gridExtra", "plot3D", "rgl"]
     },
     "Characterization": {
@@ -5709,9 +5775,9 @@
     },
     "ChemoSpec": {
       "name": "ChemoSpec",
-      "version": "6.1.11",
-      "sha256": "055dapz7nd0vqz94b9q9j5lpy75da6bs11qiz8633mzlxj2nmpll",
-      "depends": ["ChemoSpecUtils", "ggplot2", "magrittr", "patchwork", "plotly", "readJDX", "reshape2"]
+      "version": "6.3.0",
+      "sha256": "1payl8s526si7qgfp76x9zyw8flvjsynqdjch2b8lhsdfgpsjdax",
+      "depends": ["ChemoSpecUtils", "ggplot2", "lattice", "magrittr", "patchwork", "plotly", "readJDX", "reshape2"]
     },
     "ChemoSpec2D": {
       "name": "ChemoSpec2D",
@@ -5743,6 +5809,12 @@
       "sha256": "0ql147p3l5rlair2vlxjsa4ddfy6a4aiy4bra227kws0v0h7xvpf",
       "depends": ["dplyr", "geometry", "ggplot2", "plotly", "readxl", "tidyr"]
     },
+    "ChileDataAPI": {
+      "name": "ChileDataAPI",
+      "version": "0.1.0",
+      "sha256": "0z8izvidxxqnih9a2h6nip9wyr8mjvgiqr9qk5pk0fzxplfwjbbw",
+      "depends": ["dplyr", "httr", "jsonlite"]
+    },
     "ChillModels": {
       "name": "ChillModels",
       "version": "1.0.2",
@@ -5817,8 +5889,8 @@
     },
     "CircStats": {
       "name": "CircStats",
-      "version": "0.2-6",
-      "sha256": "07bg4zrs2iqh0pmi44pybi8hlvnxwcaa5zpg85rmf55kflxxkzlf",
+      "version": "0.2-7",
+      "sha256": "0mp463w7myizvidhjnljzhyb1vrc1ajyay876g2w7k919klsnvcz",
       "depends": ["MASS", "boot"]
     },
     "CirceR": {
@@ -5883,8 +5955,8 @@
     },
     "ClassificationEnsembles": {
       "name": "ClassificationEnsembles",
-      "version": "0.5.0",
-      "sha256": "0ihagai3dd0fdczvg21j7f8623pzs4bf4q80nn31q7nqa0kaz6vk",
+      "version": "0.6.0",
+      "sha256": "01hcc27xc4wgbbkw4rbfx567fb7l3xv46is2iiiv9axgz4yifan1",
       "depends": ["C50", "MachineShop", "car", "caret", "corrplot", "doParallel", "dplyr", "e1071", "ggplot2", "gt", "ipred", "magrittr", "pls", "purrr", "randomForest", "ranger", "reactable", "reactablefmtr", "scales", "tidyr", "tree"]
     },
     "CleanBSequences": {
@@ -5943,10 +6015,16 @@
     },
     "ClimMobTools": {
       "name": "ClimMobTools",
-      "version": "1.5",
-      "sha256": "1svni8zlyy4gj7wzs1431hgc3g0kwwr4sw0ddxgrnvd350rzwxg5",
+      "version": "1.6.1",
+      "sha256": "1gqzw92q29i4ck13wmg5n4gwmr28k9bmfyvn8yv4rg2jr5nkhl22",
       "depends": ["Matrix", "RSpectra", "httr", "jsonlite", "lpSolve"]
     },
+    "ClimaRep": {
+      "name": "ClimaRep",
+      "version": "0.6",
+      "sha256": "0ynhri2r13ga4rp7px0p05nj28163vwzyvz1gyn8zrcsvxy9j6zi",
+      "depends": ["ggplot2", "sf", "terra", "tidyterra"]
+    },
     "ClinSigMeasures": {
       "name": "ClinSigMeasures",
       "version": "1.2",
@@ -6087,9 +6165,9 @@
     },
     "ClusterGVis": {
       "name": "ClusterGVis",
-      "version": "0.1.2",
-      "sha256": "0i14z0a6bf9r1c07k0rp57qbgclnz2di0hfw1h15pgsmm15g0ckp",
-      "depends": ["Biobase", "ComplexHeatmap", "Matrix", "Mfuzz", "SingleCellExperiment", "SummarizedExperiment", "TCseq", "circlize", "clusterProfiler", "colorRamps", "dplyr", "e1071", "factoextra", "ggplot2", "magrittr", "purrr", "reshape2", "scales", "tibble"]
+      "version": "0.1.4",
+      "sha256": "02y47pfsinbkfhkav48xvly0c322j3lp2kannp0z5lffdpa0cdan",
+      "depends": ["Matrix", "SingleCellExperiment", "colorRamps", "dplyr", "e1071", "factoextra", "ggplot2", "magrittr", "purrr", "reshape2", "scales", "tibble"]
     },
     "ClusterR": {
       "name": "ClusterR",
@@ -6225,8 +6303,8 @@
     },
     "CohortConstructor": {
       "name": "CohortConstructor",
-      "version": "0.4.0",
-      "sha256": "198wnnirm7iwls0k0m4sbnsll473fraggn6wrxh366z1c7hk3dy7",
+      "version": "0.5.0",
+      "sha256": "1b4g8axjfq2ybjm31nblp5q1jbc3hshf2lnrb7ygkjqv0xgvi68i",
       "depends": ["CDMConnector", "PatientProfiles", "checkmate", "cli", "clock", "dbplyr", "dplyr", "glue", "magrittr", "omopgenerics", "purrr", "rlang", "tidyr"]
     },
     "CohortExplorer": {
@@ -6237,9 +6315,9 @@
     },
     "CohortGenerator": {
       "name": "CohortGenerator",
-      "version": "0.11.2",
-      "sha256": "02fsdwswdpgv0cf2naqj9p0fv8qxvcsani68dl05hcnsj7qrhgs6",
-      "depends": ["DatabaseConnector", "ParallelLogger", "R6", "RJSONIO", "ResultModelManager", "SqlRender", "checkmate", "digest", "dplyr", "jsonlite", "lubridate", "readr", "rlang", "stringi", "tibble"]
+      "version": "0.12.0",
+      "sha256": "0z8g9a232i59ajygjshbxwblr8y2cjxqwn08r3ys34yfzmbz96pi",
+      "depends": ["DatabaseConnector", "ParallelLogger", "R6", "ResultModelManager", "SqlRender", "checkmate", "digest", "dplyr", "jsonlite", "lubridate", "readr", "rlang", "stringi", "tibble"]
     },
     "CohortPathways": {
       "name": "CohortPathways",
@@ -6255,8 +6333,8 @@
     },
     "CohortSurvival": {
       "name": "CohortSurvival",
-      "version": "1.0.1",
-      "sha256": "1w6qp6wkjkg3zb06x3i9jy7hymnyshq5mg25kxmsazwf6lh8gi2m",
+      "version": "1.0.2",
+      "sha256": "0vy1blarcawkm70iygv00cx9wa0flpywgyxfayzmlp89b7d0221x",
       "depends": ["CDMConnector", "DBI", "PatientProfiles", "broom", "checkmate", "cli", "clock", "dplyr", "glue", "magrittr", "omopgenerics", "purrr", "rlang", "stringr", "survival", "tibble", "tidyr"]
     },
     "CohortSymmetry": {
@@ -6387,8 +6465,8 @@
     },
     "CompExpDes": {
       "name": "CompExpDes",
-      "version": "1.0.7",
-      "sha256": "01fb3xvg4ykfgl183m1z5ydychjzls6xcsvhzsayjsf9fbc9gbk8",
+      "version": "1.0.8",
+      "sha256": "0qdxsi4ahkwm77wlzlvng9mc7d6sj4x57bhj6ranxr36qqn6cjjq",
       "depends": []
     },
     "CompGR": {
@@ -6417,8 +6495,8 @@
     },
     "CompQuadForm": {
       "name": "CompQuadForm",
-      "version": "1.4.3",
-      "sha256": "1i30hrqdk64q17vsn918c3q79brchgx2wzh1gbsgbn0dh1ncabq4",
+      "version": "1.4.4",
+      "sha256": "0hx15zs180q1kpm7pp608sgmarwjjf4gss4lmavxzmkwpy3j1bw4",
       "depends": []
     },
     "CompR": {
@@ -6471,10 +6549,16 @@
     },
     "Compositional": {
       "name": "Compositional",
-      "version": "7.5",
-      "sha256": "15h309pp13h4k571hwn707ij93a4f2cf91znm236y93dsmamkin7",
+      "version": "7.6",
+      "sha256": "0fzprvxvw8lw0xv138g4adhp10igfw740wfqlgsl1bhsk054nynf",
       "depends": ["MASS", "Matrix", "Rfast", "Rfast2", "Rnanoflann", "bigstatsr", "cluster", "doParallel", "emplik", "energy", "foreach", "glmnet", "mda", "minpack_lm", "mixture", "nnet", "quadprog", "quantreg", "sn"]
     },
+    "CompositionalHDDA": {
+      "name": "CompositionalHDDA",
+      "version": "1.0",
+      "sha256": "0dcm9nva1z297g94qy098bbgjy1fpsi2kzm43wms3lh30zw7mv1d",
+      "depends": ["Compositional", "HDclassif", "Rfast"]
+    },
     "CompositionalML": {
       "name": "CompositionalML",
       "version": "1.0",
@@ -6483,9 +6567,9 @@
     },
     "CompositionalRF": {
       "name": "CompositionalRF",
-      "version": "1.2",
-      "sha256": "1s5g8lscmwhqgg0idf79np12shf8iqb1r1ckcy19azi5zxzgixqx",
-      "depends": ["Compositional", "Rcpp", "RcppParallel", "Rfast", "doParallel", "foreach"]
+      "version": "1.3",
+      "sha256": "0hdn15c8alysvmxf2z4rlic50zmsqssh3wbcmpngs0mc6k5skvqx",
+      "depends": ["Compositional", "Rcpp", "RcppParallel", "Rfast"]
     },
     "CompoundEvents": {
       "name": "CompoundEvents",
@@ -6499,6 +6583,12 @@
       "sha256": "0z1fxmsbswd6cnv4r557g55a8lsiwwv13v6i5kw8yayg9xh43knx",
       "depends": []
     },
+    "ConFluxPro": {
+      "name": "ConFluxPro",
+      "version": "1.3.1",
+      "sha256": "0qlzdn31dqmhr1idnqicbpyg8lmpbk2dgbadjrqcq9c1yg1lcqbh",
+      "depends": ["dplyr", "furrr", "ggplot2", "lifecycle", "lubridate", "magrittr", "progressr", "rlang", "scales", "tibble", "tidyr"]
+    },
     "ConNEcT": {
       "name": "ConNEcT",
       "version": "0.7.27",
@@ -6559,12 +6649,6 @@
       "sha256": "0f7wk0sdfqbrbnyjdjx0vssmf03ddp9b64jl7scmv5lfvy2y6zk2",
       "depends": ["R6", "Rdpack", "ggplot2", "gridExtra"]
     },
-    "ConfZIC": {
-      "name": "ConfZIC",
-      "version": "1.0.1",
-      "sha256": "0x9933zirfdkg2ljm3kk1nalk9ri0rrqi11q07dkyh78p4w9lmsp",
-      "depends": ["MuMIn", "cmna", "ltsa", "mvtnorm", "psych", "tidytable"]
-    },
     "ConfidenceEllipse": {
       "name": "ConfidenceEllipse",
       "version": "1.1.0",
@@ -6591,8 +6675,8 @@
     },
     "CongressData": {
       "name": "CongressData",
-      "version": "1.5.4",
-      "sha256": "0hbsbszcwj81p2jnsh9k3ggnn2l0xvj0yk0c9fvqnlqhm07zm3l1",
+      "version": "1.5.5",
+      "sha256": "14cm84jf56wgmm6fgajh7905hx65n281i9j1f0rxaf970p68q8hd",
       "depends": ["curl", "dplyr", "fst", "rlang", "stringr", "tidyselect"]
     },
     "CongreveLamsdell2016": {
@@ -6625,6 +6709,12 @@
       "sha256": "0wzhczs61vmq81k8p9pbm42gq28sv8gjlp5cs19nrxzsjfx56gx4",
       "depends": ["L1pack", "MASS", "PerformanceAnalytics", "car", "frequencyConnectedness", "glmnet", "igraph", "moments", "progress", "quantreg", "riskParityPortfolio", "rmgarch", "rugarch", "urca", "xts", "zoo"]
     },
+    "Connection": {
+      "name": "Connection",
+      "version": "0.1.0",
+      "sha256": "1xkp5d1dpaj47gy2vkwgv3c5lg35g1zxyvg7svxx45yrf6cmi34p",
+      "depends": []
+    },
     "ConsRank": {
       "name": "ConsRank",
       "version": "2.1.5",
@@ -6685,6 +6775,12 @@
       "sha256": "1y4kh00z63a9j8bsjgnf6lmwkivsf5zk8yw6i9d72a8jr2bhb78w",
       "depends": ["lattice", "tkrplot"]
     },
+    "ConversationAlign": {
+      "name": "ConversationAlign",
+      "version": "0.3.2",
+      "sha256": "07qxk98rgal1rxa8xfwb0y0kxqm5n0y5jn4qnq42n4m37ql745f4",
+      "depends": ["DescTools", "YRmisc", "dplyr", "httr", "magrittr", "purrr", "rlang", "stringi", "stringr", "textstem", "tibble", "tidyr", "tidyselect", "zoo"]
+    },
     "ConvertPar": {
       "name": "ConvertPar",
       "version": "0.1",
@@ -6705,8 +6801,8 @@
     },
     "CooccurrenceAffinity": {
       "name": "CooccurrenceAffinity",
-      "version": "1.0",
-      "sha256": "0wn8jkvm5x30vj1vy196l691kbs5aa3j09s5dsa2r54cr34d16mn",
+      "version": "1.0.2",
+      "sha256": "0a8ya9fsbz20bmywbjva1jxgz90sf2vschbbi4ccqxa18fb1wlxl",
       "depends": ["BiasedUrn", "cowplot", "ggplot2", "plyr", "reshape"]
     },
     "CoopGame": {
@@ -6741,9 +6837,9 @@
     },
     "CopernicusMarine": {
       "name": "CopernicusMarine",
-      "version": "0.2.5",
-      "sha256": "0nhrjwp3xav2hsaiiivyi9z6yqmhpwynnv6rgyxhw8rm1clkhwsx",
-      "depends": ["crayon", "dplyr", "httr2", "leaflet", "purrr", "rlang", "sf", "stringr", "tidyr", "xml2"]
+      "version": "0.2.6",
+      "sha256": "11r176c0gz6zdi1nwkhlwwkizrpl9vq2pl3gks98h9c4a9i4qysc",
+      "depends": ["aws_s3", "cli", "dplyr", "httr2", "leaflet", "purrr", "rlang", "sf", "stringr", "tibble", "tidyr", "xml2"]
     },
     "Copula_Markov": {
       "name": "Copula.Markov",
@@ -6837,8 +6933,8 @@
     },
     "Correlplot": {
       "name": "Correlplot",
-      "version": "1.1.0",
-      "sha256": "1kpan2ifpqhw6nzkx1ww6k5xwr624jysz6l6i9xg35np4xfcgrwz",
+      "version": "1.1.2",
+      "sha256": "1vcs1slif1hag7qzgim7apy7az56gbq47j45gjkdx11w5bqjvmmg",
       "depends": ["MASS", "calibrate", "corrplot", "ggplot2", "lsei", "xtable"]
     },
     "Counterfactual": {
@@ -6865,12 +6961,6 @@
       "sha256": "19lb8m36s3ilvh9jia4b291a8wmfwvh2sb8jbpwxg7ksvj5bvcz6",
       "depends": ["Formula", "expm", "lmtest", "numDeriv"]
     },
-    "CovCombR": {
-      "name": "CovCombR",
-      "version": "1.0",
-      "sha256": "07yd0zbvc9db2jw6xigfhxnbkxwb3gxlmywadz7fs3rva2if2ffx",
-      "depends": ["CholWishart", "Matrix", "nlme"]
-    },
     "CovCorTest": {
       "name": "CovCorTest",
       "version": "1.0.0",
@@ -6963,9 +7053,9 @@
     },
     "Cronbach": {
       "name": "Cronbach",
-      "version": "0.2",
-      "sha256": "0c9lc6w9lba0j530n3kyrsvr9gn75gddbc6igns5friaz5j6jrla",
-      "depends": ["Rfast", "boot"]
+      "version": "0.3",
+      "sha256": "0g40dxzcfrp18s5m791ppplrpwdjrhj7ks45c24pidvr1rsvx0li",
+      "depends": ["Rfast", "Rfast2", "boot"]
     },
     "CropBreeding": {
       "name": "CropBreeding",
@@ -6987,8 +7077,8 @@
     },
     "CrossCarry": {
       "name": "CrossCarry",
-      "version": "0.4.0",
-      "sha256": "1nls5knpjfdbzwg8mapkinmmpafs4lpk6x0fayh16f6g5yvk2dr8",
+      "version": "0.5.0",
+      "sha256": "0js86zr38dd7hr9nxmdvj97z7460r9rqnyj6l7nnhrkicrmiry5m",
       "depends": ["MASS", "dplyr", "gee", "ggplot2"]
     },
     "CrossClustering": {
@@ -6997,6 +7087,12 @@
       "sha256": "0by2kwykbm5il3smfi52vzzy18niqjgjflbza66dm5rlbny9dgpb",
       "depends": ["checkmate", "cli", "cluster", "crayon", "dplyr", "flip", "mclust", "purrr"]
     },
+    "CrossExpression": {
+      "name": "CrossExpression",
+      "version": "1.0.0",
+      "sha256": "0jiw76y6j88q5d6pcgf6l8n672mxhkl3vp9h5i2zyg6ci5ln1nhq",
+      "depends": ["Matrix", "RANN", "Rfast", "dplyr", "ggplot2", "stringr"]
+    },
     "CrossValidate": {
       "name": "CrossValidate",
       "version": "2.3.5",
@@ -7083,9 +7179,9 @@
     },
     "Cyclops": {
       "name": "Cyclops",
-      "version": "3.5.1",
-      "sha256": "1nrx8rd107nhza0ccgg2ipg54arg5d2zhyvc8mp6lyjqn1g1mrlb",
-      "depends": ["Andromeda", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "bit64", "dplyr", "rlang", "survival"]
+      "version": "3.6.0",
+      "sha256": "0a7hk0wir7ffkbgj2swq3wprr0jv83zavhxj758nqzj83wmk7km9",
+      "depends": ["Andromeda", "Matrix", "Rcpp", "RcppEigen", "bit", "bit64", "dplyr", "rlang", "survival", "tidyr"]
     },
     "CytOpT": {
       "name": "CytOpT",
@@ -7191,9 +7287,9 @@
     },
     "DALEX": {
       "name": "DALEX",
-      "version": "2.4.3",
-      "sha256": "08cd5nhgd6vaazcqq985kwivg99v6ily4idhgkpz8l9ffl3lavm0",
-      "depends": ["ggplot2", "iBreakDown", "ingredients"]
+      "version": "2.5.2",
+      "sha256": "0r2p591k5b4s67f1h1b0shb4m0vsz39aa57x9q61ypqnr9xv0ba6",
+      "depends": ["ggplot2", "iBreakDown", "ingredients", "kernelshap"]
     },
     "DALEXtra": {
       "name": "DALEXtra",
@@ -7237,12 +7333,6 @@
       "sha256": "0dx6g6yl1sqxg1l3gry3sb3c1j7yhmbjk5z78azyxyjj83v2cvig",
       "depends": ["qpdf"]
     },
-    "DBEST": {
-      "name": "DBEST",
-      "version": "1.8",
-      "sha256": "1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy",
-      "depends": ["zoo"]
-    },
     "DBHC": {
       "name": "DBHC",
       "version": "0.0.3",
@@ -7317,9 +7407,9 @@
     },
     "DCEtool": {
       "name": "DCEtool",
-      "version": "1.1.1",
-      "sha256": "1rz8vi51krznlzfdmhqk9hsf168fvglmki2950d6k0n6c8578y7h",
-      "depends": ["DT", "MASS", "adjustedcranlogs", "dfidx", "ggplot2", "htmltools", "idefix", "knitr", "magrittr", "mlogit", "mvtnorm", "readxl", "remotes", "rlist", "shiny", "shinyBS", "shinyWidgets", "shinycssloaders", "survival", "tidyr", "usethis", "writexl"]
+      "version": "1.2.1",
+      "sha256": "0wk97ljabvns1338zs030kq53vqhffz6bm7v45xz9qqyb5falpr1",
+      "depends": ["DT", "adjustedcranlogs", "ggplot2", "htmltools", "httr", "idefix", "magrittr", "mvtnorm", "readxl", "remotes", "rlist", "shiny", "shinyBS", "shinyWidgets", "shinycssloaders", "shinyhelper", "survival", "usethis", "writexl"]
     },
     "DCG": {
       "name": "DCG",
@@ -7339,12 +7429,6 @@
       "sha256": "0f8q0avzl3jpjly1jsg02lz8h38208j25nfdf1v79qcp4ia7m3pp",
       "depends": ["BiocGenerics", "BiocParallel", "Matrix", "Rcpp", "RcppArmadillo", "ape", "dplyr", "igraph", "matrixStats", "phangorn", "purrr", "rBayesianOptimization", "rlang", "stringr", "tensorflow", "tidyr"]
     },
-    "DCODE": {
-      "name": "DCODE",
-      "version": "1.0",
-      "sha256": "19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n",
-      "depends": ["seqinr"]
-    },
     "DCPO": {
       "name": "DCPO",
       "version": "0.5.3",
@@ -7419,9 +7503,9 @@
     },
     "DDPNA": {
       "name": "DDPNA",
-      "version": "0.3.3",
-      "sha256": "10asskc757c2xmp2xc4v6gzp43jj4db93xjdq8hqqfvr0vyvmffy",
-      "depends": ["Hmisc", "MEGENA", "VennDiagram", "ggalt", "ggplot2", "igraph", "plyr", "scales"]
+      "version": "0.4.1",
+      "sha256": "1kynw40r9vrp8ilg3nmb7zjadymfczf4711k9zkc2bpqd1figv10",
+      "depends": ["Hmisc", "MEGENA", "VennDiagram", "ggfun", "ggplot2", "ggrepel", "igraph", "plyr", "scales"]
     },
     "DDPstar": {
       "name": "DDPstar",
@@ -7527,8 +7611,8 @@
     },
     "DEoptimR": {
       "name": "DEoptimR",
-      "version": "1.1-3-1",
-      "sha256": "18kjq2gcqnicmbdpg5pkzsa4wvy20fprqdkh115k34l6pm176ssq",
+      "version": "1.1-4",
+      "sha256": "18h2wqk1d9w07hmwmcm0jqlxs24zpvknh1gd3glpfpppsq8ds6ss",
       "depends": []
     },
     "DEploid": {
@@ -7599,8 +7683,8 @@
     },
     "DGLMExtPois": {
       "name": "DGLMExtPois",
-      "version": "0.2.3",
-      "sha256": "0bbf7cyrnn1ghvhbnv54pv6325l8v8fy1bayl4b6qgs84xd959p4",
+      "version": "0.2.4",
+      "sha256": "15s1sq0gkpffridrqqjnfgyj5j9nip5kindp4bnqicf168cixcib",
       "depends": ["COMPoissonReg", "nloptr"]
     },
     "DGM": {
@@ -7683,14 +7767,14 @@
     },
     "DIFboost": {
       "name": "DIFboost",
-      "version": "0.3",
-      "sha256": "07x31ccy2l0drv1356g1v4jw71i7zqb3d0v856gsd3kpqhclpvx0",
+      "version": "0.4",
+      "sha256": "01zsbaz3d7ypb5kjh59z7sdb9al9dsjysxahgbiq5ly4f8q4a39v",
       "depends": ["mboost", "penalized", "stabs"]
     },
     "DIFlasso": {
       "name": "DIFlasso",
-      "version": "1.0-4",
-      "sha256": "13ls5018l790cdr26431li4gi9zw03ilypszfqglg4hj485h7dyw",
+      "version": "1.0-5",
+      "sha256": "074z430ljgs4dfnx2yncjmrzirypx98s4lspvr5c07jzmpss590g",
       "depends": ["grplasso", "miscTools", "penalized"]
     },
     "DIFplus": {
@@ -7815,9 +7899,9 @@
     },
     "DLMRMV": {
       "name": "DLMRMV",
-      "version": "0.1.0",
-      "sha256": "0h130bsn203wi6lym8d2439v89ilpmrapkpnb36x7cfsi9y8nbdw",
-      "depends": []
+      "version": "1.0.0",
+      "sha256": "0nlv81jli35k6ywaqjbgw5p2v73jjz5svss2qfslw797nqz4ln5v",
+      "depends": ["MASS", "glmnet"]
     },
     "DLMtool": {
       "name": "DLMtool",
@@ -7873,11 +7957,11 @@
       "sha256": "1bziiyv63lcbmd79fykjj6b63igbbw0pwiq37k7q9l5vij6jfcj9",
       "depends": ["doParallel", "foreach", "matrixStats"]
     },
-    "DMwR2": {
-      "name": "DMwR2",
-      "version": "0.0.2",
-      "sha256": "1vzfbz2k05j8r2hpig3d2grb99rnnh2s1sviii3prcyqicxfh0i9",
-      "depends": ["DBI", "class", "dplyr", "quantmod", "readr", "rpart", "xts", "zoo"]
+    "DNAmf": {
+      "name": "DNAmf",
+      "version": "0.1.0",
+      "sha256": "0n1y3is60fkvpg1fmnd23ny4wzf94rcf68r4n7ajwi7lin6wcxv2",
+      "depends": ["fields", "lhs", "mvtnorm", "plgp"]
     },
     "DNAmixturesLite": {
       "name": "DNAmixturesLite",
@@ -7975,11 +8059,11 @@
       "sha256": "1mzws3w7djpxnfqxjcqwgia7p17kb0qlnzj6qcfg2m1vamb1cn2z",
       "depends": []
     },
-    "DPBBM": {
-      "name": "DPBBM",
-      "version": "0.2.5",
-      "sha256": "1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2",
-      "depends": ["CEoptim", "VGAM", "gplots", "tmvtnorm"]
+    "DPI": {
+      "name": "DPI",
+      "version": "2025.6",
+      "sha256": "1h2csfv7f5s3a9q4dr9iri77yxim5c1yd0m0gn4rcfxkhhzimag1",
+      "depends": ["cli", "crayon", "ggplot2", "glue", "qgraph"]
     },
     "DPP": {
       "name": "DPP",
@@ -7989,8 +8073,8 @@
     },
     "DPQ": {
       "name": "DPQ",
-      "version": "0.5-9",
-      "sha256": "04bmsqp4mkrf4y1s161ql77f2zpqi66cyqyz9xpzgdf0dizsvn50",
+      "version": "0.6-0",
+      "sha256": "0kr1prx189w6bhyhkigcqspw7jcyyspc27jj6g7wsg2vnd9w1fil",
       "depends": ["sfsmisc"]
     },
     "DPQmpfr": {
@@ -8071,6 +8155,12 @@
       "sha256": "0g1qx77zwazg2109nmxm12bsma9nvacydxl5g8rq23dvl2khpkx3",
       "depends": []
     },
+    "DRPT": {
+      "name": "DRPT",
+      "version": "1.1",
+      "sha256": "0m1fdyx96a0rgicrdnn6z6qbf5i6zqsnjw1l6ayzylbna981p995",
+      "depends": ["BiasedUrn", "Rcpp", "Rdpack", "future", "future_apply", "rootSolve"]
+    },
     "DRR": {
       "name": "DRR",
       "version": "0.0.4",
@@ -8145,20 +8235,20 @@
     },
     "DSLite": {
       "name": "DSLite",
-      "version": "1.4.0",
-      "sha256": "1xc9igwsxwiirg40br1qckai0lzhijfnpdrxg94r38hngb7r5cy2",
+      "version": "1.4.1",
+      "sha256": "0gm2viwavy04irhl9xmk0sbfgwvv4g6qamjmg4yrcwracx5k7zbz",
       "depends": ["DSI", "R6", "rly"]
     },
     "DSMolgenisArmadillo": {
       "name": "DSMolgenisArmadillo",
-      "version": "2.0.9",
-      "sha256": "0myhpkblj8dl1csqd91wk7xr4zvnk400ygqbwbajayjn6l7dvqmd",
-      "depends": ["DSI", "MolgenisAuth", "base64enc", "dplyr", "httr", "jsonlite", "stringr", "urltools"]
+      "version": "3.0.0",
+      "sha256": "0jj04z70m3xg7ipj7wk6ngl9rpisdizpdk0qwsigv9ak6dlbc8ny",
+      "depends": ["DSI", "MolgenisAuth", "base64enc", "dplyr", "httr", "jsonlite", "lifecycle", "stringr", "urltools"]
     },
     "DSOpal": {
       "name": "DSOpal",
-      "version": "1.4.0",
-      "sha256": "1jhjk2anh5kc421r0l8v0s5cbnqhdwwiirk1zcmmgk62k3an0lsf",
+      "version": "1.4.1",
+      "sha256": "0n06rjj0kp4i1rzb4l8w0nn92a3idwyanrcqvy2z8xdaqgk4qk6x",
       "depends": ["DSI", "opalr"]
     },
     "DSSAT": {
@@ -8199,8 +8289,8 @@
     },
     "DTAT": {
       "name": "DTAT",
-      "version": "0.3-7",
-      "sha256": "0rh09bdygqwzdlx0girs2ir5dy3jd3r2m4xia46njxvh3jld5vsg",
+      "version": "0.3-8",
+      "sha256": "107ziajbappl4xvi555g2df35lcyb3514jnwj661kv535bsj5ind",
       "depends": ["Hmisc", "data_table", "dplyr", "jsonlite", "km_ci", "pomp", "r2d3", "shiny", "survival"]
     },
     "DTAXG": {
@@ -8281,12 +8371,6 @@
       "sha256": "1f1di9ypq6f0929pq15xncf7zw16wlqap4rchbia27n39cv15dni",
       "depends": ["BiocParallel", "dplyr", "fgsea", "igraph", "magrittr", "stringr", "tibble", "tidyr"]
     },
-    "DTSR": {
-      "name": "DTSR",
-      "version": "0.2.0",
-      "sha256": "12rn5hh1vaf9j2vb8wai1m4ikm071d2s14ph7a6rh1hz1ag0mk8m",
-      "depends": ["DMwR2", "MASS", "cluster", "mvdalab"]
-    },
     "DTSg": {
       "name": "DTSg",
       "version": "2.0.0",
@@ -8319,8 +8403,8 @@
     },
     "DVHmetrics": {
       "name": "DVHmetrics",
-      "version": "0.4.2",
-      "sha256": "0dxbjqiqhzjrv867qhxmqavzklq0j3qjv4qwdacyrq8faz82vhv7",
+      "version": "0.4.3",
+      "sha256": "0rs31mbadfli1w1gair8ycrnsbc29mm2qm7fprbla3krzspfwg8f",
       "depends": ["DT", "KernSmooth", "ggplot2", "reshape2", "shiny"]
     },
     "DWDLargeR": {
@@ -8427,8 +8511,8 @@
     },
     "DataExplorer": {
       "name": "DataExplorer",
-      "version": "0.8.3",
-      "sha256": "11a0b6jrvf81sa0a8595q48j66qky4xya3mvr3vr41vj0k98p90y",
+      "version": "0.8.4",
+      "sha256": "16c5rr4h8bv4m7ynlhaahmahfb1206ld0r06hxpfkkw6s67hnydz",
       "depends": ["data_table", "ggplot2", "gridExtra", "networkD3", "reshape2", "rmarkdown", "scales"]
     },
     "DataGraph": {
@@ -8469,8 +8553,8 @@
     },
     "DataSimilarity": {
       "name": "DataSimilarity",
-      "version": "0.1.1",
-      "sha256": "1ncnxwdma0yli6ymhgh33g2ybizgmfshidhkwl1prdal2x9v0f42",
+      "version": "0.2.0",
+      "sha256": "1i6chd06cjsidhy73if6wmibikdpxd1hdy29fk8frz6j2mc3smcw",
       "depends": ["boot"]
     },
     "DataSpaceR": {
@@ -8559,8 +8643,8 @@
     },
     "DeSciDe": {
       "name": "DeSciDe",
-      "version": "1.0.0",
-      "sha256": "17y9lzfpnq0ndbq68c6drm193pr7d5xwcpcjd10w2chx72h5hzi4",
+      "version": "1.0.1",
+      "sha256": "1qh94kgqqw2vjs0cgrnp2048jk0pzlz8dcz8h68df3pmnga4b32g",
       "depends": ["ComplexHeatmap", "STRINGdb", "circlize", "data_table", "dplyr", "ggplot2", "ggrepel", "igraph", "magrittr", "openxlsx", "rentrez", "tibble", "tidyr"]
     },
     "DebiasInfer": {
@@ -8577,8 +8661,8 @@
     },
     "DecomposeR": {
       "name": "DecomposeR",
-      "version": "1.0.6",
-      "sha256": "0f5bagmn0s15qhw0c7fiv96r2ih365fak1rz3pxfnaqmm20l2j8i",
+      "version": "1.0.7",
+      "sha256": "1kq8ga0wrbgjpyy45zhs13gnhrlxya9mxxq0p8ljg9mqnf93yni9",
       "depends": ["StratigrapheR", "colorRamps", "dplyr", "hexbin", "tictoc", "usethis"]
     },
     "DecorateR": {
@@ -8607,8 +8691,8 @@
     },
     "Delaporte": {
       "name": "Delaporte",
-      "version": "8.4.1",
-      "sha256": "1gv0js21x5sh54vjkvyh41ph1ixk1nw7ajm111fwz95prd9wx04v",
+      "version": "8.4.2",
+      "sha256": "19ncmmjrzxw87blmj11xigk9qza7q68r5yqj187895r3415ani4g",
       "depends": []
     },
     "DelayedEffect_Design": {
@@ -8685,8 +8769,8 @@
     },
     "Deriv": {
       "name": "Deriv",
-      "version": "4.1.6",
-      "sha256": "0wmslhggdhamvzfa0nvj6j5bc8jhiy3n5q0p5ha9bcsyvi92mf01",
+      "version": "4.2.0",
+      "sha256": "0qqz588rvak0fsnbpidxdz4i0g2s7jav3s1p7nagvrhgz7kr80r1",
       "depends": []
     },
     "DescTools": {
@@ -8937,8 +9021,8 @@
     },
     "Directional": {
       "name": "Directional",
-      "version": "7.1",
-      "sha256": "0zyihh16ra1d8iy1cfv9qq2ysq88n31zn2ah2nf9gzzfsnnj0cqx",
+      "version": "7.2",
+      "sha256": "127rk32w2524awcdvhcgdc0qb134g4g58871grdf3lm2ipzdqa1a",
       "depends": ["Rfast", "Rfast2", "Rnanoflann", "bigstatsr", "doParallel", "foreach", "ggplot2", "magrittr", "rgl", "rnaturalearth", "sf"]
     },
     "DirichletReg": {
@@ -8965,6 +9049,12 @@
       "sha256": "1wd6jxdi1ib24hpkn2ghrv91gyi0qmpgvvhdscmx58w6vxlk1rsz",
       "depends": ["Matrix", "Rdpack", "lars", "withr", "zoo"]
     },
+    "DisasterAlert": {
+      "name": "DisasterAlert",
+      "version": "1.0.0",
+      "sha256": "1y5yrqlmh7gyfx5hbhasdk4xw1m039anwghn8jinmkc5s9541zwb",
+      "depends": ["DT", "RColorBrewer", "dplyr", "ggplot2", "htmlwidgets", "leaflet", "plotly", "quanteda", "scales", "stringr", "textdata", "tidyr", "tidytext", "tidyverse", "wordcloud"]
+    },
     "DiscreteDLM": {
       "name": "DiscreteDLM",
       "version": "1.0.0",
@@ -9045,9 +9135,9 @@
     },
     "Distance": {
       "name": "Distance",
-      "version": "2.0.0",
-      "sha256": "1q3xv5wvpmck19ziq7md8q274br7dbwm3xizbdgj5rq18n1yfcsr",
-      "depends": ["dplyr", "mrds", "rlang"]
+      "version": "2.0.1",
+      "sha256": "17cbjsmxc59hxm5j8z2jcc978w0f34g37kprc9vnlj3s7iprqlx6",
+      "depends": ["Rdpack", "dplyr", "mrds", "rlang"]
     },
     "DistatisR": {
       "name": "DistatisR",
@@ -9061,12 +9151,6 @@
       "sha256": "072km5alfd9ba2p4qvrysdfrqbm8dksjwn3hkcidh6sg5m0g7aiw",
       "depends": ["dplyr", "rlang", "statmod"]
     },
-    "DistributionIV": {
-      "name": "DistributionIV",
-      "version": "0.1.0",
-      "sha256": "0n1z2vq0avr0mmr0125zpv2qinwpnivrdjgfgnh9cx3ss76ghzam",
-      "depends": ["checkmate", "torch", "vctrs"]
-    },
     "DistributionOptimization": {
       "name": "DistributionOptimization",
       "version": "1.2.6",
@@ -9135,14 +9219,14 @@
     },
     "Docovt": {
       "name": "Docovt",
-      "version": "0.1",
-      "sha256": "0kvdz1jd4zhnz21drq6b84237nrr6dh5h2lfi66fgj39p5bzbg8x",
+      "version": "0.2",
+      "sha256": "1ss7i0q7q05s6m5943yvj1hbp44kb1yp80jgy2fhph10j6bch9jj",
       "depends": []
     },
     "Dogoftest": {
       "name": "Dogoftest",
-      "version": "0.1",
-      "sha256": "0lf36mvng5qwsh0z0k54h1vhypnnpggbdgklraqqqnyr0np06rh1",
+      "version": "0.3",
+      "sha256": "12j9j3qf3i9ifh61qwi3fdz229nz4pvhyrcybhvxzgd8nqpxs89b",
       "depends": []
     },
     "Domean": {
@@ -9159,8 +9243,8 @@
     },
     "DoseFinding": {
       "name": "DoseFinding",
-      "version": "1.3-1",
-      "sha256": "1hg83ydq3k2wwaar4dwad8qrsgd3qixq3lgryzq2xg3p63qq70rq",
+      "version": "1.4-1",
+      "sha256": "0hir12c2f3vyfyw7vhcbkny62rghq6q6gkklfi9xad8rfgjq8m0n",
       "depends": ["ggplot2", "lattice", "mvtnorm"]
     },
     "DoubleCone": {
@@ -9231,9 +9315,9 @@
     },
     "DrugExposureDiagnostics": {
       "name": "DrugExposureDiagnostics",
-      "version": "1.1.3",
-      "sha256": "0782mdd54k15lkzqcrddacbv3s14yga9anklz9p01si68pi4vja5",
-      "depends": ["CDMConnector", "DrugUtilisation", "R6", "checkmate", "clock", "dplyr", "glue", "magrittr", "omopgenerics", "rlang", "tidyr", "tidyselect"]
+      "version": "1.1.4",
+      "sha256": "0v84shp54d3nh1ang7pvd5hy9i5nwgx7sgydkm3lz4yxiwkwfycj",
+      "depends": ["CDMConnector", "DrugUtilisation", "R6", "checkmate", "dplyr", "glue", "magrittr", "omopgenerics", "rlang", "tidyr", "tidyselect"]
     },
     "DrugSim2DR": {
       "name": "DrugSim2DR",
@@ -9243,8 +9327,8 @@
     },
     "DrugUtilisation": {
       "name": "DrugUtilisation",
-      "version": "1.0.3",
-      "sha256": "0hgg6mrlfx2lq25g5m01qczhbalfh0rrsji3kq4lx3rzw0j58f0h",
+      "version": "1.0.4",
+      "sha256": "0b9xvxf04h2fwjzncq5s04l0k9yvdk5ql0a3ywg57jndgd1sr616",
       "depends": ["CDMConnector", "CodelistGenerator", "PatientProfiles", "cli", "clock", "dplyr", "glue", "omopgenerics", "purrr", "rlang", "stringr", "tidyr"]
     },
     "DstarM": {
@@ -9453,9 +9537,9 @@
     },
     "EDCimport": {
       "name": "EDCimport",
-      "version": "0.5.2",
-      "sha256": "1c000mmy5krlq5203xjhhnwi44isqbph627cbg2j38ygw5ilvp50",
-      "depends": ["cli", "dplyr", "forcats", "fs", "ggplot2", "glue", "haven", "lifecycle", "purrr", "readr", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyselect"]
+      "version": "0.6.0",
+      "sha256": "0z4xc22fry8r4422l1hlmxhvi3yz6dzkw41hhdidw38wvrl7vaim",
+      "depends": ["cli", "dplyr", "forcats", "fs", "ggplot2", "glue", "haven", "lifecycle", "lubridate", "purrr", "readr", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "EDFtest": {
       "name": "EDFtest",
@@ -9537,8 +9621,8 @@
     },
     "EESPCA": {
       "name": "EESPCA",
-      "version": "0.7.0",
-      "sha256": "0bj1wi1almj7rb7sad4i47mnfh4y83mbdd1x5clda6nd738adl2b",
+      "version": "0.8.0",
+      "sha256": "0hyznkl893bpqf3qq3b6q1clnb8hhgc0j801d42bxd50pwqswmgh",
       "depends": ["MASS", "PMA", "rifle"]
     },
     "EFA_MRFA": {
@@ -9561,8 +9645,8 @@
     },
     "EFAtools": {
       "name": "EFAtools",
-      "version": "0.5.0",
-      "sha256": "12n5cl1i6a5gxc9zmjj3ydrf54c834kfpzm46dk10x813mqgkmab",
+      "version": "0.6.1",
+      "sha256": "0x2c1a1fwa79pdam2day57rpcyxf195a4kqsnwzr2xh6x1fjrnad",
       "depends": ["GPArotation", "Rcpp", "RcppArmadillo", "checkmate", "cli", "crayon", "dplyr", "future", "future_apply", "ggplot2", "lavaan", "magrittr", "progress", "progressr", "psych", "rlang", "stringr", "tibble", "tidyr", "viridisLite"]
     },
     "EFAutilities": {
@@ -9615,9 +9699,9 @@
     },
     "EHRmuse": {
       "name": "EHRmuse",
-      "version": "0.0.2.1",
-      "sha256": "0l1bbbn1vw18lzysw7xgrmi3lm69y5fi2f47wmm9vm5mcw4hlcvm",
-      "depends": ["MASS", "dplyr", "magrittr", "nleqslv", "nnet", "simplexreg", "survey", "xgboost"]
+      "version": "0.0.2.2",
+      "sha256": "1vk333p45x45hi5xckn1zr5hrdarqhpxflqm8c31k57gq48qaaaq",
+      "depends": ["Formula", "MASS", "dplyr", "magrittr", "nleqslv", "nnet", "plotrix", "survey", "xgboost"]
     },
     "EHRtemporalVariability": {
       "name": "EHRtemporalVariability",
@@ -9627,8 +9711,8 @@
     },
     "EIAapi": {
       "name": "EIAapi",
-      "version": "0.1.2",
-      "sha256": "1vyl7zm8vwqcs57b8sw9vkwc1p123kcz2d2xldg6p2vfkgi91jw1",
+      "version": "0.2.0",
+      "sha256": "1k5351i9hl2zik1bvw2khb37a59aymy7b7z68miiw7q0chh7dcm5",
       "depends": ["data_table", "dplyr", "jsonlite", "lubridate"]
     },
     "EIEntropy": {
@@ -9711,9 +9795,9 @@
     },
     "EMC2": {
       "name": "EMC2",
-      "version": "3.1.1",
-      "sha256": "1vfkf91vrzkdl4d0mvp8ci9wrgifjs3wd2ajm23rp4blczlrbap5",
-      "depends": ["Brobdingnag", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "WienR", "abind", "coda", "colorspace", "corpcor", "corrplot", "lpSolve", "magic", "matrixcalc", "msm", "mvtnorm", "psych"]
+      "version": "3.2.0",
+      "sha256": "0yl1l2ai051sydhp9i2hj6ywjylgh6hmnxzrxqjsq429b210746z",
+      "depends": ["Brobdingnag", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "WienR", "abind", "coda", "colorspace", "corrplot", "lpSolve", "magic", "matrixcalc", "msm", "mvtnorm", "psych"]
     },
     "EMCluster": {
       "name": "EMCluster",
@@ -9747,8 +9831,8 @@
     },
     "EML": {
       "name": "EML",
-      "version": "2.0.6.1",
-      "sha256": "1k2chfz6qixa6jsikqgilqp8j49mcshn725ck1h77bacfxfhf7za",
+      "version": "2.0.7",
+      "sha256": "0q432jgfl4wc9mrgfyksnl6b9fz404pc06q3214wi8l34w7317bq",
       "depends": ["digest", "dplyr", "emld", "jqr", "jsonlite", "rmarkdown", "uuid", "xml2"]
     },
     "EMLI": {
@@ -9757,6 +9841,12 @@
       "sha256": "0zwbbxsmkyrgmva5h8l78f181nz5asc7dpdcmajvj2y3yl1rb278",
       "depends": []
     },
+    "EMMAgeo": {
+      "name": "EMMAgeo",
+      "version": "0.9.9",
+      "sha256": "10dg7077szfnv19a10xkj1xn4kgikvv5l8mbii5sfnbf3zgj3zn2",
+      "depends": ["GPArotation", "caTools", "nnls", "shiny"]
+    },
     "EMMIXSSL": {
       "name": "EMMIXSSL",
       "version": "1.1.1",
@@ -9787,6 +9877,12 @@
       "sha256": "0qwj4jlfhppjxwcjldh49b6idnagazrxybaid3k2c269wvxwvddq",
       "depends": ["Matrix"]
     },
+    "EMOTIONS": {
+      "name": "EMOTIONS",
+      "version": "1.0",
+      "sha256": "1ngjzyn840vm9z9nyj154z3x1qvf6wa3rv4nk93jmlgi13slj86v",
+      "depends": ["dplyr", "ggplot2", "ggridges", "minpack_lm", "orthopolynom", "parameters", "quantreg", "rlang", "tidyr", "tidyselect"]
+    },
     "EMP": {
       "name": "EMP",
       "version": "2.0.6",
@@ -9823,12 +9919,6 @@
       "sha256": "0g4s99cbww9wi89acbpn8ggkfkf39nq0km0nhm5956r62sjw2wfr",
       "depends": []
     },
-    "EMTscore": {
-      "name": "EMTscore",
-      "version": "0.1.1",
-      "sha256": "1ypchz5frnfn1val0hfr5hfcb4fx98sch7v45iddbp59n6bmfwly",
-      "depends": ["AUCell", "ComplexHeatmap", "GSA", "GSVA", "Seurat", "circlize", "curl", "doParallel", "dplyr", "foreach", "ggplot2", "ggpubr", "ggthemes", "gridExtra", "magrittr", "nsprcomp", "paletteer", "pheatmap", "stringr"]
-    },
     "EMbC": {
       "name": "EMbC",
       "version": "2.0.4",
@@ -9837,8 +9927,8 @@
     },
     "EMgaussian": {
       "name": "EMgaussian",
-      "version": "0.2.1",
-      "sha256": "0gl3lfww7chwsvg16m5x6agbza4xx482b56wqccb9zqin0j89dfb",
+      "version": "0.2.2",
+      "sha256": "103lrfkclhr4myas1sdscs7rr1mcxhdvymy45hpr8rlyi4ddxn1r",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "caret", "glasso", "glassoFast", "lavaan", "matrixcalc"]
     },
     "EMpeaksR": {
@@ -9849,8 +9939,8 @@
     },
     "ENMTools": {
       "name": "ENMTools",
-      "version": "1.1.2",
-      "sha256": "0xz0v378mfy36yc001zr8j8s2dv6jpq2w2da7n3lsxarr8slqp8m",
+      "version": "1.1.5",
+      "sha256": "09f1k4z2pn6iyvxlldy0qjmj9a8k8rdma08sby1qg44nwsy1izr4",
       "depends": ["ENMeval", "dismo", "forcats", "ggplot2", "ggpubr", "gridExtra", "knitr", "lhs", "magrittr", "raster", "spatstat_geom", "spatstat_random", "terra"]
     },
     "ENMeval": {
@@ -9909,9 +9999,9 @@
     },
     "ER": {
       "name": "ER",
-      "version": "1.1.1",
-      "sha256": "1hsp5sqhnsz175nc2cq2w4g6dgld1429ib7w58piw6982b7m6zn6",
-      "depends": ["ggplot2", "glmnet", "gridExtra", "pls", "plsVarSel", "scales"]
+      "version": "1.1.2",
+      "sha256": "1vsvcdpq6izfjy1h6h8lfs403fdr9biw4s69pan9kx24pwmxc2ry",
+      "depends": ["crayon", "ggplot2", "glmnet", "gridExtra", "pls", "plsVarSel", "scales"]
     },
     "ERDbuilder": {
       "name": "ERDbuilder",
@@ -10401,8 +10491,8 @@
     },
     "Epi": {
       "name": "Epi",
-      "version": "2.59",
-      "sha256": "0dvnjrw81mmmnbi6jdvd3c1942c4aqpd64nzs09nml0win831mh0",
+      "version": "2.60",
+      "sha256": "0mzcd82afjy2xsv7809qcnfabvrskc0cx3vkaac3c10gg8ddkmi9",
       "depends": ["MASS", "Matrix", "cmprsk", "data_table", "dplyr", "etm", "magrittr", "mgcv", "numDeriv", "plyr", "survival", "zoo"]
     },
     "EpiContactTrace": {
@@ -10425,8 +10515,8 @@
     },
     "EpiEstim": {
       "name": "EpiEstim",
-      "version": "2.2-4",
-      "sha256": "12zv1mlb0gqsvff1s0fvqgxqk42c7y9gz3h94mjmf1wbmhsjcqnf",
+      "version": "2.2-5",
+      "sha256": "1z1p8qgvbx2iydqj92y5xyd5g7brjr37dj5pabjj5r4nm7g2h7nc",
       "depends": ["coarseDataTools", "coda", "fitdistrplus", "ggplot2", "gridExtra", "incidence", "reshape2", "scales"]
     },
     "EpiForsk": {
@@ -10851,8 +10941,8 @@
     },
     "ExtremalDep": {
       "name": "ExtremalDep",
-      "version": "0.0.4-4",
-      "sha256": "1k0b7i14vib00z79wymxk5jh413acqb3pp8bz4m0iv0xsmf38l2n",
+      "version": "0.0.4-5",
+      "sha256": "08d808qpc6mknd7n0jzv2r3vf4wa95iq7dfhlwrdr9wbyhjl0fa9",
       "depends": ["cluster", "copula", "doParallel", "evd", "fda", "foreach", "gtools", "mvtnorm", "nloptr", "numDeriv", "quadprog", "sn"]
     },
     "ExtremeBounds": {
@@ -10917,8 +11007,8 @@
     },
     "FAMetA": {
       "name": "FAMetA",
-      "version": "0.1.6",
-      "sha256": "0hn4g0qqiy15jg42g27v0rmplm8gh84fr0kpp7q56c21mcs5w4h3",
+      "version": "0.1.7",
+      "sha256": "1klyh2bh2343x4lsiibqm522kjwq7wp70p19cbwdhx9idfn4arwg",
       "depends": ["LipidMS", "accucor", "gplots", "gtools", "knitr", "minpack_lm", "plyr", "rmarkdown", "scales", "tidyr"]
     },
     "FAMoS": {
@@ -10947,8 +11037,8 @@
     },
     "FARS": {
       "name": "FARS",
-      "version": "0.4.0",
-      "sha256": "0r5m66wvh8fp1bs7zz38p93k8v9hq6v106n3ax5qxxfayfg8s6c2",
+      "version": "0.5.0",
+      "sha256": "0qwzv99bgdrihxmykawjfh2nb697mcr4mmk5d7brbs6145gzxaci",
       "depends": ["MASS", "SyScSelection", "dplyr", "ellipse", "forcats", "ggplot2", "nloptr", "plotly", "quantreg", "reshape2", "sn", "stringr", "tidyr"]
     },
     "FAS": {
@@ -11001,9 +11091,9 @@
     },
     "FAwR": {
       "name": "FAwR",
-      "version": "1.1.2",
-      "sha256": "1x90wvp0w7fhid7i5160b4fiv4xn5mpvy33zjzy0mvqvp0yp8xf0",
-      "depends": ["MASS", "glpkAPI", "lattice"]
+      "version": "1.2.0",
+      "sha256": "1flj639h2dad0bl2nx91lvm063mixrfdwn5dfsf5m6zxp84j3zmg",
+      "depends": ["MASS", "lattice"]
     },
     "FBCRM": {
       "name": "FBCRM",
@@ -11181,8 +11271,8 @@
     },
     "FIESTAutils": {
       "name": "FIESTAutils",
-      "version": "1.3.1",
-      "sha256": "10sjr439hn7xzc3qmi8r74408q9fr2fpggq1220syy1k2dnh6sri",
+      "version": "1.3.2",
+      "sha256": "0140wr7rz32w2c2crbpsanxp9c9axzxnxg8gy70iry2jjk3r49p8",
       "depends": ["DBI", "JoSAE", "RColorBrewer", "RPostgres", "RSQLite", "Rcpp", "data_table", "gdalraster", "hbsae", "mase", "nlme", "sae", "sf", "sqldf", "terra", "units"]
     },
     "FILEST": {
@@ -11221,6 +11311,12 @@
       "sha256": "0ag8mzbjf2paslqspb18dk0ndqbp5rhmlmz9p2q2gxljfrdkzqkd",
       "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "rARPACK"]
     },
+    "FKmL": {
+      "name": "FKmL",
+      "version": "0.1.1",
+      "sha256": "187fsaq8s7yfqx2lmm8yjja6c9s5gl8s5i0vark0h0p3ymf0f15v",
+      "depends": ["abind", "dplyr", "ggplot2", "proxy"]
+    },
     "FLAG": {
       "name": "FLAG",
       "version": "0.1",
@@ -11247,8 +11343,8 @@
     },
     "FLORAL": {
       "name": "FLORAL",
-      "version": "0.4.0",
-      "sha256": "17g20p2f0hm9g5i44g3bwfyy6s9sqjjyzq065x0k7sfmfk5kr686",
+      "version": "0.5.0",
+      "sha256": "1hqqjkfjpqcid37m9p9nk41dbm7pl9a0yi2qgmwxxhi17pzdkz7g",
       "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "ast2ast", "caret", "doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "glmnet", "msm", "mvtnorm", "phyloseq", "reshape", "survcomp", "survival"]
     },
     "FLR": {
@@ -11257,6 +11353,12 @@
       "sha256": "0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n",
       "depends": ["combinat"]
     },
+    "FLSSS": {
+      "name": "FLSSS",
+      "version": "9.2.8",
+      "sha256": "05siyr7kaw0z1khikaqy0i00sv6f7lm4dgyv0z1jp8r1lvxcx92j",
+      "depends": ["Rcpp", "RcppParallel"]
+    },
     "FLightR": {
       "name": "FLightR",
       "version": "0.5.5",
@@ -11289,8 +11391,8 @@
     },
     "FME": {
       "name": "FME",
-      "version": "1.3.6.3",
-      "sha256": "189n3svhlfp86svn8p88wi38lhsz0bqndys0pq87c6grsj5c5i43",
+      "version": "1.3.6.4",
+      "sha256": "1sgap9knr9486x4aa4rwjilbfa8ysyklw0b1sridhipnipf3jvab",
       "depends": ["MASS", "coda", "deSolve", "minpack_lm", "minqa", "rootSolve"]
     },
     "FMM": {
@@ -11343,9 +11445,9 @@
     },
     "FORTLS": {
       "name": "FORTLS",
-      "version": "1.5.3",
-      "sha256": "12nzqysz7msgvg56djsfh7ysngadag6c4dzw11v1cflciv0wbcx8",
-      "depends": ["Distance", "RCSF", "Rcpp", "RcppArmadillo", "RcppEigen", "Rfast", "VoxR", "data_table", "dbscan", "dplyr", "glue", "htmlwidgets", "lidR", "mapview", "moments", "plotly", "progress", "raster", "reticulate", "scales", "sf", "terra", "tidyr", "vroom"]
+      "version": "1.6.0",
+      "sha256": "1cfxcj8ivpbbsnjgwba7bv6r0pwp2kiv8i50rxlfb82jw46hr6xk",
+      "depends": ["Distance", "RCSF", "Rcpp", "RcppArmadillo", "RcppEigen", "VoxR", "data_table", "dbscan", "glue", "htmlwidgets", "lidR", "moments", "plotly", "progress", "raster", "reticulate", "scales", "sf", "tidyr", "vroom"]
     },
     "FPCA3D": {
       "name": "FPCA3D",
@@ -11553,8 +11655,8 @@
     },
     "FactoMineR": {
       "name": "FactoMineR",
-      "version": "2.11",
-      "sha256": "0qzhfjcz0kahqf214g4xs7gfpqx05xbfiwa5r2ldgn2drd16phij",
+      "version": "2.12",
+      "sha256": "18mny9i6s3ischhls28lxy8igji96pqic1l65mxh31f4ikjswr60",
       "depends": ["DT", "MASS", "car", "cluster", "ellipse", "emmeans", "flashClust", "ggplot2", "ggrepel", "lattice", "leaps", "multcompView", "scatterplot3d"]
     },
     "FactorAssumptions": {
@@ -11631,8 +11733,8 @@
     },
     "FastCUB": {
       "name": "FastCUB",
-      "version": "0.0.3",
-      "sha256": "11mn7nd629pkxbb5cxw0ahqchl7vjn885f0z6lzs515n54fclkk7",
+      "version": "0.0.4",
+      "sha256": "0hscxq52abfxb8y3l25rjsxikzi8w6amgxl7brvgayp3yici1fwv",
       "depends": ["CUB", "Formula"]
     },
     "FastGP": {
@@ -11661,9 +11763,9 @@
     },
     "FastJM": {
       "name": "FastJM",
-      "version": "1.4.2",
-      "sha256": "0h5kywvbwxd13ghgvfgx1sr7k4ywgk4c51xfpr8dvqig9nnvrav8",
-      "depends": ["MASS", "Rcpp", "RcppEigen", "caret", "dplyr", "nlme", "statmod", "survival", "timeROC"]
+      "version": "1.5.1",
+      "sha256": "0f3m3qzhrvicab8c6mzj554zxwhih85b8s3a20apsp1qvh47j9wl",
+      "depends": ["MASS", "Rcpp", "RcppEigen", "caret", "dplyr", "magrittr", "nlme", "statmod", "survival", "timeROC"]
     },
     "FastKM": {
       "name": "FastKM",
@@ -11767,12 +11869,6 @@
       "sha256": "0h7xmzqyd8brnii3xr1njwg5psw3cpn5jqmn59fqaa4xm7mx242r",
       "depends": ["DT", "callr", "ggplot2", "httr", "pracma", "purrr", "shiny", "shinyjs"]
     },
-    "FeedbackTS": {
-      "name": "FeedbackTS",
-      "version": "1.5",
-      "sha256": "120labhmisw1x1bq8c4bl6l14vayvb9xcm6jsj1awacypgrr2ar2",
-      "depends": ["automap", "gstat", "mapdata", "maps", "proj4", "sp"]
-    },
     "FertBoot": {
       "name": "FertBoot",
       "version": "0.5.0",
@@ -11985,8 +12081,8 @@
     },
     "FlowScreen": {
       "name": "FlowScreen",
-      "version": "1.2.6",
-      "sha256": "1s9xyrvfsgrl2zxm2an5qj3rs1qx7v7j8wc83jzl28pkwa5xr351",
+      "version": "2.1",
+      "sha256": "1528yiiz3zq4kqvd89ihm491lv8q3hm38ng4d9jinz5c7vwgrh5j",
       "depends": ["changepoint", "evir", "zyp"]
     },
     "FlowerMate": {
@@ -12033,8 +12129,8 @@
     },
     "ForLion": {
       "name": "ForLion",
-      "version": "0.2.0",
-      "sha256": "023j37ibdhl115nfrs0pcqx22qf7svc3h7gs7548kk5srm976qv7",
+      "version": "0.3.0",
+      "sha256": "1f4vchv25pmcjw5w00jir0b6z8rzqflk7rlp308a8nldg09lbnxc",
       "depends": ["cubature", "psych"]
     },
     "ForagingOrg": {
@@ -12247,10 +12343,16 @@
       "sha256": "1f1zdwr9pmpscb8va9gd7yl0vyxmv0hy6swfrh7074whvs0dkbn7",
       "depends": ["MASS", "caret", "fda", "funData", "glmnet", "lava"]
     },
+    "FunctionalCalibration": {
+      "name": "FunctionalCalibration",
+      "version": "1.0.0",
+      "sha256": "1q5drb7c282nb8d0a8j2xa501jwfziyc3m9lkkpkjmz9r3ajccci",
+      "depends": ["wavethresh"]
+    },
     "FunnelPlotR": {
       "name": "FunnelPlotR",
-      "version": "0.5.0",
-      "sha256": "0h3nq5dd14n49zzgwaqqsh5qdx1xcsgskzqsajz1qpy86bm4ji89",
+      "version": "0.6.0",
+      "sha256": "1gj7x3dbnjz0v2h9vbdjgxvca0wvr8q5v37qnnxwvfpmgll1dc4l",
       "depends": ["dplyr", "ggplot2", "ggrepel", "rlang", "scales"]
     },
     "FusionLearn": {
@@ -12339,14 +12441,14 @@
     },
     "FuzzySTs": {
       "name": "FuzzySTs",
-      "version": "0.3",
-      "sha256": "01bzkq9aj2afj87vz6vn6i8cs2368ppb5z9fpwlpkyjpp2a0cxsv",
+      "version": "0.4",
+      "sha256": "0shc6ib8ip8hhp8lg7vccdd5kqljb8s91lznbrqb6hrvjmjjvvay",
       "depends": ["FuzzyNumbers", "polynom"]
     },
     "FuzzySimRes": {
       "name": "FuzzySimRes",
-      "version": "0.4.5",
-      "sha256": "06vixzj76g071dvakk6jc2awsfhxi7bsd1ssanaa2rmkn3bj9kb4",
+      "version": "0.4.7",
+      "sha256": "1qjhas3q5080plpql8jy4nxhvkvszgvagba729xw0gkgsh6fxxyl",
       "depends": ["FuzzyNumbers", "palasso"]
     },
     "FuzzyStatTra": {
@@ -12439,6 +12541,12 @@
       "sha256": "076ijbv734ip2lgl02kk62jwwxdzspma98rfppk3ln4hz24nfklz",
       "depends": ["ComplexHeatmap", "RColorBrewer", "Rcpp", "circlize", "dendextend", "gridExtra", "magick", "seriation"]
     },
+    "GARCH_X": {
+      "name": "GARCH.X",
+      "version": "1.0",
+      "sha256": "1rarfkfjxfzjg7v864if0nn8zvnabw9cd5pszq7998avrv9h162k",
+      "depends": ["GA", "GenSA", "pso"]
+    },
     "GARCHIto": {
       "name": "GARCHIto",
       "version": "0.1.0",
@@ -12501,8 +12609,8 @@
     },
     "GCCfactor": {
       "name": "GCCfactor",
-      "version": "1.0.1",
-      "sha256": "1rxn0v4msfr5rwqc91ypafnvwa23n5574s8lhqmdqq53rs32ff89",
+      "version": "1.1.0",
+      "sha256": "1dcmghvrv3kmrjnzfx5min3lfjxy1f9rgrm9b34h1f29kd0k79qn",
       "depends": ["sandwich", "stringr"]
     },
     "GCD": {
@@ -12511,6 +12619,12 @@
       "sha256": "1259z76hajapzzq75fas2sq19r0wapn1ybghdaqdc6dksifdz6fv",
       "depends": ["raster"]
     },
+    "GCEstim": {
+      "name": "GCEstim",
+      "version": "0.1.0",
+      "sha256": "0q0jr2xzbwdrxrbphfqnqjl6vw3k4s2p5pnwgbp6zfrllk1z9ay4",
+      "depends": ["DT", "Rsolnp", "bayestestR", "clusterGeneration", "data_table", "downlit", "ggdist", "ggplot2", "ggpubr", "hdrcde", "latex2exp", "lbfgs", "lbfgsb3c", "magrittr", "meboot", "miniUI", "optimParallel", "optimx", "pathviewr", "plotly", "pracma", "readxl", "rlang", "rstudioapi", "shiny", "shinyWidgets", "shinydashboardPlus", "simstudy", "viridis", "zoo"]
+    },
     "GCPBayes": {
       "name": "GCPBayes",
       "version": "4.2.0",
@@ -12559,12 +12673,6 @@
       "sha256": "0z8fanwjx3pg8pahxfdz00h8my3jk6cxpjlpkp22ygwxs1w4hfj6",
       "depends": ["FactoMineR", "descriptio", "ggplot2", "ggrepel", "rlang"]
     },
-    "GDELTtools": {
-      "name": "GDELTtools",
-      "version": "1.7",
-      "sha256": "0v368chcgqnrfy2isy8z7gl0xizafhxlcd29gr89iblhrzwmssid",
-      "depends": ["datetimeutils", "dplyr", "plyr", "stringr"]
-    },
     "GDILM_ME": {
       "name": "GDILM.ME",
       "version": "1.2.1",
@@ -12585,9 +12693,9 @@
     },
     "GDINA": {
       "name": "GDINA",
-      "version": "2.9.9",
-      "sha256": "0hlckphwyl8ncirqljsf014yzx7fz05zvmfjs3dybah89lb1apqh",
-      "depends": ["MASS", "Rcpp", "RcppArmadillo", "Rsolnp", "alabama", "ggplot2", "nloptr", "numDeriv", "shiny", "shinydashboard"]
+      "version": "2.9.12",
+      "sha256": "0d0lvaqddklaml29mckxvpbqkq9f1l6ypd77ys2cpdqsiwakwz59",
+      "depends": ["MASS", "Rcpp", "RcppArmadillo", "Rsolnp", "alabama", "foreach", "ggplot2", "nloptr", "numDeriv", "shiny", "shinydashboard"]
     },
     "GDPuc": {
       "name": "GDPuc",
@@ -12603,8 +12711,8 @@
     },
     "GE": {
       "name": "GE",
-      "version": "0.4.8",
-      "sha256": "1mhjkag4my8hbil62gy6rqgwck9p14dapdl52h17aidvjyiivlks",
+      "version": "0.5.0",
+      "sha256": "1ms4bbhj88kd83bkzsxvf06shmgnciw4mc4px82k9qjyj8fngbn5",
       "depends": ["CGE", "DiagrammeR", "data_tree"]
     },
     "GEC": {
@@ -12615,8 +12723,8 @@
     },
     "GECal": {
       "name": "GECal",
-      "version": "0.1.5",
-      "sha256": "0i5l15v3g0mpr3byhg55pib5x84fjhp7yxwzm3hb04dfn1dx07lj",
+      "version": "0.1.7",
+      "sha256": "13ymhql3xzf6nr3vihpdmxj0zs6b23ykprk95gb3nkcvgjf7cgaf",
       "depends": ["nleqslv"]
     },
     "GEEaSPU": {
@@ -12825,9 +12933,9 @@
     },
     "GGally": {
       "name": "GGally",
-      "version": "2.2.1",
-      "sha256": "1il6yphqxcyj1039imi8pn6ygyni24daz8ljxxp3z9inb5k2dcwb",
-      "depends": ["RColorBrewer", "dplyr", "ggplot2", "ggstats", "gtable", "lifecycle", "magrittr", "plyr", "progress", "rlang", "scales", "tidyr"]
+      "version": "2.3.0",
+      "sha256": "02bdl4drfmy1768clf8v3396v12k0hfjjki4rrwdavy6xvlsnppy",
+      "depends": ["RColorBrewer", "S7", "dplyr", "ggplot2", "ggstats", "gtable", "lifecycle", "magrittr", "progress", "rlang", "scales", "tidyr"]
     },
     "GGoutlieR": {
       "name": "GGoutlieR",
@@ -12841,6 +12949,12 @@
       "sha256": "0r20ij9kl69jbk979352a7qhf0691z73r1kdak0zj669p25zpcp1",
       "depends": ["curl", "dplyr", "httr2", "readr", "rlang", "terra", "tibble", "tidyr", "tidyselect"]
     },
+    "GHRexplore": {
+      "name": "GHRexplore",
+      "version": "0.1.1",
+      "sha256": "1bim5g2l6yv74chy79r65vr196krrzxg9fv7x4iffi5r9ijrnafq",
+      "depends": ["ISOweek", "RColorBrewer", "colorspace", "cowplot", "dplyr", "ggplot2", "rlang", "tidyr"]
+    },
     "GHS": {
       "name": "GHS",
       "version": "0.1",
@@ -12915,10 +13029,16 @@
     },
     "GJRM": {
       "name": "GJRM",
-      "version": "0.2-6.7",
-      "sha256": "1zzbjss0xfnmf8q445wfrkvpgp4x33nmcnfxm2wizpfj7jgxprqg",
+      "version": "0.2-6.8",
+      "sha256": "17anngk7g0gyq5yzqmvvcd5ga6nnmc8n50fj4q36r1phr27jsw59",
       "depends": ["Rmpfr", "VGAM", "VineCopula", "copula", "distrEx", "evd", "gamlss_dist", "ggplot2", "ismev", "magic", "matrixStats", "mgcv", "mnormt", "numDeriv", "psych", "scam", "survey", "survival", "trust"]
     },
+    "GJRM_data": {
+      "name": "GJRM.data",
+      "version": "0.1-1",
+      "sha256": "0fkl7nq8wd3ksv09b7h6c1mkha44yaarnrqvslz5c3bwwgv49cki",
+      "depends": []
+    },
     "GK2011": {
       "name": "GK2011",
       "version": "0.1.3",
@@ -12927,20 +13047,20 @@
     },
     "GLCMTextures": {
       "name": "GLCMTextures",
-      "version": "0.6.2",
-      "sha256": "1hvb76zdcdmbzai1ddb0067my1bl11vh50230nlz1whby7k5q6ls",
+      "version": "0.6.3",
+      "sha256": "1xb4p43c8mac5bm4br54d9qbf6znbj0s8wiyjymdj7jnjl1pv91x",
       "depends": ["Rcpp", "RcppArmadillo", "raster", "terra"]
     },
     "GLDEX": {
       "name": "GLDEX",
-      "version": "2.0.0.9.3",
-      "sha256": "0xv9w4kmivmmcnn19a6s6d1ilhi1misdgrp07ks7rbd177zjy5vs",
+      "version": "2.0.0.9.4",
+      "sha256": "1idably9qnx2v63bawb03c802zy0fzf6qyrirb9kc9mskhbqsq4k",
       "depends": ["cluster", "spacefillr"]
     },
     "GLDreg": {
       "name": "GLDreg",
-      "version": "1.1.1",
-      "sha256": "1cp5mgbvq0g9ss2cv5yincfjvs8jmciz0h3g5jrr8gda1gvf357i",
+      "version": "1.1.2",
+      "sha256": "04219j32dqf6n6hwxxxw3qmq0dkf754y9j6vvkz86gwwvkry0915",
       "depends": ["GLDEX", "ddst"]
     },
     "GLMMadaptive": {
@@ -13083,8 +13203,8 @@
     },
     "GOCompare": {
       "name": "GOCompare",
-      "version": "1.0.2.1",
-      "sha256": "0h4235bs9aszil20bxyscxv2z96rw9gdp87va8bmvj15cg2lfvgv",
+      "version": "1.0.2.2",
+      "sha256": "05kwdsh0mynavdwmm95vbsx4sy81814ml3fjmk2d3l9y862lmnjk",
       "depends": ["ape", "ggplot2", "ggrepel", "igraph", "mathjaxr", "stringr", "vegan"]
     },
     "GOFShiny": {
@@ -13119,14 +13239,14 @@
     },
     "GPAbin": {
       "name": "GPAbin",
-      "version": "1.0.6",
-      "sha256": "1bcljfjd09nyjywlbqijbpmzl7znsr9la4mllwv0s4h51n9hddxd",
+      "version": "1.1.0",
+      "sha256": "043qmhybvfpw0jvlj3lgz739r0n1whhzz43c77rnyvbpcrf8szq3",
       "depends": ["ca", "jomo", "mi", "mice", "missMDA", "mitools", "stringr"]
     },
     "GPArotateDF": {
       "name": "GPArotateDF",
-      "version": "2023.11-1",
-      "sha256": "161mml6pwcqza6asn7315lqkn69k9k1l9rwa59f9m68v427a5lr0",
+      "version": "2025.7-1",
+      "sha256": "0x0h8ybycasfv91030awphrz6ag5byi99m09kxggx8rjf4j2231z",
       "depends": ["GPArotation"]
     },
     "GPArotation": {
@@ -13149,8 +13269,8 @@
     },
     "GPCMlasso": {
       "name": "GPCMlasso",
-      "version": "0.1-7",
-      "sha256": "0hlhm780xyila4idk5r87pw046xi3lxhhpr0a22smhf4klvnlfgc",
+      "version": "0.1-8",
+      "sha256": "1amxi8g8sql2z9yjxpc436k99fr3zr96bfzzi4ijwv4nyd7crhpa",
       "depends": ["Rcpp", "RcppArmadillo", "TeachingDemos", "caret", "cubature", "ltm", "mirt", "mvtnorm", "statmod"]
     },
     "GPCsign": {
@@ -13171,12 +13291,6 @@
       "sha256": "0s5jq2vmz02yr1wd79s6h5c8rvpbkdlnhdy5yfckk5nxddabcymb",
       "depends": ["Rcpp", "RcppArmadillo", "fda", "fda_usc", "fields", "interp", "mgcv"]
     },
-    "GPGame": {
-      "name": "GPGame",
-      "version": "1.2.0",
-      "sha256": "1xxilr1ify9ip3vs000jawxplcbf1vqli40frhnwwjqf01kj8jq5",
-      "depends": ["DiceDesign", "DiceKriging", "GPareto", "KrigInv", "MASS", "Rcpp", "matrixStats", "mnormt", "mvtnorm"]
-    },
     "GPL2025": {
       "name": "GPL2025",
       "version": "1.0.1",
@@ -13261,6 +13375,12 @@
       "sha256": "1dvixffrn3vz98n8p7vqqr9l77m8n1gij5za8z2hfpg78pipa0mi",
       "depends": ["BH", "FNN", "GpGp", "Matrix", "Rcpp", "RcppArmadillo", "fields", "sparseinv"]
     },
+    "GRAB": {
+      "name": "GRAB",
+      "version": "0.2.2",
+      "sha256": "0xmkjnyx27qwfirss0n8nhg8ahbmd2apjcmk27id6vyx3p6nzk9s",
+      "depends": ["BH", "Matrix", "RSQLite", "Rcpp", "RcppArmadillo", "RcppParallel", "data_table", "dplyr", "igraph", "lme4", "mvtnorm", "ordinal", "survival"]
+    },
     "GRAPE": {
       "name": "GRAPE",
       "version": "0.1.1",
@@ -13299,9 +13419,9 @@
     },
     "GRIN2": {
       "name": "GRIN2",
-      "version": "1.0",
-      "sha256": "17q26vwz8mmdq649pmb6n4q210912f8q7qcc2imq10ri9ssaw295",
-      "depends": ["ComplexHeatmap", "EnsDb_Hsapiens_v75", "GenomeInfoDb", "Gviz", "biomaRt", "circlize", "data_table", "dplyr", "ensembldb", "forcats", "ggplot2", "gridGraphics", "magrittr", "stringr", "survival", "tibble", "tidyselect", "writexl"]
+      "version": "2.0.0",
+      "sha256": "1hy9gf782sqyqmv1q6bqyr074rsacwdbnlyw46jp3b4hmfbfzz8r",
+      "depends": ["circlize", "data_table", "dplyr", "forcats", "ggplot2", "magrittr", "stringr", "survival", "tibble", "tidyselect", "writexl"]
     },
     "GRNNs": {
       "name": "GRNNs",
@@ -13315,12 +13435,6 @@
       "sha256": "1g6n00gnz47w06wkx0sha97qxxyhc8n2y8zaagqx7krgzx7lkha3",
       "depends": ["plyr", "rrBLUP"]
     },
-    "GRS_test": {
-      "name": "GRS.test",
-      "version": "1.2",
-      "sha256": "1g560n81kqf81n1z3s4yxl24r386q21avjknz6msqzp4xhxhr4l6",
-      "depends": []
-    },
     "GRShiny": {
       "name": "GRShiny",
       "version": "1.0.0",
@@ -13407,8 +13521,8 @@
     },
     "GSODR": {
       "name": "GSODR",
-      "version": "4.1.3",
-      "sha256": "0zqc0md2h2r0f0h9k8q70kdjnx35lvn8dnmzpxq0vwlkd0vzfyrn",
+      "version": "4.1.4",
+      "sha256": "12wyapbxbdf4rr8adc5y9c4clpz2mm24awxdidpq18gcjmg1v8za",
       "depends": ["R_utils", "countrycode", "curl", "data_table", "withr"]
     },
     "GSSE": {
@@ -13483,12 +13597,6 @@
       "sha256": "0n4ghjqzfdhid9fnj7qr034y9kmf969bv53yvwvz5zcjvll0mpmr",
       "depends": ["Rcpp", "nloptr", "pracma"]
     },
-    "GUIProfiler": {
-      "name": "GUIProfiler",
-      "version": "2.0.1",
-      "sha256": "10m4d7f2rhw6cmkrnw3jh4iqlkfphf4v7mpfwzw17laq0ncmsx5r",
-      "depends": ["MASS", "Nozzle_R1", "Rgraphviz", "graph", "proftools", "rstudioapi"]
-    },
     "GUTS": {
       "name": "GUTS",
       "version": "1.2.5",
@@ -13627,12 +13735,6 @@
       "sha256": "1mq8406zgh4yww2jb7xvvmizyis9cb2hwdliacr4hxpjg38c3jdn",
       "depends": ["combinat", "gtools", "ineq", "kappalab", "lpSolveAPI"]
     },
-    "GameTheoryAllocation": {
-      "name": "GameTheoryAllocation",
-      "version": "1.0",
-      "sha256": "0733vmyr0d9scjd5ixpnggr548snd7nj70knf5hbzc59nmbc5y11",
-      "depends": ["e1071", "lpSolveAPI"]
-    },
     "Gammareg": {
       "name": "Gammareg",
       "version": "3.0.1",
@@ -13647,8 +13749,8 @@
     },
     "GaussSuppression": {
       "name": "GaussSuppression",
-      "version": "1.0.0",
-      "sha256": "1pdysqb3f4jya33pw9qfw1msd610wf6cqjb25r8x8vwv6qvnmj22",
+      "version": "1.1.0",
+      "sha256": "0zifs7cgl3cmrgianqhqgkkxgmbvl1591x9xx19nkdczb9hjwrvb",
       "depends": ["Matrix", "RegSDC", "SSBtools"]
     },
     "GaussianHMM1d": {
@@ -13659,9 +13761,9 @@
     },
     "GeDS": {
       "name": "GeDS",
-      "version": "0.3.2",
-      "sha256": "1wczr0my62drglglajv5jiyy0gpnynf7c0d50awjra65rcspi81p",
-      "depends": ["MASS", "Matrix", "Rcpp", "Rmpfr", "TH_data", "doFuture", "doParallel", "doRNG", "foreach", "future", "mboost", "mi", "plot3D"]
+      "version": "0.3.3",
+      "sha256": "1xjv3wbyc2z3ls4v5v1mnyz4ajacb67i0mmlpja4fjd1xc39n72y",
+      "depends": ["MASS", "Matrix", "Rcpp", "doFuture", "doParallel", "doRNG", "foreach", "future", "mboost", "plot3D"]
     },
     "GeNetIt": {
       "name": "GeNetIt",
@@ -13743,9 +13845,9 @@
     },
     "GencoDymo2": {
       "name": "GencoDymo2",
-      "version": "1.0.1",
-      "sha256": "1vpwzz8z95kric9wj7l2nc0sd93396rsja4s1vrbip9qjhmdv3ji",
-      "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg38", "Biostrings", "GenomicRanges", "RCurl", "data_table", "dplyr", "plotrix", "progress", "rtracklayer", "tidyr"]
+      "version": "1.0.2",
+      "sha256": "080lvfp58f9b9qvm6z2m4n1jyi474k7m3anvniis26pard1wlqrl",
+      "depends": ["BSgenome", "Biostrings", "GenomicRanges", "IRanges", "RCurl", "data_table", "dplyr", "plotrix", "progress", "rtracklayer", "tidyr"]
     },
     "GenderInfer": {
       "name": "GenderInfer",
@@ -13857,8 +13959,8 @@
     },
     "GenomeAdmixR": {
       "name": "GenomeAdmixR",
-      "version": "2.1.11",
-      "sha256": "1d4hg6z8cmsxyqx7kb6323hfcn3rb3lmi062752x86jfbzf0rvqr",
+      "version": "2.1.12",
+      "sha256": "13qfbdm61nz8dn8c2knxzxkmq6x3hsiix3lp47q8vbj9k84rb9y3",
       "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "ggplot2", "ggridges", "hierfstat", "rlang", "stringr", "tibble", "vcfR"]
     },
     "GenomicSig": {
@@ -13887,9 +13989,9 @@
     },
     "GeoModels": {
       "name": "GeoModels",
-      "version": "2.1.5",
-      "sha256": "0vm09g74n967m94yv634dlzfv9g3s9hqrhxfvcgxk95vxpdnvr7i",
-      "depends": ["FastGP", "VGAM", "codetools", "doFuture", "dotCall64", "fields", "foreach", "future", "hypergeo", "lamW", "mapproj", "minqa", "nabor", "pbivnorm", "plotrix", "pracma", "progressr", "scatterplot3d", "shape", "sn", "sp", "spam", "zipfR"]
+      "version": "2.1.8",
+      "sha256": "1036lwwg9114835pnjkj6rb4nqm5fssmq3x70r42sjhn1103rwff",
+      "depends": ["FastGP", "VGAM", "doFuture", "dotCall64", "fields", "foreach", "future", "future_apply", "hypergeo", "mapproj", "minqa", "nabor", "pbivnorm", "plotrix", "pracma", "progressr", "scatterplot3d", "shape", "sn", "sp", "spam"]
     },
     "GeoMongo": {
       "name": "GeoMongo",
@@ -14073,8 +14175,8 @@
     },
     "GitStats": {
       "name": "GitStats",
-      "version": "2.3.3",
-      "sha256": "17xj5vdw5ka8l3917d4qjrjw7f8z4y97qlg32134pqqa38ikr666",
+      "version": "2.3.4",
+      "sha256": "1q8w3dbb5dv53svi31marhimzabns1lygq9ia2a7id0850lvlgsl",
       "depends": ["R6", "cli", "dplyr", "glue", "httr2", "lubridate", "magrittr", "purrr", "rlang", "stringr"]
     },
     "GlarmaVarSel": {
@@ -14281,12 +14383,6 @@
       "sha256": "0wdirn5h8394q0gmpbh9b2yg481j2p03n6spwjcsqqkfsfc5db9s",
       "depends": ["Ckmeans_1d_dp", "Rcpp", "Rdpack", "cluster", "dqrng", "fossil", "mclust", "plotrix"]
     },
-    "GrimR": {
-      "name": "GrimR",
-      "version": "0.5",
-      "sha256": "005ywc31yn1cs54kjlkrryw0s7zm8dqqfjkdlkm4s1sbc9r3mssz",
-      "depends": ["car"]
-    },
     "GroupBN": {
       "name": "GroupBN",
       "version": "1.2.0",
@@ -14659,6 +14755,12 @@
       "sha256": "1ch6lcsigmhgpwj22w787pba49hw8938zbwd36j1npm1zbpzrm8v",
       "depends": ["HDMT", "MASS", "conquer", "doParallel", "foreach", "glmnet", "hdi", "hommel", "iterators", "ncvreg", "quantreg", "survival"]
     },
+    "HIViz": {
+      "name": "HIViz",
+      "version": "0.1.2",
+      "sha256": "0ddmqfpxn3wg3y9z6n3cwrjj3w6y0wlq82a9kkl8wmcksah6cjg8",
+      "depends": ["DT", "dplyr", "ggplot2", "ggrepel", "haven", "paletteer", "plotly", "readxl", "shiny", "shinyWidgets", "shinydashboard", "tidyr", "wordcloud"]
+    },
     "HK80": {
       "name": "HK80",
       "version": "0.0.2",
@@ -14673,8 +14775,8 @@
     },
     "HLAtools": {
       "name": "HLAtools",
-      "version": "1.6.2",
-      "sha256": "0m4vc00a7l0qg0ar1lhil3xf6r05n55qy8d3fic4pyb34zgxjdfr",
+      "version": "1.6.3",
+      "sha256": "0x7skrcqrznbq60kdxkr9yrcl5ng2420ic650y03in14qvf7acql",
       "depends": ["DescTools", "dplyr", "fmsb", "rvest", "stringr", "tibble", "xfun"]
     },
     "HLMdiag": {
@@ -14779,6 +14881,12 @@
       "sha256": "0pn192bikij1yqms6vnv1n313g4q21966314zvg1krrwisklny9r",
       "depends": ["Matrix", "pROC"]
     },
+    "HOIFCar": {
+      "name": "HOIFCar",
+      "version": "0.2.1",
+      "sha256": "02arbmfj79vcmfmrwfqc9rx0iyr14g3p986m8f4qb9lr6gg72x01",
+      "depends": []
+    },
     "HOasso": {
       "name": "HOasso",
       "version": "1.0.1",
@@ -14913,9 +15021,9 @@
     },
     "HVT": {
       "name": "HVT",
-      "version": "25.2.4",
-      "sha256": "12y46p0z9n31nq4nqx9xa4g59dna50wwn0lzf7hpfq3830q4nmi7",
-      "depends": ["FNN", "MASS", "NbClust", "Rtsne", "cluster", "deldir", "dplyr", "gganimate", "ggplot2", "gridExtra", "magrittr", "markovchain", "plyr", "purrr", "reshape2", "scales", "splancs", "tidyr", "umap"]
+      "version": "25.2.5",
+      "sha256": "1k24p0wns7wl87ah56d7np18kcd47d341a0qb1n1sdh51cf9hjx8",
+      "depends": ["FNN", "MASS", "NbClust", "Rtsne", "cluster", "deldir", "dplyr", "ggplot2", "gridExtra", "magrittr", "markovchain", "plyr", "purrr", "reshape2", "scales", "splancs", "tidyr", "umap"]
     },
     "HWEintrinsic": {
       "name": "HWEintrinsic",
@@ -14935,6 +15043,12 @@
       "sha256": "1p9k0jp7qms1sl5msrqm12bf5f48h8jrw2im72f150yv3q5yadjy",
       "depends": ["clipr", "colorspace", "data_table", "dplyr", "ggplot2", "ggpubr", "ggrepel", "lubridate", "ncdf4", "patchwork", "pbapply", "purrr", "rlang", "scales", "stringr", "tidyr", "tidyselect", "zoo"]
     },
+    "HaDeX": {
+      "name": "HaDeX",
+      "version": "1.2.3",
+      "sha256": "11lxdfrigiy0y9y0di9vljfxbm7l15yphkjhwi5wmgbz9d85psv4",
+      "depends": ["data_table", "dplyr", "ggplot2", "latex2exp", "readr", "readxl", "reshape2", "shiny", "tidyr"]
+    },
     "HadIBDs": {
       "name": "HadIBDs",
       "version": "1.0.1",
@@ -14983,6 +15097,12 @@
       "sha256": "15jawq5bxy2kjvl7bxqjr6p02ivhfrdzjmvjy1vp45jnaz6052v2",
       "depends": []
     },
+    "HaploVar": {
+      "name": "HaploVar",
+      "version": "0.1.1",
+      "sha256": "0hr015bkyg92hqcdvqrjs4fhlx83l51nrqn524arjh8qsyb5mjl0",
+      "depends": ["dbscan", "dplyr", "magrittr", "tibble", "tidyr"]
+    },
     "HardyWeinberg": {
       "name": "HardyWeinberg",
       "version": "1.7.8",
@@ -15039,8 +15159,8 @@
     },
     "HelpersMG": {
       "name": "HelpersMG",
-      "version": "6.5",
-      "sha256": "0y4slz11b35wxc9zsri49srmw559aiy0pmdx9lgi0vnfs682clyp",
+      "version": "6.6",
+      "sha256": "1kfsiw8hpyhl9fvhy4wm183y8qrs4h1h9qwlcz8wgxpc613s1pd2",
       "depends": ["MASS", "Matrix", "coda", "ggplot2", "rlang"]
     },
     "HetSeq": {
@@ -15099,8 +15219,8 @@
     },
     "HiGarrote": {
       "name": "HiGarrote",
-      "version": "1.1.1",
-      "sha256": "1gl4ql0cz4av79ax3xzjwa6r4yayhm1zx4yicx717sncw8qwi06a",
+      "version": "2.0.0",
+      "sha256": "1mdkr2flil6wrg5k4b09r8c4sgi3pifm0fd1dhdy2mvsxjl6ckp2",
       "depends": ["Matrix", "MaxPro", "Rcpp", "RcppArmadillo", "matrixcalc", "nloptr", "purrr", "quadprog", "rlist", "scales", "stringr"]
     },
     "HiResTEC": {
@@ -15121,6 +15241,12 @@
       "sha256": "0hpr8rxpzgbr1v6fh4wxx140nh2017cvrk8anaczv1rnq75j2bdp",
       "depends": ["cluster", "fastcluster"]
     },
+    "HighFive": {
+      "name": "HighFive",
+      "version": "3.1.0",
+      "sha256": "1zj4rrbl09k6cqn9js1ky0cd779dy0zq6m1wvhanxqgy53r6dhjg",
+      "depends": []
+    },
     "HighestMedianRules": {
       "name": "HighestMedianRules",
       "version": "1.0",
@@ -15265,12 +15391,6 @@
       "sha256": "1kykxra9cg1n17l2zmnjk1qv8450v4qix5sylm1k9xxzirbb7wca",
       "depends": ["sp"]
     },
-    "HydroMe": {
-      "name": "HydroMe",
-      "version": "2.1.1",
-      "sha256": "06fqzvpwh25qc9ksh49gpfyw8jgy9xbw27wlp8mxk0b2fq58fyqg",
-      "depends": []
-    },
     "HydroPortailStats": {
       "name": "HydroPortailStats",
       "version": "1.1.0",
@@ -15297,8 +15417,8 @@
     },
     "I14Y": {
       "name": "I14Y",
-      "version": "0.1.4",
-      "sha256": "04m0h3iwz4sm1fnqxd5kynsqi3dw4a170ad77kf2windapqh7ha0",
+      "version": "0.1.5",
+      "sha256": "1v1vq7kv42k6397ry8dhcyhy5cfvd9si0ms2wbnywr5h4svwbkdn",
       "depends": ["cli", "curl", "httr2", "readr", "rlang", "tibble"]
     },
     "IADT": {
@@ -15385,6 +15505,12 @@
       "sha256": "0ah4fg93ihr4m8af19r2gnfibmalvmrc3pmac1afkw6jc0bnir4p",
       "depends": ["binhf", "data_table", "dplyr", "fmsb", "gtools", "tibble", "tidyr", "tidyselect"]
     },
+    "IBclust": {
+      "name": "IBclust",
+      "version": "1.2",
+      "sha256": "0arv1m4ya7y3gydp5mxl2x29whxd3xjlxng8qh2gfs7glv0zmcg7",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "Rdpack", "np", "rje"]
+    },
     "IBrokers": {
       "name": "IBrokers",
       "version": "0.10-2",
@@ -15453,8 +15579,8 @@
     },
     "ICGE": {
       "name": "ICGE",
-      "version": "0.4.2",
-      "sha256": "13p9v0g5qda8bpj3sj9p277l7idv4jscrsszg2kn080dapp3cppp",
+      "version": "0.4.3",
+      "sha256": "01ri8yymf1ganwh5ic2flm26hz9789ymxz2g7xx3s0vzmyhw9d6x",
       "depends": ["MASS", "cluster", "fastcluster"]
     },
     "ICGOR": {
@@ -15483,8 +15609,8 @@
     },
     "ICSClust": {
       "name": "ICSClust",
-      "version": "0.1.0",
-      "sha256": "0sw8ck9384xc0rfj7q7yd0fjacilp64fx8b0l0cw5k920rnzskbj",
+      "version": "0.1.1",
+      "sha256": "1pghld3pqlfbvd6x0fn9viii2s06xwg7j7jbw1mrpcj508xzp2iy",
       "depends": ["GGally", "ICS", "Rcpp", "RcppArmadillo", "RcppRoll", "cluster", "fpc", "ggplot2", "heplots", "mclust", "moments", "mvtnorm", "otrimle", "rrcov", "scales", "tclust"]
     },
     "ICSKAT": {
@@ -15585,8 +15711,8 @@
     },
     "IDEAFilter": {
       "name": "IDEAFilter",
-      "version": "0.2.0",
-      "sha256": "0clr5jkrmwp6nd491rm67i794kh0dcjlhf6z56a8pvjhhia29hpy",
+      "version": "0.2.1",
+      "sha256": "0nynip92nb51f782j2r8n1dqyq21grnhxcsjvgh7ifjczbxw8wbg",
       "depends": ["RColorBrewer", "crayon", "ggplot2", "pillar", "purrr", "shiny", "shinyTime"]
     },
     "IDEATools": {
@@ -15597,8 +15723,8 @@
     },
     "IDF": {
       "name": "IDF",
-      "version": "2.1.2",
-      "sha256": "19mg7a83badb3wqnrmx5ric0nlfdb33wcxfmq9457s8019ghvpvv",
+      "version": "2.1.3",
+      "sha256": "1h6wamq7fhjijr1s64q4q14i1kgrky4vyv9anvspnvh2pl0dklyd",
       "depends": ["RcppRoll", "evd", "fastmatch", "ismev", "pbapply"]
     },
     "IDLFM": {
@@ -15733,12 +15859,6 @@
       "sha256": "0wv19hqsdx264m7wxh63krrw10ccv3axz44zfbk02m53p5v5vh58",
       "depends": []
     },
-    "IGCities": {
-      "name": "IGCities",
-      "version": "0.2.0",
-      "sha256": "1564bzvi6vgg9q8s97mxjwklr83vkcv8f526savkhnjxdzi1zmy0",
-      "depends": []
-    },
     "IGST": {
       "name": "IGST",
       "version": "0.1.0",
@@ -15777,15 +15897,15 @@
     },
     "IJSE": {
       "name": "IJSE",
-      "version": "0.1.1",
-      "sha256": "1xnip7c4q2czcbpz488b6n26n3yvsvannjicd1v2h23hl7578ga8",
+      "version": "0.1.2",
+      "sha256": "1wz7rdnb1wr6pp17nx9rf9cp2ha6c593jj28i2a8g9fc4n88agkv",
       "depends": ["brms", "posterior"]
     },
     "ILRCM": {
       "name": "ILRCM",
-      "version": "0.1.0",
-      "sha256": "0sx8bcxb8xzbb9r4fgjyr4qd21bpfv1sj29sk058xsnzwibrsg6m",
-      "depends": ["ggplot2", "scales"]
+      "version": "0.2.0",
+      "sha256": "0crnmgg4bwnzz79xwfyazjx73dr9bbdpkh52f105q1533q6y2f8w",
+      "depends": ["dplyr", "ggplot2", "rlang", "scales"]
     },
     "ILS": {
       "name": "ILS",
@@ -15801,8 +15921,8 @@
     },
     "ILSAstats": {
       "name": "ILSAstats",
-      "version": "0.3.8",
-      "sha256": "1ly1661ip2cskdzrs0i72wdh4lxh4m1xsz9mv5pm9i37m9831xvx",
+      "version": "0.4.0",
+      "sha256": "1gr6shcmkqr82z63gz9qssgdmfj8xfaia1dm75gkldxqmh6rn3xl",
       "depends": []
     },
     "ILSE": {
@@ -15813,9 +15933,9 @@
     },
     "ILSM": {
       "name": "ILSM",
-      "version": "1.0.3.2",
-      "sha256": "1wqw33yg3r6bdwhhczaxhkdpzpmxjd58ns2j9q55lx5vvk4q97dh",
-      "depends": ["Matrix", "igraph"]
+      "version": "1.1.0.1",
+      "sha256": "1lszgals6k9klba3gh0q98pabvgfl34nl9hb9nq231fsvq73k6cr",
+      "depends": ["igraph", "plot_matrix", "vegan"]
     },
     "IMD": {
       "name": "IMD",
@@ -15861,8 +15981,8 @@
     },
     "IMak": {
       "name": "IMak",
-      "version": "2.1.0",
-      "sha256": "1972iwam1kkkb3107pq8jhmm3q0ypn92p519srzm82xnbf0m7828",
+      "version": "2.1.1",
+      "sha256": "09wj8xx30a2lqww8x67nwwyr8k1zsrdbrnnghriv854i6r44dmmf",
       "depends": ["png"]
     },
     "IMmailgun": {
@@ -15897,8 +16017,8 @@
     },
     "INLAtools": {
       "name": "INLAtools",
-      "version": "0.0.2",
-      "sha256": "0srkj5dzyfrn826nh2aadpr6z04sbsm08953yj5gxa5s6rn3vfyy",
+      "version": "0.0.4",
+      "sha256": "16261m87nj3s5lzpixbqafygn6sy2xnxyis5b2v85m4n5w8i5m0z",
       "depends": ["Matrix"]
     },
     "INQC": {
@@ -15919,6 +16039,12 @@
       "sha256": "1l1vfl0m4iqniwp4bp1bfjpqhwahg341fpyxhryr0j8lypqaw7si",
       "depends": ["SQUAREM", "dplyr", "rlist"]
     },
+    "INetTool": {
+      "name": "INetTool",
+      "version": "0.1.1",
+      "sha256": "0380irgb6zxaq637ij1534n791kcqqj6xnr4qzpx18hdnaf93gxi",
+      "depends": ["ggplot2", "ggpubr", "igraph", "multinet", "r2r", "robin"]
+    },
     "IOHanalyzer": {
       "name": "IOHanalyzer",
       "version": "0.1.8.10",
@@ -15937,12 +16063,6 @@
       "sha256": "1fablbj94ppcmzixjqhfrkjxirmc6vvyl6dldni2jmyjvsixvbpv",
       "depends": ["stringi"]
     },
-    "IPCAPS": {
-      "name": "IPCAPS",
-      "version": "1.1.8",
-      "sha256": "17ifkgjjnvvcc8dp065ng4ad9lr85lcdcb401vi84yy8m2llbypw",
-      "depends": ["KRIS", "LPCM", "MASS", "Matrix", "Rmixmod", "apcluster", "expm", "fpc"]
-    },
     "IPCWK": {
       "name": "IPCWK",
       "version": "1.0",
@@ -15957,8 +16077,8 @@
     },
     "IPEC": {
       "name": "IPEC",
-      "version": "1.1.0",
-      "sha256": "1zmh2ck80xh7gzh6d23lw155bny1afkzv1jr3b6i2451c439ybdr",
+      "version": "1.1.1",
+      "sha256": "0715nihjq7acrv77b5xkspc7s2qxah3rbswliqmg90rnc3amn992",
       "depends": ["MASS", "numDeriv"]
     },
     "IPEDS": {
@@ -16077,8 +16197,8 @@
     },
     "ISAR": {
       "name": "ISAR",
-      "version": "0.1.12",
-      "sha256": "0c6ahpkpbmy8zg7ac0j3v01jw59g3h8n6s8c6lkrmk1my42yzr1c",
+      "version": "1.0.0",
+      "sha256": "1c0294nya9dv3h3lnb23d0q8yh88d7dcrc5jxvc6aa8gnr034c74",
       "depends": []
     },
     "ISAT": {
@@ -16311,8 +16431,8 @@
     },
     "InSilicoVA": {
       "name": "InSilicoVA",
-      "version": "1.4.0",
-      "sha256": "15x6d928rk9in2swbaal6hcw2nikj153fgqyd7nhdkcbs1agrsl1",
+      "version": "1.4.2",
+      "sha256": "1f17yibp3q58adm3b02ja38qnmjscfxc3nc8rgw17c9ydd35mblz",
       "depends": ["InterVA5", "coda", "ggplot2", "rJava"]
     },
     "IncDTW": {
@@ -16323,8 +16443,8 @@
     },
     "IncidencePrevalence": {
       "name": "IncidencePrevalence",
-      "version": "1.2.0",
-      "sha256": "0jwhgwm2dbnb5hgxv5fwzrqyn2r604k26s2p687hlzm23p01cfby",
+      "version": "1.2.1",
+      "sha256": "0mvpyz3r6kkpny13yz72bb3jdcfm8wy5a6awp39ar8yz6g7dxijp",
       "depends": ["CDMConnector", "PatientProfiles", "cli", "clock", "dplyr", "glue", "magrittr", "omopgenerics", "purrr", "rlang", "stringr", "tidyr"]
     },
     "IncomPair": {
@@ -16431,8 +16551,8 @@
     },
     "Infusion": {
       "name": "Infusion",
-      "version": "2.2.0",
-      "sha256": "13jj8ivxigk8k6fl8m2dbniv08vfd87ry8vbpzcj9mxk7kg9p75l",
+      "version": "2.3.0",
+      "sha256": "1xway5jpfadll9jg6dvmd4xi9pkr5zphrlldlipsyyr7jayrpadm",
       "depends": ["blackbox", "boot", "cli", "foreach", "geometry", "matrixStats", "mvtnorm", "nloptr", "numDeriv", "pbapply", "proxy", "ranger", "spaMM", "viridisLite"]
     },
     "InjurySeverityScore": {
@@ -16573,12 +16693,6 @@
       "sha256": "1wwx2kssjysl1lraac36pvxq34vg8qm0vwi861rs1iipfc35i84j",
       "depends": ["lattice"]
     },
-    "Inventorymodel": {
-      "name": "Inventorymodel",
-      "version": "1.1.0.1",
-      "sha256": "0x36pkr2f038cwdfqi03pljhg6xwhp7v97ymyqddb5lw5a0isw87",
-      "depends": ["GameTheoryAllocation", "e1071"]
-    },
     "Irescale": {
       "name": "Irescale",
       "version": "2.3.0",
@@ -16647,14 +16761,14 @@
     },
     "IsoplotR": {
       "name": "IsoplotR",
-      "version": "6.6",
-      "sha256": "04kjxdnvj28gbq5lxlhnbf7hsl9sd1vg7k8d38imc22qd59255ym",
+      "version": "6.7",
+      "sha256": "02nzxpw36ic60iv14fcxaijh004k1km45k94c4g0wair60ljxgww",
       "depends": ["MASS"]
     },
     "IsoplotRgui": {
       "name": "IsoplotRgui",
-      "version": "6.6",
-      "sha256": "10a0icbcf2nngsjcai66m4qdhjzn7ysapvw2j24d9qam32zy39xs",
+      "version": "6.7",
+      "sha256": "1kzhy20mikxs7lpalqkb5ib8k8vx90w3cr8ai3hh8bgyb6gbb7js",
       "depends": ["IsoplotR", "shinylight"]
     },
     "IsoriX": {
@@ -16665,14 +16779,14 @@
     },
     "IssueTrackeR": {
       "name": "IssueTrackeR",
-      "version": "1.1.1",
-      "sha256": "1mh5glqbp846bj7hj71gnljyfvmysq2r1wld2fx5cmxci4fyfndp",
-      "depends": ["crayon", "gh", "yaml"]
+      "version": "1.2.0",
+      "sha256": "0gjbsvfljhf5gw6qr4iab9p42lirq67g0a42jadh4zi6shqvprja",
+      "depends": ["cli", "crayon", "gh", "yaml"]
     },
     "IterativeHardThresholding": {
       "name": "IterativeHardThresholding",
-      "version": "1.0.2",
-      "sha256": "0vv8v61pzlykdyjivl19q8nr9p22c845y902yljgrvc9ayidczqm",
+      "version": "1.0.3",
+      "sha256": "0b1b2jddn8s5182gb38ws0yxr5gwczk3pzkd3wkzd0prl6bvnv2r",
       "depends": ["Cyclops", "ParallelLogger"]
     },
     "IxPopDyMod": {
@@ -16687,22 +16801,16 @@
       "sha256": "0m90rnhr5vkdv1xswr5c0j06ngzvmg73nd0kmg9m9r6a6ddddcyl",
       "depends": ["clue"]
     },
-    "JAGStree": {
-      "name": "JAGStree",
-      "version": "1.0.1",
-      "sha256": "1ybdbmvkxgk159ajfdxsf1i5rq56z1p5kx4ibgvns1s7gdadncrc",
-      "depends": ["AutoWMM", "DiagrammeR", "R2jags", "data_tree", "gtools", "mcmcplots", "tidyverse"]
-    },
     "JANE": {
       "name": "JANE",
-      "version": "1.1.0",
-      "sha256": "11g6zag8qrp4vvjf7c5wizh7b8ai5wlzi2cmr84fbwk80vli1sa5",
+      "version": "2.0.0",
+      "sha256": "0cwsgdkfd94wzm86q53swlh4dvzgigl2wfpbvycsrnbh6r4bv2ly",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "aricode", "extraDistr", "future", "future_apply", "igraph", "mclust", "progress", "progressr", "rlang", "scales", "stringdist"]
     },
     "JATSdecoder": {
       "name": "JATSdecoder",
-      "version": "1.2.0",
-      "sha256": "01nqj3w690gn4iqy35v215451agfx1dfgc5vbmmc5wp5r2rk2p09",
+      "version": "1.2.1",
+      "sha256": "13cxqbxi83j2hblncv3s8vg7jp1a8cyw20yaa3s5x0a9fx8m6s3p",
       "depends": ["NLP", "openNLP"]
     },
     "JBrowseR": {
@@ -16719,14 +16827,14 @@
     },
     "JDCruncheR": {
       "name": "JDCruncheR",
-      "version": "0.3.5",
-      "sha256": "1q0p3my7py3p33zllmw8q2kvvrmla1js6qwh059h1bv4p13zgx8s",
+      "version": "0.3.6",
+      "sha256": "011lx1pwp3mrnzx7psg2chmlxhk4nak09w3nf154q5g5dvgjxhxa",
       "depends": ["openxlsx"]
     },
     "JFE": {
       "name": "JFE",
-      "version": "2.5.10",
-      "sha256": "0m1gmlwh8lsmc45bkmxf48p9k8s41m8pfb02ppla5573iyx2882n",
+      "version": "2.5.11",
+      "sha256": "1jzr9a9pmkxqgasszjqqqxsk0lf8b9g09jk3m5jxm9c2smkrhlrp",
       "depends": ["xts"]
     },
     "JFM": {
@@ -16735,12 +16843,6 @@
       "sha256": "08655vgfb2ll8hwjsj5lsw4849rahn3blisdqn8bwfhclrwd24xn",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "RockFab", "Rvcg", "randomcoloR", "rgl"]
     },
-    "JGL": {
-      "name": "JGL",
-      "version": "2.3.2",
-      "sha256": "0zsvr20vaxhkac2mdlqzd12xqpgw4yvx4bkqwgsbvhpl34pz7dy2",
-      "depends": ["igraph"]
-    },
     "JGR": {
       "name": "JGR",
       "version": "1.9-2",
@@ -16785,9 +16887,9 @@
     },
     "JMbayes2": {
       "name": "JMbayes2",
-      "version": "0.5-2",
-      "sha256": "1bdd0d41ivs88yy2219zvnx1g5f6za57v5mbal47qryy47xs2fz5",
-      "depends": ["GLMMadaptive", "Rcpp", "RcppArmadillo", "coda", "ggplot2", "gridExtra", "matrixStats", "nlme", "parallelly", "survival"]
+      "version": "0.5-7",
+      "sha256": "0djd6r3b48rjywyrkcm7mmkih83p3xi6fgh9dx1xihw1p6g0kbbf",
+      "depends": ["GLMMadaptive", "Rcpp", "RcppArmadillo", "abind", "coda", "ggplot2", "gridExtra", "matrixStats", "nlme", "parallelly", "survival"]
     },
     "JMbdirect": {
       "name": "JMbdirect",
@@ -16803,8 +16905,8 @@
     },
     "JNplots": {
       "name": "JNplots",
-      "version": "0.1.1",
-      "sha256": "0k1jdy5wdzdswzl6kz9d1r6imj3cqcmkyz7ka1d6pcbysjsj9ynn",
+      "version": "0.1.2",
+      "sha256": "1hcrv38qhfcap10rnm70sbd3gxxxsv1032swjv1nc9ww490x08w9",
       "depends": ["ape", "nlme", "scales"]
     },
     "JOPS": {
@@ -16953,8 +17055,8 @@
     },
     "JointFPM": {
       "name": "JointFPM",
-      "version": "1.2.2",
-      "sha256": "0ak3si4hzym3v0jkiarjkiq3v9zzgbyhvj99rmvrvy1ax0yl7c2v",
+      "version": "1.3.0",
+      "sha256": "124ibpbddyv0fg3yq1is1q1hv49wdmbdpfams1iyqkndspg3narz",
       "depends": ["cli", "data_table", "lifecycle", "matrixStats", "rlang", "rmutil", "rstpm2", "statmod", "survival"]
     },
     "Julia": {
@@ -16983,9 +17085,9 @@
     },
     "JustifyAlpha": {
       "name": "JustifyAlpha",
-      "version": "0.1.1",
-      "sha256": "0bd7sn4sn95kal5q2x1q78fsk1mhakr5fax3z6ny2yda2h266af9",
-      "depends": ["BayesFactor", "Superpower", "ggplot2", "pwr", "qpdf", "shiny", "shinydashboard", "stringr"]
+      "version": "0.1.2",
+      "sha256": "176bawmq9bi0qlzdqxkws7iaspd9p1818z8snx4yf8y9id5q0fd6",
+      "depends": ["BayesFactor", "ggplot2", "qpdf", "shiny", "stringr"]
     },
     "KCSKNNShiny": {
       "name": "KCSKNNShiny",
@@ -17289,8 +17391,8 @@
     },
     "KinMixLite": {
       "name": "KinMixLite",
-      "version": "2.1.1",
-      "sha256": "1yq7wkim0cm6p1nm49km5izabkp1cid9z8df7wndnx048kb37qv4",
+      "version": "2.2.1",
+      "sha256": "1kxzqywwjlxf2l0kc7ywbyhggw1im5kvfrypzbckc84hn6hsd8gl",
       "depends": ["DNAmixturesLite", "Matrix", "Rsolnp", "gRaven", "gRbase", "numDeriv", "pedtools", "ribd", "statnet_common"]
     },
     "KingCountyHouses": {
@@ -17409,8 +17511,8 @@
     },
     "L1pack": {
       "name": "L1pack",
-      "version": "0.52",
-      "sha256": "0mk282f9kd4rz8gkhrdl670p430ib5qbi420j717b78ca1bvv7h3",
+      "version": "0.60",
+      "sha256": "0hvhxg0d1y9ryfahyqm9m55hx379d6k0vfrylm48rsh22rcinqfq",
       "depends": ["fastmatrix"]
     },
     "L2DensityGoFtest": {
@@ -17485,6 +17587,12 @@
       "sha256": "0vqjp00nviyl6ghbjn2ayj3k0x2a7hihff0w0x7xwqv3z8x0mh8g",
       "depends": ["MASS", "coda"]
     },
+    "LBDiscover": {
+      "name": "LBDiscover",
+      "version": "0.1.0",
+      "sha256": "1r473riqdf5zl26f1n0yv0sd59a92l5ihb2i7p8ylkwf4hc8ylc1",
+      "depends": ["Matrix", "httr", "igraph", "jsonlite", "rentrez", "xml2"]
+    },
     "LBI": {
       "name": "LBI",
       "version": "0.2.2",
@@ -17589,8 +17697,8 @@
     },
     "LDcorSV": {
       "name": "LDcorSV",
-      "version": "1.3.3",
-      "sha256": "0wr8i9q9p48vpcia8v3rd8bb2pfijr9r6kg9x26k4wncpg7n83cp",
+      "version": "1.3.4",
+      "sha256": "1vj1zf2glj9xp1b1bk211wyyz6nhj13ww9j7s4347qixzfm603j1",
       "depends": []
     },
     "LDlinkR": {
@@ -17677,12 +17785,6 @@
       "sha256": "0sd2b0wqmf51x7hxpx2mgymsgn1abzwdiaxp66708pg5nskg48ah",
       "depends": ["MASS", "elasticnet", "gtools", "mvtnorm", "pls", "randomForest"]
     },
-    "LIStest": {
-      "name": "LIStest",
-      "version": "2.1",
-      "sha256": "1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a",
-      "depends": []
-    },
     "LJexm": {
       "name": "LJexm",
       "version": "1.0.5",
@@ -17721,9 +17823,9 @@
     },
     "LLMR": {
       "name": "LLMR",
-      "version": "0.3.0",
-      "sha256": "00pykjdznpd4yd7b2dqjsk0f9pzxnw0bs63h55zwdg16vczq0j7m",
-      "depends": ["dplyr", "future", "future_apply", "httr2", "memoise", "purrr", "rlang", "tibble"]
+      "version": "0.5.0",
+      "sha256": "04jr1gvl524551xmhv9ydp9d8adp5wkqymx8md8v1dvdw0iyj8jg",
+      "depends": ["base64enc", "dplyr", "future", "future_apply", "glue", "httr2", "memoise", "mime", "purrr", "rlang", "tibble", "tidyr"]
     },
     "LLSR": {
       "name": "LLSR",
@@ -17773,6 +17875,12 @@
       "sha256": "0d2g0w1ail82vknj9pwisxswmns9zsa24cnlm1yqhc7bqry23vgj",
       "depends": ["data_table", "magrittr"]
     },
+    "LMest": {
+      "name": "LMest",
+      "version": "3.2.6",
+      "sha256": "0czy4yb07n71g6gvg6f3bgzywizkm4bjqszwhxx9ccw2ch48wm5j",
+      "depends": ["Formula", "MASS", "MultiLCIRT", "diagram", "mclust", "mix", "mvtnorm", "scatterplot3d"]
+    },
     "LMfilteR": {
       "name": "LMfilteR",
       "version": "0.1.3.1",
@@ -18001,6 +18109,12 @@
       "sha256": "16fgbj8i2j87b5r2qrq75r0l6gk56zy62i5g0jx7h078kan5vvvp",
       "depends": ["terra"]
     },
+    "LSTMfactors": {
+      "name": "LSTMfactors",
+      "version": "1.0.0",
+      "sha256": "1m1vk52ssq4srvn8mvlzkqlq5hn0f0blsxmpvvphmjr7px7z944c",
+      "depends": ["EFAfactors", "reticulate"]
+    },
     "LSTS": {
       "name": "LSTS",
       "version": "2.1",
@@ -18027,16 +18141,10 @@
     },
     "LSX": {
       "name": "LSX",
-      "version": "1.4.4",
-      "sha256": "0pyh3l9wzycy0xk0rfdif5paraixzffvld2s0kp94jqis515axlc",
+      "version": "1.4.5",
+      "sha256": "1x4zc0nkfr5h4m8pj3zwv6yxmkz7yyb1mr52vd88303ymjsbc9a0",
       "depends": ["Matrix", "RSpectra", "digest", "ggplot2", "ggrepel", "locfit", "proxyC", "quanteda", "quanteda_textstats", "reshape2", "stringi"]
     },
-    "LTAR": {
-      "name": "LTAR",
-      "version": "0.1.0",
-      "sha256": "0jn0fym0v6j9c7pam1samafph9fiqrdr141n3mqj9xks0vaqrqqh",
-      "depends": ["gsignal", "rTensor", "rTensor2", "vars"]
-    },
     "LTASR": {
       "name": "LTASR",
       "version": "0.1.4",
@@ -18049,6 +18157,12 @@
       "sha256": "0q9lj69vpkyc6a40m9xj46qi5h8h2r6rl4k49bs3z19661gcxydd",
       "depends": ["GDINA", "ggplot2", "ggpubr", "ggsignif"]
     },
+    "LTFGRS": {
+      "name": "LTFGRS",
+      "version": "1.0.0",
+      "sha256": "0i3qk1lsks6mv6fasabfz69y9x5ml8k8yn28jk5r82varw1cdhgd",
+      "depends": ["Rcpp", "batchmeans", "dplyr", "future", "future_apply", "igraph", "lubridate", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "tmvtnorm", "xgboost"]
+    },
     "LTFHPlus": {
       "name": "LTFHPlus",
       "version": "2.1.4",
@@ -18099,9 +18213,9 @@
     },
     "LaMa": {
       "name": "LaMa",
-      "version": "2.0.4",
-      "sha256": "0p2009ldm49ym4xhf6rg4ish4m9gxmfyaf1lr4j39gnai5k7610s",
-      "depends": ["CircStats", "MASS", "Matrix", "RTMB", "Rcpp", "RcppArmadillo", "circular", "mgcv", "numDeriv", "sn", "splines2"]
+      "version": "2.0.5",
+      "sha256": "1z33f7cr72swmfsffmpq4s1jy32ixsyy0qimpfk66azdhzi3p6pj",
+      "depends": ["MASS", "Matrix", "RTMB", "Rcpp", "RcppArmadillo", "circular", "mgcv", "numDeriv", "sn", "splines2"]
     },
     "LabApplStat": {
       "name": "LabApplStat",
@@ -18373,6 +18487,12 @@
       "sha256": "097aj0b8gxly3gqvckcl9xcvv60yd06ydagdqzy80zhv4aqgxm5p",
       "depends": []
     },
+    "LightFitR": {
+      "name": "LightFitR",
+      "version": "1.0.0",
+      "sha256": "1rs740abr9zcwwd37whgf0pd25kivswna3s6q7swv2qdgqp4ggp5",
+      "depends": ["lubridate", "nnls", "stringr"]
+    },
     "LightLogR": {
       "name": "LightLogR",
       "version": "0.9.2",
@@ -18493,6 +18613,12 @@
       "sha256": "0rsxkli6xhjwy058skgij2cf3n1lcjsaw3pd51i55l2bpwlrmci6",
       "depends": ["RColorBrewer", "lawstat", "nlme", "qpdf"]
     },
+    "LoTTA": {
+      "name": "LoTTA",
+      "version": "0.1.1",
+      "sha256": "1lhcdf5g5nbc3cx984c3gmq9h76y6cvs2ka9np72i4fcily1hh9r",
+      "depends": ["bayestestR", "ggplot2", "ggpubr", "runjags"]
+    },
     "LobsterCatch": {
       "name": "LobsterCatch",
       "version": "0.1.0",
@@ -18543,9 +18669,9 @@
     },
     "LogicForest": {
       "name": "LogicForest",
-      "version": "2.1.1",
-      "sha256": "11f64w80a14yqbngajahw397zfa9yx86asylnmszzx8l2qvw307c",
-      "depends": ["LogicReg"]
+      "version": "2.1.2",
+      "sha256": "1sf41sj9l7dfpr3giay9q84v52rscrrfh1x45njx3g9ysn3pl3i3",
+      "depends": ["LogicReg", "survival"]
     },
     "LogicReg": {
       "name": "LogicReg",
@@ -18589,11 +18715,11 @@
       "sha256": "0jydzc50vfml06ykk34bx5681wp35m9yj8x67h9pqwhpyn0f36ca",
       "depends": ["MASS", "bestNormalize", "car", "dplyr", "effsize", "emmeans", "ggplot2", "glmmTMB", "lme4", "magrittr", "patchwork", "reshape2", "rlang", "rstatix", "stringr", "tibble", "tidyr"]
     },
-    "LongMemoryTS": {
-      "name": "LongMemoryTS",
+    "LongDecompHE": {
+      "name": "LongDecompHE",
       "version": "0.1.0",
-      "sha256": "0n378sad8i283vs7q63spdhwpwjly2d5zj15d4v2085j7sc7z8vi",
-      "depends": ["Rcpp", "RcppArmadillo", "fracdiff", "longmemo", "mvtnorm", "partitions"]
+      "sha256": "1dx7f4qsckj9jbfd25bbfzcl33287iwfiak92y39nyd9znrm5fli",
+      "depends": ["copula", "corpcor", "ggplot2", "patchwork", "tidyr"]
     },
     "LongituRF": {
       "name": "LongituRF",
@@ -18627,9 +18753,9 @@
     },
     "LorenzRegression": {
       "name": "LorenzRegression",
-      "version": "2.1.0",
-      "sha256": "1npv0dcw16fm8k03wd4cnxxim4nc4qs81smhzg5np8bix4df36bx",
-      "depends": ["GA", "MASS", "Rcpp", "RcppArmadillo", "Rearrangement", "boot", "doParallel", "foreach", "ggplot2", "locpol", "parsnip", "rsample", "scales"]
+      "version": "2.2.0",
+      "sha256": "1bw6nbj56s5vfswmm1qdab2rflnzkvfms3ilfgijlx6w21zv9phl",
+      "depends": ["GA", "MASS", "Rcpp", "RcppArmadillo", "Rearrangement", "boot", "doParallel", "foreach", "ggplot2", "parsnip", "progress", "rsample"]
     },
     "LowRankQP": {
       "name": "LowRankQP",
@@ -18717,8 +18843,8 @@
     },
     "MAGEE": {
       "name": "MAGEE",
-      "version": "1.4.2",
-      "sha256": "1gwm82iwji0wviy2d3brws9d3iqwgxlkcf4b24b9hcvfl1kgglb6",
+      "version": "1.4.3",
+      "sha256": "1rcf352q88cyx5ivifkbihbii8xp86iva2hxfbjrc75i7pbpfb89",
       "depends": ["CompQuadForm", "GMMAT", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "data_table", "foreach"]
     },
     "MAGMA_R": {
@@ -18765,8 +18891,8 @@
     },
     "MALDIrppa": {
       "name": "MALDIrppa",
-      "version": "1.1.0-2",
-      "sha256": "1afwkc8dyq51z610z7wnhm95f5j04yj90pxxa33mhdnm2dwsc963",
+      "version": "1.1.0-3",
+      "sha256": "08ag876sipkcxmlz3i4yzqyr5nd3wdfvcss7dx6d2dnf5hvsyrwa",
       "depends": ["MALDIquant", "lattice", "robustbase", "signal", "waveslim"]
     },
     "MAMS": {
@@ -18799,6 +18925,12 @@
       "sha256": "1f50fkxsdisndxh03ylzqipwh2kr51dai6z8xjhiv28h9ymgz9br",
       "depends": ["RColorBrewer", "forecast", "smooth"]
     },
+    "MAPCtools": {
+      "name": "MAPCtools",
+      "version": "0.1.0",
+      "sha256": "0yzm1x1cmc4bnffh9mha9s1jw44gd90pq764x097cvjh57pjgiir",
+      "depends": ["dplyr", "fastDummies", "ggplot2", "ggpubr", "gridExtra", "purrr", "rlang", "scales", "stringr", "survey", "tibble", "tidyr", "tidyselect", "viridis"]
+    },
     "MAPITR": {
       "name": "MAPITR",
       "version": "1.1.2",
@@ -18871,6 +19003,12 @@
       "sha256": "0qydfp856qlmiwf3a2vs2dfk203sx8vvzrqn4hga9wi7bxdylk9f",
       "depends": []
     },
+    "MAVE": {
+      "name": "MAVE",
+      "version": "1.3.12",
+      "sha256": "089xkqj7kfck93v9q6hsw21a70njl9livrd63i91mndv6jwjrw27",
+      "depends": ["Rcpp", "RcppArmadillo", "mda"]
+    },
     "MAZE": {
       "name": "MAZE",
       "version": "0.0.2",
@@ -18903,8 +19041,8 @@
     },
     "MBAnalysis": {
       "name": "MBAnalysis",
-      "version": "2.0.2",
-      "sha256": "1b1s7s1qa82y8054f3mdpq7s13lk7dks900li5k0gr7sqfqdg1fz",
+      "version": "2.1.0",
+      "sha256": "1gxnnhc4dcfs2xjak3gjka1jvn9rvvxc2ajxgkc7xvarqhsllc66",
       "depends": ["ggplot2", "ggrepel"]
     },
     "MBBEFDLite": {
@@ -18927,8 +19065,8 @@
     },
     "MBESS": {
       "name": "MBESS",
-      "version": "4.9.3",
-      "sha256": "05ph8dwigwn0c4qg8smqhsjijvsvfawbzvm74mqpasi8qifz8nd3",
+      "version": "4.9.41",
+      "sha256": "1j9ni7hq5wls4x1hqgk1d5xh4idiryr6anlbxlfc3w9ya0jllax5",
       "depends": ["MASS", "OpenMx", "boot", "lavaan", "mnormt", "nlme", "sem", "semTools"]
     },
     "MBHdesign": {
@@ -18939,8 +19077,8 @@
     },
     "MBMethPred": {
       "name": "MBMethPred",
-      "version": "0.1.4.2",
-      "sha256": "0qpflcydkf2k8a7kqklvp7mskppviqkffkr98rfsklk8iqf8x9c9",
+      "version": "0.1.4.3",
+      "sha256": "1mmzs2q3sx76xhy0vlnav3c884d4p9i2bm735x5rc9agjbd0ibff",
       "depends": ["MASS", "Rtsne", "SNFtool", "caTools", "caret", "class", "dplyr", "e1071", "ggplot2", "keras", "pROC", "randomForest", "readr", "reshape2", "reticulate", "rgl", "stringr", "tensorflow", "xgboost"]
     },
     "MBNMAdose": {
@@ -18963,8 +19101,8 @@
     },
     "MBSP": {
       "name": "MBSP",
-      "version": "4.0",
-      "sha256": "1rfjykm2363m67ycm9vsxnddcsmlqxg5gx8sfg9ma8alwnh0s3fb",
+      "version": "5.0",
+      "sha256": "1b91xdwlwnsls56h5c31d7ykwbngxgg4xzzhwqspq9961i6nqkax",
       "depends": ["GIGrvg", "MCMCpack", "mvtnorm"]
     },
     "MBmca": {
@@ -18975,8 +19113,8 @@
     },
     "MCARtest": {
       "name": "MCARtest",
-      "version": "1.2.2",
-      "sha256": "1j2p43jd1l5di93mf3arfnvg3jz4jzz1f917y2xbvgvgim2s2zmv",
+      "version": "1.3",
+      "sha256": "1zjlqrz0gcj74lh5hs78b4ibxn3s4jckkdpsjjs364ad3g9kzzlb",
       "depends": ["Epi", "MASS", "Matrix", "Rcpp", "Rcsdp", "Rdpack", "copula", "gtools", "highs", "lpSolve", "missMethods", "norm", "pracma", "rcdd"]
     },
     "MCAvariants": {
@@ -19027,12 +19165,6 @@
       "sha256": "17k1msiggqqbz1c8bjy9ig5nzvqddvz53mzfhaclj1453hy793xp",
       "depends": ["dplyr", "gee", "lme4", "parameters", "stringr", "survey"]
     },
-    "MCMC_OTU": {
-      "name": "MCMC.OTU",
-      "version": "1.0.10",
-      "sha256": "1h1b0lw7d96q47sgq3px8j6rbkyhxhykm1c891px89khgg6hnszc",
-      "depends": ["MCMCglmm", "coda", "ggplot2"]
-    },
     "MCMC_qpcr": {
       "name": "MCMC.qpcr",
       "version": "1.2.4",
@@ -19059,8 +19191,8 @@
     },
     "MCMCprecision": {
       "name": "MCMCprecision",
-      "version": "0.4.0",
-      "sha256": "0r0qchiv61sk3drrb0rhwsk55gci4w343hd2gsvclrlyb8r9qhaf",
+      "version": "0.4.2",
+      "sha256": "017sp56hdgzi5r5abq7j1khq50ijgrhp89vq59ypw53zb8b0j8gw",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppProgress", "combinat"]
     },
     "MCMCtreeR": {
@@ -19147,6 +19279,18 @@
       "sha256": "1b3p6ry8gkvyphakn3504ibl2x8dbhx95saild0mj0iwm3sjyspf",
       "depends": []
     },
+    "MD2sample": {
+      "name": "MD2sample",
+      "version": "1.0.0",
+      "sha256": "0x9s8d04kgclprhbqyry2ycp4wk9lg86c6q1zvj7ywzigpiq1y5p",
+      "depends": ["Ball", "FNN", "Rcpp", "ade4", "copula", "gTests", "igraph", "lsa", "microbenchmark", "mvtnorm"]
+    },
+    "MDCcure": {
+      "name": "MDCcure",
+      "version": "0.1.0",
+      "sha256": "0xwy960z6xkg19fyq2w07v686xm627p2qniibfpkls1g8aq0cmha",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "future", "future_apply", "ggplot2", "ggtext", "gridExtra", "npcure", "smcure", "survival"]
+    },
     "MDDC": {
       "name": "MDDC",
       "version": "1.1.0",
@@ -19233,8 +19377,8 @@
     },
     "MECfda": {
       "name": "MECfda",
-      "version": "0.2.0",
-      "sha256": "1jkp91bzyhwsjij7074rj8wrj5jsxwbpk53jf02adra2i7cbbrni",
+      "version": "0.2.1",
+      "sha256": "1cgz2sfw4ynggjwyc9jbid291wd7y214acj1y1fzpsa2g0rvbf50",
       "depends": ["MASS", "Matrix", "corpcor", "dplyr", "fda", "glme", "gss", "lme4", "magrittr", "mgcv", "nlme", "pracma", "quantreg", "refund"]
     },
     "MED": {
@@ -19345,24 +19489,12 @@
       "sha256": "0n1xws3dw0650037qyqgp600p8cf098qa5hkbncdfdbl0w34qamy",
       "depends": []
     },
-    "MG1StationaryProbability": {
-      "name": "MG1StationaryProbability",
-      "version": "0.1.2",
-      "sha256": "151ygjpykc9jccfh6jhgywg82j006a8yqba6nvzhd1v9qb60yd4a",
-      "depends": ["doParallel", "foreach", "memoise"]
-    },
     "MGBT": {
       "name": "MGBT",
       "version": "1.0.7",
       "sha256": "0wrw5yjaw3sgsw0l8q5gq95i5q1wxwgcffkxkxaa1cygblrrz12y",
       "depends": []
     },
-    "MGDrivE2": {
-      "name": "MGDrivE2",
-      "version": "2.1.0",
-      "sha256": "1n7kmn65v6fb372jyqcsqnn01xvwyascqn881avd2iclrajr6h7p",
-      "depends": ["Matrix", "deSolve", "statmod"]
-    },
     "MGL": {
       "name": "MGL",
       "version": "1.1",
@@ -19459,6 +19591,12 @@
       "sha256": "1ig3329akcaq6lk17nnid64qgz1i8spy11f1gawnbmp2x6z6y8wc",
       "depends": []
     },
+    "MIDASim": {
+      "name": "MIDASim",
+      "version": "2.0",
+      "sha256": "0hgqpqmjil3icp0sngvhbsgf9ywilqv438zyqxpifr4bpca0s7w4",
+      "depends": ["MASS", "pracma", "psych", "scam"]
+    },
     "MIDN": {
       "name": "MIDN",
       "version": "1.0",
@@ -19491,8 +19629,8 @@
     },
     "MIMER": {
       "name": "MIMER",
-      "version": "1.0.3",
-      "sha256": "1nqdjgm95dnaxnzy5j28agl7b95hj6hqjyipk5mz44yc2y2chg3z",
+      "version": "1.0.4",
+      "sha256": "1zpna27xcparwx81fjr97qhkwd8834dw8gd9548baa688g7iniby",
       "depends": ["AMR", "data_table", "dplyr", "fuzzyjoin", "reshape2", "rlang", "stringr", "testthat", "tidyr"]
     },
     "MIMSunit": {
@@ -19593,10 +19731,16 @@
     },
     "MLBC": {
       "name": "MLBC",
-      "version": "0.2.1",
-      "sha256": "1d353mz88lyzhzwb9978hmzrzpqiibx2d53arly6044mr86ff250",
+      "version": "0.2.2",
+      "sha256": "0sw37mr4fgsk8ifx9cgcs1jml3pna009n0msqj0hhww5qcbdninm",
       "depends": ["MASS", "RcppEigen", "TMB", "numDeriv"]
     },
+    "MLCIRTwithin": {
+      "name": "MLCIRTwithin",
+      "version": "2.1.2",
+      "sha256": "0c67cama9j6q821gj1bsjajqdr9yx72lnzas76qa94cqig7514rg",
+      "depends": ["MASS", "MultiLCIRT", "limSolve"]
+    },
     "MLCM": {
       "name": "MLCM",
       "version": "0.4.3",
@@ -19641,8 +19785,8 @@
     },
     "MLGL": {
       "name": "MLGL",
-      "version": "1.0.0",
-      "sha256": "1vn9r867mj6g407ca2ncd1f2c3x83jcdllyxfalm3962xgwrg08m",
+      "version": "1.0.1",
+      "sha256": "11w76jalyy1fsmji81x8mv0403ncgqa8rr2lyc14vms7jhj6zvxp",
       "depends": ["FactoMineR", "MASS", "Matrix", "fastcluster", "gglasso", "parallelDist"]
     },
     "MLGdata": {
@@ -19717,6 +19861,12 @@
       "sha256": "0fvrl7ahaiv93sq637yhf18j8bf3w28f0l4b8sjs2ssc5pbg1448",
       "depends": []
     },
+    "MLwrap": {
+      "name": "MLwrap",
+      "version": "0.1.0",
+      "sha256": "0v8vysd3w57f45za1xcxr963mxzpkk8m9g52vfwf37zpa3983aia",
+      "depends": ["DiagrammeR", "R6", "cli", "dials", "dplyr", "fastshap", "ggbeeswarm", "ggplot2", "glue", "innsight", "magrittr", "parsnip", "patchwork", "recipes", "rlang", "rsample", "sensitivity", "tibble", "tidyr", "tune", "vip", "workflows", "yardstick"]
+    },
     "MM": {
       "name": "MM",
       "version": "1.6-8",
@@ -19773,8 +19923,8 @@
     },
     "MMGFM": {
       "name": "MMGFM",
-      "version": "1.1.0",
-      "sha256": "1alsgv7wjb6mcg0zgcxkpfr89hr3yclgc68yv88wzq8ad9py9wzg",
+      "version": "1.2.0",
+      "sha256": "0a9gw29yzqd7xb0zd3hxamkpkb355gm5wvs85pfidgi7hl98ga74",
       "depends": ["GFM", "MASS", "MultiCOAP", "Rcpp", "RcppArmadillo", "irlba"]
     },
     "MMINP": {
@@ -19941,8 +20091,8 @@
     },
     "MPDiR": {
       "name": "MPDiR",
-      "version": "0.2",
-      "sha256": "0n7zrcxqfvd0y4qiqsx0qf5rgqdrci5026wkdpffngamxlm80f86",
+      "version": "0.3",
+      "sha256": "156y9mkispq1whydnjza05kj0afyapbw5jhc0lzpxh6mfbzphvnq",
       "depends": []
     },
     "MPGE": {
@@ -20035,6 +20185,12 @@
       "sha256": "0vgmm9lwkpfahzlhcyaixh2x9d85rrpxipzsc0wy66j43vgn4jhp",
       "depends": ["MASS", "Matrix", "caret", "dplyr", "ggplot2", "glmnet", "gridExtra", "igraph", "magrittr", "mgcv", "pbapply", "plyr", "purrr", "reshape2", "sfsmisc"]
     },
+    "MRG": {
+      "name": "MRG",
+      "version": "0.3.10",
+      "sha256": "1xihzy96jyx604cb43z6fwda8vsicmjfr6barqf666nhs884lz4y",
+      "depends": ["dplyr", "ggplot2", "magrittr", "plyr", "purrr", "rlang", "sf", "sjmisc", "stars", "terra", "tidyr", "tidyselect", "vardpoor", "viridis"]
+    },
     "MRHawkes": {
       "name": "MRHawkes",
       "version": "1.0",
@@ -20067,8 +20223,8 @@
     },
     "MRQoL": {
       "name": "MRQoL",
-      "version": "1.0",
-      "sha256": "0isn4g3jpz7wm99ymrshl6zgkb7iancdzdxl2w98n8fbxsh5z6sw",
+      "version": "1.0.1",
+      "sha256": "11w648kh1k27b8an7b2p9pa0v532bg9l5dvjdaibr9mx77g16qdz",
       "depends": []
     },
     "MRReg": {
@@ -20119,6 +20275,12 @@
       "sha256": "0aqdjnb07z8pny5r64c6rjx2ch7n7syr051h19npr7nxl3kc1xhn",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "data_table", "dplyr", "fastkmedoids", "rlang"]
     },
+    "MSCCT": {
+      "name": "MSCCT",
+      "version": "1.0.2",
+      "sha256": "1b19bwvd1lyjfcs32cph5fi2hzd1xzfk2h2xspq7vpimav9i7k8f",
+      "depends": ["boot", "survival"]
+    },
     "MSCMT": {
       "name": "MSCMT",
       "version": "1.4.0",
@@ -20173,6 +20335,12 @@
       "sha256": "0nzn3zys6cbqvzjncdgvlxw00zvg7c2wcnf59yky66chz42c31wd",
       "depends": ["R2ROC", "r2redux"]
     },
+    "MSMU": {
+      "name": "MSMU",
+      "version": "0.1.2",
+      "sha256": "0jqmgckxayaflfpm173n4p2yyxk5cmkd2znf4k6p6y1msn9mbmx4",
+      "depends": []
+    },
     "MSMwRA": {
       "name": "MSMwRA",
       "version": "1.5",
@@ -20217,9 +20385,9 @@
     },
     "MSclassifR": {
       "name": "MSclassifR",
-      "version": "0.3.3",
-      "sha256": "1qn79awr6yiywiz9k1wx6bqml1ssjijg1k2rm4blvlbd26yk5lbr",
-      "depends": ["MALDIquant", "MALDIquantForeign", "MALDIrppa", "UBL", "VSURF", "car", "caret", "cp4p", "dplyr", "e1071", "fuzzyjoin", "ggplot2", "glmnet", "limma", "mclust", "metap", "mixOmics", "mltools", "nnet", "performanceEstimation", "randomForest", "reshape2", "statmod", "vita", "xgboost"]
+      "version": "0.4.0",
+      "sha256": "1ils9bnhr8rls6ysh1cicrrxasbgmii6fppdmnkhsdk288jalmqc",
+      "depends": ["Boruta", "MALDIquant", "MALDIquantForeign", "MALDIrppa", "VSURF", "car", "caret", "cp4p", "dplyr", "e1071", "ggplot2", "glmnet", "limma", "mclust", "metap", "mixOmics", "mltools", "nnet", "randomForest", "reshape2", "statmod", "vita", "xgboost"]
     },
     "MSclust": {
       "name": "MSclust",
@@ -20323,12 +20491,6 @@
       "sha256": "04dkan3hxl3difflskp7d1lw1bvxhg4s28ssy2v4m7z7wbpj3v1m",
       "depends": []
     },
-    "MTest": {
-      "name": "MTest",
-      "version": "1.0.2",
-      "sha256": "19sz6s5hbrvm4jv54hv8g3d2ixf9pk72ch5j9418skal4dawh1yn",
-      "depends": ["car", "ggplot2", "plotly"]
-    },
     "MUACz": {
       "name": "MUACz",
       "version": "2.1.0",
@@ -20557,6 +20719,12 @@
       "sha256": "0myy75psf2v22rl4ajg73sh4y7fvkfjcvdkbwi4bjg6rd1r5j49g",
       "depends": ["RColorBrewer", "biomaRt", "caret", "data_table", "dplyr", "ggcorrplot", "ggplot2", "keras", "magrittr", "mlr3", "mlr3tuning", "paradox", "purrr", "reshape2", "scutr", "stringr", "tibble", "tidyr", "tidyselect"]
     },
+    "ManyIVsNets": {
+      "name": "ManyIVsNets",
+      "version": "0.1.1",
+      "sha256": "1yrinsb8y9gj5njrd5afhlgb9p680rm6mwmlbyn06z0yslcgj5j3",
+      "depends": ["AER", "dplyr", "ggplot2", "ggraph", "igraph", "lmtest", "magrittr", "readr", "sandwich"]
+    },
     "ManyTests": {
       "name": "ManyTests",
       "version": "1.2",
@@ -20583,9 +20751,9 @@
     },
     "MapperAlgo": {
       "name": "MapperAlgo",
-      "version": "1.0.2",
-      "sha256": "0vgvy9cqznd9xkcrw92a78wqlff6sny89jlahyn0nk67cn8jn02k",
-      "depends": ["doParallel", "foreach"]
+      "version": "1.0.3",
+      "sha256": "1ardgaf6pji7r106j8lxynnvl1xygf7cxqcv1nwwri7afqh6hxxv",
+      "depends": ["doParallel", "foreach", "ggplot2", "ggraph", "htmlwidgets", "igraph", "networkD3", "tidygraph"]
     },
     "MarZIC": {
       "name": "MarZIC",
@@ -20697,8 +20865,8 @@
     },
     "MatrixCorrelation": {
       "name": "MatrixCorrelation",
-      "version": "0.10.0",
-      "sha256": "1na3y1crlj57c1xq9ja3v94cx2dr0myrlx9bxvhhwss3q3r1lgby",
+      "version": "0.10.1",
+      "sha256": "0kil8ykzflvpiicwsbwfzshbs0whj6nv970w369i60kgxdcgvnmf",
       "depends": ["RSpectra", "Rcpp", "RcppArmadillo", "plotrix", "pracma", "progress"]
     },
     "MatrixEQTL": {
@@ -20751,8 +20919,8 @@
     },
     "MaxWiK": {
       "name": "MaxWiK",
-      "version": "1.0.5",
-      "sha256": "04yaxc23m60jj1z24zkpw84g8fl7ayvbmfqqbhxa1q5am1fr3cfa",
+      "version": "1.0.6",
+      "sha256": "1d5wry468czdrk7qdz52hrlai3q231c3nz124dizfrs1a4x8kv3r",
       "depends": ["abc", "ggplot2", "scales"]
     },
     "MaxentVariableSelection": {
@@ -20815,6 +20983,12 @@
       "sha256": "0zn63qljsw3bnxpj823lrkcl3rnxksjsaxzn6dbddw41j80mmfa4",
       "depends": ["lubridate"]
     },
+    "MeasurementDiagnostics": {
+      "name": "MeasurementDiagnostics",
+      "version": "0.1.0",
+      "sha256": "01w63mpgfgbs91jph6wqq4b29n574maj74macvddjhb3pzg04kpp",
+      "depends": ["CohortConstructor", "DBI", "PatientProfiles", "cli", "dplyr", "magrittr", "omopgenerics", "purrr", "rlang", "tidyr"]
+    },
     "MedDataSets": {
       "name": "MedDataSets",
       "version": "0.1.0",
@@ -20833,6 +21007,12 @@
       "sha256": "1jnrav6hhb97v5ncrspkq7ph2xqzc7sn14awlsnmbfzpv3543m4y",
       "depends": []
     },
+    "MedZIsc": {
+      "name": "MedZIsc",
+      "version": "0.0.4",
+      "sha256": "01x5jj29nc4z4j2c6jy03pqc0ch2b694rmwp63c8a2rbha97fxc8",
+      "depends": ["MASS", "betareg", "glmnet"]
+    },
     "MediaK": {
       "name": "MediaK",
       "version": "1.0",
@@ -20851,12 +21031,6 @@
       "sha256": "07vzfm583gqk0ars4gamyn21lpcsdxx86nkp227i9yk7lyj0r6kp",
       "depends": ["MASS", "Rcpp", "RcppEigen", "RcppNumerical", "devEMF", "doParallel", "flextable", "foreach", "lme4", "lmerTest", "mvtnorm", "officer", "pbkrtest", "rootSolve", "shiny", "shinyMatrix", "shinydashboard"]
     },
-    "Mega2R": {
-      "name": "Mega2R",
-      "version": "1.1.0",
-      "sha256": "05g0r7z6kiy0pgl7cbcc3c0wbf4wbc7fxdbha8sc77m3hqya882l",
-      "depends": ["AnnotationDbi", "DBI", "GenomeInfoDb", "RSQLite", "Rcpp", "SKAT", "famSKATRC", "gdsfmt", "kinship2", "pedgene"]
-    },
     "MendelianRandomization": {
       "name": "MendelianRandomization",
       "version": "0.10.0",
@@ -20949,8 +21123,8 @@
     },
     "MetaNet": {
       "name": "MetaNet",
-      "version": "0.2.5",
-      "sha256": "05wc8lzjbj87pj289y4s5m3szxrxnmd7b5rzpsg2r2bwjk1gm46g",
+      "version": "0.2.7",
+      "sha256": "0lvnq5wbwwc6cwp6dypkj3x0xn23g8sn18ins3r78nxynx0g31j7",
       "depends": ["dplyr", "ggnewscale", "ggplot2", "ggrepel", "igraph", "magrittr", "pcutils", "reshape2", "rlang", "tibble"]
     },
     "MetaSKAT": {
@@ -21061,6 +21235,12 @@
       "sha256": "04r1hylym4pxlxy7ldd185bczd398f8a757a9yy6f86lg4vrqyhq",
       "depends": ["ggplot2"]
     },
+    "MexicoDataAPI": {
+      "name": "MexicoDataAPI",
+      "version": "0.1.0",
+      "sha256": "17wg0i7x68vpivy0gm82gjvsx53zyk4hcrgfyc2gksxjkw63zkqz",
+      "depends": ["dplyr", "httr", "jsonlite", "scales"]
+    },
     "MfUSampler": {
       "name": "MfUSampler",
       "version": "1.1.0",
@@ -21175,6 +21355,12 @@
       "sha256": "1y0iv92mp7hf14vrj54qd0yvmjrv52jv3vg25kc5q7pml63njkqa",
       "depends": ["Iso", "ggplot2", "gridExtra"]
     },
+    "MinTriadic": {
+      "name": "MinTriadic",
+      "version": "1.0.0",
+      "sha256": "0xmv79bx3wxklizk0l37il1lg40jvnksch064a3ydwg397vq2wg2",
+      "depends": ["BH", "Rcpp", "lolog"]
+    },
     "MindOnStats": {
       "name": "MindOnStats",
       "version": "0.11",
@@ -21201,8 +21387,8 @@
     },
     "MiscMetabar": {
       "name": "MiscMetabar",
-      "version": "0.14.2",
-      "sha256": "15s98akyxb48glqzkhm8wbxd3p36pwqydnzk218lhmyqx28fqin1",
+      "version": "0.14.3",
+      "sha256": "00kx28fhzn4wswf87zyqhvw6aq5b43aazwdxchnycvayd5wn5hxv",
       "depends": ["ape", "dada2", "dplyr", "ggplot2", "lifecycle", "phyloseq", "purrr", "rlang"]
     },
     "MissCP": {
@@ -21295,12 +21481,6 @@
       "sha256": "07wiv7x2c9mhqk37zndxvdb76m9shizc48qz2bp2f4g5z9hciid7",
       "depends": ["MASS", "MCMCpack", "R2jags", "RColorBrewer", "bayesplot", "coda", "ggmcmc", "ggplot2", "lattice", "loo", "reshape", "reshape2", "splancs"]
     },
-    "MixSemiRob": {
-      "name": "MixSemiRob",
-      "version": "1.1.0",
-      "sha256": "0rvpwb4skd5s0f7qnm2mjrhfz4ppa6inqyfz970mpycihig3vilc",
-      "depends": ["GoFKernel", "MASS", "Rlab", "mixtools", "mvtnorm", "pracma", "quadprog", "robustbase", "ucminf"]
-    },
     "MixSim": {
       "name": "MixSim",
       "version": "1.1-8",
@@ -21399,8 +21579,8 @@
     },
     "MoTBFs": {
       "name": "MoTBFs",
-      "version": "1.4.1",
-      "sha256": "03c1k5vvswlhbsivw6yznw1v0cdl8avs514iaa2v2994j2yk40j6",
+      "version": "1.4.2",
+      "sha256": "0ayzc9d95pzaj36p3nqfnmrv11x6andq684i58591v866ldjmrnl",
       "depends": ["Matrix", "bnlearn", "ggm", "lpSolve", "quadprog"]
     },
     "ModEstM": {
@@ -21465,9 +21645,9 @@
     },
     "MolgenisAuth": {
       "name": "MolgenisAuth",
-      "version": "0.0.25",
-      "sha256": "1ggij166zy0z05hmpwzdx2s1j38s9zr2ldayxljmcl348ds7rk7n",
-      "depends": ["httr", "urltools"]
+      "version": "1.0.0",
+      "sha256": "08144p4hq4pzj4qk1a7x9k9ilz63f6jy281xnp52kkapy9k69x96",
+      "depends": ["assertthat", "httr2", "urltools"]
     },
     "MomTrunc": {
       "name": "MomTrunc",
@@ -21547,12 +21727,6 @@
       "sha256": "18fvkklh4p89mcvjbnxb7cimylpj46ipslqsxkkpyzrb88wwlsjk",
       "depends": ["MASS", "StatMatch", "ade4", "candisc", "car", "class", "ellipse", "heplots", "plot3D", "vegan"]
     },
-    "Morphoscape": {
-      "name": "Morphoscape",
-      "version": "1.0.2",
-      "sha256": "1f4cj5086r1849dwmha8drf7jq56p7bp0fj2liqksppy7gxmdrs4",
-      "depends": ["alphahull", "automap", "concaveman", "ggplot2", "scales", "sp", "spatial", "viridisLite"]
-    },
     "MortCast": {
       "name": "MortCast",
       "version": "2.8-0",
@@ -21739,10 +21913,16 @@
       "sha256": "14npzvidqiy25ldg2g4vyj6bbrmi9vbpswbm9ah9hc4sdjdq344h",
       "depends": ["Matrix", "gam", "pracma", "quantreg"]
     },
+    "MultiLCIRT": {
+      "name": "MultiLCIRT",
+      "version": "2.12",
+      "sha256": "1j6p75d8gr5x7x5grck29ylmp69z6z65pq5q3kyk001z15h4gv9a",
+      "depends": ["MASS", "limSolve"]
+    },
     "MultiLevelOptimalBayes": {
       "name": "MultiLevelOptimalBayes",
-      "version": "0.0.1.6",
-      "sha256": "1a4qp8y8lz37np1np07g7fzgc3776dmy6ybinqfm3j58q31v545l",
+      "version": "0.0.2.0",
+      "sha256": "1x46nsjf0xfryhym4vb170w2qw8742lxzi4c3c13r743pw3bb0y9",
       "depends": ["pracma"]
     },
     "MultiNMix": {
@@ -21805,12 +21985,6 @@
       "sha256": "1mlaprg3cfmfwrq7wh64fmyv1wpdnil7wpcrcg3921qydk65py6z",
       "depends": ["BinOrdNonNor", "CorrToolBox", "Matrix", "PoisNonNor", "corpcor", "moments", "norm"]
     },
-    "MultiVarSel": {
-      "name": "MultiVarSel",
-      "version": "1.1.3",
-      "sha256": "18wcw80m5knv6hbzczjsx3lf7sn9n84z12zz844agp6234im163p",
-      "depends": ["Matrix", "glmnet"]
-    },
     "MultinomialCI": {
       "name": "MultinomialCI",
       "version": "1.2",
@@ -21855,8 +22029,8 @@
     },
     "MultivariateAnalysis": {
       "name": "MultivariateAnalysis",
-      "version": "0.5.0",
-      "sha256": "1hphl6swqkfjqbybkcpvf0bda6jf434v7l6pqzlviqzlnww94riv",
+      "version": "0.5.1",
+      "sha256": "04g64agjjwqa4spl9d1gmffdsvhxpqhjb8wd0h908aljpdh3dzv8",
       "depends": ["NbClust", "PCAmixdata", "biotools", "candisc", "corrplot", "crayon", "ecodist", "factoextra", "ggdendro", "ggplot2", "gridExtra", "magrittr", "plotly", "rstudioapi"]
     },
     "MultivariateRandomForest": {
@@ -21919,18 +22093,6 @@
       "sha256": "1v1ypjsa5yzl6mrgmakngz7zf3ksmv7ac2nf6i30dshikln8mk9i",
       "depends": ["data_table", "ggforce", "ggplot2", "ggrepel", "knitr", "rmarkdown", "shiny", "shinyWidgets"]
     },
-    "NADA": {
-      "name": "NADA",
-      "version": "1.6-1.1",
-      "sha256": "0jp4mqr77cx7q5lff84s6wb0dwjy9mi0jyhbjc5fsx50bdczc3v7",
-      "depends": ["survival"]
-    },
-    "NADA2": {
-      "name": "NADA2",
-      "version": "1.1.8",
-      "sha256": "0m06kbx7z9ad7f3xf0r6gh1rbrgin2lcsc4hvdfsrayq1n4zfdap",
-      "depends": ["EnvStats", "Kendall", "NADA", "cenGAM", "coin", "fitdistrplus", "mgcv", "multcomp", "perm", "survival", "survminer", "vegan"]
-    },
     "NAEPirtparams": {
       "name": "NAEPirtparams",
       "version": "1.0.0",
@@ -22089,9 +22251,9 @@
     },
     "NFCP": {
       "name": "NFCP",
-      "version": "1.2.1",
-      "sha256": "16dvk8jiyzd94lfif0nkwc0ix05is8bhyykaaa6p1irwgzk8cia4",
-      "depends": ["FKF_SP", "LSMRealOptions", "MASS", "Rdpack", "curl", "mathjaxr", "numDeriv", "rgenoud"]
+      "version": "1.2.2",
+      "sha256": "07wxxmcvclygid88cxl0raphmc858h92dfq7gacq9gvkdcrcn022",
+      "depends": ["FKF_SP", "LSMRealOptions", "MASS", "Rdpack", "mathjaxr", "numDeriv", "rgenoud"]
     },
     "NFLSimulatoR": {
       "name": "NFLSimulatoR",
@@ -22161,8 +22323,8 @@
     },
     "NHSRwaitinglist": {
       "name": "NHSRwaitinglist",
-      "version": "0.1.1",
-      "sha256": "0gffg38nq2mg7ska3i9bxsajaxjbmj0ida622h067bh1igii517n",
+      "version": "0.1.2",
+      "sha256": "02p6ch53xw24cl3zi7fa6kdl3rxnvg1lgqz8r771w9zfhz5v0kdx",
       "depends": ["cli", "dplyr", "randomNames", "rlang"]
     },
     "NIMAA": {
@@ -22225,12 +22387,6 @@
       "sha256": "09y3arzw08054xb1y3nmnnzxybgjm2yyvkc530avpqkl1yrb1ap2",
       "depends": ["MASS", "forestplot", "ggplot2", "metafor", "stringr"]
     },
-    "NMADiagT": {
-      "name": "NMADiagT",
-      "version": "0.1.2",
-      "sha256": "0fskc3ldfdl17gazpfr2hixy79n7db4c1f5yl1jalhwxiabnxjwp",
-      "depends": ["MASS", "MCMCpack", "Rdpack", "coda", "ggplot2", "imguR", "ks", "plotrix", "reshape2", "rjags"]
-    },
     "NMAoutlier": {
       "name": "NMAoutlier",
       "version": "0.2.0",
@@ -22267,6 +22423,12 @@
       "sha256": "1y2069kfig1rvp7px2iv7knnj9a0qgv48x1lwbmkfp2mzkrcs9fb",
       "depends": []
     },
+    "NMRphasing": {
+      "name": "NMRphasing",
+      "version": "1.0.7",
+      "sha256": "1i6glyv3dskzcnyyzjqsma4dp6mdjsaz7y3y9q1rib1jw8wwk2jd",
+      "depends": ["MassSpecWavelet", "baseline", "signal"]
+    },
     "NMTox": {
       "name": "NMTox",
       "version": "0.1.0",
@@ -22287,14 +22449,14 @@
     },
     "NMdata": {
       "name": "NMdata",
-      "version": "0.2.0",
-      "sha256": "0b6j4xrzvlb7lvdcqjg4g3zx770lssl4k1gdxkhdqb1q9w53144i",
+      "version": "0.2.1",
+      "sha256": "0icnh0icpanvyi3p5s7ddqiyiim86glvxyjk1sjaz6c7il9b4a09",
       "depends": ["data_table", "fst"]
     },
     "NMsim": {
       "name": "NMsim",
-      "version": "0.2.3",
-      "sha256": "11zfcixrw0d0s1ywqs3ixcwsnpxmigrc8wnnyn1rq1zrhxl12rix",
+      "version": "0.2.4",
+      "sha256": "0srzi3sh0mxlby1yn1l14c4zm6hp1jivs3zk41a14qf79hnzwf9w",
       "depends": ["MASS", "NMdata", "R_utils", "data_table", "fst", "xfun"]
     },
     "NNMIS": {
@@ -22305,8 +22467,8 @@
     },
     "NNS": {
       "name": "NNS",
-      "version": "11.3",
-      "sha256": "0ljhvv2zvfwaiwk37s433xmzb4aayhwd5rzaffzf6wggnb6phm0r",
+      "version": "11.4.1",
+      "sha256": "159mrqndn32vgrikkw95mj3350v5aazwdaqyi82axk8679rsy9bi",
       "depends": ["Rcpp", "RcppParallel", "Rfast", "data_table", "doParallel", "foreach", "quantmod", "rgl", "xts", "zoo"]
     },
     "NNTbiomarker": {
@@ -22389,8 +22551,8 @@
     },
     "NPLStoolbox": {
       "name": "NPLStoolbox",
-      "version": "1.0.0",
-      "sha256": "01f1cimkpakprj5jg7r7k12as84gnqdfib8s1ksph727q6zblc0h",
+      "version": "1.1.0",
+      "sha256": "0r20ps2z8v3809afh5yv672668gbc0mdi1b1dw8z36kxkwsi6xb2",
       "depends": ["dplyr", "parafac4microbiome", "pracma", "rTensor"]
     },
     "NPMLEcmprsk": {
@@ -22425,8 +22587,8 @@
     },
     "NSM3": {
       "name": "NSM3",
-      "version": "1.19",
-      "sha256": "1pm4h8khl6vrspwbdbl13m83xm672x30xyzr3cqdqqgsz740bpn4",
+      "version": "1.20",
+      "sha256": "1yg8d7n9as81j5z18xjy0l46kqzils6i7bfy83kh92f989wy2193",
       "depends": ["BSDA", "Hmisc", "MASS", "Rfit", "SuppDists", "agricolae", "ash", "binom", "coin", "combinat", "fANCOVA", "gtools", "km_ci", "metafor", "nortest", "np", "partitions", "quantreg", "survival", "waveslim"]
     },
     "NSO1212": {
@@ -22503,14 +22665,14 @@
     },
     "NVCSSL": {
       "name": "NVCSSL",
-      "version": "2.0",
-      "sha256": "1nsdhmay2blfa07ri1kfb204di8s5i7zk7qwwlbkhdjjl0qa3vd7",
+      "version": "3.0",
+      "sha256": "0fgihyzk7g3f5jk1vamjgrlg9vxf2vy2da2v0lsa7rklqc9j9f0q",
       "depends": ["GIGrvg", "MASS", "MCMCpack", "Matrix", "dae", "grpreg", "mvtnorm", "plyr"]
     },
     "NaileR": {
       "name": "NaileR",
-      "version": "1.2.2",
-      "sha256": "070j5nvm09xf5jkcahxz0kl928xfb94vzjqmhvrr8mm9w58v15mw",
+      "version": "1.2.3",
+      "sha256": "1spsy1154xg3g4qb8wpsizpbhdms6k7kr9msn4bx9mr7j2w9m36w",
       "depends": ["FactoMineR", "SensoMineR", "dplyr", "glue", "magrittr", "ollamar", "rlang", "stringr", "tibble"]
     },
     "NameNeedle": {
@@ -22653,8 +22815,8 @@
     },
     "NetRep": {
       "name": "NetRep",
-      "version": "1.2.7",
-      "sha256": "02ss45giv30pi31b5rysa36bn5c4fs5x58g4vb0arz9cnicznv97",
+      "version": "1.2.8",
+      "sha256": "1wyvl0irbg8r3cfc8gdxiwg4pykb1kfq18v9rwinqrxnkakvpiri",
       "depends": ["BH", "RColorBrewer", "Rcpp", "RcppArmadillo", "RhpcBLASctl", "abind", "foreach", "statmod"]
     },
     "NetSci": {
@@ -22773,8 +22935,8 @@
     },
     "NiLeDAM": {
       "name": "NiLeDAM",
-      "version": "0.3",
-      "sha256": "1xqj33182fz6x633vs9iy3rxr7m13bqn1773fphs1sb8mvxwdvzq",
+      "version": "0.4",
+      "sha256": "0ghhvbxrs4b2lqs60d606jliily90p19kxz0zj31xxdvadmjdnrk",
       "depends": ["dplyr", "ggplot2", "magrittr", "nleqslv", "rlang", "scales", "shiny", "shinyjs", "shinythemes", "thematic", "tidyr"]
     },
     "NicheBarcoding": {
@@ -22921,16 +23083,10 @@
       "sha256": "1a1vki21hc4xym9b5szahadzmidkkhzdz5iiafminniglpk90xhw",
       "depends": ["NoviceDeveloperResources"]
     },
-    "Nozzle_R1": {
-      "name": "Nozzle.R1",
-      "version": "1.1-1.1",
-      "sha256": "0fanf7cl8dlb8iqw8ww03dd5s6mrpr97m2c511clqkaavbd0yzkp",
-      "depends": []
-    },
     "NumericEnsembles": {
       "name": "NumericEnsembles",
-      "version": "0.8.0",
-      "sha256": "1pzidh7lyccgj3c78fmdjwv2mhsqn0cdq0y4zshdfci0m95b1acg",
+      "version": "0.9.0",
+      "sha256": "1zzhd73blwycp76z3qpm0xx31dj04hxdaxq5fln0pi44j94dlmzr",
       "depends": ["Cubist", "Metrics", "arm", "brnn", "broom", "car", "caret", "corrplot", "doParallel", "dplyr", "e1071", "earth", "gam", "gbm", "ggplot2", "glmnet", "gridExtra", "ipred", "leaps", "nnet", "pls", "purrr", "randomForest", "reactable", "reactablefmtr", "readr", "rpart", "tidyr", "tree", "xgboost"]
     },
     "Numero": {
@@ -22959,8 +23115,8 @@
     },
     "OBIC": {
       "name": "OBIC",
-      "version": "3.0.3",
-      "sha256": "0bhmry7214i018r5cjxlrf07x5wbbg0aysish053wdcgrkzjplrs",
+      "version": "4.0.0",
+      "sha256": "1iaxxfl9xjf7pmpa3lj7bcmlglg1d6fzrqzdjyz4qshvy9zw2a34",
       "depends": ["checkmate", "data_table"]
     },
     "OBL": {
@@ -23077,12 +23233,6 @@
       "sha256": "0p5bi4z6q2kz1hkn12hy7qsn1sdb336y8phmznd8cayyfil7hjvh",
       "depends": []
     },
-    "OOS": {
-      "name": "OOS",
-      "version": "1.0.0",
-      "sha256": "0jnj5y26rv0i2561mywcxb7aavmpq16ippq6rblb8jiqjd05nhib",
-      "depends": ["caret", "dplyr", "forecast", "furrr", "future", "ggplot2", "glmnet", "imputeTS", "lmtest", "lubridate", "magrittr", "purrr", "sandwich", "tidyr", "vars", "xts", "zoo"]
-    },
     "OPC": {
       "name": "OPC",
       "version": "0.0.2",
@@ -23115,8 +23265,8 @@
     },
     "OPSR": {
       "name": "OPSR",
-      "version": "0.1.2",
-      "sha256": "13gcl93lgmrv224nsi1cvp11hp4pkm6b418bhcsak62z7ga4ly0p",
+      "version": "1.0.1",
+      "sha256": "15sy07vyi6zig5ggx7hbsaa2s9bkbkx3zc3rx3410qgy0v7bb245",
       "depends": ["Formula", "MASS", "Rcpp", "RcppArmadillo", "Rdpack", "car", "maxLik", "mvtnorm", "sandwich", "texreg"]
     },
     "OPTS": {
@@ -23145,8 +23295,8 @@
     },
     "ORFID": {
       "name": "ORFID",
-      "version": "1.0.2",
-      "sha256": "11g4l45x3jwyffamr2qd0h7y15kyynqqwxh1mp1mnv0lchmdyr89",
+      "version": "1.0.3",
+      "sha256": "0aqywssfzqr50g3prfralql9f6xzyng5hw0z60hhn0lh3qlr9xs9",
       "depends": ["dplyr", "ggplot2", "magrittr", "openxlsx", "readr", "rlang", "stringr", "tidyr"]
     },
     "ORIClust": {
@@ -23211,8 +23361,8 @@
     },
     "OSMscale": {
       "name": "OSMscale",
-      "version": "0.5.20",
-      "sha256": "14n5574j083xllj0xs87cl8szc0favb8wp3v10bbdljbk35qvmbm",
+      "version": "0.5.22",
+      "sha256": "1dsl67rmmw7mvyhzz47kf7n9xzkqj6jq9ndh1s273d6l0m91czmq",
       "depends": ["OpenStreetMap", "berryFunctions", "pbapply", "sf"]
     },
     "OSNMTF": {
@@ -23221,12 +23371,6 @@
       "sha256": "0g83wqh97iz3g4ganj2dy3biyn8cmb0v8zz6rydald1hfszj8aa2",
       "depends": ["MASS", "dplyr"]
     },
-    "OSTE": {
-      "name": "OSTE",
-      "version": "1.0",
-      "sha256": "0l8whr883g3jp5ckgxr4zf9vj055jrjb7pfraacd15smnrbl0v5d",
-      "depends": ["pec", "prodlim", "ranger", "survival"]
-    },
     "OSsurvival": {
       "name": "OSsurvival",
       "version": "1.0",
@@ -23313,8 +23457,8 @@
     },
     "OceanView": {
       "name": "OceanView",
-      "version": "1.0.7",
-      "sha256": "0s615mrbwamd85h1q8rg5mciwq0hcjzl5rqjaq578nz5ikr3px9a",
+      "version": "1.0.8",
+      "sha256": "1aackcpqyajrad6j702n8a0krcfiad8vcw3qx9pgqhwaddkb1mkm",
       "depends": ["plot3D", "plot3Drgl", "rgl", "shape"]
     },
     "OddsPlotty": {
@@ -23355,8 +23499,8 @@
     },
     "OlinkAnalyze": {
       "name": "OlinkAnalyze",
-      "version": "4.2.0",
-      "sha256": "0mvrlw2h8a60xj0narhbird6sgcfyzc605n154vjdlzbs39knpzi",
+      "version": "4.3.1",
+      "sha256": "1rmn3mpj3s4amlpd6zp3llr9yjhprw1s00mislcsi1a57s077vbs",
       "depends": ["broom", "car", "cli", "data_table", "dplyr", "emmeans", "forcats", "generics", "ggplot2", "ggpubr", "ggrepel", "magrittr", "readxl", "rlang", "rstatix", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "OlympicRshiny": {
@@ -23379,8 +23523,8 @@
     },
     "OmicNavigator": {
       "name": "OmicNavigator",
-      "version": "1.15.0",
-      "sha256": "1b49w0jpzg8ijj0znncnv3mcpnl17rrmhyjhmnhd1q4x4x8q277z",
+      "version": "1.16.0",
+      "sha256": "1pc0k790y0qnsgc5baiq2ng94plw7akrrk6jm04d0b1lbxpzg4bs",
       "depends": ["data_table", "jsonlite"]
     },
     "OmicSense": {
@@ -23415,15 +23559,15 @@
     },
     "OmopSketch": {
       "name": "OmopSketch",
-      "version": "0.4.0",
-      "sha256": "0ccqryjrdqcjvrmzs82sz16h9vvg8wxs2pkdas76nxf89zaxk2q9",
+      "version": "0.5.1",
+      "sha256": "0zbq5c3ai25pjmf3nh57ssmq98mqycvdxm532afc623m7gfh7vax",
       "depends": ["CDMConnector", "CohortConstructor", "PatientProfiles", "cli", "clock", "dplyr", "glue", "lifecycle", "omopgenerics", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "OmopViewer": {
       "name": "OmopViewer",
-      "version": "0.3.0",
-      "sha256": "1kjya9mrjwi7g71b3s22gl0bgb0l0j5wfmgvznwmhqkaga33fkp3",
-      "depends": ["DT", "bslib", "cli", "dplyr", "glue", "gt", "markdown", "omopgenerics", "purrr", "rlang", "shiny", "snakecase", "stringr", "styler", "tidyr", "usethis", "visOmopResults", "yaml"]
+      "version": "0.4.0",
+      "sha256": "0vlhhrla3870ij4i0fcdap0hapl2rrf116cszpcfnfxawc8hh4vs",
+      "depends": ["DT", "bslib", "cli", "dplyr", "glue", "gt", "lifecycle", "markdown", "omopgenerics", "purrr", "rlang", "shiny", "snakecase", "stringr", "styler", "tidyr", "usethis", "visOmopResults", "yaml"]
     },
     "OnAge": {
       "name": "OnAge",
@@ -23533,6 +23677,12 @@
       "sha256": "1awwyam8jz0vh0dlwx23r96g5mvfclnwa3a4j97ng8k5w3hcwisi",
       "depends": ["ggplot2", "lubridate", "pracma", "tidyr"]
     },
+    "OpenBARD": {
+      "name": "OpenBARD",
+      "version": "0.0.1",
+      "sha256": "093bsn5lxqkss00iz7c8fkjsx8wc5li53q57dbvphwsy8hh9bp8p",
+      "depends": []
+    },
     "OpenCL": {
       "name": "OpenCL",
       "version": "0.2-10",
@@ -23577,8 +23727,8 @@
     },
     "OpenRepGrid": {
       "name": "OpenRepGrid",
-      "version": "0.1.17",
-      "sha256": "1an9q33g0q5hsf8xz5cqxbnypp0jffhs0nshlal9d4svy1ks0nc9",
+      "version": "0.1.18",
+      "sha256": "0dmj218fbs9nsyzs6jfa3rpy1v6336flxm9bfys5pb3xc2v7a4wg",
       "depends": ["XML", "abind", "colorspace", "crayon", "dplyr", "igraph", "openxlsx", "plyr", "psych", "pvclust", "scales", "stringr", "tidyr"]
     },
     "OpenRepGrid_ic": {
@@ -23839,6 +23989,12 @@
       "sha256": "10p2q90jbjyzbvn8kgx1i8if144gq2zylqh8h3x4sg2ajqbcv8kg",
       "depends": ["MASS", "RColorBrewer", "Rcpp", "VGAM", "ggplot2", "igraph", "knitr", "magicaxis", "mapproj", "network", "networkDynamic", "plyr"]
     },
+    "PAGE": {
+      "name": "PAGE",
+      "version": "0.3.0",
+      "sha256": "1f869zkk7zdpldbqj5kxdy4xyl6gsc3cxlmcz2hc38cmq0885by4",
+      "depends": ["GGally", "MASS", "RSQLite", "caret", "glasso", "lars", "metrica", "network", "randomForest"]
+    },
     "PAGFL": {
       "name": "PAGFL",
       "version": "1.1.3",
@@ -23887,6 +24043,12 @@
       "sha256": "0pq5kq0i87yrdfs6id2lc6gg4dqsa07fsas13yc8jw6bd9lcf6rh",
       "depends": ["DBI", "igraph", "org_Hs_eg_db", "reshape2"]
     },
+    "PANPRSnext": {
+      "name": "PANPRSnext",
+      "version": "1.2.1",
+      "sha256": "1cjk46lwhrg2k109iadlf7mknfxdbahkvg83xk1p2866rjigxfws",
+      "depends": ["Rcpp", "RcppArmadillo", "gtools"]
+    },
     "PAS": {
       "name": "PAS",
       "version": "1.2.5",
@@ -24069,8 +24231,8 @@
     },
     "PCMRS": {
       "name": "PCMRS",
-      "version": "0.1-4",
-      "sha256": "0bf85zv3nl13gsdi96cd2qg7mfppsccs0ci7l204hws8nmbvri83",
+      "version": "0.1-5",
+      "sha256": "11rkvsgz24nharal1z68g2l7px6mhq5rm8sc8c3kjiiq4f8wz83p",
       "depends": ["Rcpp", "RcppArmadillo", "cubature", "ltm", "mvtnorm", "statmod"]
     },
     "PCObw": {
@@ -24231,9 +24393,9 @@
     },
     "PFIM": {
       "name": "PFIM",
-      "version": "6.1",
-      "sha256": "095ddfgq424j3hfkbh4f2hjy93z098yyqa3ld28zj9x3skwpbbs0",
-      "depends": ["Deriv", "Matrix", "Rcpp", "deSolve", "devtools", "ggplot2", "inline", "kableExtra", "knitr", "pracma", "purrr", "rmarkdown", "scales", "stringr"]
+      "version": "7.0",
+      "sha256": "1pm2zk6svwaqgzcka76mrnzyz1x1sj2sd9ygcgqfdnql5gcmy71k",
+      "depends": ["Deriv", "Matrix", "Rcpp", "RcppArmadillo", "S7", "deSolve", "ggplot2", "inline", "kableExtra", "knitr", "pracma", "purrr", "scales", "stringr", "tibble"]
     },
     "PFLR": {
       "name": "PFLR",
@@ -24241,6 +24403,12 @@
       "sha256": "1i4fsab96iiidnjk3lzd1zlz5yc665lsv4lk7d18aw4npr6gzpl8",
       "depends": ["MASS", "fda", "flare", "glmnet", "psych"]
     },
+    "PFW": {
+      "name": "PFW",
+      "version": "0.1.0",
+      "sha256": "1s3wz1khjng1f2r7awmc2ip4w46v7i2sjssysa1sfql5vxzbs3sl",
+      "depends": ["curl", "dplyr", "httr2", "lubridate", "stringdist", "xml2"]
+    },
     "PGEE": {
       "name": "PGEE",
       "version": "1.5",
@@ -24267,14 +24435,14 @@
     },
     "PH1XBAR": {
       "name": "PH1XBAR",
-      "version": "0.11.2",
-      "sha256": "0ikh8jrf2yq9f444wa5fkiwri5xfc9r19f7862p3s11xmax8dycn",
-      "depends": ["forecast", "mvtnorm", "pracma"]
+      "version": "0.11.3",
+      "sha256": "0k2p50w0q8gmjfkn12rxx03zrh8cp0bba67nyal34g3h6l5394ws",
+      "depends": ["VGAM", "forecast", "mvtnorm", "pracma"]
     },
     "PHENTHAUproc": {
       "name": "PHENTHAUproc",
-      "version": "1.1",
-      "sha256": "1bhd147mhv1xj4q6yqz92n8vi6nji093y78pi1jkav1plwx2qf3c",
+      "version": "1.1.1",
+      "sha256": "1x6g7lm4b534s97h652n1rgx28hdfyh4wcmpcpz8qfjidj42by04",
       "depends": ["lubridate", "rlang", "terra"]
     },
     "PHEindicatormethods": {
@@ -24333,8 +24501,8 @@
     },
     "PINSPlus": {
       "name": "PINSPlus",
-      "version": "2.0.7",
-      "sha256": "1r4fw3hm0bp3spxkcrwwcmirkp4a8myqwpw8d6cxmz7ns6202860",
+      "version": "2.0.9",
+      "sha256": "145v53bw4phjb06k7gz7hx93qy9y8l189gcw03hhxcqnw1sm43ry",
       "depends": ["FNN", "Rcpp", "RcppArmadillo", "RcppParallel", "cluster", "doParallel", "entropy", "foreach", "impute", "irlba", "matrixStats", "mclust"]
     },
     "PINstimation": {
@@ -24417,9 +24585,9 @@
     },
     "PLMIX": {
       "name": "PLMIX",
-      "version": "2.1.1",
-      "sha256": "05mnzsi7y71cvg50qx8hp4m31gqslldl34k41r1f8npyb6ldpdca",
-      "depends": ["MCMCpack", "PlackettLuce", "Rcpp", "StatRank", "abind", "coda", "foreach", "ggmcmc", "ggplot2", "gridExtra", "gtools", "label_switching", "pmr", "prefmod", "radarchart", "rankdist", "rcdd", "reshape2"]
+      "version": "2.2.0",
+      "sha256": "1iqjs0p8hl5kca9habi2yfxwwdhh0759idrsvfb01kqqybzbara6",
+      "depends": ["MCMCpack", "PlackettLuce", "Rcpp", "abind", "coda", "foreach", "ggmcmc", "ggplot2", "gridExtra", "label_switching", "radarchart", "rcdd", "reshape2"]
     },
     "PLNmodels": {
       "name": "PLNmodels",
@@ -24687,8 +24855,8 @@
     },
     "PPSFS": {
       "name": "PPSFS",
-      "version": "0.1.0",
-      "sha256": "180brwqcs2qjh01a1qwdy2a8g19scn4mxzc3s6pw8gyl2r3fzxi7",
+      "version": "0.1.1",
+      "sha256": "1vq8l7ri6q8g7a67ipbwf2xi1spkhgn9slzjmrvh5nfm5sxrv4s6",
       "depends": ["Rcpp", "RcppArmadillo", "brglm2"]
     },
     "PPTcirc": {
@@ -24705,9 +24873,9 @@
     },
     "PPforest": {
       "name": "PPforest",
-      "version": "0.1.3",
-      "sha256": "1byn2l91nws91xgjjal610vv4yns12z861rq3iks4kv4giwgdfq1",
-      "depends": ["Rcpp", "RcppArmadillo", "doParallel", "dplyr", "magrittr", "plyr", "tibble", "tidyr"]
+      "version": "0.2.0",
+      "sha256": "1vk2986yqfzylgdv4p400y34vd8qm9z1s6hqgdz67w2w9h5yjjip",
+      "depends": ["Rcpp", "RcppArmadillo", "doParallel", "dplyr", "magrittr", "plyr", "tibble", "tidyr", "tidyselect"]
     },
     "PPtreeViz": {
       "name": "PPtreeViz",
@@ -24999,8 +25167,8 @@
     },
     "PSweight": {
       "name": "PSweight",
-      "version": "2.1.1",
-      "sha256": "07kmcack636gj1xa6ggxvd737svnvxsa5bp2pkf7a236sjygziaj",
+      "version": "2.1.2",
+      "sha256": "065avyp2c61zn69ry0vivrnbxfimmjjidjq7mr47b634pm83h5cv",
       "depends": ["MASS", "SuperLearner", "gbm", "ggplot2", "lme4", "nnet", "numDeriv", "survey"]
     },
     "PTAk": {
@@ -25029,8 +25197,8 @@
     },
     "PTXQC": {
       "name": "PTXQC",
-      "version": "1.1.2",
-      "sha256": "1z425vs9kbpcxkjipng1wgxix19rf8v74240k9hcslszks9za2ip",
+      "version": "1.1.3",
+      "sha256": "05s9nc5ckiv9gz0ind93rq9c8v40lmcy9gxr56hg4dnax16d73gs",
       "depends": ["R6", "R6P", "RColorBrewer", "UpSetR", "data_table", "ggdendro", "ggplot2", "gridExtra", "gtable", "htmlTable", "knitr", "magrittr", "plyr", "reshape2", "rlang", "rmarkdown", "rmzqc", "seqinr", "xml2", "yaml"]
     },
     "PTwins": {
@@ -25041,8 +25209,8 @@
     },
     "PUGMM": {
       "name": "PUGMM",
-      "version": "0.1.0",
-      "sha256": "03bwg4mb0kc708plqzym0xw5giai45nk601fs53gfnad57y70wdp",
+      "version": "0.1.1",
+      "sha256": "0bf3vck3f9h3g67xkmq90axk2mc3x1riidc02x2fz2sw9nmyshvr",
       "depends": ["ClusterR", "MASS", "Matrix", "doParallel", "foreach", "igraph", "mclust", "mcompanion", "ppclust"]
     },
     "PUMP": {
@@ -25077,8 +25245,8 @@
     },
     "PVAClone": {
       "name": "PVAClone",
-      "version": "0.1-7",
-      "sha256": "1fp4ivjs1980456gyzamwpwwy2rc2sv6xwb2mbk12qkpghgdgssl",
+      "version": "0.1-8",
+      "sha256": "0q7l1k6rmhh51bvl8y6mz4c8hsx1gv0s96bhmpbr6q7anhkhf8q1",
       "depends": ["coda", "dclone", "dcmle"]
     },
     "PVR": {
@@ -25107,8 +25275,8 @@
     },
     "PWIR": {
       "name": "PWIR",
-      "version": "0.0.3",
-      "sha256": "05f4mj8id8ikfz63c8c1lkbxl7s1b2q5xri8iicn1xv2m3w89p2v",
+      "version": "0.0.3.1",
+      "sha256": "1fslzlnafmhq62l4l1m1aap1pp8k7glsx9529gxybrs8i5bwxvbj",
       "depends": ["bibliometrix", "igraph", "progressr"]
     },
     "PaLMr": {
@@ -25131,8 +25299,8 @@
     },
     "Pade": {
       "name": "Pade",
-      "version": "1.0.7",
-      "sha256": "1rs3wap5rx4kq1vabhcfj2qbzfq2b78nvs4bc5h0jg3z32g99220",
+      "version": "1.0.8",
+      "sha256": "0bx6ngz1kiifw2jkzvx7ajgqndf2m8z04n6lfpccbaxhlqhp7njs",
       "depends": []
     },
     "PairViz": {
@@ -25353,33 +25521,33 @@
     },
     "PathwaySpace": {
       "name": "PathwaySpace",
-      "version": "1.0.1",
-      "sha256": "0a91984f5zkvkcd0vkpr10h5ji6v3ls2451lmcsj5wfzcxxr94gn",
+      "version": "1.0.2",
+      "sha256": "1gmc938n5sr4kmqab27b1wlk3l6nb3vimcmp1hpljr4dmn1r7m5q",
       "depends": ["RANN", "RGraphSpace", "ggplot2", "ggrepel", "igraph", "lifecycle", "scales"]
     },
     "PathwayVote": {
       "name": "PathwayVote",
-      "version": "0.1.0",
-      "sha256": "0awlx7d1hnnang6mzm8kzxw7nr4cz71ch72fz7dxar0yf57b7q6b",
-      "depends": ["AnnotationDbi", "ReactomePA", "clusterProfiler", "dplyr", "furrr", "future", "org_Hs_eg_db", "parallelly"]
+      "version": "0.1.1",
+      "sha256": "1qqp5l591mjhhslwqric0wagifsbpdrys84p39ndhgjn78hbcj25",
+      "depends": ["AnnotationDbi", "GO_db", "clusterProfiler", "furrr", "future", "org_Hs_eg_db", "parallelly", "reactome_db"]
     },
     "PatientLevelPrediction": {
       "name": "PatientLevelPrediction",
-      "version": "6.4.1",
-      "sha256": "0kb97ddar7bj73dxay4wjh6bhkncmsy1wzmdl52i4n253gslh8hq",
+      "version": "6.5.0",
+      "sha256": "0zgyc1qgwmj6xlda9xwwklspginp60akg684bjgd2yvdkhrbiqj9",
       "depends": ["Andromeda", "Cyclops", "DatabaseConnector", "FeatureExtraction", "Matrix", "PRROC", "ParallelLogger", "SqlRender", "digest", "dplyr", "memuse", "pROC", "rlang", "tidyr"]
     },
     "PatientProfiles": {
       "name": "PatientProfiles",
-      "version": "1.4.0",
-      "sha256": "0daq13ac314lcfsjjg1i5zk62fjnyfnnwf5hq2ms3qp15zc7cqp1",
+      "version": "1.4.2",
+      "sha256": "1va0ghgzjmjdy7m5l79n35skp2m3c2fj8lyg9qmn0cgvvp86w4lq",
       "depends": ["CDMConnector", "cli", "dplyr", "lifecycle", "omopgenerics", "purrr", "rlang", "stringr", "tidyr"]
     },
     "Patterns": {
       "name": "Patterns",
-      "version": "1.5",
-      "sha256": "1b4krl9gcwrxrslqyc0hhc6kqc7q34i70pyx9yb7xkdixs6dkr95",
-      "depends": ["Mfuzz", "SelectBoost", "VGAM", "WGCNA", "abind", "cluster", "e1071", "gplots", "igraph", "jetset", "lars", "lattice", "limma", "movMF", "nnls", "plotrix", "repmis", "tnet"]
+      "version": "1.6",
+      "sha256": "08fh7vj0c3ishb6m4vgka6nnhi3dhcagldq4y7qwcakgw4nlcpvf",
+      "depends": ["Mfuzz", "SelectBoost", "VGAM", "WGCNA", "abind", "cluster", "e1071", "gplots", "igraph", "jetset", "lars", "lattice", "limma", "movMF", "nnls", "plotrix", "tnet"]
     },
     "PdPDB": {
       "name": "PdPDB",
@@ -25455,9 +25623,9 @@
     },
     "PepMapViz": {
       "name": "PepMapViz",
-      "version": "1.0.0",
-      "sha256": "0akn8m97ngs5bhnvs6qwhg2sjwfwhcbd5q4yqns6r6h0dfzq4248",
-      "depends": ["data_table", "ggforce", "ggh4x", "ggnewscale", "ggplot2", "rlang", "stringr"]
+      "version": "1.1.0",
+      "sha256": "1rrgqbrm355a03b4vrfv116icbidy2i1ghvs2866dn4lj0z8dzhw",
+      "depends": ["DT", "data_table", "ggforce", "ggh4x", "ggnewscale", "ggplot2", "rlang", "shiny", "stringr"]
     },
     "PepSAVIms": {
       "name": "PepSAVIms",
@@ -25623,9 +25791,9 @@
     },
     "PhenotypeR": {
       "name": "PhenotypeR",
-      "version": "0.1.5",
-      "sha256": "1m5qpzxj15g41x6bk4cxv90p8n8ay9sbq0a9dapb8dlwc5iy2w42",
-      "depends": ["CodelistGenerator", "CohortCharacteristics", "CohortConstructor", "IncidencePrevalence", "OmopSketch", "cli", "dplyr", "magrittr", "omopgenerics", "purrr", "rlang", "vctrs"]
+      "version": "0.2.0",
+      "sha256": "1bw0hz0d76yygsrgir7cdgys3mgvcddaznl8pygc2rw3jq0n8klw",
+      "depends": ["CodelistGenerator", "CohortCharacteristics", "CohortConstructor", "IncidencePrevalence", "MeasurementDiagnostics", "OmopSketch", "cli", "dplyr", "magrittr", "omopgenerics", "purrr", "readr", "rlang", "vctrs"]
     },
     "PhenotypeSimulator": {
       "name": "PhenotypeSimulator",
@@ -25839,8 +26007,8 @@
     },
     "PoSIAdjRSquared": {
       "name": "PoSIAdjRSquared",
-      "version": "0.0.0.1",
-      "sha256": "1awdrw16pansw8m0lvm2ahbrmv2h3mv7yrcknj6dqypjqpiv5adg",
+      "version": "0.1.0",
+      "sha256": "0w8kv8d8jpw952wqnb3xzsk1lp59jzhwygdl8haif1j2yr1nwwc1",
       "depends": ["VGAM", "lmf"]
     },
     "PogromcyDanych": {
@@ -25861,12 +26029,6 @@
       "sha256": "0ml6xcdl4ygr01q0cjwd11ql7wal91jnf3hs1rfhfr4mh8jpgivx",
       "depends": ["MASS", "boot", "car", "ggplot2", "gmm", "lubridate", "sandwich"]
     },
-    "PointedSDMs": {
-      "name": "PointedSDMs",
-      "version": "2.1.3",
-      "sha256": "1gscdi8gzl9hd794iwxvl41m2jrhh3chb8h7dxqghln1s1bqi6g3",
-      "depends": ["FNN", "R6", "R_devices", "blockCV", "fmesher", "ggplot2", "inlabru", "raster", "sf", "sp", "terra"]
-    },
     "PoisBinNonNor": {
       "name": "PoisBinNonNor",
       "version": "1.3.3",
@@ -25935,9 +26097,9 @@
     },
     "PolisheR": {
       "name": "PolisheR",
-      "version": "1.0.0",
-      "sha256": "0fmjkjhdss980vx4p5j9yw0nkrydyjga2k2gv5gw3jri8335ky37",
-      "depends": ["NaileR", "dplyr", "shiny"]
+      "version": "1.1.1",
+      "sha256": "1wwm2ybrgxj4jjk2fpq2rx5ipp5a3sp4871a7np4glaap1a11mrj",
+      "depends": ["FactoMineR", "NaileR", "dplyr", "shiny", "shinycssloaders", "stringr"]
     },
     "Poly4AT": {
       "name": "Poly4AT",
@@ -25963,12 +26125,6 @@
       "sha256": "0np5v1255crfp1x7613rdzgkzkm64ikkjm67xrsncijr202yh1gq",
       "depends": ["FOCI", "igraph"]
     },
-    "PolyTrend": {
-      "name": "PolyTrend",
-      "version": "1.2",
-      "sha256": "17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5",
-      "depends": []
-    },
     "Polychrome": {
       "name": "Polychrome",
       "version": "1.5.4",
@@ -26037,9 +26193,9 @@
     },
     "PopGenHelpR": {
       "name": "PopGenHelpR",
-      "version": "1.3.2",
-      "sha256": "0qkfrv5qshzb06q0y6vp9f01xcs9zqc7zb8nmpyl1sb18a6bvv2r",
-      "depends": ["dplyr", "ggplot2", "magrittr", "reshape2", "rlang", "scatterpie", "spData", "spdep", "vcfR"]
+      "version": "1.4.0",
+      "sha256": "0pbbjb2kiyphlv7xmrania4pi5nv9h1m3n8242qwnkljxxixkz9q",
+      "depends": ["dplyr", "geodata", "ggplot2", "ggspatial", "magrittr", "reshape2", "rlang", "scatterpie", "sf", "spdep", "terra", "vcfR"]
     },
     "PopGenReport": {
       "name": "PopGenReport",
@@ -26113,6 +26269,12 @@
       "sha256": "1wszkvc3h72g1b8962749bg0gjh3nhcf6ydfd7471srkh9qhg4a0",
       "depends": ["miscF"]
     },
+    "PoweR": {
+      "name": "PoweR",
+      "version": "1.1.4",
+      "sha256": "19xjc23gxpnssijsd9mcfki8cswfwzr1m6yd8gym96rrwaqwsxps",
+      "depends": ["Rcpp", "RcppArmadillo"]
+    },
     "PoweREST": {
       "name": "PoweREST",
       "version": "0.1.0",
@@ -26145,9 +26307,9 @@
     },
     "PrInDT": {
       "name": "PrInDT",
-      "version": "1.0.1",
-      "sha256": "0z03d87bnp2cf2k4m25il2wqglj53g5mdz7wpjzvsklnzsmxdbmy",
-      "depends": ["MASS", "party", "splitstackshape", "stringr"]
+      "version": "2.0.0",
+      "sha256": "0wvb9p14nyf9ny006qavghbfrbc6iav3x5dgghmp6sbp11h1smrd",
+      "depends": ["MASS", "gdata", "party", "splitstackshape", "stringr"]
     },
     "PracTools": {
       "name": "PracTools",
@@ -26373,8 +26535,8 @@
     },
     "ProfileLadder": {
       "name": "ProfileLadder",
-      "version": "0.1.2",
-      "sha256": "0qrw6k12pbdribjlk25rvmlvkgbs5w9b3lf5lazff0xx0hqhkb7w",
+      "version": "0.1.3",
+      "sha256": "03v2ph3ms5r63i90a9cc6wl7pdav01fg6zff36ncx77mgcmhch1p",
       "depends": ["ChainLadder", "raw"]
     },
     "ProfileLikelihood": {
@@ -26451,8 +26613,8 @@
     },
     "ProxReg": {
       "name": "ProxReg",
-      "version": "1.1.1",
-      "sha256": "1j6m0f6jjv061r05i3ipj3knb11z6impsp453blazbqfl9gr4k51",
+      "version": "1.1.2",
+      "sha256": "18jdn28770d06iihkwjjcdimnhrcg8dxxp8j9kdglwv9xpynk89r",
       "depends": ["EBImage", "dplyr", "glmnet"]
     },
     "Przewodnik": {
@@ -26517,8 +26679,8 @@
     },
     "Publish": {
       "name": "Publish",
-      "version": "2023.01.17",
-      "sha256": "0lsr27014zm389xzyddklkql05zh4x9d7jcjz3yv78fwbjzw4v23",
+      "version": "2025.07.24",
+      "sha256": "1ay89c0ldxnavp9dlphawjcfbi3291wksdsfgrjv8x1wn7ziy57y",
       "depends": ["data_table", "lava", "multcomp", "prodlim", "survival"]
     },
     "PulmoDataSets": {
@@ -26551,6 +26713,12 @@
       "sha256": "1iz7vbsc7by3dwfnlz3sdch1ij3765lr9422v49mpqj51laykni6",
       "depends": ["MASS"]
     },
+    "Pv3Rs": {
+      "name": "Pv3Rs",
+      "version": "0.0.2",
+      "sha256": "1kjd8fh7din9gacqlppmvdn8bnagnx8718f3hlr2wnd9w15fr0qj",
+      "depends": ["RColorBrewer", "dplyr", "fields", "igraph", "matrixStats", "multicool", "partitions", "purrr"]
+    },
     "PvSTATEM": {
       "name": "PvSTATEM",
       "version": "0.2.2",
@@ -26607,8 +26775,8 @@
     },
     "QBMS": {
       "name": "QBMS",
-      "version": "1.5.0",
-      "sha256": "1b75qvcwm7c1f0387igw5ayafl66k8yrp1b78cb0yczhmaxx3bvm",
+      "version": "2.0.0",
+      "sha256": "0ysqyikykw2nyxq1xqbmnjji1s3h7xw3mwj2za5ld04gr577349r",
       "depends": ["DBI", "RNetCDF", "RSQLite", "future", "future_apply", "httr2", "jsonlite", "terra"]
     },
     "QCA": {
@@ -26709,8 +26877,8 @@
     },
     "QHScrnomo": {
       "name": "QHScrnomo",
-      "version": "3.0.1",
-      "sha256": "1axl0scvk5q127rcffdfv8k9ikvq0wamrbnqaimm3smcyfbcyyqm",
+      "version": "3.0.2",
+      "sha256": "1jpn2fl324cgp63d8w8v9bnyji7nl1n8rpk4x9m65hivlzfqdsk2",
       "depends": ["Hmisc", "cmprsk", "rms"]
     },
     "QI": {
@@ -26835,8 +27003,8 @@
     },
     "Qest": {
       "name": "Qest",
-      "version": "1.0.1",
-      "sha256": "0vl5nhnjijzqvk2s8l9rr6f7hqjh867w7b3w3j1b4kwzfpzsfcqc",
+      "version": "1.0.2",
+      "sha256": "18qx2vn8gl83hfvvcm20z57yj972pd8c8dxq0ksf7jbr2lf6jw3b",
       "depends": ["matrixStats", "pch", "survival"]
     },
     "Qindex": {
@@ -26871,9 +27039,9 @@
     },
     "Qtools": {
       "name": "Qtools",
-      "version": "1.5.9",
-      "sha256": "167c8mfj0if4j9m3rjbi1gnhwypq5ky297zyb437p42b3856qagi",
-      "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "boot", "conquer", "glmx", "gtools", "np", "numDeriv", "quantdr", "quantreg"]
+      "version": "1.6.0",
+      "sha256": "02nda27829ckxzicvrn5iy70aypbgnihck0sc3ln0cmc29sj3fyl",
+      "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "boot", "conquer", "corpcor", "glmx", "gtools", "np", "numDeriv", "quantdr", "quantreg"]
     },
     "QuAnTeTrack": {
       "name": "QuAnTeTrack",
@@ -26919,8 +27087,8 @@
     },
     "QuantBondCurves": {
       "name": "QuantBondCurves",
-      "version": "0.3.1",
-      "sha256": "0x4yirvdqg56n70va7kdnj4xlxbxl3w33q2m9rilcr27fg13wrf1",
+      "version": "0.3.2",
+      "sha256": "0jkr1fmmv4hf3d07l723cyfbj8092gx8842fv6iwddzl0q9hs28v",
       "depends": ["Rsolnp", "lubridate", "quantdates"]
     },
     "QuantNorm": {
@@ -26959,6 +27127,12 @@
       "sha256": "043lkg1pyaja7a4f9lmcwrvdjpfly2z378s15snwnxj8vb5pgr38",
       "depends": []
     },
+    "QuantilePeer": {
+      "name": "QuantilePeer",
+      "version": "0.0.1",
+      "sha256": "0zrg37x5wgvys76xzz84gjidhjbqsx2dywrrs851g3ha1qnjcpfp",
+      "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppNumerical", "formula_tools"]
+    },
     "QuantumOps": {
       "name": "QuantumOps",
       "version": "3.0.1",
@@ -27105,8 +27279,8 @@
     },
     "R2OpenBUGS": {
       "name": "R2OpenBUGS",
-      "version": "3.2-3.2.1",
-      "sha256": "0689aqa034xkbyy46m3sjanjkxrii4ma1crm5qw5kaqbx7dg153c",
+      "version": "3.2-4",
+      "sha256": "0isrfwvzvz4jlxmwrn6jfwcfccndk2q6645cwh11y4qrbf70yazz",
       "depends": ["boot", "coda"]
     },
     "R2ROC": {
@@ -27117,8 +27291,8 @@
     },
     "R2WinBUGS": {
       "name": "R2WinBUGS",
-      "version": "2.1-22.1",
-      "sha256": "199qkp4ar0kkdf7a2fn9aq17253ss97mddaivydcywvbp50n53j3",
+      "version": "2.1-23",
+      "sha256": "1czz9rqpfzqfhfk8sg08nxn9zlv4qr1xf89pyw5wsc7hrnpaxsza",
       "depends": ["boot", "coda"]
     },
     "R2admb": {
@@ -27135,8 +27309,8 @@
     },
     "R2sample": {
       "name": "R2sample",
-      "version": "4.0.1",
-      "sha256": "0i4ljqvka2rrwv19v0gd1hkh130bs0x83zqjq8gm6mbzbx9kw0h9",
+      "version": "4.1.0",
+      "sha256": "12ckc3jlnl1qkf1bkhj7nawp9r6mwnvlzgwjfna4x2pn2sxmvxr0",
       "depends": ["Rcpp", "ggplot2", "microbenchmark", "shiny"]
     },
     "R3port": {
@@ -27153,9 +27327,9 @@
     },
     "R4GoodPersonalFinances": {
       "name": "R4GoodPersonalFinances",
-      "version": "1.0.0",
-      "sha256": "01cac18gdg5dkspwk3kzvcbi5mrskxgic2whyk4awcbzm468z7ir",
-      "depends": ["PrettyCols", "bsicons", "bslib", "cachem", "cli", "dplyr", "fs", "furrr", "future", "ggplot2", "ggrepel", "ggtext", "glue", "lubridate", "memoise", "nloptr", "progressr", "purrr", "readr", "rlang", "scales", "shiny", "stringr", "tidyr"]
+      "version": "1.1.0",
+      "sha256": "1ms27kbi0b1nfk7hx01fgfjl0g1j093bnkhsm5sc2nnz6i9vl5n4",
+      "depends": ["PrettyCols", "bsicons", "bslib", "cachem", "cli", "dplyr", "fs", "furrr", "future", "ggplot2", "ggrepel", "ggtext", "glue", "gt", "lubridate", "memoise", "nloptr", "progressr", "purrr", "readr", "rlang", "scales", "shiny", "stringr", "tidyr"]
     },
     "R4HCR": {
       "name": "R4HCR",
@@ -27361,6 +27535,12 @@
       "sha256": "0dmyk75wr463prc0fi0n9cmyvdzcs50q7pndwqz5d9qv7vh8ny7h",
       "depends": ["BBmisc", "TeachingDemos", "checkmate", "mlr", "shape"]
     },
+    "RBaM": {
+      "name": "RBaM",
+      "version": "1.0.1",
+      "sha256": "02wqjy4ch9cshbf5b5zxvps64x0zzzysy00g515a7hw6yd7h891c",
+      "depends": ["R_utils", "ggplot2", "gridExtra", "rjson", "rlang", "tidyr"]
+    },
     "RBaseX": {
       "name": "RBaseX",
       "version": "1.1.2",
@@ -27453,8 +27633,8 @@
     },
     "RCPA": {
       "name": "RCPA",
-      "version": "0.2.6",
-      "sha256": "0hy8v2nz17c2n85pg3w775wrl5if6ch15h1y1hk7yld7rl7b2i3l",
+      "version": "0.2.7",
+      "sha256": "05k1kr76yi2i650lhr77kfnx1ca7i2hwflqy8531378qxk79lbb6",
       "depends": ["AnnotationDbi", "Biobase", "BiocManager", "DESeq2", "GEOquery", "IRdisplay", "RobustRankAggreg", "SummarizedExperiment", "dplyr", "edgeR", "ggnewscale", "ggpattern", "ggplot2", "ggrepel", "graph", "httr", "jsonlite", "limma", "rlang", "scales", "stringr", "tidyr"]
     },
     "RCPA3": {
@@ -27507,8 +27687,8 @@
     },
     "RCarb": {
       "name": "RCarb",
-      "version": "0.1.6",
-      "sha256": "0p4g41jsyy0kq8v1pva5463cass2924j6i1l5r665pzxya1w5n8p",
+      "version": "0.1.7",
+      "sha256": "01vwk9mf9lbzy8vky9yfs18a0g2bid0jgk0zlp9sd6m04fpd7qhg",
       "depends": ["interp", "matrixStats"]
     },
     "RChest": {
@@ -27613,6 +27793,12 @@
       "sha256": "0aqjs7dh40d24l8fhhkyf1vnpwbxm47blfi4lwwld2hyi854m80q",
       "depends": ["Rcpp", "Rfast"]
     },
+    "RDML": {
+      "name": "RDML",
+      "version": "1.1",
+      "sha256": "0r113yds2090pys41aigpp2wkrmbm891j045g0in5l9j9zw136yj",
+      "depends": ["R6", "checkmate", "data_table", "lubridate", "pipeR", "readxl", "rlist", "stringr", "xml2"]
+    },
     "RDP": {
       "name": "RDP",
       "version": "0.3.0",
@@ -27669,8 +27855,8 @@
     },
     "RECA": {
       "name": "RECA",
-      "version": "1.7",
-      "sha256": "1xikj20flqajpkw4wyynmqd1pafbylzwfrmc8bz9pqgggjjhrqql",
+      "version": "1.7.1",
+      "sha256": "07wwsch9242npbqz11alqjqpa0di3s7h6aawl6pq0a8yrr44cxy2",
       "depends": []
     },
     "REDCapCAST": {
@@ -27687,20 +27873,20 @@
     },
     "REDCapExporter": {
       "name": "REDCapExporter",
-      "version": "0.3.1",
-      "sha256": "0pwyv6wz03d38yi9xgwzjfy2sjwq30h11nji1jb30h24ls4ynxyp",
+      "version": "0.3.2",
+      "sha256": "09agay7glhfzwp9h3j0f71r65d1d6b2ccar04bkbas5fgbfv8xl7",
       "depends": ["curl", "keyring", "lubridate", "rjson"]
     },
     "REDCapR": {
       "name": "REDCapR",
-      "version": "1.4.0",
-      "sha256": "0qjcp8s1fvc47am21dnxgdvgjrnpma8qfzdbfv41n5jyva18scbz",
+      "version": "1.5.0",
+      "sha256": "0gsf4p76lkd1sr1ni5ylrpsw0s9qy33zsxzpyzsg248rv3chaddq",
       "depends": ["checkmate", "dplyr", "httr", "jsonlite", "magrittr", "readr", "rlang", "tibble", "tidyr"]
     },
     "REDCapTidieR": {
       "name": "REDCapTidieR",
-      "version": "1.2.3",
-      "sha256": "17pn2k5r9mn1762xn4nvm6x6zfk0gac7vw04qs3gif9nywbfl71r",
+      "version": "1.2.4",
+      "sha256": "192a2mdv0zcm8rqas58cx23xaqjs4awibakb3jgp7ybpmhpcvs5n",
       "depends": ["REDCapR", "checkmate", "cli", "dplyr", "forcats", "formattable", "glue", "lobstr", "lubridate", "pillar", "purrr", "readr", "rlang", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
     },
     "REDI": {
@@ -27711,9 +27897,9 @@
     },
     "REEMtree": {
       "name": "REEMtree",
-      "version": "0.90.5",
-      "sha256": "1iapqwhis2vz19c3mivmwpj0nlgzb8fm3j2w060ypydwzmar0qmj",
-      "depends": ["nlme", "rpart"]
+      "version": "0.90.6",
+      "sha256": "0lxnj2pdkn2w5b3681y510f7dln9d7055aismriipiq7znz9k6ya",
+      "depends": ["AER", "nlme", "rpart"]
     },
     "REFA": {
       "name": "REFA",
@@ -27733,6 +27919,12 @@
       "sha256": "0qjrck92fjmvwmwix5kniaqhh3y81xgpbmbfcsgimjjgpj1dqmma",
       "depends": ["GPArotation", "geex"]
     },
+    "REMixed": {
+      "name": "REMixed",
+      "version": "0.1.0",
+      "sha256": "1v9b8wjzbx94f8ay67yvgclwkma529dvd3r0l3yn9fwd4j088nrr",
+      "depends": ["Rmpfr", "Rsmlx", "deSolve", "doSNOW", "dplyr", "fastGHQuad", "foreach", "ggplot2", "snow", "stringr"]
+    },
     "REN": {
       "name": "REN",
       "version": "0.1.0",
@@ -27757,6 +27949,12 @@
       "sha256": "0mm815pf90xqp1fgz955cdgc9k72kpq8zlpfa18pb478c02kvwg3",
       "depends": ["DT", "REPPlab", "shiny"]
     },
+    "REPS": {
+      "name": "REPS",
+      "version": "1.0.0",
+      "sha256": "042avc8zd33lykjcqc5ly3vlfygvh1wq2jmk846gka1mi6yjl78r",
+      "depends": ["KFAS", "dplyr", "lmtest", "stringr"]
+    },
     "REPTILE": {
       "name": "REPTILE",
       "version": "1.0",
@@ -27777,8 +27975,8 @@
     },
     "RESI": {
       "name": "RESI",
-      "version": "1.3.0",
-      "sha256": "04pi6j8yzcxfzq3irdwg4zd3wmkf3mw8ra9d0kcgabpmdf48bg9q",
+      "version": "1.3.2",
+      "sha256": "0g8gbbdxlf8wxbkhjjbpwdgis5g7ibm4gl3fcdrr7g894i14vfjm",
       "depends": ["aod", "boot", "car", "clubSandwich", "ggplot2", "lmtest", "nlme", "sandwich"]
     },
     "RESIDE": {
@@ -27807,8 +28005,8 @@
     },
     "REddyProc": {
       "name": "REddyProc",
-      "version": "1.3.3",
-      "sha256": "0ss8zyvvhkkw42vk3v4qx21i9navb74kjlgj3dikz0a19z93nrrz",
+      "version": "1.3.4",
+      "sha256": "0aif078c7zkvym7bmkgylf9fd81q6vn5js7va5brv6zr1mjij1vc",
       "depends": ["Rcpp", "bigleaf", "dplyr", "magrittr", "mlegp", "purrr", "readr", "rlang", "solartime", "tibble"]
     },
     "REddyProcNCDF": {
@@ -27921,15 +28119,15 @@
     },
     "RGENERATE": {
       "name": "RGENERATE",
-      "version": "1.3.7",
-      "sha256": "0w6hqrf2lr6qz79skml2vjpfwfv5vxj94rghxxa3rp9dqzhi7rc0",
-      "depends": ["RMAWGEN", "magrittr"]
+      "version": "1.3.8",
+      "sha256": "19l35hhxy5hbdyk2q2vqad146crykap7wb179gwbwfqzl9v1ryd9",
+      "depends": ["RMAWGEN", "magrittr", "vars"]
     },
     "RGENERATEPREC": {
       "name": "RGENERATEPREC",
-      "version": "1.2.9",
-      "sha256": "0bnw77vny61pkhp9pb3v3ckz6immm4pp9f7qzyhc97646fci9ysl",
-      "depends": ["Matrix", "RGENERATE", "RMAWGEN", "blockmatrix", "copula", "stringr"]
+      "version": "1.3.2",
+      "sha256": "13qk00gd5gpf20rb7fb569bf5gs54gkl2zs04jd7iybwmnphxby4",
+      "depends": ["Matrix", "RGENERATE", "RMAWGEN", "blockmatrix", "copula", "lubridate", "stringr"]
     },
     "RGF": {
       "name": "RGF",
@@ -27987,9 +28185,9 @@
     },
     "RGraphSpace": {
       "name": "RGraphSpace",
-      "version": "1.0.8",
-      "sha256": "1fhs2bh1zcld4yr7yp5j9bgyjykh6rkccg6l76xyk44pn5z02prj",
-      "depends": ["ggplot2", "igraph", "scales"]
+      "version": "1.0.9",
+      "sha256": "0nx4fz956sl4fxivq3wy5i3zd7bir3hqp7ffyam87f5sbb19p9da",
+      "depends": ["ggplot2", "igraph", "lifecycle", "scales"]
     },
     "RGraphics": {
       "name": "RGraphics",
@@ -28245,8 +28443,8 @@
     },
     "RKorAPClient": {
       "name": "RKorAPClient",
-      "version": "1.0.0",
-      "sha256": "0zk7sn1kqh963vrjv2hylqgchvl2wph4jns52ik25jm70k1i16rr",
+      "version": "1.1.0",
+      "sha256": "1k37if7jfrl2ybncd69f0ccv6qv92xz22s0683110mgbxcza6fg8",
       "depends": ["PTXQC", "R_cache", "broom", "curl", "dplyr", "ggplot2", "highcharter", "httr2", "jsonlite", "keyring", "lubridate", "magrittr", "purrr", "stringr", "tibble", "tidyr", "urltools"]
     },
     "RLRsim": {
@@ -28299,8 +28497,8 @@
     },
     "RLumShiny": {
       "name": "RLumShiny",
-      "version": "0.2.4",
-      "sha256": "0iyg1j7w2888lgv1palpc0chh7i8fli12qv3rvm5bvmwp4qhgbzj",
+      "version": "0.2.5",
+      "sha256": "1kgzrhi6bm1rk3s22k17wp9ylrl204kasd2gy7g13d58r748v95g",
       "depends": ["DT", "Luminescence", "RCarb", "data_table", "googleVis", "knitr", "leaflet", "markdown", "readxl", "rhandsontable", "shiny", "shinydashboard"]
     },
     "RM_weights": {
@@ -28339,6 +28537,12 @@
       "sha256": "0rairbx6fqwzpdc6b0did5212ki0ryc1b23xfwaql3a7b1rmzn5h",
       "depends": ["dplyr", "fmsb", "igraph", "lpSolve", "matlib", "matrixStats", "nloptr", "pracma"]
     },
+    "RMCLab": {
+      "name": "RMCLab",
+      "version": "0.1.0",
+      "sha256": "06z6zb085s1j1vvwm0mdb2rnfi6r117f51rql43b2xg19jcx0imn",
+      "depends": ["Rcpp", "RcppArmadillo", "softImpute"]
+    },
     "RMFM": {
       "name": "RMFM",
       "version": "1.1.0",
@@ -28407,8 +28611,8 @@
     },
     "RMSS": {
       "name": "RMSS",
-      "version": "1.1.2",
-      "sha256": "01hf291czmdijm1152ckdrd33a8w2m0rdwclaj607b81hb1431q0",
+      "version": "1.2.0",
+      "sha256": "1dfnaj8fpkyh7m9ydm4qyl5g26nxfh3iw3ap6j22i92p9fihpv59",
       "depends": ["Rcpp", "RcppArmadillo", "cellWise", "robStepSplitReg", "robustbase", "srlars"]
     },
     "RMT4DS": {
@@ -28485,8 +28689,8 @@
     },
     "RMixtComp": {
       "name": "RMixtComp",
-      "version": "4.1.4",
-      "sha256": "1jybw5yhcahvixpyb551mzifi6kw914g80g1g4pdbgpkg4f9sfk4",
+      "version": "4.1.5",
+      "sha256": "18714vz8lz8rv2l3l9fsdpwmz8rb3l14siqf58c7q4cw2kvaz030",
       "depends": ["RMixtCompIO", "RMixtCompUtilities", "ggplot2", "plotly", "scales"]
     },
     "RMixtCompIO": {
@@ -28525,12 +28729,6 @@
       "sha256": "1041whycnph2bdmphy9k27b39g541lxa210jbnfxc5r9617rcavh",
       "depends": ["AnnotationFilter", "AnnotationHub", "BiocGenerics", "ComplexHeatmap", "DESeq2", "SummarizedExperiment", "circlize", "cowplot", "dplyr", "ensembldb", "ggplot2", "ggpointdensity", "ggrepel", "magrittr", "matrixStats", "patchwork", "purrr", "stringr", "tibble", "tidyr", "tidyselect"]
     },
-    "RNCBIEUtilsLibs": {
-      "name": "RNCBIEUtilsLibs",
-      "version": "0.9",
-      "sha256": "1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba",
-      "depends": ["rJava"]
-    },
     "RNCEP": {
       "name": "RNCEP",
       "version": "1.0.11",
@@ -28651,6 +28849,12 @@
       "sha256": "1c5kyv716afanpcqavj51zhjvx9bjjbxwzhd104hj34gcvhqcy2d",
       "depends": ["data_table"]
     },
+    "ROCnGO": {
+      "name": "ROCnGO",
+      "version": "0.1.0",
+      "sha256": "0ipbkfr8sx4c5wf4zcfscx1vfrwvcyh2m2qjhjb26bg2bd7pc5kg",
+      "depends": ["SummarizedExperiment", "cli", "dplyr", "forcats", "ggplot2", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"]
+    },
     "ROCnReg": {
       "name": "ROCnReg",
       "version": "1.0-9",
@@ -29121,8 +29325,8 @@
     },
     "RRgeo": {
       "name": "RRgeo",
-      "version": "0.0.3",
-      "sha256": "1clarffwzjljpp9b3n7zn159w8zk0claj1x1nc3gmn3771z551hr",
+      "version": "0.0.5",
+      "sha256": "1dnj5pp09lyfvcc1s2wmz5armdh68k6flhnvn29irnn5fwr9kfsl",
       "depends": ["PresenceAbsence", "RRphylo", "Rphylopars", "ade4", "adehabitatMA", "ape", "biomod2", "dismo", "doParallel", "doSNOW", "ecospat", "foreach", "gtools", "ks", "leastcostpath", "pbapply", "scales", "sf", "sp", "terra"]
     },
     "RRmorph": {
@@ -29133,14 +29337,14 @@
     },
     "RRphylo": {
       "name": "RRphylo",
-      "version": "3.0.0",
-      "sha256": "1sadp65prgdymns73lbppdria4a27r8klvkxp1rmwygrqhn1l6mv",
+      "version": "3.0.1",
+      "sha256": "1j49860shz9dz6alrf7i331b00xz09ln8sxmvh8l3a2nfzms81qz",
       "depends": ["ape", "doParallel", "emmeans", "foreach", "phytools"]
     },
     "RRreg": {
       "name": "RRreg",
-      "version": "0.7.5",
-      "sha256": "105hv4izzbm5b89mg1k99zkms8ppjafj6x2fvh71yhaszh79fh88",
+      "version": "0.7.6",
+      "sha256": "1hskns7h57z9jg3rfazd4gnx6pyq90ga1vprxj6n1j513x6zam1q",
       "depends": ["doParallel", "foreach", "lme4"]
     },
     "RSA": {
@@ -29185,6 +29389,12 @@
       "sha256": "08p4gywh1g13mwcmvp046ybz410jyrzi505rdqr8yirjpk59bw1p",
       "depends": ["Metrics", "ggplot2", "gridExtra", "rJava", "shiny", "shinycssloaders", "shinyjs"]
     },
+    "RSD": {
+      "name": "RSD",
+      "version": "0.2.0",
+      "sha256": "0rqhg2bf3pbvv09bpywy480psqdhy0z85n20gba0rvg72n1iq1ii",
+      "depends": ["dplyr", "ggplot2", "magrittr", "tidyr"]
+    },
     "RSDA": {
       "name": "RSDA",
       "version": "3.2.4",
@@ -29227,12 +29437,6 @@
       "sha256": "1z2slc2gxr3w7m1ybyd69axx1gi4fadjlkg066gf12b86bbmfia2",
       "depends": ["Rcpp"]
     },
-    "RSP": {
-      "name": "RSP",
-      "version": "0.4",
-      "sha256": "126lag0i2k4fwlr7gnc9jfn63pyi6d6gzzmypyr6jk666pwsk5f6",
-      "depends": ["DT", "GPArotation", "MVN", "Metrics", "ShinyItemAnalysis", "catR", "foreign", "ggplot2", "gt", "hornpa", "igraph", "lavaan", "ltm", "mirt", "plyr", "polycor", "psych", "rJava", "rstudioapi", "scales", "semPlot", "shiny", "shinyBS", "shinyWidgets", "shinycustomloader", "shinyjs", "shinythemes", "xlsx"]
-    },
     "RSQL": {
       "name": "RSQL",
       "version": "0.2.2",
@@ -29241,8 +29445,8 @@
     },
     "RSQLite": {
       "name": "RSQLite",
-      "version": "2.4.1",
-      "sha256": "17b086wgpk0yynymhwm20j4ik6xf4xccpzl00nnk4zi6qp66ria7",
+      "version": "2.4.2",
+      "sha256": "0vl0j2f3m7q2vs93a91dn1xnbsdq76wbj3ip707cqpymmyyc5ykh",
       "depends": ["DBI", "bit64", "blob", "cpp11", "memoise", "pkgconfig", "plogr", "rlang"]
     },
     "RSSL": {
@@ -29301,8 +29505,8 @@
     },
     "RSiena": {
       "name": "RSiena",
-      "version": "1.4.7",
-      "sha256": "0hvjd0f80p5icrzd4qa01349pkc5884l2p00m580aqiigri49d1q",
+      "version": "1.5.0",
+      "sha256": "17cky5769ra4mpppb2m4kf9zpkf9lnvkm21wq11cbhrfzaspaqn8",
       "depends": ["MASS", "Matrix", "lattice", "xtable"]
     },
     "RSizeBiased": {
@@ -29409,8 +29613,8 @@
     },
     "RTLknitr": {
       "name": "RTLknitr",
-      "version": "1.0.0",
-      "sha256": "125sx7gy8gnyhz15cjrmqwrh32w3nd49d8qwg0grj3q12v03i8ca",
+      "version": "1.0.1",
+      "sha256": "0a1bxbadmwmsscmsgdq4pw5skssp6dbddyv6d4ysl6xllqx9pppy",
       "depends": ["bookdown", "gt", "knitr", "magrittr"]
     },
     "RTMB": {
@@ -29457,8 +29661,8 @@
     },
     "RUnit": {
       "name": "RUnit",
-      "version": "0.4.33",
-      "sha256": "0pybwvd57vf71vvlxdrynw5n6s5gnbqnwvq0qpd395ggqypwb95j",
+      "version": "0.4.33.1",
+      "sha256": "01bz34hf4j93mldwharwdc691db324zbl09zg1qnwjnhm0xzla45",
       "depends": []
     },
     "RVA": {
@@ -29469,8 +29673,8 @@
     },
     "RVAideMemoire": {
       "name": "RVAideMemoire",
-      "version": "0.9-83-11",
-      "sha256": "133wil3sywpyha10mfjryl8crgm0q8hmy2w5xniid888a2jkna0d",
+      "version": "0.9-83-12",
+      "sha256": "1q52yhg2fhhs7nc77am0jbpd1pd6baqfdp8j8gch6nac9qw04jzc",
       "depends": ["FactoMineR", "MASS", "ade4", "boot", "car", "lme4", "nnet", "pls", "pspearman", "vegan"]
     },
     "RVCompare": {
@@ -29553,8 +29757,8 @@
     },
     "RWsearch": {
       "name": "RWsearch",
-      "version": "5.2.4",
-      "sha256": "1mb6kpqmpiy2zw4rklwx65aiw0khnfwvdgia7agp42nfnalihi21",
+      "version": "5.2.6",
+      "sha256": "01dyyyim7r0flp37jzwbh9c5rkzq6cqsixpxdxhv5xkagjmklpfd",
       "depends": ["XML", "brew", "latexpdf", "networkD3", "sig", "sos"]
     },
     "RXKCD": {
@@ -29649,8 +29853,8 @@
     },
     "Radviz": {
       "name": "Radviz",
-      "version": "0.9.4",
-      "sha256": "06mv7y4gi6h1k986blzngrvgnp375p3f5gdj4vgphxq2qg83a8wk",
+      "version": "0.9.5",
+      "sha256": "0ks7vyb46pgdfkkxrcfg9wbglpjgvzv8s601aa6k1f3vnxfg3kz7",
       "depends": ["Rcpp", "RcppArmadillo", "dplyr", "ggplot2", "hexbin", "igraph", "pracma", "rlang"]
     },
     "RagGrid": {
@@ -29859,8 +30063,8 @@
     },
     "RavenR": {
       "name": "RavenR",
-      "version": "2.2.2",
-      "sha256": "0z1gp1jvh0b80f5bkfg1gg7x116axfgix13hpviyh0c3mfi5yw37",
+      "version": "2.2.3",
+      "sha256": "0idwdxgvyb72cm53zcj0dy7mfvwjx6za8d8whmbwb4qp20ixdd3x",
       "depends": ["DiagrammeR", "RCurl", "Rcpp", "colorspace", "cowplot", "crayon", "dplyr", "dygraphs", "gdata", "ggplot2", "igraph", "lubridate", "magrittr", "purrr", "scales", "stringr", "tidyr", "visNetwork", "xts", "zoo"]
     },
     "RawHummus": {
@@ -29947,12 +30151,6 @@
       "sha256": "1rrij4ryspff9mn1c3jlzjprnipak7nzlb488pk0ci0awaccp5ga",
       "depends": ["data_table", "igraph", "sqldf", "visNetwork"]
     },
-    "RchivalTag": {
-      "name": "RchivalTag",
-      "version": "0.1.9",
-      "sha256": "0sz6hmcpsgp5am5g89q15was8im6wr2c18fjsychjxngj6ii0cy0",
-      "depends": ["cleangeo", "dygraphs", "ggedit", "ggplot2", "htmlwidgets", "leaflet", "leaflet_extras2", "lubridate", "mapdata", "maps", "ncdf4", "oceanmap", "plotly", "plyr", "pracma", "raster", "readr", "sf", "shiny", "sp", "stringr", "suntools", "xts"]
-    },
     "Rchoice": {
       "name": "Rchoice",
       "version": "0.3-6",
@@ -29967,8 +30165,8 @@
     },
     "RcmdrMisc": {
       "name": "RcmdrMisc",
-      "version": "2.9-1",
-      "sha256": "0khp8dw1b3v5jqbhnqxjcyyjz9hj9pb98niacn17cf9iln9rr7mc",
+      "version": "2.9-2",
+      "sha256": "07apdqwrr3bkhg53cpq7sxlx74x455754dihhn1s4jqys3437g68",
       "depends": ["Hmisc", "MASS", "abind", "car", "colorspace", "e1071", "foreign", "haven", "lattice", "nortest", "readstata13", "readxl", "sandwich"]
     },
     "RcmdrPlugin_BWS1": {
@@ -29989,12 +30187,6 @@
       "sha256": "0ac9vw34pgd2919d2gzk8xv55i60d8ndvwzi14rwvgc5ll38hh73",
       "depends": ["Rcmdr", "support_BWS3", "support_CEs", "survival"]
     },
-    "RcmdrPlugin_BiclustGUI": {
-      "name": "RcmdrPlugin.BiclustGUI",
-      "version": "1.1.3.1",
-      "sha256": "1wb1pbwghq1xxpwlihfixx42yf1f1py3hdwh8sfpqklh63ymwifk",
-      "depends": ["BcDiag", "BiBitR", "BicARE", "Rcmdr", "biclust", "fabia", "gplots", "iBBiG", "s4vd", "superbiclust", "viridis"]
-    },
     "RcmdrPlugin_DCCV": {
       "name": "RcmdrPlugin.DCCV",
       "version": "0.2-0",
@@ -30177,8 +30369,8 @@
     },
     "Rcpp": {
       "name": "Rcpp",
-      "version": "1.0.14",
-      "sha256": "00l0791grrwkg4rkqb6k6d5x9qas9cizbgnv7iqy5qxhxx94ms3l",
+      "version": "1.1.0",
+      "sha256": "0kgvdh3s4kskr1m23bybpkpbm47wgbln2mz7n8wwhs5s40jiq8c4",
       "depends": []
     },
     "Rcpp11": {
@@ -30207,8 +30399,8 @@
     },
     "RcppArmadillo": {
       "name": "RcppArmadillo",
-      "version": "14.4.3-1",
-      "sha256": "0f54x1nphwd5b0ipjqj3xql6zxgby8m3xri881zh2a9yih2mckqi",
+      "version": "14.6.0-1",
+      "sha256": "17igvyb5g8i2b1mjs0n56aqcx83js3fmzwwwz2k96zhizlmnwbhs",
       "depends": ["Rcpp"]
     },
     "RcppArray": {
@@ -30261,8 +30453,8 @@
     },
     "RcppCWB": {
       "name": "RcppCWB",
-      "version": "0.6.7",
-      "sha256": "0n2npdr7cvvch0667f3axx4an08vrp9rmb5dr0apg4wpannai5zf",
+      "version": "0.6.8",
+      "sha256": "1h64gaww45h1hbsnk01r88a77awi0af8s8g6ayvyylpvg5lainh4",
       "depends": ["Rcpp", "fs"]
     },
     "RcppCensSpatial": {
@@ -30465,9 +30657,9 @@
     },
     "RcppPlanc": {
       "name": "RcppPlanc",
-      "version": "2.0.12",
-      "sha256": "148yjcbyq72jr0wqjjwj41gd6m2mzghkk8p48bb23w88fzj2m333",
-      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "hdf5r_Extra"]
+      "version": "2.0.13",
+      "sha256": "149fkjrfgqkvlr99c8ri1019hr2lrjfrpsdmnxg447wsvxgm39r2",
+      "depends": ["HighFive", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "hdf5r_Extra"]
     },
     "RcppProgress": {
       "name": "RcppProgress",
@@ -30483,8 +30675,8 @@
     },
     "RcppRedis": {
       "name": "RcppRedis",
-      "version": "0.2.5",
-      "sha256": "0a3h26cbzfzlw6x3fpvcjfbaai8v41jld2dav250vw7r0vc4cj7r",
+      "version": "0.2.6",
+      "sha256": "1n3x9nh9k6jq6b728g66ckcp6njy6r2yfxvzmlx2ifcah1aixn98",
       "depends": ["RApiSerialize", "Rcpp"]
     },
     "RcppRoll": {
@@ -30543,8 +30735,8 @@
     },
     "RcppXPtrUtils": {
       "name": "RcppXPtrUtils",
-      "version": "0.1.2",
-      "sha256": "0hm57nf4dzgsmg4hjj6wikwjx93fgfwkmybw6ly4b58wi6qwml1l",
+      "version": "0.1.3",
+      "sha256": "0kgagmsiz6w98bj12mz2383nnl5w3b2nh86a5csjiy4gc21g6jrn",
       "depends": ["Rcpp"]
     },
     "RcppXsimd": {
@@ -30573,8 +30765,8 @@
     },
     "Rcsdp": {
       "name": "Rcsdp",
-      "version": "0.1.57.5",
-      "sha256": "1lhw7czra10bw8r7cv472wyx58gd4qhs6hsyijsgkfcb9b5qn12h",
+      "version": "0.1.57.6",
+      "sha256": "0c2vpq89k1dxkil0gf4qh1vv2xajcbxnhfavc6sc0qwz54394xf9",
       "depends": []
     },
     "Rcssplot": {
@@ -30747,8 +30939,8 @@
     },
     "Recocrop": {
       "name": "Recocrop",
-      "version": "0.4-1",
-      "sha256": "1drh1qssnb42p1zl45phpggxhx6is435k9f1vzga0q0dddr5q770",
+      "version": "0.4-2",
+      "sha256": "0n7k8wgpn90ilz8gq81l6z5jafyrcbgr5363wkj09qqrhj81v8lh",
       "depends": ["Rcpp", "meteor", "terra"]
     },
     "Recon": {
@@ -30759,8 +30951,8 @@
     },
     "RecordLinkage": {
       "name": "RecordLinkage",
-      "version": "0.4-12.4",
-      "sha256": "0jfissk9gcf1w78dhly01dpjlb8nyk32iz1s2n38ggk8ywd4zgbk",
+      "version": "0.4-12.5",
+      "sha256": "14dpwnkymkzs2j714vxj0nsi2yqglcgdqr80772lr8y6v0pkxc1x",
       "depends": ["DBI", "RSQLite", "ada", "data_table", "e1071", "evd", "ff", "ipred", "nnet", "rpart", "xtable"]
     },
     "RecordTest": {
@@ -30825,8 +31017,8 @@
     },
     "RegDDM": {
       "name": "RegDDM",
-      "version": "1.0",
-      "sha256": "1dj3m2ixvbxi707fwwhx2vsrbz598n55s1fvdi39kbm4l2qg0f13",
+      "version": "1.1",
+      "sha256": "17vwqfb93vgbszv2yrjbbgknxp21ah7vnv4697i926nrp26kzvb4",
       "depends": ["dplyr", "purrr", "rlang", "rstan", "rtdists", "stringr", "tidyr"]
     },
     "RegKink": {
@@ -30885,8 +31077,8 @@
     },
     "ReliaGrowR": {
       "name": "ReliaGrowR",
-      "version": "0.1.4",
-      "sha256": "1g98g445rrkwpgk36zg5c28p3w68l1k8dflplxjdcfmrldph51ab",
+      "version": "0.1.5",
+      "sha256": "0vml5vqrslwxfjprdiv8gkv39nf25scwkh6637d420xh3i27lp61",
       "depends": ["segmented"]
     },
     "ReliabilityTheory": {
@@ -30981,8 +31173,8 @@
     },
     "ResIN": {
       "name": "ResIN",
-      "version": "2.1.0",
-      "sha256": "0kx74xc029yi20l15ri1isv6k26xwybi2hhama232aa17z7dl0bj",
+      "version": "2.2.1",
+      "sha256": "0mgx4k0rsqf4wxlxjsfw7zp8ri7fpwj4xrjqaag45mk08rxkx21p",
       "depends": ["DirectedClustering", "Matrix", "doSNOW", "dplyr", "fastDummies", "foreach", "ggplot2", "ggraph", "igraph", "parallelly", "psych", "qgraph", "readr", "shadowtext", "tidyr", "wCorr"]
     },
     "ResIndex": {
@@ -31045,12 +31237,6 @@
       "sha256": "1w2x1spyg3dam6jrj85vc0n058fiziz0awz524hzh7nrm6ra0yly",
       "depends": ["DT", "Rdpack", "evd", "ggplot2", "gridExtra", "ismev", "mathjaxr", "openair", "shiny", "shinydashboard"]
     },
-    "RevEcoR": {
-      "name": "RevEcoR",
-      "version": "0.99.3",
-      "sha256": "1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj",
-      "depends": ["Matrix", "XML", "gtools", "igraph", "magrittr", "plyr", "purrr", "stringr"]
-    },
     "RevGadgets": {
       "name": "RevGadgets",
       "version": "1.2.1",
@@ -31137,8 +31323,8 @@
     },
     "Rfssa": {
       "name": "Rfssa",
-      "version": "3.1.0",
-      "sha256": "0knz199h29ph6qxbasrjqdyhgsqnrmp83syz3d3mblqnlz3ar1mi",
+      "version": "3.2.0",
+      "sha256": "0cbmz30gnrv6qxa6svr1rkbq4y7vk4arzamvfiq24sfbfvrr82nc",
       "depends": ["RSpectra", "Rcpp", "RcppArmadillo", "RcppEigen", "Rssa", "dplyr", "fda", "ftsa", "ggplot2", "lattice", "markdown", "plotly", "rainbow", "shiny", "tibble"]
     },
     "Rgbp": {
@@ -31161,9 +31347,9 @@
     },
     "Rgof": {
       "name": "Rgof",
-      "version": "3.2.0",
-      "sha256": "1s8mvc05ri2d9ifqnkj90j8b4ifs5dbpmh20slcxka7ipw25q45s",
-      "depends": ["Rcpp", "ggplot2", "microbenchmark"]
+      "version": "3.3.0",
+      "sha256": "1yhyz4gks1pcazzsc11ia9sg81xh04kk0yxi4ilhbk1bpgps05kd",
+      "depends": ["Rcpp", "ggplot2", "microbenchmark", "nortest"]
     },
     "RgoogleMaps": {
       "name": "RgoogleMaps",
@@ -31377,9 +31563,9 @@
     },
     "Rmonize": {
       "name": "Rmonize",
-      "version": "1.1.0",
-      "sha256": "0k9v0larxg35vnq65ybzp9nf5w860vqp7m0jf4q4ax58vj6f17yw",
-      "depends": ["crayon", "dplyr", "fabR", "fs", "haven", "lifecycle", "madshapR", "rlang", "stringr", "tidyr"]
+      "version": "2.0.0",
+      "sha256": "0jx3yd3v81pvcg81akj38khgwwii9gdwkbhzk3vxxiqrvzk0ynrm",
+      "depends": ["crayon", "dplyr", "fabR", "fs", "haven", "madshapR", "rlang", "stringr", "tidyr"]
     },
     "Rmosek": {
       "name": "Rmosek",
@@ -31389,8 +31575,8 @@
     },
     "Rmpfr": {
       "name": "Rmpfr",
-      "version": "1.1-0",
-      "sha256": "07qlmyqj1jnzg4kzqd1zpr8vky68hn12nkzxh459c0zhqy6i8gmf",
+      "version": "1.1-1",
+      "sha256": "1ljb558b40w4gk8bn9qdb81m8q5a1jwq6xvmp6fr7sd9mfdsyrqz",
       "depends": ["gmp"]
     },
     "Rmpi": {
@@ -31419,8 +31605,8 @@
     },
     "Rnest": {
       "name": "Rnest",
-      "version": "1.1",
-      "sha256": "0w74h0jb94rp63jcar8k0knv7ifhhq66w875dwfpld6ffaqisr7h",
+      "version": "1.2",
+      "sha256": "1yc5a09iwdx6jqrjpg9dm6fb569kmv7cm6qgn018qfwbidahh6dj",
       "depends": ["EFA_MRFA", "MASS", "cli", "crayon", "fungible", "ggplot2", "lavaan", "mvtnorm", "scales"]
     },
     "Rnightly": {
@@ -31449,8 +31635,8 @@
     },
     "RoBMA": {
       "name": "RoBMA",
-      "version": "3.5.0",
-      "sha256": "0c1dfvlridvnxgnrq6q97zlj3693v0pppf6lmvzwl972pnm70jkg",
+      "version": "3.5.1",
+      "sha256": "0nihhr6aipgwiskvvfbniqbnyhwfxzqzb1wkyq6wz98cb0kkmick",
       "depends": ["BayesTools", "Rdpack", "coda", "ggplot2", "mvtnorm", "rjags", "rlang", "runjags", "scales"]
     },
     "RoBSA": {
@@ -31585,6 +31771,12 @@
       "sha256": "0cbibfp4y45cc1disp2r37v0jln0cd9gy3d77z3k9ybj1gg8wa88",
       "depends": ["rjags", "statip"]
     },
+    "RobustCalibration": {
+      "name": "RobustCalibration",
+      "version": "0.5.6",
+      "sha256": "1mhaxxifay8xakpj3q5pq2rgrklwxh7b3pca1im0wpn8nl9hiw73",
+      "depends": ["Rcpp", "RcppEigen", "RobustGaSP", "nloptr"]
+    },
     "RobustGaSP": {
       "name": "RobustGaSP",
       "version": "0.6.8",
@@ -31617,9 +31809,9 @@
     },
     "Robyn": {
       "name": "Robyn",
-      "version": "3.11.1",
-      "sha256": "0bcam3ki00s4rn1jyny7n9azandpl72b4w6gm1s50iivx17w6km2",
-      "depends": ["doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "ggridges", "glmnet", "jsonlite", "lares", "lubridate", "minpack_lm", "nloptr", "patchwork", "prophet", "reticulate", "stringr", "tidyr"]
+      "version": "3.12.1",
+      "sha256": "1f6sag1ln8h0dyglp68ailpc15ykz49w8sr6hyvp9y1nk7bfw3x6",
+      "depends": ["doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "ggridges", "glmnet", "jsonlite", "lares", "lubridate", "nloptr", "patchwork", "prophet", "reticulate", "stringr", "tidyr"]
     },
     "RockFab": {
       "name": "RockFab",
@@ -31629,8 +31821,8 @@
     },
     "Rogue": {
       "name": "Rogue",
-      "version": "2.1.6",
-      "sha256": "0wbgl9dj2lr5ffn27q6q06n45vj9lm9qxx07dvd37jniqjxz71v4",
+      "version": "2.1.7",
+      "sha256": "1s29ryv9imp4j5p0xlddpf18nd032d66hh4i1v3b6k905c600vl3",
       "depends": ["Rdpack", "Rfast", "TreeDist", "TreeTools", "ape", "cli", "fastmatch", "matrixStats"]
     },
     "RolWinMulCor": {
@@ -31659,8 +31851,8 @@
     },
     "RootsExtremaInflections": {
       "name": "RootsExtremaInflections",
-      "version": "1.2.1",
-      "sha256": "0qd6cmzp8fkb75ac79xbh4032vqwax7nk7d6yykpdbn0bnk2kvdi",
+      "version": "1.2.5",
+      "sha256": "1fvn0j3n4giidzmdskyy64n21fin65rv00g9in6509ccs78klqzd",
       "depends": ["doParallel", "foreach", "inflection", "iterators"]
     },
     "Ropj": {
@@ -31759,18 +31951,18 @@
       "sha256": "0kd8ghclfz81c5lgj4fc06lgkniksch7xi6fmj1ydn2i35k0ji6l",
       "depends": ["GEOmap", "MBA", "RPMG", "RSEIS", "minpack_lm"]
     },
+    "Rquefts": {
+      "name": "Rquefts",
+      "version": "1.2-5",
+      "sha256": "10nbvmvyv8srqvvqz8kpdi5bnsmqppq6877h85nnfgs04l87bixq",
+      "depends": ["Rcpp", "meteor"]
+    },
     "Rramas": {
       "name": "Rramas",
       "version": "0.1-8",
       "sha256": "05hix0cr3908pgjx576ls4rkv70q6d3ycbj6jchip3ia0ziadhq0",
       "depends": ["diagram"]
     },
-    "Rraven": {
-      "name": "Rraven",
-      "version": "1.0.14",
-      "sha256": "1sfzsf1f758sicild58hi5lqbs1vmzma9znni3is2vlcsn9pyn5s",
-      "depends": ["pbapply", "seewave", "tuneR", "warbleR"]
-    },
     "Rrdap": {
       "name": "Rrdap",
       "version": "1.0.7",
@@ -31833,9 +32025,9 @@
     },
     "Rsolnp": {
       "name": "Rsolnp",
-      "version": "1.16",
-      "sha256": "0w7nkj6igr0gi7r7jg950lsx7dj6aipgxi6vbjsf5f5yc9h7fhii",
-      "depends": ["truncnorm"]
+      "version": "2.0.1",
+      "sha256": "14k7qcqz611zr2a9a1nmdcmavci89v62b4yzsawda7fxmc0128iv",
+      "depends": ["Rcpp", "RcppArmadillo", "future_apply", "numDeriv", "truncnorm"]
     },
     "Rsomoclu": {
       "name": "Rsomoclu",
@@ -31875,8 +32067,8 @@
     },
     "Rsubbotools": {
       "name": "Rsubbotools",
-      "version": "0.0.0.9",
-      "sha256": "1iqc5fqhxqp867pi6pb0zbhjag86ydadclq53jw9wcby6z7w0spn",
+      "version": "0.0.1",
+      "sha256": "10zj3jqcrr5flv2v9wxyprsp1vis0mm92y4m7wx4b6v8qd2xcp7j",
       "depends": ["Rcpp", "RcppGSL"]
     },
     "Rsurrogate": {
@@ -31947,16 +32139,10 @@
     },
     "Rtumblr": {
       "name": "Rtumblr",
-      "version": "0.1.0",
-      "sha256": "19vl079icyh615ac8wxw810dfqlj3c1lpr0gjkkc030jpl2g0yzr",
+      "version": "0.1.1",
+      "sha256": "06dahnasdm8vc0dn1ylxhy4gnrflwb8677sp450gr8w3afvca1yz",
       "depends": ["dplyr", "httr", "tibble"]
     },
-    "Rtwalk": {
-      "name": "Rtwalk",
-      "version": "1.8.0",
-      "sha256": "0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5",
-      "depends": []
-    },
     "Rtwobitlib": {
       "name": "Rtwobitlib",
       "version": "0.3.10",
@@ -31993,12 +32179,6 @@
       "sha256": "1r72kcc5f9k38ks39nh9x1y7k1kxrbyv7lywqpsy7wknnddzg7kc",
       "depends": []
     },
-    "Rwclust": {
-      "name": "Rwclust",
-      "version": "0.1.0",
-      "sha256": "0c7q2i9n22sqj3wq9m0j49y5h14848myjbixrdkic8lvv91dm438",
-      "depends": ["Matrix", "checkmate"]
-    },
     "RweaveExtra": {
       "name": "RweaveExtra",
       "version": "1.2-0",
@@ -32211,9 +32391,9 @@
     },
     "SARP_moodle": {
       "name": "SARP.moodle",
-      "version": "1.0.4",
-      "sha256": "1zpvw5sdzrh5ci89lqra73yvvpj340wc1rl5825krj1f73lmga3s",
-      "depends": ["base64enc"]
+      "version": "1.2.3",
+      "sha256": "1jqgsky3bvz72dlllzw8n9sgvw7xz1hqkwjcsmyzzwcdwk768j7j",
+      "depends": ["base64enc", "magick"]
     },
     "SAScii": {
       "name": "SAScii",
@@ -32227,18 +32407,18 @@
       "sha256": "1413x0biid7972zz2qqv22h26a738mp7n97gpxxs9rykxkw3bfr5",
       "depends": []
     },
-    "SASmarkdown": {
-      "name": "SASmarkdown",
-      "version": "0.8.2",
-      "sha256": "0xrrmb2zmm0mdg4akm5rnzbxxx690w9mv90mp830kbs42i0haqqg",
-      "depends": ["knitr", "xfun"]
-    },
     "SASmixed": {
       "name": "SASmixed",
       "version": "1.0-4",
       "sha256": "0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm",
       "depends": []
     },
+    "SATS": {
+      "name": "SATS",
+      "version": "1.0.4",
+      "sha256": "1fv0jhr9iws0n078g8afnpb7h2qxz1jkpia4bmv4a66124p84c0p",
+      "depends": ["BSgenome_Hsapiens_UCSC_hg19", "Biostrings", "GenomicRanges", "IRanges", "dplyr", "glmnet"]
+    },
     "SAVER": {
       "name": "SAVER",
       "version": "1.1.2",
@@ -32287,12 +32467,6 @@
       "sha256": "1h44qwz9gkwwgkac25h4vn0kq3mjvjsyq99yfd8v8g6g8fkkclaq",
       "depends": ["ggplot2", "reshape2", "scales"]
     },
-    "SBMTrees": {
-      "name": "SBMTrees",
-      "version": "1.2",
-      "sha256": "00mj0k4id9gqkyvf74h32yiw4k7jy53q5r7kk00k1clkf2dqkns1",
-      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppDist", "RcppProgress", "arm", "dplyr", "lme4", "mice", "mvtnorm", "nnet", "sn", "tidyr"]
-    },
     "SBN": {
       "name": "SBN",
       "version": "1.0.0",
@@ -32359,11 +32533,11 @@
       "sha256": "186pl21p22fqprd155n73849j4fpk5zclps3n0irdfmvqd4b4gp8",
       "depends": ["DBI", "R6", "checkmate", "dbplyr", "dplyr", "glue", "magrittr", "openssl", "parallelly", "purrr", "rlang", "stringr", "tidyr", "tidyselect"]
     },
-    "SCEM": {
-      "name": "SCEM",
-      "version": "1.1.0",
-      "sha256": "1fxxkv965gb0wq06rclv05xxlzk8p9l8hzbnqcf0nbbymyn73fqr",
-      "depends": ["devtools", "mathjaxr"]
+    "SCE": {
+      "name": "SCE",
+      "version": "1.1.1",
+      "sha256": "16mpfi040szxjq99x452hhgx0xnj08prp36p4ji34hka5svv0hzc",
+      "depends": []
     },
     "SCEPtER": {
       "name": "SCEPtER",
@@ -32413,12 +32587,6 @@
       "sha256": "1gv9widjwvk5j535r1zx6f41ylpa2r4168ya580llgblx85z402d",
       "depends": ["MASS", "gplots"]
     },
-    "SCIntRuler": {
-      "name": "SCIntRuler",
-      "version": "0.99.6",
-      "sha256": "1ap23iighbx1x3blfh0b9srgk5mzinl3gy0addfwd6i40a160brp",
-      "depends": ["Matrix", "MatrixGenerics", "Rcpp", "Seurat", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "batchelor", "coin", "cowplot", "dplyr", "ggplot2", "gridExtra", "harmony", "magrittr"]
-    },
     "SCMA": {
       "name": "SCMA",
       "version": "1.3.1",
@@ -32461,12 +32629,6 @@
       "sha256": "1s0mmzfz0zhr5v4wagcjwdba8a5f57xr26vwml92dnw6lai37pj4",
       "depends": ["ggplot2", "ggpubr"]
     },
-    "SCRIP": {
-      "name": "SCRIP",
-      "version": "1.0.0",
-      "sha256": "1cv8443y2s67q3krsyj7r2d1vqv01w8xr0iz8dz4kijmhksyg7ng",
-      "depends": ["BiocGenerics", "BiocManager", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "checkmate", "crayon", "edgeR", "fitdistrplus", "knitr", "mgcv", "splatter"]
-    },
     "SCRT": {
       "name": "SCRT",
       "version": "1.3.1",
@@ -32697,8 +32859,8 @@
     },
     "SFDesign": {
       "name": "SFDesign",
-      "version": "0.1.1",
-      "sha256": "0xny6j6pa84y1h7pjsv6xylwnzpsd9s6mdz6mn0gcsk0zhi9s5bh",
+      "version": "0.1.2",
+      "sha256": "1m4q4wdqa2szm7rk1j9bhmgn0m1gxgllqr2inkaxxj8jb1qq6bhz",
       "depends": ["GenSA", "Rcpp", "RcppArmadillo", "nloptr", "primes", "proxy", "spacefillr"]
     },
     "SFM": {
@@ -32871,8 +33033,8 @@
     },
     "SIMPLE_REGRESSION": {
       "name": "SIMPLE.REGRESSION",
-      "version": "0.2.3",
-      "sha256": "177y5dha519hkxj2jpwlq5iab586mb5jw8x5qcfxd4r2bpk6h7k0",
+      "version": "0.2.6",
+      "sha256": "1dl59gsf5p3kkafws6v4rk7vldskia5pji8qd9pv5p9ds96nivsx",
       "depends": ["BayesFactor", "MASS", "nlme", "pscl", "rstanarm"]
     },
     "SIMle": {
@@ -33007,6 +33169,12 @@
       "sha256": "0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb",
       "depends": []
     },
+    "SLIC": {
+      "name": "SLIC",
+      "version": "0.3",
+      "sha256": "0hw86ww7rbh1vg20zwvmxw17n2gld0qsi7l9l6rwc8xlvqdn2yqs",
+      "depends": ["LaplacesDemon", "sn"]
+    },
     "SLIDE": {
       "name": "SLIDE",
       "version": "1.0.0",
@@ -33021,9 +33189,9 @@
     },
     "SLOPE": {
       "name": "SLOPE",
-      "version": "0.5.2",
-      "sha256": "02m9p43x6pacfvjd7zvnr1n5s6lkkbr858x0kmz9vd9qq9xpxzi6",
-      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "foreach", "ggplot2"]
+      "version": "1.0.1",
+      "sha256": "03slji3p1hvncsawl1cf1la8b8q9fcpir4mqh962yhyglz3wrqv2",
+      "depends": ["BH", "Matrix", "Rcpp", "RcppEigen", "bigmemory"]
     },
     "SLOS": {
       "name": "SLOS",
@@ -33037,6 +33205,12 @@
       "sha256": "1i813q0m9h964nd61kwnvakci3n1bn06pvq9zvxb2clcch05qyfj",
       "depends": []
     },
+    "SLRMss": {
+      "name": "SLRMss",
+      "version": "1.0.0",
+      "sha256": "0b957fsdwfzjrwbdfpqy8jp32xlkpzbw11lg0qjs0jd2bzzl43s1",
+      "depends": ["normalp", "ssym"]
+    },
     "SLSEdesign": {
       "name": "SLSEdesign",
       "version": "0.0.5",
@@ -33051,9 +33225,9 @@
     },
     "SLmetrics": {
       "name": "SLmetrics",
-      "version": "0.3-3",
-      "sha256": "1djd664v7w2gj5p624irs2acfcfls0bb1k20zc87p47d2dfid9wl",
-      "depends": ["Rcpp", "RcppEigen", "lattice"]
+      "version": "0.3-4",
+      "sha256": "1byrlbxrd5z41ym48kx5psqwj66jm35f2xpg8xqxh183gh6ydg15",
+      "depends": ["Rcpp", "RcppArmadillo", "lattice"]
     },
     "SMAHP": {
       "name": "SMAHP",
@@ -33291,8 +33465,8 @@
     },
     "SOMbrero": {
       "name": "SOMbrero",
-      "version": "1.4-2",
-      "sha256": "15bwdw3awwqq6d4b8ja8lsvcyr2v37l5jc3ja3df3y0ziazdllpn",
+      "version": "1.4-3",
+      "sha256": "1l4b0jzcawmxaz0x7i8il8fjm0fsky11jx21x8xnkcdkdli977f0",
       "depends": ["ggplot2", "ggwordcloud", "igraph", "interp", "markdown", "metR", "rlang", "scatterplot3d", "shiny"]
     },
     "SOMnmR": {
@@ -33493,12 +33667,6 @@
       "sha256": "0gf5cw2fnssl198ccpvnma4bcqi33whl6ihc1s9i2lw6xg4qvb33",
       "depends": ["Matrix", "Rcpp", "glmnet", "lars", "ncvreg"]
     },
-    "SPUTNIK": {
-      "name": "SPUTNIK",
-      "version": "1.4.2",
-      "sha256": "1jp1gprib1ppwnsgr7457b48ljlb70s2rzccq660d5lrngs8afca",
-      "depends": ["doSNOW", "e1071", "edgeR", "foreach", "ggplot2", "imager", "infotheo", "irlba", "reshape", "spatstat_explore", "spatstat_geom", "viridis"]
-    },
     "SPYvsSPY": {
       "name": "SPYvsSPY",
       "version": "0.1.1",
@@ -33511,12 +33679,6 @@
       "sha256": "0n9458sj5sw4k9qd11gvmqmjf9hy1hh0bwx1jzm6r901l1wbp7xi",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
-    "SPmlficmcm": {
-      "name": "SPmlficmcm",
-      "version": "1.4",
-      "sha256": "1acs3560a7h6xx286m40abr9b7i5qihn6wni8flj0biahmsszzx6",
-      "depends": ["nleqslv"]
-    },
     "SPreg": {
       "name": "SPreg",
       "version": "1.0",
@@ -33603,8 +33765,8 @@
     },
     "SSBtools": {
       "name": "SSBtools",
-      "version": "1.7.5",
-      "sha256": "1v4jd1iz4nhwvsbyzvhwgc82057z5vrc52kfk8njan54m4lvhsjy",
+      "version": "1.8.0",
+      "sha256": "1j9nwws8k9h1irbsjqlqa5y8qga8myy4ic13im28fa6f9zlpfn0z",
       "depends": ["MASS", "Matrix"]
     },
     "SSDM": {
@@ -33615,8 +33777,8 @@
     },
     "SSDforR": {
       "name": "SSDforR",
-      "version": "2.0",
-      "sha256": "0qg3p4mmd59xdf49msg29m8d13li7snzmmrav2kaflawbwmz4h8x",
+      "version": "2.1",
+      "sha256": "02djhx593s1fr4dsks46zs22wgdyxjkw61ify5ipfca60f1ajbg8",
       "depends": ["Kendall", "MASS", "MAd", "SingleCaseES", "TTR", "metafor", "modifiedmk", "psych", "retrodesign"]
     },
     "SSEparser": {
@@ -33633,9 +33795,9 @@
     },
     "SSHAARP": {
       "name": "SSHAARP",
-      "version": "2.0.5",
-      "sha256": "00yzn0acgj3dib89a28x90v865czh05ig65dbsxc9silr3fwl10j",
-      "depends": ["BIGDAWG", "DescTools", "HLAtools", "data_table", "dplyr", "filesstrings", "gmt", "gtools", "purrr", "stringi", "stringr"]
+      "version": "2.0.8",
+      "sha256": "0kzss5003a3aqp3kwpi9qv67jinarjaz3iz7zkhp3iwlnmfbkh0n",
+      "depends": ["DescTools", "HLAtools", "data_table", "dplyr", "filesstrings", "gmt", "gtools", "purrr", "stringi", "stringr"]
     },
     "SSIMmap": {
       "name": "SSIMmap",
@@ -33769,6 +33931,12 @@
       "sha256": "17ani0x3l7asa7sv90p9xanjjbhf21a5z5ysvzq31mazqbw8jfzd",
       "depends": ["bsts", "copula", "evd", "ggplot2", "rootSolve"]
     },
+    "STDistance": {
+      "name": "STDistance",
+      "version": "0.6.6",
+      "sha256": "18scd94v91awi4q261q8nqpqvi9hsw4rby6zraafqsqz63mlakd2",
+      "depends": ["Hmisc", "RColorBrewer", "dplyr", "ggplot2", "scales", "tidyr"]
+    },
     "STEPCAM": {
       "name": "STEPCAM",
       "version": "1.2.3",
@@ -33841,12 +34009,6 @@
       "sha256": "12n4p7bc9gzp9kddd8qa6j9vx0ccg37bp5d7qyda4izzi7jz4p3i",
       "depends": ["data_table", "dplyr", "ggplot2", "gridExtra", "magrittr", "officer", "readr", "readxl", "rlang", "stringr"]
     },
-    "SUNGEO": {
-      "name": "SUNGEO",
-      "version": "1.3.0",
-      "sha256": "0ydwsrgqknngx7567xwfhwj1jdmi4ip1jxkb5jdy41f7ysy1myd0",
-      "depends": ["RANN", "RCurl", "Rcpp", "automap", "cartogram", "data_table", "dplyr", "httr", "jsonlite", "measurements", "packcircles", "purrr", "raster", "rlang", "rmapshaper", "sf", "spdep", "stringr", "terra"]
-    },
     "SUSENAS": {
       "name": "SUSENAS",
       "version": "0.1.0",
@@ -34011,8 +34173,8 @@
     },
     "SchoolDataIT": {
       "name": "SchoolDataIT",
-      "version": "0.2.6",
-      "sha256": "1agjr4a2hv18k7gbinaww52c4x3wn36gyjy1bfhaf1yzxcl4wffg",
+      "version": "0.2.7",
+      "sha256": "0568viqfkzv37dfvahl9mffjp8hdd889bsqvvmm3riqgp65fn0lq",
       "depends": ["curl", "dplyr", "ggplot2", "httr", "leafpop", "magrittr", "mapview", "readr", "rlang", "rvest", "sf", "stringr", "tidyr", "xml2"]
     },
     "SciViews": {
@@ -34059,9 +34221,9 @@
     },
     "SeBR": {
       "name": "SeBR",
-      "version": "1.0.0",
-      "sha256": "0xk002y4nim5f3mcfbl3zk484cf2s5mvg1paj2jg4f5v60vr4pwp",
-      "depends": ["GpGp", "MASS", "fields", "quantreg", "spikeSlabGAM", "statmod"]
+      "version": "1.1.0",
+      "sha256": "09khc5g9wzybazzrlyyc299jm5zhv2v23790hi8fvqb356d4nxz2",
+      "depends": []
     },
     "SeaGraphs": {
       "name": "SeaGraphs",
@@ -34089,8 +34251,8 @@
     },
     "SeasEpi": {
       "name": "SeasEpi",
-      "version": "0.0.1",
-      "sha256": "0kzsivc9kfg95bz8rkja5j55sxxdzgpdmm0yifnh9f0vq3qjydah",
+      "version": "0.0.2",
+      "sha256": "1yvhl04hifa6rgxf8dw19900r7i0f3j0r98w2h4ffhdj98i9039w",
       "depends": ["MASS", "mvtnorm", "ngspatial"]
     },
     "SecretsProvider": {
@@ -34099,12 +34261,6 @@
       "sha256": "1da3pvdfjkf5899wgxx64xw9s2zwkpb1w0c5hkf45bli5md1sph3",
       "depends": []
     },
-    "SeedCalc": {
-      "name": "SeedCalc",
-      "version": "1.0.0",
-      "sha256": "1p8ncf3l2zhpbbblpjagg8cg9gf7f2izdcgc48n1aq4f7bmjbqgk",
-      "depends": []
-    },
     "SeedImbibition": {
       "name": "SeedImbibition",
       "version": "0.1.0",
@@ -34147,12 +34303,6 @@
       "sha256": "0flc2ackvk54k5ixpbhmnkgybqssxbh5jz2g3bp7h6ff6xz49pb4",
       "depends": ["mvtnorm"]
     },
-    "Select": {
-      "name": "Select",
-      "version": "1.4",
-      "sha256": "1qx4wwxxwjq31vf645xvwb0y2z5h4v6ca8fcrfpaj5kc33f333v2",
-      "depends": ["FD", "Rsolnp", "ade4", "lattice", "latticeExtra"]
-    },
     "SelectBoost": {
       "name": "SelectBoost",
       "version": "2.2.2",
@@ -34165,6 +34315,12 @@
       "sha256": "00fk3ljm3x1slffni6g4j61s2766znlmamg16vmbkfjmrbb80nfy",
       "depends": ["arm", "lifecycle"]
     },
+    "SelfControlledCaseSeries": {
+      "name": "SelfControlledCaseSeries",
+      "version": "6.0.1",
+      "sha256": "0gn78fr62r05zjg3ln5nx8qnkgh5xw7bpg1srfkvbv86rx22j1qj",
+      "depends": ["Andromeda", "Cyclops", "DatabaseConnector", "EmpiricalCalibration", "ParallelLogger", "R6", "Rcpp", "ResultModelManager", "SqlRender", "checkmate", "digest", "dplyr", "ggplot2", "jsonlite", "readr"]
+    },
     "SemNeT": {
       "name": "SemNeT",
       "version": "1.4.4",
@@ -34251,8 +34407,8 @@
     },
     "SensoMineR": {
       "name": "SensoMineR",
-      "version": "1.27",
-      "sha256": "0si7zklv94li8payg4zxcac1a7ivk90q4ckcyak536sqfinihpb3",
+      "version": "1.28",
+      "sha256": "1x65scrzr5xya03637xp3kpfvim86i9iwa14v2avbw8sxfnbgmqn",
       "depends": ["AlgDesign", "FactoMineR", "KernSmooth", "cluster", "ggplot2", "ggrepel", "gtools", "reshape2"]
     },
     "SentimentAnalysis": {
@@ -34323,9 +34479,9 @@
     },
     "SerolyzeR": {
       "name": "SerolyzeR",
-      "version": "1.2.0",
-      "sha256": "1693w4b8f2622y9ncppjwyzgna20a5kamzrfb3894svfpp16912c",
-      "depends": ["R6", "R_utils", "dplyr", "fs", "ggplot2", "ggrepel", "lubridate", "nplr", "png", "readxl", "scales", "stringi", "stringr", "svglite"]
+      "version": "1.3.0",
+      "sha256": "1bng54y5n4hj88ixpadmimsyjp6i0y6qyanjv9l4r60v64r7rg72",
+      "depends": ["R6", "R_utils", "dplyr", "fs", "ggplot2", "ggrepel", "lubridate", "nplr", "png", "readxl", "rlang", "scales", "stringi", "stringr", "svglite"]
     },
     "SetMethods": {
       "name": "SetMethods",
@@ -34423,6 +34579,12 @@
       "sha256": "162iw7qzi5cb73lawfvsnbq3cxgx0si9bz0avv60rrkzdb0xlr05",
       "depends": ["devtools", "dpseg", "plot_matrix", "plotrix", "qpdf", "stargazer", "stringr", "tableHTML", "textBoxPlacement", "zoo"]
     },
+    "ShiVa": {
+      "name": "ShiVa",
+      "version": "1.0.1",
+      "sha256": "0ms48qdir5hb12h50mz63f0h2wbicpjaf6sqisx4pp4r76g3hlgi",
+      "depends": ["MASS", "ape", "glmnet", "igraph", "phylolm", "psych"]
+    },
     "ShiftConvolvePoibin": {
       "name": "ShiftConvolvePoibin",
       "version": "1.0.0",
@@ -34437,8 +34599,8 @@
     },
     "ShinyItemAnalysis": {
       "name": "ShinyItemAnalysis",
-      "version": "1.5.4",
-      "sha256": "00ys8jpgzcg14lq4qjw2919zdp85xb7ss3568nb96626r22k9gzp",
+      "version": "1.5.5",
+      "sha256": "0m8m0gqw8fiardny6ydnpxyh5vr88qp3yjfz96bi48mdj868xaki",
       "depends": ["difR", "dplyr", "ggplot2", "lme4", "mirt", "nnet", "psych", "purrr", "rlang", "rstudioapi", "tibble", "tidyr"]
     },
     "ShinyLink": {
@@ -34477,6 +34639,12 @@
       "sha256": "0iyri3syjk9xv49d87fdyhnxg5c5x827vnak8vgckkkp62sdln2q",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
+    "ShrinkageTrees": {
+      "name": "ShrinkageTrees",
+      "version": "1.0.0",
+      "sha256": "1p9ax1n650vrp9p390v4mrvf5036sc9vv3wwxh6b80p3hix37mz4",
+      "depends": ["Rcpp"]
+    },
     "SiER": {
       "name": "SiER",
       "version": "0.1.0",
@@ -34525,12 +34693,6 @@
       "sha256": "1sylchhhz6kx4r8jx95cvsmjsacjh8pin7acf2fyw2a4nlx9r1a6",
       "depends": ["httr", "jsonlite"]
     },
-    "SigTree": {
-      "name": "SigTree",
-      "version": "1.10.6",
-      "sha256": "18gh7azjr979ijc2y4yyskj24ay697rw3j7znc5p4a63s4vpxr9w",
-      "depends": ["MASS", "RColorBrewer", "ape", "phyext2", "phylobase", "phyloseq", "vegan"]
-    },
     "SightabilityModel": {
       "name": "SightabilityModel",
       "version": "1.5.5",
@@ -34555,6 +34717,12 @@
       "sha256": "1f57zbc7746jr2hfgri29whw5nb7w8h9nwk2p2n851b1rf7q0mgp",
       "depends": ["car"]
     },
+    "Silhouette": {
+      "name": "Silhouette",
+      "version": "0.9.4",
+      "sha256": "0f5yapdfca9zdbhj22hdnlqf8srijv6qqfzbg1y4l0dp66s3rbcw",
+      "depends": ["dplyr", "ggplot2", "ggpubr"]
+    },
     "SillyPutty": {
       "name": "SillyPutty",
       "version": "0.4.2",
@@ -34579,6 +34747,12 @@
       "sha256": "1651b9n7v4ifn0kvv3frmdw5b7w11vl27rjk2w49ky431zns55r2",
       "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "RcppXPtrUtils", "coda", "dplyr", "ggplot2", "mvtnorm", "purrr", "tibble", "tidyr"]
     },
+    "SimBaRepro": {
+      "name": "SimBaRepro",
+      "version": "0.1.0",
+      "sha256": "167hg8hp9k3lxkh604jxpd5biq1gcmr3kn54l3phd6pnv6y6iqq0",
+      "depends": ["ddalpha", "ggplot2"]
+    },
     "SimComp": {
       "name": "SimComp",
       "version": "3.6",
@@ -34605,8 +34779,8 @@
     },
     "SimDesign": {
       "name": "SimDesign",
-      "version": "2.19.2",
-      "sha256": "1pcmkkvlg4qabl06s0k2bmpi2andqf4wfpr3vnb9fmcy9dfdf7dw",
+      "version": "2.20.0",
+      "sha256": "00yk20axkfmpx6ncs3w035l4x8g2yg7snjrbkpl5wawv1qcpxv4h",
       "depends": ["R_utils", "beepr", "dplyr", "future", "future_apply", "parallelly", "pbapply", "progressr", "sessioninfo", "testthat"]
     },
     "SimDissolution": {
@@ -34741,6 +34915,12 @@
       "sha256": "198rfvs45bqaaj91lcmasc98jximivksv6m1ik7wr49daifikddv",
       "depends": ["dplyr", "purrr", "rlang", "tidyr", "tidyselect"]
     },
+    "SingleCellComplexHeatMap": {
+      "name": "SingleCellComplexHeatMap",
+      "version": "0.1.2",
+      "sha256": "03rwx4ir41rqcbgp1jjgyrr81h0lz3vvc4dpb6v4mpy5wm4n4xl7",
+      "depends": ["ComplexHeatmap", "RColorBrewer", "Seurat", "circlize", "dplyr", "magrittr", "tidyr"]
+    },
     "SingleCellStat": {
       "name": "SingleCellStat",
       "version": "0.3.1",
@@ -34807,6 +34987,12 @@
       "sha256": "0hvxg4hrk3rb1wxhi71rgamxd8wcwys569137znfs0y8j6yvf0jj",
       "depends": ["DCCA", "PerformanceAnalytics", "TSEntropies", "nonlinearTseries"]
     },
+    "SlimR": {
+      "name": "SlimR",
+      "version": "1.0.3",
+      "sha256": "1lnl9wghp00s578gjcmfq2jnjvbd9jmim128rsjiyby7izb63jbs",
+      "depends": ["Seurat", "cowplot", "dplyr", "ggplot2", "magrittr", "patchwork", "pheatmap", "readxl", "scales", "tibble", "tidyr"]
+    },
     "SmallCountRounding": {
       "name": "SmallCountRounding",
       "version": "1.2.0",
@@ -34845,8 +35031,8 @@
     },
     "SmoothHazard": {
       "name": "SmoothHazard",
-      "version": "2024.04.10",
-      "sha256": "18nn6c94lr1l49z9wj5grxck72dk9rkppg0qh5qbgcdkfxww4096",
+      "version": "2025.07.24",
+      "sha256": "0175pnfmqzrkrl6173szw51yfrn4kgs2jvs9czzybdgabs1za8r9",
       "depends": ["lava", "mvtnorm", "prodlim"]
     },
     "SmoothTensor": {
@@ -34947,8 +35133,8 @@
     },
     "SoilTaxonomy": {
       "name": "SoilTaxonomy",
-      "version": "0.2.7",
-      "sha256": "057hcd7013y0s1xg0x3233phy0wrz4cp565djdyynm8pkhx4wiq7",
+      "version": "0.2.8",
+      "sha256": "19m4p53zy18asz6ja2gv3q1liv4qsi1y752pp07wn5n54h102p0c",
       "depends": ["data_table", "stringr"]
     },
     "SoilTesting": {
@@ -35103,8 +35289,8 @@
     },
     "SparseBiplots": {
       "name": "SparseBiplots",
-      "version": "4.0.2",
-      "sha256": "1cadisjw0g3gyng6h5cfgpmn243k31kh58iifmbw1176nyfln84p",
+      "version": "4.1.1",
+      "sha256": "0sv9a9zp3ab5gpp89214vf515bg8sx5xamgc9k0fiagg64b1nkn7",
       "depends": ["ggplot2", "ggrepel", "sparsepca"]
     },
     "SparseChol": {
@@ -35283,8 +35469,8 @@
     },
     "SpatialPosition": {
       "name": "SpatialPosition",
-      "version": "2.1.2",
-      "sha256": "12xglqrw4mqdfshd325gicrd3gnrkiaj1i2p5mlpklhdciahv1pi",
+      "version": "2.1.3",
+      "sha256": "1pa3sr7jmjs6vyv4212ybhsxqzdmxkhc0h685ncxy6nrhcni5jvh",
       "depends": ["isoband", "raster", "sf", "sp"]
     },
     "SpatialRDD": {
@@ -35301,8 +35487,8 @@
     },
     "SpatialRoMLE": {
       "name": "SpatialRoMLE",
-      "version": "0.1.0",
-      "sha256": "1m80vcd27g11v0gxnjz6p4ghljpxdb8jpkns8ry5yzhfvcpf29jc",
+      "version": "0.1.1.1",
+      "sha256": "1rkgas0xlai9k7gppd78pysicpfxa5ybwb1dzn4ksy2vcgjqcm66",
       "depends": []
     },
     "SpatialTools": {
@@ -35361,8 +35547,8 @@
     },
     "SpectralClMixed": {
       "name": "SpectralClMixed",
-      "version": "1.0.1",
-      "sha256": "10nx03kr35irvvink8kfx6gbv90wnlsx514r7921hrjvcjiqn82s",
+      "version": "1.0.2",
+      "sha256": "0n3pailmiqwpr9ij2fgvmrc59lpwzi7934xw8h03hh2mxhi0n74d",
       "depends": ["GGally", "RSpectra", "cluster", "ggplot2"]
     },
     "SpectralMap": {
@@ -35439,8 +35625,8 @@
     },
     "SplitWise": {
       "name": "SplitWise",
-      "version": "1.0.0",
-      "sha256": "1rsks07sg3720g9sg508y3cyy8d2dw8838qrzra72cijz9yg58hx",
+      "version": "1.0.2",
+      "sha256": "088yzy62g9gs9sqcw4km3ski250p6mvhhn7axwjaqp5l9lqmjdw7",
       "depends": ["rpart"]
     },
     "SpoMAG": {
@@ -35457,8 +35643,8 @@
     },
     "Spower": {
       "name": "Spower",
-      "version": "0.2.3",
-      "sha256": "0nf5c9yybv6ilxgbjfdw1bq1nrkhzl7cm7dy8pdyv2ra63d4qy38",
+      "version": "0.3.1",
+      "sha256": "1dg2zzbs00m15wqjkgyzrxk4qcya81s13i81yyrdgfg774s6kkdw",
       "depends": ["EnvStats", "SimDesign", "car", "cocor", "ggplot2", "lavaan", "parallelly", "plotly", "polycor"]
     },
     "SqlRender": {
@@ -35533,6 +35719,12 @@
       "sha256": "133l5vnyx1sq7q6cgrwjsnl8x6k1zfzl19k3inijk9qq095pbzrd",
       "depends": ["MASS", "Matrix", "Rdpack", "fBasics", "numDeriv", "stabledist", "testthat", "xtable"]
     },
+    "StablePopulation": {
+      "name": "StablePopulation",
+      "version": "1.0.3",
+      "sha256": "05xgq8x907954pm8agzmmv5yj9jsv9grv0zrwpm1c1m2n1a0wkxk",
+      "depends": ["openxlsx", "readxl"]
+    },
     "StackImpute": {
       "name": "StackImpute",
       "version": "0.1.0",
@@ -35611,12 +35803,6 @@
       "sha256": "1w8r59hdvi69wpxr5bq8ir7gzm4b6403ljy2lryh6y77n8gz65i6",
       "depends": []
     },
-    "Statamarkdown": {
-      "name": "Statamarkdown",
-      "version": "0.9.2",
-      "sha256": "1ir2qh492q0rn6rwnmvj2cxqsssmsd5hm9vlyg0r7dk22grh19z0",
-      "depends": ["knitr", "xfun"]
-    },
     "StateLevelForest": {
       "name": "StateLevelForest",
       "version": "0.1.0",
@@ -35691,8 +35877,8 @@
     },
     "StochBlock": {
       "name": "StochBlock",
-      "version": "0.1.2",
-      "sha256": "0g0l36imgw3bvqj5g45abwicswcyqprzbkas9pzgha8dsc5s12w3",
+      "version": "0.1.5",
+      "sha256": "1xvdgpayzynxkxrmllz9p8n5w4fk85ka91ysw7s0mbwn6y9gib2r",
       "depends": ["Rcpp", "RcppArmadillo", "blockmodeling", "doParallel", "doRNG", "foreach"]
     },
     "StockDistFit": {
@@ -35937,8 +36123,8 @@
     },
     "Superpower": {
       "name": "Superpower",
-      "version": "0.2.3",
-      "sha256": "0mzmzlvkq8n4isrkk1d49cm98dc8vqfg3jn5j4igb9s3dndkhlmb",
+      "version": "0.2.4",
+      "sha256": "0wmkdl14wdhm7hr30843rm8lzd6z5jpbpm94sxqh74w6ypxw89kf",
       "depends": ["MASS", "afex", "dplyr", "emmeans", "ggplot2", "magrittr", "reshape2", "tidyr", "tidyselect"]
     },
     "SuppDists": {
@@ -36189,8 +36375,8 @@
     },
     "SynergyLMM": {
       "name": "SynergyLMM",
-      "version": "1.0.1",
-      "sha256": "0ryri6z4hza9sb9q86vwv1afm3l7kgqssxrvz8v0v1i5hfh9avsz",
+      "version": "1.1.0",
+      "sha256": "1028r3r2d5diw2d1dps7ffxgx809lp1cjvwhikvp0ixzxh0nm1f7",
       "depends": ["MASS", "car", "clubSandwich", "cowplot", "dplyr", "fBasics", "ggplot2", "lattice", "magrittr", "marginaleffects", "nlme", "nlmeU", "performance", "rlang"]
     },
     "Synth": {
@@ -36405,9 +36591,9 @@
     },
     "TDIagree": {
       "name": "TDIagree",
-      "version": "0.1.1",
-      "sha256": "01chzg465fc390imwnhgnjjxsi5wyh897bjc8zzcfim7qnfrkg03",
-      "depends": ["boot", "coxed", "gt", "katex", "multcomp", "nlme", "plotfunctions"]
+      "version": "0.1.2",
+      "sha256": "1makm2cqsn5488zik8xy6n0yx0kskfbfdyw559nd3b1hm76q2czf",
+      "depends": ["boot", "gt", "katex", "multcomp", "nlme", "plotfunctions"]
     },
     "TDLM": {
       "name": "TDLM",
@@ -36649,16 +36835,10 @@
       "sha256": "0wia39yj7abnicx4xhaq1g69qx5fmzh6gywyl5yqfmw03azmyl55",
       "depends": ["DEoptim", "Rdpack", "ggplot2"]
     },
-    "TP_idm": {
-      "name": "TP.idm",
-      "version": "1.5.1",
-      "sha256": "0w8sgzm5bmv9m16dryxpw51q000mfmbipxqnhb26bkzr6y46bd79",
-      "depends": []
-    },
     "TPAC": {
       "name": "TPAC",
-      "version": "0.2.0",
-      "sha256": "1k3nd3yrv1kxidjwaff4q9aqf7yqqwa6946a154y2h3k21kfmwcc",
+      "version": "0.3.0",
+      "sha256": "0d7chkd5xr9n7hqclw53pbd5x27w8ib330qpf2mbpb085c8fdbyn",
       "depends": ["MASS", "TPACData", "data_table"]
     },
     "TPACData": {
@@ -36693,8 +36873,8 @@
     },
     "TPMplt": {
       "name": "TPMplt",
-      "version": "0.1.6",
-      "sha256": "17nnymcaxh294fz8kbiazzfqf1pn09a3kzjznqxflqbxlxin8kl9",
+      "version": "0.1.7",
+      "sha256": "1i22iyrphnljbp227209b2yq7vzbkrhx6h7c56g3q8ykiprjhj51",
       "depends": ["RColorBrewer", "VBTree", "dlm", "e1071", "ggplot2", "metR", "rgl"]
     },
     "TPXG": {
@@ -36969,9 +37149,9 @@
     },
     "TTAinterfaceTrendAnalysis": {
       "name": "TTAinterfaceTrendAnalysis",
-      "version": "1.5.10",
-      "sha256": "16d37qjz8qcr3j6sz4sxxmv789qkr22gpq5808npbpk9wry723wh",
-      "depends": ["data_table", "e1071", "multcomp", "mvtnorm", "nlme", "pastecs", "relimp", "reshape", "rkt", "stlplus", "tcltk2", "wql", "zoo"]
+      "version": "1.5.11",
+      "sha256": "1rap16nfxalrvvpzkf3x5ms73rkl8xz1n4mlzgl0v1i18v3fwnxd",
+      "depends": ["BreakPoints", "data_table", "e1071", "multcomp", "mvtnorm", "nlme", "pastecs", "relimp", "reshape", "rkt", "stlplus", "tcltk2", "wql", "zoo"]
     },
     "TTCA": {
       "name": "TTCA",
@@ -37035,9 +37215,9 @@
     },
     "TVMVP": {
       "name": "TVMVP",
-      "version": "1.0.4",
-      "sha256": "0j06fxppdnx5fgs1xi6kv32ykg4j7xr69ivhzg3nfrvxr4wwlxmm",
-      "depends": ["R6", "cli", "prettyunits"]
+      "version": "1.0.5",
+      "sha256": "17c22iijqky7x0i7sx9bxcnly0mnk45lkw07v69p470jz3b5bjlb",
+      "depends": ["R6", "cli", "dplyr", "ggplot2", "prettyunits", "tidyr"]
     },
     "TWW": {
       "name": "TWW",
@@ -37057,6 +37237,12 @@
       "sha256": "1ydxl9mc17bi3axzs15qlqr6db8rah5k44dyxvjng2c18nig72dh",
       "depends": ["colorRamps"]
     },
+    "TableContainer": {
+      "name": "TableContainer",
+      "version": "1.0.0",
+      "sha256": "1rd00zrkqq3bs5y63xdgpd6g7y2j0cs5yczkdjmwx9ia2j57chg0",
+      "depends": ["cli", "glue"]
+    },
     "TableHC": {
       "name": "TableHC",
       "version": "0.1.2",
@@ -37101,8 +37287,8 @@
     },
     "TapeS": {
       "name": "TapeS",
-      "version": "0.13.3",
-      "sha256": "0hbskhixvgijl0kppzcld89in5skpaqk8b0an5fn5gmnkjm7cpsg",
+      "version": "0.14.1",
+      "sha256": "0c4vzb1bs2l1nq7r9qhwhvl34gz3agzrxix306f3r8cwvyc325yf",
       "depends": ["Rcpp", "RcppArmadillo", "TapeR"]
     },
     "Tariff": {
@@ -37137,8 +37323,8 @@
     },
     "TcGSA": {
       "name": "TcGSA",
-      "version": "0.12.10",
-      "sha256": "1bdffzq3zwvr0qsp71mp0fqf9dgx9n3f08c53adwavycwr6zg1l7",
+      "version": "0.12.13",
+      "sha256": "1dgxc5zm5rx40cpwq8sxm513x1d5dn7q2qzqj5z9wyqrnp73qghy",
       "depends": ["GSA", "cluster", "cowplot", "ggplot2", "gtools", "lme4", "multtest", "reshape2", "stringr"]
     },
     "Tcomp": {
@@ -37225,12 +37411,6 @@
       "sha256": "18q4a155cxgzlbq5d4nfqvj88m5hc5ysdshkpcbih98axc6zm071",
       "depends": []
     },
-    "TensorTools": {
-      "name": "TensorTools",
-      "version": "1.0.0",
-      "sha256": "0x16raj8xhjzjhrpj9l5rz66rfiy8hf6ap3l7gqmx53vfk3fpsqq",
-      "depends": ["Matrix", "gsignal", "matrixcalc", "png", "raster", "wavethresh"]
-    },
     "Ternary": {
       "name": "Ternary",
       "version": "2.3.4",
@@ -37461,8 +37641,8 @@
     },
     "TidyDensity": {
       "name": "TidyDensity",
-      "version": "1.5.0",
-      "sha256": "1ncs8c0gwb54snn9xbndgjc9cgqf8hgqmr5ki2bsxad0vqgjl9vq",
+      "version": "1.5.1",
+      "sha256": "1q272wjavyzqsmlsgb2gw0cjh85yfk8jdbanwqw9vpn9y7ancjdq",
       "depends": ["actuar", "broom", "data_table", "dplyr", "ggplot2", "magrittr", "nloptr", "patchwork", "plotly", "purrr", "rlang", "stringr", "survival", "tidyr", "tidyselect"]
     },
     "TidyMultiqc": {
@@ -37507,6 +37687,12 @@
       "sha256": "07lw6jnr76qrxwrwv90hi5ih2xf6g4sz4hfapk5vf1y3ayfskkl0",
       "depends": ["DescTools", "TeachingDemos", "mclust"]
     },
+    "Tivy": {
+      "name": "Tivy",
+      "version": "0.1.1",
+      "sha256": "0lc9vbrk6d27xkkr8xkgw6isi97y1q2wqa6nc83gd4skj5hppjgn",
+      "depends": ["RColorBrewer", "dplyr", "future", "future_apply", "ggplot2", "httr", "jsonlite", "leaflet", "lubridate", "patchwork", "pdftools", "rlang", "rvest", "scales", "stringi", "stringr", "tidyr"]
+    },
     "Tlasso": {
       "name": "Tlasso",
       "version": "1.0.2",
@@ -37593,8 +37779,8 @@
     },
     "TraMineR": {
       "name": "TraMineR",
-      "version": "2.2-11",
-      "sha256": "05fb5w1wz3aqc7ngr4vp84dwbwpxm10lpkqlin55h895wph5529x",
+      "version": "2.2-12",
+      "sha256": "0c3s562rnq2q006cksw36g89mik1746i8xqxl09l9y3sjcnd6qv4",
       "depends": ["RColorBrewer", "boot", "cluster", "colorspace", "vegan"]
     },
     "TraMineRextras": {
@@ -37659,9 +37845,9 @@
     },
     "TransProR": {
       "name": "TransProR",
-      "version": "1.0.3",
-      "sha256": "1hvbgak6q2i9js8wrzs0rmf4arzzcmsdz54ks6kcfddma7309qhc",
-      "depends": ["ComplexHeatmap", "DESeq2", "Hmisc", "circlize", "dplyr", "edgeR", "geomtextpath", "ggVennDiagram", "ggalt", "ggdensity", "ggnewscale", "ggplot2", "ggpubr", "ggraph", "ggtree", "hrbrthemes", "limma", "magrittr", "rlang", "spiralize", "stringr", "sva", "tibble", "tidygraph", "tidyr"]
+      "version": "1.0.5",
+      "sha256": "0fxr4y3qj5836rpij4mdiq46s8yp6c022ih7zr22wfawiy9rxnc3",
+      "depends": ["ComplexHeatmap", "DESeq2", "Hmisc", "circlize", "dplyr", "edgeR", "geomtextpath", "ggVennDiagram", "ggdensity", "ggnewscale", "ggplot2", "ggpubr", "ggraph", "ggtree", "hrbrthemes", "limma", "magrittr", "rlang", "spiralize", "stringr", "sva", "tibble", "tidygraph", "tidyr"]
     },
     "TransTGGM": {
       "name": "TransTGGM",
@@ -37675,6 +37861,12 @@
       "sha256": "0dynxrmpyji2dn42l4s87waz7m77ci0h7rnsc3zm6a3ya9gxgdfv",
       "depends": []
     },
+    "Transition": {
+      "name": "Transition",
+      "version": "1.0.0",
+      "sha256": "0j7hgrqrwwhi78s0v3z94i83bsvjgaqp4fv9qdiz89gswsazim64",
+      "depends": ["Rcpp"]
+    },
     "Tratamentos_ad": {
       "name": "Tratamentos.ad",
       "version": "0.2.4",
@@ -37729,6 +37921,12 @@
       "sha256": "18d1y5sf871sbp1yhsc9ji27a8hly5g7qv0jxy2apml44i1003iw",
       "depends": ["cli", "data_table", "future", "future_apply"]
     },
+    "TreeOrderTests": {
+      "name": "TreeOrderTests",
+      "version": "0.1.0",
+      "sha256": "0as8kdc9i3j2hhrc4r0f66nn6npbl9nza7nccar92w2x46fi9a9i",
+      "depends": []
+    },
     "TreeRingShape": {
       "name": "TreeRingShape",
       "version": "3.0.5",
@@ -37755,9 +37953,9 @@
     },
     "TreeTools": {
       "name": "TreeTools",
-      "version": "1.14.0",
-      "sha256": "1qc3kwz1js073sjgn0vnqzjcic5b8xg4a9p6q01yl565wjyd7iy1",
-      "depends": ["PlotTools", "RCurl", "R_cache", "Rcpp", "Rdpack", "ape", "bit64", "colorspace", "fastmatch", "lifecycle"]
+      "version": "1.15.0",
+      "sha256": "06a3bwc3gnhhrf0zr44s6ycfi8z0q4rwsyvcxwj9frz3248k2niy",
+      "depends": ["PlotTools", "RCurl", "R_cache", "Rcpp", "Rdpack", "ape", "bit64", "colorspace", "fastmatch", "lifecycle", "stringi"]
     },
     "TrenchR": {
       "name": "TrenchR",
@@ -37861,6 +38059,12 @@
       "sha256": "0xmq40zarj1shghnczkmwlds1j0f5b5ap6im7mahn3ir54x6mwrh",
       "depends": ["hash"]
     },
+    "TrueWAP": {
+      "name": "TrueWAP",
+      "version": "0.1.0",
+      "sha256": "0jgqz91mw2p5267gnc7m6adnw5nbnm9r2xdkl0n7wdpd2z02p7pv",
+      "depends": ["TTR", "zoo"]
+    },
     "TrumpetPlots": {
       "name": "TrumpetPlots",
       "version": "0.0.1.1",
@@ -37915,6 +38119,12 @@
       "sha256": "0isb1nmm6hxwn6p52an1axj30ilkr5c8xi86zx2b8acivdz2xr12",
       "depends": ["blockrand", "dplyr", "simsurv", "survival"]
     },
+    "TwoPhaseCorR": {
+      "name": "TwoPhaseCorR",
+      "version": "1.1.1",
+      "sha256": "03xrcwxk8bvxdph530gq6kq41z7zjh0ril4wa386k6br47rfk47f",
+      "depends": ["MASS", "Matrix", "dplyr", "ggplot2"]
+    },
     "TwoSampleTest_HD": {
       "name": "TwoSampleTest.HD",
       "version": "1.2",
@@ -37969,12 +38179,6 @@
       "sha256": "0sbw0kvviczpccv3nq2n1nkj61hng178px4381zkaf1yrv44x9l6",
       "depends": []
     },
-    "UBL": {
-      "name": "UBL",
-      "version": "0.0.9",
-      "sha256": "1jpm41la5210a9shak01fsgq2yw8l1cz5zbb5zlas2nc2jg7hslh",
-      "depends": ["MBA", "automap", "gstat", "randomForest", "sp"]
-    },
     "UBStats": {
       "name": "UBStats",
       "version": "0.2.2",
@@ -37995,8 +38199,8 @@
     },
     "UCSCXenaShiny": {
       "name": "UCSCXenaShiny",
-      "version": "2.1.0",
-      "sha256": "080a3p3cb818hns7f72c411bh13clfn3b6xl7wlx41z69swphb5m",
+      "version": "2.2.0",
+      "sha256": "0ygxwsllqhk6c82aw6282az1p3q8sldgmryf94c37fzj8kkjwvig",
       "depends": ["UCSCXenaTools", "digest", "dplyr", "ezcox", "forcats", "ggplot2", "ggpubr", "httr", "magrittr", "ppcor", "psych", "purrr", "rlang", "shiny", "stringr", "tibble", "tidyr"]
     },
     "UCSCXenaTools": {
@@ -38007,8 +38211,8 @@
     },
     "UComp": {
       "name": "UComp",
-      "version": "5.1",
-      "sha256": "026n2gvmihdhpcm6glkpbsq260gpccfnhiaazdhj89pmkmwqmr6z",
+      "version": "5.1.1",
+      "sha256": "0a3jxdw3aicllbabfqabyfzvdq1mxz9xd60j90288bb7bxynp4j4",
       "depends": ["Rcpp", "RcppArmadillo", "ggforce", "ggplot2", "gridExtra", "tsibble", "tsoutliers"]
     },
     "UEI": {
@@ -38055,8 +38259,8 @@
     },
     "UPCM": {
       "name": "UPCM",
-      "version": "0.0-3",
-      "sha256": "1apah04qdgvxxf6q6xr53716pcrmds86sn8f7ykxj93ggg8k0bvl",
+      "version": "0.0-4",
+      "sha256": "1c6fc1yrbhsia33qxjq29fgwa1hynpd006jvvb79dx1klwmmn4kk",
       "depends": ["Rcpp", "RcppArmadillo", "cubature", "ltm", "mvtnorm", "numDeriv", "statmod"]
     },
     "UPG": {
@@ -38193,8 +38397,8 @@
     },
     "UniprotR": {
       "name": "UniprotR",
-      "version": "2.4.0",
-      "sha256": "0zrpqr1kvigfd0qv2sfra0xm2l94r0v0gyi2yjfgf2g60br4gggj",
+      "version": "2.5.0",
+      "sha256": "1rfaavzfqbllgnc45wawr15v53xfbbzg17z35plxxz6v9ibqxa6a",
       "depends": ["alakazam", "curl", "data_tree", "dplyr", "ggplot2", "ggpubr", "ggsci", "gprofiler2", "gridExtra", "htmlwidgets", "httr", "magick", "magrittr", "networkD3", "plyr", "progress", "qdapRegex", "scales", "stringr", "tidyverse"]
     },
     "UnitCircle": {
@@ -38265,8 +38469,8 @@
     },
     "V8": {
       "name": "V8",
-      "version": "6.0.4",
-      "sha256": "185b42pcy5x31vwq82z3d839vx6ggxnnh6564cjipyh48vl2xvpr",
+      "version": "6.0.5",
+      "sha256": "0j1j2iwmfikbavjdvhizd48rjfm6b6hv741y38lysca1873l6rc2",
       "depends": ["Rcpp", "curl", "jsonlite"]
     },
     "VAJointSurv": {
@@ -38323,6 +38527,12 @@
       "sha256": "09hysmxxawcbyfx6bia546aqydryl2r5p3ai7bvl6ghdckw5mnpl",
       "depends": ["MASS", "ars", "corpcor", "mvtnorm", "strucchange", "vars"]
     },
+    "VARtests": {
+      "name": "VARtests",
+      "version": "2.0.7",
+      "sha256": "07571vs4c8bf83n3qj8gi9py3s52s9fnc8pj0jv71xrac10n68zr",
+      "depends": ["Rcpp", "RcppArmadillo", "sn"]
+    },
     "VBJM": {
       "name": "VBJM",
       "version": "0.1.0",
@@ -38485,12 +38695,6 @@
       "sha256": "16m9y9sq04q6c7adnx5w6a4qqgzisdvn2jn2bp58xcaf95sbcjnp",
       "depends": ["Biostrings", "DECIPHER", "ape", "cluster", "dbscan", "pathviewr"]
     },
-    "VIRF": {
-      "name": "VIRF",
-      "version": "0.1.0",
-      "sha256": "0bdkmbmkmmj78h9x025qsdzjzcx8xr2s98wlspcsghlz4hxkzcas",
-      "depends": ["BigVAR", "expm", "gnm", "ks", "matlib", "matrixcalc", "mgarchBEKK", "rmgarch"]
-    },
     "VLF": {
       "name": "VLF",
       "version": "1.1-3",
@@ -38625,8 +38829,8 @@
     },
     "VeccTMVN": {
       "name": "VeccTMVN",
-      "version": "1.2.1",
-      "sha256": "0ylpzdbq5c3cpmyciss9y60b5pg6fg7svv54ilb9ml589320zmax",
+      "version": "1.3.0",
+      "sha256": "0x0nd07015ibp1q989kwnwig0c85vvfc30azswyn4dia8dwd5zzf",
       "depends": ["GPvecchia", "GpGp", "Matrix", "Rcpp", "RcppArmadillo", "TruncatedNormal", "nleqslv", "truncnorm"]
     },
     "VectorCodeR": {
@@ -38661,8 +38865,8 @@
     },
     "VertexWiseR": {
       "name": "VertexWiseR",
-      "version": "1.3.2",
-      "sha256": "05vp96vvgh54c0rj4ixx6nyykkvrsni9y9qrb91r4xr42fahk6yq",
+      "version": "1.4.0",
+      "sha256": "09brbgb8xc0pysvki5hlnx84pl0q949gf79r24141g7r580532sp",
       "depends": ["ciftiTools", "doParallel", "doSNOW", "foreach", "freesurferformats", "fs", "gifti", "igraph", "plotly", "png", "rappdirs", "reticulate", "stringr"]
     },
     "VeryLargeIntegers": {
@@ -38757,14 +38961,14 @@
     },
     "VizTest": {
       "name": "VizTest",
-      "version": "0.3-1",
-      "sha256": "08c47wnz64f3cf0zz9ak8jbay27sx9g5zwml29kzh2sqmhdrl8rh",
-      "depends": ["HDInterval", "dplyr", "ggplot2"]
+      "version": "0.4",
+      "sha256": "1bv8jbhprg77ffz966zz0xpsddhr1v19ss39ik5qf7d3pml1h6s4",
+      "depends": ["HDInterval", "dplyr", "ggplot2", "tidyr"]
     },
     "VoronoiBiomedPlot": {
       "name": "VoronoiBiomedPlot",
-      "version": "0.1.0",
-      "sha256": "1v4m673i5kbi5p742v4wky5m48dgc66qzpyhyz81gh3098l99wqb",
+      "version": "0.1.1",
+      "sha256": "1k09p23p3zzmpc07ycwfcm04m2nfrc8vfpgzy88r35l0x6fz00v4",
       "depends": ["deldir", "ggplot2", "ggrepel"]
     },
     "VorteksExport": {
@@ -38823,14 +39027,14 @@
     },
     "WALS": {
       "name": "WALS",
-      "version": "0.2.5",
-      "sha256": "0z3863ml85065w23m6wr4hd5a0vdaiavpmrbal8kz4igj6j34ff6",
+      "version": "0.2.6",
+      "sha256": "0rv61z62qfs0ss80lfv2jb537ixqfdwap7xbk0a1fwfr9h4zhfgw",
       "depends": ["Formula", "MASS", "Rdpack"]
     },
     "WARDEN": {
       "name": "WARDEN",
-      "version": "1.2.0",
-      "sha256": "04rbqvvijfjvg3zp29b7f3rdir42qvpl6s83szsjnpr6r2ka81d1",
+      "version": "1.2.5",
+      "sha256": "1z06n57dgaxlq3qqr4hx6i15arhpb85ni9471msmzam3lfzvi3wr",
       "depends": ["MASS", "data_table", "doFuture", "flexsurv", "foreach", "future", "magrittr", "progressr", "purrr", "rlang", "tidyr", "zoo"]
     },
     "WARN": {
@@ -38895,14 +39099,14 @@
     },
     "WH": {
       "name": "WH",
-      "version": "1.1.2",
-      "sha256": "0hvlyb3vb4lk4sn6vqj80y0ps5jx8fdlcniiqhy803v04cph7v4y",
-      "depends": []
+      "version": "2.0.0",
+      "sha256": "0m0f16grkvv9z68q8niq7l75hif3ppb96gprw973zh2dcnac26br",
+      "depends": ["Rcpp"]
     },
     "WINS": {
       "name": "WINS",
-      "version": "1.5",
-      "sha256": "0cd0xwvm61847cxbc9xk265nykzb8csyzfd83ip7zkwm3a8qywsd",
+      "version": "1.5.1",
+      "sha256": "0j44d0qknpm95nfncwbmvqxmwzllrbw1j5zhmd2cw8fsjcgl47g3",
       "depends": ["copula", "ggplot2", "ggpubr", "reshape2", "stringr", "survival", "viridis"]
     },
     "WIPF": {
@@ -38925,8 +39129,8 @@
     },
     "WMAP": {
       "name": "WMAP",
-      "version": "1.1.0",
-      "sha256": "11fd1g83i2qvp9814zk3qq8bz5gir1j5gsz5x5zrqgygyla2xpbw",
+      "version": "1.2.0",
+      "sha256": "1j0fkxar850s4sgjz1hjlljanp2y1dayjpr2kn9r7n0zdnb2z7px",
       "depends": ["caret", "forcats", "ggplot2", "pkgcond", "randomForest", "zeallot"]
     },
     "WMWssp": {
@@ -39147,9 +39351,9 @@
     },
     "WebAnalytics": {
       "name": "WebAnalytics",
-      "version": "0.9.12",
-      "sha256": "031gyndk605841ns33pifhfwlasa39jhrmvigw84iqc2dgxqqpgl",
-      "depends": ["brew", "data_table", "digest", "fs", "ggplot2", "reshape2", "scales", "tinytex", "uaparserjs", "xtable"]
+      "version": "0.9.14",
+      "sha256": "1z12lvb7qln08zg42gsjrjxp5ksg8awbdwnw3y8cfv7zmh316sf6",
+      "depends": ["brew", "data_table", "digest", "fs", "ggplot2", "reshape2", "scales", "uaparserjs", "xtable"]
     },
     "WebGestaltR": {
       "name": "WebGestaltR",
@@ -39183,20 +39387,20 @@
     },
     "WeibullR_learnr": {
       "name": "WeibullR.learnr",
-      "version": "0.2",
-      "sha256": "0zifz7wbgl2al9av97r5yy5p0vlyfq34s3328l16r9z9ri02hhli",
+      "version": "0.2.1",
+      "sha256": "1q93g5l25br76asz6mmkr8f2dbl0f4d4vcnd38mwx7pbp819lzwh",
       "depends": ["ReliaGrowR", "WeibullR", "WeibullR_ALT", "learnr"]
     },
     "WeibullR_plotly": {
       "name": "WeibullR.plotly",
-      "version": "0.3",
-      "sha256": "1y8w3sgkraqjbmzrrm933574iqj75zn40niga32nn399yxqa9wnv",
+      "version": "0.3.1",
+      "sha256": "0xld1qycznh2980m8mfc2fjdraazqwcqmf8pyyrs7fv64d8bkaak",
       "depends": ["ReliaGrowR", "WeibullR", "plotly"]
     },
     "WeibullR_shiny": {
       "name": "WeibullR.shiny",
-      "version": "0.3",
-      "sha256": "1iadi0gzbyj359kbn9ycv4l3jzbrn2wfas7412hgbh51ahhkqblh",
+      "version": "0.3.1",
+      "sha256": "061miq7d3h9gbz5br0j7a006h5jccx67yq1zxxlfh3gw1vvnp10n",
       "depends": ["ReliaGrowR", "WeibullR", "WeibullR_plotly", "magrittr", "shiny", "shinyWidgets", "shinydashboard"]
     },
     "WeightIt": {
@@ -39205,6 +39409,12 @@
       "sha256": "13fxcb7hhghzij3g5hz5352hi3jd7z5f69a50dfh2g6n4mhq67vc",
       "depends": ["chk", "cobalt", "crayon", "generics", "ggplot2", "rlang", "sandwich"]
     },
+    "WeightMyItems": {
+      "name": "WeightMyItems",
+      "version": "0.1.4",
+      "sha256": "14l4a79ws2yay2a7vdj7kq39rpi8q4wdysckh1vsyz1snw1rs2jy",
+      "depends": ["psychometric"]
+    },
     "WeightSVM": {
       "name": "WeightSVM",
       "version": "1.7-16",
@@ -39261,9 +39471,9 @@
     },
     "WhatsR": {
       "name": "WhatsR",
-      "version": "1.0.4",
-      "sha256": "0i6mhc3cm7m885v5sznci7bqr6h2bfgnv466v5jwdwidisnzrhgx",
-      "depends": ["anytime", "checkmate", "data_table", "dplyr", "ggmap", "ggplot2", "ggwordcloud", "lubridate", "mgsub", "qdap", "qdapRegex", "ragg", "readr", "stringi", "tokenizers", "visNetwork"]
+      "version": "1.0.6",
+      "sha256": "1j1s8avr449sbm8683669n91q94nr9wqy65n05pzmywkzs7nbiis",
+      "depends": ["anytime", "checkmate", "data_table", "dplyr", "ggplot2", "ggwordcloud", "leaflet", "lubridate", "mgsub", "qdap", "qdapRegex", "ragg", "readr", "stringi", "tokenizers", "visNetwork"]
     },
     "WhiteLabRt": {
       "name": "WhiteLabRt",
@@ -39273,8 +39483,8 @@
     },
     "WhiteStripe": {
       "name": "WhiteStripe",
-      "version": "2.4.3",
-      "sha256": "0r9gjmdilyfj317gr2z00xgz1bjx4802nb522341fw1gklgf7y5i",
+      "version": "2.5.0",
+      "sha256": "0l87wpkfad3dzkl9ay92xdgaalq796c3jl4y2w71kv7msjs1mlfd",
       "depends": ["mgcv", "neurobase", "oro_nifti"]
     },
     "WienR": {
@@ -39363,8 +39573,8 @@
     },
     "WormTensor": {
       "name": "WormTensor",
-      "version": "0.1.1",
-      "sha256": "1xnjp6m3h0q6phmn2c2wkbjzyl8lpx07jsryz0i8rxr6ny591ja2",
+      "version": "0.1.2",
+      "sha256": "0laaia9y3pm8kq0ajl6k1dw6aj15blb7xxhy3jn555hxs2dypwhd",
       "depends": ["Rtsne", "aricode", "clValid", "cluster", "clusterSim", "cowplot", "dtwclust", "factoextra", "ggplot2", "ggrepel", "rTensor", "usedist", "uwot"]
     },
     "WpProj": {
@@ -39579,8 +39789,8 @@
     },
     "ZEP": {
       "name": "ZEP",
-      "version": "0.1.4",
-      "sha256": "0dvbfpx84rw4i6cacqw61fifbdxsg9516zkciapsiny93h17ajbk",
+      "version": "0.1.5",
+      "sha256": "043vlybpxyjczaq2i9s3gnrhdr5fll13d5g722h5brj8v7n4jn2z",
       "depends": ["FuzzyNumbers"]
     },
     "ZIBR": {
@@ -39693,9 +39903,9 @@
     },
     "aLBI": {
       "name": "aLBI",
-      "version": "0.1.7",
-      "sha256": "15pa431l58w3dym4v0wsma9zjmlw4xwcvjsyw0fd996ckzj1g15j",
-      "depends": ["dplyr"]
+      "version": "0.1.8",
+      "sha256": "1rf8a8d4df9i4nzcb6mcmcypsl7k9s8hbablfhwynss6c8m2a9vm",
+      "depends": ["dplyr", "ggplot2", "openxlsx"]
     },
     "aLFQ": {
       "name": "aLFQ",
@@ -39729,8 +39939,8 @@
     },
     "aRxiv": {
       "name": "aRxiv",
-      "version": "0.10",
-      "sha256": "0fm22lcifq2lmbv2il0jkkp7b426924vwph7yrcqprvlvb3g33id",
+      "version": "0.12",
+      "sha256": "0fhrdfr525hgn1ms5w096cw2mbf81qy65f5qf3757h98553qj8s7",
       "depends": ["XML", "httr"]
     },
     "aSPU": {
@@ -39751,6 +39961,12 @@
       "sha256": "1jg19ns3mxfycc11i2c152d83n4kqz3dd6d269sijnxrw80kzjki",
       "depends": ["party", "randomForest", "rpart"]
     },
+    "aamatch": {
+      "name": "aamatch",
+      "version": "0.3.7",
+      "sha256": "1wrhxh61drmcixp895miglhxvhipwnixx0w42cr6m1mbn69xbd75",
+      "depends": ["iTOS"]
+    },
     "abasequence": {
       "name": "abasequence",
       "version": "0.1.0",
@@ -39795,8 +40011,8 @@
     },
     "abctools": {
       "name": "abctools",
-      "version": "1.1.7",
-      "sha256": "16gn5hk25glbjml7bclxqkybi90gqjijz6hl6ak8aig5wm08pgx2",
+      "version": "1.1.8",
+      "sha256": "00b2qyfr15yllaw70v591j5akdcalb3hjj5l1jym9sb87q05rhz0",
       "depends": ["Hmisc", "abc", "abind", "plyr"]
     },
     "abd": {
@@ -39871,6 +40087,12 @@
       "sha256": "1v5pc5sacw3yb0r7x55iaf14pf5ck7h2mm07ssp92lxm2ivh58f6",
       "depends": ["BayesLogit", "GIGrvg", "mvtnorm", "truncnorm"]
     },
+    "abn": {
+      "name": "abn",
+      "version": "3.1.9",
+      "sha256": "153xv0gry77283ymbfr99z5p0wv2pnjg3k9b67xcj9ysal3dx4qi",
+      "depends": ["Rcpp", "RcppArmadillo", "Rgraphviz", "doParallel", "foreach", "graph", "lme4", "mclogit", "nnet", "rjags", "stringi"]
+    },
     "abnormality": {
       "name": "abnormality",
       "version": "0.1.0",
@@ -40011,8 +40233,8 @@
     },
     "acdcquery": {
       "name": "acdcquery",
-      "version": "1.0.1",
-      "sha256": "03ip3fvc1qcq0vmcidv1rbih85v3dxhx08047vjlf21kfcr9cizk",
+      "version": "1.1.0",
+      "sha256": "0zilw7bwblayhfs0sf11dl7kcb5azzljx93679syscvkmjn5myil",
       "depends": ["DBI", "RSQLite"]
     },
     "ace2fastq": {
@@ -40089,8 +40311,8 @@
     },
     "acro": {
       "name": "acro",
-      "version": "0.1.4",
-      "sha256": "0vm1828zb90kqj7vz16mpai7b975frmgd4hvs357cdgiam1hga76",
+      "version": "0.1.5",
+      "sha256": "08fmfz171dmfiwv5dhvjn3fy4g8qb7sfhcvjxbwwhpshp6m7r3n0",
       "depends": ["admiraldev", "png", "reticulate"]
     },
     "acroname": {
@@ -40185,14 +40407,14 @@
     },
     "actuaRE": {
       "name": "actuaRE",
-      "version": "0.1.5",
-      "sha256": "02f90vdbfz6shsw4ndhqbqjsrwiwmi1jp66bsl897cb8fnywnzs4",
+      "version": "0.1.6",
+      "sha256": "0nx2zm0f4gnbkx92lyz5wsjxq35pij7c8y6zf69wyqb6m9wlsp0a",
       "depends": ["cplm", "data_table", "ggplot2", "knitr", "lme4", "magrittr", "nlme", "statmod"]
     },
     "actuar": {
       "name": "actuar",
-      "version": "3.3-5",
-      "sha256": "0ymh4gx8nplw7acx9pg1gxwfjcnjx0zzpd9x4pf4hlzqwddaynqm",
+      "version": "3.3-6",
+      "sha256": "1rlg5xz41d04r9gab14mv4s61q68wmg00p71pqy60iw6r91j9811",
       "depends": ["expint"]
     },
     "actuaryr": {
@@ -40233,8 +40455,8 @@
     },
     "adabag": {
       "name": "adabag",
-      "version": "5.0",
-      "sha256": "03nnqgia61pavic9l6av0hh81wilxlkrx3g244ypar1fv9ppan7c",
+      "version": "5.1",
+      "sha256": "0a5vam2gi5gc917s2akipn2s30wn1a2w3d25g9an5cj0d326xmb8",
       "depends": ["ConsRank", "caret", "doParallel", "dplyr", "foreach", "rpart", "tidyr"]
     },
     "adace": {
@@ -40261,6 +40483,12 @@
       "sha256": "0zi3a17rapc1z074k3yzgjv2b6ba6c9d54b1hm0ivvgfd335981f",
       "depends": ["ROI", "ROI_plugin_optimx", "optimx"]
     },
+    "adapt3": {
+      "name": "adapt3",
+      "version": "1.0.1",
+      "sha256": "0b4pcv680910i4ypdd21v2l23xlqj435i1ibbj9kwp7sngnp3mmr",
+      "depends": ["BH", "Rcpp", "RcppArmadillo", "lefko3", "rlang"]
+    },
     "adapt4pv": {
       "name": "adapt4pv",
       "version": "0.2-3",
@@ -40329,8 +40557,8 @@
     },
     "adas_utils": {
       "name": "adas.utils",
-      "version": "1.2.0",
-      "sha256": "0057r2ahmaxdcp6rmmpwfk6cbicl2mbqc84rdvjrn1lxlsx4lgas",
+      "version": "1.2.1",
+      "sha256": "0lj02asmj4xsjd1g69n705n83dvc25msv7mbmjq1b9rks4jj5pfd",
       "depends": ["dplyr", "gghalfnorm", "ggplot2", "glue", "lubridate", "magrittr", "purrr", "readr", "rlang", "scales", "stringr", "tibble", "tidyr"]
     },
     "adass": {
@@ -40341,20 +40569,20 @@
     },
     "adbcdrivermanager": {
       "name": "adbcdrivermanager",
-      "version": "0.18.0",
-      "sha256": "16zfwk1cl76ah80q62xbrri96d4dhmi9z6674478dsnnfpqvxqh2",
+      "version": "0.19.0-1",
+      "sha256": "073j1w4wh6c1zlky1irc50f0qh959zinqln8syjkazzcjfnqybz0",
       "depends": ["nanoarrow"]
     },
     "adbcpostgresql": {
       "name": "adbcpostgresql",
-      "version": "0.18.0",
-      "sha256": "17yarhcpn05zlci9sv4wrv1j8z706v8qn8i595vwdv2fi8i8hi8m",
+      "version": "0.19.0",
+      "sha256": "1imimks8frqhy2q8lfjakl3a76sbnp93kijq84vw8jmbmil2zawj",
       "depends": ["adbcdrivermanager"]
     },
     "adbcsqlite": {
       "name": "adbcsqlite",
-      "version": "0.18.0",
-      "sha256": "1lr3nqf08biilkdivpkjfamd0fcim2g18vi7226zm67m39dv4qf0",
+      "version": "0.19.0",
+      "sha256": "1ssh6gkimh63qwy4w0x66h8qqjgklyr7hssmfjcfmcnj38wypany",
       "depends": ["adbcdrivermanager"]
     },
     "adbi": {
@@ -40467,9 +40695,9 @@
     },
     "adehabitatLT": {
       "name": "adehabitatLT",
-      "version": "0.3.28",
-      "sha256": "1hixi29v6p2479hy5y907mfz3ij01dkiyxd62mx348pnh5nkn8bc",
-      "depends": ["CircStats", "ade4", "adehabitatMA", "sp"]
+      "version": "0.3.29",
+      "sha256": "0sfvkgz4x63qw6j8rwvd4dlisg33mzah3161vgr84iab84jjadxk",
+      "depends": ["ade4", "adehabitatMA", "sp"]
     },
     "adehabitatMA": {
       "name": "adehabitatMA",
@@ -40479,8 +40707,8 @@
     },
     "adelie": {
       "name": "adelie",
-      "version": "1.0.7",
-      "sha256": "1xnkp6a1g5mhbmcbmrx24zwxpvsc81s8m77irmq1w6kc67ib2c2n",
+      "version": "1.0.8",
+      "sha256": "059cz4sn2g42z17mk1jj8vbr6ii9dc46dfhplnwwbpq422bvfmsc",
       "depends": ["Matrix", "Rcpp", "RcppEigen", "r2r", "stringr"]
     },
     "adephylo": {
@@ -40569,8 +40797,8 @@
     },
     "adjustedCurves": {
       "name": "adjustedCurves",
-      "version": "0.11.2",
-      "sha256": "11bc2hrxr65i1rk2zv7r7daqm7m5v9xhhgk1fwr0jbs6c4dk2niw",
+      "version": "0.11.3",
+      "sha256": "09q8lr5zm0g7p7avaqq8l9q385w2pnagqpads0lwifpclyqz9r4v",
       "depends": ["R_utils", "doParallel", "doRNG", "dplyr", "foreach", "rlang", "survival"]
     },
     "adjustedcranlogs": {
@@ -40593,8 +40821,8 @@
     },
     "admiral": {
       "name": "admiral",
-      "version": "1.2.0",
-      "sha256": "1pk20c5y6zi8k5915wj507r7spzxy9ybpk4gv3wfpphwfbhriw3m",
+      "version": "1.3.1",
+      "sha256": "07ahbilcsvf1gdzi7mah0k8915cakzypf5r0450vx4hj9wgvpsq2",
       "depends": ["admiraldev", "cli", "dplyr", "hms", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tidyr", "tidyselect"]
     },
     "admiral_test": {
@@ -40605,14 +40833,14 @@
     },
     "admiraldev": {
       "name": "admiraldev",
-      "version": "1.2.0",
-      "sha256": "0fkm3bg0ha5gsdxzv2blr3lip3dyy12d8jp6vp1g3jb3y24amrxd",
-      "depends": ["cli", "dplyr", "glue", "lifecycle", "lubridate", "purrr", "rlang", "stringr", "tidyr", "tidyselect"]
+      "version": "1.3.1",
+      "sha256": "0c6z16fv9i1rsq3syjgz5w2yjlxyghyyq5y7nblph82kg0qd1lsd",
+      "depends": ["cli", "dplyr", "glue", "lifecycle", "lubridate", "purrr", "rlang", "roxygen2", "stringr", "tidyr", "tidyselect", "withr"]
     },
     "admiralmetabolic": {
       "name": "admiralmetabolic",
-      "version": "0.1.0",
-      "sha256": "1xj1l33ss9hpqx5i5wml051izf2c36q57xh7drrjpyi4lizwzzcj",
+      "version": "0.2.0",
+      "sha256": "1j0w4mniqwpdw9haqnnxgkxx568gvklv8kp8pm39qic4i6ndwf2l",
       "depends": ["admiral", "admiraldev", "cli", "dplyr", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tidyselect"]
     },
     "admiralonco": {
@@ -40623,9 +40851,9 @@
     },
     "admiralophtha": {
       "name": "admiralophtha",
-      "version": "1.2.0",
-      "sha256": "1rsyl8qq36zw6bhd6dmq8m6vjcrpyrvm3bd52iyxpmb0xca2j83x",
-      "depends": ["admiral", "admiraldev", "cli", "dplyr", "hms", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tidyr", "tidyselect"]
+      "version": "1.3.0",
+      "sha256": "01pkd56ql0ldfna64p1jv4j1d0ql84g07nbf5ybyldb1vs5l1c2a",
+      "depends": ["admiral", "admiraldev", "dplyr", "hms", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tidyr", "tidyselect"]
     },
     "admiralpeds": {
       "name": "admiralpeds",
@@ -40647,8 +40875,8 @@
     },
     "admix": {
       "name": "admix",
-      "version": "2.4",
-      "sha256": "13dw5g2i00rwz43fx54m8379slwc7z3lvn1gz694yhn3v52ilx8i",
+      "version": "2.4.2",
+      "sha256": "1cmq9n401ax7n1kzsqqnm1a8lwgncf7w2vql7fkdhwa12w0w4s1q",
       "depends": ["EnvStats", "Iso", "MASS", "Rcpp", "Rdpack", "cubature", "fdrtool", "orthopolynom", "pracma"]
     },
     "admixr": {
@@ -40719,8 +40947,8 @@
     },
     "adsoRptionCMF": {
       "name": "adsoRptionCMF",
-      "version": "0.1.0",
-      "sha256": "1hpa5lsjckmcfa2n8c86xvbdr0fv3xi020rizjbrqcg9sxnnpsyc",
+      "version": "0.1.1",
+      "sha256": "1x4x6jhd5s6ifn98mrgiyzk7hzchcvz11ly4dqlwbmldmpw5gnh7",
       "depends": ["Metrics", "boot", "ggplot2", "nls2"]
     },
     "adsoRptionCV": {
@@ -40755,8 +40983,8 @@
     },
     "adwave": {
       "name": "adwave",
-      "version": "1.3",
-      "sha256": "11iy50ng0zxvwsvdsvx262j8zgqaai308lp5is47az7xzvk57mx7",
+      "version": "1.4",
+      "sha256": "1cg04xizy3rp5r0iyhyf8mqmn2jjzs9q9k5d4npyf9jzr0wb5jya",
       "depends": ["waveslim"]
     },
     "adwordsR": {
@@ -40929,9 +41157,9 @@
     },
     "ageutils": {
       "name": "ageutils",
-      "version": "0.0.8",
-      "sha256": "1x8rglljccm0h5x5145hz6d14h7zynarg2ic17brlsflbm3wfcfg",
-      "depends": ["rlang", "tibble"]
+      "version": "0.1.0",
+      "sha256": "0y0afgndm64fzd10rh9n8aiqy0s59sfl7sbc9b9xr4i8virsyaj9",
+      "depends": ["rlang", "tibble", "vctrs"]
     },
     "agfh": {
       "name": "agfh",
@@ -41163,9 +41391,9 @@
     },
     "air": {
       "name": "air",
-      "version": "0.2.2",
-      "sha256": "0r54kq6iiad3g07sz69napw5qx6qp9sx2qp6jy7frynh8s60bss9",
-      "depends": ["httr", "keyring", "rjson"]
+      "version": "0.2.3",
+      "sha256": "0cwn809g0g6jjb6nwmymxlxz5mmjvgzmmjywlnzagggpw7wasqak",
+      "depends": ["httr", "keyring", "result", "rjson"]
     },
     "airGR": {
       "name": "airGR",
@@ -41341,12 +41569,6 @@
       "sha256": "1qqfhfrhqlzlmfdf84sq9v17d6jrnn4w7yilskbrg74zvbcbc3k8",
       "depends": ["Formula", "checkmate", "lmtest", "numDeriv", "optimx", "sandwich"]
     },
-    "ale": {
-      "name": "ale",
-      "version": "0.5.0",
-      "sha256": "19yp1zlhjbzb0qszzc6kszg4mr6cyi7zzllpkzw7q3spjcq7kmpw",
-      "depends": ["S7", "broom", "cli", "dplyr", "furrr", "future", "ggplot2", "insight", "patchwork", "progressr", "purrr", "rlang", "staccuracy", "stringr", "tidyr", "univariateML"]
-    },
     "alfr": {
       "name": "alfr",
       "version": "1.2.1",
@@ -41421,8 +41643,8 @@
     },
     "allelematch": {
       "name": "allelematch",
-      "version": "2.5.4",
-      "sha256": "1zzx9ilxh99grjl2dmzmby0kh9rgd1h2x1hvsaxvxxmnahdsprm2",
+      "version": "2.5.5",
+      "sha256": "0605cky95c0l2abmhkiig74is0h1zdn3ncz8m0ag9gqcvlpp5n0l",
       "depends": ["dynamicTreeCut"]
     },
     "allestimates": {
@@ -41437,6 +41659,12 @@
       "sha256": "198cibnh0x9s1cfkjyz99i8d878z6ds08zfwfp22i2r4pzanhi7w",
       "depends": ["DBI", "bigrquery", "bit64", "cli", "dbplyr", "dplyr", "glue", "lifecycle", "magrittr", "purrr", "rlang", "sessioninfo", "stringr", "tidyr"]
     },
+    "allometry": {
+      "name": "allometry",
+      "version": "0.1.1",
+      "sha256": "1kscdir0dkzn7cqmwdrkqcbjbgfc511vzlxj9h7fkizvysp3rlpl",
+      "depends": []
+    },
     "allomr": {
       "name": "allomr",
       "version": "0.3.0",
@@ -41487,8 +41715,8 @@
     },
     "alphaN": {
       "name": "alphaN",
-      "version": "0.1.0",
-      "sha256": "0asm0r1cqbqan0d5dbb7jffqgrcai2kcpw1l2p9s4qxfff9vliva",
+      "version": "0.1.2",
+      "sha256": "15mbhd5bd80dfll0mxrjh1dxhyc606p9zbffc86h884zlzh9mrxc",
       "depends": []
     },
     "alphaOutlier": {
@@ -41535,8 +41763,8 @@
     },
     "alqrfe": {
       "name": "alqrfe",
-      "version": "1.1",
-      "sha256": "0lzw1sk4iaqzmg1a39v3wxcgj9hchyjcxq7b3nm83al8r75rfvdk",
+      "version": "1.2",
+      "sha256": "0xablian48jg3f45x8c28j5f4bjzzhf3f154f9h3v0lpygkwgswh",
       "depends": ["MASS", "Rcpp", "RcppArmadillo"]
     },
     "alr4": {
@@ -41571,8 +41799,8 @@
     },
     "alternativeROC": {
       "name": "alternativeROC",
-      "version": "0.0.12",
-      "sha256": "0xbbqdl0fv08zwycm84rn9kcwbyh67wlcppj3gphz9k5fx1lb7qc",
+      "version": "1.0.0",
+      "sha256": "09a3rq3m51nw7cvrj3a64m8rkjrlh0slr79wdksg0fihis7lnysb",
       "depends": ["Hmisc", "Rcpp", "pROC", "plyr", "sn"]
     },
     "altfuelr": {
@@ -41661,8 +41889,8 @@
     },
     "ambiorix": {
       "name": "ambiorix",
-      "version": "2.2.0",
-      "sha256": "1kpbfznzxwkmn8svrhhzm2rb2zpbbgx8j4a2pbylmm7040v5hd1g",
+      "version": "2.2.1",
+      "sha256": "10x3rbqh53i61mws32x35b302q7y2zswgmwqa2ykmvd6g1q02a5h",
       "depends": ["assertthat", "cli", "fs", "glue", "httpuv", "log", "webutils", "yyjsonr"]
     },
     "ambit": {
@@ -41775,8 +42003,8 @@
     },
     "analogue": {
       "name": "analogue",
-      "version": "0.18.0",
-      "sha256": "03zxiayrp26kfv1blp7vlbc6j9ff5cjd24fsppp57f27rqag5mnk",
+      "version": "0.18.1",
+      "sha256": "0nwpb9m0lsbm2j2mcxb81cixn5rmjxy5qghnq4mivsm7ss90mhlm",
       "depends": ["MASS", "brglm", "lattice", "mgcv", "princurve", "vegan"]
     },
     "analyzer": {
@@ -41907,9 +42135,9 @@
     },
     "annotater": {
       "name": "annotater",
-      "version": "0.2.3",
-      "sha256": "0ziwkc7z3v8awm7smq38mdj61vjq4qh99d0fmr63sibmg6l3pf7p",
-      "depends": ["dplyr", "purrr", "readr", "rlang", "rstudioapi", "stringi", "stringr", "tibble", "tidyr"]
+      "version": "0.2.4",
+      "sha256": "1z2vzhb49hi861xpjwwijzyywrix9njm3yswvy3h9aqg5m5xjqnn",
+      "depends": ["dplyr", "knitr", "purrr", "readr", "rlang", "rstudioapi", "stringi", "stringr", "tibble", "tidyr"]
     },
     "annotator": {
       "name": "annotator",
@@ -42039,14 +42267,14 @@
     },
     "anytime": {
       "name": "anytime",
-      "version": "0.3.11",
-      "sha256": "1qvb568x99cy68855zsv28llhky1badz34gnp6mdkvz1998qsl7z",
+      "version": "0.3.12",
+      "sha256": "1sqmwsn32dy9qykk90ksl3447pdfgwanlfmpi7pwk26jj6d00hax",
       "depends": ["BH", "Rcpp"]
     },
     "ao": {
       "name": "ao",
-      "version": "1.2.0",
-      "sha256": "1xlvcrdclibnaw9l1x0gmzmg05b5ls59rr46j5fq66d1ama5shzr",
+      "version": "1.2.1",
+      "sha256": "0a6xw5sasv7v12r4vwp5m2n44gay8kvf5bc9bihv5cwg2281xp14",
       "depends": ["R6", "checkmate", "cli", "future_apply", "oeli", "optimizeR", "progressr"]
     },
     "aod": {
@@ -42115,6 +42343,12 @@
       "sha256": "0aq0vj11m8i0ii74ml71km38rrvh7nlxfsd7f1i5ykbmcqks25ay",
       "depends": ["cli", "dbplyr", "lifecycle", "rlang", "sparklyr"]
     },
+    "apc": {
+      "name": "apc",
+      "version": "3.0.0",
+      "sha256": "1ryypindnm1x5k2r24nyn0dnclcvisk3a8x64ris1p2yvs3ak789",
+      "depends": ["AER", "ISLR", "car", "ggplot2", "lattice", "lmtest", "plm", "plyr", "reshape", "survey"]
+    },
     "apcf": {
       "name": "apcf",
       "version": "0.3.2",
@@ -42147,8 +42381,8 @@
     },
     "apex": {
       "name": "apex",
-      "version": "1.0.6",
-      "sha256": "1cz51g7s4xfr7fvjq0cc9iwy9sb3wwdfrblcjr9pacj09bk2myh7",
+      "version": "1.0.7",
+      "sha256": "0inlkn4y8xcp73nikfsyf6lcckwld7jg56haargqz9p3bhwfs7fb",
       "depends": ["adegenet", "ape", "phangorn"]
     },
     "apexcharter": {
@@ -42183,9 +42417,9 @@
     },
     "aplot": {
       "name": "aplot",
-      "version": "0.2.6",
-      "sha256": "1f0cpw0a3q7wxnpn7zslxs94jb3rv8ims0c9i4bgcilqxmb23s95",
-      "depends": ["ggfun", "ggplot2", "ggplotify", "magrittr", "patchwork", "yulab_utils"]
+      "version": "0.2.8",
+      "sha256": "1ykb6cygwlmbz8n18pqkln9l8acfrb2gm9lgbrqp7y7aqxrami4g",
+      "depends": ["ggfun", "ggplot2", "ggplotify", "magrittr", "patchwork", "pillar", "yulab_utils"]
     },
     "aplotExtra": {
       "name": "aplotExtra",
@@ -42357,8 +42591,8 @@
     },
     "arakno": {
       "name": "arakno",
-      "version": "1.3.0",
-      "sha256": "1mbbb4bzcck78wma9nrmpava81cii92rzjq0yl3p38zvnym2i2m9",
+      "version": "1.3.1",
+      "sha256": "00wpsiwspz2b9in0c35a404amrpwjd4h166pm1yvl2v8qw0z1f7q",
       "depends": ["ape", "httr", "jsonlite", "phytools", "rgbif", "rworldmap", "rworldxtra"]
     },
     "arc": {
@@ -42381,9 +42615,9 @@
     },
     "arcgisgeocode": {
       "name": "arcgisgeocode",
-      "version": "0.2.3",
-      "sha256": "0g3cipci6s38xzb1pfz124ngi29l9zdjw79zzzv4w4k71cbckbnr",
-      "depends": ["RcppSimdJson", "arcgisutils", "cli", "curl", "httr2", "jsonify", "rlang", "sf"]
+      "version": "0.3.0",
+      "sha256": "0zhi8gsm7ksw3lkkfqidwm5rlx82f2mz24n5s9lwm9z43ixbyir2",
+      "depends": ["RcppSimdJson", "arcgisutils", "cli", "httr2", "jsonify", "rlang", "sf"]
     },
     "arcgislayers": {
       "name": "arcgislayers",
@@ -42559,6 +42793,12 @@
       "sha256": "1msbd52989yqxqxgapgjvzfzzpkr2w9dp7ig8racqpzwqnjhpswb",
       "depends": ["ltsa"]
     },
+    "argminCS": {
+      "name": "argminCS",
+      "version": "1.1.0",
+      "sha256": "091wpabdfxrnlb54rg5b5z2z5i0n49drf22hcnc5y6xc2b31jdhw",
+      "depends": ["BSDA", "LDATS", "MASS", "Rdpack", "glue", "withr"]
+    },
     "argo": {
       "name": "argo",
       "version": "3.0.2",
@@ -42621,8 +42861,8 @@
     },
     "arima2": {
       "name": "arima2",
-      "version": "3.3.0",
-      "sha256": "115igm3g8hd0ccs5si7siwr56hynjj84abrivg9ri4zld7vc8lws",
+      "version": "3.4.0",
+      "sha256": "0r5c1sixlvmbj6h7qgyf64zbg6x65lrlc2djlmnj1kk26xbj71qm",
       "depends": ["ggplot2"]
     },
     "arkdb": {
@@ -42649,6 +42889,12 @@
       "sha256": "1g8732naydqyv5pq1fkyb1i6qddv62jdmn2ys5lbdvx2zq5cnns2",
       "depends": ["MASS", "Matrix", "abind", "coda", "lme4", "nlme"]
     },
+    "armaOptions": {
+      "name": "armaOptions",
+      "version": "1.0.0",
+      "sha256": "0xbaqph01ghx7pssilina8z5r0h5mjrkv3gyzrfkn7jipmymb2jq",
+      "depends": ["forecast"]
+    },
     "armspp": {
       "name": "armspp",
       "version": "0.0.2",
@@ -42711,8 +42957,8 @@
     },
     "arrow": {
       "name": "arrow",
-      "version": "20.0.0.2",
-      "sha256": "19xnz3df1r9n01dbsf05xkw6q5w8vipzkkb5bpx7jlcp38jnp8zn",
+      "version": "21.0.0",
+      "sha256": "1ipwcgzbzr5xb1ff0ikwxdfhbniqdjmvi4505cmb0divg9p50946",
       "depends": ["R6", "assertthat", "bit64", "cpp11", "glue", "purrr", "rlang", "tidyselect", "vctrs"]
     },
     "arrowheadr": {
@@ -42765,8 +43011,8 @@
     },
     "arulesCBA": {
       "name": "arulesCBA",
-      "version": "1.2.7",
-      "sha256": "0d8nfqbk3y4vw5n3xnns2gy9jwj07a1zbaag9n0hmxrcs8m5ml83",
+      "version": "1.2.8",
+      "sha256": "1jx9zgzpfwg89vpxllg6s14mlaz4lyi3l5lvas79rznjhbsb7l35",
       "depends": ["Matrix", "arules", "discretization", "glmnet"]
     },
     "arulesNBMiner": {
@@ -42939,8 +43185,8 @@
     },
     "asremlPlus": {
       "name": "asremlPlus",
-      "version": "4.4.48",
-      "sha256": "0vxv7018ygs11hzya290365i02h55xfnxsxnkv32bb3rf2d2p5w5",
+      "version": "4.4.49",
+      "sha256": "09wj9mgalrk3ky5r22zsbv1949gh9is8g4lgpcjir2z0gdgad4gg",
       "depends": ["RColorBrewer", "dae", "devtools", "doParallel", "dplyr", "foreach", "ggplot2", "nloptr", "qqplotr", "reshape2", "rlang", "sticky", "stringr", "tryCatchLog"]
     },
     "r_assert": {
@@ -43173,8 +43419,8 @@
     },
     "atrrr": {
       "name": "atrrr",
-      "version": "0.1.0",
-      "sha256": "1h3qizyhi59lh6n11z8kl0af6x8r0k0jd63njl4bkg4l7b2l3b4b",
+      "version": "0.1.1",
+      "sha256": "1n5d5dmim3hns9ckbkascl1b9f3kim8m5nivn2xynql5w0lnf8rh",
       "depends": ["cli", "glue", "httr2", "purrr", "rlang", "snakecase", "stringr", "tibble"]
     },
     "attachment": {
@@ -43275,8 +43521,8 @@
     },
     "auk": {
       "name": "auk",
-      "version": "0.8.1",
-      "sha256": "18kkbvkrv1bqmz46hb5mmwy5mc5x5wja424zjwzp45n0syi3l6ax",
+      "version": "0.8.2",
+      "sha256": "15ganiamcg1adppqf6gxriacm3wspqi796m0iigxzfm2q5imfmam",
       "depends": ["assertthat", "countrycode", "dplyr", "httr", "magrittr", "readr", "rlang", "stringi", "stringr", "tidyr"]
     },
     "aum": {
@@ -43299,8 +43545,8 @@
     },
     "authoritative": {
       "name": "authoritative",
-      "version": "0.1.0",
-      "sha256": "106873mng2vljmgbragjr2awkfgp40dfhj60y7mjfv3k7al37661",
+      "version": "0.2.0",
+      "sha256": "1ky825v1z71xj0w7rj6l6ijzhj0f6kd3kk72c62mjs6h9bdfi9qd",
       "depends": ["stringi"]
     },
     "auto_pca": {
@@ -43339,12 +43585,6 @@
       "sha256": "1k3h2gsck06dnvrifg9rhxi6b3fwfjrkvg0q2wzb9kdnnzgiwcln",
       "depends": ["FNN", "LatticeKrig", "MASS", "RSpectra", "Rcpp", "RcppEigen", "RcppParallel", "fields", "filehash", "filehashSQLite", "filematrix", "mgcv", "spam"]
     },
-    "autoGO": {
-      "name": "autoGO",
-      "version": "1.0.1",
-      "sha256": "0gd7kgnq390wzg5j1v8x4793mdc5hjyyag1b7hibkjqan2jfzj0q",
-      "depends": ["ComplexHeatmap", "DESeq2", "GSVA", "RColorBrewer", "SummarizedExperiment", "ape", "dichromat", "dplyr", "enrichR", "ggplot2", "ggrepel", "imguR", "msigdbr", "openxlsx", "purrr", "readr", "reshape2", "stringr", "textshape", "tibble", "tidyr", "tidyselect"]
-    },
     "autoMFA": {
       "name": "autoMFA",
       "version": "1.0.0",
@@ -43383,15 +43623,15 @@
     },
     "autocogs": {
       "name": "autocogs",
-      "version": "0.1.4",
-      "sha256": "0v27l9a0ysj7x9wjka1jl1bq9rmxmzldclcp1w59a6807wjlszhx",
+      "version": "0.1.5",
+      "sha256": "0asb26xp082wbn2zsawvbd9cf3in4pvw5d58rfsy0swa2187w3yh",
       "depends": ["MASS", "broom", "checkmate", "diptest", "dplyr", "ggplot2", "hexbin", "mclust", "moments", "progress", "tibble"]
     },
     "autodb": {
       "name": "autodb",
-      "version": "2.3.1",
-      "sha256": "0vkn90w3xpd1cgm7g3idjd0q1rj8nin146asysvzaixaqpm4h9s1",
-      "depends": ["rlang"]
+      "version": "3.0.0",
+      "sha256": "1sa86wyrvksxmsfplq6c14h8lcl5wj069ivqrac3x6bkk0hxc78d",
+      "depends": []
     },
     "autogam": {
       "name": "autogam",
@@ -43399,6 +43639,12 @@
       "sha256": "1152nz7v4zxgq8wqkbss92pm13l77qs36kz3y6d8fiqryl8g1a0j",
       "depends": ["cli", "dplyr", "mgcv", "purrr", "rlang", "staccuracy", "stringr", "univariateML"]
     },
+    "autograph": {
+      "name": "autograph",
+      "version": "0.1.2",
+      "sha256": "1h3raj1l1q78xachspzsv280j0d2c6ac9ah2fzczrs2da07gjb46",
+      "depends": ["cli", "dplyr", "ggdendro", "ggplot2", "manynet", "tidyr"]
+    },
     "autoharp": {
       "name": "autoharp",
       "version": "0.0.12",
@@ -43437,14 +43683,14 @@
     },
     "automap": {
       "name": "automap",
-      "version": "1.1-16",
-      "sha256": "0vvpmadpdjanriqx866g8dyabv27104svnmymfz7azmijvwp4yna",
+      "version": "1.1-20",
+      "sha256": "1vcqdl691gr90pn4sbzniiaqarjwc3narbnbm3qrshz5awpk45wz",
       "depends": ["ggplot2", "gstat", "lattice", "reshape", "sf", "sp", "stars"]
     },
     "automatedtests": {
       "name": "automatedtests",
-      "version": "0.1.1",
-      "sha256": "1dq9a3chyd48anigr66msdrfnm4dl7wwrhpyq3fs2k1qp6vgw82b",
+      "version": "0.1.2",
+      "sha256": "0vdx7mj0wbapk0f2krjd52whhc7s8wg5ain05np25f096l9iypaa",
       "depends": ["DescTools", "R6", "nnet", "nortest"]
     },
     "autometric": {
@@ -43479,8 +43725,8 @@
     },
     "autoslider_core": {
       "name": "autoslider.core",
-      "version": "0.2.5",
-      "sha256": "1xf95qbxna6rh8x6bn6024l57v4aa3rwh0vlz6b0r0a6lnn39xf3",
+      "version": "0.2.7",
+      "sha256": "1cwidh4j1qw69c3ghbgnkxkpjy6kd6nrf221257kh95w94fvsys5",
       "depends": ["assertthat", "checkmate", "cli", "dplyr", "flextable", "forcats", "ggplot2", "ggpubr", "gridExtra", "gtsummary", "officer", "rlang", "rlistings", "rtables", "rvg", "stringr", "survival", "tern", "tidyr", "yaml"]
     },
     "autostats": {
@@ -43533,8 +43779,8 @@
     },
     "avesperu": {
       "name": "avesperu",
-      "version": "0.0.5",
-      "sha256": "1z5md68arn2hy2jvlimgn3xfj0j5rapsn6r4wmvld801lzv1imaj",
+      "version": "0.0.6",
+      "sha256": "080p3g515gx9qh1anmr6xiq0imxxywzymc0ik5wb499ws6ydr5lp",
       "depends": []
     },
     "avidaR": {
@@ -43543,6 +43789,12 @@
       "sha256": "1rm37lsmi5cyrkdpb55hr5m1pklwv5czzk4m1dzqzdvn4qp95ms7",
       "depends": ["R6", "RColorBrewer", "base64enc", "circlize", "curl", "dplyr", "httr", "readr", "tibble", "tidyr", "xml2"]
     },
+    "avilistr": {
+      "name": "avilistr",
+      "version": "0.0.1",
+      "sha256": "1yyhpf8jk4ymql19gvb071g9vrvxsixqwfp14yxgbjzmghpsa4j7",
+      "depends": []
+    },
     "avlm": {
       "name": "avlm",
       "version": "0.1.0",
@@ -43561,6 +43813,12 @@
       "sha256": "1qr9yhwrllpk0drg3s1r4f5hsx78yfys6nyj2vdk70n8na102243",
       "depends": ["TreeTools", "ape", "doParallel", "doSNOW", "dplyr", "foreach", "phytools", "snow", "stringr", "tidytree"]
     },
+    "avseqmc": {
+      "name": "avseqmc",
+      "version": "1.0.1",
+      "sha256": "0f6xsw6kyr54w1vf5yfi23l74d3q872impqxwgvnl93mp71mm0ld",
+      "depends": []
+    },
     "awdb": {
       "name": "awdb",
       "version": "0.1.2",
@@ -43665,8 +43923,8 @@
     },
     "aws_wrfsmn": {
       "name": "aws.wrfsmn",
-      "version": "0.0.5",
-      "sha256": "0xkbf6ydn6l177q6ch99ymriq1y46hqlkah3sxl3db30ihkhrkrd",
+      "version": "0.1.0",
+      "sha256": "1sszc8nqyph8ly4wvfmqgbm6qf09spb94wz5rfsqmz3j6acvip7b",
       "depends": ["aws_s3", "dplyr", "ggplot2", "hydroGOF", "lubridate", "magrittr", "terra"]
     },
     "awsMethods": {
@@ -43695,8 +43953,8 @@
     },
     "b64": {
       "name": "b64",
-      "version": "0.1.6",
-      "sha256": "1ccac83ppsfpf6jlh3q368p7yfdk9qgykr7hv7n7aphiq23nl39r",
+      "version": "0.1.7",
+      "sha256": "1vx0x31php5cy07wayq26hh0hgcmjfkmw1mjhz2dc7k7040ky9ab",
       "depends": []
     },
     "bRacatus": {
@@ -43719,8 +43977,8 @@
     },
     "bSims": {
       "name": "bSims",
-      "version": "0.3-2",
-      "sha256": "1aflarz69rk4dlrp5gmgi6hs6mx0m8xhpp7ppv6m5gsjf8g18iaf",
+      "version": "0.3-3",
+      "sha256": "0cahjnn2ip1iv63ym22qb6hrgpz7hsd6nzw06b7mqwx15mrwdw1q",
       "depends": ["MASS", "deldir", "intrval", "mefa4", "pbapply"]
     },
     "bWGR": {
@@ -43735,12 +43993,6 @@
       "sha256": "199cdbwphpz6ds19841s32bm2rjd7b6v484bvaskw94z0d8bcn6w",
       "depends": ["DT", "miniUI", "qrcode", "rstudioapi", "shiny"]
     },
-    "baRulho": {
-      "name": "baRulho",
-      "version": "2.1.3",
-      "sha256": "15mk65an0cg4mvhiyh4xksb11wdpm6b7prpdc978zgw2i0xsw5qj",
-      "depends": ["Sim_DiffProc", "checkmate", "cli", "fftw", "ohun", "png", "rlang", "seewave", "tuneR", "viridis", "warbleR"]
-    },
     "babel": {
       "name": "babel",
       "version": "0.3-0",
@@ -43755,9 +44007,9 @@
     },
     "babelmixr2": {
       "name": "babelmixr2",
-      "version": "0.1.7",
-      "sha256": "1fgifa1ibq423vhgqzmhvryngszwvjhcnkl6q0ws95y3q9p449wk",
-      "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "checkmate", "cli", "digest", "lotri", "monolix2rx", "nlmixr2", "nlmixr2est", "nonmem2rx", "qs", "rex", "rxode2"]
+      "version": "0.1.8",
+      "sha256": "0ifvi00m5nxkkjqyxbb36xai90pk3a7znbd4bfy6y2nvkxzs7gx7",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "checkmate", "cli", "digest", "lotri", "magrittr", "monolix2rx", "nlmixr2data", "nlmixr2est", "nlmixr2extra", "nlmixr2plot", "nonmem2rx", "qs", "rex", "rxode2"]
     },
     "babelwhale": {
       "name": "babelwhale",
@@ -43803,8 +44055,8 @@
     },
     "backbone": {
       "name": "backbone",
-      "version": "2.1.4",
-      "sha256": "05b493cfzi85hnczl56d81sc7j5xfwybsmnc4i4q984sw0gpgvll",
+      "version": "2.1.5",
+      "sha256": "0pan4lpmr02d57kp0xjj0vj4g7ba548f839w5k1lmsgqaybzqwq2",
       "depends": ["Matrix", "Rcpp", "igraph"]
     },
     "backpipe": {
@@ -43857,8 +44109,8 @@
     },
     "badger": {
       "name": "badger",
-      "version": "0.2.4",
-      "sha256": "1d41xcynl2g63mb4qmhkj8hrs193fq7n0ymh6v2ygabn2n6029kc",
+      "version": "0.2.5",
+      "sha256": "17x1307qm826lvd4awr4b0s2m66byjmq784sdc8aa3bqz20mrlr4",
       "depends": ["desc", "dlstats", "rvcheck", "usethis"]
     },
     "baf": {
@@ -43875,8 +44127,8 @@
     },
     "bage": {
       "name": "bage",
-      "version": "0.9.0",
-      "sha256": "0gwi563bgryxcvp3lw06qk9cp7blnz0272l87s3avk9n7gr75f7j",
+      "version": "0.9.4",
+      "sha256": "0rs98g8klrpcjzz66xnk5c2j5hjnv0h73b0i49xyk5j3g7jqlydz",
       "depends": ["Matrix", "RcppEigen", "TMB", "cli", "generics", "poputils", "rvec", "sparseMVN", "tibble", "vctrs"]
     },
     "bagged_outliertrees": {
@@ -43893,8 +44145,8 @@
     },
     "baggr": {
       "name": "baggr",
-      "version": "0.7.8",
-      "sha256": "18faz6b8llzxsrm60bnsanplc8d7knb8cmcz34nyai7i7022061k",
+      "version": "0.7.11",
+      "sha256": "10vv8dl0b53i57x7r9vc64jpksvkrj7blis6hfi2h30v2jzhwnlv",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayesplot", "crayon", "forestplot", "ggplot2", "ggplotify", "ggrepel", "gridExtra", "rstan", "rstantools", "testthat"]
     },
     "baguette": {
@@ -44019,8 +44271,8 @@
     },
     "banffIT": {
       "name": "banffIT",
-      "version": "1.0.0",
-      "sha256": "0b37j8xg2rg7gisp2m1rqvjfffqj0yfz54bq2fl0wckmgknkz05c",
+      "version": "2.0.0",
+      "sha256": "0kk4byvn870c85apnz2ff733fpkxzi007sm6ai2r36arh6nl9v64",
       "depends": ["crayon", "dplyr", "fabR", "fs", "lubridate", "madshapR", "rlang", "stringr", "tidyr"]
     },
     "bang": {
@@ -44115,8 +44367,8 @@
     },
     "bartXViz": {
       "name": "bartXViz",
-      "version": "1.0.3",
-      "sha256": "1n245s222di90afrv636yzzkv1fmx9yisxhcmbr4svcgk97zwhmj",
+      "version": "1.0.8",
+      "sha256": "0vrwpxjc06nxlj0ahi8vnf4n6jsjarrqi6x1498658d5kvys6fjb",
       "depends": ["BART", "Rcpp", "RcppArmadillo", "SuperLearner", "abind", "bartMachine", "data_table", "dbarts", "dplyr", "forcats", "foreach", "ggfittext", "ggforce", "gggenes", "ggplot2", "ggpubr", "gridExtra", "missForest", "reshape2", "stringr", "tidyr"]
     },
     "bartcs": {
@@ -44181,8 +44433,8 @@
     },
     "baseline": {
       "name": "baseline",
-      "version": "1.3-6",
-      "sha256": "0ywfkgixahx21mqq81wmr3zcfcrm1vsspsf47dj750iwcpdhwcnz",
+      "version": "1.3-7",
+      "sha256": "1v5w93vkdjyj6nj6jahppn0zpbsvvxkqq35k3fh58q354177kd6a",
       "depends": ["SparseM"]
     },
     "basemaps": {
@@ -44373,8 +44625,8 @@
     },
     "bayes4psy": {
       "name": "bayes4psy",
-      "version": "1.2.12",
-      "sha256": "1i6yc871bbygj6sw2v2l0diiz03n3n4mw46n905fsjkpdrx8rfhj",
+      "version": "1.2.13",
+      "sha256": "092jrk52ax1i36m5jcnnp3a3fqd6s1gyjk1725d3wzhh0zaavkr7",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "circular", "cowplot", "dplyr", "emg", "ggplot2", "mcmcse", "metRology", "reshape", "rstan", "rstantools"]
     },
     "bayesAB": {
@@ -44385,8 +44637,8 @@
     },
     "bayesCureRateModel": {
       "name": "bayesCureRateModel",
-      "version": "1.3",
-      "sha256": "0h3sq3yydzkr9f0j0n32w8x8an0ckl5q85yiz7c63c535wxhhdg0",
+      "version": "1.4",
+      "sha256": "000w6421kc3d6cldhd35s0791qzj38np8vl6z8czwdvif623sph3",
       "depends": ["HDInterval", "Rcpp", "RcppArmadillo", "VGAM", "calculus", "coda", "doParallel", "flexsurv", "foreach", "mclust", "survival"]
     },
     "bayesDP": {
@@ -44469,15 +44721,15 @@
     },
     "bayesRecon": {
       "name": "bayesRecon",
-      "version": "0.3.2",
-      "sha256": "05x6x95dka571pidm4bs531qbnfrj59x81ji9h2n8iccfnqx38yl",
+      "version": "0.3.3",
+      "sha256": "08dy4mw39vh57rwnwm70d7agpi8l3j8h40pi5jpijbc4sx89n0hc",
       "depends": ["lpSolve"]
     },
     "bayesSSM": {
       "name": "bayesSSM",
-      "version": "0.5.0",
-      "sha256": "1aqkrn6jmq1bpvy3j3mv10jy8hz84g0j7kp78jdzqz9msfd6ljwd",
-      "depends": ["MASS", "dplyr", "future", "future_apply", "lifecycle"]
+      "version": "0.6.1",
+      "sha256": "10s3afd35qd88v90kb7nn7b61k4riv2qaxwhydwgx4a8kh53cybi",
+      "depends": ["MASS", "Rcpp", "dplyr", "future", "future_apply", "lifecycle"]
     },
     "bayesSurv": {
       "name": "bayesSurv",
@@ -44635,6 +44887,12 @@
       "sha256": "1l6i8qh7l53x0133gjc5jvri4vnnfviq9y3mcr1kfa5j84gfnmsf",
       "depends": ["MCMCpack", "Rcpp", "RcppArmadillo", "dplyr", "dygraphs", "furrr", "future", "ggplot2", "leaflet", "lubridate", "magrittr", "progress", "progressr", "purrr", "rlang", "sf", "shiny", "tictoc", "tidyr"]
     },
+    "bayesmsm": {
+      "name": "bayesmsm",
+      "version": "1.0.0",
+      "sha256": "02j5r06l5fddsdcla6bhy1wqdzjcdsjjfy0ixfvxx6bjpm2lj7jz",
+      "depends": ["MCMCpack", "R2jags", "coda", "doParallel", "foreach", "ggplot2"]
+    },
     "bayesnec": {
       "name": "bayesnec",
       "version": "2.1.3.0",
@@ -44649,8 +44907,8 @@
     },
     "bayesplot": {
       "name": "bayesplot",
-      "version": "1.12.0",
-      "sha256": "1savil71px6p6nsz01jj4fapzccz62aqbb80fman5ysk5slyaqxi",
+      "version": "1.13.0",
+      "sha256": "1xshvrk95vspilkp1qw24plclfrjajw34ffvznjkfryzrz0sisxx",
       "depends": ["dplyr", "ggplot2", "ggridges", "glue", "posterior", "reshape2", "rlang", "tibble", "tidyr", "tidyselect"]
     },
     "bayespm": {
@@ -44685,8 +44943,8 @@
     },
     "bayestestR": {
       "name": "bayestestR",
-      "version": "0.16.0",
-      "sha256": "0zcqfqx3my6rdxzq3miq0plmdrj4czynax3zhp7x1ac4als1dyl3",
+      "version": "0.16.1",
+      "sha256": "1avk3ddii1cwnzhi72mmxs1p756cczxhlhz3rlb1s0783fagyhbd",
       "depends": ["datawizard", "insight"]
     },
     "bayesvl": {
@@ -44713,12 +44971,6 @@
       "sha256": "0lsp9g9xjwwf2znh4vld41pgdn55ncvmdsyg84ifhdqzjrsgwc6f",
       "depends": ["rlang", "stringr"]
     },
-    "bayou": {
-      "name": "bayou",
-      "version": "2.3.1",
-      "sha256": "0i0zkag8mrjdr7w4489gp6bf5mykcnnwgi31ypjk52y09haz7a5n",
-      "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "ape", "assertthat", "coda", "denstrip", "fitdistrplus", "foreach", "geiger", "mnormt", "phytools"]
-    },
     "baystability": {
       "name": "baystability",
       "version": "0.2.0",
@@ -44769,8 +45021,8 @@
     },
     "bbnet": {
       "name": "bbnet",
-      "version": "1.1.0",
-      "sha256": "1nyfjfqrnwp0438kjjb126gi5pkdbrcfif79521d5248zyr8hvr6",
+      "version": "1.2.0",
+      "sha256": "1p8y0qhkvqpkssv3akij25wv6r4937rw4irjx2f97zbyrii23c01",
       "depends": ["dplyr", "ggplot2", "igraph", "tibble"]
     },
     "bbotk": {
@@ -44785,6 +45037,12 @@
       "sha256": "0mi2834v4cvrhvpnzkb4lgkqq993c3c1yzsxdnmny4p6yxw1q547",
       "depends": ["Formula", "expint", "pbapply", "statmod"]
     },
+    "bbssr": {
+      "name": "bbssr",
+      "version": "1.0.2",
+      "sha256": "1022fpahabbk7bza3yp0z0qil0skrdpmpqcnyi1zfdsxwch1dfq3",
+      "depends": ["fpCompare"]
+    },
     "bbw": {
       "name": "bbw",
       "version": "0.3.0",
@@ -44803,6 +45061,12 @@
       "sha256": "0g0z4z3dw4mjp4dpa0d6bz46700jibixhlh2jj62z2l7qz5140cy",
       "depends": ["Rcpp", "RcppArmadillo", "boot", "nnet", "rgl"]
     },
+    "bcRP": {
+      "name": "bcRP",
+      "version": "1.0.1",
+      "sha256": "1a3hs1kkrsc3ip5a10cgw8mm0zng7kpmpiyj914fpr6f61hfcv00",
+      "depends": ["httr2", "readr", "tibble", "yyjsonr"]
+    },
     "bcaboot": {
       "name": "bcaboot",
       "version": "0.2-3",
@@ -44931,8 +45195,8 @@
     },
     "bdots": {
       "name": "bdots",
-      "version": "1.2.5",
-      "sha256": "18sciji8xy1s53d7d5q1g5zqdn25wd7w5vyiisigf54sbz13vqg6",
+      "version": "2.0.0",
+      "sha256": "1kd33m1p3pzi2fvfda85yyglki8jll5hzslzxyrq2hfxkjxvica7",
       "depends": ["data_table", "ggplot2", "gridExtra", "mvtnorm", "nlme"]
     },
     "bdpar": {
@@ -45183,9 +45447,9 @@
     },
     "bennu": {
       "name": "bennu",
-      "version": "0.3.0",
-      "sha256": "04vgpk549fr5wwg11f5979iqd40yqamdch46vwxb57wxhraphcxy",
-      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "ggplot2", "glue", "lifecycle", "magrittr", "rlang", "rstan", "rstantools", "scales", "tidybayes", "tidyr"]
+      "version": "0.3.1",
+      "sha256": "08fzjy7s7xnbyzfnk9hrbn1w4w828xbin0nb6fjgsapangkc7c8y",
+      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "generics", "ggplot2", "glue", "lifecycle", "magrittr", "rlang", "rstan", "rstantools", "scales", "tidybayes", "tidyr"]
     },
     "bentcableAR": {
       "name": "bentcableAR",
@@ -45195,14 +45459,14 @@
     },
     "benthos": {
       "name": "benthos",
-      "version": "1.3-8",
-      "sha256": "0pznxnf4wl47wc926diaf4h6x12grc9vxbzd8d4d5j18dp3wvr5z",
+      "version": "1.3-9",
+      "sha256": "16nlk271b5hwzmflp4skvyi46crxr0qa0ick2ac68xnx2ax8rw2c",
       "depends": ["dplyr", "lazyeval", "readr"]
     },
     "berryFunctions": {
       "name": "berryFunctions",
-      "version": "1.22.5",
-      "sha256": "1kd1r8ha1dggqmpiiwxvgfk5igshkfaqnkhkrjn7s79xqz2bsq1k",
+      "version": "1.22.13",
+      "sha256": "0lfz6mr1d3gi33dx9kf8c2cynxb94w7fs02iwrl4rh9cca8x3wd0",
       "depends": ["abind"]
     },
     "bespatial": {
@@ -45291,14 +45555,14 @@
     },
     "betapart": {
       "name": "betapart",
-      "version": "1.6",
-      "sha256": "1ap1z9pvih66la7qh1bfihq0s5csnacgnx3i31gnj5ylaf72z9ds",
+      "version": "1.6.1",
+      "sha256": "1kvyp48gs0kbvbc4ychadj8yjpynpgzayxrgjdny8jsv7p4xvixh",
       "depends": ["ape", "doSNOW", "fastmatch", "foreach", "geometry", "itertools", "minpack_lm", "picante", "rcdd", "snow"]
     },
     "betaper": {
       "name": "betaper",
-      "version": "1.1-2",
-      "sha256": "0gh5xjimg0wgv626g3y34mvgrji2aylnm89iwadg7d6g4s457ynp",
+      "version": "1.1-3",
+      "sha256": "1ibz5shmjmfb4kwsgyhal7qx5017x9vqwszghsx3nna2lqxc4b3k",
       "depends": ["vegan"]
     },
     "betareg": {
@@ -45357,8 +45621,8 @@
     },
     "bfboin": {
       "name": "bfboin",
-      "version": "0.1.0",
-      "sha256": "0mjk8384ram3ywxnclnrwz5483260b9vvbzshzs3adc6h872fqdz",
+      "version": "0.1.1",
+      "sha256": "019wd3lwqlqq6in3933lika0kbf3dg52f5w3il6dfq6nm7f8v9nf",
       "depends": ["BOIN", "purrr"]
     },
     "bfboinet": {
@@ -45381,9 +45645,9 @@
     },
     "bfsMaps": {
       "name": "bfsMaps",
-      "version": "1.99.3",
-      "sha256": "1sjvlfwcp52l2bpnbbalrcr978lwmkrr9kz47jvnkgy3vg9ppd14",
-      "depends": ["DescTools", "sf"]
+      "version": "1.99.4",
+      "sha256": "0cs6m8z9l8g4pfkhzckj2zjdslibig9azizqcjfx5xf0m0iz8g02",
+      "depends": ["DescTools", "httr", "sf"]
     },
     "bfsl": {
       "name": "bfsl",
@@ -45451,6 +45715,12 @@
       "sha256": "0iw36qifawm5jlsjzv4y4kl228hz4clbgzf02dpxv7579nlnibm7",
       "depends": []
     },
+    "bhetGP": {
+      "name": "bhetGP",
+      "version": "1.0.1",
+      "sha256": "0jz7h5j20wrxh52rylhg0fmkdf679064q5rz41c8g1m814d8i33d",
+      "depends": ["FNN", "GPvecchia", "GpGp", "Matrix", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "hetGP", "laGP", "mvtnorm"]
+    },
     "bhm": {
       "name": "bhm",
       "version": "1.19",
@@ -45483,9 +45753,9 @@
     },
     "bibliometrix": {
       "name": "bibliometrix",
-      "version": "5.0.1",
-      "sha256": "1ylyxrjpd9cdd18nyyvspw3zdr7lkh0p3chk5xzg4dz870acmkg0",
-      "depends": ["DT", "Matrix", "SnowballC", "bibliometrixData", "ca", "dimensionsR", "dplyr", "forcats", "ggplot2", "ggrepel", "igraph", "openalexR", "openxlsx", "plotly", "pubmedR", "purrr", "readr", "readxl", "rscopus", "shiny", "stringdist", "stringi", "stringr", "tidyr", "tidytext", "visNetwork"]
+      "version": "5.1.0",
+      "sha256": "1gshkp6z4pl598777kc0427qqa0dz2n1hbkzww4asb14ixn6hvnv",
+      "depends": ["DT", "Matrix", "SnowballC", "bibliometrixData", "ca", "dimensionsR", "dplyr", "forcats", "ggplot2", "ggrepel", "igraph", "openalexR", "openxlsx", "plotly", "pubmedR", "purrr", "readr", "readxl", "rscopus", "shiny", "shinycssloaders", "stringdist", "stringi", "stringr", "tibble", "tidyr", "tidytext", "visNetwork"]
     },
     "bibliometrixData": {
       "name": "bibliometrixData",
@@ -45543,8 +45813,8 @@
     },
     "bidsr": {
       "name": "bidsr",
-      "version": "0.1.0",
-      "sha256": "1c3p6bnn27f11mv28fm50gfm03k81y6lfm1lnnh6pw5wsagzzjbn",
+      "version": "0.1.1",
+      "sha256": "0nk1yqh4zkrzx18amjxhgp3amwicyk1inq178sppdgplqzxwkvkg",
       "depends": ["S7", "checkmate", "data_table", "fastmap", "fs", "jsonlite", "nanotime", "uuid"]
     },
     "bidux": {
@@ -45567,8 +45837,8 @@
     },
     "bigBits": {
       "name": "bigBits",
-      "version": "1.3",
-      "sha256": "1aajx0cg3ljjmvc50qx3v2halqksj54i2krcm7ib33cnqaxzbfbb",
+      "version": "1.4",
+      "sha256": "0r70s63l2mzkliwdsb9q2bw4x23qinlzw9sgsra5sa1j2sl6yxxg",
       "depends": ["Rmpfr", "gmp"]
     },
     "bigD": {
@@ -45627,8 +45897,8 @@
     },
     "bigassertr": {
       "name": "bigassertr",
-      "version": "0.1.6",
-      "sha256": "0bk11jinlc1cvm6aaq9mccs9i328b8s2lbwq63a42fgf1qng103p",
+      "version": "0.1.7",
+      "sha256": "0py8nr937ddi6c7r2bcqrpvqkh1mhmk5ylnrmqlahawnwmpksm6g",
       "depends": []
     },
     "bigchess": {
@@ -45753,8 +46023,8 @@
     },
     "bigstatsr": {
       "name": "bigstatsr",
-      "version": "1.6.1",
-      "sha256": "1c445mm11gsvs2sqmrblig1d3456vwb1n3rz08mhkpxghjaf4dci",
+      "version": "1.6.2",
+      "sha256": "0nr99132jf3w773z8j47n4m2j4v4aijj143cf051qrmfrx7a8fgy",
       "depends": ["RSpectra", "Rcpp", "RcppArmadillo", "bigassertr", "bigparallelr", "cowplot", "foreach", "ggplot2", "ps", "rmio", "tibble"]
     },
     "bigstep": {
@@ -45783,9 +46053,9 @@
     },
     "bigutilsr": {
       "name": "bigutilsr",
-      "version": "0.3.4",
-      "sha256": "096h0v277n39bvipfbfd730lz3qkplfnv58zmzsyy3al9f7lajxl",
-      "depends": ["RSpectra", "Rcpp", "bigassertr", "bigparallelr", "nabor", "robustbase"]
+      "version": "0.3.11",
+      "sha256": "1wiy8dc1sawb6w1pchzihlb0v52asnajbgjnl6h9ii5vj31z5irw",
+      "depends": ["RSpectra", "Rcpp", "RcppArmadillo", "RcppEigen", "bigassertr", "bigparallelr", "nabor", "robustbase"]
     },
     "bikeshare14": {
       "name": "bikeshare14",
@@ -45855,8 +46125,8 @@
     },
     "binaryRL": {
       "name": "binaryRL",
-      "version": "0.8.7",
-      "sha256": "1f6lc14i479rv7c6k2bjn8x53g6q5jycxy9k7c8gxcl8i19sn0bj",
+      "version": "0.9.0",
+      "sha256": "0a08rhlp65i2p4yywcyijcd3jym0pabxadjv2m456c627s5g7akp",
       "depends": ["doFuture", "doRNG", "foreach", "future", "progressr"]
     },
     "binb": {
@@ -46029,9 +46299,9 @@
     },
     "bioRad": {
       "name": "bioRad",
-      "version": "0.9.1",
-      "sha256": "19qngdvpsbfv2swmyfjy85mqkmp3wh88kckm769zj58wish0fmkk",
-      "depends": ["assertthat", "curl", "dplyr", "fields", "ggplot2", "glue", "jsonlite", "lubridate", "lutz", "raster", "readr", "rhdf5", "rlang", "sf", "sp", "stringr", "suntools", "tidyr", "tidyselect", "viridis", "viridisLite"]
+      "version": "0.10.0",
+      "sha256": "1da7jj544ygz6kxbbr0wx11ygm53r21vv5zpx4cfjhnpcs26c33d",
+      "depends": ["assertthat", "curl", "dplyr", "fields", "ggplot2", "glue", "jsonlite", "lifecycle", "lubridate", "lutz", "raster", "readr", "rhdf5", "rlang", "sf", "sp", "stringr", "suntools", "tidyr", "tidyselect", "viridis", "viridisLite"]
     },
     "bioSNR": {
       "name": "bioSNR",
@@ -46071,8 +46341,8 @@
     },
     "biogeom": {
       "name": "biogeom",
-      "version": "1.4.3",
-      "sha256": "0wzj99ldk0654s1a8d1b4q57mahv4mjzndx5bj1hakmsdrwa6q8b",
+      "version": "1.4.4",
+      "sha256": "166ll1yvygxnh79lry1yfr5c4pz9cz905wh1qll96mqln97zbxf3",
       "depends": ["spatstat_geom"]
     },
     "biogram": {
@@ -46125,8 +46395,8 @@
     },
     "biometryassist": {
       "name": "biometryassist",
-      "version": "1.3.0",
-      "sha256": "01k1p3a2y8fiz1g0mx4rykcaywl3vkr5mc2pka9dlr8h0pvwd0wk",
+      "version": "1.3.1",
+      "sha256": "1aylsj1yyj3whndhzzk40s2v8ihigjlmvf7px01pa75c07zjbrlv",
       "depends": ["agricolae", "askpass", "cowplot", "curl", "emmeans", "ggplot2", "lattice", "multcompView", "pracma", "rlang", "scales", "stringi", "xml2"]
     },
     "biomod2": {
@@ -46191,8 +46461,8 @@
     },
     "biostat3": {
       "name": "biostat3",
-      "version": "0.2.2",
-      "sha256": "0gggiqnbflqx4h89wk17k556ifn26mz07czfpy5zq2pr2y6qfqjd",
+      "version": "0.2.3",
+      "sha256": "1jd1clvhgf67znrrlqdi0x7l67jl9ml109c9l92jkqkbgi595zx4",
       "depends": ["MASS", "survival"]
     },
     "biostats101": {
@@ -46257,8 +46527,8 @@
     },
     "birdie": {
       "name": "birdie",
-      "version": "0.6.1",
-      "sha256": "1xh3ga5f16p46jrw7xj2mwv41mnib0mijin2005q9wrfr5pr54yc",
+      "version": "0.7.1",
+      "sha256": "1vpnlhdzk5ccc0wmq6bawcdfsmr2v45065g3sa6y63nv15rn5s97",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "RcppThread", "SQUAREM", "StanHeaders", "cli", "dplyr", "generics", "rlang", "stringi", "stringr", "vctrs"]
     },
     "birdnetR": {
@@ -46297,12 +46567,6 @@
       "sha256": "1bjlw2vlgb9c50iah1w38b1g8bgdys86vr7bnbv0fapzp584d36g",
       "depends": ["classInt", "ggplot2"]
     },
-    "bisectr": {
-      "name": "bisectr",
-      "version": "0.1.0",
-      "sha256": "1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7",
-      "depends": ["devtools"]
-    },
     "bispdep": {
       "name": "bispdep",
       "version": "1.0-2",
@@ -46437,8 +46701,8 @@
     },
     "blackmarbler": {
       "name": "blackmarbler",
-      "version": "0.2.4",
-      "sha256": "1scrkn7kagb8wkz0h87xnbbkpdqyvwc110km890rakm0qgpgf1w9",
+      "version": "0.2.5",
+      "sha256": "1l384xlqz0xdf18wd6r203g0cf0qqc1gv4mcigvrzd898ksygr77",
       "depends": ["dplyr", "exactextractr", "httr2", "lubridate", "purrr", "readr", "sf", "stringr", "terra", "tidyr"]
     },
     "blaise": {
@@ -46483,16 +46747,10 @@
       "sha256": "00pxi5zj68796b3qkil3w66z446ib61xl2l5v1qia1mc9fznlzri",
       "depends": ["BH", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayesplot", "coda", "future_apply", "lavaan", "loo", "mnormt", "nonnest2", "rstan", "rstantools", "tmvnsim"]
     },
-    "blender": {
-      "name": "blender",
-      "version": "0.1.2",
-      "sha256": "1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c",
-      "depends": ["vegan"]
-    },
     "blindrecalc": {
       "name": "blindrecalc",
-      "version": "1.0.1",
-      "sha256": "126mh5p1js4mm9sq3w6hs2vlx4baa6gzm9b9jybllfi751jsgjw5",
+      "version": "1.1.0",
+      "sha256": "12hdm59lj0hysssf7xkpqipnpiwbw5rdbr65ar1vb6n0ggd39hd1",
       "depends": ["Rcpp"]
     },
     "blindreview": {
@@ -46543,12 +46801,6 @@
       "sha256": "13vjy9f3zki8w1damz6kqq47689mk4l1navnwh7r6z8lqkmj52fh",
       "depends": ["rlang", "vctrs"]
     },
-    "blockCV": {
-      "name": "blockCV",
-      "version": "3.1-5",
-      "sha256": "1ngjr7z7ivm12dijywvca776bpgagszn2aipl7d3kfzs9z3x12hg",
-      "depends": ["Rcpp", "sf"]
-    },
     "blockForest": {
       "name": "blockForest",
       "version": "0.2.6",
@@ -46569,9 +46821,9 @@
     },
     "blocking": {
       "name": "blocking",
-      "version": "1.0.0",
-      "sha256": "0ckj6ynq640i3cwjavkkl22s50nlyxx56aq2zrv46i0kgk8jsimh",
-      "depends": ["Matrix", "RcppAlgos", "RcppAnnoy", "RcppHNSW", "data_table", "igraph", "mlpack", "readr", "rnndescent", "text2vec", "tokenizers"]
+      "version": "1.0.1",
+      "sha256": "18rjqrrzv1kiydja555ng45p8aky259p36sh77rr0nvjk1vw3639",
+      "depends": ["Matrix", "RcppAnnoy", "RcppHNSW", "data_table", "igraph", "mlpack", "readr", "rnndescent", "text2vec", "tokenizers"]
     },
     "blocklength": {
       "name": "blocklength",
@@ -46587,8 +46839,8 @@
     },
     "blockmodeling": {
       "name": "blockmodeling",
-      "version": "1.1.5",
-      "sha256": "00qmpf0jdc8vl76rzfg12z2mdr215q8qd9p3a4b816y2g0092vrv",
+      "version": "1.1.8",
+      "sha256": "15xlxvlbx5cis37v7078h3djxwsd48fi33855lf4xwshl9d60r1i",
       "depends": ["Matrix"]
     },
     "blockmodels": {
@@ -46671,8 +46923,8 @@
     },
     "bmabart": {
       "name": "bmabart",
-      "version": "1.0",
-      "sha256": "0sslfz2vsq29j99r4rx17ykf9n6mzc4sf1bw6qkpij6hcs994wcn",
+      "version": "2.0",
+      "sha256": "0qqqzzgr5csi6hbmpq6np9aqlrzn4b7d4j0r434cqjziyy2h48cl",
       "depends": ["BART", "gplots", "lattice", "survival"]
     },
     "bmabasket": {
@@ -46731,9 +46983,9 @@
     },
     "bmm": {
       "name": "bmm",
-      "version": "1.0.1",
-      "sha256": "11fl9a0350602ipjzcwqh2fcbh1zhbachxb37wd4n25qaraqds6l",
-      "depends": ["brms", "crayon", "dplyr", "fs", "glue", "magrittr", "matrixStats", "tidyr", "withr"]
+      "version": "1.2.0",
+      "sha256": "07h4cq8z7ymi8r7ff19qprqr4bx29wl32y6z07gpszybc6y9a7lh",
+      "depends": ["brms", "crayon", "fs", "glue", "matrixStats", "withr"]
     },
     "bmp": {
       "name": "bmp",
@@ -46755,8 +47007,8 @@
     },
     "bnRep": {
       "name": "bnRep",
-      "version": "0.0.4",
-      "sha256": "10ia4p2x3zks6wvfyapmja5mq3byp2ri02vb7gfhdya43ykps0yd",
+      "version": "0.0.5",
+      "sha256": "1jjxrs4iick0pxqcnsphh7102vkbn8l9n9hsdllqmx53rbiaf1ld",
       "depends": ["DT", "Rgraphviz", "bnlearn", "dplyr", "qgraph", "shiny", "shinyjs", "shinythemes"]
     },
     "bnclassify": {
@@ -46785,8 +47037,8 @@
     },
     "bnma": {
       "name": "bnma",
-      "version": "1.6.0",
-      "sha256": "0z2kd9x5hi192dlr36r4vh9c66dzprm63y1l9v8av6dfnz63sj5b",
+      "version": "1.6.1",
+      "sha256": "03kkk3zzxlrh5dbcr8wrp6pxmdipvib7byv32fmac40zpsgkf2s9",
       "depends": ["coda", "ggplot2", "igraph", "rjags"]
     },
     "bnmonitor": {
@@ -46873,10 +47125,16 @@
       "sha256": "1dws84ghc5r6zpnr23qd4l9bkazds8ar723wkrkikjni58vshjf1",
       "depends": ["rJava"]
     },
+    "boilerplate": {
+      "name": "boilerplate",
+      "version": "1.3.0",
+      "sha256": "0inz6z8zbp4qhr98n3s0g1l9rsfvlyy15nrdksvd2sd1mihp799v",
+      "depends": ["cli", "digest", "jsonlite", "jsonvalidate"]
+    },
     "boinet": {
       "name": "boinet",
-      "version": "1.3.0",
-      "sha256": "1dpam5165mr7vyxn6g5jk5pj0x1z1ywpbkxyfy12yz4ypb39q5b2",
+      "version": "1.4.0",
+      "sha256": "09bdb3vflpl5jw5xrxhkdcccv98hd46qd84akdxhjf1kwbmri75q",
       "depends": ["Iso", "copula", "gt", "mfp", "tibble"]
     },
     "boiwsa": {
@@ -46911,15 +47169,15 @@
     },
     "bonn": {
       "name": "bonn",
-      "version": "1.0.2",
-      "sha256": "1z22cdizz8sgw4fry98adcjvn23ag3qvvcinbg3kmafksdk1ivmb",
+      "version": "1.0.3",
+      "sha256": "0bwawj68cahvmaj0kb04xd70m74nxcl98rqdhvprpr2zgk5qqg0a",
       "depends": ["httr", "jsonlite"]
     },
     "bonsai": {
       "name": "bonsai",
-      "version": "0.3.2",
-      "sha256": "171zrfwr7xpr4j7ppkfw5a27xakf1sxdpm365zg5am7zr3inhbb7",
-      "depends": ["cli", "dials", "dplyr", "glue", "parsnip", "purrr", "rlang", "tibble", "withr"]
+      "version": "0.4.0",
+      "sha256": "01li3l7fas15gg2ibvxv50gy6y6c1q3466z5y13s0kjmxd1534ib",
+      "depends": ["cli", "dials", "dplyr", "parsnip", "purrr", "rlang", "tibble", "withr"]
     },
     "bonsaiforest": {
       "name": "bonsaiforest",
@@ -46963,6 +47221,12 @@
       "sha256": "0df19q44fsv0hvda4dwq302wsh6vlalwszyh0ir66r5ryrrmhas4",
       "depends": ["MLmetrics", "Rglpk", "dplyr", "lpSolveAPI"]
     },
+    "boostmath": {
+      "name": "boostmath",
+      "version": "1.0.2",
+      "sha256": "0aqyqc2pmw5gffk4al51hv57fc1xs65gqfyi476chznyw3rb3056",
+      "depends": ["BH", "cpp11"]
+    },
     "boostrq": {
       "name": "boostrq",
       "version": "1.0.0",
@@ -47023,6 +47287,12 @@
       "sha256": "1aj5l42d5y7czxzlg6r9ykdxyjf8m8bahl41xk4k6xpxckdnka14",
       "depends": ["binom", "boot"]
     },
+    "bootLRTpairwise": {
+      "name": "bootLRTpairwise",
+      "version": "0.2.0",
+      "sha256": "1lym425nrji9si0q66a6xh22zjrmxv8nbnv0hqargxpaf1w31mjk",
+      "depends": []
+    },
     "bootPLS": {
       "name": "bootPLS",
       "version": "1.0.1",
@@ -47055,9 +47325,9 @@
     },
     "bootcluster": {
       "name": "bootcluster",
-      "version": "0.4.1",
-      "sha256": "0f1zw39c4dr0j6clxg4iay0vd3jb9k2nm6rjkvx32pnvmhbdkhvn",
-      "depends": ["GGally", "cluster", "doParallel", "dplyr", "flexclust", "foreach", "fpc", "ggplot2", "gridExtra", "igraph", "intergraph", "kernlab", "mclust", "network", "plyr", "sna"]
+      "version": "0.4.2",
+      "sha256": "18k72455fhgcs1fijavlzg34bsj8qb0qkfnz2zsnfhhspbkl9f17",
+      "depends": ["GGally", "cluster", "doParallel", "dplyr", "flexclust", "foreach", "fpc", "ggplot2", "gridExtra", "igraph", "intergraph", "kernlab", "mclust", "network", "plyr", "progress", "sna"]
     },
     "bootf2": {
       "name": "bootf2",
@@ -47163,8 +47433,8 @@
     },
     "box_linters": {
       "name": "box.linters",
-      "version": "0.10.5",
-      "sha256": "1j6zjs5cpafyk1f74p059mggr9kp7c92fv4msyycs0lwji01ar88",
+      "version": "0.10.6",
+      "sha256": "063bnjm102k0c1yjpl8rpngc2pids34k6iaqp63zlkij48yjvylm",
       "depends": ["cli", "fs", "glue", "lintr", "purrr", "rlang", "stringr", "withr", "xfun", "xml2", "xmlparsedata"]
     },
     "box_lsp": {
@@ -47259,8 +47529,8 @@
     },
     "bplsr": {
       "name": "bplsr",
-      "version": "1.0.3",
-      "sha256": "0jfr3fxmb2azm37p089690sql89ca5zghd51syf96pzxxh3wjiqm",
+      "version": "1.0.4",
+      "sha256": "0w3zq0i0jspjwl1yxk924ppfirmhwx0bzbzzmhk06xswv7mjx0s7",
       "depends": ["coda", "progress", "statmod"]
     },
     "bpmnR": {
@@ -47415,8 +47685,8 @@
     },
     "brea": {
       "name": "brea",
-      "version": "0.3.1",
-      "sha256": "1sh0m4hfik0kzc19ygqcbrxn67n52zz9l90gs494iqqwj1fzs8f7",
+      "version": "0.4.1",
+      "sha256": "18vnx73n9g4bwzq9d49a4mhxf3i8j9xpzg58gvmhklxbql7a913r",
       "depends": []
     },
     "bread": {
@@ -47443,12 +47713,6 @@
       "sha256": "027q949qqyxlj58a4qpn6a2qcaqzawgzmck8ab1dnfgpyi0vkrpm",
       "depends": ["Rcpp", "ggplot2", "plyr"]
     },
-    "breakpoint": {
-      "name": "breakpoint",
-      "version": "1.2",
-      "sha256": "004vi1qr7iib8ykg6sp7xzv0bb841h4vsz2x0cyrhkdp41frglx9",
-      "depends": ["MASS", "doParallel", "foreach", "ggplot2", "msm"]
-    },
     "breathtestcore": {
       "name": "breathtestcore",
       "version": "0.8.9",
@@ -47461,6 +47725,12 @@
       "sha256": "1cybi9nvwsh3z34jgw8j1ls34flk9sppv101qnd9mcx06apkhhmn",
       "depends": ["BH", "Rcpp", "RcppEigen", "StanHeaders", "breathtestcore", "dplyr", "purrr", "rstan", "rstantools", "stringr", "tidyr"]
     },
+    "bregr": {
+      "name": "bregr",
+      "version": "1.0.0",
+      "sha256": "11imzpivqg8lh02qriplr3qi31dwnq01kdknixv8irh3dk7bmwi7",
+      "depends": ["S7", "broom", "broom_helpers", "cli", "dplyr", "forestploter", "ggplot2", "glue", "insight", "lifecycle", "purrr", "rlang", "survival", "tibble", "vctrs"]
+    },
     "brew": {
       "name": "brew",
       "version": "1.0-10",
@@ -47493,9 +47763,9 @@
     },
     "brickster": {
       "name": "brickster",
-      "version": "0.2.8",
-      "sha256": "1lamksgnn89nc497l2zfa2npbrfqh7gffqzl24dhwvxni5jp0hm4",
-      "depends": ["base64enc", "cli", "curl", "dplyr", "glue", "httr2", "ini", "jsonlite", "nanoarrow", "purrr", "rlang", "tibble"]
+      "version": "0.2.8.1",
+      "sha256": "1gia15h9v9bsi9p1kvhik5c0jk3a1jxh92wa4y2qv3dhd0m2vxsx",
+      "depends": ["R6", "base64enc", "cli", "curl", "dplyr", "glue", "httr2", "ini", "jsonlite", "nanoarrow", "purrr", "rlang", "tibble"]
     },
     "bridgedist": {
       "name": "bridgedist",
@@ -47613,8 +47883,8 @@
     },
     "broom": {
       "name": "broom",
-      "version": "1.0.8",
-      "sha256": "0i4b80vs29b064930qvlhfxpkx3a49kvf4r0psnsknyayr18asfl",
+      "version": "1.0.9",
+      "sha256": "0rkfkf4vy294s4ap8vx4zngjvvwd2nzn0lr8lbc1a1h1rv5rp6n3",
       "depends": ["backports", "cli", "dplyr", "generics", "glue", "lifecycle", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "broom_helpers": {
@@ -47703,8 +47973,8 @@
     },
     "bsamGP": {
       "name": "bsamGP",
-      "version": "1.2.6",
-      "sha256": "1x41ppc0j6rkh3lqimihkbvsxfb9p2yyi1v95mqh0sywi636x73v",
+      "version": "1.2.7",
+      "sha256": "0vhg6ra951nd9wh0y9qp9fn4cxgllx5lrwrv8qnahblnigyfzff3",
       "depends": ["MASS", "ggplot2", "gridExtra"]
     },
     "bscui": {
@@ -47763,8 +48033,8 @@
     },
     "bspcov": {
       "name": "bspcov",
-      "version": "1.0.1",
-      "sha256": "15dgkn1m3wrdci98qrrx0hr8c2lbn7p124gjp45mgwkjn9rgi2qb",
+      "version": "1.0.2",
+      "sha256": "0hyxkyddr3i932ya5pbjw7l6p4nci08x2bci8w6ahn0qlayrv1fh",
       "depends": ["BayesFactor", "CholWishart", "FinCovRegularization", "GIGrvg", "MASS", "Matrix", "RSpectra", "caret", "coda", "dplyr", "furrr", "future", "ggmcmc", "ggplot2", "ks", "magrittr", "matrixStats", "matrixcalc", "mvnfast", "mvtnorm", "plyr", "progress", "purrr"]
     },
     "bspec": {
@@ -47779,12 +48049,6 @@
       "sha256": "01kmhjxjkkba8k598sapdnwyk1lii0fvp4jxxjkj94kdyb2n7593",
       "depends": ["Rcpp", "RcppArmadillo", "arrApply", "nlsic"]
     },
-    "bsplinePsd": {
-      "name": "bsplinePsd",
-      "version": "0.6.0",
-      "sha256": "0f785l02hiq3f7anxqhm09f7lrqgkkqhly7f1x78cxm22hvrqyhg",
-      "depends": ["Rcpp"]
-    },
     "bsplus": {
       "name": "bsplus",
       "version": "0.1.5",
@@ -47937,8 +48201,8 @@
     },
     "bulkreadr": {
       "name": "bulkreadr",
-      "version": "1.2.0",
-      "sha256": "1q3k310jn0lyssd9fzxp1wk0f78cp74iigc1a31wv1ksgsvy47wf",
+      "version": "1.2.1",
+      "sha256": "1jkngd6yfhjgzj8cb2l7awkqmv29d75y7whk9kh50mlapviqzfbi",
       "depends": ["curl", "dplyr", "fs", "googlesheets4", "haven", "inspectdf", "labelled", "lubridate", "magrittr", "openxlsx", "purrr", "readr", "readxl", "rlang", "sjlabelled", "stringr", "tibble", "tidyr"]
     },
     "bulletcp": {
@@ -47973,8 +48237,8 @@
     },
     "bumbl": {
       "name": "bumbl",
-      "version": "1.0.3",
-      "sha256": "16fpd62wkvjd25wv80rlp01q57sacx1jjww5j1v6hifc8097wj0i",
+      "version": "1.0.4",
+      "sha256": "1a4jmygca1di499xan7hpn7jxw6x88pw5snd36izgfm226nsl9jg",
       "depends": ["MASS", "broom", "dplyr", "ggplot2", "glue", "lifecycle", "purrr", "rlang", "tidyr"]
     },
     "bumblebee": {
@@ -48021,8 +48285,8 @@
     },
     "bupaR": {
       "name": "bupaR",
-      "version": "0.5.4",
-      "sha256": "16m9n7h1nwfz564cxyhgkxdzszcr3nr7abz4d6mqx97kjv46k23n",
+      "version": "0.5.5",
+      "sha256": "10hmminkpcss74fgl04mmw197vxz53173iz7akrnmmpb75nmckcr",
       "depends": ["cli", "data_table", "dplyr", "eventdataR", "forcats", "ggplot2", "glue", "lifecycle", "lubridate", "magrittr", "miniUI", "pillar", "purrr", "rlang", "shiny", "stringi", "stringr", "tibble", "tidyr"]
     },
     "bupaverse": {
@@ -48105,8 +48369,8 @@
     },
     "bvhar": {
       "name": "bvhar",
-      "version": "2.2.2",
-      "sha256": "0gkgr000n90c0vw5glysxbswc9l95jdx85k3x67rj53x5dfhw09q",
+      "version": "2.3.0",
+      "sha256": "0wfzn4m1ja88l1mpkx0ql9i7832dgb5jpsy1rb1dlmlcm45j0wmn",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppSpdlog", "RcppThread", "bayesplot", "dplyr", "foreach", "ggplot2", "lifecycle", "optimParallel", "posterior", "purrr", "tibble", "tidyr"]
     },
     "bvls": {
@@ -48349,6 +48613,12 @@
       "sha256": "012mjayj90m5gsd8mhm2ic00pa0bnrjiidq9mv4vxj8slwp641rz",
       "depends": []
     },
+    "calcal": {
+      "name": "calcal",
+      "version": "1.0.0",
+      "sha256": "1ffqpq7r2pqf1534flx9yqlah7xich846kb4l6nyyrzar1kx1549",
+      "depends": ["vctrs"]
+    },
     "calcite": {
       "name": "calcite",
       "version": "0.1.0",
@@ -48357,8 +48627,8 @@
     },
     "calculus": {
       "name": "calculus",
-      "version": "1.0.1",
-      "sha256": "1p80bgg6896z798cx7nwqbwd0rxdv27kamaw1gw0hv4lpqsr7q10",
+      "version": "1.1.0",
+      "sha256": "161i2cjb7872g4qfhjxh08273wpvsss4lwfkavlqal1f1cv90php",
       "depends": ["Rcpp"]
     },
     "calendR": {
@@ -48495,8 +48765,8 @@
     },
     "campsismod": {
       "name": "campsismod",
-      "version": "1.2.2",
-      "sha256": "1b67br0hsxfgzrlqlajfk9r3yazwm4xw81sapd3wjdkmd3fnmvzq",
+      "version": "1.2.3",
+      "sha256": "1jzyznk1cr25pjwsnrxlh9c4pka4wzydgvs4ajy7456hc64h7895",
       "depends": ["LaplacesDemon", "MASS", "assertthat", "dplyr", "ggplot2", "magrittr", "purrr", "readr", "rlang", "tibble", "tidyr"]
     },
     "camsRad": {
@@ -48553,6 +48823,12 @@
       "sha256": "02k4d7z565xlmwv5kl7dqqdm27zvmwm2pyfqpp7czdji17agkji0",
       "depends": []
     },
+    "cancerradarr": {
+      "name": "cancerradarr",
+      "version": "1.3.1",
+      "sha256": "17d07ldvd7jnvxcyc70jj88wj922zg677kggwvrd9yncbyrng03c",
+      "depends": ["dplyr", "epitools", "magrittr", "openxlsx", "plyr", "purrr", "rlang", "rmarkdown", "stringr", "tidyr"]
+    },
     "cancerscreening": {
       "name": "cancerscreening",
       "version": "1.1.1",
@@ -48579,8 +48855,8 @@
     },
     "canvasXpress": {
       "name": "canvasXpress",
-      "version": "1.56.1",
-      "sha256": "1x4k7h0vvpn628yy3nqwnq2n53mb09iqzglx6s65m7arjc7wjbgh",
+      "version": "1.57.4",
+      "sha256": "16lpivcfqv2hvyf0hy4i9xmlkl6q2p932qwi49dnd7kk8qqnx5af",
       "depends": ["htmltools", "htmlwidgets", "httr", "jsonlite"]
     },
     "canvasXpress_data": {
@@ -48723,14 +48999,14 @@
     },
     "cards": {
       "name": "cards",
-      "version": "0.6.0",
-      "sha256": "1g41i4nqkgzb1sv2f9hy06h0m2hmlcpqgc2ssjm2l7dcbgy5534f",
+      "version": "0.6.1",
+      "sha256": "1ndzhsk9c82hr8c3w9b2a7lgfns24p2hk2nqkmwpymb8a7yx9fbc",
       "depends": ["cli", "dplyr", "glue", "lifecycle", "rlang", "tidyr", "tidyselect"]
     },
     "cardx": {
       "name": "cardx",
-      "version": "0.2.4",
-      "sha256": "1qbfa2kbxbc7lnrajj79dgz2nkjf4616ngha1yk9fl6f10qmsk24",
+      "version": "0.2.5",
+      "sha256": "179wzyzp89xfmm95nvspazpkprn4cqi6dh3bw1j12ljxnv44npan",
       "depends": ["cards", "cli", "dplyr", "glue", "lifecycle", "rlang", "tidyr"]
     },
     "care": {
@@ -48775,6 +49051,12 @@
       "sha256": "0z8r64cb3w0m5a7khysvfmnf1ywa7svi5lvxiwx1a6j6868zbxlr",
       "depends": ["caret", "dplyr", "forecast", "generics", "magrittr"]
     },
+    "caretSDM": {
+      "name": "caretSDM",
+      "version": "1.1.0.1",
+      "sha256": "0g6qi5p3jmqwc03bb5qkh07avp4973iv84r1gw71yp0s787qcrr5",
+      "depends": ["CoordinateCleaner", "Rtsne", "caret", "checkmate", "cli", "data_table", "dismo", "dplyr", "fs", "furrr", "future", "ggplot2", "ggspatial", "glue", "gtools", "httr", "lwgeom", "mapview", "pROC", "parallelly", "pdp", "progressr", "purrr", "raster", "rgbif", "sf", "stars", "stringdist", "stringr", "terra", "tidyr", "usdm"]
+    },
     "carfima": {
       "name": "carfima",
       "version": "2.0.2",
@@ -48807,8 +49089,8 @@
     },
     "carrier": {
       "name": "carrier",
-      "version": "0.1.1",
-      "sha256": "155zna5bv6ybb6hr3lsv8dn67lkbbvn3dbihfw2s6ajkzvms9x13",
+      "version": "0.2.0",
+      "sha256": "0wwqgmkw7nm0zycjrbhq9156l5z9bw6cspaqmrg5844s8482dvdq",
       "depends": ["lobstr", "rlang"]
     },
     "cartograflow": {
@@ -48843,8 +49125,8 @@
     },
     "cartography": {
       "name": "cartography",
-      "version": "3.1.4",
-      "sha256": "1sww3n7glkzrpf1ki31z8309qr5496m1rm5gj3cprwif8fxfyjx5",
+      "version": "3.1.5",
+      "sha256": "1nkws1fhxm46fh470i1xz3r9vn3zy7xcp0309851c90axd996ywq",
       "depends": ["Rcpp", "classInt", "curl", "png", "raster", "sf", "sp"]
     },
     "cascadeSelect": {
@@ -49201,6 +49483,12 @@
       "sha256": "0n0qyzlsm54dl71n5rdrim6rvmsbk3g8n5r0i2q91yk9fayaz9ly",
       "depends": ["BH", "Rcpp", "hypergeo2"]
     },
+    "cbcTools": {
+      "name": "cbcTools",
+      "version": "0.6.2",
+      "sha256": "0ps6m443mm5shxa5a15mldv9gywzm13byaqbwkfqpk24h4dpdh4j",
+      "depends": ["fastDummies", "ggplot2", "idefix", "logitr", "randtoolbox", "rlang"]
+    },
     "cbinom": {
       "name": "cbinom",
       "version": "1.6",
@@ -49269,8 +49557,8 @@
     },
     "cccp": {
       "name": "cccp",
-      "version": "0.3-1",
-      "sha256": "06ds1f954m2g3g85rccpvk1bhxqn544qqxg7wzs4jkb97h590dzn",
+      "version": "0.3-2",
+      "sha256": "1i9v40kz05hqar537cnkzw3gbfwlzgd6waxr9wcy086wxpf3wm28",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "cccrm": {
@@ -49419,14 +49707,14 @@
     },
     "cdgd": {
       "name": "cdgd",
-      "version": "0.3.5",
-      "sha256": "10cd1s06k2hcvzjsibz1nask7n22x98s0cpi1j0l974s1j426wzy",
+      "version": "1.0.0",
+      "sha256": "0j0cmv1r8f0aa1sjdzw6ppxcfny1jd9s38060h6awdbmhfiygf21",
       "depends": ["caret"]
     },
     "cdiWG2WS": {
       "name": "cdiWG2WS",
-      "version": "0.1.2",
-      "sha256": "1h8a56dgh07csq2b7hk5ychd3gpfn7dx9zg3hfvl1zcgdn3rs457",
+      "version": "0.2.0",
+      "sha256": "037jvxv1a5wlc63mpbl9b2bd4j5c5yd091xflax242v4hw01nir1",
       "depends": []
     },
     "cdid": {
@@ -49483,6 +49771,12 @@
       "sha256": "1h6zd8hcxd8k6lnmq066gjgp683y6f7kfisyf1zbasbr1l4gp0fx",
       "depends": ["data_table", "ggplot2", "lme4", "readxl"]
     },
+    "ceblR": {
+      "name": "ceblR",
+      "version": "1.0.0",
+      "sha256": "130ysfwz4df1i88vhl14qj4mx6650syd1y33sr1mha5n2cmb8sn3",
+      "depends": ["dplyr", "lifecycle", "magrittr", "readr"]
+    },
     "ceg": {
       "name": "ceg",
       "version": "0.1.0",
@@ -49537,12 +49831,6 @@
       "sha256": "0gmdxs9s3c1rk8mqc2pp6zdmzy9nij51m29vf24ii8s201f9raj6",
       "depends": ["ellipse", "pracma"]
     },
-    "cellularautomata": {
-      "name": "cellularautomata",
-      "version": "0.1.0",
-      "sha256": "07j0bv8bj20jjh4zdxgqnpkxm0pb2aia6045rp23i3x18n18zf42",
-      "depends": ["gganimate", "ggplot2", "patchwork", "purrr", "rlang"]
-    },
     "cem": {
       "name": "cem",
       "version": "1.1.31",
@@ -49599,9 +49887,9 @@
     },
     "censobr": {
       "name": "censobr",
-      "version": "0.4.1",
-      "sha256": "1lvbmcng9y3ky0p1phd0xznlwx4dd88ig25jws6vg9lbl7y8pm6k",
-      "depends": ["arrow", "checkmate", "curl", "dplyr", "duckdb", "fs", "glue"]
+      "version": "0.5.0",
+      "sha256": "04pr905i91fhgrqijznkvqwi3fj8i5krb68n28d6nz44fk2a24ck",
+      "depends": ["arrow", "checkmate", "cli", "curl", "dplyr", "duckdb", "fs", "glue", "rlang"]
     },
     "censorcopula": {
       "name": "censorcopula",
@@ -49713,8 +50001,8 @@
     },
     "ces": {
       "name": "ces",
-      "version": "0.1.0",
-      "sha256": "0li48bclx113gqhs1plni4v1dyp5aakv87ll76k0a2c0ka675fw6",
+      "version": "1.0.1",
+      "sha256": "095qbq6fgijylg0rbfmh0rahq7rjnb0vjb96vamld5hq8blfzc1b",
       "depends": ["dplyr", "haven", "tibble"]
     },
     "cesR": {
@@ -49777,12 +50065,6 @@
       "sha256": "03wfzilxgia12hacwkay2ki94mha8b42g62cx66x1rkqqxgcp6n9",
       "depends": []
     },
-    "cfma": {
-      "name": "cfma",
-      "version": "1.0",
-      "sha256": "006z5g3rqpg44jqdf6ivyxr47sxm5cd9cqhayfi8qk73xx5w4lv9",
-      "depends": []
-    },
     "cfmortality": {
       "name": "cfmortality",
       "version": "0.3.0",
@@ -49819,6 +50101,12 @@
       "sha256": "172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8",
       "depends": ["Rcpp"]
     },
+    "cgaim": {
+      "name": "cgaim",
+      "version": "1.0.2",
+      "sha256": "0az5msrznyqwcgx4n9hqc9g96wcl3zc0cqhv7g5yws3rfk3phjd3",
+      "depends": ["MASS", "Matrix", "TruncatedNormal", "cgam", "coneproj", "doParallel", "foreach", "gratia", "limSolve", "mgcv", "osqp", "quadprog", "scam", "scar"]
+    },
     "cgal4h": {
       "name": "cgal4h",
       "version": "0.1.0",
@@ -49827,9 +50115,9 @@
     },
     "cgam": {
       "name": "cgam",
-      "version": "1.27",
-      "sha256": "106hrsjixjd50kcdv81dvjz467sbjqd23sk9z7fpnx4600bfg39f",
-      "depends": ["Matrix", "coneproj", "dplyr", "ggplot2", "lme4", "rlang", "splines2", "statmod", "svDialogs", "zeallot"]
+      "version": "1.28",
+      "sha256": "1cn6ivvad6md6pp6905yd3q37rp4w6qvgwbshqpb906cri44zs6j",
+      "depends": ["MASS", "Matrix", "coneproj", "dplyr", "ggplot2", "lme4", "quadprog", "rlang", "splines2", "statmod", "svDialogs", "zeallot"]
     },
     "cglasso": {
       "name": "cglasso",
@@ -49929,8 +50217,8 @@
     },
     "changepointsVar": {
       "name": "changepointsVar",
-      "version": "0.1.1",
-      "sha256": "0a5g0bafvb1rbw31y8b8plwhxw5svlh4qfjwvdzafbcrp3rn1cs4",
+      "version": "0.1.2",
+      "sha256": "0xw538yhg46myfhl3djs1ynrzb19p9wv1sgmmdm4gbh7mij511wp",
       "depends": ["MASS", "lars"]
     },
     "changer": {
@@ -49945,6 +50233,12 @@
       "sha256": "0123mbdr4bkkp8w9w15bg9qxkbpd6nyp602fw690zsy1dyimm78k",
       "depends": ["AER", "chandwich", "lmtest", "progress", "purrr", "rlang", "sandwich"]
     },
+    "chapensk": {
+      "name": "chapensk",
+      "version": "0.4",
+      "sha256": "0s52wnb3k9qvv16i31c04nyhrq8jbvszad6nsxc06lpnj18294ma",
+      "depends": ["Bessel"]
+    },
     "charcuterie": {
       "name": "charcuterie",
       "version": "0.0.6",
@@ -50005,10 +50299,16 @@
       "sha256": "1h7b8l5ksigz4dwvk1q7fsd2ppss9qqmi8vzlcqdir6qh911s75h",
       "depends": ["bslib", "cli", "clipr", "config", "coro", "ellmer", "fs", "glue", "httr2", "lifecycle", "processx", "purrr", "rlang", "rstudioapi", "shiny", "yaml"]
     },
+    "chcd": {
+      "name": "chcd",
+      "version": "0.1.1",
+      "sha256": "0fl3ad47i7nnws0j7agv16cgbgacmw63yxdrwx1jqs21633c00y5",
+      "depends": ["dplyr", "magrittr", "progress", "readr", "rlang", "stringr", "tibble"]
+    },
     "cheapr": {
       "name": "cheapr",
-      "version": "1.3.1",
-      "sha256": "1zm312mjly5kxk41vsz2vp5nc793xyghydkn906m55zk8n78dydn",
+      "version": "1.3.2",
+      "sha256": "164v45dyv5czzhh6d1vjcy1zpi2skr437h1l2k23r3d1fzcfc785",
       "depends": ["collapse", "cpp11"]
     },
     "cheatsheet": {
@@ -50091,14 +50391,14 @@
     },
     "cheese": {
       "name": "cheese",
-      "version": "0.1.2",
-      "sha256": "0g935mlf2hkbhd8cif8nmvg477if8sv7ga50ddb0cvghdaqjd183",
+      "version": "0.1.3",
+      "sha256": "16lswrjh6q6rpy1qmq0q4a51hvchd3wkz5397gpfkpvdi8gvskc3",
       "depends": ["dplyr", "forcats", "kableExtra", "knitr", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "cheetahR": {
       "name": "cheetahR",
-      "version": "0.2.0",
-      "sha256": "1i43vpcnx1rfs8djzaa5276l9x7n89a04ap0wx4zr4z7n0h6fwvh",
+      "version": "0.3.0",
+      "sha256": "071irh8r0sy2kv4ab5si1jpgign42swzji9r5klanp6mkgji1kv8",
       "depends": ["htmlwidgets", "jsonlite", "tibble"]
     },
     "chem_databases": {
@@ -50127,8 +50427,8 @@
     },
     "chemodiv": {
       "name": "chemodiv",
-      "version": "0.3.0",
-      "sha256": "07y8wvi5vh5apvg57pd2q5rqvpxm0h3v899n12r76gwvj8z1a28s",
+      "version": "0.3.1",
+      "sha256": "04hs1f1aiy6mvflb2my897qclmsw8cy63a3f2pv6m9asr6iqxis5",
       "depends": ["ChemmineR", "GUniFrac", "ape", "curl", "fmcsR", "ggdendro", "ggplot2", "ggraph", "gridExtra", "hillR", "httr", "igraph", "jsonlite", "rlang", "tidygraph", "tidyr", "vegan", "webchem"]
     },
     "chemometrics": {
@@ -50175,8 +50475,8 @@
     },
     "chevron": {
       "name": "chevron",
-      "version": "0.2.11",
-      "sha256": "0vly5cpwknn41kf5lm42flrzv7f5q566cc38bn157dq4jlm46pij",
+      "version": "0.2.12",
+      "sha256": "1pmhsz5naa71i90852nx3fr36q3wz97w0y3bg4ww62n96i04hplg",
       "depends": ["checkmate", "dplyr", "dunlin", "forcats", "formatters", "ggplot2", "glue", "lifecycle", "lubridate", "magrittr", "nestcolor", "purrr", "rlang", "rlistings", "rtables", "stringr", "tern", "tibble"]
     },
     "chi": {
@@ -50263,12 +50563,6 @@
       "sha256": "116kmgyi8wndl4r4fmbbdi2bpzxnl92izz1rr6xzwr8zd7xcs22v",
       "depends": ["lifecycle", "rlang"]
     },
-    "chkptstanr": {
-      "name": "chkptstanr",
-      "version": "0.1.1",
-      "sha256": "0p0pzpzyg3sw4gnvzdx34f96yxidpykq49v5xlhnrsnpjzajjfs3",
-      "depends": ["Rdpack", "abind", "brms", "rstan"]
-    },
     "chlorpromazineR": {
       "name": "chlorpromazineR",
       "version": "0.2.0",
@@ -50305,6 +50599,12 @@
       "sha256": "0a8xvgpgaxxlb102ix5j98zd8wvi1xzs0cg7im8g2ly1h0mv1rxy",
       "depends": ["Rfast2"]
     },
+    "chopin": {
+      "name": "chopin",
+      "version": "0.9.4",
+      "sha256": "0ldvp4nwfhq6b07vwnlq1pg3f72ivpvha4vylrwvzgx1blgwxas0",
+      "depends": ["anticlust", "cli", "collapse", "dplyr", "exactextractr", "future", "future_apply", "igraph", "mirai", "rlang", "sf", "stars", "terra"]
+    },
     "choplump": {
       "name": "choplump",
       "version": "1.1.2",
@@ -50337,9 +50637,9 @@
     },
     "choroplethr": {
       "name": "choroplethr",
-      "version": "4.0.0",
-      "sha256": "124j1add7fjdrldw1brm4a2z5zn1v9jv0nm0cjgwj5ildkpwry5k",
-      "depends": ["Hmisc", "R6", "RgoogleMaps", "WDI", "dplyr", "ggmap", "ggplot2", "gridExtra", "rvest", "stringr", "tidycensus", "tidyr", "tigris", "xml2"]
+      "version": "5.0.0",
+      "sha256": "01hywyyak9vsdrb8j47qk1zklazqhyv8p8wzh43gfjs05pg27apf",
+      "depends": ["Hmisc", "R6", "dplyr", "ggplot2", "ggrepel", "rnaturalearth", "sf", "stringr", "tidycensus", "tigris"]
     },
     "choroplethrAdmin1": {
       "name": "choroplethrAdmin1",
@@ -50373,8 +50673,8 @@
     },
     "chromer": {
       "name": "chromer",
-      "version": "0.8",
-      "sha256": "0x9xhih0a19mqwiqs7bljcdgki874ii653v91frkwsr2y2yd9j7c",
+      "version": "0.10",
+      "sha256": "1gbbxaq9bnkj290099ih2kg0cw8ir829qw7a7ckbslf4ahscqx16",
       "depends": ["dplyr", "httr", "tibble"]
     },
     "chromoMap": {
@@ -50467,6 +50767,12 @@
       "sha256": "17w1hx3rbbil2zkcgx4c20pjsqw51i297xnnkhr1db5zg6cqqvff",
       "depends": ["arrangements", "bnlearn", "doParallel", "dplyr", "fastmatch", "foreach", "gRain", "igraph", "patchwork", "rlang", "tidyr"]
     },
+    "cicalc": {
+      "name": "cicalc",
+      "version": "0.1.0",
+      "sha256": "1sv3rg89ycqkm3y8ci3xmnhcwzpa3cw5jzfhfa1qyjbisk1wbqfa",
+      "depends": ["broom", "cli", "dplyr", "forcats", "glue", "purrr", "rlang", "tidyr"]
+    },
     "ciccr": {
       "name": "ciccr",
       "version": "0.3.0",
@@ -50485,6 +50791,12 @@
       "sha256": "0z0dpq5vyv8s4cn4y8ph8y4b8nb63bkqsjmlixa1kr29l132gj1l",
       "depends": ["lubridate"]
     },
+    "ciflyr": {
+      "name": "ciflyr",
+      "version": "0.1.1",
+      "sha256": "11wmxk9ax70cps4ci2r969i2dbwiks2gdb7g45id9cmjcs7r9nb8",
+      "depends": []
+    },
     "cifti": {
       "name": "cifti",
       "version": "0.4.5",
@@ -50607,8 +50919,8 @@
     },
     "circumplex": {
       "name": "circumplex",
-      "version": "1.0.0",
-      "sha256": "19jka0bmp5fgy65vby67ih60ka86jwiq07r90piwjplffm35qlxp",
+      "version": "1.0.1",
+      "sha256": "0xbqd71ybbw2jcqpy1ry444bs7g63civ6sqb0bc995qcr2w6mzxn",
       "depends": ["Rcpp", "RcppArmadillo", "boot", "ggforce", "ggplot2", "htmlTable", "rlang"]
     },
     "cirls": {
@@ -50673,9 +50985,9 @@
     },
     "ciu": {
       "name": "ciu",
-      "version": "0.6.0",
-      "sha256": "0pqs8ivbybbrjar978bl05awgaks33nqfm7l9z68iv2sj4a9hv21",
-      "depends": ["Rcpp", "crayon", "ggplot2"]
+      "version": "0.8",
+      "sha256": "14ih7x08dwj24fsvvzas9dxighclbylwcbizmmgs2x6fhilaqjfr",
+      "depends": ["Rcpp", "crayon", "ggbeeswarm", "ggplot2"]
     },
     "ciuupi": {
       "name": "ciuupi",
@@ -50695,12 +51007,6 @@
       "sha256": "12k8wqv33p3pvvcg5sr8bvgxgnmsyp6nfpnz00x3y43wax35s7h0",
       "depends": ["AER", "kcmeans"]
     },
-    "civis": {
-      "name": "civis",
-      "version": "3.1.2",
-      "sha256": "0ahrav9gd0dy05vxapg5x0csadwcnm4nfcwwk752j9nksd1hl3wg",
-      "depends": ["future", "httr", "jsonlite", "memoise"]
-    },
     "ciw": {
       "name": "ciw",
       "version": "0.0.2",
@@ -50745,10 +51051,16 @@
     },
     "clam": {
       "name": "clam",
-      "version": "2.6.2",
-      "sha256": "1ad6cir6kzrmws3yq9xwdiz8mg01z4ibxk7596s6v136z76rxacd",
+      "version": "2.6.3",
+      "sha256": "0kdvmbqmgjjwx872apllasv95iff5cnqg5ay4nippjxm9hlg08sf",
       "depends": ["data_table", "rice", "rintcal"]
     },
+    "clampSeg": {
+      "name": "clampSeg",
+      "version": "1.2-0",
+      "sha256": "1cz4sj5lfpyk2i6zbjl6qd7vsqlfc0915m82ff99ln5lr1myy508",
+      "depends": ["lowpassFilter", "stepR"]
+    },
     "clap": {
       "name": "clap",
       "version": "0.1.0",
@@ -50799,8 +51111,8 @@
     },
     "classicaltest": {
       "name": "classicaltest",
-      "version": "0.7.0",
-      "sha256": "0wqkqnyj6xdb6qsv03qz002g2b0f7s2vy33f3dm8kpajapdprvnk",
+      "version": "0.7.5",
+      "sha256": "1b3ci1jja16cwc43fagns7p7jiih4bc7hlmdnkz4gshgrlmbd3dv",
       "depends": []
     },
     "classifierplots": {
@@ -50817,9 +51129,9 @@
     },
     "classmap": {
       "name": "classmap",
-      "version": "1.2.4",
-      "sha256": "183h70kfsvr1b0xjb5ggzmdag76nv70jdk08j0347nvxq99ibpxf",
-      "depends": ["cellWise", "cluster", "e1071", "ggplot2", "gridExtra", "kernlab", "randomForest", "robustbase", "rpart"]
+      "version": "1.2.6",
+      "sha256": "16r7kqlwvw0zrfbp8s2i64fqrllwi694r1yfm67ycsadbdqf2zxx",
+      "depends": ["cellWise", "cluster", "e1071", "ggplot2", "gridExtra", "kernlab", "randomForest", "robustbase", "rpart", "scales"]
     },
     "clayringsmiletus": {
       "name": "clayringsmiletus",
@@ -50889,8 +51201,8 @@
     },
     "cleanepi": {
       "name": "cleanepi",
-      "version": "1.1.0",
-      "sha256": "1w61hpfq1sfddjjgigyg2x8140gah7ci4d1hyrnf30iiqbbc044v",
+      "version": "1.1.1",
+      "sha256": "0hsl86za1xiaiphhrbdjpna0fm05820az5r54rscksyf86lp3gsm",
       "depends": ["checkmate", "cli", "dplyr", "janitor", "linelist", "lubridate", "magrittr", "matchmaker", "numberize", "readr", "rlang", "tibble"]
     },
     "cleaner": {
@@ -50967,14 +51279,14 @@
     },
     "clickstream": {
       "name": "clickstream",
-      "version": "1.3.3",
-      "sha256": "1pbw74kd1ig6xc9llv8idizx0rya2454kpd9z62ybwvy68vyargs",
+      "version": "1.3.4",
+      "sha256": "06srgcck6j1k4ysla5bww5ai9bhnny5x8lgx2wa6p6y74hh3rwfy",
       "depends": ["ClickClust", "MASS", "Rsolnp", "arules", "data_table", "ggplot2", "igraph", "linprog", "plyr", "reshape2"]
     },
     "clidamonger": {
       "name": "clidamonger",
-      "version": "1.3.0",
-      "sha256": "0dqq59cgjynccz4c9rs7mz7b3s8gldcr4s9m17wjmkjz2ldba3xr",
+      "version": "1.4.0",
+      "sha256": "1pmj3nif59mrr69a7b6p7q59jv42nflg8i04cv8cbn9g84mcxggc",
       "depends": []
     },
     "clidatajp": {
@@ -51001,16 +51313,10 @@
       "sha256": "1p2xy5r9axkj8yk6ywaq0w5i00bdfm15drjz227nx8p4vd3q6si8",
       "depends": ["RColorBrewer", "ggplot2", "httr", "lubridate", "magrittr", "reshape2", "rvest", "scales", "stringr", "xml2"]
     },
-    "clikcorr": {
-      "name": "clikcorr",
-      "version": "1.0",
-      "sha256": "0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5",
-      "depends": ["mvtnorm"]
-    },
     "climaemet": {
       "name": "climaemet",
-      "version": "1.4.1",
-      "sha256": "0pf4xck985hin5qsvg3yyh4sqainjm47ml19fla6z08l3q1qvyx7",
+      "version": "1.4.2",
+      "sha256": "099sw68yqizlk94f0j62is554jn2ihnp0k82nnmi9ag7qm2bad5i",
       "depends": ["cli", "dplyr", "ggplot2", "httr2", "jsonlite", "rappdirs", "readr", "rlang", "tibble", "tidyr", "xml2"]
     },
     "climate": {
@@ -51117,8 +51423,8 @@
     },
     "clinify": {
       "name": "clinify",
-      "version": "0.1.2",
-      "sha256": "1jkdzr1pmvqjac8awx00xppmdwvbl7p27z2dsphqvb66kwjra7rm",
+      "version": "0.3.0",
+      "sha256": "1fvnfmbap04jvkbhjn1ifddwq573hdb4z7abkkky5fsrvpg66lcy",
       "depends": ["dplyr", "flextable", "htmltools", "knitr", "magrittr", "officer", "tidyselect", "zoo"]
     },
     "clinmon": {
@@ -51127,6 +51433,12 @@
       "sha256": "0cd5mrirfll0zbm9k8glwdqnh4qy4dlfnsypr3xhyf6ppgm35hlv",
       "depends": ["signal"]
     },
+    "clinpubr": {
+      "name": "clinpubr",
+      "version": "1.0.1",
+      "sha256": "0kz9z2cn33ndaghdp9s38vjsdcrimnikh0hgwqy0ffmayjjf6iam",
+      "depends": ["DescTools", "ResourceSelection", "broom", "car", "caret", "dcurves", "dplyr", "fBasics", "forestploter", "ggplot2", "pROC", "rlang", "rms", "rstatix", "stringi", "stringr", "survival", "survminer", "tableone", "tidyr"]
+    },
     "clinsig": {
       "name": "clinsig",
       "version": "1.2",
@@ -51177,8 +51489,8 @@
     },
     "clmplus": {
       "name": "clmplus",
-      "version": "1.0.0",
-      "sha256": "024w8a4qj9sr0vqpfv5sm5gmcy4crin90sfx0z1y13iiznk7kvch",
+      "version": "1.0.1",
+      "sha256": "0xvn7jzc8yhvzf1jpb0qadz5dyaqb67h56wvhrfq1r81w4wda33v",
       "depends": ["ChainLadder", "StMoMo", "forecast", "ggplot2", "gridExtra", "reshape2"]
     },
     "clock": {
@@ -51285,8 +51597,8 @@
     },
     "clubSandwich": {
       "name": "clubSandwich",
-      "version": "0.6.0",
-      "sha256": "025njaxmf0pa3lzrxkffj219rs3wyfp59q52h1v6hwbxa48gh7hg",
+      "version": "0.6.1",
+      "sha256": "0y2zq8n3phyxjkkrlhsjvf4sk0n75xh8ywis2hy2khmridhygb36",
       "depends": ["lifecycle", "sandwich"]
     },
     "clubpro": {
@@ -51303,16 +51615,10 @@
     },
     "clugenr": {
       "name": "clugenr",
-      "version": "1.0.3",
-      "sha256": "0wqhqy6ivhz0nhl0gr5gcxqdvi5ha4mhqgvgjmgaqibpi03dy3l8",
+      "version": "1.0.4",
+      "sha256": "1p85cbls4syrdc5inbc9rwwd4wz6yj6jdz1vk43h44yvyk4p21c8",
       "depends": ["mathjaxr"]
     },
-    "clusEvol": {
-      "name": "clusEvol",
-      "version": "1.0.0",
-      "sha256": "192zi43flpwfazgjd5ci0620hbad77z6s527vp6qwywcly3aqxmw",
-      "depends": ["cluster", "clusterSim", "dplyr", "fpc", "ggplot2", "plotly", "viridis"]
-    },
     "clusTransition": {
       "name": "clusTransition",
       "version": "1.0",
@@ -51433,6 +51739,12 @@
       "sha256": "1lkq2dylimigfpvl4981a6xnn9bi462g0bbfkjz90sak9azzlnwx",
       "depends": ["MASS", "ade4", "cluster", "e1071"]
     },
+    "clusterWebApp": {
+      "name": "clusterWebApp",
+      "version": "0.1.3",
+      "sha256": "0r7j50k8b9z5ak87jgalzy98fn97nngzjhr4jf5dasy8q4qbl28r",
+      "depends": ["DT", "Rtsne", "cluster", "dbscan", "dplyr", "factoextra", "ggplot2", "kernlab", "magrittr", "mclust", "mlbench", "shiny", "shinycssloaders", "shinythemes", "tidyr"]
+    },
     "clusterhap": {
       "name": "clusterhap",
       "version": "0.1",
@@ -51525,8 +51837,8 @@
     },
     "clv": {
       "name": "clv",
-      "version": "0.3-2.4",
-      "sha256": "1zbi4i6z0sphkkjifr2h0pms9ysifh62iwcpmh9kmv2wl5m51vms",
+      "version": "0.3-2.5",
+      "sha256": "1py99g430lgn8x383jzhjipb48gxv0rg62x84y8dpbv4gsv25rnq",
       "depends": ["class", "cluster"]
     },
     "cmAnalysis": {
@@ -51601,6 +51913,12 @@
       "sha256": "0hlz10zrwdk9p0rybfqn04104bv0d9024d0ca1d6v66ymzy3gwlw",
       "depends": []
     },
+    "cmgnd": {
+      "name": "cmgnd",
+      "version": "0.1.1",
+      "sha256": "1k0hws823rmqf3z455sv1yqp8i1hq8hz5nrg9k77nnj0x1v2zsfd",
+      "depends": ["RcppAlgos", "ggplot2", "gnorm", "lubridate", "purrr"]
+    },
     "cmhc": {
       "name": "cmhc",
       "version": "0.2.10",
@@ -51789,9 +52107,9 @@
     },
     "coat": {
       "name": "coat",
-      "version": "0.2.0",
-      "sha256": "01sfssvb20rnjx6vpgyglj96wysr9v00n7fa8mg9l65cgv32dvgc",
-      "depends": ["ggparty", "ggplot2", "ggtext", "gridExtra", "partykit"]
+      "version": "0.2.2",
+      "sha256": "1j2la7msa5xqfnc41qx3avw8qmg18hd8xyyxmhrc4pnr3ngbv8wk",
+      "depends": ["partykit"]
     },
     "cobalt": {
       "name": "cobalt",
@@ -51813,8 +52131,8 @@
     },
     "cobs": {
       "name": "cobs",
-      "version": "1.3-9",
-      "sha256": "1czrnwd8qamznl2vxrj9p37azz7pgqg7ygrhwr4rmhwg5d2k9nrg",
+      "version": "1.3-9-1",
+      "sha256": "1sik2m1qzv24h9difhsfqsjb03krxhq7nd9pcn7fzxd3xn9m0qgk",
       "depends": ["SparseM", "quantreg"]
     },
     "coca": {
@@ -51831,8 +52149,8 @@
     },
     "coconots": {
       "name": "coconots",
-      "version": "2.0.0",
-      "sha256": "1cyj6wqh7xplpkmp1x0b2pq6jc12jmgi2xjd3rbj048lxz6mj8sn",
+      "version": "2.0.1",
+      "sha256": "1m0sq3bgdkf8ks60qbx69p8irw7jw7hdf30zjk2fkn52k9rak90q",
       "depends": ["HMMpa", "JuliaConnectoR", "Rcpp", "forecast", "ggplot2", "matrixStats", "numDeriv"]
     },
     "cocons": {
@@ -51885,9 +52203,9 @@
     },
     "coda_base": {
       "name": "coda.base",
-      "version": "1.0.0",
-      "sha256": "0snwhpjksli90z2x54xwdkcl7h5pwsllxj7zsb8g6k9q90l9kqv7",
-      "depends": ["Rcpp", "RcppArmadillo"]
+      "version": "1.0.3",
+      "sha256": "1r22yy7id4j1i1m7zd0vqvqyfcly22viw3p7wdfc6bx388shfzqd",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo"]
     },
     "coda_plot": {
       "name": "coda.plot",
@@ -51963,8 +52281,8 @@
     },
     "codemetar": {
       "name": "codemetar",
-      "version": "0.3.5",
-      "sha256": "0py4qn9148xlc1ldlifpm7vd7l9dih4f7yiadvmz57b3y2vr0b02",
+      "version": "0.3.6",
+      "sha256": "0v7zzf7hh5f56wsvm69alqyim8y3npjdrh85qvw8936la6xlh7db",
       "depends": ["cli", "codemeta", "commonmark", "crul", "desc", "gert", "gh", "jsonlite", "magrittr", "memoise", "pingr", "purrr", "remotes", "sessioninfo", "urltools", "xml2"]
     },
     "codename": {
@@ -52177,12 +52495,6 @@
       "sha256": "1av82yrp6csw7700ymipd02j73cmzn0apv7ykachjw09nzk86kvj",
       "depends": ["nlsr"]
     },
-    "collUtils": {
-      "name": "collUtils",
-      "version": "1.0.5",
-      "sha256": "0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p",
-      "depends": ["Rcpp", "rJava"]
-    },
     "collapse": {
       "name": "collapse",
       "version": "2.1.2",
@@ -52383,9 +52695,9 @@
     },
     "colorrepel": {
       "name": "colorrepel",
-      "version": "0.4.1",
-      "sha256": "0ba2fr274wwqr4ra8srn3jy3b9y2w0wf4yxdkhimkmwwnb0sfrg8",
-      "depends": ["Matrix", "Polychrome", "distances", "dplyr", "dqrng", "ggalt", "ggplot2", "ggrepel", "gtools", "knitr", "matrixStats", "plotly", "plyr", "png", "purrr", "stringr"]
+      "version": "0.4.3",
+      "sha256": "1568jgvnr25fph8varc27phgklspbjklh6826qn3sk61mddibxxc",
+      "depends": ["Matrix", "Polychrome", "distances", "dplyr", "dqrng", "ggplot2", "ggrepel", "gtools", "knitr", "matrixStats", "plotly", "plyr", "png", "purrr", "stringr"]
     },
     "colors3d": {
       "name": "colors3d",
@@ -52567,6 +52879,12 @@
       "sha256": "0slxxq4jw2abfvg725x1hd7jmrsdc6ckbgzjzin081ll29axrfxg",
       "depends": []
     },
+    "commecometrics": {
+      "name": "commecometrics",
+      "version": "1.0.0",
+      "sha256": "1nrmw71snr0ywinyx781g31in1mip7z7px2wd4q1lmlqsgp352v6",
+      "depends": ["dplyr", "ggplot2", "leaflet", "purrr", "raster", "rnaturalearth", "sf", "tibble", "viridis"]
+    },
     "common": {
       "name": "common",
       "version": "1.1.3",
@@ -52575,8 +52893,8 @@
     },
     "commonmark": {
       "name": "commonmark",
-      "version": "1.9.5",
-      "sha256": "0radgpdvpzhw3615jmjac7vhqnq0j6dfi9avhw4q4zz12vwrdgzs",
+      "version": "2.0.0",
+      "sha256": "0139jfaal03099kdykcljypaznrd7linx7x6fcm1wpgzykwxfivz",
       "depends": []
     },
     "commonsMath": {
@@ -52593,9 +52911,9 @@
     },
     "comorbidPGS": {
       "name": "comorbidPGS",
-      "version": "0.3.4",
-      "sha256": "1dy8yfyy88vw2x8mk6n3nx2dbkf17m4ibvbkxhrywralvll0wspa",
-      "depends": ["MASS", "ggplot2", "nnet"]
+      "version": "1.0.0",
+      "sha256": "0nzxl11m7913j0h63rzlaji2nvwn2hqmd6mdyf8r9nh1l1a3zxj3",
+      "depends": ["MASS", "ggplot2", "ivreg", "nnet"]
     },
     "comorbidity": {
       "name": "comorbidity",
@@ -52755,8 +53073,8 @@
     },
     "compound_Cox": {
       "name": "compound.Cox",
-      "version": "3.32",
-      "sha256": "1xgl45i764x1lmqbv6q16jhfn211m28zyqhaj4xmv8g6i11sxy3j",
+      "version": "3.33",
+      "sha256": "0l4igxy7v783dabpqljj5335jy3h8azsy97c8gwmrbp1cxxsdh1h",
       "depends": ["MASS", "numDeriv", "survival"]
     },
     "comprehenr": {
@@ -52801,6 +53119,12 @@
       "sha256": "005bk3y7il94h7zlkdjlibm1zm9yplbbzlybdjxmckh67sr6d03x",
       "depends": []
     },
+    "conMItion": {
+      "name": "conMItion",
+      "version": "0.2.0",
+      "sha256": "0s54iqvh15sw165cc7vviy9bspa7dwphss681s742s2d39a9np61",
+      "depends": []
+    },
     "conStruct": {
       "name": "conStruct",
       "version": "1.0.6",
@@ -52819,12 +53143,6 @@
       "sha256": "033rxc0sh4crilqqahypd1yhzcxa1m7q10yg7paj637f9syaxcdh",
       "depends": []
     },
-    "concatenate": {
-      "name": "concatenate",
-      "version": "1.0.0",
-      "sha256": "1kvsw7vwa3hn97ff7r6z21h5ajs74azwv2dk4pzgyaasnbp778hw",
-      "depends": []
-    },
     "concatipede": {
       "name": "concatipede",
       "version": "1.0.1",
@@ -52989,8 +53307,8 @@
     },
     "confidence": {
       "name": "confidence",
-      "version": "1.1-2",
-      "sha256": "0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z",
+      "version": "1.1-3",
+      "sha256": "15zvzkbbg4f2w4wyhbq5rllhv3j926m0x0kvri5azpyd4lfyrlik",
       "depends": ["ggplot2", "knitr", "markdown", "plyr", "xtable"]
     },
     "config": {
@@ -53019,8 +53337,8 @@
     },
     "confintROB": {
       "name": "confintROB",
-      "version": "1.0-1",
-      "sha256": "13fbq4zxs90sy49c55b9i2i8yq3g3p4p45cx30rs7yrb3610zkfb",
+      "version": "1.0-2",
+      "sha256": "1krp73kh3zjijm6rgp5ly7vrcqn1z4z46zzvs0dw0dkwmm40z3yh",
       "depends": ["MASS", "foreach", "lme4", "mvtnorm", "tidyr"]
     },
     "confinterpret": {
@@ -53067,8 +53385,8 @@
     },
     "conformalbayes": {
       "name": "conformalbayes",
-      "version": "0.1.2",
-      "sha256": "0pl1ajix5v3zckny5angk1rqnalln4agf65yrdva210zl6wp7fzm",
+      "version": "0.1.4",
+      "sha256": "0v13nnz9s2w9rwdy29vy8ff48pzkkc05n3x0vzqspn06ashbpf40",
       "depends": ["cli", "loo", "matrixStats", "rstantools"]
     },
     "conformalpvalue": {
@@ -53121,8 +53439,8 @@
     },
     "connectapi": {
       "name": "connectapi",
-      "version": "0.7.0",
-      "sha256": "08ypacyv8rpalk5i6cccv8qhqbrmjqg3k55s5c2xcsg0fhgikbv4",
+      "version": "0.8.0",
+      "sha256": "1600gxivq5qmlf8bbyw29vr996w5m77rh5l2f33sm35c5dhl2pc5",
       "depends": ["R6", "base64enc", "bit64", "fs", "glue", "httr", "jsonlite", "lifecycle", "magrittr", "mime", "purrr", "rlang", "tibble", "uuid", "vctrs"]
     },
     "connectcreds": {
@@ -53281,6 +53599,12 @@
       "sha256": "0kirab46p51n6592lsa82bkwi5g3rx5ixz6ag1ds74yw3r8j62g5",
       "depends": ["R6", "data_table"]
     },
+    "contdid": {
+      "name": "contdid",
+      "version": "0.1.0",
+      "sha256": "09bh1rdcxpqr72civl3gv1pa4kndn0r03rl35j98pld5hf3mif0j",
+      "depends": ["BMisc", "MASS", "checkmate", "ggplot2", "npiv", "ptetools", "sandwich", "splines2"]
+    },
     "contentid": {
       "name": "contentid",
       "version": "0.0.19",
@@ -53355,8 +53679,8 @@
     },
     "contsurvplot": {
       "name": "contsurvplot",
-      "version": "0.2.1",
-      "sha256": "0z0s1ym9np9l8pmgbja46w25zr415laa1w68mjz04hq9wrzjjaca",
+      "version": "0.2.2",
+      "sha256": "0wq7n3zlk706kz9m1ksqip46xjc6ih5k2vhh3vybskpp0w1ck0sv",
       "depends": ["dplyr", "foreach", "ggplot2", "riskRegression", "rlang"]
     },
     "convdistr": {
@@ -53419,12 +53743,6 @@
       "sha256": "1pmiirigjdkrb3pzqcw6qlh6418z384mvaxqw5mrcm1gxzrqp649",
       "depends": ["MASS", "StatMatch", "ellipse", "fields", "plotrix"]
     },
-    "cooccur": {
-      "name": "cooccur",
-      "version": "1.3",
-      "sha256": "1wlaghhi4f3v8kzwhcgq3c6as7v3zlpkzhb232qz1amr7f0058kv",
-      "depends": ["ggplot2", "gmp", "reshape2"]
-    },
     "cookiecutter": {
       "name": "cookiecutter",
       "version": "0.1.0",
@@ -53445,9 +53763,9 @@
     },
     "cooltools": {
       "name": "cooltools",
-      "version": "2.4",
-      "sha256": "1ammi354y2cbaarf29s9kjks8k0zdimcxif6crakn9p3vi30h0nk",
-      "depends": ["FNN", "MASS", "Rcpp", "bit64", "celestial", "cubature", "data_table", "jpeg", "plotrix", "png", "pracma", "randtoolbox", "raster", "sp"]
+      "version": "2.18",
+      "sha256": "1xl3k63zwqb42ax0jww6r9nbwsx23wbnclp2k3qpjjdd6x0m78vp",
+      "depends": ["FNN", "MASS", "Rcpp", "bit64", "celestial", "cubature", "data_table", "float", "hdf5r", "jpeg", "plotrix", "png", "pracma", "randtoolbox", "raster", "sp"]
     },
     "coop": {
       "name": "coop",
@@ -53457,8 +53775,8 @@
     },
     "copBasic": {
       "name": "copBasic",
-      "version": "2.2.7",
-      "sha256": "1gx49q1psf0pifiaym2w2bff1cwhjw5dhkh326nq29w452xps7kr",
+      "version": "2.2.8",
+      "sha256": "040xar3lc94q0zj9rllzd2mjvcc1kmlxiaamnvxsdawjp6s48l8s",
       "depends": ["lmomco", "randtoolbox"]
     },
     "copCAR": {
@@ -53485,10 +53803,16 @@
       "sha256": "0ymjpwqbdfbyrvszi5avpbx086i4lwrxgxysr0rlnh2wfm849vsj",
       "depends": []
     },
+    "copernicusR": {
+      "name": "copernicusR",
+      "version": "0.1.0",
+      "sha256": "0gik19nw164hzadbbnkl37xg4ndxc95swy331hv9prwcv9fxw9bq",
+      "depends": ["reticulate"]
+    },
     "cophescan": {
       "name": "cophescan",
-      "version": "1.4.1",
-      "sha256": "0lnc20f1xaijibza4px9m47fy70jz9y9y5m7wk5h50kb4dh6ywxh",
+      "version": "1.4.2",
+      "sha256": "008ajabw40m1d18rjc9dyxrw8dhlgs64ki5yr14204dm3jvgb712",
       "depends": ["Rcpp", "RcppArmadillo", "coloc", "data_table", "dplyr", "ggplot2", "ggrepel", "magrittr", "matrixStats", "pheatmap", "viridis"]
     },
     "copre": {
@@ -53709,8 +54033,8 @@
     },
     "corpustools": {
       "name": "corpustools",
-      "version": "0.5.1",
-      "sha256": "154n9gxzg9cx10sxbb05df9wsr378k2qhkprqr9cyh1q5ll1pki7",
+      "version": "0.5.2",
+      "sha256": "1als91awsa32i0sk57zcdr0zhg2bilh9jpq6mmrpwc14qafkl983",
       "depends": ["Matrix", "R6", "RNewsflow", "Rcpp", "RcppProgress", "data_table", "digest", "igraph", "pbapply", "quanteda", "rsyntax", "stringi", "tokenbrowser", "udpipe", "wordcloud"]
     },
     "corr2D": {
@@ -53769,8 +54093,8 @@
     },
     "correlation": {
       "name": "correlation",
-      "version": "0.8.7",
-      "sha256": "0r0mvhmywzic3dfx49y1z9pbkwm3mwy9k6f04ywidi04sk759za0",
+      "version": "0.8.8",
+      "sha256": "1m5acyw6g3brgw8pfn4aaklx2rwgzf0pxsrg6qd99d8h4cnw9jq0",
       "depends": ["bayestestR", "datawizard", "insight", "parameters"]
     },
     "correlationfunnel": {
@@ -53953,12 +54277,6 @@
       "sha256": "0h89knii8zkbq0lw7yn3qzak30s7bifq53ga4vy6za6hqwc53x2j",
       "depends": ["ComplexHeatmap", "circlize"]
     },
-    "countTransformers": {
-      "name": "countTransformers",
-      "version": "0.0.6",
-      "sha256": "14n2sv7wqzslrzg0ag473ljj9mvha94161p5yh2h9l1vx7xliimf",
-      "depends": ["Biobase", "MASS", "limma"]
-    },
     "countcolors": {
       "name": "countcolors",
       "version": "0.9.1",
@@ -53985,8 +54303,8 @@
     },
     "countfitteR": {
       "name": "countfitteR",
-      "version": "1.4",
-      "sha256": "1aq7v2fy24pf3r6fkmcwvs18r2xc2l1bqablp53xfc7b6kxq3vqn",
+      "version": "1.5",
+      "sha256": "0ky0ql4an8y3wr97lp16v8xnlq4zcniihp49n7mrh3y6ryghsg3h",
       "depends": ["MASS", "ggplot2", "pscl", "shiny"]
     },
     "countgmifs": {
@@ -54033,8 +54351,8 @@
     },
     "coursekata": {
       "name": "coursekata",
-      "version": "0.18.1",
-      "sha256": "0j3c42f3ay3k5w2jrlq0yd2jh0p38q5lywp5rawhvls2ibg45ibm",
+      "version": "0.19.0",
+      "sha256": "124lzp2xw90y1l97zhl2ydkagbzd5qgv2mj1f8il8vss604ffc2n",
       "depends": ["Metrics", "cli", "dslabs", "ggformula", "ggplot2", "glue", "lsr", "mosaic", "palmerpenguins", "purrr", "remotes", "rlang", "supernova", "vctrs", "viridisLite"]
     },
     "covBM": {
@@ -54183,8 +54501,8 @@
     },
     "covidcast": {
       "name": "covidcast",
-      "version": "0.5.2",
-      "sha256": "0d4x3cydjng0f0gzn8fly44hf2viypym6ag7mzwips7791rhcm6k",
+      "version": "0.5.3",
+      "sha256": "1gydzczhhscr9qijpc2fyw200ws2db957yrgcdl9qcbm71k17d8m",
       "depends": ["MMWRweek", "dplyr", "ggplot2", "httr", "purrr", "rlang", "sf", "tidyr", "xml2"]
     },
     "covidmx": {
@@ -54243,8 +54561,8 @@
     },
     "cowplot": {
       "name": "cowplot",
-      "version": "1.1.3",
-      "sha256": "0wxjynpbamyimpms7psbac7xgwswzlidczpc037q20y5yld9fml7",
+      "version": "1.2.0",
+      "sha256": "188s4dpyys71byq2kd3ljcl2dn5akp0n7ng08mgh13xn9wm5h7a3",
       "depends": ["ggplot2", "gtable", "rlang", "scales"]
     },
     "cowsay": {
@@ -54253,12 +54571,6 @@
       "sha256": "1z4qrzzcjix5yk95wp8dj4wg8sg306bf42603qxl0xd9m57qjaal",
       "depends": ["crayon", "rlang"]
     },
-    "coxed": {
-      "name": "coxed",
-      "version": "0.3.3",
-      "sha256": "09jnqza8wp2palayb0vsz43qmh8470gxil1l7g3b65lmxa7wpmnh",
-      "depends": ["PermAlgo", "dplyr", "ggplot2", "gridExtra", "mediation", "mgcv", "rms", "survival", "tidyr"]
-    },
     "coxerr": {
       "name": "coxerr",
       "version": "1.1",
@@ -54285,8 +54597,8 @@
     },
     "coxphm": {
       "name": "coxphm",
-      "version": "0.2.0",
-      "sha256": "1xiymqskxvi9vxq9zi3hzpxfjb97d5dagwzvdg46imzxv8bbzaia",
+      "version": "0.2.1",
+      "sha256": "1wgdnl85z5v6nbiw5zh82z9yvckyibg782ajfjshcg9r99np09kg",
       "depends": ["MASS", "survival"]
     },
     "coxphw": {
@@ -54339,10 +54651,16 @@
     },
     "cpfa": {
       "name": "cpfa",
-      "version": "1.2-0",
-      "sha256": "19xmrhk12ri8wd1p43wl3g362xzidnk232lv06i9lsy01jzmqgxx",
+      "version": "1.2-1",
+      "sha256": "07is8l4pwrvhm6nfqjwavhsrjy7lyjc7h1nhq7d9jnfikm46dmk9",
       "depends": ["doParallel", "e1071", "foreach", "glmnet", "multiway", "nnet", "randomForest", "rda", "xgboost"]
     },
+    "cpgfR": {
+      "name": "cpgfR",
+      "version": "0.0.1.0",
+      "sha256": "146an2zbvv3dghkyf8cb0fi5hmqr5mykixdlxxsmn30x7rfd7b05",
+      "depends": ["curl", "data_table", "deflateBR", "lubridate", "osfr", "stringr"]
+    },
     "cpi": {
       "name": "cpi",
       "version": "0.1.5",
@@ -54393,8 +54711,8 @@
     },
     "cpp11armadillo": {
       "name": "cpp11armadillo",
-      "version": "0.5.2",
-      "sha256": "0gck7wzp4z75z57xxg0k4bcc2my9xmzy387msvmlapmq0mw6yxfz",
+      "version": "0.5.4",
+      "sha256": "132d5qliphxlamf55vrb8vmfk1rbxrpcbbs909d0qbkvn35b3l80",
       "depends": ["cpp11"]
     },
     "cpp11bigwig": {
@@ -54519,8 +54837,8 @@
     },
     "crandep": {
       "name": "crandep",
-      "version": "0.3.12",
-      "sha256": "151ssp2v3fawkm97pby63z7x52q8mgsl6acjdk03kviip6li4qgy",
+      "version": "0.3.13",
+      "sha256": "1kgqshbvqqd3ywi6lma925i5375gy4gfgm8q93b0pznayy1pfwy8",
       "depends": ["Rcpp", "RcppArmadillo", "dplyr", "gsl", "igraph", "pracma", "stringr"]
     },
     "crane": {
@@ -54909,8 +55227,8 @@
     },
     "crqa": {
       "name": "crqa",
-      "version": "2.0.6",
-      "sha256": "117sxxil4yzqss7b8d5r7y2grpc6nzcli9mrjaarsk10k95c4bwp",
+      "version": "2.0.7",
+      "sha256": "1ic503sivm94d6ib4zlr0c4dfvgz17ivzflcdf79qbvb60zxwbm8",
       "depends": ["Matrix", "dplyr", "ggplot2", "gplots", "pracma", "rdist", "tseriesChaos"]
     },
     "crrSC": {
@@ -54975,9 +55293,9 @@
     },
     "crul": {
       "name": "crul",
-      "version": "1.5.0",
-      "sha256": "17dx3qhdssk0zanp73g0d7h3imhwh9ydzs009fbrspw1s9w3fwyv",
-      "depends": ["R6", "curl", "httpcode", "jsonlite", "mime", "urltools"]
+      "version": "1.6.0",
+      "sha256": "02awbi4a5b71h2dfxqccsz99d596n588sn8dq797mbjs3gm7g3y5",
+      "depends": ["R6", "curl", "httpcode", "jsonlite", "lifecycle", "mime", "rlang", "urltools"]
     },
     "crumble": {
       "name": "crumble",
@@ -55005,8 +55323,8 @@
     },
     "cry": {
       "name": "cry",
-      "version": "0.5.1",
-      "sha256": "0n1yyjkqj0kqs53g27chl7lhk07f7aj81jwyvaxfmfkp03xzjj0d",
+      "version": "0.5.2",
+      "sha256": "0x60k9q47visrwl138ym918hpg33gix97sbl3661fg8dp4gnafc3",
       "depends": ["ggplot2", "zoo"]
     },
     "crypto2": {
@@ -55281,8 +55599,8 @@
     },
     "ctmm": {
       "name": "ctmm",
-      "version": "1.2.0",
-      "sha256": "0fmihi6ihk4jgg0abyhlfhg4wx91sq06xr11dc0vbhcyaq2090r4",
+      "version": "1.3.0",
+      "sha256": "147spyzcp744gy5mvvwgsmhnkxk8iqrlzc4g9lk7c9x13n16g73c",
       "depends": ["Bessel", "Gmedian", "MASS", "data_table", "digest", "expm", "fasttime", "gsl", "manipulate", "numDeriv", "parsedate", "pbivnorm", "pracma", "raster", "sf", "shape", "sp", "statmod", "terra"]
     },
     "ctmva": {
@@ -55293,21 +55611,21 @@
     },
     "ctqr": {
       "name": "ctqr",
-      "version": "2.1",
-      "sha256": "050v5am4cmr6y35ygppabs32hlzpngfqy1wdpqwc76kc3m097mlr",
+      "version": "2.2",
+      "sha256": "1pm4q0p8vldjiv29sa7c86rrs2f36ssjlcdch806yxygb68xs7dm",
       "depends": ["pch", "survival"]
     },
     "ctrdata": {
       "name": "ctrdata",
-      "version": "1.22.3",
-      "sha256": "0a2y6swr1695grarjfp71q0cnlh3cmi1s35srvjg2fn82kw4svby",
-      "depends": ["V8", "clipr", "countrycode", "curl", "digest", "dplyr", "htmlwidgets", "httr", "jqr", "jsonlite", "lubridate", "nodbi", "readr", "rlang", "stringdist", "stringi", "tibble", "tidyr", "xml2", "zip"]
+      "version": "1.24.1",
+      "sha256": "0vgra3hjl5s2mdqxnvk4r7whq6ikghhy03gp0q6rkjrvg275mbd6",
+      "depends": ["V8", "dplyr", "htmlwidgets", "httr2", "jqr", "jsonlite", "lubridate", "nodbi", "readr", "rlang", "rvest", "stringdist", "stringi", "tidyr", "xml2", "zip"]
     },
     "ctrialsgov": {
       "name": "ctrialsgov",
-      "version": "0.2.5",
-      "sha256": "0hdh1fdfaja8amf7fkvk1c6yif703132bvacq0j9pk5jr97czgpw",
-      "depends": ["DBI", "Matrix", "dplyr", "ggplot2", "htmlwidgets", "lubridate", "plotly", "purrr", "rlang", "stringi", "tibble"]
+      "version": "0.2.7",
+      "sha256": "01y2b21wjybh5ljyzd8a9mw8r7367awf0vj5w7zwygjbjwajc7xi",
+      "depends": ["DBI", "Matrix", "dplyr", "lubridate", "purrr", "rlang", "stringi", "tibble"]
     },
     "ctrlGene": {
       "name": "ctrlGene",
@@ -55317,9 +55635,9 @@
     },
     "ctsem": {
       "name": "ctsem",
-      "version": "3.10.2",
-      "sha256": "03wvjsmsgpchh1nm0xxfyv707g768wgsfdshpmm16c5adq3pn987",
-      "depends": ["BH", "Deriv", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cOde", "data_table", "expm", "ggplot2", "mize", "mvtnorm", "plyr", "rstan", "rstantools", "statmod", "tibble"]
+      "version": "3.10.4",
+      "sha256": "0j4cg4j9whhy6gkqmj7aa5yr3ym4433k4vm27s8fl2c8i1i4b55d",
+      "depends": ["BH", "Deriv", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cOde", "data_table", "expm", "ggplot2", "mize", "mvtnorm", "parallelly", "plyr", "rstan", "rstantools", "tibble"]
     },
     "ctsemOMX": {
       "name": "ctsemOMX",
@@ -55341,8 +55659,8 @@
     },
     "ctv": {
       "name": "ctv",
-      "version": "0.9-6",
-      "sha256": "0w300vcvn663zpi5whv3512wchwmhjn6aamynmb6fmayf7ahsmf5",
+      "version": "0.9-7",
+      "sha256": "0d8kac74hncbjiz4jcg7f3931lqdcga3hk8n8fxdj37y33f6dapb",
       "depends": []
     },
     "ctxR": {
@@ -55353,8 +55671,8 @@
     },
     "ctypesio": {
       "name": "ctypesio",
-      "version": "0.1.2",
-      "sha256": "14g5j670bqdgalp351xbvr0df45jbw26jzvm5j9xccgyfqvzwr2r",
+      "version": "0.1.3",
+      "sha256": "0hm65vv89pszvmj34yn24a14bdl7z1kf38jbdwv9n8wxldypfij2",
       "depends": []
     },
     "cuRe": {
@@ -55419,8 +55737,8 @@
     },
     "cucumber": {
       "name": "cucumber",
-      "version": "2.1.0",
-      "sha256": "1fjk7vkf28yb3xvbmy955ph92n57cpk5vnxw80vxb63milxva0bg",
+      "version": "2.1.1",
+      "sha256": "1xkac688szxjs9sfnc3zwin6dg9072fizrcwaklwvqy62r1gri8q",
       "depends": ["checkmate", "cli", "dplyr", "fs", "glue", "purrr", "rlang", "stringr", "testthat", "tibble", "withr"]
     },
     "cuda_ml": {
@@ -55441,12 +55759,6 @@
       "sha256": "153cjl6x6mm6dix77bv9614nrd7x7qimwkw96mgxwarfpf1172nn",
       "depends": []
     },
-    "cumstats": {
-      "name": "cumstats",
-      "version": "1.0",
-      "sha256": "119w751z9dg6pjyk389pbl8ab8pirf9sqndi4nxi89ix2bby4xz8",
-      "depends": []
-    },
     "cumulcalib": {
       "name": "cumulcalib",
       "version": "0.0.1",
@@ -55485,8 +55797,8 @@
     },
     "curl": {
       "name": "curl",
-      "version": "6.3.0",
-      "sha256": "0qq6pi1dzkdvnddx7azkanq6amp9bdn2k9qddlmgrnbfllk6x8kb",
+      "version": "6.4.0",
+      "sha256": "1nzcfy1swc3r505az9hzqwizmn9i7cmkymb7km2b9hyjjbwdpd1v",
       "depends": []
     },
     "currencyapi": {
@@ -55611,8 +55923,8 @@
     },
     "cv": {
       "name": "cv",
-      "version": "2.0.3",
-      "sha256": "0d0js2sfffb7k3dl89j166c90sk1a1zh1rsyx04y9grhspahiqli",
+      "version": "2.0.4",
+      "sha256": "0h9v4pi2zhfbq5x89as2s27989c5xiz75py6dq2saihqzjp8piyr",
       "depends": ["MASS", "car", "doParallel", "foreach", "glmmTMB", "gtools", "insight", "lattice", "lme4", "nlme"]
     },
     "cvAUC": {
@@ -55701,8 +56013,8 @@
     },
     "cvms": {
       "name": "cvms",
-      "version": "1.7.0",
-      "sha256": "09wr85lygkkpfcraa63m45qrfxy7zd5niww0zmbvqym16fz72xk6",
+      "version": "1.8.0",
+      "sha256": "0d3fgrrphvpfd5drk4rrxwq77zaz8byrajnm2zzwqs3rn1ry8d17",
       "depends": ["MuMIn", "checkmate", "data_table", "dplyr", "ggplot2", "groupdata2", "lifecycle", "lme4", "pROC", "parameters", "plyr", "purrr", "rearrr", "recipes", "rlang", "stringr", "tibble", "tidyr"]
     },
     "cvsem": {
@@ -55711,12 +56023,6 @@
       "sha256": "148v8axwxfr328l709b6q1fmqnzmiw9g7589zgwha4d6lrx4ak4i",
       "depends": ["Rdpack", "lavaan"]
     },
-    "cvwrapr": {
-      "name": "cvwrapr",
-      "version": "1.0",
-      "sha256": "17h017p76y7sjcwik48ravygmyivj6kvkhqy5s9ch0nwzzcrzvj3",
-      "depends": ["foreach", "survival"]
-    },
     "cwot": {
       "name": "cwot",
       "version": "0.1.0",
@@ -55803,8 +56109,8 @@
     },
     "cytometree": {
       "name": "cytometree",
-      "version": "2.0.2",
-      "sha256": "18g7av73lmnyga1kk24bf8jy599zn9n6qhr13mxsqgi0zdinicfa",
+      "version": "2.0.6",
+      "sha256": "03z5hjghbjzq3ajdz9wzjrmd05rf1pw4aijqw3swxm736sz92la1",
       "depends": ["GoFKernel", "Rcpp", "RcppArmadillo", "cowplot", "ggplot2", "igraph", "mclust"]
     },
     "cytominer": {
@@ -55821,8 +56127,8 @@
     },
     "czso": {
       "name": "czso",
-      "version": "0.4.1",
-      "sha256": "0hsml601swdig8ky210c8w3n2zfgn3f14ai9l43ni1iplkcpcdxi",
+      "version": "0.4.2",
+      "sha256": "1lk0i2dgcaqhslg9s1g5s4b7d968bj96hb7hb8z9yxjbbw1lxgdh",
       "depends": ["cli", "curl", "dplyr", "httr", "jsonlite", "lifecycle", "magrittr", "readr", "rlang", "stringi", "tibble"]
     },
     "d3Network": {
@@ -56029,6 +56335,12 @@
       "sha256": "0ljhpw2f4hbkqh6c6gwqwwdsa4kp5qvyphig5zcn6qrb9ryf3wh1",
       "depends": ["s20x"]
     },
+    "dagHMM": {
+      "name": "dagHMM",
+      "version": "0.1.1",
+      "sha256": "0hai26wr0rhiyj366hyqan6262bp6jncc9557p9zwz6iwqgynjym",
+      "depends": ["PRROC", "bnclassify", "bnlearn", "future", "gtools", "matrixStats"]
+    },
     "dagR": {
       "name": "dagR",
       "version": "1.2.1",
@@ -56067,21 +56379,21 @@
     },
     "daiquiri": {
       "name": "daiquiri",
-      "version": "1.1.1",
-      "sha256": "05057i8xvkzyd8h1ppw7qip1d4yjgzimmb5chbdw72mwwgbrwrfy",
+      "version": "1.2.0",
+      "sha256": "1vwgsk55sqanqchyxs1aar40d8si5v7k0hn6i4sc9w51wwq4lfwh",
       "depends": ["cowplot", "data_table", "ggplot2", "reactable", "readr", "rmarkdown", "scales", "xfun"]
     },
     "daltoolbox": {
       "name": "daltoolbox",
-      "version": "1.2.707",
-      "sha256": "081kq2p6avkmdz00ivdzqx9qfl6grk3p2mjn3xw4dgivzmkn9mkp",
-      "depends": ["FNN", "MLmetrics", "caret", "class", "cluster", "dbscan", "dplyr", "e1071", "forecast", "ggplot2", "nnet", "randomForest", "reshape", "tree"]
+      "version": "1.2.727",
+      "sha256": "1kkpkhwl39fbvqr931fscbh9ap69zahjdlqb9v79mabadxjnbd6p",
+      "depends": ["FNN", "caret", "class", "cluster", "dbscan", "dplyr", "e1071", "ggplot2", "nnet", "randomForest", "reshape", "tree"]
     },
     "daltoolboxdp": {
       "name": "daltoolboxdp",
-      "version": "1.2.707",
-      "sha256": "1d6d0b80gxggjap8wzc639ckwm3h1fjjc0qgc3a2b7n4dxzc0qj1",
-      "depends": ["FSelector", "daltoolbox", "doBy", "glmnet", "leaps", "reticulate", "smotefamily"]
+      "version": "1.2.727",
+      "sha256": "1z4iy191lrg6c8zx2r3zbv934fvhxxwfix9p7bz5hnm7rypzyif5",
+      "depends": ["FSelector", "daltoolbox", "doBy", "glmnet", "leaps", "reticulate", "smotefamily", "tspredit"]
     },
     "dam": {
       "name": "dam",
@@ -56223,8 +56535,8 @@
     },
     "data_table": {
       "name": "data.table",
-      "version": "1.17.4",
-      "sha256": "0lq774b5nyjc5k30mbg6834wzwihx72cc35nf0032jc2wfhb4vir",
+      "version": "1.17.8",
+      "sha256": "1q1h2dlvdgpr6s1vpdifwcg1jbig4z3h1vdqqbd4z4a8snb49whp",
       "depends": []
     },
     "data_table_threads": {
@@ -56295,9 +56607,9 @@
     },
     "dataRetrieval": {
       "name": "dataRetrieval",
-      "version": "2.7.18",
-      "sha256": "0am07lj0jcb3fgirbb5y5354mznc7262fiyi10bncv5qmxgzmaxx",
-      "depends": ["curl", "httr2", "jsonlite", "lubridate", "readr", "xml2"]
+      "version": "2.7.20",
+      "sha256": "0fnvwwjsgp48h4pwfi14y7ixak6kz8qvs2x4jsn0qlavm9l1c9vl",
+      "depends": ["curl", "httr2", "jsonlite", "lubridate", "readr", "sf", "whisker", "xml2"]
     },
     "dataSDA": {
       "name": "dataSDA",
@@ -56349,9 +56661,9 @@
     },
     "datamedios": {
       "name": "datamedios",
-      "version": "1.2.1",
-      "sha256": "1i7zzikmk124dh6711mnm8zhpm1q5imnvsgywrclag1jcrjy7yry",
-      "depends": ["DT", "dplyr", "ggplot2", "httr", "jsonlite", "lubridate", "magrittr", "purrr", "rlang", "rvest", "stringr", "tidytext", "wordcloud2", "xml2"]
+      "version": "1.2.2",
+      "sha256": "06nif692h901iknlz7w8c2v2p7cm1m85lj2653qx2fdmm29gmlb9",
+      "depends": ["DT", "dplyr", "ggplot2", "httr", "jsonlite", "lubridate", "magrittr", "plotly", "purrr", "rlang", "rvest", "stringr", "tidytext", "wordcloud2", "xml2"]
     },
     "datamods": {
       "name": "datamods",
@@ -56361,9 +56673,9 @@
     },
     "datana": {
       "name": "datana",
-      "version": "1.1.0",
-      "sha256": "0f83hp1gcc5dn4lxr28ia9sa46lsmsj83vdg6k3fdvch036mlaag",
-      "depends": ["Hmisc", "ggplot2"]
+      "version": "1.1.1",
+      "sha256": "0f28gw9nj7aiqkzb499xby3adxz8bn484fhlmqsf5rx9jw9zbh52",
+      "depends": ["Hmisc", "ggplot2", "scales"]
     },
     "datanugget": {
       "name": "datanugget",
@@ -56499,14 +56811,14 @@
     },
     "dataviewR": {
       "name": "dataviewR",
-      "version": "0.1.0",
-      "sha256": "0sn5v617k9mkc74bsai7f93d8ss802rirda338vyrsvfsx8bq4ca",
+      "version": "0.1.1",
+      "sha256": "13bnajf3j5yv6ahhin5yhk7p5nyw7y9qixwndk9vq98jwfdkmj9f",
       "depends": ["DT", "datamods", "dplyr", "forcats", "htmlwidgets", "labelled", "purrr", "shiny", "shinyjs", "stringr", "tibble"]
     },
     "datawizard": {
       "name": "datawizard",
-      "version": "1.1.0",
-      "sha256": "1zwl59852fi89nn696a1awf84qxcn1zjmmkcfp3rzpl0zm8mszg3",
+      "version": "1.2.0",
+      "sha256": "0ffd4lg4i3d0i5xn9fjl17jvd0nsf5p1xkaif777afg1wrj1qi1k",
       "depends": ["insight"]
     },
     "datazoom_amazonia": {
@@ -56691,8 +57003,8 @@
     },
     "dbi_table": {
       "name": "dbi.table",
-      "version": "1.0.3",
-      "sha256": "18gwlv6c2pipy1f1pp9ymbabnh67y438hm1scragv8y39gw6cr7v",
+      "version": "1.0.4",
+      "sha256": "0yhjzgbigx2z1gb6x7bvljp6rqh6bqa2fqhh68n5q7xzm1m5n0ig",
       "depends": ["DBI", "bit64", "dbplyr", "rlang", "stringi"]
     },
     "dblcens": {
@@ -56709,8 +57021,8 @@
     },
     "dbmss": {
       "name": "dbmss",
-      "version": "2.10-0",
-      "sha256": "096xly2bck2dizl1z06yc1b48dbs8bn46s031vcadyk8s5zxvmfi",
+      "version": "2.11-0",
+      "sha256": "0jjbjm3jzm1z9y51a6n3ylkj4492pc4g7dvh6x5j21lc4nks44fb",
       "depends": ["Rcpp", "RcppParallel", "cubature", "doFuture", "foreach", "future", "ggplot2", "progressr", "reshape2", "rlang", "spatstat_explore", "spatstat_geom", "spatstat_random", "spatstat_utils", "tibble"]
     },
     "dbnR": {
@@ -56751,8 +57063,8 @@
     },
     "dbstats": {
       "name": "dbstats",
-      "version": "2.0.2",
-      "sha256": "1rnjgzil98rys9fa0jkamfqrkski3vd7wi59mqg8xk26xw0v5c96",
+      "version": "2.0.3",
+      "sha256": "134wrfzayhl0aqsf8qcrnvhj5hj5vifmhliidxckd0bdhjzk9yis",
       "depends": ["cluster", "pls"]
     },
     "dbw": {
@@ -56805,8 +57117,8 @@
     },
     "dclone": {
       "name": "dclone",
-      "version": "2.3-2",
-      "sha256": "1x0fx24fxb7zp9g9lrdb1hbljgmi9szrsh751jidm52fin863qz0",
+      "version": "2.3-3",
+      "sha256": "18fkxf7z4f6i8wn3v9v9wh9mgmaa38z1ym8znd6nfy1wrmx7klas",
       "depends": ["Matrix", "R2OpenBUGS", "coda", "rjags", "rstan"]
     },
     "dclust": {
@@ -56823,8 +57135,8 @@
     },
     "dcmle": {
       "name": "dcmle",
-      "version": "0.4-1",
-      "sha256": "1zh243ya02232z56i0y05l891685my6g9v6wal6z5c92s179g85p",
+      "version": "0.4-2",
+      "sha256": "1gch4hy8xlf8a5aqglfh31pxxaayxf5f7g9wzpn59ir4fk4agdns",
       "depends": ["coda", "dclone", "lattice"]
     },
     "dcmodify": {
@@ -56937,8 +57249,8 @@
     },
     "ddplot": {
       "name": "ddplot",
-      "version": "0.0.1",
-      "sha256": "03zcnc6is4qdpz3krhhz820j0an6dr7562bnmzj787xf5parwq6r",
+      "version": "0.0.2",
+      "sha256": "0vjag5gr5vc8ps325nn275ppli0l6141mc62zr69g0jlqdl021pj",
       "depends": ["r2d3"]
     },
     "ddsPLS": {
@@ -57127,6 +57439,12 @@
       "sha256": "1y47ggfsfrbsm8z78j5ibxbm4lhp90h3qwhyh4qw5dhsd6jspsbd",
       "depends": ["purrr"]
     },
+    "decorrelate": {
+      "name": "decorrelate",
+      "version": "0.1.6.4",
+      "sha256": "1dylqhbydgg075vnrdygs3gxhx32zbx3qim0anqv96xr18h5fblg",
+      "depends": ["CholWishart", "Matrix", "Rcpp", "RcppArmadillo", "Rfast", "irlba"]
+    },
     "decp": {
       "name": "decp",
       "version": "0.1.2",
@@ -57225,8 +57543,8 @@
     },
     "deeptime": {
       "name": "deeptime",
-      "version": "2.1.0",
-      "sha256": "1sv4vqg1q31nkk8aq8dz3nk3q9jfdm2c5b3b2n0355z31zpqg3gq",
+      "version": "2.2.0",
+      "sha256": "02zjwc5m4qkc27x0d8amb26sg745f2a4hnnrrdd947jp9gm9qwpc",
       "depends": ["cli", "curl", "deeptimedata", "ggfittext", "ggforce", "ggh4x", "ggplot2", "grImport2", "gridExtra", "gtable", "lattice", "lifecycle", "rlang", "scales"]
     },
     "deeptimedata": {
@@ -57423,20 +57741,20 @@
     },
     "dendextend": {
       "name": "dendextend",
-      "version": "1.19.0",
-      "sha256": "17nvk2gqyzgiwd62z2jw56rvlc14m1m5wx41xhc2p1wbl60s5njq",
+      "version": "1.19.1",
+      "sha256": "0097bmdv960khjkf3gvbdrazx4ns8i9221m9h68vnq541h61ag5y",
       "depends": ["ggplot2", "magrittr", "viridis"]
     },
     "dendroNetwork": {
       "name": "dendroNetwork",
-      "version": "0.5.4",
-      "sha256": "0jns6nfihb9wqz4sh8pbsy01kp0ml2x16jls4vqhixkbfpns4vkf",
+      "version": "0.5.5",
+      "sha256": "0syx1lw1hi2vm447rgrni05sxcm758dj2n5qbgb73anwshc5gihk",
       "depends": ["RColorBrewer", "RCy3", "doParallel", "dplR", "dplyr", "foreach", "igraph", "lifecycle", "reshape2", "stringr", "tidyr"]
     },
     "dendroTools": {
       "name": "dendroTools",
-      "version": "1.2.14",
-      "sha256": "0cg6d6flin0x1hphiwzsmvns6rxbzbjf3rrs7pwv2fqvgvlgj8jw",
+      "version": "1.2.15",
+      "sha256": "02q20ramz2g3ry2rv6f480w9y1vnsnr6mjfcwby9adbfnylrqyp2",
       "depends": ["Cubist", "MLmetrics", "boot", "brnn", "dplR", "dplyr", "ggplot2", "knitr", "lubridate", "magrittr", "oce", "plotly", "psych", "randomForest", "reshape2", "scales", "viridis"]
     },
     "dendroextras": {
@@ -57465,8 +57783,8 @@
     },
     "denguedatahub": {
       "name": "denguedatahub",
-      "version": "2.1.1",
-      "sha256": "1s7in7hh90gs9lzdijdl8q2xx24dbvslyd0ykdl7l3sn7qf4cp92",
+      "version": "3.2.0",
+      "sha256": "1kp66g0mjj2bk1p3y6mb0355qmj4ahixp560xw9khj6slgdpvbw8",
       "depends": ["dplyr", "here", "lifecycle", "magrittr", "purrr", "rlang", "rvest", "stringr", "tabulapdf", "tibble", "tidyr", "xml2"]
     },
     "denim": {
@@ -57513,15 +57831,15 @@
     },
     "densityarea": {
       "name": "densityarea",
-      "version": "0.1.0",
-      "sha256": "0blcpclwa6507vna9j8ysj0rs57r15f9vhp78d8fnl1436zlm217",
+      "version": "0.1.1",
+      "sha256": "1zwwx4bf3fam71lnj9dmyfmm396fk8k8j95hp73dfhvy9p7m6ggy",
       "depends": ["cli", "dplyr", "ggdensity", "isoband", "purrr", "rlang", "sf", "sfheaders", "tibble", "vctrs"]
     },
     "densityratio": {
       "name": "densityratio",
-      "version": "0.2.0",
-      "sha256": "1939f9qf8fpmibhnc4p2kk6k92wfwqin6bcfan5g3can0kk57j2j",
-      "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "ggplot2", "osqp", "pbapply"]
+      "version": "0.2.2",
+      "sha256": "0lsrca7k4m60vywya06x7bmz2bl9cr2nawv4l0m50ahwid0isphn",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "ggh4x", "ggplot2", "osqp", "pbapply"]
     },
     "densratio": {
       "name": "densratio",
@@ -57571,6 +57889,12 @@
       "sha256": "1jym52qxx8v4kbq2578d03q2593q96jccr85if47djikw0aaxmcr",
       "depends": ["mvtnorm"]
     },
+    "dependentsimr": {
+      "name": "dependentsimr",
+      "version": "1.0.0.0",
+      "sha256": "0mfacpmm10bqw5lki0r6xqx967xhghp5bk83plwyvb6yw9qhl0vh",
+      "depends": ["rlang"]
+    },
     "depigner": {
       "name": "depigner",
       "version": "0.9.1",
@@ -57681,8 +58005,8 @@
     },
     "deseats": {
       "name": "deseats",
-      "version": "1.1.0",
-      "sha256": "11qhsiqq0f1s6b7x7fmvgwwhirhilf9x37pk90pwgg3h4khjl1j5",
+      "version": "1.1.1",
+      "sha256": "0b9yrblvjnk9plg0hfpnyhfdv69b3z3nnvgrlhni3iizj3jl6i0x",
       "depends": ["Rcpp", "RcppArmadillo", "animation", "furrr", "future", "future_apply", "ggplot2", "progressr", "purrr", "rlang", "shiny", "tidyr", "zoo"]
     },
     "desiR": {
@@ -57729,9 +58053,9 @@
     },
     "desirability2": {
       "name": "desirability2",
-      "version": "0.0.1",
-      "sha256": "0x5v6mak68h6a03hccf8gksj3wmgcd3l84bplx1s4jr755wdm5ih",
-      "depends": ["glue", "purrr", "rlang", "tibble"]
+      "version": "0.1.0",
+      "sha256": "1jrbf9mapmrwdcxmpw7wrbx69i9qhwb19ph1acr02vgl8riaa6mx",
+      "depends": ["S7", "cli", "dplyr", "purrr", "rlang", "tibble"]
     },
     "desk": {
       "name": "desk",
@@ -57781,6 +58105,12 @@
       "sha256": "0yl1x0jz66hingbl094picsiyrxzxvnz0grq63rva6nwn7pv1c0b",
       "depends": ["Rcpp", "data_table", "ggplot2", "gridExtra", "iterators", "itertools", "plyr", "reshape2"]
     },
+    "detectXOR": {
+      "name": "detectXOR",
+      "version": "0.1.0",
+      "sha256": "0war6dl3ham9ibwqlvxjpkz5s3hgskjhmhrhbr2kbfw500xzcv2y",
+      "depends": ["DescTools", "base64enc", "dplyr", "ggh4x", "ggplot2", "ggthemes", "glue", "htmltools", "kableExtra", "knitr", "magrittr", "reshape2", "tibble"]
+    },
     "detectnorm": {
       "name": "detectnorm",
       "version": "1.0.0",
@@ -57933,14 +58263,14 @@
     },
     "dfidx": {
       "name": "dfidx",
-      "version": "0.1-2",
-      "sha256": "195isyxqcnwwrl17ayxqnlcwmraplq574dfzyiyqn9zkkn3afalx",
+      "version": "0.2-0",
+      "sha256": "1q2sch77s72140mwy6nj29l71fs1wzvqhmxn21safm2ia5a5xfk5",
       "depends": ["Formula", "Rdpack"]
     },
     "dfmirroR": {
       "name": "dfmirroR",
-      "version": "2.1.0",
-      "sha256": "0npd9yllsjbb49mqdwaw75lbgx4lr8qgga70yybd6c16wdfkg396",
+      "version": "2.2.0",
+      "sha256": "114mswfrnm824026sb9z89xnqbkk6q8m32jrzy6nn5fjq3g46485",
       "depends": ["MASS", "e1071", "fitdistrplus"]
     },
     "dfms": {
@@ -57973,12 +58303,6 @@
       "sha256": "1vylfnivkp4gv7wv7pjby918x3v8pnh0qds1hwmw5980na283qif",
       "depends": ["formula_tools"]
     },
-    "dfped": {
-      "name": "dfped",
-      "version": "1.1",
-      "sha256": "11ffsah14igba276m9d3cla0kgb3isizm5d7j1iqcd0wq23il7hq",
-      "depends": ["ggplot2", "rstan"]
-    },
     "dfphase1": {
       "name": "dfphase1",
       "version": "1.2.0",
@@ -58119,8 +58443,8 @@
     },
     "dials": {
       "name": "dials",
-      "version": "1.4.0",
-      "sha256": "0klkk0jydm2q1l77k4ilvn2n984a6vnaz62r8dn9vkppmg64mw73",
+      "version": "1.4.1",
+      "sha256": "0bnmnf9vvjmx49iim1dziaycb97xsn66j6w9wph235rnmgsvj12b",
       "depends": ["DiceDesign", "cli", "dplyr", "glue", "hardhat", "lifecycle", "pillar", "purrr", "rlang", "scales", "sfd", "tibble", "vctrs", "withr"]
     },
     "diaplt": {
@@ -58155,14 +58479,14 @@
     },
     "diceR": {
       "name": "diceR",
-      "version": "3.0.0",
-      "sha256": "195gc0cigl0ily9zbs2s1jrw5lkn9b4p2pk1vhfca1lyl7rppa4c",
-      "depends": ["RankAggreg", "Rcpp", "abind", "assertthat", "clValid", "class", "clue", "clusterCrit", "clv", "dplyr", "ggplot2", "infotheo", "klaR", "magrittr", "mclust", "pheatmap", "purrr", "stringr", "tidyr", "yardstick"]
+      "version": "3.1.0",
+      "sha256": "0kbkbl8zay7g4wqm6sw65zr4g710d9b2y9350gjy7jbbxqyy7mks",
+      "depends": ["RankAggreg", "Rcpp", "abind", "assertthat", "clValid", "class", "clue", "clusterCrit", "dplyr", "ggplot2", "infotheo", "klaR", "magrittr", "mclust", "pheatmap", "purrr", "stringr", "tidyr", "yardstick"]
     },
     "diceplot": {
       "name": "diceplot",
-      "version": "0.1.7",
-      "sha256": "1k17rjkl6mscdflj6hxlz3q2jcf3angjbnghzd9cgc2lvw41v5p7",
+      "version": "0.2.0",
+      "sha256": "17q9apx89p8p3d726q9z0w9xg7sb0898ibv00rblnp5cxn5lcb4c",
       "depends": ["RColorBrewer", "cowplot", "data_table", "dplyr", "ggplot2", "ggrepel", "rlang", "sf", "tibble", "tidyr"]
     },
     "dichromat": {
@@ -58233,8 +58557,8 @@
     },
     "difNLR": {
       "name": "difNLR",
-      "version": "1.5.1-1",
-      "sha256": "1mr8spi7az1l3ki71xymm0j27fv6nizv75javn2spjv0ynyv9h3v",
+      "version": "1.5.1-4",
+      "sha256": "0570c38fa4vaxj32cd86xqcjlzfv0dwk989qzm9kka37ffv2cj64",
       "depends": ["VGAM", "calculus", "ggplot2", "msm", "nnet", "plyr"]
     },
     "difR": {
@@ -58437,8 +58761,8 @@
     },
     "dipm": {
       "name": "dipm",
-      "version": "1.10",
-      "sha256": "14ik7npakgdc22vzx64mn4rgwh5x3pbdk81h3kflcqk1392qa26g",
+      "version": "1.11",
+      "sha256": "0xvwh2myj0k6dzlm041axwg4q7z66pkxb0fam8n9xyd1aag0svyn",
       "depends": ["ggplot2", "partykit", "survival"]
     },
     "dipsaus": {
@@ -58473,8 +58797,8 @@
     },
     "directlabels": {
       "name": "directlabels",
-      "version": "2025.5.20",
-      "sha256": "0rxydqyfqkqhk9m9f5vldspss5kc6cljpglpq18skrcrylv9z4zd",
+      "version": "2025.6.24",
+      "sha256": "1a0l31jhcin40bk8002pmh7bb6jrr50bdknl6h8n9j8jmd6hkzgy",
       "depends": ["quadprog"]
     },
     "directotree": {
@@ -58501,12 +58825,6 @@
       "sha256": "1sfrwk53rrq353lal6rirrbfjn0zrm3plmrdmxic3z89f5h3qkpf",
       "depends": ["PolynomF"]
     },
-    "disaggR": {
-      "name": "disaggR",
-      "version": "1.0.5.3",
-      "sha256": "1i2in27gygmh1l05371hzbf8zssgsjl6jyljsr964gk02l0ghkpn",
-      "depends": ["RColorBrewer"]
-    },
     "disaggregation": {
       "name": "disaggregation",
       "version": "0.4.0",
@@ -58545,8 +58863,8 @@
     },
     "discfrail": {
       "name": "discfrail",
-      "version": "0.1",
-      "sha256": "1ll8c0fwwmz2yw8w582422r8bk9lr1570d7m7w2n1flrnqpqmk8j",
+      "version": "0.2",
+      "sha256": "1hqfkhz8h16iximp3w60a591r7gnbkn5776dndpj5chxsh7xw7pv",
       "depends": ["Matrix", "numDeriv", "survival"]
     },
     "discharge": {
@@ -58743,8 +59061,8 @@
     },
     "dissimilarities": {
       "name": "dissimilarities",
-      "version": "0.2.1",
-      "sha256": "0v1gffjvvi800jm99xss9ib3bhvwck1ikwnzhfi0l37js2kral8f",
+      "version": "0.3.0",
+      "sha256": "1lpjn66ib56wbkb9433babja5bszl0l1iqpz2kycaa7y79vdc2b9",
       "depends": ["Rcpp", "microbenchmark", "proxy"]
     },
     "distTails": {
@@ -58801,6 +59119,12 @@
       "sha256": "0h7cywxnasxmqnl9f2f9wp4viwvv72hjx2drr78prqy3nn3lvqwx",
       "depends": []
     },
+    "distfreereg": {
+      "name": "distfreereg",
+      "version": "1.1",
+      "sha256": "01hvgqgidzqna6hxdm2rpqsr1b7v1lv1mvcmivxf90zcmi0cgps6",
+      "depends": ["calculus", "clue", "lme4"]
+    },
     "distfromq": {
       "name": "distfromq",
       "version": "1.0.4",
@@ -58947,8 +59271,8 @@
     },
     "dittoViz": {
       "name": "dittoViz",
-      "version": "1.0.3",
-      "sha256": "12awba85sbr4ig7lk2d47ll19avlv2vmhyp9fnh9yn41wfmqnzlh",
+      "version": "1.0.4",
+      "sha256": "013dbv1n7wpv759vqzxlal802aapig114sxq58ihxbpxfphdhmp4",
       "depends": ["cowplot", "ggplot2", "ggrepel", "ggridges"]
     },
     "dittodb": {
@@ -58993,12 +59317,6 @@
       "sha256": "0rgmzcy2kk1bc6v27qcj4ckyvidzvldqx3cz1prccq5bhw2m8cdz",
       "depends": ["truncnorm"]
     },
-    "diverse": {
-      "name": "diverse",
-      "version": "0.1.5",
-      "sha256": "10kmx3qv58xhqs1icsxqq0y0cm8y2hx9ysb65brd3hhg33alzvk3",
-      "depends": ["foreign", "proxy", "reshape2"]
-    },
     "diversitree": {
       "name": "diversitree",
       "version": "0.10-1",
@@ -59133,14 +59451,14 @@
     },
     "dm": {
       "name": "dm",
-      "version": "1.0.11",
-      "sha256": "1jv9r5h3p4ci0d809fhzkc17xh6iliavkzkzcnkq7y4xahkk45rj",
+      "version": "1.0.12",
+      "sha256": "0xy7cvgafpkl024w8p59pmlphhx66znr748j87xcwlihmqx5722g",
       "depends": ["backports", "cli", "dplyr", "glue", "igraph", "lifecycle", "memoise", "purrr", "rlang", "tibble", "tidyr", "tidyselect", "vctrs"]
     },
     "dma": {
       "name": "dma",
-      "version": "1.4-0",
-      "sha256": "003snr09hazszwqnvjrbv8vyz6ihgcfcfhrlshg451dddn920615",
+      "version": "1.4-1",
+      "sha256": "12pqwpvahhk5f4m72npzbx6fir3d9vrxcmv0l5724lpj57s1hq9c",
       "depends": ["MASS"]
     },
     "dmai": {
@@ -59175,8 +59493,8 @@
     },
     "dmm": {
       "name": "dmm",
-      "version": "3.1-1",
-      "sha256": "0rzi1bk1js3glyw83xic7yywvgp8dc4ah8za678ipqd86w8d536g",
+      "version": "3.2-1",
+      "sha256": "167zrcmwihidgs374c4vwdvldd17s2cfaj1r7cbhpglkjk6lmcw7",
       "depends": ["MASS", "Matrix", "nadiv", "pls", "robustbase"]
     },
     "dmtools": {
@@ -59235,14 +59553,14 @@
     },
     "doBy": {
       "name": "doBy",
-      "version": "4.6.27",
-      "sha256": "1gb0907dd7n9i1k83dcljfiwxk4hcqzjw41qgwdw7pbklc6yhxg1",
+      "version": "4.7.0",
+      "sha256": "1217zbcwwcafqmg8h3dmqjvpqz9id61ppv3hdlm69vbxfk2nsw5a",
       "depends": ["Deriv", "MASS", "Matrix", "boot", "broom", "cowplot", "dplyr", "ggplot2", "microbenchmark", "modelr", "rlang", "tibble", "tidyr"]
     },
     "doFuture": {
       "name": "doFuture",
-      "version": "1.1.1",
-      "sha256": "1dqdm7dhikjm4m8bf452qli75y31yrrhjq6dvil6rrcl5m0cjcz7",
+      "version": "1.1.2",
+      "sha256": "0wf5f4pw9arifpi0k8bzivkf2002c2ls05lkah0n0bc7kahsr9ia",
       "depends": ["foreach", "future", "future_apply", "globals", "iterators"]
     },
     "doMC": {
@@ -59319,8 +59637,8 @@
     },
     "dockViewR": {
       "name": "dockViewR",
-      "version": "0.1.0",
-      "sha256": "0nysqnvx1hhsipahkbmbammqlc83qjnwvc52sxhpa4yyj291d2a8",
+      "version": "0.2.0",
+      "sha256": "1dmb660xlsncnrr0yky6x0005npm5j0bdgwnz0bgz9f9x1q4gbqi",
       "depends": ["htmltools", "htmlwidgets", "shiny"]
     },
     "dockerfiler": {
@@ -59413,16 +59731,10 @@
       "sha256": "1rmvb6pa71frvjszpsjaw3ahm70kyykrq6zfjqk8smgcg397k9pi",
       "depends": ["agricolae"]
     },
-    "doex": {
-      "name": "doex",
-      "version": "1.2",
-      "sha256": "1r999z30ipa04pgck0hfalqxihb1bj8sdhlkkhf4plb7maaz3qm3",
-      "depends": []
-    },
     "dogesr": {
       "name": "dogesr",
-      "version": "0.5.0",
-      "sha256": "0w5qps781c406br5rba6mv127yrlgq7rzchk55j7mndrm7hwia63",
+      "version": "0.5.2",
+      "sha256": "03fgl61bijzyk8x05biiaszp6xphsl1n31v4qj17b036pcpk8mf6",
       "depends": ["Rdpack", "dplyr", "ggplot2", "ggthemes", "igraph", "knitr", "qpdf", "rmarkdown"]
     },
     "dominanceanalysis": {
@@ -59467,6 +59779,12 @@
       "sha256": "0hyqbpnhzjsx7ml0z6n9z60yhp5c0dyicm3jfc841aykvb1ifqbp",
       "depends": ["MASS", "Morpho", "Rvcg", "concaveman", "ggplot2", "igraph", "rgl", "sp", "tis", "usethis"]
     },
+    "door": {
+      "name": "door",
+      "version": "0.0.2",
+      "sha256": "1z7pfy4j5nxk21bjba6zgvcy5asd0g5xhq2q74d1y49jz3vsqsx9",
+      "depends": ["dplyr", "forestplot", "ggplot2", "labeling", "scales", "tidyr"]
+    },
     "doremi": {
       "name": "doremi",
       "version": "1.0.0",
@@ -59607,9 +59925,9 @@
     },
     "downloadthis": {
       "name": "downloadthis",
-      "version": "0.4.1",
-      "sha256": "09hbcb9yj45l6v9iyv5pr4wz01l8624b34x45107d7a62djil1x9",
-      "depends": ["b64", "bsplus", "fs", "ggplot2", "htmltools", "magrittr", "mime", "readr", "writexl", "zip"]
+      "version": "0.5.0",
+      "sha256": "0352mqcq61vaj3lxrgj2428g45alzbqdl9j1n219ysrcxhnmywwk",
+      "depends": ["base64enc", "bsplus", "fs", "ggplot2", "htmltools", "magrittr", "mime", "readr", "writexl", "zip"]
     },
     "downscale": {
       "name": "downscale",
@@ -59641,6 +59959,12 @@
       "sha256": "1dzlry0pr8i39ix0hnhg19fi00kz5jf2l568230mc1k6fv7fidbv",
       "depends": ["dplyr", "ggplot2", "rlang", "survival", "tidyr", "timereg"]
     },
+    "dpcR": {
+      "name": "dpcR",
+      "version": "0.6",
+      "sha256": "1bx3nyh3k843jrrwqvinwayii7g7vjb09wannmgw21mndbrban8i",
+      "depends": ["binom", "chipPCR", "dgof", "e1071", "evd", "multcomp", "pracma", "qpcR", "rateratio_test", "readxl", "shiny", "signal", "spatstat_explore", "spatstat_geom"]
+    },
     "dpcc": {
       "name": "dpcc",
       "version": "1.0.0",
@@ -59815,6 +60139,12 @@
       "sha256": "1f93g35yg3kqybqnby08n5l7bgqghxypkpp4ivj9164b3yj8iy39",
       "depends": []
     },
+    "dream": {
+      "name": "dream",
+      "version": "0.1.0",
+      "sha256": "1bs4s8vwdxfqvdj19l327m3mv778992h85px6568y4gf65gahhrd",
+      "depends": ["Rcpp", "collapse", "data_table", "doParallel", "dqrng", "fastmatch", "foreach"]
+    },
     "dreamer": {
       "name": "dreamer",
       "version": "3.2.0",
@@ -59971,6 +60301,12 @@
       "sha256": "1l5qqcpzad2nnhzzcb43slgmdg08v830l5np8mc7qh4wlig1x95l",
       "depends": ["ggplot2", "unikn"]
     },
+    "dsBase": {
+      "name": "dsBase",
+      "version": "6.3.3",
+      "sha256": "0n98mzg8204xz9f81f27c53dj9rwjnhgx9qyjya7j69kfq1ifvw4",
+      "depends": ["RANN", "childsds", "dplyr", "gamlss", "gamlss_dist", "lme4", "mice", "polycor", "reshape2", "stringr"]
+    },
     "dsTidyverse": {
       "name": "dsTidyverse",
       "version": "1.0.4",
@@ -60069,8 +60405,8 @@
     },
     "dsmmR": {
       "name": "dsmmR",
-      "version": "1.0.5",
-      "sha256": "0pdhpshdhpd1cvgnx3cnbkczwychxv49w90sc4lvgviknl7wd4c1",
+      "version": "1.0.7",
+      "sha256": "1pfiraa82qj9palqdln8gi6yd73ks4fjq6frfz9548px4b4zxzvf",
       "depends": ["DiscreteWeibull"]
     },
     "dsos": {
@@ -60151,12 +60487,6 @@
       "sha256": "1g9rnnidnxag8pqp9m6hhl478y82hagpidispqvlv470gnbzmciz",
       "depends": ["DT", "coin", "cubature", "dplyr", "ggplot2", "gsDesign", "mvtnorm", "shiny", "shinythemes", "stringr", "survival", "tidyr"]
     },
-    "dtmapi": {
-      "name": "dtmapi",
-      "version": "0.0.2",
-      "sha256": "1a0a5dff82igzxsz0ma3j2w7waqq2nrv3cy0df2nh7sgqvcldk4m",
-      "depends": ["httr2", "jsonlite", "magrittr"]
-    },
     "dtp": {
       "name": "dtp",
       "version": "0.1.0",
@@ -60195,8 +60525,8 @@
     },
     "dtt": {
       "name": "dtt",
-      "version": "0.1-2",
-      "sha256": "0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn",
+      "version": "0.1-2.1",
+      "sha256": "113qb6fjp08gcmv4cgq3cm2fk6k3r3j1wfsrygq8889i2bq4a073",
       "depends": []
     },
     "dttr2": {
@@ -60255,14 +60585,14 @@
     },
     "duckdb": {
       "name": "duckdb",
-      "version": "1.3.0",
-      "sha256": "010y7ag92y1hb8wi72i4vgjlgii9r7nj6znzlikadmpf58j3gzs9",
+      "version": "1.3.2",
+      "sha256": "0wb923z0cg9a2bm1a0qi8sw6f949qi5aqq8yhafcxykbc9wz2xy3",
       "depends": ["DBI"]
     },
     "duckdbfs": {
       "name": "duckdbfs",
-      "version": "0.1.0",
-      "sha256": "1waqbjnq4mykj0jkdddrs3k3mhyvl2y8qdwba9iq351d0am29l59",
+      "version": "0.1.1",
+      "sha256": "0nqgnmqh7f826i3ha0zddgk191vcd6a8kcq4w3k3dq6dij6c3qx3",
       "depends": ["DBI", "dbplyr", "dplyr", "duckdb", "fs", "glue"]
     },
     "duckduckr": {
@@ -60273,8 +60603,8 @@
     },
     "duckplyr": {
       "name": "duckplyr",
-      "version": "1.1.0",
-      "sha256": "1cl8snkm87wf3xm989h4bwv8skjljblhi66ry16h9r1gbfrvngny",
+      "version": "1.1.1",
+      "sha256": "03l99swgcyy1fjfpwvza6f6r7g6j3485753bdjl7wk3f9c7ydjbi",
       "depends": ["DBI", "cli", "collections", "dplyr", "duckdb", "glue", "jsonlite", "lifecycle", "magrittr", "memoise", "pillar", "rlang", "tibble", "tidyselect", "vctrs"]
     },
     "duckspatial": {
@@ -60459,22 +60789,22 @@
     },
     "dynRB": {
       "name": "dynRB",
-      "version": "0.18",
-      "sha256": "0sz0a1g6z48f0s7ch86y9mvazwk4gdswjj179a13d0yjhy9rgpk0",
+      "version": "0.19",
+      "sha256": "047dmcaaf8a28ir89nqv6hh60winixc149h02fy8843v1mjrhq67",
       "depends": ["RColorBrewer", "corrplot", "dplyr", "foreign", "ggplot2", "reshape2", "vegan"]
     },
-    "dynaSpec": {
-      "name": "dynaSpec",
-      "version": "1.0.3",
-      "sha256": "07k3s2nd17i8gakp1jagx9dvj7ra1wi1byqbg92xnj7qryxfcb9p",
-      "depends": ["ari", "gganimate", "ggplot2", "png", "scales", "seewave", "tuneR", "viridis", "warbleR"]
-    },
     "dynaTree": {
       "name": "dynaTree",
       "version": "1.2-17",
       "sha256": "1w7z1qjyhhcymi9if1x8i8sniya642diwnvkf0qhwzan8scig1yj",
       "depends": []
     },
+    "dynafluxr": {
+      "name": "dynafluxr",
+      "version": "1.0.1",
+      "sha256": "18838jcijnga9d8yplqgbwvdxzkpamkyh4h7g2qq007dfh0vdjij",
+      "depends": ["arrApply", "bspline", "gmresls", "nlsic", "optparse", "qpdf", "shiny", "shinyFiles", "shinyjs", "slam"]
+    },
     "dynamAedes": {
       "name": "dynamAedes",
       "version": "2.2.9",
@@ -60595,6 +60925,12 @@
       "sha256": "1wcr17ys60iz447arxa4nr1vlf2hv9ipspr4kmcijz081aa4nfhj",
       "depends": ["RColorBrewer", "Rcpp"]
     },
+    "dynsim": {
+      "name": "dynsim",
+      "version": "1.2.4",
+      "sha256": "0b98by2y2cxy607rv1cy4m2kndbm7gxgi6y4g6f1r87p1y62pbjc",
+      "depends": ["MASS", "ggplot2", "gridExtra"]
+    },
     "dynsurv": {
       "name": "dynsurv",
       "version": "0.4-7",
@@ -60627,9 +60963,9 @@
     },
     "e2tree": {
       "name": "e2tree",
-      "version": "0.1.2",
-      "sha256": "0q1djx2x832s59xzn1dkx5224iqq2wzxndfa8ahw85y61kkahm9r",
-      "depends": ["Matrix", "RSpectra", "Rcpp", "ape", "doParallel", "dplyr", "foreach", "future_apply", "ggplot2", "partitions", "purrr", "randomForest", "rpart_plot", "tidyr"]
+      "version": "0.2.0",
+      "sha256": "12s82gkz7hqjwbgg9ppcy341q48m7iq1c4idaqjydhavnld8jra0",
+      "depends": ["Matrix", "RSpectra", "Rcpp", "ape", "doParallel", "dplyr", "foreach", "future_apply", "ggplot2", "partitions", "purrr", "randomForest", "ranger", "rpart_plot", "tidyr"]
     },
     "eAnalytics": {
       "name": "eAnalytics",
@@ -60681,8 +61017,8 @@
     },
     "eDNAjoint": {
       "name": "eDNAjoint",
-      "version": "0.3.2",
-      "sha256": "1090bnfpkkp6qlb4hzhajl4l8p96swxfqk2c0vra2ky3gdqr3nhg",
+      "version": "0.3.3",
+      "sha256": "041r5qa5qf5bb155h0yns3siy06j4igr3wylqkdga6bmfkdfz8c1",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayestestR", "dplyr", "ggplot2", "lifecycle", "loo", "rlist", "rstan", "rstantools", "scales", "tidyr"]
     },
     "eFRED": {
@@ -60723,8 +61059,8 @@
     },
     "eNchange": {
       "name": "eNchange",
-      "version": "1.0",
-      "sha256": "07vdi05fr6mynb86haas21izdcjiagw14p1h8n0qr1hb3klvs8n5",
+      "version": "1.1",
+      "sha256": "03s2agcvwxcrfp0jalj05jy87amw4prdpnr95xi0pbz2z6cpkqpc",
       "depends": ["ACDm", "Rcpp", "doParallel", "foreach", "hawkes", "iterators"]
     },
     "ePCR": {
@@ -60781,12 +61117,6 @@
       "sha256": "0wwkn30kjdg0qni05l3acbgai9j3h2mqjli49afmpd2453fpyxig",
       "depends": ["betareg", "doParallel", "foreach"]
     },
-    "earlywarnings": {
-      "name": "earlywarnings",
-      "version": "1.1.29",
-      "sha256": "1xa9rijqqxa5l253dg8dn1jjhdakf8krl5rflq5v9gybfyrq1885",
-      "depends": ["Kendall", "KernSmooth", "fields", "ggplot2", "knitr", "lmtest", "moments", "nortest", "quadprog", "som", "spam", "tgp", "tseries"]
-    },
     "earth": {
       "name": "earth",
       "version": "5.3.4",
@@ -60795,9 +61125,9 @@
     },
     "earthdatalogin": {
       "name": "earthdatalogin",
-      "version": "0.0.2",
-      "sha256": "1g044i4kjl5ica9dlg0y2xnhaiqb3xi9ha81ljcz4w8f5mkj7y46",
-      "depends": ["httr", "openssl", "purrr"]
+      "version": "0.0.3",
+      "sha256": "051c8hbp0kdfapi68p5jm1xl60b0715cwdrsjhgfqkxxldcph919",
+      "depends": ["base64enc", "httr", "httr2", "jsonlite", "openssl", "purrr"]
     },
     "earthtide": {
       "name": "earthtide",
@@ -60871,6 +61201,12 @@
       "sha256": "03gl5gl0yqgpygd4kna79wrhflbnq3zrz3iq2i8hk9xqd83mszh3",
       "depends": []
     },
+    "easyScieloPack": {
+      "name": "easyScieloPack",
+      "version": "0.1.1",
+      "sha256": "07zhf6hw10mcpry41k8r8khwnv03mn5b0lyjh3l1jlk18kha89vb",
+      "depends": ["dplyr", "httr", "magrittr", "rvest", "stringr", "xml2"]
+    },
     "easySdcTable": {
       "name": "easySdcTable",
       "version": "1.1.1",
@@ -60883,6 +61219,12 @@
       "sha256": "1k62dfhnc0g07jf82gm1m3747z8zchmj4mi5qap4dgc7pxdp2ikc",
       "depends": ["Rcpp", "SpecsVerification", "pbapply"]
     },
+    "easyViz": {
+      "name": "easyViz",
+      "version": "1.0.0",
+      "sha256": "06ayjfi8l4zmkvsf95krkh5rxmzqdh46mxy76l5s4hij2dm2yjvi",
+      "depends": []
+    },
     "easyalluvial": {
       "name": "easyalluvial",
       "version": "0.3.2",
@@ -60963,8 +61305,8 @@
     },
     "easystats": {
       "name": "easystats",
-      "version": "0.7.4",
-      "sha256": "1c3xnzjwn46pdw7dz45704r38fq21qk8j5gsra0cizj1mi54cd2d",
+      "version": "0.7.5",
+      "sha256": "1x53ibvsq96nay4xjj6bq621a85hc3zbx3cwm7428n65ynlanfyj",
       "depends": ["bayestestR", "correlation", "datawizard", "effectsize", "insight", "modelbased", "parameters", "performance", "report", "see"]
     },
     "easysurv": {
@@ -61047,8 +61389,8 @@
     },
     "ebdm": {
       "name": "ebdm",
-      "version": "1.0.0",
-      "sha256": "1b276jzwxsznsayzbxd2yry2wjljib8rb3npj8xd2xzdidnlr1s4",
+      "version": "1.1.0",
+      "sha256": "16qigjkyxxp8y4hywc2xlnd8his5xn438zf2n2isw27siqzw4lqq",
       "depends": []
     },
     "ebirdst": {
@@ -61081,16 +61423,10 @@
       "sha256": "14ql990pgwwb8aakg4ikj7p3ijbfaqjrsvrrjwlma3halqs3cy19",
       "depends": ["ashr", "deconvolveR", "dplyr", "ggplot2", "horseshoe", "magrittr", "mixsqp", "rlang", "truncnorm", "trust"]
     },
-    "ebreg": {
-      "name": "ebreg",
-      "version": "0.1.3",
-      "sha256": "1xrs9afjd5hkdmhglj3md5i5hm7awlcdlccz3y2lw4c73lx31ywz",
-      "depends": ["Rdpack", "lars"]
-    },
     "ebvcube": {
       "name": "ebvcube",
-      "version": "0.5.0",
-      "sha256": "17hw5g4h9ji5f6g5x8wp2mlh136il0vmf6j06rndmcr6c9cfgsfx",
+      "version": "0.5.2",
+      "sha256": "1pr8adwmqar11r89zjnxnyg2hya282nhap8fyhmharpqq8swm681",
       "depends": ["DelayedArray", "HDF5Array", "checkmate", "curl", "ggplot2", "httr", "jsonlite", "memuse", "ncdf4", "ncmeta", "reshape2", "rhdf5", "stringr", "terra", "tidyterra", "withr"]
     },
     "ec50estimator": {
@@ -61185,9 +61521,9 @@
     },
     "echos": {
       "name": "echos",
-      "version": "1.0.1",
-      "sha256": "162114g5xv3r0lizja02n5m9vz9anrg82hsd2qdz2nrg1hdwp1c1",
-      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "distributional", "dplyr", "fabletools", "forecast", "purrr", "rlang", "tidyr", "tsibble"]
+      "version": "1.0.2",
+      "sha256": "0dnjzsh5rs59ps56sb899mqaq5g4kmcxdbvdswfibynxnvh94i2p",
+      "depends": ["Rcpp", "RcppArmadillo", "distributional", "dplyr", "fabletools", "rlang", "tidyr", "tsibble"]
     },
     "ecic": {
       "name": "ecic",
@@ -61293,9 +61629,9 @@
     },
     "econid": {
       "name": "econid",
-      "version": "0.0.1",
-      "sha256": "0ijkmicv1xkfn3zi49yjq7431c23zr9m2fnq94ypfkii00k5jgal",
-      "depends": ["cli", "dplyr", "fuzzyjoin", "purrr", "rlang", "tibble", "tidyr"]
+      "version": "0.0.2",
+      "sha256": "0ahxvka6xadrzsig0x1ls2g0rhn92prqnn229cmffmgppqnnl53j",
+      "depends": ["cli", "dplyr", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "economiccomplexity": {
       "name": "economiccomplexity",
@@ -61341,8 +61677,8 @@
     },
     "ecos": {
       "name": "ecos",
-      "version": "0.1.6",
-      "sha256": "1syqh2ivznz5swify1gc34m1iqgnp10rhk7b8giil7fwdzifalfj",
+      "version": "0.1.7",
+      "sha256": "1pn75rv9dylr015czgxjzvld6asl3zshlkqmam5s2jph01rgs82p",
       "depends": ["XML", "httr", "jsonlite", "stringr"]
     },
     "ecosim": {
@@ -61381,6 +61717,12 @@
       "sha256": "040y610c1v7l5phy8lmimafjh466s1zdhk81cfcarwhf0l1hzzpr",
       "depends": ["deSolve", "mvtnorm"]
     },
+    "ecoteach": {
+      "name": "ecoteach",
+      "version": "0.1.0",
+      "sha256": "10rz8prf1yk9paxrnv9l70s9650r4xkc14b6m2syd3ag4c39y5j5",
+      "depends": []
+    },
     "ecotox": {
       "name": "ecotox",
       "version": "1.4.4",
@@ -61401,8 +61743,8 @@
     },
     "ecotrends": {
       "name": "ecotrends",
-      "version": "1.0",
-      "sha256": "0n3j4rjc607pvncx67slh2mhba1ycs6j5p0gwd3ybma1pwxf0n39",
+      "version": "1.1",
+      "sha256": "0mc5ydk74ns5v3j9nbzxq9p6yawmbmbgafigvg6rlxn2z2296785",
       "depends": ["collinear", "fuzzySim", "maxnet", "modEvA", "terra", "trend"]
     },
     "ecoval": {
@@ -61417,12 +61759,6 @@
       "sha256": "1imahvby3nj1b5d1x7hq6gkfg0fyyd27ghls0v35456imy1fmhz5",
       "depends": ["Rcpp"]
     },
-    "ecpc": {
-      "name": "ecpc",
-      "version": "3.1.1",
-      "sha256": "0vi9k3p1xicx53rmccmx1ykdidqb22hkwgr7l5hc0bjzsv7h2w38",
-      "depends": ["CVXR", "JOPS", "Matrix", "checkmate", "gglasso", "glmnet", "mgcv", "multiridge", "mvtnorm", "pROC", "pracma", "quadprog", "survival"]
-    },
     "ecpdist": {
       "name": "ecpdist",
       "version": "0.2.1",
@@ -61473,9 +61809,9 @@
     },
     "edeaR": {
       "name": "edeaR",
-      "version": "0.9.4",
-      "sha256": "120x95a5s51rvpr6kybgs875rbghqqmsrzdpq3jr1007yaxpl710",
-      "depends": ["bupaR", "cli", "data_table", "dplyr", "ggplot2", "ggthemes", "glue", "hms", "lifecycle", "lubridate", "miniUI", "purrr", "rlang", "shiny", "shinyTime", "stringr", "tibble", "tidyr", "zoo"]
+      "version": "0.9.5",
+      "sha256": "11cjmgq6gsnkrd556cgvd0k75nqm6qcqi35hwp95k2yvdpqsgfka",
+      "depends": ["bupaR", "cli", "data_table", "dplyr", "ggplot2", "ggthemes", "glue", "hms", "lifecycle", "lubridate", "magrittr", "miniUI", "purrr", "rlang", "shiny", "shinyTime", "stringr", "tibble", "tidyr", "zoo"]
     },
     "edecob": {
       "name": "edecob",
@@ -61581,8 +61917,8 @@
     },
     "edlibR": {
       "name": "edlibR",
-      "version": "1.0.2",
-      "sha256": "0pncj573n95g6vnjnyihhac94qxq63p15lxy1xy7pd2p63p5hs4f",
+      "version": "1.0.3",
+      "sha256": "01xlbdavj5kfw18ypqky6i5dfjk64fjrc4zl7bspdy944bg6k61r",
       "depends": ["Rcpp", "stringr"]
     },
     "edmdata": {
@@ -61701,8 +62037,8 @@
     },
     "effects": {
       "name": "effects",
-      "version": "4.2-2",
-      "sha256": "0nlj79am9a1yg737dhfa8dj1kj2hly9pfknmphsbcvlgxqn35vig",
+      "version": "4.2-4",
+      "sha256": "0lh8yabk6z2j84yn0386ggz01gxl946xcpcawgqklw8cs55cwzs9",
       "depends": ["carData", "colorspace", "estimability", "insight", "lattice", "lme4", "nnet", "survey"]
     },
     "effectsize": {
@@ -61717,12 +62053,6 @@
       "sha256": "0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5",
       "depends": ["Kendall"]
     },
-    "efflog": {
-      "name": "efflog",
-      "version": "1.0",
-      "sha256": "1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b",
-      "depends": []
-    },
     "effsize": {
       "name": "effsize",
       "version": "0.8.1",
@@ -61899,8 +62229,8 @@
     },
     "eks": {
       "name": "eks",
-      "version": "1.1.0",
-      "sha256": "19xb7pkac7s5gj2b3l0a4mjbjbna61nwrji6g9zq0b5mhg4dz67r",
+      "version": "1.1.1",
+      "sha256": "0biwvxv3ig2hg5hbigdcaiasfs9xwrzqmzahpr2rj2w25sc03kck",
       "depends": ["colorspace", "dplyr", "geos", "ggplot2", "isoband", "ks", "lwgeom", "mapsf", "sf"]
     },
     "elaborator": {
@@ -62049,8 +62379,8 @@
     },
     "ellmer": {
       "name": "ellmer",
-      "version": "0.2.1",
-      "sha256": "0b2qniil7g9v5ayklqz38pmqgfzwngc002ig9g8plaa80nnz0w9f",
+      "version": "0.3.0",
+      "sha256": "0rrd7whwa2mpy9rqvp7gg0sjdf7mgp6nfzkzpkw640w4dq4nv6nm",
       "depends": ["R6", "S7", "cli", "coro", "glue", "httr2", "jsonlite", "later", "lifecycle", "promises", "rlang"]
     },
     "elmNNRcpp": {
@@ -62127,8 +62457,8 @@
     },
     "embryogrowth": {
       "name": "embryogrowth",
-      "version": "9.5",
-      "sha256": "059q5bp1pfz1hpas144jvb60izrl0f3nrn4ddm27h0haffx20s59",
+      "version": "10.2",
+      "sha256": "0mjsc3k942f0rmq0sw887dfy1imdjf0skwplcap6bki30zx7a1xq",
       "depends": ["HelpersMG", "Rdpack", "deSolve", "ggplot2", "numDeriv", "optimx"]
     },
     "emcAdr": {
@@ -62139,8 +62469,8 @@
     },
     "emdbook": {
       "name": "emdbook",
-      "version": "1.3.13",
-      "sha256": "069w10i1590bcyzv4kfsg7wsr1yl9nlsyj6yvys088xll5z4n116",
+      "version": "1.3.14",
+      "sha256": "18m0n0nfi0khmd9fxqjlhrd669vnrnri5v9ch69rvkpngxl3gjmg",
       "depends": ["MASS", "bbmle", "coda", "lattice", "plyr"]
     },
     "emdi": {
@@ -62193,8 +62523,8 @@
     },
     "emmeans": {
       "name": "emmeans",
-      "version": "1.11.1",
-      "sha256": "1iw4rf24al6bcg818b38iag0k947f32y2ipwrrzpaykxd68nyfv8",
+      "version": "1.11.2",
+      "sha256": "0pxzva2pkqj7dvxph5102h5rn6lyl0g39dhfynadmdp97qskg63w",
       "depends": ["estimability", "mvtnorm", "numDeriv"]
     },
     "emoa": {
@@ -62203,6 +62533,12 @@
       "sha256": "1w287k5gjhgqcyq27xz0ybvhzkf1kydcnpcn30iziliw3xx71g2d",
       "depends": []
     },
+    "emodnet_wfs": {
+      "name": "emodnet.wfs",
+      "version": "2.1.1",
+      "sha256": "1jbwnybk44p7gq5y4pc60ravamr79y91izazlrmvjiywbcg48n6f",
+      "depends": ["checkmate", "cli", "dplyr", "lifecycle", "memoise", "ows4R", "purrr", "rlang", "sf", "tibble", "whoami"]
+    },
     "emoji": {
       "name": "emoji",
       "version": "16.0.0",
@@ -62281,6 +62617,12 @@
       "sha256": "0sd45wjdb00iyj8n16kqxypisam7ibwvpcaxsi1z56yzlzp93p4i",
       "depends": ["mvtnorm"]
     },
+    "enaho": {
+      "name": "enaho",
+      "version": "0.2.0",
+      "sha256": "04nx5642bjbli22jb7a85jb9byg8kxby45j5qr82z8a8vn7g8vxs",
+      "depends": ["haven", "tibble"]
+    },
     "encode": {
       "name": "encode",
       "version": "0.3.6",
@@ -62385,8 +62727,8 @@
     },
     "enpls": {
       "name": "enpls",
-      "version": "6.1",
-      "sha256": "12088v9xnj5b3dlakqz1hbzxz4mdai7xi7s2fpx8lj3y3lx7znmb",
+      "version": "6.1.1",
+      "sha256": "0k61nbpcdv1qpym197mks2yw0rmg817yiib1zcpb5dpwnj693ypv",
       "depends": ["doParallel", "foreach", "ggplot2", "plotly", "pls", "reshape2", "spls"]
     },
     "enrichR": {
@@ -62541,8 +62883,8 @@
     },
     "eodhdR2": {
       "name": "eodhdR2",
-      "version": "0.5.1",
-      "sha256": "1r1fxgqh9sv6gkcggjjrbby2jjz2bv5pm9kq46rkq1arfsmagxr7",
+      "version": "0.5.2",
+      "sha256": "0q1zlc0q5hhhg1kb7vakcvxzhpxlkbzc94azpp8x7p8awcmy1z56",
       "depends": []
     },
     "eoffice": {
@@ -62613,8 +62955,8 @@
     },
     "epiR": {
       "name": "epiR",
-      "version": "2.0.84",
-      "sha256": "0fjanfsbczbyx7f0664igsk8y1hc051x3n00k3vwvvkzfscx69kj",
+      "version": "2.0.85",
+      "sha256": "1gn99qqfnz03xzq522pjm09wvszcqdhkavppxryj0zw1wvcc2lky",
       "depends": ["BiasedUrn", "flextable", "lubridate", "officer", "pander", "sf", "survival", "zoo"]
     },
     "epibasix": {
@@ -62707,12 +63049,6 @@
       "sha256": "1nxdlz7gl9vrha9iw92y0s9dmm101gkz0rsqxqg1rdxanr6hs6sh",
       "depends": ["deSolve", "polspline", "shiny"]
     },
-    "epimdr2": {
-      "name": "epimdr2",
-      "version": "1.0-9",
-      "sha256": "1lx1zibp2ziwdyj180jf9y5xczfs2xfkb5bw7q4f7i9p70jlqcrz",
-      "depends": ["deSolve", "ggplot2", "phaseR", "plotly", "polspline", "shiny"]
-    },
     "epinet": {
       "name": "epinet",
       "version": "2.1.11",
@@ -62769,8 +63105,8 @@
     },
     "epitrix": {
       "name": "epitrix",
-      "version": "0.4.0",
-      "sha256": "08cz2p9xxa966a2v8kay00l3pmgfgmwzlh5pnx04s19rmar13z02",
+      "version": "0.4.1",
+      "sha256": "196lykw91z8rrl8w06i8lhavk1dj3n32ivrqb2bwjbfwzljib550",
       "depends": ["distcrete", "dplyr", "purrr", "rlang", "sodium", "stringi", "tidyr"]
     },
     "epiworldR": {
@@ -62805,8 +63141,8 @@
     },
     "epm": {
       "name": "epm",
-      "version": "1.1.4",
-      "sha256": "0s7frjl457ww0njxdvrgxd68nlgp3n31ic9z4a2j5f5nzp41n7jw",
+      "version": "1.1.5",
+      "sha256": "1sdd21v3v8f65028q0kpdz5axxw17kd3v94vssfqsv728jdnh5xn",
       "depends": ["Rcpp", "RcppProgress", "ape", "pbapply", "sf", "terra", "viridisLite"]
     },
     "epmrob": {
@@ -62877,16 +63213,22 @@
     },
     "eq5d": {
       "name": "eq5d",
-      "version": "0.15.7",
-      "sha256": "0rdhvsp1fz7cpq82zksxih2kz25w9d0lxrg6jk694zzxm89gjknc",
+      "version": "0.16.0",
+      "sha256": "1777jkpdcnvd2s4617smsv8na3rc8xlyipgvgyly88xs8d796ph3",
       "depends": ["lifecycle", "rlang"]
     },
     "eq5dsuite": {
       "name": "eq5dsuite",
-      "version": "1.0.0",
-      "sha256": "1dy52swx5mq9xs2c0c4xa01dkpzffbyydfk6h83wh7hy27ml4zr8",
+      "version": "1.0.1",
+      "sha256": "137d92lilycngc5dgvpb91nsiz6vcb1f9xqjzcqfy73br82j09ky",
       "depends": ["RColorBrewer", "dplyr", "ggplot2", "moments", "rappdirs", "rlang", "scales", "stringr", "tidyr"]
     },
+    "eqtesting": {
+      "name": "eqtesting",
+      "version": "0.1.1",
+      "sha256": "0jc0fjcrmibwf22k5bm3nlcnmn85jb1cia5whkacydkpkakhzb75",
+      "depends": ["data_table"]
+    },
     "equalCovs": {
       "name": "equalCovs",
       "version": "1.0",
@@ -62925,8 +63267,8 @@
     },
     "equatiomatic": {
       "name": "equatiomatic",
-      "version": "0.3.6",
-      "sha256": "189qsbgqrzp84ylb76s56fjgvfzcwb8llp7q0mdd1h3bfrvsxa14",
+      "version": "0.3.7",
+      "sha256": "10qrkq2wzyzip9226c0vhpjc6ws8zysaqiwzr2qyxf223pg42483",
       "depends": ["broom", "broom_mixed", "knitr", "shiny"]
     },
     "equiBSPD": {
@@ -62967,15 +63309,15 @@
     },
     "erah": {
       "name": "erah",
-      "version": "2.0.1",
-      "sha256": "136wh0gaygc7mkj507bjmgzv79jcap0whngd501gg47zf7b8jzxx",
-      "depends": ["HiClimR", "furrr", "future", "igraph", "osd", "progress", "quantreg", "signal", "tibble"]
+      "version": "2.2.0",
+      "sha256": "0j3vn9c9izff54n43gz1n36ckhj668kyj151kafxb7znkx49ddz9",
+      "depends": ["HiClimR", "Rcpp", "furrr", "igraph", "osd", "progress", "quantreg", "signal", "tibble"]
     },
     "eratosthenes": {
       "name": "eratosthenes",
-      "version": "0.0.2",
-      "sha256": "1kfgqb6bd0i39k4k5wg3p33ir13wnfvdyh2ld0gmcgfl2gjks7pa",
-      "depends": ["Rcpp", "Rdpack"]
+      "version": "0.0.9",
+      "sha256": "0i8sz1s2mhq191blrhxx1sig4s12h8a8hyy4rr0vdnn6ib85njf1",
+      "depends": ["Rcpp", "Rdpack", "paletteer"]
     },
     "erboost": {
       "name": "erboost",
@@ -63021,9 +63363,9 @@
     },
     "ergm_multi": {
       "name": "ergm.multi",
-      "version": "0.2.1.1",
-      "sha256": "122yl6g4rbfdw0pscahr3p93kga8nifb2gdrpicikynpqb6dhqdn",
-      "depends": ["Matrix", "Rdpack", "ergm", "glue", "network", "purrr", "rlang", "rle", "statnet_common", "tibble"]
+      "version": "0.3.0",
+      "sha256": "0ak8qzqiw26qmy6f0kdgzq72hknz8rdz0px38bk31lxsrfcygqpl",
+      "depends": ["Matrix", "Rdpack", "ergm", "glue", "network", "networkLite", "purrr", "rlang", "rle", "statnet_common", "tibble"]
     },
     "ergm_rank": {
       "name": "ergm.rank",
@@ -63063,8 +63405,8 @@
     },
     "ernm": {
       "name": "ernm",
-      "version": "1.0.0",
-      "sha256": "1hqzx92pn13brmq4bsrsainam52c6f3x6a8n2vsll01bhwc8fhh0",
+      "version": "1.0.2",
+      "sha256": "08xqjqn6q4y61x4a66rpjp6grz1grfz9dr236v4l787sf7f22m45",
       "depends": ["BH", "Rcpp", "dplyr", "ggplot2", "moments", "network", "rlang", "tidyr", "trust"]
     },
     "erp_easy": {
@@ -63081,14 +63423,14 @@
     },
     "errorlocate": {
       "name": "errorlocate",
-      "version": "1.1.1",
-      "sha256": "1qml2qd63iqswb0zvnx9m3ia0zq7q20ycllhds3bwa4fwg25pfsp",
+      "version": "1.1.2",
+      "sha256": "01j2pxcfmvgw6y0dmi321g6hqljs80gy55jw2kk1z85d6z3vy6gg",
       "depends": ["lpSolveAPI", "validate"]
     },
     "errors": {
       "name": "errors",
-      "version": "0.4.3",
-      "sha256": "1sks7n3821lak567wr9z26mipkcsl009rmjwdkxcha969l5ic8f5",
+      "version": "0.4.4",
+      "sha256": "0gm5f1ji7xa6kv93wy050dqhbh9picyc73zj0cfc106skq8m7hwx",
       "depends": []
     },
     "errum": {
@@ -63195,9 +63537,9 @@
     },
     "espadon": {
       "name": "espadon",
-      "version": "1.11.0",
-      "sha256": "1pr7q0as14jpn6437mhrb55icpcfy9jcy5aippj9bkdlprq9xsmc",
-      "depends": ["DT", "Matrix", "Rcpp", "Rdpack", "Rvcg", "colorspace", "igraph", "js", "mathjaxr", "misc3d", "openxlsx", "progress", "qs", "rgl", "shiny", "shinyWidgets", "sodium"]
+      "version": "1.11.1",
+      "sha256": "0cb74zs29lf4zxiqirva2pm87p6rm0ql0yfpzld1dw69mglpz1jb",
+      "depends": ["DT", "Matrix", "Rcpp", "Rdpack", "Rvcg", "colorspace", "igraph", "js", "mathjaxr", "misc3d", "openxlsx", "progress", "qs2", "rgl", "shiny", "shinyWidgets", "sodium"]
     },
     "esquisse": {
       "name": "esquisse",
@@ -63327,8 +63669,8 @@
     },
     "etl": {
       "name": "etl",
-      "version": "0.4.1",
-      "sha256": "1msc5mpnw4wd5f798q8rjdxyky6b2bqn6vncgq40jscab83hk9hi",
+      "version": "0.4.2",
+      "sha256": "0cggfdw98v70wigifqvnz01lg362mpbvvcla4apcvkysmpsyqlz1",
       "depends": ["DBI", "dbplyr", "downloader", "dplyr", "fs", "janitor", "lubridate", "readr", "rlang", "rvest", "tibble", "usethis", "xml2"]
     },
     "etm": {
@@ -63361,11 +63703,11 @@
       "sha256": "0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr",
       "depends": []
     },
-    "etwfe": {
-      "name": "etwfe",
-      "version": "0.5.0",
-      "sha256": "1lb7crk14cz0bh1mbzgvc9b1llrvlj5p8605lr2p6psmrn94ikip",
-      "depends": ["Formula", "data_table", "fixest", "marginaleffects", "tinyplot"]
+    "eudata": {
+      "name": "eudata",
+      "version": "0.1.3",
+      "sha256": "1i4v967r3fkqg35gzd5ylkyg7i1n94vmi16c5592vzirgj75sxk7",
+      "depends": ["cli", "dplyr", "fs", "httr2", "purrr", "rappdirs", "tibble"]
     },
     "eudract": {
       "name": "eudract",
@@ -63415,12 +63757,6 @@
       "sha256": "0w0ffhm20yp2nfisc38hm9da1529i3fab0rxmhn1d7lsqs2f42f4",
       "depends": ["cli", "dplyr", "glue", "httr", "jsonlite", "lubridate", "stringr", "tibble", "tidyr"]
     },
-    "europeanaR": {
-      "name": "europeanaR",
-      "version": "0.1.0",
-      "sha256": "11cr8n64yv50zwib9wkvk1j43p9a1cmxmzznxykczv43l193kjg7",
-      "depends": ["Rdpack", "data_table", "httr", "jsonlite", "magrittr"]
-    },
     "europepmc": {
       "name": "europepmc",
       "version": "0.4.3",
@@ -63471,8 +63807,8 @@
     },
     "evaluate": {
       "name": "evaluate",
-      "version": "1.0.3",
-      "sha256": "1qm2vz8a1hjgqyidaf3favzbp7fjka3m6qdq9yxjjmhf2gdfvzxv",
+      "version": "1.0.4",
+      "sha256": "1jm4xijnmcvmd0m5rmvr2mj6z3v9dqj1m1fnp0d35jz3zkfgdpq8",
       "depends": []
     },
     "evapoRe": {
@@ -63549,8 +63885,8 @@
     },
     "eventstudyr": {
       "name": "eventstudyr",
-      "version": "1.1.3",
-      "sha256": "0l7sv8kb459sb69rp2y61g7a19i8xhanjd6paajlrha44bxyl1kv",
+      "version": "1.1.4",
+      "sha256": "0785x8vdwgwnfqkjadmyshrrc01pajs5phrmncypmk4ivj85y6z0",
       "depends": ["MASS", "car", "data_table", "dplyr", "estimatr", "ggplot2", "pracma", "rlang", "stringr"]
     },
     "evesim": {
@@ -63633,14 +63969,14 @@
     },
     "evolMap": {
       "name": "evolMap",
-      "version": "1.3.8",
-      "sha256": "1qf9gwpljl6wmndi37sw9ym22r9442184rx5k0gkqam56m96s4iw",
+      "version": "1.3.14",
+      "sha256": "1jvpvs5xggx45r29sxqb6cmsh5h234i8j8n3fyxrffrf9y5janb8",
       "depends": ["curl", "jsonlite", "sf"]
     },
     "evola": {
       "name": "evola",
-      "version": "1.0.5",
-      "sha256": "0c8nd804gg3hwpf5nd2f4jmi9im0cccvxn7zdh05yczlr5bvc148",
+      "version": "1.0.6",
+      "sha256": "10pyz1n0hiswxz7z1ikvwwdrcjmg8y8gi1kbx65ccq4r3v4zgi4i",
       "depends": ["AlphaSimR", "Matrix", "crayon"]
     },
     "evolqg": {
@@ -63727,6 +64063,12 @@
       "sha256": "0lqxnljrlwc94sb6niiass7k2xb6gcl4ysh5ap25d9dy4mkymkl2",
       "depends": ["exactci", "ssanv"]
     },
+    "exactLTRE": {
+      "name": "exactLTRE",
+      "version": "0.1.2",
+      "sha256": "0cjvhn0nnzfc3zsifp6szxap5f68xrm8q9g8wb67kljl8h8yqp41",
+      "depends": ["matrixcalc", "popdemo"]
+    },
     "exactRankTests": {
       "name": "exactRankTests",
       "version": "0.8-35",
@@ -63963,8 +64305,8 @@
     },
     "explore": {
       "name": "explore",
-      "version": "1.3.4",
-      "sha256": "1qnvh8ks2incns87r43qszcs3ks058zzfsd7p2ghnqhnldzkrh70",
+      "version": "1.3.5",
+      "sha256": "0as72wrnafz56jskz4zllny1abs731na7a3zzllp1047z05knjrr",
       "depends": ["DT", "cli", "dplyr", "forcats", "ggplot2", "gridExtra", "magrittr", "palmerpenguins", "plotly", "rlang", "rmarkdown", "rpart", "rpart_plot", "shiny", "stringr", "tibble"]
     },
     "exploreR": {
@@ -63981,9 +64323,9 @@
     },
     "export": {
       "name": "export",
-      "version": "0.3.0",
-      "sha256": "1b238d6aa1m2pcg7vdjbrvjj748j3fim5zvhng7lgkag2rzjqa56",
-      "depends": ["broom", "devEMF", "flextable", "officer", "openxlsx", "rgl", "rvg", "stargazer", "xml2", "xtable"]
+      "version": "0.3.1",
+      "sha256": "0960sbwrlzfvwz5hbp31xksd9bnmhhsrn9vm9dvqgd1wbqqm1bym",
+      "depends": ["broom", "devEMF", "flextable", "officer", "openxlsx", "rvg", "stargazer", "xml2", "xtable"]
     },
     "expowo": {
       "name": "expowo",
@@ -64069,17 +64411,23 @@
       "sha256": "1ad3xp4axbbid9i9vd4q8iccs3g3917yic2mas37mfwm5in4l9pl",
       "depends": ["Rcpp"]
     },
+    "extraSuperpower": {
+      "name": "extraSuperpower",
+      "version": "1.5.2",
+      "sha256": "0lglhjrp5y2hzhwh018jl6hdmd5yppbdjlv9g1g1igd4bgm8izi6",
+      "depends": ["MASS", "Matrix", "Rfit", "afex", "fGarch", "ggplot2", "ggthemes", "nparLD", "permuco", "plyr", "reshape2", "rlang", "rlist", "scales", "sn", "tmvtnorm", "truncnorm"]
+    },
     "extractFAERS": {
       "name": "extractFAERS",
-      "version": "0.1.2",
-      "sha256": "01lj86zs9qpwy7s0l2gq562a6zyblrgzk2lpxmynj5lvl253d3ag",
+      "version": "0.1.4",
+      "sha256": "08rq1nqj36m4w670kw0n102zlqzk1a0kynxmkhi0axf7cklf46hq",
       "depends": ["dplyr", "stringr"]
     },
     "extractox": {
       "name": "extractox",
-      "version": "1.0.0",
-      "sha256": "02vmd3zask41qhxrcmjkzrxqjjx94nva16fimxf9rccjlq0n0p05",
-      "depends": ["cli", "httr2", "janitor", "pingr", "readxl", "rvest", "webchem", "withr"]
+      "version": "1.2.0",
+      "sha256": "1p640q0kvv8pcfjaq98gcyy37k8zns58h9hpv326bvxdcjfzsbvk",
+      "depends": ["cli", "condathis", "curl", "fs", "httr2", "janitor", "pingr", "readxl", "rlang", "rvest", "webchem", "withr"]
     },
     "extrafont": {
       "name": "extrafont",
@@ -64131,8 +64479,8 @@
     },
     "extremeStat": {
       "name": "extremeStat",
-      "version": "1.5.9",
-      "sha256": "19ayk8nx6yb14mhgglhy3mq606mm17r3is0x6apxqic7vadvmiqg",
+      "version": "1.5.11",
+      "sha256": "0cv91x6ncyddbmw79hpb845plwbk00kw41466a4g1qp3kh2ixddw",
       "depends": ["RColorBrewer", "Renext", "berryFunctions", "evd", "evir", "extRemes", "fExtremes", "ismev", "lmomco", "pbapply"]
     },
     "extremefit": {
@@ -64215,20 +64563,20 @@
     },
     "eyeris": {
       "name": "eyeris",
-      "version": "1.2.1",
-      "sha256": "15ii61mmzpdxmhlm0yf20lskanpbza3wvb1qx085n9z2psc8zyzl",
-      "depends": ["cli", "data_table", "dplyr", "eyelinker", "gsignal", "lifecycle", "progress", "purrr", "rlang", "stringr", "tidyr", "withr", "zoo"]
+      "version": "2.1.1",
+      "sha256": "0bs2irbygws9am9yi3jmsz7rhf3pmk057z90c35281pv0hnf6n20",
+      "depends": ["MASS", "cli", "data_table", "dplyr", "eyelinker", "fields", "gsignal", "jsonlite", "lifecycle", "progress", "purrr", "rlang", "rmarkdown", "stringr", "tidyr", "viridis", "withr", "zoo"]
     },
     "eyetools": {
       "name": "eyetools",
-      "version": "0.8.1",
-      "sha256": "0h4cpb273x40lyc6hnrr4mfbkh8ip255az2yfk9n9qgcr2v7iaw4",
-      "depends": ["ggforce", "ggplot2", "glue", "hdf5r", "lifecycle", "magick", "pbapply", "rlang", "viridis", "zoo"]
+      "version": "0.9.2",
+      "sha256": "0kfchp57bl6ccix96czpa5y9p6fysmwbfb8hlxn0zvipwixd5a5x",
+      "depends": ["ggforce", "ggplot2", "glue", "hdf5r", "lifecycle", "magick", "pbapply", "png", "rlang", "viridis", "zoo"]
     },
     "eyetrackingR": {
       "name": "eyetrackingR",
-      "version": "0.2.1",
-      "sha256": "0y0aj9p4yhjmf04pi1bmbr4ygx4n2myc1n42fh3nzmy2chcaj959",
+      "version": "0.2.2",
+      "sha256": "0cda0jv3x12isz4aqkr8xj393yf2zj093mfapmmsl8p7pw1f20ar",
       "depends": ["broom", "broom_mixed", "dplyr", "ggplot2", "lazyeval", "purrr", "rlang", "tidyr", "zoo"]
     },
     "ez": {
@@ -64329,8 +64677,8 @@
     },
     "fChange": {
       "name": "fChange",
-      "version": "2.0.0",
-      "sha256": "10rv0cvpqj296g5d58h44a13nljdxlv77bpl9pfj12dafi812amz",
+      "version": "2.1.0",
+      "sha256": "0xx5dmh2fsr0dz73rx0gy88waj5hwnwd1mfcxhwibm1974izwz5j",
       "depends": ["MASS", "RColorBrewer", "Rcpp", "RcppArmadillo", "Rfast", "dplyr", "fastmatrix", "fda", "ftsa", "ggplot2", "ggpubr", "plot3D", "plotly", "rainbow", "sandwich", "scales", "tensorA", "tidyr", "vars"]
     },
     "fCopulae": {
@@ -64347,8 +64695,8 @@
     },
     "fEGarch": {
       "name": "fEGarch",
-      "version": "1.0.0",
-      "sha256": "1a5yfnkf69i2il7ic52azz5d7lwwl4jn980nfm89skn6421rc8c0",
+      "version": "1.0.1",
+      "sha256": "16xszzj97pbfx7krakqfmlsmvdmyvvfz7vnc3j9xbsjpp1fcr8fc",
       "depends": ["Rcpp", "RcppArmadillo", "Rsolnp", "cli", "esemifar", "furrr", "future", "ggplot2", "magrittr", "numDeriv", "rlang", "rugarch", "smoots", "zoo"]
     },
     "fExtremes": {
@@ -64467,8 +64815,8 @@
     },
     "fabR": {
       "name": "fabR",
-      "version": "2.1.0",
-      "sha256": "1rqy3n3gnylpfc48pmrbm91y1lr87hkg44x9x53sky9044ms6flx",
+      "version": "2.1.1",
+      "sha256": "0mvyzw17ljirqvzz0622r4wdbqysjwkrwl21lf1lmchfmd27w446",
       "depends": ["bookdown", "dplyr", "fs", "haven", "janitor", "lifecycle", "lubridate", "purrr", "readr", "readxl", "rlang", "stringr", "tidyr", "usethis", "writexl", "xfun"]
     },
     "fabisearch": {
@@ -64617,8 +64965,8 @@
     },
     "factorplot": {
       "name": "factorplot",
-      "version": "1.2.3",
-      "sha256": "0gh2rv518hz39sihv9b08v8ldyyac21djz6ynxdaajh0hcicvasf",
+      "version": "1.2.4",
+      "sha256": "007pd621qwi48xbr6p0zr7zxqm3mqi3bsqwgnpmr4m7c7xc4ms4s",
       "depends": ["multcomp"]
     },
     "factorstochvol": {
@@ -64677,8 +65025,8 @@
     },
     "fairmetrics": {
       "name": "fairmetrics",
-      "version": "1.0.3",
-      "sha256": "1nnjr3di3k9vw3nwn7sgm33w4jkp9wbga8q8qzgbw0g9jz5xbwbl",
+      "version": "1.0.4",
+      "sha256": "0gibjhyf3l78m3b32f762imgd5wdfxg2nj40y5y58hsy5gjvc85h",
       "depends": []
     },
     "fairml": {
@@ -64953,15 +65301,15 @@
     },
     "fastR2": {
       "name": "fastR2",
-      "version": "1.2.4",
-      "sha256": "1bmqsjqa13i4dm2pblrwsj1wa80mpi71mpmznc1i199kd4afscgz",
+      "version": "1.2.5",
+      "sha256": "1ryc1315bvqdf6g5zdq7jimy8j11vhckq89x3843carr7qrm1h5s",
       "depends": ["dplyr", "ggplot2", "lattice", "maxLik", "miscTools", "mosaic", "numDeriv"]
     },
     "fastRG": {
       "name": "fastRG",
-      "version": "0.3.2",
-      "sha256": "1ig6z8azl2vsl79nfs3s4f9v1f6f27vzc0kxb9zmvkpx3hfnlm7k",
-      "depends": ["Matrix", "RSpectra", "dplyr", "ellipsis", "ggplot2", "glue", "igraph", "tibble", "tidygraph", "tidyr"]
+      "version": "0.3.3",
+      "sha256": "0w269x4cmcv062srvkzd781h1bm955627z7rsksbr65a3adaw4da",
+      "depends": ["Matrix", "RSpectra", "dplyr", "ggplot2", "glue", "igraph", "rlang", "tibble", "tidygraph", "tidyr"]
     },
     "fastRhockey": {
       "name": "fastRhockey",
@@ -65073,14 +65421,14 @@
     },
     "fastdid": {
       "name": "fastdid",
-      "version": "1.0.3",
-      "sha256": "1rb3lvp9s5jj34643c5njsi16hl7q67hjvyzcfw1gxdrz46nv444",
+      "version": "1.0.5",
+      "sha256": "00rnsqpmfs5kbbxjyrlnjm3hz095yvbzfw1svk1811hbbvn2kycl",
       "depends": ["BMisc", "collapse", "data_table", "dreamerr", "ggplot2", "parglm", "stringr"]
     },
     "fastei": {
       "name": "fastei",
-      "version": "0.0.0.7",
-      "sha256": "1zfwm8pbc6n9gnv4dx7g8dx9g9w2ab0wa5l4sapdmfh9bg1dwhim",
+      "version": "0.0.0.9",
+      "sha256": "1mq4rlfyzjpcsql2326q7mpvdx019gg3x7jhn037wqzfsy50rjdb",
       "depends": ["Rcpp", "jsonlite"]
     },
     "fasterElasticNet": {
@@ -65091,8 +65439,8 @@
     },
     "fasterRaster": {
       "name": "fasterRaster",
-      "version": "8.4.0.7",
-      "sha256": "0fzzgasbcb9p4mghggl8m0slk0wjbidzbvvxjl8q1lyy8k90zgb6",
+      "version": "8.4.1.0",
+      "sha256": "0d3qqkvyq7jmcskd5i95hv4ss4licjacr95qq058r90jik4gajl9",
       "depends": ["DT", "data_table", "omnibus", "rgrass", "sf", "shiny", "terra"]
     },
     "fasterize": {
@@ -65151,8 +65499,8 @@
     },
     "fastmatrix": {
       "name": "fastmatrix",
-      "version": "0.5-9017",
-      "sha256": "0bdbcn20c3kxjc7zg1xvp0nnykifwnf8v2911gqz4156hx9kw8k8",
+      "version": "0.6",
+      "sha256": "1s62avacck9bszws2q8mkf2b9rs2dh3zs04lgm75fkbvcayr7jrx",
       "depends": []
     },
     "fastmit": {
@@ -65163,8 +65511,8 @@
     },
     "fastml": {
       "name": "fastml",
-      "version": "0.6.1",
-      "sha256": "06c61lffg479p5izmspfpwycnzjx4hkd17ryh65vz8p354lk1hgs",
+      "version": "0.6.2",
+      "sha256": "1cgmi5ggkf0y2ik5spb106g98y9gyw85pk6c44rp8qcbbxhxdhz5",
       "depends": ["DALEX", "DT", "GGally", "RColorBrewer", "UpSetR", "VIM", "baguette", "bonsai", "broom", "dbscan", "dials", "discrim", "doFuture", "dplyr", "finetune", "future", "ggplot2", "ggpubr", "gridExtra", "htmlwidgets", "janitor", "kableExtra", "knitr", "magrittr", "mice", "missForest", "moments", "naniar", "pROC", "parsnip", "patchwork", "plotly", "plsmod", "probably", "purrr", "recipes", "reshape2", "rlang", "rmarkdown", "rsample", "scales", "skimr", "stringr", "tibble", "tidyr", "tune", "viridisLite", "workflows", "yardstick"]
     },
     "fastnet": {
@@ -65185,6 +65533,12 @@
       "sha256": "1zb2d89659r912yxg003zhbxacvh1qrwi33hpqnmr4afhsqgw34f",
       "depends": ["colorfast"]
     },
+    "fastpolicytree": {
+      "name": "fastpolicytree",
+      "version": "1.0",
+      "sha256": "0nlm9gwb68rw4bp3wsm4wc1chf4chqi3by8iwxjandgzj37hlxy6",
+      "depends": ["Rcpp"]
+    },
     "fastpos": {
       "name": "fastpos",
       "version": "0.5.1",
@@ -65253,8 +65607,8 @@
     },
     "fat2Lpoly": {
       "name": "fat2Lpoly",
-      "version": "1.2.5",
-      "sha256": "08bbd17aqmfcacvk283bpf9cp1isf5pgfdciwxn0f7ahdzd81g4s",
+      "version": "1.2.6",
+      "sha256": "01s679c7jhq2zb6c1k9i4l52ygrngjp2i6x6ws59d8qc2rbxjc2f",
       "depends": ["kinship2", "multgee"]
     },
     "faux": {
@@ -65379,8 +65733,8 @@
     },
     "fclust": {
       "name": "fclust",
-      "version": "2.1.1.1",
-      "sha256": "1d5qa30jlx6qn6npvccl97fcmh5a4wf3nw0d7jvn3y7mcb5yqlqk",
+      "version": "2.1.2",
+      "sha256": "1i4khfkh0wzi4jpcgvdgsjjvxk5nfcdb1r0079ys1lyvx07x0qj6",
       "depends": ["MASS", "Rcpp", "RcppArmadillo"]
     },
     "fcm": {
@@ -65469,9 +65823,9 @@
     },
     "fdaPOIFD": {
       "name": "fdaPOIFD",
-      "version": "1.0.3",
-      "sha256": "0c773hidrg69gs9lzdcwf4hzzmid3kwf73pw6c807y1b4lgiai20",
-      "depends": ["FastGP", "MASS", "fdapace", "ggplot2", "magrittr", "patchwork", "reshape2", "tibble"]
+      "version": "2.0.0",
+      "sha256": "1zx4rjb5h9inqgh7db9n69jviyw1i7zcxjkhpcbv5pwa0rchn68a",
+      "depends": ["ggplot2", "igraph", "magrittr", "patchwork", "reshape2", "tibble"]
     },
     "fdaSP": {
       "name": "fdaSP",
@@ -65523,9 +65877,9 @@
     },
     "fdasrvf": {
       "name": "fdasrvf",
-      "version": "2.3.6",
-      "sha256": "0fwzs5m0gkmk2gygx3n9dv2k7a7hcfj8zfcm2fbzqgkj4ffhhymx",
-      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "cli", "coda", "doParallel", "fields", "foreach", "lpSolve", "mvtnorm", "rlang", "tolerance", "viridisLite"]
+      "version": "2.4.0",
+      "sha256": "0gy57vdg04im4z9n9g1lys0959c2y2sa83c4qzblzm3f9gl9ndh0",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "cli", "coda", "doParallel", "fields", "foreach", "lpSolve", "minpack_lm", "mvtnorm", "rlang", "tolerance", "viridisLite"]
     },
     "fdatest": {
       "name": "fdatest",
@@ -65541,8 +65895,8 @@
     },
     "fdesigns": {
       "name": "fdesigns",
-      "version": "1.0",
-      "sha256": "0hsn325jgzvd4bjpmy5rglnz9035k1lb4h8yf2hbajnxxald0kal",
+      "version": "1.1",
+      "sha256": "10njbw13achjd5jcb3qj2mzmg1vi1ik7vwlxbhqpjg39jv6ik5cn",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "mvQuad", "mvtnorm"]
     },
     "fdicdata": {
@@ -65689,6 +66043,12 @@
       "sha256": "1havzbpqwlc32qmr2mpdxczjj918aig7l0iz669pkgxgqxf8dq5x",
       "depends": []
     },
+    "fee": {
+      "name": "fee",
+      "version": "1.0.0",
+      "sha256": "0wkl2il9bdl6a4vrwb3ki10ay6iciz1j5nm1gd4j87sl12bjafvf",
+      "depends": ["oneinfl"]
+    },
     "feisr": {
       "name": "feisr",
       "version": "1.3.0",
@@ -65757,8 +66117,8 @@
     },
     "fetwfe": {
       "name": "fetwfe",
-      "version": "1.0.0",
-      "sha256": "14vrjri748rinzb56pwwnddi230src9q7wrxzqch8lliv8262wq9",
+      "version": "1.5.0",
+      "sha256": "04pg6lj3wgid3crqnhd7bzlbqa6nghx5pcjx1l2bxk2m8srmalcf",
       "depends": ["Matrix", "expm", "glmnet", "grpreg"]
     },
     "ff": {
@@ -65851,12 +66211,6 @@
       "sha256": "1srv60svg3ig4xp4k25cq5jw56izf1hcwr9acnpx09y2sqh11y70",
       "depends": ["MASS", "Matrix", "lmtest", "matrixcalc", "network", "sandwich", "sna"]
     },
-    "fgm": {
-      "name": "fgm",
-      "version": "1.0",
-      "sha256": "0i6lbqxxjq78dql14qwqs7slnn0kyls2g3a9biabny2narwf6n3m",
-      "depends": ["JGL", "fdapace"]
-    },
     "fgui": {
       "name": "fgui",
       "version": "1.0-8",
@@ -66043,6 +66397,12 @@
       "sha256": "1rxq1ci3q1n4v5nnkrcl29kand7a752b7rrgrzq754jjaybp6xnh",
       "depends": ["magrittr", "plyr", "yaml"]
     },
+    "filtro": {
+      "name": "filtro",
+      "version": "0.1.0",
+      "sha256": "1lx1cp4jfknsxy8ppx3101bzzg0qmlmgpk3vhrx6cb81mmi1c7jg",
+      "depends": ["purrr", "rlang", "tibble"]
+    },
     "finalfit": {
       "name": "finalfit",
       "version": "1.0.8",
@@ -66195,8 +66555,8 @@
     },
     "firebase_auth_rest": {
       "name": "firebase.auth.rest",
-      "version": "1.0.0",
-      "sha256": "1gdrccvh5hlrrpv57swjqvma5pw6ikmn6zyya7z22hwwmzlc97m3",
+      "version": "1.0.1",
+      "sha256": "1f5lxjnl04sv2y10vz6vwlngcdnrh0likchz6sqzf9f7dp177y7k",
       "depends": ["httr2"]
     },
     "firebehavioR": {
@@ -66235,6 +66595,12 @@
       "sha256": "15mlr113qgndjhyry8img50jfk0si81kw2cdgl896b0g4djc5la3",
       "depends": []
     },
+    "fishboot": {
+      "name": "fishboot",
+      "version": "1.0.2",
+      "sha256": "0ay53vdkgckim4n7cxdsh12gqbsbbja43lc7lpa12spjb6myznyv",
+      "depends": ["TropFishR", "doParallel", "fishmethods", "foreach", "ks"]
+    },
     "fishdata": {
       "name": "fishdata",
       "version": "1.0.1",
@@ -66267,8 +66633,8 @@
     },
     "fishstat": {
       "name": "fishstat",
-      "version": "2025.1.0.0",
-      "sha256": "0xnmmpfhy79yck30rwvm7qlkjg04xn7h2w9an67lsy2715rp0cns",
+      "version": "2025.1.0.1",
+      "sha256": "02hwij5cc8267z6zs9qwvlaicnzx8dkk6gxrl75wd3p97l8dj860",
       "depends": []
     },
     "fishtree": {
@@ -66333,8 +66699,8 @@
     },
     "fitbitViz": {
       "name": "fitbitViz",
-      "version": "1.0.6",
-      "sha256": "021ggcfgcwr3l6ppjwfm3q489k9rni20f00mqpfsbh1xjvlrg0rz",
+      "version": "1.0.7",
+      "sha256": "1gw9glpphjyi6a3dviar1zyn0jqv07j46clz4skdawfwnqvnnny2",
       "depends": ["XML", "base64enc", "data_table", "ggplot2", "ggthemes", "glue", "hms", "httr", "jsonlite", "leafgl", "leaflet", "lifecycle", "lubridate", "magrittr", "paletteer", "patchwork", "raster", "rayshader", "reshape2", "rstudioapi", "scales", "sf", "terra", "varian", "viridis"]
     },
     "fitbitr": {
@@ -66351,8 +66717,8 @@
     },
     "fitdistrplus": {
       "name": "fitdistrplus",
-      "version": "1.2-2",
-      "sha256": "1ms5cisbv7k5kyn79hk13wr9dmf23lzria84w5z9h2d70zgn0hfp",
+      "version": "1.2-4",
+      "sha256": "13qjwfg8sqavqlwpswlcnyj6ndiiql65gna9wwwrffvsfh31nd5j",
       "depends": ["MASS", "rlang", "survival"]
     },
     "fitlandr": {
@@ -66429,8 +66795,8 @@
     },
     "fixes": {
       "name": "fixes",
-      "version": "0.4.0",
-      "sha256": "06zh7fd8dvdc7ndp1fbsrnvdvx2ga1ya10jvlfrlzggfqd38x13f",
+      "version": "0.5.0",
+      "sha256": "0805gsrmrqi0z6jwqrys6afj6m61cw7b185dzmj44yz2m3fhfnzm",
       "depends": ["broom", "dplyr", "fixest", "ggplot2", "rlang", "tibble"]
     },
     "fixest": {
@@ -66585,9 +66951,9 @@
     },
     "flexIC": {
       "name": "flexIC",
-      "version": "0.1.3",
-      "sha256": "1jm36vld9yafqrxkifma2bspd860hxbh3l4wclx8dcv667c0aj52",
-      "depends": ["ggplot2"]
+      "version": "0.1.4",
+      "sha256": "1ppz8lvrsbm0nmapmrdh11b29fb34py67mwdxks4z1p7jz6jlzwd",
+      "depends": ["MASS", "ggplot2"]
     },
     "flexOR": {
       "name": "flexOR",
@@ -66699,8 +67065,8 @@
     },
     "flightsbr": {
       "name": "flightsbr",
-      "version": "1.1.0",
-      "sha256": "0zmrd5lww637a1yvyc4ap9v0lkdj8ypdpy1b1swrm4alf3bg9s19",
+      "version": "1.1.1",
+      "sha256": "1xp9d9acl1337b8jl0ngjj2nlrasg0g68g92ajxj971a82k5kabc",
       "depends": ["archive", "curl", "data_table", "fs", "janitor", "lifecycle", "parzer", "pbapply", "rvest"]
     },
     "flimo": {
@@ -66763,6 +67129,12 @@
       "sha256": "1mb95jdspi3363x75y972g1pg3cy7qhsgplm0vhl6l3mzcvvcnwi",
       "depends": ["MASS"]
     },
+    "flir": {
+      "name": "flir",
+      "version": "0.5.0",
+      "sha256": "1snin9hh4zc30qb00mw1j27zvxk32h1yn19f52cydf292kmch624",
+      "depends": ["astgrepr", "cli", "crayon", "data_table", "digest", "fs", "git2r", "rprojroot", "yaml"]
+    },
     "float": {
       "name": "float",
       "version": "0.3-3",
@@ -66823,6 +67195,12 @@
       "sha256": "1il5cbg7qgsw95rx3mxgy789wja0fpn40my0asyj1vrac0w8kgvq",
       "depends": ["Gmisc", "cli", "dplyr", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
     },
+    "flowcluster": {
+      "name": "flowcluster",
+      "version": "0.1.0",
+      "sha256": "18nnvr6yihw1acgadk4q9zirrbgxjnninxa1gxn178wiyq24gjgr",
+      "depends": ["dbscan", "dplyr", "glue", "lwgeom", "sf", "tibble", "tidyr", "tidyselect", "units"]
+    },
     "flowmapblue": {
       "name": "flowmapblue",
       "version": "0.0.2",
@@ -66879,14 +67257,20 @@
     },
     "fluxible": {
       "name": "fluxible",
-      "version": "1.2.2",
-      "sha256": "1j3ccnksfh90jfmg9gqasqjc7n8jd9yczr0x6llz43hl4y3xj3qv",
+      "version": "1.2.6",
+      "sha256": "1phqplf7703r9ws75bs9kw47m6h2jyssh84949qjp0aylmkr44sz",
       "depends": ["broom", "dplyr", "ggforce", "ggplot2", "haven", "lifecycle", "lubridate", "progress", "purrr", "purrrlyr", "rlang", "stringr", "tidyr", "tidyselect", "zoo"]
     },
+    "fluxtools": {
+      "name": "fluxtools",
+      "version": "0.4.0",
+      "sha256": "1gkqdxdknxfcnxcgd7kanj7ld7db3jjh49gyi5rrwihla52ipa60",
+      "depends": ["dplyr", "plotly", "shiny"]
+    },
     "fluxweb": {
       "name": "fluxweb",
-      "version": "0.2.0",
-      "sha256": "1ssq90fqm4p0j4g171mx208lmgz3hkxs8hgsffkawpmxgacs0gh1",
+      "version": "2.0.1",
+      "sha256": "1ynlprbw7slwx6kini9q9lp520swrwmgpnvmfxka6y5v399dkp5b",
       "depends": []
     },
     "flying": {
@@ -66933,9 +67317,9 @@
     },
     "fmesher": {
       "name": "fmesher",
-      "version": "0.4.0",
-      "sha256": "0c0wf1lxl5kwdpa91jvfg8ysn7yarrbrwr5ycf32dfvx1b164s7q",
-      "depends": ["Matrix", "Rcpp", "dplyr", "lifecycle", "rlang", "sf", "tibble", "withr"]
+      "version": "0.5.0",
+      "sha256": "1rzbcykby1q6hj54asjwxk5353jl4ln1lpd1vygpm06dj48wn6vw",
+      "depends": ["Matrix", "Rcpp", "dplyr", "lifecycle", "rlang", "sf", "splancs", "tibble", "withr"]
     },
     "fmf": {
       "name": "fmf",
@@ -67011,8 +67395,8 @@
     },
     "foghorn": {
       "name": "foghorn",
-      "version": "1.6.0",
-      "sha256": "1x3zgjy1pnjv0a2dra5a36fwg3lgq8yfqdm731r28kdwy6d1az85",
+      "version": "1.6.1",
+      "sha256": "1n2cb2gw63zf314wwlb4gggiwkckxswhhr73l1fqyvnpdgsqxxz3",
       "depends": ["cli", "curl", "httr2", "rlang", "rvest", "tibble", "xml2"]
     },
     "folda": {
@@ -67161,8 +67545,8 @@
     },
     "forecastHybrid": {
       "name": "forecastHybrid",
-      "version": "5.0.19",
-      "sha256": "1pg3wbmlagr01j3nikfh4dvh5lvbdfp7069wx9h9xsl7d4481ly1",
+      "version": "5.1.20",
+      "sha256": "1dc78dy728bk4ny2w6yrjcfjl2h65d2hxdnrfvjyqsqx8wh48xni",
       "depends": ["doParallel", "foreach", "forecast", "ggplot2", "purrr", "thief", "zoo"]
     },
     "forecastLSW": {
@@ -67273,12 +67657,6 @@
       "sha256": "1xkl6kv0y863ksd2p6aj2cf377v1kdz3py37vylfawjq5jawqzyy",
       "depends": ["archive", "cli", "countrycode", "dplyr", "foreign", "glue", "lifecycle", "purrr", "sf", "stringi", "stringr", "terra", "tibble", "tidyr"]
     },
-    "forestecology": {
-      "name": "forestecology",
-      "version": "0.2.0",
-      "sha256": "0pvh50sdiscgkshlmyngz7pkmpaz03c8x3gfjp5ir52f8710ngb7",
-      "depends": ["blockCV", "dplyr", "forcats", "ggplot2", "ggridges", "glue", "magrittr", "mvnfast", "patchwork", "purrr", "rlang", "sf", "sfheaders", "snakecase", "stringr", "tibble", "tidyr", "yardstick"]
-    },
     "forested": {
       "name": "forested",
       "version": "0.1.0",
@@ -67413,8 +67791,8 @@
     },
     "forrel": {
       "name": "forrel",
-      "version": "1.8.0",
-      "sha256": "0i1114xw4np4sb3yw22pc8j1wcnyqvl1wgcgns1xccmh5pzvwkl5",
+      "version": "1.8.1",
+      "sha256": "1jfxbppkkpqq44djxkl2wwcz6dpvaj44yrdbi7jg6md3pdn5k2jv",
       "depends": ["glue", "pbapply", "pedprobr", "pedtools", "ribd", "verbalisr"]
     },
     "forsearch": {
@@ -67429,6 +67807,12 @@
       "sha256": "0x3nrvazzapvx8nfjyp7a0d1n2qs3mpbnfqj07rv4kxyw47p93iy",
       "depends": ["dplyr", "glue", "rlang", "stringr", "tidyselect"]
     },
+    "fortniteR": {
+      "name": "fortniteR",
+      "version": "0.1.0",
+      "sha256": "1linykhm2mp4sgwvxgyrmrz5gr748fd8ygz1i2c9vv3ywkrgz5r6",
+      "depends": ["dplyr", "httr2", "purrr", "tibble"]
+    },
     "fortunes": {
       "name": "fortunes",
       "version": "1.5-4",
@@ -67489,6 +67873,12 @@
       "sha256": "0w15ylisx7md3nyclqbd13n23f2r36875pdiskav4rry28m892bi",
       "depends": []
     },
+    "fpROC": {
+      "name": "fpROC",
+      "version": "0.1.0",
+      "sha256": "08a3s2qaz5p7rqbxglz93mlm8a5rf7mv87x30gwf8a69dsd530q7",
+      "depends": ["Rcpp", "RcppArmadillo", "terra"]
+    },
     "fpa": {
       "name": "fpa",
       "version": "1.0",
@@ -67575,8 +67965,8 @@
     },
     "fqar": {
       "name": "fqar",
-      "version": "0.5.4",
-      "sha256": "0gjf7k1rz2rlaqbmhg4sifan6x49alk8wvxracqmzkgggkp82sbw",
+      "version": "0.5.5",
+      "sha256": "0f84bs88mpcybrnaqy3jplxfm1hm7g0zgc7yzwdqsjzqx4qvfv2j",
       "depends": ["dplyr", "ggplot2", "httr", "jsonlite", "memoise", "rlang", "tidyr", "tidyselect"]
     },
     "fr": {
@@ -67627,6 +68017,12 @@
       "sha256": "1hi5xzya528947wfb50brl00m6n6krv4sn5nzga285nncf6xprhh",
       "depends": ["abind"]
     },
+    "fractalforest": {
+      "name": "fractalforest",
+      "version": "1.0.1",
+      "sha256": "0lfvaqjfqrcjf71yn840bllmw69qi6d18fnxlw01mddb4c8aq598",
+      "depends": ["cowplot", "dplyr", "ggplot2", "magrittr", "purrr", "rlang", "sf", "stringi", "stringr"]
+    },
     "fractional": {
       "name": "fractional",
       "version": "0.1.3",
@@ -67905,9 +68301,9 @@
     },
     "froggeR": {
       "name": "froggeR",
-      "version": "0.4.0",
-      "sha256": "0zjij29b4vbby2dymwkks4n3f3pd44z18i49ivm8a9fhjhh0hshw",
-      "depends": ["cli", "glue", "here", "quarto", "rappdirs", "readr", "rstudioapi", "stringr", "usethis", "yaml"]
+      "version": "0.5.1",
+      "sha256": "10ndbl8yh8rh01cifk56fx0yhjvzmdbd3ifmwmd5bm5whn38221c",
+      "depends": ["cli", "fs", "glue", "here", "quarto", "rappdirs", "readr", "rstudioapi", "stringr", "usethis", "yaml"]
     },
     "fromhere": {
       "name": "fromhere",
@@ -67947,8 +68343,8 @@
     },
     "frscore": {
       "name": "frscore",
-      "version": "0.5.1",
-      "sha256": "1nss4kmsficfn7kwwcy6bvmpym9zz8cz8s7n6xdd168bhsr3z6gp",
+      "version": "0.5.2",
+      "sha256": "1wp3rrbrvnxq0cq6fkyy3hbf2xpfi01zcfgzia8amxgs8382lgb9",
       "depends": ["Rfast", "cna", "dplyr", "igraph", "lifecycle", "magrittr", "rlang", "visNetwork", "withr"]
     },
     "fruclimadapt": {
@@ -67975,12 +68371,6 @@
       "sha256": "0815z6a677ygiv4hlslmvbnd1pdnh2xz3sw0nzgrcr2vzj83h25x",
       "depends": ["R6", "R_utils", "chk", "lgr", "lifecycle", "stringi"]
     },
-    "fscaret": {
-      "name": "fscaret",
-      "version": "0.9.4.4",
-      "sha256": "18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw",
-      "depends": ["caret", "gsubfn", "hmeasure"]
-    },
     "fsdaR": {
       "name": "fsdaR",
       "version": "0.9-0",
@@ -68013,8 +68403,8 @@
     },
     "fso": {
       "name": "fso",
-      "version": "2.1-2",
-      "sha256": "15jvq063j05wpiwcm80zbnr1rf5g7xhv60qh3b8c43l398n4frhw",
+      "version": "2.1-4",
+      "sha256": "0linrn5r3l3rcgr05iqc8bjrg042p0i3vjrxkcppi6apnq0mnvqa",
       "depends": ["labdsv"]
     },
     "fspe": {
@@ -68203,6 +68593,12 @@
       "sha256": "16lp9sz63s3g3f1j1dmx881k6wy177cmi4vl6xwg4bzg88bkf8rq",
       "depends": ["devtools", "ggplot2", "ggrepel", "igraph", "randomcoloR"]
     },
+    "funcMapper": {
+      "name": "funcMapper",
+      "version": "1.0.2",
+      "sha256": "04q03zax1yy5a03yaxxcrrh6896wap4zliji6f9di0ws3863drqm",
+      "depends": ["functiondepends", "glue", "htmlwidgets", "magrittr", "visNetwork"]
+    },
     "funcharts": {
       "name": "funcharts",
       "version": "1.7.0",
@@ -68221,6 +68617,12 @@
       "sha256": "120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr",
       "depends": []
     },
+    "functionals": {
+      "name": "functionals",
+      "version": "0.5.0",
+      "sha256": "0xyz1a7zlbcp2slka1f7zgyzlm48yv2p367pxi9acbpjli25yqns",
+      "depends": []
+    },
     "functiondepends": {
       "name": "functiondepends",
       "version": "0.2.3",
@@ -68347,6 +68749,12 @@
       "sha256": "113qzv4wyh76nhidk4kdcrqaczcand1ihhgcvvm9jj3nbbh8xqkh",
       "depends": ["bigalgebra", "biganalytics", "bigmemory", "fastDummies", "gplots"]
     },
+    "fusedTree": {
+      "name": "fusedTree",
+      "version": "1.0.1",
+      "sha256": "0530cgxjznjrr2ilwqhvla4nmzr1vfn4y6qcpp79ahdnfal09xsz",
+      "depends": ["Matrix", "splitTools", "survival", "treeClust"]
+    },
     "fusen": {
       "name": "fusen",
       "version": "0.7.1",
@@ -68391,8 +68799,8 @@
     },
     "future": {
       "name": "future",
-      "version": "1.58.0",
-      "sha256": "1r4g38idri2lxrbgd4j20ypp3zj0j99m96zk35qyfjx2sazwjxr7",
+      "version": "1.67.0",
+      "sha256": "15wlavph1gnk7cskp34jjlx4ngdsh8wm3fik5q6sypjvbh4q9jzq",
       "depends": ["digest", "globals", "listenv", "parallelly"]
     },
     "future_apply": {
@@ -68409,14 +68817,14 @@
     },
     "future_callr": {
       "name": "future.callr",
-      "version": "0.10.0",
-      "sha256": "06f5s4rsaa2q6jkqx44i9l99g99ylwzxkhj4avjk2k64pvjw2aw6",
+      "version": "0.10.1",
+      "sha256": "0z0qxkai6z29chbpfmhkgr311vks0zpyvd7p1bak6yq6gy6kf6ra",
       "depends": ["callr", "future", "parallelly"]
     },
     "future_mirai": {
       "name": "future.mirai",
-      "version": "0.10.0",
-      "sha256": "19hhyq0ag9c9gajj266n0wkl341izwqhbdk9h8yq5dp7nifxlas7",
+      "version": "0.10.1",
+      "sha256": "1kzcdm2w98xc4gk8rc94lbspag5nxaji80rvsn703kli9bccryji",
       "depends": ["future", "mirai", "parallelly"]
     },
     "future_tests": {
@@ -68457,8 +68865,8 @@
     },
     "fuzzyjoin": {
       "name": "fuzzyjoin",
-      "version": "0.1.6",
-      "sha256": "0s5rhqz8vih4za3a8k1k7i3gq8hj0w7bqnakw40k6mg87jvyzsj7",
+      "version": "0.1.6.1",
+      "sha256": "0zf7jnr8zbb736j2v6z4ri8ig20lrf17j9jylf4vdf7kdwd9irxr",
       "depends": ["dplyr", "geosphere", "purrr", "stringdist", "stringr", "tibble", "tidyr"]
     },
     "fuzzylink": {
@@ -68475,9 +68883,9 @@
     },
     "fwb": {
       "name": "fwb",
-      "version": "0.4.0",
-      "sha256": "052b43cbrsn7rz7mbhs5m50qhjpq414cvp42zd1jk9zrxm1wak03",
-      "depends": ["chk", "pbapply", "rlang"]
+      "version": "0.5.0",
+      "sha256": "0wzza6cwj8fbs58dm3ci43gh5ly3pmf0a6xjphkgpky17xigrr99",
+      "depends": ["chk", "generics", "pbapply", "rlang"]
     },
     "fwlplot": {
       "name": "fwlplot",
@@ -68533,6 +68941,12 @@
       "sha256": "1lkasna05pp5sc9jqgqmias8kl7h1fb64jfb9rpld575lmy2n2gv",
       "depends": ["AnnotationDbi", "htmlwidgets", "httr2", "jsonlite", "org_Hs_eg_db", "stringr"]
     },
+    "g6R": {
+      "name": "g6R",
+      "version": "0.1.0",
+      "sha256": "1j5gvfqfq1am3sygskfss6v4j910cglpnkb5hxplr7wls3924mcz",
+      "depends": ["htmlwidgets", "shiny"]
+    },
     "gCat": {
       "name": "gCat",
       "version": "0.2",
@@ -68541,8 +68955,8 @@
     },
     "gFormulaMI": {
       "name": "gFormulaMI",
-      "version": "1.0.1",
-      "sha256": "1sk952gnisx6vyq4lkk14clj11sy73j1ik58fwzjvjblpdjfd45a",
+      "version": "1.0.2",
+      "sha256": "0ix5wdii6ncdxwahf2d8v604zwib14hixn1hcdvk4cbqkpwpks1r",
       "depends": ["mice"]
     },
     "gIPFrm": {
@@ -68583,8 +68997,8 @@
     },
     "gMOIP": {
       "name": "gMOIP",
-      "version": "1.5.4",
-      "sha256": "1vjzn2r3qfwvrvh74ly8sbsarx86r2sfhxh31zkbqnwh12465dgm",
+      "version": "1.5.5",
+      "sha256": "128sv7m3x0gb43bs1bm5jwsgymxl14gadyjvnjcff8wmbi0ax7f2",
       "depends": ["MASS", "Matrix", "Rfast", "dplyr", "geometry", "ggplot2", "ggrepel", "moocore", "plyr", "png", "purrr", "rgl", "rlang", "sp", "tibble", "tidyr", "tidyselect"]
     },
     "gMWT": {
@@ -68677,12 +69091,6 @@
       "sha256": "1sg09v0nc0q0da74c2a665q6yjsyg1iv6gzdfpqzq9y6d9fvpf66",
       "depends": ["Rdpack", "dplyr", "gap", "gap_datasets", "ggplot2", "survival"]
     },
-    "gadget2": {
-      "name": "gadget2",
-      "version": "2.3.11",
-      "sha256": "0ka5mbr9nppgsr95l33k510h278z49j6chbbqvbba0gan9842kwg",
-      "depends": []
-    },
     "gadget3": {
       "name": "gadget3",
       "version": "0.13-0",
@@ -68721,16 +69129,28 @@
     },
     "galamm": {
       "name": "galamm",
-      "version": "0.2.2",
-      "sha256": "1zsfqd6l9bd4m9kzlz7lk9ncjy24lhwv3xcr06ps6kdqxvs51xrf",
+      "version": "0.2.3",
+      "sha256": "0zjfb9siwn62irvjfrzk0hdbj1jqcg8f3kdr5lzgniasgqgs2bvd",
       "depends": ["Matrix", "Rcpp", "RcppEigen", "Rdpack", "lme4", "memoise", "mgcv", "nlme"]
     },
+    "galaxias": {
+      "name": "galaxias",
+      "version": "0.1.0",
+      "sha256": "18fjnbb9yc5l05yy0348m5mvs9hr51qbv23dbqyrxwsaz6x5aba4",
+      "depends": ["cli", "corella", "delma", "dplyr", "fs", "glue", "httr2", "jsonlite", "purrr", "readr", "rlang", "tibble", "usethis", "withr", "zip"]
+    },
     "galigor": {
       "name": "galigor",
       "version": "0.2.5",
       "sha256": "1lfw1kikf90nv9g0xrb656fbilmxdk64zrzi43wrz7y2y55sd5xv",
       "depends": ["cli", "crayon", "dplyr", "gargle", "getProxy", "magrittr", "purrr", "rappsflyer", "rfacebookstat", "rgoogleads", "rmytarget", "rstudioapi", "rvkstat", "ryandexdirect", "rym", "tibble", "tidyr"]
     },
+    "galisats": {
+      "name": "galisats",
+      "version": "1.0.1",
+      "sha256": "1a3z2gqcb4vdnr8dq5425aqrr7p3fj3xmibczqw6my6dpbca5bzf",
+      "depends": ["png"]
+    },
     "gallery": {
       "name": "gallery",
       "version": "1.0.0",
@@ -68805,8 +69225,8 @@
     },
     "gamclass": {
       "name": "gamclass",
-      "version": "0.62.5",
-      "sha256": "0y34970qwgssdnwnhb1hnkyav8j7pq3hkdskw63qs8cin4cknq7j",
+      "version": "0.62.7",
+      "sha256": "1mqmq4qdk37rihai1dxfvk3g56lb4f1mjzgbxyw5vxpbnlrzjqlz",
       "depends": ["lattice", "latticeExtra", "randomForest", "rpart"]
     },
     "gameR": {
@@ -68931,8 +69351,8 @@
     },
     "gammaFuncModel": {
       "name": "gammaFuncModel",
-      "version": "4.0",
-      "sha256": "0r16ni3wcdq1z26lf4k14l5ax0ry95vyj07vsdn270wh10b1hi6m",
+      "version": "5.0",
+      "sha256": "1593lfbbnrai8amkqqmy6gpm7xg0yq4ndvxi877zz972542fnsv9",
       "depends": ["Rdpack", "cubature", "dplyr", "future_apply", "ggplot2", "gridExtra", "nlme", "patchwork", "rlang", "rootSolve", "scales"]
     },
     "gammi": {
@@ -69021,8 +69441,8 @@
     },
     "garchx": {
       "name": "garchx",
-      "version": "1.5",
-      "sha256": "0znb5drsbd6vfr6yp020r3w3k3jmk6p3xcnkx3n2sc7fm2qg765b",
+      "version": "1.6",
+      "sha256": "1mgi55cvvczzadsg5p8nkxmj2v327qms724ynpvszdcm4l5hvy6p",
       "depends": ["zoo"]
     },
     "gargle": {
@@ -69115,10 +69535,16 @@
       "sha256": "1cbhii3z0pa1pxjkv4qqks2jv4radhwgsz11cr21kzg1nkd3g9sc",
       "depends": ["deSolve"]
     },
+    "gaussDiff": {
+      "name": "gaussDiff",
+      "version": "1.1.1",
+      "sha256": "0ipriazck2j62nwalrgbrdn9gb8lg1iiin0id8if5hdj75j194lq",
+      "depends": []
+    },
     "gausscov": {
       "name": "gausscov",
-      "version": "1.1.6",
-      "sha256": "1ipf6fm76g44f93gzmij4ihh3r2qx2hw618lyi050czgij1f9i1m",
+      "version": "1.1.8",
+      "sha256": "0cygzw6832xcq9qdcns1pnj1afhbkbzzlyqpvn3xdy2409646ld1",
       "depends": []
     },
     "gaussfacts": {
@@ -69141,8 +69567,8 @@
     },
     "gaussratiovegind": {
       "name": "gaussratiovegind",
-      "version": "2.0.1",
-      "sha256": "16gwi1xqdi0xpcmq8nmw5q75nj1f4lnxrxvl49bli06ycbhrk3lq",
+      "version": "2.0.3",
+      "sha256": "0q342nvcds969r0vvak962kvkzv5ydi0zcaa1vcqs7wld5nsdml3",
       "depends": []
     },
     "gawdis": {
@@ -69261,8 +69687,8 @@
     },
     "gchartsmap": {
       "name": "gchartsmap",
-      "version": "0.1.3",
-      "sha256": "1dkpc5hqdhzygj4rbl8s0i0sbj2081j0by76x96iy86f8saj2xj5",
+      "version": "1.0.1",
+      "sha256": "1m7x32sd8zp34dx8ypmkyfvp5cc466zlhzsl1rvj7wg2fzj5f235",
       "depends": ["httr", "jsonlite", "sf", "tigris"]
     },
     "gcite": {
@@ -69303,8 +69729,8 @@
     },
     "gcplyr": {
       "name": "gcplyr",
-      "version": "1.11.0",
-      "sha256": "1vxslc0n6dimalxqiw3qzpva4aqjkarnp88k81zrmr8j1qgwhf7v",
+      "version": "1.12.0",
+      "sha256": "1rpjj7mpfrd75f39nw7m3j5fsd9wksqd713mp3is50v7bg3fl5ag",
       "depends": ["dplyr", "rlang", "tidyr"]
     },
     "gcxgclab": {
@@ -69327,8 +69753,8 @@
     },
     "gdalraster": {
       "name": "gdalraster",
-      "version": "2.0.0",
-      "sha256": "023j30k63hmkmnynq8ip8h6hphzs292l67adxh5ai53zmj72ydby",
+      "version": "2.1.0",
+      "sha256": "1wkf7fgi2vg40ysmgmakhg9gj9zwdlspl036qggn6hg4217f4ljs",
       "depends": ["Rcpp", "RcppInt64", "bit64", "nanoarrow", "wk", "xml2"]
     },
     "gdata": {
@@ -69435,10 +69861,16 @@
     },
     "geeCRT": {
       "name": "geeCRT",
-      "version": "1.1.3",
-      "sha256": "08gcifq3gv8b6j7mdgf2y2s9gdcza96681wkzmq7skcj9430m7dm",
+      "version": "1.1.4",
+      "sha256": "1p5s9zsaadkcg4pcchr5shzg9hllxs6f58bp43y6xmhg769pi3yi",
       "depends": ["MASS", "mvtnorm", "rootSolve"]
     },
+    "geeLite": {
+      "name": "geeLite",
+      "version": "1.0.2",
+      "sha256": "06jcvvvzk2m4pzxsnsf658qaqmdaqavpvfnlzj07yh7b77iqgxrm",
+      "depends": ["RSQLite", "cli", "crayon", "data_table", "dplyr", "geojsonio", "googledrive", "h3jsr", "jsonlite", "knitr", "lubridate", "magrittr", "progress", "purrr", "reshape2", "reticulate", "rgee", "rnaturalearth", "rnaturalearthdata", "rstudioapi", "sf", "stringr", "tidyr", "tidyrgee"]
+    },
     "geeM": {
       "name": "geeM",
       "version": "0.10.1",
@@ -69453,8 +69885,8 @@
     },
     "geeasy": {
       "name": "geeasy",
-      "version": "0.1.2",
-      "sha256": "0hfxryqn5dxpyl0s16ibbg1n8w19wl5ldxa8g437akb760pmsmvl",
+      "version": "0.1.3",
+      "sha256": "18hb3smwcazgns1kjl44xrikbxy5j1cda19wpgdj4z7s8k8mxj15",
       "depends": ["MESS", "Matrix", "geeM", "geepack", "ggplot2", "lme4"]
     },
     "geecure": {
@@ -69475,6 +69907,12 @@
       "sha256": "0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w",
       "depends": ["MASS", "gee", "matrixcalc", "nlme"]
     },
+    "geess": {
+      "name": "geess",
+      "version": "0.1.2",
+      "sha256": "1ph0sic885ajmlcmniw1c01d1di3gzkfaxafnb2npw0h8km61h1l",
+      "depends": ["MASS"]
+    },
     "geessbin": {
       "name": "geessbin",
       "version": "1.0.0",
@@ -69517,11 +69955,17 @@
       "sha256": "10ygdfz9f5xhahlqb2divwvaljhiz8jhsd12wvq0qalx0v1h5j0p",
       "depends": []
     },
+    "gemR": {
+      "name": "gemR",
+      "version": "1.2.1",
+      "sha256": "03v9dw5lvxcap68liw4ypj0mlqgnhz0hza6bv0ap7yx78drc8q7w",
+      "depends": ["HDANOVA", "ggplot2", "glmnet", "gridExtra", "lme4", "mixlm", "neuralnet", "pls", "plsVarSel", "pracma", "scales"]
+    },
     "gemini_R": {
       "name": "gemini.R",
-      "version": "0.13.1",
-      "sha256": "1ryb8hmdn36p33anlbxsgh4lqkwyg9qlyg97i5y5lmz81kbmfw6h",
-      "depends": ["base64enc", "cli", "httr2", "jsonlite", "rstudioapi"]
+      "version": "0.16.0",
+      "sha256": "0s84yfq89qwnimaazi49nlh9dplf3746njfwnzy30sg8zac8aw5q",
+      "depends": ["base64enc", "cli", "httr2", "jsonlite", "knitr", "rstudioapi"]
     },
     "gemma2": {
       "name": "gemma2",
@@ -69537,8 +69981,8 @@
     },
     "gemtc": {
       "name": "gemtc",
-      "version": "1.0-2",
-      "sha256": "01sas647d3s5adkqg96z0hhr9pig275fz896ghnp313p5k3fz90l",
+      "version": "1.1-0",
+      "sha256": "0fr7k9hkvdad61namfand4p83j2bcxzlcyzpz8l06lqnijhvd9ii",
       "depends": ["Rglpk", "coda", "forcats", "igraph", "meta", "plyr", "rjags", "truncnorm"]
     },
     "gen2stage": {
@@ -69631,6 +70075,12 @@
       "sha256": "19n3d6ps0wswq1bxgfqifq26svqf8q696im14wfglrl731mr0qbm",
       "depends": ["dplyr", "httr", "jsonlite", "magrittr", "purrr", "tibble"]
     },
+    "genderapi": {
+      "name": "genderapi",
+      "version": "1.0.3",
+      "sha256": "1hp7cycvml0p4jkmz6rjcn3l09q2dqn85n6dl6jlg904f07ypkxx",
+      "depends": ["httr", "jsonlite"]
+    },
     "genderstat": {
       "name": "genderstat",
       "version": "0.1.5",
@@ -69669,8 +70119,8 @@
     },
     "geneSLOPE": {
       "name": "geneSLOPE",
-      "version": "0.38.2",
-      "sha256": "08fbrssj03ak6xqm9fmb9v6ir7229qds891088wznvg58k81yslv",
+      "version": "0.38.3",
+      "sha256": "0qrij0jmd9p0chf5vs4clp6098d93w8slj46d43c2g0gc1d3p6vp",
       "depends": ["SLOPE", "bigmemory", "ggplot2"]
     },
     "genekitr": {
@@ -69789,9 +70239,9 @@
     },
     "genieclust": {
       "name": "genieclust",
-      "version": "1.1.6",
-      "sha256": "131nax76dsg3b6700qwgq3gpin4pl152rjsfqgh41m89ffchk0m4",
-      "depends": ["Rcpp"]
+      "version": "1.2.0",
+      "sha256": "1kk5zcq4mw9dqzdvgw1wfc234xawjydr8awbn41iscxa6sisnvmj",
+      "depends": ["Rcpp", "quitefastmst"]
     },
     "genio": {
       "name": "genio",
@@ -69901,6 +70351,12 @@
       "sha256": "0r1n5icxs313aipl63hdbvki37h2hv1r8ii7m8pyf9h36jxk4lfg",
       "depends": []
     },
+    "gentransmuted": {
+      "name": "gentransmuted",
+      "version": "1.0",
+      "sha256": "17y36jdwvkddxk0jwpj56zvlj8pk6rxfmci62cagghp4gqfnxsz8",
+      "depends": ["VGAM", "pracma"]
+    },
     "geoAr": {
       "name": "geoAr",
       "version": "1.0.0",
@@ -69981,8 +70437,8 @@
     },
     "geocodebr": {
       "name": "geocodebr",
-      "version": "0.2.0",
-      "sha256": "0ysijs6v8shr3zqdpmd5hi1fynn7l4bd8h65hpmn03r4mf144w31",
+      "version": "0.2.1",
+      "sha256": "0dxwgfzxgjfm7hhznpbqp0iiljakxg5v7y7q2imryn5lisjbngm3",
       "depends": ["DBI", "Rcpp", "arrow", "checkmate", "cli", "data_table", "dplyr", "duckdb", "enderecobr", "fs", "glue", "httr2", "nanoarrow", "purrr", "rlang", "sf", "sfheaders"]
     },
     "geocomplexity": {
@@ -70047,9 +70503,9 @@
     },
     "geofacet": {
       "name": "geofacet",
-      "version": "0.2.1",
-      "sha256": "1bj201afh7df3smgmllglmgs7bkkc1k1arvjr7kwn1cnn67b3mzj",
-      "depends": ["geogrid", "ggplot2", "ggrepel", "gridExtra", "gtable", "imguR", "rlang", "rnaturalearth", "sp"]
+      "version": "0.2.4",
+      "sha256": "1szibyknny2zz9m9ihf0i9s01lmyxqr6nzz310q9cd9amn85kh0f",
+      "depends": ["geogrid", "ggplot2", "ggrepel", "gridExtra", "gtable", "httr2", "rlang", "rnaturalearth", "sp"]
     },
     "geofi": {
       "name": "geofi",
@@ -70173,9 +70629,9 @@
     },
     "geomtextpath": {
       "name": "geomtextpath",
-      "version": "0.1.5",
-      "sha256": "1paq6xv6mmljzgwk25sb8dsdag4m52lpnn5x1r55zfss5x3s1bz0",
-      "depends": ["ggplot2", "rlang", "scales", "systemfonts", "textshaping"]
+      "version": "0.2.0",
+      "sha256": "1h7kp93vmfnwrg4qj7sfi2ki3iv0sb66wq2qx1qpvhd5g1w1jp06",
+      "depends": ["ggplot2", "rlang", "scales", "systemfonts", "textshaping", "vctrs"]
     },
     "geomultistar": {
       "name": "geomultistar",
@@ -70197,8 +70653,8 @@
     },
     "geonetwork": {
       "name": "geonetwork",
-      "version": "0.5.0",
-      "sha256": "0yg6pp2ya62qws6jdjxmhqjh5gdn4cfm6zbljazc35xf7d97jjnx",
+      "version": "0.6.0",
+      "sha256": "13i7wl66snvfkxg0grdbcw7ybgzwxhv19lmpf6lsy9xim937wbbv",
       "depends": ["geosphere", "igraph", "sf"]
     },
     "geonode4R": {
@@ -70273,10 +70729,22 @@
       "sha256": "01cwlrbqi216a19h9721i0vj7vakrybybqkicbg9pwyv6c2hy8cq",
       "depends": ["Rcpp", "sp"]
     },
+    "geospt": {
+      "name": "geospt",
+      "version": "1.0-6",
+      "sha256": "1x10yqhi64wssl5z91j7i0cgmabwynf797sjmnnh24p2b4zhm3w0",
+      "depends": ["MASS", "TeachingDemos", "fields", "genalg", "gsl", "gstat", "minqa", "plyr", "sgeostat", "sp"]
+    },
+    "geosptdb": {
+      "name": "geosptdb",
+      "version": "1.0-2",
+      "sha256": "0g12z3imw2x6xph0qi39kk3jr1drddjs82lf5hgsyb4v5ypb809x",
+      "depends": ["FD", "MASS", "StatMatch", "fields", "geospt", "gsl", "minqa", "sp"]
+    },
     "geostan": {
       "name": "geostan",
-      "version": "0.8.1",
-      "sha256": "0z1zqyd762pzxqxd0923n7r2jdshrlvwjk38zpbdyayw305a71pg",
+      "version": "0.8.2",
+      "sha256": "0nqns6cxyis23l7xqar2i4ly7j6s8yx3jxwsprdb9sc2yh4a2jl4",
       "depends": ["BH", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "gridExtra", "rstan", "rstantools", "sf", "signs", "spData", "spdep", "truncnorm"]
     },
     "geostats": {
@@ -70359,8 +70827,8 @@
     },
     "gerefer": {
       "name": "gerefer",
-      "version": "0.1.1",
-      "sha256": "10l4s44amz0pc9nmwh3j7bbysyn2rwfa6a95w3xpf6qdgjkxgfnw",
+      "version": "0.1.2",
+      "sha256": "1vnxwclsyclimrhdlvrdh05hp2h8fxz3k4xjayq9wasjz9vylw90",
       "depends": ["bibliorefer"]
     },
     "germinationmetrics": {
@@ -70435,6 +70903,12 @@
       "sha256": "0n8ja0i1v0cd2piqyx4hfc4qw18d535j3ffpz164c3r8cmppnqzd",
       "depends": ["cli", "httr"]
     },
+    "getRad": {
+      "name": "getRad",
+      "version": "0.2.0",
+      "sha256": "0hjclh3iy9mvakzivfps0drrg6i95p5s04ayjpx6cpvzvjqn75nw",
+      "depends": ["bioRad", "cachem", "cli", "dplyr", "glue", "httr2", "lubridate", "purrr", "rlang", "tibble", "vroom", "xml2"]
+    },
     "getable": {
       "name": "getable",
       "version": "1.0.3",
@@ -70551,8 +71025,8 @@
     },
     "gfunctions": {
       "name": "gfunctions",
-      "version": "1.0",
-      "sha256": "1rjrw4g0daw219spcz0pmy78m68gidk7vdbxd31wqgn1p7xwa4jb",
+      "version": "1.1",
+      "sha256": "1ignj6jshm1gw4w85fspj0wbk3si9bllk8il9xys6wmsdxc2iq44",
       "depends": ["sandwich", "zoo"]
     },
     "gg_gap": {
@@ -70623,8 +71097,8 @@
     },
     "ggPMX": {
       "name": "ggPMX",
-      "version": "1.2.11",
-      "sha256": "04381iaa52ljpkbi4sy5xgyiv0vznd2k7vnwvsdyk4qkggxxyqw9",
+      "version": "1.3.0",
+      "sha256": "1kmvf4j3wnyadwns3jj00nsn22n4w7hdgwhk3qciw7hbhl9ck2qs",
       "depends": ["GGally", "R6", "assertthat", "checkmate", "data_table", "dplyr", "ggforce", "ggplot2", "gtable", "knitr", "magrittr", "purrr", "readr", "rlang", "rmarkdown", "scales", "stringr", "tidyr", "yaml", "zoo"]
     },
     "ggQQunif": {
@@ -70633,12 +71107,6 @@
       "sha256": "0vrxmqxy946mwdq0mb2m1ch41r0chrw7hcn18dr3mp10bv7pl7wj",
       "depends": ["dplyr", "ggplot2", "scales"]
     },
-    "ggRandomForests": {
-      "name": "ggRandomForests",
-      "version": "2.2.1",
-      "sha256": "05w1rs0mg2nj5j1rd32s1mcj294p4zm24p2d87535rmslqmya9c7",
-      "depends": ["ggplot2", "randomForest", "randomForestSRC", "survival", "tidyr"]
-    },
     "ggResidpanel": {
       "name": "ggResidpanel",
       "version": "0.3.0",
@@ -70671,8 +71139,8 @@
     },
     "ggVennDiagram": {
       "name": "ggVennDiagram",
-      "version": "1.5.2",
-      "sha256": "0hzjbpd3f3zn169s5nvnv7b4wlrwdn3r0pk0vgkdnhchl75g0qni",
+      "version": "1.5.4",
+      "sha256": "0xwyz4n2xdg682vzrwij4g4idiiqv6fqbs31j7wys238n4g8jvz9",
       "depends": ["aplot", "dplyr", "forcats", "ggplot2", "tibble", "venn", "yulab_utils"]
     },
     "ggalign": {
@@ -70705,12 +71173,6 @@
       "sha256": "0wax853pi3ghqv5alfkx9rgfb3sm3sqh3miklwvn22bh1s44q14h",
       "depends": ["dplyr", "ggplot2", "lazyeval", "rlang", "tidyr", "tidyselect"]
     },
-    "ggalt": {
-      "name": "ggalt",
-      "version": "0.4.0",
-      "sha256": "0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc",
-      "depends": ["KernSmooth", "MASS", "RColorBrewer", "ash", "dplyr", "extrafont", "ggplot2", "gtable", "maps", "plotly", "proj4", "scales", "tibble"]
-    },
     "ggamma": {
       "name": "ggamma",
       "version": "1.0.1",
@@ -70719,14 +71181,14 @@
     },
     "gganimate": {
       "name": "gganimate",
-      "version": "1.0.9",
-      "sha256": "016nky797h4093qrpynq5rr1p7h4chpv1hyngpcs2csr1064rjmz",
+      "version": "1.0.10",
+      "sha256": "1fca3q22k5d44452f1y1sasm83z2kpdyzblds7zqrgwlwi76rv4x",
       "depends": ["cli", "ggplot2", "glue", "lifecycle", "progress", "rlang", "scales", "stringi", "transformr", "tweenr", "vctrs"]
     },
     "ggarchery": {
       "name": "ggarchery",
-      "version": "0.4.3",
-      "sha256": "1fgcy26gq0cpk4vhc412yw5wj8j4afs21lp7fcqsdah1xmpnhym2",
+      "version": "0.4.4",
+      "sha256": "0fhwj8l975m94hsyclxvb36c8k8xczcmc1925q516fih08a1pi4r",
       "depends": ["dplyr", "ggplot2", "glue", "magrittr", "purrr", "rlang", "tidyr"]
     },
     "ggarrow": {
@@ -70773,8 +71235,8 @@
     },
     "ggbrace": {
       "name": "ggbrace",
-      "version": "0.1.1",
-      "sha256": "0p5k9lp0c34ry3mf39w0j9pi8irych9p6lvh6zyk82my18b25yk0",
+      "version": "0.1.2",
+      "sha256": "15cbkny750a865vadwkkbx9drzkakhfm514m6mg5i7isyaji1ri3",
       "depends": ["ggplot2"]
     },
     "ggbrain": {
@@ -70785,8 +71247,8 @@
     },
     "ggbreak": {
       "name": "ggbreak",
-      "version": "0.1.4",
-      "sha256": "0paqjx3jlnnwgy7iaaqlslcmngcdprwf1pxknazcj2v91yal40v8",
+      "version": "0.1.5",
+      "sha256": "1x3gf52ismr1n9fgnp1mr01cj0l0fjrxflc5k8d775x54gxcfy1l",
       "depends": ["aplot", "ggfun", "ggplot2", "ggplotify", "rlang", "yulab_utils"]
     },
     "ggbrick": {
@@ -70819,6 +71281,12 @@
       "sha256": "1c0gdn8skkm82f3qxv9551l36zwqcga9b9sbc48q8hp71ay4ac6b",
       "depends": ["colorspace", "dplyr", "ggplot2", "lifecycle", "magrittr", "patchwork", "rlang"]
     },
+    "ggchord": {
+      "name": "ggchord",
+      "version": "0.2.0",
+      "sha256": "1kxfpy11zlhcs1x91spay0cijyyd5za20wavf7z9bfzxv3yx0m1a",
+      "depends": ["RColorBrewer", "ggnewscale", "ggplot2"]
+    },
     "ggcleveland": {
       "name": "ggcleveland",
       "version": "0.1.0",
@@ -70831,6 +71299,12 @@
       "sha256": "03gjcwsq9dn076rcwgv1i3bmwzyhb41i8q222rlhfrw10id0p2yz",
       "depends": ["ggplot2"]
     },
+    "ggcorrheatmap": {
+      "name": "ggcorrheatmap",
+      "version": "0.1.2",
+      "sha256": "0hhvs3yapy3mz188qfz6dbgff3dx9v2bbmvwvy7n21ys2wdc3pdl",
+      "depends": ["cli", "dendextend", "dplyr", "ggnewscale", "ggplot2", "rlang", "scales"]
+    },
     "ggcorrplot": {
       "name": "ggcorrplot",
       "version": "0.1.4.1",
@@ -70863,8 +71337,8 @@
     },
     "ggdemetra": {
       "name": "ggdemetra",
-      "version": "0.2.8",
-      "sha256": "18i96jkbc0zm9xgn5250v2316kccr5vcxag2gii7lag7bhj6fq51",
+      "version": "0.2.9",
+      "sha256": "0dr2ycwhknjm9cd059cr696fssgd822qh2vgkb9ncahhq8q8qsll",
       "depends": ["RJDemetra", "ggplot2", "ggrepel", "gridExtra"]
     },
     "ggdendro": {
@@ -70879,6 +71353,12 @@
       "sha256": "01ym1af6w39zg6xh5mls8kwl4mg0lpjd94j0hm2xrgl39llpwx6r",
       "depends": ["MASS", "ggplot2", "isoband", "scales", "tibble", "vctrs"]
     },
+    "ggdibbler": {
+      "name": "ggdibbler",
+      "version": "0.1.0",
+      "sha256": "1zpmlldc11i3x48hiksqd298yg0l2xvwq5fs7gmy3mrmpqjmb53f",
+      "depends": ["distributional", "dplyr", "ggplot2", "rlang", "sf"]
+    },
     "ggdist": {
       "name": "ggdist",
       "version": "3.3.3",
@@ -70891,6 +71371,30 @@
       "sha256": "1dmfjc9b5833z0lp9kxw0apzk72czyxhbk2vpvz3l1m88gxnm859",
       "depends": ["Rcpp", "RcppArmadillo", "coda", "data_table", "ggplot2", "matrixStats"]
     },
+    "ggdmcHeaders": {
+      "name": "ggdmcHeaders",
+      "version": "0.2.9.1",
+      "sha256": "0z3542d0d5xcf96x823x70mflrbggz0hiw4p0cxxng3ky67g6f7y",
+      "depends": []
+    },
+    "ggdmcLikelihood": {
+      "name": "ggdmcLikelihood",
+      "version": "0.2.9.0",
+      "sha256": "0nihaxhrj2wbwf1qvsx6kr2vigqigjxl0nzs322ssk9rm53rianw",
+      "depends": ["Rcpp", "RcppArmadillo", "ggdmcHeaders"]
+    },
+    "ggdmcModel": {
+      "name": "ggdmcModel",
+      "version": "0.2.9.0",
+      "sha256": "0d6wi775j7i896wc6a96b7w5w11y3w5zkcnwqyr2f1dfh9bj2rhk",
+      "depends": ["Rcpp", "RcppArmadillo", "ggdmcHeaders"]
+    },
+    "ggdmcPrior": {
+      "name": "ggdmcPrior",
+      "version": "0.2.9.0",
+      "sha256": "1q7q876p4gwcs3i3b4r4ili33krmp4fld4rh5b8l9h2a4f1814vs",
+      "depends": ["Rcpp", "RcppArmadillo", "ggdmcHeaders", "lattice"]
+    },
     "gge": {
       "name": "gge",
       "version": "1.9",
@@ -70899,8 +71403,8 @@
     },
     "ggeasy": {
       "name": "ggeasy",
-      "version": "0.1.5",
-      "sha256": "1inxk15lmdjpfzf46xdn6yrgz6h45i6rhv2qpcyb2rvf4v6cfm96",
+      "version": "0.1.6",
+      "sha256": "0yflqryikxcq5hmj14n8wiz1cidmxvqkqjvpwrw0c5j5kjc1ckqy",
       "depends": ["ggplot2", "rlang"]
     },
     "ggedit": {
@@ -70935,8 +71439,8 @@
     },
     "ggfields": {
       "name": "ggfields",
-      "version": "0.0.6",
-      "sha256": "1b23hxi9g5fcmrw63pmksayk9j7xsi0j23qkfkchlcx258yrf7la",
+      "version": "0.0.7",
+      "sha256": "15sk0xbsljfnwchzam9azhrq502sjjbwjmk29gxm19qf9kkxq4ab",
       "depends": ["dplyr", "ggplot2", "rlang", "scales", "sf"]
     },
     "ggfigdone": {
@@ -70977,20 +71481,20 @@
     },
     "ggforce": {
       "name": "ggforce",
-      "version": "0.4.2",
-      "sha256": "1a2i1rl27yqh8kxjpphwcv05p19l2aw07q9gxl4x8iv8xpkb0if1",
-      "depends": ["MASS", "Rcpp", "RcppEigen", "cli", "ggplot2", "gtable", "lifecycle", "polyclip", "rlang", "scales", "systemfonts", "tidyselect", "tweenr", "vctrs", "withr"]
+      "version": "0.5.0",
+      "sha256": "0lsxzfygwkldvchxp75dj8aw9mn4wxv6ci3s0jh799sdvhrymcs1",
+      "depends": ["MASS", "cli", "cpp11", "ggplot2", "gtable", "lifecycle", "polyclip", "rlang", "scales", "systemfonts", "tidyselect", "tweenr", "vctrs", "withr"]
     },
     "ggformula": {
       "name": "ggformula",
-      "version": "0.12.0",
-      "sha256": "0vbpivyxms46px3wqkbl1wq199mqdxq94gsiplv4i7lz0lzghsfm",
+      "version": "0.12.2",
+      "sha256": "1190vklvfbqh5dm5m1c05b9qz7a22hz5nhblfrm7g6pnv53z2pcj",
       "depends": ["ggplot2", "ggridges", "labelled", "mosaicCore", "rlang", "scales", "stringr", "tibble"]
     },
     "ggfortify": {
       "name": "ggfortify",
-      "version": "0.4.17",
-      "sha256": "1ygbvk3b99mabwqc9hh5lz3adj1i05ym7i8b6kbgid8cgrbaaxag",
+      "version": "0.4.19",
+      "sha256": "1gbacgrxd7dj62i2k2xv005k4q23iljcrczp5a9yxrg4bgw8qmic",
       "depends": ["dplyr", "ggplot2", "gridExtra", "scales", "stringr", "tibble", "tidyr"]
     },
     "ggfoundry": {
@@ -71001,14 +71505,14 @@
     },
     "ggfun": {
       "name": "ggfun",
-      "version": "0.1.8",
-      "sha256": "0p1znrc6k7lh1i3q65v8i48z5d48fag8pz213a8297cdiik9wgq8",
-      "depends": ["cli", "dplyr", "ggplot2", "rlang", "yulab_utils"]
+      "version": "0.2.0",
+      "sha256": "048p3922sd3fhssf042xnx30jrs2nkn1kn7xq4m88w972p9ngln5",
+      "depends": ["cli", "dplyr", "ggplot2", "rlang", "scales", "yulab_utils"]
     },
     "ggfx": {
       "name": "ggfx",
-      "version": "1.0.1",
-      "sha256": "1lys5lzlilzvd6dm7rkxv7nvnp80fajl5yzhpwcbb5az5832ik27",
+      "version": "1.0.2",
+      "sha256": "0qa8ck7r1vmgha108z4vydfvj2p0rlkjhm2d8f41sipwa4qlg4s2",
       "depends": ["ggplot2", "gtable", "magick", "ragg", "rlang"]
     },
     "gggap": {
@@ -71017,6 +71521,12 @@
       "sha256": "1iidxm7qcrg0isw2q27cmjbfb3pkfj5jcg1nj8lgy6xmydw3vrw3",
       "depends": ["cowplot", "ggplot2"]
     },
+    "gggda": {
+      "name": "gggda",
+      "version": "0.1.1",
+      "sha256": "0yy78jhiz6kk0992x5dnmknl2nfy1sb27bgj4dhr9gn8w79b235h",
+      "depends": ["ddalpha", "dplyr", "ggplot2", "labeling", "magrittr", "rlang", "scales", "tidyr"]
+    },
     "gggenes": {
       "name": "gggenes",
       "version": "0.5.1",
@@ -71031,8 +71541,8 @@
     },
     "ggghost": {
       "name": "ggghost",
-      "version": "0.2.2",
-      "sha256": "08ik4zbkglff6byqdym2ipg3ar2p273p014n3lf4dkvrys7asvk6",
+      "version": "0.2.3",
+      "sha256": "0r14b75d8xc4srn300zfjnwdcqck34c1hkyms7rlmwbchyfl477z",
       "depends": ["animation", "ggplot2"]
     },
     "gggibbous": {
@@ -71103,8 +71613,8 @@
     },
     "gghourglass": {
       "name": "gghourglass",
-      "version": "0.0.2",
-      "sha256": "1ymn39yll2hrdpf051xkbi9qs07xiv8gqp909cm8r6fsy0v68kmx",
+      "version": "0.0.3",
+      "sha256": "00fi8vnzkqhd2kb5vixggaxmgyjgr4dp27zfmxnbjjyndg8zcs5g",
       "depends": ["dplyr", "ggplot2", "lubridate", "rlang", "suncalc", "tidyr"]
     },
     "ggimage": {
@@ -71181,8 +71691,8 @@
     },
     "gglogger": {
       "name": "gglogger",
-      "version": "0.1.5",
-      "sha256": "1hhpv5vvpb635hb27v64h92x7ga9m4yvrldd61qa0jzjhnmp1623",
+      "version": "0.1.6",
+      "sha256": "1h9qblqa64cacp8arylwh8g1da6gl9dhk2y7dd42s7m71z9j0vzz",
       "depends": ["cli", "ggplot2"]
     },
     "gglorenz": {
@@ -71193,10 +71703,16 @@
     },
     "ggm": {
       "name": "ggm",
-      "version": "2.5.1",
-      "sha256": "1bp00m93mrx33gpd36qnrxx60y17aimlh6bd36cqyh6vpf0vpfvg",
+      "version": "2.5.2",
+      "sha256": "0nv5m7f2kbjr0abfpcb18g1291ghphpzx0ixf7fpk23ia6xqwvyy",
       "depends": ["BiocManager", "graph", "igraph"]
     },
+    "ggmRSCU": {
+      "name": "ggmRSCU",
+      "version": "0.1.0",
+      "sha256": "12j8z8qlp4r3ksa11f313qfk8ndpikvrf488i3pdclm57vzxvqmg",
+      "depends": ["data_table", "dplyr", "ggplot2", "patchwork", "purrr", "rlang", "tidyr"]
+    },
     "ggmap": {
       "name": "ggmap",
       "version": "4.0.1",
@@ -71229,9 +71745,9 @@
     },
     "ggmice": {
       "name": "ggmice",
-      "version": "0.1.0",
-      "sha256": "14fb8889fqx3r0rky7rfnagfrrlhspj74zlp7wz7wj232y3j923h",
-      "depends": ["cli", "dplyr", "ggplot2", "magrittr", "mice", "purrr", "rlang", "stringr", "tidyr", "tidyselect"]
+      "version": "0.1.1",
+      "sha256": "1rc4cjcsaqznizw2g420sy3lv35p715hw7kyi5wkv5whnr395nrw",
+      "depends": ["cli", "dplyr", "ggplot2", "magrittr", "mice", "purrr", "rlang", "scales", "stringr", "tidyr", "tidyselect"]
     },
     "ggmix": {
       "name": "ggmix",
@@ -71277,8 +71793,8 @@
     },
     "ggnewscale": {
       "name": "ggnewscale",
-      "version": "0.5.1",
-      "sha256": "14kf0app8gfylky1vd6gvqdihxm1k4lfgpawx04z1ckb82gifl6d",
+      "version": "0.5.2",
+      "sha256": "1j2qcf8hlwlc462g1giciv8srdpqw613xfz91xya007ac107arfp",
       "depends": ["ggplot2"]
     },
     "ggnormalviolin": {
@@ -71307,8 +71823,8 @@
     },
     "ggpackets": {
       "name": "ggpackets",
-      "version": "0.2.1",
-      "sha256": "1fdyr0m5rf1wy2pydvk12g7lw338iw026rxz98mv8kryrs32q7kh",
+      "version": "0.2.2",
+      "sha256": "1a94lz5k3fhsvcz42nz8pabvd1ndhm6rbq3pcm5vpjq8x7q7bwq2",
       "depends": ["ggplot2", "rlang"]
     },
     "ggpage": {
@@ -71325,8 +71841,8 @@
     },
     "ggparty": {
       "name": "ggparty",
-      "version": "1.0.0",
-      "sha256": "0s6hr5p930kl3pj6ajwgwqz6yikc3l9hhzy1yn0nqc0r8pp2jyqf",
+      "version": "1.0.0.1",
+      "sha256": "0x2wi0lbqgf3fkbp281lglvrq6i3g9824b308a16kiq70qgb7lf0",
       "depends": ["checkmate", "ggplot2", "gtable", "partykit", "rlang", "survival"]
     },
     "ggpath": {
@@ -71355,9 +71871,9 @@
     },
     "ggpedigree": {
       "name": "ggpedigree",
-      "version": "0.7.0",
-      "sha256": "0a4kq6imbi321rh4x2rgnkbad4ckllr939f2lpd5a4119rqf25xs",
-      "depends": ["BGmisc", "dplyr", "ggplot2", "ggrepel", "kinship2", "paletteer", "plotly", "reshape2", "rlang", "scales", "stringr", "tidyr"]
+      "version": "0.8.0",
+      "sha256": "0yafjc19r5491kbnv6h4jhlcx19m7sx4w9vv9hm8z5bx1f71491j",
+      "depends": ["BGmisc", "dplyr", "ggplot2", "kinship2", "plotly", "reshape2", "rlang", "scales", "stringr", "tidyr"]
     },
     "ggperiodic": {
       "name": "ggperiodic",
@@ -71367,8 +71883,8 @@
     },
     "ggpicrust2": {
       "name": "ggpicrust2",
-      "version": "2.1.2",
-      "sha256": "15l3hryw3jz9d7pxvwnsl2h0xms63kyw5fcw2bw8b22w956xj2v9",
+      "version": "2.3.2",
+      "sha256": "1v6spda0af967xxjc8kp8v8al0lmnacgcdsa7pfp61vmh5j7nkpr",
       "depends": ["aplot", "dplyr", "ggh4x", "ggplot2", "ggplotify", "ggprism", "ggraph", "magrittr", "patchwork", "progress", "readr", "tibble", "tidygraph", "tidyr"]
     },
     "ggpie": {
@@ -71383,6 +71899,12 @@
       "sha256": "15q78hl9fngjx1xyccwzny78rg169zv10fvzl6an9silcgwrw2ak",
       "depends": ["dplyr", "farver", "forcats", "ggplot2", "purrr", "rlang", "scales", "stringr", "tidyr"]
     },
+    "ggplayfair": {
+      "name": "ggplayfair",
+      "version": "0.1.1",
+      "sha256": "02n2p49cyl3rfbsc5ys9w6kwxc8p7b6ibvn7rwqi81zbf5q6pacx",
+      "depends": ["ggplot2"]
+    },
     "ggplot_multistats": {
       "name": "ggplot.multistats",
       "version": "1.0.1",
@@ -71397,8 +71919,8 @@
     },
     "ggplot2_utils": {
       "name": "ggplot2.utils",
-      "version": "0.3.2",
-      "sha256": "07svk16j9mc3d1fgkd5zpilnr82f7r40y9nachkp32s2bsg1a29g",
+      "version": "0.3.3",
+      "sha256": "0av11pb3l292nqqqlgdx9f65cv2b6nk2a76r89wwggr30hk0l2ix",
       "depends": ["EnvStats", "checkmate", "ggplot2", "ggpp", "ggstats", "survival"]
     },
     "ggplot2movies": {
@@ -71427,9 +71949,9 @@
     },
     "ggpmisc": {
       "name": "ggpmisc",
-      "version": "0.6.1",
-      "sha256": "1ipi8dsxql94gk9h020shbvy26arpwjqlmkplyy746vmhkc03ma8",
-      "depends": ["MASS", "confintr", "dplyr", "generics", "ggplot2", "ggpp", "lmodel2", "lubridate", "multcomp", "multcompView", "plyr", "polynom", "quantreg", "rlang", "scales", "splus2R", "tibble"]
+      "version": "0.6.2",
+      "sha256": "10mc1k72j1hnnjldigf1cb3wg3d0f21kw25zy0i3ddfdq0fxylg0",
+      "depends": ["MASS", "caTools", "confintr", "dplyr", "generics", "ggplot2", "ggpp", "lmodel2", "lubridate", "multcomp", "multcompView", "nlme", "plyr", "polynom", "quantreg", "rlang", "scales", "splus2R", "tibble"]
     },
     "ggpointdensity": {
       "name": "ggpointdensity",
@@ -71457,14 +71979,14 @@
     },
     "ggpolypath": {
       "name": "ggpolypath",
-      "version": "0.3.0",
-      "sha256": "0ipn1lhmpcdxim3235kxsw6vkj7cf7smqdm534jfa75ski4q9xpy",
+      "version": "0.4.0",
+      "sha256": "1kx3f2nyyy97y790krspsggwrardhscv23s5px0i2snjm3qcv2r7",
       "depends": ["ggplot2"]
     },
     "ggpp": {
       "name": "ggpp",
-      "version": "0.5.8-1",
-      "sha256": "1jk3x679rvkj3if14cai99w5sk0nj07rhppwwd7i7a1daal0grh5",
+      "version": "0.5.9",
+      "sha256": "1im9xyb5knakb8lgnnfzqlzw8ca9hynj1yh44fhlqxifp06p0g0d",
       "depends": ["MASS", "dplyr", "ggplot2", "glue", "gridExtra", "lubridate", "magrittr", "polynom", "rlang", "scales", "stringr", "tibble", "vctrs", "xts", "zoo"]
     },
     "ggprism": {
@@ -71475,8 +71997,8 @@
     },
     "ggpubr": {
       "name": "ggpubr",
-      "version": "0.6.0",
-      "sha256": "0x7p3lbh0xv5qk0shsrj1fjx382zak7mj8l3z1zd348r2pccavif",
+      "version": "0.6.1",
+      "sha256": "17w3nf3zisgriha4x9gh81hblyjgkbia7pa7br8zrryaqknna6n3",
       "depends": ["cowplot", "dplyr", "ggplot2", "ggrepel", "ggsci", "ggsignif", "glue", "gridExtra", "magrittr", "polynom", "purrr", "rlang", "rstatix", "scales", "tibble", "tidyr"]
     },
     "ggpval": {
@@ -71637,8 +72159,8 @@
     },
     "ggseqplot": {
       "name": "ggseqplot",
-      "version": "0.8.6",
-      "sha256": "0rbazw5bra9hxnv1a2pzrfmc4aapj5qlhavp641rb79rawrlx3vg",
+      "version": "0.8.7",
+      "sha256": "08r6734jmyip820dwpvl56pmk06lj88jmvfn17v6d75r69aws9ic",
       "depends": ["Rdpack", "TraMineR", "cli", "colorspace", "dplyr", "forcats", "ggh4x", "ggplot2", "ggrepel", "ggtext", "glue", "haven", "patchwork", "purrr", "rlang", "tidyr", "usethis"]
     },
     "ggshadow": {
@@ -71659,12 +72181,6 @@
       "sha256": "02mjailzyqkdnzky60dgampw2sq6mnn7s66fk0lhy32s8apm280i",
       "depends": ["ggplot2"]
     },
-    "ggsmc": {
-      "name": "ggsmc",
-      "version": "0.1.2.0",
-      "sha256": "1wgb5ml1bgfi6rddbvm3rfk6di9imyx17iflg8h42hhbvbvm93iy",
-      "depends": ["gganimate", "ggplot2", "poorman"]
-    },
     "ggsoccer": {
       "name": "ggsoccer",
       "version": "0.2.0",
@@ -71697,8 +72213,8 @@
     },
     "ggspectra": {
       "name": "ggspectra",
-      "version": "0.3.15",
-      "sha256": "0yxax1xbc4h94fgm4wi9c4n63kgwanbgvjah7s3d42pyghj8754n",
+      "version": "0.3.16",
+      "sha256": "0w9msigbd9439882nr8yyr05ia9ghfckfpdym4n4s1p54n3bbcm7",
       "depends": ["ggplot2", "ggrepel", "lubridate", "photobiology", "photobiologyWavebands", "rlang", "scales", "tibble"]
     },
     "ggstackplot": {
@@ -71721,8 +72237,8 @@
     },
     "ggstats": {
       "name": "ggstats",
-      "version": "0.9.0",
-      "sha256": "110c9xcrc7rvn4lw8z0lnza3zi327biqbkg90idpjj7gzmwkf3v1",
+      "version": "0.10.0",
+      "sha256": "05yp7z787mfb6cpzvfhxzy4fb935r0c1d43ya3885mzpjzf3dky6",
       "depends": ["cli", "dplyr", "forcats", "ggplot2", "lifecycle", "patchwork", "purrr", "rlang", "scales", "stringr", "tidyr"]
     },
     "ggstatsplot": {
@@ -71745,9 +72261,9 @@
     },
     "ggsurveillance": {
       "name": "ggsurveillance",
-      "version": "0.4.0",
-      "sha256": "1pwph4bhnz3ch68fzrn510044swnyp7prx0m5g9ap87i754ag53x",
-      "depends": ["ISOweek", "cli", "dplyr", "forcats", "ggplot2", "glue", "lubridate", "rlang", "scales", "stringr", "tidyr", "tidyselect"]
+      "version": "0.5.1",
+      "sha256": "0j5cdw0znpqfkp3hci3w8pzyz6yqa403c8c6cx8b5wpxks1kakn9",
+      "depends": ["ISOweek", "cli", "dplyr", "forcats", "ggplot2", "glue", "legendry", "lubridate", "rlang", "scales", "stringr", "tidyr", "tidyselect"]
     },
     "ggsurvey": {
       "name": "ggsurvey",
@@ -71763,14 +72279,14 @@
     },
     "ggswissmaps": {
       "name": "ggswissmaps",
-      "version": "0.1.1",
-      "sha256": "0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4",
+      "version": "0.1.2",
+      "sha256": "1fwhfbk1sll6yhhmz7h8hbgd7yfnfgps9anwybh3j9haf17qs2d5",
       "depends": ["ggplot2"]
     },
     "ggtangle": {
       "name": "ggtangle",
-      "version": "0.0.6",
-      "sha256": "1q24565y2icr8cs55cni2iyh22mqlk12nll19md96g4r3hbdq0al",
+      "version": "0.0.7",
+      "sha256": "0qkv9dl3z6pzfdc0l08323xh04y7vjzv9rwcxih4zfn12x66qz67",
       "depends": ["ggfun", "ggplot2", "ggrepel", "igraph", "rlang", "yulab_utils"]
     },
     "ggtaxplot": {
@@ -71833,6 +72349,12 @@
       "sha256": "1zzdamzxkwimzjhrjf5nijj0r94l03nabny5gjv49kqlncjicr7r",
       "depends": ["ggplot2", "rlang"]
     },
+    "ggtranslate": {
+      "name": "ggtranslate",
+      "version": "0.1.0",
+      "sha256": "0k7074j4pyffg8k7iyinxv5zqbrwnqxqhvhbsdjlgr00n4yirsvx",
+      "depends": ["ggplot2", "rlang"]
+    },
     "ggtreebar": {
       "name": "ggtreebar",
       "version": "0.1.0",
@@ -71877,8 +72399,8 @@
     },
     "ggview": {
       "name": "ggview",
-      "version": "0.2.1",
-      "sha256": "0jdpr4bmw9kzq41h42r1i4ravfvkv65n2xkmqn6gm23bhdwyngmj",
+      "version": "0.2.2",
+      "sha256": "0dbfqffrzrkmhbg6gk4f89jzgna9nzzbknzpkf1xggz4ijbzdhfc",
       "depends": ["ggplot2", "rstudioapi"]
     },
     "ggvis": {
@@ -72007,6 +72529,12 @@
       "sha256": "0qb8w455a8wxc5ljmydq4xag2kbj5yk06an0pd9hd4k48wssg8la",
       "depends": ["BH", "Rcpp", "RcppArmadillo"]
     },
+    "gilmour": {
+      "name": "gilmour",
+      "version": "0.1.1",
+      "sha256": "1irc0wxqhvxp4qradlr7qj4vaxhap6znqs3rf3vi4r89q69fnb39",
+      "depends": []
+    },
     "gim": {
       "name": "gim",
       "version": "0.33.1",
@@ -72021,8 +72549,8 @@
     },
     "gimme": {
       "name": "gimme",
-      "version": "0.8.2",
-      "sha256": "081f1gbg771110xmm07dsbs3r1xczzdl9k5r7g87ya5yfdk1k6g3",
+      "version": "0.9.1",
+      "sha256": "09gj4zqls9025dr8zxdwlxqmm4cpp5m6jrx53sp4pg69p1sq5rd8",
       "depends": ["MASS", "MIIVsem", "data_tree", "igraph", "imputeTS", "lavaan", "nloptr", "qgraph", "tseries"]
     },
     "gimms": {
@@ -72181,6 +72709,12 @@
       "sha256": "1bg9jw4ra76j132lkr0p5m2xlr952fdij1hn6f1v7g687l55m0k5",
       "depends": ["ROCR", "Rcpp", "kernlab", "seqinr"]
     },
+    "gkwreg": {
+      "name": "gkwreg",
+      "version": "1.0.10",
+      "sha256": "0b0xk1zim63cjcm40wfkf2k3qd22q67irndsq9hwswxqwjq38azb",
+      "depends": ["Formula", "Rcpp", "RcppArmadillo", "RcppEigen", "TMB", "fmsb", "ggplot2", "ggpubr", "gridExtra", "magrittr", "numDeriv", "patchwork", "rappdirs", "reshape2", "scales", "tidyr"]
+    },
     "glam": {
       "name": "glam",
       "version": "1.0.2",
@@ -72267,8 +72801,8 @@
     },
     "gllvm": {
       "name": "gllvm",
-      "version": "2.0.2",
-      "sha256": "1la0wpds8s65739lbqhp4cx198yq6msliy447nri4jf4bqcsjl8z",
+      "version": "2.0.5",
+      "sha256": "0ashacvv6n76z7dmcbsmp8sn41mhm7az7g05dx82wapcbwvi8wfp",
       "depends": ["MASS", "Matrix", "RcppEigen", "TMB", "alabama", "fishMod", "mgcv", "nloptr"]
     },
     "glm_deploy": {
@@ -72387,8 +72921,8 @@
     },
     "glmmrBase": {
       "name": "glmmrBase",
-      "version": "1.0.0",
-      "sha256": "1qyv2idi60ql428wqvvwcpp89bsdfpj5xq8r276xzbivaa2wf26w",
+      "version": "1.0.2",
+      "sha256": "0svfmmhw5xg6hbky0l1r2q3r2nk05hd90psj6nm6fmbhd7ljwv0a",
       "depends": ["BH", "Matrix", "R6", "Rcpp", "RcppEigen", "RcppParallel", "SparseChol", "StanHeaders", "rstan", "rstantools"]
     },
     "glmmrOptim": {
@@ -72399,14 +72933,14 @@
     },
     "glmmsel": {
       "name": "glmmsel",
-      "version": "1.0.2",
-      "sha256": "0n8g8l3hvjdll2r19s0awl5l6biacm86kx47v9gcgdc598nrby0c",
+      "version": "1.0.3",
+      "sha256": "0vp8lnjc7nz22lz7a12n65h87g5l1w45vmx0mi7wcf6kq9a5wq54",
       "depends": ["Rcpp", "RcppArmadillo", "ggplot2"]
     },
     "glmnet": {
       "name": "glmnet",
-      "version": "4.1-9",
-      "sha256": "1z9d8s8r4iivjy9ph1dk9czvlj5hadwvk9zj6yz6682szwknfx8m",
+      "version": "4.1-10",
+      "sha256": "171fgxkm4p4ki274mjddapsxkwfp1v99p8brx23pxcjh922bb949",
       "depends": ["Matrix", "Rcpp", "RcppEigen", "foreach", "shape", "survival"]
     },
     "glmnetSE": {
@@ -72507,9 +73041,9 @@
     },
     "gloBFPr": {
       "name": "gloBFPr",
-      "version": "0.1.0",
-      "sha256": "1fj90ynmy5byqx94nbwqivw27hd74a7lyhsvkz7kzm4y6193hd2r",
-      "depends": ["dplyr", "httr2", "rlang", "sf", "terra"]
+      "version": "0.1.3",
+      "sha256": "0sjcck2rgcp0mgjdczfaqv48lpxsbbgv6v569xjcj1gy0xnrp6yd",
+      "depends": ["cli", "dplyr", "httr2", "lwgeom", "rlang", "sf", "terra"]
     },
     "globalKinhom": {
       "name": "globalKinhom",
@@ -72561,16 +73095,10 @@
     },
     "glorenz": {
       "name": "glorenz",
-      "version": "0.1.0",
-      "sha256": "0hkcgrggrx7ykwblsgzm66x8agirym209s3s6piqk8c3lnzw8kz4",
+      "version": "0.1.1",
+      "sha256": "02ks991a2bv9w576155s650m0g7z1dlpc5b8flry0kzqxawklghd",
       "depends": ["LorenzRegression", "dplyr", "magrittr", "rlang"]
     },
-    "glossa": {
-      "name": "glossa",
-      "version": "1.1.0",
-      "sha256": "07sfbzqs5spvmf9z7cjydp64cc8rc54mgxa877rh1cxnbxlai4y0",
-      "depends": ["DT", "GeoThinneR", "blockCV", "bs4Dash", "dbarts", "dplyr", "ggplot2", "htmltools", "jsonlite", "leaflet", "markdown", "mcp", "pROC", "sf", "shiny", "shinyWidgets", "sparkline", "svglite", "terra", "tidyterra", "waiter", "zip"]
-    },
     "glossary": {
       "name": "glossary",
       "version": "1.0.0",
@@ -72591,10 +73119,16 @@
     },
     "glpkAPI": {
       "name": "glpkAPI",
-      "version": "1.3.4",
-      "sha256": "1cr40jksm27h0j1j0q1ngcf4cbrhrjz48m6z3c3jns8h17h8g8qh",
+      "version": "1.3.4.1",
+      "sha256": "012v3vzhfv0cjh5hfz58x2zpcaph680prhj40jkxphss7xfqhi00",
       "depends": []
     },
+    "glsm": {
+      "name": "glsm",
+      "version": "0.0.0.6",
+      "sha256": "1gr6bbqdyp9bxq6jsh30yqwzvkxlzvji0yz546k6lvm101cj5p8f",
+      "depends": ["VGAM", "dplyr", "ggplot2", "plyr"]
+    },
     "glue": {
       "name": "glue",
       "version": "1.8.0",
@@ -72643,12 +73177,6 @@
       "sha256": "19kf409yhq13689akqz88dj0fq02falbh0j0kkvh0l0vymx4hj7y",
       "depends": ["RColorBrewer", "boot", "compositions", "foreach", "gstat", "sp"]
     },
-    "gma": {
-      "name": "gma",
-      "version": "1.0",
-      "sha256": "08hxbs9z4vq5zjis0lgdcvlysaj1k7i0icdk3wsyqf3wd9znsibi",
-      "depends": ["MASS", "car", "nlme"]
-    },
     "gmailr": {
       "name": "gmailr",
       "version": "2.0.0",
@@ -72747,8 +73275,8 @@
     },
     "gmvarkit": {
       "name": "gmvarkit",
-      "version": "2.1.4",
-      "sha256": "0kpsfdqn3sislc20dv8rfia5zlvhzl245h8paf04xqmlfvv2i75j",
+      "version": "2.2.0",
+      "sha256": "09pf4zfj41dw79g7xfd6fkhfn4r64ah9n2k14kj9crw2byl3n4l1",
       "depends": ["Brobdingnag", "gsl", "mvnfast", "pbapply"]
     },
     "gmvjoint": {
@@ -72853,12 +73381,6 @@
       "sha256": "0azkbx3x6bb919b6miv9pn1swr2icxaysx5irdjvbxjd5ymlkz5y",
       "depends": ["Hmisc", "fields", "mgcv", "vegan"]
     },
-    "gofCopula": {
-      "name": "gofCopula",
-      "version": "0.4-2",
-      "sha256": "14blfca1liihx3rjskjxv3wa0sczsj2di2vimb05j5g44yc8hwi3",
-      "depends": ["MASS", "R_utils", "SparseGrid", "VineCopula", "copula", "crayon", "doSNOW", "foreach", "numDeriv", "progress", "yarrr"]
-    },
     "gofIG": {
       "name": "gofIG",
       "version": "1.0",
@@ -72897,9 +73419,9 @@
     },
     "gofigR": {
       "name": "gofigR",
-      "version": "0.3.1",
-      "sha256": "05ncp9a5ybxq2vadq9ihzfahiw6llbl2lrk3wmv2n5f5r853r4z8",
-      "depends": ["base64enc", "cowplot", "getPass", "ggplotify", "httr", "jsonlite", "knitr", "magick", "qrcode", "readr", "rstudioapi", "rsvg", "scriptName"]
+      "version": "1.1.2",
+      "sha256": "01qdnbvsc7204ivn0aj61fcmz6ldrrzbjk410rk74yb36g71i7qi",
+      "depends": ["base64enc", "cowplot", "digest", "getPass", "ggplotify", "httr", "jsonlite", "knitr", "magick", "qrcode", "readr", "rstudioapi", "rsvg", "scriptName", "shiny", "shinyjs"]
     },
     "gofreg": {
       "name": "gofreg",
@@ -73011,8 +73533,8 @@
     },
     "googleLanguageR": {
       "name": "googleLanguageR",
-      "version": "0.3.0",
-      "sha256": "0lm50g3gshp18nvygi6is2rayzhcx0rw2rvb4lvm0jlx5m96xgxb",
+      "version": "0.3.0.1",
+      "sha256": "17gmyf0kj922zxqpnafvvvnpb5d2bzf8j0xlyv1q2rmwz8f8l0ii",
       "depends": ["assertthat", "base64enc", "googleAuthR", "jsonlite", "magrittr", "purrr", "tibble"]
     },
     "googlePolylines": {
@@ -73173,8 +73695,8 @@
     },
     "gpboost": {
       "name": "gpboost",
-      "version": "1.5.8",
-      "sha256": "0x01gfb4rr3f9kspyv8wjyd8wadwhh8yil6vqbjqvbz39rf21mad",
+      "version": "1.6.1",
+      "sha256": "000q23yzby62qgb9wyc2c7595fz13fragmxs8rkf0r1syrv8wynn",
       "depends": ["Matrix", "R6", "RJSONIO", "data_table"]
     },
     "gpcp": {
@@ -73347,8 +73869,8 @@
     },
     "grafzahl": {
       "name": "grafzahl",
-      "version": "0.0.11",
-      "sha256": "0zx6fqwklyi3sc1p59nb71mgrfnp7bqw5axmddj3706cawlrqrb8",
+      "version": "0.0.12",
+      "sha256": "07znymwp55cg5kxy6gzxkb4l2ysljwihjajfg0mq4kqb4jxl2r1r",
       "depends": ["jsonlite", "lime", "quanteda", "reticulate"]
     },
     "grainscape": {
@@ -73365,8 +73887,8 @@
     },
     "grand": {
       "name": "grand",
-      "version": "0.9.0",
-      "sha256": "08lgwpkbamb7p5a59q0dp1n7np9kmmvccvg97bl7937ishx50mg5",
+      "version": "0.9.1",
+      "sha256": "0lrwzrpd15241q6wb78q3bx12zxfmqgxn2i9sa1bbaflakdkml8r",
       "depends": ["igraph"]
     },
     "grandR": {
@@ -73429,12 +73951,6 @@
       "sha256": "0m6v796hwxdv7nan3157x7b8xpph605ihj6gnmlh3v1p95dygsy7",
       "depends": ["MASS", "boot", "dplyr", "ggplot2", "ggrepel", "gridExtra", "gtools", "madness", "reshape2", "survival"]
     },
-    "graphTweets": {
-      "name": "graphTweets",
-      "version": "0.5.3",
-      "sha256": "0jf52lclwvqgybdj6fknzx046bh6jgwxvqs4c5g1ii8f2lsz9y07",
-      "depends": ["combinat", "dplyr", "igraph", "magrittr", "purrr", "rlang", "tidyr", "zeallot"]
-    },
     "graphclust": {
       "name": "graphclust",
       "version": "1.3",
@@ -73557,8 +74073,8 @@
     },
     "grattan": {
       "name": "grattan",
-      "version": "2024.1.1",
-      "sha256": "0cxgj20c7gk55p22rmy1al44if4pk90yf9zify2jz9h7pviwgpjx",
+      "version": "2025.5.0",
+      "sha256": "1wdg4cakg6qxhc7dgnny37nq0dbisk4w9pgms6l9hx7am7h1w3a8",
       "depends": ["assertthat", "checkmate", "data_table", "fastmatch", "forecast", "fy", "grattanInflators", "hutils", "hutilscpp", "ineq", "magrittr"]
     },
     "grattanInflators": {
@@ -73701,14 +74217,14 @@
     },
     "grex": {
       "name": "grex",
-      "version": "1.9",
-      "sha256": "0s6nan76rrmh3yhgvzb7pqdrzx2w9px8ay4v9yiib4bamy9wmhpb",
+      "version": "1.9.1",
+      "sha256": "0hcnjg1him16zvwj3dh1jfwyff61fpjqrz3svq1lvsyfgfd7ayhx",
       "depends": []
     },
     "greybox": {
       "name": "greybox",
-      "version": "2.0.4",
-      "sha256": "0d5wwmxj2w6r5217wlgs5sa03l2yibar339p0z9qv3aa81a7piyy",
+      "version": "2.0.5",
+      "sha256": "1krw8d595cr13w6n6bcs88ar1iibmka56avr252a0gi9zcaaxn2p",
       "depends": ["Rcpp", "generics", "nloptr", "pracma", "statmod", "texreg", "xtable", "zoo"]
     },
     "grf": {
@@ -73755,8 +74271,8 @@
     },
     "gridGraphviz": {
       "name": "gridGraphviz",
-      "version": "0.3-1",
-      "sha256": "0yzy7w4bk3rn9yjqy06gzkcs0dla3n49z3v1z0mjikg8cd97d5ni",
+      "version": "0.3-2",
+      "sha256": "1klgw04g3fx27xk34dhsh5qkpyyfmji65awjn8zymfw5nf3v2lpd",
       "depends": ["Rgraphviz", "graph"]
     },
     "gridOT": {
@@ -73767,8 +74283,8 @@
     },
     "gridSVG": {
       "name": "gridSVG",
-      "version": "1.7-5",
-      "sha256": "1p8qnx9q96bni39x44l40rgcdi9r440zbipdfvkbs2paysx6mkr5",
+      "version": "1.7-6",
+      "sha256": "16ya4nzhia7skglrp65i0jdbjvi77y2w1xrjngicklcv6kwr6icp",
       "depends": ["XML", "jsonlite"]
     },
     "gridpattern": {
@@ -73821,8 +74337,8 @@
     },
     "grobblR": {
       "name": "grobblR",
-      "version": "0.2.1",
-      "sha256": "1l1msh900kmbbszn1f9vfdix4a6180lvs3gfidp9pgkvi2gv2g01",
+      "version": "0.2.2",
+      "sha256": "1r4mi9z9lch3c6sfwm5cvqxj201fbzwvlh8q2b8h73i95mk33mcx",
       "depends": ["RCurl", "dplyr", "ggplot2", "glue", "gridExtra", "magrittr", "png", "purrr", "stringr", "tibble"]
     },
     "groc": {
@@ -73869,8 +74385,8 @@
     },
     "groupcompare": {
       "name": "groupcompare",
-      "version": "1.0.0",
-      "sha256": "0a80fgjvd1dfbp79g221v6mbkdswif4qwk9v0vqfhp0k7lqj4pn8",
+      "version": "1.0.1",
+      "sha256": "0qggsrdvp57a5c79hsz1m1g4za0h87kkj4qmsvyxxsgpif4bqvyv",
       "depends": ["boot", "vioplot"]
     },
     "groupdata2": {
@@ -73881,8 +74397,8 @@
     },
     "groupedHyperframe": {
       "name": "groupedHyperframe",
-      "version": "0.2.3",
-      "sha256": "0ic5fr5akjpj17jixcxqb2wcbhgsk7x0rf676wlnc8n6s36cxx5v",
+      "version": "0.2.4",
+      "sha256": "0f61n2lhhdcnbmav6z3amjcgg9b14x9pr8qcyrn9z215d7h354qy",
       "depends": ["SpatialPack", "cli", "matrixStats", "pracma", "spatstat_explore", "spatstat_geom"]
     },
     "groupedHyperframe_random": {
@@ -73897,6 +74413,12 @@
       "sha256": "16qyvd8k7wdg0iafs5gxljx464nd79kwdl7g7g6hvhrhr621mgyq",
       "depends": ["BH", "Rcpp", "RcppEigen", "doParallel", "foreach", "qvalue"]
     },
+    "grouper": {
+      "name": "grouper",
+      "version": "0.3.1",
+      "sha256": "03nl7xr8ma29sjx6f3ll3lsmqq86k5vcv6r390gym7sw4y0pqnc6",
+      "depends": ["cluster", "dplyr", "magrittr", "ompr", "rlang", "yaml"]
+    },
     "groupr": {
       "name": "groupr",
       "version": "0.1.2",
@@ -73941,8 +74463,8 @@
     },
     "growthPheno": {
       "name": "growthPheno",
-      "version": "3.1.12",
-      "sha256": "0fy8r7289qwm2snvdlbjhfb705p9vxll0kr9x5vm0dw7zx4h281v",
+      "version": "3.1.13",
+      "sha256": "1k4kjd7nhihs3h0ajjr4jj44z4ap8kvrr3avw3ajlg8jvl090wcv",
       "depends": ["GGally", "Hmisc", "JOPS", "RColorBrewer", "dae", "dplyr", "ggplot2", "readxl", "reshape", "stringi"]
     },
     "growthcleanr": {
@@ -73971,8 +74493,8 @@
     },
     "growthrates": {
       "name": "growthrates",
-      "version": "0.8.4",
-      "sha256": "04q8psz4fiibjj0pl6n7wkq83qn1aizzixww8gqdxzzsq6kay81q",
+      "version": "0.8.5",
+      "sha256": "05ynz1kg7fmpan8fim2l61501nmjp7c32ca3kx3ypr7alrj7a5zp",
       "depends": ["FME", "deSolve", "lattice"]
     },
     "grpCox": {
@@ -73983,8 +74505,8 @@
     },
     "grpSLOPE": {
       "name": "grpSLOPE",
-      "version": "0.3.3",
-      "sha256": "05417f0pnp21svi30vcbkkw16zyg1kxynfigh5w2jdjmd12cb899",
+      "version": "0.3.4",
+      "sha256": "0az52gxchdywn13h2hjr6zlcgwsky01dlnl6rv0kwrwlz5v8c0q8",
       "depends": ["Rcpp"]
     },
     "grplasso": {
@@ -74037,14 +74559,14 @@
     },
     "gsDesign": {
       "name": "gsDesign",
-      "version": "3.6.8",
-      "sha256": "18vxc76yxz9yygn8dlcfg7mmnl1l1xp9wmnz1pjzljgp434f2avn",
+      "version": "3.6.9",
+      "sha256": "1pvdl8qyqx0476csbk5l7s7qglqdxshighpgpnjc46jnv66rhzmp",
       "depends": ["dplyr", "ggplot2", "gt", "magrittr", "r2rtf", "rlang", "tibble", "tidyr", "xtable"]
     },
     "gsDesign2": {
       "name": "gsDesign2",
-      "version": "1.1.4",
-      "sha256": "1fv3xvfdax5z4gkj4rbzf3dx3h1jragj4bjrkx0b1wmwdkz15dv2",
+      "version": "1.1.5",
+      "sha256": "05ancgf4l19ffvm6fvdagi5a0vlc1z3n4f2kba7c3nslqvg6g14n",
       "depends": ["Rcpp", "corpcor", "data_table", "dplyr", "gsDesign", "gt", "mvtnorm", "npsurvSS", "r2rtf", "survival", "tibble", "tidyr"]
     },
     "gsEasy": {
@@ -74067,8 +74589,8 @@
     },
     "gsaot": {
       "name": "gsaot",
-      "version": "0.2.0",
-      "sha256": "17v0y0z11x50rbbazahcrkbaj01isw5rq9xga6mpdrkqi8s1rp69",
+      "version": "1.1.0",
+      "sha256": "0cpwinvl1kn30p270wwzk553r9xxdaim6p3bzwsxi8dynv5l1f1b",
       "depends": ["Rcpp", "RcppEigen", "Rdpack", "boot", "ggplot2", "patchwork", "transport"]
     },
     "gsarima": {
@@ -74107,6 +74629,12 @@
       "sha256": "0i62zngk2n4jx9bk378xakzr1fjb2f8p2x4larx38jg511is2lq1",
       "depends": ["dplyr", "ggplot2", "glue", "magrittr", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr"]
     },
+    "gseries": {
+      "name": "gseries",
+      "version": "3.0.2",
+      "sha256": "0y0w44cjg7hc56gbd9s2zxhnf2bx7qwm6g0ygr2222g9fm4cnfid",
+      "depends": ["ggplot2", "ggtext", "gridExtra", "lifecycle", "osqp", "rlang", "xmpdf"]
+    },
     "gsheet": {
       "name": "gsheet",
       "version": "0.4.6",
@@ -74181,8 +74709,8 @@
     },
     "gstat": {
       "name": "gstat",
-      "version": "2.1-3",
-      "sha256": "1lia3vxkv8s9q5svmlg1grhz45ab0ppln69rwcn55vzm6307gp7f",
+      "version": "2.1-4",
+      "sha256": "0c66313dm2h5drq0zv7jzvcgmwjalvpvhm2gj1m9jkhg91nbvz7s",
       "depends": ["FNN", "lattice", "sf", "sftime", "sp", "spacetime", "stars", "zoo"]
     },
     "gstsm": {
@@ -74277,8 +74805,8 @@
     },
     "gtfsrouter": {
       "name": "gtfsrouter",
-      "version": "0.1.3",
-      "sha256": "02vgx456z8d3yf5lklf7cddypkpxqxyv745xlax7y2fkanbinh3v",
+      "version": "0.1.4",
+      "sha256": "0iy60w0vi3cqn1gydhz0aawg784rayg94j2qvcana5w31bxhxzlh",
       "depends": ["Rcpp", "cli", "data_table", "fs", "geodist"]
     },
     "gtfstools": {
@@ -74317,10 +74845,16 @@
       "sha256": "05bfcc77bg2ndl83l0lv7rs4slxcflv9h2pfij8a3j1k9r9lwp2x",
       "depends": ["anytime", "curl", "ggplot2", "jsonlite"]
     },
+    "gtrendshealth": {
+      "name": "gtrendshealth",
+      "version": "1.0.0",
+      "sha256": "1b9i0gcbk3ifrjfq162d69ja0ia5v2q0ipdkqglp11bjh9cans4m",
+      "depends": ["httr", "jsonlite"]
+    },
     "gtsummary": {
       "name": "gtsummary",
-      "version": "2.2.0",
-      "sha256": "11l5mw9h069j841gsdf7q1r4k0icnwniwmmfqhwlx1qyp7pvvx2f",
+      "version": "2.3.0",
+      "sha256": "1nkx78n7xf8hcd9c3adbdplj39mv819bd83n8ii6mq0j9vp5bpls",
       "depends": ["cards", "cli", "dplyr", "glue", "gt", "lifecycle", "rlang", "tidyr", "vctrs"]
     },
     "guaguas": {
@@ -74581,12 +75115,6 @@
       "sha256": "1c00zpswnbfd44j7fb6pib6fwri2qs8kasd3fxifmaj0i6zpq8jf",
       "depends": ["wavethresh"]
     },
-    "habCluster": {
-      "name": "habCluster",
-      "version": "1.0.5",
-      "sha256": "1cjmhq8krkv4g1vy70kc3j667djzmq38xlqn568f437f6jaglvkp",
-      "depends": ["Rcpp", "igraph", "raster", "sf", "stars"]
-    },
     "hablar": {
       "name": "hablar",
       "version": "0.3.2",
@@ -74607,8 +75135,8 @@
     },
     "hagis": {
       "name": "hagis",
-      "version": "3.1.12",
-      "sha256": "18mcd8vm2dy50wfwfxbih841z1l8yml6fvb6y5qqq7a04h09k590",
+      "version": "4.0.0",
+      "sha256": "1hvzkwffk23d8zsbni7pqncq1kgckcnlax6dc7fplv46hsag80lf",
       "depends": ["data_table", "ggplot2", "pander"]
     },
     "hahmmr": {
@@ -74619,8 +75147,8 @@
     },
     "hakaiApi": {
       "name": "hakaiApi",
-      "version": "1.0.3",
-      "sha256": "124favc84xv2kzdpvr5b8x3qrbq26swh7xkjgznq6y5hclxa43kv",
+      "version": "1.0.5",
+      "sha256": "0kb4ghh8ph2sjwb93dsf9y066dhalxbn6v63mdsf3gc2rrki5sjh",
       "depends": ["R6", "dplyr", "httr2", "readr", "tibble"]
     },
     "hal9001": {
@@ -74689,18 +75217,18 @@
       "sha256": "0n9n4rjcxzgsxg4lkf4qhlwj9773jwdw34z73lmc0lxyb9x7sj8j",
       "depends": ["dplyr", "handwriter", "lifecycle", "magrittr", "purrr", "ranger", "reshape2", "stringr", "tidyr", "tidyselect"]
     },
-    "handyFunctions": {
-      "name": "handyFunctions",
-      "version": "0.1.0",
-      "sha256": "0y476acqdm73y19k8s9c9vy8xryyjg16pay3vikslwccv7kgsigz",
-      "depends": ["ggplot2", "rlang", "stringr"]
-    },
     "handyplots": {
       "name": "handyplots",
       "version": "1.1.3",
       "sha256": "0pcl0iichdw2lkv8y00mv6n6c0rvrnsk75ka5lwm2g7b64pphsvk",
       "depends": []
     },
+    "hann": {
+      "name": "hann",
+      "version": "1.0",
+      "sha256": "1dxs7ks1mrcd98bhar78an0659isdnpj7x4xi1y40zffndivkpkz",
+      "depends": []
+    },
     "hans": {
       "name": "hans",
       "version": "0.1",
@@ -74739,9 +75267,9 @@
     },
     "happign": {
       "name": "happign",
-      "version": "0.3.3",
-      "sha256": "1yrv0j2xdwwadi1q1slwr9fbb72d4dfp59j064s2anyzl02q9xrm",
-      "depends": ["archive", "dplyr", "httr2", "jsonlite", "sf", "terra", "xml2", "yyjsonr"]
+      "version": "0.3.5",
+      "sha256": "13qd3b83174h3mixp1sr9flyggs0w2j5ffpvcg9fyrkjca7fai83",
+      "depends": ["dplyr", "httr2", "jsonlite", "sf", "terra", "xml2", "yyjsonr"]
     },
     "happytime": {
       "name": "happytime",
@@ -74751,8 +75279,8 @@
     },
     "harbinger": {
       "name": "harbinger",
-      "version": "1.2.707",
-      "sha256": "0h11gp4nb8qw21nqp5hjasi3s78k5nnhcsk8n0xc6phaljd05649",
+      "version": "1.2.727",
+      "sha256": "1ca6d7dj05139ylcv8b3dhlw4dkyf6rg0zqvvpylhhak4zimfh62",
       "depends": ["RcppHungarian", "changepoint", "daltoolbox", "dplyr", "dtwclust", "forecast", "ggplot2", "hht", "rugarch", "stringr", "strucchange", "tsmp", "tspredit", "wavelets", "zoo"]
     },
     "hardhat": {
@@ -74823,8 +75351,8 @@
     },
     "hatchR": {
       "name": "hatchR",
-      "version": "0.3.2",
-      "sha256": "1v47kd4hz5mg28bmxxdg3p82skhiv6pds688x7mq1ss76wl0ixyw",
+      "version": "1.0.1",
+      "sha256": "1vnl7yn1i1ki4rps1fys0hr0d5872b8bzh6wh0mghc1r4r2kvh0y",
       "depends": ["dplyr", "ggplot2", "ggtext", "lifecycle", "lubridate", "rlang", "tibble"]
     },
     "haven": {
@@ -74887,6 +75415,12 @@
       "sha256": "0fg782gxivkkwhqvxf09j1q20f2dqm7bd1y9bp99fy7mg88zp0gn",
       "depends": ["Matrix"]
     },
+    "hbsaems": {
+      "name": "hbsaems",
+      "version": "0.1.1",
+      "sha256": "1fbqfid8ivamrxjgzvv2kps7k9i4pwd7rwryz28vqj7y0k8lhfls",
+      "depends": ["DT", "XICOR", "bayesplot", "bridgesampling", "brms", "coda", "energy", "ggplot2", "mice", "minerva", "posterior", "priorsense", "readxl", "shiny", "shinyWidgets", "shinydashboard"]
+    },
     "hcandersenr": {
       "name": "hcandersenr",
       "version": "0.2.0",
@@ -74901,8 +75435,8 @@
     },
     "hce": {
       "name": "hce",
-      "version": "0.7.2",
-      "sha256": "1vhmk96xm802inbg0h3xzyzf5kd8pbwr8ih15hfda7d2vnzj0859",
+      "version": "0.8.0",
+      "sha256": "1azk98qrnhkhysqaraqvpq46l19gsvrmxmxv91wmz1gxx4jkh6bx",
       "depends": []
     },
     "hchinamap": {
@@ -74955,8 +75489,8 @@
     },
     "hdar": {
       "name": "hdar",
-      "version": "1.0.6",
-      "sha256": "1w242ivi6ffdmi9j4vzczmaaymy35a0jcs4n19rh382823ic03jw",
+      "version": "1.0.7",
+      "sha256": "0b53xhxrghcg7nwzy6pzvmh18g187lm4nfby2bys2fdrsgfz9lj5",
       "depends": ["R6", "htmltools", "httr2", "jsonlite", "magrittr", "progress", "scales", "stringr"]
     },
     "hdbayes": {
@@ -74997,9 +75531,9 @@
     },
     "hdcuremodels": {
       "name": "hdcuremodels",
-      "version": "0.0.1",
-      "sha256": "09ih9jlz7l4vcgqhpy9h5c8j19c5fdfn4hhka85as762lxxbkwrl",
-      "depends": ["doParallel", "flexsurv", "flexsurvcure", "foreach", "ggplot2", "ggpubr", "glmnet", "knockoff", "mvnfast", "plyr", "survival"]
+      "version": "0.0.5",
+      "sha256": "12l7g2rk2ij6hyyn73jvwi703g3czsi6lkzhmha189d4jr009drs",
+      "depends": ["doParallel", "flexsurv", "flexsurvcure", "foreach", "ggplot2", "ggpubr", "glmnet", "knockoff", "mvnfast", "plyr", "survival", "withr"]
     },
     "hdd": {
       "name": "hdd",
@@ -75129,8 +75663,8 @@
     },
     "healthatlas": {
       "name": "healthatlas",
-      "version": "0.2.1",
-      "sha256": "10qz7ibba3qjvp1bf75m4313ymxgvfvinnsplzmdakp5j76hg153",
+      "version": "0.2.2",
+      "sha256": "1pqljkhrsxdbzmjrwygb7dj6h9h3jfff9jzj015kb4120hz7jiys",
       "depends": ["chk", "curl", "httr2", "sf", "tibble"]
     },
     "healthcare_antitrust": {
@@ -75207,8 +75741,8 @@
     },
     "heatindex": {
       "name": "heatindex",
-      "version": "0.0.1",
-      "sha256": "0xncg2kkvxghyhpbwbpldwz5f91xjcqsidk16wj5nbvx44hrl89c",
+      "version": "0.0.2",
+      "sha256": "0issq20b0csj7ajp08mbh0m2nkg6qilc607bbsqbmrdp94qis3j3",
       "depends": ["Rcpp"]
     },
     "heatmap3": {
@@ -75231,8 +75765,8 @@
     },
     "heatmaply": {
       "name": "heatmaply",
-      "version": "1.5.0",
-      "sha256": "1crdm7avxv3zx59byz2fqbcw95728crwf9cckjb9gal1065xv95c",
+      "version": "1.6.0",
+      "sha256": "1dbgnv24ssa07qs91b8h157hx93lb62sq6i15fpq8rr8ik6f7wl6",
       "depends": ["RColorBrewer", "assertthat", "colorspace", "dendextend", "egg", "ggplot2", "htmlwidgets", "magrittr", "plotly", "reshape2", "scales", "seriation", "viridis", "webshot"]
     },
     "heatwaveR": {
@@ -75273,9 +75807,9 @@
     },
     "heemod": {
       "name": "heemod",
-      "version": "1.0.2",
-      "sha256": "0zcj2g578m6pxv7iz3xlypka64qm2j906w10n69wplpn9h9cp3s4",
-      "depends": ["dplyr", "ggplot2", "glue", "lifecycle", "memoise", "mvnfast", "purrr", "rlang", "tibble", "vctrs"]
+      "version": "1.1.0",
+      "sha256": "17x0k1yriqljj6x919xhmc4pf34m2f0dwa00mn3ivb755gsxiz8k",
+      "depends": ["dplyr", "ggplot2", "glue", "lifecycle", "mvnfast", "purrr", "rlang", "tibble", "vctrs"]
     },
     "heimdall": {
       "name": "heimdall",
@@ -75567,9 +76101,9 @@
     },
     "hgnc": {
       "name": "hgnc",
-      "version": "0.1.4",
-      "sha256": "180092gpcs3j94904ry42crs62knzrv926bp25dapigqqfj7jjqi",
-      "depends": ["dplyr", "hms", "httr", "jsonlite", "lubridate", "magrittr", "purrr", "readr", "rlang", "rvest", "stringr", "tibble"]
+      "version": "0.3.0",
+      "sha256": "1kh64ydplvga9vliwl85y9sp9xdv5lhfh1j8l7m06afkrjiw756f",
+      "depends": ["cli", "dplyr", "httr2", "memoise", "prettyunits", "purrr", "readr", "stringr", "tibble"]
     },
     "hgutils": {
       "name": "hgutils",
@@ -75621,10 +76155,16 @@
     },
     "hicp": {
       "name": "hicp",
-      "version": "0.6.1",
-      "sha256": "1zb18sn2az5gval4az4n9g9jipmikd08jj7vpmlqmzdsascp75wg",
+      "version": "1.0.0",
+      "sha256": "04q6j4y69x0pk4bkwisvsy91l9mdhi84wgppp8jg4vrpwzg6qa9q",
       "depends": ["data_table", "restatapi"]
     },
+    "hicream": {
+      "name": "hicream",
+      "version": "0.0.1",
+      "sha256": "1q76xk98bjcghrxkf6yv79qby5yn4rzgydmia072pnadlrlnaph6",
+      "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "InteractionSet", "Matrix", "S4Vectors", "SummarizedExperiment", "adjclust", "auk", "csaw", "diffHic", "dplyr", "edgeR", "limma", "reshape2", "reticulate", "rlang", "viridis"]
+    },
     "hiddenf": {
       "name": "hiddenf",
       "version": "2.0",
@@ -75735,9 +76275,9 @@
     },
     "highlightr": {
       "name": "highlightr",
-      "version": "1.0.2",
-      "sha256": "1n4jb1snl9riqkfhzn84rq1czyg5r5v41m3fk78wc0fi2wacxwil",
-      "depends": ["dplyr", "fuzzyjoin", "ggplot2", "magrittr", "purrr", "quanteda", "quanteda_textstats", "stringi", "stringr", "tibble", "tidyr", "tm"]
+      "version": "1.1.2",
+      "sha256": "0185wz2lxryk6q0fv6s6j7sp38l6vy253vgdw2dwyvnfcpamkhbx",
+      "depends": ["dplyr", "ggplot2", "magrittr", "purrr", "quanteda", "quanteda_textstats", "stringi", "stringr", "tibble", "tidyr", "tm", "zoomerjoin"]
     },
     "highmean": {
       "name": "highmean",
@@ -75759,8 +76299,8 @@
     },
     "highs": {
       "name": "highs",
-      "version": "1.10.0-2",
-      "sha256": "1mm8v3cy9c3k0b609m40gasvkkl105qrsrslxxbrskfpgph4g2pq",
+      "version": "1.10.0-3",
+      "sha256": "0hhp71w5qsagzfyp4y83bslkjvvqqlvgrbz6npigw7nx15z8a4w8",
       "depends": ["Rcpp", "checkmate"]
     },
     "hightR": {
@@ -75813,8 +76353,8 @@
     },
     "himach": {
       "name": "himach",
-      "version": "0.3.2",
-      "sha256": "0j262rkhfadd6n1ypzwv8pj543zinayihnvfsb5i8i6fx2lag88q",
+      "version": "1.0.0",
+      "sha256": "04xp50yrs2gcybip9m2ns0dq7gkij370x8hq70cx3c228rcmjlxm",
       "depends": ["cppRouting", "data_table", "dplyr", "geosphere", "ggplot2", "lwgeom", "purrr", "s2", "sf", "tidyr"]
     },
     "hindex": {
@@ -75849,8 +76389,8 @@
     },
     "hipread": {
       "name": "hipread",
-      "version": "0.2.4",
-      "sha256": "06z20kxswamhs8abjk6ff7xqhisaixw9ygz1831n38nl489vjpip",
+      "version": "0.2.5",
+      "sha256": "0p4xhafk9ahvvklwy7lfsqzi3lxyqh3rkbqazdq4ifrmgwqmifiw",
       "depends": ["BH", "R6", "Rcpp", "rlang", "tibble"]
     },
     "hisse": {
@@ -75955,11 +76495,11 @@
       "sha256": "0zalvgnibd1kygryqcah5d008y6a0nxpy61yyiqsriw89r01jyjk",
       "depends": ["MASS", "bayesplot", "mvtnorm"]
     },
-    "hmeasure": {
-      "name": "hmeasure",
-      "version": "1.0-2",
-      "sha256": "0l4nlny532kddiaa1nmgd37971whhwzb54mb1pvbwax7fsg6hmhw",
-      "depends": []
+    "hmde": {
+      "name": "hmde",
+      "version": "1.2.1",
+      "sha256": "0vj381zzcmmmzm8nyin0r7h9nnl0a6vrs35mgns70h5i8l5zmagb",
+      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "ggplot2", "purrr", "rlang", "rstan", "rstantools"]
     },
     "hmer": {
       "name": "hmer",
@@ -75981,9 +76521,9 @@
     },
     "hmmTMB": {
       "name": "hmmTMB",
-      "version": "1.0.2",
-      "sha256": "1vrjkq5vv70wjvg588w2q7sd8qhnp4iz3swx8yc3x8w7zpwkf0hn",
-      "depends": ["CircStats", "MASS", "Matrix", "R6", "RcppEigen", "TMB", "ggplot2", "mgcv", "optimx", "stringr", "tmbstan"]
+      "version": "1.1.0",
+      "sha256": "0zzncmcff3r1s0aqnlihh9ij35rfk5z2wis809xkkhbgj3cgy14j",
+      "depends": ["MASS", "Matrix", "R6", "RcppEigen", "TMB", "ggplot2", "mgcv", "stringr", "tmbstan"]
     },
     "hmmm": {
       "name": "hmmm",
@@ -76071,9 +76611,9 @@
     },
     "holobiont": {
       "name": "holobiont",
-      "version": "0.1.2",
-      "sha256": "1m22x1la59kh7z57s05rsmxf44y2fzk32159wjnfs4wvqdfskzkl",
-      "depends": ["ape", "dplyr", "ggplot2", "phyloseq", "phytools", "tibble"]
+      "version": "0.1.3",
+      "sha256": "0rv1rd0q1kacflq2p517fmkghy4y5c76410ahz4dg560adkb8gwv",
+      "depends": ["ape", "castor", "data_table", "dplyr", "ggplot2", "phyloseq", "phytools", "tibble", "vegan"]
     },
     "holodeck": {
       "name": "holodeck",
@@ -76431,8 +76971,8 @@
     },
     "httk": {
       "name": "httk",
-      "version": "2.6.1",
-      "sha256": "1ll3j8750jabh2h5xz69rd9h300kksq80j1cnk3h27wkw9zsplyf",
+      "version": "2.7.0",
+      "sha256": "0ppdvqy049iw9b5hn0270ljr04srm1l5wm5ji9i7dbxyg9j8zis8",
       "depends": ["Rdpack", "data_table", "deSolve", "dplyr", "ggplot2", "magrittr", "msm", "mvtnorm", "purrr", "survey", "truncnorm"]
     },
     "httpRequest": {
@@ -76473,8 +77013,8 @@
     },
     "httptest2": {
       "name": "httptest2",
-      "version": "1.1.0",
-      "sha256": "0vj6ynxc2xdq4xhl6df8aa3582s7jf5m71hxqxhjsjfqdzm72dv8",
+      "version": "1.2.1",
+      "sha256": "1mjpx70fi643yr7wljn4gpbn4rwdgdxzd8zx0hk3vbcnn8pigjvl",
       "depends": ["digest", "httr2", "jsonlite", "rlang", "testthat"]
     },
     "httpuv": {
@@ -76491,8 +77031,8 @@
     },
     "httr2": {
       "name": "httr2",
-      "version": "1.1.2",
-      "sha256": "17bzggypradnfgrmswjlj5fd0vcvi2nhx28frfy8cr17fj15102r",
+      "version": "1.2.1",
+      "sha256": "07l3zlj45bykia7abc92s4d91z379zvh6iz9pm0hyx07amzw6a17",
       "depends": ["R6", "cli", "curl", "glue", "lifecycle", "magrittr", "openssl", "rappdirs", "rlang", "vctrs", "withr"]
     },
     "hubEnsembles": {
@@ -76611,8 +77151,8 @@
     },
     "hwep": {
       "name": "hwep",
-      "version": "2.0.2",
-      "sha256": "0cvy9s9kwc1jp4klgbjahidpk8gkvfa43vry8i0y77nvfys7x9v9",
+      "version": "2.0.3",
+      "sha256": "1gqjblh7cq5kcqjwjvrzfw159kvbg2qv7w4fpa8kfkx92gvcszqn",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bridgesampling", "doFuture", "doRNG", "foreach", "future", "iterators", "pracma", "rstan", "rstantools", "tensr", "updog"]
     },
     "hwig": {
@@ -76723,6 +77263,12 @@
       "sha256": "0vg9cm2xjayhi1xsr6x8cl1ix5dk7x9p0wn0nhrf31nlvmpwh0c1",
       "depends": ["hydroTSM", "xts", "zoo"]
     },
+    "hydroMOPSO": {
+      "name": "hydroMOPSO",
+      "version": "0.1-14",
+      "sha256": "0wa20i337q495dq0z2rjsdilypl9qkf0pdvky5lbrmix0zk95mxb",
+      "depends": ["hydroTSM", "lhs", "randtoolbox", "zoo"]
+    },
     "hydroTSM": {
       "name": "hydroTSM",
       "version": "0.7-0.1",
@@ -76785,8 +77331,8 @@
     },
     "hyper_gam": {
       "name": "hyper.gam",
-      "version": "0.1.1",
-      "sha256": "0nyg3h7x5dnhhd6i8zbjf7fx95cjwjfnab60w9l4b1y9w47nx5f7",
+      "version": "0.1.2",
+      "sha256": "119ylg2kg2cfbdlya2hknl47py0766929xn8yx5gslll8mq201wz",
       "depends": ["caret", "cli", "groupedHyperframe", "mgcv", "nlme", "plotly"]
     },
     "hyper2": {
@@ -76839,8 +77385,8 @@
     },
     "hypervolume": {
       "name": "hypervolume",
-      "version": "3.1.5",
-      "sha256": "1gca148ch6mr1s1s501d1fh830l6b74friygm09y2a89mc2g6g14",
+      "version": "3.1.6",
+      "sha256": "0z2mzxl4141z95sjqb4xm2c7r53g29j2fmvsi4wb1nj8yd4haw9b",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "caret", "data_table", "doParallel", "dplyr", "e1071", "fastcluster", "foreach", "geometry", "ggplot2", "hitandrun", "ks", "maps", "mvtnorm", "palmerpenguins", "pbapply", "pdist", "progress", "purrr", "raster", "sp", "terra"]
     },
     "hypoRF": {
@@ -76903,12 +77449,6 @@
       "sha256": "1ksvrrpymflfbr7acnv3sh4xa0xqjp44ngdpkp500p50mwpww1wr",
       "depends": ["magrittr"]
     },
-    "i2extras": {
-      "name": "i2extras",
-      "version": "0.2.1",
-      "sha256": "14k9s5ppq3c7ldh6gqi82awmkk34ac0br0qr42gqba9lrssf4bsr",
-      "depends": ["MASS", "ciTools", "data_table", "dplyr", "ggplot2", "incidence2", "rlang", "tibble", "tidyr", "tidyselect", "vctrs"]
-    },
     "i3pack": {
       "name": "i3pack",
       "version": "0.1.0",
@@ -76917,8 +77457,8 @@
     },
     "iAR": {
       "name": "iAR",
-      "version": "1.3.0",
-      "sha256": "0n38a42jpr2wg7ngs8975r8856mivy1nhwq64i34in8pwkvprgf6",
+      "version": "1.3.1",
+      "sha256": "01bqrb08w6qajda1mqpjk6ly0qi8nyqrigirbi0a889j4xy2k1rh",
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "S7", "ggplot2", "zoo"]
     },
     "iAdapt": {
@@ -77007,8 +77547,8 @@
     },
     "iForecast": {
       "name": "iForecast",
-      "version": "1.1.1",
-      "sha256": "05miwnmmsiilfym0mvk6n2jaw0dz4vpxfdvlhx2ivkhad0n8cs7l",
+      "version": "1.1.2",
+      "sha256": "1gs01mm2y35q28gvn5yabkbwh96qrkkjlfz3f80whcls53d4v28m",
       "depends": ["caret", "zoo"]
     },
     "iGSEA": {
@@ -77049,14 +77589,14 @@
     },
     "iNEXT": {
       "name": "iNEXT",
-      "version": "3.0.1",
-      "sha256": "1nf4jhwqx5im966qzq7si78c5q4jgsa73d74ya8q8aj02n49jcyy",
+      "version": "3.0.2",
+      "sha256": "1mfjdwhmcnwyhi9gy63vz18rsh61y6fgbib51ni6f5ikfi7h28i0",
       "depends": ["Rcpp", "ggplot2", "reshape2"]
     },
     "iNEXT_3D": {
       "name": "iNEXT.3D",
-      "version": "1.0.8",
-      "sha256": "0f8yg6c2nmci5znpvbg599zs38kgwzp76k2qv6sknr2isv3jcfpl",
+      "version": "1.0.10",
+      "sha256": "12sjg27953ij399rxj0l8kdjc5fyk5sz70rdxclsy23jlk8nx2gn",
       "depends": ["Rcpp", "ape", "dplyr", "ggplot2", "phyclust", "reshape2", "tibble", "tidytree"]
     },
     "iNEXT_4steps": {
@@ -77085,20 +77625,20 @@
     },
     "iNZightRegression": {
       "name": "iNZightRegression",
-      "version": "1.3.4",
-      "sha256": "0zqfb25gz4dwf0hqccgq3pb5wv2zmkw3ldkpscwkmc12pz2xm7im",
+      "version": "1.3.5",
+      "sha256": "1xgvwidnx4gk5a6zakk9ik2f07wwjhkx9dy1377ggjz1qf337q7j",
       "depends": ["GGally", "car", "dplyr", "ggplot2", "ggrepel", "ggtext", "iNZightPlots", "multcomp", "patchwork"]
     },
     "iNZightTS": {
       "name": "iNZightTS",
-      "version": "2.0.0",
-      "sha256": "1wzzzkl64m7mk0mpkvgkj7ahlqdja9hyhwficprd4kyqxrv00f0r",
+      "version": "2.0.2",
+      "sha256": "1as2vhrki55r1bjwpjgkad5rc8brfgwash8h9i4cm30b8kixx8ki",
       "depends": ["colorspace", "dplyr", "evaluate", "fable", "fabletools", "feasts", "forcats", "ggplot2", "ggtext", "glue", "lubridate", "patchwork", "rlang", "stringr", "tibble", "tidyr", "tsibble", "urca"]
     },
     "iNZightTools": {
       "name": "iNZightTools",
-      "version": "2.0.1",
-      "sha256": "0qmpj8hwg4gmbyhp4r1li3rrq2f5743kg04r7s7ii0j9gwsw3y0s",
+      "version": "2.0.3",
+      "sha256": "1hg1lqdwp790dni6dj1c55qapwxi1jci91grm3z2964lrv4dam3l",
       "depends": ["DBI", "dplyr", "forcats", "glue", "magrittr", "purrr", "readr", "rlang", "srvyr", "stringr", "survey", "tibble", "tidyr", "units"]
     },
     "iPRISM": {
@@ -77241,8 +77781,8 @@
     },
     "ibdsim2": {
       "name": "ibdsim2",
-      "version": "2.2.0",
-      "sha256": "1sqh1sqm8pw6fwfc06pwsyid4z5dkdhl9cgjzsi64hij4h18xc5b",
+      "version": "2.3.0",
+      "sha256": "088ljmr6fkqj9zy04xpw7vsjkjvqd6s79330gi16x840vapagk02",
       "depends": ["Rcpp", "ggplot2", "glue", "pedtools", "ribd"]
     },
     "ibelief": {
@@ -77487,9 +78027,9 @@
     },
     "icmstate": {
       "name": "icmstate",
-      "version": "0.1.1",
-      "sha256": "0nkvfa03vzmq1sh95fbc16820666afs16v60iprw1n3426gxiyls",
-      "depends": ["Rcpp", "checkmate", "deSolve", "ggplot2", "igraph", "msm", "mstate", "prodlim"]
+      "version": "0.2.0",
+      "sha256": "1gxfhm07h303220hr7gk4whf2xm97r0p7x140isc7zhdwmsc3fnf",
+      "depends": ["JOPS", "Rcpp", "checkmate", "deSolve", "ggplot2", "igraph", "msm", "mstate", "prodlim", "survival"]
     },
     "icosa": {
       "name": "icosa",
@@ -77547,9 +78087,9 @@
     },
     "ideanet": {
       "name": "ideanet",
-      "version": "1.1.0",
-      "sha256": "1vyzqqvc7nfh9db1gq4hk8bk57l266gb7r81bq41x941xzlfcf5l",
-      "depends": ["CliquePercolation", "Matrix", "RSpectra", "cluster", "colorspace", "concorR", "cowplot", "data_table", "dplyr", "forcats", "ggplot2", "ggthemes", "gridGraphics", "igraph", "igraphdata", "intergraph", "jsonlite", "linkcomm", "magrittr", "moments", "network", "readxl", "reshape2", "rlang", "shiny", "sna", "stringr", "tibble", "tidyr", "tidyselect"]
+      "version": "1.1.1",
+      "sha256": "07spm0wsi12apnd7ls1hs7lib5gzcms9jzzfcynjichz5pkcrzij",
+      "depends": ["CliquePercolation", "Matrix", "RSpectra", "cluster", "colorspace", "concorR", "cowplot", "data_table", "dplyr", "forcats", "ggplot2", "ggthemes", "gridGraphics", "igraph", "igraphdata", "intergraph", "jsonlite", "magrittr", "moments", "network", "readxl", "reshape2", "rlang", "shiny", "sna", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "idefix": {
       "name": "idefix",
@@ -77655,8 +78195,8 @@
     },
     "ieegio": {
       "name": "ieegio",
-      "version": "0.0.4",
-      "sha256": "1ma8dhv43brq3lgp18hd05gjabhv1wwacas93y7xg3sdfahyhkqm",
+      "version": "0.0.5",
+      "sha256": "0q980v593fpa9k3k2f93xrbkly6p7zhysmg8y19zr634x8vdphlb",
       "depends": ["R6", "R_matlab", "data_table", "digest", "fastmap", "filearray", "freesurferformats", "fs", "fst", "gifti", "hdf5r", "jsonlite", "oro_nifti", "readNSx", "rpyANTs", "stringr", "yaml"]
     },
     "iemisctext": {
@@ -77667,8 +78207,8 @@
     },
     "ieugwasr": {
       "name": "ieugwasr",
-      "version": "1.0.3",
-      "sha256": "0xj6i6i6fq30f4pcbc53vjrycxalv1j5lz7v6vpnn2b70f8n3lxq",
+      "version": "1.1.0",
+      "sha256": "0p56qxs3ap8hicqq9zxy00h7jnckph4lniq46wm9iix2l92z1qn6",
       "depends": ["dplyr", "httr", "jsonlite", "magrittr"]
     },
     "ifCNVR": {
@@ -77715,9 +78255,9 @@
     },
     "ig_degree_betweenness": {
       "name": "ig.degree.betweenness",
-      "version": "0.1.1",
-      "sha256": "1w78gl8ls7y4knlhm8jq3rg5xghg51ia2xqksh7q6siw4lzhamkn",
-      "depends": ["BBmisc", "igraph", "igraphdata", "qgraph", "rlist"]
+      "version": "0.2.0",
+      "sha256": "1gf6mji6ifsn0vm4bahyyakgy2j1yvpd39jkmk327v0l2i7kx9wk",
+      "depends": ["BBmisc", "dplyr", "ggplot2", "igraph", "igraphdata", "qgraph", "rlist", "tibble", "tidyr"]
     },
     "ig_vancouver_2014_topcolour": {
       "name": "ig.vancouver.2014.topcolour",
@@ -77901,10 +78441,16 @@
     },
     "imageData": {
       "name": "imageData",
-      "version": "0.1-62",
-      "sha256": "1q5s6zda1vvinp23afxjys3zl17xaidb11a7iibxpz6rla75183d",
+      "version": "0.1.64",
+      "sha256": "080s3grhhqafs13gwmzyqij6vzx8qkrfk69qlxgmp21ghcpklgk1",
       "depends": ["GGally", "Hmisc", "RColorBrewer", "dae", "ggplot2", "readxl", "reshape"]
     },
+    "imageRy": {
+      "name": "imageRy",
+      "version": "0.3.0",
+      "sha256": "06zcw2jsvdbvc28hrcrqw9b8xck0ml3sg27bqi93c68navphcbm7",
+      "depends": ["ggplot2", "rlang", "terra", "viridis"]
+    },
     "imagefluency": {
       "name": "imagefluency",
       "version": "0.2.5",
@@ -77919,8 +78465,8 @@
     },
     "imager": {
       "name": "imager",
-      "version": "1.0.3",
-      "sha256": "00720nzksl6pfk35wmiznay5idi7cakdywi4pfvxffgslncvjl53",
+      "version": "1.0.5",
+      "sha256": "0m84qb9riqzk5hr0p309i8ycc8646x0963g2lhfin8f1ziv914b6",
       "depends": ["Rcpp", "downloader", "igraph", "jpeg", "magrittr", "png", "purrr", "readbitmap", "stringr"]
     },
     "imagerExtra": {
@@ -78007,12 +78553,6 @@
       "sha256": "14qn4pvg9g57xmj1dgsdybmc30rj2gfdby52pzvcjzyfsbxw8hch",
       "depends": ["base64enc", "dplyr", "httr", "jsonlite", "knitr", "rlang"]
     },
-    "imguR": {
-      "name": "imguR",
-      "version": "1.0.3",
-      "sha256": "14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3",
-      "depends": ["httr", "jpeg", "png"]
-    },
     "iml": {
       "name": "iml",
       "version": "0.11.4",
@@ -78051,8 +78591,8 @@
     },
     "immunogenetr": {
       "name": "immunogenetr",
-      "version": "0.2.0",
-      "sha256": "1q8r16nyda06lxpz07m433qbz2i8hdz92l6x93plhbq7gh53i2az",
+      "version": "0.3.1",
+      "sha256": "0zmkjxba4bkanns9z2q2dyp3cdhm4a23flzmla7qhvldykmkckgn",
       "depends": ["cli", "dplyr", "glue", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "xml2"]
     },
     "imola": {
@@ -78093,8 +78633,8 @@
     },
     "implicitMeasures": {
       "name": "implicitMeasures",
-      "version": "0.2.1",
-      "sha256": "177d69fbyzrg28ddxqlqbf7hm25mj5rpmpslh0mad2xqzyvdylvn",
+      "version": "0.3.0",
+      "sha256": "0zyx9fsch9arny61b4swk0nrfy8l8am09y5vzggalgc8hhx6zbqy",
       "depends": ["ggplot2", "stringr", "tidyr", "xtable"]
     },
     "implied": {
@@ -78223,6 +78763,12 @@
       "sha256": "0r51ai4sih08bbzlk4ndgbsrmvvpy5362x3wknm1v9l4m42kzkwh",
       "depends": ["Rcpp", "RcppEigen", "htmltools", "htmlwidgets"]
     },
+    "inDAGO": {
+      "name": "inDAGO",
+      "version": "1.0.0",
+      "sha256": "08h5pk4q2mis97bmyqnqcssc5wcffn07xmfjv23pqvmk01g45h38",
+      "depends": ["BiocGenerics", "Biostrings", "DT", "HTSFilter", "Hmisc", "R_devices", "Rfastp", "Rsamtools", "Rsubread", "S4Vectors", "ShortRead", "UpSetR", "XVector", "bigtabulate", "bsicons", "bslib", "callr", "checkmate", "data_table", "dplyr", "edgeR", "fs", "ggplot2", "ggrepel", "heatmaply", "htmltools", "limma", "magrittr", "matrixStats", "memuse", "paletteer", "pheatmap", "plotly", "readr", "reshape2", "rintrojs", "rtracklayer", "seqinr", "shiny", "shinyFiles", "shinyWidgets", "shinycssloaders", "shinyjs", "spsComps", "tibble", "tidyr", "upsetjs"]
+    },
     "inTextSummaryTable": {
       "name": "inTextSummaryTable",
       "version": "3.3.3",
@@ -78261,9 +78807,9 @@
     },
     "incase": {
       "name": "incase",
-      "version": "0.3.2",
-      "sha256": "06qzzvxxwi0dp7ln864qszvk9xqbb4rgx5mbnkcvji7in6k2yj0n",
-      "depends": ["backports", "cli", "magrittr", "plu", "rlang"]
+      "version": "0.4.0",
+      "sha256": "1550cqza64qfqbh6wpicv84lipzk8sixkkjihbgl49v8nvrnaw58",
+      "depends": ["backports", "cli", "glue", "lifecycle", "magrittr", "plu", "rlang"]
     },
     "incgraph": {
       "name": "incgraph",
@@ -78273,8 +78819,8 @@
     },
     "incidence": {
       "name": "incidence",
-      "version": "1.7.5",
-      "sha256": "0ysvrbvgk7xiv2d931mgb8q18fxjhlknrlww7myidv7n5250sd0v",
+      "version": "1.7.6",
+      "sha256": "0rzgwil8gpwfibshs8sgcypq9qfi3dsgfp6gi76mx7bj0zrimvy5",
       "depends": ["aweek", "ggplot2"]
     },
     "incidence2": {
@@ -78291,8 +78837,8 @@
     },
     "incidentally": {
       "name": "incidentally",
-      "version": "1.0.2",
-      "sha256": "063m672ym9w5zmzvdhr17smqy1mffkl3vls7nhpsxc4bjswqls2g",
+      "version": "1.0.3",
+      "sha256": "0sj49n6szdl6mxz85vn01cjk1xxdchwpxjv07dp34f81m5bgzi5l",
       "depends": ["Matrix", "igraph", "xml2"]
     },
     "inctools": {
@@ -78409,10 +78955,16 @@
       "sha256": "1kjy2kgi5v29yk6pv776gwdqzkscjh96p3iv1j906vh47zp8wrag",
       "depends": ["MASS", "glmnet", "hdi"]
     },
+    "infectiousR": {
+      "name": "infectiousR",
+      "version": "0.1.0",
+      "sha256": "19lwxw3vcpwsvcr5an9d3644bmm5w0pk31b0cfmkcffpmnrgli8c",
+      "depends": ["dplyr", "httr", "jsonlite", "lubridate"]
+    },
     "infer": {
       "name": "infer",
-      "version": "1.0.8",
-      "sha256": "05m24gzkkdb7i1xia6q99ji964p98mxb875jy2z418q26fjhnfdw",
+      "version": "1.0.9",
+      "sha256": "0g5ajhfj009lxsqwl00ixgzh0g3cxm6qx40swknn9rjvwqwrjjdj",
       "depends": ["broom", "cli", "dplyr", "generics", "ggplot2", "glue", "lifecycle", "magrittr", "patchwork", "purrr", "rlang", "tibble", "tidyr", "vctrs"]
     },
     "inferCSN": {
@@ -78459,8 +79011,8 @@
     },
     "inflection": {
       "name": "inflection",
-      "version": "1.3.6",
-      "sha256": "11kiclf3jd08im5lkm12p9winkcqp4y8897syvccx07qc99kifn8",
+      "version": "1.3.7",
+      "sha256": "0482g7idw28h42xzb5v15y0wlmxg999cn9wgf92s4v4w0rrcfcpw",
       "depends": []
     },
     "influence_ME": {
@@ -78471,8 +79023,8 @@
     },
     "influence_SEM": {
       "name": "influence.SEM",
-      "version": "2.3",
-      "sha256": "0z83rvlri9g30291p0wv4s0jhiy6445lcrqrd4n1crach9672yzy",
+      "version": "2.4",
+      "sha256": "1f4l7h66s537xgfplfd36vsaca1i0913cji33hmiqmbw23fbrhja",
       "depends": ["lavaan"]
     },
     "influenceAUC": {
@@ -78561,8 +79113,8 @@
     },
     "inlabru": {
       "name": "inlabru",
-      "version": "2.12.0",
-      "sha256": "19njs1ji1w2gnn25jkis3qk2xd0zgb9kfz6p6k8h83lc2852ipp3",
+      "version": "2.13.0",
+      "sha256": "1y908g6sjfp5anppp67d6d43jxqlqx46mmmqlwaca8ykig2n9cdj",
       "depends": ["Matrix", "MatrixModels", "dplyr", "fmesher", "lifecycle", "magrittr", "plyr", "rlang", "sf", "tibble", "withr"]
     },
     "inlamemi": {
@@ -78577,12 +79129,6 @@
       "sha256": "0yhhy7yrycxg58shfwrja2zfdixss2wldi6qg262dfa9w6j68brj",
       "depends": ["checkmate", "rlang", "scales"]
     },
-    "inldata": {
-      "name": "inldata",
-      "version": "1.2.7",
-      "sha256": "1hi2rzh95in4zgy9vwsnb9vddl64ia9jsb0mvcpgr7fciqnfp0rw",
-      "depends": ["checkmate", "sf", "stringi", "terra"]
-    },
     "inline": {
       "name": "inline",
       "version": "0.3.21",
@@ -78597,8 +79143,8 @@
     },
     "inlpubs": {
       "name": "inlpubs",
-      "version": "1.2.0",
-      "sha256": "108jxs1qp4ypcw0c4rkybhh1dxydiy8gy3d4lfz1d7vf93gk3jji",
+      "version": "1.3.0",
+      "sha256": "08sx60r6g0wzc7xwf99ya62vp8wr3353wfkcw28aqi4lbda60dfd",
       "depends": ["checkmate", "tm"]
     },
     "innsight": {
@@ -78607,6 +79153,12 @@
       "sha256": "1z9qjdl89i69zx713jc27fb3k7x9vj6rzqwh6m7qaz4izbgc5hh1",
       "depends": ["R6", "checkmate", "cli", "ggplot2", "torch"]
     },
+    "ino": {
+      "name": "ino",
+      "version": "1.1.0",
+      "sha256": "1f1rjckwxbmak7maxyb1s9vhks9kq2j7dr1ddx3p1fkbg6cz9pck",
+      "depends": ["R6", "checkmate", "cli", "dplyr", "future_apply", "ggplot2", "normalize", "oeli", "optimizeR", "portion", "tidyr"]
+    },
     "inops": {
       "name": "inops",
       "version": "0.0.1",
@@ -78645,8 +79197,8 @@
     },
     "insight": {
       "name": "insight",
-      "version": "1.3.0",
-      "sha256": "19d8wglqlasm6kbgsgyg5a7q7lz5qc3g77hsyclivcidaq1108x2",
+      "version": "1.3.1",
+      "sha256": "0vgnzsivc71hry6lxnyqh4bpd2vxi6h00p35ggyzxdycnfw2nam3",
       "depends": []
     },
     "inspectdf": {
@@ -78721,24 +79273,12 @@
       "sha256": "013n0qp12dqnnk931rvs6lql2r13z5j4jf27s4aqfyd80mnl5w7k",
       "depends": ["lme4", "plyr"]
     },
-    "intSDM": {
-      "name": "intSDM",
-      "version": "2.1.1",
-      "sha256": "13qh4aa96hkrq1q7n22m8b6g64i5nw4n2wq320izqnc8nkrq3hv5",
-      "depends": ["PointedSDMs", "R6", "blockCV", "fmesher", "geodata", "ggplot2", "giscoR", "inlabru", "rgbif", "sf", "terra", "tidyterra", "units"]
-    },
     "intamap": {
       "name": "intamap",
-      "version": "1.5-7",
-      "sha256": "1rvjqv58bfsya6sc9kbqkln3f9zw3cvqhqsdxfsksvjybnmychxq",
+      "version": "1.5-11",
+      "sha256": "1prpri38r0j5n7kl4w11593vc4k6ywp4hc57d5m9g4nmhh50637m",
       "depends": ["MASS", "MBA", "automap", "doParallel", "evd", "foreach", "gstat", "mvtnorm", "sf", "sp"]
     },
-    "intamapInteractive": {
-      "name": "intamapInteractive",
-      "version": "1.2-6",
-      "sha256": "0mdn4fmc7skmf61pshyyc6g3xlxa2friyy0kzhn5d6q5ni3fm7rb",
-      "depends": ["automap", "gstat", "intamap", "sf", "sp", "spatstat_geom", "spcosa"]
-    },
     "intccr": {
       "name": "intccr",
       "version": "3.0.4",
@@ -78781,6 +79321,12 @@
       "sha256": "0rgm8rj95r269ww7snwv6czqdxabhzwxyaf3587scprhhn7pncy3",
       "depends": ["Matrix", "ggplot2", "igraph", "intergraph", "sna", "spatstat_geom", "spdep", "viridis"]
     },
+    "inteq": {
+      "name": "inteq",
+      "version": "1.0",
+      "sha256": "16a9qvrsskz61y9qj5spqpffm5a8y9ziyszki5nznj98805r9474",
+      "depends": []
+    },
     "interactionR": {
       "name": "interactionR",
       "version": "0.1.7",
@@ -78937,6 +79483,12 @@
       "sha256": "07p9r358q3jxm8n7nypxmvpfnh61njivcwaplgzzxrlcbway6fq9",
       "depends": ["Rcpp", "data_table"]
     },
+    "intervalpsych": {
+      "name": "intervalpsych",
+      "version": "0.1.0",
+      "sha256": "0pq1ycwp56521b9r1vfd5h1g8hx5sfvx8mbnn9jh185lm7sb73pa",
+      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "ggdist", "ggokabeito", "ggplot2", "posterior", "purrr", "rstan", "rstantools"]
+    },
     "intervals": {
       "name": "intervals",
       "version": "0.15.5",
@@ -78999,9 +79551,9 @@
     },
     "intrval": {
       "name": "intrval",
-      "version": "0.1-3",
-      "sha256": "0pq2pbvhhczh90p78zcgv5n1wgw0jswly8g5bfqxq5j2nhd8imbd",
-      "depends": []
+      "version": "1.0-0",
+      "sha256": "0l0rmfdyn468rshg6ycx41c8y3yh5yb669kdwrzk89qdplyplw75",
+      "depends": ["fpCompare"]
     },
     "intsurv": {
       "name": "intsurv",
@@ -79053,8 +79605,8 @@
     },
     "invertiforms": {
       "name": "invertiforms",
-      "version": "0.1.1",
-      "sha256": "0n3ksfdryk0g6f60acxh4i9f5z6gi9bsbal95z9pcd1vgvyhr1xw",
+      "version": "0.1.2",
+      "sha256": "15f6li13fyp4mlrwlicz93i1ajhk4akwp8ix06s9b9wsjw2d3f9w",
       "depends": ["Matrix", "glue", "sparseLRMatrix"]
     },
     "investr": {
@@ -79065,8 +79617,8 @@
     },
     "invgamma": {
       "name": "invgamma",
-      "version": "1.1",
-      "sha256": "12ga2y4wc9bc5zz6vimvxwgjpsx3ys3209nq63gscbw559ydxa5a",
+      "version": "1.2",
+      "sha256": "00b6sn548v6b9wwg34qvvsvci3d0f98cib5iw2sask7isnx2jhpp",
       "depends": []
     },
     "invgamstochvol": {
@@ -79125,8 +79677,8 @@
     },
     "iotarelr": {
       "name": "iotarelr",
-      "version": "0.1.5",
-      "sha256": "0sp3qcd5zbz8q2srfa5a34gv9rj4hcqiggbrmr67p8zfrfm950np",
+      "version": "0.1.6",
+      "sha256": "1lzl0py3yv0r8hjs1ipm3iysxd0h0b3yp4mfac63b7qwcv05lgmj",
       "depends": ["Rcpp", "ggalluvial", "ggplot2", "gridExtra", "rlang"]
     },
     "iotools": {
@@ -79201,12 +79753,6 @@
       "sha256": "07bl1yj1y0dd56zmqip73rvbzzciwi5lafvqfhz0zxlk6pzyqfpj",
       "depends": ["R6", "shiny", "txtq"]
     },
-    "ipcwswitch": {
-      "name": "ipcwswitch",
-      "version": "1.0.4",
-      "sha256": "12z16c8sv1nhdv70kwx1a0wh588znkv5y5r0s9kcws0n3rjhzh9p",
-      "depends": ["survival"]
-    },
     "ipd": {
       "name": "ipd",
       "version": "0.1.4",
@@ -79341,8 +79887,8 @@
     },
     "ipw": {
       "name": "ipw",
-      "version": "1.2.1",
-      "sha256": "0xgx9l5s4w71494jfs2jfs1dhch18rb8j7jn68hilh1pzc9hz05k",
+      "version": "1.2.1.1",
+      "sha256": "0nh4v3rf0awqdfnp1ldxkslqswxmp1fdbn05nk4ywzmy4l8cls09",
       "depends": ["MASS", "geepack", "nnet", "survival"]
     },
     "ipwCoxCSV": {
@@ -79405,6 +79951,12 @@
       "sha256": "1ky5nlmyrnwz6121wwqd8p8r1ycnjkl5r290k4x2477rzs267zic",
       "depends": ["Matrix"]
     },
+    "ironseed": {
+      "name": "ironseed",
+      "version": "0.1.0",
+      "sha256": "1mc22y30cd5v5hgvsfrfhfiwchg7mbd6l3fiz6f91hxsdw76l90j",
+      "depends": []
+    },
     "irr": {
       "name": "irr",
       "version": "0.84.1",
@@ -79449,8 +80001,8 @@
     },
     "irtQ": {
       "name": "irtQ",
-      "version": "0.2.1",
-      "sha256": "0jql9lz6f2ik5ixv66028h45wh1jcb54rbgmazsgrzvjpb12zybg",
+      "version": "1.0.0",
+      "sha256": "1cg9rxbk7xsbaj4qx9gvda4q3zxlxbq5v8pfng1kpwcsja8bysla",
       "depends": ["Matrix", "Rfast", "dplyr", "ggplot2", "gridExtra", "janitor", "mirt", "purrr", "reshape2", "rlang", "statmod", "tibble", "tidyr"]
     },
     "irtawsi": {
@@ -79527,9 +80079,9 @@
     },
     "islasso": {
       "name": "islasso",
-      "version": "1.5.2",
-      "sha256": "100sb5795xk45cm7zb0zmqy3flz0hy32alqqi1wfv10v06dbdlbd",
-      "depends": ["Matrix", "glmnet"]
+      "version": "1.6.0",
+      "sha256": "185i72l1748gf06vwifgpk17rwgx811402l90fa8q2d67ip9z3fy",
+      "depends": ["cli", "ggplot2", "glmnet", "gridExtra"]
     },
     "ismev": {
       "name": "ismev",
@@ -79569,8 +80121,8 @@
     },
     "isoWater": {
       "name": "isoWater",
-      "version": "1.2.0",
-      "sha256": "1lmpvcljzsga89ib2avsasfdkgx3658vrp5gik25ymcdyxhsx5mi",
+      "version": "1.2.1",
+      "sha256": "0rhl57071xk97d5si5mqr3dkj47lwbfbkcy4qq1k93n95q4br2jd",
       "depends": ["R2WinBUGS", "R2jags", "abind", "doParallel", "foreach", "httr", "jsonlite"]
     },
     "isoband": {
@@ -79611,8 +80163,8 @@
     },
     "isocountry": {
       "name": "isocountry",
-      "version": "0.4.0",
-      "sha256": "0gksbq90i0h4pm7mqkwiz8lmd0lyby40z1lc935miz0zgr96n24x",
+      "version": "0.5.0",
+      "sha256": "19y48jjxmqnzabyacik016hd2i2m7a54bb8x4w30x0jgdiq3zqpj",
       "depends": ["tibble"]
     },
     "isodistrreg": {
@@ -79827,8 +80379,8 @@
     },
     "itsdm": {
       "name": "itsdm",
-      "version": "0.2.1",
-      "sha256": "1rd55arrha2xy5d68nymz3awycpk0797d9q55ia42rq9n1gi9w9k",
+      "version": "0.2.2",
+      "sha256": "180bjjfplhl3xkbkiq1p5i2m6wp3q7bnxx63ac5sgqbyr7ycpw74",
       "depends": ["ROCit", "checkmate", "dplyr", "fastshap", "ggplot2", "isotree", "mgcv", "ncdf4", "outliertree", "patchwork", "raster", "rlang", "sf", "stars", "stringr", "tidyselect"]
     },
     "itsmr": {
@@ -79855,6 +80407,12 @@
       "sha256": "1pcls9lgj6i7qad5y28bvj2nra8kpnjslcdkjvl1q1aq8ig1yb98",
       "depends": ["BSSprep"]
     },
+    "ivdesc": {
+      "name": "ivdesc",
+      "version": "1.1.2",
+      "sha256": "04ap12ff5aqr2sgwkmzq4xzzp9hy0pchvjza5kk55mm228hqv1n4",
+      "depends": ["knitr", "purrr", "rsample"]
+    },
     "ivdesign": {
       "name": "ivdesign",
       "version": "0.1.0",
@@ -80091,9 +80649,9 @@
     },
     "jarbes": {
       "name": "jarbes",
-      "version": "2.2.5",
-      "sha256": "1jzvmrg9azagr36mp6vdvm2kjpxlmg4hvxqbnhag86h40csj47cd",
-      "depends": ["GGally", "MASS", "R2jags", "bookdown", "ggExtra", "ggplot2", "gridExtra", "kableExtra", "mcmcplots", "qpdf", "rjags", "tidyr"]
+      "version": "2.3.0",
+      "sha256": "0fw769m9qrzwi7jaaqnswwwv3kggba7bkqzwc4m85llkn4mj5fi4",
+      "depends": ["GGally", "MASS", "R2jags", "bayesplot", "bookdown", "ggExtra", "ggplot2", "gridExtra", "kableExtra", "qpdf", "rjags", "tidyr"]
     },
     "javateak": {
       "name": "javateak",
@@ -80271,8 +80829,8 @@
     },
     "jmvReadWrite": {
       "name": "jmvReadWrite",
-      "version": "0.4.10",
-      "sha256": "18b0gm3k7pxb9nwvg1qk4mrfq3q6h9qbpghcy9c3gpwdrwdqq740",
+      "version": "0.4.11",
+      "sha256": "1c9gzfhljgsi87y8dbvxdw38f5hv3ij8bzpsk0l0gv7b7rhfgl2v",
       "depends": ["jsonlite", "zip"]
     },
     "jmvconnect": {
@@ -80485,6 +81043,12 @@
       "sha256": "04a40v4znpj98j7y6009d74a6g9dchj5rr3p08cgz9p3rlfw3g7h",
       "depends": ["htmltools"]
     },
+    "jrSiCKLSNMF": {
+      "name": "jrSiCKLSNMF",
+      "version": "1.2.3",
+      "sha256": "1fiw72mk70fh4mnsmzq0a08ahxl9hl9da0wj48f4b18j512jhjvl",
+      "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "Rdpack", "clValid", "cluster", "data_table", "factoextra", "foreach", "ggplot2", "ggrepel", "igraph", "irlba", "kknn", "pbapply", "rlang", "scran", "umap"]
+    },
     "jrc": {
       "name": "jrc",
       "version": "0.6.0",
@@ -80499,8 +81063,8 @@
     },
     "jrt": {
       "name": "jrt",
-      "version": "1.1.2",
-      "sha256": "03k5dgqqzhhd6n4pdpcyq0zy4dj35yj41c6wnz4pa2i0i16jgfdq",
+      "version": "1.1.3",
+      "sha256": "0k6jxjpvscc0yw0dhk33fcd5k6al8fbai7zwf9cbkwaxjr65wc4m",
       "depends": ["directlabels", "dplyr", "ggplot2", "ggsci", "irr", "mirt", "psych", "tidyr"]
     },
     "jrvFinance": {
@@ -80535,15 +81099,15 @@
     },
     "jskm": {
       "name": "jskm",
-      "version": "0.5.13",
-      "sha256": "0dmpfpjy4spv5f81sz6ciydqx7d7mvli8fnw4gp7vqn1hxs37ly3",
+      "version": "0.5.14",
+      "sha256": "19y99gnmkf5lqip56iizs0s4lcl7y3300rj41jlgdpmrsr73jjzd",
       "depends": ["cmprsk", "ggplot2", "ggpubr", "patchwork", "scales", "survey", "survival"]
     },
     "jsmodule": {
       "name": "jsmodule",
-      "version": "1.6.9",
-      "sha256": "15spp6kva3f1bacri4kkppwd2l6hfjxh886hy1qvbmmhc0x9nmrb",
-      "depends": ["DT", "GGally", "Hmisc", "MatchIt", "RColorBrewer", "bslib", "data_table", "epiDisplay", "flextable", "forestploter", "geepack", "ggplot2", "ggpubr", "ggrepel", "haven", "htmltools", "jskm", "jstable", "labelled", "maxstat", "officer", "pROC", "purrr", "readr", "readxl", "riskRegression", "rstudioapi", "rvg", "scales", "see", "shiny", "shinyWidgets", "shinycustomloader", "shinyjs", "survIDINRI", "survey", "survival", "timeROC"]
+      "version": "1.6.11",
+      "sha256": "1g1srmcbmqlpmga32wb97jcq2sw6pgvxr5dxz7bfgbxy01hd8n2f",
+      "depends": ["DT", "GGally", "Hmisc", "MatchIt", "R6", "RColorBrewer", "bslib", "data_table", "epiDisplay", "flextable", "forestploter", "geepack", "ggplot2", "ggpubr", "ggrepel", "haven", "htmltools", "jskm", "jstable", "labelled", "maxstat", "officer", "pROC", "purrr", "readr", "readxl", "riskRegression", "rstudioapi", "rvg", "scales", "see", "shiny", "shinyWidgets", "shinycustomloader", "shinyjs", "survIDINRI", "survey", "survival", "timeROC"]
     },
     "json2aRgs": {
       "name": "json2aRgs",
@@ -80595,8 +81159,8 @@
     },
     "jstable": {
       "name": "jstable",
-      "version": "1.3.12",
-      "sha256": "1h273d7xcypmchmlbczv4cmkvynhbjgvm4vh04crv5jd4gwn0qkl",
+      "version": "1.3.13",
+      "sha256": "1y9cah5q1dhg2xpxbpvyrbgacpv40057h8dil540ckxi0gz7mkpk",
       "depends": ["car", "coxme", "data_table", "dplyr", "geepack", "labelled", "lme4", "lmerTest", "magrittr", "nortest", "purrr", "rlang", "survey", "survival", "tableone", "tibble"]
     },
     "jstager": {
@@ -80659,6 +81223,12 @@
       "sha256": "14gczjxfs7m3kn4smxl8l66c1m4iz9d710hx8gn167g0hr1kijv6",
       "depends": ["Rcpp", "nloptr"]
     },
+    "junco": {
+      "name": "junco",
+      "version": "0.1.1",
+      "sha256": "1fm6jxnn1glq199kq57bknzqffmndqbx45w6q4613scax30ma63a",
+      "depends": ["assertthat", "broom", "checkmate", "dplyr", "emmeans", "formatters", "generics", "mmrm", "rbmi", "rlistings", "rtables", "survival", "tern", "tibble", "tidytlg"]
+    },
     "junctions": {
       "name": "junctions",
       "version": "2.1.3",
@@ -80683,12 +81253,6 @@
       "sha256": "1ixmz3pj18zddgah59iqd4zbm5praw0dvn6c93dn5mrwx92pa65c",
       "depends": []
     },
-    "jvnVaR": {
-      "name": "jvnVaR",
-      "version": "1.0",
-      "sha256": "0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci",
-      "depends": []
-    },
     "k5": {
       "name": "k5",
       "version": "0.2.1",
@@ -80769,8 +81333,8 @@
     },
     "kanova": {
       "name": "kanova",
-      "version": "0.3-17",
-      "sha256": "080agirbaz1pnpmqyxf3hfqz9n41zb41xrcfwcaxf6a83pvv4fbb",
+      "version": "0.3-19",
+      "sha256": "0hdap20xwb6805hv13ifjz4jk8ml0bpmznf15r6lyr31ca9jb27g",
       "depends": ["spatstat_explore", "spatstat_geom", "spatstat_random"]
     },
     "kantorovich": {
@@ -80815,12 +81379,6 @@
       "sha256": "0j50km7j6nmmpalhyzv2ydh69pj6ss5jgdqykiy83hcj1d2h4cac",
       "depends": ["seewave", "tuneR"]
     },
-    "karel": {
-      "name": "karel",
-      "version": "0.1.1",
-      "sha256": "0nvzvd8aq0sipcvn8agjjd2k1wykpgc99nrrk2cxrlvsjbpd2w52",
-      "depends": ["dplyr", "gganimate", "ggplot2", "gifski", "magrittr", "purrr", "tidyr"]
-    },
     "karlen": {
       "name": "karlen",
       "version": "0.0.2",
@@ -80853,8 +81411,8 @@
     },
     "kbal": {
       "name": "kbal",
-      "version": "0.1.2",
-      "sha256": "1cjcyk8j4ki92ps3s7q5i5l8rrdv9ksijazykww82cv1pgpilns7",
+      "version": "0.1.3",
+      "sha256": "0ck4zcdj09fnw4nx93pwcjr24flaim66lsygg6d843r60i6pdd3m",
       "depends": ["RSpectra", "Rcpp", "RcppParallel", "dplyr"]
     },
     "kcmeans": {
@@ -80905,6 +81463,12 @@
       "sha256": "1gaykb735zk2q1bdc29qm36rbi13qxfb4qr91ywccmb6c2106fby",
       "depends": ["MASS", "markdown", "np"]
     },
+    "kdps": {
+      "name": "kdps",
+      "version": "1.0.0",
+      "sha256": "0wff0xmmk951mbmdnj3fvyg51qy6h9zfnajhslixvrd1br7gd1r1",
+      "depends": ["data_table", "dplyr", "progress", "tibble"]
+    },
     "kdry": {
       "name": "kdry",
       "version": "0.0.2",
@@ -80989,6 +81553,12 @@
       "sha256": "05hyhgbc2533az1yrjj8v8idky0xwn20mxd92dna0is6pddf75hv",
       "depends": ["RJSONIO", "crayon", "data_table", "dplyr", "echarts4r", "magick", "plotly", "reticulate", "rjson", "rstudioapi", "tensorflow", "tidyjson"]
     },
+    "kerdiest": {
+      "name": "kerdiest",
+      "version": "1.3-1",
+      "sha256": "0i3fj4kw0l8mic1l5d9p3h6z6c4srn5jmlrqjnha59lyymrvfscb",
+      "depends": []
+    },
     "kergp": {
       "name": "kergp",
       "version": "0.5.8",
@@ -81015,9 +81585,9 @@
     },
     "kernelshap": {
       "name": "kernelshap",
-      "version": "0.7.0",
-      "sha256": "0p0zi0l3b7axcp3r34arwbpbbj8bibgryza7g5f45ngm77nlbc5f",
-      "depends": ["MASS", "foreach"]
+      "version": "0.9.0",
+      "sha256": "0adk5gjapw68wsh97a4fdzf0frazy9c77kf6ci3gj3mh0hwj3bi8",
+      "depends": ["doFuture", "foreach"]
     },
     "kernhaz": {
       "name": "kernhaz",
@@ -81045,8 +81615,8 @@
     },
     "kernscr": {
       "name": "kernscr",
-      "version": "1.0.6",
-      "sha256": "0vk0ppb24la6876sw96kk5s3lw4qqs56m507xncbdvjjgw6pq180",
+      "version": "1.0.7",
+      "sha256": "1v4z5zbx3z2m6p7blkhq8r7m9wx156x4vmifmni3455ls8g7b341",
       "depends": ["MASS", "mvtnorm"]
     },
     "kernstadapt": {
@@ -81069,8 +81639,8 @@
     },
     "keyATM": {
       "name": "keyATM",
-      "version": "0.5.3",
-      "sha256": "1xp9w3z3d9wcag8chysg8bmkyp84wz1nifyg3g0blb9fprxcl1np",
+      "version": "0.5.4",
+      "sha256": "09mk832ws42v0pf65p90cggwmz087dkfsksp3xg0l2fj3f0l0bdf",
       "depends": ["MASS", "Matrix", "Rcpp", "RcppEigen", "cli", "dplyr", "fastmap", "fs", "future_apply", "ggplot2", "ggrepel", "magrittr", "matrixNormal", "pgdraw", "purrr", "quanteda", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "keyToEnglish": {
@@ -81087,8 +81657,8 @@
     },
     "keyholder": {
       "name": "keyholder",
-      "version": "0.1.7",
-      "sha256": "19xbzpanwyfxywzki3m5jvams40ppxkplm7p1jqm6d5rviidiq1j",
+      "version": "0.1.8",
+      "sha256": "08v7hsbsdf2hdyzr2z1bgyxdg64dvkz828n772jxb77qq9h5k901",
       "depends": ["dplyr", "rlang", "tibble"]
     },
     "keyperm": {
@@ -81111,8 +81681,8 @@
     },
     "keyring": {
       "name": "keyring",
-      "version": "1.4.0",
-      "sha256": "1s1msy82f76wkbchhrfxr072dzg93qnmcg017ymhdksmrjw7zxwk",
+      "version": "1.4.1",
+      "sha256": "116fad7zhhrcbmfmxih11q18x9a9prkln9i503y98i6dr0glb8pv",
       "depends": ["R6", "askpass", "filelock", "yaml"]
     },
     "keyringr": {
@@ -81247,6 +81817,12 @@
       "sha256": "1mn09isszg53zxss4q29fiv3ci7y25xsx36cmipk93b7s6p30mhn",
       "depends": ["numDeriv"]
     },
+    "kinesis": {
+      "name": "kinesis",
+      "version": "0.2.1",
+      "sha256": "0qj5znbh46vaah7cslhhd7wp4yycglv7mi5l823mnhpljldh92h0",
+      "depends": ["aion", "arkhe", "bslib", "config", "dimensio", "folio", "gt", "isopleuros", "kairos", "khroma", "mirai", "nexus", "sass", "shiny", "tabula"]
+    },
     "kinship2": {
       "name": "kinship2",
       "version": "1.9.6.1",
@@ -81381,8 +81957,8 @@
     },
     "kmBlock": {
       "name": "kmBlock",
-      "version": "0.1.2",
-      "sha256": "07y1gadn5givrx4ww9vzgcqdkchgd1ndjq65v6ssrbcxsx1lbgxl",
+      "version": "0.1.4",
+      "sha256": "1j68fjs826skg59jgrilsd5d4xssj03wq5mpdx4drb6baxjlpjmk",
       "depends": ["Rcpp", "RcppArmadillo", "blockmodeling", "doParallel", "doRNG", "foreach"]
     },
     "kmc": {
@@ -81745,6 +82321,12 @@
       "sha256": "0lx7p2rgvcjgg99chcan0qb9hafx226sqvdb1g1xpkdwvzbyxci8",
       "depends": ["Rcpp"]
     },
+    "kvkapiR": {
+      "name": "kvkapiR",
+      "version": "0.1.2",
+      "sha256": "18ix3zc76z2piqbv49kq0p27m8g5wwa8v6bh057b24w03w48mxx4",
+      "depends": ["cli", "dplyr", "httr2", "lifecycle", "purrr", "tibble", "tidyr"]
+    },
     "kyotil": {
       "name": "kyotil",
       "version": "2024.11-01",
@@ -81759,8 +82341,8 @@
     },
     "kzs": {
       "name": "kzs",
-      "version": "1.4",
-      "sha256": "1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9",
+      "version": "1.4.1",
+      "sha256": "1fbwd55ww51c3wj7km552w809vdpxqagp5gxyzsxmz1gqw1b67pr",
       "depends": ["lattice"]
     },
     "l0ara": {
@@ -81819,8 +82401,8 @@
     },
     "labdsv": {
       "name": "labdsv",
-      "version": "2.1-0",
-      "sha256": "1lawc8fm766p7z6kk0c3lda71i8lywg30znzyfkrx94sbr8r5nlr",
+      "version": "2.1-2",
+      "sha256": "0n7sd5j8b2bq88744gsbzsxwkpv5l8siik47gg6bzh0ch9g2ycii",
       "depends": ["MASS", "Rtsne", "cluster", "mgcv"]
     },
     "label_switching": {
@@ -81907,12 +82489,6 @@
       "sha256": "11wv998mapys2hgwwdgvgllcjsd4y7g7p19kg419xlx3py0c077p",
       "depends": ["broom", "dplyr", "forcats", "ggplot2", "ggtext", "lubridate", "magrittr", "minpack_lm", "patchwork", "pracma", "rlang", "segmented", "stringr", "tidyr"]
     },
-    "lactcurves": {
-      "name": "lactcurves",
-      "version": "1.1.0",
-      "sha256": "1ksllpgz519gzrs8gwfgg7743vj3j7ikmbwgisdjs77sdxxl7xyz",
-      "depends": ["orthopolynom", "polynom"]
-    },
     "lacunaritycovariance": {
       "name": "lacunaritycovariance",
       "version": "1.1-7",
@@ -81969,8 +82545,8 @@
     },
     "lamW": {
       "name": "lamW",
-      "version": "2.2.4",
-      "sha256": "1h1plx9d6kzgdv20sx7pjfkz54jw11pkqrspgw4hh1kgk6hpbgsz",
+      "version": "2.2.5",
+      "sha256": "0njdkvn76m6ywrzam3h5d3wxdn3v11ja3z0vn37mhfwwd4a327ck",
       "depends": ["Rcpp", "RcppParallel"]
     },
     "lambda_r": {
@@ -82065,8 +82641,8 @@
     },
     "landsepi": {
       "name": "landsepi",
-      "version": "1.5.1",
-      "sha256": "1n0ymmycgpfmv7drlazkws7vyw868lwkdyw2gfsb7fl615qwg6j3",
+      "version": "1.5.2",
+      "sha256": "0j76g1lv7l9kf2b8vj3yhc346sf1k38q8b1ajpzjckh7rn0slmys",
       "depends": ["DBI", "Matrix", "RSQLite", "Rcpp", "deSolve", "doParallel", "fields", "foreach", "mvtnorm", "sf", "sp", "splancs", "testthat"]
     },
     "langevitour": {
@@ -82107,8 +82683,8 @@
     },
     "lares": {
       "name": "lares",
-      "version": "5.2.13",
-      "sha256": "1n6dc11593hwcb0r0vq4c6yym6yqawbkf9f956ydg4ni9kvbw8vp",
+      "version": "5.3.1",
+      "sha256": "14qswq667s0cpxdlwlvrzzdzgrfkhm119ah5vxwyzpvsmw6chcm3",
       "depends": ["dplyr", "ggplot2", "httr", "jsonlite", "lubridate", "openxlsx", "pROC", "patchwork", "rlang", "rpart", "rpart_plot", "rvest", "stringr", "tidyr", "yaml"]
     },
     "lareshiny": {
@@ -82191,8 +82767,8 @@
     },
     "latexSymb": {
       "name": "latexSymb",
-      "version": "0.4.2",
-      "sha256": "0p12dag85zvrzk3z3chynf2fbwwgf1fzypxgv6av013jgn0rdqcn",
+      "version": "1.0.0",
+      "sha256": "0sdmp474vb8spbd3gwcl3c01cbss9gpjpa1a9l87m056wx1p3fl1",
       "depends": ["purrr"]
     },
     "latexdiffr": {
@@ -82209,8 +82785,8 @@
     },
     "latrend": {
       "name": "latrend",
-      "version": "1.6.1",
-      "sha256": "1g5hhl8himv1g3v70vs42jsxn1h04knh73m6yhzkgc2bnj16hr2r",
+      "version": "1.6.2",
+      "sha256": "1p468y9bnifk2ady9skc6521yzg1lv50m7m7wsliq5k0j2k6vq21",
       "depends": ["R_utils", "Rdpack", "assertthat", "data_table", "foreach", "magrittr", "matrixStats", "rlang", "rmarkdown"]
     },
     "latte": {
@@ -82225,6 +82801,12 @@
       "sha256": "1xzrpy30irlzf3dy6pz5jnbd8p82xgfy5kin5bai0179jlmsc3s0",
       "depends": []
     },
+    "latticeDensity": {
+      "name": "latticeDensity",
+      "version": "1.2.7",
+      "sha256": "14znz7qfnrgixpcc48iyja1qqz102vanzayymzrv7wfail1rp8w6",
+      "depends": ["sp", "spam", "spatialreg", "spatstat", "spatstat_geom", "spdep", "splancs"]
+    },
     "latticeExtra": {
       "name": "latticeExtra",
       "version": "0.6-30",
@@ -82281,8 +82863,8 @@
     },
     "lavaangui": {
       "name": "lavaangui",
-      "version": "0.2.4",
-      "sha256": "0pnv3li6844h0802jp02z0r4pgj92ak5mr59hpj0l904ixhlfqag",
+      "version": "0.2.5",
+      "sha256": "1bh3apsq750fv268g6ws8m6m4w7sxclph2gzxr7kjh6f4lphzxpf",
       "depends": ["DT", "base64enc", "colorspace", "digest", "future", "haven", "igraph", "jsonlite", "lavaan", "plyr", "promises", "readr", "readxl", "shiny"]
     },
     "lavacreg": {
@@ -82803,8 +83385,8 @@
     },
     "lemon": {
       "name": "lemon",
-      "version": "0.5.0",
-      "sha256": "0d0x9mds241hm6armdb32zg4wkkvyy23q2cwk550lmxx2x6bb71w",
+      "version": "0.5.1",
+      "sha256": "0lwlpn3wpws3y79gd2amw8y8prg86wiznvj48ls9kwzy4mi0ma6v",
       "depends": ["ggplot2", "gridExtra", "gtable", "knitr", "lattice", "plyr", "scales"]
     },
     "lenght": {
@@ -82857,8 +83439,8 @@
     },
     "lessR": {
       "name": "lessR",
-      "version": "4.4.3",
-      "sha256": "12b74qwbc8pnxxy1hvp2wh4nl33za6hmj69g2m39vzdd7qgzniis",
+      "version": "4.4.4",
+      "sha256": "1is297rg8sjj4jfhrhk5ad3rsi1lmjlz0w2ca7ygmbxdkmizwq46",
       "depends": ["MASS", "colorspace", "ellipse", "kableExtra", "knitr", "lattice", "latticeExtra", "leaps", "openxlsx", "robustbase", "shiny", "xts", "zoo"]
     },
     "lessSEM": {
@@ -82879,6 +83461,12 @@
       "sha256": "1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd",
       "depends": ["MASS"]
     },
+    "letsHerp": {
+      "name": "letsHerp",
+      "version": "0.1.0",
+      "sha256": "001h53kixzx3vjiwn6ffm2ji40la3sf6kl1639ypgzfmk2bys6h5",
+      "depends": ["dplyr", "httr", "pbapply", "pbmcapply", "rvest", "stringr", "tidyr", "xml2"]
+    },
     "letsR": {
       "name": "letsR",
       "version": "5.0",
@@ -82941,9 +83529,9 @@
     },
     "lfl": {
       "name": "lfl",
-      "version": "2.2.1",
-      "sha256": "0x7lwbpigfbfmwr5mynrkb8d0x4wvl1w0kj68dgbqg46mwh7v0mi",
-      "depends": ["Rcpp", "e1071", "foreach", "forecast", "plyr", "tibble", "tseries", "zoo"]
+      "version": "2.3.0",
+      "sha256": "01pdbxx7dr0r6sadlkx25h1r5i6pmsv0r1sxd49w1k39cmbvn4sv",
+      "depends": ["Rcpp", "e1071", "foreach", "forecast", "plyr", "tibble", "tseries"]
     },
     "lfmm": {
       "name": "lfmm",
@@ -82953,8 +83541,8 @@
     },
     "lfproQC": {
       "name": "lfproQC",
-      "version": "1.4.0",
-      "sha256": "0ga5zwgqj5249kx7psnjzxj46v64npq6qvn8gl7hi7177r5ysgn9",
+      "version": "1.4.1",
+      "sha256": "0zlzbhs8a50m10hsn93nbmip8qg98xls5dwa54h1dzpvsx5sz8rk",
       "depends": ["Hmisc", "MASS", "VIM", "dplyr", "ggplot2", "laeken", "limma", "magrittr", "matrixStats", "pcaMethods", "plotly", "reshape", "reshape2", "tidyr", "tidyselect", "vsn"]
     },
     "lfstat": {
@@ -82995,14 +83583,14 @@
     },
     "lgr": {
       "name": "lgr",
-      "version": "0.4.4",
-      "sha256": "09x1vw6cnc1c0p0ylcz1q1vcxyaf1kljhh7ni3gl5jm19zii2h4c",
+      "version": "0.5.0",
+      "sha256": "1h0bg3f7hmf9ichv5dsy16ncb1z8nihzhvg5bfz1001ix9csb1f2",
       "depends": ["R6"]
     },
     "lgrExtra": {
       "name": "lgrExtra",
-      "version": "0.0.9",
-      "sha256": "1qjm6pz7s2nhx78cgc9si2mfcrqimpv2i11gqiznfxcy6rq2n3lp",
+      "version": "0.2.0",
+      "sha256": "0bqr8fr8xxndfdjv2xr0b306f2kv55wy386skbldw6a88ssgqbnw",
       "depends": ["R6", "data_table", "lgr"]
     },
     "lgrdata": {
@@ -83049,8 +83637,8 @@
     },
     "libdeflate": {
       "name": "libdeflate",
-      "version": "1.24-0",
-      "sha256": "1dbhnr6z1m2b0ykgqgkazyadczwifiihffay0zci51fh0lkmm848",
+      "version": "1.24-7",
+      "sha256": "1jq8wr2a9hzalpiilywankcpxgd3v7cy7xnf5xc4ff00ilbb6qal",
       "depends": []
     },
     "libgeos": {
@@ -83061,14 +83649,14 @@
     },
     "libimath": {
       "name": "libimath",
-      "version": "3.1.9-1",
-      "sha256": "1gxnbs3vh38a8m2nxjlaay8n4b654lad55m34akmdf1ahiwpamic",
+      "version": "3.1.9-4",
+      "sha256": "1q7hqbq84rk5q4fq3wnrhchm9nb087jkpq87p395mi84njbh7h05",
       "depends": []
     },
     "libopenexr": {
       "name": "libopenexr",
-      "version": "3.4.0",
-      "sha256": "03asa08aprylq3r3n2pbpjlw5kxl4qy816474ii6qaprhmxsv3kg",
+      "version": "3.4.0-4",
+      "sha256": "04ic2b8m35662yc7d5d0h1c4d9vz10nx1dmblqrbkfhnibad3530",
       "depends": ["libdeflate", "libimath"]
     },
     "libr": {
@@ -83187,8 +83775,8 @@
     },
     "lightr": {
       "name": "lightr",
-      "version": "1.8.0",
-      "sha256": "0pw2kdw4izhnlzis6mn52c3m8x3nhrhknlh6mk7i5ri8phv237w8",
+      "version": "1.9.0",
+      "sha256": "0g49l7cqg485svwfc07i87626mcdv13g99mvmlkgl2fhsm69dibr",
       "depends": ["future_apply", "progressr", "xml2"]
     },
     "lightsout": {
@@ -83229,8 +83817,8 @@
     },
     "likert": {
       "name": "likert",
-      "version": "1.3.5",
-      "sha256": "0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p",
+      "version": "1.3.5.1",
+      "sha256": "08dx4n6056fzlv2p6y6fi0w0alm36bb1wjcviq9vah251ds075n9",
       "depends": ["ggplot2", "gridExtra", "plyr", "psych", "reshape2", "xtable"]
     },
     "lilikoi": {
@@ -83247,8 +83835,8 @@
     },
     "limSolve": {
       "name": "limSolve",
-      "version": "2.0",
-      "sha256": "1gqi8gprvpdvvksjrxyf4693m6y7apdx0mw4jgrr7csjd36v82a0",
+      "version": "2.0.1",
+      "sha256": "0f7r5bkshgwjsyiwazyqxf0bg703f6q3j80318l3964c4vw51519",
       "depends": ["MASS", "lpSolve", "quadprog"]
     },
     "lime": {
@@ -83331,8 +83919,8 @@
     },
     "linelist": {
       "name": "linelist",
-      "version": "2.0.0",
-      "sha256": "1vf1807by3zym6nk9jbfy62sck1h1qqhzhbkyiadszaa6nkrin2d",
+      "version": "2.0.1",
+      "sha256": "05lcz5yiaf0d1dhrfxqmypqabcibryb5yl2bvy48h8k8dk69g9xm",
       "depends": ["checkmate", "rlang", "tidyselect"]
     },
     "linelistBayes": {
@@ -83413,12 +84001,6 @@
       "sha256": "01k15a88x574vcmgclglfrm5lm1jb97hgjwy13w388y4r45x27wk",
       "depends": ["R_utils", "brew", "devtools", "renv", "roxygen2", "rstudioapi", "sf", "terra", "xfun", "xml2", "yaml"]
     },
-    "linkcomm": {
-      "name": "linkcomm",
-      "version": "1.0-14",
-      "sha256": "15xm4c7sqpid1vjra250dnvdx98qgzbzmvaycf3zqqnqcmy5bw9n",
-      "depends": ["RColorBrewer", "dynamicTreeCut", "igraph"]
-    },
     "linkedInadsR": {
       "name": "linkedInadsR",
       "version": "0.1.0",
@@ -83577,8 +84159,8 @@
     },
     "lit": {
       "name": "lit",
-      "version": "1.0.0",
-      "sha256": "1n5avz33d041bl8b9khqbiyprjdrd5nj1n19134sfpqs7h0wcjzp",
+      "version": "1.0.1",
+      "sha256": "0d148s09cd6d4pqn9yg98x9nm1dr8i6yjsh7mf9a6jnnyx8z6z45",
       "depends": ["CompQuadForm", "Rcpp", "RcppArmadillo", "RcppEigen", "genio"]
     },
     "litRiddle": {
@@ -83607,14 +84189,14 @@
     },
     "literanger": {
       "name": "literanger",
-      "version": "0.1.1",
-      "sha256": "15y9jmpml0a5j5fafg7i7zgjxy17bcm7il8gb3cjj8nn2zphamy4",
+      "version": "0.2.0",
+      "sha256": "1rsf1f2p31kqjvkpkwfhsdl4fjcdqbffy38xdmxyzlm9q40qhqnh",
       "depends": ["Rcereal", "cpp11"]
     },
     "litteR": {
       "name": "litteR",
-      "version": "1.0.0",
-      "sha256": "0lb8vl13w60dci4ygxqi2ap4ay1b2ywn8zmyigkn251sz9j2f4q9",
+      "version": "1.0.1",
+      "sha256": "1j6wj3dg7lwq6kki0461pzy2k7jhkgn0h5cjh2aa7hgwp6d37s09",
       "depends": ["dplyr", "fs", "ggplot2", "purrr", "readr", "rlang", "rmarkdown", "stringr", "tidyr", "tidyselect", "yaml"]
     },
     "litterfitter": {
@@ -83745,8 +84327,8 @@
     },
     "lme4breeding": {
       "name": "lme4breeding",
-      "version": "1.0.63",
-      "sha256": "0sc3xkgk7s1kbryrja1svk90fkc6g6sd0ynimva3jj1wbjvj0a0y",
+      "version": "1.0.70",
+      "sha256": "1mn9knb7sgzgfhy4c30li8hikjnp07nqly1b8q3yq3vhi84ipjsf",
       "depends": ["Matrix", "crayon", "lme4"]
     },
     "lmeInfo": {
@@ -83851,12 +84433,6 @@
       "sha256": "0jkqm5cavixb1wfcw00k0pa6y8j252h6mhq5ldcz1qakp07rhzb4",
       "depends": ["Lmoments", "MASS", "goftest"]
     },
-    "lmreg": {
-      "name": "lmreg",
-      "version": "1.2",
-      "sha256": "02a4nqqcfkjlq21mpk8abd4lj4ib2nps3ndf7zgmzygkd1z0df18",
-      "depends": ["MASS"]
-    },
     "lmridge": {
       "name": "lmridge",
       "version": "1.2.2",
@@ -83877,8 +84453,8 @@
     },
     "lmtp": {
       "name": "lmtp",
-      "version": "1.5.2",
-      "sha256": "1blh19rgglbkjdzqka359kcic216f7dbx0sinrqibhdhfrkvyz1w",
+      "version": "1.5.3",
+      "sha256": "0wcsmc6xldrz3ni1czxyhq8k5p0ak1izfrpbqbbfkj7iwygcf9j0",
       "depends": ["R6", "SuperLearner", "checkmate", "cli", "data_table", "future", "generics", "ife", "isotone", "lifecycle", "nnls", "origami", "progressr"]
     },
     "lmviz": {
@@ -84039,8 +84615,8 @@
     },
     "locits": {
       "name": "locits",
-      "version": "1.7.7",
-      "sha256": "13y313z0wmhrqfzgr3dbcmkdg6507p0wdvyxrnz1vm0rjwqv4911",
+      "version": "1.7.8",
+      "sha256": "07pl34c6mgjym8358kypxlkbnzk16ci5b05lz27194qrbphlhy2h",
       "depends": ["igraph", "wavethresh"]
     },
     "locpol": {
@@ -84357,8 +84933,8 @@
     },
     "longevity": {
       "name": "longevity",
-      "version": "1.2",
-      "sha256": "0jr0x1yy56va08mxz7c7nrpd5dsfdmqxbxlhzic87g1czkc1m774",
+      "version": "1.2.1",
+      "sha256": "0d1sfbq0z6b46yzwvqm8sbjk73arj69gy8dx189x816rl2qd460h",
       "depends": ["Rcpp", "RcppArmadillo", "Rsolnp", "numDeriv", "rlang"]
     },
     "longit": {
@@ -84399,8 +84975,8 @@
     },
     "longmemo": {
       "name": "longmemo",
-      "version": "1.1-3",
-      "sha256": "0c4ahci4bf630pcm9zfjwipbq2rb7yi55w91yi6qy39fzdj4v568",
+      "version": "1.1-4",
+      "sha256": "1yd06j4zr3k7b4rpk9swvym8347wb06n3czpnsgqlr7zqg4lj21r",
       "depends": []
     },
     "longmixr": {
@@ -84447,8 +85023,8 @@
     },
     "lookup": {
       "name": "lookup",
-      "version": "1.0",
-      "sha256": "0ncmj1df64088qv0g2c0wd8n43qmi15358mz289hakg6z4h0dmyi",
+      "version": "1.1",
+      "sha256": "0ppxi97rw1sp71x9knbs59vd4vhxnc3kswd61i9ab5w2w6qbym4b",
       "depends": []
     },
     "lookupTable": {
@@ -84459,8 +85035,8 @@
     },
     "loon": {
       "name": "loon",
-      "version": "1.4.2",
-      "sha256": "037b7h78fdbrpjc02gs8h9dx06inkkj19haiap6y36828ppip8ap",
+      "version": "1.4.3",
+      "sha256": "0rxbr93p4j14x5mh60l73jq8lg6gbj61ih5na4jv3p2j06l2mn9a",
       "depends": ["gridExtra"]
     },
     "loon_data": {
@@ -84489,9 +85065,9 @@
     },
     "loopevd": {
       "name": "loopevd",
-      "version": "1.0.0",
-      "sha256": "15l3kprp1yj3byciaijck6k957izypjfhfwmvpzvwnbvdrhb5dp4",
-      "depends": ["evd", "ncdf4", "terra"]
+      "version": "1.0.2",
+      "sha256": "0g75m3sjkyzp3b2d3hcmyw68dz1az1g705816irg0inkqc0yfwvc",
+      "depends": ["evd", "ismev", "ncdf4", "terra"]
     },
     "lorad": {
       "name": "lorad",
@@ -84537,8 +85113,8 @@
     },
     "lotri": {
       "name": "lotri",
-      "version": "1.0.0",
-      "sha256": "15myyigrlfc8gmasaf3z9g3dy44c19814ydvql4pi4867cfmgi4x",
+      "version": "1.0.1",
+      "sha256": "0qg69a41fr0py6rqj1w7sv84rvh8mxf1d4djyniaq5vbqrkf3ax3",
       "depends": ["checkmate", "cpp11", "cpp11armadillo", "crayon"]
     },
     "lovecraftr": {
@@ -84591,8 +85167,8 @@
     },
     "lpda": {
       "name": "lpda",
-      "version": "1.2.0",
-      "sha256": "0hhh4hz7cmmna4rsdwagy9cm0kv6lvv3qzcjnbbs762hbxfj43n7",
+      "version": "1.2.1",
+      "sha256": "0i2qmjgvqr6hqbx820achm56shqb0nd4jn1w1v806kr3n9gx006m",
       "depends": ["Rglpk", "multiway"]
     },
     "lpdensity": {
@@ -84627,8 +85203,8 @@
     },
     "lpridge": {
       "name": "lpridge",
-      "version": "1.1-0",
-      "sha256": "1zc0jn7j15yb3qj5sxs0nnj8knrzhm8899kyps6fp10vm2wwdnd1",
+      "version": "1.1-1",
+      "sha256": "0xkp22v8401av7l0qpmbffkg8h66mkic87gdp3nyzjk9agx4jzkf",
       "depends": []
     },
     "lqmix": {
@@ -84669,8 +85245,8 @@
     },
     "lrstat": {
       "name": "lrstat",
-      "version": "0.2.14",
-      "sha256": "0i4303v7h8lil5lg67ff09s8cvy7rnmgi3vhlrggfc8qc4nm7wjc",
+      "version": "0.2.15",
+      "sha256": "0f4r5r3i706qi52fih4lx1rkc990pf37332dni5callzfjw88f4v",
       "depends": ["Rcpp", "lpSolve", "mvtnorm", "shiny"]
     },
     "lsa": {
@@ -84705,8 +85281,8 @@
     },
     "lsirm12pl": {
       "name": "lsirm12pl",
-      "version": "1.3.4",
-      "sha256": "0bqlclpyask6lms8y45dspaj6slxz8f8wf17v5n086d26bbb7d66",
+      "version": "1.3.5",
+      "sha256": "0v2pdw0g56qz1z0cm3q2sxs92qry21xfv7pspb55g68bkyfjjjqb",
       "depends": ["GPArotation", "MCMCpack", "Rcpp", "RcppArmadillo", "coda", "dplyr", "fpc", "ggplot2", "gridExtra", "kernlab", "pROC", "plotly", "plyr", "purrr", "rlang", "spatstat", "spatstat_geom", "spatstat_random", "tidyr"]
     },
     "lsl": {
@@ -84733,12 +85309,6 @@
       "sha256": "1q6y0l0s8wz7jqhvia7bzhas8ipa7v9jary1n9hr1zj2j079a38v",
       "depends": ["emmeans"]
     },
-    "lsnstat": {
-      "name": "lsnstat",
-      "version": "1.0.1",
-      "sha256": "0ig1ndbnng052ww0fmw5k7lwb0whzg9ychww40h7mdg3dpiyswi5",
-      "depends": ["dplyr", "httr", "jsonlite"]
-    },
     "lsoda": {
       "name": "lsoda",
       "version": "1.2",
@@ -84855,8 +85425,8 @@
     },
     "lubrilog": {
       "name": "lubrilog",
-      "version": "1.1.0",
-      "sha256": "166787agrp4a0gnm8vs72q6cgr1vha1g3d6yhdsla76l394rzq5n",
+      "version": "1.3.0",
+      "sha256": "0y6daqwks4sb5h1789z01y0qp80gfrprxarcr2an71ijfvp8cksf",
       "depends": ["cli", "lubridate"]
     },
     "lucas": {
@@ -84873,8 +85443,8 @@
     },
     "ludic": {
       "name": "ludic",
-      "version": "0.2.0",
-      "sha256": "08j6y65dxalyrcp14mry7a393if42lfh8smkq1q70dsdk6645j7d",
+      "version": "0.2.1",
+      "sha256": "19g38jr9im6shla7paldfddm2gz8ywm7dbqis9slppy9fqpm8dlw",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "fGarch", "landpred", "rootSolve"]
     },
     "lue": {
@@ -84915,9 +85485,9 @@
     },
     "luz": {
       "name": "luz",
-      "version": "0.4.0",
-      "sha256": "02p1h6rhjvdkw10az1zzz0fd4l8nhn04bwkr71l73a94fbwm6dpz",
-      "depends": ["R6", "cli", "coro", "ellipsis", "fs", "generics", "glue", "magrittr", "prettyunits", "progress", "purrr", "rlang", "torch", "zeallot"]
+      "version": "0.5.0",
+      "sha256": "0agpcs4m3yil19bzanj08qqnsirnld4pdkqwzfyynalsi7hgvmzl",
+      "depends": ["R6", "cli", "coro", "fs", "generics", "glue", "magrittr", "prettyunits", "progress", "purrr", "rlang", "torch", "zeallot"]
     },
     "luzlogr": {
       "name": "luzlogr",
@@ -84973,6 +85543,12 @@
       "sha256": "02ij8nrgwzz4201kiskvsh101y2qj896k1h7kqhf5zp2j98pipmr",
       "depends": ["cpp11"]
     },
+    "m2b": {
+      "name": "m2b",
+      "version": "1.1.0",
+      "sha256": "0bfjm0qs5nb0642p3991zy4zpqkwf0wqqdv35ydm72xhrbdsgzl6",
+      "depends": ["caTools", "caret", "geosphere", "ggplot2", "randomForest"]
+    },
     "m2r": {
       "name": "m2r",
       "version": "1.0.3",
@@ -85041,8 +85617,8 @@
     },
     "mHMMbayes": {
       "name": "mHMMbayes",
-      "version": "1.1.0",
-      "sha256": "1z13zzim90akaz82dbp8s81zyhcd3xmx3wmqvkcaq5wqh2p64s7a",
+      "version": "1.1.1",
+      "sha256": "1syy1nrsx8j8rb7zz6lamplvylk9n1xkq1h79dql0hvz59hnbvws",
       "depends": ["MCMCpack", "Rcpp", "Rdpack", "mvtnorm"]
     },
     "mMARCH_AC": {
@@ -85129,12 +85705,6 @@
       "sha256": "1sq0i4zdd0r55qzlsmx9p88hxyvbzhaga2bx2akxmz7x7crqbz2j",
       "depends": ["LowRankQP", "doParallel", "foreach", "icenReg", "iterators", "mnormt", "quadprog", "rlang", "survival"]
     },
-    "macc": {
-      "name": "macc",
-      "version": "1.0.1",
-      "sha256": "1qj4mlikbqrxa6m46527xmxdbk7b3l95z6jdgpmi0ifywjiv52a4",
-      "depends": ["MASS", "car", "lme4", "nlme", "optimx"]
-    },
     "macleish": {
       "name": "macleish",
       "version": "0.3.9",
@@ -85221,9 +85791,9 @@
     },
     "madshapR": {
       "name": "madshapR",
-      "version": "1.1.0",
-      "sha256": "035hxkkhxi68id1f3q9qyl82kzphq9als60x7wv03gmzi6fn85zy",
-      "depends": ["DT", "bookdown", "crayon", "dplyr", "fabR", "forcats", "fs", "ggplot2", "haven", "janitor", "knitr", "lifecycle", "lubridate", "readr", "rlang", "stringr", "tidyr", "tidytext"]
+      "version": "2.0.0",
+      "sha256": "1nj8i4w0v5gikc6y3j4kivvzrd2qgdiadggyl6f9kjl0lphc8lvj",
+      "depends": ["DT", "bookdown", "crayon", "dplyr", "fabR", "forcats", "fs", "ggplot2", "haven", "janitor", "knitr", "lubridate", "readr", "rlang", "stringr", "tidyr"]
     },
     "madsim": {
       "name": "madsim",
@@ -85233,8 +85803,8 @@
     },
     "maestro": {
       "name": "maestro",
-      "version": "0.6.0",
-      "sha256": "158rzgf3c7klv8k0d8lqbvzrlicqbk56scwdnnjp8qi7p7bf27l1",
+      "version": "0.6.1",
+      "sha256": "1fr04177q2876v45c23n9r8z4wy2afrlb9vncrxd3kgzc6p469wm",
       "depends": ["R6", "R_utils", "cli", "dplyr", "glue", "lifecycle", "logger", "lubridate", "purrr", "rlang", "roxygen2", "tictoc", "timechange"]
     },
     "mafR": {
@@ -85309,12 +85879,6 @@
       "sha256": "1ljmrrm36y31db5z4cl863ap8k3jcaxk0qzy3f0cn6iag4zzigx2",
       "depends": []
     },
-    "maic": {
-      "name": "maic",
-      "version": "0.1.4",
-      "sha256": "0ba0kg5kgnn2g33mmhj9x8ichckyybbpn5xxc56qxvk2w2xv2wpj",
-      "depends": ["Hmisc", "matrixStats", "weights"]
-    },
     "maicChecks": {
       "name": "maicChecks",
       "version": "0.2.0",
@@ -85363,12 +85927,6 @@
       "sha256": "0ma8dm7x07wwm94ginsah778lkwqb3nlqpydmn7g22zvbariail7",
       "depends": ["cluster", "prismatic", "terra"]
     },
-    "makeProject": {
-      "name": "makeProject",
-      "version": "1.0",
-      "sha256": "09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca",
-      "depends": []
-    },
     "makedummies": {
       "name": "makedummies",
       "version": "1.2.1",
@@ -85513,16 +86071,28 @@
       "sha256": "1qlmpg4afplhi4m3maws0njx11am28f7hry9rb3k9mxlvss6cr66",
       "depends": []
     },
+    "mantar": {
+      "name": "mantar",
+      "version": "0.1.0",
+      "sha256": "1200wwy9ijmp3jll19m239swbgpmwlqg685ykgjg1b6368sdwk1v",
+      "depends": []
+    },
+    "mantis": {
+      "name": "mantis",
+      "version": "0.4.3",
+      "sha256": "1y2ifn5bz5mz62vrl84pn43r7mx65p1zqh5s9zmk7hnfhfcklh5z",
+      "depends": ["dplyr", "dygraphs", "ggplot2", "htmltools", "knitr", "purrr", "reactable", "rmarkdown", "scales", "tidyr", "xts"]
+    },
     "manydata": {
       "name": "manydata",
-      "version": "1.0.2",
-      "sha256": "00s8v3s8wap9rns4qssna6cp9q9j3nk2hdhj3jmndxx10xici6xz",
+      "version": "1.0.3",
+      "sha256": "10sc6ms9xqjl999jb8mwvrw0xdx4ylnsgb8sd0iq79hfaikiln0a",
       "depends": ["cli", "dplyr", "dtplyr", "ggplot2", "httr", "jsonlite", "messydates", "purrr", "remotes", "stringr", "tidyr"]
     },
     "manydist": {
       "name": "manydist",
-      "version": "0.4.3",
-      "sha256": "114w4ylinkp8f5c82xlkzlnz272z0ph099xi81ypb95bpvb9whzk",
+      "version": "0.4.8",
+      "sha256": "1j12sc1x5615pb6aar5y76g3lpcq5gf41399x1w7jlxkymgrjkx6",
       "depends": ["Matrix", "Rfast", "cluster", "data_table", "distances", "dplyr", "entropy", "fastDummies", "forcats", "fpc", "magrittr", "philentropy", "purrr", "readr", "recipes", "rsample", "tibble", "tidyr"]
     },
     "manymodelr": {
@@ -85533,8 +86103,8 @@
     },
     "manymome": {
       "name": "manymome",
-      "version": "0.2.8",
-      "sha256": "036pvkwh4wqsjmqk3bjsr1q08cz5yd10lwbjhmw9b3zg801d6yxk",
+      "version": "0.2.9",
+      "sha256": "004h739ypci56sbqq2yamw2q3653lws5i5wclsridv9j5fnm3fdv",
       "depends": ["MASS", "boot", "ggplot2", "igraph", "lavaan", "pbapply"]
     },
     "manymome_table": {
@@ -85545,8 +86115,8 @@
     },
     "manynet": {
       "name": "manynet",
-      "version": "1.3.2",
-      "sha256": "1nspzw0q80nr5w6pmjaggxy1mim872m36ik9caq2h1lydsaqm6vj",
+      "version": "1.5.1",
+      "sha256": "1kwmhag6lb7cxb97gqrh32c04inizy4yvkqa276v2n8lypalbsjl",
       "depends": ["cli", "dplyr", "ggplot2", "ggraph", "igraph", "network", "pillar", "tidygraph"]
     },
     "maotai": {
@@ -85629,15 +86199,15 @@
     },
     "mapgl": {
       "name": "mapgl",
-      "version": "0.2.2",
-      "sha256": "1g1flhb547j2m1fkvf6v8jhj4a1z1bxj8lxswbx9n6zqc5r86z8s",
+      "version": "0.3.2",
+      "sha256": "13wngr0czbfm938q5014iah3lfaqfmragq50ds5njgdffrfypkb6",
       "depends": ["base64enc", "classInt", "geojsonsf", "htmltools", "htmlwidgets", "rlang", "sf", "shiny", "terra", "viridisLite"]
     },
     "mapi": {
       "name": "mapi",
-      "version": "1.0.5",
-      "sha256": "1yljvapzkb43i2sbqsmn5aqp95hm8gjkz8m41x1chwyfddrzjsbw",
-      "depends": ["Rcpp", "data_table", "pbapply", "sf"]
+      "version": "1.1.4",
+      "sha256": "0qwaqgwms2qx5zz5c9n0zziyc5snvfpvsyvjinb64myghyk7d3nj",
+      "depends": ["Rcpp", "data_table", "doParallel", "fmesher", "foreach", "s2", "sf"]
     },
     "mapindia": {
       "name": "mapindia",
@@ -85659,8 +86229,8 @@
     },
     "maplegend": {
       "name": "maplegend",
-      "version": "0.2.0",
-      "sha256": "0phf116pf8hfs7di7hwjj7777wjzlw00hmn25ldkg7s8dbhsjhy6",
+      "version": "0.3.0",
+      "sha256": "1papxqrpg36y0f397asx730k19qkjfgxz4097gqxy9bsg2r0wc5c",
       "depends": []
     },
     "mapme_biodiversity": {
@@ -85683,8 +86253,8 @@
     },
     "mappeR": {
       "name": "mappeR",
-      "version": "2.1.0",
-      "sha256": "1ph2kslylbjwjfals697f7ggj55risbsf5f9p78hxwq5vfccbldz",
+      "version": "2.3.0",
+      "sha256": "1bg62yap2xgwdjw0l0zv3ackmnwglpajkz1mbsr5wqcg870y9p20",
       "depends": ["fastcluster"]
     },
     "mappings": {
@@ -85695,8 +86265,8 @@
     },
     "mapplots": {
       "name": "mapplots",
-      "version": "1.5.2",
-      "sha256": "064a3jc7p4wh5x8rxmjap6kqkg19zfkq8ac820d9sm35d0fia3pd",
+      "version": "1.5.3",
+      "sha256": "104jv650is1hhcnq8xacigkvvlal62lknz6m7i4b9g3g9yp45bix",
       "depends": []
     },
     "mappoly": {
@@ -85755,8 +86325,8 @@
     },
     "mapsf": {
       "name": "mapsf",
-      "version": "0.12.0",
-      "sha256": "1rxydssi9f0n9kgkvlcirzpdsnxn9a3gd7panljm1lqa92aqh1ck",
+      "version": "1.0.0",
+      "sha256": "0nkvnjlyg0d1ij9l63jwqlayca6ki837ikrisii8pdfxjmyq8yyw",
       "depends": ["classInt", "maplegend", "s2", "sf"]
     },
     "maptiles": {
@@ -85773,8 +86343,8 @@
     },
     "maptree": {
       "name": "maptree",
-      "version": "1.4-8",
-      "sha256": "1x35nk4fi2b62krcvcv187n5sbqrgvw4pbm7r19ps3jlanpi5ksm",
+      "version": "1.4-9",
+      "sha256": "1mm6jd7mswhvl8vaapbqwypz8k8xi42s2j239xi8jy0kda61ip6x",
       "depends": ["cluster", "rpart"]
     },
     "mapview": {
@@ -85797,8 +86367,8 @@
     },
     "maraca": {
       "name": "maraca",
-      "version": "1.0.0",
-      "sha256": "130ammd7vkccw8j3wy5rrglfrcgivzn2qygfwcrxmfiv4xy8w9i0",
+      "version": "1.0.1",
+      "sha256": "1mfj74pzi57pwp9zmjn8vxmwl61gbs75rpxnpjh7v0qbaf3h10bs",
       "depends": ["checkmate", "dplyr", "ggplot2", "hce", "lifecycle", "patchwork", "tidyr"]
     },
     "marble": {
@@ -85845,8 +86415,8 @@
     },
     "marginaleffects": {
       "name": "marginaleffects",
-      "version": "0.27.0",
-      "sha256": "1fj5aljdssll3ma5ds5ackgpgi3bliy6zk73d3pmmhjqcmmlnxiz",
+      "version": "0.28.0",
+      "sha256": "1x0i2sbwc2blkzdayb4r14dhnwphzl5ar4imqvy2acvfvfhzpp6c",
       "depends": ["Formula", "Rcpp", "RcppEigen", "backports", "checkmate", "data_table", "generics", "insight", "rlang"]
     },
     "marginalizedRisk": {
@@ -85855,6 +86425,12 @@
       "sha256": "1f0qql4nvd5bkvkx0wn8w7fjzplabm5is8ms8rl6bpayfhaa6zai",
       "depends": []
     },
+    "marginme": {
+      "name": "marginme",
+      "version": "0.1.0",
+      "sha256": "1vgnwiclnz0drh4cllj78584w4panbkjpj8sfb2d6qakbwfi37fp",
+      "depends": ["glmmrBase"]
+    },
     "margins": {
       "name": "margins",
       "version": "0.3.28",
@@ -85953,8 +86529,8 @@
     },
     "marmap": {
       "name": "marmap",
-      "version": "1.0.10",
-      "sha256": "0zmik6hpc44syknn7k9pbmy01jpnlp4sc9n3rhslrpnks39l0hvq",
+      "version": "1.0.12",
+      "sha256": "15c8q3yiq10q7l5navk1xrjxqy89bap9hh4mvlyja4b98y5j7rbf",
       "depends": ["DBI", "RSQLite", "adehabitatMA", "gdistance", "geosphere", "ggplot2", "ncdf4", "plotrix", "raster", "reshape2", "shape", "sp"]
     },
     "marqLevAlg": {
@@ -86013,8 +86589,8 @@
     },
     "massProps": {
       "name": "massProps",
-      "version": "0.3.2",
-      "sha256": "178f4rvlwdp4nl9jy47j12b2mj23dlsx06prkg7l4anf7283vqq5",
+      "version": "0.3.3",
+      "sha256": "13pvpi9ifbmb1m52mfyk41jdmwy8csf9rbs5i6bl05j6sv53cjw5",
       "depends": ["rollupTree"]
     },
     "masscor": {
@@ -86127,9 +86703,9 @@
     },
     "maths_genealogy": {
       "name": "maths.genealogy",
-      "version": "0.1.2",
-      "sha256": "1dzwwlpjqpvh8q01hq37852jqlh6avii5mbr5v5ny28ngmzn0i8q",
-      "depends": ["checkmate", "cli", "httr2", "jsonlite", "later", "rlang", "rvest", "websocket"]
+      "version": "0.1.4",
+      "sha256": "1sia676vd6i3070r8g3sahswfyf7qkm9v3zq8w2r7gkp7q9jcgcj",
+      "depends": ["checkmate", "cli", "curl", "httr2", "jsonlite", "later", "rlang", "rvest", "websocket"]
     },
     "matlab": {
       "name": "matlab",
@@ -86361,8 +86937,8 @@
     },
     "maxstablePCA": {
       "name": "maxstablePCA",
-      "version": "0.1.1",
-      "sha256": "02lxvkg9ia25cvwppf8qf84mwzjkfc8w9acc99wnisddrdq7l1h2",
+      "version": "0.1.2",
+      "sha256": "1gm3lh31na42iqmzj0q9dprq17h4qx2g1g6v9bpdb05vbryxwibn",
       "depends": ["nloptr"]
     },
     "maxstat": {
@@ -86377,12 +86953,6 @@
       "sha256": "11ajilchzl433790i90hx9qja3vixzzgx5k35pf9xryba6xbdchl",
       "depends": ["magrittr"]
     },
-    "mazeGen": {
-      "name": "mazeGen",
-      "version": "0.1.3",
-      "sha256": "192xygg3l4rpqp49sgd5hpp4h3f8wjhyldn0l8abxhsks7jd2kfb",
-      "depends": ["igraph"]
-    },
     "mazealls": {
       "name": "mazealls",
       "version": "0.2.0",
@@ -86409,9 +86979,9 @@
     },
     "mbX": {
       "name": "mbX",
-      "version": "0.1.3",
-      "sha256": "1pmdnj8wa4fvfpf22qvvfnp7l4hvv1pa19had7z3skgimawl3krr",
-      "depends": ["dplyr", "ggplot2", "openxlsx", "readxl", "tidyr"]
+      "version": "0.2.0",
+      "sha256": "0ngg5jz25hqgdd992cn1lgagwr9d33qaryn8n50dbc7rh0daxpjd",
+      "depends": ["FSA", "dplyr", "ggplot2", "multcompView", "openxlsx", "readxl", "rstatix", "tibble", "tidyr"]
     },
     "mbbe": {
       "name": "mbbe",
@@ -86553,8 +87123,8 @@
     },
     "mcboost": {
       "name": "mcboost",
-      "version": "0.4.3",
-      "sha256": "17zflvafz6w91lxbr8saasxp9bn18bla1jqg53fka2k8fnziz4g8",
+      "version": "0.4.4",
+      "sha256": "14svsgkq11zy0l4nwr7f8ri68b3cfmzygqj20bbfcy42470hkvwr",
       "depends": ["R6", "backports", "checkmate", "data_table", "glmnet", "mlr3", "mlr3misc", "mlr3pipelines", "rmarkdown", "rpart"]
     },
     "mcca": {
@@ -86679,16 +87249,10 @@
     },
     "mcmcensemble": {
       "name": "mcmcensemble",
-      "version": "3.1.0",
-      "sha256": "0cbld6yr91jzi084pkzvfhqlqympqv9f91sj5gxvannnwszw3454",
+      "version": "3.2.0",
+      "sha256": "0hdcgh8cc5b5mwx2qp1h7y1fhwq45jqx0w9gcx8r8g2jry3lzwj8",
       "depends": ["future_apply", "progressr"]
     },
-    "mcmcplots": {
-      "name": "mcmcplots",
-      "version": "0.4.3",
-      "sha256": "0187z79gmvcrwqybxh3ckhcrqi0nqhvcvlczgxfkpq95y5czprdq",
-      "depends": ["coda", "colorspace", "denstrip", "sfsmisc"]
-    },
     "mcmcr": {
       "name": "mcmcr",
       "version": "0.6.2",
@@ -86755,6 +87319,12 @@
       "sha256": "1b1g92sw5x2rz21hl6fnfqc9q1bhawmbj8f4pbq6llljxb85k0id",
       "depends": []
     },
+    "mcptools": {
+      "name": "mcptools",
+      "version": "0.1.0",
+      "sha256": "1b3y1xbfajrpbw2v3h3z2gi5zvpz4g0y2wpnbfp1n87dxd4gimh6",
+      "depends": ["cli", "ellmer", "jsonlite", "nanonext", "processx", "promises", "rlang"]
+    },
     "mcr": {
       "name": "mcr",
       "version": "1.3.3.1",
@@ -86917,6 +87487,12 @@
       "sha256": "1r4cz49h1sp1kl1sjqapadhd49lpdnr48w9xbwgpfh2ghwxfcval",
       "depends": ["lubridate", "parsedate"]
     },
+    "mdsOpt": {
+      "name": "mdsOpt",
+      "version": "0.7-7",
+      "sha256": "0frf1ll0618m29xyqsh1v0fzb3rw5dchn7pqcm9vy0sr9d8dahx1",
+      "depends": ["animation", "clusterSim", "plotrix", "smacof", "spdep", "symbolicDA"]
+    },
     "mdscore": {
       "name": "mdscore",
       "version": "0.1-3",
@@ -87003,8 +87579,8 @@
     },
     "mecoturn": {
       "name": "mecoturn",
-      "version": "0.3.0",
-      "sha256": "1qr7p50wplg3nwvaz595nxfrf5b1dc8l4y13jx65r8kvksqrl07g",
+      "version": "0.3.1",
+      "sha256": "1svwv9510kqdxbb1mmdl5hk0ndwn59c35lyvj556fig1b2f640rq",
       "depends": ["GUniFrac", "R6", "betareg", "ggplot2", "ggpubr", "glmmTMB", "lmerTest", "magrittr", "microeco"]
     },
     "medExtractR": {
@@ -87093,8 +87669,8 @@
     },
     "medparser": {
       "name": "medparser",
-      "version": "0.1.0",
-      "sha256": "1xgylvgjcaxw49sy65chwr56iinsmfm0bj32mw1f4ssc6l0bm2ab",
+      "version": "0.2.0",
+      "sha256": "0swc2glm59wdcl4nscm88k7mks79g24r7n6xivabpvbqb1yk8p93",
       "depends": []
     },
     "meerva": {
@@ -87111,14 +87687,14 @@
     },
     "mefa": {
       "name": "mefa",
-      "version": "3.2-9",
-      "sha256": "1rllkxp218qsa1c0aaa5zdky5bh2rzqbhdc2n14bmvv4jlgzrl8c",
+      "version": "3.2-10",
+      "sha256": "1vcq3ym41q6rj8xrp9s00d2iw52z699v39rd3blsnmv0x5pnwipq",
       "depends": []
     },
     "mefa4": {
       "name": "mefa4",
-      "version": "0.3-11",
-      "sha256": "02npawccc316vwgmk0yna7wvlxzsbdishxzmfd4wgl7g218wjk3m",
+      "version": "0.3-12",
+      "sha256": "19rna5h5rkcgc467qvrw7ccjsm3nad4daj21irkmf5j5z0cyyi43",
       "depends": ["Matrix"]
     },
     "meifly": {
@@ -87153,8 +87729,8 @@
     },
     "mem": {
       "name": "mem",
-      "version": "2.18",
-      "sha256": "1jz2zadwm9gvlgfr1dvi8m6p3zm3bjz4n4apkbpj8g594ghcbrpx",
+      "version": "2.19",
+      "sha256": "07ml120qdp3idh9838bnmw37l5y7ixlrp1fpfx4jv0i642fys2b0",
       "depends": ["EnvStats", "RColorBrewer", "RcppRoll", "boot", "dplyr", "ggplot2", "mclust", "purrr", "sm", "tidyr"]
     },
     "memapp": {
@@ -87177,8 +87753,8 @@
     },
     "memgene": {
       "name": "memgene",
-      "version": "1.0.2",
-      "sha256": "1f1v651vab4b3bfxn8wp5p848h6vy7ylr52zirwhnhxj37fzhkq6",
+      "version": "1.0.3",
+      "sha256": "0gmim6c5rqwgvcs0gpjxlfkvnaw3x1wiz9w4jjc9jqxhzpd595pa",
       "depends": ["ade4", "gdistance", "raster", "sp", "vegan"]
     },
     "memify": {
@@ -87199,12 +87775,6 @@
       "sha256": "1gqdb8y2khcnd1h2906kz1k7x58lw2ri48s9glfjq6whpj6bzpdk",
       "depends": ["digest"]
     },
-    "memochange": {
-      "name": "memochange",
-      "version": "1.1.2",
-      "sha256": "04qv201vcyfipp7p32i9b1paanimbi3h39mzsx26b7nm46pp1nws",
-      "depends": ["LongMemoryTS", "forecast", "fracdiff", "longmemo", "sandwich", "strucchange"]
-    },
     "memofunc": {
       "name": "memofunc",
       "version": "1.0.2",
@@ -87301,6 +87871,12 @@
       "sha256": "061q6b8603jbvlqkl6ddcmw1rgy53sqbxbsxhv218f7px392b1vf",
       "depends": ["FNN", "Rcpp", "RcppArmadillo", "dplyr", "glue", "magrittr", "rlang"]
     },
+    "mesonet": {
+      "name": "mesonet",
+      "version": "0.0.1",
+      "sha256": "13c3cijw6g0h4dcr07xxrmkgp0ziwcxdk5hw7b3g7r5pajn7nl75",
+      "depends": ["units"]
+    },
     "messaging": {
       "name": "messaging",
       "version": "0.1.0",
@@ -87345,8 +87921,8 @@
     },
     "meta": {
       "name": "meta",
-      "version": "8.1-0",
-      "sha256": "1cgfyyyc40s24a1aw6jpha99p42pd6h75sp0cbpsig9xxzg9rrb5",
+      "version": "8.2-0",
+      "sha256": "1b66ki7px7ns6pmpki0kvw1wsfk7dngw74v6izxavix125xr3mkd",
       "depends": ["CompQuadForm", "dplyr", "ggplot2", "lme4", "magrittr", "metadat", "metafor", "purrr", "readr", "scales", "stringr", "tibble", "xml2"]
     },
     "meta_shrinkage": {
@@ -87399,9 +87975,9 @@
     },
     "metaGE": {
       "name": "metaGE",
-      "version": "1.2.1",
-      "sha256": "0kpviym3sfz005xq4mrrfrak07wpl6cm48m7xn2gyf1kl5jqx1c7",
-      "depends": ["Rfast", "corrplot", "data_table", "dplyr", "emdbook", "furrr", "future", "ggplot2", "ggrepel", "gplots", "ks", "purrr", "qqman", "stringr", "tibble", "tidyr", "viridis", "yarrr"]
+      "version": "1.2.2",
+      "sha256": "0ida7vksm5irh9vmm6jk2wsjfgxjrv5qr2mwa9xcq09mfp8yxsfb",
+      "depends": ["Rfast", "corrplot", "data_table", "dplyr", "emdbook", "furrr", "future", "ggplot2", "ggrepel", "gplots", "ks", "purrr", "qqman", "stringr", "tibble", "tidyr", "viridis"]
     },
     "metaHelper": {
       "name": "metaHelper",
@@ -87505,11 +88081,17 @@
       "sha256": "0aiz10wjb24p52hx5srmws7myncjdvhd8kxbnxyaxg31wgxl3183",
       "depends": ["dplyr", "forcats", "ggplot2", "magrittr", "purrr", "rlang", "shiny", "stringr", "tibble", "tidyr", "tidyselect"]
     },
+    "metacor": {
+      "name": "metacor",
+      "version": "1.1.2",
+      "sha256": "0slc49j67zchabv6v6rphx6kb6axh7k1222yj84a1fb7f5g56dv4",
+      "depends": ["officer", "stringr"]
+    },
     "metacore": {
       "name": "metacore",
-      "version": "0.1.3",
-      "sha256": "06ba9p1by6hfagj0s43b6dwwfci5fczl2fr7kw3cchqsr90y3vfr",
-      "depends": ["R6", "dplyr", "magrittr", "purrr", "readxl", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "xml2"]
+      "version": "0.2.1",
+      "sha256": "05sbj0kcl86farm8ps12zljd3c4l573rjahfbc8bzy8310x8bd0z",
+      "depends": ["R6", "cli", "dplyr", "magrittr", "purrr", "readxl", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "xml2"]
     },
     "metadat": {
       "name": "metadat",
@@ -87549,9 +88131,9 @@
     },
     "metaforest": {
       "name": "metaforest",
-      "version": "0.1.4",
-      "sha256": "1b578s08621x5g2sqgi88sdlknq3zaql5xbhdggzml8c0n7lhbc1",
-      "depends": ["data_table", "ggplot2", "gtable", "metafor", "ranger"]
+      "version": "0.1.5",
+      "sha256": "0bi53dkqsgivqqzl0nxxrsjlgfgwx1g7sxp6wng924pzxdzn0sw9",
+      "depends": ["data_table", "ggplot2", "gtable", "metadat", "metafor", "ranger"]
     },
     "metafuse": {
       "name": "metafuse",
@@ -87561,8 +88143,8 @@
     },
     "metagam": {
       "name": "metagam",
-      "version": "0.4.0",
-      "sha256": "1kpxf2jxbx13if3ir9iqsqbdg6gg0l9pa3qnxmff4w5dd59by5kd",
+      "version": "0.4.1",
+      "sha256": "1d9q78bkg204788lp394sxy6jks8fbpyh6vndrxjjlpnsp5pglz3",
       "depends": ["ggplot2", "metafor", "mgcv", "rlang"]
     },
     "metagear": {
@@ -87673,6 +88255,12 @@
       "sha256": "17j3xivpyq17is5vzmca9zck6dryzfnrzddvppik4ml3xq122br9",
       "depends": ["BH", "Formula", "Rcpp", "RcppArmadillo", "RcppProgress", "ggplot2", "gridExtra"]
     },
+    "metaphonebr": {
+      "name": "metaphonebr",
+      "version": "0.0.4",
+      "sha256": "1n26gia9qfz146nvykl1gm3mn04mv4vk275q5nf25hyqbaf000lx",
+      "depends": ["lifecycle", "stringi"]
+    },
     "metaplot": {
       "name": "metaplot",
       "version": "0.8.4",
@@ -87733,6 +88321,12 @@
       "sha256": "0cdsr1yplqqggcvnqxa00iqnnddskj0jn605vw36dnb063ank7cb",
       "depends": ["MASS", "RColorBrewer", "SNFtool", "cli", "cluster", "data_table", "digest", "dplyr", "ggplot2", "mclust", "progressr", "purrr", "rlang", "tibble", "tidyr"]
     },
+    "metasplines": {
+      "name": "metasplines",
+      "version": "0.1.0",
+      "sha256": "1055bw8g4gkhba5pql69sqgli5k2avhs8g0gggb91809f98mlqpb",
+      "depends": ["dplyr", "meta", "optimization", "rlang", "stringr", "tibble", "tidyr"]
+    },
     "metatest": {
       "name": "metatest",
       "version": "1.0-5",
@@ -87747,9 +88341,9 @@
     },
     "metatools": {
       "name": "metatools",
-      "version": "0.1.6",
-      "sha256": "09rr7hfzkwk2ddc9cs9x8yvqbizk0bxfflkn9vdlf1b9kvrpknh9",
-      "depends": ["dplyr", "magrittr", "metacore", "purrr", "rlang", "stringr", "tibble", "tidyr"]
+      "version": "0.2.0",
+      "sha256": "1gvypr3japml2r654q8p6kl4jjcl38djz85pw0vn96ij9bgvchl0",
+      "depends": ["cli", "dplyr", "lifecycle", "magrittr", "metacore", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "metaumbrella": {
       "name": "metaumbrella",
@@ -87819,9 +88413,9 @@
     },
     "meteospain": {
       "name": "meteospain",
-      "version": "0.2.0",
-      "sha256": "1bbnq9b03r2njqphdkg43zfgf2hv2qy7zrfzy2nbzj784f599z3h",
-      "depends": ["assertthat", "cachem", "cli", "curl", "dplyr", "glue", "httr", "jsonlite", "lubridate", "memoise", "purrr", "rlang", "sf", "stringr", "tidyr", "units", "vctrs", "xml2"]
+      "version": "0.2.1",
+      "sha256": "1jv8zh5vmpwz3vc7j72qawf2ll78qjyzlqmic2zc9dnwqwf17lry",
+      "depends": ["assertthat", "cachem", "cli", "curl", "dplyr", "glue", "httr", "jsonlite", "lubridate", "purrr", "rlang", "sf", "stringr", "tidyr", "units", "vctrs", "xml2"]
     },
     "metevalue": {
       "name": "metevalue",
@@ -87969,9 +88563,9 @@
     },
     "mgcViz": {
       "name": "mgcViz",
-      "version": "0.2.0",
-      "sha256": "0lnp2m1z3hs2wrnfp7wpp70gg2gqzi8ak0c2xp1gc48y79pgp3g2",
-      "depends": ["GGally", "KernSmooth", "gamm4", "ggplot2", "gridExtra", "matrixStats", "mgcv", "miniUI", "plyr", "qgam", "shiny", "viridis"]
+      "version": "0.2.1",
+      "sha256": "0wr9nch5yd6ygcpqn4zx49v52i2qv4d9p7c8aykkafj5sbn73v42",
+      "depends": ["GGally", "KernSmooth", "gamm4", "ggplot2", "gridExtra", "matrixStats", "mgcv", "plyr", "qgam", "viridis"]
     },
     "mgcv": {
       "name": "mgcv",
@@ -88239,8 +88833,8 @@
     },
     "micompr": {
       "name": "micompr",
-      "version": "1.1.4",
-      "sha256": "1i50zvhdfxz0zbx5vmiz9s055j6f0j0gf6a2vxhm7cw597rfp3s5",
+      "version": "1.2.0",
+      "sha256": "1mr0i4q6aih59xv5jfbxb72v49006dc0qyrhws9lja1j44gbk72y",
       "depends": []
     },
     "microCRAN": {
@@ -88335,8 +88929,8 @@
     },
     "microplot": {
       "name": "microplot",
-      "version": "1.0-45",
-      "sha256": "0qprvn5zv9ai30lhd8qykffc5f8va886kc5qka34940lin63v389",
+      "version": "1.0-47",
+      "sha256": "175bk01h8akgz8l3xl6hyfc4m7sq80r23gz29dwqbxflm6v8jbjy",
       "depends": ["HH", "Hmisc", "cowplot", "flextable", "ggplot2", "htmltools", "lattice", "officer"]
     },
     "microseq": {
@@ -88359,9 +88953,9 @@
     },
     "micsr": {
       "name": "micsr",
-      "version": "0.1-2",
-      "sha256": "0f81n5p36a3lrm5dh4ikdlsbv170qyswz0k3k5bmzd3gjzs6x0an",
-      "depends": ["CompQuadForm", "Formula", "Rcpp", "Rdpack", "generics", "numDeriv", "sandwich", "survival"]
+      "version": "0.1-3",
+      "sha256": "1jp3nh5rvcbrsfvqmiiv43il8cm3rjp1z26jsb0hfhvas0mni1gz",
+      "depends": ["CompQuadForm", "Formula", "Rcpp", "Rdpack", "dfidx", "generics", "numDeriv", "sandwich", "survival"]
     },
     "micss": {
       "name": "micss",
@@ -88417,6 +89011,12 @@
       "sha256": "17ycy3wj02a88l0wj1bhpgjd45j3mn4kijxj8lz2fyzg156yn1kw",
       "depends": ["arm", "blorr", "dagitty", "glue", "lifecycle", "mfp2", "mice", "rlang", "rmarkdown"]
     },
+    "midr": {
+      "name": "midr",
+      "version": "0.5.0",
+      "sha256": "0bixb1szwnhzgyjdk753qh0vyqvkhgyd28d288g1xf2318xjamib",
+      "depends": ["RcppEigen", "rlang"]
+    },
     "midrangeMCP": {
       "name": "midrangeMCP",
       "version": "3.1.3",
@@ -88449,15 +89049,15 @@
     },
     "migest": {
       "name": "migest",
-      "version": "2.0.4",
-      "sha256": "0gksf8f1arpzxmcid1vskkf4s2r6k4n0ss85cag9429lmjpix5h4",
-      "depends": ["circlize", "dplyr", "forcats", "magrittr", "matrixStats", "migration_indices", "mipfp", "purrr", "stringr", "tibble", "tidyr"]
+      "version": "2.0.5",
+      "sha256": "04s5kczg19klzlbhy3mh5y3swqq01ydrw5bg2lnmmsdpaz9jp9xq",
+      "depends": ["CVXR", "circlize", "dplyr", "forcats", "lpSolve", "magrittr", "matrixStats", "migration_indices", "mipfp", "purrr", "stringr", "tibble", "tidyr"]
     },
     "migraph": {
       "name": "migraph",
-      "version": "1.4.5",
-      "sha256": "0b9qr64ff7r14pvvxlfs7dc54llrx9q0riziyz272qwbxdaq9raw",
-      "depends": ["dplyr", "furrr", "future", "generics", "ggplot2", "manynet", "purrr"]
+      "version": "1.5.0",
+      "sha256": "14dnkip86ag0h2abjj5dlbfqi25sgdz3lw4q0xc62f684h9f0hkw",
+      "depends": ["dplyr", "furrr", "future", "generics", "manynet", "purrr"]
     },
     "migrate": {
       "name": "migrate",
@@ -88663,12 +89263,6 @@
       "sha256": "0y5yzic9pwpzs01gnl82syankijcjp85n22jn5zda0bp3y01r53r",
       "depends": []
     },
-    "minimapR": {
-      "name": "minimapR",
-      "version": "0.0.1.3",
-      "sha256": "1kj2yr17jq5pawx23n8sf8g3fxm1y7g16694rln3gyc3j15gdvl6",
-      "depends": ["Rsamtools", "pafr"]
-    },
     "minimax": {
       "name": "minimax",
       "version": "1.1.1",
@@ -88749,8 +89343,8 @@
     },
     "mirai": {
       "name": "mirai",
-      "version": "2.3.0",
-      "sha256": "0cczacjlwrr5m2drpa62sp9bixw39qbjp5n1cihkfj1jj9jal5wz",
+      "version": "2.4.1",
+      "sha256": "09xlvyzcq04157vhywrxp3y7rnki6vclvg5avlaz80g7w7xhfvd7",
       "depends": ["nanonext"]
     },
     "mirrorselect": {
@@ -88893,8 +89487,8 @@
     },
     "missMDA": {
       "name": "missMDA",
-      "version": "1.19",
-      "sha256": "0p76jlzqayhwqwinaxhf69s3c5hxk4hmncvw4dsyybwvha25hrzr",
+      "version": "1.20",
+      "sha256": "0c7xdy27yvinqgld8z2l7ii3fijpkxl5sh1wf3rc1l0fagji00gr",
       "depends": ["FactoMineR", "doParallel", "foreach", "ggplot2", "mice", "mvtnorm"]
     },
     "missMethods": {
@@ -88923,9 +89517,9 @@
     },
     "missingHE": {
       "name": "missingHE",
-      "version": "1.5.0",
-      "sha256": "0my6a768w7lixh6cw453bl2nrb5aqdiri309p5kp4psp17pzllak",
-      "depends": ["BCEA", "R2jags", "bayesplot", "coda", "ggmcmc", "ggplot2", "ggpubr", "ggthemes", "gridExtra", "loo", "mcmcplots", "mcmcr"]
+      "version": "1.5.1",
+      "sha256": "05fqw10x6kspr76d3yw3g5hxcpr9clz3874l30b5gprkwdqj9z4w",
+      "depends": ["BCEA", "R2jags", "bayesplot", "coda", "ggmcmc", "ggplot2", "ggpubr", "ggthemes", "gridExtra", "loo", "mcmcr"]
     },
     "missoNet": {
       "name": "missoNet",
@@ -88953,14 +89547,14 @@
     },
     "mistral": {
       "name": "mistral",
-      "version": "2.2.2",
-      "sha256": "1ssgglw2y1bkhlwcrmw8bv8ic6vl5nj4l482hlq8kv1dgyrnbsas",
+      "version": "2.2.3",
+      "sha256": "1mv0wnsqk6789knghnb0lmfwi73dlp1sar30aa1jmminam3wjwgg",
       "depends": ["DiceKriging", "Matrix", "Rcpp", "doParallel", "e1071", "foreach", "ggplot2", "iterators", "mvtnorm", "quadprog"]
     },
     "misty": {
       "name": "misty",
-      "version": "0.7.2",
-      "sha256": "18v8yxiwdx3ff7pxn2n2xkm1dfp05ljivk4kbj5dsrxway02bb4i",
+      "version": "0.7.3",
+      "sha256": "0x4qv4nvm453sxdbw2vsa1w56sj94lvg623m4q3clwzqmkm1ci9w",
       "depends": ["ggplot2", "haven", "lavaan", "lme4", "rstudioapi"]
     },
     "misuvi": {
@@ -89091,8 +89685,8 @@
     },
     "mixedBayes": {
       "name": "mixedBayes",
-      "version": "0.1.8",
-      "sha256": "0ylv9l06vi5sbygsp1f8pmg0p1rmyxjlxmiz031zp6wyhhkxxpyx",
+      "version": "0.1.10",
+      "sha256": "10hzc5c3k8v8nz2m2ca0zim7q3gragv0ajwab42hky7018zbnd68",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "mixedCCA": {
@@ -89205,8 +89799,8 @@
     },
     "mixtur": {
       "name": "mixtur",
-      "version": "1.2.1",
-      "sha256": "02hybyc647jhl3jcyv26kcg1ijq4qlami18m6xyckygw8m2fb85l",
+      "version": "1.2.2",
+      "sha256": "1irx7fbv04w8cc3zci5hn08z6czi7shlysvyccxyb17wdm96ncni",
       "depends": ["dplyr", "ggplot2", "rlang", "tidyr"]
     },
     "mixture": {
@@ -89355,8 +89949,8 @@
     },
     "mlflow": {
       "name": "mlflow",
-      "version": "2.21.3",
-      "sha256": "0a8bb88c645nf7wcz4kcrlkrga7hbf3xw0i7dz06n4dvfdyvcjsb",
+      "version": "2.22.1",
+      "sha256": "0253shqbif5kbrfm840wabivdhsca2n9qb9fckwbw4i6jczl52k7",
       "depends": ["base64enc", "forge", "fs", "git2r", "glue", "httpuv", "httr", "ini", "jsonlite", "openssl", "processx", "purrr", "rlang", "swagger", "tibble", "withr", "yaml", "zeallot"]
     },
     "mlim": {
@@ -89413,12 +90007,6 @@
       "sha256": "1d7a5x9b0w3nk6dxvnbjkqf72cmx4y5czw39gj4fdib639s054gb",
       "depends": ["cli", "lme4", "lmerTest", "varTestnlme"]
     },
-    "mlms": {
-      "name": "mlms",
-      "version": "1.0.2",
-      "sha256": "1yijs5lda2yqly871lwxq5iw61zkig096jvvdkkvdviav75vklgx",
-      "depends": ["checkmate", "jsonlite", "plotrix", "readxl", "sf", "stringi"]
-    },
     "mlmtools": {
       "name": "mlmtools",
       "version": "1.0.2",
@@ -89433,8 +90021,8 @@
     },
     "mlogit": {
       "name": "mlogit",
-      "version": "1.1-2",
-      "sha256": "1i8wiz4gkq369mk8scz5c8b1nsnxyrzpk89v7aj56rmw3x53k6l9",
+      "version": "1.1-3",
+      "sha256": "1zaqq181qcpgysn88wvxpm7ch1y1sgnm9mvzwl3asaff6f2z63gl",
       "depends": ["Formula", "MASS", "Rdpack", "dfidx", "lmtest", "statmod", "zoo"]
     },
     "mlogitBMA": {
@@ -89469,9 +90057,9 @@
     },
     "mlr3": {
       "name": "mlr3",
-      "version": "0.23.0",
-      "sha256": "1av2v4kdn5klbgr2wmqd671ggzaspyw5pgsjcq2aq9cbpr407dv3",
-      "depends": ["R6", "backports", "checkmate", "data_table", "evaluate", "future", "future_apply", "lgr", "mlbench", "mlr3measures", "mlr3misc", "palmerpenguins", "paradox", "parallelly", "uuid"]
+      "version": "1.1.0",
+      "sha256": "13bcaixff7ll7fvbjjyz5dcssjhsb163x487h2f5rxkmwhxkvl45",
+      "depends": ["R6", "backports", "checkmate", "cli", "data_table", "evaluate", "future", "future_apply", "lgr", "mlbench", "mlr3measures", "mlr3misc", "palmerpenguins", "paradox", "parallelly", "uuid"]
     },
     "mlr3batchmark": {
       "name": "mlr3batchmark",
@@ -89499,14 +90087,14 @@
     },
     "mlr3db": {
       "name": "mlr3db",
-      "version": "0.5.2",
-      "sha256": "1cq22h9yj27ighh4clyak1xwx2wb5v4803hd7lrhnlgzs85dmhj2",
+      "version": "0.6.0",
+      "sha256": "1zb8bgfy9sr5n6mvsbbk67v7aqnpzy7nw21ashssf1ykhf1ycff1",
       "depends": ["R6", "backports", "checkmate", "data_table", "mlr3", "mlr3misc"]
     },
     "mlr3fairness": {
       "name": "mlr3fairness",
-      "version": "0.3.2",
-      "sha256": "0rm6l50prwjjy55p14zs9mkdrczbyl7f63fqsmh7r5xjahcsnfi7",
+      "version": "0.4.0",
+      "sha256": "0krilvi4zsfv5ggz8lmxlakj11n5kkcqra2ljis7cm7vpl9kpz98",
       "depends": ["R6", "checkmate", "data_table", "ggplot2", "mlr3", "mlr3learners", "mlr3measures", "mlr3misc", "mlr3pipelines", "paradox", "rlang"]
     },
     "mlr3fda": {
@@ -89523,15 +90111,15 @@
     },
     "mlr3fselect": {
       "name": "mlr3fselect",
-      "version": "1.3.0",
-      "sha256": "0xs73nqg04nb57br1aayc9vi98zc8iwmd0iv3g5wj3c7x89kwygz",
-      "depends": ["R6", "bbotk", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "paradox", "stabm"]
+      "version": "1.4.0",
+      "sha256": "0avm4j5r3h8dcn06x4g2rmm7na42qkjlsih65y379zjgbma2rf0p",
+      "depends": ["R6", "bbotk", "checkmate", "cli", "data_table", "lgr", "mlr3", "mlr3misc", "paradox", "stabm"]
     },
     "mlr3hyperband": {
       "name": "mlr3hyperband",
-      "version": "0.6.0",
-      "sha256": "1sr9bccy1zmbj83i6nlwkfmi98b40bl1l9q4lzl8n0knnavnzcj7",
-      "depends": ["R6", "bbotk", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "mlr3tuning", "paradox"]
+      "version": "1.0.0",
+      "sha256": "0nlapgpr4vqh4q7sbi9dwcwpa5hj7wlg5q7fa1dalhlk1ikrigqm",
+      "depends": ["R6", "bbotk", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "mlr3tuning", "paradox", "uuid"]
     },
     "mlr3inferr": {
       "name": "mlr3inferr",
@@ -89565,21 +90153,21 @@
     },
     "mlr3oml": {
       "name": "mlr3oml",
-      "version": "0.10.0",
-      "sha256": "0qlgqq22zy5kdgp6l6fg3yx8ywxpy4yaa2567j9z1pg5ij9yd49h",
+      "version": "0.10.1",
+      "sha256": "0dmz5rclvs01nl0w2mlwknwagv69s6fgrx3yb7gqvdrrgil3p0xl",
       "depends": ["R6", "backports", "bit64", "checkmate", "curl", "data_table", "jsonlite", "lgr", "mlr3", "mlr3misc", "paradox", "stringi", "uuid", "withr"]
     },
     "mlr3pipelines": {
       "name": "mlr3pipelines",
-      "version": "0.7.2",
-      "sha256": "0144sqwddd1484209fcqx5mpj2xx9xnr2vgmhhlnijqajz5riydd",
+      "version": "0.9.0",
+      "sha256": "0kn0ihk9ks8r51mghahli1mrhq3d3l3al4fzcvzm72fb0r8n3k1v",
       "depends": ["R6", "backports", "checkmate", "data_table", "digest", "lgr", "mlr3", "mlr3misc", "paradox", "withr"]
     },
     "mlr3resampling": {
       "name": "mlr3resampling",
-      "version": "2025.3.30",
-      "sha256": "01nql7q4mv430kv7qjnz9wyipdnd0zgph9mrp319hd6b5gl93ljx",
-      "depends": ["R6", "checkmate", "data_table", "mlr3", "mlr3misc", "paradox"]
+      "version": "2025.6.23",
+      "sha256": "1pvsmqymlxb65icvcswsnbskd5hyv4y0b6inax8cirp73hmii3s4",
+      "depends": ["R6", "batchtools", "checkmate", "data_table", "filelock", "mlr3", "mlr3misc", "paradox"]
     },
     "mlr3shiny": {
       "name": "mlr3shiny",
@@ -89589,14 +90177,14 @@
     },
     "mlr3spatial": {
       "name": "mlr3spatial",
-      "version": "0.5.0",
-      "sha256": "105wscgkrlgckrmisr1b5xf8wlj9w2w7ir8w1280isyg2zp1gva8",
+      "version": "0.6.0",
+      "sha256": "0yzdxxm0qhxli0gh9lpbmy1m630f22fjgwnwi0y7pikrjj2xq1z8",
       "depends": ["R6", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "sf", "terra"]
     },
     "mlr3spatiotempcv": {
       "name": "mlr3spatiotempcv",
-      "version": "2.3.2",
-      "sha256": "06kb8v0g1kn1z2107g1ik2r2hydcxljs8hb77cffhz2l7ac5cnq2",
+      "version": "2.3.3",
+      "sha256": "0h9f0snqx6m15p8nqgrmqv1ww7npxq75vy1a8jbk47pa8z9rwj1i",
       "depends": ["R6", "checkmate", "data_table", "ggplot2", "mlr3", "mlr3misc", "paradox"]
     },
     "mlr3summary": {
@@ -89613,8 +90201,8 @@
     },
     "mlr3torch": {
       "name": "mlr3torch",
-      "version": "0.2.1",
-      "sha256": "0png7kiz4zkplxkfmyxk9dpkb74z35rdk97l9zadxx4fk25prrcc",
+      "version": "0.3.0",
+      "sha256": "0d5j7i6dwl3w1mfim2chq5dqpl74pc5vxgv1jbyyx8if89wvcwy2",
       "depends": ["R6", "backports", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "mlr3pipelines", "paradox", "torch", "withr"]
     },
     "mlr3tuning": {
@@ -89643,8 +90231,8 @@
     },
     "mlrCPO": {
       "name": "mlrCPO",
-      "version": "0.3.7-7",
-      "sha256": "0nia2f8j5vgiradlcqi618mlv7146ml2pvbzh4p89p1pk75p6v0l",
+      "version": "0.3.8",
+      "sha256": "09l691ryjv764vf15zyrhi46b5fn33g06jplnip8cqh5f3dq9sgh",
       "depends": ["BBmisc", "ParamHelpers", "backports", "checkmate", "mlr", "stringi"]
     },
     "mlrMBO": {
@@ -89697,8 +90285,8 @@
     },
     "mlt": {
       "name": "mlt",
-      "version": "1.6-5",
-      "sha256": "0pssscrvy1jb1nczj7w1ga54ykpqg6w0frhd260hlj8g742gvgl3",
+      "version": "1.6-6",
+      "sha256": "1wy267gr5vzljwmn57v14y0m9cc0s2jkgqwv1s749v24bwpp1xxk",
       "depends": ["BB", "Matrix", "alabama", "basefun", "coneproj", "mvtnorm", "nloptr", "numDeriv", "quadprog", "sandwich", "survival", "variables"]
     },
     "mlt_docreg": {
@@ -90045,8 +90633,8 @@
     },
     "modEvA": {
       "name": "modEvA",
-      "version": "3.34",
-      "sha256": "01yn47nx2nm4g51zhpl170544vrh2v7p3q5bxcg9z1jh3s0xypjl",
+      "version": "3.39",
+      "sha256": "1735dgpxgpx5dxcxqbzw45xw11hmv614g34nynsbfzzjzcyrn1hp",
       "depends": ["terra"]
     },
     "modMax": {
@@ -90117,8 +90705,8 @@
     },
     "modelbased": {
       "name": "modelbased",
-      "version": "0.11.2",
-      "sha256": "18fk4m0i363ynihd0q7nybkfn3mv3d37mpyjmf0vyv3bdf2ngl68",
+      "version": "0.12.0",
+      "sha256": "0i4c9pszanqs8fpwqpqdf2q8xjmq0vnw1jhd1vn19qmk2yk538z4",
       "depends": ["bayestestR", "datawizard", "insight", "parameters"]
     },
     "modelbpp": {
@@ -90135,9 +90723,9 @@
     },
     "modeldata": {
       "name": "modeldata",
-      "version": "1.4.0",
-      "sha256": "15cfvvhf1c8zaanxdrrh934kz8250j0r5k6df0qkl5dz8cqv8sgb",
-      "depends": ["MASS", "dplyr", "purrr", "rlang", "tibble"]
+      "version": "1.5.0",
+      "sha256": "1sml65x92n4mvq7841hav3jfi069q7bs5jy0fckwx4raa4221mxb",
+      "depends": ["MASS", "cli", "dplyr", "purrr", "rlang", "tibble"]
     },
     "modeldatatoo": {
       "name": "modeldatatoo",
@@ -90195,8 +90783,8 @@
     },
     "modeltests": {
       "name": "modeltests",
-      "version": "0.1.6",
-      "sha256": "112pwkrg3d1lmcqhs946nm4dxhp9h7gvjibvhcjzlmd1d0qhlivc",
+      "version": "0.1.7",
+      "sha256": "0fmsn2cbfx05mzrg2j2j756vapvf26p9qvqj3bywny59nv7p9jbm",
       "depends": ["dplyr", "generics", "purrr", "testthat", "tibble"]
     },
     "modeltime": {
@@ -90291,8 +90879,8 @@
     },
     "modisfast": {
       "name": "modisfast",
-      "version": "1.0.0",
-      "sha256": "1shdhvc1bcfrmr8gxqx7qqphq0kj0lmc20sggq3bvs82yml77jda",
+      "version": "1.0.2",
+      "sha256": "1vas9a92qr8b6sdg0q92cm3z9h476639274phrfrp8gyyjl5ld7x",
       "depends": ["cli", "curl", "dplyr", "httr", "lubridate", "magrittr", "purrr", "rvest", "sf", "stringr", "terra", "xml2"]
     },
     "modmarg": {
@@ -90315,9 +90903,9 @@
     },
     "modsem": {
       "name": "modsem",
-      "version": "1.0.10",
-      "sha256": "0lhrvy6fp7h87yfxq7i761ycjwqs4dh0pzfhdx38y4ib475ibh4c",
-      "depends": ["MplusAutomation", "Rcpp", "RcppArmadillo", "dplyr", "fastGHQuad", "ggplot2", "lavaan", "mvnfast", "mvtnorm", "nlme", "plotly", "purrr", "rlang", "stringr"]
+      "version": "1.0.11",
+      "sha256": "13bizkm1yynd2zx6wr9my4z2dxjgdbk4q660179mlb87vqz5z5pp",
+      "depends": ["Amelia", "Deriv", "MASS", "MplusAutomation", "Rcpp", "RcppArmadillo", "cli", "dplyr", "fastGHQuad", "ggplot2", "lavaan", "mvnfast", "mvtnorm", "nlme", "plotly", "purrr", "rlang", "stringr"]
     },
     "moduleColor": {
       "name": "moduleColor",
@@ -90381,8 +90969,8 @@
     },
     "momentuHMM": {
       "name": "momentuHMM",
-      "version": "1.5.5",
-      "sha256": "0isd18b0fdf75gk6lbm34hgrhwj1fnl7airpv56xffsdvhvj6xjq",
+      "version": "1.5.6",
+      "sha256": "14hig6jw6zni4fvadmfhdkgyq8cay5dbrraihsah4w867b5l1n45",
       "depends": ["Brobdingnag", "CircStats", "MASS", "Rcpp", "RcppArmadillo", "crawl", "doParallel", "doRNG", "foreach", "mvtnorm", "numDeriv", "raster", "rlang", "sp"]
     },
     "monaco": {
@@ -90423,8 +91011,8 @@
     },
     "monitOS": {
       "name": "monitOS",
-      "version": "0.1.5",
-      "sha256": "0hdyxb1f2hy3fjbmjf60xnb0x61cga047g007jr9rpb5cimnpk7b",
+      "version": "0.1.6",
+      "sha256": "0p1jzx69g9phbdybmq8bzhzz3qmy9rf76wzap3k24i386dplm6la",
       "depends": ["glue", "shiny", "shinydashboard"]
     },
     "monitoR": {
@@ -90471,8 +91059,8 @@
     },
     "monolix2rx": {
       "name": "monolix2rx",
-      "version": "0.0.4",
-      "sha256": "0ij28qrk28s2hcdifvmlnbprfl6nivgx3fbmp7zhclm9i23a793g",
+      "version": "0.0.5",
+      "sha256": "0wiwfxknz1zlsg2xagd9jryfrcrhmq936l8fl0afszqci1b56rgi",
       "depends": ["Rcpp", "checkmate", "cli", "crayon", "dparser", "ggforce", "ggplot2", "lotri", "magrittr", "rxode2", "stringi", "withr"]
     },
     "monomvn": {
@@ -90507,8 +91095,8 @@
     },
     "moocore": {
       "name": "moocore",
-      "version": "0.1.7",
-      "sha256": "1w8r7g0iajzy66308pzbx7ga1qqgjrjfvfa5z4wkzmm1yf0cacwg",
+      "version": "0.1.8",
+      "sha256": "11kbccl4npn09kh9h5ad68bxamr2plpyn65ry9wd8qai0z4fi80q",
       "depends": ["Rdpack", "matrixStats"]
     },
     "moodef": {
@@ -90649,10 +91237,16 @@
       "sha256": "0jr74r5y01wi05zqlxzgiv4fjqabrk3av8ra5kd1k1zdvfhrbl86",
       "depends": ["Rdpack", "flexsurv", "magrittr", "reshape2", "rlang", "tibble"]
     },
+    "mos": {
+      "name": "mos",
+      "version": "0.1.3",
+      "sha256": "1qvj3fvf1b6kv0g17n37hwjbj3yrxvl7mhnqynxq3zhyjlncvrvf",
+      "depends": ["hypergeo2"]
+    },
     "mosaic": {
       "name": "mosaic",
-      "version": "1.9.1",
-      "sha256": "0l7h3zg5izr5xxqy1sngz6fzbwdffzljnjmfbshzzbl4x80f5lwl",
+      "version": "1.9.2",
+      "sha256": "07jynw6kg3bfsmnisx7nf6fydximdkryk6m08cljmfriyfkvqmhy",
       "depends": ["MASS", "Matrix", "dplyr", "ggformula", "ggplot2", "lattice", "mosaicCore", "mosaicData", "purrr", "rlang", "tibble", "tidyr"]
     },
     "mosaicCalc": {
@@ -90663,8 +91257,8 @@
     },
     "mosaicCore": {
       "name": "mosaicCore",
-      "version": "0.9.4.0",
-      "sha256": "0v3xhv6yfk1hc6a40jjgp6vvq102qa1l4n787pfywx6jhzbhamp2",
+      "version": "0.9.5",
+      "sha256": "0j0a5i3578rgwcscs9w6pgy692ddnz5x7836bnh0b844zwxm0jzz",
       "depends": ["MASS", "dplyr", "rlang", "tidyr"]
     },
     "mosaicData": {
@@ -90693,8 +91287,8 @@
     },
     "motif": {
       "name": "motif",
-      "version": "0.6.4",
-      "sha256": "0khvplcnw868cspzvn3mimvsvygxaw7ay6py2da9pjzmcbij9g36",
+      "version": "0.6.5",
+      "sha256": "0dknvy80gzk5cf5661sikcn12bgdy2jv92wpmj1rmdiflba05i8s",
       "depends": ["Rcpp", "RcppArmadillo", "comat", "philentropy", "sf", "stars", "tibble"]
     },
     "motifcluster": {
@@ -90763,11 +91357,17 @@
       "sha256": "1ci6j2vvdbzgiwsbwlizqkhn9jxpcg344v3lx2nzlnv8kd2kj1ic",
       "depends": ["assertthat", "bit64", "cli", "dplyr", "rlang", "sf", "tibble", "tidyselect", "units", "vctrs", "vroom"]
     },
+    "moveEZ": {
+      "name": "moveEZ",
+      "version": "1.0.3",
+      "sha256": "09kfm54kckxp1dysx42n5kchia5ahh98k4rfh7xa2vsqpmy1d0i8",
+      "depends": ["GPAbin", "biplotEZ", "dplyr", "gganimate", "ggplot2"]
+    },
     "moveHMM": {
       "name": "moveHMM",
-      "version": "1.10",
-      "sha256": "011g8hjiv5kd5z5m1k0m9nigln1k2xzd7rm7s5abqcx5b4br4cvg",
-      "depends": ["CircStats", "MASS", "Rcpp", "RcppArmadillo", "boot", "geosphere", "ggmap", "ggplot2", "numDeriv", "sp"]
+      "version": "1.11",
+      "sha256": "0kcswpxhylbfsya2sn9awlndl1fl3qfqdvdllqw7651c6i45xljs",
+      "depends": ["MASS", "Rcpp", "RcppArmadillo", "boot", "geosphere", "ggmap", "ggplot2", "numDeriv", "sp"]
     },
     "moveWindSpeed": {
       "name": "moveWindSpeed",
@@ -90781,6 +91381,12 @@
       "sha256": "1rq0q8myszcssdxn77lrf7z6yisc5318k32qxaj98rpggr7pfs93",
       "depends": ["Matrix", "chron", "elevatr", "gdistance", "raster", "sf", "sp", "terra"]
     },
+    "movedesign": {
+      "name": "movedesign",
+      "version": "0.3.2",
+      "sha256": "0xagcqf7yxbydpxydri19q0mh8bgiysilgiv9w2ldb5sak19iqni",
+      "depends": ["bayestestR", "bsplus", "combinat", "config", "crayon", "ctmm", "data_table", "dplyr", "fontawesome", "gdtools", "ggiraph", "ggplot2", "ggpubr", "ggtext", "golem", "gsl", "lubridate", "parsedate", "quarto", "reactable", "rintrojs", "rlang", "scales", "shiny", "shinyFeedback", "shinyWidgets", "shinyalert", "shinybusy", "shinydashboard", "shinydashboardPlus", "shinyjs", "stringr", "terra", "tidyr", "viridis"]
+    },
     "movegroup": {
       "name": "movegroup",
       "version": "2024.03.05",
@@ -90789,8 +91395,8 @@
     },
     "movementsync": {
       "name": "movementsync",
-      "version": "0.1.4",
-      "sha256": "132m7df76hj96xpbh1k9s1p8j8jy51mv9v6xrlm35kgwxgk912zk",
+      "version": "0.1.5",
+      "sha256": "15ydc2anks4wxyyryyzmqck68zlcfqn6ck51svxis0gmabq64ik9",
       "depends": ["WaveletComp", "circular", "dplyr", "ggplot2", "gridExtra", "hms", "igraph", "lmtest", "osfr", "rlang", "scales", "signal", "tidyr", "zoo"]
     },
     "movieROC": {
@@ -90931,6 +91537,12 @@
       "sha256": "1y3kfbwvy5a01527d18ca4p10nm8x4rm8zgr7h71irbjl3jlj70v",
       "depends": []
     },
+    "mrIML": {
+      "name": "mrIML",
+      "version": "2.1.0",
+      "sha256": "0b7sylysr8cbqkapm2vgsm19ihq73fp1aw668j41lwg3ds15pc4g",
+      "depends": ["MetricsWeighted", "dplyr", "finetune", "flashlight", "future_apply", "ggplot2", "hstats", "magrittr", "patchwork", "purrr", "recipes", "rlang", "rsample", "tibble", "tidyr", "tidyselect", "tune", "workflows", "yardstick"]
+    },
     "mrMLM": {
       "name": "mrMLM",
       "version": "5.0.1",
@@ -90957,8 +91569,8 @@
     },
     "mrbin": {
       "name": "mrbin",
-      "version": "1.9.3",
-      "sha256": "0xxxv0kyalar166nmhal4xgnbxkk61j403xabw6dh1i4cfb5q4g7",
+      "version": "1.9.4",
+      "sha256": "0yk3cl87p136bydb7kfxz1d4x3mm7h5jyvwfnrhr4r3xwvd8psg1",
       "depends": []
     },
     "mrbsizeR": {
@@ -90975,9 +91587,9 @@
     },
     "mrds": {
       "name": "mrds",
-      "version": "3.0.0",
-      "sha256": "0xrir814jmhp7kvp5jn3f5amy5lqjcrj6qmg5ffkj96yzmpc4ab2",
-      "depends": ["Rsolnp", "mgcv", "nloptr", "numDeriv", "optimx"]
+      "version": "3.0.1",
+      "sha256": "03dx3xc599915z9ibig43ys8b65yp0f8dz7nrdzqzmlb1d95kc55",
+      "depends": ["Rdpack", "Rsolnp", "mgcv", "nloptr", "numDeriv", "optimx"]
     },
     "mreg": {
       "name": "mreg",
@@ -91017,8 +91629,8 @@
     },
     "mrgsim_parallel": {
       "name": "mrgsim.parallel",
-      "version": "0.2.1",
-      "sha256": "074c47fkwy5n9x89dswi3ybnck1f0rlbyad6by32jyslw8bz76ln",
+      "version": "0.3.0",
+      "sha256": "1crw8547l1f1jk9g8c1zhpmpi1c1m44aqsyhibq2srl576appldv",
       "depends": ["callr", "dplyr", "fst", "future", "future_apply", "mrgsolve"]
     },
     "mrgsim_sa": {
@@ -91119,8 +91731,8 @@
     },
     "mscstts": {
       "name": "mscstts",
-      "version": "0.6.3",
-      "sha256": "1yqb9p7404yh9bjjjpy83k7yssvvpn3v9vddy47pgwjv4hbpbq19",
+      "version": "0.6.4",
+      "sha256": "12lblsykwxcn4zwjmjysmmswk1xmfpsdb94zyrr2gmdncmb6z3bc",
       "depends": ["httr", "jsonlite", "tuneR"]
     },
     "mscsweblm4r": {
@@ -91155,8 +91767,8 @@
     },
     "mseapca": {
       "name": "mseapca",
-      "version": "2.0.3",
-      "sha256": "0kmli8dmkv7dacb52dz84plhr4ncagch2kzh61amhga4chwqhwzq",
+      "version": "2.2.1",
+      "sha256": "0j0ahx4lv3r947slbq1lwzhbinjpjadqfqg4v6gc88mldxka2474",
       "depends": ["XML", "loadings"]
     },
     "msentropy": {
@@ -91191,8 +91803,8 @@
     },
     "msigdbr": {
       "name": "msigdbr",
-      "version": "24.1.0",
-      "sha256": "0rii1fmwg09in67s2f6cw482093n320703si6ksjjlda5d8p0i1a",
+      "version": "25.1.1",
+      "sha256": "00nhzpkxhkbn01v1xwngqxrlcg37f3m7xlkd3b88lsr2l2fr5596",
       "depends": ["assertthat", "babelgene", "curl", "dplyr", "lifecycle", "rlang", "tibble", "tidyselect"]
     },
     "msir": {
@@ -91311,8 +91923,8 @@
     },
     "mtarm": {
       "name": "mtarm",
-      "version": "0.1.5",
-      "sha256": "03xwfl8jn8bnvswi1riv4qgs2nn8vm4zl7j4v50j41qkp3rsbkpr",
+      "version": "0.1.6",
+      "sha256": "0zrd2i9cv6b7blyn0kfccyrnacc2zsi0al20q9v8sz7w33jhkwl6",
       "depends": ["Formula", "GIGrvg", "coda", "mvtnorm"]
     },
     "mtb": {
@@ -91347,9 +91959,9 @@
     },
     "mtscr": {
       "name": "mtscr",
-      "version": "1.0.2",
-      "sha256": "132dp97sx6177j8apla2qlw8gfw75dmg2vrbv3h99sd99jnhb8yz",
-      "depends": ["broom_mixed", "cli", "dplyr", "glmmTMB", "glue", "lifecycle", "purrr", "readr", "rlang", "stringr", "tibble"]
+      "version": "2.0.0",
+      "sha256": "17bni5cmfdibb7zmzxx3hnrhc2h3qjvplhb8859xbn63yspf83hx",
+      "depends": ["broom_mixed", "cli", "dplyr", "glmmTMB", "glue", "lifecycle", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "mtsdi": {
       "name": "mtsdi",
@@ -91527,8 +92139,8 @@
     },
     "multiDEGGs": {
       "name": "multiDEGGs",
-      "version": "1.0.0",
-      "sha256": "0fs4l8bs92bmf9zf7vnj335ii2kwbnmp599k6h42ypg92sp076y0",
+      "version": "1.1.0",
+      "sha256": "0z91l72rb1hzh9c6d07y73z0b87vnc8dk6nb50mdbfkzm1z8nn4l",
       "depends": ["DT", "MASS", "knitr", "magrittr", "pbapply", "pbmcapply", "rmarkdown", "sfsmisc", "shiny", "shinydashboard", "visNetwork"]
     },
     "multiDimBio": {
@@ -91575,9 +92187,9 @@
     },
     "multibias": {
       "name": "multibias",
-      "version": "1.7.1",
-      "sha256": "1ykfzyaad2z1baxsb6s9915cn89a2imd5b1ya4vx1d2w16gjbnvy",
-      "depends": ["broom", "dplyr", "lifecycle", "magrittr", "rlang"]
+      "version": "1.7.2",
+      "sha256": "0qalwa3mf6gramgmzpqif3x0vn7xhv1avhkqvjv4gqlr8n2v1gmq",
+      "depends": ["broom", "dplyr", "ggplot2", "lifecycle", "magrittr", "purrr", "rlang"]
     },
     "multibiasmeta": {
       "name": "multibiasmeta",
@@ -91765,6 +92377,12 @@
       "sha256": "0rh7z5wn3ndg03hkd42kk43ydxcdyhrsfxbvlxb3bir6pvwa9s6m",
       "depends": ["MASS", "S4Vectors", "SummarizedExperiment", "brms", "cli", "dplyr", "fansi", "formula_tools", "ggplot2", "glmnetUtils", "glue", "miniLNM", "patchwork", "phyloseq", "progress", "purrr", "ranger", "rlang", "tidygraph", "tidyr", "tidyselect"]
     },
+    "multimediate": {
+      "name": "multimediate",
+      "version": "0.1.4",
+      "sha256": "01bs0ai756p59jk3wp8zl9dpdi5h1ay51bsfhfdabpr4f7m161fg",
+      "depends": ["MASS", "mvtnorm", "rmutil", "timereg"]
+    },
     "multimix": {
       "name": "multimix",
       "version": "1.0-10",
@@ -91827,8 +92445,8 @@
     },
     "multiocc": {
       "name": "multiocc",
-      "version": "0.2.1",
-      "sha256": "1ndwky6rjyb7x0mg2xx5lsxr5yyhg7a9jrwmwryjg6jsw23965qx",
+      "version": "0.2.3",
+      "sha256": "0zsxz2csrvzxm9n5n2bz4jf7dxw1zwxapg5z4dn13w5a82ndhvjx",
       "depends": ["MASS", "coda", "interp", "tmvtnorm", "truncnorm"]
     },
     "multipanelfigure": {
@@ -92013,8 +92631,8 @@
     },
     "munsellinterpol": {
       "name": "munsellinterpol",
-      "version": "3.1-0",
-      "sha256": "1ry94w2rpayx9g3p4v07k7fn2dgrb09pxzxs8wwkkil3iirjpcly",
+      "version": "3.2-0",
+      "sha256": "1xzvfwh9smilw13587bfn4zw989zx7cfddl636hh3vkv4aq296a4",
       "depends": ["logger", "rootSolve", "spacesRGB", "spacesXYZ"]
     },
     "murphydiagram": {
@@ -92037,8 +92655,8 @@
     },
     "musicMCT": {
       "name": "musicMCT",
-      "version": "0.1.2",
-      "sha256": "0llvpbhqlvpn5f5l36fsig4rwnr45d694w87apdb7pinql23r1k0",
+      "version": "0.2.0",
+      "sha256": "1cihcmkr1x0vjxm5adwcrkldc58ixrw2hjys3228s772iyz169n3",
       "depends": ["igraph"]
     },
     "musicNMR": {
@@ -92157,8 +92775,8 @@
     },
     "mvSLOUCH": {
       "name": "mvSLOUCH",
-      "version": "2.7.6",
-      "sha256": "1l11dza28m5l6iam90z2vvmpabp91s3rmnb7b1x78c77ss1r7gig",
+      "version": "2.7.7",
+      "sha256": "1k2zq27fjmzb4bqwzzc7ykvlc7q51my8wgiyqwz53fdbpjq81xwk",
       "depends": ["Matrix", "PCMBase", "abind", "ape", "matrixcalc", "mvtnorm", "ouch"]
     },
     "mvSUSY": {
@@ -92211,8 +92829,8 @@
     },
     "mverse": {
       "name": "mverse",
-      "version": "0.2.1",
-      "sha256": "0pd05j0g7fpn0yb8mkcjwymzpjpl40lcq5ag79sl1ihpw5kwh8s8",
+      "version": "0.2.2",
+      "sha256": "0wbdb9nfjrn3pca3x3gr03lnhsvnkksr36hl4iq7rp9mpab6pw7n",
       "depends": ["Rdpack", "broom", "dplyr", "ggplot2", "ggraph", "ggupset", "igraph", "magrittr", "multiverse", "rlang", "stringr", "tidyr", "tidyselect"]
     },
     "mvgam": {
@@ -92247,8 +92865,8 @@
     },
     "mvinfluence": {
       "name": "mvinfluence",
-      "version": "0.9.0",
-      "sha256": "0yzp8sybmmr2nfa0g0v14kb2fqa5ayi0awlrb05vbyxvr5pg4f8h",
+      "version": "0.9.2",
+      "sha256": "0c5pbg5z1342cw68q44kinw830ch9jp1gy0wh6yn0ip3wpzaxsxj",
       "depends": ["car", "heplots"]
     },
     "mvmesh": {
@@ -92343,8 +92961,8 @@
     },
     "mvpd": {
       "name": "mvpd",
-      "version": "0.0.4",
-      "sha256": "10k82g2izv72k99j99mjljg2hxb66pzhgfqal2j5z3cj3gmkjabg",
+      "version": "0.0.5",
+      "sha256": "1gbxz2iwsphn8inpply39hp2glkfd8iqxbvcdp6rsxjw8jscg2g0",
       "depends": ["Matrix", "cubature", "libstable4u", "matrixStats", "mvtnorm", "stabledist"]
     },
     "mvrsquared": {
@@ -92479,6 +93097,12 @@
       "sha256": "1hrn2v6wvw8xllqd1bhxb50hj9icinfrar6k9jgl0wjcsn024fc1",
       "depends": []
     },
+    "mycolorsTB": {
+      "name": "mycolorsTB",
+      "version": "0.1.1",
+      "sha256": "0jw58agwhxl5r20x3dqxc1gwmapg30v6d2daxv8gdzh4fgjjd7za",
+      "depends": ["ape", "ggplot2", "ggtree"]
+    },
     "mycor": {
       "name": "mycor",
       "version": "0.1.1",
@@ -92499,8 +93123,8 @@
     },
     "nFactors": {
       "name": "nFactors",
-      "version": "2.4.1.1",
-      "sha256": "08gydk231zijw3inp6d3hnc5mz0zywi4vzlvqb4jmibhv0hncdxv",
+      "version": "2.4.1.2",
+      "sha256": "1j0w0g20hqfwq4fhhvr9421fnnln1fnvzyb6bc6gj66ar7ngvrqx",
       "depends": ["MASS", "lattice", "psych"]
     },
     "nFunNN": {
@@ -92625,14 +93249,14 @@
     },
     "nanoarrow": {
       "name": "nanoarrow",
-      "version": "0.6.0-1",
-      "sha256": "01daqxjxvs7p0j8jr2g44crmkzinkisgwa0dr289c2smhqzk5nwm",
+      "version": "0.7.0",
+      "sha256": "1vcfvcavzaagan695b35bc9kai3pmqybmr5cjgnszg72cznnw3ga",
       "depends": []
     },
     "nanonext": {
       "name": "nanonext",
-      "version": "1.6.0",
-      "sha256": "0n2lq6czshp4r5jsrabz6al36s3d9dai8dkf80h9bskga36bfkp3",
+      "version": "1.6.2",
+      "sha256": "02kwqfjgf4b0fl4iar4fkncl5l0qhialb53fiiq03nm8a7b2rcj4",
       "depends": []
     },
     "nanoparquet": {
@@ -92859,8 +93483,8 @@
     },
     "ncaavolleyballr": {
       "name": "ncaavolleyballr",
-      "version": "0.4.2",
-      "sha256": "04jcwkvs0l8s5znxxs25wmzazs3q5nqdy7m6dvqm8rz0hb3fvsa4",
+      "version": "0.4.3",
+      "sha256": "1zrqv2mmjfmnsf6vfcsbp09an8cxgs29hw992114d8nmsfll29xl",
       "depends": ["cli", "curl", "dplyr", "httr2", "lifecycle", "purrr", "rlang", "rvest", "stringr", "tibble", "tidyr", "xml2"]
     },
     "ncappc": {
@@ -92889,8 +93513,8 @@
     },
     "ncdfCF": {
       "name": "ncdfCF",
-      "version": "0.6.0",
-      "sha256": "00hys99h9znyx3xbzkllramaraaib6fn5rjswn2x9xy926b8q9q8",
+      "version": "0.6.1",
+      "sha256": "0wb8j2h8apccwpgm70y7hv3mkhp2j9ppxkgrqp35ryddj6nn0437",
       "depends": ["CFtime", "R6", "RNetCDF", "abind", "stringr"]
     },
     "ncdfgeom": {
@@ -93051,9 +93675,9 @@
     },
     "nemsqar": {
       "name": "nemsqar",
-      "version": "1.1.0",
-      "sha256": "1qv6839r1444i3bjggmff40m9m8h4kisif4w6jq4ziqxrl0a43xi",
-      "depends": ["cli", "dplyr", "lifecycle", "lubridate", "rlang", "tibble", "tidyselect"]
+      "version": "1.1.2",
+      "sha256": "021gsrz0b1r034qc89yppvr63ri8dzwjc9iy1qk82jzrj6hgz5x9",
+      "depends": ["cli", "dplyr", "glue", "lifecycle", "lubridate", "rlang", "tibble", "tidyselect"]
     },
     "nemtr": {
       "name": "nemtr",
@@ -93081,8 +93705,8 @@
     },
     "neodistr": {
       "name": "neodistr",
-      "version": "0.1.1",
-      "sha256": "1g27z8qnk98fgblpprvb55lfly79dcfa9kcfz7rhx1hnarbzf85p",
+      "version": "0.1.2",
+      "sha256": "08rvry8qdcrvh6nfxz1dgxzpbhl17ar2ygc3crlwlpj0vmbvymlc",
       "depends": ["Rmpfr", "brms", "ggplot2", "plotly", "rstan", "shiny", "shinythemes"]
     },
     "neojags": {
@@ -93111,9 +93735,9 @@
     },
     "neonUtilities": {
       "name": "neonUtilities",
-      "version": "2.4.3",
-      "sha256": "0jpfgiaznpglc499qa6kqbyswpm9nf5004sqqxg797fv4n9z72jy",
-      "depends": ["R_utils", "curl", "data_table", "downloader", "httr", "jsonlite", "pbapply", "stringr", "tidyr"]
+      "version": "3.0.0",
+      "sha256": "0c04j8vq7g7kakvwgd23w6b7nv86gf3bngp3zjrsn1iqlkjv5qx4",
+      "depends": ["R_utils", "arrow", "curl", "data_table", "downloader", "dplyr", "httr", "jose", "jsonlite", "pbapply", "rlang", "tidyr"]
     },
     "neonstore": {
       "name": "neonstore",
@@ -93121,6 +93745,12 @@
       "sha256": "16xbvqk02ihqv2lilgsmp777v93m2m6px9wcmpg8lm8xhrbyj4gr",
       "depends": ["DBI", "R_utils", "cachem", "duckdb", "duckdbfs", "glue", "httr", "memoise", "progress", "thor", "vroom", "zip"]
     },
+    "neotoma2": {
+      "name": "neotoma2",
+      "version": "1.0.7",
+      "sha256": "0lhlsfgibg69yl28s9ijyjgy0x713lg83j8xhd3a43d5279wndkp",
+      "depends": ["assertthat", "digest", "dplyr", "geojsonsf", "gtools", "httr", "jsonlite", "leaflet", "lubridate", "magrittr", "progress", "purrr", "rlang", "sf", "stringr", "tidyr", "uuid"]
+    },
     "nephro": {
       "name": "nephro",
       "version": "1.5",
@@ -93189,8 +93819,8 @@
     },
     "netCoin": {
       "name": "netCoin",
-      "version": "2.1.0",
-      "sha256": "16ddm27vvwiiqxxjk4rpi7pv147739kmk5fwfmhdbd50vrc0769z",
+      "version": "2.1.9",
+      "sha256": "1vj3c4knaxspqz6aczdirp5qi2b1z2fks8jpvzxs9ik6k10mpbib",
       "depends": ["GPArotation", "MASS", "Matrix", "haven", "igraph", "rD3plot"]
     },
     "netSEM": {
@@ -93213,8 +93843,8 @@
     },
     "netassoc": {
       "name": "netassoc",
-      "version": "0.7.0",
-      "sha256": "0hbyg31r9sjp0dyxlbsbw7r1kb1dwr0apilsw8saf1vlqwsiasga",
+      "version": "0.7.1",
+      "sha256": "1m1p8bs64gxrran4aicq1s2ddq6sz6hflv1a5icbb9miz294dc15",
       "depends": ["corpcor", "huge", "igraph", "infotheo", "vegan"]
     },
     "netcmc": {
@@ -93255,8 +93885,8 @@
     },
     "netgsa": {
       "name": "netgsa",
-      "version": "4.0.5",
-      "sha256": "1m9myxsbvbljr038azxzakpbh20a21qhiy20d0ipvjc5asq3kfla",
+      "version": "4.0.6",
+      "sha256": "0zdj464mlhm71cwgn6jhzb6nrpnwy6php7gifgzag7pin9zh0l5y",
       "depends": ["AnnotationDbi", "Matrix", "RCy3", "Rcpp", "RcppEigen", "corpcor", "data_table", "dplyr", "genefilter", "glassoFast", "glmnet", "graph", "graphite", "httr", "igraph", "magrittr", "msigdbr", "org_Hs_eg_db", "quadprog", "reshape2", "rlang"]
     },
     "netgwas": {
@@ -93465,8 +94095,8 @@
     },
     "neurobase": {
       "name": "neurobase",
-      "version": "1.32.4",
-      "sha256": "0jgf7zv4j2r09is0r8fkizgy0mz3c0iyldhw8f1fgys4gwzia7cc",
+      "version": "1.33.0",
+      "sha256": "1cpvi1jcsmpr5kl0gglswzq4kcrgy3nqd2j6jb6mk91ilby1gm1j",
       "depends": ["RNifti", "R_utils", "abind", "matrixStats", "oro_nifti"]
     },
     "neuroblastoma": {
@@ -93511,6 +94141,12 @@
       "sha256": "1660v7nng6dj9gwn04ynirms0g10wpsz33i26va229zdviqm5cyy",
       "depends": ["cowplot", "dplyr", "ggplot2", "ggpmisc", "pracma", "scales"]
     },
+    "neutroSurvey": {
+      "name": "neutroSurvey",
+      "version": "0.1.0",
+      "sha256": "16law3i9yzafcavm9swl6k68yvxgsn0ig3zb3cfimai00xssbcnd",
+      "depends": ["moments"]
+    },
     "neutrostat": {
       "name": "neutrostat",
       "version": "0.0.2",
@@ -93561,8 +94197,8 @@
     },
     "newsmap": {
       "name": "newsmap",
-      "version": "0.9.0",
-      "sha256": "103if7yh378c91bwq4j22p3krg00hwzah5wi1pjnni65yjjg2bqa",
+      "version": "0.9.2",
+      "sha256": "0d1djkbyy16g2knk1jaq21rkqjw9j4x8b5isp0pvxriih6xbbzwa",
       "depends": ["Matrix", "quanteda", "quanteda_textstats", "stringi"]
     },
     "newsmd": {
@@ -93687,8 +94323,8 @@
     },
     "nhlscraper": {
       "name": "nhlscraper",
-      "version": "0.1.1",
-      "sha256": "1day35808ynzananpsmhbdbbhn4z58z7jl6xhsvdlyf0w3479j1s",
+      "version": "0.2.0",
+      "sha256": "0p6462a3xns2ck96ib7nhvqf6sg66rswwzx9p80kqknsl5iy208a",
       "depends": ["dplyr", "httr", "jsonlite", "magrittr", "tibble"]
     },
     "nhm": {
@@ -93717,8 +94353,8 @@
     },
     "nhstplot": {
       "name": "nhstplot",
-      "version": "1.3.0",
-      "sha256": "162v85h9prl2kcchm219577ljw2an2hjapxyqxiv6xymp06cw4bn",
+      "version": "1.4.0",
+      "sha256": "04hayyfi0f0288v9wvwciyf0hwiy8kdp9vjyn030p1373slxjgrn",
       "depends": ["ggplot2"]
     },
     "niaidMI": {
@@ -93807,8 +94443,8 @@
     },
     "nimbleCarbon": {
       "name": "nimbleCarbon",
-      "version": "0.2.5",
-      "sha256": "0gqzdiid3x5k8286j3wy31pha76diniyj7si0mzrmq13kw77lsls",
+      "version": "0.2.6",
+      "sha256": "0k9k3k5qm5saj5xgz0niydc6m91dcr2428vhmh1vka7zz4cwfvfv",
       "depends": ["coda", "doSNOW", "foreach", "nimble", "rcarbon", "snow"]
     },
     "nimbleEcology": {
@@ -93889,12 +94525,6 @@
       "sha256": "0gi8v0l3032di8ph7x0x9yqsmip7fyams8bpznphg75h4wlalvlv",
       "depends": ["dplyr", "future", "future_apply", "ggplot2", "httr2", "lubridate", "purrr", "rlang", "tidyr", "tidyselect"]
     },
-    "njgeo": {
-      "name": "njgeo",
-      "version": "0.1.0",
-      "sha256": "1cc6gm0l5z31hqif2d8wd503pb48xsmyr28pbildkxgy9z022af5",
-      "depends": ["curl", "dplyr", "httr", "jsonlite", "sf"]
-    },
     "nlMS": {
       "name": "nlMS",
       "version": "1.1",
@@ -93933,8 +94563,8 @@
     },
     "nlive": {
       "name": "nlive",
-      "version": "0.7.0",
-      "sha256": "0w5gy53yaclyxvyac78drqa7fcklfpxak1s1wxnznmq4n7c09nj5",
+      "version": "0.8.0",
+      "sha256": "0c2cx3w8415c1wk25894dinkx9vbrmrm4wy73fny62n7dvd7gwp6",
       "depends": ["Rmisc", "Rmpfr", "dplyr", "fastDummies", "ggplot2", "knitr", "lcmm", "nlraa", "saemix", "sitar", "sqldf", "viridis"]
     },
     "nlme": {
@@ -93957,9 +94587,9 @@
     },
     "nlmixr2": {
       "name": "nlmixr2",
-      "version": "3.0.2",
-      "sha256": "0pf24k0773bmc3bv9853z2ldj9fj622c3ibsyhx8n62f4wfqsx2m",
-      "depends": ["cli", "crayon", "lotri", "magrittr", "nlmixr2data", "nlmixr2est", "nlmixr2extra", "nlmixr2plot", "rxode2"]
+      "version": "4.0.0",
+      "sha256": "0g460n23k4yl9avaqh8l1nfci83b30x88gqiwj7iwvq7ky4c0zll",
+      "depends": ["cli", "crayon", "dplyr", "lotri", "magrittr", "nlmixr2est", "nlmixr2extra", "nlmixr2plot", "purrr", "rstudioapi", "rxode2", "tibble"]
     },
     "nlmixr2data": {
       "name": "nlmixr2data",
@@ -93969,8 +94599,8 @@
     },
     "nlmixr2est": {
       "name": "nlmixr2est",
-      "version": "3.0.4",
-      "sha256": "0waknqb71djbjd22qh53fwinkmqqs7s2bv2hb6dcmpb8wm5fqnhj",
+      "version": "4.0.2",
+      "sha256": "1nw4p4cxiij1arqjl83icwhpxl5qf3m9acjf5fi5i2sfynq0rccb",
       "depends": ["BH", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "backports", "checkmate", "cli", "knitr", "lbfgsb3c", "lotri", "magrittr", "minqa", "n1qn1", "nlme", "nlmixr2data", "rex", "rxode2", "symengine"]
     },
     "nlmixr2extra": {
@@ -93987,20 +94617,20 @@
     },
     "nlmixr2plot": {
       "name": "nlmixr2plot",
-      "version": "3.0.1",
-      "sha256": "1r6dyczhsrvich8gd6x1a8a53gxkhxqg05s7fllnhxjjid4v29qb",
+      "version": "3.0.2",
+      "sha256": "18x72r1qm05svvyzbfa63m5zh245ka91rvgjvrrqphclw5szrxm0",
       "depends": ["ggplot2", "nlmixr2est", "nlmixr2extra", "rxode2", "vpc", "xgxr"]
     },
     "nlmixr2rpt": {
       "name": "nlmixr2rpt",
-      "version": "0.2.0",
-      "sha256": "1lc7pmh97wggfms2in37f5bdrri914ninr58ah92215p3fxcqmls",
-      "depends": ["cli", "dplyr", "flextable", "ggforce", "ggplot2", "ggpubr", "nlmixr2", "nlmixr2extra", "onbrand", "rxode2", "stringr", "xpose", "xpose_nlmixr2", "yaml"]
+      "version": "0.2.1",
+      "sha256": "0x1kgia70ggj6fyrpsx3qyspvj94xqg5qh42if6bmkx2h6a96ajk",
+      "depends": ["cli", "dplyr", "flextable", "ggforce", "ggplot2", "ggpubr", "nlmixr2est", "nlmixr2extra", "onbrand", "rxode2", "stringr", "xpose", "xpose_nlmixr2", "yaml"]
     },
     "nlmm": {
       "name": "nlmm",
-      "version": "1.1.0",
-      "sha256": "0mi9nsdzsvaxfb3n3z3rijd8saw4l7x3g2gq8ivzxyilyav5anxb",
+      "version": "1.1.1",
+      "sha256": "1scvm7caxh4ap4gqx327gs0r1ahf0nw447zr0pc8z1n0yank49vi",
       "depends": ["BH", "MASS", "Matrix", "Qtools", "Rcpp", "RcppArmadillo", "gsl", "lqmm", "mvtnorm", "nlme", "numDeriv", "statmod"]
     },
     "nlmrt": {
@@ -94101,8 +94731,8 @@
     },
     "nlsic": {
       "name": "nlsic",
-      "version": "1.1.0",
-      "sha256": "0qx8839sxs5lwxc8gygl7j57r7fkwzw631imhlacmc1zn86svzp2",
+      "version": "1.1.1",
+      "sha256": "1rca8f4p35bkhpgrqnakx3z1igvzvf3b37qkib4j6kl9cv1kvgw9",
       "depends": ["dotty", "nnls"]
     },
     "nlsmsn": {
@@ -94137,8 +94767,8 @@
     },
     "nltm": {
       "name": "nltm",
-      "version": "1.4.5",
-      "sha256": "10w8nagb51wcbf5v082lgqw13f1dznhas77cmhsqp9d23iw52waq",
+      "version": "1.4.6",
+      "sha256": "0pf1pgsgvq5mjvhck4dr2mrs1g9iqih1cnjw1fmqi6ix6hprm8nh",
       "depends": ["survival"]
     },
     "nlts": {
@@ -94317,8 +94947,8 @@
     },
     "nodbi": {
       "name": "nodbi",
-      "version": "0.13.0",
-      "sha256": "1zv5p81iiys0bxwd9913fx95bkh3rch6lbcr66gyvb8lgxd21pf2",
+      "version": "0.13.1",
+      "sha256": "0awjwcajfaimcamj67bwqn9ai7bbf0bdpy82rxg4kyz8jr6p46fy",
       "depends": ["DBI", "R_utils", "V8", "jqr", "jsonlite", "stringi", "uuid"]
     },
     "node2vec": {
@@ -94401,22 +95031,22 @@
     },
     "nomclust": {
       "name": "nomclust",
-      "version": "2.8.0",
-      "sha256": "1bl92zaf4iidm48xjxj0v812lx7gk3i3frvb59xr71y91ranwjpv",
+      "version": "2.8.1",
+      "sha256": "0w9lmxp31l9vgq91c31f0ph944zsc8bgprg9sx73h7iyh2jlb1qx",
       "depends": ["Rcpp", "clValid", "cluster"]
     },
+    "nomesbr": {
+      "name": "nomesbr",
+      "version": "0.0.7",
+      "sha256": "0zjsqv420wydn8q7jv247i7i549zybk81q71n9xs4zx6n620hn7v",
+      "depends": ["data_table", "dplyr", "httr2", "stringr", "tictoc"]
+    },
     "nominatimlite": {
       "name": "nominatimlite",
       "version": "0.4.2",
       "sha256": "0n0q5g4r5m8rq0m94ddbrsv91c67jvca9ca02f9id1qyha7pbkvz",
       "depends": ["dplyr", "jsonlite", "sf"]
     },
-    "nomisr": {
-      "name": "nomisr",
-      "version": "0.4.7",
-      "sha256": "0mf301nhsl71h79jxfkwa27j5nifsxp7y6vxbnx87rybr80b3hg1",
-      "depends": ["dplyr", "httr", "jsonlite", "rlang", "rsdmx", "snakecase", "tibble"]
-    },
     "nomnoml": {
       "name": "nomnoml",
       "version": "0.3.0",
@@ -94479,8 +95109,8 @@
     },
     "nonmem2rx": {
       "name": "nonmem2rx",
-      "version": "0.1.6",
-      "sha256": "1gw4bw83a1d77y3nj0glqik1j59az30iga53qaci8wxadx95k9lk",
+      "version": "0.1.7",
+      "sha256": "0x0qhj96g07rwhfqwvyx5zz9dli5nil2vygpz5k57kgg6ld1qyx6",
       "depends": ["Rcpp", "checkmate", "cli", "crayon", "data_table", "digest", "dparser", "ggforce", "ggplot2", "lotri", "magrittr", "qs", "rxode2", "xml2"]
     },
     "nonmemica": {
@@ -94507,6 +95137,12 @@
       "sha256": "0gflldd3kjbpdlvbwi073igj6shcqr9g5x6zcp5gfa12404qpflq",
       "depends": []
     },
+    "nonparTrendR": {
+      "name": "nonparTrendR",
+      "version": "0.1.0",
+      "sha256": "1i3bg9hrwa6168s4z96s1rlz3qz0bcjm133pr7n9842zly8zryvx",
+      "depends": []
+    },
     "nonparaeff": {
       "name": "nonparaeff",
       "version": "0.5-13",
@@ -94669,6 +95305,12 @@
       "sha256": "0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91",
       "depends": ["dplyr", "httr", "magrittr"]
     },
+    "notionR": {
+      "name": "notionR",
+      "version": "0.0.9",
+      "sha256": "0ln1w29bs2vaqmcmhmjn5sgihf7si98lyiyp6img9jx875dgv61g",
+      "depends": ["dplyr", "httr", "httr2", "stringi", "tibble", "tidyr"]
+    },
     "novelforestSG": {
       "name": "novelforestSG",
       "version": "2.1.0",
@@ -94717,12 +95359,6 @@
       "sha256": "0fl10gj6s09gfmb7wl1y62fr49qnckjqxbzhjkyx029v9klbfvp7",
       "depends": ["lattice"]
     },
-    "nparACT": {
-      "name": "nparACT",
-      "version": "0.8",
-      "sha256": "0zwhz52j526n3xd21s7kghjaby56a8g296bkkc6scaa23zn1xg4b",
-      "depends": ["ggplot2", "stringr", "zoo"]
-    },
     "nparLD": {
       "name": "nparLD",
       "version": "2.2",
@@ -94897,12 +95533,6 @@
       "sha256": "0fklz6pd855rdpq1h85dsrn50sra0zlilj3slvv4fg1f1l2fg227",
       "depends": ["ks", "lubridate", "terra"]
     },
-    "nprcgenekeepr": {
-      "name": "nprcgenekeepr",
-      "version": "1.0.7",
-      "sha256": "1z3anys5p2gi15fzfaz73ay237rbvwai04qqwx42s0agrh2p6yhn",
-      "depends": ["Matrix", "Rlabkey", "WriteXLS", "anytime", "data_table", "futile_logger", "htmlTable", "lifecycle", "lubridate", "plotrix", "readxl", "sessioninfo", "shiny", "stringi"]
-    },
     "npreg": {
       "name": "npreg",
       "version": "1.1.0",
@@ -94947,8 +95577,8 @@
     },
     "npsm": {
       "name": "npsm",
-      "version": "2.0.0",
-      "sha256": "0d2pa55jcxrphmsnv0wcv3xsdidjcr8b8s9krbal27rjrvqqh27s",
+      "version": "2.0.1",
+      "sha256": "185j428pv23nj8b64c0bvbj11qk99gcdddp4ax2vhpchrqqmmf5a",
       "depends": ["Rfit", "class", "plyr"]
     },
     "npsp": {
@@ -94993,6 +95623,12 @@
       "sha256": "0fpgp6k3mhb0qxbx6248k9bscnmlzwj70mqh631a1nc4cpdjvw3q",
       "depends": ["survival"]
     },
+    "nrlR": {
+      "name": "nrlR",
+      "version": "0.1.0",
+      "sha256": "011jd5pn8gzwvkf7axcf772d72q2sly5ps2ril0r0xxn46x189xw",
+      "depends": ["cli", "dplyr", "glue", "httr", "jsonlite", "lubridate", "purrr", "rvest", "stringr", "tibble", "xml2"]
+    },
     "nsRFA": {
       "name": "nsRFA",
       "version": "0.7-17",
@@ -95029,12 +95665,6 @@
       "sha256": "189s543dchbjki4vj4yszmlnarpghdn4s53k2mlwfzps1m7m39df",
       "depends": ["checkmate"]
     },
-    "nser": {
-      "name": "nser",
-      "version": "1.5.3",
-      "sha256": "0v88gbcak22wpqanp5b4j1fdsp3s4jdhwq4a399msmjd1kxzf5f6",
-      "depends": ["curl", "dplyr", "googleVis", "httr", "lubridate", "magrittr", "purrr", "readr", "reticulate", "rvest", "stringr", "xml2"]
-    },
     "nsga2R": {
       "name": "nsga2R",
       "version": "1.1",
@@ -95397,14 +96027,14 @@
     },
     "occCite": {
       "name": "occCite",
-      "version": "0.5.9",
-      "sha256": "17msmwh1rlyf4a2jkz36856bmvy2v636jmg3f8c4xingmfgdi94i",
-      "depends": ["BIEN", "DBI", "RColorBrewer", "RPostgreSQL", "RefManageR", "ape", "bib2df", "curl", "dplyr", "ggplot2", "htmltools", "leaflet", "lubridate", "rgbif", "rlang", "stringr", "tidyr", "viridis", "waffle"]
+      "version": "0.6.0",
+      "sha256": "1k1z6hkf7yid6bqivzzsnpp4bwx6vaqn310qsb8gf4mzlc0f5icr",
+      "depends": ["BIEN", "DBI", "RColorBrewer", "RPostgreSQL", "RefManageR", "bib2df", "curl", "dplyr", "ggplot2", "htmltools", "leaflet", "lubridate", "rgbif", "rlang", "stringr", "tidyr", "viridis", "waffle"]
     },
     "occumb": {
       "name": "occumb",
-      "version": "1.2.0",
-      "sha256": "1lxngbp0v92ssappc4n8gmxzxzb01jk1xw71jng431a7ha589xxy",
+      "version": "1.2.1",
+      "sha256": "1grn6k7mv2imcrxs9q1w697kwzd991bk5v8mdvm58nhvn9v9dr2z",
       "depends": ["checkmate", "crayon", "jagsUI", "knitr"]
     },
     "occupancy": {
@@ -95455,12 +96085,6 @@
       "sha256": "13zdzqjlf5pihji6np9a3m2j5ycy4jvfl75knzry2ir78zr9ngj7",
       "depends": ["DT", "classInt", "dplyr", "ggplot2", "htmlwidgets", "leaflet", "leaflet_extras", "lwgeom", "sf", "shiny", "shinyBS", "shinyjs", "shinythemes", "stringr", "webshot", "zip"]
     },
-    "oceanmap": {
-      "name": "oceanmap",
-      "version": "0.1.6",
-      "sha256": "12ppcqk2s14p7hg0a6b3hgnz90dxn3kagfgkpykz6ks93vjy8pd7",
-      "depends": ["abind", "extrafont", "fields", "ggedit", "ggplot2", "lubridate", "mapdata", "maps", "ncdf4", "plotly", "plotrix", "raster", "reshape2", "sf", "sp"]
-    },
     "oceanwaves": {
       "name": "oceanwaves",
       "version": "0.2.0",
@@ -95487,9 +96111,9 @@
     },
     "oclust": {
       "name": "oclust",
-      "version": "0.2.0",
-      "sha256": "08247vcjs7hhzbj69f2x39n5y5ycns0qd7pdlvpwyn4j7yd1ji31",
-      "depends": ["MASS", "dbscan", "entropy", "mclust", "mixture", "mvtnorm"]
+      "version": "1.0.0",
+      "sha256": "0mvllqxikf40lybawvj7hjnsjcdbyimrm0ga522b2zlyzzk2acak",
+      "depends": ["MASS", "dbscan", "entropy", "mclust", "mixture", "mvtnorm", "progress"]
     },
     "ocp": {
       "name": "ocp",
@@ -95605,11 +96229,17 @@
       "sha256": "1m6lr75v7ig87c6xv22smq6mwlmp5ka8im6blp5mcvcw2dxc930w",
       "depends": []
     },
+    "oecdoda": {
+      "name": "oecdoda",
+      "version": "0.1.0",
+      "sha256": "1abdffg2m8bj7yp2v3xgqmj6bqb37layg7h4bhknfp205bzmh3fd",
+      "depends": ["cli", "httr2", "tibble"]
+    },
     "oeli": {
       "name": "oeli",
-      "version": "0.7.3",
-      "sha256": "0jn1chn7i06ffarmvbj7sfslhxlyr3ls1m0a709yfcwxlg76q1a1",
-      "depends": ["R6", "Rcpp", "RcppArmadillo", "SimMultiCorrData", "benchmarkme", "checkmate", "cli", "ggplot2", "hexSticker", "testthat"]
+      "version": "0.7.4",
+      "sha256": "1606l1d3c6wcynk0g5vz6dds3qxmqrda578d0qg1kh9wbxfv8vj7",
+      "depends": ["R6", "Rcpp", "RcppArmadillo", "SimMultiCorrData", "benchmarkme", "checkmate", "cli", "dplyr", "future", "future_apply", "ggplot2", "glue", "hexSticker", "progressr", "testthat", "tibble"]
     },
     "oem": {
       "name": "oem",
@@ -95685,8 +96315,8 @@
     },
     "ogrdbstats": {
       "name": "ogrdbstats",
-      "version": "0.5.2",
-      "sha256": "1dppd0jzzrifclic1bs6asjl2rbzygvbrjbc922xsz95wazgfmww",
+      "version": "0.5.4",
+      "sha256": "08rcshrmkvdabm0kgh3ghja2l3n1iixadl0nxxarn4r5mnx9nc2p",
       "depends": ["Biostrings", "ComplexHeatmap", "RColorBrewer", "alakazam", "argparser", "bookdown", "data_table", "dplyr", "ggplot2", "gridExtra", "magrittr", "scales", "stringdist", "stringr", "tidyr", "tigger"]
     },
     "ohenery": {
@@ -95707,12 +96337,6 @@
       "sha256": "0zw4r1sv46mfxzbp620a00wsh9i1dc21lmf1iadsdm4iss8pjk44",
       "depends": ["geojsonsf", "httr", "jsonlite", "readr", "sf"]
     },
-    "ohun": {
-      "name": "ohun",
-      "version": "1.0.2",
-      "sha256": "0l3c6p1q2mjvr03q905ygmaax94bn3a0fkfn8kfjr6d5bs60283s",
-      "depends": ["checkmate", "cli", "fftw", "ggplot2", "igraph", "rlang", "seewave", "sf", "tuneR", "warbleR"]
-    },
     "oii": {
       "name": "oii",
       "version": "1.0.2.1",
@@ -95791,6 +96415,12 @@
       "sha256": "03l53vbsard0hpaffcaa9l1aa3nh3w16j00k2jz2jqrrg02z0d7h",
       "depends": ["MASS", "broom", "data_table", "dplyr", "ff", "glmnet", "magrittr", "matrixStats", "purrr", "rlang", "tidyr"]
     },
+    "omixVizR": {
+      "name": "omixVizR",
+      "version": "1.1.3",
+      "sha256": "0qig9l4j62v1nzg1z487x7pb2hzw0rszd5n3lxn3ymh7xlcgq2wy",
+      "depends": ["data_table", "dplyr", "genpwr", "ggbreak", "ggplot2", "ggrepel", "ggsci", "ggtext", "magrittr", "purrr", "scales", "showtext", "sysfonts"]
+    },
     "omnibus": {
       "name": "omnibus",
       "version": "1.2.15",
@@ -95805,8 +96435,8 @@
     },
     "omopgenerics": {
       "name": "omopgenerics",
-      "version": "1.2.0",
-      "sha256": "16yq749h602rzqm9889hzzk35y3c07dcq6p72p408wlqjf3s42s2",
+      "version": "1.3.0",
+      "sha256": "0gmw2yr6xhr935fr77n89njhvzxpzwicr4gpzlcnwimgldq20nxm",
       "depends": ["cli", "dbplyr", "dplyr", "generics", "glue", "lifecycle", "purrr", "rlang", "snakecase", "stringi", "stringr", "tidyr", "vctrs"]
     },
     "ompr": {
@@ -95847,9 +96477,9 @@
     },
     "onbrand": {
       "name": "onbrand",
-      "version": "1.0.6",
-      "sha256": "1hnhnhzfmd3cjl9ibkydzcy9i7if1f1ykqj0a74wmawh37cv4iiv",
-      "depends": ["digest", "dplyr", "flextable", "ggplot2", "magrittr", "officer", "rlang", "stringr", "yaml"]
+      "version": "1.0.7",
+      "sha256": "1yhis24g5yjdjc5kzc7kdxxbblk4fhsnqpnz35g4gl5y8qd0aazp",
+      "depends": ["digest", "dplyr", "flextable", "ggplot2", "officer", "rlang", "stringr", "yaml"]
     },
     "onc_api": {
       "name": "onc.api",
@@ -95901,8 +96531,8 @@
     },
     "oneinfl": {
       "name": "oneinfl",
-      "version": "1.0.1",
-      "sha256": "05bymyrvd8a6wxdspd9640m7gjgli0gzasx6vyga64g6wcddf4b5",
+      "version": "1.0.2",
+      "sha256": "02j435ys1yy579nhd32sgakwvc8yv089ml9lrqgkrfs4v6jyc40d",
       "depends": []
     },
     "onelogin": {
@@ -95931,8 +96561,8 @@
     },
     "onewaytests": {
       "name": "onewaytests",
-      "version": "3.0",
-      "sha256": "0qmzgg869pdj3sfi8znd02z62px9n04fxl1psrfw8mxl4ainp0v7",
+      "version": "3.1",
+      "sha256": "06fjaascmalcxfbsrgdf3i2039iqjpgdg4vsgwysiqff28hk9fs2",
       "depends": ["car", "ggplot2", "moments", "nortest", "wesanderson"]
     },
     "onion": {
@@ -96223,12 +96853,6 @@
       "sha256": "1ydmms5xf92qn4417007p71c8w360x9h1sw2b3hql3l7dq12f3xa",
       "depends": ["Rcpp", "magrittr"]
     },
-    "opendataformat": {
-      "name": "opendataformat",
-      "version": "2.2.0",
-      "sha256": "0i14kfp48s1bjj0f2ksjgizxb4mlmqik78g0h0bs1zwdnrffhpsv",
-      "depends": ["cli", "data_table", "jsonlite", "magrittr", "tibble", "xml2", "zip"]
-    },
     "opendatatoronto": {
       "name": "opendatatoronto",
       "version": "0.1.6",
@@ -96243,8 +96867,8 @@
     },
     "openeo": {
       "name": "openeo",
-      "version": "1.4.0",
-      "sha256": "1b20b2zns81a5apmvcm4nv22acxngbvnxb2xzaq32kpw0mkm4hvf",
+      "version": "1.4.1",
+      "sha256": "1wyhbb7bkr2bpvr0cmd7i0lkhsfczgg0110l4c9mr5p02gdj6hjk",
       "depends": ["IRdisplay", "R6", "base64enc", "htmltools", "httr2", "jsonlite", "lubridate", "rlang", "sf"]
     },
     "opengraph": {
@@ -96271,6 +96895,12 @@
       "sha256": "0bcljsirlkxn0h87j2g2jb6spcik84h7nms06mcj40ckx188yr82",
       "depends": ["R6"]
     },
+    "openmpp": {
+      "name": "openmpp",
+      "version": "0.0.1",
+      "sha256": "1a5d8zfqbi76bdyxsinhrf97k37v1li5xjfbd73185xan51aj0zp",
+      "depends": ["R6", "cli", "curl", "glue", "httr2", "jsonlite", "purrr", "readr", "rlang", "tibble", "tidyr", "tidyselect"]
+    },
     "openrouteservice": {
       "name": "openrouteservice",
       "version": "0.6.2",
@@ -96303,16 +96933,10 @@
     },
     "openxlsx2": {
       "name": "openxlsx2",
-      "version": "1.16",
-      "sha256": "1id4z2l98y432h4430b8fnfivb2kz2ymxx3w8s583bc7115d271l",
+      "version": "1.18",
+      "sha256": "1v1hsk3nrkji1ryyn9knkqp0x4h6b7c09xjs769abybmk95k7mvp",
       "depends": ["R6", "Rcpp", "magrittr", "stringi", "zip"]
     },
-    "opera": {
-      "name": "opera",
-      "version": "1.2.0",
-      "sha256": "09gh0c74y3n25f9p1rya8ybql5mfaqkcnr8i8wwwzfm67vqdfrnh",
-      "depends": ["Rcpp", "RcppEigen", "Rdpack", "alabama", "htmltools", "htmlwidgets", "pipeR", "rAmCharts"]
-    },
     "operator_tools": {
       "name": "operator.tools",
       "version": "1.6.3",
@@ -96339,9 +96963,9 @@
     },
     "oppr": {
       "name": "oppr",
-      "version": "1.0.4",
-      "sha256": "1kyzrpr09fmx7rhbgwy5d1s8ggl7avcrs4vjb9s6m03w756zbb3a",
-      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "ape", "assertthat", "cli", "ggplot2", "lpSolveAPI", "magrittr", "proto", "tibble", "tidytree", "uuid", "viridisLite", "withr"]
+      "version": "1.0.5",
+      "sha256": "1ky2aicn4pgrs692snlps0cbzp6z1kjwvip7dnywx3d72x9426bv",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "ape", "assertthat", "cli", "ggplot2", "lpSolveAPI", "magrittr", "proto", "rlang", "tibble", "tidytree", "uuid", "viridisLite", "withr"]
     },
     "optBiomarker": {
       "name": "optBiomarker",
@@ -96429,8 +97053,8 @@
     },
     "opticut": {
       "name": "opticut",
-      "version": "0.1-3",
-      "sha256": "1knjxfz52gisnkz62m885zf4gn73dnkhc0q2wfvmhj02vqq0sfhf",
+      "version": "0.1-4",
+      "sha256": "0kgks2wk7b16rpz0f7ic13p5q31v530i72350hlkgxc1wggjphys",
       "depends": ["MASS", "ResourceSelection", "betareg", "mefa4", "pbapply", "pscl"]
     },
     "optifunset": {
@@ -96483,8 +97107,8 @@
     },
     "optimall": {
       "name": "optimall",
-      "version": "1.1.1",
-      "sha256": "0pc7bswfaz0fc9mjr8m29xvm9a1015fb80sr7si65zkkmjhxwldz",
+      "version": "1.2.0",
+      "sha256": "13xwj2mb1j1whr8786lam4g3sp7izj8nz0k25cz7fp07h3kzn28r",
       "depends": ["dplyr", "glue", "magrittr", "rlang", "tibble"]
     },
     "optimbase": {
@@ -96507,9 +97131,9 @@
     },
     "optimizeR": {
       "name": "optimizeR",
-      "version": "1.2.0",
-      "sha256": "1nymalz79mwsv7mvl7a5l8cllyls6rwwiq2aj682wf0mpzh12gcv",
-      "depends": ["R6", "TestFunctions", "checkmate", "cli", "lbfgsb3c", "oeli", "pracma", "ucminf"]
+      "version": "1.2.1",
+      "sha256": "0yjx628w3g8ksd2y34a0zhldhx3iz0g3npgj9pvs5ycrlknbf36z",
+      "depends": ["R6", "TestFunctions", "checkmate", "cli", "lbfgsb3c", "numDeriv", "oeli", "pracma", "ucminf"]
     },
     "optimos_prime": {
       "name": "optimos.prime",
@@ -96621,8 +97245,8 @@
     },
     "orcamentoBR": {
       "name": "orcamentoBR",
-      "version": "1.0.4",
-      "sha256": "1fjscbhhf6p8mhp50rm77yczpq4jfsh3g36zhlyzj3bzmfspg49m",
+      "version": "1.0.5",
+      "sha256": "0dd7ym65qhbsac0rbwgf2y01gglil236y9v24hycn8gjpxnl66kn",
       "depends": ["httr", "jsonlite"]
     },
     "orclus": {
@@ -96753,15 +97377,15 @@
     },
     "ordinalsimr": {
       "name": "ordinalsimr",
-      "version": "0.2.1",
-      "sha256": "1xjkmv77mc0sprbjrppd9wzkd4qqwnzd6ww91szdzv2igsnsi9lf",
+      "version": "0.2.2",
+      "sha256": "1g4l2cm5k104kj1pxm6ckgb0wr64yi8f3xvxj2ks9mzi3zdp7kmc",
       "depends": ["DT", "assertthat", "bslib", "callr", "coin", "config", "dplyr", "ggplot2", "golem", "rhandsontable", "rlang", "rms", "shiny", "shinyWidgets", "shinycssloaders", "tidyr", "withr"]
     },
     "ordr": {
       "name": "ordr",
-      "version": "0.1.1",
-      "sha256": "07nsl6mdm4dmyl8vsqzcpd2mihcxsm68gjx3v1dfqgjqmz477nvf",
-      "depends": ["dplyr", "generics", "ggplot2", "ggrepel", "labeling", "magrittr", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyselect"]
+      "version": "0.2.0",
+      "sha256": "0ysg1npqfgn8n3fpi7cxj8wfgvhbn10ams533h355mgqhds3shdy",
+      "depends": ["MASS", "cli", "dplyr", "generics", "gggda", "ggplot2", "ggrepel", "labeling", "magrittr", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "ore": {
       "name": "ore",
@@ -96801,9 +97425,9 @@
     },
     "orgutils": {
       "name": "orgutils",
-      "version": "0.5-0",
-      "sha256": "1gvj82m67xmi0kwd883zmqgxnc621q30bgbnnszm5fnb3y2ni7d6",
-      "depends": ["textutils"]
+      "version": "0.5-1",
+      "sha256": "1f4n9l218brbg5jvxlx9px74r669czkd5iwrq53nwb2iaj4wcr7n",
+      "depends": []
     },
     "orientlib": {
       "name": "orientlib",
@@ -96901,6 +97525,12 @@
       "sha256": "0l5dq8rj4rg4v324610kj2j5nv7py6z1jcplhb6br1gvldj7ng1d",
       "depends": []
     },
+    "osbng": {
+      "name": "osbng",
+      "version": "0.2.0",
+      "sha256": "05d7gxmj0kaaw7zcir7n2maxhsgh1sw64jp7vqdzfrx34fvnv4n1",
+      "depends": ["geos"]
+    },
     "osc": {
       "name": "osc",
       "version": "1.0.5",
@@ -96993,9 +97623,15 @@
     },
     "otargen": {
       "name": "otargen",
-      "version": "1.1.5",
-      "sha256": "1akqdz0qcc5clj2mqn71zqi7d93l5yihzr9d4wsk4pv9rsw3vqry",
-      "depends": ["cli", "dplyr", "ggiraphExtra", "ggplot2", "ggrepel", "ghql", "janitor", "jsonlite", "magrittr", "rlang", "stringr", "tibble", "tidyr"]
+      "version": "2.0.0",
+      "sha256": "0abqf3ibhnm5p1qiwqjvwvg87i7l4q22m35gv7qgxqpwvq8hxn6p",
+      "depends": ["cli", "dplyr", "ghql", "httr", "jsonlite", "magrittr", "tibble", "tidyr"]
+    },
+    "otel": {
+      "name": "otel",
+      "version": "0.1.0",
+      "sha256": "1zpfldzp319xdbaq1mch9ccpl7nk3s202zk422g34lwswgryjifa",
+      "depends": []
     },
     "otinference": {
       "name": "otinference",
@@ -97035,8 +97671,8 @@
     },
     "ottr": {
       "name": "ottr",
-      "version": "1.5.1",
-      "sha256": "0ixvisvzxfdznmdgy3jjknqmldryagp7nynvszf99lbxbnxcvdhj",
+      "version": "1.5.2",
+      "sha256": "0glfz21xw5wxzs6hbbr2w2ah2aa3i05kqvv6qf41ahwsrl4xxz01",
       "depends": ["R6", "jsonlite", "testthat", "zip"]
     },
     "ottrpal": {
@@ -97117,12 +97753,6 @@
       "sha256": "13z39pfc7fzxil5gc48s7b2f0zal4l4d8qw5xvwy4mlp010mwrc5",
       "depends": ["Rcereal", "Rcpp"]
     },
-    "outqrf": {
-      "name": "outqrf",
-      "version": "1.0.0",
-      "sha256": "0gl3ix39kx7n1akg1789nfqg84jxq5q9qdxwcmf8ch7zklbkgccb",
-      "depends": ["dplyr", "ggplot2", "ggpubr", "missRanger", "ranger", "tidyr"]
-    },
     "outreg": {
       "name": "outreg",
       "version": "0.2.2",
@@ -97159,6 +97789,12 @@
       "sha256": "01nsqzsgsnbx513lcb6lr94p7mlw0nnb6y02k2m04p35dqjxmfc5",
       "depends": ["spatstat_geom"]
     },
+    "overshiny": {
+      "name": "overshiny",
+      "version": "0.1.0",
+      "sha256": "06w17n6wy4lag1kll1iyb1pj5cibdpsc2l1bx4slikpl1ibj85gs",
+      "depends": ["ggplot2", "htmltools", "shiny", "shinyjqui", "shinyjs", "stringr"]
+    },
     "overtureR": {
       "name": "overtureR",
       "version": "0.2.5",
@@ -97197,8 +97833,8 @@
     },
     "owidapi": {
       "name": "owidapi",
-      "version": "0.1.0",
-      "sha256": "14npr3nf4iy59182lpzqi81hq0j754mgqnj8qpkrk4jkg8g4vfm6",
+      "version": "0.1.1",
+      "sha256": "1xannxprp79z7i3gxhd9znwvfy3fq88932vmqfs9zxpgblm176q7",
       "depends": ["cli", "httr2", "jsonlite", "lifecycle", "rlang", "tibble"]
     },
     "owmr": {
@@ -97335,9 +97971,9 @@
     },
     "pROC": {
       "name": "pROC",
-      "version": "1.18.5",
-      "sha256": "129cnh3kh9sr42nc7n9f14kr9svi3501834x40njynnzlr0wi4sm",
-      "depends": ["Rcpp", "plyr"]
+      "version": "1.19.0.1",
+      "sha256": "06g6f260g65s87hfam796j9ysazi6xrb6jmg1wpiji9w383ysqgi",
+      "depends": ["Rcpp"]
     },
     "pRSR": {
       "name": "pRSR",
@@ -97437,8 +98073,8 @@
     },
     "packrat": {
       "name": "packrat",
-      "version": "0.9.2",
-      "sha256": "1mvj2s78n2r66nlqq5bjrvgdwlwbcqdj81yryc34sv3y4m1mkpv9",
+      "version": "0.9.3",
+      "sha256": "1ml11wiy5gakvr96q8y69bwz9vq9s46iv9j9cmmx2vskbhmfcwyv",
       "depends": []
     },
     "pacman": {
@@ -97467,8 +98103,8 @@
     },
     "pacta_loanbook": {
       "name": "pacta.loanbook",
-      "version": "0.1.0",
-      "sha256": "10jafygzsksmfgj2cx8rmyj3zfhld15dpfjsn237hs5anxjjwavp",
+      "version": "0.1.1",
+      "sha256": "045x4awilasdydnixwghgrfcw3yadnp1knlpirp3k0mnjdh37spb",
       "depends": ["cli", "dplyr", "ggrepel", "magrittr", "purrr", "r2dii_analysis", "r2dii_data", "r2dii_match", "r2dii_plot", "rlang", "rstudioapi", "scales", "tibble", "tidyselect"]
     },
     "pacta_multi_loanbook": {
@@ -97483,6 +98119,12 @@
       "sha256": "1pyq429sq0g7zxc9zmnl823fj0fi1hd8a5x3zqdz9hb6qqdrpq0q",
       "depends": ["XML", "apsimx", "concaveman", "gstat", "httr", "jsonlite", "sf", "stars", "tmap", "units"]
     },
+    "paddleR": {
+      "name": "paddleR",
+      "version": "0.1.2",
+      "sha256": "0ji4bwr90d4x6x3b7alncsc8dzj4xqzqbv7niwbgj5kvlsqy9f7k",
+      "depends": ["httr2", "rlang"]
+    },
     "padr": {
       "name": "padr",
       "version": "0.6.3",
@@ -97495,12 +98137,6 @@
       "sha256": "1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5",
       "depends": ["curl", "exams", "stringr"]
     },
-    "pafr": {
-      "name": "pafr",
-      "version": "0.0.2",
-      "sha256": "0ali4m1pv73y88x1dk5rvmg1ysy48janjnc1hnqfcndszfz2b0wm",
-      "depends": ["dplyr", "ggplot2", "rlang", "stringr", "tibble"]
-    },
     "pagedown": {
       "name": "pagedown",
       "version": "0.22",
@@ -97519,12 +98155,6 @@
       "sha256": "0gcy9gsjb75v9wc03n1yazxnf1b4v5x8w4mwlsvv9d42kbx1ib3r",
       "depends": []
     },
-    "pageviews": {
-      "name": "pageviews",
-      "version": "0.6.0",
-      "sha256": "187gy6czxkicxghhklma87pfa23xcm07c4n9jfsr5yl9hwwfcna6",
-      "depends": ["curl", "httr", "jsonlite"]
-    },
     "pagoda2": {
       "name": "pagoda2",
       "version": "1.0.12",
@@ -97587,8 +98217,8 @@
     },
     "palaeoSig": {
       "name": "palaeoSig",
-      "version": "2.1-3",
-      "sha256": "121akb42lqzp2vvfj6kjlaxsivxd71r7vnwyg6pcymkin94r8c3k",
+      "version": "2.1-4",
+      "sha256": "1l8sdsk0wg28wwlnb6jn52sgfr4r94z10c7jp3jkpi89jlc5pi3w",
       "depends": ["MASS", "TeachingDemos", "assertr", "dplyr", "forcats", "ggplot2", "ggrepel", "magrittr", "mgcv", "purrr", "rioja", "rlang", "tibble", "tidyr", "vegan"]
     },
     "palaeoverse": {
@@ -97677,8 +98307,8 @@
     },
     "palettes": {
       "name": "palettes",
-      "version": "0.2.1",
-      "sha256": "0s0pdza87jq5p7biq4vnajl59gnw77m2yi0x05gb31nmvcicxf2b",
+      "version": "0.2.2",
+      "sha256": "1zzw1r2ij4dlxhw9b9iinz7kjsis98a91i6qym1b02w0h76av3dz",
       "depends": ["cli", "farver", "ggplot2", "pillar", "prismatic", "purrr", "rlang", "scales", "tibble", "vctrs"]
     },
     "palettesForR": {
@@ -97701,8 +98331,8 @@
     },
     "palm": {
       "name": "palm",
-      "version": "1.1.5",
-      "sha256": "108w8vsb41j1kwvymjcf5123xi8qiprcpiqynlvvfk1bp24jaz45",
+      "version": "1.1.6",
+      "sha256": "167i88ld6222sw7rldq94mb8z07s7haa8ps82dr36hc9mqkqj0ah",
       "depends": ["R6", "Rcpp", "gsl", "minqa", "mvtnorm"]
     },
     "palmerpenguins": {
@@ -97731,8 +98361,8 @@
     },
     "pam": {
       "name": "pam",
-      "version": "1.0.2",
-      "sha256": "0hg8ax25pi4sbl6gasms6rpfmxhkk50b9gfa6v55mczji7jkgv1y",
+      "version": "1.0.4",
+      "sha256": "0smwp4imymgzv9vfcmmn8nv5mmfp6zmpd4sphqlvd9ak0jq3i8gp",
       "depends": ["cowplot", "data_table", "dplyr", "ggplot2", "ggthemes", "gridExtra", "minpack_lm", "rlang"]
     },
     "pamm": {
@@ -97881,8 +98511,8 @@
     },
     "parTimeROC": {
       "name": "parTimeROC",
-      "version": "0.1.1",
-      "sha256": "15khi8zfjr2lxr4839nd8b80m2r7lh01vpggakq5wkv734rj445w",
+      "version": "0.2.0",
+      "sha256": "0cww4wzybzcym6fgqjpzds7a511ynisw555qp9d6m3fzj7h3zs6h",
       "depends": ["BH", "DescTools", "GofCens", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "VineCopula", "cubature", "flexsurv", "moments", "mvtnorm", "rstan", "rstantools", "sn", "survival"]
     },
     "parabar": {
@@ -97905,9 +98535,9 @@
     },
     "parafac4microbiome": {
       "name": "parafac4microbiome",
-      "version": "1.2.1",
-      "sha256": "0fjbkcskwc9l4b4sk5n6nijr2sj0dfv9xpf7j8nan0jagl2dihvv",
-      "depends": ["compositions", "cowplot", "doParallel", "dplyr", "foreach", "ggplot2", "ggpubr", "lifecycle", "magrittr", "mize", "multiway", "pracma", "rTensor", "rlang", "tidyr"]
+      "version": "1.3.2",
+      "sha256": "11pdhxs6cayyymf8zshqwpznnrb7xrdyh5viann53lk8iw9zx571",
+      "depends": ["compositions", "cowplot", "doParallel", "dplyr", "foreach", "ggplot2", "ggpubr", "lifecycle", "magrittr", "multiway", "pracma", "rTensor", "rlang", "tidyr"]
     },
     "parallelDist": {
       "name": "parallelDist",
@@ -97935,8 +98565,8 @@
     },
     "parallelly": {
       "name": "parallelly",
-      "version": "1.45.0",
-      "sha256": "03silxwvzd64gl1f2vchghwmb5jz3ib6p42v39nwhpfg0339q3sw",
+      "version": "1.45.1",
+      "sha256": "0pa8pzzqfi5k97z5wc3c0k4jna6w364w0xw0v42rp3zxhw23qpbb",
       "depends": []
     },
     "parallelpam": {
@@ -97965,8 +98595,8 @@
     },
     "parameters": {
       "name": "parameters",
-      "version": "0.26.0",
-      "sha256": "010qkk20bd8lr4gi1fawdjzghf6xczg7pb7cyfknjbc74lnl22kg",
+      "version": "0.27.0",
+      "sha256": "09pzisqqfbsz5rsg4icjjmvxwkhifs2nnffgnavscp27wvwhq2l3",
       "depends": ["bayestestR", "datawizard", "insight"]
     },
     "paramhetero": {
@@ -97983,8 +98613,8 @@
     },
     "paramlink": {
       "name": "paramlink",
-      "version": "1.1-5",
-      "sha256": "0a21cy8q3zv96zdq5q2hfkb2ga1fham00in7wfyyd9wpck9gp009",
+      "version": "1.1-6",
+      "sha256": "0izphg3vw1kz30c8zjxa3big5niq8hamr25qs11cds6f5f8fnsp0",
       "depends": ["assertthat", "kinship2", "maxLik"]
     },
     "paramlink2": {
@@ -98025,14 +98655,14 @@
     },
     "parcr": {
       "name": "parcr",
-      "version": "0.5.2",
-      "sha256": "0288l0jl246jp44zzi0avgz8yip23b64hg8pgnnadl7271xx0nvx",
+      "version": "0.5.3",
+      "sha256": "07z5p8n6wvvmv4z20m0m868655a28zr7pqgh3q0w3xh3k2ydyl7m",
       "depends": []
     },
     "parfm": {
       "name": "parfm",
-      "version": "2.7.7",
-      "sha256": "12kcvdpmp99lqgr1775xqjkcn3s5agng1hwhjq2sa3bgrjgmhsh5",
+      "version": "2.7.8",
+      "sha256": "149dsnka40gbwwc45ccrkdjwcgzf5p61v9h0mpcghm48pn84sy5g",
       "depends": ["msm", "optimx", "sn", "survival"]
     },
     "pargasite": {
@@ -98217,8 +98847,8 @@
     },
     "parzer": {
       "name": "parzer",
-      "version": "0.4.3",
-      "sha256": "1sfw1pg4kv22fdba9xg7gckz3cry3fd4ww5j8c79rf3ss7np10vs",
+      "version": "0.4.4",
+      "sha256": "09w06pb8gbcdy6839br6q728b3qdffiba1hjc4jcj26cdp8l99np",
       "depends": ["Rcpp", "withr"]
     },
     "pasadr": {
@@ -98295,8 +98925,8 @@
     },
     "patchwork": {
       "name": "patchwork",
-      "version": "1.3.0",
-      "sha256": "05ifwnrvlxk95nafvba09i7gq35i5xyxja51bfdvvkmalk26xbvp",
+      "version": "1.3.1",
+      "sha256": "1gli8m1r0d4kcbv2cyz39mx1c9pnpqbh7wf10kmlj9mia80bmrz3",
       "depends": ["cli", "farver", "ggplot2", "gtable", "rlang"]
     },
     "patentr": {
@@ -98319,8 +98949,8 @@
     },
     "pathfindR": {
       "name": "pathfindR",
-      "version": "2.5.0",
-      "sha256": "1a59wqc733wi0sn6aaanwm2y6gjzvfp0b7wkcpk8zm6xxdzkkck8",
+      "version": "2.5.1",
+      "sha256": "0qzms9hkkbjijrljdrs5i7x7kf4j6jqccg0516byc90z1m45l430",
       "depends": ["AnnotationDbi", "DBI", "R_utils", "doParallel", "foreach", "fpc", "ggkegg", "ggplot2", "ggraph", "ggupset", "httr", "igraph", "knitr", "msigdbr", "org_Hs_eg_db", "pathfindR_data", "rmarkdown"]
     },
     "pathfindR_data": {
@@ -98355,8 +98985,8 @@
     },
     "pathviewr": {
       "name": "pathviewr",
-      "version": "1.1.7",
-      "sha256": "0n3jv5zzwb7579ymv8s6vr7nzrc3gz5bi30yf6qvqixr8j0k4ggr",
+      "version": "1.1.8",
+      "sha256": "0zfd77yi09jzy8pkpxjzpwsa2lph94gs9qsx5jfzx02lp76pa8vl",
       "depends": ["R_matlab", "cowplot", "data_table", "dplyr", "fANCOVA", "ggplot2", "lubridate", "magrittr", "purrr", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "pathwayTMB": {
@@ -98415,8 +99045,8 @@
     },
     "pawacc": {
       "name": "pawacc",
-      "version": "1.2.3",
-      "sha256": "150bvmnv5myq856x19kg1ca9favcsh1cid70y8hv3wd9f25w9r8c",
+      "version": "1.2.4",
+      "sha256": "03795i0k993rzjdzf1qhcs6x3f3bpz5z4xqwakvdn7fh9p9m1i28",
       "depends": ["SparseM"]
     },
     "paws": {
@@ -98439,8 +99069,8 @@
     },
     "paws_common": {
       "name": "paws.common",
-      "version": "0.8.4",
-      "sha256": "11wsmrpca02x4jhg4msi3l0gk2jkpd4i0zk2pdxlsqry6v9hvjgm",
+      "version": "0.8.5",
+      "sha256": "02vr09hjg5142xhcdqlqygjjqzvd6y21s126dsvhilwf33irw4ng",
       "depends": ["Rcpp", "base64enc", "curl", "digest", "httr2", "jsonlite", "xml2"]
     },
     "paws_compute": {
@@ -98523,8 +99153,8 @@
     },
     "pbapply": {
       "name": "pbapply",
-      "version": "1.7-2",
-      "sha256": "04xf1p7c0066cwnxfmzaikbc322bxnw022ziv8kkhzlc6268rvdf",
+      "version": "1.7-4",
+      "sha256": "0b9hy4zva0n8s8lfk5ddfq10y3pc69dygcnkfi9p64xzlq872p3a",
       "depends": []
     },
     "pbatR": {
@@ -98571,10 +99201,16 @@
     },
     "pbkrtest": {
       "name": "pbkrtest",
-      "version": "0.5.4",
-      "sha256": "08nq4fjgh4156cpw1y9x10bk13j98ix5xr36cdbhyd3cfvskyind",
+      "version": "0.5.5",
+      "sha256": "06y5kcq0y2j8bc5hmvrsv4wjbmir8i1y7s5xhjhvnwzxlvq8wv6j",
       "depends": ["MASS", "Matrix", "broom", "doBy", "dplyr", "lme4", "numDeriv"]
     },
+    "pblm": {
+      "name": "pblm",
+      "version": "0.1-12",
+      "sha256": "1w0mv4nhdc5p91g35p4m4n6kkfqjgnc1md6randfchb8vi6yapj3",
+      "depends": ["MASS", "Matrix", "lattice"]
+    },
     "pbm": {
       "name": "pbm",
       "version": "1.2.1",
@@ -98655,8 +99291,8 @@
     },
     "pcadapt": {
       "name": "pcadapt",
-      "version": "4.4.0",
-      "sha256": "1b5sk6dy51465n96qyycy1i1lkiky7lwxycdmynv66xrkyyn3gas",
+      "version": "4.4.1",
+      "sha256": "0w3fmgzg6b1iqssi8hj2s6m3y9s60swlwmicwspxzby41hhn0nh3",
       "depends": ["RSpectra", "Rcpp", "bigutilsr", "data_table", "ggplot2", "magrittr", "mmapcharr", "rmio"]
     },
     "pcal": {
@@ -98733,8 +99369,8 @@
     },
     "pch": {
       "name": "pch",
-      "version": "2.1",
-      "sha256": "15dvrcrbcql54wf011r1a3pl3v2b551mq0pf4wcr7wjrf330h1w3",
+      "version": "2.2",
+      "sha256": "1cg1hjyczvhcx44gmkb5n6yd266lqmphi7p618zd6ip0qx015ank",
       "depends": ["Hmisc", "survival"]
     },
     "pchc": {
@@ -98847,8 +99483,8 @@
     },
     "pdcor": {
       "name": "pdcor",
-      "version": "1.0",
-      "sha256": "1qza222x30dd8larlza2byqx8pi4vbcynkdrr5nzmgkyvz1dwcmc",
+      "version": "1.2",
+      "sha256": "0f2k8pwj93ma6aac21zmvlg3i09grch9pzjkq57pjziyq4j65zvc",
       "depends": ["Rfast", "Rfast2", "dcov"]
     },
     "pder": {
@@ -98943,9 +99579,9 @@
     },
     "peacesciencer": {
       "name": "peacesciencer",
-      "version": "1.1.0",
-      "sha256": "06mlz2yjihm4xbdipv167ldf8z7r0ldwfn9day5c3lphg73fym5b",
-      "depends": ["dplyr", "geosphere", "lifecycle", "magrittr", "rlang", "stevemisc", "stringr", "tidyr"]
+      "version": "1.2.0",
+      "sha256": "0jcaxwinwndmm12id80gjldqkp0w45s5sndg9ri6hyw6kdjhgqdd",
+      "depends": ["dplyr", "geosphere", "isard", "lifecycle", "magrittr", "rlang", "stevemisc", "stringr", "tidyr"]
     },
     "peacots": {
       "name": "peacots",
@@ -98967,8 +99603,8 @@
     },
     "pec": {
       "name": "pec",
-      "version": "2023.04.12",
-      "sha256": "15ggf3fa1p5r0dl7k2j99cc920jvmk0p1ny0jzyrpddh8fcgwlk5",
+      "version": "2025.06.24",
+      "sha256": "07yab2zrs45wmwd0fmicm7383g8izv8n2dln5hc2z082sz77mfwf",
       "depends": ["foreach", "lava", "prodlim", "riskRegression", "rms", "survival", "timereg"]
     },
     "pecora": {
@@ -99057,9 +99693,9 @@
     },
     "pedquant": {
       "name": "pedquant",
-      "version": "0.2.4",
-      "sha256": "07b2jd3fryv3jdhp5wrsycnzfwhbx55dw34lxll60zn73m4ii24w",
-      "depends": ["PerformanceAnalytics", "TTR", "curl", "data_table", "echarts4r", "httr", "jsonlite", "lubridate", "readr", "readxl", "rvest", "stringi", "xefun", "zoo"]
+      "version": "0.2.5",
+      "sha256": "0rxb9vzljjzw1f2z99f59jvc55z947l7xqfwfkvdxn2hl6s0ar6w",
+      "depends": ["PerformanceAnalytics", "TTR", "curl", "data_table", "echarts4r", "htmlwidgets", "httr", "jsonlite", "lubridate", "readr", "readxl", "rvest", "stringi", "xefun", "zoo"]
     },
     "pedsuite": {
       "name": "pedsuite",
@@ -99069,8 +99705,8 @@
     },
     "pedtools": {
       "name": "pedtools",
-      "version": "2.8.1",
-      "sha256": "0wrzrw4ij0axazvflmlribzjyxa7c2j5cn2w3fzmqyfcddghwkq5",
+      "version": "2.8.2",
+      "sha256": "1dax7wkrym4fkfmil2553g1zfqjjwswid4j49nffl0d9fg5wdlij",
       "depends": ["kinship2", "pedmut"]
     },
     "pedtricks": {
@@ -99109,6 +99745,12 @@
       "sha256": "1hvqszfnqwbya73fs36d8mqz277nfbgrwga5z9jfxdnkalxw5bxq",
       "depends": []
     },
+    "pems_utils": {
+      "name": "pems.utils",
+      "version": "0.3.0.8",
+      "sha256": "1c255kw6ljmn7nbj6qwmb7jvnzcxvj3vw7chkplbmfsza0ym555z",
+      "depends": ["baseline", "dplyr", "ggplot2", "lattice", "loa", "rlang", "tibble"]
+    },
     "pemultinom": {
       "name": "pemultinom",
       "version": "0.1.1",
@@ -99117,8 +99759,8 @@
     },
     "penAFT": {
       "name": "penAFT",
-      "version": "0.3.0",
-      "sha256": "1yhg9fr3fwpxxcp0ri4iqfwa9f2y134y5b13qfils4y15cp0rnzj",
+      "version": "0.3.2",
+      "sha256": "07clr9q6l3g0szcr331baddwsmjbxjvj6v0wsmmxx3rqhgf7a9as",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "ggplot2", "irlba"]
     },
     "penMSM": {
@@ -99279,16 +99921,10 @@
     },
     "performance": {
       "name": "performance",
-      "version": "0.14.0",
-      "sha256": "1sibccf0kswv8gv8mk91593ikzkqigsj6n1bjflacihhjrpxyn1a",
+      "version": "0.15.0",
+      "sha256": "16qcb81lh93dywcq81rrf4n9ixkyx57ag1kkjfvw3yqx84fxif53",
       "depends": ["bayestestR", "datawizard", "insight"]
     },
-    "performanceEstimation": {
-      "name": "performanceEstimation",
-      "version": "1.1.0",
-      "sha256": "08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc",
-      "depends": ["dplyr", "ggplot2", "parallelMap", "tidyr"]
-    },
     "periscope": {
       "name": "periscope",
       "version": "1.0.4",
@@ -99351,8 +99987,8 @@
     },
     "permute": {
       "name": "permute",
-      "version": "0.9-7",
-      "sha256": "1h4dyhcsv8p3h3qxsy98pib9v79dddvrnq7qx6abkblsazxqzy7g",
+      "version": "0.9-8",
+      "sha256": "0jz357f7794na0rz1aqjcyng1dlv2d34hy4mfip5r4j6c193ij7j",
       "depends": []
     },
     "permutes": {
@@ -99549,8 +100185,8 @@
     },
     "pgenlibr": {
       "name": "pgenlibr",
-      "version": "0.4.0",
-      "sha256": "1l41m6ms5lvz8prk6r8qq8f35kr2r72jj54c0g5cy9j19jqql9xn",
+      "version": "0.5.3",
+      "sha256": "0ahg557hxn4kwbmppmaflcwxywhxjpnaqwdmkd9g8ffg69j36p6l",
       "depends": ["Rcpp"]
     },
     "pgirmess": {
@@ -99573,8 +100209,8 @@
     },
     "pgnorm": {
       "name": "pgnorm",
-      "version": "2.0",
-      "sha256": "1k9z7pvmranr8m62v7amc0pj6lwzh3wqi79gg3mflifn1mr6c057",
+      "version": "2.0.1",
+      "sha256": "1w8a15dxkppcirivdd1wr6js0nbiibmns80g90h4xyxdsr9bixga",
       "depends": []
     },
     "pgraph": {
@@ -99643,6 +100279,12 @@
       "sha256": "1h5d5ky5pb83rrss16mg8l9s8mk6l1alw3jga5mx5xmg5ii8w6jf",
       "depends": []
     },
+    "pharmaverseadamjnj": {
+      "name": "pharmaverseadamjnj",
+      "version": "0.0.1",
+      "sha256": "0z8z6jwhkis885wa4pd3nhj662gr6af6ara4q4z6nm92w82h1mjp",
+      "depends": ["pharmaverseadam"]
+    },
     "pharmaverseraw": {
       "name": "pharmaverseraw",
       "version": "0.1.0",
@@ -99651,10 +100293,16 @@
     },
     "pharmaversesdtm": {
       "name": "pharmaversesdtm",
-      "version": "1.2.0",
-      "sha256": "1q0hid9v6bb73fnvqlrvsv94hsa5sgk0az4bb4p01p9wj11mzyw3",
+      "version": "1.3.0",
+      "sha256": "1xalp0l305n1ixwy19nvisb83vrnjv7qh2w4h89hphhad9gbzixn",
       "depends": []
     },
+    "pharmaversesdtmjnj": {
+      "name": "pharmaversesdtmjnj",
+      "version": "0.0.1",
+      "sha256": "0y4dp8hnhmmw62qwaivb30wxqf5a29bb7cmyzlnahk1ski1cg05i",
+      "depends": ["pharmaversesdtm"]
+    },
     "pharmr": {
       "name": "pharmr",
       "version": "1.7.2",
@@ -99679,12 +100327,6 @@
       "sha256": "0dnyqa6jias2jqjqjpiq32jnd21ghb2shw45vdq8b5xyb8rxclwj",
       "depends": ["arrayhelpers", "boot", "coda", "ggplot2", "mvtnorm", "rjags"]
     },
-    "phaseR": {
-      "name": "phaseR",
-      "version": "2.2.1",
-      "sha256": "1gq882r4jkq8f0xm3qmjh4zx540sgpdhlj8894dhf5g6vhgaa1kd",
-      "depends": ["deSolve"]
-    },
     "phateR": {
       "name": "phateR",
       "version": "1.0.7",
@@ -99771,8 +100413,8 @@
     },
     "phenology": {
       "name": "phenology",
-      "version": "10.1",
-      "sha256": "088288idp4jgj1jcrqxij9p5phlh425r41v7wnvxghp066cg1snr",
+      "version": "10.3",
+      "sha256": "1991fv37xzmhsq6vzcmd6gngw07v50rg7lp5h0fzlgfvgxbfxsgb",
       "depends": ["HelpersMG", "numDeriv", "optimx"]
     },
     "phenomap": {
@@ -99873,8 +100515,8 @@
     },
     "photobiology": {
       "name": "photobiology",
-      "version": "0.13.0",
-      "sha256": "00k01z75a872w3zhwzq903q6lqj458snmmf7j3nak33rkyx67czw",
+      "version": "0.13.2",
+      "sha256": "15yd576mvbnad80cvq0268jhbzbds9i1073fg5bck60ky69l38jx",
       "depends": ["SunCalcMeeus", "caTools", "dplyr", "lubridate", "plyr", "polynom", "rlang", "splus2R", "stringr", "tibble", "tidyr", "zoo"]
     },
     "photobiologyFilters": {
@@ -100059,8 +100701,8 @@
     },
     "phyloregion": {
       "name": "phyloregion",
-      "version": "1.0.8",
-      "sha256": "10i5s3dv71nr0m3wmph2rynzg9zj8xqzb6a25r5kj66r8v91jz3d",
+      "version": "1.0.9",
+      "sha256": "15cr2h3dx9h6r63i5x186aqi8jrgf355gc932hny5zj173kkllk8",
       "depends": ["Matrix", "ape", "betapart", "clustMixType", "colorspace", "igraph", "maptpx", "phangorn", "predicts", "smoothr", "terra", "vegan"]
     },
     "phylosamp": {
@@ -100113,8 +100755,8 @@
     },
     "phylter": {
       "name": "phylter",
-      "version": "0.9.11",
-      "sha256": "1dkm6wfrmbbx7ygfbvk68mv4ay3986wzy0wadxskbbvbvqcshjqa",
+      "version": "0.9.12",
+      "sha256": "1x96j5wj9hgs6d9zg03cim7l6ja3y27zv3893i8h7k27bz7rai7m",
       "depends": ["RSpectra", "Rcpp", "RcppArmadillo", "RcppEigen", "Rfast", "ape", "ggplot2", "reshape2"]
     },
     "phyr": {
@@ -100171,6 +100813,12 @@
       "sha256": "1n7h1lvrivy7czzhisd9p3g187ivcyhzyjj7ahkimyb296gy8z1b",
       "depends": ["htmlwidgets"]
     },
+    "pickmax": {
+      "name": "pickmax",
+      "version": "0.1.0",
+      "sha256": "08z0gwh5gk0fy7srbs4q876j0b176s9zsivazl5hj1rlv7yws7v4",
+      "depends": ["dplyr", "magrittr", "rlang"]
+    },
     "picohdr": {
       "name": "picohdr",
       "version": "0.1.1",
@@ -100221,9 +100869,9 @@
     },
     "piiR": {
       "name": "piiR",
-      "version": "0.2.1",
-      "sha256": "0zn0bs418hxr33gfrmadd24270n32bixsrpi28k6sr20xgjcpyg5",
-      "depends": ["infotheo", "pROC"]
+      "version": "0.3.0",
+      "sha256": "0m4kqgcqgn6wz2x6565xbcikcvfgw64gbhb9kc96jm747pysprny",
+      "depends": []
     },
     "pikchr": {
       "name": "pikchr",
@@ -100233,8 +100881,8 @@
     },
     "pillar": {
       "name": "pillar",
-      "version": "1.10.2",
-      "sha256": "0ifnarggd1anxslf2yknc18dvq3lr31nzchai0q2bdi83gzf7nrc",
+      "version": "1.11.0",
+      "sha256": "04as1syizc0zbj03104x55s83z37kcjqgpwpmqkz6kpfbcp1si9k",
       "depends": ["cli", "glue", "lifecycle", "rlang", "utf8", "vctrs"]
     },
     "pim": {
@@ -100341,8 +100989,8 @@
     },
     "pipeflow": {
       "name": "pipeflow",
-      "version": "0.2.2",
-      "sha256": "1kdqgs0phaq1bqp2lbwjbi9zs4g67sy4bl5g3nxnpxmpnscm44xr",
+      "version": "0.2.3",
+      "sha256": "091f7mphw1d453gflyvxsw3256p7sqyqgc3q3i88bc3wjknxwj8m",
       "depends": ["R6", "data_table", "jsonlite", "lgr"]
     },
     "pipeliner": {
@@ -100443,8 +101091,8 @@
     },
     "pixmap": {
       "name": "pixmap",
-      "version": "0.4-13",
-      "sha256": "04g74v8g9r0f3czzk4r3n0wxyg7ldgfdlh21bas7axa9l10wdnz3",
+      "version": "0.4-14",
+      "sha256": "17psp66dbw72glyhpy37h0xkifp1nv2f2ghfnmk9pf4m3y9hqw96",
       "depends": []
     },
     "pk_unit_trans": {
@@ -100515,8 +101163,8 @@
     },
     "pkgdiff": {
       "name": "pkgdiff",
-      "version": "0.2.0",
-      "sha256": "0m9m012sslr60wgji4gp8bjrj3665zvc9xfyfa9d84qpmfl2zvda",
+      "version": "0.2.1",
+      "sha256": "1m201bmn0p038hmmaxggd5cfz9jjhmb8rqch07q4zp7kddc6ixmq",
       "depends": ["common", "cranlogs", "crayon", "rvest"]
     },
     "pkgdown": {
@@ -100731,8 +101379,8 @@
     },
     "pleLMA": {
       "name": "pleLMA",
-      "version": "0.2.1",
-      "sha256": "1n6q4x8qv00j0hikzzr600xgikhr462zm73zllb9n0valhmzy18z",
+      "version": "0.2.2",
+      "sha256": "1ywdz27x1l5x7n6isz8kncbr9w48q6gnf0xb5zmd5m3h3lfbm4vh",
       "depends": ["dfidx", "mlogit"]
     },
     "pleio": {
@@ -100833,14 +101481,14 @@
     },
     "plot3D": {
       "name": "plot3D",
-      "version": "1.4.1",
-      "sha256": "1x6ian6hfkaih2aa11z92qlihqqf5wmpc9705dzigafx8i4gfvfv",
+      "version": "1.4.2",
+      "sha256": "0xgxlpqvjf23wmwyn061mhs5hgw4xc0chy4knq56xcgfn3w7mcc8",
       "depends": ["misc3d"]
     },
     "plot3Drgl": {
       "name": "plot3Drgl",
-      "version": "1.0.4",
-      "sha256": "1p8vypid2v1n255hlpxxlbnf1lyv2jywls0jfm7scfms5aisk1vd",
+      "version": "1.0.5",
+      "sha256": "0x6w076paq5vnwlxgdwifl9aqcpjzzfck3a0r1xnp7rnkgpymkkm",
       "depends": ["plot3D", "rgl"]
     },
     "plot4fun": {
@@ -100911,9 +101559,9 @@
     },
     "plotdap": {
       "name": "plotdap",
-      "version": "1.0.3",
-      "sha256": "151vaz61ycm95sazbn7d03wr7hcmvcmbz12rjls334lp38735954",
-      "depends": ["cmocean", "dplyr", "gganimate", "ggnewscale", "ggplot2", "lazyeval", "lubridate", "magrittr", "mapdata", "maps", "raster", "rerddap", "scales", "sf", "tidyr", "viridis"]
+      "version": "1.1.0",
+      "sha256": "10r0wn9s73x71mamhkp3f8g9k7559x8x5s8qrnr6540x2r5l92cx",
+      "depends": ["cmocean", "dplyr", "gganimate", "ggnewscale", "ggplot2", "lazyeval", "lubridate", "magrittr", "mapdata", "maps", "raster", "rerddap", "rlang", "scales", "sf", "tidyr", "viridis"]
     },
     "plotfunctions": {
       "name": "plotfunctions",
@@ -100935,8 +101583,8 @@
     },
     "plotly": {
       "name": "plotly",
-      "version": "4.10.4",
-      "sha256": "0ryqcs9y7zan36zs6n1hxxy91pajldpax8q7cwcimlsmxnvrbafg",
+      "version": "4.11.0",
+      "sha256": "1cyf9c29jp6k3dizh96dx37dzr0rwwxv2lx15a3r0dcigv6hk45s",
       "depends": ["RColorBrewer", "base64enc", "crosstalk", "data_table", "digest", "dplyr", "ggplot2", "htmltools", "htmlwidgets", "httr", "jsonlite", "lazyeval", "magrittr", "promises", "purrr", "rlang", "scales", "tibble", "tidyr", "vctrs", "viridisLite"]
     },
     "plotlyGeoAssets": {
@@ -100959,9 +101607,9 @@
     },
     "plotor": {
       "name": "plotor",
-      "version": "0.6.0",
-      "sha256": "05l57vhza3yalwj3ja0swbarrqqsg5bw1d8l3knn2r5fn3ykrx37",
-      "depends": ["broom", "car", "cli", "detectseparation", "dplyr", "forcats", "ggplot2", "glue", "gt", "gtExtras", "janitor", "purrr", "rlang", "scales", "stringr", "tibble", "tidyselect"]
+      "version": "0.7.0",
+      "sha256": "08qgzsdn6hsqw93c9c7bvv6gyzrfwbsm9mn8ivlsrigdvbrg0lnj",
+      "depends": ["broom", "car", "cli", "detectseparation", "dplyr", "forcats", "ggplot2", "glue", "gt", "janitor", "purrr", "rlang", "scales", "stringr", "tibble", "tidyselect"]
     },
     "plotpc": {
       "name": "plotpc",
@@ -100995,8 +101643,8 @@
     },
     "plotthis": {
       "name": "plotthis",
-      "version": "0.7.0",
-      "sha256": "1rhw5d97asw4qkqcbgb7xlgax4xfwi3dzwfnyf0mxb4wqcl1aybl",
+      "version": "0.7.3",
+      "sha256": "0q076a905p12j0ii24y8n23a6wfkjvy1ga1zx4ag6lg04s4k83sf",
       "depends": ["circlize", "cowplot", "dplyr", "forcats", "ggnewscale", "ggplot2", "ggrepel", "glue", "gridtext", "gtable", "patchwork", "reshape2", "rlang", "scales", "stringr", "tidyr", "zoo"]
     },
     "plotwidgets": {
@@ -101509,12 +102157,6 @@
       "sha256": "0vmggbvacpbdz4zvn3cinip1b0ac44vgbydmsk6698hwgx9iwmfp",
       "depends": ["dplyr", "lubridate", "purrr"]
     },
-    "pollimetry": {
-      "name": "pollimetry",
-      "version": "1.0.1",
-      "sha256": "09zmcwlgzl4fnkdg2m424ibv3izzrm595c7pi4mc3bd1g8sa2ypn",
-      "depends": ["brms", "repmis"]
-    },
     "pollster": {
       "name": "pollster",
       "version": "0.1.6",
@@ -101589,14 +102231,14 @@
     },
     "polyglotr": {
       "name": "polyglotr",
-      "version": "1.6.0",
-      "sha256": "1cj7c6dipgs025xhwap9krilr6427y5l61ardl4jxl3swigi190j",
+      "version": "1.7.0",
+      "sha256": "1bwvynfgmsz8avz9f3frr21rr8wram284l3cslsqblnfq64dmksr",
       "depends": ["RCurl", "dplyr", "httr", "jsonlite", "magrittr", "purrr", "rlang", "rvest", "stringr", "tibble", "urltools"]
     },
     "polykde": {
       "name": "polykde",
-      "version": "1.1.4",
-      "sha256": "02gw7xwyfdblf13b9r4ww6v46l5kff6irzsnnv5afgjf71n7fw9c",
+      "version": "1.1.7",
+      "sha256": "0bhyjhx2w423q0igxasal8r1izrq5bzx25lp6d6ifniksqi8lyqr",
       "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "abind", "doFuture", "foreach", "future", "gsl", "movMF", "progressr", "rotasym", "sphunif"]
     },
     "polylabelr": {
@@ -101835,8 +102477,8 @@
     },
     "poppr": {
       "name": "poppr",
-      "version": "2.9.6",
-      "sha256": "0cn62r584dfvz57in0666m4fsx9yd7xv8rawwgrhrqxs911pgzfd",
+      "version": "2.9.7",
+      "sha256": "1ax9mifdc3x6jxjj68fw5p4nypsm3i192n6s6lc5if1bq5982mfz",
       "depends": ["ade4", "adegenet", "ape", "boot", "dplyr", "ggplot2", "igraph", "magrittr", "pegas", "polysat", "progressr", "rlang", "shiny", "vegan"]
     },
     "popsom7": {
@@ -101877,8 +102519,8 @@
     },
     "poputils": {
       "name": "poputils",
-      "version": "0.4.1",
-      "sha256": "0s4srswgr74m7yf2rdv002f4hr6v9wwbrp6ahw2icwplmlkrkg2r",
+      "version": "0.4.2",
+      "sha256": "0c7gxsx2wb3pvf582ik33y1sjyzba7g17l8iy5zybsk56ghyn4fk",
       "depends": ["cli", "cpp11", "rlang", "rvec", "tibble", "tidyselect", "vctrs"]
     },
     "porridge": {
@@ -101895,9 +102537,9 @@
     },
     "portalr": {
       "name": "portalr",
-      "version": "0.4.3",
-      "sha256": "1n6p1ighh5m209snfsy7fr71mz7bg9lyg4lnscaczaq9x91sjk9d",
-      "depends": ["cli", "clipr", "dplyr", "forecast", "httr", "lubridate", "lunar", "magrittr", "rlang", "tidyr", "tidyselect", "zoo"]
+      "version": "0.4.4",
+      "sha256": "0aabz00gg2nfdc4jswlkhk5wxsccckpvnavfk444by7dvgcpq4lz",
+      "depends": ["cli", "clipr", "dplyr", "forecast", "httr", "lubridate", "lunar", "magrittr", "rlang", "tibble", "tidyr", "tidyselect", "zoo"]
     },
     "portes": {
       "name": "portes",
@@ -101973,8 +102615,8 @@
     },
     "postcard": {
       "name": "postcard",
-      "version": "1.0.0",
-      "sha256": "1k9sar32rb46qa2i5qkng93v5ysbfd597ih5gpdr9b98m5cn0vbj",
+      "version": "1.0.1",
+      "sha256": "110wd7v4rljbmwymsx6z3q1gi5274lnzb61ksgp4f5bj147bzhf8",
       "depends": ["Deriv", "cli", "dplyr", "earth", "generics", "magrittr", "options", "parsnip", "rlang", "rsample", "stringr", "tidyselect", "tune", "workflowsets", "xgboost", "yardstick"]
     },
     "postcards": {
@@ -102147,8 +102789,8 @@
     },
     "powerSurvEpi": {
       "name": "powerSurvEpi",
-      "version": "0.1.3",
-      "sha256": "1p1fw4jq4rxc273hmycxf4bkqm6zmfw0jdy2s65jy10q37r53ial",
+      "version": "0.1.5",
+      "sha256": "0912ayscqgwmaym5p7a6mlggv77lhawg9rxa6a56n3fzx4cwi3ak",
       "depends": ["pracma", "survival"]
     },
     "powerbiR": {
@@ -102271,6 +102913,12 @@
       "sha256": "1j9l6gswri0in4zswqdpcfk5ki9r885ngk9883zdxp0p7k4d37fp",
       "depends": []
     },
+    "ppls": {
+      "name": "ppls",
+      "version": "2.0.0",
+      "sha256": "0yabadgrpx2cwk2nj0f858h8cnsm0k7crk4n7r13khpkwxfkmkg9",
+      "depends": ["MASS"]
+    },
     "ppmHR": {
       "name": "ppmHR",
       "version": "1.0",
@@ -102297,8 +102945,8 @@
     },
     "pprof": {
       "name": "pprof",
-      "version": "1.0.1",
-      "sha256": "1i5vf2815gli269jj5y2b181mjv1spr7q5ybnk876nvry4g807lr",
+      "version": "1.0.2",
+      "sha256": "1dvx2qr3vqwhzykp6l86wprrsk8q82pm5cmgqxc6ml2hxc6qf9sf",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "caret", "dplyr", "ggplot2", "lme4", "magrittr", "olsrr", "pROC", "poibin", "rlang", "scales", "tibble"]
     },
     "pps": {
@@ -102333,8 +102981,8 @@
     },
     "pqrBayes": {
       "name": "pqrBayes",
-      "version": "1.1.3",
-      "sha256": "05c5d40wgd5g755vai004y6xhwp9acah295m43s797cjs4a17kn8",
+      "version": "1.1.4",
+      "sha256": "01ksdrf702jfx9s5qcgvg1bazr98bmyp22f0vjsmylcnxzgzdljb",
       "depends": ["Rcpp", "RcppArmadillo", "glmnet"]
     },
     "pqrfe": {
@@ -102351,9 +102999,9 @@
     },
     "praatpicture": {
       "name": "praatpicture",
-      "version": "1.4.3",
-      "sha256": "1j3092d40vjygd2ybmxnx02bd14384yplc7hyvmlamfn7l4w9aq7",
-      "depends": ["av", "bslib", "crayon", "emuR", "gifski", "gsignal", "ipa", "phonTools", "rPraat", "reticulate", "rstudioapi", "shiny", "shinyjs", "soundgen", "tuneR", "wrassp", "zoo"]
+      "version": "1.5.0",
+      "sha256": "0h7ln81n84rrvzz72xlw6g8iysi2c8ni5s4pzwhhwv09q4z7px5p",
+      "depends": ["av", "bslib", "crayon", "emuR", "gifski", "gsignal", "ipa", "phonTools", "rPraat", "rstudioapi", "shiny", "shinyjs", "soundgen", "tuneR", "wrassp", "zoo"]
     },
     "prabclus": {
       "name": "prabclus",
@@ -102381,8 +103029,8 @@
     },
     "prais": {
       "name": "prais",
-      "version": "1.1.3",
-      "sha256": "0mwg87z2rki1g50464h9q25i28zm0glhyzaar5xvls9xvqx96dvm",
+      "version": "1.1.4",
+      "sha256": "099yvyry359bkp2gbr80f6cdk21119cylx3pgk6h5cqszglyc1ks",
       "depends": ["pcse", "sandwich"]
     },
     "praise": {
@@ -102471,8 +103119,8 @@
     },
     "predRupdate": {
       "name": "predRupdate",
-      "version": "0.2.0",
-      "sha256": "0wy5yrzsp36gyb6za4965xnk1pkii895a510zkghybarxnsxcb1h",
+      "version": "0.2.1",
+      "sha256": "1yy4c784k7hbrb0a944v46wzmyvyzxyb9bzdba8x8liay0d85nl0",
       "depends": ["ggplot2", "ggpubr", "pROC", "rlang", "survival"]
     },
     "predfairness": {
@@ -102547,6 +103195,12 @@
       "sha256": "1z2a3mjy28jn4gzq8myfslkvkry380fjp59i7xf8iz3wbg5pkszm",
       "depends": ["terra"]
     },
+    "predictsr": {
+      "name": "predictsr",
+      "version": "0.1.1",
+      "sha256": "161q2ni36hm6b1hwhbzrcp8q1qd1kqhqqysbz8vf7fz2r8ja1vqb",
+      "depends": ["glue", "httr2", "jsonlite", "logger"]
+    },
     "predieval": {
       "name": "predieval",
       "version": "0.1.1",
@@ -102555,8 +103209,8 @@
     },
     "predint": {
       "name": "predint",
-      "version": "2.2.1",
-      "sha256": "1db5nzwhj2zjzqpdrp0phcwxxgn4pdphb05hjlyc9r58hspg8k11",
+      "version": "2.3.0",
+      "sha256": "013r4mp92436g1rkicgmcqhvqaazid9208cb6ibzhikjqrr1i72b",
       "depends": ["MASS", "ggplot2", "lme4"]
     },
     "predtools": {
@@ -102607,6 +103261,12 @@
       "sha256": "19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v",
       "depends": ["dplyr", "psych", "reshape2"]
     },
+    "prepost": {
+      "name": "prepost",
+      "version": "0.3.0",
+      "sha256": "14jw31rd6rk9309g5d0hc0bzvx4rmsv9blclw2nlcrlkd5slxz6f",
+      "depends": ["BayesLogit", "Rglpk", "gtools", "lpSolve", "progress"]
+    },
     "prepplot": {
       "name": "prepplot",
       "version": "1.0-2",
@@ -102691,12 +103351,6 @@
       "sha256": "18bb2wqdw71j4gkdxf9blvg8mca2rq5wjwq5wyjqkvaxdlkn5din",
       "depends": ["cli", "dplyr", "rlang", "stringr"]
     },
-    "prettifyAddins": {
-      "name": "prettifyAddins",
-      "version": "2.6.1",
-      "sha256": "0ncj10j1ygc1dhlqdg5vklzf258bjbg6mry8i8vqqh1dxvl2djwr",
-      "depends": ["XRJulia", "chromote", "httr", "rstudioapi", "shiny", "webdriver", "xml2"]
-    },
     "prettyB": {
       "name": "prettyB",
       "version": "0.2.2",
@@ -102789,8 +103443,8 @@
     },
     "pricelevels": {
       "name": "pricelevels",
-      "version": "1.3.0",
-      "sha256": "1mi949l7fczcsha81qlviaq14882062v7wr4raxavhb5hg1m057r",
+      "version": "1.4.0",
+      "sha256": "1a9zzdzb0279dvzwql6axjxdrmb8mx3rrnp4r31sk2j0bax90a52",
       "depends": ["data_table", "minpack_lm"]
     },
     "pricesensitivitymeter": {
@@ -102799,6 +103453,12 @@
       "sha256": "136y3dfm6chznp8bnyw6xd9wkv265j3ykqicxib1vwgwaprg6zdm",
       "depends": ["ggplot2", "rlang", "survey"]
     },
+    "pridit": {
+      "name": "pridit",
+      "version": "1.1.0",
+      "sha256": "1q15dz0918ln3zrw149vg7m42sf21zj7c0h090896lshncdq64y2",
+      "depends": []
+    },
     "prim": {
       "name": "prim",
       "version": "1.0.22",
@@ -102987,8 +103647,8 @@
     },
     "probably": {
       "name": "probably",
-      "version": "1.1.0",
-      "sha256": "1rpv9mn4w52d49rr5s359is1jfyzbv3syf8fid2z3k77hbh203vy",
+      "version": "1.1.1",
+      "sha256": "03n2f066l1yb59y7zf884zsj06y0jzni8x8m9jfmdy92wpm63zz5",
       "depends": ["butcher", "cli", "dplyr", "furrr", "generics", "ggplot2", "hardhat", "pillar", "purrr", "rlang", "tidyr", "tidyselect", "tune", "vctrs", "withr", "workflows", "yardstick"]
     },
     "probe": {
@@ -103027,12 +103687,6 @@
       "sha256": "1jdaizvsmw1ipbjm2qbgfvnkaz68zga7i8lp7yjf5rfzjvfi1hwq",
       "depends": []
     },
-    "processanimateR": {
-      "name": "processanimateR",
-      "version": "1.0.5",
-      "sha256": "054m578ifb4hhlalijkdmjxifn36vy61sdzjgcr1gg4yxfi2fbx3",
-      "depends": ["DiagrammeR", "bupaR", "dplyr", "htmltools", "htmlwidgets", "magrittr", "processmapR", "rlang", "stringr", "tidyr"]
-    },
     "processcheckR": {
       "name": "processcheckR",
       "version": "0.1.4",
@@ -103041,8 +103695,8 @@
     },
     "processmapR": {
       "name": "processmapR",
-      "version": "0.5.6",
-      "sha256": "0152v160gh1m0805a9gbk21k71l1mqvddha7zlk4ydqqf9gm0qbw",
+      "version": "0.5.7",
+      "sha256": "0qcq07ayvd0i7jidm0ad6sgkzl5d6zzdkvm3fbdcsh4lbbiz3x1j",
       "depends": ["BH", "DiagrammeR", "Rcpp", "bupaR", "cli", "data_table", "dplyr", "edeaR", "forcats", "ggplot2", "glue", "hms", "htmltools", "htmlwidgets", "lifecycle", "miniUI", "plotly", "purrr", "rlang", "scales", "shiny", "stringr", "tidyr"]
     },
     "processmonitR": {
@@ -103065,8 +103719,8 @@
     },
     "proclhmm": {
       "name": "proclhmm",
-      "version": "1.0.0",
-      "sha256": "05pwa09bkclzshyk3jsnhsj43vdp89miw3zznj082zj9484vfhzj",
+      "version": "1.0.1",
+      "sha256": "0hpv2brfypwh0dgr5asz44zz7pmpkbd1m83bnjdbq73n1y1wg0i7",
       "depends": ["Rcpp", "statmod"]
     },
     "procmaps": {
@@ -103077,8 +103731,8 @@
     },
     "procs": {
       "name": "procs",
-      "version": "1.0.6",
-      "sha256": "06hsdzw23854pc9zirbbfzm451ybllrp5gx6b4bk0pd8wv1iza01",
+      "version": "1.0.7",
+      "sha256": "0bfnjclf08lqv6nwdhb8j1z6am2i3hlyjw6hh83cm0sd2dmaqa7y",
       "depends": ["common", "fmtr", "reporter", "sasLM", "tibble"]
     },
     "prodest": {
@@ -103131,8 +103785,8 @@
     },
     "profileCI": {
       "name": "profileCI",
-      "version": "1.0.0",
-      "sha256": "08akp2wdb4iy15b8k0ncwwmpbb9ipc52hp8jnr25mbaanbsgaqnf",
+      "version": "1.1.0",
+      "sha256": "1v5ysx8b0kn9mq4w392hyhy138g4cjh0gp77w3nam01pcv856jwc",
       "depends": ["itp"]
     },
     "profileModel": {
@@ -103189,12 +103843,6 @@
       "sha256": "1x2cpykcmq5a30c0mf22h2pnnanqij0yqjv3q33xzx11c07fpzfj",
       "depends": ["htmlwidgets", "rlang", "vctrs"]
     },
-    "progenyClust": {
-      "name": "progenyClust",
-      "version": "1.2",
-      "sha256": "0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l",
-      "depends": ["Hmisc"]
-    },
     "progress": {
       "name": "progress",
       "version": "1.2.3",
@@ -103233,8 +103881,8 @@
     },
     "projpred": {
       "name": "projpred",
-      "version": "2.8.0",
-      "sha256": "1xm1444qv0pkxdf2nacxnb2apx5lar1f3qz4jrxp6xd2xk2xv0xk",
+      "version": "2.9.0",
+      "sha256": "01h6q7wc1faymg6mpfsgzc23ff3icfah3grpcwghs1d4g8rhk0g7",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "abind", "gamm4", "ggplot2", "gtools", "lme4", "loo", "mclogit", "mgcv", "mvtnorm", "nnet", "ordinal", "rstantools", "scales"]
     },
     "prolific_api": {
@@ -103293,8 +103941,8 @@
     },
     "prompter": {
       "name": "prompter",
-      "version": "1.2.0",
-      "sha256": "18bbgcirw6z1vwna4bad4f4s4wnfq62bf9mzkakzlrn59kq9rxgc",
+      "version": "1.2.1",
+      "sha256": "1zm1sj22k78f5m1s20b440pgb5w9fjbmyvkcz491h8w2kx728nhp",
       "depends": ["shiny"]
     },
     "promptr": {
@@ -103581,8 +104229,8 @@
     },
     "psborrow": {
       "name": "psborrow",
-      "version": "0.2.2",
-      "sha256": "0zv50zfg1hmnjg0fyksfn93ib1cj6wjgd6h51408x8fz0jqrqs0s",
+      "version": "0.2.3",
+      "sha256": "06jmhg0n091b90bfv053mhlm2xq9s79hnj1r82rav60rl3zkn54w",
       "depends": ["MatchIt", "data_table", "doParallel", "dplyr", "foreach", "futile_logger", "ggplot2", "mvtnorm", "rjags", "survival"]
     },
     "psborrow2": {
@@ -103605,8 +104253,8 @@
     },
     "pscore": {
       "name": "pscore",
-      "version": "0.4.0",
-      "sha256": "0flzqr9x0z2mjnbm5cjm8hqndkbv2yp11agkx89mbaafsg0hmjn1",
+      "version": "0.4.1",
+      "sha256": "0drhgsghij4gjgi8pgq26llrrqcxzydsg24iyv9xxfw7m3gzr2gs",
       "depends": ["JWileymisc", "ggplot2", "lavaan", "reshape2"]
     },
     "psd": {
@@ -103665,8 +104313,8 @@
     },
     "psgp": {
       "name": "psgp",
-      "version": "0.3-21",
-      "sha256": "1pcg6q1g5ipial8kyk20n15zzls4ig0m0sxcc7d3ngryir89cyzs",
+      "version": "0.3-23",
+      "sha256": "0n2ffqsl9nkg9rwvlzq4fsa60lsk931c8ni37wngh77d38vdkw19",
       "depends": ["Rcpp", "RcppArmadillo", "automap", "doParallel", "foreach", "gstat", "intamap", "sp"]
     },
     "psica": {
@@ -103683,8 +104331,8 @@
     },
     "psidread": {
       "name": "psidread",
-      "version": "1.0.3",
-      "sha256": "0k1rk5bsdhf9x7znmq99snw8p5qfnysz7hlh7s7adg7hn79rifx4",
+      "version": "1.0.5",
+      "sha256": "1l5l8z6r81xrcwqv2by2i9shgqiirpww9c98mq9sidmha5p8nh7v",
       "depends": ["asciiSetupReader", "dplyr", "stringr", "tidyr"]
     },
     "psm3mkv": {
@@ -103755,8 +104403,8 @@
     },
     "psvd": {
       "name": "psvd",
-      "version": "0.1-0",
-      "sha256": "1j6qlmzpqdjh2vzmn8xyry739rpnfpb57y3gpgv1lg93wcinchhq",
+      "version": "1.0-0",
+      "sha256": "0alav79g1cvci6cnjk2lnn6hnp9lzs6lijascbah6b7b9z9602np",
       "depends": []
     },
     "psvmSDR": {
@@ -103785,8 +104433,8 @@
     },
     "psych": {
       "name": "psych",
-      "version": "2.5.3",
-      "sha256": "1glgpbsf83b9ibj4rbxhz433634jhfx7jh4r0czfzf76w92vr76x",
+      "version": "2.5.6",
+      "sha256": "042i67n1dad1kzznfh1rzkp2bg9x9n9ky2rbnbd7vgp6yh7fpmyf",
       "depends": ["GPArotation", "lattice", "mnormt", "nlme"]
     },
     "psychReport": {
@@ -103797,8 +104445,8 @@
     },
     "psychTools": {
       "name": "psychTools",
-      "version": "2.5.3",
-      "sha256": "1hyb14z0swdffm5mk1qbxg5dykhlw0ymgb5id9m7r5raprcxhg0x",
+      "version": "2.5.7.22",
+      "sha256": "1cdza3b6sp0n753vrqyzx0k8qxblsxx9zcnjm75r2gblm1hvkymd",
       "depends": ["foreign", "psych", "rtf"]
     },
     "psychmeta": {
@@ -103839,8 +104487,8 @@
     },
     "psychotree": {
       "name": "psychotree",
-      "version": "0.16-1",
-      "sha256": "04ipl6kadfvyl28wx8jbpisb4pcswrwq1qiqm90h47ldbnmha932",
+      "version": "0.16-2",
+      "sha256": "0v3hcrvscdd6m6g37ihacr33bfs6vmbvfb1yd17hyj4a77xzdnzb",
       "depends": ["Formula", "partykit", "psychotools"]
     },
     "psychrolib": {
@@ -104073,8 +104721,8 @@
     },
     "purrr": {
       "name": "purrr",
-      "version": "1.0.4",
-      "sha256": "0m4fkd047z0p7pd0vp819h6x6n7rmrmi53kvdbjslp8wclj3f0bc",
+      "version": "1.1.0",
+      "sha256": "1d35kjimz8s52a3pdyz4x7h10cchr4qpvd8zp2rpz9h97gzqplia",
       "depends": ["cli", "lifecycle", "magrittr", "rlang", "vctrs"]
     },
     "purrrlyr": {
@@ -104095,12 +104743,24 @@
       "sha256": "05ma76jhk00m9872f7gb0vwmk2q3l79r1ddaf1slbhgd57l1avk2",
       "depends": ["checkmate", "cli", "glue", "httr", "rlang"]
     },
+    "putior": {
+      "name": "putior",
+      "version": "0.1.0",
+      "sha256": "17dq7fdf4mmrvkikyi1whvij8c9hig9kwizg7rzb27n0hh0j7q28",
+      "depends": []
+    },
     "puzzle": {
       "name": "puzzle",
       "version": "0.0.1",
       "sha256": "073n074irsvn4w1jy5xmr6l24a209kn0ypvf1d2zn3p6yd93wzss",
       "depends": ["dplyr", "kableExtra", "lubridate", "plyr", "readr", "readxl", "reshape", "reshape2", "sqldf", "tidyverse"]
     },
+    "pvEBayes": {
+      "name": "pvEBayes",
+      "version": "0.1.1",
+      "sha256": "0hlcc239yj6p7ybv74s8gx4w4lzal951mpyki1yd5kqan5x35vb2",
+      "depends": ["REBayes", "Rcpp", "RcppEigen", "SobolSequence", "data_table", "ggdist", "ggfittext", "ggplot2", "glue", "magrittr", "wacolors"]
+    },
     "pvLRT": {
       "name": "pvLRT",
       "version": "0.5.1",
@@ -104149,6 +104809,12 @@
       "sha256": "0vyrrgbj955jkir25svq59h8darvaf33m985mcy1dx6836zqwgap",
       "depends": ["ggplot2"]
     },
+    "pwSEM": {
+      "name": "pwSEM",
+      "version": "1.0.0",
+      "sha256": "0vmhjh9sa04b4g736yacpz4a3mw8r0b6f9wkqq2rbgzdd2kywmx2",
+      "depends": ["copula", "gamm4", "ggm", "igraph", "mgcv", "poolr"]
+    },
     "pwlmm": {
       "name": "pwlmm",
       "version": "1.1.1",
@@ -104343,8 +105009,8 @@
     },
     "qad": {
       "name": "qad",
-      "version": "1.0.4",
-      "sha256": "1pvdm6h5zilvrpggvy5qq5lhxxblslkjvjjfdj1f5zaick2hmf3s",
+      "version": "1.0.5",
+      "sha256": "1jn71nwnzib8rk102l5gqwz1dl1xdjrwlqzrqj2sx4jw37h718pr",
       "depends": ["Rcpp", "copula", "cowplot", "data_table", "dplyr", "ggExtra", "ggplot2", "viridis"]
     },
     "qap": {
@@ -104415,8 +105081,8 @@
     },
     "qch": {
       "name": "qch",
-      "version": "2.0.0",
-      "sha256": "1d2mcyzfnpmr4pv036crhsc91gypj0jrn6hmd9jcnm49khqc0lan",
+      "version": "2.1.0",
+      "sha256": "0s0qxkahlyzpzvy5n94q9hk49kmlb39jzrjyqra8kr1l092avfhr",
       "depends": ["Rcpp", "RcppArmadillo", "copula", "dplyr", "ks", "purrr", "qvalue", "stringr"]
     },
     "qcluster": {
@@ -104517,8 +105183,8 @@
     },
     "qgcompint": {
       "name": "qgcompint",
-      "version": "1.0.0",
-      "sha256": "12zkzlfjfpazmz1cp713nqf1wsbhnqvm63jc9s2hvpsdrwzhdd52",
+      "version": "1.0.2",
+      "sha256": "1mripval0w7qdm1nzw56y18jrmb72f99h9fmfmzwi8kj42s4pk25",
       "depends": ["MASS", "arm", "future", "future_apply", "ggplot2", "gridExtra", "numDeriv", "qgcomp", "rootSolve", "survival"]
     },
     "qgg": {
@@ -104553,8 +105219,8 @@
     },
     "qicharts2": {
       "name": "qicharts2",
-      "version": "0.8.0",
-      "sha256": "08nq83mimcifb2nnq4jzbfynkxhinhl3j8lmjgx5hk3xw8zghwkh",
+      "version": "0.8.1",
+      "sha256": "1h2c9f3nv14a9cb69vvfcrrfskigpa229i52yvqcc5h899wf8xlc",
       "depends": ["ggplot2", "scales"]
     },
     "qif": {
@@ -104583,20 +105249,14 @@
     },
     "qlcMatrix": {
       "name": "qlcMatrix",
-      "version": "0.9.8",
-      "sha256": "0d38jb653787s05g8syc9wgaljaifmkviijwz5rzcd881glgs8sv",
+      "version": "0.9.9",
+      "sha256": "12ay5vxa2862ga5p5ilncjx9av8662hxfbc4j96zn31m5pjc508a",
       "depends": ["Matrix", "docopt", "slam", "sparsesvd"]
     },
-    "qlcVisualize": {
-      "name": "qlcVisualize",
-      "version": "0.4",
-      "sha256": "13bznvc1915igbaj5bkc96lzsjpvpbkixs3gqpdgl1nzmakrlpjj",
-      "depends": ["MASS", "RSpectra", "alphahull", "automap", "cartogramR", "concaveman", "fields", "geodata", "gstat", "mapplots", "maps", "qlcMatrix", "seriation", "sf", "sp", "spatstat_geom", "spatstat_random", "stars"]
-    },
     "qlcal": {
       "name": "qlcal",
-      "version": "0.0.15",
-      "sha256": "1sqx2blqbgv9g10kzvav9fawsd2pvd4psbrc6lcm9slidcbxrgyk",
+      "version": "0.0.16",
+      "sha256": "07v4ardvpp6a9b1smn4fbsvyn6jmiplj1wsvrlidk26xxc1vwlm1",
       "depends": ["BH", "Rcpp"]
     },
     "qlifetable": {
@@ -104613,8 +105273,8 @@
     },
     "qmd": {
       "name": "qmd",
-      "version": "1.1.2",
-      "sha256": "15y1bivli3jy09l4j37zp327x1nchkg6qm8hs46srcxznh9zb99d",
+      "version": "1.1.3",
+      "sha256": "1kba81w6pql309qjfv9dgbvr7avhc6jf116v8nzmy1z6x5w0qnmk",
       "depends": ["Rcpp", "cowplot", "dplyr", "ggplot2", "qad"]
     },
     "qmethod": {
@@ -104667,8 +105327,8 @@
     },
     "qpdf": {
       "name": "qpdf",
-      "version": "1.3.5",
-      "sha256": "0yn41pjr86cw3i1s0050c9f36xmxgqrymrkczsa6zz1i392rg6kh",
+      "version": "1.4.1",
+      "sha256": "1ihmqcyzqs67ngnx4rwrcax5g9i7ikfly36b7hw7xwdpk7qcdcis",
       "depends": ["Rcpp", "askpass", "curl"]
     },
     "qpmadr": {
@@ -104739,8 +105399,8 @@
     },
     "qrcmNP": {
       "name": "qrcmNP",
-      "version": "0.2.1",
-      "sha256": "10yqksn9761fryjvx6srv2z1pzmlr5m69bch16j256j9k2lknsr4",
+      "version": "0.2.2",
+      "sha256": "0637mmg3vvvpblx2ghxi5jis9qiaywkj91n1gcgm2g778p6lric0",
       "depends": ["qrcm", "survival"]
     },
     "qrcode": {
@@ -104809,6 +105469,12 @@
       "sha256": "1jacj0ybcbfhll5nvx31h00jm1rlcyzw3kcbxffrmpa9hd1spxql",
       "depends": []
     },
+    "qryflow": {
+      "name": "qryflow",
+      "version": "0.1.0",
+      "sha256": "03zly94ld976dv1imk4gr9d0n1a2whsxarwxq3an478qckihflq6",
+      "depends": ["DBI"]
+    },
     "qs": {
       "name": "qs",
       "version": "0.27.3",
@@ -104833,12 +105499,6 @@
       "sha256": "0df8988pr0kcz8xdi8sgl99mifs8djzjrannx52n42yck58g5hky",
       "depends": []
     },
-    "qsort": {
-      "name": "qsort",
-      "version": "0.2.3",
-      "sha256": "1xvp29dijfa2207wyw3z09rmffn61fngfy0f00qjk284n1jnnvrg",
-      "depends": ["cowplot", "ggplot2", "gridExtra", "purrr"]
-    },
     "qsplines": {
       "name": "qsplines",
       "version": "1.0.1",
@@ -104901,8 +105561,8 @@
     },
     "qtl2ggplot": {
       "name": "qtl2ggplot",
-      "version": "1.2.4",
-      "sha256": "0ygadcm05fqkpa8j2h6rpcxpd287g2av7qnlwlqp1s86zfxshk96",
+      "version": "1.2.6",
+      "sha256": "1a51p184xsswiyswj0ww53sjbqr2cqfd9by5d5qq3fh4fkn1d6l4",
       "depends": ["RColorBrewer", "Rcpp", "assertthat", "dplyr", "ggplot2", "ggrepel", "purrr", "qtl2", "rlang", "stringr", "tidyr"]
     },
     "qtl2pattern": {
@@ -105087,14 +105747,14 @@
     },
     "quantdr": {
       "name": "quantdr",
-      "version": "1.2.2",
-      "sha256": "0w6jdd6i4wxbk4fp44rmy32mwq9ng63zwamq8zpa1hlfbm5qh4s2",
-      "depends": ["KernSmooth", "dr", "mvtnorm", "quantreg"]
+      "version": "1.3.2",
+      "sha256": "14cim7j2qfngh5x9g06km7f7zfbnlzcgri5309gjqn033bq2gfdf",
+      "depends": ["KernSmooth", "mvtnorm", "quantreg"]
     },
     "quanteda": {
       "name": "quanteda",
-      "version": "4.3.0",
-      "sha256": "08h3ypxmk50haicvbyxkhk4wimx8d9ia133m67v4smhhyp5cb89b",
+      "version": "4.3.1",
+      "sha256": "1wwrcqdkpk9saqk63mv3a1bwyxn3j6pbj3h3rbr6n1fg8yy2038h",
       "depends": ["Matrix", "Rcpp", "SnowballC", "fastmatch", "jsonlite", "lifecycle", "magrittr", "stopwords", "stringi", "xml2", "yaml"]
     },
     "quanteda_textmodels": {
@@ -105147,8 +105807,8 @@
     },
     "quantmod": {
       "name": "quantmod",
-      "version": "0.4.27",
-      "sha256": "0h81c9jcj51r4v146z6lgpwilq1v96gas5rv5jmv2bn2c4mw1lvi",
+      "version": "0.4.28",
+      "sha256": "0f6kdsr2cz1fwklv62z6n78qhzh4xyxzhpvfy7n9dfnaw1d23m6i",
       "depends": ["TTR", "curl", "jsonlite", "xts", "zoo"]
     },
     "quantoptr": {
@@ -105225,9 +105885,15 @@
     },
     "quarto": {
       "name": "quarto",
-      "version": "1.4.4",
-      "sha256": "18403v03hh57fm09csg6jmxh6biih7dgq9sakn0hg6x3kn8vnnaf",
-      "depends": ["cli", "jsonlite", "later", "processx", "rlang", "rmarkdown", "rstudioapi", "yaml"]
+      "version": "1.5.0",
+      "sha256": "133lm6ai4mlb85jdlgl3hiyv6f50pw3nzhv06g0hg8kfjmf96lqm",
+      "depends": ["cli", "fs", "htmltools", "jsonlite", "later", "lifecycle", "processx", "rlang", "rmarkdown", "rstudioapi", "xfun", "yaml"]
+    },
+    "quartose": {
+      "name": "quartose",
+      "version": "0.1.0",
+      "sha256": "15sc7c0m7l5vy2zgjxlbslbzz4nd8gcn5yrszx9d5d3sfpmzzgmy",
+      "depends": ["cli", "knitr", "purrr", "rlang"]
     },
     "quaxnat": {
       "name": "quaxnat",
@@ -105297,9 +105963,9 @@
     },
     "quickPlot": {
       "name": "quickPlot",
-      "version": "1.0.2",
-      "sha256": "0228mcv6cz74whzxmgcdb79w0k8mibszw4kwnjjs6pljz41rxcbq",
-      "depends": ["data_table", "fpCompare", "terra"]
+      "version": "1.0.4",
+      "sha256": "04rcplcxchrb9lhsvp22m8fl1wqgkficziqy6p02icp8lg5fx9v7",
+      "depends": ["data_table", "fpCompare", "ggplot2", "terra"]
     },
     "quickReg": {
       "name": "quickReg",
@@ -105385,11 +106051,17 @@
       "sha256": "1fmzdnikskq8f70h6bh5ig5s6d227bzd6q93n2c05ymj1m5s9ban",
       "depends": ["Formula", "partykit", "rpart"]
     },
+    "quitefastmst": {
+      "name": "quitefastmst",
+      "version": "0.9.0",
+      "sha256": "1lyy6m1hvbf2a0wqsga7m7k6vjg0q6cwf6xlikxrksj2z4bdalm2",
+      "depends": ["Rcpp"]
+    },
     "quollr": {
       "name": "quollr",
-      "version": "0.1.1",
-      "sha256": "1qvgajd7bx38nhisb7y5i48fmw9vx6di34s08dkna34rjhafak0a",
-      "depends": ["dplyr", "ggplot2", "interp", "langevitour", "proxy", "rlang", "rsample", "tibble", "tidyselect"]
+      "version": "0.3.7",
+      "sha256": "0kfdf029j6r104bavjiq4k5h21fxdb4hy8x87ikv4x3plklv29dz",
+      "depends": ["Rcpp", "RcppArmadillo", "cli", "crosstalk", "dplyr", "ggplot2", "htmltools", "interp", "langevitour", "patchwork", "plotly", "proxy", "purrr", "rsample", "tibble", "tidyr", "tidyselect"]
     },
     "quoradsR": {
       "name": "quoradsR",
@@ -105477,27 +106149,27 @@
     },
     "r2dii_analysis": {
       "name": "r2dii.analysis",
-      "version": "0.5.1",
-      "sha256": "1ywd6sz8srbjx2in5bb7i2v4jbsxkvllk494lk9sa1ml38hyqn8d",
+      "version": "0.5.2",
+      "sha256": "1fgih4i0rrdl2z9j4mms43nfp8wf4zgkjk3an9hs7rp3iy04m1l4",
       "depends": ["dplyr", "glue", "lifecycle", "magrittr", "r2dii_data", "rlang", "tidyr", "tidyselect", "zoo"]
     },
     "r2dii_data": {
       "name": "r2dii.data",
-      "version": "0.6.0",
-      "sha256": "160mzbb9j2hvhf60k236nli899rz2ghfnwc7wzb18bfffhsj1ysx",
+      "version": "0.6.1",
+      "sha256": "0x0l8rix4rg3ip9dpz9im1z4kmc6h3j4r76yh8116xzpfgpm30dy",
       "depends": ["lifecycle"]
     },
     "r2dii_match": {
       "name": "r2dii.match",
-      "version": "0.4.0",
-      "sha256": "1gw9vjf84hgkqprbhrih8m1y89vlzmviq7rnv2ipklkfq7lra8mk",
-      "depends": ["data_table", "dplyr", "glue", "lifecycle", "magrittr", "purrr", "r2dii_data", "rlang", "stringdist", "stringi", "tibble", "tidyr", "tidyselect"]
+      "version": "0.4.1",
+      "sha256": "0jqb6g07vv51smzq723x56xjglxz91n6246mhsgb60klprsdr0qs",
+      "depends": ["cli", "data_table", "dplyr", "glue", "lifecycle", "magrittr", "purrr", "r2dii_data", "rlang", "stringdist", "stringi", "tibble", "tidyr", "tidyselect"]
     },
     "r2dii_plot": {
       "name": "r2dii.plot",
-      "version": "0.5.1",
-      "sha256": "1mmyzhf5ry5a6gxvgpbgdh8rhz5n2rp0jlid0px9l5jq42zwpyn7",
-      "depends": ["dplyr", "ggplot2", "ggrepel", "glue", "magrittr", "r2dii_data", "rlang", "scales", "stringr"]
+      "version": "0.5.2",
+      "sha256": "0bbd7vfwrgk3pyzg2vqhh2lm8yr04ssw9qjjkpqhxk3skdyq6ax0",
+      "depends": ["dplyr", "ggplot2", "ggrepel", "glue", "r2dii_data", "rlang", "scales", "stringr"]
     },
     "r2fireworks": {
       "name": "r2fireworks",
@@ -105631,6 +106303,12 @@
       "sha256": "1p0dnrp21zx1l9lqx01jnq54d5ppb8siibv47i4gsp7c7db9ymxc",
       "depends": ["boot", "dplyr", "ggplot2", "ggrepel", "here", "magick", "magrittr", "pROC", "psych", "purrr"]
     },
+    "r4pde": {
+      "name": "r4pde",
+      "version": "0.1.0",
+      "sha256": "08hwhr8pw6rp9293kfkn8wk552n2rvf7z1vbx70m0r7aawv3h6x9",
+      "depends": ["boot", "car", "cowplot", "dplyr", "ggplot2", "igraph", "interval", "lubridate", "nasapower", "progress", "purrr", "rlang", "survival", "tidyr"]
+    },
     "r4ss": {
       "name": "r4ss",
       "version": "1.44.0",
@@ -105751,10 +106429,16 @@
       "sha256": "1ilrgx2di1cfawkv8qw6ax4gh6iw8f1n9ynqf5sbf2cx772g0nsj",
       "depends": ["rJava"]
     },
+    "rCoinbase": {
+      "name": "rCoinbase",
+      "version": "1.0.0",
+      "sha256": "1caik34slr9mqji4fp7n60a8v56s8x5ibvjaqj7as8nycyrsgxrh",
+      "depends": ["data_table", "dplyr", "httr", "httr2", "jose", "lubridate", "openssl", "purrr", "tibble", "tidyr", "uuid"]
+    },
     "rD3plot": {
       "name": "rD3plot",
-      "version": "1.1.26",
-      "sha256": "0dn97z27knh4kqgg72rakyabzlq32429wnyf2h35nzkkrzxnk180",
+      "version": "1.1.37",
+      "sha256": "1yz3wqj5rrmbjw43xb1zb8b4j4d241qlb9a58bqan6k8x84rhp5l",
       "depends": ["igraph"]
     },
     "rDEA": {
@@ -105787,12 +106471,6 @@
       "sha256": "13pxw0np8pn895wcb3rxvc0s7ayr968567fx4p2z8gnz2hp7g62j",
       "depends": ["MASS", "cluster", "clusterGeneration", "igraph", "proxy", "stream"]
     },
-    "rENA": {
-      "name": "rENA",
-      "version": "0.2.7",
-      "sha256": "136rlzm4pkip0j1zhn4ycsfmq4hjwvhp4d5359wsjkym6lr9n846",
-      "depends": ["R6", "Rcpp", "RcppArmadillo", "concatenate", "data_table", "doParallel", "foreach", "magrittr", "plotly", "scales"]
-    },
     "rFIA": {
       "name": "rFIA",
       "version": "1.1.1",
@@ -105913,12 +106591,6 @@
       "sha256": "1bwg8mzddsc39km85b41bxp2hwqmb4g5a3010f6yp1qlgcb9rmj1",
       "depends": ["plyr"]
     },
-    "rLakeHabitat": {
-      "name": "rLakeHabitat",
-      "version": "1.0.0",
-      "sha256": "1i6dkh0dv4fhnflsfyg96yi318yx2g7l5kpvlg3bllhmhsax3dbc",
-      "depends": ["dplyr", "gganimate", "ggplot2", "gstat", "isoband", "rLakeAnalyzer", "sf", "terra", "tidyterra"]
-    },
     "rMEA": {
       "name": "rMEA",
       "version": "1.2.2",
@@ -105939,8 +106611,8 @@
     },
     "rMVP": {
       "name": "rMVP",
-      "version": "1.4.0",
-      "sha256": "1f4qrfqbil953wqy22p4jks6zgp5w3pdbx0dlkkjma4sjd8qm26p",
+      "version": "1.4.5",
+      "sha256": "1ah0v8b780s9b8vz3j6ms9p99mh1dl26v78gdk2bc2dp8v701w8c",
       "depends": ["BH", "MASS", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppProgress", "RhpcBLASctl", "bigmemory"]
     },
     "rMultiNet": {
@@ -106153,12 +106825,6 @@
       "sha256": "1ks4rwaish24sg5gc2jkfdqfq6h8gh9f3wdxk3dxjgpwjqwijz8f",
       "depends": []
     },
-    "rTensor2": {
-      "name": "rTensor2",
-      "version": "2.0.0",
-      "sha256": "0bangmph2hmk50gx21dkky0b22aimh168bndbp7a0s5vg2m49ijz",
-      "depends": ["Matrix", "gsignal", "matrixcalc", "png", "rTensor", "raster", "wavethresh"]
-    },
     "rTephra": {
       "name": "rTephra",
       "version": "0.1",
@@ -106173,9 +106839,9 @@
     },
     "rUM": {
       "name": "rUM",
-      "version": "2.1.0",
-      "sha256": "0frdbcslz44f2pw8f899g5mwrl5abvyd0pqfhn2pnkjb2gpqkh28",
-      "depends": ["bookdown", "conflicted", "glue", "gtsummary", "here", "quarto", "readr", "rio", "rlang", "rmarkdown", "roxygen2", "stringr", "table1", "tidymodels", "tidyverse", "usethis"]
+      "version": "2.2.0",
+      "sha256": "167v9mdg9hs3y7i9vjczq8wf8wzrcwwqngdw0abfxpm8847hl1fa",
+      "depends": ["bookdown", "conflicted", "dplyr", "fs", "glue", "gtsummary", "here", "labelled", "lifecycle", "purrr", "quarto", "readr", "rio", "rlang", "rmarkdown", "roxygen2", "stringr", "table1", "tidymodels", "tidyverse", "usethis"]
     },
     "rWCVP": {
       "name": "rWCVP",
@@ -106341,8 +107007,8 @@
     },
     "ragnar": {
       "name": "ragnar",
-      "version": "0.1.0",
-      "sha256": "0l83gk1qlxnh008j89a9wb2qkax43yq5simh83fflx1acx7jdahb",
+      "version": "0.2.0",
+      "sha256": "155v73gswmh8q0dni5065li82s4m0mbdbkm1m0yxp3469v6w0c92",
       "depends": ["DBI", "S7", "blob", "cli", "commonmark", "curl", "dotty", "dplyr", "duckdb", "glue", "httr2", "reticulate", "rlang", "rvest", "stringi", "tibble", "tidyr", "vctrs", "withr", "xml2"]
     },
     "rags2ridges": {
@@ -106351,6 +107017,12 @@
       "sha256": "09dp04y8wl7cws5y94k9j2rlrmm2ci1lk8y77cb17lxr0i1yv6gb",
       "depends": ["Hmisc", "RBGL", "RSpectra", "Rcpp", "RcppArmadillo", "expm", "fdrtool", "gRbase", "ggplot2", "graph", "igraph", "reshape", "sfsmisc", "snowfall"]
     },
+    "ragtop": {
+      "name": "ragtop",
+      "version": "1.2.0",
+      "sha256": "1qkl7hmbhbhbgn5n3k5ll7yllvj1km2038gals169sh0zwxaz6ni",
+      "depends": ["futile_logger", "limSolve"]
+    },
     "rai": {
       "name": "rai",
       "version": "1.0.0",
@@ -106395,9 +107067,9 @@
     },
     "ralger": {
       "name": "ralger",
-      "version": "2.2.4",
-      "sha256": "1j0np7h051dglva3dj9b64fagr99hvpsza1q2fnc7g3x1ki7mgni",
-      "depends": ["crayon", "curl", "dplyr", "robotstxt", "rvest", "stringi", "stringr", "tidyr", "xml2"]
+      "version": "2.3.0",
+      "sha256": "0z239ab7bd14w2inwyrbhgc8jp9jc4zf6mamfqw75s48m9bkir8f",
+      "depends": ["crayon", "curl", "dplyr", "purrr", "robotstxt", "rvest", "stringi", "stringr", "tidyr", "urltools", "xml2"]
     },
     "ramchoice": {
       "name": "ramchoice",
@@ -106419,8 +107091,14 @@
     },
     "ramify": {
       "name": "ramify",
-      "version": "0.3.3",
-      "sha256": "0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2",
+      "version": "0.4.0",
+      "sha256": "0wxc39z58s9k754c126gzj1injq950kym0d3rhzqq8da6bhanr04",
+      "depends": []
+    },
+    "rampage": {
+      "name": "rampage",
+      "version": "0.2.0",
+      "sha256": "1kmz6dg912irzrzwk03xsgai5qzfal44qac0zvy4ry77danpc0iz",
       "depends": []
     },
     "ramps": {
@@ -106443,9 +107121,9 @@
     },
     "randPedPCA": {
       "name": "randPedPCA",
-      "version": "1.0.1",
-      "sha256": "0zgc08n28xq815mgr1ijhzvqmzm9hapgm86rdlmprbdgr9g3fimz",
-      "depends": ["Matrix", "pedigreeTools", "spam"]
+      "version": "1.1.3",
+      "sha256": "116aqjijs20ilckdz2xqgvichjgd8pwlw90p4h3n26q7aw3ypbl4",
+      "depends": ["Matrix", "RSpectra", "pedigreeTools", "spam"]
     },
     "randcorr": {
       "name": "randcorr",
@@ -106461,9 +107139,9 @@
     },
     "randnet": {
       "name": "randnet",
-      "version": "0.7",
-      "sha256": "1zb2arx63avjlqjpbf37cvix080khkihh6bb0g1h2alv4lbaaaak",
-      "depends": ["AUC", "Matrix", "RSpectra", "data_table", "entropy", "irlba", "mgcv", "nnls", "poweRlaw", "pracma", "sparseFLMM"]
+      "version": "1.0",
+      "sha256": "0ai5r6ypkr8879dhw368q3rh2w60vgvb1kv11wlrdhns6wzi0v23",
+      "depends": ["AUC", "Matrix", "RSpectra", "Rcpp", "RcppEigen", "data_table", "entropy", "irlba", "mgcv", "nnls", "poweRlaw", "pracma", "sparseFLMM"]
     },
     "rando": {
       "name": "rando",
@@ -106533,8 +107211,8 @@
     },
     "randomMachines": {
       "name": "randomMachines",
-      "version": "0.1.0",
-      "sha256": "1b34jwvs2x67kbjmxa5rpxlrqsvghgnyddz250nwpchj2s4lgc17",
+      "version": "0.1.1",
+      "sha256": "04fld2i7s64km0jck9nbpnsjr1y307z97cvvn60jyxhxv7xgv5c3",
       "depends": ["kernlab"]
     },
     "randomNames": {
@@ -106797,8 +107475,8 @@
     },
     "rare": {
       "name": "rare",
-      "version": "0.1.1",
-      "sha256": "0j78ilswiaxdp9107psiw8ibxncd7i81z2njhfqf0n7532pbvjss",
+      "version": "0.1.2",
+      "sha256": "1w869zj6q0ddqbmn1bxf49pkfjq4gzny16wklhf5d2wfr58x6vzf",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "glmnet"]
     },
     "rareNMtests": {
@@ -106827,8 +107505,8 @@
     },
     "rashnu": {
       "name": "rashnu",
-      "version": "0.1.0",
-      "sha256": "1a7b6bzf9lqwwd7z34dfhk9p8ckc8dbrrgdsiqp8q2nzv6d9c739",
+      "version": "0.1.2",
+      "sha256": "1m38gzyfzaqg5v9pm0mxzvk39lp79bjr06k7g8c8hkplpxqqf1ph",
       "depends": ["DT", "shiny"]
     },
     "rassta": {
@@ -106923,8 +107601,8 @@
     },
     "rater": {
       "name": "rater",
-      "version": "1.3.1",
-      "sha256": "0ipgjhxn8d9g6yv369hckvq84v8rrw5b230zz24h72dy9s2nyr44",
+      "version": "1.3.2",
+      "sha256": "0r14bdskl64afhkyvj2dgfn8ljdww1i10lh2krxz7paggmxh7wmi",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "loo", "rlang", "rstan", "rstantools"]
     },
     "rateratio_test": {
@@ -106941,9 +107619,9 @@
     },
     "ratesci": {
       "name": "ratesci",
-      "version": "0.5.0",
-      "sha256": "0q2n2ijfwp8dh6p2ca7szl06az4h646bip0vgr9cb015jww1v30q",
-      "depends": ["polynom"]
+      "version": "1.0.0",
+      "sha256": "1wfibl1g2wckc6pa5npcqjaa79z41szc8x2sx5q0wsyksalydbkw",
+      "depends": []
     },
     "ratioOfQsprays": {
       "name": "ratioOfQsprays",
@@ -106965,9 +107643,9 @@
     },
     "ratlas": {
       "name": "ratlas",
-      "version": "0.1.0",
-      "sha256": "0iwkdr08jwyar1k737izjg7xw3wz1qlc0c7jar0fzlcn06i32c9k",
-      "depends": ["bookdown", "colorspace", "dplyr", "extrafont", "fs", "ggplot2", "ggtext", "glue", "hrbrthemes", "knitr", "magrittr", "officedown", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr", "xaringan", "xfun"]
+      "version": "0.1.1",
+      "sha256": "1pdvrgdp0hxrv1l7zhqdmrhlyc792by63hrmfixd5fr89yqz4ld4",
+      "depends": ["bookdown", "colorspace", "dplyr", "extrafont", "fs", "ggplot2", "glue", "hrbrthemes", "knitr", "magrittr", "officedown", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr", "xaringan", "xfun"]
     },
     "rattle": {
       "name": "rattle",
@@ -106995,8 +107673,8 @@
     },
     "ravetools": {
       "name": "ravetools",
-      "version": "0.2.2",
-      "sha256": "0h8c3hgnjwknzqz8lmdv44f36n1zrkgg7vr84r90dzc4i4vk0533",
+      "version": "0.2.3",
+      "sha256": "1qh5j5c34ahk1l9y6l2ksxzawy28z9r4vx9fdwdnagkr34mgl3r9",
       "depends": ["R6", "RNiftyReg", "Rcpp", "RcppEigen", "digest", "filearray", "gsignal", "pracma", "waveslim"]
     },
     "raw": {
@@ -107061,9 +107739,9 @@
     },
     "rb3": {
       "name": "rb3",
-      "version": "0.0.12",
-      "sha256": "0zxxkyk541vakhj7xr7xsw9y93ys5kjq6slw9qchp6w9bfw6wwxc",
-      "depends": ["XML", "ascii", "base64enc", "bizdays", "cli", "digest", "dplyr", "httr", "jsonlite", "proto", "purrr", "readr", "readxl", "rlang", "rvest", "stringr", "tidyr", "yaml"]
+      "version": "0.1.0",
+      "sha256": "1p7viylp5mk0h43272ni07arwwyrnbfiws27m19faxlcrj2xqhl9",
+      "depends": ["DBI", "RSQLite", "R_utils", "XML", "arrow", "base64enc", "bizdays", "cli", "digest", "dplyr", "httr", "jsonlite", "lubridate", "purrr", "readr", "rlang", "stringi", "stringr", "yaml"]
     },
     "rbacon": {
       "name": "rbacon",
@@ -107091,8 +107769,8 @@
     },
     "rbcc": {
       "name": "rbcc",
-      "version": "0.1.4",
-      "sha256": "15crmxv2spkhnhivsr2sbq5kyhqbfisgriiz5dxq8d3f399wcxx6",
+      "version": "0.1.5",
+      "sha256": "0yn73sgby3y4g04fi1shgh6kyqjryc6aiji0m23rkn37lq86vabj",
       "depends": ["PearsonDS", "ggplot2", "pracma", "qcc", "reshape2"]
     },
     "rbch": {
@@ -107151,14 +107829,14 @@
     },
     "rbioapi": {
       "name": "rbioapi",
-      "version": "0.8.2",
-      "sha256": "065621bbkxr9g6y6wl6ha41jqrh9bnagfdpcpmhi4sndp18vlz3n",
+      "version": "0.8.3",
+      "sha256": "11siimf60xv8f0gmf6vnf3rwfq4d13s6n7k2nv5df9bx9g5dbl01",
       "depends": ["httr", "jsonlite"]
     },
     "rbiom": {
       "name": "rbiom",
-      "version": "2.2.0",
-      "sha256": "1p7lh6ni8m9khwnp3iyzgdznyl09ckfyl84q4410p0lc5iqg21bh",
+      "version": "2.2.1",
+      "sha256": "1xp8gv4n3nqllqxpzjjaq057hm0lsckpf9q8p6nghx3rz3kxjs2h",
       "depends": ["ape", "dplyr", "emmeans", "fillpattern", "ggbeeswarm", "ggnewscale", "ggplot2", "ggrepel", "ggtext", "jsonlite", "magrittr", "mgcv", "parallelly", "patchwork", "pillar", "plyr", "readr", "readxl", "slam", "vegan"]
     },
     "rbiouml": {
@@ -107259,14 +107937,14 @@
     },
     "rcarbon": {
       "name": "rcarbon",
-      "version": "1.5.1",
-      "sha256": "0wgf0jia5iwa7v1aln80521rj1q7rhx3l9rpf3df3za73kn4z7gm",
+      "version": "1.5.2",
+      "sha256": "05mj9ylh8ssm9mmf9iyxs65ck56swpjy7yg87mkhl38gy3aaxn61",
       "depends": ["doSNOW", "foreach", "iterators", "knitr", "sf", "snow", "spatstat", "spatstat_explore", "spatstat_geom", "spatstat_linnet", "spatstat_model"]
     },
     "rcartocolor": {
       "name": "rcartocolor",
-      "version": "2.1.1",
-      "sha256": "0lqipmrcvgjlh7ya4r3vf7qiypc2pwgqcxzmg4xmb5h5p5l37cq0",
+      "version": "2.1.2",
+      "sha256": "1hd8j6w2sa5ibm7hklm1z1y9y20rd71ak9b9m331k7lay52mp1k5",
       "depends": ["ggplot2", "scales"]
     },
     "rcausim": {
@@ -107331,8 +108009,8 @@
     },
     "rcdo": {
       "name": "rcdo",
-      "version": "0.2.0",
-      "sha256": "1qiy4jalg6ms6k9chbbkfc0vjmljffym4bfa0v7ks9y9j21jxr17",
+      "version": "0.3.0",
+      "sha256": "1glbyk40lw85jv3g33skghqsp5zaymypapfbv492kdz50yfyhkvk",
       "depends": ["R6", "cli", "rlang"]
     },
     "rcens": {
@@ -107355,8 +108033,8 @@
     },
     "rcheology": {
       "name": "rcheology",
-      "version": "4.5.0.0",
-      "sha256": "1kijqma4gpi868czw99hkjgldylj5kmxdkgkjy5j9cz5n0ckkibc",
+      "version": "4.5.1.0",
+      "sha256": "1dvic1vkhrxlpm1nmz5218kw7n8g31iycpvgvgs73q0xiyd71x2b",
       "depends": []
     },
     "rchroma": {
@@ -107473,6 +108151,12 @@
       "sha256": "0a7h3gblc69g1mkalb3yss9x609701zwd3hh4pr2v96fdmsxdpkc",
       "depends": ["KernSmooth", "forecast", "ggmap", "htmltools", "igraph", "leaflet", "leafsync", "lubridate", "pals", "raster", "sp", "terra"]
     },
+    "rcrisp": {
+      "name": "rcrisp",
+      "version": "0.1.4",
+      "sha256": "0zjc5bcaw1yd2jhbkcmbk5687rcj77ni0p3yynha0xz7hc0v8rna",
+      "depends": ["dbscan", "dplyr", "lwgeom", "osmdata", "rcoins", "rlang", "rstac", "sf", "sfheaders", "sfnetworks", "stringr", "terra", "tidygraph", "units", "visor"]
+    },
     "rcrossref": {
       "name": "rcrossref",
       "version": "1.2.0",
@@ -107539,16 +108223,10 @@
       "sha256": "1h32wxjykz9y3k48rx31cvy485gsx8ix3194r2zgxlwdza3rl3lb",
       "depends": ["curl", "data_table", "jsonlite"]
     },
-    "rdd": {
-      "name": "rdd",
-      "version": "0.57",
-      "sha256": "1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp",
-      "depends": ["AER", "Formula", "lmtest", "sandwich"]
-    },
     "rddapp": {
       "name": "rddapp",
-      "version": "1.3.2",
-      "sha256": "1bb76v35cpcvmjnkzficl1rvwkz37z0i56bq81m7nb87cb9p1hkv",
+      "version": "1.3.3",
+      "sha256": "087h10sm5i74kjwckzj5ciggk4wk3n4s62zigadi6zlph56q1bll",
       "depends": ["AER", "DT", "Formula", "R_utils", "lmtest", "plot3D", "sandwich", "shiny", "sp"]
     },
     "rddensity": {
@@ -107563,12 +108241,6 @@
       "sha256": "19izmky8rwz98i6w76mac9b1sppjdpa48jm33gy38zd3k6k2054j",
       "depends": ["glue", "rlang", "xml2"]
     },
-    "rddtools": {
-      "name": "rddtools",
-      "version": "1.6.0",
-      "sha256": "12lxdpazfhwn5kkzs91qhs0xcky30dj01yp0v5708ahr1ywqdxmd",
-      "depends": ["AER", "Formula", "KernSmooth", "ggplot2", "lmtest", "locpol", "np", "rdd", "rdrobust", "rmarkdown", "sandwich"]
-    },
     "rde": {
       "name": "rde",
       "version": "0.1.0",
@@ -107601,9 +108273,9 @@
     },
     "rdhte": {
       "name": "rdhte",
-      "version": "0.0.2",
-      "sha256": "0v38i7hjxqdw801gfd3hlb485v8sb1pkl240qvhjr4qn72fhszf4",
-      "depends": ["rdrobust", "sandwich"]
+      "version": "0.1.0",
+      "sha256": "1wk759h2dcf52pyrk4qsl8kzjr2g9q92d56ck6iiah3fjij8sdry",
+      "depends": ["multcomp", "rdrobust", "sandwich"]
     },
     "rdi": {
       "name": "rdi",
@@ -107653,6 +108325,12 @@
       "sha256": "00fpycbsczla7vcik649kdw9q0ckqml5f1f1bhphk2mazk12pqva",
       "depends": ["brew", "httr", "stringr", "xml2"]
     },
+    "rdocdump": {
+      "name": "rdocdump",
+      "version": "0.1.0",
+      "sha256": "0qrlfv2n1x5r39mxsi6pqzr373c0jr7m21fwpf1kghwl2917kc3x",
+      "depends": []
+    },
     "rdomains": {
       "name": "rdomains",
       "version": "0.2.1",
@@ -107671,16 +108349,10 @@
       "sha256": "0a7ays4acilpa6w4098bndjszpf6q29w0423i16p7h1giqn3yxgr",
       "depends": ["rdrobust"]
     },
-    "rdracor": {
-      "name": "rdracor",
-      "version": "1.0.4",
-      "sha256": "1bypz0llvr05zvhfw76yinvr2qsbqnbws0mkif2mmckd57a7395x",
-      "depends": ["Rdpack", "data_table", "httr", "igraph", "jsonlite", "purrr", "stringr", "tibble", "tidyr", "xml2"]
-    },
     "rdrobust": {
       "name": "rdrobust",
-      "version": "2.2",
-      "sha256": "1p9k8gd39090r5ml1sk30k3hvfns2v6laysbaswsn9i2ka70zj42",
+      "version": "3.0.0",
+      "sha256": "18r79c6k1nxm0lf6g751q0bb6zvq5pbc5cszvzm0rsp4vbbd1g5i",
       "depends": ["MASS", "ggplot2"]
     },
     "rdryad": {
@@ -107751,9 +108423,9 @@
     },
     "reactRouter": {
       "name": "reactRouter",
-      "version": "0.1.0",
-      "sha256": "0ymh40ihznb15vz2jaaa25a5hzzrgajyz5cazwg70p2859scvrb5",
-      "depends": ["checkmate", "htmltools", "shiny", "shiny_react"]
+      "version": "0.1.1",
+      "sha256": "0iqfnk6vp2cks7fbv0dcxq9fgb1af5vrvzwri7d9lkldsiss0gw4",
+      "depends": ["checkmate", "htmltools", "shiny", "shiny_react", "uuid"]
     },
     "reactable": {
       "name": "reactable",
@@ -107961,8 +108633,8 @@
     },
     "readtext": {
       "name": "readtext",
-      "version": "0.91",
-      "sha256": "0bzaq0vx6c83i4xf7p9zwka7h7jbv1qfy6w4v3kljx30hl048dpn",
+      "version": "0.92.1",
+      "sha256": "10v8wgqfcax0b0v256j93z51mlslcrrp0ymq0schlcnr0kpbx9cv",
       "depends": ["antiword", "data_table", "digest", "httr", "jsonlite", "pdftools", "pillar", "readODS", "readxl", "streamR", "stringi", "striprtf", "xml2"]
     },
     "readtextgrid": {
@@ -108057,8 +108729,8 @@
     },
     "rebus_numbers": {
       "name": "rebus.numbers",
-      "version": "0.0-1",
-      "sha256": "0drgszz0824j49c6jk9ry0cfjky7g843ldlxrx3g2vjp0v7hznj3",
+      "version": "0.0-1.1",
+      "sha256": "11z8471laxymyq8yzw0wf6fkhxi20jg4s1rz15f7vvk89w8kr5lk",
       "depends": ["rebus_base"]
     },
     "rebus_unicode": {
@@ -108151,6 +108823,12 @@
       "sha256": "0qi5y1rbdw6dcvkl8gw9fh7rcb0f6ckig8464sgxslgf7cdk2gcz",
       "depends": ["XML", "dplyr", "haven", "magrittr", "sjlabelled", "stringr", "tidyr"]
     },
+    "recoder": {
+      "name": "recoder",
+      "version": "0.1.2",
+      "sha256": "0kgn563hsqxrw19y5s1kkxbck9r66qxb0rqbj914lkxg9d510mnn",
+      "depends": ["stringr"]
+    },
     "recogito": {
       "name": "recogito",
       "version": "0.2.1",
@@ -108237,8 +108915,8 @@
     },
     "red": {
       "name": "red",
-      "version": "1.6.2",
-      "sha256": "1qvzm086lbpphz5x426qpn298mps0qinv8zdzp6scfk9jyzf8h6m",
+      "version": "1.6.3",
+      "sha256": "0xs7qm84ygkcgnddjvz8lfapp8717df32jx21364lf88yr9swrjc",
       "depends": ["BAT", "dismo", "gdistance", "geosphere", "jsonlite", "predicts", "sp", "terra"]
     },
     "reda": {
@@ -108291,8 +108969,8 @@
     },
     "redist": {
       "name": "redist",
-      "version": "4.2.0",
-      "sha256": "1ibwldd24zj2fhpn18q4381mp82p7wbv61xmqm2lzybil92y800w",
+      "version": "4.3.0",
+      "sha256": "140kzihidw4x3gx2j2hpzny35x0mg4qy7mp0d13c4sf2mkimlzds",
       "depends": ["Rcpp", "RcppArmadillo", "RcppThread", "cli", "doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "patchwork", "redistmetrics", "rlang", "servr", "sf", "stringr", "sys", "tidyselect", "vctrs"]
     },
     "redistmetrics": {
@@ -108501,9 +109179,9 @@
     },
     "regioncode": {
       "name": "regioncode",
-      "version": "0.1.2",
-      "sha256": "1q3d2s6x79i7v7phspabk3m7kld74jplv5wda9ybpyv1vzdinx99",
-      "depends": ["dplyr", "pinyin"]
+      "version": "0.2.0",
+      "sha256": "012fadyzkcw2dimjzmday8b705xci1k8z9fq02wkqhkrhkvw45mj",
+      "depends": ["pinyin"]
     },
     "regions": {
       "name": "regions",
@@ -108525,8 +109203,8 @@
     },
     "reglogit": {
       "name": "reglogit",
-      "version": "1.2-7",
-      "sha256": "0mknx71h24kbh4agarkhrfp2wz1kjvd34kv0c6qy0f1jwvr3kzr6",
+      "version": "1.2-8",
+      "sha256": "0fn8ls0ijlawxak354jphnvmqx4f4jg3259d1ml7dic3v07bi869",
       "depends": ["Matrix", "boot", "mvtnorm"]
     },
     "regmed": {
@@ -108627,9 +109305,9 @@
     },
     "regtomean": {
       "name": "regtomean",
-      "version": "1.2",
-      "sha256": "1j13sc4lklw4rnfrg62b26sy7rcw3spa0a0bzc0mrbvinsq7b5dc",
-      "depends": ["effsize", "formattable", "ggplot2", "htmlwidgets", "mefa", "plotrix", "sjPlot", "sjmisc"]
+      "version": "1.2.1",
+      "sha256": "1rnyr1cliqvz73awkvnmp0n5ksbkgdi3ns3dypjkzmyl1qp795k4",
+      "depends": ["effsize", "formattable", "ggplot2", "htmlwidgets", "plotrix"]
     },
     "regtools": {
       "name": "regtools",
@@ -108861,8 +109539,8 @@
     },
     "rencher": {
       "name": "rencher",
-      "version": "0.1.3",
-      "sha256": "1f69mz2inffirnykx2jiw9bdd9245gwsj1zwdldr6gl3djv2v8wd",
+      "version": "0.1.4",
+      "sha256": "1rs5ygnq0ybffqjkbc6i3x06dmadldbzcmpqy3j4ir2b8d6if2rs",
       "depends": []
     },
     "renpow": {
@@ -108879,8 +109557,8 @@
     },
     "renv": {
       "name": "renv",
-      "version": "1.1.4",
-      "sha256": "1lwhcdjqqnv78cw88g3qvdmz89w5i0ll4z2rricikvbfsnmgw778",
+      "version": "1.1.5",
+      "sha256": "1ch60km15004ck79v97dnym7s35hjhvypg2gj6imxg49b739ds9y",
       "depends": []
     },
     "renz": {
@@ -108945,8 +109623,8 @@
     },
     "repmis": {
       "name": "repmis",
-      "version": "0.5",
-      "sha256": "0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5",
+      "version": "0.5.1",
+      "sha256": "079z5179igxi0bdqsckclqg2pfgq6l2ifbsqn7872bqsyq48w7rp",
       "depends": ["R_cache", "data_table", "digest", "httr", "plyr"]
     },
     "repmod": {
@@ -109065,8 +109743,8 @@
     },
     "reproducibleRchunks": {
       "name": "reproducibleRchunks",
-      "version": "1.0.3",
-      "sha256": "0ymb2m853qb6ih6rzi75pwxi4pcizfjq03hhw84xnzpyyhhgha6v",
+      "version": "1.2.0",
+      "sha256": "12z9xbhdh5wg2zk294kdljvxx2ppkg1f6z6r0mdbyhybjvxggg9b",
       "depends": ["digest", "jsonlite", "knitr", "rmarkdown", "rstudioapi"]
     },
     "reproj": {
@@ -109081,6 +109759,18 @@
       "sha256": "102rnc2g31aijhwsmad86k2wjcvbvzi51c2rp0wk711riq5v7cm1",
       "depends": ["progress"]
     },
+    "reptiledb_data": {
+      "name": "reptiledb.data",
+      "version": "0.0.0.1",
+      "sha256": "0mg2514rsfa1632skdk7ap7q9s8iij92bmxydqxxvx03pvcbw4rh",
+      "depends": ["httr", "rvest", "stringr", "tibble"]
+    },
+    "reptiledbr": {
+      "name": "reptiledbr",
+      "version": "0.0.1",
+      "sha256": "0lw59x8asbvmdyk5kjd1rfid35lvv0k38r8aispyp51pd3iddp2n",
+      "depends": ["dplyr", "fuzzyjoin", "lifecycle", "purrr", "stringr", "tibble", "tidyr", "xml2"]
+    },
     "repurrrsive": {
       "name": "repurrrsive",
       "version": "1.1.0",
@@ -109185,8 +109875,8 @@
     },
     "reshape": {
       "name": "reshape",
-      "version": "0.8.9",
-      "sha256": "0j203qmc076x5lp6q2xi4dq4xdb73jmsa42rpxp1c37knnrph4br",
+      "version": "0.8.10",
+      "sha256": "0r3bzhl7i4v11lh36qflzsacanv0z4zn332k9ps7j0jjas4nxvrm",
       "depends": ["plyr"]
     },
     "reshape2": {
@@ -109251,9 +109941,9 @@
     },
     "resquin": {
       "name": "resquin",
-      "version": "0.0.2",
-      "sha256": "0h3wmmhx3bqy1li6nvgdxfvdr9k2yiw2b7h74jbc4mvpil747l7l",
-      "depends": ["cli", "purrr", "vctrs"]
+      "version": "0.1.1",
+      "sha256": "0wfgrghmi3san5l4f927irr6ngvi37cl0020k4y517aw0l0dyspj",
+      "depends": ["cli", "purrr", "rlang", "slider", "stringi", "tibble", "vctrs"]
     },
     "restatapi": {
       "name": "restatapi",
@@ -109281,8 +109971,8 @@
     },
     "restfulr": {
       "name": "restfulr",
-      "version": "0.0.15",
-      "sha256": "14p6h0gjknqy5z2fprxw7waf4p0cd2qmp18s7qig4ylqn8gqzzs0",
+      "version": "0.0.16",
+      "sha256": "099px4r866xpdz97lq8dc2ck77glczbq9kllivzr9x137wdd2ksp",
       "depends": ["RCurl", "S4Vectors", "XML", "rjson", "yaml"]
     },
     "restimizeapi": {
@@ -109293,8 +109983,8 @@
     },
     "restoptr": {
       "name": "restoptr",
-      "version": "1.0.6",
-      "sha256": "0m7nw277qgjdxfwx3i1k73l93rqyf766l2af9ymap9dl7hrp8jaq",
+      "version": "1.1.1",
+      "sha256": "1rld23qqx1fhrry4qn7z8xsc65ys2jmwsjivv79nq06idam6df41",
       "depends": ["assertthat", "crayon", "magrittr", "rJava", "terra", "units"]
     },
     "restriktor": {
@@ -109323,8 +110013,8 @@
     },
     "retel": {
       "name": "retel",
-      "version": "0.1.0",
-      "sha256": "1rajv6y3zsk7hd9wr7szxi685rh377hhvj69rvg77fn0pk56g40b",
+      "version": "0.1.1",
+      "sha256": "0wpm2swnx7p74xh9vxwsv860swj4n031gh8qqwvshw8dyb0xsr6c",
       "depends": ["Matrix", "checkmate", "matrixcalc", "nloptr"]
     },
     "rethinker": {
@@ -109341,8 +110031,8 @@
     },
     "reticulate": {
       "name": "reticulate",
-      "version": "1.42.0",
-      "sha256": "0d3xd8gk7zkcbfypmd5d1kcavcada0asvgccb27a1pghgqxw18kr",
+      "version": "1.43.0",
+      "sha256": "1a9d6gxrsy99mx7z1hhyh9xdn9r4ssb4crq5bgr1aqszmb2ags3j",
       "depends": ["Matrix", "Rcpp", "RcppTOML", "here", "jsonlite", "png", "rappdirs", "rlang", "withr"]
     },
     "retimer": {
@@ -109495,6 +110185,12 @@
       "sha256": "1fybxxmwm0xw3pwv5lx0vkmi4f215hvnwk3kbwm3031c1vr662l4",
       "depends": ["Rcpp"]
     },
+    "rextendr": {
+      "name": "rextendr",
+      "version": "0.4.1",
+      "sha256": "1flfw2lnm9fagpq4x7llqkj8kfr75snfrikr3kdjc4fymq1dxkyl",
+      "depends": ["brio", "callr", "cli", "desc", "dplyr", "glue", "jsonlite", "pkgbuild", "processx", "rlang", "rprojroot", "stringi", "vctrs", "withr"]
+    },
     "rfPermute": {
       "name": "rfPermute",
       "version": "2.5.5",
@@ -109519,12 +110215,6 @@
       "sha256": "0h2ryyl5zc3pxi85y0qwadfz7sdzz0m6ilwzabw317sb0z5lms5b",
       "depends": ["digest", "fs", "tibble", "xml2"]
     },
-    "rfars": {
-      "name": "rfars",
-      "version": "1.2.0",
-      "sha256": "1wk0gzg50hd7iq7l4c4rdzwvn0i6ikarp4pyqnv4ginvwlxyf591",
-      "depends": ["data_table", "downloader", "dplyr", "haven", "janitor", "lubridate", "magrittr", "purrr", "readr", "rlang", "sas7bdat", "stringr", "tidyr", "tidyselect", "zoo"]
-    },
     "rfieldclimate": {
       "name": "rfieldclimate",
       "version": "0.1.1",
@@ -109591,6 +110281,12 @@
       "sha256": "01xv6ds3h8gvi1wi5hgy3r1dhi0767mcgsnshvhva3bnvf1a8398",
       "depends": []
     },
+    "rfriend": {
+      "name": "rfriend",
+      "version": "1.0.0",
+      "sha256": "00xfba6vmwylba328kz3qadck6pss5gy5yiyz5kj5paingwcnkfc",
+      "depends": ["DHARMa", "MuMIn", "bestNormalize", "crayon", "emmeans", "ggplot2", "knitr", "magick", "multcomp", "multcompView", "nortest", "pander", "rmarkdown", "rstatix", "rstudioapi", "stringr", "this_path", "writexl", "xfun"]
+    },
     "rfvimptest": {
       "name": "rfvimptest",
       "version": "0.1.4",
@@ -109681,16 +110377,10 @@
       "sha256": "1c1rqgr7qsj61gp2frm197k396xfdspvmmwr56izwb09225cbp6d",
       "depends": ["XML", "igraph", "servr"]
     },
-    "rgho": {
-      "name": "rgho",
-      "version": "3.0.2",
-      "sha256": "1j46pkb8n2hn1isz5xgfagwn77cxs48wv3rs4qqvq2nq1r5bpa4x",
-      "depends": ["ODataQuery", "curl", "dplyr", "httr", "lifecycle", "magrittr", "rlang", "tibble", "tidyr"]
-    },
     "rgl": {
       "name": "rgl",
-      "version": "1.3.18",
-      "sha256": "0qv226nm5iaq09jifm96v4xx6ki4735xnm9mgm22absrl6w43fia",
+      "version": "1.3.24",
+      "sha256": "0jgf0gf9ny64v4ja61xsfzx6bmjwwc4j6fm89ls2ibvfqnbhln4z",
       "depends": ["R6", "base64enc", "htmltools", "htmlwidgets", "jsonlite", "knitr", "magrittr", "mime"]
     },
     "rgl_cry": {
@@ -109761,8 +110451,8 @@
     },
     "rgrass": {
       "name": "rgrass",
-      "version": "0.5-2",
-      "sha256": "0z2n9rv6y5w2pp8x1xqp00hpsp8m6s9xrcvf2fkhh1ssj2x508lc",
+      "version": "0.5-3",
+      "sha256": "14cy6gwzdpbaymsg3n64dyw2jmh8agx98wqz7knj2gvkgcc455pz",
       "depends": ["xml2"]
     },
     "rgsp": {
@@ -109899,8 +110589,8 @@
     },
     "rice": {
       "name": "rice",
-      "version": "1.2.0",
-      "sha256": "0npnngr9xrrb33wn12gi87j2crdqf184gm8ba2n0y68l8m0j76p6",
+      "version": "1.3.0",
+      "sha256": "0npppmhl9m1bhlcq39wx9qf81hij61k6fzbv0izy14spy51xwsq4",
       "depends": ["ggplot2", "maps", "rintcal", "rlang"]
     },
     "ricegeneann": {
@@ -109941,8 +110631,8 @@
     },
     "ridgetorus": {
       "name": "ridgetorus",
-      "version": "1.0.2",
-      "sha256": "04wabvf7agyk8djfqn41zcsj33940vx32zzf6811h4n5bs14kp65",
+      "version": "1.0.3",
+      "sha256": "11bbn8dy8ydl9m3z9xdpzlksf4fzkllvv16i3h257g4zgiv7lpjg",
       "depends": ["Rcpp", "RcppArmadillo", "circular", "rootSolve", "sdetorus", "sphunif"]
     },
     "ridgregextra": {
@@ -109977,8 +110667,8 @@
     },
     "rifreg": {
       "name": "rifreg",
-      "version": "0.1.0",
-      "sha256": "053hlvx3yibiadzwjsv55qvysc0bkznzqk61rjwb23lyxvjbb3rq",
+      "version": "1.1.0",
+      "sha256": "1xkhscksf6kfkz6vcxph05n204madpxwh30lrwiilrwjlvm4v4hw",
       "depends": ["Formula", "Hmisc", "ggplot2", "pbapply", "sandwich"]
     },
     "rifttable": {
@@ -109995,8 +110685,8 @@
     },
     "rim": {
       "name": "rim",
-      "version": "0.8.0",
-      "sha256": "1dv7vic2f4khyd9k7wk95gan89s4klvlb474r0j931pp3icj23jq",
+      "version": "0.8.1",
+      "sha256": "1hg1xgr7agbz9rlmrm1l77yv9h1gnqzz9c5h696b51492jsiigvg",
       "depends": ["GlobalOptions", "R6", "Rcpp", "knitr"]
     },
     "rimu": {
@@ -110031,8 +110721,8 @@
     },
     "rintcal": {
       "name": "rintcal",
-      "version": "1.2.1",
-      "sha256": "10dsf66bzfbgkl9hd6c2lk4njwmd542251xmvppjan7nn3ai1r6l",
+      "version": "1.3.0",
+      "sha256": "18bkynd3b9dbqq8gdc376bfx6hbvbw7nhyadm5cy2cg9hwcm5f8g",
       "depends": ["data_table", "jsonlite"]
     },
     "rintimg": {
@@ -110073,8 +110763,8 @@
     },
     "ripserr": {
       "name": "ripserr",
-      "version": "0.3.0",
-      "sha256": "1w663pfhbna3j90cnhb1agp5ppkbyl3rlbqsa52inc93bcpr3ias",
+      "version": "1.0.0",
+      "sha256": "14pp0qw9zzxmk5c70vg41mhk288jip8xj8xagzqwmfb0bmbvpm5j",
       "depends": ["Rcpp"]
     },
     "rirods": {
@@ -110089,6 +110779,12 @@
       "sha256": "12r7mbaxp9pjypbpjxlsbqg7spw80gjgm2w0lsvgvclffc50a6ni",
       "depends": ["dplyr", "ggplot2"]
     },
+    "risk_assessr": {
+      "name": "risk.assessr",
+      "version": "2.0.0",
+      "sha256": "1lr5818b2r2w9pn1zzlzx58yvqlfx87iyr42yz6m6abj3l4nx5m1",
+      "depends": ["callr", "checkmate", "covr", "curl", "desc", "devtools", "dplyr", "fs", "gh", "jsonlite", "purrr", "rcmdcheck", "remotes", "rlang", "stringr", "tidyr", "xml2"]
+    },
     "riskCommunicator": {
       "name": "riskCommunicator",
       "version": "1.0.1",
@@ -110127,9 +110823,9 @@
     },
     "riskdiff": {
       "name": "riskdiff",
-      "version": "0.1.0",
-      "sha256": "1zagrikjf8lj5p905yigwlzn9mzsrbfqx8gxp55sf0mpqbycb8ih",
-      "depends": ["dplyr", "purrr", "rlang", "scales", "stringr", "tibble"]
+      "version": "0.2.1",
+      "sha256": "0pwd023p812b180z66yqnafjsnpslmyagngdg5c1aiw83pg52n0p",
+      "depends": ["dplyr", "ggplot2", "purrr", "rlang", "scales", "stringr", "tibble"]
     },
     "riskmetric": {
       "name": "riskmetric",
@@ -110145,8 +110841,8 @@
     },
     "riskscores": {
       "name": "riskscores",
-      "version": "1.2.1",
-      "sha256": "1wj3ccclk72l7lgxc2kv6dhj46jivxg0440v958llcc8khw02qf6",
+      "version": "1.2.3",
+      "sha256": "0fsx5y827zbsfq6x63c1xglw8n7wg8cqc0x9ippfz00p0xzfygk7",
       "depends": ["dplyr", "foreach", "ggplot2", "magrittr", "pROC"]
     },
     "risksetROC": {
@@ -110257,12 +110953,6 @@
       "sha256": "07a1wbn5ps9ygfi25fffgmrzw90izj4yk8gxb47r85x6lvqv1p0h",
       "depends": []
     },
-    "rjmcmc": {
-      "name": "rjmcmc",
-      "version": "0.4.5",
-      "sha256": "14rzvp6z5avlcnmlmvb6w4gvlh6v4ncbcai3v4c4svnjv555vz45",
-      "depends": ["coda", "madness", "mvtnorm"]
-    },
     "rjqpd": {
       "name": "rjqpd",
       "version": "0.2.3",
@@ -110295,8 +110985,8 @@
     },
     "rjwsacruncher": {
       "name": "rjwsacruncher",
-      "version": "0.2.1",
-      "sha256": "01vnn0i00yflw07kn52bk13swmf88chnb482cs660qdnq5lzkm7k",
+      "version": "0.2.2",
+      "sha256": "0ybkxnfc4h6bkplk7l3hwb0mnl14305plf1h4fmsy59n8bsdyhsz",
       "depends": ["XML"]
     },
     "rkafkajars": {
@@ -110325,8 +111015,8 @@
     },
     "rlandfire": {
       "name": "rlandfire",
-      "version": "2.0.0",
-      "sha256": "122vjg0wbmc7p4w8gwi84ffag9hgf3pg0qxl2vrm8xkz6bvpikpf",
+      "version": "2.0.1",
+      "sha256": "1dsykbzgmlh0y5qw4jhsm07lvhax9mpfsfxv4pdncrwyfwf2m7pn",
       "depends": ["curl", "httr2", "sf", "terra"]
     },
     "rlang": {
@@ -110391,8 +111081,8 @@
     },
     "rlibkriging": {
       "name": "rlibkriging",
-      "version": "0.9-1",
-      "sha256": "1p6bwy2d3mwc72gar98b1lhdr4c0fjrldbyb3k4hzmm4v0avs9hz",
+      "version": "0.9-2.1",
+      "sha256": "1m7q7mys1rg9pd20jlyi8nhj3pykv70yc0vlqc7y4cfy1v558rxs",
       "depends": ["DiceKriging", "Rcpp", "RcppArmadillo"]
     },
     "rliger": {
@@ -110415,8 +111105,8 @@
     },
     "rlistings": {
       "name": "rlistings",
-      "version": "0.2.11",
-      "sha256": "04ym0mfpfznbsirz50ckg9h8ypmmzdb791aagn3r9j14d0wbflmv",
+      "version": "0.2.12",
+      "sha256": "12mm72h5sr48hhlap6shx940vywzgia5hknmbs4nf9lzng1n1swr",
       "depends": ["checkmate", "formatters", "tibble"]
     },
     "rlmDataDriven": {
@@ -110643,8 +111333,8 @@
     },
     "rmon": {
       "name": "rmon",
-      "version": "1.0.0",
-      "sha256": "15s3kb6fbyqzngsl4b4bfzcyjw03b863ygp0vy8g8l60n8m42gb7",
+      "version": "1.1.0",
+      "sha256": "0xbl962rqya8vq8p5rcyc00ayg5xwfdl42pa89myhq599q21zmww",
       "depends": ["processx"]
     },
     "rmonocypher": {
@@ -110679,9 +111369,9 @@
     },
     "rmsMD": {
       "name": "rmsMD",
-      "version": "0.1.2",
-      "sha256": "193yxz5wz7vdaghka33mdrj3m1ynizfipc83ly4s7bxif0hwdgdv",
-      "depends": ["rms"]
+      "version": "1.0.0",
+      "sha256": "1i6pnwa8icnkjcixmg4z6qss574n48shqf9wls3d44wcba1k9kvn",
+      "depends": ["cowplot", "ggplot2", "rlang", "rms"]
     },
     "rmsb": {
       "name": "rmsb",
@@ -110745,8 +111435,8 @@
     },
     "rmzqc": {
       "name": "rmzqc",
-      "version": "0.6.0",
-      "sha256": "0igk2a1fs2pfp405ski862kwjwq8xvq9324y4kydygd75g0mmw1s",
+      "version": "0.7.0",
+      "sha256": "0smipf6rf8gii0cidws8jyamhfxnr1ywba0p3xmi9nkrarwvxys6",
       "depends": ["R6", "R6P", "jsonlite", "jsonvalidate", "knitr", "ontologyIndex", "rmarkdown", "testthat"]
     },
     "rnaCrosslinkOO": {
@@ -110769,9 +111459,9 @@
     },
     "rnaturalearth": {
       "name": "rnaturalearth",
-      "version": "1.0.1",
-      "sha256": "1vfkn4bf77mr2n7dhmnl55ma4cvwy2nazhizmdqd98w2ydl13z3p",
-      "depends": ["httr", "jsonlite", "sf", "terra"]
+      "version": "1.1.0",
+      "sha256": "0ql6f3w5wyychxfx9vff0nsl76d9l1rapa28in70fsij3qkvjj8a",
+      "depends": ["cli", "httr", "jsonlite", "sf", "terra"]
     },
     "rnaturalearthdata": {
       "name": "rnaturalearthdata",
@@ -110913,9 +111603,9 @@
     },
     "robcp": {
       "name": "robcp",
-      "version": "0.3.8",
-      "sha256": "0gl75k2lzk16v4ahksdis07y3l1x78x2jyfisw6k48svcmhpsdv5",
-      "depends": ["Rcpp"]
+      "version": "0.3.9",
+      "sha256": "1wb3wafvbbapw2y8mwwf39ikz1hlkp2xwx66z3pidj70z19d1fgx",
+      "depends": ["MASS", "Rcpp", "mvtnorm", "pracma"]
     },
     "roben": {
       "name": "roben",
@@ -111003,8 +111693,8 @@
     },
     "robreg3S": {
       "name": "robreg3S",
-      "version": "0.3",
-      "sha256": "0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls",
+      "version": "0.3-1",
+      "sha256": "1hbav9pqsdlxgp6nly66iljpnq1qnpw32kims07lapnznlpfrq8j",
       "depends": ["GSE", "MASS", "robustbase"]
     },
     "robregcc": {
@@ -111117,8 +111807,8 @@
     },
     "robustbetareg": {
       "name": "robustbetareg",
-      "version": "0.3.0",
-      "sha256": "09f4binbi5gcf80fhpxzrmpm2k2xf6f7rcw9g2xzmni8b4cs2l6p",
+      "version": "0.3.1",
+      "sha256": "04a6h0d6q7rz3py42qnic5ijln89pzjhkb4xi4lbmvlkd03qzqqa",
       "depends": ["BBmisc", "Formula", "MASS", "Matrix", "Rmpfr", "betareg", "crayon", "miscTools", "numDeriv", "pracma", "robustbase", "rstudioapi", "zoo"]
     },
     "robustcov": {
@@ -111175,6 +111865,12 @@
       "sha256": "08c6dyzki68hzl006s12bkjiirlw2n2isirjh8b79sd6zjrjlh72",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo"]
     },
+    "robustsur": {
+      "name": "robustsur",
+      "version": "0.0-8",
+      "sha256": "0a5q1s6xac7lqf3y0m2n4zyfc9zqb3l0q54c9d1xalhkijn6cdyz",
+      "depends": ["GSE", "Matrix", "robreg3S", "robustbase"]
+    },
     "robustvarComp": {
       "name": "robustvarComp",
       "version": "0.1-7",
@@ -111345,8 +112041,8 @@
     },
     "rollupTree": {
       "name": "rollupTree",
-      "version": "0.3.1",
-      "sha256": "047dpddgg8lcrcvzaa6si8cmmwz4kh6p25pvz0k92vr47kh71f7f",
+      "version": "0.3.2",
+      "sha256": "0xchf2c8qq42i20355cp7mzrj9sk7cb6bnjf9ym042vfh24rbnfz",
       "depends": ["igraph"]
     },
     "roloc": {
@@ -111399,9 +112095,9 @@
     },
     "ropenblas": {
       "name": "ropenblas",
-      "version": "0.3.0",
-      "sha256": "161k0mjsbwyr4670cab546lxx9car9spc9qsjqcz8q9lj42rfyvn",
-      "depends": ["RCurl", "XML", "cli", "fs", "getPass", "git2r", "glue", "magrittr", "pingr", "rlang", "rstudioapi", "rvest", "stringr", "withr"]
+      "version": "0.4.0",
+      "sha256": "1sxmnq80xs7b7zkfxkl1260ym1s0gwzbd2p83w4bwsww873m48yi",
+      "depends": ["cli", "fs", "getPass", "git2r", "glue", "magrittr", "pingr", "rlang", "rvest", "stringr", "withr"]
     },
     "ropendata": {
       "name": "ropendata",
@@ -111495,8 +112191,8 @@
     },
     "rotasym": {
       "name": "rotasym",
-      "version": "1.1.5",
-      "sha256": "04vmxfj7jwd6h1d5ns4hq8xbc4sm008vsyiw5jlp212a4fdrplaj",
+      "version": "1.2.0",
+      "sha256": "0z97i9a659lvv9a0cmjkkcqqk2d6ikc231yljk9l11716q3hyzhi",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "rotationForest": {
@@ -111621,8 +112317,8 @@
     },
     "rpact": {
       "name": "rpact",
-      "version": "4.2.0",
-      "sha256": "1qfjqvdall6vnpflzj334xyskp8cwsl7831bidiajaw8j8w9bky4",
+      "version": "4.2.1",
+      "sha256": "0lff42fh00933lklzq4fhp5m57jgklqpm6i3ki6mbsj2y8y838gm",
       "depends": ["R6", "Rcpp", "knitr", "rlang"]
     },
     "rpaleoclim": {
@@ -111651,8 +112347,8 @@
     },
     "rpart_plot": {
       "name": "rpart.plot",
-      "version": "3.1.2",
-      "sha256": "1ci2nks8knx84f42lpxnpx0s4bvbbyfcxvynkw9baplf39fjmjix",
+      "version": "3.1.3",
+      "sha256": "01jap75v6n5s9mxmvc9f76pmzxyj0wdbvlx2f8xvy0n1xahayqbk",
       "depends": ["rpart"]
     },
     "rpartScore": {
@@ -111765,14 +112461,14 @@
     },
     "rpql": {
       "name": "rpql",
-      "version": "0.8.1",
-      "sha256": "065mkdfrhs7jmkwyvkydic04snih1wb18xshddll1r5kam4ixvn2",
+      "version": "0.8.2",
+      "sha256": "0ggw20rn4fw4nk8lnz1lmfgv6x86fi7v4l2jp1jpd5fqd81cn1lc",
       "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "gamlss_dist", "lme4", "mvtnorm"]
     },
     "rprev": {
       "name": "rprev",
-      "version": "1.0.5",
-      "sha256": "0494z0049rxahs4ndjlclzfc65k304a1m01cdlhjg4rz1gc1vrr8",
+      "version": "1.0.6",
+      "sha256": "1zfi1wk5ffcq2b1l8aznn3h5wdcwgiqa4qfvwk9z8f0zilfdqq9l",
       "depends": ["data_table", "dplyr", "ggplot2", "lazyeval", "lubridate", "magrittr", "survival", "tidyr"]
     },
     "rprime": {
@@ -111795,8 +112491,8 @@
     },
     "rprojroot": {
       "name": "rprojroot",
-      "version": "2.0.4",
-      "sha256": "16bf6ga5fgm83j3m67plw5i54az2vdbvw5m99ixaqkd24pxn7x5m",
+      "version": "2.1.0",
+      "sha256": "0ka7q8hajpzrwm9nq78032h1lr4a2np9ld3l93cjyzcjvj4ax0hq",
       "depends": []
     },
     "rprojtree": {
@@ -111819,14 +112515,14 @@
     },
     "rpyANTs": {
       "name": "rpyANTs",
-      "version": "0.0.4",
-      "sha256": "11044d5vi825g1b597hwkrw121m0q7vf5p5v17dq56zkrnr5jyx8",
+      "version": "0.0.5",
+      "sha256": "0ikq4j666vl87ywmhq5jymxdxs1vxa2fnldsj8nwjjf9n78l77mm",
       "depends": ["RNifti", "reticulate", "rpymat"]
     },
     "rpymat": {
       "name": "rpymat",
-      "version": "0.1.7",
-      "sha256": "0zrq4j0xw4blv9bsdrnkf0wb61bsm1lrlh92a2qw8p3daa48833q",
+      "version": "0.1.8",
+      "sha256": "1yajp34ns3q2nyqw29f155db171lim9ya852smvf9bllg5k732r3",
       "depends": ["IRkernel", "fastmap", "glue", "jsonlite", "rappdirs", "reticulate", "rstudioapi"]
     },
     "rqPen": {
@@ -111921,8 +112617,8 @@
     },
     "rrcov3way": {
       "name": "rrcov3way",
-      "version": "0.5-0",
-      "sha256": "1n4wjxb5irgsm9yfhg5aav161ca2s1cgzhggxgf8xxyy1yw3xnk0",
+      "version": "0.6-1",
+      "sha256": "0xk9y0w6l6fg45zmdw4am7ajw1s8xjvgsyjaxypcfk7dr5pkd9cq",
       "depends": ["ThreeWay", "nnls", "pracma", "robustbase", "rrcov"]
     },
     "rrcovHD": {
@@ -111951,8 +112647,8 @@
     },
     "rredlist": {
       "name": "rredlist",
-      "version": "1.0.0",
-      "sha256": "188difrf4v4bidw1ihgwi29vicv3fsmvmqhpm7h7z25fds3y4xp5",
+      "version": "1.1.0",
+      "sha256": "0kghiyjrawr5j55i4dxj50dix68rcrkj9l9j0ghkmgh1prwv7f6x",
       "depends": ["cli", "crul", "curl", "jsonlite", "lifecycle", "rlang"]
     },
     "rrefine": {
@@ -112041,8 +112737,8 @@
     },
     "rsample": {
       "name": "rsample",
-      "version": "1.3.0",
-      "sha256": "14f9m82c0j3r3z0wdk4jialfi4khnpznhfxca4cj64qgj5wxzx7k",
+      "version": "1.3.1",
+      "sha256": "0c34y1qi25q5idp19iba8p5vw86p35p40gb7xv3hka2h0gczncbb",
       "depends": ["cli", "dplyr", "furrr", "generics", "glue", "lifecycle", "pillar", "purrr", "rlang", "slider", "tibble", "tidyr", "tidyselect", "vctrs"]
     },
     "rsat": {
@@ -112065,9 +112761,9 @@
     },
     "rsconnect": {
       "name": "rsconnect",
-      "version": "1.4.1",
-      "sha256": "0h5f1a4kazzw5mn5a3k9x0gmbvbf1pcx0nny034v8jn65p3agvhq",
-      "depends": ["PKI", "RcppTOML", "cli", "curl", "digest", "jose", "jsonlite", "lifecycle", "openssl", "packrat", "renv", "rlang", "rstudioapi", "yaml"]
+      "version": "1.5.0",
+      "sha256": "01f4s6vmvdj15mg1mx01p4rv2pw3pwr3k9y4y68bzqvsh39pcbpk",
+      "depends": ["PKI", "cli", "curl", "digest", "jsonlite", "lifecycle", "openssl", "packrat", "renv", "rlang", "rstudioapi", "snowflakeauth", "yaml"]
     },
     "rscontract": {
       "name": "rscontract",
@@ -112077,8 +112773,8 @@
     },
     "rscopus": {
       "name": "rscopus",
-      "version": "0.8.1",
-      "sha256": "1cqgidnr8w20cs6l4rgaddj4n5n3zamqf6bvh9pzd2f616hl1nfv",
+      "version": "0.9.0",
+      "sha256": "1m6sc56hsfr2xyd3ry20b6qxa40znq97dnvjp08vp7r53w48c0pc",
       "depends": ["dplyr", "glue", "httr", "jsonlite", "magrittr", "plyr", "tidyr"]
     },
     "rscorecard": {
@@ -112089,8 +112785,8 @@
     },
     "rsdNE": {
       "name": "rsdNE",
-      "version": "1.1.0",
-      "sha256": "0xjnkg009m51zfwih1rpgwch8bs7vvri0x4skrikzx3nvlszcjh3",
+      "version": "1.2.0",
+      "sha256": "1540pj7qy1y32rxd5psd0168gcm694n8fcpi1sz4kh4h76444w1a",
       "depends": []
     },
     "rsdepth": {
@@ -112231,6 +112927,12 @@
       "sha256": "0cl00y9xy5iwmx003zja7b21db5sib7izs8qgmp6731w68bvdj2q",
       "depends": ["lintools", "validate"]
     },
+    "rspacer": {
+      "name": "rspacer",
+      "version": "0.2.0",
+      "sha256": "16igkl5zh8y7g37rbpb6yk6762p1i94ah8ipjlqdhv0kp7abbbj5",
+      "depends": ["cli", "curl", "dplyr", "fs", "glue", "httr2", "purrr", "readr", "readxl", "rlang", "rvest", "stringr", "tibble", "tidyr", "xml2"]
+    },
     "rsparkling": {
       "name": "rsparkling",
       "version": "0.2.19",
@@ -112341,8 +113043,8 @@
     },
     "rstpm2": {
       "name": "rstpm2",
-      "version": "1.6.7",
-      "sha256": "0drcnfpccl8braxxgx5vnkzcqgdk4gla2iscpixz041sa0yhm7hd",
+      "version": "1.6.9",
+      "sha256": "16zslanp6f9qvxas1xrliak1821qwjiahhdm1cwzpajwbwnq012h",
       "depends": ["Rcpp", "RcppArmadillo", "bbmle", "fastGHQuad", "mgcv", "mvtnorm", "numDeriv", "survival"]
     },
     "rstream": {
@@ -112383,8 +113085,8 @@
     },
     "rsurveycto": {
       "name": "rsurveycto",
-      "version": "0.2.1",
-      "sha256": "1s2slc7wlbrsvw0jnsimchypn6f8jmcs8fkc12a0f02lalgm21qn",
+      "version": "0.2.2",
+      "sha256": "1gc32b9c6wgcvsrpjz96r9vnd5w9y71x30cla2gmqg4hva1x29a7",
       "depends": ["checkmate", "cli", "curl", "data_table", "glue", "httr", "jsonlite", "lifecycle", "readxl", "rlang", "vctrs", "withr"]
     },
     "rsvd": {
@@ -112455,8 +113157,8 @@
     },
     "rtables": {
       "name": "rtables",
-      "version": "0.6.12",
-      "sha256": "1ma4vybabfsrajdfrvn4zqbdrpqh4vf3cmy98jdmdvg6jzlavvzh",
+      "version": "0.6.13",
+      "sha256": "1imnj3znl8g6f9hmi2vysqhl31zxbr7sjwnadg5r5d49xj6973f4",
       "depends": ["checkmate", "formatters", "htmltools", "lifecycle", "magrittr", "stringi"]
     },
     "rtables_officer": {
@@ -112501,6 +113203,12 @@
       "sha256": "0i9493f3rykhjxwbvydz6aikzkwfphq3dyc8jw0fzw057zd24cgb",
       "depends": ["rlang"]
     },
+    "rtestim": {
+      "name": "rtestim",
+      "version": "1.0.0",
+      "sha256": "0psvdmd6f878n3qq39ddsnyd5f200f22vsshi8hnwr581kj73qpl",
+      "depends": ["BH", "Matrix", "Rcpp", "RcppEigen", "checkmate", "cli", "dspline", "ggplot2", "rlang", "testthat", "tibble", "tvdenoising", "vctrs"]
+    },
     "rtf": {
       "name": "rtf",
       "version": "0.4-14.1",
@@ -112599,9 +113307,9 @@
     },
     "rtoot": {
       "name": "rtoot",
-      "version": "0.3.5",
-      "sha256": "1fdr1v7v7828gfd9mh0br2fzqx6p7rpy2avr58brli4i3lq25rgx",
-      "depends": ["clipr", "curl", "dplyr", "httr", "jsonlite", "tibble"]
+      "version": "0.3.6",
+      "sha256": "0dzmgfxh3dlibyj9zaiyf5plp75nn2267gcx8shdhn5j48g227c5",
+      "depends": ["cli", "clipr", "curl", "dplyr", "httr", "jsonlite", "tibble"]
     },
     "rtop": {
       "name": "rtop",
@@ -112617,8 +113325,8 @@
     },
     "rtrek": {
       "name": "rtrek",
-      "version": "0.5.1",
-      "sha256": "0hc58h2g3xldlcqlns43xf01sj09lmb7wnjlngsg6dr31z59xbk2",
+      "version": "0.5.2",
+      "sha256": "1bj5hv56ynjdj3iyvlq4z0w47qhzihdd3xsx5j7sbym0c0nhl8n9",
       "depends": ["downloader", "dplyr", "ggplot2", "jpeg", "jsonlite", "memoise", "png", "purrr", "rvest", "tibble", "tidyr", "xml2"]
     },
     "rtrend": {
@@ -112653,8 +113361,8 @@
     },
     "rts2": {
       "name": "rts2",
-      "version": "0.8.0",
-      "sha256": "11qigvkrvgqbm7x08a9xrlm8a1qgrzrpda8dqhlqlcj2sd60wp07",
+      "version": "0.8.3",
+      "sha256": "100zapbwdk952687a38pqimvb3zzpc7xp18y1c987hjmz1xf5adj",
       "depends": ["BH", "R6", "Rcpp", "RcppEigen", "RcppParallel", "SparseChol", "StanHeaders", "glmmrBase", "lubridate", "raster", "rstan", "rstantools", "sf", "stars"]
     },
     "rtsdata": {
@@ -112701,8 +113409,8 @@
     },
     "rugarch": {
       "name": "rugarch",
-      "version": "1.5-3",
-      "sha256": "150rw7hyfxcrrhpnwjq5zqk54jrqkj8pjzm65nb5077qjicd7yf0",
+      "version": "1.5-4",
+      "sha256": "10p8ljirzgy5awgh4ah2r582l239p4ssczyx4xhi764941zc7biv",
       "depends": ["Rcpp", "RcppArmadillo", "Rsolnp", "SkewHyperbolic", "chron", "fracdiff", "ks", "nloptr", "numDeriv", "spd", "xts", "zoo"]
     },
     "ruijter": {
@@ -112711,16 +113419,10 @@
       "sha256": "0gdpl32acwq8cjsv04s5p6rwc1v3x59p4knm4qlzlgmv5dsvil64",
       "depends": ["tibble"]
     },
-    "ruimtehol": {
-      "name": "ruimtehol",
-      "version": "0.3.2",
-      "sha256": "1fjyrcqb1hv86xwdq5zds8gdgnvcv1nnbh5j7mf17870miy0vzln",
-      "depends": ["BH", "Rcpp"]
-    },
     "ruler": {
       "name": "ruler",
-      "version": "0.3.0",
-      "sha256": "0k6xvb06cqiinvkpbmylzm0r11h52yay6k70jfmz2c0g5rb6bj4r",
+      "version": "0.3.1",
+      "sha256": "1q9lqjfdpqk9ywjwji3crp0rfh8kd3zsxqm3hym9yhzggqjhb364",
       "depends": ["dplyr", "keyholder", "magrittr", "purrr", "rlang", "tibble", "tidyr"]
     },
     "rules": {
@@ -112791,8 +113493,8 @@
     },
     "runonce": {
       "name": "runonce",
-      "version": "0.2.3",
-      "sha256": "04lmzw9ldc3b6zdc7sr3mrfiam24372j11l5p1y9i2zjb9rxk1nn",
+      "version": "0.3.2",
+      "sha256": "1if51m0lb85v6cfi6dy071g8q04hzm1rfa6lzlb9qk2f0w897fkm",
       "depends": ["bigassertr", "urltools"]
     },
     "runstats": {
@@ -112803,8 +113505,8 @@
     },
     "rush": {
       "name": "rush",
-      "version": "0.2.0",
-      "sha256": "115k13k6qj8pq0h58y7qcknfw53x0qv4z0nrs446knc90rcwjscx",
+      "version": "0.3.0",
+      "sha256": "08kk0r7d4xaa65lvll85zrzgrnf0z1sq2y44hj6a3wf7in8azyy0",
       "depends": ["R6", "checkmate", "data_table", "ids", "jsonlite", "lgr", "mirai", "mlr3misc", "processx", "redux", "uuid"]
     },
     "rusk": {
@@ -112863,8 +113565,8 @@
     },
     "rvec": {
       "name": "rvec",
-      "version": "0.0.7",
-      "sha256": "0m30jyzrbywlbhqc6k2178fmq7z6169qwr8pckijnx63al3qsyxn",
+      "version": "0.0.8",
+      "sha256": "1jv9va1xkj5wq7fr50s8qkbyapfv9ij2qbqhys460gdxk1qk67kp",
       "depends": ["cli", "glue", "matrixStats", "rlang", "tibble", "tidyselect", "vctrs"]
     },
     "rversions": {
@@ -112897,12 +113599,6 @@
       "sha256": "161fdvk1gn5mz15shkd2w0yv0y9bp5rzyrmg43yl7h75csfl7l8g",
       "depends": ["rJava"]
     },
-    "rvif": {
-      "name": "rvif",
-      "version": "2.0",
-      "sha256": "0w7any6km13jnad9jx1a8gkfmzbz345dwkhm5mxi06zfk65yv65r",
-      "depends": ["multiColl"]
-    },
     "rvinecopulib": {
       "name": "rvinecopulib",
       "version": "0.7.3.1.0",
@@ -112929,9 +113625,9 @@
     },
     "rwa": {
       "name": "rwa",
-      "version": "0.0.3",
-      "sha256": "11irb6ayr1a1rbmhc9zqwyb1vjfc0fq7imji0lfa30zplwgf1mqh",
-      "depends": ["dplyr", "ggplot2", "magrittr", "tidyr"]
+      "version": "0.1.0",
+      "sha256": "0qdw88w3zgnfzi2k8a8m64pix4vb2v0y99063w01jvncvd1jibg3",
+      "depends": ["boot", "dplyr", "ggplot2", "magrittr", "purrr", "tidyr"]
     },
     "rwalkr": {
       "name": "rwalkr",
@@ -113031,8 +113727,8 @@
     },
     "rxode2": {
       "name": "rxode2",
-      "version": "3.0.4",
-      "sha256": "1d67md4rr08csv47yrls0ssq4lh6yhkm9n201zfyn1f9h731jhsj",
+      "version": "4.0.3",
+      "sha256": "1lm711vjci053v1fds3xsn06n1shf5vjiv2prsfp2hk7rb5c33yv",
       "depends": ["BH", "PreciseSums", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "StanHeaders", "backports", "checkmate", "cli", "data_table", "dparser", "ggplot2", "inline", "lotri", "magrittr", "memoise", "qs", "rex", "rxode2ll", "sitmo", "sys"]
     },
     "rxode2ll": {
@@ -113113,12 +113809,6 @@
       "sha256": "16692xrdgvijhdaqaysr61bl8hfjx0li7xnbk9rbnvj4g196zq2n",
       "depends": ["R6", "curl", "data_table", "fs", "future", "future_apply", "lgr", "paws_storage"]
     },
-    "s4vd": {
-      "name": "s4vd",
-      "version": "1.1-1",
-      "sha256": "1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp",
-      "depends": ["biclust", "foreach", "irlba"]
-    },
     "sAIC": {
       "name": "sAIC",
       "version": "1.0.1",
@@ -113271,8 +113961,8 @@
     },
     "sae_projection": {
       "name": "sae.projection",
-      "version": "0.1.3",
-      "sha256": "0qbpr5xc9a2mlflncc3wq73ciim823dmxxljawcmml8pf6lhihh8",
+      "version": "0.1.4",
+      "sha256": "02s1ngqfcxrwddxcmqpj9gazj1qb9m8x3ahgh5vywckx9d12772w",
       "depends": ["FSelector", "bonsai", "caret", "cli", "doParallel", "dplyr", "glmnet", "lightgbm", "parsnip", "randomForest", "ranger", "recipes", "rlang", "rsample", "survey", "themis", "tidymodels", "tune", "workflows", "xgboost", "yardstick"]
     },
     "sae_prop": {
@@ -113317,6 +114007,12 @@
       "sha256": "1i1pgvh6xn26w3g4x7bn0d8qi2g9l8fd58ag1i7lrsrq3rx5m83k",
       "depends": ["coda", "rjags", "stringr"]
     },
+    "saeHB_TF_beta": {
+      "name": "saeHB.TF.beta",
+      "version": "0.1.0",
+      "sha256": "14hnkag0pw82fj88bhrc506dgks6q9834wiyi20sc0wv8c2m6xb8",
+      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayesplot", "rstan", "rstantools", "stringr"]
+    },
     "saeHB_ZIB": {
       "name": "saeHB.ZIB",
       "version": "0.1.1",
@@ -113415,8 +114111,8 @@
     },
     "saemix": {
       "name": "saemix",
-      "version": "3.3",
-      "sha256": "1xx6254sj6lyarkkdkl3lajflyh8c2y8261bl9a19d1457l1h8wv",
+      "version": "3.4",
+      "sha256": "1az3wrmw9digjkq58gc0619114nyr0miia6d7nsp5fgbn9khd7q6",
       "depends": ["MASS", "ggplot2", "gridExtra", "mclust", "npde", "rlang", "scales"]
     },
     "saens": {
@@ -113431,6 +114127,12 @@
       "sha256": "1x8r61yar1wbjbcrzfzpb7g4xyvvw82rhzsgvs87iab9k1axz8q1",
       "depends": []
     },
+    "safeframe": {
+      "name": "safeframe",
+      "version": "1.0.0",
+      "sha256": "11wsn18zvv4w36xj1n970ffrhw4ws9vk0akk8gxqlixkg8n141x2",
+      "depends": ["checkmate", "lifecycle", "rlang", "tidyselect"]
+    },
     "safejoin": {
       "name": "safejoin",
       "version": "0.2.0",
@@ -113553,8 +114255,8 @@
     },
     "sampcompR": {
       "name": "sampcompR",
-      "version": "0.3.0",
-      "sha256": "0dmscwmz4ramcgrr7rh0m47xq0xnp85pjny2932l4kpkplmhv201",
+      "version": "0.3.1.2",
+      "sha256": "154wxpbnwl0fgwq0imnj123n12hjqnkzrl2y9ngv8iadrzgvlxi0",
       "depends": ["Hmisc", "boot", "data_table", "dplyr", "forcats", "furrr", "future", "ggplot2", "lmtest", "magrittr", "psych", "purrr", "readr", "reshape2", "rlang", "sandwich", "survey", "svrep", "tibble", "tidyr"]
     },
     "sampleSelection": {
@@ -113619,8 +114321,8 @@
     },
     "sampling": {
       "name": "sampling",
-      "version": "2.10",
-      "sha256": "0x976wblv663aidqmcif1rjv72nbxf4nzms901lmryxbq1p9gv7x",
+      "version": "2.11",
+      "sha256": "08k4h4ki9xpb2kpml3ld4yjmxirrj5vcs21ic4rj8gl776a3y6ll",
       "depends": ["MASS", "lpSolve"]
     },
     "samplingDataCRT": {
@@ -113691,9 +114393,9 @@
     },
     "sanba": {
       "name": "sanba",
-      "version": "0.0.1",
-      "sha256": "084nhbg8a8b8nh2fxg4if3cfyhrkscnb171n8j9s9xb3zdmbhhzk",
-      "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "RcppProgress", "cpp11", "matrixStats", "salso", "scales"]
+      "version": "0.0.2",
+      "sha256": "1k9r63m4fc3v70887br8w4rd8x6fbm6076wq534mq9020hpwbj34",
+      "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "RcppProgress", "matrixStats", "salso", "scales"]
     },
     "sand": {
       "name": "sand",
@@ -113787,8 +114489,8 @@
     },
     "sapfluxnetr": {
       "name": "sapfluxnetr",
-      "version": "0.1.4",
-      "sha256": "0x437nhv3g327apxnihr1wnp4mmzxn9pfk24shpj6a8amxphlzxd",
+      "version": "0.1.5",
+      "sha256": "17x1dnnavcqzlc7rsgh10nj2qhcmywiwkq0x4wx39mv688q72brw",
       "depends": ["assertthat", "dplyr", "furrr", "ggplot2", "glue", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "sapo": {
@@ -113865,8 +114567,8 @@
     },
     "sasLM": {
       "name": "sasLM",
-      "version": "0.10.5",
-      "sha256": "1m44rf8mpw9pc5jlxw8ab5z62knj0fjfvbrs53yvfvlbh39xjbq4",
+      "version": "0.10.6",
+      "sha256": "10yfyj5fara54dgdc3ir3ygns63ahh7aidb3ifbi7xby5i39nn3s",
       "depends": ["mvtnorm"]
     },
     "sasfunclust": {
@@ -113923,12 +114625,6 @@
       "sha256": "0651vv381b5j8zn9gngkqz7asbz3bwrrln57448j2w0qa1lfpq87",
       "depends": ["sf", "snakecase", "terra"]
     },
-    "saturnin": {
-      "name": "saturnin",
-      "version": "1.1.1",
-      "sha256": "0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36",
-      "depends": ["Rcpp", "RcppEigen"]
-    },
     "savonliquide": {
       "name": "savonliquide",
       "version": "0.2.0",
@@ -113979,8 +114675,8 @@
     },
     "sbgcop": {
       "name": "sbgcop",
-      "version": "0.980",
-      "sha256": "0vmg8b4462qghlyx6hq0raf9xqvygzgwi5y0cbqcljhmbmqjrwxs",
+      "version": "1.0",
+      "sha256": "1mqj3dyza886dal83plf5xj3idp3yrj6hg8acsw14lc4c5kbp2wi",
       "depends": []
     },
     "sbim": {
@@ -114027,8 +114723,8 @@
     },
     "sbtools": {
       "name": "sbtools",
-      "version": "1.3.2",
-      "sha256": "14yjml5d34jkyw7rsc02zpb4wy9w30sxqzpdjk02znxpm9baxsj1",
+      "version": "1.4.1",
+      "sha256": "0gwy8hn79b0z8j9dalgkzyq6j127pll13fsd248aiarin884yiax",
       "depends": ["cli", "curl", "httr", "jsonlite", "keyring", "mime"]
     },
     "sbw": {
@@ -114099,9 +114795,9 @@
     },
     "scGate": {
       "name": "scGate",
-      "version": "1.7.0",
-      "sha256": "0wsp7q7m0v0ijzgcim0ixa770055n4j5hj0aypx62kchni5p8cjn",
-      "depends": ["BiocParallel", "Seurat", "UCell", "dplyr", "ggplot2", "ggridges", "patchwork", "reshape2"]
+      "version": "1.7.2",
+      "sha256": "050a23wlmzp2pijzi8dgjzjy349mzs9apiiz8i4q7j6ak63lcij9",
+      "depends": ["BiocParallel", "Seurat", "UCell", "colorspace", "dplyr", "ggplot2", "ggridges", "patchwork", "reshape2"]
     },
     "scINSIGHT": {
       "name": "scINSIGHT",
@@ -114127,6 +114823,12 @@
       "sha256": "0gcwx8kfik1lv949r9d9rqqnvrfkr4bj5cj2i9h1r7l1b76kna74",
       "depends": ["glasso"]
     },
+    "scMappR": {
+      "name": "scMappR",
+      "version": "1.0.12",
+      "sha256": "1hlqh54qy3lh4chpsbl4qwpdirik0jkcgxmylr31p250cwz0frfw",
+      "depends": ["ADAPTS", "GSVA", "Seurat", "downloader", "gProfileR", "ggplot2", "gprofiler2", "limSolve", "pbapply", "pcaMethods", "pheatmap", "reshape"]
+    },
     "scModels": {
       "name": "scModels",
       "version": "1.0.4",
@@ -114187,6 +114889,12 @@
       "sha256": "04r3fqsv0ycjycy11r03ga05s4wzjlmhxifw8cm92qkcl8h4av40",
       "depends": ["crayon", "dplyr", "ggplot2", "ggpubr", "magrittr", "pbmcapply", "proxy", "spatstat_geom", "spatstat_random", "tidyr"]
     },
+    "scStability": {
+      "name": "scStability",
+      "version": "1.0.3",
+      "sha256": "0fkqgxgmcqwwhqdi0lq2y2ql6bdvbyr7b75nsrda5xpysalcling",
+      "depends": ["Rtsne", "Seurat", "aricode", "future", "future_apply", "ggplot2", "magrittr", "pcaPP", "rlang", "uwot", "vegan"]
+    },
     "scTenifoldKnk": {
       "name": "scTenifoldKnk",
       "version": "1.0.1",
@@ -114235,12 +114943,6 @@
       "sha256": "0340biwz0md6sxq5iq5wiz6q8kcrll80429f1ab9zz88k3fya2s6",
       "depends": []
     },
-    "scaleboot": {
-      "name": "scaleboot",
-      "version": "1.0-1",
-      "sha256": "1q0bs5f1vgja5gj3id1ny6raja8ljgd8dk50fs1wn90f6080afy7",
-      "depends": ["mvtnorm", "pvclust"]
-    },
     "scales": {
       "name": "scales",
       "version": "1.4.0",
@@ -114261,8 +114963,8 @@
     },
     "scan": {
       "name": "scan",
-      "version": "0.64.0",
-      "sha256": "1vmcx1sf973vxhqcsm6rpkxgmskgnvaq3xdd0lf5i6cpcg4rdfri",
+      "version": "0.65.1",
+      "sha256": "1ljjz3w482c6cr043wml3h64rananh2y5skcgy08mc9pzlr9m52a",
       "depends": ["MCMCglmm", "car", "gt", "kableExtra", "knitr", "magrittr", "mblm", "nlme", "readxl"]
     },
     "scanstatistics": {
@@ -114333,8 +115035,8 @@
     },
     "scatterpie": {
       "name": "scatterpie",
-      "version": "0.2.4",
-      "sha256": "165n0jay7aad5i10g520zrrcdx12m63mxg6d3a66gmash6sj2jsr",
+      "version": "0.2.5",
+      "sha256": "061c53rj6f9srshd5izad190glll3202kgbdwz403jc0g77xrwan",
       "depends": ["dplyr", "ggforce", "ggfun", "ggplot2", "rlang", "tidyr", "yulab_utils"]
     },
     "scatterplot3d": {
@@ -114441,8 +115143,8 @@
     },
     "scholar": {
       "name": "scholar",
-      "version": "0.2.4",
-      "sha256": "12r4j1s71szh77nsnqzsi0q5cvkp0cyr2fxzcagk02f42bnp5aww",
+      "version": "0.2.5",
+      "sha256": "15zdikddwc0dv3f0p98vr6vnxq7117yzws6a6lrkn08qg2k8wq5j",
       "depends": ["R_cache", "dplyr", "ggplot2", "ggraph", "httr", "rlang", "rvest", "stringr", "tidygraph", "xml2"]
     },
     "schoolmath": {
@@ -114519,8 +115221,8 @@
     },
     "scimo": {
       "name": "scimo",
-      "version": "0.0.2",
-      "sha256": "1fvljxn6m01wv4hmljcrki2wzbc0nlr3zrbyw80jbzw3p55vqgls",
+      "version": "0.0.3",
+      "sha256": "1mly3l0gyzf2ifx4x4zagd01pib75r1r5f4sml6vm8d01f7d0k8q",
       "depends": ["dplyr", "generics", "magrittr", "recipes", "rlang", "tibble", "tidyr"]
     },
     "sciplot": {
@@ -114615,8 +115317,8 @@
     },
     "scoringutils": {
       "name": "scoringutils",
-      "version": "2.1.0",
-      "sha256": "1i1p09dws471mmm9v47ad3s30b9lapalz1yrq4vdvsn2m52yh5hb",
+      "version": "2.1.1",
+      "sha256": "17plqjbvbxy34dh233rc9js78m3klg4c883snc0n39wrybhspggc",
       "depends": ["Metrics", "checkmate", "cli", "data_table", "ggplot2", "purrr", "scoringRules"]
     },
     "scout": {
@@ -114639,14 +115341,14 @@
     },
     "scpi": {
       "name": "scpi",
-      "version": "3.0.0",
-      "sha256": "0qmx43x16xwiwzjhqzvic18nlf4wbmasfd2bw63rrazzgj8zhqpr",
-      "depends": ["CVXR", "ECOSolveR", "MASS", "Matrix", "Qtools", "abind", "doSNOW", "dplyr", "fastDummies", "foreach", "ggplot2", "magrittr", "purrr", "reshape2", "rlang", "stringr", "tibble", "tidyr"]
+      "version": "3.0.1",
+      "sha256": "1g63csw4fpcy67y6pl9h02m233k4rqv2kvk50bb788nmpxw79pzk",
+      "depends": ["CVXR", "ECOSolveR", "MASS", "Matrix", "Qtools", "Rdpack", "abind", "doSNOW", "dplyr", "fastDummies", "foreach", "ggplot2", "magrittr", "purrr", "reshape2", "rlang", "stringr", "tibble", "tidyr"]
     },
     "scplot": {
       "name": "scplot",
-      "version": "0.5.1",
-      "sha256": "0pygj45m55qwwip18gxmjz8z5m451xkjpd3cns81cs0cs9xji9dw",
+      "version": "0.6.0",
+      "sha256": "0bsdzvc6c5bdwwah5mbr1x7aq40zd0597ivdhzi88c3awfjvm08q",
       "depends": ["ggplot2", "mblm", "scan"]
     },
     "scpoisson": {
@@ -114693,8 +115395,8 @@
     },
     "scregclust": {
       "name": "scregclust",
-      "version": "0.2.0",
-      "sha256": "0pcnwyv3qx1wbjr27576zp0jfi1axplmghgc0yf9rjdxsh6hp44b",
+      "version": "0.2.2",
+      "sha256": "07cicq7lbp6x4gk2rk9q2c9lh98zkjlg3j9qsg50x8xc216x6462",
       "depends": ["Matrix", "Rcpp", "RcppEigen", "cli", "ggplot2", "igraph", "prettyunits", "reshape", "rlang"]
     },
     "scribe": {
@@ -114831,8 +115533,8 @@
     },
     "sdcHierarchies": {
       "name": "sdcHierarchies",
-      "version": "0.21.0",
-      "sha256": "0ihfddjkqdmzpr62dackblwbjcvbkhzm4ap1xzbn4m8i3z1nlbi0",
+      "version": "0.22.0",
+      "sha256": "1nd3g1lhmxmbhpn7mcm4kd3pq1b9n4fbb7294151sjbqbab21qp6",
       "depends": ["Rcpp", "cli", "data_table", "jsonlite", "rlang", "shiny", "shinyTree", "shinyjs", "shinythemes"]
     },
     "sdcLog": {
@@ -114855,9 +115557,9 @@
     },
     "sdcTable": {
       "name": "sdcTable",
-      "version": "0.32.7",
-      "sha256": "14fqf8m2k3lzbqq3ww5hv0f9m56vxwl6v3pcj446zagawaja3wvb",
-      "depends": ["Matrix", "Rcpp", "Rglpk", "SSBtools", "data_table", "glpkAPI", "knitr", "progress", "rlang", "sdcHierarchies", "slam", "stringr"]
+      "version": "0.33.0",
+      "sha256": "0zzqb83yfsqli5dkychbm6pv15909m70raxdmd0k91pbaic6n9j2",
+      "depends": ["Matrix", "Rcpp", "SSBtools", "data_table", "highs", "knitr", "progress", "rlang", "sdcHierarchies", "slam", "stringr"]
     },
     "sde": {
       "name": "sde",
@@ -114879,14 +115581,14 @@
     },
     "sdm": {
       "name": "sdm",
-      "version": "1.2-55",
-      "sha256": "0bnypbhym7rnkc4hd7yzm6ga1p3vkpxsjpiaji5mc145qvqnwyij",
+      "version": "1.2-59",
+      "sha256": "0s2agg091bsg6jz165silbfwl4zfq8m5vgx4bmh901hgxi20vf05",
       "depends": ["raster", "sp", "terra"]
     },
     "sdmTMB": {
       "name": "sdmTMB",
-      "version": "0.7.0",
-      "sha256": "0122891lkfzl8crbk4f03vlgknq0dl1ncj75p8mn2aivdjgi9vzv",
+      "version": "0.7.4",
+      "sha256": "04r0c7l6lqgyax44r3p7xzhf85wz49i10ddw2x8k9qvl725vigs4",
       "depends": ["Matrix", "RcppEigen", "TMB", "abind", "assertthat", "cli", "fishMod", "fmesher", "generics", "lifecycle", "lme4", "mgcv", "mvtnorm", "nlme", "rlang"]
     },
     "sdmpredictors": {
@@ -115015,12 +115717,6 @@
       "sha256": "1xy2hacd57v75y5snhn4al7bi71wr994jy6m2sdr6qzzsd5pbgpc",
       "depends": ["forecast", "xts", "zoo"]
     },
-    "seawaveQ": {
-      "name": "seawaveQ",
-      "version": "2.0.2",
-      "sha256": "1x4vvassal1lwb9xnwisrhlx2maaqxl84h7klfy8yg9x80fdrhsw",
-      "depends": ["lubridate", "plyr", "reshape2", "rms", "survival"]
-    },
     "secr": {
       "name": "secr",
       "version": "5.2.4",
@@ -115059,8 +115755,8 @@
     },
     "secsse": {
       "name": "secsse",
-      "version": "3.1.0",
-      "sha256": "0v4qjsjmc7shqx8cy92c99fh6bfy2zdkwi2as05r2h4c2vk3p73z",
+      "version": "3.5.0",
+      "sha256": "0cmjf21rlj6r6gbspvpfv0f3slxv174d8mzk49qfdm9394fsvrcw",
       "depends": ["BH", "DDD", "Rcpp", "RcppParallel", "ape", "geiger", "ggplot2", "rlang", "tibble", "treestats"]
     },
     "sectorgap": {
@@ -115077,8 +115773,8 @@
     },
     "sedproxy": {
       "name": "sedproxy",
-      "version": "0.7.5",
-      "sha256": "1n5970pbdc0zl9vh0fslirlww56as5c090mnhzbic1fdzkhli245",
+      "version": "0.7.6",
+      "sha256": "05j3lfbi7yp2knnxym8y5vls4ynqx3fh5r6v42p0fqnk6wxsga9n",
       "depends": ["dplyr", "ggplot2", "mvtnorm", "rlang", "tidyr"]
     },
     "see": {
@@ -115141,6 +115837,12 @@
       "sha256": "13c48sn453yp4j0ap8slnnr2gfhlxasz926p2pazkrg817w7m28z",
       "depends": ["tuneR"]
     },
+    "segMGarch": {
+      "name": "segMGarch",
+      "version": "1.3",
+      "sha256": "0s5zi35z7r72m8g9a5l5w55cnkwkgxmwi653dcfjg0pcdc7v5s6z",
+      "depends": ["Rcpp", "RcppArmadillo", "corpcor", "doParallel", "fGarch", "foreach", "iterators", "mvtnorm"]
+    },
     "segRDA": {
       "name": "segRDA",
       "version": "1.0.2",
@@ -115203,9 +115905,9 @@
     },
     "segtest": {
       "name": "segtest",
-      "version": "1.0.2",
-      "sha256": "17r0k61wxry2bcb1aqrvvpbavqkf04qcaql2cn8qnbyfm5gxdhm4",
-      "depends": ["Rcpp", "RcppArmadillo", "doFuture", "doRNG", "foreach", "future", "iterators", "updog"]
+      "version": "2.0.0",
+      "sha256": "12i2p1q5yhqlazjang2nfzn0kpsmcy8z05qqql7956gcvr21njk0",
+      "depends": ["Rcpp", "RcppArmadillo", "doFuture", "doRNG", "foreach", "future", "iterators", "minqa", "nloptr", "updog"]
     },
     "seguid": {
       "name": "seguid",
@@ -115299,8 +116001,8 @@
     },
     "selenium": {
       "name": "selenium",
-      "version": "0.1.4",
-      "sha256": "0dnz7zz1rxkf80ayxmp56kcx3blbl5hxwcy66rhrs1s090mbhyxr",
+      "version": "0.2.0",
+      "sha256": "1gsk7cbykain4xf7zxx96wpl2rfgmcmdx9y8xmgjj0ngqm8q0rww",
       "depends": ["R6", "base64enc", "httr2", "jsonlite", "lifecycle", "processx", "rappdirs", "rlang"]
     },
     "selfingTree": {
@@ -115327,6 +116029,12 @@
       "sha256": "1a71yaw20l5wsmgchwf4p3yhwbb2g65aw5i8cmajyhwp0hhvgyls",
       "depends": ["boot", "gsl", "lme4"]
     },
+    "semEffect": {
+      "name": "semEffect",
+      "version": "1.2.3",
+      "sha256": "0bqg2m7674n22dqn2m10y86ziv785kwh4k1hw7kmnlkd68y8j92y",
+      "depends": ["RColorBrewer", "checkmate", "dplyr", "ggplot2", "lavaan", "piecewiseSEM", "plspm", "tidyr"]
+    },
     "semPlot": {
       "name": "semPlot",
       "version": "1.1.6",
@@ -115425,10 +116133,16 @@
     },
     "seminr": {
       "name": "seminr",
-      "version": "2.3.4",
-      "sha256": "0zh5slwrsv20z1irfy944cd0x7940yv84p5mjj7jj9isgr9a8wbz",
+      "version": "2.3.6",
+      "sha256": "1sdqcdlbfc6jyn32a9dhva8cc35ni64b05m8fd69glh91q7lflmw",
       "depends": ["DiagrammeR", "DiagrammeRsvg", "glue", "knitr", "lavaan", "rmarkdown", "testthat", "webp"]
     },
+    "seminrExtras": {
+      "name": "seminrExtras",
+      "version": "0.1.0",
+      "sha256": "1xfj03qc5wzvk561dn8flv3bww12305chqs25chcbmy9yya3j1b1",
+      "depends": ["seminr"]
+    },
     "semlbci": {
       "name": "semlbci",
       "version": "0.11.3",
@@ -115467,8 +116181,8 @@
     },
     "semptools": {
       "name": "semptools",
-      "version": "0.3.1",
-      "sha256": "0hyf1zr592hrl45xd678vma3g6wa3qdj4bchr3a7bvvr42nhcsyf",
+      "version": "0.3.2",
+      "sha256": "0g2wrcynh2f8l3sm2csrfa11g3p4j7483ifv10yh7m7kx96k8gmq",
       "depends": ["lavaan", "rlang", "semPlot"]
     },
     "semsfa": {
@@ -115479,9 +116193,9 @@
     },
     "semtree": {
       "name": "semtree",
-      "version": "0.9.20",
-      "sha256": "1dcxnlnl5j9dha5bdmj4rn117cbssdzp1gwdnch2pc0234ziq4ys",
-      "depends": ["OpenMx", "clisymbols", "cluster", "crayon", "data_table", "expm", "future_apply", "ggplot2", "gridBase", "lavaan", "rpart", "rpart_plot", "sandwich", "strucchange", "tidyr", "zoo"]
+      "version": "0.9.22",
+      "sha256": "15hdikqrmjm8pmqycz102sl9v9d980dipxpi4ynbhyywp9is0q3r",
+      "depends": ["OpenMx", "clisymbols", "cluster", "crayon", "data_table", "dplyr", "expm", "future_apply", "ggplot2", "gridBase", "lavaan", "rpart", "rpart_plot", "sandwich", "strucchange", "tidyr", "zoo"]
     },
     "semver": {
       "name": "semver",
@@ -115593,8 +116307,8 @@
     },
     "sensobol": {
       "name": "sensobol",
-      "version": "1.1.5",
-      "sha256": "0vw53aqlgdqncy8cpwlc959bavrsfqam7yq99ic6ij8kxqf4h9xl",
+      "version": "1.1.6",
+      "sha256": "0irdiknzrjd6mk2652qljawj4li1r9ii4m4fhbyl1wf9rh5gkg6n",
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "Rfast", "boot", "data_table", "deSolve", "ggplot2", "lhs", "magrittr", "matrixStats", "randtoolbox", "rlang", "scales", "stringr"]
     },
     "sensory": {
@@ -115995,8 +116709,8 @@
     },
     "sfhotspot": {
       "name": "sfhotspot",
-      "version": "0.9.1",
-      "sha256": "0827wff1bldd90swrj6cxyhn9nisyzb6kb24wpmaxpryjdclhjkw",
+      "version": "1.0.0",
+      "sha256": "1cy157rq1f9fyqnlcsfryjl8snar48dzgxqs4flg7ba44wlrmx3p",
       "depends": ["SpatialKDE", "cli", "ggplot2", "rlang", "sf", "spdep", "tibble"]
     },
     "sfinx": {
@@ -116025,8 +116739,8 @@
     },
     "sfsmisc": {
       "name": "sfsmisc",
-      "version": "1.1-20",
-      "sha256": "0svpqdcwq62y5d2ywcdrqn1lpq1jvfqx9mxl0dxxa08whahhyqs4",
+      "version": "1.1-21",
+      "sha256": "0w6lqs7xn2g0979v8vwvldqcdaws4nvgb4g9kr1007476f977jhl",
       "depends": []
     },
     "sft": {
@@ -116169,8 +116883,8 @@
     },
     "sgsR": {
       "name": "sgsR",
-      "version": "1.4.5",
-      "sha256": "1ircbwlc6ysv8v8vxn5snjqx47qhi5rdqyd3vvf3cx54jndsnvah",
+      "version": "1.5.0",
+      "sha256": "0rvi2h5q520dih81kwz0wk8a9znbsl42ahnbq7djqh0yrcnraj29",
       "depends": ["BalancedSampling", "SamplingBigData", "clhs", "dplyr", "ggplot2", "sf", "spatstat_geom", "terra", "tidyr"]
     },
     "sgstar": {
@@ -116191,6 +116905,12 @@
       "sha256": "1zg95sjhrfvbdlfc387g9p0vnb8nb6agdk1mb3wq3kwkm2da0bqj",
       "depends": []
     },
+    "shadowVIMP": {
+      "name": "shadowVIMP",
+      "version": "1.0.2",
+      "sha256": "0ic6fxrbfkcf5cyacg4lwg04xphiin9x4ymf968f7m6p9494s9xs",
+      "depends": ["dplyr", "ggforce", "ggplot2", "ggpubr", "magrittr", "patchwork", "ranger", "rlang", "stringr", "tidyr"]
+    },
     "shadowr": {
       "name": "shadowr",
       "version": "0.0.2",
@@ -116199,9 +116919,9 @@
     },
     "shadowtext": {
       "name": "shadowtext",
-      "version": "0.1.4",
-      "sha256": "1s3fsh6cmblyhlqrswialc9437as306ki36dyx0dv4001slvxl47",
-      "depends": ["ggplot2", "scales"]
+      "version": "0.1.5",
+      "sha256": "0gbjipm8qqkrgmjfw38i92nv2r6rmnm362kjw1fh9834q159n2mq",
+      "depends": ["S7", "ggplot2", "scales"]
     },
     "shannon": {
       "name": "shannon",
@@ -116259,8 +116979,8 @@
     },
     "shapviz": {
       "name": "shapviz",
-      "version": "0.9.7",
-      "sha256": "0x5kzw465688ibdpl97bddakscsza1mjrvkvg4w3rp01ssrln3dw",
+      "version": "0.10.2",
+      "sha256": "0fhm324371dcd9nlr5vws75l1pi05jqqsgsqv6sd9naij88mwsmk",
       "depends": ["ggfittext", "gggenes", "ggplot2", "ggrepel", "patchwork", "rlang", "xgboost"]
     },
     "shar": {
@@ -116271,8 +116991,8 @@
     },
     "sharp": {
       "name": "sharp",
-      "version": "1.4.7",
-      "sha256": "1fx9kj6316pd04wpfd1dz76wf56jp2rax172f2x7r7ymmqj1p5sk",
+      "version": "1.4.8",
+      "sha256": "1cr2850pr775wmmkmj43m72m645ggp8c40sl3wd6giji72z98789",
       "depends": ["Rdpack", "abind", "beepr", "fake", "future", "future_apply", "glassoFast", "glmnet", "igraph", "mclust", "nloptr", "plotrix", "withr"]
     },
     "sharpData": {
@@ -116307,8 +117027,8 @@
     },
     "sharx": {
       "name": "sharx",
-      "version": "1.0-6",
-      "sha256": "0fyz7m8zx2i4r1kj5svzmn6l43f7zg2sj4c3ynyjwa1lzi5wf75v",
+      "version": "1.0-7",
+      "sha256": "0s2h9n9p9nns3bfh2fvzjd95nxkd2lsmssl6xgd3ksq311ymd1s7",
       "depends": ["Formula", "dclone", "dcmle"]
     },
     "shattering": {
@@ -116367,9 +117087,9 @@
     },
     "shiny": {
       "name": "shiny",
-      "version": "1.10.0",
-      "sha256": "0lj46hm42a66fancgcy8pxcbv5xfm9x66kxdlvjq7cc4cqbhlw3f",
-      "depends": ["R6", "bslib", "cachem", "commonmark", "crayon", "fastmap", "fontawesome", "glue", "htmltools", "httpuv", "jsonlite", "later", "lifecycle", "mime", "promises", "rlang", "sourcetools", "withr", "xtable"]
+      "version": "1.11.1",
+      "sha256": "0abivvs991dqnsdw3pkyqqfnppih4j5wyk1d1innnvv43230z33g",
+      "depends": ["R6", "bslib", "cachem", "cli", "commonmark", "fastmap", "fontawesome", "glue", "htmltools", "httpuv", "jsonlite", "later", "lifecycle", "mime", "promises", "rlang", "sourcetools", "withr", "xtable"]
     },
     "shiny_benchmark": {
       "name": "shiny.benchmark",
@@ -116463,8 +117183,8 @@
     },
     "shiny2docker": {
       "name": "shiny2docker",
-      "version": "0.0.2",
-      "sha256": "00r6hm2spp9pba1rbzdki0cfvgm16ivlvhqbh7nlpq3q0x252wcr",
+      "version": "0.0.3",
+      "sha256": "0404z1p8j0csfi3bgbhc2n19zwmksbs3vi6w202aw1vkbs8ab2ya",
       "depends": ["attachment", "cli", "dockerfiler", "here", "yesno"]
     },
     "shinyAce": {
@@ -116643,9 +117363,9 @@
     },
     "shinyMixR": {
       "name": "shinyMixR",
-      "version": "0.5.0",
-      "sha256": "1z73wdv8vc71x3rp0axm3ad8wqj3fz4g9bdvzd3d4m6gblvydvpq",
-      "depends": ["DT", "R3port", "bs4Dash", "cli", "collapsibleTree", "fresh", "ggplot2", "gridExtra", "magrittr", "nlmixr2", "nlmixr2est", "patchwork", "plotly", "ps", "shiny", "shinyAce", "shinyWidgets", "shinyjs", "stringi", "whisker", "xfun"]
+      "version": "0.5.1",
+      "sha256": "04xdlppvls4r872dsaggc0qi1i56xdyrvrgyi6annxsh8jif30b3",
+      "depends": ["DT", "R3port", "bs4Dash", "cli", "collapsibleTree", "fresh", "ggplot2", "gridExtra", "magrittr", "nlmixr2est", "patchwork", "plotly", "ps", "rxode2", "shiny", "shinyAce", "shinyWidgets", "shinyjs", "stringi", "whisker", "xfun"]
     },
     "shinyMobile": {
       "name": "shinyMobile",
@@ -117133,6 +117853,12 @@
       "sha256": "0vd8md4w4v05l9d5v7kx21kw3rkbkx8iqf4da44x95kfnnxiqjcx",
       "depends": ["jsonlite"]
     },
+    "shoppingwords": {
+      "name": "shoppingwords",
+      "version": "0.1.0",
+      "sha256": "0n83xc16ydgmi0g6ggayfj36mhmwrppbbdgkxgz6ajdrjdyw0yfc",
+      "depends": ["stopwords", "stringdist", "stringi", "tibble"]
+    },
     "shoredate": {
       "name": "shoredate",
       "version": "1.1.1",
@@ -117163,11 +117889,17 @@
       "sha256": "1ajqvm6y5djdjh5prci31hyv1ilycn1vf5gniq92gxqhzab7bnxc",
       "depends": ["LambertW", "ggplot2", "minpack_lm", "purrr", "tidyr"]
     },
+    "shortuuid": {
+      "name": "shortuuid",
+      "version": "0.1.0",
+      "sha256": "1kd6pgdn01bsxzabkdfmzr08nwf82d2n6njvb128bgyr5jdc61s8",
+      "depends": ["Rcpp"]
+    },
     "shotGroups": {
       "name": "shotGroups",
-      "version": "0.8.2",
-      "sha256": "0m3n3ja6ny45rdd13s9f7nm1ml3p3y7nisbhfg0fj369wym95r1p",
-      "depends": ["CompQuadForm", "KernSmooth", "boot", "coin", "robustbase"]
+      "version": "0.8.4",
+      "sha256": "01hp6kzkj8fr5qri2qk64kz5jn77a0xhkig58rnl6j9q0smwhzga",
+      "depends": ["CompQuadForm", "KernSmooth", "boot"]
     },
     "showimage": {
       "name": "showimage",
@@ -117291,9 +118023,9 @@
     },
     "siera": {
       "name": "siera",
-      "version": "0.3.0",
-      "sha256": "0dkxbnjq9gq1mhi7q790pr3sbs2m9p197s34yi5nc0cvfzd20zjy",
-      "depends": ["dplyr", "jsonlite", "magrittr", "stringr", "tibble", "tidyr"]
+      "version": "0.5.0",
+      "sha256": "135r0b8lzf8vava1i9acksh2nkacp03hgv7c9as243nxa2ln1n3l",
+      "depends": ["cli", "dplyr", "jsonlite", "magrittr", "readxl", "stringr", "tibble", "tidyr"]
     },
     "sievePH": {
       "name": "sievePH",
@@ -117471,8 +118203,8 @@
     },
     "simDAG": {
       "name": "simDAG",
-      "version": "0.3.1",
-      "sha256": "1qkk116vz5ngkqwnrc43zymw4x6gccsyvaiy8y3ks1c6799vpr7f",
+      "version": "0.3.2",
+      "sha256": "1bfmah009qgh8xcrpbkzcjil8sf0dbc6sp0jc3m45dk4fqn6xba8",
       "depends": ["Rfast", "data_table", "igraph", "rlang"]
     },
     "simDNAmixtures": {
@@ -117505,6 +118237,12 @@
       "sha256": "1a2p4hx80rrrzs4gjscdsy1jbzpahkw0h2nlna4q8p75blgnzwpn",
       "depends": ["Rcpp", "lattice"]
     },
+    "simIC": {
+      "name": "simIC",
+      "version": "0.1.0",
+      "sha256": "15h4xj4j43nalbdvw8d1lyrnd4bah3m6sjv6k36zjn5hixbchvhw",
+      "depends": []
+    },
     "simIDM": {
       "name": "simIDM",
       "version": "0.1.0",
@@ -117627,8 +118365,8 @@
     },
     "simecol": {
       "name": "simecol",
-      "version": "0.9-2",
-      "sha256": "1wvigicykz1i5qmrdrzzq6cc3agi7fy888ajl2aqbvmg4bpa9jji",
+      "version": "0.9-3",
+      "sha256": "1hn0bxilpcc0d1q23vyf9h6qn904b4vqayhwjw9f3dcbfbvahq70",
       "depends": ["deSolve", "minqa"]
     },
     "simer": {
@@ -117643,12 +118381,6 @@
       "sha256": "1849wayygyqv0fh1i2qva7ggh2yah2nn0sgbcy9pldxrjq8q9iw0",
       "depends": []
     },
-    "simexaft": {
-      "name": "simexaft",
-      "version": "1.0.7.1",
-      "sha256": "0n3n2g07pnpcqhbrjf78lbvqvc136g7jxlx6q27vnk96kwizh3f1",
-      "depends": ["mvtnorm", "survival"]
-    },
     "simfam": {
       "name": "simfam",
       "version": "1.1.6",
@@ -117711,8 +118443,8 @@
     },
     "simmer_plot": {
       "name": "simmer.plot",
-      "version": "0.1.18",
-      "sha256": "0wxn6g27i4fk4xkl9l8qbsqg61jr7hz5n974gfld38cigp1f62n9",
+      "version": "0.1.19",
+      "sha256": "1z322zja8744kjc2xyniynavkz1iffm0iwjrsw8lhzdfbhj2lch7",
       "depends": ["DiagrammeR", "dplyr", "ggplot2", "scales", "simmer", "tidyr"]
     },
     "simml": {
@@ -117775,12 +118507,6 @@
       "sha256": "0yxc509qmxrcg4kvpkfy1nz8q3k1kvhhwyf93zg3alqf2nnjs50i",
       "depends": ["mvtnorm"]
     },
-    "simpleMLP": {
-      "name": "simpleMLP",
-      "version": "1.0.0",
-      "sha256": "134h217d3ipzpxgj5fh04pkajqmxdnnlr53ykk27vi86dqk4087p",
-      "depends": ["ggplot2", "readr"]
-    },
     "simpleNeural": {
       "name": "simpleNeural",
       "version": "0.1.3",
@@ -117841,12 +118567,6 @@
       "sha256": "046w12p1349lsns4q8gi5mzjbw623m00fq8p7x6yqfb42fczf4xj",
       "depends": ["digest", "glue", "httr", "jsonlite"]
     },
-    "simplexreg": {
-      "name": "simplexreg",
-      "version": "1.3",
-      "sha256": "1zkh00xbddhgz0qn0a5pj12n0hpx4f5kihpfj71x92pmxpzglcxh",
-      "depends": ["Formula", "plotrix"]
-    },
     "simplextree": {
       "name": "simplextree",
       "version": "1.0.1",
@@ -117909,8 +118629,8 @@
     },
     "simsalapar": {
       "name": "simsalapar",
-      "version": "1.0-12",
-      "sha256": "0aac4mjx4pdfhy52jvr3v2d8hp20qglzfhrvqmrvvn5pcn2qmlh4",
+      "version": "1.0-13",
+      "sha256": "0vqwi2xac8kq919xzpq361sb1rf9br94lxp004d6y9qn233091vk",
       "depends": ["colorspace", "gridBase", "sfsmisc"]
     },
     "simsem": {
@@ -117991,6 +118711,12 @@
       "sha256": "0zzghs44yll5181mw5nqm49k4q01hzm88fqjq8fjfzza1gplrkf7",
       "depends": ["ggplot2", "lubridate", "reshape2", "reticulate", "scales", "terra"]
     },
+    "simulateDCE": {
+      "name": "simulateDCE",
+      "version": "0.3.1",
+      "sha256": "1558l8iydh86451hy076cgwgs2gpfg855hq05b81pqqfqammnkdq",
+      "depends": ["data_table", "dplyr", "evd", "formula_tools", "furrr", "future", "ggplot2", "glue", "kableExtra", "magrittr", "mixl", "psych", "purrr", "qs", "readr", "rmarkdown", "stringr", "tibble", "tictoc", "tidyr"]
+    },
     "simulator": {
       "name": "simulator",
       "version": "0.2.5",
@@ -118113,8 +118839,8 @@
     },
     "sisireg": {
       "name": "sisireg",
-      "version": "1.1.2",
-      "sha256": "0xwi1c60xlcl1ykgacxdk35wanmc4rbp1wl97s91xhvcfmfpvj4k",
+      "version": "1.2.1",
+      "sha256": "0friwsmps57mlcbb007xjcz3hqliybdjifssaclslwjrlxvf0z1h",
       "depends": ["reticulate", "zoo"]
     },
     "sistec": {
@@ -118137,9 +118863,9 @@
     },
     "sitar": {
       "name": "sitar",
-      "version": "1.4.0",
-      "sha256": "14qc5qy21qyj4gml0gwfn8izbsmzwy30ddc7mazhszi487jrcrp0",
-      "depends": ["dplyr", "forcats", "ggplot2", "glue", "magrittr", "nlme", "purrr", "rlang", "rsample", "tibble", "tidyr"]
+      "version": "1.5.0",
+      "sha256": "1icp1g201nq2rnffyamrbx17pzlxqs8iyndwsjjgwf0sdswnc91i",
+      "depends": ["dplyr", "forcats", "ggplot2", "glue", "magrittr", "nlme", "purrr", "rlang", "rsample", "splines2", "tibble", "tidyr"]
     },
     "sitepickR": {
       "name": "sitepickR",
@@ -118179,9 +118905,9 @@
     },
     "sits": {
       "name": "sits",
-      "version": "1.5.2",
-      "sha256": "0298z2gisds07hsflchy7qi0686f833w2n25j5asxvvh1g0s7c9w",
-      "depends": ["Rcpp", "RcppArmadillo", "dplyr", "leaflet", "lubridate", "luz", "purrr", "randomForest", "rstac", "sf", "slider", "terra", "tibble", "tidyr", "tmap", "torch", "units", "yaml"]
+      "version": "1.5.3",
+      "sha256": "03hgkk9jry2mw597w4qqn9137crfsn36xndj4vyxmcrxxv37l421",
+      "depends": ["Rcpp", "RcppArmadillo", "dplyr", "leafgl", "leaflet", "lubridate", "luz", "purrr", "randomForest", "rstac", "sf", "slider", "terra", "tibble", "tidyr", "tmap", "torch", "units", "yaml"]
     },
     "sivirep": {
       "name": "sivirep",
@@ -118209,9 +118935,9 @@
     },
     "sjPlot": {
       "name": "sjPlot",
-      "version": "2.8.17",
-      "sha256": "0rai02bnqj5q829f35vw1z779cyw4rx84w6ngv7mpiagw3nb6agj",
-      "depends": ["MASS", "bayestestR", "datawizard", "dplyr", "ggeffects", "ggplot2", "insight", "knitr", "parameters", "performance", "purrr", "rlang", "scales", "sjlabelled", "sjmisc", "sjstats", "tidyr"]
+      "version": "2.9.0",
+      "sha256": "0a7i9klzhjlc5bgwsrm7vqnrrzkkw92pn0s7dhaphwh4zhfc39jd",
+      "depends": ["bayestestR", "datawizard", "dplyr", "ggeffects", "ggplot2", "insight", "knitr", "parameters", "performance", "purrr", "rlang", "scales", "sjlabelled", "sjmisc", "sjstats", "tidyr"]
     },
     "sjSDM": {
       "name": "sjSDM",
@@ -118233,8 +118959,8 @@
     },
     "sjmisc": {
       "name": "sjmisc",
-      "version": "2.8.10",
-      "sha256": "12y5aa820h95dbak9zd2rbg1hc0636b2dpg0mn9mkb76a4ssnr1d",
+      "version": "2.8.11",
+      "sha256": "0b0mfaqwn8bih7zfmd0h60sfmwnvy0m5niimh4mdcm8mzfiddlcf",
       "depends": ["datawizard", "dplyr", "insight", "magrittr", "purrr", "rlang", "sjlabelled", "tidyselect"]
     },
     "sjstats": {
@@ -118335,9 +119061,9 @@
     },
     "skimr": {
       "name": "skimr",
-      "version": "2.1.5",
-      "sha256": "11w32vfwm6pz4cvmm60na6pjbyjvw2xq489ij5xqzx0n3pma7wq6",
-      "depends": ["cli", "dplyr", "knitr", "magrittr", "pillar", "purrr", "repr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
+      "version": "2.2.1",
+      "sha256": "030vfh2lpfvhaa32mx9bb0bhkji6f3b00mjh6vp21v6fvnc18im3",
+      "depends": ["cli", "dplyr", "knitr", "pillar", "purrr", "repr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
     },
     "skipTrack": {
       "name": "skipTrack",
@@ -118347,8 +119073,8 @@
     },
     "sklarsomega": {
       "name": "sklarsomega",
-      "version": "3.0-2",
-      "sha256": "027rx1x5hsn0qx7s6s2sqf13p49jbhi6g7w0fzfqf619p3fzkghg",
+      "version": "3.0-3",
+      "sha256": "0dgarg73lcv4jzr4hkzgm3ch1w3lzgnqsyrqjxkxyz4l4l5b5185",
       "depends": ["LaplacesDemon", "Matrix", "dfoptim", "extraDistr", "hash", "mcmcse", "numDeriv", "spam"]
     },
     "skm": {
@@ -118455,14 +119181,14 @@
     },
     "sleev": {
       "name": "sleev",
-      "version": "1.1.3",
-      "sha256": "0igs67lwnfipa24n40yl7d7l6ywn2arjv4cygl8r0yjfmlxmbky1",
+      "version": "1.1.4",
+      "sha256": "0kxh8lgkv3wyk1wyxf9b8y5lxzxwmic8pjd1f76h3hkgvbmxdwyv",
       "depends": ["Rcpp", "RcppArmadillo", "RcppEigen"]
     },
     "slendr": {
       "name": "slendr",
-      "version": "1.1.0",
-      "sha256": "1gz2ln9dx8r47f0parxpjcy68xbx8zq4076p7cg5bh96naxbgaaz",
+      "version": "1.2.0",
+      "sha256": "0z5336zv8mp3q8a78x77rwg7wwkk9i435qc663njz0lidiy2q45y",
       "depends": ["ape", "digest", "dplyr", "ggplot2", "ggrepel", "ijtiff", "magrittr", "png", "purrr", "readr", "reticulate", "scales", "shiny", "shinyWidgets", "tidyr"]
     },
     "slfm": {
@@ -118477,12 +119203,6 @@
       "sha256": "07gkl35hq3w42kw103gn9f15s0z4n49nq39ip1nzm3s6d1ad6in6",
       "depends": ["Rdpack", "numDeriv"]
     },
-    "slickR": {
-      "name": "slickR",
-      "version": "0.6.0",
-      "sha256": "01p72l3h8izg9pphjhkm83rgfsvlimf8aa5asa5lfgfbma60ivhb",
-      "depends": ["base64enc", "checkmate", "htmltools", "htmlwidgets", "lifecycle", "xml2"]
-    },
     "slider": {
       "name": "slider",
       "version": "0.3.2",
@@ -118525,6 +119245,12 @@
       "sha256": "00fk5fr5zsk2qxc1kfhmshhjxgnamm3401089sx8m2l529zd6r8j",
       "depends": ["codetools", "crayon", "purrr", "rlang", "tibble"]
     },
+    "slopes": {
+      "name": "slopes",
+      "version": "1.0.1",
+      "sha256": "1nhn30gk0rxd9gp8x7chv3hyf6g0hrwyczlz174phz19rf75pvf8",
+      "depends": ["colorspace", "geodist", "pbapply", "raster", "sf"]
+    },
     "slouch": {
       "name": "slouch",
       "version": "2.1.5",
@@ -118581,8 +119307,8 @@
     },
     "smacofx": {
       "name": "smacofx",
-      "version": "1.20-1",
-      "sha256": "0lr6hpg2h7rb3x9qvggip4f034wijzibhxkam6wipss28mc7845q",
+      "version": "1.21-1",
+      "sha256": "13bcwaqqymlc03y9dr5ijprjmq26gwfk3qjp5ya3q9z7yzlywhzr",
       "depends": ["MASS", "ProjectionBasedClustering", "minqa", "plotrix", "smacof", "vegan", "weights"]
     },
     "smacpod": {
@@ -118665,8 +119391,8 @@
     },
     "smcfcs": {
       "name": "smcfcs",
-      "version": "2.0.0",
-      "sha256": "1220fm2227pzrwxay2nlgdgan5pfx3ch54ws25yvz618xqkw2hbi",
+      "version": "2.0.1",
+      "sha256": "0hd1az3av1z9sgdn9fx0a1lkkm8w7pp5bnd7p10m1rj66f9pm2kq",
       "depends": ["MASS", "VGAM", "abind", "brglm2", "checkmate", "rlang", "survival"]
     },
     "smcure": {
@@ -118791,8 +119517,8 @@
     },
     "smooth": {
       "name": "smooth",
-      "version": "4.2.0",
-      "sha256": "1wf7203fryj8gi4kivfhax092i9mh2ikk3wzcb4wvv8r2yg0kngv",
+      "version": "4.3.0",
+      "sha256": "068s9yh0w2zgzwcapivivwsybbn7cc04kzir3z7bpanv99ggkhdj",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "generics", "greybox", "nloptr", "pracma", "statmod", "xtable", "zoo"]
     },
     "smoothHR": {
@@ -118801,6 +119527,12 @@
       "sha256": "0ljgk297sm201hzzjajddv39x78d90wn49sbzjrvia2d2hwz5s3j",
       "depends": ["survival"]
     },
+    "smoothROCtime": {
+      "name": "smoothROCtime",
+      "version": "0.1.1",
+      "sha256": "1d0lfjkvlvpnqis6vcv4mdsmhhhpwhswjf8mgd8rsjlxxmfzhksy",
+      "depends": ["ks"]
+    },
     "smoothSurv": {
       "name": "smoothSurv",
       "version": "2.6",
@@ -118813,6 +119545,12 @@
       "sha256": "0007i40a12jgavgd95fbpiil1s331qd05ww6v19l49lbnlk3ldxg",
       "depends": ["Matrix", "Rdpack"]
     },
+    "smoothemplik": {
+      "name": "smoothemplik",
+      "version": "0.0.14",
+      "sha256": "16bwkb2a424lwpb4hv0frk2ph2nq1vlb88hc885wkirxxmdzb2xa",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "Rdpack", "data_table", "testthat"]
+    },
     "smoother": {
       "name": "smoother",
       "version": "1.3",
@@ -118839,8 +119577,8 @@
     },
     "smoothr": {
       "name": "smoothr",
-      "version": "1.0.1",
-      "sha256": "1sf57ywx4836dcz8s6h20d0r68y41c11gjbg78bpai4k1401a2sq",
+      "version": "1.1.0",
+      "sha256": "1wyk4k42bbfcm88cmalg1vk0nwb1ziprxg9nv3f3613sldh8fkha",
       "depends": ["sf", "terra", "units"]
     },
     "smoothtail": {
@@ -118897,6 +119635,12 @@
       "sha256": "0vr5jy8bxbczaqr9kg0fnanxhv9nj51yzgacrb63k33cs85p981m",
       "depends": ["doParallel", "foreach", "iterators"]
     },
+    "smsets": {
+      "name": "smsets",
+      "version": "1.2.3",
+      "sha256": "0ff9n5iv8pn92449afj9yj6dpkbg690ipdjcla257xmija9pcpgh",
+      "depends": ["Hotelling", "biotools", "data_table", "stringr"]
+    },
     "smss": {
       "name": "smss",
       "version": "1.0-2",
@@ -118915,6 +119659,12 @@
       "sha256": "06pvnrhd3q913nxhk1icj11xkd1is3qi31b0kv6zbc0qkixn1ym7",
       "depends": ["DescTools", "MASS", "fmsb", "shiny", "shinydashboard", "sortable"]
     },
+    "smvr": {
+      "name": "smvr",
+      "version": "0.2.0",
+      "sha256": "1k5g29lv6w8rci4lnrc8175dqr6l45f5gn0wggr85h6pggcgis2k",
+      "depends": ["cli", "rlang", "vctrs"]
+    },
     "sn": {
       "name": "sn",
       "version": "2.1.1",
@@ -118981,6 +119731,12 @@
       "sha256": "1ccm0414ydrk405hg0bjvd9v70yz1xl0mbj6l945qbjskaxy2w32",
       "depends": ["dplyr", "ggplot2", "kableExtra", "knitr"]
     },
+    "snc": {
+      "name": "snc",
+      "version": "0.1.0",
+      "sha256": "0x9h08241vn25lam4lglrcr6cg1yqk4ma1nflqv3d8lj2vb7v6cn",
+      "depends": []
+    },
     "snem": {
       "name": "snem",
       "version": "0.1.1",
@@ -119035,6 +119791,12 @@
       "sha256": "0hxip3rzv7slxvif1000avbcid2mjxj1y9mimyvk87h404mr6h96",
       "depends": ["snow"]
     },
+    "snowflakeauth": {
+      "name": "snowflakeauth",
+      "version": "0.1.2",
+      "sha256": "15knmv45kkmdfpc414vcj8mbnwggfv28qqigwnvg0vi5lvwfpnn5",
+      "depends": ["RcppTOML", "cli", "curl", "jsonlite", "rlang"]
+    },
     "snowflakes": {
       "name": "snowflakes",
       "version": "1.0.0",
@@ -119053,12 +119815,6 @@
       "sha256": "1b24x8aqfk909nzy3xzpvrcrfisnvh0p5v895yrsx8knm1cjh0x3",
       "depends": ["adegenet", "doParallel", "dplyr", "forcats", "foreach", "ggplot2", "magrittr", "readr", "tidyr", "withr", "yaml"]
     },
-    "snpReady": {
-      "name": "snpReady",
-      "version": "0.9.6",
-      "sha256": "1r96j8zh84dn7qh3zgl0p0v3a80hx2wd3c4jgjlr43hzl7yglpqr",
-      "depends": ["Matrix", "impute", "matrixcalc", "rgl", "stringr"]
-    },
     "snplinkage": {
       "name": "snplinkage",
       "version": "1.2.0",
@@ -119137,6 +119893,12 @@
       "sha256": "1fyimv1i83ck7hwb7nnbdk46fiasi4kb8h944dni73536mnhc57g",
       "depends": ["dplyr", "magrittr", "mice", "psych", "purrr", "rlang", "stringr", "tidycensus", "tidyr"]
     },
+    "socratadata": {
+      "name": "socratadata",
+      "version": "0.1.0",
+      "sha256": "0xx33hpxad077kjhqfv2360g3vir3flniw6kyr1g4f1jwyq6fw40",
+      "depends": ["cli", "httr2", "rlang", "sf", "tibble"]
+    },
     "socviz": {
       "name": "socviz",
       "version": "1.2",
@@ -119181,8 +119943,8 @@
     },
     "soilDB": {
       "name": "soilDB",
-      "version": "2.8.9",
-      "sha256": "19vsikdm05l7w3q6k0mzgfirwbch0px2jwkqkpaami34phkw28yb",
+      "version": "2.8.11",
+      "sha256": "1rdpxafvaj6rw5558mbpyzz7f9d1rqblljxd56p5lxc8mjfk1zah",
       "depends": ["DBI", "aqp", "curl", "data_table"]
     },
     "soilassessment": {
@@ -119205,8 +119967,8 @@
     },
     "soilhypfit": {
       "name": "soilhypfit",
-      "version": "0.1-7",
-      "sha256": "1ssz9w9ibw8mban0fq50j4lgr8vmkrsn8v9cpkg0wl28z1hqbhz3",
+      "version": "0.1-8",
+      "sha256": "1y0idnwrdslj8qj4l3rl7rpckg2w3r8qf63i71qxmginzifqhgg0",
       "depends": ["Rmpfr", "SoilHyP", "mgcv", "nloptr", "quadprog", "snowfall"]
     },
     "soilphysics": {
@@ -119325,8 +120087,8 @@
     },
     "sommer": {
       "name": "sommer",
-      "version": "4.4.2",
-      "sha256": "0j9ip8m5pfyyjngibrbp4gr938njg154cfxhhvrilwgr545959av",
+      "version": "4.4.3",
+      "sha256": "1p3aqr9jd696s2s5v1qcpx0hahrp05p5w33bcn2bw2dbcfj7fa24",
       "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "crayon"]
     },
     "somspace": {
@@ -119439,8 +120201,8 @@
     },
     "soundgen": {
       "name": "soundgen",
-      "version": "2.7.2",
-      "sha256": "1707qcr5dasrszrfac93svysvwjpabcyqshw01hszp46bcnikqrq",
+      "version": "2.7.3",
+      "sha256": "1p0hl3d5jgnricch7rz631c6kphxsvp1ng24k9y7g97pwy6hdcvb",
       "depends": ["data_table", "doParallel", "dtw", "foreach", "mvtnorm", "nonlinearTseries", "phonTools", "seewave", "shiny", "shinyBS", "shinyjs", "signal", "tuneR", "zoo"]
     },
     "sourcetools": {
@@ -119517,8 +120279,8 @@
     },
     "spBayesSurv": {
       "name": "spBayesSurv",
-      "version": "1.1.8",
-      "sha256": "0z91k88m5bh8ipicb43kknxshjr6dwr6whfkm28j49xwjrm4ydsy",
+      "version": "1.1.9",
+      "sha256": "1q95vq26zzfkg6adqy65p6yc73inn5w2wwb2vv8vrxxz1n6j9d1r",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "coda", "fields", "survival"]
     },
     "spCP": {
@@ -119541,8 +120303,8 @@
     },
     "spEDM": {
       "name": "spEDM",
-      "version": "1.6",
-      "sha256": "1w1ypaz2dx5gsppz742yfygjcshyxl0jhc5hs17afxmrv4pdag2d",
+      "version": "1.7",
+      "sha256": "0cil76rgzq5pqgmkjz4c5ndfwmgs3ya8hzpdf4nf6mriarblwsmm",
       "depends": ["Rcpp", "RcppArmadillo", "RcppThread", "dplyr", "ggplot2", "sdsfun", "sf", "terra"]
     },
     "spFSR": {
@@ -119607,8 +120369,8 @@
     },
     "spStack": {
       "name": "spStack",
-      "version": "1.0.1",
-      "sha256": "11ikxhm7iqb3pk6q2nw2mym23znvlxqfzs9b1569hh33znki2p7m",
+      "version": "1.1.1",
+      "sha256": "0qn6nqg9fva9zdn2b3kby0yc57c4wl9gf25c1jkd3ywy7qwgg9wc",
       "depends": ["CVXR", "MBA", "future", "future_apply", "ggplot2", "rstudioapi"]
     },
     "spTDyn": {
@@ -119631,9 +120393,9 @@
     },
     "spaMM": {
       "name": "spaMM",
-      "version": "4.5.0",
-      "sha256": "1nr44jg73gnbc3q1ip7zmzl1n5bggbcgjrdlh6fg81zp41ba3ydv",
-      "depends": ["MASS", "Matrix", "ROI", "Rcpp", "RcppEigen", "backports", "boot", "crayon", "geometry", "gmp", "minqa", "nlme", "nloptr", "numDeriv", "pbapply", "proxy"]
+      "version": "4.6.1",
+      "sha256": "1ng4l3izsj4qzl61zyhmqqkp008d6r9xvl4i8w65cgn1riyh3x5b",
+      "depends": ["MASS", "Matrix", "ROI", "Rcpp", "RcppEigen", "backports", "boot", "cli", "geometry", "gmp", "minqa", "nlme", "nloptr", "numDeriv", "pbapply", "proxy", "reformulas"]
     },
     "spaa": {
       "name": "spaa",
@@ -119715,9 +120477,9 @@
     },
     "spanishoddata": {
       "name": "spanishoddata",
-      "version": "0.1.1",
-      "sha256": "1hglg1kvvqbxkxhsihfv4c3z0gnfwry1s3kgiyy0dwgwba6sxvnv",
-      "depends": ["DBI", "checkmate", "curl", "dplyr", "duckdb", "fs", "glue", "here", "httr2", "lifecycle", "lubridate", "memuse", "parallelly", "purrr", "readr", "rlang", "sf", "stringr", "tibble", "xml2"]
+      "version": "0.2.1",
+      "sha256": "04x508vny94fx7xwisgmhr17h1k8cwaa0r2cv5pc41ynd6iq6yjz",
+      "depends": ["DBI", "checkmate", "digest", "dplyr", "duckdb", "fs", "glue", "here", "httr2", "jsonlite", "lifecycle", "lubridate", "memoise", "openssl", "parallelly", "paws_storage", "purrr", "readr", "rlang", "sf", "stringr", "tibble", "xml2"]
     },
     "spant": {
       "name": "spant",
@@ -119733,9 +120495,9 @@
     },
     "spareg": {
       "name": "spareg",
-      "version": "1.0.0",
-      "sha256": "0yrfa4b4d2l2a6jk3a9nvqcrjixpbpl8ly0pawafqi1s0sigzxp6",
-      "depends": ["Matrix", "ROCR", "Rdpack", "dplyr", "ggplot2", "glmnet", "rlang"]
+      "version": "1.1.0",
+      "sha256": "0x9jw9dzdjjg5lvwndk086y4apkv59j5kqq7mphpsbcqwyd3sq44",
+      "depends": ["Matrix", "ROCR", "Rdpack", "ggplot2", "glmnet", "rlang"]
     },
     "spark_sas7bdat": {
       "name": "spark.sas7bdat",
@@ -119769,8 +120531,8 @@
     },
     "sparklyr": {
       "name": "sparklyr",
-      "version": "1.9.0",
-      "sha256": "1bmis1nf5255pmpw5ppnl9b1vxspi20y2w17km2172n33jyqgrnl",
+      "version": "1.9.1",
+      "sha256": "1wajnipp67nmwjb1ivqczax1lhd2caxh78kq6nas7lx9lnqczamw",
       "depends": ["DBI", "config", "dbplyr", "dplyr", "generics", "globals", "glue", "httr", "jsonlite", "openssl", "purrr", "rlang", "rstudioapi", "tidyr", "tidyselect", "uuid", "vctrs", "withr", "xml2"]
     },
     "sparklyr_flint": {
@@ -119821,12 +120583,6 @@
       "sha256": "0lzsm04m80l9h20xc1ifzw30fzbmg3xqspf1arzw5hk5081iid0q",
       "depends": ["doFuture", "doRNG", "fields", "foreach", "future", "iterators", "lifecycle", "sparr", "spatstat_geom", "spatstat_random", "terra"]
     },
-    "sparseBC": {
-      "name": "sparseBC",
-      "version": "1.2",
-      "sha256": "0a1siyi9kc805qji4alnw3c21spf4iw4wpsbfl50zvs52p8vl8w2",
-      "depends": ["fields", "glasso"]
-    },
     "sparseCov": {
       "name": "sparseCov",
       "version": "0.0.1",
@@ -120079,12 +120835,6 @@
       "sha256": "0i5fcy2q53612kq1qjg2sp10lwsiva6nay0v2jl2mw28zx6p22s9",
       "depends": ["RColorBrewer", "crayon", "dixon", "dplyr", "furrr", "future", "ggplot2", "magrittr", "pbmcapply", "purrr", "scales", "spatstat_explore", "spatstat_geom", "spatstat_univar", "stringr", "tibble", "tidyr", "tidyselect"]
     },
-    "spatialfusion": {
-      "name": "spatialfusion",
-      "version": "0.7",
-      "sha256": "0snrv92xrzfc2xrv937mwyng7xp6rgfhn61nhddbrkwfw5dw7vl5",
-      "depends": ["deldir", "fields", "rstan", "sf", "sp", "spam"]
-    },
     "spatialising": {
       "name": "spatialising",
       "version": "0.6.0",
@@ -120135,8 +120885,8 @@
     },
     "spatstat": {
       "name": "spatstat",
-      "version": "3.3-3",
-      "sha256": "1sg09hdzr9a327d3nwsvbz35s3mcdxy6gxbchmwwzqs6yagb1gh6",
+      "version": "3.4-0",
+      "sha256": "1izq1v6hzyq483x5jagai5zkhfc1yzkxj427la2nlklzlz9cwaqv",
       "depends": ["spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_linnet", "spatstat_model", "spatstat_random", "spatstat_univar", "spatstat_utils"]
     },
     "spatstat_Knet": {
@@ -120153,14 +120903,14 @@
     },
     "spatstat_explore": {
       "name": "spatstat.explore",
-      "version": "3.4-3",
-      "sha256": "0jjfqvyiwxrn2zg1k4pzkbs8l2syf7c4klzyypy4nr9gbzwgwr3m",
+      "version": "3.5-2",
+      "sha256": "0ff53rw8p3ix62mcw9iw5s3ddnl51155jwdph4sx01d483qn0zfd",
       "depends": ["Matrix", "abind", "goftest", "nlme", "spatstat_data", "spatstat_geom", "spatstat_random", "spatstat_sparse", "spatstat_univar", "spatstat_utils"]
     },
     "spatstat_geom": {
       "name": "spatstat.geom",
-      "version": "3.4-1",
-      "sha256": "18nr7zlad0gpnpzjfgd7wyvdbz1cxnwb4krml4vfjnr3qnn0zcq7",
+      "version": "3.5-0",
+      "sha256": "0fslk8q11c4667664qg9xfrwajx11kh0c370pmiz59qarh0zgsc1",
       "depends": ["deldir", "polyclip", "spatstat_data", "spatstat_univar", "spatstat_utils"]
     },
     "spatstat_gui": {
@@ -120171,8 +120921,8 @@
     },
     "spatstat_linnet": {
       "name": "spatstat.linnet",
-      "version": "3.2-6",
-      "sha256": "1fihp6qrkiivhc9i2d7371dfgsdb08xy9y0g5lfm6pxifyqfqvw2",
+      "version": "3.3-1",
+      "sha256": "1awj80srq2zr3xga8bcphaxq1pqjphsypz7ppcvx35dq5mm8djny",
       "depends": ["Matrix", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_model", "spatstat_random", "spatstat_sparse", "spatstat_univar", "spatstat_utils"]
     },
     "spatstat_local": {
@@ -120183,8 +120933,8 @@
     },
     "spatstat_model": {
       "name": "spatstat.model",
-      "version": "3.3-6",
-      "sha256": "1581ai5dyklcc9jy3kyv0ylk91isa0wdrkzggz9yrk112fy8859n",
+      "version": "3.4-0",
+      "sha256": "0lgi9ph5zyy5jy970y84yxvggdrvfw6w885xnd9f5fm1jn17avxf",
       "depends": ["Matrix", "abind", "goftest", "mgcv", "nlme", "rpart", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_random", "spatstat_sparse", "spatstat_univar", "spatstat_utils", "tensor"]
     },
     "spatstat_random": {
@@ -120201,14 +120951,14 @@
     },
     "spatstat_univar": {
       "name": "spatstat.univar",
-      "version": "3.1-3",
-      "sha256": "0lc1a5x1gbf9sc810y7f6q5zr9gx2l4sy8xf8krwp5ylms3zvv3g",
+      "version": "3.1-4",
+      "sha256": "0y940b3s8d008bpkh9alwk6m9m9bssxw4cnyyqaqirbvarspfjl8",
       "depends": ["spatstat_utils"]
     },
     "spatstat_utils": {
       "name": "spatstat.utils",
-      "version": "3.1-4",
-      "sha256": "0vmk0r8424fnpydrqm9xyc1jbbv14qjykw9i8xf0pa354v5m4ka1",
+      "version": "3.1-5",
+      "sha256": "0s3zr8sll9n0dl3kd586mql0i4h84svdr5z2z4jv51aaarpj4lmz",
       "depends": []
     },
     "spatsurv": {
@@ -120255,8 +121005,8 @@
     },
     "spcosa": {
       "name": "spcosa",
-      "version": "0.4-3",
-      "sha256": "0nn7z7xyblsaq7hmvnlf8fxi7rc0vyii7m3qgzkdhj6d0j9xxngp",
+      "version": "0.4-4",
+      "sha256": "0mj8gjrqapsc1xgvqydn5iw4fkzlvig5rkcb8vi9ijl78w9ydc2j",
       "depends": ["ggplot2", "rJava", "sp"]
     },
     "spcov": {
@@ -120303,8 +121053,8 @@
     },
     "spduration": {
       "name": "spduration",
-      "version": "0.17.2",
-      "sha256": "1cgrpfljb43qay38qjhb2xccawh8llrp545bm5bv29k7h1nsa9cb",
+      "version": "0.17.3",
+      "sha256": "00c0dfpfr7nb7w6baflylm5ijgr7hsacxpzblpiaa6jdm593jdrv",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "corpcor", "forecast", "separationplot", "xtable"]
     },
     "spdynmod": {
@@ -120391,6 +121141,12 @@
       "sha256": "1jbadg9n42qrbw1v6hqrdp5pzy2nn1kvqi4xscxdxvc6c33i7zr4",
       "depends": ["data_table", "foreach", "lomb"]
     },
+    "spectrakit": {
+      "name": "spectrakit",
+      "version": "0.1.1",
+      "sha256": "1bc5lfyypnwcpx929a7jsbbqaypf8bbm6xjyb0zxn1r3aqq2m59q",
+      "depends": ["data_table", "dplyr", "ggplot2", "glue", "magick", "purrr", "readr", "rlang", "tibble"]
+    },
     "spectral": {
       "name": "spectral",
       "version": "2.0",
@@ -120591,8 +121347,8 @@
     },
     "sphunif": {
       "name": "sphunif",
-      "version": "1.4.0",
-      "sha256": "125w91cz60j3lkx8dm74c8gh67k5j2k8mypx7rihym9rsdibdric",
+      "version": "1.4.1",
+      "sha256": "11xsxw84209yiw2gjvbdr4iknhnxxbhsx7pygpg68lryc1ryc9nd",
       "depends": ["Rcpp", "RcppArmadillo", "doFuture", "doRNG", "foreach", "future", "gsl", "rotasym"]
     },
     "spicy": {
@@ -120649,6 +121405,12 @@
       "sha256": "1yasqy086h4dv348krisc024mic0dvdsncqys95l85924djlfipp",
       "depends": ["MASS", "RColorBrewer", "gee", "geepack", "ggplot2", "lattice", "rje", "rlang", "splancs", "stringr", "waveslim"]
     },
+    "spinebil": {
+      "name": "spinebil",
+      "version": "0.1.6",
+      "sha256": "1kkzz4klsd1k8sn7jg9igl2kcahrmzv2ziwa2rwisw97a7gdnd0b",
+      "depends": ["cassowaryr", "dplyr", "ggplot2", "tibble", "tictoc", "tidyr", "tourr"]
+    },
     "spinifex": {
       "name": "spinifex",
       "version": "0.3.8",
@@ -120705,8 +121467,8 @@
     },
     "splineCox": {
       "name": "splineCox",
-      "version": "0.0.4",
-      "sha256": "00jd0gf7ls4pais4bgy48pmgqz5kn2g3aqhksyyyfdc2rk2fvxmh",
+      "version": "0.0.5",
+      "sha256": "1qqzryisx1zw985j9pdy11wjam7f4iliazrq410qqb7d38rc40vr",
       "depends": ["ggplot2", "joint_Cox"]
     },
     "splines2": {
@@ -120777,8 +121539,8 @@
     },
     "spls": {
       "name": "spls",
-      "version": "2.2-3",
-      "sha256": "0bmb0ai5z80njhypd342i711x0bdkwcvlyn374lyyzj8h3d97mmv",
+      "version": "2.3-2",
+      "sha256": "110i0msxd8bgf2kkx596bfmvc96w20iwg8i9rjrjgk50bxalbh0n",
       "depends": ["MASS", "nnet", "pls"]
     },
     "splus2R": {
@@ -120819,8 +121581,8 @@
     },
     "spmodel": {
       "name": "spmodel",
-      "version": "0.10.0",
-      "sha256": "1r280m9lgln10nwbk3c2ylwkphg97g1caii4wf89gbhv51izv90j",
+      "version": "0.11.0",
+      "sha256": "09g6chi8f84fg3dfwa05prisfrc55gc7d66wx7c58w6b8xdwd0s0",
       "depends": ["Matrix", "generics", "sf", "tibble"]
     },
     "spmoran": {
@@ -120885,8 +121647,8 @@
     },
     "sportyR": {
       "name": "sportyR",
-      "version": "2.2.2",
-      "sha256": "1br7wbxr488pknqq3ik6w86rrkx5cn61jrm2b8az27zh8k362dv6",
+      "version": "2.2.3",
+      "sha256": "03sfkgiy8ja8q8jvacxi5m43hfj2j9kaf04396572j69xjiqjnph",
       "depends": ["ggfittext", "ggplot2", "glue", "rlang"]
     },
     "spotidy": {
@@ -120915,8 +121677,8 @@
     },
     "spphpr": {
       "name": "spphpr",
-      "version": "1.1.4",
-      "sha256": "0z583awsx0ickcx3mag7bm9i9a967xh3d131cd7hpww10nj8y4sx",
+      "version": "1.1.5",
+      "sha256": "0vzdn07gi9dp8pdzh1sllfkj2lsddw2wswami3ifj9lk9x631sqq",
       "depends": []
     },
     "spqdep": {
@@ -120975,14 +121737,14 @@
     },
     "sps": {
       "name": "sps",
-      "version": "0.6.0",
-      "sha256": "15pq2ab458a342drlsnnq73ka5ag58y7yx68xhv8n4d9in1h0i1m",
+      "version": "0.6.1",
+      "sha256": "16rs7r2nlivb5czhakxih3a04asgqjj236hzz1m023vb1szbd3j9",
       "depends": []
     },
     "spsComps": {
       "name": "spsComps",
-      "version": "0.3.3.0",
-      "sha256": "1yhd2iw9z614mcb2lnq43x5ixfpc5lbdm5avgawp726c3fvflky8",
+      "version": "0.3.4.0",
+      "sha256": "1l69yigdabwwsixk364jvmc1c5nc8d4djc77cf0jlzshhdsjbqx8",
       "depends": ["R6", "assertthat", "crayon", "glue", "htmltools", "magrittr", "shiny", "shinyAce", "shinytoastr", "stringr"]
     },
     "spsUtil": {
@@ -121185,9 +121947,9 @@
     },
     "srppp": {
       "name": "srppp",
-      "version": "1.0.1",
-      "sha256": "12fxyy7g52d4hhx3g4x3cps8rbnx5s9xw8h5cv3dqr5i1pgcnrxb",
-      "depends": ["cli", "dm", "dplyr", "stringr", "tibble", "tidyr", "xml2"]
+      "version": "1.1.0",
+      "sha256": "02l2ay9fjrxz18jq1knjifawlkhcv1i5ndfv3rkzph8lafkbj8l6",
+      "depends": ["cli", "data_tree", "dm", "dplyr", "rlang", "stringr", "tibble", "tidyr", "xml2"]
     },
     "srt": {
       "name": "srt",
@@ -121281,8 +122043,8 @@
     },
     "ssfa": {
       "name": "ssfa",
-      "version": "1.2.2",
-      "sha256": "1ypfx6k2zbc5n779ikj6pa8kwc6bg3zn4m044v46qn20348ygg0a",
+      "version": "1.2.3",
+      "sha256": "1ini85vajxz36i552qr93nfr91c8an2g9dal9v1i8ka35s535h52",
       "depends": ["Matrix", "maxLik", "sp", "spatialreg", "spdep"]
     },
     "ssfit": {
@@ -121317,9 +122079,9 @@
     },
     "ssifs": {
       "name": "ssifs",
-      "version": "1.0.4",
-      "sha256": "11krpqzjnbaxqpjzg0hvigr6254vgr6w09bha64cn6fry3z6n860",
-      "depends": ["R2jags", "Rdpack", "RevEcoR", "ggplot2", "gtools", "igraph", "meta", "netmeta", "plyr"]
+      "version": "1.0.5",
+      "sha256": "0vp82lzxd7n1x2nic0mn02qpn71f2kgdfq7kn6cw7fj1pm0p6srj",
+      "depends": ["R2jags", "Rdpack", "ggplot2", "gtools", "igraph", "meta", "netmeta", "plyr"]
     },
     "ssimparser": {
       "name": "ssimparser",
@@ -121407,8 +122169,8 @@
     },
     "sstvars": {
       "name": "sstvars",
-      "version": "1.2.0",
-      "sha256": "1sy32kw0zznsfm8nvs4zr5rjqykjvn4r3w4d7vs5lppjfb9c13dk",
+      "version": "1.2.1",
+      "sha256": "0w6fawwwxqns40z3pwcw9zn16y56s1w51828h8rxdjjvgrc1p0id",
       "depends": ["Rcpp", "RcppArmadillo", "pbapply"]
     },
     "ssutil": {
@@ -121435,6 +122197,12 @@
       "sha256": "0j29k9fg8659yw1jwmcakiic51rin1dj1fmvpapy2wmz4c3pr0fp",
       "depends": ["corpcor", "fdrtool", "sda"]
     },
+    "stCEG": {
+      "name": "stCEG",
+      "version": "0.1.0",
+      "sha256": "0ki3rvsh3bg4i4mz4flhrcmb1yzmxqzb73nq6gqckkbvlg4bp3g4",
+      "depends": ["DT", "RColorBrewer", "colorspace", "crayon", "dplyr", "gtools", "htmltools", "htmlwidgets", "hwep", "igraph", "leaflet", "purrr", "scales", "sf", "shiny", "shinyWidgets", "shinycssloaders", "shinyjqui", "shinyjs", "sortable", "spData", "stringr", "tidyr", "tidyverse", "viridis", "visNetwork", "zoo"]
+    },
     "stR": {
       "name": "stR",
       "version": "0.7",
@@ -121497,8 +122265,8 @@
     },
     "stablelearner": {
       "name": "stablelearner",
-      "version": "0.1-5",
-      "sha256": "0a1fsy9hf63c1yfp4dallfsiknzsnhjl91yzqsgvni3gyx0vjykm",
+      "version": "0.1-6",
+      "sha256": "0pam43vkfwxjv0dynpg0w8csc6yjs32g0kniabj1436llm73i09y",
       "depends": ["MASS", "e1071", "party", "partykit", "randomForest", "ranger"]
     },
     "stablespec": {
@@ -121609,6 +122377,12 @@
       "sha256": "04gqgjj38z9gggfmza8aqq7hdiilszvg023a1b9f3pga3rlc54y8",
       "depends": ["htmltools", "shiny"]
     },
+    "staninside": {
+      "name": "staninside",
+      "version": "0.0.4",
+      "sha256": "0v48dlfd6xay4hgcrc5kvrgnmbc256m4f8vm3jfndhr523iz3j4r",
+      "depends": ["cli", "fs", "rappdirs"]
+    },
     "stanza": {
       "name": "stanza",
       "version": "1.0-3",
@@ -121707,8 +122481,8 @@
     },
     "starvz": {
       "name": "starvz",
-      "version": "0.8.2",
-      "sha256": "0rgrbnsn1cx6255scqyjrywbq2bn3mpn7aq60p31k6f80dd850lg",
+      "version": "0.8.3",
+      "sha256": "14zmp8aj93nzhx4m5nih6j1p30kss5llgj37v7wazdml3jfxyb61",
       "depends": ["BH", "RColorBrewer", "Rcpp", "data_tree", "dplyr", "ggplot2", "gtools", "lpSolve", "magrittr", "patchwork", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr", "yaml", "zoo"]
     },
     "starwarsdb": {
@@ -121737,8 +122511,8 @@
     },
     "statar": {
       "name": "statar",
-      "version": "0.7.6",
-      "sha256": "0fjlmzndcm88dlqf6kmd1ssy0ll2g7vap6cai954lh37zbbbb674",
+      "version": "0.7.7",
+      "sha256": "12vzahbgdrwi89x9gms60z04vl5zwndhrraylpdlpx30dy0ir6w9",
       "depends": ["data_table", "dplyr", "ggplot2", "lazyeval", "matrixStats", "rlang", "stringr", "tidyselect"]
     },
     "statcanR": {
@@ -121797,27 +122571,27 @@
     },
     "statgenGWAS": {
       "name": "statgenGWAS",
-      "version": "1.0.11",
-      "sha256": "07kv3gy5q5qw8jd4l8i3515f70xxax5xcnyjb0ql818lc2c9fg4y",
-      "depends": ["Rcpp", "RcppArmadillo", "data_table", "ggplot2", "rlang", "sommer"]
+      "version": "1.0.12",
+      "sha256": "07zgyi17n3yc5g3ryc15k6z7zn441zi598h117xab97bzd8r7bz9",
+      "depends": ["LMMsolver", "Rcpp", "RcppArmadillo", "data_table", "ggplot2", "rlang", "sommer"]
     },
     "statgenGxE": {
       "name": "statgenGxE",
-      "version": "1.0.9",
-      "sha256": "0p2z8qf0gjznkcp99dzrdjkbv9433h62iwcj3h01dpx2f6v0f6zb",
+      "version": "1.0.10",
+      "sha256": "0a69zamdwr6h9msm6rwkb7vxaxqw3x348g7w62rhra9s5rma2vzj",
       "depends": ["emmeans", "ggplot2", "gridExtra", "knitr", "lme4", "rlang", "statgenSTA", "xtable"]
     },
     "statgenHTP": {
       "name": "statgenHTP",
-      "version": "1.0.8",
-      "sha256": "1wzfyi1l4sjflqanhkdrjvri2580pdq329pvsawmqg7d0f6m190b",
-      "depends": ["LMMsolver", "Matrix", "SpATS", "animation", "factoextra", "ggforce", "ggnewscale", "ggplot2", "gridExtra", "locfit", "lubridate", "reshape2", "rlang", "scales", "spam"]
+      "version": "1.0.9.1",
+      "sha256": "1hsyhcc2pmgxjngv2ldjhaarj2i1098n65p8yfrg94p7w2i7qlqx",
+      "depends": ["LMMsolver", "Matrix", "SpATS", "animation", "ggforce", "ggnewscale", "ggplot2", "gridExtra", "locfit", "lubridate", "rlang", "scales", "spam"]
     },
     "statgenIBD": {
       "name": "statgenIBD",
-      "version": "1.0.8",
-      "sha256": "0sswnv1i8zfxfdmq4lxdfkhqddzairlynw43dvwnj4lxv64kfqdx",
-      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "data_table", "ggplot2", "rlang", "statgenGWAS", "stringi"]
+      "version": "1.0.9",
+      "sha256": "15xv0njyg93ci8vm797i8milh5w1zkgmpl73lsi41b3rbp76izzx",
+      "depends": ["Matrix", "R_utils", "Rcpp", "RcppArmadillo", "data_table", "ggplot2", "rlang", "statgenGWAS", "stringi"]
     },
     "statgenMPP": {
       "name": "statgenMPP",
@@ -121827,14 +122601,14 @@
     },
     "statgenQTLxT": {
       "name": "statgenQTLxT",
-      "version": "1.0.2",
-      "sha256": "1lq8v49zf9l6gaifdwc0qpx8kknnhqw2jg19v2vr7da1xqd7wfdi",
+      "version": "1.0.3",
+      "sha256": "0pwb5sdviwwzvipbyif1nd2ifjxs8rxwgg14mvj0amla36kd55rp",
       "depends": ["Rcpp", "RcppArmadillo", "data_table", "foreach", "sommer", "statgenGWAS"]
     },
     "statgenSTA": {
       "name": "statgenSTA",
-      "version": "1.0.14",
-      "sha256": "0mj314ikqrhjjs2dcri0da8sbmar7acnh2rnpx99ylk32i6l6lrl",
+      "version": "1.0.15",
+      "sha256": "13b81aw5m7c8drkl9ylmhf8fsk9wcakhg9xgk8m1vyj9q8l7m38l",
       "depends": ["SpATS", "emmeans", "ggplot2", "ggrepel", "gridExtra", "knitr", "lme4", "mapproj", "maps", "qtl", "rlang", "scales", "xtable"]
     },
     "staticryptR": {
@@ -121843,6 +122617,12 @@
       "sha256": "1ki3kpjvwbradgr3nip8cxgasxcys1qyryh0gq9kmx9f0dbql5y2",
       "depends": []
     },
+    "statioVAR": {
+      "name": "statioVAR",
+      "version": "0.1.2",
+      "sha256": "0c8xj6jv8h2z5aaba79m06hi3ii7q4x5v07wwgj3bd34wddl4qj3",
+      "depends": ["dplyr", "rlang"]
+    },
     "stationaRy": {
       "name": "stationaRy",
       "version": "0.5.1",
@@ -121887,9 +122667,9 @@
     },
     "statnetWeb": {
       "name": "statnetWeb",
-      "version": "0.5.8",
-      "sha256": "12qwx0gnrmb449rz5a2qhds6rparfpw8ak4n0cxk9dmy6d47903l",
-      "depends": ["RColorBrewer", "ergm", "lattice", "latticeExtra", "network", "shiny", "sna"]
+      "version": "0.6.1",
+      "sha256": "0g2fdq8bk2a6c1c4xvc4vnnf88c4rjhgrlgq0d1i9w32x4qv4abr",
+      "depends": ["DT", "RColorBrewer", "ergm", "lattice", "latticeExtra", "network", "shiny", "sna"]
     },
     "statnipokladna": {
       "name": "statnipokladna",
@@ -121911,8 +122691,8 @@
     },
     "statquotes": {
       "name": "statquotes",
-      "version": "0.3.2",
-      "sha256": "0y805alr98zz306jjnikggdd02c3yrp5izzwhh457bsb85i22yri",
+      "version": "0.3.3",
+      "sha256": "1vgm5wyyllymbj8xngilhc4sdpn6kbm4kn6g2j6hlxgg8m44wq3d",
       "depends": ["stringr", "tidytext", "wordcloud"]
     },
     "stats19": {
@@ -121929,8 +122709,8 @@
     },
     "statsExpressions": {
       "name": "statsExpressions",
-      "version": "1.7.0",
-      "sha256": "06znshf4wlg4ffqywabxrramii919zbywapn5b5wx1mdwayxkf51",
+      "version": "1.7.1",
+      "sha256": "0bf9b9z7il8jcrrvsz0plv232hdvkrq7s418x3pzz36aqi5ybn10",
       "depends": ["BayesFactor", "PMCMRplus", "WRS2", "afex", "bayestestR", "correlation", "datawizard", "dplyr", "effectsize", "glue", "insight", "magrittr", "parameters", "performance", "purrr", "rlang", "rstantools", "tidyr", "withr", "zeallot"]
     },
     "statsearchanalyticsr": {
@@ -122097,8 +122877,8 @@
     },
     "stepmixr": {
       "name": "stepmixr",
-      "version": "0.1.2",
-      "sha256": "0yh0dbv14bdzwlz3fwl5ibmmg2nzb6prfdwribavfndx8zxbwgn7",
+      "version": "0.1.3",
+      "sha256": "1brbbklfi5kpbbjbvazbxkv6flxg8z9bvlqy4dvqs3cfp4izqlsl",
       "depends": ["reticulate"]
     },
     "stepp": {
@@ -122127,8 +122907,8 @@
     },
     "stevedata": {
       "name": "stevedata",
-      "version": "1.5.0",
-      "sha256": "1dck595x51gb1b20nx6szz5p91xbw1p6zc0vvw7bb21yph94f165",
+      "version": "1.6.0",
+      "sha256": "0b4sm7j5p8bm0nl7ygalni4hjl6xdv029mqlmkbg3zrjdsmpb5nx",
       "depends": []
     },
     "stevedore": {
@@ -122239,12 +123019,6 @@
       "sha256": "0cvv6q5r55iqk327rav25dymvnn77rj8chmgkbkwd0c1dpqf4x5q",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "data_table", "glmnet", "lda", "matrixStats", "quadprog", "quanteda", "slam", "stringr"]
     },
-    "stmCorrViz": {
-      "name": "stmCorrViz",
-      "version": "1.3",
-      "sha256": "1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv",
-      "depends": ["SnowballC", "jsonlite", "stm", "tm"]
-    },
     "stmgp": {
       "name": "stmgp",
       "version": "1.0.4.1",
@@ -122301,8 +123075,8 @@
     },
     "stochvol": {
       "name": "stochvol",
-      "version": "3.2.5",
-      "sha256": "1adzkd7m1lpcqbqqr39v558qfwjgs23h600z0dm2p1rf4cs51f5f",
+      "version": "3.2.6",
+      "sha256": "0sna6naiayyl3i1257818fzpz6d6qy551ck3grfhp0l0601ppvkw",
       "depends": ["Rcpp", "RcppArmadillo", "coda"]
     },
     "stochvolTMB": {
@@ -122349,14 +123123,14 @@
     },
     "stopp": {
       "name": "stopp",
-      "version": "0.2.4",
-      "sha256": "09cvh2h8c91zb8iak7g4j0sznv8kxbn0r2xjl36p663mqk2lb5ss",
+      "version": "1.0.0",
+      "sha256": "10idrb8yqix3ql8j97h832412yq9klcznwhpcky8phv5n0lzk1cg",
       "depends": ["KernSmooth", "MASS", "fields", "mgcv", "optimx", "plot3D", "sparr", "spatstat_explore", "spatstat_geom", "spatstat_linnet", "spatstat_model", "spatstat_random", "spatstat_univar", "spatstat_utils", "splancs", "stlnpp", "stpp"]
     },
     "stoppingrule": {
       "name": "stoppingrule",
-      "version": "0.5.2",
-      "sha256": "0zkqbcnw0bg49ff9sx489qmgwdnc84a6l63w9g28mya25l8j2djl",
+      "version": "0.6",
+      "sha256": "1pcmjqdzpmpn6spilh7np1rcbxwiiy94cf7q3vy08pfs8yrkmjnk",
       "depends": ["matrixStats", "pracma"]
     },
     "stops": {
@@ -122631,8 +123405,8 @@
     },
     "stringfish": {
       "name": "stringfish",
-      "version": "0.16.0",
-      "sha256": "14vrg6mkwwgw1klgpvjn7936yfxav55rainz71xjjih2j21vq21n",
+      "version": "0.17.0",
+      "sha256": "0x6nad21q7shsl7wjzldb6si7j09dyxksrpq29cxphh79d0ga2ly",
       "depends": ["Rcpp", "RcppParallel"]
     },
     "stringformattr": {
@@ -122773,11 +123547,11 @@
       "sha256": "00iw5yr6qnf01hd0a9dsqwjv2cdhq82pfj5wiy1fz0jg0q1ghh9n",
       "depends": ["ape", "class", "e1071", "lattice", "pamr", "tcltk2", "tsne"]
     },
-    "subcopem2D": {
-      "name": "subcopem2D",
-      "version": "1.3",
-      "sha256": "06wwd847g9pxd0z2a8494h3nc9s280a3s1510bir24m3z7w1pqf3",
-      "depends": []
+    "suRface_analytics": {
+      "name": "suRface.analytics",
+      "version": "0.1.0",
+      "sha256": "0par5jciz5k1bxsy867zv7y4bf4aw3k8miwppk78kaxgsd821g0y",
+      "depends": ["FactoMineR", "dplyr", "effectsize", "factoextra", "ggplot2", "multcompView", "randomForest"]
     },
     "subdetect": {
       "name": "subdetect",
@@ -122857,11 +123631,11 @@
       "sha256": "125msb0krcdj6jbdvzdl75179ajakb1l0xal45bp38am8w62a6zz",
       "depends": ["SuperLearner"]
     },
-    "subspace": {
-      "name": "subspace",
-      "version": "1.0.4",
-      "sha256": "0p2j0lnwj3ym1v4xla6r97zjikb8alnibdc690xn9c0z21hmv43v",
-      "depends": ["colorspace", "ggvis", "rJava", "stringr"]
+    "substackR": {
+      "name": "substackR",
+      "version": "0.1.15",
+      "sha256": "0sjylyn1lczzc652nh6hlwacgsxv24r70f5id42085srpcmwp6hi",
+      "depends": ["cli", "httr2", "rlang"]
     },
     "success": {
       "name": "success",
@@ -123057,8 +123831,8 @@
     },
     "superspreading": {
       "name": "superspreading",
-      "version": "0.3.0",
-      "sha256": "0qs23j0d35xakk5qkh2qf6bibffkdc02050p16fhpax1c3991dx1",
+      "version": "0.4.0",
+      "sha256": "11355cd35wka4svhvgn8hl8msw3wh0px8q8dhbw5lfpdjl0q6v61",
       "depends": ["checkmate", "rlang"]
     },
     "supervisedPRIM": {
@@ -123067,6 +123841,12 @@
       "sha256": "1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib",
       "depends": ["prim"]
     },
+    "support": {
+      "name": "support",
+      "version": "0.1.7",
+      "sha256": "1n1ckvxagbh9xr8r1anf3y6kb0j10ir332019wxd34mm67can62z",
+      "depends": ["BH", "Rcpp", "RcppArmadillo", "randtoolbox"]
+    },
     "support_BWS": {
       "name": "support.BWS",
       "version": "0.4-6",
@@ -123291,9 +124071,15 @@
     },
     "survcompare": {
       "name": "survcompare",
-      "version": "0.2.0",
-      "sha256": "1g5gzs61srzx4glrxgfr70vwmx96mvf6lbca43srskn1f8n93k14",
-      "depends": ["caret", "glmnet", "randomForestSRC", "survival", "timeROC"]
+      "version": "0.3.0",
+      "sha256": "09w6akmb83wmf7wl8fhm1z64ivw7sv9311n9cmi3mirm105i32rp",
+      "depends": ["caret", "glmnet", "missForestPredict", "randomForestSRC", "survival", "timeROC"]
+    },
+    "survdnn": {
+      "name": "survdnn",
+      "version": "0.6.0",
+      "sha256": "0xqdf3i95lbzxmrjjvwzdsrc6zw9zy6625yvfias4ca91mdqrj7f",
+      "depends": ["cli", "dplyr", "ggplot2", "glue", "purrr", "rsample", "survival", "tibble", "tidyr", "torch"]
     },
     "surveil": {
       "name": "surveil",
@@ -123303,8 +124089,8 @@
     },
     "surveillance": {
       "name": "surveillance",
-      "version": "1.24.1",
-      "sha256": "0wzjv9pb8nl1almd0qmn5xqfms2026pg21jvcqd73ij053w4vz1a",
+      "version": "1.25.0",
+      "sha256": "13mznfrlb2wshbc6rak6x19ma2sh2nm5wzi4y6sms2lls9zbpg62",
       "depends": ["MASS", "Matrix", "nlme", "polyCub", "sp", "spatstat_geom", "xtable"]
     },
     "survex": {
@@ -123363,8 +124149,8 @@
     },
     "surveydown": {
       "name": "surveydown",
-      "version": "0.11.0",
-      "sha256": "0i9k3lk6sw46lv8wi4wsmlf9nj7qcpaz9h123aqz0df7hy9gf0wj",
+      "version": "0.12.6",
+      "sha256": "1qnzsp7wl76m43cjs33vk0ik681raas1gxvp06sv1a3hza43qcf2",
       "depends": ["DBI", "DT", "RPostgres", "bslib", "cli", "dotenv", "fs", "htmltools", "jsonlite", "markdown", "miniUI", "pool", "quarto", "rstudioapi", "rvest", "shiny", "shinyWidgets", "shinyjs", "xml2", "yaml"]
     },
     "surveyexplorer": {
@@ -123447,9 +124233,9 @@
     },
     "survivalPLANN": {
       "name": "survivalPLANN",
-      "version": "0.1",
-      "sha256": "0vkpclsirb37a0xdzbbk7z0ajnp398l12mwkrxh2nprngsnfvywn",
-      "depends": ["nnet", "survival"]
+      "version": "0.4",
+      "sha256": "02gfbgv5ldjyvzqk68zhncgd6nwkr2sncf2d89m5ghlm05kvm030",
+      "depends": ["RISCA", "nnet", "survival"]
     },
     "survivalREC": {
       "name": "survivalREC",
@@ -123465,9 +124251,9 @@
     },
     "survivalSL": {
       "name": "survivalSL",
-      "version": "0.97.1",
-      "sha256": "1grcimk3pba04m5j7nya1ixcvk3nf8y6g5yb9n79waar0l1676za",
-      "depends": ["MASS", "caret", "date", "dplyr", "flexsurv", "glmnet", "glmnetUtils", "hdnom", "randomForestSRC", "rpart", "survival", "survivalPLANN"]
+      "version": "0.98",
+      "sha256": "02kq1rcz0yi4dix6zakp4w0b0wqzng45l62vbc40i5ghjfi3xgq4",
+      "depends": ["MASS", "caret", "date", "dplyr", "flexsurv", "glmnet", "hdnom", "randomForestSRC", "rpart", "survival", "survivalPLANN"]
     },
     "survivalVignettes": {
       "name": "survivalVignettes",
@@ -123525,8 +124311,8 @@
     },
     "survregVB": {
       "name": "survregVB",
-      "version": "0.0.1",
-      "sha256": "0mgj00hf2ll85dyb1ap0m45j641cij0qx3y843z607qlfsbiq00b",
+      "version": "0.0.2",
+      "sha256": "11d5c8rf5r84al64r65bxv6ai2ndsrpjw6iwl871yax310ibwmzg",
       "depends": ["bayestestR", "invgamma"]
     },
     "survsim": {
@@ -123723,9 +124509,9 @@
     },
     "svycdiff": {
       "name": "svycdiff",
-      "version": "0.1.1",
-      "sha256": "1hfgrcrkwgsi3d71aih9w866cwnidhkl45bnw29g0gz3wyvxj9gs",
-      "depends": ["betareg", "numDeriv", "survey"]
+      "version": "0.2.0",
+      "sha256": "1smi4zcvs7ihik5l489klj3hg4mbzgnkw9zzw9hly4g3crha3j6p",
+      "depends": ["MASS", "betareg", "numDeriv", "survey"]
     },
     "svycoxme": {
       "name": "svycoxme",
@@ -123801,9 +124587,9 @@
     },
     "swash": {
       "name": "swash",
-      "version": "1.2.1",
-      "sha256": "15vn6agwidvzmy3q1kiggwqa0y3z0f78574md531mw4jly35n9z6",
-      "depends": ["lubridate"]
+      "version": "1.2.2",
+      "sha256": "0x11ad2dl6wm2frkzxs52mv1s1qfrg2jwqmff71hfw066n78x2lc",
+      "depends": ["lubridate", "sf", "spdep"]
     },
     "swatches": {
       "name": "swatches",
@@ -123967,6 +124753,12 @@
       "sha256": "0h1301406spbl7yz0i0b1vqqrf5zd0yxvxx3ljsi5pj4mdhp5j32",
       "depends": ["htmltools", "markdown", "nextGenShinyApps", "r2symbols", "rstudioapi", "shiny", "shinyStorePlus"]
     },
+    "symbolicDA": {
+      "name": "symbolicDA",
+      "version": "0.7-2",
+      "sha256": "1fpjq56ibyf4fk6kmdw3a1sdpma4zmgy1fbn6qdnnjj6w4gzfsyw",
+      "depends": ["RSDA", "XML", "ade4", "cluster", "clusterSim", "e1071", "shapes"]
+    },
     "symbolicQspray": {
       "name": "symbolicQspray",
       "version": "1.1.0",
@@ -124059,20 +124851,20 @@
     },
     "synthesizer": {
       "name": "synthesizer",
-      "version": "0.4.0",
-      "sha256": "09njg6wmls9p03mrdw3rwy4jv413cmnylg5xhlys6x47z1m1vwb9",
-      "depends": ["randomForest"]
+      "version": "0.5.0",
+      "sha256": "1zn3m406d97i3hghji6gfvnxjh0112q5c5kxxra6km5f04p1kij5",
+      "depends": []
     },
     "synthpop": {
       "name": "synthpop",
-      "version": "1.9-1.1",
-      "sha256": "139x14w1aipxbxfkl2r9v85c1z6nlds5kgbcbd3dhd90irrxys15",
+      "version": "1.9-2",
+      "sha256": "1n5pc7226i1wrcjrfj985n12qcnps4s3gp26dy1qld59sj5liqy0",
       "depends": ["MASS", "broman", "classInt", "forcats", "foreign", "ggplot2", "lattice", "mipfp", "nnet", "party", "plyr", "polspline", "proto", "randomForest", "ranger", "rmutil", "rpart", "stringr", "survival"]
     },
     "syrup": {
       "name": "syrup",
-      "version": "0.1.3",
-      "sha256": "1c4cmqhh7k5ykywjkrlz73sh0i43aqjbakg0gd0lz90vmjkin7jf",
+      "version": "0.1.4",
+      "sha256": "1a1r0gjq2kfcasn5yag6c2pi187gb70l5r91g6ryg0dg9jvfa4d9",
       "depends": ["bench", "callr", "dplyr", "ps", "purrr", "rlang", "tibble", "vctrs", "withr"]
     },
     "sys": {
@@ -124141,6 +124933,12 @@
       "sha256": "08qp2iz9hqvgnbf60v86ppma3a70zk2x3hyr9xvhdrl4pgdb61na",
       "depends": []
     },
+    "tEDM": {
+      "name": "tEDM",
+      "version": "1.0",
+      "sha256": "1g1s65kshqy2ihvx420wh57hzphjnxpvh5q3zgpf1ivb6jhy2ymj",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppThread", "dplyr", "ggplot2"]
+    },
     "tLagInterim": {
       "name": "tLagInterim",
       "version": "1.1",
@@ -124203,8 +125001,8 @@
     },
     "tablaxlsx": {
       "name": "tablaxlsx",
-      "version": "1.2.5",
-      "sha256": "1cwjqxsqspyrv19wx1fvqk2x2jc3vv6h7k8flpr74a5la1jmxsbd",
+      "version": "1.2.6",
+      "sha256": "1di2dykjfni2f2ylrp9h4rv2amxwwvy1mhj5xfzx1hfzmp9sw7dh",
       "depends": ["openxlsx"]
     },
     "table_express": {
@@ -124309,6 +125107,12 @@
       "sha256": "1nv189d6sjjrhc1nr7xhdf22gfh1z93rlcgm2vk7kcs43avm8fwb",
       "depends": ["jsonlite"]
     },
+    "tabr": {
+      "name": "tabr",
+      "version": "0.5.3",
+      "sha256": "1mp2j3f373hhqfk9mjp63qlkdcgmaq5iszk5bzzgyy8gn05y9722",
+      "depends": ["crayon", "dplyr", "ggplot2", "purrr", "tibble", "tidyr"]
+    },
     "tabs": {
       "name": "tabs",
       "version": "0.1.1",
@@ -124389,8 +125193,8 @@
     },
     "tactile": {
       "name": "tactile",
-      "version": "0.2.1",
-      "sha256": "1yly05zin0isad69d6j1k2nb9ykvz0gj2xs9mqiq2cda0mdxmh65",
+      "version": "0.2.2",
+      "sha256": "1smb0zm7sn8clnppljc4d9a54frimjbx09p7i31b76g7k4mys0pr",
       "depends": ["MASS", "RColorBrewer", "gridExtra", "lattice", "latticeExtra"]
     },
     "tada": {
@@ -124401,8 +125205,8 @@
     },
     "tagcloud": {
       "name": "tagcloud",
-      "version": "0.6",
-      "sha256": "04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl",
+      "version": "0.7.0",
+      "sha256": "0acgvg7c3qh4vm0bb20658p187280mp3ksszc07j6kll4z1pl1ic",
       "depends": ["RColorBrewer", "Rcpp"]
     },
     "tagr": {
@@ -124479,8 +125283,8 @@
     },
     "tangram": {
       "name": "tangram",
-      "version": "0.8.2",
-      "sha256": "1r4wvz3nrms3mh06a7zykhkbsi4hz57xdn7af49yiypynhrxiin5",
+      "version": "0.8.3",
+      "sha256": "1bfiy88jfpz4hsk21i53qiwif8fj7sb5lgyc3lwkw8rbwvd6hj00",
       "depends": ["R6", "base64enc", "digest", "htmltools", "knitr", "magrittr", "stringi", "stringr"]
     },
     "tangram_pipe": {
@@ -124515,8 +125319,8 @@
     },
     "tarchives": {
       "name": "tarchives",
-      "version": "0.1.0",
-      "sha256": "0yk60amdnhha36g919rr4d8h4laprdpd4ih699iacdzd1sakjm47",
+      "version": "0.1.1",
+      "sha256": "0bvi7wrq3nav50fbdhlrr245dr0xxkampasnnrqjbcv2pnbcw87w",
       "depends": ["callr", "fs", "rlang", "targets", "usethis", "withr"]
     },
     "tardis": {
@@ -124557,8 +125361,8 @@
     },
     "tatoo": {
       "name": "tatoo",
-      "version": "1.1.2",
-      "sha256": "0lvnl2lqp16af4rkmijl47bx5xf17gpji21s0h8xxzpbxbmy3xwx",
+      "version": "1.1.3",
+      "sha256": "0gwqrp0y8hdgv5nrb8sg9y87makjd3s2ndfw8z7abad1fyi45ni0",
       "depends": ["assertthat", "colt", "crayon", "data_table", "magrittr", "openxlsx", "stringi", "withr"]
     },
     "tatooheene": {
@@ -124587,8 +125391,8 @@
     },
     "taxa": {
       "name": "taxa",
-      "version": "0.4.3",
-      "sha256": "1vvvj7gm0xh42bd1zh6zl14lpvyi5naxp8qsm59aynahw02s6w49",
+      "version": "0.4.4",
+      "sha256": "1s0lhrgbvdfmd86gk1vzcrli2xfmwdqr4cqlyyi8i5rc9mjygfly",
       "depends": ["cli", "crayon", "dplyr", "magrittr", "pillar", "rlang", "stringr", "tibble", "vctrs", "viridisLite"]
     },
     "taxadb": {
@@ -124609,6 +125413,12 @@
       "sha256": "0ix2zcgd93cs8kljxv547swa0adzkwabh2hwg14p4q348l049dv4",
       "depends": ["R6", "ape", "cli", "crayon", "crul", "curl", "data_table", "jsonlite", "lifecycle", "natserv", "phangorn", "ritis", "rotl", "rredlist", "stringi", "tibble", "wikitaxa", "worrms", "xml2", "zoo"]
     },
+    "taxizedb": {
+      "name": "taxizedb",
+      "version": "0.3.2",
+      "sha256": "08d5713424m45jzxwi770kcqrbvwbxzj78a89y0xdry65g5gghp9",
+      "depends": ["DBI", "RSQLite", "curl", "dbplyr", "dplyr", "hoardr", "magrittr", "readr", "rlang", "tibble", "vroom"]
+    },
     "taxlist": {
       "name": "taxlist",
       "version": "0.3.0",
@@ -124713,8 +125523,8 @@
     },
     "tclust": {
       "name": "tclust",
-      "version": "2.1-0",
-      "sha256": "1vx9nbm20hclf54js2ip09h6fhqhkn0gq90a08hhn5b1n25gvvxk",
+      "version": "2.1-2",
+      "sha256": "0x5rgxjlll9552bb59jf59mv7040rb0l14j3sh8vylwv6wpbnc85",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "rlang"]
     },
     "tcpl": {
@@ -124725,8 +125535,8 @@
     },
     "tcplfit2": {
       "name": "tcplfit2",
-      "version": "0.1.8",
-      "sha256": "12dx2frvwlm5r5wyrzw3izmrqpiik0zjra2r8vm9dq7k55llk9gh",
+      "version": "0.1.9",
+      "sha256": "1cl06hax9izlffz38hlhnw37dchv74fpazcwg4w3yy2lkybm3n5i",
       "depends": ["RColorBrewer", "ggplot2", "numDeriv", "reshape2", "stringr"]
     },
     "tcxr": {
@@ -124749,8 +125559,8 @@
     },
     "tdarec": {
       "name": "tdarec",
-      "version": "0.1.0",
-      "sha256": "1s9vpy7dr4zrrj5ahqlsbwgz02q4n7h64h10f116nv3zgkn8zjxm",
+      "version": "0.2.0",
+      "sha256": "009848spvsrqx69k3adpdqz3zrfz1fsrbdph7fp079f8x5l04v4v",
       "depends": ["dials", "magrittr", "purrr", "recipes", "rlang", "scales", "tibble", "tidyr", "vctrs"]
     },
     "tdata": {
@@ -124827,8 +125637,8 @@
     },
     "teal_logger": {
       "name": "teal.logger",
-      "version": "0.3.2",
-      "sha256": "1d6d9rahc2nqzajp66v7yrif3x2w0l12z0v4ly87hnvy6dvkgfkp",
+      "version": "0.4.0",
+      "sha256": "1yw6ywdcwm069lv36i69gzkyg3pc8k36dnj8wgyzvbv8r6720l5n",
       "depends": ["glue", "lifecycle", "logger", "shiny", "withr"]
     },
     "teal_modules_clinical": {
@@ -124869,8 +125679,8 @@
     },
     "tealeaves": {
       "name": "tealeaves",
-      "version": "1.0.6",
-      "sha256": "0gfga3fx047kpngwrkinsq3w5f34svnh3vpfjnc78bvrmmm70wqw",
+      "version": "1.0.6.1",
+      "sha256": "0wkinm8n1348aygmnprcasrc9mpyqg38akf8hsqkqcanygq42jgv",
       "depends": ["checkmate", "crayon", "dplyr", "furrr", "future", "glue", "magrittr", "purrr", "rlang", "stringr", "units"]
     },
     "teamcolors": {
@@ -124951,6 +125761,12 @@
       "sha256": "11dr5z1s9d8d2xsl4gm9x15v7jyi88f5c5gk05layh5nl2c1bxni",
       "depends": []
     },
+    "temper": {
+      "name": "temper",
+      "version": "1.0.0",
+      "sha256": "1fh4p5kwk6a04ngjj6yfjrldc1xd3xia7k29s32d0jqxiaa67brz",
+      "depends": ["ggplot2", "imputeTS", "lubridate", "purrr", "scales", "torch"]
+    },
     "temperatureresponse": {
       "name": "temperatureresponse",
       "version": "0.2",
@@ -124971,8 +125787,8 @@
     },
     "templr": {
       "name": "templr",
-      "version": "0.2-0",
-      "sha256": "1s2awbcf3vaalbrwz5ryfiz69vhapy9h6jhy6zgzqqs5l1aw4ad0",
+      "version": "0.2-1",
+      "sha256": "01y0shzwskw27kr9jsv4zxxcvczckm36fki55vr4pmif9s8xwyl8",
       "depends": ["jsonlite", "remotes", "xml2"]
     },
     "tempted": {
@@ -124995,8 +125811,8 @@
     },
     "tensor": {
       "name": "tensor",
-      "version": "1.5",
-      "sha256": "19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1",
+      "version": "1.5.1",
+      "sha256": "0n4b2q1my6q2b73c7hl9wp9wwnimq8950kv9hcgyrbda9q10gnvf",
       "depends": []
     },
     "tensorA": {
@@ -125055,8 +125871,8 @@
     },
     "tensr": {
       "name": "tensr",
-      "version": "1.0.1",
-      "sha256": "1z6b3ra7fgn88mxbhsq65x3frj5j7p17n119s9kbw7sg9y633vfx",
+      "version": "1.0.2",
+      "sha256": "14agzkh0i5qfbz6vkb81d3a34gvw2rm3lm4rfag5ql3df863whz6",
       "depends": ["assertthat"]
     },
     "tepr": {
@@ -125067,8 +125883,8 @@
     },
     "tergm": {
       "name": "tergm",
-      "version": "4.2.1",
-      "sha256": "1mv01rhd6ddsfcnzrv0lcb982fqswmzs932m23snpm76a11w074a",
+      "version": "4.2.2",
+      "sha256": "0kszsjliib7zgpq8vbwq3ncxjlmnwlmk8if2xvi0hnqw1vmgimbc",
       "depends": ["MASS", "coda", "ergm", "ergm_multi", "network", "networkDynamic", "nlme", "purrr", "robustbase", "statnet_common"]
     },
     "tergmLite": {
@@ -125097,8 +125913,8 @@
     },
     "tern": {
       "name": "tern",
-      "version": "0.9.8",
-      "sha256": "03h3v1as96w96gdknxnjacqxc2yp6vxkakwaxjr79shh9dhsww4r",
+      "version": "0.9.9",
+      "sha256": "0bsfh4b68j67y54h7pivlrrwd1xain8aj7f660p82qw27l6xvl8k",
       "depends": ["MASS", "Rdpack", "broom", "car", "checkmate", "cowplot", "dplyr", "emmeans", "forcats", "formatters", "ggplot2", "gridExtra", "gtable", "labeling", "lifecycle", "magrittr", "nestcolor", "rlang", "rtables", "scales", "survival", "tibble", "tidyr"]
     },
     "tern_gee": {
@@ -125109,10 +125925,16 @@
     },
     "tern_mmrm": {
       "name": "tern.mmrm",
-      "version": "0.3.2",
-      "sha256": "0xw0ikqi352sg8nvh1g0pmychhagq6lzvawqv25qvb66mw5ayhpc",
+      "version": "0.3.3",
+      "sha256": "0b0hj70kvpf3n1ji3zkjlikh6bz0mydz99i1dc9v9zj0a66r2435",
       "depends": ["checkmate", "cowplot", "dplyr", "emmeans", "formatters", "generics", "ggplot2", "lifecycle", "magrittr", "mmrm", "parallelly", "rlang", "rtables", "tern", "tidyr"]
     },
+    "tern_rbmi": {
+      "name": "tern.rbmi",
+      "version": "0.1.6",
+      "sha256": "1skhm6wsapy5pyq6vrnzjai2jg742g7267vqc1q4z7xqh3mjcvmm",
+      "depends": ["broom", "checkmate", "formatters", "lifecycle", "magrittr", "rbmi", "rtables", "tern"]
+    },
     "ternvis": {
       "name": "ternvis",
       "version": "1.3",
@@ -125121,8 +125943,8 @@
     },
     "terra": {
       "name": "terra",
-      "version": "1.8-54",
-      "sha256": "130kk5cyhvkxcc51ywq1rg3kbz0qnh778gmn5jsqrgypdpxdlhrx",
+      "version": "1.8-60",
+      "sha256": "08wcrrdm8bsh16qy7dz2m0bj36aghq4q4rm8vd382rkb26xsi3ny",
       "depends": ["Rcpp"]
     },
     "terrainmeshr": {
@@ -125133,8 +125955,8 @@
     },
     "terrainr": {
       "name": "terrainr",
-      "version": "0.7.5",
-      "sha256": "1bxwv94pkd4yskhqcwg891caiknipgr2lwcmy54znr8gchsm5527",
+      "version": "0.7.6",
+      "sha256": "0akssa1c3k57m2arg8zw8b7l813lqzwc4fq9ghhqg7l5kah80rlp",
       "depends": ["base64enc", "ggplot2", "glue", "httr", "magick", "png", "rlang", "sf", "terra", "unifir", "units"]
     },
     "tesselle": {
@@ -125295,9 +126117,9 @@
     },
     "text": {
       "name": "text",
-      "version": "1.5",
-      "sha256": "12yn9cl9g7w699b3dnb3w5hc9kxa7nzkkhv8i8f2y9nyidhka625",
-      "depends": ["cowplot", "dplyr", "furrr", "future", "ggplot2", "ggrepel", "magrittr", "parsnip", "purrr", "recipes", "reticulate", "rlang", "rsample", "stringi", "tibble", "tidyr", "topics", "tune", "workflows", "yardstick"]
+      "version": "1.6",
+      "sha256": "0zkqdx6q6qri3l8hzbysw1g4qv7ilmwfm2g4n9n7ccmbvcfc7gwr",
+      "depends": ["cowplot", "dplyr", "furrr", "future", "ggplot2", "ggrepel", "hardhat", "magrittr", "parsnip", "purrr", "recipes", "reticulate", "rlang", "rsample", "stringi", "tibble", "tidyr", "topics", "tune", "workflows", "yardstick"]
     },
     "text_alignment": {
       "name": "text.alignment",
@@ -125407,12 +126229,6 @@
       "sha256": "1vj1dlv2dyb3hyr60p91sh4p514i0m7gf86zk32xbdyv6k9zdkmf",
       "depends": ["dplyr", "ggplot2", "magrittr", "plyr", "purrr", "stopwords", "stringr", "textdata", "tidyr", "tidytext"]
     },
-    "textile": {
-      "name": "textile",
-      "version": "0.1.4",
-      "sha256": "069gb0j8ym44j1wk05xd3sixbvpxhhnhwax2gvyb9kbh5b99qpi6",
-      "depends": []
-    },
     "textir": {
       "name": "textir",
       "version": "2.0-5",
@@ -125581,12 +126397,6 @@
       "sha256": "1yff22jzh1mp73zbz2mav6z8m42lylfjhb8dgxj4337fv3if3i13",
       "depends": []
     },
-    "tframePlus": {
-      "name": "tframePlus",
-      "version": "2024.2-1",
-      "sha256": "02c4fjgwywqi6s7g42rpzz070j28cjr4bs94298jv2x14zkwf4v8",
-      "depends": ["tframe", "timeSeries"]
-    },
     "tfrmt": {
       "name": "tfrmt",
       "version": "0.1.3",
@@ -125667,9 +126477,15 @@
     },
     "thames": {
       "name": "thames",
-      "version": "0.1.1",
-      "sha256": "09k4ygi865115c98mgzpvx7ab4kbghasg3fvnmd3c1nhs6h7szmn",
-      "depends": ["uniformly"]
+      "version": "0.1.2",
+      "sha256": "0g886wki7wfvyyf95xr9jz7rgg6vbg5q7jrn0k3czbmxm9ip7lpl",
+      "depends": []
+    },
+    "thamesmix": {
+      "name": "thamesmix",
+      "version": "0.1.3",
+      "sha256": "1z7nm9wq2l5ix351a112y4ia9qg446ah2qmj963jjjv9falqyvh3",
+      "depends": ["Rfast", "combinat", "gor", "igraph", "mvtnorm", "quadprog", "sparsediscrim", "withr"]
     },
     "thankr": {
       "name": "thankr",
@@ -125679,15 +126495,15 @@
     },
     "theft": {
       "name": "theft",
-      "version": "0.6.3",
-      "sha256": "03ppazjwjg30a01nkawxg8bb2gzv7qnkbav5c25allsbw8gfbshh",
-      "depends": ["R_matlab", "Rcatch22", "dplyr", "fabletools", "feasts", "purrr", "reticulate", "rlang", "tibble", "tidyr", "tsfeatures", "tsibble"]
+      "version": "0.8.2",
+      "sha256": "1bxi0j7jw6iwv5s4hniwfa0zxhvnjjsn8q5r7aj9vvn5l1j5gvvn",
+      "depends": ["R_matlab", "Rcatch22", "dplyr", "fabletools", "feasts", "purrr", "reticulate", "rlang", "tidyr", "tsfeatures", "tsibble"]
     },
     "theftdlc": {
       "name": "theftdlc",
-      "version": "0.1.2",
-      "sha256": "0gc5xfizqdljkg4cqz6a0zp981804sfcjd07zrqc8pkjvq8489j8",
-      "depends": ["MASS", "Rtsne", "broom", "correctR", "dplyr", "e1071", "ggplot2", "janitor", "mclust", "normaliseR", "purrr", "reshape2", "rlang", "scales", "theft", "tibble", "tidyr", "umap"]
+      "version": "0.2.1",
+      "sha256": "0cdmkdxcp03cdrm9m646vfxvwcw3jq6xm15lvxj2xqp3v8630x5y",
+      "depends": ["MASS", "Rtsne", "broom", "correctR", "dplyr", "e1071", "furrr", "future", "ggplot2", "glmnet", "janitor", "mclust", "normaliseR", "purrr", "reshape2", "rlang", "scales", "theft", "tibble", "tidyr", "umap"]
     },
     "theiaR": {
       "name": "theiaR",
@@ -125697,8 +126513,8 @@
     },
     "thematic": {
       "name": "thematic",
-      "version": "0.1.6",
-      "sha256": "00ym9blns25cq6wij8bjgq3g79bllm8h617lvd9ald51q78pd52h",
+      "version": "0.1.7",
+      "sha256": "0wzwhhn25jlaxl9i4ibr2p7rr6pl5z71mhwgm22x8zb6447gi3vs",
       "depends": ["farver", "ggplot2", "rappdirs", "rlang", "rstudioapi", "scales"]
     },
     "themis": {
@@ -125709,9 +126525,9 @@
     },
     "theorytools": {
       "name": "theorytools",
-      "version": "0.1.0",
-      "sha256": "0xxbkf5z8a737x0yvh8q4jgn8hdpyc3wq8gfsa04iqb542mfs2lr",
-      "depends": ["cli", "gert", "gh", "jsonlite", "worcs"]
+      "version": "0.1.2",
+      "sha256": "128p1s0fm3awmc2wsn86ixnblaik7ym02r2w4kjvghd0m0zvli9g",
+      "depends": ["Deriv", "cli", "curl", "dagitty", "gert", "gh", "jsonlite", "knitr", "tidySEM", "worcs", "yaml"]
     },
     "thermocouple": {
       "name": "thermocouple",
@@ -125749,6 +126565,12 @@
       "sha256": "0wg51vyhw2dl6ycm7q6ygpkb56bihi734dmpb061yw99x6qfanbi",
       "depends": []
     },
+    "thisutils": {
+      "name": "thisutils",
+      "version": "0.0.7",
+      "sha256": "1v41w0djkywzkafkjpi5mdyjxwadlxxv6kzdycipj7dd3xm8ydwf",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "cli", "doParallel", "foreach", "purrr", "rlang"]
+    },
     "thor": {
       "name": "thor",
       "version": "1.2.0",
@@ -125883,8 +126705,8 @@
     },
     "tidyBdE": {
       "name": "tidyBdE",
-      "version": "0.3.8",
-      "sha256": "1ck1ah6nh6pa10x02iczllddnwzgff6qvwajrkkqri3jp8si9d0h",
+      "version": "0.4.0",
+      "sha256": "1z3887n9sc8j3mhvz1p0918vbjcc3inx2rksrszwkjvisa3vsv2l",
       "depends": ["dplyr", "ggplot2", "readr", "scales", "tibble", "tidyr"]
     },
     "tidyCDISC": {
@@ -125919,8 +126741,8 @@
     },
     "tidyHeatmap": {
       "name": "tidyHeatmap",
-      "version": "1.11.6",
-      "sha256": "0fk0zgh0i4wv1fcqsd9bha6096c8y5a0cwpykqqq4sa1v3ji58pb",
+      "version": "1.12.2",
+      "sha256": "0ymm05qpy58jbmhb7agfy4pm62zd8lpchi00lsgnnbkmljdkdhx2",
       "depends": ["ComplexHeatmap", "RColorBrewer", "circlize", "dendextend", "dplyr", "lifecycle", "magrittr", "patchwork", "purrr", "rlang", "tibble", "tidyr", "viridis"]
     },
     "tidyLPA": {
@@ -125931,8 +126753,8 @@
     },
     "tidyMC": {
       "name": "tidyMC",
-      "version": "1.0.0",
-      "sha256": "0mf2xxckxxvcgw1381yscmzppwgmmn44zpfyw6glkbw6963z542k",
+      "version": "1.0.1",
+      "sha256": "0cyiihfkzviziqzr3r86kzw3fqrrh8gkbmfrvcdz7vz1y3w2z96w",
       "depends": ["checkmate", "dplyr", "furrr", "future", "ggplot2", "hms", "kableExtra", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "tidyREDCap": {
@@ -125949,9 +126771,9 @@
     },
     "tidySEM": {
       "name": "tidySEM",
-      "version": "0.2.8",
-      "sha256": "0ghixlv0riz09d7lrh6w1jxydfsz4j1amyhbcc7s4syfkvcnrw9d",
-      "depends": ["Matrix", "MplusAutomation", "RANN", "bain", "blavaan", "car", "dbscan", "future_apply", "ggplot2", "gtable", "igraph", "lavaan", "nonnest2", "progressr", "psych"]
+      "version": "0.2.9",
+      "sha256": "11a3mahkl4s97j4am2b7087fggrylxcz4sbvs69x8f8wwfns0m5k",
+      "depends": ["Matrix", "MplusAutomation", "RANN", "car", "dbscan", "future_apply", "ggplot2", "gtable", "igraph", "lavaan", "nonnest2", "progressr", "psych"]
     },
     "tidySummaries": {
       "name": "tidySummaries",
@@ -125991,15 +126813,15 @@
     },
     "tidycensus": {
       "name": "tidycensus",
-      "version": "1.7.1",
-      "sha256": "1l2fgbd2mpkpjryk0kmlb1j530bc47k4x9grvskh18fnff6a8z9m",
+      "version": "1.7.3",
+      "sha256": "11642pmwb74r4sbbxdkxnxr396baiy9f0fdfdhr5xhl4hl9yigjz",
       "depends": ["crayon", "dplyr", "httr", "jsonlite", "purrr", "rappdirs", "readr", "rlang", "rvest", "sf", "stringr", "tidyr", "tidyselect", "tigris", "units", "xml2"]
     },
     "tidychangepoint": {
       "name": "tidychangepoint",
-      "version": "1.0.0",
-      "sha256": "0lxhi7y1lf9hszw7iap8pw1cc2mvns1awzi2snr8apqm20x4y42k",
-      "depends": ["GA", "broom", "changepoint", "cli", "dplyr", "ggplot2", "lifecycle", "memoise", "patchwork", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr", "tsibble", "vctrs", "wbs", "xts", "zoo"]
+      "version": "1.0.1",
+      "sha256": "0pxizc76969rpsajibmr0a3baw42kw6kbwz3xz9sd9blmxny1plj",
+      "depends": ["GA", "broom", "changepoint", "changepointGA", "cli", "dplyr", "ggplot2", "lifecycle", "lubridate", "memoise", "patchwork", "prettyunits", "purrr", "rlang", "scales", "segmented", "stringr", "tibble", "tidyr", "tsibble", "vctrs", "wbs", "xts", "zoo"]
     },
     "tidycharts": {
       "name": "tidycharts",
@@ -126061,6 +126883,12 @@
       "sha256": "0my8mxk9gx2pk3hjnd50gd6322i1l1ll4z3l4k2mr2nahbdfhbwh",
       "depends": ["cli", "dplyr", "numDeriv", "purrr", "rlang", "tibble"]
     },
+    "tidydfidx": {
+      "name": "tidydfidx",
+      "version": "0.0-1",
+      "sha256": "1ai45x6i0s670zn8bvn8hhv9zk6v94c4a174acg97w9qvdq8x6s8",
+      "depends": ["Rdpack", "dfidx", "dplyr", "pillar", "vctrs"]
+    },
     "tidydice": {
       "name": "tidydice",
       "version": "1.0.0",
@@ -126069,9 +126897,9 @@
     },
     "tidydr": {
       "name": "tidydr",
-      "version": "0.0.5",
-      "sha256": "16vghbd4iacw3480jzf12cm37azhz7xfql5z6hzh8nin48wsawiw",
-      "depends": ["ggfun", "ggplot2", "rlang"]
+      "version": "0.0.6",
+      "sha256": "00f6cskln8739xjfgnn1166n49798xmigw6kf65yl85kw37l9bqz",
+      "depends": ["cluster", "ggfun", "ggplot2", "rlang"]
     },
     "tidyedgar": {
       "name": "tidyedgar",
@@ -126165,8 +126993,8 @@
     },
     "tidyhte": {
       "name": "tidyhte",
-      "version": "1.0.2",
-      "sha256": "0c19b7yh09gixgicrr7x65a9vzyvzapr4pv130ysx4jksjcqvdfp",
+      "version": "1.0.4",
+      "sha256": "0wgs8r7isaaqk57yzypvjhjnznl5ykwlvwvzkx8a6x7b7qy5pk1z",
       "depends": ["R6", "SuperLearner", "checkmate", "dplyr", "lifecycle", "magrittr", "progress", "purrr", "rlang", "tibble"]
     },
     "tidyhydat": {
@@ -126235,6 +127063,12 @@
       "sha256": "0rm62pcxchknaz0bgfy1fcam33asspbzhwf03jx9vl5vx78ymk04",
       "depends": ["CFtime", "RNetCDF", "dplyr", "forcats", "magrittr", "ncdf4", "ncmeta", "purrr", "rlang", "tibble", "tidyr"]
     },
+    "tidynorm": {
+      "name": "tidynorm",
+      "version": "0.3.0",
+      "sha256": "0dysyw0paj2gzlkwdl86wq7ifv2zwiapjmg4kxh300n5c75331l9",
+      "depends": ["Rcpp", "RcppArmadillo", "cli", "dplyr", "glue", "purrr", "rlang", "stringr", "tidyr", "tidyselect"]
+    },
     "tidypaleo": {
       "name": "tidypaleo",
       "version": "0.1.3",
@@ -126249,8 +127083,8 @@
     },
     "tidyplots": {
       "name": "tidyplots",
-      "version": "0.2.2",
-      "sha256": "1kf21dv28nmhakmpnzr12wcdpidfvmqmi1zkyqvfq0ql0n3y8gkj",
+      "version": "0.3.1",
+      "sha256": "1n1mh5g5ww9qbam3y5rcvvpf4f63mgj141g3xsnaic1v1zkzpvqx",
       "depends": ["Hmisc", "cli", "dplyr", "forcats", "ggbeeswarm", "ggplot2", "ggpubr", "ggrastr", "ggrepel", "glue", "htmltools", "lifecycle", "patchwork", "purrr", "rlang", "scales", "stringr", "tidyr", "tidyselect"]
     },
     "tidyplus": {
@@ -126267,8 +127101,8 @@
     },
     "tidyposterior": {
       "name": "tidyposterior",
-      "version": "1.0.1",
-      "sha256": "1yi0pihglp683dmfg0bn9lnb0qsl2xprj3al65v642rcfzrr7h4h",
+      "version": "1.0.2",
+      "sha256": "1qdjffw0q8sradkk2n8ai76dpzyq3v9r5w8331z54bcxjc4v0004",
       "depends": ["dplyr", "generics", "ggplot2", "purrr", "rlang", "rsample", "rstanarm", "tibble", "tidyr", "tune", "vctrs", "workflowsets"]
     },
     "tidypredict": {
@@ -126313,6 +127147,12 @@
       "sha256": "0sdjbl4ivjrppg215j1wpcyjlbhn0g7z9cpljvqkwq3mb1abhdfd",
       "depends": ["assertthat", "crayon", "dplyr", "glue", "lubridate", "purrr", "readr", "reticulate", "rgee", "rlang", "sf", "stringr", "tidyr"]
     },
+    "tidyrhrv": {
+      "name": "tidyrhrv",
+      "version": "1.1.0",
+      "sha256": "0p42d6ms3siqqmysbpz21l70aikcwn8zvjrrfvjawx9xs946larv",
+      "depends": ["RHRV", "dplyr", "magrittr", "pracma", "purrr", "tibble", "tidyr"]
+    },
     "tidyrstats": {
       "name": "tidyrstats",
       "version": "0.1.0",
@@ -126379,6 +127219,12 @@
       "sha256": "1srxh5gyspcghzvnmpyq36ky608ipf71vv0s1jg01mgf2i5pdkf4",
       "depends": ["attempt", "rlang", "stringdist", "tibble"]
     },
+    "tidysummary": {
+      "name": "tidysummary",
+      "version": "0.1.0",
+      "sha256": "08fwncwf4wl0m46zvsmkyylkhii6v1dx26psfkqpfpgq15b6yxpi",
+      "depends": ["car", "cli", "dplyr", "fBasics", "glue", "qqplotr", "rlang", "stringr", "tibble", "tidyplots", "tidyr"]
+    },
     "tidysynth": {
       "name": "tidysynth",
       "version": "0.2.1",
@@ -126399,8 +127245,8 @@
     },
     "tidytext": {
       "name": "tidytext",
-      "version": "0.4.2",
-      "sha256": "0m1dxlrmkany4pjbr2p2m9hzn59gldmznyvs6dcb3zdr5861ix0c",
+      "version": "0.4.3",
+      "sha256": "1ncpwpqjaz6nk1i82g061llr4vkm1fjn56v6ckini9n9v41f6fwr",
       "depends": ["Matrix", "cli", "dplyr", "generics", "janeaustenr", "lifecycle", "purrr", "rlang", "stringr", "tibble", "tokenizers", "vctrs"]
     },
     "tidytidbits": {
@@ -126409,10 +127255,16 @@
       "sha256": "1zbm165bimjag7azhy77zlzqilygybqxz35q4r3d7hi7p6m96w78",
       "depends": ["dplyr", "extrafont", "forcats", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
     },
+    "tidytitanic": {
+      "name": "tidytitanic",
+      "version": "0.0.1",
+      "sha256": "1hql3j84hw19x77n0jyv9fgvriin075a0sjc6lljm5wmg6gckn0l",
+      "depends": []
+    },
     "tidytlg": {
       "name": "tidytlg",
-      "version": "0.1.6",
-      "sha256": "00fnz8y6a23kmic1ig2xixxq46qs8h82sm798n66imfhcn21d0f3",
+      "version": "0.10.0",
+      "sha256": "14s8s5gxvgrirphjs4fjxbpjqzcasxiy64gj804l1m7c59qpb41x",
       "depends": ["assertthat", "cellranger", "cli", "crayon", "dplyr", "forcats", "ggplot2", "glue", "huxtable", "magrittr", "png", "purrr", "readxl", "rlang", "rstudioapi", "stringr", "tibble", "tidyr"]
     },
     "tidytransit": {
@@ -126453,8 +127305,8 @@
     },
     "tidywater": {
       "name": "tidywater",
-      "version": "0.8.2",
-      "sha256": "01ahgrj1wgm6ypk70mk1hcxnyb1wmnmzi4hvjkf3hd26c43fsd7i",
+      "version": "0.9.0",
+      "sha256": "0si1pkbg1ib1dinl8karvy8ya0dcrj30nr03jg1qkr01sknh06sz",
       "depends": ["deSolve", "dplyr", "forcats", "furrr", "ggplot2", "ggrepel", "knitr", "magrittr", "purrr", "rlang", "tidyr"]
     },
     "tidywikidatar": {
@@ -126571,12 +127423,6 @@
       "sha256": "1bz368s1iryxrrxsvq2sbzlm2cnrfqxafzvbsgm6smb3skwyp3sb",
       "depends": ["cli", "dplyr", "lifecycle", "memoise", "pillar", "purrr", "rlang", "tibble", "tidygraph", "vctrs"]
     },
-    "time_slots": {
-      "name": "time.slots",
-      "version": "0.2.0",
-      "sha256": "04qh8cgk3ixvvc67m2hal935m5kisq2n67cvjmsg1frz1bf2yvld",
-      "depends": ["dplyr", "ggfittext", "ggplot2", "lubridate", "scales"]
-    },
     "timeDF": {
       "name": "timeDF",
       "version": "0.9.1",
@@ -126747,8 +127593,8 @@
     },
     "tinyVAST": {
       "name": "tinyVAST",
-      "version": "1.1.1",
-      "sha256": "0ghsyvbn33vbcbqnwqk6q5lgg697wvq8sr58vp6xjnwmfchpwha0",
+      "version": "1.2.0",
+      "sha256": "0w0j0428swhxmadmbflszcn38rajkh07fpzwmy2lchschrjq0n3y",
       "depends": ["Matrix", "RcppEigen", "TMB", "abind", "checkmate", "corpcor", "cv", "dsem", "fmesher", "igraph", "insight", "mgcv", "sdmTMB", "sem", "sf", "sfnetworks", "units"]
     },
     "tinyarray": {
@@ -126777,8 +127623,8 @@
     },
     "tinyplot": {
       "name": "tinyplot",
-      "version": "0.4.1",
-      "sha256": "1v8jjj9ygl9lk94l2qr95irljzg7zanljnn5h31nwcpb54fkzcf6",
+      "version": "0.4.2",
+      "sha256": "02ij8cr1nqixkk492f68yy28phx1c03y616aw4qgj7c1b58ng702",
       "depends": []
     },
     "tinyscholar": {
@@ -126789,8 +127635,8 @@
     },
     "tinysnapshot": {
       "name": "tinysnapshot",
-      "version": "0.1.0",
-      "sha256": "0r53c5z8kwg8l8b5px6gqk9cfjpx33h8x8b9dkk50ml20vfx5i1p",
+      "version": "0.2.0",
+      "sha256": "19adi0ylihjz0k8fzx5bwh3aazfwv99a2k02fi7g03fym6sgwyqn",
       "depends": ["diffobj", "magick", "tinytest"]
     },
     "tinyspotifyr": {
@@ -126801,8 +127647,8 @@
     },
     "tinytable": {
       "name": "tinytable",
-      "version": "0.9.0",
-      "sha256": "1jb82smsdrg08lk7r14hs7gavkcw98sfq50vrzxbb65gs60rikgm",
+      "version": "0.11.0",
+      "sha256": "19aswc3nckfssicyzb92rynkfvmgm471cn5qmpbx4najh240mwcr",
       "depends": []
     },
     "tinytest": {
@@ -127035,9 +127881,9 @@
     },
     "tmaptools": {
       "name": "tmaptools",
-      "version": "3.2",
-      "sha256": "1fjhknc03nz66pvwvg3ifjsfgkqfc1il274zmm5fs3rqz74zhxya",
-      "depends": ["RColorBrewer", "XML", "dichromat", "lwgeom", "magrittr", "sf", "stars", "units", "viridisLite"]
+      "version": "3.3",
+      "sha256": "0mjch2f60pxylb39xpaniaakcm72zpwn9y8k9m7pxjk3lhc9knya",
+      "depends": ["XML", "lwgeom", "sf", "stars", "units"]
     },
     "tmbstan": {
       "name": "tmbstan",
@@ -127083,8 +127929,8 @@
     },
     "tmt": {
       "name": "tmt",
-      "version": "0.3.4-0",
-      "sha256": "0n0wrgrf99bvlwbgjgx3sa8icmjqy1swc0ck3l1yja228qc26179",
+      "version": "0.3.6-0",
+      "sha256": "0zawfk2njrlyffrfz1qkwhvy35470rc5s04679y45h4jspn53nm2",
       "depends": ["Rcpp", "ggplot2", "rlang"]
     },
     "tmvmixnorm": {
@@ -127113,8 +127959,8 @@
     },
     "tna": {
       "name": "tna",
-      "version": "0.5.0",
-      "sha256": "1fdd59f9njwh64hasircv5kx8zhjy0csl3q28aax7y911wbi7xd0",
+      "version": "1.0.0",
+      "sha256": "0c9j73ygb8d00c1jk1svadg6hxp8m76sl2l6zfq9b0p1553cxrz8",
       "depends": ["RColorBrewer", "checkmate", "cli", "colorspace", "dplyr", "ggplot2", "igraph", "qgraph", "rlang", "tibble", "tidyr", "tidyselect"]
     },
     "tndata": {
@@ -127269,9 +128115,9 @@
     },
     "topics": {
       "name": "topics",
-      "version": "0.50",
-      "sha256": "1xjs9kay0p82ci497rgbmgi2mq66r1nzvyq3qqk6rwnf4mvv8dg1",
-      "depends": ["Matrix", "data_table", "dplyr", "ggplot2", "ggwordcloud", "mallet", "ngram", "purrr", "rJava", "readr", "rlang", "stopwords", "stringr", "textmineR", "tibble", "tidyr"]
+      "version": "0.60",
+      "sha256": "126q3n202jc7wmzm6c3vqr6w2jarmjy654p3aibcgn7mvrsn8nrf",
+      "depends": ["Matrix", "data_table", "dplyr", "ggforce", "ggplot2", "ggwordcloud", "mallet", "ngram", "purrr", "readr", "rlang", "stopwords", "stringr", "textmineR", "tibble", "tidyr"]
     },
     "topoDistance": {
       "name": "topoDistance",
@@ -127285,6 +128131,18 @@
       "sha256": "1pzyn916wllmry2gzwp6fhhcd3fjz7k4jlgsgqs3c2b2g0vqknm2",
       "depends": ["fields", "gRbase", "graph", "igraph", "qpgraph"]
     },
+    "topolow": {
+      "name": "topolow",
+      "version": "1.0.0",
+      "sha256": "0jrndnybc2zwy9vr87ngzvkgiwfx0l6jngfscvdjysdzy2hp4jgc",
+      "depends": ["MASS", "Racmacs", "Rtsne", "ape", "coda", "data_table", "dplyr", "filelock", "ggplot2", "ggrepel", "gridExtra", "igraph", "lhs", "plotly", "reshape2", "rgl", "rlang", "scales", "umap", "vegan"]
+    },
+    "toporanga": {
+      "name": "toporanga",
+      "version": "1.0.0",
+      "sha256": "0wlxylyp2g3i4adi23qcx27rgav65scnk25gsbk2vs3gv1y2azyx",
+      "depends": []
+    },
     "toposort": {
       "name": "toposort",
       "version": "1.0.0",
@@ -127317,8 +128175,8 @@
     },
     "torch": {
       "name": "torch",
-      "version": "0.14.2",
-      "sha256": "1j0wgxr25h91c7x48svmgd0pbjl2ljn8rv6rsgw5a56vdgr992nb",
+      "version": "0.15.1",
+      "sha256": "1s688m3km4av1ir4rcrwawr77sm0bijmlnlgwbxwkcmvmr7gcx2a",
       "depends": ["R6", "Rcpp", "bit64", "callr", "cli", "coro", "desc", "glue", "jsonlite", "magrittr", "rlang", "safetensors", "scales", "withr"]
     },
     "torchdatasets": {
@@ -127335,9 +128193,9 @@
     },
     "torchvision": {
       "name": "torchvision",
-      "version": "0.6.0",
-      "sha256": "0n78x9dyj9dk2dpsmx5zbm1842nhfnb7jszva320avr72w6a4386",
-      "depends": ["abind", "fs", "jpeg", "magrittr", "png", "rappdirs", "rlang", "torch", "withr"]
+      "version": "0.7.0",
+      "sha256": "0dx09wk211wzb0qkvfiv864z63h0c3s7q6pdvqk8a7zysv844w9a",
+      "depends": ["abind", "cli", "fs", "glue", "jpeg", "jsonlite", "magrittr", "png", "rappdirs", "rlang", "tiff", "torch", "withr", "zeallot"]
     },
     "torchvisionlib": {
       "name": "torchvisionlib",
@@ -127395,9 +128253,9 @@
     },
     "tourr": {
       "name": "tourr",
-      "version": "1.2.4",
-      "sha256": "1qh1cwi1jf58jblbigxgbsxkc8w3vh5kdi9zh0m2xn5mmnyjjspa",
-      "depends": ["MASS", "dplyr", "tibble"]
+      "version": "1.2.6",
+      "sha256": "0ywpfa6ip4gyrdmzxx2kbnsa3pir58abq2m9bwim4id6kl862q1p",
+      "depends": ["MASS", "ash", "cassowaryr", "dplyr", "energy", "geozoo", "mgcv", "minerva", "tibble"]
     },
     "tower": {
       "name": "tower",
@@ -127521,8 +128379,8 @@
     },
     "track2KBA": {
       "name": "track2KBA",
-      "version": "1.1.2",
-      "sha256": "1y5mj2qakwvgxh0s8dli9d2i97g1y19k0v3q20zgj7j3wx7x8fw4",
+      "version": "1.1.3",
+      "sha256": "12cbaav7mfvm9xg076maxymwj523pn1z5llb1saksy42yjxdf9zc",
       "depends": ["Matching", "adehabitatHR", "dplyr", "foreach", "geosphere", "ggplot2", "lubridate", "magrittr", "maps", "move", "purrr", "raster", "rlang", "sf", "sp", "tidyr"]
     },
     "trackdem": {
@@ -127647,8 +128505,8 @@
     },
     "trajmsm": {
       "name": "trajmsm",
-      "version": "0.1.3",
-      "sha256": "1rjg89qh4ljaz1pspwx6njfbc5b1i4b5mka0vlypm2i5pljk71wa",
+      "version": "0.1.4",
+      "sha256": "0a4sxbci46ijcmkbl92xbgvn5r9vd0s3b6ipw6qv3x2sw6f1r242",
       "depends": ["e1071", "flexmix", "ggplot2", "sandwich", "survival"]
     },
     "trajr": {
@@ -127659,8 +128517,8 @@
     },
     "tram": {
       "name": "tram",
-      "version": "1.2-2",
-      "sha256": "0ibp7l1vpjlbvp2wphh99y290kby8dhqcqrvq280plrvcg3r4wvy",
+      "version": "1.2-3",
+      "sha256": "1aq3nlql8czcm4x4xfnbz2nggivd8hz69vy9pfm69shmv28zbfij",
       "depends": ["Formula", "Matrix", "basefun", "mlt", "multcomp", "mvtnorm", "sandwich", "survival", "variables"]
     },
     "tramME": {
@@ -127797,8 +128655,8 @@
     },
     "transreg": {
       "name": "transreg",
-      "version": "1.0.4",
-      "sha256": "0z1n8n04h78lqxwyskdm7hjbdyhmmiscwwkc2gn7k1lklfn1gwl2",
+      "version": "1.0.5",
+      "sha256": "0kygikv9hra0przwyq38ji47abj7b094xh0c68yqdhinw3ppn0bc",
       "depends": ["glmnet", "joinet", "starnet"]
     },
     "transx": {
@@ -127821,14 +128679,14 @@
     },
     "traumar": {
       "name": "traumar",
-      "version": "1.2.0",
-      "sha256": "1vl4ldy5qswg5hk2l2va275ihamzqr7knyvwa008x53yl22r05vg",
+      "version": "1.2.1",
+      "sha256": "1dkix7q78h5bpf1i0ahxmcyalx9y6cm8l74dgdpg04kdy435h04d",
       "depends": ["cli", "dplyr", "ggplot2", "glue", "hms", "infer", "lifecycle", "lubridate", "nemsqar", "nortest", "patchwork", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "traveltimeR": {
       "name": "traveltimeR",
-      "version": "1.2.1",
-      "sha256": "1029hxdgzapx0irvq5ir18fpdm5cyj5wjvl1h88x3g1rs88pvfzi",
+      "version": "1.3.1",
+      "sha256": "11kpqk5bw8hk6r2hq9zzl3dv0c7q209z5nd7cc7h2skls2nal6nr",
       "depends": ["RProtoBuf", "data_table", "httr", "jsonlite"]
     },
     "trawl": {
@@ -127851,9 +128709,9 @@
     },
     "treasury": {
       "name": "treasury",
-      "version": "0.2.0",
-      "sha256": "0dg7yik152gikxn35khcrc098li6n3ppb7d78cwmxl2ikvzcgbbm",
-      "depends": ["httr2", "readxl", "rlang", "tidyr", "xml2"]
+      "version": "0.3.0",
+      "sha256": "0fk0yah540v1izz8v05ifl26rfis2iylp5f134fl4gq8w0y3hr7q",
+      "depends": ["data_table", "httr2", "xml2"]
     },
     "treats": {
       "name": "treats",
@@ -127881,8 +128739,8 @@
     },
     "treeClust": {
       "name": "treeClust",
-      "version": "1.1-7",
-      "sha256": "1s7kh6q0bkixsygrip95zf1bi10ihddsa5lq9dfxd68yh8rsby6z",
+      "version": "1.1-7.1",
+      "sha256": "1ls36crqkckvh8qvyxwm8gzs7f1i5vm73r5ciz4p45ll0yx8250h",
       "depends": ["cluster", "rpart"]
     },
     "treeDA": {
@@ -128019,9 +128877,9 @@
     },
     "trelliscopejs": {
       "name": "trelliscopejs",
-      "version": "0.2.6",
-      "sha256": "16i1km57yz8bl4ni919d3qmj8aj5l88l7byhd6ksh88ygpfl7wq8",
-      "depends": ["DistributionUtils", "autocogs", "base64enc", "digest", "dplyr", "ggplot2", "gtable", "htmltools", "htmlwidgets", "jsonlite", "knitr", "progress", "purrr", "rlang", "tidyr", "webshot"]
+      "version": "0.2.11",
+      "sha256": "1hj4n5cdm4w3fwmm9m1ijic7jsyck64jqgi0h1mxlx8d2yma2lp9",
+      "depends": ["DistributionUtils", "autocogs", "base64enc", "digest", "dplyr", "fidelius", "ggplot2", "gtable", "htmltools", "htmlwidgets", "jsonlite", "knitr", "progress", "purrr", "rlang", "tidyr", "webshot"]
     },
     "tremendousr": {
       "name": "tremendousr",
@@ -128121,9 +128979,9 @@
     },
     "trimcluster": {
       "name": "trimcluster",
-      "version": "0.1-5",
-      "sha256": "12siv8yx8dcavsz8jk96lwscbj257ar8jpaxksl2zb06987g4fcj",
-      "depends": []
+      "version": "0.2-0",
+      "sha256": "0vmj3hrwm3rcd4sf7a6jq3ay7qgr39x3zpzmgi67gd8d8cr2hnfh",
+      "depends": ["tclust"]
     },
     "trimetStops": {
       "name": "trimetStops",
@@ -128167,6 +129025,12 @@
       "sha256": "0ximarlnrgldny2wf1ygzh2id72cvrx8fplk49kq1qwbvjf21sj0",
       "depends": []
     },
+    "triplediff": {
+      "name": "triplediff",
+      "version": "0.1.0",
+      "sha256": "1y403b80pfq41l3fhglc6nddcqdj6lbcxfvx45zd5qbw3pynkq2j",
+      "depends": ["BMisc", "Matrix", "Rcpp", "data_table", "parglm", "speedglm"]
+    },
     "triplesmatch": {
       "name": "triplesmatch",
       "version": "1.1.0",
@@ -128199,8 +129063,8 @@
     },
     "troopdata": {
       "name": "troopdata",
-      "version": "1.0.2",
-      "sha256": "13a1a6d724816s5mkx4hxn7syvwy34l8bdffas76g0g3kadkpvj7",
+      "version": "1.0.4",
+      "sha256": "1r2k9673hq1bmnlhb5kwjgy4czfmd57aazr33zfwd6wmfpwkjpd7",
       "depends": ["dplyr", "magrittr", "rlang"]
     },
     "tropAlgebra": {
@@ -128235,8 +129099,8 @@
     },
     "trtswitch": {
       "name": "trtswitch",
-      "version": "0.1.7",
-      "sha256": "1z1m96l114saf26jv9p0dazspva7x11k654isa0p5am8iynv9pa0",
+      "version": "0.1.8",
+      "sha256": "03ssvdghwyscdpvdfcm8204l7bwk38xqgyr1rk78as8x0ap8lfd6",
       "depends": ["Rcpp"]
     },
     "trud": {
@@ -128541,8 +129405,8 @@
     },
     "tsissm": {
       "name": "tsissm",
-      "version": "1.0.1",
-      "sha256": "17knl2x4lhzvbf03vl4pdl619vg609zwvk2ylhp01fvgk19vzadg",
+      "version": "1.0.2",
+      "sha256": "1klm2hnwk4mj53n99jcwr1w167prdrbbplzjrj4qsadb3snjb4q3",
       "depends": ["RTMB", "Rcpp", "RcppEigen", "TMB", "copula", "data_table", "flextable", "future", "future_apply", "nloptr", "progressr", "sandwich", "tsaux", "tsdistributions", "tsmethods", "viridisLite", "xts", "zoo"]
     },
     "tsmarch": {
@@ -128577,9 +129441,9 @@
     },
     "tsnet": {
       "name": "tsnet",
-      "version": "0.1.0",
-      "sha256": "14wy4mfzxkigdm3abfybijqicfqxl0gfbf72asadwipaqyw91nf6",
-      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cowplot", "dplyr", "ggdist", "ggokabeito", "ggplot2", "posterior", "rlang", "rstan", "rstantools", "tidyr"]
+      "version": "0.2.0",
+      "sha256": "1a9zy9im4nim2c8c4cxm4zcgfyv04nhynvi042s702nlana0pnag",
+      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cowplot", "dplyr", "ggdist", "ggokabeito", "ggplot2", "loo", "posterior", "rlang", "rstan", "rstantools", "tidyr"]
     },
     "tsoutliers": {
       "name": "tsoutliers",
@@ -128595,8 +129459,8 @@
     },
     "tspredit": {
       "name": "tspredit",
-      "version": "1.2.707",
-      "sha256": "1j5sggf1qwcj0w6vnjjnba6zsgb31f0vdwqif9f1jbiq88l29y1l",
+      "version": "1.2.727",
+      "sha256": "18d6i1g7d482gjj92rqfkr8vs05rvscwkfz06f1rq69mqq8sk1gb",
       "depends": ["DescTools", "FNN", "KFAS", "daltoolbox", "dplyr", "e1071", "elmNNRcpp", "forecast", "hht", "mFilter", "nnet", "randomForest", "wavelets"]
     },
     "tsqn": {
@@ -128671,6 +129535,12 @@
       "sha256": "0k35kavamz8s9c2na2f01i74wxid4lf4h8w71hk0nxzdm1qv3i45",
       "depends": ["MASS", "evd", "mvtnorm", "tictoc"]
     },
+    "ttScreening": {
+      "name": "ttScreening",
+      "version": "1.7",
+      "sha256": "08azvpw54a4snkikq48n40hgxd7hym6yn8qjaglc9hhrs6ghwfrp",
+      "depends": ["MASS", "corpcor", "limma", "matrixStats", "simsalapar", "sva"]
+    },
     "ttbary": {
       "name": "ttbary",
       "version": "0.3-1",
@@ -128703,8 +129573,8 @@
     },
     "ttservice": {
       "name": "ttservice",
-      "version": "0.4.1",
-      "sha256": "1r0prv3p3xlcfn16bxjyvkr255rsaf5m26c394qxc78y6qf6wrbd",
+      "version": "0.5.3",
+      "sha256": "127q2f6ahh6527ni2ywhgmks9pqxj2ih8dmqcrlb6s2x4v385vqx",
       "depends": ["Matrix", "dplyr", "plotly"]
     },
     "ttt": {
@@ -128745,8 +129615,8 @@
     },
     "tufte": {
       "name": "tufte",
-      "version": "0.13",
-      "sha256": "130g2dz49pinhcwzax4d90wv8wdgz621qiq92yhhd845zs55gqzi",
+      "version": "0.14.0",
+      "sha256": "0jkp90678xrgzq6qd7n6wxmbd0s52q32n30d33jlg1w511adss8b",
       "depends": ["htmltools", "knitr", "rmarkdown", "xfun"]
     },
     "tufterhandout": {
@@ -129135,8 +130005,8 @@
     },
     "uGMAR": {
       "name": "uGMAR",
-      "version": "3.5.2",
-      "sha256": "12n7rwpw6sabb53985vlgcq7bjqh7f6dy0p60mp8smcdw9qhl7sg",
+      "version": "3.6.0",
+      "sha256": "0ggrjcy4ay88sys1jhx56vcs7v3fl8v4fkmnz91kk5c6q5nkgr87",
       "depends": ["Brobdingnag", "gsl", "pbapply"]
     },
     "uHMM": {
@@ -129219,8 +130089,8 @@
     },
     "udunits2": {
       "name": "udunits2",
-      "version": "0.13.2.1",
-      "sha256": "00prsy8m41v1camcsz94d7gm8qab2mdnwl3x0dyhz4r49b02jm4z",
+      "version": "0.13.2.2",
+      "sha256": "0nq49px1f2n5vm4il2vd21x5vdvcpnnq884qgzks6pqm5jhw8v9y",
       "depends": []
     },
     "ufRisk": {
@@ -129231,8 +130101,8 @@
     },
     "ufs": {
       "name": "ufs",
-      "version": "0.5.12",
-      "sha256": "002xvhn1mcgfjzaslarra0bv33plyz1a4akjxxbmh4q4v6abxk88",
+      "version": "25.7.1",
+      "sha256": "1ryf4a2fkr83xbpwb4y9nmkn14jpqmqr3qigwb8jg5idji0q6wps",
       "depends": ["GPArotation", "SuppDists", "digest", "diptest", "dplyr", "ggplot2", "ggrepel", "ggridges", "gridExtra", "gtable", "htmltools", "kableExtra", "knitr", "pander", "plyr", "pwr", "rmdpartials", "scales"]
     },
     "ugatsdb": {
@@ -129289,6 +130159,12 @@
       "sha256": "1acl04bm8f2hgi26mpmzcwp44yv9zxarzw4r4k20b367k8g9rh8a",
       "depends": ["XML", "httr"]
     },
+    "ukhsadatR": {
+      "name": "ukhsadatR",
+      "version": "0.1.1",
+      "sha256": "0qpyl4cyscc6wssfq9x1nqaw3llshd2bhl1q3r50kxl0fnfbzz5k",
+      "depends": ["httr2", "jsonlite"]
+    },
     "uklr": {
       "name": "uklr",
       "version": "1.0.2",
@@ -129315,8 +130191,8 @@
     },
     "ulrb": {
       "name": "ulrb",
-      "version": "0.1.6",
-      "sha256": "1xksj1gzh44fa5xdxxd4y099zpbk8hdzj95mbkdxikwbilixfzs7",
+      "version": "0.1.8",
+      "sha256": "15i7vbm12jfx26azd139h5600r1ccraq1axc2qrzy2i9qfdxf1vi",
       "depends": ["cluster", "clusterSim", "dplyr", "ggplot2", "gridExtra", "purrr", "rlang", "tidyr"]
     },
     "ultrapolaRplot": {
@@ -129417,8 +130293,8 @@
     },
     "unhcrthemes": {
       "name": "unhcrthemes",
-      "version": "0.6.3",
-      "sha256": "02qvqjwxyxdxc8g3irm1ircz3qyd7w7x84fp2dvqjpxk27qcwki6",
+      "version": "0.7.0",
+      "sha256": "1wxm0n5gr36r9350wyhalwik79ch6n5s3b3iy7y0d4b02ys966a4",
       "depends": ["extrafont", "ggplot2", "ggrepel", "ggtext", "scales", "systemfonts"]
     },
     "unheadr": {
@@ -129481,6 +130357,12 @@
       "sha256": "05zhx5a3ka3xa3h2j2dc17q7alq3zcnahvzbngyrz5ri0q3w1l5l",
       "depends": ["abind", "pgnorm", "rgl"]
     },
+    "unifyR": {
+      "name": "unifyR",
+      "version": "1.0.0",
+      "sha256": "0pfd4fzw50dgqjyh3kbn0wdbw562gxf29ik8p14ljbzfi962yanr",
+      "depends": []
+    },
     "unigd": {
       "name": "unigd",
       "version": "0.1.3",
@@ -129619,6 +130501,12 @@
       "sha256": "1j3l68lcsmkdlfpw20p7nqh2lalds1inz82xmy9kiw7lwpq74ycj",
       "depends": ["R6", "assertthat", "dplyr", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
+    "unsum": {
+      "name": "unsum",
+      "version": "0.2.0",
+      "sha256": "0x3jlahx78dip1r6dld8h0gwiiivznj7m001fdzb83s2709a81jf",
+      "depends": ["cli", "ggplot2", "nanoparquet", "readr", "rlang", "roundwork", "scales", "tibble"]
+    },
     "unsystation": {
       "name": "unsystation",
       "version": "0.2.1",
@@ -129675,14 +130563,14 @@
     },
     "upndown": {
       "name": "upndown",
-      "version": "0.2.0",
-      "sha256": "15dlzn52nyk37naqjxxzy6wmspv3ambc0rg5xc9ffrbiai4j2sqr",
-      "depends": ["cir", "expm", "numbers", "plyr"]
+      "version": "0.3.0",
+      "sha256": "02qz24zzl0d4hiwc35l21sp06sm1k1swrk8kp8wqxfjknps5qcvp",
+      "depends": ["MASS", "cir", "expm", "plyr"]
     },
     "upset_hp": {
       "name": "upset.hp",
-      "version": "0.0.1",
-      "sha256": "1spbsfcp09yj5d5n8vc8rinv20j8qjc7xmx9bq8ab0cqijnzn6aw",
+      "version": "0.0.4",
+      "sha256": "02yz5hn0zph3y7aamanppihvjd3l4klrphlns71g79r0i6qpzap3",
       "depends": ["MuMIn", "ggplot2", "glmm_hp", "patchwork", "vegan"]
     },
     "upsetjs": {
@@ -129717,8 +130605,8 @@
     },
     "urbin": {
       "name": "urbin",
-      "version": "0.1-14",
-      "sha256": "1061a7n9yrpz6ixy88zwiam6amy7jg2l2hv7c5n8cqg33j32lf22",
+      "version": "0.1-16",
+      "sha256": "0jw2ih916m1nrhmdggpg5kx3ldhvpr2fpxmm638nb366zmynaf0z",
       "depends": []
     },
     "urca": {
@@ -129733,6 +130621,12 @@
       "sha256": "06034lb94krbzawqg5xklwcksvyyzl3qy355f66baj5pw7dms5k2",
       "depends": ["cli", "curl", "xml2"]
     },
+    "urlexplorer": {
+      "name": "urlexplorer",
+      "version": "0.1.0",
+      "sha256": "0ds243hqf807zkjxja09l45796im1vd7vclx8adjwyb8d1vgsmyb",
+      "depends": ["dplyr", "rlang", "stringr", "tibble", "tidyr"]
+    },
     "urlparse": {
       "name": "urlparse",
       "version": "0.2.1",
@@ -129903,8 +130797,8 @@
     },
     "usmapdata": {
       "name": "usmapdata",
-      "version": "0.5.0",
-      "sha256": "1m3zlwpfrb233vwy5kmrml4ky1jjls29l342r9s8bb57b7dldxhs",
+      "version": "0.6.0",
+      "sha256": "1nji6r0cx7vdfgjji1c50095ad5wchas9m832znd80jkg373i1vs",
       "depends": ["rlang", "sf"]
     },
     "ussherR": {
@@ -129981,9 +130875,9 @@
     },
     "utsf": {
       "name": "utsf",
-      "version": "1.2.0",
-      "sha256": "1axcvg5h3wwpdm15fpqip20ngmcp1j0hzps7xaw2bbnx4rcj35j5",
-      "depends": ["Cubist", "FNN", "forecast", "ggplot2", "ipred", "ranger", "rpart", "vctsfr"]
+      "version": "1.3.0",
+      "sha256": "04bpx4wb92w41z8h54har5jb9cblhs34qhaqcfkywg83rhp5qgaz",
+      "depends": ["Cubist", "FNN", "forecast", "generics", "ggplot2", "ipred", "ranger", "rpart", "vctsfr"]
     },
     "uuid": {
       "name": "uuid",
@@ -130015,12 +130909,6 @@
       "sha256": "0xgazc1appn9z1qj7kqaydknskvcphz4y822sryygmngl9608xgz",
       "depends": ["cowplot", "dplyr", "gghalves", "ggplot2", "ggpubr", "ggtext", "magrittr", "maps", "rentrez", "rlang", "scales", "stringdist", "stringr", "tidyr"]
     },
-    "vICC": {
-      "name": "vICC",
-      "version": "1.0.0",
-      "sha256": "13lcs7wwj1xfbjf3q7r8ssf00jg5hr1vjp2pyw0r42iz7mx47xjv",
-      "depends": ["Rdpack", "coda", "ggplot2", "nlme", "rjags"]
-    },
     "vMF": {
       "name": "vMF",
       "version": "0.0.3",
@@ -130033,6 +130921,12 @@
       "sha256": "031k19ric26xvrva3rs9894n7ak87h96d2c4ip1lrr0lhhbk3awv",
       "depends": []
     },
+    "vacalibration": {
+      "name": "vacalibration",
+      "version": "2.0",
+      "sha256": "1j13q5lv265p1vxp0xbffab437q5897km22gmmwi3bm6ql1g4smc",
+      "depends": ["ggplot2", "loo", "patchwork", "reshape2", "rstan"]
+    },
     "vaccine": {
       "name": "vaccine",
       "version": "1.3.0",
@@ -130093,6 +130987,12 @@
       "sha256": "03l4c6vbzaxcrzc0ykx52h420r8cp3vrqxzl8jzxq8c8a9ms1xsi",
       "depends": ["lazyeval"]
     },
+    "valdr": {
+      "name": "valdr",
+      "version": "1.0.1",
+      "sha256": "00dbn9ivc3il8j4yfbkihbz1i52ri7zgv6gn49kg8wci98844cb7",
+      "depends": ["base64enc", "httr", "jsonlite", "keyring"]
+    },
     "valection": {
       "name": "valection",
       "version": "1.0.0",
@@ -130155,8 +131055,8 @@
     },
     "validatetools": {
       "name": "validatetools",
-      "version": "0.5.2",
-      "sha256": "16pgqk96daz0dgsq2r9kfl6mkc4fffkai0ir1sh2js9v6d5c74k0",
+      "version": "0.6.1",
+      "sha256": "12l8sp66m16wk39n5bzmjnks7fmrwb2bdn8146k64f6dyfy5hv9h",
       "depends": ["lpSolveAPI", "validate"]
     },
     "validmind": {
@@ -130185,8 +131085,8 @@
     },
     "valr": {
       "name": "valr",
-      "version": "0.8.3",
-      "sha256": "1k3nghd8nd145mpcax1yb22za4vjvygzh4fhrs5dj46biqp44rxc",
+      "version": "0.8.4",
+      "sha256": "138s6ydqhhik0ymfby9sdnpyjj56m98yqav4vmgv619fhialyx0y",
       "depends": ["Rcpp", "broom", "cli", "cpp11bigwig", "dplyr", "ggplot2", "lifecycle", "readr", "rlang", "stringr", "tibble"]
     },
     "valueEQ5D": {
@@ -130195,12 +131095,6 @@
       "sha256": "1w1l07s1rfxc1ba6kdq0l1vmb2qib6gmdm91706cmy1azfa92n4d",
       "depends": ["testthat"]
     },
-    "valueSetCompare": {
-      "name": "valueSetCompare",
-      "version": "1.0.0",
-      "sha256": "06cb1hz1gp5gzbxbnv7306fyvvczggnaclab9llsbvfnmacbc2k5",
-      "depends": ["dplyr", "eq5dsuite", "ggplot2", "rlang"]
-    },
     "valuemap": {
       "name": "valuemap",
       "version": "2.0.4",
@@ -130365,8 +131259,8 @@
     },
     "varoc": {
       "name": "varoc",
-      "version": "0.2.0",
-      "sha256": "034bycqwlz23rm2hm4i1qpqs1s74mk5axv965h09xj7yzvy9qjkm",
+      "version": "0.4.0",
+      "sha256": "0ndkvggr86ynrzj4xh721qmif3xd9q56ah95jpy9m3ixjbdvy0jx",
       "depends": ["corrplot", "pROC"]
     },
     "vars": {
@@ -130449,8 +131343,8 @@
     },
     "vcdExtra": {
       "name": "vcdExtra",
-      "version": "0.8-5",
-      "sha256": "09kpfnyi6q7xn4x6f7i3k8g6f2fdnm7kk81lxjmlhhn36jxc2p2i",
+      "version": "0.8-6",
+      "sha256": "031s6g7rnqxxs2hdbr6rhchwqzkzc1lgl6skci4r96idfl4a3k2i",
       "depends": ["MASS", "ca", "dplyr", "glue", "gnm", "here", "purrr", "readxl", "stringr", "tidyr", "vcd"]
     },
     "vcfR": {
@@ -130461,8 +131355,8 @@
     },
     "vcfppR": {
       "name": "vcfppR",
-      "version": "0.7.6",
-      "sha256": "0i3q8zc946hibq5dp0xzz5h56gqm33245sm56vh9jh847ivkayh9",
+      "version": "0.8.0",
+      "sha256": "1ccd3da0cpadvym9k4pv58s1r4kgngwc2wzi6r8fdlcqgzcnmn8f",
       "depends": ["Rcpp"]
     },
     "vchartr": {
@@ -130491,9 +131385,9 @@
     },
     "vcr": {
       "name": "vcr",
-      "version": "1.7.0",
-      "sha256": "0spz4wfglj7gd3fh1cv4bc1lf98m1ialay3vzyhzb1n2fq6812k7",
-      "depends": ["R6", "base64enc", "crul", "httr", "httr2", "rprojroot", "urltools", "webmockr", "yaml"]
+      "version": "2.0.0",
+      "sha256": "03c2pjf9za7brvbjyxl8bkmi3l6ky7z155apgqk4liwvvc8flirq",
+      "depends": ["R6", "cli", "curl", "jsonlite", "lifecycle", "rlang", "rprojroot", "waldo", "yaml"]
     },
     "vcrpart": {
       "name": "vcrpart",
@@ -130551,9 +131445,9 @@
     },
     "vecmatch": {
       "name": "vecmatch",
-      "version": "1.1.0",
-      "sha256": "0sawas9ysahmdvwrcyjwcn8866q1m1qqzspjjjzcc195xfdrck2s",
-      "depends": ["MASS", "Matching", "VGAM", "brglm2", "chk", "cli", "ggplot2", "ggpp", "ggpubr", "mclogit", "nnet", "optmatch", "productplots", "rlang", "rstatix", "withr"]
+      "version": "1.2.0",
+      "sha256": "0yx3qg5d7ls49w6amwm5i90in4n40l8bms50q47hgpq11dfnvpij",
+      "depends": ["MASS", "Matching", "VGAM", "brglm2", "callr", "chk", "cli", "doRNG", "foreach", "ggplot2", "ggpp", "ggpubr", "mclogit", "nnet", "optmatch", "productplots", "rlang", "rstatix", "withr"]
     },
     "vecsets": {
       "name": "vecsets",
@@ -130569,9 +131463,9 @@
     },
     "vectorsurvR": {
       "name": "vectorsurvR",
-      "version": "1.4.0",
-      "sha256": "1s8j09q7zscyd2jyy57ikwqms733g1dxvsqldwbmwf7s0376xb1q",
-      "depends": ["DT", "dplyr", "httr2", "jsonlite", "kableExtra", "knitr", "lubridate", "magrittr", "purrr", "rstudioapi", "sf", "stringr", "tidyr"]
+      "version": "1.5.1",
+      "sha256": "01yj3w039jim0gfni67k6famj91r116lggnrf85nikavm56995ar",
+      "depends": ["DT", "dplyr", "httr2", "jsonlite", "kableExtra", "knitr", "lubridate", "magrittr", "rstudioapi", "sf", "stringr", "tidyr"]
     },
     "vectorwavelet": {
       "name": "vectorwavelet",
@@ -130579,6 +131473,12 @@
       "sha256": "1z0gl28hgrqgx0ynv248a80fh190pm15c9cg1l1665acrw62kqs7",
       "depends": ["Rcpp", "biwavelet", "fields", "foreach", "iterators", "maps", "spam"]
     },
+    "vecvec": {
+      "name": "vecvec",
+      "version": "0.1.0",
+      "sha256": "07fgg4y6zw79xcdbhwfdp6s2awvbamvmb3xx4bzbi8a3ryh7rick",
+      "depends": ["rlang", "vctrs"]
+    },
     "veesa": {
       "name": "veesa",
       "version": "0.1.6",
@@ -130711,6 +131611,12 @@
       "sha256": "095b0s2i2j655xfwjrddlz9pia0a1njzh7r3cjnfk84dp43a03hl",
       "depends": ["CircStats", "MASS", "boot", "dtw", "fields"]
     },
+    "verifyr2": {
+      "name": "verifyr2",
+      "version": "1.0.0",
+      "sha256": "0w3xvaqs0avb9ndki72m0r816vm9fz46hbvfgjia09rj2dwa490s",
+      "depends": ["R6", "base64enc", "diffobj", "dplyr", "jsonlite", "magrittr", "mime", "rappdirs", "shiny", "stringr", "striprtf", "tibble"]
+    },
     "vermeulen": {
       "name": "vermeulen",
       "version": "0.1.2",
@@ -130765,6 +131671,12 @@
       "sha256": "0kgw1jx0rl9v8qy8qg7zjzdgvwqdi7k1lsvsx3lnpw4sfpkzsq23",
       "depends": []
     },
+    "vfunc": {
+      "name": "vfunc",
+      "version": "1.0",
+      "sha256": "1frwv124vm3la6zhykwpngvlzlics00za3qdydfjgz55a1pcgzln",
+      "depends": []
+    },
     "vglmer": {
       "name": "vglmer",
       "version": "1.0.6",
@@ -130801,6 +131713,12 @@
       "sha256": "0fq7dqpsnrfnf03dvz2zpxysj0qjapvpvclzl9ch1j5g06jpbdmg",
       "depends": ["assertthat", "crul", "dplyr", "jsonlite", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "utf8"]
     },
+    "vibass": {
+      "name": "vibass",
+      "version": "1.0.1",
+      "sha256": "1pzfmdn1q5g52cmjaiy5j008igag3bgjmcvw6bsviq3vbqyxv4nz",
+      "depends": ["R2BayesX", "cli", "dplyr", "extraDistr", "ggplot2", "golem", "knitr", "lme4", "magrittr", "rlang", "rstudioapi", "shiny", "tibble", "tidyr"]
+    },
     "vici": {
       "name": "vici",
       "version": "0.7.3",
@@ -130839,8 +131757,8 @@
     },
     "vigicaen": {
       "name": "vigicaen",
-      "version": "0.15.6",
-      "sha256": "1frc1qzzs2xfhlmsiqdvl9y6y77r4aa5bfb9vdjh3zhmfnjihkbj",
+      "version": "0.16.1",
+      "sha256": "1g0wpjsf5shjprzng1ngsvwih53chcj7vy4y20gbxlprs41mzn78",
       "depends": ["arrow", "cli", "data_table", "dplyr", "fst", "ggplot2", "glue", "gridExtra", "lifecycle", "purrr", "rlang", "stringr", "tidyr"]
     },
     "viking": {
@@ -130857,8 +131775,8 @@
     },
     "vimp": {
       "name": "vimp",
-      "version": "2.3.3",
-      "sha256": "069pcxzavi213idpslnc1skylsb1wn6xldajnn54prlwq9hkfb19",
+      "version": "2.3.5",
+      "sha256": "1893nqdcwc35skgga6x45rn207n1ayrmdmn8khc7j2vk34fysab0",
       "depends": ["MASS", "ROCR", "SuperLearner", "boot", "data_table", "dplyr", "magrittr", "rlang", "tibble"]
     },
     "vimpclust": {
@@ -130915,6 +131833,12 @@
       "sha256": "1xkgbf4l0ca8dgpzcsb94fxnv8vwz8rhs99i33zdwy14nqcjxcj5",
       "depends": ["Cubist", "baguette", "dials", "dplyr", "glmnet", "hardhat", "kernlab", "kknn", "magrittr", "parsnip", "purrr", "ranger", "recipes", "rsample", "rules", "tidyselect", "tune", "viraldomain", "workflows", "workflowsets"]
     },
+    "viralx": {
+      "name": "viralx",
+      "version": "1.3.1",
+      "sha256": "06liywpwb9hwld51ya88mvdqfzkwwp6g4cahh2gllyvzl8q0lysp",
+      "depends": ["DALEX", "DALEXtra", "parsnip", "recipes", "workflows"]
+    },
     "viridis": {
       "name": "viridis",
       "version": "0.6.5",
@@ -130959,9 +131883,9 @@
     },
     "visOmopResults": {
       "name": "visOmopResults",
-      "version": "1.1.0",
-      "sha256": "15b3akvq5d0mqqki4cylai6fr34f1kz1mwx8a14glda3xs20mwcr",
-      "depends": ["cli", "dplyr", "generics", "glue", "omopgenerics", "purrr", "reactable", "rlang", "stringr", "tidyr"]
+      "version": "1.1.1",
+      "sha256": "0jck3fbjljz3vq84ap3xl0d149i0h5z0aqfz4bfbnx058dzhhyh8",
+      "depends": ["cli", "dplyr", "generics", "glue", "omopgenerics", "purrr", "rlang", "stringr", "tidyr"]
     },
     "visStatistics": {
       "name": "visStatistics",
@@ -131113,11 +132037,17 @@
       "sha256": "17micfmlksnw167vavvhlk431fm20k74y5ggs47pgz5fwpm854zp",
       "depends": []
     },
+    "vitals": {
+      "name": "vitals",
+      "version": "0.1.0",
+      "sha256": "002ib0cxm5cc9mdf2gx0g2fif1rr9fzlqdfrazfqh8w22wfvkzhp",
+      "depends": ["R6", "S7", "cli", "dplyr", "ellmer", "glue", "httpuv", "jsonlite", "purrr", "rlang", "rstudioapi", "tibble", "tidyr", "withr"]
+    },
     "vivainsights": {
       "name": "vivainsights",
-      "version": "0.6.2",
-      "sha256": "1xmffacid9lpy65r52bz9b06wmdvzmhcd94w6yavp2z2sadyvrba",
-      "depends": ["data_table", "dplyr", "ggplot2", "ggraph", "ggrepel", "ggwordcloud", "glue", "htmltools", "igraph", "lifecycle", "magrittr", "markdown", "networkD3", "purrr", "reshape2", "rmarkdown", "scales", "tidyr", "tidyselect", "tidytext", "wpa"]
+      "version": "0.7.0",
+      "sha256": "054c1r9ia5gmva2yqx2mwggsiy28w5rfpmbx7cc7mnfy46ipff51",
+      "depends": ["data_table", "dplyr", "ggplot2", "ggraph", "ggrepel", "glue", "htmltools", "igraph", "lifecycle", "magrittr", "markdown", "networkD3", "purrr", "reshape2", "rlang", "rmarkdown", "scales", "tidyr", "tidyselect", "tidytext", "wpa"]
     },
     "vivaldi": {
       "name": "vivaldi",
@@ -131125,12 +132055,6 @@
       "sha256": "1dvihjc6vjzg2w1j0q6vjhlhpwkknwsd97lpbqbfpacpp337mvx8",
       "depends": ["dplyr", "ggplot2", "glue", "magrittr", "plotly", "seqinr", "tidyr", "tidyselect", "vcfR"]
     },
-    "vivid": {
-      "name": "vivid",
-      "version": "0.2.9",
-      "sha256": "13iagv585a5z7pggzlcgc8h17r5lx4nq2gljy58238nsi0xc9549",
-      "depends": ["DendSer", "GGally", "RColorBrewer", "colorspace", "condvis2", "dplyr", "flashlight", "ggalt", "ggnewscale", "ggplot2", "igraph", "sp"]
-    },
     "vivo": {
       "name": "vivo",
       "version": "0.2.1",
@@ -131149,6 +132073,12 @@
       "sha256": "1pk444fcw4yyv2dnfrw9vynbpc4gwr5yv9jd41djp9yipdf6d53l",
       "depends": ["XML", "httr", "jsonlite", "purrr"]
     },
+    "vmTools": {
+      "name": "vmTools",
+      "version": "1.0.1",
+      "sha256": "0a10s8hipvhfsmgpd4rchwbjnnsk96rid233i6jxmh377cd0ll33",
+      "depends": ["R6", "data_table"]
+    },
     "vmdTDNN": {
       "name": "vmdTDNN",
       "version": "0.1.1",
@@ -131169,8 +132099,8 @@
     },
     "vmsae": {
       "name": "vmsae",
-      "version": "0.1.0",
-      "sha256": "17rv6xvhdkglyldk69kva84fk2fs99qvmv5r5m0vyw623mc3cd2s",
+      "version": "0.1.1",
+      "sha256": "0indwpmqz1yv50h8i642wl2lkx2dzgs0hm51p5s31iw4ywyd8nya",
       "depends": ["dplyr", "ggplot2", "gridExtra", "reticulate", "rlang", "sf", "tidyr"]
     },
     "vntrs": {
@@ -131193,9 +132123,9 @@
     },
     "voice": {
       "name": "voice",
-      "version": "0.4.21",
-      "sha256": "0fh1k0596npm6yah992g3hc79g6lh12b7k97nnxlm1pgpdbb503v",
-      "depends": ["R_utils", "dplyr", "reticulate", "seewave", "tibble", "tidyselect", "tuneR", "wrassp", "zoo"]
+      "version": "0.5.4",
+      "sha256": "1b9gqjwci1ysxxf0xmyhng286lc792wj87l5aqlkwd5xmzynyl4v",
+      "depends": ["R_utils", "arrangements", "dplyr", "ggplot2", "htmltools", "httr", "reticulate", "seewave", "tabr", "tibble", "tidyselect", "tuneR", "wrassp", "zoo"]
     },
     "voiceR": {
       "name": "voiceR",
@@ -131203,10 +132133,16 @@
       "sha256": "1bc2h04i9l76wqrw93brg5ivpgd0pq20zq2nq8x7p851jfxz84p4",
       "depends": ["DT", "FSA", "MASS", "doParallel", "foreach", "ggplot2", "ggpubr", "ggthemes", "gridExtra", "gtable", "kableExtra", "knitr", "phia", "plotly", "rcompanion", "rlang", "rmarkdown", "seewave", "shiny", "shinyFiles", "shinyjs", "soundgen", "stringr", "tuneR", "xfun"]
     },
+    "voigt": {
+      "name": "voigt",
+      "version": "1.0",
+      "sha256": "104p1s8d6py7zqg09wncxs0z9gb6rx86glcfa914ikk6a6wypxhz",
+      "depends": ["coda", "invgamma", "pracma"]
+    },
     "vol2birdR": {
       "name": "vol2birdR",
-      "version": "1.1.0",
-      "sha256": "0xqfr3w39ywdf02jx6pms5srvwhav2gkbkqg34kca75mlyhcsqja",
+      "version": "1.1.1",
+      "sha256": "0iq4rxxp3x4az63lb9pk1znx76x88gv87x00cizsgrjlrp21df7m",
       "depends": ["Rcpp", "RcppGSL", "assertthat", "pkgbuild", "rlang", "withr"]
     },
     "volatilityTrader": {
@@ -131239,12 +132175,6 @@
       "sha256": "0l8wg5ra2dmmb0j7swpfq5qimd1m7plw3ixs8g1r6vjw8dcw0bcs",
       "depends": ["base64enc", "broom", "car", "dplyr", "effectsize", "ggplot2", "heplots", "kableExtra", "knitr", "lifecycle", "magrittr", "psych", "purrr", "rlang", "rmarkdown", "scales", "skimr", "tibble", "tidyr", "tidyselect"]
     },
-    "volleystat": {
-      "name": "volleystat",
-      "version": "0.2.0",
-      "sha256": "0n1r0bvvmba21cs3qgpnw9jxpgl2n82fhxa40sa1w2gav5rch5i6",
-      "depends": []
-    },
     "volrisk": {
       "name": "volrisk",
       "version": "0.1.0",
@@ -131253,9 +132183,9 @@
     },
     "voluModel": {
       "name": "voluModel",
-      "version": "0.2.2",
-      "sha256": "1pl4rxqpsh2kvnqph53nbcv4kj9zj7i3krn7y0h1mcvp0pzz1yva",
-      "depends": ["dplyr", "fields", "ggplot2", "ggtext", "metR", "modEvA", "rangeBuilder", "sf", "terra", "viridisLite"]
+      "version": "0.2.3",
+      "sha256": "0qvyysd975p3nrm3k4pnqan4qlgwd0lc5316qqfjfxiiil6vpfgp",
+      "depends": ["dplyr", "fields", "ggplot2", "ggtext", "metR", "modEvA", "rangeBuilder", "rnaturalearth", "sf", "terra", "viridisLite"]
     },
     "voronoiTreemap": {
       "name": "voronoiTreemap",
@@ -131283,9 +132213,9 @@
     },
     "vosonSML": {
       "name": "vosonSML",
-      "version": "0.32.7",
-      "sha256": "1fs939zq2vnilc3fp6cplsqk0iz71i8xjdcbvspsccw7rsdp2qs8",
-      "depends": ["data_table", "dplyr", "httr", "jsonlite", "lubridate", "purrr", "rlang", "stringr", "textutils", "tibble", "tidyr"]
+      "version": "0.35.1",
+      "sha256": "0094p4vi70kbciaf4lzd47mdxdfpn3x4frfikhxhrwdl8f9rmpx4",
+      "depends": ["data_table", "dplyr", "httr2", "jsonlite", "lubridate", "purrr", "rlang", "stringr", "textutils", "tibble", "tidyr"]
     },
     "vote": {
       "name": "vote",
@@ -131511,8 +132441,8 @@
     },
     "vvtermtime": {
       "name": "vvtermtime",
-      "version": "0.0.1",
-      "sha256": "0c7cry87wgk86wydrw0l8icc25lx5fcxzm1wyfs2ls8ppmpkz3l7",
+      "version": "0.1.0",
+      "sha256": "0ym14h0bdrshx62rr156xgacl3989pbwyqabw6c6hhca5ngyl7k4",
       "depends": ["httr", "jsonlite", "magrittr"]
     },
     "vwline": {
@@ -131601,8 +132531,8 @@
     },
     "waldo": {
       "name": "waldo",
-      "version": "0.6.1",
-      "sha256": "1jbn3vfykyv8czwqs6wbb8m172cl2fqgggy86n3h1rrg59rz7hy9",
+      "version": "0.6.2",
+      "sha256": "1yh79qcz6h073b42pr1hgvci8p64js6s386j6sbw9vi5wrmp8amj",
       "depends": ["cli", "diffobj", "glue", "rlang"]
     },
     "walkboutr": {
@@ -131665,16 +132595,10 @@
       "sha256": "0b1g2fpshhkd15b6fz4v3qwf425p5ahbh57acclqq6znl1acl1hg",
       "depends": ["flextable", "lubridate", "readtext"]
     },
-    "warbleR": {
-      "name": "warbleR",
-      "version": "1.1.34",
-      "sha256": "005kdz24xgi5nk84msvmcl68x8rmd0p20vip6ln0aj39y3y7zyr7",
-      "depends": ["NatureSounds", "RCurl", "Rcpp", "bioacoustics", "cli", "curl", "dtw", "fftw", "httr", "knitr", "monitoR", "pbapply", "rjson", "seewave", "testthat", "tuneR"]
-    },
     "warehouseTools": {
       "name": "warehouseTools",
-      "version": "0.1.2",
-      "sha256": "1qw7rmr7jh61icbjq4fd3y02bkqamgq4np6k6fxb9kvzf09r7fs7",
+      "version": "0.1.4",
+      "sha256": "1d6s58ihl58836clxrpfg9mc106c6rjcx5v8ibrziw3p157b6xk9",
       "depends": ["clusterSim", "dplyr"]
     },
     "warp": {
@@ -131727,8 +132651,8 @@
     },
     "watcher": {
       "name": "watcher",
-      "version": "0.1.3",
-      "sha256": "09rm08i0zkzpdgjqcdi67sikcy25gmszi5xmdh0i8ji80w4bx4zw",
+      "version": "0.1.4",
+      "sha256": "0kw6ngrdmb8a7jvdyyw1qgvahkmf7pw0sjz1q3qjvfxs1y5bs59l",
       "depends": ["R6", "later", "rlang"]
     },
     "waterYearType": {
@@ -131871,8 +132795,8 @@
     },
     "wcep": {
       "name": "wcep",
-      "version": "1.0.2",
-      "sha256": "0ydlfd6ngmrccaf9zybyzp11x98kih40kj3i2dq81ixxsgk2pjnq",
+      "version": "1.0.3",
+      "sha256": "1gbxw0hizlsgckcjjhi1xlzd7mmqqjhyzfxdrvriwb2v113x5sy9",
       "depends": ["coin", "dplyr", "progress", "tidyr"]
     },
     "wconf": {
@@ -131973,15 +132897,15 @@
     },
     "webchem": {
       "name": "webchem",
-      "version": "1.3.0",
-      "sha256": "06b9i9jipg564zyw4gkgiidz7501rlp40hxm4z3k5mzy148lr5vq",
+      "version": "1.3.1",
+      "sha256": "1xbqzppiz5sgxqbzcqihnk5yjbvdw5shvx9z4c6p39fkw7xj68wd",
       "depends": ["base64enc", "data_tree", "dplyr", "httr", "jsonlite", "purrr", "rlang", "rvest", "stringr", "tibble", "xml2"]
     },
     "webdav": {
       "name": "webdav",
-      "version": "0.1.5",
-      "sha256": "1j3likv9f0k09q0b0i4269qpawfffrf0sa8dkmrza7syi5csd1z5",
-      "depends": ["curl", "dplyr", "glue", "httpuv", "httr2", "magrittr", "stringr", "tibble", "xml2"]
+      "version": "0.1.6",
+      "sha256": "1f8h0ivyzi27vhcb9myjw5ygl3nvh86cns1vcsv00i26skdfwr6j",
+      "depends": ["curl", "dplyr", "glue", "httpuv", "httr2", "purrr", "stringr", "tibble", "tidyr", "xml2"]
     },
     "webdeveloper": {
       "name": "webdeveloper",
@@ -132003,8 +132927,8 @@
     },
     "webfakes": {
       "name": "webfakes",
-      "version": "1.3.2",
-      "sha256": "18hcr63ci5cfdd9299va4gckabwx7mypw1jv5vydn2w8x4da2s68",
+      "version": "1.4.0",
+      "sha256": "1132i5wz1y9wpkgqx3d3mkkixv74q28krfw054hgsfpzi5mj8b24",
       "depends": []
     },
     "webglobe": {
@@ -132021,9 +132945,9 @@
     },
     "webmockr": {
       "name": "webmockr",
-      "version": "2.0.0",
-      "sha256": "048skbz57f7xzg1c88j6hhpgyg4nnrx41w5wrh7lm0r71k2kaq2f",
-      "depends": ["R6", "cli", "crul", "curl", "fauxpas", "jsonlite", "magrittr", "rlang", "urltools"]
+      "version": "2.2.0",
+      "sha256": "0l20vxiysgbmhd9jqz6fkzi1pqjypfc41r9rr80rsx8491g490vy",
+      "depends": ["R6", "cli", "curl", "fauxpas", "jsonlite", "magrittr", "rlang", "urltools"]
     },
     "webp": {
       "name": "webp",
@@ -132153,8 +133077,8 @@
     },
     "weights": {
       "name": "weights",
-      "version": "1.1.1",
-      "sha256": "145jmsrfqj1x5qz86rigzrxmc7x049a5knn1xwxw0881xnz1a1ii",
+      "version": "1.1.2",
+      "sha256": "1slr2nz89hqh27w4n3jywgrz4842jl3ssp76736qd7dd181cbhbc",
       "depends": ["Hmisc", "gdata", "lme4", "mice"]
     },
     "weird": {
@@ -132265,6 +133189,12 @@
       "sha256": "16xzhwvhd3zdklyvdb1lla5lykbvkq5hghfm9yz0cc6ykcnz7afr",
       "depends": ["DBI", "dm", "dplyr", "hms", "lubridate", "rlang", "snakecase", "tibble", "xlsx"]
     },
+    "whep": {
+      "name": "whep",
+      "version": "0.1.0",
+      "sha256": "1vn49gin894ff53bg8ishl0r0a0q67nhzmxwa8z26jlll03hc3d4",
+      "depends": ["FAOSTAT", "cli", "dplyr", "fs", "httr", "mipfp", "nanoparquet", "pins", "purrr", "readr", "rlang", "stringr", "tidyr", "withr", "yaml"]
+    },
     "where": {
       "name": "where",
       "version": "1.0.0",
@@ -132285,15 +133215,15 @@
     },
     "whippr": {
       "name": "whippr",
-      "version": "0.1.3",
-      "sha256": "17r1wcgpriynpd3z7l6wa4al72x4ad07y1mr5jjafxgms6l554lx",
+      "version": "0.1.4",
+      "sha256": "19iyj3nrar3wlim8ndbnfrfjg1y6ih7x9hx1z5g1qvn8x6slzxxw",
       "depends": ["broom", "cli", "dplyr", "ggplot2", "glue", "lubridate", "magrittr", "minpack_lm", "nlstools", "patchwork", "pillar", "purrr", "readxl", "rlang", "stringr", "tibble", "tidyr", "zoo"]
     },
     "whirl": {
       "name": "whirl",
-      "version": "0.2.0",
-      "sha256": "10bhpcwgv5zyvprgf9pf6ablasifly7vglapzrb334racbqljq2g",
-      "depends": ["R6", "callr", "cli", "dplyr", "jsonlite", "kableExtra", "knitr", "quarto", "reticulate", "rlang", "sessioninfo", "stringr", "tibble", "tidyr", "unglue", "withr", "yaml", "zephyr"]
+      "version": "0.3.0",
+      "sha256": "1fb35sk9jcjgij833d6zi50ciq3v8c8brq3bk37hjhd2cn308j06",
+      "depends": ["R6", "callr", "cli", "dplyr", "jsonlite", "kableExtra", "knitr", "purrr", "quarto", "reticulate", "rlang", "sessioninfo", "stringr", "tibble", "tidyr", "unglue", "withr", "yaml", "zephyr"]
     },
     "whisker": {
       "name": "whisker",
@@ -132373,12 +133303,6 @@
       "sha256": "05300hslrfpsqaxzzbmxgl2s2dz3wldpmnxh9hzgy97xkdc0c6fn",
       "depends": ["Matrix", "broom", "dplyr", "purrr", "reshape2", "rlang", "tibble", "tidyr", "tidytext"]
     },
-    "wiesbaden": {
-      "name": "wiesbaden",
-      "version": "1.2.10",
-      "sha256": "0kmapfksrxkr3dry8didznhv3q0827183532s78bai9l2hm8is1p",
-      "depends": ["httr", "jsonlite", "keyring", "readr", "stringi", "stringr", "xml2"]
-    },
     "wig": {
       "name": "wig",
       "version": "0.1.0",
@@ -132387,9 +133311,9 @@
     },
     "wikiTools": {
       "name": "wikiTools",
-      "version": "1.2.8",
-      "sha256": "076fi6z0jqgz33nh19hz9rms5dj49waxyi2iwwrfwfcjshj8vwms",
-      "depends": ["collections", "curl", "httr", "jsonlite", "ratelimitr"]
+      "version": "1.2.14",
+      "sha256": "0ypwx1zx6i38hq2nljjh6rcsqmbvnznbfq4m2a1nlq5q9i4ypcj4",
+      "depends": ["collections", "curl", "httr", "jsonlite", "netCoin", "ratelimitr"]
     },
     "wikibooks": {
       "name": "wikibooks",
@@ -132505,12 +133429,6 @@
       "sha256": "0jni53gswr4amln87c6kksrb54apdacw3mdcg0dgz2107f9l0a4g",
       "depends": ["lubridate"]
     },
-    "wingen": {
-      "name": "wingen",
-      "version": "2.1.2",
-      "sha256": "0a4lhsvwd1jh48nb2b6nxkybp4j5pblf94j8pmx6v2yq11k2ddki",
-      "depends": ["automap", "crayon", "dplyr", "furrr", "gdistance", "ggplot2", "hierfstat", "magrittr", "pegas", "purrr", "raster", "rlang", "sf", "terra", "tidyr", "tidyselect", "vcfR", "viridis"]
-    },
     "winputall": {
       "name": "winputall",
       "version": "1.0.1",
@@ -132525,8 +133443,8 @@
     },
     "wintime": {
       "name": "wintime",
-      "version": "0.3.0",
-      "sha256": "12ghq92mqr76jvld47cy4hh1gqs8kvjd0afb39qyx24l5abcl4nc",
+      "version": "0.4.0",
+      "sha256": "1ijwnyn9n48a9gzcpc4d3i5bvcgnn0xag5vfm4y8pb5wnizmk81k",
       "depends": ["survival"]
     },
     "wiqid": {
@@ -132561,8 +133479,8 @@
     },
     "wizaRdry": {
       "name": "wizaRdry",
-      "version": "0.2.0",
-      "sha256": "1x0xmajvsrnidinw4afd6kdfwxm8zw1l61mn41y7q8gj5lc4ci0i",
+      "version": "0.2.6",
+      "sha256": "1rnrmh2hzal0bw35ynj6r4nc31bi8xlqn4999zsz2pqnhap3gw4a",
       "depends": ["R6", "REDCapR", "beepr", "cli", "config", "dplyr", "future", "future_apply", "haven", "httr", "jsonlite", "knitr", "lubridate", "mongolite", "qualtRics", "rlang", "rstudioapi", "stringdist", "testthat"]
     },
     "wk": {
@@ -132657,8 +133575,8 @@
     },
     "worcs": {
       "name": "worcs",
-      "version": "0.1.18",
-      "sha256": "1ab841yan8q6iqcyr9y61p67j1jcdlxqjy768ax70kjms1yf5jgr",
+      "version": "0.1.19",
+      "sha256": "1q41ijd2pl8bdyv2nf61yh07n2nm9zgqd4n3zlrq357izbj5pl3j",
       "depends": ["cli", "credentials", "digest", "gert", "gh", "prereg", "ranger", "renv", "rlang", "rmarkdown", "rticles", "tinytex", "usethis", "xfun", "yaml"]
     },
     "word_alignment": {
@@ -132699,8 +133617,8 @@
     },
     "wordmap": {
       "name": "wordmap",
-      "version": "0.9.2",
-      "sha256": "0qf20qr29wmd0m56nvwgfx1wkgwfqcych54nx1p1zw97010izxm7",
+      "version": "0.9.5",
+      "sha256": "180mwy47j33c6ssw56jaay10zh10d82pmvaacacfhzca4w0x3fq1",
       "depends": ["Matrix", "ggplot2", "ggrepel", "quanteda", "stringi"]
     },
     "wordnet": {
@@ -132747,8 +133665,8 @@
     },
     "wordvector": {
       "name": "wordvector",
-      "version": "0.5.0",
-      "sha256": "1vq31vdygv5iy62ka1ffcf5vc63b0z24b5yzk0b7df0m2m19nci6",
+      "version": "0.5.1",
+      "sha256": "04yiqdqvihl0s4vha6zzqirds4230gvsh88lzn8jdciigs6zrpav",
       "depends": ["Matrix", "RSpectra", "Rcpp", "irlba", "proxyC", "quanteda", "rsvd", "stringi"]
     },
     "workflowr": {
@@ -132789,9 +133707,9 @@
     },
     "worldmet": {
       "name": "worldmet",
-      "version": "0.9.9",
-      "sha256": "0fadyla3f48cx7bb6q2sf4bz23ni30pl0inp0llphc9aqg6m9vf3",
-      "depends": ["doParallel", "dplyr", "foreach", "leaflet", "magrittr", "openair", "purrr", "readr", "tibble", "tidyr"]
+      "version": "0.10.0",
+      "sha256": "0ps1swfk13lv7jqz9p2qw90x2ynrsz0wzm5dynsfih5ad2z4d210",
+      "depends": ["cli", "dplyr", "leaflet", "openair", "purrr", "readr", "rlang", "sf", "tidyr"]
     },
     "worrms": {
       "name": "worrms",
@@ -132829,6 +133747,12 @@
       "sha256": "0qk748dzr0a338p6lf8y99snxyqj59xcnpffhh0d3973vlv2rqix",
       "depends": ["DT", "data_table", "dplyr", "ggplot2", "ggraph", "ggrepel", "ggwordcloud", "htmltools", "igraph", "magrittr", "markdown", "networkD3", "proxy", "purrr", "reshape2", "rmarkdown", "scales", "tidyr", "tidyselect", "tidytext"]
     },
+    "wpeR": {
+      "name": "wpeR",
+      "version": "0.1.0",
+      "sha256": "0lzqx60zmr4zczl2rm8pr56jv1pmbk5hd909lnf1ksa357dnrpb4",
+      "depends": ["dplyr", "ggplot2", "sf"]
+    },
     "wpp2008": {
       "name": "wpp2008",
       "version": "1.0-1",
@@ -132871,6 +133795,12 @@
       "sha256": "1pbmjg6y543aih8mxf9njfwpm090virhgqf8w0a5yx0jdfjwmz04",
       "depends": ["DT", "Hmisc", "ggplot2", "googleVis", "plyr", "reshape2", "shiny", "shinyjs", "shinythemes", "wpp2019"]
     },
+    "wqc": {
+      "name": "wqc",
+      "version": "0.1.2",
+      "sha256": "0145w1vn2k2fhbzfawn58cpxcwny1cha0yihn5pz4i9v2lsyh84q",
+      "depends": ["QCSIS", "lattice", "viridisLite", "waveslim"]
+    },
     "wql": {
       "name": "wql",
       "version": "1.0.2",
@@ -132885,20 +133815,20 @@
     },
     "wqtrends": {
       "name": "wqtrends",
-      "version": "1.5.0",
-      "sha256": "0swgjxq1i6pgflvavwq2dcdw21mc9bngqy18l089xrdv8kvilw4m",
+      "version": "1.5.1",
+      "sha256": "0ngj618qflrk9ia6a35k87fvqg31q1ypgwb9lh5h38bilbyzbcay",
       "depends": ["dplyr", "ggplot2", "lubridate", "mgcv", "mixmeta", "plotly", "purrr", "tibble", "tidyr", "viridisLite"]
     },
     "wrGraph": {
       "name": "wrGraph",
-      "version": "1.3.9",
-      "sha256": "04qjy29l4qjpq3f0w2mq050lg84hi6brfvpxl4mwdv07iw0c4d47",
+      "version": "1.3.10",
+      "sha256": "0lffq2vp5p9g7nqwpnafmv1ym1hhhs53zkpm360fjsqb66wwh424",
       "depends": ["RColorBrewer", "lattice", "wrMisc"]
     },
     "wrMisc": {
       "name": "wrMisc",
-      "version": "1.15.3.1",
-      "sha256": "0ahs0rr7k9vspizcahwisnlx5lkrbwymw5cjgl1wq6yy5444snng",
+      "version": "1.15.4",
+      "sha256": "0740bvsb748zh3a0vd1dgb2cpl6i8f6ivz023qf0jr1609p8271c",
       "depends": ["MASS"]
     },
     "wrProteo": {
@@ -132921,8 +133851,8 @@
     },
     "wrappedtools": {
       "name": "wrappedtools",
-      "version": "0.9.7",
-      "sha256": "1ymy6dkf5nc2pwf83bamm0n1fnr0xd6dh4pvmniafy8qfsn289vs",
+      "version": "0.9.8",
+      "sha256": "01di3p49165d14an496rxn872x5inljrlkywp02imi96q2s3cavy",
       "depends": ["DescTools", "boot", "broom", "coin", "dplyr", "flextable", "forcats", "ggplot2", "glue", "kableExtra", "knitr", "lifecycle", "nortest", "purrr", "rlang", "rlist", "stringr", "tibble", "tidyr"]
     },
     "wrappr": {
@@ -133095,8 +134025,8 @@
     },
     "xactonomial": {
       "name": "xactonomial",
-      "version": "1.0.3",
-      "sha256": "1dmxbcksybznhd0hcvpzxgpkcxyz0rjlvmpy195qby23g51f3l4w",
+      "version": "1.2.0",
+      "sha256": "1gjyg8fbm0n48hhlsvdw2p8y6w0nm6b785xrnapblrra2vc4g17y",
       "depends": []
     },
     "xadmix": {
@@ -133131,8 +134061,8 @@
     },
     "xdvir": {
       "name": "xdvir",
-      "version": "0.1-2",
-      "sha256": "0agnf1sqchd4jipy6yz4mrm04igihp845v56s4r49njsq5mp55v3",
+      "version": "0.1-3",
+      "sha256": "1j9db94kr4ywgj8ja380xbdl1ll9bql47j2zpcnxpmz3xm0n71wm",
       "depends": ["hexView", "rlang", "systemfonts", "tinytex"]
     },
     "xefun": {
@@ -133143,8 +134073,8 @@
     },
     "xega": {
       "name": "xega",
-      "version": "0.9.0.8",
-      "sha256": "1z9x1596c7hg05mxd4q2l222fsrz2cf259n2q6jz3xm0nhkmh6wj",
+      "version": "0.9.0.12",
+      "sha256": "1y1lw2wkjfyv8593wrnx31wdrn9j8wsbdgc1qmm8kammicfya6x7",
       "depends": ["filelock", "parallelly", "xegaBNF", "xegaDerivationTrees", "xegaDfGene", "xegaGaGene", "xegaGeGene", "xegaGpGene", "xegaPermGene", "xegaPopulation", "xegaSelectGene"]
     },
     "xegaBNF": {
@@ -133161,14 +134091,14 @@
     },
     "xegaDfGene": {
       "name": "xegaDfGene",
-      "version": "1.0.0.3",
-      "sha256": "0r13gchfx2pvsl25nqqnv2xpqdyad70x13kb4i42h5ysffkbfakr",
+      "version": "1.0.0.5",
+      "sha256": "1fwxwl6bzn0z6idqzd4qda47sxbq9ylxpfviz2ms29kby9ypsz2v",
       "depends": ["xegaSelectGene"]
     },
     "xegaGaGene": {
       "name": "xegaGaGene",
-      "version": "1.0.0.2",
-      "sha256": "0i1v178d7vr98syas7bw6k4s1i7mf8ndwk878dcb9lc0br0nvkdd",
+      "version": "1.0.0.4",
+      "sha256": "182vml7kmxnkvlqi13xrw1p86q1lchzki3pnc1gzk8f90ga1d27f",
       "depends": ["xegaSelectGene"]
     },
     "xegaGeGene": {
@@ -133191,8 +134121,8 @@
     },
     "xegaPopulation": {
       "name": "xegaPopulation",
-      "version": "1.0.0.7",
-      "sha256": "0gbiv9v83gda1mcr3k7lzp0am88k6hfr028yr38n2jnkbwz4zngc",
+      "version": "1.0.0.8",
+      "sha256": "0vj0rp7w6gc1cs6rgxmrnvpzfzvdrxrn62vh2xg1dnnna0z2q598",
       "depends": ["future_apply", "xegaGaGene", "xegaSelectGene"]
     },
     "xegaSelectGene": {
@@ -133299,8 +134229,8 @@
     },
     "xlsxjars": {
       "name": "xlsxjars",
-      "version": "0.6.1",
-      "sha256": "1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p",
+      "version": "0.9.0",
+      "sha256": "1h7bxqiz8ajpnrkalhkq1jyjbqsm98lajg0m802vcy5gkwz0jh28",
       "depends": ["rJava"]
     },
     "xmap": {
@@ -133413,8 +134343,8 @@
     },
     "xportr": {
       "name": "xportr",
-      "version": "0.4.2",
-      "sha256": "167m68ihi93gvxz3zr84mya50jpigbwr47s05g8xdn0jv1vifb7r",
+      "version": "0.4.3",
+      "sha256": "1dxi42813bxlpbd11gqyrm41v8qs772hkpg7y3gkrgvpmca4pf4w",
       "depends": ["checkmate", "cli", "dplyr", "glue", "haven", "lifecycle", "magrittr", "purrr", "readr", "rlang", "stringr", "tidyselect"]
     },
     "xpose": {
@@ -133425,8 +134355,8 @@
     },
     "xpose_nlmixr2": {
       "name": "xpose.nlmixr2",
-      "version": "0.4.0",
-      "sha256": "0scq6brd7sn1ybmacxlpdlmkwxbn9sc2gpzw6438fwfjss6sza8s",
+      "version": "0.4.1",
+      "sha256": "0a9asdq9d5g39bhb75ks698izbgs6x1npsq53b7kznl40kpcjc2a",
       "depends": ["crayon", "dplyr", "ggplot2", "magrittr", "nlmixr2est", "rlang", "stringr", "tibble", "tidyr", "vpc", "xpose"]
     },
     "xpose_xtras": {
@@ -133527,8 +134457,8 @@
     },
     "xxdi": {
       "name": "xxdi",
-      "version": "1.2.3",
-      "sha256": "07yjq9f6dw1xvd5map5aj42qhbgdqyla270vqn0h8x2h8wfqjfgq",
+      "version": "1.2.4",
+      "sha256": "1z332i1cyicbwargimma5m6rz1hb3zc2rpzgxcci3z7szjyxn5f8",
       "depends": ["Matrix", "agop", "dplyr", "ggplot2", "tidyr"]
     },
     "xxhashlite": {
@@ -133575,8 +134505,8 @@
     },
     "yamlet": {
       "name": "yamlet",
-      "version": "1.2.1",
-      "sha256": "0c8g97swjpxzf936k9z00d957xpdihzggf7m2qcp1mlcp4ahj7kg",
+      "version": "1.2.5",
+      "sha256": "0al7vdjgzmanwns512bphn2lg93c3iqn8hg4xsm8z4q3bj3j3qh8",
       "depends": ["csv", "dplyr", "encode", "ggplot2", "knitr", "pillar", "rlang", "scales", "spork", "tidyr", "units", "vctrs", "xtable", "yaml"]
     },
     "yamlme": {
@@ -133593,8 +134523,8 @@
     },
     "yarrr": {
       "name": "yarrr",
-      "version": "0.1.5",
-      "sha256": "1258bj7x4icaxfabnnd3fgwydnqbzxkih7zw0sdlwdax3q8fw5c5",
+      "version": "0.1.14",
+      "sha256": "0p7ir1danj4w6sillff40s34jakvl2kkclf53rq7kzlqyayn17ah",
       "depends": ["BayesFactor", "circlize", "jpeg"]
     },
     "yasp": {
@@ -133641,8 +134571,8 @@
     },
     "yhat": {
       "name": "yhat",
-      "version": "2.0-4",
-      "sha256": "0hzf6fns37jv67ssa6zwivpj2nlaykfjmj5y21dyh739i3102jnv",
+      "version": "2.0-5",
+      "sha256": "078p1vanm2zgsy9k4dvvhsflq5jikgl3fljybjh6s39bv1mxk46v",
       "depends": ["boot", "miscTools", "plotrix", "yacca"]
     },
     "yhatr": {
@@ -133743,9 +134673,9 @@
     },
     "zCompositions": {
       "name": "zCompositions",
-      "version": "1.5.0-4",
-      "sha256": "1bvaw6m95hz8hd5p8h1d482b45r3w82dyj3sxlijf12s0qg8w63k",
-      "depends": ["MASS", "NADA", "truncnorm"]
+      "version": "1.5.0-5",
+      "sha256": "07wqk5kyz4kvrzwsxd2bclckmj7bmbjzwmm4a4c19j71ia3irrx5",
+      "depends": ["MASS", "survival", "truncnorm"]
     },
     "zTree": {
       "name": "zTree",
@@ -133773,8 +134703,8 @@
     },
     "zdeskR": {
       "name": "zdeskR",
-      "version": "0.5.0",
-      "sha256": "1hpmpvbm58f6gvvxxl9bgs144nysk8p6dd9dfnnkppphchjchvdp",
+      "version": "0.6.0",
+      "sha256": "03lgg8hlv5wc2q7i9mc3nr9rpai5gxdnfyq6d69pssnzsg8mid11",
       "depends": ["dplyr", "httr", "jsonlite", "magrittr", "plyr", "purrr", "tidyr", "tidyselect"]
     },
     "zeallot": {
@@ -133797,8 +134727,8 @@
     },
     "zen4R": {
       "name": "zen4R",
-      "version": "0.10.1",
-      "sha256": "1b4fhj05h9y2pv6pkz3d5814bscdb1f6l4ismq72fi7lxbg6jjvj",
+      "version": "0.10.2",
+      "sha256": "19801lcnxy8g7c2pp1f1ris943xkb1ip9kkiim6zms079d39p1mr",
       "depends": ["R6", "XML", "atom4R", "cli", "httr", "jsonlite", "keyring", "plyr", "utf8", "xml2"]
     },
     "zendeskR": {
@@ -134007,8 +134937,8 @@
     },
     "zoomr": {
       "name": "zoomr",
-      "version": "0.3.0",
-      "sha256": "0yaxxv5jiv25rx737zqz901pmbfys7rpqpngnhy1w6wgfq2pfdnp",
+      "version": "0.4.0",
+      "sha256": "0l1ii1a0mk2drcrblfw5q4n5k2yihyh9pmn7nm0qs8al5zfkxfik",
       "depends": ["dplyr", "glue", "httr", "janitor", "jsonlite", "magrittr", "purrr", "rlang", "tidyr", "tidyselect"]
     },
     "zscorer": {
@@ -134102,6 +135032,13 @@
       "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "doParallel", "dplyr", "foreach", "ggplot2"],
       "broken": true
     },
+    "ADMUR": {
+      "name": "ADMUR",
+      "version": "1.0.3",
+      "sha256": "1wv5frav8vjkvsqwng9zddajmb7rdm4iqrikw9cjpqdpk7njl8ph",
+      "depends": ["mathjaxr", "scales", "zoo"],
+      "broken": true
+    },
     "ADSIHT": {
       "name": "ADSIHT",
       "version": "0.1.0",
@@ -134137,6 +135074,13 @@
       "depends": ["dplyr", "magrittr", "mgcv", "rgl"],
       "broken": true
     },
+    "ALEPlot": {
+      "name": "ALEPlot",
+      "version": "1.1",
+      "sha256": "0bakl8a7xda7vh9zsc66kkd5w5jmb5j28kfwpfq2ifvk2mrakr3w",
+      "depends": ["yaImpute"],
+      "broken": true
+    },
     "ALSM": {
       "name": "ALSM",
       "version": "0.2.0",
@@ -134396,13 +135340,6 @@
       "depends": ["discretization", "foreign", "functional", "stringr"],
       "broken": true
     },
-    "AnalyzeFMRI": {
-      "name": "AnalyzeFMRI",
-      "version": "1.1-24",
-      "sha256": "0qkhw6bik6s82h4yb5bashqjl8wfxarivvz6r5ffn9cgrvlwyahd",
-      "depends": ["fastICA", "R_matlab"],
-      "broken": true
-    },
     "AnimalAPD": {
       "name": "AnimalAPD",
       "version": "1.0.0",
@@ -134578,6 +135515,13 @@
       "depends": ["FME", "limSolve", "Matrix"],
       "broken": true
     },
+    "BCSub": {
+      "name": "BCSub",
+      "version": "0.5",
+      "sha256": "0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp",
+      "depends": ["MASS", "Rcpp", "RcppArmadillo", "mcclust", "nFactors"],
+      "broken": true
+    },
     "BCellMA": {
       "name": "BCellMA",
       "version": "0.3.4",
@@ -134704,6 +135648,13 @@
       "depends": ["Deriv", "dplyr", "extraDistr", "gamlss", "gamlss_dist", "ggplot2", "pracma"],
       "broken": true
     },
+    "BRVM": {
+      "name": "BRVM",
+      "version": "5.3.0",
+      "sha256": "0vkx0lbamfkmpcpd7kp85jqzf2fivp898yw0dvkgan8kkfqclra5",
+      "depends": ["dplyr", "fBasics", "formattable", "goftest", "gsheet", "highcharter", "httr", "httr2", "lubridate", "magrittr", "nortest", "rlang", "rvest", "stringr", "tibble", "tidyr", "timeDate", "tseries", "xml2", "xts"],
+      "broken": true
+    },
     "BRugs": {
       "name": "BRugs",
       "version": "0.9-2.1",
@@ -134816,6 +135767,13 @@
       "depends": [],
       "broken": true
     },
+    "BayesOrdDesign": {
+      "name": "BayesOrdDesign",
+      "version": "0.1.2",
+      "sha256": "1417zd1n5sip999n6q6bgs85c0000ksl73a4p94y0lmdn27i8pmj",
+      "depends": ["R2jags", "coda", "ggplot2", "gsDesign", "madness", "ordinal", "rjags", "rjmcmc", "schoolmath", "superdiag"],
+      "broken": true
+    },
     "BayesPiecewiseICAR": {
       "name": "BayesPiecewiseICAR",
       "version": "0.2.1",
@@ -135012,6 +135970,13 @@
       "depends": ["mvtnorm"],
       "broken": true
     },
+    "Bodi": {
+      "name": "Bodi",
+      "version": "0.1.0",
+      "sha256": "1z3xamj4qh3g5asrl3kbvcnx3r66mch34d0hlz9vg0498s9fwn6s",
+      "depends": ["gbm", "mgcv", "opera", "ranger", "rpart"],
+      "broken": true
+    },
     "Boov": {
       "name": "Boov",
       "version": "1.0.0",
@@ -135159,6 +136124,13 @@
       "depends": ["doSNOW", "foreach", "magrittr", "pbapply", "raster", "Rcpp", "snow", "sp"],
       "broken": true
     },
+    "CEOdata": {
+      "name": "CEOdata",
+      "version": "1.3.1.1",
+      "sha256": "0cf8d3qw2x2lww6hxw96b1b6dl6pq2n0w1ffl2d7870vcvzl3lwr",
+      "depends": ["dplyr", "haven", "jsonlite", "stringr", "urltools"],
+      "broken": true
+    },
     "CHCN": {
       "name": "CHCN",
       "version": "1.5",
@@ -135180,6 +136152,13 @@
       "depends": ["KernSmooth", "scatterplot3d"],
       "broken": true
     },
+    "CIDER": {
+      "name": "CIDER",
+      "version": "0.99.4",
+      "sha256": "16cv4w38x9zadc28x0z1hajfyy32vhf0w818zcqcakarrz6y7d08",
+      "depends": ["Seurat", "dbscan", "doParallel", "edgeR", "foreach", "ggplot2", "igraph", "kernlab", "limma", "pheatmap", "viridis"],
+      "broken": true
+    },
     "CIFsmry": {
       "name": "CIFsmry",
       "version": "1.0.1.1",
@@ -135600,6 +136579,13 @@
       "depends": [],
       "broken": true
     },
+    "ConfZIC": {
+      "name": "ConfZIC",
+      "version": "1.0.1",
+      "sha256": "0x9933zirfdkg2ljm3kk1nalk9ri0rrqi11q07dkyh78p4w9lmsp",
+      "depends": ["MuMIn", "cmna", "ltsa", "mvtnorm", "psych", "tidytable"],
+      "broken": true
+    },
     "ConfoundedMeta": {
       "name": "ConfoundedMeta",
       "version": "1.3.0",
@@ -135663,6 +136649,13 @@
       "depends": ["fdrtool", "pracma"],
       "broken": true
     },
+    "CovCombR": {
+      "name": "CovCombR",
+      "version": "1.0",
+      "sha256": "07yd0zbvc9db2jw6xigfhxnbkxwb3gxlmywadz7fs3rva2if2ffx",
+      "depends": ["CholWishart", "Matrix", "nlme"],
+      "broken": true
+    },
     "CovRegRF": {
       "name": "CovRegRF",
       "version": "2.0.1",
@@ -135768,6 +136761,13 @@
       "depends": ["car", "dplyr", "emmeans", "ggplot2", "ggpubr", "ggrepel", "psych", "readr", "reshape", "rstatix", "tibble"],
       "broken": true
     },
+    "DBEST": {
+      "name": "DBEST",
+      "version": "1.8",
+      "sha256": "1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy",
+      "depends": ["zoo"],
+      "broken": true
+    },
     "DBGSA": {
       "name": "DBGSA",
       "version": "1.2",
@@ -135810,6 +136810,13 @@
       "depends": ["igraph", "limma"],
       "broken": true
     },
+    "DCODE": {
+      "name": "DCODE",
+      "version": "1.0",
+      "sha256": "19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n",
+      "depends": ["seqinr"],
+      "broken": true
+    },
     "DDoutlier": {
       "name": "DDoutlier",
       "version": "0.1.0",
@@ -135859,6 +136866,13 @@
       "depends": ["ellipse", "MCMCpack", "mvtnorm"],
       "broken": true
     },
+    "DMwR2": {
+      "name": "DMwR2",
+      "version": "0.0.2",
+      "sha256": "1vzfbz2k05j8r2hpig3d2grb99rnnh2s1sviii3prcyqicxfh0i9",
+      "depends": ["DBI", "class", "dplyr", "quantmod", "readr", "rpart", "xts", "zoo"],
+      "broken": true
+    },
     "DNH4": {
       "name": "DNH4",
       "version": "0.1.12",
@@ -135880,6 +136894,13 @@
       "depends": ["lattice", "Matrix", "numDeriv"],
       "broken": true
     },
+    "DPBBM": {
+      "name": "DPBBM",
+      "version": "0.2.5",
+      "sha256": "1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2",
+      "depends": ["CEoptim", "VGAM", "gplots", "tmvtnorm"],
+      "broken": true
+    },
     "DPWeibull": {
       "name": "DPWeibull",
       "version": "1.8",
@@ -135922,6 +136943,13 @@
       "depends": ["aod", "ggplot2", "survival"],
       "broken": true
     },
+    "DTSR": {
+      "name": "DTSR",
+      "version": "0.2.0",
+      "sha256": "12rn5hh1vaf9j2vb8wai1m4ikm071d2s14ph7a6rh1hz1ag0mk8m",
+      "depends": ["DMwR2", "MASS", "cluster", "mvdalab"],
+      "broken": true
+    },
     "DUBStepR": {
       "name": "DUBStepR",
       "version": "1.2.0",
@@ -136118,6 +137146,13 @@
       "depends": ["doParallel", "foreach", "stringr"],
       "broken": true
     },
+    "DistributionIV": {
+      "name": "DistributionIV",
+      "version": "0.1.0",
+      "sha256": "0n1z2vq0avr0mmr0125zpv2qinwpnivrdjgfgnh9cx3ss76ghzam",
+      "depends": ["checkmate", "torch", "vctrs"],
+      "broken": true
+    },
     "DivInsight": {
       "name": "DivInsight",
       "version": "0.1.0",
@@ -136335,11 +137370,11 @@
       "depends": ["MASS", "mvtnorm"],
       "broken": true
     },
-    "EMMAgeo": {
-      "name": "EMMAgeo",
-      "version": "0.9.8",
-      "sha256": "1rcdqdy16x00fnry80rr6j6081p9zbkmhxxfv4k9izncagpm3gqk",
-      "depends": ["GPArotation", "caTools", "limSolve", "matrixStats", "shiny"],
+    "EMTscore": {
+      "name": "EMTscore",
+      "version": "0.1.1",
+      "sha256": "1ypchz5frnfn1val0hfr5hfcb4fx98sch7v45iddbp59n6bmfwly",
+      "depends": ["AUCell", "ComplexHeatmap", "GSA", "GSVA", "Seurat", "circlize", "curl", "doParallel", "dplyr", "foreach", "ggplot2", "ggpubr", "ggthemes", "gridExtra", "magrittr", "nsprcomp", "paletteer", "pheatmap", "stringr"],
       "broken": true
     },
     "EMVS": {
@@ -136657,13 +137692,6 @@
       "depends": ["gplots"],
       "broken": true
     },
-    "FLSSS": {
-      "name": "FLSSS",
-      "version": "9.1.8",
-      "sha256": "1ld0lrzwjj47gb95zii7v9qbp1dbiwww6hxq7vc82l6jlllsw3f6",
-      "depends": ["Rcpp", "RcppParallel"],
-      "broken": true
-    },
     "FPCA2D": {
       "name": "FPCA2D",
       "version": "1.0",
@@ -136762,6 +137790,13 @@
       "depends": ["BH", "Matrix", "Rcpp", "digest", "magrittr"],
       "broken": true
     },
+    "FeedbackTS": {
+      "name": "FeedbackTS",
+      "version": "1.5",
+      "sha256": "120labhmisw1x1bq8c4bl6l14vayvb9xcm6jsj1awacypgrr2ar2",
+      "depends": ["automap", "gstat", "mapdata", "maps", "proj4", "sp"],
+      "broken": true
+    },
     "FieldSim": {
       "name": "FieldSim",
       "version": "3.2.1",
@@ -136958,6 +137993,13 @@
       "depends": [],
       "broken": true
     },
+    "GDELTtools": {
+      "name": "GDELTtools",
+      "version": "1.7",
+      "sha256": "0v368chcgqnrfy2isy8z7gl0xizafhxlcd29gr89iblhrzwmssid",
+      "depends": ["datetimeutils", "dplyr", "plyr", "stringr"],
+      "broken": true
+    },
     "GENEAsphere": {
       "name": "GENEAsphere",
       "version": "1.5.1",
@@ -137035,6 +138077,13 @@
       "depends": ["GANPA", "WGCNA"],
       "broken": true
     },
+    "GPGame": {
+      "name": "GPGame",
+      "version": "1.2.0",
+      "sha256": "1xxilr1ify9ip3vs000jawxplcbf1vqli40frhnwwjqf01kj8jq5",
+      "depends": ["DiceDesign", "DiceKriging", "GPareto", "KrigInv", "MASS", "Rcpp", "matrixStats", "mnormt", "mvtnorm"],
+      "broken": true
+    },
     "GPIC": {
       "name": "GPIC",
       "version": "0.1.0",
@@ -137084,6 +138133,13 @@
       "depends": ["glmnet", "MASS", "randomForest", "ranger", "RPtests"],
       "broken": true
     },
+    "GRS_test": {
+      "name": "GRS.test",
+      "version": "1.2",
+      "sha256": "1g560n81kqf81n1z3s4yxl24r386q21avjknz6msqzp4xhxhr4l6",
+      "depends": [],
+      "broken": true
+    },
     "GSAfisherCombined": {
       "name": "GSAfisherCombined",
       "version": "1.0",
@@ -137112,6 +138168,13 @@
       "depends": ["rpanel", "tkrplot"],
       "broken": true
     },
+    "GUIProfiler": {
+      "name": "GUIProfiler",
+      "version": "2.0.1",
+      "sha256": "10m4d7f2rhw6cmkrnw3jh4iqlkfphf4v7mpfwzw17laq0ncmsx5r",
+      "depends": ["MASS", "Nozzle_R1", "Rgraphviz", "graph", "proftools", "rstudioapi"],
+      "broken": true
+    },
     "GWG": {
       "name": "GWG",
       "version": "1.0",
@@ -137140,6 +138203,13 @@
       "depends": ["Biostrings", "ape", "dendextend", "dplyr", "ggplot2", "heatmaply", "magrittr", "reshape2", "traits"],
       "broken": true
     },
+    "GameTheoryAllocation": {
+      "name": "GameTheoryAllocation",
+      "version": "1.0",
+      "sha256": "0733vmyr0d9scjd5ixpnggr548snd7nj70knf5hbzc59nmbc5y11",
+      "depends": ["e1071", "lpSolveAPI"],
+      "broken": true
+    },
     "GapAnalysis": {
       "name": "GapAnalysis",
       "version": "1.0.2",
@@ -137308,6 +138378,13 @@
       "depends": ["Matrix"],
       "broken": true
     },
+    "GrimR": {
+      "name": "GrimR",
+      "version": "0.5",
+      "sha256": "005ywc31yn1cs54kjlkrryw0s7zm8dqqfjkdlkm4s1sbc9r3mssz",
+      "depends": ["car"],
+      "broken": true
+    },
     "GuessCompx": {
       "name": "GuessCompx",
       "version": "1.0.3",
@@ -137504,13 +138581,6 @@
       "depends": ["kerdiest", "pbapply", "reliaR", "rgenoud", "sets", "triangle"],
       "broken": true
     },
-    "HaDeX": {
-      "name": "HaDeX",
-      "version": "1.2.2",
-      "sha256": "1qj6n03pd5kd5ff5h4v8wmnqxxylsxx1p6i88nahqkah2mzg9jdr",
-      "depends": ["DT", "data_table", "dplyr", "ggplot2", "gsubfn", "latex2exp", "readr", "readxl", "reshape2", "shiny", "stringr", "tidyr"],
-      "broken": true
-    },
     "HadoopStreaming": {
       "name": "HadoopStreaming",
       "version": "0.2",
@@ -137616,6 +138686,13 @@
       "depends": ["checkmate", "DiagrammeR", "dplyr", "graph", "magrittr", "nnet", "pixiedust", "plyr", "rjags", "stringr"],
       "broken": true
     },
+    "HydroMe": {
+      "name": "HydroMe",
+      "version": "2.1.1",
+      "sha256": "06fqzvpwh25qc9ksh49gpfyw8jgy9xbw27wlp8mxk0b2fq58fyqg",
+      "depends": [],
+      "broken": true
+    },
     "IAbin": {
       "name": "IAbin",
       "version": "1.0",
@@ -137700,6 +138777,13 @@
       "depends": ["DescTools", "doParallel", "doRNG", "foreach", "glmnet", "HDCI", "mathjaxr", "Matrix", "MatrixExtra", "parallelly", "S4Vectors", "stringr", "SummarizedExperiment"],
       "broken": true
     },
+    "IGCities": {
+      "name": "IGCities",
+      "version": "0.2.0",
+      "sha256": "1564bzvi6vgg9q8s97mxjwklr83vkcv8f526savkhnjxdzi1zmy0",
+      "depends": [],
+      "broken": true
+    },
     "IGG": {
       "name": "IGG",
       "version": "1.0",
@@ -137749,6 +138833,13 @@
       "depends": ["BH", "Rcpp", "assertthat", "magrittr"],
       "broken": true
     },
+    "IPCAPS": {
+      "name": "IPCAPS",
+      "version": "1.1.8",
+      "sha256": "17ifkgjjnvvcc8dp065ng4ad9lr85lcdcb401vi84yy8m2llbypw",
+      "depends": ["KRIS", "LPCM", "MASS", "Matrix", "Rmixmod", "apcluster", "expm", "fpc"],
+      "broken": true
+    },
     "IPDFileCheck": {
       "name": "IPDFileCheck",
       "version": "0.8.1",
@@ -137938,6 +139029,13 @@
       "depends": ["chron", "date"],
       "broken": true
     },
+    "Inventorymodel": {
+      "name": "Inventorymodel",
+      "version": "1.1.0.1",
+      "sha256": "0x36pkr2f038cwdfqi03pljhg6xwhp7v97ymyqddb5lw5a0isw87",
+      "depends": ["GameTheoryAllocation", "e1071"],
+      "broken": true
+    },
     "IsoCI": {
       "name": "IsoCI",
       "version": "1.1",
@@ -137973,6 +139071,13 @@
       "depends": ["colorspace", "ellipse", "fgui", "plotrix", "runjags"],
       "broken": true
     },
+    "JAGStree": {
+      "name": "JAGStree",
+      "version": "1.0.1",
+      "sha256": "1ybdbmvkxgk159ajfdxsf1i5rq56z1p5kx4ibgvns1s7gdadncrc",
+      "depends": ["AutoWMM", "DiagrammeR", "R2jags", "data_tree", "gtools", "mcmcplots", "tidyverse"],
+      "broken": true
+    },
     "JASPAR": {
       "name": "JASPAR",
       "version": "0.0.1",
@@ -137987,6 +139092,13 @@
       "depends": ["gee", "MASS"],
       "broken": true
     },
+    "JGL": {
+      "name": "JGL",
+      "version": "2.3.2",
+      "sha256": "0zsvr20vaxhkac2mdlqzd12xqpgw4yvx4bkqwgsbvhpl34pz7dy2",
+      "depends": ["igraph"],
+      "broken": true
+    },
     "JMcmprsk": {
       "name": "JMcmprsk",
       "version": "0.9.10",
@@ -138253,11 +139365,11 @@
       "depends": ["diagram", "limSolve"],
       "broken": true
     },
-    "LMest": {
-      "name": "LMest",
-      "version": "3.2.5",
-      "sha256": "0db9my1gvml2j625an7zivqavcbnishhpsi584d5z3qj7dm1lbb3",
-      "depends": ["Formula", "MASS", "MultiLCIRT", "diagram", "mclust", "mix", "mvtnorm", "scatterplot3d"],
+    "LIStest": {
+      "name": "LIStest",
+      "version": "2.1",
+      "sha256": "1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a",
+      "depends": [],
       "broken": true
     },
     "LOGANTree": {
@@ -138330,6 +139442,13 @@
       "depends": ["fields", "gam", "LICORS", "Matrix", "RColorBrewer"],
       "broken": true
     },
+    "LTAR": {
+      "name": "LTAR",
+      "version": "0.1.0",
+      "sha256": "0jn0fym0v6j9c7pam1samafph9fiqrdr141n3mqj9xks0vaqrqqh",
+      "depends": ["gsignal", "rTensor", "rTensor2", "vars"],
+      "broken": true
+    },
     "LTRCforests": {
       "name": "LTRCforests",
       "version": "0.7.0",
@@ -138470,6 +139589,13 @@
       "depends": [],
       "broken": true
     },
+    "LongMemoryTS": {
+      "name": "LongMemoryTS",
+      "version": "0.1.0",
+      "sha256": "0n378sad8i283vs7q63spdhwpwjly2d5zj15d4v2085j7sc7z8vi",
+      "depends": ["Rcpp", "RcppArmadillo", "fracdiff", "longmemo", "mvtnorm", "partitions"],
+      "broken": true
+    },
     "LotkasLaw": {
       "name": "LotkasLaw",
       "version": "0.0.1.0",
@@ -138519,13 +139645,6 @@
       "depends": [],
       "broken": true
     },
-    "MAVE": {
-      "name": "MAVE",
-      "version": "1.3.11",
-      "sha256": "01n204bxabbm8pcpayy2s0jvhg73r5cv0026lb3vbk0m40z02kcz",
-      "depends": ["Rcpp", "RcppArmadillo", "mda"],
-      "broken": true
-    },
     "MAVTgsa": {
       "name": "MAVTgsa",
       "version": "1.3",
@@ -138575,6 +139694,13 @@
       "depends": ["RankAggreg"],
       "broken": true
     },
+    "MCMC_OTU": {
+      "name": "MCMC.OTU",
+      "version": "1.0.10",
+      "sha256": "1h1b0lw7d96q47sgq3px8j6rbkyhxhykm1c891px89khgg6hnszc",
+      "depends": ["MCMCglmm", "coda", "ggplot2"],
+      "broken": true
+    },
     "MCMChybridGP": {
       "name": "MCMChybridGP",
       "version": "5.4",
@@ -138638,6 +139764,13 @@
       "depends": ["deldir", "depth", "depthTools", "fda_usc", "matrixStats"],
       "broken": true
     },
+    "MG1StationaryProbability": {
+      "name": "MG1StationaryProbability",
+      "version": "0.1.2",
+      "sha256": "151ygjpykc9jccfh6jhgywg82j006a8yqba6nvzhd1v9qb60yd4a",
+      "depends": ["doParallel", "foreach", "memoise"],
+      "broken": true
+    },
     "MGDrivE": {
       "name": "MGDrivE",
       "version": "1.6.0",
@@ -138645,6 +139778,13 @@
       "depends": ["R6", "Rcpp", "Rdpack"],
       "broken": true
     },
+    "MGDrivE2": {
+      "name": "MGDrivE2",
+      "version": "2.1.0",
+      "sha256": "1n7kmn65v6fb372jyqcsqnn01xvwyascqn881avd2iclrajr6h7p",
+      "depends": ["Matrix", "deSolve", "statmod"],
+      "broken": true
+    },
     "MGRASTer": {
       "name": "MGRASTer",
       "version": "0.9",
@@ -138722,13 +139862,6 @@
       "depends": ["glasso", "MASS", "testthat", "trust"],
       "broken": true
     },
-    "MLCIRTwithin": {
-      "name": "MLCIRTwithin",
-      "version": "2.1.1",
-      "sha256": "1x0xmka7kkbjnh3yv4zxxyl17cpmf0rb9hxmdl1srb6ijld4np1b",
-      "depends": ["MASS", "MultiLCIRT", "limSolve"],
-      "broken": true
-    },
     "MLCOPULA": {
       "name": "MLCOPULA",
       "version": "1.0.1",
@@ -138876,13 +140009,6 @@
       "depends": [],
       "broken": true
     },
-    "MRG": {
-      "name": "MRG",
-      "version": "0.3.1",
-      "sha256": "1n72qcmc7fn4rbxhkdjj1nxkq82kq3rsflg64dry31misfss41qy",
-      "depends": ["dplyr", "magrittr", "plyr", "purrr", "rlang", "sf", "sjmisc", "stars", "terra", "tidyr", "tidyselect", "vardpoor"],
-      "broken": true
-    },
     "MRH": {
       "name": "MRH",
       "version": "2.2",
@@ -138925,6 +140051,13 @@
       "depends": ["rgl"],
       "broken": true
     },
+    "MTest": {
+      "name": "MTest",
+      "version": "1.0.2",
+      "sha256": "19sz6s5hbrvm4jv54hv8g3d2ixf9pk72ch5j9418skal4dawh1yn",
+      "depends": ["car", "ggplot2", "plotly"],
+      "broken": true
+    },
     "MVB": {
       "name": "MVB",
       "version": "1.1",
@@ -139037,6 +140170,13 @@
       "depends": ["lavaan", "Matrix", "survey"],
       "broken": true
     },
+    "Mega2R": {
+      "name": "Mega2R",
+      "version": "1.1.0",
+      "sha256": "05g0r7z6kiy0pgl7cbcc3c0wbf4wbc7fxdbha8sc77m3hqya882l",
+      "depends": ["AnnotationDbi", "DBI", "GenomeInfoDb", "RSQLite", "Rcpp", "SKAT", "famSKATRC", "gdsfmt", "kinship2", "pedgene"],
+      "broken": true
+    },
     "MeshesOperations": {
       "name": "MeshesOperations",
       "version": "0.1.0",
@@ -139226,6 +140366,13 @@
       "depends": ["lme4"],
       "broken": true
     },
+    "MixSemiRob": {
+      "name": "MixSemiRob",
+      "version": "1.1.0",
+      "sha256": "0rvpwb4skd5s0f7qnm2mjrhfz4ppa6inqyfz970mpycihig3vilc",
+      "depends": ["GoFKernel", "MASS", "Rlab", "mixtools", "mvtnorm", "pracma", "quadprog", "robustbase", "ucminf"],
+      "broken": true
+    },
     "MixtureInf": {
       "name": "MixtureInf",
       "version": "1.1",
@@ -139275,6 +140422,13 @@
       "depends": ["compare", "doParallel", "foreach", "iterators", "sitar"],
       "broken": true
     },
+    "Morphoscape": {
+      "name": "Morphoscape",
+      "version": "1.0.2",
+      "sha256": "1f4cj5086r1849dwmha8drf7jq56p7bp0fj2liqksppy7gxmdrs4",
+      "depends": ["alphahull", "automap", "concaveman", "ggplot2", "scales", "sp", "spatial", "viridisLite"],
+      "broken": true
+    },
     "MorseGen": {
       "name": "MorseGen",
       "version": "1.2",
@@ -139338,13 +140492,6 @@
       "depends": ["matlab"],
       "broken": true
     },
-    "MultiLCIRT": {
-      "name": "MultiLCIRT",
-      "version": "2.11",
-      "sha256": "1qls0qp5fz377h50lvpzq3vkw49i3nvizli98gss50nqci8ssqm4",
-      "depends": ["MASS", "limSolve"],
-      "broken": true
-    },
     "MultiRR": {
       "name": "MultiRR",
       "version": "1.1",
@@ -139359,6 +140506,13 @@
       "depends": ["nlme", "reshape"],
       "broken": true
     },
+    "MultiVarSel": {
+      "name": "MultiVarSel",
+      "version": "1.1.3",
+      "sha256": "18wcw80m5knv6hbzczjsx3lf7sn9n84z12zz844agp6234im163p",
+      "depends": ["Matrix", "glmnet"],
+      "broken": true
+    },
     "Multiaovbay": {
       "name": "Multiaovbay",
       "version": "0.1.0",
@@ -139380,6 +140534,20 @@
       "depends": ["rJava"],
       "broken": true
     },
+    "NADA": {
+      "name": "NADA",
+      "version": "1.6-1.1",
+      "sha256": "0jp4mqr77cx7q5lff84s6wb0dwjy9mi0jyhbjc5fsx50bdczc3v7",
+      "depends": ["survival"],
+      "broken": true
+    },
+    "NADA2": {
+      "name": "NADA2",
+      "version": "1.1.8",
+      "sha256": "0m06kbx7z9ad7f3xf0r6gh1rbrgin2lcsc4hvdfsrayq1n4zfdap",
+      "depends": ["EnvStats", "Kendall", "NADA", "cenGAM", "coin", "fitdistrplus", "mgcv", "multcomp", "perm", "survival", "survminer", "vegan"],
+      "broken": true
+    },
     "NADIA": {
       "name": "NADIA",
       "version": "0.4.2",
@@ -139457,11 +140625,11 @@
       "depends": [],
       "broken": true
     },
-    "NMRphasing": {
-      "name": "NMRphasing",
-      "version": "1.0.6",
-      "sha256": "1s71n8mwqw3fazcgvdisk9m1s25x033v1id80mvra78kpalw3vzg",
-      "depends": ["MassSpecWavelet", "baseline", "signal"],
+    "NMADiagT": {
+      "name": "NMADiagT",
+      "version": "0.1.2",
+      "sha256": "0fskc3ldfdl17gazpfr2hixy79n7db4c1f5yl1jalhwxiabnxjwp",
+      "depends": ["MASS", "MCMCpack", "Rdpack", "coda", "ggplot2", "imguR", "ks", "plotrix", "reshape2", "rjags"],
       "broken": true
     },
     "NMproject": {
@@ -139611,6 +140779,13 @@
       "depends": ["histogram", "optimx"],
       "broken": true
     },
+    "Nozzle_R1": {
+      "name": "Nozzle.R1",
+      "version": "1.1-1.1",
+      "sha256": "0fanf7cl8dlb8iqw8ww03dd5s6mrpr97m2c511clqkaavbd0yzkp",
+      "depends": [],
+      "broken": true
+    },
     "OCA": {
       "name": "OCA",
       "version": "0.5",
@@ -139681,6 +140856,13 @@
       "depends": ["modi"],
       "broken": true
     },
+    "OOS": {
+      "name": "OOS",
+      "version": "1.0.0",
+      "sha256": "0jnj5y26rv0i2561mywcxb7aavmpq16ippq6rblb8jiqjd05nhib",
+      "depends": ["caret", "dplyr", "forecast", "furrr", "future", "ggplot2", "glmnet", "imputeTS", "lmtest", "lubridate", "magrittr", "purrr", "sandwich", "tidyr", "vars", "xts", "zoo"],
+      "broken": true
+    },
     "OOmisc": {
       "name": "OOmisc",
       "version": "1.2",
@@ -139716,6 +140898,13 @@
       "depends": ["cluster", "distances", "doParallel", "doRNG", "foreach", "plyr", "Rfast"],
       "broken": true
     },
+    "OSTE": {
+      "name": "OSTE",
+      "version": "1.0",
+      "sha256": "0l8whr883g3jp5ckgxr4zf9vj055jrjb7pfraacd15smnrbl0v5d",
+      "depends": ["pec", "prodlim", "ranger", "survival"],
+      "broken": true
+    },
     "OjaNP": {
       "name": "OjaNP",
       "version": "1.0-0",
@@ -139856,13 +141045,6 @@
       "depends": ["cluster", "GO_db"],
       "broken": true
     },
-    "PANPRSnext": {
-      "name": "PANPRSnext",
-      "version": "1.2.0",
-      "sha256": "1s9kv58af7hj65qxcnrsfjrh8xfqhm5m4kpg279li5b4g4cpnqx9",
-      "depends": ["Rcpp", "RcppArmadillo", "gtools"],
-      "broken": true
-    },
     "PAsso": {
       "name": "PAsso",
       "version": "0.1.10",
@@ -140206,6 +141388,13 @@
       "depends": [],
       "broken": true
     },
+    "PointedSDMs": {
+      "name": "PointedSDMs",
+      "version": "2.1.3",
+      "sha256": "1gscdi8gzl9hd794iwxvl41m2jrhh3chb8h7dxqghln1s1bqi6g3",
+      "depends": ["FNN", "R6", "R_devices", "blockCV", "fmesher", "ggplot2", "inlabru", "raster", "sf", "sp", "terra"],
+      "broken": true
+    },
     "PoissonSeq": {
       "name": "PoissonSeq",
       "version": "1.1.2",
@@ -140213,6 +141402,13 @@
       "depends": ["combinat"],
       "broken": true
     },
+    "PolyTrend": {
+      "name": "PolyTrend",
+      "version": "1.2",
+      "sha256": "17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5",
+      "depends": [],
+      "broken": true
+    },
     "PolygonSoup": {
       "name": "PolygonSoup",
       "version": "1.0.1",
@@ -140255,13 +141451,6 @@
       "depends": ["ggplot2", "rJava", "zoo"],
       "broken": true
     },
-    "PoweR": {
-      "name": "PoweR",
-      "version": "1.0.7",
-      "sha256": "040wc7hxa8y6bm1rs7ip2skdxmmwksxkyb6xzqgdjp8m7a25fppb",
-      "depends": ["Rcpp", "RcppArmadillo"],
-      "broken": true
-    },
     "PowerNormal": {
       "name": "PowerNormal",
       "version": "1.2.0",
@@ -140612,13 +141801,6 @@
       "depends": [],
       "broken": true
     },
-    "RDML": {
-      "name": "RDML",
-      "version": "1.0",
-      "sha256": "13ly1p42njbcygwvkyii8sjqbsywjy5w5g1kd7m8kswi5dsk3qqv",
-      "depends": ["R6", "checkmate", "data_table", "lubridate", "pipeR", "readxl", "rlist", "stringr", "xml2"],
-      "broken": true
-    },
     "RDSTK": {
       "name": "RDSTK",
       "version": "1.1",
@@ -140787,6 +141969,13 @@
       "depends": ["RRNA"],
       "broken": true
     },
+    "RNCBIEUtilsLibs": {
+      "name": "RNCBIEUtilsLibs",
+      "version": "0.9",
+      "sha256": "1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba",
+      "depends": ["rJava"],
+      "broken": true
+    },
     "RNRCS": {
       "name": "RNRCS",
       "version": "0.2.5",
@@ -140878,6 +142067,13 @@
       "depends": ["ncdf4", "raster", "rasterVis", "rgdal", "sp"],
       "broken": true
     },
+    "RSP": {
+      "name": "RSP",
+      "version": "0.4",
+      "sha256": "126lag0i2k4fwlr7gnc9jfn63pyi6d6gzzmypyr6jk666pwsk5f6",
+      "depends": ["DT", "GPArotation", "MVN", "Metrics", "ShinyItemAnalysis", "catR", "foreign", "ggplot2", "gt", "hornpa", "igraph", "lavaan", "ltm", "mirt", "plyr", "polycor", "psych", "rJava", "rstudioapi", "scales", "semPlot", "shiny", "shinyBS", "shinyWidgets", "shinycustomloader", "shinyjs", "shinythemes", "xlsx"],
+      "broken": true
+    },
     "RSPS": {
       "name": "RSPS",
       "version": "1.0",
@@ -141116,6 +142312,13 @@
       "depends": ["optextras"],
       "broken": true
     },
+    "RchivalTag": {
+      "name": "RchivalTag",
+      "version": "0.1.9",
+      "sha256": "0sz6hmcpsgp5am5g89q15was8im6wr2c18fjsychjxngj6ii0cy0",
+      "depends": ["cleangeo", "dygraphs", "ggedit", "ggplot2", "htmlwidgets", "leaflet", "leaflet_extras2", "lubridate", "mapdata", "maps", "ncdf4", "oceanmap", "plotly", "plyr", "pracma", "raster", "readr", "sf", "shiny", "sp", "stringr", "suntools", "xts"],
+      "broken": true
+    },
     "RclusTool": {
       "name": "RclusTool",
       "version": "0.91.6",
@@ -141123,6 +142326,13 @@
       "depends": ["FactoMineR", "MASS", "SearchTrees", "class", "cluster", "conclust", "corrplot", "e1071", "factoextra", "ggplot2", "jpeg", "knitr", "mclust", "mda", "mmand", "nnet", "png", "randomForest", "reshape", "rlang", "sp", "stringi", "stringr", "tcltk2", "tkrplot"],
       "broken": true
     },
+    "RcmdrPlugin_BiclustGUI": {
+      "name": "RcmdrPlugin.BiclustGUI",
+      "version": "1.1.3.1",
+      "sha256": "1wb1pbwghq1xxpwlihfixx42yf1f1py3hdwh8sfpqklh63ymwifk",
+      "depends": ["BcDiag", "BiBitR", "BicARE", "Rcmdr", "biclust", "fabia", "gplots", "iBBiG", "s4vd", "superbiclust", "viridis"],
+      "broken": true
+    },
     "RcmdrPlugin_EcoVirtual": {
       "name": "RcmdrPlugin.EcoVirtual",
       "version": "1.0",
@@ -141347,6 +142557,13 @@
       "depends": ["XML", "ggplot2", "plyr", "rentrez"],
       "broken": true
     },
+    "RevEcoR": {
+      "name": "RevEcoR",
+      "version": "0.99.3",
+      "sha256": "1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj",
+      "depends": ["Matrix", "XML", "gtools", "igraph", "magrittr", "plyr", "purrr", "stringr"],
+      "broken": true
+    },
     "Rga4gh": {
       "name": "Rga4gh",
       "version": "0.1.1",
@@ -141452,13 +142669,6 @@
       "depends": ["data_table", "igraph", "markovchain", "tm"],
       "broken": true
     },
-    "RobustCalibration": {
-      "name": "RobustCalibration",
-      "version": "0.5.5",
-      "sha256": "0ilbj88bgjymyyn7jh7dnxhhba7xrmpsnhkwr1cr53zd9rpywfdf",
-      "depends": ["Rcpp", "RcppEigen", "RobustGaSP", "nloptr"],
-      "broken": true
-    },
     "Rodam": {
       "name": "Rodam",
       "version": "0.1.14",
@@ -141501,11 +142711,11 @@
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack"],
       "broken": true
     },
-    "Rquefts": {
-      "name": "Rquefts",
-      "version": "1.2-4",
-      "sha256": "144hmgapzk8w2cv0gmyr67ivs683djv7k8i0ciihb4gl7rp55ppg",
-      "depends": ["Rcpp", "meteor"],
+    "Rraven": {
+      "name": "Rraven",
+      "version": "1.0.14",
+      "sha256": "1sfzsf1f758sicild58hi5lqbs1vmzma9znni3is2vlcsn9pyn5s",
+      "depends": ["pbapply", "seewave", "tuneR", "warbleR"],
       "broken": true
     },
     "Rrdrand": {
@@ -141543,6 +142753,13 @@
       "depends": ["colourpicker", "devtools", "dplyr", "DT", "FSelector", "ggplot2", "ggthemes", "officer", "plotly", "rlang", "rmarkdown", "shiny", "shinyBS", "shinydashboard", "shinyjs", "tidyr"],
       "broken": true
     },
+    "Rtwalk": {
+      "name": "Rtwalk",
+      "version": "1.8.0",
+      "sha256": "0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5",
+      "depends": [],
+      "broken": true
+    },
     "Runiversal": {
       "name": "Runiversal",
       "version": "1.0.2",
@@ -141564,6 +142781,13 @@
       "depends": ["Rcpp"],
       "broken": true
     },
+    "Rwclust": {
+      "name": "Rwclust",
+      "version": "0.1.0",
+      "sha256": "0c7q2i9n22sqj3wq9m0j49y5h14848myjbixrdkic8lvv91dm438",
+      "depends": ["Matrix", "checkmate"],
+      "broken": true
+    },
     "Rwinsteps": {
       "name": "Rwinsteps",
       "version": "1.0-1.1",
@@ -141634,6 +142858,13 @@
       "depends": [],
       "broken": true
     },
+    "SASmarkdown": {
+      "name": "SASmarkdown",
+      "version": "0.8.2",
+      "sha256": "0xrrmb2zmm0mdg4akm5rnzbxxx690w9mv90mp830kbs42i0haqqg",
+      "depends": ["knitr", "xfun"],
+      "broken": true
+    },
     "SASxport": {
       "name": "SASxport",
       "version": "1.7.0",
@@ -141648,6 +142879,13 @@
       "depends": ["coda", "DiceKriging"],
       "broken": true
     },
+    "SBMTrees": {
+      "name": "SBMTrees",
+      "version": "1.2",
+      "sha256": "00mj0k4id9gqkyvf74h32yiw4k7jy53q5r7kk00k1clkf2dqkns1",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppDist", "RcppProgress", "arm", "dplyr", "lme4", "mice", "mvtnorm", "nnet", "sn", "tidyr"],
+      "broken": true
+    },
     "SBRect": {
       "name": "SBRect",
       "version": "0.26",
@@ -141676,6 +142914,20 @@
       "depends": [],
       "broken": true
     },
+    "SCEM": {
+      "name": "SCEM",
+      "version": "1.1.0",
+      "sha256": "1fxxkv965gb0wq06rclv05xxlzk8p9l8hzbnqcf0nbbymyn73fqr",
+      "depends": ["devtools", "mathjaxr"],
+      "broken": true
+    },
+    "SCIntRuler": {
+      "name": "SCIntRuler",
+      "version": "0.99.6",
+      "sha256": "1ap23iighbx1x3blfh0b9srgk5mzinl3gy0addfwd6i40a160brp",
+      "depends": ["Matrix", "MatrixGenerics", "Rcpp", "Seurat", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "batchelor", "coin", "cowplot", "dplyr", "ggplot2", "gridExtra", "harmony", "magrittr"],
+      "broken": true
+    },
     "SCORER2": {
       "name": "SCORER2",
       "version": "0.99.0",
@@ -141690,6 +142942,13 @@
       "depends": ["doParallel", "dplyr", "foreach", "ggplot2", "Rcpp", "RcppArmadillo", "RcppProgress"],
       "broken": true
     },
+    "SCRIP": {
+      "name": "SCRIP",
+      "version": "1.0.0",
+      "sha256": "1cv8443y2s67q3krsyj7r2d1vqv01w8xr0iz8dz4kijmhksyg7ng",
+      "depends": ["BiocGenerics", "BiocManager", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "checkmate", "crayon", "edgeR", "fitdistrplus", "knitr", "mgcv", "splatter"],
+      "broken": true
+    },
     "SCRSELECT": {
       "name": "SCRSELECT",
       "version": "1.3-3",
@@ -141963,6 +143222,20 @@
       "depends": [],
       "broken": true
     },
+    "SPUTNIK": {
+      "name": "SPUTNIK",
+      "version": "1.4.2",
+      "sha256": "1jp1gprib1ppwnsgr7457b48ljlb70s2rzccq660d5lrngs8afca",
+      "depends": ["doSNOW", "e1071", "edgeR", "foreach", "ggplot2", "imager", "infotheo", "irlba", "reshape", "spatstat_explore", "spatstat_geom", "viridis"],
+      "broken": true
+    },
+    "SPmlficmcm": {
+      "name": "SPmlficmcm",
+      "version": "1.4",
+      "sha256": "1acs3560a7h6xx286m40abr9b7i5qihn6wni8flj0biahmsszzx6",
+      "depends": ["nleqslv"],
+      "broken": true
+    },
     "SQB": {
       "name": "SQB",
       "version": "0.4",
@@ -142054,6 +143327,13 @@
       "depends": [],
       "broken": true
     },
+    "SUNGEO": {
+      "name": "SUNGEO",
+      "version": "1.3.0",
+      "sha256": "0ydwsrgqknngx7567xwfhwj1jdmi4ip1jxkb5jdy41f7ysy1myd0",
+      "depends": ["RANN", "RCurl", "Rcpp", "automap", "cartogram", "data_table", "dplyr", "httr", "jsonlite", "measurements", "packcircles", "purrr", "raster", "rlang", "rmapshaper", "sf", "spdep", "stringr", "terra"],
+      "broken": true
+    },
     "SVMMatch": {
       "name": "SVMMatch",
       "version": "1.1",
@@ -142117,6 +143397,13 @@
       "depends": ["fdrtool", "pracma"],
       "broken": true
     },
+    "SeedCalc": {
+      "name": "SeedCalc",
+      "version": "1.0.0",
+      "sha256": "1p8ncf3l2zhpbbblpjagg8cg9gf7f2izdcgc48n1aq4f7bmjbqgk",
+      "depends": [],
+      "broken": true
+    },
     "SeedMatchR": {
       "name": "SeedMatchR",
       "version": "1.1.1",
@@ -142173,6 +143460,13 @@
       "depends": ["sp"],
       "broken": true
     },
+    "Select": {
+      "name": "Select",
+      "version": "1.4",
+      "sha256": "1qx4wwxxwjq31vf645xvwb0y2z5h4v6ca8fcrfpaj5kc33f333v2",
+      "depends": ["FD", "Rsolnp", "ade4", "lattice", "latticeExtra"],
+      "broken": true
+    },
     "SelvarMix": {
       "name": "SelvarMix",
       "version": "1.2.1",
@@ -142222,6 +143516,13 @@
       "depends": ["EBImage", "R6", "shiny", "shinyjs"],
       "broken": true
     },
+    "SigTree": {
+      "name": "SigTree",
+      "version": "1.10.6",
+      "sha256": "18gh7azjr979ijc2y4yyskj24ay697rw3j7znc5p4a63s4vpxr9w",
+      "depends": ["MASS", "RColorBrewer", "ape", "phyext2", "phylobase", "phyloseq", "vegan"],
+      "broken": true
+    },
     "SimEvolEnzCons": {
       "name": "SimEvolEnzCons",
       "version": "2.0.0",
@@ -142516,6 +143817,13 @@
       "depends": ["data_table"],
       "broken": true
     },
+    "Statamarkdown": {
+      "name": "Statamarkdown",
+      "version": "0.9.2",
+      "sha256": "1ir2qh492q0rn6rwnmvj2cxqsssmsd5hm9vlyg0r7dk22grh19z0",
+      "depends": ["knitr", "xfun"],
+      "broken": true
+    },
     "Statsomat": {
       "name": "Statsomat",
       "version": "1.1.0",
@@ -142740,6 +144048,13 @@
       "depends": ["Biobase", "ComplexHeatmap", "GGally", "Mfuzz", "RColorBrewer", "Rtsne", "UpSetR", "WGCNA", "circlize", "clusterProfiler", "cowplot", "dplyr", "e1071", "factoextra", "ggcorrplot", "ggforce", "ggnewscale", "ggplot2", "ggplotify", "ggpolypath", "ggpubr", "ggrepel", "ggsci", "igraph", "pheatmap", "plotrix", "randomcoloR", "reshape2", "shiny", "stringr", "survival", "survminer", "tidyr", "umap", "vegan", "venn"],
       "broken": true
     },
+    "TP_idm": {
+      "name": "TP.idm",
+      "version": "1.5.1",
+      "sha256": "0w8sgzm5bmv9m16dryxpw51q000mfmbipxqnhb26bkzr6y46bd79",
+      "depends": [],
+      "broken": true
+    },
     "TPCselect": {
       "name": "TPCselect",
       "version": "0.8.3",
@@ -142922,6 +144237,13 @@
       "depends": ["MASS", "pracma", "tensorregress"],
       "broken": true
     },
+    "TensorTools": {
+      "name": "TensorTools",
+      "version": "1.0.0",
+      "sha256": "0x16raj8xhjzjhrpj9l5rz66rfiy8hf6ap3l7gqmx53vfk3fpsqq",
+      "depends": ["Matrix", "gsignal", "matrixcalc", "png", "raster", "wavethresh"],
+      "broken": true
+    },
     "Thermistor": {
       "name": "Thermistor",
       "version": "1.1.0",
@@ -143090,6 +144412,13 @@
       "depends": ["dplyr", "ggplot2", "gridExtra", "lubridate", "magrittr", "PAutilities", "pROC", "RcppRoll", "rlang", "tidyr"],
       "broken": true
     },
+    "UBL": {
+      "name": "UBL",
+      "version": "0.0.9",
+      "sha256": "1jpm41la5210a9shak01fsgq2yw8l1cz5zbb5zlas2nc2jg7hslh",
+      "depends": ["MBA", "automap", "gstat", "randomForest", "sp"],
+      "broken": true
+    },
     "UMR": {
       "name": "UMR",
       "version": "1.1.0",
@@ -143188,13 +144517,6 @@
       "depends": ["HI", "minqa", "mvnfast"],
       "broken": true
     },
-    "VARtests": {
-      "name": "VARtests",
-      "version": "2.0.5",
-      "sha256": "0gmm2qrrl4v5vx0nhiwq5brvanhybpb2q0zlf4dihramhjjbwyar",
-      "depends": ["Rcpp", "RcppArmadillo", "sn"],
-      "broken": true
-    },
     "VHDClassification": {
       "name": "VHDClassification",
       "version": "0.3",
@@ -143216,6 +144538,13 @@
       "depends": [],
       "broken": true
     },
+    "VIRF": {
+      "name": "VIRF",
+      "version": "0.1.0",
+      "sha256": "0bdkmbmkmmj78h9x025qsdzjzcx8xr2s98wlspcsghlz4hxkzcas",
+      "depends": ["BigVAR", "expm", "gnm", "ks", "matlib", "matrixcalc", "mgarchBEKK", "rmgarch"],
+      "broken": true
+    },
     "VNM": {
       "name": "VNM",
       "version": "7.1",
@@ -143545,13 +144874,6 @@
       "depends": ["geosphere", "ggplot2", "googledrive", "gstat", "gtsummary", "kableExtra", "maps", "purrr", "raster", "rnaturalearth", "sf", "sp", "swfscMisc", "table1", "tmap"],
       "broken": true
     },
-    "abn": {
-      "name": "abn",
-      "version": "3.1.1",
-      "sha256": "1sixgahjcy82yiiixgxiqbm8jcajqz0m3h0hwwm202iwzi3vyhiv",
-      "depends": ["Rcpp", "RcppArmadillo", "Rgraphviz", "doParallel", "foreach", "graph", "lme4", "mclogit", "nnet", "rjags", "stringi"],
-      "broken": true
-    },
     "acmeR": {
       "name": "acmeR",
       "version": "1.1.0",
@@ -143671,6 +144993,13 @@
       "depends": ["clusterCrit", "dplyr", "ggplot2", "Hmisc", "kml", "signal"],
       "broken": true
     },
+    "ale": {
+      "name": "ale",
+      "version": "0.5.0",
+      "sha256": "19yp1zlhjbzb0qszzc6kszg4mr6cyi7zzllpkzw7q3spjcq7kmpw",
+      "depends": ["S7", "broom", "cli", "dplyr", "furrr", "future", "ggplot2", "insight", "patchwork", "progressr", "purrr", "rlang", "staccuracy", "stringr", "tidyr", "univariateML"],
+      "broken": true
+    },
     "alignfigR": {
       "name": "alignfigR",
       "version": "0.1.1",
@@ -143776,13 +145105,6 @@
       "depends": ["ape", "coda", "cubature", "pbapply", "quantreg"],
       "broken": true
     },
-    "apc": {
-      "name": "apc",
-      "version": "2.0.0",
-      "sha256": "0vh6iyxm46k8sfa1xgz0y6m619snnm8s072kml5qgiiw5s7bqnpq",
-      "depends": ["AER", "ChainLadder", "ISLR", "car", "ggplot2", "lattice", "lmtest", "plm", "plyr", "reshape", "survey"],
-      "broken": true
-    },
     "aphylo": {
       "name": "aphylo",
       "version": "0.3-4",
@@ -144070,6 +145392,13 @@
       "depends": ["checkmate", "cli", "glue", "httr", "jsonlite", "magrittr", "ows4R", "R6", "sf", "stringr"],
       "broken": true
     },
+    "autoGO": {
+      "name": "autoGO",
+      "version": "1.0.1",
+      "sha256": "0gd7kgnq390wzg5j1v8x4793mdc5hjyyag1b7hibkjqan2jfzj0q",
+      "depends": ["ComplexHeatmap", "DESeq2", "GSVA", "RColorBrewer", "SummarizedExperiment", "ape", "dichromat", "dplyr", "enrichR", "ggplot2", "ggrepel", "imguR", "msigdbr", "openxlsx", "purrr", "readr", "reshape2", "stringr", "textshape", "tibble", "tidyr", "tidyselect"],
+      "broken": true
+    },
     "autocart": {
       "name": "autocart",
       "version": "1.4.5",
@@ -144126,6 +145455,13 @@
       "depends": [],
       "broken": true
     },
+    "baRulho": {
+      "name": "baRulho",
+      "version": "2.1.3",
+      "sha256": "15mk65an0cg4mvhiyh4xksb11wdpm6b7prpdc978zgw2i0xsw5qj",
+      "depends": ["Sim_DiffProc", "checkmate", "cli", "fftw", "ohun", "png", "rlang", "seewave", "tuneR", "viridis", "warbleR"],
+      "broken": true
+    },
     "babar": {
       "name": "babar",
       "version": "1.0",
@@ -144259,6 +145595,13 @@
       "depends": ["coda", "lattice", "MASS", "MCMCpack", "RColorBrewer"],
       "broken": true
     },
+    "bayou": {
+      "name": "bayou",
+      "version": "2.3.1",
+      "sha256": "0i0zkag8mrjdr7w4489gp6bf5mykcnnwgi31ypjk52y09haz7a5n",
+      "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "ape", "assertthat", "coda", "denstrip", "fitdistrplus", "foreach", "geiger", "mnormt", "phytools"],
+      "broken": true
+    },
     "bazar": {
       "name": "bazar",
       "version": "1.0.11",
@@ -144588,6 +145931,13 @@
       "depends": [],
       "broken": true
     },
+    "bisectr": {
+      "name": "bisectr",
+      "version": "0.1.0",
+      "sha256": "1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7",
+      "depends": ["devtools"],
+      "broken": true
+    },
     "bisg": {
       "name": "bisg",
       "version": "0.1.0",
@@ -144630,6 +145980,13 @@
       "depends": [],
       "broken": true
     },
+    "blender": {
+      "name": "blender",
+      "version": "0.1.2",
+      "sha256": "1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c",
+      "depends": ["vegan"],
+      "broken": true
+    },
     "blin": {
       "name": "blin",
       "version": "0.0.1",
@@ -144637,6 +145994,13 @@
       "depends": ["abind", "glmnet", "MASS", "Matrix", "mvtnorm"],
       "broken": true
     },
+    "blockCV": {
+      "name": "blockCV",
+      "version": "3.1-5",
+      "sha256": "1ngjr7z7ivm12dijywvca776bpgagszn2aipl7d3kfzs9z3x12hg",
+      "depends": ["Rcpp", "sf"],
+      "broken": true
+    },
     "blockRAR": {
       "name": "blockRAR",
       "version": "1.0.2",
@@ -144784,6 +146148,13 @@
       "depends": ["Imap"],
       "broken": true
     },
+    "breakpoint": {
+      "name": "breakpoint",
+      "version": "1.2",
+      "sha256": "004vi1qr7iib8ykg6sp7xzv0bb841h4vsz2x0cyrhkdp41frglx9",
+      "depends": ["MASS", "doParallel", "foreach", "ggplot2", "msm"],
+      "broken": true
+    },
     "brickr": {
       "name": "brickr",
       "version": "0.3.5",
@@ -144826,6 +146197,13 @@
       "depends": ["BH", "coda", "DiagrammeR", "lattice", "magrittr", "Rcpp", "RcppEigen", "rstan", "rstantools", "shiny", "StanHeaders", "viridis", "visNetwork"],
       "broken": true
     },
+    "bsplinePsd": {
+      "name": "bsplinePsd",
+      "version": "0.6.0",
+      "sha256": "0f785l02hiq3f7anxqhm09f7lrqgkkqhly7f1x78cxm22hvrqyhg",
+      "depends": ["Rcpp"],
+      "broken": true
+    },
     "bssn": {
       "name": "bssn",
       "version": "1.0",
@@ -145064,13 +146442,6 @@
       "depends": ["Boom", "bsts", "dplyr", "ggplot2", "magrittr"],
       "broken": true
     },
-    "cbcTools": {
-      "name": "cbcTools",
-      "version": "0.5.0",
-      "sha256": "07has80n7n23y2y3shalps1hkw1r8f4fld1r48g42fdrwkhhf6jw",
-      "depends": ["AlgDesign", "DoE_base", "MASS", "fastDummies", "ggplot2", "idefix", "logitr", "randtoolbox", "rlang"],
-      "broken": true
-    },
     "cbird": {
       "name": "cbird",
       "version": "1.0",
@@ -145169,6 +146540,13 @@
       "depends": ["Rcpp"],
       "broken": true
     },
+    "cellularautomata": {
+      "name": "cellularautomata",
+      "version": "0.1.0",
+      "sha256": "07j0bv8bj20jjh4zdxgqnpkxm0pb2aia6045rp23i3x18n18zf42",
+      "depends": ["gganimate", "ggplot2", "patchwork", "purrr", "rlang"],
+      "broken": true
+    },
     "censNID": {
       "name": "censNID",
       "version": "0-0-1",
@@ -145218,11 +146596,11 @@
       "depends": ["cli", "data_table", "dplyr", "glue", "httr", "janitor", "jsonlite", "magrittr", "mgcv", "nnet", "progressr", "purrr", "Rcpp", "RcppParallel", "rlang", "stringr", "tibble", "tidyr"],
       "broken": true
     },
-    "cgaim": {
-      "name": "cgaim",
-      "version": "1.0.1",
-      "sha256": "1krs61rbnz7v4pncbjlil4728x5xyz5vzbyj487njbmqgymq10wl",
-      "depends": ["MASS", "Matrix", "TruncatedNormal", "cgam", "coneproj", "doParallel", "foreach", "gratia", "limSolve", "mgcv", "osqp", "quadprog", "scam", "scar"],
+    "cfma": {
+      "name": "cfma",
+      "version": "1.0",
+      "sha256": "006z5g3rqpg44jqdf6ivyxr47sxm5cd9cqhayfi8qk73xx5w4lv9",
+      "depends": [],
       "broken": true
     },
     "cgalMeshes": {
@@ -145372,6 +146750,13 @@
       "depends": ["Matrix", "NLP", "jiebaR", "purrr", "slam", "stringi", "tm"],
       "broken": true
     },
+    "chkptstanr": {
+      "name": "chkptstanr",
+      "version": "0.1.1",
+      "sha256": "0p0pzpzyg3sw4gnvzdx34f96yxidpykq49v5xlhnrsnpjzajjfs3",
+      "depends": ["Rdpack", "abind", "brms", "rstan"],
+      "broken": true
+    },
     "chorrrds": {
       "name": "chorrrds",
       "version": "0.1.9.5",
@@ -145414,11 +146799,11 @@
       "depends": [],
       "broken": true
     },
-    "clampSeg": {
-      "name": "clampSeg",
-      "version": "1.1-1",
-      "sha256": "1zrndnd8n7ssn2fm0l7y31a2la0nsybqsl4j44r0mmc1m0m94vks",
-      "depends": ["lowpassFilter", "stepR"],
+    "civis": {
+      "name": "civis",
+      "version": "3.1.2",
+      "sha256": "0ahrav9gd0dy05vxapg5x0csadwcnm4nfcwwk752j9nksd1hl3wg",
+      "depends": ["future", "httr", "jsonlite", "memoise"],
       "broken": true
     },
     "classyfireR": {
@@ -145442,6 +146827,13 @@
       "depends": ["Rcpp", "RcppEigen"],
       "broken": true
     },
+    "clikcorr": {
+      "name": "clikcorr",
+      "version": "1.0",
+      "sha256": "0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5",
+      "depends": ["mvtnorm"],
+      "broken": true
+    },
     "climdex_pcic": {
       "name": "climdex.pcic",
       "version": "1.1-11",
@@ -145491,6 +146883,13 @@
       "depends": [],
       "broken": true
     },
+    "clusEvol": {
+      "name": "clusEvol",
+      "version": "1.0.0",
+      "sha256": "192zi43flpwfazgjd5ci0620hbad77z6s527vp6qwywcly3aqxmw",
+      "depends": ["cluster", "clusterSim", "dplyr", "fpc", "ggplot2", "plotly", "viridis"],
+      "broken": true
+    },
     "clustDRM": {
       "name": "clustDRM",
       "version": "0.1-0",
@@ -145575,6 +146974,13 @@
       "depends": ["ape", "aphid", "seqinr"],
       "broken": true
     },
+    "collUtils": {
+      "name": "collUtils",
+      "version": "1.0.5",
+      "sha256": "0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p",
+      "depends": ["Rcpp", "rJava"],
+      "broken": true
+    },
     "collectArgs": {
       "name": "collectArgs",
       "version": "0.4.0",
@@ -145694,6 +147100,13 @@
       "depends": ["doParallel", "foreach", "GenomicRanges", "ggplot2", "ggrepel", "heatmap3", "igraph", "IRanges", "MASS", "mixtools", "R4RNA", "RColorBrewer", "reshape2", "RRNA", "S4Vectors", "seqinr", "tidyverse", "TopDom"],
       "broken": true
     },
+    "concatenate": {
+      "name": "concatenate",
+      "version": "1.0.0",
+      "sha256": "1kvsw7vwa3hn97ff7r6z21h5ajs74azwv2dk4pzgyaasnbp778hw",
+      "depends": [],
+      "broken": true
+    },
     "conclust": {
       "name": "conclust",
       "version": "1.1",
@@ -145792,6 +147205,13 @@
       "depends": ["JuliaCall", "magrittr"],
       "broken": true
     },
+    "cooccur": {
+      "name": "cooccur",
+      "version": "1.3",
+      "sha256": "1wlaghhi4f3v8kzwhcgq3c6as7v3zlpkzhb232qz1amr7f0058kv",
+      "depends": ["ggplot2", "gmp", "reshape2"],
+      "broken": true
+    },
     "coopProductGame": {
       "name": "coopProductGame",
       "version": "2.0",
@@ -145883,6 +147303,13 @@
       "depends": ["bitops", "httr", "RCurl", "rjson"],
       "broken": true
     },
+    "countTransformers": {
+      "name": "countTransformers",
+      "version": "0.0.6",
+      "sha256": "14n2sv7wqzslrzg0ag473ljj9mvha94161p5yh2h9l1vx7xliimf",
+      "depends": ["Biobase", "MASS", "limma"],
+      "broken": true
+    },
     "countyfloods": {
       "name": "countyfloods",
       "version": "0.1.0",
@@ -145932,6 +147359,13 @@
       "depends": [],
       "broken": true
     },
+    "coxed": {
+      "name": "coxed",
+      "version": "0.3.3",
+      "sha256": "09jnqza8wp2palayb0vsz43qmh8470gxil1l7g3b65lmxa7wpmnh",
+      "depends": ["PermAlgo", "dplyr", "ggplot2", "gridExtra", "mediation", "mgcv", "rms", "survival", "tidyr"],
+      "broken": true
+    },
     "coxinterval": {
       "name": "coxinterval",
       "version": "1.2",
@@ -146156,6 +147590,13 @@
       "depends": ["magrittr", "Rcpp", "rlang", "zeallot"],
       "broken": true
     },
+    "cumstats": {
+      "name": "cumstats",
+      "version": "1.0",
+      "sha256": "119w751z9dg6pjyk389pbl8ab8pirf9sqndi4nxi89ix2bby4xz8",
+      "depends": [],
+      "broken": true
+    },
     "customsteps": {
       "name": "customsteps",
       "version": "0.7.1.0",
@@ -146198,6 +147639,13 @@
       "depends": [],
       "broken": true
     },
+    "cvwrapr": {
+      "name": "cvwrapr",
+      "version": "1.0",
+      "sha256": "17h017p76y7sjcwik48ravygmyivj6kvkhqy5s9ch0nwzzcrzvj3",
+      "depends": ["foreach", "survival"],
+      "broken": true
+    },
     "cwbtools": {
       "name": "cwbtools",
       "version": "0.4.2",
@@ -146247,13 +147695,6 @@
       "depends": ["GenKern", "plotrix"],
       "broken": true
     },
-    "dagHMM": {
-      "name": "dagHMM",
-      "version": "0.1.0",
-      "sha256": "1dw4clv2x71km1sqz1mydscwyj6y9yqx06v3rkmdz13qqcacfmhi",
-      "depends": ["bnclassify", "bnlearn", "future", "gtools", "matrixStats", "PRROC"],
-      "broken": true
-    },
     "dalmatian": {
       "name": "dalmatian",
       "version": "1.0.0",
@@ -146667,6 +148108,13 @@
       "depends": ["data_table", "ggplot2", "lme4", "plyr"],
       "broken": true
     },
+    "dfped": {
+      "name": "dfped",
+      "version": "1.1",
+      "sha256": "11ffsah14igba276m9d3cla0kgb3isizm5d7j1iqcd0wq23il7hq",
+      "depends": ["ggplot2", "rstan"],
+      "broken": true
+    },
     "dfpk": {
       "name": "dfpk",
       "version": "3.5.1",
@@ -146807,6 +148255,13 @@
       "depends": ["MASS", "Matrix", "expectreg", "formula_tools", "mgcv", "nloptr", "provenance", "rlang", "survival"],
       "broken": true
     },
+    "disaggR": {
+      "name": "disaggR",
+      "version": "1.0.5.3",
+      "sha256": "1i2in27gygmh1l05371hzbf8zssgsjl6jyljsr964gk02l0ghkpn",
+      "depends": ["RColorBrewer"],
+      "broken": true
+    },
     "discgolf": {
       "name": "discgolf",
       "version": "0.2.0",
@@ -146884,13 +148339,6 @@
       "depends": ["MASS"],
       "broken": true
     },
-    "distfreereg": {
-      "name": "distfreereg",
-      "version": "1.0.1",
-      "sha256": "1vly5yiqfc68wvijrsa5c14yv4h5rwqrhq4isi3k5ck1sldpdfv5",
-      "depends": ["clue", "numDeriv"],
-      "broken": true
-    },
     "distillML": {
       "name": "distillML",
       "version": "0.1.0.13",
@@ -146919,6 +148367,13 @@
       "depends": ["ggplot2", "qgraph", "Rcpp", "shiny"],
       "broken": true
     },
+    "diverse": {
+      "name": "diverse",
+      "version": "0.1.5",
+      "sha256": "10kmx3qv58xhqs1icsxqq0y0cm8y2hx9ysb65brd3hhg33alzvk3",
+      "depends": ["foreign", "proxy", "reshape2"],
+      "broken": true
+    },
     "dkDNA": {
       "name": "dkDNA",
       "version": "0.1.1",
@@ -147003,6 +148458,13 @@
       "depends": ["dplyr", "ggplot2", "lubridate", "purrr", "rlang", "stringr", "tidyr"],
       "broken": true
     },
+    "doex": {
+      "name": "doex",
+      "version": "1.2",
+      "sha256": "1r999z30ipa04pgck0hfalqxihb1bj8sdhlkkhf4plb7maaz3qm3",
+      "depends": [],
+      "broken": true
+    },
     "dotdot": {
       "name": "dotdot",
       "version": "0.1.0",
@@ -147094,6 +148556,13 @@
       "depends": ["copula", "gratia", "mgcv", "Rcpp", "RcppArmadillo", "Rdpack"],
       "broken": true
     },
+    "dtmapi": {
+      "name": "dtmapi",
+      "version": "0.0.2",
+      "sha256": "1a0a5dff82igzxsz0ma3j2w7waqq2nrv3cy0df2nh7sgqvcldk4m",
+      "depends": ["httr2", "jsonlite", "magrittr"],
+      "broken": true
+    },
     "dtree": {
       "name": "dtree",
       "version": "0.4.2",
@@ -147129,6 +148598,13 @@
       "depends": ["data_table", "mvtnorm", "nloptr", "numDeriv", "Rcpp"],
       "broken": true
     },
+    "dynaSpec": {
+      "name": "dynaSpec",
+      "version": "1.0.3",
+      "sha256": "07k3s2nd17i8gakp1jagx9dvj7ra1wi1byqbg92xnj7qryxfcb9p",
+      "depends": ["ari", "gganimate", "ggplot2", "png", "scales", "seewave", "tuneR", "viridis", "warbleR"],
+      "broken": true
+    },
     "dynamicGraph": {
       "name": "dynamicGraph",
       "version": "0.2.2.6",
@@ -147178,13 +148654,6 @@
       "depends": ["assertthat", "dplyr", "dyndimred", "dynfeature", "dynutils", "dynwrap", "GA", "ggforce", "ggplot2", "ggraph", "ggrepel", "igraph", "MASS", "patchwork", "purrr", "reshape2", "tibble", "tidygraph", "tidyr", "vipor"],
       "broken": true
     },
-    "dynsim": {
-      "name": "dynsim",
-      "version": "1.2.3",
-      "sha256": "1fk23cp2hvkn7msxrdc9cnm4pmcmhcdf3q6rwm507bniigrswnx4",
-      "depends": ["MASS", "ggplot2", "gridExtra"],
-      "broken": true
-    },
     "eMLEloglin": {
       "name": "eMLEloglin",
       "version": "1.0.1",
@@ -147192,6 +148661,13 @@
       "depends": ["lpSolveAPI"],
       "broken": true
     },
+    "earlywarnings": {
+      "name": "earlywarnings",
+      "version": "1.1.29",
+      "sha256": "1xa9rijqqxa5l253dg8dn1jjhdakf8krl5rflq5v9gybfyrq1885",
+      "depends": ["Kendall", "KernSmooth", "fields", "ggplot2", "knitr", "lmtest", "moments", "nortest", "quadprog", "som", "spam", "tgp", "tseries"],
+      "broken": true
+    },
     "easyDifferentialGeneCoexpression": {
       "name": "easyDifferentialGeneCoexpression",
       "version": "1.4",
@@ -147220,6 +148696,13 @@
       "depends": [],
       "broken": true
     },
+    "ebreg": {
+      "name": "ebreg",
+      "version": "0.1.3",
+      "sha256": "1xrs9afjd5hkdmhglj3md5i5hm7awlcdlccz3y2lw4c73lx31ywz",
+      "depends": ["Rdpack", "lars"],
+      "broken": true
+    },
     "ecap": {
       "name": "ecap",
       "version": "0.1.2",
@@ -147241,6 +148724,13 @@
       "depends": ["arrow", "cachem", "cli", "curl", "glue", "memoise", "piggyback", "rlang", "vctrs"],
       "broken": true
     },
+    "ecpc": {
+      "name": "ecpc",
+      "version": "3.1.1",
+      "sha256": "0vi9k3p1xicx53rmccmx1ykdidqb22hkwgr7l5hc0bjzsv7h2w38",
+      "depends": ["CVXR", "JOPS", "Matrix", "checkmate", "gglasso", "glmnet", "mgcv", "multiridge", "mvtnorm", "pROC", "pracma", "quadprog", "survival"],
+      "broken": true
+    },
     "edbuildmapr": {
       "name": "edbuildmapr",
       "version": "0.3.1",
@@ -147332,6 +148822,13 @@
       "depends": ["ggplot2", "reshape2", "rmarkdown", "seqinr", "shiny", "viridis"],
       "broken": true
     },
+    "efflog": {
+      "name": "efflog",
+      "version": "1.0",
+      "sha256": "1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b",
+      "depends": [],
+      "broken": true
+    },
     "eflm": {
       "name": "eflm",
       "version": "0.3.0",
@@ -147570,6 +149067,13 @@
       "depends": ["bayesplot", "BH", "dplyr", "ggplot2", "hrbrthemes", "lme4", "magrittr", "Matrix", "Rcpp", "RcppEigen", "Rdpack", "rlang", "rstan", "rstanarm", "rstantools", "scales", "StanHeaders", "tidyr", "zoo"],
       "broken": true
     },
+    "epimdr2": {
+      "name": "epimdr2",
+      "version": "1.0-9",
+      "sha256": "1lx1zibp2ziwdyj180jf9y5xczfs2xfkb5bw7q4f7i9p70jlqcrz",
+      "depends": ["deSolve", "ggplot2", "phaseR", "plotly", "polspline", "shiny"],
+      "broken": true
+    },
     "episcan": {
       "name": "episcan",
       "version": "0.0.1",
@@ -147731,6 +149235,13 @@
       "depends": [],
       "broken": true
     },
+    "etwfe": {
+      "name": "etwfe",
+      "version": "0.5.0",
+      "sha256": "1lb7crk14cz0bh1mbzgvc9b1llrvlj5p8605lr2p6psmrn94ikip",
+      "depends": ["Formula", "data_table", "fixest", "marginaleffects", "tinyplot"],
+      "broken": true
+    },
     "eulerian": {
       "name": "eulerian",
       "version": "1.0",
@@ -147745,6 +149256,13 @@
       "depends": ["PCICt", "RNetCDF", "data_table", "fs", "lubridate", "magrittr", "ncdf4", "ncdf4_helpers"],
       "broken": true
     },
+    "europeanaR": {
+      "name": "europeanaR",
+      "version": "0.1.0",
+      "sha256": "11cr8n64yv50zwib9wkvk1j43p9a1cmxmzznxykczv43l193kjg7",
+      "depends": ["Rdpack", "data_table", "httr", "jsonlite", "magrittr"],
+      "broken": true
+    },
     "evaluator": {
       "name": "evaluator",
       "version": "0.4.3",
@@ -147787,13 +149305,6 @@
       "depends": ["deSolve", "expm", "MASS"],
       "broken": true
     },
-    "exactLTRE": {
-      "name": "exactLTRE",
-      "version": "0.1.0",
-      "sha256": "0fhzymvsmp1hcq32nwka745jhbf51iyb9hp6ix9rm88kyclcwhrl",
-      "depends": ["matrixcalc", "popdemo"],
-      "broken": true
-    },
     "exactLoglinTest": {
       "name": "exactLoglinTest",
       "version": "1.4.2",
@@ -148284,6 +149795,13 @@
       "depends": [],
       "broken": true
     },
+    "fgm": {
+      "name": "fgm",
+      "version": "1.0",
+      "sha256": "0i6lbqxxjq78dql14qwqs7slnn0kyls2g3a9biabny2narwf6n3m",
+      "depends": ["JGL", "fdapace"],
+      "broken": true
+    },
     "fgof": {
       "name": "fgof",
       "version": "0.2-1",
@@ -148564,6 +150082,13 @@
       "depends": ["BIOMASS"],
       "broken": true
     },
+    "forestecology": {
+      "name": "forestecology",
+      "version": "0.2.0",
+      "sha256": "0pvh50sdiscgkshlmyngz7pkmpaz03c8x3gfjp5ir52f8710ngb7",
+      "depends": ["blockCV", "dplyr", "forcats", "ggplot2", "ggridges", "glue", "magrittr", "mvnfast", "patchwork", "purrr", "rlang", "sf", "sfheaders", "snakecase", "stringr", "tibble", "tidyr", "yardstick"],
+      "broken": true
+    },
     "foster": {
       "name": "foster",
       "version": "0.1.1",
@@ -148655,6 +150180,13 @@
       "depends": ["freqdom", "glasso", "lars", "mpmi", "randomForestSRC"],
       "broken": true
     },
+    "fscaret": {
+      "name": "fscaret",
+      "version": "0.9.4.4",
+      "sha256": "18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw",
+      "depends": ["caret", "gsubfn", "hmeasure"],
+      "broken": true
+    },
     "ftnonpar": {
       "name": "ftnonpar",
       "version": "0.1-88",
@@ -148781,6 +150313,13 @@
       "depends": ["gWidgets2", "memoise", "RGtk2"],
       "broken": true
     },
+    "gadget2": {
+      "name": "gadget2",
+      "version": "2.3.11",
+      "sha256": "0ka5mbr9nppgsr95l33k510h278z49j6chbbqvbba0gan9842kwg",
+      "depends": [],
+      "broken": true
+    },
     "gameofthrones": {
       "name": "gameofthrones",
       "version": "1.0.2",
@@ -148837,13 +150376,6 @@
       "depends": ["dials", "dplyr", "magrittr", "parsnip", "purrr", "rlang", "rmgarch", "rugarch", "stringr", "tibble", "tidyr"],
       "broken": true
     },
-    "gaussDiff": {
-      "name": "gaussDiff",
-      "version": "1.1",
-      "sha256": "0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45",
-      "depends": [],
-      "broken": true
-    },
     "gazepath": {
       "name": "gazepath",
       "version": "1.3",
@@ -149019,20 +150551,6 @@
       "depends": ["cluster", "GEOmap", "RFOC", "RPMG", "RSEIS"],
       "broken": true
     },
-    "geospt": {
-      "name": "geospt",
-      "version": "1.0-5",
-      "sha256": "060952gblj078r3j246z72c3piviy6gprgsx0w60lyc51k908mz5",
-      "depends": ["MASS", "TeachingDemos", "fields", "genalg", "gsl", "gstat", "limSolve", "minqa", "plyr", "sgeostat", "sp"],
-      "broken": true
-    },
-    "geosptdb": {
-      "name": "geosptdb",
-      "version": "1.0-1",
-      "sha256": "1n1jvigavcxlbc5wki74lnhax3060i44m1cvkcr664wsjqhx3kl2",
-      "depends": ["FD", "StatMatch", "fields", "geospt", "gsl", "limSolve", "minqa", "sp"],
-      "broken": true
-    },
     "geotech": {
       "name": "geotech",
       "version": "1.0",
@@ -149138,6 +150656,20 @@
       "depends": ["ggplot2"],
       "broken": true
     },
+    "ggRandomForests": {
+      "name": "ggRandomForests",
+      "version": "2.2.1",
+      "sha256": "05w1rs0mg2nj5j1rd32s1mcj294p4zm24p2d87535rmslqmya9c7",
+      "depends": ["ggplot2", "randomForest", "randomForestSRC", "survival", "tidyr"],
+      "broken": true
+    },
+    "ggalt": {
+      "name": "ggalt",
+      "version": "0.4.0",
+      "sha256": "0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc",
+      "depends": ["KernSmooth", "MASS", "RColorBrewer", "ash", "dplyr", "extrafont", "ggplot2", "gtable", "maps", "plotly", "proj4", "scales", "tibble"],
+      "broken": true
+    },
     "ggasym": {
       "name": "ggasym",
       "version": "0.1.6",
@@ -149243,6 +150775,13 @@
       "depends": ["ggplot2", "rlang", "seasonal", "zoo"],
       "broken": true
     },
+    "ggsmc": {
+      "name": "ggsmc",
+      "version": "0.1.2.0",
+      "sha256": "1wgb5ml1bgfi6rddbvm3rfk6di9imyx17iflg8h42hhbvbvm93iy",
+      "depends": ["gganimate", "ggplot2", "poorman"],
+      "broken": true
+    },
     "ggsn": {
       "name": "ggsn",
       "version": "0.5.0",
@@ -149306,13 +150845,6 @@
       "depends": ["curl", "data_table", "devtools", "httr", "jsonlite", "mockery"],
       "broken": true
     },
-    "gkwreg": {
-      "name": "gkwreg",
-      "version": "1.0.7",
-      "sha256": "0ndpq6fxs3h2726yix5aw3dp0160cr2pxlx78d4pibci96vnfgjb",
-      "depends": ["Formula", "Rcpp", "RcppArmadillo", "RcppEigen", "TMB", "fmsb", "ggplot2", "ggpubr", "gridExtra", "magrittr", "numDeriv", "patchwork", "rappdirs", "reshape2", "scales", "tidyr"],
-      "broken": true
-    },
     "glacierSMBM": {
       "name": "glacierSMBM",
       "version": "0.1",
@@ -149362,6 +150894,13 @@
       "depends": [],
       "broken": true
     },
+    "glossa": {
+      "name": "glossa",
+      "version": "1.1.0",
+      "sha256": "07sfbzqs5spvmf9z7cjydp64cc8rc54mgxa877rh1cxnbxlai4y0",
+      "depends": ["DT", "GeoThinneR", "blockCV", "bs4Dash", "dbarts", "dplyr", "ggplot2", "htmltools", "jsonlite", "leaflet", "markdown", "mcp", "pROC", "sf", "shiny", "shinyWidgets", "sparkline", "svglite", "terra", "tidyterra", "waiter", "zip"],
+      "broken": true
+    },
     "glottospace": {
       "name": "glottospace",
       "version": "0.0.112",
@@ -149383,6 +150922,13 @@
       "depends": ["coin", "dplyr", "ggplot2", "tidyr"],
       "broken": true
     },
+    "gma": {
+      "name": "gma",
+      "version": "1.0",
+      "sha256": "08hxbs9z4vq5zjis0lgdcvlysaj1k7i0icdk3wsyqf3wd9znsibi",
+      "depends": ["MASS", "car", "nlme"],
+      "broken": true
+    },
     "gmat": {
       "name": "gmat",
       "version": "0.2.2",
@@ -149397,6 +150943,13 @@
       "depends": ["BiasedUrn", "binom"],
       "broken": true
     },
+    "gofCopula": {
+      "name": "gofCopula",
+      "version": "0.4-2",
+      "sha256": "14blfca1liihx3rjskjxv3wa0sczsj2di2vimb05j5g44yc8hwi3",
+      "depends": ["MASS", "R_utils", "SparseGrid", "VineCopula", "copula", "crayon", "doSNOW", "foreach", "numDeriv", "progress", "yarrr"],
+      "broken": true
+    },
     "gofastr": {
       "name": "gofastr",
       "version": "0.3.0",
@@ -149516,6 +151069,13 @@
       "depends": ["checkmate", "furrr", "raster", "sf", "usethis"],
       "broken": true
     },
+    "graphTweets": {
+      "name": "graphTweets",
+      "version": "0.5.3",
+      "sha256": "0jf52lclwvqgybdj6fknzx046bh6jgwxvqs4c5g1ii8f2lsz9y07",
+      "depends": ["combinat", "dplyr", "igraph", "magrittr", "purrr", "rlang", "tidyr", "zeallot"],
+      "broken": true
+    },
     "graphscan": {
       "name": "graphscan",
       "version": "1.1.1",
@@ -149691,6 +151251,13 @@
       "depends": ["Morpho", "Polychrome", "RCDT", "Rcpp", "Rvcg", "clipr", "colorsGen", "cxhull", "plotrix", "purrr", "rgl", "rstudioapi"],
       "broken": true
     },
+    "habCluster": {
+      "name": "habCluster",
+      "version": "1.0.5",
+      "sha256": "1cjmhq8krkv4g1vy70kc3j667djzmq38xlqn568f437f6jaglvkp",
+      "depends": ["Rcpp", "igraph", "raster", "sf", "stars"],
+      "broken": true
+    },
     "hacksaw": {
       "name": "hacksaw",
       "version": "0.0.2",
@@ -149712,6 +151279,13 @@
       "depends": ["abind", "boot", "dplyr", "R6", "Rcpp", "stringr"],
       "broken": true
     },
+    "handyFunctions": {
+      "name": "handyFunctions",
+      "version": "0.1.0",
+      "sha256": "0y476acqdm73y19k8s9c9vy8xryyjg16pay3vikslwccv7kgsigz",
+      "depends": ["ggplot2", "rlang", "stringr"],
+      "broken": true
+    },
     "hansard": {
       "name": "hansard",
       "version": "0.8.0",
@@ -149957,6 +151531,13 @@
       "depends": ["httr", "RCurl", "XML"],
       "broken": true
     },
+    "hmeasure": {
+      "name": "hmeasure",
+      "version": "1.0-2",
+      "sha256": "0l4nlny532kddiaa1nmgd37971whhwzb54mb1pvbwax7fsg6hmhw",
+      "depends": [],
+      "broken": true
+    },
     "hmgm": {
       "name": "hmgm",
       "version": "1.0.3",
@@ -150139,13 +151720,6 @@
       "depends": ["nsRFA"],
       "broken": true
     },
-    "hydroMOPSO": {
-      "name": "hydroMOPSO",
-      "version": "0.1-3",
-      "sha256": "14yvsxzlzpisn5hqyqcq1fmqsbj96pqcgyhnj414mj366x6w5qxp",
-      "depends": ["hydroTSM", "lhs", "randtoolbox", "xts", "zoo"],
-      "broken": true
-    },
     "hydroPSO": {
       "name": "hydroPSO",
       "version": "0.5-1",
@@ -150209,6 +151783,13 @@
       "depends": ["assertive_sets", "assertive_types", "flexdashboard", "glue", "htmltools", "knitr", "magrittr", "rmarkdown", "stringi", "stringr", "xfun", "ymlthis"],
       "broken": true
     },
+    "i2extras": {
+      "name": "i2extras",
+      "version": "0.2.1",
+      "sha256": "14k9s5ppq3c7ldh6gqi82awmkk34ac0br0qr42gqba9lrssf4bsr",
+      "depends": ["MASS", "ciTools", "data_table", "dplyr", "ggplot2", "incidence2", "rlang", "tibble", "tidyr", "tidyselect", "vctrs"],
+      "broken": true
+    },
     "iBATCGH": {
       "name": "iBATCGH",
       "version": "1.3.1",
@@ -150433,6 +152014,13 @@
       "depends": ["dplyr", "httr", "jsonlite"],
       "broken": true
     },
+    "imguR": {
+      "name": "imguR",
+      "version": "1.0.3",
+      "sha256": "14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3",
+      "depends": ["httr", "jpeg", "png"],
+      "broken": true
+    },
     "immuneSIM": {
       "name": "immuneSIM",
       "version": "0.8.7",
@@ -150531,6 +152119,13 @@
       "depends": ["ltm"],
       "broken": true
     },
+    "inldata": {
+      "name": "inldata",
+      "version": "1.2.7",
+      "sha256": "1hi2rzh95in4zgy9vwsnb9vddl64ia9jsb0mvcpgr7fciqnfp0rw",
+      "depends": ["checkmate", "sf", "stringi", "terra"],
+      "broken": true
+    },
     "inlmisc": {
       "name": "inlmisc",
       "version": "0.5.5",
@@ -150538,13 +152133,6 @@
       "depends": ["checkmate", "data_table", "GA", "htmltools", "htmlwidgets", "igraph", "knitr", "leaflet", "raster", "rgdal", "rgeos", "rmarkdown", "scales", "sp", "tinytex", "webshot", "wordcloud2", "xtable", "yaml"],
       "broken": true
     },
-    "ino": {
-      "name": "ino",
-      "version": "1.0.2",
-      "sha256": "18pl1scg8lxz0x1r2ksvrlpr7qvwp88bxvwiz4j4w3if5w0i0qhk",
-      "depends": ["cli", "crayon", "doSNOW", "dplyr", "forcats", "foreach", "ggplot2", "glue", "mvtnorm", "optimizeR", "reshape2", "rlang", "scales"],
-      "broken": true
-    },
     "insectDisease": {
       "name": "insectDisease",
       "version": "1.2.2",
@@ -150566,6 +152154,20 @@
       "depends": ["raster"],
       "broken": true
     },
+    "intSDM": {
+      "name": "intSDM",
+      "version": "2.1.1",
+      "sha256": "13qh4aa96hkrq1q7n22m8b6g64i5nw4n2wq320izqnc8nkrq3hv5",
+      "depends": ["PointedSDMs", "R6", "blockCV", "fmesher", "geodata", "ggplot2", "giscoR", "inlabru", "rgbif", "sf", "terra", "tidyterra", "units"],
+      "broken": true
+    },
+    "intamapInteractive": {
+      "name": "intamapInteractive",
+      "version": "1.2-6",
+      "sha256": "0mdn4fmc7skmf61pshyyc6g3xlxa2friyy0kzhn5d6q5ni3fm7rb",
+      "depends": ["automap", "gstat", "intamap", "sf", "sp", "spatstat_geom", "spcosa"],
+      "broken": true
+    },
     "intdag": {
       "name": "intdag",
       "version": "1.0.1",
@@ -150671,6 +152273,13 @@
       "depends": ["dplyr", "economiccomplexity", "openxlsx", "readxl", "tidyr", "usethis"],
       "broken": true
     },
+    "ipcwswitch": {
+      "name": "ipcwswitch",
+      "version": "1.0.4",
+      "sha256": "12z16c8sv1nhdv70kwx1a0wh588znkv5y5r0s9kcws0n3rjhzh9p",
+      "depends": ["survival"],
+      "broken": true
+    },
     "ipmisc": {
       "name": "ipmisc",
       "version": "6.0.2",
@@ -150769,13 +152378,6 @@
       "depends": ["Formula", "ucminf"],
       "broken": true
     },
-    "ivdesc": {
-      "name": "ivdesc",
-      "version": "1.1.1",
-      "sha256": "0b28xghncvq182kl19m8k1frnr2cqj7nvnhcd831kfd84bk2sz13",
-      "depends": ["knitr", "purrr", "rsample"],
-      "broken": true
-    },
     "ivfixed": {
       "name": "ivfixed",
       "version": "1.0",
@@ -150909,13 +152511,6 @@
       "depends": ["ggplot2", "gridExtra", "gtools", "JM", "joineR", "lme4", "MASS", "Matrix", "meta", "msm", "statmod", "survival"],
       "broken": true
     },
-    "jrSiCKLSNMF": {
-      "name": "jrSiCKLSNMF",
-      "version": "1.2.2",
-      "sha256": "1b0v8hq9dpif6l0gm9iyrd9l2mgdg7ksaj6zvip8rvqx1n5wdxdv",
-      "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "Rdpack", "clValid", "cluster", "data_table", "factoextra", "foreach", "ggplot2", "ggrepel", "igraph", "irlba", "kknn", "pbapply", "rlang", "scran", "umap"],
-      "broken": true
-    },
     "jsonStrings": {
       "name": "jsonStrings",
       "version": "2.1.1",
@@ -150944,6 +152539,13 @@
       "depends": [],
       "broken": true
     },
+    "jvnVaR": {
+      "name": "jvnVaR",
+      "version": "1.0",
+      "sha256": "0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci",
+      "depends": [],
+      "broken": true
+    },
     "kaps": {
       "name": "kaps",
       "version": "1.0.2",
@@ -150951,6 +152553,13 @@
       "depends": ["coin", "Formula", "survival"],
       "broken": true
     },
+    "karel": {
+      "name": "karel",
+      "version": "0.1.1",
+      "sha256": "0nvzvd8aq0sipcvn8agjjd2k1wykpgc99nrrk2cxrlvsjbpd2w52",
+      "depends": ["dplyr", "gganimate", "ggplot2", "gifski", "magrittr", "purrr", "tidyr"],
+      "broken": true
+    },
     "kcirt": {
       "name": "kcirt",
       "version": "0.6.0",
@@ -150993,13 +152602,6 @@
       "depends": ["reticulate"],
       "broken": true
     },
-    "kerdiest": {
-      "name": "kerdiest",
-      "version": "1.2",
-      "sha256": "16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3",
-      "depends": ["chron", "date", "evir"],
-      "broken": true
-    },
     "kernelPSI": {
       "name": "kernelPSI",
       "version": "1.1.1",
@@ -151140,6 +152742,13 @@
       "depends": ["cld2", "data_table", "magrittr", "stopwords", "stringdist"],
       "broken": true
     },
+    "lactcurves": {
+      "name": "lactcurves",
+      "version": "1.1.0",
+      "sha256": "1ksllpgz519gzrs8gwfgg7743vj3j7ikmbwgisdjs77sdxxl7xyz",
+      "depends": ["orthopolynom", "polynom"],
+      "broken": true
+    },
     "laercio": {
       "name": "laercio",
       "version": "1.0-1",
@@ -151210,13 +152819,6 @@
       "depends": [],
       "broken": true
     },
-    "latticeDensity": {
-      "name": "latticeDensity",
-      "version": "1.2.6",
-      "sha256": "0l9ypdpy09nnmanj2gvaxzj79s8d9iqwy6rv0rig5fwbqv1y6135",
-      "depends": ["sf", "sp", "spam", "spatialreg", "spatstat", "spatstat_geom", "spdep", "splancs"],
-      "broken": true
-    },
     "lavaan_survey": {
       "name": "lavaan.survey",
       "version": "1.1.3.1",
@@ -151455,6 +153057,13 @@
       "depends": ["Rcpp", "stepR"],
       "broken": true
     },
+    "linkcomm": {
+      "name": "linkcomm",
+      "version": "1.0-14",
+      "sha256": "15xm4c7sqpid1vjra250dnvdx98qgzbzmvaycf3zqqnqcmy5bw9n",
+      "depends": ["RColorBrewer", "dynamicTreeCut", "igraph"],
+      "broken": true
+    },
     "linkim": {
       "name": "linkim",
       "version": "0.1",
@@ -151532,6 +153141,13 @@
       "depends": ["lattice", "lme4", "pastecs", "qtl", "stringr"],
       "broken": true
     },
+    "lmreg": {
+      "name": "lmreg",
+      "version": "1.2",
+      "sha256": "02a4nqqcfkjlq21mpk8abd4lj4ib2nps3ndf7zgmzygkd1z0df18",
+      "depends": ["MASS"],
+      "broken": true
+    },
     "lmvar": {
       "name": "lmvar",
       "version": "1.5.2",
@@ -151658,6 +153274,13 @@
       "depends": [],
       "broken": true
     },
+    "lsnstat": {
+      "name": "lsnstat",
+      "version": "1.0.1",
+      "sha256": "0ig1ndbnng052ww0fmw5k7lwb0whzg9ychww40h7mdg3dpiyswi5",
+      "depends": ["dplyr", "httr", "jsonlite"],
+      "broken": true
+    },
     "lsplsGlm": {
       "name": "lsplsGlm",
       "version": "1.0",
@@ -151714,13 +153337,6 @@
       "depends": ["corpcor", "expm", "MASS"],
       "broken": true
     },
-    "m2b": {
-      "name": "m2b",
-      "version": "1.0",
-      "sha256": "0agzw67mmwrw1f61yn24z5w1pgjssdapg3li0a53i3ylnij45mzr",
-      "depends": ["caTools", "caret", "e1071", "geosphere", "ggplot2", "randomForest"],
-      "broken": true
-    },
     "m5": {
       "name": "m5",
       "version": "0.1.1",
@@ -151749,6 +153365,13 @@
       "depends": ["C50", "rpart"],
       "broken": true
     },
+    "macc": {
+      "name": "macc",
+      "version": "1.0.1",
+      "sha256": "1qj4mlikbqrxa6m46527xmxdbk7b3l95z6jdgpmi0ifywjiv52a4",
+      "depends": ["MASS", "car", "lme4", "nlme", "optimx"],
+      "broken": true
+    },
     "machQA": {
       "name": "machQA",
       "version": "0.1.4",
@@ -151770,6 +153393,13 @@
       "depends": ["mrds"],
       "broken": true
     },
+    "maic": {
+      "name": "maic",
+      "version": "0.1.4",
+      "sha256": "0ba0kg5kgnn2g33mmhj9x8ichckyybbpn5xxc56qxvk2w2xv2wpj",
+      "depends": ["Hmisc", "matrixStats", "weights"],
+      "broken": true
+    },
     "mail": {
       "name": "mail",
       "version": "1.0",
@@ -151784,6 +153414,13 @@
       "depends": ["jsonlite", "urltools"],
       "broken": true
     },
+    "makeProject": {
+      "name": "makeProject",
+      "version": "1.0",
+      "sha256": "09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca",
+      "depends": [],
+      "broken": true
+    },
     "mangoTraining": {
       "name": "mangoTraining",
       "version": "1.1.1",
@@ -151917,6 +153554,13 @@
       "depends": ["Rcpp"],
       "broken": true
     },
+    "mazeGen": {
+      "name": "mazeGen",
+      "version": "0.1.3",
+      "sha256": "192xygg3l4rpqp49sgd5hpp4h3f8wjhyldn0l8abxhsks7jd2kfb",
+      "depends": ["igraph"],
+      "broken": true
+    },
     "mbclusterwise": {
       "name": "mbclusterwise",
       "version": "1.0",
@@ -151987,6 +153631,13 @@
       "depends": ["abn", "coda", "cowplot", "ggplot2", "ggpubr", "gRbase"],
       "broken": true
     },
+    "mcmcplots": {
+      "name": "mcmcplots",
+      "version": "0.4.3",
+      "sha256": "0187z79gmvcrwqybxh3ckhcrqi0nqhvcvlczgxfkpq95y5czprdq",
+      "depends": ["coda", "colorspace", "denstrip", "sfsmisc"],
+      "broken": true
+    },
     "mcsm": {
       "name": "mcsm",
       "version": "1.0",
@@ -152008,13 +153659,6 @@
       "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "RcppParallel", "salso", "stringr", "testthat", "tidyr"],
       "broken": true
     },
-    "mdsOpt": {
-      "name": "mdsOpt",
-      "version": "0.7-6",
-      "sha256": "1przk2ganrvs2g15rzby4npy58iwlxv1lsqrzan6z65filncqifq",
-      "depends": ["animation", "clusterSim", "plotrix", "smacof", "spdep", "symbolicDA"],
-      "broken": true
-    },
     "mdsdt": {
       "name": "mdsdt",
       "version": "1.2",
@@ -152071,6 +153715,13 @@
       "depends": ["rvest", "stringr"],
       "broken": true
     },
+    "memochange": {
+      "name": "memochange",
+      "version": "1.1.2",
+      "sha256": "04qv201vcyfipp7p32i9b1paanimbi3h39mzsx26b7nm46pp1nws",
+      "depends": ["LongMemoryTS", "forecast", "fracdiff", "longmemo", "sandwich", "strucchange"],
+      "broken": true
+    },
     "merlin": {
       "name": "merlin",
       "version": "0.1.0",
@@ -152120,13 +153771,6 @@
       "depends": ["data_table", "ggplot2", "plotROC"],
       "broken": true
     },
-    "metacor": {
-      "name": "metacor",
-      "version": "1.0-2.1",
-      "sha256": "0y3z7jbhw5c2dbn9fx9wlw1311irjc2xvnm5hnaixbbj53qz24n0",
-      "depends": ["gsl", "rmeta"],
-      "broken": true
-    },
     "metaplotr": {
       "name": "metaplotr",
       "version": "0.0.3",
@@ -152253,6 +153897,13 @@
       "depends": ["htmlwidgets", "knitr"],
       "broken": true
     },
+    "minimapR": {
+      "name": "minimapR",
+      "version": "0.0.1.3",
+      "sha256": "1kj2yr17jq5pawx23n8sf8g3fxm1y7g16694rln3gyc3j15gdvl6",
+      "depends": ["Rsamtools", "pafr"],
+      "broken": true
+    },
     "minimaxdesign": {
       "name": "minimaxdesign",
       "version": "0.1.5",
@@ -152435,6 +154086,13 @@
       "depends": [],
       "broken": true
     },
+    "mlms": {
+      "name": "mlms",
+      "version": "1.0.2",
+      "sha256": "1yijs5lda2yqly871lwxq5iw61zkig096jvvdkkvdviav75vklgx",
+      "depends": ["checkmate", "jsonlite", "plotrix", "readxl", "sf", "stringi"],
+      "broken": true
+    },
     "mlr3proba": {
       "name": "mlr3proba",
       "version": "0.4.9",
@@ -153191,13 +154849,6 @@
       "depends": ["analogue", "dplyr", "httr", "jsonlite", "leaflet", "plyr", "reshape2", "xml2"],
       "broken": true
     },
-    "neotoma2": {
-      "name": "neotoma2",
-      "version": "1.0.5",
-      "sha256": "13l41cypjpiqdkpkdwz7z39iiza2z6jcxj4sgm85713m7ws9dyak",
-      "depends": ["assertthat", "dplyr", "geojsonsf", "gtools", "httr", "jsonlite", "leaflet", "lubridate", "magrittr", "progress", "purrr", "rlang", "sf", "stringr", "tidyr", "uuid", "wk"],
-      "broken": true
-    },
     "nestedmodels": {
       "name": "nestedmodels",
       "version": "1.1.0",
@@ -153303,6 +154954,13 @@
       "depends": ["dplyr", "httr", "jsonlite", "RCurl"],
       "broken": true
     },
+    "njgeo": {
+      "name": "njgeo",
+      "version": "0.1.0",
+      "sha256": "1cc6gm0l5z31hqif2d8wd503pb48xsmyr28pbildkxgy9z022af5",
+      "depends": ["curl", "dplyr", "httr", "jsonlite", "sf"],
+      "broken": true
+    },
     "njtr1": {
       "name": "njtr1",
       "version": "0.3.2",
@@ -153408,6 +155066,13 @@
       "depends": ["dplyr", "httr", "readr", "rlang", "rvest", "stringr", "tibble", "tidyr"],
       "broken": true
     },
+    "nomisr": {
+      "name": "nomisr",
+      "version": "0.4.7",
+      "sha256": "0mf301nhsl71h79jxfkwa27j5nifsxp7y6vxbnx87rybr80b3hg1",
+      "depends": ["dplyr", "httr", "jsonlite", "rlang", "rsdmx", "snakecase", "tibble"],
+      "broken": true
+    },
     "nomordR": {
       "name": "nomordR",
       "version": "0.1",
@@ -153485,6 +155150,13 @@
       "depends": ["corpcor", "DBI", "httr", "lubridate", "magic", "matlab", "Matrix", "RCurl", "RMySQL", "vars", "xts", "zoo"],
       "broken": true
     },
+    "nparACT": {
+      "name": "nparACT",
+      "version": "0.8",
+      "sha256": "0zwhz52j526n3xd21s7kghjaby56a8g296bkkc6scaa23zn1xg4b",
+      "depends": ["ggplot2", "stringr", "zoo"],
+      "broken": true
+    },
     "npcopTest": {
       "name": "npcopTest",
       "version": "1.03",
@@ -153499,6 +155171,13 @@
       "depends": ["assertthat", "cli", "crayon", "erratum"],
       "broken": true
     },
+    "nprcgenekeepr": {
+      "name": "nprcgenekeepr",
+      "version": "1.0.7",
+      "sha256": "1z3anys5p2gi15fzfaz73ay237rbvwai04qqwx42s0agrh2p6yhn",
+      "depends": ["Matrix", "Rlabkey", "WriteXLS", "anytime", "data_table", "futile_logger", "htmlTable", "lifecycle", "lubridate", "plotrix", "readxl", "sessioninfo", "shiny", "stringi"],
+      "broken": true
+    },
     "npsr": {
       "name": "npsr",
       "version": "0.1.1",
@@ -153534,6 +155213,13 @@
       "depends": ["jsonlite", "magrittr", "yahoofinancer"],
       "broken": true
     },
+    "nser": {
+      "name": "nser",
+      "version": "1.5.3",
+      "sha256": "0v88gbcak22wpqanp5b4j1fdsp3s4jdhwq4a399msmjd1kxzf5f6",
+      "depends": ["curl", "dplyr", "googleVis", "httr", "lubridate", "magrittr", "purrr", "readr", "reticulate", "rvest", "stringr", "xml2"],
+      "broken": true
+    },
     "nseval": {
       "name": "nseval",
       "version": "0.5.1",
@@ -153611,6 +155297,13 @@
       "depends": ["ConR", "knitr", "rgdal"],
       "broken": true
     },
+    "oceanmap": {
+      "name": "oceanmap",
+      "version": "0.1.6",
+      "sha256": "12ppcqk2s14p7hg0a6b3hgnz90dxn3kagfgkpykz6ks93vjy8pd7",
+      "depends": ["abind", "extrafont", "fields", "ggedit", "ggplot2", "lubridate", "mapdata", "maps", "ncdf4", "plotly", "plotrix", "raster", "reshape2", "sf", "sp"],
+      "broken": true
+    },
     "ocomposition": {
       "name": "ocomposition",
       "version": "1.1",
@@ -153653,6 +155346,13 @@
       "depends": ["lattice"],
       "broken": true
     },
+    "ohun": {
+      "name": "ohun",
+      "version": "1.0.2",
+      "sha256": "0l3c6p1q2mjvr03q905ygmaax94bn3a0fkfn8kfjr6d5bs60283s",
+      "depends": ["checkmate", "cli", "fftw", "ggplot2", "igraph", "rlang", "seewave", "sf", "tuneR", "warbleR"],
+      "broken": true
+    },
     "okmesonet": {
       "name": "okmesonet",
       "version": "0.1.5",
@@ -153737,6 +155437,13 @@
       "depends": ["crul", "dplyr", "jsonlite", "maptools", "rappdirs", "readr", "tibble", "xml2"],
       "broken": true
     },
+    "opendataformat": {
+      "name": "opendataformat",
+      "version": "2.2.0",
+      "sha256": "0i14kfp48s1bjj0f2ksjgizxb4mlmqik78g0h0bs1zwdnrffhpsv",
+      "depends": ["cli", "data_table", "jsonlite", "magrittr", "tibble", "xml2", "zip"],
+      "broken": true
+    },
     "opensensmapr": {
       "name": "opensensmapr",
       "version": "0.6.0",
@@ -153758,6 +155465,13 @@
       "depends": ["doParallel", "foreach", "maptools", "openair", "plyr", "raster", "reshape", "rgdal", "sp"],
       "broken": true
     },
+    "opera": {
+      "name": "opera",
+      "version": "1.2.0",
+      "sha256": "09gh0c74y3n25f9p1rya8ybql5mfaqkcnr8i8wwwzfm67vqdfrnh",
+      "depends": ["Rcpp", "RcppEigen", "Rdpack", "alabama", "htmltools", "htmlwidgets", "pipeR", "rAmCharts"],
+      "broken": true
+    },
     "optAUC": {
       "name": "optAUC",
       "version": "1.0",
@@ -153919,6 +155633,13 @@
       "depends": ["Rcpp", "RcppArmadillo"],
       "broken": true
     },
+    "outqrf": {
+      "name": "outqrf",
+      "version": "1.0.0",
+      "sha256": "0gl3ix39kx7n1akg1789nfqg84jxq5q9qdxwcmf8ch7zklbkgccb",
+      "depends": ["dplyr", "ggplot2", "ggpubr", "missRanger", "ranger", "tidyr"],
+      "broken": true
+    },
     "outsider": {
       "name": "outsider",
       "version": "0.1.1",
@@ -154017,6 +155738,20 @@
       "depends": ["survival"],
       "broken": true
     },
+    "pafr": {
+      "name": "pafr",
+      "version": "0.0.2",
+      "sha256": "0ali4m1pv73y88x1dk5rvmg1ysy48janjnc1hnqfcndszfz2b0wm",
+      "depends": ["dplyr", "ggplot2", "rlang", "stringr", "tibble"],
+      "broken": true
+    },
+    "pageviews": {
+      "name": "pageviews",
+      "version": "0.6.0",
+      "sha256": "187gy6czxkicxghhklma87pfa23xcm07c4n9jfsr5yl9hwwfcna6",
+      "depends": ["curl", "httr", "jsonlite"],
+      "broken": true
+    },
     "pagoo": {
       "name": "pagoo",
       "version": "0.3.17",
@@ -154325,13 +156060,6 @@
       "depends": ["alabama", "BH", "psqn", "Rcpp", "RcppArmadillo", "testthat"],
       "broken": true
     },
-    "pems_utils": {
-      "name": "pems.utils",
-      "version": "0.3.0.7",
-      "sha256": "0r6s0y67i5s6ld32l4bylgw7bp7akgizlq1jcf2ik69hy9cwsd83",
-      "depends": ["baseline", "dplyr", "ggplot2", "lattice", "loa", "rlang", "tibble"],
-      "broken": true
-    },
     "penDvine": {
       "name": "penDvine",
       "version": "0.2.4",
@@ -154381,6 +156109,13 @@
       "depends": ["ape", "phytools", "Rcpp", "RcppArmadillo"],
       "broken": true
     },
+    "performanceEstimation": {
+      "name": "performanceEstimation",
+      "version": "1.1.0",
+      "sha256": "08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc",
+      "depends": ["dplyr", "ggplot2", "parallelMap", "tidyr"],
+      "broken": true
+    },
     "pergola": {
       "name": "pergola",
       "version": "1.0",
@@ -154451,6 +156186,13 @@
       "depends": ["dplyr", "ggplot2", "Rcpp", "scales", "tibble", "tidyr"],
       "broken": true
     },
+    "phaseR": {
+      "name": "phaseR",
+      "version": "2.2.1",
+      "sha256": "1gq882r4jkq8f0xm3qmjh4zx540sgpdhlj8894dhf5g6vhgaa1kd",
+      "depends": ["deSolve"],
+      "broken": true
+    },
     "pheble": {
       "name": "pheble",
       "version": "0.1.0",
@@ -154773,6 +156515,13 @@
       "depends": [],
       "broken": true
     },
+    "pollimetry": {
+      "name": "pollimetry",
+      "version": "1.0.1",
+      "sha256": "09zmcwlgzl4fnkdg2m424ibv3izzrm595c7pi4mc3bd1g8sa2ypn",
+      "depends": ["brms", "repmis"],
+      "broken": true
+    },
     "polyPK": {
       "name": "polyPK",
       "version": "3.1.0",
@@ -154962,6 +156711,13 @@
       "depends": [],
       "broken": true
     },
+    "prettifyAddins": {
+      "name": "prettifyAddins",
+      "version": "2.6.1",
+      "sha256": "0ncj10j1ygc1dhlqdg5vklzf258bjbg6mry8i8vqqh1dxvl2djwr",
+      "depends": ["XRJulia", "chromote", "httr", "rstudioapi", "shiny", "webdriver", "xml2"],
+      "broken": true
+    },
     "prewas": {
       "name": "prewas",
       "version": "1.1.1",
@@ -155011,6 +156767,13 @@
       "depends": ["diagram", "dplyr", "flextable", "ggplot2", "ggrepel", "interactions", "lavaan", "officer", "predict3d", "psych", "purrr", "rlang", "rmarkdown", "rrtable", "semTools", "stringr", "tidyr", "tidyselect", "ztable"],
       "broken": true
     },
+    "processanimateR": {
+      "name": "processanimateR",
+      "version": "1.0.5",
+      "sha256": "054m578ifb4hhlalijkdmjxifn36vy61sdzjgcr1gg4yxfi2fbx3",
+      "depends": ["DiagrammeR", "bupaR", "dplyr", "htmltools", "htmlwidgets", "magrittr", "processmapR", "rlang", "stringr", "tidyr"],
+      "broken": true
+    },
     "prof_tree": {
       "name": "prof.tree",
       "version": "0.1.0",
@@ -155018,6 +156781,13 @@
       "depends": ["data_tree"],
       "broken": true
     },
+    "progenyClust": {
+      "name": "progenyClust",
+      "version": "1.2",
+      "sha256": "0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l",
+      "depends": ["Hmisc"],
+      "broken": true
+    },
     "prognosticROC": {
       "name": "prognosticROC",
       "version": "0.7",
@@ -155214,6 +156984,13 @@
       "depends": ["ade4", "FactoClass", "FactoMineR"],
       "broken": true
     },
+    "qlcVisualize": {
+      "name": "qlcVisualize",
+      "version": "0.4",
+      "sha256": "13bznvc1915igbaj5bkc96lzsjpvpbkixs3gqpdgl1nzmakrlpjj",
+      "depends": ["MASS", "RSpectra", "alphahull", "automap", "cartogramR", "concaveman", "fields", "geodata", "gstat", "mapplots", "maps", "qlcMatrix", "seriation", "sf", "sp", "spatstat_geom", "spatstat_random", "stars"],
+      "broken": true
+    },
     "qmix": {
       "name": "qmix",
       "version": "0.1.2.0",
@@ -155249,6 +157026,13 @@
       "depends": ["curl", "jsonlite", "Rmpfr"],
       "broken": true
     },
+    "qsort": {
+      "name": "qsort",
+      "version": "0.2.3",
+      "sha256": "1xvp29dijfa2207wyw3z09rmffn61fngfy0f00qjk284n1jnnvrg",
+      "depends": ["cowplot", "ggplot2", "gridExtra", "purrr"],
+      "broken": true
+    },
     "qtlmt": {
       "name": "qtlmt",
       "version": "0.1-6",
@@ -155396,6 +157180,13 @@
       "depends": ["Rcpp"],
       "broken": true
     },
+    "rENA": {
+      "name": "rENA",
+      "version": "0.2.7",
+      "sha256": "136rlzm4pkip0j1zhn4ycsfmq4hjwvhp4d5359wsjkym6lr9n846",
+      "depends": ["R6", "Rcpp", "RcppArmadillo", "concatenate", "data_table", "doParallel", "foreach", "magrittr", "plotly", "scales"],
+      "broken": true
+    },
     "rFDSN": {
       "name": "rFDSN",
       "version": "0.0.0",
@@ -155466,6 +157257,13 @@
       "depends": ["rJava", "rjson"],
       "broken": true
     },
+    "rLakeHabitat": {
+      "name": "rLakeHabitat",
+      "version": "1.0.0",
+      "sha256": "1i6dkh0dv4fhnflsfyg96yi318yx2g7l5kpvlg3bllhmhsax3dbc",
+      "depends": ["dplyr", "gganimate", "ggplot2", "gstat", "isoband", "rLakeAnalyzer", "sf", "terra", "tidyterra"],
+      "broken": true
+    },
     "rLiDAR": {
       "name": "rLiDAR",
       "version": "0.1.5",
@@ -155536,6 +157334,13 @@
       "depends": ["alphashape3d", "boot", "data_table", "doSNOW", "foreach", "Rcpp", "RcppArmadillo", "RcppHNSW", "RcppProgress", "rgeos", "rgl", "sp"],
       "broken": true
     },
+    "rTensor2": {
+      "name": "rTensor2",
+      "version": "2.0.0",
+      "sha256": "0bangmph2hmk50gx21dkky0b22aimh168bndbp7a0s5vg2m49ijz",
+      "depends": ["Matrix", "gsignal", "matrixcalc", "png", "rTensor", "raster", "wavethresh"],
+      "broken": true
+    },
     "rTorch": {
       "name": "rTorch",
       "version": "0.4.2",
@@ -155585,13 +157390,6 @@
       "depends": ["abind", "Biobase", "CGHbase", "expm", "fdrtool", "igraph", "MASS", "Matrix", "mvtnorm", "rags2ridges", "Rcpp", "RcppArmadillo"],
       "broken": true
     },
-    "ragtop": {
-      "name": "ragtop",
-      "version": "1.1.1",
-      "sha256": "0vgc2q71g8ysccq19kbk9a4swxgd5qj91xm4bshfgdg5chxqnb50",
-      "depends": ["futile_logger", "limSolve"],
-      "broken": true
-    },
     "ramlegacy": {
       "name": "ramlegacy",
       "version": "0.2.0",
@@ -155858,6 +157656,13 @@
       "depends": ["base64enc", "futile_logger", "Rcpp"],
       "broken": true
     },
+    "rdd": {
+      "name": "rdd",
+      "version": "0.57",
+      "sha256": "1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp",
+      "depends": ["AER", "Formula", "lmtest", "sandwich"],
+      "broken": true
+    },
     "rdddr": {
       "name": "rdddr",
       "version": "1.0.0",
@@ -155865,6 +157670,13 @@
       "depends": ["broom", "dataverse", "DeclareDesign", "dplyr", "estimatr", "fabricatr", "generics", "ggplot2", "prediction", "purrr", "randomizr", "readr", "rlang", "tibble", "tidyr"],
       "broken": true
     },
+    "rddtools": {
+      "name": "rddtools",
+      "version": "1.6.0",
+      "sha256": "12lxdpazfhwn5kkzs91qhs0xcky30dj01yp0v5708ahr1ywqdxmd",
+      "depends": ["AER", "Formula", "KernSmooth", "ggplot2", "lmtest", "locpol", "np", "rdd", "rdrobust", "rmarkdown", "sandwich"],
+      "broken": true
+    },
     "rdetools": {
       "name": "rdetools",
       "version": "1.0",
@@ -155886,6 +157698,13 @@
       "depends": ["cli", "crayon", "prettycode", "R6"],
       "broken": true
     },
+    "rdracor": {
+      "name": "rdracor",
+      "version": "1.0.4",
+      "sha256": "1bypz0llvr05zvhfw76yinvr2qsbqnbws0mkif2mmckd57a7395x",
+      "depends": ["Rdpack", "data_table", "httr", "igraph", "jsonlite", "purrr", "stringr", "tibble", "tidyr", "xml2"],
+      "broken": true
+    },
     "rdrop2": {
       "name": "rdrop2",
       "version": "0.8.2.1",
@@ -155949,13 +157768,6 @@
       "depends": ["dplyr", "ldat", "lpSolve", "lvec", "Rcpp", "stringdist"],
       "broken": true
     },
-    "recoder": {
-      "name": "recoder",
-      "version": "0.1",
-      "sha256": "0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd",
-      "depends": ["stringr"],
-      "broken": true
-    },
     "recom": {
       "name": "recom",
       "version": "1.0",
@@ -156145,13 +157957,6 @@
       "depends": [],
       "broken": true
     },
-    "rextendr": {
-      "name": "rextendr",
-      "version": "0.3.1",
-      "sha256": "1jm0vvpqzycbp6an2vi3wmjavhj2wlnncvgxcd1nfzn0fw7vpbrc",
-      "depends": ["brio", "callr", "cli", "desc", "dplyr", "glue", "jsonlite", "pkgbuild", "processx", "purrr", "rlang", "rprojroot", "stringi", "tibble", "vctrs", "withr"],
-      "broken": true
-    },
     "rfUtilities": {
       "name": "rfUtilities",
       "version": "2.1-5",
@@ -156159,6 +157964,13 @@
       "depends": ["cluster", "randomForest"],
       "broken": true
     },
+    "rfars": {
+      "name": "rfars",
+      "version": "1.2.0",
+      "sha256": "1wk0gzg50hd7iq7l4c4rdzwvn0i6ikarp4pyqnv4ginvwlxyf591",
+      "depends": ["data_table", "downloader", "dplyr", "haven", "janitor", "lubridate", "magrittr", "purrr", "readr", "rlang", "sas7bdat", "stringr", "tidyr", "tidyselect", "zoo"],
+      "broken": true
+    },
     "rfinance": {
       "name": "rfinance",
       "version": "0.1.0",
@@ -156229,6 +158041,13 @@
       "depends": ["sp"],
       "broken": true
     },
+    "rgho": {
+      "name": "rgho",
+      "version": "3.0.2",
+      "sha256": "1j46pkb8n2hn1isz5xgfagwn77cxs48wv3rs4qqvq2nq1r5bpa4x",
+      "depends": ["ODataQuery", "curl", "dplyr", "httr", "lifecycle", "magrittr", "rlang", "tibble", "tidyr"],
+      "broken": true
+    },
     "rglwidget": {
       "name": "rglwidget",
       "version": "0.2.1",
@@ -156355,6 +158174,13 @@
       "depends": ["RCurl"],
       "broken": true
     },
+    "rjmcmc": {
+      "name": "rjmcmc",
+      "version": "0.4.5",
+      "sha256": "14rzvp6z5avlcnmlmvb6w4gvlh6v4ncbcai3v4c4svnjv555vz45",
+      "depends": ["coda", "madness", "mvtnorm"],
+      "broken": true
+    },
     "rjpdmp": {
       "name": "rjpdmp",
       "version": "2.0.0",
@@ -156509,13 +158335,6 @@
       "depends": ["MCMCpack", "coda", "lattice", "mvtnorm", "pscl"],
       "broken": true
     },
-    "robustsur": {
-      "name": "robustsur",
-      "version": "0.0-7",
-      "sha256": "0j3hqg0n5alckibzclks70a4xdhcwq4xm2a3z5w4dsvlzqgpnjl3",
-      "depends": ["GSE", "Matrix", "robreg3S", "robustbase"],
-      "broken": true
-    },
     "roistats": {
       "name": "roistats",
       "version": "0.1.1",
@@ -156761,6 +158580,13 @@
       "depends": ["KFAS"],
       "broken": true
     },
+    "ruimtehol": {
+      "name": "ruimtehol",
+      "version": "0.3.2",
+      "sha256": "1fjyrcqb1hv86xwdq5zds8gdgnvcv1nnbh5j7mf17870miy0vzln",
+      "depends": ["BH", "Rcpp"],
+      "broken": true
+    },
     "ruin": {
       "name": "ruin",
       "version": "0.1.1",
@@ -156803,6 +158629,13 @@
       "depends": ["CompQuadForm"],
       "broken": true
     },
+    "rvif": {
+      "name": "rvif",
+      "version": "2.0",
+      "sha256": "0w7any6km13jnad9jx1a8gkfmzbz345dwkhm5mxi06zfk65yv65r",
+      "depends": ["multiColl"],
+      "broken": true
+    },
     "rwebstat": {
       "name": "rwebstat",
       "version": "1.1.1",
@@ -156859,6 +158692,13 @@
       "depends": ["abind", "bigmemory", "GEOmap", "geomapdata", "mapproj", "maps", "NbClust", "ncdf4", "plyr", "SpecsVerification"],
       "broken": true
     },
+    "s4vd": {
+      "name": "s4vd",
+      "version": "1.1-1",
+      "sha256": "1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp",
+      "depends": ["biclust", "foreach", "irlba"],
+      "broken": true
+    },
     "sBF": {
       "name": "sBF",
       "version": "1.1.1",
@@ -156985,6 +158825,13 @@
       "depends": ["foreign", "RColorBrewer", "SeerMapper", "sp", "stringr"],
       "broken": true
     },
+    "saturnin": {
+      "name": "saturnin",
+      "version": "1.1.1",
+      "sha256": "0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36",
+      "depends": ["Rcpp", "RcppEigen"],
+      "broken": true
+    },
     "saves": {
       "name": "saves",
       "version": "0.5",
@@ -157020,13 +158867,6 @@
       "depends": ["BiocStyle", "cowplot", "dplyr", "easypackages", "forcats", "ggplot2", "gtools", "plyr", "purrr", "RColorBrewer", "readr", "scales", "stringr", "tibble", "tidyr", "tidyverse"],
       "broken": true
     },
-    "scMappR": {
-      "name": "scMappR",
-      "version": "1.0.11",
-      "sha256": "0a2jm2a10lawqrlcglaz31gx3kbvjz19f4ynhllkj0px61awxjah",
-      "depends": ["ADAPTS", "GSVA", "Seurat", "downloader", "gProfileR", "ggplot2", "gprofiler2", "limSolve", "pbapply", "pcaMethods", "pheatmap", "reshape"],
-      "broken": true
-    },
     "scPOP": {
       "name": "scPOP",
       "version": "0.1.0",
@@ -157048,6 +158888,13 @@
       "depends": ["reticulate"],
       "broken": true
     },
+    "scaleboot": {
+      "name": "scaleboot",
+      "version": "1.0-1",
+      "sha256": "1q0bs5f1vgja5gj3id1ny6raja8ljgd8dk50fs1wn90f6080afy7",
+      "depends": ["mvtnorm", "pvclust"],
+      "broken": true
+    },
     "scalpel": {
       "name": "scalpel",
       "version": "1.0.3",
@@ -157174,6 +159021,13 @@
       "depends": ["ggplot2", "gridExtra", "magrittr", "TTR"],
       "broken": true
     },
+    "seawaveQ": {
+      "name": "seawaveQ",
+      "version": "2.0.2",
+      "sha256": "1x4vvassal1lwb9xnwisrhlx2maaqxl84h7klfy8yg9x80fdrhsw",
+      "depends": ["lubridate", "plyr", "reshape2", "rms", "survival"],
+      "broken": true
+    },
     "secure": {
       "name": "secure",
       "version": "0.6",
@@ -157209,13 +159063,6 @@
       "depends": ["sp", "splancs"],
       "broken": true
     },
-    "segMGarch": {
-      "name": "segMGarch",
-      "version": "1.2",
-      "sha256": "0chw41h25jka9wa3rf3d8dq2ym47379jflv33q6qxaak8xy1kmd9",
-      "depends": ["Rcpp", "RcppArmadillo", "corpcor", "doParallel", "fGarch", "foreach", "iterators", "mvtnorm"],
-      "broken": true
-    },
     "seleniumPipes": {
       "name": "seleniumPipes",
       "version": "0.3.7",
@@ -157566,6 +159413,13 @@
       "depends": ["cobs", "nnls"],
       "broken": true
     },
+    "simexaft": {
+      "name": "simexaft",
+      "version": "1.0.7.1",
+      "sha256": "0n3n2g07pnpcqhbrjf78lbvqvc136g7jxlx6q27vnk96kwizh3f1",
+      "depends": ["mvtnorm", "survival"],
+      "broken": true
+    },
     "simfinR": {
       "name": "simfinR",
       "version": "0.2.3",
@@ -157573,6 +159427,13 @@
       "depends": ["crayon", "digest", "dplyr", "jsonlite", "lubridate", "magrittr", "memoise", "purrr"],
       "broken": true
     },
+    "simpleMLP": {
+      "name": "simpleMLP",
+      "version": "1.0.0",
+      "sha256": "134h217d3ipzpxgj5fh04pkajqmxdnnlr53ykk27vi86dqk4087p",
+      "depends": ["ggplot2", "readr"],
+      "broken": true
+    },
     "simplevis": {
       "name": "simplevis",
       "version": "7.1.0",
@@ -157580,6 +159441,13 @@
       "depends": ["dplyr", "ggplot2", "htmlwidgets", "leafem", "leaflet", "leafpop", "magrittr", "rlang", "scales", "sf", "shiny", "snakecase", "stars", "stringr", "tidyr", "tidyselect", "viridis"],
       "broken": true
     },
+    "simplexreg": {
+      "name": "simplexreg",
+      "version": "1.3",
+      "sha256": "1zkh00xbddhgz0qn0a5pj12n0hpx4f5kihpfj71x92pmxpzglcxh",
+      "depends": ["Formula", "plotrix"],
+      "broken": true
+    },
     "sismonr": {
       "name": "sismonr",
       "version": "2.1.0",
@@ -157622,6 +159490,13 @@
       "depends": ["httr", "raster", "s2", "sf", "xml2"],
       "broken": true
     },
+    "slickR": {
+      "name": "slickR",
+      "version": "0.6.0",
+      "sha256": "01p72l3h8izg9pphjhkm83rgfsvlimf8aa5asa5lfgfbma60ivhb",
+      "depends": ["base64enc", "checkmate", "htmltools", "htmlwidgets", "lifecycle", "xml2"],
+      "broken": true
+    },
     "slopeOP": {
       "name": "slopeOP",
       "version": "1.0.1",
@@ -157692,13 +159567,6 @@
       "depends": ["SparseM", "colorspace", "lmtest", "quantreg", "rgl"],
       "broken": true
     },
-    "smoothROCtime": {
-      "name": "smoothROCtime",
-      "version": "0.1.0",
-      "sha256": "03iihjxb5xdaf74cm9cajqqjli754mdmv5v1y4hla9vv23017ca1",
-      "depends": ["ks"],
-      "broken": true
-    },
     "snappier": {
       "name": "snappier",
       "version": "0.2.0",
@@ -157727,6 +159595,13 @@
       "depends": ["ggplot2", "snpStats"],
       "broken": true
     },
+    "snpReady": {
+      "name": "snpReady",
+      "version": "0.9.6",
+      "sha256": "1r96j8zh84dn7qh3zgl0p0v3a80hx2wd3c4jgjlr43hzl7yglpqr",
+      "depends": ["Matrix", "impute", "matrixcalc", "rgl", "stringr"],
+      "broken": true
+    },
     "snpStatsWriter": {
       "name": "snpStatsWriter",
       "version": "1.5-6",
@@ -157825,6 +159700,13 @@
       "depends": [],
       "broken": true
     },
+    "sparseBC": {
+      "name": "sparseBC",
+      "version": "1.2",
+      "sha256": "0a1siyi9kc805qji4alnw3c21spf4iw4wpsbfl50zvs52p8vl8w2",
+      "depends": ["fields", "glasso"],
+      "broken": true
+    },
     "sparseGAM": {
       "name": "sparseGAM",
       "version": "1.0",
@@ -157860,6 +159742,13 @@
       "depends": ["MASS", "Rtsne", "class", "igraph", "irlba", "knitr", "matrixStats", "pracma", "rmarkdown"],
       "broken": true
     },
+    "spatialfusion": {
+      "name": "spatialfusion",
+      "version": "0.7",
+      "sha256": "0snrv92xrzfc2xrv937mwyng7xp6rgfhn61nhddbrkwfw5dw7vl5",
+      "depends": ["deldir", "fields", "rstan", "sf", "sp", "spam"],
+      "broken": true
+    },
     "spatialnbda": {
       "name": "spatialnbda",
       "version": "1.0",
@@ -158259,6 +160148,13 @@
       "depends": ["dplyr", "lubridate", "purrr", "readr", "readxl", "rlang", "rvest", "sf", "stringr", "tibble", "xml2"],
       "broken": true
     },
+    "stmCorrViz": {
+      "name": "stmCorrViz",
+      "version": "1.3",
+      "sha256": "1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv",
+      "depends": ["SnowballC", "jsonlite", "stm", "tm"],
+      "broken": true
+    },
     "stochprofML": {
       "name": "stochprofML",
       "version": "2.0.3",
@@ -158343,6 +160239,13 @@
       "depends": [],
       "broken": true
     },
+    "subcopem2D": {
+      "name": "subcopem2D",
+      "version": "1.3",
+      "sha256": "06wwd847g9pxd0z2a8494h3nc9s280a3s1510bir24m3z7w1pqf3",
+      "depends": [],
+      "broken": true
+    },
     "sublime": {
       "name": "sublime",
       "version": "1.3",
@@ -158364,6 +160267,13 @@
       "depends": [],
       "broken": true
     },
+    "subspace": {
+      "name": "subspace",
+      "version": "1.0.4",
+      "sha256": "0p2j0lnwj3ym1v4xla6r97zjikb8alnibdc690xn9c0z21hmv43v",
+      "depends": ["colorspace", "ggvis", "rJava", "stringr"],
+      "broken": true
+    },
     "subtee": {
       "name": "subtee",
       "version": "1.0.1",
@@ -158413,13 +160323,6 @@
       "depends": ["httr", "jsonlite", "rcrossref", "xml2"],
       "broken": true
     },
-    "support": {
-      "name": "support",
-      "version": "0.1.5",
-      "sha256": "0gs6mva1lwanq4rm8l70sid28if2l0k249ydirqkz72lz12hg1br",
-      "depends": ["BH", "MHadaptive", "nloptr", "randtoolbox", "Rcpp", "RcppArmadillo"],
-      "broken": true
-    },
     "supportInt": {
       "name": "supportInt",
       "version": "1.1",
@@ -158602,13 +160505,6 @@
       "depends": ["MASS", "Matrix", "sybil"],
       "broken": true
     },
-    "symbolicDA": {
-      "name": "symbolicDA",
-      "version": "0.7-1",
-      "sha256": "1x1qwrf587lgp9ciakrhiy3wj4g90x4g7r784rr2b97g1xwysjff",
-      "depends": ["RSDA", "XML", "ade4", "cluster", "clusterSim", "e1071", "shapes"],
-      "broken": true
-    },
     "symbols": {
       "name": "symbols",
       "version": "1.1",
@@ -158686,13 +160582,6 @@
       "depends": ["R6", "RCurl", "config", "future", "httr", "jsonlite", "jsonvalidate", "lubridate", "purrr", "rlist", "stringr", "urltools"],
       "broken": true
     },
-    "tabr": {
-      "name": "tabr",
-      "version": "0.5.1",
-      "sha256": "1y14whqm0xw9n14nc2r27c6i6hchcbmbzidkyi9nhjn3prdln5b2",
-      "depends": ["crayon", "dplyr", "ggplot2", "purrr", "tibble", "tidyr"],
-      "broken": true
-    },
     "tabulate": {
       "name": "tabulate",
       "version": "0.1.0",
@@ -158721,13 +160610,6 @@
       "depends": ["MASS", "baseline", "broom", "colorRamps", "data_table", "deSolve", "devEMF", "minpack_lm", "pracma", "segmented", "sfsmisc", "smoother"],
       "broken": true
     },
-    "taxizedb": {
-      "name": "taxizedb",
-      "version": "0.3.1",
-      "sha256": "157xpbmqp3l0blf6n7cb0qswj12v39rhvx0zkbrc2w73g601naj5",
-      "depends": ["DBI", "RSQLite", "curl", "dbplyr", "dplyr", "hoardr", "magrittr", "readr", "rlang", "tibble"],
-      "broken": true
-    },
     "taxonbridge": {
       "name": "taxonbridge",
       "version": "1.2.2",
@@ -158805,13 +160687,6 @@
       "depends": ["assertive_base", "assertive_properties", "assertive_types", "Matrix", "purrr"],
       "broken": true
     },
-    "tern_rbmi": {
-      "name": "tern.rbmi",
-      "version": "0.1.4",
-      "sha256": "1z9jl7agfhrvbjpxb80mrlpn8xhavzlkywwsfdnn1fhb1n4yapzy",
-      "depends": ["broom", "checkmate", "formatters", "lifecycle", "magrittr", "rbmi", "rtables", "tern"],
-      "broken": true
-    },
     "tessellation": {
       "name": "tessellation",
       "version": "2.3.0",
@@ -158833,6 +160708,13 @@
       "depends": [],
       "broken": true
     },
+    "textile": {
+      "name": "textile",
+      "version": "0.1.4",
+      "sha256": "069gb0j8ym44j1wk05xd3sixbvpxhhnhwax2gvyb9kbh5b99qpi6",
+      "depends": [],
+      "broken": true
+    },
     "textreadr": {
       "name": "textreadr",
       "version": "1.2.0",
@@ -158854,6 +160736,13 @@
       "depends": ["tframe"],
       "broken": true
     },
+    "tframePlus": {
+      "name": "tframePlus",
+      "version": "2024.2-1",
+      "sha256": "02c4fjgwywqi6s7g42rpzz070j28cjr4bs94298jv2x14zkwf4v8",
+      "depends": ["tframe", "timeSeries"],
+      "broken": true
+    },
     "tfse": {
       "name": "tfse",
       "version": "0.5.0",
@@ -158973,6 +160862,13 @@
       "depends": ["MASS", "abd", "ggplot2", "lattice", "manipulate", "mosaic", "mosaicData", "rlang"],
       "broken": true
     },
+    "time_slots": {
+      "name": "time.slots",
+      "version": "0.2.0",
+      "sha256": "04qh8cgk3ixvvc67m2hal935m5kisq2n67cvjmsg1frz1bf2yvld",
+      "depends": ["dplyr", "ggfittext", "ggplot2", "lubridate", "scales"],
+      "broken": true
+    },
     "timeSeq": {
       "name": "timeSeq",
       "version": "1.0.4",
@@ -159365,13 +161261,6 @@
       "depends": ["RandomFieldsUtils", "tcltk2", "tkrplot"],
       "broken": true
     },
-    "ttScreening": {
-      "name": "ttScreening",
-      "version": "1.6",
-      "sha256": "1i8c9l3sdkzl99zxxyfqm84vkh6wjdh3a32l5q8ikf74g9dhxkf4",
-      "depends": ["MASS", "corpcor", "limma", "matrixStats", "simsalapar", "sva"],
-      "broken": true
-    },
     "ttTensor": {
       "name": "ttTensor",
       "version": "1.0.1",
@@ -159582,6 +161471,13 @@
       "depends": ["DescTools", "dplyr", "ggplot2", "gmodels", "haven", "magrittr", "psych", "RColorBrewer", "rio", "tibble", "tidyr"],
       "broken": true
     },
+    "vICC": {
+      "name": "vICC",
+      "version": "1.0.0",
+      "sha256": "13lcs7wwj1xfbjf3q7r8ssf00jg5hr1vjp2pyw0r42iz7mx47xjv",
+      "depends": ["Rdpack", "coda", "ggplot2", "nlme", "rjags"],
+      "broken": true
+    },
     "validateRS": {
       "name": "validateRS",
       "version": "1.0.0",
@@ -159603,6 +161499,13 @@
       "depends": ["cowplot", "ggplot2", "MASS", "reshape2"],
       "broken": true
     },
+    "valueSetCompare": {
+      "name": "valueSetCompare",
+      "version": "1.0.0",
+      "sha256": "06cb1hz1gp5gzbxbnv7306fyvvczggnaclab9llsbvfnmacbc2k5",
+      "depends": ["dplyr", "eq5dsuite", "ggplot2", "rlang"],
+      "broken": true
+    },
     "valuer": {
       "name": "valuer",
       "version": "1.1.2",
@@ -159715,13 +161618,6 @@
       "depends": [],
       "broken": true
     },
-    "viralx": {
-      "name": "viralx",
-      "version": "1.3.0",
-      "sha256": "1449r74g4q7qigyqb21sasdyr80542b4lfavjszh2s5bd8pkc8di",
-      "depends": ["DALEX", "DALEXtra", "Formula", "TeachingDemos", "dplyr", "earth", "kknn", "parsnip", "plotmo", "plotrix", "recipes", "rsample", "vdiffr", "workflows"],
-      "broken": true
-    },
     "viruslearner": {
       "name": "viruslearner",
       "version": "0.0.1",
@@ -159743,6 +161639,13 @@
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "rstan", "rstantools", "sqldf"],
       "broken": true
     },
+    "vivid": {
+      "name": "vivid",
+      "version": "0.2.9",
+      "sha256": "13iagv585a5z7pggzlcgc8h17r5lx4nq2gljy58238nsi0xc9549",
+      "depends": ["DendSer", "GGally", "RColorBrewer", "colorspace", "condvis2", "dplyr", "flashlight", "ggalt", "ggnewscale", "ggplot2", "igraph", "sp"],
+      "broken": true
+    },
     "vlad": {
       "name": "vlad",
       "version": "0.2.2",
@@ -159771,6 +161674,13 @@
       "depends": ["AMORE", "cairoDevice", "chron", "cluster", "DBI", "ecodist", "fields", "foreign", "ggmap", "ggplot2", "gmt", "gsubfn", "gWidgets2", "gWidgets2RGtk2", "intervals", "mapdata", "maps", "maptools", "marmap", "outliers", "PBSmapping", "plotrix", "R6", "RSQLite", "sp", "sqldf", "VennDiagram"],
       "broken": true
     },
+    "volleystat": {
+      "name": "volleystat",
+      "version": "0.2.0",
+      "sha256": "0n1r0bvvmba21cs3qgpnw9jxpgl2n82fhxa40sa1w2gav5rch5i6",
+      "depends": [],
+      "broken": true
+    },
     "vortexR": {
       "name": "vortexR",
       "version": "1.1.7",
@@ -159855,6 +161765,13 @@
       "depends": [],
       "broken": true
     },
+    "warbleR": {
+      "name": "warbleR",
+      "version": "1.1.34",
+      "sha256": "005kdz24xgi5nk84msvmcl68x8rmd0p20vip6ln0aj39y3y7zyr7",
+      "depends": ["NatureSounds", "RCurl", "Rcpp", "bioacoustics", "cli", "curl", "dtw", "fftw", "httr", "knitr", "monitoR", "pbapply", "rjson", "seewave", "testthat", "tuneR"],
+      "broken": true
+    },
     "washex": {
       "name": "washex",
       "version": "1.2.0",
@@ -159974,6 +161891,13 @@
       "depends": ["abind", "data_table", "dplyr", "DT", "shiny"],
       "broken": true
     },
+    "wiesbaden": {
+      "name": "wiesbaden",
+      "version": "1.2.10",
+      "sha256": "0kmapfksrxkr3dry8didznhv3q0827183532s78bai9l2hm8is1p",
+      "depends": ["httr", "jsonlite", "keyring", "readr", "stringi", "stringr", "xml2"],
+      "broken": true
+    },
     "wikipediatrend": {
       "name": "wikipediatrend",
       "version": "2.1.6",
@@ -160002,6 +161926,13 @@
       "depends": ["data_table", "JM", "Matrix", "MLEcens", "mvtnorm", "nlme", "plyr", "pssm", "survival"],
       "broken": true
     },
+    "wingen": {
+      "name": "wingen",
+      "version": "2.1.2",
+      "sha256": "0a4lhsvwd1jh48nb2b6nxkybp4j5pblf94j8pmx6v2yq11k2ddki",
+      "depends": ["automap", "crayon", "dplyr", "furrr", "gdistance", "ggplot2", "hierfstat", "magrittr", "pegas", "purrr", "raster", "rlang", "sf", "terra", "tidyr", "tidyselect", "vcfR", "viridis"],
+      "broken": true
+    },
     "wingui": {
       "name": "wingui",
       "version": "0.2",

From 4570f7e64990153c70acdfc2fa6ef41b95e9d689 Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Sun, 17 Aug 2025 11:59:11 +0200
Subject: [PATCH 3227/3724] rPackages.fcl: fixed build

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 724a44285919..3d94793c89e7 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1790,6 +1790,10 @@ let
       '';
     });
 
+    fcl = old.fcl.overrideAttrs (attrs: {
+      postPatch = "patchShebangs configure";
+    });
+
     fio = old.fio.overrideAttrs (attrs: {
       postPatch = "patchShebangs configure";
     });

From c9b5761b045fd3ee082a4f1539d3cfb1240b13ca Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Sun, 17 Aug 2025 12:09:31 +0200
Subject: [PATCH 3228/3724] rPackages.cartogramR: fixed build

---
 pkgs/development/r-modules/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 3d94793c89e7..7e9ee0ee19df 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1106,7 +1106,10 @@ let
       fftw.dev
     ];
     specklestar = [ pkgs.fftw.dev ];
-    cartogramR = [ pkgs.fftw.dev ];
+    cartogramR = with pkgs; [
+      fftw.dev
+      pkg-config
+    ];
     jqr = [ pkgs.jq.out ];
     kza = [ pkgs.pkg-config ];
     igraph = with pkgs; [
@@ -1753,6 +1756,10 @@ let
       postPatch = "patchShebangs configure";
     });
 
+    cartogramR = old.cartogramR.overrideAttrs (attrs: {
+      postPatch = "patchShebangs configure";
+    });
+
     rshift = old.rshift.overrideAttrs (attrs: {
       postPatch = "patchShebangs configure";
     });

From d9e40187de5401c7bb196d44ab380511423b0075 Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Sun, 17 Aug 2025 12:34:37 +0200
Subject: [PATCH 3229/3724] rPackages.caviarpd: fixed build

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 7e9ee0ee19df..fc8894900dc4 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -451,7 +451,10 @@ let
       libjpeg
     ];
     bnpmr = [ pkgs.gsl ];
-    caviarpd = [ pkgs.cargo ];
+    caviarpd = with pkgs; [
+      cargo
+      rustc
+    ];
     cairoDevice = [ pkgs.gtk2.dev ];
     Cairo = with pkgs; [
       libtiff

From 579ba5cf64614ea846080bcaf35c3cbb299380f8 Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Sun, 17 Aug 2025 12:45:07 +0200
Subject: [PATCH 3230/3724] rPackages.heck: fixed build

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index fc8894900dc4..b8e89d6d267d 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -589,7 +589,10 @@ let
     leidenAlg = [ pkgs.gmp.dev ];
     Libra = [ pkgs.gsl ];
     libstable4u = [ pkgs.gsl ];
-    heck = [ pkgs.cargo ];
+    heck = with pkgs; [
+      cargo
+      rustc
+    ];
     LOMAR = [ pkgs.gmp.dev ];
     littler = [ pkgs.libdeflate ];
     lpsymphony = with pkgs; [

From a25648796362706ce08bb5bae082d9f47fb658b7 Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Sun, 17 Aug 2025 12:50:20 +0200
Subject: [PATCH 3231/3724] rPackages.hypergeo2: fixed build

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index b8e89d6d267d..d38e07de84c7 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -572,6 +572,11 @@ let
     ];
     Rigraphlib = [ pkgs.cmake ];
     HiCseg = [ pkgs.gsl ];
+    hypergeo2 = with pkgs; [
+      gmp.dev
+      mpfr.dev
+      pkg-config
+    ];
     imager = [ pkgs.xorg.libX11.dev ];
     imbibe = [ pkgs.zlib.dev ];
     image_CannyEdges = with pkgs; [

From 7267a9f835b9e88445c016de55b65a816b7f9feb Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Sun, 17 Aug 2025 13:11:15 +0200
Subject: [PATCH 3232/3724] rPackages.interpolation: fixed build

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index d38e07de84c7..70a2aaee19de 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1128,7 +1128,10 @@ let
       libxml2.dev
       glpk
     ];
-    interpolation = [ pkgs.gmp ];
+    interpolation = with pkgs; [
+      gmp
+      mpfr
+    ];
     image_textlinedetector = with pkgs; [
       pkg-config
       opencv

From bb494d5a2ee15eecfe3260c3a070841b8e1a1d4a Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Sun, 17 Aug 2025 20:43:41 +0200
Subject: [PATCH 3233/3724] rPackages.zoomerjoin: fixed build

---
 pkgs/development/r-modules/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 70a2aaee19de..25707090577d 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -2001,7 +2001,11 @@ let
     });
 
     zoomerjoin = old.zoomerjoin.overrideAttrs (attrs: {
-      nativeBuildInputs = [ pkgs.cargo ] ++ attrs.nativeBuildInputs;
+      nativeBuildInputs = [
+        pkgs.cargo
+        pkgs.rustc
+      ]
+      ++ attrs.nativeBuildInputs;
       postPatch = "patchShebangs configure";
     });
 

From de35dae7611ce9b42702577622cdf4397e50b6dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= <dev@biobits.be>
Date: Mon, 18 Aug 2025 15:25:19 +0200
Subject: [PATCH 3234/3724] rPackages.BulkSignalR: mark as broken

Requires internet access
---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 25707090577d..623c1575fb25 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1661,6 +1661,7 @@ let
     "minired" # deprecated on CRAN
 
     # Impure network access during build
+    "BulkSignalR"
     "waddR"
     "tiledb"
     "switchr"

From 5ec8caeb60109bc38634bdc0dd49932b464e4693 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Fri, 22 Aug 2025 10:21:32 +1000
Subject: [PATCH 3235/3724] rPackages.RcppPlanc: fix build

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 623c1575fb25..482454ae6911 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -689,6 +689,11 @@ let
     gdalcubes = [ pkgs.pkg-config ];
     rgeos = [ pkgs.geos ];
     Rglpk = [ pkgs.glpk ];
+    RcppPlanc = with pkgs; [
+      which
+      cmake
+      pkg-config
+    ];
     RGtk2 = [ pkgs.gtk2.dev ];
     rhdf5 = [ pkgs.zlib ];
     Rhdf5lib = with pkgs; [ zlib.dev ];
@@ -1381,6 +1386,10 @@ let
     crandep = [ pkgs.gsl ];
     catSurv = [ pkgs.gsl ];
     ccfindR = [ pkgs.gsl ];
+    RcppPlanc = with pkgs; [
+      hwloc
+      hdf5.dev
+    ];
     screenCounter = [ pkgs.zlib.dev ];
     SPARSEMODr = [ pkgs.gsl ];
     RKHSMetaMod = [ pkgs.gsl ];

From 64eca23f5bca70e00ae8d65835ba241e9d1638b3 Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Tue, 19 Aug 2025 11:09:40 +0200
Subject: [PATCH 3236/3724] rPackages.webfakes: fixed build

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 482454ae6911..ca019ed6b58e 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -2744,6 +2744,10 @@ let
       '';
     });
 
+    webfakes = old.webfakes.overrideAttrs (_: {
+      postPatch = "patchShebangs configure";
+    });
+
     redland = old.redland.overrideAttrs (_: {
       PKGCONFIG_CFLAGS = "-I${pkgs.redland}/include -I${pkgs.librdf_raptor2}/include/raptor2 -I${pkgs.librdf_rasqal}/include/rasqal";
       PKGCONFIG_LIBS = "-L${pkgs.redland}/lib -L${pkgs.librdf_raptor2}/lib -L${pkgs.librdf_rasqal}/lib -lrdf -lraptor2 -lrasqal";

From 60483b80470cbb2c76bf45bbc8e312d65ded7834 Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Tue, 19 Aug 2025 11:23:16 +0200
Subject: [PATCH 3237/3724] rPackages.arcgisplaces: fixed build

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index ca019ed6b58e..bdf03d95a564 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1780,6 +1780,10 @@ let
       postPatch = "patchShebangs configure";
     });
 
+    arcgisplaces = old.arcgisplaces.overrideAttrs (attrs: {
+      postPatch = "patchShebangs configure";
+    });
+
     cartogramR = old.cartogramR.overrideAttrs (attrs: {
       postPatch = "patchShebangs configure";
     });

From 798b5a2f801318c4be156f5be12eaa407b479acc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 21:24:20 +0000
Subject: [PATCH 3238/3724] ghstack: 0.9.4 -> 0.11.0

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

diff --git a/pkgs/by-name/gh/ghstack/package.nix b/pkgs/by-name/gh/ghstack/package.nix
index c78f8adaaa5a..569178dd63e3 100644
--- a/pkgs/by-name/gh/ghstack/package.nix
+++ b/pkgs/by-name/gh/ghstack/package.nix
@@ -6,7 +6,7 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "ghstack";
-  version = "0.9.4";
+  version = "0.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {

From 8a394a88fdecda0f3647da6c5fcef7fd888401d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 21:39:37 +0000
Subject: [PATCH 3239/3724] gat: 0.25.0 -> 0.25.1

---
 pkgs/by-name/ga/gat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix
index cac7f8501bd4..23fa9b103ce5 100644
--- a/pkgs/by-name/ga/gat/package.nix
+++ b/pkgs/by-name/ga/gat/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "gat";
-  version = "0.25.0";
+  version = "0.25.1";
 
   src = fetchFromGitHub {
     owner = "koki-develop";
     repo = "gat";
     tag = "v${version}";
-    hash = "sha256-be6pV8e1Grw7HSvGrJN4ukCpI+Xu4nKN+ITtb+saVgw=";
+    hash = "sha256-DgIAAlA7rhMvTovmIZOsJ7KoXizGZXT2GRkTnxOh7L0=";
   };
 
-  vendorHash = "sha256-AaDFeDZMMDrIRqYFR+b4nrmLf13KUMEEE1zUHpVQxTg=";
+  vendorHash = "sha256-Aq+wcBeYpKWwXgGUZbAqT0zm1Bri7Df3rt7ycwy060o=";
 
   env.CGO_ENABLED = 0;
 

From 2696d0fa3ce933ff964953fce246fb74b514ab92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 23 Aug 2025 19:43:10 +0200
Subject: [PATCH 3240/3724] pocket-id: 1.7.0 -> 1.9.1

---
 pkgs/by-name/po/pocket-id/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix
index 84275171c72f..2dd0f0178ee9 100644
--- a/pkgs/by-name/po/pocket-id/package.nix
+++ b/pkgs/by-name/po/pocket-id/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  buildGoModule,
+  buildGo125Module,
   stdenvNoCC,
   nodejs,
   pnpm_10,
@@ -9,20 +9,20 @@
   nix-update-script,
 }:
 
-buildGoModule (finalAttrs: {
+buildGo125Module (finalAttrs: {
   pname = "pocket-id";
-  version = "1.7.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-u4H1wC5RL3p7GNL7WQkmK8DNgwKQvgxHd8TIug+Be+o=";
+    hash = "sha256-3sUkEbC96/XUR1tvCmxu56hPh7Ag/sD6/pGrq9JhHC8=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";
 
-  vendorHash = "sha256-guG/JnwUi2WeClSfAX9pRG3kLJMTvTDiJ7L54TGeSd0=";
+  vendorHash = "sha256-eNUhk76YLHtXCFaxiavM6d8CMeE+YQ+vOecDUCiTh5k=";
 
   env.CGO_ENABLED = 0;
   ldflags = [
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
     pnpmDeps = pnpm_10.fetchDeps {
       inherit (finalAttrs) pname version src;
       fetcherVersion = 1;
-      hash = "sha256-UgbclnoOqsWY5fYAGoDJON9MDtN5edw65JRleghdReE=";
+      hash = "sha256-q2oXyFVdaDfJ4NFDt26/VJVXzQLCuKXHtCx1mah6Js8=";
     };
 
     env.BUILD_OUTPUT_PATH = "dist";

From a019344338d84d8e6a79ab0a5a1ede443234e331 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Wed, 30 Jul 2025 13:19:48 -0700
Subject: [PATCH 3241/3724] emacs: replace `fetchFromSavannah` with mirror;
 adjust build

---
 pkgs/applications/editors/emacs/default.nix    |  2 +-
 pkgs/applications/editors/emacs/make-emacs.nix | 14 +++++---------
 pkgs/applications/editors/emacs/sources.nix    | 10 +++++-----
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index cc604b222f32..e36142b300dd 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -13,7 +13,7 @@ lib.makeScope pkgs.newScope (
       inherit lib;
       inherit (pkgs)
         fetchFromBitbucket
-        fetchFromSavannah
+        fetchurl
         ;
     };
 
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index e088d9610b70..be728c1a3a1a 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -69,7 +69,6 @@
   # Boolean flags
   withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
   noGui ? false,
-  srcRepo ? true,
   withAcl ? false,
   withAlsaLib ? false,
   withAthena ? false,
@@ -200,9 +199,11 @@ mkDerivation (finalAttrs: {
     ];
 
   postPatch = lib.concatStringsSep "\n" [
-    (lib.optionalString srcRepo ''
-      rm -fr .git
-    '')
+
+    # See: https://github.com/NixOS/nixpkgs/issues/170426
+    ''
+      find . -type f \( -name "*.elc" -o -name "*loaddefs.el" \) -exec rm {} \;
+    ''
 
     # Add the name of the wrapped gvfsd
     # This used to be carried as a patch but it often got out of sync with
@@ -247,11 +248,6 @@ mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeWrapper
     pkg-config
-  ]
-  ++ lib.optionals (variant == "macport") [
-    texinfo
-  ]
-  ++ lib.optionals srcRepo [
     autoreconfHook
     texinfo
   ]
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index c706d8ecc276..38864a90e221 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromBitbucket,
-  fetchFromSavannah,
+  fetchurl,
 }:
 
 let
@@ -26,9 +26,9 @@ let
       src =
         {
           "mainline" = (
-            fetchFromSavannah {
-              repo = "emacs";
-              inherit rev hash;
+            fetchurl {
+              url = "mirror://gnu/emacs/emacs-${rev}.tar.xz";
+              inherit hash;
             }
           );
           "macport" = (
@@ -108,7 +108,7 @@ in
     version = "30.2";
     variant = "mainline";
     rev = "30.2";
-    hash = "sha256-3Lfb3HqdlXqSnwJfxe7npa4GGR9djldy8bKRpkQCdSA=";
+    hash = "sha256-s/NvGKbdJxVxM3AWYlfeL64B+dOM/oeM7Zsebe1b79k=";
     patches = fetchpatch: [
       (builtins.path {
         name = "inhibit-lexical-cookie-warning-67916.patch";

From c7348c8e35dedb8ab74229e88fbcf130cca46eba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 22:55:37 +0000
Subject: [PATCH 3242/3724] artichoke: 0-unstable-2025-08-03 ->
 0-unstable-2025-08-18

---
 pkgs/by-name/ar/artichoke/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ar/artichoke/package.nix b/pkgs/by-name/ar/artichoke/package.nix
index 25bfac1bca1b..46829ca62052 100644
--- a/pkgs/by-name/ar/artichoke/package.nix
+++ b/pkgs/by-name/ar/artichoke/package.nix
@@ -10,13 +10,13 @@
 
 rustPlatform.buildRustPackage {
   pname = "artichoke";
-  version = "0-unstable-2025-08-03";
+  version = "0-unstable-2025-08-18";
 
   src = fetchFromGitHub {
     owner = "artichoke";
     repo = "artichoke";
-    rev = "ff0b17820a5f64ea9e8b744cef4a9111df3ed252";
-    hash = "sha256-0SUU/1gp7A0gjluc8ZyF9C4ZxAgNsM6jwuT3E8GxFQY=";
+    rev = "2dc4c45dc3f925b9aaefc44c33e75dec7586b6ad";
+    hash = "sha256-miZWT1oMyKJLA+6zO881cy4kJrkkmOpfm/l7Su/ECUw=";
   };
 
   cargoHash = "sha256-JD+qt0pu5wxIuLa3Bd9eadQFE7dyKzqxsAKPebG7+Zg=";

From f27d8d4301e8f699a98853a4acee6b7eba32378a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 23:06:52 +0000
Subject: [PATCH 3243/3724] tweag-credential-helper: 0.0.6 -> 0.0.8

---
 pkgs/by-name/tw/tweag-credential-helper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tw/tweag-credential-helper/package.nix b/pkgs/by-name/tw/tweag-credential-helper/package.nix
index 839410ea5d01..c1e84eaf05d3 100644
--- a/pkgs/by-name/tw/tweag-credential-helper/package.nix
+++ b/pkgs/by-name/tw/tweag-credential-helper/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tweag-credential-helper";
-  version = "0.0.6";
+  version = "0.0.8";
 
   src = fetchFromGitHub {
     owner = "tweag";
     repo = "credential-helper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+nl/rmI2xuVVi4uKlhwaJdNSHdQMixqb7oaKQvec+Cg=";
+    hash = "sha256-Evsw7l6zeHz3pDRNME8TIpYHnTbjlqY5abndjRLiTas=";
   };
 
-  vendorHash = "sha256-e4H/WqShF5W+g1vxVz9jE66nDI3i5T6KBtti1YUlsk0=";
+  vendorHash = "sha256-LVXHCRgRop2wdNU/NG5FFVYf5iiQRSPoRSX7B7r2tuI=";
 
   env.CGO_ENABLED = "0";
   ldflags = [

From ea2c47f9faf65e08f6b50439b7fc3be2a4ee7b6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 23:09:57 +0000
Subject: [PATCH 3244/3724] xenia-canary: 0-unstable-2025-08-15 ->
 0-unstable-2025-08-22

---
 pkgs/by-name/xe/xenia-canary/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix
index 90e0ed5613d4..3c34ecb2a70b 100644
--- a/pkgs/by-name/xe/xenia-canary/package.nix
+++ b/pkgs/by-name/xe/xenia-canary/package.nix
@@ -19,14 +19,14 @@
 }:
 llvmPackages_20.stdenv.mkDerivation {
   pname = "xenia-canary";
-  version = "0-unstable-2025-08-15";
+  version = "0-unstable-2025-08-22";
 
   src = fetchFromGitHub {
     owner = "xenia-canary";
     repo = "xenia-canary";
     fetchSubmodules = true;
-    rev = "a9fb32a2fddaf46573a0300c84db2b530cc62c2f";
-    hash = "sha256-F2zf3LeQl2F/iDAqFFAWBNX2C+L9mEeNWKi3w/Fon7g=";
+    rev = "765073021a3fd0ec193f89ff224aad5a3af31551";
+    hash = "sha256-WLSGhSK9hpcCp7a6YIjiaLI+z2PeyQEvoHJxvvFd7Vw=";
   };
 
   dontConfigure = true;

From 8d3634eece8972dc51372ca70043fed68dae0157 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 25 Aug 2025 01:22:41 +0200
Subject: [PATCH 3245/3724] python3Packages.xgrammar: 0.1.22 -> 0.1.23

Diff: https://github.com/mlc-ai/xgrammar/compare/v0.1.22...v0.1.23

Changelog: https://github.com/mlc-ai/xgrammar/releases/tag/v0.1.23
---
 pkgs/development/python-modules/xgrammar/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xgrammar/default.nix b/pkgs/development/python-modules/xgrammar/default.nix
index 9f653da2d179..16961ad77c19 100644
--- a/pkgs/development/python-modules/xgrammar/default.nix
+++ b/pkgs/development/python-modules/xgrammar/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "xgrammar";
-  version = "0.1.22";
+  version = "0.1.23";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     repo = "xgrammar";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-mz6eabETkAzDoPjXE5VJvgrR1vnXXmx3JO4xZRH4TRQ=";
+    hash = "sha256-asyxJsrsbfFNh1pLBDzM4kdmunQp7/mTDw3L8KuZf4g=";
   };
 
   patches = [
@@ -78,6 +78,7 @@ buildPythonPackage rec {
     "test_grammar_matcher_json_schema"
     "test_grammar_matcher_tag_dispatch"
     "test_regex_converter"
+    "test_serialize_compiled_grammar_with_hf_tokenizer"
     "test_tokenizer_info"
 
     # Torch not compiled with CUDA enabled

From 2d1c98c5df859ecb9ba16d46a62d2b4dc0e618a3 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Sun, 24 Aug 2025 16:29:05 -0700
Subject: [PATCH 3246/3724] signalbackup-tools: 20250818-1 -> 20250824

Diff: https://github.com/bepaald/signalbackup-tools/compare/20250818-1...20250824
---
 pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 19dce23a62f1..6e0e5d807517 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20250818-1";
+  version = "20250824";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     tag = version;
-    hash = "sha256-qVKtFgSnxXZEwmzVen62BLnLsklyoFdYCX1bVp8TNMI=";
+    hash = "sha256-V2q3eA/Bqa98RdF2/Quta2qA7MmL1xiPNXsRehee9zU=";
   };
 
   nativeBuildInputs = [

From c578e45f5da3e2f861ca72c06bc5973d5ad231b2 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Sun, 24 Aug 2025 16:46:40 -0700
Subject: [PATCH 3247/3724] npingler: unstable-2025-08-21 ->
 unstable-2025-08-24

This includes a number of features and bugfixes, including:
- Improved profile path detection
- Improved logging
- `sudo` commands are not run when the're not needed
- Derivations can now be diffed with commands like `nix-diff` or `nvd`
- Args like `--verbose` or `--dry-run` can now be given in any position,
  including after subcommands
- You can now run `npingler build` to build a new profile without
  switching to it
---
 pkgs/by-name/np/npingler/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/np/npingler/package.nix b/pkgs/by-name/np/npingler/package.nix
index 6223a0eaac79..443cf4f50b7c 100644
--- a/pkgs/by-name/np/npingler/package.nix
+++ b/pkgs/by-name/np/npingler/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "npingler";
-  version = "unstable-2025-08-21";
+  version = "unstable-2025-08-24";
 
   src = fetchFromGitHub {
     owner = "9999years";
     repo = "npingler";
-    rev = "de47bb5c5c188ba3b36958c2284dbc6d24f2687f";
-    hash = "sha256-4Q8oG2iem9dgsTTEFfhyw2rPAxtXdGx+Uhb/9uAdUy4=";
+    rev = "b897098be1df890b669dc734edcb10bf8fc798cb";
+    hash = "sha256-mMwfonIP8fnJDNdl9ANhLmYlM8tPLtBCWNIPSRBT/D4=";
   };
 
-  cargoHash = "sha256-wTW0cwi6C2WRlH2ifPMTdLAEZg4VbE5Jr5Mh+e+SjaM=";
+  cargoHash = "sha256-VhMpgrNy0NauwBSCR+5vjod9H216HPC+rdQUIFVjnRg=";
 
   meta = {
     description = "Nix profile manager for use with npins";

From ce56e68024d42f5d8e033cbaad8ff86a44b43f6a Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Sun, 24 Aug 2025 16:51:06 -0700
Subject: [PATCH 3248/3724] python3Packages.openai: 1.100.2 -> 1.101.0

Diff: https://github.com/openai/openai-python/compare/v1.100.2...v1.101.0

Changelog: https://github.com/openai/openai-python/blob/v1.101.0/CHANGELOG.md
---
 pkgs/development/python-modules/openai/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index cd2cc24fb449..c127e68c1923 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -51,14 +51,14 @@
 
 buildPythonPackage rec {
   pname = "openai";
-  version = "1.100.2";
+  version = "1.101.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "openai-python";
     tag = "v${version}";
-    hash = "sha256-6pw5IWkxmAcJvmEEPuqSq8GmQyZeGPL/2LmCxZDXlLA=";
+    hash = "sha256-XCstUYM2jiq3PbNiRmLnguzQtvrGk0Ik5K0tk37bq2U=";
   };
 
   postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"'';

From a3c1bf2b2404fa1a45bee916f385c76219b81071 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 23:51:16 +0000
Subject: [PATCH 3249/3724] seagoat: 1.0.20 -> 1.0.25

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

diff --git a/pkgs/by-name/se/seagoat/package.nix b/pkgs/by-name/se/seagoat/package.nix
index 3819a06875b4..a82823c65d7e 100644
--- a/pkgs/by-name/se/seagoat/package.nix
+++ b/pkgs/by-name/se/seagoat/package.nix
@@ -14,14 +14,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "seagoat";
-  version = "1.0.20";
+  version = "1.0.25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kantord";
     repo = "SeaGOAT";
     tag = "v${version}";
-    hash = "sha256-UbvWvPEd4SRVZpnANJD3V/oZAQrqOeEjWwr5TyOZjNI=";
+    hash = "sha256-Qg4sYp2glD7TI6MjqTGFFDlwpLdy7apckTUT29NSK6k=";
   };
 
   build-system = [ python3Packages.poetry-core ];

From 7e861fb7f29383385481a1806bb9179bb552f8ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 23:55:53 +0000
Subject: [PATCH 3250/3724] upbound: 0.40.1 -> 0.40.3

---
 pkgs/by-name/up/upbound/sources-stable.json | 34 ++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/up/upbound/sources-stable.json b/pkgs/by-name/up/upbound/sources-stable.json
index b0e6f4902754..b43015f58698 100644
--- a/pkgs/by-name/up/upbound/sources-stable.json
+++ b/pkgs/by-name/up/upbound/sources-stable.json
@@ -8,38 +8,38 @@
   "fetchurlAttrSet": {
     "docker-credential-up": {
       "aarch64-darwin": {
-        "hash": "sha256-IDF8VsXux30yPRf6tn0ZVzUjYWOH8M9RxkuCJeiQI9s=",
-        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/darwin_arm64.tar.gz"
+        "hash": "sha256-RuYUtOeraMygkwwlwbqcSfhLfKclbhInkppOVFBxwuU=",
+        "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/darwin_arm64.tar.gz"
       },
       "aarch64-linux": {
-        "hash": "sha256-25NSIXdbXa6RYiAgfRo9GIAP79uvbKMopQsO+nFcDLQ=",
-        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/linux_arm64.tar.gz"
+        "hash": "sha256-qvZFOXKnj27h69/JPhqH5wu86nqAa/7pHZzzTxwSTcg=",
+        "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/linux_arm64.tar.gz"
       },
       "x86_64-darwin": {
-        "hash": "sha256-z469M2QsNPXhES06tPJUrHVvgp2UomBLBeWKMujX+AI=",
-        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/darwin_amd64.tar.gz"
+        "hash": "sha256-o7JMbBeCHAN0pqUzAGDHTuIzS+9QRLeQuQnDQU2aCLw=",
+        "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/darwin_amd64.tar.gz"
       },
       "x86_64-linux": {
-        "hash": "sha256-EAHYUYUWwXOWIuZCQnvp1quu3c2CsaO9nWcqBpNGMi0=",
-        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/linux_amd64.tar.gz"
+        "hash": "sha256-eU9GsVmJtQZ5T6YrnrvV3cNZPCBD29JCqDIhyLt37Hk=",
+        "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/linux_amd64.tar.gz"
       }
     },
     "up": {
       "aarch64-darwin": {
-        "hash": "sha256-euLretQd2QML9t9F/vEhopJRA0gWgfuIPA7vdAFQsOE=",
-        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/darwin_arm64.tar.gz"
+        "hash": "sha256-9gwYejmN5mu2tYYHOiaC/R/38IdksZKP36BUXec/K9U=",
+        "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/darwin_arm64.tar.gz"
       },
       "aarch64-linux": {
-        "hash": "sha256-Td0OBK37mRBUgXBAV+ayBfMDn+/ycLS5WTaW42SMzOc=",
-        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/linux_arm64.tar.gz"
+        "hash": "sha256-XiGtOrWEfF8CQvsrutyiP2XXGaAft0WC02sqiXTOBqs=",
+        "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/linux_arm64.tar.gz"
       },
       "x86_64-darwin": {
-        "hash": "sha256-l5ApNOnc+j9z/ghW+reo+S60UHBaJdJGhS46tu59ZLM=",
-        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/darwin_amd64.tar.gz"
+        "hash": "sha256-kt2pvAJSDK91BrHD21HPX1+XnkeQaPfXPpr0Gwk6+8M=",
+        "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/darwin_amd64.tar.gz"
       },
       "x86_64-linux": {
-        "hash": "sha256-XXuotsGjY6nKDXbobBOa0Yaw4qRSX3hF89DZ/m8wfmg=",
-        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/linux_amd64.tar.gz"
+        "hash": "sha256-17C2Igba/apKI4iTu8hIzlcI7PkXAAwM/eqoBeuWcpw=",
+        "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/linux_amd64.tar.gz"
       }
     }
   },
@@ -49,5 +49,5 @@
     "x86_64-darwin",
     "x86_64-linux"
   ],
-  "version": "0.40.1"
+  "version": "0.40.3"
 }

From d4f903a9bac491167ed7a0e208d8f555b4edb878 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 23:58:46 +0000
Subject: [PATCH 3251/3724] python3Packages.pyais: 2.13.0 -> 2.13.1

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

diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix
index c604cae39a06..9eba9db3c2fb 100644
--- a/pkgs/development/python-modules/pyais/default.nix
+++ b/pkgs/development/python-modules/pyais/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyais";
-  version = "2.13.0";
+  version = "2.13.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "M0r13n";
     repo = "pyais";
     tag = "v${version}";
-    hash = "sha256-72P2I6RlK3wzvvvYdpkeLDqBmKHqcHvkl3g0+tewvho=";
+    hash = "sha256-T6ibxUt62oZ1obokdFIU9l0hmtCMnZzc/YOIK2QUcCE=";
   };
 
   build-system = [ setuptools ];

From 4b08c4e4e25ccdc694fcbaae9e3c570e958b3563 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 25 Aug 2025 02:04:50 +0200
Subject: [PATCH 3252/3724] python3Packages.xgrammar: mark as broken on darwin

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

diff --git a/pkgs/development/python-modules/xgrammar/default.nix b/pkgs/development/python-modules/xgrammar/default.nix
index 16961ad77c19..c7f26b35eb41 100644
--- a/pkgs/development/python-modules/xgrammar/default.nix
+++ b/pkgs/development/python-modules/xgrammar/default.nix
@@ -95,5 +95,10 @@ buildPythonPackage rec {
     homepage = "https://xgrammar.mlc.ai";
     changelog = "https://github.com/mlc-ai/xgrammar/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
+    badPlatforms = [
+      # clang++: error: unsupported option '-ffat-lto-objects' for target 'arm64-apple-darwin'
+      # idem for 'x86_64-apple-darwin'
+      lib.systems.inspect.patterns.isDarwin
+    ];
   };
 }

From 8ff9a3635c4d848d9946de07e1521b1e5cfe8d1e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 25 Aug 2025 02:07:02 +0200
Subject: [PATCH 3253/3724] python3Packages.xgrammar: mark as broken on
 aarch64-linux

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

diff --git a/pkgs/development/python-modules/xgrammar/default.nix b/pkgs/development/python-modules/xgrammar/default.nix
index c7f26b35eb41..ef67d4b22abd 100644
--- a/pkgs/development/python-modules/xgrammar/default.nix
+++ b/pkgs/development/python-modules/xgrammar/default.nix
@@ -96,6 +96,9 @@ buildPythonPackage rec {
     changelog = "https://github.com/mlc-ai/xgrammar/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     badPlatforms = [
+      # error: ‘operator delete’ called on unallocated object ‘result’ [-Werror=free-nonheap-object]
+      "aarch64-linux"
+
       # clang++: error: unsupported option '-ffat-lto-objects' for target 'arm64-apple-darwin'
       # idem for 'x86_64-apple-darwin'
       lib.systems.inspect.patterns.isDarwin

From 766126029de4041c119d1c04fcd1f5cc362cbc4b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 25 Aug 2025 00:39:55 +0200
Subject: [PATCH 3254/3724] python3Packages.outlines-core: 0.1.26 -> 0.2.11

Diff: https://github.com/dottxt-ai/outlines-core/compare/0.1.26...0.2.11

Changelog:
https://github.com/dottxt-ai/outlines-core/releases/tag/0.2.11
---
 .../python-modules/outlines-core/Cargo.lock   | 1651 ++++++++++++-----
 .../python-modules/outlines-core/default.nix  |   50 +-
 2 files changed, 1248 insertions(+), 453 deletions(-)

diff --git a/pkgs/development/python-modules/outlines-core/Cargo.lock b/pkgs/development/python-modules/outlines-core/Cargo.lock
index abad149b1273..20b287a1c984 100644
--- a/pkgs/development/python-modules/outlines-core/Cargo.lock
+++ b/pkgs/development/python-modules/outlines-core/Cargo.lock
@@ -2,6 +2,15 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "addr2line"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "gimli",
+]
+
 [[package]]
 name = "adler2"
 version = "2.0.0"
@@ -23,6 +32,44 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
+[[package]]
+name = "aws-lc-rs"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fcc8f365936c834db5514fc45aee5b1202d677e6b40e48468aaaa8183ca8c7"
+dependencies = [
+ "aws-lc-sys",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079"
+dependencies = [
+ "bindgen",
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+]
+
+[[package]]
+name = "backtrace"
+version = "0.3.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -37,23 +84,47 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bincode"
-version = "2.0.0-rc.3"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11ea1a0346b94ef188834a65c068a03aec181c94896d481d7a0a40d85b0ce95"
+checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740"
 dependencies = [
  "bincode_derive",
  "serde",
+ "unty",
 ]
 
 [[package]]
 name = "bincode_derive"
-version = "2.0.0-rc.3"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e30759b3b99a1b802a7a3aa21c85c3ded5c28e1c83170d82d70f08bbf7f3e4c"
+checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09"
 dependencies = [
  "virtue",
 ]
 
+[[package]]
+name = "bindgen"
+version = "0.69.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+dependencies = [
+ "bitflags 2.9.1",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.12.1",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash 1.1.0",
+ "shlex",
+ "syn",
+ "which",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -62,15 +133,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -79,14 +150,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
-name = "cc"
-version = "1.2.1"
+name = "bytes"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "cc"
+version = "1.2.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
 dependencies = [
+ "jobserver",
+ "libc",
  "shlex",
 ]
 
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -94,34 +182,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "console"
-version = "0.15.8"
+name = "cfg_aliases"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "cmake"
+version = "0.1.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "console"
+version = "0.15.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
 dependencies = [
  "encode_unicode",
- "lazy_static",
  "libc",
- "unicode-width 0.1.14",
- "windows-sys 0.52.0",
+ "once_cell",
+ "unicode-width",
+ "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
 [[package]]
 name = "crc32fast"
 version = "1.4.2"
@@ -133,9 +231,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -152,15 +250,15 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "darling"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -168,9 +266,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
 dependencies = [
  "fnv",
  "ident_case",
@@ -182,9 +280,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core",
  "quote",
@@ -255,31 +353,37 @@ dependencies = [
 ]
 
 [[package]]
-name = "either"
-version = "1.13.0"
+name = "dunce"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "encode_unicode"
-version = "0.3.6"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
 
 [[package]]
 name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -287,21 +391,12 @@ name = "esaxx-rs"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
 
 [[package]]
 name = "flate2"
-version = "1.0.35"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
+checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -313,21 +408,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -338,21 +418,116 @@ dependencies = [
 ]
 
 [[package]]
-name = "getrandom"
-version = "0.2.15"
+name = "fs_extra"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
- "cfg-if",
- "libc",
- "wasi",
+ "futures-core",
 ]
 
 [[package]]
-name = "hashbrown"
-version = "0.15.1"
+name = "futures-core"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
+[[package]]
+name = "glob"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+
+[[package]]
+name = "hashbrown"
+version = "0.15.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 
 [[package]]
 name = "heck"
@@ -362,38 +537,147 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hf-hub"
-version = "0.3.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732"
+checksum = "112fa2f6ad4ab815b9e1b938b4b1e437032d055e2f92ed10fd6ab2e62d02c6b6"
 dependencies = [
  "dirs",
+ "http",
  "indicatif",
  "log",
- "native-tls",
- "rand",
+ "rand 0.8.5",
+ "reqwest",
+ "rustls",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "ureq",
 ]
 
 [[package]]
-name = "icu_collections"
-version = "1.5.0"
+name = "home"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "http"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "hyper"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http",
+ "http-body",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+ "webpki-roots 0.26.11",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "libc",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
 dependencies = [
  "displaydoc",
+ "potential_utf",
  "yoke",
  "zerofrom",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_locid"
-version = "1.5.0"
+name = "icu_locale_core"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -402,31 +686,11 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
 [[package]]
 name = "icu_normalizer"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -434,67 +698,54 @@ dependencies = [
  "icu_properties",
  "icu_provider",
  "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
 
 [[package]]
 name = "icu_properties"
-version = "1.5.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a"
 dependencies = [
  "displaydoc",
  "icu_collections",
- "icu_locid_transform",
+ "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "tinystr",
+ "potential_utf",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04"
 
 [[package]]
 name = "icu_provider"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
 dependencies = [
  "displaydoc",
- "icu_locid",
- "icu_provider_macros",
+ "icu_locale_core",
  "stable_deref_trait",
  "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
+ "zerotrie",
  "zerovec",
 ]
 
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -514,9 +765,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -524,9 +775,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -534,22 +785,28 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.17.9"
+version = "0.17.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281"
+checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235"
 dependencies = [
  "console",
  "number_prefix",
  "portable-atomic",
- "unicode-width 0.2.0",
+ "unicode-width",
  "web-time",
 ]
 
 [[package]]
 name = "indoc"
-version = "2.0.5"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
+
+[[package]]
+name = "ipnet"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "itertools"
@@ -570,17 +827,37 @@ dependencies = [
 ]
 
 [[package]]
-name = "itoa"
-version = "1.0.13"
+name = "itertools"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "jobserver"
+version = "0.1.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+dependencies = [
+ "getrandom 0.3.3",
+ "libc",
+]
 
 [[package]]
 name = "js-sys"
-version = "0.3.72"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -591,10 +868,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
-name = "libc"
-version = "0.2.164"
+name = "lazycell"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libc"
+version = "0.2.172"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+
+[[package]]
+name = "libloading"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
+dependencies = [
+ "cfg-if",
+ "windows-targets 0.53.0",
+]
 
 [[package]]
 name = "libredox"
@@ -602,27 +895,33 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "libc",
 ]
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "litemap"
-version = "0.7.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+
+[[package]]
+name = "lru-slab"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
 
 [[package]]
 name = "macro_rules_attribute"
@@ -655,6 +954,12 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -663,18 +968,29 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.0"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
 dependencies = [
  "adler2",
 ]
 
 [[package]]
-name = "monostate"
-version = "0.1.13"
+name = "mio"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d208407d7552cd041d8cdb69a1bc3303e029c598738177a3d87082004dc0e1e"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+dependencies = [
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "monostate"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aafe1be9d0c75642e3e50fedc7ecadf1ef1cbce6eb66462153fc44245343fbee"
 dependencies = [
  "monostate-impl",
  "serde",
@@ -682,32 +998,15 @@ dependencies = [
 
 [[package]]
 name = "monostate-impl"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0"
+checksum = "c402a4092d5e204f32c9e155431046831fa712637043c58cb73bc6bc6c9663b5"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
-[[package]]
-name = "native-tls"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -725,10 +1024,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
-name = "once_cell"
-version = "1.20.2"
+name = "object"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "onig"
@@ -752,50 +1060,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "openssl"
-version = "0.10.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -804,18 +1068,19 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "outlines-core"
-version = "0.0.0"
+version = "0.2.11"
 dependencies = [
  "bincode",
  "hf-hub",
  "once_cell",
  "pyo3",
  "regex",
- "rustc-hash",
+ "regex-automata",
+ "rustc-hash 2.1.1",
  "serde",
  "serde-pyobject",
  "serde_json",
- "thiserror 2.0.3",
+ "thiserror 2.0.12",
  "tokenizers",
 ]
 
@@ -832,40 +1097,71 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
-name = "pkg-config"
-version = "0.3.31"
+name = "pin-project-lite"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "portable-atomic"
-version = "1.9.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+
+[[package]]
+name = "potential_utf"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+dependencies = [
+ "zerovec",
+]
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
  "zerocopy",
 ]
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.92"
+name = "prettyplease"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.22.6"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884"
+checksum = "7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872"
 dependencies = [
  "cfg-if",
  "indoc",
@@ -881,9 +1177,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.22.6"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38"
+checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -891,9 +1187,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.22.6"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636"
+checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -901,9 +1197,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.22.6"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453"
+checksum = "fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -913,9 +1209,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.22.6"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe"
+checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -925,14 +1221,75 @@ dependencies = [
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.37"
+name = "quinn"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash 2.1.1",
+ "rustls",
+ "socket2",
+ "thiserror 2.0.12",
+ "tokio",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
+dependencies = [
+ "bytes",
+ "getrandom 0.3.3",
+ "lru-slab",
+ "rand 0.9.1",
+ "ring",
+ "rustc-hash 2.1.1",
+ "rustls",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.12",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -940,8 +1297,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
 ]
 
 [[package]]
@@ -951,7 +1318,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
 ]
 
 [[package]]
@@ -960,7 +1337,16 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.3",
 ]
 
 [[package]]
@@ -1000,7 +1386,7 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.16",
  "libredox",
  "thiserror 1.0.69",
 ]
@@ -1035,45 +1421,102 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
-name = "ring"
-version = "0.17.8"
+name = "reqwest"
+version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls",
+ "rustls-pemfile",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tokio-rustls",
+ "tokio-util",
+ "tower",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+ "webpki-roots 0.26.11",
+ "windows-registry",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.16",
  "libc",
- "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "rustc-hash"
-version = "2.1.0"
+name = "rustc-demangle"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustix"
-version = "0.38.41"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.17"
+version = "0.23.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e"
+checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
 dependencies = [
+ "aws-lc-rs",
  "log",
  "once_cell",
  "ring",
@@ -1084,74 +1527,62 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustls-pki-types"
-version = "1.10.0"
+name = "rustls-pemfile"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "web-time",
+ "zeroize",
+]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.8"
+version = "0.103.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
 dependencies = [
+ "aws-lc-rs",
  "ring",
  "rustls-pki-types",
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "schannel"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "serde"
-version = "1.0.215"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde-pyobject"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca4b0aad8b225845739a0030a0d5cc2ae949c56a86a7daf9226c7df7c2016d16"
+checksum = "30bb5418e5b2eb469c0e8e6eb2c9de96aa1db5e2e04f25560de78e02bb746aa6"
 dependencies = [
  "pyo3",
  "serde",
@@ -1159,9 +1590,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1170,9 +1601,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.133"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "indexmap",
  "itoa",
@@ -1181,6 +1612,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -1188,16 +1631,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
-name = "smallvec"
-version = "1.13.2"
+name = "slab"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
 
 [[package]]
-name = "spin"
-version = "0.9.8"
+name = "smallvec"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+
+[[package]]
+name = "socket2"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "socks"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b"
+dependencies = [
+ "byteorder",
+ "libc",
+ "winapi",
+]
 
 [[package]]
 name = "spm_precompiled"
@@ -1231,9 +1698,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.89"
+version = "2.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1241,10 +1708,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "synstructure"
-version = "0.13.1"
+name = "sync_wrapper"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1257,19 +1733,6 @@ version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
-[[package]]
-name = "tempfile"
-version = "3.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
-dependencies = [
- "cfg-if",
- "fastrand",
- "once_cell",
- "rustix",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -1281,11 +1744,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.3"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl 2.0.3",
+ "thiserror-impl 2.0.12",
 ]
 
 [[package]]
@@ -1301,9 +1764,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.3"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1312,34 +1775,48 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.7.6"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
 dependencies = [
  "displaydoc",
  "zerovec",
 ]
 
 [[package]]
-name = "tokenizers"
-version = "0.20.3"
+name = "tinyvec"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b67c92f6d705e2a1d106fb0b28c696f9074901a9c656ee5d9f5de204c39bf7"
+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokenizers"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3169b3195f925496c895caee7978a335d49218488ef22375267fba5a46a40bd7"
 dependencies = [
  "aho-corasick",
  "derive_builder",
  "esaxx-rs",
- "getrandom",
+ "getrandom 0.2.16",
  "hf-hub",
- "indicatif",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "lazy_static",
  "log",
  "macro_rules_attribute",
  "monostate",
  "onig",
  "paste",
- "rand",
+ "rand 0.8.5",
  "rayon",
  "rayon-cond",
  "regex",
@@ -1347,17 +1824,107 @@ dependencies = [
  "serde",
  "serde_json",
  "spm_precompiled",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "unicode-normalization-alignments",
  "unicode-segmentation",
  "unicode_categories",
 ]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.14"
+name = "tokio"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "socket2",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "unicode-normalization-alignments"
@@ -1374,12 +1941,6 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
 [[package]]
 name = "unicode-width"
 version = "0.2.0"
@@ -1394,9 +1955,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
 [[package]]
 name = "unindent"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
+checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
 
 [[package]]
 name = "untrusted"
@@ -1405,41 +1966,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
-name = "ureq"
-version = "2.10.1"
+name = "unty"
+version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
+checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
+
+[[package]]
+name = "ureq"
+version = "2.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
 dependencies = [
  "base64 0.22.1",
  "flate2",
  "log",
- "native-tls",
  "once_cell",
  "rustls",
  "rustls-pki-types",
  "serde",
  "serde_json",
+ "socks",
  "url",
- "webpki-roots",
+ "webpki-roots 0.26.11",
 ]
 
 [[package]]
 name = "url"
-version = "2.5.3"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
 ]
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -1447,16 +2008,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
-name = "vcpkg"
-version = "0.2.15"
+name = "virtue"
+version = "0.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1"
 
 [[package]]
-name = "virtue"
-version = "0.0.13"
+name = "want"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
 
 [[package]]
 name = "wasi"
@@ -1465,25 +2029,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
-name = "wasm-bindgen"
-version = "0.2.95"
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.95"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
  "syn",
@@ -1491,10 +2064,23 @@ dependencies = [
 ]
 
 [[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.95"
+name = "wasm-bindgen-futures"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1502,9 +2088,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.95"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1515,9 +2101,35 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.95"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "wasm-streams"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
 
 [[package]]
 name = "web-time"
@@ -1531,13 +2143,91 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.7"
+version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e"
+checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
+dependencies = [
+ "webpki-roots 1.0.0",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb"
 dependencies = [
  "rustls-pki-types",
 ]
 
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-link"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+
+[[package]]
+name = "windows-registry"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.53.0",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b895b5356fc36103d0f64dd1e94dfa7ac5633f1c9dd6e80fe9ec4adef69e09d"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -1589,13 +2279,29 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -1608,6 +2314,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -1620,6 +2332,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -1632,12 +2350,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -1650,6 +2380,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -1662,6 +2398,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -1674,6 +2416,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -1687,22 +2435,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
-name = "write16"
-version = "1.0.0"
+name = "windows_x86_64_msvc"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags 2.9.1",
+]
 
 [[package]]
 name = "writeable"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
 
 [[package]]
 name = "yoke"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -1712,9 +2469,9 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1724,19 +2481,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
 dependencies = [
- "byteorder",
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1745,18 +2501,18 @@ dependencies = [
 
 [[package]]
 name = "zerofrom"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1771,10 +2527,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 
 [[package]]
-name = "zerovec"
-version = "0.10.4"
+name = "zerotrie"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -1783,9 +2550,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.10.3"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/pkgs/development/python-modules/outlines-core/default.nix b/pkgs/development/python-modules/outlines-core/default.nix
index 2e39baea6579..cca2b10ff673 100644
--- a/pkgs/development/python-modules/outlines-core/default.nix
+++ b/pkgs/development/python-modules/outlines-core/default.nix
@@ -1,37 +1,48 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
+  fetchFromGitHub,
+
+  # nativeBuildInputs
   cargo,
   pkg-config,
   rustPlatform,
   rustc,
+
+  # buildInputs
   openssl,
+
+  # build-system
   setuptools-rust,
   setuptools-scm,
+
+  # dependencies
   interegular,
   jsonschema,
+
+  # optional-dependencies
   datasets,
   numpy,
-  pytestCheckHook,
   pydantic,
   scipy,
   torch,
   transformers,
+
+  # tests
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "outlines-core";
-  version = "0.1.26";
+  version = "0.2.11";
+
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit version;
-    pname = "outlines_core";
-    hash = "sha256-SBxDATQed8yPGDLWFnhK201GG0/sZYeOfA0sunFjoYk=";
+  src = fetchFromGitHub {
+    owner = "dottxt-ai";
+    repo = "outlines-core";
+    tag = version;
+    hash = "sha256-lLMTHFytJT2MhnzT0RlRCaSBPijA81fjxUqx4IGfVo8=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {
@@ -39,6 +50,11 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
+    substituteInPlace Cargo.toml \
+      --replace-fail \
+        'version = "0.0.0"' \
+        'version = "${version}"'
+
     cp --no-preserve=mode ${./Cargo.lock} Cargo.lock
   '';
 
@@ -46,6 +62,7 @@ buildPythonPackage rec {
     cargo
     pkg-config
     rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
     rustc
   ];
 
@@ -74,16 +91,27 @@ buildPythonPackage rec {
     ];
   };
 
+  pythonImportsCheck = [ "outlines_core" ];
+
+  preCheck = ''
+    rm -rf outlines_core
+  '';
+
   nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [
     # Tests that need to download from Hugging Face Hub.
     "test_complex_serialization"
     "test_create_fsm_index_tokenizer"
+    "test_from_pretrained"
+    "test_pickling_from_pretrained_with_revision"
     "test_reduced_vocabulary_with_rare_tokens"
   ];
 
-  pythonImportsCheck = [ "outlines_core" ];
+  disabledTestPaths = [
+    # Downloads from Hugging Face Hub
+    "tests/test_kernels.py"
+  ];
 
   meta = {
     description = "Structured text generation (core)";

From f41518ce88b7e62e00e361ac07f07cb05f75f65c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 25 Aug 2025 00:37:26 +0200
Subject: [PATCH 3255/3724] python3Packages.outlines: 1.2.1 -> 1.2.3

Diff: https://github.com/outlines-dev/outlines/compare/1.2.1...1.2.3

Changelog: https://github.com/dottxt-ai/outlines/releases/tag/1.2.3
---
 .../python-modules/outlines/default.nix       | 156 ++++++++++++++++--
 1 file changed, 140 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix
index 6cef333055bd..e9162d6bf51b 100644
--- a/pkgs/development/python-modules/outlines/default.nix
+++ b/pkgs/development/python-modules/outlines/default.nix
@@ -2,37 +2,55 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   setuptools,
   setuptools-scm,
+
+  # dependencies
   airportsdata,
-  interegular,
   cloudpickle,
   datasets,
   diskcache,
+  genson,
+  interegular,
+  iso3166,
   jinja2,
   jsonschema,
+  lark,
+  nest-asyncio,
   numpy,
   outlines-core,
   pycountry,
   pydantic,
-  lark,
-  nest-asyncio,
   referencing,
   requests,
   torch,
   transformers,
+
+  # tests
+  anthropic,
+  google-genai,
+  jax,
+  llama-cpp-python,
+  ollama,
+  openai,
+  pytest-asyncio,
+  pytest-mock,
+  pytestCheckHook,
+  tensorflow,
 }:
 
 buildPythonPackage rec {
   pname = "outlines";
-  version = "1.2.1";
+  version = "1.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "outlines-dev";
     repo = "outlines";
     tag = version;
-    hash = "sha256-WmkA+plIouEzleo3yoSxfCjK0E3EfMGQIPl20aIKxl8=";
+    hash = "sha256-t1YSkFC56De9HkdDJN9WIpKDdHxZRfGRbFOtAiJxKUI=";
   };
 
   build-system = [
@@ -42,33 +60,139 @@ buildPythonPackage rec {
 
   dependencies = [
     airportsdata
-    interegular
     cloudpickle
     datasets
     diskcache
+    genson
+    interegular
+    iso3166
     jinja2
     jsonschema
-    outlines-core
-    pydantic
     lark
     nest-asyncio
     numpy
+    outlines-core
+    pycountry
+    pydantic
     referencing
     requests
     torch
     transformers
-    pycountry
   ];
 
-  checkPhase = ''
-    export HOME=$(mktemp -d)
-    python3 -c 'import outlines'
-  '';
+  pythonImportsCheck = [ "outlines" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    anthropic
+    google-genai
+    jax
+    llama-cpp-python
+    ollama
+    openai
+    pytest-asyncio
+    pytest-mock
+    pytestCheckHook
+    tensorflow
+  ];
+
+  disabledTests = [
+    # Try to dowload models from Hugging Face Hub
+    "test_application_callable_call"
+    "test_application_generator_reuse"
+    "test_application_template_call"
+    "test_application_template_error"
+    "test_generator_black_box_async_processor"
+    "test_generator_black_box_sync_processor"
+    "test_generator_init_multiple_output_type"
+    "test_generator_steerable_output_type"
+    "test_generator_steerable_processor"
+    "test_llamacpp_type_adapter_format_output_type"
+    "test_steerable_generator_call"
+    "test_steerable_generator_init_cfg_output_type"
+    "test_steerable_generator_init_invalid_output_type"
+    "test_steerable_generator_init_other_output_type"
+    "test_steerable_generator_init_valid_processor"
+    "test_steerable_generator_stream"
+    "test_transformer_tokenizer_convert_token_to_string"
+    "test_transformer_tokenizer_decode"
+    "test_transformer_tokenizer_encode"
+    "test_transformer_tokenizer_eq"
+    "test_transformer_tokenizer_getstate_setstate"
+    "test_transformer_tokenizer_hash"
+    "test_transformer_tokenizer_init"
+
+    # TypeError: "Could not resolve authentication method.
+    # Expected either api_key or auth_token to be set.
+    # Or for one of the `X-Api-Key` or `Authorization` headers to be explicitly omitted.
+    "test_anthopic_streaming"
+    "test_anthropic_chat"
+    "test_anthropic_simple_call"
+    "test_anthropic_simple_vision"
+
+    # ConnectionError: Failed to connect to Ollama.
+    "test_ollama_async_chat"
+    "test_ollama_async_direct"
+    "test_ollama_async_json"
+    "test_ollama_async_simple"
+    "test_ollama_async_simple_vision"
+    "test_ollama_async_stream"
+    "test_ollama_async_stream_json"
+    "test_ollama_chat"
+    "test_ollama_direct"
+    "test_ollama_json"
+    "test_ollama_simple"
+    "test_ollama_simple_vision"
+    "test_ollama_stream"
+    "test_ollama_stream_json"
+
+    # openai.APIConnectionError: Connection error.
+    "test_openai_async_chat"
+    "test_openai_async_direct_call"
+    "test_openai_async_simple_call"
+    "test_openai_async_simple_call_multiple_samples"
+    "test_openai_async_simple_json_schema"
+    "test_openai_async_simple_pydantic"
+    "test_openai_async_simple_pydantic_refusal"
+    "test_openai_async_simple_vision"
+    "test_openai_async_simple_vision_pydantic"
+    "test_openai_async_streaming"
+    "test_openai_chat"
+    "test_openai_direct_call"
+    "test_openai_simple_call"
+    "test_openai_simple_call_multiple_samples"
+    "test_openai_simple_json_schema"
+    "test_openai_simple_pydantic"
+    "test_openai_simple_pydantic_refusal"
+    "test_openai_simple_vision"
+    "test_openai_simple_vision_pydantic"
+    "test_openai_streaming"
+  ];
+
+  disabledTestPaths = [
+    # Try to dowload models from Hugging Face Hub
+    "tests/backends/test_backends.py"
+    "tests/backends/test_llguidance.py"
+    "tests/backends/test_outlines_core.py"
+    "tests/backends/test_xgrammar.py"
+    "tests/models/test_llamacpp.py"
+    "tests/models/test_llamacpp_tokenizer.py"
+    "tests/models/test_transformers.py"
+    "tests/models/test_transformers_multimodal.py"
+    "tests/models/test_transformers_multimodal_type_adapter.py"
+    "tests/models/test_transformers_type_adapter.py"
+
+    # Requires unpackaged dottxt
+    "tests/models/test_dottxt.py"
+
+    # ValueError: Missing key inputs argument! To use the Google AI API, provide (`api_key`) arguments.
+    "tests/models/test_gemini.py"
+  ];
+
+  meta = {
     description = "Structured text generation";
     homepage = "https://github.com/outlines-dev/outlines";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ lach ];
+    changelog = "https://github.com/dottxt-ai/outlines/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ lach ];
   };
 }

From 15fad33a2715884a3082ab277949b191571eeaa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 24 Aug 2025 14:17:00 -0700
Subject: [PATCH 3256/3724] mat2: use python312

On Python 3.13, `tests/test_libmat2.py::TestCleaning::test_html` fails with

    ValueError: The closing tag title doesn't have a corresponding opening one in ./tests/data/clean.html.
---
 pkgs/by-name/ma/mat2/package.nix | 9 +++++++++
 pkgs/top-level/all-packages.nix  | 2 --
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/ma/mat2/package.nix

diff --git a/pkgs/by-name/ma/mat2/package.nix b/pkgs/by-name/ma/mat2/package.nix
new file mode 100644
index 000000000000..ac4f59620916
--- /dev/null
+++ b/pkgs/by-name/ma/mat2/package.nix
@@ -0,0 +1,9 @@
+{
+  # On Python 3.13, `tests/test_libmat2.py::TestCleaning::test_html` fails with
+  #
+  #     ValueError: The closing tag title doesn't have a corresponding opening one in ./tests/data/clean.html.
+  python312Packages,
+}:
+
+with python312Packages;
+toPythonApplication mat2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6d8b2a70fa6..b549f107d024 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2228,8 +2228,6 @@ with pkgs;
 
   maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { };
 
-  mat2 = with python3.pkgs; toPythonApplication mat2;
-
   materialx = with python3Packages; toPythonApplication materialx;
 
   # while building documentation meson may want to run binaries for host

From 9684c484070a8bc050244df21a988b82284c9d55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 00:32:39 +0000
Subject: [PATCH 3257/3724] rbw: 1.13.2 -> 1.14.0

---
 pkgs/by-name/rb/rbw/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix
index a785dcc428f3..c1c4d74b2dac 100644
--- a/pkgs/by-name/rb/rbw/package.nix
+++ b/pkgs/by-name/rb/rbw/package.nix
@@ -24,14 +24,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rbw";
-  version = "1.13.2";
+  version = "1.14.0";
 
   src = fetchzip {
     url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz";
-    hash = "sha256-ebLbdIF+BybK7ssNtZacGWmAEwdNZh8b94QYgvcwzmM=";
+    hash = "sha256-5KEOjnhn12QnR2CBBuUMHLOOyfkCMY/R3LzoP/EfBbA=";
   };
 
-  cargoHash = "sha256-xDb4shDHCbd0yuTSAt80i1aqyuhpkfd/fYF98CfXdcM=";
+  cargoHash = "sha256-GbPh999yM28qNRBpG2zs03EzwAKCG6CwqDP8JYedfl0=";
 
   nativeBuildInputs = [
     installShellFiles

From bd953fc1a80da0e86a40f89a4d0bfdc99270dd3e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 25 Aug 2025 02:32:59 +0200
Subject: [PATCH 3258/3724] python3Packages.vcver: drop

Was introduced as a dependency of deepmerge, which dropped it in 2021.
---
 .../python-modules/vcver/default.nix          | 33 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/development/python-modules/vcver/default.nix

diff --git a/pkgs/development/python-modules/vcver/default.nix b/pkgs/development/python-modules/vcver/default.nix
deleted file mode 100644
index d1f5d20566f4..000000000000
--- a/pkgs/development/python-modules/vcver/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  packaging,
-}:
-
-buildPythonPackage {
-  pname = "vcver";
-  version = "0.2.12";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "toumorokoshi";
-    repo = "vcver-python";
-    rev = "c5d8a6f1f0e49bb25f5dbb07312e42cb4da096d6";
-    sha256 = "1cvgs70jf7ki78338zaglaw2dkvyndmx15ybd6k4zqwwsfgk490b";
-  };
-
-  propagatedBuildInputs = [ packaging ];
-
-  # circular dependency on test tool uranium https://pypi.org/project/uranium/
-  doCheck = false;
-
-  pythonImportsCheck = [ "vcver" ];
-
-  meta = with lib; {
-    description = "Reference Implementation of vcver";
-    homepage = "https://github.com/toumorokoshi/vcver-python";
-    license = licenses.mit;
-    maintainers = with maintainers; [ hexa ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b5830cf6fe21..cb4854915657 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -836,6 +836,7 @@ mapAliases ({
   uuid = throw "uuid is a Python standard module"; # added 2024-04-18
   validictory = throw "validictory has been removed, since it abandoned"; # added 2023-07-07
   validphys2 = throw "validphys2 has been removed, since it had a broken dependency that was removed"; # added 2023-07-07
+  vcver = throw "vcver has been removed, since it was an unused leaf package"; # added 2025-08-25
   vega_datasets = vega-datasets; # added 2023-11-04
   ViennaRNA = viennarna; # added 2023-08-23
   virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3429aee40ea..2e8e93b25913 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19465,8 +19465,6 @@ self: super: with self; {
 
   vcrpy = callPackage ../development/python-modules/vcrpy { };
 
-  vcver = callPackage ../development/python-modules/vcver { };
-
   vcversioner = callPackage ../development/python-modules/vcversioner { };
 
   vdf = callPackage ../development/python-modules/vdf { };

From d8a1fc36b5db5dd034ab85bee29c6ffdeaf5da03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 00:55:38 +0000
Subject: [PATCH 3259/3724] libjodycode: 4.0 -> 4.0.1

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

diff --git a/pkgs/by-name/li/libjodycode/package.nix b/pkgs/by-name/li/libjodycode/package.nix
index 5dcd17a93262..1313041f2f1b 100644
--- a/pkgs/by-name/li/libjodycode/package.nix
+++ b/pkgs/by-name/li/libjodycode/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libjodycode";
-  version = "4.0";
+  version = "4.0.1";
 
   outputs = [
     "out"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "jbruchon";
     repo = "libjodycode";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2G6jh+eVwri3RINiFxrc7xwoGTTxlGKsEQMu9YxWSzY=";
+    hash = "sha256-9YdDw7xIuAArQtPYhDeT4AhSwi5fhVJeBl3R+J7PaCw=";
   };
 
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

From d26aa5f9514ca4179679df18f3957c3d0e9faead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 1 Oct 2024 16:34:52 -0700
Subject: [PATCH 3260/3724] svgo: init at 4.0.0

---
 pkgs/by-name/sv/svgo/missing-hashes.json | 22 ++++++++++
 pkgs/by-name/sv/svgo/package.nix         | 56 ++++++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 pkgs/by-name/sv/svgo/missing-hashes.json
 create mode 100644 pkgs/by-name/sv/svgo/package.nix

diff --git a/pkgs/by-name/sv/svgo/missing-hashes.json b/pkgs/by-name/sv/svgo/missing-hashes.json
new file mode 100644
index 000000000000..964e11a01bf8
--- /dev/null
+++ b/pkgs/by-name/sv/svgo/missing-hashes.json
@@ -0,0 +1,22 @@
+{
+  "@rollup/rollup-android-arm-eabi@npm:4.40.1": "bd6599045fbfa1bba4eb4fa6269bf11121ac377a5e9bc5f32265b66cc190d3bf0eece89a4b0503cf38c0f91fc3d64f5daeeccd55420cf522cde478c6c8dacf4c",
+  "@rollup/rollup-android-arm64@npm:4.40.1": "89932296d6f2dd08ce2d4ee91d5cc14b5305c13f5b7ddba30dad59b525682539191b7769e5b2baf849b664d664daf26b0f29fb2950c2456ff85c5bb11ca39bed",
+  "@rollup/rollup-darwin-arm64@npm:4.40.1": "0eae1bc7d76ad339ccbfb1571fae06d9c3ad60cf95a513c42f14fb7cbc74697d35ce5f81f5b9a619cb7ff17ae8d78d9f39e78ab9ed2d94bf3755fd4c4b593929",
+  "@rollup/rollup-darwin-x64@npm:4.40.1": "524543130b510ef8f9775d55ddc6dd3735a1cbd82ffb95b74d677c9cc179848027cffdc6b7318976fa516497c73bc3039da8bbdfabd268156ca0ca1cc41428a8",
+  "@rollup/rollup-freebsd-arm64@npm:4.40.1": "1e43d5075bdcf1480a04dd7121036fdb1d6432848359cf6d9669d324d4556a2e354a758e276d7a6c2761b9fbefdab1307c58d459968ea847db7be20fe51b1c22",
+  "@rollup/rollup-freebsd-x64@npm:4.40.1": "f1c1921630d49602836ae77b7c1f0790e71b1317cb68733a21ce9ed6529c222265ae93e4c33eba590695015b3f43c0c54cd0aaa138531ffe3051880673ac2f5d",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.1": "bea6ef52650bd0c795429d635a2c8429eecbe5f8365e927cdbca02c1d07d1e28af760669e2d4b7c5ae5ff575c803fae6c370d74b342ea5d4625276dd4651accc",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.40.1": "cf41bd211e700928864808382c183e3f41fbc6f4804a9be0292b738f31b8b48ec9721e8717703960875aa0dc15075d7a191e6feb9b6af444ee4c0acd482da50f",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.40.1": "992f2dbd1f01bfe12c6ff72c5aebc2f7624bae973f8f992aa33422e12b516a718c18076202bfd4dc678ffa82f7ef9e3583582aacca9f4f7fde3e7164e76420ce",
+  "@rollup/rollup-linux-arm64-musl@npm:4.40.1": "96a17721328bf35fbedecb2a94a881e407179b364921178d1c64a481831ff9ca5b260f627056461c7854946e9c2c854aef537e25ecbce3f1b70b810371f45267",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.1": "e313a016a50431cdd0fc2f3855cd345a921304793ab205ff3860523dcd009edd6efd7afc6197220faa5a4e0b638fd29f732f79c91759a392d221d708eceb3af6",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.1": "ebc53027c9f6b9b3c36a008fa73958b21f52ece080cda6d2329f6412f255f73ccfed52083b9efff14950511a2a6a2dcb4351347db19f19920f33bbb6d1446be8",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.40.1": "9d4e28526eedbf681bc1897da4e61b08657b9a396841e057995c7a54999aeb21548308e30430bfd9c3b9da09deeac7800b1da88bfbebea3c1f2442424107f13c",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.40.1": "c5f4b1d84f9a468bca4582192da1c8a0242bbb1b96965b3becb96a8a0a19d6522f741e52d591bbf3d9aba6c16a247fef02ed7a4a37a11bbd035f50a5bfd3c5af",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.40.1": "15ddb6faa9d49a12f87f97a21e16c171b49167b1dfe86d3a81a059e38901fc8edc9d49a68fc88e809699bd77b9eb72edde8bbb49bfb58a40438aa9dd4ceba1ea",
+  "@rollup/rollup-linux-x64-gnu@npm:4.40.1": "3c240b9aafb8c5360656326cd112568f3003082450dc48fc1eb4a01da460930abbf6235a85cee153f182eeeadcb28ab65116b93e2725e8d935ae60bf098024e2",
+  "@rollup/rollup-linux-x64-musl@npm:4.40.1": "27ec9c576a7f111333dc764c1ce48c0718e9617467e86fff431fa01c904b890f606f238a73fcfbc5928c78e1e7855947be78e16e49bf6044cfc0abdeffb6da9e",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.40.1": "c4a4f46690669b6d2eea20440edc46deb103cdf7f41debcfda1c0f68c41bea66526eb6f8befdc0da6192ae762c740e82f76e30164f1bbb4c36faba6c457fb905",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.40.1": "976361a3888decf0bc81521d83010e58213c264967ce23e023990ef2110a9189785fbb72c3752466179feb069f457d7242adbcb9813c9ce8f7b6363fb3ea6063",
+  "@rollup/rollup-win32-x64-msvc@npm:4.40.1": "70f30abca4447f1a9c163f07482b0f62029d545f94abe686cf40c6cb1039bd13ee00471927a4cb595c94929b97a8b189c86d7fc9872858d48b1711096ee6d45a"
+}
diff --git a/pkgs/by-name/sv/svgo/package.nix b/pkgs/by-name/sv/svgo/package.nix
new file mode 100644
index 000000000000..2cd74ca00403
--- /dev/null
+++ b/pkgs/by-name/sv/svgo/package.nix
@@ -0,0 +1,56 @@
+{
+  fetchFromGitHub,
+  lib,
+  makeWrapper,
+  nodejs,
+  stdenv,
+  yarn-berry_3,
+}:
+
+let
+  yarn-berry = yarn-berry_3;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "svgo";
+  version = "4.0.0";
+
+  src = fetchFromGitHub {
+    owner = "svg";
+    repo = "svgo";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-eSttRNHxcZquIxrTogk+7YS7rhp083qnOwJI71cmO20=";
+  };
+
+  missingHashes = ./missing-hashes.json;
+
+  offlineCache = yarn-berry.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-DrIbnm0TWviCfylCI/12XYsx7YOIk7JFVV18Q4dImwU=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+    yarn-berry.yarnBerryConfigHook
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/bin" "$out/lib/svgo"
+    cp -r bin lib node_modules package.json plugins "$out/lib/svgo"
+    makeWrapper '${lib.getExe nodejs}' "$out/bin/svgo" \
+      --add-flags "$out/lib/svgo/bin/svgo.js"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    changelog = "https://github.com/svg/svgo/releases/tag/${finalAttrs.src.tag}";
+    description = "Node.js tool for optimizing SVG files";
+    homepage = "https://github.com/svg/svgo";
+    license = lib.licenses.mit;
+    mainProgram = "svgo";
+    maintainers = [ ];
+    platforms = lib.platforms.all;
+  };
+})

From 6c32fe8992ec62a99699ad4fd11966861a7e4cfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 1 Oct 2024 16:29:03 -0700
Subject: [PATCH 3261/3724] nodePackages.svgo: drop

---
 pkgs/by-name/ak/akkoma-fe/package.nix         |  6 +--
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 50 -------------------
 pkgs/servers/web-apps/discourse/default.nix   |  4 +-
 pkgs/top-level/all-packages.nix               |  6 +--
 6 files changed, 8 insertions(+), 60 deletions(-)

diff --git a/pkgs/by-name/ak/akkoma-fe/package.nix b/pkgs/by-name/ak/akkoma-fe/package.nix
index 88096a68f044..ce282974eac4 100644
--- a/pkgs/by-name/ak/akkoma-fe/package.nix
+++ b/pkgs/by-name/ak/akkoma-fe/package.nix
@@ -9,7 +9,7 @@
   nodejs,
   jpegoptim,
   oxipng,
-  nodePackages,
+  svgo,
   nix-update-script,
 }:
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     nodejs
     jpegoptim
     oxipng
-    nodePackages.svgo
+    svgo
   ];
 
   postPatch = ''
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     # (Losslessly) optimise compression of image artifacts
     find dist -type f -name '*.jpg' -execdir ${jpegoptim}/bin/jpegoptim -w$NIX_BUILD_CORES {} \;
     find dist -type f -name '*.png' -execdir ${oxipng}/bin/oxipng -o max -t $NIX_BUILD_CORES {} \;
-    find dist -type f -name '*.svg' -execdir ${nodePackages.svgo}/bin/svgo {} \;
+    find dist -type f -name '*.svg' -execdir ${svgo}/bin/svgo {} \;
 
     cp -R -v dist $out
 
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 80024647fc3f..c8e24794e2c1 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -203,6 +203,7 @@ mapAliases {
   inherit (pkgs) stylelint; # added 2023-09-13
   surge = pkgs.surge-cli; # Added 2023-09-08
   inherit (pkgs) svelte-language-server; # Added 2024-05-12
+  inherit (pkgs) svgo; # added 2025-08-24
   swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09
   inherit (pkgs) tailwindcss; # added 2024-12-04
   teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index a2ad4054fe62..9167fa3d6624 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -144,7 +144,6 @@
 , "smartdc"
 , "speed-test"
 , "svelte-check"
-, "svgo"
 , "tern"
 , "tiddlywiki"
 , "tsun"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 6e7242c1f9c0..8e8fa9375329 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -62664,56 +62664,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  svgo = nodeEnv.buildNodePackage {
-    name = "svgo";
-    packageName = "svgo";
-    version = "3.3.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz";
-      sha512 = "OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==";
-    };
-    dependencies = [
-      sources."@trysound/sax-0.2.0"
-      sources."boolbase-1.0.0"
-      sources."commander-7.2.0"
-      sources."css-select-5.1.0"
-      (
-        sources."css-tree-2.3.1"
-        // {
-          dependencies = [
-            sources."mdn-data-2.0.30"
-          ];
-        }
-      )
-      sources."css-what-6.1.0"
-      (
-        sources."csso-5.0.5"
-        // {
-          dependencies = [
-            sources."css-tree-2.2.1"
-          ];
-        }
-      )
-      sources."dom-serializer-2.0.0"
-      sources."domelementtype-2.3.0"
-      sources."domhandler-5.0.3"
-      sources."domutils-3.2.2"
-      sources."entities-4.5.0"
-      sources."mdn-data-2.0.28"
-      sources."nth-check-2.1.1"
-      sources."picocolors-1.1.1"
-      sources."source-map-js-1.2.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Nodejs-based tool for optimizing SVG vector graphics files";
-      homepage = "https://svgo.dev";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   tern = nodeEnv.buildNodePackage {
     name = "tern";
     packageName = "tern";
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index 306fc5d776a0..bb8a4cb3770e 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -35,7 +35,7 @@
   rsync,
   icu,
   pnpm_9,
-  nodePackages,
+  svgo,
   nodejs,
   jq,
   moreutils,
@@ -82,7 +82,7 @@ let
     libjpeg
     jpegoptim
     gifsicle
-    nodePackages.svgo
+    svgo
     jhead
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6d8b2a70fa6..ea9619422a12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11017,9 +11017,7 @@ with pkgs;
 
   moeli = eduli;
 
-  emojione = callPackage ../data/fonts/emojione {
-    inherit (nodePackages) svgo;
-  };
+  emojione = callPackage ../data/fonts/emojione { };
 
   flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme {
     inherit (plasma5Packages) breeze-icons;
@@ -15078,7 +15076,7 @@ with pkgs;
 
   hjson = with python3Packages; toPythonApplication hjson;
 
-  image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; };
+  image_optim = callPackage ../applications/graphics/image_optim { };
 
   libjack2 = jack2.override { prefix = "lib"; };
 

From 7477148eb1538b00649854eceae4bcfd717455f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 01:31:33 +0000
Subject: [PATCH 3262/3724] goose: 3.24.3 -> 3.25.0

---
 pkgs/by-name/go/goose/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/goose/package.nix b/pkgs/by-name/go/goose/package.nix
index eaf2d65c495f..6515c478c06f 100644
--- a/pkgs/by-name/go/goose/package.nix
+++ b/pkgs/by-name/go/goose/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule rec {
   pname = "goose";
-  version = "3.24.3";
+  version = "3.25.0";
 
   src = fetchFromGitHub {
     owner = "pressly";
     repo = "goose";
     rev = "v${version}";
-    hash = "sha256-GfHhjpg/fMuctAEZFWnUnpnBUFOeGn2L3BSlfI9cOuE=";
+    hash = "sha256-ouyvxlnJQIMqRZt4nsR01+9p227FGBlHoCMAq6Ufh7A=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-uaCCbKAtkeTDAjHKXVdWykRGA/YlsszZR8CdM6YGFaw=";
+  vendorHash = "sha256-Cpw2xJWWW85LUS5K+KM2fCUISYwLFjsdk0gPRgIZKP4=";
 
   # skipping: end-to-end tests require a docker daemon
   postPatch = ''

From d343eb3aa254c4c21889821c8ff619e073bc74f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 01:36:50 +0000
Subject: [PATCH 3263/3724] python3Packages.types-ujson: 5.10.0.20250326 ->
 5.10.0.20250822

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

diff --git a/pkgs/development/python-modules/types-ujson/default.nix b/pkgs/development/python-modules/types-ujson/default.nix
index 1033f806a117..9c82fa09867c 100644
--- a/pkgs/development/python-modules/types-ujson/default.nix
+++ b/pkgs/development/python-modules/types-ujson/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-ujson";
-  version = "5.10.0.20250326";
+  version = "5.10.0.20250822";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_ujson";
     inherit version;
-    hash = "sha256-VGngXywx7LPEwCZ8yP5BvNEWgm+7Te1pgBpkXGh90BQ=";
+    hash = "sha256-CnlVWOH3hTI3PPPwPzWx8IvGDVLZJBh7l5le41l7oAY=";
   };
 
   build-system = [ setuptools ];

From 12b4a6f3cae57f3639fdc03c3200437f4d0b746c Mon Sep 17 00:00:00 2001
From: jacobmichels <jacob.michels2025@gmail.com>
Date: Sun, 24 Aug 2025 21:37:08 -0400
Subject: [PATCH 3264/3724] evil-helix: 20250601 -> 20250823

---
 pkgs/by-name/ev/evil-helix/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ev/evil-helix/package.nix b/pkgs/by-name/ev/evil-helix/package.nix
index cb029f85ffe2..6a19b159c0de 100644
--- a/pkgs/by-name/ev/evil-helix/package.nix
+++ b/pkgs/by-name/ev/evil-helix/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (final: {
   pname = "evil-helix";
-  version = "20250601";
+  version = "20250823";
 
   src = fetchFromGitHub {
     owner = "usagi-flow";
     repo = "evil-helix";
     tag = "release-${final.version}";
-    hash = "sha256-bsl9ltPXEhkcnnHFAXQMyBCh1qd+UBV0XK2EcJOe+eg=";
+    hash = "sha256-G4oMiXjx+/i9flVRw5M3doHpTGjEDg/27CpBd5zxpEM=";
   };
 
-  cargoHash = "sha256-epI/Xvw0mgc1IoDXpACws7Lsbkj1Xdk7conzJlUqRxY=";
+  cargoHash = "sha256-Mf0nrgMk1MlZkSyUN6mlM5lmTcrOHn3xBNzmVGtApEU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 5bd7c7905d592290933b2db4fa5791206f7fadde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 01:38:31 +0000
Subject: [PATCH 3265/3724] ghostfolio: 2.191.1 -> 2.193.0

---
 pkgs/by-name/gh/ghostfolio/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 1ac015eb2dff..bdf92ed1ce5e 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.191.1";
+  version = "2.193.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-goaR1R1jgcZ7mPeSBYAu+kd59GCIThdjvuq1t5rTdRI=";
+    hash = "sha256-/JKE2GBRAB40ho3LrsCSMbjXq8bhGShiWoYTwTRFVPE=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-RkpVmpKYHen06LxcQ1gFx6L8P/WOnjkVaHcDk8uqAKI=";
+  npmDepsHash = "sha256-bJrxClKOgbL5Dq9lUAPWPmDZG6vOFRnlkB9kl+mFvPk=";
 
   nativeBuildInputs = [
     prisma

From ce52e738122c4a3d089f444b5c20c4d8dadce8e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 01:43:29 +0000
Subject: [PATCH 3266/3724] obs-studio-plugins.obs-tuna: 1.9.10 -> 1.9.11

---
 .../video/obs-studio/plugins/obs-tuna/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix
index 87ba04219d6d..52fcc213de1f 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-tuna";
-  version = "1.9.10";
+  version = "1.9.11";
 
   nativeBuildInputs = [
     cmake
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "univrsal";
     repo = "tuna";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Y4ny8XJIk4KtmRTWdO6tHevT4Ivr1TqkNMNhua499sY=";
+    hash = "sha256-XB2qQ96HhZRpONE8EOYHbKWvI52EZwkNCyfBv6UkRjU=";
     fetchSubmodules = true;
   };
 

From d600a9fccfdf0fbb0239a3b4e8f71e651b57b3ff Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 25 Aug 2025 09:46:19 +0800
Subject: [PATCH 3267/3724] guile-sdl: drop

The software build has failed. It has no maintainer, and the library is not used by any other packages. Since it is difficult to maintain, it should be removed.
---
 pkgs/by-name/gu/guile-sdl/package.nix | 65 ---------------------------
 pkgs/top-level/aliases.nix            |  1 +
 pkgs/top-level/all-packages.nix       |  4 --
 3 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 pkgs/by-name/gu/guile-sdl/package.nix

diff --git a/pkgs/by-name/gu/guile-sdl/package.nix b/pkgs/by-name/gu/guile-sdl/package.nix
deleted file mode 100644
index b3fb533bbdaf..000000000000
--- a/pkgs/by-name/gu/guile-sdl/package.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  lib,
-  SDL,
-  SDL_image,
-  SDL_mixer,
-  SDL_ttf,
-  buildEnv,
-  fetchurl,
-  guile,
-  lzip,
-  pkg-config,
-  stdenv,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "guile-sdl";
-  version = "0.6.1";
-
-  src = fetchurl {
-    url = "mirror://gnu/guile-sdl/guile-sdl-${finalAttrs.version}.tar.lz";
-    hash = "sha256-/9sTTvntkRXck3FoRalROjqUQC8hkePtLTnHNZotKOE=";
-  };
-
-  nativeBuildInputs = [
-    SDL
-    guile
-    lzip
-    pkg-config
-  ];
-
-  configureFlags = [
-    (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest")
-  ];
-
-  buildInputs = [
-    (lib.getDev SDL)
-    (lib.getDev SDL_image)
-    (lib.getDev SDL_mixer)
-    (lib.getDev SDL_ttf)
-    guile
-  ];
-
-  makeFlags =
-    let
-      sdl-env = buildEnv {
-        name = "sdl-env";
-        paths = finalAttrs.buildInputs;
-      };
-    in
-    [
-      "SDLMINUSI=-I${sdl-env}/include/SDL"
-    ];
-
-  strictDeps = true;
-
-  meta = {
-    # clang-16: error: unsupported option '--visibility=hidden'; did you mean '-fvisibility=hidden'
-    broken = stdenv.hostPlatform.isDarwin;
-    homepage = "https://www.gnu.org/software/guile-sdl/";
-    description = "Guile bindings for SDL";
-    license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
-    inherit (guile.meta) platforms;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6a6ac68b11a7..b6ddea0e4ffb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1116,6 +1116,7 @@ mapAliases {
   gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
   guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09
   guile-disarchive = disarchive; # Added 2023-10-27
+  guile-sdl = throw "guile-sdl has been removed, as it was broken"; # Added 2025-08-25
   gutenprintBin = gutenprint-bin; # Added 2025-08-21
   gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01ca7d904597..d91bafb6ac27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6443,10 +6443,6 @@ with pkgs;
 
   guile = guile_3_0;
 
-  guile-sdl = callPackage ../by-name/gu/guile-sdl/package.nix {
-    guile = guile_2_2;
-  };
-
   guile-xcb = callPackage ../by-name/gu/guile-xcb/package.nix {
     guile = guile_2_2;
   };

From 945a6fc37f4e26a4d8201b18e8c737be8de80f89 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 25 Aug 2025 09:59:54 +0800
Subject: [PATCH 3268/3724] jscoverage: drop

The software build has failed. It has no maintainer, the upstream project has not been updated for years, and it is difficult to maintain. It should be removed.
---
 .../js/jscoverage/jsfalse_to_null.patch       | 26 --------
 pkgs/by-name/js/jscoverage/package.nix        | 66 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 1 insertion(+), 92 deletions(-)
 delete mode 100644 pkgs/by-name/js/jscoverage/jsfalse_to_null.patch
 delete mode 100644 pkgs/by-name/js/jscoverage/package.nix

diff --git a/pkgs/by-name/js/jscoverage/jsfalse_to_null.patch b/pkgs/by-name/js/jscoverage/jsfalse_to_null.patch
deleted file mode 100644
index b49594964e1f..000000000000
--- a/pkgs/by-name/js/jscoverage/jsfalse_to_null.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git i/js/jsstr.cpp w/js/jsstr.cpp
-index e662bf1..b18597e 100644
---- i/js/jsstr.cpp
-+++ w/js/jsstr.cpp
-@@ -3040,7 +3040,7 @@ js_InitStringClass(JSContext *cx, JSObject *obj)
-                                  JSVAL_VOID, NULL, NULL,
-                                  JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0,
-                                  NULL)) {
--        return JS_FALSE;
-+        return NULL;
-     }
- 
-     return proto;
-diff --git i/js/jsxml.cpp w/js/jsxml.cpp
-index 5621ede..e00c97d 100644
---- i/js/jsxml.cpp
-+++ w/js/jsxml.cpp
-@@ -303,7 +303,7 @@ NewXMLNamespace(JSContext *cx, JSString *prefix, JSString *uri, JSBool declared)
- 
-     obj = js_NewObject(cx, &js_NamespaceClass.base, NULL, NULL);
-     if (!obj)
--        return JS_FALSE;
-+        return NULL;
-     JS_ASSERT(JSVAL_IS_VOID(obj->fslots[JSSLOT_PREFIX]));
-     JS_ASSERT(JSVAL_IS_VOID(obj->fslots[JSSLOT_URI]));
-     JS_ASSERT(JSVAL_IS_VOID(obj->fslots[JSSLOT_DECLARED]));
diff --git a/pkgs/by-name/js/jscoverage/package.nix b/pkgs/by-name/js/jscoverage/package.nix
deleted file mode 100644
index 6b0044a6ef86..000000000000
--- a/pkgs/by-name/js/jscoverage/package.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  fetchurl,
-  perl,
-  python3,
-  lib,
-  stdenv,
-  zip,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "jscoverage";
-  version = "0.5.1";
-
-  src = fetchurl {
-    url = "https://siliconforks.com/${pname}/download/${pname}-${version}.tar.bz2";
-    sha256 = "c45f051cec18c10352f15f9844f47e37e8d121d5fd16680e2dd0f3b4420eb7f4";
-  };
-
-  patches = [
-    ./jsfalse_to_null.patch
-  ];
-
-  nativeBuildInputs = [
-    perl
-    python3
-    zip
-  ];
-
-  strictDeps = true;
-
-  # It works without MOZ_FIX_LINK_PATHS, circumventing an impurity
-  # issue.  Maybe we could kick js/ (spidermonkey) completely and
-  # instead use our spidermonkey via nix.
-  preConfigure = ''
-    sed -i 's/^MOZ_FIX_LINK_PATHS=.*$/MOZ_FIX_LINK_PATHS=""/' ./js/configure
-  '';
-
-  meta = {
-    description = "Code coverage for JavaScript";
-
-    longDescription = ''
-      JSCoverage is a tool that measures code coverage for JavaScript
-      programs.
-
-      Code coverage statistics show which lines of a program have been
-      executed (and which have been missed). This information is useful
-      for constructing comprehensive test suites (hence, it is often
-      called test coverage).
-
-      JSCoverage works by instrumenting the JavaScript code used in web
-      pages. Code coverage statistics are collected while the
-      instrumented JavaScript code is executed in a web browser.
-
-      JSCoverage supports the complete language syntax described in the
-      ECMAScript Language Specification (ECMA-262, 3rd
-      edition). JSCoverage works with any modern standards-compliant web
-      browser - including Internet Explorer (IE 6, 7, and 8), Firefox,
-      Opera, Safari, and Google Chrome - on Microsoft Windows and
-      GNU/Linux.
-    '';
-
-    homepage = "http://siliconforks.com/jscoverage/";
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6a6ac68b11a7..624c701df635 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1190,6 +1190,7 @@ mapAliases {
   jd-gui = throw "jd-gui has been removed due to a dependency on the dead JCenter Bintray. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
   jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
   jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07
+  jscoverage = throw "jscoverage has been removed, as it was broken"; # Added 2025-08-25
 
   # Julia
   julia_16-bin = throw "'julia_16-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-10-08

From df6258685fae9b7e609731dab7a27d924d4921c9 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 25 Aug 2025 10:06:10 +0800
Subject: [PATCH 3269/3724] manaplus: drop

The software build has failed. It has no maintainer, the upstream project has not been updated for a year, and it is difficult to maintain. It should be removed.
---
 ...ibxml2-const-ptr-and-missing-include.patch | 25 ------
 .../manaplus/0002-missing-ctime-include.patch | 30 -------
 pkgs/by-name/ma/manaplus/package.nix          | 81 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 4 files changed, 1 insertion(+), 136 deletions(-)
 delete mode 100644 pkgs/by-name/ma/manaplus/0001-libxml2-const-ptr-and-missing-include.patch
 delete mode 100644 pkgs/by-name/ma/manaplus/0002-missing-ctime-include.patch
 delete mode 100644 pkgs/by-name/ma/manaplus/package.nix

diff --git a/pkgs/by-name/ma/manaplus/0001-libxml2-const-ptr-and-missing-include.patch b/pkgs/by-name/ma/manaplus/0001-libxml2-const-ptr-and-missing-include.patch
deleted file mode 100644
index 2d31c730dddc..000000000000
--- a/pkgs/by-name/ma/manaplus/0001-libxml2-const-ptr-and-missing-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/utils/dumplibs.cpp b/src/utils/dumplibs.cpp
-index 4215d6183..2d410f150 100644
---- a/src/utils/dumplibs.cpp
-+++ b/src/utils/dumplibs.cpp
-@@ -140,7 +140,7 @@ void dumpLibs()
-     LIBXML_TEST_VERSION
- #endif  // LIBXML_TEST_VERSION
- #ifdef ENABLE_LIBXML
--    const char **xmlVersion = __xmlParserVersion();
-+    const char * const *xmlVersion = __xmlParserVersion();
-     if (xmlVersion != nullptr)
-         logger->log(" libxml2: %s", *xmlVersion);
- #endif  // ENABLE_LIBXML
-diff --git a/src/utils/xml/libxml.inc b/src/utils/xml/libxml.inc
-index c60abd095..cf4c845a9 100644
---- a/src/utils/xml/libxml.inc
-+++ b/src/utils/xml/libxml.inc
-@@ -24,6 +24,7 @@
- 
- #ifdef ENABLE_LIBXML
- 
-+#include <libxml/parser.h>
- #include <libxml/xmlwriter.h>
- 
- __XML_XMLWRITER_H__
diff --git a/pkgs/by-name/ma/manaplus/0002-missing-ctime-include.patch b/pkgs/by-name/ma/manaplus/0002-missing-ctime-include.patch
deleted file mode 100644
index 1b3b0d385758..000000000000
--- a/pkgs/by-name/ma/manaplus/0002-missing-ctime-include.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/progs/dyecmd/client.cpp b/src/progs/dyecmd/client.cpp
-index 6321da0d2..bb655519b 100644
---- a/src/progs/dyecmd/client.cpp
-+++ b/src/progs/dyecmd/client.cpp
-@@ -86,9 +86,7 @@ PRAGMA48(GCC diagnostic pop)
- #include <sys/time.h>
- #include "fs/specialfolder.h"
- #undef ERROR
--#endif  // WIN32
--
--#ifdef __clang__
-+#else
- #include <ctime>
- #endif  // __clang__
- 
-diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
-index 2df412b7d..1658e3d4a 100644
---- a/src/resources/wallpaper.cpp
-+++ b/src/resources/wallpaper.cpp
-@@ -37,9 +37,7 @@
- 
- #ifdef WIN32
- #include <sys/time.h>
--#endif  // WIN32
--
--#ifdef __clang__
-+#else
- #include <ctime>
- #endif  // __clang__
- 
diff --git a/pkgs/by-name/ma/manaplus/package.nix b/pkgs/by-name/ma/manaplus/package.nix
deleted file mode 100644
index cb30d88c53cd..000000000000
--- a/pkgs/by-name/ma/manaplus/package.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitLab,
-  SDL2,
-  SDL2_image,
-  SDL2_ttf,
-  SDL2_mixer,
-  SDL2_net,
-  SDL2_gfx,
-  zlib,
-  physfs,
-  curl,
-  libxml2,
-  libpng,
-  libX11,
-  pkg-config,
-  libGL,
-  autoreconfHook,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "manaplus";
-  version = "2.1.3.17-unstable-2024-08-15";
-
-  src = fetchFromGitLab {
-    owner = "manaplus";
-    repo = "manaplus";
-    rev = "40ebe02e81b34f5b02ea682d2d470a20e7e63cfc";
-    sha256 = "sha256-OVmCqK8undrBKgY5bB2spezmYwWXnmrPlSpV5euortc=";
-  };
-
-  # The unstable version has this commit that fixes missing <cstdint> include:
-  # https://gitlab.com/manaplus/manaplus/-/commit/63912a8a6bfaecdb6b40d2a89191a2fb5af32906
-  patches = [
-    # https://gitlab.com/manaplus/manaplus/-/issues/33
-    ./0001-libxml2-const-ptr-and-missing-include.patch
-    # https://gitlab.com/manaplus/manaplus/-/issues/32
-    ./0002-missing-ctime-include.patch
-  ];
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-  ];
-
-  buildInputs = [
-    SDL2
-    SDL2_gfx
-    SDL2_image
-    SDL2_mixer
-    SDL2_net
-    SDL2_ttf
-    curl
-    libGL
-    libpng
-    libX11
-    libxml2
-    physfs
-    zlib
-  ];
-
-  strictDeps = true;
-
-  configureFlags = [
-    (lib.withFeature true "sdl2")
-    (lib.withFeature false "dyecmd")
-    (lib.withFeature false "internalsdlgfx")
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    maintainers = [ ];
-    description = "Free OpenSource 2D MMORPG client";
-    homepage = "https://manaplus.org/";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.all;
-    badPlatforms = [ lib.systems.inspect.patterns.isDarwin ];
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6a6ac68b11a7..6666e0e0e903 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1475,6 +1475,7 @@ mapAliases {
   mariadb-client = hiPrio mariadb.client; # added 2019.07.28
   maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 20204-08-24
   manicode = throw "manicode has been renamed to codebuff"; # Added 2024-12-10
+  manaplus = throw "manaplus has been removed, as it was broken"; # Added 2025-08-25
   manta = throw "manta does not support python3, and development has been abandoned upstream"; # Added 2025-03-17
   manticore = throw "manticore is no longer maintained since 2020, and doesn't build since smlnj-110.99.7.1"; # Added 2025-05-17
 

From d08d0b2d43c828499d09a53268eab02bf326de40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 02:07:44 +0000
Subject: [PATCH 3270/3724] enzyme: 0.0.189 -> 0.0.191

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

diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix
index 30f2f62b16aa..8c574fd7e45a 100644
--- a/pkgs/by-name/en/enzyme/package.nix
+++ b/pkgs/by-name/en/enzyme/package.nix
@@ -7,13 +7,13 @@
 }:
 llvmPackages.stdenv.mkDerivation rec {
   pname = "enzyme";
-  version = "0.0.189";
+  version = "0.0.191";
 
   src = fetchFromGitHub {
     owner = "EnzymeAD";
     repo = "Enzyme";
     rev = "v${version}";
-    hash = "sha256-fjKu8H24RuDGmMjN4SphdQw6g8FLS0Xc+STjgx7hiq4=";
+    hash = "sha256-fNTfep7Edl2Bg0Kqq7xDgpzb2u1LECvBMArRFfxHWR0=";
   };
 
   postPatch = ''

From 90c912cecce5a4b6c735924b23976b426307dffc Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 25 Aug 2025 10:19:12 +0800
Subject: [PATCH 3271/3724] namazu: drop

The software build has failed. It has no maintainer, the upstream project has not been updated for years, and it is difficult to maintain. It should be removed.
---
 pkgs/by-name/na/namazu/package.nix | 46 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 pkgs/by-name/na/namazu/package.nix

diff --git a/pkgs/by-name/na/namazu/package.nix b/pkgs/by-name/na/namazu/package.nix
deleted file mode 100644
index 9616c9332ba1..000000000000
--- a/pkgs/by-name/na/namazu/package.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  fetchurl,
-  lib,
-  stdenv,
-  perl,
-  perlPackages,
-  makeWrapper,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "namazu";
-  version = "2.0.21";
-
-  src = fetchurl {
-    url = "http://namazu.org/stable/${pname}-${version}.tar.gz";
-    sha256 = "1xvi7hrprdchdpzhg3fvk4yifaakzgydza5c0m50h1yvg6vay62w";
-  };
-
-  buildInputs = [
-    perl
-    perlPackages.FileMMagic
-  ];
-  nativeBuildInputs = [ makeWrapper ];
-
-  postInstall = ''
-    wrapProgram $out/bin/mknmz --set PERL5LIB ${
-      perlPackages.makeFullPerlPath [ perlPackages.FileMMagic ]
-    }
-  '';
-
-  meta = {
-    description = "Full-text search engine";
-
-    longDescription = ''
-      Namazu is a full-text search engine intended for easy use.  Not
-      only does it work as a small or medium scale Web search engine,
-      but also as a personal search system for email or other files.
-    '';
-
-    license = lib.licenses.gpl2Plus;
-    homepage = "http://namazu.org/";
-
-    platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6a6ac68b11a7..8ebf99e28025 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1590,6 +1590,7 @@ mapAliases {
 
   ### N ###
 
+  namazu = throw "namazu has been removed, as it was broken"; # Added 2025-08-25
   ncdu_2 = ncdu; # Added 2022-07-22
   neocities-cli = neocities; # Added 2024-07-31
   neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28

From 85ff054b7cb284a41d07d7aa617e1551389022f4 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 25 Aug 2025 10:22:22 +0800
Subject: [PATCH 3272/3724] nfstrace: drop

The software build has failed. It has no maintainer, is poorly maintained upstream, and is difficult to keep up. It should be removed.
---
 pkgs/by-name/nf/nfstrace/package.nix | 79 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 pkgs/by-name/nf/nfstrace/package.nix

diff --git a/pkgs/by-name/nf/nfstrace/package.nix b/pkgs/by-name/nf/nfstrace/package.nix
deleted file mode 100644
index 11edace296ef..000000000000
--- a/pkgs/by-name/nf/nfstrace/package.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  cmake,
-  fetchFromGitHub,
-  fetchpatch,
-  json_c,
-  libpcap,
-  ncurses,
-  lib,
-  stdenv,
-  libtirpc,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "nfstrace";
-  version = "0.4.3.2";
-
-  src = fetchFromGitHub {
-    owner = "epam";
-    repo = "nfstrace";
-    rev = version;
-    sha256 = "1djsyn7i3xp969rnmsdaf5vwjiik9wylxxrc5nm7by00i76c1vsg";
-  };
-
-  patches = [
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian/nfstrace/raw/debian/0.4.3.1-3/debian/patches/reproducible_build.patch";
-      sha256 = "0fd96r8xi142kjwibqkd46s6jwsg5kfc5v28bqsj9rdlc2aqmay5";
-    })
-    # Fixes build failure with gcc-10
-    # Related PR https://github.com/epam/nfstrace/pull/42/commits/4562a895ed3ac0e811bdd489068ad3ebe4d7b501
-    (fetchpatch {
-      url = "https://github.com/epam/nfstrace/commit/4562a895ed3ac0e811bdd489068ad3ebe4d7b501.patch";
-      sha256 = "1fbicbllyykjknik7asa81x0ixxmbwqwkiz74cnznagv10jlkj3p";
-    })
-
-    # Fix pending upstream inclusion for ncurses-6.3 support:
-    #  https://github.com/epam/nfstrace/pull/50
-    (fetchpatch {
-      name = "ncurses-6.3.patch";
-      url = "https://github.com/epam/nfstrace/commit/29c7c415f5412df1aae9b1e6ed3a2760d2c227a0.patch";
-      sha256 = "134709w6bld010jx3xdy9imcjzal904a84n9f8vv0wnas5clxdmx";
-    })
-  ];
-
-  postPatch = ''
-    # -Wall -Wextra -Werror fails on clang and newer gcc
-     substituteInPlace CMakeLists.txt \
-       --replace "-Wno-braced-scalar-init" "" \
-       --replace "-Werror" ""
-  '';
-
-  buildInputs = [
-    json_c
-    libpcap
-    ncurses
-    libtirpc
-  ];
-  nativeBuildInputs = [ cmake ];
-
-  # To build with GCC 8+ it needs:
-  CXXFLAGS = "-Wno-class-memaccess -Wno-ignored-qualifiers";
-  # CMake can't find json_c without:
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-I${json_c.dev}/include/json-c"
-    "-Wno-error=address-of-packed-member"
-    "-I${libtirpc.dev}/include/tirpc"
-  ];
-  NIX_LDFLAGS = [ "-ltirpc" ];
-
-  doCheck = false; # requires network access
-
-  meta = with lib; {
-    homepage = "http://epam.github.io/nfstrace/";
-    description = "NFS and CIFS tracing/monitoring/capturing/analyzing tool";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    mainProgram = "nfstrace";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6a6ac68b11a7..4a8e0ab7741d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1657,6 +1657,7 @@ mapAliases {
   networkmanager_strongswan = networkmanager-strongswan; # added 2025-06-29
   newlibCross = newlib; # Added 2024-09-06
   newlib-nanoCross = newlib-nano; # Added 2024-09-06
+  nfstrace = throw "nfstrace has been removed, as it was broken"; # Added 2025-08-25
   nix-direnv-flakes = nix-direnv;
   nix-ld-rs = nix-ld; # Added 2024-08-17
   nix-plugin-pijul = throw "nix-plugin-pijul has been removed due to being discontinued"; # added 2025-05-18

From fc50449abe121bf169b9cf541ea2fb0ab6780eca Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 25 Aug 2025 10:39:47 +0800
Subject: [PATCH 3273/3724] pal: drop

The software build has failed. It has no maintainer, the upstream project has not been updated for years, and it is difficult to maintain. It should be removed.
---
 pkgs/by-name/pa/pal/package.nix | 42 ---------------------------------
 pkgs/top-level/aliases.nix      |  1 +
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/by-name/pa/pal/package.nix

diff --git a/pkgs/by-name/pa/pal/package.nix b/pkgs/by-name/pa/pal/package.nix
deleted file mode 100644
index f8189b385860..000000000000
--- a/pkgs/by-name/pa/pal/package.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  glib,
-  gettext,
-  readline,
-  pkg-config,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "pal";
-  version = "0.4.3";
-  src = fetchurl {
-    url = "mirror://sourceforge/palcal/pal-${version}.tgz";
-    sha256 = "072mahxvd7lcvrayl32y589w4v3vh7bmlcnhiksjylknpsvhqiyf";
-  };
-
-  patchPhase = ''
-    sed -i -e 's/-o root//' -e 's,ESTDIR}/etc,ESTDIR}'$out/etc, src/Makefile
-    sed -i -e 's,/etc/pal\.conf,'$out/etc/pal.conf, src/input.c
-  '';
-
-  makeFlags = [ "prefix=$(out)" ];
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    glib
-    gettext
-    readline
-  ];
-
-  hardeningDisable = [ "format" ];
-
-  meta = {
-    homepage = "https://palcal.sourceforge.net/";
-    description = "Command-line calendar program that can keep track of events";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
-    platforms = with lib.platforms; linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6a6ac68b11a7..2e8c1080b18a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1798,6 +1798,7 @@ mapAliases {
   packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17
   paco = throw "'paco' has been removed as it has been abandoned"; # Added 2025-04-30
   inherit (perlPackages) pacup;
+  pal = throw "pal has been removed, as it was broken"; # Added 2025-08-25
   panopticon = throw "'panopticon' has been removed because it is unmaintained upstream"; # Added 2025-01-25
   paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14
   paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17

From c997c46bf3259dca39d1ba2decd78dc4a3b4397c Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 19:53:38 -0700
Subject: [PATCH 3274/3724] python3Packages.llama-index-embeddings-gemini: fix
 build by setting hatchling as build-system

---
 .../python-modules/llama-index-embeddings-gemini/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
index 2bf7acb72d83..8d09ffdb7126 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
@@ -4,7 +4,7 @@
   fetchPypi,
   google-generativeai,
   llama-index-core,
-  poetry-core,
+  hatchling,
   pythonOlder,
 }:
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [ "google-generativeai" ];
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     google-generativeai

From c13e450857b7ff856df8c9912858ad6684c16d98 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 19:53:39 -0700
Subject: [PATCH 3275/3724] python3Packages.llama-index-embeddings-google: fix
 build by setting hatchling as build-system

---
 .../python-modules/llama-index-embeddings-google/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix
index e984a934cc0b..d5728bb1a8b8 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix
@@ -4,7 +4,7 @@
   fetchPypi,
   google-generativeai,
   llama-index-core,
-  poetry-core,
+  hatchling,
   pythonOlder,
 }:
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [ "google-generativeai" ];
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     google-generativeai

From b34b2af049e4983b7298102aeccd8a2a66ad6c1c Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 19:53:41 -0700
Subject: [PATCH 3276/3724] python3Packages.llama-index-embeddings-ollama: fix
 build by setting hatchling as build-system

---
 .../python-modules/llama-index-embeddings-ollama/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix
index b6e00c2d616c..e912fba6adca 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix
@@ -4,7 +4,7 @@
   fetchPypi,
   llama-index-core,
   ollama,
-  poetry-core,
+  hatchling,
   pythonOlder,
 }:
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [ "ollama" ];
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     llama-index-core

From 2f4d5012c8ce8e6c999370a32099c2eac8fff752 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 19:53:42 -0700
Subject: [PATCH 3277/3724] python3Packages.llama-index-embeddings-openai: fix
 build by setting hatchling as build-system

---
 .../python-modules/llama-index-embeddings-openai/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix
index 1f4da3f6b17c..23cb2b564f1b 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   llama-index-core,
-  poetry-core,
+  hatchling,
   pythonOlder,
 }:
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     hash = "sha256-rFh4OaERCJ6opiVfkhQBbXqBOzg7u7+SB3mb4RAHWOs=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [ llama-index-core ];
 

From ebff05012ab976e48d978ef19c2ce09acd27ebc9 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 19:53:44 -0700
Subject: [PATCH 3278/3724] python3Packages.llama-index-graph-stores-nebula:
 fix build by setting hatchling as build-system

---
 .../llama-index-graph-stores-nebula/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix
index f08c410a191e..f279ad97093f 100644
--- a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix
+++ b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix
@@ -4,7 +4,7 @@
   fetchPypi,
   llama-index-core,
   nebula3-python,
-  poetry-core,
+  hatchling,
   pythonOlder,
 }:
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     hash = "sha256-BzArWYZIY1SRl1q48wAdAy+mWoId+lNbcsw9LQmmw7Q=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     llama-index-core

From 2a74d42cb07659d87da921964520439682f27072 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 19:53:45 -0700
Subject: [PATCH 3279/3724] python3Packages.llama-index-graph-stores-neo4j: fix
 build by setting hatchling as build-system

---
 .../python-modules/llama-index-graph-stores-neo4j/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
index ee1a9fa73c3f..8acce41c0663 100644
--- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
+++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
@@ -4,7 +4,7 @@
   fetchPypi,
   neo4j,
   llama-index-core,
-  poetry-core,
+  hatchling,
   pythonOlder,
 }:
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     hash = "sha256-Iumsnln5iGMAoB3aY4haecm87jYXlEW4/2+uppW8m9c=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     neo4j

From 7d4fd96cd93c7edf7e2551b83bd59ed3b63febef Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 19:53:47 -0700
Subject: [PATCH 3280/3724] python3Packages.llama-index-readers-database: fix
 build by setting hatchling as build-system

---
 .../python-modules/llama-index-readers-database/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-database/default.nix b/pkgs/development/python-modules/llama-index-readers-database/default.nix
index c52b6f97c072..01c58c2754ad 100644
--- a/pkgs/development/python-modules/llama-index-readers-database/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-database/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   llama-index-core,
-  poetry-core,
+  hatchling,
   pythonOlder,
 }:
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     hash = "sha256-5eaNufjXiM4sgc101d19Z3W3CQLE3m8uLa1GOPh05ek=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [ llama-index-core ];
 

From 9d3ad8ab287db2c9fdcac700e64b38d6d87cb957 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 19:53:49 -0700
Subject: [PATCH 3281/3724] python3Packages.llama-index-readers-json: fix build
 by setting hatchling as build-system

---
 .../python-modules/llama-index-readers-json/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-json/default.nix b/pkgs/development/python-modules/llama-index-readers-json/default.nix
index 434430ee7969..0bc7703b836e 100644
--- a/pkgs/development/python-modules/llama-index-readers-json/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-json/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   llama-index-core,
-  poetry-core,
+  hatchling,
   pythonOlder,
 }:
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     hash = "sha256-ThQWERdEzPIAUaYWQDkSJdIIvixrKv0eN4LGRaNaS3U=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [ llama-index-core ];
 

From b47ac1a348e4297b026cfc4e9907456c4435af74 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 19:53:50 -0700
Subject: [PATCH 3282/3724] python3Packages.llama-index-readers-s3: fix build
 by setting hatchling as build-system

---
 .../python-modules/llama-index-readers-s3/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/pkgs/development/python-modules/llama-index-readers-s3/default.nix
index 9f40cadfdf5c..a5e7e59fb0c5 100644
--- a/pkgs/development/python-modules/llama-index-readers-s3/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-s3/default.nix
@@ -4,7 +4,7 @@
   fetchPypi,
   llama-index-core,
   llama-index-readers-file,
-  poetry-core,
+  hatchling,
   pythonOlder,
   s3fs,
 }:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     hash = "sha256-3wzxfKkwhC4YfUYPBa/XKqIZQ6zLgB9SSHR+vPhwzOA=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     llama-index-core

From 8995fd742eeba77a30e2ef2636cd714de2b4dc6c Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 19:53:52 -0700
Subject: [PATCH 3283/3724] python3Packages.llama-index-readers-twitter: fix
 build by setting hatchling as build-system

---
 .../python-modules/llama-index-readers-twitter/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix
index 97e07d49f89d..455f0d8252b6 100644
--- a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   llama-index-core,
-  poetry-core,
+  hatchling,
   pythonOlder,
   tweepy,
 }:
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     hash = "sha256-AfruOaKbPJasPS0eQjr6501yt32nQ7PvFwD2QVdgBYA=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     llama-index-core

From 489be72d8ee20eeb1e53cf1412f6513eb1e9f3ad Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 19:53:53 -0700
Subject: [PATCH 3284/3724] python3Packages.llama-index-readers-txtai: fix
 build by setting hatchling as build-system

---
 .../python-modules/llama-index-readers-txtai/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix
index a6cfc2c6568b..78dfbf23f35a 100644
--- a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   llama-index-core,
-  poetry-core,
+  hatchling,
   pythonOlder,
 }:
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     hash = "sha256-0eOJ9r27lG6WwOz27+N5qldROoaU5UAewtY4N4m8Kcs=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [ llama-index-core ];
 

From 713f938bcb0ded212f3fc17171c524fbc238ad5e Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 19:53:55 -0700
Subject: [PATCH 3285/3724] python3Packages.llama-index-readers-weather: fix
 build by setting hatchling as build-system

---
 .../python-modules/llama-index-readers-weather/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/pkgs/development/python-modules/llama-index-readers-weather/default.nix
index 6b24f3b8f9f5..16d821e901c8 100644
--- a/pkgs/development/python-modules/llama-index-readers-weather/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-weather/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   llama-index-core,
-  poetry-core,
+  hatchling,
   pyowm,
   pythonOlder,
   pytestCheckHook,
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     hash = "sha256-qgrHlJXOKWY5UnB2lZAJun3xA9sxn5+ZNNI6+aDnE98=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     llama-index-core

From a55ad07ef1d92ce203e8757b5bee54914cabd67a Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 19:53:56 -0700
Subject: [PATCH 3286/3724] python3Packages.llama-index-vector-stores-google:
 fix build by setting hatchling as build-system

---
 .../llama-index-vector-stores-google/default.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix
index 7449e0113e1a..38e63021e9ae 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix
@@ -4,7 +4,7 @@
   fetchPypi,
   google-generativeai,
   llama-index-core,
-  poetry-core,
+  hatchling,
   pythonOlder,
 }:
 
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   pythonRelaxDeps = [ "google-generativeai" ];
 
   build-system = [
-    poetry-core
+    hatchling
   ];
 
   dependencies = [

From 3fdaa0ba4a7c5898d7151482fe2b7c5958a8bf5c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 02:55:41 +0000
Subject: [PATCH 3287/3724] firefly-iii: 6.2.21 -> 6.3.2

---
 pkgs/by-name/fi/firefly-iii/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix
index 07c086943366..405888e0793d 100644
--- a/pkgs/by-name/fi/firefly-iii/package.nix
+++ b/pkgs/by-name/fi/firefly-iii/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii";
-  version = "6.2.21";
+  version = "6.3.2";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "firefly-iii";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zyaur3CjSZ8Or2E0rQKubQ440xjwwzJE7i6QXfmn5vk=";
+    hash = "sha256-pXnz2a8Z9KRl6L4PUOq/zfxYaRZmxB9whE4fS6d+5x4=";
   };
 
   buildInputs = [ php84 ];
@@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     composerNoScripts = true;
     composerStrictValidation = true;
     strictDeps = true;
-    vendorHash = "sha256-mo2oHmFtuY62AcT+ti/zPxxS39a6Qb0cPStyyvyVCag=";
+    vendorHash = "sha256-I/SoFoCquuLqRoe6ibqkwPXg66uZQt+0zx3BQ/S9ucs=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-T8Kv4vbr5n+tVQntFEaNozvSu6CKJCA3V256Ml7yzHA=";
+    hash = "sha256-XxQseVs11XxxgBMBOxM5aCq2acfzEj5gD+HTQolwEUs=";
   };
 
   preInstall = ''

From 771b8d35e8725827dbe227019522223265084d5a Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 20:02:01 -0700
Subject: [PATCH 3288/3724] python3Packages.llama-index-readers-llama-parse:
 fix build by setting hatchling as build-system

---
 .../llama-index-readers-llama-parse/default.nix             | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix
index 9b415779ee92..3b0d41172897 100644
--- a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix
@@ -4,7 +4,7 @@
   fetchPypi,
   llama-index-core,
   llama-parse,
-  poetry-core,
+  hatchling,
   pythonOlder,
 }:
 
@@ -23,9 +23,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [ "llama-parse" ];
 
-  nativeBuildInputs = [
-    poetry-core
-  ];
+  build-system = [ hatchling ];
 
   propagatedBuildInputs = [
     llama-parse

From f8612d451f72c7a620e959ff059cb0794558be0a Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 20:02:05 -0700
Subject: [PATCH 3289/3724] python3Packages.llama-index-readers-file: add
 pandas to pythonRelaxDeps

---
 .../python-modules/llama-index-readers-file/default.nix          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix
index c3af3b457026..8c055851158a 100644
--- a/pkgs/development/python-modules/llama-index-readers-file/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix
@@ -29,6 +29,7 @@ buildPythonPackage rec {
     "pymupdf"
     "pypdf"
     "striprtf"
+    "pandas"
   ];
 
   build-system = [ hatchling ];

From 0954b52dc7cb34f2f41e34cd575edc2cb78ea76a Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 20:03:53 -0700
Subject: [PATCH 3290/3724] 
 python3Packages.llama-index-{agent,program,question-gen}-openai: remove

These packages were removed in upstream llama-index due to breaking changes:
- Agent classes including FunctionCallingAgent, ReActAgent, AgentRunner deprecated
- QueryPipeline class and associated code removed
- Agent-based chat engines removed in favor of workflow-based agents

Users should migrate to new workflow agents: FunctionAgent, CodeActAgent,
ReActAgent, and AgentWorkflow.
---
 .../llama-index-agent-openai/default.nix      | 41 -------------------
 .../llama-index-program-openai/default.nix    | 40 ------------------
 .../default.nix                               | 41 -------------------
 .../python-modules/llama-index/default.nix    |  6 ---
 pkgs/top-level/python-packages.nix            | 10 -----
 5 files changed, 138 deletions(-)
 delete mode 100644 pkgs/development/python-modules/llama-index-agent-openai/default.nix
 delete mode 100644 pkgs/development/python-modules/llama-index-program-openai/default.nix
 delete mode 100644 pkgs/development/python-modules/llama-index-question-gen-openai/default.nix

diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix
deleted file mode 100644
index a7b7ca7ed607..000000000000
--- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  hatchling,
-  llama-index-core,
-  llama-index-llms-openai,
-  pythonOlder,
-}:
-
-buildPythonPackage rec {
-  pname = "llama-index-agent-openai";
-  version = "0.4.12";
-  pyproject = true;
-
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    pname = "llama_index_agent_openai";
-    inherit version;
-    hash = "sha256-0v5T/rac/kV1LttzKL8NJfapBxs8BWeH5mG5Plt0iig=";
-  };
-
-  pythonRelaxDeps = [ "llama-index-llms-openai" ];
-
-  build-system = [ hatchling ];
-
-  dependencies = [
-    llama-index-core
-    llama-index-llms-openai
-  ];
-
-  pythonImportsCheck = [ "llama_index.agent.openai" ];
-
-  meta = with lib; {
-    description = "LlamaIndex Agent Integration for OpenAI";
-    homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/agent/llama-index-agent-openai";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/development/python-modules/llama-index-program-openai/default.nix b/pkgs/development/python-modules/llama-index-program-openai/default.nix
deleted file mode 100644
index 7c1a0b2a59dd..000000000000
--- a/pkgs/development/python-modules/llama-index-program-openai/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  hatchling,
-  llama-index-agent-openai,
-  llama-index-core,
-  llama-index-llms-openai,
-}:
-
-buildPythonPackage rec {
-  pname = "llama-index-program-openai";
-  version = "0.3.2";
-  pyproject = true;
-
-  src = fetchPypi {
-    pname = "llama_index_program_openai";
-    inherit version;
-    hash = "sha256-BMlZouYWSJiUvS7uu5lQDW8cF9WIw9oN3HXr0+t0Ue4=";
-  };
-
-  pythonRelaxDeps = [ "llama-index-agent-openai" ];
-
-  build-system = [ hatchling ];
-
-  dependencies = [
-    llama-index-agent-openai
-    llama-index-core
-    llama-index-llms-openai
-  ];
-
-  pythonImportsCheck = [ "llama_index.program.openai" ];
-
-  meta = with lib; {
-    description = "LlamaIndex Program Integration for OpenAI";
-    homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/program/llama-index-program-openai";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix
deleted file mode 100644
index bea21efd68fa..000000000000
--- a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  hatchling,
-  llama-index-core,
-  llama-index-llms-openai,
-  llama-index-program-openai,
-}:
-
-buildPythonPackage rec {
-  pname = "llama-index-question-gen-openai";
-  version = "0.3.1";
-  pyproject = true;
-
-  src = fetchPypi {
-    pname = "llama_index_question_gen_openai";
-    inherit version;
-    hash = "sha256-XpMRtDPMJYH/ilMfoZ+zqiGBW6/3WqrN7xF2CslSKqk=";
-  };
-
-  build-system = [ hatchling ];
-
-  dependencies = [
-    llama-index-core
-    llama-index-llms-openai
-    llama-index-program-openai
-  ];
-
-  # Tests are only available in the mono repo
-  doCheck = false;
-
-  pythonImportsCheck = [ "llama_index.question_gen.openai" ];
-
-  meta = with lib; {
-    description = "LlamaIndex Question Gen Integration for Openai Generator";
-    homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/question_gen/llama-index-question-gen-openai";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/development/python-modules/llama-index/default.nix b/pkgs/development/python-modules/llama-index/default.nix
index 8bba3b0d5704..c0c36f235dd0 100644
--- a/pkgs/development/python-modules/llama-index/default.nix
+++ b/pkgs/development/python-modules/llama-index/default.nix
@@ -1,7 +1,6 @@
 {
   buildPythonPackage,
   hatchling,
-  llama-index-agent-openai,
   llama-index-cli,
   llama-index-core,
   llama-index-embeddings-openai,
@@ -9,8 +8,6 @@
   llama-index-legacy,
   llama-index-llms-openai,
   llama-index-multi-modal-llms-openai,
-  llama-index-program-openai,
-  llama-index-question-gen-openai,
   llama-index-readers-file,
   llama-index-readers-llama-parse,
 }:
@@ -30,7 +27,6 @@ buildPythonPackage {
   ];
 
   dependencies = [
-    llama-index-agent-openai
     llama-index-cli
     llama-index-core
     llama-index-embeddings-openai
@@ -38,8 +34,6 @@ buildPythonPackage {
     llama-index-legacy
     llama-index-llms-openai
     llama-index-multi-modal-llms-openai
-    llama-index-program-openai
-    llama-index-question-gen-openai
     llama-index-readers-file
     llama-index-readers-llama-parse
   ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2e8e93b25913..1933dcc869dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8442,8 +8442,6 @@ self: super: with self; {
 
   llama-index = callPackage ../development/python-modules/llama-index { };
 
-  llama-index-agent-openai = callPackage ../development/python-modules/llama-index-agent-openai { };
-
   llama-index-cli = callPackage ../development/python-modules/llama-index-cli { };
 
   llama-index-core = callPackage ../development/python-modules/llama-index-core { };
@@ -8502,14 +8500,6 @@ self: super: with self; {
     callPackage ../development/python-modules/llama-index-multi-modal-llms-openai
       { };
 
-  llama-index-program-openai =
-    callPackage ../development/python-modules/llama-index-program-openai
-      { };
-
-  llama-index-question-gen-openai =
-    callPackage ../development/python-modules/llama-index-question-gen-openai
-      { };
-
   llama-index-readers-database =
     callPackage ../development/python-modules/llama-index-readers-database
       { };

From 4e20c95a7709a2e6cb6b65709e140e63dba9ebac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 03:21:58 +0000
Subject: [PATCH 3291/3724] libretro.play: 0-unstable-2025-08-04 ->
 0-unstable-2025-08-20

---
 pkgs/applications/emulators/libretro/cores/play.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix
index db3b85fe376a..08944442c849 100644
--- a/pkgs/applications/emulators/libretro/cores/play.nix
+++ b/pkgs/applications/emulators/libretro/cores/play.nix
@@ -14,13 +14,13 @@
 }:
 mkLibretroCore {
   core = "play";
-  version = "0-unstable-2025-08-04";
+  version = "0-unstable-2025-08-20";
 
   src = fetchFromGitHub {
     owner = "jpd002";
     repo = "Play-";
-    rev = "c7e327b5b86bfeaf13e89440a319ee5b0c039a3d";
-    hash = "sha256-J7rCOl7vHX/2Jy/fPh8yDAf8xQc41wmkMcC9SSRqxF0=";
+    rev = "7062c5e67a4a90b75fe1d0221c43f678a0d049b6";
+    hash = "sha256-PnZNcy69o0Fi2gfC7gDXyo6wUykdG4NxKumEl9P8K9Y=";
     fetchSubmodules = true;
   };
 

From 56c661622ff0a692a293b9082f9bb74f34d3870e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 Aug 2025 21:43:22 +0200
Subject: [PATCH 3292/3724] buildMozillaMach: use system onnxruntime

Fixes: #432724
---
 pkgs/build-support/build-mozilla-mach/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 75e94c5ccfd8..ad0f61192908 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -90,6 +90,7 @@ in
   nspr,
   nss_esr,
   nss_latest,
+  onnxruntime,
   pango,
   xorg,
   zip,
@@ -510,6 +511,9 @@ buildStdenv.mkDerivation {
     (enableFeature pulseaudioSupport "pulseaudio")
     (enableFeature sndioSupport "sndio")
   ]
+  ++ lib.optionals (!buildStdenv.hostPlatform.isDarwin && lib.versionAtLeast version "141") [
+    "--with-onnx-runtime=${lib.getLib onnxruntime}/lib"
+  ]
   ++ [
     (enableFeature crashreporterSupport "crashreporter")
     (enableFeature ffmpegSupport "ffmpeg")

From 9aa5a393f17415b1ee636081128a492ca1cc4baa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 Aug 2025 21:46:13 +0200
Subject: [PATCH 3293/3724] buildMozillaMach: use cheap tar archive for
 packaging during profiling

By default Firefox wants to use xz -9 --extreme here, which costs us
a not so insigificant number of minutes leading up to profiling.
---
 pkgs/build-support/build-mozilla-mach/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index ad0f61192908..10304f4819d5 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -599,6 +599,9 @@ buildStdenv.mkDerivation {
   ++ extraBuildInputs;
 
   profilingPhase = lib.optionalString pgoSupport ''
+    # Avoid compressing the instrumented build with high levels of compression
+    export MOZ_PKG_FORMAT=tar
+
     # Package up Firefox for profiling
     ./mach package
 

From d4c8961f72ec70a67e285b0dbccc3567cd52d61b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 25 Aug 2025 06:02:55 +0200
Subject: [PATCH 3294/3724] python3Packages.pyssim: drop obsolete patch

---
 .../python-modules/pyssim/default.nix         | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix
index 6c08c68b5278..52eaafa2349f 100644
--- a/pkgs/development/python-modules/pyssim/default.nix
+++ b/pkgs/development/python-modules/pyssim/default.nix
@@ -6,7 +6,6 @@
   scipy,
   pillow,
   pywavelets,
-  fetchpatch,
   setuptools,
 }:
 
@@ -15,6 +14,14 @@ buildPythonPackage rec {
   version = "0.7.1";
   pyproject = true;
 
+  # PyPI tarball doesn't contain test images so let's use GitHub
+  src = fetchFromGitHub {
+    owner = "jterrace";
+    repo = "pyssim";
+    tag = "v${version}";
+    hash = "sha256-6393EATaXg12pYXPaHty+8LepUM6kgtZ0zSjZ1Izytg=";
+  };
+
   build-system = [
     setuptools
   ];
@@ -26,22 +33,6 @@ buildPythonPackage rec {
     pywavelets
   ];
 
-  # PyPI tarball doesn't contain test images so let's use GitHub
-  src = fetchFromGitHub {
-    owner = "jterrace";
-    repo = "pyssim";
-    tag = "v${version}";
-    sha256 = "sha256-6393EATaXg12pYXPaHty+8LepUM6kgtZ0zSjZ1Izytg=";
-  };
-
-  patches = [
-    # "Use PyWavelets for continuous wavelet transform"; signal.cwt was removed and broke the build
-    (fetchpatch {
-      url = "https://github.com/jterrace/pyssim/commit/64a58687f261eb397e9c22609b5d48497ef02762.patch?full_index=1";
-      hash = "sha256-u6okuWZgGcYlf/SW0QLrAv0IYuJi7D8RHHEr8DeXKcw=";
-    })
-  ];
-
   # Tests are copied from .github/workflows/python-package.yml
   checkPhase = ''
     runHook preCheck

From b4929af8bfee40f48ab079cefddf47a12628cdfb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 04:21:38 +0000
Subject: [PATCH 3295/3724] dolt: 1.58.3 -> 1.58.5

---
 pkgs/by-name/do/dolt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index 18becf6036d0..42a26dc86bce 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "dolt";
-  version = "1.58.3";
+  version = "1.58.5";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     rev = "v${version}";
-    sha256 = "sha256-JQD/qYcVOvjkVPpE7oUxGwCJR5dkVuJpU9fMYT0W7fI=";
+    sha256 = "sha256-ieMAld3wssub+vdNNassjpc3X1KPSNhR6GK/EmIwQ28=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-MaqRgGCzWMjoNGPTDQg8xukeYwxnPzds6qd9lIEdi0U=";
+  vendorHash = "sha256-Mr51zbGBnO0sb9KDBiidFpRZk7wHJqbY1fYnXwgqJA8=";
   proxyVendor = true;
   doCheck = false;
 

From 1127296f57fdc251506c84137eef0e7c2a83cb55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 04:29:07 +0000
Subject: [PATCH 3296/3724] oo7: 0.4.3 -> 0.5.0

---
 pkgs/by-name/oo/oo7/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/oo/oo7/package.nix b/pkgs/by-name/oo/oo7/package.nix
index 3462e38d3bcf..44e6de58f2f2 100644
--- a/pkgs/by-name/oo/oo7/package.nix
+++ b/pkgs/by-name/oo/oo7/package.nix
@@ -10,20 +10,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "oo7";
-  version = "0.4.3";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "bilelmoussaoui";
     repo = "oo7";
     rev = version;
-    hash = "sha256-P20hxwTT/O4o+Z1LnXJJkeEHv1IILfj4/pPMNde55mY=";
+    hash = "sha256-FIHXjbxAqEH3ekTNL0/TBFZoeDYZ84W2+UeJDxcauk8=";
   };
 
   # TODO: this won't cover tests from the client crate
   # Additionally cargo-credential will also not be built here
   buildAndTestSubdir = "cli";
 
-  cargoHash = "sha256-VNgbdvX5ttW+/V2Zzkd3rGIjVe1ENRE6WLg7M48ij7o=";
+  cargoHash = "sha256-4ibhHCRBsEcwG5+6Gf/uuswA/k9zJLj+RcMdmBcmvD4=";
 
   nativeBuildInputs = [ pkg-config ];
 

From c0044cbec3182274a83c39cf84a263756a0bd9f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= <dev@biobits.be>
Date: Mon, 18 Aug 2025 11:12:15 +0200
Subject: [PATCH 3297/3724] rPackages.graper: revert outdated fix

This reverts commit d5cf10fb90cc3cea04a4ca241cce4cf2f800ea1d.
---
 pkgs/development/r-modules/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index bdf03d95a564..b0fc95343681 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -2042,13 +2042,6 @@ let
       postPatch = "patchShebangs configure";
     });
 
-    graper = old.graper.overrideAttrs (attrs: {
-      postPatch = ''
-        substituteInPlace "src/Makevars" \
-          --replace-fail "CXX_STD=CXX11" "CXX_STD=CXX14"
-      '';
-    });
-
     ocf = old.ocf.overrideAttrs (attrs: {
       postPatch = "patchShebangs configure";
     });

From 0331ac1a11ebc689b4328a482d97b757243d9f1a Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 21:49:02 -0700
Subject: [PATCH 3298/3724] Revert "python3Packages.albucore: 0.0.24 -> 0.0.33"

This reverts commit 6ca4b4658e52218e6348d03fb6f93d6bfac318f1.

albumentations isn't compatible with 0.0.33
---
 pkgs/development/python-modules/albucore/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix
index 6a4491840858..4ca66b260401 100644
--- a/pkgs/development/python-modules/albucore/default.nix
+++ b/pkgs/development/python-modules/albucore/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "albucore";
-  version = "0.0.33";
+  version = "0.0.24";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "albumentations-team";
     repo = "albucore";
     tag = version;
-    hash = "sha256-OQYIvJM3pLna5rr1H7pVDhUR9sLmx032AZ9SWXQqMjc=";
+    hash = "sha256-frVMPW3au/6vPRY89GIt7chCPkUMl13DpPqCPqIjz/o=";
   };
 
   pythonRelaxDeps = [ "opencv-python" ];
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = {
     description = "High-performance image processing library to optimize and extend Albumentations with specialized functions for image transformations";
     homepage = "https://github.com/albumentations-team/albucore";
-    changelog = "https://github.com/albumentations-team/albucore/releases/tag/${src.tag}";
+    changelog = "https://github.com/albumentations-team/albucore/releases/tag/${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bcdarwin ];
   };

From 6052b3ba6d4f14b0a9c459c7186871ea9c369ffb Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sun, 24 Aug 2025 21:55:35 -0700
Subject: [PATCH 3299/3724] python3Packages.albucore: set skipBulkUpdate so
 albumentations doesn't break

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

diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix
index 4ca66b260401..d7a20c46fb34 100644
--- a/pkgs/development/python-modules/albucore/default.nix
+++ b/pkgs/development/python-modules/albucore/default.nix
@@ -40,6 +40,10 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  # albumentations doesn't support newer versions of albucore
+  # and has been archived upstream in favor of relicensed `albumentationsx`
+  passthru.skipBulkUpdate = true;
+
   meta = {
     description = "High-performance image processing library to optimize and extend Albumentations with specialized functions for image transformations";
     homepage = "https://github.com/albumentations-team/albucore";

From 8ffe606188d68603fd6ac6d4a341c640832e99f5 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 21 Aug 2025 11:59:10 +0200
Subject: [PATCH 3300/3724] codex: 0.22.0 -> 0.23.0

- Remove python3 dependency as the login process is implemented in rust
- Move test environment setup to preCheck
- Add TERM=dumb for UI snapshot tests
- Reorganize checkFlags to separate Darwin-specific skips
---
 pkgs/by-name/co/codex/package.nix | 55 ++++++++++++++++---------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 5486ff753c0b..fc5247c3dfed 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -7,70 +7,71 @@
   installShellFiles,
   nix-update-script,
   pkg-config,
-  python3,
   openssl,
   versionCheckHook,
   installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.22.0";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-JTwtydW8LLBH/55+8a/BbqlZtkXsFKbT8dGoDEAjk1c=";
+    hash = "sha256-JS2nRh3/MNQ0mfdr2/Q10sAB38yWBLpw2zFf0dJORuM=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";
 
-  cargoHash = "sha256-3PljlyPfDsnjGmR/0iM7Fu1TnyDj31pKVcOU/izsL30=";
+  cargoHash = "sha256-HbhOiTO7qFp64v+Bb62V1LxPH7qeTnWwkJKPEN4Vx6c=";
 
   nativeBuildInputs = [
     installShellFiles
     pkg-config
   ];
 
-  buildInputs = [
-    openssl
-    # Required because of codex-rs/login/src/login_with_chatgpt.py
-    python3
-  ];
+  buildInputs = [ openssl ];
 
   nativeCheckInputs = [ gitMinimal ];
 
   __darwinAllowLocalNetworking = true;
-  env = {
+  preCheck = ''
     # Disables sandbox tests which want to access /usr/bin/touch
-    CODEX_SANDBOX = "seatbelt";
+    export CODEX_SANDBOX=seatbelt
     # Skips tests that require networking
-    CODEX_SANDBOX_NETWORK_DISABLED = 1;
-  };
+    export CODEX_SANDBOX_NETWORK_DISABLED=1
+    # Required by ui_snapshot_add_details and ui_snapshot_update_details_with_rename
+    export TERM=dumb
+    # Required by azure_overrides_assign_properties_used_for_responses_url and env_var_overrides_loaded_auth
+    export USER=test
+  '';
   checkFlags = [
-    # Wants to access /bin/zsh
-    "--skip=shell::tests::test_run_with_profile_escaping_and_execution"
     # Wants to access unix sockets
     "--skip=allow_unix_socketpair_recvfrom"
-    # Fails with 'stream ended unexpectedly: InternalAgentDied'
-    "--skip=includes_base_instructions_override_in_request"
-    "--skip=includes_user_instructions_message_in_request"
-    "--skip=originator_config_override_is_used"
-    "--skip=prefixes_context_and_instructions_once_and_consistently_across_requests"
-    # Fails with 'called `Result::unwrap()` on an `Err` value: NotPresent'
-    "--skip=azure_overrides_assign_properties_used_for_responses_url"
-    "--skip=env_var_overrides_loaded_auth"
+    # Needs access to python3. However, adding python3 to nativeCheckInputs doesn't resolve the issue
+    "--skip=python_multiprocessing_lock_works_under_sandbox"
     # Version 0.0.0 hardcoded
     "--skip=test_conversation_create_and_send_message_ok"
     "--skip=test_send_message_session_not_found"
     "--skip=test_send_message_success"
-    # Assertion fails
+    # Tests fail
     "--skip=diff_render::tests::ui_snapshot_add_details"
     "--skip=diff_render::tests::ui_snapshot_update_details_with_rename"
-    # Attempted to creat a NULL object
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Wants to access /bin/zsh
+    "--skip=shell::tests::test_run_with_profile_escaping_and_execution"
+    # Requires access to the Apple system configuration
+    "--skip=azure_overrides_assign_properties_used_for_responses_url"
+    "--skip=env_var_overrides_loaded_auth"
+    "--skip=includes_base_instructions_override_in_request"
+    "--skip=includes_user_instructions_message_in_request"
+    "--skip=originator_config_override_is_used"
+    "--skip=per_turn_overrides_keep_cached_prefix_and_key_constant"
+    "--skip=overrides_turn_context_but_keeps_cached_prefix_and_key_constant"
+    "--skip=prefixes_context_and_instructions_once_and_consistently_across_requests"
     "--skip=test_apply_patch_tool"
-    # Needs access to python3. However, adding python3 to nativeCHeckInputs doesn't resolve the issue
-    "--skip=python_multiprocessing_lock_works_under_sandbox"
   ];
 
   postInstall = lib.optionalString installShellCompletions ''

From 43a82e36ad884dac9ca7d7559e8d6f8f927c9ce8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 05:16:42 +0000
Subject: [PATCH 3301/3724] getmail6: 6.19.09 -> 6.19.10

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

diff --git a/pkgs/by-name/ge/getmail6/package.nix b/pkgs/by-name/ge/getmail6/package.nix
index 66352e4f89aa..24f404823cbb 100644
--- a/pkgs/by-name/ge/getmail6/package.nix
+++ b/pkgs/by-name/ge/getmail6/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "getmail6";
-  version = "6.19.09";
+  version = "6.19.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getmail6";
     repo = "getmail6";
     tag = "v${version}";
-    hash = "sha256-GQK8zDA7uXYw449/gWzLLUguE/uEqsyFJ3qt5RoqEus=";
+    hash = "sha256-W9B6+riHsE5Hu2J8QnhPKhpRlXsQyg3ThP4ADp/0UhI=";
   };
 
   build-system = with python3.pkgs; [

From cca7c124471e82423a150c6cd63bd41a7b377632 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 25 Aug 2025 08:07:10 +0200
Subject: [PATCH 3302/3724] bluetuith: 0.2.3 -> 0.2.5

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/bl/bluetuith/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix
index c9fbbdf5c48c..e61c102be3e4 100644
--- a/pkgs/by-name/bl/bluetuith/package.nix
+++ b/pkgs/by-name/bl/bluetuith/package.nix
@@ -1,28 +1,28 @@
 {
   lib,
-  buildGoModule,
+  # Module requires Go 1.25, drop pin once buildGoModule uses Go >= 1.25.
+  buildGo125Module,
   fetchFromGitHub,
   nix-update-script,
 }:
 
-buildGoModule (finalAttrs: {
+buildGo125Module (finalAttrs: {
   pname = "bluetuith";
-  version = "0.2.3";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "darkhz";
     repo = "bluetuith";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yXH/koNT4ec/SOZhSU01iPNAfD1MdMjM2+wNmjXWsrk=";
+    hash = "sha256-h7SMGI8wIiu4i2kcKRsmLHM4tu7ZZK0usBXh5zFu94E=";
   };
 
-  vendorHash = "sha256-tEVzuhE0Di7edGa5eJHLLqOecCuoj02h91TsZiZU1PM=";
+  vendorHash = null;
 
   env.CGO_ENABLED = 0;
 
   ldflags = [
     "-s"
-    "-w"
     "-X github.com/darkhz/bluetuith/cmd.Version=${finalAttrs.version}@nixpkgs"
   ];
 

From da82f162fe39484b166a78e5e13ddfd49f341eb4 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Mon, 25 Aug 2025 08:12:22 +0200
Subject: [PATCH 3303/3724] claude-code: 1.0.89 -> 1.0.90

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

- Settings file changes take effect immediately - no restart required
---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index c77985e6e156..12f4421556af 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -6,13 +6,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.89"
+        "@anthropic-ai/claude-code": "^1.0.90"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.89",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.89.tgz",
-      "integrity": "sha512-FKzFA0whQ1oVqdq3HG7gE3aojcZfGxrhza9z7OMDUFm4YMADHQxn6TWxWss5dhzXze7vd+QOn8CuH+uHnhAr4w==",
+      "version": "1.0.90",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.90.tgz",
+      "integrity": "sha512-waC7GC4fnfyiFVFTS7Eo4MAS/iEYpyM67JZFXr+B07bOkjBYtBqXh77+Z/btcyI8NxvUtpnFS0R5FXkU/tKCwg==",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 157fa465f60a..eb2cdfdceabb 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.89";
+  version = "1.0.90";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-ULOL4emd7VZNvHD5Hk3YI1Cyb1Q1YMCcDDxlRDUM1dc=";
+    hash = "sha256-dI3nnuN5a8lBsuTVGzEASxqxCKr2KrTpBdEIgk/47Kw=";
   };
 
-  npmDepsHash = "sha256-qoPyOrtuYTLwnqROVqjXapKgaGb7k31/hBwEA0V9FUQ=";
+  npmDepsHash = "sha256-LinE6hbDhvZ5RlkRSzQMC+JbnmocQRosJLo5aP4p3hE=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From f4d230ed96c21c3b3dc6ea6fb072f635cdc09182 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 06:14:44 +0000
Subject: [PATCH 3304/3724] atmos: 1.186.0 -> 1.188.0

---
 pkgs/by-name/at/atmos/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/at/atmos/package.nix b/pkgs/by-name/at/atmos/package.nix
index 336bdb5eb6cf..ea9f6400e176 100644
--- a/pkgs/by-name/at/atmos/package.nix
+++ b/pkgs/by-name/at/atmos/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "atmos";
-  version = "1.186.0";
+  version = "1.188.0";
 
   src = fetchFromGitHub {
     owner = "cloudposse";
     repo = "atmos";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Mi18XmKXT27fMONfRqQqfi1TIGQ3sLTW9aeUJvPjTac=";
+    hash = "sha256-WQ4u/5V7zVS1d7J3XS3nix465AyZGudpdSEZiBD+HMc=";
   };
 
-  vendorHash = "sha256-qYKHfLsz0rno2JGIyG4aTcNW51waaeXJK7V5tkypueA=";
+  vendorHash = "sha256-HlFwFzP1K/qiuRu3/XvNZiCB7oXBk5rx6mSlCB+q4kc=";
 
   ldflags = [
     "-s"

From 53b0ca8a7c3a5173baf433c48dfe28bdf22da595 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 06:15:13 +0000
Subject: [PATCH 3305/3724] python3Packages.rchitect: 0.4.7 -> 0.4.8

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

diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix
index 400394bdebf5..b1c9d639bffc 100644
--- a/pkgs/development/python-modules/rchitect/default.nix
+++ b/pkgs/development/python-modules/rchitect/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "rchitect";
-  version = "0.4.7";
+  version = "0.4.8";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "randy3k";
     repo = "rchitect";
     tag = "v${version}";
-    hash = "sha256-M7OWDo3mEEOYtjIpzPIpzPMBtv2TZJKJkSfHczZYS8Y=";
+    hash = "sha256-R1Zr0M6NQw+8MYHSm8ll5oe/P1Q/apO4xnWdWVFTgWQ=";
   };
 
   postPatch = ''

From 6ae5c34ce692578036fce3b9410c7e7a7b5fcd10 Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Mon, 25 Aug 2025 13:22:00 +1000
Subject: [PATCH 3306/3724] aide: move to finalAttrs

---
 pkgs/by-name/ai/aide/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ai/aide/package.nix b/pkgs/by-name/ai/aide/package.nix
index 3d14dcea9f9e..cc60a85853ab 100644
--- a/pkgs/by-name/ai/aide/package.nix
+++ b/pkgs/by-name/ai/aide/package.nix
@@ -14,15 +14,18 @@
   libgcrypt,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "aide";
   version = "0.19.2";
 
   src = fetchurl {
-    url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-I3YrBfRhEe3rPIoFAWyHMcAb24wfkb5IwVbDGrhedMQ=";
+    # We specifically want the tar.gz, so fetchFromGitHub is not suitable here
+    url = "https://github.com/aide/aide/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    hash = "sha256-I3YrBfRhEe3rPIoFAWyHMcAb24wfkb5IwVbDGrhedMQ=";
   };
 
+  nativeBuildInputs = [ pkg-config ];
+
   buildInputs = [
     flex
     bison
@@ -35,8 +38,6 @@ stdenv.mkDerivation rec {
     libgcrypt
   ];
 
-  nativeBuildInputs = [ pkg-config ];
-
   configureFlags = [
     "--with-posix-acl"
     "--with-selinux"
@@ -46,11 +47,11 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://aide.github.io/";
-    changelog = "https://github.com/aide/aide/blob/v${version}/ChangeLog";
+    changelog = "https://github.com/aide/aide/blob/v${finalAttrs.version}/ChangeLog";
     description = "File and directory integrity checker";
     mainProgram = "aide";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ happysalada ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 30cddbf9e1b6d4ff36c7fa948aba974e16fe28d8 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Mon, 25 Aug 2025 16:11:22 +1000
Subject: [PATCH 3307/3724] rPackages.ijtiff: fix build

---
 pkgs/development/r-modules/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index b0fc95343681..b20f8bcefeb0 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1450,7 +1450,11 @@ let
     ];
     DropletUtils = [ pkgs.zlib.dev ];
     RMariaDB = [ pkgs.libmysqlclient.dev ];
-    ijtiff = [ pkgs.libtiff ];
+    ijtiff = with pkgs; [
+      libtiff
+      libjpeg
+      zlib
+    ];
     ragg =
       with pkgs;
       [

From 8fc8c3e12efaf15912089254c81d7478c142aa44 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Mon, 25 Aug 2025 02:30:12 -0400
Subject: [PATCH 3308/3724] nixos/qemu-vm: Default configuration for empty disk
 image qemu devices.

---
 nixos/modules/virtualisation/qemu-vm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 0cc1b1146a84..a35b9101c3d4 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -480,6 +480,7 @@ in
             };
             options.driveConfig = mkOption {
               type = lib.types.submodule driveOptions;
+              default = { };
               description = "Drive configuration to pass to {option}`virtualisation.qemu.drives`";
             };
           }

From 9eb64ce44a896ff66392212a93e64561d0034675 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 06:36:09 +0000
Subject: [PATCH 3309/3724] python3Packages.colcon-ros-domain-id-coordinator:
 0.2.1 -> 0.2.4

---
 .../python-modules/colcon-ros-domain-id-coordinator/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/colcon-ros-domain-id-coordinator/default.nix b/pkgs/development/python-modules/colcon-ros-domain-id-coordinator/default.nix
index 0718a4af348c..02ffcfc4fe5a 100644
--- a/pkgs/development/python-modules/colcon-ros-domain-id-coordinator/default.nix
+++ b/pkgs/development/python-modules/colcon-ros-domain-id-coordinator/default.nix
@@ -13,7 +13,7 @@
 }:
 buildPythonPackage {
   pname = "colcon-ros-domain-id-coordinator";
-  version = "0.2.1";
+  version = "0.2.4";
   pyproject = true;
 
   src = fetchFromGitHub {

From 723fc4c94b802dd25de308f467a5435966d7b4d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 06:36:22 +0000
Subject: [PATCH 3310/3724] postgresqlPackages.omnigres: 0-unstable-2025-08-15
 -> 0-unstable-2025-08-24

---
 pkgs/servers/sql/postgresql/ext/omnigres.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/omnigres.nix b/pkgs/servers/sql/postgresql/ext/omnigres.nix
index 692b959c870f..f3933d1058f9 100644
--- a/pkgs/servers/sql/postgresql/ext/omnigres.nix
+++ b/pkgs/servers/sql/postgresql/ext/omnigres.nix
@@ -21,13 +21,13 @@ let
 in
 postgresqlBuildExtension (finalAttrs: {
   pname = "omnigres";
-  version = "0-unstable-2025-08-15";
+  version = "0-unstable-2025-08-24";
 
   src = fetchFromGitHub {
     owner = "omnigres";
     repo = "omnigres";
-    rev = "d2cd8f8aef5b865367fd47bf46c59ede24bfd1ed";
-    hash = "sha256-PR5fK2prERTY+dDr+zoqXWfNzl5Vyv85Jh6RPNNtDtI=";
+    rev = "8d986ca6c6ebc099af9ffec26bac06b39368b222";
+    hash = "sha256-3oKzLPyusvDf3Tptd7udkzpMhac6gWmSlevzHV0t5CY=";
   };
 
   # This matches postInstall of PostgreSQL's generic.nix, which does this for the PGXS Makefile.

From 1651cb11aa10a92a3a9106753045d4d588e6741b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 06:37:17 +0000
Subject: [PATCH 3311/3724] grafanactl: 0.1.1 -> 0.1.3

---
 pkgs/by-name/gr/grafanactl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/grafanactl/package.nix b/pkgs/by-name/gr/grafanactl/package.nix
index cc2b5aa47ec9..d304b3e7a138 100644
--- a/pkgs/by-name/gr/grafanactl/package.nix
+++ b/pkgs/by-name/gr/grafanactl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "grafanactl";
-  version = "0.1.1";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafanactl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-l+Aj1n0ZU7tW5hTKeTkZQgvlnOBISaYJ2qFramD4eiY=";
+    hash = "sha256-lgcEDoqedPEYfy30IMclfhFEYGLaDuRLP2M4cKRp0ro=";
   };
 
-  vendorHash = "sha256-eEgGrb/un+KkT7DBJ1SMUUHauZQMYroKo6OBrgzGicM=";
+  vendorHash = "sha256-LtaIVrUdiryk4IIAjhlBFRlNARjN+YX0BvPFvwqktNA=";
 
   ldflags = [
     "-X main.version=v${finalAttrs.version}"

From cc1251b631e8041547e6b63115bbb14c008626fa Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <folliekazetani@protonmail.com>
Date: Mon, 25 Aug 2025 13:43:31 +0700
Subject: [PATCH 3312/3724] nixos/iwd: fix DriverQuirks.DefaultInterface config
 option

[DriverQuirks].DefaultInterface option accepts a comma-separated list of drivers
or glob matches as its value.
---
 nixos/modules/services/networking/iwd.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix
index e275e7906ad5..32ebf4a859ab 100644
--- a/nixos/modules/services/networking/iwd.nix
+++ b/nixos/modules/services/networking/iwd.nix
@@ -13,17 +13,18 @@ let
     mkOption
     types
     recursiveUpdate
+    optionalAttrs
     ;
 
   cfg = config.networking.wireless.iwd;
   ini = pkgs.formats.ini { };
-  defaults = {
-    # without UseDefaultInterface, sometimes wlan0 simply goes AWOL with NetworkManager
-    # https://iwd.wiki.kernel.org/interface_lifecycle#interface_management_in_iwd
-    DriverQuirks.UseDefaultInterface =
-      with config.networking.networkmanager;
-      (enable && (wifi.backend == "iwd"));
-  };
+  defaults =
+    with config.networking.networkmanager;
+    optionalAttrs (enable && (wifi.backend == "iwd")) {
+      # without DefaultInterface, sometimes wlan0 simply goes AWOL with NetworkManager
+      # https://iwd.wiki.kernel.org/interface_lifecycle#interface_management_in_iwd
+      DriverQuirks.DefaultInterface = "?*";
+    };
   configFile = ini.generate "main.conf" (recursiveUpdate defaults cfg.settings);
 
 in
@@ -64,7 +65,7 @@ in
       {
         assertion = !(cfg.settings ? General && cfg.settings.General ? UseDefaultInterface);
         message = ''
-          `networking.wireless.iwd.settings.General.UseDefaultInterface` has been deprecated. Use `networking.wireless.iwd.settings.DriverQuirks.UseDefaultInterface` instead.
+          `networking.wireless.iwd.settings.General.UseDefaultInterface` has been deprecated. Use `networking.wireless.iwd.settings.DriverQuirks.DefaultInterface` instead.
         '';
       }
     ];

From 97072789f18b7c0a548e2bfa519acc2a8b1cabbc Mon Sep 17 00:00:00 2001
From: polyfloyd <floyd@polyfloyd.net>
Date: Mon, 25 Aug 2025 08:47:54 +0200
Subject: [PATCH 3313/3724] argocd: v2.14.11 -> v3.1.0

---
 pkgs/by-name/ar/argocd/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix
index b6ec6f336c7e..d010594e0035 100644
--- a/pkgs/by-name/ar/argocd/package.nix
+++ b/pkgs/by-name/ar/argocd/package.nix
@@ -9,25 +9,25 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "2.14.11";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     rev = "v${version}";
-    hash = "sha256-KCU/WMytx4kOzlkZDwLfRRfutBtdk6UVBNdXOWC5kWc=";
+    hash = "sha256-zg6zd10hpGUOukrwMK0qJXBL8nVgPSZJ6+jh+/mbOL0=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch
-  vendorHash = "sha256-Xm9J08pxzm3fPQjMA6NDu+DPJGsvtUvj+n/qrOZ9BE4=";
+  vendorHash = "sha256-tYHA1WlziKWOvv3uF3tTSrvqDoHBVRhUnKZXOxT1rMk=";
 
   # Set target as ./cmd per cli-local
-  # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
+  # https://github.com/argoproj/argo-cd/blob/master/Makefile
   subPackages = [ "cmd" ];
 
   ldflags =
     let
-      packageUrl = "github.com/argoproj/argo-cd/v2/common";
+      packageUrl = "github.com/argoproj/argo-cd/v3/common";
     in
     [
       "-s"
@@ -46,7 +46,7 @@ buildGoModule rec {
   prePatch = ''
     export KUBECTL_VERSION=$(grep 'k8s.io/kubectl v' go.mod | cut -f 2 -d " " | cut -f 1 -d "=" )
     echo using $KUBECTL_VERSION
-    ldflags="''${ldflags} -X github.com/argoproj/argo-cd/v2/common.kubectlVersion=''${KUBECTL_VERSION}"
+    ldflags="''${ldflags} -X github.com/argoproj/argo-cd/v3/common.kubectlVersion=''${KUBECTL_VERSION}"
   '';
   installPhase = ''
     runHook preInstall

From 3b28da6a0b934e28eaeabbf302dc1af6c9c80665 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 07:06:16 +0000
Subject: [PATCH 3314/3724] python3Packages.liccheck: 0.9.2 -> 0.9.3

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

diff --git a/pkgs/development/python-modules/liccheck/default.nix b/pkgs/development/python-modules/liccheck/default.nix
index 0571d96588af..b36722a88e7e 100644
--- a/pkgs/development/python-modules/liccheck/default.nix
+++ b/pkgs/development/python-modules/liccheck/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "liccheck";
-  version = "0.9.2";
+  version = "0.9.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "dhatim";
     repo = "python-license-check";
     tag = version;
-    hash = "sha256-2WJw5TVMjOr+GX4YV0nssOtQeYvDHBLnlWquJQWPL9I=";
+    hash = "sha256-ohq3ZsbZcyqhwmvaVF/+mo7lNde5gjbz8pwhzHi3SPY=";
   };
 
   propagatedBuildInputs = [

From 5bec3123c9656592632af9127f88605d57b1ae36 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 07:17:57 +0000
Subject: [PATCH 3315/3724] python3Packages.python-arango: 8.2.1 -> 8.2.2

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

diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix
index 76823eb509f2..5a859674e62d 100644
--- a/pkgs/development/python-modules/python-arango/default.nix
+++ b/pkgs/development/python-modules/python-arango/default.nix
@@ -32,7 +32,7 @@ in
 
 buildPythonPackage rec {
   pname = "python-arango";
-  version = "8.2.1";
+  version = "8.2.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     owner = "arangodb";
     repo = "python-arango";
     tag = version;
-    hash = "sha256-ZLjCcH6cSG+LcoeSifBm6HGjnRFJwYNTXbcw9b/BeQY=";
+    hash = "sha256-qcG1q85q3hhkcYSGcWp5I1spwvf+yPg6TZbAnc0/iYw=";
   };
 
   nativeBuildInputs = [

From 54750bcd00efbcc4013bc539755a323408dad859 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 25 Aug 2025 09:23:09 +0200
Subject: [PATCH 3316/3724] python3Packages.reflex: 0.8.6 -> 0.8.7

Changelog: https://github.com/reflex-dev/reflex/releases/tag/v0.8.7
---
 pkgs/development/python-modules/reflex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix
index 70e5c6bc02a2..644f0c59bbcd 100644
--- a/pkgs/development/python-modules/reflex/default.nix
+++ b/pkgs/development/python-modules/reflex/default.nix
@@ -43,14 +43,14 @@
 
 buildPythonPackage rec {
   pname = "reflex";
-  version = "0.8.6";
+  version = "0.8.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "reflex-dev";
     repo = "reflex";
     tag = "v${version}";
-    hash = "sha256-Tas67x9UEFSR7yyENvixzCWbbKgP+OBMw6prnxWgCQo=";
+    hash = "sha256-ieR+Wxj1bJp3dQpw6j2Wki1nm4MWtVZ+UOtDl+6ip7M=";
   };
 
   # 'rich' is also somehow checked when building the wheel,

From 869ddc70444c0f686d584dfa791a6ed34ea4456d Mon Sep 17 00:00:00 2001
From: XYenon <i@xyenon.bid>
Date: Wed, 16 Jul 2025 11:55:50 +0800
Subject: [PATCH 3317/3724] btrfs-progs: fix static build

---
 pkgs/by-name/bt/btrfs-progs/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix
index fe0c06274516..01ffb87d0625 100644
--- a/pkgs/by-name/bt/btrfs-progs/package.nix
+++ b/pkgs/by-name/bt/btrfs-progs/package.nix
@@ -71,6 +71,10 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals (!udevSupport) [
     "--disable-libudev"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "ac_cv_func_malloc_0_nonnull=yes"
+    "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
   makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ];

From 636d8f84870a72791b550396f4679807a46bad11 Mon Sep 17 00:00:00 2001
From: Skoh <101289702+SkohTV@users.noreply.github.com>
Date: Mon, 25 Aug 2025 03:36:56 -0400
Subject: [PATCH 3318/3724] fractal: add missing `libwebp` runtime dependency
 (#436623)

Fixes #436588
---
 pkgs/by-name/fr/fractal/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix
index cfa580c253c1..50e7e5381180 100644
--- a/pkgs/by-name/fr/fractal/package.nix
+++ b/pkgs/by-name/fr/fractal/package.nix
@@ -26,6 +26,7 @@
   xdg-desktop-portal,
   libseccomp,
   glycin-loaders,
+  libwebp,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -87,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
     sqlite
     xdg-desktop-portal
     libseccomp
+    libwebp
   ]
   ++ (with gst_all_1; [
     gstreamer

From 4b9fe2e96248dd34205c1d92eacc0737af079cf3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 25 Aug 2025 09:49:56 +0200
Subject: [PATCH 3319/3724] python3Packages.transformers: 4.55.3 -> 4.55.4

Diff: https://github.com/huggingface/transformers/compare/v4.55.3...v4.55.4

Changelog: https://github.com/huggingface/transformers/releases/tag/v4.55.4
---
 pkgs/development/python-modules/transformers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index 5465d5437d5c..6783c86c8fc8 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -59,14 +59,14 @@
 
 buildPythonPackage rec {
   pname = "transformers";
-  version = "4.55.3";
+  version = "4.55.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "transformers";
     tag = "v${version}";
-    hash = "sha256-wvcAKcEQ2dU/7IfCB0AH45ZdpiL5ib7kPPjFRhv4Z+0=";
+    hash = "sha256-gBVFIX4wSfWVWPc0dAC9aGGjNdBhUaOfyU3C+wDr6GY=";
   };
 
   build-system = [ setuptools ];

From f9a31f4687b18c8327d1c251f9270d1a520a487a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 07:51:01 +0000
Subject: [PATCH 3320/3724] keep-sorted: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/by-name/ke/keep-sorted/package.nix b/pkgs/by-name/ke/keep-sorted/package.nix
index 7d7e322df389..56d775c41044 100644
--- a/pkgs/by-name/ke/keep-sorted/package.nix
+++ b/pkgs/by-name/ke/keep-sorted/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "keep-sorted";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "keep-sorted";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lGAB+Hb5lPcH+QOZpz98FdP0Qjj4O1iUhuC6lA81xpc=";
+    hash = "sha256-1WkxZRxXafz8xTmdy0aP+jqWsuwQlvkZSmEjnlmHBaA=";
   };
 
   vendorHash = "sha256-HTE9vfjRmi5GpMue7lUfd0jmssPgSOljbfPbya4uGsc=";

From 35a5dfbfa3c3a5efb0547e8d4c96819ca65e75ca Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 25 Aug 2025 10:27:07 +0300
Subject: [PATCH 3321/3724] nixos/tests: fix tests that use SDDM

Newer versions of SDDM moved the Xauth cookie from /tmp
to $XDG_RUNTIME_DIR, so update tests accordingly.

Also, add a delay before reading the cookie, as SDDM
does not create the file atomically, so it's possible
we try to read it before the cookie is actually written.
---
 nixos/tests/lxqt.nix      | 1 +
 nixos/tests/maestral.nix  | 5 +++--
 nixos/tests/plasma6.nix   | 8 ++++----
 nixos/tests/retroarch.nix | 5 +++--
 nixos/tests/sddm.nix      | 2 ++
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/nixos/tests/lxqt.nix b/nixos/tests/lxqt.nix
index a685a21536bb..99b507ff28a3 100644
--- a/nixos/tests/lxqt.nix
+++ b/nixos/tests/lxqt.nix
@@ -37,6 +37,7 @@
       with subtest("Wait for login"):
           machine.wait_for_x()
           machine.wait_for_file("/tmp/xauth_*")
+          machine.sleep(1)
           machine.succeed("xauth merge /tmp/xauth_*")
           machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'")
 
diff --git a/nixos/tests/maestral.nix b/nixos/tests/maestral.nix
index 30491a496b93..57e07b7e76f8 100644
--- a/nixos/tests/maestral.nix
+++ b/nixos/tests/maestral.nix
@@ -70,8 +70,9 @@
 
       with subtest("GUI"):
         gui.wait_for_x()
-        gui.wait_for_file("/tmp/xauth_*")
-        gui.succeed("xauth merge /tmp/xauth_*")
+        gui.wait_for_file("/run/user/1000/xauth_*")
+        gui.sleep(1)
+        gui.succeed("xauth merge /run/user/1000/xauth_*")
         gui.wait_for_window("^Desktop ")
         gui.wait_for_unit("maestral.service", "${user.name}")
     '';
diff --git a/nixos/tests/plasma6.nix b/nixos/tests/plasma6.nix
index b10d829102ad..5b350ef54382 100644
--- a/nixos/tests/plasma6.nix
+++ b/nixos/tests/plasma6.nix
@@ -32,8 +32,10 @@
     ''
       with subtest("Wait for login"):
           start_all()
-          machine.wait_for_file("/tmp/xauth_*")
-          machine.succeed("xauth merge /tmp/xauth_*")
+          machine.wait_for_file("/run/user/1000/xauth_*")
+          machine.sleep(1)
+          machine.succeed("xauth merge /run/user/1000/xauth_*")
+          machine.succeed("su - ${user.name} -c 'xauth merge /run/user/1000/xauth_*'")
 
       with subtest("Check plasmashell started"):
           machine.wait_until_succeeds("pgrep plasmashell")
@@ -45,8 +47,6 @@
       with subtest("Ensure Elisa is not installed"):
           machine.fail("which elisa")
 
-      machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'")
-
       with subtest("Run Dolphin"):
           machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 dolphin >&2 &'")
           machine.wait_for_window(" Dolphin")
diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix
index 9f700ed290ef..bd3d0263d7f5 100644
--- a/nixos/tests/retroarch.nix
+++ b/nixos/tests/retroarch.nix
@@ -35,8 +35,9 @@
     ''
       with subtest("Wait for login"):
           start_all()
-          machine.wait_for_file("/tmp/xauth_*")
-          machine.succeed("xauth merge /tmp/xauth_*")
+          machine.wait_for_file("/run/sddm/xauth_*")
+          machine.sleep(1)
+          machine.succeed("xauth merge /run/sddm/xauth_*")
 
       with subtest("Check RetroArch started"):
           machine.wait_until_succeeds("pgrep retroarch")
diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index ca3525712d33..014c8d379748 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -24,6 +24,7 @@
         machine.screenshot("sddm")
         machine.send_chars("${user.password}\n")
         machine.wait_for_file("/tmp/xauth_*")
+        machine.sleep(1)
         machine.succeed("xauth merge /tmp/xauth_*")
         machine.wait_for_window("^IceWM ")
       '';
@@ -54,6 +55,7 @@
       testScript = ''
         start_all()
         machine.wait_for_file("/tmp/xauth_*")
+        machine.sleep(1)
         machine.succeed("xauth merge /tmp/xauth_*")
         machine.wait_for_window("^IceWM ")
       '';

From c345de079f121663798e5ffed6f8e415a33cf350 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 25 Aug 2025 10:32:04 +0300
Subject: [PATCH 3322/3724] nixos/tests/retroarch: modernize

---
 nixos/tests/retroarch.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix
index bd3d0263d7f5..4d813cc10b05 100644
--- a/nixos/tests/retroarch.nix
+++ b/nixos/tests/retroarch.nix
@@ -16,7 +16,7 @@
         enable = true;
         package = pkgs.retroarch-bare;
       };
-      services.xserver.displayManager = {
+      services.displayManager = {
         sddm.enable = true;
         defaultSession = "RetroArch";
         autoLogin = {
@@ -29,7 +29,7 @@
   testScript =
     { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
       xdo = "${pkgs.xdotool}/bin/xdotool";
     in
     ''

From 8ba1a8c882f4052de72506ed4e4c0264275e84d3 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 13 Aug 2025 16:01:22 +0800
Subject: [PATCH 3323/3724] yffi: init at 0.24.0

---
 pkgs/by-name/yf/yffi/package.nix | 50 ++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/yf/yffi/package.nix

diff --git a/pkgs/by-name/yf/yffi/package.nix b/pkgs/by-name/yf/yffi/package.nix
new file mode 100644
index 000000000000..6bebf3fe9c20
--- /dev/null
+++ b/pkgs/by-name/yf/yffi/package.nix
@@ -0,0 +1,50 @@
+{
+  fetchFromGitHub,
+  lib,
+  rust-cbindgen,
+  rustPlatform,
+  stdenv,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "yffi";
+  version = "0.24.0";
+
+  src = fetchFromGitHub {
+    owner = "y-crdt";
+    repo = "y-crdt";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-RFdLEsKQxt8BGqbf5FFM7mZD64glW7bTKRJaAQOe+vo=";
+  };
+
+  cargoHash = "sha256-RL9lBc7lSmc6jOavE5lZupmaNGZgQhJBedNhjfHVajg=";
+
+  buildAndTestSubdir = "yffi";
+
+  nativeBuildInputs = [
+    rust-cbindgen
+  ];
+
+  postBuild = ''
+    cbindgen --config yffi/cbindgen.toml --crate yffi --output libyrs.h --lang C
+  '';
+
+  postCheck = ''
+    $CXX -o yrs-ffi-tests -I . tests-ffi/main.cpp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/libyrs.a
+    ./yrs-ffi-tests
+  '';
+
+  postInstall = ''
+    install -Dm644 libyrs.h $out/include/libyrs.h
+  '';
+
+  meta = {
+    description = "C foreign function interface for Yrs";
+    homepage = "https://github.com/y-crdt/y-crdt/tree/main/yffi";
+    downloadPage = "https://github.com/y-crdt/y-crdt/tags";
+    changelog = "https://github.com/y-crdt/y-crdt/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    teams = with lib.teams; [ ngi ];
+    platforms = with lib.platforms; linux;
+  };
+})

From 686f62372d9088ffe5a8e0f06bfbb2124061767e Mon Sep 17 00:00:00 2001
From: polyfloyd <floyd@polyfloyd.net>
Date: Mon, 25 Aug 2025 10:05:30 +0200
Subject: [PATCH 3324/3724] argocd: Build the web-ui to make it usable (fixes
 #207618)

---
 pkgs/by-name/ar/argocd/package.nix | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix
index d010594e0035..597778941003 100644
--- a/pkgs/by-name/ar/argocd/package.nix
+++ b/pkgs/by-name/ar/argocd/package.nix
@@ -5,6 +5,10 @@
   installShellFiles,
   nix-update-script,
   stdenv,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  nodejs,
 }:
 
 buildGoModule rec {
@@ -18,6 +22,28 @@ buildGoModule rec {
     hash = "sha256-zg6zd10hpGUOukrwMK0qJXBL8nVgPSZJ6+jh+/mbOL0=";
   };
 
+  ui = stdenv.mkDerivation {
+    pname = "${pname}-ui";
+    inherit version;
+    src = src + "/ui";
+
+    offlineCache = fetchYarnDeps {
+      yarnLock = "${src}/ui/yarn.lock";
+      hash = "sha256-ekhSPWzIgFhwSw0bIlBqu8LTYk3vuJ9VM8eHc3mnHGM=";
+    };
+
+    nativeBuildInputs = [
+      yarnConfigHook
+      yarnBuildHook
+      nodejs
+    ];
+
+    postInstall = ''
+      mkdir -p $out
+      cp -r dist $out/dist
+    '';
+  };
+
   proxyVendor = true; # darwin/linux hash mismatch
   vendorHash = "sha256-tYHA1WlziKWOvv3uF3tTSrvqDoHBVRhUnKZXOxT1rMk=";
 
@@ -41,6 +67,11 @@ buildGoModule rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
+  preBuild = ''
+    cp -r ${ui}/dist ./ui
+    stat ./ui/dist/app/index.html # Sanity check
+  '';
+
   # set ldflag for kubectlVersion since it is needed for argo
   # Per https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22KUBECTL_VERSION%3D%22+path%3AMakefile&type=code
   prePatch = ''

From 5064123893ed0d805595621b3dd1171881d586a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 08:20:28 +0000
Subject: [PATCH 3325/3724] syshud: 0-unstable-2025-07-26 ->
 0-unstable-2025-08-18

---
 pkgs/by-name/sy/syshud/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix
index 00220697fae1..6393c7eab0f0 100644
--- a/pkgs/by-name/sy/syshud/package.nix
+++ b/pkgs/by-name/sy/syshud/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "syshud";
-  version = "0-unstable-2025-07-26";
+  version = "0-unstable-2025-08-18";
 
   src = fetchFromGitHub {
     owner = "System64fumo";
     repo = "syshud";
-    rev = "d954c124280b71f80930046a11e390a814c1b229";
-    hash = "sha256-FUPnIUl9x0eZmhls4CmPGg4kZb1MNmKU5BKecFDQdHM=";
+    rev = "6dbf17bb953342c844517d1b4eb672cbae7a1566";
+    hash = "sha256-T9tWmgDIcmmRXAeWR7Pfjalkl6xogtuz1qfsSAuQmkg=";
   };
 
   postPatch = ''

From 22c4babe9615098e566686bdfeb7ef6facee65a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 08:37:59 +0000
Subject: [PATCH 3326/3724] gitxray: 1.0.17.4 -> 1.0.18

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

diff --git a/pkgs/by-name/gi/gitxray/package.nix b/pkgs/by-name/gi/gitxray/package.nix
index cdc424a576fc..cb05a2d44a89 100644
--- a/pkgs/by-name/gi/gitxray/package.nix
+++ b/pkgs/by-name/gi/gitxray/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gitxray";
-  version = "1.0.17.4";
+  version = "1.0.18";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kulkansecurity";
     repo = "gitxray";
     tag = version;
-    hash = "sha256-JzQ7Dq02lWDGj7+xN4jOHQZThGy/wB0TZDax3fAyXNM=";
+    hash = "sha256-d8NHRcCPTW935lb5MNkmxc8lhyByU0X+iKTUwY8ycRo=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From d15e0fae52e24833c29fd03e80a571c84f9113d2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 25 Aug 2025 10:57:41 +0200
Subject: [PATCH 3327/3724] python3Packages.pytensor: skip failing tests on
 darwin

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

diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix
index d5212c6533bd..3eb16dd31ec0 100644
--- a/pkgs/development/python-modules/pytensor/default.nix
+++ b/pkgs/development/python-modules/pytensor/default.nix
@@ -83,6 +83,11 @@ buildPythonPackage rec {
   '';
 
   disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Numerical assertion error
+    # tests.unittest_tools.WrongValue: WrongValue
+    "test_op_sd"
+    "test_op_ss"
+
     # pytensor.link.c.exceptions.CompileError: Compilation failed (return status=1)
     "OpFromGraph"
     "add"
@@ -123,6 +128,7 @@ buildPythonPackage rec {
     "test_modes"
     "test_mul_s_v_grad"
     "test_multiple_outputs"
+    "test_nnet"
     "test_not_inplace"
     "test_numba_Cholesky_grad"
     "test_numba_pad"

From 6384a482fb2c35aef68d14b66d67c5ce59ed9602 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 09:09:02 +0000
Subject: [PATCH 3328/3724] python3Packages.kubernetes-asyncio: 32.3.0 ->
 33.3.0

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

diff --git a/pkgs/development/python-modules/kubernetes-asyncio/default.nix b/pkgs/development/python-modules/kubernetes-asyncio/default.nix
index 456ce3e9b6cd..d9069357f0bb 100644
--- a/pkgs/development/python-modules/kubernetes-asyncio/default.nix
+++ b/pkgs/development/python-modules/kubernetes-asyncio/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "kubernetes-asyncio";
-  version = "32.3.0";
+  version = "33.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tomplus";
     repo = "kubernetes_asyncio";
     tag = version;
-    hash = "sha256-EqFecu389zS/DqwoMz9ptaLv+jwJhABTEdMv8nwCSTQ=";
+    hash = "sha256-Ei5Y2IBBk8AoMQQBHOvKkJ1H+9dmnz22qrrZKrWazVE=";
   };
 
   postPatch = ''

From 4e5c1de046182100513ad6ecc5ec1ba7d6495b49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 09:22:53 +0000
Subject: [PATCH 3329/3724] python3Packages.taskw-ng: 0.2.6 -> 0.2.7

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

diff --git a/pkgs/development/python-modules/taskw-ng/default.nix b/pkgs/development/python-modules/taskw-ng/default.nix
index 5dfb9110735c..03f3d77cd0b5 100644
--- a/pkgs/development/python-modules/taskw-ng/default.nix
+++ b/pkgs/development/python-modules/taskw-ng/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "taskw-ng";
-  version = "0.2.6";
+  version = "0.2.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "bergercookie";
     repo = "taskw-ng";
     tag = "v${version}";
-    hash = "sha256-tlidTt0TzWnvfajYiIfvRv7OfakHY6zWAicmAwq/Z8w=";
+    hash = "sha256-KxXLSDvUclQlNbMR+Zzl6tgBrH2QxqjLVoyBK3OiKVU=";
   };
 
   pythonRelaxDeps = [

From a2d6f91cbe4f9c018716d990f567b3c00714eef7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 09:36:51 +0000
Subject: [PATCH 3330/3724] biome: 2.2.0 -> 2.2.2

---
 pkgs/by-name/bi/biome/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix
index 22735a8c04f1..b50f2725e0d4 100644
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "biome";
-  version = "2.2.0";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "biomejs";
     repo = "biome";
     rev = "@biomejs/biome@${finalAttrs.version}";
-    hash = "sha256-i4SSEiU3gQRgOUyMxomCos3Ly20pzQQG20nTdYzY75E=";
+    hash = "sha256-YmDHAsNGN5lsCgiciASdMUM6InbbjaGwyfyEX+XNOxs=";
   };
 
-  cargoHash = "sha256-f7ve9VAnkyxp7s7Xf3MXAft4mAfMwLiajst4aCwUyjs=";
+  cargoHash = "sha256-l3BQMG/cCxzQizeFGwAEDP8mzLtf/21ojyd+7gzhbtU=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 1e584fb9bf0b103bf0e82cdac1fc13b6aedd3c65 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 10:05:42 +0000
Subject: [PATCH 3331/3724] python3Packages.django-mptt: 0.16 -> 0.17

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

diff --git a/pkgs/development/python-modules/django-mptt/default.nix b/pkgs/development/python-modules/django-mptt/default.nix
index 404b6df1bc90..43d4739fa016 100644
--- a/pkgs/development/python-modules/django-mptt/default.nix
+++ b/pkgs/development/python-modules/django-mptt/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "django-mptt";
-  version = "0.16";
+  version = "0.17";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-mptt";
     repo = "django-mptt";
     rev = version;
-    hash = "sha256-vWnXKWzaa5AWoNaIc8NA1B2mnzKXRliQmi5VdrRMadE=";
+    hash = "sha256-fsVGwqlSZcBGXisbxTNGSwiuDOJ3DFV6MnB4h6OxkMA=";
   };
 
   build-system = [ hatchling ];

From 645e81fd178ecb8c522ddae9695e87526c5c3429 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 10:10:04 +0000
Subject: [PATCH 3332/3724] ansible-doctor: 7.1.0 -> 7.2.0

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

diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix
index fd23b4f62f91..570e1a04b0ba 100644
--- a/pkgs/by-name/an/ansible-doctor/package.nix
+++ b/pkgs/by-name/an/ansible-doctor/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ansible-doctor";
-  version = "7.1.0";
+  version = "7.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = "ansible-doctor";
     tag = "v${version}";
-    hash = "sha256-RAfRzMtsXu1s3a1seG49+Zzd6nLtT8RObdDnO8nrymw=";
+    hash = "sha256-7SGnbcaufKWBDq5Na+s+X8RGRskl1Q1bh0xelT/IQXU=";
   };
 
   build-system = with python3Packages; [

From 75ccd1f28868e020ff6d48449380556792d435f8 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 25 Aug 2025 11:13:29 +0100
Subject: [PATCH 3333/3724] homepage-dashboard: 1.4.3 -> 1.4.6

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

diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix
index 210c919e9cc8..acde55ba10f7 100644
--- a/pkgs/by-name/ho/homepage-dashboard/package.nix
+++ b/pkgs/by-name/ho/homepage-dashboard/package.nix
@@ -28,13 +28,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "homepage-dashboard";
-  version = "1.4.3";
+  version = "1.4.6";
 
   src = fetchFromGitHub {
     owner = "gethomepage";
     repo = "homepage";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ib2sErgz1FPnHxmUE8LD/tD1smNcOc0/Ljncl+E9YdM=";
+    hash = "sha256-ug7cT/HMiOQF6CX6EEFlvgttXFZdRctSTqPAAkun2KU=";
   };
 
   # This patch ensures that the cache implementation respects the env

From 8e4670486ad326c0e64493dbb7467cdd29a622f7 Mon Sep 17 00:00:00 2001
From: Ruby Iris Juric <ruby@srxl.me>
Date: Tue, 5 Aug 2025 21:40:49 +1000
Subject: [PATCH 3334/3724] sharkey: 2025.4.3 -> 2025.4.4

---
 pkgs/by-name/sh/sharkey/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sh/sharkey/package.nix b/pkgs/by-name/sh/sharkey/package.nix
index 288e295a2f4a..42d1aca219ee 100644
--- a/pkgs/by-name/sh/sharkey/package.nix
+++ b/pkgs/by-name/sh/sharkey/package.nix
@@ -21,21 +21,21 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sharkey";
-  version = "2025.4.3";
+  version = "2025.4.4";
 
   src = fetchFromGitLab {
     domain = "activitypub.software";
     owner = "TransFem-org";
     repo = "Sharkey";
     tag = finalAttrs.version;
-    hash = "sha256-B268bSR5VFyJ/TaWg3xxpnP4oRj07XUpikJZ2Tb9FEY=";
+    hash = "sha256-h6FkjwJ+TI5NZmGYOl/+yNP7gyc7FKmpdkfXmgqxh/s=";
     fetchSubmodules = true;
   };
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-S8LxawbtguFOEZyYbS1FQWw/TcRm4Z6mG7dUhfXbf1c=";
+    fetcherVersion = 2;
+    hash = "sha256-34X8oJGkGXB9y7W4MquUkv8vY5yq2RoGIUCbjYppkIU=";
   };
 
   nativeBuildInputs = [

From 64a200b22ab02d5b5af00f255f34c6523fcb3824 Mon Sep 17 00:00:00 2001
From: Ruby Iris Juric <ruby@srxl.me>
Date: Mon, 25 Aug 2025 20:14:15 +1000
Subject: [PATCH 3335/3724] sharkey: add tmarkus as maintainer

https://github.com/NixOS/nixpkgs/pull/431142#pullrequestreview-3149369365
---
 nixos/modules/services/web-apps/sharkey.nix | 5 ++++-
 nixos/tests/web-apps/sharkey.nix            | 5 ++++-
 pkgs/by-name/sh/sharkey/package.nix         | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-apps/sharkey.nix b/nixos/modules/services/web-apps/sharkey.nix
index 3ff9a37784c3..9bf363279f08 100644
--- a/nixos/modules/services/web-apps/sharkey.nix
+++ b/nixos/modules/services/web-apps/sharkey.nix
@@ -296,5 +296,8 @@ in
       })
     ]);
 
-  meta.maintainers = with lib.maintainers; [ srxl ];
+  meta.maintainers = with lib.maintainers; [
+    srxl
+    tmarkus
+  ];
 }
diff --git a/nixos/tests/web-apps/sharkey.nix b/nixos/tests/web-apps/sharkey.nix
index f3261e612100..3a07493178b5 100644
--- a/nixos/tests/web-apps/sharkey.nix
+++ b/nixos/tests/web-apps/sharkey.nix
@@ -49,5 +49,8 @@ in
           machine.succeed("curl --fail http://localhost:3000")
     '';
 
-  meta.maintainers = with lib.maintainers; [ srxl ];
+  meta.maintainers = with lib.maintainers; [
+    srxl
+    tmarkus
+  ];
 }
diff --git a/pkgs/by-name/sh/sharkey/package.nix b/pkgs/by-name/sh/sharkey/package.nix
index 42d1aca219ee..33b3087d9d08 100644
--- a/pkgs/by-name/sh/sharkey/package.nix
+++ b/pkgs/by-name/sh/sharkey/package.nix
@@ -161,6 +161,9 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.agpl3Only;
     platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "sharkey";
-    maintainers = with lib.maintainers; [ srxl ];
+    maintainers = with lib.maintainers; [
+      srxl
+      tmarkus
+    ];
   };
 })

From 0491e7e3eb4d756a5865cfe8d0a9fb8695037e8a Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Wed, 30 Jul 2025 12:20:38 +0900
Subject: [PATCH 3336/3724] glab: 1.62.0 -> 1.65.0

https://gitlab.com/gitlab-org/cli/-/releases/v1.63.0
https://gitlab.com/gitlab-org/cli/-/releases/v1.64.0
https://gitlab.com/gitlab-org/cli/-/releases/v1.65.0

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/gl/glab/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix
index 960ca9c5b5fd..98f7be5ff5b2 100644
--- a/pkgs/by-name/gl/glab/package.nix
+++ b/pkgs/by-name/gl/glab/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "glab";
-  version = "1.62.0";
+  version = "1.65.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+dXMlNc54i/vEwYV0YRKXrdWejcgfXFW+tFq3tf8TZY=";
+    hash = "sha256-LqcUrF1CkNshsZBl9PdYByQKzMr5lWw5+BwCXs+yml0=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-sgph04zjHvvgL0QJm2//h8jyDg/5NY7dq50C0G0hYYM=";
+  vendorHash = "sha256-2lC55LaMOrDy8F+IOqB4aujYlKKgpJmhZw6kl2yN/GM=";
 
   ldflags = [
     "-s"

From 83420cf6afa163c8a8b5bb98cd00410403eaeac3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 10:55:02 +0000
Subject: [PATCH 3337/3724] python3Packages.ament-package: 0.17.2 -> 0.18.1

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

diff --git a/pkgs/development/python-modules/ament-package/default.nix b/pkgs/development/python-modules/ament-package/default.nix
index 8c10b6ea9eb3..c52535e62a70 100644
--- a/pkgs/development/python-modules/ament-package/default.nix
+++ b/pkgs/development/python-modules/ament-package/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "ament-package";
-  version = "0.17.2";
+  version = "0.18.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ament";
     repo = "ament_package";
     tag = version;
-    hash = "sha256-+Jfj8mkvrpJnd3oPhOo2E5cvVO9ujez0mrpsj2taOOU=";
+    hash = "sha256-M2SSGmzxlOITNzWTZ92/PtTVGtKMU/IwJG0VMhzDLR8=";
   };
 
   build-system = [

From b241bf27455f10eabd48c615091f68cc9784b582 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Mon, 25 Aug 2025 12:55:36 +0200
Subject: [PATCH 3338/3724] liferea: 1.16-RC2 -> 1.16.1

Diff: https://github.com/lwindolf/liferea/compare/v1.16-RC2...v1.16.1
---
 pkgs/by-name/li/liferea/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/liferea/package.nix b/pkgs/by-name/li/liferea/package.nix
index 2611b3396f91..fd463456ca6f 100644
--- a/pkgs/by-name/li/liferea/package.nix
+++ b/pkgs/by-name/li/liferea/package.nix
@@ -17,7 +17,7 @@
   libnotify,
   gtk3,
   gsettings-desktop-schemas,
-  libpeas,
+  libpeas2,
   libsecret,
   gobject-introspection,
   glib-networking,
@@ -26,11 +26,11 @@
 
 stdenv.mkDerivation rec {
   pname = "liferea";
-  version = "1.16-RC2";
+  version = "1.16.1";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    hash = "sha256-yOfePUcr6NauNQjkWnSxPD5tJSqx5OSTFGUxOz3hDhg=";
+    hash = "sha256-4KmqxG8D0vwrMlBo5qGBIUdKpB8wCGAhYyqSyvn2muw=";
   };
 
   nativeBuildInputs = [
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     libxslt
     sqlite
     libsoup_3
-    libpeas
+    libpeas2
     gsettings-desktop-schemas
     json-glib
     libsecret
@@ -68,6 +68,9 @@ stdenv.mkDerivation rec {
   postFixup = ''
     buildPythonPath ${python3Packages.pycairo}
     patchPythonScript $out/lib/liferea/plugins/trayicon.py
+
+    buildPythonPath ${python3Packages.requests}
+    patchPythonScript $out/lib/liferea/plugins/download-manager.py
   '';
 
   passthru.updateScript = gitUpdater {

From ddaf3eeceba46be015f4b71eb02c746fe85a690c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 11:29:59 +0000
Subject: [PATCH 3339/3724] python3Packages.llama-index-llms-ollama: 0.7.0 ->
 0.7.1

---
 .../python-modules/llama-index-llms-ollama/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
index 675e10bbd9fb..d21ff84b8267 100644
--- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-ollama";
-  version = "0.7.0";
+  version = "0.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_ollama";
     inherit version;
-    hash = "sha256-ThKtTl6mEAZsTgeTVpnFnZMkffIhh27X9+Gn9wwzs8c=";
+    hash = "sha256-GJtl6iXAPGYMEFuA27UQnE/qjaaPHpBZKuv9/d5wiSg=";
   };
 
   build-system = [ hatchling ];

From 52af76796f1a37fc05b9fe9469d2d6c803842378 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 19 Aug 2025 17:35:04 +0200
Subject: [PATCH 3340/3724] python312Packages.viser: 1.0.3 -> 1.0.4

Diff: https://github.com/nerfstudio-project/viser/compare/v1.0.3...v1.0.4

Changelog: https://github.com/nerfstudio-project/viser/releases/tag/v1.0.4
---
 pkgs/development/python-modules/viser/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/viser/default.nix b/pkgs/development/python-modules/viser/default.nix
index 211c755e1ed7..032bbd622ae8 100644
--- a/pkgs/development/python-modules/viser/default.nix
+++ b/pkgs/development/python-modules/viser/default.nix
@@ -26,7 +26,7 @@
   scipy,
   tqdm,
   trimesh,
-  tyro,
+  typing-extensions,
   websockets,
   yourdfpy,
 
@@ -43,6 +43,7 @@
   # pyliblzfse,
   robot-descriptions,
   torch,
+  tyro,
 
   # nativeCheckInputs
   pytestCheckHook,
@@ -50,14 +51,14 @@
 
 buildPythonPackage rec {
   pname = "viser";
-  version = "1.0.3";
+  version = "1.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nerfstudio-project";
     repo = "viser";
     tag = "v${version}";
-    hash = "sha256-zufWYq4HvkmbSawTq8G7TheWNpspRL/dptyLuGnUQ2U=";
+    hash = "sha256-AS5D6pco6wzQ414yxvv0K9FB3tfP1BvqigRLJJXDduU=";
   };
 
   postPatch = ''
@@ -108,7 +109,7 @@ buildPythonPackage rec {
     scipy
     tqdm
     trimesh
-    tyro
+    typing-extensions
     websockets
     yourdfpy
   ];
@@ -130,6 +131,7 @@ buildPythonPackage rec {
       # pyliblzfse
       robot-descriptions
       torch
+      tyro
     ];
   };
 

From 009d9beee9aadb31eae171d0e50bd8029fa26cf5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 11:46:35 +0000
Subject: [PATCH 3341/3724] python3Packages.pyexploitdb: 0.2.92 -> 0.2.95

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

diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index 5d0893783abc..c6d51422d8d7 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyexploitdb";
-  version = "0.2.92";
+  version = "0.2.95";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyExploitDb";
     inherit version;
-    hash = "sha256-tjNOSTDPmi+Ml3HBN+I+iPGerrAHtoaPNSGisWIYaxM=";
+    hash = "sha256-NBuFgOhD/b1ngJDWGeP3dhYx2G6McBi0ctCXWoP3cEQ=";
   };
 
   build-system = [ setuptools ];

From 13f1ea32e02065e70960b674cd6bf7710f3af7da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 11:51:05 +0000
Subject: [PATCH 3342/3724] yara-x: 0.15.0 -> 1.5.0

---
 pkgs/by-name/ya/yara-x/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix
index 9972818aa0da..1d14f1d4cd03 100644
--- a/pkgs/by-name/ya/yara-x/package.nix
+++ b/pkgs/by-name/ya/yara-x/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yara-x";
-  version = "0.15.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "yara-x";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fbuh/SMfOygnuvG9zTZqem4oLaS+5uXScXPhU3aVDjM=";
+    hash = "sha256-YZmhwHA6PnQb3QXhbWK8cbV0CScbiD5k+HceDcV6iCI=";
   };
 
-  cargoHash = "sha256-+dPIujaxDJ7JrtNvX4VjGHFmgtCb1BJpFQL4c3E1/GY=";
+  cargoHash = "sha256-8LofNTLa3a2dDH72T54HJR/+qArXt+X6OMJIQwmjQIQ=";
 
   nativeBuildInputs = [
     installShellFiles

From 8f5076aba92f75e59640b26f1104ea3788af64e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 12:08:01 +0000
Subject: [PATCH 3343/3724] python3Packages.pycyphal: 1.18.0 -> 1.24.3

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

diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix
index 112cb1736220..a0a8fb61fc2c 100644
--- a/pkgs/development/python-modules/pycyphal/default.nix
+++ b/pkgs/development/python-modules/pycyphal/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "pycyphal";
-  version = "1.18.0";
+  version = "1.24.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "OpenCyphal";
     repo = "pycyphal";
     tag = version;
-    hash = "sha256-XkH0wss8ueh/Wwz0lhvQShOp3a4X9lNdosT/sMe7p4Q=";
+    hash = "sha256-aa7PJ6QkqwwPwQvYc6QKaxtm1Mnz3d7SLEik55qN6/Y=";
     fetchSubmodules = true;
   };
 

From a133742e39246cf65925b0f386f5d5f5a2d098de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 12:12:48 +0000
Subject: [PATCH 3344/3724] gh-skyline: 0.1.6 -> 0.1.7

---
 pkgs/by-name/gh/gh-skyline/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gh/gh-skyline/package.nix b/pkgs/by-name/gh/gh-skyline/package.nix
index d226bebfd665..bfcc60c30d00 100644
--- a/pkgs/by-name/gh/gh-skyline/package.nix
+++ b/pkgs/by-name/gh/gh-skyline/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gh-skyline";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-skyline";
     tag = "v${version}";
-    hash = "sha256-IMsq+IhuZUJ7JSWZJPvx2bQ9avFsjfc/kOW9Sre5jAo=";
+    hash = "sha256-yc9NaWx1jV2YUpPz2u9irikkLw1cnManq+AXREvCfII=";
   };
 
-  vendorHash = "sha256-iAqc8RlvpvP9Go8E/b+PnEgKRdpD3+IIQ1JUKVZ1Ces=";
+  vendorHash = "sha256-fPXpgiCA9k8tYQ2leCb+XR34OGJZ6YWCFAxG9mTeXoI=";
 
   ldflags = [
     "-s"

From baa3367ea6e7f220e8fdda07445878d9a33525cd Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 22 Aug 2025 13:09:32 -0700
Subject: [PATCH 3345/3724] cvc4: fix build on darwin

---
 pkgs/by-name/cv/cvc4/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/cv/cvc4/package.nix b/pkgs/by-name/cv/cvc4/package.nix
index 039ec5617dbc..8748d1e57926 100644
--- a/pkgs/by-name/cv/cvc4/package.nix
+++ b/pkgs/by-name/cv/cvc4/package.nix
@@ -61,6 +61,19 @@ stdenv.mkDerivation rec {
     ./cvc4-bash-patsub-replacement.patch
   ];
 
+  postPatch = ''
+        # Fix missing size_t declarations by adding after pragma once or include guards
+        sed -i '/#pragma once/a\
+    #include <cstddef>' src/expr/emptyset.h || sed -i '1i\
+    #include <cstddef>' src/expr/emptyset.h
+
+        sed -i '/#define CVC4__EXPR__EXPR_IOMANIP_H/a\
+    #include <cstddef>' src/expr/expr_iomanip.h
+
+        sed -i '/#define CVC4__UTIL__REGEXP_H/a\
+    #include <cstddef>' src/util/regexp.h
+  '';
+
   preConfigure = ''
     patchShebangs ./src/
   '';

From 68c2b33eadd4971f59231b83a3858cd30094bf76 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 25 Aug 2025 15:31:01 +0300
Subject: [PATCH 3346/3724] nixos/tests: better handling of SDDM xauth files

Clearly, the sleep is not sleeping enough, so actually wait
for the cookie to be written (and hope that it doesn't get
split into multiple writes...)
---
 nixos/tests/lxqt.nix      | 2 +-
 nixos/tests/maestral.nix  | 2 +-
 nixos/tests/plasma6.nix   | 2 +-
 nixos/tests/retroarch.nix | 2 +-
 nixos/tests/sddm.nix      | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/lxqt.nix b/nixos/tests/lxqt.nix
index 99b507ff28a3..595b6dc3f9ba 100644
--- a/nixos/tests/lxqt.nix
+++ b/nixos/tests/lxqt.nix
@@ -37,7 +37,7 @@
       with subtest("Wait for login"):
           machine.wait_for_x()
           machine.wait_for_file("/tmp/xauth_*")
-          machine.sleep(1)
+          machine.wait_until_succeeds("test -s /tmp/xauth_*")
           machine.succeed("xauth merge /tmp/xauth_*")
           machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'")
 
diff --git a/nixos/tests/maestral.nix b/nixos/tests/maestral.nix
index 57e07b7e76f8..6432ab73b4f5 100644
--- a/nixos/tests/maestral.nix
+++ b/nixos/tests/maestral.nix
@@ -71,7 +71,7 @@
       with subtest("GUI"):
         gui.wait_for_x()
         gui.wait_for_file("/run/user/1000/xauth_*")
-        gui.sleep(1)
+        gui.wait_until_succeeds("test -s /run/user/1000/xauth_*")
         gui.succeed("xauth merge /run/user/1000/xauth_*")
         gui.wait_for_window("^Desktop ")
         gui.wait_for_unit("maestral.service", "${user.name}")
diff --git a/nixos/tests/plasma6.nix b/nixos/tests/plasma6.nix
index 5b350ef54382..7e74f3219eaa 100644
--- a/nixos/tests/plasma6.nix
+++ b/nixos/tests/plasma6.nix
@@ -33,7 +33,7 @@
       with subtest("Wait for login"):
           start_all()
           machine.wait_for_file("/run/user/1000/xauth_*")
-          machine.sleep(1)
+          machine.wait_until_succeeds("test -s /run/user/1000/xauth_*")
           machine.succeed("xauth merge /run/user/1000/xauth_*")
           machine.succeed("su - ${user.name} -c 'xauth merge /run/user/1000/xauth_*'")
 
diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix
index 4d813cc10b05..5f4fe101b46d 100644
--- a/nixos/tests/retroarch.nix
+++ b/nixos/tests/retroarch.nix
@@ -36,7 +36,7 @@
       with subtest("Wait for login"):
           start_all()
           machine.wait_for_file("/run/sddm/xauth_*")
-          machine.sleep(1)
+          machine.wait_until_succeeds("test -s /run/sddm/xauth_*")
           machine.succeed("xauth merge /run/sddm/xauth_*")
 
       with subtest("Check RetroArch started"):
diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index 014c8d379748..4a3b1321b7d6 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -24,7 +24,7 @@
         machine.screenshot("sddm")
         machine.send_chars("${user.password}\n")
         machine.wait_for_file("/tmp/xauth_*")
-        machine.sleep(1)
+        machine.wait_until_succeeds("test -s /tmp/xauth_*")
         machine.succeed("xauth merge /tmp/xauth_*")
         machine.wait_for_window("^IceWM ")
       '';
@@ -55,7 +55,7 @@
       testScript = ''
         start_all()
         machine.wait_for_file("/tmp/xauth_*")
-        machine.sleep(1)
+        machine.wait_until_succeeds("test -s /tmp/xauth_*")
         machine.succeed("xauth merge /tmp/xauth_*")
         machine.wait_for_window("^IceWM ")
       '';

From 55390a9277ef9a4c25c8d38d5757cde350421d5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 12:33:16 +0000
Subject: [PATCH 3347/3724] hawkeye: 6.1.1 -> 6.2.0

---
 pkgs/by-name/ha/hawkeye/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/hawkeye/package.nix b/pkgs/by-name/ha/hawkeye/package.nix
index 0b5e8baf2dbb..7876fc4b5730 100644
--- a/pkgs/by-name/ha/hawkeye/package.nix
+++ b/pkgs/by-name/ha/hawkeye/package.nix
@@ -7,16 +7,16 @@
 
 rustPackages.rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hawkeye";
-  version = "6.1.1";
+  version = "6.2.0";
 
   src = fetchFromGitHub {
     owner = "korandoru";
     repo = "hawkeye";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-F+6zbVr3oUD/HMpTa5nDR9Tv/k9v+R644IFhVNfKwuU=";
+    hash = "sha256-pIDnD2w1Q85Tc28WKCatkOBURJGQwovzm3KwoBX4IrY=";
   };
 
-  cargoHash = "sha256-BPSA0Z6Bk05xvztv1btkErC4+WDUcIWs7aFV2eVySwQ=";
+  cargoHash = "sha256-T4b2gj+QBChmNsKzMSNbEKIUbVCSKKGiHakOenkxV84=";
 
   nativeBuildInputs = [
     pkg-config

From edaf54e36ed6fae7638aa1368d24df9600d91ffa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 13:06:52 +0000
Subject: [PATCH 3348/3724] terraform-providers.incus: 0.3.1 -> 0.4.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 453eee8cfe39..fc24860d143e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -678,13 +678,13 @@
     "vendorHash": null
   },
   "incus": {
-    "hash": "sha256-zIth+M/70f/uw+CE1r3z5m36VcenCW224x64BG2gkes=",
+    "hash": "sha256-b6UOHTonjvC9Gqt2bmK/gd5WPYYL4OW1E+H/jFbefHY=",
     "homepage": "https://registry.terraform.io/providers/lxc/incus",
     "owner": "lxc",
     "repo": "terraform-provider-incus",
-    "rev": "v0.3.1",
+    "rev": "v0.4.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-HcKNrvDNthxPjg3qmUoRa0Ecj0dNJ5okf5wKT5SWGhU="
+    "vendorHash": "sha256-vj9MbNe8ZAYYbi8p+0LT7IW32C5UnYdndtKtHWBvbBs="
   },
   "infoblox": {
     "hash": "sha256-uxzWgxetwgzj9L5+yxw2EoMzdx6NbR2kEb4fGw3Wxn0=",

From 41ae23c0e7bc34853d2e9b8be63b0c599174259c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 25 Aug 2025 15:17:01 +0200
Subject: [PATCH 3349/3724] ci,workflows: deal with ghost reviews

When a user deletes their account, they appear as a "ghost user". This
user is represented as `null` on API requests. If such a user had posted
a review before, this breaks a few places, which assume to be able to
access `user.login`.
---
 .github/workflows/dismissed-review.yml | 2 +-
 ci/github-script/reviews.js            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dismissed-review.yml b/.github/workflows/dismissed-review.yml
index 1d99c1c9cf06..224ea0af7249 100644
--- a/.github/workflows/dismissed-review.yml
+++ b/.github/workflows/dismissed-review.yml
@@ -49,7 +49,7 @@ jobs:
                     repo: context.repo.repo,
                     pull_number: pull_request.number
                   })).filter(review =>
-                    review.user.login == 'github-actions[bot]' &&
+                    review.user?.login == 'github-actions[bot]' &&
                     review.state == 'DISMISSED'
                   ).map(review => github.graphql(`
                     mutation($node_id:ID!) {
diff --git a/ci/github-script/reviews.js b/ci/github-script/reviews.js
index 107ec3975c98..f10f141d84cb 100644
--- a/ci/github-script/reviews.js
+++ b/ci/github-script/reviews.js
@@ -12,7 +12,7 @@ async function dismissReviews({ github, context, dry }) {
         pull_number,
       })
     )
-      .filter((review) => review.user.login === 'github-actions[bot]')
+      .filter((review) => review.user?.login === 'github-actions[bot]')
       .map(async (review) => {
         if (review.state === 'CHANGES_REQUESTED') {
           await github.rest.pulls.dismissReview({
@@ -46,7 +46,7 @@ async function postReview({ github, context, core, dry, body }) {
     })
   ).find(
     (review) =>
-      review.user.login === 'github-actions[bot]' &&
+      review.user?.login === 'github-actions[bot]' &&
       // If a review is still pending, we can just update this instead
       // of posting a new one.
       (review.state === 'CHANGES_REQUESTED' ||

From 342b93ab5b3e84d2739b53bd8e54f01873b3ec1b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 25 Aug 2025 15:18:33 +0200
Subject: [PATCH 3350/3724] python3Packages.dvclive: 3.48.4 -> 3.48.5

Diff: https://github.com/iterative/dvclive/compare/3.48.4...3.48.5

Changelog: https://github.com/iterative/dvclive/releases/tag/3.48.5
---
 .../python-modules/dvclive/default.nix        | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix
index 31d2539af170..e681d16fa3b2 100644
--- a/pkgs/development/python-modules/dvclive/default.nix
+++ b/pkgs/development/python-modules/dvclive/default.nix
@@ -1,14 +1,24 @@
 {
   lib,
   buildPythonPackage,
-  datasets,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools-scm,
+
+  # dependencies
   dvc,
   dvc-render,
   dvc-studio-client,
-  fastai,
-  fetchFromGitHub,
   funcy,
   gto,
+  psutil,
+  pynvml,
+  ruamel-yaml,
+  scmrepo,
+
+  # optional-dependencies
+  # all
   jsonargparse,
   lightgbm,
   lightning,
@@ -18,31 +28,27 @@
   optuna,
   pandas,
   pillow,
-  psutil,
-  pynvml,
-  pythonOlder,
-  ruamel-yaml,
   scikit-learn,
-  scmrepo,
-  setuptools-scm,
   tensorflow,
   torch,
   transformers,
   xgboost,
+  # huggingface
+  datasets,
+  # fastai
+  fastai,
 }:
 
 buildPythonPackage rec {
   pname = "dvclive";
-  version = "3.48.4";
+  version = "3.48.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvclive";
     tag = version;
-    hash = "sha256-fs0NbsjpGaR4cXE/ajfeF6ZJ3fc7K28KDJ0LIJ/vsdg=";
+    hash = "sha256-ucMtYHDwdpyYnnC7QCn5T6gCS8SarohKh6lxFXtPXgc=";
   };
 
   build-system = [ setuptools-scm ];
@@ -53,10 +59,10 @@ buildPythonPackage rec {
     dvc-studio-client
     funcy
     gto
-    ruamel-yaml
-    scmrepo
     psutil
     pynvml
+    ruamel-yaml
+    scmrepo
   ];
 
   optional-dependencies = {
@@ -114,11 +120,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "dvclive" ];
 
-  meta = with lib; {
+  meta = {
     description = "Library for logging machine learning metrics and other metadata in simple file formats";
     homepage = "https://github.com/iterative/dvclive";
     changelog = "https://github.com/iterative/dvclive/releases/tag/${src.tag}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From e11bcbb432b63317c9213d45c1953b1d77f7c244 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 25 Aug 2025 05:06:06 +0200
Subject: [PATCH 3351/3724] buildMozillaMach: prune obsolete patches

---
 ...CK_LINKER-setting-when-linker-name-i.patch | 57 -------------------
 .../build-mozilla-mach/default.nix            | 28 +--------
 .../env_var_for_system_dir-ff111.patch        | 22 -------
 .../env_var_for_system_dir-ff133.patch        | 22 -------
 .../firefox-cannot-find-type-Allocator.patch  | 26 ---------
 .../firefox-mac-missing-vector-header.patch   | 11 ----
 .../no-buildconfig-ffx121.patch               | 27 ---------
 .../no-buildconfig-ffx136.patch               | 26 ---------
 8 files changed, 1 insertion(+), 218 deletions(-)
 delete mode 100644 pkgs/build-support/build-mozilla-mach/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch
 delete mode 100644 pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff111.patch
 delete mode 100644 pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff133.patch
 delete mode 100644 pkgs/build-support/build-mozilla-mach/firefox-cannot-find-type-Allocator.patch
 delete mode 100644 pkgs/build-support/build-mozilla-mach/firefox-mac-missing-vector-header.patch
 delete mode 100644 pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx121.patch
 delete mode 100644 pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx136.patch

diff --git a/pkgs/build-support/build-mozilla-mach/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch b/pkgs/build-support/build-mozilla-mach/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch
deleted file mode 100644
index 58107b6b9320..000000000000
--- a/pkgs/build-support/build-mozilla-mach/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 45d40b3eeb393051bd3a49feebcefe39dc6e4e93 Mon Sep 17 00:00:00 2001
-From: Peter Collingbourne <pcc@google.com>
-Date: Wed, 23 Apr 2025 21:13:38 -0700
-Subject: [PATCH] build: fix RELRHACK_LINKER setting when linker name is target
- triple prefixed
-
-RELRHACK_LINKER is used as the name of a binary installed in a
-directory specified with -B to override the linker. Both Clang and
-GCC will only look for a binary named "ld" (or "ld.$fuse_ld_setting"
-if -fuse-ld= is specified) in the -B directories, which means that
-if the linker name does not follow this pattern, for example if it
-is named $target_triple-ld", the relrhack linker will not be found,
-the compiler will use the normal linker and the link will fail. To fix
-this problem, use the correct pattern to name the relrhack executable.
----
- toolkit/moz.configure | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 6c47287a5b..1a9c368e5e 100644
---- a/toolkit/moz.configure
-+++ b/toolkit/moz.configure
-@@ -1843,23 +1843,23 @@ with only_when("--enable-compile-environment"):
-     use_relrhack = depends(which_elf_hack)(lambda x: x == "relr")
-     set_config("RELRHACK", True, when=use_relrhack)
- 
--    @depends(c_compiler, linker_ldflags, when=use_relrhack)
--    def relrhack_real_linker(c_compiler, linker_ldflags):
-+    @depends(linker_ldflags, when=use_relrhack)
-+    def relrhack_linker(linker_ldflags):
-         ld = "ld"
-         for flag in linker_ldflags:
-             if flag.startswith("-fuse-ld="):
-                 ld = "ld." + flag[len("-fuse-ld=") :]
-+        return ld
-+
-+    set_config("RELRHACK_LINKER", relrhack_linker)
-+
-+    @depends(c_compiler, relrhack_linker, when=use_relrhack)
-+    def relrhack_real_linker(c_compiler, ld):
-         ld = check_cmd_output(
-             c_compiler.compiler, f"--print-prog-name={ld}", *c_compiler.flags
-         )
-         return ld.rstrip()
- 
--    @depends(relrhack_real_linker, when=use_relrhack)
--    def relrhack_linker(ld):
--        return os.path.basename(ld)
--
--    set_config("RELRHACK_LINKER", relrhack_linker)
--
-     std_filesystem = host_cxx_compiler.try_run(
-         header="#include <filesystem>",
-         body='auto foo = std::filesystem::absolute("");',
--- 
-2.49.0.805.g082f7c87e0-goog
-
diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 10304f4819d5..953f4a5b1cbb 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -304,15 +304,7 @@ buildStdenv.mkDerivation {
   ];
 
   patches =
-    lib.optionals (lib.versionAtLeast version "111" && lib.versionOlder version "133") [
-      ./env_var_for_system_dir-ff111.patch
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "133") [ ./env_var_for_system_dir-ff133.patch ]
-    ++ lib.optionals (lib.versionAtLeast version "121" && lib.versionOlder version "136") [
-      ./no-buildconfig-ffx121.patch
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "136") [ ./no-buildconfig-ffx136.patch ]
-    ++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "141") [
+    lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "141") [
       # https://bugzilla.mozilla.org/show_bug.cgi?id=1955112
       # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9
       ./139-wayland-drag-animation.patch
@@ -326,24 +318,6 @@ buildStdenv.mkDerivation {
         [
           ./142-relax-apple-sdk.patch
         ]
-    ++ lib.optionals (lib.versionOlder version "139") [
-      # Fix for missing vector header on macOS
-      # https://bugzilla.mozilla.org/show_bug.cgi?id=1959377
-      # Fixed on Firefox 139
-      ./firefox-mac-missing-vector-header.patch
-    ]
-    ++ lib.optionals (lib.versionOlder version "140") [
-      # https://bugzilla.mozilla.org/show_bug.cgi?id=1962497
-      # https://phabricator.services.mozilla.com/D246545
-      # Fixed on Firefox 140
-      ./build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch
-    ]
-    ++ lib.optionals (lib.versionOlder version "138") [
-      # https://bugzilla.mozilla.org/show_bug.cgi?id=1941479
-      # https://phabricator.services.mozilla.com/D240572
-      # Fixed on Firefox 138
-      ./firefox-cannot-find-type-Allocator.patch
-    ]
     ++ extraPatches;
 
   postPatch = ''
diff --git a/pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff111.patch b/pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff111.patch
deleted file mode 100644
index 71f5272a18e5..000000000000
--- a/pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff111.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
-index 6db876975187..5882c5d7f1d6 100644
---- a/toolkit/xre/nsXREDirProvider.cpp
-+++ b/toolkit/xre/nsXREDirProvider.cpp
-@@ -11,6 +11,7 @@
- 
- #include "jsapi.h"
- #include "xpcpublic.h"
-+#include "prenv.h"
- #include "prprf.h"
- 
- #include "nsIAppStartup.h"
-@@ -309,7 +310,8 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) {
-       "/usr/lib/mozilla"_ns
- #    endif
-       ;
--  rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir));
-+  const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");
-+  rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), false, getter_AddRefs(localDir));
- #  endif
- 
-   if (NS_SUCCEEDED(rv)) {
diff --git a/pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff133.patch b/pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff133.patch
deleted file mode 100644
index f35569c5909f..000000000000
--- a/pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff133.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
-index 6db876975187..5882c5d7f1d6 100644
---- a/toolkit/xre/nsXREDirProvider.cpp
-+++ b/toolkit/xre/nsXREDirProvider.cpp
-@@ -11,6 +11,7 @@
- 
- #include "jsapi.h"
- #include "xpcpublic.h"
-+#include "prenv.h"
- #include "prprf.h"
- 
- #include "nsIAppStartup.h"
-@@ -297,7 +297,8 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) {
-       "/usr/lib/mozilla"_ns
- #    endif
-       ;
--  rv = NS_NewNativeLocalFile(dirname, getter_AddRefs(localDir));
-+  const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");
-+  rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), getter_AddRefs(localDir));
- #  endif
- 
-   if (NS_SUCCEEDED(rv)) {
diff --git a/pkgs/build-support/build-mozilla-mach/firefox-cannot-find-type-Allocator.patch b/pkgs/build-support/build-mozilla-mach/firefox-cannot-find-type-Allocator.patch
deleted file mode 100644
index 5ab5401e1c43..000000000000
--- a/pkgs/build-support/build-mozilla-mach/firefox-cannot-find-type-Allocator.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 518049ce568d01413eeda304e8e9c341ab8849f6 Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh+mozilla@glandium.org>
-Date: Thu, 6 Mar 2025 09:36:10 +0000
-Subject: [PATCH] Bug 1941479 - Mark mozilla::SmallPointerArray_Element as
- opaque. r=emilio
-
-Differential Revision: https://phabricator.services.mozilla.com/D240572
----
- layout/style/ServoBindings.toml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/layout/style/ServoBindings.toml b/layout/style/ServoBindings.toml
-index 86c6c3026ce7..2b9a34a81a0f 100644
---- a/layout/style/ServoBindings.toml
-+++ b/layout/style/ServoBindings.toml
-@@ -301,6 +301,7 @@ opaque-types = [
-     "mozilla::dom::Touch",
-     "mozilla::dom::Sequence",
-     "mozilla::SmallPointerArray",
-+    "mozilla::SmallPointerArray_Element",
-     "mozilla::dom::Optional",
-     "mozilla::dom::OwningNodeOrString_Value",
-     "mozilla::dom::Nullable",
--- 
-2.49.0
-
diff --git a/pkgs/build-support/build-mozilla-mach/firefox-mac-missing-vector-header.patch b/pkgs/build-support/build-mozilla-mach/firefox-mac-missing-vector-header.patch
deleted file mode 100644
index 19510f1ff142..000000000000
--- a/pkgs/build-support/build-mozilla-mach/firefox-mac-missing-vector-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r 8273f6f8f9b6 security/sandbox/mac/Sandbox.h
---- a/security/sandbox/mac/Sandbox.h	Mon Sep 02 00:19:08 2024 +0000
-+++ b/security/sandbox/mac/Sandbox.h	Sun Dec 29 11:41:25 2024 -0500
-@@ -7,6 +7,7 @@
- #define mozilla_Sandbox_h
- 
- #include <string>
-+#include <vector>
- #include "mozilla/ipc/UtilityProcessSandboxing.h"
- 
- enum MacSandboxType {
diff --git a/pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx121.patch b/pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx121.patch
deleted file mode 100644
index 999d0bd8e7f3..000000000000
--- a/pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx121.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
-index cfbc39527b02..9327631a79c5 100644
---- a/docshell/base/nsAboutRedirector.cpp
-+++ b/docshell/base/nsAboutRedirector.cpp
-@@ -88,9 +88,6 @@ static const RedirEntry kRedirMap[] = {
-     {"about", "chrome://global/content/aboutAbout.html", 0},
-     {"addons", "chrome://mozapps/content/extensions/aboutaddons.html",
-      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
--    {"buildconfig", "chrome://global/content/buildconfig.html",
--     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
--         nsIAboutModule::IS_SECURE_CHROME_UI},
-     {"checkerboard", "chrome://global/content/aboutCheckerboard.html",
-      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
-          nsIAboutModule::ALLOW_SCRIPT},
-diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index ed7c2ad3fc30..ff54456a6582 100644
---- a/toolkit/content/jar.mn
-+++ b/toolkit/content/jar.mn
-@@ -41,8 +41,6 @@ toolkit.jar:
-    content/global/aboutUrlClassifier.js
-    content/global/aboutUrlClassifier.xhtml
-    content/global/aboutUrlClassifier.css
--*   content/global/buildconfig.html
--   content/global/buildconfig.css
-    content/global/contentAreaUtils.js
-    content/global/datepicker.xhtml
- #ifndef MOZ_FENNEC
diff --git a/pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx136.patch b/pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx136.patch
deleted file mode 100644
index 69972b5518bb..000000000000
--- a/pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx136.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
-index 16888323d7..b96450a247 100644
---- a/docshell/base/nsAboutRedirector.cpp
-+++ b/docshell/base/nsAboutRedirector.cpp
-@@ -90,9 +90,6 @@ static const RedirEntry kRedirMap[] = {
-     {"addons", "chrome://mozapps/content/extensions/aboutaddons.html",
-      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
- #endif
--    {"buildconfig", "chrome://global/content/buildconfig.html",
--     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
--         nsIAboutModule::IS_SECURE_CHROME_UI},
-     {"checkerboard", "chrome://global/content/aboutCheckerboard.html",
-      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
-          nsIAboutModule::ALLOW_SCRIPT},
-diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index eb6c179b60..57568668b1 100644
---- a/toolkit/content/jar.mn
-+++ b/toolkit/content/jar.mn
-@@ -40,7 +40,6 @@ toolkit.jar:
-    content/global/aboutUrlClassifier.js
-    content/global/aboutUrlClassifier.xhtml
-    content/global/aboutUrlClassifier.css
--*   content/global/buildconfig.html
-    content/global/buildconfig.css
-    content/global/contentAreaUtils.js
-    content/global/datepicker.xhtml

From ba68d96c62ceeaf274063e606b488c8709314644 Mon Sep 17 00:00:00 2001
From: Sven Over <sven@svenover.de>
Date: Mon, 25 Aug 2025 14:11:37 +0100
Subject: [PATCH 3352/3724] spr 1.3.4 -> 1.3.7

---
 pkgs/by-name/sp/spr/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sp/spr/package.nix b/pkgs/by-name/sp/spr/package.nix
index f5dfe9252be8..9d32e9c54e48 100644
--- a/pkgs/by-name/sp/spr/package.nix
+++ b/pkgs/by-name/sp/spr/package.nix
@@ -1,19 +1,25 @@
 {
-  lib,
-  rustPlatform,
   fetchCrate,
+  lib,
+  openssl,
+  pkg-config,
+  rustPlatform,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "spr";
-  version = "1.3.4";
+  version = "1.3.7";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-lsdWInJWcofwU3P4vAWcLQeZuV3Xn1z30B7mhODJ4Vc=";
+    hash = "sha256-YmmPxsDoV1sYmqY0Jfqm3xTPmu7WWuIUQyOaICu3stM=";
   };
 
-  cargoHash = "sha256-4fYQM+GQ5yqES8HQ23ft4wfM5mwDdcWuE5Ed2LST9Gw=";
+  cargoHash = "sha256-cQsxRrs/pBe/xmqpp5vi1VRJo8jCAufYJrMigxs/tWY=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
 
   meta = with lib; {
     description = "Submit pull requests for individual, amendable, rebaseable commits to GitHub";

From 9ee67b869e960608ab95aa5c4c3882e90aff6eaa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 13:47:58 +0000
Subject: [PATCH 3353/3724] kin-openapi: 0.132.0 -> 0.133.0

---
 pkgs/by-name/ki/kin-openapi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ki/kin-openapi/package.nix b/pkgs/by-name/ki/kin-openapi/package.nix
index 9797ad5ddcfb..de98ca1beda0 100644
--- a/pkgs/by-name/ki/kin-openapi/package.nix
+++ b/pkgs/by-name/ki/kin-openapi/package.nix
@@ -5,14 +5,14 @@
 }:
 buildGoModule rec {
   pname = "kin-openapi";
-  version = "0.132.0";
-  vendorHash = "sha256-VtN2dOJEBAS7khjn2GlvMspFvd7SgMqNWBte3gwbWng=";
+  version = "0.133.0";
+  vendorHash = "sha256-SFT4mY0TVUa/hMMe7sOVToSX8qA1OimOiNs4kBjRdBU=";
 
   src = fetchFromGitHub {
     owner = "getkin";
     repo = "kin-openapi";
     tag = "v${version}";
-    hash = "sha256-2iDT9sI4dy7KEFKfWhPhccTc1/1jpSjYt+cXz+RE9ys=";
+    hash = "sha256-7KC+cHdI3zArJbSMfao8JIb3sUZJK1PQfrIiFI0zHM8=";
   };
 
   checkFlags =

From 763c345bb423674521605a131af21807fbf60a78 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sun, 24 Aug 2025 15:16:46 +0200
Subject: [PATCH 3354/3724] prowlarr: 1.37.0.5076 -> 2.0.5.5160

---
 pkgs/by-name/pr/prowlarr/deps.json   |  8 ++++----
 pkgs/by-name/pr/prowlarr/package.nix | 25 ++-----------------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/pr/prowlarr/deps.json b/pkgs/by-name/pr/prowlarr/deps.json
index 53ed46c74faf..c8ca52167952 100644
--- a/pkgs/by-name/pr/prowlarr/deps.json
+++ b/pkgs/by-name/pr/prowlarr/deps.json
@@ -609,8 +609,8 @@
   },
   {
     "pname": "Polly",
-    "version": "8.5.2",
-    "hash": "sha256-IrN06ddOIJ0VYuVefe3LvfW0kX20ATRQkEBg9CBomRA="
+    "version": "8.6.0",
+    "hash": "sha256-wlvYcfcOExa3LopwRFO4axW682jkUZvioHe+kznspHk="
   },
   {
     "pname": "Polly.Contrib.WaitAndRetry",
@@ -619,8 +619,8 @@
   },
   {
     "pname": "Polly.Core",
-    "version": "8.5.2",
-    "hash": "sha256-PAwsWqrCieCf/7Y87fV7XMKoaY2abCQNtI+4oyyMifk="
+    "version": "8.6.0",
+    "hash": "sha256-NEGMMQ+3+i4ytsGekKfP1trUe0mRZP7MV0eBiSFXHW8="
   },
   {
     "pname": "RestSharp",
diff --git a/pkgs/by-name/pr/prowlarr/package.nix b/pkgs/by-name/pr/prowlarr/package.nix
index 5afe8e16fbfe..69d6877a43e1 100644
--- a/pkgs/by-name/pr/prowlarr/package.nix
+++ b/pkgs/by-name/pr/prowlarr/package.nix
@@ -19,7 +19,7 @@
   applyPatches,
 }:
 let
-  version = "1.37.0.5076";
+  version = "2.0.5.5160";
   # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
   # the already patched lockfile to `fetchYarnDeps`.
   src = applyPatches {
@@ -27,32 +27,11 @@ let
       owner = "Prowlarr";
       repo = "Prowlarr";
       tag = "v${version}";
-      hash = "sha256-uSdZaPq/aXehmRKMobwYNs5iYGPv5R76Ix9lCEVdLzM=";
+      hash = "sha256-xSAEDcBaItA+retaSKtEI6wlwj5Knfi4RwUN6GGYms0=";
     };
     postPatch = ''
       mv src/NuGet.config NuGet.Config
     '';
-    patches = lib.optionals (lib.versionOlder version "2.0") [
-      # See https://github.com/Prowlarr/Prowlarr/pull/2399
-      # Unfortunately, the .NET 8 upgrade will be merged into the v2 branch,
-      # and it may take some time for that to become stable.
-      # However, the patches cleanly apply to v1 as well.
-      (fetchpatch {
-        name = "dotnet8-compatibility";
-        url = "https://github.com/Prowlarr/Prowlarr/commit/21c408a7dac8abaac91c05958f18a556220b2304.patch";
-        hash = "sha256-Es7JEXycOJPMXN+Kgv4wRnJA+l6zltUdP2i/wVodTBs=";
-      })
-      (fetchpatch {
-        name = "dotnet8-darwin-compatibility";
-        url = "https://github.com/Prowlarr/Prowlarr/commit/7a1fca5e23a3e75a9a2b2e1073a33eaa2ce865fe.patch";
-        hash = "sha256-bReCHXC3RHgm1MYmE2kGqStt4fuBHowcupLIXT3fEes=";
-      })
-      (fetchpatch {
-        name = "bump-swashbuckle-version";
-        url = "https://github.com/Prowlarr/Prowlarr/commit/8eec321a0eaa396e2f964576e5883890c719b202.patch";
-        hash = "sha256-SOdzGvq8FFYa451zTOw8yD1CDvM++AiFYFHhFW5Soco=";
-      })
-    ];
   };
   rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system;
 in

From c577a4f0588042b6c6e30e9a2f267a6e3ebb97fe Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 25 Aug 2025 17:03:25 +0300
Subject: [PATCH 3355/3724] widevine-cdm: fix build

The zipfile simply disappeared from the CDN. Use the archive.org copy
for now to unbreak the build.

See https://github.com/NixOS/nixpkgs/issues/435671.
---
 pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix b/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix
index 00c1b625c32d..ae16e951c666 100644
--- a/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix
+++ b/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation (finalAttrs: {
   version = "4.10.2891.0";
 
   src = fetchzip {
-    url = "https://dl.google.com/widevine-cdm/${finalAttrs.version}-linux-x64.zip";
+    # The download 404s
+    url = "https://web.archive.org/web/20250725071306/https://dl.google.com/widevine-cdm/4.10.2891.0-linux-x64.zip";
     hash = "sha256-ZO6FmqJUnB9VEJ7caJt58ym8eB3/fDATri3iOWCULRI=";
     stripRoot = false;
   };

From 1cfc9773b5a8c52262da3184646d3ff11506acc3 Mon Sep 17 00:00:00 2001
From: PixelSergey <sergey.ichtchenko@gmail.com>
Date: Sun, 17 Aug 2025 00:38:23 +0100
Subject: [PATCH 3356/3724] meow: 2.1.4 -> 2.1.5

---
 pkgs/by-name/me/meow/package.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/me/meow/package.nix b/pkgs/by-name/me/meow/package.nix
index 7a30edfcbde3..43f3b158b6d9 100644
--- a/pkgs/by-name/me/meow/package.nix
+++ b/pkgs/by-name/me/meow/package.nix
@@ -1,26 +1,28 @@
 {
   lib,
-  fetchFromGitHub,
+  fetchCrate,
   rustPlatform,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "meow";
-  version = "2.1.4";
+  version = "2.1.5";
 
-  src = fetchFromGitHub {
-    owner = "PixelSergey";
-    repo = "meow";
-    rev = "v${version}";
-    hash = "sha256-iskpT0CU/cGp+8myWaVmdw/uC0VoP8Sv+qbjpDDKS3o=";
+  src = fetchCrate {
+    inherit version;
+    crateName = "${pname}-cli";
+    sha256 = "sha256-6tf4/KRZj+1zlxnNgz3kw/HYR2QKg0kEwu+TbKah3e8=";
   };
 
-  cargoHash = "sha256-c+Nz3PH5a5CAG4HaIEz7U+b4rp6sgAuo+/uRL70/Tbs=";
+  cargoHash = "sha256-Z3qAeIAiLJEHsqlDLvQXzX287dZSLhPg2V6clfI0Egs=";
 
   postInstall = ''
     mv $out/bin/meow-cli $out/bin/meow
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Print ASCII cats to your terminal";
     homepage = "https://github.com/PixelSergey/meow";

From bc6ffc09997b4c16719eda1bf4398ea8482adb67 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Aug 2025 16:28:22 +0200
Subject: [PATCH 3357/3724] python313Packages.btest: add missing multiprocess

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

diff --git a/pkgs/development/python-modules/btest/default.nix b/pkgs/development/python-modules/btest/default.nix
index 44a510dc8895..61c4c29b765f 100644
--- a/pkgs/development/python-modules/btest/default.nix
+++ b/pkgs/development/python-modules/btest/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  multiprocess,
   pythonOlder,
   setuptools,
 }:
@@ -22,6 +23,8 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  dependencies = [ multiprocess ];
+
   # No tests available and no module to import
   doCheck = false;
 

From ffa66548dd46fc1b629638d3c8cc8465dcb16cc4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:42:09 +0200
Subject: [PATCH 3358/3724] python312Packages.mypy-boto3-clouddirectory: 1.40.0
 -> 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 32201783ddbc..501827c3c789 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -222,8 +222,8 @@ rec {
       "sha256-38IFJI1enFd6XnWe81zuf80N23Orfl1CUCRt57g0zEE=";
 
   mypy-boto3-clouddirectory =
-    buildMypyBoto3Package "clouddirectory" "1.40.0"
-      "sha256-kMDdPCPFcwKQR5/MAlbyvGY4o7PHwQzQVGkzWLRg7Sk=";
+    buildMypyBoto3Package "clouddirectory" "1.40.16"
+      "sha256-fFnHwgB8r239cpVnWSfeiGO1MNOxkXn9MNMUA5ohm04=";
 
   mypy-boto3-cloudformation =
     buildMypyBoto3Package "cloudformation" "1.40.0"

From 1b98d8242dc9fc770b3af8269a741091606248fc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:42:17 +0200
Subject: [PATCH 3359/3724] python312Packages.mypy-boto3-cognito-sync: 1.40.0
 -> 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 501827c3c789..49161be23ea7 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -318,8 +318,8 @@ rec {
       "sha256-g79jptfBbK/WuUeQDMnEogENZ0ysf1UKfMFa1fzlWkU=";
 
   mypy-boto3-cognito-sync =
-    buildMypyBoto3Package "cognito-sync" "1.40.0"
-      "sha256-3BylDhj1qWTDr/xeUxdnrKNXbXisMgXL0OoThhdoSZg=";
+    buildMypyBoto3Package "cognito-sync" "1.40.16"
+      "sha256-NFaYYsnZD0MlDKl7t9FCMLV2eo/WH34ach4o6N/xrm0=";
 
   mypy-boto3-comprehend =
     buildMypyBoto3Package "comprehend" "1.40.15"

From 3ae93691b403a007562c8e7c53db2ed368b7b2dd Mon Sep 17 00:00:00 2001
From: langsjo <104687438+langsjo@users.noreply.github.com>
Date: Sun, 15 Jun 2025 20:14:45 +0300
Subject: [PATCH 3360/3724] maintainers: add langsjo

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 388a3a8a1332..cf2b9a1ad15f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14125,6 +14125,11 @@
     githubId = 61395246;
     name = "Lampros Pitsillos";
   };
+  langsjo = {
+    name = "langsjo";
+    github = "langsjo";
+    githubId = 104687438;
+  };
   larsr = {
     email = "Lars.Rasmusson@gmail.com";
     github = "larsr";

From fb56571ed3205c2a43050e042d2c4712862a0ba9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:42:26 +0200
Subject: [PATCH 3361/3724] python312Packages.mypy-boto3-docdb: 1.40.0 ->
 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 49161be23ea7..13623dcccd70 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -418,8 +418,8 @@ rec {
       "sha256-JT+/tWyrcEXCiPhfcJQYXsPAwKCKLPu+c3A+r4iJIVg=";
 
   mypy-boto3-docdb =
-    buildMypyBoto3Package "docdb" "1.40.0"
-      "sha256-GH91jmgaNkchW2fK8winBTP4IWUftwqFCqfJPqkDj9o=";
+    buildMypyBoto3Package "docdb" "1.40.16"
+      "sha256-qpxQc8Zq/XAJJBKaAVFnoGlfVL/08lh+HqT2ix/UDOc=";
 
   mypy-boto3-docdb-elastic =
     buildMypyBoto3Package "docdb-elastic" "1.40.0"

From 874f8796977b06002358d19a12b3b22f348eb3d9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:42:33 +0200
Subject: [PATCH 3362/3724] python312Packages.mypy-boto3-elb: 1.40.0 -> 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 13623dcccd70..67ff211bdd32 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -490,8 +490,8 @@ rec {
       "sha256-4xpjAgNDfYP3Z8uPxINsLOQ1vvanXW1/QDbUcZ57e0Y=";
 
   mypy-boto3-elb =
-    buildMypyBoto3Package "elb" "1.40.0"
-      "sha256-/VNUPoXCvu+XIbq81YPL7wN1aCnec5K4Vv3ysVr2+eI=";
+    buildMypyBoto3Package "elb" "1.40.16"
+      "sha256-9LKKt1qGw/gWS+XtNzmnjk0WOFHAmTuzkj9D3tYuMtU=";
 
   mypy-boto3-elbv2 =
     buildMypyBoto3Package "elbv2" "1.40.0"

From 73908059c875cc52b4118c308e61ec6af0930a9b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:42:45 +0200
Subject: [PATCH 3363/3724] python312Packages.mypy-boto3-healthlake: 1.40.0 ->
 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 67ff211bdd32..60d2e113f29b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -601,8 +601,8 @@ rec {
       "sha256-c/QCgM8mWIAe76C7e3+g9z3i/ukvOz9QGungofo2hY8=";
 
   mypy-boto3-healthlake =
-    buildMypyBoto3Package "healthlake" "1.40.0"
-      "sha256-zsVA9tf4try58FeHrxsVdXxdN9d1UpLiebb6tViGZ3k=";
+    buildMypyBoto3Package "healthlake" "1.40.16"
+      "sha256-8GlzjPAake0zidyq1MVF9cMQ14+UdU5zcuMEBOoTEBM=";
 
   mypy-boto3-iam =
     buildMypyBoto3Package "iam" "1.40.0"

From 2f4c38c34d0eed44ddb27bc884a760dfa76b4a5b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:42:51 +0200
Subject: [PATCH 3364/3724] python312Packages.mypy-boto3-iotanalytics: 1.40.0
 -> 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 60d2e113f29b..71efa1c89fad 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -653,8 +653,8 @@ rec {
       "sha256-LFuz5/nCZGpSfgqyswxn80VzxXsqzZlBFqPtPJ8bzgo=";
 
   mypy-boto3-iotanalytics =
-    buildMypyBoto3Package "iotanalytics" "1.40.0"
-      "sha256-llbeFHGDeVXv++P6wtIh+lwMbVlNPIpDim7s5Ux4MV8=";
+    buildMypyBoto3Package "iotanalytics" "1.40.16"
+      "sha256-kLN+S5x9XMO8TovR57hwXnqQvC6K+JwHncgmrLFOpFY=";
 
   mypy-boto3-iotdeviceadvisor =
     buildMypyBoto3Package "iotdeviceadvisor" "1.40.15"

From 858e57917be5d7368b571721ac56541c59f09053 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:43:06 +0200
Subject: [PATCH 3365/3724] python312Packages.mypy-boto3-macie2: 1.40.0 ->
 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 71efa1c89fad..17b1540091cd 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -833,8 +833,8 @@ rec {
       "sha256-8GUW15hhmTVMHUiEa6G3839Z8O+VUerBYVN7lVEHUjg=";
 
   mypy-boto3-macie2 =
-    buildMypyBoto3Package "macie2" "1.40.0"
-      "sha256-YQD3ujd2DtQuygjhJH/bJnxUQ30n1gyUcSMRMIXcjTc=";
+    buildMypyBoto3Package "macie2" "1.40.16"
+      "sha256-JKGY573KRt5XWgLVcNvlNgTdFYHC7Qj/YNcdODmUF00=";
 
   mypy-boto3-managedblockchain =
     buildMypyBoto3Package "managedblockchain" "1.40.15"

From a3bc4fedc52013aca467f3bea3e85a523036df15 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:43:08 +0200
Subject: [PATCH 3366/3724] 
 python312Packages.mypy-boto3-marketplacecommerceanalytics: 1.40.0 -> 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 17b1540091cd..297a189bc8dd 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -853,8 +853,8 @@ rec {
       "sha256-tgFgsCuWsIC2AkRcLQ7e4ANb0eTwqfU9N1/XXPReB5I=";
 
   mypy-boto3-marketplacecommerceanalytics =
-    buildMypyBoto3Package "marketplacecommerceanalytics" "1.40.0"
-      "sha256-f24JMHKTmfJGygP1zdKqLgo/8muBTz/B0LEt31ZJp+I=";
+    buildMypyBoto3Package "marketplacecommerceanalytics" "1.40.16"
+      "sha256-7gZOd0TBAWyyY7g85UXAjp4miV08qfB20B6YQww360w=";
 
   mypy-boto3-mediaconnect =
     buildMypyBoto3Package "mediaconnect" "1.40.0"

From dbb103a837a0ca707256e764a45a76731fafbbdc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:43:10 +0200
Subject: [PATCH 3367/3724] python312Packages.mypy-boto3-medialive: 1.40.10 ->
 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 297a189bc8dd..44afc91275b4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -865,8 +865,8 @@ rec {
       "sha256-DJEU4Ha8jpV/J8UP6emYMjcv9RfZt1njsBPD11q0BUI=";
 
   mypy-boto3-medialive =
-    buildMypyBoto3Package "medialive" "1.40.10"
-      "sha256-hGbdgOvsb+gd7640D1WeXj4tOkzuGwi8Ib/RmmQd4tY=";
+    buildMypyBoto3Package "medialive" "1.40.16"
+      "sha256-zlgLZi4d3DptEmu7re5rsWx16kZzFVL1eiNvIC/MFzk=";
 
   mypy-boto3-mediapackage =
     buildMypyBoto3Package "mediapackage" "1.40.15"

From 41cafd9c5ec58ed6ae155d13692f3dc49fbd3181 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:43:14 +0200
Subject: [PATCH 3368/3724] python312Packages.mypy-boto3-memorydb: 1.40.0 ->
 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 44afc91275b4..9d8569382692 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -897,8 +897,8 @@ rec {
       "sha256-FT2lYxXXUxPssxPqinwIbEj1YEhRTyDZz44LyKr6jCc=";
 
   mypy-boto3-memorydb =
-    buildMypyBoto3Package "memorydb" "1.40.0"
-      "sha256-pbtnV+rUtjVXOreQNRYKyKB9ovSwyZWNY08LHaxDCFs=";
+    buildMypyBoto3Package "memorydb" "1.40.16"
+      "sha256-aJbMT+n4ml/lcdj4hvIhf2mEFgVUQhHuB65oerbdiA0=";
 
   mypy-boto3-meteringmarketplace =
     buildMypyBoto3Package "meteringmarketplace" "1.40.0"

From 52b580dfe47a3aff296c805500a2841c793ab789 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:43:27 +0200
Subject: [PATCH 3369/3724] python312Packages.mypy-boto3-proton: 1.40.0 ->
 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 9d8569382692..1f7c2d90a072 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1061,8 +1061,8 @@ rec {
       "sha256-T04icQC+XwQZhaAEBWRiqfCUaayXP1szpbLdAG/7t3k=";
 
   mypy-boto3-proton =
-    buildMypyBoto3Package "proton" "1.40.0"
-      "sha256-39AZnJrwQups3lYJHM18nmyof92C3xw7Tf8jbwNVZ4g=";
+    buildMypyBoto3Package "proton" "1.40.16"
+      "sha256-6HufCNGwO9QsEJofZEWhyFwuGe5rA0hunAqudPXLw4o=";
 
   mypy-boto3-qldb =
     buildMypyBoto3Package "qldb" "1.40.0"

From 2782a3373d6c5d4468eaf25b23593f4643801c9e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:43:28 +0200
Subject: [PATCH 3370/3724] python312Packages.mypy-boto3-qldb: 1.40.0 ->
 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1f7c2d90a072..959ae0bb21d4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1065,8 +1065,8 @@ rec {
       "sha256-6HufCNGwO9QsEJofZEWhyFwuGe5rA0hunAqudPXLw4o=";
 
   mypy-boto3-qldb =
-    buildMypyBoto3Package "qldb" "1.40.0"
-      "sha256-PHQpqhWY8k/HUbqnCafgzhAukaUo91Mir/DszBN8y7Q=";
+    buildMypyBoto3Package "qldb" "1.40.16"
+      "sha256-IaEZm5lbmuWg/Y6BHJ6ABKBPlQsvCCRIBkQk1xbc9PI=";
 
   mypy-boto3-qldb-session =
     buildMypyBoto3Package "qldb-session" "1.40.0"

From 3fee0a901552b0491bffa022968048da730b7222 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:43:30 +0200
Subject: [PATCH 3371/3724] python312Packages.mypy-boto3-rds: 1.40.3 -> 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 959ae0bb21d4..b7035e989337 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1085,8 +1085,8 @@ rec {
       "sha256-1yLtNpzjAZzF2L87OvTsXN7VhwyQt3KA1YpRxPPjNG8=";
 
   mypy-boto3-rds =
-    buildMypyBoto3Package "rds" "1.40.3"
-      "sha256-SqXuOk/U9ux5cuzqazNit8ANMmnLimv1/xPYBxymN+Y=";
+    buildMypyBoto3Package "rds" "1.40.16"
+      "sha256-+VtBbtMoYVgMjkvTn8g9RYuryjDgzh7OlKXLtjllPKE=";
 
   mypy-boto3-rds-data =
     buildMypyBoto3Package "rds-data" "1.40.0"

From f932c1b683584175568638d8a8fafe65cc60b42c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:43:36 +0200
Subject: [PATCH 3372/3724] 
 python312Packages.mypy-boto3-route53-recovery-readiness: 1.40.0 -> 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b7035e989337..4d21c3bf5c34 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1145,8 +1145,8 @@ rec {
       "sha256-xHo8vLsSgGMCM3uVYv1ihLAOpkSc3XjuPgKWLFTqDkk=";
 
   mypy-boto3-route53-recovery-readiness =
-    buildMypyBoto3Package "route53-recovery-readiness" "1.40.0"
-      "sha256-3H++iwsm7Lhe8rKkyR+IJ0reNeXaL94UEkqfLBKClzY=";
+    buildMypyBoto3Package "route53-recovery-readiness" "1.40.16"
+      "sha256-oo6Vpu6SfuJKw1aqX8x6oIlLUJbHa2lNfPx5kfQMo8M=";
 
   mypy-boto3-route53domains =
     buildMypyBoto3Package "route53domains" "1.40.0"

From 27175fe3f1b6c4388c7e7a08a7e666d0e878837e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:43:39 +0200
Subject: [PATCH 3373/3724] python312Packages.mypy-boto3-sagemaker: 1.40.14 ->
 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4d21c3bf5c34..c66d0281bfd5 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1173,8 +1173,8 @@ rec {
       "sha256-HPAyUwvfUNZl3Ts3H0evVO7UifAiiwrDPyYJ4titkqA=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.40.14"
-      "sha256-c68Off9js9/KX5ElnEKx1UI0DQvAVsPXyWI0kBs++BQ=";
+    buildMypyBoto3Package "sagemaker" "1.40.16"
+      "sha256-EGGubyEkwJyBFZy6BPi6ozwW7EJHSZOw/8SK/FHIc64=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.0"

From 9e15503a947e686be3a3ec96207130849e4c3132 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:43:40 +0200
Subject: [PATCH 3374/3724] python312Packages.mypy-boto3-sagemaker-a2i-runtime:
 1.40.0 -> 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c66d0281bfd5..4d48f901856a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1177,8 +1177,8 @@ rec {
       "sha256-EGGubyEkwJyBFZy6BPi6ozwW7EJHSZOw/8SK/FHIc64=";
 
   mypy-boto3-sagemaker-a2i-runtime =
-    buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.0"
-      "sha256-vHiULaXt7b1F2lHx9WXtYr3MnxyDaWDKiozYRTSmkfM=";
+    buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.16"
+      "sha256-Mab/cO02qbhVylLWHL4aGfgMArujecXpsOgfMG7OLTk=";
 
   mypy-boto3-sagemaker-edge =
     buildMypyBoto3Package "sagemaker-edge" "1.40.0"

From e45955b74c13d07eea9bff6c5729c0e8df9ebaba Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:43:48 +0200
Subject: [PATCH 3375/3724] python312Packages.mypy-boto3-simspaceweaver: 1.40.0
 -> 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4d48f901856a..1c5a8e9b00f9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1265,8 +1265,8 @@ rec {
       "sha256-S77EdSxEfJn5CzxzBWjxzSY1zttBnS/pPQ2NWKFQM6k=";
 
   mypy-boto3-simspaceweaver =
-    buildMypyBoto3Package "simspaceweaver" "1.40.0"
-      "sha256-iPQ4dCw/XZJtUdru+Xmd7t6UaG2HJspWSkL7I/+WdZ4=";
+    buildMypyBoto3Package "simspaceweaver" "1.40.16"
+      "sha256-RfRroS8x3KiY5OvyRpOT8WCi37cI5YUbZj2BEOskgKk=";
 
   mypy-boto3-sms =
     buildMypyBoto3Package "sms" "1.40.0"

From 246c823c58725aa0bb9151ca6f2f35f32a3308c7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:43:55 +0200
Subject: [PATCH 3376/3724] python312Packages.mypy-boto3-synthetics: 1.40.0 ->
 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1c5a8e9b00f9..48f716ad1720 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1345,8 +1345,8 @@ rec {
       "sha256-qkE3rF32WkR56WB5pu3dKJLCLY5e1rvMDPYAruyj9O8=";
 
   mypy-boto3-synthetics =
-    buildMypyBoto3Package "synthetics" "1.40.0"
-      "sha256-LCW7HDnLI4BurauxCef8W93Rt/NYjR3XM1gC6AQ9uuA=";
+    buildMypyBoto3Package "synthetics" "1.40.16"
+      "sha256-E7spYXuGbWE7BrOPNP/f8kUakXjTLGf1JAZuhd6m0Yg=";
 
   mypy-boto3-textract =
     buildMypyBoto3Package "textract" "1.40.0"

From 57f70e0dc7f94d7f70da2173d95ee94ced621c2a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:43:59 +0200
Subject: [PATCH 3377/3724] python312Packages.mypy-boto3-wafv2: 1.40.0 ->
 1.40.16

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 48f716ad1720..826d6349e1b1 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1397,8 +1397,8 @@ rec {
       "sha256-BCmGOUKfRbzFczLKiU5gMjnU3RALOFIHmif2peyzggY=";
 
   mypy-boto3-wafv2 =
-    buildMypyBoto3Package "wafv2" "1.40.0"
-      "sha256-o1Vz6xyFHZXg6/hTEf+uO3LCVlZjgDBKI5V9hCedAPc=";
+    buildMypyBoto3Package "wafv2" "1.40.16"
+      "sha256-pog2ynsKrud7qCCW19DbXVNbyZBqvqnEecdxpxkuNEY=";
 
   mypy-boto3-wellarchitected =
     buildMypyBoto3Package "wellarchitected" "1.40.0"

From 149b9a5a980cba69760eceb0f71d31d1ae16882c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 25 Aug 2025 16:44:08 +0200
Subject: [PATCH 3378/3724] python313Packages.boto3-stubs: 1.40.15 -> 1.40.16

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 50c5f2efc015..0bb950302b92 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.15";
+  version = "1.40.16";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-RzcP/f2fGJmQC7pVT0rhhGQjxFm+rM8R4urkaJavURk=";
+    hash = "sha256-MJYKSkakxJqsRA3rEoE1b+iQf6z/EA52zkWHc43HfQE=";
   };
 
   build-system = [ setuptools ];

From 967502cfdd7d8279f40744706ebf8fb56dfd4ac6 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 24 Aug 2025 01:32:04 -0700
Subject: [PATCH 3379/3724] roslyn: 4.2.0 -> 4.14.0

---
 pkgs/by-name/ro/roslyn/deps.json   | 1036 +++++-----------------------
 pkgs/by-name/ro/roslyn/package.nix |   33 +-
 2 files changed, 195 insertions(+), 874 deletions(-)

diff --git a/pkgs/by-name/ro/roslyn/deps.json b/pkgs/by-name/ro/roslyn/deps.json
index 1ada653a10e1..4ee0a9919ea0 100644
--- a/pkgs/by-name/ro/roslyn/deps.json
+++ b/pkgs/by-name/ro/roslyn/deps.json
@@ -1,1022 +1,326 @@
 [
   {
     "pname": "dotnet-format",
-    "version": "6.2.315104",
-    "sha256": "0b802r9xbxibds3dj57ywzl377kyi2h4cmy1iajp82kqbd4707cl",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/dotnet-format/6.2.315104/dotnet-format.6.2.315104.nupkg"
+    "version": "7.0.360304",
+    "hash": "sha256-TuhZIhearocl702hLzGJCcRd8+RWoI4tDY02Bf6Lus8=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/dotnet-format/7.0.360304/dotnet-format.7.0.360304.nupkg"
   },
   {
-    "pname": "Microsoft.AspNetCore.App.Ref",
-    "version": "3.1.10",
-    "sha256": "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/3.1.10/microsoft.aspnetcore.app.ref.3.1.10.nupkg"
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
-    "version": "3.1.32",
-    "sha256": "00ha2sl4gvqv68mbrsizd6ngqy0vv6vamngzjxr338k1w7a276dx",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/3.1.32/microsoft.aspnetcore.app.runtime.linux-arm64.3.1.32.nupkg"
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
-    "version": "3.1.32",
-    "sha256": "0ywz63q8vrdp25ix2j9b7h2jp5grc68hqfl64c6lqk26q9xwhp9r",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/3.1.32/microsoft.aspnetcore.app.runtime.linux-x64.3.1.32.nupkg"
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
-    "version": "3.1.32",
-    "sha256": "1crk54a1wvj76s9gnh46pi7wk8ryympm9xh2jq4s4rpp329fqgic",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/3.1.32/microsoft.aspnetcore.app.runtime.osx-x64.3.1.32.nupkg"
+    "pname": "Microsoft.Bcl.HashCode",
+    "version": "1.1.1",
+    "hash": "sha256-gP6ZhEsjjbmw6a477sm7UuOvGFFTxZYfRE2kKxK8jnc=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.hashcode/1.1.1/microsoft.bcl.hashcode.1.1.1.nupkg"
   },
   {
     "pname": "Microsoft.Build.Framework",
-    "version": "16.5.0",
-    "sha256": "1xgr02r7s9i6s70n237hss4yi9zicssia3zd2ny6s8vyxb7jpdyb",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/16.5.0/microsoft.build.framework.16.5.0.nupkg"
+    "version": "17.13.9",
+    "hash": "sha256-IrYG5ushm3fFW7DudKBPBj1Xs5BDwfc3vpZnkwsn2Bc=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.13.9/microsoft.build.framework.17.13.9.nupkg"
+  },
+  {
+    "pname": "Microsoft.Build.Framework",
+    "version": "17.7.2",
+    "hash": "sha256-fNWmVQYFTJDveAGmxEdNqJRAczV6+Ep8RA8clKBJFqw=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.7.2/microsoft.build.framework.17.7.2.nupkg"
   },
   {
     "pname": "Microsoft.Build.Tasks.Core",
-    "version": "16.5.0",
-    "sha256": "08mpdcnjbjpsggfzb3plpmjg1jhx2j4zslm8m2p3icnrpw8swxz4",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/16.5.0/microsoft.build.tasks.core.16.5.0.nupkg"
+    "version": "17.13.9",
+    "hash": "sha256-ZF6MaW4TIGGgqMqr78f7XrY4ZuoxTyaDi8EMLNMiV5I=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.13.9/microsoft.build.tasks.core.17.13.9.nupkg"
   },
   {
-    "pname": "Microsoft.Build.Tasks.Git",
-    "version": "1.2.0-beta-22167-02",
-    "sha256": "1zb5vhlc9kzqbw22hg84hakhqms0aa7ghy585229hsf278rfh2sy",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.tasks.git/1.2.0-beta-22167-02/microsoft.build.tasks.git.1.2.0-beta-22167-02.nupkg"
+    "pname": "Microsoft.Build.Tasks.Core",
+    "version": "17.7.2",
+    "hash": "sha256-OrV/qWgZHzGlNUmaSfX5wDBcmg1aQeF3/OUHpSH+uZU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.7.2/microsoft.build.tasks.core.17.7.2.nupkg"
   },
   {
     "pname": "Microsoft.Build.Utilities.Core",
-    "version": "16.5.0",
-    "sha256": "127l700qqky1nfrljncrpk7y4f0qi0811kpk2j87659nnv81bxs7",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/16.5.0/microsoft.build.utilities.core.16.5.0.nupkg"
+    "version": "17.13.9",
+    "hash": "sha256-B1+u6sdrkwz3b5JLZ42BHkFRvPKRGyMWWUt44Fyb9Zo=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.13.9/microsoft.build.utilities.core.17.13.9.nupkg"
+  },
+  {
+    "pname": "Microsoft.Build.Utilities.Core",
+    "version": "17.7.2",
+    "hash": "sha256-oatF0KfuP1nb4+OLNKg2/R/ZLO4EiACaO5leaxMEY4A=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.7.2/microsoft.build.utilities.core.17.7.2.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "3.3.3",
-    "sha256": "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.3.3/microsoft.codeanalysis.analyzers.3.3.3.nupkg"
+    "version": "3.11.0",
+    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.11.0/microsoft.codeanalysis.analyzers.3.11.0.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
-    "version": "3.3.4-beta1.22160.2",
-    "sha256": "1g95w9jbwg74f04dif3wbdbcigrx5rwv1ng4g102970l1lbx898b",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49e5305d-d845-4a14-9d69-6f5dbfb9570c/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.3.4-beta1.22160.2/microsoft.codeanalysis.bannedapianalyzers.3.3.4-beta1.22160.2.nupkg"
+    "version": "3.11.0-beta1.24081.1",
+    "hash": "sha256-5UN//A8oc2w+UoxAwWmXWRXykQD+2mpa1hbJrAfh2Lg=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.bannedapianalyzers.3.11.0-beta1.24081.1.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "3.8.0",
-    "sha256": "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/3.8.0/microsoft.codeanalysis.common.3.8.0.nupkg"
+    "version": "4.1.0",
+    "hash": "sha256-g3RLyeHfdOOF6H89VLJi06/k8/eJ6j2dgNYZ/MBdfNU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/4.1.0/microsoft.codeanalysis.common.4.1.0.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.NetAnalyzers",
-    "version": "6.0.0-rc1.21366.2",
-    "sha256": "18svr40y7c0gv68hv9g9fzd9f8hm7bqwygrwvax3i8cajbfwmzp4",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.netanalyzers/6.0.0-rc1.21366.2/microsoft.codeanalysis.netanalyzers.6.0.0-rc1.21366.2.nupkg"
+    "version": "8.0.0-preview.23468.1",
+    "hash": "sha256-2wF9nG7tL92RKT46l5A0EQB3uow93516Dh8hSw7kUvg=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49a1bb2b-12b0-475f-adbd-1560fc76be38/nuget/v3/flat2/microsoft.codeanalysis.netanalyzers/8.0.0-preview.23468.1/microsoft.codeanalysis.netanalyzers.8.0.0-preview.23468.1.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers",
-    "version": "3.3.4-beta1.22160.2",
-    "sha256": "01jaajr4qmc70dwixzrxyh638wkf5s33hm0km4lwrw4n5j1xivp1",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/e31c6eea-0277-49f3-8194-142be67a9f72/nuget/v3/flat2/microsoft.codeanalysis.performancesensitiveanalyzers/3.3.4-beta1.22160.2/microsoft.codeanalysis.performancesensitiveanalyzers.3.3.4-beta1.22160.2.nupkg"
+    "version": "3.3.4-beta1.22504.1",
+    "hash": "sha256-HYGDtRhUgaIG5t4VpOt3ZFQ8nqLSJ6mTR5964FMmK50=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/e31c6eea-0277-49f3-8194-142be67a9f72/nuget/v3/flat2/microsoft.codeanalysis.performancesensitiveanalyzers/3.3.4-beta1.22504.1/microsoft.codeanalysis.performancesensitiveanalyzers.3.3.4-beta1.22504.1.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
-    "version": "3.3.4-beta1.22160.2",
-    "sha256": "0ih091ls51x5k9q998g14pfy4r3g1ygvzihj1gkrl79wydn7b0n3",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49e5305d-d845-4a14-9d69-6f5dbfb9570c/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.3.4-beta1.22160.2/microsoft.codeanalysis.publicapianalyzers.3.3.4-beta1.22160.2.nupkg"
+    "version": "3.11.0-beta1.24081.1",
+    "hash": "sha256-nXx0MSYXVzdr0jcNo9aZLocZU1ywN+n/vdD2kYBh5TI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.publicapianalyzers.3.11.0-beta1.24081.1.nupkg"
   },
   {
     "pname": "Microsoft.CSharp",
     "version": "4.7.0",
-    "sha256": "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j",
+    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"
   },
   {
     "pname": "Microsoft.DiaSymReader.Native",
     "version": "17.0.0-beta1.21524.1",
-    "sha256": "0gash3xgzvcb78w2xqv003l0cld199zpfilnjbagwbr5ikdh6f3s",
+    "hash": "sha256-ejgD24wlL/7UkpZGd39KoVEG6ABg4y44Oovt//qAWj0=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader.native/17.0.0-beta1.21524.1/microsoft.diasymreader.native.17.0.0-beta1.21524.1.nupkg"
   },
   {
     "pname": "Microsoft.DotNet.Arcade.Sdk",
-    "version": "7.0.0-beta.22171.2",
-    "sha256": "15y26skavivkwhnpfa984if3cnpnllbbwbdsjiyfdcalp32fhmjq",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/7.0.0-beta.22171.2/microsoft.dotnet.arcade.sdk.7.0.0-beta.22171.2.nupkg"
+    "version": "9.0.0-beta.25271.1",
+    "hash": "sha256-Kk4iy7AcCfJ4BOcAEyRuFQ+pFF1zjL+1c+UaU/SKRv4=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25271.1/microsoft.dotnet.arcade.sdk.9.0.0-beta.25271.1.nupkg"
   },
   {
     "pname": "Microsoft.DotNet.XliffTasks",
-    "version": "1.0.0-beta.22169.1",
-    "sha256": "12fcin3d4m0lawla9fflz9f2qispzgvzf1mwkpscmlk5lnvb0riw",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/1.0.0-beta.22169.1/microsoft.dotnet.xlifftasks.1.0.0-beta.22169.1.nupkg"
+    "version": "9.0.0-beta.25271.1",
+    "hash": "sha256-Pt1JWrowN7AgRijTpkk0OMi/DGGJxN9Dd+eobMev/Do=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25271.1/microsoft.dotnet.xlifftasks.9.0.0-beta.25271.1.nupkg"
   },
   {
-    "pname": "Microsoft.Net.Compilers.Toolset",
-    "version": "4.2.0-1.final",
-    "sha256": "02zas22hj29gv2w7h74q786i0cvxffgwqai21ri0zj41nb2hwhyq",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.compilers.toolset/4.2.0-1.final/microsoft.net.compilers.toolset.4.2.0-1.final.nupkg"
+    "pname": "Microsoft.IO.Redist",
+    "version": "6.0.1",
+    "hash": "sha256-IaATAy1M/MEBTid0mQiTrHj4aTwo2POCtckxSbLc3lU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.io.redist/6.0.1/microsoft.io.redist.6.0.1.nupkg"
   },
   {
-    "pname": "Microsoft.NETCore.App.Host.linux-arm64",
-    "version": "3.1.32",
-    "sha256": "1zygp70xrk5zggs3q4a6yc6jfdwzcsjjsapqpwn6qyx35m69b72p",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/3.1.32/microsoft.netcore.app.host.linux-arm64.3.1.32.nupkg"
+    "pname": "Microsoft.NET.StringTools",
+    "version": "17.13.9",
+    "hash": "sha256-E3bKeMbBLabLM3GWPmD4HDjJzS3Ru1KcPTRWHugRgrQ=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.13.9/microsoft.net.stringtools.17.13.9.nupkg"
   },
   {
-    "pname": "Microsoft.NETCore.App.Host.linux-x64",
-    "version": "3.1.32",
-    "sha256": "08sar3s7j6z1q5prjmz2jrbsq5ms81mrsi1c1zbfrkplkfjpld3a",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.32/microsoft.netcore.app.host.linux-x64.3.1.32.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.osx-x64",
-    "version": "3.1.32",
-    "sha256": "186gjn8sbhp4z6pq8fw4g8nqk9dwyaplwvdz2y3fbbvg36lggsh0",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/3.1.32/microsoft.netcore.app.host.osx-x64.3.1.32.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Ref",
-    "version": "3.1.0",
-    "sha256": "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/3.1.0/microsoft.netcore.app.ref.3.1.0.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
-    "version": "3.1.32",
-    "sha256": "13pcn74z1swz73s72zjl07f118j35wacnzgk7kbjqn83nwgqdgvq",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/3.1.32/microsoft.netcore.app.runtime.linux-arm64.3.1.32.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
-    "version": "3.1.32",
-    "sha256": "0mmc57dl8plrspdxwb7209wz29vhiwqds4nfbdfws7zg35yy70c7",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/3.1.32/microsoft.netcore.app.runtime.linux-x64.3.1.32.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.osx-x64",
-    "version": "3.1.32",
-    "sha256": "06bk39zcv27cwshjsxfg5d6wzkkzdhfk08sipdc7mr1s8pk7ihi1",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/3.1.32/microsoft.netcore.app.runtime.osx-x64.3.1.32.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.0.1",
-    "sha256": "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.1.0",
-    "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.1.1",
-    "sha256": "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.1.1/microsoft.netcore.platforms.1.1.1.nupkg"
+    "pname": "Microsoft.NET.StringTools",
+    "version": "17.7.2",
+    "hash": "sha256-hQE07TCgcQuyu9ZHVq2gPDb0+xe8ECJUdrgh17bJP4o=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.7.2/microsoft.net.stringtools.17.7.2.nupkg"
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "5.0.0",
-    "sha256": "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc",
+    "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg"
   },
-  {
-    "pname": "Microsoft.NETCore.Targets",
-    "version": "1.0.1",
-    "sha256": "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"
-  },
-  {
-    "pname": "Microsoft.NETCore.Targets",
-    "version": "1.1.0",
-    "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"
-  },
   {
     "pname": "Microsoft.NETFramework.ReferenceAssemblies",
-    "version": "1.0.2",
-    "sha256": "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.2/microsoft.netframework.referenceassemblies.1.0.2.nupkg"
+    "version": "1.0.3",
+    "hash": "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.3/microsoft.netframework.referenceassemblies.1.0.3.nupkg"
   },
   {
     "pname": "Microsoft.NETFramework.ReferenceAssemblies.net472",
-    "version": "1.0.2",
-    "sha256": "1dny43jksy6dm9zrkdm8j80gb25w6wdvjlxnphj7ngf0fbg3dd2c",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.2/microsoft.netframework.referenceassemblies.net472.1.0.2.nupkg"
-  },
-  {
-    "pname": "Microsoft.SourceLink.AzureRepos.Git",
-    "version": "1.2.0-beta-22167-02",
-    "sha256": "1mqzajvp0xa8smhilrakp9nr18r2lbqgn0jb79443srvjf93f6sl",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.sourcelink.azurerepos.git/1.2.0-beta-22167-02/microsoft.sourcelink.azurerepos.git.1.2.0-beta-22167-02.nupkg"
-  },
-  {
-    "pname": "Microsoft.SourceLink.Common",
-    "version": "1.2.0-beta-22167-02",
-    "sha256": "1s4x6syw1vfs0wrlyjvf5n7xiqgqnyv9cmmnaxzmx41f7zydirj6",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.sourcelink.common/1.2.0-beta-22167-02/microsoft.sourcelink.common.1.2.0-beta-22167-02.nupkg"
-  },
-  {
-    "pname": "Microsoft.SourceLink.GitHub",
-    "version": "1.2.0-beta-22167-02",
-    "sha256": "0zwc5sxvcz26rcyirrbd55cnz1v7s0njlj91jk3rdjxw6aw2bgnr",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.sourcelink.github/1.2.0-beta-22167-02/microsoft.sourcelink.github.1.2.0-beta-22167-02.nupkg"
+    "version": "1.0.3",
+    "hash": "sha256-/6ClVwo5+RE5kWTQWB/93vmbXj37ql8iDlziKWm89Xw=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.3/microsoft.netframework.referenceassemblies.net472.1.0.3.nupkg"
   },
   {
     "pname": "Microsoft.VisualStudio.Setup.Configuration.Interop",
-    "version": "1.16.30",
-    "sha256": "14022lx03vdcqlvbbdmbsxg5pqfx1rfq2jywxlyaz9v68cvsb0g4",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/1.16.30/microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg"
+    "version": "3.2.2146",
+    "hash": "sha256-ic5h0cmHIaowJfItTLXLnmFhIg4NhaoMoWVAFMHKdzQ=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg"
   },
   {
     "pname": "Microsoft.VisualStudio.Threading.Analyzers",
-    "version": "17.2.20-alpha",
-    "sha256": "199690hc75yb01npwjwb7mdch0syrczcxyx6mphm1hn2cm108qax",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.2.20-alpha/microsoft.visualstudio.threading.analyzers.17.2.20-alpha.nupkg"
+    "version": "17.13.2",
+    "hash": "sha256-pfhN5HDSWbo6hmlSnCVWvnkYTqSjs8PNtSyHCEEtUjI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.13.2/microsoft.visualstudio.threading.analyzers.17.13.2.nupkg"
   },
   {
-    "pname": "Microsoft.Win32.Primitives",
-    "version": "4.3.0",
-    "sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"
+    "pname": "Microsoft.WindowsDesktop.App.Ref",
+    "version": "8.0.19",
+    "hash": "sha256-rbNLx37nzGSoBNXyL1TadcKtI3SUAZ9x8e6NUMYU6hI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.windowsdesktop.app.ref/8.0.19/microsoft.windowsdesktop.app.ref.8.0.19.nupkg"
   },
   {
-    "pname": "Microsoft.Win32.Registry",
-    "version": "4.3.0",
-    "sha256": "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/4.3.0/microsoft.win32.registry.4.3.0.nupkg"
+    "pname": "Microsoft.WindowsDesktop.App.Ref",
+    "version": "9.0.8",
+    "hash": "sha256-Mi/PbUS4/zfsj9RAN4SRn3O0O/lj+GEUiJjX2xMxrlg=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.windowsdesktop.app.ref/9.0.8/microsoft.windowsdesktop.app.ref.9.0.8.nupkg"
   },
   {
     "pname": "NETStandard.Library",
     "version": "2.0.3",
-    "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y",
+    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"
   },
   {
     "pname": "PowerShell",
     "version": "7.0.0",
-    "sha256": "13jhnbh12rcmdrkmlxq45ard03lmfq7bg14xg7k108jlpnpsr1la",
+    "hash": "sha256-ioasr71UIhDmeZ2Etw52lQ7QsioEd1pnbpVlEeCyUI4=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/powershell/7.0.0/powershell.7.0.0.nupkg"
   },
-  {
-    "pname": "RichCodeNav.EnvVarDump",
-    "version": "0.1.1643-alpha",
-    "sha256": "1pp1608xizvv0h9q01bqy7isd3yzb3lxb2yp27j4k25xsvw460vg",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg"
-  },
   {
     "pname": "Roslyn.Diagnostics.Analyzers",
-    "version": "3.3.4-beta1.22160.2",
-    "sha256": "0rr7q46vc5lbywm3mf4ld1kjkg9w7fbmkkyka0bi8idrfib7kn0i",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49e5305d-d845-4a14-9d69-6f5dbfb9570c/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.3.4-beta1.22160.2/roslyn.diagnostics.analyzers.3.3.4-beta1.22160.2.nupkg"
-  },
-  {
-    "pname": "runtime.any.System.Collections",
-    "version": "4.3.0",
-    "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.any.System.Diagnostics.Tracing",
-    "version": "4.3.0",
-    "sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.any.System.Globalization",
-    "version": "4.3.0",
-    "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.any.System.Globalization.Calendars",
-    "version": "4.3.0",
-    "sha256": "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.globalization.calendars/4.3.0/runtime.any.system.globalization.calendars.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.any.System.IO",
-    "version": "4.3.0",
-    "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.any.System.Reflection",
-    "version": "4.3.0",
-    "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.any.System.Reflection.Primitives",
-    "version": "4.3.0",
-    "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.any.System.Resources.ResourceManager",
-    "version": "4.3.0",
-    "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.any.System.Runtime",
-    "version": "4.3.0",
-    "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.any.System.Runtime.Handles",
-    "version": "4.3.0",
-    "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.any.System.Runtime.InteropServices",
-    "version": "4.3.0",
-    "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.any.System.Text.Encoding",
-    "version": "4.3.0",
-    "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.any.System.Text.Encoding.Extensions",
-    "version": "4.3.0",
-    "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.any.System.Threading.Tasks",
-    "version": "4.3.0",
-    "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "sha256": "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"
-  },
-  {
-    "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "sha256": "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"
-  },
-  {
-    "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "sha256": "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"
-  },
-  {
-    "pname": "runtime.native.System",
-    "version": "4.3.0",
-    "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.native.System.Net.Http",
-    "version": "4.3.0",
-    "sha256": "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.net.http/4.3.0/runtime.native.system.net.http.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.native.System.Security.Cryptography.Apple",
-    "version": "4.3.0",
-    "sha256": "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.apple/4.3.0/runtime.native.system.security.cryptography.apple.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "sha256": "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.2/runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"
-  },
-  {
-    "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "sha256": "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"
-  },
-  {
-    "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "sha256": "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"
-  },
-  {
-    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
-    "version": "4.3.0",
-    "sha256": "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "sha256": "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"
-  },
-  {
-    "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "sha256": "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"
-  },
-  {
-    "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "sha256": "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"
-  },
-  {
-    "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "sha256": "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"
-  },
-  {
-    "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "sha256": "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"
-  },
-  {
-    "pname": "runtime.unix.Microsoft.Win32.Primitives",
-    "version": "4.3.0",
-    "sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.unix.System.Diagnostics.Debug",
-    "version": "4.3.0",
-    "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.unix.System.IO.FileSystem",
-    "version": "4.3.0",
-    "sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.unix.System.Net.Primitives",
-    "version": "4.3.0",
-    "sha256": "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.unix.System.Private.Uri",
-    "version": "4.3.0",
-    "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg"
-  },
-  {
-    "pname": "runtime.unix.System.Runtime.Extensions",
-    "version": "4.3.0",
-    "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Buffers",
-    "version": "4.3.0",
-    "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.3.0/system.buffers.4.3.0.nupkg"
+    "version": "3.11.0-beta1.24081.1",
+    "hash": "sha256-wIOhKwvYetwytnuNX0uNC5oyBDU7xAhLqzTvyuGDVMM=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.11.0-beta1.24081.1/roslyn.diagnostics.analyzers.3.11.0-beta1.24081.1.nupkg"
   },
   {
     "pname": "System.Buffers",
     "version": "4.5.1",
-    "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3",
+    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"
   },
   {
     "pname": "System.CodeDom",
-    "version": "4.4.0",
-    "sha256": "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/4.4.0/system.codedom.4.4.0.nupkg"
-  },
-  {
-    "pname": "System.Collections",
-    "version": "4.0.11",
-    "sha256": "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.0.11/system.collections.4.0.11.nupkg"
-  },
-  {
-    "pname": "System.Collections",
-    "version": "4.3.0",
-    "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Collections.Concurrent",
-    "version": "4.0.12",
-    "sha256": "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg"
-  },
-  {
-    "pname": "System.Collections.Concurrent",
-    "version": "4.3.0",
-    "sha256": "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg"
+    "version": "7.0.0",
+    "hash": "sha256-7IPt39cY+0j0ZcRr/J45xPtEjnSXdUJ/5ai3ebaYQiE=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/7.0.0/system.codedom.7.0.0.nupkg"
   },
   {
     "pname": "System.Collections.Immutable",
-    "version": "1.5.0",
-    "sha256": "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg"
+    "version": "8.0.0",
+    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/8.0.0/system.collections.immutable.8.0.0.nupkg"
   },
   {
     "pname": "System.Collections.Immutable",
-    "version": "5.0.0",
-    "sha256": "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"
+    "version": "9.0.0",
+    "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/9.0.0/system.collections.immutable.9.0.0.nupkg"
   },
   {
-    "pname": "System.Diagnostics.Debug",
-    "version": "4.0.11",
-    "sha256": "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg"
+    "pname": "System.Configuration.ConfigurationManager",
+    "version": "9.0.0",
+    "hash": "sha256-+pLnTC0YDP6Kjw5DVBiFrV/Q3x5is/+6N6vAtjvhVWk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.configuration.configurationmanager/9.0.0/system.configuration.configurationmanager.9.0.0.nupkg"
   },
   {
-    "pname": "System.Diagnostics.Debug",
-    "version": "4.3.0",
-    "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"
+    "pname": "System.Diagnostics.EventLog",
+    "version": "9.0.0",
+    "hash": "sha256-tPvt6yoAp56sK/fe+/ei8M65eavY2UUhRnbrREj/Ems=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.eventlog/9.0.0/system.diagnostics.eventlog.9.0.0.nupkg"
   },
   {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "4.3.0",
-    "sha256": "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg"
+    "pname": "System.Formats.Asn1",
+    "version": "7.0.0",
+    "hash": "sha256-eMF+SD/yeslf/wOIlOTlpfpj3LtP6HUilGeSj++bJKg=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/7.0.0/system.formats.asn1.7.0.0.nupkg"
   },
   {
-    "pname": "System.Diagnostics.Tracing",
-    "version": "4.1.0",
-    "sha256": "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg"
-  },
-  {
-    "pname": "System.Diagnostics.Tracing",
-    "version": "4.3.0",
-    "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Globalization",
-    "version": "4.0.11",
-    "sha256": "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"
-  },
-  {
-    "pname": "System.Globalization",
-    "version": "4.3.0",
-    "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Globalization.Calendars",
-    "version": "4.3.0",
-    "sha256": "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Globalization.Extensions",
-    "version": "4.3.0",
-    "sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.IO",
-    "version": "4.1.0",
-    "sha256": "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.1.0/system.io.4.1.0.nupkg"
-  },
-  {
-    "pname": "System.IO",
-    "version": "4.3.0",
-    "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.IO.FileSystem",
-    "version": "4.3.0",
-    "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.IO.FileSystem.Primitives",
-    "version": "4.3.0",
-    "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.IO.Pipes.AccessControl",
-    "version": "5.0.0",
-    "sha256": "0jl5b95cy8biivi1kdn2wi0gy2m1a0gyj8fy88djybrg2705c8fz",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipes.accesscontrol/5.0.0/system.io.pipes.accesscontrol.5.0.0.nupkg"
-  },
-  {
-    "pname": "System.Linq",
-    "version": "4.1.0",
-    "sha256": "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.1.0/system.linq.4.1.0.nupkg"
-  },
-  {
-    "pname": "System.Linq",
-    "version": "4.3.0",
-    "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.3.0/system.linq.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Linq.Parallel",
-    "version": "4.0.1",
-    "sha256": "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.parallel/4.0.1/system.linq.parallel.4.0.1.nupkg"
+    "pname": "System.Formats.Nrbf",
+    "version": "9.0.0",
+    "hash": "sha256-c4qf6CocQUZB0ySGQd8s15PXY7xfrjQqMGXxkwytKyw=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.nrbf/9.0.0/system.formats.nrbf.9.0.0.nupkg"
   },
   {
     "pname": "System.Memory",
-    "version": "4.5.4",
-    "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.4/system.memory.4.5.4.nupkg"
-  },
-  {
-    "pname": "System.Net.Http",
-    "version": "4.3.4",
-    "sha256": "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.http/4.3.4/system.net.http.4.3.4.nupkg"
-  },
-  {
-    "pname": "System.Net.Primitives",
-    "version": "4.3.0",
-    "sha256": "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Numerics.Vectors",
-    "version": "4.4.0",
-    "sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"
+    "version": "4.5.5",
+    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.5/system.memory.4.5.5.nupkg"
   },
   {
     "pname": "System.Numerics.Vectors",
     "version": "4.5.0",
-    "sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59",
+    "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"
   },
   {
-    "pname": "System.Private.Uri",
-    "version": "4.3.0",
-    "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Reflection",
-    "version": "4.1.0",
-    "sha256": "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"
-  },
-  {
-    "pname": "System.Reflection",
-    "version": "4.3.0",
-    "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"
+    "pname": "System.Reflection.Metadata",
+    "version": "8.0.0",
+    "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/8.0.0/system.reflection.metadata.8.0.0.nupkg"
   },
   {
     "pname": "System.Reflection.Metadata",
-    "version": "1.6.0",
-    "sha256": "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg"
-  },
-  {
-    "pname": "System.Reflection.Metadata",
-    "version": "5.0.0",
-    "sha256": "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"
-  },
-  {
-    "pname": "System.Reflection.Primitives",
-    "version": "4.0.1",
-    "sha256": "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"
-  },
-  {
-    "pname": "System.Reflection.Primitives",
-    "version": "4.3.0",
-    "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Reflection.TypeExtensions",
-    "version": "4.1.0",
-    "sha256": "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"
+    "version": "9.0.0",
+    "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/9.0.0/system.reflection.metadata.9.0.0.nupkg"
   },
   {
     "pname": "System.Resources.Extensions",
-    "version": "4.6.0",
-    "sha256": "0inch9jgchgmsg3xjivbhh9mpin40mhdd8dgf4i1p3g42i0hzc0j",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg"
-  },
-  {
-    "pname": "System.Resources.ResourceManager",
-    "version": "4.0.1",
-    "sha256": "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"
-  },
-  {
-    "pname": "System.Resources.ResourceManager",
-    "version": "4.3.0",
-    "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Resources.Writer",
-    "version": "4.0.0",
-    "sha256": "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.writer/4.0.0/system.resources.writer.4.0.0.nupkg"
-  },
-  {
-    "pname": "System.Runtime",
-    "version": "4.1.0",
-    "sha256": "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"
-  },
-  {
-    "pname": "System.Runtime",
-    "version": "4.3.0",
-    "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.7.1",
-    "sha256": "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg"
+    "version": "9.0.0",
+    "hash": "sha256-y2gLEMuAy6QfEyNJxABC/ayMWGnwlpX735jsUQLktho=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/9.0.0/system.resources.extensions.9.0.0.nupkg"
   },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "6.0.0",
-    "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc",
+    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg"
   },
   {
-    "pname": "System.Runtime.Extensions",
-    "version": "4.1.0",
-    "sha256": "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"
+    "pname": "System.Security.Cryptography.Pkcs",
+    "version": "7.0.2",
+    "hash": "sha256-qS5Z/Yo8J+f3ExVX5Qkcpj1Z57oUZqz5rWa1h5bVpl8=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/7.0.2/system.security.cryptography.pkcs.7.0.2.nupkg"
   },
   {
-    "pname": "System.Runtime.Extensions",
-    "version": "4.3.0",
-    "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"
+    "pname": "System.Security.Cryptography.ProtectedData",
+    "version": "9.0.0",
+    "hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/9.0.0/system.security.cryptography.protecteddata.9.0.0.nupkg"
   },
   {
-    "pname": "System.Runtime.Handles",
-    "version": "4.0.1",
-    "sha256": "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"
+    "pname": "System.Security.Cryptography.Xml",
+    "version": "7.0.1",
+    "hash": "sha256-CH8+JVC8LyCSW75/6ZQ7ecMbSOAE1c16z4dG8JTp01w=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.xml/7.0.1/system.security.cryptography.xml.7.0.1.nupkg"
   },
   {
-    "pname": "System.Runtime.Handles",
-    "version": "4.3.0",
-    "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Runtime.InteropServices",
-    "version": "4.1.0",
-    "sha256": "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"
-  },
-  {
-    "pname": "System.Runtime.InteropServices",
-    "version": "4.3.0",
-    "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Runtime.Loader",
-    "version": "4.3.0",
-    "sha256": "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.loader/4.3.0/system.runtime.loader.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Runtime.Numerics",
-    "version": "4.3.0",
-    "sha256": "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Runtime.Serialization.Primitives",
-    "version": "4.1.1",
-    "sha256": "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg"
-  },
-  {
-    "pname": "System.Security.AccessControl",
-    "version": "5.0.0",
-    "sha256": "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg"
-  },
-  {
-    "pname": "System.Security.Cryptography.Algorithms",
-    "version": "4.3.0",
-    "sha256": "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Security.Cryptography.Cng",
-    "version": "4.3.0",
-    "sha256": "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.cng/4.3.0/system.security.cryptography.cng.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Security.Cryptography.Csp",
-    "version": "4.3.0",
-    "sha256": "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.csp/4.3.0/system.security.cryptography.csp.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Security.Cryptography.Encoding",
-    "version": "4.3.0",
-    "sha256": "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.openssl/4.3.0/system.security.cryptography.openssl.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Security.Cryptography.Primitives",
-    "version": "4.3.0",
-    "sha256": "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Security.Cryptography.X509Certificates",
-    "version": "4.3.0",
-    "sha256": "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Security.Principal.Windows",
-    "version": "5.0.0",
-    "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/5.0.0/system.security.principal.windows.5.0.0.nupkg"
-  },
-  {
-    "pname": "System.Text.Encoding",
-    "version": "4.0.11",
-    "sha256": "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"
-  },
-  {
-    "pname": "System.Text.Encoding",
-    "version": "4.3.0",
-    "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"
+    "pname": "System.Security.Permissions",
+    "version": "9.0.0",
+    "hash": "sha256-BFrA9ottmQtLIAiKiGRbfSUpzNJwuaOCeFRDN4Z0ku0=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/9.0.0/system.security.permissions.9.0.0.nupkg"
   },
   {
     "pname": "System.Text.Encoding.CodePages",
-    "version": "4.0.1",
-    "sha256": "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"
-  },
-  {
-    "pname": "System.Text.Encoding.CodePages",
-    "version": "4.5.1",
-    "sha256": "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg"
-  },
-  {
-    "pname": "System.Text.Encoding.CodePages",
-    "version": "6.0.0",
-    "sha256": "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/6.0.0/system.text.encoding.codepages.6.0.0.nupkg"
-  },
-  {
-    "pname": "System.Text.Encoding.Extensions",
-    "version": "4.3.0",
-    "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Threading",
-    "version": "4.0.11",
-    "sha256": "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.0.11/system.threading.4.0.11.nupkg"
-  },
-  {
-    "pname": "System.Threading",
-    "version": "4.3.0",
-    "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"
-  },
-  {
-    "pname": "System.Threading.Tasks",
-    "version": "4.0.11",
-    "sha256": "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"
-  },
-  {
-    "pname": "System.Threading.Tasks",
-    "version": "4.3.0",
-    "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"
+    "version": "7.0.0",
+    "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/7.0.0/system.text.encoding.codepages.7.0.0.nupkg"
   },
   {
     "pname": "System.Threading.Tasks.Dataflow",
-    "version": "4.9.0",
-    "sha256": "1g6s9pjg4z8iy98df60y9a01imdqy59zd767vz74rrng78jl2dk5",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/4.9.0/system.threading.tasks.dataflow.4.9.0.nupkg"
+    "version": "9.0.0",
+    "hash": "sha256-nRzcFvLBpcOfyIJdCCZq5vDKZN0xHVuB8yCXoMrwZJA=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/9.0.0/system.threading.tasks.dataflow.9.0.0.nupkg"
   },
   {
     "pname": "System.Threading.Tasks.Extensions",
     "version": "4.5.4",
-    "sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153",
+    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg"
   },
   {
-    "pname": "System.Threading.Thread",
-    "version": "4.0.0",
-    "sha256": "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.0.0/system.threading.thread.4.0.0.nupkg"
+    "pname": "System.ValueTuple",
+    "version": "4.5.0",
+    "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"
+  },
+  {
+    "pname": "System.Windows.Extensions",
+    "version": "9.0.0",
+    "hash": "sha256-RErD+Ju15qtnwdwB7E0SjjJGAnhXwJyC7UPcl24Z3Vs=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.windows.extensions/9.0.0/system.windows.extensions.9.0.0.nupkg"
   }
 ]
diff --git a/pkgs/by-name/ro/roslyn/package.nix b/pkgs/by-name/ro/roslyn/package.nix
index 4404f1ef0618..032b9c68fe01 100644
--- a/pkgs/by-name/ro/roslyn/package.nix
+++ b/pkgs/by-name/ro/roslyn/package.nix
@@ -9,19 +9,31 @@
 
 buildDotnetModule rec {
   pname = "roslyn";
-  version = "4.2.0";
+  version = "4.14.0";
 
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
-    rev = "v${version}";
-    hash = "sha256-4iXabFp0LqJ8TXOrqeD+oTAocg6ZTIfijfX3s3fMJuI=";
+    tag = "NET-SDK-9.0.304";
+    hash = "sha256-mj14bpJks7CcrbcEScPkl3feKUycGLiBYXs908GnGhg=";
   };
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
+  dotnet-sdk =
+    with dotnetCorePackages;
+    sdk_9_0
+    // {
+      inherit
+        (combinePackages [
+          sdk_9_0
+          sdk_8_0
+        ])
+        packages
+        targetPackages
+        ;
+    };
 
   projectFile = [
-    "src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj"
+    "src/NuGet/Microsoft.Net.Compilers.Toolset/Framework/Microsoft.Net.Compilers.Toolset.Framework.Package.csproj"
   ];
 
   nugetDeps = ./deps.json;
@@ -31,7 +43,8 @@ buildDotnetModule rec {
   nativeBuildInputs = [ unzip ];
 
   postPatch = ''
-    sed -i 's/latestPatch/latestFeature/' global.json
+    substituteInPlace global.json \
+      --replace-fail "patch" "latestFeature"
   '';
 
   buildPhase = ''
@@ -41,16 +54,18 @@ buildDotnetModule rec {
       -p:Configuration=Release \
       -p:RepositoryUrl="${meta.homepage}" \
       -p:RepositoryCommit="v${version}" \
-      src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj
+      src/NuGet/Microsoft.Net.Compilers.Toolset/Framework/Microsoft.Net.Compilers.Toolset.Framework.Package.csproj
 
     runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
+
     pkg="$out/lib/dotnet/microsoft.net.compilers.toolset/${version}"
     mkdir -p "$out/bin" "$pkg"
 
-    unzip -q artifacts/packages/Release/Shipping/Microsoft.Net.Compilers.Toolset.${version}-dev.nupkg \
+    unzip -q artifacts/packages/Release/Shipping/Microsoft.Net.Compilers.Toolset.Framework.${version}-dev.nupkg \
       -d "$pkg"
     # nupkg has 0 permissions for a bunch of things
     chmod -R +rw "$pkg"
@@ -59,6 +74,8 @@ buildDotnetModule rec {
       --add-flags "$pkg/tasks/net472/csc.exe"
     makeWrapper ${mono}/bin/mono $out/bin/vbc \
       --add-flags "$pkg/tasks/net472/vbc.exe"
+
+    runHook postInstall
   '';
 
   meta = with lib; {

From da0473abf1358f25ca28fe6f9f1bd69b0a606984 Mon Sep 17 00:00:00 2001
From: Nico Bellack <nico@bellack.dev>
Date: Mon, 25 Aug 2025 17:12:21 +0200
Subject: [PATCH 3380/3724] roomarranger: 10.0.1 -> 10.2

---
 pkgs/by-name/ro/roomarranger/package.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ro/roomarranger/package.nix b/pkgs/by-name/ro/roomarranger/package.nix
index 4b0e2630dadd..6ed69b6d8cda 100644
--- a/pkgs/by-name/ro/roomarranger/package.nix
+++ b/pkgs/by-name/ro/roomarranger/package.nix
@@ -15,7 +15,7 @@ let
     exec = "roomarranger";
     name = "roomarranger";
     desktopName = "Room Arranger";
-    genericName = "Design your room, office, apartment, house.";
+    genericName = "Design your room, office, apartment or house, plan gardens and more...";
     icon = "roomarranger-icon";
     terminal = false;
     categories = [ "Graphics" ];
@@ -28,11 +28,11 @@ in
 
 stdenv.mkDerivation {
   pname = "roomarranger";
-  version = "10.0.1";
+  version = "10.2";
 
   src = fetchurl {
-    url = "https://f000.backblazeb2.com/file/rooarr/rooarr1001-linux64.tar.gz";
-    hash = "sha256-OwJSOfyTQinVKzrJftpFa5NN1kGweBezedpL2aE4LbE=";
+    url = "https://f000.backblazeb2.com/file/rooarr/rooarr1020-linux64.tar.gz";
+    hash = "sha256-24AGP2le5HfcVMlqDjiMRcRWKU/zjACV7KzJlVWMpkw=";
   };
 
   nativeBuildInputs = [
@@ -53,9 +53,6 @@ stdenv.mkDerivation {
     mkdir -p $out/lib $out/bin
     cp -r rooarr-bin/* $out/lib/
 
-    # Delete bundled dynamic libraries that reference major Qt version 6
-    rm -f $out/lib/*.6
-
     ln -s $out/lib/RoomArranger $out/bin/roomarranger
 
     # Install application icons

From ca9ee0dcb785e0db687b5b93e433fd53002c2240 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 15:13:09 +0000
Subject: [PATCH 3381/3724] proton-ge-bin: GE-Proton10-12 -> GE-Proton10-13

---
 pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix
index 275efa042add..8e989f315667 100644
--- a/pkgs/by-name/pr/proton-ge-bin/package.nix
+++ b/pkgs/by-name/pr/proton-ge-bin/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-ge-bin";
-  version = "GE-Proton10-12";
+  version = "GE-Proton10-13";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-mjqcN/gTfAlPDXgJUm8qxH+jvNN8iiIuF33hSQ5Y/Vo=";
+    hash = "sha256-HjCsnPX3TwUroVj8RnQ0k6unU2Ou/E5PogRIElDWjgE=";
   };
 
   dontUnpack = true;

From f3b3c657e46a5911595985527fc2d0dd79f56a1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 15:19:24 +0000
Subject: [PATCH 3382/3724] doctl: 1.139.0 -> 1.141.0

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

diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix
index e96717bca5f3..47b34e4467a9 100644
--- a/pkgs/by-name/do/doctl/package.nix
+++ b/pkgs/by-name/do/doctl/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule rec {
   pname = "doctl";
-  version = "1.139.0";
+  version = "1.141.0";
 
   vendorHash = null;
 
@@ -42,7 +42,7 @@ buildGoModule rec {
     owner = "digitalocean";
     repo = "doctl";
     tag = "v${version}";
-    hash = "sha256-oofG1Fj+1NiDhvSMm0k49K740aUWTrAqH4s/8KsY82o=";
+    hash = "sha256-IZ/CP9xdupwkiOihZuf/MXEP2cnoJ/lqYUEsFDf/ITk=";
   };
 
   meta = {

From 3b8f682c0d94d0e63b0f6ab26950f9499f08b8c3 Mon Sep 17 00:00:00 2001
From: Nico Bellack <nico@bellack.dev>
Date: Mon, 25 Aug 2025 17:26:14 +0200
Subject: [PATCH 3383/3724] roomarranger: add changelog meta attribute

---
 pkgs/by-name/ro/roomarranger/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ro/roomarranger/package.nix b/pkgs/by-name/ro/roomarranger/package.nix
index 6ed69b6d8cda..c5343115baf4 100644
--- a/pkgs/by-name/ro/roomarranger/package.nix
+++ b/pkgs/by-name/ro/roomarranger/package.nix
@@ -77,6 +77,7 @@ stdenv.mkDerivation {
       Free for 30 days. Updates are free.
     '';
     homepage = "https://www.roomarranger.com/";
+    changelog = "https://www.roomarranger.com/whatsnew.txt";
     license = lib.licenses.unfree;
     platforms = [ "x86_64-linux" ];
     maintainers = with lib.maintainers; [ bellackn ];

From 60c8e1e139ca0d0db34a297d1398bf366ec1bf31 Mon Sep 17 00:00:00 2001
From: "Michael Barney, Jr" <mbarneyme@gmail.com>
Date: Mon, 25 Aug 2025 11:30:26 -0400
Subject: [PATCH 3384/3724] aws-sam-cli: 1.35.0 -> 1.43.0

---
 pkgs/by-name/aw/aws-sam-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/aws-sam-cli/package.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix
index 7c369c80a931..9b4e30277552 100644
--- a/pkgs/by-name/aw/aws-sam-cli/package.nix
+++ b/pkgs/by-name/aw/aws-sam-cli/package.nix
@@ -11,14 +11,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "aws-sam-cli";
-  version = "1.135.0";
+  version = "1.143.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sam-cli";
     tag = "v${version}";
-    hash = "sha256-ccYpEznuU6d7gDyrDiuUmvdCJutXI7SAH2PH9Vdq8Fs=";
+    hash = "sha256-QnJQ45ucziHmOkQdAT29szOljBExiIXZ2zvhiKYXBxI=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From a6530a4169e1b606df0affb9b8c105aa475b10e7 Mon Sep 17 00:00:00 2001
From: Frede Braendstrup <frederikbraendstrup@gmail.com>
Date: Mon, 25 Aug 2025 16:53:36 +0200
Subject: [PATCH 3385/3724] vimPlugins.perfanno-nvim: init at 2024-12-28

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix |  6 ++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 3 files changed, 20 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 78c064422cec..c664f342460b 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -12415,6 +12415,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  perfanno-nvim = buildVimPlugin {
+    pname = "perfanno.nvim";
+    version = "2024-12-28";
+    src = fetchFromGitHub {
+      owner = "t-troebst";
+      repo = "perfanno.nvim";
+      rev = "8640d6655f17a79af8de3153af2ce90c03f65e86";
+      sha256 = "1097sppcsw41asps1k51ic9h4z0hpzgc44kjfcyqdhclnxwady81";
+    };
+    meta.homepage = "https://github.com/t-troebst/perfanno.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   persisted-nvim = buildVimPlugin {
     pname = "persisted.nvim";
     version = "2025-08-16";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 001f8138a7ac..a319de91ea6c 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -24,6 +24,7 @@
   direnv,
   fzf,
   gawk,
+  gperf,
   helm-ls,
   himalaya,
   htop,
@@ -2972,6 +2973,11 @@ in
     ];
   });
 
+  perfanno-nvim = super.perfanno-nvim.overrideAttrs (old: {
+    dependencies = [ gperf ];
+    meta.maintainers = with lib.maintainers; [ fredeb ];
+  });
+
   persisted-nvim = super.persisted-nvim.overrideAttrs {
     nvimSkipModules = [
       # /lua/persisted/init.lua:44: attempt to index upvalue 'config' (a nil value)
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 530c56e0394f..0413b95dfdeb 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -953,6 +953,7 @@ https://github.com/lewis6991/pckr.nvim/,HEAD,
 https://github.com/tmsvg/pear-tree/,,
 https://github.com/steelsojka/pears.nvim/,,
 https://github.com/toppair/peek.nvim/,HEAD,
+https://github.com/t-troebst/perfanno.nvim/,HEAD,
 https://github.com/olimorris/persisted.nvim/,HEAD,
 https://github.com/folke/persistence.nvim/,,
 https://github.com/Weissle/persistent-breakpoints.nvim/,,

From 46c70a0ed9d6d29be962a6af9eddf3cdee9400e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 15:52:10 +0000
Subject: [PATCH 3386/3724] wlr-layout-ui: 1.6.15 -> 1.6.16

---
 pkgs/by-name/wl/wlr-layout-ui/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wl/wlr-layout-ui/package.nix b/pkgs/by-name/wl/wlr-layout-ui/package.nix
index 5fc6fbe41f8c..56b0f7d4b835 100644
--- a/pkgs/by-name/wl/wlr-layout-ui/package.nix
+++ b/pkgs/by-name/wl/wlr-layout-ui/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "wlr-layout-ui";
-  version = "1.6.15";
+  version = "1.6.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fdev31";
     repo = "wlr-layout-ui";
     tag = version;
-    hash = "sha256-9dGwqh4uq7Hc8OjD8mxAnwesoOSCXHjYIWBPylznxu4=";
+    hash = "sha256-CghOj5fQnuHd6PMeLOX4NKdVw7+pueZXahzYcAMwNOA=";
   };
 
   nativeBuildInputs = [

From fa12e22f30a9f227395c1b3fc3041641ac863679 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 25 Aug 2025 10:54:38 -0500
Subject: [PATCH 3387/3724] xp-pen-g430-driver: switch to finalAttrs

---
 pkgs/by-name/xp/xp-pen-g430-driver/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xp/xp-pen-g430-driver/package.nix b/pkgs/by-name/xp/xp-pen-g430-driver/package.nix
index 525630a6153c..cc0f8120a0d0 100644
--- a/pkgs/by-name/xp/xp-pen-g430-driver/package.nix
+++ b/pkgs/by-name/xp/xp-pen-g430-driver/package.nix
@@ -10,13 +10,13 @@
   libglvnd,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xp-pen-g430-driver";
   version = "1.2.13.1";
 
   src = fetchzip {
     url = "https://archive.org/download/linux-pentablet-v-1.2.13.1.tar.gz-20200428/Linux_Pentablet_V1.2.13.1.tar.gz%2820200428%29.zip/Linux_Pentablet_V1.2.13.1.tar.gz";
-    name = "xp-pen-g430-driver-${version}.tar.gz";
+    name = "xp-pen-g430-driver-${finalAttrs.version}.tar.gz";
     hash = "sha256-Wavf4EAzR/NX3GOfdAEdFX08gkD03FVvAkIl37Zmipc=";
   };
 
@@ -48,4 +48,4 @@ stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" ];
     maintainers = with lib.maintainers; [ ];
   };
-}
+})

From 02afe349b29272988ea507a45496629afaa6cf32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 16:13:06 +0000
Subject: [PATCH 3388/3724] python3Packages.dbt-semantic-interfaces: 0.8.5 ->
 0.9.0

---
 .../python-modules/dbt-semantic-interfaces/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix
index 8c237e65a930..17f5751ec2f3 100644
--- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix
+++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "dbt-semantic-interfaces";
-  version = "0.8.5";
+  version = "0.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "dbt-labs";
     repo = "dbt-semantic-interfaces";
     tag = "v${version}";
-    hash = "sha256-fe+0W08XfBzimQZugCpphrHYcDaoUUYkA+FYa2lS3Uo=";
+    hash = "sha256-I/bMpqTaAHs0XnYOYjFRgXv3qB06LItkaSxtRjk55js=";
   };
 
   pythonRelaxDeps = [ "importlib-metadata" ];

From d1cf1c2e507f0abd601dcfc0706b3d8a5f3cc50e Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Mon, 25 Aug 2025 09:22:29 -0700
Subject: [PATCH 3389/3724] tayga: fix cross

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

diff --git a/pkgs/by-name/ta/tayga/package.nix b/pkgs/by-name/ta/tayga/package.nix
index 5e6adac35c75..718bf40dbd0d 100644
--- a/pkgs/by-name/ta/tayga/package.nix
+++ b/pkgs/by-name/ta/tayga/package.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-xOm4fetFq2UGuhOojrT8WOcX78c6MLTMVbDv+O62x2E=";
   };
 
+  makeFlags = [ "CC=${lib.getExe stdenv.cc}" ];
+
   preBuild = ''
     echo "#define TAYGA_VERSION \"${finalAttrs.version}\"" > version.h
   '';

From f32332afcc1d44e18d12e86157c2a9a72c7917a8 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 24 Aug 2025 21:25:25 +0200
Subject: [PATCH 3390/3724] pythonPackages.distutils-cfg: drop

---
 .../python-modules/distutils-cfg/default.nix  | 42 -------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 pkgs/development/python-modules/distutils-cfg/default.nix

diff --git a/pkgs/development/python-modules/distutils-cfg/default.nix b/pkgs/development/python-modules/distutils-cfg/default.nix
deleted file mode 100644
index 89bd84156060..000000000000
--- a/pkgs/development/python-modules/distutils-cfg/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-# global distutils configuration, see http://docs.python.org/2/install/index.html#distutils-configuration-files
-
-{
-  stdenv,
-  python,
-  writeText,
-  extraCfg ? "",
-  overrideCfg ? "",
-}:
-
-let
-  distutilsCfg = writeText "distutils.cfg" (
-    if overrideCfg != "" then
-      overrideCfg
-    else
-      ''
-        [easy_install]
-
-        # don't allow network connections during build to ensure purity
-        allow-hosts = None
-
-        # make sure we always unzip installed packages otherwise setup hooks won't work
-        zip_ok = 0
-
-        ${extraCfg}
-      ''
-  );
-in
-stdenv.mkDerivation {
-  name = "${python.libPrefix}-distutils.cfg";
-
-  buildInputs = [ python ];
-
-  dontUnpack = true;
-
-  installPhase = ''
-    dest="$out/${python.sitePackages}/distutils"
-    mkdir -p $dest
-    ln -s ${python}/lib/${python.libPrefix}/distutils/* $dest
-    ln -s ${distutilsCfg} $dest/distutils.cfg
-  '';
-}

From c18a6a58174642ca88ef23e10f7ba0ae64eb2a5d Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Mon, 25 Aug 2025 12:39:59 +0000
Subject: [PATCH 3391/3724] grpc-health-probe: init at 0.4.40

---
 pkgs/by-name/gr/grpc-health-probe/package.nix | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 pkgs/by-name/gr/grpc-health-probe/package.nix

diff --git a/pkgs/by-name/gr/grpc-health-probe/package.nix b/pkgs/by-name/gr/grpc-health-probe/package.nix
new file mode 100644
index 000000000000..cb140c3e492e
--- /dev/null
+++ b/pkgs/by-name/gr/grpc-health-probe/package.nix
@@ -0,0 +1,27 @@
+{
+  buildGoModule,
+  lib,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "grpc-health-probe";
+  version = "0.4.40";
+
+  src = fetchFromGitHub {
+    owner = "grpc-ecosystem";
+    repo = "grpc-health-probe";
+    rev = "v${version}";
+    hash = "sha256-Na0y8fL109flHGJOniEpLgs60xf1V0YlSBrX9iHtymM=";
+  };
+
+  vendorHash = "sha256-eIjDs14PEzoVaRYoxN03pDfYzg4VF1tgskLY9oIkMLE=";
+
+  meta = with lib; {
+    description = "command-line tool to perform health-checks for gRPC applications";
+    homepage = "https://github.com/grpc-ecosystem/grpc-health-probe";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jpds ];
+    mainProgram = "grpc-health-probe";
+  };
+}

From f704eef1c3d7167c95ea935c7dca71e8d02f2da5 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Mon, 25 Aug 2025 12:54:57 +0000
Subject: [PATCH 3392/3724] nixos/thanos: Add check for serving gRPC port

---
 nixos/tests/thanos.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/thanos.nix b/nixos/tests/thanos.nix
index caadfaa37c2c..d1ba83868bbc 100644
--- a/nixos/tests/thanos.nix
+++ b/nixos/tests/thanos.nix
@@ -42,7 +42,10 @@ in
       {
         virtualisation.diskSize = 2 * 1024;
         virtualisation.memorySize = 2048;
-        environment.systemPackages = [ pkgs.jq ];
+        environment.systemPackages = [
+          pkgs.grpc-health-probe
+          pkgs.jq
+        ];
         networking.firewall.allowedTCPPorts = [ grpcPort ];
         services.prometheus = {
           enable = true;
@@ -178,6 +181,7 @@ in
         virtualisation.diskSize = 2 * 1024;
         virtualisation.memorySize = 2048;
         environment.systemPackages = with pkgs; [
+          grpc-health-probe
           jq
           thanos
         ];
@@ -251,6 +255,13 @@ in
       prometheus.wait_for_open_port(${toString queryPort})
       prometheus.succeed("curl -sf http://127.0.0.1:${toString queryPort}/metrics")
 
+      prometheus.wait_until_succeeds("journalctl -o cat -u thanos-sidecar.service | grep 'listening for serving gRPC'")
+
+      store.wait_until_succeeds("journalctl -o cat -u thanos-store.service | grep 'listening for serving gRPC'")
+
+      for machine in prometheus, store:
+        machine.wait_until_succeeds("grpc-health-probe -addr 127.0.0.1:${toString grpcPort}")
+
       # Let's test if pushing a metric to the pushgateway succeeds:
       prometheus.wait_for_unit("pushgateway.service")
       prometheus.succeed(

From bbc563dd0614a1298eb441584e3240f01693df54 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 25 Aug 2025 16:41:05 +0200
Subject: [PATCH 3393/3724] python3Packages.mlflow: 3.1.4 -> 3.3.1

Diff: https://github.com/mlflow/mlflow/compare/v3.1.4...v3.3.1

Changelog: https://github.com/mlflow/mlflow/blob/v3.3.1/CHANGELOG.md
---
 .../development/python-modules/mlflow/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index 3abe96a35935..827ac4bc8686 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  buildPythonPackage,
   fetchFromGitHub,
 
   # build-system
@@ -7,12 +8,13 @@
 
   # dependencies
   alembic,
-  buildPythonPackage,
   cachetools,
   click,
   cloudpickle,
+  cryptography,
   databricks-sdk,
   docker,
+  fastapi,
   flask,
   gitpython,
   graphene,
@@ -34,6 +36,7 @@
   scipy,
   sqlalchemy,
   sqlparse,
+  uvicorn,
 
   # tests
   aiohttp,
@@ -44,7 +47,6 @@
   botocore,
   catboost,
   datasets,
-  fastapi,
   google-cloud-storage,
   httpx,
   jwt,
@@ -65,20 +67,19 @@
   tensorflow,
   torch,
   transformers,
-  uvicorn,
   xgboost,
 }:
 
 buildPythonPackage rec {
   pname = "mlflow";
-  version = "3.1.4";
+  version = "3.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mlflow";
     repo = "mlflow";
     tag = "v${version}";
-    hash = "sha256-GU1CVwc31bLai8QoXch/UTx//+OG2V/6jG9Ocz4MDuA=";
+    hash = "sha256-5zObSnGx7+cCrqRfvcnprQN05NqVBCeWcAZEE1Jpeuo=";
   };
 
   pythonRelaxDeps = [
@@ -97,8 +98,10 @@ buildPythonPackage rec {
     cachetools
     click
     cloudpickle
+    cryptography
     databricks-sdk
     docker
+    fastapi
     flask
     gitpython
     graphene
@@ -122,6 +125,7 @@ buildPythonPackage rec {
     shap
     sqlalchemy
     sqlparse
+    uvicorn
   ];
 
   pythonImportsCheck = [ "mlflow" ];
@@ -135,7 +139,6 @@ buildPythonPackage rec {
     botocore
     catboost
     datasets
-    fastapi
     google-cloud-storage
     httpx
     jwt

From 4ba868005a88ed49e120b275159d4e48d06440e5 Mon Sep 17 00:00:00 2001
From: MultisampledNight <contact@multisamplednight.com>
Date: Mon, 25 Aug 2025 18:44:58 +0200
Subject: [PATCH 3394/3724] =?UTF-8?q?otree:=200.5.1=20=E2=86=92=200.6.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ot/otree/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ot/otree/package.nix b/pkgs/by-name/ot/otree/package.nix
index e45d1eae012e..2ead2a664d9c 100644
--- a/pkgs/by-name/ot/otree/package.nix
+++ b/pkgs/by-name/ot/otree/package.nix
@@ -6,19 +6,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "otree";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "fioncat";
     repo = "otree";
     tag = "v${version}";
-    hash = "sha256-nfRCqqOJl5tpKFyWAHa98Z1Q2lD61eFPD3O155mawf8=";
+    hash = "sha256-Pz9iAN5GMJeYYQ7T0QWUfRwvSfreRF8pJR8ctPVFAmA=";
   };
 
-  cargoHash = "sha256-+rBS9t743OwfNCy6v5dRdjWZRHA5GNniaWVnAtb5yaw=";
+  cargoHash = "sha256-Uz4oA8maAiUye+FRoVBRuMHoPytr5y8DUfPA4CuMSe4=";
 
   meta = {
-    description = "Command line tool to view objects (json/yaml/toml) in TUI tree widget";
+    description = "Command line tool to view objects (JSON/YAML/TOML/XML) in TUI tree widget";
     homepage = "https://github.com/fioncat/otree";
     changelog = "https://github.com/fioncat/otree/releases/tag/v${version}";
     license = lib.licenses.mit;

From bdf2b9ee4010a8f83ec181ccae701e2765feec17 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 25 Aug 2025 10:21:37 +0200
Subject: [PATCH 3395/3724] python3Packages.pymc: fix

https://github.com/pymc-devs/pytensor/pull/1471/files
---
 pkgs/development/python-modules/pymc/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix
index bc85ec17a518..836ee2f3f183 100644
--- a/pkgs/development/python-modules/pymc/default.nix
+++ b/pkgs/development/python-modules/pymc/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
 
   # build-system
   setuptools,
@@ -32,15 +33,21 @@ buildPythonPackage rec {
     hash = "sha256-zh6FsCEviuyqapguTrUDsWKq70ef0IKRhnn2dkgQ/KA=";
   };
 
+  patches = [
+    # TODO: remove at next release
+    # https://github.com/pymc-devs/pytensor/pull/1471
+    (fetchpatch2 {
+      name = "pytensor-2-32-compat";
+      url = "https://github.com/pymc-devs/pymc/commit/59176b6adda88971e546a0cf93ca04424af5197f.patch";
+      hash = "sha256-jkDwlKwxbn9DwpkxEbSXk/kbGjT/Xu8bsZHFBWYpMgA=";
+    })
+  ];
+
   build-system = [
     setuptools
     versioneer
   ];
 
-  pythonRelaxDeps = [
-    "pytensor"
-  ];
-
   dependencies = [
     arviz
     cachetools

From 970dcca69c93c9af2f6e97e01de1a9f861cf87e4 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Mon, 25 Aug 2025 12:55:11 -0400
Subject: [PATCH 3396/3724] treewide: Fix links in module documentation

---
 nixos/lib/systemd-types.nix                        |  2 +-
 nixos/modules/hardware/fw-fanctrl.nix              |  2 +-
 nixos/modules/hardware/nfc-nci.nix                 |  2 +-
 nixos/modules/hardware/video/nvidia.nix            |  2 +-
 nixos/modules/programs/firefox.nix                 |  4 ++--
 nixos/modules/programs/lazygit.nix                 |  2 +-
 .../programs/nautilus-open-any-terminal.nix        |  2 +-
 nixos/modules/programs/ryzen-monitor-ng.nix        |  2 +-
 nixos/modules/programs/starship.nix                |  2 +-
 nixos/modules/programs/yazi.nix                    |  6 +++---
 nixos/modules/programs/zsh/oh-my-zsh.nix           |  2 +-
 nixos/modules/services/amqp/rabbitmq.nix           |  8 ++++----
 nixos/modules/services/audio/alsa.nix              |  2 +-
 nixos/modules/services/backup/borgmatic.nix        |  4 ++--
 nixos/modules/services/cluster/k3s/default.nix     |  2 +-
 .../continuous-integration/buildbot/master.nix     |  2 +-
 .../gitea-actions-runner.nix                       |  2 +-
 nixos/modules/services/databases/dgraph.nix        |  2 +-
 nixos/modules/services/databases/postgresql.md     |  4 ++--
 nixos/modules/services/development/blackfire.nix   |  6 +++---
 .../services/development/jupyter/default.nix       |  2 +-
 .../services/development/jupyterhub/default.nix    |  2 +-
 nixos/modules/services/games/mchprs.nix            |  2 +-
 nixos/modules/services/hardware/display.md         |  2 +-
 nixos/modules/services/hardware/display.nix        |  6 +++---
 nixos/modules/services/hardware/tlp.nix            |  2 +-
 .../services/home-automation/matter-server.nix     |  2 +-
 nixos/modules/services/mail/mailman.md             |  2 +-
 nixos/modules/services/mail/roundcube.nix          |  2 +-
 nixos/modules/services/matrix/dendrite.nix         |  2 +-
 nixos/modules/services/matrix/maubot.md            |  2 +-
 nixos/modules/services/misc/dwm-status.nix         |  2 +-
 nixos/modules/services/misc/radicle.nix            |  2 +-
 nixos/modules/services/misc/renovate.nix           |  4 ++--
 nixos/modules/services/misc/tabby.nix              |  4 ++--
 nixos/modules/services/monitoring/glpi-agent.nix   |  2 +-
 .../services/monitoring/prometheus/default.nix     |  2 +-
 .../monitoring/prometheus/exporters/ecoflow.nix    |  4 ++--
 .../monitoring/prometheus/exporters/pgbouncer.nix  |  2 +-
 .../monitoring/prometheus/exporters/pve.nix        |  4 ++--
 .../monitoring/prometheus/exporters/tibber.nix     |  2 +-
 .../services/network-filesystems/ipfs-cluster.nix  |  4 ++--
 .../services/network-filesystems/xtreemfs.nix      | 10 +++++-----
 .../services/network-filesystems/yandex-disk.nix   |  2 +-
 nixos/modules/services/networking/aria2.nix        |  4 ++--
 nixos/modules/services/networking/crab-hole.nix    |  2 +-
 nixos/modules/services/networking/doh-server.md    |  2 +-
 nixos/modules/services/networking/doh-server.nix   |  2 +-
 nixos/modules/services/networking/mihomo.nix       | 10 +++++-----
 nixos/modules/services/networking/monero.nix       |  4 ++--
 nixos/modules/services/networking/morty.nix        |  2 +-
 nixos/modules/services/networking/mycelium.nix     |  2 +-
 nixos/modules/services/networking/newt.nix         |  2 +-
 .../networking/nghttpx/backend-submodule.nix       |  2 +-
 .../nghttpx/frontend-params-submodule.nix          | 10 +++++-----
 .../networking/nghttpx/nghttpx-options.nix         | 12 ++++++------
 .../services/networking/nm-file-secret-agent.nix   |  2 +-
 nixos/modules/services/networking/nomad.nix        |  2 +-
 nixos/modules/services/networking/openconnect.nix  |  2 +-
 .../modules/services/networking/pdns-recursor.nix  |  2 +-
 nixos/modules/services/networking/prosody.nix      |  2 +-
 nixos/modules/services/networking/sing-box.nix     |  2 +-
 nixos/modules/services/networking/sunshine.nix     |  4 ++--
 nixos/modules/services/networking/tailscale.nix    |  2 +-
 nixos/modules/services/networking/umurmur.nix      |  2 +-
 nixos/modules/services/networking/zerobin.nix      |  2 +-
 nixos/modules/services/scheduling/prefect.nix      |  2 +-
 nixos/modules/services/security/authelia.nix       |  8 ++++----
 .../security/bitwarden-directory-connector-cli.nix |  2 +-
 .../services/system/cachix-agent/default.nix       |  2 +-
 .../modules/services/system/cachix-watch-store.nix |  2 +-
 .../services/system/kerberos/kerberos-server.md    | 10 +++++-----
 nixos/modules/services/system/zram-generator.nix   |  2 +-
 nixos/modules/services/torrent/opentracker.nix     |  2 +-
 nixos/modules/services/video/frigate.nix           |  6 +++---
 nixos/modules/services/video/wivrn.nix             |  2 +-
 nixos/modules/services/web-apps/castopod.md        |  2 +-
 nixos/modules/services/web-apps/haven.nix          |  6 +++---
 nixos/modules/services/web-apps/karakeep.nix       |  2 +-
 nixos/modules/services/web-apps/lasuite-docs.nix   |  4 ++--
 .../services/web-apps/nextjs-ollama-llm-ui.nix     |  2 +-
 nixos/modules/services/web-apps/nostr-rs-relay.nix |  2 +-
 nixos/modules/services/web-apps/outline.nix        |  4 ++--
 .../modules/services/web-apps/peertube-runner.nix  |  4 ++--
 nixos/modules/services/web-apps/pixelfed.nix       |  2 +-
 .../services/web-apps/porn-vault/default.nix       |  2 +-
 nixos/modules/services/web-apps/reposilite.nix     |  6 +++---
 nixos/modules/services/web-apps/sharkey.nix        |  8 ++++----
 nixos/modules/services/web-apps/stash.nix          |  4 ++--
 nixos/modules/services/web-apps/strfry.nix         |  2 +-
 nixos/modules/services/web-apps/youtrack.md        |  2 +-
 nixos/modules/services/web-servers/garage.nix      |  2 +-
 nixos/modules/services/web-servers/mighttpd2.nix   |  4 ++--
 .../services/web-servers/nginx/vhost-options.nix   |  8 ++++----
 nixos/modules/services/web-servers/send.nix        |  4 ++--
 .../modules/services/web-servers/unit/default.nix  |  2 +-
 nixos/modules/system/boot/binfmt.nix               |  2 +-
 .../boot/loader/systemd-boot/systemd-boot.nix      |  6 +++---
 nixos/modules/system/boot/zram-as-tmp.nix          |  8 ++++----
 nixos/modules/virtualisation/docker-rootless.nix   |  2 +-
 nixos/modules/virtualisation/docker.nix            |  2 +-
 nixos/modules/virtualisation/libvirtd.nix          | 14 +++++++-------
 nixos/modules/virtualisation/lxd.nix               |  2 +-
 nixos/modules/virtualisation/nixos-containers.nix  |  2 +-
 .../virtualisation/podman/network-socket.nix       |  2 +-
 nixos/modules/virtualisation/virtualbox-host.nix   |  2 +-
 nixos/modules/virtualisation/waagent.nix           |  2 +-
 107 files changed, 180 insertions(+), 180 deletions(-)

diff --git a/nixos/lib/systemd-types.nix b/nixos/lib/systemd-types.nix
index e3926c14252f..f156beebf359 100644
--- a/nixos/lib/systemd-types.nix
+++ b/nixos/lib/systemd-types.nix
@@ -95,7 +95,7 @@ let
               minimal, "recommended" includes "required", and
               "suggested" includes "recommended".
 
-              See: https://systemd.io/ELF_DLOPEN_METADATA/
+              See: <https://systemd.io/ELF_DLOPEN_METADATA/>
             '';
           };
 
diff --git a/nixos/modules/hardware/fw-fanctrl.nix b/nixos/modules/hardware/fw-fanctrl.nix
index 7c4413cdc05c..feb434853ead 100644
--- a/nixos/modules/hardware/fw-fanctrl.nix
+++ b/nixos/modules/hardware/fw-fanctrl.nix
@@ -27,7 +27,7 @@ in
     config = lib.mkOption {
       default = { };
       description = ''
-        Additional config entries for the fw-fanctrl service (documentation: https://github.com/TamtamHero/fw-fanctrl/blob/main/doc/configuration.md)
+        Additional config entries for the fw-fanctrl service (documentation: <https://github.com/TamtamHero/fw-fanctrl/blob/main/doc/configuration.md>)
       '';
       type = lib.types.submodule {
         freeformType = configFormat.type;
diff --git a/nixos/modules/hardware/nfc-nci.nix b/nixos/modules/hardware/nfc-nci.nix
index 49d9be94d109..34d69db2115c 100644
--- a/nixos/modules/hardware/nfc-nci.nix
+++ b/nixos/modules/hardware/nfc-nci.nix
@@ -139,7 +139,7 @@ in
       default = defaultSettings;
       description = ''
         Configuration to be written to the libncf-nci configuration files.
-        To understand the configuration format, refer to https://github.com/NXPNFCLinux/linux_libnfc-nci/tree/master/conf.
+        To understand the configuration format, refer to <https://github.com/NXPNFCLinux/linux_libnfc-nci/tree/master/conf>.
       '';
       type = lib.types.attrs;
     };
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 28752c8f5406..be4afcd63036 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -229,7 +229,7 @@ in
 
         Warning: This feature is relatively new, depending on your system this might
         work poorly. AMD support, especially so.
-        See: https://forums.developer.nvidia.com/t/the-all-new-outputsink-feature-aka-reverse-prime/129828
+        See: <https://forums.developer.nvidia.com/t/the-all-new-outputsink-feature-aka-reverse-prime/129828>
 
         Note that this option only has any effect if the "nvidia" driver is specified
         in {option}`services.xserver.videoDrivers`, and it should preferably
diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix
index 1600d62ad038..d391b25892f4 100644
--- a/nixos/modules/programs/firefox.nix
+++ b/nixos/modules/programs/firefox.nix
@@ -268,7 +268,7 @@ in
         AutoConfig files can be used to set and lock preferences that are not covered
         by the policies.json for Mac and Linux. This method can be used to automatically
         change user preferences or prevent the end user from modifiying specific
-        preferences by locking them. More info can be found in https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig.
+        preferences by locking them. More info can be found in <https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig>.
       '';
     };
 
@@ -279,7 +279,7 @@ in
         AutoConfig files can be used to set and lock preferences that are not covered
         by the policies.json for Mac and Linux. This method can be used to automatically
         change user preferences or prevent the end user from modifiying specific
-        preferences by locking them. More info can be found in https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig.
+        preferences by locking them. More info can be found in <https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig>.
 
         Files are concated and autoConfig is appended.
       '';
diff --git a/nixos/modules/programs/lazygit.nix b/nixos/modules/programs/lazygit.nix
index 06252f1f1ef5..203ac0ea4b39 100644
--- a/nixos/modules/programs/lazygit.nix
+++ b/nixos/modules/programs/lazygit.nix
@@ -22,7 +22,7 @@ in
       description = ''
         Lazygit configuration.
 
-        See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md for documentation.
+        See <https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md> for documentation.
       '';
     };
   };
diff --git a/nixos/modules/programs/nautilus-open-any-terminal.nix b/nixos/modules/programs/nautilus-open-any-terminal.nix
index 1293f6892375..4604e5837f78 100644
--- a/nixos/modules/programs/nautilus-open-any-terminal.nix
+++ b/nixos/modules/programs/nautilus-open-any-terminal.nix
@@ -17,7 +17,7 @@ in
       default = null;
       description = ''
         The terminal emulator to add to context-entry of nautilus. Supported terminal
-        emulators are listed in https://github.com/Stunkymonkey/nautilus-open-any-terminal#supported-terminal-emulators.
+        emulators are listed in <https://github.com/Stunkymonkey/nautilus-open-any-terminal#supported-terminal-emulators>.
       '';
     };
   };
diff --git a/nixos/modules/programs/ryzen-monitor-ng.nix b/nixos/modules/programs/ryzen-monitor-ng.nix
index 8d9e75928404..6558eb147118 100644
--- a/nixos/modules/programs/ryzen-monitor-ng.nix
+++ b/nixos/modules/programs/ryzen-monitor-ng.nix
@@ -18,7 +18,7 @@ in
 
         SMU Set and Get for many parameters and CO counts.
 
-        https://github.com/mann1x/ryzen_monitor_ng
+        <https://github.com/mann1x/ryzen_monitor_ng>
 
         WARNING: Damage cause by use of your AMD processor outside of official AMD specifications or outside of factory settings are not covered under any AMD product warranty and may not be covered by your board or system manufacturer's warranty
       '';
diff --git a/nixos/modules/programs/starship.nix b/nixos/modules/programs/starship.nix
index e606f776ab81..97339c8119ec 100644
--- a/nixos/modules/programs/starship.nix
+++ b/nixos/modules/programs/starship.nix
@@ -62,7 +62,7 @@ in
       description = ''
         Configuration included in `starship.toml`.
 
-        See https://starship.rs/config/#prompt for documentation.
+        See <https://starship.rs/config/#prompt> for documentation.
       '';
     };
 
diff --git a/nixos/modules/programs/yazi.nix b/nixos/modules/programs/yazi.nix
index 6a097c8b9c9b..b6c7e3133bd7 100644
--- a/nixos/modules/programs/yazi.nix
+++ b/nixos/modules/programs/yazi.nix
@@ -37,7 +37,7 @@ in
                     description = ''
                       Configuration included in `${name}.toml`.
 
-                      See https://yazi-rs.github.io/docs/configuration/${name}/ for documentation.
+                      See <https://yazi-rs.github.io/docs/configuration/${name}/> for documentation.
                     '';
                   }
                 )
@@ -71,7 +71,7 @@ in
       description = ''
         Lua plugins.
 
-        See https://yazi-rs.github.io/docs/plugins/overview/ for documentation.
+        See <https://yazi-rs.github.io/docs/plugins/overview/> for documentation.
       '';
       example = lib.literalExpression ''
         {
@@ -92,7 +92,7 @@ in
       description = ''
         Pre-made themes.
 
-        See https://yazi-rs.github.io/docs/flavors/overview/ for documentation.
+        See <https://yazi-rs.github.io/docs/flavors/overview/> for documentation.
       '';
       example = lib.literalExpression ''
         {
diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix
index a0351d688911..77e5a5f18f02 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.nix
+++ b/nixos/modules/programs/zsh/oh-my-zsh.nix
@@ -117,7 +117,7 @@ in
         default = "";
         description = ''
           Shell commands executed before the `oh-my-zsh` is loaded.
-          For example, to disable async git prompt write `zstyle ':omz:alpha:lib:git' async-prompt no` (more information https://github.com/ohmyzsh/ohmyzsh?tab=readme-ov-file#async-git-prompt)
+          For example, to disable async git prompt write `zstyle ':omz:alpha:lib:git' async-prompt no` (more information <https://github.com/ohmyzsh/ohmyzsh?tab=readme-ov-file#async-git-prompt>)
         '';
       };
     };
diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index 5b2794a18566..4bc032896018 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -109,8 +109,8 @@ in
           will be merged into these options by RabbitMQ at runtime to
           form the final configuration.
 
-          See https://www.rabbitmq.com/configure.html#config-items
-          For the distinct formats, see https://www.rabbitmq.com/configure.html#config-file-formats
+          See <https://www.rabbitmq.com/configure.html#config-items>
+          For the distinct formats, see <https://www.rabbitmq.com/configure.html#config-file-formats>
         '';
       };
 
@@ -127,8 +127,8 @@ in
           The contents of this option will be merged into the `configItems`
           by RabbitMQ at runtime to form the final configuration.
 
-          See the second table on https://www.rabbitmq.com/configure.html#config-items
-          For the distinct formats, see https://www.rabbitmq.com/configure.html#config-file-formats
+          See the second table on <https://www.rabbitmq.com/configure.html#config-items>
+          For the distinct formats, see <https://www.rabbitmq.com/configure.html#config-file-formats>
         '';
       };
 
diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index ace47e862aad..1d611844bf26 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -278,7 +278,7 @@ in
         The content of the system-wide ALSA configuration (/etc/asound.conf).
 
         Documentation of the configuration language and examples can be found
-        in the unofficial ALSA wiki: https://alsa.opensrc.org/Asoundrc
+        in the unofficial ALSA wiki: <https://alsa.opensrc.org/Asoundrc>
       '';
     };
 
diff --git a/nixos/modules/services/backup/borgmatic.nix b/nixos/modules/services/backup/borgmatic.nix
index 632b7e6e72d9..21f9c5eea46b 100644
--- a/nixos/modules/services/backup/borgmatic.nix
+++ b/nixos/modules/services/backup/borgmatic.nix
@@ -131,7 +131,7 @@ in
 
     settings = lib.mkOption {
       description = ''
-        See https://torsion.org/borgmatic/docs/reference/configuration/
+        See <https://torsion.org/borgmatic/docs/reference/configuration/>
       '';
       default = null;
       type = lib.types.nullOr cfgType;
@@ -139,7 +139,7 @@ in
 
     configurations = lib.mkOption {
       description = ''
-        Set of borgmatic configurations, see https://torsion.org/borgmatic/docs/reference/configuration/
+        Set of borgmatic configurations, see <https://torsion.org/borgmatic/docs/reference/configuration/>
       '';
       default = { };
       type = lib.types.attrsOf cfgType;
diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix
index 40b387ef6563..c5c963696b23 100644
--- a/nixos/modules/services/cluster/k3s/default.nix
+++ b/nixos/modules/services/cluster/k3s/default.nix
@@ -293,7 +293,7 @@ let
           description = ''
             Extra HelmChart field definitions that are merged with the rest of the HelmChart
             custom resource. This can be used to set advanced fields or to overwrite
-            generated fields. See https://docs.k3s.io/helm#helmchart-field-definitions
+            generated fields. See <https://docs.k3s.io/helm#helmchart-field-definitions>
             for possible fields.
           '';
         };
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index 398a1c09973e..64555228c9c3 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -86,7 +86,7 @@ in
 
       configurators = lib.mkOption {
         type = lib.types.listOf lib.types.str;
-        description = "Configurator Steps, see https://docs.buildbot.net/latest/manual/configuration/configurators.html";
+        description = "Configurator Steps, see <https://docs.buildbot.net/latest/manual/configuration/configurators.html>";
         default = [ ];
         example = [
           "util.JanitorConfigurator(logHorizon=timedelta(weeks=4), hour=12, dayOfWeek=6)"
diff --git a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix
index 52009e6e9cef..8225d0ca2ebc 100644
--- a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix
@@ -126,7 +126,7 @@ in
           settings = mkOption {
             description = ''
               Configuration for `act_runner daemon`.
-              See https://gitea.com/gitea/act_runner/src/branch/main/internal/pkg/config/config.example.yaml for an example configuration
+              See <https://gitea.com/gitea/act_runner/src/branch/main/internal/pkg/config/config.example.yaml> for an example configuration
             '';
 
             type = types.submodule {
diff --git a/nixos/modules/services/databases/dgraph.nix b/nixos/modules/services/databases/dgraph.nix
index 38eb7df0bf66..9e0a463b0b37 100644
--- a/nixos/modules/services/databases/dgraph.nix
+++ b/nixos/modules/services/databases/dgraph.nix
@@ -75,7 +75,7 @@ in
         type = settingsFormat.type;
         default = { };
         description = ''
-          Contents of the dgraph config. For more details see https://dgraph.io/docs/deploy/config
+          Contents of the dgraph config. For more details see <https://dgraph.io/docs/deploy/config>
         '';
       };
 
diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md
index 4e4d147e0300..6b95478c70f2 100644
--- a/nixos/modules/services/databases/postgresql.md
+++ b/nixos/modules/services/databases/postgresql.md
@@ -56,8 +56,8 @@ invalidated most of its previous use cases:
 - psql >= 15 instead gives only the database owner create permissions
 - Even on psql < 15 (or databases migrated to >= 15), it is
   recommended to manually assign permissions along these lines
-  - https://www.postgresql.org/docs/release/15.0/
-  - https://www.postgresql.org/docs/15/ddl-schemas.html#DDL-SCHEMAS-PRIV
+  - <https://www.postgresql.org/docs/release/15.0/>
+  - <https://www.postgresql.org/docs/15/ddl-schemas.html#DDL-SCHEMAS-PRIV>
 
 ### Assigning ownership {#module-services-postgres-initializing-ownership}
 
diff --git a/nixos/modules/services/development/blackfire.nix b/nixos/modules/services/development/blackfire.nix
index 1f804cd4d883..be444ce65abc 100644
--- a/nixos/modules/services/development/blackfire.nix
+++ b/nixos/modules/services/development/blackfire.nix
@@ -25,7 +25,7 @@ in
       enable = lib.mkEnableOption "Blackfire profiler agent";
       settings = lib.mkOption {
         description = ''
-          See https://blackfire.io/docs/up-and-running/configuration/agent
+          See <https://blackfire.io/docs/up-and-running/configuration/agent>
         '';
         type = lib.types.submodule {
           freeformType = with lib.types; attrsOf str;
@@ -36,7 +36,7 @@ in
               description = ''
                 Sets the server id used to authenticate with Blackfire
 
-                You can find your personal server-id at https://blackfire.io/my/settings/credentials
+                You can find your personal server-id at <https://blackfire.io/my/settings/credentials>
               '';
             };
 
@@ -45,7 +45,7 @@ in
               description = ''
                 Sets the server token used to authenticate with Blackfire
 
-                You can find your personal server-token at https://blackfire.io/my/settings/credentials
+                You can find your personal server-token at <https://blackfire.io/my/settings/credentials>
               '';
             };
           };
diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix
index 4ed82b1e3d50..eece4df20c9d 100644
--- a/nixos/modules/services/development/jupyter/default.nix
+++ b/nixos/modules/services/development/jupyter/default.nix
@@ -126,7 +126,7 @@ in
       type = lib.types.str;
       description = ''
         Password to use with notebook.
-        Can be generated following: https://jupyter-server.readthedocs.io/en/stable/operators/public-server.html#preparing-a-hashed-password
+        Can be generated following: <https://jupyter-server.readthedocs.io/en/stable/operators/public-server.html#preparing-a-hashed-password>
       '';
       example = "argon2:$argon2id$v=19$m=10240,t=10,p=8$48hF+vTUuy1LB83/GzNhUg$J1nx4jPWD7PwOJHs5OtDW8pjYK2s0c1R3rYGbSIKB54";
     };
diff --git a/nixos/modules/services/development/jupyterhub/default.nix b/nixos/modules/services/development/jupyterhub/default.nix
index ad7820395290..01961db823fa 100644
--- a/nixos/modules/services/development/jupyterhub/default.nix
+++ b/nixos/modules/services/development/jupyterhub/default.nix
@@ -64,7 +64,7 @@ in
         Extra contents appended to the jupyterhub configuration
 
         Jupyterhub configuration is a normal python file using
-        Traitlets. https://jupyterhub.readthedocs.io/en/stable/getting-started/config-basics.html. The
+        Traitlets. <https://jupyterhub.readthedocs.io/en/stable/getting-started/config-basics.html>. The
         base configuration of this module was designed to have sane
         defaults for configuration but you can override anything since
         this is a python file.
diff --git a/nixos/modules/services/games/mchprs.nix b/nixos/modules/services/games/mchprs.nix
index f1276aec911c..aa6cda7102b9 100644
--- a/nixos/modules/services/games/mchprs.nix
+++ b/nixos/modules/services/games/mchprs.nix
@@ -201,7 +201,7 @@ in
 
         description = ''
           Configuration for MCHPRS via `Config.toml`.
-          See https://github.com/MCHPR/MCHPRS/blob/master/README.md for documentation.
+          See <https://github.com/MCHPR/MCHPRS/blob/master/README.md> for documentation.
         '';
       };
 
diff --git a/nixos/modules/services/hardware/display.md b/nixos/modules/services/hardware/display.md
index 5b3b96d571ac..0d6310939ef8 100644
--- a/nixos/modules/services/hardware/display.md
+++ b/nixos/modules/services/hardware/display.md
@@ -74,7 +74,7 @@ Under the hood it adds `drm.edid_firmware` entry to `boot.kernelParams` NixOS op
 ## Pulling files from linuxhw/EDID database {#module-hardware-display-edid-linuxhw}
 
 `hardware.display.edid.linuxhw` utilizes `pkgs.linuxhw-edid-fetcher` to extract EDID files
-from https://github.com/linuxhw/EDID based on simple string/regexp search identifying exact entries:
+from <https://github.com/linuxhw/EDID> based on simple string/regexp search identifying exact entries:
 
 ```nix
 {
diff --git a/nixos/modules/services/hardware/display.nix b/nixos/modules/services/hardware/display.nix
index 29e205c81de9..ae8da40630e1 100644
--- a/nixos/modules/services/hardware/display.nix
+++ b/nixos/modules/services/hardware/display.nix
@@ -141,7 +141,7 @@ in
                 An EDID filename to be used for configured display, as in `edid/<filename>`.
                 See for more information:
                 - `hardware.display.edid.packages`
-                - https://wiki.archlinux.org/title/Kernel_mode_setting#Forcing_modes_and_EDID
+                - <https://wiki.archlinux.org/title/Kernel_mode_setting#Forcing_modes_and_EDID>
               '';
             };
             mode = lib.mkOption {
@@ -153,8 +153,8 @@ in
                     <xres>x<yres>[M][R][-<bpp>][@<refresh>][i][m][eDd]
 
                 See for more information:
-                - https://docs.kernel.org/fb/modedb.html
-                - https://wiki.archlinux.org/title/Kernel_mode_setting#Forcing_modes
+                - <https://docs.kernel.org/fb/modedb.html>
+                - <https://wiki.archlinux.org/title/Kernel_mode_setting#Forcing_modes>
               '';
               example = lib.literalExpression ''
                 "e"
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index cfd18d00bfb6..63126123f532 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -42,7 +42,7 @@ in
           USB_BLACKLIST_PHONE = 1;
         };
         description = ''
-          Options passed to TLP. See https://linrunner.de/tlp for all supported options..
+          Options passed to TLP. See <https://linrunner.de/tlp> for all supported options..
         '';
       };
 
diff --git a/nixos/modules/services/home-automation/matter-server.nix b/nixos/modules/services/home-automation/matter-server.nix
index 072d7068a9aa..a0ff6ad33490 100644
--- a/nixos/modules/services/home-automation/matter-server.nix
+++ b/nixos/modules/services/home-automation/matter-server.nix
@@ -42,7 +42,7 @@ in
       default = [ ];
       description = ''
         Extra arguments to pass to the matter-server executable.
-        See https://github.com/home-assistant-libs/python-matter-server?tab=readme-ov-file#running-the-development-server for options.
+        See <https://github.com/home-assistant-libs/python-matter-server?tab=readme-ov-file#running-the-development-server> for options.
       '';
     };
   };
diff --git a/nixos/modules/services/mail/mailman.md b/nixos/modules/services/mail/mailman.md
index 341c3d6744b6..a66fa10c6890 100644
--- a/nixos/modules/services/mail/mailman.md
+++ b/nixos/modules/services/mail/mailman.md
@@ -48,7 +48,7 @@ DNS records will also be required:
 After this has been done and appropriate DNS records have been
 set up, the Postorius mailing list manager and the Hyperkitty
 archive browser will be available at
-https://lists.example.org/. Note that this setup is not
+`https://lists.example.org/`. Note that this setup is not
 sufficient to deliver emails to most email providers nor to
 avoid spam -- a number of additional measures for authenticating
 incoming and outgoing mails, such as SPF, DMARC and DKIM are
diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index 15a114a7354e..324cdb1aadc5 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -68,7 +68,7 @@ in
         '';
         description = ''
           Password file for the postgresql connection.
-          Must be formatted according to PostgreSQL .pgpass standard (see https://www.postgresql.org/docs/current/libpq-pgpass.html)
+          Must be formatted according to PostgreSQL .pgpass standard (see <https://www.postgresql.org/docs/current/libpq-pgpass.html>)
           but only one line, no comments and readable by user `nginx`.
           Ignored if `database.host` is set to `localhost`, as peer authentication will be used.
         '';
diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix
index 290e76038025..259a0c24903c 100644
--- a/nixos/modules/services/matrix/dendrite.nix
+++ b/nixos/modules/services/matrix/dendrite.nix
@@ -225,7 +225,7 @@ in
             description = ''
               The language most likely to be used on the server - used when indexing, to
               ensure the returned results match expectations. A full list of possible languages
-              can be found at https://github.com/blevesearch/bleve/tree/master/analysis/lang
+              can be found at <https://github.com/blevesearch/bleve/tree/master/analysis/lang>
             '';
           };
         };
diff --git a/nixos/modules/services/matrix/maubot.md b/nixos/modules/services/matrix/maubot.md
index 46a0caaedefc..d7c02a0ca19c 100644
--- a/nixos/modules/services/matrix/maubot.md
+++ b/nixos/modules/services/matrix/maubot.md
@@ -33,7 +33,7 @@ framework for Matrix.
 4. Optionally, set `services.maubot.pythonPackages` to a list of python3
    packages to make available for Maubot plugins.
 5. Optionally, set `services.maubot.plugins` to a list of Maubot
-   plugins (full list available at https://plugins.maubot.xyz/):
+   plugins (full list available at <https://plugins.maubot.xyz/>):
    ```nix
    {
      services.maubot.plugins = with config.services.maubot.package.plugins; [
diff --git a/nixos/modules/services/misc/dwm-status.nix b/nixos/modules/services/misc/dwm-status.nix
index b7031808287b..627c426a582c 100644
--- a/nixos/modules/services/misc/dwm-status.nix
+++ b/nixos/modules/services/misc/dwm-status.nix
@@ -66,7 +66,7 @@ in
           };
         };
         description = ''
-          Config options for dwm-status, see https://github.com/Gerschtli/dwm-status#configuration
+          Config options for dwm-status, see <https://github.com/Gerschtli/dwm-status#configuration>
           for available options.
         '';
       };
diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix
index b85d4f5aacb7..a4b18d60fcbc 100644
--- a/nixos/modules/services/misc/radicle.nix
+++ b/nixos/modules/services/misc/radicle.nix
@@ -199,7 +199,7 @@ in
         };
       settings = lib.mkOption {
         description = ''
-          See https://app.radicle.xyz/nodes/seed.radicle.garden/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/radicle/src/node/config.rs#L275
+          See <https://app.radicle.xyz/nodes/seed.radicle.garden/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/radicle/src/node/config.rs#L275>
         '';
         default = { };
         example = lib.literalExpression ''
diff --git a/nixos/modules/services/misc/renovate.nix b/nixos/modules/services/misc/renovate.nix
index 3966e0579662..4ecf440a7638 100644
--- a/nixos/modules/services/misc/renovate.nix
+++ b/nixos/modules/services/misc/renovate.nix
@@ -75,7 +75,7 @@ in
         Extra environment variables to export to the Renovate process
         from the systemd unit configuration.
 
-        See https://docs.renovatebot.com/config-overview for available environment variables.
+        See <https://docs.renovatebot.com/config-overview> for available environment variables.
       '';
       example = {
         LOG_LEVEL = "debug";
@@ -104,7 +104,7 @@ in
         Renovate's global configuration.
         If you want to pass secrets to renovate, please use {option}`services.renovate.credentials` for that.
 
-        See https://docs.renovatebot.com/config-overview for available settings.
+        See <https://docs.renovatebot.com/config-overview> for available settings.
       '';
     };
   };
diff --git a/nixos/modules/services/misc/tabby.nix b/nixos/modules/services/misc/tabby.nix
index 653bc9879288..dce695d6fd2e 100644
--- a/nixos/modules/services/misc/tabby.nix
+++ b/nixos/modules/services/misc/tabby.nix
@@ -70,7 +70,7 @@ in
           $ sudo chown -R tabby:tabby /var/lib/tabby/models/
 
           See for Model Options:
-          > https://github.com/TabbyML/registry-tabby
+          > <https://github.com/TabbyML/registry-tabby>
         '';
       };
 
@@ -114,7 +114,7 @@ in
           Enable sending anonymous usage data.
 
           See for more details:
-          > https://tabby.tabbyml.com/docs/configuration#usage-collection
+          > <https://tabby.tabbyml.com/docs/configuration#usage-collection>
         '';
       };
     };
diff --git a/nixos/modules/services/monitoring/glpi-agent.nix b/nixos/modules/services/monitoring/glpi-agent.nix
index 63d435a503ac..4d0407e1a5f8 100644
--- a/nixos/modules/services/monitoring/glpi-agent.nix
+++ b/nixos/modules/services/monitoring/glpi-agent.nix
@@ -45,7 +45,7 @@ in
         default = { };
         description = ''
           GLPI Agent configuration options.
-          See https://glpi-agent.readthedocs.io/en/latest/configuration.html for all available options.
+          See <https://glpi-agent.readthedocs.io/en/latest/configuration.html> for all available options.
 
           The 'server' option is mandatory and must point to your GLPI server.
         '';
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index efd516309148..965ef9313b53 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -1904,7 +1904,7 @@ in
       default = null;
       description = ''
         Specifies which file should be used as web.config.file and be passed on startup.
-        See https://prometheus.io/docs/prometheus/latest/configuration/https/ for valid options.
+        See <https://prometheus.io/docs/prometheus/latest/configuration/https/> for valid options.
       '';
     };
 
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/ecoflow.nix b/nixos/modules/services/monitoring/prometheus/exporters/ecoflow.nix
index 0b85f614016f..d95a3867fdcc 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/ecoflow.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/ecoflow.nix
@@ -29,7 +29,7 @@ in
       type = types.path;
       default = /etc/ecoflow-access-key;
       description = ''
-        Path to the file with your personal api access string from the Ecoflow development website https://developer-eu.ecoflow.com.
+        Path to the file with your personal api access string from the Ecoflow development website <https://developer-eu.ecoflow.com>.
         Do to share or commit your plaintext scecrets to a public repo use: agenix or soaps.
       '';
     };
@@ -37,7 +37,7 @@ in
       type = types.path;
       default = /etc/ecoflow-secret-key;
       description = ''
-        Path to the file with your personal api secret string from the Ecoflow development website https://developer-eu.ecoflow.com.
+        Path to the file with your personal api secret string from the Ecoflow development website <https://developer-eu.ecoflow.com>.
         Do to share or commit your plaintext scecrets to a public repo use: agenix or soaps.
       '';
     };
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix
index 945a950ed85d..f837174fde7a 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix
@@ -82,7 +82,7 @@ in
         needs to have read access to files owned by the PgBouncer process. Depends on
         the availability of /proc.
 
-        https://prometheus.io/docs/instrumenting/writing_clientlibs/#process-metrics.
+        <https://prometheus.io/docs/instrumenting/writing_clientlibs/#process-metrics>.
 
       '';
     };
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix
index c05dde9a29df..c49a11edb616 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix
@@ -38,7 +38,7 @@ in
 
         The environment file should NOT be stored in /nix/store as it contains passwords and/or keys in plain text.
 
-        Environment reference: https://github.com/prometheus-pve/prometheus-pve-exporter#authentication
+        Environment reference: <https://github.com/prometheus-pve/prometheus-pve-exporter#authentication>
       '';
     };
 
@@ -53,7 +53,7 @@ in
 
         If both configFile and environmentFile are provided, the configFile option will be ignored.
 
-        Configuration reference: https://github.com/prometheus-pve/prometheus-pve-exporter/#authentication
+        Configuration reference: <https://github.com/prometheus-pve/prometheus-pve-exporter/#authentication>
       '';
     };
 
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/tibber.nix b/nixos/modules/services/monitoring/prometheus/exporters/tibber.nix
index 670f23a54d20..76705561a159 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/tibber.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/tibber.nix
@@ -16,7 +16,7 @@ in
       default = null;
       description = ''
         Add here the path to your personal Tibber API Token ('Bearer Token') File.
-        Get your personal Tibber API Token here: https://developer.tibber.com
+        Get your personal Tibber API Token here: <https://developer.tibber.com>
         Do not share your personal plaintext Tibber API Token via github. (see: ryantm/agenix, mic92/sops)
       '';
     };
diff --git a/nixos/modules/services/network-filesystems/ipfs-cluster.nix b/nixos/modules/services/network-filesystems/ipfs-cluster.nix
index 4e7db74930cb..bd048aa498d2 100644
--- a/nixos/modules/services/network-filesystems/ipfs-cluster.nix
+++ b/nixos/modules/services/network-filesystems/ipfs-cluster.nix
@@ -26,7 +26,7 @@ in
           "raft"
           "crdt"
         ];
-        description = "Consensus protocol - 'raft' or 'crdt'. https://cluster.ipfs.io/documentation/guides/consensus/";
+        description = "Consensus protocol - 'raft' or 'crdt'. <https://cluster.ipfs.io/documentation/guides/consensus/>";
       };
 
       dataDir = lib.mkOption {
@@ -44,7 +44,7 @@ in
       openSwarmPort = lib.mkOption {
         type = lib.types.bool;
         default = false;
-        description = "Open swarm port, secured by the cluster secret. This does not expose the API or proxy. https://cluster.ipfs.io/documentation/guides/security/";
+        description = "Open swarm port, secured by the cluster secret. This does not expose the API or proxy. <https://cluster.ipfs.io/documentation/guides/security/>";
       };
 
       secretFile = lib.mkOption {
diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix
index 24ce5f7c224f..e5c472740e9e 100644
--- a/nixos/modules/services/network-filesystems/xtreemfs.nix
+++ b/nixos/modules/services/network-filesystems/xtreemfs.nix
@@ -186,7 +186,7 @@ in
           description = ''
             Configuration of XtreemFS DIR service.
             WARNING: configuration is saved as plaintext inside nix store.
-            For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
+            For more options: <https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html>
           '';
         };
         replication = {
@@ -228,7 +228,7 @@ in
             description = ''
               Configuration of XtreemFS DIR replication plugin.
               WARNING: configuration is saved as plaintext inside nix store.
-              For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
+              For more options: <https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html>
             '';
           };
         };
@@ -335,7 +335,7 @@ in
           description = ''
             Configuration of XtreemFS MRC service.
             WARNING: configuration is saved as plaintext inside nix store.
-            For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
+            For more options: <https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html>
           '';
         };
         replication = {
@@ -377,7 +377,7 @@ in
             description = ''
               Configuration of XtreemFS MRC replication plugin.
               WARNING: configuration is saved as plaintext inside nix store.
-              For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
+              For more options: <https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html>
             '';
           };
         };
@@ -454,7 +454,7 @@ in
           description = ''
             Configuration of XtreemFS OSD service.
             WARNING: configuration is saved as plaintext inside nix store.
-            For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html
+            For more options: <https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html>
           '';
         };
       };
diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix
index c2364898f998..6e769882226d 100644
--- a/nixos/modules/services/network-filesystems/yandex-disk.nix
+++ b/nixos/modules/services/network-filesystems/yandex-disk.nix
@@ -26,7 +26,7 @@ in
         type = lib.types.bool;
         default = false;
         description = ''
-          Whether to enable Yandex-disk client. See https://disk.yandex.ru/
+          Whether to enable Yandex-disk client. See <https://disk.yandex.ru/>
         '';
       };
 
diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix
index 3e0961c753cb..24fe3452927e 100644
--- a/nixos/modules/services/networking/aria2.nix
+++ b/nixos/modules/services/networking/aria2.nix
@@ -85,7 +85,7 @@ in
         example = "/run/secrets/aria2-rpc-token.txt";
         description = ''
           A file containing the RPC secret authorization token.
-          Read https://aria2.github.io/manual/en/html/aria2c.html#rpc-auth to know how this option value is used.
+          Read <https://aria2.github.io/manual/en/html/aria2c.html#rpc-auth> to know how this option value is used.
         '';
       };
       downloadDirPermission = lib.mkOption {
@@ -121,7 +121,7 @@ in
           Generates the `aria2.conf` file. Refer to [the documentation][0] for
           all possible settings.
 
-          [0]: https://aria2.github.io/manual/en/html/aria2c.html#synopsis
+          [0]: <https://aria2.github.io/manual/en/html/aria2c.html#synopsis>
         '';
         default = { };
         type = lib.types.submodule {
diff --git a/nixos/modules/services/networking/crab-hole.nix b/nixos/modules/services/networking/crab-hole.nix
index 7e68c649ad5b..31af31e7a225 100644
--- a/nixos/modules/services/networking/crab-hole.nix
+++ b/nixos/modules/services/networking/crab-hole.nix
@@ -43,7 +43,7 @@ in
       };
 
       settings = lib.mkOption {
-        description = "Crab-holes config. See big example https://github.com/LuckyTurtleDev/crab-hole/blob/main/example-config.toml";
+        description = "Crab-holes config. See big example <https://github.com/LuckyTurtleDev/crab-hole/blob/main/example-config.toml>";
 
         example = {
           downstream = [
diff --git a/nixos/modules/services/networking/doh-server.md b/nixos/modules/services/networking/doh-server.md
index 730100eec688..4c8fd06f12f5 100644
--- a/nixos/modules/services/networking/doh-server.md
+++ b/nixos/modules/services/networking/doh-server.md
@@ -69,4 +69,4 @@ in
 }
 ```
 
-See a full configuration in https://github.com/m13253/dns-over-https/blob/master/doh-server/doh-server.conf.
+See a full configuration in <https://github.com/m13253/dns-over-https/blob/master/doh-server/doh-server.conf>.
diff --git a/nixos/modules/services/networking/doh-server.nix b/nixos/modules/services/networking/doh-server.nix
index ab81e299390d..8350a30190df 100644
--- a/nixos/modules/services/networking/doh-server.nix
+++ b/nixos/modules/services/networking/doh-server.nix
@@ -116,7 +116,7 @@ in
         listen = [ ":8153" ];
         upstream = [ "udp:127.0.0.1:53" ];
       };
-      description = "Configuration of doh-server in toml. See example in https://github.com/m13253/dns-over-https/blob/master/doh-server/doh-server.conf";
+      description = "Configuration of doh-server in toml. See example in <https://github.com/m13253/dns-over-https/blob/master/doh-server/doh-server.conf>";
     };
 
     useACMEHost = lib.mkOption {
diff --git a/nixos/modules/services/networking/mihomo.nix b/nixos/modules/services/networking/mihomo.nix
index cc2130575260..efacc1e99411 100644
--- a/nixos/modules/services/networking/mihomo.nix
+++ b/nixos/modules/services/networking/mihomo.nix
@@ -31,13 +31,13 @@ in
 
         You can also use the following website:
         - metacubexd:
-          - https://d.metacubex.one
-          - https://metacubex.github.io/metacubexd
-          - https://metacubexd.pages.dev
+          - <https://d.metacubex.one>
+          - <https://metacubex.github.io/metacubexd>
+          - <https://metacubexd.pages.dev>
         - yacd:
-          - https://yacd.haishan.me
+          - <https://yacd.haishan.me>
         - clash-dashboard:
-          - https://clash.razord.top
+          - <https://clash.razord.top>
       '';
     };
 
diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix
index bd63ea3806ac..9da570bbb5e2 100644
--- a/nixos/modules/services/networking/monero.nix
+++ b/nixos/modules/services/networking/monero.nix
@@ -80,7 +80,7 @@ in
           Path to a text file containing IPs to block.
           Useful to prevent DDoS/deanonymization attacks.
 
-          https://github.com/monero-project/meta/issues/1124
+          <https://github.com/monero-project/meta/issues/1124>
         '';
         example = lib.literalExpression ''
           builtins.fetchurl {
@@ -222,7 +222,7 @@ in
         default = false;
         description = ''
           Whether to prune the blockchain.
-          https://www.getmonero.org/resources/moneropedia/pruning.html
+          <https://www.getmonero.org/resources/moneropedia/pruning.html>
         '';
       };
 
diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix
index 8f672162a3c4..99aab2f263f1 100644
--- a/nixos/modules/services/networking/morty.nix
+++ b/nixos/modules/services/networking/morty.nix
@@ -21,7 +21,7 @@ in
 
     services.morty = {
 
-      enable = mkEnableOption "Morty proxy server. See https://github.com/asciimoo/morty";
+      enable = mkEnableOption "Morty proxy server. See <https://github.com/asciimoo/morty>";
 
       ipv6 = mkOption {
         type = types.bool;
diff --git a/nixos/modules/services/networking/mycelium.nix b/nixos/modules/services/networking/mycelium.nix
index 7ba506ef25eb..7ffbf13be400 100644
--- a/nixos/modules/services/networking/mycelium.nix
+++ b/nixos/modules/services/networking/mycelium.nix
@@ -49,7 +49,7 @@ in
       type = lib.types.bool;
       default = true;
       description = ''
-        Adds the hosted peers from https://github.com/threefoldtech/mycelium#hosted-public-nodes.
+        Adds the hosted peers from <https://github.com/threefoldtech/mycelium#hosted-public-nodes>.
       '';
     };
     extraArgs = lib.mkOption {
diff --git a/nixos/modules/services/networking/newt.nix b/nixos/modules/services/networking/newt.nix
index e001dd85ffdd..07a58d868cab 100644
--- a/nixos/modules/services/networking/newt.nix
+++ b/nixos/modules/services/networking/newt.nix
@@ -44,7 +44,7 @@ in
         type = with lib.types; nullOr path;
         default = null;
         description = ''
-          Path to a file containing sensitive environment variables for Newt. See https://docs.fossorial.io/Newt/overview#cli-args
+          Path to a file containing sensitive environment variables for Newt. See <https://docs.fossorial.io/Newt/overview#cli-args>
           These will overwrite anything defined in the config.
           The file should contain environment-variable assignments like:
           NEWT_ID=2ix2t8xk22ubpfy
diff --git a/nixos/modules/services/networking/nghttpx/backend-submodule.nix b/nixos/modules/services/networking/nghttpx/backend-submodule.nix
index 19829f59ea91..041780cd2964 100644
--- a/nixos/modules/services/networking/nghttpx/backend-submodule.nix
+++ b/nixos/modules/services/networking/nghttpx/backend-submodule.nix
@@ -28,7 +28,7 @@
       description = ''
         List of nghttpx backend patterns.
 
-        Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-b
+        Please see <https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-b>
         for more information on the pattern syntax and nghttpxs behavior.
       '';
     };
diff --git a/nixos/modules/services/networking/nghttpx/frontend-params-submodule.nix b/nixos/modules/services/networking/nghttpx/frontend-params-submodule.nix
index 2addc3e6e867..63691811f922 100644
--- a/nixos/modules/services/networking/nghttpx/frontend-params-submodule.nix
+++ b/nixos/modules/services/networking/nghttpx/frontend-params-submodule.nix
@@ -11,7 +11,7 @@
         Enable or disable TLS. If true (enabled) the key and
         certificate must be configured for nghttpx.
 
-        Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-f
+        Please see <https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-f>
         for more detail.
       '';
     };
@@ -24,7 +24,7 @@
         name received from the client is used instead of the request
         host. See --backend option about the pattern match.
 
-        Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-f
+        Please see <https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-f>
         for more detail.
       '';
     };
@@ -37,7 +37,7 @@
         dynamically modify nghttpx at run-time therefore this feature
         is disabled by default and should be turned on with care.
 
-        Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-f
+        Please see <https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-f>
         for more detail.
       '';
     };
@@ -49,7 +49,7 @@
         Make this frontend a health monitor endpoint. Any request
         received on this frontend is responded to with a 200 OK.
 
-        Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-f
+        Please see <https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-f>
         for more detail.
       '';
     };
@@ -60,7 +60,7 @@
       description = ''
         Accept PROXY protocol version 1 on frontend connection.
 
-        Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-f
+        Please see <https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-f>
         for more detail.
       '';
     };
diff --git a/nixos/modules/services/networking/nghttpx/nghttpx-options.nix b/nixos/modules/services/networking/nghttpx/nghttpx-options.nix
index 79fd8b57c3eb..f59f02a7d1d0 100644
--- a/nixos/modules/services/networking/nghttpx/nghttpx-options.nix
+++ b/nixos/modules/services/networking/nghttpx/nghttpx-options.nix
@@ -77,7 +77,7 @@
         is used. In the single process mode, the signal handling
         feature is disabled.
 
-        Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx--single-process
+        Please see <https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx--single-process>
       '';
     };
 
@@ -87,7 +87,7 @@
       description = ''
         Listen backlog size.
 
-        Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx--backlog
+        Please see <https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx--backlog>
       '';
     };
 
@@ -104,7 +104,7 @@
         only IPv4 address is considered. If "IPv6" is given, only IPv6
         address is considered.
 
-        Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx--backend-address-family
+        Please see <https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx--backend-address-family>
       '';
     };
 
@@ -114,7 +114,7 @@
       description = ''
         Set the number of worker threads.
 
-        Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-n
+        Please see <https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-n>
       '';
     };
 
@@ -127,7 +127,7 @@
         the platforms which lack thread support. If threading is
         disabled, this option is always enabled.
 
-        Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx--single-thread
+        Please see <https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx--single-thread>
       '';
     };
 
@@ -138,7 +138,7 @@
         Set maximum number of open files (RLIMIT_NOFILE) to \<N\>. If 0
         is given, nghttpx does not set the limit.
 
-        Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx--rlimit-nofile
+        Please see <https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx--rlimit-nofile>
       '';
     };
   };
diff --git a/nixos/modules/services/networking/nm-file-secret-agent.nix b/nixos/modules/services/networking/nm-file-secret-agent.nix
index 8d9b8fee3c54..669a6e208deb 100644
--- a/nixos/modules/services/networking/nm-file-secret-agent.nix
+++ b/nixos/modules/services/networking/nm-file-secret-agent.nix
@@ -84,7 +84,7 @@ in
                   The NetworkManager configuration settings reference roughly corresponds to connection types.
                   More might be available on your system depending on the installed plugins.
 
-                  https://networkmanager.dev/docs/api/latest/ch01.html
+                  <https://networkmanager.dev/docs/api/latest/ch01.html>
                 '';
                 type = lib.types.nullOr lib.types.str;
                 default = null;
diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index f66e82e7143b..7ddbff8b924d 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -43,7 +43,7 @@ in
           Enable Docker support. Needed for Nomad's docker driver.
 
           Note that the docker group membership is effectively equivalent
-          to being root, see https://github.com/moby/moby/issues/9976.
+          to being root, see <https://github.com/moby/moby/issues/9976>.
         '';
       };
 
diff --git a/nixos/modules/services/networking/openconnect.nix b/nixos/modules/services/networking/openconnect.nix
index dacc0c9148a0..13d8580c67b1 100644
--- a/nixos/modules/services/networking/openconnect.nix
+++ b/nixos/modules/services/networking/openconnect.nix
@@ -81,7 +81,7 @@ let
           Extra config to be appended to the interface config. It should
           contain long-format options as would be accepted on the command
           line by `openconnect`
-          (see https://www.infradead.org/openconnect/manual.html).
+          (see <https://www.infradead.org/openconnect/manual.html>).
           Non-key-value options like `deflate` can be used by
           declaring them as booleans, i. e. `deflate = true;`.
         '';
diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix
index 581c206eb3c7..3185dd1b9696 100644
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@@ -181,7 +181,7 @@ in
       default = "validate";
       description = ''
         Controls the level of DNSSEC processing done by the PowerDNS Recursor.
-        See https://doc.powerdns.com/md/recursor/dnssec/ for a detailed explanation.
+        See <https://doc.powerdns.com/md/recursor/dnssec/> for a detailed explanation.
       '';
     };
 
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index cf973dd242a5..ce55056710e2 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -763,7 +763,7 @@ in
           Force certificate authentication for server-to-server connections?
           This provides ideal security, but requires servers you communicate
           with to support encryption AND present valid, trusted certificates.
-          For more information see https://prosody.im/doc/s2s#security
+          For more information see <https://prosody.im/doc/s2s#security>
         '';
       };
 
diff --git a/nixos/modules/services/networking/sing-box.nix b/nixos/modules/services/networking/sing-box.nix
index 5910dadd5878..fd209785bbb0 100644
--- a/nixos/modules/services/networking/sing-box.nix
+++ b/nixos/modules/services/networking/sing-box.nix
@@ -30,7 +30,7 @@ in
         };
         default = { };
         description = ''
-          The sing-box configuration, see https://sing-box.sagernet.org/configuration/ for documentation.
+          The sing-box configuration, see <https://sing-box.sagernet.org/configuration/> for documentation.
 
           Options containing secret data should be set to an attribute set
           containing the attribute `_secret` - a string pointing to a file
diff --git a/nixos/modules/services/networking/sunshine.nix b/nixos/modules/services/networking/sunshine.nix
index 2b723b74ce7b..61c6bdf387b7 100644
--- a/nixos/modules/services/networking/sunshine.nix
+++ b/nixos/modules/services/networking/sunshine.nix
@@ -60,7 +60,7 @@ in
       description = ''
         Settings to be rendered into the configuration file. If this is set, no configuration is possible from the web UI.
 
-        See https://docs.lizardbyte.dev/projects/sunshine/en/latest/about/advanced_usage.html#configuration for syntax.
+        See <https://docs.lizardbyte.dev/projects/sunshine/en/latest/about/advanced_usage.html#configuration for syntax>.
       '';
       example = literalExpression ''
         {
@@ -73,7 +73,7 @@ in
           type = port;
           default = defaultPort;
           description = ''
-            Base port -- others used are offset from this one, see https://docs.lizardbyte.dev/projects/sunshine/en/latest/about/advanced_usage.html#port for details.
+            Base port -- others used are offset from this one, see <https://docs.lizardbyte.dev/projects/sunshine/en/latest/about/advanced_usage.html#port> for details.
           '';
         };
       });
diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
index 80d0de468ee5..596a015eccce 100644
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -104,7 +104,7 @@ in
       default = { };
       description = ''
         Extra parameters to pass after the auth key.
-        See https://tailscale.com/kb/1215/oauth-clients#registering-new-nodes-using-oauth-credentials
+        See <https://tailscale.com/kb/1215/oauth-clients#registering-new-nodes-using-oauth-credentials>
       '';
     };
 
diff --git a/nixos/modules/services/networking/umurmur.nix b/nixos/modules/services/networking/umurmur.nix
index 5d4719c6e522..9cceebe8aec1 100644
--- a/nixos/modules/services/networking/umurmur.nix
+++ b/nixos/modules/services/networking/umurmur.nix
@@ -164,7 +164,7 @@ in
           };
         };
         default = { };
-        description = "Settings of uMurmur. For reference see https://github.com/umurmur/umurmur/blob/master/umurmur.conf.example";
+        description = "Settings of uMurmur. For reference see <https://github.com/umurmur/umurmur/blob/master/umurmur.conf.example>";
       };
 
       configFile = lib.mkOption rec {
diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix
index 35548f34f554..49bcc9e830d3 100644
--- a/nixos/modules/services/networking/zerobin.nix
+++ b/nixos/modules/services/networking/zerobin.nix
@@ -72,7 +72,7 @@ in
         '';
         description = ''
           Extra configuration to be appended to the 0bin config file
-          (see https://0bin.readthedocs.org/en/latest/en/options.html)
+          (see <https://0bin.readthedocs.org/en/latest/en/options.html>)
         '';
       };
     };
diff --git a/nixos/modules/services/scheduling/prefect.nix b/nixos/modules/services/scheduling/prefect.nix
index c0a5fae52703..72179533cfe8 100644
--- a/nixos/modules/services/scheduling/prefect.nix
+++ b/nixos/modules/services/scheduling/prefect.nix
@@ -123,7 +123,7 @@ in
     baseUrl = lib.mkOption {
       type = nullOr str;
       default = null;
-      description = "external url when served by a reverse proxy, e.g. https://example.com/prefect";
+      description = "external url when served by a reverse proxy, e.g. `https://example.com/prefect`";
     };
   };
 
diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix
index 7b93a7f9f7b3..5dc438473a1d 100644
--- a/nixos/modules/services/security/authelia.nix
+++ b/nixos/modules/services/security/authelia.nix
@@ -48,7 +48,7 @@ let
             as the values will be preserved in your nix store.
             This attribute allows you to configure the location of secret files to be loaded at runtime.
 
-            https://www.authelia.com/configuration/methods/secrets/
+            <https://www.authelia.com/configuration/methods/secrets/>
           '';
           default = { };
           type = types.submodule {
@@ -117,7 +117,7 @@ let
             If you are providing secrets please consider the options under {option}`services.authelia.<instance>.secrets`
             or make sure you use the `_FILE` suffix.
             If you provide the raw secret rather than the location of a secret file that secret will be preserved in the nix store.
-            For more details: https://www.authelia.com/configuration/methods/secrets/
+            For more details: <https://www.authelia.com/configuration/methods/secrets/>
           '';
           default = { };
         };
@@ -128,7 +128,7 @@ let
             There are several values that are defined and documented in nix such as `default_2fa_method`,
             but additional items can also be included.
 
-            https://github.com/authelia/authelia/blob/master/config.template.yml
+            <https://github.com/authelia/authelia/blob/master/config.template.yml>
           '';
           default = { };
           example = ''
@@ -284,7 +284,7 @@ in
         Multi-domain protection currently requires multiple instances of Authelia.
         If you don't require multiple instances of Authelia you can define just the one.
 
-        https://www.authelia.com/roadmap/active/multi-domain-protection/
+        <https://www.authelia.com/roadmap/active/multi-domain-protection/>
       '';
       example = ''
         {
diff --git a/nixos/modules/services/security/bitwarden-directory-connector-cli.nix b/nixos/modules/services/security/bitwarden-directory-connector-cli.nix
index 633563a11561..57decbcb521d 100644
--- a/nixos/modules/services/security/bitwarden-directory-connector-cli.nix
+++ b/nixos/modules/services/security/bitwarden-directory-connector-cli.nix
@@ -150,7 +150,7 @@ in
             overwriteExisting = mkOption {
               type = types.bool;
               default = false;
-              description = "Remove and re-add users/groups, See https://bitwarden.com/help/user-group-filters/#overwriting-syncs for more details.";
+              description = "Remove and re-add users/groups, See <https://bitwarden.com/help/user-group-filters/#overwriting-syncs> for more details.";
             };
 
             largeImport = mkOption {
diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix
index a75bd6f7b287..b7da56d08981 100644
--- a/nixos/modules/services/system/cachix-agent/default.nix
+++ b/nixos/modules/services/system/cachix-agent/default.nix
@@ -11,7 +11,7 @@ in
   meta.maintainers = [ lib.maintainers.domenkozar ];
 
   options.services.cachix-agent = {
-    enable = lib.mkEnableOption "Cachix Deploy Agent: https://docs.cachix.org/deploy/";
+    enable = lib.mkEnableOption "Cachix Deploy Agent: <https://docs.cachix.org/deploy/>";
 
     name = lib.mkOption {
       type = lib.types.str;
diff --git a/nixos/modules/services/system/cachix-watch-store.nix b/nixos/modules/services/system/cachix-watch-store.nix
index 28de56d20fb4..d9bd417d5d60 100644
--- a/nixos/modules/services/system/cachix-watch-store.nix
+++ b/nixos/modules/services/system/cachix-watch-store.nix
@@ -14,7 +14,7 @@ in
   ];
 
   options.services.cachix-watch-store = {
-    enable = lib.mkEnableOption "Cachix Watch Store: https://docs.cachix.org";
+    enable = lib.mkEnableOption "Cachix Watch Store: <https://docs.cachix.org>";
 
     cacheName = lib.mkOption {
       type = lib.types.str;
diff --git a/nixos/modules/services/system/kerberos/kerberos-server.md b/nixos/modules/services/system/kerberos/kerberos-server.md
index 4aa883b8e68b..925adfc731fe 100644
--- a/nixos/modules/services/system/kerberos/kerberos-server.md
+++ b/nixos/modules/services/system/kerberos/kerberos-server.md
@@ -53,11 +53,11 @@ To enable a Kerberos server:
 
 ## Upstream Documentation {#module-services-kerberos-server-upstream-documentation}
 
-- MIT Kerberos homepage: https://web.mit.edu/kerberos
-- MIT Kerberos docs: https://web.mit.edu/kerberos/krb5-latest/doc/index.html
+- MIT Kerberos homepage: <https://web.mit.edu/kerberos>
+- MIT Kerberos docs: <https://web.mit.edu/kerberos/krb5-latest/doc/index.html>
 
-- Heimdal Kerberos GitHub wiki: https://github.com/heimdal/heimdal/wiki
-- Heimdal kerberos doc manpages (Debian unstable): https://manpages.debian.org/unstable/heimdal-docs/index.html
-- Heimdal Kerberos kdc manpages (Debian unstable): https://manpages.debian.org/unstable/heimdal-kdc/index.html
+- Heimdal Kerberos GitHub wiki: <https://github.com/heimdal/heimdal/wiki>
+- Heimdal kerberos doc manpages (Debian unstable): <https://manpages.debian.org/unstable/heimdal-docs/index.html>
+- Heimdal Kerberos kdc manpages (Debian unstable): <https://manpages.debian.org/unstable/heimdal-kdc/index.html>
 
 Note the version number in the URLs, it may be different for the latest version.
diff --git a/nixos/modules/services/system/zram-generator.nix b/nixos/modules/services/system/zram-generator.nix
index 1815cd21c639..7eb3fdda46d3 100644
--- a/nixos/modules/services/system/zram-generator.nix
+++ b/nixos/modules/services/system/zram-generator.nix
@@ -25,7 +25,7 @@ in
       default = { };
       description = ''
         Configuration for zram-generator,
-        see https://github.com/systemd/zram-generator for documentation.
+        see <https://github.com/systemd/zram-generator> for documentation.
       '';
     };
   };
diff --git a/nixos/modules/services/torrent/opentracker.nix b/nixos/modules/services/torrent/opentracker.nix
index 22938e9359d4..4d33182291df 100644
--- a/nixos/modules/services/torrent/opentracker.nix
+++ b/nixos/modules/services/torrent/opentracker.nix
@@ -17,7 +17,7 @@ in
       type = lib.types.separatedString " ";
       description = ''
         Configuration Arguments for opentracker
-        See https://erdgeist.org/arts/software/opentracker/ for all params
+        See <https://erdgeist.org/arts/software/opentracker/> for all params
       '';
       default = "";
     };
diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
index c63f3df3c063..6dc6bab6c036 100644
--- a/nixos/modules/services/video/frigate.nix
+++ b/nixos/modules/services/video/frigate.nix
@@ -190,8 +190,8 @@ in
 
         See also:
 
-        - https://docs.frigate.video/configuration/hardware_acceleration
-        - https://docs.frigate.video/configuration/ffmpeg_presets#hwaccel-presets
+        - <https://docs.frigate.video/configuration/hardware_acceleration>
+        - <https://docs.frigate.video/configuration/ffmpeg_presets#hwaccel-presets>
       '';
     };
 
@@ -217,7 +217,7 @@ in
             description = ''
               Attribute set of cameras configurations.
 
-              https://docs.frigate.video/configuration/cameras
+              <https://docs.frigate.video/configuration/cameras>
             '';
           };
 
diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix
index 9c5e9ebb6486..6f4538964283 100644
--- a/nixos/modules/services/video/wivrn.nix
+++ b/nixos/modules/services/video/wivrn.nix
@@ -126,7 +126,7 @@ in
             Like upstream, the application option is a list including the application and it's flags. In the case of the NixOS module however, the first element of the list must be a package. The module will assert otherwise.
             The application can be set to a single package because it gets passed to lib.toList, though this will not allow for flags to be passed.
 
-            See https://github.com/WiVRn/WiVRn/blob/master/docs/configuration.md
+            See <https://github.com/WiVRn/WiVRn/blob/master/docs/configuration.md>
           '';
           default = { };
           example = literalExpression ''
diff --git a/nixos/modules/services/web-apps/castopod.md b/nixos/modules/services/web-apps/castopod.md
index 6c654c6ad363..c69970b623b6 100644
--- a/nixos/modules/services/web-apps/castopod.md
+++ b/nixos/modules/services/web-apps/castopod.md
@@ -4,7 +4,7 @@ Castopod is an open-source hosting platform made for podcasters who want to enga
 
 ## Quickstart {#module-services-castopod-quickstart}
 
-Configure ACME (https://nixos.org/manual/nixos/unstable/#module-security-acme).
+Configure ACME (<https://nixos.org/manual/nixos/unstable/#module-security-acme>).
 Use the following configuration to start a public instance of Castopod on `castopod.example.com` domain:
 
 ```nix
diff --git a/nixos/modules/services/web-apps/haven.nix b/nixos/modules/services/web-apps/haven.nix
index b5417ffb3c06..d67a201b43f4 100644
--- a/nixos/modules/services/web-apps/haven.nix
+++ b/nixos/modules/services/web-apps/haven.nix
@@ -48,9 +48,9 @@ in
 
     settings = lib.mkOption {
       default = defaultSettings;
-      defaultText = "See https://github.com/bitvora/haven/blob/master/.env.example";
+      defaultText = "See <https://github.com/bitvora/haven/blob/master/.env.example>";
       apply = lib.recursiveUpdate defaultSettings;
-      description = "See https://github.com/bitvora/haven for documentation.";
+      description = "See <https://github.com/bitvora/haven> for documentation.";
       example = lib.literalExpression ''
         {
           RELAY_URL = "relay.example.com";
@@ -63,7 +63,7 @@ in
       type = lib.types.nullOr lib.types.path;
       default = null;
       description = ''
-        Path to a file containing sensitive environment variables. See https://github.com/bitvora/haven for documentation.
+        Path to a file containing sensitive environment variables. See <https://github.com/bitvora/haven> for documentation.
         The file should contain environment-variable assignments like:
         S3_SECRET_KEY=mysecretkey
         S3_ACCESS_KEY_ID=myaccesskey
diff --git a/nixos/modules/services/web-apps/karakeep.nix b/nixos/modules/services/web-apps/karakeep.nix
index df431d89c3a9..7867381007ac 100644
--- a/nixos/modules/services/web-apps/karakeep.nix
+++ b/nixos/modules/services/web-apps/karakeep.nix
@@ -34,7 +34,7 @@ in
           Environment variables to pass to Karakaeep. This is how most settings
           can be configured. Changing DATA_DIR is possible but not supported.
 
-          See https://docs.karakeep.app/configuration/
+          See <https://docs.karakeep.app/configuration/>
         '';
         type = lib.types.attrsOf lib.types.str;
         default = { };
diff --git a/nixos/modules/services/web-apps/lasuite-docs.nix b/nixos/modules/services/web-apps/lasuite-docs.nix
index 2a1c352f302c..c6a1b0c2ae40 100644
--- a/nixos/modules/services/web-apps/lasuite-docs.nix
+++ b/nixos/modules/services/web-apps/lasuite-docs.nix
@@ -194,7 +194,7 @@ in
         description = ''
           Configuration options of collaboration server.
 
-          See https://github.com/suitenumerique/docs/blob/v${cfg.collaborationServer.package.version}/docs/env.md
+          See <https://github.com/suitenumerique/docs/blob/v${cfg.collaborationServer.package.version}/docs/env.md>
         '';
       };
     };
@@ -327,7 +327,7 @@ in
       description = ''
         Configuration options of docs.
 
-        See https://github.com/suitenumerique/docs/blob/v${cfg.backendPackage.version}/docs/env.md
+        See <https://github.com/suitenumerique/docs/blob/v${cfg.backendPackage.version}/docs/env.md>
 
         `REDIS_URL` and `CELERY_BROKER_URL` are set if `services.lasuite-docs.redis.createLocally` is true.
         `DB_HOST` is set if `services.lasuite-docs.postgresql.createLocally` is true.
diff --git a/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix b/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix
index b656362cf192..8f1d293fdd73 100644
--- a/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix
+++ b/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix
@@ -37,7 +37,7 @@ in
 
           Note: You should keep it at 127.0.0.1 and only serve to the local
           network or internet from a (home) server behind a reverse-proxy and secured encryption.
-          See https://wiki.nixos.org/wiki/Nginx for instructions on how to set up a reverse-proxy.
+          See <https://wiki.nixos.org/wiki/Nginx> for instructions on how to set up a reverse-proxy.
         '';
       };
 
diff --git a/nixos/modules/services/web-apps/nostr-rs-relay.nix b/nixos/modules/services/web-apps/nostr-rs-relay.nix
index ffc6564a5716..7fb4a59ae893 100644
--- a/nixos/modules/services/web-apps/nostr-rs-relay.nix
+++ b/nixos/modules/services/web-apps/nostr-rs-relay.nix
@@ -40,7 +40,7 @@ in
     settings = lib.mkOption {
       inherit (settingsFormat) type;
       default = { };
-      description = "See https://git.sr.ht/~gheartsfield/nostr-rs-relay/#configuration for documentation.";
+      description = "See <https://git.sr.ht/~gheartsfield/nostr-rs-relay/#configuration> for documentation.";
     };
   };
 
diff --git a/nixos/modules/services/web-apps/outline.nix b/nixos/modules/services/web-apps/outline.nix
index 2289bcb01592..9aa1fb09a43a 100644
--- a/nixos/modules/services/web-apps/outline.nix
+++ b/nixos/modules/services/web-apps/outline.nix
@@ -297,9 +297,9 @@ in
     discordAuthentication = lib.mkOption {
       description = ''
         To configure Discord auth, you'll need to create an application at
-        https://discord.com/developers/applications/
+        <https://discord.com/developers/applications/>
 
-        See https://docs.getoutline.com/s/hosting/doc/discord-g4JdWFFub6
+        See <https://docs.getoutline.com/s/hosting/doc/discord-g4JdWFFub6>
         for details on setting up your Discord app.
       '';
       default = null;
diff --git a/nixos/modules/services/web-apps/peertube-runner.nix b/nixos/modules/services/web-apps/peertube-runner.nix
index 749a1d71d704..0aae8e558825 100644
--- a/nixos/modules/services/web-apps/peertube-runner.nix
+++ b/nixos/modules/services/web-apps/peertube-runner.nix
@@ -53,7 +53,7 @@ in
       description = ''
         Configuration for peertube-runner.
 
-        See available configuration options at https://docs.joinpeertube.org/maintain/tools#configuration.
+        See available configuration options at <https://docs.joinpeertube.org/maintain/tools#configuration>.
       '';
     };
     instancesToRegister = lib.mkOption {
@@ -72,7 +72,7 @@ in
               description = ''
                 Path to a file containing a registration token for the PeerTube instance.
 
-                See how to generate registration tokens at https://docs.joinpeertube.org/admin/remote-runners#manage-remote-runners.
+                See how to generate registration tokens at <https://docs.joinpeertube.org/admin/remote-runners#manage-remote-runners>.
               '';
             };
             runnerName = lib.mkOption {
diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix
index 11643725e3b7..0022cbe57ac6 100644
--- a/nixos/modules/services/web-apps/pixelfed.nix
+++ b/nixos/modules/services/web-apps/pixelfed.nix
@@ -173,7 +173,7 @@ in
           default = "mysql";
           description = ''
             Database engine to use.
-            Note that PGSQL is not well supported: https://github.com/pixelfed/pixelfed/issues/2727
+            Note that PGSQL is not well supported: <https://github.com/pixelfed/pixelfed/issues/2727>
           '';
         };
 
diff --git a/nixos/modules/services/web-apps/porn-vault/default.nix b/nixos/modules/services/web-apps/porn-vault/default.nix
index 56978dc8c0f0..e493e5de7b84 100644
--- a/nixos/modules/services/web-apps/porn-vault/default.nix
+++ b/nixos/modules/services/web-apps/porn-vault/default.nix
@@ -55,7 +55,7 @@ in
         description = ''
           Configuration for Porn-Vault. The attributes are serialized to JSON in config.json.
 
-          See https://gitlab.com/porn-vault/porn-vault/-/blob/dev/config.example.json
+          See <https://gitlab.com/porn-vault/porn-vault/-/blob/dev/config.example.json>
         '';
         default = defaultConfig;
         apply = lib.recursiveUpdate defaultConfig;
diff --git a/nixos/modules/services/web-apps/reposilite.nix b/nixos/modules/services/web-apps/reposilite.nix
index 6d16760987a6..420f5eb923d8 100644
--- a/nixos/modules/services/web-apps/reposilite.nix
+++ b/nixos/modules/services/web-apps/reposilite.nix
@@ -116,7 +116,7 @@ let
         type = lib.types.nullOr lib.types.str;
         description = ''
           Database connection string. Please use {option}`services.reposilite.database` instead.
-          See https://reposilite.com/guide/general#local-configuration for valid values.
+          See <https://reposilite.com/guide/general#local-configuration> for valid values.
         '';
         default = null;
       };
@@ -141,7 +141,7 @@ let
           Path to the .jsk KeyStore or paths to the PKCS#8 certificate and private key, separated by a space (see example).
           You can use `''${WORKING_DIRECTORY}` to refer to paths relative to Reposilite's working directory.
           If you are using a Java KeyStore, don't forget to specify the password via the {var}`REPOSILITE_LOCAL_KEYPASSWORD` environment variable.
-          See https://reposilite.com/guide/ssl for more information on how to set SSL up.
+          See <https://reposilite.com/guide/ssl> for more information on how to set SSL up.
         '';
         default = null;
         example = "\${WORKING_DIRECTORY}/cert.pem \${WORKING_DIRECTORY}/key.pem";
@@ -354,7 +354,7 @@ in
         assertion = cfg.settings.sslEnabled -> cfg.settings.keyPath != null;
         message = ''
           Reposilite was configured to enable SSL, but no valid paths to certificate files were provided via `settings.keyPath`.
-          Read more about SSL certificates here: https://reposilite.com/guide/ssl
+          Read more about SSL certificates here: <https://reposilite.com/guide/ssl>
         '';
       }
       {
diff --git a/nixos/modules/services/web-apps/sharkey.nix b/nixos/modules/services/web-apps/sharkey.nix
index 3ff9a37784c3..c75c7493c84e 100644
--- a/nixos/modules/services/web-apps/sharkey.nix
+++ b/nixos/modules/services/web-apps/sharkey.nix
@@ -33,7 +33,7 @@ in
           List of paths to files containing environment variables for Sharkey to use at runtime.
 
           This is useful for keeping secrets out of the Nix store. See
-          https://docs.joinsharkey.org/docs/install/configuration/ for how to configure Sharkey using environment
+          <https://docs.joinsharkey.org/docs/install/configuration/> for how to configure Sharkey using environment
           variables.
         '';
       };
@@ -57,7 +57,7 @@ in
           You need to ensure `services.meilisearch.masterKeyFile` is correctly configured for a working
           Meilisearch setup. You also need to configure Sharkey to use an API key obtained from Meilisearch with the
           `MK_CONFIG_MEILISEARCH_APIKEY` environment variable, and set `services.sharkey.settings.meilisearch.index` to
-          the created index. See https://docs.joinsharkey.org/docs/customisation/search/meilisearch/ for how to create
+          the created index. See <https://docs.joinsharkey.org/docs/customisation/search/meilisearch/> for how to create
           an API key and index.
         '';
       };
@@ -141,7 +141,7 @@ in
                 Which provider to use for full text search.
 
                 All options other than `sqlLike` require extra setup - see the comments in
-                https://activitypub.software/TransFem-org/Sharkey/-/blob/develop/.config/example.yml for details.
+                <https://activitypub.software/TransFem-org/Sharkey/-/blob/develop/.config/example.yml> for details.
 
                 If `sqlPgroonga` is set, and `services.sharkey.setupPostgres` is `true`, the pgroonga extension will
                 automatically be setup. You still need to create an index manually.
@@ -172,7 +172,7 @@ in
         description = ''
           Configuration options for Sharkey.
 
-          See https://activitypub.software/TransFem-org/Sharkey/-/blob/develop/.config/example.yml for a list of all
+          See <https://activitypub.software/TransFem-org/Sharkey/-/blob/develop/.config/example.yml> for a list of all
           available configuration options.
         '';
       };
diff --git a/nixos/modules/services/web-apps/stash.nix b/nixos/modules/services/web-apps/stash.nix
index 1d6f5cee9182..72d4d67cd6cf 100644
--- a/nixos/modules/services/web-apps/stash.nix
+++ b/nixos/modules/services/web-apps/stash.nix
@@ -221,7 +221,7 @@ let
       dangerous_allow_public_without_auth = mkOption {
         type = types.bool;
         default = false;
-        description = "Learn more at https://docs.stashapp.cc/networking/authentication-required-when-accessing-stash-from-the-internet/";
+        description = "Learn more at <https://docs.stashapp.cc/networking/authentication-required-when-accessing-stash-from-the-internet/>";
       };
       gallery_cover_regex = mkOption {
         type = types.str;
@@ -276,7 +276,7 @@ let
       security_tripwire_accessed_from_public_internet = mkOption {
         type = types.nullOr types.str;
         default = "";
-        description = "Learn more at https://docs.stashapp.cc/networking/authentication-required-when-accessing-stash-from-the-internet/";
+        description = "Learn more at <https://docs.stashapp.cc/networking/authentication-required-when-accessing-stash-from-the-internet/>";
       };
       sequential_scanning = mkOption {
         type = types.bool;
diff --git a/nixos/modules/services/web-apps/strfry.nix b/nixos/modules/services/web-apps/strfry.nix
index 84f7d5604bd4..9b78a73df8d7 100644
--- a/nixos/modules/services/web-apps/strfry.nix
+++ b/nixos/modules/services/web-apps/strfry.nix
@@ -92,7 +92,7 @@ in
       type = settingsFormat.type;
       default = defaultSettings;
       apply = lib.recursiveUpdate defaultSettings;
-      description = "Configuration options to set for the Strfry service. See https://github.com/hoytech/strfry for documentation.";
+      description = "Configuration options to set for the Strfry service. See <https://github.com/hoytech/strfry> for documentation.";
       example = lib.literalExpression ''
         dbParams = {
           maxreaders = 256;
diff --git a/nixos/modules/services/web-apps/youtrack.md b/nixos/modules/services/web-apps/youtrack.md
index f33f482ff970..2f65c9e5b511 100644
--- a/nixos/modules/services/web-apps/youtrack.md
+++ b/nixos/modules/services/web-apps/youtrack.md
@@ -15,7 +15,7 @@ You can find this token in the log of the `youtrack` service. The log line looks
 
 Starting with YouTrack 2023.1, JetBrains no longer distributes it as as JAR.
 The new distribution with the JetBrains Launcher as a ZIP changed the basic data structure and also some configuration parameters.
-Check out https://www.jetbrains.com/help/youtrack/server/YouTrack-Java-Start-Parameters.html for more information on the new configuration options.
+Check out <https://www.jetbrains.com/help/youtrack/server/YouTrack-Java-Start-Parameters.html> for more information on the new configuration options.
 When upgrading to YouTrack 2023.1 or higher, a migration script will move the old state directory to `/var/lib/youtrack/2022_3` as a backup.
 A one-time manual update is required:
 
diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix
index 919bdfa36718..66996312865c 100644
--- a/nixos/modules/services/web-servers/garage.nix
+++ b/nixos/modules/services/web-servers/garage.nix
@@ -74,7 +74,7 @@ in
             type = with types; either path (listOf attrs);
             description = ''
               The directory in which Garage will store the data blocks of objects. This folder can be placed on an HDD.
-              Since v0.9.0, Garage supports multiple data directories, refer to https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#data_dir for the exact format.
+              Since v0.9.0, Garage supports multiple data directories, refer to <https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#data_dir> for the exact format.
             '';
           };
         };
diff --git a/nixos/modules/services/web-servers/mighttpd2.nix b/nixos/modules/services/web-servers/mighttpd2.nix
index 3e2f61c170fa..09f5f847f74a 100644
--- a/nixos/modules/services/web-servers/mighttpd2.nix
+++ b/nixos/modules/services/web-servers/mighttpd2.nix
@@ -50,7 +50,7 @@ in
       type = types.lines;
       description = ''
         Verbatim config file to use
-        (see https://kazu-yamamoto.github.io/mighttpd2/config.html)
+        (see <https://kazu-yamamoto.github.io/mighttpd2/config.html>)
       '';
     };
 
@@ -84,7 +84,7 @@ in
       type = types.lines;
       description = ''
         Verbatim routing file to use
-        (see https://kazu-yamamoto.github.io/mighttpd2/config.html)
+        (see <https://kazu-yamamoto.github.io/mighttpd2/config.html>)
       '';
     };
 
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index ac30a88c860f..169c443d759a 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -240,7 +240,7 @@ with lib;
         IP address / port.
         If there is one server block configured to enable http2, then it is
         enabled for all server blocks on this IP.
-        See https://stackoverflow.com/a/39466948/263061.
+        See <https://stackoverflow.com/a/39466948/263061>.
       '';
     };
 
@@ -254,7 +254,7 @@ with lib;
         and activate the QUIC transport protocol
         `services.nginx.virtualHosts.<name>.quic = true;`.
         Note that HTTP/3 support is experimental and *not* yet recommended for production.
-        Read more at https://quic.nginx.org/
+        Read more at <https://quic.nginx.org/>
         HTTP/3 availability must be manually advertised, preferably in each location block.
       '';
     };
@@ -269,7 +269,7 @@ with lib;
         and activate the QUIC transport protocol
         `services.nginx.virtualHosts.<name>.quic = true;`.
         Note that special application protocol support is experimental and *not* yet recommended for production.
-        Read more at https://quic.nginx.org/
+        Read more at <https://quic.nginx.org/>
       '';
     };
 
@@ -282,7 +282,7 @@ with lib;
         which can be achieved by setting `services.nginx.package = pkgs.nginxQuic;`.
         Note that QUIC support is experimental and
         *not* yet recommended for production.
-        Read more at https://quic.nginx.org/
+        Read more at <https://quic.nginx.org/>
       '';
     };
 
diff --git a/nixos/modules/services/web-servers/send.nix b/nixos/modules/services/web-servers/send.nix
index 9c87fc1e6c98..a80cd15644f6 100644
--- a/nixos/modules/services/web-servers/send.nix
+++ b/nixos/modules/services/web-servers/send.nix
@@ -27,8 +27,8 @@ in
             ])
           );
         description = ''
-          All the available config options and their defaults can be found here: https://github.com/timvisee/send/blob/master/server/config.js,
-          some descriptions can found here: https://github.com/timvisee/send/blob/master/docs/docker.md#environment-variables
+          All the available config options and their defaults can be found here: <https://github.com/timvisee/send/blob/master/server/config.js>,
+          some descriptions can found here: <https://github.com/timvisee/send/blob/master/docs/docker.md#environment-variables>
 
           Values under {option}`services.send.environment` will override the predefined values in the Send service.
             - Time/duration should be in seconds
diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix
index 53c820e2947e..301f01b5cf48 100644
--- a/nixos/modules/services/web-servers/unit/default.nix
+++ b/nixos/modules/services/web-servers/unit/default.nix
@@ -76,7 +76,7 @@ in
             }
           }
         '';
-        description = "Unit configuration in JSON format. More details here https://unit.nginx.org/configuration";
+        description = "Unit configuration in JSON format. More details here <https://unit.nginx.org/configuration>";
       };
     };
   };
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix
index 5dfa85e4cd4c..809195667626 100644
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@@ -185,7 +185,7 @@ in
 
         description = ''
           Extra binary formats to register with the kernel.
-          See https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.html for more details.
+          See <https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.html> for more details.
         '';
 
         type = types.attrsOf (
diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
index eed72998f565..035462d10402 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@@ -172,7 +172,7 @@ in
       description = ''
         Whether to enable the systemd-boot (formerly gummiboot) EFI boot manager.
         For more information about systemd-boot:
-        https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/
+        <https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/>
       '';
     };
 
@@ -182,7 +182,7 @@ in
       description = ''
         The sort key used for the NixOS bootloader entries.
         This key determines sorting relative to non-NixOS entries.
-        See also https://uapi-group.org/specifications/specs/boot_loader_specification/#sorting
+        See also <https://uapi-group.org/specifications/specs/boot_loader_specification/#sorting>
 
         This option can also be used to control the sorting of NixOS specialisations.
 
@@ -384,7 +384,7 @@ in
 
         To control the ordering of the entry in the boot menu, use the sort-key
         field, see
-        https://uapi-group.org/specifications/specs/boot_loader_specification/#sorting
+        <https://uapi-group.org/specifications/specs/boot_loader_specification/#sorting>
         and {option}`boot.loader.systemd-boot.sortKey`.
       '';
     };
diff --git a/nixos/modules/system/boot/zram-as-tmp.nix b/nixos/modules/system/boot/zram-as-tmp.nix
index 2fcf7c73971c..194e7c1659ff 100644
--- a/nixos/modules/system/boot/zram-as-tmp.nix
+++ b/nixos/modules/system/boot/zram-as-tmp.nix
@@ -36,7 +36,7 @@ in
             then the zram device will have 256 MiB.
             Fractions in the range 0.1–0.5 are recommended
 
-            See: https://github.com/systemd/zram-generator/blob/main/zram-generator.conf.example
+            See: <https://github.com/systemd/zram-generator/blob/main/zram-generator.conf.example>
           '';
         };
 
@@ -47,7 +47,7 @@ in
           description = ''
             The compression algorithm to use for the zram device.
 
-            See: https://github.com/systemd/zram-generator/blob/main/zram-generator.conf.example
+            See: <https://github.com/systemd/zram-generator/blob/main/zram-generator.conf.example>
           '';
         };
 
@@ -58,7 +58,7 @@ in
           description = ''
             The file system to put on the device.
 
-            See: https://github.com/systemd/zram-generator/blob/main/zram-generator.conf.example
+            See: <https://github.com/systemd/zram-generator/blob/main/zram-generator.conf.example>
           '';
         };
 
@@ -70,7 +70,7 @@ in
             by setting "discard".
             Setting this to the empty string clears the option.
 
-            See: https://github.com/systemd/zram-generator/blob/main/zram-generator.conf.example
+            See: <https://github.com/systemd/zram-generator/blob/main/zram-generator.conf.example>
           '';
         };
       };
diff --git a/nixos/modules/virtualisation/docker-rootless.nix b/nixos/modules/virtualisation/docker-rootless.nix
index 6a13e4b916ee..92f8d132e923 100644
--- a/nixos/modules/virtualisation/docker-rootless.nix
+++ b/nixos/modules/virtualisation/docker-rootless.nix
@@ -45,7 +45,7 @@ in
       };
       description = ''
         Configuration for docker daemon. The attributes are serialized to JSON used as daemon.conf.
-        See https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file
+        See <https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file>
       '';
     };
 
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 58a8de8972d0..bba01002a749 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -78,7 +78,7 @@ in
       };
       description = ''
         Configuration for docker daemon. The attributes are serialized to JSON used as daemon.conf.
-        See https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file
+        See <https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file>
       '';
     };
 
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index a8cb398d52d4..d23299202b44 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -150,7 +150,7 @@ let
         description = ''
           Hooks that will be placed under /var/lib/libvirt/hooks/daemon.d/
           and called for daemon start/shutdown/SIGHUP events.
-          Please see https://libvirt.org/hooks.html for documentation.
+          Please see <https://libvirt.org/hooks.html> for documentation.
         '';
       };
 
@@ -160,7 +160,7 @@ let
         description = ''
           Hooks that will be placed under /var/lib/libvirt/hooks/qemu.d/
           and called for qemu domains begin/end/migrate events.
-          Please see https://libvirt.org/hooks.html for documentation.
+          Please see <https://libvirt.org/hooks.html> for documentation.
         '';
       };
 
@@ -170,7 +170,7 @@ let
         description = ''
           Hooks that will be placed under /var/lib/libvirt/hooks/lxc.d/
           and called for lxc domains begin/end events.
-          Please see https://libvirt.org/hooks.html for documentation.
+          Please see <https://libvirt.org/hooks.html> for documentation.
         '';
       };
 
@@ -180,7 +180,7 @@ let
         description = ''
           Hooks that will be placed under /var/lib/libvirt/hooks/libxl.d/
           and called for libxl-handled xen domains begin/end events.
-          Please see https://libvirt.org/hooks.html for documentation.
+          Please see <https://libvirt.org/hooks.html> for documentation.
         '';
       };
 
@@ -190,7 +190,7 @@ let
         description = ''
           Hooks that will be placed under /var/lib/libvirt/hooks/network.d/
           and called for networks begin/end events.
-          Please see https://libvirt.org/hooks.html for documentation.
+          Please see <https://libvirt.org/hooks.html> for documentation.
         '';
       };
     };
@@ -205,7 +205,7 @@ let
           This option enables the older libvirt NSS module. This method uses
           DHCP server records, therefore is dependent on the hostname provided
           by the guest.
-          Please see https://libvirt.org/nss.html for more information.
+          Please see <https://libvirt.org/nss.html> for more information.
         '';
       };
 
@@ -215,7 +215,7 @@ let
         description = ''
           This option enables the newer libvirt_guest NSS module. This module
           uses the libvirt guest name instead of the hostname of the guest.
-          Please see https://libvirt.org/nss.html for more information.
+          Please see <https://libvirt.org/nss.html> for more information.
         '';
       };
     };
diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix
index 55ad4b7ce94a..d5763a1867de 100644
--- a/nixos/modules/virtualisation/lxd.nix
+++ b/nixos/modules/virtualisation/lxd.nix
@@ -68,7 +68,7 @@ in
           running containers requiring many file operations.
           Fixes errors like "Too many open files" or
           "neighbour: ndisc_cache: neighbor table overflow!".
-          See https://lxd.readthedocs.io/en/latest/production-setup/
+          See <https://lxd.readthedocs.io/en/latest/production-setup/>
           for details.
         '';
       };
diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index fa353d41dc04..635df00b7b18 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -729,7 +729,7 @@ in
                   so that no overlapping UID/GID ranges are assigned to multiple containers.
                   This is the recommanded option as it enhances container security massively and operates fully automatically in most cases.
 
-                  See https://www.freedesktop.org/software/systemd/man/latest/systemd-nspawn.html#--private-users= for details.
+                  See <https://www.freedesktop.org/software/systemd/man/latest/systemd-nspawn.html#--private-users=> for details.
                 '';
               };
 
diff --git a/nixos/modules/virtualisation/podman/network-socket.nix b/nixos/modules/virtualisation/podman/network-socket.nix
index 8aad9cf7bef8..39434216d780 100644
--- a/nixos/modules/virtualisation/podman/network-socket.nix
+++ b/nixos/modules/virtualisation/podman/network-socket.nix
@@ -29,7 +29,7 @@ in
         This allows Docker clients to connect with the equivalents of the Docker
         CLI `-H` and `--tls*` family of options.
 
-        For certificate setup, see https://docs.docker.com/engine/security/protect-access/
+        For certificate setup, see <https://docs.docker.com/engine/security/protect-access/>
 
         This option is independent of [](#opt-virtualisation.podman.dockerSocket.enable).
       '';
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index 1ca612269303..d5b2949b762f 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -98,7 +98,7 @@ in
 
         This option is incompatible with `addNetworkInterface`.
 
-        Note: This is experimental. Please check https://github.com/cyberus-technology/virtualbox-kvm/issues.
+        Note: This is experimental. Please check <https://github.com/cyberus-technology/virtualbox-kvm/issues>.
       '';
     };
   };
diff --git a/nixos/modules/virtualisation/waagent.nix b/nixos/modules/virtualisation/waagent.nix
index 83e2248b7325..bb63506efa08 100644
--- a/nixos/modules/virtualisation/waagent.nix
+++ b/nixos/modules/virtualisation/waagent.nix
@@ -257,7 +257,7 @@ in
       type = settingsType;
       default = { };
       description = ''
-        The waagent.conf configuration, see https://learn.microsoft.com/en-us/azure/virtual-machines/extensions/agent-linux for documentation.
+        The waagent.conf configuration, see <https://learn.microsoft.com/en-us/azure/virtual-machines/extensions/agent-linux> for documentation.
       '';
     };
   };

From 1d70bcee60e3099f65ff1c6cc7742527b227b55c Mon Sep 17 00:00:00 2001
From: Jennings Zhang <dev@sl.jennin.xyz>
Date: Wed, 20 Aug 2025 21:23:17 -0400
Subject: [PATCH 3397/3724] helmfile: 1.1.4 -> 1.1.5

---
 pkgs/by-name/he/helmfile/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/he/helmfile/package.nix b/pkgs/by-name/he/helmfile/package.nix
index 5a32dcfd9f29..c4cadadab1bf 100644
--- a/pkgs/by-name/he/helmfile/package.nix
+++ b/pkgs/by-name/he/helmfile/package.nix
@@ -1,24 +1,24 @@
 {
   lib,
-  buildGoModule,
+  buildGo125Module,
   fetchFromGitHub,
   installShellFiles,
   makeWrapper,
   pluginsDir ? null,
 }:
 
-buildGoModule rec {
+buildGo125Module rec {
   pname = "helmfile";
-  version = "1.1.4";
+  version = "1.1.5";
 
   src = fetchFromGitHub {
     owner = "helmfile";
     repo = "helmfile";
     rev = "v${version}";
-    hash = "sha256-q0PIvTsl5wbzSNyrJbN6y8nB7yJB3NO2RAvWKr8hmNU=";
+    hash = "sha256-7A/WPBXk17HCAr9F7UZwNO2+N4tvtfPo9wNwtw1HKy4=";
   };
 
-  vendorHash = "sha256-frwwqVmkiWtA6eg4rcd/KbG5CiEoF+rRO66/6WMxawI=";
+  vendorHash = "sha256-CNvmIK8xUm1CdwdXU5FVUShmaA3CEgR4H7GmOH2KwzE=";
 
   proxyVendor = true; # darwin/linux hash mismatch
 

From 07a7ad711288acc7692120b0bf90dbf67568ad98 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 25 Aug 2025 09:23:25 +0200
Subject: [PATCH 3398/3724] python3Packages.reflex-chakra: 0.8.2post1 -> 0.8.2

Changelog: https://github.com/reflex-dev/reflex-chakra/releases/tag/v0.8.2
---
 .../python-modules/reflex-chakra/default.nix         | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix
index 9aa21d479820..83f5d1c1f5d4 100644
--- a/pkgs/development/python-modules/reflex-chakra/default.nix
+++ b/pkgs/development/python-modules/reflex-chakra/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   hatchling,
-  uv-dynamic-versioning,
   pythonOlder,
   reflex,
   pytestCheckHook,
@@ -11,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "reflex-chakra";
-  version = "0.8.2post1";
+  version = "0.8.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,18 +19,11 @@ buildPythonPackage rec {
     owner = "reflex-dev";
     repo = "reflex-chakra";
     tag = "v${version}";
-    hash = "sha256-DugZRZpGP90EFkBjpAS1XkjrNPG6WWwCQPUcEZJ0ff8=";
+    hash = "sha256-6KWIpTtr2tNBxXoj2hY0zuX0bpSUvsoA1Y7uwln3HDY=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail ', "uv-dynamic-versioning"' "" \
-      --replace-fail 'source = "uv-dynamic-versioning"' 'source = "env"${"\n"}variable = "version"'
-  '';
-
   build-system = [
     hatchling
-    uv-dynamic-versioning
   ];
   dependencies = [ reflex ];
 

From fe9914fc76de50f95f48ff2679bb217db064d99a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 25 Aug 2025 09:23:39 +0200
Subject: [PATCH 3399/3724] python3Packages.reflex-hosting-cli: 0.1.54 ->
 0.1.55

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

diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix
index f42a8a2e4d79..732580294bf9 100644
--- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix
+++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "reflex-hosting-cli";
-  version = "0.1.54";
+  version = "0.1.55";
   pyproject = true;
 
   # source is not published https://github.com/reflex-dev/reflex/issues/3762
   src = fetchPypi {
     pname = "reflex_hosting_cli";
     inherit version;
-    hash = "sha256-agfG9nKCvKqWUOfXZ54S25jMYPSg9oVItcu0PTbIoB4=";
+    hash = "sha256-9dWwwmzv3HujNWlUt75r+o7FAmfBOiJH9s8YoUDpWRg=";
   };
 
   pythonRelaxDeps = [

From f220a3ee983370ac266c3d21a330c6bb61ca927d Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 25 Aug 2025 13:07:18 +0200
Subject: [PATCH 3400/3724] python3Packages.returns: remove curio dependency

curio is not supported by anyio anymore as of v4
---
 pkgs/development/python-modules/returns/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/returns/default.nix b/pkgs/development/python-modules/returns/default.nix
index dc2a443f4a95..74b36df70095 100644
--- a/pkgs/development/python-modules/returns/default.nix
+++ b/pkgs/development/python-modules/returns/default.nix
@@ -2,7 +2,6 @@
   lib,
   anyio,
   buildPythonPackage,
-  curio,
   fetchFromGitHub,
   httpx,
   hypothesis,
@@ -42,7 +41,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     anyio
-    curio
     httpx
     hypothesis
     pytestCheckHook

From f177c2cbc7c99c6981e4ac1502c9a60b78b97d73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 17:23:13 +0000
Subject: [PATCH 3401/3724] python3Packages.fslpy: 3.21.1 -> 3.23.0

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

diff --git a/pkgs/development/python-modules/fslpy/default.nix b/pkgs/development/python-modules/fslpy/default.nix
index 48d828abea24..3edbf75a21de 100644
--- a/pkgs/development/python-modules/fslpy/default.nix
+++ b/pkgs/development/python-modules/fslpy/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "fslpy";
-  version = "3.21.1";
+  version = "3.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "fsl";
     repo = "fslpy";
     rev = "refs/tags/${version}";
-    hash = "sha256-O0bhzu6zZeuGJqXAwlgM8qHkgtaGCmg7xSkOqbZH2eA=";
+    hash = "sha256-lY/7TNOqGK0pRm5Rne1nrqXVQDZPkHwlZV9ITsOwp9Q=";
   };
 
   build-system = [ setuptools ];

From 6125d1cbe8723d98997bdd6c6ea3cb75864a7b9d Mon Sep 17 00:00:00 2001
From: Andrew Voynov <andrewvoynov.b@gmail.com>
Date: Mon, 25 Aug 2025 11:56:50 +0300
Subject: [PATCH 3402/3724] lf: 36 -> 37

Diff: https://github.com/gokcehan/lf/compare/r36...r37

Changelog: https://github.com/gokcehan/lf/releases/tag/r37
---
 pkgs/by-name/lf/lf/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lf/lf/package.nix b/pkgs/by-name/lf/lf/package.nix
index 455442217c06..e7be3b4c9b3a 100644
--- a/pkgs/by-name/lf/lf/package.nix
+++ b/pkgs/by-name/lf/lf/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "lf";
-  version = "36";
+  version = "37";
 
   src = fetchFromGitHub {
     owner = "gokcehan";
     repo = "lf";
     tag = "r${version}";
-    hash = "sha256-XvoCP1Ih+FLDhd1y4GB+J+8901zGpIXT1sf+Gfd+HLw=";
+    hash = "sha256-I7HmhksPj6I/MScjc+w/KYBZho6br+Sdshq71W0DUFQ=";
   };
 
-  vendorHash = "sha256-ZShpWCfEVPLafrn3MvtxkRsBvwUEOiLBs1gZhKSBrsQ=";
+  vendorHash = "sha256-T/UAhm+EnoT1rSdoWJXdSwbKKnXMdRit00E2/KmE3UU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 305fca7648009c3658a5b958cd318f63bcc7ef26 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 25 Aug 2025 19:18:08 +0200
Subject: [PATCH 3403/3724] python3Packages.dbt-common:
 1.23.0-unstable-2025-04-21 -> 1.28.0-unstable-2025-08-14

Changelog: https://github.com/dbt-labs/dbt-common/blob/main/CHANGELOG.md
---
 pkgs/development/python-modules/dbt-common/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix
index 2bcc80d74e12..d0829b2c34f3 100644
--- a/pkgs/development/python-modules/dbt-common/default.nix
+++ b/pkgs/development/python-modules/dbt-common/default.nix
@@ -7,6 +7,7 @@
   hatchling,
 
   # dependencies
+  dbt-protos,
   agate,
   colorama,
   deepdiff,
@@ -28,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "dbt-common";
-  version = "1.23.0-unstable-2025-04-21";
+  version = "1.28.0-unstable-2025-08-14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dbt-labs";
     repo = "dbt-common";
-    rev = "03e09c01f20573975e8e17776a4b7c9088b3f212"; # They don't tag releases
-    hash = "sha256-KqnwlFZZRYuWRflMzjrqCPBnzY9q/pPhceM2DGqz5bw=";
+    rev = "dd34e0a0565620863ff70c0b02421d84fcee8a02"; # They don't tag releases
+    hash = "sha256-hG6S+IIAR3Cu69oFapQUVoCdaiEQYeMQ/ekBuAXxPrI=";
   };
 
   build-system = [ hatchling ];
@@ -50,6 +51,7 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
+    dbt-protos
     agate
     colorama
     deepdiff
@@ -81,7 +83,7 @@ buildPythonPackage rec {
   meta = {
     description = "Shared common utilities for dbt-core and adapter implementations use";
     homepage = "https://github.com/dbt-labs/dbt-common";
-    changelog = "https://github.com/dbt-labs/dbt-common/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/dbt-labs/dbt-common/blob/main/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };

From c53fa9b4caa036eb549dbe9a29a07eeb80798af4 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 25 Aug 2025 19:23:51 +0200
Subject: [PATCH 3404/3724] python3Packages.dbt-adapters: 1.16.3 -> 1.16.5

Changelog: https://github.com/dbt-labs/dbt-adapters/blob/main/dbt-adapters/CHANGELOG.md
---
 pkgs/development/python-modules/dbt-adapters/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix
index ca491b9afbbe..bcfb16abff49 100644
--- a/pkgs/development/python-modules/dbt-adapters/default.nix
+++ b/pkgs/development/python-modules/dbt-adapters/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "dbt-adapters";
-  version = "1.16.3";
+  version = "1.16.5";
   pyproject = true;
 
   # missing tags on GitHub
   src = fetchPypi {
     pname = "dbt_adapters";
     inherit version;
-    hash = "sha256-1J0+V776ujbt8Anm/gAdld0MkC5apmeN8IEtzZBSWf8=";
+    hash = "sha256-OAPGC88WvBy/3sGyDO4pAHLYYe2+k7l7PpKpNcV+IdM=";
   };
 
   build-system = [ hatchling ];

From 040d073d6ddf9fa75493ca611076ba13e1a7357f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 25 Aug 2025 19:24:23 +0200
Subject: [PATCH 3405/3724] python3Packages.dbt-core: 1.10.6 -> 1.10.9

Changelog: https://github.com/dbt-labs/dbt-core/blob/v1.10.9/CHANGELOG.md
---
 pkgs/development/python-modules/dbt-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix
index 4fd76d96d919..61620c332ad5 100644
--- a/pkgs/development/python-modules/dbt-core/default.nix
+++ b/pkgs/development/python-modules/dbt-core/default.nix
@@ -37,14 +37,14 @@
 
 buildPythonPackage rec {
   pname = "dbt-core";
-  version = "1.10.6";
+  version = "1.10.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dbt-labs";
     repo = "dbt-core";
     tag = "v${version}";
-    hash = "sha256-tMrtn5NYkRpok6mv4/CBXGPQuHWpL/raejPXyagj7Bs=";
+    hash = "sha256-4K00EVTOTTUHWwTpBlXKoHGof/s/H2acoWZPJ9FmBuk=";
   };
 
   sourceRoot = "${src.name}/core";

From 1b29cf8afce46e95acdd6771a7d2acae8a6aa14f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 25 Aug 2025 19:24:51 +0200
Subject: [PATCH 3406/3724] python3Packages.dbt-extractor: 0.5.1 -> 0.6.0

Changelog: https://github.com/dbt-labs/dbt-extractor/blob/main/CHANGELOG.md
---
 pkgs/development/python-modules/dbt-extractor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dbt-extractor/default.nix b/pkgs/development/python-modules/dbt-extractor/default.nix
index b6b197680bfc..9474194a4eb3 100644
--- a/pkgs/development/python-modules/dbt-extractor/default.nix
+++ b/pkgs/development/python-modules/dbt-extractor/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "dbt-extractor";
-  version = "0.5.1";
+  version = "0.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,12 +18,12 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "dbt_extractor";
     inherit version;
-    hash = "sha256-zV2VV2qN6kGQJAqvmTajf9dLS3kTymmjw2j8RHK7fhM=";
+    hash = "sha256-1s8I7Hk7i8K9biYO+BgjCuaKT3FDb6SJ8I19saUuL/4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-luPAuRl+yrHinLs6H0ZRVnce2zz1DUrniVOCa1hu1S4=";
+    hash = "sha256-6Y4zfqhj1/IeEX+Ve49jblxeW565Q2ypNClb/Ej0xoc=";
   };
 
   nativeBuildInputs = [

From 1d744c458c7c047a27df5875976d50362d01ce5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 18:07:20 +0000
Subject: [PATCH 3407/3724] python3Packages.langchain-aws: 0.2.30 -> 0.2.31

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

diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index 637117d0ef40..3fd7fe81c479 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-aws";
-  version = "0.2.30";
+  version = "0.2.31";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-aws";
     tag = "langchain-aws==${version}";
-    hash = "sha256-Q69DAqdlddTaUMxw51dLb+CQt5HOsaumlU8mfkGWZkQ=";
+    hash = "sha256-oUCFVVHd35pTc0ViVWRf+h6+cHtx22du/xa0KgnBRtw=";
   };
 
   postPatch = ''

From 5c20d4dc2f8923bf868efe13ad24ec723798e662 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 17 Aug 2025 11:12:50 +0200
Subject: [PATCH 3408/3724] windows.mingw_w64_pthreads: put deprecation behind
 alias

---
 pkgs/os-specific/windows/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix
index 3cfdb8c7e85d..3a8813b15aaa 100644
--- a/pkgs/os-specific/windows/default.nix
+++ b/pkgs/os-specific/windows/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  config,
   stdenv,
   buildPackages,
   pkgs,
@@ -9,7 +10,9 @@
 }:
 
 lib.makeScope newScope (
-  self: with self; {
+  self:
+  with self;
+  {
     dlfcn = callPackage ./dlfcn { };
 
     mingw_w64 = callPackage ./mingw-w64 {
@@ -31,8 +34,6 @@ lib.makeScope newScope (
 
     mingw_w64_headers = callPackage ./mingw-w64/headers.nix { };
 
-    mingw_w64_pthreads = lib.warn "windows.mingw_w64_pthreads is deprecated, windows.pthreads should be preferred" self.pthreads;
-
     mcfgthreads = callPackage ./mcfgthreads { stdenv = crossThreadsStdenv; };
 
     npiperelay = callPackage ./npiperelay { };
@@ -43,4 +44,7 @@ lib.makeScope newScope (
 
     sdk = callPackage ./msvcSdk { };
   }
+  // lib.optionalAttrs config.allowAliases {
+    mingw_w64_pthreads = lib.warn "windows.mingw_w64_pthreads is deprecated, windows.pthreads should be preferred" self.pthreads;
+  }
 )

From 5a684c05024b8028573f38dd32e54c17de8a86cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 18:22:40 +0000
Subject: [PATCH 3409/3724] morewaita-icon-theme: 48.3.1 -> 48.4

---
 pkgs/by-name/mo/morewaita-icon-theme/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
index 76885e8baaf8..409e80bb3d52 100644
--- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix
+++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "morewaita-icon-theme";
-  version = "48.3.1";
+  version = "48.4";
 
   src = fetchFromGitHub {
     owner = "somepaulo";
     repo = "MoreWaita";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Gi73Cn/FwI055Inodo8huHeaWGTy9IR3qPMbjAHBsPw=";
+    hash = "sha256-c3wpxaANZL9SwYwUEHkW0bbv4VsdseuwORsC49kUSjg=";
   };
 
   postPatch = ''

From b9509c28270ae8374587b8cfb736a8b47f37810b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 17 Aug 2025 11:37:58 +0200
Subject: [PATCH 3410/3724] windows.sdk: move throw behind meta.license check

---
 pkgs/os-specific/windows/msvcSdk/default.nix | 164 ++++++++++---------
 1 file changed, 83 insertions(+), 81 deletions(-)

diff --git a/pkgs/os-specific/windows/msvcSdk/default.nix b/pkgs/os-specific/windows/msvcSdk/default.nix
index 17e0cce656a6..f57d2bf90de9 100644
--- a/pkgs/os-specific/windows/msvcSdk/default.nix
+++ b/pkgs/os-specific/windows/msvcSdk/default.nix
@@ -24,102 +24,104 @@ let
     else
       throw "Unsupported system";
 in
-if !config.microsoftVisualStudioLicenseAccepted then
-  throw ''
-    Microsoft Software License Terms are not accepted with config.microsoftVisualStudioLicenseAccepted.
-    Please read https://visualstudio.microsoft.com/license-terms/mt644918/ and if you agree, change your
-    config to indicate so.
-  ''
-else
-  stdenvNoCC.mkDerivation (finalAttrs: {
-    inherit version;
-    pname = "msvc-sdk";
-    dontUnpack = true;
+stdenvNoCC.mkDerivation (finalAttrs: {
+  inherit version;
+  pname = "msvc-sdk";
+  dontUnpack = true;
 
-    strictDeps = true;
-    nativeBuildInputs = [ xwin ];
+  strictDeps = true;
+  nativeBuildInputs = [ xwin ];
 
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-    outputHash = hashes.${arch};
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash =
+    if !config.microsoftVisualStudioLicenseAccepted then
+      throw ''
+        Microsoft Software License Terms are not accepted with config.microsoftVisualStudioLicenseAccepted.
+        Please read https://visualstudio.microsoft.com/license-terms/mt644918/ and if you agree, change your
+        config to indicate so.
+      ''
+    else
+      hashes.${arch};
 
-    __structuredAttrs = true;
-    xwinArgs = [
-      "--accept-license"
-      "--cache-dir=xwin-out"
-      "--manifest=${./manifest.json}"
-      "--arch=${arch}"
-      "splat"
-      "--preserve-ms-arch-notation"
-    ];
+  __structuredAttrs = true;
+  xwinArgs = [
+    "--accept-license"
+    "--cache-dir=xwin-out"
+    "--manifest=${./manifest.json}"
+    "--arch=${arch}"
+    "splat"
+    "--preserve-ms-arch-notation"
+  ];
 
-    buildPhase = ''
-      runHook preBuild
+  buildPhase = ''
+    runHook preBuild
 
-      xwin "''${xwinArgs[@]}"
-      mkdir "$out"
-      mv xwin-out/splat/* "$out"
+    xwin "''${xwinArgs[@]}"
+    mkdir "$out"
+    mv xwin-out/splat/* "$out"
 
-      runHook postBuild
-    '';
+    runHook postBuild
+  '';
 
-    dontFixup = true;
-    dontInstall = true;
+  dontFixup = true;
+  dontInstall = true;
 
-    passthru = {
-      updateScript = ./update.nu;
-      tests = {
-        hello-world = testers.runCommand {
-          name = "hello-msvc";
+  passthru = {
+    updateScript = ./update.nu;
+    tests = {
+      hello-world = testers.runCommand {
+        name = "hello-msvc";
 
-          nativeBuildInputs = [
-            llvmPackages.clang-unwrapped
-            llvmPackages.bintools-unwrapped
-          ];
+        nativeBuildInputs = [
+          llvmPackages.clang-unwrapped
+          llvmPackages.bintools-unwrapped
+        ];
 
-          script = ''
-            set -euo pipefail
+        script = ''
+          set -euo pipefail
 
-            cat > hello.c <<- EOF
-            #include <stdio.h>
+          cat > hello.c <<- EOF
+          #include <stdio.h>
 
-            int main(int argc, char* argv[]) {
-                printf("Hello world!\n");
-                return 0;
-            }
-            EOF
+          int main(int argc, char* argv[]) {
+              printf("Hello world!\n");
+              return 0;
+          }
+          EOF
 
-            clang-cl --target=x86_64-pc-windows-msvc -fuse-ld=lld \
-                /vctoolsdir ${finalAttrs.finalPackage}/crt \
-                /winsdkdir ${finalAttrs.finalPackage}/sdk \
-                ./hello.c -v
+          clang-cl --target=x86_64-pc-windows-msvc -fuse-ld=lld \
+              /vctoolsdir ${finalAttrs.finalPackage}/crt \
+              /winsdkdir ${finalAttrs.finalPackage}/sdk \
+              ./hello.c -v
 
-            if test ! -f hello.exe; then
-              echo "hello.exe not found!"
-              exit 1
-            else
-              touch $out
-            fi
-          '';
-        };
+          if test ! -f hello.exe; then
+            echo "hello.exe not found!"
+            exit 1
+          else
+            touch $out
+          fi
+        '';
       };
     };
+  };
 
-    meta = {
-      description = "MSVC SDK and Windows CRT for cross compiling";
-      homepage = "https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/";
-      maintainers = [ lib.maintainers.RossSmyth ];
-      license = {
-        deprecated = false;
-        fullName = "Microsoft Software License Terms";
-        shortName = "msvc";
-        spdxId = "unknown";
-        url = "https://www.visualstudio.com/license-terms/mt644918/";
-      };
-      platforms = lib.platforms.all;
-      # The arm32 manifest is missing critical pieces.
-      broken = stdenvNoCC.hostPlatform.isAarch32;
-      sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
-      teams = [ lib.teams.windows ];
+  meta = {
+    description = "MSVC SDK and Windows CRT for cross compiling";
+    homepage = "https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/";
+    maintainers = [ lib.maintainers.RossSmyth ];
+    license = {
+      deprecated = false;
+      fullName = "Microsoft Software License Terms";
+      shortName = "msvc";
+      spdxId = "unknown";
+      free = false;
+      url = "https://www.visualstudio.com/license-terms/mt644918/";
     };
-  })
+    platforms = lib.platforms.all;
+    # The arm32 manifest is missing critical pieces.
+    broken = stdenvNoCC.hostPlatform.isAarch32;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    teams = [ lib.teams.windows ];
+  };
+})

From 52e38450f49c2739ef0a2c41f9b8ffc7f9d643cc Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 17 Aug 2025 10:58:40 +0200
Subject: [PATCH 3411/3724] packages-config.nix: remove redundant package sets

these package set where already recoursed into
---
 pkgs/top-level/packages-config.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index b90bbcb080a8..eb69a04b807b 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -11,19 +11,15 @@
     with super;
     lib.mapAttrs (_: set: recurseIntoAttrs set) {
       inherit (super)
-        agdaPackages
-        apacheHttpdPackages
         fusePackages
         gns3Packages
         haskellPackages
-        idrisPackages
         nodePackages
         nodePackages_latest
         platformioPackages
         rPackages
         roundcubePlugins
         sourceHanPackages
-        zabbix60
         windows
         ;
 

From 36753867a59072e493c94d7f6a2b054b6eeecac5 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 25 Aug 2025 20:13:06 +0200
Subject: [PATCH 3412/3724] python3Packages.dbt-snowflake: 1.9.1 -> 1.10.0

---
 .../python-modules/dbt-snowflake/default.nix  | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix
index 9bd0f8552020..4f824570cdd5 100644
--- a/pkgs/development/python-modules/dbt-snowflake/default.nix
+++ b/pkgs/development/python-modules/dbt-snowflake/default.nix
@@ -2,25 +2,29 @@
   lib,
   buildPythonPackage,
   dbt-core,
-  fetchFromGitHub,
+  fetchPypi,
   pytestCheckHook,
-  setuptools,
+  hatchling,
   snowflake-connector-python,
 }:
 
 buildPythonPackage rec {
   pname = "dbt-snowflake";
-  version = "1.9.1";
+  version = "1.10.0";
   pyproject = true;
 
-  src = fetchFromGitHub {
-    owner = "dbt-labs";
-    repo = "dbt-snowflake";
-    tag = "v${version}";
-    hash = "sha256-oPzSdAQgb2fKES3YcSGYjILFqixxxjdLCNVytVPecTg=";
+  # missing tags on GitHub
+  src = fetchPypi {
+    pname = "dbt_snowflake";
+    inherit version;
+    hash = "sha256-Y5H7ATm8bntl4YaF5l9DZiRhHt2q2/XaICp+PR9ywIw=";
   };
 
-  build-system = [ setuptools ];
+  pythonRelaxDeps = [
+    "certifi"
+  ];
+
+  build-system = [ hatchling ];
 
   dependencies = [
     dbt-core
@@ -32,12 +36,17 @@ buildPythonPackage rec {
 
   enabledTestPaths = [ "tests/unit" ];
 
+  pytestFlagsArray = [
+    # pyproject.toml specifies -n auto which only pytest-xdist understands
+    "--override-ini addopts=''"
+  ];
+
   pythonImportsCheck = [ "dbt.adapters.snowflake" ];
 
   meta = {
     description = "Plugin enabling dbt to work with Snowflake";
-    homepage = "https://github.com/dbt-labs/dbt-snowflake";
-    changelog = "https://github.com/dbt-labs/dbt-snowflake/blob/${src.tag}/CHANGELOG.md";
+    homepage = "https://github.com/dbt-labs/dbt-adapters/blob/main/dbt-snowflake";
+    changelog = "https://github.com/dbt-labs/dbt-adapters/blob/main/dbt-snowflake/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ tjni ];
   };

From a96d5a3b0baaff941a89b38f5a3141fa03ecff9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 18:46:26 +0000
Subject: [PATCH 3413/3724] vdrPlugins.softhddevice: 2.4.5 -> 2.4.6

---
 pkgs/applications/video/vdr/softhddevice/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix
index 814b4b5e971b..3ccce10e05a2 100644
--- a/pkgs/applications/video/vdr/softhddevice/default.nix
+++ b/pkgs/applications/video/vdr/softhddevice/default.nix
@@ -15,12 +15,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "vdr-softhddevice";
-  version = "2.4.5";
+  version = "2.4.6";
 
   src = fetchFromGitHub {
     owner = "ua0lnj";
     repo = "vdr-plugin-softhddevice";
-    sha256 = "sha256-G5pOSlO1FU7kvHwH1yw8UBEeDwQ5aIxubdyFcWQ2Z/8=";
+    sha256 = "sha256-69mLiu/v+iZntrGvL0eNE/dDQwRVIlg5MfsNTr52Ots=";
     rev = "v${version}";
   };
 

From e99fb95853f427b407e122f025a3b9dce957d066 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 18:52:00 +0000
Subject: [PATCH 3414/3724] python3Packages.django-sesame: 3.2.2 -> 3.2.3

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

diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix
index 16a1a8844fe7..0cd763507429 100644
--- a/pkgs/development/python-modules/django-sesame/default.nix
+++ b/pkgs/development/python-modules/django-sesame/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "django-sesame";
-  version = "3.2.2";
+  version = "3.2.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "aaugustin";
     repo = "django-sesame";
     tag = version;
-    hash = "sha256-8jbYhD/PfPnutJZonmdrqLIQdXiUHF12w0M9tuyyDz0=";
+    hash = "sha256-JpbmcV5hAZkW15cizsAJhmTda4xtML0EY/PJdVSInUs=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From c7cc51db098be356f782fd98a08666e3fcf53f7a Mon Sep 17 00:00:00 2001
From: Alexandre Abreu <git@abreu.id>
Date: Mon, 25 Aug 2025 19:47:19 +0100
Subject: [PATCH 3415/3724] vintagestory: 1.21.0-rc.7 -> 1.21.0

---
 pkgs/by-name/vi/vintagestory/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 84fab6ea8e74..dec4ab0b33b3 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "vintagestory";
-  version = "1.21.0-rc.7";
+  version = "1.21.0";
 
   src = fetchurl {
-    url = "https://cdn.vintagestory.at/gamefiles/unstable/vs_client_linux-x64_${version}.tar.gz";
-    hash = "sha256-uoQjsSzQQ/4JjhPCDp3VWV0NCQsM5lca7VKB8OnKtYA=";
+    url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
+    hash = "sha256-90YQOur7UhXxDBkGLSMnXQK7iQ6+Z8Mqx9PEG6FEXBs=";
   };
 
   nativeBuildInputs = [

From a7575e30dfc923804ff534ac436c6c638710dba1 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Mon, 25 Aug 2025 20:56:48 +0200
Subject: [PATCH 3416/3724] basalt-monado: do not use cudatoolkit, use
 cuda_nvcc

---
 pkgs/by-name/ba/basalt-monado/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix
index ee2294f50879..3a1acbf76abc 100644
--- a/pkgs/by-name/ba/basalt-monado/package.nix
+++ b/pkgs/by-name/ba/basalt-monado/package.nix
@@ -60,13 +60,15 @@ stdenv.mkDerivation {
     opencv.cxxdev
     tbb
     xorg.libX11
+  ]
+  ++ lib.optionals enableCuda [
+    cudaPackages.cuda_nvcc
   ];
 
   cmakeFlags = [
     (lib.cmakeBool "BASALT_INSTANTIATIONS_DOUBLE" false)
     (lib.cmakeBool "BUILD_TESTS" false)
     (lib.cmakeFeature "EIGEN_ROOT" "${eigen}/include/eigen3")
-    (lib.optionals enableCuda "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}")
   ];
 
   passthru.updateScript = nix-update-script { };

From 1546f04d1e9f7fd7107c23c6bc3012044e5ff9da Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Mon, 25 Aug 2025 20:57:09 +0200
Subject: [PATCH 3417/3724] monado: do not use cudatoolkit, use
 cuda_nvcc+cuda_cudart

---
 pkgs/by-name/mo/monado/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix
index aff6ab89d4c5..5cc46c2ac552 100644
--- a/pkgs/by-name/mo/monado/package.nix
+++ b/pkgs/by-name/mo/monado/package.nix
@@ -143,6 +143,10 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals tracingSupport [
     tracy
+  ]
+  ++ lib.optionals enableCuda [
+    cudaPackages.cuda_nvcc
+    cudaPackages.cuda_cudart
   ];
 
   cmakeFlags = [
@@ -151,7 +155,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "XRT_FEATURE_TRACING" tracingSupport)
     (lib.cmakeBool "XRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH" true)
     (lib.cmakeBool "XRT_HAVE_STEAM" true)
-    (lib.optionals enableCuda "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}")
   ];
 
   # Help openxr-loader find this runtime

From 373d3e93b9cc0f6a283bc4f7c898619e021c0f5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Fri, 22 Aug 2025 18:33:35 +0700
Subject: [PATCH 3418/3724] ocamlPackages.multicore-magic-dscheck: init at
 ocamlPackages.multicore-magic.version

---
 .../ocaml-modules/multicore-magic/dscheck.nix | 20 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/multicore-magic/dscheck.nix

diff --git a/pkgs/development/ocaml-modules/multicore-magic/dscheck.nix b/pkgs/development/ocaml-modules/multicore-magic/dscheck.nix
new file mode 100644
index 000000000000..28b36b422bc0
--- /dev/null
+++ b/pkgs/development/ocaml-modules/multicore-magic/dscheck.nix
@@ -0,0 +1,20 @@
+{
+  lib,
+  buildDunePackage,
+  dscheck,
+  multicore-magic,
+}:
+
+buildDunePackage {
+  pname = "multicore-magic-dscheck";
+
+  inherit (multicore-magic) src version;
+
+  propagatedBuildInputs = [
+    dscheck
+  ];
+
+  meta = multicore-magic.meta // {
+    description = "Implementation of multicore-magic API using the atomic module of DScheck to make DScheck tests possible in libraries using multicore-magic";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index f82442ec2c34..5d74adccdaa9 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1323,6 +1323,7 @@ let
         multicore-bench = callPackage ../development/ocaml-modules/multicore-bench { };
 
         multicore-magic = callPackage ../development/ocaml-modules/multicore-magic { };
+        multicore-magic-dscheck = callPackage ../development/ocaml-modules/multicore-magic/dscheck.nix { };
 
         multipart_form = callPackage ../development/ocaml-modules/multipart_form { };
 

From e2b24c1d9d23e16424b5f51eebdd0e427b9c0042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Fri, 22 Aug 2025 18:20:15 +0700
Subject: [PATCH 3419/3724] =?UTF-8?q?ocamlPackages.saturn:=200.5.0=20?=
 =?UTF-8?q?=E2=86=92=201.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Seems versions have diverged from saturn_lockfree
---
 .../ocaml-modules/saturn/default.nix          | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/saturn/default.nix b/pkgs/development/ocaml-modules/saturn/default.nix
index 85eb26776707..afd2dd6018c6 100644
--- a/pkgs/development/ocaml-modules/saturn/default.nix
+++ b/pkgs/development/ocaml-modules/saturn/default.nix
@@ -1,35 +1,55 @@
 {
   lib,
-  buildDunePackage,
+  fetchurl,
   ocaml,
-  saturn_lockfree,
+  version ? "1.0.0",
+  buildDunePackage,
+  backoff,
   domain_shims,
   dscheck,
+  mdx,
   multicore-bench,
+  multicore-magic,
+  multicore-magic-dscheck,
   qcheck,
   qcheck-alcotest,
   qcheck-stm,
 }:
 
 buildDunePackage {
+  inherit version;
+
   pname = "saturn";
 
-  inherit (saturn_lockfree) src version;
+  minimalOCamlVersion = "4.14";
 
-  propagatedBuildInputs = [ saturn_lockfree ];
+  src = fetchurl {
+    url = "https://github.com/ocaml-multicore/saturn/releases/download/${version}/saturn-${version}.tbz";
+    sha512 = "925104a4293326d345701e80932ace2b5d2da02ca6406271d33cd54f9e9c6583f35b060bc42c640357c98669f5bc42e8447dbd21614ae02ce5b5efaa8f04a132";
+  };
 
-  doCheck = lib.versionAtLeast ocaml.version "5.0";
+  propagatedBuildInputs = [
+    backoff
+    multicore-magic
+  ];
+
+  doCheck = lib.versionAtLeast ocaml.version "5.2";
   checkInputs = [
     domain_shims
     dscheck
+    mdx
     multicore-bench
+    multicore-magic-dscheck
     qcheck
     qcheck-alcotest
     qcheck-stm
   ];
+  nativeCheckInputs = [ mdx.bin ];
 
-  meta = saturn_lockfree.meta // {
+  meta = {
     description = "Parallelism-safe data structures for multicore OCaml";
+    homepage = "https://github.com/ocaml-multicore/lockfree";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
   };
-
 }

From b3ee7ce66f58982ed6695b486d4f1d8c7e6b6fc2 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 25 Aug 2025 21:05:35 +0200
Subject: [PATCH 3420/3724] uv-sort: unbreak

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

diff --git a/pkgs/by-name/uv/uv-sort/package.nix b/pkgs/by-name/uv/uv-sort/package.nix
index ed3e901a7efc..2e6cd323b6a5 100644
--- a/pkgs/by-name/uv/uv-sort/package.nix
+++ b/pkgs/by-name/uv/uv-sort/package.nix
@@ -17,6 +17,11 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-umKMcQcQST0bBGf7ZXxNcWq/5/ht3jp+3JVjowBdeO0=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail '"packaging~=24.1"' '"packaging"'
+  '';
+
   build-system = with python3Packages; [
     hatchling
     uv-dynamic-versioning

From 0a96b5228760df297ea15cb65fc5b8def279f608 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 19:20:38 +0000
Subject: [PATCH 3421/3724] linuxKernel.kernels.linux_lqx: 6.15.10 -> 6.16.3

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

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 93f49062f347..6726f6de2e33 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -23,9 +23,9 @@ let
     };
     # ./update-zen.py lqx
     lqx = {
-      version = "6.15.10"; # lqx
+      version = "6.16.3"; # lqx
       suffix = "lqx1"; # lqx
-      sha256 = "1z8mixavfq5yylyv9j0g7m25jbrfjqfs4c2h9ibgky0fk701fchk"; # lqx
+      sha256 = "0y7ym3kcy936p3kz71dx411l7pms53cfqbq8h8dp9vxw9vhjkh5n"; # lqx
       isLqx = true;
     };
   };

From 6077545d049338011b07f73183018b67ffccc9c4 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 25 Aug 2025 18:32:26 +0100
Subject: [PATCH 3422/3724] nixos/tests/containers-imperative: enable
 containers explicitly

---
 nixos/tests/containers-imperative.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 630bcbdf64be..bc0842189e12 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -19,6 +19,8 @@
     {
       imports = [ ../modules/installer/cd-dvd/channel.nix ];
 
+      boot.enableContainers = true;
+
       # XXX: Sandbox setup fails while trying to hardlink files from the host's
       #      store file system into the prepared chroot directory.
       nix.settings.sandbox = false;

From 42a1d455ce491d087e038c183a10590d5397b0e7 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 25 Aug 2025 18:32:26 +0100
Subject: [PATCH 3423/3724] nixos/doc/imperative-containers: add
 `boot.enableContainers` note

---
 .../doc/manual/administration/imperative-containers.section.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/administration/imperative-containers.section.md b/nixos/doc/manual/administration/imperative-containers.section.md
index 852305ad8148..3ea78c63ea08 100644
--- a/nixos/doc/manual/administration/imperative-containers.section.md
+++ b/nixos/doc/manual/administration/imperative-containers.section.md
@@ -2,7 +2,7 @@
 
 We'll cover imperative container management using `nixos-container`
 first. Be aware that container management is currently only possible as
-`root`.
+`root`, and that you need to enable [](#opt-boot.enableContainers) explicitly.
 
 You create a container with identifier `foo` as follows:
 

From 67eb21483d59f63f7f1884926af124684e72f078 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 25 Aug 2025 18:32:26 +0100
Subject: [PATCH 3424/3724] =?UTF-8?q?nixos/treewide:=20don=E2=80=99t=20red?=
 =?UTF-8?q?undantly=20disable=20`boot.enableContainers`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nixos/modules/profiles/minimal.nix      | 3 ---
 nixos/modules/profiles/perlless.nix     | 1 -
 nixos/tests/disable-installer-tools.nix | 1 -
 3 files changed, 5 deletions(-)

diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index ddeca9601e66..e013418c386c 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -30,9 +30,6 @@ in
     fish.generateCompletions = mkDefault false;
   };
 
-  # This pulls in nixos-containers which depends on Perl.
-  boot.enableContainers = mkDefault false;
-
   services = {
     logrotate.enable = mkDefault false;
     udisks2.enable = mkDefault false;
diff --git a/nixos/modules/profiles/perlless.nix b/nixos/modules/profiles/perlless.nix
index 73758a7bed9e..8df815a92443 100644
--- a/nixos/modules/profiles/perlless.nix
+++ b/nixos/modules/profiles/perlless.nix
@@ -11,7 +11,6 @@
   system.tools.nixos-generate-config.enable = lib.mkDefault false;
   programs.less.lessopen = lib.mkDefault null;
   programs.command-not-found.enable = lib.mkDefault false;
-  boot.enableContainers = lib.mkDefault false;
   boot.loader.grub.enable = lib.mkDefault false;
   environment.defaultPackages = lib.mkDefault [ ];
   documentation.info.enable = lib.mkDefault false;
diff --git a/nixos/tests/disable-installer-tools.nix b/nixos/tests/disable-installer-tools.nix
index ac8fa4cbf46a..902b9f0ff505 100644
--- a/nixos/tests/disable-installer-tools.nix
+++ b/nixos/tests/disable-installer-tools.nix
@@ -11,7 +11,6 @@
     { pkgs, lib, ... }:
     {
       system.disableInstallerTools = true;
-      boot.enableContainers = false;
       environment.defaultPackages = [ ];
     };
 

From 2c98ea1e3309989842c01eede6b744ffe68d301b Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Sun, 24 Aug 2025 21:39:10 +0300
Subject: [PATCH 3425/3724] nixos/systemd: add upstream units for boot counting

These units are needed to be able to experiment with systemd's boot counting
functionality (e.g. with out-of-tree bootloaders like lanzaboote), and they
cannot easily be added through configuration without patching nixpkgs.
They are basically a no-op when boot entries do not contain any
counters, so AFAICT there is no disadvantage to them being enabled by default.
---
 nixos/modules/system/boot/systemd.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 56f6b006eb6b..153ee54cb4b2 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -113,6 +113,10 @@ let
     "systemd-rfkill.service"
     "systemd-rfkill.socket"
 
+    # Boot counting
+    "boot-complete.target"
+    "systemd-bless-boot.service"
+
     # Hibernate / suspend.
     "hibernate.target"
     "suspend.target"

From 0f06b7840b8051db64c5f77c82b989fc41dec325 Mon Sep 17 00:00:00 2001
From: tomasguinzburg <tomasguinzburg@gmail.com>
Date: Mon, 25 Aug 2025 21:20:47 +0200
Subject: [PATCH 3426/3724] maintainers: add sodagunz

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 388a3a8a1332..190da1df0cac 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23954,6 +23954,12 @@
     githubId = 55726;
     name = "Stanislav Ochotnický";
   };
+  sodagunz = {
+    name = "sodagunz";
+    github = "sodagunz";
+    githubId = 19618127;
+    email = "sodagunz+nixpkgs@proton.me";
+  };
   sodiboo = {
     name = "sodiboo";
     github = "sodiboo";

From c9f9798863d34b5090382ec67fb454d6280cefa3 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Mon, 25 Aug 2025 19:22:43 +0000
Subject: [PATCH 3427/3724] vector: Add fix for Rust 1.89 elided lifetimes

---
 pkgs/by-name/ve/vector/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 01bf2d38bb07..be1442314a8c 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   rustPlatform,
   pkg-config,
   openssl,
@@ -63,6 +64,14 @@ rustPlatform.buildRustPackage {
     zlib
   ];
 
+  patches = [
+    (fetchpatch {
+      name = "1.89-mismatched-lifetime-syntaxes.patch";
+      url = "https://patch-diff.githubusercontent.com/raw/vectordotdev/vector/pull/23645.patch";
+      hash = "sha256-2ADlF4/Z1uR3LR6608lA4tseh+MnHb097PACD/Nq6/0=";
+    })
+  ];
+
   # Rust 1.80.0 introduced the unexepcted_cfgs lint, which requires crates to allowlist custom cfg options that they inspect.
   # Upstream is working on fixing this in https://github.com/vectordotdev/vector/pull/20949, but silencing the lint lets us build again until then.
   # TODO remove when upgrading Vector

From ad4ac7026f88ff1a576dbcad8b67b36fa86c0ed8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 12:47:53 +0000
Subject: [PATCH 3428/3724] python3Packages.rivet: 4.1.0 -> 4.1.1

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

diff --git a/pkgs/by-name/ri/rivet/package.nix b/pkgs/by-name/ri/rivet/package.nix
index 6d7ad79dfdba..8cd54f03583d 100644
--- a/pkgs/by-name/ri/rivet/package.nix
+++ b/pkgs/by-name/ri/rivet/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rivet";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
-    hash = "sha256-ZUijUaROWkMD+yJ351IWkKnYQZXfltkscHuBbztAyEM=";
+    hash = "sha256-vR1RM1XD9y8PiKly853Z8RRM6uLLRyVC5dMGD+q08cw=";
   };
 
   latex = texliveBasic.withPackages (

From 01d8accd9ad67d83fb392442de6aa58af3adf900 Mon Sep 17 00:00:00 2001
From: Sander <hey@sandydoo.me>
Date: Mon, 25 Aug 2025 15:17:48 +0200
Subject: [PATCH 3429/3724] devenv: upgrade nix version for 1.8.2

---
 pkgs/by-name/de/devenv/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index b50a71452fe2..5304121eaa18 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -15,22 +15,24 @@
 }:
 
 let
+  version = "1.8.2";
+  devenvNixVersion = "2.30.4";
+
   devenv_nix =
     (nixVersions.git.overrideSource (fetchFromGitHub {
       owner = "cachix";
       repo = "nix";
-      rev = "031c3cf42d2e9391eee373507d8c12e0f9606779";
-      hash = "sha256-dOi/M6yNeuJlj88exI+7k154z+hAhFcuB8tZktiW7rg=";
+      rev = "devenv-${devenvNixVersion}";
+      hash = "sha256-3+GHIYGg4U9XKUN4rg473frIVNn8YD06bjwxKS1IPrU=";
     })).overrideAttrs
       (old: {
-        version = "2.30-devenv";
+        pname = "devenv-nix";
+        version = devenvNixVersion;
         doCheck = false;
         doInstallCheck = false;
         # do override src, but the Nix way so the warning is unaware of it
         __intentionallyOverridingVersion = true;
       });
-
-  version = "1.8.2";
 in
 rustPlatform.buildRustPackage {
   pname = "devenv";

From ad42cbffa00bd75d1b3f07022fe56e236ce9e019 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 19:45:22 +0000
Subject: [PATCH 3430/3724] python3Packages.python-ecobee-api: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix
index 942497db0cde..3ccbd71be866 100644
--- a/pkgs/development/python-modules/python-ecobee-api/default.nix
+++ b/pkgs/development/python-modules/python-ecobee-api/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "python-ecobee-api";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "nkgilley";
     repo = "python-ecobee-api";
     tag = version;
-    hash = "sha256-dJ7dVceYfmJHvk2OEXtRW/U8h2jFDc2aC58WmqhyP+k=";
+    hash = "sha256-7AFt5WHtAr1DRG1kjmUwYMHVwbonltNvzgewDuFa6Tk=";
   };
 
   build-system = [ setuptools ];

From 8a0bda1b766c7c78e2d436db970ca82fccec0843 Mon Sep 17 00:00:00 2001
From: tomasguinzburg <tomasguinzburg@gmail.com>
Date: Mon, 25 Aug 2025 21:21:14 +0200
Subject: [PATCH 3431/3724] ncspot: 1.3.0 -> 1.3.1

---
 pkgs/by-name/nc/ncspot/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix
index 1f30a2a9be02..e64aa1d7241c 100644
--- a/pkgs/by-name/nc/ncspot/package.nix
+++ b/pkgs/by-name/nc/ncspot/package.nix
@@ -30,19 +30,18 @@
   withShareSelection ? false,
   withTermion ? false,
 }:
-
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ncspot";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "hrkfdn";
     repo = "ncspot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FSMQv2443oPQjMSv68ppfI2ZTUG79b+GcXmHNAmjPZk=";
+    hash = "sha256-bKwpvkaYIFK4USxAfx/Vudu7KlT3WP5rKQ1f5lQFbtc=";
   };
 
-  cargoHash = "sha256-Qjsn3U9KZr5qZliJ/vbudfkH1uOng1N5c8dAyH+Y5vQ=";
+  cargoHash = "sha256-FepaUgwOaQKW+0ugGDbqFmZmVPL7wqVaYyLk5UjND2o=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3;
 
@@ -95,6 +94,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       liff
       getchoo
+      sodagunz
     ];
     mainProgram = "ncspot";
   };

From 71df0dfb93694b4a0d754133b977913dda9ac441 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 25 Aug 2025 12:47:46 -0700
Subject: [PATCH 3432/3724] python3Packages.bork: fix build

The `bork` build broke when `build` [updated], so this commit un-borks `bork` by relaxing the build requirement on `build`.

Yes, I do think I'm clever, why do you ask?

[updated]: e1338b72675e
---
 pkgs/development/python-modules/bork/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix
index 83a8c6ccc59f..44060463c25f 100644
--- a/pkgs/development/python-modules/bork/default.nix
+++ b/pkgs/development/python-modules/bork/default.nix
@@ -34,6 +34,7 @@ buildPythonPackage rec {
   ];
 
   pythonRelaxDeps = [
+    "build"
     "packaging"
     "urllib3"
   ];

From 92c4de8b0abe16d228907089d353315561a13e5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 19:52:37 +0000
Subject: [PATCH 3433/3724] iroh: 0.91.0 -> 0.91.2

---
 pkgs/by-name/ir/iroh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix
index 93bad8bb7758..db1755a662d9 100644
--- a/pkgs/by-name/ir/iroh/package.nix
+++ b/pkgs/by-name/ir/iroh/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "iroh";
-  version = "0.91.0";
+  version = "0.91.2";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "iroh";
     rev = "v${version}";
-    hash = "sha256-eY/w3YBuNPsCDhu58S7cykFCY0ikpMR4RFWHVMjH33Q=";
+    hash = "sha256-O1hWQNBLUqkBPoaW1lxmTrai+lktIAFgPX2Qa3y5HPc=";
   };
 
-  cargoHash = "sha256-tkqomIOOfPSbyNMNJskqZLXdU8uDK91f9IGjhz+q300=";
+  cargoHash = "sha256-CgEit1HR6w0Y5SmSpErJnag3vaNgyocymLaM4RjYIBo=";
 
   # Some tests require network access which is not available in nix build sandbox.
   doCheck = false;

From 0da508a78bee17b26fc037fcaff7bfc0ca8872de Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Tue, 26 Aug 2025 04:01:37 +0800
Subject: [PATCH 3434/3724] dsd,itpp: drop

The software build has failed. It has no maintainer, the upstream project has not been updated for years, and it is difficult to maintain. It should be removed.
---
 pkgs/by-name/ds/dsd/package.nix  | 49 --------------------------
 pkgs/by-name/it/itpp/package.nix | 59 --------------------------------
 pkgs/top-level/aliases.nix       |  2 ++
 3 files changed, 2 insertions(+), 108 deletions(-)
 delete mode 100644 pkgs/by-name/ds/dsd/package.nix
 delete mode 100644 pkgs/by-name/it/itpp/package.nix

diff --git a/pkgs/by-name/ds/dsd/package.nix b/pkgs/by-name/ds/dsd/package.nix
deleted file mode 100644
index eb5aaa2cc0bb..000000000000
--- a/pkgs/by-name/ds/dsd/package.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  mbelib,
-  libsndfile,
-  itpp,
-  portaudioSupport ? true,
-  portaudio ? null,
-}:
-
-assert portaudioSupport -> portaudio != null;
-
-stdenv.mkDerivation {
-  pname = "dsd";
-  version = "2022-03-14";
-
-  src = fetchFromGitHub {
-    owner = "szechyjs";
-    repo = "dsd";
-    rev = "59423fa46be8b41ef0bd2f3d2b45590600be29f0";
-    sha256 = "128gvgkanvh4n5bjnzkfk419hf5fdbad94fb8d8lv67h94vfchyd";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [
-    mbelib
-    libsndfile
-    itpp
-  ]
-  ++ lib.optionals portaudioSupport [ portaudio ];
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "Digital Speech Decoder";
-    longDescription = ''
-      DSD is able to decode several digital voice formats from discriminator
-      tap audio and synthesize the decoded speech. Speech synthesis requires
-      mbelib, which is a separate package.
-    '';
-    homepage = "https://github.com/szechyjs/dsd";
-    license = licenses.gpl2;
-    platforms = platforms.unix;
-    maintainers = [ ];
-    mainProgram = "dsd";
-  };
-}
diff --git a/pkgs/by-name/it/itpp/package.nix b/pkgs/by-name/it/itpp/package.nix
deleted file mode 100644
index e419a181dd68..000000000000
--- a/pkgs/by-name/it/itpp/package.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  cmake,
-  gtest,
-  blas,
-  fftw,
-  liblapack,
-  gfortran,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "it++";
-  version = "4.3.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/itpp/itpp-${version}.tar.bz2";
-    sha256 = "0xxqag9wi0lg78xgw7b40rp6wxqp5grqlbs9z0ifvdfzqlhpcwah";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    gfortran
-  ];
-  buildInputs = [
-    fftw
-    liblapack
-
-    # NOTE: OpenBLAS doesn't work here because IT++ doesn't pass aligned
-    # buffers, which causes segfaults in the optimized kernels :-(
-    blas
-  ];
-
-  cmakeFlags = [
-    "-DCMAKE_CXX_FLAGS=-std=c++14"
-    "-DBLAS_FOUND:BOOL=TRUE"
-    "-DBLAS_LIBRARIES:STRING=${blas}/lib/libblas.so"
-    "-DLAPACK_FOUND:BOOL=TRUE"
-    "-DLAPACK_LIBRARIES:STRING=${liblapack}/lib/liblapack.so"
-    "-DGTEST_DIR:PATH=${gtest.src}/googletest"
-  ];
-
-  doCheck = true;
-
-  checkPhase = ''
-    ./gtests/itpp_gtests
-  '';
-
-  meta = with lib; {
-    description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions";
-    mainProgram = "itpp-config";
-    homepage = "https://itpp.sourceforge.net/";
-    license = licenses.gpl3;
-    platforms = platforms.unix;
-    maintainers = [ ];
-    broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/itpp.x86_64-darwin
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6a6ac68b11a7..d968baee6874 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -768,6 +768,7 @@ mapAliases {
   dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11
   downonspot = throw "'downonspot' was removed because upstream has been taken down by a cease and desist"; # Added 2025-01-25
   dozenal = throw "dozenal has been removed because it does not compile and only minimal functionality"; # Added 2025-03-30
+  dsd = throw "dsd has been removed, as it was broken and lack of upstream maintenance"; # Added 2025-08-25
   dstat = throw "'dstat' has been removed because it has been unmaintained since 2020. Use 'dool' instead."; # Added 2025-01-21
   drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool";
   dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03
@@ -1175,6 +1176,7 @@ mapAliases {
   istatmenus = throw "istatmenus has beend renamed to istat-menus"; # Added 2025-05-05
   iso-flags-png-320x420 = lib.warnOnInstantiate "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17
   itktcl = tclPackages.itktcl; # Added 2024-10-02
+  itpp = throw "itpp has been removed, as it was broken"; # Added 2025-08-25
   iv = throw "iv has been removed as it was no longer required for neuron and broken"; # Added 2025-04-18
   ix = throw "ix has been removed from Nixpkgs, as the ix.io pastebin has been offline since Dec. 2023"; # Added 2025-04-11
 

From 5935f88cb439aa2e6d0d4b38e454c7476d09d11a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 20:11:34 +0000
Subject: [PATCH 3435/3724] python3Packages.signxml: 4.1.0 -> 4.2.0

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

diff --git a/pkgs/development/python-modules/signxml/default.nix b/pkgs/development/python-modules/signxml/default.nix
index 1737c0b52090..cae86a7df16d 100644
--- a/pkgs/development/python-modules/signxml/default.nix
+++ b/pkgs/development/python-modules/signxml/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "signxml";
-  version = "4.1.0";
+  version = "4.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "XML-Security";
     repo = "signxml";
     tag = "v${version}";
-    hash = "sha256-yNxqU5sg2xANCKLkaWYn1sr1SWQLPVfu9Jg3VF6Qf28=";
+    hash = "sha256-oyDhJZVn08rIcR3ti9jsYxyBPgz6VaJSbBVYrTQkbVU=";
   };
 
   build-system = [

From d10c1b65f1613dd2cefab6e58a7a77262e6c444c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 20:18:04 +0000
Subject: [PATCH 3436/3724] python3Packages.pyvista: 0.46.1 -> 0.46.2

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

diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix
index 679e5ab81777..b76320f33c17 100644
--- a/pkgs/development/python-modules/pyvista/default.nix
+++ b/pkgs/development/python-modules/pyvista/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyvista";
-  version = "0.46.1";
+  version = "0.46.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyvista";
     repo = "pyvista";
     tag = "v${version}";
-    hash = "sha256-o/g2cvSCLwKigHxMinS1WeVLj6Z6RGM3F/3kWURTJks=";
+    hash = "sha256-k5Sr41mmZJCEiIeEyyqulzYrI3cQYTWN5ooW41QUPuQ=";
   };
 
   # remove this line once pyvista 0.46 is released

From f5095e0707b9d0d94aadf9223ec61a12a185e3a9 Mon Sep 17 00:00:00 2001
From: Eric Ripa <eric@ripa.io>
Date: Thu, 17 Jul 2025 17:14:11 -0700
Subject: [PATCH 3437/3724] blowfish-tools: init at 1.10.0

---
 pkgs/by-name/bl/blowfish-tools/package.nix | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/by-name/bl/blowfish-tools/package.nix

diff --git a/pkgs/by-name/bl/blowfish-tools/package.nix b/pkgs/by-name/bl/blowfish-tools/package.nix
new file mode 100644
index 000000000000..d8ab233e56cb
--- /dev/null
+++ b/pkgs/by-name/bl/blowfish-tools/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  hugo,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "blowfish-tools";
+  version = "1.10.0";
+
+  src = fetchFromGitHub {
+    owner = "nunocoracao";
+    repo = "blowfish-tools";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-90EKsRKOO2Hb64Wy3TlwzlPU2K8AAlSxc17ek5ZLoG0=";
+  };
+
+  dontNpmBuild = true;
+
+  npmDepsHash = "sha256-P6XHXR4QcVCRz5ju36OzCTNxXtW9RYxkfhbp7kJVfoY=";
+
+  postFixup = ''
+    wrapProgram $out/bin/blowfish-tools \
+      --prefix PATH : ${lib.makeBinPath [ hugo ]}
+  '';
+
+  meta = {
+    description = "CLI to initialize and configure a Blowfish project";
+    homepage = "https://blowfish.page";
+    changelog = "https://github.com/nunocoracao/blowfish-tools/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ eripa ];
+    mainProgram = "blowfish-tools";
+  };
+})

From 6898855d0ffc8dcaa55376698600023792cee748 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Mon, 25 Aug 2025 16:38:50 -0400
Subject: [PATCH 3438/3724] wayland-bongocat: 1.2.4 -> 1.2.5

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

diff --git a/pkgs/by-name/wa/wayland-bongocat/package.nix b/pkgs/by-name/wa/wayland-bongocat/package.nix
index f54e68ce0bfb..5574421c87ad 100644
--- a/pkgs/by-name/wa/wayland-bongocat/package.nix
+++ b/pkgs/by-name/wa/wayland-bongocat/package.nix
@@ -10,12 +10,12 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wayland-bongocat";
-  version = "1.2.4";
+  version = "1.2.5";
   src = fetchFromGitHub {
     owner = "saatvik333";
     repo = "wayland-bongocat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ek9sVzofW0sWJBCeudykdirDkF04YdR1gAcpeWqgQAQ=";
+    hash = "sha256-VkBuqmen6s/LDFu84skQ3wOpIeURZ5e93lvAiEdny70=";
   };
 
   # Package dependencies

From 875383a0e559c59182dbfbf0cc6c2784060b517c Mon Sep 17 00:00:00 2001
From: alexyao2015 <33379584+alexyao2015@users.noreply.github.com>
Date: Tue, 15 Jul 2025 16:36:42 +0100
Subject: [PATCH 3439/3724] bitwarden-desktop: Build desktop proxy

---
 pkgs/by-name/bi/bitwarden-desktop/package.nix       | 10 ++++++++++
 .../bitwarden-desktop/set-desktop-proxy-path.patch  | 13 +++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/by-name/bi/bitwarden-desktop/set-desktop-proxy-path.patch

diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 373d3daa31c9..14fc7979d94a 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -49,6 +49,8 @@ buildNpmPackage' rec {
 
     # ensures `app.getPath("exe")` returns our wrapper, not ${electron}/bin/electron
     ./set-exe-path.patch
+    # ensure that the desktop proxy is correctly located in libexec
+    ./set-desktop-proxy-path.patch
     # on linux: don't flip fuses, don't create wrapper script, on darwin: don't try copying safari extensions, don't try re-signing app
     ./skip-afterpack-and-aftersign.patch
     # since out arch doesn't match upstream, we'll generate and use desktop_napi.node instead of desktop_napi.${platform}-${arch}.node
@@ -60,6 +62,8 @@ buildNpmPackage' rec {
     rm -r bitwarden_license
 
     substituteInPlace apps/desktop/src/main.ts --replace-fail '%%exePath%%' "$out/bin/bitwarden"
+    substituteInPlace apps/desktop/src/main/native-messaging.main.ts \
+      --replace-fail '%%desktopProxyPath%%' "$out/libexec/desktop_proxy"
 
     # force canUpdate to false
     # will open releases page instead of trying to update files
@@ -133,6 +137,10 @@ buildNpmPackage' rec {
     pushd apps/desktop/desktop_native/napi
     npm run build
     popd
+
+    pushd apps/desktop/desktop_native/proxy
+    cargo build --bin desktop_proxy --release -j $NIX_BUILD_CORES --offline
+    popd
   '';
 
   postBuild = ''
@@ -176,6 +184,8 @@ buildNpmPackage' rec {
 
   installPhase = ''
     runHook preInstall
+
+    install -Dm755 -t $out/libexec apps/desktop/desktop_native/target/release/desktop_proxy
   ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/Applications
diff --git a/pkgs/by-name/bi/bitwarden-desktop/set-desktop-proxy-path.patch b/pkgs/by-name/bi/bitwarden-desktop/set-desktop-proxy-path.patch
new file mode 100644
index 000000000000..ecdbd3e83f5f
--- /dev/null
+++ b/pkgs/by-name/bi/bitwarden-desktop/set-desktop-proxy-path.patch
@@ -0,0 +1,13 @@
+diff --git a/apps/desktop/src/main/native-messaging.main.ts b/apps/desktop/src/main/native-messaging.main.ts
+index 30f3e03..6bbf96f 100644
+--- a/apps/desktop/src/main/native-messaging.main.ts
++++ b/apps/desktop/src/main/native-messaging.main.ts
+@@ -500,7 +500,7 @@ export class NativeMessagingMain {
+       }
+     }
+ 
+-    return path.join(path.dirname(this.exePath), `desktop_proxy${ext}`);
++    return "%%desktopProxyPath%%";
+   }
+ 
+   private homedir() {

From d5240951da93234f68cc1846915794c62414a3b2 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Thu, 21 Aug 2025 14:20:36 -0400
Subject: [PATCH 3440/3724] nss_latest: 3.114 -> 3.115

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_115.rst
---
 pkgs/development/libraries/nss/latest.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix
index eb09313d1a11..45cd7960539f 100644
--- a/pkgs/development/libraries/nss/latest.nix
+++ b/pkgs/development/libraries/nss/latest.nix
@@ -5,6 +5,6 @@
 #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
 
 import ./generic.nix {
-  version = "3.114";
-  hash = "sha256-YVtXk1U9JtqfOH7+m/+bUI/yXJcydqjjGbCy/5xbMe8=";
+  version = "3.115";
+  hash = "sha256-8PeFeaIOtjBZJLBx3ONwZlK5SaLnjKEFoZWvVsu/3tA=";
 }

From ade64288fa0a66c679fbe8a13af359aea9bb3cb6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 25 Aug 2025 22:52:32 +0200
Subject: [PATCH 3441/3724] esphome: 2025.8.0 -> 2025.8.1

https://github.com/esphome/esphome/releases/tag/2025.8.1
---
 pkgs/by-name/es/esphome/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 1cb87cff635e..41e7b21e41b3 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -34,14 +34,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2025.8.0";
+  version = "2025.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "esphome";
     tag = version;
-    hash = "sha256-LOHsiSiqeCLrKLcVfAiPZl54aDTaYuKw073h0XMDiTE=";
+    hash = "sha256-aXbsMqAq1VD3sG4M+zhFw5LyHpQTFFxKpRFRIRuJ/aU=";
   };
 
   patches = [

From 2050ae84b5d617d95ddcd8292afe5d205c79af8d Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Thu, 21 Aug 2025 14:20:37 -0400
Subject: [PATCH 3442/3724] nss_3_114: init

This is the latest version that works for Firefox versions between 129
and 142 inclusive, and is included Nixpkgs-wide because the issue that
prevents 3.115 from working with later versions of Firefox may also
affect other software.
---
 pkgs/development/libraries/nss/3_114.nix | 4 ++++
 pkgs/top-level/all-packages.nix          | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 pkgs/development/libraries/nss/3_114.nix

diff --git a/pkgs/development/libraries/nss/3_114.nix b/pkgs/development/libraries/nss/3_114.nix
new file mode 100644
index 000000000000..3d17c3de971c
--- /dev/null
+++ b/pkgs/development/libraries/nss/3_114.nix
@@ -0,0 +1,4 @@
+import ./generic.nix {
+  version = "3.114";
+  hash = "sha256-YVtXk1U9JtqfOH7+m/+bUI/yXJcydqjjGbCy/5xbMe8=";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04521e6c4eab..2d0914e36e76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8638,6 +8638,7 @@ with pkgs;
   };
 
   nss_latest = callPackage ../development/libraries/nss/latest.nix { };
+  nss_3_114 = callPackage ../development/libraries/nss/3_114.nix { };
   nss_esr = callPackage ../development/libraries/nss/esr.nix { };
   nss = nss_esr;
   nssTools = nss.tools;

From d3140d859652cfee7139dabe36cd972cf31d9974 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Thu, 21 Aug 2025 14:20:37 -0400
Subject: [PATCH 3443/3724] buildMozillaMach: use nss_3_114 as needed

As reported in https://github.com/NixOS/nixpkgs/pull/435118, Firefox
versions prior to 143 crash when used with nss 3.115.
---
 pkgs/build-support/build-mozilla-mach/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 953f4a5b1cbb..8afe2e434322 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -89,6 +89,7 @@ in
   nasm,
   nspr,
   nss_esr,
+  nss_3_114,
   nss_latest,
   onnxruntime,
   pango,
@@ -555,7 +556,12 @@ buildStdenv.mkDerivation {
       xorg.xorgproto
       zlib
       (
-        if (lib.versionAtLeast version "129") then nss_latest else nss_esr # 3.90
+        if (lib.versionAtLeast version "143") then
+          nss_latest
+        else if (lib.versionAtLeast version "129") then
+          nss_3_114
+        else
+          nss_esr # 3.90
       )
     ]
     ++ lib.optional alsaSupport alsa-lib

From ad69899ab7848f9169e0d7d0f1799f1eccd08971 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Thu, 21 Aug 2025 14:20:37 -0400
Subject: [PATCH 3444/3724] firefox-devedition-unwrapped: 142.0b9 -> 143.0b2

https://www.firefox.com/en-US/firefox/143.0beta/releasenotes/
---
 .../browsers/firefox/packages/firefox-devedition.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index 5b38270109bf..9b36cd21ff83 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = pname;
-  version = "142.0b9";
+  version = "143.0b2";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "1223065e5c614be9b72f3306daebc98e032d993797bab4d8e646523dfcd9aa554f442b302a32e6281ebb41fcbed49f63097a58fef2a612ae8ff0371f670bad3c";
+    sha512 = "265a3b95b3c2a3e5cd051334f9a8c9bac1f8dba10d7a625bfceeb9a75f1e45617975dc26d1760c2e656b26fdf98f18da3181402a067252451d2ac71614dcfb6d";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From a58130893959b670169b54822de3724cb3257f43 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Thu, 21 Aug 2025 14:20:38 -0400
Subject: [PATCH 3445/3724] firefox-beta-unwrapped: 142.0b9 -> 143.0b2

https://www.firefox.com/en-US/firefox/143.0beta/releasenotes/
---
 .../networking/browsers/firefox/packages/firefox-beta.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
index 9a55f3cf51b5..aff9413de889 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
   pname = "firefox-beta";
   binaryName = pname;
-  version = "142.0b9";
+  version = "143.0b2";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "5a350ce0907977aa5d803801f6d00a4b91f2f2f29994a5951c48ee39f7b3b87843e992950890e59fb7a897e0912461d5661361c89e0deb59da226d1aac7d95ef";
+    sha512 = "3d206037dbd849158b70b8a8fda8527595ead612033a6dd2f0c0417ce0bc50312d2911e3b5d2964a01ab686c7636856a32f43163ce895767a11c1f3298cbf6e8";
   };
 
   meta = {

From 2240ad8625b21d50dbb23496faf89a11a35fdf2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 21:00:45 +0000
Subject: [PATCH 3446/3724] build(deps): bump korthout/backport-action from
 3.2.1 to 3.3.0

Bumps [korthout/backport-action](https://github.com/korthout/backport-action) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/korthout/backport-action/releases)
- [Commits](https://github.com/korthout/backport-action/compare/0193454f0c5947491d348f33a275c119f30eb736...ca4972adce8039ff995e618f5fc02d1b7961f27a)

---
updated-dependencies:
- dependency-name: korthout/backport-action
  dependency-version: 3.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/backport.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 0392578df488..b516dcea1a87 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -48,7 +48,7 @@ jobs:
 
       - name: Create backport PRs
         id: backport
-        uses: korthout/backport-action@0193454f0c5947491d348f33a275c119f30eb736 # v3.2.1
+        uses: korthout/backport-action@ca4972adce8039ff995e618f5fc02d1b7961f27a # v3.3.0
         with:
           # Config README: https://github.com/korthout/backport-action#backport-action
           copy_labels_pattern: 'severity:\ssecurity'

From 60795c8b3ca7af0c0da9aca5aa8008bae93b714d Mon Sep 17 00:00:00 2001
From: Ari Lotter <arilotter@gmail.com>
Date: Mon, 25 Aug 2025 15:47:18 -0400
Subject: [PATCH 3447/3724] acsccid: 1.1.8 -> 1.1.12

---
 pkgs/by-name/ac/acsccid/package.nix | 31 +++++++++++------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/ac/acsccid/package.nix b/pkgs/by-name/ac/acsccid/package.nix
index 28cb34aa4bce..5e6864b1e21e 100644
--- a/pkgs/by-name/ac/acsccid/package.nix
+++ b/pkgs/by-name/ac/acsccid/package.nix
@@ -1,8 +1,9 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
+  fetchurl,
   autoconf,
+  autoconf-archive,
   automake,
   libtool,
   gettext,
@@ -14,20 +15,19 @@
   libiconv,
 }:
 
-stdenv.mkDerivation rec {
-  version = "1.1.8";
+stdenv.mkDerivation (finalAttrs: {
+  version = "1.1.12";
   pname = "acsccid";
 
-  src = fetchFromGitHub {
-    owner = "acshk";
-    repo = "acsccid";
-    tag = "v${version}";
-    sha256 = "12aahrvsk21qgpjwcrr01s742ixs44nmjkvcvqyzhqb307x1rrn3";
+  src = fetchurl {
+    url = "mirror://sourceforge/acsccid/acsccid-${finalAttrs.version}.tar.bz2";
+    sha256 = "sha256-KPYHWlSUpWjOL9hmbEifb0pRWZtE+8k5Dh3bSNPMxb0=";
   };
 
   nativeBuildInputs = [
     pkg-config
     autoconf
+    autoconf-archive
     automake
     libtool
     gettext
@@ -50,19 +50,12 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   postPatch = ''
-    sed -e s_/bin/echo_echo_g -i src/Makefile.am
+    substituteInPlace src/Makefile.in \
+      --replace-fail '$(INSTALL_UDEV_RULE_FILE)' ""
     patchShebangs src/convert_version.pl
     patchShebangs src/create_Info_plist.pl
   '';
 
-  preConfigure = ''
-    libtoolize --force
-    aclocal
-    autoheader
-    automake --force-missing --add-missing
-    autoconf
-  '';
-
   meta = {
     description = "PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card readers";
     longDescription = ''
@@ -78,9 +71,9 @@ stdenv.mkDerivation rec {
         services.pcscd.enable = true;
         services.pcscd.plugins = [ pkgs.acsccid ];
     '';
-    homepage = src.meta.homepage;
+    homepage = "http://acsccid.sourceforge.net";
     license = lib.licenses.lgpl2Plus;
     maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.unix;
   };
-}
+})

From 82d03fbe17a8645c057fa2b48f89390af49ff0f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 21:07:33 +0000
Subject: [PATCH 3448/3724] python3Packages.llama-index-llms-openai: 0.5.0 ->
 0.5.4

---
 .../python-modules/llama-index-llms-openai/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
index b81017db54ed..738c32e3abfc 100644
--- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-openai";
-  version = "0.5.0";
+  version = "0.5.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_openai";
     inherit version;
-    hash = "sha256-CJlnMoLFjRmlu/ImFqAQkCROMIcm05KiTkZJOZMkdg8=";
+    hash = "sha256-nja20vxfBWsA7mVZAbO7fnBgsj97GUOYift41pY0D1Q=";
   };
 
   pythonRemoveDeps = [

From f1b8c38c4308b368a9cc932ed629550e6ada7496 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 25 Aug 2025 23:42:03 +0200
Subject: [PATCH 3449/3724] asciiquarium-transparent: 1.3 -> 1.4

---
 pkgs/by-name/as/asciiquarium-transparent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/as/asciiquarium-transparent/package.nix b/pkgs/by-name/as/asciiquarium-transparent/package.nix
index e82c054b017a..85ee2cb78c7c 100644
--- a/pkgs/by-name/as/asciiquarium-transparent/package.nix
+++ b/pkgs/by-name/as/asciiquarium-transparent/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "asciiquarium-transparent";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "nothub";
     repo = "asciiquarium";
-    rev = "${finalAttrs.version}";
-    hash = "sha256-zQyVIfwmhF3WsCeIZLwjDufvKzAfjLxaK2s7WTedqCg=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-lUNPg+/R/UwnHxjVXROMjvQxBZuCPBrYWB546OHplJM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 9a77eef2a9b9f77ab774c26218d25bb23e48c940 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 25 Aug 2025 23:49:02 +0200
Subject: [PATCH 3450/3724] nss: implement automated updates using
 nix-update-script

---
 pkgs/development/libraries/nss/3_114.nix   |  2 ++
 pkgs/development/libraries/nss/esr.nix     |  2 ++
 pkgs/development/libraries/nss/generic.nix | 17 +++++++++++++++--
 pkgs/development/libraries/nss/latest.nix  |  2 ++
 pkgs/development/libraries/nss/update.sh   | 10 ----------
 5 files changed, 21 insertions(+), 12 deletions(-)
 delete mode 100755 pkgs/development/libraries/nss/update.sh

diff --git a/pkgs/development/libraries/nss/3_114.nix b/pkgs/development/libraries/nss/3_114.nix
index 3d17c3de971c..92b0671c8a79 100644
--- a/pkgs/development/libraries/nss/3_114.nix
+++ b/pkgs/development/libraries/nss/3_114.nix
@@ -1,4 +1,6 @@
 import ./generic.nix {
   version = "3.114";
   hash = "sha256-YVtXk1U9JtqfOH7+m/+bUI/yXJcydqjjGbCy/5xbMe8=";
+  filename = "3_114.nix";
+  versionRegex = "NSS_(3)_(114)(?:_(\\d+))?_RTM";
 }
diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix
index f1b8c6df4acf..63b10c220152 100644
--- a/pkgs/development/libraries/nss/esr.nix
+++ b/pkgs/development/libraries/nss/esr.nix
@@ -1,4 +1,6 @@
 import ./generic.nix {
   version = "3.101.2";
   hash = "sha256-i5K47pzQYOiD4vFHBN6VeqXEdPBOM7U1oSK0qSi2M2Y=";
+  filename = "esr.nix";
+  versionRegex = "NSS_(3)_(101)(?:_(\\d+))?_RTM";
 }
diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix
index 77d838a25ab0..6c274607e03c 100644
--- a/pkgs/development/libraries/nss/generic.nix
+++ b/pkgs/development/libraries/nss/generic.nix
@@ -1,4 +1,9 @@
-{ version, hash }:
+{
+  version,
+  hash,
+  filename,
+  versionRegex,
+}:
 {
   lib,
   stdenv,
@@ -19,6 +24,7 @@
   enableFIPS ? false,
   nixosTests,
   nss_latest,
+  nix-update-script,
 }:
 
 let
@@ -229,7 +235,14 @@ stdenv.mkDerivation rec {
       runHook postInstall
     '';
 
-  passthru.updateScript = ./update.sh;
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--override-filename"
+      "pkgs/development/libraries/nss/${filename}"
+      "--version-regex"
+      versionRegex
+    ];
+  };
 
   passthru.tests =
     lib.optionalAttrs (lib.versionOlder version nss_latest.version) {
diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix
index 45cd7960539f..5711746540b7 100644
--- a/pkgs/development/libraries/nss/latest.nix
+++ b/pkgs/development/libraries/nss/latest.nix
@@ -7,4 +7,6 @@
 import ./generic.nix {
   version = "3.115";
   hash = "sha256-8PeFeaIOtjBZJLBx3ONwZlK5SaLnjKEFoZWvVsu/3tA=";
+  filename = "latest.nix";
+  versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM";
 }
diff --git a/pkgs/development/libraries/nss/update.sh b/pkgs/development/libraries/nss/update.sh
deleted file mode 100755
index 600dbdff004c..000000000000
--- a/pkgs/development/libraries/nss/update.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gnugrep gnused coreutils common-updater-scripts
-
-set -x
-
-base_url="https://ftp.mozilla.org/pub/security/nss/releases/"
-
-version="$(curl -sSL ${base_url}  | grep 'RTM' | grep -v WITH_CKBI | sed 's|.*>\(NSS_[0-9]*_[0-9]*_*[0-9]*_*[0-9]*_RTM\)/.*|\1|g' | sed 's|NSS_||g' | sed 's|_RTM||g' | sed 's|_|.|g' | sort -V | tail -1)"
-hash="$(nix-hash --type sha256 --base32 ${base_url}/NSS_${version/\./_}_RTM/src/nss-${version}.tar.gz)"
-update-source-version nss "${version}" "${hash}"

From 0838da41814d626f4d4666a0a3f3ff6b9d5089dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Mon, 25 Aug 2025 23:50:13 +0200
Subject: [PATCH 3451/3724] mullvad-browser: 14.5.5 -> 14.5.6

https://github.com/mullvad/mullvad-browser/releases/tag/14.5.6
---
 pkgs/by-name/mu/mullvad-browser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index 92d10debd1cd..7316c456b846 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -97,7 +97,7 @@ let
     ++ lib.optionals mediaSupport [ ffmpeg ]
   );
 
-  version = "14.5.5";
+  version = "14.5.6";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -109,7 +109,7 @@ let
         "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-PwqxYylW602XAKBvEJk4Rl8q6nWBGH3pFvTOuAYtr/w=";
+      hash = "sha256-oUbeteUlgQIzRezEQy9APDtXWX8RuOCtUXQAWlzqkyM=";
     };
   };
 

From a623867fd2aed070924d13505814eec634a9af3e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 25 Aug 2025 23:56:41 +0200
Subject: [PATCH 3452/3724] nss_latest: 3.115 -> 3.115.1

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_115_1.rst
---
 pkgs/development/libraries/nss/latest.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix
index 5711746540b7..85caeb11d41c 100644
--- a/pkgs/development/libraries/nss/latest.nix
+++ b/pkgs/development/libraries/nss/latest.nix
@@ -5,8 +5,8 @@
 #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
 
 import ./generic.nix {
-  version = "3.115";
-  hash = "sha256-8PeFeaIOtjBZJLBx3ONwZlK5SaLnjKEFoZWvVsu/3tA=";
+  version = "3.115.1";
+  hash = "sha256-SuXNqRW0lBPioYxmoGa3ZbfxC7ud6TW3xVpakVwtm14=";
   filename = "latest.nix";
   versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM";
 }

From 324bee70162126c8c3ee60ce71fb74041f5ebc88 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 25 Aug 2025 23:56:59 +0200
Subject: [PATCH 3453/3724] nss_3_114: 3.114 -> 3.114.1

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_114_1.rst
---
 pkgs/development/libraries/nss/3_114.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss/3_114.nix b/pkgs/development/libraries/nss/3_114.nix
index 92b0671c8a79..af578ffeb2e4 100644
--- a/pkgs/development/libraries/nss/3_114.nix
+++ b/pkgs/development/libraries/nss/3_114.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "3.114";
-  hash = "sha256-YVtXk1U9JtqfOH7+m/+bUI/yXJcydqjjGbCy/5xbMe8=";
+  version = "3.114.1";
+  hash = "sha256-xs7G5MHOd6mPVpBfDd2fFG2qw+5KypBTPqErbl0zfrk=";
   filename = "3_114.nix";
   versionRegex = "NSS_(3)_(114)(?:_(\\d+))?_RTM";
 }

From ddacce558859d778ab7b52f9b507848efe841035 Mon Sep 17 00:00:00 2001
From: Andy Zhang <1329212+zh4ngx@users.noreply.github.com>
Date: Mon, 25 Aug 2025 14:58:45 -0700
Subject: [PATCH 3454/3724] beeper: 4.1.111 -> 4.1.135

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

diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index cb6cd7a143f6..36d0be40a5dd 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -9,10 +9,10 @@
 }:
 let
   pname = "beeper";
-  version = "4.1.111";
+  version = "4.1.135";
   src = fetchurl {
     url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
-    hash = "sha256-0cr6syveIHIIy8+FyE23U8iidMYJXkN8CqhhbH0oNt0=";
+    hash = "sha256-bp0RGU689A8kgphNgJJnlbQBh1fAubwWUvM9StzLwB4=";
   };
   appimageContents = appimageTools.extract {
     inherit pname version src;

From a690d9e357ed3e35f6930274b7bfd4f0f730ea3e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 21:58:52 +0000
Subject: [PATCH 3455/3724] gollama: v1.35.3 -> v1.37.1

---
 pkgs/by-name/go/gollama/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/gollama/package.nix b/pkgs/by-name/go/gollama/package.nix
index 824754f4963f..876fe6dcaa75 100644
--- a/pkgs/by-name/go/gollama/package.nix
+++ b/pkgs/by-name/go/gollama/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gollama";
-  version = "v1.35.3";
+  version = "v1.37.1";
 
   src = fetchFromGitHub {
     owner = "sammcj";
     repo = "gollama";
     tag = "v${version}";
-    hash = "sha256-k2SGcsWQi2jC3W2ZO8KXY+WUyh7n7qonLr6BLKZXzdY=";
+    hash = "sha256-HNRerVlnYfEAmxUk8nE8fyLozQ7zngFrcDrWG1RtqJw=";
   };
 
-  vendorHash = "sha256-hZx4AsPnlFmJGms0vRKgBV/4Ea8uvHaNc0zNehs2RB8=";
+  vendorHash = "sha256-Hf1E55FHlyp7VAwaunvpG/hYNVHO2DSFDGFyaPiFieY=";
 
   doCheck = false;
 

From 7d616d4459c9739579e10a44a015ae7ebd1d4a5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 22:05:07 +0000
Subject: [PATCH 3456/3724] terraform-providers.awscc: 1.51.0 -> 1.53.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index fc24860d143e..643aa86499d1 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -135,13 +135,13 @@
     "vendorHash": "sha256-rTQzbI04C92J+IXVX8dHtcbMvOif5jLW8ejm20qfrSA="
   },
   "awscc": {
-    "hash": "sha256-lsnmPbG5juue8ZQ/JT8zjk4vSDwMqUlIxAqKxbaR3iY=",
+    "hash": "sha256-RMOLAJyoIVIlg4GgU6rCSASgcZlvFMmLjFPqc5Lrdp8=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
     "owner": "hashicorp",
     "repo": "terraform-provider-awscc",
-    "rev": "v1.51.0",
+    "rev": "v1.53.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-1PX776uNp1uXW2i23Ea7b74rEQk2hH6xpDqi7StK3Hs="
+    "vendorHash": "sha256-VNWa7ynbqhaPXrnZBmWLsMOExnjBRD7+gp89tMReNAY="
   },
   "azuread": {
     "hash": "sha256-7dbBhQz0MDUAaz4U1ewM2RayWtp5gbo3FrrQ762Tb6A=",

From 4241f0fed9cc74285b2243297f3c7a014c935c20 Mon Sep 17 00:00:00 2001
From: NilaTheDragon <nilathedragon@pm.me>
Date: Tue, 26 Aug 2025 00:29:34 +0200
Subject: [PATCH 3457/3724] high-tide: 1.0.0 -> 1.1.0

---
 pkgs/by-name/hi/high-tide/package.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix
index cdd184386506..b19baef569a7 100644
--- a/pkgs/by-name/hi/high-tide/package.nix
+++ b/pkgs/by-name/hi/high-tide/package.nix
@@ -13,20 +13,21 @@
   gst_all_1,
   libsecret,
   libportal,
+  alsa-utils,
   pipewire,
   nix-update-script,
 }:
 
 python313Packages.buildPythonApplication rec {
   pname = "high-tide";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "Nokse22";
     repo = "high-tide";
     tag = "v${version}";
-    hash = "sha256-lvfEqXXlDuW+30iTQ0FddcnAMZRM0BYeuxLN4++xs/0=";
+    hash = "sha256-AHdv2eazUnxgw5D4SlIzWm/wnC26zedwiAGT0OzjdZs=";
   };
 
   nativeBuildInputs = [
@@ -51,13 +52,16 @@ python313Packages.buildPythonApplication rec {
     libsecret
   ]);
 
-  dependencies = with python313Packages; [
+  dependencies = [
+    alsa-utils
+  ]
+  ++ (with python313Packages; [
     pygobject3
     tidalapi
     requests
     mpd2
     pypresence
-  ];
+  ]);
 
   dontWrapGApps = true;
 

From 2fb7257c8f1f79618bfc38f18010aa551c2aa0da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 22:35:22 +0000
Subject: [PATCH 3458/3724] python3Packages.sagemaker-core: 1.0.52 -> 1.0.55

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

diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix
index 95b24b25e1cf..40cf5441255a 100644
--- a/pkgs/development/python-modules/sagemaker-core/default.nix
+++ b/pkgs/development/python-modules/sagemaker-core/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker-core";
-  version = "1.0.52";
+  version = "1.0.55";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-core";
     tag = "v${version}";
-    hash = "sha256-f+Xy9/14cJhbjqrSqR+Bh98uNUCb0XlDdaTPkPAomlA=";
+    hash = "sha256-Qt7AgS9x9hgM6Qs5trfP6wEAKAuR6aOMz2VFtLdmXt8=";
   };
 
   build-system = [

From 42cf5f1db9c41daada2ff6a6166e9f8e243b437f Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Tue, 26 Aug 2025 01:38:56 +0300
Subject: [PATCH 3459/3724] koboldcpp: 1.97.4 -> 1.98

Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.98
Diff: https://github.com/LostRuins/koboldcpp/compare/v1.97.4...v1.98
---
 pkgs/by-name/ko/koboldcpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index b196b0bc550a..bbdadfaf7234 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -41,13 +41,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.97.4";
+  version = "1.98";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z9F3q+1iq6HQV37yRjBOlJRChhnQ/cPP5sAZl5rFDUs=";
+    hash = "sha256-5VP7NfHc00TdTqr5wel1vrtOnJWDGZT44tKDEm/f2iw=";
   };
 
   enableParallelBuilding = true;

From 12429274b82cadab45c1afc456ee8d242e19a64d Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 11:52:18 -0700
Subject: [PATCH 3460/3724] python3Packages.langchain-anthropic: disable bulk
 updates

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

diff --git a/pkgs/development/python-modules/langchain-anthropic/default.nix b/pkgs/development/python-modules/langchain-anthropic/default.nix
index 69feac9399db..a0d9e62488cc 100644
--- a/pkgs/development/python-modules/langchain-anthropic/default.nix
+++ b/pkgs/development/python-modules/langchain-anthropic/default.nix
@@ -60,8 +60,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langchain_anthropic" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-anthropic==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-anthropic==";
+    };
   };
 
   meta = {

From 725f15b920183ddbfb0555dabd88e61283cd5c91 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 12:07:40 -0700
Subject: [PATCH 3461/3724] python3Packages.langchain-aws: disable bulk updates

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

diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index 3fd7fe81c479..27ec01997618 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -69,8 +69,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langchain_aws" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-aws==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-aws==";
+    };
   };
 
   meta = {

From afa17a7f7ed621265a1bda93dac1f7eefca5344d Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 11:27:43 -0700
Subject: [PATCH 3462/3724] python3Packages.langchain-azure-dynamic-sessions:
 repair broken update

#431074 ran the python update tool and changed tags where gitUpdater was
in use. This reverts the tag change and restores the correct version.
This also disables bulk updtes in the future.
---
 .../langchain-azure-dynamic-sessions/default.nix   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
index f404c0562d97..dafa4f5af501 100644
--- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
+++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-azure-dynamic-sessions";
-  version = "0.3.72";
+  version = "0.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-core==${version}";
-    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+    tag = "langchain-azure-dynamic-sessions==${version}";
+    hash = "sha256-tgvoOSr4tpi+tFBan+kw8FZUfUJHcQXv9e1nyeGP0so=";
   };
 
   sourceRoot = "${src.name}/libs/partners/azure-dynamic-sessions";
@@ -74,8 +74,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langchain_azure_dynamic_sessions" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-azure-dynamic-sessions==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-azure-dynamic-sessions==";
+    };
   };
 
   meta = {

From 896bb4a447fa12d6e614f998232953e81b7f7640 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 12:03:39 -0700
Subject: [PATCH 3463/3724] python3Packages.langchain-chroma: disable bulk
 updates

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

diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix
index 211cb58a1c78..2365b18fcd19 100644
--- a/pkgs/development/python-modules/langchain-chroma/default.nix
+++ b/pkgs/development/python-modules/langchain-chroma/default.nix
@@ -64,8 +64,12 @@ buildPythonPackage rec {
     "test_chroma_update_document"
   ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-chroma==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-chroma==";
+    };
   };
 
   meta = {

From e12a334aeec8d12690d812df39c90eb593c8599d Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 12:14:50 -0700
Subject: [PATCH 3464/3724] python3Packages.langchain-core: disable bulk
 updates

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

diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix
index 25c111f5826e..80ef77828e11 100644
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@@ -90,7 +90,8 @@ buildPythonPackage rec {
     tests.pytest = langchain-core.overridePythonAttrs (_: {
       doCheck = true;
     });
-
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
     updateScript = gitUpdater {
       rev-prefix = "langchain-core==";
     };

From d3996e02c41d7c0a48e12f9d4bedca62b8d4cda3 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 12:47:58 -0700
Subject: [PATCH 3465/3724] python3Packages.langchain-deepseek: revert broken
 update, skipBulkUpdate

---
 .../python-modules/langchain-deepseek/default.nix  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-deepseek/default.nix b/pkgs/development/python-modules/langchain-deepseek/default.nix
index f26769315352..e6978addf2e8 100644
--- a/pkgs/development/python-modules/langchain-deepseek/default.nix
+++ b/pkgs/development/python-modules/langchain-deepseek/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-deepseek";
-  version = "0.3.72";
+  version = "0.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-core==${version}";
-    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+    tag = "langchain-deepseek==${version}";
+    hash = "sha256-lIlThVpyZF5osiCyYMO8kQUNtG5eUjXGZLdgRraj4Yc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/deepseek";
@@ -60,8 +60,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langchain_deepseek" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-deepseek==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-deepseek==";
+    };
   };
 
   meta = {

From 6acce342190fe9c4a615ff97c98a099257cc1e8a Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 12:59:30 -0700
Subject: [PATCH 3466/3724] python3Packages.langchain-fireworks: repair broken
 update, skipBulkUpdate

---
 .../python-modules/langchain-fireworks/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-fireworks/default.nix b/pkgs/development/python-modules/langchain-fireworks/default.nix
index 48a221a7766c..3a614511e244 100644
--- a/pkgs/development/python-modules/langchain-fireworks/default.nix
+++ b/pkgs/development/python-modules/langchain-fireworks/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-fireworks";
-  version = "0.3.72";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-core==${version}";
-    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+    tag = "langchain-fireworks==${version}";
+    hash = "sha256-OZou323FAk2I4YuQV7sllbzDwFQWy/90FK3gIHnEBd0=";
   };
 
   sourceRoot = "${src.name}/libs/partners/fireworks";
@@ -62,8 +62,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langchain_fireworks" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-fireworks==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-fireworks==";
+    };
   };
 
   meta = {

From e939491d8a000e495362284eedc9a9fd7ca13e72 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 13:17:46 -0700
Subject: [PATCH 3467/3724] python3Packages.langchain-google-genai: apply
 skipBulkUpdate

---
 .../python-modules/langchain-google-genai/default.nix     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-google-genai/default.nix b/pkgs/development/python-modules/langchain-google-genai/default.nix
index 9ebf4abbc76d..37f2485556ba 100644
--- a/pkgs/development/python-modules/langchain-google-genai/default.nix
+++ b/pkgs/development/python-modules/langchain-google-genai/default.nix
@@ -72,8 +72,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langchain_google_genai" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "libs/genai/v";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "libs/genai/v";
+    };
   };
 
   meta = {

From 2f68506b8a449d856ea000cab4272d76f38452b1 Mon Sep 17 00:00:00 2001
From: Christoph Koehler <christoph@zerodeviation.net>
Date: Mon, 25 Aug 2025 16:45:47 -0600
Subject: [PATCH 3468/3724] Reapply "aider-chat: fix tree-sitter query"

This reverts commit b6554c9f0eafd8248986e43ae646c344631be30b.
---
 .../ai/aider-chat/fix-tree-sitter.patch       | 21 +++++++++++++++++++
 pkgs/by-name/ai/aider-chat/package.nix        |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/by-name/ai/aider-chat/fix-tree-sitter.patch

diff --git a/pkgs/by-name/ai/aider-chat/fix-tree-sitter.patch b/pkgs/by-name/ai/aider-chat/fix-tree-sitter.patch
new file mode 100644
index 000000000000..df06e6036294
--- /dev/null
+++ b/pkgs/by-name/ai/aider-chat/fix-tree-sitter.patch
@@ -0,0 +1,21 @@
+diff --git a/aider/repomap.py b/aider/repomap.py
+index 23eee239..0a40f2e6 100644
+--- a/aider/repomap.py
++++ b/aider/repomap.py
+@@ -16,6 +16,7 @@ from grep_ast import TreeContext, filename_to_lang
+ from pygments.lexers import guess_lexer_for_filename
+ from pygments.token import Token
+ from tqdm import tqdm
++from tree_sitter import QueryCursor
+ 
+ from aider.dump import dump
+ from aider.special import filter_important_files
+@@ -286,7 +287,7 @@ class RepoMap:
+ 
+         # Run the tags queries
+         query = language.query(query_scm)
+-        captures = query.captures(tree.root_node)
++        captures = QueryCursor(query).captures(tree.root_node)
+ 
+         saw = set()
+         if USING_TSL_PACK:
diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix
index 4da3540b97d6..bf3cfc8d4f8e 100644
--- a/pkgs/by-name/ai/aider-chat/package.nix
+++ b/pkgs/by-name/ai/aider-chat/package.nix
@@ -146,6 +146,8 @@ let
     ];
 
     patches = [
+      ./fix-tree-sitter.patch
+
       (replaceVars ./fix-flake8-invoke.patch {
         flake8 = lib.getExe python3Packages.flake8;
       })

From 61e0fe02d2b653d11934d60b95d46cce6036a600 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 4 Aug 2025 19:26:27 +0000
Subject: [PATCH 3469/3724] spatialite-gui: refactor package definitions

---
 pkgs/by-name/sp/spatialite-gui/package.nix | 18 +++++++++---------
 pkgs/top-level/all-packages.nix            |  4 ----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/sp/spatialite-gui/package.nix b/pkgs/by-name/sp/spatialite-gui/package.nix
index 88193e2cbe8f..42ec69fcee55 100644
--- a/pkgs/by-name/sp/spatialite-gui/package.nix
+++ b/pkgs/by-name/sp/spatialite-gui/package.nix
@@ -20,17 +20,17 @@
   proj,
   sqlite,
   virtualpg,
-  wxGTK,
+  wxGTK32,
   xz,
   zstd,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "spatialite-gui";
   version = "2.1.0-beta1";
 
   src = fetchurl {
-    url = "https://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/spatialite_gui-${version}.tar.gz";
+    url = "https://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/spatialite_gui-${finalAttrs.version}.tar.gz";
     hash = "sha256-ukjZbfGM68P/I/aXlyB64VgszmL0WWtpuuMAyjwj2zM=";
   };
 
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     proj
     sqlite
     virtualpg
-    wxGTK
+    wxGTK32
     xz
     zstd
   ];
@@ -68,12 +68,12 @@ stdenv.mkDerivation rec {
     rm -fr $out/share
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Graphical user interface for SpatiaLite";
     homepage = "https://www.gaia-gis.it/fossil/spatialite_gui";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    teams = [ teams.geospatial ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
+    teams = [ lib.teams.geospatial ];
     mainProgram = "spatialite_gui";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04521e6c4eab..dac183d0e40d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11221,10 +11221,6 @@ with pkgs;
 
   qgis = callPackage ../applications/gis/qgis { };
 
-  spatialite-gui = callPackage ../by-name/sp/spatialite-gui/package.nix {
-    wxGTK = wxGTK32;
-  };
-
   ### APPLICATIONS
 
   _2bwm = callPackage ../applications/window-managers/2bwm {

From 47e4dd79fd258fecf4407c46578664355851011d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 22:50:28 +0000
Subject: [PATCH 3470/3724] python3Packages.bthome-ble: 3.14.0 -> 3.14.1

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

diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix
index 665094952cc1..c01d1749e137 100644
--- a/pkgs/development/python-modules/bthome-ble/default.nix
+++ b/pkgs/development/python-modules/bthome-ble/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "bthome-ble";
-  version = "3.14.0";
+  version = "3.14.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bthome-ble";
     tag = "v${version}";
-    hash = "sha256-1jgrE7EwYJPb/F5gIXmRFU3xBG00tIXRA8BsE20Tw6Y=";
+    hash = "sha256-ySvEO4ic1Oo0b/kBADOMRgf9Thq6sBvxYWFKQpH3ouU=";
   };
 
   build-system = [ poetry-core ];

From e11d6faf2333958e23c0a32108574e76179e9951 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 13:20:14 -0700
Subject: [PATCH 3471/3724] python3Packages.langchain-grok: apply
 skipBulkUpdate

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

diff --git a/pkgs/development/python-modules/langchain-groq/default.nix b/pkgs/development/python-modules/langchain-groq/default.nix
index e0bdf7d2db2b..fbd1d646b8ea 100644
--- a/pkgs/development/python-modules/langchain-groq/default.nix
+++ b/pkgs/development/python-modules/langchain-groq/default.nix
@@ -54,8 +54,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langchain_groq" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-groq==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-groq==";
+    };
   };
 
   meta = {

From 1ceae877777dc7a2d7a2e09c4d7464e2f33cdf3b Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 13:20:14 -0700
Subject: [PATCH 3472/3724] python3Packages.langchain-huggingface: apply
 skipBulkUpdate

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

diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix
index c6953f29790e..e8a1dd68fc1a 100644
--- a/pkgs/development/python-modules/langchain-huggingface/default.nix
+++ b/pkgs/development/python-modules/langchain-huggingface/default.nix
@@ -80,8 +80,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langchain_huggingface" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-huggingface==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-huggingface==";
+    };
   };
 
   meta = {

From 91a1a968b482e3a2547699341b0222e1b145b40b Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 13:26:52 -0700
Subject: [PATCH 3473/3724] python3Packages.langchain-mistralai: repair broken
 update, apply skipBulkUpdate

---
 .../python-modules/langchain-mistralai/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-mistralai/default.nix b/pkgs/development/python-modules/langchain-mistralai/default.nix
index e7e45057e77c..e8e67b354643 100644
--- a/pkgs/development/python-modules/langchain-mistralai/default.nix
+++ b/pkgs/development/python-modules/langchain-mistralai/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-mistralai";
-  version = "0.3.72";
+  version = "0.2.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-core==${version}";
-    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+    tag = "langchain-mistralai==${version}";
+    hash = "sha256-14mYvW7j2hxAFZanRhuuo1seX6E4+tAuEPExDbdwHKg=";
   };
 
   sourceRoot = "${src.name}/libs/partners/mistralai";
@@ -62,8 +62,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langchain_mistralai" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-mistralai==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-mistralai==";
+    };
   };
 
   meta = {

From 45e1b681ddace418ba9302ba2ccd7b42f66a8f78 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 15:23:47 -0700
Subject: [PATCH 3474/3724] python3Packages.langchain-mongodb: repair broken
 update, apply skipBulkUpdate

---
 .../python-modules/langchain-mongodb/default.nix   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix
index 212efde0e232..293aebc76c04 100644
--- a/pkgs/development/python-modules/langchain-mongodb/default.nix
+++ b/pkgs/development/python-modules/langchain-mongodb/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-mongodb";
-  version = "0.3.72";
+  version = "0.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-core==${version}";
-    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+    tag = "langchain-mongodb==${version}";
+    hash = "sha256-Jd9toXkS9dGtSIrJQ/5W+swV1z2BJOJKBtkyGzj3oSc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/mongodb";
@@ -66,8 +66,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langchain_mongodb" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-mongodb==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-mongodb==";
+    };
   };
 
   meta = {

From d0bdfe87f5c0662fad3f100e8b277d4f95029552 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 15:23:47 -0700
Subject: [PATCH 3475/3724] python3Packages.langchain-ollama: repair broken
 update, apply skipBulkUpdate

---
 .../python-modules/langchain-ollama/default.nix    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix
index d76f1cef40c4..63f58a0be5ad 100644
--- a/pkgs/development/python-modules/langchain-ollama/default.nix
+++ b/pkgs/development/python-modules/langchain-ollama/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-ollama";
-  version = "0.3.72";
+  version = "0.3.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-core==${version}";
-    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+    tag = "langchain-ollama==${version}";
+    hash = "sha256-GQkyJaYvwRbjDR0Rfen7/X5hFhY2+WU74B6/9Ufhpo4=";
   };
 
   sourceRoot = "${src.name}/libs/partners/ollama";
@@ -60,8 +60,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langchain_ollama" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-ollama==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-ollama==";
+    };
   };
 
   meta = {

From c7e9475ce9ac13f809303707676fe94addf3ca5d Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 15:27:54 -0700
Subject: [PATCH 3476/3724] python3Packages.langchain-openai: repair broken
 update, apply skipBulkUpdate

---
 .../python-modules/langchain-openai/default.nix    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix
index 142098443e91..2e6bb2ab23fe 100644
--- a/pkgs/development/python-modules/langchain-openai/default.nix
+++ b/pkgs/development/python-modules/langchain-openai/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-openai";
-  version = "0.3.72";
+  version = "0.3.28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-core==${version}";
-    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+    tag = "langchain-openai==${version}";
+    hash = "sha256-HpAdCHxmfGJcqXArvtlYagNuEBGBjrbICIwh9nI0qMQ=";
   };
 
   sourceRoot = "${src.name}/libs/partners/openai";
@@ -102,8 +102,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langchain_openai" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-openai==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-openai==";
+    };
   };
 
   meta = {

From ecd1b8bd6e2c0d944ea452362caea864e391c8da Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 15:31:00 -0700
Subject: [PATCH 3477/3724] python3Packages.langchain-perplexity: repair broken
 update, apply skipBulkUpdate

---
 .../langchain-perplexity/default.nix               | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-perplexity/default.nix b/pkgs/development/python-modules/langchain-perplexity/default.nix
index 79f6078643a5..9638e5aa883d 100644
--- a/pkgs/development/python-modules/langchain-perplexity/default.nix
+++ b/pkgs/development/python-modules/langchain-perplexity/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-perplexity";
-  version = "0.3.72";
+  version = "0.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-core==${version}";
-    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+    tag = "langchain-perplexity==${version}";
+    hash = "sha256-4KYLyhGbG8Y8cDGffE4/8OM61eAKRFTgxKDKMTQExic=";
   };
 
   sourceRoot = "${src.name}/libs/partners/perplexity";
@@ -60,8 +60,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langchain_perplexity" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-perplexity==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-perplexity==";
+    };
   };
 
   meta = {

From 563020e89c9b37c1cfd77532884c66efe8963e7f Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 15:34:23 -0700
Subject: [PATCH 3478/3724] python3Packages.langchain-tests: repair broken
 update, apply skipBulkUpdate

---
 .../python-modules/langchain-tests/default.nix     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix
index 42afbb15a0cc..c9c3659a7ae3 100644
--- a/pkgs/development/python-modules/langchain-tests/default.nix
+++ b/pkgs/development/python-modules/langchain-tests/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-tests";
-  version = "0.3.72";
+  version = "0.3.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-core==${version}";
-    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+    tag = "langchain-tests==${version}";
+    hash = "sha256-RMuxWA/n8d71FReFKO3Y/5P0MYk4aZ5WU2/TRxf9UuE=";
   };
 
   sourceRoot = "${src.name}/libs/standard-tests";
@@ -72,8 +72,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-tests==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-tests==";
+    };
   };
 
   meta = {

From 6d60e23f75ed146b8cf48ff1b66f3dcded4254f9 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 15:37:48 -0700
Subject: [PATCH 3479/3724] python3Packages.langchain-text-splitters: repair
 broken update, apply skipBulkUpdate

---
 .../langchain-text-splitters/default.nix           | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix
index 53ddcc2ae78c..763e473267e3 100644
--- a/pkgs/development/python-modules/langchain-text-splitters/default.nix
+++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-text-splitters";
-  version = "0.3.72";
+  version = "0.3.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-core==${version}";
-    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+    tag = "langchain-text-splitters==${version}";
+    hash = "sha256-dMGvGZyux38Svl0OYgiAoYLdAf0lv27lzXgHFTBp3cs=";
   };
 
   sourceRoot = "${src.name}/libs/text-splitters";
@@ -52,8 +52,12 @@ buildPythonPackage rec {
 
   enabledTestPaths = [ "tests/unit_tests" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-text-splitters==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-text-splitters==";
+    };
   };
 
   meta = {

From 7ac946c26e23cddc31e7c55a6bee385febed7bcb Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 25 Aug 2025 15:40:51 -0700
Subject: [PATCH 3480/3724] python3Packages.langchain-xai: repair broken
 update, apply skipBulkUpdate

---
 .../python-modules/langchain-xai/default.nix       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-xai/default.nix b/pkgs/development/python-modules/langchain-xai/default.nix
index 9d61f9437079..6769f74c3440 100644
--- a/pkgs/development/python-modules/langchain-xai/default.nix
+++ b/pkgs/development/python-modules/langchain-xai/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-xai";
-  version = "0.3.72";
+  version = "0.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-core==${version}";
-    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+    tag = "langchain-xai==${version}";
+    hash = "sha256-nae7KwCKjkvenOO8vErxFQStHolc+N8EUuK6U8r48Kc=";
   };
 
   sourceRoot = "${src.name}/libs/partners/xai";
@@ -70,8 +70,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langchain_xai" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain-xai==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain-xai==";
+    };
   };
 
   meta = {

From 3d940d1c91cbdc9a6781089e82b55fd5ce8b71ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 23:03:33 +0000
Subject: [PATCH 3481/3724] evdevremapkeys: unstable-2021-05-04 -> 1.0.0

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

diff --git a/pkgs/by-name/ev/evdevremapkeys/package.nix b/pkgs/by-name/ev/evdevremapkeys/package.nix
index 2a9e1e44d200..42bad51d9351 100644
--- a/pkgs/by-name/ev/evdevremapkeys/package.nix
+++ b/pkgs/by-name/ev/evdevremapkeys/package.nix
@@ -6,7 +6,7 @@
 
 python3Packages.buildPythonPackage {
   pname = "evdevremapkeys";
-  version = "unstable-2021-05-04";
+  version = "1.0.0";
   format = "pyproject";
 
   src = fetchFromGitHub {

From 7b7f93af755f48c0ab47411a33d97a26a92ef0af Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 25 Aug 2025 23:03:33 +0000
Subject: [PATCH 3482/3724] zfs_2_3: 2.3.3 -> 2.3.4

Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.4
---
 pkgs/os-specific/linux/zfs/2_3.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix
index b58a5c6480d3..7c175ba48a46 100644
--- a/pkgs/os-specific/linux/zfs/2_3.nix
+++ b/pkgs/os-specific/linux/zfs/2_3.nix
@@ -12,10 +12,10 @@ callPackage ./generic.nix args {
   kernelModuleAttribute = "zfs_2_3";
 
   kernelMinSupportedMajorMinor = "4.18";
-  kernelMaxSupportedMajorMinor = "6.15";
+  kernelMaxSupportedMajorMinor = "6.16";
 
   # this package should point to the latest release.
-  version = "2.3.3";
+  version = "2.3.4";
 
   tests = {
     inherit (nixosTests.zfs) series_2_3;
@@ -29,5 +29,5 @@ callPackage ./generic.nix args {
     amarshall
   ];
 
-  hash = "sha256-NXAbyGBfpzWfm4NaP1/otTx8fOnoRV17343qUMdQp5U=";
+  hash = "sha256-8BSuDRDyqPGAiyGGxFyEZIcXB+cKsKk25jcFPrSK3GI=";
 }

From 32617b57880eb292e54fff9064c9b0c3d1ae1cb1 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Mon, 25 Aug 2025 12:55:55 -0400
Subject: [PATCH 3483/3724] python3Packages.msgraph-core: Fix missing
 dependency

unblocks authentik from building properly
---
 pkgs/development/python-modules/msgraph-core/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix
index 235a8be3a46a..c673d7e14421 100644
--- a/pkgs/development/python-modules/msgraph-core/default.nix
+++ b/pkgs/development/python-modules/msgraph-core/default.nix
@@ -9,7 +9,7 @@
   microsoft-kiota-abstractions,
   microsoft-kiota-authentication-azure,
   microsoft-kiota-http,
-  requests,
+  microsoft-kiota-serialization-json,
   azure-identity,
   pytestCheckHook,
   responses,
@@ -36,11 +36,12 @@ buildPythonPackage rec {
     microsoft-kiota-abstractions
     microsoft-kiota-authentication-azure
     microsoft-kiota-http
-    requests
-  ];
+  ]
+  ++ httpx.optional-dependencies.http2;
 
   nativeCheckInputs = [
     azure-identity
+    microsoft-kiota-serialization-json
     pytestCheckHook
     python-dotenv
     responses

From f1440db956e91e21a7ca576b838d2dbe1864c15f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 23:20:30 +0000
Subject: [PATCH 3484/3724] python3Packages.numbagg: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/development/python-modules/numbagg/default.nix b/pkgs/development/python-modules/numbagg/default.nix
index 6ec6156d5def..7b964d16ed46 100644
--- a/pkgs/development/python-modules/numbagg/default.nix
+++ b/pkgs/development/python-modules/numbagg/default.nix
@@ -21,7 +21,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.9.0";
+  version = "0.9.1";
   pname = "numbagg";
   pyproject = true;
 
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "numbagg";
     repo = "numbagg";
     tag = "v${version}";
-    hash = "sha256-BuD5hjAd++pW4pEQyl0UP9gd3J8SjJirtpxVE53BLpM=";
+    hash = "sha256-IathtnmGlgug+u7AS1ulgf2462br5DdU3TJBDlBPf08=";
   };
 
   build-system = [

From ded0cc94eefe85d37163de993c5ba79dc2f933b6 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 25 Aug 2025 22:55:40 +0200
Subject: [PATCH 3485/3724] ffmpeg: fixup to make rebuild count lower

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

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 9e6fba364ea0..940dd6c9ffc2 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -575,12 +575,14 @@ stdenv.mkDerivation (
       # Ffmpeg > 4 doesn't know about the flag anymore
       (enableFeature buildAvresample "avresample")
     ]
+    ++ [
+      (enableFeature buildAvutil "avutil")
+    ]
     ++ optionals (lib.versionOlder version "8.0") [
       # FFMpeg >= 8 doesn't know about the flag anymore
       (enableFeature (buildPostproc && withGPL) "postproc")
     ]
     ++ [
-      (enableFeature buildAvutil "avutil")
       (enableFeature buildSwresample "swresample")
       (enableFeature buildSwscale "swscale")
     ]
@@ -824,10 +826,10 @@ stdenv.mkDerivation (
       perl
       pkg-config
     ]
-    # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle.
-    ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ])
     # 8.0 is only compatible with nasm, and we don't want to rebuild all older ffmpeg builds at this moment.
     ++ (if versionOlder version "8.0" then [ yasm ] else [ nasm ])
+    # 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 ]
     ++ optionals withCudaNVCC [ cuda_nvcc ];
 

From b6345143a181e2fb92ec20de8340bc95acd579b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 6 Dec 2023 17:27:06 +0100
Subject: [PATCH 3486/3724] prefer-remote-fetch: add mkNugetSource

---
 pkgs/build-support/prefer-remote-fetch/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/prefer-remote-fetch/default.nix b/pkgs/build-support/prefer-remote-fetch/default.nix
index 3257e7000fe3..47b633da8faf 100644
--- a/pkgs/build-support/prefer-remote-fetch/default.nix
+++ b/pkgs/build-support/prefer-remote-fetch/default.nix
@@ -23,4 +23,5 @@ self: super: {
   fetchs3 = args: super.fetchs3 ({ preferLocalBuild = false; } // args);
   fetchsvn = args: super.fetchsvn ({ preferLocalBuild = false; } // args);
   fetchurl = args: super.fetchurl ({ preferLocalBuild = false; } // args);
+  mkNugetSource = args: super.mkNugetSource ({ preferLocalBuild = false; } // args);
 }

From 4acde7282a63863a21f297da0f0db4c643deac58 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Mon, 25 Aug 2025 19:29:13 -0400
Subject: [PATCH 3487/3724] couchdb: use quickjs instead of spidermonkey

Allows us to drop spidermonkey_91, which reached EOL years ago. We won't
switch to the latest supported spidermonkey version for couchdb(128)
because as of commit its support ends in 3 weeks, so there would be no
use trying to update it again after this. Better to just switch now and
avoid pain in the future.
---
 pkgs/servers/http/couchdb/3.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix
index 50d1d63a9825..afddb8344784 100644
--- a/pkgs/servers/http/couchdb/3.nix
+++ b/pkgs/servers/http/couchdb/3.nix
@@ -5,7 +5,6 @@
   erlang,
   icu,
   openssl,
-  spidermonkey_91,
   python3,
   nixosTests,
 }:
@@ -20,8 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   postPatch = ''
-    substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-91' "${spidermonkey_91.dev}/include/mozjs-91"
-    substituteInPlace configure --replace '/usr/include/''${SM_HEADERS}' "${spidermonkey_91.dev}/include/mozjs-91"
     patchShebangs bin/rebar
   ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -37,14 +34,14 @@ stdenv.mkDerivation rec {
   buildInputs = [
     icu
     openssl
-    spidermonkey_91
     (python3.withPackages (ps: with ps; [ requests ]))
   ];
 
   dontAddPrefix = "True";
 
   configureFlags = [
-    "--spidermonkey-version=91"
+    "--js-engine=quickjs"
+    "--disable-spidermonkey"
   ];
 
   buildFlags = [

From 8ab7ff673ef4b84a83b281ee918efbb22ab1bcfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dyego=20Aur=C3=A9lio?= <dyegoaurelio@gmail.com>
Date: Mon, 25 Aug 2025 20:32:43 -0300
Subject: [PATCH 3488/3724] forge-mtg: 1.6.65 -> 2.0.05

* updating install phase to copy file paths from their new locations

* ensuring forge-adventure has libGl so it can launch

* add mvnParameters to avoid building unnecessary packages from forge monorepo

* add desktop entry file

* update project homepage
---
 pkgs/by-name/fo/forge-mtg/no-launch4j.patch | 429 +++-----------------
 pkgs/by-name/fo/forge-mtg/package.nix       |  75 +++-
 2 files changed, 113 insertions(+), 391 deletions(-)

diff --git a/pkgs/by-name/fo/forge-mtg/no-launch4j.patch b/pkgs/by-name/fo/forge-mtg/no-launch4j.patch
index 7e9d9f4790a0..02731aa16fdb 100644
--- a/pkgs/by-name/fo/forge-mtg/no-launch4j.patch
+++ b/pkgs/by-name/fo/forge-mtg/no-launch4j.patch
@@ -1,396 +1,85 @@
-diff --git a/forge-adventure/pom.xml b/forge-adventure/pom.xml
-index b35356ea76..b7ab1c775b 100644
---- a/forge-adventure/pom.xml
-+++ b/forge-adventure/pom.xml
-@@ -47,131 +47,6 @@
-                 </configuration>
-             </plugin>
- 
--            <plugin>
--                    <groupId>com.akathist.maven.plugins.launch4j</groupId>
--                    <artifactId>launch4j-maven-plugin</artifactId>
--                    <version>1.7.25</version>
--                    <executions>
--                        <execution>
--                            <id>l4j-adv</id>
--                            <phase>package</phase>
--                            <goals>
--                                <goal>launch4j</goal>
--                            </goals>
--                            <configuration>
--                                <headerType>gui</headerType>
--                                <outfile>${project.build.directory}/forge-adventure-editor-java8.exe</outfile>
--                                <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
--                                <dontWrapJar>true</dontWrapJar>
--                                <errTitle>forge</errTitle>
--                                <icon>src/main/config/forge-adventure-editor.ico</icon>
--                                <classPath>
--                                    <mainClass>forge.adventure.Main</mainClass>
--                                    <addDependencies>false</addDependencies>
--                                    <preCp>anything</preCp>
--                                </classPath>
--                                <jre>
--                                    <minVersion>1.8.0</minVersion>
--                                    <maxHeapSize>4096</maxHeapSize>
--                                    <opts>
--                                        <opt>-Dfile.encoding=UTF-8</opt>
--                                    </opts>
--                                </jre>
--                                <versionInfo>
--                                    <fileVersion>
--                                        1.0.0.0
--                                    </fileVersion>
--                                    <txtFileVersion>
--                                        1.0.0.0
--                                    </txtFileVersion>
--                                    <fileDescription>Forge</fileDescription>
--                                    <copyright>Forge</copyright>
--                                    <productVersion>
--                                        1.0.0.0
--                                    </productVersion>
--                                    <txtProductVersion>
--                                        1.0.0.0
--                                    </txtProductVersion>
--                                    <productName>forge-adventure-editor</productName>
--                                    <internalName>forge-adventure-editor</internalName>
--                                    <originalFilename>forge-adventure-editor-java8.exe</originalFilename>
--                                </versionInfo>
--                            </configuration>
--                        </execution>
--                        <!--extra-->
--                        <execution>
--                            <id>l4j-adv2</id>
--                            <phase>package</phase>
--                            <goals>
--                                <goal>launch4j</goal>
--                            </goals>
--                            <configuration>
--                                <headerType>gui</headerType>
--                                <outfile>${project.build.directory}/forge-adventure-editor.exe</outfile>
--                                <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
--                                <dontWrapJar>true</dontWrapJar>
--                                <errTitle>forge</errTitle>
--                                <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl>
--                                <icon>src/main/config/forge-adventure-editor.ico</icon>
--                                <classPath>
--                                    <mainClass>forge.adventure.Main</mainClass>
--                                    <addDependencies>false</addDependencies>
--                                    <preCp>anything</preCp>
--                                </classPath>
--                                <jre>
--                                    <minVersion>11.0.1</minVersion>
--                                    <jdkPreference>jdkOnly</jdkPreference>
--                                    <maxHeapSize>4096</maxHeapSize>
--                                    <opts>
--                                        <opt>-Dfile.encoding=UTF-8</opt>
--                                        <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.base/java.math=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt>
--                                        <opt>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.desktop/java.awt=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.desktop/java.awt.font=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.desktop/java.awt.image=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.desktop/java.awt.color=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.desktop/sun.awt.image=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.desktop/javax.swing=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.desktop/javax.swing.border=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.desktop/javax.swing.event=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.desktop/sun.swing=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.desktop/java.beans=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.base/java.util.concurrent=ALL-UNNAMED</opt>
--                                        <opt>--add-opens java.base/java.net=ALL-UNNAMED</opt>
--                                        <opt>-Dio.netty.tryReflectionSetAccessible=true</opt>
--                                    </opts>
--                                </jre>
--                                <versionInfo>
--                                    <fileVersion>
--                                        1.0.0.0
--                                    </fileVersion>
--                                    <txtFileVersion>
--                                        1.0.0.0
--                                    </txtFileVersion>
--                                    <fileDescription>Forge</fileDescription>
--                                    <copyright>Forge</copyright>
--                                    <productVersion>
--                                        1.0.0.0
--                                    </productVersion>
--                                    <txtProductVersion>
--                                        1.0.0.0
--                                    </txtProductVersion>
--                                    <productName>forge-adventure-editor</productName>
--                                    <internalName>forge-adventure-editor</internalName>
--                                    <originalFilename>forge-adventure-editor.exe</originalFilename>
--                                </versionInfo>
--                            </configuration>
--                        </execution>
--                        <!--extra-->
--                    </executions>
--            </plugin>
--
-             <plugin>
-                 <groupId>com.google.code.maven-replacer-plugin</groupId>
-                 <artifactId>replacer</artifactId>
 diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
-index 3b74663b04..f0e324b69c 100644
+index dfe902e6b9..6fe3382f27 100644
 --- a/forge-gui-desktop/pom.xml
 +++ b/forge-gui-desktop/pom.xml
-@@ -282,59 +282,6 @@
-             <id>windows-linux-release</id>
-             <build>
-                 <plugins>
--                    <plugin>
--                        <groupId>com.akathist.maven.plugins.launch4j</groupId>
--                        <artifactId>launch4j-maven-plugin</artifactId>
--                        <version>2.1.2</version>
--                        <executions>
--                            <execution>
--                                <id>l4j-gui</id>
--                                <phase>package</phase>
--                                <goals>
--                                    <goal>launch4j</goal>
--                                </goals>
--                                <configuration>
--                                    <headerType>gui</headerType>
--                                    <outfile>${project.build.directory}/forge-java8.exe</outfile>
--                                    <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
--                                    <dontWrapJar>true</dontWrapJar>
--                                    <errTitle>forge</errTitle>
--                                    <icon>src/main/config/forge.ico</icon>
--                                    <classPath>
--                                        <mainClass>forge.view.Main</mainClass>
--                                        <addDependencies>false</addDependencies>
--                                        <preCp>anything</preCp>
--                                    </classPath>
--                                    <jre>
--                                        <minVersion>1.8.0</minVersion>
--                                        <maxHeapSize>4096</maxHeapSize>
--                                        <opts>
--                                            <opt>-Dfile.encoding=UTF-8</opt>
--                                        </opts>
--                                    </jre>
--                                    <versionInfo>
--                                        <fileVersion>
--                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
--                                        </fileVersion>
--                                        <txtFileVersion>
--                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
--                                        </txtFileVersion>
--                                        <fileDescription>Forge</fileDescription>
--                                        <copyright>Forge</copyright>
--                                        <productVersion>
--                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
--                                        </productVersion>
--                                        <txtProductVersion>
--                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
--                                        </txtProductVersion>
--                                        <productName>Forge</productName>
--                                        <internalName>forge</internalName>
--                                        <originalFilename>forge-java8.exe</originalFilename>
--                                    </versionInfo>
--                                </configuration>
--                            </execution>
--                        </executions>
--                    </plugin>
- 
-                     <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-@@ -447,130 +394,6 @@
-             <id>windows-linux</id>
-             <build>
-                 <plugins>
--                    <plugin>
--                        <groupId>com.akathist.maven.plugins.launch4j</groupId>
--                        <artifactId>launch4j-maven-plugin</artifactId>
--                        <version>2.1.2</version>
--                        <executions>
--                            <execution>
--                                <id>l4j-gui</id>
--                                <phase>package</phase>
--                                <goals>
--                                    <goal>launch4j</goal>
--                                </goals>
--                                <configuration>
--                                    <headerType>gui</headerType>
--                                    <outfile>${project.build.directory}/forge-java8.exe</outfile>
--                                    <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
--                                    <dontWrapJar>true</dontWrapJar>
--                                    <errTitle>forge</errTitle>
--                                    <icon>src/main/config/forge.ico</icon>
--                                    <classPath>
--                                        <mainClass>forge.view.Main</mainClass>
--                                        <addDependencies>false</addDependencies>
--                                        <preCp>anything</preCp>
--                                    </classPath>
--                                    <jre>
--                                        <minVersion>1.8.0</minVersion>
--                                        <maxHeapSize>4096</maxHeapSize>
--                                        <opts>
--                                            <opt>-Dfile.encoding=UTF-8</opt>
--                                        </opts>
--                                    </jre>
--                                    <versionInfo>
--                                        <fileVersion>
--                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
--                                        </fileVersion>
--                                        <txtFileVersion>
--                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
--                                        </txtFileVersion>
--                                        <fileDescription>Forge</fileDescription>
--                                        <copyright>Forge</copyright>
--                                        <productVersion>
--                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
--                                        </productVersion>
--                                        <txtProductVersion>
--                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
--                                        </txtProductVersion>
--                                        <productName>Forge</productName>
--                                        <internalName>forge</internalName>
--                                        <originalFilename>forge-java8.exe</originalFilename>
--                                    </versionInfo>
--                                </configuration>
--                            </execution>
--                            <!--extra-->
--                            <execution>
--                                <id>l4j-gui2</id>
--                                <phase>package</phase>
--                                <goals>
--                                    <goal>launch4j</goal>
--                                </goals>
--                                <configuration>
--                                    <headerType>gui</headerType>
--                                    <outfile>${project.build.directory}/forge.exe</outfile>
--                                    <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
--                                    <dontWrapJar>true</dontWrapJar>
--                                    <errTitle>forge</errTitle>
--                                    <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl>
--                                    <icon>src/main/config/forge.ico</icon>
--                                    <classPath>
--                                        <mainClass>forge.view.Main</mainClass>
--                                        <addDependencies>false</addDependencies>
--                                        <preCp>anything</preCp>
--                                    </classPath>
--                                    <jre>
--                                        <minVersion>11.0.1</minVersion>
--                                        <jdkPreference>jdkOnly</jdkPreference>
--                                        <maxHeapSize>4096</maxHeapSize>
--                                        <opts>
--                                            <opt>-Dfile.encoding=UTF-8</opt>
--                                            <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.base/java.math=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt>
--                                            <opt>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.desktop/java.awt=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.desktop/java.awt.font=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.desktop/java.awt.image=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.desktop/java.awt.color=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.desktop/sun.awt.image=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.desktop/javax.swing=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.desktop/javax.swing.border=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.desktop/javax.swing.event=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.desktop/sun.swing=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.desktop/java.beans=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.base/java.util.concurrent=ALL-UNNAMED</opt>
--                                            <opt>--add-opens java.base/java.net=ALL-UNNAMED</opt>
--                                            <opt>-Dio.netty.tryReflectionSetAccessible=true</opt>
--                                        </opts>
--                                    </jre>
--                                    <versionInfo>
--                                        <fileVersion>
--                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
--                                        </fileVersion>
--                                        <txtFileVersion>
--                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
--                                        </txtFileVersion>
--                                        <fileDescription>Forge</fileDescription>
--                                        <copyright>Forge</copyright>
--                                        <productVersion>
--                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
--                                        </productVersion>
--                                        <txtProductVersion>
--                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
--                                        </txtProductVersion>
--                                        <productName>Forge</productName>
--                                        <internalName>forge</internalName>
--                                        <originalFilename>forge.exe</originalFilename>
--                                    </versionInfo>
--                                </configuration>
--                            </execution>
--                            <!--extra-->
--                        </executions>
--                    </plugin>
- 
-                     <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
-index e7439c1e3a..de0cbc16a1 100644
---- a/forge-gui-mobile-dev/pom.xml
-+++ b/forge-gui-mobile-dev/pom.xml
-@@ -64,130 +64,6 @@
-                     </replacements>
-                 </configuration>
+@@ -70,62 +70,6 @@
+                     </execution>
+                 </executions>
              </plugin>
 -            <plugin>
 -                <groupId>com.akathist.maven.plugins.launch4j</groupId>
 -                <artifactId>launch4j-maven-plugin</artifactId>
--                <version>1.7.25</version>
+-                <version>2.5.1</version>
 -                <executions>
 -                    <execution>
--                        <id>l4j-adv</id>
+-                        <id>l4j-gui</id>
 -                        <phase>package</phase>
 -                        <goals>
 -                            <goal>launch4j</goal>
 -                        </goals>
 -                        <configuration>
 -                            <headerType>gui</headerType>
--                            <outfile>${project.build.directory}/forge-adventure-java8.exe</outfile>
+-                            <outfile>${project.build.directory}/forge.exe</outfile>
 -                            <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
 -                            <dontWrapJar>true</dontWrapJar>
 -                            <errTitle>forge</errTitle>
--                            <icon>src/main/config/forge-adventure.ico</icon>
+-                            <downloadUrl>https://bell-sw.com/pages/downloads/#jdk-17-lts</downloadUrl>
+-                            <icon>src/main/config/forge.ico</icon>
 -                            <classPath>
--                                <mainClass>forge.app.Main</mainClass>
+-                                <mainClass>forge.view.Main</mainClass>
 -                                <addDependencies>false</addDependencies>
 -                                <preCp>anything</preCp>
 -                            </classPath>
 -                            <jre>
--                                <minVersion>1.8.0</minVersion>
+-                                <minVersion>17</minVersion>
+-                                <requiresJdk>true</requiresJdk>
 -                                <maxHeapSize>4096</maxHeapSize>
 -                                <opts>
--                                    <opt>-Dfile.encoding=UTF-8</opt>
+-                                    <opt>${mandatory.java.args}</opt>
+-                                    <opt>${addopen.java.args}</opt>
 -                                </opts>
 -                            </jre>
 -                            <versionInfo>
 -                                <fileVersion>
--                                    1.0.0.0
+-                                    ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
 -                                </fileVersion>
 -                                <txtFileVersion>
--                                    1.0.0.0
+-                                    ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
 -                                </txtFileVersion>
 -                                <fileDescription>Forge</fileDescription>
 -                                <copyright>Forge</copyright>
 -                                <productVersion>
--                                    1.0.0.0
+-                                    ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
 -                                </productVersion>
 -                                <txtProductVersion>
--                                    1.0.0.0
+-                                    ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
 -                                </txtProductVersion>
--                                <productName>forge-adventure</productName>
--                                <internalName>forge-adventure</internalName>
--                                <originalFilename>forge-adventure-java8.exe</originalFilename>
+-                                <productName>Forge</productName>
+-                                <internalName>forge</internalName>
+-                                <originalFilename>forge.exe</originalFilename>
 -                            </versionInfo>
 -                        </configuration>
 -                    </execution>
--                    <!--extra-->
+-                </executions>
+-            </plugin>
+             <plugin>
+                 <groupId>com.google.code.maven-replacer-plugin</groupId>
+                 <artifactId>replacer</artifactId>
+diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
+index 168ecba1dc..748dbf47b7 100644
+--- a/forge-gui-mobile-dev/pom.xml
++++ b/forge-gui-mobile-dev/pom.xml
+@@ -60,57 +60,6 @@
+                     <target>17</target>
+                 </configuration>
+             </plugin>
+-            <plugin>
+-                <groupId>com.akathist.maven.plugins.launch4j</groupId>
+-                <artifactId>launch4j-maven-plugin</artifactId>
+-                <version>2.5.1</version>
+-                <executions>
 -                    <execution>
--                        <id>l4j-adv2</id>
+-                        <id>l4j-adv</id>
 -                        <phase>package</phase>
 -                        <goals>
 -                            <goal>launch4j</goal>
@@ -401,40 +90,14 @@ index e7439c1e3a..de0cbc16a1 100644
 -                            <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
 -                            <dontWrapJar>true</dontWrapJar>
 -                            <errTitle>forge</errTitle>
--                            <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl>
+-                            <downloadUrl>https://bell-sw.com/pages/downloads/#jdk-17-lts</downloadUrl>
 -                            <icon>src/main/config/forge-adventure.ico</icon>
--                            <classPath>
--                                <mainClass>forge.app.Main</mainClass>
--                                <addDependencies>false</addDependencies>
--                                <preCp>anything</preCp>
--                            </classPath>
 -                            <jre>
--                                <minVersion>11.0.1</minVersion>
--                                <jdkPreference>jdkOnly</jdkPreference>
+-                                <minVersion>17</minVersion>
+-                                <requiresJdk>true</requiresJdk>
 -                                <maxHeapSize>4096</maxHeapSize>
 -                                <opts>
--                                    <opt>-Dfile.encoding=UTF-8</opt>
--                                    <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.base/java.math=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt>
--                                    <opt>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.desktop/java.awt=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.desktop/java.awt.font=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.desktop/java.awt.image=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.desktop/java.awt.color=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.desktop/sun.awt.image=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.desktop/javax.swing=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.desktop/javax.swing.border=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.desktop/javax.swing.event=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.desktop/sun.swing=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.desktop/java.beans=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.base/java.util.concurrent=ALL-UNNAMED</opt>
--                                    <opt>--add-opens java.base/java.net=ALL-UNNAMED</opt>
--                                    <opt>-Dio.netty.tryReflectionSetAccessible=true</opt>
+-                                    <opt>${mandatory.java.args}</opt>
 -                                </opts>
 -                            </jre>
 -                            <versionInfo>
@@ -462,5 +125,5 @@ index e7439c1e3a..de0cbc16a1 100644
 -                </executions>
 -            </plugin>
              <plugin>
-                 <artifactId>maven-assembly-plugin</artifactId>
-                 <configuration>
+                 <groupId>com.google.code.maven-replacer-plugin</groupId>
+                 <artifactId>replacer</artifactId>
diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix
index dedce0dd3cd3..683fe9a51f31 100644
--- a/pkgs/by-name/fo/forge-mtg/package.nix
+++ b/pkgs/by-name/fo/forge-mtg/package.nix
@@ -6,16 +6,20 @@
   maven,
   makeWrapper,
   openjdk,
+  libGL,
+  makeDesktopItem,
+  copyDesktopItems,
+  imagemagick,
 }:
 
 let
-  version = "1.6.65";
+  version = "2.0.05";
 
   src = fetchFromGitHub {
     owner = "Card-Forge";
     repo = "forge";
     rev = "forge-${version}";
-    hash = "sha256-MCJl3nBHbX/O24bzD4aQ12eMWxYY2qJC5vomvtsIBek=";
+    hash = "sha256-71CZBI4FvN5X7peDjhv+0cdTYv8hWwzM8ePdvQSb6QI=";
   };
 
   # launch4j downloads and runs a native binary during the package phase.
@@ -26,11 +30,56 @@ maven.buildMavenPackage {
   pname = "forge-mtg";
   inherit version src patches;
 
-  mvnHash = "sha256-ouF0Ja3oGrlUCcT0PzI5i9FQ+oLdEhE/LvhJ0QGErvI=";
+  mvnHash = "sha256-krPOUaJTo5i3imkDvEkBJH3W01y1KypdvitqmZ5JMMA=";
 
   doCheck = false; # Needs a running Xorg
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+    copyDesktopItems
+    imagemagick
+  ];
+  desktopItems = [
+    (makeDesktopItem {
+      name = "forge";
+      exec = "forge";
+      actions = {
+        forge-adventure = {
+          exec = "forge-adventure";
+          name = "Play Adventure";
+        };
+        forge-adventure-editor = {
+          exec = "forge-adventure-editor";
+          name = "Adventure Editor";
+        };
+        forge-classic = {
+          exec = "forge";
+          name = "Play Classic";
+        };
+      };
+      icon = "forge-mtg";
+      comment = "Magic: the Gathering card game with rules enforcement";
+      desktopName = "Forge MTG";
+      genericName = "Card Game";
+      categories = [
+        "Game"
+        "BoardGame"
+      ];
+      keywords = [
+        "Magic"
+        "MTG"
+        "Card Game"
+        "Trading Card Game"
+        "TCG"
+      ];
+    })
+  ];
+
+  mvnParameters = lib.escapeShellArgs [
+    "-pl"
+    ":adventure-editor,:forge-gui-desktop,:forge-gui-mobile-dev" # forge-gui-mobile-dev is required for forge-adventure
+    "--also-make"
+  ];
 
   installPhase = ''
     runHook preInstall
@@ -40,16 +89,25 @@ maven.buildMavenPackage {
       forge-gui-desktop/target/forge-gui-desktop-${version}-jar-with-dependencies.jar \
       forge-gui-mobile-dev/target/forge-adventure.sh \
       forge-gui-mobile-dev/target/forge-gui-mobile-dev-${version}-jar-with-dependencies.jar \
-      forge-adventure/target/forge-adventure-editor.sh \
-      forge-adventure/target/forge-adventure-${version}-jar-with-dependencies.jar \
+      adventure-editor/target/adventure-editor-jar-with-dependencies.jar \
       forge-gui/res \
       $out/share/forge
+    cp adventure-editor/target/adventure-editor.sh $out/share/forge/forge-adventure-editor.sh
+
+    mkdir -p $out/share/icons/hicolor/128x128/apps
+    magick AppIcon.png -resize 128x128 $out/share/icons/hicolor/128x128/apps/forge-mtg.png
+
     runHook postInstall
   '';
 
   preFixup = ''
     for commandToInstall in forge forge-adventure forge-adventure-editor; do
       chmod 555 $out/share/forge/$commandToInstall.sh
+      PREFIX_CMD=""
+      if [ "$commandToInstall" = "forge-adventure" ]; then
+        PREFIX_CMD="--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}"
+      fi
+
       makeWrapper $out/share/forge/$commandToInstall.sh $out/bin/$commandToInstall \
         --prefix PATH : ${
           lib.makeBinPath [
@@ -59,13 +117,14 @@ maven.buildMavenPackage {
           ]
         } \
         --set JAVA_HOME ${openjdk}/lib/openjdk \
-        --set SENTRY_DSN ""
+        --set SENTRY_DSN "" \
+        $PREFIX_CMD
     done
   '';
 
   meta = with lib; {
     description = "Magic: the Gathering card game with rules enforcement";
-    homepage = "https://www.slightlymagic.net/forum/viewforum.php?f=26";
+    homepage = "https://card-forge.github.io/forge";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ eigengrau ];
   };

From b7609ba68d220133f8918a1989aa6eff59aeae48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dyego=20Aur=C3=A9lio?= <dyegoaurelio@gmail.com>
Date: Thu, 21 Aug 2025 09:41:28 -0300
Subject: [PATCH 3489/3724] forge-mtg: add updateScript
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Christopher Fredén <me@icetan.org>
---
 pkgs/by-name/fo/forge-mtg/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix
index 683fe9a51f31..ef078bbe0298 100644
--- a/pkgs/by-name/fo/forge-mtg/package.nix
+++ b/pkgs/by-name/fo/forge-mtg/package.nix
@@ -10,6 +10,7 @@
   makeDesktopItem,
   copyDesktopItems,
   imagemagick,
+  nix-update-script,
 }:
 
 let
@@ -122,6 +123,10 @@ maven.buildMavenPackage {
     done
   '';
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=forge-(.*)" ];
+  };
+
   meta = with lib; {
     description = "Magic: the Gathering card game with rules enforcement";
     homepage = "https://card-forge.github.io/forge";

From 4e310e5fcdd9b86608b1b880786ab34897b98c68 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 26 Aug 2025 07:34:36 +0800
Subject: [PATCH 3490/3724] pantheon.elementary-screenshot: 8.0.2 -> 8.0.3

https://github.com/elementary/screenshot/compare/8.0.2...8.0.3
---
 pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
index 5b854127ecd2..522c65c5e9c1 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-screenshot";
-  version = "8.0.2";
+  version = "8.0.3";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "screenshot";
     rev = version;
-    hash = "sha256-yCLaiwR1zRoQZI8QVt0oMMGyS7xjaO7gbj7XfphBL2o=";
+    hash = "sha256-nEJCyQs77zcUb9mc2dUBbZP3zWdPFHTOORROe3u6sSA=";
   };
 
   nativeBuildInputs = [

From adc23de0145d2f29c72243e2190fb379fbaa0870 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 23:41:49 +0000
Subject: [PATCH 3491/3724] vscode-extensions.banacorn.agda-mode: 0.6.4 ->
 0.6.5

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 6e155a6b10b7..7049dbea35f3 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -493,8 +493,8 @@ let
         mktplcRef = {
           publisher = "banacorn";
           name = "agda-mode";
-          version = "0.6.4";
-          hash = "sha256-KBOVVVDw+72QSYv4jynqeVBdIfYz+T5hD2//royVJpw=";
+          version = "0.6.5";
+          hash = "sha256-fq3JiqdtYN9kAWDvu8X+2mlU5kj2RwUTPA4QF43vShQ=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog";

From 806e4f002867f02f2bf2ffeda76f6c108dd7fbff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 23:45:45 +0000
Subject: [PATCH 3492/3724] vscode-extensions.chanhx.crabviz: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 6e155a6b10b7..220c062ac57a 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -920,8 +920,8 @@ let
         mktplcRef = {
           name = "crabviz";
           publisher = "chanhx";
-          version = "0.4.0";
-          hash = "sha256-SOsoSQLDNRqby91Ire4euSz6udRZI6G/RVloVjIvhUM=";
+          version = "0.5.0";
+          hash = "sha256-YLNx/9jmHc0HDm/yHquOlMDPmAbpIdd6UZn0JZQVJko=";
         };
         meta = {
           description = "VSCode extension for generating call graphs based on LSP";

From a51a0739f4b355e36731a31f164f71f5aa1fd8ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Aug 2025 23:46:39 +0000
Subject: [PATCH 3493/3724] vscode-extensions.elixir-lsp.vscode-elixir-ls:
 0.29.2 -> 0.29.3

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 6e155a6b10b7..52c5608bfef7 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1614,8 +1614,8 @@ let
         mktplcRef = {
           name = "elixir-ls";
           publisher = "JakeBecker";
-          version = "0.29.2";
-          hash = "sha256-+MkKUhyma/mc5MZa0+RFty5i7rox0EARPTm/uggQj6M=";
+          version = "0.29.3";
+          hash = "sha256-cghDjgv3FWsNpnH6Pa9iPuiPOlLI/iucGH+fzF35ERk=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";

From 47fd2277580b4e4efa957cb13021ca55311bbb0a Mon Sep 17 00:00:00 2001
From: Clover Ison <clover@isons.org>
Date: Sun, 24 Aug 2025 14:38:33 -0700
Subject: [PATCH 3494/3724] minefair: init at 1.5.0

---
 pkgs/by-name/mi/minefair/package.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 pkgs/by-name/mi/minefair/package.nix

diff --git a/pkgs/by-name/mi/minefair/package.nix b/pkgs/by-name/mi/minefair/package.nix
new file mode 100644
index 000000000000..2fc84795abb9
--- /dev/null
+++ b/pkgs/by-name/mi/minefair/package.nix
@@ -0,0 +1,25 @@
+{
+  fetchFromGitHub,
+  rustPlatform,
+  lib,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "minefair";
+  version = "1.5.0";
+  src = fetchFromGitHub {
+    owner = "LyricLy";
+    repo = "minefair";
+    tag = finalAttrs.version;
+    hash = "sha256-gABgSjS+ZhzmWJsCbbWMFstFAoTJ+Yc159CCo5nhYBc=";
+  };
+  cargoHash = "sha256-s4Wlp3IUPDuArf9N+9qWZH7JjQeczYi1phpUs7SNUd4=";
+
+  meta = {
+    description = "Fair and infinite implementation of Minesweeper";
+    homepage = "https://github.com/LyricLy/minefair";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.pyrotelekinetic ];
+    mainProgram = "minefair";
+  };
+})

From fbfcacf42af64042b2eb76f794a0f04263e0bbbb Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 25 Aug 2025 17:17:57 -0700
Subject: [PATCH 3495/3724] python3Packages.argos-translate-files: modernize,
 fix missing deps

---
 .../argos-translate-files/default.nix         | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/argos-translate-files/default.nix b/pkgs/development/python-modules/argos-translate-files/default.nix
index 933238b68cba..c0917a76e03c 100644
--- a/pkgs/development/python-modules/argos-translate-files/default.nix
+++ b/pkgs/development/python-modules/argos-translate-files/default.nix
@@ -2,37 +2,44 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  writableTmpDirAsHomeHook,
+  setuptools,
   lxml,
+  pymupdf,
+  pysrt,
   translatehtml,
 }:
 
 buildPythonPackage rec {
   pname = "argos-translate-files";
   version = "1.4.0";
-
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-vKnPL0xgyJ1vYtB2AgnKv4BqigSiFYmIm5HBq4hQ7nI=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     lxml
+    pymupdf
+    pysrt
     translatehtml
   ];
 
+  nativeCheckInputs = [
+    # pythonImportsCheck needs a home dir for argostranslatefiles
+    writableTmpDirAsHomeHook
+  ];
+
   postPatch = ''
     ln -s */requires.txt requirements.txt
   '';
 
-  # required for import check to work (argostranslate)
-  env.HOME = "/tmp";
-
   pythonImportsCheck = [ "argostranslatefiles" ];
 
-  doCheck = false; # no tests
-
   meta = with lib; {
     description = "Translate files using Argos Translate";
     homepage = "https://www.argosopentech.com";

From 6a6408eb90f92b15edca8b59c04689e7632a25e7 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 26 Aug 2025 00:15:34 +0200
Subject: [PATCH 3496/3724] python3Packages.unifi: drop

---
 .../python-modules/unifi/default.nix          | 29 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 pkgs/development/python-modules/unifi/default.nix

diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix
deleted file mode 100644
index daebd11ee3c0..000000000000
--- a/pkgs/development/python-modules/unifi/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  urllib3,
-}:
-
-buildPythonPackage rec {
-  pname = "unifi";
-  version = "1.2.5";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0prgx01hzs49prrazgxrinm7ivqzy57ch06qm2h7s1p957sazds8";
-  };
-
-  propagatedBuildInputs = [ urllib3 ];
-
-  # upstream has no tests
-  doCheck = false;
-
-  meta = with lib; {
-    description = "API towards the Ubiquity Networks UniFi controller";
-    homepage = "https://pypi.python.org/pypi/unifi/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index cb4854915657..5c035de23c1f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -828,6 +828,7 @@ mapAliases ({
   ufoLib2 = ufolib2; # added 2024-01-07
   ukrainealarm = throw "ukrainealarm has been removed, as it has been replaced as a home-assistant dependency by uasiren."; # added 2024-01-05
   unblob-native = throw "unblob-native has been removed because its functionality is merged into unblob 25.4.14."; # Added 2025-05-02
+  unifi = throw "'unifi' has been removed as upstream was archived in 2017"; # Added 2025-08-25
   unittest2 = throw "unittest2 has been removed as it's a backport of unittest that's unmaintained and not needed beyond Python 3.4."; # added 2022-12-01
   update_checker = update-checker; # added 2024-01-07
   uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1933dcc869dc..63a2b6385f5d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19265,8 +19265,6 @@ self: super: with self; {
 
   unidiff = callPackage ../development/python-modules/unidiff { };
 
-  unifi = callPackage ../development/python-modules/unifi { };
-
   unifi-ap = callPackage ../development/python-modules/unifi-ap { };
 
   unifi-discovery = callPackage ../development/python-modules/unifi-discovery { };

From dc88b258814331bc45ef3fd74637939a6d5a5b0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 00:29:34 +0000
Subject: [PATCH 3497/3724] rime-wanxiang: 11.1.4 -> 11.3.1

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

diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix
index 0f4679d2cf3a..ee4f4c1d55e9 100644
--- a/pkgs/by-name/ri/rime-wanxiang/package.nix
+++ b/pkgs/by-name/ri/rime-wanxiang/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rime-wanxiang";
-  version = "11.1.4";
+  version = "11.3.1";
 
   src = fetchFromGitHub {
     owner = "amzxyz";
     repo = "rime_wanxiang";
     tag = "v" + finalAttrs.version;
-    hash = "sha256-mBfa2XF76dMv5Et54I0LQwgelKAdosLXaO3zPpS5nAU=";
+    hash = "sha256-tCQ2mPOw7meA7ex7e4BgVco86MNNtxsSC9L6oaVebo4=";
   };
 
   nativeBuildInputs = [

From ddc03319fe55663e2273cbb8689db475ea42bce5 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 26 Aug 2025 00:07:32 +0200
Subject: [PATCH 3498/3724] elm-github-install: drop

---
 .../elm-github-install/default.nix            | 30 -------------------
 pkgs/top-level/aliases.nix                    |  2 +-
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 pkgs/tools/package-management/elm-github-install/default.nix

diff --git a/pkgs/tools/package-management/elm-github-install/default.nix b/pkgs/tools/package-management/elm-github-install/default.nix
deleted file mode 100644
index d5b945fcb205..000000000000
--- a/pkgs/tools/package-management/elm-github-install/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  bundlerEnv,
-  ruby,
-  bundlerUpdateScript,
-}:
-
-bundlerEnv rec {
-  pname = "elm_install";
-  name = "elm-github-install-${version}";
-
-  version = (import ./gemset.nix).elm_install.version;
-
-  inherit ruby;
-  gemdir = ./.;
-
-  passthru.updateScript = bundlerUpdateScript "elm-github-install";
-
-  meta = with lib; {
-    description = "Install Elm packages from git repositories";
-    homepage = "https://github.com/gdotdesign/elm-github-install";
-    license = licenses.unfree;
-    maintainers = with maintainers; [
-      roberth
-      nicknovitski
-    ];
-    platforms = platforms.all;
-    mainProgram = "elm-install";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ada5eb0b9855..de409c4563d2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -799,7 +799,7 @@ mapAliases {
   eintopf = lauti; # Project was renamed, added 2025-05-01
   elasticsearch7Plugins = elasticsearchPlugins;
   electronplayer = throw "'electronplayer' has been removed as it had been discontinued upstream since October 2024"; # Added 2024-12-17
-
+  elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25
   element-desktop-wayland = throw "element-desktop-wayland has been removed. Consider setting NIXOS_OZONE_WL=1 via 'environment.sessionVariables' instead"; # Added 2024-12-17
   elementsd-simplicity = throw "'elementsd-simplicity' has been removed due to lack of maintenance, consider using 'elementsd' instead"; # Added 2025-06-04
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d0914e36e76..2fe0f1fdcafc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2045,8 +2045,6 @@ with pkgs;
     conf = config.element-web.conf or { };
   };
 
-  elm-github-install = callPackage ../tools/package-management/elm-github-install { };
-
   espanso-wayland = espanso.override {
     x11Support = false;
     waylandSupport = !stdenv.hostPlatform.isDarwin;

From 537f408abf80633050afb46f0fea680759e94128 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sun, 24 Aug 2025 19:20:32 +0300
Subject: [PATCH 3499/3724] qemu: Fix Python deps, the third time

Hooks from `python` (specifically the one that adds `pythonPath`) are needed by `python/scripts/mkvenv.py` to find meson

With `python.withPackages`

```
python determined to be '/nix/store/r98crvxg8pmrvx9vzymhlwbbvffnzjhl-python3-3.13.6-env/bin/python3'
python version: Python 3.13.6
mkvenv: Creating non-isolated virtual environment (with packages from '/nix/store/r98crvxg8pmrvx9vzymhlwbbvffnzjhl-python3-3.13.6-env/lib/python3.13/site-packages') at 'pyvenv'
mkvenv: checking for meson>=1.5.0
mkvenv: checking for pycotap>=1.1.0
mkvenv: installing meson==1.5.0, pycotap==1.3.1
```

With `pythonPackages.python`

```
python version: Python 3.13.6
mkvenv: Creating non-isolated virtual environment at 'pyvenv'
mkvenv: checking for meson>=1.5.0
mkvenv: checking for pycotap>=1.1.0
mkvenv: installing pycotap==1.3.1
```

Here's a diff of the env-vars https://gist.github.com/Artturin/e79f1fcf125ebb138c0012008e719533

the `withPackages` without `pythonOnBuildForHost` was wrong too but
changing it didn't fix the issue

Fixes this error in qemu-user / qemu minimal

```
$ ./result/bin/qemu-aarch64
./result/bin/qemu-aarch64: error while loading shared libraries: libz.so.1: cannot open shared object file: No such file or directory
```

Co-authored-by: dramforever <dramforever@live.com>
---
 pkgs/applications/virtualization/qemu/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 98542ee3aabc..4e313ed8784c 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -169,8 +169,12 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     perl
 
-    # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation
-    (python3Packages.python.withPackages (ps: with ps; [ distlib ]))
+    # For python changes other than simple package additions, ping @dramforever for review.
+    # Don't change `python3Packages` to `python3.pkgs.*`, breaks cross-compilation.
+    python3Packages.distlib
+    # Hooks from the python package are needed to add `$pythonPath` so
+    # `python/scripts/mkvenv.py` can detect `meson` otherwise the vendored meson without patches will be used.
+    python3Packages.python
   ]
   ++ lib.optionals gtkSupport [ wrapGAppsHook3 ]
   ++ lib.optionals enableDocs [

From 7e1a0d8a2e329ef48d0c8d10f219cf64c8d781f5 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Mon, 25 Aug 2025 20:55:26 -0400
Subject: [PATCH 3500/3724] audiobookshelf: 2.28.0 -> 2.29.0

changelog: https://github.com/advplyr/audiobookshelf/releases/tag/v2.29.0
---
 pkgs/by-name/au/audiobookshelf/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix
index 44dcf2e39fde..5afc714b5bf8 100644
--- a/pkgs/by-name/au/audiobookshelf/package.nix
+++ b/pkgs/by-name/au/audiobookshelf/package.nix
@@ -15,10 +15,10 @@
 
 let
   source = {
-    version = "2.28.0";
-    hash = "sha256-bbsiaSGIaD5oFnhk3e+SWzYxv4dsRXrgMVbe1lsj4pw=";
-    npmDepsHash = "sha256-JC2uOXV+EwS6CGwyOUTXcymFwLSz/KUqIoB4ccSGgbw=";
-    clientNpmDepsHash = "sha256-6l8apOd3R259+SlcD6P6rx1FkRnB80keoBGcfbQNhGU=";
+    version = "2.29.0";
+    hash = "sha256-Vewznln5Ny8SWfOfyusnDcO9CsTwWrOTP+W8ynnSdR0=";
+    npmDepsHash = "sha256-zk2Xw3lpy/ZBZZKSsMgdIHrKGB7yl9GYtewn9ME1guc=";
+    clientNpmDepsHash = "sha256-mDS/onnotiBTFihoSMSccF/mrdTduZj5DZfQpyzMoDY=";
   };
 
   src = fetchFromGitHub {

From fe130ce98872b7b2b72db7573059cbdf57e70bc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 01:34:11 +0000
Subject: [PATCH 3501/3724] json-fortran: 9.0.4 -> 9.0.5

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

diff --git a/pkgs/by-name/js/json-fortran/package.nix b/pkgs/by-name/js/json-fortran/package.nix
index aa18a56a6899..ffe328b197bb 100644
--- a/pkgs/by-name/js/json-fortran/package.nix
+++ b/pkgs/by-name/js/json-fortran/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "json-fortran";
-  version = "9.0.4";
+  version = "9.0.5";
 
   src = fetchFromGitHub {
     owner = "jacobwilliams";
     repo = "json-fortran";
     rev = version;
-    hash = "sha256-tLDs/yh9xMfZd2m+jD6Mm3Lr4asI4SrBDOAU2vN5OfA=";
+    hash = "sha256-4IyysBcGKJKET8A5Bbbd5WJtlNh/7EdHuXsR6B/VDh0=";
   };
 
   nativeBuildInputs = [

From b339519d06285ddef3705117368ddc17eff1a6e1 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 26 Aug 2025 02:35:49 +0100
Subject: [PATCH 3502/3724] vimPlugins.vim-rhai: init at 2022-07-16

Add vim-rhai plugin (https://github.com/rhaiscript/vim-rhai) which
provides syntax highlighting for the Rhai scripting language.

Closes https://github.com/NixOS/nixpkgs/issues/433005
---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 78c064422cec..824bc77bab26 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -20126,6 +20126,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  vim-rhai = buildVimPlugin {
+    pname = "vim-rhai";
+    version = "2022-07-16";
+    src = fetchFromGitHub {
+      owner = "rhaiscript";
+      repo = "vim-rhai";
+      rev = "b0585e2c92a4a64edcd060836ae41d1e698ebc20";
+      sha256 = "0m36d7f2zkb5197k3gfjdhidpl2j50y2n2ywg1mxv4a55b06vfbh";
+    };
+    meta.homepage = "https://github.com/rhaiscript/vim-rhai/";
+    meta.hydraPlatforms = [ ];
+  };
+
   vim-rhubarb = buildVimPlugin {
     pname = "vim-rhubarb";
     version = "2025-06-27";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 530c56e0394f..4a25393ce569 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1545,6 +1545,7 @@ https://github.com/tpope/vim-ragtag/,,
 https://github.com/tpope/vim-rails/,,
 https://github.com/jordwalke/vim-reasonml/,,
 https://github.com/tpope/vim-repeat/,,
+https://github.com/rhaiscript/vim-rhai/,,
 https://github.com/tpope/vim-rhubarb/,,
 https://github.com/airblade/vim-rooter/,,
 https://github.com/tpope/vim-rsi/,,

From 95da0e564863c99fc662201de77836008ff19384 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Mon, 25 Aug 2025 18:43:29 -0700
Subject: [PATCH 3503/3724] dbus-sharp{,-glib}-{1,2}_0: remove

---
 .../dbus-sharp-glib/dbus-sharp-glib-1.0.nix   | 40 -------------------
 .../libraries/dbus-sharp-glib/default.nix     | 40 -------------------
 .../libraries/dbus-sharp/dbus-sharp-1.0.nix   | 36 -----------------
 .../libraries/dbus-sharp/default.nix          | 39 ------------------
 pkgs/top-level/aliases.nix                    |  6 ++-
 pkgs/top-level/all-packages.nix               |  7 ----
 6 files changed, 5 insertions(+), 163 deletions(-)
 delete mode 100644 pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
 delete mode 100644 pkgs/development/libraries/dbus-sharp-glib/default.nix
 delete mode 100644 pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
 delete mode 100644 pkgs/development/libraries/dbus-sharp/default.nix

diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
deleted file mode 100644
index 077c52be3735..000000000000
--- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  pkg-config,
-  mono,
-  dbus-sharp-1_0,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dbus-sharp-glib";
-  version = "0.5";
-
-  src = fetchFromGitHub {
-    owner = "mono";
-    repo = "dbus-sharp-glib";
-
-    rev = "v${version}";
-    sha256 = "0z8ylzby8n5sar7aywc8rngd9ap5qqznadsscp5v34cacdfz1gxm";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    autoreconfHook
-    mono # gmcs
-  ];
-  buildInputs = [
-    mono
-    dbus-sharp-1_0
-  ];
-
-  dontStrip = true;
-
-  meta = with lib; {
-    description = "D-Bus for .NET: GLib integration module";
-    platforms = platforms.linux;
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix
deleted file mode 100644
index 538a14597b10..000000000000
--- a/pkgs/development/libraries/dbus-sharp-glib/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  mono,
-  dbus-sharp-2_0,
-  autoreconfHook,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dbus-sharp-glib";
-  version = "0.6";
-
-  src = fetchFromGitHub {
-    owner = "mono";
-    repo = "dbus-sharp-glib";
-
-    rev = "v${version}";
-    sha256 = "0i39kfg731as6j0hlmasgj8dyw5xsak7rl2dlimi1naphhffwzm8";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    autoreconfHook
-    mono # gmcs
-  ];
-  buildInputs = [
-    mono
-    dbus-sharp-2_0
-  ];
-
-  dontStrip = true;
-
-  meta = with lib; {
-    description = "D-Bus for .NET: GLib integration module";
-    platforms = platforms.linux;
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
deleted file mode 100644
index e949ebb05fe5..000000000000
--- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  mono,
-  autoreconfHook,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dbus-sharp";
-  version = "0.7";
-
-  src = fetchFromGitHub {
-    owner = "mono";
-    repo = "dbus-sharp";
-
-    rev = "v${version}";
-    sha256 = "13qlqx9wqahfpzzl59157cjxprqcx2bd40w5gb2bs3vdx058p562";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    autoreconfHook
-    mono # gmcs
-  ];
-  buildInputs = [ mono ];
-
-  dontStrip = true;
-
-  meta = with lib; {
-    description = "D-Bus for .NET";
-    platforms = platforms.linux;
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
deleted file mode 100644
index 31bb564d3a5a..000000000000
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  mono4,
-  autoreconfHook,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dbus-sharp";
-  version = "0.8.1";
-
-  src = fetchFromGitHub {
-    owner = "mono";
-    repo = "dbus-sharp";
-
-    rev = "v${version}";
-    sha256 = "1g5lblrvkd0wnhfzp326by6n3a9mj2bj7a7646g0ziwgsxp5w6y7";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    autoreconfHook
-    mono4 # gmcs
-  ];
-
-  # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
-  # See: https://github.com/NixOS/nixpkgs/pull/46060
-  buildInputs = [ mono4 ];
-
-  dontStrip = true;
-
-  meta = with lib; {
-    description = "D-Bus for .NET";
-    platforms = platforms.linux;
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 87e506f06df1..c959b6fb2f88 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -723,8 +723,12 @@ mapAliases {
   daytona-bin = throw "'daytona-bin' has been removed, as it was unmaintained in nixpkgs"; # Added 2025-07-21
   dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16
   dbench = throw "'dbench' has been removed as it is unmaintained for 14 years and broken"; # Added 2025-05-17
-  dclib = throw "'dclib' has been removed as it is unmaintained for 16 years and broken"; # Added 2025-05-25
   dbus-map = throw "'dbus-map' has been dropped as it is unmaintained"; # Added 2024-11-01
+  dbus-sharp-1_0 = throw "'dbus-sharp-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
+  dbus-sharp-2_0 = throw "'dbus-sharp-2_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
+  dbus-sharp-glib-1_0 = throw "'dbus-sharp-glib-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
+  dbus-sharp-glib-2_0 = throw "'dbus-sharp-glib-2_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
+  dclib = throw "'dclib' has been removed as it is unmaintained for 16 years and broken"; # Added 2025-05-25
   deadpixi-sam = deadpixi-sam-unstable;
 
   debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04521e6c4eab..d06823d4f8df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7518,13 +7518,6 @@ with pkgs;
   db62 = callPackage ../development/libraries/db/db-6.2.nix { };
 
   dbus = callPackage ../development/libraries/dbus { };
-  dbus-sharp-1_0 = callPackage ../development/libraries/dbus-sharp/dbus-sharp-1.0.nix { };
-  dbus-sharp-2_0 = callPackage ../development/libraries/dbus-sharp { };
-
-  dbus-sharp-glib-1_0 =
-    callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
-      { };
-  dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { };
 
   makeDBusConf = callPackage ../development/libraries/dbus/make-dbus-conf.nix { };
 

From 3a4fb5de9b4d7f5e405d154a3258058228826f9b Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Mon, 25 Aug 2025 18:43:38 -0700
Subject: [PATCH 3504/3724] notify-sharp: remove

---
 pkgs/by-name/no/notify-sharp/package.nix | 49 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 2 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 pkgs/by-name/no/notify-sharp/package.nix

diff --git a/pkgs/by-name/no/notify-sharp/package.nix b/pkgs/by-name/no/notify-sharp/package.nix
deleted file mode 100644
index 0871187848c6..000000000000
--- a/pkgs/by-name/no/notify-sharp/package.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitLab,
-  pkg-config,
-  autoreconfHook,
-  mono,
-  gtk-sharp-3_0,
-  dbus-sharp-1_0,
-  dbus-sharp-glib-1_0,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "notify-sharp";
-  version = "3.0.3";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "Archive";
-    repo = "notify-sharp";
-
-    rev = version;
-    sha256 = "1vm7mnmxdwrgy4mr07lfva8sa6a32f2ah5x7w8yzcmahaks3sj5m";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    autoreconfHook
-  ];
-
-  buildInputs = [
-    mono
-    gtk-sharp-3_0
-    dbus-sharp-1_0
-    dbus-sharp-glib-1_0
-  ];
-
-  dontStrip = true;
-
-  postPatch = ''
-    sed -i 's#^[ \t]*DOCDIR=.*$#DOCDIR=$out/lib/monodoc#' ./configure.ac
-  '';
-
-  meta = with lib; {
-    description = "D-Bus for .NET";
-    platforms = platforms.linux;
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c959b6fb2f88..0c28f5005327 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1605,6 +1605,7 @@ mapAliases {
   netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23
   nettools = net-tools; # Added 2025-06-11
   newt-go = fosrl-newt; # Added 2025-06-24
+  notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
   nextcloud29 = throw ''
     Nextcloud v29 has been removed from `nixpkgs` as the support for is dropped
     by upstream in 2025-04. Please upgrade to at least Nextcloud v30 by declaring

From 2aa4e95e49d8bb7de72d65cbdc2898d4f50828c5 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Tue, 20 Aug 2024 13:40:18 -0400
Subject: [PATCH 3505/3724] libjpeg-tools: init at 1.71

---
 pkgs/by-name/li/libjpeg-tools/package.nix | 50 +++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/li/libjpeg-tools/package.nix

diff --git a/pkgs/by-name/li/libjpeg-tools/package.nix b/pkgs/by-name/li/libjpeg-tools/package.nix
new file mode 100644
index 000000000000..02b166817efe
--- /dev/null
+++ b/pkgs/by-name/li/libjpeg-tools/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libjpeg-tools";
+  version = "1.71";
+
+  src = fetchFromGitHub {
+    owner = "thorfdbg";
+    repo = "libjpeg";
+    rev = "25f71280913fde7400801772bbf885bb3e873242";
+    hash = "sha256-40yb9EujJp9y1PnuYLcPxK31Kj2Q4UQ5YBwXQFYXI/Y=";
+  };
+
+  outputs = [
+    "out"
+    "lib"
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    make lib
+    make final
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -m755 -D jpeg $out/bin/jpeg
+    install -m644 -D libjpeg.so $lib/lib/libjpeg
+    runHook postInstall
+  '';
+
+  doCheck = false; # no tests
+
+  meta = {
+    description = "A complete implementation of 10918-1 (JPEG) coming from jpeg.org (the ISO group) with extensions for HDR, lossless and alpha channel coding standardized as ISO/IEC 18477 (JPEG XT)";
+    homepage = "https://github.com/thorfdbg/libjpeg";
+    license = with lib.licenses; [ gpl3 ];
+    changelog = "https://github.com/thorfdbg/libjpeg/README.history";
+    maintainers = with lib.maintainers; [ bcdarwin ];
+    platforms = lib.platforms.unix;
+    mainProgram = "jpeg";
+    # clang build fails with "ld: symbol(s) not found for architecture arm64" (on aarch64-darwin)
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+})

From bfe89bb8c8c594b7e8f8738a4692954633d277e7 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sun, 17 Aug 2025 16:53:58 -0400
Subject: [PATCH 3506/3724] python313Packages.pylibjpeg-libjpeg: unvendor
 libjpeg source

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

diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix
index 4f54cca42a7b..1462b8a1fd2b 100644
--- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix
+++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix
@@ -11,6 +11,7 @@
   pydicom,
   pylibjpeg-data,
   pylibjpeg,
+  libjpeg-tools,
 }:
 
 let
@@ -25,13 +26,15 @@ let
       owner = "pydicom";
       repo = "pylibjpeg-libjpeg";
       tag = "v${self.version}";
-      hash = "sha256-xqSA1cutTsH9k4l9CW96n/CURzkAyDi3PZylZeedVjA=";
-      fetchSubmodules = true;
+      hash = "sha256-P01pofPLTOa5ynsCkLnxiMzVfCg4tbT+/CcpPTeSViw=";
     };
 
     postPatch = ''
       substituteInPlace pyproject.toml \
         --replace-fail 'poetry-core >=1.8,<2' 'poetry-core'
+      rmdir lib/libjpeg
+      cp -r ${libjpeg-tools.src} lib/libjpeg
+      chmod u+w lib/libjpeg
     '';
 
     build-system = [

From 1c91ae4a81fd23c74bd673a286f26cf7a4614281 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 01:58:51 +0000
Subject: [PATCH 3507/3724] plumed: 2.9.3 -> 2.10.0

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

diff --git a/pkgs/by-name/pl/plumed/package.nix b/pkgs/by-name/pl/plumed/package.nix
index c2d64c559678..c1131d48cd3f 100644
--- a/pkgs/by-name/pl/plumed/package.nix
+++ b/pkgs/by-name/pl/plumed/package.nix
@@ -9,13 +9,13 @@ assert !blas.isILP64;
 
 stdenv.mkDerivation rec {
   pname = "plumed";
-  version = "2.9.3";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "plumed";
     repo = "plumed2";
     rev = "v${version}";
-    hash = "sha256-KN412t64tp3QUQkhpLU3sAYDosQ3hw9HqpT1fzt5fwA=";
+    hash = "sha256-aFX8u+XNb7LARm1jtzWzIvZE5qHFaudtp45Om1Fridg=";
   };
 
   postPatch = ''

From 732fdb161f52d40638651416e832c7c64c2840dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 01:59:38 +0000
Subject: [PATCH 3508/3724] python3Packages.citeproc-py: 0.8.2 -> 0.9.0

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

diff --git a/pkgs/development/python-modules/citeproc-py/default.nix b/pkgs/development/python-modules/citeproc-py/default.nix
index d14f1a653754..1f29b5102146 100644
--- a/pkgs/development/python-modules/citeproc-py/default.nix
+++ b/pkgs/development/python-modules/citeproc-py/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "citeproc-py";
-  version = "0.8.2";
+  version = "0.9.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "citeproc_py";
     inherit version;
-    hash = "sha256-swsQocrDW4IaQEQiOdGEdL34rns+NrjufmsujuQt0ZI=";
+    hash = "sha256-WHgdilY+h8p8zrQ9CL6soQ3N+fPPd93zsXiUBx7cJ8g=";
   };
 
   build-system = [ setuptools ];

From 0d2ef6a4bdb17d2ebfb00a2faa034a73300d13a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 02:16:53 +0000
Subject: [PATCH 3509/3724] code-cursor: 1.4.5 -> 1.5.5

---
 pkgs/by-name/co/code-cursor/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index d690ebd13056..7a99dd1afa3f 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -16,20 +16,20 @@ let
 
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/af58d92614edb1f72bdd756615d131bf8dfa5299/linux/x64/Cursor-1.4.5-x86_64.AppImage";
-      hash = "sha256-2Hz1tXC+YkIIHWG1nO3/84oygH+wvaUtTXqvv19ZAz4=";
+      url = "https://downloads.cursor.com/production/823f58d4f60b795a6aefb9955933f3a2f0331d7b/linux/x64/Cursor-1.5.5-x86_64.AppImage";
+      hash = "sha256-eq/AQcAONs6HBpRdx2yf4MFTQ1cm/rOeaZZTq8YUF8s=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/af58d92614edb1f72bdd756615d131bf8dfa5299/linux/arm64/Cursor-1.4.5-aarch64.AppImage";
-      hash = "sha256-kKoOSxLsgeM2FJRW2HlCinhz6Ij6lpVsbWxQmTiMBSs=";
+      url = "https://downloads.cursor.com/production/823f58d4f60b795a6aefb9955933f3a2f0331d7b/linux/arm64/Cursor-1.5.5-aarch64.AppImage";
+      hash = "sha256-709MYaAnoYI+k1CPkfVzL0PvrJ4zw4wSHZvbuqLlXMQ=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/af58d92614edb1f72bdd756615d131bf8dfa5299/darwin/x64/Cursor-darwin-x64.dmg";
-      hash = "sha256-fX8ukEWKS2prNz+UopZ9a4uhDLoGYuXa6P8cSJqBang=";
+      url = "https://downloads.cursor.com/production/823f58d4f60b795a6aefb9955933f3a2f0331d7b/darwin/x64/Cursor-darwin-x64.dmg";
+      hash = "sha256-A13mVAw8mgjGlGegAzkeUi536keZwcJZkbO4ZzfMmXs=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/af58d92614edb1f72bdd756615d131bf8dfa5299/darwin/arm64/Cursor-darwin-arm64.dmg";
-      hash = "sha256-J/by3BOoIV2HUtcCqaCEJoPzqcFFooc/zShSmEBSw/Q=";
+      url = "https://downloads.cursor.com/production/823f58d4f60b795a6aefb9955933f3a2f0331d7b/darwin/arm64/Cursor-darwin-arm64.dmg";
+      hash = "sha256-Pc1pG1Vj9bf8H6Gt2bR8JANo/6oZza+L3Zlrihpg1dk=";
     };
   };
 
@@ -39,7 +39,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = finalCommandLineArgs;
 
-  version = "1.4.5";
+  version = "1.5.5";
   pname = "cursor";
 
   # You can find the current VSCode version in the About dialog:

From d636fc577b782426df12e974ac3b78744cd1cbbc Mon Sep 17 00:00:00 2001
From: BeatLink <git@beatlink.simplelogin.com>
Date: Mon, 25 Aug 2025 22:17:39 -0500
Subject: [PATCH 3510/3724] trillium-{desktop,server}: 0.97.2 -> 0.98.0

---
 ...sole-logger-instead-of-rolling-files.patch |  72 -----------
 pkgs/applications/office/trilium/default.nix  |  21 ----
 pkgs/applications/office/trilium/desktop.nix  | 113 ------------------
 pkgs/applications/office/trilium/server.nix   |  65 ----------
 pkgs/applications/office/trilium/update.sh    |  23 ----
 .../package.nix                               |  32 ++---
 pkgs/by-name/tr/trilium-desktop/update.sh     |  29 +++++
 .../by-name/tr/trilium-next-desktop/update.sh |  29 -----
 .../package.nix                               |  10 +-
 pkgs/top-level/all-packages.nix               |   5 -
 10 files changed, 50 insertions(+), 349 deletions(-)
 delete mode 100644 pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch
 delete mode 100644 pkgs/applications/office/trilium/default.nix
 delete mode 100644 pkgs/applications/office/trilium/desktop.nix
 delete mode 100644 pkgs/applications/office/trilium/server.nix
 delete mode 100755 pkgs/applications/office/trilium/update.sh
 rename pkgs/by-name/tr/{trilium-next-desktop => trilium-desktop}/package.nix (77%)
 create mode 100755 pkgs/by-name/tr/trilium-desktop/update.sh
 delete mode 100755 pkgs/by-name/tr/trilium-next-desktop/update.sh
 rename pkgs/by-name/tr/{trilium-next-server => trilium-server}/package.nix (87%)

diff --git a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch
deleted file mode 100644
index 68f203b464b2..000000000000
--- a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/src/services/log.js b/src/services/log.js
-index a141eae14..094b9381b 100644
---- a/src/services/log.js
-+++ b/src/services/log.js
-@@ -1,15 +1,7 @@
- "use strict";
- 
--const fs = require('fs');
--const dataDir = require('./data_dir.js');
- const cls = require('./cls.js');
- 
--if (!fs.existsSync(dataDir.LOG_DIR)) {
--    fs.mkdirSync(dataDir.LOG_DIR, 0o700);
--}
--
--let logFile = null;
--
- const SECOND = 1000;
- const MINUTE = 60 * SECOND;
- const HOUR = 60 * MINUTE;
-@@ -17,38 +9,6 @@ const DAY = 24 * HOUR;
- 
- const NEW_LINE = process.platform === "win32" ? '\r\n' : '\n';
- 
--let todaysMidnight = null;
--
--initLogFile();
--
--function getTodaysMidnight() {
--    const now = new Date();
--
--    return new Date(now.getFullYear(), now.getMonth(), now.getDate());
--}
--
--function initLogFile() {
--    todaysMidnight = getTodaysMidnight();
--
--    const path = `${dataDir.LOG_DIR}/trilium-${formatDate()}.log`;
--
--    if (logFile) {
--        logFile.end();
--    }
--
--    logFile = fs.createWriteStream(path, {flags: 'a'});
--}
--
--function checkDate(millisSinceMidnight) {
--    if (millisSinceMidnight >= DAY) {
--        initLogFile();
--
--        millisSinceMidnight -= DAY;
--    }
--
--    return millisSinceMidnight;
--}
--
- function log(str) {
-     const bundleNoteId = cls.get("bundleNoteId");
- 
-@@ -56,12 +16,6 @@ function log(str) {
-         str = `[Script ${bundleNoteId}] ${str}`;
-     }
- 
--    let millisSinceMidnight = Date.now() - todaysMidnight.getTime();
--
--    millisSinceMidnight = checkDate(millisSinceMidnight);
--
--    logFile.write(`${formatTime(millisSinceMidnight)} ${str}${NEW_LINE}`);
--
-     console.log(str);
- }
- 
\ No newline at end of file
diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
deleted file mode 100644
index b910e548ba6f..000000000000
--- a/pkgs/applications/office/trilium/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, callPackage, ... }:
-
-let
-  metaCommon = with lib; {
-    description = "Hierarchical note taking application with focus on building large personal knowledge bases";
-    homepage = "https://github.com/zadam/trilium";
-    license = licenses.agpl3Plus;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [
-      fliegendewurst
-      eliandoran
-    ];
-  };
-in
-{
-
-  trilium-desktop = callPackage ./desktop.nix { metaCommon = metaCommon; };
-  trilium-server = callPackage ./server.nix { metaCommon = metaCommon; };
-
-}
diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix
deleted file mode 100644
index 2a812f6d00b7..000000000000
--- a/pkgs/applications/office/trilium/desktop.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-  stdenv,
-  lib,
-  unzip,
-  autoPatchelfHook,
-  fetchurl,
-  makeWrapper,
-  alsa-lib,
-  libgbm,
-  nss,
-  nspr,
-  systemd,
-  makeDesktopItem,
-  copyDesktopItems,
-  wrapGAppsHook3,
-  metaCommon,
-}:
-
-let
-  pname = "trilium-desktop";
-  version = "0.63.6";
-
-  linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
-  linuxSource.sha256 = "12kgq5x4f93hxz057zqhz0x1y0rxfxh90fv9fjjs3jrnk0by7f33";
-
-  darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip";
-  darwinSource.sha256 = "0ry512cn622av3nm8rnma2yvqc71rpzax639872ivvc5vm4rsc30";
-
-  meta = metaCommon // {
-    mainProgram = "trilium";
-    platforms = [
-      "x86_64-linux"
-      "x86_64-darwin"
-    ];
-  };
-
-  linux = stdenv.mkDerivation rec {
-    inherit pname version meta;
-
-    src = fetchurl linuxSource;
-
-    # TODO: migrate off autoPatchelfHook and use nixpkgs' electron
-    nativeBuildInputs = [
-      autoPatchelfHook
-      makeWrapper
-      wrapGAppsHook3
-      copyDesktopItems
-    ];
-
-    buildInputs = [
-      alsa-lib
-      libgbm
-      nss
-      nspr
-      stdenv.cc.cc
-      systemd
-    ];
-
-    desktopItems = [
-      (makeDesktopItem {
-        name = "Trilium";
-        exec = "trilium";
-        icon = "trilium";
-        comment = meta.description;
-        desktopName = "Trilium Notes";
-        categories = [ "Office" ];
-        startupWMClass = "trilium notes";
-      })
-    ];
-
-    # Remove trilium-portable.sh, so trilium knows it is packaged making it stop auto generating a desktop item on launch
-    postPatch = ''
-      rm ./trilium-portable.sh
-    '';
-
-    installPhase = ''
-      runHook preInstall
-      mkdir -p $out/bin
-      mkdir -p $out/share/trilium
-      mkdir -p $out/share/icons/hicolor/128x128/apps
-
-      cp -r ./* $out/share/trilium
-      ln -s $out/share/trilium/trilium $out/bin/trilium
-
-      ln -s $out/share/trilium/icon.png $out/share/icons/hicolor/128x128/apps/trilium.png
-      runHook postInstall
-    '';
-
-    # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :)
-    # Error: libstdc++.so.6: cannot open shared object file: No such file or directory
-    preFixup = ''
-      gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs})
-    '';
-
-    dontStrip = true;
-
-    passthru.updateScript = ./update.sh;
-  };
-
-  darwin = stdenv.mkDerivation {
-    inherit pname version meta;
-
-    src = fetchurl darwinSource;
-    nativeBuildInputs = [ unzip ];
-
-    installPhase = ''
-      mkdir -p $out/Applications
-      cp -r *.app $out/Applications
-    '';
-  };
-
-in
-if stdenv.hostPlatform.isDarwin then darwin else linux
diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix
deleted file mode 100644
index 4b1770dbd3d8..000000000000
--- a/pkgs/applications/office/trilium/server.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  lib,
-  stdenv,
-  autoPatchelfHook,
-  fetchurl,
-  nixosTests,
-  metaCommon,
-}:
-
-let
-  serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
-  serverSource.sha256 = "0gwp6h6nvfzq7k1g3233h838nans45jkd5c3pzl6qdhhm19vcs27";
-  version = "0.63.6";
-in
-stdenv.mkDerivation {
-  pname = "trilium-server";
-  inherit version;
-  meta = metaCommon // {
-    platforms = [ "x86_64-linux" ];
-    mainProgram = "trilium-server";
-  };
-
-  src = fetchurl serverSource;
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-  ];
-
-  buildInputs = [
-    (lib.getLib stdenv.cc.cc)
-  ];
-
-  patches = [
-    # patch logger to use console instead of rolling files
-    ./0001-Use-console-logger-instead-of-rolling-files.patch
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/bin
-    mkdir -p $out/share/trilium-server
-
-    cp -r ./* $out/share/trilium-server
-    runHook postInstall
-  '';
-
-  postFixup = ''
-    cat > $out/bin/trilium-server <<EOF
-    #!${stdenv.cc.shell}
-    cd $out/share/trilium-server
-    exec ./node/bin/node src/www
-    EOF
-    chmod a+x $out/bin/trilium-server
-
-    # ERROR: noBrokenSymlinks: found 4 dangling symlinks, 0 reflexive symlinks and 0 unreadable symlinks
-    unlink $out/share/trilium-server/node/bin/npx
-    unlink $out/share/trilium-server/node/bin/npm
-    unlink $out/share/trilium-server/node_modules/.bin/electron
-    unlink $out/share/trilium-server/node_modules/.bin/electron-installer-debian
-  '';
-
-  passthru.tests = {
-    trilium-server = nixosTests.trilium-server;
-  };
-}
diff --git a/pkgs/applications/office/trilium/update.sh b/pkgs/applications/office/trilium/update.sh
deleted file mode 100755
index e292609e3f75..000000000000
--- a/pkgs/applications/office/trilium/update.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p coreutils curl jq
-set -euo pipefail
-
-cd $(dirname "${BASH_SOURCE[0]}")
-
-setKV () {
-    sed -i "s|$2 = \".*\"|$2 = \"${3:-}\"|" $1
-}
-
-version=$(curl -s --show-error "https://api.github.com/repos/zadam/trilium/releases/latest" | jq -r '.tag_name' | tail -c +2)
-
-# Update desktop application
-sha256_linux64=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz)
-sha256_darwin64=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip)
-setKV ./desktop.nix version $version
-setKV ./desktop.nix linuxSource.sha256 $sha256_linux64
-setKV ./desktop.nix darwinSource.sha256 $sha256_darwin64
-
-# Update server
-sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz)
-setKV ./server.nix version $version
-setKV ./server.nix serverSource.sha256 $sha256_linux64_server
diff --git a/pkgs/by-name/tr/trilium-next-desktop/package.nix b/pkgs/by-name/tr/trilium-desktop/package.nix
similarity index 77%
rename from pkgs/by-name/tr/trilium-next-desktop/package.nix
rename to pkgs/by-name/tr/trilium-desktop/package.nix
index 08ecf72c2075..76ae0feb72c6 100644
--- a/pkgs/by-name/tr/trilium-next-desktop/package.nix
+++ b/pkgs/by-name/tr/trilium-desktop/package.nix
@@ -14,28 +14,28 @@
 }:
 
 let
-  pname = "trilium-next-desktop";
-  version = "0.97.2";
+  pname = "trilium-desktop";
+  version = "0.98.0";
 
-  triliumSource = os: arch: sha256: {
+  triliumSource = os: arch: hash: {
     url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";
-    inherit sha256;
+    inherit hash;
   };
 
   linuxSource = triliumSource "linux";
   darwinSource = triliumSource "macos";
 
   # exposed like this for update.sh
-  x86_64-linux.sha256 = "12ms6knzaawryf7qisfnj5fj7v1icvkq7r0fpw55aajm7y0mpmf0";
-  aarch64-linux.sha256 = "0qgvasic531crlckwqn8mm9aimm7kliab2y7i264k60pb8h5spmp";
-  x86_64-darwin.sha256 = "1dam3ig7z21vi6icd4ww46smgn4d7kis3r51h0r5cvi8mc9ahq1i";
-  aarch64-darwin.sha256 = "0wysa3kacxryv1g1rmqm4ikjv9hfp1bqjcv1yn8drsi80zscm4lj";
+  x86_64-linux.hash = "sha256-GrREVY6P9L0ymH6QbXdtOm3mNzFD3u8HAOWDI7/x1VU=";
+  aarch64-linux.hash = "sha256-bLeU2REsKuVRei3WujGJEponiCZAviE8WyofWu2/NPg=";
+  x86_64-darwin.hash = "sha256-pN+6HapDxL/anMQJ2JeGmtBcRrlLMzJlEpSTo9QBbpg=";
+  aarch64-darwin.hash = "sha256-9y8NDrwiz9ql1Ia2F0UYF0XWBCyCahHZaAPOsvIJ5l0=";
 
   sources = {
-    x86_64-linux = linuxSource "x64" x86_64-linux.sha256;
-    aarch64-linux = linuxSource "arm64" aarch64-linux.sha256;
-    x86_64-darwin = darwinSource "x64" x86_64-darwin.sha256;
-    aarch64-darwin = darwinSource "arm64" aarch64-darwin.sha256;
+    x86_64-linux = linuxSource "x64" x86_64-linux.hash;
+    aarch64-linux = linuxSource "arm64" aarch64-linux.hash;
+    x86_64-darwin = darwinSource "x64" x86_64-darwin.hash;
+    aarch64-darwin = darwinSource "arm64" aarch64-darwin.hash;
   };
 
   src = fetchurl sources.${stdenv.hostPlatform.system};
@@ -85,9 +85,9 @@ let
         exec = "trilium";
         icon = "trilium";
         comment = meta.description;
-        desktopName = "TriliumNext Notes";
+        desktopName = "Trilium Notes";
         categories = [ "Office" ];
-        startupWMClass = "Trilium Notes Next";
+        startupWMClass = "Trilium Notes";
       })
     ];
 
@@ -138,8 +138,8 @@ let
 
     installPhase = ''
       runHook preInstall
-      mkdir -p "$out/Applications/TriliumNext Notes.app"
-      cp -r * "$out/Applications/TriliumNext Notes.app/"
+      mkdir -p "$out/Applications/Trilium Notes.app"
+      cp -r * "$out/Applications/Trilium Notes.app/"
       runHook postInstall
     '';
   };
diff --git a/pkgs/by-name/tr/trilium-desktop/update.sh b/pkgs/by-name/tr/trilium-desktop/update.sh
new file mode 100755
index 000000000000..eefaa8c308b2
--- /dev/null
+++ b/pkgs/by-name/tr/trilium-desktop/update.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p coreutils curl jq
+set -euo pipefail
+
+cd $(dirname "${BASH_SOURCE[0]}")
+
+setKV () {
+    sed -i "s|$2 = \".*\"|$2 = \"${3:-}\"|" $1
+}
+
+version=$(curl -s --show-error "https://api.github.com/repos/TriliumNext/Trilium/releases/latest" | jq -r '.tag_name' | tail -c +2)
+setKV ./package.nix version $version
+
+# Update desktop application
+sha256_linux64=$(nix store prefetch-file --json --hash-type sha256 https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-linux-x64.zip | jq -r .hash)
+sha256_linux64_arm=$(nix store prefetch-file --json --hash-type sha256 https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-linux-arm64.zip | jq -r .hash)
+sha256_darwin64=$(nix store prefetch-file --json --hash-type sha256 https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-macos-x64.zip | jq -r .hash)
+sha256_darwin64_arm=$(nix store prefetch-file --json --hash-type sha256 https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-macos-arm64.zip | jq -r .hash)
+setKV ./package.nix x86_64-linux.hash $sha256_linux64
+setKV ./package.nix aarch64-linux.hash $sha256_linux64_arm
+setKV ./package.nix x86_64-darwin.hash $sha256_darwin64
+setKV ./package.nix aarch64-darwin.hash $sha256_darwin64_arm
+
+# Update server
+sha256_linux64_server=$(nix store prefetch-file --json --hash-type sha256 https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz | jq -r .hash)
+sha256_linux64_server_arm=$(nix store prefetch-file --json --hash-type sha256 https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz | jq -r .hash)
+setKV ../trilium-server/package.nix version $version
+setKV ../trilium-server/package.nix serverSource_x64.hash $sha256_linux64_server
+setKV ../trilium-server/package.nix serverSource_arm64.hash $sha256_linux64_server_arm
diff --git a/pkgs/by-name/tr/trilium-next-desktop/update.sh b/pkgs/by-name/tr/trilium-next-desktop/update.sh
deleted file mode 100755
index 2b3802e9abd2..000000000000
--- a/pkgs/by-name/tr/trilium-next-desktop/update.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p coreutils curl jq
-set -euo pipefail
-
-cd $(dirname "${BASH_SOURCE[0]}")
-
-setKV () {
-    sed -i "s|$2 = \".*\"|$2 = \"${3:-}\"|" $1
-}
-
-version=$(curl -s --show-error "https://api.github.com/repos/TriliumNext/Trilium/releases/latest" | jq -r '.tag_name' | tail -c +2)
-setKV ./package.nix version $version
-
-# Update desktop application
-sha256_linux64=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-linux-x64.zip)
-sha256_linux64_arm=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-linux-arm64.zip)
-sha256_darwin64=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-macos-x64.zip)
-sha256_darwin64_arm=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-macos-arm64.zip)
-setKV ./package.nix x86_64-linux.sha256 $sha256_linux64
-setKV ./package.nix aarch64-linux.sha256 $sha256_linux64_arm
-setKV ./package.nix x86_64-darwin.sha256 $sha256_darwin64
-setKV ./package.nix aarch64-darwin.sha256 $sha256_darwin64_arm
-
-# Update server
-sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz)
-sha256_linux64_server_arm=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz)
-setKV ../trilium-next-server/package.nix version $version
-setKV ../trilium-next-server/package.nix serverSource_x64.sha256 $sha256_linux64_server
-setKV ../trilium-next-server/package.nix serverSource_arm64.sha256 $sha256_linux64_server_arm
diff --git a/pkgs/by-name/tr/trilium-next-server/package.nix b/pkgs/by-name/tr/trilium-server/package.nix
similarity index 87%
rename from pkgs/by-name/tr/trilium-next-server/package.nix
rename to pkgs/by-name/tr/trilium-server/package.nix
index a8f92ae6f744..822b7acfabbc 100644
--- a/pkgs/by-name/tr/trilium-next-server/package.nix
+++ b/pkgs/by-name/tr/trilium-server/package.nix
@@ -7,12 +7,12 @@
 }:
 
 let
-  version = "0.97.2";
+  version = "0.98.0";
 
   serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";
-  serverSource_x64.sha256 = "1zbi1jh2iib6wcaab0wdhb2rhslmn06dn22h28h8jjj5qjpbqqz0";
+  serverSource_x64.hash = "sha256-m5QDm8XOFi5Blbif044WMm/yyRrJx5t9/LjSto/gSL0=";
   serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";
-  serverSource_arm64.sha256 = "1a6gnfprskq0cqvg625dazqq39h89d3g9rssdcyw7w0a7kw8nfrv";
+  serverSource_arm64.hash = "sha256-1pdQEJIOxDU05z+31gNpsb9K4BpJ3njNsqxJymfD4wg=";
 
   serverSource =
     if stdenv.hostPlatform.isx86_64 then
@@ -20,10 +20,10 @@ let
     else if stdenv.hostPlatform.isAarch64 then
       serverSource_arm64
     else
-      throw "${stdenv.hostPlatform.config} not supported by trilium-next-server";
+      throw "${stdenv.hostPlatform.config} not supported by trilium-server";
 in
 stdenv.mkDerivation {
-  pname = "trilium-next-server";
+  pname = "trilium-server";
   inherit version;
 
   src = fetchurl serverSource;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be7f042314fa..6d5539b2fbfc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4408,11 +4408,6 @@ with pkgs;
 
   translatepy = with python3.pkgs; toPythonApplication translatepy;
 
-  inherit (callPackage ../applications/office/trilium { })
-    trilium-desktop
-    trilium-server
-    ;
-
   trytond = with python3Packages; toPythonApplication trytond;
 
   ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint { };

From f9ea14f007805b942e30ec923d6a90621c61a32e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 13:39:16 +1000
Subject: [PATCH 3511/3724] home-assistant-custom-components.xiaomi_gateway3:
 4.1.0 -> 4.1.2 (#436987)

https://github.com/AlexxIT/XiaomiGateway3/releases/tag/v4.1.2
---
 .../custom-components/xiaomi_gateway3/package.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
index f63dc9165b82..2f481f5eddd5 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "AlexxIT";
   domain = "xiaomi_gateway3";
-  version = "4.1.0";
+  version = "4.1.2";
 
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "XiaomiGateway3";
     rev = "v${version}";
-    hash = "sha256-fpMrp8iVO1Gmj0c80qRr3yfdZ3fl+DOiEi1vF1GZwXU=";
+    hash = "sha256-20OA2H1HOwQKLL6Cjhp4xfTv1/BSc/XaMHX+wO+EM5s=";
   };
 
   dependencies = [ zigpy ];

From f0680ae0e2671724d0efe8d80312a9ce77fdbb84 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Tue, 19 Aug 2025 18:32:17 +0800
Subject: [PATCH 3512/3724] pub2nix.generatePackageGraph: init

---
 .../hooks/dart-config-hook.sh                 |  1 +
 .../build-dart-application/hooks/default.nix  |  3 ++
 .../dart/pub2nix/package-graph.py             | 54 +++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 pkgs/build-support/dart/pub2nix/package-graph.py

diff --git a/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh b/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh
index 50754a7b56d4..56f20a4f63a3 100644
--- a/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh
+++ b/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh
@@ -9,6 +9,7 @@ dartConfigHook() {
     echo "Installing dependencies"
     mkdir -p .dart_tool
     cp "$packageConfig" .dart_tool/package_config.json
+    @python3@ @packageGraphScript@ > .dart_tool/package_graph.json
 
     packagePath() {
         jq --raw-output --arg name "$1" '.packages.[] | select(.name == $name) .rootUri | sub("file://"; "")' .dart_tool/package_config.json
diff --git a/pkgs/build-support/dart/build-dart-application/hooks/default.nix b/pkgs/build-support/dart/build-dart-application/hooks/default.nix
index bf4b88da5d2e..64f1019f882f 100644
--- a/pkgs/build-support/dart/build-dart-application/hooks/default.nix
+++ b/pkgs/build-support/dart/build-dart-application/hooks/default.nix
@@ -4,6 +4,7 @@
   dart,
   yq,
   jq,
+  python3,
 }:
 
 {
@@ -11,6 +12,8 @@
     name = "dart-config-hook";
     substitutions.yq = "${yq}/bin/yq";
     substitutions.jq = "${jq}/bin/jq";
+    substitutions.python3 = lib.getExe (python3.withPackages (ps: with ps; [ pyyaml ]));
+    substitutions.packageGraphScript = ../../pub2nix/package-graph.py;
   } ./dart-config-hook.sh;
   dartBuildHook = makeSetupHook {
     name = "dart-build-hook";
diff --git a/pkgs/build-support/dart/pub2nix/package-graph.py b/pkgs/build-support/dart/pub2nix/package-graph.py
new file mode 100644
index 000000000000..a63b5b042045
--- /dev/null
+++ b/pkgs/build-support/dart/pub2nix/package-graph.py
@@ -0,0 +1,54 @@
+"""
+https://github.com/dart-lang/pub/issues/4522
+This script generates a package_graph.json file.
+"""
+
+import json
+import os
+from pathlib import Path
+from urllib.parse import unquote, urlparse
+
+import yaml
+
+
+def get_package(pubspec_path: Path, dev_dependencies: bool = False):
+    with pubspec_path.open("r", encoding="utf-8") as f:
+        pubspec = yaml.load(f, Loader=yaml.CSafeLoader)
+    package = {
+        "name": pubspec["name"],
+        "version": pubspec.get("version") or "0.0.0",
+        "dependencies": list(pubspec.get("dependencies") or {}),
+    }
+    if dev_dependencies:
+        package["devDependencies"] = list(pubspec.get("dev_dependencies") or {})
+    return package
+
+
+def main() -> None:
+    package_config_file_path = Path(os.environ["packageConfig"])  # noqa: SIM112
+    with package_config_file_path.open("r", encoding="utf-8") as f:
+        package_config = json.load(f)
+    package_graph = []
+    root_package = get_package(Path("pubspec.yaml"), dev_dependencies=True)
+    for data in package_config.get("packages", []):
+        if data["name"] == root_package["name"] or data["rootUri"] == "flutter_gen":
+            continue
+        package_graph.append(
+            get_package(Path(unquote(urlparse(data["rootUri"]).path)) / "pubspec.yaml")
+        )
+    package_graph.append(root_package)
+    print(
+        json.dumps(
+            {
+                "roots": [root_package["name"]],
+                "packages": package_graph,
+                "configVersion": 1,
+            },
+            indent=2,
+            ensure_ascii=False,
+        )
+    )
+
+
+if __name__ == "__main__":
+    main()

From b30acab643f0989601a3f5b3e404748f5823030b Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Tue, 19 Aug 2025 19:51:29 +0800
Subject: [PATCH 3513/3724] flutter: remove package_graph related patches

---
 .../3_32/patches/fix-native-assets.patch      | 38 --------
 ...-crash-on-missing-package-graph-json.patch | 95 -------------------
 2 files changed, 133 deletions(-)
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_32/patches/fix-native-assets.patch
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_35/patches/avoid-crash-on-missing-package-graph-json.patch

diff --git a/pkgs/development/compilers/flutter/versions/3_32/patches/fix-native-assets.patch b/pkgs/development/compilers/flutter/versions/3_32/patches/fix-native-assets.patch
deleted file mode 100644
index 3e266db224f3..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_32/patches/fix-native-assets.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-This patch introducing error handling in the invocation of packagesWithNativeAssets within flutter_tools.
-
---- a/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
-+++ b/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
-@@ -357,7 +357,15 @@
- }
-
- Future<bool> _nativeBuildRequired(FlutterNativeAssetsBuildRunner buildRunner) async {
--  final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  late final List<String> packagesWithNativeAssets;
-+  try {
-+    packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  } catch (error, stackTrace) {
-+    globals.logger.printTrace(
-+      'Error while checking for native assets packages: $error\n$stackTrace'
-+    );
-+    packagesWithNativeAssets = <String>[];
-+  }
-   if (packagesWithNativeAssets.isEmpty) {
-     globals.logger.printTrace(
-       'No packages with native assets. Skipping native assets compilation.',
-@@ -385,7 +393,15 @@
-   FileSystem fileSystem,
-   FlutterNativeAssetsBuildRunner buildRunner,
- ) async {
--  final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  late final List<String> packagesWithNativeAssets;
-+  try {
-+    packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  } catch (error, stackTrace) {
-+    globals.logger.printTrace(
-+      'Error while checking for native assets packages: $error\n$stackTrace'
-+    );
-+    packagesWithNativeAssets = <String>[];
-+  }
-   if (packagesWithNativeAssets.isEmpty) {
-     globals.logger.printTrace(
-       'No packages with native assets. Skipping native assets compilation.',
diff --git a/pkgs/development/compilers/flutter/versions/3_35/patches/avoid-crash-on-missing-package-graph-json.patch b/pkgs/development/compilers/flutter/versions/3_35/patches/avoid-crash-on-missing-package-graph-json.patch
deleted file mode 100644
index a81ea1996e0e..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_35/patches/avoid-crash-on-missing-package-graph-json.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Prevent crashes due to missing or incomplete package_graph.json
-
-Modify package graph parsing to safely handle missing package_graph.json file
-and missing dependencies or devDependencies entries by using empty defaults
-instead of throwing errors.
-
---- a/packages/flutter_tools/lib/src/package_graph.dart
-+++ b/packages/flutter_tools/lib/src/package_graph.dart
-@@ -36,18 +36,9 @@
-     isExclusiveDevDependency: true,
-   );
-
--  final List<String>? dependencies = packageGraph.dependencies[project.manifest.appName];
--  if (dependencies == null) {
--    throwToolExit('''
--Failed to parse ${packageGraph.file.path}: dependencies for `${project.manifest.appName}` missing.
--Try running `flutter pub get`''');
--  }
--  final List<String>? devDependencies = packageGraph.devDependencies[project.manifest.appName];
--  if (devDependencies == null) {
--    throwToolExit('''
--Failed to parse ${packageGraph.file.path}: devDependencies for `${project.manifest.appName}` missing.
--Try running `flutter pub get`''');
--  }
-+  final List<String> dependencies = packageGraph.dependencies[project.manifest.appName] ?? <String>[];
-+  final List<String> devDependencies = packageGraph.devDependencies[project.manifest.appName] ?? <String>[];
-+
-   final packageNamesToVisit = <String>[...dependencies, ...devDependencies];
-   while (packageNamesToVisit.isNotEmpty) {
-     final String current = packageNamesToVisit.removeLast();
-@@ -55,13 +46,7 @@
-       continue;
-     }
-
--    final List<String>? dependencies = packageGraph.dependencies[current];
--
--    if (dependencies == null) {
--      throwToolExit('''
--Failed to parse ${packageGraph.file.path}: dependencies for `$current` missing.
--Try running `flutter pub get`''');
--    }
-+    final List<String> dependencies = packageGraph.dependencies[current] ?? <String>[];
-     packageNamesToVisit.addAll(dependencies);
-
-     result[current] = Dependency(
-@@ -89,7 +74,7 @@
-       currentDependency.rootUri,
-       isExclusiveDevDependency: false,
-     );
--    packageNamesToVisit.addAll(packageGraph.dependencies[current]!);
-+    packageNamesToVisit.addAll(packageGraph.dependencies[current] ?? <String>[]);
-   }
-   return result.values.toList();
- }
-@@ -147,6 +132,9 @@
-     final File file = project.packageConfig.fileSystem.file(
-       project.packageConfig.uri.resolve('package_graph.json'),
-     );
-+    if (!file.existsSync()) {
-+      return PackageGraph(file, <String>[], <String, List<String>>{}, <String, List<String>>{});
-+    }
-     try {
-       return PackageGraph.fromJson(file, jsonDecode(file.readAsStringSync()));
-     } on IOException catch (e) {
-
---- a/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
-+++ b/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
-@@ -384,7 +384,12 @@
- }
-
- Future<bool> _nativeBuildRequired(FlutterNativeAssetsBuildRunner buildRunner) async {
--  final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  late final List<String> packagesWithNativeAssets;
-+  try {
-+    packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  } catch (error) {
-+    packagesWithNativeAssets = <String>[];
-+  }
-   if (packagesWithNativeAssets.isEmpty) {
-     globals.logger.printTrace(
-       'No packages with native assets. Skipping native assets compilation.',
-@@ -412,7 +417,12 @@
-   FileSystem fileSystem,
-   FlutterNativeAssetsBuildRunner buildRunner,
- ) async {
--  final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  late final List<String> packagesWithNativeAssets;
-+  try {
-+    packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  } catch (error) {
-+    packagesWithNativeAssets = <String>[];
-+  }
-   if (packagesWithNativeAssets.isEmpty) {
-     globals.logger.printTrace(
-       'No packages with native assets. Skipping native assets compilation.',

From f66b8a30fc3ca70d722023753731188066a04ade Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 04:05:24 +0000
Subject: [PATCH 3514/3724] python3Packages.llama-index-vector-stores-postgres:
 0.6.1 -> 0.6.3

---
 .../llama-index-vector-stores-postgres/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
index ab54499442bf..476b5256a634 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-postgres";
-  version = "0.6.1";
+  version = "0.6.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_vector_stores_postgres";
     inherit version;
-    hash = "sha256-E+PFvOTRO3FGGSwFwEUe0fEpmuE/fmRtiCGHwO53qm4=";
+    hash = "sha256-sV0ufDvyoLGHVJNKhM9TJEA7lAHisxvNsAQY7S0Ddww=";
   };
 
   pythonRemoveDeps = [ "psycopg2-binary" ];

From 285ec2d183fe199079b7f7d58c13b2f722059e30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 04:15:59 +0000
Subject: [PATCH 3515/3724] prettierd: 0.26.1 -> 0.26.2

---
 pkgs/by-name/pr/prettierd/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prettierd/package.nix b/pkgs/by-name/pr/prettierd/package.nix
index 56bca3bb7711..2568f921bfbd 100644
--- a/pkgs/by-name/pr/prettierd/package.nix
+++ b/pkgs/by-name/pr/prettierd/package.nix
@@ -13,18 +13,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "prettierd";
-  version = "0.26.1";
+  version = "0.26.2";
 
   src = fetchFromGitHub {
     owner = "fsouza";
     repo = "prettierd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8IlPC4KCFKJAbCVPl+vK9WustevKHOLbh41F6vMwHX4=";
+    hash = "sha256-KvFOvWQZBppvHbvUvGQu39j8aV/pQFwfuqjFQqdb7lI=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-M7mLkDHJa4iz6u3LSIIq3xCbYbiR0pPAkOK1MjJKstI=";
+    hash = "sha256-Rf7km2WUODqWu8U8iiHNrb5dMamIm1XCsRnldO71j5A=";
   };
 
   strictDeps = true;

From 01db557bb590b5640ff43432027f5b2997466dc5 Mon Sep 17 00:00:00 2001
From: huantian <davidtianli@gmail.com>
Date: Mon, 25 Aug 2025 21:21:13 -0700
Subject: [PATCH 3516/3724] unityhub: 3.13.1 -> 3.14.0

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

diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix
index f6462328da7c..d00cbe840221 100644
--- a/pkgs/by-name/un/unityhub/package.nix
+++ b/pkgs/by-name/un/unityhub/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "unityhub";
-  version = "3.13.1";
+  version = "3.14.0";
 
   src = fetchurl {
     url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb";
-    hash = "sha256-gBQrz6CNlUyhxeLmY6tNtxpaQJSEW00r7MGyIDtYdiY=";
+    hash = "sha256-pOtdvu7sVe+n2FzItM6SA2sFhOwE48Tk5L+cbK7TTq8=";
   };
 
   nativeBuildInputs = [

From bfc9dfd92d873a7dc6d4c8acfff864720bea87c4 Mon Sep 17 00:00:00 2001
From: huantian <davidtianli@gmail.com>
Date: Mon, 25 Aug 2025 21:23:07 -0700
Subject: [PATCH 3517/3724] unityhub: disable auto updater

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

diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix
index d00cbe840221..ce8e2c3ba2d2 100644
--- a/pkgs/by-name/un/unityhub/package.nix
+++ b/pkgs/by-name/un/unityhub/package.nix
@@ -139,6 +139,11 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/share/applications/unityhub.desktop \
       --replace-fail /opt/unityhub/unityhub $out/opt/unityhub/unityhub
 
+    # This file is used by auto updater to determine whether this install is
+    # a .deb, .rpm, etc. Remove this to disable the auto updater, which auto
+    # downloads the update, in addition to being useless.
+    rm $out/opt/unityhub/resources/package-type
+
     runHook postInstall
   '';
 

From 5b7cc7296b07259aac5d0aca6dd00c27551192c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 04:40:26 +0000
Subject: [PATCH 3518/3724] nightfox-gtk-theme: 0-unstable-2025-07-28 ->
 0-unstable-2025-08-21

---
 pkgs/by-name/ni/nightfox-gtk-theme/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix
index 4361cf140bca..2a07c05b2c39 100644
--- a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix
+++ b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix
@@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2025-07-28";
+    version = "0-unstable-2025-08-21";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Nightfox-GTK-Theme";
-      rev = "ea0172aa853e8f6c2b00568c4cd6dcbea7991b7c";
-      hash = "sha256-9+RBAG/JKGXjW6zRut8eXM4EYkbNRZ+yw5tLDrSMBXg=";
+      rev = "4d73329de5ac65dc3e957e1635d471c7d3122a6b";
+      hash = "sha256-QTsouPINcn8coLk5z2EFMG1egP97rFVPgiYqGhwu62c=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From b3a7b1920f911523d0c36c8ff8ef527ad4a7cc02 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Tue, 26 Aug 2025 12:44:21 +0800
Subject: [PATCH 3519/3724] flut-renamer: drop

This software currently has no maintainer. Although the upstream project is still maintained, it is not very active. This has prevented the removal of flutter324.
---
 pkgs/by-name/fl/flut-renamer/package.nix      |   35 -
 .../by-name/fl/flut-renamer/pubspec.lock.json | 1038 -----------------
 pkgs/by-name/fl/flut-renamer/update.sh        |   34 -
 pkgs/top-level/aliases.nix                    |    1 +
 4 files changed, 1 insertion(+), 1107 deletions(-)
 delete mode 100644 pkgs/by-name/fl/flut-renamer/package.nix
 delete mode 100644 pkgs/by-name/fl/flut-renamer/pubspec.lock.json
 delete mode 100755 pkgs/by-name/fl/flut-renamer/update.sh

diff --git a/pkgs/by-name/fl/flut-renamer/package.nix b/pkgs/by-name/fl/flut-renamer/package.nix
deleted file mode 100644
index 61ffe30a009d..000000000000
--- a/pkgs/by-name/fl/flut-renamer/package.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  flutter324,
-}:
-
-flutter324.buildFlutterApplication rec {
-  pname = "flut-renamer";
-  version = "1.5.4";
-
-  src = fetchFromGitHub {
-    owner = "sun-jiao";
-    repo = "flut-renamer";
-    tag = version;
-    hash = "sha256-maPmZwsmmjyvHgutWF+8CIw2NA6HCB4/PPiiCAG+n8I=";
-  };
-
-  pubspecLock = lib.importJSON ./pubspec.lock.json;
-
-  postInstall = ''
-    install -Dm644 assets/desktop.png $out/share/pixmaps/flut-renamer.png
-    install -Dm644 appimage/flut-renamer.desktop $out/share/applications/flut-renamer.desktop
-    substituteInPlace $out/share/applications/flut-renamer.desktop \
-      --replace-fail "Icon=desktop" "Icon=flut-renamer"
-  '';
-
-  meta = {
-    description = "Bulk file renamer written in flutter";
-    homepage = "https://github.com/sun-jiao/flut-renamer";
-    mainProgram = "flut-renamer";
-    platforms = lib.platforms.linux;
-    license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
-  };
-}
diff --git a/pkgs/by-name/fl/flut-renamer/pubspec.lock.json b/pkgs/by-name/fl/flut-renamer/pubspec.lock.json
deleted file mode 100644
index 6221d195878b..000000000000
--- a/pkgs/by-name/fl/flut-renamer/pubspec.lock.json
+++ /dev/null
@@ -1,1038 +0,0 @@
-{
-  "packages": {
-    "archive": {
-      "dependency": "transitive",
-      "description": {
-        "name": "archive",
-        "sha256": "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.2"
-    },
-    "args": {
-      "dependency": "direct main",
-      "description": {
-        "name": "args",
-        "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.6.0"
-    },
-    "async": {
-      "dependency": "transitive",
-      "description": {
-        "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.11.0"
-    },
-    "audio_metadata_reader": {
-      "dependency": "direct main",
-      "description": {
-        "name": "audio_metadata_reader",
-        "sha256": "9f05d016a3277357308eb6d2f283cd1229c7fae62d6943ee6ab95b374e265222",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
-    "boolean_selector": {
-      "dependency": "transitive",
-      "description": {
-        "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "change_app_package_name": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "change_app_package_name",
-        "sha256": "1d6ca5fbaba7264f70857941543337b2efe48f19ae2eef29b89927541b52a787",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.4.0"
-    },
-    "characters": {
-      "dependency": "transitive",
-      "description": {
-        "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.0"
-    },
-    "charset": {
-      "dependency": "transitive",
-      "description": {
-        "name": "charset",
-        "sha256": "27802032a581e01ac565904ece8c8962564b1070690794f0072f6865958ce8b9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.1"
-    },
-    "checked_yaml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "checked_yaml",
-        "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.3"
-    },
-    "cli_util": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cli_util",
-        "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.2"
-    },
-    "clock": {
-      "dependency": "transitive",
-      "description": {
-        "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.1"
-    },
-    "collection": {
-      "dependency": "transitive",
-      "description": {
-        "name": "collection",
-        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.18.0"
-    },
-    "convert": {
-      "dependency": "transitive",
-      "description": {
-        "name": "convert",
-        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    },
-    "cross_file": {
-      "dependency": "direct main",
-      "description": {
-        "name": "cross_file",
-        "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.4+2"
-    },
-    "crypto": {
-      "dependency": "direct main",
-      "description": {
-        "name": "crypto",
-        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.6"
-    },
-    "cyrtranslit": {
-      "dependency": "direct main",
-      "description": {
-        "name": "cyrtranslit",
-        "sha256": "8580dd5c8e0f9f96f6a7b272ad68d01e8aee22e2352c437c4f38e3585ade538a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.1"
-    },
-    "deepcopy": {
-      "dependency": "transitive",
-      "description": {
-        "name": "deepcopy",
-        "sha256": "a9ef127c1dda20c9ebf280551a9653afc71ba76a408f3ed5ca58062f367af5ac",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.2"
-    },
-    "desktop_drop": {
-      "dependency": "direct main",
-      "description": {
-        "name": "desktop_drop",
-        "sha256": "03abf1c0443afdd1d65cf8fa589a2f01c67a11da56bbb06f6ea1de79d5628e94",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.5.0"
-    },
-    "device_info_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "device_info_plus",
-        "sha256": "4fa68e53e26ab17b70ca39f072c285562cfc1589df5bb1e9295db90f6645f431",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "11.2.0"
-    },
-    "device_info_plus_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "device_info_plus_platform_interface",
-        "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.0.2"
-    },
-    "equatable": {
-      "dependency": "transitive",
-      "description": {
-        "name": "equatable",
-        "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.7"
-    },
-    "exif": {
-      "dependency": "direct main",
-      "description": {
-        "name": "exif",
-        "sha256": "a7980fdb3b7ffcd0b035e5b8a5e1eef7cadfe90ea6a4e85ebb62f87b96c7a172",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.3.0"
-    },
-    "fake_async": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.1"
-    },
-    "ffi": {
-      "dependency": "transitive",
-      "description": {
-        "name": "ffi",
-        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.3"
-    },
-    "file": {
-      "dependency": "transitive",
-      "description": {
-        "name": "file",
-        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.0.1"
-    },
-    "file_manager": {
-      "dependency": "direct main",
-      "description": {
-        "name": "file_manager",
-        "sha256": "72c3ec25614ca7a115995db5ca6a7fe84ab3e9b9280e7ab25ab50b9c892f437e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.2"
-    },
-    "file_picker": {
-      "dependency": "direct main",
-      "description": {
-        "name": "file_picker",
-        "sha256": "c904b4ab56d53385563c7c39d8e9fa9af086f91495dfc48717ad84a42c3cf204",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "8.1.7"
-    },
-    "fixnum": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fixnum",
-        "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.1"
-    },
-    "flutter": {
-      "dependency": "direct main",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_launcher_icons": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "flutter_launcher_icons",
-        "sha256": "31cd0885738e87c72d6f055564d37fabcdacee743b396b78c7636c169cac64f5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.14.2"
-    },
-    "flutter_lints": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "flutter_lints",
-        "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.0.0"
-    },
-    "flutter_localizations": {
-      "dependency": "direct main",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_plugin_android_lifecycle": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_plugin_android_lifecycle",
-        "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.24"
-    },
-    "flutter_test": {
-      "dependency": "direct dev",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_web_plugins": {
-      "dependency": "transitive",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "fluttertoast": {
-      "dependency": "direct main",
-      "description": {
-        "name": "fluttertoast",
-        "sha256": "24467dc20bbe49fd63e57d8e190798c4d22cbbdac30e54209d153a15273721d1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "8.2.10"
-    },
-    "http": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http",
-        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.2"
-    },
-    "http_parser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.2"
-    },
-    "iconsax_flutter": {
-      "dependency": "transitive",
-      "description": {
-        "name": "iconsax_flutter",
-        "sha256": "95b65699da8ea98f87c5d232f06b0debaaf1ec1332b697e4d90969ec9a93037d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "image": {
-      "dependency": "transitive",
-      "description": {
-        "name": "image",
-        "sha256": "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.5.2"
-    },
-    "intl": {
-      "dependency": "direct main",
-      "description": {
-        "name": "intl",
-        "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.19.0"
-    },
-    "json_annotation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "json_annotation",
-        "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.9.0"
-    },
-    "leak_tracker": {
-      "dependency": "transitive",
-      "description": {
-        "name": "leak_tracker",
-        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "10.0.5"
-    },
-    "leak_tracker_flutter_testing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "leak_tracker_flutter_testing",
-        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.5"
-    },
-    "leak_tracker_testing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.1"
-    },
-    "lints": {
-      "dependency": "transitive",
-      "description": {
-        "name": "lints",
-        "sha256": "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.0.0"
-    },
-    "matcher": {
-      "dependency": "transitive",
-      "description": {
-        "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.12.16+1"
-    },
-    "material_color_utilities": {
-      "dependency": "transitive",
-      "description": {
-        "name": "material_color_utilities",
-        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.11.1"
-    },
-    "meta": {
-      "dependency": "transitive",
-      "description": {
-        "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.15.0"
-    },
-    "mime": {
-      "dependency": "transitive",
-      "description": {
-        "name": "mime",
-        "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
-    "package_info_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "package_info_plus",
-        "sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "8.1.2"
-    },
-    "package_info_plus_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "package_info_plus_platform_interface",
-        "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.2"
-    },
-    "path": {
-      "dependency": "direct main",
-      "description": {
-        "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.9.0"
-    },
-    "path_provider": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider",
-        "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.5"
-    },
-    "path_provider_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_android",
-        "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.15"
-    },
-    "path_provider_foundation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_foundation",
-        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "path_provider_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_linux",
-        "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.1"
-    },
-    "path_provider_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_platform_interface",
-        "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
-    "path_provider_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_windows",
-        "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.0"
-    },
-    "pausable_timer": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pausable_timer",
-        "sha256": "6ef1a95441ec3439de6fb63f39a011b67e693198e7dae14e20675c3c00e86074",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.0+3"
-    },
-    "permission_handler": {
-      "dependency": "direct main",
-      "description": {
-        "name": "permission_handler",
-        "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "11.3.1"
-    },
-    "permission_handler_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_android",
-        "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "12.0.13"
-    },
-    "permission_handler_apple": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_apple",
-        "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "9.4.5"
-    },
-    "permission_handler_html": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_html",
-        "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3+5"
-    },
-    "permission_handler_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_platform_interface",
-        "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.2.3"
-    },
-    "permission_handler_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_windows",
-        "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.1"
-    },
-    "petitparser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.2"
-    },
-    "pinyin": {
-      "dependency": "direct main",
-      "description": {
-        "name": "pinyin",
-        "sha256": "240f271a3c71af20c8d2757756b5ee8e9d79a955d37abad4b3568fd406b22411",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.3.0"
-    },
-    "platform": {
-      "dependency": "transitive",
-      "description": {
-        "name": "platform",
-        "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.6"
-    },
-    "plugin_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "plugin_platform_interface",
-        "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.8"
-    },
-    "posix": {
-      "dependency": "transitive",
-      "description": {
-        "name": "posix",
-        "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.1"
-    },
-    "shared_preferences": {
-      "dependency": "direct main",
-      "description": {
-        "name": "shared_preferences",
-        "sha256": "a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.5"
-    },
-    "shared_preferences_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_android",
-        "sha256": "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.0"
-    },
-    "shared_preferences_foundation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_foundation",
-        "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.5.4"
-    },
-    "shared_preferences_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_linux",
-        "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "shared_preferences_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_platform_interface",
-        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "shared_preferences_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_web",
-        "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.2"
-    },
-    "shared_preferences_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_windows",
-        "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "sky_engine": {
-      "dependency": "transitive",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.99"
-    },
-    "source_span": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.10.0"
-    },
-    "sprintf": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sprintf",
-        "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.0.0"
-    },
-    "stack_trace": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stack_trace",
-        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.11.1"
-    },
-    "stream_channel": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
-    "string_scanner": {
-      "dependency": "transitive",
-      "description": {
-        "name": "string_scanner",
-        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
-    "term_glyph": {
-      "dependency": "transitive",
-      "description": {
-        "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.1"
-    },
-    "test_api": {
-      "dependency": "transitive",
-      "description": {
-        "name": "test_api",
-        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.2"
-    },
-    "toastification": {
-      "dependency": "direct main",
-      "description": {
-        "name": "toastification",
-        "sha256": "4d97fbfa463dfe83691044cba9f37cb185a79bb9205cfecb655fa1f6be126a13",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.0"
-    },
-    "typed_data": {
-      "dependency": "transitive",
-      "description": {
-        "name": "typed_data",
-        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.4.0"
-    },
-    "url_launcher": {
-      "dependency": "direct main",
-      "description": {
-        "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.3.1"
-    },
-    "url_launcher_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_android",
-        "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.3.14"
-    },
-    "url_launcher_ios": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_ios",
-        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.3.2"
-    },
-    "url_launcher_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_linux",
-        "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.1"
-    },
-    "url_launcher_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_macos",
-        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.2"
-    },
-    "url_launcher_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_platform_interface",
-        "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.2"
-    },
-    "url_launcher_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.3"
-    },
-    "url_launcher_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_windows",
-        "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.3"
-    },
-    "uuid": {
-      "dependency": "transitive",
-      "description": {
-        "name": "uuid",
-        "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.5.1"
-    },
-    "vector_math": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.4"
-    },
-    "vm_service": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vm_service",
-        "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "14.2.5"
-    },
-    "web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "web",
-        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
-    "win32": {
-      "dependency": "transitive",
-      "description": {
-        "name": "win32",
-        "sha256": "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.10.0"
-    },
-    "win32_registry": {
-      "dependency": "transitive",
-      "description": {
-        "name": "win32_registry",
-        "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.5"
-    },
-    "xdg_directories": {
-      "dependency": "transitive",
-      "description": {
-        "name": "xdg_directories",
-        "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
-    "xml": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.5.0"
-    },
-    "yaml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "yaml",
-        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.3"
-    }
-  },
-  "sdks": {
-    "dart": ">=3.5.0 <4.0.0",
-    "flutter": ">=3.24.0"
-  }
-}
diff --git a/pkgs/by-name/fl/flut-renamer/update.sh b/pkgs/by-name/fl/flut-renamer/update.sh
deleted file mode 100755
index e1e23f9bc891..000000000000
--- a/pkgs/by-name/fl/flut-renamer/update.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p yq nix bash coreutils nix-update common-updater-scripts ripgrep flutter
-
-set -eou pipefail
-
-PACKAGE_DIR="$(realpath "$(dirname "$0")")"
-cd "$PACKAGE_DIR"/..
-while ! test -f flake.nix; do cd ..; done
-NIXPKGS_DIR="$PWD"
-
-latestVersion=$(
-    list-git-tags --url=https://github.com/sun-jiao/flut-renamer |
-        rg '^v(.*)' -r '$1' |
-        sort --version-sort |
-        tail -n1
-)
-
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; flut-renamer.version or (lib.getVersion flut-renamer)" | tr -d '"')
-
-if [[ "$currentVersion" == "$latestVersion" ]]; then
-    echo "package is up-to-date: $currentVersion"
-    exit 0
-fi
-
-nix-update --version=$latestVersion flut-renamer
-
-export HOME="$(mktemp -d)"
-src="$(nix-build --no-link "$NIXPKGS_DIR" -A flut-renamer.src)"
-TMPDIR="$(mktemp -d)"
-cp --recursive --no-preserve=mode "$src"/* $TMPDIR
-cd $TMPDIR
-flutter pub get
-yq . pubspec.lock >"$PACKAGE_DIR"/pubspec.lock.json
-rm -rf $TMPDIR
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 87e506f06df1..e7bc4e6d1e97 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -893,6 +893,7 @@ mapAliases {
   flatbuffers_2_0 = flatbuffers; # Added 2022-05-12
   flatcam = throw "flatcam has been removed because it is unmaintained since 2022 and doesn't support Python > 3.10"; # Added 2025-01-25
   flow-editor = flow-control; # Added 2025-03-05
+  flut-renamer = throw "flut-renamer is unmaintained and has been removed"; # Added 2025-08-26
   flutter313 = throw "flutter313 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
   flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
   flutter319 = throw "flutter319 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-12-03

From 9fe3a2ac3ada7db4d0859d27b8a4ec97a1526a63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 04:48:04 +0000
Subject: [PATCH 3520/3724] ollama: 0.11.4 -> 0.11.7

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

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index b05ca97d35a1..a8f4838c1f87 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -117,13 +117,13 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.11.4";
+  version = "0.11.7";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-joIA/rH8j+SJH5EVMr6iqKLve6bkntPQM43KCN9JTZ8=";
+    hash = "sha256-rSKuLdfbmAyGTkhfdE9GuywuQweeA5WfNwP/wGMN4So=";
   };
 
   vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";

From 82e5957fd0d366935e1774c91cef54c3362da6da Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Tue, 26 Aug 2025 12:50:19 +0800
Subject: [PATCH 3521/3724] bloomeetunes: drop

This software currently has no maintainer. Although the upstream project is still maintained, it is not very active. This has prevented the removal of flutter324.
---
 pkgs/by-name/bl/bloomeetunes/package.nix      |   65 -
 .../by-name/bl/bloomeetunes/pubspec.lock.json | 1923 -----------------
 pkgs/by-name/bl/bloomeetunes/update.sh        |   24 -
 pkgs/top-level/aliases.nix                    |    1 +
 4 files changed, 1 insertion(+), 2012 deletions(-)
 delete mode 100644 pkgs/by-name/bl/bloomeetunes/package.nix
 delete mode 100644 pkgs/by-name/bl/bloomeetunes/pubspec.lock.json
 delete mode 100755 pkgs/by-name/bl/bloomeetunes/update.sh

diff --git a/pkgs/by-name/bl/bloomeetunes/package.nix b/pkgs/by-name/bl/bloomeetunes/package.nix
deleted file mode 100644
index c155618d562d..000000000000
--- a/pkgs/by-name/bl/bloomeetunes/package.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  autoPatchelfHook,
-  lib,
-  fetchFromGitHub,
-  flutter324,
-  mpv,
-  makeDesktopItem,
-  copyDesktopItems,
-}:
-
-flutter324.buildFlutterApplication rec {
-  pname = "bloomeetunes";
-  version = "2.11.6";
-
-  src = fetchFromGitHub {
-    owner = "HemantKArya";
-    repo = "BloomeeTunes";
-    tag = "v${version}+171";
-    hash = "sha256-gSAe5S5rdcNLP4v7NTchQj3UJ/h6msLax9H77w+JJnk=";
-  };
-
-  pubspecLock = lib.importJSON ./pubspec.lock.json;
-
-  gitHashes = {
-    youtube_explode_dart = "sha256-ctUSoXLUJCu23hvEzYy5EoTCv7gG79rEiMFX7i1RGX0=";
-  };
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    copyDesktopItems
-  ];
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "bloomeetunes";
-      exec = "bloomee";
-      icon = "bloomeetunes";
-      genericName = "Music Player";
-      desktopName = "Bloomee Tunes";
-    })
-  ];
-
-  postInstall = ''
-    install -Dm644 assets/icons/bloomee_new_logo_c.png $out/share/pixmaps/bloomeetunes.png
-  '';
-
-  extraWrapProgramArgs = ''
-    --prefix LD_LIBRARY_PATH : $out/app/bloomeetunes/lib:${
-      lib.makeLibraryPath [
-        mpv
-      ]
-    }
-  '';
-
-  passthru.updateScript = ./update.sh;
-
-  meta = {
-    description = "Cross-platform music app designed to bring you ad-free tunes from various sources";
-    homepage = "https://github.com/HemantKArya/BloomeeTunes";
-    mainProgram = "bloomee";
-    license = with lib.licenses; [ gpl2Plus ];
-    maintainers = with lib.maintainers; [ ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/bl/bloomeetunes/pubspec.lock.json b/pkgs/by-name/bl/bloomeetunes/pubspec.lock.json
deleted file mode 100644
index 7ac5e40f623a..000000000000
--- a/pkgs/by-name/bl/bloomeetunes/pubspec.lock.json
+++ /dev/null
@@ -1,1923 +0,0 @@
-{
-  "packages": {
-    "_fe_analyzer_shared": {
-      "dependency": "transitive",
-      "description": {
-        "name": "_fe_analyzer_shared",
-        "sha256": "ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "61.0.0"
-    },
-    "analyzer": {
-      "dependency": "transitive",
-      "description": {
-        "name": "analyzer",
-        "sha256": "ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.13.0"
-    },
-    "archive": {
-      "dependency": "transitive",
-      "description": {
-        "name": "archive",
-        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.6.1"
-    },
-    "args": {
-      "dependency": "transitive",
-      "description": {
-        "name": "args",
-        "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.5.0"
-    },
-    "async": {
-      "dependency": "transitive",
-      "description": {
-        "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.11.0"
-    },
-    "audio_service": {
-      "dependency": "direct main",
-      "description": {
-        "name": "audio_service",
-        "sha256": "f6c8191bef6b843da34675dd0731ad11d06094c36b691ffcf3148a4feb2e585f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.18.16"
-    },
-    "audio_service_mpris": {
-      "dependency": "direct main",
-      "description": {
-        "name": "audio_service_mpris",
-        "sha256": "fdab1ae1f659c6db36d5cc396e46e4ee9663caefa6153f8453fcd01d57567c08",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "audio_service_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "audio_service_platform_interface",
-        "sha256": "6283782851f6c8b501b60904a32fc7199dc631172da0629d7301e66f672ab777",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3"
-    },
-    "audio_service_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "audio_service_web",
-        "sha256": "4cdc2127cd4562b957fb49227dc58e3303fafb09bde2573bc8241b938cf759d9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3"
-    },
-    "audio_session": {
-      "dependency": "direct main",
-      "description": {
-        "name": "audio_session",
-        "sha256": "b2a26ba8b7efa1790d6460e82971fde3e398cfbe2295df9dea22f3499d2c12a7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.23"
-    },
-    "audio_video_progress_bar": {
-      "dependency": "direct main",
-      "description": {
-        "name": "audio_video_progress_bar",
-        "sha256": "67f3a5ea70d48b48caaf29f5a0606284a6aa3a393736daf9e82bec985d2f9b70",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.1"
-    },
-    "badges": {
-      "dependency": "direct main",
-      "description": {
-        "name": "badges",
-        "sha256": "a7b6bbd60dce418df0db3058b53f9d083c22cdb5132a052145dc267494df0b84",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    },
-    "bloc": {
-      "dependency": "transitive",
-      "description": {
-        "name": "bloc",
-        "sha256": "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "9.0.0"
-    },
-    "boolean_selector": {
-      "dependency": "transitive",
-      "description": {
-        "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "build": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build",
-        "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "build_cli_annotations": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_cli_annotations",
-        "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "build_config": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_config",
-        "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.1"
-    },
-    "build_daemon": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_daemon",
-        "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.2"
-    },
-    "build_resolvers": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_resolvers",
-        "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.2"
-    },
-    "build_runner": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "build_runner",
-        "sha256": "dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.12"
-    },
-    "build_runner_core": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_runner_core",
-        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.3.2"
-    },
-    "built_collection": {
-      "dependency": "transitive",
-      "description": {
-        "name": "built_collection",
-        "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.1.1"
-    },
-    "built_value": {
-      "dependency": "transitive",
-      "description": {
-        "name": "built_value",
-        "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "8.9.2"
-    },
-    "cached_network_image": {
-      "dependency": "direct main",
-      "description": {
-        "name": "cached_network_image",
-        "sha256": "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.3.1"
-    },
-    "cached_network_image_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cached_network_image_platform_interface",
-        "sha256": "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.0"
-    },
-    "cached_network_image_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cached_network_image_web",
-        "sha256": "205d6a9f1862de34b93184f22b9d2d94586b2f05c581d546695e3d8f6a805cd7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
-    "carousel_slider": {
-      "dependency": "direct main",
-      "description": {
-        "name": "carousel_slider",
-        "sha256": "7b006ec356205054af5beaef62e2221160ea36b90fb70a35e4deacd49d0349ae",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.0.0"
-    },
-    "characters": {
-      "dependency": "transitive",
-      "description": {
-        "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.0"
-    },
-    "checked_yaml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "checked_yaml",
-        "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.3"
-    },
-    "cli_util": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cli_util",
-        "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.1"
-    },
-    "clock": {
-      "dependency": "transitive",
-      "description": {
-        "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.1"
-    },
-    "code_builder": {
-      "dependency": "transitive",
-      "description": {
-        "name": "code_builder",
-        "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.10.0"
-    },
-    "collection": {
-      "dependency": "transitive",
-      "description": {
-        "name": "collection",
-        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.18.0"
-    },
-    "connectivity_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "connectivity_plus",
-        "sha256": "224a77051d52a11fbad53dd57827594d3bd24f945af28bd70bab376d68d437f0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.0.2"
-    },
-    "connectivity_plus_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "connectivity_plus_platform_interface",
-        "sha256": "cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.4"
-    },
-    "convert": {
-      "dependency": "direct main",
-      "description": {
-        "name": "convert",
-        "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.1"
-    },
-    "cross_file": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cross_file",
-        "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.4+2"
-    },
-    "crypto": {
-      "dependency": "direct main",
-      "description": {
-        "name": "crypto",
-        "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.5"
-    },
-    "csslib": {
-      "dependency": "transitive",
-      "description": {
-        "name": "csslib",
-        "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "dart_des": {
-      "dependency": "direct main",
-      "description": {
-        "name": "dart_des",
-        "sha256": "0a66afb8883368c824497fd2a1fd67bdb1a785965a3956728382c03d40747c33",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.2"
-    },
-    "dart_discord_rpc": {
-      "dependency": "direct main",
-      "description": {
-        "name": "dart_discord_rpc",
-        "sha256": "c5c6204198a8e10146efb98e6c85fd9374c3576ce4a3c92ade5544c871e7ec87",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.0.2"
-    },
-    "dart_discord_rpc_ffi": {
-      "dependency": "transitive",
-      "description": {
-        "name": "dart_discord_rpc_ffi",
-        "sha256": "0a6f86dc1412ea1798c8ded68541d21460f3d62c316ff6134ba0caadd93048e1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.0.2"
-    },
-    "dart_style": {
-      "dependency": "transitive",
-      "description": {
-        "name": "dart_style",
-        "sha256": "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.2"
-    },
-    "dartx": {
-      "dependency": "transitive",
-      "description": {
-        "name": "dartx",
-        "sha256": "8b25435617027257d43e6508b5fe061012880ddfdaa75a71d607c3de2a13d244",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
-    "dbus": {
-      "dependency": "transitive",
-      "description": {
-        "name": "dbus",
-        "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.10"
-    },
-    "device_info_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "device_info_plus",
-        "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "10.1.2"
-    },
-    "device_info_plus_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "device_info_plus_platform_interface",
-        "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.0.1"
-    },
-    "easy_debounce": {
-      "dependency": "direct main",
-      "description": {
-        "name": "easy_debounce",
-        "sha256": "f082609cfb8f37defb9e37fc28bc978c6712dedf08d4c5a26f820fa10165a236",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.3"
-    },
-    "equatable": {
-      "dependency": "direct main",
-      "description": {
-        "name": "equatable",
-        "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.7"
-    },
-    "fading_edge_scrollview": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fading_edge_scrollview",
-        "sha256": "c25c2231652ce774cc31824d0112f11f653881f43d7f5302c05af11942052031",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.0"
-    },
-    "fake_async": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.1"
-    },
-    "ffi": {
-      "dependency": "direct overridden",
-      "description": {
-        "name": "ffi",
-        "sha256": "13a6ccf6a459a125b3fcdb6ec73bd5ff90822e071207c663bfd1f70062d51d18",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.1"
-    },
-    "file": {
-      "dependency": "transitive",
-      "description": {
-        "name": "file",
-        "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.0.0"
-    },
-    "file_picker": {
-      "dependency": "direct main",
-      "description": {
-        "name": "file_picker",
-        "sha256": "825aec673606875c33cd8d3c4083f1a3c3999015a84178b317b7ef396b7384f3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "8.0.7"
-    },
-    "fixnum": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fixnum",
-        "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
-    "flutter": {
-      "dependency": "direct main",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_bloc": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_bloc",
-        "sha256": "153856bdaac302bbdc58a1d1403d50c40557254aa05eaeed40515d88a25a526b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "9.0.0"
-    },
-    "flutter_cache_manager": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_cache_manager",
-        "sha256": "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.3.1"
-    },
-    "flutter_displaymode": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_displaymode",
-        "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.6.0"
-    },
-    "flutter_downloader": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_downloader",
-        "sha256": "b6da5495b6258aa7c243d0f0a5281e3430b385bccac11cc508f981e653b25aa6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.11.8"
-    },
-    "flutter_launcher_icons": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "flutter_launcher_icons",
-        "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.13.1"
-    },
-    "flutter_lints": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "flutter_lints",
-        "sha256": "a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.3"
-    },
-    "flutter_plugin_android_lifecycle": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_plugin_android_lifecycle",
-        "sha256": "9d98bd47ef9d34e803d438f17fd32b116d31009f534a6fa5ce3a1167f189a6de",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.21"
-    },
-    "flutter_rust_bridge": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_rust_bridge",
-        "sha256": "e12415c3bce49bcbc3fed383f0ea41ad7d828f6cf0eccba0588ffa5a812fe522",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.82.1"
-    },
-    "flutter_svg": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_svg",
-        "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.10+1"
-    },
-    "flutter_test": {
-      "dependency": "direct dev",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_web_plugins": {
-      "dependency": "transitive",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "freezed_annotation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "freezed_annotation",
-        "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.4"
-    },
-    "frontend_server_client": {
-      "dependency": "transitive",
-      "description": {
-        "name": "frontend_server_client",
-        "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.0"
-    },
-    "fuzzywuzzy": {
-      "dependency": "direct main",
-      "description": {
-        "name": "fuzzywuzzy",
-        "sha256": "3004379ffd6e7f476a0c2091f38f16588dc45f67de7adf7c41aa85dec06b432c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
-    "glob": {
-      "dependency": "transitive",
-      "description": {
-        "name": "glob",
-        "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
-    "go_router": {
-      "dependency": "direct main",
-      "description": {
-        "name": "go_router",
-        "sha256": "f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "14.8.1"
-    },
-    "google_nav_bar": {
-      "dependency": "direct main",
-      "description": {
-        "name": "google_nav_bar",
-        "sha256": "1c8e3882fa66ee7b74c24320668276ca23affbd58f0b14a24c1e5590f4d07ab0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.0.6"
-    },
-    "graphs": {
-      "dependency": "transitive",
-      "description": {
-        "name": "graphs",
-        "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.2"
-    },
-    "html": {
-      "dependency": "direct main",
-      "description": {
-        "name": "html",
-        "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.15.4"
-    },
-    "html_unescape": {
-      "dependency": "direct main",
-      "description": {
-        "name": "html_unescape",
-        "sha256": "15362d7a18f19d7b742ef8dcb811f5fd2a2df98db9f80ea393c075189e0b61e3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
-    "http": {
-      "dependency": "direct main",
-      "description": {
-        "name": "http",
-        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.2"
-    },
-    "http_multi_server": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http_multi_server",
-        "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.1"
-    },
-    "http_parser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.2"
-    },
-    "icons_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "icons_plus",
-        "sha256": "8e2f601b8605d45dd55b106a0da084a1809125077a49574ca22e8bcd5b6e86f0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.0.0"
-    },
-    "image": {
-      "dependency": "transitive",
-      "description": {
-        "name": "image",
-        "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.2.0"
-    },
-    "infinite_listview": {
-      "dependency": "transitive",
-      "description": {
-        "name": "infinite_listview",
-        "sha256": "f6062c1720eb59be553dfa6b89813d3e8dd2f054538445aaa5edaddfa5195ce6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
-    "io": {
-      "dependency": "transitive",
-      "description": {
-        "name": "io",
-        "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.4"
-    },
-    "isar": {
-      "dependency": "direct main",
-      "description": {
-        "name": "isar",
-        "sha256": "e17a9555bc7f22ff26568b8c64d019b4ffa2dc6bd4cb1c8d9b269aefd32e53ad",
-        "url": "https://pub.isar-community.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.8"
-    },
-    "isar_flutter_libs": {
-      "dependency": "direct main",
-      "description": {
-        "name": "isar_flutter_libs",
-        "sha256": "78710781e658ce4bff59b3f38c5b2735e899e627f4e926e1221934e77b95231a",
-        "url": "https://pub.isar-community.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.8"
-    },
-    "isar_generator": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "isar_generator",
-        "sha256": "484e73d3b7e81dbd816852fe0b9497333118a9aeb646fd2d349a62cc8980ffe1",
-        "url": "https://pub.isar-community.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.8"
-    },
-    "js": {
-      "dependency": "transitive",
-      "description": {
-        "name": "js",
-        "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.6.7"
-    },
-    "json_annotation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "json_annotation",
-        "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.9.0"
-    },
-    "just_audio": {
-      "dependency": "direct main",
-      "description": {
-        "name": "just_audio",
-        "sha256": "1a1eb86e7d81e69a1d36943f2b3efd62dece3dad2cafd9ec2e62e6db7c04d9b7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.9.43"
-    },
-    "just_audio_media_kit": {
-      "dependency": "direct main",
-      "description": {
-        "name": "just_audio_media_kit",
-        "sha256": "9f3517213dfc7bbaf6980656feb66c35600f114c7efc0b5b3f4476cd5c18b45e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.6"
-    },
-    "just_audio_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "just_audio_platform_interface",
-        "sha256": "0243828cce503c8366cc2090cefb2b3c871aa8ed2f520670d76fd47aa1ab2790",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.3.0"
-    },
-    "just_audio_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "just_audio_web",
-        "sha256": "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.11"
-    },
-    "leak_tracker": {
-      "dependency": "transitive",
-      "description": {
-        "name": "leak_tracker",
-        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "10.0.5"
-    },
-    "leak_tracker_flutter_testing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "leak_tracker_flutter_testing",
-        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.5"
-    },
-    "leak_tracker_testing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.1"
-    },
-    "lints": {
-      "dependency": "transitive",
-      "description": {
-        "name": "lints",
-        "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "logging": {
-      "dependency": "direct main",
-      "description": {
-        "name": "logging",
-        "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
-    "marquee": {
-      "dependency": "direct main",
-      "description": {
-        "name": "marquee",
-        "sha256": "4b5243d2804373bdc25fc93d42c3b402d6ec1f4ee8d0bb72276edd04ae7addb8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.3"
-    },
-    "matcher": {
-      "dependency": "transitive",
-      "description": {
-        "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.12.16+1"
-    },
-    "material_color_utilities": {
-      "dependency": "transitive",
-      "description": {
-        "name": "material_color_utilities",
-        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.11.1"
-    },
-    "media_kit": {
-      "dependency": "transitive",
-      "description": {
-        "name": "media_kit",
-        "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.11"
-    },
-    "media_kit_libs_linux": {
-      "dependency": "direct main",
-      "description": {
-        "name": "media_kit_libs_linux",
-        "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.3"
-    },
-    "media_kit_libs_windows_audio": {
-      "dependency": "direct main",
-      "description": {
-        "name": "media_kit_libs_windows_audio",
-        "sha256": "c2fd558cc87b9d89a801141fcdffe02e338a3b21a41a18fbd63d5b221a1b8e53",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.9"
-    },
-    "meta": {
-      "dependency": "transitive",
-      "description": {
-        "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.15.0"
-    },
-    "metadata_god": {
-      "dependency": "direct main",
-      "description": {
-        "name": "metadata_god",
-        "sha256": "cf13931c39eba0b9443d16e8940afdabee125bf08945f18d4c0d02bcae2a3317",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.5.2+1"
-    },
-    "mime": {
-      "dependency": "transitive",
-      "description": {
-        "name": "mime",
-        "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.5"
-    },
-    "modal_bottom_sheet": {
-      "dependency": "direct main",
-      "description": {
-        "name": "modal_bottom_sheet",
-        "sha256": "eac66ef8cb0461bf069a38c5eb0fa728cee525a531a8304bd3f7b2185407c67e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.0"
-    },
-    "nested": {
-      "dependency": "transitive",
-      "description": {
-        "name": "nested",
-        "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "nm": {
-      "dependency": "transitive",
-      "description": {
-        "name": "nm",
-        "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.5.0"
-    },
-    "numberpicker": {
-      "dependency": "direct main",
-      "description": {
-        "name": "numberpicker",
-        "sha256": "4c129154944b0f6b133e693f8749c3f8bfb67c4d07ef9dcab48b595c22d1f156",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
-    "octo_image": {
-      "dependency": "transitive",
-      "description": {
-        "name": "octo_image",
-        "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "package_config": {
-      "dependency": "transitive",
-      "description": {
-        "name": "package_config",
-        "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "package_info_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "package_info_plus",
-        "sha256": "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.2.0"
-    },
-    "package_info_plus_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "package_info_plus_platform_interface",
-        "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.1"
-    },
-    "palette_generator": {
-      "dependency": "direct main",
-      "description": {
-        "name": "palette_generator",
-        "sha256": "d50fbcd69abb80c5baec66d700033b1a320108b1aa17a5961866a12c0abb7c0c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.3+4"
-    },
-    "path": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.9.0"
-    },
-    "path_parsing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_parsing",
-        "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.1"
-    },
-    "path_provider": {
-      "dependency": "direct main",
-      "description": {
-        "name": "path_provider",
-        "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.4"
-    },
-    "path_provider_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_android",
-        "sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.10"
-    },
-    "path_provider_foundation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_foundation",
-        "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.0"
-    },
-    "path_provider_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_linux",
-        "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.1"
-    },
-    "path_provider_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_platform_interface",
-        "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
-    "path_provider_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_windows",
-        "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.0"
-    },
-    "permission_handler": {
-      "dependency": "direct main",
-      "description": {
-        "name": "permission_handler",
-        "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "11.3.1"
-    },
-    "permission_handler_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_android",
-        "sha256": "76e4ab092c1b240d31177bb64d2b0bea43f43d0e23541ec866151b9f7b2490fa",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "12.0.12"
-    },
-    "permission_handler_apple": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_apple",
-        "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "9.4.5"
-    },
-    "permission_handler_html": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_html",
-        "sha256": "d220eb8476b466d58b161e10b3001d93999010a26228a3fb89c4280db1249546",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3+1"
-    },
-    "permission_handler_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_platform_interface",
-        "sha256": "fe0ffe274d665be8e34f9c59705441a7d248edebbe5d9e3ec2665f88b79358ea",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.2.2"
-    },
-    "permission_handler_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_windows",
-        "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.1"
-    },
-    "petitparser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.2"
-    },
-    "platform": {
-      "dependency": "transitive",
-      "description": {
-        "name": "platform",
-        "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.5"
-    },
-    "plugin_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "plugin_platform_interface",
-        "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.8"
-    },
-    "pool": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.5.1"
-    },
-    "provider": {
-      "dependency": "transitive",
-      "description": {
-        "name": "provider",
-        "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.1.2"
-    },
-    "pub_semver": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pub_semver",
-        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.4"
-    },
-    "pubspec_parse": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pubspec_parse",
-        "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.0"
-    },
-    "puppeteer": {
-      "dependency": "transitive",
-      "description": {
-        "name": "puppeteer",
-        "sha256": "de3f921154e5d336b14cdc05b674ac3db5701a5338f3cb0042868a5146f16e67",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.12.0"
-    },
-    "receive_sharing_intent": {
-      "dependency": "direct main",
-      "description": {
-        "name": "receive_sharing_intent",
-        "sha256": "f127989f8662ea15e193bd1e10605e5a0ab6bb92dffd51f3ce002feb0ce24c93",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.8.0"
-    },
-    "responsive_framework": {
-      "dependency": "direct main",
-      "description": {
-        "name": "responsive_framework",
-        "sha256": "52367ab0c3479b3a5342dec3b74a3d47c4cc1b45bb5d38f720c2e002ebccd4ee",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.4.0"
-    },
-    "rxdart": {
-      "dependency": "direct main",
-      "description": {
-        "name": "rxdart",
-        "sha256": "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.27.7"
-    },
-    "safe_local_storage": {
-      "dependency": "transitive",
-      "description": {
-        "name": "safe_local_storage",
-        "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.2"
-    },
-    "scrollable_positioned_list": {
-      "dependency": "direct main",
-      "description": {
-        "name": "scrollable_positioned_list",
-        "sha256": "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.8"
-    },
-    "share_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "share_plus",
-        "sha256": "3ef39599b00059db0990ca2e30fca0a29d8b37aae924d60063f8e0184cf20900",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.2.2"
-    },
-    "share_plus_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "share_plus_platform_interface",
-        "sha256": "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.4.0"
-    },
-    "shelf": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shelf",
-        "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.4.1"
-    },
-    "shelf_static": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shelf_static",
-        "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.2"
-    },
-    "shelf_web_socket": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shelf_web_socket",
-        "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.4"
-    },
-    "simple_sparse_list": {
-      "dependency": "transitive",
-      "description": {
-        "name": "simple_sparse_list",
-        "sha256": "aa648fd240fa39b49dcd11c19c266990006006de6699a412de485695910fbc1f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.4"
-    },
-    "sky_engine": {
-      "dependency": "transitive",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.99"
-    },
-    "sliding_up_panel": {
-      "dependency": "direct main",
-      "description": {
-        "name": "sliding_up_panel",
-        "sha256": "578e90956a6212d1e406373250b2436a0f3afece29aee3c24c8360094d6cf968",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0+1"
-    },
-    "source_gen": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_gen",
-        "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.5.0"
-    },
-    "source_span": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.10.0"
-    },
-    "sqflite": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sqflite",
-        "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.3+1"
-    },
-    "sqflite_common": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sqflite_common",
-        "sha256": "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.5.4+2"
-    },
-    "stack_trace": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stack_trace",
-        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.11.1"
-    },
-    "stream_channel": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
-    "stream_transform": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stream_transform",
-        "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "string_scanner": {
-      "dependency": "transitive",
-      "description": {
-        "name": "string_scanner",
-        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
-    "string_similarity": {
-      "dependency": "direct main",
-      "description": {
-        "name": "string_similarity",
-        "sha256": "b4b73ec3af3e4203504b136dfbcdbca29edea4eb373684811b76ded9f40a54b9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "synchronized": {
-      "dependency": "transitive",
-      "description": {
-        "name": "synchronized",
-        "sha256": "a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.0"
-    },
-    "term_glyph": {
-      "dependency": "transitive",
-      "description": {
-        "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.1"
-    },
-    "test_api": {
-      "dependency": "transitive",
-      "description": {
-        "name": "test_api",
-        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.2"
-    },
-    "time": {
-      "dependency": "transitive",
-      "description": {
-        "name": "time",
-        "sha256": "ad8e018a6c9db36cb917a031853a1aae49467a93e0d464683e029537d848c221",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.4"
-    },
-    "timing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "timing",
-        "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.1"
-    },
-    "tuple": {
-      "dependency": "transitive",
-      "description": {
-        "name": "tuple",
-        "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.2"
-    },
-    "typed_data": {
-      "dependency": "transitive",
-      "description": {
-        "name": "typed_data",
-        "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.2"
-    },
-    "unicode": {
-      "dependency": "transitive",
-      "description": {
-        "name": "unicode",
-        "sha256": "48f8b6c50ed70ba61647f4987d56ec505923041956bbdb651db2838ce7b47b58",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.7"
-    },
-    "universal_platform": {
-      "dependency": "transitive",
-      "description": {
-        "name": "universal_platform",
-        "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
-    "uri_parser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "uri_parser",
-        "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.2"
-    },
-    "url_launcher": {
-      "dependency": "direct main",
-      "description": {
-        "name": "url_launcher",
-        "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.3.0"
-    },
-    "url_launcher_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_android",
-        "sha256": "f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.3.9"
-    },
-    "url_launcher_ios": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_ios",
-        "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.3.1"
-    },
-    "url_launcher_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_linux",
-        "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.0"
-    },
-    "url_launcher_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_macos",
-        "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.0"
-    },
-    "url_launcher_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_platform_interface",
-        "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.2"
-    },
-    "url_launcher_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.3"
-    },
-    "url_launcher_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_windows",
-        "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    },
-    "uuid": {
-      "dependency": "transitive",
-      "description": {
-        "name": "uuid",
-        "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.7"
-    },
-    "vector_graphics": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vector_graphics",
-        "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.11+1"
-    },
-    "vector_graphics_codec": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vector_graphics_codec",
-        "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.11+1"
-    },
-    "vector_graphics_compiler": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vector_graphics_compiler",
-        "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.11+1"
-    },
-    "vector_math": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.4"
-    },
-    "vm_service": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vm_service",
-        "sha256": "f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "14.2.4"
-    },
-    "watcher": {
-      "dependency": "transitive",
-      "description": {
-        "name": "watcher",
-        "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
-    "web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "web",
-        "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.5.1"
-    },
-    "web_socket_channel": {
-      "dependency": "transitive",
-      "description": {
-        "name": "web_socket_channel",
-        "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.5"
-    },
-    "win32": {
-      "dependency": "transitive",
-      "description": {
-        "name": "win32",
-        "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.5.4"
-    },
-    "win32_registry": {
-      "dependency": "transitive",
-      "description": {
-        "name": "win32_registry",
-        "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.4"
-    },
-    "xdg_directories": {
-      "dependency": "transitive",
-      "description": {
-        "name": "xdg_directories",
-        "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.4"
-    },
-    "xml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.5.0"
-    },
-    "xxh3": {
-      "dependency": "transitive",
-      "description": {
-        "name": "xxh3",
-        "sha256": "a92b30944a9aeb4e3d4f3c3d4ddb3c7816ca73475cd603682c4f8149690f56d7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.1"
-    },
-    "yaml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "yaml",
-        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    },
-    "youtube_explode_dart": {
-      "dependency": "direct main",
-      "description": {
-        "path": ".",
-        "ref": "master",
-        "resolved-ref": "4230020b5ae6cbb19fb37666709f0e76e749c749",
-        "url": "https://github.com/HemantKArya/youtube_explode_dart.git"
-      },
-      "source": "git",
-      "version": "2.4.0-dev.1"
-    }
-  },
-  "sdks": {
-    "dart": ">=3.5.0 <4.0.0",
-    "flutter": ">=3.22.0"
-  }
-}
diff --git a/pkgs/by-name/bl/bloomeetunes/update.sh b/pkgs/by-name/bl/bloomeetunes/update.sh
deleted file mode 100755
index 75dd3934aff0..000000000000
--- a/pkgs/by-name/bl/bloomeetunes/update.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils common-updater-scripts
-
-set -eou pipefail
-
-ROOT="$(dirname "$(readlink -f "$0")")"
-
-latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/HemantKArya/BloomeeTunes/releases/latest | jq --raw-output .tag_name)
-latestVersion=$(echo "$latestTag" | sed 's/^v//' | grep -o '^[^+]*')
-RunNumber=$(echo "$latestTag" | grep -o '[^+]*$')
-
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; bloomeetunes.version or (lib.getVersion bloomeetunes)" | tr -d '"')
-
-if [[ "$currentVersion" == "$latestVersion" ]]; then
-    echo "package is up-to-date: $currentVersion"
-    exit 0
-fi
-
-sed -i "s/\(tag = \"v\${version}+\)[0-9]\+/\1${RunNumber}/" "$ROOT/package.nix"
-
-hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(nix-prefetch-url --unpack "https://github.com/HemantKArya/BloomeeTunes/archive/refs/tags/${latestTag}.tar.gz"))
-update-source-version bloomeetunes $latestVersion $hash
-
-curl https://raw.githubusercontent.com/HemantKArya/BloomeeTunes/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 87e506f06df1..c81e4311a45a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -527,6 +527,7 @@ mapAliases {
   bless = throw "'bless' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'imhex' or 'ghex' instead"; # Added 2024-09-15
   blockbench-electron = blockbench; # Added 2024-03-16
   bloom = throw "'bloom' has been removed because it was unmaintained upstream."; # Added 2024-11-02
+  bloomeetunes = throw "bloomeetunes is unmaintained and has been removed"; # Added 2025-08-26
   bmap-tools = bmaptool; # Added 2024-08-05
   boost175 = throw "Boost 1.75 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24
   boost184 = throw "Boost 1.84 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24

From 902f7267ce79e6ee35716c7b09b95558e54a9cd8 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Tue, 26 Aug 2025 12:52:55 +0800
Subject: [PATCH 3522/3724] harmony-music: drop

This software currently has no maintainer. Although the upstream project is still maintained, it is not very active. This has prevented the removal of flutter324.
---
 pkgs/by-name/ha/harmony-music/package.nix     |   98 -
 .../ha/harmony-music/pubspec.lock.json        | 1616 -----------------
 pkgs/top-level/aliases.nix                    |    1 +
 3 files changed, 1 insertion(+), 1714 deletions(-)
 delete mode 100644 pkgs/by-name/ha/harmony-music/package.nix
 delete mode 100644 pkgs/by-name/ha/harmony-music/pubspec.lock.json

diff --git a/pkgs/by-name/ha/harmony-music/package.nix b/pkgs/by-name/ha/harmony-music/package.nix
deleted file mode 100644
index 4836e427afe9..000000000000
--- a/pkgs/by-name/ha/harmony-music/package.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  autoPatchelfHook,
-  lib,
-  fetchFromGitHub,
-  flutter324,
-  makeDesktopItem,
-  libayatana-appindicator,
-  copyDesktopItems,
-  mpv,
-  runCommand,
-  _experimental-update-script-combinators,
-  harmony-music,
-  gitUpdater,
-  yq,
-  jdk,
-}:
-
-flutter324.buildFlutterApplication rec {
-  pname = "harmony-music";
-  version = "1.12.0";
-
-  src = fetchFromGitHub {
-    owner = "anandnet";
-    repo = "Harmony-Music";
-    tag = "v${version}";
-    hash = "sha256-czXtJeMcwYD0iBmYNhicywTPSnsW1Y2Yl3T2YS3uuWo=";
-  };
-
-  pubspecLock = lib.importJSON ./pubspec.lock.json;
-
-  gitHashes = {
-    just_audio_media_kit = "sha256-cNuKwOAEcFCTfbKhvBvYAdmD5qFeNW16jc3A+6ID3bM=";
-    sidebar_with_animation = "sha256-Y7dTO4wN7cOmm2mnzQPW/gDYltLr7wMKMXbGtAg8WzY=";
-    youtube_explode_dart = "sha256-+3j+B+Ea1l/SzR8ZLp0vLYco77hkwn9VKRPvDeHqIeY=";
-    terminate_restart = "sha256-NiznKbko9f2yWcI62MA2xc/NQgy/31fYqK0COHR1Wpk=";
-  };
-
-  nativeBuildInputs = [
-    copyDesktopItems
-    autoPatchelfHook
-  ];
-
-  buildInputs = [
-    libayatana-appindicator
-    jdk
-  ];
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "harmony-music";
-      exec = "harmonymusic";
-      icon = "harmony-music";
-      genericName = "Harmony Music";
-      desktopName = "Harmony Music";
-      categories = [
-        "AudioVideo"
-      ];
-      keywords = [
-        "Music"
-        "Media"
-        "Streaming"
-      ];
-    })
-  ];
-
-  postInstall = ''
-    install -Dm644 assets/icons/icon.png $out/share/pixmaps/harmony-music.png
-  '';
-
-  extraWrapProgramArgs = ''
-    --prefix LD_LIBRARY_PATH : $out/app/harmony-music/lib:${lib.makeLibraryPath [ mpv ]}
-  '';
-
-  passthru = {
-    pubspecSource =
-      runCommand "pubspec.lock.json"
-        {
-          buildInputs = [ yq ];
-          inherit (harmony-music) src;
-        }
-        ''
-          cat $src/pubspec.lock | yq > $out
-        '';
-    updateScript = _experimental-update-script-combinators.sequence [
-      (gitUpdater { rev-prefix = "v"; })
-      (_experimental-update-script-combinators.copyAttrOutputToFile "harmony-music.pubspecSource" ./pubspec.lock.json)
-    ];
-  };
-
-  meta = {
-    description = "Cross platform App for streaming Music";
-    homepage = "https://github.com/anandnet/Harmony-Music";
-    mainProgram = "harmonymusic";
-    license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/ha/harmony-music/pubspec.lock.json b/pkgs/by-name/ha/harmony-music/pubspec.lock.json
deleted file mode 100644
index c1cd95ca04e3..000000000000
--- a/pkgs/by-name/ha/harmony-music/pubspec.lock.json
+++ /dev/null
@@ -1,1616 +0,0 @@
-{
-  "packages": {
-    "animations": {
-      "dependency": "direct main",
-      "description": {
-        "name": "animations",
-        "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.11"
-    },
-    "app_links": {
-      "dependency": "direct main",
-      "description": {
-        "name": "app_links",
-        "sha256": "3ced568a5d9e309e99af71285666f1f3117bddd0bd5b3317979dccc1a40cada4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.5.1"
-    },
-    "archive": {
-      "dependency": "direct main",
-      "description": {
-        "name": "archive",
-        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.6.1"
-    },
-    "args": {
-      "dependency": "transitive",
-      "description": {
-        "name": "args",
-        "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.6.0"
-    },
-    "async": {
-      "dependency": "transitive",
-      "description": {
-        "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.11.0"
-    },
-    "audio_service": {
-      "dependency": "direct main",
-      "description": {
-        "name": "audio_service",
-        "sha256": "887ddf15fce31fd12aa8044c3bffd14c58929fb20e31d96284fe3aaf48315ac6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.18.17"
-    },
-    "audio_service_mpris": {
-      "dependency": "direct main",
-      "description": {
-        "name": "audio_service_mpris",
-        "sha256": "b16db3584a4b2464c0bfd575c1a21765723d257931222f8adfcb0511f940d352",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.5"
-    },
-    "audio_service_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "audio_service_platform_interface",
-        "sha256": "6283782851f6c8b501b60904a32fc7199dc631172da0629d7301e66f672ab777",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3"
-    },
-    "audio_service_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "audio_service_web",
-        "sha256": "b8ea9243201ee53383157fbccf13d5d2a866b5dda922ec19d866d1d5d70424df",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.4"
-    },
-    "audio_session": {
-      "dependency": "transitive",
-      "description": {
-        "name": "audio_session",
-        "sha256": "2b7fff16a552486d078bfc09a8cde19f426dc6d6329262b684182597bec5b1ac",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.25"
-    },
-    "audio_video_progress_bar": {
-      "dependency": "direct main",
-      "description": {
-        "name": "audio_video_progress_bar",
-        "sha256": "552b1f73c56c4c88407999e0a8507176f60c56de3e6d63bc20a0eab48467d4c9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.3"
-    },
-    "audiotags": {
-      "dependency": "direct main",
-      "description": {
-        "name": "audiotags",
-        "sha256": "13bc4c62b27289768044958d0a6114e047f3d27cf9847e9287edff984bb56290",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.4.2"
-    },
-    "boolean_selector": {
-      "dependency": "transitive",
-      "description": {
-        "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "build_cli_annotations": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_cli_annotations",
-        "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "buttons_tabbar": {
-      "dependency": "direct main",
-      "description": {
-        "name": "buttons_tabbar",
-        "sha256": "6ce4a6015d90500b4c610fa08bc79957516d3303763c68587f20b0263866c0a8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.15"
-    },
-    "cached_network_image": {
-      "dependency": "direct main",
-      "description": {
-        "name": "cached_network_image",
-        "sha256": "4a5d8d2c728b0f3d0245f69f921d7be90cae4c2fd5288f773088672c0893f819",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.4.0"
-    },
-    "cached_network_image_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cached_network_image_platform_interface",
-        "sha256": "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.1.1"
-    },
-    "cached_network_image_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cached_network_image_web",
-        "sha256": "6322dde7a5ad92202e64df659241104a43db20ed594c41ca18de1014598d7996",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.0"
-    },
-    "characters": {
-      "dependency": "transitive",
-      "description": {
-        "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.0"
-    },
-    "cli_config": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cli_config",
-        "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "clock": {
-      "dependency": "transitive",
-      "description": {
-        "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.1"
-    },
-    "collection": {
-      "dependency": "transitive",
-      "description": {
-        "name": "collection",
-        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.18.0"
-    },
-    "convert": {
-      "dependency": "transitive",
-      "description": {
-        "name": "convert",
-        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    },
-    "cross_file": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cross_file",
-        "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.4+2"
-    },
-    "crypto": {
-      "dependency": "transitive",
-      "description": {
-        "name": "crypto",
-        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.6"
-    },
-    "csslib": {
-      "dependency": "transitive",
-      "description": {
-        "name": "csslib",
-        "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.2"
-    },
-    "dbus": {
-      "dependency": "transitive",
-      "description": {
-        "name": "dbus",
-        "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.11"
-    },
-    "dio": {
-      "dependency": "direct main",
-      "description": {
-        "name": "dio",
-        "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.8.0+1"
-    },
-    "dio_web_adapter": {
-      "dependency": "transitive",
-      "description": {
-        "name": "dio_web_adapter",
-        "sha256": "e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "fake_async": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.1"
-    },
-    "ffi": {
-      "dependency": "transitive",
-      "description": {
-        "name": "ffi",
-        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.3"
-    },
-    "file": {
-      "dependency": "transitive",
-      "description": {
-        "name": "file",
-        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.0.1"
-    },
-    "file_picker": {
-      "dependency": "direct main",
-      "description": {
-        "name": "file_picker",
-        "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "8.3.7"
-    },
-    "fixnum": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fixnum",
-        "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.1"
-    },
-    "flutter": {
-      "dependency": "direct main",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_cache_manager": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_cache_manager",
-        "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.4.1"
-    },
-    "flutter_keyboard_visibility": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_keyboard_visibility",
-        "sha256": "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.0"
-    },
-    "flutter_keyboard_visibility_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_linux",
-        "sha256": "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "flutter_keyboard_visibility_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_macos",
-        "sha256": "c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "flutter_keyboard_visibility_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_platform_interface",
-        "sha256": "e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
-    "flutter_keyboard_visibility_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_web",
-        "sha256": "d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
-    "flutter_keyboard_visibility_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_windows",
-        "sha256": "fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "flutter_lints": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "flutter_lints",
-        "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.0"
-    },
-    "flutter_lyric": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_lyric",
-        "sha256": "5d7e6c46c07b96842a05d5d8af385cb9d715feb7e0f1db1983bc128813c420d7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.4+6"
-    },
-    "flutter_plugin_android_lifecycle": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_plugin_android_lifecycle",
-        "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.24"
-    },
-    "flutter_rust_bridge": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_rust_bridge",
-        "sha256": "02720226035257ad0b571c1256f43df3e1556a499f6bcb004849a0faaa0e87f0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.82.6"
-    },
-    "flutter_slidable": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_slidable",
-        "sha256": "a857de7ea701f276fd6a6c4c67ae885b60729a3449e42766bb0e655171042801",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    },
-    "flutter_test": {
-      "dependency": "direct dev",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_web_plugins": {
-      "dependency": "transitive",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "freezed_annotation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "freezed_annotation",
-        "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.4"
-    },
-    "get": {
-      "dependency": "direct main",
-      "description": {
-        "name": "get",
-        "sha256": "c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.7.2"
-    },
-    "google_fonts": {
-      "dependency": "direct main",
-      "description": {
-        "name": "google_fonts",
-        "sha256": "b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.2.1"
-    },
-    "gtk": {
-      "dependency": "transitive",
-      "description": {
-        "name": "gtk",
-        "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "hive": {
-      "dependency": "direct main",
-      "description": {
-        "name": "hive",
-        "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.3"
-    },
-    "hive_flutter": {
-      "dependency": "direct main",
-      "description": {
-        "name": "hive_flutter",
-        "sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
-    "html": {
-      "dependency": "transitive",
-      "description": {
-        "name": "html",
-        "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.15.5"
-    },
-    "http": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http",
-        "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.0"
-    },
-    "http_parser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.2"
-    },
-    "image": {
-      "dependency": "transitive",
-      "description": {
-        "name": "image",
-        "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.3.0"
-    },
-    "ionicons": {
-      "dependency": "direct main",
-      "description": {
-        "name": "ionicons",
-        "sha256": "5496bc65a16115ecf05b15b78f494ee4a8869504357668f0a11d689e970523cf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.2"
-    },
-    "jni": {
-      "dependency": "direct main",
-      "description": {
-        "name": "jni",
-        "sha256": "302f50fd0595cb6440d12aac04b1b83a6de268cfc4721595450ba1d9bcdb3b1f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.14.0"
-    },
-    "jnigen": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "jnigen",
-        "sha256": "376f70d554c9d6aa9bc9dbefbad07f8571d5a56c67ae0c8ce7647fc1f5215cdc",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.14.0"
-    },
-    "js": {
-      "dependency": "transitive",
-      "description": {
-        "name": "js",
-        "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.6.7"
-    },
-    "json_annotation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "json_annotation",
-        "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.9.0"
-    },
-    "just_audio": {
-      "dependency": "direct main",
-      "description": {
-        "name": "just_audio",
-        "sha256": "f978d5b4ccea08f267dae0232ec5405c1b05d3f3cd63f82097ea46c015d5c09e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.9.46"
-    },
-    "just_audio_media_kit": {
-      "dependency": "direct main",
-      "description": {
-        "path": ".",
-        "ref": "3738e6bcc07e289ff9621cf2514f1906c99de9aa",
-        "resolved-ref": "3738e6bcc07e289ff9621cf2514f1906c99de9aa",
-        "url": "https://github.com/anandnet/just_audio_media_kit.git"
-      },
-      "source": "git",
-      "version": "1.0.0"
-    },
-    "just_audio_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "just_audio_platform_interface",
-        "sha256": "271b93b484c6f494ecd72a107fffbdb26b425f170c665b9777a0a24a726f2f24",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.4.0"
-    },
-    "just_audio_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "just_audio_web",
-        "sha256": "58915be64509a7683c44bf11cd1a23c15a48de104927bee116e3c63c8eeea0d4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.14"
-    },
-    "leak_tracker": {
-      "dependency": "transitive",
-      "description": {
-        "name": "leak_tracker",
-        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "10.0.5"
-    },
-    "leak_tracker_flutter_testing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "leak_tracker_flutter_testing",
-        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.5"
-    },
-    "leak_tracker_testing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.1"
-    },
-    "lints": {
-      "dependency": "transitive",
-      "description": {
-        "name": "lints",
-        "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.0"
-    },
-    "lists": {
-      "dependency": "transitive",
-      "description": {
-        "name": "lists",
-        "sha256": "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.1"
-    },
-    "logging": {
-      "dependency": "transitive",
-      "description": {
-        "name": "logging",
-        "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.0"
-    },
-    "matcher": {
-      "dependency": "transitive",
-      "description": {
-        "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.12.16+1"
-    },
-    "material_color_utilities": {
-      "dependency": "transitive",
-      "description": {
-        "name": "material_color_utilities",
-        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.11.1"
-    },
-    "media_kit": {
-      "dependency": "transitive",
-      "description": {
-        "name": "media_kit",
-        "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.11"
-    },
-    "media_kit_libs_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "media_kit_libs_linux",
-        "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.3"
-    },
-    "media_kit_libs_windows_audio": {
-      "dependency": "transitive",
-      "description": {
-        "name": "media_kit_libs_windows_audio",
-        "sha256": "c2fd558cc87b9d89a801141fcdffe02e338a3b21a41a18fbd63d5b221a1b8e53",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.9"
-    },
-    "menu_base": {
-      "dependency": "transitive",
-      "description": {
-        "name": "menu_base",
-        "sha256": "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.1"
-    },
-    "meta": {
-      "dependency": "transitive",
-      "description": {
-        "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.15.0"
-    },
-    "mime": {
-      "dependency": "transitive",
-      "description": {
-        "name": "mime",
-        "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.6"
-    },
-    "octo_image": {
-      "dependency": "transitive",
-      "description": {
-        "name": "octo_image",
-        "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "package_config": {
-      "dependency": "transitive",
-      "description": {
-        "name": "package_config",
-        "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "palette_generator": {
-      "dependency": "direct main",
-      "description": {
-        "name": "palette_generator",
-        "sha256": "5a96b78983752faeb94866b30cb8f52e94ef176722bf51d1c5541d6a3044368f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.3+6"
-    },
-    "path": {
-      "dependency": "direct main",
-      "description": {
-        "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.9.0"
-    },
-    "path_provider": {
-      "dependency": "direct main",
-      "description": {
-        "name": "path_provider",
-        "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.5"
-    },
-    "path_provider_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_android",
-        "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.15"
-    },
-    "path_provider_foundation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_foundation",
-        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "path_provider_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_linux",
-        "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.1"
-    },
-    "path_provider_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_platform_interface",
-        "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
-    "path_provider_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_windows",
-        "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.0"
-    },
-    "permission_handler": {
-      "dependency": "direct main",
-      "description": {
-        "name": "permission_handler",
-        "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "11.3.1"
-    },
-    "permission_handler_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_android",
-        "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "12.0.13"
-    },
-    "permission_handler_apple": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_apple",
-        "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "9.4.5"
-    },
-    "permission_handler_html": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_html",
-        "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3+5"
-    },
-    "permission_handler_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_platform_interface",
-        "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.2.3"
-    },
-    "permission_handler_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_windows",
-        "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.1"
-    },
-    "petitparser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.2"
-    },
-    "platform": {
-      "dependency": "transitive",
-      "description": {
-        "name": "platform",
-        "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.6"
-    },
-    "plugin_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "plugin_platform_interface",
-        "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.8"
-    },
-    "pool": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.5.1"
-    },
-    "pub_semver": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pub_semver",
-        "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.5"
-    },
-    "puppeteer": {
-      "dependency": "transitive",
-      "description": {
-        "name": "puppeteer",
-        "sha256": "7a990c68d33882b642214c351f66492d9a738afa4226a098ab70642357337fa2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.16.0"
-    },
-    "rxdart": {
-      "dependency": "transitive",
-      "description": {
-        "name": "rxdart",
-        "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.28.0"
-    },
-    "safe_local_storage": {
-      "dependency": "transitive",
-      "description": {
-        "name": "safe_local_storage",
-        "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.2"
-    },
-    "screen_retriever": {
-      "dependency": "transitive",
-      "description": {
-        "name": "screen_retriever",
-        "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "screen_retriever_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "screen_retriever_linux",
-        "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "screen_retriever_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "screen_retriever_macos",
-        "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "screen_retriever_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "screen_retriever_platform_interface",
-        "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "screen_retriever_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "screen_retriever_windows",
-        "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "share_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "share_plus",
-        "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "10.1.4"
-    },
-    "share_plus_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "share_plus_platform_interface",
-        "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.0.2"
-    },
-    "shelf": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shelf",
-        "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.4.1"
-    },
-    "shelf_static": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shelf_static",
-        "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.3"
-    },
-    "shelf_web_socket": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shelf_web_socket",
-        "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.4"
-    },
-    "shimmer": {
-      "dependency": "direct main",
-      "description": {
-        "name": "shimmer",
-        "sha256": "5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.0"
-    },
-    "shortid": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shortid",
-        "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.2"
-    },
-    "sidebar_with_animation": {
-      "dependency": "direct main",
-      "description": {
-        "path": ".",
-        "ref": "b53567a42b4ba3793a3cf00d478bdba0ecce33d7",
-        "resolved-ref": "b53567a42b4ba3793a3cf00d478bdba0ecce33d7",
-        "url": "https://github.com/anandnet/animated_side_bar.git"
-      },
-      "source": "git",
-      "version": "0.0.3"
-    },
-    "sky_engine": {
-      "dependency": "transitive",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.99"
-    },
-    "smtc_windows": {
-      "dependency": "direct main",
-      "description": {
-        "name": "smtc_windows",
-        "sha256": "0fd64d0c6a0c8ea4ea7908d31195eadc8f6d45d5245159fc67259e9e8704100f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3"
-    },
-    "source_span": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.10.0"
-    },
-    "sprintf": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sprintf",
-        "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.0.0"
-    },
-    "sqflite": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sqflite",
-        "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1"
-    },
-    "sqflite_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sqflite_android",
-        "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.0"
-    },
-    "sqflite_common": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sqflite_common",
-        "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.5.4+6"
-    },
-    "sqflite_darwin": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sqflite_darwin",
-        "sha256": "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.1+1"
-    },
-    "sqflite_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sqflite_platform_interface",
-        "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.0"
-    },
-    "stack_trace": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stack_trace",
-        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.11.1"
-    },
-    "stream_channel": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
-    "string_scanner": {
-      "dependency": "transitive",
-      "description": {
-        "name": "string_scanner",
-        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
-    "synchronized": {
-      "dependency": "transitive",
-      "description": {
-        "name": "synchronized",
-        "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.3.0+3"
-    },
-    "term_glyph": {
-      "dependency": "transitive",
-      "description": {
-        "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.1"
-    },
-    "terminate_restart": {
-      "dependency": "direct main",
-      "description": {
-        "path": ".",
-        "ref": "eb505e07e11d0fe1f5c03993e707c6678428c353",
-        "resolved-ref": "eb505e07e11d0fe1f5c03993e707c6678428c353",
-        "url": "https://github.com/anandnet/terminate_restart.git"
-      },
-      "source": "git",
-      "version": "1.0.7"
-    },
-    "test_api": {
-      "dependency": "transitive",
-      "description": {
-        "name": "test_api",
-        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.2"
-    },
-    "toggle_switch": {
-      "dependency": "direct main",
-      "description": {
-        "name": "toggle_switch",
-        "sha256": "dca04512d7c23ed320d6c5ede1211a404f177d54d353bf785b07d15546a86ce5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.0"
-    },
-    "tray_manager": {
-      "dependency": "direct main",
-      "description": {
-        "name": "tray_manager",
-        "sha256": "bdc3ac6c36f3d12d871459e4a9822705ce5a1165a17fa837103bc842719bf3f7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.4"
-    },
-    "tuple": {
-      "dependency": "transitive",
-      "description": {
-        "name": "tuple",
-        "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.2"
-    },
-    "typed_data": {
-      "dependency": "transitive",
-      "description": {
-        "name": "typed_data",
-        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.4.0"
-    },
-    "unicode": {
-      "dependency": "transitive",
-      "description": {
-        "name": "unicode",
-        "sha256": "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.1"
-    },
-    "universal_platform": {
-      "dependency": "transitive",
-      "description": {
-        "name": "universal_platform",
-        "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
-    "uri_parser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "uri_parser",
-        "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.2"
-    },
-    "url_launcher": {
-      "dependency": "direct main",
-      "description": {
-        "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.3.1"
-    },
-    "url_launcher_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_android",
-        "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.3.14"
-    },
-    "url_launcher_ios": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_ios",
-        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.3.2"
-    },
-    "url_launcher_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_linux",
-        "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.1"
-    },
-    "url_launcher_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_macos",
-        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.2"
-    },
-    "url_launcher_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_platform_interface",
-        "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.2"
-    },
-    "url_launcher_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.3"
-    },
-    "url_launcher_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_windows",
-        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.4"
-    },
-    "uuid": {
-      "dependency": "transitive",
-      "description": {
-        "name": "uuid",
-        "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.5.1"
-    },
-    "vector_math": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.4"
-    },
-    "vm_service": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vm_service",
-        "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "14.2.5"
-    },
-    "web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "web",
-        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
-    "web_socket_channel": {
-      "dependency": "transitive",
-      "description": {
-        "name": "web_socket_channel",
-        "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.0"
-    },
-    "widget_marquee": {
-      "dependency": "direct main",
-      "description": {
-        "name": "widget_marquee",
-        "sha256": "7a16d17a15adff1d0191535ffa6cf03d2b5373bbca333c7006788a712ee3f3a8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.0.8"
-    },
-    "win32": {
-      "dependency": "transitive",
-      "description": {
-        "name": "win32",
-        "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.10.1"
-    },
-    "window_manager": {
-      "dependency": "direct main",
-      "description": {
-        "name": "window_manager",
-        "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.3"
-    },
-    "xdg_directories": {
-      "dependency": "transitive",
-      "description": {
-        "name": "xdg_directories",
-        "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
-    "xml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.5.0"
-    },
-    "yaml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "yaml",
-        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.3"
-    },
-    "youtube_explode_dart": {
-      "dependency": "direct main",
-      "description": {
-        "path": ".",
-        "ref": "1d9ec9baa806705b1d859260eeb389ec28c6b024",
-        "resolved-ref": "1d9ec9baa806705b1d859260eeb389ec28c6b024",
-        "url": "https://github.com/anandnet/youtube_explode_dart.git"
-      },
-      "source": "git",
-      "version": "2.3.7"
-    }
-  },
-  "sdks": {
-    "dart": ">=3.5.0 <4.0.0",
-    "flutter": ">=3.24.0"
-  }
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 87e506f06df1..b40612fd8c86 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1124,6 +1124,7 @@ mapAliases {
   hacksaw = throw "'hacksaw' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   haka = throw "haka has been removed because it failed to build and was unmaintained for 9 years"; # Added 2025-03-11
   hardinfo = throw "'hardinfo' has been removed as it was abandoned upstream. Consider using 'hardinfo2' instead."; # added 2025-04-17
+  harmony-music = throw "harmony-music is unmaintained and has been removed"; # Added 2025-08-26
   hasura-graphql-engine = throw "hasura-graphql-engine has been removed because was broken and its packaging severly out of date"; # Added 2025-02-14
   haven-cli = throw "'haven-cli' has been removed due to the official announcement of the project closure. Read more at https://havenprotocol.org/2024/12/12/project-closure-announcement"; # Added 2025-02-25
   hawknl = throw "'hawknl' has been removed as it was unmaintained and the upstream unavailable"; # Added 2025-05-07

From e4246b85ecc6fcd82f4be4fc249b1522d403a33b Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Tue, 26 Aug 2025 13:01:50 +0800
Subject: [PATCH 3523/3724] gopeed,localsend: use flutter327

---
 pkgs/by-name/go/gopeed/package.nix    | 4 ++--
 pkgs/by-name/lo/localsend/package.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix
index febaff39719f..594a849b14eb 100644
--- a/pkgs/by-name/go/gopeed/package.nix
+++ b/pkgs/by-name/go/gopeed/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  flutter324,
+  flutter327,
   autoPatchelfHook,
   buildGoModule,
   libayatana-appindicator,
@@ -44,7 +44,7 @@ let
     meta = metaCommon;
   };
 in
-flutter324.buildFlutterApplication {
+flutter327.buildFlutterApplication {
   inherit version src;
   pname = "gopeed";
 
diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix
index dd13d61ac6b9..f07e589d9f37 100644
--- a/pkgs/by-name/lo/localsend/package.nix
+++ b/pkgs/by-name/lo/localsend/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   fetchFromGitHub,
-  flutter324,
+  flutter327,
   makeDesktopItem,
   copyDesktopItems,
   nixosTests,
@@ -16,7 +16,7 @@ let
   pname = "localsend";
   version = "1.17.0";
 
-  linux = flutter324.buildFlutterApplication rec {
+  linux = flutter327.buildFlutterApplication rec {
     inherit pname version;
 
     src = fetchFromGitHub {

From df7db57367528e3b9beaa303437fbb4fe20e27cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 05:33:34 +0000
Subject: [PATCH 3524/3724] taze: 19.1.0 -> 19.3.0

---
 pkgs/by-name/ta/taze/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix
index a4bd2fe26c45..c1556a9d2105 100644
--- a/pkgs/by-name/ta/taze/package.nix
+++ b/pkgs/by-name/ta/taze/package.nix
@@ -13,19 +13,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "taze";
-  version = "19.1.0";
+  version = "19.3.0";
 
   src = fetchFromGitHub {
     owner = "antfu-collective";
     repo = "taze";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hBXs8S8mOMV7FQIhCzJuhcbTczkwMc5B44fTacAJvyw=";
+    hash = "sha256-sgQHXaa8mPpmFgYfAVksjokuCvuYnT9blJRWG/tXdA8=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-aUMV2REINp5LDcj1s8bgQAj/4508UEewu+ebD+JT0+M=";
+    hash = "sha256-Wb19IIh9SKc0/Uvh3Tq0SlxU5Yd5ivn493uiPUtXKbk=";
   };
 
   nativeBuildInputs = [

From fc50e536de59905849c149acf1b0fa822275b86b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 05:37:02 +0000
Subject: [PATCH 3525/3724] python3Packages.bx-py-utils: 109 -> 111

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

diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix
index e4d881163576..8714c9c1176d 100644
--- a/pkgs/development/python-modules/bx-py-utils/default.nix
+++ b/pkgs/development/python-modules/bx-py-utils/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "bx-py-utils";
-  version = "109";
+  version = "111";
 
   disabled = pythonOlder "3.10";
 
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "boxine";
     repo = "bx_py_utils";
     tag = "v${version}";
-    hash = "sha256-y1R48nGeTCpcBAzU3kqNQumRToKvQx9qst1kXPWDIlk=";
+    hash = "sha256-B+05yBjqfnBaVvRZo47Akqyap4W5do+Xsumi69Ez4iY=";
   };
 
   postPatch = ''

From 9653539a4b15b86eb8201d762e96c01794b5434a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 05:54:26 +0000
Subject: [PATCH 3526/3724] wrkflw: 0.7.0 -> 0.7.1

---
 pkgs/by-name/wr/wrkflw/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wr/wrkflw/package.nix b/pkgs/by-name/wr/wrkflw/package.nix
index b165a9057258..40742d26f28f 100644
--- a/pkgs/by-name/wr/wrkflw/package.nix
+++ b/pkgs/by-name/wr/wrkflw/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wrkflw";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "bahdotsh";
     repo = "wrkflw";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-J0FlGuISBpyiZNQSwQF/9YJncu67BKSC2Bq2S6F/vKQ=";
+    hash = "sha256-r7FEyMVvsHqFylOXx9NKeI3WHGmlv5655BOhi0tlbVU=";
   };
 
-  cargoHash = "sha256-8iYsHVc7WI94IKMECYs4v+68rG3Mc8Kto9dmGwQrkCU=";
+  cargoHash = "sha256-hCkUN8BcdJIIWXJhPbSrdX06nHjsx5arrgPuC+Jo8rM=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From 5160431e8a63440b46fd367ba822d79b82e82deb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 06:08:21 +0000
Subject: [PATCH 3527/3724] python3Packages.reorder-python-imports: 3.13.0 ->
 3.15.0

---
 .../python-modules/reorder-python-imports/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reorder-python-imports/default.nix b/pkgs/development/python-modules/reorder-python-imports/default.nix
index edb7175db01a..b18033e88fd7 100644
--- a/pkgs/development/python-modules/reorder-python-imports/default.nix
+++ b/pkgs/development/python-modules/reorder-python-imports/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "reorder-python-imports";
-  version = "3.13.0";
+  version = "3.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "asottile";
     repo = "reorder_python_imports";
     tag = "v${version}";
-    hash = "sha256-N0hWrrUeojlUDZx2Azs/y2kCaknQ62hHdp0J2ZXPElY=";
+    hash = "sha256-oBzEPKcJO/M13+KSLZYSeMgwo28J7TZOj6H2YHkFWHU=";
   };
 
   build-system = [ setuptools ];

From c4ddaf61b51257bc8328848430b7c4f9577aab37 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 26 Aug 2025 08:09:12 +0200
Subject: [PATCH 3528/3724] claude-code: 1.0.90 -> 1.0.92

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Minor version bump with bug fixes and improvements.
---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 12f4421556af..51b53deb0420 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -6,13 +6,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.90"
+        "@anthropic-ai/claude-code": "^1.0.92"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.90",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.90.tgz",
-      "integrity": "sha512-waC7GC4fnfyiFVFTS7Eo4MAS/iEYpyM67JZFXr+B07bOkjBYtBqXh77+Z/btcyI8NxvUtpnFS0R5FXkU/tKCwg==",
+      "version": "1.0.92",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.92.tgz",
+      "integrity": "sha512-/XuwJqAvXwIGf9WeZOxHI6qQsAGzxhrRc3hyQdvwW6cU5iviTmrxWasksPbJMvFt6KQoAUU6XHs78XyYmBpOXQ==",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index eb2cdfdceabb..30135b447218 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.90";
+  version = "1.0.92";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-dI3nnuN5a8lBsuTVGzEASxqxCKr2KrTpBdEIgk/47Kw=";
+    hash = "sha256-xW+oI91wL+DFaOHw5M84QJktuE9HXb031pGbrNcrpPQ=";
   };
 
-  npmDepsHash = "sha256-LinE6hbDhvZ5RlkRSzQMC+JbnmocQRosJLo5aP4p3hE=";
+  npmDepsHash = "sha256-rrMskQkWKz+B5dqJ8gHgBxO20OdgE3d53TJWDxeJGbo=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 6ce3f826408ced038b68858d4fb65e0715958c21 Mon Sep 17 00:00:00 2001
From: Andrei Lapshin <alapshin@fastmail.com>
Date: Mon, 25 Aug 2025 21:51:36 +0200
Subject: [PATCH 3529/3724] mitmproxy: 12.1.1 -> 12.1.2

---
 pkgs/development/python-modules/mitmproxy-linux/default.nix | 3 ++-
 pkgs/development/python-modules/mitmproxy-macos/default.nix | 2 +-
 pkgs/development/python-modules/mitmproxy-rs/default.nix    | 6 +++---
 pkgs/development/python-modules/mitmproxy/default.nix       | 6 ++++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/mitmproxy-linux/default.nix b/pkgs/development/python-modules/mitmproxy-linux/default.nix
index 41467db01625..1af784ed3611 100644
--- a/pkgs/development/python-modules/mitmproxy-linux/default.nix
+++ b/pkgs/development/python-modules/mitmproxy-linux/default.nix
@@ -12,7 +12,8 @@ buildPythonPackage {
   pyproject = true;
 
   postPatch = ''
-    substituteInPlace mitmproxy-linux/build.rs \
+    substituteInPlace ../mitmproxy-rs-*-vendor/aya-build-*/src/lib.rs \
+      --replace-fail '"+nightly",' "" \
       --replace-fail '"-Z",' "" \
       --replace-fail '"build-std=core",' ""
 
diff --git a/pkgs/development/python-modules/mitmproxy-macos/default.nix b/pkgs/development/python-modules/mitmproxy-macos/default.nix
index caf00819f313..606ae484f274 100644
--- a/pkgs/development/python-modules/mitmproxy-macos/default.nix
+++ b/pkgs/development/python-modules/mitmproxy-macos/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     format = "wheel";
     dist = "py3";
     python = "py3";
-    hash = "sha256-sNguT3p72v9+FU5XFLYV6p0fO6WvGYerPy68GINwbyA=";
+    hash = "sha256-NArp10yhERk7Hhw5fIU+ekbupyldyzpLQdKgebiUpOM=";
   };
 
   # repo has no python tests
diff --git a/pkgs/development/python-modules/mitmproxy-rs/default.nix b/pkgs/development/python-modules/mitmproxy-rs/default.nix
index f0598f51944a..023ffdca0ab9 100644
--- a/pkgs/development/python-modules/mitmproxy-rs/default.nix
+++ b/pkgs/development/python-modules/mitmproxy-rs/default.nix
@@ -11,21 +11,21 @@
 
 buildPythonPackage rec {
   pname = "mitmproxy-rs";
-  version = "0.12.3";
+  version = "0.12.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mitmproxy";
     repo = "mitmproxy_rs";
     tag = "v${version}";
-    hash = "sha256-bWvSaUx5nv8d17eOWyYlhSDi71rHycrFoDGRuQEL7LU=";
+    hash = "sha256-Wd/4XzSMQ3qgacFUlxReQFyonUbTqWKDCk3m+kWhXy0=";
   };
 
   buildAndTestSubdir = "mitmproxy-rs";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-9J5RVGCXyMOcCYUP+LS92Xv1krA+feoMqFgeFExxxqY=";
+    hash = "sha256-Q5EBI5uXJgbI9NMblkTT/GweopnTr/zUG35i+Aoe3QA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix
index 2632ecf82108..a3bc6a665655 100644
--- a/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/pkgs/development/python-modules/mitmproxy/default.nix
@@ -38,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "mitmproxy";
-  version = "12.1.1";
+  version = "12.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mitmproxy";
     repo = "mitmproxy";
     tag = "v${version}";
-    hash = "sha256-RTHL5+lbR+AbkiE4+z4ZbxZSV2E4NGTmShbMIMRKJPA=";
+    hash = "sha256-XYZ14JlVYG/OLlEze+C1L/HP3HD5GEW+jG2YYSXW/8Y=";
   };
 
   pythonRelaxDeps = [
@@ -55,6 +55,8 @@ buildPythonPackage rec {
     "passlib"
     "pyopenssl"
     "tornado"
+    "typing-extensions"
+    "urwid"
   ];
 
   build-system = [ setuptools ];

From 1e11e207ce1c7e5d4cfe4c95cb16b609c6d6deb2 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 25 Aug 2025 21:13:53 +0200
Subject: [PATCH 3530/3724] python3Packages.cachier: unbreak

---
 .../python-modules/cachier/default.nix          | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix
index 60f46103311d..2c93fcc2d1d8 100644
--- a/pkgs/development/python-modules/cachier/default.nix
+++ b/pkgs/development/python-modules/cachier/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
@@ -9,6 +10,7 @@
   portalocker,
   pytestCheckHook,
   pytest-cov-stub,
+  sqlalchemy,
   pymongo,
   dnspython,
   pymongo-inmemory,
@@ -46,6 +48,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-cov-stub
+    sqlalchemy
     pymongo
     dnspython
     pymongo-inmemory
@@ -67,9 +70,23 @@ buildPythonPackage rec {
     # don't test formatting
     "test_flake8"
 
+    # slow, spawns 800+ threads
+    "test_inotify_instance_limit_reached"
+
     # timing sensitive
     "test_being_calc_next_time"
     "test_pickle_being_calculated"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # sensitive to host file system
+    # Unhandled exception in FSEventsEmitter -  RuntimeError: Cannot add watch - it is already scheduled
+    "test_bad_cache_file"
+    "test_delete_cache_file"
+  ];
+
+  disabledTestPaths = [
+    # Keeps breaking due to concurrent access or failing to close the db between tests.
+    "tests/test_sql_core.py"
   ];
 
   preBuild = ''

From d058d3b840d85c859e3b8dceb9342b8ae0703f8b Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 26 Aug 2025 08:36:51 +0200
Subject: [PATCH 3531/3724] ci-edit: drop

This doesn't seem to receive much maintenance upstream.

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/ci/ci-edit/package.nix | 41 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 pkgs/by-name/ci/ci-edit/package.nix

diff --git a/pkgs/by-name/ci/ci-edit/package.nix b/pkgs/by-name/ci/ci-edit/package.nix
deleted file mode 100644
index 02963c7e382c..000000000000
--- a/pkgs/by-name/ci/ci-edit/package.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  python3,
-  fetchFromGitHub,
-}:
-
-python3.pkgs.buildPythonApplication {
-  pname = "ci-edit";
-  version = "51-unstable-2023-04-11";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = "ci_edit";
-    # Last build iteration is v51 from 2021, but there are some recent
-    # additions of syntax highlighting and dictionary files.
-    rev = "2976f01dc6421b5639505292b335212d413d044f";
-    hash = "sha256-DwVNNotRcYbvJX6iXffSQyZMFTxQexIhfG8reFmozN8=";
-  };
-
-  nativeBuildInputs = with python3.pkgs; [
-    setuptools
-  ];
-
-  postInstall = ''
-    ln -s $out/bin/ci.py $out/bin/ci_edit
-    ln -s $out/bin/ci.py $out/bin/we
-    install -Dm644 $src/app/*.words $out/${python3.sitePackages}/app/
-  '';
-
-  pythonImportsCheck = [ "app" ];
-
-  meta = with lib; {
-    description = "Terminal text editor with mouse support and ctrl+Q to quit";
-    homepage = "https://github.com/google/ci_edit";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ katexochen ];
-    mainProgram = "ci_edit";
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6a6ac68b11a7..e8baa5472c86 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -611,6 +611,7 @@ mapAliases {
   citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
   citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
   citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
+  ci-edit = throw "'ci-edit' has been removed due to lack of maintenance upstream"; # Added 2025-08-26
   cloog = throw "cloog has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   cloog_0_18_0 = throw "cloog_0_18_0 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   cloogppl = throw "cloogppl has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13

From e496afdfa64ecbae7086544b89c87e0baaceac27 Mon Sep 17 00:00:00 2001
From: zimward <zimward@zimward.moe>
Date: Mon, 25 Aug 2025 23:44:13 +0200
Subject: [PATCH 3532/3724] slic3r: drop

---
 pkgs/by-name/sl/slic3r/package.nix | 137 -----------------------------
 pkgs/top-level/aliases.nix         |   1 +
 2 files changed, 1 insertion(+), 137 deletions(-)
 delete mode 100644 pkgs/by-name/sl/slic3r/package.nix

diff --git a/pkgs/by-name/sl/slic3r/package.nix b/pkgs/by-name/sl/slic3r/package.nix
deleted file mode 100644
index 6931cc5e7130..000000000000
--- a/pkgs/by-name/sl/slic3r/package.nix
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  perl,
-  makeWrapper,
-  makeDesktopItem,
-  which,
-  perlPackages,
-  boost,
-  wrapGAppsHook3,
-}:
-
-stdenv.mkDerivation rec {
-  version = "1.3.0";
-  pname = "slic3r";
-
-  src = fetchFromGitHub {
-    owner = "alexrj";
-    repo = "Slic3r";
-    rev = version;
-    sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0=";
-  };
-
-  nativeBuildInputs = [
-    makeWrapper
-    which
-    wrapGAppsHook3
-  ];
-  buildInputs = [
-    boost
-  ]
-  ++ (with perlPackages; [
-    perl
-    EncodeLocale
-    MathClipper
-    ExtUtilsXSpp
-    MathConvexHullMonotoneChain
-    MathGeometryVoronoi
-    MathPlanePath
-    Moo
-    IOStringy
-    ClassXSAccessor
-    Wx
-    GrowlGNTP
-    NetDBus
-    ImportInto
-    XMLSAX
-    ExtUtilsMakeMaker
-    OpenGL
-    WxGLCanvas
-    ModuleBuild
-    LWP
-    ExtUtilsCppGuess
-    ModuleBuildWithXSpp
-    ExtUtilsTypemapsDefault
-    DevelChecklib
-    locallib
-  ]);
-
-  desktopItem = makeDesktopItem {
-    name = "slic3r";
-    exec = "slic3r";
-    icon = "slic3r";
-    comment = "G-code generator for 3D printers";
-    desktopName = "Slic3r";
-    genericName = "3D printer tool";
-    categories = [ "Development" ];
-  };
-
-  prePatch = ''
-    # In nix ioctls.h isn't available from the standard kernel-headers package
-    # on other distributions. As the copy in glibc seems to be identical to the
-    # one in the kernel, we use that one instead.
-    sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp
-  '';
-
-  patches = [
-    (fetchpatch {
-      url = "https://web.archive.org/web/20230606220657if_/https://sources.debian.org/data/main/s/slic3r/1.3.0%2Bdfsg1-5/debian/patches/Drop-error-admesh-works-correctly-on-little-endian-machin.patch";
-      hash = "sha256-+F94jzMFBdI++SKgyEZTBaHFVbjxWwgJa8YVbpK0euI=";
-    })
-    (fetchpatch {
-      url = "https://web.archive.org/web/20230606220036if_/https://sources.debian.org/data/main/s/slic3r/1.3.0+dfsg1-5/debian/patches/0006-Fix-FTBFS-with-Boost-1.71.patch";
-      hash = "sha256-4jvNccttig5YI1hXSANAWxVz6C4+kowlacMXVCpFgOo=";
-    })
-    (fetchpatch {
-      url = "https://web.archive.org/web/20230606220054if_/https://sources.debian.org/data/main/s/slic3r/1.3.0+dfsg1-5/debian/patches/fix_boost_174.patch";
-      hash = "sha256-aSmxc2htmrla9l/DIRWeKdBW0LTV96wMUZSLLNjgbzY=";
-    })
-  ];
-
-  buildPhase = ''
-    export SLIC3R_NO_AUTO=true
-    export LD=$CXX
-    export PERL5LIB="./xs/blib/arch/:./xs/blib/lib:$PERL5LIB"
-
-    substituteInPlace Build.PL \
-      --replace "0.9918" "0.9923" \
-      --replace "eval" ""
-
-    pushd xs
-      perl Build.PL
-      perl Build
-    popd
-
-    perl Build.PL --gui
-  '';
-
-  installPhase = ''
-    mkdir -p "$out/share/slic3r/"
-    cp -r * "$out/share/slic3r/"
-    wrapProgram "$out/share/slic3r/slic3r.pl" \
-      --prefix PERL5LIB : "$out/share/slic3r/xs/blib/arch:$out/share/slic3r/xs/blib/lib:$PERL5LIB"
-    mkdir -p "$out/bin"
-    ln -s "$out/share/slic3r/slic3r.pl" "$out/bin/slic3r"
-    mkdir -p "$out/share/pixmaps/"
-    ln -s "$out/share/slic3r/var/Slic3r.png" "$out/share/pixmaps/slic3r.png"
-    mkdir -p "$out/share/applications"
-    cp "$desktopItem"/share/applications/* "$out/share/applications/"
-  '';
-
-  meta = with lib; {
-    description = "G-code generator for 3D printers";
-    mainProgram = "slic3r";
-    longDescription = ''
-      Slic3r is the tool you need to convert a digital 3D model into printing
-      instructions for your 3D printer. It cuts the model into horizontal
-      slices (layers), generates toolpaths to fill them and calculates the
-      amount of material to be extruded.'';
-    homepage = "https://slic3r.org/";
-    license = licenses.agpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ bjornfor ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ada5eb0b9855..067b495babb7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2111,6 +2111,7 @@ mapAliases {
   SkypeExport = skypeexport; # Added 2024-06-12
   skypeforlinux = throw "Skype has been shut down in May 2025"; # Added 2025-05-05
   slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17
+  slic3r = throw "'slic3r' has been removed because it is unmaintained"; # Added 2025-08-26
   slimerjs = throw "slimerjs does not work with any version of Firefox newer than 59; upstream ended the project in 2021. <https://slimerjs.org/faq.html#end-of-development>"; # added 2025-01-06
   sloccount = throw "'sloccount' has been removed because it is unmaintained. Consider migrating to 'loccount'"; # added 2025-05-17
   slrn = throw "'slrn' has been removed because it is unmaintained upstream and broken."; # Added 2025-06-11

From 44ab8751e5c48593427a38d8cfbd6ad500aaee22 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 26 Aug 2025 11:24:12 +0300
Subject: [PATCH 3533/3724] python3Packages.numbagg: fix changelog URL

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

diff --git a/pkgs/development/python-modules/numbagg/default.nix b/pkgs/development/python-modules/numbagg/default.nix
index 7b964d16ed46..98b3eecc2e7b 100644
--- a/pkgs/development/python-modules/numbagg/default.nix
+++ b/pkgs/development/python-modules/numbagg/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
   meta = {
     description = "Fast N-dimensional aggregation functions with Numba";
     homepage = "https://github.com/numbagg/numbagg";
-    changelog = "https://github.com/numbagg/numbagg/releases/tag/${version}";
+    changelog = "https://github.com/numbagg/numbagg/releases/tag/v${version}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ flokli ];
   };

From e167a96fa5b8e7a0e8e3883870904452cf5b61ee Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Tue, 26 Aug 2025 10:24:30 +0200
Subject: [PATCH 3534/3724] homer: 25.04.1 -> 25.08.1

Git changelog: https://github.com/bastienwirtz/homer/compare/v25.04.1...v25.08.1
Release tag: https://github.com/bastienwirtz/homer/releases/tag/v25.08.1

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 ...cifying-custom-sass-compiler-path-by.patch | 157 +++++++++---------
 pkgs/by-name/ho/homer/package.nix             |  17 +-
 2 files changed, 90 insertions(+), 84 deletions(-)

diff --git a/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch b/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch
index 2320b53976cf..19e2ee66e681 100644
--- a/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch
+++ b/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch
@@ -1,24 +1,23 @@
-From d4d4a299de39685e59f256c81d8e60ce6efd8b23 Mon Sep 17 00:00:00 2001
+From 0f77537ce2ba5c1a23d5c2a154bdc77450d1e0e5 Mon Sep 17 00:00:00 2001
 From: Christoph Heiss <christoph@c8h4.io>
-Date: Wed, 1 Jan 2025 18:02:40 +0100
+Date: Tue, 26 Aug 2025 10:23:14 +0200
 Subject: [PATCH] build: enable specifying custom sass compiler path by env-var
 
-Signed-off-by: Felix Buehler <account@buehler.rocks>
 Signed-off-by: Christoph Heiss <christoph@c8h4.io>
 ---
- package.json                |  7 ++++++-
+ package.json                |  5 ++++-
  patches/sass-embedded.patch | 15 +++++++++++++++
- pnpm-lock.yaml              | 35 ++++++++++++++++++++---------------
- 3 files changed, 41 insertions(+), 16 deletions(-)
+ pnpm-lock.yaml              | 27 ++++++++++++++++-----------
+ 3 files changed, 35 insertions(+), 12 deletions(-)
  create mode 100644 patches/sass-embedded.patch
 
-diff --git i/package.json w/package.json
-index 897b42e..7a91a85 100644
---- i/package.json
-+++ w/package.json
+diff --git a/package.json b/package.json
+index a67d2c6..17f17b1 100644
+--- a/package.json
++++ b/package.json
 @@ -32,6 +32,9 @@
    "license": "Apache-2.0",
-   "packageManager": "pnpm@10.4.1+sha512.c753b6c3ad7afa13af388fa6d808035a008e30ea9993f58c6663e2bc5ff21679aa834db094987129aa4d488b86df57f7b634981b2f827cdcacc698cc0cfb88af",
+   "packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
    "pnpm": {
 -    "neverBuiltDependencies": []
 +    "neverBuiltDependencies": [],
@@ -29,7 +28,7 @@ index 897b42e..7a91a85 100644
  }
 diff --git a/patches/sass-embedded.patch b/patches/sass-embedded.patch
 new file mode 100644
-index 0000000..f941a8e
+index 0000000..5e02bed
 --- /dev/null
 +++ b/patches/sass-embedded.patch
 @@ -0,0 +1,15 @@
@@ -37,106 +36,112 @@ index 0000000..f941a8e
 +index ae33aa3028e1a120d9e84b043bb19a71f1083b96..7a49d16a54982312ad638632d6750d7bec670f02 100644
 +--- a/dist/lib/src/compiler-path.js
 ++++ b/dist/lib/src/compiler-path.js
-+@@ -24,6 +24,10 @@ function isLinuxMusl(path) {
-+ }
++@@ -8,6 +8,10 @@ const p = require("path");
++ const compiler_module_1 = require("./compiler-module");
 + /** The full command for the embedded compiler executable. */
 + exports.compilerCommand = (() => {
 ++    const binPath = process.env.SASS_EMBEDDED_BIN_PATH;
 ++    if (binPath) {
 ++        return [binPath];
 ++    }
-+     const platform = process.platform === 'linux' && isLinuxMusl(process.execPath)
-+         ? 'linux-musl'
-+         : process.platform;
-diff --git i/pnpm-lock.yaml w/pnpm-lock.yaml
-index 5df58fb..bb27c4b 100644
---- i/pnpm-lock.yaml
-+++ w/pnpm-lock.yaml
++     try {
++         return [
++             require.resolve(`${compiler_module_1.compilerModule}/dart-sass/src/dart` +
+diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
+index 8f98554..44d1691 100644
+--- a/pnpm-lock.yaml
++++ b/pnpm-lock.yaml
 @@ -4,6 +4,11 @@ settings:
    autoInstallPeers: true
    excludeLinksFromLockfile: false
-
+ 
 +patchedDependencies:
 +  sass-embedded:
-+    hash: 6wjvcsryx2tfkpottp4wf5nbzi
++    hash: 24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20
 +    path: patches/sass-embedded.patch
 +
  importers:
-
+ 
    .:
 @@ -29,7 +34,7 @@ importers:
-         version: 9.21.0
+         version: 9.32.0
        '@vitejs/plugin-vue':
-         specifier: ^5.2.1
--        version: 5.2.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)
-+        version: 5.2.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)
+         specifier: ^6.0.1
+-        version: 6.0.1(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)
++        version: 6.0.1(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)
        '@vue/eslint-config-prettier':
          specifier: ^10.2.0
-         version: 10.2.0(eslint@9.21.0)(prettier@3.5.2)
+         version: 10.2.0(eslint@9.32.0)(prettier@3.6.2)
 @@ -50,13 +55,13 @@ importers:
-         version: 3.5.2
+         version: 3.6.2
        sass-embedded:
-         specifier: ^1.85.0
--        version: 1.85.0
-+        version: 1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
+         specifier: ^1.90.0
+-        version: 1.90.0
++        version: 1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20)
        vite:
-         specifier: ^6.1.3
--        version: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0)
-+        version: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0)
+         specifier: ^7.0.6
+-        version: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
++        version: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
        vite-plugin-pwa:
-         specifier: ^0.21.1
--        version: 0.21.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
-+        version: 0.21.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
-
+         specifier: ^1.0.2
+-        version: 1.0.2(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0)
++        version: 1.0.2(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0)
+ 
  packages:
-
-@@ -3477,9 +3482,9 @@ snapshots:
-
+ 
+@@ -3634,10 +3639,10 @@ snapshots:
+ 
    '@types/trusted-types@2.0.7': {}
-
--  '@vitejs/plugin-vue@5.2.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)':
-+  '@vitejs/plugin-vue@5.2.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)':
+ 
+-  '@vitejs/plugin-vue@6.0.1(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)':
++  '@vitejs/plugin-vue@6.0.1(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)':
      dependencies:
--      vite: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0)
-+      vite: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0)
-       vue: 3.5.13
-
-   '@vue/compiler-core@3.5.13':
-@@ -4702,7 +4707,7 @@ snapshots:
-   sass-embedded-win32-x64@1.85.0:
+       '@rolldown/pluginutils': 1.0.0-beta.29
+-      vite: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
++      vite: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
+       vue: 3.5.18
+ 
+   '@vue/compiler-core@3.5.18':
+@@ -4869,7 +4874,7 @@ snapshots:
+   sass-embedded-win32-x64@1.90.0:
      optional: true
-
--  sass-embedded@1.85.0:
-+  sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi):
+ 
+-  sass-embedded@1.90.0:
++  sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20):
      dependencies:
-       '@bufbuild/protobuf': 2.2.3
+       '@bufbuild/protobuf': 2.6.3
        buffer-builder: 0.2.0
-@@ -5001,25 +5006,25 @@ snapshots:
-
+@@ -5184,18 +5189,18 @@ snapshots:
+ 
    varint@6.0.0: {}
-
--  vite-plugin-pwa@0.21.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
-+  vite-plugin-pwa@0.21.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
+ 
+-  vite-plugin-pwa@1.0.2(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0):
++  vite-plugin-pwa@1.0.2(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0):
      dependencies:
-       debug: 4.4.0
+       debug: 4.4.1
        pretty-bytes: 6.1.1
-       tinyglobby: 0.2.12
--      vite: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0)
-+      vite: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0)
+       tinyglobby: 0.2.14
+-      vite: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
++      vite: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
        workbox-build: 7.3.0
        workbox-window: 7.3.0
      transitivePeerDependencies:
        - supports-color
-
--  vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0):
-+  vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0):
+ 
+-  vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1):
++  vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1):
      dependencies:
-       esbuild: 0.24.2
-       postcss: 8.5.3
-       rollup: 4.38.0
+       esbuild: 0.25.8
+       fdir: 6.4.6(picomatch@4.0.3)
+@@ -5206,7 +5211,7 @@ snapshots:
      optionalDependencies:
        fsevents: 2.3.3
--      sass-embedded: 1.85.0
-+      sass-embedded: 1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
-       terser: 5.39.0
-       yaml: 2.7.0
+       sass: 1.90.0
+-      sass-embedded: 1.90.0
++      sass-embedded: 1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20)
+       terser: 5.43.1
+       yaml: 2.8.1
+ 
+-- 
+2.50.1
+
diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix
index e00c2327054e..79c4cffde305 100644
--- a/pkgs/by-name/ho/homer/package.nix
+++ b/pkgs/by-name/ho/homer/package.nix
@@ -2,31 +2,32 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
-  pnpm_9,
+  pnpm_10,
   nodejs,
   dart-sass,
   nix-update-script,
   nixosTests,
 }:
+
 stdenvNoCC.mkDerivation rec {
   pname = "homer";
-  version = "25.04.1";
+  version = "25.08.1";
   src = fetchFromGitHub {
     owner = "bastienwirtz";
     repo = "homer";
     rev = "v${version}";
-    hash = "sha256-hvDrFGv6Mht9whA2lJbDLQnP2LkOiCo3NtjMpWr/q6A=";
+    hash = "sha256-DA2gdh6o67QDC4y+N5DVG0ktjt/ORNbycU/y2cUjUE0=";
   };
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm_10.fetchDeps {
     inherit
       pname
       version
       src
       patches
       ;
-    fetcherVersion = 1;
-    hash = "sha256-y1R+rlaOtFOHHAgEHPBl40536U10Ft0iUSfGcfXS08Y=";
+    fetcherVersion = 2;
+    hash = "sha256-y/4f/39NOVV46Eg3h7fw8K43/kUIBqtiokTRRlX7398=";
   };
 
   # Enables specifying a custom Sass compiler binary path via `SASS_EMBEDDED_BIN_PATH` environment variable.
@@ -35,7 +36,7 @@ stdenvNoCC.mkDerivation rec {
   nativeBuildInputs = [
     nodejs
     dart-sass
-    pnpm_9.configHook
+    pnpm_10.configHook
   ];
 
   buildPhase = ''
@@ -65,7 +66,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     description = "Very simple static homepage for your server";
-    homepage = "https://homer-demo.netlify.app/";
+    homepage = "https://github.com/bastienwirtz/homer";
     changelog = "https://github.com/bastienwirtz/homer/releases";
     license = licenses.asl20;
     maintainers = with maintainers; [

From ea9cd38249fd53d4058cf7610ac34fbd916adb5d Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Tue, 26 Aug 2025 10:24:56 +0200
Subject: [PATCH 3535/3724] sudo-rs: add sudoedit symlinks

---
 pkgs/by-name/su/sudo-rs/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix
index 835d75de3b3f..a4193931ed0e 100644
--- a/pkgs/by-name/su/sudo-rs/package.nix
+++ b/pkgs/by-name/su/sudo-rs/package.nix
@@ -38,6 +38,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
       ln -vs $(basename "$man_fn") "$man_fn_fixed"
       installManPage "$man_fn_fixed"
     done
+
+    ln -s $out/share/man/man8/{sudo,sudoedit}.8.gz
+    ln -s $out/bin/{sudo,sudoedit}
   '';
 
   checkFlags = map (t: "--skip=${t}") [

From e6393736cbb7f4d122bc971ebc7ca10078f85216 Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Tue, 26 Aug 2025 10:33:49 +0200
Subject: [PATCH 3536/3724] nixos/sudo-rs: add sudoedit wrapper

---
 nixos/modules/security/sudo-rs.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/sudo-rs.nix b/nixos/modules/security/sudo-rs.nix
index 7fa795270b8b..50e50e77b851 100644
--- a/nixos/modules/security/sudo-rs.nix
+++ b/nixos/modules/security/sudo-rs.nix
@@ -286,7 +286,16 @@ in
       in
       {
         sudo = {
-          source = "${lib.getExe cfg.package}";
+          source = lib.getExe cfg.package;
+          inherit
+            owner
+            group
+            setuid
+            permissions
+            ;
+        };
+        sudoedit = {
+          source = lib.getExe' cfg.package "sudoedit";
           inherit
             owner
             group

From 4ff411c4b7e425a77a79bc7bc5ddd6618fe737a0 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Tue, 26 Aug 2025 08:51:33 +0000
Subject: [PATCH 3537/3724] pwvucontrol: fix cross compilation

---
 pkgs/by-name/pw/pwvucontrol/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/pw/pwvucontrol/package.nix b/pkgs/by-name/pw/pwvucontrol/package.nix
index 47fcecde48b7..35dab5a2f0e9 100644
--- a/pkgs/by-name/pw/pwvucontrol/package.nix
+++ b/pkgs/by-name/pw/pwvucontrol/package.nix
@@ -57,6 +57,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-oQSH4P9WxvkXZ53KM5ZoRAZyQFt60Zz7guBbgT1iiBk=";
   };
 
+  postPatch = ''
+    substituteInPlace src/meson.build --replace-fail \
+      "'src' / rust_target / meson.project_name()," \
+      "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name(),"
+  '';
+
   nativeBuildInputs = [
     cargo
     desktop-file-utils
@@ -80,6 +86,9 @@ stdenv.mkDerivation (finalAttrs: {
     wireplumber_0_4
   ];
 
+  # For https://github.com/saivert/pwvucontrol/blob/7bf43c746cd49fffbfb244ac4474742c6b3737a9/src/meson.build#L45-L46
+  env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
+
   meta = {
     description = "Pipewire Volume Control";
     homepage = "https://github.com/saivert/pwvucontrol";

From 619bacbba597f5e8f385bb8fe1aa00592f2fe085 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Tue, 26 Aug 2025 08:57:48 +0000
Subject: [PATCH 3538/3724] loupe: fix cross compilation

---
 pkgs/by-name/lo/loupe/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix
index 4f887f68316a..cf5a039ba465 100644
--- a/pkgs/by-name/lo/loupe/package.nix
+++ b/pkgs/by-name/lo/loupe/package.nix
@@ -37,6 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-PKkyZDd4FLWGZ/kDKWkaSV8p8NDniSQGcR9Htce6uCg=";
   };
 
+  postPatch = ''
+    substituteInPlace src/meson.build --replace-fail \
+      "'src' / rust_target / meson.project_name()," \
+      "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()," \
+  '';
+
   nativeBuildInputs = [
     cargo
     desktop-file-utils
@@ -73,6 +79,9 @@ stdenv.mkDerivation (finalAttrs: {
     )
   '';
 
+  # For https://gitlab.gnome.org/GNOME/loupe/-/blob/0e6ddb0227ac4f1c55907f8b43eaef4bb1d3ce70/src/meson.build#L34-35
+  env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
+
   passthru = {
     updateScript =
       let

From 78cc6434021631bdd474d73cb2f430732a3367d9 Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Tue, 26 Aug 2025 14:18:18 +0530
Subject: [PATCH 3539/3724] choose: 1.3.6 -> 1.3.7

Diff: https://github.com/theryangeary/choose/compare/v1.3.6...v1.3.7
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
 pkgs/by-name/ch/choose/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/choose/package.nix b/pkgs/by-name/ch/choose/package.nix
index 3043e782099d..3e6597d8722f 100644
--- a/pkgs/by-name/ch/choose/package.nix
+++ b/pkgs/by-name/ch/choose/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "choose";
-  version = "1.3.6";
+  version = "1.3.7";
 
   src = fetchFromGitHub {
     owner = "theryangeary";
     repo = "choose";
     rev = "v${version}";
-    sha256 = "sha256-ojmib9yri/Yj1VSwwssbXv+ThnZjUXLTmOpfPGdGFaU=";
+    sha256 = "sha256-nqL8CAnpqOaecC6vHlCtVXFRO0OAGZAn12TdOM5iUFA=";
   };
 
-  cargoHash = "sha256-SecWDujJu68K1LMQJQ55LeW51Ag/aCt1YKcdWeRp22c=";
+  cargoHash = "sha256-NVpkCs1QY2e+WiI9nk1uz/j3pOtsJpMwgAMspB6Bs1E=";
 
   meta = with lib; {
     description = "Human-friendly and fast alternative to cut and (sometimes) awk";

From 594f4924de0341292a9aecf39c46c4d545755aba Mon Sep 17 00:00:00 2001
From: Stzx <silence.m@hotmail.com>
Date: Tue, 26 Aug 2025 16:19:36 +0800
Subject: [PATCH 3540/3724] scx.cscheds: direct use of bash

---
 pkgs/os-specific/linux/scx/scx_cscheds.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix
index dc9e138cd7f4..23c183bf8a2a 100644
--- a/pkgs/os-specific/linux/scx/scx_cscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix
@@ -17,15 +17,6 @@
   libseccomp,
 }:
 
-let
-  # Fixes a bug with the meson build script where it specifies
-  # /bin/bash twice in the script
-  misbehaviorBash = writeShellScript "bash" ''
-    shift 1
-    exec ${lib.getExe bash} "$@"
-  '';
-
-in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "scx_cscheds";
   inherit (scx-common) version src;
@@ -66,7 +57,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     cp ${finalAttrs.fetchBpftool} meson-scripts/fetch_bpftool
     cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf
     substituteInPlace meson.build \
-      --replace-fail '[build_bpftool' "['${misbehaviorBash}', build_bpftool"
+      --replace-fail '[build_bpftool' "['${lib.getExe bash}', build_bpftool"
 
     # TODO: Remove in next release.
     substituteInPlace lib/scxtest/overrides.h \

From c221fb1b374267662034c647faf63b2ae5287976 Mon Sep 17 00:00:00 2001
From: Victor Nascimento Bakke <gipphe@gmail.com>
Date: Mon, 11 Aug 2025 00:15:01 +0200
Subject: [PATCH 3541/3724] jdenticon-cli: init at 3.3.0

---
 pkgs/by-name/jd/jdenticon-cli/package.nix | 52 +++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/jd/jdenticon-cli/package.nix

diff --git a/pkgs/by-name/jd/jdenticon-cli/package.nix b/pkgs/by-name/jd/jdenticon-cli/package.nix
new file mode 100644
index 000000000000..bc91523e6f6d
--- /dev/null
+++ b/pkgs/by-name/jd/jdenticon-cli/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nodejs,
+  makeWrapper,
+  versionCheckHook,
+  nix-update-script,
+}:
+buildNpmPackage (finalAttrs: {
+  pname = "jdenticon-cli";
+  version = "3.3.0";
+  src = fetchFromGitHub {
+    owner = "dmester";
+    repo = "jdenticon";
+    tag = finalAttrs.version;
+    hash = "sha256-uOPNsfEreC7F+Y0WWmudZSPnGxqarna0JPOwQyK6LiQ=";
+  };
+  npmDepsHash = "sha256-LXwvb088oHmA57EryfYtKi0L/9sB+yyUr/K/qGA1W9k=";
+
+  nativeBuildInputs = [
+    makeWrapper
+    nodejs
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D bin/jdenticon.js "$out/lib/jdenticon/bin/jdenticon.js"
+    install -D dist/jdenticon-node.js "$out/lib/jdenticon/dist/jdenticon-node.js"
+    install -d "$out/lib/jdenticon/node_modules"
+    cp -r node_modules/canvas-renderer  "$out/lib/jdenticon/node_modules"
+    makeWrapper "${lib.getExe nodejs}" "$out/bin/jdenticon" \
+      --add-flags "$out/lib/jdenticon/bin/jdenticon.js"
+
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/dmester/jdenticon/releases/tag/${finalAttrs.version}";
+    description = "JavaScript library for generating highly recognizable identicons using HTML5 canvas or SVG.";
+    homepage = "https://jdenticon.com/";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.gipphe ];
+    mainProgram = "jdenticon";
+  };
+})

From 245daf0bff4837fd562e0325b546d289b26eb70c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Santos=20Reis?= <joaosreis@outlook.pt>
Date: Tue, 26 Aug 2025 10:51:41 +0100
Subject: [PATCH 3542/3724] spotify/darwin: 1.2.69.449 -> 1.2.70.409

---
 pkgs/by-name/sp/spotify/darwin.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sp/spotify/darwin.nix b/pkgs/by-name/sp/spotify/darwin.nix
index d2c24ad6ec5a..cb9ddae6591e 100644
--- a/pkgs/by-name/sp/spotify/darwin.nix
+++ b/pkgs/by-name/sp/spotify/darwin.nix
@@ -11,18 +11,18 @@
 stdenv.mkDerivation {
   inherit pname;
 
-  version = "1.2.69.449";
+  version = "1.2.70.409";
 
   src =
     if stdenv.hostPlatform.isAarch64 then
       (fetchurl {
-        url = "https://web.archive.org/web/20250811170447/https://download.scdn.co/SpotifyARM64.dmg";
-        hash = "sha256-x9lpcQI1kZc4OIvQBhKXmI7t/2DIDbzufZhpNCKTxPA=";
+        url = "https://web.archive.org/web/20250826093914/https://download.scdn.co/SpotifyARM64.dmg";
+        hash = "sha256-bs+rSMfIFG0FyHGDUtuk6tSbd5l6r6qUNH20hQQjZC0=";
       })
     else
       (fetchurl {
-        url = "https://web.archive.org/web/20250811170211/https://download.scdn.co/Spotify.dmg";
-        hash = "sha256-z6pmQ3Wmwnd3YQNf1WPdPNCRxHX1PjqAEt50trGe0Bk=";
+        url = "https://web.archive.org/web/20250826093142/https://download.scdn.co/Spotify.dmg";
+        hash = "sha256-i1mHX7zo/07sHrGm8c6SQdFekRuJXOmqCcOk2IYPeLI=";
       });
 
   nativeBuildInputs = [ undmg ];

From e4f6313e8545b459ae5a7dec3ca9881e3198cbe7 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Tue, 26 Aug 2025 19:59:58 +1000
Subject: [PATCH 3543/3724] python3Packages.jaxlib: fix eval, infinate
 recursion

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

diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix
index 429dce1b4594..6182440701b0 100644
--- a/pkgs/development/python-modules/jaxlib/default.nix
+++ b/pkgs/development/python-modules/jaxlib/default.nix
@@ -6,8 +6,7 @@
   # Build-time dependencies:
   addDriverRunpath,
   autoAddDriverRunpath,
-  #bazel_6,
-  bazel,
+  bazel_7,
   binutils,
   buildBazelPackage,
   buildPythonPackage,
@@ -226,7 +225,7 @@ let
 
     # See https://github.com/google/jax/blob/main/.bazelversion for the latest.
     #bazel = bazel_6;
-    bazel = bazel;
+    bazel = bazel_7;
 
     src = fetchFromGitHub {
       owner = "google";

From 190b1f6fbec02525a2520c2313d20b5cb27f8077 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Tue, 26 Aug 2025 04:05:12 -0600
Subject: [PATCH 3544/3724] python3Packages.coincurve: fix build, modernize

---
 .../python-modules/coincurve/default.nix      | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix
index d70b8a020255..7fcc967932ac 100644
--- a/pkgs/development/python-modules/coincurve/default.nix
+++ b/pkgs/development/python-modules/coincurve/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   cmake,
@@ -18,7 +19,6 @@
 
   # checks
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -26,8 +26,6 @@ buildPythonPackage rec {
   version = "21.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "ofek";
     repo = "coincurve";
@@ -35,6 +33,14 @@ buildPythonPackage rec {
     hash = "sha256-+8/CsV2BTKZ5O2LIh5/kOKMfFrkt2Jsjuj37oiOgO6Y=";
   };
 
+  patches = [
+    # Build requires cffi LICENSE files
+    (fetchpatch {
+      url = "https://github.com/ofek/coincurve/commit/19597b0869803acfc669d916e43c669e9ffcced7.patch";
+      hash = "sha256-BkUxXjcwk3btcvSVaVZqVTJ+8E8CYtT5cTXLx9lxJ/g=";
+    })
+  ];
+
   build-system = [
     hatchling
     cffi
@@ -56,25 +62,17 @@ buildPythonPackage rec {
     cffi
   ];
 
-  preCheck = ''
-    # https://github.com/ofek/coincurve/blob/master/tox.ini#L20-L22=
-    rm -rf coincurve
-
-    # don't run benchmark tests
-    rm tests/test_bench.py
-  '';
-
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "coincurve" ];
 
-  meta = with lib; {
+  meta = {
     description = "Cross-platform bindings for libsecp256k1";
     homepage = "https://github.com/ofek/coincurve";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ ryand56 ];
   };
 }

From 8873b3cfafe07ffabce8f32a929f4356b1042e91 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 12:07:08 +0200
Subject: [PATCH 3545/3724] nuclei: 3.4.8 -> 3.4.10

Diff: https://github.com/projectdiscovery/nuclei/compare/v3.4.8...v3.4.10

Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v3.4.10
---
 pkgs/by-name/nu/nuclei/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix
index fedced71e028..ce4acf746936 100644
--- a/pkgs/by-name/nu/nuclei/package.nix
+++ b/pkgs/by-name/nu/nuclei/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "nuclei";
-  version = "3.4.8";
+  version = "3.4.10";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei";
     tag = "v${version}";
-    hash = "sha256-SESLzN2Fc+GY4ztJ8V9GfSb/Ja88PPpgptJLL2jx1SI=";
+    hash = "sha256-lFyp5VXEX0nK83p2LmWdhNoQKvNtgln1GG3OpZEXaL8=";
   };
 
   vendorHash = "sha256-cDK0xP3vHRVBeFK2dKDnaCNge7EBKkMcrYen12XI7G0=";

From 46ee0092aef4d84e28f28d7d964a5d0423e1fbf0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Aug 2025 09:48:01 +0200
Subject: [PATCH 3546/3724] graphinder: modernize

---
 pkgs/by-name/gr/graphinder/package.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gr/graphinder/package.nix b/pkgs/by-name/gr/graphinder/package.nix
index a770ed13a6ae..ccd8c52df735 100644
--- a/pkgs/by-name/gr/graphinder/package.nix
+++ b/pkgs/by-name/gr/graphinder/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "graphinder";
   version = "2.0.0b4";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Escape-Technologies";
@@ -16,11 +16,9 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-emBWhEJxYRAw3WTd8t+lurnHX8SeCcLBHGH9B+Owuag=";
   };
 
-  nativeBuildInputs = with python3.pkgs; [
-    poetry-core
-  ];
+  build-system = with python3.pkgs; [ poetry-core ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     aiohttp
     beautifulsoup4
     requests
@@ -49,10 +47,10 @@ python3.pkgs.buildPythonApplication rec {
 
   meta = {
     description = "Tool to find GraphQL endpoints using subdomain enumeration";
-    mainProgram = "graphinder";
     homepage = "https://github.com/Escape-Technologies/graphinder";
-    changelog = "https://github.com/Escape-Technologies/graphinder/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    changelog = "https://github.com/Escape-Technologies/graphinder/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "graphinder";
   };
 }

From c56150136a154b36e0fe5f749c365ba502c7407c Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 26 Aug 2025 12:13:43 +0200
Subject: [PATCH 3547/3724] matrix-synapse: 1.136.0 -> 1.137.0

Diff: https://github.com/element-hq/synapse/compare/v1.136.0...v1.137.0
Changelog: https://github.com/element-hq/synapse/releases/tag/v1.137.0
---
 pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index 7b29a8490732..a0791b5ac5f5 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -14,19 +14,19 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.136.0";
+  version = "1.137.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-9nN4sQXCamVi+FRN9++FN5nQmjYZnPKDLxjxEuga6EM=";
+    hash = "sha256-jnbW1p5JK00Of6XqoDfWs/4SqIztafjkvXUDWhMTm30=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-GX4lVg6aPVlqFgSSGsUg3wi7bne9jVWPTVx8rO5SjL8=";
+    hash = "sha256-qpgDErV1VVzaUHHQX4ReXCPihdrSKI/4HtbDeQIblR8=";
   };
 
   build-system = with python3Packages; [

From 46b98cadf940ea1913260c0632283538017dd17f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 26 Aug 2025 12:16:48 +0200
Subject: [PATCH 3548/3724] python3Packages.sagemaker: 2.249.0 -> 2.251.0

Diff: https://github.com/aws/sagemaker-python-sdk/compare/v2.249.0...v2.251.0

Changelog: https://github.com/aws/sagemaker-python-sdk/blob/v2.251.0/CHANGELOG.md
---
 pkgs/development/python-modules/sagemaker/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index fa226744b5c0..c85014a814a8 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -13,6 +13,7 @@
   docker,
   fastapi,
   google-pasta,
+  graphene,
   importlib-metadata,
   jsonschema,
   numpy,
@@ -40,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker";
-  version = "2.249.0";
+  version = "2.251.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-python-sdk";
     tag = "v${version}";
-    hash = "sha256-CXEIRFr0rrdydPOKp4HxErUUew86toGAkKo8X5Bz2Bo=";
+    hash = "sha256-QGj4ZUAwr6SxUNWgs+1PNxg/4WYE1ynR1y4I11+kDmc=";
   };
 
   build-system = [
@@ -72,6 +73,7 @@ buildPythonPackage rec {
     docker
     fastapi
     google-pasta
+    graphene
     importlib-metadata
     jsonschema
     numpy

From 6c6fdfe3d869e3892d65c56213069cf6a6fbd409 Mon Sep 17 00:00:00 2001
From: David Wronek <david@mainlining.org>
Date: Sun, 17 Aug 2025 12:14:49 +0200
Subject: [PATCH 3549/3724] _0xffff: init at 0.10

Signed-off-by: David Wronek <david@mainlining.org>
---
 pkgs/by-name/_0/_0xffff/package.nix | 44 +++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/_0/_0xffff/package.nix

diff --git a/pkgs/by-name/_0/_0xffff/package.nix b/pkgs/by-name/_0/_0xffff/package.nix
new file mode 100644
index 000000000000..b30e4a273375
--- /dev/null
+++ b/pkgs/by-name/_0/_0xffff/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  libusb-compat-0_1,
+  versionCheckHook,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "0xFFFF";
+  version = "0.10";
+
+  src = fetchFromGitHub {
+    owner = "pali";
+    repo = "0xFFFF";
+    tag = finalAttrs.version;
+    hash = "sha256-RTpiH6OpC1hRbhLW5Em01oDQdpAZ/mfggCDLSUzOC9s=";
+  };
+
+  strictDeps = true;
+
+  buildInputs = [ libusb-compat-0_1 ];
+
+  installFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX="
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-h";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Open Free Fiasco Firmware Flasher for Maemo devices";
+    homepage = "https://github.com/pali/0xFFFF";
+    changelog = "https://github.com/pali/0xFFFF/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+    mainProgram = "0xFFFF";
+  };
+})

From bcd4a87129c83d269e96f7e9f0e28eb867e69435 Mon Sep 17 00:00:00 2001
From: DaRacci <me@racci.dev>
Date: Tue, 26 Aug 2025 20:37:15 +1000
Subject: [PATCH 3550/3724] boxflat: fix build

---
 pkgs/by-name/bo/boxflat/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/boxflat/package.nix b/pkgs/by-name/bo/boxflat/package.nix
index b42156eab9e9..71c1242a8807 100644
--- a/pkgs/by-name/bo/boxflat/package.nix
+++ b/pkgs/by-name/bo/boxflat/package.nix
@@ -48,7 +48,8 @@ python3Packages.buildPythonPackage rec {
   postPatch = ''
     substituteInPlace requirements.txt \
         --replace-fail "psutil==6.1.0" "psutil" \
-        --replace-fail "evdev==1.7.1" "evdev"
+        --replace-fail "evdev==1.7.1" "evdev" \
+        --replace-fail "pycairo==1.27.0" "pycairo"
   '';
 
   preBuild = ''

From c8efaed5bb409707d78a34f776f06eec2663aeb3 Mon Sep 17 00:00:00 2001
From: ljxfstorm <ljxf.storm@live.cn>
Date: Tue, 26 Aug 2025 18:43:16 +0800
Subject: [PATCH 3551/3724] cloudflare-warp: add headless variant

---
 pkgs/by-name/cl/cloudflare-warp/package.nix | 44 +++++++++++++++------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix
index 3a6c759ad1ad..feb8e901b883 100644
--- a/pkgs/by-name/cl/cloudflare-warp/package.nix
+++ b/pkgs/by-name/cl/cloudflare-warp/package.nix
@@ -20,6 +20,7 @@
   jq,
   ripgrep,
   common-updater-scripts,
+  headless ? false,
 }:
 
 let
@@ -38,7 +39,7 @@ in
 stdenv.mkDerivation rec {
   inherit version;
 
-  pname = "cloudflare-warp";
+  pname = "cloudflare-warp" + lib.optionalString headless "-headless";
 
   src =
     sources.${stdenv.hostPlatform.system}
@@ -49,20 +50,24 @@ stdenv.mkDerivation rec {
     autoPatchelfHook
     versionCheckHook
     makeWrapper
+  ]
+  ++ lib.optionals (!headless) [
     copyDesktopItems
     desktop-file-utils
   ];
 
   buildInputs = [
     dbus
-    gtk3
     libpcap
     openssl
     nss
     (lib.getLib stdenv.cc.cc)
+  ]
+  ++ lib.optionals (!headless) [
+    gtk3
   ];
 
-  desktopItems = [
+  desktopItems = lib.optionals (!headless) [
     (makeDesktopItem {
       name = "com.cloudflare.WarpCli";
       desktopName = "Cloudflare Zero Trust Team Enrollment";
@@ -93,22 +98,35 @@ stdenv.mkDerivation rec {
     mv lib/systemd/system $out/lib/systemd/
     substituteInPlace $out/lib/systemd/system/warp-svc.service \
       --replace-fail "ExecStart=" "ExecStart=$out"
-    substituteInPlace $out/lib/systemd/user/warp-taskbar.service \
-      --replace-fail "ExecStart=" "ExecStart=$out" \
-      --replace-fail "BindsTo=" "PartOf="
+    ${lib.optionalString (!headless) ''
+      substituteInPlace $out/lib/systemd/user/warp-taskbar.service \
+        --replace-fail "ExecStart=" "ExecStart=$out" \
+        --replace-fail "BindsTo=" "PartOf="
 
-    cat >>$out/lib/systemd/user/warp-taskbar.service <<EOF
+      cat >>$out/lib/systemd/user/warp-taskbar.service <<EOF
 
-    [Service]
-    BindReadOnlyPaths=$out:/usr:
-    EOF
+      [Service]
+      BindReadOnlyPaths=$out:/usr:
+      EOF
+    ''}
+    ${lib.optionalString headless ''
+      # For headless version, remove GUI components
+      rm $out/bin/warp-taskbar
+      rm -r $out/lib/systemd/user
+      rm -r $out/etc
+      rm -r $out/share/applications
+      rm -r $out/share/icons
+      rm -r $out/share/warp
+    ''}
 
     runHook postInstall
   '';
 
   postInstall = ''
     wrapProgram $out/bin/warp-svc --prefix PATH : ${lib.makeBinPath [ nftables ]}
-    wrapProgram $out/bin/warp-cli --prefix PATH : ${lib.makeBinPath [ desktop-file-utils ]}
+    ${lib.optionalString (!headless) ''
+      wrapProgram $out/bin/warp-cli --prefix PATH : ${lib.makeBinPath [ desktop-file-utils ]}
+    ''}
   '';
 
   doInstallCheck = true;
@@ -146,7 +164,9 @@ stdenv.mkDerivation rec {
   };
 
   meta = with lib; {
-    description = "Replaces the connection between your device and the Internet with a modern, optimized, protocol";
+    description =
+      "Replaces the connection between your device and the Internet with a modern, optimized, protocol"
+      + lib.optionalString headless " (headless version)";
     homepage = "https://pkg.cloudflareclient.com/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;

From f688ab8422c78678a55a14a336273abf265a31b1 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Tue, 26 Aug 2025 04:41:15 -0600
Subject: [PATCH 3552/3724] basicswap: fix build

---
 pkgs/by-name/ba/basicswap/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ba/basicswap/package.nix b/pkgs/by-name/ba/basicswap/package.nix
index cf66255cd150..b075824140ad 100644
--- a/pkgs/by-name/ba/basicswap/package.nix
+++ b/pkgs/by-name/ba/basicswap/package.nix
@@ -38,6 +38,12 @@ let
           rev = "932366c9d4d8e487162b5c1b2a2d9693e24e0483";
           hash = "sha256-zOekPmP1zR/S+zxq/7OrEz24k8SInlsB+wJ8kPlmqe4=";
         };
+        patches = [ ];
+        preCheck = ''
+          rm -rf src/coincurve
+          # don't run benchmark tests
+          rm tests/test_bench.py
+        '';
       });
   bindir = linkFarm "bindir" (
     lib.mapAttrs (_: p: "${lib.getBin p}/bin") {

From bc4588c24515166dcdaa3d2c1f03c10bd44f1027 Mon Sep 17 00:00:00 2001
From: DaRacci <me@racci.dev>
Date: Tue, 26 Aug 2025 21:19:56 +1000
Subject: [PATCH 3553/3724] chore: add meta.mainProgram for hacompanion

---
 pkgs/by-name/ha/hacompanion/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ha/hacompanion/package.nix b/pkgs/by-name/ha/hacompanion/package.nix
index b0c45b04b531..a17ddc3d9aad 100644
--- a/pkgs/by-name/ha/hacompanion/package.nix
+++ b/pkgs/by-name/ha/hacompanion/package.nix
@@ -27,5 +27,6 @@ buildGoModule rec {
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ ramblurr ];
+    mainProgram = "hacompanion";
   };
 }

From 55dbe088f93f468ee684146e5be2bd6d62ddcf56 Mon Sep 17 00:00:00 2001
From: Philippe Schaaf <philippe.schaaf@secunet.com>
Date: Tue, 26 Aug 2025 13:08:31 +0200
Subject: [PATCH 3554/3724] python3Packages.mkdocs-drawio-exporter: fix build

Signed-off-by: Philippe Schaaf <philippe.schaaf@secunet.com>
---
 .../mkdocs-swagger-ui-tag/default.nix              | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
index e3174f10b0ad..1e0726ccfe0e 100644
--- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
+++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
@@ -1,10 +1,11 @@
 {
-  lib,
   beautifulsoup4,
   buildPythonPackage,
   fetchFromGitHub,
+  hatchling,
+  lib,
   mkdocs,
-  pathspec,
+  playwright,
   pytestCheckHook,
   pythonOlder,
 }:
@@ -12,7 +13,7 @@
 buildPythonPackage rec {
   pname = "mkdocs-swagger-ui-tag";
   version = "0.7.1";
-  format = "setuptools";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -24,12 +25,13 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    mkdocs
     beautifulsoup4
+    hatchling
+    mkdocs
   ];
 
   nativeCheckInputs = [
-    pathspec
+    playwright
     pytestCheckHook
   ];
 
@@ -40,6 +42,8 @@ buildPythonPackage rec {
     "test_material"
     "test_material_dark_scheme_name"
     "test_template"
+    "test_mkdocs_screenshot"
+    "test_no_console_errors"
   ];
 
   meta = with lib; {

From e7f04f0fb94b7fcbecf4dd26c13329eea205a2d8 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Tue, 26 Aug 2025 19:28:45 +0800
Subject: [PATCH 3555/3724] wio: 0.17.3-unstable-2024-04-30 -> 0.19.0

---
 pkgs/by-name/wi/wio/package.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/wi/wio/package.nix b/pkgs/by-name/wi/wio/package.nix
index ea8ce6fcf379..76df2d97ff99 100644
--- a/pkgs/by-name/wi/wio/package.nix
+++ b/pkgs/by-name/wi/wio/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
+  fetchFromGitLab,
   alacritty,
   cage,
   cairo,
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wio";
-  version = "0.17.3-unstable-2024-04-30";
+  version = "0.19.0";
 
-  src = fetchFromGitHub {
-    owner = "Rubo3";
+  src = fetchFromGitLab {
+    owner = "Rubo";
     repo = "wio";
-    rev = "9d459df379efdcf20ea10906c48c79c506c32066";
-    hash = "sha256-Bn7mCVQPH/kH2WRsGPPGIGgvk0r894zZHCHl6BVmWVg=";
+    rev = finalAttrs.version;
+    hash = "sha256-Ol9/dMYg1L+3jGFMpKsAPUAA7hkxu/v88JrI3v+ozAM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3072866de458..f528d9ca0c28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4529,7 +4529,7 @@ with pkgs;
   web-eid-app = libsForQt5.callPackage ../tools/security/web-eid-app { };
 
   wio = callPackage ../by-name/wi/wio/package.nix {
-    wlroots = wlroots_0_17;
+    wlroots = wlroots_0_19;
   };
 
   wring = nodePackages.wring;

From b65bcee42a2bbf0570fee2aa51f88a035b8f35e8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 26 Aug 2025 13:28:48 +0200
Subject: [PATCH 3556/3724] buildMozillaMach: restore no-buildconfig patch

The accidental removal bloated the runtime closure of all consumers.
---
 .../136-no-buildconfig.patch                  | 26 +++++++++++++++++++
 .../build-mozilla-mach/default.nix            |  3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/build-support/build-mozilla-mach/136-no-buildconfig.patch

diff --git a/pkgs/build-support/build-mozilla-mach/136-no-buildconfig.patch b/pkgs/build-support/build-mozilla-mach/136-no-buildconfig.patch
new file mode 100644
index 000000000000..69972b5518bb
--- /dev/null
+++ b/pkgs/build-support/build-mozilla-mach/136-no-buildconfig.patch
@@ -0,0 +1,26 @@
+diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
+index 16888323d7..b96450a247 100644
+--- a/docshell/base/nsAboutRedirector.cpp
++++ b/docshell/base/nsAboutRedirector.cpp
+@@ -90,9 +90,6 @@ static const RedirEntry kRedirMap[] = {
+     {"addons", "chrome://mozapps/content/extensions/aboutaddons.html",
+      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
+ #endif
+-    {"buildconfig", "chrome://global/content/buildconfig.html",
+-     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+-         nsIAboutModule::IS_SECURE_CHROME_UI},
+     {"checkerboard", "chrome://global/content/aboutCheckerboard.html",
+      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+          nsIAboutModule::ALLOW_SCRIPT},
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+index eb6c179b60..57568668b1 100644
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -40,7 +40,6 @@ toolkit.jar:
+    content/global/aboutUrlClassifier.js
+    content/global/aboutUrlClassifier.xhtml
+    content/global/aboutUrlClassifier.css
+-*   content/global/buildconfig.html
+    content/global/buildconfig.css
+    content/global/contentAreaUtils.js
+    content/global/datepicker.xhtml
diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 8afe2e434322..043fc8ec537d 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -305,7 +305,8 @@ buildStdenv.mkDerivation {
   ];
 
   patches =
-    lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "141") [
+    lib.optionals (lib.versionAtLeast version "136") [ ./136-no-buildconfig.patch ]
+    ++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "141") [
       # https://bugzilla.mozilla.org/show_bug.cgi?id=1955112
       # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9
       ./139-wayland-drag-animation.patch

From b5586570626e6c57111a107caba7dcad56075ce9 Mon Sep 17 00:00:00 2001
From: langsjo <104687438+langsjo@users.noreply.github.com>
Date: Sun, 15 Jun 2025 20:15:09 +0300
Subject: [PATCH 3557/3724] lmath: init at 1.10.15

---
 pkgs/by-name/lm/lmath/package.nix | 54 +++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/lm/lmath/package.nix

diff --git a/pkgs/by-name/lm/lmath/package.nix b/pkgs/by-name/lm/lmath/package.nix
new file mode 100644
index 000000000000..9b29d50f552d
--- /dev/null
+++ b/pkgs/by-name/lm/lmath/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  nix-update-script,
+  fetchurl,
+  appimageTools,
+  makeBinaryWrapper,
+}:
+let
+  pname = "lmath";
+  version = "1.10.15";
+  src = fetchurl {
+    url = "https://github.com/lehtoroni/lmath-issues/releases/download/v${version}/LMath_Linux_r${version}-release.AppImage";
+    hash = "sha256-JOV+g7izjctCkHl5q/9T2PSUZzPzVPisHppbPofVYy0=";
+  };
+
+  appimageContents = appimageTools.extractType2 {
+    inherit pname version src;
+  };
+in
+appimageTools.wrapType2 {
+  inherit pname version src;
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ];
+
+  # '--skip-updated-bundle-check' stops automatic updates from breaking the package
+  extraInstallCommands = ''
+    install -Dm 444 ${appimageContents}/lmath.desktop $out/share/applications/lmath.desktop
+    install -Dm 444 ${appimageContents}/lmath.png $out/share/icons/hicolor/512x512/apps/lmath.png
+
+    wrapProgram $out/bin/lmath \
+      --add-flags "--no-update-check"
+
+    substituteInPlace $out/share/applications/lmath.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=lmath'
+  '';
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "^r([0-9\.]*)"
+    ];
+  };
+
+  meta = {
+    description = "Simple notebook app with LaTeX capabilities";
+    homepage = "https://lehtodigital.fi/lmath/";
+    mainProgram = "lmath";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ langsjo ];
+    platforms = [ "x86_64-linux" ];
+  };
+}

From eb766e2d51e24016df00a6ddfb472601f49a43be Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 25 Aug 2025 21:06:20 +0200
Subject: [PATCH 3558/3724] ci/github-script: fix run script

Not a problem for prepare/commits, but the labels comand will remove the
temp directory again, before it actually runs the command. Nothing good
will come out of that!
---
 ci/github-script/run | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/github-script/run b/ci/github-script/run
index eeaee253ef42..1d974cf5355f 100755
--- a/ci/github-script/run
+++ b/ci/github-script/run
@@ -49,7 +49,7 @@ program
   .option('--no-dry', 'Make actual modifications')
   .action(async (owner, repo, pr, options) => {
     const prepare = (await import('./prepare.js')).default
-    run(prepare, owner, repo, pr, options)
+    await run(prepare, owner, repo, pr, options)
   })
 
 program
@@ -61,7 +61,7 @@ program
   .option('--no-cherry-picks', 'Do not expect cherry-picks.')
   .action(async (owner, repo, pr, options) => {
     const commits = (await import('./commits.js')).default
-    run(commits, owner, repo, pr, options)
+    await run(commits, owner, repo, pr, options)
   })
 
 program
@@ -77,7 +77,7 @@ program
     try {
       process.env.GITHUB_WORKSPACE = tmp
       process.chdir(tmp)
-      run(labels, owner, repo, pr, options)
+      await run(labels, owner, repo, pr, options)
     } finally {
       rmSync(tmp, { recursive: true })
     }

From 979687958f5d57b1d36006fbc769a26427369e73 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 26 Aug 2025 10:51:23 +0200
Subject: [PATCH 3559/3724] workflows/labels: prevent error on token creation
 for Test workflow

This only happens when the label workflow runs in pull_request context
*and* from within nixpkgs (not a fork). This is the case for dependabot
updates.
---
 .github/workflows/labels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 97049cb08f87..6a2b11c621a1 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -50,7 +50,7 @@ jobs:
 
       # Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour.
       - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
-        if: vars.NIXPKGS_CI_APP_ID
+        if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
         id: app-token
         with:
           app-id: ${{ vars.NIXPKGS_CI_APP_ID }}

From 7b8f5c0136e7bd10bc694dfb3d1f28966157659b Mon Sep 17 00:00:00 2001
From: Christoph Jabs <contact@christophjabs.info>
Date: Mon, 25 Aug 2025 13:49:43 +0300
Subject: [PATCH 3560/3724] python3Packages.python-sat: 0.1.8.dev17 ->
 0.1.8.dev20

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

diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix
index 940dbfe3273d..e4e451d1855d 100644
--- a/pkgs/development/python-modules/python-sat/default.nix
+++ b/pkgs/development/python-modules/python-sat/default.nix
@@ -8,16 +8,22 @@
 }:
 buildPythonPackage rec {
   pname = "python-sat";
-  version = "0.1.8.dev17";
+  version = "0.1.8.dev20";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "pysathq";
     repo = "pysat";
-    rev = "a04763de6dafb8d3a0d7f1b231fc0d30be1de4c0"; # upstream does not tag releases
-    hash = "sha256-FG6oAAI8XKXumj6Ys2QjjYcRp1TpwkUZzyfpkdq5V6E=";
+    rev = "d94f51e5eff2feef35abbc25480659eafa615cc0"; # upstream does not tag releases
+    hash = "sha256-fKZcdEVuqpv8jWnK8Cr1UJ7szJqXivK6x3YPYHH5ccI=";
   };
 
+  # Build SAT solver backends in parallel
+  postPatch = ''
+    substituteInPlace solvers/prepare.py \
+      --replace-fail "&& make &&" "&& make -j$NIX_BUILD_CORES &&"
+  '';
+
   propagatedBuildInputs = [
     six
     pypblib

From 2679dd50205dcb639c4bebea0d3571ebd255ca0c Mon Sep 17 00:00:00 2001
From: Christoph Jabs <contact@christophjabs.info>
Date: Tue, 26 Aug 2025 14:17:23 +0300
Subject: [PATCH 3561/3724] python3Package.python-sat: unbreak darwin

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

diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix
index e4e451d1855d..a64ab34d2cd1 100644
--- a/pkgs/development/python-modules/python-sat/default.nix
+++ b/pkgs/development/python-modules/python-sat/default.nix
@@ -18,10 +18,13 @@ buildPythonPackage rec {
     hash = "sha256-fKZcdEVuqpv8jWnK8Cr1UJ7szJqXivK6x3YPYHH5ccI=";
   };
 
-  # Build SAT solver backends in parallel
+  # Build SAT solver backends in parallel and fix hard-coded g++ reference for
+  # darwin, where stdenv uses clang
   postPatch = ''
     substituteInPlace solvers/prepare.py \
       --replace-fail "&& make &&" "&& make -j$NIX_BUILD_CORES &&"
+    substituteInPlace solvers/patches/glucose421.patch \
+      --replace-fail "+CXX      := g++" "+CXX      := c++"
   '';
 
   propagatedBuildInputs = [
@@ -43,6 +46,5 @@ buildPythonPackage rec {
       maintainers.chrjabs
     ];
     platforms = lib.platforms.all;
-    badPlatforms = lib.platforms.darwin ++ [ "i686-linux" ];
   };
 }

From c1853d5ea1d1bef787567ddbb2521ad01df9eafd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 12:01:49 +0000
Subject: [PATCH 3562/3724] build(deps): bump actions/create-github-app-token
 from 2.1.0 to 2.1.1

Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/actions/create-github-app-token/releases)
- [Commits](https://github.com/actions/create-github-app-token/compare/0f859bf9e69e887678d5bbfbee594437cb440ffe...a8d616148505b5069dccd32f177bb87d7f39123b)

---
updated-dependencies:
- dependency-name: actions/create-github-app-token
  dependency-version: 2.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/backport.yml       | 2 +-
 .github/workflows/check.yml          | 2 +-
 .github/workflows/edited.yml         | 2 +-
 .github/workflows/labels.yml         | 2 +-
 .github/workflows/periodic-merge.yml | 2 +-
 .github/workflows/reviewers.yml      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 0392578df488..15a2206bb202 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -27,7 +27,7 @@ jobs:
     steps:
       # Use a GitHub App to create the PR so that CI gets triggered
       # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
-      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
+      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
         id: app-token
         with:
           app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index e8fe7c3717dc..377e9dc2bb75 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -109,7 +109,7 @@ jobs:
       - name: Build codeowners validator
         run: nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A codeownersValidator
 
-      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
+      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
         if: github.event_name == 'pull_request_target' && vars.OWNER_RO_APP_ID
         id: app-token
         with:
diff --git a/.github/workflows/edited.yml b/.github/workflows/edited.yml
index b1b5b6dfc077..8a38f0eefeff 100644
--- a/.github/workflows/edited.yml
+++ b/.github/workflows/edited.yml
@@ -36,7 +36,7 @@ jobs:
       # Use a GitHub App to create the PR so that CI gets triggered
       # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
       # We only need Pull Requests: write here, but the app is also used for backports.
-      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
+      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
         id: app-token
         with:
           app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 6a2b11c621a1..4dfbe74f02b8 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -49,7 +49,7 @@ jobs:
         run: npm install @actions/artifact bottleneck
 
       # Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour.
-      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
+      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
         if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
         id: app-token
         with:
diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml
index 4e22a2bcbbd9..3846d04159fc 100644
--- a/.github/workflows/periodic-merge.yml
+++ b/.github/workflows/periodic-merge.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
       # Use a GitHub App to create the PR so that CI gets triggered
       # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
-      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
+      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
         id: app-token
         with:
           app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 9b3de2338553..c27bb0e97090 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -48,7 +48,7 @@ jobs:
       #   - OWNER_APP_PRIVATE_KEY (secret)
       #
       # Can't use the token received from permissions above, because it can't get enough permissions.
-      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
+      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
         if: github.event_name == 'pull_request_target' && vars.OWNER_APP_ID
         id: app-token
         with:

From 220ec9effe96a81e5f99229d10c17ae2cef60142 Mon Sep 17 00:00:00 2001
From: Lin Xianyi <iynaix@gmail.com>
Date: Tue, 26 Aug 2025 20:03:12 +0800
Subject: [PATCH 3563/3724] python3Packages.rawpy: fix build

Fixes build due to failing test
---
 pkgs/development/python-modules/rawpy/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/rawpy/default.nix b/pkgs/development/python-modules/rawpy/default.nix
index ed82047d9a29..fa1f147ab595 100644
--- a/pkgs/development/python-modules/rawpy/default.nix
+++ b/pkgs/development/python-modules/rawpy/default.nix
@@ -74,6 +74,7 @@ buildPythonPackage rec {
 
   disabledTests = [
     # rawpy._rawpy.LibRawFileUnsupportedError: b'Unsupported file format or not RAW file'
+    "testCropSizeSigma"
     "testFoveonFileOpenAndPostProcess"
     "testThumbExtractBitmap"
   ];

From 15afa751d227f6a0a33fc4ee84b7fa824aa3f2fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 12:37:49 +0000
Subject: [PATCH 3564/3724] parallel: 20250722 -> 20250822

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index c5733f4d59b2..cc9dacc51e94 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "parallel";
-  version = "20250722";
+  version = "20250822";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/parallel-${version}.tar.bz2";
-    hash = "sha256-kagf9BKc31rTw8RewDPnXyu+pUR/S2gToNjP6OXHhDs=";
+    hash = "sha256-AZ0yhyKGfP/pGMRJNkMIwN8EhFbGkpm5FFGj5vrJFno=";
   };
 
   outputs = [

From 6b8a1b5de73f3ce373b7e9dae469c760b27b4d67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 12:38:20 +0000
Subject: [PATCH 3565/3724] sttr: 0.2.26 -> 0.2.27

---
 pkgs/by-name/st/sttr/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/sttr/package.nix b/pkgs/by-name/st/sttr/package.nix
index 66647f41abbe..2bef2f2e42cd 100644
--- a/pkgs/by-name/st/sttr/package.nix
+++ b/pkgs/by-name/st/sttr/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "sttr";
-  version = "0.2.26";
+  version = "0.2.27";
 
   src = fetchFromGitHub {
     owner = "abhimanyu003";
     repo = "sttr";
     rev = "v${version}";
-    hash = "sha256-VyO4NyiTWWQJjbhKHoIC86B4KdSowlrR6XR3HCKr0U4=";
+    hash = "sha256-tJljVXyTIYFsjPTzmlzJ/jC9rm8DC2SA1eU6GTyXnG8=";
   };
 
-  vendorHash = "sha256-g35BCThoym9awjMObMUecRkkLsQyEIviYc4rdQsIICY=";
+  vendorHash = "sha256-QVLOcFRZ7Ovft7Tzn47+mstSikpqRVZAqyMEVgemwA8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 0ee7390328b9a72c80144d814151b90c1bd4a61b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 12:43:01 +0000
Subject: [PATCH 3566/3724] kafkactl: 5.11.1 -> 5.12.0

---
 pkgs/by-name/ka/kafkactl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ka/kafkactl/package.nix b/pkgs/by-name/ka/kafkactl/package.nix
index b21b7d8c64f6..1c513fa0a2b8 100644
--- a/pkgs/by-name/ka/kafkactl/package.nix
+++ b/pkgs/by-name/ka/kafkactl/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kafkactl";
-  version = "5.11.1";
+  version = "5.12.0";
 
   src = fetchFromGitHub {
     owner = "deviceinsight";
     repo = "kafkactl";
     tag = "v${version}";
-    hash = "sha256-kemN4XJcXH3V7/RT9S2FLiUgS7tisK6wmHyUQnyBfhU=";
+    hash = "sha256-wNqoGb3tVzoj+cUNNxqJvnq2Qr8BF0BC0FM01QAnu2o=";
   };
 
-  vendorHash = "sha256-rxQxNf3FBAGudgrE2wxHw4mVHxTEpQpQ+DX/nEVpoJY=";
+  vendorHash = "sha256-sVvEHMXpjas+l93IZfAChDX5eDm0lkUNCr5r1JaVQ9I=";
 
   doCheck = false;
 

From 7fa68c744b62d9d3a797964b9a42aaf134a5e1a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 13:13:37 +0000
Subject: [PATCH 3567/3724] planus: 1.1.1 -> 1.2.0

---
 pkgs/by-name/pl/planus/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pl/planus/package.nix b/pkgs/by-name/pl/planus/package.nix
index e94013eae961..5e38b58ca998 100644
--- a/pkgs/by-name/pl/planus/package.nix
+++ b/pkgs/by-name/pl/planus/package.nix
@@ -8,15 +8,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "planus";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchCrate {
     pname = "planus-cli";
     inherit version;
-    hash = "sha256-Tulp2gD4CbNaxRAc+7/rWY4SjXp66Kui9/PuKfnaeMs=";
+    hash = "sha256-z1fXLXSk9xprKMCsbkvJfDB3qz9aR6Bslf517TyQ7qI=";
   };
 
-  cargoHash = "sha256-3wZ6kmWzGjS2pnBDBi3t2A9kSlWUyG5ohsGfK2ViTcY=";
+  cargoHash = "sha256-igja5/FaYBrJSBc9Gw3091UorEV+UmlxPzfk5FYaWXo=";
 
   nativeBuildInputs = [
     installShellFiles

From 7741401e734a88a45cd0dd1c574069c1188e8d24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 13:38:52 +0000
Subject: [PATCH 3568/3724] ansible-lint: 25.8.1 -> 25.8.2

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

diff --git a/pkgs/by-name/an/ansible-lint/package.nix b/pkgs/by-name/an/ansible-lint/package.nix
index 2512ae5bb914..9fe6b8583977 100644
--- a/pkgs/by-name/an/ansible-lint/package.nix
+++ b/pkgs/by-name/an/ansible-lint/package.nix
@@ -8,13 +8,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ansible-lint";
-  version = "25.8.1";
+  version = "25.8.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "ansible_lint";
-    hash = "sha256-BAWePPW2ROeW4h1EUARiHR4kVOOuto0e6gpJ9lDvMhk=";
+    hash = "sha256-Nd093RLYBjh2kVvy8GuaG4D9J6fLHKTOUcjOu4RpCSI=";
   };
 
   postPatch = ''

From eb06f89d6e1c0652af2024df152ce9a54ae0fb19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 13:48:30 +0000
Subject: [PATCH 3569/3724] libretro.citra: 0-unstable-2025-06-22 ->
 0-unstable-2025-08-17

---
 pkgs/applications/emulators/libretro/cores/citra.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/citra.nix b/pkgs/applications/emulators/libretro/cores/citra.nix
index 0ea38a2711d4..420a7bc2c1d4 100644
--- a/pkgs/applications/emulators/libretro/cores/citra.nix
+++ b/pkgs/applications/emulators/libretro/cores/citra.nix
@@ -9,13 +9,13 @@
 }:
 mkLibretroCore {
   core = "citra";
-  version = "0-unstable-2025-06-22";
+  version = "0-unstable-2025-08-17";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "citra";
-    rev = "176214934cd46d6e072adcbda5f676bc4ca3162e";
-    hash = "sha256-cdBR64OBOGMy0ROR89mbKXC0xk+QkBHUKEkIn2czGiQ=";
+    rev = "5263fae3344e5e9af43036e0e38bec2d10fb2407";
+    hash = "sha256-66kbE1taODjxXDhO3uV5R212nikyXfHwCHC/zamZuL0=";
     fetchSubmodules = true;
   };
 

From 36177855bcfec719d56ebc1e4e30585fc6780bf4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 12:34:55 +0000
Subject: [PATCH 3570/3724] fd: 10.2.0 -> 10.3.0

---
 pkgs/by-name/fd/fd/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix
index 1583617a313c..bfc27802175a 100644
--- a/pkgs/by-name/fd/fd/package.nix
+++ b/pkgs/by-name/fd/fd/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fd";
-  version = "10.2.0";
+  version = "10.3.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "fd";
     rev = "v${version}";
-    hash = "sha256-B+lOohoPH7UkRxRNTzSVt0SDrqEwh4hIvBF3uWliDEI=";
+    hash = "sha256-rUoR8LHtzwGQBwJGEsWpMYKG6HcGKcktcyF7TxTDJs8=";
   };
 
-  cargoHash = "sha256-0LzraGDujLMs60/Ytq2hcG/3RYbo8sJkurYVhRpa2D8=";
+  cargoHash = "sha256-yiR23t48I0USD21tnFZzmTmO0D8kWNzP9Ff3QM9GitU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 266993049e3d653870377e37549f422b4443b01d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 26 Aug 2025 16:01:56 +0200
Subject: [PATCH 3571/3724] python3Packages.pyling-square: fix build, cleanup

---
 .../python-modules/pylink-square/default.nix  | 24 ++++++++++++-------
 .../pylink-square/fix-setup-cfg-syntax.patch  | 24 +++++++++++++++++++
 2 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/python-modules/pylink-square/fix-setup-cfg-syntax.patch

diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix
index d2e365e86b50..8dbc0145b610 100644
--- a/pkgs/development/python-modules/pylink-square/default.nix
+++ b/pkgs/development/python-modules/pylink-square/default.nix
@@ -2,12 +2,17 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   setuptools,
-  mock,
+
+  # dependencies
   psutil,
-  pytestCheckHook,
-  pythonOlder,
   six,
+
+  # tests
+  mock,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -15,8 +20,6 @@ buildPythonPackage rec {
   version = "1.6.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "square";
     repo = "pylink";
@@ -24,6 +27,11 @@ buildPythonPackage rec {
     hash = "sha256-rkkdnpkl9UHcBDjp6lsFXR1zNn7tH1KeTQ7wV+yJ3m0=";
   };
 
+  patches = [
+    # ERROR: /build/source/setup.cfg:16: unexpected value continuation
+    ./fix-setup-cfg-syntax.patch
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -45,11 +53,11 @@ buildPythonPackage rec {
     "test_set_log_file_success"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Python interface for the SEGGER J-Link";
     homepage = "https://github.com/square/pylink";
     changelog = "https://github.com/square/pylink/blob/${src.tag}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ dump_stack ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dump_stack ];
   };
 }
diff --git a/pkgs/development/python-modules/pylink-square/fix-setup-cfg-syntax.patch b/pkgs/development/python-modules/pylink-square/fix-setup-cfg-syntax.patch
new file mode 100644
index 000000000000..a4a3122dc782
--- /dev/null
+++ b/pkgs/development/python-modules/pylink-square/fix-setup-cfg-syntax.patch
@@ -0,0 +1,24 @@
+diff --git a/setup.cfg b/setup.cfg
+index 22f5e1c..fcad35f 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -11,19 +11,3 @@ universal = 1
+ [behave]
+ color = True
+ summary = True
+-
+-[options.extras_require]
+-  dev =
+-    behave==1.2.5
+-    coverage==4.4.1
+-    psutil>=5.2.2
+-    pycodestyle>=2.3.1
+-    setuptools>=70.2.0
+-    six
+-    sphinx==1.4.8
+-    sphinx-argparse==0.1.15
+-    sphinx_rtd_theme==0.2.4
+-    sphinxcontrib-napoleon==0.5.3
+-    wheel
+-  test =
+-    mock==2.0.0

From 110e512a977c93b9915b958aa7964c828cf88d58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 14:14:45 +0000
Subject: [PATCH 3572/3724] python3Packages.oslo-utils: 9.0.0 -> 9.1.0

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

diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix
index 47a4aac4eb26..9da2e71d149e 100644
--- a/pkgs/development/python-modules/oslo-utils/default.nix
+++ b/pkgs/development/python-modules/oslo-utils/default.nix
@@ -37,13 +37,13 @@
 
 buildPythonPackage rec {
   pname = "oslo-utils";
-  version = "9.0.0";
+  version = "9.1.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "oslo_utils";
     inherit version;
-    hash = "sha256-1FobkOoUlliVYtOP6EP9p/okf5p+YXhIhZkdIPtmOkM=";
+    hash = "sha256-AcOHXnzKAFtZRlxCn0ZxE7X0sEIRy9U0yawvFSJ207M=";
   };
 
   patches = [

From 88b387f90d45f8e5a51a078ae12731c3d5424c9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 26 Aug 2025 16:20:58 +0200
Subject: [PATCH 3573/3724] nixos/tests/gotenberg: auto start chromium and
 libreoffice to detect failures starting them without having to convert a
 document

---
 nixos/tests/gotenberg.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/tests/gotenberg.nix b/nixos/tests/gotenberg.nix
index c640657ea872..05b326996aa6 100644
--- a/nixos/tests/gotenberg.nix
+++ b/nixos/tests/gotenberg.nix
@@ -7,6 +7,9 @@
   nodes.machine = {
     services.gotenberg = {
       enable = true;
+      # fail the service if any of those does not come up
+      chromium.autoStart = true;
+      libreoffice.autoStart = true;
     };
   };
 

From 9ccc3c9a10c2a1a72438c2c843ea67b6d13dad78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 14:21:07 +0000
Subject: [PATCH 3574/3724] python3Packages.wikitextparser: 0.56.2 -> 0.56.4

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

diff --git a/pkgs/development/python-modules/wikitextparser/default.nix b/pkgs/development/python-modules/wikitextparser/default.nix
index 1b5fe1da7e3a..46b8dbefac7e 100644
--- a/pkgs/development/python-modules/wikitextparser/default.nix
+++ b/pkgs/development/python-modules/wikitextparser/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "wikitextparser";
-  version = "0.56.2";
+  version = "0.56.4";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "5j9";
     repo = "wikitextparser";
     rev = "v${version}";
-    hash = "sha256-g0Hvxw8evmCebM2joGT7XMnakVjDG74VJmZhlvUiQMU=";
+    hash = "sha256-xg2cWhfJXS7zUuzXPslFTZz6mY/Pvl2F2b7HNWV2c3I=";
   };
 
   nativeBuildInputs = [ setuptools ];

From f2f4173088a33a261578c4bda2d606ce637be122 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 26 Aug 2025 15:47:43 +0200
Subject: [PATCH 3575/3724] python3Packages.django-allauth: add headless-spec
 optional dependencies

https://codeberg.org/allauth/django-allauth/issues/4493
https://codeberg.org/allauth/django-allauth/commit/85f5f3987
---
 pkgs/development/python-modules/django-allauth/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index e710032e9006..6250bb4808e8 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -81,6 +81,7 @@ buildPythonPackage rec {
   '';
 
   optional-dependencies = {
+    headless-spec = [ pyyaml ];
     idp-oidc = [
       oauthlib
       pyjwt

From f27ef634658e87e7a905b8800250334cd27b35d6 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 26 Aug 2025 15:48:17 +0200
Subject: [PATCH 3576/3724] glitchtip: use django-allauth headless-spec
 optional dependencies

---
 pkgs/by-name/gl/glitchtip/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix
index 7d3f484d678e..9233d83bfab1 100644
--- a/pkgs/by-name/gl/glitchtip/package.nix
+++ b/pkgs/by-name/gl/glitchtip/package.nix
@@ -60,9 +60,6 @@ let
       orjson
       psycopg
       pydantic
-      # undocumented on django-allauth side
-      # https://codeberg.org/allauth/django-allauth/issues/4493
-      pyyaml
       sentry-sdk
       symbolic
       user-agents
@@ -71,6 +68,7 @@ let
       whitenoise
     ]
     ++ celery.optional-dependencies.redis
+    ++ django-allauth.optional-dependencies.headless-spec
     ++ django-allauth.optional-dependencies.mfa
     ++ django-allauth.optional-dependencies.socialaccount
     ++ django-redis.optional-dependencies.hiredis

From 29b86c0a177300733eb39726af906dba24a8e64f Mon Sep 17 00:00:00 2001
From: randomdude16671 <randomdude16671@proton.me>
Date: Fri, 8 Aug 2025 15:07:51 +0530
Subject: [PATCH 3577/3724] maintainers: add randomdude

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 388a3a8a1332..f229453faa7b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21168,6 +21168,12 @@
     githubId = 5653911;
     name = "Rampoina";
   };
+  randomdude = {
+    name = "Random Dude";
+    email = "randomdude16671@proton.me";
+    github = "randomdude16671";
+    githubId = 210965013;
+  };
   rane = {
     name = "Rane";
     email = "rane+git@junkyard.systems";

From 41b4d676f2c1c4989839085029ee18b1bcccd39f Mon Sep 17 00:00:00 2001
From: randomdude16671 <randomdude16671@proton.me>
Date: Fri, 8 Aug 2025 15:11:30 +0530
Subject: [PATCH 3578/3724] sesh: add randomdude to maintainers

---
 pkgs/by-name/se/sesh/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix
index eda3938abb6a..fc0f7f57b9f5 100644
--- a/pkgs/by-name/se/sesh/package.nix
+++ b/pkgs/by-name/se/sesh/package.nix
@@ -34,6 +34,7 @@ buildGoModule rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       gwg313
+      randomdude
       t-monaghan
     ];
     mainProgram = "sesh";

From 38f0736da7c8ded304a82bbb36bb12783ed2db66 Mon Sep 17 00:00:00 2001
From: randomdude16671 <randomdude16671@proton.me>
Date: Fri, 8 Aug 2025 15:12:08 +0530
Subject: [PATCH 3579/3724] sesh: 2.16.0 -> 2.17.1

---
 pkgs/by-name/se/sesh/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix
index fc0f7f57b9f5..663827bb5d1c 100644
--- a/pkgs/by-name/se/sesh/package.nix
+++ b/pkgs/by-name/se/sesh/package.nix
@@ -2,20 +2,27 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
+  go-mockery,
   versionCheckHook,
 }:
 buildGoModule rec {
   pname = "sesh";
-  version = "2.16.0";
+  version = "2.17.1";
 
+  nativeBuildInputs = [
+    go-mockery
+  ];
   src = fetchFromGitHub {
     owner = "joshmedeski";
     repo = "sesh";
     rev = "v${version}";
-    hash = "sha256-3kD7t3lgkxrK53cL+5i9DB5w1hIYA4J/MiauLZ1Z7KQ=";
+    hash = "sha256-olt61AR/Tq8lLh65V0/+GDrWjCi9hrkNbHR9LOX7kY0=";
   };
 
-  vendorHash = "sha256-r6n0xZbOvqDU63d3WrXenvV4x81iRgpOS2h73xSlVBI=";
+  preBuild = ''
+    mockery
+  '';
+  vendorHash = "sha256-TLl8HZnsVvtx6jqusTETP0l3zTmzYmuV4NJIM958VcQ=";
 
   ldflags = [
     "-s"

From e5143301e214ec9099f882fda8363d9080e86243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 26 Aug 2025 16:31:18 +0200
Subject: [PATCH 3580/3724] nixos/gotenberg: fix starting chromium

[Tue Aug 26 16:12:02 2025] audit: type=1326 audit(1756217587.085:126): auid=4294967295 uid=0 gid=0 ses=4294967295 pid=3124193 comm="chromium" exe="/nix/store/xrjg398ps4mkbpsz66kpjgqfzfjpm2cr-chromium-unwrapped-139.0.7258.127/libexec/chromium/chromium" sig=31 arch=c000003e syscall=330 compat=0 ip=0x7f001d2c4afb code=0x80000000
---
 nixos/modules/services/misc/gotenberg.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/misc/gotenberg.nix b/nixos/modules/services/misc/gotenberg.nix
index e306e530116a..ed4549b03436 100644
--- a/nixos/modules/services/misc/gotenberg.nix
+++ b/nixos/modules/services/misc/gotenberg.nix
@@ -303,6 +303,7 @@ in
       };
       serviceConfig = {
         Type = "simple";
+        # NOTE: disable to debug chromium crashes or otherwise no coredump is created and forbidden syscalls are not being logged
         DynamicUser = true;
         ExecStart = "${lib.getExe cfg.package} ${lib.escapeShellArgs args}";
 
@@ -340,6 +341,7 @@ in
           "@sandbox"
           "@system-service"
           "@chown"
+          "@pkey" # required by chromium or it crashes
         ];
         SystemCallArchitectures = "native";
 

From 59c943560f72992b59c54ec1dd2a7319bea7c7f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 26 Aug 2025 16:48:47 +0200
Subject: [PATCH 3581/3724] thunderbird-140: init at 140.2.0esr

This is a bit late, with the default being 142 already.
---
 .../networking/mailreaders/thunderbird/packages.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix                     |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index a598216c9fff..3cd5889b6fe5 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -112,6 +112,19 @@ rec {
   # Eventually, switch to an updateScript without versionPrefix hardcoded...
   thunderbird-esr = thunderbird-128;
 
+  thunderbird-140 = common {
+    applicationName = "Thunderbird ESR";
+
+    version = "140.2.0esr";
+    sha512 = "6a10f95b805f00a0820c822ae07bc52ac39d0a55f084c319d27f01710d8a1d809b7b224da966632ae0a22658bf14e76c8fd7cec022718316c306c43809a4997d";
+
+    updateScript = callPackage ./update.nix {
+      attrPath = "thunderbirdPackages.thunderbird-140";
+      versionPrefix = "140";
+      versionSuffix = "esr";
+    };
+  };
+
   thunderbird-128 = common {
     applicationName = "Thunderbird ESR";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a2391fb7cf6..904fc44be2dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13247,6 +13247,9 @@ with pkgs;
   thunderbird-128-unwrapped = thunderbirdPackages.thunderbird-128;
   thunderbird-128 = wrapThunderbird thunderbirdPackages.thunderbird-128 { };
 
+  thunderbird-140-unwrapped = thunderbirdPackages.thunderbird-140;
+  thunderbird-140 = wrapThunderbird thunderbirdPackages.thunderbird-140 { };
+
   thunderbird-bin = thunderbird-latest-bin;
   thunderbird-latest-bin = wrapThunderbird thunderbird-latest-bin-unwrapped {
     pname = "thunderbird-bin";

From 6751f53b542c9720752088c2dbbbf49110d3189d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 26 Aug 2025 16:50:16 +0200
Subject: [PATCH 3582/3724] thunderbird-esr: 128.x -> 140.x

---
 .../networking/mailreaders/thunderbird/packages.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 3cd5889b6fe5..fcf77335fd20 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -110,7 +110,7 @@ rec {
   };
 
   # Eventually, switch to an updateScript without versionPrefix hardcoded...
-  thunderbird-esr = thunderbird-128;
+  thunderbird-esr = thunderbird-140;
 
   thunderbird-140 = common {
     applicationName = "Thunderbird ESR";

From aadacfb3dd5ef0bd81064094dfde7ef458a47fc4 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Tue, 26 Aug 2025 17:00:55 +0200
Subject: [PATCH 3583/3724] taisei: 1.4.2 -> 1.4.4

---
 pkgs/by-name/ta/taisei/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix
index 20d634de5de2..10abb09c8c0f 100644
--- a/pkgs/by-name/ta/taisei/package.nix
+++ b/pkgs/by-name/ta/taisei/package.nix
@@ -12,32 +12,30 @@
   openssl,
   gamemode,
   shaderc,
-  ensureNewerSourcesForZipFilesHook,
   # Runtime depends
   glfw,
-  SDL2,
+  sdl3,
   SDL2_mixer,
   cglm,
   freetype,
   libpng,
   libwebp,
-  libzip,
   zlib,
   zstd,
   spirv-cross,
+  mimalloc,
 
   gamemodeSupport ? stdenv.hostPlatform.isLinux,
 }:
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "taisei";
-  version = "1.4.2";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "taisei-project";
     repo = "taisei";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rThLz8o6IYhIBUc0b1sAQi2aF28btajcM1ScTv+qn6c=";
+    hash = "sha256-Cs66kyNSVjUZUH+ddZGjFwSUQtwqX4uuGQh+ZLv6N6o=";
     fetchSubmodules = true;
   };
 
@@ -48,24 +46,23 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     python3Packages.python
     python3Packages.zstandard
-    ensureNewerSourcesForZipFilesHook
     shaderc
   ];
 
   buildInputs = [
     glfw
-    SDL2
+    sdl3
     SDL2_mixer
     cglm
     freetype
     libpng
     libwebp
-    libzip
     zlib
     zstd
     opusfile
     openssl
     spirv-cross
+    mimalloc
   ]
   ++ lib.optional gamemodeSupport gamemode;
 
@@ -74,7 +71,10 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "install_macos_bundle" false)
     (lib.mesonEnable "install_relocatable" false)
     (lib.mesonEnable "shader_transpiler" false)
+    (lib.mesonEnable "shader_transpiler_dxbc" false)
     (lib.mesonEnable "gamemode" gamemodeSupport)
+    (lib.mesonEnable "package_data" false)
+    (lib.mesonEnable "vfs_zip" false)
   ];
 
   preConfigure = ''

From c07dda5631fc056395a441d5b71900540b4d84e1 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Tue, 26 Aug 2025 17:02:05 +0200
Subject: [PATCH 3584/3724] taisei: fix gamemode support

---
 pkgs/by-name/ta/taisei/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix
index 10abb09c8c0f..cf60561951d0 100644
--- a/pkgs/by-name/ta/taisei/package.nix
+++ b/pkgs/by-name/ta/taisei/package.nix
@@ -12,6 +12,7 @@
   openssl,
   gamemode,
   shaderc,
+  makeWrapper,
   # Runtime depends
   glfw,
   sdl3,
@@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.python
     python3Packages.zstandard
     shaderc
+    makeWrapper
   ];
 
   buildInputs = [
@@ -81,6 +83,11 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs .
   '';
 
+  postInstall = lib.optionalString gamemodeSupport ''
+    wrapProgram $out/bin/taisei \
+      --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ gamemode ]}
+  '';
+
   strictDeps = true;
 
   meta = {

From 1737cb9fe9fdfb6eca2d76bc8800259054f69102 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 26 Aug 2025 17:18:43 +0200
Subject: [PATCH 3585/3724] tinymist: 0.13.22 -> 0.13.24

Changelog:
https://github.com/Myriad-Dreamin/tinymist/releases/tag/v0.13.24
Diff:
https://github.com/Myriad-Dreamin/tinymist/compare/v0.13.22...v0.13.24
---
 .../vscode/extensions/myriad-dreamin.tinymist/default.nix   | 2 +-
 pkgs/by-name/ti/tinymist/package.nix                        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
index 11f1c14bf5b2..81b82c2a6097 100644
--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "tinymist";
     publisher = "myriad-dreamin";
     inherit (tinymist) version;
-    hash = "sha256-fI+HzioLDxACH0anSkYOw47jpocVQp7m9xHh6APehis=";
+    hash = "sha256-wFFzUwOyaMInaVskKK/KA1eDd71fZ2j+snZ2NvFB5nU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix
index 61a0404dd752..127f456be4ae 100644
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tinymist";
   # Please update the corresponding vscode extension when updating
   # this derivation.
-  version = "0.13.22";
+  version = "0.13.24";
 
   src = fetchFromGitHub {
     owner = "Myriad-Dreamin";
     repo = "tinymist";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OLFffYjgo+go6fEQNM2TVdZL9cHVuA8Tgv73a3ex3JM=";
+    hash = "sha256-/QDqeHTa2TT9TOEGype0yG8pUq0VR4ENvwAbAnfqk5A=";
   };
 
-  cargoHash = "sha256-IyGYBbb8ilK+8fsFAm1N2A0Cw0qrbTqG20TgQs+1yaA=";
+  cargoHash = "sha256-1kcpITV2Mj1z46Y8aa0J2WQ6zHJ3WXurgF2Ujh1GnPM=";
 
   nativeBuildInputs = [
     installShellFiles

From 67cffed7d9de1c4b8e6fe5681c53f9513492be55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 26 Aug 2025 16:37:54 +0200
Subject: [PATCH 3586/3724] gotenberg: 8.21.1 -> 8.22.0

Changelog: https://github.com/gotenberg/gotenberg/releases/tag/v8.22.0
---
 pkgs/by-name/go/gotenberg/package.nix | 29 ++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/go/gotenberg/package.nix b/pkgs/by-name/go/gotenberg/package.nix
index ddce8144813a..225dc55e14ff 100644
--- a/pkgs/by-name/go/gotenberg/package.nix
+++ b/pkgs/by-name/go/gotenberg/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGoModule,
+  buildGo125Module,
   chromium,
   fetchFromGitHub,
   libreoffice,
@@ -22,18 +22,23 @@ let
   libreoffice' = "${libreoffice}/lib/libreoffice/program/soffice.bin";
   inherit (lib) getExe;
 in
-buildGoModule rec {
+buildGo125Module rec {
   pname = "gotenberg";
-  version = "8.21.1";
+  version = "8.22.0";
+
+  outputs = [
+    "out"
+    "hyphen"
+  ];
 
   src = fetchFromGitHub {
     owner = "gotenberg";
     repo = "gotenberg";
     tag = "v${version}";
-    hash = "sha256-2uILOK5u+HrdjqN+ZQjGv48QxSCrzSvnF+Ae6iCKCbU=";
+    hash = "sha256-LrkJlUkcvW8ky9e2Ltj13wxcL0rvaE4NfVJrcrgPHL4=";
   };
 
-  vendorHash = "sha256-sTcP/tyrCtvgYeOnsbqRFdBC1bbMAbA978t6LOTKFio=";
+  vendorHash = "sha256-JHsuCYx9Ec/w8LBT2R4LxlrfjYyYve0+4/Xq0U1sq5I=";
 
   postPatch = ''
     find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${src}#g' {} \;
@@ -82,14 +87,20 @@ buildGoModule rec {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
+  postInstall = ''
+    mkdir $hyphen
+    cp -r build/chromium-hyphen-data/*/* $hyphen/
+  '';
+
   preFixup = ''
     wrapProgram $out/bin/gotenberg \
+      --set CHROMIUM_HYPHEN_DATA_DIR_PATH "$hyphen" \
+      --set EXIFTOOL_BIN_PATH "${getExe exiftool}" \
+      --set JAVA_HOME "${jre'}" \
+      --set PDFCPU_BIN_PATH "${getExe pdfcpu}" \
       --set PDFTK_BIN_PATH "${getExe pdftk}" \
       --set QPDF_BIN_PATH "${getExe qpdf}" \
-      --set UNOCONVERTER_BIN_PATH "${getExe unoconv}" \
-      --set EXIFTOOL_BIN_PATH "${getExe exiftool}" \
-      --set PDFCPU_BIN_PATH "${getExe pdfcpu}" \
-      --set JAVA_HOME "${jre'}"
+      --set UNOCONVERTER_BIN_PATH "${getExe unoconv}"
   '';
 
   passthru.updateScript = nix-update-script { };

From 9f09125d21e21cac053f8d0ab6b923a424d9f9d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 26 Aug 2025 17:13:57 +0200
Subject: [PATCH 3587/3724] nixos/gotenberg: fix typos

---
 nixos/modules/services/misc/gotenberg.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/gotenberg.nix b/nixos/modules/services/misc/gotenberg.nix
index ed4549b03436..de8c7805673c 100644
--- a/nixos/modules/services/misc/gotenberg.nix
+++ b/nixos/modules/services/misc/gotenberg.nix
@@ -115,7 +115,7 @@ in
         autoStart = mkOption {
           type = types.bool;
           default = false;
-          description = "Automatically start chromium when Gotenberg starts. If false, Chromium will start on the first conversion request that uses it.";
+          description = "Automatically start Chromium when Gotenberg starts. If false, Chromium will start on the first conversion request that uses it.";
         };
 
         disableJavascript = mkOption {
@@ -172,7 +172,7 @@ in
         autoStart = mkOption {
           type = types.bool;
           default = false;
-          description = "Automatically start LibreOffice when Gotenberg starts. If false, Chromium will start on the first conversion request that uses it.";
+          description = "Automatically start LibreOffice when Gotenberg starts. If false, LibreOffice will start on the first conversion request that uses it.";
         };
 
         disableRoutes = mkOption {

From 53fb369dfaaf670bcc137d8eda6c06ee8e3ed664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 26 Aug 2025 17:14:06 +0200
Subject: [PATCH 3588/3724] nixos/paperless: update link

---
 nixos/modules/services/misc/paperless.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix
index 4a54e637507a..78b427021408 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@@ -598,7 +598,7 @@ in
 
         services.gotenberg = lib.mkIf cfg.configureTika {
           enable = true;
-          # https://github.com/paperless-ngx/paperless-ngx/blob/v2.15.3/docker/compose/docker-compose.sqlite-tika.yml#L64-L69
+          # https://github.com/paperless-ngx/paperless-ngx/blob/v2.18.2/docker/compose/docker-compose.sqlite-tika.yml#L60-L65
           chromium.disableJavascript = true;
           extraArgs = [ "--chromium-allow-list=file:///tmp/.*" ];
         };

From 659468bd3f8f612a9adec2d18276c4a96787f32f Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 26 Aug 2025 17:33:43 +0200
Subject: [PATCH 3589/3724] obsidian: 1.9.10 -> 1.9.12

Changelog: https://obsidian.md/changelog/2025-08-26-desktop-v1.9.12/
---
 pkgs/by-name/ob/obsidian/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix
index 4f82de5b0250..37e78f8e87de 100644
--- a/pkgs/by-name/ob/obsidian/package.nix
+++ b/pkgs/by-name/ob/obsidian/package.nix
@@ -12,7 +12,7 @@
 }:
 let
   pname = "obsidian";
-  version = "1.9.10";
+  version = "1.9.12";
   appname = "Obsidian";
   meta = with lib; {
     description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files";
@@ -36,9 +36,9 @@ let
     url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
     hash =
       if stdenv.hostPlatform.isDarwin then
-        "sha256-tUT50nGF2rua5Wm1nqwO4I83u8o+BwwrapIbxgaAi1Y="
+        "sha256-HIcnOY/Fn/3zJTKiLxzPKbvug/wf1nc3lG2zyep68Nw="
       else
-        "sha256-5d9x92Nu8dzAGCnTeYHmv5XQN6aWxRemRyjC6wN6lDQ=";
+        "sha256-qS4M9gvCs3B2kOlImH/ddm0zjsVa4Zrhu2VEBKYNuMo=";
   };
 
   icon = fetchurl {

From d8380109635e612ca5e023969ee19dda6b5393eb Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 26 Aug 2025 17:42:16 +0200
Subject: [PATCH 3590/3724] python3Packages.kivy: Fix FTBFS

---
 pkgs/development/python-modules/kivy/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix
index a0a9bbcd36be..84488c615402 100644
--- a/pkgs/development/python-modules/kivy/default.nix
+++ b/pkgs/development/python-modules/kivy/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   cython,
   docutils,
@@ -34,6 +35,15 @@ buildPythonPackage rec {
     hash = "sha256-q8BoF/pUTW2GMKBhNsqWDBto5+nASanWifS9AcNRc8Q=";
   };
 
+  patches = [
+    # Fix compat with newer Cython
+    (fetchpatch {
+      name = "0001-kivy-Remove-old-Python-2-long.patch";
+      url = "https://github.com/kivy/kivy/commit/5a1b27d7d3bdee6cedb55440bfae9c4e66fb3c68.patch";
+      hash = "sha256-GDNYL8dC1Rh4KJ8oPiIjegOJGzRQ1CsgWQeAvx9+Rc8=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail "setuptools~=69.2.0" "setuptools" \

From 7e34e7d6db43268ee3982b8951d71efa2b6a58e0 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 26 Aug 2025 17:51:30 +0200
Subject: [PATCH 3591/3724] python3Packages.kivy: Small improvements

- Get guaranteed-correct output of mtdev with library file via lib.getLib
- Move all environment variables into env attrset
- Drop meta-wide "with lib"
---
 .../python-modules/kivy/default.nix           | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix
index 84488c615402..3eff452ef759 100644
--- a/pkgs/development/python-modules/kivy/default.nix
+++ b/pkgs/development/python-modules/kivy/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
   ''
   + lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace kivy/lib/mtdev.py \
-      --replace-fail "LoadLibrary('libmtdev.so.1')" "LoadLibrary('${mtdev}/lib/libmtdev.so.1')"
+      --replace-fail "LoadLibrary('libmtdev.so.1')" "LoadLibrary('${lib.getLib mtdev}/lib/libmtdev.so.1')"
   '';
 
   build-system = [
@@ -95,20 +95,24 @@ buildPythonPackage rec {
     filetype
   ];
 
-  KIVY_NO_CONFIG = 1;
-  KIVY_NO_ARGS = 1;
-  KIVY_NO_FILELOG = 1;
-  # prefer pkg-config over hardcoded framework paths
-  USE_OSX_FRAMEWORKS = 0;
-  # work around python distutils compiling C++ with $CC (see issue #26709)
-  env.NIX_CFLAGS_COMPILE = toString (
-    lib.optionals stdenv.cc.isGNU [
-      "-Wno-error=incompatible-pointer-types"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
-    ]
-  );
+  env = {
+    KIVY_NO_CONFIG = 1;
+    KIVY_NO_ARGS = 1;
+    KIVY_NO_FILELOG = 1;
+
+    # prefer pkg-config over hardcoded framework paths
+    USE_OSX_FRAMEWORKS = 0;
+
+    # work around python distutils compiling C++ with $CC (see issue #26709)
+    NIX_CFLAGS_COMPILE = toString (
+      lib.optionals stdenv.cc.isGNU [
+        "-Wno-error=incompatible-pointer-types"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
+      ]
+    );
+  };
 
   /*
     We cannot run tests as Kivy tries to import itself before being fully
@@ -117,11 +121,11 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "kivy" ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/kivy/kivy/releases/tag/${src.tag}";
     description = "Library for rapid development of hardware-accelerated multitouch applications";
     homepage = "https://github.com/kivy/kivy";
-    license = licenses.mit;
-    maintainers = with maintainers; [ risson ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ risson ];
   };
 }

From cb12d1512442e1acf979ced0f59e83b07eb00117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 26 Aug 2025 18:01:29 +0200
Subject: [PATCH 3592/3724] nixos/gotenberg: allow another syscall which caused
 a coredump while doing further testing

---
 nixos/modules/services/misc/gotenberg.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/gotenberg.nix b/nixos/modules/services/misc/gotenberg.nix
index de8c7805673c..e9a6388b970b 100644
--- a/nixos/modules/services/misc/gotenberg.nix
+++ b/nixos/modules/services/misc/gotenberg.nix
@@ -342,6 +342,7 @@ in
           "@system-service"
           "@chown"
           "@pkey" # required by chromium or it crashes
+          "mincore"
         ];
         SystemCallArchitectures = "native";
 

From d7fbdf54e13884ed2c5491f9430bc0af6570810d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 3 Mar 2025 22:46:30 +0100
Subject: [PATCH 3593/3724] nixos/postgresql-backup: do not enable assertions
 when module is disabled

---
 .../services/backup/postgresql-backup.nix     | 77 ++++++++++---------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index 2e78cfa5e6d1..b05435b4db36 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -152,45 +152,48 @@ in
 
   };
 
-  config = lib.mkMerge [
-    {
-      assertions = [
-        {
-          assertion = cfg.backupAll -> cfg.databases == [ ];
-          message = "config.services.postgresqlBackup.backupAll cannot be used together with config.services.postgresqlBackup.databases";
-        }
-        {
-          assertion =
-            cfg.compression == "none"
-            || (cfg.compression == "gzip" && cfg.compressionLevel >= 1 && cfg.compressionLevel <= 9)
-            || (cfg.compression == "zstd" && cfg.compressionLevel >= 1 && cfg.compressionLevel <= 19);
-          message = "config.services.postgresqlBackup.compressionLevel must be set between 1 and 9 for gzip and 1 and 19 for zstd";
-        }
-      ];
-    }
-    (lib.mkIf cfg.enable {
-      systemd.tmpfiles.rules = [
-        "d '${cfg.location}' 0700 postgres - - -"
-      ];
-    })
-    (lib.mkIf (cfg.enable && cfg.backupAll) {
-      systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpOptions}";
-    })
-    (lib.mkIf (cfg.enable && !cfg.backupAll) {
-      systemd.services = lib.listToAttrs (
-        map (
-          db:
-          let
-            cmd = "pg_dump ${cfg.pgdumpOptions} ${db}";
-          in
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        assertions = [
           {
-            name = "postgresqlBackup-${db}";
-            value = postgresqlBackupService db cmd;
+            assertion = cfg.backupAll -> cfg.databases == [ ];
+            message = "config.services.postgresqlBackup.backupAll cannot be used together with config.services.postgresqlBackup.databases";
           }
-        ) cfg.databases
-      );
-    })
-  ];
+          {
+            assertion =
+              cfg.compression == "none"
+              || (cfg.compression == "gzip" && cfg.compressionLevel >= 1 && cfg.compressionLevel <= 9)
+              || (cfg.compression == "zstd" && cfg.compressionLevel >= 1 && cfg.compressionLevel <= 19);
+            message = "config.services.postgresqlBackup.compressionLevel must be set between 1 and 9 for gzip and 1 and 19 for zstd";
+          }
+        ];
+
+        systemd.tmpfiles.rules = [
+          "d '${cfg.location}' 0700 postgres - - -"
+        ];
+      }
+
+      (lib.mkIf cfg.backupAll {
+        systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall ${cfg.pgdumpOptions}";
+      })
+
+      (lib.mkIf (!cfg.backupAll) {
+        systemd.services = lib.listToAttrs (
+          map (
+            db:
+            let
+              cmd = "pg_dump ${cfg.pgdumpOptions} ${db}";
+            in
+            {
+              name = "postgresqlBackup-${db}";
+              value = postgresqlBackupService db cmd;
+            }
+          ) cfg.databases
+        );
+      })
+    ]
+  );
 
   meta.maintainers = with lib.maintainers; [ Scrumplex ];
 }

From 76e8df4468188e5bffde9151b38b94b962ce1624 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 26 Aug 2025 09:16:29 -0700
Subject: [PATCH 3594/3724] python3Packages.langgraph-sdk: repair broken
 update, apply skipBulkUpdate

---
 .../python-modules/langgraph-sdk/default.nix       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix
index 4b5515c2a5ea..8e55808fdf54 100644
--- a/pkgs/development/python-modules/langgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/langgraph-sdk/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-sdk";
-  version = "2.1.1";
+  version = "0.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
-    tag = "checkpoint==${version}";
-    hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U=";
+    tag = "sdk==${version}";
+    hash = "sha256-X8ysXd5CwMiJMZ6GdiPjjjlm6x88Ibub04fhjDzi59M=";
   };
 
   sourceRoot = "${src.name}/libs/sdk-py";
@@ -43,8 +43,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langgraph_sdk" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "sdk==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "sdk==";
+    };
   };
 
   meta = {

From 02fc1bdb2cb5e725769aa031c6b92255741d80fc Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 26 Aug 2025 09:19:34 -0700
Subject: [PATCH 3595/3724] python3Packages.langgraph-prebuilt: apply
 skipBulkUpdate

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

diff --git a/pkgs/development/python-modules/langgraph-prebuilt/default.nix b/pkgs/development/python-modules/langgraph-prebuilt/default.nix
index 0cf2805c131c..59d69db2ba02 100644
--- a/pkgs/development/python-modules/langgraph-prebuilt/default.nix
+++ b/pkgs/development/python-modules/langgraph-prebuilt/default.nix
@@ -89,8 +89,12 @@ buildPythonPackage rec {
     "tests/conftest.py"
   ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "prebuilt==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "prebuilt==";
+    };
   };
 
   meta = {

From e6696ddb247f303b7cf950f8783e339f7b32d8d0 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 26 Aug 2025 09:27:25 -0700
Subject: [PATCH 3596/3724] Revert "ci: add myself as a reviewer on anything in
 maintainers that's otherwise not maintained"

---
 ci/OWNERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index cb3b2869a9f1..856ca93675ca 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -19,7 +19,6 @@
 /.github/workflows                      @NixOS/nixpkgs-ci
 /ci                                     @NixOS/nixpkgs-ci
 /ci/OWNERS                              @infinisil @philiptaron
-/maintainers                            @philiptaron
 
 # Development support
 /.editorconfig @Mic92 @zowoq

From e7dd5380c2b1c1f8c5f712f53fb6033e7c9e7033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 26 Aug 2025 18:29:44 +0200
Subject: [PATCH 3597/3724] python313Packages.pyvmomi: fix build

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

diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix
index 7c9102a7c0d2..9ca4de0a1890 100644
--- a/pkgs/development/python-modules/pyvmomi/default.nix
+++ b/pkgs/development/python-modules/pyvmomi/default.nix
@@ -6,15 +6,13 @@
   requests,
   six,
   pyopenssl,
-  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pyvmomi";
   version = "9.0.0.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vmware";
@@ -23,7 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-4r0UtLR1dhhNQ+Lx12JiEozDAjMxPly+RR0LWRg/A4E=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     requests
     six
   ];

From e02dbaf605886eea0bc1eebcda25f273f4da8932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 26 Aug 2025 18:51:50 +0200
Subject: [PATCH 3598/3724] mdcat: fix compilation

---
 pkgs/tools/text/mdcat/default.nix     |  4 ++++
 pkgs/tools/text/mdcat/fix-clippy.diff | 14 ++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/tools/text/mdcat/fix-clippy.diff

diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix
index c58582acda4f..dda3a3977cc4 100644
--- a/pkgs/tools/text/mdcat/default.nix
+++ b/pkgs/tools/text/mdcat/default.nix
@@ -22,6 +22,10 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-j6BFXx5cyjE3+fo1gGKlqpsxrm3i9HfQ9tJGNNjjLwo=";
   };
 
+  patches = [
+    ./fix-clippy.diff
+  ];
+
   nativeBuildInputs = [
     pkg-config
     asciidoctor
diff --git a/pkgs/tools/text/mdcat/fix-clippy.diff b/pkgs/tools/text/mdcat/fix-clippy.diff
new file mode 100644
index 000000000000..d54b75ffd581
--- /dev/null
+++ b/pkgs/tools/text/mdcat/fix-clippy.diff
@@ -0,0 +1,14 @@
+diff --git a/pulldown-cmark-mdcat/src/terminal/osc.rs b/pulldown-cmark-mdcat/src/terminal/osc.rs
+index 8fa2db6..dc2a2da 100644
+--- a/pulldown-cmark-mdcat/src/terminal/osc.rs
++++ b/pulldown-cmark-mdcat/src/terminal/osc.rs
+@@ -20,9 +20,6 @@ pub fn write_osc<W: Write + ?Sized>(writer: &mut W, command: &str) -> Result<()>
+     Ok(())
+ }
+ 
+-#[derive(Debug, PartialEq, Eq, Copy, Clone)]
+-pub struct Osc8Links;
+-
+ /// Whether the given `url` needs to get an explicit host.
+ ///
+ /// [OSC 8] links require that `file://` URLs give an explicit hostname, as

From b3a24e9195d058d7f6f4551fb143405576af2bc8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 16:53:36 +0000
Subject: [PATCH 3599/3724] rzls: 10.0.0-preview.25411.5 ->
 10.0.0-preview.25424.9

---
 pkgs/by-name/rz/rzls/deps.json   | 138 +++++++++++++++++--------------
 pkgs/by-name/rz/rzls/package.nix |   6 +-
 2 files changed, 81 insertions(+), 63 deletions(-)

diff --git a/pkgs/by-name/rz/rzls/deps.json b/pkgs/by-name/rz/rzls/deps.json
index 372caef41733..373f7cead63b 100644
--- a/pkgs/by-name/rz/rzls/deps.json
+++ b/pkgs/by-name/rz/rzls/deps.json
@@ -67,9 +67,9 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "5.0.0-2.25380.11",
-    "hash": "sha256-BTfux6b560oPleV/AkF262NGcA6ODfNpuUjQrTENCP0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25380.11/microsoft.codeanalysis.analyzers.5.0.0-2.25380.11.nupkg"
+    "version": "5.0.0-2.25418.8",
+    "hash": "sha256-dlQ7KyYZLqSE3D0j6ZAPBv8gbSuE+8IVQhJAeoo2K8g=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25418.8/microsoft.codeanalysis.analyzers.5.0.0-2.25418.8.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
@@ -79,27 +79,27 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "5.0.0-2.25380.11",
-    "hash": "sha256-TJCSoPNZkL8ZeaMbM3gxk02Kgw6SOn8sfiLcvhseQNc=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25380.11/microsoft.codeanalysis.common.5.0.0-2.25380.11.nupkg"
+    "version": "5.0.0-2.25418.8",
+    "hash": "sha256-O1yCn9+EAwtxZ/GwmAcyDWDPrhjMM4jAuSHvDYCMYiI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25418.8/microsoft.codeanalysis.common.5.0.0-2.25418.8.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "5.0.0-2.25380.11",
-    "hash": "sha256-BOz8ZUYWjrrN0pL2tQPtVgK4xCrSRgl691+xPhV+Xi0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25380.11/microsoft.codeanalysis.csharp.5.0.0-2.25380.11.nupkg"
+    "version": "5.0.0-2.25418.8",
+    "hash": "sha256-aO1ZCPkpE0SiF1YgELlOVTe2Mq6mbdZhc8acKsgGYCM=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.5.0.0-2.25418.8.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Features",
-    "version": "5.0.0-2.25380.11",
-    "hash": "sha256-4lvcDmiNtG/diRxzppu+NlW9DFN8CtMtt3vXU290Ky8=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25380.11/microsoft.codeanalysis.csharp.features.5.0.0-2.25380.11.nupkg"
+    "version": "5.0.0-2.25418.8",
+    "hash": "sha256-KFlqI0142Cli+8LgWlfK1DCNO+TlFPQK8NtmCvJZz6A=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.features.5.0.0-2.25418.8.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
-    "version": "5.0.0-2.25380.11",
-    "hash": "sha256-cPsgAyt7k7T1DSgH2Cm/je431GQgVO/4pt+Z7rhQ3Zk=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25380.11/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25380.11.nupkg"
+    "version": "5.0.0-2.25418.8",
+    "hash": "sha256-TigMGogMhbbRaWR4/9Aj+o5lxmVWUoIjBtmUiBHFhxM=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25418.8.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Elfie",
@@ -109,21 +109,21 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.ExternalAccess.Razor.Features",
-    "version": "5.0.0-2.25380.11",
-    "hash": "sha256-v9VPJ6Q7WN6ymh2EdvEHciBuZpJZOpYEkDamVxv7pW4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25380.11/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25380.11.nupkg"
+    "version": "5.0.0-2.25418.8",
+    "hash": "sha256-153NrMy6dA1FuUD0XfRASHiALANMSKXIigf49pQ8emI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25418.8/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25418.8.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Features",
-    "version": "5.0.0-2.25380.11",
-    "hash": "sha256-np7X7tCTIGZRKtBHvM8ToG8/vjCsmEsedLJTVy/QZes=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25380.11/microsoft.codeanalysis.features.5.0.0-2.25380.11.nupkg"
+    "version": "5.0.0-2.25418.8",
+    "hash": "sha256-dYmfiCnerjAArbF4LuXNi6oF9dY8lcDw2M3MX1IswhI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25418.8/microsoft.codeanalysis.features.5.0.0-2.25418.8.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.LanguageServer.Protocol",
-    "version": "5.0.0-2.25380.11",
-    "hash": "sha256-o7B62H5VNz/pA5+IM3i5zUIYDsa2UEzWlkOMDrUtj/4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25380.11/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25380.11.nupkg"
+    "version": "5.0.0-2.25418.8",
+    "hash": "sha256-cgAS5pZY6qb2I8QlTaDWl3zLGURNBblPKf69lYHF+xc=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25418.8/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25418.8.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
@@ -133,27 +133,27 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Remote.Workspaces",
-    "version": "5.0.0-2.25380.11",
-    "hash": "sha256-z6+Bv8EQmqX9oEb1VgS+k0qj8FYDxRuXkTeuSrKGfTM=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25380.11/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25380.11.nupkg"
+    "version": "5.0.0-2.25418.8",
+    "hash": "sha256-bHlIsWZus8Ms10WTAgSsKaAsIWyxwCMLd3zfXO3eFXA=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25418.8/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25418.8.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Scripting.Common",
-    "version": "5.0.0-2.25380.11",
-    "hash": "sha256-NtfvByHwKt9PISAoHUAy/x1oBwg3hqGcm2gJ+SXcPOc=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25380.11/microsoft.codeanalysis.scripting.common.5.0.0-2.25380.11.nupkg"
+    "version": "5.0.0-2.25418.8",
+    "hash": "sha256-jmvE90GOWoZLsHcX0SaBHXSJIfDeL/s/47k7uaG0DiE=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25418.8/microsoft.codeanalysis.scripting.common.5.0.0-2.25418.8.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Workspaces.Common",
-    "version": "5.0.0-2.25380.11",
-    "hash": "sha256-ybwUauakjco08QhfKzj1n9zai/N2LwBzsZ+mx3ZA9rg=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25380.11/microsoft.codeanalysis.workspaces.common.5.0.0-2.25380.11.nupkg"
+    "version": "5.0.0-2.25418.8",
+    "hash": "sha256-+LI3eEQDmdLTGaab4gu225NblD1l+RWZ+noosDWbxFM=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25418.8/microsoft.codeanalysis.workspaces.common.5.0.0-2.25418.8.nupkg"
   },
   {
     "pname": "Microsoft.CommonLanguageServerProtocol.Framework",
-    "version": "5.0.0-2.25380.11",
-    "hash": "sha256-QyWWR0EvtMs9oF5elCLYhypzUeAZBy1vzKCqVrLPinc=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25380.11/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25380.11.nupkg"
+    "version": "5.0.0-2.25418.8",
+    "hash": "sha256-b5QMnPTP/+wpkD2RmS6UtaO5RNYC3PxirboyVgniG04=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25418.8/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25418.8.nupkg"
   },
   {
     "pname": "Microsoft.CSharp",
@@ -205,9 +205,9 @@
   },
   {
     "pname": "Microsoft.Net.Compilers.Toolset",
-    "version": "5.0.0-2.25380.11",
-    "hash": "sha256-IDw4PtfjbHvXVat7tNiQo3i4AhKYERkHuK4UZ2k0qrA=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25380.11/microsoft.net.compilers.toolset.5.0.0-2.25380.11.nupkg"
+    "version": "5.0.0-2.25418.8",
+    "hash": "sha256-/Vr5J7ORwruP5mLMeVdbUPjUWYmCbLmZbi+aJBq8HmU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25418.8/microsoft.net.compilers.toolset.5.0.0-2.25418.8.nupkg"
   },
   {
     "pname": "Microsoft.NET.StringTools",
@@ -313,15 +313,9 @@
   },
   {
     "pname": "Microsoft.ServiceHub.Client",
-    "version": "4.2.1017",
-    "hash": "sha256-Achfy4EpZfcIOf02P8onWJH1cte+rP9ZAy94Gf4MVCA=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.servicehub.client/4.2.1017/microsoft.servicehub.client.4.2.1017.nupkg"
-  },
-  {
-    "pname": "Microsoft.ServiceHub.Framework",
-    "version": "4.2.100",
-    "hash": "sha256-xr3E+4mhhp7rTulh9OVdLQgLXWvt14SFMuLGv4/fqgw=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.2.100/microsoft.servicehub.framework.4.2.100.nupkg"
+    "version": "4.6.3200",
+    "hash": "sha256-cEXlKEJbQxKztw5g+k9GNTZ0fbHVDCp8/JuMqCK6bAE=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.client/4.6.3200/microsoft.servicehub.client.4.6.3200.nupkg"
   },
   {
     "pname": "Microsoft.ServiceHub.Framework",
@@ -329,18 +323,18 @@
     "hash": "sha256-GZCNC6Nd++vHi5A0UZtTI1sl/63N+NDX2JFfPdTGMDQ=",
     "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.8.40/microsoft.servicehub.framework.4.8.40.nupkg"
   },
+  {
+    "pname": "Microsoft.ServiceHub.Framework",
+    "version": "4.8.47",
+    "hash": "sha256-E6M1/jt84cr0HoODwO5BjcelOs+YsD61mlHQnvaMg20=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.8.47/microsoft.servicehub.framework.4.8.47.nupkg"
+  },
   {
     "pname": "Microsoft.ServiceHub.Framework",
     "version": "4.9.11-beta",
     "hash": "sha256-sAdzwH8lt1Z44YMGYTTwMSS8uceK8FXWR5h1p3Iu1OQ=",
     "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.9.11-beta/microsoft.servicehub.framework.4.9.11-beta.nupkg"
   },
-  {
-    "pname": "Microsoft.ServiceHub.Resources",
-    "version": "4.2.1017",
-    "hash": "sha256-6nq1jsXLThMritNI1CZj5Batfo/0W0Pt2iLY72yZGNw=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.servicehub.resources/4.2.1017/microsoft.servicehub.resources.4.2.1017.nupkg"
-  },
   {
     "pname": "Microsoft.VisualStudio.Composition",
     "version": "17.12.18",
@@ -683,12 +677,6 @@
     "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg"
   },
-  {
-    "pname": "StreamJsonRpc",
-    "version": "2.15.26",
-    "hash": "sha256-Wsqxh+1NDGdDklTXJBj25B64I8KCqu68nKxg4O9d+Jg=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/streamjsonrpc/2.15.26/streamjsonrpc.2.15.26.nupkg"
-  },
   {
     "pname": "StreamJsonRpc",
     "version": "2.20.20",
@@ -701,6 +689,12 @@
     "hash": "sha256-Ufx0QWwG9dNm/OrHRzkztVvbQHyKdj6MtTzNTQwTwl0=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/streamjsonrpc/2.21.10/streamjsonrpc.2.21.10.nupkg"
   },
+  {
+    "pname": "StreamJsonRpc",
+    "version": "2.22.12",
+    "hash": "sha256-sZVXFHQgA/qdnZeuZ/u54zg2JfMRSGgR0Ub+VxiWoFg=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/streamjsonrpc/2.22.12/streamjsonrpc.2.22.12.nupkg"
+  },
   {
     "pname": "StreamJsonRpc",
     "version": "2.23.39-alpha",
@@ -1091,12 +1085,30 @@
     "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg"
   },
+  {
+    "pname": "System.Security.AccessControl",
+    "version": "6.0.0",
+    "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/6.0.0/system.security.accesscontrol.6.0.0.nupkg"
+  },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
     "version": "9.0.0",
     "hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/9.0.0/system.security.cryptography.protecteddata.9.0.0.nupkg"
   },
+  {
+    "pname": "System.Security.Permissions",
+    "version": "8.0.0",
+    "hash": "sha256-+YUPY+3HnTmfPLZzr+5qEk0RqalCbFZBgLXee1yCH1M=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/8.0.0/system.security.permissions.8.0.0.nupkg"
+  },
+  {
+    "pname": "System.Security.Permissions",
+    "version": "9.0.0",
+    "hash": "sha256-BFrA9ottmQtLIAiKiGRbfSUpzNJwuaOCeFRDN4Z0ku0=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/9.0.0/system.security.permissions.9.0.0.nupkg"
+  },
   {
     "pname": "System.Security.Principal",
     "version": "4.3.0",
@@ -1210,5 +1222,11 @@
     "version": "4.5.0",
     "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"
+  },
+  {
+    "pname": "System.Windows.Extensions",
+    "version": "9.0.0",
+    "hash": "sha256-RErD+Ju15qtnwdwB7E0SjjJGAnhXwJyC7UPcl24Z3Vs=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.windows.extensions/9.0.0/system.windows.extensions.9.0.0.nupkg"
   }
 ]
diff --git a/pkgs/by-name/rz/rzls/package.nix b/pkgs/by-name/rz/rzls/package.nix
index dbcb01be172a..7ccbd46dbe5e 100644
--- a/pkgs/by-name/rz/rzls/package.nix
+++ b/pkgs/by-name/rz/rzls/package.nix
@@ -25,11 +25,11 @@ buildDotnetModule {
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "razor";
-    rev = "9ab78c78721106dcf827e397ff71b07114577712";
-    hash = "sha256-ank/7cg5qubP9oAbj14WZtJ81nNKDh6g8FRVbkdUQAQ=";
+    rev = "f2270a5492e831864b60a8853c7435ded110ad6f";
+    hash = "sha256-QMeIQmX/1W3N3r27fG5/Q6CsW/Wh+EI5+poGlJ2sbsQ=";
   };
 
-  version = "10.0.0-preview.25411.5";
+  version = "10.0.0-preview.25424.9";
   projectFile = "src/Razor/src/rzls/rzls.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;

From 3b7e1637559ad6fc4977aea459b1749db6cbf688 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 26 Aug 2025 19:09:54 +0200
Subject: [PATCH 3600/3724] roundcubePlugins: eval and build

---
 pkgs/top-level/all-packages.nix    | 2 +-
 pkgs/top-level/packages-config.nix | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6806540f7d95..68a804f1ea40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2330,7 +2330,7 @@ with pkgs;
 
   roundcube = callPackage ../servers/roundcube { };
 
-  roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { });
+  roundcubePlugins = recurseIntoAttrs (callPackage ../servers/roundcube/plugins { });
 
   rsyslog = callPackage ../tools/system/rsyslog {
     withHadoop = false; # Currently Broken
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index eb69a04b807b..e30de0007d0a 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -18,7 +18,6 @@
         nodePackages_latest
         platformioPackages
         rPackages
-        roundcubePlugins
         sourceHanPackages
         windows
         ;

From a635909bb49e78459f68700d6d526bd939f21c39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 17:13:04 +0000
Subject: [PATCH 3601/3724] python3Packages.iso4217: 1.12 -> 1.14

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

diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix
index 50aadffb98f6..ea27ffdd45fa 100644
--- a/pkgs/development/python-modules/iso4217/default.nix
+++ b/pkgs/development/python-modules/iso4217/default.nix
@@ -18,7 +18,7 @@ let
 in
 buildPythonPackage rec {
   pname = "iso4217";
-  version = "1.12";
+  version = "1.14";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "dahlia";
     repo = "iso4217";
     tag = version;
-    hash = "sha256-xOKfdk8Bn9f5oszS0IHUD6HgzL9VSa5GBZ28n4fvAck=";
+    hash = "sha256-lGXNSUBv/So3UgqXQ5AksqrCJVoyU8icDCfOda7Y5BE=";
   };
 
   build-system = [ setuptools ];

From 6b1ffd4282ad2301864d3a73ebbb1b59f9a54e3f Mon Sep 17 00:00:00 2001
From: Felipe Silva <git@felipeqq2.rocks>
Date: Tue, 4 Feb 2025 22:27:11 -0400
Subject: [PATCH 3602/3724] nixos/restic: allow setting repository/password via
 `environmentFile`

---
 nixos/modules/services/backup/restic.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix
index 63ff7916ab10..85bb1cd0bf41 100644
--- a/nixos/modules/services/backup/restic.nix
+++ b/nixos/modules/services/backup/restic.nix
@@ -20,7 +20,8 @@ in
         {
           options = {
             passwordFile = lib.mkOption {
-              type = lib.types.str;
+              type = with lib.types; nullOr str;
+              default = null;
               description = ''
                 Read the repository password from a file.
               '';
@@ -366,8 +367,10 @@ in
     assertions = lib.flatten (
       lib.mapAttrsToList (name: backup: [
         {
-          assertion = (backup.repository == null) != (backup.repositoryFile == null);
-          message = "services.restic.backups.${name}: exactly one of repository or repositoryFile should be set";
+          assertion =
+            ((backup.repository == null) != (backup.repositoryFile == null))
+            || (backup.environmentFile != null);
+          message = "services.restic.backups.${name}: exactly one of repository, repositoryFile or environmentFile should be set";
         }
         {
           assertion =
@@ -378,6 +381,10 @@ in
             !(fileBackup && commandBackup);
           message = "services.restic.backups.${name}: cannot do both a command backup and a file backup at the same time.";
         }
+        {
+          assertion = (backup.passwordFile != null) || (backup.environmentFile != null);
+          message = "services.restic.backups.${name}: passwordFile or environmentFile must be set";
+        }
       ]) config.services.restic.backups
     );
     systemd.services = lib.mapAttrs' (

From e2330fbedc847b1cef81837a563c5fa65407c956 Mon Sep 17 00:00:00 2001
From: Armel Cloarec <armel@armelclo.fr>
Date: Thu, 14 Aug 2025 16:56:37 +0200
Subject: [PATCH 3603/3724] phosh: 0.44.1 -> 0.48.0 Change fetchurl to
 FetchFromGitlab Fix Automatic package updates: directoryListingUpdater ->
 nix-update-script

---
 .../window-managers/phosh/default.nix         | 48 +++++++++++++++----
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix
index 825b34dd58b2..ff3b60e5ad35 100644
--- a/pkgs/applications/window-managers/phosh/default.nix
+++ b/pkgs/applications/window-managers/phosh/default.nix
@@ -1,8 +1,8 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  directoryListingUpdater,
+  fetchFromGitLab,
+  nix-update-script,
   meson,
   ninja,
   pkg-config,
@@ -39,16 +39,40 @@
   evolution-data-server,
   nixosTests,
   gmobile,
+  appstream,
 }:
 
+let
+  # Derived from subprojects/libcall-ui.wrap
+  libcall-ui = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    group = "World";
+    owner = "Phosh";
+    repo = "libcall-ui";
+    tag = "v0.1.4";
+    hash = "sha256-6fiqdvagcMnvaZ9UxC05haBwObcsqwgJL/V03LuSMF8=";
+  };
+
+  # Derived from subprojects/gvc.wrap
+  gvc = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "libgnome-volume-control";
+    rev = "5f9768a2eac29c1ed56f1fbb449a77a3523683b6";
+    hash = "sha256-gdgTnxzH8BeYQAsvv++Yq/8wHi7ISk2LTBfU8hk12NM=";
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "phosh";
-  version = "0.44.1";
+  version = "0.48.0";
 
-  src = fetchurl {
-    # Release tarball which includes subprojects gvc and libcall-ui
-    url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-rczGr7YSmVFu13oa3iSTmSQ4jsjl7lv38zQtD7WmDis=";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    group = "World";
+    owner = "Phosh";
+    repo = "phosh";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-HnjR0hVjkGfoD8RYCJqpGjRhl0W+QO8tYwSo71XFL6A=";
   };
 
   nativeBuildInputs = [
@@ -71,7 +95,6 @@ stdenv.mkDerivation (finalAttrs: {
     callaudiod
     evolution-data-server
     pulseaudio
-    glib
     modemmanager
     gcr
     networkmanager
@@ -87,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     upower
     wayland
     feedbackd
+    appstream
   ];
 
   nativeCheckInputs = [
@@ -97,10 +121,16 @@ stdenv.mkDerivation (finalAttrs: {
   # Temporarily disabled - Test is broken (SIGABRT)
   doCheck = false;
 
+  postPatch = ''
+    ln -s ${libcall-ui} subprojects/libcall-ui
+    ln -s ${gvc} subprojects/gvc
+  '';
+
   mesonFlags = [
     "-Dcompositor=${phoc}/bin/phoc"
     # Save some time building if tests are disabled
     "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}"
+    "-Dc_args=-I${glib.dev}/include/gio-unix-2.0/"
   ];
 
   checkPhase = ''
@@ -123,7 +153,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     providedSessions = [ "phosh" ];
     tests.phosh = nixosTests.phosh;
-    updateScript = directoryListingUpdater { };
+    updateScript = nix-update-script { };
   };
 
   meta = with lib; {

From b5bd9a647b6f6c7b28d5f8991bf4c20208b6260f Mon Sep 17 00:00:00 2001
From: Armel Cloarec <armel@armelclo.fr>
Date: Thu, 14 Aug 2025 17:14:03 +0200
Subject: [PATCH 3604/3724] phosh-mobile-settings: 0.41.0 -> 0.48.0 Fix
 Automatic package updates: directoryListingUpdater -> nix-update-script

---
 .../phosh/phosh-mobile-settings.nix           | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
index a795eb8e26fd..399ddbb94857 100644
--- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
+++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitLab,
   nixosTests,
-  directoryListingUpdater,
+  nix-update-script,
   meson,
   ninja,
   pkg-config,
@@ -20,11 +20,26 @@
   json-glib,
   gsound,
   gmobile,
+  gnome-desktop,
+  libpulseaudio,
+  libportal,
+  libportal-gtk4,
+  glib,
 }:
 
+let
+  # Derived from subprojects/gvc.wrap
+  gvc = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "libgnome-volume-control";
+    rev = "5f9768a2eac29c1ed56f1fbb449a77a3523683b6";
+    hash = "sha256-gdgTnxzH8BeYQAsvv++Yq/8wHi7ISk2LTBfU8hk12NM=";
+  };
+in
 stdenv.mkDerivation rec {
   pname = "phosh-mobile-settings";
-  version = "0.41.0";
+  version = "0.48.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -32,7 +47,7 @@ stdenv.mkDerivation rec {
     owner = "Phosh";
     repo = "phosh-mobile-settings";
     rev = "v${version}";
-    hash = "sha256-t5qngjQcjPltUGbcZ+CF5FbZtZkV/cD3xUhuApQbKHo=";
+    hash = "sha256-XnXwTjZnPlGNUmqizcIQdJ6SmrQ0dq9jNEhNsmDPzyM=";
   };
 
   nativeBuildInputs = [
@@ -42,6 +57,7 @@ stdenv.mkDerivation rec {
     pkg-config
     wayland-scanner
     wrapGAppsHook4
+    glib.dev
   ];
 
   buildInputs = [
@@ -55,22 +71,25 @@ stdenv.mkDerivation rec {
     json-glib
     gsound
     gmobile
+    gnome-desktop
+    libpulseaudio
+    libportal
+    libportal-gtk4
   ];
 
   postPatch = ''
-    # There are no schemas to compile.
-    substituteInPlace meson.build \
-      --replace 'glib_compile_schemas: true' 'glib_compile_schemas: false'
+    ln -s ${gvc} subprojects/gvc
   '';
 
   postInstall = ''
     # this is optional, but without it phosh-mobile-settings won't know about lock screen plugins
     ln -s '${phosh}/lib/phosh' "$out/lib/phosh"
+    glib-compile-schemas "$out/share/glib-2.0/schemas"
   '';
 
   passthru = {
     tests.phosh = nixosTests.phosh;
-    updateScript = directoryListingUpdater { };
+    updateScript = nix-update-script { };
   };
 
   meta = {

From f687eadd68deb9d49eb4bedec751274b2d1e087b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 17:26:48 +0000
Subject: [PATCH 3605/3724] python3Packages.python-snoo: 0.8.3 -> 0.9.0

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

diff --git a/pkgs/development/python-modules/python-snoo/default.nix b/pkgs/development/python-modules/python-snoo/default.nix
index 25b5be31d08e..05239538a597 100644
--- a/pkgs/development/python-modules/python-snoo/default.nix
+++ b/pkgs/development/python-modules/python-snoo/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "python-snoo";
-  version = "0.8.3";
+  version = "0.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lash-L";
     repo = "python-snoo";
     tag = "v${version}";
-    hash = "sha256-V+abmzQhzbRY+aJDThV+qXExNLKiahwxVR8WnXEP1vc=";
+    hash = "sha256-HLX8eVhAZbydZNbBAwi7F4qloZImPZlts4CDyFLIeGE=";
   };
 
   postPatch = ''

From dad6a74cab89bb8c35127d88c9b5ddf20bf5d3de Mon Sep 17 00:00:00 2001
From: Armel Cloarec <armel@armelclo.fr>
Date: Thu, 14 Aug 2025 17:30:12 +0200
Subject: [PATCH 3606/3724] phoc: 0.44.1 -> 0.48.0 Fix Automatic package
 updates: directoryListingUpdater -> nix-update-script

---
 pkgs/by-name/ph/phoc/package.nix | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ph/phoc/package.nix b/pkgs/by-name/ph/phoc/package.nix
index 084542190c57..6fc1b9e18912 100644
--- a/pkgs/by-name/ph/phoc/package.nix
+++ b/pkgs/by-name/ph/phoc/package.nix
@@ -19,17 +19,27 @@
   wayland,
   libdrm,
   libxkbcommon,
-  wlroots_0_17,
+  wlroots_0_19,
   xorg,
-  directoryListingUpdater,
+  nix-update-script,
   nixosTests,
   testers,
   gmobile,
 }:
 
+let
+  # Derived from subprojects/gvdb.wrap
+  gvdb = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "gvdb";
+    rev = "4758f6fb7f889e074e13df3f914328f3eecb1fd3";
+    hash = "sha256-4mqoHPlrMPenoGPwDqbtv4/rJ/uq9Skcm82pRvOxNIk=";
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "phoc";
-  version = "0.44.1";
+  version = "0.48.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -37,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Phosh";
     repo = "phoc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Whke7wTRp5NaRauiiQZLjs0pSD1uAyr0aAhlK5e1+Hw=";
+    hash = "sha256-ve69Na6iZwsNM0y7AZ0p/CObUfE6uEbhOV4sb5NaCYg=";
   };
 
   nativeBuildInputs = [
@@ -66,11 +76,15 @@ stdenv.mkDerivation (finalAttrs: {
     gmobile
   ];
 
+  postPatch = ''
+    ln -s ${gvdb} subprojects/gvdb
+  '';
+
   mesonFlags = [ "-Dembed-wlroots=disabled" ];
 
   # Patch wlroots to remove a check which crashes Phosh.
   # This patch can be found within the phoc source tree.
-  wlroots = wlroots_0_17.overrideAttrs (old: {
+  wlroots = wlroots_0_19.overrideAttrs (old: {
     patches = (old.patches or [ ]) ++ [
       (stdenvNoCC.mkDerivation {
         name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch";
@@ -87,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
     tests.version = testers.testVersion {
       package = finalAttrs.finalPackage;
     };
-    updateScript = directoryListingUpdater { };
+    updateScript = nix-update-script { };
   };
 
   meta = with lib; {

From 9494f24765d6f69de6e6bc9a030acebd8195462e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 12 May 2025 20:37:27 +0200
Subject: [PATCH 3607/3724] ocamlPackages.systemd: replace `meta.platform` with
 `meta.platforms`

`platform` is not a valid attr in meta an makes check-meta fail
---
 pkgs/development/ocaml-modules/systemd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/systemd/default.nix b/pkgs/development/ocaml-modules/systemd/default.nix
index f729601d3a74..ce6410a282bd 100644
--- a/pkgs/development/ocaml-modules/systemd/default.nix
+++ b/pkgs/development/ocaml-modules/systemd/default.nix
@@ -16,7 +16,7 @@ buildDunePackage {
   minimalOCamlVersion = "4.06";
   propagatedBuildInputs = [ systemdLibs ];
   meta = {
-    platform = lib.platforms.linux;
+    platforms = lib.platforms.linux;
     description = "OCaml module for native access to the systemd facilities";
     license = lib.licenses.lgpl3Only;
     maintainers = [ lib.maintainers.atagen ];

From 6eec03acff37b43a7b4da3bac4dcde5f759a7f66 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 12 May 2025 20:59:49 +0200
Subject: [PATCH 3608/3724] ocamlPackages.janeStreet: recurseIntoAttrs

---
 pkgs/top-level/ocaml-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5d74adccdaa9..deee9cbfb844 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -871,7 +871,7 @@ let
           else
             null;
 
-        janeStreet =
+        janeStreet = lib.recurseIntoAttrs (
           if lib.versionOlder "5.1" ocaml.version then
             import ../development/ocaml-modules/janestreet/0.17.nix {
               inherit self;
@@ -928,7 +928,8 @@ let
             }
           else
             import ../development/ocaml-modules/janestreet {
-            };
+            }
+        );
 
         javalib = callPackage ../development/ocaml-modules/javalib { };
 

From 230ec7554cf8f977019387d3cec3fb021ec69ed6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 17:30:43 +0000
Subject: [PATCH 3609/3724] terraform-providers.heroku: 5.2.8 -> 5.2.11

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index fc24860d143e..dacd700765d5 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -597,11 +597,11 @@
     "vendorHash": "sha256-sPvX69R2BmlY/KhXZgxCunzseoOkz1h2b8yqekBBn0k="
   },
   "heroku": {
-    "hash": "sha256-B/NaFe8KOKGJJlF3vZnpdMnbD1VxBktqodPBk+4NZEc=",
+    "hash": "sha256-Kc9/k+PyUHXj3F3YnqlPI+d7eroscBkdHt68nUbwyX8=",
     "homepage": "https://registry.terraform.io/providers/heroku/heroku",
     "owner": "heroku",
     "repo": "terraform-provider-heroku",
-    "rev": "v5.2.8",
+    "rev": "v5.2.11",
     "spdx": null,
     "vendorHash": null
   },

From ab0b16dd05b55be93a259d16118578257784208a Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 19 Aug 2025 14:41:25 +0200
Subject: [PATCH 3610/3724] ocamlPackages: move removed packages behind
 allowAliases

---
 pkgs/top-level/ocaml-packages.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index deee9cbfb844..37c4a51e1878 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -11,7 +11,9 @@ let
   mkOcamlPackages =
     ocaml:
     (lib.makeScope newScope (
-      self: with self; {
+      self:
+      with self;
+      {
         inherit ocaml;
 
         ### A ###
@@ -118,8 +120,6 @@ let
 
         binning = callPackage ../development/ocaml-modules/binning { };
 
-        biocaml = throw "biocaml has been removed"; # 2025-06-04
-
         biotk = callPackage ../development/ocaml-modules/biotk { };
 
         bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { };
@@ -659,7 +659,6 @@ let
 
         gapi-ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { };
 
-        gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead";
         gd = callPackage ../development/ocaml-modules/gd { inherit (pkgs) gd; };
 
         gen = callPackage ../development/ocaml-modules/gen { };
@@ -1427,8 +1426,6 @@ let
 
         ocaml-version = callPackage ../development/ocaml-modules/ocaml-version { };
 
-        ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom";
-
         ocamlbuild =
           if lib.versionOlder "4.03" ocaml.version then
             callPackage ../development/tools/ocaml/ocamlbuild { }
@@ -2224,6 +2221,11 @@ let
         ### End ###
 
       }
+      // lib.optionalAttrs config.allowAliases {
+        biocaml = throw "biocaml has been removed"; # 2025-06-04
+        gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead";
+        ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom";
+      }
     )).overrideScope
       liftJaneStreet;
 

From c0c0e36ddd39d4f76e5c0dc6af9bcd4288830e7b Mon Sep 17 00:00:00 2001
From: Armel Cloarec <armel@armelclo.fr>
Date: Thu, 14 Aug 2025 17:36:20 +0200
Subject: [PATCH 3611/3724] gmobile: 0.2.1 -> 0.4.0 Fix Automatic package
 updates: directoryListingUpdater -> nix-update-script Fix package name: name
 -> pname

---
 pkgs/by-name/gm/gmobile/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gm/gmobile/package.nix b/pkgs/by-name/gm/gmobile/package.nix
index f0b0c8473731..4add773dfd33 100644
--- a/pkgs/by-name/gm/gmobile/package.nix
+++ b/pkgs/by-name/gm/gmobile/package.nix
@@ -11,19 +11,21 @@
   libuev,
   gobject-introspection,
   udevCheckHook,
+  vala,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  name = "gmobile";
-  version = "0.2.1";
+  pname = "gmobile";
+  version = "0.4.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     group = "World";
     owner = "Phosh";
     repo = "gmobile";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-5OQ2JT7YeEYzKXafwgg0xJk2AvtFw2dtcH3mt+cm1bI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5WRsHbwReLy3ZMbfsyjr3VsGawaQoXMFIDtKw3P/loA=";
   };
 
   nativeBuildInputs = [
@@ -39,10 +41,13 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     json-glib
     libuev
+    vala
   ];
 
   doInstallCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Functions useful in mobile related, glib based projects";
     homepage = "https://gitlab.gnome.org/World/Phosh/gmobile";

From 97c7fb1c7f16f6c1299852fa437c953fa6987c7a Mon Sep 17 00:00:00 2001
From: Armel Cloarec <armel@armelclo.fr>
Date: Thu, 14 Aug 2025 18:08:56 +0200
Subject: [PATCH 3612/3724] maintainers: add armelclo

	modified:   maintainers/maintainer-list.nix
---
 maintainers/maintainer-list.nix                             | 6 ++++++
 pkgs/applications/window-managers/phosh/default.nix         | 1 +
 .../window-managers/phosh/phosh-mobile-settings.nix         | 5 ++++-
 pkgs/by-name/gm/gmobile/package.nix                         | 5 ++++-
 pkgs/by-name/ph/phoc/package.nix                            | 1 +
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5db08cf0f594..9934b9d6c7bd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2070,6 +2070,12 @@
     githubId = 29145250;
     name = "Armeen Mahdian";
   };
+  armelclo = {
+    email = "armel@armelclo.fr";
+    github = "ArmelClo";
+    githubId = 61419525;
+    name = "Armel Cloarec";
+  };
   armijnhemel = {
     email = "armijn@tjaldur.nl";
     github = "armijnhemel";
diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix
index ff3b60e5ad35..0317d563055c 100644
--- a/pkgs/applications/window-managers/phosh/default.nix
+++ b/pkgs/applications/window-managers/phosh/default.nix
@@ -164,6 +164,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with maintainers; [
       masipcat
       zhaofengli
+      armelclo
     ];
     platforms = platforms.linux;
     mainProgram = "phosh-session";
diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
index 399ddbb94857..1c043619d6ab 100644
--- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
+++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
@@ -98,7 +98,10 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.gnome.org/World/Phosh/phosh-mobile-settings";
     changelog = "https://gitlab.gnome.org/World/Phosh/phosh-mobile-settings/-/blob/v${version}/debian/changelog";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ rvl ];
+    maintainers = with lib.maintainers; [
+      rvl
+      armelclo
+    ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/gm/gmobile/package.nix b/pkgs/by-name/gm/gmobile/package.nix
index 4add773dfd33..c43f8a02e539 100644
--- a/pkgs/by-name/gm/gmobile/package.nix
+++ b/pkgs/by-name/gm/gmobile/package.nix
@@ -52,7 +52,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Functions useful in mobile related, glib based projects";
     homepage = "https://gitlab.gnome.org/World/Phosh/gmobile";
     license = lib.licenses.lgpl21Plus;
-    maintainers = with lib.maintainers; [ donovanglover ];
+    maintainers = with lib.maintainers; [
+      donovanglover
+      armelclo
+    ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ph/phoc/package.nix b/pkgs/by-name/ph/phoc/package.nix
index 6fc1b9e18912..2b530740b280 100644
--- a/pkgs/by-name/ph/phoc/package.nix
+++ b/pkgs/by-name/ph/phoc/package.nix
@@ -112,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with maintainers; [
       masipcat
       zhaofengli
+      armelclo
     ];
     platforms = platforms.linux;
   };

From 7d288dec0188947ee4d0f77b6e8a84dd772ae3ac Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 26 Aug 2025 09:09:19 -0700
Subject: [PATCH 3613/3724] python3Packages.langgraph: repair broken update,
 apply skipBulkUpdate

---
 .../python-modules/langgraph/default.nix      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index 9b3670490a8d..ef3089303418 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -40,14 +40,14 @@
 }:
 buildPythonPackage rec {
   pname = "langgraph";
-  version = "2.1.1";
+  version = "0.6.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
-    tag = "checkpoint==${version}";
-    hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U=";
+    tag = version;
+    hash = "sha256-9jl16cKp3E7j79PXrr/3splrcJtfQQN7yFJ5sfa6c+I=";
   };
 
   postgresqlTestSetupPost = ''
@@ -133,11 +133,15 @@ buildPythonPackage rec {
   ];
 
   # Since `langgraph` is the only unprefixed package, we have to use an explicit match
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version-regex"
-      "([0-9.]+)"
-    ];
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "([0-9.]+)"
+      ];
+    };
   };
 
   meta = {

From 6d2d77d31cad89ffac54e8e16b83dde0923b7b67 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 26 Aug 2025 09:24:24 -0700
Subject: [PATCH 3614/3724] python3Packages.langgraph-cli: repair broken
 update, apply skipBulkUpdate

---
 .../python-modules/langgraph-cli/default.nix       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix
index 312d92cf4549..b1173051aab4 100644
--- a/pkgs/development/python-modules/langgraph-cli/default.nix
+++ b/pkgs/development/python-modules/langgraph-cli/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-cli";
-  version = "2.1.1";
+  version = "0.3.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
-    tag = "checkpoint==${version}";
-    hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U=";
+    tag = "cli==${version}";
+    hash = "sha256-tBMdFOHSRjw0PtE19XytLU4MmjR3NBLJxUqWoG4L2F8=";
   };
 
   sourceRoot = "${src.name}/libs/cli";
@@ -80,8 +80,12 @@ buildPythonPackage rec {
     "test_build_command_shows_wolfi_warning"
   ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "cli==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "cli==";
+    };
   };
 
   meta = {

From bd7c36721dcafe7a56908bc845f99eb3faf9055e Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 26 Aug 2025 09:26:08 -0700
Subject: [PATCH 3615/3724] python3Packages.langgraph-cli: 0.3.6 -> 0.4.0

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

diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix
index b1173051aab4..0e566526caa3 100644
--- a/pkgs/development/python-modules/langgraph-cli/default.nix
+++ b/pkgs/development/python-modules/langgraph-cli/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-cli";
-  version = "0.3.6";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "cli==${version}";
-    hash = "sha256-tBMdFOHSRjw0PtE19XytLU4MmjR3NBLJxUqWoG4L2F8=";
+    hash = "sha256-/SPrX5O7Tt7fhATqN2fS7wSM+CJTY3QLmlUbfaCoFzo=";
   };
 
   sourceRoot = "${src.name}/libs/cli";

From bc72db398d1a51ce0b5b996b64db4e93f60c6672 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 26 Aug 2025 09:28:05 -0700
Subject: [PATCH 3616/3724] python3Packages.langgraph-checkpoint: apply
 skipBulkUpdate

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

diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
index bfcedb58e168..b0769f2a5306 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
@@ -63,8 +63,12 @@ buildPythonPackage rec {
     "test_embed_with_path"
   ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "checkpoint==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "checkpoint==";
+    };
   };
 
   meta = {

From e500804b5d24fe35f3db0a636830fe26eabefa7f Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 26 Aug 2025 09:33:32 -0700
Subject: [PATCH 3617/3724] python3Packages.langgraph-checkpoint-postgres:
 repair broken update, apply skipBulkUpdate

---
 .../langgraph-checkpoint-postgres/default.nix      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
index 78fbcc0a8e0c..5a0295eb96c3 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-checkpoint-postgres";
-  version = "2.1.1";
+  version = "2.0.23";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
-    tag = "checkpoint==${version}";
-    hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U=";
+    tag = "checkpointpostgres==${version}";
+    hash = "sha256-QAzT8T3bf3R3gwI/iWDYYDz0SxgLZsP61oMk72dYz4s=";
   };
 
   postgresqlTestSetupPost = ''
@@ -93,8 +93,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langgraph.checkpoint.postgres" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "checkpointpostgres==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "checkpointpostgres==";
+    };
   };
 
   meta = {

From 5610941d362897519b0c258c003515491e51148c Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 26 Aug 2025 09:36:00 -0700
Subject: [PATCH 3618/3724] python3Packages.langgraph-checkpoint-sqlite: repair
 broken update, apply skipBulkUpdate

---
 .../langgraph-checkpoint-sqlite/default.nix               | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
index 67184f2a8eaf..44877b4eadeb 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
@@ -74,8 +74,12 @@ buildPythonPackage rec {
     "test_search"
   ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "checkpointsqlite==";
+  passthru = {
+    # python updater script sets the wrong tag
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "checkpointsqlite==";
+    };
   };
 
   meta = {

From 55b0193b0e23cb73628a4b1e86bcdf3254a2fb82 Mon Sep 17 00:00:00 2001
From: Neurofibromin <125222560+Neurofibromin@users.noreply.github.com>
Date: Sat, 7 Jun 2025 17:37:55 +0200
Subject: [PATCH 3619/3724] maintainers: add neurofibromin

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 097fcf5c9147..23bb14820650 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18048,6 +18048,12 @@
     githubId = 42888162;
     keys = [ { fingerprint = "A0B9 48C5 A263 55C2 035F  8567 FBB7 2A94 52D9 1A72"; } ];
   };
+  neurofibromin = {
+    name = "Neurofibromin";
+    github = "Neurofibromin";
+    githubId = 125222560;
+    keys = [ { fingerprint = "9F9B FE94 618A D266 67BD 2821 4F67 1AFA D8D4 428B"; } ];
+  };
   neverbehave = {
     email = "i@never.pet";
     github = "NeverBehave";

From 6c0dee3d65c4c02f935b7d42af3422a2022a59c8 Mon Sep 17 00:00:00 2001
From: Neurofibromin <125222560+Neurofibromin@users.noreply.github.com>
Date: Mon, 9 Jun 2025 11:59:54 +0200
Subject: [PATCH 3620/3724] mfaomp: init at 0.4.3

---
 pkgs/by-name/mf/mfaomp/package.nix | 51 ++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/mf/mfaomp/package.nix

diff --git a/pkgs/by-name/mf/mfaomp/package.nix b/pkgs/by-name/mf/mfaomp/package.nix
new file mode 100644
index 000000000000..967c771c20f9
--- /dev/null
+++ b/pkgs/by-name/mf/mfaomp/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qt6,
+  libvlc,
+  libvlcpp,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mfaomp";
+  version = "0.4.3";
+
+  src = fetchFromGitHub {
+    owner = "Neurofibromin";
+    repo = "mfaomp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-b8eIG5UC1i4yfHSStNwhgIttTS+g511RmFJ5OYxeYvM=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qtwebengine
+    qt6.qtsvg
+    libvlc
+    libvlcpp
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "USE_SYSTEM_PROVIDED_LIBVLCPP" true)
+    (lib.cmakeBool "USE_FETCHED_LIBVLCPP" false)
+  ];
+
+  meta = {
+    description = "Multiple Files At Once Media Player";
+    homepage = "https://github.com/Neurofibromin/mfaomp";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ neurofibromin ];
+    platforms = lib.platforms.linux;
+    mainProgram = "mfaomp";
+  };
+})

From 465ab8f0977d05657b1b4adc6e7e06fe4db04c0c Mon Sep 17 00:00:00 2001
From: jopejoe1 <nixpkgs@missing.ninja>
Date: Tue, 26 Aug 2025 20:02:33 +0200
Subject: [PATCH 3621/3724] windows: minimal eval (#437193)

---
 pkgs/top-level/all-packages.nix    | 2 +-
 pkgs/top-level/packages-config.nix | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 241b09cc64d3..12510fda4a81 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10922,7 +10922,7 @@ with pkgs;
 
   v4l-utils = callPackage ../os-specific/linux/v4l-utils { };
 
-  windows = callPackages ../os-specific/windows { };
+  windows = recurseIntoAttrs (callPackages ../os-specific/windows { });
 
   wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
 
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index eb69a04b807b..f4598ee7c2b6 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -20,7 +20,6 @@
         rPackages
         roundcubePlugins
         sourceHanPackages
-        windows
         ;
 
       # Make sure haskell.compiler is included, so alternative GHC versions show up,

From b90b532691add2b55fb292f0ceb5457261561d5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 18:09:54 +0000
Subject: [PATCH 3622/3724] granian: 2.5.0 -> 2.5.1

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

diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix
index 4460f3a562f3..7ba56ea7b8c7 100644
--- a/pkgs/development/python-modules/granian/default.nix
+++ b/pkgs/development/python-modules/granian/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "granian";
-  version = "2.5.0";
+  version = "2.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "emmett-framework";
     repo = "granian";
     tag = "v${version}";
-    hash = "sha256-Ce0e31pjQEHHNz0Q13jshPBqxZdgAomGT3dpYm+ruQE=";
+    hash = "sha256-+K1M4cWJkZF7oeod8PMT3hSYERUjsE6rxN3QZlwQnVM=";
   };
 
   # Granian forces a custom allocator for all the things it runs,
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-QdoGxNMhBltzzAQIQt+Y5M4WRBtbdwm907jHlh1IxeQ=";
+    hash = "sha256-JHZiHRfU5CPhKMSdf0nD5SVDPAviyxsJrxhorEg3W64=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From 66acc8301e53b20e2f33c6c72377d97687154757 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 18:18:19 +0000
Subject: [PATCH 3623/3724] python3Packages.bluecurrent-api: 1.2.4 -> 1.3.1

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

diff --git a/pkgs/development/python-modules/bluecurrent-api/default.nix b/pkgs/development/python-modules/bluecurrent-api/default.nix
index dc42e6e2266d..33e250cbe4cd 100644
--- a/pkgs/development/python-modules/bluecurrent-api/default.nix
+++ b/pkgs/development/python-modules/bluecurrent-api/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "bluecurrent-api";
-  version = "1.2.4";
+  version = "1.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "bluecurrent";
     repo = "HomeAssistantAPI";
     tag = "v${version}";
-    hash = "sha256-NirWs06CkiSE3HPomQwBmX+XFhBxsM6ffE72mvlfxoY=";
+    hash = "sha256-PX0pD7X0o7OVtlz4Q5KuDBH83jtTaIdMnuLvAMTP8+U=";
   };
 
   build-system = [ setuptools ];

From 014e046c1cd9b9e751318ec1f281978e0f0c4ac2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 18:40:03 +0000
Subject: [PATCH 3624/3724] obs-studio-plugins.obs-vkcapture: 1.5.2 -> 1.5.3

---
 pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
index 4ce54c9c7a6f..bd8295db954b 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-vkcapture";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "nowrep";
     repo = "obs-vkcapture";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ghfRST7J3bipQnOZnYMtmDggET+Etq/ngHs+zQ0bm1w=";
+    hash = "sha256-zra7fwYnUfPKS4AA6Z9FIPP3p/uR5O1wB6Z76aivtZI=";
   };
 
   cmakeFlags = lib.optionals stdenv.hostPlatform.isi686 [

From ffa01f6d339d3bc31ce1aed95f5985787ab515af Mon Sep 17 00:00:00 2001
From: Jeffrey Harmon <contact@jeffreyharmon.dev>
Date: Tue, 26 Aug 2025 14:40:46 -0400
Subject: [PATCH 3625/3724] gdtoolkit_4: 4.3.3 -> 4.3.4

---
 pkgs/by-name/gd/gdtoolkit_4/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gd/gdtoolkit_4/package.nix b/pkgs/by-name/gd/gdtoolkit_4/package.nix
index 29a5b02b8825..049a5c7956d1 100644
--- a/pkgs/by-name/gd/gdtoolkit_4/package.nix
+++ b/pkgs/by-name/gd/gdtoolkit_4/package.nix
@@ -27,14 +27,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "gdtoolkit";
-  version = "4.3.3";
+  version = "4.3.4";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "Scony";
     repo = "godot-gdscript-toolkit";
     tag = version;
-    hash = "sha256-GS1bCDOKtdJkzgP3+CSWEUeHQ9lUcAHDT09QmPOOeVc=";
+    hash = "sha256-D67iwGGF3CrdAi/XKGVkusZlFCsMPIKdVpKDwcVQMrI=";
   };
 
   disabled = python.pythonOlder "3.7";
@@ -43,6 +43,7 @@ python.pkgs.buildPythonApplication rec {
     docopt
     lark
     pyyaml
+    radon
     setuptools
   ];
 
@@ -62,12 +63,13 @@ python.pkgs.buildPythonApplication rec {
   # The tests are not working on NixOS
   disabledTestPaths = [
     "tests/generated/test_expression_parsing.py"
-    "tests/gdradon/test_executable.py"
   ];
 
   pythonImportsCheck = [
     "gdtoolkit"
     "gdtoolkit.formatter"
+    "gdtoolkit.gd2py"
+    "gdtoolkit.gdradon"
     "gdtoolkit.linter"
     "gdtoolkit.parser"
   ];

From a6414cb37ed4ad13e80f25c9309101c531d72953 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 18:50:44 +0000
Subject: [PATCH 3626/3724] python3Packages.rigour: 1.2.2 -> 1.2.9

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

diff --git a/pkgs/development/python-modules/rigour/default.nix b/pkgs/development/python-modules/rigour/default.nix
index 9d88f21c99db..081015337342 100644
--- a/pkgs/development/python-modules/rigour/default.nix
+++ b/pkgs/development/python-modules/rigour/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "rigour";
-  version = "1.2.2";
+  version = "1.2.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "opensanctions";
     repo = "rigour";
     tag = "v${version}";
-    hash = "sha256-k0rOl9mkSD7Evb8wc043Coa2UNSlaX7BqUscqcEciRQ=";
+    hash = "sha256-9eK5ZCkgku/ZDEGAdpXFvZZiFY5sorJ0r0Ko/HuYi1o=";
   };
 
   build-system = [

From 2eebcd6b91e9b0fe4c7be9a2c977a97955f37c73 Mon Sep 17 00:00:00 2001
From: hannahfluch <hannah@diefluchs.at>
Date: Mon, 18 Aug 2025 20:01:23 +0200
Subject: [PATCH 3627/3724] networkminer: fix desktop file

---
 pkgs/by-name/ne/networkminer/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ne/networkminer/package.nix b/pkgs/by-name/ne/networkminer/package.nix
index fd605c8e7a3b..72186710e76a 100644
--- a/pkgs/by-name/ne/networkminer/package.nix
+++ b/pkgs/by-name/ne/networkminer/package.nix
@@ -39,6 +39,9 @@ buildDotnetModule rec {
     # Embedded base64-encoded app icon in resx fails to parse. Delete it
     sed -zi 's|<data name="$this.Icon".*</data>||g' NetworkMiner/NamedPipeForm.resx
     sed -zi 's|<data name="$this.Icon".*</data>||g' NetworkMiner/UpdateCheck.resx
+
+    # Remove the UTF-8 BOM from the desktop file.
+    dos2unix -r NetworkMiner/NetworkMiner.desktop
   '';
 
   nugetDeps = ./deps.json;

From fd0ad4fee834fa585bc70424c0e67003015671a4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 26 Aug 2025 21:39:41 +0200
Subject: [PATCH 3628/3724] buildMozillaMach: restore MOZ_SYSTEM_DIR patch

Accidentally dropped while pruning obsolete patches.
---
 .../133-env-var-for-system-dir.patch          | 22 +++++++++++++++++++
 .../build-mozilla-mach/default.nix            |  3 +++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/build-support/build-mozilla-mach/133-env-var-for-system-dir.patch

diff --git a/pkgs/build-support/build-mozilla-mach/133-env-var-for-system-dir.patch b/pkgs/build-support/build-mozilla-mach/133-env-var-for-system-dir.patch
new file mode 100644
index 000000000000..f35569c5909f
--- /dev/null
+++ b/pkgs/build-support/build-mozilla-mach/133-env-var-for-system-dir.patch
@@ -0,0 +1,22 @@
+diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
+index 6db876975187..5882c5d7f1d6 100644
+--- a/toolkit/xre/nsXREDirProvider.cpp
++++ b/toolkit/xre/nsXREDirProvider.cpp
+@@ -11,6 +11,7 @@
+ 
+ #include "jsapi.h"
+ #include "xpcpublic.h"
++#include "prenv.h"
+ #include "prprf.h"
+ 
+ #include "nsIAppStartup.h"
+@@ -297,7 +297,8 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) {
+       "/usr/lib/mozilla"_ns
+ #    endif
+       ;
+-  rv = NS_NewNativeLocalFile(dirname, getter_AddRefs(localDir));
++  const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");
++  rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), getter_AddRefs(localDir));
+ #  endif
+ 
+   if (NS_SUCCEEDED(rv)) {
diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 043fc8ec537d..790ca307cdb1 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -305,7 +305,10 @@ buildStdenv.mkDerivation {
   ];
 
   patches =
+    # Remove references to the build clsoure
     lib.optionals (lib.versionAtLeast version "136") [ ./136-no-buildconfig.patch ]
+    # Add MOZ_SYSTEM_DIR env var for native messaging host support
+    ++ lib.optionals (lib.versionAtLeast version "133") [ ./133-env-var-for-system-dir.patch ]
     ++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "141") [
       # https://bugzilla.mozilla.org/show_bug.cgi?id=1955112
       # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9

From 2612d7b72e58c64914126bd8f4d1cbb4a512eaf6 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 26 Aug 2025 21:51:57 +0200
Subject: [PATCH 3629/3724] chromium,chromedriver: 139.0.7258.138 ->
 139.0.7258.154

https://chromereleases.googleblog.com/2025/08/stable-channel-update-for-desktop_26.html

This update includes 1 security fix.

CVEs:
CVE-2025-9478
---
 .../networking/browsers/chromium/info.json    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index b529df32de1c..1290f95d3a1e 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "139.0.7258.138",
+    "version": "139.0.7258.154",
     "chromedriver": {
-      "version": "139.0.7258.139",
-      "hash_darwin": "sha256-EqKEyT/iEJkVASSAEP0/dNptDw3yr3AwoM2yUYbn1to=",
-      "hash_darwin_aarch64": "sha256-3H9CUsMDvD+PJ+n/YwCv22uEIxa80y+cMvL1PWOWQg0="
+      "version": "139.0.7258.155",
+      "hash_darwin": "sha256-9tHj/QSFz9fJTQ+xivOKbssqXsE53BHViy7uCZ4OMhc=",
+      "hash_darwin_aarch64": "sha256-fmflqWTiruKD/VtmNWllCA71tqaB0OIOUiXsmJOTJFI="
     },
     "deps": {
       "depot_tools": {
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "884e54ea8d42947ed636779015c5b4815e069838",
-        "hash": "sha256-MCBHB1ms3H8AXqiIDHH7C+8/NDcgsn3pDx7mKtGdfbc=",
+        "rev": "9e0d6b2b47ffb17007b713429c9a302f9e43847f",
+        "hash": "sha256-L3cq3kx7hOv8bzwkQ+nyDM9VDzsvHaRzrSwrqwyCdHA=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -97,8 +97,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "96492b317e27ba4106ed00f5faa4534cfeaa0b8f",
-        "hash": "sha256-TE8vYLNnAzVkGQZ2ZYuNHnu8fwp2Qv4ANP0btgrKYSQ="
+        "rev": "d9fc4a372074b1079c193c422fc4a180e79b6636",
+        "hash": "sha256-owMOjZEXhjXkEwzKdNVUk6Uzqdfp8UQq4JLDSvbvyeA="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -582,8 +582,8 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "849572b5c41e5bf59dc88bf54c41067faa9b5b00",
-        "hash": "sha256-lTUkzpzIskbEL7b2xBWT8s9YNyu1AZ235SBo5AfQtpg="
+        "rev": "bbdc38bc2d1693f56154f78eb5d4ff296d8ca3da",
+        "hash": "sha256-LYo73KuSVBEcRN1PqG0EBFeKaLy66UPtZ3DMHP5YVXM="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
@@ -797,8 +797,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "4d36678284f92d381f411c7947588d7a09989ca4",
-        "hash": "sha256-X5k2R7/sS3/C2S5hC1ILSquWjnPol3Pk+xe1suzgnFs="
+        "rev": "a0a7886d6b3707be8d4b403e463fa82fdb3f216c",
+        "hash": "sha256-KjIBJw40hiBkcHNn96dD5iZs2n2HMWIkAJ6ND2+5JJQ="
       }
     }
   },

From 4f6db78d211d0b5b236b2164340a77f585955afd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 19:52:43 +0000
Subject: [PATCH 3630/3724] v2ray-domain-list-community: 20250814002625 ->
 20250826193754

---
 pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index 1ef693a8ddbd..781554b682bf 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20250814002625";
+    version = "20250826193754";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-HNnwVnZFcvwAzrfEuZCG1SQlnIlUeb7o2Yis8X8MaF0=";
+      hash = "sha256-t1+Jd/d6U3WjsFwxWxKWbDd4v4y+EWODcRSoDHv7hwY=";
     };
     vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
     meta = with lib; {

From aac8f8975b0531c093930264433d3e320b36c076 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 26 Aug 2025 22:17:01 +0200
Subject: [PATCH 3631/3724] evcc: 0.207.4 -> 0.207.5

https://github.com/evcc-io/evcc/releases/tag/0.207.5
---
 pkgs/by-name/ev/evcc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index 7445be0aa1c2..a787c2829e08 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,16 +17,16 @@
 }:
 
 let
-  version = "0.207.4";
+  version = "0.207.5";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-TQOeeGcgkaMoMyDbJQKIZIKJ6Wpz/wJqvpQjglnJRXI=";
+    hash = "sha256-THgW9+y634THKS1Co3e4kIkeS6Lmg7mTg9YYeuLyrZI=";
   };
 
-  vendorHash = "sha256-qH0wHP5xHxnnURwlk4AA3H1NCftFFgAYAWPW3cdpwdk=";
+  vendorHash = "sha256-1+5SNgYblHRDpL+O1GGtvPR7pJ6lsEM/At7RMbzB5sA=";
 
   commonMeta = with lib; {
     license = licenses.mit;

From b9e09271b76a01bce3dd6ec276c1fbd42c396b89 Mon Sep 17 00:00:00 2001
From: dramforever <dramforever@live.com>
Date: Mon, 25 Aug 2025 14:15:22 +0800
Subject: [PATCH 3632/3724] linuxPackages.v4l2loopback: Fix makeFlags for utils

Do not pass makeFlags to the utils build. It only works with building
kernel modules.

Fixes #436300.
---
 pkgs/os-specific/linux/v4l2loopback/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index a43048ea1c49..6ca2efdfc275 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -32,6 +32,11 @@ stdenv.mkDerivation {
     sed -i '/depmod/d' Makefile
   '';
 
+  # Don't use makeFlags for this
+  postBuild = ''
+    make utils
+  '';
+
   nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
 
   postInstall = ''
@@ -46,6 +51,7 @@ stdenv.mkDerivation {
   makeFlags = kernelModuleMakeFlags ++ [
     "KERNELRELEASE=${kernel.modDirVersion}"
     "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    "v4l2loopback.ko"
   ];
 
   meta = {

From e6158c191ceaf848dfc9a11f0c8758a0a0ab4a57 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:45:46 +0200
Subject: [PATCH 3633/3724] python312Packages.mypy-boto3-appflow: 1.40.0 ->
 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 826d6349e1b1..3309aeb9319d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -102,8 +102,8 @@ rec {
       "sha256-wLCPBODUaTw6VdnbZ0bD9BzIVTPuGpVlZfeGBZY95B8=";
 
   mypy-boto3-appflow =
-    buildMypyBoto3Package "appflow" "1.40.0"
-      "sha256-w2NPLBdMrpFTuryOJtezSYU81kG4ZL2nIcRB0c5oL7M=";
+    buildMypyBoto3Package "appflow" "1.40.17"
+      "sha256-eBbaAv0NU/VcaZNNPaBvU2pt7rXNm2DwqZ0xtoX2WwU=";
 
   mypy-boto3-appintegrations =
     buildMypyBoto3Package "appintegrations" "1.40.0"

From 582c269fe6fd97e1de61338d0e70f20c46b7540b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:45:48 +0200
Subject: [PATCH 3634/3724] python312Packages.mypy-boto3-apprunner: 1.40.0 ->
 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3309aeb9319d..65e627f01853 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -126,8 +126,8 @@ rec {
       "sha256-ZMDdjJse4uyAnWIy/cwQQuAemTrUBdm8PYQp0LTuHgE=";
 
   mypy-boto3-apprunner =
-    buildMypyBoto3Package "apprunner" "1.40.0"
-      "sha256-xrpy1Eq+Kleg0oYEQY/UDXvUUdZp9B6rz4OrXo/A9bA=";
+    buildMypyBoto3Package "apprunner" "1.40.18"
+      "sha256-WLfvFLM0ggxd0DXBGsNZg9Lj+pmoOqjqahauQhPIBGs=";
 
   mypy-boto3-appstream =
     buildMypyBoto3Package "appstream" "1.40.4"

From eb1b7d6bba1eec4dc3e28754b82ea2e5f8d24c9d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:45:50 +0200
Subject: [PATCH 3635/3724] python312Packages.mypy-boto3-arc-zonal-shift:
 1.40.0 -> 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 65e627f01853..a1efd725b041 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -138,8 +138,8 @@ rec {
       "sha256-NgOa+Na/gU7IrtEJ8bVMJaSCNgTnGreX2TsjsAlIN+Y=";
 
   mypy-boto3-arc-zonal-shift =
-    buildMypyBoto3Package "arc-zonal-shift" "1.40.0"
-      "sha256-c8dkKeytZ3/lr1gWswCtcFGsHnv7F+7TOeNMNnocJhE=";
+    buildMypyBoto3Package "arc-zonal-shift" "1.40.18"
+      "sha256-+CR5RYb8rFZxC5Vl208nRf9RT0Dhd7w1s0vdkefAhM4=";
 
   mypy-boto3-athena =
     buildMypyBoto3Package "athena" "1.40.0"

From 76a83dbe0ce9a5482e62654ec39a8488adc9d2fa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:45:54 +0200
Subject: [PATCH 3636/3724] 
 python312Packages.mypy-boto3-chime-sdk-media-pipelines: 1.40.0 -> 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a1efd725b041..ebd89de1fc3e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -194,8 +194,8 @@ rec {
       "sha256-oPAwpEyXLywiumiOZ5b6YzplIHa10a4b5zMyb0M2IAU=";
 
   mypy-boto3-chime-sdk-media-pipelines =
-    buildMypyBoto3Package "chime-sdk-media-pipelines" "1.40.0"
-      "sha256-P+I+mG7Bhf83/Mdt3HG5y/nWiKTEjIjTebcBfZ789sY=";
+    buildMypyBoto3Package "chime-sdk-media-pipelines" "1.40.17"
+      "sha256-5qaK+piVZhvHqBJgGteNsvmMZG5y6fvLD4W8qASfcL0=";
 
   mypy-boto3-chime-sdk-meetings =
     buildMypyBoto3Package "chime-sdk-meetings" "1.40.0"

From dce5b513f9e0e8e16249c128c9bbc0eea45847fe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:45:55 +0200
Subject: [PATCH 3637/3724] python312Packages.mypy-boto3-chime-sdk-messaging:
 1.40.0 -> 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ebd89de1fc3e..a0b7b7d24368 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -202,8 +202,8 @@ rec {
       "sha256-8BL5bNgUJegDMQnyGnLjSxzaPATF80av0lk+D+bEqgI=";
 
   mypy-boto3-chime-sdk-messaging =
-    buildMypyBoto3Package "chime-sdk-messaging" "1.40.0"
-      "sha256-Vtf4PVkKxCIYSyvOXMMo1r7ZskDVA0zw9Ql0elCsw28=";
+    buildMypyBoto3Package "chime-sdk-messaging" "1.40.17"
+      "sha256-TfpYINO0LCU2IMQwDaMJkjWq2Fsrqv7w7w1KhCKWIyU=";
 
   mypy-boto3-chime-sdk-voice =
     buildMypyBoto3Package "chime-sdk-voice" "1.40.0"

From 39a1e083f708e0a0c7f3cf348e327815d991ebc1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:45:59 +0200
Subject: [PATCH 3638/3724] python312Packages.mypy-boto3-cloudsearch: 1.40.0 ->
 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a0b7b7d24368..5008278f074d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -242,8 +242,8 @@ rec {
       "sha256-h/dMWTcSGu7IuI2G2G+gt3EbWV1SA4JpOcYiMtlGUxs=";
 
   mypy-boto3-cloudsearch =
-    buildMypyBoto3Package "cloudsearch" "1.40.0"
-      "sha256-sWGWNB+dBURSQhopDDm5rXsvolhDVi8oRshfG57vbw0=";
+    buildMypyBoto3Package "cloudsearch" "1.40.17"
+      "sha256-bnLdoUOM0daHl74qUUfv6RO6Mqkk8Su97RzCjKettQQ=";
 
   mypy-boto3-cloudsearchdomain =
     buildMypyBoto3Package "cloudsearchdomain" "1.40.0"

From 47ba1d6537d40a69b66572fa47989e38e6b965c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:03 +0200
Subject: [PATCH 3639/3724] python312Packages.mypy-boto3-cloudtrail-data:
 1.40.0 -> 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5008278f074d..94d98f2cb062 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -254,8 +254,8 @@ rec {
       "sha256-aV+fpcURVMZv7jOsZ/LF6edo4doNZPtCwdG4YEGKMYc=";
 
   mypy-boto3-cloudtrail-data =
-    buildMypyBoto3Package "cloudtrail-data" "1.40.0"
-      "sha256-1UfkYWjdEHdYQff3xCTH3jQapWyzc/L9pznEc/o5Stg=";
+    buildMypyBoto3Package "cloudtrail-data" "1.40.17"
+      "sha256-ghgArlI9Z/rk9kM6k6b+0x/Fugp7q25+uV+Y2dZFtSU=";
 
   mypy-boto3-cloudwatch =
     buildMypyBoto3Package "cloudwatch" "1.40.0"

From d45381d6101420b9464a448b9339dd9d3ae51913 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:05 +0200
Subject: [PATCH 3640/3724] python312Packages.mypy-boto3-codeartifact: 1.40.0
 -> 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 94d98f2cb062..e5d8bcee4e08 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -262,8 +262,8 @@ rec {
       "sha256-SbEKbGXjkvk+jIXQHToTj+yzhUX1ob8VzT4awbWUAWs=";
 
   mypy-boto3-codeartifact =
-    buildMypyBoto3Package "codeartifact" "1.40.0"
-      "sha256-FyjlcLmx8cmYlTlzxI8AupyGJXwIWEh7OOtKeUA6vPk=";
+    buildMypyBoto3Package "codeartifact" "1.40.17"
+      "sha256-XqaCY0uawL5BKmcTl1D3uz1EgsKn3wtph036TX07/Fg=";
 
   mypy-boto3-codebuild =
     buildMypyBoto3Package "codebuild" "1.40.8"

From f215fdac5ff7bf9800626aef52f5465e7a78c79d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:07 +0200
Subject: [PATCH 3641/3724] python312Packages.mypy-boto3-codecommit: 1.40.0 ->
 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e5d8bcee4e08..d81e7cbf26e7 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -274,8 +274,8 @@ rec {
       "sha256-cPLylCvda6iHWRcPMVaL/qEkeg7EzBs38G2mX1eP0ZI=";
 
   mypy-boto3-codecommit =
-    buildMypyBoto3Package "codecommit" "1.40.0"
-      "sha256-buG7f7h5ciaoS7Pq/8u8PsvAmqaJqYr4+rIiXxUVqaI=";
+    buildMypyBoto3Package "codecommit" "1.40.18"
+      "sha256-+T9NGuE7gN1OjOBhIU8QCo09FiAQ1qdiABitoQpDZrk=";
 
   mypy-boto3-codedeploy =
     buildMypyBoto3Package "codedeploy" "1.40.0"

From b550e20305e001207019c7c47ef9c0cf7c660896 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:08 +0200
Subject: [PATCH 3642/3724] python312Packages.mypy-boto3-codeguru-security:
 1.40.0 -> 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d81e7cbf26e7..d6d0fd032397 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -286,8 +286,8 @@ rec {
       "sha256-DGppntoDyUYwAo1XkJG7OQTK/E0B4F9y2qjnIQaRT7I=";
 
   mypy-boto3-codeguru-security =
-    buildMypyBoto3Package "codeguru-security" "1.40.0"
-      "sha256-T++PZg1Q9GQpdpMrkOXpMaW3NZe9bKgJAmqLflvJXgc=";
+    buildMypyBoto3Package "codeguru-security" "1.40.17"
+      "sha256-LT2Fi8LHrgRgYz6HnKyRB14Vl+PjCjTx/EF8s5D2hhw=";
 
   mypy-boto3-codeguruprofiler =
     buildMypyBoto3Package "codeguruprofiler" "1.40.0"

From 6467809aafff6d0a404beafa00201ce4c0030612 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:10 +0200
Subject: [PATCH 3643/3724] python312Packages.mypy-boto3-codestar-connections:
 1.40.0 -> 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d6d0fd032397..1280946592ea 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -302,8 +302,8 @@ rec {
       "sha256-B9Aq+hh9BOzCIYMkS21IZYb3tNCnKnV2OpSIo48aeJM=";
 
   mypy-boto3-codestar-connections =
-    buildMypyBoto3Package "codestar-connections" "1.40.0"
-      "sha256-MJfhLtZ7XJxOvfnYruvPGr6yl7Dg71iKC65b57s3YUw=";
+    buildMypyBoto3Package "codestar-connections" "1.40.18"
+      "sha256-NNVGx+fN0apfT84GbtQjK6YX30bIomIPUaK9RFOsrVQ=";
 
   mypy-boto3-codestar-notifications =
     buildMypyBoto3Package "codestar-notifications" "1.40.0"

From a189b35fa632758538deb8796b2313f0656fa371 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:11 +0200
Subject: [PATCH 3644/3724] 
 python312Packages.mypy-boto3-codestar-notifications: 1.40.0 -> 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1280946592ea..2f9201d536a2 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -306,8 +306,8 @@ rec {
       "sha256-NNVGx+fN0apfT84GbtQjK6YX30bIomIPUaK9RFOsrVQ=";
 
   mypy-boto3-codestar-notifications =
-    buildMypyBoto3Package "codestar-notifications" "1.40.0"
-      "sha256-AsC0tMY0LbaFxJgLK3QLDrXNOjLkZkvp60AwyQEkeRw=";
+    buildMypyBoto3Package "codestar-notifications" "1.40.17"
+      "sha256-uzTn5MwCM6dkY5P9/tLfZqOfdKVvBClMxMkG9vgnx/4=";
 
   mypy-boto3-cognito-identity =
     buildMypyBoto3Package "cognito-identity" "1.40.15"

From 7c59fb9b49e4b584fe5ae188faf51fdea76976f1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:13 +0200
Subject: [PATCH 3645/3724] python312Packages.mypy-boto3-comprehendmedical:
 1.40.0 -> 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2f9201d536a2..0b59862a2715 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -326,8 +326,8 @@ rec {
       "sha256-8lrg38NrNjdyZ/8qKsD1glKqnzrwPvkQ1RAk3qiCi3Q=";
 
   mypy-boto3-comprehendmedical =
-    buildMypyBoto3Package "comprehendmedical" "1.40.0"
-      "sha256-oJFrBdUov2dpl4XWV3HGHigKTvLAUtD2x1gzxzeK5oA=";
+    buildMypyBoto3Package "comprehendmedical" "1.40.18"
+      "sha256-z/pN67x0vam1aGd+24ZJHSdOp04A/Di179ymtUw/61Q=";
 
   mypy-boto3-compute-optimizer =
     buildMypyBoto3Package "compute-optimizer" "1.40.0"

From 1d4054e622da72278473907531b0a14dcd37abcd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:16 +0200
Subject: [PATCH 3646/3724] python312Packages.mypy-boto3-connectparticipant:
 1.40.12 -> 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0b59862a2715..af40e2bd5013 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -354,8 +354,8 @@ rec {
       "sha256-dDHPNM+HVEIBXu9GFRtnnY+j5J31Z0gNfv/cd91QX4I=";
 
   mypy-boto3-connectparticipant =
-    buildMypyBoto3Package "connectparticipant" "1.40.12"
-      "sha256-b+0wJbc/LuPL7CmVy+E70eyfFepvhRN+ymAwECm/j7Q=";
+    buildMypyBoto3Package "connectparticipant" "1.40.18"
+      "sha256-FT+D1wlBL1dYus9PuLPxIxhj17WCg1nYqzT3dUn32+g=";
 
   mypy-boto3-controltower =
     buildMypyBoto3Package "controltower" "1.40.0"

From 2927cf718eb0bdf2214f9166b548db7f3f346aa9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:17 +0200
Subject: [PATCH 3647/3724] python312Packages.mypy-boto3-cur: 1.40.0 -> 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index af40e2bd5013..556af7dcc204 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -362,8 +362,8 @@ rec {
       "sha256-boRrDWiYtyKWUimJ7yb3uYPGSB/tmI2sEXNFacAPDic=";
 
   mypy-boto3-cur =
-    buildMypyBoto3Package "cur" "1.40.0"
-      "sha256-swFOOGB/iVP98EUOfTohHCxzrLNf1bnX/cbQWC83PVw=";
+    buildMypyBoto3Package "cur" "1.40.17"
+      "sha256-QRwEUkDj7S0/VuQrcwuPWqKnzXEN6NYUSakhT+9T2wk=";
 
   mypy-boto3-customer-profiles =
     buildMypyBoto3Package "customer-profiles" "1.40.0"

From a530fef6c758cc5d442fa8afdfd3f9be308f861a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:20 +0200
Subject: [PATCH 3648/3724] python312Packages.mypy-boto3-dax: 1.40.0 -> 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 556af7dcc204..cbcd4200e383 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -386,8 +386,8 @@ rec {
       "sha256-I5xvx5UCp1h2H1c2xI6mSI4ZaXsONs/09/BJfRXCr3A=";
 
   mypy-boto3-dax =
-    buildMypyBoto3Package "dax" "1.40.0"
-      "sha256-8WIQT3ZFLScp4zge1Cu5OkxeXS9GCCPdYlwJPwwz1GU=";
+    buildMypyBoto3Package "dax" "1.40.17"
+      "sha256-LjLWri3u0r973OARtntun5k18oNnKp2vUrEV8mkidbA=";
 
   mypy-boto3-detective =
     buildMypyBoto3Package "detective" "1.40.14"

From 472abf4f8518e8f69b9f622d97b3098e146d2098 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:22 +0200
Subject: [PATCH 3649/3724] python312Packages.mypy-boto3-devops-guru: 1.40.0 ->
 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index cbcd4200e383..e6b7817ad424 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -398,8 +398,8 @@ rec {
       "sha256-6v65flOExW7V8UfoyPaBcUQDYjhJ2jyuQpXMZW+ajCI=";
 
   mypy-boto3-devops-guru =
-    buildMypyBoto3Package "devops-guru" "1.40.0"
-      "sha256-aQR1CrCbisf0vApIjFXa5/oKC4Q1eT0AsLTg0EBojAs=";
+    buildMypyBoto3Package "devops-guru" "1.40.17"
+      "sha256-cDV8kPjBB3Mu5cqsAVsRjTk6KMozwEMHx/Fu0SRp5EQ=";
 
   mypy-boto3-directconnect =
     buildMypyBoto3Package "directconnect" "1.40.10"

From 13dcb6af0a7355be7d2ea0dfc8aa25dfac2dbf8b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:24 +0200
Subject: [PATCH 3650/3724] python312Packages.mypy-boto3-dlm: 1.40.0 -> 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e6b7817ad424..79eede621bbb 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -410,8 +410,8 @@ rec {
       "sha256-7B/r3hmwde2URQF3ztv3Ruva+0IPq2uNAoY4lAHga80=";
 
   mypy-boto3-dlm =
-    buildMypyBoto3Package "dlm" "1.40.0"
-      "sha256-t+aKxZaK2Zx6QQ2AmlCUpjXhFtcma+nOKMXF1bkRfBY=";
+    buildMypyBoto3Package "dlm" "1.40.18"
+      "sha256-Qx3IAePD2OHEnXHG3O2U1aRcH3Tf/6WUrjrn1uZXmwE=";
 
   mypy-boto3-dms =
     buildMypyBoto3Package "dms" "1.40.0"

From a7b38c21d609f0052327c69e22ea80f8dea5cb99 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:27 +0200
Subject: [PATCH 3651/3724] python312Packages.mypy-boto3-ec2: 1.40.13 ->
 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 79eede621bbb..fed95fe19437 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -446,8 +446,8 @@ rec {
       "sha256-jtkx0kbI7SB74U5uWyGdVhKMlsy/T82lz3P89k8LMPA=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.40.13"
-      "sha256-w9aG9S079qgjEZ5CJcOzROsYKEJVcPnZVMnvpYEag30=";
+    buildMypyBoto3Package "ec2" "1.40.18"
+      "sha256-kqtjsctmvaEQYlFd6oqLGKhvMrirEheBHuzkreZmO0E=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.40.0"

From 29045bfcc0a7a6a99c2466a29e959f288aeb7484 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:31 +0200
Subject: [PATCH 3652/3724] python312Packages.mypy-boto3-elastictranscoder:
 1.40.0 -> 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index fed95fe19437..9bfceea0535a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -486,8 +486,8 @@ rec {
       "sha256-TMfQt3rK4aT7DnlJCbJj7sFrDL9NqQc4kQS8sdTdDS0=";
 
   mypy-boto3-elastictranscoder =
-    buildMypyBoto3Package "elastictranscoder" "1.40.0"
-      "sha256-4xpjAgNDfYP3Z8uPxINsLOQ1vvanXW1/QDbUcZ57e0Y=";
+    buildMypyBoto3Package "elastictranscoder" "1.40.18"
+      "sha256-ObCzDvt0o59FXWw3bAh67Gh1QJNx7HjDEE0pMCcHkCs=";
 
   mypy-boto3-elb =
     buildMypyBoto3Package "elb" "1.40.16"

From 04a0c5be5ebddf8dcaa278d91cafb00bda878f45 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:33 +0200
Subject: [PATCH 3653/3724] python312Packages.mypy-boto3-emr-containers: 1.40.0
 -> 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 9bfceea0535a..2f987066fd36 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -502,8 +502,8 @@ rec {
       "sha256-crNaa6bqSP7fCsFV5CnAHazDpXrFkkb46ria2LWTDvY=";
 
   mypy-boto3-emr-containers =
-    buildMypyBoto3Package "emr-containers" "1.40.0"
-      "sha256-69FemTAsiAMYEcITc+5xrg+swrxgILdj3CwmgIIMi0c=";
+    buildMypyBoto3Package "emr-containers" "1.40.17"
+      "sha256-N/Ies7aPNaCwHsrCetlhVOnlkqLUe7LaVvjjnheTpfs=";
 
   mypy-boto3-emr-serverless =
     buildMypyBoto3Package "emr-serverless" "1.40.0"

From 655ec9175ef824ad7a0d2c560c5f984f8376bf71 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:35 +0200
Subject: [PATCH 3654/3724] python312Packages.mypy-boto3-finspace: 1.40.0 ->
 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2f987066fd36..1b310b3d2dee 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -526,8 +526,8 @@ rec {
       "sha256-pqXtqKztmI4gOfyvwgjNg0MShL/RPwVQhdcHHGlw7Qk=";
 
   mypy-boto3-finspace =
-    buildMypyBoto3Package "finspace" "1.40.0"
-      "sha256-rIdTU3A6jN0cpn6kQE0nPSqjYPqXUF2yyjMuvpnejpE=";
+    buildMypyBoto3Package "finspace" "1.40.18"
+      "sha256-jB4Yb1hX9P8bhY0cprew6S1VgG4G/IVo3OlGuAojQ38=";
 
   mypy-boto3-finspace-data =
     buildMypyBoto3Package "finspace-data" "1.40.0"

From 2b1d53015a3916e098a19891f5ced8ab5eced780 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:36 +0200
Subject: [PATCH 3655/3724] python312Packages.mypy-boto3-finspace-data: 1.40.0
 -> 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1b310b3d2dee..3ea99ad7323b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -530,8 +530,8 @@ rec {
       "sha256-jB4Yb1hX9P8bhY0cprew6S1VgG4G/IVo3OlGuAojQ38=";
 
   mypy-boto3-finspace-data =
-    buildMypyBoto3Package "finspace-data" "1.40.0"
-      "sha256-jX1fYURsKptrn7rtyoekqvS81P42GiW5J7kS9aKw1c0=";
+    buildMypyBoto3Package "finspace-data" "1.40.17"
+      "sha256-fePfBO2KWcMACejuSer80O2LCEuwh/pjA6wkEpUL9os=";
 
   mypy-boto3-firehose =
     buildMypyBoto3Package "firehose" "1.40.0"

From 74a8fe4c645d4f318c79c5846d29d88cb7d6a367 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:39 +0200
Subject: [PATCH 3656/3724] python312Packages.mypy-boto3-forecast: 1.40.0 ->
 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3ea99ad7323b..97a31e604dc8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -546,8 +546,8 @@ rec {
       "sha256-sTuTQ3ADgiApY0davzOBHz+jz21tp2C4L7Kq6j8dUvY=";
 
   mypy-boto3-forecast =
-    buildMypyBoto3Package "forecast" "1.40.0"
-      "sha256-mo2xp2XnApilK6zB+KZLt/KcJ6mTPskjidfZ0ju6Xss=";
+    buildMypyBoto3Package "forecast" "1.40.17"
+      "sha256-PMEWvzCP8gTKwsV9oIjqIB7jIMDZDjLqdPO/G7nnfDc=";
 
   mypy-boto3-forecastquery =
     buildMypyBoto3Package "forecastquery" "1.40.15"

From b17ee9d56fb2f8b6e42d6c2e75e0f67c6fb1ee1f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:42 +0200
Subject: [PATCH 3657/3724] python312Packages.mypy-boto3-glacier: 1.40.0 ->
 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 97a31e604dc8..517125812f51 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -566,8 +566,8 @@ rec {
       "sha256-KgMMWys21dHhDP9kQjxPeQtJBWfiOeSCtwuE9FIAzk8=";
 
   mypy-boto3-glacier =
-    buildMypyBoto3Package "glacier" "1.40.0"
-      "sha256-NBSrlhycsJqCgbiitfNmSAGcTPgZfkfx5DGm8ZhrRyc=";
+    buildMypyBoto3Package "glacier" "1.40.18"
+      "sha256-lEYmHnV9ADvj1BqZEeEBakiPLkfFNg4eUjx/ByEnrLQ=";
 
   mypy-boto3-globalaccelerator =
     buildMypyBoto3Package "globalaccelerator" "1.40.0"

From 4f7e53fb88bec08c8c43c7055e8e963f827690f1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:43 +0200
Subject: [PATCH 3658/3724] python312Packages.mypy-boto3-globalaccelerator:
 1.40.0 -> 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 517125812f51..37b580b87bdc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -570,8 +570,8 @@ rec {
       "sha256-lEYmHnV9ADvj1BqZEeEBakiPLkfFNg4eUjx/ByEnrLQ=";
 
   mypy-boto3-globalaccelerator =
-    buildMypyBoto3Package "globalaccelerator" "1.40.0"
-      "sha256-So/NDL0KF5iypLYitnJ/38C5RovqBGXcUhHtlEMnjMM=";
+    buildMypyBoto3Package "globalaccelerator" "1.40.18"
+      "sha256-DS2Bb39wrP+k2H2oxkm13WzRyF6cX96P0JgF2OXAdMA=";
 
   mypy-boto3-glue =
     buildMypyBoto3Package "glue" "1.40.15"

From ded61f3277808485890d2082c98aaccbd474f98a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:45 +0200
Subject: [PATCH 3659/3724] python312Packages.mypy-boto3-greengrass: 1.40.0 ->
 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 37b580b87bdc..ab5bea2f2d52 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -581,8 +581,8 @@ rec {
       "sha256-KQqyk9PFUttzDrZW7viev8xbumdud05EBdNoxz//hEY=";
 
   mypy-boto3-greengrass =
-    buildMypyBoto3Package "greengrass" "1.40.0"
-      "sha256-LjQRVGdaDoTkLT+FRRt5adFZhzrjV+q2s9HyBrR0pdQ=";
+    buildMypyBoto3Package "greengrass" "1.40.18"
+      "sha256-2LlUVjYGni7omje8tlvAJNkKDVSbVIF4mnUNzb01lUQ=";
 
   mypy-boto3-greengrassv2 =
     buildMypyBoto3Package "greengrassv2" "1.40.15"

From f0d6ae53d22811ef97d7009a2d45f247844e2ba6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:47 +0200
Subject: [PATCH 3660/3724] python312Packages.mypy-boto3-identitystore: 1.40.0
 -> 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ab5bea2f2d52..65e8878eb6fb 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -609,8 +609,8 @@ rec {
       "sha256-uQCsVXN1Qo8LvDeqJP3SkB4ttwGK5E4Kr5nsD4SijUQ=";
 
   mypy-boto3-identitystore =
-    buildMypyBoto3Package "identitystore" "1.40.0"
-      "sha256-RLcGOVDiwryD6xf9E6lWSdAAIKCP4hNaBQknjbwPAuQ=";
+    buildMypyBoto3Package "identitystore" "1.40.18"
+      "sha256-nOj8fkesQ6iVsoLwa/29LYl9X16UUL13k7M2rTEln0U=";
 
   mypy-boto3-imagebuilder =
     buildMypyBoto3Package "imagebuilder" "1.40.0"

From 340190e07cadf2b6f4d8dc8ff7e53b76d875a2c6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:49 +0200
Subject: [PATCH 3661/3724] python312Packages.mypy-boto3-imagebuilder: 1.40.0
 -> 1.40.18

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 65e8878eb6fb..a77c520b31c6 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -613,8 +613,8 @@ rec {
       "sha256-nOj8fkesQ6iVsoLwa/29LYl9X16UUL13k7M2rTEln0U=";
 
   mypy-boto3-imagebuilder =
-    buildMypyBoto3Package "imagebuilder" "1.40.0"
-      "sha256-Mcp5NCJal9YyJ9bQN9q/M0E/pXvXiDlLGvAqpCo2xLs=";
+    buildMypyBoto3Package "imagebuilder" "1.40.18"
+      "sha256-ESRTEa4C5wrITcd1KyZNVP8fUEgumSoQVpWDnoJz7lc=";
 
   mypy-boto3-importexport =
     buildMypyBoto3Package "importexport" "1.40.0"

From 28901009255d259c606b7f39f45df409ed28552d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:53 +0200
Subject: [PATCH 3662/3724] python312Packages.mypy-boto3-iotfleethub: 1.40.0 ->
 1.40.17

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a77c520b31c6..0a48666d69b5 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -669,8 +669,8 @@ rec {
       "sha256-CIr9UTs6qHRvEWrlHLooTOYzFKaWA+BwG/N8Fp+XTJg=";
 
   mypy-boto3-iotfleethub =
-    buildMypyBoto3Package "iotfleethub" "1.40.0"
-      "sha256-U2nCifkYupb+DcMn8JjPUM+dCROsyyZGukChsaDNROE=";
+    buildMypyBoto3Package "iotfleethub" "1.40.17"
+      "sha256-SeJi6Z/TJAiqL6+21CMP6iZF/Skv1hnmldPrJpOHUfo=";
 
   mypy-boto3-iotfleetwise =
     buildMypyBoto3Package "iotfleetwise" "1.40.0"

From 4fe22385e15b39cdb9ef897d4c8afab0a815ee65 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:54 +0200
Subject: [PATCH 3663/3724] python312Packages.mypy-boto3-iotsecuretunneling:
 1.40.0 -> 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0a48666d69b5..b1220715aaa3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -677,8 +677,8 @@ rec {
       "sha256-PER1D68w6wBvHUH5CGEn4H1zku92vhcwWDFRpoXZlmg=";
 
   mypy-boto3-iotsecuretunneling =
-    buildMypyBoto3Package "iotsecuretunneling" "1.40.0"
-      "sha256-E1l57KrYP3ggjLVj94kzBB85CFF7HtldUMHGZP7aUEo=";
+    buildMypyBoto3Package "iotsecuretunneling" "1.40.18"
+      "sha256-AS7G6I5JR2tkq1m+cx+9PFaIhe7QwWH0DF/7vuIY+zQ=";
 
   mypy-boto3-iotsitewise =
     buildMypyBoto3Package "iotsitewise" "1.40.2"

From e411999bc0fba9ed68a87bc3f50e682c3876a7b4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:57 +0200
Subject: [PATCH 3664/3724] python312Packages.mypy-boto3-kafka: 1.40.0 ->
 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b1220715aaa3..ecf49aa21ff4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -709,8 +709,8 @@ rec {
       "sha256-mtWPF8wmFGLC0PqkKX/UiYT6/VG7FfgrbsqTqRIOgsA=";
 
   mypy-boto3-kafka =
-    buildMypyBoto3Package "kafka" "1.40.0"
-      "sha256-6gXpZ/pjG8O2LB7Ct4gC21B/R/32w1lJi1r1tdqkmKo=";
+    buildMypyBoto3Package "kafka" "1.40.18"
+      "sha256-vO3AdbglCEhMr8YfBqcTBMP0hE65wkPnnWlW0C9m0So=";
 
   mypy-boto3-kafkaconnect =
     buildMypyBoto3Package "kafkaconnect" "1.40.0"

From 438a6a26f126e944d1e48d00bb839a78cb0c9ade Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:46:58 +0200
Subject: [PATCH 3665/3724] python312Packages.mypy-boto3-kendra: 1.40.0 ->
 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ecf49aa21ff4..d160908fadc8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -717,8 +717,8 @@ rec {
       "sha256-4wNbhuNsLwrYemkPuadR6oeaCuSajU5IwCb0En89M3U=";
 
   mypy-boto3-kendra =
-    buildMypyBoto3Package "kendra" "1.40.0"
-      "sha256-i5CJ9t2W/EE4/b1jIPqRR3DjIVWSSV/KSYSM+wMc944=";
+    buildMypyBoto3Package "kendra" "1.40.17"
+      "sha256-IOj6WGiMgCtbLlZ+AHvSAYZFYLxBiXWUA1VKDPBBe+Y=";
 
   mypy-boto3-kendra-ranking =
     buildMypyBoto3Package "kendra-ranking" "1.40.0"

From 5b32baa8b899f9fed1504c9a947e48f327e640db Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:00 +0200
Subject: [PATCH 3666/3724] 
 python312Packages.mypy-boto3-kinesis-video-archived-media: 1.40.0 -> 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d160908fadc8..62f8f915e8aa 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -733,8 +733,8 @@ rec {
       "sha256-T3T3FeI6jc4GK0D2pPL/ECPOxvQbRSHwvBVnmIOn5o4=";
 
   mypy-boto3-kinesis-video-archived-media =
-    buildMypyBoto3Package "kinesis-video-archived-media" "1.40.0"
-      "sha256-ihfxiVg/T3QS4NaL3eE5KB9KqLQO4aUIF76LfIPnOmU=";
+    buildMypyBoto3Package "kinesis-video-archived-media" "1.40.17"
+      "sha256-wKaV5LpNWviCW+R1kiEEUdi91BE42Q5/fdq7FpqkGaM=";
 
   mypy-boto3-kinesis-video-media =
     buildMypyBoto3Package "kinesis-video-media" "1.40.0"

From 07fd147b7bdfd057a4b7e297729f4dca20ca2d5a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:02 +0200
Subject: [PATCH 3667/3724] python312Packages.mypy-boto3-kinesisanalytics:
 1.40.0 -> 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 62f8f915e8aa..507b2506ba99 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -749,8 +749,8 @@ rec {
       "sha256-cnUWkJfPyd7G9ClFFWNXHFwuSqmTcUHwluPBeF4qO8o=";
 
   mypy-boto3-kinesisanalytics =
-    buildMypyBoto3Package "kinesisanalytics" "1.40.0"
-      "sha256-92xYlrd3Q31HrOvJ1dOB/F2zM+CyldYvZBYbHZaOtIw=";
+    buildMypyBoto3Package "kinesisanalytics" "1.40.17"
+      "sha256-OU9dcphpwEqoTDleItqOluVxpu73KbWUU3bwflXKO9M=";
 
   mypy-boto3-kinesisanalyticsv2 =
     buildMypyBoto3Package "kinesisanalyticsv2" "1.40.14"

From e629b5eed1720bd4c632c3d4edd015f5ad58214c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:05 +0200
Subject: [PATCH 3668/3724] python312Packages.mypy-boto3-lex-runtime: 1.40.0 ->
 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 507b2506ba99..c1ad3fcaf47d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -777,8 +777,8 @@ rec {
       "sha256-OjITjvhbdqBc9CMvaWzyIu+ObFiTF2tfSpsQ93W+sBw=";
 
   mypy-boto3-lex-runtime =
-    buildMypyBoto3Package "lex-runtime" "1.40.0"
-      "sha256-doynFbb8iYiH/J7+ORecp8z0/PFJjxlnHcq96+iqHV0=";
+    buildMypyBoto3Package "lex-runtime" "1.40.17"
+      "sha256-Bt0APaVZxgwASjYTMUctwbsb7u2ZFOf5a3UlComKWxs=";
 
   mypy-boto3-lexv2-models =
     buildMypyBoto3Package "lexv2-models" "1.40.0"

From 29a01015bcc1c4ff4e867529f30609294c169944 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:07 +0200
Subject: [PATCH 3669/3724] python312Packages.mypy-boto3-lookoutequipment:
 1.40.0 -> 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c1ad3fcaf47d..742b57b25e5c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -813,8 +813,8 @@ rec {
       "sha256-eAZIggxP6MJFOjmoBERDQ1tJafaeo5zlOLpbIiXP1RM=";
 
   mypy-boto3-lookoutequipment =
-    buildMypyBoto3Package "lookoutequipment" "1.40.0"
-      "sha256-REAeA7qKwik8cKk9WZoOcG2uZLtFFKr4jTRdAu902bs=";
+    buildMypyBoto3Package "lookoutequipment" "1.40.17"
+      "sha256-ttDzy2rDfDeiBre/iuZ4Na9f3UtHb0GZw9ocXSGmEhE=";
 
   mypy-boto3-lookoutmetrics =
     buildMypyBoto3Package "lookoutmetrics" "1.40.15"

From 818eac6e9e77672610d8f3ccf0269b61455c632a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:09 +0200
Subject: [PATCH 3670/3724] python312Packages.mypy-boto3-lookoutvision: 1.40.0
 -> 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 742b57b25e5c..5956f6e024e7 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -821,8 +821,8 @@ rec {
       "sha256-ZcL1sZGlckqZFhCqTZwMeghP8K9Hee1Zi3N6wZb9hts=";
 
   mypy-boto3-lookoutvision =
-    buildMypyBoto3Package "lookoutvision" "1.40.0"
-      "sha256-KPOBiptOCywHx3+Uj6GJvZzVaJ2oEirfQXEbiI6iicE=";
+    buildMypyBoto3Package "lookoutvision" "1.40.18"
+      "sha256-DKGXLR3lVek8IHAolI372LKc5YFy1o40DUVxp+xc1ww=";
 
   mypy-boto3-m2 =
     buildMypyBoto3Package "m2" "1.40.0"

From 9d6d28f617e0b498a2dac7c9a6def0c3271148c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:12 +0200
Subject: [PATCH 3671/3724] python312Packages.mypy-boto3-mediaconvert: 1.40.0
 -> 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5956f6e024e7..1672505e368e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -861,8 +861,8 @@ rec {
       "sha256-8EUTmbFAFXO724bxmzxa2RoovG9L6mm1dxbNupbKKRQ=";
 
   mypy-boto3-mediaconvert =
-    buildMypyBoto3Package "mediaconvert" "1.40.0"
-      "sha256-DJEU4Ha8jpV/J8UP6emYMjcv9RfZt1njsBPD11q0BUI=";
+    buildMypyBoto3Package "mediaconvert" "1.40.17"
+      "sha256-L2/TEQbnd60RuCaqpNI/xyQ76AqbIUe5KWwZtSf+2I8=";
 
   mypy-boto3-medialive =
     buildMypyBoto3Package "medialive" "1.40.16"

From 67035a02aa5f41f3665805beefaedacd3b12669e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:14 +0200
Subject: [PATCH 3672/3724] python312Packages.mypy-boto3-mediapackage-vod:
 1.40.0 -> 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1672505e368e..b671a9ee9b5a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -873,8 +873,8 @@ rec {
       "sha256-HMPme3zTPKCGRHUhRXgw83o0UV+Frz25+0eOEB9cDdA=";
 
   mypy-boto3-mediapackage-vod =
-    buildMypyBoto3Package "mediapackage-vod" "1.40.0"
-      "sha256-2Y/oFyKN9+k6nbRE3jGuvxPYkG8ts/teruqNbopSn6c=";
+    buildMypyBoto3Package "mediapackage-vod" "1.40.17"
+      "sha256-T3Ba5a0ogaaNqOs93jww/OT2UgHZzy9k6YGpkN9DlYY=";
 
   mypy-boto3-mediapackagev2 =
     buildMypyBoto3Package "mediapackagev2" "1.40.0"

From 6fb6574fa62d6cb3c89a521acc21c6f92bb43637 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:15 +0200
Subject: [PATCH 3673/3724] python312Packages.mypy-boto3-mediastore: 1.40.0 ->
 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b671a9ee9b5a..5d8093163309 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -881,8 +881,8 @@ rec {
       "sha256-NRpCHPEXgFazLRtyvzkztliGFtm2eIq4b1CVNaxIXQ0=";
 
   mypy-boto3-mediastore =
-    buildMypyBoto3Package "mediastore" "1.40.0"
-      "sha256-+dq2mYkfUZ8nlcWHQ65ENLLTxxX4X4n4lOniFdqxAXM=";
+    buildMypyBoto3Package "mediastore" "1.40.17"
+      "sha256-YCFhcxgtQvf9MhwzCHqjGPX666dv35lkTLhxp4wGog0=";
 
   mypy-boto3-mediastore-data =
     buildMypyBoto3Package "mediastore-data" "1.40.0"

From c38f9a67e36a767bf8dea71583aed0f8b218dba5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:17 +0200
Subject: [PATCH 3674/3724] python312Packages.mypy-boto3-mgh: 1.40.0 -> 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5d8093163309..b57ac2531211 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -905,8 +905,8 @@ rec {
       "sha256-wbPakhKKDtNY6y84jzqJQlP7IiG5QAKQTRsYP/tndV8=";
 
   mypy-boto3-mgh =
-    buildMypyBoto3Package "mgh" "1.40.0"
-      "sha256-/LncQEw5kVzE7LcoSgN58zOQU53fRAuN5bIsl/yiJZE=";
+    buildMypyBoto3Package "mgh" "1.40.18"
+      "sha256-6PlBNNCfxt4MLqmDPM6icIyutPGyXd54AWKHxCTQ024=";
 
   mypy-boto3-mgn =
     buildMypyBoto3Package "mgn" "1.40.0"

From 2c9a9ac19c760f22a7d333d3addc14fe737eb567 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:19 +0200
Subject: [PATCH 3675/3724] 
 python312Packages.mypy-boto3-migration-hub-refactor-spaces: 1.40.0 -> 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b57ac2531211..c6e50a86c5d0 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -913,8 +913,8 @@ rec {
       "sha256-XyB7/8zj4pU/+cxqhEf2WMoBoo/J12lOrlL0WD2Nhic=";
 
   mypy-boto3-migration-hub-refactor-spaces =
-    buildMypyBoto3Package "migration-hub-refactor-spaces" "1.40.0"
-      "sha256-bpQyqX1kM5G9uRICoPo21pW3EyGh9wDHZskJgaB2qQs=";
+    buildMypyBoto3Package "migration-hub-refactor-spaces" "1.40.18"
+      "sha256-SVy3+tok3qsJv76TiaOIPVSnJiGxfuPgAYT+bi3Kxss=";
 
   mypy-boto3-migrationhub-config =
     buildMypyBoto3Package "migrationhub-config" "1.40.0"

From d7f8a7102df2f2e4d2533d6d60e38e3ed6e75baf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:21 +0200
Subject: [PATCH 3676/3724] python312Packages.mypy-boto3-mq: 1.40.0 -> 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c6e50a86c5d0..eb83c5bd3366 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -929,8 +929,8 @@ rec {
       "sha256-G+Kn0K9lI24r/A+KBOE2euh+raKIystZ7uB2k9AD/Zg=";
 
   mypy-boto3-mq =
-    buildMypyBoto3Package "mq" "1.40.0"
-      "sha256-ve5QGD9F3ulZ1H2IGMmjHEGsj9+kvcHtNVly334pXIA=";
+    buildMypyBoto3Package "mq" "1.40.18"
+      "sha256-uLNYxXfiAMVzHOk0NXCer6cR3aBI+CdHCoUEANqFBUw=";
 
   mypy-boto3-mturk =
     buildMypyBoto3Package "mturk" "1.40.0"

From 5cd542a0afb5af900ea6f38d50a945d61f414389 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:27 +0200
Subject: [PATCH 3677/3724] python312Packages.mypy-boto3-personalize-events:
 1.40.0 -> 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index eb83c5bd3366..e3f3d898028d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1017,8 +1017,8 @@ rec {
       "sha256-uCJkg08AHfWeSnMQo9Y9/oGwxb6+p7kAZQbTGszv3Os=";
 
   mypy-boto3-personalize-events =
-    buildMypyBoto3Package "personalize-events" "1.40.0"
-      "sha256-mFjiZCTx39BpnVDJkjoHnOKKvctZXoVelDXMG6kznyY=";
+    buildMypyBoto3Package "personalize-events" "1.40.18"
+      "sha256-ot000kDzq6Dle+9d9EWXHM7kLIzA4Se7X1w24dEhLVg=";
 
   mypy-boto3-personalize-runtime =
     buildMypyBoto3Package "personalize-runtime" "1.40.0"

From dc5e5a14b074d2957912b15ac9665e122a2651cb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:28 +0200
Subject: [PATCH 3678/3724] python312Packages.mypy-boto3-personalize-runtime:
 1.40.0 -> 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e3f3d898028d..d0684cc9f124 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1021,8 +1021,8 @@ rec {
       "sha256-ot000kDzq6Dle+9d9EWXHM7kLIzA4Se7X1w24dEhLVg=";
 
   mypy-boto3-personalize-runtime =
-    buildMypyBoto3Package "personalize-runtime" "1.40.0"
-      "sha256-lcLdLz14tQ3KTUngLTQ4iYOWjJTdquoItqKRBdf4ZqU=";
+    buildMypyBoto3Package "personalize-runtime" "1.40.17"
+      "sha256-If4bUVxIhJNXlW0i3ojv5hVDX5YoCqA0PjzcLbtc1q4=";
 
   mypy-boto3-pi =
     buildMypyBoto3Package "pi" "1.40.0"

From 1a9f126c913244d62d3f79d8f230b2bd5493f756 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:29 +0200
Subject: [PATCH 3679/3724] python312Packages.mypy-boto3-pinpoint: 1.40.0 ->
 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d0684cc9f124..243c1b9e0a8d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1029,8 +1029,8 @@ rec {
       "sha256-cOQUbgRJXVYYlT4Raormux73YtBHOMnTOZu7F9rj9iY=";
 
   mypy-boto3-pinpoint =
-    buildMypyBoto3Package "pinpoint" "1.40.0"
-      "sha256-7H0lySCszWZpr7YeyGS0nfUeKZX51vf6ILPtHnltHsA=";
+    buildMypyBoto3Package "pinpoint" "1.40.18"
+      "sha256-zhekW0Dk58LRUfyVd6slsy3tKu31j/cGEYfkvpLrmnA=";
 
   mypy-boto3-pinpoint-email =
     buildMypyBoto3Package "pinpoint-email" "1.40.15"

From 45a864a160f27743767756934db1b19d53f75c4f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:33 +0200
Subject: [PATCH 3680/3724] python312Packages.mypy-boto3-ram: 1.40.0 -> 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 243c1b9e0a8d..2ba58b640599 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1077,8 +1077,8 @@ rec {
       "sha256-scnIRamymMIBSKcHFhxnxDASqjOQvVm9ywAivUYWN6s=";
 
   mypy-boto3-ram =
-    buildMypyBoto3Package "ram" "1.40.0"
-      "sha256-8EfTTXMgOylxEKDit+NPXUaS2VmurnOFwz8fBfByz5I=";
+    buildMypyBoto3Package "ram" "1.40.18"
+      "sha256-eguBtTttYrCcdQ1HYyy7zNVXqVkBbG59aHwzgiV1PwY=";
 
   mypy-boto3-rbin =
     buildMypyBoto3Package "rbin" "1.40.0"

From 8ec79b515799dd0eb33a24f34c966557b72fa4ae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:34 +0200
Subject: [PATCH 3681/3724] python312Packages.mypy-boto3-rbin: 1.40.0 ->
 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2ba58b640599..87a56e7c915b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1081,8 +1081,8 @@ rec {
       "sha256-eguBtTttYrCcdQ1HYyy7zNVXqVkBbG59aHwzgiV1PwY=";
 
   mypy-boto3-rbin =
-    buildMypyBoto3Package "rbin" "1.40.0"
-      "sha256-1yLtNpzjAZzF2L87OvTsXN7VhwyQt3KA1YpRxPPjNG8=";
+    buildMypyBoto3Package "rbin" "1.40.18"
+      "sha256-zye0xv5P6GemZiH+T/cIyzx9qaeOKitEWpW6LOkc8KM=";
 
   mypy-boto3-rds =
     buildMypyBoto3Package "rds" "1.40.16"

From b84f17151fe2dae2b71e5c0f15ea5ce5e0fb72d0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:37 +0200
Subject: [PATCH 3682/3724] 
 python312Packages.mypy-boto3-resourcegroupstaggingapi: 1.40.0 -> 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 87a56e7c915b..bab46cceca4e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1121,8 +1121,8 @@ rec {
       "sha256-q6SqqJEsDrQfjYpiFp1S2+CnAjKUW+wBsLVSjYng9ZE=";
 
   mypy-boto3-resourcegroupstaggingapi =
-    buildMypyBoto3Package "resourcegroupstaggingapi" "1.40.0"
-      "sha256-NRNWvFj3jb7EdKqUEhGXH2zVetFn+GcdokZJQ6JMsUk=";
+    buildMypyBoto3Package "resourcegroupstaggingapi" "1.40.17"
+      "sha256-y80XkJoge5ED3oj4562wlG8GaXcCzTI8It58RW+skRQ=";
 
   mypy-boto3-robomaker =
     buildMypyBoto3Package "robomaker" "1.40.0"

From bf60f49403c830ade3644b4e860c0746fcee811a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:39 +0200
Subject: [PATCH 3683/3724] 
 python312Packages.mypy-boto3-route53-recovery-cluster: 1.40.0 -> 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index bab46cceca4e..2ad2b0479368 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1137,8 +1137,8 @@ rec {
       "sha256-7cIfnpdrNUByompkx6sncBpYl/s4pFbwUFmHfvg07Qw=";
 
   mypy-boto3-route53-recovery-cluster =
-    buildMypyBoto3Package "route53-recovery-cluster" "1.40.0"
-      "sha256-bl9tBA5QmntHCYMcYhLW8N8w+oTTStr33J5C8kbXnZs=";
+    buildMypyBoto3Package "route53-recovery-cluster" "1.40.18"
+      "sha256-2eARoNdjICq+9/NDLcgCikBIQV9WNDb8UUKGtfJA6Yw=";
 
   mypy-boto3-route53-recovery-control-config =
     buildMypyBoto3Package "route53-recovery-control-config" "1.40.14"

From deab96ead56653ab74af7fccdf8e3e2cd01c00d4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:43 +0200
Subject: [PATCH 3684/3724] python312Packages.mypy-boto3-sagemaker-edge: 1.40.0
 -> 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2ad2b0479368..913ace510c3a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1181,8 +1181,8 @@ rec {
       "sha256-Mab/cO02qbhVylLWHL4aGfgMArujecXpsOgfMG7OLTk=";
 
   mypy-boto3-sagemaker-edge =
-    buildMypyBoto3Package "sagemaker-edge" "1.40.0"
-      "sha256-yvZGGSA7RDJm5fOWuOSeyRqz5rpE0E0b4r8nZCVt6Yo=";
+    buildMypyBoto3Package "sagemaker-edge" "1.40.17"
+      "sha256-ZhD8T6Mp5M3Kofd462vX3HsEbazpYFOf1HJ3L9xUhGU=";
 
   mypy-boto3-sagemaker-featurestore-runtime =
     buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.40.0"

From af4ca32ab89faaffc447cc319e6a87da7746b55b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:44 +0200
Subject: [PATCH 3685/3724] 
 python312Packages.mypy-boto3-sagemaker-featurestore-runtime: 1.40.0 ->
 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 913ace510c3a..77c1b72dfdee 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1185,8 +1185,8 @@ rec {
       "sha256-ZhD8T6Mp5M3Kofd462vX3HsEbazpYFOf1HJ3L9xUhGU=";
 
   mypy-boto3-sagemaker-featurestore-runtime =
-    buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.40.0"
-      "sha256-Cw9b4qPE2cPyHovEP7Bs5/uOF7p6O+Kv4B5ORStjQh0=";
+    buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.40.17"
+      "sha256-p3zQ7rWP78gg2bBYdpGgVi2f771qZk+jwwxBcoQJwjk=";
 
   mypy-boto3-sagemaker-geospatial =
     buildMypyBoto3Package "sagemaker-geospatial" "1.40.0"

From 220a574065bbd1344726927c6d58479ac21cdc1f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:45 +0200
Subject: [PATCH 3686/3724] python312Packages.mypy-boto3-sagemaker-geospatial:
 1.40.0 -> 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 77c1b72dfdee..a4df48da14c3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1189,8 +1189,8 @@ rec {
       "sha256-p3zQ7rWP78gg2bBYdpGgVi2f771qZk+jwwxBcoQJwjk=";
 
   mypy-boto3-sagemaker-geospatial =
-    buildMypyBoto3Package "sagemaker-geospatial" "1.40.0"
-      "sha256-PHz//7ffPnSUAdLUj5CzjtbJ4XYvXY8/7hi/7HZ4RWg=";
+    buildMypyBoto3Package "sagemaker-geospatial" "1.40.18"
+      "sha256-yzqISXyDj1FhqTvct8hc+1L1Iutnq29hSGnPAarBE+M=";
 
   mypy-boto3-sagemaker-metrics =
     buildMypyBoto3Package "sagemaker-metrics" "1.40.0"

From 2933f5aabef3e0cbec09ff74c513e66be3ca646a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:46 +0200
Subject: [PATCH 3687/3724] python312Packages.mypy-boto3-sagemaker-runtime:
 1.40.0 -> 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a4df48da14c3..02d2c66dbec4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1197,8 +1197,8 @@ rec {
       "sha256-ad7DooARgF8aOpOkvMnUig/zHHARPZe8Y6fkervBGUU=";
 
   mypy-boto3-sagemaker-runtime =
-    buildMypyBoto3Package "sagemaker-runtime" "1.40.0"
-      "sha256-gorL6w+a2l5yrVGBy+zOlINjmH77BdymsIxj8YWYio0=";
+    buildMypyBoto3Package "sagemaker-runtime" "1.40.17"
+      "sha256-NuIRRV2eq/OSMyeqKuZXGFfjzGQpX41Gx5Tv9l/2jOo=";
 
   mypy-boto3-savingsplans =
     buildMypyBoto3Package "savingsplans" "1.40.0"

From 4e45a07d1b7c0fd1680ac333d7667a4103c06954 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:49 +0200
Subject: [PATCH 3688/3724] python312Packages.mypy-boto3-serverlessrepo: 1.40.0
 -> 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 02d2c66dbec4..a91cda85c63e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1229,8 +1229,8 @@ rec {
       "sha256-DrmDjFx8N9pqL2tikWd1PD0qvBX2oI2Y9+WiDvAlOgE=";
 
   mypy-boto3-serverlessrepo =
-    buildMypyBoto3Package "serverlessrepo" "1.40.0"
-      "sha256-E5QNOEIq54TLCtsqCZg1mIFVnk7/kzvLf/K9vhuOzMY=";
+    buildMypyBoto3Package "serverlessrepo" "1.40.17"
+      "sha256-1YK+zUZhTf37giAyXYuZDJ8Gmg4LUZO1FwaAGViIXos=";
 
   mypy-boto3-service-quotas =
     buildMypyBoto3Package "service-quotas" "1.40.0"

From 833bfbe01f21b54044fe082ba2f33aab78fdf362 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:51 +0200
Subject: [PATCH 3689/3724] 
 python312Packages.mypy-boto3-servicecatalog-appregistry: 1.40.0 -> 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a91cda85c63e..242ace89a0e1 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1241,8 +1241,8 @@ rec {
       "sha256-NQpBAN1iSAgS0TcKWe8GURwxKVdjmslcfkpF8rEL3G4=";
 
   mypy-boto3-servicecatalog-appregistry =
-    buildMypyBoto3Package "servicecatalog-appregistry" "1.40.0"
-      "sha256-ET2prHzHi0EBkWB9MlmdudaaJhay5in5+rdUF0T6veE=";
+    buildMypyBoto3Package "servicecatalog-appregistry" "1.40.18"
+      "sha256-0UIIVr2CmQYi6QefrbpCvPvBUaw/fIyzZY6RuWWIwn4=";
 
   mypy-boto3-servicediscovery =
     buildMypyBoto3Package "servicediscovery" "1.40.10"

From a183d986db30650b68a8fd5c8cfcfccca6a7821d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:54 +0200
Subject: [PATCH 3690/3724] python312Packages.mypy-boto3-shield: 1.40.0 ->
 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 242ace89a0e1..5d4059a4069a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1257,8 +1257,8 @@ rec {
       "sha256-aGK44+fTKwT+5o4bcqz1GvOm/9gpP3oX82Eta/uXc8w=";
 
   mypy-boto3-shield =
-    buildMypyBoto3Package "shield" "1.40.0"
-      "sha256-nwgaSaqi1PebG4PEco7o6J0bX28+NpVbYiA+SXk2Or8=";
+    buildMypyBoto3Package "shield" "1.40.17"
+      "sha256-nQ2tvjrYiAvx/NH7u0F+Ys15hYfQz4sVERpw9IH2RQQ=";
 
   mypy-boto3-signer =
     buildMypyBoto3Package "signer" "1.40.0"

From 3db51c82b43d83a50a0d4dd77a91b3143dd049ba Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:55 +0200
Subject: [PATCH 3691/3724] python312Packages.mypy-boto3-signer: 1.40.0 ->
 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5d4059a4069a..c35103a94ccf 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1261,8 +1261,8 @@ rec {
       "sha256-nQ2tvjrYiAvx/NH7u0F+Ys15hYfQz4sVERpw9IH2RQQ=";
 
   mypy-boto3-signer =
-    buildMypyBoto3Package "signer" "1.40.0"
-      "sha256-S77EdSxEfJn5CzxzBWjxzSY1zttBnS/pPQ2NWKFQM6k=";
+    buildMypyBoto3Package "signer" "1.40.18"
+      "sha256-1SQFGuDDU8MkciZtGjkLhY0zFyIPkwvgYXJLoYEK1oI=";
 
   mypy-boto3-simspaceweaver =
     buildMypyBoto3Package "simspaceweaver" "1.40.16"

From 7309b9e16d3f063cf8c42df487dd6706cb546dd9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:57 +0200
Subject: [PATCH 3692/3724] python312Packages.mypy-boto3-snowball: 1.40.0 ->
 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c35103a94ccf..ed82b55811c6 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1281,8 +1281,8 @@ rec {
       "sha256-nz8mCT3F3TnU/SmO9BAyJ/Q0/ghxUhTZCgHsXHaX8+M=";
 
   mypy-boto3-snowball =
-    buildMypyBoto3Package "snowball" "1.40.0"
-      "sha256-7UFz5HOt4iKYrd25ODXrrs6OI4bMZbxS7uE++psmn5U=";
+    buildMypyBoto3Package "snowball" "1.40.17"
+      "sha256-MVXzb+7NvziTkEQuuo3GQdoHrrnL9859f0i07qQGnYc=";
 
   mypy-boto3-sns =
     buildMypyBoto3Package "sns" "1.40.1"

From 34c36dcf2829093694b09d003595eec75bb0aac5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:47:59 +0200
Subject: [PATCH 3693/3724] python312Packages.mypy-boto3-sqs: 1.40.0 -> 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ed82b55811c6..3212ac18cb9e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1289,8 +1289,8 @@ rec {
       "sha256-4G2J2xDIM2QJY2XGMKFE1Zyj4P22Y7vWtzvRgW0eU9s=";
 
   mypy-boto3-sqs =
-    buildMypyBoto3Package "sqs" "1.40.0"
-      "sha256-A9C1tIjj0B8kGUALokXde4m74GpDil1PWdNY7urRm7Q=";
+    buildMypyBoto3Package "sqs" "1.40.17"
+      "sha256-BN6BikMlh5XISgk9QdMZHI2JRG6MQ/6ndPRTuBJKfVY=";
 
   mypy-boto3-ssm =
     buildMypyBoto3Package "ssm" "1.40.0"

From 7ffc31ba525becdc7c7361cad5f8832feab7751b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:48:03 +0200
Subject: [PATCH 3694/3724] python312Packages.mypy-boto3-support: 1.40.0 ->
 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3212ac18cb9e..5372ecb292b2 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1333,8 +1333,8 @@ rec {
       "sha256-61XlCWCuYZTQlIhGTDAhljkt9xKmpfQwi2oOJCRM/Vw=";
 
   mypy-boto3-support =
-    buildMypyBoto3Package "support" "1.40.0"
-      "sha256-kNDyeCMDOf4pV5P3dMsKotAMrBVR+Dct8abMT7eHnDI=";
+    buildMypyBoto3Package "support" "1.40.17"
+      "sha256-Ngqg/OaZCigXIPORzWl8CMv64KPmu8axXSgnBzBWnII=";
 
   mypy-boto3-support-app =
     buildMypyBoto3Package "support-app" "1.40.0"

From 84701dd335909a8fd09485e74a2a1c569bedb519 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:48:04 +0200
Subject: [PATCH 3695/3724] python312Packages.mypy-boto3-support-app: 1.40.0 ->
 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5372ecb292b2..c160e2bf9884 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1337,8 +1337,8 @@ rec {
       "sha256-Ngqg/OaZCigXIPORzWl8CMv64KPmu8axXSgnBzBWnII=";
 
   mypy-boto3-support-app =
-    buildMypyBoto3Package "support-app" "1.40.0"
-      "sha256-+yxtP/cnx2CiQUs5IW5kibeGStP0MFXGFpRy7M2uKt0=";
+    buildMypyBoto3Package "support-app" "1.40.17"
+      "sha256-PKD1uLbQHrySwD8nMt/OHqkGbu1qWyEYM2KzMMM+VR4=";
 
   mypy-boto3-swf =
     buildMypyBoto3Package "swf" "1.40.0"

From 93a1559522298d87053b2fe160ece8123c9ad9cb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:48:07 +0200
Subject: [PATCH 3696/3724] python312Packages.mypy-boto3-translate: 1.40.0 ->
 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c160e2bf9884..f2b11a5909b5 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1373,8 +1373,8 @@ rec {
       "sha256-BMsYO2mBrK/CtWRj9jVNO2sC4IarhQ+1hYd9FeJDIEw=";
 
   mypy-boto3-translate =
-    buildMypyBoto3Package "translate" "1.40.0"
-      "sha256-r0WubEtRpiEWHNHqh5aPKD77TA9OLlDQiZHN3tRVTcU=";
+    buildMypyBoto3Package "translate" "1.40.17"
+      "sha256-sc7qt+4ztG8uxTo05AfI47zEbQsA2DjI6vUg4vPHsb8=";
 
   mypy-boto3-verifiedpermissions =
     buildMypyBoto3Package "verifiedpermissions" "1.40.0"

From 2804ccd95ab65caf9e194da94fc71dee939d1fc5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:48:09 +0200
Subject: [PATCH 3697/3724] python312Packages.mypy-boto3-waf-regional: 1.40.0
 -> 1.40.18

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index f2b11a5909b5..0fab1d0a5987 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1393,8 +1393,8 @@ rec {
       "sha256-OTU77sd04w1esOd5pEN6X2faLVkJK/08J9SpURLEe1Y=";
 
   mypy-boto3-waf-regional =
-    buildMypyBoto3Package "waf-regional" "1.40.0"
-      "sha256-BCmGOUKfRbzFczLKiU5gMjnU3RALOFIHmif2peyzggY=";
+    buildMypyBoto3Package "waf-regional" "1.40.18"
+      "sha256-r1Z15ZcuHUFEr7yUhnksIfPtxMlCrCiQw4TfRFfSW/U=";
 
   mypy-boto3-wafv2 =
     buildMypyBoto3Package "wafv2" "1.40.16"

From f997a1bf2112887af1e755e471ba41b747292aa8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:48:10 +0200
Subject: [PATCH 3698/3724] python312Packages.mypy-boto3-wellarchitected:
 1.40.0 -> 1.40.17

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0fab1d0a5987..294ed334e9a4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1401,8 +1401,8 @@ rec {
       "sha256-pog2ynsKrud7qCCW19DbXVNbyZBqvqnEecdxpxkuNEY=";
 
   mypy-boto3-wellarchitected =
-    buildMypyBoto3Package "wellarchitected" "1.40.0"
-      "sha256-NCsDTXA3eGZAhrTU/G8zgEVQT9Z8ZIH33voql8t2P6U=";
+    buildMypyBoto3Package "wellarchitected" "1.40.17"
+      "sha256-YCjVBZlqyrA72U/Y18Wt4j2FRLAi0YnkLYx/i9BAg34=";
 
   mypy-boto3-wisdom =
     buildMypyBoto3Package "wisdom" "1.40.0"

From 308698ab3b509594549a53761acb16d41f0eaba3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 22:48:18 +0200
Subject: [PATCH 3699/3724] python313Packages.boto3-stubs: 1.40.16 -> 1.40.18

---
 pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 0bb950302b92..f1d90028471b 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.16";
+  version = "1.40.18";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-MJYKSkakxJqsRA3rEoE1b+iQf6z/EA52zkWHc43HfQE=";
+    hash = "sha256-mkNu1E9E2xYoyqQ6cbXvHZeo6e8YZadGOy7Nymm6qCs=";
   };
 
   build-system = [ setuptools ];

From b53e99691d294b155f55a00fb1546c884de542da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 21:05:22 +0000
Subject: [PATCH 3700/3724] racket-minimal: 8.17 -> 8.18

---
 pkgs/by-name/ra/racket/manifest.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ra/racket/manifest.json b/pkgs/by-name/ra/racket/manifest.json
index e7250d32f99d..39447754c36f 100644
--- a/pkgs/by-name/ra/racket/manifest.json
+++ b/pkgs/by-name/ra/racket/manifest.json
@@ -1,11 +1,11 @@
 {
-  "version": "8.17",
+  "version": "8.18",
   "full": {
-    "filename": "racket-8.17-src.tgz",
-    "sha256": "44431395138f7b8c5e67d416ff063b8fb6ce056f4c4f0fda27b7b1ec58bfa33b"
+    "filename": "racket-8.18-src.tgz",
+    "sha256": "65477c71ec1a978a6ee4db582b9b47b1a488029d7a42e358906de154a6e5905c"
   },
   "minimal": {
-    "filename": "racket-minimal-8.17-src.tgz",
-    "sha256": "4acb365869290881fa07c69588cfa8b2dc1000bdc69955d70964b0b1e76b71ba"
+    "filename": "racket-minimal-8.18-src.tgz",
+    "sha256": "24b9cf8365254b43bac308192c782edfbd86363df1322c4e063b797ed0f7db66"
   }
 }

From b6dde26bb65612836fd518bdc3ac853bbc77a4a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 21:11:06 +0000
Subject: [PATCH 3701/3724] shellhub-agent: 0.20.0 -> 0.20.1

---
 pkgs/by-name/sh/shellhub-agent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix
index 4893f271fff1..2194556e0d9a 100644
--- a/pkgs/by-name/sh/shellhub-agent/package.nix
+++ b/pkgs/by-name/sh/shellhub-agent/package.nix
@@ -12,18 +12,18 @@
 
 buildGoModule rec {
   pname = "shellhub-agent";
-  version = "0.20.0";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
     rev = "v${version}";
-    hash = "sha256-cDCpZB9lkEnkltY2OQ/Y5HSZmlukeQFbuxhtbeb8E2s=";
+    hash = "sha256-VO8uQ5tXYK1k1WZiJAq8/VcvCiCcbjzGMDWfZwKSw9w=";
   };
 
   modRoot = "./agent";
 
-  vendorHash = "sha256-17D8xrLlwX57JW4yXfPlo9RQRMCxVa7MjQQmzI/MBas=";
+  vendorHash = "sha256-BAZ/rZqI51FYAHLcxbsPQofeNvRZRWihWAMEf91DDHI=";
 
   ldflags = [
     "-s"

From 4aebed42ee3797dd9693b8f1b0447e979dc58c18 Mon Sep 17 00:00:00 2001
From: "Michael Barney, Jr" <mbarneyme@gmail.com>
Date: Mon, 25 Aug 2025 11:29:24 -0400
Subject: [PATCH 3702/3724] python3Packages.aws-lambda-builders: 1.56.0 ->
 1.57.0

---
 .../python-modules/aws-lambda-builders/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix
index 8f28fc43296b..aa24f5a428ce 100644
--- a/pkgs/development/python-modules/aws-lambda-builders/default.nix
+++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aws-lambda-builders";
-  version = "1.56.0";
+  version = "1.57.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "awslabs";
     repo = "aws-lambda-builders";
     tag = "v${version}";
-    hash = "sha256-7fXuDR5AYAtnJapTTJ1QE45aP2l80ao/8RFwM7bgA4w=";
+    hash = "sha256-09SWe+uHsSmnxxZMqAeeg7z4MHex7oTgIHWO0jf6FQs=";
   };
 
   postPatch = ''

From e47e0b8a148ca2a822b0d2bef23493bdefd067bd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Aug 2025 16:36:13 +0200
Subject: [PATCH 3703/3724] python313Packages.liccheck: modernize

---
 pkgs/development/python-modules/liccheck/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/liccheck/default.nix b/pkgs/development/python-modules/liccheck/default.nix
index b36722a88e7e..4be930d0dcb3 100644
--- a/pkgs/development/python-modules/liccheck/default.nix
+++ b/pkgs/development/python-modules/liccheck/default.nix
@@ -9,13 +9,14 @@
   python3-openid,
   pythonOlder,
   semantic-version,
+  setuptools,
   toml,
 }:
 
 buildPythonPackage rec {
   pname = "liccheck";
   version = "0.9.3";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -26,7 +27,9 @@ buildPythonPackage rec {
     hash = "sha256-ohq3ZsbZcyqhwmvaVF/+mo7lNde5gjbz8pwhzHi3SPY=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     configparser
     semantic-version
     toml
@@ -43,10 +46,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Check python packages from requirement.txt and report issues";
-    mainProgram = "liccheck";
     homepage = "https://github.com/dhatim/python-license-check";
-    changelog = "https://github.com/dhatim/python-license-check/releases/tag/${version}";
+    changelog = "https://github.com/dhatim/python-license-check/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "liccheck";
   };
 }

From 87e9455abdb5f7afcfd58d1c801df025a95127f5 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Wed, 27 Aug 2025 05:17:11 +0800
Subject: [PATCH 3704/3724] kazumi: 1.7.6 -> 1.7.7

---
 pkgs/by-name/ka/kazumi/gitHashes.json    |  2 +-
 pkgs/by-name/ka/kazumi/package.nix       |  8 +-
 pkgs/by-name/ka/kazumi/pubspec.lock.json | 98 ++++++++++--------------
 3 files changed, 46 insertions(+), 62 deletions(-)

diff --git a/pkgs/by-name/ka/kazumi/gitHashes.json b/pkgs/by-name/ka/kazumi/gitHashes.json
index 78b8dc65ca92..e7400f04c2ca 100644
--- a/pkgs/by-name/ka/kazumi/gitHashes.json
+++ b/pkgs/by-name/ka/kazumi/gitHashes.json
@@ -1,5 +1,5 @@
 {
-  "desktop_webview_window": "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM=",
+  "desktop_webview_window": "sha256-GcTwBQKPFwG6fVYd9v2HVvc/Meyxmc8cD5GcgcnPpgo=",
   "media_kit": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
   "media_kit_libs_android_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
   "media_kit_libs_ios_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index a4db51666f49..f4ef0f824bc8 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  flutter332,
+  flutter335,
   fetchFromGitHub,
   autoPatchelfHook,
   alsa-lib,
@@ -17,16 +17,16 @@
 }:
 
 let
-  version = "1.7.6";
+  version = "1.7.7";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-avZ0IxxJO9e0xWE58QYkTspDqgwu+nCwzzvV+4rCLOk=";
+    hash = "sha256-t+RhLzfQwiBa49BCZ0qeUijAylPWYR8UYZHKk6bVgZc=";
   };
 in
-flutter332.buildFlutterApplication {
+flutter335.buildFlutterApplication {
   pname = "kazumi";
   inherit version src;
 
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index 2dafbd1b1bea..f1f9262e33fb 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -4,27 +4,21 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
+        "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "76.0.0"
-    },
-    "_macros": {
-      "dependency": "transitive",
-      "description": "dart",
-      "source": "sdk",
-      "version": "0.3.3"
+      "version": "67.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
+        "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.11.0"
+      "version": "6.4.1"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -110,11 +104,11 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7",
+        "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.4.1"
     },
     "build_config": {
       "dependency": "transitive",
@@ -140,31 +134,31 @@
       "dependency": "transitive",
       "description": {
         "name": "build_resolvers",
-        "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62",
+        "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.4.2"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53",
+        "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.4.13"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792",
+        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.1.2"
+      "version": "7.3.2"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -230,11 +224,11 @@
       "dependency": "direct main",
       "description": {
         "name": "card_settings_ui",
-        "sha256": "ee92c90366096c84e43a4e2942902b81d3ecd53e7c4643ab804d342d0469cb77",
+        "sha256": "69946704bf4e05830e4737645188f14420285063c8e15f82ef8f5708dba55df8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "2.0.0"
     },
     "characters": {
       "dependency": "transitive",
@@ -380,11 +374,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820",
+        "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.8"
+      "version": "2.3.6"
     },
     "dbus": {
       "dependency": "transitive",
@@ -400,8 +394,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "no_texture",
-        "resolved-ref": "109f1739727a71d8da60696143f5af91061faab2",
+        "ref": "user_script",
+        "resolved-ref": "0372b6b20c7d48b5777180b8d3cb0124f2e6b061",
         "url": "https://github.com/Predidit/linux_webview_window.git"
       },
       "source": "git",
@@ -895,31 +889,31 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
+        "sha256": "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.9"
+      "version": "11.0.1"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.9"
+      "version": "3.0.10"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "lints": {
       "dependency": "transitive",
@@ -951,16 +945,6 @@
       "source": "hosted",
       "version": "1.3.0"
     },
-    "macros": {
-      "dependency": "transitive",
-      "description": {
-        "name": "macros",
-        "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3-main.0"
-    },
     "matcher": {
       "dependency": "transitive",
       "description": {
@@ -985,7 +969,7 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit",
-        "ref": "main",
+        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "url": "https://github.com/Predidit/media-kit.git"
       },
@@ -996,7 +980,7 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/android/media_kit_libs_android_video",
-        "ref": "main",
+        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "url": "https://github.com/Predidit/media-kit.git"
       },
@@ -1007,7 +991,7 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/ios/media_kit_libs_ios_video",
-        "ref": "main",
+        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "url": "https://github.com/Predidit/media-kit.git"
       },
@@ -1018,7 +1002,7 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/linux/media_kit_libs_linux",
-        "ref": "main",
+        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "url": "https://github.com/Predidit/media-kit.git"
       },
@@ -1029,7 +1013,7 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/macos/media_kit_libs_macos_video",
-        "ref": "main",
+        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "url": "https://github.com/Predidit/media-kit.git"
       },
@@ -1040,7 +1024,7 @@
       "dependency": "direct main",
       "description": {
         "path": "libs/universal/media_kit_libs_video",
-        "ref": "main",
+        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "url": "https://github.com/Predidit/media-kit.git"
       },
@@ -1051,7 +1035,7 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/windows/media_kit_libs_windows_video",
-        "ref": "main",
+        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "url": "https://github.com/Predidit/media-kit.git"
       },
@@ -1062,7 +1046,7 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit_video",
-        "ref": "main",
+        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
         "url": "https://github.com/Predidit/media-kit.git"
       },
@@ -1113,11 +1097,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "mobx_codegen",
-        "sha256": "e0abbbc651a69550440f6b65c99ec222a1e2a4afd7baec8ba0f3088c7ca582a8",
+        "sha256": "990da80722f7d7c0017dec92040b31545d625b15d40204c36a1e63d167c73cdc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.7.1"
+      "version": "2.7.0"
     },
     "modular_core": {
       "dependency": "transitive",
@@ -1613,11 +1597,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf_web_socket",
-        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
+        "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.0"
+      "version": "2.0.1"
     },
     "shortid": {
       "dependency": "transitive",
@@ -1799,11 +1783,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.4"
+      "version": "0.7.6"
     },
     "timing": {
       "dependency": "transitive",
@@ -1999,11 +1983,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "version": {
       "dependency": "transitive",
@@ -2239,6 +2223,6 @@
   },
   "sdks": {
     "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.32.8"
+    "flutter": ">=3.35.1"
   }
 }

From a8abbb7f7109b58023893555c5e94a8b76b5f6f5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Aug 2025 23:23:59 +0200
Subject: [PATCH 3705/3724] cnspec: 11.68.0 -> 11.69.0

Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.68.0...refs/tags/v11.69.0

Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.69.0
---
 pkgs/by-name/cn/cnspec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index 89df8acf242d..85062aa39359 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "11.68.0";
+  version = "11.69.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-OFV6xk8JbdmW0hj6UsrK/KW96kVNSCtzQ75dGLeuJCk=";
+    hash = "sha256-oMGkGZH6k5E/8/WyMOqoB5oQskKd1FZbyQJ9XS+f/G0=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-vVCpA7ete2XPcwSZLmtcmdcc467g+KI5zXbZVjZsur4=";
+  vendorHash = "sha256-7/DjNBpecs65VwaEXnnPunx9phpzSH9p/+Y82XRWJjo=";
 
   subPackages = [ "apps/cnspec" ];
 

From 708992a460a172ac0d304be81c765a4b6442f510 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 27 Aug 2025 00:36:03 +0300
Subject: [PATCH 3706/3724] bootspec: add update script

---
 pkgs/by-name/bo/bootspec/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/bo/bootspec/package.nix b/pkgs/by-name/bo/bootspec/package.nix
index e3f1b8c598a0..caea01c53b9f 100644
--- a/pkgs/by-name/bo/bootspec/package.nix
+++ b/pkgs/by-name/bo/bootspec/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "bootspec";
@@ -16,6 +17,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-fKbF5SyI0UlZTWsygdE8BGWuOoNSU4jx+CGdJoJFhZs=";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Implementation of RFC-0125's datatype and synthesis tooling";
     homepage = "https://github.com/DeterminateSystems/bootspec";

From 1e5b0170bb7a83b66d6482579c1ed988dedc87e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 21:37:05 +0000
Subject: [PATCH 3707/3724] mirrord: 3.157.2 -> 3.159.0

---
 pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index 10b339f96cff..f8682bf37d2d 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.157.2",
+  "version": "3.159.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.157.2/mirrord_linux_x86_64",
-      "hash": "sha256-H73Qrj/6BezHo/jF1rvbN2rsisbTvRUB8qyzE2OcleI="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.159.0/mirrord_linux_x86_64",
+      "hash": "sha256-QwoilxsUmUDaYbIJLOhERbRgrrCN/M1sp4BvJsMWtOQ="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.157.2/mirrord_linux_aarch64",
-      "hash": "sha256-hh4JSuUVDv3Z+J97+ArgJFpsb1i+hW35SQFSps4+/FE="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.159.0/mirrord_linux_aarch64",
+      "hash": "sha256-/4VACn2xOwDBjKca8gO2syuw6foDQNyqZCECiPNeT2M="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.157.2/mirrord_mac_universal",
-      "hash": "sha256-ObypSr4R+a5MrpNwyqZQjnTD1mVv9VG8OZmMMNtJzQ0="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.159.0/mirrord_mac_universal",
+      "hash": "sha256-l/ZlUNzmp1/JBufNTbBD7yPUtHTCaU1gBOzX4GzHrq0="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.157.2/mirrord_mac_universal",
-      "hash": "sha256-ObypSr4R+a5MrpNwyqZQjnTD1mVv9VG8OZmMMNtJzQ0="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.159.0/mirrord_mac_universal",
+      "hash": "sha256-l/ZlUNzmp1/JBufNTbBD7yPUtHTCaU1gBOzX4GzHrq0="
     }
   }
 }

From bb47b7feecec34f148cf0865684d482de0311273 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 23:37:34 +0200
Subject: [PATCH 3708/3724] python313Packages.aiohomeconnect: 0.18.1 -> 0.19.0

Diff: https://github.com/MartinHjelmare/aiohomeconnect/compare/v0.18.1...v0.19.0

Changelog: https://github.com/MartinHjelmare/aiohomeconnect/blob/v0.19.0/CHANGELOG.md
---
 pkgs/development/python-modules/aiohomeconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix
index 590c8a9d0506..f8e5354b3101 100644
--- a/pkgs/development/python-modules/aiohomeconnect/default.nix
+++ b/pkgs/development/python-modules/aiohomeconnect/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomeconnect";
-  version = "0.18.1";
+  version = "0.19.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiohomeconnect";
     tag = "v${version}";
-    hash = "sha256-Gi6uSImA3R1/7CYbyzg/0j6z/wVFpuEzJNeTCoglhpY=";
+    hash = "sha256-1JIUwC2HtYXwbqmzdjmKzeEZcpSrRem2wdCoQKaRdmc=";
   };
 
   build-system = [ setuptools ];

From 72b5befda30353afddf73f8367b7a71b01f4da99 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 23:38:23 +0200
Subject: [PATCH 3709/3724] python313Packages.iaqualink: 0.5.3 -> 0.6.0

Diff: https://github.com/flz/iaqualink-py/compare/v0.5.3...v0.6.0

Changelog: https://github.com/flz/iaqualink-py/releases/tag/vv0.6.0
---
 pkgs/development/python-modules/iaqualink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iaqualink/default.nix b/pkgs/development/python-modules/iaqualink/default.nix
index 93619ea1a540..b746301ac122 100644
--- a/pkgs/development/python-modules/iaqualink/default.nix
+++ b/pkgs/development/python-modules/iaqualink/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "iaqualink";
-  version = "0.5.3";
+  version = "0.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "flz";
     repo = "iaqualink-py";
     tag = "v${version}";
-    hash = "sha256-2DqZJlsbDWo9fxIDg5P0CvZs8AuAh8XrhNiwIvuRm80=";
+    hash = "sha256-s/ZhcbTaCvn7ei1O4+P4fKPojitl+4gsatc9PZx+W2g=";
   };
 
   build-system = [

From 9ecfc36165ca742013adbea3888bc89a8ce8ab9c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 23:38:45 +0200
Subject: [PATCH 3710/3724] python313Packages.qingping-ble: 0.10.0 -> 1.0.1

Diff: https://github.com/bluetooth-devices/qingping-ble/compare/v0.10.0...v1.0.1

Changelog: https://github.com/Bluetooth-Devices/qingping-ble/blob/v1.0.1/CHANGELOG.md
---
 pkgs/development/python-modules/qingping-ble/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qingping-ble/default.nix b/pkgs/development/python-modules/qingping-ble/default.nix
index d12bd8a332c1..3aee0368c0e9 100644
--- a/pkgs/development/python-modules/qingping-ble/default.nix
+++ b/pkgs/development/python-modules/qingping-ble/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "qingping-ble";
-  version = "0.10.0";
+  version = "1.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "bluetooth-devices";
     repo = "qingping-ble";
     tag = "v${version}";
-    hash = "sha256-5w3KGJLdHFv6kURKTz3YImZNjaETiVqbbJTJpBSLSo8=";
+    hash = "sha256-YESOD2wdSD9Z7cHgzQq3Dkem0yxerOBsX9rFNEbBZfo=";
   };
 
   build-system = [ poetry-core ];

From de61bb9fd257fdff6d6d5c626770317657880649 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 23:39:20 +0200
Subject: [PATCH 3711/3724] python313Packages.velbus-aio: 2025.5.0 -> 2025.8.0

Diff: https://github.com/Cereal2nd/velbus-aio/compare/2025.5.0...2025.8.0

Changelog: https://github.com/Cereal2nd/velbus-aio/releases/tag/2025.8.0
---
 pkgs/development/python-modules/velbus-aio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix
index 7f44876d2b09..1d5bbaf9f39c 100644
--- a/pkgs/development/python-modules/velbus-aio/default.nix
+++ b/pkgs/development/python-modules/velbus-aio/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "velbus-aio";
-  version = "2025.5.0";
+  version = "2025.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "Cereal2nd";
     repo = "velbus-aio";
     tag = version;
-    hash = "sha256-oRcTiFYWVOlM6jHuIUpE4OapWn/4VyWD+MYZI5pgW3s=";
+    hash = "sha256-Z8aQ7UciafWjK3bND846BgolWtOakJv63qzc1eB94dc=";
     fetchSubmodules = true;
   };
 

From 0ee8a90d566958093001be67f7dc4641874ee3b6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 23:39:46 +0200
Subject: [PATCH 3712/3724] python313Packages.pyswitchbot: 0.68.4 -> 0.69.0

Diff: https://github.com/Danielhiversen/pySwitchbot/compare/0.68.4...0.69.0

Changelog: https://github.com/Danielhiversen/pySwitchbot/releases/tag/0.69.0
---
 pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index 5b1dd2d43536..d69b1ffd1db5 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.68.4";
+  version = "0.69.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     tag = version;
-    hash = "sha256-B3xORFuvgVM4MoAMWWXkO5wUe1wU2gEo+NzWVikMrXg=";
+    hash = "sha256-5hXFfWGRWPY0fbokw/+61PGlGC6UlQV9FbLuXfWX0KI=";
   };
 
   build-system = [ setuptools ];

From 9571c47326a3162b59b7c1b45ad21f79a0764021 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Tue, 26 Aug 2025 21:40:49 +0000
Subject: [PATCH 3713/3724] bootspec: 1.0.1 -> 1.1.0

---
 pkgs/by-name/bo/bootspec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bo/bootspec/package.nix b/pkgs/by-name/bo/bootspec/package.nix
index caea01c53b9f..307733da90f4 100644
--- a/pkgs/by-name/bo/bootspec/package.nix
+++ b/pkgs/by-name/bo/bootspec/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "bootspec";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "bootspec";
     rev = "v${version}";
-    hash = "sha256-0MO+SqG7Gjq+fmMJkIFvaKsfTmC7z3lGfi7bbBv7iBE=";
+    hash = "sha256-WDEaTxj5iT8tvasd6gnMhRgNoEdDi9Wi4ke8sVtNpt8=";
   };
 
-  cargoHash = "sha256-fKbF5SyI0UlZTWsygdE8BGWuOoNSU4jx+CGdJoJFhZs=";
+  cargoHash = "sha256-ZJKoL1vYfAG1rpCcE1jRm7Yj2dhooJ6iQ91c6EGF83E=";
 
   passthru.updateScript = nix-update-script { };
 

From 83de0534f382ed81a5277f9ee2f7fecbd29b5bb5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 26 Aug 2025 23:42:36 +0200
Subject: [PATCH 3714/3724] python313Packages.letpot: 0.6.1 -> 0.6.2

Diff: https://github.com/jpelgrom/python-letpot/compare/v0.6.1...v0.6.2

Changelog: https://github.com/jpelgrom/python-letpot/releases/tag/v0.6.2
---
 pkgs/development/python-modules/letpot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/letpot/default.nix b/pkgs/development/python-modules/letpot/default.nix
index c5a776479534..d6d2b03d56b5 100644
--- a/pkgs/development/python-modules/letpot/default.nix
+++ b/pkgs/development/python-modules/letpot/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "letpot";
-  version = "0.6.1";
+  version = "0.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jpelgrom";
     repo = "python-letpot";
     tag = "v${version}";
-    hash = "sha256-xcuBDygUpkPzwdGGG+GLQBaMPpkrj49Y/1KKh6w9jmA=";
+    hash = "sha256-aSnh1tCHAa5nLWkt0vmEXE0Dow6A5Zb6AkbTX15F6A0=";
   };
 
   build-system = [ poetry-core ];

From 4635e6fd36d6e85f6a293e51aff2e15ae52d74d8 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Tue, 26 Aug 2025 23:48:37 +0100
Subject: [PATCH 3715/3724] _86Box: fixed missing libgcrypt dep for VNC
 renderer

---
 pkgs/by-name/_8/_86Box/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/_8/_86Box/package.nix b/pkgs/by-name/_8/_86Box/package.nix
index a0f912d7c547..6b0421956a16 100644
--- a/pkgs/by-name/_8/_86Box/package.nix
+++ b/pkgs/by-name/_8/_86Box/package.nix
@@ -28,6 +28,7 @@
   libvorbis,
   libopus,
   libmpg123,
+  libgcrypt,
 
   enableDynarec ? with stdenv.hostPlatform; isx86 || isAarch,
   enableNewDynarec ? enableDynarec && stdenv.hostPlatform.isAarch,
@@ -87,7 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
   ++ lib.optional enableWayland wayland
-  ++ lib.optional enableVncRenderer libvncserver;
+  ++ lib.optionals enableVncRenderer [
+    libvncserver
+    libgcrypt
+  ];
 
   cmakeFlags =
     lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF"

From f29d3a361e2cedbfd08fa9a4a8560fc8612c4f59 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 23:10:38 +0000
Subject: [PATCH 3716/3724] python3Packages.genie-partner-sdk: 1.0.9 -> 1.0.10

---
 pkgs/development/python-modules/genie-partner-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/genie-partner-sdk/default.nix b/pkgs/development/python-modules/genie-partner-sdk/default.nix
index b287f8185da8..429aa38baa56 100644
--- a/pkgs/development/python-modules/genie-partner-sdk/default.nix
+++ b/pkgs/development/python-modules/genie-partner-sdk/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "genie-partner-sdk";
-  version = "1.0.9";
+  version = "1.0.10";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "genie_partner_sdk";
-    hash = "sha256-9fnKbC/Kiu5DYF3Sz4EksOJbJzRG7C+H3Ku2uE3eTTY=";
+    hash = "sha256-wADTKmR/9p60VJtbK+chUfZuyHe8fYkDSzFHALpXApg=";
   };
 
   nativeBuildInputs = [ hatchling ];

From 116201756fb8601f8fc584a12b67f88e32480a03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 23:18:33 +0000
Subject: [PATCH 3717/3724] udiskie: 2.5.7 -> 2.5.8

---
 pkgs/by-name/ud/udiskie/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ud/udiskie/package.nix b/pkgs/by-name/ud/udiskie/package.nix
index 1031709ff3e8..1fa8d58a5c8c 100644
--- a/pkgs/by-name/ud/udiskie/package.nix
+++ b/pkgs/by-name/ud/udiskie/package.nix
@@ -17,7 +17,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "udiskie";
-  version = "2.5.7";
+  version = "2.5.8";
 
   pyproject = true;
 
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
     owner = "coldfix";
     repo = "udiskie";
     rev = "v${version}";
-    hash = "sha256-ndoTVeF6iTe4+aqFDRaLUEaBavgCWHzULXeG3Kj3ptY=";
+    hash = "sha256-FFp1+7cCfkMI74rEAez8aJsaplEUa3madoSx+lwplzE=";
   };
 
   patches = [

From 237b761faae1cf79f6c42d038857bfa26ae52a4b Mon Sep 17 00:00:00 2001
From: "Berk D. Demir" <bdd@mindcast.org>
Date: Wed, 27 Aug 2025 00:18:18 +0000
Subject: [PATCH 3718/3724] _1password-gui: 8.11.6 -> 8.11.8

---
 pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json
index 1e77e1f21a86..34cc90dee2fd 100644
--- a/pkgs/by-name/_1/_1password-gui/sources.json
+++ b/pkgs/by-name/_1/_1password-gui/sources.json
@@ -1,28 +1,28 @@
 {
   "stable": {
     "linux": {
-      "version": "8.11.6",
+      "version": "8.11.8",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.6.x64.tar.gz",
-          "hash": "sha256-OjyJDesweUhLHuBeLCEvNOloDZO8/D6Z1FquLyapQ4Q="
+          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.8.x64.tar.gz",
+          "hash": "sha256-gidi2lnKFxcSxi6lekWODp9TJNGofWFp72Bp30KoRfY="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.6.arm64.tar.gz",
-          "hash": "sha256-sspmxX6xeVHvEww4D41PZTM2YftbILx06aMuDbAay74="
+          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.8.arm64.tar.gz",
+          "hash": "sha256-pZqhWd2K+5+B3eK52OZNSPh3Jx4MKBy+hAnC5tihzhM="
         }
       }
     },
     "darwin": {
-      "version": "8.11.6",
+      "version": "8.11.8",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.6-x86_64.zip",
-          "hash": "sha256-HMwb22/4Dw3M3B1nrdURSQzMGAZxsVG6t8E+MUmRmjg="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.8-x86_64.zip",
+          "hash": "sha256-MYyWof17KLVRtnPqSICnny24f8YoXJWeGwErWFrb6C4="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.6-aarch64.zip",
-          "hash": "sha256-SrB4tUk2GroUOptdQlJsC9tFssYXduyLR1TqH7aU2N4="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.8-aarch64.zip",
+          "hash": "sha256-wii983COooBCXyiV2a2MC7SKnFJLp1JashsOzT3+ZRA="
         }
       }
     }

From f95d605add4682f8631f9443d60d7a7bfe276fad Mon Sep 17 00:00:00 2001
From: "Berk D. Demir" <bdd@mindcast.org>
Date: Wed, 27 Aug 2025 00:21:33 +0000
Subject: [PATCH 3719/3724] _1password-gui-beta: 8.11.8-32.BETA ->
 8.11.8-39.BETA

---
 pkgs/by-name/_1/_1password-gui/sources.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json
index 34cc90dee2fd..d0561e04f388 100644
--- a/pkgs/by-name/_1/_1password-gui/sources.json
+++ b/pkgs/by-name/_1/_1password-gui/sources.json
@@ -29,15 +29,15 @@
   },
   "beta": {
     "linux": {
-      "version": "8.11.8-32.BETA",
+      "version": "8.11.8-39.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.8-32.BETA.x64.tar.gz",
-          "hash": "sha256-FlJ7uXtqavcOUs/DRGCMR0ImX9mlQBYGxFzM45DByBg="
+          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.8-39.BETA.x64.tar.gz",
+          "hash": "sha256-8KokDe9Vnr2lL5NileTcs+ncpqOcoRs5/N8hmrVv33U="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.8-32.BETA.arm64.tar.gz",
-          "hash": "sha256-Dqy9keq6aRrFp2zKGOpV9kmI4CZQFZpf8ey9n9OKy8A="
+          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.8-39.BETA.arm64.tar.gz",
+          "hash": "sha256-fWLFshduzdbYgoSIeMKPd3SsbLh62O2lPFXqwqk/DTQ="
         }
       }
     },

From 6f17f09df7117dfc00bf84c186325379baf8c638 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 26 Aug 2025 20:28:46 -0400
Subject: [PATCH 3720/3724] blender: 4.5.1 -> 4.5.2 (#436994)

Changelog: https://developer.blender.org/docs/release_notes/4.5/corrective_releases/
---
 pkgs/by-name/bl/blender/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index 9cae88fc7820..22a805042ff9 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -115,12 +115,12 @@ in
 
 stdenv'.mkDerivation (finalAttrs: {
   pname = "blender";
-  version = "4.5.1";
+  version = "4.5.2";
 
   src = fetchzip {
     name = "source";
     url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
-    hash = "sha256-x1zeBQ0aTBFUpB7c4XfP6b2p+ENRFEnTGa4m/7Pl24k=";
+    hash = "sha256-6blXwp3DeWNM5Q6M5gWj4O+K/gFxEOj41lzlc5biEYQ=";
   };
 
   postPatch =

From 4924630a347776020a283669bea497092b2ea148 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Aug 2025 00:32:31 +0000
Subject: [PATCH 3721/3724] pay-respects: 0.7.8 -> 0.7.9

---
 pkgs/by-name/pa/pay-respects/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix
index f7c297063410..f2b82e49b3ff 100644
--- a/pkgs/by-name/pa/pay-respects/package.nix
+++ b/pkgs/by-name/pa/pay-respects/package.nix
@@ -6,17 +6,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pay-respects";
-  version = "0.7.8";
+  version = "0.7.9";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "iff";
     repo = "pay-respects";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-73uGxcJCWUVwr1ddNjZTRJwx8OfnAPwtp80v1xpUEhA=";
+    hash = "sha256-qKej29kM0Kq5RRHo+lu9cGeTjnjUvpmIqSxq5yHuCKc=";
   };
 
-  cargoHash = "sha256-VSv0BpIICkYyCIfGDfK7wfKQssWF13hCh6IW375CI/c=";
+  cargoHash = "sha256-2MEbUBTZ/zsPLhHTnQCrWQManqUQ3V3xta5NT9gu38A=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From 9610b3651c469304a3bfae9b482fc67ef244ecb1 Mon Sep 17 00:00:00 2001
From: Antonio Yang <yanganto@gmail.com>
Date: Tue, 26 Aug 2025 16:21:55 +0800
Subject: [PATCH 3722/3724] gitui: fix build for v0.27.0

Co-authored-by: Picnoir <picnoir@alternativebit.fr>
---
 pkgs/by-name/gi/gitui/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix
index 6c2f8cf7f342..8abe536cbb67 100644
--- a/pkgs/by-name/gi/gitui/package.nix
+++ b/pkgs/by-name/gi/gitui/package.nix
@@ -9,6 +9,7 @@
   cmake,
   xclip,
   nix-update-script,
+  fetchpatch,
 }:
 let
   pname = "gitui";
@@ -39,6 +40,16 @@ rustPlatform.buildRustPackage {
     libiconv
   ];
 
+  patches = [
+    # Fixes the build for rust 1.89
+    # Upstream PR: https://github.com/gitui-org/gitui/pull/2663
+    # TOREMOVE for gitui > 0.27.0
+    (fetchpatch {
+      url = "https://github.com/gitui-org/gitui/commit/950e703cab1dd37e3d02e7316ec99cc0dc70513c.patch";
+      sha256 = "sha256-KDgOPLKGuJaF0Nc6rw9FPFmcI07I8Gyp/KNX8x6+2xw=";
+    })
+  ];
+
   postPatch = ''
     # The cargo config overrides linkers for some targets, breaking the build
     # on e.g. `aarch64-linux`. These overrides are not required in the Nix

From c80f0f65da09a0d52b60eb223ddbc5b3280e3716 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Aug 2025 02:34:52 +0000
Subject: [PATCH 3723/3724] wgsl-analyzer: 2025-06-28 -> 2025-08-08

---
 pkgs/by-name/wg/wgsl-analyzer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wg/wgsl-analyzer/package.nix b/pkgs/by-name/wg/wgsl-analyzer/package.nix
index 492b9a232794..4a7230a47cbe 100644
--- a/pkgs/by-name/wg/wgsl-analyzer/package.nix
+++ b/pkgs/by-name/wg/wgsl-analyzer/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wgsl-analyzer";
-  version = "2025-06-28";
+  version = "2025-08-08";
 
   src = fetchFromGitHub {
     owner = "wgsl-analyzer";
     repo = "wgsl-analyzer";
     tag = finalAttrs.version;
-    hash = "sha256-X4BUZWrCmyixM6D7785jsQ4XYhXemQ7ycl0FUijevkg=";
+    hash = "sha256-wYUhHbq+W9feA1R7uGrUd607C7yE3HPlc5+22t+oqOs=";
   };
 
-  cargoHash = "sha256-PEhvnIVjNi0O2ZqzSW/CRaK4r5pzd7sMUDhB2eGpqk8=";
+  cargoHash = "sha256-QBeuzLbG/unf+FIXJ8AxSuAKRmx1JezOBlgRKpEHRPo=";
 
   checkFlags = [
     # Imports failures

From 59348e17ce76547946026053a4098c36ec714079 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Aug 2025 05:44:18 +0000
Subject: [PATCH 3724/3724] python3Packages.osc: 1.9.1 -> 1.19.1

---
 pkgs/development/python-modules/osc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix
index 7eadbf1a8313..51beca1710b6 100644
--- a/pkgs/development/python-modules/osc/default.nix
+++ b/pkgs/development/python-modules/osc/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "osc";
-  version = "1.9.1";
+  version = "1.19.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "osc";
     rev = version;
-    hash = "sha256-03EDarU7rmsiE96IYHXFuPtD8nWur0qwj8NDzSj8OX0=";
+    hash = "sha256-klPO873FwQOf4DCTuDd86vmGLI4ep9xgS6c+HasJv0Q=";
   };
 
   buildInputs = [ bashInteractive ]; # needed for bash-completion helper